[glib] Updated Welsh translation

[Iestyn Mathonwy Pryce <impryce src gnome org>]

commit 473fd041324931cc1267e354408475058611d740
Author: Iestyn Pryce <dylunio gmail com>
Date:   Sun Dec 20 12:03:19 2009 +0000

    Updated Welsh translation

 po/cy.po | 1114 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 561 insertions(+), 553 deletions(-)
---
diff --git a/po/cy.po b/po/cy.po
index ff7ee25..0abd7f7 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -3,349 +3,353 @@
 # Kyfieithu (http://www.kyfieithu.co.uk), 2003.
 # Dafydd Harries <daf parnassus ath cx>, 2003 2004.
 # Rhys Jones <rhys sucs org>, 2003-2006.
-#
+# Iestyn Pryce <dylunio gmail com>, 2009.
 msgid ""
 msgstr ""
 "Project-Id-Version: glib\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-29 23:30-0500\n"
-"PO-Revision-Date: 2006-06-29 19:38+0100\n"
-"Last-Translator: Rhys Jones <rhys sucs org>\n"
+"POT-Creation-Date: 2009-12-20 12:02+0000\n"
+"PO-Revision-Date: 2009-12-20 12:02+0100\n"
+"Last-Translator: Iestyn Pryce <dylunio gmail com>\n"
 "Language-Team: Welsh <gnome-cy pengwyn linux org uk>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: cy\n"
+"Plural-Forms: nplurals=2; plural=(n==2) ? 1 : 0;\n"
+"X-Generator: Virtaal 0.5.0\n"
 
-#: glib/gbookmarkfile.c:737
+#: ../glib/gbookmarkfile.c:737
 #, c-format
 msgid "Unexpected attribute '%s' for element '%s'"
 msgstr "Priodwedd annisgwyl '%s' i'r elfen '%s'"
 
-#: glib/gbookmarkfile.c:748 glib/gbookmarkfile.c:819 glib/gbookmarkfile.c:829
-#: glib/gbookmarkfile.c:936
+#: ../glib/gbookmarkfile.c:748 ../glib/gbookmarkfile.c:819
+#: ../glib/gbookmarkfile.c:829 ../glib/gbookmarkfile.c:936
 #, c-format
 msgid "Attribute '%s' of element '%s' not found"
 msgstr "Priodwedd '%s' o elfen '%s' heb ei chanfod"
 
-#: glib/gbookmarkfile.c:1106 glib/gbookmarkfile.c:1171
-#: glib/gbookmarkfile.c:1235 glib/gbookmarkfile.c:1245
+#: ../glib/gbookmarkfile.c:1106 ../glib/gbookmarkfile.c:1171
+#: ../glib/gbookmarkfile.c:1235 ../glib/gbookmarkfile.c:1245
 #, c-format
 msgid "Unexpected tag '%s', tag '%s' expected"
 msgstr "Tag annisgwyl '%s'; disgwyliwyd y tag '%s'"
 
-#: glib/gbookmarkfile.c:1131 glib/gbookmarkfile.c:1145
-#: glib/gbookmarkfile.c:1213 glib/gbookmarkfile.c:1265
+#: ../glib/gbookmarkfile.c:1131 ../glib/gbookmarkfile.c:1145
+#: ../glib/gbookmarkfile.c:1213 ../glib/gbookmarkfile.c:1265
 #, c-format
 msgid "Unexpected tag '%s' inside '%s'"
 msgstr "Tag annisgwyl '%s' o fewn '%s'"
 
-#: glib/gbookmarkfile.c:1793
+#: ../glib/gbookmarkfile.c:1793
 #, fuzzy
 msgid "No valid bookmark file found in data dirs"
-msgstr "Ni ddarganfuwyd ffeil llyfrnodau ddilys yn y cyfeiriaduron data"
+msgstr "Ni ddarganfuwyd ffeil llyfrnodau ddilys yn y plygell data"
 
-#: glib/gbookmarkfile.c:1994
+#: ../glib/gbookmarkfile.c:1994
 #, c-format
 msgid "A bookmark for URI '%s' already exists"
 msgstr "Llyfrnod ar gyfer yr URI '%s' yn bodoli eisoes"
 
-#: glib/gbookmarkfile.c:2040 glib/gbookmarkfile.c:2198
-#: glib/gbookmarkfile.c:2283 glib/gbookmarkfile.c:2363
-#: glib/gbookmarkfile.c:2448 glib/gbookmarkfile.c:2531
-#: glib/gbookmarkfile.c:2609 glib/gbookmarkfile.c:2688
-#: glib/gbookmarkfile.c:2730 glib/gbookmarkfile.c:2827
-#: glib/gbookmarkfile.c:2953 glib/gbookmarkfile.c:3143
-#: glib/gbookmarkfile.c:3219 glib/gbookmarkfile.c:3384
-#: glib/gbookmarkfile.c:3473 glib/gbookmarkfile.c:3563
-#: glib/gbookmarkfile.c:3691
+#: ../glib/gbookmarkfile.c:2040 ../glib/gbookmarkfile.c:2198
+#: ../glib/gbookmarkfile.c:2283 ../glib/gbookmarkfile.c:2363
+#: ../glib/gbookmarkfile.c:2448 ../glib/gbookmarkfile.c:2531
+#: ../glib/gbookmarkfile.c:2609 ../glib/gbookmarkfile.c:2688
+#: ../glib/gbookmarkfile.c:2730 ../glib/gbookmarkfile.c:2827
+#: ../glib/gbookmarkfile.c:2953 ../glib/gbookmarkfile.c:3143
+#: ../glib/gbookmarkfile.c:3219 ../glib/gbookmarkfile.c:3384
+#: ../glib/gbookmarkfile.c:3473 ../glib/gbookmarkfile.c:3563
+#: ../glib/gbookmarkfile.c:3691
 #, c-format
 msgid "No bookmark found for URI '%s'"
 msgstr "Dim llyfrnod wedi ei ganfod ar gyfer yr URI '%s'"
 
-#: glib/gbookmarkfile.c:2372
+#: ../glib/gbookmarkfile.c:2372
 #, c-format
 msgid "No MIME type defined in the bookmark for URI '%s'"
 msgstr "Dim math MIME wedi'i ddiffinio yn y llyfrnod ar gyfer yr URI '%s'"
 
-#: glib/gbookmarkfile.c:2457
+#: ../glib/gbookmarkfile.c:2457
 #, c-format
 msgid "No private flag has been defined in bookmark for URI '%s'"
 msgstr "Dim baner breifat wedi'i diffinio yn y llyfrnod ar gyfer yr URI '%s'"
 
-#: glib/gbookmarkfile.c:2836
+#: ../glib/gbookmarkfile.c:2836
 #, c-format
 msgid "No groups set in bookmark for URI '%s'"
 msgstr "Dim grwpiau wedi'u gosod yn y llyfrnod ar gyfer yr URI '%s'"
 
-#: glib/gbookmarkfile.c:3237 glib/gbookmarkfile.c:3394
+#: ../glib/gbookmarkfile.c:3237 ../glib/gbookmarkfile.c:3394
 #, c-format
 msgid "No application with name '%s' registered a bookmark for '%s'"
 msgstr "Does dim un rhaglen o'r enw '%s' wedi cofrestru llyfrnod ar gyfer '%s'"
 
-#: glib/gbookmarkfile.c:3417
+#: ../glib/gbookmarkfile.c:3417
 #, fuzzy, c-format
 msgid "Failed to expand exec line '%s' with URI '%s'"
 msgstr "Methwyd darllen y cyswllt symbolaidd '%s': %s"
 
-#: glib/gconvert.c:437 glib/gconvert.c:515 glib/giochannel.c:1230
+#: ../glib/gconvert.c:437 ../glib/gconvert.c:515 ../glib/giochannel.c:1230
 #, c-format
 msgid "Conversion from character set '%s' to '%s' is not supported"
 msgstr "Ni chynhelir trawsnewidiad o set nodau '%s' i '%s'"
 
-#: glib/gconvert.c:441 glib/gconvert.c:519
+#: ../glib/gconvert.c:441 ../glib/gconvert.c:519
 #, c-format
 msgid "Could not open converter from '%s' to '%s'"
 msgstr "Methwyd agor trawsnewidydd rhwng '%s' a '%s'"
 
-#: glib/gconvert.c:638 glib/gconvert.c:1031 glib/giochannel.c:1402
-#: glib/giochannel.c:1444 glib/giochannel.c:2288 glib/gutf8.c:964
-#: glib/gutf8.c:1419
+#: ../glib/gconvert.c:638 ../glib/gconvert.c:1031 ../glib/giochannel.c:1402
+#: ../glib/giochannel.c:1444 ../glib/giochannel.c:2288 ../glib/gutf8.c:964
+#: ../glib/gutf8.c:1419
 msgid "Invalid byte sequence in conversion input"
 msgstr "Dilyniant beit annilys ym mewnbwn trawsnewid"
 
-#: glib/gconvert.c:646 glib/gconvert.c:956 glib/giochannel.c:1409
-#: glib/giochannel.c:2300
+#: ../glib/gconvert.c:646 ../glib/gconvert.c:956 ../glib/giochannel.c:1409
+#: ../glib/giochannel.c:2300
 #, c-format
 msgid "Error during conversion: %s"
 msgstr "Gwall wrth drawsnewid: %s"
 
-#: glib/gconvert.c:678 glib/gutf8.c:960 glib/gutf8.c:1170 glib/gutf8.c:1311
-#: glib/gutf8.c:1415
+#: ../glib/gconvert.c:678 ../glib/gutf8.c:960 ../glib/gutf8.c:1170
+#: ../glib/gutf8.c:1311 ../glib/gutf8.c:1415
 msgid "Partial character sequence at end of input"
 msgstr "Dilyniant nod rhannol ar ddiwedd y mewnbwn"
 
-#: glib/gconvert.c:928
+#: ../glib/gconvert.c:928
 #, c-format
 msgid "Cannot convert fallback '%s' to codeset '%s'"
 msgstr "Methu trawsnewid '%s' wrth gefn i'r set godau '%s'"
 
-#: glib/gconvert.c:1751
+#: ../glib/gconvert.c:1751
 #, c-format
 msgid "The URI '%s' is not an absolute URI using the \"file\" scheme"
 msgstr "Nid yw'r LAU '%s' yn LAU absoliwt yn y cynllun \"file\""
 
-#: glib/gconvert.c:1761
+#: ../glib/gconvert.c:1761
 #, c-format
 msgid "The local file URI '%s' may not include a '#'"
 msgstr "Ni chaniateir i'r LAU ffeil lleol '%s' gynnwys '#'"
 
-#: glib/gconvert.c:1778
+#: ../glib/gconvert.c:1778
 #, c-format
 msgid "The URI '%s' is invalid"
 msgstr "Mae'r LAU '%s' yn annilys"
 
-#: glib/gconvert.c:1790
+#: ../glib/gconvert.c:1790
 #, c-format
 msgid "The hostname of the URI '%s' is invalid"
 msgstr "Mae'r enw gwesteiwr yn y LAU '%s' yn annilys"
 
-#: glib/gconvert.c:1806
+#: ../glib/gconvert.c:1806
 #, c-format
 msgid "The URI '%s' contains invalidly escaped characters"
 msgstr "Mae'r LAU '%s' yn cynnwys nodau wedi eu dianc mewn modd annilys"
 
-#: glib/gconvert.c:1901
+#: ../glib/gconvert.c:1901
 #, c-format
 msgid "The pathname '%s' is not an absolute path"
 msgstr "Nid yw'r llwybr '%s' yn llwybr gosodedig"
 
-#: glib/gconvert.c:1911
+#: ../glib/gconvert.c:1911
 msgid "Invalid hostname"
 msgstr "Enw gwesteiwr annilys"
 
-#: glib/gdir.c:112 glib/gdir.c:135
+#: ../glib/gdir.c:112 ../glib/gdir.c:135
 #, c-format
 msgid "Error opening directory '%s': %s"
 msgstr "Gwall y cyfeiriadur '%s': %s"
 
-#: glib/gfileutils.c:536 glib/gfileutils.c:624
+#: ../glib/gfileutils.c:536 ../glib/gfileutils.c:624
 #, c-format
 msgid "Could not allocate %lu bytes to read file \"%s\""
 msgstr "Methwyd canfod %lu beit er mwyn darllen y ffeil \"%s\""
 
-#: glib/gfileutils.c:551
+#: ../glib/gfileutils.c:551
 #, c-format
 msgid "Error reading file '%s': %s"
 msgstr "Gwall wrth ddarllen ffeil '%s': %s "
 
-#: glib/gfileutils.c:565
+#: ../glib/gfileutils.c:565
 #, c-format
 msgid "File \"%s\" is too large"
-msgstr ""
+msgstr "Mae'r ffeil \"%s\" yn rhy fawr"
 
-#: glib/gfileutils.c:648
+#: ../glib/gfileutils.c:648
 #, c-format
 msgid "Failed to read from file '%s': %s"
 msgstr "Methwyd darllen o'r ffeil '%s': %s"
 
-#: glib/gfileutils.c:699 glib/gfileutils.c:786
+#: ../glib/gfileutils.c:699 ../glib/gfileutils.c:786
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Methwyd agor y ffeil '%s': %s"
 
-#: glib/gfileutils.c:716 glib/gmappedfile.c:141
+#: ../glib/gfileutils.c:716 ../glib/gmappedfile.c:141
 #, c-format
 msgid "Failed to get attributes of file '%s': fstat() failed: %s"
 msgstr "Methwyd darllen agweddau ffeil '%s': methiant fstat(): %s"
 
