[gedit] Updated Welsh translation



commit 6f33e2fcbc1c95ab542d1e169606af91221824aa
Author: Iestyn Pryce <dylunio gmail com>
Date:   Fri Aug 7 17:54:30 2009 +0100

    Updated Welsh translation

 po/cy.po | 3244 +++++++++++++++++++++++++++-----------------------------------
 1 files changed, 1413 insertions(+), 1831 deletions(-)
---
diff --git a/po/cy.po b/po/cy.po
index 8037b67..7c4a0e7 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -21,8 +21,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gedit\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-10-11 07:05+0100\n"
-"PO-Revision-Date: 2007-10-11 07:02+0100\n"
+"POT-Creation-Date: 2009-08-06 08:13+0100\n"
+"PO-Revision-Date: 2009-08-07 17:53+0100\n"
 "Last-Translator: Iestyn Pryce <dylunio gmail com>\n"
 "Language-Team: Cymraeg <gnome-cy-list gnome org>\n"
 "MIME-Version: 1.0\n"
@@ -34,533 +34,353 @@ msgstr ""
 msgid "Edit text files"
 msgstr "Golygu ffeiliau testun"
 
-#: ../data/gedit.desktop.in.in.h:2 ../gedit/gedit.c:463
+#: ../data/gedit.desktop.in.in.h:2
+#: ../gedit/gedit-print-job.c:755
 msgid "Text Editor"
 msgstr "Golygydd Testun"
 
-#: ../data/gedit.schemas.in.h:1
-msgid ""
-"A custom font that will be used for the editing area. This will only take "
-"effect if the \"Use Default Font\" option is turned off."
-msgstr ""
-"Ffont addasedig a gaiff ei ddefnyddio ar gyfer yr ardal golygu. Dim ond os "
-"caiff yr opsiwn \"Defnyddio'r Ffont Rhagosodedig\" ei ddiffodd y defnyddir y "
-"ffont hwn."
+#: ../data/gedit.schemas.in.in.h:1
+msgid "A custom font that will be used for the editing area. This will only take effect if the \"Use Default Font\" option is turned off."
+msgstr "Ffont addasedig a gaiff ei ddefnyddio ar gyfer yr ardal golygu. Dim ond os caiff yr opsiwn \"Defnyddio'r Ffont Rhagosodedig\" ei ddiffodd y defnyddir y ffont hwn."
 
-#: ../data/gedit.schemas.in.h:2 ../gedit/gedit-plugin-manager.c:765
+#: ../data/gedit.schemas.in.in.h:2
 msgid "Active plugins"
 msgstr "Ategion sy'n weithredol"
 
-#: ../data/gedit.schemas.in.h:3
+#: ../data/gedit.schemas.in.in.h:3
 msgid "Auto Detected Encodings"
 msgstr "Amgodiadau Wedi eu Canfod yn Awtomatig"
 
-#: ../data/gedit.schemas.in.h:4
+#: ../data/gedit.schemas.in.in.h:4
 msgid "Auto Save"
 msgstr "Cadw Awtomatig"
 
-#: ../data/gedit.schemas.in.h:5
+#: ../data/gedit.schemas.in.in.h:5
 msgid "Auto Save Interval"
 msgstr "Ysbaid Cadw Awtomatig"
 
-#: ../data/gedit.schemas.in.h:6
+#: ../data/gedit.schemas.in.in.h:6
 msgid "Auto indent"
 msgstr "Mewnoli'n awtomatig"
 
-#: ../data/gedit.schemas.in.h:7
+#: ../data/gedit.schemas.in.in.h:7
 msgid "Backup Copy Extension"
 msgstr "Estyniad Copi Wrth Gefn"
 
-#: ../data/gedit.schemas.in.h:8
+#: ../data/gedit.schemas.in.in.h:8
 msgid "Body Font for Printing"
 msgstr "Ffont y Corff ar gyfer Argraffu"
 
-#: ../data/gedit.schemas.in.h:9
+#: ../data/gedit.schemas.in.in.h:9
 msgid "Bottom Panel is Visible"
 msgstr "Panel Gwaelod yn Weladwy"
 
-#: ../data/gedit.schemas.in.h:10
+#: ../data/gedit.schemas.in.in.h:10
 msgid "Create Backup Copies"
 msgstr "Creu Copïau Wrth Gefn"
 
-#: ../data/gedit.schemas.in.h:11
+#: ../data/gedit.schemas.in.in.h:11
 msgid "Display Line Numbers"
 msgstr "Dangos Rhifau Llinell"
 
-#: ../data/gedit.schemas.in.h:12
+#: ../data/gedit.schemas.in.in.h:12
 msgid "Display Right Margin"
 msgstr "Dangos Ymyl Dde"
 
-#: ../data/gedit.schemas.in.h:13
+#: ../data/gedit.schemas.in.in.h:13
 msgid "Editor Font"
 msgstr "Ffont Golygydd"
 
-#: ../data/gedit.schemas.in.h:14
+#: ../data/gedit.schemas.in.in.h:14
 msgid "Enable Search Highlighting"
 msgstr "Galluogi Amlygiad Chwiliad"
 
-#: ../data/gedit.schemas.in.h:15
+#: ../data/gedit.schemas.in.in.h:15
 msgid "Enable Syntax Highlighting"
 msgstr "Galluogi Amlygiad Cystrawen"
 
-#: ../data/gedit.schemas.in.h:16
+#: ../data/gedit.schemas.in.in.h:16
 msgid "Encodings shown in menu"
 msgstr "Amgodiad a ddangosir yn y ddewislen"
 
-#: ../data/gedit.schemas.in.h:17
-msgid ""
-"Extension or suffix to use for backup file names. This will only take effect "
-"if the \"Create Backup Copies\" option is turned on."
-msgstr ""
-"Estyniad neu ôl-ddodiad i'w ddefnyddio ar gyfer enwau ffeiliau wrth gefn. "
-"Dim ond os caiff yr opsiwn \"Creu Copïau Wrth Gefn\" ei alluogi y defnyddir "
-"yr estyniad."
+#: ../data/gedit.schemas.in.in.h:17
+msgid "Extension or suffix to use for backup file names. This will only take effect if the \"Create Backup Copies\" option is turned on."
+msgstr "Estyniad neu ôl-ddodiad i'w ddefnyddio ar gyfer enwau ffeiliau wrth gefn. Dim ond os caiff yr opsiwn \"Creu Copïau Wrth Gefn\" ei alluogi y defnyddir yr estyniad."
 
-#: ../data/gedit.schemas.in.h:18
+#: ../data/gedit.schemas.in.in.h:18
 msgid "Header Font for Printing"
 msgstr "Ffont Bennawd ar gyfer Argraffu"
 
-#: ../data/gedit.schemas.in.h:19
+#: ../data/gedit.schemas.in.in.h:19
 msgid "Highlight Current Line"
 msgstr "Amlygu'r Llinell Bresennol"
 
-#: ../data/gedit.schemas.in.h:20
+#: ../data/gedit.schemas.in.in.h:20
 msgid "Highlight Matching Bracket"
 msgstr "Amlygu'r Gromfach sy'n Cyd-fynd"
 
-#: ../data/gedit.schemas.in.h:21
-msgid ""
-"If this value is 0, then no line numbers will be inserted when printing a "
-"document. Otherwise, gedit will print line numbers every such number of "
-"lines."
-msgstr ""
-"Os mai 0 yw'r gwerth yma, ni fewnosodir rhifau llinell wrth argraffu dogfen. "
-"Fel arall, fe fydd gedit yn argraffu rhifau llinell bob hyn o linellau."
+#: ../data/gedit.schemas.in.in.h:21
+msgid "If this value is 0, then no line numbers will be inserted when printing a document. Otherwise, gedit will print line numbers every such number of lines."
+msgstr "Os mai 0 yw'r gwerth yma, ni fewnosodir rhifau llinell wrth argraffu dogfen. Fel arall, fe fydd gedit yn argraffu rhifau llinell bob hyn o linellau."
 
-#: ../data/gedit.schemas.in.h:22
+#: ../data/gedit.schemas.in.in.h:22
 msgid "Insert spaces"
 msgstr "Mewnosod bylchau"
 
-#: ../data/gedit.schemas.in.h:23
+#: ../data/gedit.schemas.in.in.h:23
 msgid "Line Number Font for Printing"
 msgstr "Ffont Rhifau Llinell ar gyfer Argraffu"
 
-#: ../data/gedit.schemas.in.h:24
+#: ../data/gedit.schemas.in.in.h:24
 msgid "Line Wrapping Mode"
 msgstr "Modd Amlapio Llinellau"
 
-#: ../data/gedit.schemas.in.h:25
-msgid ""
-"List of VFS schemes gedit supports in write mode. The 'file' scheme is "
-"writable by default."
-msgstr ""
-"Rhestr o gynlluniau VFS mae gedit yn eu cynnal yn y modd ysgrifennu. Fel "
-"rhagosodiad, gellir ysgrifennu at y cynllun 'file'."
+#: ../data/gedit.schemas.in.in.h:25
+msgid "List of VFS schemes gedit supports in write mode. The 'file' scheme is writable by default."
+msgstr "Rhestr o gynlluniau VFS mae gedit yn eu cynnal yn y modd ysgrifennu. Fel rhagosodiad, gellir ysgrifennu at y cynllun 'file'."
 
-#: ../data/gedit.schemas.in.h:26
-msgid ""
-"List of active plugins. It contains the \"Location\" of the active plugins. "
-"See the .gedit-plugin file for obtaining the \"Location\" of a given plugin."
-msgstr ""
-"Rhestr o ategion gweithredol. Mae'n cynnwys \"Lleoliad\" yr ategion "
-"gweithredol. Gweler y ffeil .gedit-plugin er mwyn cael \"Lleoliad\" ategyn "
-"arbennig."
+#: ../data/gedit.schemas.in.in.h:26
+msgid "List of active plugins. It contains the \"Location\" of the active plugins. See the .gedit-plugin file for obtaining the \"Location\" of a given plugin."
+msgstr "Rhestr o ategion gweithredol. Mae'n cynnwys \"Lleoliad\" yr ategion gweithredol. Gweler y ffeil .gedit-plugin er mwyn cael \"Lleoliad\" ategyn arbennig."
 
-#: ../data/gedit.schemas.in.h:27
-msgid ""
-"List of encodings shown in Character Coding menu in open/save file selector. "
-"Only recognized encodings are used."
-msgstr ""
-"Rhestr o amgodiadau a ddangosir yn y ddewislen Amgodiad Nodau yn y dewiswr "
-"ffeiliau agor/cadw. Dim ond amgodiadau a adnabyddir a gaiff eu defnyddio."
+#: ../data/gedit.schemas.in.in.h:27
+msgid "List of encodings shown in Character Coding menu in open/save file selector. Only recognized encodings are used."
+msgstr "Rhestr o amgodiadau a ddangosir yn y ddewislen Amgodiad Nodau yn y dewiswr ffeiliau agor/cadw. Dim ond amgodiadau a adnabyddir a gaiff eu defnyddio."
 
-#: ../data/gedit.schemas.in.h:28
+#: ../data/gedit.schemas.in.in.h:28
 msgid "Max Number of Undo Actions"
 msgstr "Uchafswm Gweithredoedd i'w Dadwneud"
 
-#: ../data/gedit.schemas.in.h:29
+#: ../data/gedit.schemas.in.in.h:29
 msgid "Maximum Recent Files"
 msgstr "Uchafswm Ffeiliau Diweddar"
 
-#: ../data/gedit.schemas.in.h:30
-msgid ""
-"Maximum number of actions that gedit will be able to undo or redo. Use \"-1"
-"\" for unlimited number of actions."
-msgstr ""
-"Y nifer mwyaf o weithredoedd y bydd gedit yn gallu dadwneud neu ail-wneud. "
-"Defnyddiwch \"-1\" am nifer diderfyn."
+#: ../data/gedit.schemas.in.in.h:30
+msgid "Maximum number of actions that gedit will be able to undo or redo. Use \"-1\" for unlimited number of actions."
+msgstr "Y nifer mwyaf o weithredoedd y bydd gedit yn gallu dadwneud neu ail-wneud. Defnyddiwch \"-1\" am nifer diderfyn."
 
-#: ../data/gedit.schemas.in.h:31
-msgid ""
-"Maximum number of actions that gedit will be able to undo or redo. Use \"-1"
-"\" for unlimited number of actions. Deprecated since 2.12.0"
-msgstr ""
-"Y nifer mwyaf o weithredoedd y bydd gedit yn gallu dadwneud neu ail-wneud. "
-"Defnyddiwch \"-1\" am nifer diderfyn. Anghymeradwy ers 2.12.0"
+#: ../data/gedit.schemas.in.in.h:31
+msgid "Maximum number of actions that gedit will be able to undo or redo. Use \"-1\" for unlimited number of actions. Deprecated since 2.12.0"
+msgstr "Y nifer mwyaf o weithredoedd y bydd gedit yn gallu dadwneud neu ail-wneud. Defnyddiwch \"-1\" am nifer diderfyn. Anghymeradwy ers 2.12.0"
 
 #. Translators: This is the Editor Font.
 #. This is a Pango font
-#: ../data/gedit.schemas.in.h:34
+#: ../data/gedit.schemas.in.in.h:34
 msgid "Monospace 12"
 msgstr "Monospace 12"
 
 #. Translators: This is the Body font for printing.
 #. This is a Pango font.
-#: ../data/gedit.schemas.in.h:37
+#: ../data/gedit.schemas.in.in.h:37
 msgid "Monospace 9"
 msgstr "Monospace 9"
 
-#. Translators: This is the Body font for printing.
-#. This is a gnome-print font name and is replaced by
-#. print_font_body_pango.
-#: ../data/gedit.schemas.in.h:41
-msgid "Monospace Regular 9"
-msgstr "Monospace Regular 9"
-
-#: ../data/gedit.schemas.in.h:42
-msgid ""
-"Number of minutes after which gedit will automatically save modified files. "
-"This will only take effect if the \"Auto Save\" option is turned on."
-msgstr ""
-"Y nifer o funudau cyn y bydd gedit yn cadw ffeiliau wedi eu newid yn "
-"awtomatig. Fe fydd hyn ond yn cymryd effaith os galluogir yr opsiwn \"Cadw'n "
-"Awtomatig\"."
+#: ../data/gedit.schemas.in.in.h:38
+msgid "Number of minutes after which gedit will automatically save modified files. This will only take effect if the \"Auto Save\" option is turned on."
+msgstr "Y nifer o funudau cyn y bydd gedit yn cadw ffeiliau wedi eu newid yn awtomatig. Fe fydd hyn ond yn cymryd effaith os galluogir yr opsiwn \"Cadw'n Awtomatig\"."
 
-#: ../data/gedit.schemas.in.h:43
+#: ../data/gedit.schemas.in.in.h:39
 msgid "Print Header"
 msgstr "Pennawd Argraffydd"
 
-#: ../data/gedit.schemas.in.h:44
+#: ../data/gedit.schemas.in.in.h:40
 msgid "Print Line Numbers"
 msgstr "Argraffu Rhifau Llinell"
 
-#: ../data/gedit.schemas.in.h:45
+#: ../data/gedit.schemas.in.in.h:41
 msgid "Print Syntax Highlighting"
 msgstr "Argraffu Amlygiad Cystrawen"
 
-#: ../data/gedit.schemas.in.h:46
+#: ../data/gedit.schemas.in.in.h:42
 msgid "Printing Line Wrapping Mode"
 msgstr "Modd Amlapio Llinellau Argraffu"
 
-#: ../data/gedit.schemas.in.h:47
+#: ../data/gedit.schemas.in.in.h:43
 msgid "Restore Previous Cursor Position"
 msgstr "Adfer Lleoliad Blaenorol y Cyrchwr"
 
-#: ../data/gedit.schemas.in.h:48
+#: ../data/gedit.schemas.in.in.h:44
 msgid "Right Margin Position"
 msgstr "Safle'r Ymyl Dde"
 
 #. Translators: This is the Header font for printing.
 #. This is a Pango font.
-#: ../data/gedit.schemas.in.h:51
+#: ../data/gedit.schemas.in.in.h:47
 msgid "Sans 11"
 msgstr "Sans 11"
 
 #. Translators: This is the Line Number font for printing.
 #. This is a Pango font.
-#: ../data/gedit.schemas.in.h:54
+#: ../data/gedit.schemas.in.in.h:50
 msgid "Sans 8"
 msgstr "Sans 8"
 
-#. Translators: This is the Header font for printing.
-#. This is a gnome-print font name and replaced by
-#. print_font_header_pango.
-#: ../data/gedit.schemas.in.h:58
-msgid "Sans Regular 11"
-msgstr "Sans Regular 11"
-
-#. Translators: This is the Line Number font for printing.
-#. This is a gnome-print font name and replaced by
-#. print_font_numbers_pango.
-#: ../data/gedit.schemas.in.h:62
-msgid "Sans Regular 8"
-msgstr "Sans Regular 8"
-
-#: ../data/gedit.schemas.in.h:63
+#: ../data/gedit.schemas.in.in.h:51
 msgid "Side Pane is Visible"
 msgstr "Cwarel Ochr yn Weladwy"
 
-#: ../data/gedit.schemas.in.h:64
+#: ../data/gedit.schemas.in.in.h:52
 msgid "Smart Home End"
 msgstr ""
 
-#: ../data/gedit.schemas.in.h:65
+#: ../data/gedit.schemas.in.in.h:53
 #, fuzzy
-msgid ""
-"Sorted list of encodings used by gedit for auto-detecting the encoding of a "
-"file. \"CURRENT\" represents the current locale encoding. Only recognized "
-"encodings are used."
-msgstr ""
-"Rhestr wedi ei drefnu o amgodiadau a ddefnyddir gan gedit er mwyn canfod "
-"amgodiad ffeil yn awtomatig. \"CURRENT\" yw'r amgodiad locale cyfredol. Dim "
-"ond amgodiadau cydnabyddedig a gaiff eu defnyddio."
+msgid "Sorted list of encodings used by gedit for auto-detecting the encoding of a file. \"CURRENT\" represents the current locale encoding. Only recognized encodings are used."
+msgstr "Rhestr wedi ei drefnu o amgodiadau a ddefnyddir gan gedit er mwyn canfod amgodiad ffeil yn awtomatig. \"CURRENT\" yw'r amgodiad locale cyfredol. Dim ond amgodiadau cydnabyddedig a gaiff eu defnyddio."
 
-#: ../data/gedit.schemas.in.h:66
-msgid ""
-"Specifies how the cursor moves when the HOME and END keys are pressed. Use "
-"\"DISABLED\" to always move at the start/end of the line, \"AFTER\" to move "
-"to the start/end of the line the first time the keys are pressed and to the "
-"start/end of the text ignoring whitespaces the second time the keys are "
-"pressed, \"BEFORE\" to move to the start/end of the text before moving to "
-"the start/end of the line and \"ALWAYS\" to always move to the start/end of "
-"the text instead of the start/end of the line."
+#: ../data/gedit.schemas.in.in.h:54
+msgid "Specifies how the cursor moves when the HOME and END keys are pressed. Use \"DISABLED\" to always move at the start/end of the line, \"AFTER\" to move to the start/end of the line the first time the keys are pressed and to the start/end of the text ignoring whitespaces the second time the keys are pressed, \"BEFORE\" to move to the start/end of the text before moving to the start/end of the line and \"ALWAYS\" to always move to the start/end of the text instead of the start/end of the line."
 msgstr ""
 
-#: ../data/gedit.schemas.in.h:67
-msgid ""
-"Specifies how to wrap long lines for printing. Use \"GTK_WRAP_NONE\" for no "
-"wrapping, \"GTK_WRAP_WORD\" for wrapping at word boundaries, and "
-"\"GTK_WRAP_CHAR\" for wrapping at individual character boundaries. Note that "
-"the values are case-sensitive, so make sure they appear exactly as mentioned "
-"here."
-msgstr ""
-"Penodi sut dylid amlapio llinellau hir ar gyfer argraffu. Defnyddiwch "
-"\"GTK_WRAP_NONE\" os am beidio amlapio, \"GTK_WRAP_WORD\" er mwyn amlapio "
-"ger ffiniau geiriau, a \"GTK_WRAP_CHAR\" er mwyn amlapio ger ffiniau nodau "
-"unigol. Nodwch fod priflythrennau a llythrennau bach yn cael eu trin yn "
-"wahanol, felly sicrhewch eu bod nhw'n ymddangos yn union fel y maent yma."
+#: ../data/gedit.schemas.in.in.h:55
+msgid "Specifies how to wrap long lines for printing. Use \"GTK_WRAP_NONE\" for no wrapping, \"GTK_WRAP_WORD\" for wrapping at word boundaries, and \"GTK_WRAP_CHAR\" for wrapping at individual character boundaries. Note that the values are case-sensitive, so make sure they appear exactly as mentioned here."
+msgstr "Penodi sut dylid amlapio llinellau hir ar gyfer argraffu. Defnyddiwch \"GTK_WRAP_NONE\" os am beidio amlapio, \"GTK_WRAP_WORD\" er mwyn amlapio ger ffiniau geiriau, a \"GTK_WRAP_CHAR\" er mwyn amlapio ger ffiniau nodau unigol. Nodwch fod priflythrennau a llythrennau bach yn cael eu trin yn wahanol, felly sicrhewch eu bod nhw'n ymddangos yn union fel y maent yma."
 
-#: ../data/gedit.schemas.in.h:68
-msgid ""
-"Specifies how to wrap long lines in the editing area. Use \"GTK_WRAP_NONE\" "
-"for no wrapping, \"GTK_WRAP_WORD\" for wrapping at word boundaries, and "
-"\"GTK_WRAP_CHAR\" for wrapping at individual character boundaries. Note that "
-"the values are case-sensitive, so make sure they appear exactly as mentioned "
-"here."
-msgstr ""
-"Penodi sut i amlapio llinellau hir yn yr ardal golygu. Defnyddiwch "
-"\"GTK_WRAP_NONE\" os am beidio amlapio, \"GTK_WRAP_WORD\" er mwyn amlapio "
-"ger ffiniau geiriau, a \"GTK_WRAP_CHAR\" er mwyn amlapio ger ffiniau nodau "
-"unigol. Nodwch fod priflythrennau a llythrennau bach yn cael eu trin yn "
-"wahanol, felly sicrhewch eu bod nhw'n ymddangos yn union fel y maent yma."
+#: ../data/gedit.schemas.in.in.h:56
+msgid "Specifies how to wrap long lines in the editing area. Use \"GTK_WRAP_NONE\" for no wrapping, \"GTK_WRAP_WORD\" for wrapping at word boundaries, and \"GTK_WRAP_CHAR\" for wrapping at individual character boundaries. Note that the values are case-sensitive, so make sure they appear exactly as mentioned here."
+msgstr "Penodi sut i amlapio llinellau hir yn yr ardal golygu. Defnyddiwch \"GTK_WRAP_NONE\" os am beidio amlapio, \"GTK_WRAP_WORD\" er mwyn amlapio ger ffiniau geiriau, a \"GTK_WRAP_CHAR\" er mwyn amlapio ger ffiniau nodau unigol. Nodwch fod priflythrennau a llythrennau bach yn cael eu trin yn wahanol, felly sicrhewch eu bod nhw'n ymddangos yn union fel y maent yma."
 
-#: ../data/gedit.schemas.in.h:69
-msgid ""
-"Specifies the font to use for a document's body when printing documents."
+#: ../data/gedit.schemas.in.in.h:57
+msgid "Specifies the font to use for a document's body when printing documents."
 msgstr "Penodi'r ffont i'w ddefnyddio ar gyfer corff dogfennau wrth argraffu."
 
-#: ../data/gedit.schemas.in.h:70
-msgid ""
-"Specifies the font to use for a document's body when printing documents. "
-"This is a gnome-print font name and replaced by print_font_body_pango."
-msgstr ""
-"Penodi'r ffont i'w ddefnyddio ar gyfer corff dogfennau wrth argraffu. Enw "
-"ffont gnome-print yw hwn, ac fe gaiff print_font_body_pango ei roi yn ei le."
+#: ../data/gedit.schemas.in.in.h:58
+msgid "Specifies the font to use for line numbers when printing. This will only take effect if the \"Print Line Numbers\" option is non-zero."
+msgstr "Penodi'r ffont i'w ddefnyddio ar gyfer rhifau llinellau wrth argraffu dogfennau. Mae hyn ond yn berthnasol os nad yw'r opsiwn \"Argraffu Rhifau Llinellau\" yn sero."
 
-#: ../data/gedit.schemas.in.h:71
-msgid ""
-"Specifies the font to use for line numbers when printing. This will only "
-"take effect if the \"Print Line Numbers\" option is non-zero."
-msgstr ""
-"Penodi'r ffont i'w ddefnyddio ar gyfer rhifau llinellau wrth argraffu "
-"dogfennau. Mae hyn ond yn berthnasol os nad yw'r opsiwn \"Argraffu Rhifau "
-"Llinellau\" yn sero."
+#: ../data/gedit.schemas.in.in.h:59
+msgid "Specifies the font to use for page headers when printing a document. This will only take effect if the \"Print Header\" option is turned on."
+msgstr "Penodi'r ffont i'w ddefnyddio ar gyfer penawdau tudalennau wrth argraffu dogfen. Mae hyn ond yn berthnasol os yw'r opsiwn \"Argraffu Pennawd\" wedi ei ddewis."
 
-#: ../data/gedit.schemas.in.h:72
-msgid ""
-"Specifies the font to use for line numbers when printing. This will only "
-"take effect if the \"Print Line Numbers\" option is non-zero. This is a "
-"gnome-print font name and replaced by print_font_numbers_pango."
-msgstr ""
-"Penodi'r ffont i'w ddefnyddio ar gyfer rhifau llinellau wrth argraffu "
-"dogfennau. Mae hyn ond yn berthnasol os nad yw'r opsiwn \"Argraffu Rhifau "
-"Llinellau\" yn sero. Enw ffont gnome-print yw hwn, ac fe gaiff "
-"print_font_numbers_pango ei roi yn ei le."
+#: ../data/gedit.schemas.in.in.h:60
+msgid "Specifies the maximum number of recently opened files that will be displayed in the \"Recent Files\" submenu."
+msgstr "Penodi'r uchafrif o ffeiliau agorwyd yn ddiweddar a gaiff eu dangos yn yr is-ddewislen \"Ffeiliau Diweddar\"."
 
-#: ../data/gedit.schemas.in.h:73
-msgid ""
-"Specifies the font to use for page headers when printing a document. This "
-"will only take effect if the \"Print Header\" option is turned on."
-msgstr ""
-"Penodi'r ffont i'w ddefnyddio ar gyfer penawdau tudalennau wrth argraffu "
-"dogfen. Mae hyn ond yn berthnasol os yw'r opsiwn \"Argraffu Pennawd\" wedi "
-"ei ddewis."
-
-#: ../data/gedit.schemas.in.h:74
-msgid ""
-"Specifies the font to use for page headers when printing a document. This "
-"will only take effect if the \"Print Header\" option is turned on. This is a "
-"gnome-print font name and replaced by print_font_header_pango."
-msgstr ""
-"Penodi'r ffont i'w ddefnyddio ar gyfer penawdau tudalennau wrth argraffu "
-"dogfen. Mae hyn ond yn berthnasol os yw'r opsiwn \"Argraffu Pennawd\" wedi "
-"ei ddewis. Enw ffont gnome-print yw hwn, ac fe gaiff print_font_header_pango "
-"ei roi yn ei le."
-
-#: ../data/gedit.schemas.in.h:75
-msgid ""
-"Specifies the maximum number of recently opened files that will be displayed "
-"in the \"Recent Files\" submenu."
-msgstr ""
-"Penodi'r uchafrif o ffeiliau agorwyd yn ddiweddar a gaiff eu dangos yn yr is-"
-"ddewislen \"Ffeiliau Diweddar\"."
-
-#: ../data/gedit.schemas.in.h:76
-msgid ""
-"Specifies the number of spaces that should be displayed instead of Tab "
-"characters."
+#: ../data/gedit.schemas.in.in.h:61
+msgid "Specifies the number of spaces that should be displayed instead of Tab characters."
 msgstr "Penodi sawl bwlch dylid dangos yn lle nodau tab."
 
-#: ../data/gedit.schemas.in.h:77
+#: ../data/gedit.schemas.in.in.h:62
 msgid "Specifies the position of the right margin."
 msgstr "Penodi safle'r ymyl dde."
 
-#: ../data/gedit.schemas.in.h:78
+#: ../data/gedit.schemas.in.in.h:63
 msgid "Status Bar is Visible"
 msgstr "Bar Statws yn Weladwy"
 
-#: ../data/gedit.schemas.in.h:79
+#: ../data/gedit.schemas.in.in.h:64
 #, fuzzy
 msgid "Style Scheme"
 msgstr "Cynlluniau ysgrifenadwy VFS"
 
-#: ../data/gedit.schemas.in.h:80
-msgid ""
-"Style for the toolbar buttons. Possible values are \"GEDIT_TOOLBAR_SYSTEM\" "
-"to use the system's default style, \"GEDIT_TOOLBAR_ICONS\" to display icons "
-"only, \"GEDIT_TOOLBAR_ICONS_AND_TEXT\" to display both icons and text, and "
-"\"GEDIT_TOOLBAR_ICONS_BOTH_HORIZ\" to display prioritized text beside icons. "
-"Note that the values are case-sensitive, so make sure they appear exactly as "
-"mentioned here."
-msgstr ""
-"Arddull ar gyfer botymau'r bar offer. Gwerthoedd posib: "
-"\"GEDIT_TOOLBAR_SYSTEM\" er mwyn defnyddio arddull ragosodedig y system, "
-"\"GEDIT_TOOLBAR_ICONS\" er mwyn dangos eiconau'n unig, "
-"\"GEDIT_TOOLBAR_ICONS_AND_TEXT\" er mwyn dangos testun ac eiconau, a "
-"\"GEDIT_TOOLBAR_ICONS_BOTH_HORIZ\" er mwyn dangos testun pwysig wrth ochr "
-"eiconau. Nodwch fod priflythrennau a llythrennau bach yn cael eu trin yn "
-"wahanol, felly sicrhewch eu bod nhw'n ymddangos yn union fel y maent yma."
-
-#: ../data/gedit.schemas.in.h:81
+#: ../data/gedit.schemas.in.in.h:65
+msgid "Style for the toolbar buttons. Possible values are \"GEDIT_TOOLBAR_SYSTEM\" to use the system's default style, \"GEDIT_TOOLBAR_ICONS\" to display icons only, \"GEDIT_TOOLBAR_ICONS_AND_TEXT\" to display both icons and text, and \"GEDIT_TOOLBAR_ICONS_BOTH_HORIZ\" to display prioritized text beside icons. Note that the values are case-sensitive, so make sure they appear exactly as mentioned here."
+msgstr "Arddull ar gyfer botymau'r bar offer. Gwerthoedd posib: \"GEDIT_TOOLBAR_SYSTEM\" er mwyn defnyddio arddull ragosodedig y system, \"GEDIT_TOOLBAR_ICONS\" er mwyn dangos eiconau'n unig, \"GEDIT_TOOLBAR_ICONS_AND_TEXT\" er mwyn dangos testun ac eiconau, a \"GEDIT_TOOLBAR_ICONS_BOTH_HORIZ\" er mwyn dangos testun pwysig wrth ochr eiconau. Nodwch fod priflythrennau a llythrennau bach yn cael eu trin yn wahanol, felly sicrhewch eu bod nhw'n ymddangos yn union fel y maent yma."
+
+#: ../data/gedit.schemas.in.in.h:66
 msgid "Tab Size"
 msgstr "Maint Tabl"
 
-#: ../data/gedit.schemas.in.h:82
+#: ../data/gedit.schemas.in.in.h:67
 msgid "The id of a GtkSourceView Style Scheme used to color the text."
 msgstr ""
 
-#: ../data/gedit.schemas.in.h:83
+#: ../data/gedit.schemas.in.in.h:68
 msgid "Toolbar Buttons Style"
 msgstr "Arddull Botymau Bar Offer"
 
-#: ../data/gedit.schemas.in.h:84
+#: ../data/gedit.schemas.in.in.h:69
 msgid "Toolbar is Visible"
 msgstr "Mae'r Bar Offer yn Weladwy"
 
-#: ../data/gedit.schemas.in.h:85
+#: ../data/gedit.schemas.in.in.h:70
 msgid "Undo Actions Limit (DEPRECATED)"
 msgstr "Cyfwng Dadwneud Gweithrediadau (ANGHYMERADWY)"
 
-#: ../data/gedit.schemas.in.h:86
+#: ../data/gedit.schemas.in.in.h:71
 msgid "Use Default Font"
 msgstr "Defnyddio Ffont Rhagosodedig"
 
