update templates for 6.0.0 alpha1

Change-Id: Ie5bf8ab575cb94b341c277daa0cd9f6f2f6871f0

1 files changed, 514 insertions, 713 deletions

diff --git a/source/cy/uui/messages.po b/source/cy/uui/messages.po
index ab754219d8d..17fc51a0dd8 100644
--- a/source/cy/uui/messages.po
+++ b/source/cy/uui/messages.po
@@ -1,149 +1,270 @@
-#
+#. extracted from uui/uiconfig/ui
 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-04-12 14:14+0200\n"
-"PO-Revision-Date: 2017-06-13 10:16+0000\n"
-"Last-Translator: Rhoslyn Prys <rprys@yahoo.com>\n"
+"POT-Creation-Date: 2017-10-04 11:48+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"
-"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: 1497349011.000000\n"
+"X-Generator: LibreOffice\n"
 
-#. sdbEf
-#: alreadyopen.src
-msgctxt "STR_ALREADYOPEN_TITLE"
-msgid "Document in Use"
-msgstr "Dogfen ar Waith"
+#: authfallback.ui:8
+msgctxt "authfallback|AuthFallbackDlg"
+msgid "Authentication Code"
+msgstr "Cod Dilysu"
 
-#. ckcJc
-#: alreadyopen.src
-msgctxt "STR_ALREADYOPEN_MSG"
+#: authfallback.ui:130
+msgctxt "authfallback|label1"
+msgid "Enter the 6 digit PIN:"
+msgstr "Rhowch PIN 6 nod:"
+
+#: filterselect.ui:7
+msgctxt "filterselect|FilterSelectDialog"
+msgid "Filter Selection"
+msgstr "Dewis Hidl"
+
+#: logindialog.ui:8
+msgctxt "logindialog|LoginDialog"
+msgid "Authentication Required"
+msgstr "Mae Angen Dilysiad"
+
+#: logindialog.ui:80
+msgctxt "logindialog|syscreds"
+msgid "_Use system credentials"
+msgstr "_Defnyddio manylion y system"
+
+#: logindialog.ui:96
+msgctxt "logindialog|remember"
+msgid "_Remember password"
+msgstr "C_ofio'r cyfrinair"
+
+#: logindialog.ui:127
+msgctxt "logindialog|accountft"
+msgid "A_ccount:"
+msgstr "C_yfrif:"
+
+#: logindialog.ui:141
+msgctxt "logindialog|passwordft"
+msgid "Pass_word:"
+msgstr "Cy_frinair:"
+
+#: logindialog.ui:180
+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
+msgctxt "logindialog|loginrealm"
 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"
+"Enter user name and password for:\n"
+"“%2” on %1"
 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"
+"Rhoi cyfrinair newydd i ddefnyddiwr:\n"
+"“%2” ar %1"
 
-#. 8mKMg
-#: alreadyopen.src
-msgctxt "STR_ALREADYOPEN_READONLY_BTN"
-msgid "Open ~Read-Only"
-msgstr "Agor ~Dogfen darllen yn unig"
+#: logindialog.ui:258
+msgctxt "logindialog|wrongloginrealm"
+msgid ""
+"Wrong user name and password for:\n"
+"“%2” on %1"
+msgstr ""
+"Enw defnyddiwr a chyfrinair ar gyfer defnyddiwr:\n"
+"“%2” ar %1"
 
-#. ThAZk
-#: alreadyopen.src
-msgctxt "STR_ALREADYOPEN_OPEN_BTN"
-msgid "~Open"
-msgstr "~Agor"
+#: logindialog.ui:272
+msgctxt "logindialog|wrongrequestinfo"
+msgid ""
+"Wrong user name and password for:\n"
+"%1"
+msgstr ""
+"Enw defnyddiwr a chyfrinair anghywir ar gyfer:\n"
+"%1"
 
-#. omvEC
-#: alreadyopen.src
-msgctxt "STR_ALREADYOPEN_SAVE_MSG"
+#: logindialog.ui:286
+msgctxt "logindialog|requestinfo"
 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"
+"Enter user name and password for:\n"
+"%1"
 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"
-"\n"
+"Rhowch eich enw defnyddiwr a chyfrinair\n"
+"%1"
 
-#. ZCJGW
-#: alreadyopen.src
-msgctxt "STR_ALREADYOPEN_RETRY_SAVE_BTN"
-msgid "~Retry Saving"
-msgstr "~Ceisio Cadw Eto"
+#: logindialog.ui:300
+msgctxt "logindialog|errorft"
+msgid "Message from server:"
+msgstr "Neges gan y gweinydd:"
 
-#. EVEQx
-#: alreadyopen.src
-msgctxt "STR_ALREADYOPEN_SAVE_BTN"
-msgid "~Save"
-msgstr "~Cadw"
+#: macrowarnmedium.ui:9
+msgctxt "macrowarnmedium|MacroWarnMedium"
+msgid "%PRODUCTNAME - Security Warning"
+msgstr "%PRODUCTNAME - Rhybudd Diogelwch"
 
-#. PFEwD
-#: filechanged.src
-msgctxt "STR_FILECHANGED_TITLE"
-msgid "Document Has Been Changed by Others"
-msgstr "Dogfen wedi ei Newid gan Eraill"
+#: macrowarnmedium.ui:25
+msgctxt "macrowarnmedium|ok"
+msgid "_Enable Macros"
+msgstr "_Galluogi Macros"
 
-#. XGC5m
-#: filechanged.src
-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"
-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"
+#: macrowarnmedium.ui:39
+msgctxt "macrowarnmedium|cancel"
+msgid "_Disable Macros"
+msgstr "_Anablu Macros"
 
-#. DGYmK
-#: filechanged.src
-msgctxt "STR_FILECHANGED_SAVEANYWAY_BTN"
-msgid "~Save Anyway"
-msgstr "~Cadw Beth Bynnag"
+#: macrowarnmedium.ui:127
+msgctxt "macrowarnmedium|descr1Label"
+msgid "The document contains document macros signed by:"
+msgstr "Mae'r ddogfen yn cynnwys macros dogfennau llofnodwyd gan:"
 