-#: glib/gfileutils.c:750
+#: ../glib/gfileutils.c:750
 #, c-format
 msgid "Failed to open file '%s': fdopen() failed: %s"
 msgstr "Methwyd agor y ffeil '%s': methiant yn fdopen(): %s"
 
-#: glib/gfileutils.c:858
+#: ../glib/gfileutils.c:858
 #, c-format
 msgid "Failed to rename file '%s' to '%s': g_rename() failed: %s"
 msgstr "Methwyd ail-enwi'r ffeil'%s' i '%s': methodd g_rename(): %s"
 
-#: glib/gfileutils.c:900 glib/gfileutils.c:1366
+#: ../glib/gfileutils.c:900 ../glib/gfileutils.c:1366
 #, c-format
 msgid "Failed to create file '%s': %s"
 msgstr "Methwyd creu'r ffeil '%s': %s"
 
-#: glib/gfileutils.c:914
+#: ../glib/gfileutils.c:914
 #, c-format
 msgid "Failed to open file '%s' for writing: fdopen() failed: %s"
 msgstr "Methu agor y ffeil '%s' er mwyn ysgrifennu iddi: methodd fdopen(): %s"
 
-#: glib/gfileutils.c:939
+#: ../glib/gfileutils.c:939
 #, c-format
 msgid "Failed to write file '%s': fwrite() failed: %s"
 msgstr "Methwyd ysgrifennu i'r ffeil '%s': methodd fwrite(): %s"
 
-#: glib/gfileutils.c:958
-#, fuzzy, c-format
+#: ../glib/gfileutils.c:958
+#, c-format
 msgid "Failed to write file '%s': fflush() failed: %s"
-msgstr "Methwyd ysgrifennu i'r ffeil '%s': methodd fwrite(): %s"
+msgstr "Methwyd ysgrifennu i'r ffeil '%s': methodd fflush(): %s"
 
-#: glib/gfileutils.c:987
-#, fuzzy, c-format
+#: ../glib/gfileutils.c:987
+#, c-format
 msgid "Failed to write file '%s': fsync() failed: %s"
-msgstr "Methwyd ysgrifennu i'r ffeil '%s': methodd fwrite(): %s"
+msgstr "Methwyd ysgrifennu i'r ffeil '%s': methodd fsync(): %s"
 
-#: glib/gfileutils.c:1006
+#: ../glib/gfileutils.c:1006
 #, c-format
 msgid "Failed to close file '%s': fclose() failed: %s"
 msgstr "Methwyd cau'r ffeil '%s': methodd fclose(): %s"
 
-#: glib/gfileutils.c:1124
+#: ../glib/gfileutils.c:1124
 #, c-format
 msgid "Existing file '%s' could not be removed: g_unlink() failed: %s"
 msgstr "Methu tynnu'r ffeil '%s' oedd eisoes yn bodoli: methodd g_unlink(): %s"
 
-#: glib/gfileutils.c:1328
+#: ../glib/gfileutils.c:1328
 #, c-format
 msgid "Template '%s' invalid, should not contain a '%s'"
 msgstr "Mae'r patrymlun '%s' yn annilys: ni ddylai gynnwys '%s'"
 
-#: glib/gfileutils.c:1341
+#: ../glib/gfileutils.c:1341
 #, c-format
 msgid "Template '%s' doesn't contain XXXXXX"
 msgstr "Nid yw'r patrymlun '%s' yn cynnwys XXXXXX"
 
-#: glib/gfileutils.c:1774
+#: ../glib/gfileutils.c:1774
 #, c-format
 msgid "%u byte"
 msgid_plural "%u bytes"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%u beit"
+msgstr[1] "%u beit"
 
-#: glib/gfileutils.c:1782
+#: ../glib/gfileutils.c:1782
 #, c-format
 msgid "%.1f KB"
-msgstr ""
+msgstr "%.1f KB"
 
-#: glib/gfileutils.c:1787
+#: ../glib/gfileutils.c:1787
 #, c-format
 msgid "%.1f MB"
-msgstr ""
+msgstr "%.1f MB"
 
-#: glib/gfileutils.c:1792
+#: ../glib/gfileutils.c:1792
 #, c-format
 msgid "%.1f GB"
-msgstr ""
+msgstr "%.1f GB"
 
-#: glib/gfileutils.c:1797
+#: ../glib/gfileutils.c:1797
 #, c-format
 msgid "%.1f TB"
-msgstr ""
+msgstr "%.1f TB"
 
-#: glib/gfileutils.c:1802
+#: ../glib/gfileutils.c:1802
 #, c-format
 msgid "%.1f PB"
-msgstr ""
+msgstr "%.1f PB"
 
-#: glib/gfileutils.c:1807
+#: ../glib/gfileutils.c:1807
 #, c-format
 msgid "%.1f EB"
-msgstr ""
+msgstr "%.1f EB"
 
-#: glib/gfileutils.c:1850
+#: ../glib/gfileutils.c:1850
 #, c-format
 msgid "Failed to read the symbolic link '%s': %s"
 msgstr "Methwyd darllen y cyswllt symbolaidd '%s': %s"
 
-#: glib/gfileutils.c:1871
+#: ../glib/gfileutils.c:1871
 msgid "Symbolic links not supported"
 msgstr "Ni chynhelir cysylltion symbolaidd"
 
-#: glib/giochannel.c:1234
+#: ../glib/giochannel.c:1234
 #, c-format
 msgid "Could not open converter from '%s' to '%s': %s"
 msgstr "Methwyd agor trawsnewidydd o '%s' i '%s': %s"
 
-#: glib/giochannel.c:1579
+#: ../glib/giochannel.c:1579
 msgid "Can't do a raw read in g_io_channel_read_line_string"
 msgstr "Methu gwneud darlleniad crau yn g_io_channel_read_line_string"
 
-#: glib/giochannel.c:1626 glib/giochannel.c:1884 glib/giochannel.c:1971
+#: ../glib/giochannel.c:1626 ../glib/giochannel.c:1884
+#: ../glib/giochannel.c:1971
 msgid "Leftover unconverted data in read buffer"
 msgstr "Data dros ben heb ei drawsnewid yn y byffer ddarllen"
 
-#: glib/giochannel.c:1707 glib/giochannel.c:1784
+#: ../glib/giochannel.c:1707 ../glib/giochannel.c:1784
 msgid "Channel terminates in a partial character"
 msgstr "Mae'r sianel yn gorffen a nod rhannol"
 
-#: glib/giochannel.c:1770
+#: ../glib/giochannel.c:1770
 msgid "Can't do a raw read in g_io_channel_read_to_end"
 msgstr "Methu gwneud darlleniad crai yn g_io_channel_read_to_end"
 
-#: glib/gmappedfile.c:123
+#: ../glib/gmappedfile.c:123
 #, c-format
 msgid "Failed to open file '%s': open() failed: %s"
 msgstr "Methwyd agor y ffeil '%s': methodd open(): %s"
 
-#: glib/gmappedfile.c:201
+#: ../glib/gmappedfile.c:201
 #, c-format
 msgid "Failed to map file '%s': mmap() failed: %s"
 msgstr "Methwyd mapio'r ffeil '%s': methodd mmap(): %s"
 
-#: glib/gmarkup.c:303 glib/gmarkup.c:343
-#, fuzzy, c-format
+#: ../glib/gmarkup.c:303 ../glib/gmarkup.c:343
+#, c-format
 msgid "Error on line %d char %d: "
-msgstr "Gwall ar linell %d golofn %d: %s"
+msgstr "Gwall ar linell %d golofn %d: "
 
-#: glib/gmarkup.c:363 glib/gmarkup.c:441
+#: ../glib/gmarkup.c:363 ../glib/gmarkup.c:441
 #, fuzzy, c-format
 msgid "Invalid UTF-8 encoded text in name - not valid '%s'"
 msgstr "Testun annilys wedi ei amgodio fel UTF-8"
 
-#: glib/gmarkup.c:374
+#: ../glib/gmarkup.c:374
 #, c-format
 msgid "'%s' is not a valid name "
-msgstr ""
+msgstr "dydy '%s' ddim yn enw dilys"
 
-#: glib/gmarkup.c:390
+#: ../glib/gmarkup.c:390
 #, c-format
 msgid "'%s' is not a valid name: '%c' "
-msgstr ""
+msgstr "dydy '%s' ddim yn enw dilys: '%c'"
 
-#: glib/gmarkup.c:494
+#: ../glib/gmarkup.c:494
 #, c-format
 msgid "Error on line %d: %s"
 msgstr "Gwall ar linell %d: %s"
 
-#: glib/gmarkup.c:578
+#: ../glib/gmarkup.c:578
 #, c-format
 msgid ""
 "Failed to parse '%-.*s', which should have been a digit inside a character "
@@ -354,7 +358,7 @@ msgstr ""
 "Methwyd adnabod '%-.*s', a ddylai fod yn ddigid o fewn cyfeiriant nod "
 "(&#234; er enghraifft) - hwyrach fod y digid yn rhy fawr"
 
-#: glib/gmarkup.c:590
+#: ../glib/gmarkup.c:590
 msgid ""
 "Character reference did not end with a semicolon; most likely you used an "
 "ampersand character without intending to start an entity - escape ampersand "
@@ -363,23 +367,23 @@ msgstr ""
 "Ni orffennwyd cyfeiriant nod gyda hanner-colon - mwy na thebyg y defnyddiwyd "
 "ampersand heb fwriadu dechrau endid - dylid defnyddio &amp; yn lle"
 
-#: glib/gmarkup.c:616
+#: ../glib/gmarkup.c:616
 #, c-format
 msgid "Character reference '%-.*s' does not encode a permitted character"
 msgstr "Nid yw'r cyfeiriant nod '%-.*s' yn amgodio nod a ganiateir"
 
-#: glib/gmarkup.c:654
+#: ../glib/gmarkup.c:654
 msgid ""
 "Empty entity '&;' seen; valid entities are: &amp; &quot; &lt; &gt; &apos;"
 msgstr ""
 "Gwelwyd endid gwag '&;'; mae &amp; &quot; &lt; &gt; a &apos; yn endidau dilys"
 
-#: glib/gmarkup.c:662
-#, fuzzy, c-format
+#: ../glib/gmarkup.c:662
+#, c-format
 msgid "Entity name '%-.*s' is not known"
-msgstr "Mae'r enw endid '%s' yn anhysbys"
+msgstr "Mae'r enw endid '%-.*s' yn anhysbys"
 
-#: glib/gmarkup.c:667
+#: ../glib/gmarkup.c:667
 msgid ""
 "Entity did not end with a semicolon; most likely you used an ampersand "
 "character without intending to start an entity - escape ampersand as &amp;"
@@ -387,11 +391,11 @@ msgstr ""
 "Ni orffennwyd yr endid gyda hanner-colon - mwy na thebyg y defnyddiwyd "
 "ampersand heb fwriadu dechrau endid - dylid defnyddio &amp; yn lle"
 
-#: glib/gmarkup.c:1014
+#: ../glib/gmarkup.c:1014
 msgid "Document must begin with an element (e.g. <book>)"
 msgstr "Rhaid i'r ddogfen ddechrau gydag elfen (e.e. <llyfr>)"
 
-#: glib/gmarkup.c:1054
+#: ../glib/gmarkup.c:1054
 #, c-format
 msgid ""
 "'%s' is not a valid character following a '<' character; it may not begin an "
@@ -399,14 +403,14 @@ msgid ""
 msgstr ""
 "Nid yw '%s' yn nod dilys yn dilyn '<'; nid yw'n gallu dechrau enw elfen"
 
-#: glib/gmarkup.c:1122
-#, fuzzy, c-format
+#: ../glib/gmarkup.c:1122
+#, c-format
 msgid ""
 "Odd character '%s', expected a '>' character to end the empty-element tag '%"
 "s'"
-msgstr "Nod od '%s', disgwyliwyd '>' er mwyn gorffen tag dechrau'r elfen '%s'"
+msgstr "Nod od '%s', disgwyliwyd nod '>' er mwyn gorffen y tag elfen wag '%s'"
 
-#: glib/gmarkup.c:1206
+#: ../glib/gmarkup.c:1206
 #, c-format
 msgid ""
 "Odd character '%s', expected a '=' after attribute name '%s' of element '%s'"
@@ -414,7 +418,7 @@ msgstr ""
 "Nod od '%s', disgwyliwyd '=' ar ôl yr enw priodoledd '%s' o'r elfen '%s'"
 
 # c-format
-#: glib/gmarkup.c:1247
+#: ../glib/gmarkup.c:1247
 #, c-format
 msgid ""
 "Odd character '%s', expected a '>' or '/' character to end the start tag of "
@@ -425,7 +429,7 @@ msgstr ""
 "s', neu briodoledd ddewisol; efallai defnyddiwyd nod annilys mewn enw "
 "priodoledd"
 
-#: glib/gmarkup.c:1291
+#: ../glib/gmarkup.c:1291
 #, c-format
 msgid ""
 "Odd character '%s', expected an open quote mark after the equals sign when "
@@ -434,7 +438,7 @@ msgstr ""
 "Nod od '%s', disgwyliwyd dyfynnod agored ar ôl y '=' wrth roi gwerth i'r "
 "priodoledd '%s' o'r elfen '%s'"
 
-#: glib/gmarkup.c:1425
+#: ../glib/gmarkup.c:1425
 #, c-format
 msgid ""
 "'%s' is not a valid character following the characters '</'; '%s' may not "
@@ -443,7 +447,7 @@ msgstr ""
 "Nid yw '%s' yn nod ddilys yn dilyn y nodau '</'; nid yw '%s' yn gallu "
 "dechrau enw elfen."
 
-#: glib/gmarkup.c:1461
+#: ../glib/gmarkup.c:1461
 #, c-format
 msgid ""
 "'%s' is not a valid character following the close element name '%s'; the "
