initial import of LibreOffice 4.0 translations

Change-Id: I577494b6b4189ed19723af4b5e273ea4da85e708

7 files changed, 4640 insertions, 1067 deletions

diff --git a/source/cy/sfx2/source/appl.po b/source/cy/sfx2/source/appl.po
index fdba8600a89..059fa68f59c 100644
--- a/source/cy/sfx2/source/appl.po
+++ b/source/cy/sfx2/source/appl.po
@@ -1,9 +1,9 @@
-#. extracted from sfx2/source/appl.oo
+#. extracted from sfx2/source/appl
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: http://qa.openoffice.org/issues/enter_bug.cgi?comment=&component=l10n&form_name=enter_issue&short_desc=Localization+issue+in+file%3A+sfx2%2Fsource%2Fappl.oo&subcomponent=ui\n"
-"POT-Creation-Date: 2012-07-04 16:39+0200\n"
+"Report-Msgid-Bugs-To: https://bugs.freedesktop.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
+"POT-Creation-Date: 2012-11-17 19:02+0200\n"
 "PO-Revision-Date: 2012-07-16 22:26+0200\n"
 "Last-Translator: Rhoslyn <rprys@yahoo.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -12,184 +12,775 @@ msgstr ""
 "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: Pootle 2.1.6\n"
+"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
 
-#: dde.src#MD_DDE_LINKEDIT.FT_DDE_APP.fixedtext.text
+#. ?S[_
+#: sfx.src
+msgctxt ""
+"sfx.src\n"
+"STR_ACCTITLE_PRODUCTIVITYTOOLS\n"
+"string.text"
+msgid "%PRODUCTNAME"
+msgstr "Cymorth %PRODUCTNAME"
+
+#. ./?=
+#: sfx.src
+msgctxt ""
+"sfx.src\n"
+"STR_PASSWD_MIN_LEN\n"
+"string.text"
+msgid "(Minimum $(MINLEN) characters)"
+msgstr "(Isafswm $(MINLEN) nod)"
+
+#. _M.Z
+#: sfx.src
+msgctxt ""
+"sfx.src\n"
+"STR_PASSWD_EMPTY\n"
+"string.text"
+msgid "(The password can be empty)"
+msgstr "(Gall y cyfrinair fod yn wag)"
+
+#. Bdj4
+#: sfx.src
+msgctxt ""
+"sfx.src\n"
+"STR_PASSWD\n"
+"string.text"
+msgid "Password"
+msgstr "Cyfrinair"
+
+#. OC#(
+#: newhelp.src
+msgctxt ""
+"newhelp.src\n"
+"WIN_HELPINDEX.TC_INDEX\n"
+"HELP_INDEX_PAGE_CONTENTS\n"
+"pageitem.text"
+msgid "Contents"
+msgstr "Cynnwys"
+
+#. GvM:
+#: newhelp.src
+msgctxt ""
+"newhelp.src\n"
+"WIN_HELPINDEX.TC_INDEX\n"
+"HELP_INDEX_PAGE_INDEX\n"
+"pageitem.text"
+msgid "Index"
+msgstr "Mynegai"
+
+#. Al^a
+#: newhelp.src
+msgctxt ""
+"newhelp.src\n"
+"WIN_HELPINDEX.TC_INDEX\n"
+"HELP_INDEX_PAGE_SEARCH\n"
+"pageitem.text"
+msgid "Find"
+msgstr "Canfod"
+
+#. aF!0
+#: newhelp.src
+msgctxt ""
+"newhelp.src\n"
+"WIN_HELPINDEX.TC_INDEX\n"
+"HELP_INDEX_PAGE_BOOKMARKS\n"
+"pageitem.text"
+msgid "Bookmarks"
+msgstr "Nodau Tudalen"
+
+#. S5Un
+#: newhelp.src
+msgctxt ""
+"newhelp.src\n"
+"TP_HELP_INDEX\n"
+"FT_EXPRESSION\n"
+"fixedtext.text"
+msgid "~Search term"
+msgstr "Chwilio ~term"
+
+#. 74B`
+#: newhelp.src
+msgctxt ""
+"newhelp.src\n"
+"TP_HELP_INDEX\n"
+"PB_OPEN_INDEX\n"
+"pushbutton.text"
+msgid "~Display"
+msgstr "~Dangos"
+
+#. kd*$
+#: newhelp.src
+msgctxt ""
+"newhelp.src\n"
+"TP_HELP_SEARCH\n"
+"FT_SEARCH\n"
+"fixedtext.text"
+msgid "S~earch term"
+msgstr "C~hwilio term"
+
+#. $39^
+#: newhelp.src
+msgctxt ""
+"newhelp.src\n"
+"TP_HELP_SEARCH\n"
+"PB_SEARCH\n"
+"pushbutton.text"
+msgid "~Find"
+msgstr "~Chwilio"
+
+#. 0l+K
+#: newhelp.src
+msgctxt ""
+"newhelp.src\n"
+"TP_HELP_SEARCH\n"
+"CB_FULLWORDS\n"
+"checkbox.text"
+msgid "~Complete words only"
+msgstr "~Geiriau cyfan yn unig"
+
+#. zpb[
+#: newhelp.src
+msgctxt ""
+"newhelp.src\n"
+"TP_HELP_SEARCH\n"
+"CB_SCOPE\n"
+"checkbox.text"
+msgid "Find in ~headings only"
+msgstr "C~anfod mewn penawdau'n unig"
+
+#. xwLh
+#: newhelp.src
+msgctxt ""
+"newhelp.src\n"
+"TP_HELP_SEARCH\n"
+"PB_OPEN_SEARCH\n"
+"pushbutton.text"
+msgid "~Display"
+msgstr "~Dangos"
+
+#. S\Dl
+#: newhelp.src
+msgctxt ""
+"newhelp.src\n"
+"TP_HELP_BOOKMARKS\n"
+"FT_BOOKMARKS\n"
+"fixedtext.text"
+msgid "~Bookmarks"
+msgstr "~Nodau Tudalen"
+
+#. }H!P
+#: newhelp.src
+msgctxt ""
+"newhelp.src\n"
+"TP_HELP_BOOKMARKS\n"
+"PB_BOOKMARKS\n"
+"pushbutton.text"
+msgid "~Display"
+msgstr "~Dangos"
+
+#. k6EB
+#: newhelp.src
+msgctxt ""
+"newhelp.src\n"
+"STR_HELP_WINDOW_TITLE\n"
+"string.text"
+msgid "%PRODUCTNAME Help"
+msgstr "Cymorth %PRODUCTNAME"
+
+#. qE?h
+#: newhelp.src
+msgctxt ""
+"newhelp.src\n"
+"STR_HELP_BUTTON_INDEX_ON\n"
+"string.text"
+msgid "Show Navigation Pane"
+msgstr "Dangos Paen Dewisydd"
+
+#. B8]-
+#: newhelp.src
+msgctxt ""
+"newhelp.src\n"
+"STR_HELP_BUTTON_INDEX_OFF\n"
+"string.text"
+msgid "Hide Navigation Pane"
+msgstr "Cuddio Paen Dewis"
+
+#. 85{D
+#: newhelp.src
+msgctxt ""
+"newhelp.src\n"
+"STR_HELP_BUTTON_START\n"
+"string.text"
+msgid "First Page"
+msgstr "Tudalen Gyntaf"
+
+#. +t-`
+#: newhelp.src
+msgctxt ""
+"newhelp.src\n"
+"STR_HELP_BUTTON_PREV\n"
+"string.text"
+msgid "Previous Page"
+msgstr "Tudalen Flaenorol"
+
+#. +k6(
+#: newhelp.src
+msgctxt ""
+"newhelp.src\n"
+"STR_HELP_BUTTON_NEXT\n"
+"string.text"
+msgid "Next Page"
+msgstr "Tudalen Nesaf"
+
+#. *B!a
+#: newhelp.src
+msgctxt ""
+"newhelp.src\n"
+"STR_HELP_BUTTON_PRINT\n"
+"string.text"
+msgid "Print..."
+msgstr "Argraffu..."
+
+#. {0~i
+#: newhelp.src
+msgctxt ""
+"newhelp.src\n"
+"STR_HELP_BUTTON_ADDBOOKMARK\n"
+"string.text"
+msgid "Add to Bookmarks..."
+msgstr "Ychwanegu i Nodau Tudalen..."
+
+#. `am9
+#: newhelp.src
+msgctxt ""
+"newhelp.src\n"
+"STR_HELP_BUTTON_SEARCHDIALOG\n"
+"string.text"
+msgid "Find on this Page..."
+msgstr "Canfod ar y Dudalen..."
+
+#. GsSD
+#: newhelp.src
+msgctxt ""
+"newhelp.src\n"
+"STR_HELP_BUTTON_SOURCEVIEW\n"
+"string.text"
+msgid "HTML Source"
+msgstr "Ffynhonnell HTML"
+
+#. abj5
+#: newhelp.src
+msgctxt ""
+"newhelp.src\n"
+"STR_HELP_FIRST_MESSAGE\n"
+"string.text"
+msgid "The Help is being started..."
+msgstr "Yn cychwyn Cymorth..."
+
+#. `-nL
+#: newhelp.src
+msgctxt ""
+"newhelp.src\n"
+"STR_HELP_MENU_TEXT_SELECTION_MODE\n"
+"string.text"
+msgid "Select Text"
+msgstr "Dewis Testun"
+
+#. RSF0
+#: newhelp.src
+msgctxt ""
+"newhelp.src\n"
+"STR_HELP_MENU_TEXT_COPY\n"
+"string.text"
+msgid "~Copy"
+msgstr "~Copïo"
+
+#. )o9#
+#: newhelp.src
+msgctxt ""
+"newhelp.src\n"
+"DLG_HELP_ADDBOOKMARK\n"
+"FT_BOOKMARK_TITLE\n"
+"fixedtext.text"
+msgid "Bookmark:"
+msgstr "Nod Tudalen:"
+
+#. 5@b-
+#: newhelp.src
+msgctxt ""
+"newhelp.src\n"
+"DLG_HELP_ADDBOOKMARK\n"
+"STR_BOOKMARK_RENAME\n"
+"string.text"
+msgid "Rename Bookmark"
+msgstr "Ailenwi Nod Tudalen"
+
+#. ^UUk
+#: newhelp.src
+msgctxt ""
+"newhelp.src\n"
+"DLG_HELP_ADDBOOKMARK\n"
+"modaldialog.text"
+msgid "Add to Bookmarks"
+msgstr "Ychwanegu i Nodau Tudalen"
+
+#. hDTg
+#: newhelp.src
+msgctxt ""
+"newhelp.src\n"
+"MENU_HELP_BOOKMARKS\n"
+"MID_OPEN\n"
+"menuitem.text"
+msgid "Display"
+msgstr "Dangos"
+
+#. p_`s
+#: newhelp.src
+msgctxt ""
+"newhelp.src\n"
+"MENU_HELP_BOOKMARKS\n"
+"MID_RENAME\n"
+"menuitem.text"
+msgid "Rename..."
+msgstr "Ailenwi..."
+
+#. wGrI
+#: newhelp.src
+msgctxt ""
+"newhelp.src\n"
+"MENU_HELP_BOOKMARKS\n"
+"MID_DELETE\n"
+"menuitem.text"
+msgid "Delete"
+msgstr "Dileu"
+
+#. m~Zx
+#: newhelp.src
+msgctxt ""
+"newhelp.src\n"
+"RID_INFO_NOSEARCHRESULTS\n"
+"infobox.text"
+msgid "No topics found."
+msgstr "Heb ganfod pynciau."
+
+#. cWqo
+#: newhelp.src
+msgctxt ""
+"newhelp.src\n"
+"RID_INFO_NOSEARCHTEXTFOUND\n"
+"infobox.text"
+msgid "The text you entered was not found."
+msgstr "Nid rhestr elfennau'r testun rhoddwyd gennych."
+
+#. zJe$
+#: newhelp.src
+msgctxt ""
+"newhelp.src\n"
+"RID_HELP_ONSTARTUP_TEXT\n"
+"string.text"
+msgid "~Display %PRODUCTNAME %MODULENAME Help at Startup"
+msgstr "~Dangos Cymorth %PRODUCTNAME %MODULENAME wrth Gychwyn"
+
+#. ZtKi
+#: dde.src
+msgctxt ""
+"dde.src\n"
+"MD_DDE_LINKEDIT\n"
+"FT_DDE_APP\n"
+"fixedtext.text"
 msgid "~Application:"
 msgstr "~Rhaglen:"
 
-#: dde.src#MD_DDE_LINKEDIT.FT_DDE_TOPIC.fixedtext.text
+#. _Rf8
+#: dde.src
+msgctxt ""
+"dde.src\n"
+"MD_DDE_LINKEDIT\n"
+"FT_DDE_TOPIC\n"
+"fixedtext.text"
 msgid "~File:"
 msgstr "~Ffeil:"
 
-#: dde.src#MD_DDE_LINKEDIT.FT_DDE_ITEM.fixedtext.text
+#. g0@Z
+#: dde.src
+msgctxt ""
+"dde.src\n"
+"MD_DDE_LINKEDIT\n"
+"FT_DDE_ITEM\n"
+"fixedtext.text"
 msgid "~Category:"
 msgstr "~Categori:"
 
-#: dde.src#MD_DDE_LINKEDIT.GROUP_DDE_CHG.fixedline.text
+#. /FDH
+#: dde.src
+msgctxt ""
+"dde.src\n"
+"MD_DDE_LINKEDIT\n"
+"GROUP_DDE_CHG\n"
+"fixedline.text"
 msgid "Modify link"
 msgstr "Newid cyswllt"
 
-#: dde.src#MD_DDE_LINKEDIT.modaldialog.text
+#. KCm@
+#: dde.src
+msgctxt ""
+"dde.src\n"
+"MD_DDE_LINKEDIT\n"
+"modaldialog.text"
 msgid "Modify Link"
 msgstr "Newid Cyswllt"
 
-#: app.src#STR_NONAME.string.text
+#. fB`!
+#: app.src
+msgctxt ""
+"app.src\n"
+"STR_NONAME\n"
+"string.text"
 msgid "Untitled"
 msgstr "Dideitl"
 
-#: app.src#STR_CLOSE.string.text
+#. 8K[Z
+#: app.src
+msgctxt ""
+"app.src\n"
+"STR_CLOSE\n"
+"string.text"
 msgid "Close"
 msgstr "Cau"
 
-#: app.src#STR_STYLE_FILTER_AUTO.string.text
+#. M;jb
+#: app.src
+msgctxt ""
+"app.src\n"
+"STR_STYLE_FILTER_AUTO\n"
+"string.text"
 msgid "Automatic"
 msgstr "Awtomatig"
 
-#: app.src#STR_STANDARD_SHORTCUT.string.text
-msgctxt "app.src#STR_STANDARD_SHORTCUT.string.text"
+#. MbT$
+#: app.src
+msgctxt ""
+"app.src\n"
+"STR_STANDARD_SHORTCUT\n"
+"string.text"
 msgid "Standard"
 msgstr "Safonol"
 
-#: app.src#STR_BYTES.string.text
+#. Bz)a
+#: app.src
+msgctxt ""
+"app.src\n"
+"STR_BYTES\n"
+"string.text"
 msgid "Bytes"
 msgstr "Beitiau"
 
-#: app.src#STR_KB.string.text
+#. G1d+
+#: app.src
+msgctxt ""
+"app.src\n"
+"STR_KB\n"
+"string.text"
 msgid "KB"
 msgstr "KB"
 
-#: app.src#STR_MB.string.text
+#. i=%.
+#: app.src
+msgctxt ""
+"app.src\n"
+"STR_MB\n"
+"string.text"
 msgid "MB"
 msgstr "MB"
 
-#: app.src#STR_GB.string.text
+#. YI!!
+#: app.src
+msgctxt ""
+"app.src\n"
+"STR_GB\n"
+"string.text"
 msgid "GB"
 msgstr "GB"
 
-#: app.src#MSG_QUERY_LASTVERSION.querybox.text
+#. Fpa\
+#: app.src
+msgctxt ""
+"app.src\n"
+"MSG_QUERY_LASTVERSION\n"
+"querybox.text"
 msgid "Cancel all changes?"
 msgstr "Diddymu pob newid?"
 
-#: app.src#RID_DOCALREADYLOADED_DLG.infobox.text
+#. L!Ry
+#: app.src
+msgctxt ""
+"app.src\n"
+"RID_DOCALREADYLOADED_DLG\n"
+"infobox.text"
 msgid "Document already open."
 msgstr "Dogfen eisoes ar agor."
 
-#: app.src#MSG_ERR_NO_WEBBROWSER_FOUND.errorbox.text
+#. $lsM
+#: app.src
+msgctxt ""
+"app.src\n"
+"MSG_ERR_NO_WEBBROWSER_FOUND\n"
+"errorbox.text"
 msgid "%PRODUCTNAME could not find a web browser on your system. Please check your Desktop Preferences or install a web browser (for example, Mozilla) in the default  location requested during the browser installation."
 msgstr "Nid yw %PRODUCTNAME yn gallu canfod porwr ee ar eich system. Gwiriwch eich Dewisiadau Bwrdd Gwaith neu gosodwch borwr gwe (ee, Firefox) yn y man rhagosodedig  nodwyd wrth osod porwr."
 
-#: app.src#MSG_ERR_NO_ABS_URI_REF.errorbox.text
+#. B_`l
+#: app.src
+msgctxt ""
+"app.src\n"
+"MSG_ERR_NO_ABS_URI_REF\n"
+"errorbox.text"
 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."
 
-#: app.src#GID_INTERN.string.text
+#. ``:#
+#: app.src
+msgctxt ""
+"app.src\n"
+"GID_INTERN\n"
+"string.text"
 msgid "Internal"
 msgstr "Mewnol"
 
-#: app.src#GID_APPLICATION.string.text
+#. _u\1
+#: app.src
+msgctxt ""
+"app.src\n"
+"GID_APPLICATION\n"
+"string.text"
 msgid "Application"
 msgstr "Rhaglen"
 
-#: app.src#GID_VIEW.string.text
+#. *d0_
+#: app.src
+msgctxt ""
+"app.src\n"
+"GID_VIEW\n"
+"string.text"
 msgid "View"
 msgstr "Golwg"
 
-#: app.src#GID_DOCUMENT.string.text
+#. ,3M`
+#: app.src
+msgctxt ""
+"app.src\n"
+"GID_DOCUMENT\n"
+"string.text"
 msgid "Documents"
 msgstr "Dogfennau"
 
-#: app.src#GID_EDIT.string.text
+#. ?EWN
+#: app.src
+msgctxt ""
+"app.src\n"
+"GID_EDIT\n"
+"string.text"
 msgid "Edit"
 msgstr "Golygu"
 
-#: app.src#GID_MACRO.string.text
+#. a.v^
+#: app.src
+msgctxt ""
+"app.src\n"
+"GID_MACRO\n"
+"string.text"
 msgid "BASIC"
 msgstr "BASIC"
 
-#: app.src#GID_OPTIONS.string.text
+#. BREc
+#: app.src
+msgctxt ""
+"app.src\n"
+"GID_OPTIONS\n"
+"string.text"
 msgid "Options"
 msgstr "Dewisiadau"
 
-#: app.src#GID_MATH.string.text
+#. fXU2
+#: app.src
+msgctxt ""
+"app.src\n"
+"GID_MATH\n"
+"string.text"
 msgid "Math"
 msgstr "Math"
 
-#: app.src#GID_NAVIGATOR.string.text
+#. nmb_
+#: app.src
+msgctxt ""
+"app.src\n"
+"GID_NAVIGATOR\n"
+"string.text"
 msgid "Navigate"
 msgstr "Llywio"
 
-#: app.src#GID_INSERT.string.text
+#. _F)T
+#: app.src
+msgctxt ""
+"app.src\n"
+"GID_INSERT\n"
+"string.text"
 msgid "Insert"
 msgstr "Mewnosod"
 
-#: app.src#GID_FORMAT.string.text
+#. Rs6V
+#: app.src
+msgctxt ""
+"app.src\n"
+"GID_FORMAT\n"
+"string.text"
 msgid "Format"
 msgstr "Fformat"
 
-#: app.src#GID_TEMPLATE.string.text
+#. [Bbo
+#: app.src
+msgctxt ""
+"app.src\n"
+"GID_TEMPLATE\n"
+"string.text"
 msgid "Templates"
 msgstr "Templedi"
 
-#: app.src#GID_TEXT.string.text
+#. 8xcg
+#: app.src
+msgctxt ""
+"app.src\n"
+"GID_TEXT\n"
+"string.text"
 msgid "Text"
 msgstr "Testun"
 
-#: app.src#GID_FRAME.string.text
+#. u47,
+#: app.src
+msgctxt ""
+"app.src\n"
+"GID_FRAME\n"
+"string.text"
 msgid "Frame"
 msgstr "Ffrâm"
 
-#: app.src#GID_GRAPHIC.string.text
-msgctxt "app.src#GID_GRAPHIC.string.text"
+#. so}2
+#: app.src
+msgctxt ""
+"app.src\n"
+"GID_GRAPHIC\n"
+"string.text"
 msgid "Graphic"
 msgstr "Graffig"
 
-#: app.src#GID_TABLE.string.text
+#. e|H\
+#: app.src
+msgctxt ""
+"app.src\n"
+"GID_TABLE\n"
+"string.text"
 msgid "Table"
 msgstr "Tabl"
 
-#: app.src#GID_ENUMERATION.string.text
+#. aJd@
+#: app.src
+msgctxt ""
+"app.src\n"
+"GID_ENUMERATION\n"
+"string.text"
 msgid "Numbering"
 msgstr "Rhifo"
 
-#: app.src#GID_DATA.string.text
+#. iye`
+#: app.src
+msgctxt ""
+"app.src\n"
+"GID_DATA\n"
+"string.text"
 msgid "Data"
 msgstr "Data"
 
-#: app.src#GID_SPECIAL.string.text
+#. Y-Dc
+#: app.src
+msgctxt ""
+"app.src\n"
+"GID_SPECIAL\n"
+"string.text"
 msgid "Special Functions"
 msgstr "Swyddogaethau Arbennig"
 
-#: app.src#GID_IMAGE.string.text
+#. Q/u7
+#: app.src
+msgctxt ""
+"app.src\n"
+"GID_IMAGE\n"
+"string.text"
 msgid "Image"
 msgstr "Delwedd"
 
-#: app.src#GID_CHART.string.text
+#. !K=,
+#: app.src
+msgctxt ""
+"app.src\n"
+"GID_CHART\n"
+"string.text"
 msgid "Chart"
 msgstr "Siart"
 
-#: app.src#GID_EXPLORER.string.text
+#. !CA4
+#: app.src
+msgctxt ""
+"app.src\n"
+"GID_EXPLORER\n"
+"string.text"
 msgid "Explorer"
 msgstr "Explorer"
 
-#: app.src#GID_CONNECTOR.string.text
+#. U];3
+#: app.src
+msgctxt ""
+"app.src\n"
+"GID_CONNECTOR\n"
+"string.text"
 msgid "Connector"
 msgstr "Cysylltydd"
 
-#: app.src#GID_MODIFY.string.text
+#. WfQY
+#: app.src
+msgctxt ""
+"app.src\n"
+"GID_MODIFY\n"
+"string.text"
 msgid "Modify"
 msgstr "Newid"
 
-#: app.src#GID_DRAWING.string.text
+#. rUz\
+#: app.src
+msgctxt ""
+"app.src\n"
+"GID_DRAWING\n"
+"string.text"
 msgid "Drawing"
 msgstr "Lluniadu"
 
-#: app.src#GID_CONTROLS.string.text
+#. N\/0
+#: app.src
+msgctxt ""
+"app.src\n"
+"GID_CONTROLS\n"
+"string.text"
 msgid "Controls"
 msgstr "Rheolydd"
 
-#: app.src#MSG_CANT_QUIT.infobox.text
+#. 0huB
+#: app.src
+msgctxt ""
+"app.src\n"
+"MSG_CANT_QUIT\n"
+"infobox.text"
 msgid ""
 "The application cannot be terminated at the moment.\n"
 "Please wait until all print jobs and/or\n"
@@ -199,35 +790,76 @@ msgstr ""
 "Arhoswch nes bod pob gwaith argraffu a/neu \n"
 "weithredoedd OLE wedi gorffen a chau pob deialog."
 
-#: app.src#STR_ISMODIFIED.string.text
+#. =!S1
+#: app.src
+msgctxt ""
+"app.src\n"
+"STR_ISMODIFIED\n"
+"string.text"
 msgid "Do you want to save the changes to %1?"
 msgstr "Hoffech chi gadw'r newidiadau i %1?"
 
-#: app.src#STR_QUITAPP.string.text
-msgid "E~xit"
-msgstr "~Gadael"
-
-#: app.src#RID_STR_HELP.string.text
+#. Yi$R
+#: app.src
+#, fuzzy
+msgctxt ""
+"app.src\n"
+"STR_QUITAPP\n"
+"string.text"
+msgid "E~xit %PRODUCTNAME"
+msgstr "Gadael %PRODUCTNAME"
+
+#. %{;B
+#: app.src
+msgctxt ""
+"app.src\n"
+"RID_STR_HELP\n"
+"string.text"
 msgid "Help"
 msgstr "Cymorth"
 
-#: app.src#RID_STR_NOAUTOSTARTHELPAGENT.string.text
+#. #CS~
+#: app.src
+msgctxt ""
+"app.src\n"
+"RID_STR_NOAUTOSTARTHELPAGENT\n"
+"string.text"
 msgid "No automatic start at 'XX'"
 msgstr "Dim cychwyn awtomatig yn 'XX'"
 
-#: app.src#RID_HELPBAR.string.text
+#. 6mWb
+#: app.src
+msgctxt ""
+"app.src\n"
+"RID_HELPBAR\n"
+"string.text"
 msgid "Help Bar"
 msgstr "Bar Cymorth"
 
-#: app.src#RID_STR_HLPFILENOTEXIST.string.text
+#. U\rC
+#: app.src
+msgctxt ""
+"app.src\n"
+"RID_STR_HLPFILENOTEXIST\n"
+"string.text"
 msgid "The help file for this topic is not installed."
 msgstr "Nid yw'r ffeil cymorth ar gyfer y pwnc wedi ei osod."
 
-#: app.src#RID_ENVTOOLBOX.string.text
+#. U0DY
+#: app.src
+msgctxt ""
+"app.src\n"
+"RID_ENVTOOLBOX\n"
+"string.text"
 msgid "Function Bar"
 msgstr "Bar Swyddogaeth"
 
-#: app.src#RID_SPECIALCONFIG_ERROR.string.text
+#. ![=i
+#: app.src
+msgctxt ""
+"app.src\n"
+"RID_SPECIALCONFIG_ERROR\n"
+"string.text"
 msgid ""
 "An error has occurred in the special configuration.\n"
 "Please contact your administrator."
@@ -235,47 +867,102 @@ msgstr ""
 "Digwyddodd gwall yn y ffurfweddiad arbennig.\n"
 "Cysylltwch â'ch gweinyddwr."
 
-#: app.src#STR_QUICKSTART_EXIT.string.text
+#. im:R
+#: app.src
+msgctxt ""
+"app.src\n"
+"STR_QUICKSTART_EXIT\n"
+"string.text"
 msgid "Exit Quickstarter"
 msgstr "Gadael Cychwyn Cyflym"
 
-#: app.src#STR_QUICKSTART_TIP.string.text
+#. Vs[P
+#: app.src
+msgctxt ""
+"app.src\n"
+"STR_QUICKSTART_TIP\n"
+"string.text"
 msgid "%PRODUCTNAME %PRODUCTVERSION Quickstarter"
 msgstr "Cychwyn Cyflym %PRODUCTNAME %PRODUCTVERSION"
 
-#: app.src#STR_QUICKSTART_FILEOPEN.string.text
+#. KO-Y
+#: app.src
+msgctxt ""
+"app.src\n"
+"STR_QUICKSTART_FILEOPEN\n"
+"string.text"
 msgid "Open Document..."
 msgstr "Agor Dogfen..."
 
-#: app.src#STR_QUICKSTART_FROMTEMPLATE.string.text
+#. h@h2
+#: app.src
+msgctxt ""
+"app.src\n"
+"STR_QUICKSTART_FROMTEMPLATE\n"
+"string.text"
 msgid "From Template..."
 msgstr "O Dempled..."
 
-#: app.src#STR_QUICKSTART_PRELAUNCH.string.text
+#. 9m_X
+#: app.src
+msgctxt ""
+"app.src\n"
+"STR_QUICKSTART_PRELAUNCH\n"
+"string.text"
 msgid "Load %PRODUCTNAME During System Start-Up"
 msgstr "Llwytho %PRODUCTNAME Wrth Gychwyn y System"
 
-#: app.src#STR_QUICKSTART_PRELAUNCH_UNX.string.text
+#. C0X7
+#: app.src
+msgctxt ""
+"app.src\n"
+"STR_QUICKSTART_PRELAUNCH_UNX\n"
+"string.text"
 msgid "Disable systray Quickstarter"
 msgstr "Atal Cychwyn Cyflym systray"
 
-#: app.src#STR_QUICKSTART_LNKNAME.string.text
+#. ?k6o
+#: app.src
+msgctxt ""
+"app.src\n"
+"STR_QUICKSTART_LNKNAME\n"
+"string.text"
 msgid "%PRODUCTNAME %PRODUCTVERSION"
 msgstr "%PRODUCTNAME %PRODUCTVERSION"
 
-#: app.src#STR_QUICKSTART_FILE.string.text
+#. Bf_*
+#: app.src
+msgctxt ""
+"app.src\n"
+"STR_QUICKSTART_FILE\n"
+"string.text"
 msgid "File"
 msgstr "Ffeil"
 
-#: app.src#STR_QUICKSTART_STARTCENTER.string.text
+#. .YXx
+#: app.src
+msgctxt ""
+"app.src\n"
+"STR_QUICKSTART_STARTCENTER\n"
+"string.text"
 msgid "Startcenter"
 msgstr "CanolfanCychwyn"
 
-#: app.src#STR_QUICKSTART_RECENTDOC.string.text
+#. mS7l
+#: app.src
+msgctxt ""
+"app.src\n"
+"STR_QUICKSTART_RECENTDOC\n"
+"string.text"
 msgid "Recent Documents"
 msgstr "Dogfennau Diweddar"
 
-#: app.src#STR_QUERY_UPDATE_LINKS.string.text
+#. 06Sj
+#: app.src
+msgctxt ""
+"app.src\n"
+"STR_QUERY_UPDATE_LINKS\n"
+"string.text"
 msgid ""
 "This document contains one or more links to external data.\n"
 "\n"
@@ -287,15 +974,30 @@ msgstr ""
 "Hoffech chi newid y ddogfen, a diweddaru pob dolen\n"
 "i estyn y data mwyaf diweddar?"
 