-#: ../data/gedit.schemas.in.h:87
-msgid ""
-"Whether gedit should automatically save modified files after a time "
-"interval. You can set the time interval with the \"Auto Save Interval\" "
-"option."
-msgstr ""
-"A ddylai gedit gadw ffeiliau a newidiwyd ar ôl ysbaid. Fe allwch osod yr "
-"ysbaid gyda'r opsiwn \"Ysbaid Cadw Awtomatig\"."
+#: ../data/gedit.schemas.in.in.h:72
+msgid "Whether gedit should automatically save modified files after a time interval. You can set the time interval with the \"Auto Save Interval\" option."
+msgstr "A ddylai gedit gadw ffeiliau a newidiwyd ar ôl ysbaid. Fe allwch osod yr ysbaid gyda'r opsiwn \"Ysbaid Cadw Awtomatig\"."
 
-#: ../data/gedit.schemas.in.h:88
-msgid ""
-"Whether gedit should create backup copies for the files it saves. You can "
-"set the backup file extension with the \"Backup Copy Extension\" option."
-msgstr ""
-"A ddylai gedit greu copïau wrth gefn ar gyfer y ffeiliau mae'n cadw. Gallwch "
-"osod yr estyniad copi wrth gefn gyda'r opsiwn \"Estyniad Copi Wrth Gefn\"."
+#: ../data/gedit.schemas.in.in.h:73
+msgid "Whether gedit should create backup copies for the files it saves. You can set the backup file extension with the \"Backup Copy Extension\" option."
+msgstr "A ddylai gedit greu copïau wrth gefn ar gyfer y ffeiliau mae'n cadw. Gallwch osod yr estyniad copi wrth gefn gyda'r opsiwn \"Estyniad Copi Wrth Gefn\"."
 
-#: ../data/gedit.schemas.in.h:89
+#: ../data/gedit.schemas.in.in.h:74
 msgid "Whether gedit should display line numbers in the editing area."
 msgstr "A ddylai gedit ddangos rhifau llinellau yn yr ardal golygu."
 
-#: ../data/gedit.schemas.in.h:90
+#: ../data/gedit.schemas.in.in.h:75
 msgid "Whether gedit should display the right margin in the editing area."
 msgstr "A ddylai gedit ddangos yr ymyl de yn yr ardal golygu."
 
-#: ../data/gedit.schemas.in.h:91
+#: ../data/gedit.schemas.in.in.h:76
 msgid "Whether gedit should enable auto indentation."
 msgstr "A ddylai gedit alluogi mewnoli awtomatig."
 
-#: ../data/gedit.schemas.in.h:92
+#: ../data/gedit.schemas.in.in.h:77
 msgid "Whether gedit should enable syntax highlighting."
 msgstr "A ddylai gedit alluogi amlygu cystrawen."
 
-#: ../data/gedit.schemas.in.h:93
-msgid ""
-"Whether gedit should highlight all the occurrences of the searched text."
-msgstr ""
-"A ddylai gedit amlygu bob man mae'r testun chwiliwyd amdano yn ymddangos."
+#: ../data/gedit.schemas.in.in.h:78
+msgid "Whether gedit should highlight all the occurrences of the searched text."
+msgstr "A ddylai gedit amlygu bob man mae'r testun chwiliwyd amdano yn ymddangos."
 
-#: ../data/gedit.schemas.in.h:94
+#: ../data/gedit.schemas.in.in.h:79
 msgid "Whether gedit should highlight matching bracket."
 msgstr "A ddylai gedit amlygu'r gromfach sy'n cyd-fynd."
 
-#: ../data/gedit.schemas.in.h:95
+#: ../data/gedit.schemas.in.in.h:80
 msgid "Whether gedit should highlight the current line."
 msgstr "A ddylai gedit amlygu'r llinell bresennol."
 
-#: ../data/gedit.schemas.in.h:96
+#: ../data/gedit.schemas.in.in.h:81
 msgid "Whether gedit should include a document header when printing documents."
 msgstr "A ddylai gedit gynnwys pennawd dogfen wrth argraffu dogfennau."
 
-#: ../data/gedit.schemas.in.h:97
+#: ../data/gedit.schemas.in.in.h:82
 msgid "Whether gedit should insert spaces instead of tabs."
 msgstr "A ddylai gedit fewnosod bylchau yn lle tabiau."
 
-#: ../data/gedit.schemas.in.h:98
+#: ../data/gedit.schemas.in.in.h:83
 msgid "Whether gedit should print syntax highlighting when printing documents."
 msgstr "A ddylai gedit argraffu amlygiadau cystrawen wrth argraffu dogfennau."
 
-#: ../data/gedit.schemas.in.h:99
-msgid ""
-"Whether gedit should restore the previous cursor position when a file is "
-"loaded."
-msgstr ""
-"A ddylai gedit adfer lleoliad blaenorol y cyrchwr pan fo ffeil wedi'i "
-"llwytho."
+#: ../data/gedit.schemas.in.in.h:84
+msgid "Whether gedit should restore the previous cursor position when a file is loaded."
+msgstr "A ddylai gedit adfer lleoliad blaenorol y cyrchwr pan fo ffeil wedi'i llwytho."
 
-#: ../data/gedit.schemas.in.h:100
-msgid ""
-"Whether the bottom panel at the bottom of editing windows should be visible."
+#: ../data/gedit.schemas.in.in.h:85
+msgid "Whether the bottom panel at the bottom of editing windows should be visible."
 msgstr "A ddylai'r panel gwaelod ar waelod ffenestri golygu fod yn weladwy."
 
-#: ../data/gedit.schemas.in.h:101
-msgid ""
-"Whether the side pane at the left of the editing window should be visible."
-msgstr ""
-"A ddylai'r panel ochr afr ochr chwith y ffenestr golygu fod yn weladwy."
+#: ../data/gedit.schemas.in.in.h:86
+msgid "Whether the side pane at the left of the editing window should be visible."
+msgstr "A ddylai'r panel ochr afr ochr chwith y ffenestr golygu fod yn weladwy."
 
-#: ../data/gedit.schemas.in.h:102
-msgid ""
-"Whether the status bar at the bottom of editing windows should be visible."
+#: ../data/gedit.schemas.in.in.h:87
+msgid "Whether the status bar at the bottom of editing windows should be visible."
 msgstr "A ddylai'r bar statws ar waelod ffenestri golygu fod yn weladwy."
 
-#: ../data/gedit.schemas.in.h:103
+#: ../data/gedit.schemas.in.in.h:88
 msgid "Whether the toolbar should be visible in editing windows."
 msgstr "A ddylai'r bar offer for yn weladwy mewn ffenestri golygu."
 
-#: ../data/gedit.schemas.in.h:104
+#: ../data/gedit.schemas.in.in.h:89
 #, fuzzy
-msgid ""
-"Whether to use the system's default fixed width font for editing text "
-"instead of a font specific to gedit. If this option is turned off, then the "
-"font named in the \"Editor Font\" option will be used instead of the system "
-"font."
-msgstr ""
-"A ddylid defnyddio ffont rhagosodedig y system ar gyfer golygu testun yn lle "
-"ffont yn benodol i gedit. Os troir yr opsiwn yma bant, yna fe gaiff y ffont "
-"a enwir yn yr opsiwn \"Font Golygydd\" ei ddefnyddio yn lle ffont y system."
+msgid "Whether to use the system's default fixed width font for editing text instead of a font specific to gedit. If this option is turned off, then the font named in the \"Editor Font\" option will be used instead of the system font."
+msgstr "A ddylid defnyddio ffont rhagosodedig y system ar gyfer golygu testun yn lle ffont yn benodol i gedit. Os troir yr opsiwn yma bant, yna fe gaiff y ffont a enwir yn yr opsiwn \"Font Golygydd\" ei ddefnyddio yn lle ffont y system."
 
-#: ../data/gedit.schemas.in.h:105
+#: ../data/gedit.schemas.in.in.h:90
 msgid "Writable VFS schemes"
 msgstr "Cynlluniau ysgrifenadwy VFS"
 
 #. Translators: This is the list of encodings shown by default in the Character Coding
 #. menu in open/save file selector. Only recognized encodings are displayed.
-#: ../data/gedit.schemas.in.h:108
+#: ../data/gedit.schemas.in.in.h:93
 msgid "[ISO-8859-15]"
 msgstr "[ISO-8859-15]"
 
@@ -575,10 +395,9 @@ msgstr "[ISO-8859-15]"
 #. Only recognized encodings are used.
 #. See http://svn.gnome.org/viewcvs/gedit/trunk/gedit/gedit-encodings.c?view=markup for
 #. a list of supported encodings
-#: ../data/gedit.schemas.in.h:120
-#, fuzzy
+#: ../data/gedit.schemas.in.in.h:105
 msgid "[UTF-8,CURRENT,ISO-8859-15,UTF-16]"
-msgstr "[UTF-8,CURRENT,ISO-8859-14,ISO-8859-15]"
+msgstr "[UTF-8,CURRENT,ISO-8859-14,ISO-8859-15,UTF-16]"
 
 #: ../gedit/dialogs/gedit-close-confirmation-dialog.c:140
 msgid "Logout _without Saving"
@@ -598,61 +417,34 @@ msgstr "Cwestiwn"
 
 #: ../gedit/dialogs/gedit-close-confirmation-dialog.c:411
 #, c-format
-msgid ""
-"If you don't save, changes from the last %ld second will be permanently lost."
-msgid_plural ""
-"If you don't save, changes from the last %ld seconds will be permanently "
-"lost."
-msgstr[0] ""
-"Os na wnewch chi gadw, fe gollir am byth newidiadau'r %ld eiliad olaf."
-msgstr[1] ""
-"Os na wnewch chi gadw, fe gollir am byth newidiadau'r %ld eiliad olaf."
-msgstr[2] ""
-"Os na wnewch chi gadw, fe gollir am byth newidiadau'r %ld eiliad olaf."
-msgstr[3] ""
-"Os na wnewch chi gadw, fe gollir am byth newidiadau'r %ld eiliad olaf."
+msgid "If you don't save, changes from the last %ld second will be permanently lost."
+msgid_plural "If you don't save, changes from the last %ld seconds will be permanently lost."
+msgstr[0] "Os na wnewch chi gadw, fe gollir am byth newidiadau'r %ld eiliad olaf."
+msgstr[1] "Os na wnewch chi gadw, fe gollir am byth newidiadau'r %ld eiliad olaf."
+msgstr[2] "Os na wnewch chi gadw, fe gollir am byth newidiadau'r %ld eiliad olaf."
+msgstr[3] "Os na wnewch chi gadw, fe gollir am byth newidiadau'r %ld eiliad olaf."
 
 #: ../gedit/dialogs/gedit-close-confirmation-dialog.c:420
-msgid ""
-"If you don't save, changes from the last minute will be permanently lost."
+msgid "If you don't save, changes from the last minute will be permanently lost."
 msgstr "Os na wnewch chi gadw, fe gollir am byth newidiadau'r munud diwethaf."
 
 #: ../gedit/dialogs/gedit-close-confirmation-dialog.c:426
 #, c-format
-msgid ""
-"If you don't save, changes from the last minute and %ld second will be "
-"permanently lost."
-msgid_plural ""
-"If you don't save, changes from the last minute and %ld seconds will be "
-"permanently lost."
-msgstr[0] ""
-"Os na wnewch chi gadw, fe gollir am byth newidiadau'r funud a %ld eiliad "
-"olaf."
-msgstr[1] ""
-"Os na wnewch chi gadw, fe gollir am byth newidiadau'r funud ac %ld eiliad "
-"olaf."
-msgstr[2] ""
-"Os na wnewch chi gadw, fe gollir am byth newidiadau'r funud a %ld eiliad "
-"olaf."
-msgstr[3] ""
-"Os na wnewch chi gadw, fe gollir am byth newidiadau'r funud ac %ld eiliad "
-"olaf."
+msgid "If you don't save, changes from the last minute and %ld second will be permanently lost."
+msgid_plural "If you don't save, changes from the last minute and %ld seconds will be permanently lost."
+msgstr[0] "Os na wnewch chi gadw, fe gollir am byth newidiadau'r funud a %ld eiliad olaf."
+msgstr[1] "Os na wnewch chi gadw, fe gollir am byth newidiadau'r funud ac %ld eiliad olaf."
+msgstr[2] "Os na wnewch chi gadw, fe gollir am byth newidiadau'r funud a %ld eiliad olaf."
+msgstr[3] "Os na wnewch chi gadw, fe gollir am byth newidiadau'r funud ac %ld eiliad olaf."
 
 #: ../gedit/dialogs/gedit-close-confirmation-dialog.c:436
 #, c-format
-msgid ""
-"If you don't save, changes from the last %ld minute will be permanently lost."
-msgid_plural ""
-"If you don't save, changes from the last %ld minutes will be permanently "
-"lost."
-msgstr[0] ""
-"Os na wnewch chi gadw, fe gollir am byth newidiadau'r %ld munud olaf."
-msgstr[1] ""
-"Os na wnewch chi gadw, fe gollir am byth newidiadau'r %ld funud olaf."
-msgstr[2] ""
-"Os na wnewch chi gadw, fe gollir am byth newidiadau'r %ld funud olaf."
-msgstr[3] ""
-"Os na wnewch chi gadw, fe gollir am byth newidiadau'r %ld munud olaf."
+msgid "If you don't save, changes from the last %ld minute will be permanently lost."
+msgid_plural "If you don't save, changes from the last %ld minutes will be permanently lost."
+msgstr[0] "Os na wnewch chi gadw, fe gollir am byth newidiadau'r %ld munud olaf."
+msgstr[1] "Os na wnewch chi gadw, fe gollir am byth newidiadau'r %ld funud olaf."
+msgstr[2] "Os na wnewch chi gadw, fe gollir am byth newidiadau'r %ld funud olaf."
+msgstr[3] "Os na wnewch chi gadw, fe gollir am byth newidiadau'r %ld munud olaf."
 
 #: ../gedit/dialogs/gedit-close-confirmation-dialog.c:451
 #, fuzzy
@@ -661,27 +453,17 @@ msgstr "Os na wnewch chi gadw, fe gollir am byth newidiadau'r awr olaf."
 
 #: ../gedit/dialogs/gedit-close-confirmation-dialog.c:457
 #, c-format
-msgid ""
-"If you don't save, changes from the last hour and %d minute will be "
-"permanently lost."
-msgid_plural ""
-"If you don't save, changes from the last hour and %d minutes will be "
-"permanently lost."
-msgstr[0] ""
-"Os na wnewch chi gadw, fe gollir am byth newidiadau'r awr a'r %d munud olaf."
-msgstr[1] ""
-"Os na wnewch chi gadw, fe gollir am byth newidiadau'r awr a'r %d funud olaf."
-msgstr[2] ""
-"Os na wnewch chi gadw, fe gollir am byth newidiadau'r awr a'r %d funud olaf."
-msgstr[3] ""
-"Os na wnewch chi gadw, fe gollir am byth newidiadau'r awr a'r %d munud olaf."
+msgid "If you don't save, changes from the last hour and %d minute will be permanently lost."
+msgid_plural "If you don't save, changes from the last hour and %d minutes will be permanently lost."
+msgstr[0] "Os na wnewch chi gadw, fe gollir am byth newidiadau'r awr a'r %d munud olaf."
+msgstr[1] "Os na wnewch chi gadw, fe gollir am byth newidiadau'r awr a'r %d funud olaf."
+msgstr[2] "Os na wnewch chi gadw, fe gollir am byth newidiadau'r awr a'r %d funud olaf."
+msgstr[3] "Os na wnewch chi gadw, fe gollir am byth newidiadau'r awr a'r %d munud olaf."
 
 #: ../gedit/dialogs/gedit-close-confirmation-dialog.c:472
 #, fuzzy, c-format
-msgid ""
-"If you don't save, changes from the last %d hour will be permanently lost."
-msgid_plural ""
-"If you don't save, changes from the last %d hours will be permanently lost."
+msgid "If you don't save, changes from the last %d hour will be permanently lost."
+msgid_plural "If you don't save, changes from the last %d hours will be permanently lost."
 msgstr[0] "Os na wnewch chi gadw, fe gollir am byth newidiadau'r awr olaf."
 msgstr[1] "Os na wnewch chi gadw, fe gollir am byth newidiadau'r %d awr olaf."
 msgstr[2] "Os na wnewch chi gadw, fe gollir am byth newidiadau'r %d awr olaf."
@@ -693,8 +475,8 @@ msgid "Changes to document \"%s\" will be permanently lost."
 msgstr "Fe gollir am byth y newidiadau wnaed i'r ddogfen \"%s\"."
 
 #: ../gedit/dialogs/gedit-close-confirmation-dialog.c:520
-#, c-format
-msgid "Save the changes to document \"%s\" before closing?"
+#, fuzzy, c-format
+msgid "Save changes to document \"%s\" before closing?"
 msgstr "Cadw'r newidiadau i'r ddogfen \"%s\" cyn cau?"
 
 #: ../gedit/dialogs/gedit-close-confirmation-dialog.c:534
@@ -714,8 +496,7 @@ msgstr[3] "Fe gollir am byth y newidiadau wnaed i'r %d dogfen."
 #: ../gedit/dialogs/gedit-close-confirmation-dialog.c:706
 #, c-format
 msgid "There is %d document with unsaved changes. Save changes before closing?"
-msgid_plural ""
-"There are %d documents with unsaved changes. Save changes before closing?"
+msgid_plural "There are %d documents with unsaved changes. Save changes before closing?"
 msgstr[0] "Mae %d dogfen gyda newidiadau heb gadw. Cadw'r newidiadau cyn cau?"
 msgstr[1] "Mae %d dogfen gyda newidiadau heb gadw. Cadw'r newidiadau cyn cau?"
 msgstr[2] "Mae %d ddogfen gyda newidiadau heb gadw. Cadw'r newidiadau cyn cau?"
@@ -733,367 +514,311 @@ msgstr "_Dewiswch y dogfennau hoffech eu cadw:"
 msgid "If you don't save, all your changes will be permanently lost."
 msgstr "Os na wnewch chi gadw, fe gollir eich holl newidiadau am byth."
 
-#: ../gedit/dialogs/gedit-encodings-dialog.c:315
+#: ../gedit/dialogs/gedit-encodings-dialog.c:321
 msgid "Character Codings"
 msgstr "Amgodiadau Nodau"
 
-#: ../gedit/dialogs/gedit-encodings-dialog.c:373
-#: ../gedit/dialogs/gedit-encodings-dialog.c:434
+#: ../gedit/dialogs/gedit-encodings-dialog.c:382
+#: ../gedit/dialogs/gedit-encodings-dialog.c:443
 msgid "_Description"
 msgstr "_Disgrifiad"
 
-#: ../gedit/dialogs/gedit-encodings-dialog.c:382
-#: ../gedit/dialogs/gedit-encodings-dialog.c:443
+#: ../gedit/dialogs/gedit-encodings-dialog.c:391
+#: ../gedit/dialogs/gedit-encodings-dialog.c:452
 msgid "_Encoding"
 msgstr "_Amgodiad"
 
-#: ../gedit/dialogs/gedit-encodings-dialog.glade.h:1
+#: ../gedit/dialogs/gedit-encodings-dialog.ui.h:1
 msgid "A_vailable encodings:"
 msgstr "Amgodiadau ar _gael:"
 
-#: ../gedit/dialogs/gedit-encodings-dialog.glade.h:2
+#: ../gedit/dialogs/gedit-encodings-dialog.ui.h:2
 msgid "Character codings"
 msgstr "Amgodiadau nodau"
 
-#: ../gedit/dialogs/gedit-encodings-dialog.glade.h:3
+#: ../gedit/dialogs/gedit-encodings-dialog.ui.h:3
 msgid "E_ncodings shown in menu:"
 msgstr "_Amgodiadau a ddangosir yn y ddewislen:"
 
-#: ../gedit/dialogs/gedit-open-location-dialog.c:139
-#: ../gedit/dialogs/gedit-open-location-dialog.glade.h:3
-msgid "Open Location"
-msgstr "Lleoliad Agor"
-
-#: ../gedit/dialogs/gedit-open-location-dialog.glade.h:1
-msgid "Ch_aracter coding:"
-msgstr "Amgodiad _nodau:"
-
-#: ../gedit/dialogs/gedit-open-location-dialog.glade.h:2
-msgid "Enter the _location (URI) of the file you would like to open:"
-msgstr "Gosodwch _lleoliad (URI) y ffeil hoffwch ei agor:"
-
-#: ../gedit/dialogs/gedit-page-setup-dialog.c:527
-#: ../gedit/dialogs/gedit-page-setup-dialog.glade.h:9
-msgid "Page Setup"
-msgstr "Cyfluniad Tudalen"
-
-#. ex:ts=4:et:
-#: ../gedit/dialogs/gedit-page-setup-dialog.glade.h:1
-#: ../gedit/dialogs/gedit-preferences-dialog.glade.h:1
-#: ../plugins/docinfo/docinfo.glade2.h:1
-#: ../plugins/externaltools/tools/tools.glade.h:1
-#: ../plugins/snippets/snippets/snippets.glade.h:1
-#: ../plugins/time/time.glade2.h:1
-msgid "    "
-msgstr "    "
-
-#: ../gedit/dialogs/gedit-page-setup-dialog.glade.h:2
-#: ../gedit/dialogs/gedit-preferences-dialog.glade.h:7
-msgid "<b>Line Numbers</b>"
-msgstr "<b>Rhifau Llinellau</b>"
-
-#: ../gedit/dialogs/gedit-page-setup-dialog.glade.h:3
-#: ../gedit/dialogs/gedit-preferences-dialog.glade.h:10
-msgid "<b>Text Wrapping</b>"
-msgstr "<b>Amlapio Testun</b>"
-
-#: ../gedit/dialogs/gedit-page-setup-dialog.glade.h:4
-#: ../gedit/dialogs/gedit-preferences-dialog.glade.h:14
-msgid "Do not _split words over two lines"
-msgstr "Peidio _hollti geiriau dros ddwy linell"
-
-#: ../gedit/dialogs/gedit-page-setup-dialog.glade.h:5
-#: ../gedit/dialogs/gedit-preferences-dialog.glade.h:17
-msgid "Enable text _wrapping"
-msgstr "Galluogi am_lapio testun"
-
-#: ../gedit/dialogs/gedit-page-setup-dialog.glade.h:6
-msgid "Fonts"
-msgstr "Ffontiau"
-
-#: ../gedit/dialogs/gedit-page-setup-dialog.glade.h:7
-msgid "General"
-msgstr "Cyffredinol"
-
-#: ../gedit/dialogs/gedit-page-setup-dialog.glade.h:8
-msgid "He_aders and footers:"
-msgstr "_Penawdau a Throedynnau:"
-
-#: ../gedit/dialogs/gedit-page-setup-dialog.glade.h:10
-msgid "Print _line numbers"
-msgstr "Argraffu _rhifau llinellau"
-
-#: ../gedit/dialogs/gedit-page-setup-dialog.glade.h:11
-#, fuzzy
-msgid "Print synta_x highlighting"
-msgstr "Argraffu amlygu _cystrawen"
-
-#: ../gedit/dialogs/gedit-page-setup-dialog.glade.h:12
-msgid "_Body:"
-msgstr "_Corff:"
-
-#: ../gedit/dialogs/gedit-page-setup-dialog.glade.h:13
-msgid "_Line numbers:"
-msgstr "_Rhifau llinellau:"
-
-#: ../gedit/dialogs/gedit-page-setup-dialog.glade.h:14
-msgid "_Number every"
-msgstr "_Rhif bob"
-
-#: ../gedit/dialogs/gedit-page-setup-dialog.glade.h:15
-msgid "_Print page headers"
-msgstr "_Argraffu penawdau tudalennau"
-
-#: ../gedit/dialogs/gedit-page-setup-dialog.glade.h:16
-msgid "_Restore Default Fonts"
-msgstr "_Adfer Ffontiau Rhagosodedig"
-
-#: ../gedit/dialogs/gedit-page-setup-dialog.glade.h:17
-msgid "lines"
-msgstr "llinellau"
-
-#: ../gedit/dialogs/gedit-preferences-dialog.c:570
+#: ../gedit/dialogs/gedit-preferences-dialog.c:571
 msgid "Push this button to select the font to be used by the editor"
-msgstr ""
-"Gwasgwch y botwm hwn er mwyn dewis y ffont i'w ddefnyddio gan y golygydd"
+msgstr "Gwasgwch y botwm hwn er mwyn dewis y ffont i'w ddefnyddio gan y golygydd"
 
-#: ../gedit/dialogs/gedit-preferences-dialog.c:580
+#: ../gedit/dialogs/gedit-preferences-dialog.c:581
 #, c-format
 msgid "_Use the system fixed width font (%s)"
 msgstr ""
 
-#: ../gedit/dialogs/gedit-preferences-dialog.c:783
+#: ../gedit/dialogs/gedit-preferences-dialog.c:784
 msgid "The selected color scheme cannot be installed."
 msgstr ""
 
-#: ../gedit/dialogs/gedit-preferences-dialog.c:808
+#: ../gedit/dialogs/gedit-preferences-dialog.c:809
 msgid "Add Scheme"
 msgstr ""
 
-#: ../gedit/dialogs/gedit-preferences-dialog.c:815
+#: ../gedit/dialogs/gedit-preferences-dialog.c:816
 msgid "A_dd Scheme"
 msgstr ""
 
-#: ../gedit/dialogs/gedit-preferences-dialog.c:823
+#: ../gedit/dialogs/gedit-preferences-dialog.c:824
 msgid "Color Scheme Files"
 msgstr ""
 
-#: ../gedit/dialogs/gedit-preferences-dialog.c:830
-#: ../gedit/gedit-file-chooser-dialog.c:52
+#: ../gedit/dialogs/gedit-preferences-dialog.c:831
+#: ../gedit/gedit-file-chooser-dialog.c:51
 msgid "All Files"
 msgstr "Pob Ffeil"
 
-#: ../gedit/dialogs/gedit-preferences-dialog.c:875
+#: ../gedit/dialogs/gedit-preferences-dialog.c:876
 #, fuzzy, c-format
 msgid "Could not remove color scheme \"%s\"."
 msgstr "Methu adfer y ffeil %s."
 
-#: ../gedit/dialogs/gedit-preferences-dialog.c:1077
+#: ../gedit/dialogs/gedit-preferences-dialog.c:1087
 msgid "gedit Preferences"
 msgstr "Hoffterau gedit"
 
-#: ../gedit/dialogs/gedit-preferences-dialog.glade.h:2
+#. ex:ts=4:et:
+#: ../gedit/dialogs/gedit-preferences-dialog.ui.h:1
+#: ../plugins/docinfo/docinfo.ui.h:1
+#: ../plugins/externaltools/tools/tools.ui.h:1
+#: ../plugins/snippets/snippets/snippets.ui.h:1
+#: ../plugins/time/gedit-time-dialog.ui.h:1
+#: ../plugins/time/gedit-time-setup-dialog.ui.h:1
+msgid "    "
+msgstr "    "
+
+#: ../gedit/dialogs/gedit-preferences-dialog.ui.h:2
 msgid "<b>Automatic Indentation</b>"
 msgstr "<b>Mewnoli Awtomatig</b>"
 
-#: ../gedit/dialogs/gedit-preferences-dialog.glade.h:3
+#: ../gedit/dialogs/gedit-preferences-dialog.ui.h:3
 msgid "<b>Bracket Matching</b>"
 msgstr "<b>Paru Bracedi</b>"
 
-#: ../gedit/dialogs/gedit-preferences-dialog.glade.h:4
+#: ../gedit/dialogs/gedit-preferences-dialog.ui.h:4
 msgid "<b>Current Line</b>"
 msgstr "<b>Llinell Bresennol</b>"
 
-#: ../gedit/dialogs/gedit-preferences-dialog.glade.h:5
+#: ../gedit/dialogs/gedit-preferences-dialog.ui.h:5
 msgid "<b>File Saving</b>"
 msgstr "<b>Cadw Ffeiliau</b>"
 
-#: ../gedit/dialogs/gedit-preferences-dialog.glade.h:6
+#: ../gedit/dialogs/gedit-preferences-dialog.ui.h:6
 msgid "<b>Font</b>"
 msgstr "<b>Ffont</b>"
 
-#: ../gedit/dialogs/gedit-preferences-dialog.glade.h:8
+#: ../gedit/dialogs/gedit-preferences-dialog.ui.h:7
+#: ../gedit/gedit-print-preferences.ui.h:2
+msgid "<b>Line Numbers</b>"
+msgstr "<b>Rhifau Llinellau</b>"
+
+#: ../gedit/dialogs/gedit-preferences-dialog.ui.h:8
 msgid "<b>Right Margin</b>"
 msgstr "<b>Ymyl De</b>"
 
-#: ../gedit/dialogs/gedit-preferences-dialog.glade.h:9
+#: ../gedit/dialogs/gedit-preferences-dialog.ui.h:9
 msgid "<b>Tab Stops</b>"
 msgstr "<b>Tabiau</b>"
 
-#: ../gedit/dialogs/gedit-preferences-dialog.glade.h:11
+#: ../gedit/dialogs/gedit-preferences-dialog.ui.h:10
+#: ../gedit/gedit-print-preferences.ui.h:5
+msgid "<b>Text Wrapping</b>"
+msgstr "<b>Amlapio Testun</b>"
+
+#: ../gedit/dialogs/gedit-preferences-dialog.ui.h:11
 #, fuzzy
 msgid "<span weight=\"bold\">Color Scheme</span>"
 msgstr "<span weight=\"bold\">Lliwiau</span>"
 
-#: ../gedit/dialogs/gedit-preferences-dialog.glade.h:12
+#: ../gedit/dialogs/gedit-preferences-dialog.ui.h:12
 msgid "Create a _backup copy of files before saving"
 msgstr "Creu copi wrth _gefn o ffeiliau cyn cadw"
 
-#: ../gedit/dialogs/gedit-preferences-dialog.glade.h:13
+#: ../gedit/dialogs/gedit-preferences-dialog.ui.h:13
 msgid "Display right _margin"
 msgstr "_Dangos ymyl de"
 
-#: ../gedit/dialogs/gedit-preferences-dialog.glade.h:15
+#: ../gedit/dialogs/gedit-preferences-dialog.ui.h:14
+#: ../gedit/gedit-print-preferences.ui.h:6
+msgid "Do not _split words over two lines"
+msgstr "Peidio _hollti geiriau dros ddwy linell"
+
+#: ../gedit/dialogs/gedit-preferences-dialog.ui.h:15
 msgid "Editor"
 msgstr "Golygydd"
 
-#: ../gedit/dialogs/gedit-preferences-dialog.glade.h:16
+#: ../gedit/dialogs/gedit-preferences-dialog.ui.h:16
 msgid "Editor _font: "
 msgstr "_Ffont golygydd: "
 
-#: ../gedit/dialogs/gedit-preferences-dialog.glade.h:18
+#: ../gedit/dialogs/gedit-preferences-dialog.ui.h:17
+#: ../gedit/gedit-print-preferences.ui.h:7
+msgid "Enable text _wrapping"
+msgstr "Galluogi am_lapio testun"
+
+#: ../gedit/dialogs/gedit-preferences-dialog.ui.h:18
 msgid "Font & Colors"
 msgstr "Ffont a Lliwiau"
 
-#: ../gedit/dialogs/gedit-preferences-dialog.glade.h:19
-#, fuzzy
+#: ../gedit/dialogs/gedit-preferences-dialog.ui.h:19
 msgid "Highlight current _line"
-msgstr "_Amlygu'r llinell bresennol"
+msgstr "Amlygu'r _llinell bresennol"
 
-#: ../gedit/dialogs/gedit-preferences-dialog.glade.h:20
+#: ../gedit/dialogs/gedit-preferences-dialog.ui.h:20
 msgid "Highlight matching _bracket"
 msgstr "Amlygu'r _gromfach sy'n cyd-fynd"
 
-#: ../gedit/dialogs/gedit-preferences-dialog.glade.h:21
+#: ../gedit/dialogs/gedit-preferences-dialog.ui.h:21
 msgid "Insert _spaces instead of tabs"
 msgstr "Mewnosod _bylchau yn lle tabiau"
 
-#: ../gedit/dialogs/gedit-preferences-dialog.glade.h:22
+#: ../gedit/dialogs/gedit-preferences-dialog.ui.h:22
 msgid "Pick the editor font"
 msgstr "Dewis ffont y golygydd"
 
-#: ../gedit/dialogs/gedit-preferences-dialog.glade.h:23
+#: ../gedit/dialogs/gedit-preferences-dialog.ui.h:23
 msgid "Plugins"
 msgstr "Ategion"
 
-#: ../gedit/dialogs/gedit-preferences-dialog.glade.h:24
+#: ../gedit/dialogs/gedit-preferences-dialog.ui.h:24
 msgid "Preferences"
 msgstr "Hoffterau"
 
-#: ../gedit/dialogs/gedit-preferences-dialog.glade.h:25
+#: ../gedit/dialogs/gedit-preferences-dialog.ui.h:25
 msgid "View"
 msgstr "Golwg"
 
-#: ../gedit/dialogs/gedit-preferences-dialog.glade.h:26
-#, fuzzy
+#: ../gedit/dialogs/gedit-preferences-dialog.ui.h:26
 msgid "_Add..."
-msgstr "_Ychwanegu"
+msgstr "_Ychwanegu..."
 