@@ -452,26 +456,26 @@ msgstr ""
 "Nid yw '%s' yn nod ddilys yn dilyn y nodau '</'; nid yw '%s' yn gallu "
 "dechrau enw elfen."
 
-#: glib/gmarkup.c:1472
+#: ../glib/gmarkup.c:1472
 #, c-format
 msgid "Element '%s' was closed, no element is currently open"
 msgstr "Cafodd yr elfen '%s' ei gau, nid oes elfen ar agor ar hyn o bryd"
 
-#: glib/gmarkup.c:1481
+#: ../glib/gmarkup.c:1481
 #, c-format
 msgid "Element '%s' was closed, but the currently open element is '%s'"
 msgstr ""
 "Cafodd yr elfen '%s' ei gau, ond yr elfen sydd ar agor ar hyn o bryd yw '%s'"
 
-#: glib/gmarkup.c:1648
+#: ../glib/gmarkup.c:1648
 msgid "Document was empty or contained only whitespace"
 msgstr "Roedd y ddogfen yn wag neu'n cynnwys gofod yn unig"
 
-#: glib/gmarkup.c:1662
+#: ../glib/gmarkup.c:1662
 msgid "Document ended unexpectedly just after an open angle bracket '<'"
 msgstr "Gorffennodd y ddogfen yn annisgwyl ar ôl '<'"
 
-#: glib/gmarkup.c:1670 glib/gmarkup.c:1715
+#: ../glib/gmarkup.c:1670 ../glib/gmarkup.c:1715
 #, c-format
 msgid ""
 "Document ended unexpectedly with elements still open - '%s' was the last "
@@ -480,7 +484,7 @@ msgstr ""
 "Gorffennodd y ddogfen yn annisgwyl tra roedd elfennau ar agor - '%s' oedd yr "
 "elfen ddiwethaf a agorwyd"
 
-#: glib/gmarkup.c:1678
+#: ../glib/gmarkup.c:1678
 #, c-format
 msgid ""
 "Document ended unexpectedly, expected to see a close angle bracket ending "
@@ -489,19 +493,19 @@ msgstr ""
 "Gorffennodd y ddogfen yn annisgwyl, disgwyliwyd ongl-fraced caeedig i "
 "ddiweddu'r tag <%s/>"
 
-#: glib/gmarkup.c:1684
+#: ../glib/gmarkup.c:1684
 msgid "Document ended unexpectedly inside an element name"
 msgstr "Gorffennodd y ddogfen yn annisgwyl y tu fewn i enw elfen"
 
-#: glib/gmarkup.c:1690
+#: ../glib/gmarkup.c:1690
 msgid "Document ended unexpectedly inside an attribute name"
 msgstr "Gorffennodd y ddogfen yn annisgwyl y tu fewn i enw priodoledd"
 
-#: glib/gmarkup.c:1695
+#: ../glib/gmarkup.c:1695
 msgid "Document ended unexpectedly inside an element-opening tag."
 msgstr "Gorffennodd y ddogfen yn annisgwyl y tu fewn i dag agor elfen"
 
-#: glib/gmarkup.c:1701
+#: ../glib/gmarkup.c:1701
 msgid ""
 "Document ended unexpectedly after the equals sign following an attribute "
 "name; no attribute value"
@@ -509,399 +513,401 @@ msgstr ""
 "Gorffennodd y ddogfen yn annisgwyl ar ôl yr hafalnod yn dilyn enw "
 "priodoledd; dim gwerth priodoledd"
 
-#: glib/gmarkup.c:1708
+#: ../glib/gmarkup.c:1708
 msgid "Document ended unexpectedly while inside an attribute value"
 msgstr "Gorffennodd y ddogfen yn annisgwyl y tu fewn i werth priodoledd"
 
-#: glib/gmarkup.c:1724
+#: ../glib/gmarkup.c:1724
 #, c-format
 msgid "Document ended unexpectedly inside the close tag for element '%s'"
 msgstr "Gorffennodd y ddogfen yn annisgwyl y tu fewn i dag cau'r elfen '%s'"
 
-#: glib/gmarkup.c:1730
+#: ../glib/gmarkup.c:1730
 msgid "Document ended unexpectedly inside a comment or processing instruction"
 msgstr ""
 "Gorffennodd y ddogfen yn annisgwyl y tu fewn i sylw neu gyfarwyddiad brosesu"
 
-#: glib/gregex.c:131
+#: ../glib/gregex.c:131
 msgid "corrupted object"
-msgstr ""
+msgstr "gwrthrych wedi'i lygru"
 
-#: glib/gregex.c:133
+#: ../glib/gregex.c:133
 msgid "internal error or corrupted object"
-msgstr ""
+msgstr "gwall mewnol neu gwrthrych wedi'i lygru"
 
-#: glib/gregex.c:135
+#: ../glib/gregex.c:135
 msgid "out of memory"
-msgstr ""
+msgstr "allan o gof"
 
-#: glib/gregex.c:140
+#: ../glib/gregex.c:140
 msgid "backtracking limit reached"
 msgstr ""
 
-#: glib/gregex.c:152 glib/gregex.c:160
+#: ../glib/gregex.c:152 ../glib/gregex.c:160
 msgid "the pattern contains items not supported for partial matching"
-msgstr ""
+msgstr "mae'r patrwm yn cynnwys eitemau na chynhelir ar gyfer cydweddu rhannol"
 
-#: glib/gregex.c:154 gio/glocalfile.c:2096
+#: ../glib/gregex.c:154 ../gio/glocalfile.c:2096
 msgid "internal error"
-msgstr ""
+msgstr "gwall mewnol"
 
-#: glib/gregex.c:162
+#: ../glib/gregex.c:162
 msgid "back references as conditions are not supported for partial matching"
 msgstr ""
+"dydy cyfeiriadau yn ôl fel amodau heb cynhaliaeth ar gyfer cydweddu rhannol"
 
-#: glib/gregex.c:171
+#: ../glib/gregex.c:171
 msgid "recursion limit reached"
-msgstr ""
+msgstr "wedi cyrraedd cyfyngiad ymgylchu"
 
-#: glib/gregex.c:173
+#: ../glib/gregex.c:173
 msgid "workspace limit for empty substrings reached"
 msgstr ""
 
-#: glib/gregex.c:175
+#: ../glib/gregex.c:175
 msgid "invalid combination of newline flags"
 msgstr ""
 
-#: glib/gregex.c:179
+#: ../glib/gregex.c:179
 msgid "unknown error"
-msgstr ""
+msgstr "gwall anhysbys"
 
-#: glib/gregex.c:199
+#: ../glib/gregex.c:199
 msgid "\\ at end of pattern"
-msgstr ""
+msgstr "\\ ar diwedd patrwm"
 
-#: glib/gregex.c:202
+#: ../glib/gregex.c:202
 msgid "\\c at end of pattern"
-msgstr ""
+msgstr "\\c ar ddiwedd patrwm"
 
-#: glib/gregex.c:205
+#: ../glib/gregex.c:205
 msgid "unrecognized character follows \\"
-msgstr ""
+msgstr "mae nod anhysbys yn dilyn \\"
 
-#: glib/gregex.c:212
+#: ../glib/gregex.c:212
 msgid "case-changing escapes (\\l, \\L, \\u, \\U) are not allowed here"
 msgstr ""
 
-#: glib/gregex.c:215
+#: ../glib/gregex.c:215
 msgid "numbers out of order in {} quantifier"
 msgstr ""
 
-#: glib/gregex.c:218
+#: ../glib/gregex.c:218
 msgid "number too big in {} quantifier"
 msgstr ""
 
-#: glib/gregex.c:221
+#: ../glib/gregex.c:221
 #, fuzzy
 msgid "missing terminating ] for character class"
 msgstr "Mae'r sianel yn gorffen a nod rhannol"
 
-#: glib/gregex.c:224
+#: ../glib/gregex.c:224
 #, fuzzy
 msgid "invalid escape sequence in character class"
 msgstr "Dilyniant beit annilys ym mewnbwn trawsnewid"
 
-#: glib/gregex.c:227
+#: ../glib/gregex.c:227
 msgid "range out of order in character class"
 msgstr ""
 
-#: glib/gregex.c:230
+#: ../glib/gregex.c:230
 msgid "nothing to repeat"
-msgstr ""
+msgstr "dim byd i ailadrodd"
 
-#: glib/gregex.c:233
+#: ../glib/gregex.c:233
 #, fuzzy
 msgid "unrecognized character after (?"
-msgstr "Cyfeiriant nod heb ei orffen"
+msgstr "nod anhysbys ar ôl (?"
 
-#: glib/gregex.c:237
+#: ../glib/gregex.c:237
 #, fuzzy
 msgid "unrecognized character after (?<"
-msgstr "Cyfeiriant nod heb ei orffen"
+msgstr "nod anhysbys ar ôl (?<"
 
-#: glib/gregex.c:241
-#, fuzzy
+#: ../glib/gregex.c:241
 msgid "unrecognized character after (?P"
-msgstr "Cyfeiriant nod heb ei orffen"
+msgstr "nod anhysbys ar ôl (?P"
 
-#: glib/gregex.c:244
+#: ../glib/gregex.c:244
 msgid "POSIX named classes are supported only within a class"
 msgstr ""
 
-#: glib/gregex.c:247
+#: ../glib/gregex.c:247
 msgid "missing terminating )"
-msgstr ""
+msgstr ") terfynol ar goll"
 
-#: glib/gregex.c:251
+#: ../glib/gregex.c:251
 msgid ") without opening ("
-msgstr ""
+msgstr ") heb ( agoriadol"
 
 #. translators: '(?R' and '(?[+-]digits' are both meant as (groups of)
 #. * sequences here, '(?-54' would be an example for the second group.
 #.
-#: glib/gregex.c:258
+#: ../glib/gregex.c:258
 msgid "(?R or (?[+-]digits must be followed by )"
 msgstr ""
 
-#: glib/gregex.c:261
+#: ../glib/gregex.c:261
 msgid "reference to non-existent subpattern"
 msgstr ""
 
-#: glib/gregex.c:264
+#: ../glib/gregex.c:264
 msgid "missing ) after comment"
-msgstr ""
+msgstr ") ar goll ar ôl sylw"
 
-#: glib/gregex.c:267
+#: ../glib/gregex.c:267
 msgid "regular expression too large"
-msgstr ""
+msgstr "mynegiad rheolaidd yn rhy fawr"
 
-#: glib/gregex.c:270
+#: ../glib/gregex.c:270
 msgid "failed to get memory"
-msgstr ""
+msgstr "wedi methu cael cof"
 
-#: glib/gregex.c:273
+#: ../glib/gregex.c:273
 msgid "lookbehind assertion is not fixed length"
 msgstr ""
 
-#: glib/gregex.c:276
+#: ../glib/gregex.c:276
 msgid "malformed number or name after (?("
 msgstr ""
 
-#: glib/gregex.c:279
+#: ../glib/gregex.c:279
 msgid "conditional group contains more than two branches"
 msgstr ""
 
-#: glib/gregex.c:282
+#: ../glib/gregex.c:282
 msgid "assertion expected after (?("
 msgstr ""
 
-#: glib/gregex.c:285
+#: ../glib/gregex.c:285
 msgid "unknown POSIX class name"
-msgstr ""
+msgstr "enw dosbarth POSIX anhysbys"
 
-#: glib/gregex.c:288
+#: ../glib/gregex.c:288
 #, fuzzy
 msgid "POSIX collating elements are not supported"
 msgstr "Ni chynhelir cysylltion symbolaidd"
 
-#: glib/gregex.c:291
+#: ../glib/gregex.c:291
 msgid "character value in \\x{...} sequence is too large"
 msgstr ""
 
-#: glib/gregex.c:294
+#: ../glib/gregex.c:294
 msgid "invalid condition (?(0)"
 msgstr ""
 
-#: glib/gregex.c:297
+#: ../glib/gregex.c:297
 msgid "\\C not allowed in lookbehind assertion"
 msgstr ""
 
-#: glib/gregex.c:300
+#: ../glib/gregex.c:300
 msgid "recursive call could loop indefinitely"
 msgstr ""
 
-#: glib/gregex.c:303
+#: ../glib/gregex.c:303
 msgid "missing terminator in subpattern name"
 msgstr ""
 
-#: glib/gregex.c:306
+#: ../glib/gregex.c:306
 msgid "two named subpatterns have the same name"
 msgstr ""
 
-#: glib/gregex.c:309
+#: ../glib/gregex.c:309
 msgid "malformed \\P or \\p sequence"
 msgstr ""
 
-#: glib/gregex.c:312
+#: ../glib/gregex.c:312
 msgid "unknown property name after \\P or \\p"
 msgstr ""
 
-#: glib/gregex.c:315
+#: ../glib/gregex.c:315
 msgid "subpattern name is too long (maximum 32 characters)"
 msgstr ""
 
-#: glib/gregex.c:318
+#: ../glib/gregex.c:318
 msgid "too many named subpatterns (maximum 10,000)"
 msgstr ""
 
-#: glib/gregex.c:321
+#: ../glib/gregex.c:321
 msgid "octal value is greater than \\377"
-msgstr ""
+msgstr "gwerth octal yn fwy na \\377"
 
-#: glib/gregex.c:324
+#: ../glib/gregex.c:324
 msgid "DEFINE group contains more than one branch"
 msgstr ""
 
-#: glib/gregex.c:327
+#: ../glib/gregex.c:327
 msgid "repeating a DEFINE group is not allowed"
 msgstr ""
 
-#: glib/gregex.c:330
+#: ../glib/gregex.c:330
 msgid "inconsistent NEWLINE options"
 msgstr ""
 