-#: app.src#STR_DDE_ERROR.string.text
+#. i8iW
+#: app.src
+msgctxt ""
+"app.src\n"
+"STR_DDE_ERROR\n"
+"string.text"
 msgid "DDE link to % for % area % are not available."
 msgstr "Nid yw'r cyswllt DDE i % ar gyfer % ardal % ar gael."
 
-#: app.src#RID_SECURITY_WARNING_HYPERLINK.warningbox.text
+#. l@25
+#: app.src
+msgctxt ""
+"app.src\n"
+"RID_SECURITY_WARNING_HYPERLINK\n"
+"warningbox.text"
 msgid "This hyperlink is going to open \"%s\". Do you want to proceed?"
 msgstr "Bydd yr hypergyswllt yn agor \"%s\". Parhau?"
 
-#: app.src#RID_SECURITY_WARNING_NO_HYPERLINKS.warningbox.text
+#. AQDY
+#: app.src
+msgctxt ""
+"app.src\n"
+"RID_SECURITY_WARNING_NO_HYPERLINKS\n"
+"warningbox.text"
 msgid ""
 "For security reasons, the hyperlink cannot be executed.\n"
 "The stated address will not be opened."
@@ -303,11 +1005,21 @@ msgstr ""
 "Am resymau diogelwch, nid oes modd gweithredu'r hypergyswllt.\n"
 "Ni fydd y cyfeiriad hwn yn cael ei agor."
 
-#: app.src#RID_SECURITY_WARNING_TITLE.string.text
+#. hL\J
+#: app.src
+msgctxt ""
+"app.src\n"
+"RID_SECURITY_WARNING_TITLE\n"
+"string.text"
 msgid "Security Warning"
 msgstr "Rhybudd Diogelwch"
 
-#: app.src#RID_XMLSEC_QUERY_LOSINGSIGNATURE.querybox.text
+#. w7P?
+#: app.src
+msgctxt ""
+"app.src\n"
+"RID_XMLSEC_QUERY_LOSINGSIGNATURE\n"
+"querybox.text"
 msgid ""
 "Saving will remove all existing signatures.\n"
 "Do you want to continue saving the document?"
@@ -315,7 +1027,12 @@ msgstr ""
 "Bydd cadw yn tynnu'r holl lofnodion presennol.\n"
 "Ydych am barhau i gadw'r ddogfen?"
 
-#: app.src#RID_XMLSEC_QUERY_SAVEBEFORESIGN.querybox.text
+#. @\]B
+#: app.src
+msgctxt ""
+"app.src\n"
+"RID_XMLSEC_QUERY_SAVEBEFORESIGN\n"
+"querybox.text"
 msgid ""
 "The document has to be saved before it can be signed.\n"
 "Do you want to save the document?"
@@ -323,41 +1040,95 @@ msgstr ""
 "Rhaid cadw'r ddogfen cyn ei llofnodi.\n"
 "Hoffech chi gadw'r ddogfen?"
 
-#: app.src#RID_XMLSEC_INFO_WRONGDOCFORMAT.infobox.text
+#. h1y.
+#: app.src
+msgctxt ""
+"app.src\n"
+"RID_QUERY_CANCELCHECKOUT\n"
+"querybox.text"
+msgid ""
+"This will discard all changes on the server since check-out.\n"
+"Do you want to proceed?"
+msgstr ""
+
+#. ;;p%
+#: app.src
+msgctxt ""
+"app.src\n"
+"RID_XMLSEC_INFO_WRONGDOCFORMAT\n"
+"infobox.text"
 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."
 
-#: app.src#RID_XMLSEC_DOCUMENTSIGNED.string.text
+#. .z!6
+#: app.src
+msgctxt ""
+"app.src\n"
+"RID_XMLSEC_DOCUMENTSIGNED\n"
+"string.text"
 msgid " (Signed)"
 msgstr " (Llofnodwyd)"
 
-#: app.src#STR_STANDARD.string.text
-msgctxt "app.src#STR_STANDARD.string.text"
+#. ,8ST
+#: app.src
+msgctxt ""
+"app.src\n"
+"STR_STANDARD\n"
+"string.text"
 msgid "Standard"
 msgstr "Safonol"
 
-#: app.src#RID_SVXSTR_FILELINK.string.text
+#. eh*?
+#: app.src
+msgctxt ""
+"app.src\n"
+"RID_SVXSTR_FILELINK\n"
+"string.text"
 msgid "Document"
 msgstr "Dogfen"
 
-#: app.src#STR_NONE.string.text
+#. %9cF
+#: app.src
+msgctxt ""
+"app.src\n"
+"STR_NONE\n"
+"string.text"
 msgid "- None -"
 msgstr "- Dim -"
 
-#: app.src#RID_SVXSTR_GRAFIKLINK.string.text
-msgctxt "app.src#RID_SVXSTR_GRAFIKLINK.string.text"
+#. Nk-O
+#: app.src
+msgctxt ""
+"app.src\n"
+"RID_SVXSTR_GRAFIKLINK\n"
+"string.text"
 msgid "Graphic"
 msgstr "Graffig"
 
-#: app.src#STR_SFX_FILTERNAME_ALL.string.text
+#. 95g=
+#: app.src
+msgctxt ""
+"app.src\n"
+"STR_SFX_FILTERNAME_ALL\n"
+"string.text"
 msgid "All files"
 msgstr "Pob ffeil"
 
-#: app.src#RID_SVXSTR_EDITGRFLINK.string.text
+#. Heok
+#: app.src
+msgctxt ""
+"app.src\n"
+"RID_SVXSTR_EDITGRFLINK\n"
+"string.text"
 msgid "Link graphics"
 msgstr "Graffigau cyswllt"
 
-#: app.src#STR_ERRUNOEVENTBINDUNG.string.text
+#. QE@|
+#: app.src
+msgctxt ""
+"app.src\n"
+"STR_ERRUNOEVENTBINDUNG\n"
+"string.text"
 msgid ""
 "An appropriate component method %1\n"
 "could not be found.\n"
@@ -369,31 +1140,67 @@ msgstr ""
 "\n"
 "Gwiriwch sillafu enw'r dull."
 
-#: app.src#RID_SVXSTR_GRFILTER_OPENERROR.string.text
+#. q+:6
+#: app.src
+msgctxt ""
+"app.src\n"
+"RID_SVXSTR_GRFILTER_OPENERROR\n"
+"string.text"
 msgid "Graphics file cannot be opened"
 msgstr "Methu agor ffeil graffigau"
 
-#: app.src#RID_SVXSTR_GRFILTER_IOERROR.string.text
+#. p[:O
+#: app.src
+msgctxt ""
+"app.src\n"
+"RID_SVXSTR_GRFILTER_IOERROR\n"
+"string.text"
 msgid "Graphics file cannot be read"
 msgstr "Methu darllen ffeil graffigau"
 
-#: app.src#RID_SVXSTR_GRFILTER_FORMATERROR.string.text
+#. 21g,
+#: app.src
+msgctxt ""
+"app.src\n"
+"RID_SVXSTR_GRFILTER_FORMATERROR\n"
+"string.text"
 msgid "Unknown graphics format"
 msgstr "Fformat graffigau anhysbys"
 
-#: app.src#RID_SVXSTR_GRFILTER_VERSIONERROR.string.text
+#. ^GAL
+#: app.src
+msgctxt ""
+"app.src\n"
+"RID_SVXSTR_GRFILTER_VERSIONERROR\n"
+"string.text"
 msgid "This version of the graphics file is not supported"
 msgstr "Nid yw'r fersiwn ffeil graffig hwn yn cael ei gynnal"
 
-#: app.src#RID_SVXSTR_GRFILTER_FILTERERROR.string.text
+#. ^Z@Y
+#: app.src
+msgctxt ""
+"app.src\n"
+"RID_SVXSTR_GRFILTER_FILTERERROR\n"
+"string.text"
 msgid "Graphics filter not found"
 msgstr "Methu canfod hidl graffig"
 
-#: app.src#RID_SVXSTR_GRFILTER_TOOBIG.string.text
+#. ,pyg
+#: app.src
+msgctxt ""
+"app.src\n"
+"RID_SVXSTR_GRFILTER_TOOBIG\n"
+"string.text"
 msgid "Not enough memory to insert graphic"
 msgstr "Dim digon o gof i fewnosod graffig"
 
-#: app.src#DLG_HELP_LICENSING.STR_LICENSING_INFORMATION_1.string.text
+#. Rw6E
+#: app.src
+msgctxt ""
+"app.src\n"
+"DLG_HELP_LICENSING\n"
+"STR_LICENSING_INFORMATION_1\n"
+"string.text"
 msgid ""
 "%PRODUCTNAME is made available subject to the terms of GNU Lesser General Public\n"
 "License Version 3. A copy of the LGPL license can be found at\n"
@@ -403,17 +1210,30 @@ msgstr ""
 "License Version 3. Mae modd gweld copi o'r drwydded LGPL yn\n"
 "http://www.gnu.org/licenses/lgpl-3.0.html"
 
-#: app.src#DLG_HELP_LICENSING.STR_LICENSING_INFORMATION_2.string.text
+#. x4R#
+#: app.src
+#, fuzzy
+msgctxt ""
+"app.src\n"
+"DLG_HELP_LICENSING\n"
+"STR_LICENSING_INFORMATION_2\n"
+"string.text"
 msgid ""
 "Third Party Code Additional copyright notices and license terms applicable to\n"
-"portions of the Software are set forth in the THIRDPARTYLICENSEREADME.html\n"
+"portions of the Software are set forth in the LICENSE.html\n"
 "file; choose Show License to see exact details in English."
 msgstr ""
 "Cod Trydydd Parti Mae hysbysiadau hawlfraint côd ychwanegol a thelerau trwydded berthnasol\n"
 "i rhannau o'r Feddalwedd i'w gweld yn y ffeil THIRDPARTYLICENSEREADME.html;\n"
 "dewiswch Dangos Trwydded i weld yr union fanylion yn Saesneg."
 
-#: app.src#DLG_HELP_LICENSING.STR_LICENSING_INFORMATION_3.string.text
+#. ]g1G
+#: app.src
+msgctxt ""
+"app.src\n"
+"DLG_HELP_LICENSING\n"
+"STR_LICENSING_INFORMATION_3\n"
+"string.text"
 msgid ""
 "All trademarks and registered trademarks mentioned herein are the property of\n"
 "their respective owners."
@@ -421,7 +1241,13 @@ msgstr ""
 "Mae pob nod masnachol a nod masnach cofrestredig sy'n cael sylw yma yn yn eiddo\n"
 "i'w perchnogion perthnasol."
 
-#: app.src#DLG_HELP_LICENSING.STR_LICENSING_INFORMATION_4.string.text
+#. V*y7
+#: app.src
+msgctxt ""
+"app.src\n"
+"DLG_HELP_LICENSING\n"
+"STR_LICENSING_INFORMATION_4\n"
+"string.text"
 msgid ""
 "Copyright © 2000, 2012 LibreOffice contributors and/or their affiliates. All rights\n"
 "reserved."
@@ -429,7 +1255,13 @@ msgstr ""
 "Hawlfraint © LibreOffice 2000, 2012 cyfranwyr a/neu eu cysylltiedig.\n"
 "Cedwir pob hawl."
 
-#: app.src#DLG_HELP_LICENSING.STR_LICENSING_INFORMATION_5.string.text
+#. \BQ#
+#: app.src
+msgctxt ""
+"app.src\n"
+"DLG_HELP_LICENSING\n"
+"STR_LICENSING_INFORMATION_5\n"
+"string.text"
 msgid ""
 "This product was created by %OOOVENDOR, based on OpenOffice.org,\n"
 "which is Copyright 2000, 2011 Oracle and/or its affiliates.\n"
@@ -441,161 +1273,31 @@ msgstr ""
 "Mae %OOOVENDOR  yn cydnabos holl aelodau cymunedol, gw\n"
 "http://www.libreoffice.org/ am fanylion pellach."
 
-#: app.src#DLG_HELP_LICENSING.PB_LICENSING_SHOW.okbutton.text
+#. ;F{Q
+#: app.src
+msgctxt ""
+"app.src\n"
+"DLG_HELP_LICENSING\n"
+"PB_LICENSING_SHOW\n"
+"okbutton.text"
 msgid "~Show License"
 msgstr "~Dangos y Drwydded"
 
-#: app.src#DLG_HELP_LICENSING.PB_LICENSING_CLOSE.cancelbutton.text
+#. U]:F
+#: app.src
+msgctxt ""
+"app.src\n"
+"DLG_HELP_LICENSING\n"
+"PB_LICENSING_CLOSE\n"
+"cancelbutton.text"
 msgid "~Close"
 msgstr "~Cau"
 
-#: app.src#DLG_HELP_LICENSING.modaldialog.text
+#. {jg5
+#: app.src
+msgctxt ""
+"app.src\n"
+"DLG_HELP_LICENSING\n"
+"modaldialog.text"
 msgid "Licensing and Legal information"
 msgstr "Gwybodaeth trwyddedu a chyfreithiol"
-
-#: newhelp.src#WIN_HELPINDEX.TC_INDEX.HELP_INDEX_PAGE_CONTENTS.pageitem.text
-msgid "Contents"
-msgstr "Cynnwys"
-
-#: newhelp.src#WIN_HELPINDEX.TC_INDEX.HELP_INDEX_PAGE_INDEX.pageitem.text
-msgid "Index"
-msgstr "Mynegai"
-
-#: newhelp.src#WIN_HELPINDEX.TC_INDEX.HELP_INDEX_PAGE_SEARCH.pageitem.text
-msgid "Find"
-msgstr "Canfod"
-
-#: newhelp.src#WIN_HELPINDEX.TC_INDEX.HELP_INDEX_PAGE_BOOKMARKS.pageitem.text
-msgid "Bookmarks"
-msgstr "Nodau Tudalen"
-
-#: newhelp.src#TP_HELP_INDEX.FT_EXPRESSION.fixedtext.text
-msgid "~Search term"
-msgstr "Chwilio ~term"
-
-#: newhelp.src#TP_HELP_INDEX.PB_OPEN_INDEX.pushbutton.text
-msgctxt "newhelp.src#TP_HELP_INDEX.PB_OPEN_INDEX.pushbutton.text"
-msgid "~Display"
-msgstr "~Dangos"
-
-#: newhelp.src#TP_HELP_SEARCH.FT_SEARCH.fixedtext.text
-msgid "S~earch term"
-msgstr "C~hwilio term"
-
-#: newhelp.src#TP_HELP_SEARCH.PB_SEARCH.pushbutton.text
-msgid "~Find"
-msgstr "~Chwilio"
-
-#: newhelp.src#TP_HELP_SEARCH.CB_FULLWORDS.checkbox.text
-msgid "~Complete words only"
-msgstr "~Geiriau cyfan yn unig"
-
-#: newhelp.src#TP_HELP_SEARCH.CB_SCOPE.checkbox.text
-msgid "Find in ~headings only"
-msgstr "C~anfod mewn penawdau'n unig"
-
-#: newhelp.src#TP_HELP_SEARCH.PB_OPEN_SEARCH.pushbutton.text
-msgctxt "newhelp.src#TP_HELP_SEARCH.PB_OPEN_SEARCH.pushbutton.text"
-msgid "~Display"
-msgstr "~Dangos"
-
-#: newhelp.src#TP_HELP_BOOKMARKS.FT_BOOKMARKS.fixedtext.text
-msgid "~Bookmarks"
-msgstr "~Nodau Tudalen"
-
-#: newhelp.src#TP_HELP_BOOKMARKS.PB_BOOKMARKS.pushbutton.text
-msgctxt "newhelp.src#TP_HELP_BOOKMARKS.PB_BOOKMARKS.pushbutton.text"
-msgid "~Display"
-msgstr "~Dangos"
-
-#: newhelp.src#STR_HELP_WINDOW_TITLE.string.text
-msgid "%PRODUCTNAME Help"
-msgstr "Cymorth %PRODUCTNAME"
-
-#: newhelp.src#STR_HELP_BUTTON_INDEX_ON.string.text
-msgid "Show Navigation Pane"
-msgstr "Dangos Paen Dewisydd"
-
-#: newhelp.src#STR_HELP_BUTTON_INDEX_OFF.string.text
-msgid "Hide Navigation Pane"
-msgstr "Cuddio Paen Dewis"
-
-#: newhelp.src#STR_HELP_BUTTON_START.string.text
-msgid "First Page"
-msgstr "Tudalen Gyntaf"
-
-#: newhelp.src#STR_HELP_BUTTON_PREV.string.text
-msgid "Previous Page"
-msgstr "Tudalen Flaenorol"
-
-#: newhelp.src#STR_HELP_BUTTON_NEXT.string.text
-msgid "Next Page"
-msgstr "Tudalen Nesaf"
-
-#: newhelp.src#STR_HELP_BUTTON_PRINT.string.text
-msgid "Print..."
-msgstr "Argraffu..."
-
-#: newhelp.src#STR_HELP_BUTTON_ADDBOOKMARK.string.text
-msgid "Add to Bookmarks..."
-msgstr "Ychwanegu i Nodau Tudalen..."
-
-#: newhelp.src#STR_HELP_BUTTON_SEARCHDIALOG.string.text
-msgid "Find on this Page..."
-msgstr "Canfod ar y Dudalen..."
-
-#: newhelp.src#STR_HELP_BUTTON_SOURCEVIEW.string.text
-msgid "HTML Source"
-msgstr "Ffynhonnell HTML"
-
-#: newhelp.src#STR_HELP_FIRST_MESSAGE.string.text
-msgid "The Help is being started..."
-msgstr "Yn cychwyn Cymorth..."
-
-#: newhelp.src#STR_HELP_MENU_TEXT_SELECTION_MODE.string.text
-msgid "Select Text"
-msgstr "Dewis Testun"
-
-#: newhelp.src#STR_HELP_MENU_TEXT_COPY.string.text
-msgid "~Copy"
-msgstr "~Copïo"
-
-#: newhelp.src#DLG_HELP_ADDBOOKMARK.FT_BOOKMARK_TITLE.fixedtext.text
-msgid "Bookmark:"
-msgstr "Nod Tudalen:"
-
-#: newhelp.src#DLG_HELP_ADDBOOKMARK.STR_BOOKMARK_RENAME.string.text
-msgid "Rename Bookmark"
-msgstr "Ailenwi Nod Tudalen"
-
-#: newhelp.src#DLG_HELP_ADDBOOKMARK.modaldialog.text
-msgid "Add to Bookmarks"
-msgstr "Ychwanegu i Nodau Tudalen"
-
-#: newhelp.src#MENU_HELP_BOOKMARKS.MID_OPEN.menuitem.text
-msgid "Display"
-msgstr "Dangos"
-
-#: newhelp.src#MENU_HELP_BOOKMARKS.MID_RENAME.menuitem.text
-msgid "Rename..."
-msgstr "Ailenwi..."
-
-#: newhelp.src#MENU_HELP_BOOKMARKS.MID_DELETE.menuitem.text
-msgid "Delete"
-msgstr "Dileu"
-
-#: newhelp.src#RID_INFO_NOSEARCHRESULTS.infobox.text
-msgid "No topics found."
-msgstr "Heb ganfod pynciau."
-
-#: newhelp.src#RID_INFO_NOSEARCHTEXTFOUND.infobox.text
-msgid "The text you entered was not found."
-msgstr "Nid rhestr elfennau'r testun rhoddwyd gennych."
-
-#: newhelp.src#RID_HELP_ONSTARTUP_TEXT.string.text
-msgid "~Display %PRODUCTNAME %MODULENAME Help at Startup"
-msgstr "~Dangos Cymorth %PRODUCTNAME %MODULENAME wrth Gychwyn"
-
-#: sfx.src#STR_ACCTITLE_PRODUCTIVITYTOOLS.string.text
-msgid "%PRODUCTNAME"
-msgstr "Cymorth %PRODUCTNAME"
diff --git a/source/cy/sfx2/source/bastyp.po b/source/cy/sfx2/source/bastyp.po
index 54a9bf135bd..272c0dfba2f 100644
--- a/source/cy/sfx2/source/bastyp.po
+++ b/source/cy/sfx2/source/bastyp.po
@@ -1,9 +1,9 @@
-#. extracted from sfx2/source/bastyp.oo
+#. extracted from sfx2/source/bastyp
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: http://qa.openoffice.org/issues/enter_bug.cgi?comment=&component=l10n&form_name=enter_issue&short_desc=Localization+issue+in+file%3A+sfx2%2Fsource%2Fbastyp.oo&subcomponent=ui\n"
-"POT-Creation-Date: 2012-07-04 16:39+0200\n"
+"Report-Msgid-Bugs-To: https://bugs.freedesktop.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
+"POT-Creation-Date: 2012-11-17 19:02+0200\n"
 "PO-Revision-Date: 2011-04-17 20:23+0200\n"
 "Last-Translator: Rhoslyn <rprys@yahoo.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -12,10 +12,15 @@ msgstr ""
 "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: Translate Toolkit 1.9.0\n"
+"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
 
-#: fltfnc.src#STR_FILTER_NOT_INSTALLED.string.text
+#. /!P,
+#: fltfnc.src
+msgctxt ""
+"fltfnc.src\n"
+"STR_FILTER_NOT_INSTALLED\n"
+"string.text"
 msgid ""
 "The selected filter $(FILTER) has not been installed.\n"
 "Would you like to do this now?"
@@ -23,7 +28,12 @@ msgstr ""
 "Nid yw'r hid yma $(FILTER) wedi ei osod.\n"
 "Hoffech chi wneud hyn?"
 
-#: fltfnc.src#STR_FILTER_CONSULT_SERVICE.string.text
+#. ;LP$
+#: fltfnc.src
+msgctxt ""
+"fltfnc.src\n"
+"STR_FILTER_CONSULT_SERVICE\n"
+"string.text"
 msgid ""
 "The selected filter $(FILTER) is not included in your edition.\n"
 "You can find information about orders on our homepage."
diff --git a/source/cy/sfx2/source/dialog.po b/source/cy/sfx2/source/dialog.po
index 5be36a9a9ba..b3785790aaf 100644
--- a/source/cy/sfx2/source/dialog.po
+++ b/source/cy/sfx2/source/dialog.po
@@ -1,9 +1,9 @@
-#. extracted from sfx2/source/dialog.oo
+#. extracted from sfx2/source/dialog
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: http://qa.openoffice.org/issues/enter_bug.cgi?comment=&component=l10n&form_name=enter_issue&short_desc=Localization+issue+in+file%3A+sfx2%2Fsource%2Fdialog.oo&subcomponent=ui\n"
-"POT-Creation-Date: 2012-07-04 16:39+0200\n"
+"Report-Msgid-Bugs-To: https://bugs.freedesktop.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
+"POT-Creation-Date: 2012-11-17 19:02+0200\n"
 "PO-Revision-Date: 2012-06-26 11:34+0200\n"
 "Last-Translator: Rhoslyn <rprys@yahoo.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -12,360 +12,1423 @@ msgstr ""
 "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: Translate Toolkit 1.9.0\n"
+"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
 
-#: newstyle.src#DLG_NEW_STYLE_BY_EXAMPLE.FL_COL.fixedline.text
+#. b!ns
+#: recfloat.src
+msgctxt ""
+"recfloat.src\n"
+"SID_RECORDING_FLOATWINDOW\n"
+"floatingwindow.text"
+msgid "Record Macro"
+msgstr "Recordio Macro"
+
+#. 3Ok|
+#: recfloat.src
+msgctxt ""
+"recfloat.src\n"
+"STR_MACRO_LOSS\n"
+"string.text"
+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."
+
+#. WVBh
+#: recfloat.src
+msgctxt ""
+"recfloat.src\n"
+"STR_CANCEL_RECORDING\n"
+"string.text"
+msgid "Cancel Recording"
+msgstr "Diddymu Recordio"
+
+#. u(dn
+#: inputdlg.src
+msgctxt ""
+"inputdlg.src\n"
+"DLG_INPUT_BOX\n"
+"BTN_INPUT_OK\n"
+"pushbutton.text"
+msgid "Accept"
+msgstr "Derbyn"
+
+#. S-or
+#: inputdlg.src
+msgctxt ""
+"inputdlg.src\n"
+"DLG_INPUT_BOX\n"
+"BTN_INPUT_CANCEL\n"
+"pushbutton.text"
+msgid "Cancel"
+msgstr "Diddymu"
+
+#. 25Oc
+#: mgetempl.src
+msgctxt ""
+"mgetempl.src\n"
+"TP_MANAGE_STYLES\n"
+"FT_NAME\n"
+"fixedtext.text"
+msgid "~Name"
+msgstr "~Enw"
+
+#. ~Ywn
+#: mgetempl.src
+msgctxt ""
+"mgetempl.src\n"
+"TP_MANAGE_STYLES\n"
+"CB_AUTO\n"
+"checkbox.text"
+msgid "~AutoUpdate"
+msgstr "~AwtoDiweddaru"
+
+#. opDF
+#: mgetempl.src
+msgctxt ""
+"mgetempl.src\n"
+"TP_MANAGE_STYLES\n"
+"FT_NEXT\n"
+"fixedtext.text"
+msgid "Ne~xt Style"
+msgstr "Arddull ~Nesaf"
+
+#. @YPQ
+#: mgetempl.src
+msgctxt ""
+"mgetempl.src\n"
+"TP_MANAGE_STYLES\n"
+"FT_BASE\n"
+"fixedtext.text"
+msgid "Linked with"
+msgstr "Cysylltiedig a"
+
+#. X5.l
+#: mgetempl.src
+msgctxt ""
+"mgetempl.src\n"
+"TP_MANAGE_STYLES\n"
+"FT_REGION\n"
+"fixedtext.text"
+msgid "~Category"
+msgstr "~Categori"
+
+#. n}ht
+#: mgetempl.src
+msgctxt ""
+"mgetempl.src\n"
+"TP_MANAGE_STYLES\n"
+"GB_DESC\n"
+"fixedline.text"
+msgid "Contains"
+msgstr "Yn cynnwys"
+
+#. .?N#
+#: taskpane.src
+msgctxt ""
+"taskpane.src\n"
+"STR_SFX_DOCK\n"
+"string.text"
+msgid "Dock"
+msgstr "Doc"
+
+#. GdUr
+#: taskpane.src
+msgctxt ""
+"taskpane.src\n"
+"STR_SFX_UNDOCK\n"
+"string.text"
+msgid "Undock"
+msgstr "Dad-ddocio"
+
+#. Hppi
+#: taskpane.src
+msgctxt ""
+"taskpane.src\n"
+"STR_SFX_TASK_PANE_VIEW\n"
+"string.text"
+msgid "View"
+msgstr "Golwg"
+
+#. v+h(
+#: taskpane.src
+msgctxt ""
+"taskpane.src\n"
+"STR_SFX_TASKS\n"
+"string.text"
+msgid "Tasks"
+msgstr "Tasgau"
+
+#. ncQ_
+#: newstyle.src
+msgctxt ""
+"newstyle.src\n"
+"DLG_NEW_STYLE_BY_EXAMPLE\n"
+"FL_COL\n"
+"fixedline.text"
 msgid "Style name"
 msgstr "Enw arddull"
 
-#: newstyle.src#DLG_NEW_STYLE_BY_EXAMPLE.MSG_OVERWRITE.querybox.text
+#. @9?h
+#: newstyle.src
+msgctxt ""
+"newstyle.src\n"
+"DLG_NEW_STYLE_BY_EXAMPLE\n"
+"MSG_OVERWRITE\n"
+"querybox.text"
 msgid "Style already exists. Overwrite?"
 msgstr "Mae'r Arddull yn bodoli eisoes. Trosysgrifo?"
 
-#: newstyle.src#DLG_NEW_STYLE_BY_EXAMPLE.modaldialog.text
+#. O8:[
+#: newstyle.src
+msgctxt ""
+"newstyle.src\n"
+"DLG_NEW_STYLE_BY_EXAMPLE\n"
+"modaldialog.text"
 msgid "Create Style"
 msgstr "Creu Arddull"
 
-#: mailwindow.src#RID_ERRBOX_MAIL_CONFIG.errorbox.text
+#. Yj-H
+#: mailwindow.src
+msgctxt ""
+"mailwindow.src\n"
+"RID_ERRBOX_MAIL_CONFIG\n"
+"errorbox.text"
 msgid "%PRODUCTNAME was unable to find a working e-mail configuration. Please save this document locally instead and attach it from within your e-mail client."
 msgstr "Mae %PRODUCTNAME yn methu canfod ffurfweddiad e-bost sy'n gweithio. Cadwch y ddogfen yn lleol a'i cysylltwch o fewn eich rhaglen e-bost."
 