-#: ../gedit/dialogs/gedit-preferences-dialog.glade.h:27
+#: ../gedit/dialogs/gedit-preferences-dialog.ui.h:27
 msgid "_Autosave files every"
 msgstr "Cadw ffeiliau yn _awtomatig bob"
 
-#: ../gedit/dialogs/gedit-preferences-dialog.glade.h:28
+#: ../gedit/dialogs/gedit-preferences-dialog.ui.h:28
+#: ../gedit/gedit-view.c:2032
 msgid "_Display line numbers"
 msgstr "_Dangos rhifau llinellau"
 
-#: ../gedit/dialogs/gedit-preferences-dialog.glade.h:29
+#: ../gedit/dialogs/gedit-preferences-dialog.ui.h:29
 msgid "_Enable automatic indentation"
 msgstr "Galluogi mewnoliad _awtomatig"
 
-#: ../gedit/dialogs/gedit-preferences-dialog.glade.h:30
+#: ../gedit/dialogs/gedit-preferences-dialog.ui.h:30
 msgid "_Right margin at column:"
 msgstr "_Ymyl dde wrth golofn:"
 
-#: ../gedit/dialogs/gedit-preferences-dialog.glade.h:31
+#: ../gedit/dialogs/gedit-preferences-dialog.ui.h:31
 msgid "_Tab width:"
 msgstr "Lled _tab:"
 
-#: ../gedit/dialogs/gedit-preferences-dialog.glade.h:32
+#: ../gedit/dialogs/gedit-preferences-dialog.ui.h:32
 msgid "_minutes"
 msgstr "_munudau"
 
-#: ../gedit/dialogs/gedit-search-dialog.c:301
-#: ../gedit/dialogs/gedit-search-dialog.glade.h:2 ../gedit/gedit-window.c:1348
+#: ../gedit/dialogs/gedit-search-dialog.c:300
+#: ../gedit/dialogs/gedit-search-dialog.ui.h:2
+#: ../gedit/gedit-window.c:1458
 msgid "Replace"
 msgstr "Amnewid"
 
-#: ../gedit/dialogs/gedit-search-dialog.c:312 ../gedit/gedit-window.c:1346
+#: ../gedit/dialogs/gedit-search-dialog.c:311
+#: ../gedit/gedit-window.c:1456
 msgid "Find"
 msgstr "Chwilio"
 
-#: ../gedit/dialogs/gedit-search-dialog.c:404
+#: ../gedit/dialogs/gedit-search-dialog.c:411
 msgid "Replace _All"
 msgstr "Amnewid _Popeth"
 
-#: ../gedit/dialogs/gedit-search-dialog.c:405
-#: ../gedit/gedit-commands-file.c:677
+#: ../gedit/dialogs/gedit-search-dialog.c:412
+#: ../gedit/gedit-commands-file.c:582
 msgid "_Replace"
 msgstr "_Amnewid"
 
-#: ../gedit/dialogs/gedit-search-dialog.glade.h:1
+#: ../gedit/dialogs/gedit-search-dialog.ui.h:1
 msgid "Match _entire word only"
 msgstr "Cydweddu gair _cyfan yn unig"
 
-#: ../gedit/dialogs/gedit-search-dialog.glade.h:3
+#: ../gedit/dialogs/gedit-search-dialog.ui.h:3
 msgid "Replace All"
 msgstr "Amnewid y Cwbl"
 
-#: ../gedit/dialogs/gedit-search-dialog.glade.h:4
+#: ../gedit/dialogs/gedit-search-dialog.ui.h:4
 msgid "Replace _with: "
 msgstr "Amnewid _gyda: "
 
-#: ../gedit/dialogs/gedit-search-dialog.glade.h:5
+#: ../gedit/dialogs/gedit-search-dialog.ui.h:5
 msgid "Search _backwards"
 msgstr "Chwilio am _yn ôl"
 
-#: ../gedit/dialogs/gedit-search-dialog.glade.h:6
+#: ../gedit/dialogs/gedit-search-dialog.ui.h:6
 msgid "_Match case"
 msgstr "_Cydweddu prif lythrennedd"
 
-#: ../gedit/dialogs/gedit-search-dialog.glade.h:7
+#: ../gedit/dialogs/gedit-search-dialog.ui.h:7
 msgid "_Search for: "
 msgstr "_Chwilio am: "
 
-#: ../gedit/dialogs/gedit-search-dialog.glade.h:8
+#: ../gedit/dialogs/gedit-search-dialog.ui.h:8
 msgid "_Wrap around"
 msgstr "_Amlapio o gwmpas"
 
-#: ../gedit/gedit.c:73
-msgid ""
-"Set the character encoding to be used to open the files listed on the "
-"command line"
-msgstr ""
-"Gosod yr amgodiad nodau i'w ddefnyddio i agor ffeiliau a rhestrir ar y "
-"llinell orchymyn"
+#: ../gedit/gedit.c:118
+#, fuzzy
+msgid "Show the application's version"
+msgstr "Cyflunio'r rhaglen"
+
+#: ../gedit/gedit.c:121
+msgid "Set the character encoding to be used to open the files listed on the command line"
+msgstr "Gosod yr amgodiad nodau i'w ddefnyddio i agor ffeiliau a rhestrir ar y llinell orchymyn"
 
-#: ../gedit/gedit.c:73
+#: ../gedit/gedit.c:121
 msgid "ENCODING"
 msgstr ""
 
-#: ../gedit/gedit.c:76
+#: ../gedit/gedit.c:124
+msgid "Display list of possible values for the encoding option"
+msgstr ""
+
+#: ../gedit/gedit.c:127
 msgid "Create a new toplevel window in an existing instance of gedit"
 msgstr "Creu ffenest lefel dop newydd mewn achos o gedit sy'n bodoli"
 
-#: ../gedit/gedit.c:79
+#: ../gedit/gedit.c:130
 msgid "Create a new document in an existing instance of gedit"
 msgstr "Creu dogfen newydd mewn achos o gedit sy'n bodoli"
 
-#: ../gedit/gedit.c:82
+#: ../gedit/gedit.c:133
 msgid "[FILE...]"
 msgstr "[FFEIL...]"
 
-#: ../gedit/gedit.c:114
-#, c-format
-msgid "%s: malformed file name or URI.\n"
-msgstr "%s: enw ffeil neu URI wedi'i gam-ffurfio.\n"
-
-#: ../gedit/gedit.c:126
+#: ../gedit/gedit.c:171
 #, c-format
 msgid "%s: invalid encoding.\n"
 msgstr "%s: amgodiad annilys.\n"
 
 #. Setup command line options
-#: ../gedit/gedit.c:455
+#: ../gedit/gedit.c:562
 msgid "- Edit text files"
 msgstr "- Golygu ffeiliau testun"
 
-#: ../gedit/gedit-commands-file.c:224 ../gedit/gedit-commands-file.c:270
+#: ../gedit/gedit.c:598
+#, c-format
+msgid ""
+"%s\n"
+"Run '%s --help' to see a full list of available command line options.\n"
+msgstr ""
+
+#: ../gedit/gedit-commands-file.c:255
 #, c-format
 msgid "Loading file '%s'â?¦"
 msgstr "Llwytho'r ffeil '%s'..."
 
-#: ../gedit/gedit-commands-file.c:279
+#: ../gedit/gedit-commands-file.c:264
 #, c-format
 msgid "Loading %d fileâ?¦"
 msgid_plural "Loading %d filesâ?¦"
@@ -1103,161 +828,102 @@ msgstr[2] "Llwytho %d ffeil..."
 msgstr[3] "Llwytho %d ffeil..."
 
 #. Translators: "Open Files" is the title of the file chooser window
-#: ../gedit/gedit-commands-file.c:423
-#, fuzzy
+#: ../gedit/gedit-commands-file.c:458
 msgid "Open Files"
-msgstr "Agor Ffeiliau..."
+msgstr "Agor Ffeiliau"
 
-#: ../gedit/gedit-commands-file.c:529
-msgid "The entered location is not valid."
-msgstr "Nid yw'r lleoliad a roddwyd yn ddilys."
-
-#: ../gedit/gedit-commands-file.c:532
-#: ../gedit/gedit-io-error-message-area.c:187
-#: ../gedit/gedit-io-error-message-area.c:226
-#: ../gedit/gedit-io-error-message-area.c:242
-#, fuzzy
-msgid "Please check that you typed the location correctly and try again."
-msgstr "Gwiriwch eich bod chi wedi teipio'r lleoliad yn gywir, cyn ceisio eto."
-
-#: ../gedit/gedit-commands-file.c:658
+#: ../gedit/gedit-commands-file.c:569
 #, c-format
 msgid "The file \"%s\" is read-only."
 msgstr "Ffeil ddarllen-yn-unig yw \"%s\"."
 
-#: ../gedit/gedit-commands-file.c:669
+#: ../gedit/gedit-commands-file.c:574
 msgid "Do you want to try to replace it with the one you are saving?"
 msgstr "Ydych chi am geisio ei hamnewid gyda'r un rydych yn ei chadw?"
 
-#: ../gedit/gedit-commands-file.c:735 ../gedit/gedit-commands-file.c:938
+#: ../gedit/gedit-commands-file.c:641
+#: ../gedit/gedit-commands-file.c:858
 #, c-format
 msgid "Saving file '%s'â?¦"
 msgstr "Cadw'r ffeil '%s'..."
 
-#: ../gedit/gedit-commands-file.c:836
+#: ../gedit/gedit-commands-file.c:748
 msgid "Save Asâ?¦"
 msgstr "Cadw Fel..."
 
-#: ../gedit/gedit-commands-file.c:1117
+#: ../gedit/gedit-commands-file.c:1072
 #, c-format
 msgid "Reverting the document '%s'â?¦"
 msgstr "Yn adfer y ddogfen '%s'..."
 
-#: ../gedit/gedit-commands-file.c:1162
+#: ../gedit/gedit-commands-file.c:1117
 #, c-format
 msgid "Revert unsaved changes to document '%s'?"
 msgstr "Adfer y newidiadau sydd heb eu cadw i ddogfen '%s'?"
 
-#: ../gedit/gedit-commands-file.c:1171
+#: ../gedit/gedit-commands-file.c:1126
 #, c-format
-msgid ""
-"Changes made to the document in the last %ld second will be permanently lost."
-msgid_plural ""
-"Changes made to the document in the last %ld seconds will be permanently "
-"lost."
-msgstr[0] ""
-"Fe gollir am byth y newidiadau wnaed i'r ddogfen yn ystod y %ld eiliad olaf."
-msgstr[1] ""
-"Fe gollir am byth y newidiadau wnaed i'r ddogfen yn ystod yr %ld eiliad olaf."
-msgstr[2] ""
-"Fe gollir am byth y newidiadau wnaed i'r ddogfen yn ystod y %ld eiliad olaf."
-msgstr[3] ""
-"Fe gollir am byth y newidiadau wnaed i'r ddogfen yn ystod y %ld eiliad olaf."
-
-#: ../gedit/gedit-commands-file.c:1180
-msgid ""
-"Changes made to the document in the last minute will be permanently lost."
-msgstr ""
-"Fe gollir am byth y newidiadau wnaed i'r ddogfen yn ystod y funud olaf."
-
-#: ../gedit/gedit-commands-file.c:1186
+msgid "Changes made to the document in the last %ld second will be permanently lost."
+msgid_plural "Changes made to the document in the last %ld seconds will be permanently lost."
+msgstr[0] "Fe gollir am byth y newidiadau wnaed i'r ddogfen yn ystod y %ld eiliad olaf."
+msgstr[1] "Fe gollir am byth y newidiadau wnaed i'r ddogfen yn ystod yr %ld eiliad olaf."
+msgstr[2] "Fe gollir am byth y newidiadau wnaed i'r ddogfen yn ystod y %ld eiliad olaf."
+msgstr[3] "Fe gollir am byth y newidiadau wnaed i'r ddogfen yn ystod y %ld eiliad olaf."
+
+#: ../gedit/gedit-commands-file.c:1135
+msgid "Changes made to the document in the last minute will be permanently lost."
+msgstr "Fe gollir am byth y newidiadau wnaed i'r ddogfen yn ystod y funud olaf."
+
+#: ../gedit/gedit-commands-file.c:1141
 #, c-format
-msgid ""
-"Changes made to the document in the last minute and %ld second will be "
-"permanently lost."
-msgid_plural ""
-"Changes made to the document in the last minute and %ld seconds will be "
-"permanently lost."
-msgstr[0] ""
-"Fe gollir am byth y newidiadau wnaed i'r ddogfen yn ystod y funud a %ld "
-"eiliad olaf."
-msgstr[1] ""
-"Fe gollir am byth y newidiadau wnaed i'r ddogfen yn ystod y funud ac %ld "
-"eiliad olaf."
-msgstr[2] ""
-"Fe gollir am byth y newidiadau wnaed i'r ddogfen yn ystod y funud a %ld "
-"eiliad olaf."
-msgstr[3] ""
-"Fe gollir am byth y newidiadau wnaed i'r ddogfen yn ystod y funud ac %ld "
-"eiliad olaf."
-
-#: ../gedit/gedit-commands-file.c:1196
+msgid "Changes made to the document in the last minute and %ld second will be permanently lost."
+msgid_plural "Changes made to the document in the last minute and %ld seconds will be permanently lost."
+msgstr[0] "Fe gollir am byth y newidiadau wnaed i'r ddogfen yn ystod y funud a %ld eiliad olaf."
+msgstr[1] "Fe gollir am byth y newidiadau wnaed i'r ddogfen yn ystod y funud ac %ld eiliad olaf."
+msgstr[2] "Fe gollir am byth y newidiadau wnaed i'r ddogfen yn ystod y funud a %ld eiliad olaf."
+msgstr[3] "Fe gollir am byth y newidiadau wnaed i'r ddogfen yn ystod y funud ac %ld eiliad olaf."
+
+#: ../gedit/gedit-commands-file.c:1151
 #, c-format
-msgid ""
-"Changes made to the document in the last %ld minute will be permanently lost."
-msgid_plural ""
-"Changes made to the document in the last %ld minutes will be permanently "
-"lost."
-msgstr[0] ""
-"Os na wnewch chi gadw, fe gollir am byth newidiadau'r %ld munud olaf."
-msgstr[1] ""
-"Os na wnewch chi gadw, fe gollir am byth newidiadau'r %ld funud olaf."
-msgstr[2] ""
-"Os na wnewch chi gadw, fe gollir am byth newidiadau'r %ld funud olaf."
-msgstr[3] ""
-"Os na wnewch chi gadw, fe gollir am byth newidiadau'r %ld munud olaf."
-
-#: ../gedit/gedit-commands-file.c:1211
+msgid "Changes made to the document in the last %ld minute will be permanently lost."
+msgid_plural "Changes made to the document in the last %ld minutes will be permanently lost."
+msgstr[0] "Os na wnewch chi gadw, fe gollir am byth newidiadau'r %ld munud olaf."
+msgstr[1] "Os na wnewch chi gadw, fe gollir am byth newidiadau'r %ld funud olaf."
+msgstr[2] "Os na wnewch chi gadw, fe gollir am byth newidiadau'r %ld funud olaf."
+msgstr[3] "Os na wnewch chi gadw, fe gollir am byth newidiadau'r %ld munud olaf."
+
+#: ../gedit/gedit-commands-file.c:1166
 #, fuzzy
 msgid "Changes made to the document in the last hour will be permanently lost."
-msgstr ""
-"Fe gollir am byth y newidiadau wnaed i'r ddogfen yn ystod y %d awr olaf."
+msgstr "Fe gollir am byth y newidiadau wnaed i'r ddogfen yn ystod y %d awr olaf."
 
-#: ../gedit/gedit-commands-file.c:1217
+#: ../gedit/gedit-commands-file.c:1172
 #, c-format
-msgid ""
-"Changes made to the document in the last hour and %d minute will be "
-"permanently lost."
-msgid_plural ""
-"Changes made to the document in the last hour and %d minutes will be "
-"permanently lost."
-msgstr[0] ""
-"Fe gollir am byth y newidiadau wnaed i'r ddogfen yn ystod yr awr a %d munud "
-"olaf."
-msgstr[1] ""
-"Fe gollir am byth y newidiadau wnaed i'r ddogfen yn ystod yr awr ac %d funud "
-"olaf."
-msgstr[2] ""
-"Fe gollir am byth y newidiadau wnaed i'r ddogfen yn ystod yr awr a %d funud "
-"olaf."
-msgstr[3] ""
-"Fe gollir am byth y newidiadau wnaed i'r ddogfen yn ystod yr awr ac %d munud "
-"olaf."
-
-#: ../gedit/gedit-commands-file.c:1232
+msgid "Changes made to the document in the last hour and %d minute will be permanently lost."
+msgid_plural "Changes made to the document in the last hour and %d minutes will be permanently lost."
+msgstr[0] "Fe gollir am byth y newidiadau wnaed i'r ddogfen yn ystod yr awr a %d munud olaf."
+msgstr[1] "Fe gollir am byth y newidiadau wnaed i'r ddogfen yn ystod yr awr ac %d funud olaf."
+msgstr[2] "Fe gollir am byth y newidiadau wnaed i'r ddogfen yn ystod yr awr a %d funud olaf."
+msgstr[3] "Fe gollir am byth y newidiadau wnaed i'r ddogfen yn ystod yr awr ac %d munud olaf."
+
+#: ../gedit/gedit-commands-file.c:1187
 #, fuzzy, c-format
-msgid ""
-"Changes made to the document in the last %d hour will be permanently lost."
-msgid_plural ""
-"Changes made to the document in the last %d hours will be permanently lost."
-msgstr[0] ""
-"Fe gollir am byth y newidiadau wnaed i'r ddogfen yn ystod y %d awr olaf."
-msgstr[1] ""
-"Fe gollir am byth y newidiadau wnaed i'r ddogfen yn ystod yr %d awr olaf."
-msgstr[2] ""
-"Fe gollir am byth y newidiadau wnaed i'r ddogfen yn ystod y %d awr olaf."
-msgstr[3] ""
-"Fe gollir am byth y newidiadau wnaed i'r ddogfen yn ystod yr %d awr olaf."
-
-#: ../gedit/gedit-commands-file.c:1258
+msgid "Changes made to the document in the last %d hour will be permanently lost."
+msgid_plural "Changes made to the document in the last %d hours will be permanently lost."
+msgstr[0] "Fe gollir am byth y newidiadau wnaed i'r ddogfen yn ystod y %d awr olaf."
+msgstr[1] "Fe gollir am byth y newidiadau wnaed i'r ddogfen yn ystod yr %d awr olaf."
+msgstr[2] "Fe gollir am byth y newidiadau wnaed i'r ddogfen yn ystod y %d awr olaf."
+msgstr[3] "Fe gollir am byth y newidiadau wnaed i'r ddogfen yn ystod yr %d awr olaf."
+
+#: ../gedit/gedit-commands-file.c:1213
 msgid "_Revert"
 msgstr "_Adfer"
 
-#: ../gedit/gedit-commands-help.c:80
+#: ../gedit/gedit-commands-help.c:81
 msgid "gedit is a small and lightweight text editor for the GNOME Desktop"
 msgstr "Mae gedit yn olygydd testun bach ac ysgafn ar gyfer Penbwrdd GNOME"
 
-#: ../gedit/gedit-commands-help.c:96
+#: ../gedit/gedit-commands-help.c:106
 msgid "translator-credits"
 msgstr ""
 "Chris Jackson <chris www linux org uk>\n"
@@ -1266,7 +932,7 @@ msgstr ""
 "Dafydd Harries <daf muse 19inch net>\n"
 "Rhys Jones <rhys sucs org>"
 
-#: ../gedit/gedit-commands-search.c:165
+#: ../gedit/gedit-commands-search.c:114
 #, c-format
 msgid "Found and replaced %d occurrence"
 msgid_plural "Found and replaced %d occurrences"
@@ -1275,41 +941,55 @@ msgstr[1] "Canfuwyd ac adferwyd %d achlysur"
 msgstr[2] "Canfuwyd ac adferwyd %d achlysur"
 msgstr[3] "Canfuwyd ac adferwyd %d achlysur"
 
-#: ../gedit/gedit-commands-search.c:175
+#: ../gedit/gedit-commands-search.c:124
 msgid "Found and replaced one occurrence"
 msgstr "Canfuwyd ac amnewidiwyd un achlysur"
 
-#: ../gedit/gedit-commands-search.c:188
-msgid "Phrase not found"
+#. Translators: %s is replaced by the text
+#. entered by the user in the search box
+#: ../gedit/gedit-commands-search.c:145
+#, fuzzy, c-format
+msgid "\"%s\" not found"
 msgstr "Cymal heb ei ganfod"
 
-#: ../gedit/gedit-document.c:814 ../gedit/gedit-document.c:908
+#: ../gedit/gedit-document.c:889
+#: ../gedit/gedit-document.c:902
 #, c-format
 msgid "Unsaved Document %d"
 msgstr "Dogfen Heb ei Chadw %d"
 
-#: ../gedit/gedit-documents-panel.c:89 ../gedit/gedit-documents-panel.c:103
-#: ../gedit/gedit-window.c:1914 ../gedit/gedit-window.c:1919
+#: ../gedit/gedit-documents-panel.c:89
+#: ../gedit/gedit-documents-panel.c:103
+#: ../gedit/gedit-window.c:2175
+#: ../gedit/gedit-window.c:2180
 msgid "Read Only"
 msgstr "Darllen yn Unig"
 
-#: ../gedit/gedit-documents-panel.c:759
+#: ../gedit/gedit-documents-panel.c:774
+#: ../gedit/gedit-window.c:3535
 msgid "Documents"
 msgstr "Dogfennau"
 
-#: ../gedit/gedit-encodings.c:140 ../gedit/gedit-encodings.c:184
-#: ../gedit/gedit-encodings.c:186 ../gedit/gedit-encodings.c:188
-#: ../gedit/gedit-encodings.c:190 ../gedit/gedit-encodings.c:192
-#: ../gedit/gedit-encodings.c:194 ../gedit/gedit-encodings.c:196
+#: ../gedit/gedit-encodings.c:140
+#: ../gedit/gedit-encodings.c:184
+#: ../gedit/gedit-encodings.c:186
+#: ../gedit/gedit-encodings.c:188
+#: ../gedit/gedit-encodings.c:190
+#: ../gedit/gedit-encodings.c:192
+#: ../gedit/gedit-encodings.c:194
+#: ../gedit/gedit-encodings.c:196
 msgid "Unicode"
 msgstr "Unicode"
 
-#: ../gedit/gedit-encodings.c:153 ../gedit/gedit-encodings.c:179
-#: ../gedit/gedit-encodings.c:231 ../gedit/gedit-encodings.c:274
+#: ../gedit/gedit-encodings.c:153
+#: ../gedit/gedit-encodings.c:179
+#: ../gedit/gedit-encodings.c:231
+#: ../gedit/gedit-encodings.c:274
 msgid "Western"
 msgstr "Gorllewinol"
 
-#: ../gedit/gedit-encodings.c:155 ../gedit/gedit-encodings.c:233
+#: ../gedit/gedit-encodings.c:155
+#: ../gedit/gedit-encodings.c:233
 #: ../gedit/gedit-encodings.c:270
 msgid "Central European"
 msgstr "Canol Ewropeaidd"
@@ -1318,23 +998,29 @@ msgstr "Canol Ewropeaidd"
 msgid "South European"
 msgstr "De Ewropeaidd"
 
-#: ../gedit/gedit-encodings.c:159 ../gedit/gedit-encodings.c:175
+#: ../gedit/gedit-encodings.c:159
+#: ../gedit/gedit-encodings.c:175
 #: ../gedit/gedit-encodings.c:284
 msgid "Baltic"
 msgstr "Baltig"
 
-#: ../gedit/gedit-encodings.c:161 ../gedit/gedit-encodings.c:235
-#: ../gedit/gedit-encodings.c:248 ../gedit/gedit-encodings.c:252
-#: ../gedit/gedit-encodings.c:254 ../gedit/gedit-encodings.c:272
+#: ../gedit/gedit-encodings.c:161
+#: ../gedit/gedit-encodings.c:235
+#: ../gedit/gedit-encodings.c:248
+#: ../gedit/gedit-encodings.c:252
+#: ../gedit/gedit-encodings.c:254
+#: ../gedit/gedit-encodings.c:272
 msgid "Cyrillic"
 msgstr "Cyrilig"
 
-#: ../gedit/gedit-encodings.c:163 ../gedit/gedit-encodings.c:241
+#: ../gedit/gedit-encodings.c:163
+#: ../gedit/gedit-encodings.c:241
 #: ../gedit/gedit-encodings.c:282
 msgid "Arabic"
 msgstr "Arabeg"
 
-#: ../gedit/gedit-encodings.c:165 ../gedit/gedit-encodings.c:276
+#: ../gedit/gedit-encodings.c:165
+#: ../gedit/gedit-encodings.c:276
 msgid "Greek"
 msgstr "Groeg"
 
@@ -1342,12 +1028,14 @@ msgstr "Groeg"
 msgid "Hebrew Visual"
 msgstr "Hebraeg Gweledol"
 
-#: ../gedit/gedit-encodings.c:169 ../gedit/gedit-encodings.c:239
+#: ../gedit/gedit-encodings.c:169
+#: ../gedit/gedit-encodings.c:239
 #: ../gedit/gedit-encodings.c:280
 msgid "Hebrew"
 msgstr "Hebraeg"
 
-#: ../gedit/gedit-encodings.c:171 ../gedit/gedit-encodings.c:237
+#: ../gedit/gedit-encodings.c:171
+#: ../gedit/gedit-encodings.c:237
 #: ../gedit/gedit-encodings.c:278
 msgid "Turkish"
 msgstr "Tyrceg"
@@ -1368,7 +1056,8 @@ msgstr "Riwmaneg"
 msgid "Armenian"
 msgstr "Armaneg"
 
-#: ../gedit/gedit-encodings.c:201 ../gedit/gedit-encodings.c:203
+#: ../gedit/gedit-encodings.c:201
+#: ../gedit/gedit-encodings.c:203
 #: ../gedit/gedit-encodings.c:217
 msgid "Chinese Traditional"
 msgstr "Tsieinëeg Draddodiadol"
@@ -1377,19 +1066,25 @@ msgstr "Tsieinëeg Draddodiadol"
 msgid "Cyrillic/Russian"
 msgstr "Cyrilig/Rwsieg"
 
-#: ../gedit/gedit-encodings.c:208 ../gedit/gedit-encodings.c:210
-#: ../gedit/gedit-encodings.c:212 ../gedit/gedit-encodings.c:244
+#: ../gedit/gedit-encodings.c:208
+#: ../gedit/gedit-encodings.c:210
+#: ../gedit/gedit-encodings.c:212
+#: ../gedit/gedit-encodings.c:244
 #: ../gedit/gedit-encodings.c:259
 msgid "Japanese"
 msgstr "Japanëeg"
 
-#: ../gedit/gedit-encodings.c:215 ../gedit/gedit-encodings.c:246
-#: ../gedit/gedit-encodings.c:250 ../gedit/gedit-encodings.c:265
+#: ../gedit/gedit-encodings.c:215
+#: ../gedit/gedit-encodings.c:246
+#: ../gedit/gedit-encodings.c:250
+#: ../gedit/gedit-encodings.c:265
 msgid "Korean"
 msgstr "Corëeg"
 
-#: ../gedit/gedit-encodings.c:220 ../gedit/gedit-encodings.c:222
-#: ../gedit/gedit-encodings.c:224 ../gedit/gedit-encodings.c:228
+#: ../gedit/gedit-encodings.c:220
+#: ../gedit/gedit-encodings.c:222
+#: ../gedit/gedit-encodings.c:224
+#: ../gedit/gedit-encodings.c:228
 msgid "Chinese Simplified"
 msgstr "Tsieinëeg Syml"
 
@@ -1401,7 +1096,8 @@ msgstr "Georgeg"
 msgid "Cyrillic/Ukrainian"
 msgstr "Cyrilig/Wcreineg"
 
-#: ../gedit/gedit-encodings.c:261 ../gedit/gedit-encodings.c:267
+#: ../gedit/gedit-encodings.c:261
+#: ../gedit/gedit-encodings.c:267
 #: ../gedit/gedit-encodings.c:286
 msgid "Vietnamese"
 msgstr "Fietnameg"
@@ -1414,409 +1110,274 @@ msgstr "Tai"
 msgid "Unknown"
 msgstr "Anhysbys"
 
-#: ../gedit/gedit-encodings-option-menu.c:219
+#: ../gedit/gedit-encodings-option-menu.c:220
 msgid "Auto Detected"
 msgstr "Canfuwyd yn Awtomatig"
 
-#: ../gedit/gedit-encodings-option-menu.c:239
-#: ../gedit/gedit-encodings-option-menu.c:261
+#: ../gedit/gedit-encodings-option-menu.c:240
+#: ../gedit/gedit-encodings-option-menu.c:262
 #, c-format
 msgid "Current Locale (%s)"
 msgstr "Locale Cyfredol (%s)"
 
-#: ../gedit/gedit-encodings-option-menu.c:322
+#: ../gedit/gedit-encodings-option-menu.c:323
 msgid "Add or _Remove..."
 msgstr "Ychwannegu new _Dynnu..."
 
-#: ../gedit/gedit-file-chooser-dialog.c:53
+#: ../gedit/gedit-file-chooser-dialog.c:52
 msgid "All Text Files"
 msgstr "Pob Ffeil Testun"
 
-#: ../gedit/gedit-file-chooser-dialog.c:79
+#: ../gedit/gedit-file-chooser-dialog.c:78
 msgid "C_haracter Coding:"
 msgstr "_Amgodiad Nodau:"
 
-#: ../gedit/gedit-help.c:66
+#: ../gedit/gedit-help.c:89
 msgid "There was an error displaying help."
 msgstr "Roedd gwall wrth ddangos cymorth."
 
-#: ../gedit/gedit-io-error-message-area.c:185
+#: ../gedit/gedit-io-error-message-area.c:213
 #, c-format
 msgid "Could not find the file %s."
 msgstr "Methu canfod y ffeil %s."
 
-#: ../gedit/gedit-io-error-message-area.c:192
-#: ../gedit/gedit-io-error-message-area.c:441
-msgid "The file contains corrupted data."
-msgstr "Mae'r ffeil yn cynnwys data llygredig."
+#: ../gedit/gedit-io-error-message-area.c:215
+#: ../gedit/gedit-io-error-message-area.c:254
+#: ../gedit/gedit-io-error-message-area.c:261
+#, fuzzy
+msgid "Please check that you typed the location correctly and try again."
+msgstr "Gwiriwch eich bod chi wedi teipio'r lleoliad yn gywir, cyn ceisio eto."
 
 #. Translators: %s is a URI scheme (like for example http:, ftp:, etc.)
-#: ../gedit/gedit-io-error-message-area.c:203
-#: ../gedit/gedit-io-error-message-area.c:452
+#: ../gedit/gedit-io-error-message-area.c:230
 #, c-format
 msgid "gedit cannot handle %s locations."
 msgstr "Ni all gedit ddelio â lleoliadau %s."
 
-#: ../gedit/gedit-io-error-message-area.c:209
-#: ../gedit/gedit-io-error-message-area.c:458
+#: ../gedit/gedit-io-error-message-area.c:236
 msgid "gedit cannot handle this location."
 msgstr "Ni all gedit ddelio â'r lleoliad hwn."
 
-#: ../gedit/gedit-io-error-message-area.c:216
-#: ../gedit/gedit-io-error-message-area.c:465
-msgid "The file contains data in an invalid format."
-msgstr "Mae'r ffeil yn cynnwys data mewn ffurf annilys."
-
-#: ../gedit/gedit-io-error-message-area.c:220
-#: ../gedit/gedit-io-error-message-area.c:469
-msgid "The file is too big."
-msgstr "Mae'r ffeil yn rhy fawr."
-
-#: ../gedit/gedit-io-error-message-area.c:224
-#, c-format
-msgid "%s is not a valid location."
-msgstr "Nid yw %s yn lleoliad dilys."
-
-#: ../gedit/gedit-io-error-message-area.c:231
-#: ../gedit/gedit-io-error-message-area.c:473
-msgid "You do not have the permissions necessary to open the file."
-msgstr "Does gennych chi ddim y caniatâd angenrheidiol i agor y ffeil."
-
-#: ../gedit/gedit-io-error-message-area.c:235
-#: ../gedit/gedit-io-error-message-area.c:477
-#: ../gedit/gedit-io-error-message-area.c:1230
+#: ../gedit/gedit-io-error-message-area.c:244
 #, fuzzy
-msgid ""
-"There are too many open files. Please close some applications and try again."
+msgid "The location of the file cannot be mounted."
+msgstr "Methu symud y ffeil \"%s\" i'r sbwriel."
+
+#: ../gedit/gedit-io-error-message-area.c:248
+msgid "The location of the file cannot be accessed because it is not mounted."
 msgstr ""
-"Mae gormod o ffeiliau ar agor. Caewch rai rhaglenni sydd ar agor, cyn ceisio "
-"eto."
 