-#. SZb7E
-#: ids.src
-msgctxt "RID_KEEP_PASSWORD"
-msgid "~Remember password until end of session"
-msgstr "~Cofio cyfrinair tan ddiwedd y sesiwn"
+#: macrowarnmedium.ui:141
+msgctxt "macrowarnmedium|descr1aLabel"
+msgid "The document contains document macros."
+msgstr "Mae'r ddogfen yn cynnwys macros dogfennau."
 
-#. 7HtCZ
-#: ids.src
-msgctxt "RID_SAVE_PASSWORD"
-msgid "~Remember password"
-msgstr "~Cofio cyfrinair"
+#: macrowarnmedium.ui:168
+msgctxt "macrowarnmedium|viewSignsButton"
+msgid "_View Signatures…"
+msgstr "_Gweld Llofnodion…"
 
-#. CV6Ci
-#: ids.src
-msgctxt "STR_WARNING_INCOMPLETE_ENCRYPTION_TITLE"
-msgid "Non-Encrypted Streams"
-msgstr "Llif Heb eu Hamgryptio"
+#: 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
+msgctxt "masterpassworddlg|MasterPasswordDialog"
+msgid "Enter Master Password"
+msgstr "Rhowch Brif Gyfrinair"
+
+#: masterpassworddlg.ui:86
+msgctxt "masterpassworddlg|label1"
+msgid "_Enter password:"
+msgstr "_Rhowch gyfrinair:"
+
+#: password.ui:8
+msgctxt "password|PasswordDialog"
+msgid "Set Password"
+msgstr "Gosod Cyfrinair"
+
+#: setmasterpassworddlg.ui:8
+msgctxt "setmasterpassworddlg|SetMasterPasswordDialog"
+msgid "Set Master Password"
+msgstr "Gosod Prif Gyfrinair"
+
+#: 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
+msgctxt "setmasterpassworddlg|label2"
+msgid "_Enter password:"
+msgstr "_Rhowch gyfrinair:"
+
+#: setmasterpassworddlg.ui:128
+msgctxt "setmasterpassworddlg|label3"
+msgid "_Reenter password:"
+msgstr "_Ail rhoi cyfrinair:"
 
-#. DLY8p
-#: ids.src
+#: setmasterpassworddlg.ui:157
+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
+msgctxt "simplenameclash|SimpleNameClashDialog"
+msgid "File Exists"
+msgstr "Ffeil yn Bodoli"
+
+#: simplenameclash.ui:37
+msgctxt "simplenameclash|replace"
+msgid "Replace"
+msgstr "Newid"
+
+#: simplenameclash.ui:51
+msgctxt "simplenameclash|rename"
+msgid "Rename"
+msgstr "Ailenwi"
+
+#: sslwarndialog.ui:8
+msgctxt "sslwarndialog|SSLWarnDialog"
+msgid "Security Warning: "
+msgstr "Rhybudd Diogelwch: "
+
+#: sslwarndialog.ui:24
+msgctxt "sslwarndialog|ok"
+msgid "Continue"
+msgstr "Parhau"
+
+#: sslwarndialog.ui:38
+msgctxt "sslwarndialog|cancel"
+msgid "Cancel Connection"
+msgstr "Diddymu'r Cysylltiad"
+
+#: sslwarndialog.ui:52
+msgctxt "sslwarndialog|view"
+msgid "View Certificate"
+msgstr "Darllen y Dystysgrif"
+
+#: unknownauthdialog.ui:8
+msgctxt "unknownauthdialog|UnknownAuthDialog"
+msgid "Website Certified by an Unknown Authority"
+msgstr "Gwefan wedi ei Dilysu gan Awdurdod Anhysbys"
+
+#: unknownauthdialog.ui:80
+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
+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
+msgctxt "unknownauthdialog|examine"
+msgid "Examine Certificate…"
+msgstr "Archwilio'r Dystysgrif…"
+
+#: ids.hrc:27
 msgctxt "RID_UUI_ERRHDL"
 msgid "The operation executed on $(ARG1) was aborted."
 msgstr "Terfynodd y weithred wnaed yn $(ARG1)."
 
-#. Q448y
-#: ids.src
+#: ids.hrc:29
 msgctxt "RID_UUI_ERRHDL"
 msgid "Access to $(ARG1) was denied."
 msgstr "Gwrthodwyd mynediad i $(ARG1)."
 
-#. w6rpp
-#: ids.src
+#: ids.hrc:31
 msgctxt "RID_UUI_ERRHDL"
 msgid "$(ARG1) already exists."
 msgstr "Mae $(ARG1) yn bodoli eisoes."
 
-#. a6BBm
-#: ids.src
+#: ids.hrc:33
 msgctxt "RID_UUI_ERRHDL"
 msgid "Target already exists."
 msgstr "Targed yn bodoli eisoes."
 
-#. KgnBz
-#: ids.src
+#: ids.hrc:35
 msgctxt "RID_UUI_ERRHDL"
 msgid ""
 "You are about to save/export a password protected basic library containing module(s) \n"
@@ -154,316 +275,242 @@ 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?"
 
-#. v6bPE
-#: ids.src
+#: ids.hrc:37
 msgctxt "RID_UUI_ERRHDL"
 msgid "The data from $(ARG1) has an incorrect checksum."
 msgstr "Mae gan ddata o $(ARG1) checksum anghywir."
 
-#. AGF5W
-#: ids.src
+#: ids.hrc:39
 msgctxt "RID_UUI_ERRHDL"
 msgid "The object $(ARG1) cannot be created in directory $(ARG2)."
 msgstr "Methu creu $(ARG1) yng nghyfeiriadur $(ARG2)."
 
-#. Dw4Ff
-#: ids.src
+#: ids.hrc:41
 msgctxt "RID_UUI_ERRHDL"
 msgid "Data of $(ARG1) could not be read."
 msgstr "Methu darllen data $(ARG1)."
 
-#. Qc4E9
-#: ids.src
+#: ids.hrc:43
 msgctxt "RID_UUI_ERRHDL"
 msgid "The seek operation on $(ARG1) could not be performed."
 msgstr "Methu cyflawni'r weithred o ymholi ar $(ARG1)."
 