-#: glib/gregex.c:333
+#: ../glib/gregex.c:333
 msgid ""
 "\\g is not followed by a braced name or an optionally braced non-zero number"
 msgstr ""
 
-#: glib/gregex.c:338
+#: ../glib/gregex.c:338
 msgid "unexpected repeat"
-msgstr ""
+msgstr "ailadroddiad anisgwyl"
 
-#: glib/gregex.c:342
+#: ../glib/gregex.c:342
 msgid "code overflow"
 msgstr ""
 
-#: glib/gregex.c:346
+#: ../glib/gregex.c:346
 msgid "overran compiling workspace"
 msgstr ""
 
-#: glib/gregex.c:350
+#: ../glib/gregex.c:350
 msgid "previously-checked referenced subpattern not found"
 msgstr ""
 
-#: glib/gregex.c:522 glib/gregex.c:1603
+#: ../glib/gregex.c:522 ../glib/gregex.c:1603
 #, c-format
 msgid "Error while matching regular expression %s: %s"
-msgstr ""
+msgstr "Gwall tra'n gweddu y mynegiad cyffredinol %s: %s"
 
-#: glib/gregex.c:1094
+#: ../glib/gregex.c:1094
 msgid "PCRE library is compiled without UTF8 support"
-msgstr ""
+msgstr "Mae'r llyfrgell PCRE wedi'i grynhoi heb cymorth UTF8"
 
-#: glib/gregex.c:1103
+#: ../glib/gregex.c:1103
 msgid "PCRE library is compiled without UTF8 properties support"
-msgstr ""
+msgstr "Mae'r llyfrgell PCRE wedi'i grynhoi heb cymorth rhinweddau UTF8"
 
-#: glib/gregex.c:1157
-#, fuzzy, c-format
+#: ../glib/gregex.c:1157
+#, c-format
 msgid "Error while compiling regular expression %s at char %d: %s"
-msgstr "Gwall ar linell %d golofn %d: %s"
+msgstr "Gwall tra'n crynhoi'r mynegiad cyffredinol %s ar golofn %d: %s"
 
-#: glib/gregex.c:1193
+#: ../glib/gregex.c:1193
 #, c-format
 msgid "Error while optimizing regular expression %s: %s"
 msgstr ""
 
-#: glib/gregex.c:2031
+#: ../glib/gregex.c:2031
 msgid "hexadecimal digit or '}' expected"
-msgstr ""
+msgstr "yn disgwyl digid hex neu '}'"
 
-#: glib/gregex.c:2047
+#: ../glib/gregex.c:2047
 msgid "hexadecimal digit expected"
-msgstr ""
+msgstr "yn disgwyl digid hex"
 
-#: glib/gregex.c:2087
+#: ../glib/gregex.c:2087
 msgid "missing '<' in symbolic reference"
 msgstr ""
 
-#: glib/gregex.c:2096
+#: ../glib/gregex.c:2096
 #, fuzzy
 msgid "unfinished symbolic reference"
 msgstr "Cyfeiriant endid heb ei orffen"
 
-#: glib/gregex.c:2103
+#: ../glib/gregex.c:2103
 msgid "zero-length symbolic reference"
 msgstr ""
 
-#: glib/gregex.c:2114
+#: ../glib/gregex.c:2114
 msgid "digit expected"
-msgstr ""
+msgstr "disgwyl digid"
 
-#: glib/gregex.c:2132
+#: ../glib/gregex.c:2132
 msgid "illegal symbolic reference"
 msgstr ""
 
-#: glib/gregex.c:2194
+#: ../glib/gregex.c:2194
 msgid "stray final '\\'"
 msgstr ""
 
-#: glib/gregex.c:2198
+#: ../glib/gregex.c:2198
 msgid "unknown escape sequence"
 msgstr ""
 
-#: glib/gregex.c:2208
+#: ../glib/gregex.c:2208
 #, c-format
 msgid "Error while parsing replacement text \"%s\" at char %lu: %s"
 msgstr ""
 
-#: glib/gshell.c:70
+#: ../glib/gshell.c:70
 msgid "Quoted text doesn't begin with a quotation mark"
 msgstr "Nid yw'r testun dyfynedig yn dechrau gyda dyfynnod"
 
-#: glib/gshell.c:160
+#: ../glib/gshell.c:160
 msgid "Unmatched quotation mark in command line or other shell-quoted text"
 msgstr ""
 "Dyfynnod heb ei gydweddu mewn llinell orchymyn neu destun arall wedi ei "
 "gragen-ddyfynnu"
 
-#: glib/gshell.c:538
+#: ../glib/gshell.c:538
 #, c-format
 msgid "Text ended just after a '\\' character. (The text was '%s')"
 msgstr "Gorffennodd y testun ar ôl '\\'. ('%s' oedd y testun.)"
 
-#: glib/gshell.c:545
+#: ../glib/gshell.c:545
 #, c-format
 msgid "Text ended before matching quote was found for %c. (The text was '%s')"
 msgstr ""
 "Gorffennodd y testun cyn y darganfuwyd dyfynnod i gydweddu %c. ('%s' oedd y "
 "testun.)"
 
-#: glib/gshell.c:557
+#: ../glib/gshell.c:557
 msgid "Text was empty (or contained only whitespace)"
 msgstr "Roedd y testun yn wag, neu'n cynnwys gofodnodau'n unig"
 
-#: glib/gspawn-win32.c:283
+#: ../glib/gspawn-win32.c:283
 msgid "Failed to read data from child process"
 msgstr "Methwyd darllen data o broses plentyn"
 
-#: glib/gspawn-win32.c:300 glib/gspawn.c:1480
+#: ../glib/gspawn-win32.c:300 ../glib/gspawn.c:1480
 #, c-format
 msgid "Failed to create pipe for communicating with child process (%s)"
 msgstr "Methwyd creu pibell er mwyn cyfathrebu â phroses plentyn (%s)"
 
-#: glib/gspawn-win32.c:339 glib/gspawn-win32.c:347 glib/gspawn.c:1139
+#: ../glib/gspawn-win32.c:339 ../glib/gspawn-win32.c:347 ../glib/gspawn.c:1139
 #, c-format
 msgid "Failed to read from child pipe (%s)"
 msgstr "Methwyd darllen o bibell plentyn (%s)"
 
-#: glib/gspawn-win32.c:370 glib/gspawn.c:1346
+#: ../glib/gspawn-win32.c:370 ../glib/gspawn.c:1346
 #, c-format
 msgid "Failed to change to directory '%s' (%s)"
 msgstr "Methwyd newid i'r cyfeiriadur '%s' (%s)"
 
-#: glib/gspawn-win32.c:376 glib/gspawn-win32.c:495
+#: ../glib/gspawn-win32.c:376 ../glib/gspawn-win32.c:495
 #, c-format
 msgid "Failed to execute child process (%s)"
 msgstr "Methwyd gweithredu proses plentyn (%s)"
 
-#: glib/gspawn-win32.c:445
+#: ../glib/gspawn-win32.c:445
 #, c-format
 msgid "Invalid program name: %s"
 msgstr "Enw rhaglen annilys: %s"
 
-#: glib/gspawn-win32.c:455 glib/gspawn-win32.c:723 glib/gspawn-win32.c:1279
+#: ../glib/gspawn-win32.c:455 ../glib/gspawn-win32.c:723
+#: ../glib/gspawn-win32.c:1279
 #, c-format
 msgid "Invalid string in argument vector at %d: %s"
 msgstr "Arg ar goll yn y fector argiau yn %d: %s"
 
-#: glib/gspawn-win32.c:466 glib/gspawn-win32.c:738 glib/gspawn-win32.c:1312
+#: ../glib/gspawn-win32.c:466 ../glib/gspawn-win32.c:738
+#: ../glib/gspawn-win32.c:1312
 #, c-format
 msgid "Invalid string in environment: %s"
 msgstr "Llinyn annilys yn yr amgylchedd: %s"
 
-#: glib/gspawn-win32.c:719 glib/gspawn-win32.c:1260
+#: ../glib/gspawn-win32.c:719 ../glib/gspawn-win32.c:1260
 #, c-format
 msgid "Invalid working directory: %s"
 msgstr "Cyfeiriadur gweithio annilys: %s"
 
-#: glib/gspawn-win32.c:784
+#: ../glib/gspawn-win32.c:784
 #, c-format
 msgid "Failed to execute helper program (%s)"
 msgstr "Methwyd gweithredu proses cymorth (%s)"
 
-#: glib/gspawn-win32.c:998
+#: ../glib/gspawn-win32.c:998
 msgid ""
 "Unexpected error in g_io_channel_win32_poll() reading data from a child "
 "process"
@@ -909,137 +915,136 @@ msgstr ""
 "Gwall annisgwyl yn g_io_channel_win32_poll() wrth ddarllen data o broses "
 "plentyn"
 
-#: glib/gspawn.c:190
+#: ../glib/gspawn.c:190
 #, c-format
 msgid "Failed to read data from child process (%s)"
 msgstr "Methwyd darllen data o broses plentyn (%s)"
 
-#: glib/gspawn.c:329
+#: ../glib/gspawn.c:329
 #, c-format
 msgid "Unexpected error in select() reading data from a child process (%s)"
 msgstr "Gwall annisgwyl yn select() wrth ddarllen o broses plentyn (%s)"
 
-#: glib/gspawn.c:414
+#: ../glib/gspawn.c:414
 #, c-format
 msgid "Unexpected error in waitpid() (%s)"
 msgstr "Gwall annisgwyl yn waitpid() (%s)"
 
-#: glib/gspawn.c:1206
+#: ../glib/gspawn.c:1206
 #, c-format
 msgid "Failed to fork (%s)"
 msgstr "Methwyd fforcio (%s)"
 
-#: glib/gspawn.c:1356
+#: ../glib/gspawn.c:1356
 #, c-format
 msgid "Failed to execute child process \"%s\" (%s)"
 msgstr "Methwyd gweithredu proses plentyn \"%s\" (%s)"
 
-#: glib/gspawn.c:1366
+#: ../glib/gspawn.c:1366
 #, c-format
 msgid "Failed to redirect output or input of child process (%s)"
 msgstr "Methwyd ailgyrchu mewnbwn neu allbwn proses blentyn (%s)"
 
-#: glib/gspawn.c:1375
+#: ../glib/gspawn.c:1375
 #, c-format
 msgid "Failed to fork child process (%s)"
 msgstr "Methwyd fforcio proses plentyn (%s)"
 
-#: glib/gspawn.c:1383
+#: ../glib/gspawn.c:1383
 #, c-format
 msgid "Unknown error executing child process \"%s\""
 msgstr "Gwall anhysbys wrth weithredu proses blentyn \"%s\""
 
-#: glib/gspawn.c:1407
+#: ../glib/gspawn.c:1407
 #, c-format
 msgid "Failed to read enough data from child pid pipe (%s)"
 msgstr "Methwyd darllen digon o ddata o bibell plentyn (%s)"
 
-#: glib/gutf8.c:1038
+#: ../glib/gutf8.c:1038
 msgid "Character out of range for UTF-8"
 msgstr "Nod y tu allan i ystod ddilys UTF-8"
 
-#: glib/gutf8.c:1138 glib/gutf8.c:1147 glib/gutf8.c:1279 glib/gutf8.c:1288
-#: glib/gutf8.c:1429 glib/gutf8.c:1525
+#: ../glib/gutf8.c:1138 ../glib/gutf8.c:1147 ../glib/gutf8.c:1279
+#: ../glib/gutf8.c:1288 ../glib/gutf8.c:1429 ../glib/gutf8.c:1525
 msgid "Invalid sequence in conversion input"
 msgstr "Dilyniant annilys ym mewnbwn trawsnewidiad"
 
-#: glib/gutf8.c:1440 glib/gutf8.c:1536
+#: ../glib/gutf8.c:1440 ../glib/gutf8.c:1536
 msgid "Character out of range for UTF-16"
 msgstr "Nod y tu allan i ystod ddilys UTF-16"
 
-#: glib/goption.c:755
+#: ../glib/goption.c:755
 msgid "Usage:"
 msgstr "Defnydd:"
 
-#: glib/goption.c:755
+#: ../glib/goption.c:755
 msgid "[OPTION...]"
 msgstr "[OPSIWN...]"
 
-#: glib/goption.c:861
+#: ../glib/goption.c:861
 msgid "Help Options:"
 msgstr "Cymorth Opsiynau:"
 
-#: glib/goption.c:862
+#: ../glib/goption.c:862
 msgid "Show help options"
 msgstr "Dangos opsiynau cymorth"
 
-#: glib/goption.c:868
+#: ../glib/goption.c:868
 msgid "Show all help options"
 msgstr "Dangos bob opsiwn cymorth"
 
-#: glib/goption.c:930
+#: ../glib/goption.c:930
 msgid "Application Options:"
 msgstr "Opsiynau Rhaglen:"
 
-#: glib/goption.c:992 glib/goption.c:1062
+#: ../glib/goption.c:992 ../glib/goption.c:1062
 #, c-format
 msgid "Cannot parse integer value '%s' for %s"
 msgstr "Methu gramadegu'r gwerth cyfanrif '%s' ar gyfer %s"
 
-#: glib/goption.c:1002 glib/goption.c:1070
+#: ../glib/goption.c:1002 ../glib/goption.c:1070
 #, c-format
 msgid "Integer value '%s' for %s out of range"
 msgstr "Mae'r gwerth cyfanrif '%s' ar gyfer %s y tu allan i'r cwmpas"
 
-#: glib/goption.c:1027
+#: ../glib/goption.c:1027
 #, c-format
 msgid "Cannot parse double value '%s' for %s"
 msgstr "Methu gramadegu'r gwerth dwbl '%s' ar gyfer %s"
 