-#: ../gedit/gedit-io-error-message-area.c:240
-#: ../gedit/gedit-io-error-message-area.c:482
+#: ../gedit/gedit-io-error-message-area.c:252
 #, c-format
 msgid "%s is a directory."
 msgstr "Mae %s yn gyfeiriadur."
 
-#: ../gedit/gedit-io-error-message-area.c:247
-#: ../gedit/gedit-io-error-message-area.c:487
-#, fuzzy
-msgid ""
-"Not enough available memory to open the file. Please close some running "
-"applications and try again."
-msgstr ""
-"Dim digon o gof ar gael er mwyn agor y ffeil. Caewch ryw raglenni sy'n "
-"rhedeg, cyn ceisio eto."
-
-#: ../gedit/gedit-io-error-message-area.c:275
-#: ../gedit/gedit-io-error-message-area.c:515
-#: ../gedit/gedit-io-error-message-area.c:1269
-#, fuzzy, c-format
-msgid ""
-"Host %s could not be found. Please check that your proxy settings are "
-"correct and try again."
-msgstr ""
-"Ni ddarganfuwyd y gwesteiwr %s. Gwiriwch fod eich gosodiadau dirprwy yn "
-"gywir cyn ceisio eto."
+#: ../gedit/gedit-io-error-message-area.c:259
+#, c-format
+msgid "%s is not a valid location."
+msgstr "Nid yw %s yn lleoliad dilys."
 
 #: ../gedit/gedit-io-error-message-area.c:286
-#: ../gedit/gedit-io-error-message-area.c:297
-#: ../gedit/gedit-io-error-message-area.c:305
-#: ../gedit/gedit-io-error-message-area.c:526
-#: ../gedit/gedit-io-error-message-area.c:537
-#: ../gedit/gedit-io-error-message-area.c:1280
-#: ../gedit/gedit-io-error-message-area.c:1291
-#: ../gedit/gedit-io-error-message-area.c:1299
-#, fuzzy
-msgid ""
-"Host name was invalid. Please check that you typed the location correctly "
-"and try again."
-msgstr ""
-"Roedd enw'r gwesteiwr yn annilys. Gwiriwch eich bod chi wedi rhoi'r lleoliad "
-"yn gywir cyn ceisio eto."
-
-#: ../gedit/gedit-io-error-message-area.c:311
-#: ../gedit/gedit-io-error-message-area.c:545
-#: ../gedit/gedit-io-error-message-area.c:1305
-#, fuzzy
-msgid ""
-"Host name was empty. Please check that your proxy settings are correct and "
-"try again."
-msgstr ""
-"Roedd enw'r gwesteiwr yn wag. Gwiriwch fod eich gosodiadau dirprwy yn gywir "
-"cyn ceisio eto."
+#, fuzzy, c-format
+msgid "Host %s could not be found. Please check that your proxy settings are correct and try again."
+msgstr "Ni ddarganfuwyd y gwesteiwr %s. Gwiriwch fod eich gosodiadau dirprwy yn gywir cyn ceisio eto."
 
-#: ../gedit/gedit-io-error-message-area.c:317
-#: ../gedit/gedit-io-error-message-area.c:1311
-#, fuzzy
-msgid ""
-"Attempt to log in failed. Please check that you typed the location correctly "
-"and try again."
-msgstr ""
-"Methwyd mewngofnodi. Gwiriwch eich bod chi wedi rhoi'r lleoliad yn gywir cyn "
-"ceisio eto."
+#: ../gedit/gedit-io-error-message-area.c:299
+#, fuzzy, c-format
+msgid "Host name was invalid. Please check that you typed the location correctly and try again."
+msgstr "Roedd enw'r gwesteiwr yn annilys. Gwiriwch eich bod chi wedi rhoi'r lleoliad yn gywir cyn ceisio eto."
 
-#: ../gedit/gedit-io-error-message-area.c:323
-msgid "The file you are trying to open is not a regular file."
-msgstr "Nid ffeil gyffredin mo'r ffeil yr ydych yn ceisio ei hagor."
+#: ../gedit/gedit-io-error-message-area.c:307
+#, c-format
+msgid "%s is not a regular file."
+msgstr "Nid yw %s yn ffeil gyffredin"
 
-#: ../gedit/gedit-io-error-message-area.c:327
-#: ../gedit/gedit-io-error-message-area.c:560
-#: ../gedit/gedit-io-error-message-area.c:1339
+#: ../gedit/gedit-io-error-message-area.c:312
 msgid "Connection timed out. Please try again."
 msgstr ""
 
+#: ../gedit/gedit-io-error-message-area.c:335
+msgid "The file is too big."
+msgstr "Mae'r ffeil yn rhy fawr."
+
 #: ../gedit/gedit-io-error-message-area.c:376
-#: ../gedit/gedit-io-error-message-area.c:610
-#: ../gedit/gedit-io-error-message-area.c:1380
 #, c-format
 msgid "Unexpected error: %s"
 msgstr "Gwall annisgwyl: %s"
 
-#: ../gedit/gedit-io-error-message-area.c:382
-#: ../gedit/gedit-io-error-message-area.c:776
+#: ../gedit/gedit-io-error-message-area.c:412
+msgid "The number of followed links is limited and the actual file could not be found within this limit."
+msgstr ""
+
+#: ../gedit/gedit-io-error-message-area.c:416
+msgid "You do not have the permissions necessary to open the file."
+msgstr "Does gennych chi ddim y caniatâd angenrheidiol i agor y ffeil."
+
+#: ../gedit/gedit-io-error-message-area.c:424
+#: ../gedit/gedit-io-error-message-area.c:666
 #, c-format
 msgid "Could not open the file %s."
 msgstr "Methu agor y ffeil %s."
 
-#: ../gedit/gedit-io-error-message-area.c:391
-#: ../gedit/gedit-io-error-message-area.c:683
+#: ../gedit/gedit-io-error-message-area.c:434
+#: ../gedit/gedit-io-error-message-area.c:439
+#: ../gedit/gedit-io-error-message-area.c:560
+#: ../gedit/gedit-io-error-message-area.c:569
 msgid "_Retry"
 msgstr "_Ail-geisio"
 
-#: ../gedit/gedit-io-error-message-area.c:436
+#: ../gedit/gedit-io-error-message-area.c:483
 #, fuzzy
-msgid "gedit cannot find it. Perhaps it has recently been deleted."
+msgid "gedit cannot find the file. Perhaps it has recently been deleted."
 msgstr "ni all gedit ei ganfod. Efallai cafodd ei ddileu yn ddiweddar."
 
-#: ../gedit/gedit-io-error-message-area.c:551
-msgid "Attempt to log in failed."
-msgstr "Methodd yr ymgais mewngofnodi."
-
-#: ../gedit/gedit-io-error-message-area.c:555
-#, c-format
-msgid "%s is not a regular file."
-msgstr "Nid yw %s yn ffeil gyffredin"
-
-#: ../gedit/gedit-io-error-message-area.c:616
+#: ../gedit/gedit-io-error-message-area.c:492
 #, c-format
 msgid "Could not revert the file %s."
 msgstr "Methu adfer y ffeil %s."
 
-#: ../gedit/gedit-io-error-message-area.c:640
+#: ../gedit/gedit-io-error-message-area.c:516
 msgid "Ch_aracter Coding:"
 msgstr "Amgodiad _Nodau:"
 
-#: ../gedit/gedit-io-error-message-area.c:778
+#: ../gedit/gedit-io-error-message-area.c:668
 msgid "gedit has not been able to detect the character coding."
 msgstr "Mae gedit wedi methu canfod yr amgodiad nodau."
 
-#: ../gedit/gedit-io-error-message-area.c:780
-#: ../gedit/gedit-io-error-message-area.c:789
+#: ../gedit/gedit-io-error-message-area.c:670
+#: ../gedit/gedit-io-error-message-area.c:679
 msgid "Please check that you are not trying to open a binary file."
 msgstr "Gwnewch yn siŵr nad ydych chi'n ceisio agor ffeil ddeuaidd."
 
-#: ../gedit/gedit-io-error-message-area.c:781
+#: ../gedit/gedit-io-error-message-area.c:671
 msgid "Select a character coding from the menu and try again."
 msgstr "Dewiswch amgodiad nodau o'r ddewislen, a cheisiwch eto."
 
-#: ../gedit/gedit-io-error-message-area.c:786
+#: ../gedit/gedit-io-error-message-area.c:676
 #, c-format
 msgid "Could not open the file %s using the %s character coding."
 msgstr "Methu agor y ffeil %s gan ddefnyddio'r amgodiad nodau %s."
 
-#: ../gedit/gedit-io-error-message-area.c:790
-#: ../gedit/gedit-io-error-message-area.c:842
+#: ../gedit/gedit-io-error-message-area.c:680
+#: ../gedit/gedit-io-error-message-area.c:732
 msgid "Select a different character coding from the menu and try again."
 msgstr "Dewiswch amgodiad nodau gwahanol o'r ddewislen, a cheisiwch eto."
 
-#: ../gedit/gedit-io-error-message-area.c:837
+#: ../gedit/gedit-io-error-message-area.c:727
 #, c-format
 msgid "Could not save the file %s using the %s character coding."
 msgstr "Methu cadw'r ffeil %s gan ddefnyddio'r amgodiad nodau %s."
 
-#: ../gedit/gedit-io-error-message-area.c:840
-msgid ""
-"The document contains one or more characters that cannot be encoded using "
-"the specified character coding."
-msgstr ""
-"Mae'r ddogfen yn cynnwys o leiaf un nod na ellir ei amgodio gyda'r amgodiad "
-"nodau gafodd ei ddewis."
+#: ../gedit/gedit-io-error-message-area.c:730
+msgid "The document contains one or more characters that cannot be encoded using the specified character coding."
+msgstr "Mae'r ddogfen yn cynnwys o leiaf un nod na ellir ei amgodio gyda'r amgodiad nodau gafodd ei ddewis."
 
-#: ../gedit/gedit-io-error-message-area.c:903
+#: ../gedit/gedit-io-error-message-area.c:798
+#: ../gedit/gedit-io-error-message-area.c:806
 msgid "_Edit Anyway"
 msgstr "_Golygu Beth Bynnag"
 
-#: ../gedit/gedit-io-error-message-area.c:906
+#: ../gedit/gedit-io-error-message-area.c:801
+#: ../gedit/gedit-io-error-message-area.c:809
 msgid "_Don't Edit"
 msgstr "_Peidio â Golygu"
 
-#: ../gedit/gedit-io-error-message-area.c:921
+#: ../gedit/gedit-io-error-message-area.c:827
 #, fuzzy, c-format
 msgid "This file (%s) is already open in another gedit window."
 msgstr "Mae'r ffeil %s ar agor eisoes."
 
-#: ../gedit/gedit-io-error-message-area.c:936
+#: ../gedit/gedit-io-error-message-area.c:842
 #, fuzzy
-msgid ""
-"gedit opened this instance of the file in a non-editable way. Do you want to "
-"edit it anyway?"
-msgstr ""
-"Agorodd gedit y copi hwn o'r ffeil mewn modd na ellir ei golygu. Ydych chi "
-"am ei golygu beth bynnag?"
+msgid "gedit opened this instance of the file in a non-editable way. Do you want to edit it anyway?"
+msgstr "Agorodd gedit y copi hwn o'r ffeil mewn modd na ellir ei golygu. Ydych chi am ei golygu beth bynnag?"
 
-#: ../gedit/gedit-io-error-message-area.c:994
-#: ../gedit/gedit-io-error-message-area.c:1089
-#, fuzzy
+#: ../gedit/gedit-io-error-message-area.c:901
+#: ../gedit/gedit-io-error-message-area.c:911
+#: ../gedit/gedit-io-error-message-area.c:1011
+#: ../gedit/gedit-io-error-message-area.c:1021
 msgid "S_ave Anyway"
-msgstr "_Cadw Beth Bynnag"
+msgstr "C_adw Beth Bynnag"
 
-#: ../gedit/gedit-io-error-message-area.c:998
-#: ../gedit/gedit-io-error-message-area.c:1093
-#, fuzzy
+#: ../gedit/gedit-io-error-message-area.c:905
+#: ../gedit/gedit-io-error-message-area.c:915
+#: ../gedit/gedit-io-error-message-area.c:1015
+#: ../gedit/gedit-io-error-message-area.c:1025
 msgid "D_on't Save"
-msgstr "_Peidio â Chadw"
+msgstr "Peidi_o â Chadw"
 
 #. FIXME: review this message, it's not clear since for the user the "modification"
 #. could be interpreted as the changes he made in the document. beside "reading" is
 #. not accurate (since last load/save)
-#: ../gedit/gedit-io-error-message-area.c:1016
+#: ../gedit/gedit-io-error-message-area.c:936
 #, c-format
 msgid "The file %s has been modified since reading it."
 msgstr "Cafodd y ffeil %s ei newid ers ei darllen."
 
-#: ../gedit/gedit-io-error-message-area.c:1032
+#: ../gedit/gedit-io-error-message-area.c:952
 msgid "If you save it, all the external changes could be lost. Save it anyway?"
-msgstr ""
-"Os wnewch chi ei chadw, mae'n bosib y collir yr holl newidiadau allanol. "
-"Ydych chi am ei chadw beth bynnag?"
+msgstr "Os wnewch chi ei chadw, mae'n bosib y collir yr holl newidiadau allanol. Ydych chi am ei chadw beth bynnag?"
 
-#: ../gedit/gedit-io-error-message-area.c:1111
+#: ../gedit/gedit-io-error-message-area.c:1046
 #, c-format
 msgid "Could not create a backup file while saving %s"
 msgstr "Wrth gadw %s, ni allwyd creu ffeil wrth gefn"
 
-#: ../gedit/gedit-io-error-message-area.c:1114
+#: ../gedit/gedit-io-error-message-area.c:1049
 #, c-format
 msgid "Could not create a temporary backup file while saving %s"
 msgstr "Wrth gadw %s, ni allwyd creu ffeil wrth gefn dros dro"
 
-#: ../gedit/gedit-io-error-message-area.c:1131
-msgid ""
-"gedit could not backup the old copy of the file before saving the new one. "
-"You can ignore this warning and save the file anyway, but if an error occurs "
-"while saving, you could lose the old copy of the file. Save anyway?"
-msgstr ""
-"Methodd gedit wneud copi wrth gefn o'r ffeil cyn cadw'r un newydd. Gallwch "
-"chi anwybyddu'r rhybudd yma, a chadw'r ffeil beth bynnag, ond os fydd gwall "
-"wrth gadw, fe allech chi golli hen gopi'r ffeil. Cadw beth bynnag?"
+#: ../gedit/gedit-io-error-message-area.c:1066
+msgid "gedit could not backup the old copy of the file before saving the new one. You can ignore this warning and save the file anyway, but if an error occurs while saving, you could lose the old copy of the file. Save anyway?"
+msgstr "Methodd gedit wneud copi wrth gefn o'r ffeil cyn cadw'r un newydd. Gallwch chi anwybyddu'r rhybudd yma, a chadw'r ffeil beth bynnag, ond os fydd gwall wrth gadw, fe allech chi golli hen gopi'r ffeil. Cadw beth bynnag?"
 
 #. Translators: %s is a URI scheme (like for example http:, ftp:, etc.)
-#: ../gedit/gedit-io-error-message-area.c:1192
-#, fuzzy, c-format
-msgid ""
-"gedit cannot handle %s locations in write mode. Please check that you typed "
-"the location correctly and try again."
-msgstr ""
-"Ni all gedit ddelio â lleoliadau %s yn y modd ysgrifennu. Gwnewch yn siŵr "
-"eich bod chi wedi rhoi'r lleoliad yn gywir cyn ceisio eto."
-
-#: ../gedit/gedit-io-error-message-area.c:1200
-#, fuzzy
-msgid ""
-"gedit cannot handle this location in write mode. Please check that you typed "
-"the location correctly and try again."
-msgstr ""
-"Ni all gedit ddelio â'r lleoliad hwn yn y modd ysgrifennu. Gwnewch yn siŵr "
-"eich bod chi wedi rhoi'r lleoliad yn gywir cyn ceisio eto."
-
-#: ../gedit/gedit-io-error-message-area.c:1209
-msgid ""
-"The disk where you are trying to save the file has a limitation on file "
-"sizes.  Please try saving a smaller file or saving it to a disk that does "
-"not have this limitation."
-msgstr ""
-"Mae gan y disg lle rydych chi'n ceisio cadw'r ffeil gyfwng ar feintiau "
-"ffeiliau. Ceisiwch gadw ffeil lai neu gadw at ddisg sydd heb y cyfyngiad yma."
-
-#: ../gedit/gedit-io-error-message-area.c:1216
+#: ../gedit/gedit-io-error-message-area.c:1126
 #, fuzzy, c-format
-msgid ""
-"%s is not a valid location. Please check that you typed the location "
-"correctly and try again."
-msgstr ""
-"Nid yw %s yn lleoliad dilys. Gwnewch yn siŵr eich bod chi wedi rhoi'r "
-"lleoliad yn gywir cyn ceisio eto."
+msgid "gedit cannot handle %s locations in write mode. Please check that you typed the location correctly and try again."
+msgstr "Ni all gedit ddelio â lleoliadau %s yn y modd ysgrifennu. Gwnewch yn siŵr eich bod chi wedi rhoi'r lleoliad yn gywir cyn ceisio eto."
 
-#: ../gedit/gedit-io-error-message-area.c:1223
+#: ../gedit/gedit-io-error-message-area.c:1134
 #, fuzzy
-msgid ""
-"You do not have the permissions necessary to save the file. Please check "
-"that you typed the location correctly and try again."
-msgstr ""
-"Does gennych chi ddim y caniatâd angenrheidiol i gadw'r ffeil. Gwiriwch eich "
-"bod chi wedi rhoi'r lleoliad yn gywir, cyn ceisio eto."
+msgid "gedit cannot handle this location in write mode. Please check that you typed the location correctly and try again."
+msgstr "Ni all gedit ddelio â'r lleoliad hwn yn y modd ysgrifennu. Gwnewch yn siŵr eich bod chi wedi rhoi'r lleoliad yn gywir cyn ceisio eto."
 
-#: ../gedit/gedit-io-error-message-area.c:1235
-#, fuzzy, c-format
-msgid ""
-"%s is a directory. Please check that you typed the location correctly and "
-"try again."
-msgstr ""
-"Cyfeiriadur yw %s. Gwiriwch eich bod chi wedi teipio'r lleoliad yn gywir, "
-"cyn ceisio eto."
+#: ../gedit/gedit-io-error-message-area.c:1143
+#, c-format
+msgid "%s is not a valid location. Please check that you typed the location correctly and try again."
+msgstr "Nid yw %s yn lleoliad dilys. Gwnewch yn siŵr eich bod chi wedi rhoi'r lleoliad yn gywir cyn ceisio eto."
 
-#: ../gedit/gedit-io-error-message-area.c:1241
+#: ../gedit/gedit-io-error-message-area.c:1149
 #, fuzzy
-msgid ""
-"Not enough available memory to save the file. Please close some running "
-"applications and try again."
-msgstr ""
-"Dim digon o gof ar gael er mwyn cadw'r ffeil. Caewch ryw raglenni sy'n "
-"rhedeg, cyn ceisio eto."
+msgid "You do not have the permissions necessary to save the file. Please check that you typed the location correctly and try again."
+msgstr "Does gennych chi ddim y caniatâd angenrheidiol i gadw'r ffeil. Gwiriwch eich bod chi wedi rhoi'r lleoliad yn gywir, cyn ceisio eto."
 
-#: ../gedit/gedit-io-error-message-area.c:1317
+#: ../gedit/gedit-io-error-message-area.c:1155
 #, fuzzy
-msgid ""
-"There is not enough disk space to save the file. Please free some disk space "
-"and try again."
-msgstr ""
-"Does dim digon o le disg i gadw'r ffeil. Rhyddhewch ychydig o'r lle ar y "
-"disg cyn ceisio eto."
+msgid "There is not enough disk space to save the file. Please free some disk space and try again."
+msgstr "Does dim digon o le disg i gadw'r ffeil. Rhyddhewch ychydig o'r lle ar y disg cyn ceisio eto."
 
-#: ../gedit/gedit-io-error-message-area.c:1323
+#: ../gedit/gedit-io-error-message-area.c:1160
 #, fuzzy
-msgid ""
-"You are trying to save the file on a read-only disk. Please check that you "
-"typed the location correctly and try again."
-msgstr ""
-"Rydych chi'n ceisio cadw'r ffeil ar ddisg darllen-yn-unig. Gwiriwch eich bod "
-"chi wedi rhoi'r lleoliad yn gywir, cyn ceisio eto."
+msgid "You are trying to save the file on a read-only disk. Please check that you typed the location correctly and try again."
+msgstr "Rydych chi'n ceisio cadw'r ffeil ar ddisg darllen-yn-unig. Gwiriwch eich bod chi wedi rhoi'r lleoliad yn gywir, cyn ceisio eto."
 
-#: ../gedit/gedit-io-error-message-area.c:1329
+#: ../gedit/gedit-io-error-message-area.c:1166
 #, fuzzy
 msgid "A file with the same name already exists. Please use a different name."
 msgstr "Mae ffeil o'r un enw yn bodoli'n barod. Defnyddiwch enw gwahanol."
 
-#: ../gedit/gedit-io-error-message-area.c:1334
+#: ../gedit/gedit-io-error-message-area.c:1171
 #, fuzzy
-msgid ""
-"The disk where you are trying to save the file has a limitation on length of "
-"the file names. Please use a shorter name."
-msgstr ""
-"Mae gan y disg lle rydych chi'n ceisio cadw'r ffeil gyfyngiad ar hyd enwau "
-"ffeiliau. Defnyddiwch enw byrrach."
+msgid "The disk where you are trying to save the file has a limitation on length of the file names. Please use a shorter name."
+msgstr "Mae gan y disg lle rydych chi'n ceisio cadw'r ffeil gyfyngiad ar hyd enwau ffeiliau. Defnyddiwch enw byrrach."
 
-#: ../gedit/gedit-io-error-message-area.c:1343
-#, fuzzy, c-format
-msgid ""
-"%s is not a regular file. Please check that you typed the location correctly "
-"and try again."
-msgstr ""
-"Nid ffeil gyffredin yw %s. Gwiriwch eich bod chi wedi rhoi'r lleoliad yn "
-"gywir, cyn ceisio eto."
+#: ../gedit/gedit-io-error-message-area.c:1178
+msgid "The disk where you are trying to save the file has a limitation on file sizes.  Please try saving a smaller file or saving it to a disk that does not have this limitation."
+msgstr "Mae gan y disg lle rydych chi'n ceisio cadw'r ffeil gyfwng ar feintiau ffeiliau. Ceisiwch gadw ffeil lai neu gadw at ddisg sydd heb y cyfyngiad yma."
 
-#: ../gedit/gedit-io-error-message-area.c:1386
+#: ../gedit/gedit-io-error-message-area.c:1193
 #, c-format
 msgid "Could not save the file %s."
 msgstr "Methu cadw'r ffeil %s."
@@ -1824,202 +1385,240 @@ msgstr "Methu cadw'r ffeil %s."
 #. FIXME: review this message, it's not clear since for the user the "modification"
 #. could be interpreted as the changes he made in the document. beside "reading" is
 #. not accurate (since last load/save)
-#: ../gedit/gedit-io-error-message-area.c:1428
+#: ../gedit/gedit-io-error-message-area.c:1235
 #, fuzzy, c-format
 msgid "The file %s changed on disk."
 msgstr "Mae'r ffeil %s ar agor eisoes."
 
-#: ../gedit/gedit-io-error-message-area.c:1433
+#: ../gedit/gedit-io-error-message-area.c:1240
 msgid "Do you want to drop your changes and reload the file?"
 msgstr ""
 
-#: ../gedit/gedit-io-error-message-area.c:1435
+#: ../gedit/gedit-io-error-message-area.c:1242
 #, fuzzy
 msgid "Do you want to reload the file?"
 msgstr "Ydych chi am ei hamnewid gyda'r un rydych yn ei chadw?"
 
-#: ../gedit/gedit-io-error-message-area.c:1445
+#: ../gedit/gedit-io-error-message-area.c:1248
+#: ../gedit/gedit-io-error-message-area.c:1259
 #, fuzzy
 msgid "_Reload"
 msgstr "_Amnewid"
 
 #. bad bad luck...
-#: ../gedit/gedit-local-document-saver.c:361
+#: ../gedit/gedit-local-document-saver.c:375
 msgid "Could not obtain backup filename"
 msgstr "Methwyd cael enw ffeil wrth gefn"
 
-#: ../gedit/gedit-notebook.c:834
+#: ../gedit/gedit-notebook.c:854
 msgid "Close document"
 msgstr "Cau'r ddogfen"
 
-#: ../gedit/gedit-panel.c:361 ../gedit/gedit-panel.c:569
+#: ../gedit/gedit-panel.c:364
+#: ../gedit/gedit-panel.c:572
 msgid "Empty"
 msgstr "Gwag"
 
-#: ../gedit/gedit-panel.c:514 ../gedit/gedit-panel.c:588
+#: ../gedit/gedit-panel.c:517
+#: ../gedit/gedit-panel.c:591
 msgid "Hide panel"
 msgstr "Cuddio'r panel"
 
-#: ../gedit/gedit-plugin-manager.c:55
+#: ../gedit/gedit-plugin-manager.c:54
 msgid "Plugin"
 msgstr "Ategyn"
 
-#: ../gedit/gedit-plugin-manager.c:56
+#: ../gedit/gedit-plugin-manager.c:55
 msgid "Enabled"
 msgstr "Galluog"
 
-#: ../gedit/gedit-plugin-manager.c:514
+#: ../gedit/gedit-plugin-manager.c:504
 msgid "_About"
 msgstr "_Ynghylch"
 
-#: ../gedit/gedit-plugin-manager.c:522
+#: ../gedit/gedit-plugin-manager.c:512
 msgid "C_onfigure"
 msgstr "_Cyflunio"
 
-#: ../gedit/gedit-plugin-manager.c:532
+#: ../gedit/gedit-plugin-manager.c:521
 msgid "A_ctivate"
 msgstr "_Gweithredu"
 
-#: ../gedit/gedit-plugin-manager.c:544
+#: ../gedit/gedit-plugin-manager.c:532
 msgid "Ac_tivate All"
 msgstr "Gweithredu _Popeth"
 
-#: ../gedit/gedit-plugin-manager.c:549
+#: ../gedit/gedit-plugin-manager.c:537
 msgid "_Deactivate All"
 msgstr "_Dad-weithredu Popeth"
 
-#: ../gedit/gedit-plugin-manager.c:794
+#: ../gedit/gedit-plugin-manager.c:800
+#, fuzzy
+msgid "Active _Plugins:"
+msgstr "Ategion sy'n weithredol"
+
+#: ../gedit/gedit-plugin-manager.c:825
 msgid "_About Plugin"
 msgstr "_Ynghylch yr Ategyn"
 
-#: ../gedit/gedit-plugin-manager.c:798
+#: ../gedit/gedit-plugin-manager.c:829
 msgid "C_onfigure Plugin"
 msgstr "_Cyflunio'r Ategyn"
 
-#: ../gedit/gedit-prefs-manager.c:171
+#: ../gedit/gedit-prefs-manager.c:170
 msgid "Cannot initialize preferences manager."
 msgstr "Methu cychwyn y rheolwr hoffterau."
 
-#: ../gedit/gedit-prefs-manager.c:1280
+#: ../gedit/gedit-prefs-manager.c:1148
 #, c-format
 msgid "Expected `%s' got `%s' for key %s"
 msgstr "Disgwyliwyd `%s' cafwyd `%s' ar gyfer yr allwedd %s"
 
-#: ../gedit/gedit-print.c:186
+#: ../gedit/gedit-print-job.c:541
 #, c-format
 msgid "File: %s"
 msgstr "Ffeil: %s"
 
-#: ../gedit/gedit-print.c:194
+#: ../gedit/gedit-print-job.c:550
 msgid "Page %N of %Q"
 msgstr "Tudalen %N o %Q"
 
-#: ../gedit/gedit-print.c:316
-msgid "Print"
-msgstr "Argraffu"
+#: ../gedit/gedit-print-job.c:805
+msgid "Preparing..."
+msgstr "Paratoi..."
 
-#: ../gedit/gedit-print.c:328 ../plugins/docinfo/docinfo.glade2.h:9
-msgid "Lines"
-msgstr "Llinellau"
+#: ../gedit/gedit-print-preferences.ui.h:1
+msgid "<b>Fonts</b>"
+msgstr "<b>Ffontiau</b>"
 
-#: ../gedit/gedit-print-job-preview.c:621
-msgid "Page Preview"
-msgstr "Rhagolwg Tudalen"
+#: ../gedit/gedit-print-preferences.ui.h:3
+msgid "<b>Page header</b>"
+msgstr "<b>Pennawd tudalen</b>"
 
-#: ../gedit/gedit-print-job-preview.c:622
-msgid "The preview of a page in the document to be printed"
-msgstr "Rhagolwg tudalen o fewn y ddogfen sydd i'w phrintio"
+#: ../gedit/gedit-print-preferences.ui.h:4
+msgid "<b>Syntax Highlighting</b>"
+msgstr "<b>Amlygiad Cystrawen</b>"
+
+#: ../gedit/gedit-print-preferences.ui.h:8
+msgid "He_aders and footers:"
+msgstr "_Penawdau a Throedynnau:"
+
+#: ../gedit/gedit-print-preferences.ui.h:9
+msgid "Print line nu_mbers"
+msgstr "Argraffu _rhifau llinellau"
+
+#: ../gedit/gedit-print-preferences.ui.h:10
+msgid "Print page _headers"
+msgstr "_Argraffu penawdau tudalennau"
+
+#: ../gedit/gedit-print-preferences.ui.h:11
+msgid "Print synta_x highlighting"
+msgstr "Argraffu amlygu _cystrawen"
 
-#: ../gedit/gedit-print-job-preview.c:708
-msgid "Other"
-msgstr "Arall"
+#: ../gedit/gedit-print-preferences.ui.h:12
+msgid "_Body:"
+msgstr "_Corff:"
+
+#: ../gedit/gedit-print-preferences.ui.h:13
+msgid "_Line numbers:"
+msgstr "_Rhifau llinellau:"
+
+#: ../gedit/gedit-print-preferences.ui.h:14
+msgid "_Number every"
+msgstr "_Rhif bob"
+
+#: ../gedit/gedit-print-preferences.ui.h:15
+msgid "_Restore Default Fonts"
+msgstr "_Adfer Ffontiau Rhagosodedig"
+
+#: ../gedit/gedit-print-preferences.ui.h:16
+msgid "lines"
+msgstr "llinellau"
 
-#: ../gedit/gedit-print-job-preview.c:738
+#: ../gedit/gedit-print-preview.c:561
 msgid "Show the previous page"
 msgstr "Dangos y dudalen flaenorol"
 
-#: ../gedit/gedit-print-job-preview.c:749
+#: ../gedit/gedit-print-preview.c:573
 msgid "Show the next page"
 msgstr "Dangos y dudalen nesaf"
 
-#: ../gedit/gedit-print-job-preview.c:764
+#: ../gedit/gedit-print-preview.c:589
 msgid "Current page (Alt+P)"
 msgstr "Y dudalen bresennol (Alt+P)"
 
-#. gtk_label_set_mnemonic_widget ((GtkLabel *) l, mp->priv->page_entry);
-#. We are displaying 'XXX of XXX'.
-#: ../gedit/gedit-print-job-preview.c:777
+#: ../gedit/gedit-print-preview.c:611
 msgid "of"
 msgstr "o"
 
-#: ../gedit/gedit-print-job-preview.c:783
+#: ../gedit/gedit-print-preview.c:619
 msgid "Page total"
 msgstr "Cyfanswm tudalennau"
 
-#: ../gedit/gedit-print-job-preview.c:784
+#: ../gedit/gedit-print-preview.c:620
 msgid "The total number of pages in the document"
 msgstr "Cyfanswm y tudalennau o fewn y ddogfen"
 
-#: ../gedit/gedit-print-job-preview.c:801
+#: ../gedit/gedit-print-preview.c:637
 msgid "Show multiple pages"
 msgstr "Dangos fwy nag un tudalen"
 
-#: ../gedit/gedit-print-job-preview.c:813
+#: ../gedit/gedit-print-preview.c:650
 msgid "Zoom 1:1"
 msgstr "Chwyddo 1:1"
 
-#: ../gedit/gedit-print-job-preview.c:821
+#: ../gedit/gedit-print-preview.c:659
 msgid "Zoom to fit the whole page"
 msgstr "Chwyddo i ffitio'r holl dudalen"
 
-#: ../gedit/gedit-print-job-preview.c:830
+#: ../gedit/gedit-print-preview.c:668
 msgid "Zoom the page in"
 msgstr "Chwyddo'r dudalen"
 
-#: ../gedit/gedit-print-job-preview.c:838
+#: ../gedit/gedit-print-preview.c:677
 msgid "Zoom the page out"
 msgstr "Crebachu'r dudalen"
 
-#: ../gedit/gedit-print-job-preview.c:848
-#, fuzzy
+#: ../gedit/gedit-print-preview.c:689
 msgid "_Close Preview"