-#. CD7zU
-#: ids.src
+#: ids.hrc:45
 msgctxt "RID_UUI_ERRHDL"
 msgid "The tell operation on $(ARG1) could not be performed."
 msgstr "Methu cyflawni'r weithred dweud ar $(ARG1)."
 
-#. AkGXL
-#: ids.src
+#: ids.hrc:47
 msgctxt "RID_UUI_ERRHDL"
 msgid "Data for $(ARG1) could not be written."
 msgstr "Methu ysgrifennu data $(ARG1)."
 
-#. ndib2
-#: ids.src
+#: ids.hrc:49
 msgctxt "RID_UUI_ERRHDL"
 msgid "Action impossible: $(ARG1) is the current directory."
 msgstr "Gweithred amhosibl: $(ARG1) yw'r cyfeiriadur presennol."
 
-#. wWVF2
-#: ids.src
+#: ids.hrc:51
 msgctxt "RID_UUI_ERRHDL"
 msgid "$(ARG1) is not ready."
 msgstr "Nid yw $(ARG1) yn barod."
 
-#. C7iGB
-#: ids.src
+#: ids.hrc:53
 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."
+msgstr "Gweithred amhosibl: Mae $(ARG1) a $(ARG2) yn nyfeisiau (disgiau) gwahanol."
 
-#. ic2pB
-#: ids.src
+#: ids.hrc:55
 msgctxt "RID_UUI_ERRHDL"
 msgid "General input/output error while accessing $(ARG1)."
 msgstr "Gwall mewnbwn/allbwn cyffredinol wrth gael mynediad i $(ARG1)."
 
-#. r6GVi
-#: ids.src
+#: ids.hrc:57
 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."
 
-#. Y6bwq
-#: ids.src
+#: ids.hrc:59
 msgctxt "RID_UUI_ERRHDL"
 msgid "$(ARG1) contains invalid characters."
 msgstr "Mae $(ARG1) yn cynnwys nodau annilys."
 
-#. 5HEak
-#: ids.src
+#: ids.hrc:61
 msgctxt "RID_UUI_ERRHDL"
 msgid "The device (drive) $(ARG1) is invalid."
 msgstr "Mae'r ddyfais (disg) $(ARG1) yn annilys."
 
-#. Ykhp2
-#: ids.src
+#: ids.hrc:63
 msgctxt "RID_UUI_ERRHDL"
 msgid "The data from $(ARG1) has an invalid length."
 msgstr "Mae i ddata o $(ARG1) hyd annilys."
 
-#. CbZfa
-#: ids.src
+#: ids.hrc:65
 msgctxt "RID_UUI_ERRHDL"
 msgid "The operation on $(ARG1) was started with an invalid parameter."
 msgstr "Cychwynnwyd gweithred ar $(ARG1) gyda pharamedr annilys."
 
-#. fEQmj
-#: ids.src
+#: ids.hrc:67
 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."
+msgstr "Nid oes modd cyflawni'r weithred am fod $(ARG1) yn cynnwys cardiau gwyllt."
 
-#. v2dLh
-#: ids.src
+#: ids.hrc:69
 msgctxt "RID_UUI_ERRHDL"
 msgid "Error during shared access to $(ARG1)."
 msgstr "Gwall yn ystod mynediad rhanedig i $(ARG1)."
 
-#. AEtU6
-#: ids.src
+#: ids.hrc:71
 msgctxt "RID_UUI_ERRHDL"
 msgid "$(ARG1) contains misplaced characters."
 msgstr "Mae $(ARG1) yn cynnwys nodau o'u lle."
 
-#. fD986
-#: ids.src
+#: ids.hrc:73
 msgctxt "RID_UUI_ERRHDL"
 msgid "The name $(ARG1) contains too many characters."
 msgstr "Mae'r enw $(ARG1) yn cynnwys gormod o nodau."
 
-#. U3tMN
-#: ids.src
+#: ids.hrc:75
 msgctxt "RID_UUI_ERRHDL"
 msgid "$(ARG1) does not exist."
 msgstr "Nid yw $(ARG1) yn bodoli."
 
-#. nB6UA
-#: ids.src
+#: ids.hrc:77
 msgctxt "RID_UUI_ERRHDL"
 msgid "The path $(ARG1) does not exist."
 msgstr "Nid yw llwybr $(ARG1) yn bodoli."
 
-#. FMV9Y
-#: ids.src
+#: ids.hrc:79
 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."
+msgstr "Nid yw'r weithred ar $(ARG1) yn cael ei gynnal gan y system weithredu."
 
-#. zzACo
-#: ids.src
+#: ids.hrc:81
 msgctxt "RID_UUI_ERRHDL"
 msgid "$(ARG1) is not a directory."
 msgstr "Nid yw $(ARG1) yn gyfeiriadur."
 
-#. YW5vM
-#: ids.src
+#: ids.hrc:83
 msgctxt "RID_UUI_ERRHDL"
 msgid "$(ARG1) is not a file."
 msgstr "Nid yw $(ARG1) yn ffeil."
 
-#. khxN3
-#: ids.src
+#: ids.hrc:85
 msgctxt "RID_UUI_ERRHDL"
 msgid "There is no space left on device $(ARG1)."
 msgstr "Nid oes gofod ar ôl ar ddyfais $(ARG1)."
 
-#. zehX6
-#: ids.src
+#: ids.hrc:87
 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."
+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."
 
-#. ctFbB
-#: ids.src
+#: ids.hrc:89
 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."
+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."
 
-#. jpzJG
-#: ids.src
+#: ids.hrc:91
 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."
+msgstr "Nid oes posibl cyflawni'r weithred ar $(ARG1) am fod rhagor o ddata ar ei ffordd."
 
-#. 6DVTU
-#: ids.src
+#: ids.hrc:93
 msgctxt "RID_UUI_ERRHDL"
 msgid "$(ARG1) cannot be copied into itself."
 msgstr "Methu copïo $(ARG1) iddo'i hun."
 
-#. zyCVE
-#: ids.src
+#: ids.hrc:95
 msgctxt "RID_UUI_ERRHDL"
 msgid "Unknown input/output error while accessing $(ARG1)."
 msgstr "Gwall mewnbwn/allbwn anhysbys wrth gael mynediad i $(ARG1)."
 