-#: dinfdlg.src#STR_SFX_NEWOFFICEDOC.string.text
+#. 2rBN
+#: securitypage.src
+msgctxt ""
+"securitypage.src\n"
+"TP_DOCINFOSECURITY\n"
+"PASSWORD_TO_OPEN_FL\n"
+"fixedline.text"
+msgid "File encryption password"
+msgstr "Cyfrinair amgryptio ffeil"
+
+#. 4i|%
+#: securitypage.src
+msgctxt ""
+"securitypage.src\n"
+"TP_DOCINFOSECURITY\n"
+"PASSWORD_TO_OPEN_FT\n"
+"fixedtext.text"
+msgid "~Enter password to open"
+msgstr "~Rhoi cyfrinair i'w agor"
+
+#. eFSV
+#: securitypage.src
+msgctxt ""
+"securitypage.src\n"
+"TP_DOCINFOSECURITY\n"
+"CONFIRM_PASSWORD_TO_OPEN_FT\n"
+"fixedtext.text"
+msgid "~Reenter password to open"
+msgstr "~Ailosod cyfrinair i'w agor"
+
+#. M5#%
+#: securitypage.src
+msgctxt ""
+"securitypage.src\n"
+"TP_DOCINFOSECURITY\n"
+"PASSWORD_TO_MODIFY_FL\n"
+"fixedline.text"
+msgid "File sharing password"
+msgstr "Cyfrinair rhannu ffeil"
+
+#. IfJ|
+#: securitypage.src
+msgctxt ""
+"securitypage.src\n"
+"TP_DOCINFOSECURITY\n"
+"PASSWORD_TO_MODIFY_FT\n"
+"fixedtext.text"
+msgid "Enter password to modify"
+msgstr "Rhosi cyfrinair er mwyn newid"
+
+#. 1T^D
+#: securitypage.src
+msgctxt ""
+"securitypage.src\n"
+"TP_DOCINFOSECURITY\n"
+"CONFIRM_PASSWORD_TO_MODIFY_FT\n"
+"fixedtext.text"
+msgid "Reenter password to modify"
+msgstr "Ailosod cvyfrinair er mwyn newid"
+
+#. [QIH
+#: securitypage.src
+msgctxt ""
+"securitypage.src\n"
+"TP_DOCINFOSECURITY\n"
+"OPTIONS_FL\n"
+"fixedline.text"
+msgid "File sharing options"
+msgstr "Dewisiadau rhannu ffeil"
+
+#. TIph
+#: securitypage.src
+msgctxt ""
+"securitypage.src\n"
+"TP_DOCINFOSECURITY\n"
+"OPEN_READONLY_CB\n"
+"checkbox.text"
+msgid "~Open file read-only"
+msgstr "~Agor ffeil darllen yn unig"
+
+#. fEC|
+#: securitypage.src
+msgctxt ""
+"securitypage.src\n"
+"TP_DOCINFOSECURITY\n"
+"RECORD_CHANGES_CB\n"
+"checkbox.text"
+msgid "Record ~changes"
+msgstr "Cofnodi ~newidiadau"
+
+#. }#:J
+#: securitypage.src
+msgctxt ""
+"securitypage.src\n"
+"TP_DOCINFOSECURITY\n"
+"STR_PROTECT\n"
+"string.text"
+msgid "~Protect..."
+msgstr "~Amddiffyn..."
+
+#. *t4:
+#: securitypage.src
+msgctxt ""
+"securitypage.src\n"
+"TP_DOCINFOSECURITY\n"
+"STR_UNPROTECT\n"
+"string.text"
+msgid "~Unprotect..."
+msgstr "~Peidio amddiffyn..."
+
+#. R6kO
+#: securitypage.src
+msgctxt ""
+"securitypage.src\n"
+"TP_DOCINFOSECURITY\n"
+"STR_END_REDLINING_WARNING\n"
+"string.text"
+msgid ""
+"This action will exit the change recording mode.\n"
+"Any information about changes will be lost.\n"
+"\n"
+"Exit change recording mode?\n"
+"\n"
+msgstr ""
+"Bydd y weithred yn gadael y newid ym modd recordio.\n"
+"Bydd unrhyw wybodaeth am newidiadau yn cael eu newid.\n"
+"\n"
+" Gadael modd recordio newid?\n"
+"\n"
+
+#. *r#I
+#: securitypage.src
+msgctxt ""
+"securitypage.src\n"
+"RID_SFX_INCORRECT_PASSWORD\n"
+"string.text"
+msgid "Incorrect password"
+msgstr "Cyfrinair anghywir"
+
+#. P(*!
+#: templateinfodlg.src
+#, fuzzy
+msgctxt ""
+"templateinfodlg.src\n"
+"DLG_TEMPLATE_INFORMATION\n"
+"BTN_TEMPLATE_INFO_CLOSE\n"
+"pushbutton.text"
+msgid "Close"
+msgstr "Cau"
+
+#. ^O^`
+#: dinfedt.src
+msgctxt ""
+"dinfedt.src\n"
+"DLG_DOCINFO_EDT\n"
+"FL_INFO\n"
+"fixedline.text"
+msgid "Names"
+msgstr "Enwau"
+
+#. \TT7
+#: dinfedt.src
+msgctxt ""
+"dinfedt.src\n"
+"DLG_DOCINFO_EDT\n"
+"modaldialog.text"
+msgid "Edit Field Names"
+msgstr "Golygu Enwau'r Meysydd"
+
+#. $\(v
+#: srchdlg.src
+msgctxt ""
+"srchdlg.src\n"
+"RID_DLG_SEARCH\n"
+"FT_SEARCH\n"
+"fixedtext.text"
+msgid "~Search for"
+msgstr "~Chwilio am"
+
+#. g*Y;
+#: srchdlg.src
+msgctxt ""
+"srchdlg.src\n"
+"RID_DLG_SEARCH\n"
+"CB_WHOLEWORDS\n"
+"checkbox.text"
+msgid "~Whole words only"
+msgstr "~Geiriau cyfan yn unig"
+
+#. C$X\
+#: srchdlg.src
+msgctxt ""
+"srchdlg.src\n"
+"RID_DLG_SEARCH\n"
+"CB_MATCHCASE\n"
+"checkbox.text"
+msgid "~Match case"
+msgstr "~Cydweddu maint"
+
+#. J2b5
+#: srchdlg.src
+msgctxt ""
+"srchdlg.src\n"
+"RID_DLG_SEARCH\n"
+"CB_WRAPAROUND\n"
+"checkbox.text"
+msgid "Wrap ~around"
+msgstr "~Amlapio"
+
+#. khTF
+#: srchdlg.src
+msgctxt ""
+"srchdlg.src\n"
+"RID_DLG_SEARCH\n"
+"CB_BACKWARDS\n"
+"checkbox.text"
+msgid "~Backwards"
+msgstr "~Nôl"
+
+#. XCJu
+#: srchdlg.src
+msgctxt ""
+"srchdlg.src\n"
+"RID_DLG_SEARCH\n"
+"PB_FIND\n"
+"pushbutton.text"
+msgid "~Find"
+msgstr "~Chwilio"
+
+#. cNZC
+#: srchdlg.src
+msgctxt ""
+"srchdlg.src\n"
+"RID_DLG_SEARCH\n"
+"PB_CANCELFIND\n"
+"cancelbutton.text"
+msgid "~Close"
+msgstr "~Cau"
+
+#. IS\\
+#: srchdlg.src
+msgctxt ""
+"srchdlg.src\n"
+"RID_DLG_SEARCH\n"
+"STR_TOGGLE\n"
+"string.text"
+msgid "Wrap ~around"
+msgstr "~Amlapio"
+
+#. ?!U8
+#: srchdlg.src
+msgctxt ""
+"srchdlg.src\n"
+"RID_DLG_SEARCH\n"
+"modelessdialog.text"
+msgid "Find on this Page"
+msgstr "Canfod yn y Dudalen"
+
+#. gaA$
+#: dialog.src
+msgctxt ""
+"dialog.src\n"
+"STR_RESET\n"
+"string.text"
+msgid "~Reset"
+msgstr "~Ailosod"
+
+#. 1jeN
+#: dialog.src
+msgctxt ""
+"dialog.src\n"
+"STR_APPLY\n"
+"string.text"
+msgid "Apply"
+msgstr "Gosod"
+
+#. v#%J
+#: dialog.src
+msgctxt ""
+"dialog.src\n"
+"STR_TABPAGE_MANAGESTYLES\n"
+"string.text"
+msgid "Organizer"
+msgstr "Trefnydd"
+
+#. bS4O
+#: dialog.src
+msgctxt ""
+"dialog.src\n"
+"MSG_TABPAGE_INVALIDNAME\n"
+"infobox.text"
+msgid "This name is already in use."
+msgstr "Mae'r enw'n cael ei ddefnyddio eisoes."
+
+#. N.+g
+#: dialog.src
+msgctxt ""
+"dialog.src\n"
+"MSG_TABPAGE_INVALIDSTYLE\n"
+"infobox.text"
+msgid "This Style does not exist."
+msgstr "Nid yw'r Arddull yn bodoli."
+
+#. cA{i
+#: dialog.src
+msgctxt ""
+"dialog.src\n"
+"MSG_TABPAGE_INVALIDPARENT\n"
+"infobox.text"
+msgid ""
+"This Style cannot be used as a base Style,\n"
+"because it would result in a recursive reference."
+msgstr ""
+"Nid oes modd defnyddio'r Arddull fel yr Arddull sail;\n"
+"gan y byddai'n arwain at gyfeiriad ailadroddus."
+
+#. U08o
+#: dialog.src
+msgctxt ""
+"dialog.src\n"
+"MSG_POOL_STYLE_NAME\n"
+"infobox.text"
+msgid ""
+"Name already exists as a default Style.\n"
+"Please choose another name."
+msgstr ""
+"Mae'r enw'n bodoli fel Arddull rhagosodedig eisoes.\n"
+"Dewiswch enw arall."
+
+#. g::%
+#: dialog.src
+msgctxt ""
+"dialog.src\n"
+"STR_DELETE_STYLE\n"
+"string.text"
+msgid "Do you really want to delete Style $1?"
+msgstr "Ydych chi wir am ddileu Arddull $1?"
+
+#. r@vo
+#: dialog.src
+msgctxt ""
+"dialog.src\n"
+"STR_DELETE_STYLE_USED\n"
+"string.text"
+msgid "You are deleting an applied Style!\n"
+msgstr "Rydych yn dileu Arddull osodedig!\n"
+
+#. sKJC
+#: dialog.src
+msgctxt ""
+"dialog.src\n"
+"MN_CONTEXT_TEMPLDLG\n"
+"ID_NEW\n"
+"menuitem.text"
+msgid "New..."
+msgstr "Newydd..."
+
+#. L#cN
+#: dialog.src
+msgctxt ""
+"dialog.src\n"
+"MN_CONTEXT_TEMPLDLG\n"
+"ID_EDIT\n"
+"menuitem.text"
+msgid "Modify..."
+msgstr "Newid..."
+
+#. %99l
+#: dialog.src
+msgctxt ""
+"dialog.src\n"
+"MN_CONTEXT_TEMPLDLG\n"
+"ID_DELETE\n"
+"menuitem.text"
+msgid "Delete..."
+msgstr "Dileu..."
+
+#. 2%V#
+#: dialog.src
+msgctxt ""
+"dialog.src\n"
+"SID_NAVIGATOR\n"
+"string.text"
+msgid "Navigator"
+msgstr "Dewisydd"
+
+#. JrN_
+#: dialog.src
+msgctxt ""
+"dialog.src\n"
+"SID_TASKPANE\n"
+"string.text"
+msgid "Task Pane"
+msgstr "Task Pane"
+
+#. k3;8
+#: dialog.src
+msgctxt ""
+"dialog.src\n"
+"MSG_ERROR_WRONG_CONFIRM\n"
+"errorbox.text"
+msgid "Faulty password confirmation"
+msgstr "Cadarnhad cyfrinair gwallus"
+
+#. 9)e$
+#: dialog.src
+msgctxt ""
+"dialog.src\n"
+"STR_PDF_EXPORT_SEND\n"
+"string.text"
+msgid "Send"
+msgstr "Anfon"
+
+#. 4AO7
+#: dinfdlg.src
+msgctxt ""
+"dinfdlg.src\n"
+"STR_SFX_NEWOFFICEDOC\n"
+"string.text"
 msgid "%PRODUCTNAME document"
 msgstr "Dogfen %PRODUCTNAME"
 
-#: dinfdlg.src#TP_DOCINFODESC.FT_TITLE.fixedtext.text
+#. |g+S
+#: dinfdlg.src
+msgctxt ""
+"dinfdlg.src\n"
+"TP_DOCINFODESC\n"
+"FT_TITLE\n"
+"fixedtext.text"
 msgid "~Title"
 msgstr "~Teitl"
 
-#: dinfdlg.src#TP_DOCINFODESC.FT_THEMA.fixedtext.text
+#. $-8G
+#: dinfdlg.src
+msgctxt ""
+"dinfdlg.src\n"
+"TP_DOCINFODESC\n"
+"FT_THEMA\n"
+"fixedtext.text"
 msgid "~Subject"
 msgstr "~Pwnc"
 
-#: dinfdlg.src#TP_DOCINFODESC.FT_KEYWORDS.fixedtext.text
+#. #8,D
+#: dinfdlg.src
+msgctxt ""
+"dinfdlg.src\n"
+"TP_DOCINFODESC\n"
+"FT_KEYWORDS\n"
+"fixedtext.text"
 msgid "~Keywords"
 msgstr "~Allweddeiriau"
 
-#: dinfdlg.src#TP_DOCINFODESC.FT_COMMENT.fixedtext.text
+#. pfRW
+#: dinfdlg.src
+msgctxt ""
+"dinfdlg.src\n"
+"TP_DOCINFODESC\n"
+"FT_COMMENT\n"
+"fixedtext.text"
 msgid "~Comments"
 msgstr "~Sylwadau"
 
-#: dinfdlg.src#TP_DOCINFODOC.BTN_CHANGE_PASS.pushbutton.text
+#. ;EiI
+#: dinfdlg.src
+msgctxt ""
+"dinfdlg.src\n"
+"TP_DOCINFODOC\n"
+"BTN_CHANGE_PASS\n"
+"pushbutton.text"
 msgid "Change ~Password..."
 msgstr "Newid C~yfrinair..."
 
-#: dinfdlg.src#TP_DOCINFODOC.FT_FILE_TYP.fixedtext.text
+#. 12!%
+#: dinfdlg.src
+msgctxt ""
+"dinfdlg.src\n"
+"TP_DOCINFODOC\n"
+"FT_FILE_TYP\n"
+"fixedtext.text"
 msgid "Type:"
 msgstr "Math:"
 
-#: dinfdlg.src#TP_DOCINFODOC.CB_FILE_READONLY.checkbox.text
-msgctxt "dinfdlg.src#TP_DOCINFODOC.CB_FILE_READONLY.checkbox.text"
+#. o)/l
+#: dinfdlg.src
+msgctxt ""
+"dinfdlg.src\n"
+"TP_DOCINFODOC\n"
+"CB_FILE_READONLY\n"
+"checkbox.text"
 msgid "~Read-only"
 msgstr "~Darllen-yn-unig"
 
-#: dinfdlg.src#TP_DOCINFODOC.FT_FILE.fixedtext.text
+#. vDFD
+#: dinfdlg.src
+msgctxt ""
+"dinfdlg.src\n"
+"TP_DOCINFODOC\n"
+"FT_FILE\n"
+"fixedtext.text"
 msgid "Location:"
 msgstr "Lleoliad:"
 
-#: dinfdlg.src#TP_DOCINFODOC.FT_FILE_SIZE.fixedtext.text
+#. GTI;
+#: dinfdlg.src
+msgctxt ""
+"dinfdlg.src\n"
+"TP_DOCINFODOC\n"
+"FT_FILE_SIZE\n"
+"fixedtext.text"
 msgid "Size:"
 msgstr "Maint:"
 
-#: dinfdlg.src#TP_DOCINFODOC.FT_CREATE.fixedtext.text
+#. )#Y5
+#: dinfdlg.src
+msgctxt ""
+"dinfdlg.src\n"
+"TP_DOCINFODOC\n"
+"FT_CREATE\n"
+"fixedtext.text"
 msgid "Created:"
 msgstr "Crëwyd:"
 
-#: dinfdlg.src#TP_DOCINFODOC.FT_CHANGE.fixedtext.text
+#. !pDe
+#: dinfdlg.src
+msgctxt ""
+"dinfdlg.src\n"
+"TP_DOCINFODOC\n"
+"FT_CHANGE\n"
+"fixedtext.text"
 msgid "Modified:"
 msgstr "Newidiwyd:"
 
-#: dinfdlg.src#TP_DOCINFODOC.FT_SIGNED.fixedtext.text
+#. =Pi:
+#: dinfdlg.src
+msgctxt ""
+"dinfdlg.src\n"
+"TP_DOCINFODOC\n"
+"FT_SIGNED\n"
+"fixedtext.text"
 msgid "Digitally signed:"
 msgstr "Llofnod digidol:"
 
-#: dinfdlg.src#TP_DOCINFODOC.BTN_SIGNATURE.pushbutton.text
+#. nb8M
+#: dinfdlg.src
+msgctxt ""
+"dinfdlg.src\n"
+"TP_DOCINFODOC\n"
+"BTN_SIGNATURE\n"
+"pushbutton.text"
 msgid "Digital Signature..."
 msgstr "Llofnod..."
 
-#: dinfdlg.src#TP_DOCINFODOC.STR_MULTSIGNED.string.text
+#. dOlR
+#: dinfdlg.src
+msgctxt ""
+"dinfdlg.src\n"
+"TP_DOCINFODOC\n"
+"STR_MULTSIGNED\n"
+"string.text"
 msgid "Multiply signed document"
 msgstr "Dogfen llofnod niferus"
 
-#: dinfdlg.src#TP_DOCINFODOC.FT_PRINT.fixedtext.text
+#. %\37
+#: dinfdlg.src
+msgctxt ""
+"dinfdlg.src\n"
+"TP_DOCINFODOC\n"
+"FT_PRINT\n"
+"fixedtext.text"
 msgid "Last printed:"
 msgstr "Argraffwyd diwethaf:"
 
-#: dinfdlg.src#TP_DOCINFODOC.FT_TIMELOG.fixedtext.text
+#. KKbH
+#: dinfdlg.src
+msgctxt ""
+"dinfdlg.src\n"
+"TP_DOCINFODOC\n"
+"FT_TIMELOG\n"
+"fixedtext.text"
 msgid "Total editing time:"
 msgstr "Cyfanswm amse golygu:"
 
-#: dinfdlg.src#TP_DOCINFODOC.FT_DOCNO.fixedtext.text
+#. f#NL
+#: dinfdlg.src
+msgctxt ""
+"dinfdlg.src\n"
+"TP_DOCINFODOC\n"
+"FT_DOCNO\n"
+"fixedtext.text"
 msgid "Revision number:"
 msgstr "Rhif adolygu:"
 
-#: dinfdlg.src#TP_DOCINFODOC.BTN_DELETE.pushbutton.text
+#. |\qa
+#: dinfdlg.src
+msgctxt ""
+"dinfdlg.src\n"
+"TP_DOCINFODOC\n"
+"BTN_DELETE\n"
+"pushbutton.text"
 msgid "Reset"
 msgstr "Ailosod"
 
-#: dinfdlg.src#TP_DOCINFODOC.CB_USE_USERDATA.checkbox.text
+#. ?/=#
+#: dinfdlg.src
+msgctxt ""
+"dinfdlg.src\n"
+"TP_DOCINFODOC\n"
+"CB_USE_USERDATA\n"
+"checkbox.text"
 msgid "~Apply user data"
 msgstr "~Rhowch ddata defnyddiwr"
 
-#: dinfdlg.src#TP_DOCINFODOC.FT_TEMPL.fixedtext.text
+#. wCI8
+#: dinfdlg.src
+msgctxt ""
+"dinfdlg.src\n"
+"TP_DOCINFODOC\n"
+"FT_TEMPL\n"
+"fixedtext.text"
 msgid "Template:"
 msgstr "Templed:"
 
-#: dinfdlg.src#TP_DOCINFODOC.STR_UNKNOWNSIZE.string.text
+#. MH)x
+#: dinfdlg.src
+msgctxt ""
+"dinfdlg.src\n"
+"TP_DOCINFODOC\n"
+"STR_UNKNOWNSIZE\n"
+"string.text"
 msgid "unknown"
 msgstr "anhysbys"
 
-#: dinfdlg.src#TP_DOCINFODOC.EDIT_FILE_NAME.string.text
+#. 9SQT
+#: dinfdlg.src
+msgctxt ""
+"dinfdlg.src\n"
+"TP_DOCINFODOC\n"
+"EDIT_FILE_NAME\n"
+"string.text"
 msgid "File Name"
 msgstr "Enw Ffeil"
 
-#: dinfdlg.src#TP_DOCINFOUSER.BTN_EDITLABEL.pushbutton.text
+#. 9%OC
+#: dinfdlg.src
+msgctxt ""
+"dinfdlg.src\n"
+"TP_DOCINFOUSER\n"
+"BTN_EDITLABEL\n"
+"pushbutton.text"
 msgid "~Info fields..."
 msgstr "~Meysydd gwybodaeth..."
 
-#: dinfdlg.src#TP_DOCINFORELOAD.RB_NOAUTOUPDATE.radiobutton.text
+#. 9bKH
+#: dinfdlg.src
+msgctxt ""
+"dinfdlg.src\n"
+"TP_DOCINFORELOAD\n"
+"RB_NOAUTOUPDATE\n"
+"radiobutton.text"
 msgid "Do not refresh automatically"
 msgstr "Peidio adnewyddu'n awtomatig"
 
-#: dinfdlg.src#TP_DOCINFORELOAD.RB_RELOADUPDATE.radiobutton.text
+#. GfU:
+#: dinfdlg.src
+msgctxt ""
+"dinfdlg.src\n"
+"TP_DOCINFORELOAD\n"
+"RB_RELOADUPDATE\n"
+"radiobutton.text"
 msgid "Refresh this document"
 msgstr "Adnewyddu'r ddogfen hon"
 
-#: dinfdlg.src#TP_DOCINFORELOAD.FT_EVERY.fixedtext.text
+#. fj:-
+#: dinfdlg.src
+msgctxt ""
+"dinfdlg.src\n"
+"TP_DOCINFORELOAD\n"
+"FT_EVERY\n"
+"fixedtext.text"
 msgid "every"
 msgstr "pob"
 
-#: dinfdlg.src#TP_DOCINFORELOAD.FT_RELOADSECS.fixedtext.text
-msgctxt "dinfdlg.src#TP_DOCINFORELOAD.FT_RELOADSECS.fixedtext.text"
+#. g`em
+#: dinfdlg.src
+msgctxt ""
+"dinfdlg.src\n"
+"TP_DOCINFORELOAD\n"
+"FT_RELOADSECS\n"
+"fixedtext.text"
 msgid "seconds"
 msgstr "eiliad"
 
-#: dinfdlg.src#TP_DOCINFORELOAD.RB_FORWARDUPDATE.radiobutton.text
+#. 3B=8
+#: dinfdlg.src
+msgctxt ""
+"dinfdlg.src\n"
+"TP_DOCINFORELOAD\n"
+"RB_FORWARDUPDATE\n"
+"radiobutton.text"
 msgid "Redirect from this document"
 msgstr "Ailgyfeirio o'r ddogfen"
 
-#: dinfdlg.src#TP_DOCINFORELOAD.FT_AFTER.fixedtext.text
+#. Y[e|
+#: dinfdlg.src
+msgctxt ""
+"dinfdlg.src\n"
+"TP_DOCINFORELOAD\n"
+"FT_AFTER\n"
+"fixedtext.text"
 msgid "after"
 msgstr "wedi"
 
-#: dinfdlg.src#TP_DOCINFORELOAD.FT_FORWARDSECS.fixedtext.text
-msgctxt "dinfdlg.src#TP_DOCINFORELOAD.FT_FORWARDSECS.fixedtext.text"
+#. _I}F
+#: dinfdlg.src
+msgctxt ""
+"dinfdlg.src\n"
+"TP_DOCINFORELOAD\n"
+"FT_FORWARDSECS\n"
+"fixedtext.text"
 msgid "seconds"
 msgstr "eiliad"
 
-#: dinfdlg.src#TP_DOCINFORELOAD.FT_URL.fixedtext.text
+#. w#f+
+#: dinfdlg.src
+msgctxt ""
+"dinfdlg.src\n"
+"TP_DOCINFORELOAD\n"
+"FT_URL\n"
+"fixedtext.text"
 msgid "to URL"
 msgstr "i URL"
 
-#: dinfdlg.src#TP_DOCINFORELOAD.FT_FRAME.fixedtext.text
+#. 8Gea
+#: dinfdlg.src
+msgctxt ""
+"dinfdlg.src\n"
+"TP_DOCINFORELOAD\n"
+"FT_FRAME\n"
+"fixedtext.text"
 msgid "to frame"
 msgstr "i ffrâm"
 
-#: dinfdlg.src#TP_DOCINFORELOAD.STR_FORWARD_ERRMSSG.string.text
+#. j!(A
+#: dinfdlg.src
+msgctxt ""
+"dinfdlg.src\n"
+"TP_DOCINFORELOAD\n"
+"STR_FORWARD_ERRMSSG\n"
+"string.text"
 msgid "If you select the option \"%PLACEHOLDER%\", you must enter a URL."
 msgstr "Os ydych yn clicio dewis \"%PLACEHOLDER%\", rhaid cynnig URL."
 
-#: dinfdlg.src#TP_CUSTOMPROPERTIES.FT_PROPERTIES.fixedtext.text
+#. ]@l]
+#: dinfdlg.src
+msgctxt ""
+"dinfdlg.src\n"
+"TP_CUSTOMPROPERTIES\n"
+"FT_PROPERTIES\n"
+"fixedtext.text"
 msgid "~Properties"
 msgstr "~Priodweddau"
 
-#: dinfdlg.src#TP_CUSTOMPROPERTIES.CTRL_PROPERTIES.STR_HEADER_NAME.string.text
+#. QWGL
+#: dinfdlg.src
+msgctxt ""
+"dinfdlg.src\n"
+"TP_CUSTOMPROPERTIES.CTRL_PROPERTIES\n"
+"STR_HEADER_NAME\n"
+"string.text"
 msgid "Name"
 msgstr "Enw"
 
-#: dinfdlg.src#TP_CUSTOMPROPERTIES.CTRL_PROPERTIES.STR_HEADER_TYPE.string.text
+#. @AXG
+#: dinfdlg.src
+msgctxt ""
+"dinfdlg.src\n"
+"TP_CUSTOMPROPERTIES.CTRL_PROPERTIES\n"
+"STR_HEADER_TYPE\n"
+"string.text"
 msgid "Type"
 msgstr "Math"
 
-#: dinfdlg.src#TP_CUSTOMPROPERTIES.CTRL_PROPERTIES.STR_HEADER_VALUE.string.text
+#. 9ZZ@
+#: dinfdlg.src
+msgctxt ""
+"dinfdlg.src\n"
+"TP_CUSTOMPROPERTIES.CTRL_PROPERTIES\n"
+"STR_HEADER_VALUE\n"
+"string.text"
 msgid "Value"
 msgstr "Gwerth"
 
-#: dinfdlg.src#TP_CUSTOMPROPERTIES.BTN_ADD.pushbutton.text
+#. %-^y
+#: dinfdlg.src
+msgctxt ""
+"dinfdlg.src\n"
+"TP_CUSTOMPROPERTIES\n"
+"BTN_ADD\n"
+"pushbutton.text"
 msgid "~Add"
 msgstr "~Ychwanegu"
 
-#: dinfdlg.src#SFX_CB_PROPERTY_NAME.combobox.text
-msgctxt "dinfdlg.src#SFX_CB_PROPERTY_NAME.combobox.text"
+#. RZ^z
+#: dinfdlg.src
+msgctxt ""
+"dinfdlg.src\n"
+"SFX_CB_PROPERTY_NAME\n"
+"combobox.text"
 msgid "-"
 msgstr "-"
 
-#: dinfdlg.src#SFX_CB_PROPERTY_NAME.combobox.quickhelptext
+#. z!gY
+#: dinfdlg.src
+msgctxt ""
+"dinfdlg.src\n"
+"SFX_CB_PROPERTY_NAME\n"
+"combobox.quickhelptext"
 msgid "Property Name"
 msgstr "Enw Priodwedd"
 
-#: dinfdlg.src#SFX_CB_PROPERTY_NAME.1.stringlist.text
+#. =}Vo
+#: dinfdlg.src
+msgctxt ""
+"dinfdlg.src\n"
+"SFX_CB_PROPERTY_NAME\n"
+"1\n"
+"stringlist.text"
 msgid "Checked by"
 msgstr "Gwiriwyd gan"
 
-#: dinfdlg.src#SFX_CB_PROPERTY_NAME.2.stringlist.text
+#. 7Gfh
+#: dinfdlg.src
+msgctxt ""
+"dinfdlg.src\n"
+"SFX_CB_PROPERTY_NAME\n"
+"2\n"
+"stringlist.text"
 msgid "Client"
 msgstr "Cleient"
 
-#: dinfdlg.src#SFX_CB_PROPERTY_NAME.3.stringlist.text
+#. Dz~|
+#: dinfdlg.src
+msgctxt ""
+"dinfdlg.src\n"
+"SFX_CB_PROPERTY_NAME\n"
+"3\n"
+"stringlist.text"
 msgid "Date completed"
 msgstr "Dyddiad cwblhawyd"
 
-#: dinfdlg.src#SFX_CB_PROPERTY_NAME.4.stringlist.text
+#. k@I/
+#: dinfdlg.src
+msgctxt ""
+"dinfdlg.src\n"
+"SFX_CB_PROPERTY_NAME\n"
+"4\n"
+"stringlist.text"
 msgid "Department"
 msgstr "Adran"
 
-#: dinfdlg.src#SFX_CB_PROPERTY_NAME.5.stringlist.text
+#. n~G^
+#: dinfdlg.src
+msgctxt ""
+"dinfdlg.src\n"
+"SFX_CB_PROPERTY_NAME\n"
+"5\n"
+"stringlist.text"
 msgid "Destinations"
 msgstr "Cyrchfan"
 
-#: dinfdlg.src#SFX_CB_PROPERTY_NAME.6.stringlist.text
+#. jOk,
+#: dinfdlg.src
+msgctxt ""
+"dinfdlg.src\n"
+"SFX_CB_PROPERTY_NAME\n"
+"6\n"
+"stringlist.text"
 msgid "Disposition"
 msgstr "Anianawd"
 
-#: dinfdlg.src#SFX_CB_PROPERTY_NAME.7.stringlist.text
+#. UIKM
+#: dinfdlg.src
+msgctxt ""
+"dinfdlg.src\n"
+"SFX_CB_PROPERTY_NAME\n"
+"7\n"
+"stringlist.text"
 msgid "Division"
 msgstr "Rhannu"
 
-#: dinfdlg.src#SFX_CB_PROPERTY_NAME.8.stringlist.text
+#. fxIb
+#: dinfdlg.src
+msgctxt ""
+"dinfdlg.src\n"
+"SFX_CB_PROPERTY_NAME\n"
+"8\n"
+"stringlist.text"
 msgid "Document number"
 msgstr "Rhif y ddogfen"
 
-#: dinfdlg.src#SFX_CB_PROPERTY_NAME.9.stringlist.text
+#. W%ve
+#: dinfdlg.src
+msgctxt ""
+"dinfdlg.src\n"
+"SFX_CB_PROPERTY_NAME\n"
+"9\n"
+"stringlist.text"
 msgid "Editor"
 msgstr "Golygydd"
 
-#: dinfdlg.src#SFX_CB_PROPERTY_NAME.10.stringlist.text
+#. *2w)
+#: dinfdlg.src
+msgctxt ""
+"dinfdlg.src\n"
+"SFX_CB_PROPERTY_NAME\n"
+"10\n"
+"stringlist.text"
 msgid "E-Mail"
 msgstr "E-bost"
 
-#: dinfdlg.src#SFX_CB_PROPERTY_NAME.11.stringlist.text
+#. )A`M
+#: dinfdlg.src
+msgctxt ""
+"dinfdlg.src\n"
+"SFX_CB_PROPERTY_NAME\n"
+"11\n"
+"stringlist.text"
 msgid "Forward to"
 msgstr "Ymlaen at"
 
-#: dinfdlg.src#SFX_CB_PROPERTY_NAME.12.stringlist.text
+#. O13\
+#: dinfdlg.src
+msgctxt ""
+"dinfdlg.src\n"
+"SFX_CB_PROPERTY_NAME\n"
+"12\n"
+"stringlist.text"
 msgid "Group"
 msgstr "Grŵp"
 