-msgstr "Cau'r rhagolwg argraffu"
+msgstr "_Cau'r Rhagolwg"
 
-#: ../gedit/gedit-print-job-preview.c:852
+#: ../gedit/gedit-print-preview.c:692
 msgid "Close print preview"
 msgstr "Cau'r rhagolwg argraffu"
 
-#: ../gedit/gedit-print-job-preview.c:1092
-#: ../gedit/gedit-print-job-preview.c:1093
-msgid "Number of pages horizontally"
-msgstr "Faint o dudalennau yn llorweddol"
+#: ../gedit/gedit-print-preview.c:758
+#, c-format
+msgid "Page %d of %d"
+msgstr "Tudalen %d o %d"
 
-#: ../gedit/gedit-print-job-preview.c:1096
-#: ../gedit/gedit-print-job-preview.c:1097
-msgid "Number of pages vertically"
-msgstr "Faint o dudalennau yn fertigol"
+#: ../gedit/gedit-print-preview.c:942
+msgid "Page Preview"
+msgstr "Rhagolwg Tudalen"
 
-#: ../gedit/gedit-print-job-preview.c:1161
-msgid "No visible output was created."
-msgstr "Ni chrëwyd allbwn gweladwy."
+#: ../gedit/gedit-print-preview.c:943
+msgid "The preview of a page in the document to be printed"
+msgstr "Rhagolwg tudalen o fewn y ddogfen sydd i'w phrintio"
 
 # "TRS" fel yn "trosysgrifo" ("overwrite")
-#: ../gedit/gedit-statusbar.c:248
-msgid "  OVR"
-msgstr "  TRS"
+#: ../gedit/gedit-statusbar.c:70
+#: ../gedit/gedit-statusbar.c:76
+msgid "OVR"
+msgstr "TRS"
 
-#: ../gedit/gedit-statusbar.c:250
-msgid "  INS"
-msgstr "  MEW"
+#: ../gedit/gedit-statusbar.c:70
+#: ../gedit/gedit-statusbar.c:76
+msgid "INS"
+msgstr "MEW"
 
 #. Translators: "Ln" is an abbreviation for "Line", Col is an abbreviation for "Column". Please,
 #. use abbreviations if possible to avoid space problems.
-#: ../gedit/gedit-statusbar.c:289
+#: ../gedit/gedit-statusbar.c:330
 #, c-format
 msgid "  Ln %d, Col %d"
 msgstr "  Ll %d, Col %d"
 
-#: ../gedit/gedit-statusbar.c:388
+#: ../gedit/gedit-statusbar.c:429
 #, c-format
 msgid "There is a tab with errors"
 msgid_plural "There are %d tabs with errors"
@@ -2028,452 +1627,475 @@ msgstr[1] "Mae yna %d tab â gwallau."
 msgstr[2] "Mae yna %d dab â gwallau."
 msgstr[3] "Mae yna %d tab â gwallau."
 
-#: ../gedit/gedit-style-scheme-manager.c:214
+#: ../gedit/gedit-style-scheme-manager.c:207
 #, c-format
 msgid "Directory '%s' could not be created: g_mkdir_with_parents() failed: %s"
 msgstr ""
 
 #. Translators: the first %s is a file name (e.g. test.txt) the second one
 #. is a directory (e.g. ssh://master.gnome.org/home/users/paolo)
-#: ../gedit/gedit-tab.c:663
+#: ../gedit/gedit-tab.c:669
 #, c-format
 msgid "Reverting %s from %s"
 msgstr "Yn adfer %s o %s"
 
-#: ../gedit/gedit-tab.c:670
+#: ../gedit/gedit-tab.c:676
 #, c-format
 msgid "Reverting %s"
 msgstr "Yn adfer %s"
 
 #. Translators: the first %s is a file name (e.g. test.txt) the second one
 #. is a directory (e.g. ssh://master.gnome.org/home/users/paolo)
-#: ../gedit/gedit-tab.c:686
+#: ../gedit/gedit-tab.c:692
 #, c-format
 msgid "Loading %s from %s"
 msgstr "Yn llwytho %s o %s"
 
-#: ../gedit/gedit-tab.c:693
+#: ../gedit/gedit-tab.c:699
 #, c-format
 msgid "Loading %s"
 msgstr "Yn llwytho %s"
 
 #. Translators: the first %s is a file name (e.g. test.txt) the second one
 #. is a directory (e.g. ssh://master.gnome.org/home/users/paolo)
-#: ../gedit/gedit-tab.c:776
+#: ../gedit/gedit-tab.c:782
 #, c-format
 msgid "Saving %s to %s"
 msgstr "Cadw %s i %s"
 
-#: ../gedit/gedit-tab.c:783
+#: ../gedit/gedit-tab.c:789
 #, c-format
 msgid "Saving %s"
 msgstr "Yn cadw %s"
 
 #. Read only
-#: ../gedit/gedit-tab.c:1646
+#: ../gedit/gedit-tab.c:1703
 msgid "RO"
 msgstr "DYU"
 
-#: ../gedit/gedit-tab.c:1691
+#: ../gedit/gedit-tab.c:1750
 #, c-format
 msgid "Error opening file %s"
 msgstr "Gwall wrth agor ffeil %s"
 
-#: ../gedit/gedit-tab.c:1696
+#: ../gedit/gedit-tab.c:1755
 #, c-format
 msgid "Error reverting file %s"
 msgstr "Gwall wrth adfer ffeil %s"
 
-#: ../gedit/gedit-tab.c:1701
+#: ../gedit/gedit-tab.c:1760
 #, c-format
 msgid "Error saving file %s"
 msgstr "Gwall wrth gadw ffeil %s"
 
-#: ../gedit/gedit-tab.c:1719
+#: ../gedit/gedit-tab.c:1781
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
-#: ../gedit/gedit-tab.c:1726
+#: ../gedit/gedit-tab.c:1788
 msgid "Name:"
 msgstr "Enw:"
 
-#: ../gedit/gedit-tab.c:1727
+#: ../gedit/gedit-tab.c:1789
 msgid "MIME Type:"
 msgstr "Math MIME:"
 
-#: ../gedit/gedit-tab.c:1728
+#: ../gedit/gedit-tab.c:1790
 msgid "Encoding:"
 msgstr "Amgodiad:"
 
-#: ../gedit/gedit-tab.c:2220
-#, c-format
-msgid "Rendering page %d of %d..."
-msgstr "Llunio tudalen %d o %d..."
-
 #. Toplevel
-#: ../gedit/gedit-ui.h:49
+#: ../gedit/gedit-ui.h:47
 msgid "_File"
 msgstr "_Ffeil"
 
-#: ../gedit/gedit-ui.h:50
+#: ../gedit/gedit-ui.h:48
 msgid "_Edit"
 msgstr "_Golygu"
 
-#: ../gedit/gedit-ui.h:51
+#: ../gedit/gedit-ui.h:49
 msgid "_View"
 msgstr "Go_lwg"
 
-#: ../gedit/gedit-ui.h:52
+#: ../gedit/gedit-ui.h:50
 msgid "_Search"
 msgstr "_Chwilio"
 
-#: ../gedit/gedit-ui.h:53
+#: ../gedit/gedit-ui.h:51
 msgid "_Tools"
 msgstr "_Offer"
 
-#: ../gedit/gedit-ui.h:54
+#: ../gedit/gedit-ui.h:52
 msgid "_Documents"
 msgstr "_Dogfennau"
 
-#: ../gedit/gedit-ui.h:55
+#: ../gedit/gedit-ui.h:53
 msgid "_Help"
 msgstr "C_ymorth"
 
-#: ../gedit/gedit-ui.h:59
+#: ../gedit/gedit-ui.h:57
 msgid "Create a new document"
 msgstr "Creu dogfen newydd"
 
-#: ../gedit/gedit-ui.h:60
+#: ../gedit/gedit-ui.h:58
 msgid "_Open..."
 msgstr "_Agor..."
 
-#: ../gedit/gedit-ui.h:61 ../gedit/gedit-window.c:1468
+#: ../gedit/gedit-ui.h:59
+#: ../gedit/gedit-window.c:1385
 msgid "Open a file"
 msgstr "Agor ffeil"
 
-#: ../gedit/gedit-ui.h:62
-msgid "Open _Location..."
-msgstr "Agor _lleoliad..."
-
-#: ../gedit/gedit-ui.h:63
-msgid "Open a file from a specified location"
-msgstr "Agor ffeil o leoliad penodedig"
-
 #. Edit menu
-#: ../gedit/gedit-ui.h:66
+#: ../gedit/gedit-ui.h:62
 msgid "Pr_eferences"
 msgstr "_Hoffterau"
 
-#: ../gedit/gedit-ui.h:67
+#: ../gedit/gedit-ui.h:63
 msgid "Configure the application"
 msgstr "Cyflunio'r rhaglen"
 
 #. Help menu
-#: ../gedit/gedit-ui.h:70
+#: ../gedit/gedit-ui.h:66
 msgid "_Contents"
 msgstr "_Cynnwys"
 
-#: ../gedit/gedit-ui.h:71
+#: ../gedit/gedit-ui.h:67
 msgid "Open the gedit manual"
 msgstr "Agor y llawlyfr gedit"
 
-#: ../gedit/gedit-ui.h:73
+#: ../gedit/gedit-ui.h:69
 msgid "About this application"
 msgstr "Ynghylch y rhaglen hon"
 
-#: ../gedit/gedit-ui.h:80
+#: ../gedit/gedit-ui.h:73
+msgid "Leave fullscreen mode"
+msgstr ""
+
+#: ../gedit/gedit-ui.h:81
 msgid "Save the current file"
 msgstr "Arbed y ffeil cyfredol"
 
-#: ../gedit/gedit-ui.h:81
+#: ../gedit/gedit-ui.h:82
 msgid "Save _As..."
 msgstr "Cadw _Fel..."
 
-#: ../gedit/gedit-ui.h:82
+#: ../gedit/gedit-ui.h:83
 msgid "Save the current file with a different name"
 msgstr "Arbed y ffeil cyfredol gydag enw newydd"
 
-#: ../gedit/gedit-ui.h:84
+#: ../gedit/gedit-ui.h:85
 msgid "Revert to a saved version of the file"
 msgstr "Adfer at fersiwn wedi ei gadw o'r ffeil"
 
-#: ../gedit/gedit-ui.h:85
+#: ../gedit/gedit-ui.h:86
 msgid "Page Set_up..."
 msgstr "Gosodiad _Tudalen..."
 
-#: ../gedit/gedit-ui.h:86
+#: ../gedit/gedit-ui.h:87
 msgid "Setup the page settings"
 msgstr "Cyflunio'r gosodiadau tudalen"
 
-#: ../gedit/gedit-ui.h:87
+#: ../gedit/gedit-ui.h:88
 msgid "Print Previe_w"
 msgstr "_Rhagolwg Argraffu"
 
-#: ../gedit/gedit-ui.h:88
+#: ../gedit/gedit-ui.h:89
 msgid "Print preview"
 msgstr "Rhagolwg argraffu"
 
-#: ../gedit/gedit-ui.h:89
+#: ../gedit/gedit-ui.h:90
 msgid "_Print..."
 msgstr "_Argraffu..."
 
-#: ../gedit/gedit-ui.h:90
+#: ../gedit/gedit-ui.h:91
 msgid "Print the current page"
 msgstr "Argraffu'r dudalen hon"
 
-#: ../gedit/gedit-ui.h:92
+#: ../gedit/gedit-ui.h:93
 msgid "Close the current file"
 msgstr "Cau'r ffeil cyfredol"
 
-#: ../gedit/gedit-ui.h:96
+#: ../gedit/gedit-ui.h:97
 msgid "Undo the last action"
 msgstr "Dadwneud y weithred ddiwethaf"
 
-#: ../gedit/gedit-ui.h:98
+#: ../gedit/gedit-ui.h:99
 msgid "Redo the last undone action"
 msgstr "Ail-wneud y weithred gafodd ei dadwneud diwethaf"
 
-#: ../gedit/gedit-ui.h:100
+#: ../gedit/gedit-ui.h:101
 msgid "Cut the selection"
 msgstr "Torri'r dewis"
 
-#: ../gedit/gedit-ui.h:102
+#: ../gedit/gedit-ui.h:103
 msgid "Copy the selection"
 msgstr "Copïo'r dewis"
 
-#: ../gedit/gedit-ui.h:104
+#: ../gedit/gedit-ui.h:105
 msgid "Paste the clipboard"
 msgstr "Gludo'r clipfwrdd"
 
-#: ../gedit/gedit-ui.h:106
+#: ../gedit/gedit-ui.h:107
 msgid "Delete the selected text"
 msgstr "Dileu'r testun a ddewiswyd"
 
-#: ../gedit/gedit-ui.h:107
+#: ../gedit/gedit-ui.h:108
 msgid "Select _All"
 msgstr "Dewis _Popeth"
 
-#: ../gedit/gedit-ui.h:108
+#: ../gedit/gedit-ui.h:109
 msgid "Select the entire document"
 msgstr "Dewis yr holl ddogfen"
 
 #. View menu
-#: ../gedit/gedit-ui.h:111
+#: ../gedit/gedit-ui.h:112
 msgid "_Highlight Mode"
 msgstr "Modd _Amlygu"
 
 #. Search menu
-#: ../gedit/gedit-ui.h:114
+#: ../gedit/gedit-ui.h:115
 msgid "_Find..."
 msgstr "_Chwilio..."
 
-#: ../gedit/gedit-ui.h:115
+#: ../gedit/gedit-ui.h:116
 msgid "Search for text"
 msgstr "Chwilio am destun"
 
-#: ../gedit/gedit-ui.h:116
+#: ../gedit/gedit-ui.h:117
 msgid "Find Ne_xt"
 msgstr "Canfod _Nesaf"
 
-#: ../gedit/gedit-ui.h:117
+#: ../gedit/gedit-ui.h:118
 msgid "Search forwards for the same text"
 msgstr "Chwilio am ymlaen am yr un llinyn"
 
-#: ../gedit/gedit-ui.h:118
+#: ../gedit/gedit-ui.h:119
 msgid "Find Pre_vious"
 msgstr "Canfod _Blaenorol"
 
-#: ../gedit/gedit-ui.h:119
+#: ../gedit/gedit-ui.h:120
 msgid "Search backwards for the same text"
 msgstr "Chwilio am yn ôl am yr un testun"
 
-#: ../gedit/gedit-ui.h:120
+#: ../gedit/gedit-ui.h:121
 msgid "_Replace..."
 msgstr "_Amnewid..."
 
-#: ../gedit/gedit-ui.h:121
+#: ../gedit/gedit-ui.h:122
 msgid "Search for and replace text"
 msgstr "Chwilio am destun a'i amnewid"
 
-#: ../gedit/gedit-ui.h:122
+#: ../gedit/gedit-ui.h:123
 msgid "_Clear Highlight"
 msgstr "_Clirio'r Amlygiad"
 
-#: ../gedit/gedit-ui.h:123
+#: ../gedit/gedit-ui.h:124
 msgid "Clear highlighting of search matches"
 msgstr "Peidio ag amlygu'r cydweddu chwilio"
 
-#: ../gedit/gedit-ui.h:124
+#: ../gedit/gedit-ui.h:125
 msgid "Go to _Line..."
 msgstr "_Mynd at Linell..."
 
-#: ../gedit/gedit-ui.h:125
+#: ../gedit/gedit-ui.h:126
 msgid "Go to a specific line"
 msgstr "Mynd at linell benodol"
 
-#: ../gedit/gedit-ui.h:126
+#: ../gedit/gedit-ui.h:127
 #, fuzzy
 msgid "_Incremental Search..."
 msgstr "Chwilio'n rhyngweithiol..."
 
-#: ../gedit/gedit-ui.h:127
+#: ../gedit/gedit-ui.h:128
 #, fuzzy
 msgid "Incrementally search for text"
 msgstr "Chwilio am destun yn rhyngweithiol"
 
 #. Documents menu
-#: ../gedit/gedit-ui.h:130
+#: ../gedit/gedit-ui.h:131
 msgid "_Save All"
 msgstr "_Cadw Popeth"
 
-#: ../gedit/gedit-ui.h:131
+#: ../gedit/gedit-ui.h:132
 msgid "Save all open files"
 msgstr "Cadw pob ffeil agored"
 
-#: ../gedit/gedit-ui.h:132
+#: ../gedit/gedit-ui.h:133
 msgid "_Close All"
 msgstr "_Cau Popeth"
 
-#: ../gedit/gedit-ui.h:133
+#: ../gedit/gedit-ui.h:134
 msgid "Close all open files"
 msgstr "Cau bob ffeil agored"
 
-#: ../gedit/gedit-ui.h:134
+#: ../gedit/gedit-ui.h:135
 msgid "_Previous Document"
 msgstr "_Dogfen Flaenorol"
 
-#: ../gedit/gedit-ui.h:135
+#: ../gedit/gedit-ui.h:136
 msgid "Activate previous document"
 msgstr "Gweithredu'r ddogfen flaenorol"
 
-#: ../gedit/gedit-ui.h:136
+#: ../gedit/gedit-ui.h:137
 msgid "_Next Document"
 msgstr "_Dogfen Nesaf"
 
-#: ../gedit/gedit-ui.h:137
+#: ../gedit/gedit-ui.h:138
 msgid "Activate next document"
 msgstr "Gweithredu'r ddogfen nesaf"
 
-#: ../gedit/gedit-ui.h:138
+#: ../gedit/gedit-ui.h:139
 msgid "_Move to New Window"
 msgstr "_Symud at Ffenest Newydd"
 
-#: ../gedit/gedit-ui.h:139
+#: ../gedit/gedit-ui.h:140
 msgid "Move the current document to a new window"
 msgstr "Symud y ddogfen gyfredol at ffenest newydd"
 
-#: ../gedit/gedit-ui.h:146
+#: ../gedit/gedit-ui.h:147
 msgid "Quit the program"
 msgstr "Gadael y rhaglen"
 
-#: ../gedit/gedit-ui.h:151
+#: ../gedit/gedit-ui.h:152
 msgid "_Toolbar"
 msgstr "Bar _Offer"
 
-#: ../gedit/gedit-ui.h:152
+#: ../gedit/gedit-ui.h:153
 msgid "Show or hide the toolbar in the current window"
 msgstr "Cuddio neu ddangos y bar offer yn y ffenestr bresennol"
 
-#: ../gedit/gedit-ui.h:154
+#: ../gedit/gedit-ui.h:155
 msgid "_Statusbar"
 msgstr "Bar _Statws"
 
-#: ../gedit/gedit-ui.h:155
+#: ../gedit/gedit-ui.h:156
 msgid "Show or hide the statusbar in the current window"
 msgstr "Cuddio neu ddangos y bar statws yn y ffenestr bresennol"
 
-#: ../gedit/gedit-ui.h:157
+#: ../gedit/gedit-ui.h:159
+#, fuzzy
+msgid "Edit text at fullscreen"
+msgstr "Golygu ffeiliau testun"
+
+#: ../gedit/gedit-ui.h:166
 msgid "Side _Pane"
 msgstr "Cwarel _Ochr"
 
-#: ../gedit/gedit-ui.h:158
+#: ../gedit/gedit-ui.h:167
 msgid "Show or hide the side pane in the current window"
 msgstr "Cuddio neu ddangos y cwarel ochr yn y ffenestr bresennol"
 
-#: ../gedit/gedit-ui.h:164
+#: ../gedit/gedit-ui.h:169
 msgid "_Bottom Pane"
 msgstr "_Cwarel Gwaelod"
 
-#: ../gedit/gedit-ui.h:165
+#: ../gedit/gedit-ui.h:170
 msgid "Show or hide the bottom pane in the current window"
 msgstr "Cuddio neu ddangos y cwarel gwaelod yn y ffenestr bresennol"
 
-#: ../gedit/gedit-utils.c:1005
-#, c-format
-msgid "Unable to find file %s."
-msgstr "Methu canfod y ffeil %s."
-
-#: ../gedit/gedit-utils.c:1009 ../gedit/gedit-utils.c:1045
+#: ../gedit/gedit-utils.c:1072
 msgid "Please check your installation."
 msgstr "Gwiriwch eich gosodiad."
 
-#: ../gedit/gedit-utils.c:1041
-#, c-format
-msgid "Unable to find the required widgets inside file %s."
+#: ../gedit/gedit-utils.c:1141
+#, fuzzy, c-format
+msgid "Unable to open ui file %s. Error: %s"
+msgstr "Methu canfod y ffeil %s."
+
+#: ../gedit/gedit-utils.c:1161
+#, fuzzy, c-format
+msgid "Unable to find the object '%s' inside file %s."
 msgstr "Methu canfod y teclynnau gofynnol o fewn y ffeil %s."
 
+#. Translators: '/ on <remote-share>'
+#: ../gedit/gedit-utils.c:1321
+#, c-format
+msgid "/ on %s"
+msgstr "/ ar %s"
+
 #. create "Wrap Around" menu item.
-#: ../gedit/gedit-view.c:1137
+#: ../gedit/gedit-view.c:1248
 msgid "_Wrap Around"
 msgstr "_Amlapio o gwmpas"
 
 #. create "Match Entire Word Only" menu item.
-#: ../gedit/gedit-view.c:1147
+#: ../gedit/gedit-view.c:1258
 msgid "Match _Entire Word Only"
 msgstr "Cydweddu gair _cyfan yn unig"
 
 #. create "Match Case" menu item.
-#: ../gedit/gedit-view.c:1157
+#: ../gedit/gedit-view.c:1268
 msgid "_Match Case"
 msgstr "_Cydweddu prif lythrennedd"
 
-#: ../gedit/gedit-view.c:1245
+#: ../gedit/gedit-view.c:1386
+#: ../gedit/gedit-view.c:1411
 msgid "String you want to search for"
 msgstr "Llinyn i'w chwilio amdani"
 
-#: ../gedit/gedit-view.c:1253
+#: ../gedit/gedit-view.c:1394
+#: ../gedit/gedit-view.c:1420
 msgid "Line you want to move the cursor to"
 msgstr "Y llinell i symud y cyrchwr ati"
 
-#: ../gedit/gedit-window.c:881
+#: ../gedit/gedit-window.c:938
 #, c-format
 msgid "Use %s highlight mode"
 msgstr "Defnyddio'r modd amlygu %s"
 
-#. add the "None" item before all the others
-#. Translators: "None" means that no highlight mode is selected in the
+#. add the "Plain Text" item before all the others
+#. Translators: "Plain Text" means that no highlight mode is selected in the
 #. * "View->Highlight Mode" submenu and so syntax highlighting is disabled
-#: ../gedit/gedit-window.c:938
-msgid "None"
-msgstr "Dim"
+#: ../gedit/gedit-window.c:995
+#: ../gedit/gedit-window.c:1880
+#: ../plugins/externaltools/tools/manager.py:121
+#: ../plugins/externaltools/tools/manager.py:423
+#: ../plugins/externaltools/tools/manager.py:533
+#: ../plugins/externaltools/tools/manager.py:844
+#, fuzzy
+msgid "Plain Text"
+msgstr "Canfod Nesaf"
 
-#: ../gedit/gedit-window.c:939
+#: ../gedit/gedit-window.c:996
 msgid "Disable syntax highlighting"
 msgstr "Analluogi amlygu cystrawen"
 
 #. Translators: %s is a URI
-#: ../gedit/gedit-window.c:1225
+#: ../gedit/gedit-window.c:1282
 #, c-format
 msgid "Open '%s'"
 msgstr "Agor '%s'"
 
-#: ../gedit/gedit-window.c:1344
-msgid "Save"
-msgstr "Cadw"
-
-#: ../gedit/gedit-window.c:1472
+#: ../gedit/gedit-window.c:1387
 msgid "Open a recently used file"
 msgstr "Agor ffeil a ddefnyddiwyd yn ddiweddar"
 
-#: ../gedit/gedit-window.c:1479
+#: ../gedit/gedit-window.c:1393
 msgid "Open"
 msgstr "Agor"
 
+#: ../gedit/gedit-window.c:1452
+msgid "Save"
+msgstr "Cadw"
+
+#: ../gedit/gedit-window.c:1454
+msgid "Print"
+msgstr "Argraffu"
+
 #. Translators: %s is a URI
-#: ../gedit/gedit-window.c:1529
-#, fuzzy, c-format
+#: ../gedit/gedit-window.c:1605
+#, c-format
 msgid "Activate '%s'"
-msgstr "Gweithredu %s"
+msgstr "Gweithredu '%s'"
+
+#: ../gedit/gedit-window.c:1858
+msgid "Use Spaces"
+msgstr "Defnyddio Bylchau"
+
+#: ../gedit/gedit-window.c:1929
+msgid "Tab Width"
+msgstr "Lled Tab"
 
 #: ../plugins/changecase/changecase.gedit-plugin.desktop.in.h:1
 msgid "Change Case"
@@ -2519,60 +2141,86 @@ msgstr "prif lythrennedd _Teitl"
 msgid "Capitalize the first letter of each selected word"
 msgstr "Priflythrennu llythyren gyntaf pob gair dewisedig"
 
-#: ../plugins/docinfo/docinfo.gedit-plugin.desktop.in.h:1
-msgid ""
-"Analyzes the current document and reports the number of words, lines, "
-"characters and non-space characters in it."
+#: ../plugins/checkupdate/checkupdate.gedit-plugin.desktop.in.h:1
+msgid "Check for latest version of gedit"
+msgstr ""
+
+#: ../plugins/checkupdate/checkupdate.gedit-plugin.desktop.in.h:2
+#, fuzzy
+msgid "Check update"
+msgstr "Ticiwyd (stad)"
+
+#: ../plugins/checkupdate/gedit-check-update-plugin.c:192
+msgid "There was an error displaying the url."
+msgstr "Roedd gwall wrth ddangos y url."
+
+#: ../plugins/checkupdate/gedit-check-update-plugin.c:222
+#: ../plugins/checkupdate/gedit-check-update-plugin.c:233
+msgid "_Download"
+msgstr "_Llawrlwytho"
+
+#: ../plugins/checkupdate/gedit-check-update-plugin.c:250
+msgid "There is a new version of gedit"
+msgstr "Mae yna fersiwn newydd o gedit"
+
+#: ../plugins/checkupdate/gedit-check-update-plugin.c:251
+msgid "You can download the new version of gedit by pressing on the download button"
 msgstr ""
-"Dadansoddi'r ddogfen gyfredol ac adrodd y nifer o eiriau, llinellau, nodau a "
-"nodau heb fod yn fylchau sydd ynddo."
+
+#: ../plugins/docinfo/docinfo.gedit-plugin.desktop.in.h:1
+msgid "Analyzes the current document and reports the number of words, lines, characters and non-space characters in it."
+msgstr "Dadansoddi'r ddogfen gyfredol ac adrodd y nifer o eiriau, llinellau, nodau a nodau heb fod yn fylchau sydd ynddo."
 
 #: ../plugins/docinfo/docinfo.gedit-plugin.desktop.in.h:2
-#: ../plugins/docinfo/docinfo.glade2.h:8
+#: ../plugins/docinfo/docinfo.ui.h:8
 msgid "Document Statistics"
 msgstr "Ystadegau Dogfen"
 
-#: ../plugins/docinfo/docinfo.glade2.h:2
+#: ../plugins/docinfo/docinfo.ui.h:2
 msgid "0"
 msgstr "0"
 
-#: ../plugins/docinfo/docinfo.glade2.h:3
+#: ../plugins/docinfo/docinfo.ui.h:3
 msgid "<span weight=\"bold\">File Name</span>"
 msgstr "<span weight=\"bold\">Enw Ffeil</span>"
 
-#: ../plugins/docinfo/docinfo.glade2.h:4
+#: ../plugins/docinfo/docinfo.ui.h:4
 msgid "Bytes"
 msgstr "Beit"
 
-#: ../plugins/docinfo/docinfo.glade2.h:5
+#: ../plugins/docinfo/docinfo.ui.h:5
 msgid "Characters (no spaces)"
 msgstr "Nodau (dim bylchau)"
 
-#: ../plugins/docinfo/docinfo.glade2.h:6
+#: ../plugins/docinfo/docinfo.ui.h:6
 msgid "Characters (with spaces)"
 msgstr "Nodau (gyda bylchau)"
 
-#: ../plugins/docinfo/docinfo.glade2.h:7
+#: ../plugins/docinfo/docinfo.ui.h:7
 msgid "Document"
 msgstr "Dogfen"
 
-#: ../plugins/docinfo/docinfo.glade2.h:10
+#: ../plugins/docinfo/docinfo.ui.h:9
+msgid "Lines"
+msgstr "Llinellau"
+
+#: ../plugins/docinfo/docinfo.ui.h:10
 msgid "Selection"
 msgstr "Dewis"
 
-#: ../plugins/docinfo/docinfo.glade2.h:11
+#: ../plugins/docinfo/docinfo.ui.h:11
 msgid "Words"
 msgstr "Geiriau"
 
-#: ../plugins/docinfo/docinfo.glade2.h:12
+#: ../plugins/docinfo/docinfo.ui.h:12
 msgid "_Update"
 msgstr "_Diweddaru"
 
-#: ../plugins/docinfo/gedit-docinfo-plugin.c:411
+#: ../plugins/docinfo/gedit-docinfo-plugin.c:422
 msgid "_Document Statistics"
 msgstr "_Ystadegau Dogfen"
 
-#: ../plugins/docinfo/gedit-docinfo-plugin.c:413
+#: ../plugins/docinfo/gedit-docinfo-plugin.c:424
 msgid "Get statistic info on current document"
 msgstr "Cyrchu ystadegau ynghylch y ddogfen gyfredol"
 
@@ -2584,207 +2232,200 @@ msgstr "Rhedeg gorchmynion allanol a sgriptiau'r plisgyn."
 msgid "External Tools"
 msgstr "Offer Allanol"
 
-#: ../plugins/externaltools/tools/__init__.py:129
+#: ../plugins/externaltools/tools/__init__.py:172
 #, fuzzy
-msgid "_External Tools..."
+msgid "Manage _External Tools..."
 msgstr "Offer Allanol"
 
-#: ../plugins/externaltools/tools/__init__.py:131
+#: ../plugins/externaltools/tools/__init__.py:174
 #, fuzzy
 msgid "Opens the External Tools Manager"
 msgstr "Rheolwr Offer Allanol"
 
-#: ../plugins/externaltools/tools/__init__.py:161
+#: ../plugins/externaltools/tools/__init__.py:178
+msgid "External _Tools"
+msgstr "Offer _Allanol"
+
+#: ../plugins/externaltools/tools/__init__.py:180
+msgid "External tools"
+msgstr "Offer allanol"
+
+#: ../plugins/externaltools/tools/__init__.py:212
 #, fuzzy
 msgid "Shell Output"
 msgstr "_Allbwn:"
 
-#: ../plugins/externaltools/tools/functions.py:109
+#: ../plugins/externaltools/tools/capture.py:94
+#, fuzzy, python-format
+msgid "Could not execute command: %s"
+msgstr "Methu adfer y ffeil %s."
+
+#: ../plugins/externaltools/tools/functions.py:157
 msgid "You must be inside a word to run this command"
 msgstr "Rhaid bod o fewn gair cyn rhedeg y gorchymyn hwn"
 
-#: ../plugins/externaltools/tools/functions.py:166
+#: ../plugins/externaltools/tools/functions.py:262
 msgid "Running tool:"
 msgstr "Offer sy'n rhedeg:"
 
-#: ../plugins/externaltools/tools/functions.py:189
+#: ../plugins/externaltools/tools/functions.py:287
 msgid "Done."
 msgstr "Wedi'i wneud."
 
-#: ../plugins/externaltools/tools/functions.py:191
+#: ../plugins/externaltools/tools/functions.py:289
 msgid "Exited"
 msgstr "Wedi Gadael"
 
-#: ../plugins/externaltools/tools/manager.py:41
-msgid "Nothing"
-msgstr "Dim"
+#: ../plugins/externaltools/tools/manager.py:119
+msgid "All languages"
+msgstr "Pob iaith"
+
+#: ../plugins/externaltools/tools/manager.py:522
+#: ../plugins/externaltools/tools/manager.py:526
+#: ../plugins/externaltools/tools/manager.py:842
+#: ../plugins/externaltools/tools/tools.ui.h:2
+msgid "All Languages"
+msgstr "Pob Iaith"
+
+#: ../plugins/externaltools/tools/manager.py:632
+msgid "New tool"
+msgstr "Arf newydd"
+
+#: ../plugins/externaltools/tools/manager.py:760
+#, python-format
+msgid "This accelerator is already bound to %s"
+msgstr "Mae'r cyflymydd hwn eisoes wedi ei rwymo i %s"
+
+#: ../plugins/externaltools/tools/manager.py:809
+msgid "Type a new accelerator, or press Backspace to clear"
+msgstr "Teipiwch gyflymydd newydd, neu bwyso Yn-Ã?l (Backspace) i glirio"
+
+#: ../plugins/externaltools/tools/manager.py:811
+msgid "Type a new accelerator"
+msgstr "Teipiwch gyflymydd newydd"
+
+#: ../plugins/externaltools/tools/outputpanel.py:100
+msgid "Stopped."
+msgstr "Wedi atal."
+
+#: ../plugins/externaltools/tools/tools.ui.h:3
+msgid "All documents"
+msgstr "Pob dogfen"
+
+#: ../plugins/externaltools/tools/tools.ui.h:4
+msgid "All documents except untitled ones"
+msgstr "Pob dogfen ar wahân i'r rhai dideitl"
 