-#: glib/goption.c:1035
+#: ../glib/goption.c:1035
 #, c-format
 msgid "Double value '%s' for %s out of range"
 msgstr "Mae'r gwerth dwbl '%s' ar gyfer %s y tu allan i'r cwmpas"
 
-#: glib/goption.c:1298 glib/goption.c:1377
+#: ../glib/goption.c:1298 ../glib/goption.c:1377
 #, c-format
 msgid "Error parsing option %s"
 msgstr "Gwall wrth ramadegu opsiwn %s"
 
-#: glib/goption.c:1408 glib/goption.c:1522
+#: ../glib/goption.c:1408 ../glib/goption.c:1522
 #, c-format
 msgid "Missing argument for %s"
 msgstr "Arg ar goll ar gyfer %s"
 
-#: glib/goption.c:1917
+#: ../glib/goption.c:1917
 #, c-format
 msgid "Unknown option %s"
 msgstr "Opsiwn anhysbys %s"
 
-#: glib/gkeyfile.c:362
-#, fuzzy
+#: ../glib/gkeyfile.c:362
 msgid "Valid key file could not be found in search dirs"
-msgstr "Ni ddarganfuwyd ffeil allwedd ddilys yn y cyfeiriaduron data"
+msgstr "Ni ddarganfuwyd ffeil allwedd ddilys yn y plygellau data"
 
-#: glib/gkeyfile.c:397
+#: ../glib/gkeyfile.c:397
 msgid "Not a regular file"
 msgstr "Ddim yn ffeil cyffredin"
 
-#: glib/gkeyfile.c:405
+#: ../glib/gkeyfile.c:405
 msgid "File is empty"
 msgstr "Ffeil yn wag"
 
-#: glib/gkeyfile.c:764
+#: ../glib/gkeyfile.c:764
 #, c-format
 msgid ""
 "Key file contains line '%s' which is not a key-value pair, group, or comment"
@@ -1047,57 +1052,57 @@ msgstr ""
 "Ffeil allwedd yn cynnwys y llinell '%s' sydd ddim yn bâr allwedd-gwerth, "
 "na'n grŵp, na'n sylw"
 
-#: glib/gkeyfile.c:824
+#: ../glib/gkeyfile.c:824
 #, fuzzy, c-format
 msgid "Invalid group name: %s"
-msgstr "Enw rhaglen annilys: %s"
+msgstr "Enw grŵp annilys: %s"
 
-#: glib/gkeyfile.c:846
+#: ../glib/gkeyfile.c:846
 msgid "Key file does not start with a group"
 msgstr "Nid yw'r ffeil allwedd yn dechrau gyda grŵp"
 
-#: glib/gkeyfile.c:872
+#: ../glib/gkeyfile.c:872
 #, fuzzy, c-format
 msgid "Invalid key name: %s"
-msgstr "Enw rhaglen annilys: %s"
+msgstr "Enw allwedd annilys: %s"
 
-#: glib/gkeyfile.c:899
+#: ../glib/gkeyfile.c:899
 #, c-format
 msgid "Key file contains unsupported encoding '%s'"
 msgstr "Ffeil allwedd yn cynnwys yr amgodiad '%s', na gynhelir"
 
-#: glib/gkeyfile.c:1115 glib/gkeyfile.c:1277 glib/gkeyfile.c:2506
-#: glib/gkeyfile.c:2572 glib/gkeyfile.c:2707 glib/gkeyfile.c:2840
-#: glib/gkeyfile.c:2993 glib/gkeyfile.c:3180 glib/gkeyfile.c:3241
+#: ../glib/gkeyfile.c:1115 ../glib/gkeyfile.c:1277 ../glib/gkeyfile.c:2506
+#: ../glib/gkeyfile.c:2572 ../glib/gkeyfile.c:2707 ../glib/gkeyfile.c:2840
+#: ../glib/gkeyfile.c:2993 ../glib/gkeyfile.c:3180 ../glib/gkeyfile.c:3241
 #, c-format
 msgid "Key file does not have group '%s'"
 msgstr "Nid oes gan y ffeil allwedd y grŵp '%s'"
 
-#: glib/gkeyfile.c:1289
+#: ../glib/gkeyfile.c:1289
 #, c-format
 msgid "Key file does not have key '%s'"
 msgstr "Ffeil allwedd heb fod yn cynnwys yr allwedd '%s'"
 
-#: glib/gkeyfile.c:1396 glib/gkeyfile.c:1511
+#: ../glib/gkeyfile.c:1396 ../glib/gkeyfile.c:1511
 #, c-format
 msgid "Key file contains key '%s' with value '%s' which is not UTF-8"
 msgstr ""
 "Ffeil allwedd yn cynnwys yr allwedd '%s' gyda'r gwerth '%s' nad yw'n UTF-8"
 
-#: glib/gkeyfile.c:1416 glib/gkeyfile.c:1910
+#: ../glib/gkeyfile.c:1416 ../glib/gkeyfile.c:1910
 #, c-format
 msgid "Key file contains key '%s' which has value that cannot be interpreted."
 msgstr ""
 "Ffeil allwedd yn cynnwys yr allwedd '%s' sydd â gwerth na ellir ei ddirnad."
 
-#: glib/gkeyfile.c:1531
-#, fuzzy, c-format
+#: ../glib/gkeyfile.c:1531
+#, c-format
 msgid ""
 "Key file contains key '%s' which has a value that cannot be interpreted."
 msgstr ""
 "Ffeil allwedd yn cynnwys yr allwedd '%s' sydd â gwerth na ellir ei ddirnad."
 
-#: glib/gkeyfile.c:2125 glib/gkeyfile.c:2337
+#: ../glib/gkeyfile.c:2125 ../glib/gkeyfile.c:2337
 #, c-format
 msgid ""
 "Key file contains key '%s' in group '%s' which has value that cannot be "
@@ -1106,163 +1111,166 @@ msgstr ""
 "Ffeil allwedd yn cynnwys yr allwedd '%s' yng ngrŵp '%s' sydd â gwerth na "
 "ellir ei ddirnad."
 
-#: glib/gkeyfile.c:2521 glib/gkeyfile.c:2722 glib/gkeyfile.c:3252
+#: ../glib/gkeyfile.c:2521 ../glib/gkeyfile.c:2722 ../glib/gkeyfile.c:3252
 #, c-format
 msgid "Key file does not have key '%s' in group '%s'"
 msgstr "Ffeil allwedd heb fod ganddi'r allwedd '%s' yn y grŵp '%s'"
 
-#: glib/gkeyfile.c:3486
+#: ../glib/gkeyfile.c:3486
 msgid "Key file contains escape character at end of line"
 msgstr "Ffeil allwedd yn cynnwys nod dianc ar ddiwedd llinell"
 
-#: glib/gkeyfile.c:3508
+#: ../glib/gkeyfile.c:3508
 #, c-format
 msgid "Key file contains invalid escape sequence '%s'"
 msgstr "Ffeil allwedd yn cynnwys '%s', sy'n ddilyniant dianc annilys"
 
-#: glib/gkeyfile.c:3650
+#: ../glib/gkeyfile.c:3650
 #, c-format
 msgid "Value '%s' cannot be interpreted as a number."
 msgstr "Ni ellir darllen y gwerth '%s' fel rhif."
 
-#: glib/gkeyfile.c:3664
+#: ../glib/gkeyfile.c:3664
 #, c-format
 msgid "Integer value '%s' out of range"
 msgstr "Gwerth cyfanrif '%s' y tu allan i'r ystod"
 
-#: glib/gkeyfile.c:3697
+#: ../glib/gkeyfile.c:3697
 #, c-format
 msgid "Value '%s' cannot be interpreted as a float number."
 msgstr "Ni ellir darllen y gwerth '%s' fel rhif arnawf."
 
-#: glib/gkeyfile.c:3721
+#: ../glib/gkeyfile.c:3721
 #, c-format
 msgid "Value '%s' cannot be interpreted as a boolean."
 msgstr "Ni ellir darllen '%s' fel gwerth Boole."
 
-#: gio/gbufferedinputstream.c:415 gio/gbufferedinputstream.c:496
-#: gio/ginputstream.c:186 gio/ginputstream.c:318 gio/ginputstream.c:557
-#: gio/ginputstream.c:682 gio/goutputstream.c:198 gio/goutputstream.c:657
+#: ../gio/gbufferedinputstream.c:415 ../gio/gbufferedinputstream.c:496
+#: ../gio/ginputstream.c:186 ../gio/ginputstream.c:318
+#: ../gio/ginputstream.c:557 ../gio/ginputstream.c:682
+#: ../gio/goutputstream.c:198 ../gio/goutputstream.c:657
 #, c-format
 msgid "Too large count value passed to %s"
 msgstr ""
 
-#: gio/gbufferedinputstream.c:883 gio/ginputstream.c:892 gio/giostream.c:305
-#: gio/goutputstream.c:1108
+#: ../gio/gbufferedinputstream.c:883 ../gio/ginputstream.c:892
+#: ../gio/giostream.c:305 ../gio/goutputstream.c:1108
 msgid "Stream is already closed"
-msgstr ""
+msgstr "Mae'r llif wedi'i gau yn barod"
 
-#: gio/gcancellable.c:433 gio/glocalfile.c:2089 gio/gsimpleasyncresult.c:648
-#: gio/gsimpleasyncresult.c:674
+#: ../gio/gcancellable.c:433 ../gio/glocalfile.c:2089
+#: ../gio/gsimpleasyncresult.c:648 ../gio/gsimpleasyncresult.c:674
 msgid "Operation was cancelled"
 msgstr ""
 
-#: gio/gcontenttype.c:180
+#: ../gio/gcontenttype.c:180
 #, fuzzy
 msgid "Unknown type"
-msgstr "Opsiwn anhysbys %s"
+msgstr "Fath anhysbys"
 
-#: gio/gcontenttype.c:181
+#: ../gio/gcontenttype.c:181
 #, c-format
 msgid "%s filetype"
 msgstr ""
 
-#: gio/gcontenttype.c:678
+#: ../gio/gcontenttype.c:678
 #, c-format
 msgid "%s type"
-msgstr ""
+msgstr "math %s"
 
-#: gio/gdatainputstream.c:311
+#: ../gio/gdatainputstream.c:311
 msgid "Unexpected early end-of-stream"
 msgstr ""
 
-#: gio/gdesktopappinfo.c:468 gio/gwin32appinfo.c:222
+#: ../gio/gdesktopappinfo.c:468 ../gio/gwin32appinfo.c:222
 msgid "Unnamed"
 msgstr ""
 
-#: gio/gdesktopappinfo.c:725
+#: ../gio/gdesktopappinfo.c:725
 msgid "Desktop file didn't specify Exec field"
 msgstr ""
 
-#: gio/gdesktopappinfo.c:905
+#: ../gio/gdesktopappinfo.c:905
 msgid "Unable to find terminal required for application"
 msgstr ""
 
-#: gio/gdesktopappinfo.c:1113
+#: ../gio/gdesktopappinfo.c:1113
 #, c-format
 msgid "Can't create user application configuration folder %s: %s"
 msgstr ""
 
-#: gio/gdesktopappinfo.c:1117
+#: ../gio/gdesktopappinfo.c:1117
 #, c-format
 msgid "Can't create user MIME configuration folder %s: %s"
 msgstr ""
 
-#: gio/gdesktopappinfo.c:1525
+#: ../gio/gdesktopappinfo.c:1525
 #, c-format
 msgid "Can't create user desktop file %s"
 msgstr ""
 
-#: gio/gdesktopappinfo.c:1639
+#: ../gio/gdesktopappinfo.c:1639
 #, c-format
 msgid "Custom definition for %s"
 msgstr ""
 
-#: gio/gdrive.c:409
+#: ../gio/gdrive.c:364
 msgid "drive doesn't implement eject"
 msgstr ""
 
 #. Translators: This is an error
 #. * message for drive objects that
 #. * don't implement any of eject or eject_with_operation.
-#: gio/gdrive.c:489
+#: ../gio/gdrive.c:444
 msgid "drive doesn't implement eject or eject_with_operation"
 msgstr ""
 
-#: gio/gdrive.c:566
+#: ../gio/gdrive.c:521
 msgid "drive doesn't implement polling for media"
 msgstr ""
 
-#: gio/gdrive.c:771
+#: ../gio/gdrive.c:726
 msgid "drive doesn't implement start"
 msgstr ""
 
-#: gio/gdrive.c:873
+#: ../gio/gdrive.c:828
 msgid "drive doesn't implement stop"
 msgstr ""
 
-#: gio/gemblem.c:325
+#: ../gio/gemblem.c:325
 #, c-format
 msgid "Can't handle version %d of GEmblem encoding"
 msgstr ""
 
-#: gio/gemblem.c:335
+#: ../gio/gemblem.c:335
 #, c-format
 msgid "Malformed number of tokens (%d) in GEmblem encoding"
 msgstr ""
 
-#: gio/gemblemedicon.c:296
+#: ../gio/gemblemedicon.c:296
 #, c-format
 msgid "Can't handle version %d of GEmblemedIcon encoding"
 msgstr ""
 
-#: gio/gemblemedicon.c:306
+#: ../gio/gemblemedicon.c:306
 #, c-format
 msgid "Malformed number of tokens (%d) in GEmblemedIcon encoding"
 msgstr ""
 
-#: gio/gemblemedicon.c:329
+#: ../gio/gemblemedicon.c:329
 msgid "Expected a GEmblem for GEmblemedIcon"
 msgstr ""
 