-#. cVa9F
-#: ids.src
+#: ids.hrc:97
 msgctxt "RID_UUI_ERRHDL"
 msgid "$(ARG1) is write protected."
 msgstr "$(ARG1) wedi ei ddiogelu rhag ysgrifennu."
 
-#. JARZx
-#: ids.src
+#: ids.hrc:99
 msgctxt "RID_UUI_ERRHDL"
 msgid "$(ARG1) is not in the correct format."
 msgstr "Nid yw $(ARG1) yn y fformat cywir."
 
-#. NJNyn
-#: ids.src
+#: ids.hrc:101
 msgctxt "RID_UUI_ERRHDL"
 msgid "The version of $(ARG1) is not correct."
 msgstr "Nid yw'r fersiwn o $(ARG1) yn gywir."
 
-#. uBqiR
-#: ids.src
+#: ids.hrc:103
 msgctxt "RID_UUI_ERRHDL"
 msgid "Drive $(ARG1) does not exist."
 msgstr "Nid yw gyrrwr $(ARG1) yn bodoli."
 
-#. zemAv
-#: ids.src
+#: ids.hrc:105
 msgctxt "RID_UUI_ERRHDL"
 msgid "Folder $(ARG1) does not exist."
 msgstr "Nid yw'r ffolder $(ARG1) yn bodoli."
 
-#. aRCFc
-#: ids.src
+#: ids.hrc:107
 msgctxt "RID_UUI_ERRHDL"
 msgid "The installed Java version is not supported."
 msgstr "Nid yw'r fersiwn gosodedig o Java'n cael ei gynnal."
 
-#. DbH3p
-#: ids.src
+#: ids.hrc:109
 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."
 
-#. 7NCGk
-#: ids.src
+#: ids.hrc:111
 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)."
+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)."
 
-#. bNWmn
-#: ids.src
+#: ids.hrc:113
 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)."
+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)."
 
-#. 5MfGQ
-#: ids.src
+#: ids.hrc:115
 msgctxt "RID_UUI_ERRHDL"
 msgid "The data associated with the partnership is corrupted."
 msgstr "Mae'r data sy'n gysylltiedig â'r bartneriaeth yn llygredig."
 
-#. fKMdA
-#: ids.src
+#: ids.hrc:117
 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."
 
-#. sBGBF
-#: ids.src
+#: ids.hrc:119
 msgctxt "RID_UUI_ERRHDL"
 msgid "Volume $(ARG1) is not ready."
 msgstr "Nid yw cyfrol $(ARG1) yn barod."
 
-#. yKKd9
-#: ids.src
+#: ids.hrc:121
 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."
 
-#. RogFv
-#: ids.src
+#: ids.hrc:123
 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."
 
-#. AqFh4
-#: ids.src
+#: ids.hrc:125
 msgctxt "RID_UUI_ERRHDL"
 msgid "Please insert disk $(ARG1)."
 msgstr "Rhowch ddisg $(ARG1) i mewn."
 
-#. WbB7f
-#: ids.src
+#: ids.hrc:127
 msgctxt "RID_UUI_ERRHDL"
 msgid "The object cannot be created in directory $(ARG1)."
 msgstr "Methu creu'r gwrthrych yng nghyfeiriadur $(ARG1)."
 
-#. cSCj6
-#: ids.src
+#: ids.hrc:129
 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?"
+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?"
 
-#. CUbSR
-#: ids.src
+#: ids.hrc:131
 msgctxt "RID_UUI_ERRHDL"
 msgid ""
 "The file '$(ARG1)' is corrupt and therefore cannot be opened. %PRODUCTNAME can try to repair the file.\n"
@@ -484,15 +531,12 @@ msgstr ""
 "\n"
 "A ddylai %PRODUCTNAME drwsio'r ffeil?\n"
 
-#. KeFss
-#: ids.src
+#: ids.hrc:133
 msgctxt "RID_UUI_ERRHDL"
-msgid ""
-"The file '$(ARG1)' could not be repaired and therefore cannot be opened."
+msgid "The file '$(ARG1)' could not be repaired and therefore cannot be opened."
 msgstr "Methu trwsio ffeil '$(ARG1)' ac felly methu ei hagor."
 
-#. JCpTn
-#: ids.src
+#: ids.hrc:135
 msgctxt "RID_UUI_ERRHDL"
 msgid ""
 "Configuration data in '$(ARG1)' is corrupted. Without this data some functions may not operate correctly.\n"
@@ -501,8 +545,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?"
 
-#. QCACp
-#: ids.src
+#: ids.hrc:137
 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"
@@ -511,18 +554,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?"
 
-#. e5Rft
-#: ids.src
+#: ids.hrc:139
 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."
+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."
 
-#. 4gRCA
-#: ids.src
+#: ids.hrc:141
 msgctxt "RID_UUI_ERRHDL"
 msgid ""
 "The configuration data source '$(ARG1)' is unavailable. Without this data some functions may not operate correctly.\n"
@@ -531,40 +568,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?"
 
-#. DAUhe
-#: ids.src
+#: ids.hrc:143
 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?"
 
-#. DSoD4
-#: ids.src
+#: ids.hrc:145
 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."
+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."
 
-#. k6aHT
-#: ids.src
+#: ids.hrc:147
 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."
+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."
 
-#. ZoUzb
-#: ids.src
+#: ids.hrc:149
 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."
 
-#. L9PCQ
-#: ids.src
+#: ids.hrc:151
 msgctxt "RID_UUI_ERRHDL"
 msgid ""
 "The previously obtained lock for file $(ARG1) has expired.\n"
@@ -573,10 +597,23 @@ 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!"
 
-#. uxveA
-#: ids.src
+#: ids.hrc:153
 msgctxt "RID_UUI_ERRHDL"
 msgid ""
+"Component cannot be loaded, possibly broken or incomplete installation.\n"
+"Full error message:\n"
+"\n"
+" $(ARG1)."
+msgstr ""
+"Nid oes modd llwytho'r gydran, efallai ei fod wedi torri neu fod y gosodiad yn anghyflawn.\n"
+"Neges gwall llawn:\n"
+"\n"
+" $(ARG1)."
+
+#: ids.hrc:158
+#, fuzzy
+msgctxt "STR_UUI_UNKNOWNAUTH_UNTRUSTED"
+msgid ""
 "Unable to verify the identity of $(ARG1) site.\n"
 "\n"
 "Before accepting this certificate, you should examine this site's certificate carefully. Are you willing to accept this certificate for the purpose of identifying the Web site $(ARG1)?"