-#: ../plugins/externaltools/tools/manager.py:42
+#: ../plugins/externaltools/tools/tools.ui.h:5
+msgid "Append to current document"
+msgstr "Atodi at y ddogfen bresennol"
+
+#: ../plugins/externaltools/tools/tools.ui.h:6
+msgid "Create new document"
+msgstr "Creu dogfen newydd"
+
+#: ../plugins/externaltools/tools/tools.ui.h:7
 msgid "Current document"
 msgstr "Dogfen bresennol"
 
-#: ../plugins/externaltools/tools/manager.py:43
+#: ../plugins/externaltools/tools/tools.ui.h:8
+msgid "Current line"
+msgstr "Llinell bresennol"
+
+#: ../plugins/externaltools/tools/tools.ui.h:9
 msgid "Current selection"
 msgstr "Dewis presennol"
 
-#: ../plugins/externaltools/tools/manager.py:44
-msgid "Current line"
-msgstr "Llinell bresennol"
+#: ../plugins/externaltools/tools/tools.ui.h:10
+#, fuzzy
+msgid "Current selection (default to document)"
+msgstr "Dewis presennol"
 
-#: ../plugins/externaltools/tools/manager.py:45
+#: ../plugins/externaltools/tools/tools.ui.h:11
 msgid "Current word"
 msgstr "Gair presennol"
 
-#: ../plugins/externaltools/tools/manager.py:48
+#: ../plugins/externaltools/tools/tools.ui.h:12
 #, fuzzy
 msgid "Display in bottom pane"
 msgstr "Dangos Rhifau Llinell"
 
-#: ../plugins/externaltools/tools/manager.py:49
-msgid "Create new document"
-msgstr "Creu dogfen newydd"
-
-#: ../plugins/externaltools/tools/manager.py:50
-msgid "Append to current document"
-msgstr "Atodi at y ddogfen bresennol"
-
-#: ../plugins/externaltools/tools/manager.py:51
-msgid "Replace current document"
-msgstr "Disodli'r ddogfen bresennol"
-
-#: ../plugins/externaltools/tools/manager.py:52
-msgid "Replace current selection"
-msgstr "Disodli'r dewis presennol"
+#: ../plugins/externaltools/tools/tools.ui.h:13
+msgid "External Tools Manager"
+msgstr "Rheolwr Offer Allanol"
 
-#: ../plugins/externaltools/tools/manager.py:53
+#: ../plugins/externaltools/tools/tools.ui.h:14
 msgid "Insert at cursor position"
 msgstr "Mewnosod ar safle'r cyrchwr"
 
-#: ../plugins/externaltools/tools/manager.py:56
-msgid "All documents"
-msgstr "Pob dogfen"
-
-#: ../plugins/externaltools/tools/manager.py:57
-msgid "All documents except untitled ones"
-msgstr "Pob dogfen ar wahân i'r rhai dideitl"
-
-#: ../plugins/externaltools/tools/manager.py:58
+#: ../plugins/externaltools/tools/tools.ui.h:15
 msgid "Local files only"
 msgstr "Ffeiliau lleol yn unig"
 
-#: ../plugins/externaltools/tools/manager.py:59
+#: ../plugins/externaltools/tools/tools.ui.h:16
+msgid "Nothing"
+msgstr "Dim"
+
+#: ../plugins/externaltools/tools/tools.ui.h:17
 msgid "Remote files only"
 msgstr "Ffeiliau pell yn unig"
 
-#: ../plugins/externaltools/tools/manager.py:60
-msgid "Untitled documents only"
-msgstr "Dogfennau dideitl yn unig"
-
-#: ../plugins/externaltools/tools/manager.py:200
-#: ../plugins/externaltools/tools/manager.py:230
-#: ../plugins/externaltools/tools/manager.py:278
-#, python-format
-msgid "Edit tool <i>%s</i>:"
-msgstr "Arf golygu <i>%s</i>:"
-
-#: ../plugins/externaltools/tools/manager.py:204
-msgid "A Brand New Tool"
-msgstr "Arf newydd sbon"
-
-#: ../plugins/externaltools/tools/manager.py:239
-msgid "New tool"
-msgstr "Arf newydd"
-
-#: ../plugins/externaltools/tools/manager.py:314
-#, python-format
-msgid "This accelerator is already bound to %s"
-msgstr "Mae'r cyflymydd hwn eisoes wedi ei rwymo i %s"
-
-#: ../plugins/externaltools/tools/manager.py:360
-msgid "Type a new accelerator, or press Backspace to clear"
-msgstr "Teipiwch gyflymydd newydd, neu bwyso Yn-Ã?l (Backspace) i glirio"
-
-#: ../plugins/externaltools/tools/manager.py:362
-msgid "Type a new accelerator"
-msgstr "Teipiwch gyflymydd newydd"
-
-#: ../plugins/externaltools/tools/outputpanel.py:78
-msgid "Stopped."
-msgstr "Wedi atal."
-
-#: ../plugins/externaltools/tools/tools.glade.h:2
-msgid "Co_mmand(s):"
-msgstr "_Gorchymyn/gorchmynion:"
-
-#: ../plugins/externaltools/tools/tools.glade.h:3
-msgid "Edit tool <i>make</i>:"
-msgstr "Arf golygu <i>make</i>:"
+#: ../plugins/externaltools/tools/tools.ui.h:18
+msgid "Replace current document"
+msgstr "Disodli'r ddogfen bresennol"
 
-#: ../plugins/externaltools/tools/tools.glade.h:4
-msgid "External Tools Manager"
-msgstr "Rheolwr Offer Allanol"
+#: ../plugins/externaltools/tools/tools.ui.h:19
+msgid "Replace current selection"
+msgstr "Disodli'r dewis presennol"
 
-#: ../plugins/externaltools/tools/tools.glade.h:5
-msgid ""
-"Nothing\n"
-"Current document\n"
-"All documents"
-msgstr ""
-"Dim\n"
-"Y ddogfen bresennol\n"
-"Pob dogfen"
+#: ../plugins/externaltools/tools/tools.ui.h:20
+msgid "Untitled documents only"
+msgstr "Dogfennau dideitl yn unig"
 
-#: ../plugins/externaltools/tools/tools.glade.h:8
+#: ../plugins/externaltools/tools/tools.ui.h:21
 msgid "_Applicability:"
 msgstr "_Cymhwysedd:"
 
-#: ../plugins/externaltools/tools/tools.glade.h:9
-msgid "_Description:"
-msgstr "_Disgrifiad:"
+#: ../plugins/externaltools/tools/tools.ui.h:22
+#: ../plugins/snippets/snippets/snippets.ui.h:12
+msgid "_Edit:"
+msgstr "_Golygu:"
 
-#: ../plugins/externaltools/tools/tools.glade.h:10
+#: ../plugins/externaltools/tools/tools.ui.h:23
 msgid "_Input:"
 msgstr "_Mewnbwn:"
 
-#: ../plugins/externaltools/tools/tools.glade.h:11
+#: ../plugins/externaltools/tools/tools.ui.h:24
 msgid "_Output:"
 msgstr "_Allbwn:"
 
-#: ../plugins/externaltools/tools/tools.glade.h:12
+#: ../plugins/externaltools/tools/tools.ui.h:25
 msgid "_Save:"
 msgstr "_Cadw:"
 
-#: ../plugins/externaltools/tools/tools.glade.h:13
+#: ../plugins/externaltools/tools/tools.ui.h:26
 msgid "_Shortcut Key:"
 msgstr ""
 
-#: ../plugins/externaltools/tools/tools.glade.h:14
+#: ../plugins/externaltools/tools/tools.ui.h:27
 msgid "_Tools:"
 msgstr "_Offer:"
 
-#: ../plugins/externaltools/tools/tools.glade.h:15
-msgid "gtk-revert-to-saved"
-msgstr ""
-
 #: ../plugins/externaltools/data/build.desktop.in.h:1
-#, fuzzy
 msgid "Build"
-msgstr "Trwm"
+msgstr "Adeiladu"
 
 #: ../plugins/externaltools/data/build.desktop.in.h:2
-#, fuzzy
 msgid "Run \"make\" in the document directory"
-msgstr "Rhedeg â??makeâ?? yng nghyfeiriadur y ddogfen"
+msgstr "Rhedeg \"make\" yng nghyfeiriadur y ddogfen"
 
 #: ../plugins/externaltools/data/open-terminal-here.desktop.in.h:1
-#, fuzzy
 msgid "Open a terminal in the document location"
-msgstr "Agor terfynell ar gyfer y cyfeiriadur sydd ar agor ar hyn o bryd"
+msgstr "Agor terfynell yn lleoliad y ddogfen"
 
 #: ../plugins/externaltools/data/open-terminal-here.desktop.in.h:2
-#, fuzzy
 msgid "Open terminal here"
-msgstr "_Agor terfynell fan hyn"
+msgstr "Agor terfynell fan hyn"
 
 #: ../plugins/externaltools/data/remove-trailing-spaces.desktop.in.h:1
 #, fuzzy
@@ -2812,16 +2453,9 @@ msgstr "Mynediad hwylus at ffeiliau o'r panel ochr"
 msgid "File Browser Pane"
 msgstr "Cwarel porwr ffeiliau"
 
-#. Translators: this is used in "file on host", e.g. "/foo/bar on ftp.baz.org"
-#: ../plugins/filebrowser/gedit-file-bookmarks-store.c:195
-#, fuzzy
-msgid "on"
-msgstr "Dim"
-
-#: ../plugins/filebrowser/gedit-file-bookmarks-store.c:330
-#, fuzzy
+#: ../plugins/filebrowser/gedit-file-bookmarks-store.c:235
 msgid "File System"
-msgstr "Ffeil: %s"
+msgstr "System Ffeiliau"
 
 #. ex:ts=8:noet:
 #: ../plugins/filebrowser/gedit-file-browser.schemas.in.h:1
@@ -2845,28 +2479,16 @@ msgid "File Browser Virtual Root Directory"
 msgstr "Rhith-Gyfeiriadur Gwraidd y Porwr Ffeiliau"
 
 #: ../plugins/filebrowser/gedit-file-browser.schemas.in.h:6
-msgid ""
-"If TRUE the file browser plugin will view the directory of the first opened "
-"document given that the file browser hasn't been used yet. (Thus this "
-"generally applies to opening a document from the command line or opening it "
-"with nautilus etc)"
-msgstr ""
-"Os yn WIR, bydd yr ategyn porwr ffeiliau yn dangos cyfeiriadur y ddogfen "
-"gyntaf a agorwyd, gan nad yw'r porwr ffeiliau wedi ei ddefnyddio eto. (Fe "
-"fydd hyn, felly, yn fwyaf perthnasol wrth agor dogfen o'r llinell orchymyn, "
-"neu ei agor gyda nautilus a.y.b.)"
+msgid "If TRUE the file browser plugin will view the directory of the first opened document given that the file browser hasn't been used yet. (Thus this generally applies to opening a document from the command line or opening it with nautilus etc)"
+msgstr "Os yn WIR, bydd yr ategyn porwr ffeiliau yn dangos cyfeiriadur y ddogfen gyntaf a agorwyd, gan nad yw'r porwr ffeiliau wedi ei ddefnyddio eto. (Fe fydd hyn, felly, yn fwyaf perthnasol wrth agor dogfen o'r llinell orchymyn, neu ei agor gyda nautilus a.y.b.)"
 
 #: ../plugins/filebrowser/gedit-file-browser.schemas.in.h:7
 msgid "Open With Tree View"
 msgstr "Agor yn yr Olwg Coeden"
 
 #: ../plugins/filebrowser/gedit-file-browser.schemas.in.h:8
-msgid ""
-"Open the tree view when the file browser plugin gets loaded instead of the "
-"bookmarks view"
-msgstr ""
-"Agor yn yr olwg coeden, yn hytrach na'r olwg llyfrnodau, wrth lwytho'r "
-"ategyn porwr ffeiliau"
+msgid "Open the tree view when the file browser plugin gets loaded instead of the bookmarks view"
+msgstr "Agor yn yr olwg coeden, yn hytrach na'r olwg llyfrnodau, wrth lwytho'r ategyn porwr ffeiliau"
 
 #: ../plugins/filebrowser/gedit-file-browser.schemas.in.h:9
 msgid "Set Location To First Document"
@@ -2877,96 +2499,74 @@ msgid "Sets whether to enable restoring of remote locations."
 msgstr "Gosod a ddylid galluogi adfer lleoliadau pell."
 
 #: ../plugins/filebrowser/gedit-file-browser.schemas.in.h:11
-msgid ""
-"The file browser root directory to use when loading the file browser plugin "
-"and onload/tree_view is TRUE."
-msgstr ""
-"Y cyfeiriadur gwraidd i'w ddefnyddio wrth lwytho'r porwr ffeiliau os yw "
-"onload/tree_view yn WIR."
+msgid "The file browser root directory to use when loading the file browser plugin and onload/tree_view is TRUE."
+msgstr "Y cyfeiriadur gwraidd i'w ddefnyddio wrth lwytho'r porwr ffeiliau os yw onload/tree_view yn WIR."
 
 #: ../plugins/filebrowser/gedit-file-browser.schemas.in.h:12
-msgid ""
-"The file browser virtual root directory to use when loading the file browser "
-"plugin when onload/tree_view is TRUE. The virtual root must always be below "
-"the actual root."
-msgstr ""
-"Y rhith-gyfeiriadur gwraidd i'w ddefnyddio wrth lwytho'r porwr ffeiliau os "
-"yw onload/tree_view yn WIR. Rhaid i'r rhith-gyfeiriadur gwraidd fod bob "
-"amser islaw'r cyfeiriadur gwraidd go iawn."
+msgid "The file browser virtual root directory to use when loading the file browser plugin when onload/tree_view is TRUE. The virtual root must always be below the actual root."
+msgstr "Y rhith-gyfeiriadur gwraidd i'w ddefnyddio wrth lwytho'r porwr ffeiliau os yw onload/tree_view yn WIR. Rhaid i'r rhith-gyfeiriadur gwraidd fod bob amser islaw'r cyfeiriadur gwraidd go iawn."
 
 #: ../plugins/filebrowser/gedit-file-browser.schemas.in.h:13
-msgid ""
-"The filter pattern to filter the file browser with. This filter works on top "
-"of the filter_mode."
-msgstr ""
-"Y patrwm hidlo i'w ddefnyddio i hidlo'r porwr ffeiliau. Mae'r hidlydd hwn yn "
-"gweithio ar ben y modd hidlo."
+msgid "The filter pattern to filter the file browser with. This filter works on top of the filter_mode."
+msgstr "Y patrwm hidlo i'w ddefnyddio i hidlo'r porwr ffeiliau. Mae'r hidlydd hwn yn gweithio ar ben y modd hidlo."
 
 #: ../plugins/filebrowser/gedit-file-browser.schemas.in.h:14
-msgid ""
-"This value determines what files get filtered from the file browser. Valid "
-"values are: none (filter nothing), hidden (filter hidden files), binary "
-"(filter binary files) and hidden_and_binary (filter both hidden and binary "
-"files)."
-msgstr ""
-"Mae'r gwerth hwn yn penderfynu pa ffeiliau sy'n cael eu hidlo i ffwrdd o'r "
-"porwr ffeiliau. Y gwerthoedd dilys yw dim (peidio â hidlo dim), cudd (hidlo "
-"ffeiliau cudd), deuaidd (hidlo ffeiliau deuaidd), cudd_a_deuaidd (hidlo "
-"ffeiliau cudd a ffeiliau deuaidd)."
+msgid "This value determines what files get filtered from the file browser. Valid values are: none (filter nothing), hidden (filter hidden files), binary (filter binary files) and hidden_and_binary (filter both hidden and binary files)."
+msgstr "Mae'r gwerth hwn yn penderfynu pa ffeiliau sy'n cael eu hidlo i ffwrdd o'r porwr ffeiliau. Y gwerthoedd dilys yw dim (peidio â hidlo dim), cudd (hidlo ffeiliau cudd), deuaidd (hidlo ffeiliau deuaidd), cudd_a_deuaidd (hidlo ffeiliau cudd a ffeiliau deuaidd)."
 
-#: ../plugins/filebrowser/gedit-file-browser-plugin.c:598
+#: ../plugins/filebrowser/gedit-file-browser-plugin.c:592
 msgid "_Set root to active document"
 msgstr "_Gosod y ddogfen bresennol fel gwraidd"
 
-#: ../plugins/filebrowser/gedit-file-browser-plugin.c:600
+#: ../plugins/filebrowser/gedit-file-browser-plugin.c:594
 msgid "Set the root to the active document location"
 msgstr "Gosod lleoliad y ddogfen sydd ar waith ar hyn o bryd fel y gwraidd"
 
-#: ../plugins/filebrowser/gedit-file-browser-plugin.c:605
+#: ../plugins/filebrowser/gedit-file-browser-plugin.c:599
 msgid "_Open terminal here"
 msgstr "_Agor terfynell fan hyn"
 
-#: ../plugins/filebrowser/gedit-file-browser-plugin.c:607
+#: ../plugins/filebrowser/gedit-file-browser-plugin.c:601
 msgid "Open a terminal at the currently opened directory"
 msgstr "Agor terfynell ar gyfer y cyfeiriadur sydd ar agor ar hyn o bryd"
 
-#: ../plugins/filebrowser/gedit-file-browser-plugin.c:741
+#: ../plugins/filebrowser/gedit-file-browser-plugin.c:737
 msgid "File Browser"
 msgstr "Porwr Ffeiliau"
 
-#: ../plugins/filebrowser/gedit-file-browser-plugin.c:864
+#: ../plugins/filebrowser/gedit-file-browser-plugin.c:868
 msgid "An error occurred while creating a new directory"
 msgstr "Digwyddodd gwall wrth greu cyfeiriadur newydd"
 
-#: ../plugins/filebrowser/gedit-file-browser-plugin.c:867
+#: ../plugins/filebrowser/gedit-file-browser-plugin.c:871
 msgid "An error occurred while creating a new file"
 msgstr "Digwyddodd gwall wrth greu ffeil newydd"
 
-#: ../plugins/filebrowser/gedit-file-browser-plugin.c:872
+#: ../plugins/filebrowser/gedit-file-browser-plugin.c:876
 msgid "An error occurred while renaming a file or directory"
 msgstr "Digwyddodd gwall wrth ail-enwi ffeil neu gyfeiriadur"
 
-#: ../plugins/filebrowser/gedit-file-browser-plugin.c:877
+#: ../plugins/filebrowser/gedit-file-browser-plugin.c:881
 msgid "An error occurred while deleting a file or directory"
 msgstr "Digwyddodd gwall wrth ddileu ffeil neu gyfeiriadur"
 
-#: ../plugins/filebrowser/gedit-file-browser-plugin.c:882
+#: ../plugins/filebrowser/gedit-file-browser-plugin.c:886
 msgid "An error occurred while opening a directory in the file manager"
 msgstr "Digwyddodd gwall wrth agor cyfeiriadur o fewn y rheolwr ffeiliau"
 
-#: ../plugins/filebrowser/gedit-file-browser-plugin.c:886
+#: ../plugins/filebrowser/gedit-file-browser-plugin.c:890
 msgid "An error occurred while setting a root directory"
 msgstr "Digwyddodd gwall wrth osod cyfeiriadur gwraidd"
 
-#: ../plugins/filebrowser/gedit-file-browser-plugin.c:890
+#: ../plugins/filebrowser/gedit-file-browser-plugin.c:894
 msgid "An error occurred while loading a directory"
 msgstr "Digwyddodd gwall wrth lwytho cyfeiriadur"
 
-#: ../plugins/filebrowser/gedit-file-browser-plugin.c:893
+#: ../plugins/filebrowser/gedit-file-browser-plugin.c:897
 msgid "An error occurred"
 msgstr "Digwyddodd gwall"
 
-#: ../plugins/filebrowser/gedit-file-browser-plugin.c:1123
+#: ../plugins/filebrowser/gedit-file-browser-plugin.c:1192
 #, fuzzy
 msgid ""
 "Cannot move file to trash, do you\n"
@@ -2975,210 +2575,217 @@ msgstr ""
 "Methu symud ffeil i'r sbwriel, ydych\n"
 "chi am ei dileu yn syth?"
 
-#: ../plugins/filebrowser/gedit-file-browser-plugin.c:1127
+#: ../plugins/filebrowser/gedit-file-browser-plugin.c:1196
 #, c-format
 msgid "The file \"%s\" cannot be moved to the trash."
 msgstr "Methu symud y ffeil \"%s\" i'r sbwriel."
 
-#: ../plugins/filebrowser/gedit-file-browser-plugin.c:1130
+#: ../plugins/filebrowser/gedit-file-browser-plugin.c:1199
 #, fuzzy
 msgid "The selected files cannot be moved to the trash."
 msgstr "Methu symud y ffeil \"%s\" i'r sbwriel."
 
-#: ../plugins/filebrowser/gedit-file-browser-plugin.c:1163
+#: ../plugins/filebrowser/gedit-file-browser-plugin.c:1232
 #, fuzzy, c-format
 msgid "Are you sure you want to permanently delete \"%s\"?"
 msgstr ""
 "Ydych chi'n siŵr eich bod\n"
 "am ddileu \"%s\" yn barhaol?"
 
-#: ../plugins/filebrowser/gedit-file-browser-plugin.c:1166
+#: ../plugins/filebrowser/gedit-file-browser-plugin.c:1235
 #, fuzzy
 msgid "Are you sure you want to permanently delete the selected files?"
 msgstr ""
 "Ydych chi'n siŵr eich bod\n"
 "am ddileu \"%s\" yn barhaol?"
 
-#: ../plugins/filebrowser/gedit-file-browser-plugin.c:1169
+#: ../plugins/filebrowser/gedit-file-browser-plugin.c:1238
 #, fuzzy
 msgid "If you delete an item, it is permanently lost."
 msgstr "Unwaith i chi ddileu eitem, fe'i collir am byth."
 
-#: ../plugins/filebrowser/gedit-file-browser-store.c:1591
-#, fuzzy
+#: ../plugins/filebrowser/gedit-file-browser-store.c:1664
 msgid "(Empty)"
-msgstr "Gwag"
+msgstr "(Gwag)"
 
-#: ../plugins/filebrowser/gedit-file-browser-store.c:2731
-#: ../plugins/filebrowser/gedit-file-browser-widget.c:1838
-msgid "Invalid uri"
-msgstr "uri annilys"
+#: ../plugins/filebrowser/gedit-file-browser-store.c:3298
+#, fuzzy
+msgid "The renamed file is currently filtered out. You need to adjust your filter settings to make the file visible"
+msgstr "Mae'r ffeil newydd wedi ei hidlo allan ar hyn o bryd. Rhaid i chi newid gosodiadau'r hidlydd er mwyn gweld y ffeil"
 
-#: ../plugins/filebrowser/gedit-file-browser-store.c:3163
+#: ../plugins/filebrowser/gedit-file-browser-store.c:3536
 msgid "file"
 msgstr "ffeil"
 
-#: ../plugins/filebrowser/gedit-file-browser-store.c:3184
-#: ../plugins/filebrowser/gedit-file-browser-store.c:3231
-msgid ""
-"The new file is currently filtered out. You need to adjust your filter "
-"settings to make the file visible"
-msgstr ""
-"Mae'r ffeil newydd wedi ei hidlo allan ar hyn o bryd. Rhaid i chi newid "
-"gosodiadau'r hidlydd er mwyn gweld y ffeil"
+#: ../plugins/filebrowser/gedit-file-browser-store.c:3560
+msgid "The new file is currently filtered out. You need to adjust your filter settings to make the file visible"
+msgstr "Mae'r ffeil newydd wedi ei hidlo allan ar hyn o bryd. Rhaid i chi newid gosodiadau'r hidlydd er mwyn gweld y ffeil"
 
-#: ../plugins/filebrowser/gedit-file-browser-store.c:3212
+#: ../plugins/filebrowser/gedit-file-browser-store.c:3588
 msgid "directory"
 msgstr "cyfeiriadur"
 
-#: ../plugins/filebrowser/gedit-file-browser-widget.c:736
+#: ../plugins/filebrowser/gedit-file-browser-store.c:3608
+#, fuzzy
+msgid "The new directory is currently filtered out. You need to adjust your filter settings to make the directory visible"
+msgstr "Mae'r ffeil newydd wedi ei hidlo allan ar hyn o bryd. Rhaid i chi newid gosodiadau'r hidlydd er mwyn gweld y ffeil"
+
+#: ../plugins/filebrowser/gedit-file-browser-widget.c:698
 msgid "Bookmarks"
 msgstr "Llyfrnodau"
 
-#: ../plugins/filebrowser/gedit-file-browser-widget.c:746
-#, fuzzy
-msgid "Recent Files"
-msgstr "Uchafswm Ffeiliau Diweddar"
-
-#: ../plugins/filebrowser/gedit-file-browser-widget.c:825
-#, fuzzy
+#: ../plugins/filebrowser/gedit-file-browser-widget.c:779
 msgid "_Filter"
-msgstr "_Ffeil"
+msgstr "_Hidlydd"
 
-#: ../plugins/filebrowser/gedit-file-browser-widget.c:830
+#: ../plugins/filebrowser/gedit-file-browser-widget.c:784
 msgid "_Move To Trash"
 msgstr "_Symud i'r Sbwriel"
 
-#: ../plugins/filebrowser/gedit-file-browser-widget.c:831
+#: ../plugins/filebrowser/gedit-file-browser-widget.c:785
 #, fuzzy
 msgid "Move selected file or folder to trash"
 msgstr "Symud y ffeil neu'r cyfeiriadur a ddewiswyd i'r sbwriel"
 
-#: ../plugins/filebrowser/gedit-file-browser-widget.c:833
+#: ../plugins/filebrowser/gedit-file-browser-widget.c:787
 msgid "_Delete"
 msgstr "_Dileu"
 
-#: ../plugins/filebrowser/gedit-file-browser-widget.c:834
+#: ../plugins/filebrowser/gedit-file-browser-widget.c:788
 #, fuzzy
 msgid "Delete selected file or folder"
 msgstr "Dileu'r ffeil neu'r cyfeiriadur a ddewiswyd"
 
-#: ../plugins/filebrowser/gedit-file-browser-widget.c:840
+#: ../plugins/filebrowser/gedit-file-browser-widget.c:794
 msgid "Up"
 msgstr ""
 
-#: ../plugins/filebrowser/gedit-file-browser-widget.c:841
+#: ../plugins/filebrowser/gedit-file-browser-widget.c:795
 #, fuzzy
 msgid "Open the parent folder"
 msgstr "Arbed y ffeil cyfredol"
 
-#: ../plugins/filebrowser/gedit-file-browser-widget.c:846
-#, fuzzy
+#: ../plugins/filebrowser/gedit-file-browser-widget.c:800
 msgid "_New Folder"
-msgstr "Ffeil _Newydd"
+msgstr "Plygell _Newydd"
 
-#: ../plugins/filebrowser/gedit-file-browser-widget.c:847
+#: ../plugins/filebrowser/gedit-file-browser-widget.c:801
 #, fuzzy
 msgid "Add new empty folder"
 msgstr "Ychwanegu ffeil wag newydd"
 
-#: ../plugins/filebrowser/gedit-file-browser-widget.c:849
+#: ../plugins/filebrowser/gedit-file-browser-widget.c:803
 msgid "New F_ile"
 msgstr "Ffeil _Newydd"
 
-#: ../plugins/filebrowser/gedit-file-browser-widget.c:850
+#: ../plugins/filebrowser/gedit-file-browser-widget.c:804
 msgid "Add new empty file"
 msgstr "Ychwanegu ffeil wag newydd"
 
-#: ../plugins/filebrowser/gedit-file-browser-widget.c:855
+#: ../plugins/filebrowser/gedit-file-browser-widget.c:809
 msgid "_Rename"
 msgstr "_Ailenwi"
 
-#: ../plugins/filebrowser/gedit-file-browser-widget.c:856
+#: ../plugins/filebrowser/gedit-file-browser-widget.c:810
 #, fuzzy
 msgid "Rename selected file or folder"
 msgstr "Ailenwi'r ffeil neu'r cyfeiriadur a ddewiswyd"
 
-#: ../plugins/filebrowser/gedit-file-browser-widget.c:862
+#: ../plugins/filebrowser/gedit-file-browser-widget.c:816
 msgid "_Previous Location"
 msgstr "_Lleoliad Blaenorol"
 
-#: ../plugins/filebrowser/gedit-file-browser-widget.c:864
+#: ../plugins/filebrowser/gedit-file-browser-widget.c:818
 #, fuzzy
 msgid "Go to the previous visited location"
 msgstr "Mynd i'r lleoliad blaenorol"
 
-#: ../plugins/filebrowser/gedit-file-browser-widget.c:866
+#: ../plugins/filebrowser/gedit-file-browser-widget.c:820
 msgid "_Next Location"
 msgstr "_Lleoliad nesaf"
 
-#: ../plugins/filebrowser/gedit-file-browser-widget.c:867
+#: ../plugins/filebrowser/gedit-file-browser-widget.c:821
 #, fuzzy
 msgid "Go to the next visited location"
 msgstr "Mynd i'r lleoliad nesaf"
 
-#: ../plugins/filebrowser/gedit-file-browser-widget.c:868
+#: ../plugins/filebrowser/gedit-file-browser-widget.c:822
 msgid "Re_fresh View"
 msgstr "Ad_newyddu'r Olwg"
 
-#: ../plugins/filebrowser/gedit-file-browser-widget.c:869
+#: ../plugins/filebrowser/gedit-file-browser-widget.c:823
 msgid "Refresh the view"
 msgstr "Adnewyddu'r olwg"
 
-#: ../plugins/filebrowser/gedit-file-browser-widget.c:870
+#: ../plugins/filebrowser/gedit-file-browser-widget.c:824
 msgid "_View Folder"
 msgstr ""
 
-#: ../plugins/filebrowser/gedit-file-browser-widget.c:871
+#: ../plugins/filebrowser/gedit-file-browser-widget.c:825
 #, fuzzy
 msgid "View folder in file manager"
 msgstr "Gweld y cyfeiriadur yn y rheolwr ffeiliau"
 
-#: ../plugins/filebrowser/gedit-file-browser-widget.c:878
+#: ../plugins/filebrowser/gedit-file-browser-widget.c:832
 msgid "Show _Hidden"
 msgstr "Dangos _Cudd"
 
-#: ../plugins/filebrowser/gedit-file-browser-widget.c:879
+#: ../plugins/filebrowser/gedit-file-browser-widget.c:833
 #, fuzzy
 msgid "Show hidden files and folders"
 msgstr "Dangos ffeiliau a chyfeiriaduron cudd"
 
-#: ../plugins/filebrowser/gedit-file-browser-widget.c:881
+#: ../plugins/filebrowser/gedit-file-browser-widget.c:835
 msgid "Show _Binary"
 msgstr "Dangos _Deuaidd"
 
-#: ../plugins/filebrowser/gedit-file-browser-widget.c:882
+#: ../plugins/filebrowser/gedit-file-browser-widget.c:836
 msgid "Show binary files"
 msgstr "Dangos ffeiliau deuaidd"
 
-#: ../plugins/filebrowser/gedit-file-browser-widget.c:987
-#: ../plugins/filebrowser/gedit-file-browser-widget.c:1003
-#: ../plugins/filebrowser/gedit-file-browser-widget.c:1035
+#: ../plugins/filebrowser/gedit-file-browser-widget.c:944
+#: ../plugins/filebrowser/gedit-file-browser-widget.c:953
+#: ../plugins/filebrowser/gedit-file-browser-widget.c:974
 msgid "Previous location"
 msgstr "Lleoliad blaenorol"
 
-#: ../plugins/filebrowser/gedit-file-browser-widget.c:991
+#: ../plugins/filebrowser/gedit-file-browser-widget.c:946
 msgid "Go to previous location"
 msgstr "Mynd i'r lleoliad blaenorol"
 
-#: ../plugins/filebrowser/gedit-file-browser-widget.c:996
-#: ../plugins/filebrowser/gedit-file-browser-widget.c:1028
+#: ../plugins/filebrowser/gedit-file-browser-widget.c:948
+#: ../plugins/filebrowser/gedit-file-browser-widget.c:969
 msgid "Go to a previously opened location"
 msgstr "Mynd i leoliad a agorwyd eisoes"
 
-#: ../plugins/filebrowser/gedit-file-browser-widget.c:1018
+#: ../plugins/filebrowser/gedit-file-browser-widget.c:965
 msgid "Next location"
 msgstr "Lleoliad nesaf"
 
-#: ../plugins/filebrowser/gedit-file-browser-widget.c:1022
+#: ../plugins/filebrowser/gedit-file-browser-widget.c:967
 msgid "Go to next location"
 msgstr "Mynd i'r lleoliad nesaf"
 