-#: dinfdlg.src#SFX_CB_PROPERTY_NAME.13.stringlist.text
+#. hSPV
+#: dinfdlg.src
+msgctxt ""
+"dinfdlg.src\n"
+"SFX_CB_PROPERTY_NAME\n"
+"13\n"
+"stringlist.text"
 msgid "Info"
 msgstr "Manylion"
 
-#: dinfdlg.src#SFX_CB_PROPERTY_NAME.14.stringlist.text
+#. -h4i
+#: dinfdlg.src
+msgctxt ""
+"dinfdlg.src\n"
+"SFX_CB_PROPERTY_NAME\n"
+"14\n"
+"stringlist.text"
 msgid "Language"
 msgstr "Iaith"
 
-#: dinfdlg.src#SFX_CB_PROPERTY_NAME.15.stringlist.text
+#. aPE)
+#: dinfdlg.src
+msgctxt ""
+"dinfdlg.src\n"
+"SFX_CB_PROPERTY_NAME\n"
+"15\n"
+"stringlist.text"
 msgid "Mailstop"
 msgstr "Mailstop"
 
-#: dinfdlg.src#SFX_CB_PROPERTY_NAME.16.stringlist.text
+#. Sc1~
+#: dinfdlg.src
+msgctxt ""
+"dinfdlg.src\n"
+"SFX_CB_PROPERTY_NAME\n"
+"16\n"
+"stringlist.text"
 msgid "Matter"
 msgstr "Pwnc"
 
-#: dinfdlg.src#SFX_CB_PROPERTY_NAME.17.stringlist.text
+#. eii+
+#: dinfdlg.src
+msgctxt ""
+"dinfdlg.src\n"
+"SFX_CB_PROPERTY_NAME\n"
+"17\n"
+"stringlist.text"
 msgid "Office"
 msgstr "Swyddfa"
 
-#: dinfdlg.src#SFX_CB_PROPERTY_NAME.18.stringlist.text
+#. -f?Q
+#: dinfdlg.src
+msgctxt ""
+"dinfdlg.src\n"
+"SFX_CB_PROPERTY_NAME\n"
+"18\n"
+"stringlist.text"
 msgid "Owner"
 msgstr "Perchennog"
 
-#: dinfdlg.src#SFX_CB_PROPERTY_NAME.19.stringlist.text
+#. \Te9
+#: dinfdlg.src
+msgctxt ""
+"dinfdlg.src\n"
+"SFX_CB_PROPERTY_NAME\n"
+"19\n"
+"stringlist.text"
 msgid "Project"
 msgstr "Project"
 
-#: dinfdlg.src#SFX_CB_PROPERTY_NAME.20.stringlist.text
+#. CID9
+#: dinfdlg.src
+msgctxt ""
+"dinfdlg.src\n"
+"SFX_CB_PROPERTY_NAME\n"
+"20\n"
+"stringlist.text"
 msgid "Publisher"
 msgstr "Cyhoeddwr"
 
-#: dinfdlg.src#SFX_CB_PROPERTY_NAME.21.stringlist.text
+#. 2-r0
+#: dinfdlg.src
+msgctxt ""
+"dinfdlg.src\n"
+"SFX_CB_PROPERTY_NAME\n"
+"21\n"
+"stringlist.text"
 msgid "Purpose"
 msgstr "Pwrpas"
 
-#: dinfdlg.src#SFX_CB_PROPERTY_NAME.22.stringlist.text
+#. .{[g
+#: dinfdlg.src
+msgctxt ""
+"dinfdlg.src\n"
+"SFX_CB_PROPERTY_NAME\n"
+"22\n"
+"stringlist.text"
 msgid "Received from"
 msgstr "Derbyniwyd gan"
 
-#: dinfdlg.src#SFX_CB_PROPERTY_NAME.23.stringlist.text
+#. BF^,
+#: dinfdlg.src
+msgctxt ""
+"dinfdlg.src\n"
+"SFX_CB_PROPERTY_NAME\n"
+"23\n"
+"stringlist.text"
 msgid "Recorded by"
 msgstr "Cofnodwyd gan"
 
-#: dinfdlg.src#SFX_CB_PROPERTY_NAME.24.stringlist.text
+#. %g,P
+#: dinfdlg.src
+msgctxt ""
+"dinfdlg.src\n"
+"SFX_CB_PROPERTY_NAME\n"
+"24\n"
+"stringlist.text"
 msgid "Recorded date"
 msgstr "Dyddiad cofnodi"
 
-#: dinfdlg.src#SFX_CB_PROPERTY_NAME.25.stringlist.text
+#. G\%^
+#: dinfdlg.src
+msgctxt ""
+"dinfdlg.src\n"
+"SFX_CB_PROPERTY_NAME\n"
+"25\n"
+"stringlist.text"
 msgid "Reference"
 msgstr "Cyfeirnod"
 
-#: dinfdlg.src#SFX_CB_PROPERTY_NAME.26.stringlist.text
+#. !oic
+#: dinfdlg.src
+msgctxt ""
+"dinfdlg.src\n"
+"SFX_CB_PROPERTY_NAME\n"
+"26\n"
+"stringlist.text"
 msgid "Source"
 msgstr "Ffynhonnell"
 
-#: dinfdlg.src#SFX_CB_PROPERTY_NAME.27.stringlist.text
+#. -x0v
+#: dinfdlg.src
+msgctxt ""
+"dinfdlg.src\n"
+"SFX_CB_PROPERTY_NAME\n"
+"27\n"
+"stringlist.text"
 msgid "Status"
 msgstr "Statws"
 
-#: dinfdlg.src#SFX_CB_PROPERTY_NAME.28.stringlist.text
+#. O2|H
+#: dinfdlg.src
+msgctxt ""
+"dinfdlg.src\n"
+"SFX_CB_PROPERTY_NAME\n"
+"28\n"
+"stringlist.text"
 msgid "Telephone number"
 msgstr "Rhif ffôn"
 
-#: dinfdlg.src#SFX_CB_PROPERTY_NAME.29.stringlist.text
+#. mr\7
+#: dinfdlg.src
+msgctxt ""
+"dinfdlg.src\n"
+"SFX_CB_PROPERTY_NAME\n"
+"29\n"
+"stringlist.text"
 msgid "Typist"
 msgstr "Teipydd"
 
-#: dinfdlg.src#SFX_CB_PROPERTY_NAME.30.stringlist.text
+#. Rqn1
+#: dinfdlg.src
+msgctxt ""
+"dinfdlg.src\n"
+"SFX_CB_PROPERTY_NAME\n"
+"30\n"
+"stringlist.text"
 msgid "URL"
 msgstr "URL"
 
-#: dinfdlg.src#SFX_LB_PROPERTY_TYPE.1.stringlist.text
+#. ;_@(
+#: dinfdlg.src
+msgctxt ""
+"dinfdlg.src\n"
+"SFX_LB_PROPERTY_TYPE\n"
+"1\n"
+"stringlist.text"
 msgid "Text"
 msgstr "Testun"
 
-#: dinfdlg.src#SFX_LB_PROPERTY_TYPE.2.stringlist.text
+#. 9AeX
+#: dinfdlg.src
+msgctxt ""
+"dinfdlg.src\n"
+"SFX_LB_PROPERTY_TYPE\n"
+"2\n"
+"stringlist.text"
 msgid "DateTime"
 msgstr "DateTime"
 
-#: dinfdlg.src#SFX_LB_PROPERTY_TYPE.3.stringlist.text
+#. -%o5
+#: dinfdlg.src
+msgctxt ""
+"dinfdlg.src\n"
+"SFX_LB_PROPERTY_TYPE\n"
+"3\n"
+"stringlist.text"
 msgid "Date"
 msgstr "Dyddiad"
 
-#: dinfdlg.src#SFX_LB_PROPERTY_TYPE.4.stringlist.text
-msgctxt "dinfdlg.src#SFX_LB_PROPERTY_TYPE.4.stringlist.text"
+#. {kG{
+#: dinfdlg.src
+msgctxt ""
+"dinfdlg.src\n"
+"SFX_LB_PROPERTY_TYPE\n"
+"4\n"
+"stringlist.text"
 msgid "Duration"
 msgstr "Hyd"
 
-#: dinfdlg.src#SFX_LB_PROPERTY_TYPE.5.stringlist.text
+#. _Np)
+#: dinfdlg.src
+msgctxt ""
+"dinfdlg.src\n"
+"SFX_LB_PROPERTY_TYPE\n"
+"5\n"
+"stringlist.text"
 msgid "Number"
 msgstr "Rhif"
 
-#: dinfdlg.src#SFX_LB_PROPERTY_TYPE.6.stringlist.text
+#. tq*v
+#: dinfdlg.src
+msgctxt ""
+"dinfdlg.src\n"
+"SFX_LB_PROPERTY_TYPE\n"
+"6\n"
+"stringlist.text"
 msgid "Yes or no"
 msgstr "Iawn neu na"
 
-#: dinfdlg.src#SFX_ST_DURATION_FORMAT.string.text
+#. {,W4
+#: dinfdlg.src
+msgctxt ""
+"dinfdlg.src\n"
+"SFX_ST_DURATION_FORMAT\n"
+"string.text"
 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"
 
-#: dinfdlg.src#SFX_WIN_PROPERTY_YESNO.RB_PROPERTY_YES.radiobutton.text
+#. ]QP-
+#: dinfdlg.src
+msgctxt ""
+"dinfdlg.src\n"
+"SFX_WIN_PROPERTY_YESNO\n"
+"RB_PROPERTY_YES\n"
+"radiobutton.text"
 msgid "Yes"
 msgstr "Iawn"
 
-#: dinfdlg.src#SFX_WIN_PROPERTY_YESNO.RB_PROPERTY_NO.radiobutton.text
+#. 7_#.
+#: dinfdlg.src
+msgctxt ""
+"dinfdlg.src\n"
+"SFX_WIN_PROPERTY_YESNO\n"
+"RB_PROPERTY_NO\n"
+"radiobutton.text"
 msgid "No"
 msgstr "Na"
 
-#: dinfdlg.src#SFX_PB_PROPERTY_REMOVE.imagebutton.text
-msgctxt "dinfdlg.src#SFX_PB_PROPERTY_REMOVE.imagebutton.text"
+#. 1#/#
+#: dinfdlg.src
+msgctxt ""
+"dinfdlg.src\n"
+"SFX_PB_PROPERTY_REMOVE\n"
+"imagebutton.text"
 msgid "-"
 msgstr "-"
 
-#: dinfdlg.src#SFX_PB_PROPERTY_REMOVE.imagebutton.quickhelptext
+#. O8#o
+#: dinfdlg.src
+msgctxt ""
+"dinfdlg.src\n"
+"SFX_PB_PROPERTY_REMOVE\n"
+"imagebutton.quickhelptext"
 msgid "Remove Property"
 msgstr "Tynnu'r Priodwedd"
 
-#: dinfdlg.src#SFX_QB_WRONG_TYPE.querybox.text
+#. TE(l
+#: dinfdlg.src
+msgctxt ""
+"dinfdlg.src\n"
+"SFX_QB_WRONG_TYPE\n"
+"querybox.text"
 msgid ""
 "The value entered does not match the specified type.\n"
 "The value will be stored as text."
@@ -373,670 +1436,951 @@ msgstr ""
 "Nid yw'r gwerth rhoddwyd yn cyd-fynd a'r math a benodwyd.\n"
 "Bydd y gwerth yn cael ei gadw fel testun."
 
-#: dinfdlg.src#SID_DOCINFO.1.TP_DOCINFODOC.pageitem.text
+#. 7e(`
+#: dinfdlg.src
+msgctxt ""
+"dinfdlg.src\n"
+"SID_DOCINFO.1\n"
+"TP_DOCINFODOC\n"
+"pageitem.text"
 msgid "General"
 msgstr "Cyffredinol"
 
-#: dinfdlg.src#SID_DOCINFO.1.TP_DOCINFODESC.pageitem.text
+#. Vu7}
+#: dinfdlg.src
+msgctxt ""
+"dinfdlg.src\n"
+"SID_DOCINFO.1\n"
+"TP_DOCINFODESC\n"
+"pageitem.text"
 msgid "Description"
 msgstr "Disgrifiad"
 
-#: dinfdlg.src#SID_DOCINFO.1.TP_CUSTOMPROPERTIES.pageitem.text
+#. Bix*
+#: dinfdlg.src
+msgctxt ""
+"dinfdlg.src\n"
+"SID_DOCINFO.1\n"
+"TP_CUSTOMPROPERTIES\n"
+"pageitem.text"
 msgid "Custom Properties"
 msgstr "Priodweddau Cyfaddas"
 
-#: dinfdlg.src#SID_DOCINFO.1.TP_DOCINFORELOAD.pageitem.text
+#. !ET3
+#: dinfdlg.src
+msgctxt ""
+"dinfdlg.src\n"
+"SID_DOCINFO.1\n"
+"TP_DOCINFORELOAD\n"
+"pageitem.text"
 msgid "Internet"
 msgstr "Rhyngrwyd"
 
-#: dinfdlg.src#SID_DOCINFO.1.TP_DOCINFOSECURITY.pageitem.text
+#. M8a.
+#: dinfdlg.src
+msgctxt ""
+"dinfdlg.src\n"
+"SID_DOCINFO.1\n"
+"TP_DOCINFOSECURITY\n"
+"pageitem.text"
 msgid "Security"
 msgstr "Security"
 
-#: dinfdlg.src#SID_DOCINFO.tabdialog.text
+#. qWQ?
+#: dinfdlg.src
+msgctxt ""
+"dinfdlg.src\n"
+"SID_DOCINFO\n"
+"tabdialog.text"
 msgid "Properties of "
 msgstr "Priodweddau "
 
-#: dinfdlg.src#RID_EDIT_DURATIONS.FL_DURATION.fixedline.text
-msgctxt "dinfdlg.src#RID_EDIT_DURATIONS.FL_DURATION.fixedline.text"
+#. ?1$B
+#: dinfdlg.src
+msgctxt ""
+"dinfdlg.src\n"
+"RID_EDIT_DURATIONS\n"
+"FL_DURATION\n"
+"fixedline.text"
 msgid "Duration"
 msgstr "Hyd"
 
-#: dinfdlg.src#RID_EDIT_DURATIONS.CB_NEGATIVE.checkbox.text
+#. kBMk
+#: dinfdlg.src
+msgctxt ""
+"dinfdlg.src\n"
+"RID_EDIT_DURATIONS\n"
+"CB_NEGATIVE\n"
+"checkbox.text"
 msgid "~Negative"
 msgstr "~Negydd"
 
-#: dinfdlg.src#RID_EDIT_DURATIONS.FT_YEAR.fixedtext.text
+#. DFPm
+#: dinfdlg.src
+msgctxt ""
+"dinfdlg.src\n"
+"RID_EDIT_DURATIONS\n"
+"FT_YEAR\n"
+"fixedtext.text"
 msgid "~Years"
 msgstr "~Blwyddyn"
 
-#: dinfdlg.src#RID_EDIT_DURATIONS.FT_MONTH.fixedtext.text
+#. n?5|
+#: dinfdlg.src
+msgctxt ""
+"dinfdlg.src\n"
+"RID_EDIT_DURATIONS\n"
+"FT_MONTH\n"
+"fixedtext.text"
 msgid "~Months"
 msgstr "~Mis"
 
-#: dinfdlg.src#RID_EDIT_DURATIONS.FT_DAY.fixedtext.text
+#. U7[:
+#: dinfdlg.src
+msgctxt ""
+"dinfdlg.src\n"
+"RID_EDIT_DURATIONS\n"
+"FT_DAY\n"
+"fixedtext.text"
 msgid "~Days"
 msgstr "~Diwrnod"
 
-#: dinfdlg.src#RID_EDIT_DURATIONS.FT_HOUR.fixedtext.text
+#. 9Y,0
+#: dinfdlg.src
+msgctxt ""
+"dinfdlg.src\n"
+"RID_EDIT_DURATIONS\n"
+"FT_HOUR\n"
+"fixedtext.text"
 msgid "H~ours"
 msgstr "~Awr"
 
-#: dinfdlg.src#RID_EDIT_DURATIONS.FT_MINUTE.fixedtext.text
+#. ut_5
+#: dinfdlg.src
+msgctxt ""
+"dinfdlg.src\n"
+"RID_EDIT_DURATIONS\n"
+"FT_MINUTE\n"
+"fixedtext.text"
 msgid "Min~utes"
 msgstr "M~unud"
 
-#: dinfdlg.src#RID_EDIT_DURATIONS.FT_SECOND.fixedtext.text
+#. V/|I
+#: dinfdlg.src
+msgctxt ""
+"dinfdlg.src\n"
+"RID_EDIT_DURATIONS\n"
+"FT_SECOND\n"
+"fixedtext.text"
 msgid "~Seconds"
 msgstr "~Eiliad"
 
-#: dinfdlg.src#RID_EDIT_DURATIONS.FT_MSECOND.fixedtext.text
+#. GTKg
+#: dinfdlg.src
+msgctxt ""
+"dinfdlg.src\n"
+"RID_EDIT_DURATIONS\n"
+"FT_MSECOND\n"
+"fixedtext.text"
 msgid "Millise~conds"
 msgstr "~Milfedeiliad"
 
-#: dinfdlg.src#RID_EDIT_DURATIONS.modaldialog.text
+#. %[Bm
+#: dinfdlg.src
+msgctxt ""
+"dinfdlg.src\n"
+"RID_EDIT_DURATIONS\n"
+"modaldialog.text"
 msgid "Edit Duration"
 msgstr "Golygu'r Hyd"
 
-#: srchdlg.src#RID_DLG_SEARCH.FT_SEARCH.fixedtext.text
-msgid "~Search for"
-msgstr "~Chwilio am"
-
-#: srchdlg.src#RID_DLG_SEARCH.CB_WHOLEWORDS.checkbox.text
-msgid "~Whole words only"
-msgstr "~Geiriau cyfan yn unig"
-
-#: srchdlg.src#RID_DLG_SEARCH.CB_MATCHCASE.checkbox.text
-msgid "~Match case"
-msgstr "~Cydweddu maint"
-
-#: srchdlg.src#RID_DLG_SEARCH.CB_WRAPAROUND.checkbox.text
-msgctxt "srchdlg.src#RID_DLG_SEARCH.CB_WRAPAROUND.checkbox.text"
-msgid "Wrap ~around"
-msgstr "~Amlapio"
-
-#: srchdlg.src#RID_DLG_SEARCH.CB_BACKWARDS.checkbox.text
-msgid "~Backwards"
-msgstr "~Nôl"
-
-#: srchdlg.src#RID_DLG_SEARCH.PB_FIND.pushbutton.text
-msgid "~Find"
-msgstr "~Chwilio"
-
-#: srchdlg.src#RID_DLG_SEARCH.PB_CANCELFIND.cancelbutton.text
-msgctxt "srchdlg.src#RID_DLG_SEARCH.PB_CANCELFIND.cancelbutton.text"
-msgid "~Close"
-msgstr "~Cau"
-
-#: srchdlg.src#RID_DLG_SEARCH.STR_TOGGLE.string.text
-msgctxt "srchdlg.src#RID_DLG_SEARCH.STR_TOGGLE.string.text"
-msgid "Wrap ~around"
-msgstr "~Amlapio"
-
-#: srchdlg.src#RID_DLG_SEARCH.modelessdialog.text
-msgid "Find on this Page"
-msgstr "Canfod yn y Dudalen"
-
-#: mgetempl.src#TP_MANAGE_STYLES.FT_NAME.fixedtext.text
-msgid "~Name"
-msgstr "~Enw"
+#. mR$8
+#: versdlg.src
+msgctxt ""
+"versdlg.src\n"
+"DLG_VERSIONS\n"
+"GB_NEWVERSIONS\n"
+"fixedline.text"
+msgid "New versions"
+msgstr "Fersiynau newydd"
 
-#: mgetempl.src#TP_MANAGE_STYLES.CB_AUTO.checkbox.text
-msgid "~AutoUpdate"
-msgstr "~AwtoDiweddaru"
+#. gFff
+#: versdlg.src
+msgctxt ""
+"versdlg.src\n"
+"DLG_VERSIONS\n"
+"PB_SAVE\n"
+"pushbutton.text"
+msgid "Save ~New Version"
+msgstr "Cadw Fersiwn ~Newydd"
 
-#: mgetempl.src#TP_MANAGE_STYLES.FT_NEXT.fixedtext.text
-msgid "Ne~xt Style"
-msgstr "Arddull ~Nesaf"
+#. 6hr`
+#: versdlg.src
+msgctxt ""
+"versdlg.src\n"
+"DLG_VERSIONS\n"
+"CB_SAVEONCLOSE\n"
+"checkbox.text"
+msgid "~Always save a version on closing"
+msgstr "Cadw fersiwn wrth ~gau"
 
-#: mgetempl.src#TP_MANAGE_STYLES.FT_BASE.fixedtext.text
-msgid "Linked with"
-msgstr "Cysylltiedig a"
+#. ^n1%
+#: versdlg.src
+msgctxt ""
+"versdlg.src\n"
+"DLG_VERSIONS\n"
+"GB_OLDVERSIONS\n"
+"fixedline.text"
+msgid "Existing versions"
+msgstr "Fersiynau presennol"
 
-#: mgetempl.src#TP_MANAGE_STYLES.FT_REGION.fixedtext.text
-msgid "~Category"
-msgstr "~Categori"
+#. kngM
+#: versdlg.src
+msgctxt ""
+"versdlg.src\n"
+"DLG_VERSIONS\n"
+"FT_DATETIME\n"
+"fixedtext.text"
+msgid "Date and time"
+msgstr "Dyddiad ac amser"
 
-#: mgetempl.src#TP_MANAGE_STYLES.GB_DESC.fixedline.text
-msgid "Contains"
-msgstr "Yn cynnwys"
+#. I!k^
+#: versdlg.src
+msgctxt ""
+"versdlg.src\n"
+"DLG_VERSIONS\n"
+"FT_SAVEDBY\n"
+"fixedtext.text"
+msgid "Saved by"
+msgstr "Cadwyd gan"
 
-#: securitypage.src#TP_DOCINFOSECURITY.PASSWORD_TO_OPEN_FL.fixedline.text
-msgid "File encryption password"
-msgstr "Cyfrinair amgryptio ffeil"
+#. 2rx~
+#: versdlg.src
+msgctxt ""
+"versdlg.src\n"
+"DLG_VERSIONS\n"
+"FT_COMMENTS\n"
+"fixedtext.text"
+msgid "Comments"
+msgstr "Sylwadau"
 
-#: securitypage.src#TP_DOCINFOSECURITY.PASSWORD_TO_OPEN_FT.fixedtext.text
-msgid "~Enter password to open"
-msgstr "~Rhoi cyfrinair i'w agor"
+#. )}O.
+#: versdlg.src
+#, fuzzy
+msgctxt ""
+"versdlg.src\n"
+"DLG_VERSIONS\n"
+"PB_CLOSE\n"
+"cancelbutton.text"
+msgid "Close"
+msgstr "Cau"
 
-#: securitypage.src#TP_DOCINFOSECURITY.CONFIRM_PASSWORD_TO_OPEN_FT.fixedtext.text
-msgid "~Reenter password to open"
-msgstr "~Ailosod cyfrinair i'w agor"
+#. s$}:
+#: versdlg.src
+msgctxt ""
+"versdlg.src\n"
+"DLG_VERSIONS\n"
+"PB_OPEN\n"
+"pushbutton.text"
+msgid "Open"
+msgstr "Agor"
 
-#: securitypage.src#TP_DOCINFOSECURITY.PASSWORD_TO_MODIFY_FL.fixedline.text
-msgid "File sharing password"
-msgstr "Cyfrinair rhannu ffeil"
+#. :qS-
+#: versdlg.src
+msgctxt ""
+"versdlg.src\n"
+"DLG_VERSIONS\n"
+"PB_VIEW\n"
+"pushbutton.text"
+msgid "~Show..."
+msgstr "~Dangos..."
 
-#: securitypage.src#TP_DOCINFOSECURITY.PASSWORD_TO_MODIFY_FT.fixedtext.text
-msgid "Enter password to modify"
-msgstr "Rhosi cyfrinair er mwyn newid"
+#. N+O_
+#: versdlg.src
+msgctxt ""
+"versdlg.src\n"
+"DLG_VERSIONS\n"
+"PB_DELETE\n"
+"pushbutton.text"
+msgid "~Delete"
+msgstr "~Dileu"
 
-#: securitypage.src#TP_DOCINFOSECURITY.CONFIRM_PASSWORD_TO_MODIFY_FT.fixedtext.text
-msgid "Reenter password to modify"
-msgstr "Ailosod cvyfrinair er mwyn newid"
+#. H8-n
+#: versdlg.src
+msgctxt ""
+"versdlg.src\n"
+"DLG_VERSIONS\n"
+"PB_COMPARE\n"
+"pushbutton.text"
+msgid "Compare"
+msgstr "Cymharu"
 
-#: securitypage.src#TP_DOCINFOSECURITY.OPTIONS_FL.fixedline.text
-msgid "File sharing options"
-msgstr "Dewisiadau rhannu ffeil"
+#. N:/a
+#: versdlg.src
+msgctxt ""
+"versdlg.src\n"
+"DLG_VERSIONS\n"
+"modaldialog.text"
+msgid "Versions of"
+msgstr "Fersiynau"
 
-#: securitypage.src#TP_DOCINFOSECURITY.OPEN_READONLY_CB.checkbox.text
-msgid "~Open file read-only"
-msgstr "~Agor ffeil darllen yn unig"
+#. 5^dy
+#: versdlg.src
+#, fuzzy
+msgctxt ""
+"versdlg.src\n"
+"DLG_COMMENTS\n"
+"FT_DATETIME\n"
+"fixedtext.text"
+msgid "Date and time: "
+msgstr "Dyddiad ac amser : "
 
-#: securitypage.src#TP_DOCINFOSECURITY.RECORD_CHANGES_CB.checkbox.text
-msgid "Record ~changes"
-msgstr "Cofnodi ~newidiadau"
+#. i^2a
+#: versdlg.src
+msgctxt ""
+"versdlg.src\n"
+"DLG_COMMENTS\n"
+"FT_SAVEDBY\n"
+"fixedtext.text"
+msgid "Saved by "
+msgstr "Cadwyd gan "
 
-#: securitypage.src#TP_DOCINFOSECURITY.STR_PROTECT.string.text
-msgid "~Protect..."
-msgstr "~Amddiffyn..."
+#. 4a?B
+#: versdlg.src
+msgctxt ""
+"versdlg.src\n"
+"DLG_COMMENTS\n"
+"PB_CLOSE\n"
+"pushbutton.text"
+msgid "~Close"
+msgstr "~Cau"
 
-#: securitypage.src#TP_DOCINFOSECURITY.STR_UNPROTECT.string.text
-msgid "~Unprotect..."
-msgstr "~Peidio amddiffyn..."
+#. u!vs
+#: versdlg.src
+msgctxt ""
+"versdlg.src\n"
+"DLG_COMMENTS\n"
+"modaldialog.text"
+msgid "Insert Version Comment"
+msgstr "Mewnosod Sylwadau'r Fersiwn"
 
-#: securitypage.src#TP_DOCINFOSECURITY.STR_END_REDLINING_WARNING.string.text
-msgid ""
-"This action will exit the change recording mode.\n"
-"Any information about changes will be lost.\n"
-"\n"
-"Exit change recording mode?\n"
-"\n"
-msgstr ""
-"Bydd y weithred yn gadael y newid ym modd recordio.\n"
-"Bydd unrhyw wybodaeth am newidiadau yn cael eu newid.\n"
-"\n"
-" Gadael modd recordio newid?\n"
-"\n"
+#. U*s]
+#: versdlg.src
+msgctxt ""
+"versdlg.src\n"
+"DLG_COMMENTS\n"
+"string.text"
+msgid "Version comment"
+msgstr "Sylwadau'r fersiwn"
 
-#: securitypage.src#RID_SFX_INCORRECT_PASSWORD.string.text
-msgid "Incorrect password"
-msgstr "Cyfrinair anghywir"
+#. m]KH
+#: versdlg.src
+#, fuzzy
+msgctxt ""
+"versdlg.src\n"
+"STR_VIEWVERSIONCOMMENT\n"
+"string.text"
+msgid "View Version Comment"
+msgstr "Mewnosod Sylwadau'r Fersiwn"
 
-#: printopt.src#TP_COMMONPRINTOPTIONS.GB_REDUCE.fixedline.text
+#. a[Q2
+#: printopt.src
+msgctxt ""
+"printopt.src\n"
+"TP_COMMONPRINTOPTIONS\n"
+"GB_REDUCE\n"
+"fixedline.text"
 msgid "Reduce print data"
 msgstr "Lleihau'r data argraffu"
 
-#: printopt.src#TP_COMMONPRINTOPTIONS.FT_OUTPUTTYPE.fixedtext.text
+#. PqLY
+#: printopt.src
+msgctxt ""
+"printopt.src\n"
+"TP_COMMONPRINTOPTIONS\n"
+"FT_OUTPUTTYPE\n"
+"fixedtext.text"
 msgid "Settings for"
 msgstr "Gosodiadau"
 
-#: printopt.src#TP_COMMONPRINTOPTIONS.RB_PRINTEROUTPUT.radiobutton.text
+#. XLBv
+#: printopt.src
+msgctxt ""
+"printopt.src\n"
+"TP_COMMONPRINTOPTIONS\n"
+"RB_PRINTEROUTPUT\n"
+"radiobutton.text"
 msgid "~Printer"
 msgstr "~Argraffydd"
 
-#: printopt.src#TP_COMMONPRINTOPTIONS.RB_PRINTFILEOUTPUT.radiobutton.text
+#. ?AlS
+#: printopt.src
+msgctxt ""
+"printopt.src\n"
+"TP_COMMONPRINTOPTIONS\n"
+"RB_PRINTFILEOUTPUT\n"
+"radiobutton.text"
 msgid "Print to ~file"
 msgstr "Argraffu i ~ffeil"
 
-#: printopt.src#TP_COMMONPRINTOPTIONS.CB_REDUCETRANSPARENCY.checkbox.text
+#. cH79
+#: printopt.src
+msgctxt ""
+"printopt.src\n"
+"TP_COMMONPRINTOPTIONS\n"
+"CB_REDUCETRANSPARENCY\n"
+"checkbox.text"
 msgid "~Reduce transparency"
 msgstr "~Lleihau tryloywder"
 
-#: printopt.src#TP_COMMONPRINTOPTIONS.RB_REDUCETRANSPARENCY_AUTO.radiobutton.text
+#. bn27
+#: printopt.src
+msgctxt ""
+"printopt.src\n"
+"TP_COMMONPRINTOPTIONS\n"
+"RB_REDUCETRANSPARENCY_AUTO\n"
+"radiobutton.text"
 msgid "Auto~matically"
 msgstr "~Yn awtomatig"
 