@@ -585,9 +622,9 @@ 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)?"
 
-#. wWG6p
-#: ids.src
-msgctxt "RID_UUI_ERRHDL"
+#: ids.hrc:159
+#, fuzzy
+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"
 "\n"
@@ -597,9 +634,15 @@ msgstr ""
 "\n"
 "Gwiriwch fod amser eich cyfrifiadur yn gywir."
 
-#. xGm8W
-#: ids.src
-msgctxt "RID_UUI_ERRHDL"
+#: ids.hrc:160
+#, fuzzy
+msgctxt "STR_UUI_SSLWARN_EXPIRED_TITLE"
+msgid "Security Warning: Server Certificate Invalid"
+msgstr "Rhybudd Diogelwch: Tystysgrif Gweinydd Annilys"
+
+#: ids.hrc:161
+#, fuzzy
+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"
 "\n"
@@ -613,9 +656,15 @@ msgstr ""
 "\n"
 "Hoffech chi barhau?"
 
-#. L2HXU
-#: ids.src
-msgctxt "RID_UUI_ERRHDL"
+#: ids.hrc:162
+#, fuzzy
+msgctxt "STR_UUI_SSLWARN_DOMAINMISMATCH_TITLE"
+msgid "Security Warning: Server Certificate Expired"
+msgstr "Rhybudd Diogelwch: Tystysgrif Gweinydd wedi dod i Ben"
+
+#: ids.hrc:163
+#, fuzzy
+msgctxt "STR_UUI_SSLWARN_INVALID"
 msgid ""
 "The certificate could not be validated. You should examine this site's certificate carefully.\n"
 "\n"
@@ -625,94 +674,134 @@ msgstr ""
 "\n"
 "Os ydych yn amau'r dystysgrif, diddymwch y cysylltiad a hysbysu gweinyddwr y wefan."
 
-#. dfLHZ
-#: ids.src
-msgctxt "RID_UUI_ERRHDL"
+#: ids.hrc:164
+#, fuzzy
+msgctxt "STR_UUI_SSLWARN_INVALID_TITLE"
 msgid "Security Warning: Domain Name Mismatch"
 msgstr "Rhybudd Diogelwch: Anghydweddiad Enw Parth"
 
-#. Ayvg9
-#: ids.src
-msgctxt "RID_UUI_ERRHDL"
-msgid "Security Warning: Server Certificate Expired"
-msgstr "Rhybudd Diogelwch: Tystysgrif Gweinydd wedi dod i Ben"
+#: strings.hrc:25
+msgctxt "STR_ENTER_PASSWORD_TO_OPEN"
+msgid "Enter password to open file: \n"
+msgstr "Rhowch y cyfrinair i agor ffeil: \n"
 
-#. 3zFuc
-#: ids.src
-msgctxt "RID_UUI_ERRHDL"
-msgid "Security Warning: Server Certificate Invalid"
-msgstr "Rhybudd Diogelwch: Tystysgrif Gweinydd Annilys"
+#: strings.hrc:26
+msgctxt "STR_ENTER_PASSWORD_TO_MODIFY"
+msgid "Enter password to modify file: \n"
+msgstr "Rhowch y cyfrinair i newid ffeil: \n"
 
-#. gZzEy
-#: ids.src
-msgctxt "RID_UUI_ERRHDL"
+#: strings.hrc:27
+msgctxt "STR_ENTER_SIMPLE_PASSWORD"
+msgid "Enter password: "
+msgstr "Rhowch gyfrinair: "
+
+#: strings.hrc:28
+msgctxt "STR_CONFIRM_SIMPLE_PASSWORD"
+msgid "Confirm password: "
+msgstr "Cadarnhau'r cyfrinair: "
+
+#: strings.hrc:29
+msgctxt "STR_TITLE_CREATE_PASSWORD"
+msgid "Set Password"
+msgstr "Gosod Cyfrinair"
+
+#: strings.hrc:30
+msgctxt "STR_TITLE_ENTER_PASSWORD"
+msgid "Enter Password"
+msgstr "Rhowch Gyfrinair"
+
+#: 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
+msgctxt "STR_ALREADYOPEN_TITLE"
+msgid "Document in Use"
+msgstr "Dogfen ar Waith"
+
+#: strings.hrc:34
+msgctxt "STR_ALREADYOPEN_MSG"
 msgid ""
-"Component cannot be loaded, possibly broken or incomplete installation.\n"
-"Full error message:\n"
+"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"
-" $(ARG1)."
 msgstr ""
-"Nid oes modd llwytho'r gydran, efallai ei fod wedi torri neu fod y gosodiad yn anghyflawn.\n"
-"Neges gwall llawn:\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.\n"
 "\n"
-" $(ARG1)."
 
-#. P7Bd8
-#: lockfailed.src
-msgctxt "STR_LOCKFAILED_TITLE"
-msgid "Document Could Not Be Locked"
-msgstr "Nid Oedd Modd Cloi'r Ddogfen"
+#: strings.hrc:35
+msgctxt "STR_ALREADYOPEN_READONLY_BTN"
+msgid "Open ~Read-Only"
+msgstr "Agor ~Dogfen darllen yn unig"
 
-#. s576b
-#: lockfailed.src
-msgctxt "STR_LOCKFAILED_MSG"
+#: strings.hrc:36
+msgctxt "STR_ALREADYOPEN_OPEN_BTN"
+msgid "~Open"
+msgstr "~Agor"
+
+#: strings.hrc:37
+msgctxt "STR_ALREADYOPEN_SAVE_MSG"
 msgid ""
-"The file could not be locked for exclusive access by %PRODUCTNAME, due to "
-"missing permission to create a lock file on that file location."
+"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"
 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."
+"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"
+"\n"
+
+#: strings.hrc:38
+msgctxt "STR_ALREADYOPEN_RETRY_SAVE_BTN"
+msgid "~Retry Saving"
+msgstr "~Ceisio Cadw Eto"
 