-#: ../plugins/filebrowser/gedit-file-browser-widget.c:1199
+#: ../plugins/filebrowser/gedit-file-browser-widget.c:1178
 #, fuzzy
 msgid "_Match Filename"
 msgstr "_Cydweddu prif lythrennedd"
 
+#: ../plugins/filebrowser/gedit-file-browser-widget.c:2044
+#, c-format
+msgid "No mount object for mounted volume: %s"
+msgstr ""
+
+#: ../plugins/filebrowser/gedit-file-browser-widget.c:2124
+#, c-format
+msgid "Could not open media: %s"
+msgstr "Methu agor cyfrwng: %s"
+
+#: ../plugins/filebrowser/gedit-file-browser-widget.c:2171
+#, fuzzy, c-format
+msgid "Could not mount volume: %s"
+msgstr "Methu agor y ffeil %s."
+
 #: ../plugins/indent/gedit-indent-plugin.c:56
 msgid "_Indent"
 msgstr "_Mewnoliad"
@@ -3196,9 +2803,8 @@ msgid "Unindent selected lines"
 msgstr "Datfewnoli y llinellau a ddewiswyd"
 
 #: ../plugins/indent/indent.gedit-plugin.desktop.in.h:1
-#, fuzzy
 msgid "Indent Lines"
-msgstr "Mewnoli llinellau"
+msgstr "Mewnoli Llinellau"
 
 #: ../plugins/indent/indent.gedit-plugin.desktop.in.h:2
 msgid "Indents or un-indents selected lines."
@@ -3217,25 +2823,37 @@ msgid "Interactive python console standing in the bottom panel"
 msgstr "Consol Python rhyngweithiol yn aros yn y panel gwaelod."
 
 #: ../plugins/pythonconsole/pythonconsole.gedit-plugin.desktop.in.h:2
-#: ../plugins/pythonconsole/pythonconsole/__init__.py:45
+#: ../plugins/pythonconsole/pythonconsole/__init__.py:49
 msgid "Python Console"
 msgstr "Consol Python"
 
-#: ../plugins/sample/gedit-sample-plugin.c:63
-msgid "Insert User Na_me"
-msgstr "Mewnosod _Enw Cyfrif"
+#. ex:et:ts=4:
+#: ../plugins/pythonconsole/pythonconsole/config.ui.h:1
+#, fuzzy
+msgid "C_ommand color:"
+msgstr "Lliw _cefndir:"
 
-#: ../plugins/sample/gedit-sample-plugin.c:65
-msgid "Insert the user name at the cursor position"
-msgstr "Mewnosod yr enw cyfrif ger safle'r cyrchydd"
+#: ../plugins/pythonconsole/pythonconsole/config.ui.h:2
+msgid "_Error color:"
+msgstr "Lliw _gwall:"
 
-#: ../plugins/sample/sample.gedit-plugin.desktop.in.h:1
-msgid "Inserts the user name at the cursor position."
-msgstr "Mewnosodir yr enw cyfrif ger safle'r cyrchydd."
+#. ex:ts=8:et:
+#: ../plugins/quickopen/quickopen/popup.py:34
+#: ../plugins/quickopen/quickopen.gedit-plugin.desktop.in.h:1
+msgid "Quick Open"
+msgstr ""
+
+#: ../plugins/quickopen/quickopen/windowhelper.py:68
+msgid "Quick open"
+msgstr ""
+
+#: ../plugins/quickopen/quickopen/windowhelper.py:69
+msgid "Quickly open documents"
+msgstr "Agor dogfennau'n gyflym"
 
-#: ../plugins/sample/sample.gedit-plugin.desktop.in.h:2
-msgid "User name"
-msgstr "Enw cyfrif"
+#: ../plugins/quickopen/quickopen.gedit-plugin.desktop.in.h:2
+msgid "Quickly open files"
+msgstr "Agor ffeiliau'n gyflym"
 
 #: ../plugins/snippets/snippets.gedit-plugin.desktop.in.h:1
 msgid "Insert often used pieces of text in a fast way"
@@ -3245,65 +2863,60 @@ msgstr "Ffordd chwim i fewnosod darnau o destun a ddefnyddir yn aml"
 msgid "Snippets"
 msgstr "Tameidiau"
 
-#: ../plugins/snippets/snippets/snippets.glade.h:2
+#: ../plugins/snippets/snippets/snippets.ui.h:2
 msgid "<b>Activation</b>"
 msgstr "<b>Rhoi ar Waith</b>"
 
-#: ../plugins/snippets/snippets/snippets.glade.h:3
+#: ../plugins/snippets/snippets/snippets.ui.h:3
 #, fuzzy
 msgid "Create new snippet"
 msgstr "Creu dogfen newydd"
 
-#: ../plugins/snippets/snippets/snippets.glade.h:4
-#: ../plugins/snippets/snippets/Manager.py:428
+#: ../plugins/snippets/snippets/snippets.ui.h:4
+#: ../plugins/snippets/snippets/Manager.py:420
 #, fuzzy
 msgid "Delete selected snippet"
 msgstr "Dileu'r testun a ddewiswyd"
 
-#: ../plugins/snippets/snippets/snippets.glade.h:5
+#: ../plugins/snippets/snippets/snippets.ui.h:5
 #, fuzzy
 msgid "Export selected snippets"
 msgstr "Mewnoli'r llinellau a ddewiswyd"
 
-#: ../plugins/snippets/snippets/snippets.glade.h:6
-#: ../plugins/snippets/snippets/Manager.py:806
+#: ../plugins/snippets/snippets/snippets.ui.h:6
+#: ../plugins/snippets/snippets/Manager.py:808
 #, fuzzy
 msgid "Import snippets"
 msgstr "_Golygu tamaid:"
 
-#: ../plugins/snippets/snippets/snippets.glade.h:7
+#: ../plugins/snippets/snippets/snippets.ui.h:7
 msgid "S_hortcut key:"
 msgstr ""
 
-#: ../plugins/snippets/snippets/snippets.glade.h:8
+#: ../plugins/snippets/snippets/snippets.ui.h:8
 msgid "Shortcut key with which the snippet is activated"
 msgstr ""
 
-#: ../plugins/snippets/snippets/snippets.glade.h:9
+#. self['hbox_tab_trigger'].set_spacing(0)
+#: ../plugins/snippets/snippets/snippets.ui.h:9
 #: ../plugins/snippets/snippets/Manager.py:697
 msgid "Single word with which the snippet is activated after pressing tab"
 msgstr ""
 
-#: ../plugins/snippets/snippets/snippets.glade.h:10
+#: ../plugins/snippets/snippets/snippets.ui.h:10
 msgid "Snippets Manager"
 msgstr "Trefnydd Tameidiau"
 
-#: ../plugins/snippets/snippets/snippets.glade.h:11
+#: ../plugins/snippets/snippets/snippets.ui.h:11
 #, fuzzy
 msgid "_Drop targets:"
 msgstr "Targed ffrâm"
 
-#: ../plugins/snippets/snippets/snippets.glade.h:12
-#, fuzzy
-msgid "_Edit:"
-msgstr "_Golygu"
-
-#: ../plugins/snippets/snippets/snippets.glade.h:13
+#: ../plugins/snippets/snippets/snippets.ui.h:13
 msgid "_Snippets:"
 msgstr "_Tameidiau:"
 
-#. "tab" here means the tab key, not the notebook tab!
-#: ../plugins/snippets/snippets/snippets.glade.h:15
+#: ../plugins/snippets/snippets/snippets.ui.h:14
 msgid "_Tab trigger:"
 msgstr "Sbardun _Tab:"
 
@@ -3315,7 +2928,7 @@ msgstr "Rheoli _Tameidiau:"
 msgid "Manage snippets"
 msgstr "Rheoli tameidiau"
 
-#: ../plugins/snippets/snippets/Manager.py:46
+#: ../plugins/snippets/snippets/Manager.py:45
 #, fuzzy
 msgid "Snippets archive"
 msgstr "Trefnydd Tameidiau"
@@ -3328,99 +2941,95 @@ msgstr "Ychwanegu tamaid newydd..."
 msgid "Global"
 msgstr "Eang"
 
-#: ../plugins/snippets/snippets/Manager.py:425
+#: ../plugins/snippets/snippets/Manager.py:417
 #, fuzzy
 msgid "Revert selected snippet"
 msgstr "Dileu'r testun a ddewiswyd"
 
-#: ../plugins/snippets/snippets/Manager.py:692
-msgid ""
-"This is not a valid tab trigger. Triggers can either contain letters or a "
-"single, non alphanumeric, character like {, [, etcetera."
-msgstr ""
-"Nid yw hwn yn sbardun tab dilys. Gall sbardunau gynnwys naill ai llythrennau "
-"neu un nod nad yw'n llythyren na'n rhif, fel {, [, a.y.b."
+#. self['hbox_tab_trigger'].set_spacing(3)
+#: ../plugins/snippets/snippets/Manager.py:690
+msgid "This is not a valid tab trigger. Triggers can either contain letters or a single, non alphanumeric, character like {, [, etcetera."
+msgstr "Nid yw hwn yn sbardun tab dilys. Gall sbardunau gynnwys naill ai llythrennau neu un nod nad yw'n llythyren na'n rhif, fel {, [, a.y.b."
 
-#: ../plugins/snippets/snippets/Manager.py:785
+#: ../plugins/snippets/snippets/Manager.py:787
 #, fuzzy, python-format
 msgid "The following error occurred while importing: %s"
 msgstr "Digwyddodd gwall wrth greu ffeil newydd"
 
-#: ../plugins/snippets/snippets/Manager.py:792
-msgid "Import succesfully completed"
+#: ../plugins/snippets/snippets/Manager.py:794
+msgid "Import successfully completed"
 msgstr ""
 
-#: ../plugins/snippets/snippets/Manager.py:811
-#: ../plugins/snippets/snippets/Manager.py:897
-#: ../plugins/snippets/snippets/Manager.py:960
+#: ../plugins/snippets/snippets/Manager.py:813
+#: ../plugins/snippets/snippets/Manager.py:899
+#: ../plugins/snippets/snippets/Manager.py:962
 #, fuzzy
 msgid "All supported archives"
 msgstr "Rhestr archif, rannir gan fylchau"
 
-#: ../plugins/snippets/snippets/Manager.py:812
-#: ../plugins/snippets/snippets/Manager.py:898
-#: ../plugins/snippets/snippets/Manager.py:961
+#: ../plugins/snippets/snippets/Manager.py:814
+#: ../plugins/snippets/snippets/Manager.py:900
+#: ../plugins/snippets/snippets/Manager.py:963
 msgid "Gzip compressed archive"
 msgstr ""
 
-#: ../plugins/snippets/snippets/Manager.py:813
-#: ../plugins/snippets/snippets/Manager.py:899
-#: ../plugins/snippets/snippets/Manager.py:962
-msgid "Bzip compressed archive"
-msgstr ""
+#: ../plugins/snippets/snippets/Manager.py:815
+#: ../plugins/snippets/snippets/Manager.py:901
+#: ../plugins/snippets/snippets/Manager.py:964
+#, fuzzy
+msgid "Bzip2 compressed archive"
+msgstr "Trefnydd Tameidiau"
 
-#: ../plugins/snippets/snippets/Manager.py:814
+#: ../plugins/snippets/snippets/Manager.py:816
 #, fuzzy
 msgid "Single snippets file"
 msgstr "Rheoli tameidiau"
 
-#: ../plugins/snippets/snippets/Manager.py:815
-#: ../plugins/snippets/snippets/Manager.py:901
-#: ../plugins/snippets/snippets/Manager.py:964
-#, fuzzy
+#: ../plugins/snippets/snippets/Manager.py:817
+#: ../plugins/snippets/snippets/Manager.py:903
+#: ../plugins/snippets/snippets/Manager.py:966
 msgid "All files"
-msgstr "Pob Ffeil"
+msgstr "Pob ffeil"
 
-#: ../plugins/snippets/snippets/Manager.py:827
+#: ../plugins/snippets/snippets/Manager.py:829
 #, fuzzy, python-format
 msgid "The following error occurred while exporting: %s"
 msgstr "Digwyddodd gwall wrth greu ffeil newydd"
 
-#: ../plugins/snippets/snippets/Manager.py:831
-msgid "Export succesfully completed"
+#: ../plugins/snippets/snippets/Manager.py:833
+msgid "Export successfully completed"
 msgstr ""
 
 #. Ask if system snippets should also be exported
-#: ../plugins/snippets/snippets/Manager.py:871
-#: ../plugins/snippets/snippets/Manager.py:938
+#: ../plugins/snippets/snippets/Manager.py:873
+#: ../plugins/snippets/snippets/Manager.py:940
 msgid "Do you want to include selected <b>system</b> snippets in your export?"
 msgstr ""
 
-#: ../plugins/snippets/snippets/Manager.py:886
-#: ../plugins/snippets/snippets/Manager.py:956
+#: ../plugins/snippets/snippets/Manager.py:888
+#: ../plugins/snippets/snippets/Manager.py:958
 msgid "There are no snippets selected to be exported"
 msgstr ""
 
-#: ../plugins/snippets/snippets/Manager.py:891
-#: ../plugins/snippets/snippets/Manager.py:929
+#: ../plugins/snippets/snippets/Manager.py:893
+#: ../plugins/snippets/snippets/Manager.py:931
 #, fuzzy
 msgid "Export snippets"
 msgstr "_Golygu tamaid:"
 
-#: ../plugins/snippets/snippets/Manager.py:1068
+#: ../plugins/snippets/snippets/Manager.py:1070
 #, fuzzy
 msgid "Type a new shortcut, or press Backspace to clear"
 msgstr "Teipiwch gyflymydd newydd, neu bwyso Yn-Ã?l (Backspace) i glirio"
 
-#: ../plugins/snippets/snippets/Manager.py:1070
-#, fuzzy
+#: ../plugins/snippets/snippets/Manager.py:1072
 msgid "Type a new shortcut"
 msgstr "Teipiwch gyflymydd newydd"
 
 #: ../plugins/snippets/snippets/Exporter.py:65
 #, python-format
 msgid "The archive `%s` could not be created"
-msgstr ""
+msgstr "Doedd yr archif `%s` ddim yn gallu cael ei chreu"
 
 #: ../plugins/snippets/snippets/Exporter.py:82
 #, python-format
@@ -3436,7 +3045,7 @@ msgstr ""
 #: ../plugins/snippets/snippets/Importer.py:83
 #, python-format
 msgid "File `%s` does not exist"
-msgstr ""
+msgstr "Dydy'r ffeil `%s` ddim yn bodoli"
 
 #: ../plugins/snippets/snippets/Importer.py:32
 #, fuzzy, python-format
@@ -3451,12 +3060,12 @@ msgstr ""
 #: ../plugins/snippets/snippets/Importer.py:52
 #, python-format
 msgid "The archive `%s` could not be extracted"
-msgstr ""
+msgstr "Doedd yr archif `%s` ddim yn gallu cael ei echdynnu"
 
 #: ../plugins/snippets/snippets/Importer.py:70
 #, python-format
 msgid "The following files could not be imported: %s"
-msgstr ""
+msgstr "Methwyd mewnforio'r ffeiliau canlynol: %s"
 
 #: ../plugins/snippets/snippets/Importer.py:86
 #: ../plugins/snippets/snippets/Importer.py:99
@@ -3464,32 +3073,26 @@ msgstr ""
 msgid "File `%s` is not a valid snippets archive"
 msgstr ""
 
-#: ../plugins/snippets/snippets/Placeholder.py:549
+#: ../plugins/snippets/snippets/Placeholder.py:571
 #, python-format
-msgid ""
-"Execution of the python command (%s) exceeds the maximum time, execution "
-"aborted."
+msgid "Execution of the python command (%s) exceeds the maximum time, execution aborted."
 msgstr ""
 
-#: ../plugins/snippets/snippets/Placeholder.py:557
+#: ../plugins/snippets/snippets/Placeholder.py:579
 #, python-format
 msgid "Execution of the python command (%s) failed: %s"
 msgstr ""
 
-#: ../plugins/snippets/snippets/Placeholder.py:563
-msgid "The following python code, run in a snippet, does not return a value"
-msgstr ""
-
-#: ../plugins/sort/gedit-sort-plugin.c:80
+#: ../plugins/sort/gedit-sort-plugin.c:86
 msgid "S_ort..."
 msgstr "_Trefnu..."
 
-#: ../plugins/sort/gedit-sort-plugin.c:82
+#: ../plugins/sort/gedit-sort-plugin.c:88
 msgid "Sort the current document or selection"
 msgstr "Trefnu'r ddogfen neu ddewis presennol"
 
 #: ../plugins/sort/sort.gedit-plugin.desktop.in.h:1
-#: ../plugins/sort/sort.glade2.h:3
+#: ../plugins/sort/sort.ui.h:3
 msgid "Sort"
 msgstr "Trefnu"
 
@@ -3497,33 +3100,33 @@ msgstr "Trefnu"
 msgid "Sorts a document or selected text."
 msgstr "Trefnu dogfen neu destun wedi ei ddewis."
 
-#: ../plugins/sort/sort.glade2.h:1
+#: ../plugins/sort/sort.ui.h:1
 msgid "R_emove duplicates"
 msgstr "_Tynnu copïau dyblyg"
 
-#: ../plugins/sort/sort.glade2.h:2
+#: ../plugins/sort/sort.ui.h:2
 msgid "S_tart at column:"
 msgstr "_Dechrau â cholofn:"
 
-#: ../plugins/sort/sort.glade2.h:4
+#: ../plugins/sort/sort.ui.h:4
 msgid "You cannot undo a sort operation"
 msgstr "Ni allwch ddadwneud gweithred trefnu"
 
 # msgstr "_Anwybyddu'r gwahaniaeth rhwng priflythennau a llythrennau bychain"
-#: ../plugins/sort/sort.glade2.h:5
+#: ../plugins/sort/sort.ui.h:5
 msgid "_Ignore case"
 msgstr "_Anwybyddu prif lythrennedd"
 
-#: ../plugins/sort/sort.glade2.h:6
+#: ../plugins/sort/sort.ui.h:6
 msgid "_Reverse order"
 msgstr "Trefn _gwrthdroëdig"
 
-#: ../plugins/sort/sort.glade2.h:7
+#: ../plugins/sort/sort.ui.h:7
 msgid "_Sort"
 msgstr "_Trefnu"
 
 #: ../plugins/spell/gedit-automatic-spell-checker.c:418
-#: ../plugins/spell/gedit-spell-checker-dialog.c:477
+#: ../plugins/spell/gedit-spell-checker-dialog.c:499
 msgid "(no suggested words)"
 msgstr "(dim geiriau wedi eu hawgrymu)"
 
@@ -3545,160 +3148,157 @@ msgstr "_Ychwanegu"
 msgid "_Spelling Suggestions..."
 msgstr "_Cynigion sillafu"
 
-#: ../plugins/spell/gedit-spell-checker-dialog.c:274
+#: ../plugins/spell/gedit-spell-checker-dialog.c:289
 msgid "Check Spelling"
 msgstr "Cywiro sillafu"
 
-#: ../plugins/spell/gedit-spell-checker-dialog.c:285
+#: ../plugins/spell/gedit-spell-checker-dialog.c:300
 msgid "Suggestions"
 msgstr "Awgrymiadau"
 
 # ydi "correct" yn ferf neu'n ansoddair?
 # ansoddair dwi'n meddwl
-#: ../plugins/spell/gedit-spell-checker-dialog.c:583
+#: ../plugins/spell/gedit-spell-checker-dialog.c:605
 msgid "(correct spelling)"
 msgstr "(sillafu cywir)"
 
-#: ../plugins/spell/gedit-spell-checker-dialog.c:726
+#: ../plugins/spell/gedit-spell-checker-dialog.c:748
 msgid "Completed spell checking"
 msgstr "Gorffennwyd gwirio sillafu"
 
-#. Translators: The text before the "|" is context to help you decide on
-#. * the correct translation. You MUST OMIT it in the translated string.
-#. * Translators: the first %s is the language name, and the
-#. * second %s is the locale name. Example:
+#. Translators: the first %s is the language name, and
+#. * the second %s is the locale name. Example:
 #. * "French (France)"
 #.
-#. Translators: The text before the "|" is context to help you decide on
-#. * the correct translation. You MUST OMIT it in the translated string.
-#: ../plugins/spell/gedit-spell-checker-language.c:287
-#: ../plugins/spell/gedit-spell-checker-language.c:295
-#, fuzzy, c-format
-msgid "language|%s (%s)"
-msgstr "Ieithoedd"
+#: ../plugins/spell/gedit-spell-checker-language.c:285
+#: ../plugins/spell/gedit-spell-checker-language.c:291
+#, c-format
+msgctxt "language"
+msgid "%s (%s)"
+msgstr "%s (%s)"
 
-#. Translators: The text before the "|" is context to help you decide on
-#. * the correct translation. You MUST OMIT it in the translated string.
-#. * Translators: this refers to an unknown language code
+#. Translators: this refers to an unknown language code
 #. * (one which isn't in our built-in list).
 #.
-#: ../plugins/spell/gedit-spell-checker-language.c:306
+#: ../plugins/spell/gedit-spell-checker-language.c:300
 #, c-format
-msgid "language|Unknown (%s)"
-msgstr ""
+msgctxt "language"
+msgid "Unknown (%s)"
+msgstr "Anhysbys (%s)"
 
-#. Translators: The text before the "|" is context to help you decide on
-#. * the correct translation. You MUST OMIT it in the translated string.
-#. * Translators: this refers the Default language used by the
+#. Translators: this refers the Default language used by the
 #. * spell checker
 #.
-#: ../plugins/spell/gedit-spell-checker-language.c:414
+#: ../plugins/spell/gedit-spell-checker-language.c:406
 #, fuzzy
-msgid "language|Default"
-msgstr "Rhagosodiad"
+msgctxt "language"
+msgid "Default"
+msgstr "Defnyddio Ffont Rhagosodedig"
 
-#: ../plugins/spell/gedit-spell-language-dialog.c:135
-#: ../plugins/spell/languages-dialog.glade2.h:2
+#: ../plugins/spell/gedit-spell-language-dialog.c:141
+#: ../plugins/spell/languages-dialog.ui.h:2
 msgid "Set language"
 msgstr "Gosod iaith"
 
-#: ../plugins/spell/gedit-spell-language-dialog.c:184
+#: ../plugins/spell/gedit-spell-language-dialog.c:192
 msgid "Languages"
 msgstr "Ieithoedd"
 
-#: ../plugins/spell/gedit-spell-plugin.c:70
-msgid "_Check Spelling"
+#: ../plugins/spell/gedit-spell-plugin.c:75
+msgid "_Check Spelling..."
 msgstr "_Gwirio Sillafu"
 
-#: ../plugins/spell/gedit-spell-plugin.c:72
+#: ../plugins/spell/gedit-spell-plugin.c:77
 msgid "Check the current document for incorrect spelling"
 msgstr "Gwirio sillafu'r ddogfen gyfredol"
 
-#: ../plugins/spell/gedit-spell-plugin.c:78
+#: ../plugins/spell/gedit-spell-plugin.c:83
 msgid "Set _Language..."
 msgstr "Gosod _Iaith:"
 
-#: ../plugins/spell/gedit-spell-plugin.c:80
+#: ../plugins/spell/gedit-spell-plugin.c:85
 msgid "Set the language of the current document"
 msgstr "Gosod iaith y ddogfen gyfredol"
 
-#: ../plugins/spell/gedit-spell-plugin.c:89
+#: ../plugins/spell/gedit-spell-plugin.c:94
 msgid "_Autocheck Spelling"
 msgstr "Gwirio Sillafu'n _Awtomatig"
 
-#: ../plugins/spell/gedit-spell-plugin.c:91
+#: ../plugins/spell/gedit-spell-plugin.c:96
 msgid "Automatically spell-check the current document"
 msgstr "Gwirio sillafu'r ddogfen gyfredol yn awtomatig."
 
-#: ../plugins/spell/gedit-spell-plugin.c:749
+#: ../plugins/spell/gedit-spell-plugin.c:761
 msgid "The document is empty."
 msgstr "Mae'r ddogfen yn wag."
 
-#: ../plugins/spell/gedit-spell-plugin.c:781
+#: ../plugins/spell/gedit-spell-plugin.c:794
 msgid "No misspelled words"
 msgstr "Dim geiriau wedi'u camsillafu"
 
-#: ../plugins/spell/languages-dialog.glade2.h:1
+#: ../plugins/spell/languages-dialog.ui.h:1
 msgid "Select the _language of the current document."
 msgstr "Dewis _iaith y ddogfen gyfredol."
 
-#: ../plugins/spell/spell-checker.glade2.h:1 ../plugins/time/time.glade2.h:2
+#: ../plugins/spell/spell-checker.ui.h:1
+#: ../plugins/time/gedit-time-dialog.ui.h:2
+#: ../plugins/time/gedit-time-setup-dialog.ui.h:2
 msgid "*"
 msgstr "*"
 
-#: ../plugins/spell/spell-checker.glade2.h:2
+#: ../plugins/spell/spell-checker.ui.h:2
 msgid "<b>Language</b>"
 msgstr "<b>Iaith</b>"
 
-#: ../plugins/spell/spell-checker.glade2.h:3
+#: ../plugins/spell/spell-checker.ui.h:3
 msgid "<b>word</b>"
 msgstr "<b>gair</b>"
 
-#: ../plugins/spell/spell-checker.glade2.h:4
+#: ../plugins/spell/spell-checker.ui.h:4
 msgid "Add w_ord"
 msgstr "Ychwanegu _gair"
 
-#: ../plugins/spell/spell-checker.glade2.h:5
+#: ../plugins/spell/spell-checker.ui.h:5
 msgid "Cha_nge"
 msgstr "_Newid"
 
-#: ../plugins/spell/spell-checker.glade2.h:6
+#: ../plugins/spell/spell-checker.ui.h:6
 msgid "Change A_ll"
 msgstr "Newid y _Cyfan"
 
-#: ../plugins/spell/spell-checker.glade2.h:7
+#: ../plugins/spell/spell-checker.ui.h:7
 msgid "Change _to:"
 msgstr "Newid _i:"
 
-#: ../plugins/spell/spell-checker.glade2.h:8
+#: ../plugins/spell/spell-checker.ui.h:8
 msgid "Check _Word"
 msgstr "Gwirio _Gair"
 
-#: ../plugins/spell/spell-checker.glade2.h:9
+#: ../plugins/spell/spell-checker.ui.h:9
 msgid "Check spelling"
 msgstr "Gwirio sillafu"
 
-#: ../plugins/spell/spell-checker.glade2.h:10
+#: ../plugins/spell/spell-checker.ui.h:10
 msgid "Ignore _All"
 msgstr "Anwybyddu _Pob Un"
 
-#: ../plugins/spell/spell-checker.glade2.h:11
+#: ../plugins/spell/spell-checker.ui.h:11
 msgid "Language:"
 msgstr "Iaith:"
 
-#: ../plugins/spell/spell-checker.glade2.h:12
+#: ../plugins/spell/spell-checker.ui.h:12
 msgid "Misspelled word:"
 msgstr "Gair wedi ei gamsillafu:"
 
-#: ../plugins/spell/spell-checker.glade2.h:13
+#: ../plugins/spell/spell-checker.ui.h:13
 msgid "User dictionary:"
 msgstr "Geiriadur y defnyddiwr:"
 
-#: ../plugins/spell/spell-checker.glade2.h:14
+#: ../plugins/spell/spell-checker.ui.h:14
 msgid "_Ignore"
 msgstr "_Anwybyddu"
 
-#: ../plugins/spell/spell-checker.glade2.h:15
+#: ../plugins/spell/spell-checker.ui.h:15
 msgid "_Suggestions:"
 msgstr "_Awgrymiadau:"
 
@@ -3707,28 +3307,27 @@ msgid "Checks the spelling of the current document."
 msgstr "Gwirio sillafu'r ddogfen gyfredol."
 
 #: ../plugins/spell/spell.gedit-plugin.desktop.in.h:2
-#, fuzzy
 msgid "Spell Checker"
-msgstr "Cywirydd sillafu"
+msgstr "Gwirydd sillafu"
+
+#: ../plugins/taglist/gedit-taglist-plugin.c:98
+#: ../plugins/taglist/gedit-taglist-plugin-panel.c:694
+#: ../plugins/taglist/gedit-taglist-plugin-panel.c:710
+msgid "Tags"
+msgstr "Tagiau"
 
-#: ../plugins/taglist/gedit-taglist-plugin-panel.c:599
+#: ../plugins/taglist/gedit-taglist-plugin-panel.c:605
 msgid "Select the group of tags you want to use"
 msgstr "Dewis y grŵp o dagiau hoffech ddefnyddio."
 
-#: ../plugins/taglist/gedit-taglist-plugin-panel.c:618
-#, fuzzy
+#: ../plugins/taglist/gedit-taglist-plugin-panel.c:624
 msgid "_Preview"
-msgstr "Rhagolwg Tudalen"
+msgstr "_Rhagolwg"
 
-#: ../plugins/taglist/gedit-taglist-plugin-panel.c:684
+#: ../plugins/taglist/gedit-taglist-plugin-panel.c:691
 msgid "Available Tag Lists"
 msgstr "Rhestrau Tag Ar Gael"
 
-#: ../plugins/taglist/gedit-taglist-plugin-panel.c:687
-#: ../plugins/taglist/gedit-taglist-plugin-panel.c:703
-msgid "Tags"
-msgstr "Tagiau"
-
 #: ../plugins/taglist/HTML.tags.xml.in.h:1
 msgid "Abbreviated form"
 msgstr "Ffurf fer"
@@ -4222,9 +3821,8 @@ msgid "Horizontal space (deprecated)"
 msgstr "Bwlch llorweddol"
 
 #: ../plugins/taglist/HTML.tags.xml.in.h:132
-#, fuzzy
 msgid "HttP header name"
-msgstr "Enw pennawd HTTP"
+msgstr "Enw pennawd HttP"
 
 # Fe edrychais ar http://www.w3.org/TR/REC-html40/struct/dirlang.html#h-8.2.4
 # er mwyn cael syniad o'r hyn oedd y tag hwn yn ei wneud - rhysj
@@ -4643,8 +4241,9 @@ msgstr "Enw iaith sgript"
 
 # FIXME: typo in English should go -> bugzilla [rhysj]
 #: ../plugins/taglist/HTML.tags.xml.in.h:244
-msgid "Script statments"
-msgstr "Llinellau o sgript"
+#, fuzzy
+msgid "Script statements"
+msgstr "Llinellau o sgrip"
 
 #: ../plugins/taglist/HTML.tags.xml.in.h:245
 msgid "Scrollbar"
@@ -4924,9 +4523,8 @@ msgid "Width"
 msgstr "Lled"
 
 #: ../plugins/taglist/HTML.tags.xml.in.h:318
-#, fuzzy
 msgid "XHTML 1.0 - Tags"
-msgstr "HTML - Tagiau"
+msgstr "XHTML 1.0 - Tagiau"
 
 #: ../plugins/taglist/Latex.tags.xml.in.h:1
 msgid "Bibliography (cite)"
@@ -5223,12 +4821,8 @@ msgid "Unbreakable text"
 msgstr "Testun na ddylid ei dorri"
 
 #: ../plugins/taglist/taglist.gedit-plugin.desktop.in.h:1
-msgid ""
-"Provides a method to easily insert into a document commonly used tags/"
-"strings without having to type them."
-msgstr ""
-"Darparu modd i fewnosod tagiau/llinynnau a ddefnyddir yn aml i mewn i "
-"ddogfen yn hawdd heb orfod eu teipio."
+msgid "Provides a method to easily insert into a document commonly used tags/strings without having to type them."
+msgstr "Darparu modd i fewnosod tagiau/llinynnau a ddefnyddir yn aml i mewn i ddogfen yn hawdd heb orfod eu teipio."
 
 #: ../plugins/taglist/taglist.gedit-plugin.desktop.in.h:2
 msgid "Tag list"
@@ -5299,23 +4893,22 @@ msgid "self"
 msgstr "hunan"
 
 #: ../plugins/taglist/XUL.tags.xml.in.h:1
-#, fuzzy
 msgid "XUL - Tags"
-msgstr "HTML - Tagiau"
+msgstr "XUL - Tagiau"
 
-#: ../plugins/time/gedit-time-plugin.c:183
+#: ../plugins/time/gedit-time-plugin.c:182
 msgid "In_sert Date and Time..."
 msgstr "_Mewnosod Dyddiad ac Amser..."
 
-#: ../plugins/time/gedit-time-plugin.c:185
+#: ../plugins/time/gedit-time-plugin.c:184
 msgid "Insert current date and time at the cursor position"
 msgstr "Mewnosod y dyddiad a'r amser cyfredol wrth safle'r cyrchydd"
 
-#: ../plugins/time/gedit-time-plugin.c:628
+#: ../plugins/time/gedit-time-plugin.c:613
 msgid "Available formats"
 msgstr "Fformatau ar gael"
 
-#: ../plugins/time/gedit-time-plugin.c:806
+#: ../plugins/time/gedit-time-plugin.c:763
 msgid "Configure insert date/time plugin..."
 msgstr "Cyflunio'r ategyn dyddiad/amser..."
 