-#: gio/gfile.c:903 gio/gfile.c:1133 gio/gfile.c:1268 gio/gfile.c:1504
-#: gio/gfile.c:1558 gio/gfile.c:1615 gio/gfile.c:1698 gio/gfile.c:1753
-#: gio/gfile.c:1813 gio/gfile.c:1867 gio/gfile.c:3192 gio/gfile.c:3246
-#: gio/gfile.c:3377 gio/gfile.c:3417 gio/gfile.c:3744 gio/gfile.c:4146
-#: gio/gfile.c:4232 gio/gfile.c:4321 gio/gfile.c:4419 gio/gfile.c:4506
-#: gio/gfile.c:4599 gio/gfile.c:4929 gio/gfile.c:5209 gio/gfile.c:5278
-#: gio/gfile.c:6869 gio/gfile.c:6959 gio/gfile.c:7045
-#: gio/win32/gwinhttpfile.c:441
+#: ../gio/gfile.c:863 ../gio/gfile.c:1093 ../gio/gfile.c:1228
+#: ../gio/gfile.c:1464 ../gio/gfile.c:1518 ../gio/gfile.c:1575
+#: ../gio/gfile.c:1658 ../gio/gfile.c:1713 ../gio/gfile.c:1773
+#: ../gio/gfile.c:1827 ../gio/gfile.c:3152 ../gio/gfile.c:3206
+#: ../gio/gfile.c:3337 ../gio/gfile.c:3377 ../gio/gfile.c:3704
+#: ../gio/gfile.c:4106 ../gio/gfile.c:4192 ../gio/gfile.c:4281
+#: ../gio/gfile.c:4379 ../gio/gfile.c:4466 ../gio/gfile.c:4559
+#: ../gio/gfile.c:4889 ../gio/gfile.c:5169 ../gio/gfile.c:5238
+#: ../gio/gfile.c:6829 ../gio/gfile.c:6919 ../gio/gfile.c:7005
+#: ../gio/win32/gwinhttpfile.c:441
 #, fuzzy
 msgid "Operation not supported"
 msgstr "Ni chynhelir cysylltion symbolaidd"
@@ -1275,130 +1283,130 @@ msgstr "Ni chynhelir cysylltion symbolaidd"
 #. Translators: This is an error message when trying to find
 #. * the enclosing (user visible) mount of a file, but none
 #. * exists.
-#: gio/gfile.c:1389 gio/glocalfile.c:1060 gio/glocalfile.c:1071
-#: gio/glocalfile.c:1084
+#: ../gio/gfile.c:1349 ../gio/glocalfile.c:1060 ../gio/glocalfile.c:1071
+#: ../gio/glocalfile.c:1084
 msgid "Containing mount does not exist"
 msgstr ""
 
-#: gio/gfile.c:2441 gio/glocalfile.c:2245
+#: ../gio/gfile.c:2401 ../gio/glocalfile.c:2245
 msgid "Can't copy over directory"
-msgstr ""
+msgstr "Methu copïo plygell drosodd"
 
-#: gio/gfile.c:2501
+#: ../gio/gfile.c:2461
 msgid "Can't copy directory over directory"
-msgstr ""
+msgstr "Methu copïo plygell dros plygell"
 
-#: gio/gfile.c:2509 gio/glocalfile.c:2254
+#: ../gio/gfile.c:2469 ../gio/glocalfile.c:2254
 msgid "Target file exists"
 msgstr ""
 
-#: gio/gfile.c:2527
+#: ../gio/gfile.c:2487
 msgid "Can't recursively copy directory"
 msgstr ""
 
-#: gio/gfile.c:2826
+#: ../gio/gfile.c:2786
 msgid "Can't copy special file"
-msgstr ""
+msgstr "Methu copïo ffeil arbennig"
 
-#: gio/gfile.c:3367
+#: ../gio/gfile.c:3327
 msgid "Invalid symlink value given"
 msgstr ""
 
-#: gio/gfile.c:3460
+#: ../gio/gfile.c:3420
 #, fuzzy
 msgid "Trash not supported"
 msgstr "Ni chynhelir cysylltion symbolaidd"
 
-#: gio/gfile.c:3509
+#: ../gio/gfile.c:3469
 #, c-format
 msgid "File names cannot contain '%c'"
-msgstr ""
+msgstr "Dydy enwai ffeiliau ddim yn gallu cynnwys '%c'"
 
-#: gio/gfile.c:5926 gio/gvolume.c:376
+#: ../gio/gfile.c:5886 ../gio/gvolume.c:331
 msgid "volume doesn't implement mount"
 msgstr ""
 
-#: gio/gfile.c:6037
+#: ../gio/gfile.c:5997
 #, fuzzy
 msgid "No application is registered as handling this file"
 msgstr "Does dim un rhaglen o'r enw '%s' wedi cofrestru llyfrnod ar gyfer '%s'"
 
-#: gio/gfileenumerator.c:206
+#: ../gio/gfileenumerator.c:206
 msgid "Enumerator is closed"
 msgstr ""
 
-#: gio/gfileenumerator.c:213 gio/gfileenumerator.c:272
-#: gio/gfileenumerator.c:372 gio/gfileenumerator.c:481
+#: ../gio/gfileenumerator.c:213 ../gio/gfileenumerator.c:272
+#: ../gio/gfileenumerator.c:372 ../gio/gfileenumerator.c:481
 msgid "File enumerator has outstanding operation"
 msgstr ""
 
-#: gio/gfileenumerator.c:362 gio/gfileenumerator.c:471
+#: ../gio/gfileenumerator.c:362 ../gio/gfileenumerator.c:471
 msgid "File enumerator is already closed"
 msgstr ""
 
-#: gio/gfileicon.c:237
+#: ../gio/gfileicon.c:237
 #, c-format
 msgid "Can't handle version %d of GFileIcon encoding"
 msgstr ""
 
-#: gio/gfileicon.c:247
+#: ../gio/gfileicon.c:247
 msgid "Malformed input data for GFileIcon"
 msgstr ""
 
-#: gio/gfileinputstream.c:155 gio/gfileinputstream.c:422
-#: gio/gfileiostream.c:171 gio/gfileoutputstream.c:170
-#: gio/gfileoutputstream.c:525
+#: ../gio/gfileinputstream.c:155 ../gio/gfileinputstream.c:422
+#: ../gio/gfileiostream.c:171 ../gio/gfileoutputstream.c:170
+#: ../gio/gfileoutputstream.c:525
 msgid "Stream doesn't support query_info"
 msgstr ""
 
-#: gio/gfileinputstream.c:337 gio/gfileiostream.c:389
-#: gio/gfileoutputstream.c:383
+#: ../gio/gfileinputstream.c:337 ../gio/gfileiostream.c:389
+#: ../gio/gfileoutputstream.c:383
 msgid "Seek not supported on stream"
 msgstr ""
 
-#: gio/gfileinputstream.c:381
+#: ../gio/gfileinputstream.c:381
 msgid "Truncate not allowed on input stream"
 msgstr ""
 
-#: gio/gfileiostream.c:465 gio/gfileoutputstream.c:459
+#: ../gio/gfileiostream.c:465 ../gio/gfileoutputstream.c:459
 msgid "Truncate not supported on stream"
 msgstr ""
 
-#: gio/gicon.c:324
+#: ../gio/gicon.c:286
 #, c-format
 msgid "Wrong number of tokens (%d)"
-msgstr ""
+msgstr "Nifer anghywir o docynnau (%d)"
 
-#: gio/gicon.c:344
+#: ../gio/gicon.c:306
 #, c-format
 msgid "No type for class name %s"
-msgstr ""
+msgstr "Dim fath ar gyfer enw dosbarth %s"
 
-#: gio/gicon.c:354
+#: ../gio/gicon.c:316
 #, c-format
 msgid "Type %s does not implement the GIcon interface"
 msgstr ""
 
-#: gio/gicon.c:365
+#: ../gio/gicon.c:327
 #, c-format
 msgid "Type %s is not classed"
 msgstr ""
 
-#: gio/gicon.c:379
+#: ../gio/gicon.c:341
 #, c-format
 msgid "Malformed version number: %s"
 msgstr ""
 
-#: gio/gicon.c:393
+#: ../gio/gicon.c:355
 #, c-format
 msgid "Type %s does not implement from_tokens() on the GIcon interface"
 msgstr ""
 
-#: gio/gicon.c:469
+#: ../gio/gicon.c:431
 msgid "Can't handle the supplied version the icon encoding"
 msgstr ""
 
-#: gio/ginputstream.c:195
+#: ../gio/ginputstream.c:195
 msgid "Input stream doesn't implement read"
 msgstr ""
 
@@ -1408,617 +1416,617 @@ msgstr ""
 #. Translators: This is an error you get if there is
 #. * already an operation running against this stream when
 #. * you try to start one
-#: gio/ginputstream.c:902 gio/giostream.c:315 gio/goutputstream.c:1118
+#: ../gio/ginputstream.c:902 ../gio/giostream.c:315
+#: ../gio/goutputstream.c:1118
 msgid "Stream has outstanding operation"
 msgstr ""
 
-#: gio/ginetsocketaddress.c:182 gio/ginetsocketaddress.c:199
-#: gio/gunixsocketaddress.c:174
+#: ../gio/ginetsocketaddress.c:182 ../gio/ginetsocketaddress.c:199
+#: ../gio/gunixsocketaddress.c:174
 msgid "Not enough space for socket address"
 msgstr ""
 
-#: gio/ginetsocketaddress.c:212
+#: ../gio/ginetsocketaddress.c:212
 msgid "Unsupported socket address"
 msgstr ""
 
-#: gio/glocaldirectorymonitor.c:288
+#: ../gio/glocaldirectorymonitor.c:288
 msgid "Unable to find default local directory monitor type"
 msgstr ""
 
-#: gio/glocalfile.c:594 gio/win32/gwinhttpfile.c:424
-#, fuzzy, c-format
+#: ../gio/glocalfile.c:594 ../gio/win32/gwinhttpfile.c:424
+#, c-format
 msgid "Invalid filename %s"
-msgstr "Enw rhaglen annilys: %s"
+msgstr "Enw ffeil annilys %s"
 
-#: gio/glocalfile.c:968
-#, fuzzy, c-format
+#: ../gio/glocalfile.c:968
+#, c-format
 msgid "Error getting filesystem info: %s"
-msgstr "Gwall wrth ddarllen ffeil '%s': %s "
+msgstr "Gwall wrth gyrchu gwybodaeth y system ffeiliau: %s"
 
-#: gio/glocalfile.c:1104
+#: ../gio/glocalfile.c:1104
 msgid "Can't rename root directory"
-msgstr ""
+msgstr "Methu ailenwi'r plygell gwraidd"
 
-#: gio/glocalfile.c:1124 gio/glocalfile.c:1150
-#, fuzzy, c-format
+#: ../gio/glocalfile.c:1124 ../gio/glocalfile.c:1150
+#, c-format
 msgid "Error renaming file: %s"
-msgstr "Gwall wrth ddarllen ffeil '%s': %s "
+msgstr "Gwall wrth ailenwi ffeil: %s "
 
-#: gio/glocalfile.c:1133
+#: ../gio/glocalfile.c:1133
 msgid "Can't rename file, filename already exist"
-msgstr ""
+msgstr "Methu ailenwi ffeil, mae ffeil gyda'r enw'n bodoli'n barod"
 
-#: gio/glocalfile.c:1146 gio/glocalfile.c:2118 gio/glocalfile.c:2147
-#: gio/glocalfile.c:2307 gio/glocalfileoutputstream.c:550
-#: gio/glocalfileoutputstream.c:603 gio/glocalfileoutputstream.c:648
-#: gio/glocalfileoutputstream.c:1130
-#, fuzzy
+#: ../gio/glocalfile.c:1146 ../gio/glocalfile.c:2118 ../gio/glocalfile.c:2147
+#: ../gio/glocalfile.c:2307 ../gio/glocalfileoutputstream.c:550
+#: ../gio/glocalfileoutputstream.c:603 ../gio/glocalfileoutputstream.c:648
+#: ../gio/glocalfileoutputstream.c:1130
 msgid "Invalid filename"
-msgstr "Enw gwesteiwr annilys"
+msgstr "Enw ffeil annilys"
 
-#: gio/glocalfile.c:1302
-#, fuzzy, c-format
+#: ../gio/glocalfile.c:1302
+#, c-format
 msgid "Error opening file: %s"
-msgstr "Gwall wrth ddarllen ffeil '%s': %s "
+msgstr "Gwall wrth agor ffeil: %s "
 
-#: gio/glocalfile.c:1312
+#: ../gio/glocalfile.c:1312
 msgid "Can't open directory"
-msgstr ""
+msgstr "Methu agor plygell"
 
-#: gio/glocalfile.c:1437
+#: ../gio/glocalfile.c:1437
 #, fuzzy, c-format
 msgid "Error removing file: %s"
 msgstr "Gwall wrth ddarllen ffeil '%s': %s "
 
-#: gio/glocalfile.c:1802
+#: ../gio/glocalfile.c:1802
 #, fuzzy, c-format
 msgid "Error trashing file: %s"
 msgstr "Gwall wrth ddarllen ffeil '%s': %s "
 
-#: gio/glocalfile.c:1825
-#, fuzzy, c-format
+#: ../gio/glocalfile.c:1825
+#, c-format
 msgid "Unable to create trash dir %s: %s"
-msgstr "Methwyd creu'r ffeil '%s': %s"
+msgstr "Methwyd creu'r plygell sbwriel %s: %s"
 
-#: gio/glocalfile.c:1846
+#: ../gio/glocalfile.c:1846
 msgid "Unable to find toplevel directory for trash"
 msgstr ""
 
-#: gio/glocalfile.c:1925 gio/glocalfile.c:1945
+#: ../gio/glocalfile.c:1925 ../gio/glocalfile.c:1945
 msgid "Unable to find or create trash directory"
-msgstr ""
+msgstr "Methu canfod na chreu plygell sbwriel"
 