-#. sqm2R
-#: lockfailed.src
-msgctxt "STR_LOCKFAILED_DONTSHOWAGAIN"
-msgid "~Do not show this message again"
-msgstr "~Peidiwch dangos y neges yma eto"
+#: strings.hrc:39
+msgctxt "STR_ALREADYOPEN_SAVE_BTN"
+msgid "~Save"
+msgstr "~Cadw"
 
-#. nqrvC
-#: nameclashdlg.src
-msgctxt "STR_RENAME_OR_REPLACE"
-msgid ""
-"A file with the name \"%NAME\" already exists in the location \"%FOLDER\".\n"
-"Choose Replace to overwrite the existing file or provide a new name."
-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:41
+msgctxt "RID_KEEP_PASSWORD"
+msgid "~Remember password until end of session"
+msgstr "~Cofio cyfrinair tan ddiwedd y sesiwn"
 
-#. 3bJvA
-#: nameclashdlg.src
-msgctxt "STR_NAME_CLASH_RENAME_ONLY"
-msgid ""
-"A file with the name \"%NAME\" already exists in the location \"%FOLDER\".\n"
-"Please enter a new name."
+#: strings.hrc:42
+msgctxt "RID_SAVE_PASSWORD"
+msgid "~Remember password"
+msgstr "~Cofio cyfrinair"
+
+#: strings.hrc:43
+msgctxt "STR_WARNING_INCOMPLETE_ENCRYPTION_TITLE"
+msgid "Non-Encrypted Streams"
+msgstr "Llif Heb eu Hamgryptio"
+
+#: strings.hrc:45
+msgctxt "STR_LOCKFAILED_TITLE"
+msgid "Document Could Not Be Locked"
+msgstr "Nid Oedd Modd Cloi'r Ddogfen"
+
+#: 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 ""
-"Mae ffeil gyda'r enw \"%NAME\" yn bodoli eisoes yn y lleoliad \"%FOLDER\".\n"
-"Darparwch enw newydd."
 
-#. Bapqc
-#: nameclashdlg.src
-msgctxt "STR_SAME_NAME_USED"
-msgid "Please provide a different file name!"
-msgstr "Darparwch enw ffeil gwahanol!"
+#: strings.hrc:47
+msgctxt "STR_LOCKFAILED_OPENREADONLY_BTN"
+msgid "Open ~Read-Only"
+msgstr ""
 
-#. u5nuY
-#: openlocked.src
+#: strings.hrc:49
 msgctxt "STR_OPENLOCKED_TITLE"
 msgid "Document in Use"
 msgstr "Cronfeydd Data ar waith"
 
-#. WkcaX
-#: openlocked.src
+#: strings.hrc:50
 msgctxt "STR_OPENLOCKED_MSG"
 msgid ""
 "Document file '$(ARG1)' is locked for editing by:\n"
@@ -729,108 +818,50 @@ msgstr ""
 "Agorwch y ddogfen fel darllen yn unig neu agor copi o'r ddogfen i'w golygu.\n"
 "\n"
 
-#. tc7YZ
-#: openlocked.src
+#: strings.hrc:51
 msgctxt "STR_OPENLOCKED_OPENREADONLY_BTN"
 msgid "Open ~Read-Only"
 msgstr "Agor ~Dogfen darllen yn unig"
 
-#. TsA54
-#: openlocked.src
+#: strings.hrc:52
 msgctxt "STR_OPENLOCKED_OPENCOPY_BTN"
 msgid "Open ~Copy"
 msgstr "Agor ~Copi"
 
-#. EXAAf
-#: openlocked.src
+#: strings.hrc:53
 msgctxt "STR_UNKNOWNUSER"
 msgid "Unknown User"
 msgstr "Defnyddiwr Anhysbys"
 
-#. RaCss
-#: passworddlg.src
-msgctxt "STR_ENTER_PASSWORD_TO_OPEN"
-msgid "Enter password to open file: \n"
-msgstr "Rhowch y cyfrinair i agor ffeil: \n"
-
-#. rmDwa
-#: passworddlg.src
-msgctxt "STR_ENTER_PASSWORD_TO_MODIFY"
-msgid "Enter password to modify file: \n"
-msgstr "Rhowch y cyfrinair i newid ffeil: \n"
-
-#. BVofP
-#: passworddlg.src
-msgctxt "STR_ENTER_SIMPLE_PASSWORD"
-msgid "Enter password: "
-msgstr "Rhowch gyfrinair: "
-
-#. UTuR2
-#: passworddlg.src
-msgctxt "STR_CONFIRM_SIMPLE_PASSWORD"
-msgid "Confirm password: "
-msgstr "Cadarnhau'r cyfrinair: "
-
-#. wydLC
-#: passworddlg.src
-msgctxt "STR_TITLE_CREATE_PASSWORD"
-msgid "Set Password"
-msgstr "Gosod Cyfrinair"
-
-#. 8fcsq
-#: passworddlg.src
-msgctxt "STR_TITLE_ENTER_PASSWORD"
-msgid "Enter Password"
-msgstr "Rhowch Gyfrinair"
+#: strings.hrc:55
+msgctxt "STR_FILECHANGED_TITLE"
+msgid "Document Has Been Changed by Others"
+msgstr "Dogfen wedi ei Newid gan Eraill"
 
-#. hggFL
-#: passworddlg.src
-msgctxt "STR_PASSWORD_MISMATCH"
+#: strings.hrc:56
+msgctxt "STR_FILECHANGED_MSG"
 msgid ""
-"The confirmation password did not match the password. Set the password again"
-" by entering the same password in both boxes."
+"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"
 msgstr ""
-"Nid yw'r cyfrinair cadarnhad yn cydweddu a'r cyfrinair. Rhowch y cyfrinair "
-"eto drwy rhoi'r un cyfrinair yn y ddau flwch."
-
-#. BsaWY
-#: passworderrs.src
-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."
-
-#. WQbYF
-#: passworderrs.src
-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."
-
-#. Gq9FJ
-#: passworderrs.src
-msgctxt "STR_ERROR_MASTERPASSWORD_WRONG"
-msgid "The master password is incorrect."
-msgstr "Mae'r prif gyfrinair yn anghywir."
-
-#. pRwHM
-#: passworderrs.src
-msgctxt "STR_ERROR_SIMPLE_PASSWORD_WRONG"
-msgid "The password is incorrect."
-msgstr "Mae'r cyfrinair yn anghywir."
+"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"
 