@@ -5327,41 +4920,214 @@ msgstr "Mewnosod Dyddiad/Amser"
 msgid "Inserts current date and time at the cursor position."
 msgstr "Mewnosod y dyddiad a'r amser cyfredol ger safle'r cyrchydd."
 
-#: ../plugins/time/time.glade2.h:3
+#: ../plugins/time/gedit-time-dialog.ui.h:3
+#: ../plugins/time/gedit-time-setup-dialog.ui.h:3
 msgid "<span size=\"small\">01/11/2002 17:52:00</span>"
 msgstr "<span size=\"small\">01/11/2002 17:52:00</span>"
 
-#: ../plugins/time/time.glade2.h:4
-msgid "<span weight=\"bold\"> When inserting date/time...</span>"
-msgstr "<span weight=\"bold\">Wrth fewnosod dyddiad/amser...</span>"
-
-#: ../plugins/time/time.glade2.h:5
-msgid "Configure date/time plugin"
-msgstr "Cyflunio'r ategyn dyddiad/amser"
-
-#: ../plugins/time/time.glade2.h:6
+#: ../plugins/time/gedit-time-dialog.ui.h:4
 msgid "Insert Date and Time"
 msgstr "Mewnosod Dyddiad ac Amser"
 
-#: ../plugins/time/time.glade2.h:7
+#: ../plugins/time/gedit-time-dialog.ui.h:5
+#: ../plugins/time/gedit-time-setup-dialog.ui.h:6
 msgid "Use the _selected format"
 msgstr "Defnyddio'r fformat fe _ddewiswyd"
 
-#: ../plugins/time/time.glade2.h:8
+#: ../plugins/time/gedit-time-dialog.ui.h:6
 msgid "_Insert"
 msgstr "_Mewnosod"
 
-#: ../plugins/time/time.glade2.h:9
+#: ../plugins/time/gedit-time-dialog.ui.h:7
+#: ../plugins/time/gedit-time-setup-dialog.ui.h:8
+msgid "_Use custom format"
+msgstr "_Defnyddio fformat addasedig"
+
+#: ../plugins/time/gedit-time-setup-dialog.ui.h:4
+msgid "<span weight=\"bold\"> When inserting date/time...</span>"
+msgstr "<span weight=\"bold\">Wrth fewnosod dyddiad/amser...</span>"
+
+#: ../plugins/time/gedit-time-setup-dialog.ui.h:5
+msgid "Configure date/time plugin"
+msgstr "Cyflunio'r ategyn dyddiad/amser"
+
+#: ../plugins/time/gedit-time-setup-dialog.ui.h:7
 msgid "_Prompt for a format"
 msgstr "_Gofyn am fformat"
 
-#: ../plugins/time/time.glade2.h:10
-msgid "_Use custom format"
-msgstr "_Defnyddio fformat addasedig"
+#~ msgid "Monospace Regular 9"
+#~ msgstr "Monospace Regular 9"
+#~ msgid "Sans Regular 11"
+#~ msgstr "Sans Regular 11"
+#~ msgid "Sans Regular 8"
+#~ msgstr "Sans Regular 8"
+#~ msgid ""
+#~ "Specifies the font to use for a document's body when printing documents. "
+#~ "This is a gnome-print font name and replaced by print_font_body_pango."
+#~ msgstr ""
+#~ "Penodi'r ffont i'w ddefnyddio ar gyfer corff dogfennau wrth argraffu. Enw "
+#~ "ffont gnome-print yw hwn, ac fe gaiff print_font_body_pango ei roi yn ei "
+#~ "le."
+#~ msgid ""
+#~ "Specifies the font to use for line numbers when printing. This will only "
+#~ "take effect if the \"Print Line Numbers\" option is non-zero. This is a "
+#~ "gnome-print font name and replaced by print_font_numbers_pango."
+#~ msgstr ""
+#~ "Penodi'r ffont i'w ddefnyddio ar gyfer rhifau llinellau wrth argraffu "
+#~ "dogfennau. Mae hyn ond yn berthnasol os nad yw'r opsiwn \"Argraffu Rhifau "
+#~ "Llinellau\" yn sero. Enw ffont gnome-print yw hwn, ac fe gaiff "
+#~ "print_font_numbers_pango ei roi yn ei le."
+#~ msgid ""
+#~ "Specifies the font to use for page headers when printing a document. This "
+#~ "will only take effect if the \"Print Header\" option is turned on. This "
+#~ "is a gnome-print font name and replaced by print_font_header_pango."
+#~ msgstr ""
+#~ "Penodi'r ffont i'w ddefnyddio ar gyfer penawdau tudalennau wrth argraffu "
+#~ "dogfen. Mae hyn ond yn berthnasol os yw'r opsiwn \"Argraffu Pennawd\" "
+#~ "wedi ei ddewis. Enw ffont gnome-print yw hwn, ac fe gaiff "
+#~ "print_font_header_pango ei roi yn ei le."
+#~ msgid "Open Location"
+#~ msgstr "Lleoliad Agor"
+#~ msgid "Ch_aracter coding:"
+#~ msgstr "Amgodiad _nodau:"
+#~ msgid "Enter the _location (URI) of the file you would like to open:"
+#~ msgstr "Gosodwch _lleoliad (URI) y ffeil hoffwch ei agor:"
+#~ msgid "Page Setup"
+#~ msgstr "Cyfluniad Tudalen"
+#~ msgid "Fonts"
+#~ msgstr "Ffontiau"
+#~ msgid "General"
+#~ msgstr "Cyffredinol"
+#~ msgid "%s: malformed file name or URI.\n"
+#~ msgstr "%s: enw ffeil neu URI wedi'i gam-ffurfio.\n"
+#~ msgid "The entered location is not valid."
+#~ msgstr "Nid yw'r lleoliad a roddwyd yn ddilys."
+#~ msgid "The file contains corrupted data."
+#~ msgstr "Mae'r ffeil yn cynnwys data llygredig."
+#~ msgid "The file contains data in an invalid format."
+#~ msgstr "Mae'r ffeil yn cynnwys data mewn ffurf annilys."
+
+#, fuzzy
+#~ msgid ""
+#~ "There are too many open files. Please close some applications and try "
+#~ "again."
+#~ msgstr ""
+#~ "Mae gormod o ffeiliau ar agor. Caewch rai rhaglenni sydd ar agor, cyn "
+#~ "ceisio eto."
+
+#, fuzzy
+#~ msgid ""
+#~ "Not enough available memory to open the file. Please close some running "
+#~ "applications and try again."
+#~ msgstr ""
+#~ "Dim digon o gof ar gael er mwyn agor y ffeil. Caewch ryw raglenni sy'n "
+#~ "rhedeg, cyn ceisio eto."
+
+#, fuzzy
+#~ msgid ""
+#~ "Host name was empty. Please check that your proxy settings are correct "
+#~ "and try again."
+#~ msgstr ""
+#~ "Roedd enw'r gwesteiwr yn wag. Gwiriwch fod eich gosodiadau dirprwy yn "
+#~ "gywir cyn ceisio eto."
+
+#, fuzzy
+#~ msgid ""
+#~ "Attempt to log in failed. Please check that you typed the location "
+#~ "correctly and try again."
+#~ msgstr ""
+#~ "Methwyd mewngofnodi. Gwiriwch eich bod chi wedi rhoi'r lleoliad yn gywir "
+#~ "cyn ceisio eto."
+#~ msgid "The file you are trying to open is not a regular file."
+#~ msgstr "Nid ffeil gyffredin mo'r ffeil yr ydych yn ceisio ei hagor."
+#~ msgid "Attempt to log in failed."
+#~ msgstr "Methodd yr ymgais mewngofnodi."
+
+#, fuzzy
+#~ msgid ""
+#~ "%s is a directory. Please check that you typed the location correctly and "
+#~ "try again."
+#~ msgstr ""
+#~ "Cyfeiriadur yw %s. Gwiriwch eich bod chi wedi teipio'r lleoliad yn gywir, "
+#~ "cyn ceisio eto."
 
+#, fuzzy
+#~ msgid ""
+#~ "Not enough available memory to save the file. Please close some running "
+#~ "applications and try again."
+#~ msgstr ""
+#~ "Dim digon o gof ar gael er mwyn cadw'r ffeil. Caewch ryw raglenni sy'n "
+#~ "rhedeg, cyn ceisio eto."
+
+#, fuzzy
+#~ msgid ""
+#~ "%s is not a regular file. Please check that you typed the location "
+#~ "correctly and try again."
+#~ msgstr ""
+#~ "Nid ffeil gyffredin yw %s. Gwiriwch eich bod chi wedi rhoi'r lleoliad yn "
+#~ "gywir, cyn ceisio eto."
+#~ msgid "Other"
+#~ msgstr "Arall"
+#~ msgid "Number of pages horizontally"
+#~ msgstr "Faint o dudalennau yn llorweddol"
+#~ msgid "Number of pages vertically"
+#~ msgstr "Faint o dudalennau yn fertigol"
+#~ msgid "No visible output was created."
+#~ msgstr "Ni chrëwyd allbwn gweladwy."
+#~ msgid "Rendering page %d of %d..."
+#~ msgstr "Llunio tudalen %d o %d..."
+#~ msgid "Open _Location..."
+#~ msgstr "Agor _lleoliad..."
+#~ msgid "Open a file from a specified location"
+#~ msgstr "Agor ffeil o leoliad penodedig"
+#~ msgid "None"
+#~ msgstr "Dim"
+#~ msgid "Edit tool <i>%s</i>:"
+#~ msgstr "Arf golygu <i>%s</i>:"
+#~ msgid "A Brand New Tool"
+#~ msgstr "Arf newydd sbon"
+#~ msgid "Co_mmand(s):"
+#~ msgstr "_Gorchymyn/gorchmynion:"
+#~ msgid "Edit tool <i>make</i>:"
+#~ msgstr "Arf golygu <i>make</i>:"
+#~ msgid ""
+#~ "Nothing\n"
+#~ "Current document\n"
+#~ "All documents"
+#~ msgstr ""
+#~ "Dim\n"
+#~ "Y ddogfen bresennol\n"
+#~ "Pob dogfen"
+#~ msgid "_Description:"
+#~ msgstr "_Disgrifiad:"
+
+#, fuzzy
+#~ msgid "on"
+#~ msgstr "Dim"
+#~ msgid "Invalid uri"
+#~ msgstr "uri annilys"
+
+#, fuzzy
+#~ msgid "Recent Files"
+#~ msgstr "Uchafswm Ffeiliau Diweddar"
+#~ msgid "Insert User Na_me"
+#~ msgstr "Mewnosod _Enw Cyfrif"
+#~ msgid "Insert the user name at the cursor position"
+#~ msgstr "Mewnosod yr enw cyfrif ger safle'r cyrchydd"
+#~ msgid "Inserts the user name at the cursor position."
+#~ msgstr "Mewnosodir yr enw cyfrif ger safle'r cyrchydd."
+#~ msgid "User name"
+#~ msgstr "Enw cyfrif"
+
+#, fuzzy
+#~ msgid "language|%s (%s)"
+#~ msgstr "Ieithoedd"
+
+#, fuzzy
+#~ msgid "language|Default"
+#~ msgstr "Rhagosodiad"
 #~ msgid "Background Color"
 #~ msgstr "Lliw Cefndir"
-
 #~ msgid ""
 #~ "Background color for selected text in the editing area. This will only "
 #~ "take effect if the \"Use Default Colors\" option is turned off."
@@ -5369,7 +5135,6 @@ msgstr "_Defnyddio fformat addasedig"
 #~ "Lliw cefndir ar gyfer testun wedi ei ddewis yn yr ardal golygu. Dim ond "
 #~ "os caiff yr opsiwn \"Defnyddio Lliwiau Rhagosodedig\" ei ddiffodd y "
 #~ "defnyddir y lliw cefndir hwn. "
-
 #~ msgid ""
 #~ "Background color for unselected text in the editing area. This will only "
 #~ "take effect if the \"Use Default Colors\" option is turned off."
@@ -5377,7 +5142,6 @@ msgstr "_Defnyddio fformat addasedig"
 #~ "Lliw cefndir ar gyfer testun heb ei ddewis yn yr ardal golygu. Dim ond os "
 #~ "caiff yr opsiwn \"Defnyddio Lliwiau Rhagosodedig\" ei ddiffodd y "
 #~ "defnyddir y lliw cefndir hwn. "
-
 #~ msgid ""
 #~ "Foreground color for selected text in the editing area. This will only "
 #~ "take effect if the \"Use Default Colors\" option is turned off."
@@ -5385,7 +5149,6 @@ msgstr "_Defnyddio fformat addasedig"
 #~ "Lliw blaendir ar gyfer testun wedi ei ddewis yn yr ardal golygu. Dim ond "
 #~ "os caiff yr opsiwn \"Defnyddio Lliwiau Rhagosodedig\" ei ddiffodd y "
 #~ "defnyddir y lliw hwn."
-
 #~ msgid ""
 #~ "Foreground color for the unselected text in the editing area. This will "
 #~ "only take effect if the \"Use Default Colors\" option is turned off."
@@ -5393,19 +5156,14 @@ msgstr "_Defnyddio fformat addasedig"
 #~ "Lliw blaendir ar gyfer testun heb ei ddewis yn yr ardal golygu. Dim ond "
 #~ "os caiff yr opsiwn \"Defnyddio Lliwiau Rhagosodedig\" ei ddiffodd y "
 #~ "defnyddir y lliw hwn."
-
 #~ msgid "Selected Text Color"
 #~ msgstr "Lliw Testun a Ddewiswyd"
-
 #~ msgid "Selection Color"
 #~ msgstr "Lliw'r Dewis"
-
 #~ msgid "Text Color"
 #~ msgstr "Lliw Testun"
-
 #~ msgid "Use Default Colors"
 #~ msgstr "Defnyddio Lliwiau Rhagosodedig"
-
 #~ msgid ""
 #~ "Whether to use the system's default colors for the editing area. If this "
 #~ "option is turned off, then the colors of the editing area will be those "
@@ -5416,424 +5174,284 @@ msgstr "_Defnyddio fformat addasedig"
 #~ "golygu. Os troir yr opsiwn hwn bant, yna fe fydd lliwiau'r ardal golygu'r "
 #~ "rheiny a benodwyd yn yr opsiynau \"Lliw Cefndir\", \"Lliw Testun\", "
 #~ "\"Lliw Testun Wedi ei Ddewis\" a \"Lliw Dewis\"."
-
 #~ msgid "Push this button to configure text color"
 #~ msgstr "Gwasgwch y botwm hwn er mwyn cyflunio lliw testun"
-
 #~ msgid "Push this button to configure background color"
 #~ msgstr "Gwasgwch y botwm hwn er mwyn cyflunio lliw cefndir"
-
 #~ msgid ""
 #~ "Push this button to configure the color in which the selected text should "
 #~ "appear"
 #~ msgstr ""
 #~ "Gwasgwch y botwm hwn er mwyn cyflunio'r lliw dylai'r testun a ddewiswyd "
 #~ "ymddangos ynddi"
-
 #~ msgid ""
 #~ "Push this button to configure the color in which the selected text should "
 #~ "be marked"
 #~ msgstr ""
 #~ "Gwasgwch y botwm hwn er mwyn cyflunio'r lliw dylai'r testun a ddewiswyd "
 #~ "cael ei farcio ynddi"
-
 #~ msgid "Elements"
 #~ msgstr "Elfennau"
-
 #~ msgid "<b>Elements</b>"
 #~ msgstr "<b>Elfennau</b>"
-
 #~ msgid "Highlight _mode:"
 #~ msgstr "_Modd amlygu:"
-
 #~ msgid "Italic"
 #~ msgstr "Italig"
-
 #~ msgid "Normal _text color:"
 #~ msgstr "Lliw _testun arferol:"
-
 #~ msgid "Pick a color"
 #~ msgstr "Dewiswch liw"
-
 #~ msgid "Pick the background color"
 #~ msgstr "Dewiswch liw'r cefndir"
-
 #~ msgid "Pick the normal text color"
 #~ msgstr "Dewiswch liw testun arferol"
-
 #~ msgid "Pick the selected text color"
 #~ msgstr "Dewis lliw testun wedi ei ddewis"
-
 #~ msgid "Pick the selection color"
 #~ msgstr "Dewis lliw'r dewis"
-
 #~ msgid "Se_lection color:"
 #~ msgstr "Lliw _dewis:"
-
 #~ msgid "Selecte_d text color:"
 #~ msgstr "Lliw _testun wedi ei ddewis:"
-
 #~ msgid "Strikethrough"
 #~ msgstr "Taro drwodd"
-
-#~ msgid "Syntax Highlighting"
-#~ msgstr "Amlygiad Cystrawen"
-
 #~ msgid "U_se default theme colors"
 #~ msgstr "Defnyddio _lliwiau rhagosodedig y thema"
-
 #~ msgid "Underline"
 #~ msgstr "Tanlinellu"
-
-#~ msgid "_Background color:"
-#~ msgstr "Lliw _cefndir:"
-
 #~ msgid "_Background:"
 #~ msgstr "Lliw _cefndir:"
-
 #~ msgid "_Enable syntax highlighting"
 #~ msgstr "_Galluogi amlygu cystrawen"
-
 #~ msgid "_Foreground:"
 #~ msgstr "_Blaendir:"
-
 #~ msgid "_Reset to Default "
 #~ msgstr "_Ailosod i'r Rhagosodiad "
-
 #~ msgid "_Use default theme font"
 #~ msgstr "Defnyddio _ffont rhagosodedig y thema"
-
 #~ msgid "Insert in output panel"
 #~ msgstr "Rhoi yn y panel allbwn"
-
 #~ msgid "F7"
 #~ msgstr "F7"
-
 #~ msgid "_Accelerator:"
 #~ msgstr "_Cyflymydd:"
-
 #~ msgid "FALSE"
 #~ msgstr "FFALS"
-
 #~ msgid "TRUE"
 #~ msgstr "GWIR"
-
 #~ msgid "hidden_and_binary"
 #~ msgstr "cudd_a_deuaidd"
-
 #~ msgid "_New Directory"
 #~ msgstr "_Cyfeiriadur Newydd"
-
 #~ msgid "Add new empty directory"
 #~ msgstr "Ychwanegu cyfeiriadur gwag newydd"
-
 #~ msgid "_View Directory"
 #~ msgstr "_Gweld Cyfeiriadur"
-
 #~ msgid "Advanced filtering"
 #~ msgstr "Hidlo uwch"
-
 #~ msgid "Afrikaans"
 #~ msgstr "Afrikaans"
-
 #~ msgid "Amharic"
 #~ msgstr "Amhareg"
-
 #~ msgid "Arabic (Egypt)"
 #~ msgstr "Arabeg (Yr Aifft)"
-
 #~ msgid "Azerbaijani"
 #~ msgstr "Azerbaijani"
-
 #~ msgid "Belarusian"
 #~ msgstr "Belarwseg"
-
 #~ msgid "Bulgarian"
 #~ msgstr "Bwlgareg"
-
 #~ msgid "Bengali"
 #~ msgstr "Bengaleg"
-
 #~ msgid "Breton"
 #~ msgstr "Llydaweg"
-
 #~ msgid "Catalan"
 #~ msgstr "Catalaneg"
-
 #~ msgid "Czech"
 #~ msgstr "Tsieceg"
-
 #~ msgid "Welsh"
 #~ msgstr "Cymraeg"
-
 #~ msgid "Danish"
 #~ msgstr "Daneg"
-
 #~ msgid "German (Austria)"
 #~ msgstr "Almaeneg (Awstria)"
-
 #~ msgid "German (Germany)"
 #~ msgstr "Almaeneg"
-
 #~ msgid "German (Swiss)"
 #~ msgstr "Almaeneg (Y Swistir)"
-
 #~ msgid "English (American)"
 #~ msgstr "Saesneg (Americanaidd)"
-
 #~ msgid "English (British)"
 #~ msgstr "Saesneg (Prydeinig)"
-
 #~ msgid "English (Canadian)"
 #~ msgstr "Saesneg (Canadaidd)"
-
 #~ msgid "Esperanto"
 #~ msgstr "Esperanto"
-
 #~ msgid "Spanish"
 #~ msgstr "Sbaeneg"
-
 #~ msgid "Estonian"
 #~ msgstr "Estoneg"
-
 #~ msgid "Persian"
 #~ msgstr "Perseg"
-
 #~ msgid "Finnish"
 #~ msgstr "Ffineg"
-
 #~ msgid "Faroese"
 #~ msgstr "Faröeg"
-
 #~ msgid "French (France)"
 #~ msgstr "Ffrangeg (Ffrainc)"
-
 #~ msgid "French (Swiss)"
 #~ msgstr "Ffrangeg (Y Swistir)"
-
 #~ msgid "Irish"
 #~ msgstr "Gwyddeleg"
-
 #~ msgid "Scottish Gaelic"
 #~ msgstr "Gaeleg yr Alban"
-
 #~ msgid "Gallegan"
 #~ msgstr "Galiseg"
-
 #~ msgid "Manx Gaelic"
 #~ msgstr "Gaeleg Manaw"
-
 #~ msgid "Hindi"
 #~ msgstr "Hindi"
-
 #~ msgid "Croatian"
 #~ msgstr "Croateg"
-
 #~ msgid "Upper Sorbian"
 #~ msgstr "Uwch Sorbeg"
-
 #~ msgid "Hungarian"
 #~ msgstr "Hwngareg"
-
 #~ msgid "Interlingua (IALA)"
 #~ msgstr "Interlingua (IALA)"
-
 #~ msgid "Indonesian"
 #~ msgstr "Indoneseg"
-
 #~ msgid "Icelandic"
 #~ msgstr "Islandeg"
-
 #~ msgid "Italian"
 #~ msgstr "Eidaleg"
-
 #~ msgid "Kurdish"
 #~ msgstr "Cwrdeg"
-
 #~ msgid "Latin"
 #~ msgstr "Lladin"
-
 #~ msgid "Lithuanian"
 #~ msgstr "Lithwaneg"
-
 #~ msgid "Latvian"
 #~ msgstr "Latfieg"
-
 #~ msgid "Malagasy"
 #~ msgstr "Malagaseg"
-
 #~ msgid "Maori"
 #~ msgstr "Maori"
-
 #~ msgid "Macedonian"
 #~ msgstr "Macedoneg"
-
 #~ msgid "Mongolian"
 #~ msgstr "Mongoleg"
-
 #~ msgid "Marathi"
 #~ msgstr "Marathi"
-
 #~ msgid "Malay"
 #~ msgstr "Malayeg"
-
 #~ msgid "Maltese"
 #~ msgstr "Malteg"
-
 #~ msgid "Norwegian Bokmal"
 #~ msgstr "Bokmal Norwy"
-
 #~ msgid "Dutch"
 #~ msgstr "Iseldireg"
-
 #~ msgid "Norwegian Nynorsk"
 #~ msgstr "Nynorsk Norwy"
-
 #~ msgid "Norwegian"
 #~ msgstr "Norwyeg"
-
 #~ msgid "Nyanja"
 #~ msgstr "Nyanja"
-
 #~ msgid "Polish"
 #~ msgstr "Pwyleg"
-
 #~ msgid "Portuguese (Portugal)"
 #~ msgstr "Portiwgaleg (Portiwgal)"
-
 #~ msgid "Portuguese (Brazilian)"
 #~ msgstr "Portiwgaleg (Brazil)"
-
 #~ msgid "Quechua"
 #~ msgstr "Quechua"
-
 #~ msgid "Russian"
 #~ msgstr "Rwsieg"
-
 #~ msgid "Kinyarwanda"
 #~ msgstr "Kinyarwanda"
-
 #~ msgid "Sardinian"
 #~ msgstr "Sardineg"
-
 #~ msgid "Slovak"
 #~ msgstr "Slofaceg"
-
 #~ msgid "Slovenian"
 #~ msgstr "Slofeneg"
-
 #~ msgid "Swedish"
 #~ msgstr "Swedeg"
-
 #~ msgid "Swahili"
 #~ msgstr "Swahili"
-
 #~ msgid "Tamil"
 #~ msgstr "Tamil"
-
 #~ msgid "Tetum"
 #~ msgstr "Tetwm"
-
 #~ msgid "Tagalog"
 #~ msgstr "Tagalog"
-
 #~ msgid "Tswana"
 #~ msgstr "Tswana"
-
 #~ msgid "Ukrainian"
 #~ msgstr "Wrcreineg"
-
 #~ msgid "Uzbek"
 #~ msgstr "Wsbeceg"
-
 #~ msgid "Walloon"
 #~ msgstr "Walŵn"
-
 #~ msgid "Yiddish"
 #~ msgstr "Iddeweg"
-
 #~ msgid "Zulu"
 #~ msgstr "Zwlw"
-
 #~ msgid "Could not find the required widgets inside %s."
 #~ msgstr "Methwyd canfod y teclynnau gofynnol o fewn %s."
-
 #~ msgid "Double-click on a tag to insert it in the current document"
 #~ msgstr "Rhowch glic dwbl ar dag er mwyn ei fewnosod yn y ddogfen gyfredol"
-
 #~ msgid "BGSound"
 #~ msgstr "Sŵn cefndir"
-
 #~ msgid "Behavior"
 #~ msgstr "Ymddygiad"
-
 #~ msgid "Blinking text"
 #~ msgstr "Testun sy'n blincio"
-
 #~ msgid "Box"
 #~ msgstr "Bocs"
-
 #~ msgid "Space"
 #~ msgstr "Bwlch"
-
 #~ msgid "gedit"
 #~ msgstr "gedit"
-
 #~ msgid "Normal"
 #~ msgstr "Arferol"
-
 #~ msgid "Use Normal highlight mode"
 #~ msgstr "Defnyddio'r modd amlygu Arferol"
-
 #~ msgid "Brackets &lt;&gt;"
 #~ msgstr "Cromfachau &lt;&gt;"
-
 #~ msgid "Symbol &gt;&gt;"
 #~ msgstr "Symbol &gt;&gt;"
-
 #~ msgid "Symbol &gt;="
 #~ msgstr "Symbol &gt;="
-
 #~ msgid "Symbol &lt;&lt;"
 #~ msgstr "Symbol &lt;&lt;"
-
 #~ msgid "Symbol &lt;="
 #~ msgstr "Symbol &lt;="
-
 #~ msgid ""
 #~ "cd $GEDIT_CURRENT_DOCUMENT_DIR\n"
 #~ "make"
 #~ msgstr ""
 #~ "cd $CYFEIRIADUR_PRESENNOL_DOGFEN_GEDIT\n"
 #~ "make"
-
 #~ msgid "Gedit View"
 #~ msgstr "Golwg Gedit"
-
 #~ msgid "Gedit View."
 #~ msgstr "Golwg Gedit."
-
 #~ msgid "Gedit viewer factory"
 #~ msgstr "ffatri golwg Gedit"
-
 #~ msgid "gedit application"
 #~ msgstr "rhaglen gedit"
-
 #~ msgid "gedit automation factory"
 #~ msgstr "ffatri awtomeiddio gedit"
-
 #~ msgid "Go to Line"
 #~ msgstr "Mynd i Linell"
-
 #~ msgid "_Go to Line"
 #~ msgstr "_Mynd i Linell"
-
 #~ msgid "The text \"%s\" was not found."
 #~ msgstr "Ni ganfodwyd y testun \"%s\"."
-
 #~ msgid "Set program location..."
 #~ msgstr "Gosod lleoliad y rhaglen..."
-
 #~ msgid ""
 #~ "The %s plugin uses an external program, called <tt>%s</tt>, to perform "
 #~ "its task.\n"
@@ -5844,108 +5462,72 @@ msgstr "_Defnyddio fformat addasedig"
 #~ "cyflawni ei dasg.\n"
 #~ "\n"
 #~ "Os gwelwch yn dda, penodwch leoliad y rhaglen <tt>%s</tt>."
-
 #~ msgid "Goto Line"
 #~ msgstr "Mynd i Linell"
-
 #~ msgid "_Line number:"
 #~ msgstr "_Rhif Linell:"
-
 #~ msgid "button1"
 #~ msgstr "botwm1"
-
 #~ msgid "dialog1"
 #~ msgstr "deialog1"
-
 #~ msgid "Browse for program location..."
 #~ msgstr "Pori ar gyfer lleoliad rhaglen..."
-
 #~ msgid "label"
 #~ msgstr "label"
-
-#~ msgid "Find Next"
-#~ msgstr "Canfod Nesaf"
-
 #~ msgid "Open from URI"
 #~ msgstr "Agor o URI"
-
-#~ msgid "%s %d"
-#~ msgstr "%s %d"
-
 #~ msgid "Invalid UTF-8 data"
 #~ msgstr "UTF-8 annilys"
-
 #~ msgid "Could not read symbolic link information for %s"
 #~ msgstr "Methwyd darllen gwybodaeth cyswllt symbolaidd ar gyfer %s"
-
 #~ msgid "The file has too many symbolic links."
 #~ msgstr "Mae gan y ffeil ormod o gysylltau symbolaidd."
-
 #~ msgid "gedit cannot handle %s: locations in write mode."
 #~ msgstr "Ni all gedit ymddelio a lleoliadau %s: yn y modd ysgrifennu."
-
 #~ msgid "gedit cannot handle this kind of location in write mode."
 #~ msgstr "Ni all gedit ymddelio a'r math hwn o leoliad yn y modd ysgrifennu."
-
 #~ msgid "A file named \"%s\" already exists.\n"
 #~ msgstr "Mae ffeil o'r enw \"%s\" yn bodoli eisoes.\n"
-
 #~ msgid "Select a file to open"
 #~ msgstr "Dewiswch ffeil i'w hagor"
-
 #~ msgid "Select files to open"
 #~ msgstr "Dewiswch ffeiliau i'w agor"
-
 #~ msgid "Select a filename to save"
 #~ msgstr "Dewiswch enw ffeil er mwyn cadw"
-
 #~ msgid "Saving document \"%s\"..."
 #~ msgstr "Cadw'r ddogfen \"%s\"..."
-
 #~ msgid "The document \"%s\" has not been saved."
 #~ msgstr "Nid yw'r ddogfen \"%s\" wedi ei chadw."
-
 #~ msgid "The document \"%s\" has been saved."
 #~ msgstr "Mae'r ddogfen \"%s\" wedi ei chadw."
-
 #~ msgid "Save as..."
 #~ msgstr "Cadw fel..."
-
 #~ msgid "Error reverting the document \"%s\"."
 #~ msgstr "Gwall wrth adfer y ddogfen \"%s\"."
-
 #~ msgid "The document \"%s\" has not been reverted."
 #~ msgstr "Ni chafodd y ddogfen \"%s\" ei hadfer."
-
 #~ msgid "The document \"%s\" has been reverted."
 #~ msgstr "Cafodd y ddogfen \"%s\" ei hadfer."
-
 #~ msgid "Could not read data from stdin."
 #~ msgstr "Methwyd darllen data o'r mewnbwn safonol."
-
 #~ msgid "Loaded file \"%s\""
 #~ msgstr "Llwythwyd ffeil \"%s\""
-
 #~ msgid "Loaded %d file"
 #~ msgid_plural "Loaded %d files"
 #~ msgstr[0] "Llwythwyd %d ffeil"
 #~ msgstr[1] "Llwythwyd %d ffeil"
 #~ msgstr[2] "Llwythwyd %d ffeil"
 #~ msgstr[3] "Llwythwyd %d ffeil"
-
 #~ msgid "Created file \"%s\""
 #~ msgstr "Wedi creu ffeil \"%s\""
-
 #~ msgid "Access was denied."
 #~ msgstr "Gwrthodwyd mynediad."
-
 #~ msgid ""
 #~ "there are too many open files. Please, close some open files and try "
 #~ "again."
 #~ msgstr ""
 #~ "mae gormod o ffeiliau ar agor. Caewch ryw ffeiliau sydd ar agor, cyn "
 #~ "ceisio eto."
-
 #~ msgid ""
 #~ "gedit was not able to automatically detect the character coding. Please, "
 #~ "check that you are not trying to open a binary file and try again "
@@ -5955,7 +5537,6 @@ msgstr "_Defnyddio fformat addasedig"
 #~ "Methodd gedit ganfod yr amgodiad nodau yn awtomatig. Gwiriwch nad ydych "
 #~ "chi'n ceisio agor ffeil ddeuaidd a cheisiwch eto gan ddewis amgodiad "
 #~ "nodau yn y ddeialog 'Agor Ffeil...' (neu 'Agor Lleoliad')"
-
 #~ msgid ""
 #~ "Please, check that you are not trying to open a binary file and that you "
 #~ "selected the right character coding in the 'Open File... ' (or 'Open "
@@ -5964,3 +5545,4 @@ msgstr "_Defnyddio fformat addasedig"
 #~ "Gwiriwch nad ydych chi'n ceisio agor ffeil ddeuaidd ac eich bod chi wedi "
 #~ "dewis yr amgodiad nodau cywir yn y ddeialog 'Agor Ffeil...' (neu 'Agor "
 #~ "Lleoliad'), a cheisiwch eto."
+



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]