-#: gio/glocalfile.c:1979
+#: ../gio/glocalfile.c:1979
 #, fuzzy, c-format
 msgid "Unable to create trashing info file: %s"
 msgstr "Methwyd creu'r ffeil '%s': %s"
 
-#: gio/glocalfile.c:2008 gio/glocalfile.c:2013 gio/glocalfile.c:2088
-#: gio/glocalfile.c:2095
-#, fuzzy, c-format
+#: ../gio/glocalfile.c:2008 ../gio/glocalfile.c:2013 ../gio/glocalfile.c:2088
+#: ../gio/glocalfile.c:2095
+#, c-format
 msgid "Unable to trash file: %s"
-msgstr "Methwyd creu'r ffeil '%s': %s"
+msgstr "Methwyd creu ffeil sbwriel: %s"
 
-#: gio/glocalfile.c:2122
-#, fuzzy, c-format
+#: ../gio/glocalfile.c:2122
+#, c-format
 msgid "Error creating directory: %s"
-msgstr "Gwall y cyfeiriadur '%s': %s"
+msgstr "Gwall wrth creu plygell: %s"
 
-#: gio/glocalfile.c:2151
+#: ../gio/glocalfile.c:2151
 #, fuzzy, c-format
 msgid "Filesystem does not support symbolic links"
 msgstr "Methwyd darllen y cyswllt symbolaidd '%s': %s"
 
-#: gio/glocalfile.c:2155
+#: ../gio/glocalfile.c:2155
 #, fuzzy, c-format
 msgid "Error making symbolic link: %s"
 msgstr "Gwall wrth ramadegu opsiwn %s"
 
-#: gio/glocalfile.c:2217 gio/glocalfile.c:2311
-#, fuzzy, c-format
+#: ../gio/glocalfile.c:2217 ../gio/glocalfile.c:2311
+#, c-format
 msgid "Error moving file: %s"
-msgstr "Gwall wrth ddarllen ffeil '%s': %s "
+msgstr "Gwall wrth symud ffeil: %s "
 
-#: gio/glocalfile.c:2240
+#: ../gio/glocalfile.c:2240
 msgid "Can't move directory over directory"
-msgstr ""
+msgstr "Methu symud plygell dros plygell"
 
-#: gio/glocalfile.c:2267 gio/glocalfileoutputstream.c:928
-#: gio/glocalfileoutputstream.c:942 gio/glocalfileoutputstream.c:957
-#: gio/glocalfileoutputstream.c:973 gio/glocalfileoutputstream.c:987
+#: ../gio/glocalfile.c:2267 ../gio/glocalfileoutputstream.c:928
+#: ../gio/glocalfileoutputstream.c:942 ../gio/glocalfileoutputstream.c:957
+#: ../gio/glocalfileoutputstream.c:973 ../gio/glocalfileoutputstream.c:987
 msgid "Backup file creation failed"
 msgstr ""
 
-#: gio/glocalfile.c:2286
+#: ../gio/glocalfile.c:2286
 #, fuzzy, c-format
 msgid "Error removing target file: %s"
 msgstr "Gwall wrth ddarllen ffeil '%s': %s "
 
-#: gio/glocalfile.c:2300
+#: ../gio/glocalfile.c:2300
 msgid "Move between mounts not supported"
 msgstr ""
 
-#: gio/glocalfileinfo.c:721
+#: ../gio/glocalfileinfo.c:721
 msgid "Attribute value must be non-NULL"
 msgstr ""
 
-#: gio/glocalfileinfo.c:728
+#: ../gio/glocalfileinfo.c:728
 msgid "Invalid attribute type (string expected)"
 msgstr ""
 
-#: gio/glocalfileinfo.c:735
+#: ../gio/glocalfileinfo.c:735
 #, fuzzy
 msgid "Invalid extended attribute name"
 msgstr "Gorffennodd y ddogfen yn annisgwyl y tu fewn i enw priodoledd"
 
-#: gio/glocalfileinfo.c:775
+#: ../gio/glocalfileinfo.c:775
 #, fuzzy, c-format
 msgid "Error setting extended attribute '%s': %s"
 msgstr "Gwall y cyfeiriadur '%s': %s"
 
-#: gio/glocalfileinfo.c:1482 gio/glocalfileoutputstream.c:812
+#: ../gio/glocalfileinfo.c:1482 ../gio/glocalfileoutputstream.c:812
 #, fuzzy, c-format
 msgid "Error stating file '%s': %s"
 msgstr "Gwall wrth ddarllen ffeil '%s': %s "
 
-#: gio/glocalfileinfo.c:1555
+#: ../gio/glocalfileinfo.c:1555
 msgid " (invalid encoding)"
-msgstr ""
+msgstr " (amgodiad annilys)"
 
-#: gio/glocalfileinfo.c:1753
+#: ../gio/glocalfileinfo.c:1753
 #, fuzzy, c-format
 msgid "Error stating file descriptor: %s"
 msgstr "Gwall wrth ddarllen ffeil '%s': %s "
 
-#: gio/glocalfileinfo.c:1798
+#: ../gio/glocalfileinfo.c:1798
 msgid "Invalid attribute type (uint32 expected)"
 msgstr ""
 
-#: gio/glocalfileinfo.c:1816
+#: ../gio/glocalfileinfo.c:1816
 msgid "Invalid attribute type (uint64 expected)"
 msgstr ""
 
-#: gio/glocalfileinfo.c:1835 gio/glocalfileinfo.c:1854
+#: ../gio/glocalfileinfo.c:1835 ../gio/glocalfileinfo.c:1854
 msgid "Invalid attribute type (byte string expected)"
 msgstr ""
 
-#: gio/glocalfileinfo.c:1889
+#: ../gio/glocalfileinfo.c:1889
 #, fuzzy
 msgid "Cannot set permissions on symlinks"
 msgstr "Gwall wrth drawsnewid: %s"
 
-#: gio/glocalfileinfo.c:1905
+#: ../gio/glocalfileinfo.c:1905
 #, fuzzy, c-format
 msgid "Error setting permissions: %s"
 msgstr "Gwall wrth drawsnewid: %s"
 
-#: gio/glocalfileinfo.c:1956
+#: ../gio/glocalfileinfo.c:1956
 #, fuzzy, c-format
 msgid "Error setting owner: %s"
 msgstr "Gwall wrth drawsnewid: %s"
 
-#: gio/glocalfileinfo.c:1979
+#: ../gio/glocalfileinfo.c:1979
 msgid "symlink must be non-NULL"
 msgstr ""
 
-#: gio/glocalfileinfo.c:1989 gio/glocalfileinfo.c:2008
-#: gio/glocalfileinfo.c:2019
+#: ../gio/glocalfileinfo.c:1989 ../gio/glocalfileinfo.c:2008
+#: ../gio/glocalfileinfo.c:2019
 #, fuzzy, c-format
 msgid "Error setting symlink: %s"
 msgstr "Gwall ar linell %d: %s"
 
-#: gio/glocalfileinfo.c:1998
+#: ../gio/glocalfileinfo.c:1998
 msgid "Error setting symlink: file is not a symlink"
 msgstr ""
 
-#: gio/glocalfileinfo.c:2124
+#: ../gio/glocalfileinfo.c:2124
 #, fuzzy, c-format
 msgid "Error setting modification or access time: %s"
 msgstr "Gwall wrth drawsnewid: %s"
 
-#: gio/glocalfileinfo.c:2147
+#: ../gio/glocalfileinfo.c:2147
 msgid "SELinux context must be non-NULL"
 msgstr ""
 
-#: gio/glocalfileinfo.c:2162
+#: ../gio/glocalfileinfo.c:2162
 #, fuzzy, c-format
 msgid "Error setting SELinux context: %s"
 msgstr "Gwall wrth drawsnewid: %s"
 
-#: gio/glocalfileinfo.c:2169
+#: ../gio/glocalfileinfo.c:2169
 msgid "SELinux is not enabled on this system"
 msgstr ""
 
-#: gio/glocalfileinfo.c:2261
+#: ../gio/glocalfileinfo.c:2261
 #, fuzzy, c-format
 msgid "Setting attribute %s not supported"
 msgstr "Ni chynhelir cysylltion symbolaidd"
 
-#: gio/glocalfileinputstream.c:159 gio/glocalfileoutputstream.c:701
-#, fuzzy, c-format
+#: ../gio/glocalfileinputstream.c:159 ../gio/glocalfileoutputstream.c:701
+#, c-format
 msgid "Error reading from file: %s"
-msgstr "Gwall wrth ddarllen ffeil '%s': %s "
+msgstr "Gwall wrth ddarllen ffeil: %s "
 
-#: gio/glocalfileinputstream.c:190 gio/glocalfileinputstream.c:202
-#: gio/glocalfileinputstream.c:314 gio/glocalfileoutputstream.c:449
-#: gio/glocalfileoutputstream.c:1005
+#: ../gio/glocalfileinputstream.c:190 ../gio/glocalfileinputstream.c:202
+#: ../gio/glocalfileinputstream.c:314 ../gio/glocalfileoutputstream.c:449
+#: ../gio/glocalfileoutputstream.c:1005
 #, fuzzy, c-format
 msgid "Error seeking in file: %s"
 msgstr "Gwall wrth ddarllen ffeil '%s': %s "
 
-#: gio/glocalfileinputstream.c:235 gio/glocalfileoutputstream.c:235
-#: gio/glocalfileoutputstream.c:330
-#, fuzzy, c-format
+#: ../gio/glocalfileinputstream.c:235 ../gio/glocalfileoutputstream.c:235
+#: ../gio/glocalfileoutputstream.c:330
+#, c-format
 msgid "Error closing file: %s"
-msgstr "Gwall wrth ddarllen ffeil '%s': %s "
+msgstr "Gwall wrth cau ffeil': %s "
 
-#: gio/glocalfilemonitor.c:191
+#: ../gio/glocalfilemonitor.c:191
 msgid "Unable to find default local file monitor type"
 msgstr ""
 
-#: gio/glocalfileoutputstream.c:181 gio/glocalfileoutputstream.c:214
-#: gio/glocalfileoutputstream.c:722
+#: ../gio/glocalfileoutputstream.c:181 ../gio/glocalfileoutputstream.c:214
+#: ../gio/glocalfileoutputstream.c:722
 #, fuzzy, c-format
 msgid "Error writing to file: %s"
 msgstr "Gwall wrth ddarllen ffeil '%s': %s "
 
-#: gio/glocalfileoutputstream.c:262
+#: ../gio/glocalfileoutputstream.c:262
 #, fuzzy, c-format
 msgid "Error removing old backup link: %s"
 msgstr "Gwall wrth ramadegu opsiwn %s"
 
-#: gio/glocalfileoutputstream.c:276 gio/glocalfileoutputstream.c:289
+#: ../gio/glocalfileoutputstream.c:276 ../gio/glocalfileoutputstream.c:289
 #, fuzzy, c-format
 msgid "Error creating backup copy: %s"
 msgstr "Gwall wrth ddarllen ffeil '%s': %s "
 
-#: gio/glocalfileoutputstream.c:307
+#: ../gio/glocalfileoutputstream.c:307
 #, fuzzy, c-format
 msgid "Error renaming temporary file: %s"
 msgstr "Gwall wrth ddarllen ffeil '%s': %s "
 
-#: gio/glocalfileoutputstream.c:495 gio/glocalfileoutputstream.c:1056
+#: ../gio/glocalfileoutputstream.c:495 ../gio/glocalfileoutputstream.c:1056
 #, fuzzy, c-format
 msgid "Error truncating file: %s"
 msgstr "Gwall wrth ddarllen ffeil '%s': %s "
 
-#: gio/glocalfileoutputstream.c:556 gio/glocalfileoutputstream.c:609
-#: gio/glocalfileoutputstream.c:654 gio/glocalfileoutputstream.c:794
-#: gio/glocalfileoutputstream.c:1037 gio/glocalfileoutputstream.c:1136
+#: ../gio/glocalfileoutputstream.c:556 ../gio/glocalfileoutputstream.c:609
+#: ../gio/glocalfileoutputstream.c:654 ../gio/glocalfileoutputstream.c:794
+#: ../gio/glocalfileoutputstream.c:1037 ../gio/glocalfileoutputstream.c:1136
 #, fuzzy, c-format
 msgid "Error opening file '%s': %s"
 msgstr "Gwall wrth ddarllen ffeil '%s': %s "
 
-#: gio/glocalfileoutputstream.c:825
+#: ../gio/glocalfileoutputstream.c:825
 msgid "Target file is a directory"
 msgstr ""
 
-#: gio/glocalfileoutputstream.c:830
+#: ../gio/glocalfileoutputstream.c:830
 #, fuzzy
 msgid "Target file is not a regular file"
 msgstr "Ddim yn ffeil cyffredin"
 
-#: gio/glocalfileoutputstream.c:842
+#: ../gio/glocalfileoutputstream.c:842
 msgid "The file was externally modified"
 msgstr ""
 
-#: gio/glocalfileoutputstream.c:1021
+#: ../gio/glocalfileoutputstream.c:1021
 #, fuzzy, c-format
 msgid "Error removing old file: %s"
 msgstr "Gwall wrth ddarllen ffeil '%s': %s "
 
-#: gio/gmemoryinputstream.c:487 gio/gmemoryoutputstream.c:553
+#: ../gio/gmemoryinputstream.c:487 ../gio/gmemoryoutputstream.c:553
 msgid "Invalid GSeekType supplied"
 msgstr ""
 
-#: gio/gmemoryinputstream.c:497 gio/gmemoryoutputstream.c:563
+#: ../gio/gmemoryinputstream.c:497 ../gio/gmemoryoutputstream.c:563
 #, fuzzy
 msgid "Invalid seek request"
 msgstr "Enw rhaglen annilys: %s"
 