-#: printopt.src#TP_COMMONPRINTOPTIONS.RB_REDUCETRANSPARENCY_NONE.radiobutton.text
+#. 0789
+#: printopt.src
+msgctxt ""
+"printopt.src\n"
+"TP_COMMONPRINTOPTIONS\n"
+"RB_REDUCETRANSPARENCY_NONE\n"
+"radiobutton.text"
 msgid "~No transparency"
 msgstr "~Dim tryloywder"
 
-#: printopt.src#TP_COMMONPRINTOPTIONS.CB_REDUCEGRADIENTS.checkbox.text
+#. W%;W
+#: printopt.src
+msgctxt ""
+"printopt.src\n"
+"TP_COMMONPRINTOPTIONS\n"
+"CB_REDUCEGRADIENTS\n"
+"checkbox.text"
 msgid "Reduce ~gradients"
 msgstr "Lleihau ~graddiant"
 
-#: printopt.src#TP_COMMONPRINTOPTIONS.RB_REDUCEGRADIENTS_STRIPES.radiobutton.text
+#. pK``
+#: printopt.src
+msgctxt ""
+"printopt.src\n"
+"TP_COMMONPRINTOPTIONS\n"
+"RB_REDUCEGRADIENTS_STRIPES\n"
+"radiobutton.text"
 msgid "Gradient ~stripes"
 msgstr "~Stribedi graddiant"
 
-#: printopt.src#TP_COMMONPRINTOPTIONS.RB_REDUCEGRADIENTS_COLOR.radiobutton.text
+#. -`R%
+#: printopt.src
+msgctxt ""
+"printopt.src\n"
+"TP_COMMONPRINTOPTIONS\n"
+"RB_REDUCEGRADIENTS_COLOR\n"
+"radiobutton.text"
 msgid "Intermediate ~color"
 msgstr "Lliw ~rhyngol"
 
-#: printopt.src#TP_COMMONPRINTOPTIONS.CB_REDUCEBITMAPS.checkbox.text
+#. 59bv
+#: printopt.src
+msgctxt ""
+"printopt.src\n"
+"TP_COMMONPRINTOPTIONS\n"
+"CB_REDUCEBITMAPS\n"
+"checkbox.text"
 msgid "Reduce ~bitmaps"
 msgstr "Lleihau ~didfapiau"
 
-#: printopt.src#TP_COMMONPRINTOPTIONS.RB_REDUCEBITMAPS_OPTIMAL.radiobutton.text
+#. 4SXX
+#: printopt.src
+msgctxt ""
+"printopt.src\n"
+"TP_COMMONPRINTOPTIONS\n"
+"RB_REDUCEBITMAPS_OPTIMAL\n"
+"radiobutton.text"
 msgid "~High print quality"
 msgstr "A~rgraffiad ansawdd uchel"
 
-#: printopt.src#TP_COMMONPRINTOPTIONS.RB_REDUCEBITMAPS_NORMAL.radiobutton.text
+#. .6j)
+#: printopt.src
+msgctxt ""
+"printopt.src\n"
+"TP_COMMONPRINTOPTIONS\n"
+"RB_REDUCEBITMAPS_NORMAL\n"
+"radiobutton.text"
 msgid "N~ormal print quality"
 msgstr "Ar~graffiad ansawdd arferol"
 
-#: printopt.src#TP_COMMONPRINTOPTIONS.RB_REDUCEBITMAPS_RESOLUTION.radiobutton.text
+#. rp)0
+#: printopt.src
+msgctxt ""
+"printopt.src\n"
+"TP_COMMONPRINTOPTIONS\n"
+"RB_REDUCEBITMAPS_RESOLUTION\n"
+"radiobutton.text"
 msgid "Reso~lution"
 msgstr "~Cydraniad"
 
-#: printopt.src#TP_COMMONPRINTOPTIONS.LB_REDUCEBITMAPS_RESOLUTION.1.stringlist.text
+#. DbzG
+#: printopt.src
+msgctxt ""
+"printopt.src\n"
+"TP_COMMONPRINTOPTIONS.LB_REDUCEBITMAPS_RESOLUTION\n"
+"1\n"
+"stringlist.text"
 msgid "72 DPI"
 msgstr "72 DPI"
 
-#: printopt.src#TP_COMMONPRINTOPTIONS.LB_REDUCEBITMAPS_RESOLUTION.2.stringlist.text
+#. n4a5
+#: printopt.src
+msgctxt ""
+"printopt.src\n"
+"TP_COMMONPRINTOPTIONS.LB_REDUCEBITMAPS_RESOLUTION\n"
+"2\n"
+"stringlist.text"
 msgid "96 DPI"
 msgstr "96 DPI"
 
-#: printopt.src#TP_COMMONPRINTOPTIONS.LB_REDUCEBITMAPS_RESOLUTION.3.stringlist.text
+#. !.m%
+#: printopt.src
+msgctxt ""
+"printopt.src\n"
+"TP_COMMONPRINTOPTIONS.LB_REDUCEBITMAPS_RESOLUTION\n"
+"3\n"
+"stringlist.text"
 msgid "150 DPI (Fax)"
 msgstr "150 DPI (Ffacs)"
 
-#: printopt.src#TP_COMMONPRINTOPTIONS.LB_REDUCEBITMAPS_RESOLUTION.4.stringlist.text
+#. d]Um
+#: printopt.src
+msgctxt ""
+"printopt.src\n"
+"TP_COMMONPRINTOPTIONS.LB_REDUCEBITMAPS_RESOLUTION\n"
+"4\n"
+"stringlist.text"
 msgid "200 DPI (default)"
 msgstr "200 DPI (rhagosodedig)"
 
-#: printopt.src#TP_COMMONPRINTOPTIONS.LB_REDUCEBITMAPS_RESOLUTION.5.stringlist.text
+#. e\,d
+#: printopt.src
+msgctxt ""
+"printopt.src\n"
+"TP_COMMONPRINTOPTIONS.LB_REDUCEBITMAPS_RESOLUTION\n"
+"5\n"
+"stringlist.text"
 msgid "300 DPI"
 msgstr "300 DPI"
 
-#: printopt.src#TP_COMMONPRINTOPTIONS.LB_REDUCEBITMAPS_RESOLUTION.6.stringlist.text
+#. }9ij
+#: printopt.src
+msgctxt ""
+"printopt.src\n"
+"TP_COMMONPRINTOPTIONS.LB_REDUCEBITMAPS_RESOLUTION\n"
+"6\n"
+"stringlist.text"
 msgid "600 DPI"
 msgstr "600 DPI"
 
-#: printopt.src#TP_COMMONPRINTOPTIONS.CB_REDUCEBITMAPS_TRANSPARENCY.checkbox.text
+#. U13i
+#: printopt.src
+msgctxt ""
+"printopt.src\n"
+"TP_COMMONPRINTOPTIONS\n"
+"CB_REDUCEBITMAPS_TRANSPARENCY\n"
+"checkbox.text"
 msgid "Include transparent ob~jects"
 msgstr "Cynnwys ~gwrthrychau tryloyw"
 
-#: printopt.src#TP_COMMONPRINTOPTIONS.CB_CONVERTTOGREYSCALES.checkbox.text
+#. }#8m
+#: printopt.src
+msgctxt ""
+"printopt.src\n"
+"TP_COMMONPRINTOPTIONS\n"
+"CB_CONVERTTOGREYSCALES\n"
+"checkbox.text"
 msgid "Con~vert colors to grayscale"
 msgstr "~Trosi lliwiau i graddlwyd"
 
-#: printopt.src#TP_COMMONPRINTOPTIONS.GB_PRINT_WARN.fixedline.text
+#. S!sE
+#: printopt.src
+msgctxt ""
+"printopt.src\n"
+"TP_COMMONPRINTOPTIONS\n"
+"GB_PRINT_WARN\n"
+"fixedline.text"
 msgid "Printer warnings"
 msgstr "Rhybuddion argraffu"
 
-#: printopt.src#TP_COMMONPRINTOPTIONS.CB_PAPERSIZE.checkbox.text
+#. g19K
+#: printopt.src
+msgctxt ""
+"printopt.src\n"
+"TP_COMMONPRINTOPTIONS\n"
+"CB_PAPERSIZE\n"
+"checkbox.text"
 msgid "P~aper size"
 msgstr "~Maint papur"
 
-#: printopt.src#TP_COMMONPRINTOPTIONS.CB_PAPERORIENTATION.checkbox.text
+#. K.K@
+#: printopt.src
+msgctxt ""
+"printopt.src\n"
+"TP_COMMONPRINTOPTIONS\n"
+"CB_PAPERORIENTATION\n"
+"checkbox.text"
 msgid "Pap~er orientation"
 msgstr "Cyfeiriadedd ~papur"
 
-#: printopt.src#TP_COMMONPRINTOPTIONS.CB_TRANSPARENCY.checkbox.text
+#. B5tJ
+#: printopt.src
+msgctxt ""
+"printopt.src\n"
+"TP_COMMONPRINTOPTIONS\n"
+"CB_TRANSPARENCY\n"
+"checkbox.text"
 msgid "~Transparency"
 msgstr "~Tryloywder"
 
-#: alienwarn.src#RID_DLG_ALIEN_WARNING.FT_INFOTEXT.fixedtext.text
-msgid ""
-"This document may contain formatting or content that cannot be saved in the currently selected file format \"%FORMATNAME\".\n"
-"\n"
-"Use the default ODF file format to be sure that the document is saved correctly."
-msgstr ""
-"Gall y ddogfen gynnwys fformatio neu gynnwys nad oes modd eu cadw yn y fformat cyfredol \"%FORMATNAME\".\n"
-"\n"
-"Defnyddiwch y fformat ffeil ODF rhagosodedig i fod yn siŵr fod y ddogfen yn cael ei chadw´n gywir."
-
-#: alienwarn.src#RID_DLG_ALIEN_WARNING.PB_NO.okbutton.text
-msgid "~Use %FORMATNAME Format"
-msgstr "~Defnyddio Fformat %FORMATNAME"
-
-#: alienwarn.src#RID_DLG_ALIEN_WARNING.PB_YES.cancelbutton.text
-msgid "Use ~ODF Format"
-msgstr "Defnyddio Fformat ~ODF"
-
-#: alienwarn.src#RID_DLG_ALIEN_WARNING.PB_MOREINFO.helpbutton.text
-msgid "~More Information..."
-msgstr "~Rhagor o wybodaeth..."
-
-#: alienwarn.src#RID_DLG_ALIEN_WARNING.CB_WARNING_OFF.checkbox.text
-msgid "~Ask when not saving in ODF format"
-msgstr "~Gofyn pan nad yn cadw i fformat ODF"
-
-#: alienwarn.src#RID_DLG_ALIEN_WARNING.modaldialog.text
-msgid "Confirm File Format"
-msgstr "Cadarnhau Fformat FFeil"
-
-#: taskpane.src#STR_SFX_DOCK.string.text
-msgid "Dock"
-msgstr "Doc"
-
-#: taskpane.src#STR_SFX_UNDOCK.string.text
-msgid "Undock"
-msgstr "Dad-ddocio"
-
-#: taskpane.src#STR_SFX_TASK_PANE_VIEW.string.text
-msgid "View"
-msgstr "Golwg"
-
-#: taskpane.src#STR_SFX_TASKS.string.text
-msgid "Tasks"
-msgstr "Tasgau"
-
-#: dinfedt.src#DLG_DOCINFO_EDT.FL_INFO.fixedline.text
-msgid "Names"
-msgstr "Enwau"
-
-#: dinfedt.src#DLG_DOCINFO_EDT.modaldialog.text
-msgid "Edit Field Names"
-msgstr "Golygu Enwau'r Meysydd"
-
-#: dialog.src#STR_RESET.string.text
-msgid "~Reset"
-msgstr "~Ailosod"
-
-#: dialog.src#STR_APPLY.string.text
-msgid "Apply"
-msgstr "Gosod"
-
-#: dialog.src#STR_TABPAGE_MANAGESTYLES.string.text
-msgid "Organizer"
-msgstr "Trefnydd"
-
-#: dialog.src#MSG_TABPAGE_INVALIDNAME.infobox.text
-msgid "This name is already in use."
-msgstr "Mae'r enw'n cael ei ddefnyddio eisoes."
-
-#: dialog.src#MSG_TABPAGE_INVALIDSTYLE.infobox.text
-msgid "This Style does not exist."
-msgstr "Nid yw'r Arddull yn bodoli."
-
-#: dialog.src#MSG_TABPAGE_INVALIDPARENT.infobox.text
-msgid ""
-"This Style cannot be used as a base Style,\n"
-"because it would result in a recursive reference."
-msgstr ""
-"Nid oes modd defnyddio'r Arddull fel yr Arddull sail;\n"
-"gan y byddai'n arwain at gyfeiriad ailadroddus."
-
-#: dialog.src#MSG_POOL_STYLE_NAME.infobox.text
-msgid ""
-"Name already exists as a default Style.\n"
-"Please choose another name."
-msgstr ""
-"Mae'r enw'n bodoli fel Arddull rhagosodedig eisoes.\n"
-"Dewiswch enw arall."
-
-#: dialog.src#STR_DELETE_STYLE.string.text
-msgid "Do you really want to delete Style $1?"
-msgstr "Ydych chi wir am ddileu Arddull $1?"
-
-#: dialog.src#STR_DELETE_STYLE_USED.string.text
-msgid "You are deleting an applied Style!\n"
-msgstr "Rydych yn dileu Arddull osodedig!\n"
-
-#: dialog.src#MN_CONTEXT_TEMPLDLG.ID_NEW.menuitem.text
-msgid "New..."
-msgstr "Newydd..."
-
-#: dialog.src#MN_CONTEXT_TEMPLDLG.ID_EDIT.menuitem.text
-msgid "Modify..."
-msgstr "Newid..."
-
-#: dialog.src#MN_CONTEXT_TEMPLDLG.ID_DELETE.menuitem.text
-msgid "Delete..."
-msgstr "Dileu..."
-
-#: dialog.src#SID_NAVIGATOR.string.text
-msgid "Navigator"
-msgstr "Dewisydd"
-
-#: dialog.src#SID_TASKPANE.string.text
-msgid "Task Pane"
-msgstr "Task Pane"
-
-#: dialog.src#MSG_ERROR_WRONG_CONFIRM.errorbox.text
-msgid "Faulty password confirmation"
-msgstr "Cadarnhad cyfrinair gwallus"
-
-#: dialog.src#STR_PDF_EXPORT_SEND.string.text
-msgid "Send"
-msgstr "Anfon"
-
-#: versdlg.src#DLG_VERSIONS.GB_NEWVERSIONS.fixedline.text
-msgid "New versions"
-msgstr "Fersiynau newydd"
-
-#: versdlg.src#DLG_VERSIONS.PB_SAVE.pushbutton.text
-msgid "Save ~New Version"
-msgstr "Cadw Fersiwn ~Newydd"
-
-#: versdlg.src#DLG_VERSIONS.CB_SAVEONCLOSE.checkbox.text
-msgid "~Always save a version on closing"
-msgstr "Cadw fersiwn wrth ~gau"
-
-#: versdlg.src#DLG_VERSIONS.GB_OLDVERSIONS.fixedline.text
-msgid "Existing versions"
-msgstr "Fersiynau presennol"
-
-#: versdlg.src#DLG_VERSIONS.FT_DATETIME.fixedtext.text
-msgid "Date and time"
-msgstr "Dyddiad ac amser"
-
-#: versdlg.src#DLG_VERSIONS.FT_SAVEDBY.fixedtext.text
-msgid "Saved by"
-msgstr "Cadwyd gan"
-
-#: versdlg.src#DLG_VERSIONS.FT_COMMENTS.fixedtext.text
-msgid "Comments"
-msgstr "Sylwadau"
-
-#: versdlg.src#DLG_VERSIONS.PB_CLOSE.cancelbutton.text
-msgid "Close"
-msgstr "Cau"
-
-#: versdlg.src#DLG_VERSIONS.PB_OPEN.pushbutton.text
-msgid "Open"
-msgstr "Agor"
-
-#: versdlg.src#DLG_VERSIONS.PB_VIEW.pushbutton.text
-msgid "~Show..."
-msgstr "~Dangos..."
-
-#: versdlg.src#DLG_VERSIONS.PB_DELETE.pushbutton.text
-msgid "~Delete"
-msgstr "~Dileu"
-
-#: versdlg.src#DLG_VERSIONS.PB_COMPARE.pushbutton.text
-msgid "Compare"
-msgstr "Cymharu"
-
-#: versdlg.src#DLG_VERSIONS.modaldialog.text
-msgid "Versions of"
-msgstr "Fersiynau"
-
-#: versdlg.src#DLG_COMMENTS.FT_DATETIME.fixedtext.text
-msgid "Date and time : "
-msgstr "Dyddiad ac amser : "
-
-#: versdlg.src#DLG_COMMENTS.FT_SAVEDBY.fixedtext.text
-msgid "Saved by "
-msgstr "Cadwyd gan "
-
-#: versdlg.src#DLG_COMMENTS.PB_CLOSE.pushbutton.text
-msgctxt "versdlg.src#DLG_COMMENTS.PB_CLOSE.pushbutton.text"
-msgid "~Close"
-msgstr "~Cau"
-
-#: versdlg.src#DLG_COMMENTS.modaldialog.text
-msgid "Insert Version Comment"
-msgstr "Mewnosod Sylwadau'r Fersiwn"
-
-#: versdlg.src#DLG_COMMENTS.string.text
-msgid "Version comment"
-msgstr "Sylwadau'r fersiwn"
-
-#: templdlg.src#RID_STYLECATALOG.BT_ORG.pushbutton.text
+#. kl#\
+#: templdlg.src
+msgctxt ""
+"templdlg.src\n"
+"RID_STYLECATALOG\n"
+"BT_ORG\n"
+"pushbutton.text"
 msgid "~Organizer..."
 msgstr "~Trefnydd..."
 
-#: templdlg.src#RID_STYLECATALOG.BT_DEL.pushbutton.text
+#. ^fQl
+#: templdlg.src
+msgctxt ""
+"templdlg.src\n"
+"RID_STYLECATALOG\n"
+"BT_DEL\n"
+"pushbutton.text"
 msgid "~Delete..."
 msgstr "~Dileu..."
 
-#: templdlg.src#RID_STYLECATALOG.BT_EDIT.pushbutton.text
+#. {*Bu
+#: templdlg.src
+msgctxt ""
+"templdlg.src\n"
+"RID_STYLECATALOG\n"
+"BT_EDIT\n"
+"pushbutton.text"
 msgid "~Modify..."
 msgstr "~Newid..."
 
-#: templdlg.src#RID_STYLECATALOG.BT_NEW.pushbutton.text
+#. +7{V
+#: templdlg.src
+msgctxt ""
+"templdlg.src\n"
+"RID_STYLECATALOG\n"
+"BT_NEW\n"
+"pushbutton.text"
 msgid "~New..."
 msgstr "~Newydd..."
 
-#: templdlg.src#RID_STYLECATALOG.modaldialog.text
+#. G[YS
+#: templdlg.src
+msgctxt ""
+"templdlg.src\n"
+"RID_STYLECATALOG\n"
+"modaldialog.text"
 msgid "Style Catalog"
 msgstr "Catalog Arddull"
 
-#: templdlg.src#STR_STYLE_ELEMTLIST.string.text
+#. 7b#$
+#: templdlg.src
+msgctxt ""
+"templdlg.src\n"
+"STR_STYLE_ELEMTLIST\n"
+"string.text"
 msgid "Style List"
 msgstr "Rhestr Arddulliau"
 
-#: templdlg.src#STR_STYLE_FILTER_HIERARCHICAL.string.text
+#. ]0I-
+#: templdlg.src
+msgctxt ""
+"templdlg.src\n"
+"STR_STYLE_FILTER_HIERARCHICAL\n"
+"string.text"
 msgid "Hierarchical"
 msgstr "Hierarchaidd"
 
-#: templdlg.src#DLG_STYLE_DESIGNER.TB_ACTION.SID_STYLE_WATERCAN.toolboxitem.text
+#. x]$p
+#: templdlg.src
+msgctxt ""
+"templdlg.src\n"
+"DLG_STYLE_DESIGNER.TB_ACTION\n"
+"SID_STYLE_WATERCAN\n"
+"toolboxitem.text"
 msgid "Fill Format Mode"
 msgstr "Modd Fformat Llanw"
 
-#: templdlg.src#DLG_STYLE_DESIGNER.TB_ACTION.SID_STYLE_NEW_BY_EXAMPLE.toolboxitem.text
+#. +]]6
+#: templdlg.src
+msgctxt ""
+"templdlg.src\n"
+"DLG_STYLE_DESIGNER.TB_ACTION\n"
+"SID_STYLE_NEW_BY_EXAMPLE\n"
+"toolboxitem.text"
 msgid "New Style from Selection"
 msgstr "Arddull Newydd o'r Dewis"
 
-#: templdlg.src#DLG_STYLE_DESIGNER.TB_ACTION.SID_STYLE_UPDATE_BY_EXAMPLE.toolboxitem.text
+#. ]cw:
+#: templdlg.src
+msgctxt ""
+"templdlg.src\n"
+"DLG_STYLE_DESIGNER.TB_ACTION\n"
+"SID_STYLE_UPDATE_BY_EXAMPLE\n"
+"toolboxitem.text"
 msgid "Update Style"
 msgstr "Diweddaru Arddull"
 
-#: templdlg.src#DLG_STYLE_DESIGNER.dockingwindow.text
+#. sP_G
+#: templdlg.src
+msgctxt ""
+"templdlg.src\n"
+"DLG_STYLE_DESIGNER\n"
+"dockingwindow.text"
 msgid "Styles and Formatting"
 msgstr "Arddulliau a Fformatio"
 
-#: recfloat.src#SID_RECORDING_FLOATWINDOW.floatingwindow.text
-msgid "Record Macro"
-msgstr "Recordio Macro"
-
-#: recfloat.src#STR_MACRO_LOSS.string.text
-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."
-
-#: recfloat.src#STR_CANCEL_RECORDING.string.text
-msgid "Cancel Recording"
-msgstr "Diddymu Recordio"
-
-#: filedlghelper.src#STR_SFX_FILEDLG_ACTUALVERSION.string.text
+#. {8W=
+#: filedlghelper.src
+msgctxt ""
+"filedlghelper.src\n"
+"STR_SFX_FILEDLG_ACTUALVERSION\n"
+"string.text"
 msgid "Current version"
 msgstr "Fersiwn presennol"
 
-#: filedlghelper.src#STR_SFX_EXPLORERFILE_EXPORT.string.text
+#. B$YO
+#: filedlghelper.src
+msgctxt ""
+"filedlghelper.src\n"
+"STR_SFX_EXPLORERFILE_EXPORT\n"
+"string.text"
 msgid "Export"
 msgstr "Allforio"
 
-#: filedlghelper.src#STR_SFX_EXPLORERFILE_INSERT.string.text
+#. UCWw
+#: filedlghelper.src
+msgctxt ""
+"filedlghelper.src\n"
+"STR_SFX_EXPLORERFILE_INSERT\n"
+"string.text"
 msgid "Insert"
 msgstr "Mewnosod"
 
-#: filedlghelper.src#STR_SFX_EXPLORERFILE_BUTTONINSERT.string.text
+#. d|_J
+#: filedlghelper.src
+msgctxt ""
+"filedlghelper.src\n"
+"STR_SFX_EXPLORERFILE_BUTTONINSERT\n"
+"string.text"
 msgid "~Insert"
 msgstr "~Mewnosod"
 
-#: filedlghelper.src#STR_SFX_IMPORT_ALL.string.text
+#. MgX_
+#: filedlghelper.src
+msgctxt ""
+"filedlghelper.src\n"
+"STR_SFX_IMPORT_ALL\n"
+"string.text"
 msgid "<All formats>"
 msgstr "<Pob fformat>"
 
-#: filedlghelper.src#STR_CB_AUTO_EXTENSION.string.text
+#. Ygel
+#: filedlghelper.src
+msgctxt ""
+"filedlghelper.src\n"
+"STR_CB_AUTO_EXTENSION\n"
+"string.text"
 msgid "~Automatic file name extension"
 msgstr "~Estyniad enw ffeil awtomatig"
 
-#: filedlghelper.src#STR_CB_SELECTION.string.text
+#. #b)s
+#: filedlghelper.src
+msgctxt ""
+"filedlghelper.src\n"
+"STR_CB_SELECTION\n"
+"string.text"
 msgid "~Selection"
 msgstr "~Dewis"
 
-#: filedlghelper.src#STR_CB_INSERT_AS_LINK.string.text
+#. IKsx
+#: filedlghelper.src
+msgctxt ""
+"filedlghelper.src\n"
+"STR_CB_INSERT_AS_LINK\n"
+"string.text"
 msgid "~Link"
 msgstr "~Cyswllt"
 
-#: filedlghelper.src#STR_CB_SHOW_PREVIEW.string.text
+#. M=*K
+#: filedlghelper.src
+msgctxt ""
+"filedlghelper.src\n"
+"STR_CB_SHOW_PREVIEW\n"
+"string.text"
 msgid "Pr~eview"
 msgstr "~Rhagolwg"
 
-#: filedlghelper.src#STR_CB_READONLY.string.text
-msgctxt "filedlghelper.src#STR_CB_READONLY.string.text"
+#. V3s1
+#: filedlghelper.src
+msgctxt ""
+"filedlghelper.src\n"
+"STR_CB_READONLY\n"
+"string.text"
 msgid "~Read-only"
 msgstr "~Darllen-yn-unig"
 
-#: filedlghelper.src#STR_CB_PASSWORD.string.text
+#. Osl|
+#: filedlghelper.src
+msgctxt ""
+"filedlghelper.src\n"
+"STR_CB_PASSWORD\n"
+"string.text"
 msgid "Save with ~password"
 msgstr "Ca~dw gyda chyfrinair"
 
-#: filedlghelper.src#STR_CB_FILTER_OPTIONS.string.text
+#. ^.Yi
+#: filedlghelper.src
+msgctxt ""
+"filedlghelper.src\n"
+"STR_CB_FILTER_OPTIONS\n"
+"string.text"
 msgid "Edit ~filter settings"
 msgstr "~Golygu gosodiadau'r hidl"
 
-#: filedlghelper.src#STR_PB_PLAY.string.text
+#. f$O}
+#: filedlghelper.src
+msgctxt ""
+"filedlghelper.src\n"
+"STR_PB_PLAY\n"
+"string.text"
 msgid "~Play"
 msgstr "~Chwarae"
 
-#: filedlghelper.src#STR_PB_STOP.string.text
+#. hNbj
+#: filedlghelper.src
+msgctxt ""
+"filedlghelper.src\n"
+"STR_PB_STOP\n"
+"string.text"
 msgid "Sto~p"
 msgstr "~Atal"
 
-#: filedlghelper.src#STR_PB_OPEN.string.text
+#. K3Z1
+#: filedlghelper.src
+msgctxt ""
+"filedlghelper.src\n"
+"STR_PB_OPEN\n"
+"string.text"
 msgid "~Open"
 msgstr "~Agor"
 
-#: filedlghelper.src#STR_PB_SAVE.string.text
+#. Xk|n
+#: filedlghelper.src
+msgctxt ""
+"filedlghelper.src\n"
+"STR_PB_SAVE\n"
+"string.text"
 msgid "~Save"
 msgstr "C~adw"
 
-#: filedlghelper.src#STR_LB_IMAGE_TEMPLATE.string.text
+#. 6J]U
+#: filedlghelper.src
+msgctxt ""
+"filedlghelper.src\n"
+"STR_LB_IMAGE_TEMPLATE\n"
+"string.text"
 msgid "Style:"
 msgstr "Arddull:"
 
-#: filedlghelper.src#STR_LB_TEMPLATES.string.text
+#. 6Q7U
+#: filedlghelper.src
+msgctxt ""
+"filedlghelper.src\n"
+"STR_LB_TEMPLATES\n"
+"string.text"
 msgid "~Templates:"
 msgstr "~Templedi:"
 
-#: filedlghelper.src#STR_LB_VERSION.string.text
+#. *tTq
+#: filedlghelper.src
+msgctxt ""
+"filedlghelper.src\n"
+"STR_LB_VERSION\n"
+"string.text"
 msgid "~Version:"
 msgstr "~Fersiwn:"
 
-#: passwd.src#DLG_PASSWD.FT_PASSWD_USER.fixedtext.text
-msgid "~User"
-msgstr "~Defnyddiwr"
-
-#: passwd.src#DLG_PASSWD.FT_PASSWD_PASSWORD.fixedtext.text
-msgid "~Password"
-msgstr "~Cyfrinair"
-
-#: passwd.src#DLG_PASSWD.FT_PASSWD_CONFIRM.fixedtext.text
-msgid "~Confirm"
-msgstr "~Cadarnhau"
-
-#: passwd.src#DLG_PASSWD.STR_PASSWD_MIN_LEN.string.text
-msgid "(Minimum $(MINLEN) characters)"
-msgstr "(Isafswm $(MINLEN) nod)"
-
-#: passwd.src#DLG_PASSWD.STR_PASSWD_EMPTY.string.text
-msgid "(The password can be empty)"
-msgstr "(Gall y cyfrinair fod yn wag)"
+#. 4|yl
+#: alienwarn.src
+msgctxt ""
+"alienwarn.src\n"
+"RID_DLG_ALIEN_WARNING\n"
+"FT_INFOTEXT\n"
+"fixedtext.text"
+msgid ""
+"This document may contain formatting or content that cannot be saved in the currently selected file format \"%FORMATNAME\".\n"
+"\n"
+"Use the default ODF file format to be sure that the document is saved correctly."
+msgstr ""
+"Gall y ddogfen gynnwys fformatio neu gynnwys nad oes modd eu cadw yn y fformat cyfredol \"%FORMATNAME\".\n"
+"\n"
+"Defnyddiwch y fformat ffeil ODF rhagosodedig i fod yn siŵr fod y ddogfen yn cael ei chadw´n gywir."
 
-#: passwd.src#DLG_PASSWD.GB_PASSWD_PASSWORD.fixedline.text
-msgctxt "passwd.src#DLG_PASSWD.GB_PASSWD_PASSWORD.fixedline.text"
-msgid "Password"
-msgstr "Cyfrinair"
+#. h=E$
+#: alienwarn.src
+msgctxt ""
+"alienwarn.src\n"
+"RID_DLG_ALIEN_WARNING\n"
+"PB_NO\n"
+"okbutton.text"
+msgid "~Use %FORMATNAME Format"
+msgstr "~Defnyddio Fformat %FORMATNAME"
 