-#. DwdJn
-#: passworderrs.src
-msgctxt "STR_ERROR_PASSWORDS_NOT_IDENTICAL"
-msgid "The password confirmation does not match."
-msgstr "Nid oedd y cadarnhad cyfrinair yn cydweddu."
+#: strings.hrc:57
+msgctxt "STR_FILECHANGED_SAVEANYWAY_BTN"
+msgid "~Save Anyway"
+msgstr "~Cadw Beth Bynnag"
 
-#. YBz5F
-#: trylater.src
+#: strings.hrc:59
 msgctxt "STR_TRYLATER_TITLE"
 msgid "Document in Use"
 msgstr "Cronfeydd Data ar waith"
 
-#. RJBwE
-#: trylater.src
+#: strings.hrc:60
 msgctxt "STR_TRYLATER_MSG"
 msgid ""
 "Document file '$(ARG1)' is locked for editing by:\n"
@@ -847,305 +878,75 @@ msgstr ""
 "Ceisiwch eto i gadw'r ddogfen neu gadw copi o'r ddogfen.\n"
 "\n"
 
-#. 8JFLZ
-#: trylater.src
+#: strings.hrc:61
 msgctxt "STR_TRYLATER_RETRYSAVING_BTN"
 msgid "~Retry Saving"
 msgstr "~Ceisio Cadw Eto"
 
-#. 6iCzM
-#: trylater.src
+#: strings.hrc:62
 msgctxt "STR_TRYLATER_SAVEAS_BTN"
 msgid "~Save As..."
 msgstr "Cadw ~Fel..."
 
-#. 45x3T
-#: authfallback.ui
-msgctxt "authfallback|AuthFallbackDlg"
-msgid "Authentication Code"
-msgstr "Cod Dilysu"
-
-#. oHHac
-#: authfallback.ui
-msgctxt "authfallback|label1"
-msgid "Enter the 6 digit PIN:"
-msgstr "Rhowch PIN 6 nod:"
-
-#. vkXiS
-#: filterselect.ui
-msgctxt "filterselect|FilterSelectDialog"
-msgid "Filter Selection"
-msgstr "Dewis Hidl"
-
-#. 8o9Bq
-#: logindialog.ui
-msgctxt "logindialog|LoginDialog"
-msgid "Authentication Required"
-msgstr "Mae Angen Dilysiad"
-
-#. SjxPP
-#: logindialog.ui
-msgctxt "logindialog|syscreds"
-msgid "_Use system credentials"
-msgstr "_Defnyddio manylion y system"
-
-#. J7CWF
-#: logindialog.ui
-msgctxt "logindialog|remember"
-msgid "_Remember password"
-msgstr "C_ofio'r cyfrinair"
-
-#. pryAC
-#: logindialog.ui
-msgctxt "logindialog|accountft"
-msgid "A_ccount:"
-msgstr "C_yfrif:"
-
-#. QccHg
-#: logindialog.ui
-msgctxt "logindialog|passwordft"
-msgid "Pass_word:"
-msgstr "Cy_frinair:"
-
-#. NF3CG
-#: logindialog.ui
-msgctxt "logindialog|nameft"
-msgid "_User name:"
-msgstr "_Enw defnyddiwr:"
-
-#. RHVAi
-#: logindialog.ui
-msgctxt "logindialog|pathft"
-msgid "_Path:"
-msgstr "_Llwybr:"
-
-#. MGeqB
-#: logindialog.ui
-msgctxt "logindialog|pathbtn"
-msgid "_Browse…"
-msgstr "_Pori…"
-
-#. mD36F
-#: logindialog.ui
-msgctxt "logindialog|loginrealm"
-msgid ""
-"Enter user name and password for:\n"
-"“%2” on %1"
-msgstr ""
-"Rhoi cyfrinair newydd i ddefnyddiwr:\n"
-"“%2” ar %1"
-
-#. kRDiF
-#: logindialog.ui
-msgctxt "logindialog|wrongloginrealm"
-msgid ""
-"Wrong user name and password for:\n"
-"“%2” on %1"
-msgstr ""
-"Enw defnyddiwr a chyfrinair ar gyfer defnyddiwr:\n"
-"“%2” ar %1"
-
-#. ARsSU
-#: logindialog.ui
-msgctxt "logindialog|wrongrequestinfo"
+#: strings.hrc:64
+msgctxt "STR_RENAME_OR_REPLACE"
 msgid ""
-"Wrong user name and password for:\n"
-"%1"
+"A file with the name \"%NAME\" already exists in the location \"%FOLDER\".\n"
+"Choose Replace to overwrite the existing file or provide a new name."
 msgstr ""
-"Enw defnyddiwr a chyfrinair anghywir ar gyfer:\n"
-"%1"
+"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."
 
-#. WJkga
-#: logindialog.ui
-msgctxt "logindialog|requestinfo"
+#: strings.hrc:65
+msgctxt "STR_NAME_CLASH_RENAME_ONLY"
 msgid ""
-"Enter user name and password for:\n"
-"%1"
+"A file with the name \"%NAME\" already exists in the location \"%FOLDER\".\n"
+"Please enter a new name."
 msgstr ""
-"Rhowch eich enw defnyddiwr a chyfrinair\n"
-"%1"
-
-#. FGAvy
-#: logindialog.ui
-msgctxt "logindialog|errorft"
-msgid "Message from server:"
-msgstr "Neges gan y gweinydd:"
+"Mae ffeil gyda'r enw \"%NAME\" yn bodoli eisoes yn y lleoliad \"%FOLDER\".\n"
+"Darparwch enw newydd."
 
-#. Q7Cb9
-#: macrowarnmedium.ui
-msgctxt "macrowarnmedium|MacroWarnMedium"
-msgid "%PRODUCTNAME - Security Warning"
-msgstr "%PRODUCTNAME - Rhybudd Diogelwch"
+#: strings.hrc:66
+msgctxt "STR_SAME_NAME_USED"
+msgid "Please provide a different file name!"
+msgstr "Darparwch enw ffeil gwahanol!"
 