-#: gio/gmemoryinputstream.c:521
+#: ../gio/gmemoryinputstream.c:521
 msgid "Cannot truncate GMemoryInputStream"
 msgstr ""
 
-#: gio/gmemoryoutputstream.c:290
+#: ../gio/gmemoryoutputstream.c:290
 msgid "Reached maximum data array limit"
 msgstr ""
 
-#: gio/gmemoryoutputstream.c:325
+#: ../gio/gmemoryoutputstream.c:325
 msgid "Memory output stream not resizable"
 msgstr ""
 
-#: gio/gmemoryoutputstream.c:341
+#: ../gio/gmemoryoutputstream.c:341
 msgid "Failed to resize memory output stream"
 msgstr ""
 
 #. Translators: This is an error
 #. * message for mount objects that
 #. * don't implement unmount.
-#: gio/gmount.c:409
+#: ../gio/gmount.c:364
 msgid "mount doesn't implement \"unmount\""
 msgstr ""
 
 #. Translators: This is an error
 #. * message for mount objects that
 #. * don't implement eject.
-#: gio/gmount.c:488
+#: ../gio/gmount.c:443
 msgid "mount doesn't implement \"eject\""
 msgstr ""
 
 #. Translators: This is an error
 #. * message for mount objects that
 #. * don't implement any of unmount or unmount_with_operation.
-#: gio/gmount.c:568
+#: ../gio/gmount.c:523
 msgid "mount doesn't implement \"unmount\" or \"unmount_with_operation\""
 msgstr ""
 
 #. Translators: This is an error
 #. * message for mount objects that
 #. * don't implement any of eject or eject_with_operation.
-#: gio/gmount.c:655
+#: ../gio/gmount.c:610
 msgid "mount doesn't implement \"eject\" or \"eject_with_operation\""
 msgstr ""
 
 #. Translators: This is an error
 #. * message for mount objects that
 #. * don't implement remount.
-#: gio/gmount.c:744
+#: ../gio/gmount.c:699
 msgid "mount doesn't implement \"remount\""
 msgstr ""
 
 #. Translators: This is an error
 #. * message for mount objects that
 #. * don't implement content type guessing.
-#: gio/gmount.c:828
+#: ../gio/gmount.c:783
 msgid "mount doesn't implement content type guessing"
 msgstr ""
 
 #. Translators: This is an error
 #. * message for mount objects that
 #. * don't implement content type guessing.
-#: gio/gmount.c:917
+#: ../gio/gmount.c:872
 msgid "mount doesn't implement synchronous content type guessing"
 msgstr ""
 
-#: gio/gnetworkaddress.c:295
+#: ../gio/gnetworkaddress.c:295
 #, c-format
 msgid "Hostname '%s' contains '[' but not ']'"
 msgstr ""
 
-#: gio/goutputstream.c:207 gio/goutputstream.c:408
+#: ../gio/goutputstream.c:207 ../gio/goutputstream.c:408
 msgid "Output stream doesn't implement write"
 msgstr ""
 
-#: gio/goutputstream.c:369 gio/goutputstream.c:781
+#: ../gio/goutputstream.c:369 ../gio/goutputstream.c:781
 msgid "Source stream is already closed"
 msgstr ""
 
-#: gio/gresolver.c:736
+#: ../gio/gresolver.c:736
 #, fuzzy, c-format
 msgid "Error resolving '%s': %s"
 msgstr "Gwall wrth ddarllen ffeil '%s': %s "
 
-#: gio/gresolver.c:786
+#: ../gio/gresolver.c:786
 #, fuzzy, c-format
 msgid "Error reverse-resolving '%s': %s"
 msgstr "Gwall wrth ddarllen ffeil '%s': %s "
 
-#: gio/gresolver.c:821 gio/gresolver.c:899
+#: ../gio/gresolver.c:821 ../gio/gresolver.c:899
 #, c-format
 msgid "No service record for '%s'"
 msgstr ""
 
-#: gio/gresolver.c:826 gio/gresolver.c:904
+#: ../gio/gresolver.c:826 ../gio/gresolver.c:904
 #, c-format
 msgid "Temporarily unable to resolve '%s'"
 msgstr ""
 
-#: gio/gresolver.c:831 gio/gresolver.c:909
+#: ../gio/gresolver.c:831 ../gio/gresolver.c:909
 #, fuzzy, c-format
 msgid "Error resolving '%s'"
 msgstr "Gwall wrth ddarllen ffeil '%s': %s "
 
-#: gio/gsocket.c:277
+#: ../gio/gsocket.c:277
 msgid "Invalid socket, not initialized"
 msgstr ""
 
-#: gio/gsocket.c:284
+#: ../gio/gsocket.c:284
 #, c-format
 msgid "Invalid socket, initialization failed due to: %s"
 msgstr ""
 
-#: gio/gsocket.c:292
+#: ../gio/gsocket.c:292
 msgid "Socket is already closed"
 msgstr ""
 
-#: gio/gsocket.c:405
+#: ../gio/gsocket.c:405
 #, fuzzy, c-format
 msgid "creating GSocket from fd: %s"
 msgstr "Gwall wrth ddarllen ffeil '%s': %s "
 
-#: gio/gsocket.c:439 gio/gsocket.c:453 gio/gsocket.c:1911
+#: ../gio/gsocket.c:439 ../gio/gsocket.c:453 ../gio/gsocket.c:1911
 #, fuzzy, c-format
 msgid "Unable to create socket: %s"
 msgstr "Methwyd creu'r ffeil '%s': %s"
 
-#: gio/gsocket.c:439
+#: ../gio/gsocket.c:439
 msgid "Unknown protocol was specified"
 msgstr ""
 
-#: gio/gsocket.c:758
+#: ../gio/gsocket.c:758
 #, fuzzy
 msgid "Cancellable initialization not supported"
 msgstr "Ni chynhelir cysylltion symbolaidd"
 
-#: gio/gsocket.c:1112
+#: ../gio/gsocket.c:1112
 #, c-format
 msgid "could not get local address: %s"
 msgstr ""
 
-#: gio/gsocket.c:1145
+#: ../gio/gsocket.c:1145
 #, fuzzy, c-format
 msgid "could not get remote address: %s"
 msgstr "Methu newid modd ffeil: methodd waitpid(): %s"
 
-#: gio/gsocket.c:1203
+#: ../gio/gsocket.c:1203
 #, c-format
 msgid "could not listen: %s"
 msgstr ""
 
-#: gio/gsocket.c:1277
+#: ../gio/gsocket.c:1277
 #, fuzzy, c-format
 msgid "Error binding to address: %s"
 msgstr "Gwall wrth ddarllen ffeil '%s': %s "
 
-#: gio/gsocket.c:1397
+#: ../gio/gsocket.c:1397
 #, fuzzy, c-format
 msgid "Error accepting connection: %s"
 msgstr "Gwall wrth drawsnewid: %s"
 
-#: gio/gsocket.c:1510
+#: ../gio/gsocket.c:1510
 #, fuzzy
 msgid "Error connecting: "
 msgstr "Gwall wrth ddarllen ffeil '%s': %s "
 
-#: gio/gsocket.c:1514
+#: ../gio/gsocket.c:1514
 msgid "Connection in progress"
 msgstr ""
 
-#: gio/gsocket.c:1519
+#: ../gio/gsocket.c:1519
 #, fuzzy, c-format
 msgid "Error connecting: %s"
 msgstr "Gwall wrth ddarllen ffeil '%s': %s "
 
-#: gio/gsocket.c:1559
+#: ../gio/gsocket.c:1559
 #, fuzzy, c-format
 msgid "Unable to get pending error: %s"
 msgstr "Methwyd creu'r ffeil '%s': %s"
 
-#: gio/gsocket.c:1655
+#: ../gio/gsocket.c:1655
 #, fuzzy, c-format
 msgid "Error receiving data: %s"
 msgstr "Gwall wrth ddarllen ffeil '%s': %s "
 
-#: gio/gsocket.c:1798
+#: ../gio/gsocket.c:1798
 #, fuzzy, c-format
 msgid "Error sending data: %s"
 msgstr "Gwall wrth ddarllen ffeil '%s': %s "
 
-#: gio/gsocket.c:1990
+#: ../gio/gsocket.c:1990
 #, fuzzy, c-format
 msgid "Error closing socket: %s"
 msgstr "Gwall wrth ddarllen ffeil '%s': %s "
 
-#: gio/gsocket.c:2475
+#: ../gio/gsocket.c:2475
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr ""
 
-#: gio/gsocket.c:2714 gio/gsocket.c:2795
+#: ../gio/gsocket.c:2714 ../gio/gsocket.c:2795
 #, fuzzy, c-format
 msgid "Error sending message: %s"
 msgstr "Gwall wrth ddarllen ffeil '%s': %s "
 
-#: gio/gsocket.c:2739
+#: ../gio/gsocket.c:2739
 msgid "GSocketControlMessage not supported on windows"
 msgstr ""
 
-#: gio/gsocket.c:2997 gio/gsocket.c:3135
+#: ../gio/gsocket.c:2997 ../gio/gsocket.c:3135
 #, fuzzy, c-format
 msgid "Error receiving message: %s"
 msgstr "Gwall wrth ddarllen ffeil '%s': %s "
 
-#: gio/gsocketclient.c:521 gio/gsocketclient.c:770
+#: ../gio/gsocketclient.c:521 ../gio/gsocketclient.c:770
 msgid "Unknown error on connect"
 msgstr ""
 
-#: gio/gsocketlistener.c:192
+#: ../gio/gsocketlistener.c:192
 msgid "Listener is already closed"
 msgstr ""
 
-#: gio/gsocketlistener.c:233
+#: ../gio/gsocketlistener.c:233
 msgid "Added socket is closed"
 msgstr ""
 
-#: gio/gthemedicon.c:499
+#: ../gio/gthemedicon.c:499
 #, c-format
 msgid "Can't handle version %d of GThemedIcon encoding"
 msgstr ""
 
-#: gio/gunixconnection.c:151
+#: ../gio/gunixconnection.c:151
 #, c-format
 msgid "Expecting 1 control message, got %d"
 msgstr ""
 
-#: gio/gunixconnection.c:164
+#: ../gio/gunixconnection.c:164
 msgid "Unexpected type of ancillary data"
 msgstr ""
 
-#: gio/gunixconnection.c:182
+#: ../gio/gunixconnection.c:182
 #, c-format
 msgid "Expecting one fd, but got %d\n"
 msgstr ""
 
-#: gio/gunixconnection.c:198
+#: ../gio/gunixconnection.c:198
 msgid "Received invalid fd"
 msgstr ""
 
-#: gio/gunixinputstream.c:354 gio/gunixinputstream.c:374
-#: gio/gunixinputstream.c:452 gio/gunixoutputstream.c:439
+#: ../gio/gunixinputstream.c:354 ../gio/gunixinputstream.c:374
+#: ../gio/gunixinputstream.c:452 ../gio/gunixoutputstream.c:439
 #, fuzzy, c-format
 msgid "Error reading from unix: %s"
 msgstr "Gwall wrth ddarllen ffeil '%s': %s "
 
-#: gio/gunixinputstream.c:407 gio/gunixinputstream.c:589
-#: gio/gunixoutputstream.c:394 gio/gunixoutputstream.c:545
+#: ../gio/gunixinputstream.c:407 ../gio/gunixinputstream.c:589
+#: ../gio/gunixoutputstream.c:394 ../gio/gunixoutputstream.c:545
 #, fuzzy, c-format
 msgid "Error closing unix: %s"
 msgstr "Gwall ar linell %d: %s"
 
-#: gio/gunixmounts.c:1846 gio/gunixmounts.c:1883
+#: ../gio/gunixmounts.c:1846 ../gio/gunixmounts.c:1883
 msgid "Filesystem root"
 msgstr ""
 
-#: gio/gunixoutputstream.c:340 gio/gunixoutputstream.c:361
+#: ../gio/gunixoutputstream.c:340 ../gio/gunixoutputstream.c:361
 #, fuzzy, c-format
 msgid "Error writing to unix: %s"
 msgstr "Gwall wrth ramadegu opsiwn %s"
 
-#: gio/gunixsocketaddress.c:182
+#: ../gio/gunixsocketaddress.c:182
 msgid "Abstract unix domain socket addresses not supported on this system"
 msgstr ""
 
-#: gio/gvolume.c:452
+#: ../gio/gvolume.c:407
 msgid "volume doesn't implement eject"
 msgstr ""
 
 #. Translators: This is an error
 #. * message for volume objects that
 #. * don't implement any of eject or eject_with_operation.
-#: gio/gvolume.c:531
+#: ../gio/gvolume.c:486
 msgid "volume doesn't implement eject or eject_with_operation"
 msgstr ""
 
-#: gio/gwin32appinfo.c:277
+#: ../gio/gwin32appinfo.c:277
 msgid "Can't find application"
 msgstr ""
 
-#: gio/gwin32appinfo.c:300
+#: ../gio/gwin32appinfo.c:300
 #, fuzzy, c-format
 msgid "Error launching application: %s"
 msgstr "Gwall wrth ramadegu opsiwn %s"
 
-#: gio/gwin32appinfo.c:336
+#: ../gio/gwin32appinfo.c:336
 #, fuzzy
 msgid "URIs not supported"
 msgstr "Ni chynhelir cysylltion symbolaidd"
 
-#: gio/gwin32appinfo.c:358
+#: ../gio/gwin32appinfo.c:358
 msgid "association changes not supported on win32"
 msgstr ""
 
-#: gio/gwin32appinfo.c:370
+#: ../gio/gwin32appinfo.c:370
 msgid "Association creation not supported on win32"
 msgstr ""