-#: passwd.src#DLG_PASSWD.FT_PASSWD_PASSWORD2.fixedtext.text
-msgid "P~assword"
-msgstr "~Cyfrinair"
+#. IbMf
+#: alienwarn.src
+msgctxt ""
+"alienwarn.src\n"
+"RID_DLG_ALIEN_WARNING\n"
+"PB_YES\n"
+"cancelbutton.text"
+msgid "Use ~ODF Format"
+msgstr "Defnyddio Fformat ~ODF"
 
-#: passwd.src#DLG_PASSWD.FT_PASSWD_CONFIRM2.fixedtext.text
-msgid "Confir~m"
-msgstr "~Cadarnhau"
+#. 3KB6
+#: alienwarn.src
+msgctxt ""
+"alienwarn.src\n"
+"RID_DLG_ALIEN_WARNING\n"
+"PB_MOREINFO\n"
+"helpbutton.text"
+msgid "~More Information..."
+msgstr "~Rhagor o wybodaeth..."
 
-#: passwd.src#DLG_PASSWD.TEXT_PASSWD.string.text
-msgctxt "passwd.src#DLG_PASSWD.TEXT_PASSWD.string.text"
-msgid "Password"
-msgstr "Cyfrinair"
+#. +^pN
+#: alienwarn.src
+msgctxt ""
+"alienwarn.src\n"
+"RID_DLG_ALIEN_WARNING\n"
+"CB_WARNING_OFF\n"
+"checkbox.text"
+msgid "~Ask when not saving in ODF format"
+msgstr "~Gofyn pan nad yn cadw i fformat ODF"
 
-#: passwd.src#DLG_PASSWD.modaldialog.text
-msgid "Enter Password"
-msgstr "Rhowch Gyfrinair"
+#. NBw1
+#: alienwarn.src
+msgctxt ""
+"alienwarn.src\n"
+"RID_DLG_ALIEN_WARNING\n"
+"modaldialog.text"
+msgid "Confirm File Format"
+msgstr "Cadarnhau Fformat FFeil"
diff --git a/source/cy/sfx2/source/doc.po b/source/cy/sfx2/source/doc.po
index d8489fb8990..eef0f830e21 100644
--- a/source/cy/sfx2/source/doc.po
+++ b/source/cy/sfx2/source/doc.po
@@ -1,9 +1,9 @@
-#. extracted from sfx2/source/doc.oo
+#. extracted from sfx2/source/doc
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: http://qa.openoffice.org/issues/enter_bug.cgi?comment=&component=l10n&form_name=enter_issue&short_desc=Localization+issue+in+file%3A+sfx2%2Fsource%2Fdoc.oo&subcomponent=ui\n"
-"POT-Creation-Date: 2012-07-04 16:39+0200\n"
+"Report-Msgid-Bugs-To: https://bugs.freedesktop.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
+"POT-Creation-Date: 2012-11-17 19:03+0200\n"
 "PO-Revision-Date: 2012-07-06 14:52+0200\n"
 "Last-Translator: Rhoslyn <rprys@yahoo.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -12,232 +12,850 @@ msgstr ""
 "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: Translate Toolkit 1.9.0\n"
+"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
 
-#: doctdlg.src#DLG_DOC_TEMPLATE.FL_EDIT.fixedline.text
-msgid "New template"
-msgstr "Templed newydd"
+#. v,qj
+#: templatelocnames.src
+msgctxt ""
+"templatelocnames.src\n"
+"STR_TEMPLATE_NAME1\n"
+"string.text"
+msgid "Abstract Green"
+msgstr "Gwyrdd Haniaethol"
 
-#: doctdlg.src#DLG_DOC_TEMPLATE.FL_STYLESHEETS.fixedline.text
-msgctxt "doctdlg.src#DLG_DOC_TEMPLATE.FL_STYLESHEETS.fixedline.text"
-msgid "Templates"
-msgstr "Templedi"
+#. ^hb8
+#: templatelocnames.src
+msgctxt ""
+"templatelocnames.src\n"
+"STR_TEMPLATE_NAME2\n"
+"string.text"
+msgid "Abstract Red"
+msgstr "Coch Haniaethol"
 
-#: doctdlg.src#DLG_DOC_TEMPLATE.FT_SECTION.fixedtext.text
-msgctxt "doctdlg.src#DLG_DOC_TEMPLATE.FT_SECTION.fixedtext.text"
-msgid "~Categories"
-msgstr "~Categorïau"
+#. W@PV
+#: templatelocnames.src
+msgctxt ""
+"templatelocnames.src\n"
+"STR_TEMPLATE_NAME3\n"
+"string.text"
+msgid "Abstract Yellow"
+msgstr "Melyn Haniaethol"
 
-#: doctdlg.src#DLG_DOC_TEMPLATE.FT_STYLESHEETS.fixedtext.text
-msgid "~Templates"
-msgstr "~Templedi"
+#. 6/3w
+#: templatelocnames.src
+msgctxt ""
+"templatelocnames.src\n"
+"STR_TEMPLATE_NAME4\n"
+"string.text"
+msgid "Bright Blue"
+msgstr "Glas Llachar"
 
-#: doctdlg.src#DLG_DOC_TEMPLATE.BT_EDIT.pushbutton.text
-msgctxt "doctdlg.src#DLG_DOC_TEMPLATE.BT_EDIT.pushbutton.text"
-msgid "~Edit"
-msgstr "~Golygu"
+#. RLxB
+#: templatelocnames.src
+msgctxt ""
+"templatelocnames.src\n"
+"STR_TEMPLATE_NAME5\n"
+"string.text"
+msgid "DNA"
+msgstr "DNA"
 
-#: doctdlg.src#DLG_DOC_TEMPLATE.BT_ORGANIZE.pushbutton.text
-msgid "~Organizer..."
-msgstr "~Trefnydd..."
+#. 22R5
+#: templatelocnames.src
+msgctxt ""
+"templatelocnames.src\n"
+"STR_TEMPLATE_NAME6\n"
+"string.text"
+msgid "Inspiration"
+msgstr "Ysbrydoliaeth"
 
-#: doctdlg.src#DLG_DOC_TEMPLATE.modaldialog.text
-msgctxt "doctdlg.src#DLG_DOC_TEMPLATE.modaldialog.text"
-msgid "Templates"
-msgstr "Templedi"
+#. RFEE
+#: templatelocnames.src
+msgctxt ""
+"templatelocnames.src\n"
+"STR_TEMPLATE_NAME7\n"
+"string.text"
+msgid "Lush Green"
+msgstr "Gwyrdd Dwfn"
+
+#. )n37
+#: templatelocnames.src
+msgctxt ""
+"templatelocnames.src\n"
+"STR_TEMPLATE_NAME8\n"
+"string.text"
+msgid "Metropolis"
+msgstr "Metropolis"
+
+#. 2Q%M
+#: templatelocnames.src
+msgctxt ""
+"templatelocnames.src\n"
+"STR_TEMPLATE_NAME9\n"
+"string.text"
+msgid "Sunset"
+msgstr "Machlud Haul"
+
+#. utTB
+#: templatelocnames.src
+msgctxt ""
+"templatelocnames.src\n"
+"STR_TEMPLATE_NAME10\n"
+"string.text"
+msgid "Vintage"
+msgstr "Hynafol"
+
+#. nS.#
+#: templatedlg.src
+msgctxt ""
+"templatedlg.src\n"
+"STR_ACTION_SORT_NAME\n"
+"string.text"
+msgid "Sort by name"
+msgstr ""
+
+#. !IZx
+#: templatedlg.src
+msgctxt ""
+"templatedlg.src\n"
+"STR_ACTION_REFRESH\n"
+"string.text"
+msgid "Refresh"
+msgstr "Adnewyddu"
+
+#. 8%9/
+#: templatedlg.src
+msgctxt ""
+"templatedlg.src\n"
+"STR_ACTION_DEFAULT\n"
+"string.text"
+msgid "Reset Default Template \\\" ; /* leave ending space */ \\\""
+msgstr ""
+
+#. |@fi
+#: templatedlg.src
+msgctxt ""
+"templatedlg.src\n"
+"STR_MOVE_NEW\n"
+"string.text"
+msgid "New folder"
+msgstr ""
+
+#. ;[%7
+#: templatedlg.src
+msgctxt ""
+"templatedlg.src\n"
+"STR_INPUT_NEW\n"
+"string.text"
+msgid "Enter folder name:"
+msgstr ""
+
+#. n#:i
+#: templatedlg.src
+msgctxt ""
+"templatedlg.src\n"
+"STR_REPOSITORY_LOCAL\n"
+"string.text"
+msgid "Local"
+msgstr ""
+
+#. }2E0
+#: templatedlg.src
+msgctxt ""
+"templatedlg.src\n"
+"STR_REPOSITORY_NEW\n"
+"string.text"
+msgid "New Repository"
+msgstr ""
+
+#. h|12
+#: templatedlg.src
+msgctxt ""
+"templatedlg.src\n"
+"STR_MSG_ERROR_LOCAL_MOVE\n"
+"string.text"
+msgid ""
+"Error moving the following templates to $1.\n"
+"$2"
+msgstr ""
+
+#. -?4V
+#: templatedlg.src
+msgctxt ""
+"templatedlg.src\n"
+"STR_MSG_ERROR_REMOTE_MOVE\n"
+"string.text"
+msgid ""
+"Error moving the following templates from repository $1 to folder $2.\n"
+"$3"
+msgstr ""
+
+#. z5SS
+#: templatedlg.src
+msgctxt ""
+"templatedlg.src\n"
+"STR_MSG_ERROR_EXPORT\n"
+"string.text"
+msgid ""
+"Error exporting the following templates:\n"
+"$1"
+msgstr ""
+
+#. VgHC
+#: templatedlg.src
+msgctxt ""
+"templatedlg.src\n"
+"STR_MSG_ERROR_IMPORT\n"
+"string.text"
+msgid ""
+"Error importing the following templates to $1:\n"
+"$2"
+msgstr ""
+
+#. mI%F
+#: templatedlg.src
+msgctxt ""
+"templatedlg.src\n"
+"STR_MSG_ERROR_DELETE_TEMPLATE\n"
+"string.text"
+msgid ""
+"The following templates cannot be deleted:\n"
+"$1"
+msgstr ""
+
+#. V2R,
+#: templatedlg.src
+msgctxt ""
+"templatedlg.src\n"
+"STR_MSG_ERROR_DELETE_FOLDER\n"
+"string.text"
+msgid ""
+"The following folders cannot be deleted:\n"
+"$1"
+msgstr ""
+
+#. tBFV
+#: templatedlg.src
+msgctxt ""
+"templatedlg.src\n"
+"STR_MSG_ERROR_REPOSITORY_NAME\n"
+"string.text"
+msgid ""
+"Failed to create repository \"$1\".\n"
+"A repository with this name may already exist."
+msgstr ""
+
+#. d]\M
+#: templatedlg.src
+msgctxt ""
+"templatedlg.src\n"
+"STR_MSG_ERROR_SELECT_FOLDER\n"
+"string.text"
+msgid "Select the destination folder(s) to save the template."
+msgstr ""
+
+#. V#5Q
+#: templatedlg.src
+msgctxt ""
+"templatedlg.src\n"
+"STR_INPUT_TEMPLATE_NEW\n"
+"string.text"
+msgid "Enter template name:"
+msgstr ""
+
+#. KrEn
+#: templatedlg.src
+#, fuzzy
+msgctxt ""
+"templatedlg.src\n"
+"STR_QMSG_SEL_FOLDER_DELETE\n"
+"string.text"
+msgid "Do you want to delete the selected folders?"
+msgstr "Hoffech chi ddileu'r data hwn?"
+
+#. \6o;
+#: templatedlg.src
+msgctxt ""
+"templatedlg.src\n"
+"STR_QMSG_TEMPLATE_OVERWRITE\n"
+"string.text"
+msgid "A template named $1 already exist in $2. Do you want to overwrite it?"
+msgstr ""
+
+#. Hl}L
+#: templatedlg.src
+msgctxt ""
+"templatedlg.src\n"
+"DLG_TEMPLATE_MANAGER\n"
+"BTN_SELECT_ALL\n"
+"pushbutton.text"
+msgid "All"
+msgstr "Popeth"
+
+#. y**4
+#: templatedlg.src
+#, fuzzy
+msgctxt ""
+"templatedlg.src\n"
+"DLG_TEMPLATE_MANAGER\n"
+"BTN_SELECT_DOCS\n"
+"pushbutton.text"
+msgid "Documents"
+msgstr "Dogfennau"
+
+#. sL`.
+#: templatedlg.src
+#, fuzzy
+msgctxt ""
+"templatedlg.src\n"
+"DLG_TEMPLATE_MANAGER\n"
+"BTN_SELECT_PRESENTATIONS\n"
+"pushbutton.text"
+msgid "Presentations"
+msgstr "Cyflwyniadau"
+
+#. #MSN
+#: templatedlg.src
+#, fuzzy
+msgctxt ""
+"templatedlg.src\n"
+"DLG_TEMPLATE_MANAGER\n"
+"BTN_SELECT_SHEETS\n"
+"pushbutton.text"
+msgid "Spreadsheets"
+msgstr "Taenlen"
+
+#. PZ`+
+#: templatedlg.src
+#, fuzzy
+msgctxt ""
+"templatedlg.src\n"
+"DLG_TEMPLATE_MANAGER\n"
+"BTN_SELECT_DRAWS\n"
+"pushbutton.text"
+msgid "Drawings"
+msgstr "Lluniadu"
+
+#. UOPo
+#: templatedlg.src
+msgctxt ""
+"templatedlg.src\n"
+"DLG_TEMPLATE_MANAGER\n"
+"BTN_SELECTION_MODE\n"
+"imagebutton.text"
+msgid "-"
+msgstr ""
+
+#. ?vkk
+#: templatedlg.src
+msgctxt ""
+"templatedlg.src\n"
+"DLG_TEMPLATE_MANAGER\n"
+"BTN_SELECTION_MODE\n"
+"imagebutton.quickhelptext"
+msgid "Enables selecting items by just clicking in the thumbnail or title."
+msgstr ""
+
+#. 64gr
+#: templatedlg.src
+msgctxt ""
+"templatedlg.src\n"
+"DLG_TEMPLATE_MANAGER.TBX_ACTION_VIEW\n"
+"TBI_TEMPLATE_REPOSITORY\n"
+"toolboxitem.text"
+msgid "Repository"
+msgstr "Storfa"
+
+#. i6iN
+#: templatedlg.src
+msgctxt ""
+"templatedlg.src\n"
+"DLG_TEMPLATE_MANAGER.TBX_ACTION_VIEW\n"
+"TBI_TEMPLATE_IMPORT\n"
+"toolboxitem.text"
+msgid "Import"
+msgstr "Mewnforio"
+
+#. #nRL
+#: templatedlg.src
+#, fuzzy
+msgctxt ""
+"templatedlg.src\n"
+"DLG_TEMPLATE_MANAGER.TBX_ACTION_VIEW\n"
+"TBI_TEMPLATE_FOLDER_DEL\n"
+"toolboxitem.text"
+msgid "Delete"
+msgstr "~Dileu"
+
+#. 9{u5
+#: templatedlg.src
+#, fuzzy
+msgctxt ""
+"templatedlg.src\n"
+"DLG_TEMPLATE_MANAGER.TBX_ACTION_VIEW\n"
+"TBI_TEMPLATE_SAVE\n"
+"toolboxitem.text"
+msgid "Save"
+msgstr "C~adw"
+
+#. lH=l
+#: templatedlg.src
+msgctxt ""
+"templatedlg.src\n"
+"DLG_TEMPLATE_MANAGER.TBX_ACTION_ACTION\n"
+"TBI_TEMPLATE_SEARCH\n"
+"toolboxitem.text"
+msgid "Search"
+msgstr "Chwilio"
+
+#. YBE$
+#: templatedlg.src
+msgctxt ""
+"templatedlg.src\n"
+"DLG_TEMPLATE_MANAGER.TBX_ACTION_ACTION\n"
+"TBI_TEMPLATE_ACTION\n"
+"toolboxitem.text"
+msgid "Action Menu"
+msgstr ""
+
+#. m-8s
+#: templatedlg.src
+#, fuzzy
+msgctxt ""
+"templatedlg.src\n"
+"DLG_TEMPLATE_MANAGER.TBX_ACTION_TEMPLATES\n"
+"TBI_TEMPLATE_EDIT\n"
+"toolboxitem.text"
+msgid "Edit"
+msgstr "Golygu"
+
+#. XRJr
+#: templatedlg.src
+msgctxt ""
+"templatedlg.src\n"
+"DLG_TEMPLATE_MANAGER.TBX_ACTION_TEMPLATES\n"
+"TBI_TEMPLATE_PROPERTIES\n"
+"toolboxitem.text"
+msgid "Properties"
+msgstr "Priodweddau"
+
+#. Ig](
+#: templatedlg.src
+#, fuzzy
+msgctxt ""
+"templatedlg.src\n"
+"DLG_TEMPLATE_MANAGER.TBX_ACTION_TEMPLATES\n"
+"TBI_TEMPLATE_DEFAULT\n"
+"toolboxitem.text"
+msgid "Set as default"
+msgstr "Gosod ~rhagosodiad"
+
+#. MR-9
+#: templatedlg.src
+msgctxt ""
+"templatedlg.src\n"
+"DLG_TEMPLATE_MANAGER.TBX_ACTION_TEMPLATES\n"
+"TBI_TEMPLATE_MOVE\n"
+"toolboxitem.text"
+msgid "Move to folder"
+msgstr ""
+
+#. arsq
+#: templatedlg.src
+#, fuzzy
+msgctxt ""
+"templatedlg.src\n"
+"DLG_TEMPLATE_MANAGER.TBX_ACTION_TEMPLATES\n"
+"TBI_TEMPLATE_EXPORT\n"
+"toolboxitem.text"
+msgid "Export"
+msgstr "Allforio"
 
-#: new.src#DLG_NEW_FILE.FT_REGION.fixedtext.text
-msgctxt "new.src#DLG_NEW_FILE.FT_REGION.fixedtext.text"
+#. +;%S
+#: templatedlg.src
+#, fuzzy
+msgctxt ""
+"templatedlg.src\n"
+"DLG_TEMPLATE_MANAGER.TBX_ACTION_TEMPLATES\n"
+"TBI_TEMPLATE_DELETE\n"
+"toolboxitem.text"
+msgid "Delete"
+msgstr "~Dileu"
+
+#. ;-`e
+#: templatedlg.src
+#, fuzzy
+msgctxt ""
+"templatedlg.src\n"
+"DLG_TEMPLATE_MANAGER\n"
+"modelessdialog.text"
+msgid "Template Manager"
+msgstr "Rheoli Templedi"
+
+#. KI5$
+#: new.src
+msgctxt ""
+"new.src\n"
+"DLG_NEW_FILE\n"
+"FT_REGION\n"
+"fixedtext.text"
 msgid "~Categories"
 msgstr "~Categorïau"
 
-#: new.src#DLG_NEW_FILE.FT_TEMPLATE.fixedtext.text
+#. Xtt|
+#: new.src
+msgctxt ""
+"new.src\n"
+"DLG_NEW_FILE\n"
+"FT_TEMPLATE\n"
+"fixedtext.text"
 msgid "T~emplates"
 msgstr "~Templedi"
 
-#: new.src#DLG_NEW_FILE.BT_MORE.morebutton.text
+#. GR\d
+#: new.src
+msgctxt ""
+"new.src\n"
+"DLG_NEW_FILE\n"
+"BT_MORE\n"
+"morebutton.text"
 msgid "~More"
 msgstr "M~wy"
 
-#: new.src#DLG_NEW_FILE.BTN_PREVIEW.checkbox.text
+#. Q0|,
+#: new.src
+msgctxt ""
+"new.src\n"
+"DLG_NEW_FILE\n"
+"BTN_PREVIEW\n"
+"checkbox.text"
 msgid "Pre~view"
 msgstr "~Rhagolwg"
 
-#: new.src#DLG_NEW_FILE.GB_DOCINFO.fixedline.text
+#. B4m!
+#: new.src
+msgctxt ""
+"new.src\n"
+"DLG_NEW_FILE\n"
+"GB_DOCINFO\n"
+"fixedline.text"
 msgid "Description"
 msgstr "Disgrifiad"
 
-#: new.src#DLG_NEW_FILE.CB_TEXT_STYLE.checkbox.text
+#. 3j53
+#: new.src
+msgctxt ""
+"new.src\n"
+"DLG_NEW_FILE\n"
+"CB_TEXT_STYLE\n"
+"checkbox.text"
 msgid "Te~xt"
 msgstr "Te~stun"
 
-#: new.src#DLG_NEW_FILE.CB_FRAME_STYLE.checkbox.text
+#. B-Hj
+#: new.src
+msgctxt ""
+"new.src\n"
+"DLG_NEW_FILE\n"
+"CB_FRAME_STYLE\n"
+"checkbox.text"
 msgid "~Frame"
 msgstr "~Ffrâm"
 
-#: new.src#DLG_NEW_FILE.CB_PAGE_STYLE.checkbox.text
+#. 2Ond
+#: new.src
+msgctxt ""
+"new.src\n"
+"DLG_NEW_FILE\n"
+"CB_PAGE_STYLE\n"
+"checkbox.text"
 msgid "~Pages"
 msgstr "~Tudalennau"
 
-#: new.src#DLG_NEW_FILE.CB_NUM_STYLE.checkbox.text
+#. 9fXd
+#: new.src
+msgctxt ""
+"new.src\n"
+"DLG_NEW_FILE\n"
+"CB_NUM_STYLE\n"
+"checkbox.text"
 msgid "N~umbering"
 msgstr "~Rhifo"
 
-#: new.src#DLG_NEW_FILE.CB_MERGE_STYLE.checkbox.text
+#. M]8d
+#: new.src
+msgctxt ""
+"new.src\n"
+"DLG_NEW_FILE\n"
+"CB_MERGE_STYLE\n"
+"checkbox.text"
 msgid "~Overwrite"
 msgstr "~Trosysgrifo"
 
-#: new.src#DLG_NEW_FILE.PB_LOAD_FILE.pushbutton.text
+#. AW)(
+#: new.src
+msgctxt ""
+"new.src\n"
+"DLG_NEW_FILE\n"
+"PB_LOAD_FILE\n"
+"pushbutton.text"
 msgid "From File..."
 msgstr "O Ffeil..."
 
-#: new.src#DLG_NEW_FILE.STR_LOAD_TEMPLATE.string.text
+#. AqxZ
+#: new.src
+msgctxt ""
+"new.src\n"
+"DLG_NEW_FILE\n"
+"STR_LOAD_TEMPLATE\n"
+"string.text"
 msgid "Load Styles"
 msgstr "Arddulliau Llwytho"
 
-#: new.src#DLG_NEW_FILE.FT_TITLE.fixedtext.text
+#. _bXe
+#: new.src
+msgctxt ""
+"new.src\n"
+"DLG_NEW_FILE\n"
+"FT_TITLE\n"
+"fixedtext.text"
 msgid "~Title"
 msgstr "~Teitl"
 
-#: new.src#DLG_NEW_FILE.FT_THEMA.fixedtext.text
+#. qT,/
+#: new.src
+msgctxt ""
+"new.src\n"
+"DLG_NEW_FILE\n"
+"FT_THEMA\n"
+"fixedtext.text"
 msgid "Subject"
 msgstr "Pwnc"
 
-#: new.src#DLG_NEW_FILE.FT_KEYWORDS.fixedtext.text
+#. |n!c
+#: new.src
+msgctxt ""
+"new.src\n"
+"DLG_NEW_FILE\n"
+"FT_KEYWORDS\n"
+"fixedtext.text"
 msgid "~Key words"
 msgstr "~Geiriau allweddol"
 
-#: new.src#DLG_NEW_FILE.FT_DESC.fixedtext.text
+#. v9\*
+#: new.src
+msgctxt ""
+"new.src\n"
+"DLG_NEW_FILE\n"
+"FT_DESC\n"
+"fixedtext.text"
 msgid "~Description"
 msgstr "~Disgrifiad"
 
-#: new.src#DLG_NEW_FILE.modaldialog.text
+#. .f[o
+#: new.src
+msgctxt ""
+"new.src\n"
+"DLG_NEW_FILE\n"
+"modaldialog.text"
 msgid "New"
 msgstr "Newydd"
 
-#: docvor.src#DLG_ORGANIZE.BTN_OK.okbutton.text
+#. vh`x
+#: docvor.src
+msgctxt ""
+"docvor.src\n"
+"DLG_ORGANIZE\n"
+"BTN_OK\n"
+"okbutton.text"
 msgid "Close"
 msgstr "Cau"
 
-#: docvor.src#DLG_ORGANIZE.BTN_FILES.pushbutton.text
+#. ?qiZ
+#: docvor.src
+msgctxt ""
+"docvor.src\n"
+"DLG_ORGANIZE\n"
+"BTN_FILES\n"
+"pushbutton.text"
 msgid "~File..."
 msgstr "~Ffeil..."
 
-#: docvor.src#DLG_ORGANIZE.BTN_ADDRESSTEMPLATE.pushbutton.text
+#. X44j
+#: docvor.src
+msgctxt ""
+"docvor.src\n"
+"DLG_ORGANIZE\n"
+"BTN_ADDRESSTEMPLATE\n"
+"pushbutton.text"
 msgid "~Address Book..."
 msgstr "~Llyfr Cyfeiriadau..."
 
-#: docvor.src#DLG_ORGANIZE.LB_LEFT_TYP.1.stringlist.text
-msgctxt "docvor.src#DLG_ORGANIZE.LB_LEFT_TYP.1.stringlist.text"
+#. D-Z5
+#: docvor.src
+msgctxt ""
+"docvor.src\n"
+"DLG_ORGANIZE.LB_LEFT_TYP\n"
+"1\n"
+"stringlist.text"
 msgid "Templates"
 msgstr "Templedi"
 
-#: docvor.src#DLG_ORGANIZE.LB_LEFT_TYP.2.stringlist.text
-msgctxt "docvor.src#DLG_ORGANIZE.LB_LEFT_TYP.2.stringlist.text"
+#. TMhp
+#: docvor.src
+msgctxt ""
+"docvor.src\n"
+"DLG_ORGANIZE.LB_LEFT_TYP\n"
+"2\n"
+"stringlist.text"
 msgid "Documents"
 msgstr "Dogfennau"
 
-#: docvor.src#DLG_ORGANIZE.LB_RIGHT_TYP.1.stringlist.text
-msgctxt "docvor.src#DLG_ORGANIZE.LB_RIGHT_TYP.1.stringlist.text"
+#. [9n)
+#: docvor.src
+msgctxt ""
+"docvor.src\n"
+"DLG_ORGANIZE.LB_RIGHT_TYP\n"
+"1\n"
+"stringlist.text"
 msgid "Templates"
 msgstr "Templedi"
 
-#: docvor.src#DLG_ORGANIZE.LB_RIGHT_TYP.2.stringlist.text
-msgctxt "docvor.src#DLG_ORGANIZE.LB_RIGHT_TYP.2.stringlist.text"
+#. ?YT,
+#: docvor.src
+msgctxt ""
+"docvor.src\n"
+"DLG_ORGANIZE.LB_RIGHT_TYP\n"
+"2\n"
+"stringlist.text"
 msgid "Documents"
 msgstr "Dogfennau"
 
-#: docvor.src#DLG_ORGANIZE.BTN_EDIT.ID_NEW.menuitem.text
+#. c*Rm
+#: docvor.src
+msgctxt ""
+"docvor.src\n"
+"DLG_ORGANIZE.BTN_EDIT\n"
+"ID_NEW\n"
+"menuitem.text"
 msgid "~New"
 msgstr "~Newydd"
 
-#: docvor.src#DLG_ORGANIZE.BTN_EDIT.ID_DELETE.menuitem.text
+#. .:yD
+#: docvor.src
+msgctxt ""
+"docvor.src\n"
+"DLG_ORGANIZE.BTN_EDIT\n"
+"ID_DELETE\n"
+"menuitem.text"
 msgid "~Delete"
 msgstr "~Dileu"
 
-#: docvor.src#DLG_ORGANIZE.BTN_EDIT.ID_EDIT.menuitem.text
-msgctxt "docvor.src#DLG_ORGANIZE.BTN_EDIT.ID_EDIT.menuitem.text"
+#. 4QR3
+#: docvor.src
+msgctxt ""
+"docvor.src\n"
+"DLG_ORGANIZE.BTN_EDIT\n"
+"ID_EDIT\n"
+"menuitem.text"
 msgid "~Edit"
 msgstr "~Golygu"
 
-#: docvor.src#DLG_ORGANIZE.BTN_EDIT.ID_COPY_FROM.menuitem.text
+#. g9)M
+#: docvor.src
+msgctxt ""
+"docvor.src\n"
+"DLG_ORGANIZE.BTN_EDIT\n"
+"ID_COPY_FROM\n"
+"menuitem.text"
 msgid "Import Template..."
 msgstr "Mewnforio Templed..."
 
-#: docvor.src#DLG_ORGANIZE.BTN_EDIT.ID_COPY_TO.menuitem.text
+#. k9H4
+#: docvor.src
+msgctxt ""
+"docvor.src\n"
+"DLG_ORGANIZE.BTN_EDIT\n"
+"ID_COPY_TO\n"
+"menuitem.text"
 msgid "Export Template..."
 msgstr "Allforio Templed..."
 
-#: docvor.src#DLG_ORGANIZE.BTN_EDIT.ID_PRINT.menuitem.text
+#. 6,7n
+#: docvor.src
+msgctxt ""
+"docvor.src\n"
+"DLG_ORGANIZE.BTN_EDIT\n"
+"ID_PRINT\n"
+"menuitem.text"
 msgid "~Print"
 msgstr "~Argraffu"
 
-#: docvor.src#DLG_ORGANIZE.BTN_EDIT.ID_PRINTER_SETUP.menuitem.text
+#. ZTI1
+#: docvor.src
+msgctxt ""
+"docvor.src\n"
+"DLG_ORGANIZE.BTN_EDIT\n"
+"ID_PRINTER_SETUP\n"
+"menuitem.text"
 msgid "Printer Settings..."
 msgstr "Gosodiadau'r Argraffydd..."
 
-#: docvor.src#DLG_ORGANIZE.BTN_EDIT.ID_RESCAN.menuitem.text
+#. Cd~#
+#: docvor.src
+msgctxt ""
+"docvor.src\n"
+"DLG_ORGANIZE.BTN_EDIT\n"
+"ID_RESCAN\n"
+"menuitem.text"
 msgid "Update"
 msgstr "Diweddaru"
 
-#: docvor.src#DLG_ORGANIZE.BTN_EDIT.ID_DEFAULT_TEMPLATE.menuitem.text
+#. DJ[q
+#: docvor.src
+msgctxt ""
+"docvor.src\n"
+"DLG_ORGANIZE.BTN_EDIT\n"
+"ID_DEFAULT_TEMPLATE\n"
+"menuitem.text"
 msgid "Set As Default Template"
 msgstr "Gosod fel y Templed Rhagosodedig"
 