-#. o4c9e
-#: macrowarnmedium.ui
-msgctxt "macrowarnmedium|ok"
-msgid "_Enable Macros"
-msgstr "_Galluogi Macros"
+#: strings.hrc:68
+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."
 
-#. svTn6
-#: macrowarnmedium.ui
-msgctxt "macrowarnmedium|cancel"
-msgid "_Disable Macros"
-msgstr "_Anablu Macros"
+#: strings.hrc:69
+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."
 
-#. tYAFs
-#: macrowarnmedium.ui
-msgctxt "macrowarnmedium|descr1Label"
-msgid "The document contains document macros signed by:"
-msgstr "Mae'r ddogfen yn cynnwys macros dogfennau llofnodwyd gan:"
+#: strings.hrc:70
+msgctxt "STR_ERROR_MASTERPASSWORD_WRONG"
+msgid "The master password is incorrect."
+msgstr "Mae'r prif gyfrinair yn anghywir."
 
-#. EDTCF
-#: macrowarnmedium.ui
-msgctxt "macrowarnmedium|descr1aLabel"
-msgid "The document contains document macros."
-msgstr "Mae'r ddogfen yn cynnwys macros dogfennau."
+#: strings.hrc:71
+msgctxt "STR_ERROR_SIMPLE_PASSWORD_WRONG"
+msgid "The password is incorrect."
+msgstr "Mae'r cyfrinair yn anghywir."
 
-#. hWGP7
-#: macrowarnmedium.ui
-msgctxt "macrowarnmedium|viewSignsButton"
-msgid "_View Signatures…"
-msgstr "_Gweld Llofnodion…"
+#: strings.hrc:72
+msgctxt "STR_ERROR_PASSWORDS_NOT_IDENTICAL"
+msgid "The password confirmation does not match."
+msgstr "Nid oedd y cadarnhad cyfrinair yn cydweddu."
 
-#. 3q4wC
-#: macrowarnmedium.ui
-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."
+#: strings.hrc:74
+msgctxt "STR_LOCKCORRUPT_TITLE"
+msgid "Lock file is corrupted"
 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."
-
-#. SBMFJ
-#: macrowarnmedium.ui
-msgctxt "macrowarnmedium|alwaysTrustCheckbutton"
-msgid "_Always trust macros from this source"
-msgstr "_Ymddiried mewn macro o fan hyn bob tro"
-
-#. BABeG
-#: masterpassworddlg.ui
-msgctxt "masterpassworddlg|MasterPasswordDialog"
-msgid "Enter Master Password"
-msgstr "Rhowch Brif Gyfrinair"
-
-#. REFvG
-#: masterpassworddlg.ui
-msgctxt "masterpassworddlg|label1"
-msgid "_Enter password:"
-msgstr "_Rhowch gyfrinair:"
-
-#. qAMT2
-#: password.ui
-msgctxt "password|PasswordDialog"
-msgid "Set Password"
-msgstr "Gosod Cyfrinair"
-
-#. ioiyr
-#: setmasterpassworddlg.ui
-msgctxt "setmasterpassworddlg|SetMasterPasswordDialog"
-msgid "Set Master Password"
-msgstr "Gosod Prif Gyfrinair"
 
-#. eBpmB
-#: setmasterpassworddlg.ui
-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."
+#: strings.hrc:75
+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 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."
-
-#. G2dce
-#: setmasterpassworddlg.ui
-msgctxt "setmasterpassworddlg|label2"
-msgid "_Enter password:"
-msgstr "_Rhowch gyfrinair:"
-
-#. yaAhh
-#: setmasterpassworddlg.ui
-msgctxt "setmasterpassworddlg|label3"
-msgid "_Reenter password:"
-msgstr "_Ail rhoi cyfrinair:"
 
-#. aNzdJ
-#: setmasterpassworddlg.ui
-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."
+#: strings.hrc:76
+msgctxt "STR_LOCKCORRUPT_OPENREADONLY_BTN"
+msgid "Open ~Read-Only"
 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."
-
-#. dAeLu
-#: simplenameclash.ui
-msgctxt "simplenameclash|SimpleNameClashDialog"
-msgid "File Exists"
-msgstr "Ffeil yn Bodoli"
-
-#. tCDZh
-#: simplenameclash.ui
-msgctxt "simplenameclash|replace"
-msgid "Replace"
-msgstr "Newid"
-
-#. j4y9t
-#: simplenameclash.ui
-msgctxt "simplenameclash|rename"
-msgid "Rename"
-msgstr "Ailenwi"
-
-#. iX6rE
-#: sslwarndialog.ui
-msgctxt "sslwarndialog|SSLWarnDialog"
-msgid "Security Warning: "
-msgstr "Rhybudd Diogelwch: "
-
-#. e7vJt
-#: sslwarndialog.ui
-msgctxt "sslwarndialog|ok"
-msgid "Continue"
-msgstr "Parhau"
-
-#. e2CMr
-#: sslwarndialog.ui
-msgctxt "sslwarndialog|cancel"
-msgid "Cancel Connection"
-msgstr "Diddymu'r Cysylltiad"
-
-#. jMfYF
-#: sslwarndialog.ui
-msgctxt "sslwarndialog|view"
-msgid "View Certificate"
-msgstr "Darllen y Dystysgrif"
-
-#. rrW2e
-#: unknownauthdialog.ui
-msgctxt "unknownauthdialog|UnknownAuthDialog"
-msgid "Website Certified by an Unknown Authority"
-msgstr "Gwefan wedi ei Dilysu gan Awdurdod Anhysbys"
-
-#. incLD
-#: unknownauthdialog.ui
-msgctxt "unknownauthdialog|accept"
-msgid "Accept this certificate temporarily for this session"
-msgstr "Derbyn y dystysgrif dros dro ar gyfer y sesiwn hon"
-
-#. fGDzR
-#: unknownauthdialog.ui
-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"
-
-#. LWUhA
-#: unknownauthdialog.ui
-msgctxt "unknownauthdialog|examine"
-msgid "Examine Certificate…"
-msgstr "Archwilio'r Dystysgrif…"