-#: docvor.src#DLG_ORGANIZE.BTN_EDIT.ID_RESET_DEFAULT_TEMPLATE.menuitem.text
+#. YUE!
+#: docvor.src
+msgctxt ""
+"docvor.src\n"
+"DLG_ORGANIZE.BTN_EDIT\n"
+"ID_RESET_DEFAULT_TEMPLATE\n"
+"menuitem.text"
 msgid "Reset Default Template"
 msgstr "Ailosod fel y Templed Rhagosodedig"
 
-#: docvor.src#DLG_ORGANIZE.BTN_EDIT.menubutton.text
+#. G@-X
+#: docvor.src
+msgctxt ""
+"docvor.src\n"
+"DLG_ORGANIZE\n"
+"BTN_EDIT\n"
+"menubutton.text"
 msgid "Commands"
 msgstr "Gorchmynion"
 
-#: docvor.src#DLG_ORGANIZE.modaldialog.text
+#. vY*9
+#: docvor.src
+msgctxt ""
+"docvor.src\n"
+"DLG_ORGANIZE\n"
+"modaldialog.text"
 msgid "Template Management"
 msgstr "Rheoli Templedi"
 
-#: templatelocnames.src#STR_TEMPLATE_NAME1.string.text
-msgid "Abstract Green"
-msgstr "Gwyrdd Haniaethol"
-
-#: templatelocnames.src#STR_TEMPLATE_NAME2.string.text
-msgid "Abstract Red"
-msgstr "Coch Haniaethol"
-
-#: templatelocnames.src#STR_TEMPLATE_NAME3.string.text
-msgid "Abstract Yellow"
-msgstr "Melyn Haniaethol"
-
-#: templatelocnames.src#STR_TEMPLATE_NAME4.string.text
-msgid "Bright Blue"
-msgstr "Glas Llachar"
-
-#: templatelocnames.src#STR_TEMPLATE_NAME5.string.text
-msgid "DNA"
-msgstr "DNA"
-
-#: templatelocnames.src#STR_TEMPLATE_NAME6.string.text
-msgid "Inspiration"
-msgstr "Ysbrydoliaeth"
-
-#: templatelocnames.src#STR_TEMPLATE_NAME7.string.text
-msgid "Lush Green"
-msgstr "Gwyrdd Dwfn"
-
-#: templatelocnames.src#STR_TEMPLATE_NAME8.string.text
-msgid "Metropolis"
-msgstr "Metropolis"
-
-#: templatelocnames.src#STR_TEMPLATE_NAME9.string.text
-msgid "Sunset"
-msgstr "Machlud Haul"
-
-#: templatelocnames.src#STR_TEMPLATE_NAME10.string.text
-msgid "Vintage"
-msgstr "Hynafol"
-
-#: doc.src#MSG_CONFIRM_FILTER.querybox.text
+#. LaBh
+#: doc.src
+msgctxt ""
+"doc.src\n"
+"MSG_CONFIRM_FILTER\n"
+"querybox.text"
 msgid ""
 "Saving in external formats may have caused\n"
 " information loss. Do you still want to close?"
@@ -245,7 +863,12 @@ msgstr ""
 "Gall fod cadw mewn fformatau allanol fod\n"
 " wedi achosi colli gwybodaeth. Cau?"
 
-#: doc.src#MSG_CONFIRM_OVERWRITE_TEMPLATE.querybox.text
+#. o2P[
+#: doc.src
+msgctxt ""
+"doc.src\n"
+"MSG_CONFIRM_OVERWRITE_TEMPLATE\n"
+"querybox.text"
 msgid ""
 "Name already in use.\n"
 "Do you want to overwrite document template?"
@@ -253,15 +876,30 @@ msgstr ""
 "Enw'n cael ei ddefnyddio eisoes.\n"
 "Trosysgrifo'r ddogfen?"
 
-#: doc.src#STR_DELETE_REGION.string.text
+#. ;jN5
+#: doc.src
+msgctxt ""
+"doc.src\n"
+"STR_DELETE_REGION\n"
+"string.text"
 msgid "Are you sure you want to delete the region \"$1\"?"
 msgstr "Ydych chi am ddileu'r ardal \"$1\"?"
 
-#: doc.src#STR_DELETE_TEMPLATE.string.text
+#. #*aX
+#: doc.src
+msgctxt ""
+"doc.src\n"
+"STR_DELETE_TEMPLATE\n"
+"string.text"
 msgid "Are you sure you want to delete the entry \"$1\"?"
 msgstr "Ydych chi am ddileu'r cofnod \"$1\"?"
 
-#: doc.src#MSG_REGION_NOTEMPTY.querybox.text
+#. Fknt
+#: doc.src
+msgctxt ""
+"doc.src\n"
+"MSG_REGION_NOTEMPTY\n"
+"querybox.text"
 msgid ""
 "The category is not empty.\n"
 "Delete anyway?"
@@ -269,60 +907,129 @@ msgstr ""
 "Nid yw'r categori'n wag.\n"
 "Dileu?"
 
-#: doc.src#STR_QUERY_SAVE_DOCUMENT.string.text
-msgid ""
-"The document \"$(DOC)\" has been modified.\n"
-"Do you want to save your changes?"
+#. 1kZD
+#: doc.src
+msgctxt ""
+"doc.src\n"
+"STR_QUERY_SAVE_DOCUMENT_TITLE\n"
+"string.text"
+msgid "Save document"
+msgstr "Cadw dogfen"
+
+#. KFdF
+#: doc.src
+msgctxt ""
+"doc.src\n"
+"STR_QUERY_SAVE_DOCUMENT\n"
+"string.text"
+msgid "Save changes to document \"$(DOC)\" before closing?"
 msgstr ""
-"Mae dogfen \"$(DOC)\" wedi newid.\n"
-"Cadw'r newidiadau?"
 
-#: doc.src#STR_STYLES.string.text
+#. !EJP
+#: doc.src
+msgctxt ""
+"doc.src\n"
+"STR_STYLES\n"
+"string.text"
 msgid "Styles"
 msgstr "Arddulliau"
 
-#: doc.src#STR_MACROS.string.text
+#. O.KD
+#: doc.src
+msgctxt ""
+"doc.src\n"
+"STR_MACROS\n"
+"string.text"
 msgid "Macros"
 msgstr "Macros"
 
-#: doc.src#STR_CONFIG.string.text
+#. xA\=
+#: doc.src
+msgctxt ""
+"doc.src\n"
+"STR_CONFIG\n"
+"string.text"
 msgid "Configuration"
 msgstr "Ffurfweddiad"
 
-#: doc.src#STR_PRINT_STYLES_HEADER.string.text
+#. v7:a
+#: doc.src
+msgctxt ""
+"doc.src\n"
+"STR_PRINT_STYLES_HEADER\n"
+"string.text"
 msgid "Styles in "
 msgstr "Arddulliau yn "
 
-#: doc.src#STR_PRINT_STYLES.string.text
+#. C:MU
+#: doc.src
+msgctxt ""
+"doc.src\n"
+"STR_PRINT_STYLES\n"
+"string.text"
 msgid "Printing Styles"
 msgstr "Arddulliau Argraffu"
 
-#: doc.src#MSG_PRINT_ERROR.errorbox.text
+#. N\N(
+#: doc.src
+msgctxt ""
+"doc.src\n"
+"MSG_PRINT_ERROR\n"
+"errorbox.text"
 msgid "The print job could not be started."
 msgstr "Methu cychwyn y gwaith argraffu."
 
-#: doc.src#STR_BACKUP_COPY.string.text
+#. @@G5
+#: doc.src
+msgctxt ""
+"doc.src\n"
+"STR_BACKUP_COPY\n"
+"string.text"
 msgid "Copy"
 msgstr "Copïo"
 
-#: doc.src#MSG_CANT_OPEN_TEMPLATE.infobox.text
+#. PGI8
+#: doc.src
+msgctxt ""
+"doc.src\n"
+"MSG_CANT_OPEN_TEMPLATE\n"
+"infobox.text"
 msgid "The template could not be opened."
 msgstr "Methu agor y templed."
 
-#: doc.src#MSG_VIEW_OPEN_CANT_SAVE.infobox.text
+#. =Uw?
+#: doc.src
+msgctxt ""
+"doc.src\n"
+"MSG_VIEW_OPEN_CANT_SAVE\n"
+"infobox.text"
 msgid "Document already open for editing."
 msgstr "Mae'r ddogfen ar agor eisoes ar gyfer golygu."
 
-#: doc.src#STR_ERROR_SAVE.string.text
+#. As(*
+#: doc.src
+msgctxt ""
+"doc.src\n"
+"STR_ERROR_SAVE\n"
+"string.text"
 msgid "Error recording document "
 msgstr "Gwall recordio dogfen "
 
-#: doc.src#STR_TEMPLATE_FILTER.string.text
-msgctxt "doc.src#STR_TEMPLATE_FILTER.string.text"
+#. {clC
+#: doc.src
+msgctxt ""
+"doc.src\n"
+"STR_TEMPLATE_FILTER\n"
+"string.text"
 msgid "Templates"
 msgstr "Templedi"
 
-#: doc.src#STR_ERROR_COPY_TEMPLATE.string.text
+#. 6foC
+#: doc.src
+msgctxt ""
+"doc.src\n"
+"STR_ERROR_COPY_TEMPLATE\n"
+"string.text"
 msgid ""
 "Error copying template \"$1\". \n"
 "A template with this name may already exist."
@@ -330,35 +1037,75 @@ msgstr ""
 "Gwall wrth gopïo templed \"$1\". \n"
 "Mae templed o'r enw hwn yn bodoli eisoes."
 
-#: doc.src#STR_ERROR_DELETE_TEMPLATE.string.text
+#. WQk^
+#: doc.src
+msgctxt ""
+"doc.src\n"
+"STR_ERROR_DELETE_TEMPLATE\n"
+"string.text"
 msgid "The template \"$1\" can not be deleted."
 msgstr "Methu dileu templed \"$1\"."
 
-#: doc.src#STR_ERROR_MOVE_TEMPLATE.string.text
+#. [5;l
+#: doc.src
+msgctxt ""
+"doc.src\n"
+"STR_ERROR_MOVE_TEMPLATE\n"
+"string.text"
 msgid "Error moving template \"$1\"."
 msgstr "Gwall wrth symud templed \"$1\"."
 
-#: doc.src#MSG_ERROR_RESCAN.errorbox.text
+#. %z6i
+#: doc.src
+msgctxt ""
+"doc.src\n"
+"MSG_ERROR_RESCAN\n"
+"errorbox.text"
 msgid "The update could not be saved."
 msgstr "Methu cadw'r diweddariad."
 
-#: doc.src#STR_ERROR_SAVE_TEMPLATE.string.text
+#. .X7e
+#: doc.src
+msgctxt ""
+"doc.src\n"
+"STR_ERROR_SAVE_TEMPLATE\n"
+"string.text"
 msgid "Error saving template "
 msgstr "Gwall wrth gadw'r templed "
 
-#: doc.src#MSG_ERROR_RENAME_TEMPLATE.errorbox.text
+#. R|pI
+#: doc.src
+msgctxt ""
+"doc.src\n"
+"MSG_ERROR_RENAME_TEMPLATE\n"
+"errorbox.text"
 msgid "Error renaming template."
 msgstr "Gwall wrth ailenwi'r templed."
 
-#: doc.src#MSG_ERROR_RENAME_TEMPLATE_REGION.errorbox.text
+#. pV,#
+#: doc.src
+msgctxt ""
+"doc.src\n"
+"MSG_ERROR_RENAME_TEMPLATE_REGION\n"
+"errorbox.text"
 msgid "Error renaming template category."
 msgstr "Gwall wrth ailenwi categori templed."
 
-#: doc.src#MSG_ERROR_EMPTY_NAME.errorbox.text
+#. iQgz
+#: doc.src
+msgctxt ""
+"doc.src\n"
+"MSG_ERROR_EMPTY_NAME\n"
+"errorbox.text"
 msgid "Please specify a name."
 msgstr "Rhowch enw."
 
-#: doc.src#MSG_ERROR_UNIQ_NAME.errorbox.text
+#. Y1+b
+#: doc.src
+msgctxt ""
+"doc.src\n"
+"MSG_ERROR_UNIQ_NAME\n"
+"errorbox.text"
 msgid ""
 "Please specify a unique name.\n"
 "Entries must not be case specific."
@@ -366,15 +1113,30 @@ msgstr ""
 "Enwch enw unigryw.\n"
 "Rhaid iddo beidio dibynnu ar faint llythrennau."
 
-#: doc.src#STR_QUERY_DEFAULT_TEMPLATE.string.text
+#. @K@5
+#: doc.src
+msgctxt ""
+"doc.src\n"
+"STR_QUERY_DEFAULT_TEMPLATE\n"
+"string.text"
 msgid "Should the template \"$(TEXT)\" become the default template?"
 msgstr "A ddylai'r templed \"$(TEXT)\" fod y templed rhagosodedig?"
 
-#: doc.src#MSG_QUERY_RESET_DEFAULT_TEMPLATE.querybox.text
+#. Td`P
+#: doc.src
+msgctxt ""
+"doc.src\n"
+"MSG_QUERY_RESET_DEFAULT_TEMPLATE\n"
+"querybox.text"
 msgid "Do you want to reset the default template?"
 msgstr "Hoffech chi ailosod y templed rhagosodedig?"
 
-#: doc.src#MSG_TEMPLATE_DIR_NOT_EXIST.infobox.text
+#. 4S2h
+#: doc.src
+msgctxt ""
+"doc.src\n"
+"MSG_TEMPLATE_DIR_NOT_EXIST\n"
+"infobox.text"
 msgid ""
 "Template directory\n"
 "$(DIR)\n"
@@ -384,15 +1146,30 @@ msgstr ""
 "$(DIR)\n"
 "yn bodoli."
 
-#: doc.src#MSG_DOCINFO_CANTREAD.infobox.text
+#. HH56
+#: doc.src
+msgctxt ""
+"doc.src\n"
+"MSG_DOCINFO_CANTREAD\n"
+"infobox.text"
 msgid "Document info cannot be read."
 msgstr "Methu darllen gwybodaeth dogfen."
 
-#: doc.src#STR_ERROR_NOSTORAGE.string.text
+#. r-ah
+#: doc.src
+msgctxt ""
+"doc.src\n"
+"STR_ERROR_NOSTORAGE\n"
+"string.text"
 msgid "The selected file has an incorrect format."
 msgstr "Mae gan y ffeil hon fformat anghywir."
 
-#: doc.src#STR_QUERY_MUSTOWNFORMAT.string.text
+#. oT|f
+#: doc.src
+msgctxt ""
+"doc.src\n"
+"STR_QUERY_MUSTOWNFORMAT\n"
+"string.text"
 msgid ""
 "Documents cannot be saved in $(FORMAT) format. Do you\n"
 "want to save your changes using the $(OWNFORMAT) format?"
@@ -400,67 +1177,102 @@ msgstr ""
 "Methu cadw'r dogfennau yn fformat $(FORMAT).\n"
 "Hoffech chi gadw'r newidiadau yn fformat $(OWNFORMAT)?"
 
-#: doc.src#STR_SAVEDOC.string.text
+#. /T]X
+#: doc.src
+msgctxt ""
+"doc.src\n"
+"STR_SAVEDOC\n"
+"string.text"
 msgid "~Save"
 msgstr "C~adw"
 
-#: doc.src#STR_UPDATEDOC.string.text
+#. }kKy
+#: doc.src
+msgctxt ""
+"doc.src\n"
+"STR_UPDATEDOC\n"
+"string.text"
 msgid "~Update"
 msgstr "~Diweddaru"
 
-#: doc.src#STR_SAVEASDOC.string.text
+#. k@@X
+#: doc.src
+msgctxt ""
+"doc.src\n"
+"STR_SAVEASDOC\n"
+"string.text"
 msgid "Save ~As..."
 msgstr "Cadw ~Fel..."
 
-#: doc.src#STR_SAVECOPYDOC.string.text
+#. nzU]
+#: doc.src
+msgctxt ""
+"doc.src\n"
+"STR_SAVECOPYDOC\n"
+"string.text"
 msgid "Save Copy ~as..."
 msgstr "C~adw Copi fel..."
 
-#: doc.src#STR_CLOSEDOC.string.text
+#. [uXh
+#: doc.src
+msgctxt ""
+"doc.src\n"
+"STR_CLOSEDOC\n"
+"string.text"
 msgid "~Close"
 msgstr "~Cau"
 
-#: doc.src#STR_CLOSEDOC_ANDRETURN.string.text
+#. YYg~
+#: doc.src
+msgctxt ""
+"doc.src\n"
+"STR_CLOSEDOC_ANDRETURN\n"
+"string.text"
 msgid "~Close & Return to "
 msgstr "~Cau a Dychwelyd i "
 
-#: doc.src#STR_WIZARD.string.text
+#. PX3I
+#: doc.src
+msgctxt ""
+"doc.src\n"
+"STR_WIZARD\n"
+"string.text"
 msgid " AutoPilot"
 msgstr " AwtoPeilot"
 
-#: doc.src#RID_STR_FILTCONFIG.string.text
+#. d#`|
+#: doc.src
+msgctxt ""
+"doc.src\n"
+"RID_STR_FILTCONFIG\n"
+"string.text"
 msgid "Configurations"
 msgstr "Ffurfweddau"
 
-#: doc.src#RID_STR_FILTBASIC.string.text
+#. hV=*
+#: doc.src
+msgctxt ""
+"doc.src\n"
+"RID_STR_FILTBASIC\n"
+"string.text"
 msgid "%PRODUCTNAME Basic libraries"
 msgstr "Llyfrgelloedd BASIC %PRODUCTNAME"
 
-#: doc.src#RID_STR_WARNSTYLEOVERWRITE.string.text
+#. 92ks
+#: doc.src
+msgctxt ""
+"doc.src\n"
+"RID_STR_WARNSTYLEOVERWRITE\n"
+"string.text"
 msgid "Should the \"$(ARG1)\" Style be replaced?"
 msgstr "A ddylai Arddull \"$(ARG1)\" gael ei newid?"
 
-#: doc.src#STR_DOC_LOADING.string.text
-msgid "Loading Document"
-msgstr "Llwytho Dogfen"
-
-#: doc.src#RID_DLSTATUS.INET_NAME_RESOLVE_START.string.text
-msgid "Connection to: $(HOST). Waiting for response..."
-msgstr "Cysylltu â: $(HOST). Disgwyl ateb..."
-
-#: doc.src#RID_DLSTATUS.INET_CONNECT_START.string.text
-msgid "Opening $(TARGET) at $(HOST)"
-msgstr "Agor $(TARGET) yn $(HOST)"
-
-#: doc.src#RID_DLSTATUS.INET_READ_STATUS.string.text
-msgid "Loading: $(TARGET) from $(HOST). Loaded: $(BYTE)"
-msgstr "Llwytho: $(TARGET) o $(HOST). Llwythwyd: $(BYTE)"
-
-#: doc.src#RID_DLSTATUS.INET_CONNECTION_CLOSED.string.text
-msgid "Disconnected"
-msgstr "Datgysylltwyd"
-
-#: doc.src#MSG_OPEN_READONLY.querybox.text
+#. u!^!
+#: doc.src
+msgctxt ""
+"doc.src\n"
+"MSG_OPEN_READONLY\n"
+"querybox.text"
 msgid ""
 "Document cannot be opened for editing.\n"
 "Do you want to open it as read-only?"
@@ -468,127 +1280,284 @@ msgstr ""
 "Nid oes modd agor y ddogfen ar gyfer ei golygu.\n"
 "Hoffech chi ei hagor fel darllen yn unig?"
 
-#: doc.src#STR_EDIT.string.text
+#. F8a5
+#: doc.src
+#, fuzzy
+msgctxt ""
+"doc.src\n"
+"STR_EDIT\n"
+"string.text"
 msgid "Edit"
 msgstr "Golygu"
 
-#: doc.src#RID_OFFICEFILTER.string.text
+#. 2@nW
+#: doc.src
+msgctxt ""
+"doc.src\n"
+"RID_OFFICEFILTER\n"
+"string.text"
 msgid "%PRODUCTNAME Documents"
 msgstr "Dogfen %PRODUCTNAME"
 
-#: doc.src#STR_FRAMEOBJECT_PROPERTIES.string.text
+#. LPRT
+#: doc.src
+msgctxt ""
+"doc.src\n"
+"STR_FRAMEOBJECT_PROPERTIES\n"
+"string.text"
 msgid "Propert~ies..."
 msgstr "~Priodweddau..."
 
-#: doc.src#STR_FSET_FILTERNAME0.string.text
+#. ,AD6
+#: doc.src
+msgctxt ""
+"doc.src\n"
+"STR_FSET_FILTERNAME0\n"
+"string.text"
 msgid "HTML (FrameSet)"
 msgstr "HTML (FframSet)"
 
-#: doc.src#STR_FSET_FILTERNAME1.string.text
+#. kD1A
+#: doc.src
+msgctxt ""
+"doc.src\n"
+"STR_FSET_FILTERNAME1\n"
+"string.text"
 msgid "%PRODUCTNAME Frame Document"
 msgstr "Dogfen Ffrâm %PRODUCTNAME"
 
-#: doc.src#STR_TEMPL_MOVED.string.text
+#. z0Z#
+#: doc.src
+msgctxt ""
+"doc.src\n"
+"STR_TEMPL_MOVED\n"
+"string.text"
 msgid "The template \"$(TEMPLATE)\" was not found at the original location. A template with the same name exists at \"$(FOUND)\". Should this template be used in the future when comparing?"
 msgstr "Nid oedd y templed \"$(TEMPLATE)\" i'w gael yn ei safle gwreiddiol. Mae templed gyda'r un enw i'w gael yn \"$(FOUND)\". A ddylai'r templed hwn gael ei ddefnyddio wrth gymharu?"
 
-#: doc.src#STR_TEMPL_RESET.string.text
+#. cX7B
+#: doc.src
+msgctxt ""
+"doc.src\n"
+"STR_TEMPL_RESET\n"
+"string.text"
 msgid "The template \"$(TEMPLATE)\" has not been found. Should the template be looked for the next time the document is opened ?"
 msgstr "Methu canfod templed \"$(TEMPLATE)\" . A ddylid edrych am y templed y tro nesaf fydd y ddogfen yn cael ei hagor ?"
 
-#: doc.src#STR_AUTOMATICVERSION.string.text
+#. gvdX
+#: doc.src
+msgctxt ""
+"doc.src\n"
+"STR_AUTOMATICVERSION\n"
+"string.text"
 msgid "Automatically saved version"
 msgstr "Fersiwn wedi ei gadw'n awtomatig"
 
-#: doc.src#STR_DOCTYPENAME_SW.string.text
+#. o}_{
+#: doc.src
+msgctxt ""
+"doc.src\n"
+"STR_DOCTYPENAME_SW\n"
+"string.text"
 msgid "Text Document"
 msgstr "Dogfen Testun"
 
-#: doc.src#STR_DOCTYPENAME_SWWEB.string.text
+#. RkXl
+#: doc.src
+msgctxt ""
+"doc.src\n"
+"STR_DOCTYPENAME_SWWEB\n"
+"string.text"
 msgid "HTML Document"
 msgstr "Dogfen HTML"
 
-#: doc.src#STR_DOCTYPENAME_SWGLOB.string.text
+#. *Iae
+#: doc.src
+msgctxt ""
+"doc.src\n"
+"STR_DOCTYPENAME_SWGLOB\n"
+"string.text"
 msgid "Master Document"
 msgstr "Prif Ddogfen"
 
-#: doc.src#STR_DOCTYPENAME_SC.string.text
+#. Gm1i
+#: doc.src
+msgctxt ""
+"doc.src\n"
+"STR_DOCTYPENAME_SC\n"
+"string.text"
 msgid "Spreadsheet"
 msgstr "Taenlen"
 
-#: doc.src#STR_DOCTYPENAME_SI.string.text
+#. YU(c
+#: doc.src
+msgctxt ""
+"doc.src\n"
+"STR_DOCTYPENAME_SI\n"
+"string.text"
 msgid "Presentation"
 msgstr "Cyflwyno"
 
-#: doc.src#STR_DOCTYPENAME_SD.string.text
+#. Z69:
+#: doc.src
+msgctxt ""
+"doc.src\n"
+"STR_DOCTYPENAME_SD\n"
+"string.text"
 msgid "Drawing"
 msgstr "Lluniadu"
 
-#: doc.src#STR_DOCTYPENAME_MESSAGE.string.text
+#. @:rF
+#: doc.src
+msgctxt ""
+"doc.src\n"
+"STR_DOCTYPENAME_MESSAGE\n"
+"string.text"
 msgid "Message"
 msgstr "Neges"
 
-#: doc.src#STR_NOSAVEANDCLOSE.string.text
-msgid "~Discard"
-msgstr "~Hepgor"
+#. \D#f
+#: doc.src
+msgctxt ""
+"doc.src\n"
+"STR_NOSAVEANDCLOSE\n"
+"string.text"
+msgid "Close ~without saving"
+msgstr ""
 
-#: doc.src#STR_PACKNGO_NOACCESS.string.text
+#. \NFn
+#: doc.src
+msgctxt ""
+"doc.src\n"
+"STR_PACKNGO_NOACCESS\n"
+"string.text"
 msgid "Access to the current data medium not possible."
 msgstr "Nid yw mynediad at y cyfrwng data presennol yn bosibl."
 
-#: doc.src#STR_PACKNGO_NEWMEDIUM.string.text
+#. hM`^
+#: doc.src
+msgctxt ""
+"doc.src\n"
+"STR_PACKNGO_NEWMEDIUM\n"
+"string.text"
 msgid "Insert the next data carrier and click OK."
 msgstr "Mewnosodwch y cludwr data nesaf a chlicio Iawn."
 
-#: doc.src#STR_OBJECT.string.text
+#. \Fil
+#: doc.src
+msgctxt ""
+"doc.src\n"
+"STR_OBJECT\n"
+"string.text"
 msgid "Object"
 msgstr "Gwrthrych"
 
-#: doc.src#DLG_MACROQUERY.querybox.text
+#. Bf*F
+#: doc.src
+msgctxt ""
+"doc.src\n"
+"DLG_MACROQUERY\n"
+"querybox.text"
 msgid "This document contains macros. $(TEXT)"
 msgstr "Mae'r ddogfen yn cynnwys y macro. $(TEXT)"
 
-#: doc.src#DLG_MACROQUERY.querybox.title
+#. plB3
+#: doc.src
+msgctxt ""
+"doc.src\n"
+"DLG_MACROQUERY\n"
+"querybox.title"
 msgid "Run Macro"
 msgstr "Rhedeg Macro"
 
-#: doc.src#BTN_OK.string.text
+#. %6=l
+#: doc.src
+msgctxt ""
+"doc.src\n"
+"BTN_OK\n"
+"string.text"
 msgid "Run"
 msgstr "Rhedeg"
 
-#: doc.src#BTN_CANCEL.string.text
+#. dj\Y
+#: doc.src
+msgctxt ""
+"doc.src\n"
+"BTN_CANCEL\n"
+"string.text"
 msgid "Do Not Run"
 msgstr "Peidio Rhedeg"
 
-#: doc.src#FT_CANCEL.string.text
+#. hfTX
+#: doc.src
+msgctxt ""
+"doc.src\n"
+"FT_CANCEL\n"
+"string.text"
 msgid "According to the security settings, the macros in this document should not be run. Do you want to run them anyway?"
 msgstr "Yn ôl y gosodiadau diogelwch, ni ddylai'r macro yn y ddogfen gael ei redeg? Hoffech chi ei redeg beth bynnag?"
 
-#: doc.src#FT_OK.string.text
+#. s(?t
+#: doc.src
+msgctxt ""
+"doc.src\n"
+"FT_OK\n"
+"string.text"
 msgid "Do you want to allow these macros to be run?"
 msgstr "Hoffech chi adael i'r macros gael eu rhedeg?"
 
-#: doc.src#STR_EXPORTASPDF_TITLE.string.text
+#. [553
+#: doc.src
+msgctxt ""
+"doc.src\n"
+"STR_EXPORTASPDF_TITLE\n"
+"string.text"
 msgid "Export as PDF"
 msgstr "Allforio fel PDF"
 
-#: doc.src#STR_EXPORTWITHCFGBUTTON.string.text
+#. M~gb
+#: doc.src
+msgctxt ""
+"doc.src\n"
+"STR_EXPORTWITHCFGBUTTON\n"
+"string.text"
 msgid "Export..."
 msgstr "Allforio..."
 
-#: doc.src#STR_EXPORTBUTTON.string.text
+#. bRo;
+#: doc.src
+#, fuzzy
+msgctxt ""
+"doc.src\n"
+"STR_EXPORTBUTTON\n"
+"string.text"
 msgid "Export"
 msgstr "Allforio"
 
-#: doc.src#RID_SVXSTR_SECURITY_ADDPATH.string.text
+#. O5WR
+#: doc.src
+msgctxt ""
+"doc.src\n"
+"RID_SVXSTR_SECURITY_ADDPATH\n"
+"string.text"
 msgid "Add this directory to the list of secure paths: "
 msgstr "Ychwanegu'r cyfarwyddiadur i restr y llwybrau diogel: "
 
-#: doc.src#STR_LABEL_FILEFORMAT.string.text
+#. s|4C
+#: doc.src
+msgctxt ""
+"doc.src\n"
+"STR_LABEL_FILEFORMAT\n"
+"string.text"
 msgid "File format:"
 msgstr "Fformat ffeil:"
 
-#: doc.src#STR_HIDDENINFO_CONTAINS.string.text
+#. mh|t
+#: doc.src
+msgctxt ""
+"doc.src\n"
+"STR_HIDDENINFO_CONTAINS\n"
+"string.text"
 msgid ""
 "This document contains:\n"
 "\n"
@@ -596,65 +1565,140 @@ msgstr ""
 "Mae'r ddogfen yn cynnwys:\n"
 "\n"
 
-#: doc.src#STR_HIDDENINFO_RECORDCHANGES.string.text
+#. f8VT
+#: doc.src
+msgctxt ""
+"doc.src\n"
+"STR_HIDDENINFO_RECORDCHANGES\n"
+"string.text"
 msgid "Recorded changes"
 msgstr "Newidiadau recordiwyd"
 
-#: doc.src#STR_HIDDENINFO_NOTES.string.text
+#. QDnA
+#: doc.src
+msgctxt ""
+"doc.src\n"
+"STR_HIDDENINFO_NOTES\n"
+"string.text"
 msgid "Notes"
 msgstr "Nodiadau"
 
-#: doc.src#STR_HIDDENINFO_DOCVERSIONS.string.text
+#. IEer
+#: doc.src
+msgctxt ""
+"doc.src\n"
+"STR_HIDDENINFO_DOCVERSIONS\n"
+"string.text"
 msgid "Document versions"
 msgstr "Fersiwn dogfen"
 
-#: doc.src#STR_HIDDENINFO_FIELDS.string.text
+#. ,tK|
+#: doc.src
+msgctxt ""
+"doc.src\n"
+"STR_HIDDENINFO_FIELDS\n"
+"string.text"
 msgid "Fields"
 msgstr "Meysydd"
 
-#: doc.src#STR_HIDDENINFO_LINKDATA.string.text
+#. $u[:
+#: doc.src
+msgctxt ""
+"doc.src\n"
+"STR_HIDDENINFO_LINKDATA\n"
+"string.text"
 msgid "Linked data..."
 msgstr "Data cysylltiedig..."
 
-#: doc.src#STR_HIDDENINFO_CONTINUE_SAVING.string.text
+#. Loa(
+#: doc.src
+msgctxt ""
+"doc.src\n"
+"STR_HIDDENINFO_CONTINUE_SAVING\n"
+"string.text"
 msgid "Do you want to continue saving the document?"
 msgstr "Hoffech chi barhau i gadw'r ddogfen?"
 
-#: doc.src#STR_HIDDENINFO_CONTINUE_PRINTING.string.text
+#. AzQ@
+#: doc.src
+msgctxt ""
+"doc.src\n"
+"STR_HIDDENINFO_CONTINUE_PRINTING\n"
+"string.text"
 msgid "Do you want to continue printing the document?"
 msgstr "Hoffech chi barhau i argraffu'r ddogfen?"
 
-#: doc.src#STR_HIDDENINFO_CONTINUE_SIGNING.string.text
+#. O}5X
+#: doc.src
+msgctxt ""
+"doc.src\n"
+"STR_HIDDENINFO_CONTINUE_SIGNING\n"
+"string.text"
 msgid "Do you want to continue signing the document?"
 msgstr "Hoffech chi barhau i lofnodi'r ddogfen?"
 
-#: doc.src#STR_HIDDENINFO_CONTINUE_CREATEPDF.string.text
+#. IDR%
+#: doc.src
+msgctxt ""
+"doc.src\n"
+"STR_HIDDENINFO_CONTINUE_CREATEPDF\n"
+"string.text"
 msgid "Do you want to continue creating a PDF file?"
 msgstr "Hoffech chi barhau i greu ffeil PDF?"
 
-#: doc.src#STR_NEW_FILENAME_SAVE.string.text
+#. cHlV
+#: doc.src
+msgctxt ""
+"doc.src\n"
+"STR_NEW_FILENAME_SAVE\n"
+"string.text"
 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."
 
-#: doc.src#STR_ERROR_DELETE_TEMPLATE_DIR.string.text
+#. ;Hp_
+#: doc.src
+msgctxt ""
+"doc.src\n"
+"STR_ERROR_DELETE_TEMPLATE_DIR\n"
+"string.text"
 msgid "Some template files are protected and can not be deleted."
 msgstr "Mae rhai ffeiliau templed wedi eu diogelu ac nid oes modd eu dileu."
 
 #. pb: %1 == a number [1-4]
-#: doc.src#STR_DOCINFO_INFOFIELD.string.text
+#. Na4p
+#: doc.src
+msgctxt ""
+"doc.src\n"
+"STR_DOCINFO_INFOFIELD\n"
+"string.text"
 msgid "Info %1"
 msgstr "Gwybodaeth %1"
 
 #. Used in the title of a shared document.
-#: doc.src#STR_SHARED.string.text
+#. U-?.
+#: doc.src
+msgctxt ""
+"doc.src\n"
+"STR_SHARED\n"
+"string.text"
 msgid " (shared)"
 msgstr " (rhanedig)"
 
-#: doc.src#STR_XMLSEC_ODF12_EXPECTED.string.text
+#. K7S)
+#: doc.src
+msgctxt ""
+"doc.src\n"
+"STR_XMLSEC_ODF12_EXPECTED\n"
+"string.text"
 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)."
 
-#: doc.src#MSG_XMLSEC_QUERY_SAVESIGNEDBEFORESIGN.querybox.text
+#. ,bct
+#: doc.src
+msgctxt ""
+"doc.src\n"
+"MSG_XMLSEC_QUERY_SAVESIGNEDBEFORESIGN\n"
+"querybox.text"
 msgid ""
 "The document has to be saved before it can be signed. Saving the document removes all present signatures.\n"
 "Do you want to save the document?"
@@ -662,62 +1706,218 @@ 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?"
 
-#: doc.src#STR_QRYTEMPL_MESSAGE.string.text
+#. 4kU1
+#: doc.src
+msgctxt ""
+"doc.src\n"
+"STR_QRYTEMPL_MESSAGE\n"
+"string.text"
 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?"
 
-#: doc.src#STR_QRYTEMPL_UPDATE_BTN.string.text
+#. JX;1
+#: doc.src
+msgctxt ""
+"doc.src\n"
+"STR_QRYTEMPL_UPDATE_BTN\n"
+"string.text"
 msgid "~Update Styles"
 msgstr "~Diweddaru Arddull"
 
-#: doc.src#STR_QRYTEMPL_KEEP_BTN.string.text
+#. kLwy
+#: doc.src
+msgctxt ""
+"doc.src\n"
+"STR_QRYTEMPL_KEEP_BTN\n"
+"string.text"
 msgid "~Keep Old Styles"
 msgstr "~Cadw'r Hen Arddull"
 
-#: doctempl.src#TEMPLATE_LONG_NAMES_ARY.1.itemlist.text
+#. veW4
+#: doctdlg.src
+msgctxt ""
+"doctdlg.src\n"
+"DLG_DOC_TEMPLATE\n"
+"FL_EDIT\n"
+"fixedline.text"
+msgid "New template"
+msgstr "Templed newydd"
+
+#. u_n^
+#: doctdlg.src
+msgctxt ""
+"doctdlg.src\n"
+"DLG_DOC_TEMPLATE\n"
+"FL_STYLESHEETS\n"
+"fixedline.text"
+msgid "Templates"
+msgstr "Templedi"
+
+#. AbnQ
+#: doctdlg.src
+msgctxt ""
+"doctdlg.src\n"
+"DLG_DOC_TEMPLATE\n"
+"FT_SECTION\n"
+"fixedtext.text"
+msgid "~Categories"
+msgstr "~Categorïau"
+
+#. ,fm*
+#: doctdlg.src
+msgctxt ""
+"doctdlg.src\n"
+"DLG_DOC_TEMPLATE\n"
+"FT_STYLESHEETS\n"
+"fixedtext.text"
+msgid "~Templates"
+msgstr "~Templedi"
+
+#. G^V_
+#: doctdlg.src
+msgctxt ""
+"doctdlg.src\n"
+"DLG_DOC_TEMPLATE\n"
+"BT_EDIT\n"
+"pushbutton.text"
+msgid "~Edit"
+msgstr "~Golygu"
+
+#. d_C]
+#: doctdlg.src
+msgctxt ""
+"doctdlg.src\n"
+"DLG_DOC_TEMPLATE\n"
+"BT_ORGANIZE\n"
+"pushbutton.text"
+msgid "~Organizer..."
+msgstr "~Trefnydd..."
+
+#. Vyp^
+#: doctdlg.src
+msgctxt ""
+"doctdlg.src\n"
+"DLG_DOC_TEMPLATE\n"
+"modaldialog.text"
+msgid "Templates"
+msgstr "Templedi"
+
+#. L)PL
+#: doctempl.src
+msgctxt ""
+"doctempl.src\n"
+"TEMPLATE_LONG_NAMES_ARY\n"
+"1\n"
+"itemlist.text"
 msgid "My Templates"
 msgstr "Templedi"
 
-#: doctempl.src#TEMPLATE_LONG_NAMES_ARY.2.itemlist.text
+#. N84N
+#: doctempl.src
+msgctxt ""
+"doctempl.src\n"
+"TEMPLATE_LONG_NAMES_ARY\n"
+"2\n"
+"itemlist.text"
 msgid "Business Correspondence"
 msgstr "Gohebiaeth Busnes"
 
-#: doctempl.src#TEMPLATE_LONG_NAMES_ARY.3.itemlist.text
+#. ,_Kj
+#: doctempl.src
+msgctxt ""
+"doctempl.src\n"
+"TEMPLATE_LONG_NAMES_ARY\n"
+"3\n"
+"itemlist.text"
 msgid "Other Business Documents"
 msgstr "Dogfennau Busnes Eraill"
 
-#: doctempl.src#TEMPLATE_LONG_NAMES_ARY.4.itemlist.text
+#. r8hD
+#: doctempl.src
+msgctxt ""
+"doctempl.src\n"
+"TEMPLATE_LONG_NAMES_ARY\n"
+"4\n"
+"itemlist.text"
 msgid "Personal Correspondence and Documents"
 msgstr "Gohebiaeth a Dogfennau Personol"
 
-#: doctempl.src#TEMPLATE_LONG_NAMES_ARY.5.itemlist.text
+#. ]``9
+#: doctempl.src
+msgctxt ""
+"doctempl.src\n"
+"TEMPLATE_LONG_NAMES_ARY\n"
+"5\n"
+"itemlist.text"
 msgid "Forms and Contracts"
 msgstr "Ffurflenni a Chontractau"
 
-#: doctempl.src#TEMPLATE_LONG_NAMES_ARY.6.itemlist.text
+#. a?4`
+#: doctempl.src
+msgctxt ""
+"doctempl.src\n"
+"TEMPLATE_LONG_NAMES_ARY\n"
+"6\n"
+"itemlist.text"
 msgid "Finances"
 msgstr "Cyllid"
 
-#: doctempl.src#TEMPLATE_LONG_NAMES_ARY.7.itemlist.text
+#. zXEJ
+#: doctempl.src
+msgctxt ""
+"doctempl.src\n"
+"TEMPLATE_LONG_NAMES_ARY\n"
+"7\n"
+"itemlist.text"
 msgid "Education"
 msgstr "Addysg"
 
-#: doctempl.src#TEMPLATE_LONG_NAMES_ARY.8.itemlist.text
+#. Mc.B
+#: doctempl.src
+msgctxt ""
+"doctempl.src\n"
+"TEMPLATE_LONG_NAMES_ARY\n"
+"8\n"
+"itemlist.text"
 msgid "Presentation Backgrounds"
 msgstr "Cefndir Cyflwyniadau"
 
-#: doctempl.src#TEMPLATE_LONG_NAMES_ARY.9.itemlist.text
+#. %:@+
+#: doctempl.src
+#, fuzzy
+msgctxt ""
+"doctempl.src\n"
+"TEMPLATE_LONG_NAMES_ARY\n"
+"9\n"
+"itemlist.text"
 msgid "Presentations"
 msgstr "Cyflwyniadau"
 
-#: doctempl.src#TEMPLATE_LONG_NAMES_ARY.10.itemlist.text
+#. Ky4f
+#: doctempl.src
+msgctxt ""
+"doctempl.src\n"
+"TEMPLATE_LONG_NAMES_ARY\n"
+"10\n"
+"itemlist.text"
 msgid "Miscellaneous"
 msgstr "Amrywiol"
 
-#: doctempl.src#TEMPLATE_LONG_NAMES_ARY.11.itemlist.text
+#. O[D^
+#: doctempl.src
+msgctxt ""
+"doctempl.src\n"
+"TEMPLATE_LONG_NAMES_ARY\n"
+"11\n"
+"itemlist.text"
 msgid "Labels"
 msgstr "Labeli"
 
-#: doctempl.src#RID_CNT_STR_WAITING.string.text
+#. R\Do
+#: doctempl.src
+msgctxt ""
+"doctempl.src\n"
+"RID_CNT_STR_WAITING\n"
+"string.text"
 msgid "The templates are being initialized for first-time usage."
 msgstr "Mae'r templedi'n cael eu cychwyn ar gyfer defnydd cyntaf."
diff --git a/source/cy/sfx2/source/menu.po b/source/cy/sfx2/source/menu.po
index 6b33ec2126f..87fac94a556 100644
--- a/source/cy/sfx2/source/menu.po
+++ b/source/cy/sfx2/source/menu.po
@@ -1,9 +1,9 @@
-#. extracted from sfx2/source/menu.oo
+#. extracted from sfx2/source/menu
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: http://qa.openoffice.org/issues/enter_bug.cgi?comment=&component=l10n&form_name=enter_issue&short_desc=Localization+issue+in+file%3A+sfx2%2Fsource%2Fmenu.oo&subcomponent=ui\n"
-"POT-Creation-Date: 2012-07-04 16:39+0200\n"
+"Report-Msgid-Bugs-To: https://bugs.freedesktop.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
+"POT-Creation-Date: 2012-11-17 19:03+0200\n"
 "PO-Revision-Date: 2011-04-12 21:54+0200\n"
 "Last-Translator: Rhoslyn <rprys@yahoo.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -12,45 +12,98 @@ msgstr ""
 "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: Translate Toolkit 1.9.0\n"
+"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
 
-#: menu.src#STR_MENU_CFGITEM.string.text
+#. @n=h
+#: menu.src
+msgctxt ""
+"menu.src\n"
+"STR_MENU_CFGITEM\n"
+"string.text"
 msgid "Configuration Menu"
 msgstr "Dewislen ffurfweddiad"
 
-#: menu.src#STR_MENU_ADDONS.string.text
+#. m=%)
+#: menu.src
+msgctxt ""
+"menu.src\n"
+"STR_MENU_ADDONS\n"
+"string.text"
 msgid "~Add-Ons"
 msgstr "~Ychwanegiadau"
 
-#: menu.src#MN_CLIPBOARDFUNCS.SID_CUT.menuitem.text
+#. Thn[
+#: menu.src
+msgctxt ""
+"menu.src\n"
+"MN_CLIPBOARDFUNCS\n"
+"SID_CUT\n"
+"menuitem.text"
 msgid "Cu~t"
 msgstr "~Torri"
 
-#: menu.src#MN_CLIPBOARDFUNCS.SID_COPY.menuitem.text
+#. ckH!
+#: menu.src
+msgctxt ""
+"menu.src\n"
+"MN_CLIPBOARDFUNCS\n"
+"SID_COPY\n"
+"menuitem.text"
 msgid "~Copy"
 msgstr "~Copïo"
 
-#: menu.src#MN_CLIPBOARDFUNCS.SID_PASTE.menuitem.text
+#. ?hoW
+#: menu.src
+msgctxt ""
+"menu.src\n"
+"MN_CLIPBOARDFUNCS\n"
+"SID_PASTE\n"
+"menuitem.text"
 msgid "~Paste"
 msgstr "~Gludo"
 
-#: menu.src#SID_WIN_FULLSCREEN.string.text
+#. ZC)*
+#: menu.src
+msgctxt ""
+"menu.src\n"
+"SID_WIN_FULLSCREEN\n"
+"string.text"
 msgid "Leave Full-Screen Mode"
 msgstr "Gadael Modd Sgrin Lawn"
 
-#: menu.src#STR_MENU_ADDONHELP.string.text
+#. F,rp
+#: menu.src
+msgctxt ""
+"menu.src\n"
+"STR_MENU_ADDONHELP\n"
+"string.text"
 msgid "Add-~On Help"
 msgstr "Cymorth ~Ychwanegiadau"
 
-#: menu.src#STR_MENU_SYNONYMS.string.text
+#. !9\E
+#: menu.src
+msgctxt ""
+"menu.src\n"
+"STR_MENU_SYNONYMS\n"
+"string.text"
 msgid "Synonyms"
 msgstr "Cyfystyron"
 
-#: menu.src#STR_MENU_NO_SYNONYM_FOUND.string.text
+#. medd
+#: menu.src
+msgctxt ""
+"menu.src\n"
+"STR_MENU_NO_SYNONYM_FOUND\n"
+"string.text"
 msgid "(none)"
 msgstr "(dim)"
 
-#: menu.src#STR_MENU_THESAURUS.string.text
+#. /^f9
+#: menu.src
+msgctxt ""
+"menu.src\n"
+"STR_MENU_THESAURUS\n"
+"string.text"
 msgid "~Thesaurus..."
 msgstr "~Thesawrws..."
diff --git a/source/cy/sfx2/source/view.po b/source/cy/sfx2/source/view.po
index f944424229b..0b2a94214ca 100644
--- a/source/cy/sfx2/source/view.po
+++ b/source/cy/sfx2/source/view.po
@@ -1,9 +1,9 @@
-#. extracted from sfx2/source/view.oo
+#. extracted from sfx2/source/view
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: http://qa.openoffice.org/issues/enter_bug.cgi?comment=&component=l10n&form_name=enter_issue&short_desc=Localization+issue+in+file%3A+sfx2%2Fsource%2Fview.oo&subcomponent=ui\n"
-"POT-Creation-Date: 2012-07-04 16:39+0200\n"
+"Report-Msgid-Bugs-To: https://bugs.freedesktop.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
+"POT-Creation-Date: 2012-11-17 19:02+0200\n"
 "PO-Revision-Date: 2011-05-01 09:07+0200\n"
 "Last-Translator: Rhoslyn <rprys@yahoo.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -12,10 +12,15 @@ msgstr ""
 "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: Translate Toolkit 1.9.0\n"
+"X-Generator: LibreOffice\n"
 "X-Accelerator-Marker: ~\n"
 
-#: view.src#STR_NODEFPRINTER.string.text
+#. =!Zr
+#: view.src
+msgctxt ""
+"view.src\n"
+"STR_NODEFPRINTER\n"
+"string.text"
 msgid ""
 "No default printer found.\n"
 "Please choose a printer and try again."
@@ -23,7 +28,12 @@ msgstr ""
 "Heb ganfod argraffydd rhagosodedig.\n"
 "Dewiswch argraffydd a cheisiwch eto."
 
-#: view.src#STR_NOSTARTPRINTER.string.text
+#. sf:p
+#: view.src
+msgctxt ""
+"view.src\n"
+"STR_NOSTARTPRINTER\n"
+"string.text"
 msgid ""
 "Could not start printer.\n"
 "Please check your printer configuration."
@@ -31,7 +41,12 @@ msgstr ""
 "Methu cychwyn yr argraffydd.\n"
 "Gwiriwch ffurfweddiad eich argraffydd."
 
-#: view.src#STR_PRINTER_NOTAVAIL.string.text
+#. V4\1
+#: view.src
+msgctxt ""
+"view.src\n"
+"STR_PRINTER_NOTAVAIL\n"
+"string.text"
 msgid ""
 "This document has been formatted for the printer $1. The specified printer is not available. \n"
 "Do you want to use the standard printer $2 ?"
@@ -39,40 +54,84 @@ msgstr ""
 "Mae'r ddogfen wedi ei fformatio ar gyfer argraffydd $1. Nid yw'r argraffydd yma ar gael. \n"
 "Hoffech chi ddefnyddio argraffydd safonol $2 ?"
 
-#: view.src#STR_PRINT_OPTIONS.string.text
+#. b=m+
+#: view.src
+msgctxt ""
+"view.src\n"
+"STR_PRINT_OPTIONS\n"
+"string.text"
 msgid "Options..."
 msgstr "Dewisiadau..."
 
-#: view.src#STR_PRINT_OPTIONS_TITLE.string.text
+#. RYJ~
+#: view.src
+msgctxt ""
+"view.src\n"
+"STR_PRINT_OPTIONS_TITLE\n"
+"string.text"
 msgid "Printer Options"
 msgstr "Dewisiadau Argraffydd"
 
-#: view.src#STR_ERROR_PRINTER_BUSY.string.text
+#. hiTV
+#: view.src
+msgctxt ""
+"view.src\n"
+"STR_ERROR_PRINTER_BUSY\n"
+"string.text"
 msgid "Printer busy"
 msgstr "Argraffydd yn brysur"
 
-#: view.src#STR_ERROR_PRINT.string.text
+#. h@-q
+#: view.src
+msgctxt ""
+"view.src\n"
+"STR_ERROR_PRINT\n"
+"string.text"
 msgid "Error while printing"
 msgstr "Gwall wrth argraffu"
 
-#: view.src#STR_PRINTING.string.text
+#. *MUJ
+#: view.src
+msgctxt ""
+"view.src\n"
+"STR_PRINTING\n"
+"string.text"
 msgid "Printing"
 msgstr "Argraffu"
 
-#: view.src#STR_PAGE.string.text
+#. K:8P
+#: view.src
+msgctxt ""
+"view.src\n"
+"STR_PAGE\n"
+"string.text"
 msgid "Page "
 msgstr "Tudalen "
 
-#: view.src#STR_ERROR_SAVE_TEMPLATE.string.text
+#. `0hL
+#: view.src
+msgctxt ""
+"view.src\n"
+"STR_ERROR_SAVE_TEMPLATE\n"
+"string.text"
 msgid "Error saving template "
 msgstr "Gwall wrth gadw'r templed "
 
-#: view.src#STR_READONLY.string.text
+#. =|r[
+#: view.src
+msgctxt ""
+"view.src\n"
+"STR_READONLY\n"
+"string.text"
 msgid " (read-only)"
 msgstr " (darllen yn unig)"
 
-#: view.src#STR_PRINT_NEWORI.string.text
-msgctxt "view.src#STR_PRINT_NEWORI.string.text"
+#. 4Bh%
+#: view.src
+msgctxt ""
+"view.src\n"
+"STR_PRINT_NEWORI\n"
+"string.text"
 msgid ""
 "The page size and orientation have been modified.\n"
 "Would you like to save the new settings in the\n"
@@ -82,7 +141,12 @@ msgstr ""
 "A ddylai'r gosodiadau newydd gael eu cadw\n"
 "yn y ddogfen bresennol?"
 
-#: view.src#STR_PRINT_NEWSIZE.string.text
+#. |#sl
+#: view.src
+msgctxt ""
+"view.src\n"
+"STR_PRINT_NEWSIZE\n"
+"string.text"
 msgid ""
 "The page size has been modified.\n"
 "Should the new settings be saved\n"
@@ -92,8 +156,12 @@ msgstr ""
 "A ddylai'r gosodiadau newydd gael eu cadw\n"
 "yn y ddogfen bresennol?"
 
-#: view.src#STR_PRINT_NEWORISIZE.string.text
-msgctxt "view.src#STR_PRINT_NEWORISIZE.string.text"
+#. )H*o
+#: view.src
+msgctxt ""
+"view.src\n"
+"STR_PRINT_NEWORISIZE\n"
+"string.text"
 msgid ""
 "The page size and orientation have been modified.\n"
 "Would you like to save the new settings in the\n"
@@ -103,15 +171,30 @@ msgstr ""
 "A ddylai'r gosodiadau newydd gael eu cadw\n"
 "yn y ddogfen bresennol?"
 
-#: view.src#STR_PREVIEW_DOCINFO.string.text
+#. x@4x
+#: view.src
+msgctxt ""
+"view.src\n"
+"STR_PREVIEW_DOCINFO\n"
+"string.text"
 msgid "<html><body BGCOLOR=\"#c0c0c0\"><font FACE=\"Arial\"><dl><dt><b>Title:</b><dd>$(TITEL)<dt><b>Subject:</b><dd>$(THEME)<dt><b>Keywords:</b><dd>$(KEYWORDS)<dt><b>Description:</b><dd>$(TEXT)</dl></font></body></html>"
 msgstr "<html><body BGCOLOR=\"#c0c0c0\"><font FACE=\"Arial\"><dl><dt><b>Teitl:</b><dd>$(TITEL)<dt><b>Pwnc:</b><dd>$(THEME)<dt><b>Allweddeiriau:</b><dd>$(KEYWORDS)<dt><b>Disgrifiad:</b><dd>$(TEXT)</dl></font></body></html>"
 
-#: view.src#STR_PREVIEW_NODOCINFO.string.text
+#. rPPT
+#: view.src
+msgctxt ""
+"view.src\n"
+"STR_PREVIEW_NODOCINFO\n"
+"string.text"
 msgid "<HTML><BODY BGCOLOR=\"#c0c0c0\"><BR><BR><P><FONT FACE=\"Arial\"><B>No document properties found.</B></FONT></P></BODY></HTML>"
 msgstr "<HTML><BODY BGCOLOR=\"#c0c0c0\"><BR><BR><P><FONT FACE=\"Arial\"><B>Heb ganfod priodweddau dogfennau.</B></FONT></P></BODY></HTML>"
 
-#: view.src#MSG_CANT_CLOSE.infobox.text
+#. ^K;Z
+#: view.src
+msgctxt ""
+"view.src\n"
+"MSG_CANT_CLOSE\n"
+"infobox.text"
 msgid ""
 "The document cannot be closed because a\n"
 " print job is being carried out."
@@ -119,19 +202,41 @@ msgstr ""
 "Nid oes modd cau'r ddogfen gan fod gwaith\n"
 " argraffu'n digwydd."
 
-#: view.src#DLG_PRINTMONITOR_TEXT.#define.text
+#. r_:u
+#: view.src
+msgctxt ""
+"view.src\n"
+"DLG_PRINTMONITOR_TEXT\n"
+"#define.text"
 msgid "Print Monitor"
 msgstr "Goruchwyliwr Argraffu"
 
-#: view.src#DLG_PRINTMONITOR.FT_PRINTING.fixedtext.text
+#. i4SG
+#: view.src
+msgctxt ""
+"view.src\n"
+"DLG_PRINTMONITOR\n"
+"FT_PRINTING\n"
+"fixedtext.text"
 msgid "is being printed on"
 msgstr "yn cael ei argraffu ar"
 
-#: view.src#DLG_PRINTMONITOR.STR_FT_PREPARATION.string.text
+#. A\01
+#: view.src
+msgctxt ""
+"view.src\n"
+"DLG_PRINTMONITOR\n"
+"STR_FT_PREPARATION\n"
+"string.text"
 msgid "is being prepared for printing"
 msgstr "yn cael ei baratoi ar gyfer ei argraffu"
 
-#: view.src#MSG_ERROR_SEND_MAIL.infobox.text
+#. aS.D
+#: view.src
+msgctxt ""
+"view.src\n"
+"MSG_ERROR_SEND_MAIL\n"
+"infobox.text"
 msgid ""
 "An error occurred in sending the message. Possible errors could be a missing user account or a defective setup.\n"
 "Please check the %PRODUCTNAME settings or your e-mail program settings."
@@ -139,10 +244,38 @@ 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."
 
-#: view.src#MSG_QUERY_OPENASTEMPLATE.querybox.text
+#. 09!f
+#: view.src
+msgctxt ""
+"view.src\n"
+"MSG_QUERY_OPENASTEMPLATE\n"
+"querybox.text"
 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?"
 
-#: view.src#STR_REPAIREDDOCUMENT.string.text
+#. x-CL
+#: view.src
+msgctxt ""
+"view.src\n"
+"STR_REPAIREDDOCUMENT\n"
+"string.text"
 msgid " (repaired document)"
 msgstr " (dogfen wedi ei thrwsio)"
+
+#. )zdE
+#: view.src
+msgctxt ""
+"view.src\n"
+"STR_NONCHECKEDOUT_DOCUMENT\n"
+"string.text"
+msgid "Document is not checked out on server"
+msgstr ""
+
+#. %)gU
+#: view.src
+msgctxt ""
+"view.src\n"
+"BT_CHECKOUT\n"
+"pushbutton.text"
+msgid "Check out"
+msgstr ""
diff --git a/source/cy/sfx2/uiconfig/ui.po b/source/cy/sfx2/uiconfig/ui.po
new file mode 100644
index 00000000000..5635428ba1e
--- /dev/null
+++ b/source/cy/sfx2/uiconfig/ui.po
@@ -0,0 +1,131 @@
+#. extracted from sfx2/uiconfig/ui
+msgid ""
+msgstr ""
+"Project-Id-Version: LibO 40l10n\n"
+"Report-Msgid-Bugs-To: https://bugs.freedesktop.org/enter_bug.cgi?product=LibreOffice&bug_status=UNCONFIRMED&component=UI\n"
+"POT-Creation-Date: 2012-11-17 19:03+0200\n"
+"PO-Revision-Date: 2012-11-17 19:03+0200\n"
+"Last-Translator: Automatically generated\n"
+"Language-Team: none\n"
+"Language: cy\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: LibreOffice\n"
+"X-Accelerator-Marker: ~\n"
+
+#. GQ/^
+#: checkin.ui
+msgctxt ""
+"checkin.ui\n"
+"CheckinDialog\n"
+"title\n"
+"string.text"
+msgid "Check-in"
+msgstr ""
+
+#. #OX{
+#: checkin.ui
+msgctxt ""
+"checkin.ui\n"
+"MajorVersion\n"
+"label\n"
+"string.text"
+msgid "New major version"
+msgstr ""
+
+#. ^g)v
+#: checkin.ui
+msgctxt ""
+"checkin.ui\n"
+"label2\n"
+"label\n"
+"string.text"
+msgid "Version comment"
+msgstr "Sylwadau'r fersiwn"
+
+#. `FHo
+#: password.ui
+#, fuzzy
+msgctxt ""
+"password.ui\n"
+"PasswordDialog\n"
+"title\n"
+"string.text"
+msgid "Enter Password"
+msgstr "Rhowch gyfrinair"
+
+#. fJ^A
+#: password.ui
+msgctxt ""
+"password.ui\n"
+"userft\n"
+"label\n"
+"string.text"
+msgid "User"
+msgstr "Defnyddiwr"
+
+#. dpZY
+#: password.ui
+#, fuzzy
+msgctxt ""
+"password.ui\n"
+"pass1ft\n"
+"label\n"
+"string.text"
+msgid "Password"
+msgstr "Cyfrinair"
+
+#. F_U-
+#: password.ui
+#, fuzzy
+msgctxt ""
+"password.ui\n"
+"confirm1ft\n"
+"label\n"
+"string.text"
+msgid "Confirm"
+msgstr "~Cadarnhau"
+
+#. _VwB
+#: password.ui
+#, fuzzy
+msgctxt ""
+"password.ui\n"
+"label1\n"
+"label\n"
+"string.text"
+msgid "Password"
+msgstr "Cyfrinair"
+
+#. oGbf
+#: password.ui
+#, fuzzy
+msgctxt ""
+"password.ui\n"
+"pass2ft\n"
+"label\n"
+"string.text"
+msgid "Password"
+msgstr "Cyfrinair"
+
+#. +`e+
+#: password.ui
+#, fuzzy
+msgctxt ""
+"password.ui\n"
+"confirm2ft\n"
+"label\n"
+"string.text"
+msgid "Confirm"
+msgstr "~Cadarnhau"
+
+#. B!DF
+#: password.ui
+msgctxt ""
+"password.ui\n"
+"label2\n"
+"label\n"
+"string.text"
+msgid "Second Password"
+msgstr ""