Updated Welsh translation from Rhys Jones.

2 files changed, 1995 insertions, 1199 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index 7c1bad63c..306429bd3 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2004-03-08  Dafydd Harries  <daf@muse.19inch.net>
+
+	* cy.po: Updated Welsh translation from Rhys Jones.
+
 2004-03-08  Ales Nyakhaychyk  <nab@mail.by>
 
 	* be.po: Updated Belarusian translation.
diff --git a/po/cy.po b/po/cy.po
index 7fa51dbc2..e7c23a6b3 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -1,20 +1,22 @@
 # epiphany yn Gymraeg.
-# Copyright (C) 2003 Free Software Foundation, Inc.
 # www.kyfieithu.co.uk <kyfieithu@dotmon.com>, 2003.
 # Kevin Willoughby, 2003.
-# Dafydd Harries <daf@parnassus.ath.cx>, 2003.
+# Dafydd Harries <daf@muse.19inch.net>, 2003.
+# Rhys Jones <rhys@sucs.org>, 2004.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: epiphany\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-08-25 17:36+0100\n"
+"POT-Creation-Date: 2004-03-08 16:26+0000\n"
 "PO-Revision-Date: 2003-08-27 00:34+0100\n"
-"Last-Translator: Dafydd Harries <daf@parnassus.ath.cx>\n"
+"Last-Translator: Rhys Jones <rhys@sucs.org>\n"
 "Language-Team: Cymraeg <gnome-cy@pengwyn.linux.org.uk>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
+"Plural-Forms: nplurals=3; plural= n==1 ? 0 : n==2 ? 1 : (n != 8 || n != "
+"11) ? 2: 3;\n"
 
 #: data/GNOME_Epiphany_Automation.server.in.h:1
 msgid "Epiphany automation"
@@ -25,28 +27,20 @@ msgid "Epiphany Nautilus view"
 msgstr "Golwg Nautilus Epiphany"
 
 #: data/GNOME_Epiphany_NautilusView.server.in.h:2
-msgid "Epiphany Nautilus view factory"
-msgstr "Ffatri golwg Nautilus Epiphany"
-
-#: data/GNOME_Epiphany_NautilusView.server.in.h:3
 msgid "Epiphany content view component"
 msgstr "Cydran golwg cynnwys Epiphany"
 
-#: data/GNOME_Epiphany_NautilusView.server.in.h:4
-msgid "Epiphany content view component's factory"
-msgstr "Ffatri cydran golwg cynnwys Epiphany"
-
-#: data/GNOME_Epiphany_NautilusView.server.in.h:5
+#: data/GNOME_Epiphany_NautilusView.server.in.h:3
 msgid "View as Web Page"
 msgstr "Gweld fel Tudalen Gwe"
 
-#: data/GNOME_Epiphany_NautilusView.server.in.h:6
+#: data/GNOME_Epiphany_NautilusView.server.in.h:4
 msgid "Web Page"
 msgstr "Tudalen Gwe"
 
-#: data/GNOME_Epiphany_NautilusView.server.in.h:7
+#: data/GNOME_Epiphany_NautilusView.server.in.h:5
 msgid "Web Page Viewer"
-msgstr "Gwelydd Tudalen We"
+msgstr "Gwelydd Tudalen Gwe"
 
 #: data/bme.desktop.in.h:1
 msgid "Browse and organize your bookmarks"
@@ -56,9 +50,86 @@ msgstr "Pori a threfnu eich llyfrnodau"
 msgid "Web Bookmarks"
 msgstr "Llyfrnodau Gwe"
 
+#: data/epiphany-lockdown.schemas.in.h:1
+msgid ""
+"A list of protocols to be considered safe in addition to the default, when "
+"disable_unsafe_protocols is enabled."
+msgstr ""
+"Rhestr o brotocolau i'w trin fel rhai diogel yn ogystal a'r rhagosodiad, pan "
+"fo disable_unsafe_protocols wedi ei alluogi."
+
+#: data/epiphany-lockdown.schemas.in.h:2
+msgid "Additional safe protocols"
+msgstr "Protocolau diogel ychwanegol"
+
+#: data/epiphany-lockdown.schemas.in.h:3
+msgid "Disable Arbitrary URLs"
+msgstr "Annalluogi URLau Mympwyol"
+
+#: data/epiphany-lockdown.schemas.in.h:4
+msgid "Disable Bookmark Editing"
+msgstr "Analluogi Golygu Llyfrnodau"
+
+#: data/epiphany-lockdown.schemas.in.h:5
+msgid "Disable History"
+msgstr "Analluogi Hanes"
+
+#: data/epiphany-lockdown.schemas.in.h:6
+msgid "Disable JavaScript chrome control"
+msgstr "Analluogi gallu Javascript i newid crôm"
+
+#: data/epiphany-lockdown.schemas.in.h:7
+msgid "Disable JavaScript's control over window chrome."
+msgstr "Peidio a gadael i JavaScript newid crôm ffenest."
+
+#: data/epiphany-lockdown.schemas.in.h:8
+msgid "Disable Toolbar Editing"
+msgstr "Analluogi Golygu'r Bar Offer"
+
+#: data/epiphany-lockdown.schemas.in.h:9
+msgid ""
+"Disable all historical information by disabling the back button, not "
+"allowing the history dialog and hiding the most used bookmarks list."
+msgstr ""
+"Analluogi'r holl wybodaeth hanes drwy analluogi'r botwm 'yn ôl', peidio a "
+"gadael i'r deialog hanes gael ei ddangos, a chuddio'r rhestr o lyfrnodau a "
+"ddefnyddir amlaf."
+
+#: data/epiphany-lockdown.schemas.in.h:10
+msgid "Disable the user's ability to edit their bookmarks."
+msgstr "Achosi i'r defnyddiwr beidio a medru golygu eu llyfrnodau."
+
+#: data/epiphany-lockdown.schemas.in.h:11
+msgid "Disable the user's ability to edit toolbars."
+msgstr "Achosi i'r defnyddiwr beidio a medru golygu barau offer."
+
+#: data/epiphany-lockdown.schemas.in.h:12
+msgid "Disable the user's ability to type in a URL to epiphany."
+msgstr "Achosi i'r defnyddiwr beidio a medru teipio URL i mewn i epiphany."
+
+#: data/epiphany-lockdown.schemas.in.h:13
+msgid "Disable unsafe protocols"
+msgstr "Analluogi protocolau peryglus"
+
+#: data/epiphany-lockdown.schemas.in.h:14
+msgid ""
+"Disables loading of content from unsafe protocols. Safe protocols are http: "
+"and https:."
+msgstr ""
+"Analluogi llwytho cynnwys o brotocolau peryglus. Y protocolau diogel yw "
+"http: a https:."
+
+#: data/epiphany-lockdown.schemas.in.h:15
+msgid "Hide menubar by default"
+msgstr "Cuddio'r bar dewis yn rhagosodedig"
+
+#: data/epiphany-lockdown.schemas.in.h:16
+msgid "Hide the menubar by default."
+msgstr "Dangos y bar dewis yn rhagosodedig."
+
 #: data/epiphany.desktop.in.h:1
 msgid "Browse the web"
-msgstr "Pori'r gwe"
+msgstr "Pori'r we"
 
 #: data/epiphany.desktop.in.h:2
 msgid "Web Browser"
@@ -76,30 +147,34 @@ msgstr "Caniatáu bryslenni"
 msgid ""
 "Allow sites to open new windows using JavaScript (if JavaScript is enabled)."
 msgstr ""
-"Caniatáu i safleoedd agor ffenestri newydd gan ddefnyddio JavaScript (os mae "
-"JavaScript wedi ei alluoig)."
+"Caniatáu i safleoedd agor ffenestri newydd gan ddefnyddio JavaScript (os yw "
+"JavaScript wedi ei alluogi)."
 
 #: data/epiphany.schemas.in.h:4
-msgid "Ask for download destination"
-msgstr "Gofyn am gyrchfan i'r lawrlwythiad"
+msgid "Always show the tab bar"
+msgstr "Dangos y bar tab bob tro"
 
 #: data/epiphany.schemas.in.h:5
-msgid "Ask for download destination."
-msgstr "Gofyn am gyrchfan i'r lawrlwythiad."
+msgid "Automatic downloads"
+msgstr "Lawrlwythiadau awtomatig"
 
 #: data/epiphany.schemas.in.h:6
 msgid "Autowrap for find in page"
 msgstr "Amlapio awtomatig ar gyfer canfod yn y dudalen"
 
 #: data/epiphany.schemas.in.h:7
+msgid "Browse with caret"
+msgstr "Pori gyda caret"
+
+#: data/epiphany.schemas.in.h:8
 msgid "Cookie accept"
 msgstr "Derbyn bisgedi"
 
-#: data/epiphany.schemas.in.h:8
+#: data/epiphany.schemas.in.h:9
 msgid "Default encoding"
 msgstr "Amgodiad rhagosodedig"
 
-#: data/epiphany.schemas.in.h:9
+#: data/epiphany.schemas.in.h:10
 msgid ""
 "Default encoding. Accepted values are: \"armscii-8\", \"Big5\", \"Big5-HKSCS"
 "\", \"EUC-JP\", \"EUC-KR\", \"gb18030\", \"GB2312\", \"geostd8\", \"HZ-GB-"
@@ -119,7 +194,7 @@ msgid ""
 "\"x-mac-turkish\", \"x-mac-ukrainian\", \"x-user-defined\", \"x-viet-tcvn5712"
 "\", \"x-viet-vps\" and \"x-windows-949\"."
 msgstr ""
-"Amgodiad rhagosodedig.  Gwerthoedd a dderbynnir: \"armscii-8\", \"Big5\", "
+"Amgodiad rhagosodedig. Gwerthoedd a dderbynnir: \"armscii-8\", \"Big5\", "
 "\"Big5-HKSCS\", \"EUC-JP\", \"EUC-KR\", \"gb18030\", \"GB2312\", \"geostd8"
 "\", \"HZ-GB-2312\", \"IBM850\", \"IBM852\", \"IBM855\", \"IBM857\", \"IBM862"
 "\", \"IBM864\", \"IBM866\", \"ISO-2022-CN\", \"ISO-2022-JP\", \"ISO-2022-KR"
@@ -134,189 +209,205 @@ msgstr ""
 "cyrillic\", \"x-mac-devanagari\", \"x-mac-farsi\", \"x-mac-greek\", \"x-mac-"
 "gujarati\", \"x-mac-gurmukhi\", \"x-mac-hebrew\", \"x-mac-icelandic\", \"x-"
 "mac-roman\", \"x-mac-romanian\", \"x-mac-turkish\", \"x-mac-ukrainian\", \"x-"
-"user-defined\", \"x-viet-tcvn5712\", \"x-viet-vps\" and \"x-windows-949\"."
+"user-defined\", \"x-viet-tcvn5712\", \"x-viet-vps\" ac \"x-windows-949\"."
 
-#: data/epiphany.schemas.in.h:10
+#: data/epiphany.schemas.in.h:11
 msgid "Default font type"
 msgstr "Math ffont rhagosodedig"
 
-#: data/epiphany.schemas.in.h:11
+#: data/epiphany.schemas.in.h:12
 msgid "Default font type. Possible values are \"serif\" and \"sans-serif\"."
 msgstr ""
 "Math ffont rhagosodedig. Gwerthoedd posib yw \"serif\" a \"sans-serif\"."
 
-#: data/epiphany.schemas.in.h:12
+#: data/epiphany.schemas.in.h:13
 msgid "Enable Java"
 msgstr "Galluogi Java"
 
-#: data/epiphany.schemas.in.h:13
+#: data/epiphany.schemas.in.h:14
 msgid "Enable Java."
 msgstr "Galluogi Java."
 
-#: data/epiphany.schemas.in.h:14
+#: data/epiphany.schemas.in.h:15
 msgid "Enable JavaScript"
 msgstr "Galluogi JavaScript"
 
-#: data/epiphany.schemas.in.h:15
+#: data/epiphany.schemas.in.h:16
 msgid "Enable JavaScript."
 msgstr "Galluogi JavaScript."
 
-#: data/epiphany.schemas.in.h:16
+#: data/epiphany.schemas.in.h:17
 msgid "Filename to print to"
 msgstr "Enw ffeil i argraffu iddo"
 
-#: data/epiphany.schemas.in.h:17
+#: data/epiphany.schemas.in.h:18
 msgid "Filename to print to."
 msgstr "Enw ffeil i argraffu iddo."
 
-#: data/epiphany.schemas.in.h:18
+#: data/epiphany.schemas.in.h:19
 msgid ""
 "For find in page, whether to start again at the beginning after reaching the "
 "end of the page."
 msgstr ""
-"Ar gyfer canfod yn y tudalen, a ddylid cychwyn eto ar y dechrau ar ôl "
-"cyrraedd diwedd y dudalen"
+"Tra'n canfod yn y dudalen, a ddylid ailgychwyn ar y dechrau ar ôl cyrraedd "
+"diwedd y dudalen."
 
-#: data/epiphany.schemas.in.h:19
+#: data/epiphany.schemas.in.h:20
+msgid "History pages time range"
+msgstr "Amrediad amser tudalennau hanes"
+
+#: data/epiphany.schemas.in.h:21
 msgid "Home page"
 msgstr "Tudalen gartref"
 
-#: data/epiphany.schemas.in.h:20
+#: data/epiphany.schemas.in.h:22
 msgid "ISO-8859-1"
 msgstr "ISO-8859-1"
 
-#: data/epiphany.schemas.in.h:21
+#: data/epiphany.schemas.in.h:23
 msgid "Languages"
 msgstr "Ieithoedd"
 
-#: data/epiphany.schemas.in.h:22
+#: data/epiphany.schemas.in.h:24
 msgid "Match case for find in page"
 msgstr "Cydweddu prif lythrennau/llythrennau bach wrth ganfod yn y dudalen"
 
-#: data/epiphany.schemas.in.h:23
+#: data/epiphany.schemas.in.h:25
 msgid "Match case for find in page."
 msgstr "Cydweddu prif lythrennau/llythrennau bach wrth ganfod yn y dudalen."
 
-#: data/epiphany.schemas.in.h:24
+#: data/epiphany.schemas.in.h:26
 msgid ""
 "Middle click to open the web page pointed to by the currently selected text"
 msgstr ""
 "Clic ganol er mwyn agor y dudalen gwe y mae'r testun detholedig yn cyfeirio "
-"iddo"
+"ato"
 
-#: data/epiphany.schemas.in.h:25
+#: data/epiphany.schemas.in.h:27
 msgid ""
 "Middle clicking on the main view pane will open the web page pointed to by "
 "the currently selected text."
 msgstr ""
-"Mi fydd clic canol ar brif cwarel yr olwg yn agor y dudalen gwe y mae'r "
+"Mi fydd clic canol ar brif chwarel yr olwg yn agor y dudalen gwe y mae'r "
 "testun detholedig yn cyfeirio iddo."
 
-#: data/epiphany.schemas.in.h:26
-msgid "Open in tabs by default."
-msgstr "Agor mewn tabiau yn rhagosodedig."
-
-#: data/epiphany.schemas.in.h:27
+#: data/epiphany.schemas.in.h:28
 msgid "Paper type"
 msgstr "Math papur"
 
-#: data/epiphany.schemas.in.h:28
+#: data/epiphany.schemas.in.h:29
 msgid ""
 "Paper type. Supported values are \"A4\", \"Letter\", \"Legal\" and "
 "\"Executive\"."
 msgstr ""
-"Math papur. Gwerthoedd  cynhaledig:  \"A4\", \"Letter\", \"Legal\" ac "
+"Math papur. Gwerthoedd cynhaledig: \"A4\", \"Letter\", \"Legal\" ac "
 "\"Executive\"."
 
-#: data/epiphany.schemas.in.h:29
+#: data/epiphany.schemas.in.h:30
 msgid "Preferred languages, two letter codes."
-msgstr "Ieithoedd dewisiedig, côdau dwy lythyren."
+msgstr "Ieithoedd dewisiedig, codau dwy lythyren."
 
-#: data/epiphany.schemas.in.h:30
+#: data/epiphany.schemas.in.h:31
 msgid "Printer name"
 msgstr "Enw'r argraffydd"
 
-#: data/epiphany.schemas.in.h:31
+#: data/epiphany.schemas.in.h:32
 msgid "Printer name."
 msgstr "Enw'r argraffydd."
 
-#: data/epiphany.schemas.in.h:32
+#: data/epiphany.schemas.in.h:33
 msgid "Printing bottom margin"
 msgstr "Yr ymyl gwaelod argraffu"
 
-#: data/epiphany.schemas.in.h:33
+#: data/epiphany.schemas.in.h:34
 msgid "Printing bottom margin (in mm)."
 msgstr "Yr ymyl gwaelod argraffu (mewn mm)."
 
-#: data/epiphany.schemas.in.h:34
+#: data/epiphany.schemas.in.h:35
 msgid "Printing left margin"
 msgstr "Yr ymyl chwith argraffu"
 
-#: data/epiphany.schemas.in.h:35
+#: data/epiphany.schemas.in.h:36
 msgid "Printing left margin (in mm)."
 msgstr "Yr ymyl chwith argraffu (mewn mm)."
 
-#: data/epiphany.schemas.in.h:36
+#: data/epiphany.schemas.in.h:37
 msgid "Printing right margin"
-msgstr "Yr ymyl de argraffu"
+msgstr "Yr ymyl dde argraffu"
 
-#: data/epiphany.schemas.in.h:37
+#: data/epiphany.schemas.in.h:38
 msgid "Printing right margin (in mm)."
-msgstr "Yr ymyl de argraffu (mewn mm)."
+msgstr "Yr ymyl dde argraffu (mewn mm)."
 
-#: data/epiphany.schemas.in.h:38
+#: data/epiphany.schemas.in.h:39
 msgid "Printing top margin"
 msgstr "Yr ymyl brig argraffu"
 
-#: data/epiphany.schemas.in.h:39
+#: data/epiphany.schemas.in.h:40
 msgid "Printing top margin (in mm)."
 msgstr "Yr ymyl brig argraffu (mewn mm)."
 
-#: data/epiphany.schemas.in.h:40
+#: data/epiphany.schemas.in.h:41
 msgid "Show bookmarks bar by default"
 msgstr "Dangos y bar llyfrnodau yn rhagosodedig"
 
-#: data/epiphany.schemas.in.h:41
+#: data/epiphany.schemas.in.h:42
 msgid "Show bookmarks bar by default."
 msgstr "Dangos y bar llyfrnodau yn rhagosodedig."
 
-#: data/epiphany.schemas.in.h:42
-msgid "Show download details"
-msgstr "Dangos manylion y lawrlwythiad"
-
 #: data/epiphany.schemas.in.h:43
-msgid "Show download details."
-msgstr "Dangos manylion y lawrlwythiad."
-
-#: data/epiphany.schemas.in.h:44
 msgid "Show statusbar by default"
 msgstr "Dangos y bar cyflwr yn rhagosodedig"
 
-#: data/epiphany.schemas.in.h:45
+#: data/epiphany.schemas.in.h:44
 msgid "Show statusbar by default."
 msgstr "Dangos y bar cyflwr yn rhagosodedig."
 
+#: data/epiphany.schemas.in.h:45
+msgid ""
+"Show the history pages visited \"ever\", \"last_two_days\", \"last_three_days"
+"\", \"today\"."
+msgstr ""
+"Dangos y tudalennau hanes ymwelwyd a hwy. Gwerthoedd posib: \"ever\", "
+"\"last_two_days\", \"last_three_days\", \"today\"."
+
 #: data/epiphany.schemas.in.h:46
+msgid "Show the tab bar also when there is only one tab open."
+msgstr "Dangos y bar tabiau hefyd pan fo ond un tab ar agor."
+
+#: data/epiphany.schemas.in.h:47
 msgid "Show toolbars by default"
 msgstr "Dangos y barau offer yn rhagosodedig"
 
-#: data/epiphany.schemas.in.h:47
+#: data/epiphany.schemas.in.h:48
 msgid "Show toolbars by default."
 msgstr "Dangos y barau offer yn rhagosodedig."
 
-#: data/epiphany.schemas.in.h:48
+#: data/epiphany.schemas.in.h:49
 msgid "Size of disk cache"
-msgstr "Maint y storfa disg"
+msgstr "Maint y storfa ddisg"
 
-#: data/epiphany.schemas.in.h:49
+#: data/epiphany.schemas.in.h:50
 msgid "Size of disk cache, in MB."
-msgstr "Maint y storfa disg, mewn MB."
+msgstr "Maint y storfa ddisg, mewn MB."
 
-#: data/epiphany.schemas.in.h:50
+#: data/epiphany.schemas.in.h:51
+msgid "The bookmark informations shown in the editor view"
+msgstr "Y manylion llyfrnod a ddangosir yn y golwg golygydd"
+
+#: data/epiphany.schemas.in.h:52
+msgid ""
+"The bookmark informations shown in the editor view. Valid values in the list "
+"are \"address\" and \"title\"."
+msgstr ""
+"Y manylion ynghylch llyfrnodau a ddangosir yn y golwg golygu. Y gwerthoedd "
+"dilys yn y rhestr yw \"address\" a \"title\"."
+
+#: data/epiphany.schemas.in.h:53
 msgid "The currently selected fonts language"
 msgstr "Iaith y ffontiau sydd wedi'u dewis ar hyn o bryd"
 
-#: data/epiphany.schemas.in.h:51
+#: data/epiphany.schemas.in.h:54
 msgid ""
 "The currently selected fonts language. Valid values are \"ar\" (arabic), \"x-"
 "baltic\" (baltic languages), \"x-central-euro\" (central european "
@@ -327,22 +418,26 @@ msgid ""
 "written in latin script), \"x-tamil\" (tamil) and \"x-devanagari"
 "\" (devanagari)."
 msgstr ""
-"Y iaith ffontiau sydd wedi ei ddewis yn gyfredol. Gwerthoedd dilys: \"ar"
+"Y iaith ffontiau sydd wedi ei ddewis ar hyn o bryd. Gwerthoedd dilys: \"ar"
 "\" (arabig), \"x-baltic\" (ieithoedd baltig), \"x-central-euro\" (ieithoedd "
 "canol ewrop), \"x-cyrillic\" (ieithoedd a ysgrifennir efo'r wyddor cyrilig), "
-"\"el\" (groeg), \"he\" (hebraeg), \"ja\" (japaneg), \"ko\" (corëeg), \"zh-C"
-"\" (tsieiëeg symleiddiedig), \"th\" (siameg) \"zh-TW\" (tseinëeg tradoddiadaol), "
-"\"tr\" (twrceg), \"x-unicode\" (ieithoedd eraill), \"x-western\" (ieithoedd "
-"a ysgrifennir yn y sgript lladin), \"x-tamil\" (tamil) a \"x-devanagari"
-"\" (devanagari)."
+"\"el\" (groeg), \"he\" (hebraeg), \"ja\" (siapanëeg), \"ko\" (corëeg), \"zh-C"
+"\" (tsieinëeg symleiddiedig), \"th\" (siameg) \"zh-TW\" (tseinëeg "
+"tradoddiadaol), \"tr\" (twrceg), \"x-unicode\" (ieithoedd eraill), \"x-"
+"western\" (ieithoedd a ysgrifennir yn y sgript lladin), \"x-tamil\" (tamil) "
+"ac \"x-devanagari\" (devanagari)."
 
-#: data/epiphany.schemas.in.h:52
+#: data/epiphany.schemas.in.h:55
+msgid "The downloads folder"
+msgstr "Y blygell lawrlwythiadau"
+
+#: data/epiphany.schemas.in.h:56
 msgid "The encoding autodetector. Empty string means autodetect is off"
 msgstr ""
-"Y darganfyddydd amgodiadau awtoamtig. Mae llinyn gwag yn golygu na chaiff y "
+"Y darganfyddydd amgodiadau awtomatig. Mae llinyn gwag yn golygu na chaiff y "
 "darganfyddydd ei ddefnyddio."
 
-#: data/epiphany.schemas.in.h:53
+#: data/epiphany.schemas.in.h:57
 msgid ""
 "The encoding autodetector. Valid entries are \"\" (autodetectors off), "
 "\"cjk_parallel_state_machine\" (autodetect east asian encodings), "
@@ -356,86 +451,190 @@ msgid ""
 msgstr ""
 "Y darganfyddydd amgodiadau awtomatig. Gwerthoedd dilys: \"\" (diffodd y "
 "darganfyddydd), \"cjk_parallel_state_machine\" (darganfod amgodiadau dwyrain "
-"asia), \"ja_parallel_state_machine\" (darganfod amgodiadau japaneg), "
+"asia), \"ja_parallel_state_machine\" (darganfod amgodiadau siapanëeg), "
 "\"ko_parallel_state_machine\" (darganfod amgodiadau corëeg), \"ruprob"
-"\" (dargandfod amgodiadau rwsieg), \"ukprob\" (dargandfod amgodiadau "
-"wcraineg), \"zh_parallel_state_machine\" (dargandfod amgodiadau tseinëeg), "
-"\"zhcn_parallel_state_machine\" (dargandfod amgodiadau tseinëeg "
-"symleiddiedig), \"zhtw_parallel_state_machine\" (dargandfod amgodiadau "
-"tseinëeg traddodiadol) a \"universal_charset_detector \" (darganfod y rhan "
+"\" (dargandfod amgodiadau rwsieg), \"ukprob\" (darganfod amgodiadau "
+"wcraineg), \"zh_parallel_state_machine\" (darganfod amgodiadau tseinëeg), "
+"\"zhcn_parallel_state_machine\" (darganfod amgodiadau tseinëeg "
+"symleiddiedig), \"zhtw_parallel_state_machine\" (darganfod amgodiadau "
+"tseinëeg traddodiadol) ac \"universal_charset_detector \" (darganfod y rhan "
 "fwyaf o amgodiadau)."
 
-#: data/epiphany.schemas.in.h:54
+#: data/epiphany.schemas.in.h:58
+msgid "The page informations shown in the history view"
+msgstr "Y manylion tudalen a ddangosir yn y golwg hanes"
+
+#: data/epiphany.schemas.in.h:59
+msgid ""
+"The page informations shown in the history view. Valid values in the list "
+"are \"address\", \"title\"."
+msgstr ""
+"Y gwybodaeth ynghylch tudalennau a ddangosir yn y golwg hanes. Gwerthoedd "
+"dilys yn y rhestr yw \"address\", \"title\"."
+
+#: data/epiphany.schemas.in.h:60
+msgid "The path of the folder where downloads are saved."
+msgstr "Llwybr y plygell lle cedwir lawrlwythiadau."
+
+#: data/epiphany.schemas.in.h:61
+msgid "Use caret browsing mode."
+msgstr "Defnyddio'r modd pori caret."
+
+#: data/epiphany.schemas.in.h:62
 msgid "Use own colors"
 msgstr "Defnyddio eich lliwiau eich hun"
 
-#: data/epiphany.schemas.in.h:55
+#: data/epiphany.schemas.in.h:63
 msgid "Use own fonts"
 msgstr "Defnyddio eich ffontiau eich hun"
 
-#: data/epiphany.schemas.in.h:56
-msgid "Use tabs"
-msgstr "Defnyddio tabiau"
-
-#: data/epiphany.schemas.in.h:57
+#: data/epiphany.schemas.in.h:64
 msgid "Use your own colors instead of the colors the page requests."
 msgstr ""
-"Defnyddio eich lliwiau eich hun yn lle'r lliwiau mae'r tudalen yn gofyn "
+"Defnyddio eich lliwiau eich hun yn lle'r lliwiau mae'r dudalen yn gofyn "
 "amdanynt."
 
-#: data/epiphany.schemas.in.h:58
+#: data/epiphany.schemas.in.h:65
 msgid "Use your own fonts instead of the fonts the page requests."
 msgstr ""
-"Defnyddiwch eich ffontiau eich hun yn lle'r wynebfathau mae'r tudalen yn "
-"gofyn amdanynt."
+"Defnyddiwch eich ffontiau eich hun yn lle'r ffontiau mae'r dudalen yn gofyn "
+"amdanynt."
 
-#: data/epiphany.schemas.in.h:59
+#: data/epiphany.schemas.in.h:66
+msgid ""
+"When files cannot be opened by the browser they are automatically downloaded "
+"to the download folder and opened with the appropriate application."
+msgstr ""
+"Pan na fedra'r porwr agor ffeiliau, maen nhw'n cael eu lawrlwytho'n "
+"awtomatig i'r plygell lawrlwythiadau, ac yn cael eu hagor gan y rhaglen "
+"briodol."
+
+#: data/epiphany.schemas.in.h:67
 msgid ""
 "Where to accept cookies from. Possible values are \"anywhere\", \"current "
 "site\" and \"nowhere\"."
 msgstr ""
-"O le i dderbyn bisgedi. Gwerthoedd posib yw \"anywhere\", \"current site\", "
+"O ble i dderbyn bisgedi. Gwerthoedd posib yw \"anywhere\", \"current site\", "
 "\"nowhere\"."
 
-#: data/epiphany.schemas.in.h:60
+#: data/epiphany.schemas.in.h:68
 msgid "Whether to print the date in the footer"
 msgstr "A ddylid argraffu'r dyddiad yn y troedyn"
 
-#: data/epiphany.schemas.in.h:61
+#: data/epiphany.schemas.in.h:69
 msgid "Whether to print the date in the footer."
-msgstr "A dylid argraffu'r dyddiad yn y troedyn."
+msgstr "A ddylid argraffu'r dyddiad yn y troedyn."
 
-#: data/epiphany.schemas.in.h:62
+#: data/epiphany.schemas.in.h:70
 msgid "Whether to print the page address in the header"
-msgstr "A dylid argraffu cyfeiriad y dudalen yn y pennawd"
+msgstr "A ddylid argraffu cyfeiriad y dudalen yn y pennawd"
 
-#: data/epiphany.schemas.in.h:63
+#: data/epiphany.schemas.in.h:71
 msgid "Whether to print the page address in the header."
-msgstr "A dylid argraffu cyfeiriad y dudalen yn y pennawd."
+msgstr "A ddylid argraffu cyfeiriad y dudalen yn y pennawd."
 
-#: data/epiphany.schemas.in.h:64
+#: data/epiphany.schemas.in.h:72
 msgid "Whether to print the page numbers (x of total) in the footer"
 msgstr "A ddylid argraffu rhifau'r dudalen (x o gyfanswm) yn y troedyn"
 
-#: data/epiphany.schemas.in.h:65
+#: data/epiphany.schemas.in.h:73
 msgid "Whether to print the page numbers (x of total) in the footer."
 msgstr "A ddylid argraffu rhifau'r dudalen (x o gyfanswm) yn y troedyn."
 
-#: data/epiphany.schemas.in.h:66
+#: data/epiphany.schemas.in.h:74
 msgid "Whether to print the page title in the header"
-msgstr "A dylid argraffu teitl y dudalen yn y pennawd"
+msgstr "A ddylid argraffu teitl y dudalen yn y pennawd"
 
-#: data/epiphany.schemas.in.h:67
+#: data/epiphany.schemas.in.h:75
 msgid "Whether to print the page title in the header."
-msgstr "A dylid argraffu teitl y dudalen yn y pennawd."
+msgstr "A ddylid argraffu teitl y dudalen yn y pennawd."
 
-#: data/epiphany.schemas.in.h:68
+#: data/epiphany.schemas.in.h:76
 msgid "x-western"
 msgstr "x-western"
 
+#: data/glade/certificate-dialogs.glade.h:1 data/glade/prefs-dialog.glade.h:1
+#: data/glade/print.glade.h:1
+msgid "    "
+msgstr "    "
+
+#: data/glade/certificate-dialogs.glade.h:2
+msgid "<b>Fingerprints</b>"
+msgstr "<b>Olion bysedd</b>"
+
+#: data/glade/certificate-dialogs.glade.h:3
+msgid "<b>Issued By</b>"
+msgstr "<b>Cyflwynwyd Gan</b>"
+
+#: data/glade/certificate-dialogs.glade.h:4
+msgid "<b>Issued To</b>"
+msgstr "<b>Cyflwynwyd I</b>"
+
+#: data/glade/certificate-dialogs.glade.h:5
+msgid "<b>Validity</b>"
+msgstr "<b>Dilysrwydd</b>"
+
+#: data/glade/certificate-dialogs.glade.h:6
+msgid "Certificate _Fields"
+msgstr "_Meysydd Tystysgrif"
+
+#: data/glade/certificate-dialogs.glade.h:7
+msgid "Certificate _Hierarchy"
+msgstr "_Hierarchiaeth Tystysgriff"
+
+#: data/glade/certificate-dialogs.glade.h:8
+msgid "Common Name:"
+msgstr "Enw Cyffredin:"
+
+#: data/glade/certificate-dialogs.glade.h:9
+msgid "DYNAMIC"
+msgstr "DEINAMIG"
+
+#: data/glade/certificate-dialogs.glade.h:10
+msgid "Details"
+msgstr "Manylion"
+
+#: data/glade/certificate-dialogs.glade.h:11
+msgid "Expires On:"
+msgstr "Yn Darfod Ar:"
+
+#: data/glade/certificate-dialogs.glade.h:12
+msgid "Field _Value"
+msgstr "_Gwerth Maes"
+
+#: data/glade/certificate-dialogs.glade.h:13
+#: data/glade/prefs-dialog.glade.h:25
+msgid "General"
+msgstr "Cyffredinol"
+
+#: data/glade/certificate-dialogs.glade.h:14
+msgid "Issued On:"
+msgstr "Cyflwynwyd Ar:"
+
+#: data/glade/certificate-dialogs.glade.h:15
+msgid "MD5 Fingerprint:"
+msgstr "Ôl Bys MD5:"
+
+#: data/glade/certificate-dialogs.glade.h:16
+#: embed/mozilla/GtkNSSDialogs.cpp:964
+msgid "Organization:"
+msgstr "Corff:"
+
+#: data/glade/certificate-dialogs.glade.h:17
+msgid "Organizational Unit:"
+msgstr "Uned Corff:"
+
+#: data/glade/certificate-dialogs.glade.h:18
+msgid "SHA1 Fingerprint:"
+msgstr "Ôl Bys SHA1:"
+
+#: data/glade/certificate-dialogs.glade.h:19
+msgid "Serial Number:"
+msgstr "Rhif Cyfres:"
+
 #: data/glade/epiphany.glade.h:1
-msgid "  "
-msgstr "  "
+msgid "      "
+msgstr "      "
 
 #: data/glade/epiphany.glade.h:2 data/glade/prefs-dialog.glade.h:2
 #: data/glade/print.glade.h:2
@@ -443,98 +642,66 @@ msgid "*"
 msgstr "*"
 
 #: data/glade/epiphany.glade.h:3
-msgid "<b>Address:</b>"
-msgstr "<b>Cyfeiriad:</b>"
+msgid "<b>_Automatic</b>"
+msgstr "<b>_Awtomatig</b>"
 
 #: data/glade/epiphany.glade.h:4
-msgid "<b>Status:</b>"
-msgstr "<b>Cyflwr:</b>"
+msgid "<b>_Use a different encoding:</b>"
+msgstr "<b>_Defnyddio amgodiad gwahanol:</b>"
 
 #: data/glade/epiphany.glade.h:5
-msgid "<b>Time Elapsed:</b>"
-msgstr "<b>Amser Aeth Heibio:</b>"
-
-#: data/glade/epiphany.glade.h:6
-msgid "<b>Time Remaining:</b>"
-msgstr "<b>Amser Ar Ôl:</b>"
-
-#: data/glade/epiphany.glade.h:7
-msgid ""
-"<span weight=\"bold\" size=\"larger\">What do you want to do with this "
-"file?\n"
-"</span>\n"
-"It's not possible to view this file type directly in the browser:"
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Beth ydych chi eisiau gwneud gyda'r "
-"ffeil hwn?\n"
-"</span>\n"
-"Nid yw'n bosib dangos ffeil o'r math hon yn y porwr"
-
-#: data/glade/epiphany.glade.h:10
 msgid "C_ase sensitive"
 msgstr "_Priflythrennau o bwys"
 
-#: data/glade/epiphany.glade.h:11
-msgid "Choose the file type action"
-msgstr "Dewiswch weithred am fath y ffeil"
-
-#: data/glade/epiphany.glade.h:12
+#: data/glade/epiphany.glade.h:6
 msgid "Cookies"
 msgstr "Bisgedi"
 
-#: data/glade/epiphany.glade.h:13
-msgid "DYNAMIC"
-msgstr "DEINAMEG"
-
-#: data/glade/epiphany.glade.h:14
+#: data/glade/epiphany.glade.h:7
 msgid "Download Manager"
 msgstr "Trefnydd Lawrlwytho"
 
-#: data/glade/epiphany.glade.h:15
-msgid "Download _Details"
-msgstr "_Manylion Lawrlythiad"
-
-#: data/glade/epiphany.glade.h:16 data/ui/nautilus-epiphany-view.xml.in.h:11
-#: src/ephy-window.c:686
+#: data/glade/epiphany.glade.h:8 data/ui/nautilus-epiphany-view.xml.h:11
+#: src/ephy-window.c:951
 msgid "Find"
 msgstr "Canfod"
 
-#: data/glade/epiphany.glade.h:17
+#: data/glade/epiphany.glade.h:9
 msgid "Passwords"
 msgstr "Cyfrineiriau"
 
-#: data/glade/epiphany.glade.h:18
+#: data/glade/epiphany.glade.h:10
 msgid "Personal Data Manager"
 msgstr "Trefnydd Data Personol"
 
-#: data/glade/epiphany.glade.h:19
-msgid "You can open it with another application or save it on disk."
-msgstr "Gallwch chwi ei agor gyda rhaglen arall, neu ei gadw ar ddisg."
+#: data/glade/epiphany.glade.h:11
+msgid "Text Encoding"
+msgstr "Amgodiad Testun"
+
+#: data/glade/epiphany.glade.h:12 src/ephy-encoding-menu.c:388
+msgid "Use the encoding specified by the document"
+msgstr "Defnyddio'r amgodiad a benodir gan y ddogfen"
 
-#: data/glade/epiphany.glade.h:20
+#: data/glade/epiphany.glade.h:13
 msgid "_Find:"
 msgstr "_Canfod:"
 
-#: data/glade/epiphany.glade.h:21
+#: data/glade/epiphany.glade.h:14
 msgid "_Next"
 msgstr "_Nesaf"
 
-#: data/glade/epiphany.glade.h:22 embed/downloader-view.c:373
+#: data/glade/epiphany.glade.h:15 embed/downloader-view.c:280
 msgid "_Pause"
 msgstr "_Seibio"
 
-#: data/glade/epiphany.glade.h:23
+#: data/glade/epiphany.glade.h:16
 msgid "_Previous"
 msgstr "_Blaenorol"
 
-#: data/glade/epiphany.glade.h:24
+#: data/glade/epiphany.glade.h:17
 msgid "_Wrap around"
 msgstr "_Amlapio"
 
-#: data/glade/prefs-dialog.glade.h:1 data/glade/print.glade.h:1
-msgid "    "
-msgstr "    "
-
 #: data/glade/prefs-dialog.glade.h:3 data/glade/print.glade.h:3
 msgid "<b>Colors</b>"
 msgstr "<b>Lliwiau</b>"
@@ -544,25 +711,25 @@ msgid "<b>Cookies</b>"
 msgstr "<b>Bisgedi</b>"
 
 #: data/glade/prefs-dialog.glade.h:5
+msgid "<b>Downloads</b>"
+msgstr "<b>Lawrlwythiadau</b>"
+
+#: data/glade/prefs-dialog.glade.h:6
 msgid "<b>Encodings</b>"
 msgstr "<b>Amgodiadau</b>"
 
-#: data/glade/prefs-dialog.glade.h:6
+#: data/glade/prefs-dialog.glade.h:7
 msgid "<b>Fonts</b>"
 msgstr "<b>Ffontiau</b>"
 
-#: data/glade/prefs-dialog.glade.h:7
+#: data/glade/prefs-dialog.glade.h:8
 msgid "<b>Home page</b>"
 msgstr "<b>Tudalen gartref</b>"
 
-#: data/glade/prefs-dialog.glade.h:8
+#: data/glade/prefs-dialog.glade.h:9
 msgid "<b>Languages</b>"
 msgstr "<b>Ieithoedd</b>"
 
-#: data/glade/prefs-dialog.glade.h:9
-msgid "<b>Tabs</b>"
-msgstr "<b>Tabiau</b>"
-
 #: data/glade/prefs-dialog.glade.h:10
 msgid "<b>Temporary Files</b>"
 msgstr "<b>Ffeiliau Dros Dro</b>"
@@ -572,141 +739,133 @@ msgid "<b>Web Content</b>"
 msgstr "<b>Cynnwys Gwe</b>"
 
 #: data/glade/prefs-dialog.glade.h:12
+msgid "A_utomatically download and open files"
+msgstr "L_awrlwytho ac agor ffeiliau yn awtomatig"
+
+#: data/glade/prefs-dialog.glade.h:13
+msgid "Add Language"
+msgstr "Ychwanegu Iaith"
+
+#: data/glade/prefs-dialog.glade.h:14
 msgid "Al_ways use the desktop theme colors"
 msgstr "Defnyddio _lliwiau thema'r penbwrdd bob tro"
 
-#: data/glade/prefs-dialog.glade.h:13
-msgid "Allow _popup windows"
+#: data/glade/prefs-dialog.glade.h:15
+msgid "Allow popup _windows"
 msgstr "Caniatau _naid-ffenestri"
 
-#: data/glade/prefs-dialog.glade.h:14
+#: data/glade/prefs-dialog.glade.h:16
 msgid "Always use _these fonts"
 msgstr "Defnyddio'r _ffontiau hyn bob tro"
 
-#: data/glade/prefs-dialog.glade.h:15
-msgid "Autodetec_t:"
+#: data/glade/prefs-dialog.glade.h:17
+msgid "Au_todetect:"
 msgstr "Darganfod yn _awtomatig:"
 
-#: data/glade/prefs-dialog.glade.h:16
+#: data/glade/prefs-dialog.glade.h:18
+msgid "Choose a l_anguage:"
+msgstr "Dewiswch _iaith:"
+
+#: data/glade/prefs-dialog.glade.h:19
 msgid "Cl_ear"
 msgstr "C_lirio"
 
-#: data/glade/prefs-dialog.glade.h:17
+#: data/glade/prefs-dialog.glade.h:20
+msgid "De_fault:"
+msgstr "_Rhagosodedig:"
+
+#: data/glade/prefs-dialog.glade.h:21
 msgid "Enable Java_Script"
 msgstr "Galluogi Java_Script"
 
-#: data/glade/prefs-dialog.glade.h:18
+#: data/glade/prefs-dialog.glade.h:22
 msgid "Enable _Java"
 msgstr "Galluogi _Java"
 
-#: data/glade/prefs-dialog.glade.h:19
+#: data/glade/prefs-dialog.glade.h:23
 msgid "Fonts and Colors"
 msgstr "Ffontiau a Lliwiau"
 
-#: data/glade/prefs-dialog.glade.h:20 data/glade/print.glade.h:16
-msgid "General"
-msgstr "Cyffredinol"
+#: data/glade/prefs-dialog.glade.h:24
+msgid "For _Language:"
+msgstr "Ar gyfer _Iaith:"
 
-#: data/glade/prefs-dialog.glade.h:21
+#: data/glade/prefs-dialog.glade.h:26
 msgid "Language"
 msgstr "Iaith"
 
-#: data/glade/prefs-dialog.glade.h:22
-msgid "Language Editor"
-msgstr "Golygydd Iaith"
-
-#: data/glade/prefs-dialog.glade.h:23
+#: data/glade/prefs-dialog.glade.h:27
 msgid "MB"
 msgstr "MB"
 
-#: data/glade/prefs-dialog.glade.h:24
-msgid "Min_imum font size:"
-msgstr "Maint ffont _isaf:"
-
-#: data/glade/prefs-dialog.glade.h:25
-msgid "Mo_re..."
-msgstr "M_wy..."
-
-#: data/glade/prefs-dialog.glade.h:26
+#: data/glade/prefs-dialog.glade.h:28
 msgid "Only _from sites you visit"
 msgstr "Dim ond o safleoedd rych chi'n _ymweld a hwy"
 
-#: data/glade/prefs-dialog.glade.h:27
-msgid "Open in _tabs by default"
-msgstr "Agor mewn _tabiau yn rhagosodedig"
-
-#: data/glade/prefs-dialog.glade.h:28
+#: data/glade/prefs-dialog.glade.h:29
 msgid "Preferences"
 msgstr "Hoffterau"
 
-#: data/glade/prefs-dialog.glade.h:29
+#: data/glade/prefs-dialog.glade.h:30
 msgid "Privacy"
 msgstr "Preifatrwydd"
 
-#: data/glade/prefs-dialog.glade.h:30
-msgid "S_ans serif:"
-msgstr "S_ans seriff:"
-
 #: data/glade/prefs-dialog.glade.h:31
-msgid "Sans Serif"
-msgstr "Sans Seriff"
+msgid "Set to Current _Page"
+msgstr "Gosod i'r Dudalen _Cyfredol"
 
 #: data/glade/prefs-dialog.glade.h:32
-msgid "Serif"
-msgstr "Seriff"
+msgid "Set to _Blank Page"
+msgstr "Gosod i Dudalen _Wag"
 
 #: data/glade/prefs-dialog.glade.h:33
-msgid "Set to Current _Page"
-msgstr "Gosod i'r Dudalen _Gyfredol"
+msgid "_Add..."
+msgstr "_Ychwanegu..."
 
 #: data/glade/prefs-dialog.glade.h:34
-msgid "Set to _Blank Page"
-msgstr "Gosod i Dudalen _Wag"
+#: src/bookmarks/ephy-bookmark-properties.c:367
+msgid "_Address:"
+msgstr "_Cyfeiriad:"
 
 #: data/glade/prefs-dialog.glade.h:35
-msgid "Si_ze:"
-msgstr "_Maint:"
+msgid "_Always accept"
+msgstr "_Derbyn bob tro"
 
 #: data/glade/prefs-dialog.glade.h:36
-msgid "Siz_e:"
-msgstr "Mai_nt:"
+msgid "_Disk space:"
+msgstr "Gofod _disg:"
 
 #: data/glade/prefs-dialog.glade.h:37
-#: src/bookmarks/ephy-bookmark-properties.c:387
-msgid "_Address:"
-msgstr "_Cyfeiriad:"
+msgid "_Down"
+msgstr "I _Lawr"
 
 #: data/glade/prefs-dialog.glade.h:38
-msgid "_Always accept"
-msgstr "_Derbyn bob tro"
+msgid "_Download folder:"
+msgstr "_Plygell lawrlwytho:"
 
 #: data/glade/prefs-dialog.glade.h:39
-msgid "_Default:"
-msgstr "_Rhagosodedig:"
+msgid "_Fixed width:"
+msgstr "Lled _penodedig:"
 
 #: data/glade/prefs-dialog.glade.h:40
-msgid "_Disk space:"
-msgstr "Gofod _disg:"
+msgid "_Minimum size:"
+msgstr "Maint _isaf:"
 
 #: data/glade/prefs-dialog.glade.h:41
-msgid "_Language:"
-msgstr "_Iaith:"
+msgid "_Never accept"
+msgstr "Peidio â derby_n"
 
 #: data/glade/prefs-dialog.glade.h:42
-msgid "_Monospace:"
-msgstr "_Unlled:"
+msgid "_Remove"
+msgstr "_Tynnu"
 
-#: data/glade/prefs-dialog.glade.h:43
-msgid "_Never accept"
-msgstr "Peidio â derby_n"
+#: data/glade/prefs-dialog.glade.h:43 src/ephy-window.c:191
+msgid "_Up"
+msgstr "I _Fyny"
 
 #: data/glade/prefs-dialog.glade.h:44
-msgid "_Proportional:"
-msgstr "_Cyfrannol:"
-
-#: data/glade/prefs-dialog.glade.h:45
-msgid "_Serif:"
-msgstr "_Seriff:"
+msgid "_Variable width:"
+msgstr "Lled _newidiol:"
 
 #: data/glade/print.glade.h:4
 msgid "<b>Footers</b>"
@@ -714,7 +873,7 @@ msgstr "<b>Troedynnau</b>"
 
 #: data/glade/print.glade.h:5
 msgid "<b>Headers</b>"
-msgstr "<b>Pennodau</b>"
+msgstr "<b>Penawdau</b>"
 
 #: data/glade/print.glade.h:6
 msgid "<b>Margins (in mm)</b>"
@@ -748,87 +907,91 @@ msgstr "Ymddangosiad"
 msgid "C_olor"
 msgstr "_Lliw"
 
-#: data/glade/print.glade.h:14
-msgid "Choose a file to print to"
-msgstr "Dewiswch ffeil i argraffu iddo"
-
 # dyma'r maint papur, dwi'n meddwl
-#: data/glade/print.glade.h:15
+#: data/glade/print.glade.h:14
 msgid "E_xecutive"
 msgstr "E_xecutive"
 
-#: data/glade/print.glade.h:17
+#: data/glade/print.glade.h:15
 msgid "L_egal"
 msgstr "C_yfreithiol"
 
-#: data/glade/print.glade.h:18
+#: data/glade/print.glade.h:16
 msgid "Lan_dscape"
 msgstr "_Tirlun"
 
-#: data/glade/print.glade.h:19
+#: data/glade/print.glade.h:17
 msgid "P_age title"
 msgstr "Teitl y dud_alen"
 
-#: data/glade/print.glade.h:20
+#: data/glade/print.glade.h:18
 msgid "P_ortrait"
 msgstr "P_ortread"
 
-#: data/glade/print.glade.h:21
+#: data/glade/print.glade.h:19
 msgid "P_rinter:"
 msgstr "A_rgraffydd:"
 
-#: data/glade/print.glade.h:22
+#: data/glade/print.glade.h:20
 msgid "Pa_ges"
-msgstr "_Tudalenau"
+msgstr "_Tudalennau"
 
-#: data/glade/print.glade.h:23
+#: data/glade/print.glade.h:21
 msgid "Page _numbers"
 msgstr "Rhifau tudale_n"
 
-#: data/glade/print.glade.h:24
-msgid "Page a_ddress"
-msgstr "Cyfeiria_d tudalen"
-
-#: data/glade/print.glade.h:25
+#: data/glade/print.glade.h:22
 msgid "Paper"
 msgstr "Papur"
 
-#: data/glade/print.glade.h:26 data/ui/nautilus-epiphany-view.xml.in.h:23
-#: src/ephy-window.c:682
+#: data/glade/print.glade.h:23 data/ui/nautilus-epiphany-view.xml.h:23
+#: src/ephy-window.c:947
 msgid "Print"
 msgstr "Argraffu"
 
-#: data/glade/print.glade.h:27
+#: data/glade/print.glade.h:24
+msgid "Print Setup"
+msgstr "Gosodiadau Argraffu"
+
+#: data/glade/print.glade.h:25
 msgid "_All pages"
 msgstr "Pob tud_alen"
 
-#: data/glade/print.glade.h:28
+#: data/glade/print.glade.h:26
 msgid "_Bottom:"
 msgstr "_Gwaelod:"
 
-#: data/glade/print.glade.h:29
+#: data/glade/print.glade.h:27
+msgid "_Browse..."
+msgstr "_Pori..."
+
+#: data/glade/print.glade.h:28
 msgid "_Date"
 msgstr "_Dyddiad"
 
-#: data/glade/print.glade.h:30
+#: data/glade/print.glade.h:29
 msgid "_File:"
 msgstr "_Ffeil:"
 
-#: data/glade/print.glade.h:31
+#: data/glade/print.glade.h:30
 msgid "_Grayscale"
 msgstr "_Graddlwyd"
 
-#: data/glade/print.glade.h:32
+#: data/glade/print.glade.h:31
 msgid "_Left:"
 msgstr "_Chwith:"
 
-#: data/glade/print.glade.h:33
+#: data/glade/print.glade.h:32
 msgid "_Letter"
 msgstr "_Llythyr"
 
+#: data/glade/print.glade.h:33
+msgid "_Page address"
+msgstr "Cyfeiria_d tudalen"
+
 #: data/glade/print.glade.h:34
 msgid "_Right:"
-msgstr "_De:"
+msgstr "_Dde:"
 
 #: data/glade/print.glade.h:35
 msgid "_Selection"
@@ -850,649 +1013,972 @@ msgstr "_o:"
 msgid "lpr"
 msgstr "lpr"
 
-#: data/ui/nautilus-epiphany-view.xml.in.h:1
+#: data/ui/nautilus-epiphany-view.xml.h:1
 msgid "Add Bookmark for Frame"
 msgstr "Ychwanegu llyfrnod ar gyfer y ffrâm"
 
-#: data/ui/nautilus-epiphany-view.xml.in.h:2
+#: data/ui/nautilus-epiphany-view.xml.h:2
 msgid "Copy"
 msgstr "Copïo"
 
-#: data/ui/nautilus-epiphany-view.xml.in.h:3
+#: data/ui/nautilus-epiphany-view.xml.h:3
 msgid "Copy Email Address"
 msgstr "Copïo Cyfeiriad Ebost"
 
-#: data/ui/nautilus-epiphany-view.xml.in.h:4
+#: data/ui/nautilus-epiphany-view.xml.h:4
 msgid "Copy Image Address"
 msgstr "Copïo Cyfeiriad y Ddelwedd"
 
-#: data/ui/nautilus-epiphany-view.xml.in.h:5
+#: data/ui/nautilus-epiphany-view.xml.h:5
 msgid "Copy Link Address"
 msgstr "Copïo Cyfeiriad y Cyswllt"
 
-#: data/ui/nautilus-epiphany-view.xml.in.h:6
+#: data/ui/nautilus-epiphany-view.xml.h:6
 msgid "Copy Page Address"
 msgstr "Copïo Cyfeiriad y Dudalen"
 
-#: data/ui/nautilus-epiphany-view.xml.in.h:7
+#: data/ui/nautilus-epiphany-view.xml.h:7
 msgid "Copy the Selection"
 msgstr "Copïo'r Dewisiad"
 
-#: data/ui/nautilus-epiphany-view.xml.in.h:8
+#: data/ui/nautilus-epiphany-view.xml.h:8
 msgid "Cut"
 msgstr "Torri"
 
-#: data/ui/nautilus-epiphany-view.xml.in.h:9
+#: data/ui/nautilus-epiphany-view.xml.h:9
 msgid "Cut the Selection"
 msgstr "Torri'r Dewisiad"
 
-#: data/ui/nautilus-epiphany-view.xml.in.h:10
-#: embed/ephy-embed-popup-control.c:543
+#: data/ui/nautilus-epiphany-view.xml.h:10
+#: embed/ephy-embed-popup-control.c:551
 msgid "Download Link"
 msgstr "Lawrlwytho'r Cyswllt"
 
-#: data/ui/nautilus-epiphany-view.xml.in.h:12 src/ppview-toolbar.c:89
+#: data/ui/nautilus-epiphany-view.xml.h:12 src/ppview-toolbar.c:92
 msgid "First"
 msgstr "Cyntaf"
 
-#: data/ui/nautilus-epiphany-view.xml.in.h:13 src/ppview-toolbar.c:93
+#: data/ui/nautilus-epiphany-view.xml.h:13 src/ppview-toolbar.c:96
 msgid "Last"
 msgstr "Olaf"
 
-#: data/ui/nautilus-epiphany-view.xml.in.h:14 src/ppview-toolbar.c:101
+#: data/ui/nautilus-epiphany-view.xml.h:14 src/ppview-toolbar.c:104
 msgid "Next"
 msgstr "Nesaf"
 
-#: data/ui/nautilus-epiphany-view.xml.in.h:15
+#: data/ui/nautilus-epiphany-view.xml.h:15
 msgid "Open Frame"
-msgstr "Agor y Frâm"
+msgstr "Agor y Ffrâm"
 
-#: data/ui/nautilus-epiphany-view.xml.in.h:16
+#: data/ui/nautilus-epiphany-view.xml.h:16
 msgid "Open Frame in New Window"
-msgstr "Agor y Frâm mewn Ffenestr Newydd"
+msgstr "Agor y Ffrâm mewn Ffenestr Newydd"
 
-#: data/ui/nautilus-epiphany-view.xml.in.h:17
+#: data/ui/nautilus-epiphany-view.xml.h:17
 msgid "Open Image"
-msgstr "Agor y Delwedd"
+msgstr "Agor y Ddelwedd"
 
-#: data/ui/nautilus-epiphany-view.xml.in.h:18
+#: data/ui/nautilus-epiphany-view.xml.h:18
 msgid "Open Image in New Window"
-msgstr "Agor y Delwedd mewn Ffenestr Newydd"
+msgstr "Agor y Ddelwedd mewn Ffenestr Newydd"
 
-#: data/ui/nautilus-epiphany-view.xml.in.h:19
+#: data/ui/nautilus-epiphany-view.xml.h:19
 msgid "Open in New Window"
 msgstr "Agor mewn Ffenestr Newydd"
 
-#: data/ui/nautilus-epiphany-view.xml.in.h:20
+#: data/ui/nautilus-epiphany-view.xml.h:20
 msgid "Paste"
 msgstr "Gludo"
 
 # TRWSIO
-#: data/ui/nautilus-epiphany-view.xml.in.h:21
+#: data/ui/nautilus-epiphany-view.xml.h:21
 msgid "Paste the Clipboard"
 msgstr "Gludo Cynnwys y Clipfwrdd"
 
-#: data/ui/nautilus-epiphany-view.xml.in.h:22 src/ppview-toolbar.c:97
+#: data/ui/nautilus-epiphany-view.xml.h:22 src/ppview-toolbar.c:100
 msgid "Previous"
 msgstr "Cynt"
 
-#: data/ui/nautilus-epiphany-view.xml.in.h:24
+#: data/ui/nautilus-epiphany-view.xml.h:24
 msgid "Print the Current File"
-msgstr "Argraffu'r Ffeil Gyfreol"
+msgstr "Argraffu'r Ffeil Cyfredol"
 
-#: data/ui/nautilus-epiphany-view.xml.in.h:25
+#: data/ui/nautilus-epiphany-view.xml.h:25
 msgid "Save Background As..."
 msgstr "Cadw'r Cefndir Fel..."
 
-#: data/ui/nautilus-epiphany-view.xml.in.h:26
+#: data/ui/nautilus-epiphany-view.xml.h:26
 msgid "Save Image As..."
 msgstr "Cadw'r Ddelwedd Fel..."
 
-#: data/ui/nautilus-epiphany-view.xml.in.h:27
+#: data/ui/nautilus-epiphany-view.xml.h:27
 msgid "Save Page As..."
 msgstr "Cadw'r Dudalen Fel..."
 
-#: data/ui/nautilus-epiphany-view.xml.in.h:28
+#: data/ui/nautilus-epiphany-view.xml.h:28
 msgid "Search for a String"
 msgstr "Chwilio Am Linyn"
 
-#: data/ui/nautilus-epiphany-view.xml.in.h:29
+#: data/ui/nautilus-epiphany-view.xml.h:29
 msgid "Select All"
 msgstr "Dewis Popeth"
 
-#: data/ui/nautilus-epiphany-view.xml.in.h:30
+#: data/ui/nautilus-epiphany-view.xml.h:30
 msgid "Select the Entire Document"
 msgstr "Dewis y Ddogfen Gyfan"
 
-#: data/ui/nautilus-epiphany-view.xml.in.h:31
+#: data/ui/nautilus-epiphany-view.xml.h:31
+msgid "Text _Encoding..."
+msgstr "_Amgodiad Testun..."
+
+#: data/ui/nautilus-epiphany-view.xml.h:32
 msgid "Use Image As Background"
 msgstr "Defnyddio'r Ddelwedd Fel Cefndir"
 
-#: data/ui/nautilus-epiphany-view.xml.in.h:32
-#: src/bookmarks/ephy-bookmarks-editor.c:153 src/ephy-history-window.c:125
-#: src/ephy-window.c:66
+#: data/ui/nautilus-epiphany-view.xml.h:33
+#: src/bookmarks/ephy-bookmarks-editor.c:162 src/ephy-history-window.c:152
+#: src/ephy-window.c:77
 msgid "_Edit"
 msgstr "_Golygu"
 
 #. Toplevel
-#: data/ui/nautilus-epiphany-view.xml.in.h:33
-#: src/bookmarks/ephy-bookmarks-editor.c:152 src/ephy-history-window.c:124
-#: src/ephy-window.c:65
+#: data/ui/nautilus-epiphany-view.xml.h:34
+#: src/bookmarks/ephy-bookmarks-editor.c:161 src/ephy-history-window.c:151
+#: src/ephy-window.c:76
 msgid "_File"
 msgstr "_Ffeil"
 
-#: data/ui/nautilus-epiphany-view.xml.in.h:34 src/ephy-window.c:109
+#: data/ui/nautilus-epiphany-view.xml.h:35 src/ephy-window.c:134
 msgid "_Find..."
 msgstr "_Canfod..."
 
-#: data/ui/nautilus-epiphany-view.xml.in.h:35 src/ephy-window.c:86
+#: data/ui/nautilus-epiphany-view.xml.h:36 src/ephy-window.c:105
 msgid "_Print..."
 msgstr "_Argraffu..."
 
-#. Hours, Minutes, Seconds
-#: embed/downloader-view.c:216
+#: embed/downloader-view.c:225
 #, c-format
 msgid "%u:%02u.%02u"
 msgstr "%u:%02u.%02u"
 
-#. Minutes, Seconds
-#: embed/downloader-view.c:221
+#: embed/downloader-view.c:229
 #, c-format
 msgid "%02u.%02u"
 msgstr "%02u.%02u"
 
-#: embed/downloader-view.c:369
+#: embed/downloader-view.c:280
 msgid "_Resume"
 msgstr "_Ailgychwyn"
 
-#: embed/downloader-view.c:391
-#, c-format
-msgid "%.1f of %.1f MB"
-msgstr "%.1f o %.1f MB"
+#: embed/downloader-view.c:343 lib/widgets/ephy-cell-renderer-progress.c:35
+#: src/ephy-window.c:1132
+msgid "Unknown"
+msgstr "Anhysbys"
 
-#: embed/downloader-view.c:397
+#: embed/downloader-view.c:394
 #, c-format
-msgid "%d of %d kB"
-msgstr "%d o %d cB"
-
-#: embed/downloader-view.c:403
+msgid "About %d second left"
+msgid_plural "About %d seconds left"
+msgstr[0] "Tua %d eiliad ar ôl"
+msgstr[1] "Tua %d eiliad ar ôl"
+msgstr[2] "Tua %d eiliad ar ôl"
+msgstr[3] "Tua %d eiliad ar ôl"
+
+#: embed/downloader-view.c:402
 #, c-format
-msgid "%d kB"
-msgstr "%d cB"
+msgid "About %d minute left"
+msgid_plural "About %d minutes left"
+msgstr[0] "Tua %d funud ar ôl"
+msgstr[1] "Tua %d funud ar ôl"
+msgstr[2] "Tua %d munud ar ôl"
+msgstr[3] "Tua %d munud ar ôl"
 
 #: embed/downloader-view.c:409
 #, c-format
-msgid "%s at %.1f kB/s"
-msgstr "%s at %.1f cB/e"
-
-#: embed/downloader-view.c:524 embed/downloader-view.c:542
-#: src/ephy-window.c:893
-msgid "Unknown"
-msgstr "Anhysbys"
-
-#: embed/downloader-view.c:541
-msgid "00.00"
-msgstr "00.00"
-
-#: embed/downloader-view.c:780
+msgid "%d download"
+msgid_plural "%d downloads"
+msgstr[0] "%d lawrlwythiad"
+msgstr[1] "%d lawrlwythiad"
+msgstr[2] "%d lawrlwythiad"
+msgstr[3] "%d lawrlwythiad"
+
+#: embed/downloader-view.c:515
 msgid "%"
 msgstr "%"
 
-#: embed/downloader-view.c:790
-msgid "Filename"
-msgstr "Enw Ffeil"
+#: embed/downloader-view.c:526
+msgid "File"
+msgstr "Ffeil"
 
-#: embed/downloader-view.c:801
-msgid "Size"
-msgstr "Maint"
-
-#: embed/downloader-view.c:812
+#: embed/downloader-view.c:540
 msgid "Remaining"
 msgstr "Yn Weddill"
 
-#: embed/downloader-view.c:1019
-msgid "Cancel all pending downloads?"
-msgstr "Diddymu pôb lawrlwythiad sydd heb orffen?"
-
-#: embed/ephy-embed-popup-control.c:554 src/popup-commands.c:333
+#: embed/ephy-embed-popup-control.c:561 src/popup-commands.c:344
 msgid "Save Image As"
-msgstr "Cadw'r Ddelwedd Fel..."
+msgstr "Cadw'r Ddelwedd Fel"
 
-#: embed/ephy-embed-popup-control.c:668
+#: embed/ephy-embed-popup-control.c:647
 msgid "Save Page As"
-msgstr "Cadw'r Dudalen Fel..."
+msgstr "Cadw'r Dudalen Fel"
 
-#: embed/ephy-embed-popup-control.c:677 src/popup-commands.c:421
+#: embed/ephy-embed-popup-control.c:656 src/popup-commands.c:434
 msgid "Save Background As"
-msgstr "Cadw'r Cefndir Fel..."
-
-#: embed/ephy-embed-utils.c:167
-msgid "The file has not been saved."
-msgstr "Nid yw'r ffeil wedi cael ei gadw."
-
-#: embed/ephy-embed-utils.c:299
-msgid "No available applications to open the specified file."
-msgstr "Nid oes rhaglen ar gael er mwyn agor y ffeil a benodwyd."
-
-#: embed/ephy-history.c:441 src/bookmarks/ephy-bookmarks.c:691
-msgid "All"
-msgstr "Popeth"
-
-#: embed/ephy-history.c:590
-msgid "Others"
-msgstr "Eraill"
-
-#: embed/ephy-history.c:596
-msgid "Local files"
-msgstr "Ffeiliau lleol"
-
-#: embed/mozilla/ContentHandler.cpp:311
-msgid "Select the destination filename"
-msgstr "Dewis enw'r ffeil cyrchfannol"
-
-#: embed/mozilla/ExternalProtocolService.cpp:124
-msgid ""
-"Epiphany cannot handle this protocol,\n"
-"and no GNOME default handler is set"
-msgstr ""
-"Nid yw Epiphany yn gallu ymdrin a'r protocol yma,\n"
-"a does trinydd rhagosodedig GNOME wedi eu osod"
-
-# TRWSIO
-#: embed/mozilla/ExternalProtocolService.cpp:138
-msgid ""
-"The protocol specified is not recognised.\n"
-"\n"
-"Would you like to try the GNOME default?"
-msgstr ""
-"Nid yw'r protocol a bempdwud yn adnabyddus.\n"
-"\n"
-"Ydych eisiau ceisio rhagosodiad GNOME?"
-
-#: embed/mozilla/FilePicker.cpp:356
-msgid "The specified path does not exist."
-msgstr "Nid yw'r llwybr a benodwyd yn bodoli."
-
-#: embed/mozilla/FilePicker.cpp:375
-msgid "A file was selected when a folder was expected."
-msgstr "Dewiswyd ffeil pan disgwylwyd plygell."
-
-#: embed/mozilla/FilePicker.cpp:382
-msgid "A folder was selected when a file was expected."
-msgstr "Dewiswyd plygell pan disgwylwyd ffeil."
-
-#: embed/mozilla/mozilla-embed-single.cpp:75
-msgid "_Arabic"
-msgstr "_Arabeg"
-
-#: embed/mozilla/mozilla-embed-single.cpp:76
-msgid "_Baltic"
-msgstr "_Baltig"
-
-#: embed/mozilla/mozilla-embed-single.cpp:77
-msgid "Central _European"
-msgstr "_Ewrop Canolog"
-
-#: embed/mozilla/mozilla-embed-single.cpp:78
-msgid "Chi_nese"
-msgstr "_Tsieineaidd"
-
-#: embed/mozilla/mozilla-embed-single.cpp:79
-msgid "_Cyrillic"
-msgstr "_Cyrilig"
-
-#: embed/mozilla/mozilla-embed-single.cpp:80
-msgid "_Greek"
-msgstr "_Groegaidd"
-
-#: embed/mozilla/mozilla-embed-single.cpp:81
-msgid "_Hebrew"
-msgstr "_Hebraeg"
-
-#: embed/mozilla/mozilla-embed-single.cpp:82
-msgid "_Indian"
-msgstr "_Indiaidd"
-
-#: embed/mozilla/mozilla-embed-single.cpp:83
-msgid "_Japanese"
-msgstr "_Siapanëaidd"
-
-#: embed/mozilla/mozilla-embed-single.cpp:84
-msgid "_Korean"
-msgstr "C_orëaidd"
-
-#: embed/mozilla/mozilla-embed-single.cpp:85
-msgid "_Turkish"
-msgstr "_Twrcaidd"
-
-#: embed/mozilla/mozilla-embed-single.cpp:86
-msgid "_Unicode"
-msgstr "_Unicode"
-
-#: embed/mozilla/mozilla-embed-single.cpp:87
-msgid "_Vietnamese"
-msgstr "_Fietnamaidd"
+msgstr "Cadw'r Cefndir Fel"
 
-#: embed/mozilla/mozilla-embed-single.cpp:88
-msgid "_Western"
-msgstr "_Gorllewinol"
-
-#: embed/mozilla/mozilla-embed-single.cpp:89
-msgid "_Other"
-msgstr "_Eraill"
-
-#. translators: access keys need only be unique within the same LG_group
-#: embed/mozilla/mozilla-embed-single.cpp:108
+#: embed/ephy-encodings.c:63
 msgid "Arabic (_IBM-864)"
 msgstr "Arabeg (_IBM-864)"
 
-#: embed/mozilla/mozilla-embed-single.cpp:109
+#: embed/ephy-encodings.c:64
 msgid "Arabic (ISO-_8859-6)"
 msgstr "Arabeg (ISO-_8859-6)"
 
-#: embed/mozilla/mozilla-embed-single.cpp:110
+#: embed/ephy-encodings.c:65
 msgid "Arabic (_MacArabic)"
 msgstr "Arabeg (_MacArabic)"
 
-#: embed/mozilla/mozilla-embed-single.cpp:111
+#: embed/ephy-encodings.c:66
 msgid "Arabic (_Windows-1256)"
 msgstr "Arabeg (_Windows-1256)"
 
-#: embed/mozilla/mozilla-embed-single.cpp:112
+#: embed/ephy-encodings.c:67
 msgid "Baltic (_ISO-8859-13)"
 msgstr "Baltig (_ISO-8859-13)"
 
-#: embed/mozilla/mozilla-embed-single.cpp:113
+#: embed/ephy-encodings.c:68
 msgid "Baltic (I_SO-8859-4)"
 msgstr "Baltig (I_SO-8859-4)"
 
-#: embed/mozilla/mozilla-embed-single.cpp:114
+#: embed/ephy-encodings.c:69
 msgid "Baltic (_Windows-1257)"
 msgstr "Baltig (_Windows-1257)"
 
-#: embed/mozilla/mozilla-embed-single.cpp:115
+#: embed/ephy-encodings.c:70
+msgid "_Armenian (ARMSCII-8)"
+msgstr "_Armeneg (ARMSCII-8)"
+
+#: embed/ephy-encodings.c:71
+msgid "_Georgian (GEOSTD8)"
+msgstr "_Georgeg (GEOSTD8)"
+
+#: embed/ephy-encodings.c:72
 msgid "Central European (_IBM-852)"
-msgstr "Ewrop Canolog (_IBM-852)"
+msgstr "Ewrop Ganolog (_IBM-852)"
 
-#: embed/mozilla/mozilla-embed-single.cpp:116
+#: embed/ephy-encodings.c:73
 msgid "Central European (I_SO-8859-2)"
-msgstr "Ewrop Canolog (I_SO-8859-2)"
+msgstr "Ewrop Ganolog (I_SO-8859-2)"
 
-#: embed/mozilla/mozilla-embed-single.cpp:117
+#: embed/ephy-encodings.c:74
 msgid "Central European (_MacCE)"
-msgstr "Ewrop Canolog (_MacCE)"
+msgstr "Ewrop Ganolog (_MacCE)"
 
-#: embed/mozilla/mozilla-embed-single.cpp:118
+#: embed/ephy-encodings.c:75
 msgid "Central European (_Windows-1250)"
-msgstr "Ewrop Canolog (_Windows-1250)"
+msgstr "Ewrop Ganolog (_Windows-1250)"
 
-#: embed/mozilla/mozilla-embed-single.cpp:119
-msgid "Croatian (Mac_Croatian)"
-msgstr "Croataidd (Mac_Croatian)"
-
-#: embed/mozilla/mozilla-embed-single.cpp:120
+#: embed/ephy-encodings.c:76
 msgid "Chinese Simplified (_GB18030)"
 msgstr "Tseinëeg Symleiddiedig (_GB18030)"
 
-#: embed/mozilla/mozilla-embed-single.cpp:121
+#: embed/ephy-encodings.c:77
 msgid "Chinese Simplified (G_B2312)"
 msgstr "Tseinëeg Symleiddiedig (G_B2312)"
 
-#: embed/mozilla/mozilla-embed-single.cpp:122
+#: embed/ephy-encodings.c:78
 msgid "Chinese Simplified (GB_K)"
 msgstr "Tseinëeg Symleiddiedig (GB_K)"
 
-#: embed/mozilla/mozilla-embed-single.cpp:123
+#: embed/ephy-encodings.c:79
 msgid "Chinese Simplified (_HZ)"
 msgstr "Tseinëeg Symleiddiedig (_HZ)"
 
-#: embed/mozilla/mozilla-embed-single.cpp:124
+#: embed/ephy-encodings.c:80
 msgid "Chinese Simplified (_ISO-2022-CN)"
 msgstr "Tseinëeg Symleiddiedig (_ISO-2022-CN)"
 
-#: embed/mozilla/mozilla-embed-single.cpp:125
+#: embed/ephy-encodings.c:81
 msgid "Chinese Traditional (Big_5)"
 msgstr "Tseinëeg Symleiddiedig (Big_5)"
 
-#: embed/mozilla/mozilla-embed-single.cpp:126
+#: embed/ephy-encodings.c:82
 msgid "Chinese Traditional (Big5-HK_SCS)"
 msgstr "Tseinëeg Traddodiadol (Big5-HK_SCS)"
 
-#: embed/mozilla/mozilla-embed-single.cpp:127
+#: embed/ephy-encodings.c:83
 msgid "Chinese Traditional (_EUC-TW)"
 msgstr "Tseinëeg Traddodiadol (_EUC-TW)"
 
-#: embed/mozilla/mozilla-embed-single.cpp:128
+#: embed/ephy-encodings.c:84
 msgid "Cyrillic (_IBM-855)"
 msgstr "Cyrilig (_IBM-855)"
 
-#: embed/mozilla/mozilla-embed-single.cpp:129
+#: embed/ephy-encodings.c:85
 msgid "Cyrillic (I_SO-8859-5)"
 msgstr "Cyrilig (I_SO-8859-5)"
 
-#: embed/mozilla/mozilla-embed-single.cpp:130
+#: embed/ephy-encodings.c:86
 msgid "Cyrillic (IS_O-IR-111)"
 msgstr "Cyrilig (IS_O-IR-111)"
 
-#: embed/mozilla/mozilla-embed-single.cpp:131
+#: embed/ephy-encodings.c:87
 msgid "Cyrillic (_KOI8-R)"
 msgstr "Cyrilig (_KOI8-R)"
 
-#: embed/mozilla/mozilla-embed-single.cpp:132
+#: embed/ephy-encodings.c:88
 msgid "Cyrillic (_MacCyrillic)"
 msgstr "Cyrilig (_MacCyrillic)"
 
-#: embed/mozilla/mozilla-embed-single.cpp:133
+#: embed/ephy-encodings.c:89
 msgid "Cyrillic (_Windows-1251)"
 msgstr "Cyrilig (_Windows-1251)"
 
-#: embed/mozilla/mozilla-embed-single.cpp:134
-msgid "Cyrillic/Russian (_CP-866)"
-msgstr "Cyrilig/Rwsieg (_CP-866)"
-
-#: embed/mozilla/mozilla-embed-single.cpp:135
-msgid "Cyrillic/Ukrainian (_KOI8-U)"
-msgstr "Cyrilig/Wcreineg (_KOI8-U)"
-
-#: embed/mozilla/mozilla-embed-single.cpp:136
-msgid "Cyrillic/Ukrainian (Mac_Ukrainian)"
-msgstr "Cyrilig/Wcreineg (Mac_Ukrainian)"
+#: embed/ephy-encodings.c:90
+msgid "Cyrillic/_Russian (IBM-866)"
+msgstr "Cyrilig/_Rwsieg (IBM-866)"
 
-#: embed/mozilla/mozilla-embed-single.cpp:137
+#: embed/ephy-encodings.c:91
 msgid "Greek (_ISO-8859-7)"
 msgstr "Groeg (_ISO-8859-7)"
 
-#: embed/mozilla/mozilla-embed-single.cpp:138
+#: embed/ephy-encodings.c:92
 msgid "Greek (_MacGreek)"
 msgstr "Groeg (_MacGreek)"
 
-#: embed/mozilla/mozilla-embed-single.cpp:139
+#: embed/ephy-encodings.c:93
 msgid "Greek (_Windows-1253)"
 msgstr "Groeg (_Windows-1253)"
 
-#: embed/mozilla/mozilla-embed-single.cpp:140
+#: embed/ephy-encodings.c:94
 msgid "Gujarati (_MacGujarati)"
 msgstr "Gwjwrati (_MacGujarati)"
 
-#: embed/mozilla/mozilla-embed-single.cpp:141
+#: embed/ephy-encodings.c:95
 msgid "Gurmukhi (Mac_Gurmukhi)"
 msgstr "Gurmukhi (Mac_Gurmukhi)"
 
-#: embed/mozilla/mozilla-embed-single.cpp:142
+#: embed/ephy-encodings.c:96
 msgid "Hindi (Mac_Devanagari)"
 msgstr "Hindi (Mac_Devanagari)"
 
-#: embed/mozilla/mozilla-embed-single.cpp:143
+#: embed/ephy-encodings.c:97
 msgid "Hebrew (_IBM-862)"
 msgstr "Hebraeg (_IBM-862)"
 
-#: embed/mozilla/mozilla-embed-single.cpp:144
+#: embed/ephy-encodings.c:98
 msgid "Hebrew (IS_O-8859-8-I)"
 msgstr "Hebraeg (IS_O-8859-8-I)"
 
-#: embed/mozilla/mozilla-embed-single.cpp:145
+#: embed/ephy-encodings.c:99
 msgid "Hebrew (_MacHebrew)"
 msgstr "Hebraeg (_MacHebrew)"
 
-#: embed/mozilla/mozilla-embed-single.cpp:146
+#: embed/ephy-encodings.c:100
 msgid "Hebrew (_Windows-1255)"
 msgstr "Hebraeg (_Windows-1255)"
 
-#: embed/mozilla/mozilla-embed-single.cpp:147
+#: embed/ephy-encodings.c:101
 msgid "_Visual Hebrew (ISO-8859-8)"
 msgstr "Hebraeg G_weledol (ISO-8859-8)"
 
-#: embed/mozilla/mozilla-embed-single.cpp:148
+#: embed/ephy-encodings.c:102
 msgid "Japanese (_EUC-JP)"
-msgstr "Japaneg (_EUC-JP)"
+msgstr "Siapaneaidd (_EUC-JP)"
 
-#: embed/mozilla/mozilla-embed-single.cpp:149
+#: embed/ephy-encodings.c:103
 msgid "Japanese (_ISO-2022-JP)"
-msgstr "Japaneg (_ISO-2022-JP)"
+msgstr "Siapaneaidd (_ISO-2022-JP)"
 
-#: embed/mozilla/mozilla-embed-single.cpp:150
+#: embed/ephy-encodings.c:104
 msgid "Japanese (_Shift-JIS)"
-msgstr "Japaneg (_Shift-JIS)"
+msgstr "Siapaneaidd (_Shift-JIS)"
 
-#: embed/mozilla/mozilla-embed-single.cpp:151
+#: embed/ephy-encodings.c:105
 msgid "Korean (_EUC-KR)"
 msgstr "Corëeg (_EUC-KR)"
 
-#: embed/mozilla/mozilla-embed-single.cpp:152
+#: embed/ephy-encodings.c:106
 msgid "Korean (_ISO-2022-KR)"
-msgstr "Corëeg (_ISO-2022-KR)"
+msgstr "Coreaidd (_ISO-2022-KR)"
 
-#: embed/mozilla/mozilla-embed-single.cpp:153
+#: embed/ephy-encodings.c:107
 msgid "Korean (_JOHAB)"
-msgstr "Corëeg (_JOHAB)"
+msgstr "Coreaidd (_JOHAB)"
 
-#: embed/mozilla/mozilla-embed-single.cpp:154
+#: embed/ephy-encodings.c:108
 msgid "Korean (_UHC)"
-msgstr "Corëeg (_UHC)"
+msgstr "Coreaidd (_UHC)"
 
-#: embed/mozilla/mozilla-embed-single.cpp:155
+#: embed/ephy-encodings.c:109
+msgid "_Celtic (ISO-8859-14)"
+msgstr "_Celtaidd (ISO-8859-14)"
+
+#: embed/ephy-encodings.c:110
+msgid "_Icelandic (MacIcelandic)"
+msgstr "_Islandeg (MacIcelandic)"
+
+#: embed/ephy-encodings.c:111
+msgid "_Nordic (ISO-8859-10)"
+msgstr "_Nordig (ISO-8859-10)"
+
+#: embed/ephy-encodings.c:112
+msgid "_Persian (MacFarsi)"
+msgstr "_Persaidd (MacFarsi)"
+
+#: embed/ephy-encodings.c:113
+msgid "Croatian (Mac_Croatian)"
+msgstr "Croataidd (Mac_Croatian)"
+
+#: embed/ephy-encodings.c:114
+msgid "_Romanian (MacRomanian)"
+msgstr "_Rwmaneg (MacRomanian)"
+
+#: embed/ephy-encodings.c:115
+msgid "R_omanian (ISO-8859-16)"
+msgstr "R_wmaneg (ISO-8859-16)"
+
+#: embed/ephy-encodings.c:116
+msgid "South _European (ISO-8859-3)"
+msgstr "De _Ewropeaidd (ISO-8859-3)"
+
+#: embed/ephy-encodings.c:117
+msgid "Thai (TIS-_620)"
+msgstr "Thai (TIS-_620)"
+
+#: embed/ephy-encodings.c:119
+msgid "Thai (IS_O-8859-11)"
+msgstr "Thai (IS_O-8859-11)"
+
+#: embed/ephy-encodings.c:120
+msgid "_Thai (Windows-874)"
+msgstr "_Thai (Windows-874)"
+
+#: embed/ephy-encodings.c:122
 msgid "Turkish (_IBM-857)"
 msgstr "Twrceg (_IBM-857)"
 
-#: embed/mozilla/mozilla-embed-single.cpp:156
+#: embed/ephy-encodings.c:123
 msgid "Turkish (I_SO-8859-9)"
 msgstr "Twrceg (I_SO-8859-9)"
 
-#: embed/mozilla/mozilla-embed-single.cpp:157
+#: embed/ephy-encodings.c:124
 msgid "Turkish (_MacTurkish)"
 msgstr "Twrceg (_MacTurkish)"
 
-#: embed/mozilla/mozilla-embed-single.cpp:158
+#: embed/ephy-encodings.c:125
 msgid "Turkish (_Windows-1254)"
 msgstr "Twrceg (_Windows-1254)"
 
-#: embed/mozilla/mozilla-embed-single.cpp:159
-msgid "Unicode (UTF-_7)"
-msgstr "Unicode (UTF-_7)"
-
-#: embed/mozilla/mozilla-embed-single.cpp:160
+#: embed/ephy-encodings.c:126
 msgid "Unicode (UTF-_8)"
 msgstr "Unicode (UTF-_8)"
 
-#: embed/mozilla/mozilla-embed-single.cpp:161
+#: embed/ephy-encodings.c:127
+msgid "Cyrillic/Ukrainian (_KOI8-U)"
+msgstr "Cyrilig/Wcreineg (_KOI8-U)"
+
+#: embed/ephy-encodings.c:128
+msgid "Cyrillic/Ukrainian (Mac_Ukrainian)"
+msgstr "Cyrilig/Wcreineg (Mac_Ukrainian)"
+
+#: embed/ephy-encodings.c:129
 msgid "Vietnamese (_TCVN)"
 msgstr "Fietnameg (_TCVN)"
 
-#: embed/mozilla/mozilla-embed-single.cpp:162
+#: embed/ephy-encodings.c:130
 msgid "Vietnamese (_VISCII)"
 msgstr "Fietnameg (_VISCII)"
 
-#: embed/mozilla/mozilla-embed-single.cpp:163
+#: embed/ephy-encodings.c:131
 msgid "Vietnamese (V_PS)"
 msgstr "Fietnameg (V_PS)"
 
-#: embed/mozilla/mozilla-embed-single.cpp:164
+#: embed/ephy-encodings.c:132
 msgid "Vietnamese (_Windows-1258)"
 msgstr "Fietnameg (_Windows-1258)"
 
-#: embed/mozilla/mozilla-embed-single.cpp:165
+#: embed/ephy-encodings.c:133
 msgid "Western (_IBM-850)"
 msgstr "Gorllewinol (_IBM-850)"
 
-#: embed/mozilla/mozilla-embed-single.cpp:166
-msgid "Western (I_SO-8859-1)"
+#: embed/ephy-encodings.c:134
+msgid "Western (_ISO-8859-1)"
 msgstr "Gorllewinol (I_SO-8859-1)"
 
-#: embed/mozilla/mozilla-embed-single.cpp:167
+#: embed/ephy-encodings.c:135
 msgid "Western (IS_O-8859-15)"
 msgstr "Gorllewinol (IS_O-8859-15)"
 
-#: embed/mozilla/mozilla-embed-single.cpp:168
+#: embed/ephy-encodings.c:136
 msgid "Western (_MacRoman)"
 msgstr "Gorllewinol (_MacRoman)"
 
-#: embed/mozilla/mozilla-embed-single.cpp:169
+#: embed/ephy-encodings.c:137
 msgid "Western (_Windows-1252)"
 msgstr "Gorllewinol (_Windows-1252)"
 
-#: embed/mozilla/mozilla-embed-single.cpp:170
-msgid "_Armenian (ARMSCII-8)"
-msgstr "_Armeneg (ARMSCII-8)"
+#. the following encodings are so rarely used that we don't want to pollute the "related"
+#. * part of the encodings menu with them, so we set the language group to 0 here
+#.
+#: embed/ephy-encodings.c:142
+msgid "English (_US-ASCII)"
+msgstr "Saesneg (_US-ASCII)"
 
-#: embed/mozilla/mozilla-embed-single.cpp:171
-msgid "_Celtic (ISO-8859-14)"
-msgstr "_Celtaidd (ISO-8859-14)"
+#: embed/ephy-encodings.c:143
+msgid "Unicode (UTF-_16 BE)"
+msgstr "Unicode (UTF-_16 BE)"
 
-#: embed/mozilla/mozilla-embed-single.cpp:172
-msgid "_Farsi (MacFarsi)"
-msgstr "_Ffarsi (MacFarsi)"
+#: embed/ephy-encodings.c:144
+msgid "Unicode (UTF-1_6 LE)"
+msgstr "Unicode (UTF-1_6 LE)"
 
-#: embed/mozilla/mozilla-embed-single.cpp:173
-msgid "_Georgian (GEOSTD8)"
-msgstr "_Georgeg (GEOSTD8)"
+#: embed/ephy-encodings.c:145
+msgid "Unicode (UTF-_32 BE)"
+msgstr "Unicode (UTF-_32 BE)"
 
-#: embed/mozilla/mozilla-embed-single.cpp:174
-msgid "_Icelandic (MacIcelandic)"
-msgstr "_Islandeg (MacIcelandic)"
+#: embed/ephy-encodings.c:146
+msgid "Unicode (UTF-3_2 LE)"
+msgstr "Unicode (UTF-3_2 LE)"
 
-#: embed/mozilla/mozilla-embed-single.cpp:175
-msgid "_Nordic (ISO-8859-10)"
-msgstr "_Nordig (ISO-8859-10)"
+#: embed/ephy-encodings.c:148
+msgid "Off"
+msgstr "I Ffwrdd"
 
-#: embed/mozilla/mozilla-embed-single.cpp:176
-msgid "_Romanian (MacRomanian)"
-msgstr "_Rwmaneg (MacRomanian)"
+#: embed/ephy-encodings.c:149 src/prefs-dialog.c:117
+msgid "Chinese"
+msgstr "Tsieinëeg"
 
-#: embed/mozilla/mozilla-embed-single.cpp:177
-msgid "R_omanian (ISO-8859-16)"
-msgstr "R_wmaneg (ISO-8859-16)"
+#: embed/ephy-encodings.c:150
+msgid "Chinese Simplified"
+msgstr "Tseinëeg Symleiddiedig"
 
-#: embed/mozilla/mozilla-embed-single.cpp:178
-msgid "South _European (ISO-8859-3)"
-msgstr "De _Ewrop (ISO-8859-3)"
+#: embed/ephy-encodings.c:151
+msgid "Chinese Traditional"
+msgstr "Tseinëeg Symleiddiedig"
 
-#: embed/mozilla/mozilla-embed-single.cpp:179
-msgid "Thai (TIS-_620)"
-msgstr "Siameg (TIS-_620)"
+#: embed/ephy-encodings.c:152
+msgid "East Asian"
+msgstr "Dwyrain Asia"
 
-#: embed/mozilla/mozilla-embed-single.cpp:181
-msgid "Thai (IS_O-8859-11)"
-msgstr "Siameg (IS_O-8859-11)"
+#: embed/ephy-encodings.c:153 lib/ephy-langs.c:38 src/prefs-dialog.c:137
+msgid "Japanese"
+msgstr "Siapaneaidd"
 
-#: embed/mozilla/mozilla-embed-single.cpp:182
-msgid "_Thai (Windows-874)"
-msgstr "_Siameg (Windows-874)"
+#: embed/ephy-encodings.c:154 lib/ephy-langs.c:39 src/prefs-dialog.c:138
+msgid "Korean"
+msgstr "Corëeg"
 
-#: embed/mozilla/mozilla-embed-single.cpp:184
-msgid "_User Defined"
-msgstr "_Diffiniedig gan y Defnyddiwr"
+#: embed/ephy-encodings.c:155 src/prefs-dialog.c:150
+msgid "Russian"
+msgstr "Rwsieg"
 
-#: embed/mozilla/mozilla-embed-single.cpp:923
-msgid "Yes"
-msgstr "Ie"
+#: embed/ephy-encodings.c:156
+msgid "Universal"
+msgstr "Cyffredinol"
 
-#: embed/mozilla/mozilla-embed-single.cpp:925
-msgid "No"
-msgstr "Na"
+#: embed/ephy-encodings.c:157 src/prefs-dialog.c:159
+msgid "Ukrainian"
+msgstr "Wcraineg"
 
-#: embed/mozilla/mozilla-embed-single.cpp:930
-msgid "End of current session"
-msgstr "Diwedd y sesiwn cyfredol"
+#. translators: this is the title that an unknown encoding will
+#. * be displayed as.
+#.
+#: embed/ephy-encodings.c:320
+#, c-format
+msgid "Unknown (%s)"
+msgstr "Anhysbys (%s)"
+
+#: embed/ephy-history.c:487 src/bookmarks/ephy-bookmarks.c:645
+msgid "All"
+msgstr "Popeth"
+
+#: embed/ephy-history.c:662
+msgid "Others"
+msgstr "Eraill"
+
+#: embed/ephy-history.c:668
+msgid "Local files"
+msgstr "Ffeiliau lleol"
+
+#: embed/mozilla/ContentHandler.cpp:134
+#: embed/mozilla/EphyHeaderSniffer.cpp:362
+msgid "Save"
+msgstr "Cadw"
+
+#: embed/mozilla/ContentHandler.cpp:265
+msgid "_Open"
+msgstr "_Agor"
+
+#: embed/mozilla/ContentHandler.cpp:265
+msgid "_Download"
+msgstr "_Lawrlwytho"
+
+#: embed/mozilla/ContentHandler.cpp:269
+msgid "_Save As..."
+msgstr "Cadw _Fel..."
+
+#: embed/mozilla/ContentHandler.cpp:286
+msgid "Download the unsafe file?"
+msgstr "Lawrlwytho'r ffeil nad yw'n ddiogel?"
+
+#: embed/mozilla/ContentHandler.cpp:287
+msgid ""
+"This type of file could potentially damage your documents or invade your "
+"privacy. It's not safe to open it directly. You can save it instead."
+msgstr ""
+"Mae'r math hon o ffeil yn medru creu difrod i'ch dogfennau, neu ymyrryd ar "
+"eich preifatrwydd. Dyw hi ddim yn ddiogel i'w hagor yn uniongyrchol. Gallwch "
+"ei harbed yn lle hynny."
+
+#: embed/mozilla/ContentHandler.cpp:295
+msgid "Open the file in another application?"
+msgstr "Agor y ffeil mewn rhaglen arall?"
+
+#: embed/mozilla/ContentHandler.cpp:296
+msgid ""
+"It's not possible to view this file type directly in the browser. You can "
+"open it with another application or save it."
+msgstr ""
+"Dyw hi ddim yn bosib gweld ffeil o'r math yma yn uniongyrchol yn y porwr. "
+"Gallwch ei hagor gyda rhaglen arall, neu ei harbed."
+
+#: embed/mozilla/ContentHandler.cpp:303
+msgid "Download the file?"
+msgstr "Lawrlwytho'r ffeil?"
+
+#: embed/mozilla/ContentHandler.cpp:304
+msgid ""
+"It's not possible to view this file because there is no application "
+"installed that can open it. You can save it instead."
+msgstr ""
+"Dyw hi ddim yn bosib gweld y ffeil hon gan nad oes rhaglen wedi ei gosod a "
+"all ei hagor. Gallwch ei harbed yn lle hynny."
+
+#: embed/mozilla/EphyHeaderSniffer.cpp:331
+#: src/bookmarks/ephy-bookmarks-import.c:252 src/ephy-toolbars-model.c:201
+#: src/window-commands.c:342
+msgid "Untitled"
+msgstr "Dideitl"
+
+#: embed/mozilla/ExternalProtocolService.cpp:121
+msgid ""
+"Epiphany cannot handle this protocol,\n"
+"and no GNOME default handler is set"
+msgstr ""
+"Nid yw Epiphany yn gallu ymdrin â'r protocol yma,\n"
+"ac nid yw GNOME wedi rhagosod trinydd"
+
+#: embed/mozilla/ExternalProtocolService.cpp:135
+msgid ""
+"The protocol specified is not recognised.\n"
+"\n"
+"Would you like to try the GNOME default?"
+msgstr ""
+"Nid yw'r protocol a benodwyd yn adnabyddus.\n"
+"\n"
+"A hoffech geisio rhagosodiad GNOME?"
+
+#: embed/mozilla/FilePicker.cpp:163
+msgid "All files"
+msgstr "Pob ffeil"
+
+#: embed/mozilla/FilePicker.cpp:168
+msgid "HTML files"
+msgstr "Ffeiliau HTML"
+
+#: embed/mozilla/FilePicker.cpp:173
+msgid "Text files"
+msgstr "Ffeiliau testun"
+
+#: embed/mozilla/FilePicker.cpp:178
+msgid "Image files"
+msgstr "Ffeiliau delwedd"
+
+#: embed/mozilla/FilePicker.cpp:183
+msgid "XML files"
+msgstr "Ffeiliau XML"
+
+#: embed/mozilla/FilePicker.cpp:188
+msgid "XUL files"
+msgstr "Ffeiliau XUL"
+
+#: embed/mozilla/GtkNSSClientAuthDialogs.cpp:185
+msgid "_Select Certificate"
+msgstr "_Dewis Tystysgrif"
+
+#: embed/mozilla/GtkNSSClientAuthDialogs.cpp:224
+#, c-format
+msgid "Choose a certificate to present as identification to %s."
+msgstr "Dewisiwch dystysgrif i'w chyflwyno fel dynodiad i %s."
+
+#: embed/mozilla/GtkNSSClientAuthDialogs.cpp:227
+msgid "Select a certificate to identify yourself."
+msgstr "Dewisiwch dystysgrif i ddynodi chi'ch hun."
+
+#: embed/mozilla/GtkNSSClientAuthDialogs.cpp:277
+msgid "Certificate _Details"
+msgstr "_Manylion y Tystysgrif"
+
+#. Add the buttons
+#: embed/mozilla/GtkNSSDialogs.cpp:222 embed/mozilla/GtkNSSDialogs.cpp:533
+msgid "_View Certificate"
+msgstr "_Gweld y Tystysgrif"
+
+#: embed/mozilla/GtkNSSDialogs.cpp:230
+msgid "_Accept"
+msgstr "_Derbyn"
+
+#: embed/mozilla/GtkNSSDialogs.cpp:294
+#, c-format
+msgid ""
+"The site %s returned security information for %s. It is possible that "
+"someone is intercepting your communication to obtain your confidential "
+"information."
+msgstr ""
+"Fe wnaeth y safle %s ddanfon atoch wybodaeth ddiogelwch ar gyfer %s. Mae'n "
+"bosib fod rhywun yn gwrando ar eich cysylltiad er mwyn cael gafael ar eich "
+"gwybodaeth cyfrinachol."
+
+#: embed/mozilla/GtkNSSDialogs.cpp:300
+#, c-format
+msgid "You should only accept the security information if you trust %s and %s."
+msgstr ""
+"Dim ond os teimlwch y medrwch ymddiried yn %s a %s y dylech chi dderbyn y "
+"wybodaeth diogelwch."
+
+#: embed/mozilla/GtkNSSDialogs.cpp:305
+msgid "Accept incorrect security information?"
+msgstr "Derbyn y wybodaeth diogelwch anghywir?"
+
+#: embed/mozilla/GtkNSSDialogs.cpp:337
+#, c-format
+msgid ""
+"Your browser was unable to trust %s. It is possible that someone is "
+"intercepting your communication to obtain your confidential information."
+msgstr ""
+"Nid oedd eich porwr gwe yn medru ymddiried yn %s. Mae'n bosib fod rhywun yn "
+"gwrando ar eich cysylltiad er mwyn cael gafael ar eich gwybodaeth "
+"gyfrinachol."
+
+#: embed/mozilla/GtkNSSDialogs.cpp:343
+#, c-format
+msgid ""
+"You should only connect to the site if you are certain you are connected to %"
+"s."
+msgstr ""
+"Dim ond os ydych yn bendant eich bod wedi cysylltu â %s y dylech chi "
+"gysylltu â'r safle."
+
+#: embed/mozilla/GtkNSSDialogs.cpp:348
+msgid "Connect to untrusted site?"
+msgstr "Cysylltu â safle na ymddiriedir ynddo?"
+
+#: embed/mozilla/GtkNSSDialogs.cpp:352
+msgid "_Don't show this message again for this site"
+msgstr "_Peidio a dangos y neges yma eto ar gyfer y safle hwn"
+
+#: embed/mozilla/GtkNSSDialogs.cpp:353
+msgid "Co_nnect"
+msgstr "Cy_sylltu"
+
+#: embed/mozilla/GtkNSSDialogs.cpp:414
+msgid "Accept expired security information?"
+msgstr "Derbyn gwybodaeth ddiogelwch sydd eisioes wedi darfod?"
+
+#: embed/mozilla/GtkNSSDialogs.cpp:415
+#, c-format
+msgid "The security information for %s expired on %s."
+msgstr "Mi wnaeth y wybodaeth ddiogelwch ar gyfer %s ddarfod ar %s."
+
+#: embed/mozilla/GtkNSSDialogs.cpp:421
+msgid "Accept not yet valid security information?"
+msgstr "Derbyn gwybodaeth ddiogelwch nad yw'n ddilys eto?"
+
+#: embed/mozilla/GtkNSSDialogs.cpp:422
+#, c-format
+msgid "The security information for %s isn't valid until %s."
+msgstr "Nid yw'r wybodaeth ddiogelwch ar gyfer %s yn ddilys tan %s."
+
+#. To translators: this a time format that is used while displaying the
+#. * expiry or start date of an SSL certificate, for the format see
+#. * strftime(3)
+#: embed/mozilla/GtkNSSDialogs.cpp:433
+msgid "%a %d %b %Y"
+msgstr "%a %d %b %Y"
+
+#: embed/mozilla/GtkNSSDialogs.cpp:444
+msgid "You should ensure that your computer's time is correct."
+msgstr "Dylech sicrhau fod yr amser ar eich cyfrifiadur yn gywir."
+
+#: embed/mozilla/GtkNSSDialogs.cpp:489
+#, c-format
+msgid "Cannot establish connection to %s."
+msgstr "Methu cysylltu â %s."
+
+#: embed/mozilla/GtkNSSDialogs.cpp:492
+#, c-format
+msgid "The certificate revocation list (CRL) from %s needs to be updated."
+msgstr ""
+"Rhaid diweddaru'r rhestr o dystysgrifau diddymwyd ('certificate revocation "
+"list', CRL) o %s."
+
+#: embed/mozilla/GtkNSSDialogs.cpp:497
+msgid "Please ask your system administrator for assistance."
+msgstr "Gofynnwch i'ch gweinyddwr systemau am gymorth."
+
+#: embed/mozilla/GtkNSSDialogs.cpp:536
+msgid "_Trust CA"
+msgstr "_Ymddiried yn yr AT"
+
+#: embed/mozilla/GtkNSSDialogs.cpp:548
+#, c-format
+msgid "Trust %s to identify:"
+msgstr "Ymddiried yn %s i adnabod:"
+
+#: embed/mozilla/GtkNSSDialogs.cpp:552
+msgid "Trust new Certificate Authority?"
+msgstr "Ymddiried mewn Awdurdod Tystysgrifo newydd?"
+
+#: embed/mozilla/GtkNSSDialogs.cpp:553
+msgid ""
+"Before trusting a Certificate Authority (CA) you should verify the "
+"certificate is authentic."
+msgstr ""
+"Cyn ymddiried mewn Awdurdod Tystysgrifo (AT) dylech sicrhau fod y dystysgrif "
+"yn ddilys."
+
+#: embed/mozilla/GtkNSSDialogs.cpp:563
+msgid "_Web sites"
+msgstr "Safleodd _Gwe"
+
+#: embed/mozilla/GtkNSSDialogs.cpp:568
+msgid "_Software developers"
+msgstr "_Datblygwyr meddalwedd"
+
+#: embed/mozilla/GtkNSSDialogs.cpp:634
+msgid "Certificate already exists."
+msgstr "Tystysgrif yn bodoli eisioes."
+
+#: embed/mozilla/GtkNSSDialogs.cpp:635
+msgid "The certificate has already been imported."
+msgstr "Cafodd y tystysgrif ei fewnforio eisioes."
+
+#: embed/mozilla/GtkNSSDialogs.cpp:754
+msgid "_Backup Certificate"
+msgstr "Tystysgrif _Wrth Gefn"
+
+#: embed/mozilla/GtkNSSDialogs.cpp:761
+msgid "Select password."
+msgstr "Dewis cyfrinair."
+
+#: embed/mozilla/GtkNSSDialogs.cpp:762
+msgid "Select a password to protect this certificate."
+msgstr "Dewiswch gyfrinair i ddiogelu'r tystysgrif yma."
+
+#: embed/mozilla/GtkNSSDialogs.cpp:774 embed/mozilla/GtkNSSDialogs.cpp:876
+msgid "_Password:"
+msgstr "_Cyfrinair:"
+
+#: embed/mozilla/GtkNSSDialogs.cpp:788
+msgid "Con_firm password:"
+msgstr "Ca_darnhau'r cyfrinair:"
+
+#. TODO: We need a better password quality meter
+#: embed/mozilla/GtkNSSDialogs.cpp:800
+msgid "Password quality:"
+msgstr "Ansawdd y cyfrinair:"
+
+#: embed/mozilla/GtkNSSDialogs.cpp:857
+msgid "I_mport Certificate"
+msgstr "_Mewnforio Tystysgrif"
+
+#: embed/mozilla/GtkNSSDialogs.cpp:865
+msgid "Password required."
+msgstr "Angen cyfrinair."
+
+#: embed/mozilla/GtkNSSDialogs.cpp:866
+msgid "Enter the password for this certificate."
+msgstr "Rhowch y cyfrinair ar gyfer y tystysgrif."
+
+#: embed/mozilla/GtkNSSDialogs.cpp:944
+msgid "Certificate Revocation list successfully imported."
+msgstr "Rhestr Ddiddymu Tystysgrifau wedi ei fewnforio'n llwyddiannus."
+
+#: embed/mozilla/GtkNSSDialogs.cpp:945
+msgid "Certificate Revocation list (CRL) imported:"
+msgstr "Rhestr Ddiddymu Tystysgrifau (CRL) fewnforiwyd:"
+
+#: embed/mozilla/GtkNSSDialogs.cpp:967
+msgid "Unit:"
+msgstr "Uned:"
+
+#: embed/mozilla/GtkNSSDialogs.cpp:970
+msgid "Next Update:"
+msgstr "Diweddariad Nesaf:"
+
+#: embed/mozilla/GtkNSSDialogs.cpp:997
+msgid "Not part of certificate"
+msgstr "Nid yn rhan o'r tystysgrif"
+
+#: embed/mozilla/GtkNSSDialogs.cpp:1265
+msgid "Certificate Properties"
+msgstr "Priodweddau Tystysgrif"
+
+#: embed/mozilla/GtkNSSDialogs.cpp:1287
+msgid "This certificate has been verified for the following uses:"
+msgstr "Mae'r dystysgrif hon wedi ei wirio ar gyfer y defnyddiau canlynol:"
+
+#: embed/mozilla/GtkNSSDialogs.cpp:1290
+msgid "Could not verify this certificate because it has been revoked."
+msgstr "Methwyd gwirio'r dystysgrif hon gan ei fod wedi ei ddiddymu."
+
+#: embed/mozilla/GtkNSSDialogs.cpp:1293
+msgid "Could not verify this certificate because it has expired."
+msgstr "Methwyd gwirio'r dystysgrif hon gan ei fod wedi darfod."
+
+#: embed/mozilla/GtkNSSDialogs.cpp:1296
+msgid "Could not verify this certificate because it is not trusted."
+msgstr "Methwyd gwirio'r dystysgrif hon gan nad oes hyder ynddi."
+
+#: embed/mozilla/GtkNSSDialogs.cpp:1299
+msgid "Could not verify this certificate because the issuer is not trusted."
+msgstr "Methwyd gwirio'r dystysgrif hon gan nad oes hyder yn y cyflwynwr."
+
+#: embed/mozilla/GtkNSSDialogs.cpp:1302
+msgid "Could not verify this certificate because the issuer is unknown."
+msgstr "Methwyd gwirio'r dystysgrif hon gan bo'r cyflwynwr yn anhysbys."
+
+#: embed/mozilla/GtkNSSDialogs.cpp:1305
+msgid ""
+"Could not verify this certificate because the CA certificate is invalid."
+msgstr ""
+"Methwyd gwirio'r dystysgrif hon am nad yw tystysgrif yr awdurdod tystysgrifo "
+"(CA) yn ddilys."
+
+#: embed/mozilla/GtkNSSDialogs.cpp:1310
+msgid "Could not verify this certificate for unknown reasons."
+msgstr "Methwyd gwirio'r dystysgrif hon am resymau anhysbys."
+
+#: embed/mozilla/GtkNSSKeyPairDialogs.cpp:183
+msgid "Generating Private Key."
+msgstr "Yn Cynhyrchu Allwedd Breifat."
+
+#: embed/mozilla/GtkNSSKeyPairDialogs.cpp:184
+msgid ""
+"Please wait while a new private key is generated. This process could take a "
+"few minutes."
+msgstr ""
+"Arhoswch tra fod allwedd breifat newydd yn cael ei chreu. Gallai'r broses "
+"hon gymryd ychydig funudau."
+
+#: embed/mozilla/mozilla-embed-single.cpp:501
+msgid ""
+"Epiphany can't be used now. Mozilla initialization failed. Check your "
+"MOZILLA_FIVE_HOME environmental variable."
+msgstr ""
+"Ni ellir defnyddio Epiphany ar hyn o bryd. Methwyd cychwyn Mozilla. Gwiriwch "
+"eich newidyn amgylchol MOZILLA_FIVE_HOME."
 
 #. *
 #. * This is a comma separated list of language ranges, as specified
@@ -1505,11 +1991,15 @@ msgstr "Diwedd y sesiwn cyfredol"
 #. * "zh_CN" translation: "zh-cn,zh"
 #. * "zh_HK" translation: "zh-hk,zh" or maybe "zh-hk,zh-tw,zh"
 #.
-#: embed/mozilla/mozilla-notifiers.cpp:605
+#: embed/mozilla/mozilla-notifiers.cpp:737
 msgid "system-language"
 msgstr "cy-gb,cy"
 
-#: lib/eel-gconf-extensions.c:79
+#: embed/print-dialog.c:289
+msgid "Print to"
+msgstr "Argraffu i"
+
+#: lib/eel-gconf-extensions.c:82
 #, c-format
 msgid ""
 "GConf error:\n"
@@ -1518,15 +2008,30 @@ msgstr ""
 "Gwall GConf:\n"
 "  %s"
 
-#: lib/egg/egg-editable-toolbar.c:269
+#: lib/eel-gconf-extensions.c:86
+#, c-format
+msgid ""
+"GConf error:\n"
+"  %s\n"
+"All further errors shown only on terminal"
+msgstr ""
+"Gwall GConf:\n"
+"  %s\n"
+"Dangosir pob gwall pellach ar y terfynell yn unig"
+
+#: lib/eel-gconf-extensions.c:90
+msgid "GConf Error"
+msgstr "Gwall GConf"
+
+#: lib/egg/egg-editable-toolbar.c:510
 msgid "_Remove Toolbar"
 msgstr "Gwa_redu'r Bar Offer"
 
-#: lib/egg/egg-toolbar-editor.c:427
+#: lib/egg/egg-toolbar-editor.c:552
 msgid "Separator"
 msgstr "Gwahanydd"
 
-#: lib/egg/egg-toolbar-editor.c:457
+#: lib/egg/egg-toolbar-editor.c:582
 msgid ""
 "Drag an item onto the toolbars above to add it, from the toolbars in the "
 "items table to remove it."
@@ -1534,22 +2039,27 @@ msgstr ""
 "Llusgwch eitem ymalen i'r bariau offer uwch i'w ychwanegu, ac oddi ar y "
 "bariau offer yn y tabl eitemau i'w waredu."
 
-#: lib/ephy-file-helpers.c:104
+#. The name of the default downloads folder
+#: lib/ephy-file-helpers.c:75 src/prefs-dialog.c:1107
+msgid "Downloads"
+msgstr "Lawrlwythiadau"
+
+#: lib/ephy-file-helpers.c:164
 #, c-format
 msgid "Failed to find %s"
 msgstr "Methwyd canfod %s"
 
-#: lib/ephy-file-helpers.c:322
+#: lib/ephy-file-helpers.c:229
 #, c-format
 msgid "%s exists, please move it out of the way."
 msgstr "Mae %s yn bodoli eisioes. Symudwch ef o'r ffordd os gwelwch yn dda."
 
-#: lib/ephy-file-helpers.c:325
+#: lib/ephy-file-helpers.c:232
 #, c-format
 msgid "Failed to create directory %s."
 msgstr "Methu creu cyfeiriadur %s."
 
-#: lib/ephy-gui.c:76
+#: lib/ephy-gui.c:90
 #, c-format
 msgid ""
 "File %s will be overwritten.\n"
@@ -1560,1052 +2070,1147 @@ msgstr ""
 "Caiff y ffeil %s ei drosysgrifo.\n"
 "Os dewiswch 'ie', mi fydd y cynnwys yn cael ei golli.\n"
 "\n"
-"Ydych eisiau mynd ymlaen?"
+"Ydych chi eisiau mynd ymlaen?"
 
-#: lib/ephy-gui.c:107
+#: lib/ephy-gui.c:121
 #, c-format
 msgid "Could not display help: %s"
 msgstr "Methwyd dangos cymorth: %s"
 
-#: lib/ephy-langs.c:28 src/prefs-dialog.c:91
+#: lib/ephy-langs.c:31 src/prefs-dialog.c:108
 msgid "Arabic"
 msgstr "Arabeg"
 
-#: lib/ephy-langs.c:29
+#: lib/ephy-langs.c:32
 msgid "Baltic"
 msgstr "Baltig"
 
-#: lib/ephy-langs.c:30
+#: lib/ephy-langs.c:33
 msgid "Central European"
 msgstr "Ewrop Canolog"
 
-#: lib/ephy-langs.c:31
+#: lib/ephy-langs.c:34
 msgid "Cyrillic"
 msgstr "Cyrilig"
 
-#: lib/ephy-langs.c:32
+#: lib/ephy-langs.c:35
 msgid "Devanagari"
 msgstr "Devanagari"
 
-#: lib/ephy-langs.c:33 src/prefs-dialog.c:113
+#: lib/ephy-langs.c:36 src/prefs-dialog.c:130
 msgid "Greek"
 msgstr "Groeg"
 
-#: lib/ephy-langs.c:34 src/prefs-dialog.c:114
+#: lib/ephy-langs.c:37 src/prefs-dialog.c:131
 msgid "Hebrew"
 msgstr "Hebraeg"
 
-#: lib/ephy-langs.c:35 src/prefs-dialog.c:120 src/prefs-dialog.c:159
-msgid "Japanese"
-msgstr "Japaneg"
-
-#: lib/ephy-langs.c:36 src/prefs-dialog.c:121 src/prefs-dialog.c:160
-msgid "Korean"
-msgstr "Corëeg"
-
-#: lib/ephy-langs.c:37 src/prefs-dialog.c:98 src/prefs-dialog.c:162
+#: lib/ephy-langs.c:40 src/prefs-dialog.c:115
 msgid "Simplified Chinese"
 msgstr "Tsieinëeg Symleiddiedig"
 
-#: lib/ephy-langs.c:38 src/prefs-dialog.c:140
+#: lib/ephy-langs.c:41 src/prefs-dialog.c:157
 msgid "Tamil"
 msgstr "Tamil"
 
-#: lib/ephy-langs.c:39
+#: lib/ephy-langs.c:42
 msgid "Thai"
-msgstr "Siameg"
+msgstr "Thai"
 
-#: lib/ephy-langs.c:40 src/prefs-dialog.c:99 src/prefs-dialog.c:163
+#: lib/ephy-langs.c:43 src/prefs-dialog.c:116
 msgid "Traditional Chinese"
 msgstr "Tsieinëeg Tradoddiadol"
 
-#: lib/ephy-langs.c:41 src/prefs-dialog.c:141
+#: lib/ephy-langs.c:45
+msgid "Traditional Chinese (Hong Kong)"
+msgstr "Tsieinëeg Tradoddiadol (Hong Kong)"
+
+#: lib/ephy-langs.c:47 src/prefs-dialog.c:158
 msgid "Turkish"
-msgstr "Tyrceg"
+msgstr "Twrceg"
 
-#: lib/ephy-langs.c:42
+#: lib/ephy-langs.c:48
 msgid "Unicode"
 msgstr "Unicode"
 
-#: lib/ephy-langs.c:43
+#: lib/ephy-langs.c:49
 msgid "Western"
 msgstr "Gorllewinol"
 
-#: lib/ephy-zoom.h:39
+#: lib/ephy-zoom.h:41
 msgid "50%"
 msgstr "50%"
 
-#: lib/ephy-zoom.h:40
+#: lib/ephy-zoom.h:42
 msgid "75%"
 msgstr "75%"
 
-#: lib/ephy-zoom.h:41
+#: lib/ephy-zoom.h:43
 msgid "100%"
 msgstr "100%"
 
-#: lib/ephy-zoom.h:42
+#: lib/ephy-zoom.h:44
 msgid "125%"
 msgstr "125%"
 
-#: lib/ephy-zoom.h:43
+#: lib/ephy-zoom.h:45
 msgid "150%"
 msgstr "150%"
 
-#: lib/ephy-zoom.h:44
+#: lib/ephy-zoom.h:46
 msgid "175%"
 msgstr "175%"
 
-#: lib/ephy-zoom.h:45
+#: lib/ephy-zoom.h:47
 msgid "200%"
 msgstr "200%"
 
-#: lib/ephy-zoom.h:46
+#: lib/ephy-zoom.h:48
 msgid "300%"
 msgstr "300%"
 
-#: lib/ephy-zoom.h:47
+#: lib/ephy-zoom.h:49
 msgid "400%"
 msgstr "400%"
 
-#: lib/widgets/ephy-zoom-control.c:145
-msgid "_Zoom"
-msgstr "_Chwyddo"
+#: lib/widgets/ephy-cell-renderer-progress.c:98
+msgid "Failed"
+msgstr "Methwyd"
 
-#: src/bookmarks/ephy-bookmark-action.c:212
+#: src/bookmarks/ephy-bookmark-action.c:248
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: src/bookmarks/ephy-bookmark-properties.c:245
+#: src/bookmarks/ephy-bookmark-properties.c:229
 #, c-format
 msgid "%s Properties"
 msgstr "Priodweddau %s"
 
-#: src/bookmarks/ephy-bookmark-properties.c:368
-#: src/bookmarks/ephy-new-bookmark.c:220
+#: src/bookmarks/ephy-bookmark-properties.c:348
+#: src/bookmarks/ephy-new-bookmark.c:215
 msgid "_Title:"
 msgstr "_Teitl:"
 
-#: src/bookmarks/ephy-bookmark-properties.c:410
-#: src/bookmarks/ephy-new-bookmark.c:243
+#: src/bookmarks/ephy-bookmark-properties.c:390
+#: src/bookmarks/ephy-new-bookmark.c:238
 msgid "To_pics:"
 msgstr "_Pynciau:"
 
-#: src/bookmarks/ephy-bookmark-properties.c:419
+#: src/bookmarks/ephy-bookmark-properties.c:399
 msgid "_Show in bookmarks bar"
 msgstr "Dango_s yn y bar llyfrnodau"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:154 src/ephy-history-window.c:126
-#: src/ephy-window.c:67
+#: src/bookmarks/ephy-bookmarks-editor.c:163 src/ephy-history-window.c:153
+#: src/ephy-window.c:78
 msgid "_View"
 msgstr "_Golwg"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:155 src/ephy-history-window.c:127
-#: src/ephy-window.c:71
+#: src/bookmarks/ephy-bookmarks-editor.c:164 src/ephy-history-window.c:154
+#: src/ephy-window.c:83
 msgid "_Help"
 msgstr "_Cymorth"
 
 #. File Menu
-#: src/bookmarks/ephy-bookmarks-editor.c:159
+#: src/bookmarks/ephy-bookmarks-editor.c:168
 msgid "_New Topic"
 msgstr "Pwnc _Newydd"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:160
+#: src/bookmarks/ephy-bookmarks-editor.c:169
 msgid "Create a new topic"
 msgstr "Creu pwnc newydd"
 
 #. File Menu
-#: src/bookmarks/ephy-bookmarks-editor.c:162
-#: src/bookmarks/ephy-bookmarks-editor.c:853 src/ephy-history-window.c:131
-#: src/ephy-history-window.c:666
+#: src/bookmarks/ephy-bookmarks-editor.c:171
+#: src/bookmarks/ephy-bookmarks-editor.c:977 src/ephy-history-window.c:158
+#: src/ephy-history-window.c:738
 msgid "_Open in New Window"
 msgstr "_Agor Mewn Ffenestr Newydd"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:163
+#: src/bookmarks/ephy-bookmarks-editor.c:172
 msgid "Open the selected bookmark in a new window"
 msgstr "Agor yr llyfrnod dewisiedig mewn ffenestr newydd"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:165
-#: src/bookmarks/ephy-bookmarks-editor.c:854 src/ephy-history-window.c:134
-#: src/ephy-history-window.c:667
+#: src/bookmarks/ephy-bookmarks-editor.c:174
+#: src/bookmarks/ephy-bookmarks-editor.c:978 src/ephy-history-window.c:161
+#: src/ephy-history-window.c:739
 msgid "Open in New _Tab"
 msgstr "Agor mewn _Tab Newydd"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:166
+#: src/bookmarks/ephy-bookmarks-editor.c:175
 msgid "Open the selected bookmark in a new tab"
 msgstr "Agor y llyfrnod dewisiedig mewn tab newydd"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:168
+#: src/bookmarks/ephy-bookmarks-editor.c:177
 msgid "_Rename..."
 msgstr "_Ailenwi..."
 
-#: src/bookmarks/ephy-bookmarks-editor.c:169
+#: src/bookmarks/ephy-bookmarks-editor.c:178
 msgid "Rename the selected bookmark or topic"
 msgstr "Ailenwi'r llyfrnod neu'r pwnc dewisiedig"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:170 src/ephy-history-window.c:137
+#: src/bookmarks/ephy-bookmarks-editor.c:179 src/ephy-history-window.c:164
 msgid "_Delete"
 msgstr "_Dileu"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:171
+#: src/bookmarks/ephy-bookmarks-editor.c:180
 msgid "Delete the selected bookmark or topic"
 msgstr "Dileu'r llyfrnod neu'r pwnc dewisiedig"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:173
-msgid "_Show in Bookmarks Bar"
-msgstr "_Dangos yn y Bar Llyfrnodau"
-
-#: src/bookmarks/ephy-bookmarks-editor.c:174
-msgid "Show the selected bookmark or topic in the bookmarks bar"
-msgstr "Dangos y llyfrnod neu'r pwnc dewisiedig yn y bar llyfrnodau"
-
-#: src/bookmarks/ephy-bookmarks-editor.c:176
+#: src/bookmarks/ephy-bookmarks-editor.c:182
 msgid "_Properties"
 msgstr "_Priodweddau"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:177
+#: src/bookmarks/ephy-bookmarks-editor.c:183
 msgid "View or modify the properties of the selected bookmark"
 msgstr "Gweld neu newid priodweddau'r llyfrnod dewisiedig"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:179
+#: src/bookmarks/ephy-bookmarks-editor.c:185
 msgid "_Import Bookmarks..."
 msgstr "_Mewnforio Llyfrnodau..."
 
-#: src/bookmarks/ephy-bookmarks-editor.c:180
+#: src/bookmarks/ephy-bookmarks-editor.c:186
 msgid "Import bookmarks from another browser or a bookmarks file"
 msgstr "Mewnforio llyfrnodau o borwr arall neu o ffeil llyfrnodau"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:182 src/ephy-history-window.c:143
-#: src/ephy-window.c:92
+#: src/bookmarks/ephy-bookmarks-editor.c:188 src/ephy-history-window.c:170
+#: src/ephy-window.c:111
 msgid "_Close"
 msgstr "_Cau"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:183
+#: src/bookmarks/ephy-bookmarks-editor.c:189
 msgid "Close the bookmarks window"
 msgstr "Cau'r ffenestr llyfrnodau"
 
 #. Edit Menu
-#: src/bookmarks/ephy-bookmarks-editor.c:187 src/ephy-history-window.c:148
-#: src/ephy-window.c:97
+#: src/bookmarks/ephy-bookmarks-editor.c:193 src/ephy-history-window.c:175
+#: src/ephy-window.c:122
 msgid "Cu_t"
 msgstr "_Torri"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:188 src/ephy-history-window.c:149
-#: src/ephy-window.c:98
+#: src/bookmarks/ephy-bookmarks-editor.c:194 src/ephy-history-window.c:176
+#: src/ephy-window.c:123
 msgid "Cut the selection"
 msgstr "Torri'r dewisiad"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:190
-#: src/bookmarks/ephy-bookmarks-editor.c:863 src/ephy-history-window.c:151
-#: src/ephy-history-window.c:676 src/ephy-window.c:100
+#: src/bookmarks/ephy-bookmarks-editor.c:196
+#: src/bookmarks/ephy-bookmarks-editor.c:987 src/ephy-history-window.c:178
+#: src/ephy-history-window.c:748 src/ephy-window.c:125
 msgid "_Copy"
 msgstr "_Copïo"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:191 src/ephy-history-window.c:152
-#: src/ephy-window.c:101
+#: src/bookmarks/ephy-bookmarks-editor.c:197 src/ephy-history-window.c:179
+#: src/ephy-window.c:126
 msgid "Copy the selection"
 msgstr "Copïo'r dewisiad"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:193 src/ephy-history-window.c:154
-#: src/ephy-window.c:103
+#: src/bookmarks/ephy-bookmarks-editor.c:199 src/ephy-history-window.c:181
+#: src/ephy-window.c:128
 msgid "_Paste"
 msgstr "_Gludo"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:194 src/ephy-history-window.c:155
+#: src/bookmarks/ephy-bookmarks-editor.c:200 src/ephy-history-window.c:182
 msgid "Paste the clipboard"
 msgstr "Gludo'r clipfwrdd"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:196 src/ephy-history-window.c:157
-#: src/ephy-window.c:106
+#: src/bookmarks/ephy-bookmarks-editor.c:202 src/ephy-history-window.c:184
+#: src/ephy-window.c:131
 msgid "Select _All"
 msgstr "Dewis _Popeth"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:197
+#: src/bookmarks/ephy-bookmarks-editor.c:203
 msgid "Select all bookmarks or text"
 msgstr "Dewis pob llyfrnod neu destun"
 
-#. View Menu
-#: src/bookmarks/ephy-bookmarks-editor.c:201 src/ephy-history-window.c:165
-msgid "_Title"
-msgstr "_Teitl"
-
-#: src/bookmarks/ephy-bookmarks-editor.c:202 src/ephy-history-window.c:166
-msgid "Show only the title column"
-msgstr "Dangos y golofn deitl yn unig"
-
-#: src/bookmarks/ephy-bookmarks-editor.c:204 src/ephy-history-window.c:168
-msgid "_Address"
-msgstr "_Cyfeiriad"
-
-#: src/bookmarks/ephy-bookmarks-editor.c:205 src/ephy-history-window.c:169
-msgid "Show only the address column"
-msgstr "Dangos y golofn gyfeiriad yn unig"
-
-#: src/bookmarks/ephy-bookmarks-editor.c:207 src/ephy-history-window.c:171
-msgid "T_itle and Address"
-msgstr "Te_itl a Cyfeiriad"
-
-#: src/bookmarks/ephy-bookmarks-editor.c:208 src/ephy-history-window.c:172
-msgid "Show both the title and address columns"
-msgstr "Dangos y ddwy golofn, teitl a cyfeiriad"
-
 #. Help Menu
-#: src/bookmarks/ephy-bookmarks-editor.c:212 src/ephy-history-window.c:176
-#: src/ephy-window.c:207
+#: src/bookmarks/ephy-bookmarks-editor.c:207 src/ephy-history-window.c:192
+#: src/ephy-window.c:222
 msgid "_Contents"
 msgstr "_Cynnwys"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:213
+#: src/bookmarks/ephy-bookmarks-editor.c:208
 msgid "Display bookmarks help"
 msgstr "Dangos cymorth llyfrnodau"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:215 src/ephy-history-window.c:179
-#: src/ephy-window.c:210
+#: src/bookmarks/ephy-bookmarks-editor.c:210 src/ephy-history-window.c:195
+#: src/ephy-window.c:225
 msgid "_About"
 msgstr "_Ynghylch"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:216 src/ephy-history-window.c:180
-#: src/ephy-window.c:211
+#: src/bookmarks/ephy-bookmarks-editor.c:211 src/ephy-history-window.c:196
+#: src/ephy-window.c:226
 msgid "Display credits for the web browser creators"
-msgstr "Dangos clodau creuwyr y porwr gwe"
+msgstr "Dangos y rhestr clod ar gyfer crëwyr y porwr gwe"
+
+#. File Menu
+#: src/bookmarks/ephy-bookmarks-editor.c:219
+msgid "_Show in Bookmarks Bar"
+msgstr "_Dangos yn y Bar Llyfrnodau"
+
+#: src/bookmarks/ephy-bookmarks-editor.c:220
+msgid "Show the selected bookmark or topic in the bookmarks bar"
+msgstr "Dangos y llyfrnod neu'r pwnc dewisiedig yn y bar llyfrnodau"
+
+#. View Menu
+#: src/bookmarks/ephy-bookmarks-editor.c:234 src/ephy-history-window.c:211
+msgid "_Title"
+msgstr "_Teitl"
+
+#: src/bookmarks/ephy-bookmarks-editor.c:235 src/ephy-history-window.c:212
+msgid "Show only the title column"
+msgstr "Dangos y golofn deitl yn unig"
+
+#: src/bookmarks/ephy-bookmarks-editor.c:236 src/ephy-history-window.c:215
+msgid "T_itle and Address"
+msgstr "Te_itl a Chyfeiriad"
+
+#: src/bookmarks/ephy-bookmarks-editor.c:237 src/ephy-history-window.c:216
+msgid "Show both the title and address columns"
+msgstr "Dangos y ddwy golofn, teitl a chyfeiriad"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:258
+#: src/bookmarks/ephy-bookmarks-editor.c:279
 msgid "Type a topic"
 msgstr "Teipiwch bwnc"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:510
+#: src/bookmarks/ephy-bookmarks-editor.c:547
+msgid "Import bookmarks from file"
+msgstr "Mewnforio llyfrnodau o ffeil"
+
+#: src/bookmarks/ephy-bookmarks-editor.c:580
 msgid "Import Bookmarks"
 msgstr "Mewnforio Llyfrnodau"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:530
+#: src/bookmarks/ephy-bookmarks-editor.c:600
 msgid "Choose the bookmarks source:"
-msgstr "Dewis ffynhonell y llyfrnodau:"
+msgstr "Dewis ffynhonnell y llyfrnodau:"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:539
+#: src/bookmarks/ephy-bookmarks-editor.c:618
 msgid "Mozilla bookmarks"
 msgstr "Llyfrnodau Mozilla"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:541
+#: src/bookmarks/ephy-bookmarks-editor.c:620
+msgid "Firebird bookmarks"
+msgstr "Llyfrnodau Firebird"
+
+#: src/bookmarks/ephy-bookmarks-editor.c:622
 msgid "Galeon bookmarks"
 msgstr "Llyfrnodau Galeon"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:543
+#: src/bookmarks/ephy-bookmarks-editor.c:624
 msgid "Konqueror bookmarks"
 msgstr "Llyfrnodau Konqueror"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:848 src/ephy-history-window.c:661
+#: src/bookmarks/ephy-bookmarks-editor.c:628
+msgid "Import from a file"
+msgstr "Mewnforio o ffeil"
+
+#: src/bookmarks/ephy-bookmarks-editor.c:972 src/ephy-history-window.c:733
 msgid "_Open in New Windows"
 msgstr "_Agor mewn Ffenestri Newydd"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:849 src/ephy-history-window.c:662
+#: src/bookmarks/ephy-bookmarks-editor.c:973 src/ephy-history-window.c:734
 msgid "Open in New _Tabs"
 msgstr "Agor mewn _Tabiau Newydd"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:859 src/ephy-history-window.c:672
+#: src/bookmarks/ephy-bookmarks-editor.c:983 src/ephy-history-window.c:744
 msgid "_Copy Address"
 msgstr "_Copïo'r Cyfeiriad"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:1106 src/ephy-history-window.c:877
+#: src/bookmarks/ephy-bookmarks-editor.c:1224 src/ephy-history-window.c:1038
 msgid "_Search:"
 msgstr "_Chwilio:"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:1215 src/ephy-window.c:688
+#: src/bookmarks/ephy-bookmarks-editor.c:1354
+#: src/bookmarks/ephy-topic-action.c:597 src/ephy-window.c:953
 msgid "Bookmarks"
 msgstr "Llyfrnodau"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:1291
+#: src/bookmarks/ephy-bookmarks-editor.c:1437
 msgid "Topics"
 msgstr "Pynciau"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:1352 src/ephy-history-window.c:1071
+#: src/bookmarks/ephy-bookmarks-editor.c:1499 src/ephy-history-window.c:1318
 msgid "Title"
 msgstr "Teitl"
 
-#. This is the adjective, not the verb
-#: src/bookmarks/ephy-bookmarks-menu.c:280
-#: src/bookmarks/ephy-topic-action.c:222
-msgid "Empty"
-msgstr "Gwag"
+#: src/bookmarks/ephy-bookmarks-editor.c:1506 src/ephy-history-window.c:1324
+msgid "Address"
+msgstr "Cyfeiriadau"
 
 #. Translators you should change these links to respect your locale.
 #. * For instance in .nl these should be
 #. * "http://www.google.nl" and "http://www.google.nl/search?q=%s"
 #.
-#: src/bookmarks/ephy-bookmarks.c:77
+#: src/bookmarks/ephy-bookmarks.c:83
 msgid "Search the web"
 msgstr "Chwilio'r we"
 
-#: src/bookmarks/ephy-bookmarks.c:77
+#: src/bookmarks/ephy-bookmarks.c:83
 #, c-format
 msgid "http://www.google.com/search?q=%s&ie=UTF-8&oe=UTF-8"
 msgstr "http://www.google.com/search?hl=cy&q=%s&ie=UTF-8&oe=UTF-8"
 
-#: src/bookmarks/ephy-bookmarks.c:83
+#: src/bookmarks/ephy-bookmarks.c:89
 msgid "Entertainment"
 msgstr "Adloniant"
 
-#: src/bookmarks/ephy-bookmarks.c:84
+#: src/bookmarks/ephy-bookmarks.c:90
 msgid "News"
 msgstr "Newyddion"
 
-#: src/bookmarks/ephy-bookmarks.c:85
+#: src/bookmarks/ephy-bookmarks.c:91
 msgid "Shopping"
 msgstr "Siopa"
 
-#: src/bookmarks/ephy-bookmarks.c:86
+#: src/bookmarks/ephy-bookmarks.c:92
 msgid "Sports"
 msgstr "Chwaraeon"
 
-#: src/bookmarks/ephy-bookmarks.c:87
+#: src/bookmarks/ephy-bookmarks.c:93
 msgid "Travel"
 msgstr "Teithio"
 
-#: src/bookmarks/ephy-bookmarks.c:88
+#: src/bookmarks/ephy-bookmarks.c:94
 msgid "Work"
 msgstr "Gwaith"
 
-#: src/bookmarks/ephy-bookmarks.c:726
+#: src/bookmarks/ephy-bookmarks.c:680
 msgid "Most Visited"
-msgstr "Ymwelir Mwyaf"
+msgstr "Ymwelir Amlaf"
 
-#: src/bookmarks/ephy-bookmarks.c:743
+#: src/bookmarks/ephy-bookmarks.c:697
 msgid "Not Categorized"
 msgstr "Heb eu Trefnu"
 
-#: src/bookmarks/ephy-new-bookmark.c:266
-msgid "New Bookmark"
-msgstr "Llyfrnod Newydd"
+#: src/bookmarks/ephy-new-bookmark.c:261
+msgid "Add Bookmark"
+msgstr "Ychwanegu Llyfrnod"
 
 #. FIXME: We "should" use gtk_message dialog here
 #. * but it doesn't support markup of text yet
 #. * so we build our own. See bug 65501.
 #.
-#: src/bookmarks/ephy-new-bookmark.c:311
+#: src/bookmarks/ephy-new-bookmark.c:306
 msgid "Duplicated Bookmark"
 msgstr "Llyfrnod Ddyblyg"
 
-#: src/bookmarks/ephy-new-bookmark.c:341
+#: src/bookmarks/ephy-new-bookmark.c:336
 #, c-format
 msgid "A bookmark titled %s already exists for this page."
-msgstr "Mae llyfrnod a'r teitl %s yn bodoli ar gyfer y dudalen hon yn barod."
+msgstr "Mae llyfrnod â'r teitl %s yn bodoli ar gyfer y dudalen hon yn barod."
 
-#: src/ephy-go-action.c:80 src/ephy-go-action.c:97 src/toolbar.c:348
+#. This is the adjective, not the verb
+#: src/bookmarks/ephy-topic-action.c:233
+msgid "Empty"
+msgstr "Gwag"
+
+#: src/ephy-encoding-dialog.c:330
+msgid "Encodings"
+msgstr "Amgodiadau"
+
+#: src/ephy-encoding-menu.c:379
+msgid "_Other..."
+msgstr "_Arall..."
+
+#: src/ephy-encoding-menu.c:380
+msgid "Other encodings"
+msgstr "Amgodiadau eraill"
+
+#: src/ephy-encoding-menu.c:387
+msgid "_Automatic"
+msgstr "_Awtomatig"
+
+#: src/ephy-go-action.c:73 src/toolbar.c:409
 msgid "Go"
 msgstr "Mynd"
 
-#: src/ephy-history-window.c:132
+#: src/ephy-history-window.c:159
 msgid "Open the selected history link in a new window"
-msgstr "Agor y cyswllt hanes ddewisiedig mewn ffenestr newydd"
+msgstr "Agor y cyswllt hanes dewisiedig mewn ffenestr newydd"
 
-#: src/ephy-history-window.c:135
+#: src/ephy-history-window.c:162
 msgid "Open the selected history link in a new tab"
-msgstr "Agor y cyswllt hanes ddewisiedig mewn tab newydd"
+msgstr "Agor y cyswllt hanes dewisiedig mewn tab newydd"
 
-#: src/ephy-history-window.c:138
+#: src/ephy-history-window.c:165
 msgid "Delete the selected history link"
 msgstr "Dileu'r cyswllt hanes dewisiedig"
 
-#: src/ephy-history-window.c:140
+#: src/ephy-history-window.c:167
 msgid "Boo_kmark Link..."
-msgstr "_Cyswllt Nôd Tudalen..."
+msgstr "_Cyswllt Llyfrnod..."
 
-#: src/ephy-history-window.c:141
+#: src/ephy-history-window.c:168
 msgid "Bookmark the selected history link"
 msgstr "Creu llyfrnod o'r cyswllt hanes a ddewiswyd"
 
-#: src/ephy-history-window.c:144
+#: src/ephy-history-window.c:171
 msgid "Close the history window"
 msgstr "Cau'r ffenestr hanes"
 
-#: src/ephy-history-window.c:158
+#: src/ephy-history-window.c:185
 msgid "Select all history links or text"
 msgstr "Dewis pob cyswllt hanes neu destun"
 
-#: src/ephy-history-window.c:160
+#: src/ephy-history-window.c:187
 msgid "C_lear History"
 msgstr "C_lirio'r Hanes"
 
-#: src/ephy-history-window.c:161
+#: src/ephy-history-window.c:188
 msgid "Clear your browsing history"
 msgstr "Clirio eich hanes pori"
 
-#: src/ephy-history-window.c:177
+#: src/ephy-history-window.c:193
 msgid "Display history help"
 msgstr "Dangos cymorth hanes"
 
-#: src/ephy-history-window.c:223
-msgid "Clear history"
-msgstr "Clirio'r hanes"
+#: src/ephy-history-window.c:213
+msgid "_Address"
+msgstr "_Cyfeiriad"
+
+#: src/ephy-history-window.c:214
+msgid "Show only the address column"
+msgstr "Dangos y golofn gyfeiriad yn unig"
+
+#: src/ephy-history-window.c:246
+msgid "Clear History"
+msgstr "Clirio'r Hanes"
 
-#: src/ephy-history-window.c:255
+#: src/ephy-history-window.c:278
 msgid "C_lear"
 msgstr "C_lirio"
 
-#: src/ephy-history-window.c:277
+#: src/ephy-history-window.c:301
 msgid "Clear browsing history?"
 msgstr "Clirio eich hanes pori?"
 
-#: src/ephy-history-window.c:284
+#: src/ephy-history-window.c:308
 msgid ""
 "Clearing the browsing history will cause all history links to be permanently "
 "deleted."
 msgstr "Mi fydd clirio'r hanes pori yn dileu'r cysylltau hanes am byth."
 
-#: src/ephy-history-window.c:951
+#: src/ephy-history-window.c:1047
+msgid "Today"
+msgstr "Heddiw"
+
+#. keep this in sync with embed/ephy-history.c's HISTORY_PAGE_OBSOLETE_DAYS
+#: src/ephy-history-window.c:1048 src/ephy-history-window.c:1051
+#: src/ephy-history-window.c:1055
+#, c-format
+msgid "Last %d day"
+msgid_plural "Last %d days"
+msgstr[0] "Yr %d diwrnod olaf"
+msgstr[1] "Y %d ddiwrnod olaf"
+msgstr[2] "Y %d diwrnod olaf"
+msgstr[3] "Yr %d diwrnod olaf"
+
+#: src/ephy-history-window.c:1192
 msgid "History"
 msgstr "Hanes"
 
-#: src/ephy-history-window.c:1021
+#: src/ephy-history-window.c:1264
 msgid "Sites"
 msgstr "Safleoedd"
 
-#: src/ephy-history-window.c:1076
-msgid "Address"
-msgstr "Cyfeiriadau"
-
-#: src/ephy-main.c:72
+#: src/ephy-main.c:56
 msgid "Open a new tab in an existing Epiphany window"
-msgstr "Agor tab newydd tu fewn i ffenestr Epiphany presennol"
-
-#: src/ephy-main.c:75
-msgid "Open a new window in an existing Epiphany process"
-msgstr "Agor ffenestr newydd tu fewn i broses Epiphany presennol"
+msgstr "Agor tab newydd tu fewn i ffenestr Epiphany sy'n bodoli eisioes"
 
-#: src/ephy-main.c:78
-msgid ""
-"Do not raise the window when opening a page in an existing Epiphany process"
-msgstr ""
-"Peidio â chodi'r ffenestr wrth agor tudalen tu fewn i broses Epiphany "
-"presennol"
-
-#: src/ephy-main.c:81
+#: src/ephy-main.c:59
 msgid "Run Epiphany in full screen mode"
-msgstr "Llenwi'r sgrîn efo Epiphany."
+msgstr "Rhedeg Epiphany lond y sgrîn"
 
-#: src/ephy-main.c:84
-msgid "Attempt to load URL in existing Epiphany window"
-msgstr "Ceisio llwytho LAU y tu fewn i ffenestr Epiphany presennol"
-
-#: src/ephy-main.c:87
+#: src/ephy-main.c:62
 msgid "Load the given session file"
-msgstr "Llwytho'r ffeil sesiynnau penodedig"
+msgstr "Llwytho'r ffeil sesiynau penodedig"
 
-#: src/ephy-main.c:88
+#: src/ephy-main.c:63 src/ephy-main.c:69
 msgid "FILE"
 msgstr "FFEIL"
 
-#: src/ephy-main.c:90
-msgid ""
-"Don't open any windows; instead act as a server for quick startup of new "
-"Epiphany instances"
-msgstr ""
-"Peidio ag agor ffenestr; yn lle, gweithredu fel gweinydd ar gyfer ymgychwyn "
-"enghreifftiau newydd o Epiphany yn gyflym"
-
-#: src/ephy-main.c:94
+#: src/ephy-main.c:65
 msgid "Add a bookmark (don't open any window)"
 msgstr "Ychwanegu llyfrnod (peidio ag agor unrhyw ffenestr)"
 
-#: src/ephy-main.c:95
+#: src/ephy-main.c:66
 msgid "URL"
 msgstr "LAU"
 
-#: src/ephy-main.c:97
-msgid "Close all Epiphany windows"
-msgstr "Cau pôb ffenestr Epiphany"
-
-#: src/ephy-main.c:100
-msgid "Same as --close, but exits server mode too"
-msgstr "Yr un peth a --close, ond yn terfynu'r modd gweinydd hefyd"
-
-#: src/ephy-main.c:103
-msgid "Used internally by the nautilus view"
-msgstr "Wedi'i ddefnyddio yn fewnol gan y golwg nautilus"
+#: src/ephy-main.c:68
+msgid "Import bookmarks from the given file"
+msgstr "Mewnforio llyfrnodau o'r ffeil yma"
 
-#: src/ephy-main.c:106
+#: src/ephy-main.c:71
 msgid "Launch the bookmarks editor"
 msgstr "Cychwyn y golygydd llyfrnodau"
 
-#: src/ephy-main.c:127
+#: src/ephy-main.c:74
+msgid "Used internally by the bonobo interface"
+msgstr "Defnyddir yn fewnol gan rhyngwyneb bonobo"
+
+#: src/ephy-main.c:109
 msgid "Epiphany Web Browser"
 msgstr "Y Porwr Gwe Epiphany"
 
-#: src/ephy-main.c:132
+#: src/ephy-main.c:113
 msgid "Ephy"
 msgstr "Ephy"
 
-#: src/ephy-main.c:203
+#: src/ephy-session.c:301
+msgid "Crash Recovery"
+msgstr "Adfer ar ôl Chwalfa"
+
+#: src/ephy-session.c:303
+msgid "_Don't Recover"
+msgstr "_Peidio Adfer"
+
+#: src/ephy-session.c:304
+msgid "_Recover"
+msgstr "_Adfer"
+
+#: src/ephy-session.c:335
 msgid ""
-"Epiphany can't be used now. Running the command \"bonobo-slay\" from the "
-"console may fix the problem. If not, you can try rebooting the computer or "
-"installing Epiphany again.\n"
-"\n"
-"Bonobo couldn't locate the GNOME_Epiphany_Automation.server."
+"Epiphany appears to have crashed or been killed the last time it was run."
 msgstr ""
-"Ni ellir defnyddio Epiphany ar hyn o bryd. Efallai bydd gweithredu'r "
-"gorchymyn \"bonobo-slay\" o'r terfynell yn trwsio'r broblem. Os na, gallwch "
-"geisio ailgychwyn y cyfrifiadur neu ailsefydlu Epiphany.\n"
-"\n"
-"Ni all Bonobo leoli'r GNOME_Epiphany_Automation.server."
+"Ymddengys bod Epiphany wedi chwalu neu cael ei ladd y tro diwethaf y cafodd "
+"ei redeg."
+
+#: src/ephy-session.c:341
+msgid "You can recover the opened tabs and windows."
+msgstr "Gallwch adfer y tabiau a ffenestri a oedd ar agor."
 
-#: src/ephy-shell.c:234
+#: src/ephy-shell.c:357
 msgid ""
-"Epiphany can't be used now. Mozilla initialization failed. Check your "
-"MOZILLA_FIVE_HOME environmental variable."
+"Bonobo couldn't locate the GNOME_Epiphany_Automation.server file. You can "
+"use bonobo-activation-sysconf to configure the search path for bonobo server "
+"files."
 msgstr ""
-"Ni ellir defnyddio Epiphany ar hyn o bryd. Methwyd cychwyn Mozilla. Gwiriwch "
-"eich newidyn amgylchol MOZILLA_FIVE_HOME."
+"Methodd Bonobo ganfod y ffeil GNOME_Epiphany_Automation.server. Medrwch "
+"ddefnyddio bonobo-activation-sysconf er mwyn gosod y llwybr i chwilio ar "
+"gyfer ffeiliau gweinydd bonobo."
 
-#: src/ephy-tab.c:314 src/ephy-tab.c:1012 src/ephy-tab.c:1195
+#: src/ephy-shell.c:364
+msgid ""
+"Epiphany can't be used now, due to an unexpected error from Bonobo when "
+"attempting to register the automation server"
+msgstr ""
+"Ni fedrir defnyddio Epiphany yn awr, oherwydd gwall annisgwyl oddi wrth "
+"Bonobo wrth geisio cychwyn y gweinydd awtomeiddio"
+
+#: src/ephy-shell.c:387
+msgid ""
+"Epiphany can't be used now, due to an unexpected error from Bonobo when "
+"attempting to locate the automation object."
+msgstr ""
+"Ni fedrir defnyddio Epiphany yn awr, oherwydd gwall annisgwyl oddi wrth "
+"Bonobo pan yn ceisio canfod y gwrthrych awtomeiddio."
+
+#: src/ephy-tab.c:367 src/ephy-tab.c:1200 src/ephy-tab.c:1370
 msgid "Blank page"
 msgstr "Tudalen wag"
 
-#: src/ephy-tab.c:639
+#: src/ephy-tab.c:772
 msgid "site"
 msgstr "safle"
 
-#: src/ephy-tab.c:663
+#: src/ephy-tab.c:796
 #, c-format
 msgid "Redirecting to %s..."
 msgstr "Yn ailgyfeirio i %s..."
 
-#: src/ephy-tab.c:667
+#: src/ephy-tab.c:800
 #, c-format
 msgid "Transferring data from %s..."
 msgstr "Yn trosglwyddo data o %s..."
 
-#: src/ephy-tab.c:671
+#: src/ephy-tab.c:804
 #, c-format
 msgid "Waiting for authorization from %s..."
 msgstr "Yn aros am awdurdod o %s..."
 
-#: src/ephy-tab.c:679
+#: src/ephy-tab.c:812
 #, c-format
 msgid "Loading %s..."
 msgstr "Yn llwytho %s..."
 
-#: src/ephy-tab.c:683
-msgid "Done."
-msgstr "Wedi gorffen."
-
-#: src/ephy-window.c:68
+#: src/ephy-window.c:79
 msgid "_Bookmarks"
 msgstr "_Llyfrnodau"
 
-#: src/ephy-window.c:69
+#: src/ephy-window.c:80
 msgid "_Go"
 msgstr "_Mynd"
 
-#: src/ephy-window.c:70
+#: src/ephy-window.c:81
+msgid "T_ools"
+msgstr "_Offer"
+
+#: src/ephy-window.c:82
 msgid "_Tabs"
 msgstr "_Tabiau"
 
 #. File menu
-#: src/ephy-window.c:74
+#: src/ephy-window.c:87
 msgid "_New Window"
 msgstr "Ffenestr _Newydd"
 
-#: src/ephy-window.c:75
+#: src/ephy-window.c:88
 msgid "Open a new window"
 msgstr "Agor ffenestr newydd"
 
-#: src/ephy-window.c:77
+#: src/ephy-window.c:90
 msgid "New _Tab"
 msgstr "_Tab Newydd"
 
-#: src/ephy-window.c:78
+#: src/ephy-window.c:91
 msgid "Open a new tab"
 msgstr "Agor tab newydd"
 
-#: src/ephy-window.c:80
+#: src/ephy-window.c:93
 msgid "_Open..."
 msgstr "_Agor..."
 
-#: src/ephy-window.c:81
+#: src/ephy-window.c:94
 msgid "Open a file"
 msgstr "Agor ffeil"
 
-#: src/ephy-window.c:83
+#: src/ephy-window.c:96
 msgid "Save _As..."
 msgstr "Cadw _Fel..."
 
-#: src/ephy-window.c:84
+#: src/ephy-window.c:97
 msgid "Save the current page"
 msgstr "Cadw'r dudalen gyfredol"
 
-#: src/ephy-window.c:87
+#: src/ephy-window.c:99
+msgid "Print Set_up..."
+msgstr "_Gosodiadau Argraffu..."
+
+#: src/ephy-window.c:100
+msgid "Setup the page settings for printing"
+msgstr "Gosod yr opsiynau tudalen ar gyfer argraffu"
+
+#: src/ephy-window.c:102
+msgid "Print Pre_view"
+msgstr "_Rhagolwg Argraffu"
+
+#: src/ephy-window.c:103
+msgid "Print preview"
+msgstr "Rhagolwg argraffu"
+
+#: src/ephy-window.c:106
 msgid "Print the current page"
 msgstr "Argraffu'r dudalen gyfredol"
 
-#: src/ephy-window.c:89
+#: src/ephy-window.c:108
 msgid "S_end To..."
 msgstr "_Anfon I..."
 
-#: src/ephy-window.c:90
+#: src/ephy-window.c:109
 msgid "Send a link of the current page"
 msgstr "Anfon cyswllt o'r dudalen gyfredol"
 
-#: src/ephy-window.c:93
+#: src/ephy-window.c:112
 msgid "Close this window"
 msgstr "Cau'r ffenestr hon"
 
-#: src/ephy-window.c:104
+#. Edit menu
+#: src/ephy-window.c:116
+msgid "_Undo"
+msgstr "_Datwneud"
+
+#: src/ephy-window.c:117
+msgid "Undo the last action"
+msgstr "Datwneud y weithred ddiweddaraf"
+
+#: src/ephy-window.c:119
+msgid "Re_do"
+msgstr "_Ailwneud"
+
+#: src/ephy-window.c:120
+msgid "Redo the last undone action"
+msgstr "Ailwneud y weithred olaf gafodd ei ddatwneud"
+
+#: src/ephy-window.c:129
 msgid "Paste clipboard"
 msgstr "Gludo'r clipfwrdd"
 
-#: src/ephy-window.c:107
+#: src/ephy-window.c:132
 msgid "Select the entire page"
 msgstr "Dewis y dudalen gyfan"
 
-#: src/ephy-window.c:110
+#: src/ephy-window.c:135
 msgid "Find a word or phrase in the page"
 msgstr "Canfod air neu frawddeg yn y dudalen"
 
-#: src/ephy-window.c:112
+#: src/ephy-window.c:137
 msgid "Find Ne_xt"
-msgstr "Canfod _Nesaf"
+msgstr "Canfod y _Nesaf"
 
-#: src/ephy-window.c:113
+#: src/ephy-window.c:138
 msgid "Find next occurrence of the word or phrase"
 msgstr "Canfod digwyddiad nesaf y gair neu frawddeg"
 
-#: src/ephy-window.c:115
+#: src/ephy-window.c:140
 msgid "Find Pre_vious"
-msgstr "Canfod _Blaenorol"
+msgstr "Canfod y _Blaenorol"
 
-#: src/ephy-window.c:116
+#: src/ephy-window.c:141
 msgid "Find previous occurrence of the word or phrase"
 msgstr "Canfod digwyddiad blaenorol y gair neu frawddeg"
 
-#: src/ephy-window.c:118
+#: src/ephy-window.c:143
 msgid "P_ersonal Data"
 msgstr "Data P_ersonol"
 
-#: src/ephy-window.c:119
+#: src/ephy-window.c:144
 msgid "View and remove cookies and passwords"
 msgstr "Gwylio a gwaredu bisgedi a chyfrineiriau"
 
-#: src/ephy-window.c:121
+#: src/ephy-window.c:146
 msgid "T_oolbars"
 msgstr "Barau _Offer"
 
-#: src/ephy-window.c:122
+#: src/ephy-window.c:147
 msgid "Customize toolbars"
 msgstr "Addasu barau offer"
 
-#: src/ephy-window.c:124
+#: src/ephy-window.c:149
 msgid "P_references"
 msgstr "_Hoffterau"
 
-#: src/ephy-window.c:125
+#: src/ephy-window.c:150
 msgid "Configure the web browser"
 msgstr "Cyflunio'r porwr gwe"
 
 #. View menu
-#: src/ephy-window.c:129
+#: src/ephy-window.c:154
 msgid "_Stop"
 msgstr "_Atal"
 
-#: src/ephy-window.c:130
+#: src/ephy-window.c:155
 msgid "Stop current data transfer"
 msgstr "Atal y llwythiad data cyfredol"
 
-#: src/ephy-window.c:132
+#: src/ephy-window.c:157
 msgid "_Reload"
 msgstr "_Ail-lwytho"
 
-#: src/ephy-window.c:133
+#: src/ephy-window.c:158
 msgid "Display the latest content of the current page"
 msgstr "Dangos cynnwys diweddaraf y dudalen gyfredol"
 
-#: src/ephy-window.c:135
-msgid "_Toolbar"
-msgstr "_Barau Offer"
-
-#: src/ephy-window.c:136
-msgid "Show or hide toolbar"
-msgstr "Dangos neu guddio'r bar offer"
-
-#: src/ephy-window.c:138
-msgid "_Bookmarks Bar"
-msgstr "_Bar Llyfrnodau"
-
-#: src/ephy-window.c:139
-msgid "Show or hide bookmarks bar"
-msgstr "Dangos neu guddio'r bar llyfrnodau"
-
-#: src/ephy-window.c:141
-msgid "St_atusbar"
-msgstr "B_ar Cyflwr"
-
-#: src/ephy-window.c:142
-msgid "Show or hide statusbar"
-msgstr "Dangos neu guddio'r bar cyflwr"
-
-#: src/ephy-window.c:144
-msgid "_Fullscreen"
-msgstr "_Sgrîn Lawn"
-
-#: src/ephy-window.c:145
-msgid "Browse at full screen"
-msgstr "Pori mewn sgrîn lawn"
-
-#: src/ephy-window.c:147
+#: src/ephy-window.c:160
 msgid "Zoom _In"
 msgstr "_Chwyddo"
 
-#: src/ephy-window.c:148
+#: src/ephy-window.c:161
 msgid "Increase the text size"
 msgstr "Cynyddu maint y testun"
 
-#: src/ephy-window.c:150
+#: src/ephy-window.c:163
 msgid "Zoom _Out"
 msgstr "Cre_bachu"
 
-#: src/ephy-window.c:151
+#: src/ephy-window.c:164
 msgid "Decrease the text size"
 msgstr "Lleihau maint y testun"
 
-#: src/ephy-window.c:153
+#: src/ephy-window.c:166
 msgid "_Normal Size"
 msgstr "Maint _Arferol"
 
-#: src/ephy-window.c:154
+#: src/ephy-window.c:167
 msgid "Use the normal text size"
 msgstr "Defnyddio'r maint testun arferol"
 
-#: src/ephy-window.c:156
-msgid "_Encoding"
-msgstr "_Amgodiad"
+#: src/ephy-window.c:169
+msgid "Text _Encoding"
+msgstr "_Amgodiad Testun"
 
-#: src/ephy-window.c:157
+#: src/ephy-window.c:170
+msgid "Change the text encoding"
+msgstr "Newid amgodiad y testun"
+
+#: src/ephy-window.c:172
 msgid "_Page Source"
 msgstr "Ffynhonell y _Dudalen"
 
-#: src/ephy-window.c:158
+#: src/ephy-window.c:173
 msgid "View the source code of the page"
 msgstr "Gweld côd ffynhonell y dudalen"
 
 #. Bookmarks menu
-#: src/ephy-window.c:162
+#: src/ephy-window.c:177
 msgid "_Add Bookmark..."
 msgstr "_Ychwanegu Llyfrnod..."
 
-#: src/ephy-window.c:163 src/ephy-window.c:224
+#: src/ephy-window.c:178 src/ephy-window.c:257
 msgid "Add a bookmark for the current page"
-msgstr "Ychwanegu llyfrnod ar gyfer y dudalen gyfredol "
+msgstr "Ychwanegu llyfrnod ar gyfer y dudalen gyfredol"
 
-#: src/ephy-window.c:165
+#: src/ephy-window.c:180
 msgid "_Edit Bookmarks"
 msgstr "_Golygu Llyfrnodau"
 
-#: src/ephy-window.c:166
+#: src/ephy-window.c:181
 msgid "Open the bookmarks window"
 msgstr "Agor y ffenestr llyfrnodau"
 
 #. Go menu
-#: src/ephy-window.c:170
+#: src/ephy-window.c:185
 msgid "_Back"
 msgstr "_Nôl"
 
-#: src/ephy-window.c:171
+#: src/ephy-window.c:186
 msgid "Go to the previous visited page"
 msgstr "Mynd i'r dudalen flaenorol"
 
-#: src/ephy-window.c:173
+#: src/ephy-window.c:188
 msgid "_Forward"
 msgstr "_Ymlaen"
 
-#: src/ephy-window.c:174
+#: src/ephy-window.c:189
 msgid "Go to the next visited page"
 msgstr "Mynd i'r dudalen nesaf"
 
-#: src/ephy-window.c:176
-msgid "_Up"
-msgstr "I _Fyny"
-
-#: src/ephy-window.c:177
+#: src/ephy-window.c:192
 msgid "Go up one level"
-msgstr "Myn i fyny un lefel"
+msgstr "Mynd i fyny un lefel"
 
-#: src/ephy-window.c:179
+#: src/ephy-window.c:194
 msgid "_Home"
 msgstr "_Gartref"
 
-#: src/ephy-window.c:180
+#: src/ephy-window.c:195
 msgid "Go to the home page"
 msgstr "Mynd i'r dudalen gartref"
 
-#: src/ephy-window.c:182
+#: src/ephy-window.c:197
 msgid "_Location..."
 msgstr "_Lleoliad..."
 
-#: src/ephy-window.c:183
+#: src/ephy-window.c:198
 msgid "Go to a specified location"
 msgstr "Mynd i leoliad penodol"
 
-#: src/ephy-window.c:185
+#: src/ephy-window.c:200
 msgid "H_istory"
 msgstr "_Hanes"
 
-#: src/ephy-window.c:186
+#: src/ephy-window.c:201
 msgid "Open the history window"
 msgstr "Agor y ffenestr hanes"
 
 #. Tabs menu
-#: src/ephy-window.c:190
+#: src/ephy-window.c:205
 msgid "_Previous Tab"
 msgstr "Tab _Blaenorol"
 
-#: src/ephy-window.c:191
+#: src/ephy-window.c:206
 msgid "Activate previous tab"
 msgstr "Gweithredu'r tab blaenorol"
 
-#: src/ephy-window.c:193
+#: src/ephy-window.c:208
 msgid "_Next Tab"
 msgstr "Tab _Nesaf"
 
-#: src/ephy-window.c:194
+#: src/ephy-window.c:209
 msgid "Activate next tab"
 msgstr "Gweithredu'r tab nesaf"
 
-#: src/ephy-window.c:196
+#: src/ephy-window.c:211
 msgid "Move Tab _Left"
 msgstr "Symud y Tab i'r _Chwith"
 
-#: src/ephy-window.c:197
+#: src/ephy-window.c:212
 msgid "Move current tab to left"
 msgstr "Symud y tab cyfredol i'r chwith"
 
-#: src/ephy-window.c:199
+#: src/ephy-window.c:214
 msgid "Move Tab _Right"
 msgstr "Symud y Tab i'r _Dde"
 
-#: src/ephy-window.c:200
+#: src/ephy-window.c:215
 msgid "Move current tab to right"
 msgstr "Symud y tab cyfredol i'r dde"
 
-#: src/ephy-window.c:202
+#: src/ephy-window.c:217
 msgid "_Detach Tab"
 msgstr "_Datglymu'r Tab"
 
-#: src/ephy-window.c:203
+#: src/ephy-window.c:218
 msgid "Detach current tab"
 msgstr "Datglymu'r tab cyfredol"
 
-#: src/ephy-window.c:208
+#: src/ephy-window.c:223
 msgid "Display web browser help"
 msgstr "Dangos cymorth y porwr gwe"
 
+#. View Menu
+#: src/ephy-window.c:234
+msgid "_Toolbar"
+msgstr "_Bar Offer"
+
+#: src/ephy-window.c:235
+msgid "Show or hide toolbar"
+msgstr "Dangos neu guddio'r bar offer"
+
+#: src/ephy-window.c:237
+msgid "_Bookmarks Bar"
+msgstr "_Bar Llyfrnodau"
+
+#: src/ephy-window.c:238
+msgid "Show or hide bookmarks bar"
+msgstr "Dangos neu guddio'r bar llyfrnodau"
+
+#: src/ephy-window.c:240
+msgid "St_atusbar"
+msgstr "B_ar Cyflwr"
+
+#: src/ephy-window.c:241
+msgid "Show or hide statusbar"
+msgstr "Dangos neu guddio'r bar cyflwr"
+
+#: src/ephy-window.c:243
+msgid "_Fullscreen"
+msgstr "_Sgrîn Lawn"
+
+#: src/ephy-window.c:244
+msgid "Browse at full screen"
+msgstr "Pori mewn sgrîn lawn"
+
+#: src/ephy-window.c:246
+msgid "Selection Caret"
+msgstr "Caret Dewisiad"
+
 #. Document
-#: src/ephy-window.c:221
+#: src/ephy-window.c:254
 msgid "_Save Background As..."
 msgstr "_Cadw'r Cefndir Fel..."
 
-#: src/ephy-window.c:223
+#: src/ephy-window.c:256
 msgid "Add Boo_kmark..."
-msgstr "_Ychwanegu Nôd Tudalen"
+msgstr "_Ychwanegu Llyfrnod..."
 
 #. Framed document
-#: src/ephy-window.c:228
+#: src/ephy-window.c:261
 msgid "_Open Frame"
 msgstr "_Agor Ffrâm"
 
-#: src/ephy-window.c:230
+#: src/ephy-window.c:263
 msgid "Open Frame in _New Window"
 msgstr "Agor Ffrâm mewn Ffenestr _Newydd"
 
-#: src/ephy-window.c:232
+#: src/ephy-window.c:265
 msgid "Open Frame in New _Tab"
 msgstr "Agor Ffrâm mewn _Tab Newydd"
 
 #. Links
-#: src/ephy-window.c:236
+#: src/ephy-window.c:269
 msgid "_Open Link"
 msgstr "_Agor y Cyswllt"
 
-#: src/ephy-window.c:238
+#: src/ephy-window.c:271
 msgid "Open Link in _New Window"
 msgstr "Agor y Cyswllt mewn Ffenestr _Newydd"
 
-#: src/ephy-window.c:240
+#: src/ephy-window.c:273
 msgid "Open Link in New _Tab"
 msgstr "Agor y Cyswllt mewn _Tab Newydd"
 
-#: src/ephy-window.c:242
-msgid "_Download Link..."
-msgstr "_Lawrlwytho Cyswllt..."
+#: src/ephy-window.c:275
+msgid "_Download Link"
+msgstr "_Lawrlwytho'r Cyswllt"
 
-#: src/ephy-window.c:244
+#: src/ephy-window.c:277
+msgid "_Save Link As..."
+msgstr "Cadw'r Cyswllt _Fel..."
+
+#: src/ephy-window.c:279
 msgid "_Bookmark Link..."
-msgstr "_Atogfio'r Cyswllt..."
+msgstr "_Llyfrnodi'r Cyswllt..."
 
-#: src/ephy-window.c:246
+#: src/ephy-window.c:281
 msgid "_Copy Link Address"
 msgstr "_Copïo Cyfeiriad y Cyswllt"
 
 #. Images
-#: src/ephy-window.c:250
+#: src/ephy-window.c:285
 msgid "Open _Image"
 msgstr "Agor y _Ddelwedd"
 
-#: src/ephy-window.c:252
+#: src/ephy-window.c:287
 msgid "Open Image in New _Window"
 msgstr "Agor y Ddelwedd mewn _Ffenestr Newydd"
 
-#: src/ephy-window.c:254
+#: src/ephy-window.c:289
 msgid "Open Image in New T_ab"
 msgstr "_Agor y Ddelwedd mewn Tab Newydd"
 
-#: src/ephy-window.c:256
+#: src/ephy-window.c:291
 msgid "_Save Image As..."
 msgstr "_Cadw'r Ddelwedd Fel..."
 
-#: src/ephy-window.c:258
+#: src/ephy-window.c:293
 msgid "_Use Image As Background"
-msgstr "_Defnyddio Delwedd Fel Cefndir"
+msgstr "_Defnyddio'r Ddelwedd Fel Cefndir"
 
-#: src/ephy-window.c:260
+#: src/ephy-window.c:295
 msgid "Copy I_mage Address"
 msgstr "_Copïo Cyfeiriad y Ddelwedd"
 
-#: src/ephy-window.c:577
+#: src/ephy-window.c:584
 msgid "Exit Fullscreen"
 msgstr "Gadael y Modd Sgrîn Lawn"
 
-#: src/ephy-window.c:678 src/window-commands.c:341
+#: src/ephy-window.c:658
+msgid "_Close document"
+msgstr "_Cau'r ddogfen"
+
+#: src/ephy-window.c:685
+msgid "There are unsubmitted changes to form elements."
+msgstr "Mae yna newidiadau i elfennau'r ffurflen sydd heb eu danfon."
+
+#: src/ephy-window.c:686
+msgid "If you close the document anyway, you will lose that information."
+msgstr ""
+"Os byddwch yn cau'r ddogfen er gwaetha hyn, fe gollwch y wybodaeth hynny."
+
+#: src/ephy-window.c:943 src/window-commands.c:395
 msgid "Open"
 msgstr "Agor"
 
-#: src/ephy-window.c:680 src/window-commands.c:382
+#: src/ephy-window.c:945 src/window-commands.c:420
 msgid "Save As"
 msgstr "Cadw Fel"
 
-#: src/ephy-window.c:684
+#: src/ephy-window.c:949
 msgid "Bookmark"
 msgstr "Llyfrnod"
 
-#: src/ephy-window.c:896
+#: src/ephy-window.c:1135
 msgid "Insecure"
 msgstr "Anniogel"
 
-#: src/ephy-window.c:899
+#: src/ephy-window.c:1138
 msgid "Broken"
 msgstr "Wedi Torri"
 
-#: src/ephy-window.c:902
+#: src/ephy-window.c:1141
 msgid "Medium"
 msgstr "Canolig"
 
-#: src/ephy-window.c:906
+#: src/ephy-window.c:1145
 msgid "Low"
 msgstr "Isel"
 
-#: src/ephy-window.c:910
+#: src/ephy-window.c:1149
 msgid "High"
 msgstr "Uchel"
 
-#: src/ephy-window.c:920
+#: src/ephy-window.c:1159
 #, c-format
 msgid ""
 "Security level: %s\n"
@@ -2614,75 +3219,88 @@ msgstr ""
 "Safon Diogelwch: %s\n"
 "%s"
 
-#: src/ephy-window.c:926
+#: src/ephy-window.c:1165
 #, c-format
 msgid "Security level: %s"
 msgstr "Safon Diogelwch: %s"
 
-#: src/pdm-dialog.c:253
-msgid "Host"
-msgstr "Gwesteiwr"
-
-#: src/pdm-dialog.c:265
-msgid "User Name"
-msgstr "Enw Defnyddiwr"
-
-#: src/pdm-dialog.c:313
+#: src/pdm-dialog.c:411
 msgid "Domain"
 msgstr "Parth"
 
-#: src/pdm-dialog.c:325
+#: src/pdm-dialog.c:423
 msgid "Name"
 msgstr "Enw"
 
-#: src/pdm-dialog.c:705
+#: src/pdm-dialog.c:664
+msgid "Host"
+msgstr "Gwesteiwr"
+
+#: src/pdm-dialog.c:676
+msgid "User Name"
+msgstr "Enw Defnyddiwr"
+
+#: src/pdm-dialog.c:869
 msgid "Cookie Properties"
 msgstr "Priodweddau Bisgedi"
 
-#: src/pdm-dialog.c:718
-msgid "Value:"
-msgstr "Gwerth:"
+#: src/pdm-dialog.c:884
+msgid "Content:"
+msgstr "Cynnwys:"
 
-#: src/pdm-dialog.c:732
+#: src/pdm-dialog.c:899
 msgid "Path:"
 msgstr "Llwybr:"
 
-#: src/pdm-dialog.c:746
+#: src/pdm-dialog.c:914
 msgid "Secure:"
 msgstr "Diogel:"
 
-#: src/pdm-dialog.c:760
-msgid "Expire:"
-msgstr "Darfod:"
+#: src/pdm-dialog.c:923
+msgid "Yes"
+msgstr "Ie"
+
+#: src/pdm-dialog.c:923
+msgid "No"
+msgstr "Na"
 
-#: src/popup-commands.c:323
+#: src/pdm-dialog.c:929
+msgid "Expires:"
+msgstr "Yn Darfod:"
+
+#: src/pdm-dialog.c:940
+msgid "End of current session"
+msgstr "Diwedd y sesiwn gyfredol"
+
+#: src/popup-commands.c:329 src/popup-commands.c:337
 msgid "Download link"
 msgstr "Lawrlwytho'r cyswllt"
 
-#: src/ppview-toolbar.c:91
+#: src/ppview-toolbar.c:93
 msgid "Go to the first page"
 msgstr "Mynd i'r dudalen gyntaf"
 
-#: src/ppview-toolbar.c:95
+#: src/ppview-toolbar.c:97
 msgid "Go to the last page"
 msgstr "Mynd i'r dudalen olaf"
 
-#: src/ppview-toolbar.c:99
+#: src/ppview-toolbar.c:101
 msgid "Go to the previous page"
 msgstr "Mynd i'r dudalen flaenorol"
 
-#: src/ppview-toolbar.c:103
+#: src/ppview-toolbar.c:105
 msgid "Go to next page"
 msgstr "Mynd i'r dudalen nesaf"
 
-#: src/ppview-toolbar.c:105
+#: src/ppview-toolbar.c:108
 msgid "Close"
 msgstr "Cau"
 
-#: src/ppview-toolbar.c:107
+#: src/ppview-toolbar.c:109
 msgid "Close print preview"
-msgstr "Cau'e rhagolwg argraffu"
+msgstr "Cau'r rhagolwg argraffu"
 
+# Dydw i ddim yn sicr fy mod yn deall hyn...
 #. *
 #. * please translate like this: "<your language> (System setting)"
 #. * Examples:
@@ -2690,320 +3308,497 @@ msgstr "Cau'e rhagolwg argraffu"
 #. * "en_AU" translation: "English, Australia (System setting)" or
 #. *                      "Australian English (System setting)"
 #.
-#: src/prefs-dialog.c:88
+#: src/prefs-dialog.c:105
 msgid "System language"
-msgstr "Iaith y system"
+msgstr "Cymraeg (Gosodiad y system)"
 
-#: src/prefs-dialog.c:89
+#: src/prefs-dialog.c:106
 msgid "Afrikaans"
 msgstr "Afrikaans"
 
-#: src/prefs-dialog.c:90
+#: src/prefs-dialog.c:107
 msgid "Albanian"
 msgstr "Albaneg"
 
-#: src/prefs-dialog.c:92
+#: src/prefs-dialog.c:109
 msgid "Azerbaijani"
 msgstr "Azerbaijani"
 
-#: src/prefs-dialog.c:93
+#: src/prefs-dialog.c:110
 msgid "Basque"
 msgstr "Basg"
 
-#: src/prefs-dialog.c:94
+#: src/prefs-dialog.c:111
 msgid "Breton"
 msgstr "Llydaweg"
 
-#: src/prefs-dialog.c:95
+#: src/prefs-dialog.c:112
 msgid "Bulgarian"
 msgstr "Bwlgareg"
 
-#: src/prefs-dialog.c:96
+#: src/prefs-dialog.c:113
 msgid "Byelorussian"
 msgstr "Belorwseg"
 
-#: src/prefs-dialog.c:97
+#: src/prefs-dialog.c:114
 msgid "Catalan"
 msgstr "Catalaneg"
 
-#: src/prefs-dialog.c:100 src/prefs-dialog.c:157
-msgid "Chinese"
-msgstr "Tsieinëeg"
-
-#: src/prefs-dialog.c:101
+#: src/prefs-dialog.c:118
 msgid "Croatian"
 msgstr "Croateg"
 
-#: src/prefs-dialog.c:102
+#: src/prefs-dialog.c:119
 msgid "Czech"
 msgstr "Tsieceg"
 
-#: src/prefs-dialog.c:103
+#: src/prefs-dialog.c:120
 msgid "Danish"
 msgstr "Daneg"
 
-#: src/prefs-dialog.c:104
+#: src/prefs-dialog.c:121
 msgid "Dutch"
 msgstr "Iseldireg"
 
-#: src/prefs-dialog.c:105
+#: src/prefs-dialog.c:122
 msgid "English"
 msgstr "Saesneg"
 
-#: src/prefs-dialog.c:106
+#: src/prefs-dialog.c:123
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: src/prefs-dialog.c:107
+#: src/prefs-dialog.c:124
 msgid "Estonian"
 msgstr "Estoneg"
 
-#: src/prefs-dialog.c:108
+#: src/prefs-dialog.c:125
 msgid "Faeroese"
 msgstr "Ffaroeg"
 
-#: src/prefs-dialog.c:109
+#: src/prefs-dialog.c:126
 msgid "Finnish"
 msgstr "Ffineg"
 
-#: src/prefs-dialog.c:110
+#: src/prefs-dialog.c:127
 msgid "French"
 msgstr "Ffrangeg"
 
-#: src/prefs-dialog.c:111
+#: src/prefs-dialog.c:128
 msgid "Galician"
 msgstr "Galiseg"
 
-#: src/prefs-dialog.c:112
+#: src/prefs-dialog.c:129
 msgid "German"
 msgstr "Almaeneg"
 
-#: src/prefs-dialog.c:115
+#: src/prefs-dialog.c:132
 msgid "Hungarian"
 msgstr "Hwngareg"
 
-#: src/prefs-dialog.c:116
+#: src/prefs-dialog.c:133
 msgid "Icelandic"
 msgstr "Islandeg"
 
-#: src/prefs-dialog.c:117
+#: src/prefs-dialog.c:134
 msgid "Indonesian"
 msgstr "Indoneseg"
 
-#: src/prefs-dialog.c:118
+#: src/prefs-dialog.c:135
 msgid "Irish"
 msgstr "Gwyddeleg"
 
-#: src/prefs-dialog.c:119
+#: src/prefs-dialog.c:136
 msgid "Italian"
 msgstr "Eidaleg"
 
-#: src/prefs-dialog.c:122
+#: src/prefs-dialog.c:139
 msgid "Latvian"
 msgstr "Latfieg"
 
-#: src/prefs-dialog.c:123
+#: src/prefs-dialog.c:140
 msgid "Lithuanian"
 msgstr "Lithwaneg"
 
-#: src/prefs-dialog.c:124
+#: src/prefs-dialog.c:141
 msgid "Macedonian"
 msgstr "Macedoneg"
 
-#: src/prefs-dialog.c:125
+#: src/prefs-dialog.c:142
 msgid "Malay"
 msgstr "Malay"
 
-#: src/prefs-dialog.c:126
+#: src/prefs-dialog.c:143
 msgid "Norwegian/Nynorsk"
 msgstr "Norwyeg/Nynorsk"
 
-#: src/prefs-dialog.c:127
+#: src/prefs-dialog.c:144
 msgid "Norwegian/Bokmal"
-msgstr "Norwyeg/Bokmaal"
+msgstr "Norwyeg/Bokmal"
 
-#: src/prefs-dialog.c:128
+#: src/prefs-dialog.c:145
 msgid "Norwegian"
 msgstr "Norwyeg"
 
-#: src/prefs-dialog.c:129
+#: src/prefs-dialog.c:146
 msgid "Polish"
 msgstr "Pwyleg"
 
-#: src/prefs-dialog.c:130
+#: src/prefs-dialog.c:147
 msgid "Portuguese"
 msgstr "Portiwgaleg"
 
-#: src/prefs-dialog.c:131
+#: src/prefs-dialog.c:148
 msgid "Portuguese of Brazil"
 msgstr "Portiwgaleg Brasil"
 
-#: src/prefs-dialog.c:132
+#: src/prefs-dialog.c:149
 msgid "Romanian"
 msgstr "Romaneg"
 
-#: src/prefs-dialog.c:133 src/prefs-dialog.c:161
-msgid "Russian"
-msgstr "Rwsieg"
-
-#: src/prefs-dialog.c:134
+#: src/prefs-dialog.c:151
 msgid "Scottish"
-msgstr "Gaeleg"
+msgstr "Gaeleg yr Alban"
 
-#: src/prefs-dialog.c:135
+#: src/prefs-dialog.c:152
 msgid "Serbian"
 msgstr "Serbieg"
 
-#: src/prefs-dialog.c:136
+#: src/prefs-dialog.c:153
 msgid "Slovak"
 msgstr "Slofaceg"
 
-#: src/prefs-dialog.c:137
+#: src/prefs-dialog.c:154
 msgid "Slovenian"
 msgstr "Slofeneg"
 
-#: src/prefs-dialog.c:138
+#: src/prefs-dialog.c:155
 msgid "Spanish"
 msgstr "Sbaeneg"
 
-#: src/prefs-dialog.c:139
+#: src/prefs-dialog.c:156
 msgid "Swedish"
 msgstr "Swedeg"
 
-#: src/prefs-dialog.c:142 src/prefs-dialog.c:165
-msgid "Ukrainian"
-msgstr "Wcraineg"
-
-#: src/prefs-dialog.c:143
+#: src/prefs-dialog.c:160
 msgid "Vietnamese"
 msgstr "Fietnameg"
 
-#: src/prefs-dialog.c:144
+#: src/prefs-dialog.c:161
 msgid "Walloon"
 msgstr "Walwneg"
 
-#: src/prefs-dialog.c:156
-msgid "Off"
-msgstr "I Ffwrdd"
-
-#: src/prefs-dialog.c:158
-msgid "East Asian"
-msgstr "Dwyrain Asia"
-
-#: src/prefs-dialog.c:164
-msgid "Universal"
-msgstr "Cyffredinol"
-
-#: src/prefs-dialog.c:950
+#: src/prefs-dialog.c:1057
 #, c-format
 msgid "Custom [%s]"
 msgstr "Addasiedig [%s]"
 
-#: src/session.c:195
-msgid "Crash Recovery"
-msgstr "Adfer ar ôl Chwalfa"
+#. Note that this does NOT refer to the home page but to a
+#. * user's home folder. It should be translated by the same
+#. * term as GTK+'s "Home" string to be consistent with the
+#. * filechooser
+#: src/prefs-dialog.c:1102
+msgid "Home"
+msgstr "Cartref"
 
-#: src/session.c:197
-msgid "_Don't Recover"
-msgstr "_Peidio Adfer"
+#: src/prefs-dialog.c:1111
+msgid "Desktop"
+msgstr "Penbwrdd"
 
-#: src/session.c:198
-msgid "_Recover"
-msgstr "_Adfer"
+#: src/prefs-dialog.c:1322
+msgid "Select a directory"
+msgstr "Dewiswch gyfeiriadur"
 
-#: src/session.c:227
-msgid ""
-"Epiphany appears to have crashed or been killed the last time it was run."
-msgstr ""
-"Ymddengys bod Epiphany wedi chwalu neu cael ei ladd y tro diwethaf y cafodd "
-"ei redeg."
-
-#: src/session.c:233
-msgid "You can recover the opened tabs and windows."
-msgstr "Gallwch adfer y tabiau a ffenestri a oedd ar agor."
-
-#: src/toolbar.c:268
+#: src/toolbar.c:332
 msgid "Back"
 msgstr "Nôl"
 
-#: src/toolbar.c:270
+#: src/toolbar.c:334
 msgid "Go back"
 msgstr "Mynd yn ôl"
 
-#: src/toolbar.c:282
+#: src/toolbar.c:346
 msgid "Forward"
 msgstr "Ymlaen"
 
-#: src/toolbar.c:284
+#: src/toolbar.c:348
 msgid "Go forward"
 msgstr "Mynd ymlaen"
 
-#: src/toolbar.c:295
+#: src/toolbar.c:359
 msgid "Up"
 msgstr "I Fyny"
 
-#: src/toolbar.c:297
+#: src/toolbar.c:361
 msgid "Go up"
 msgstr "Mynd i fyny"
 
-#: src/toolbar.c:308
-msgid "Spinner"
-msgstr "Troellydd"
-
-#: src/toolbar.c:318
+#: src/toolbar.c:375
 msgid "Address Entry"
 msgstr "Cofnod Cyfeiriad"
 
-#: src/toolbar.c:320
+#: src/toolbar.c:377
 msgid "Enter a web address to open, or a phrase to search for on the web"
-msgstr "Rhowch gyfeiriad gwe i'w gor, neu frawddeg i'w chwilio amdani ar y we"
+msgstr "Rhowch gyfeiriad gwe i'w agor, neu frawddeg i'w chwilio amdani ar y we"
 
-#: src/toolbar.c:329
+#: src/toolbar.c:389
 msgid "Zoom"
 msgstr "Chwyddo"
 
-#: src/toolbar.c:330
+#: src/toolbar.c:391
 msgid "Adjust the text size"
 msgstr "Addasu maint y testun"
 
-#: src/toolbar.c:340
+#: src/toolbar.c:401
 msgid "Favicon"
 msgstr "Hoffeicon"
 
-#: src/toolbar.c:350
+#: src/toolbar.c:411
 msgid "Go to the address entered in the address entry"
 msgstr "Mynd i'r cyfeiriad a roddwyd yn y maes cyfeiriad"
 
-#: src/window-commands.c:130
+#: src/window-commands.c:168
 msgid "Check this out!"
 msgstr "Edrychwch ar hyn!"
 
-#: src/window-commands.c:295 src/ephy-toolbars-model.c:197
-msgid "Untitled"
-msgstr "Dideitl"
-
-#: src/window-commands.c:692
+#: src/window-commands.c:881
 msgid "Toolbar Editor"
 msgstr "Golygydd Bar Offer"
 
-#: src/window-commands.c:714
+#: src/window-commands.c:903
 msgid "_Add a New Toolbar"
 msgstr "_Ychwanegu Bar Offer Newydd"
 
 #. Translator credits
-#: src/window-commands.c:764
-msgid "translator_credits"
+#: src/window-commands.c:954
+msgid "translator-credits"
 msgstr ""
-"Keith Willoughby <keith@flat222.org>,\n"
-"Dafydd Harries <daf@parnassus.ath.cx>,\n"
-"Chris M. Jackson <chris@www.linux.org.uk>"
+"Keith Willoughby <keith@flat222.org>\n"
+"Dafydd Harries <daf@muse.19inch.net>\n"
+"Chris M. Jackson <chris@www.linux.org.uk>\n"
+"Rhys Jones <rhys@sucs.org>"
 
-#: src/window-commands.c:792
+#: src/window-commands.c:984
 msgid "A GNOME browser based on Mozilla"
-msgstr "Porwr GNOME yn seiliedig ar Mozilla"
+msgstr "Porwr GNOME yn seiliedig ar Mozilla/Gwe-lywiwr"
+
+#~ msgid "Epiphany Nautilus view factory"
+#~ msgstr "Ffatri golwg Nautilus Epiphany"
+
+#~ msgid "Epiphany content view component's factory"
+#~ msgstr "Ffatri cydran golwg cynnwys Epiphany"
 
-#~ msgid "_Language encoding:"
-#~ msgstr "Amgodiad _iaith:"
+#~ msgid "Ask for download destination"
+#~ msgstr "Gofyn am gyrchfan i'r lawrlwythiad"
+
+#~ msgid "Ask for download destination."
+#~ msgstr "Gofyn am gyrchfan i'r lawrlwythiad."
+
+#~ msgid "Open in tabs by default."
+#~ msgstr "Agor mewn tabiau yn rhagosodedig."
+
+#~ msgid "Show download details."
+#~ msgstr "Dangos manylion y lawrlwythiad."
+
+#~ msgid "Use tabs"
+#~ msgstr "Defnyddio tabiau"
+
+#~ msgid "  "
+#~ msgstr "  "
+
+#~ msgid "<b>Address:</b>"
+#~ msgstr "<b>Cyfeiriad:</b>"
+
+#~ msgid "<b>Time Elapsed:</b>"
+#~ msgstr "<b>Amser Aeth Heibio:</b>"
+
+#~ msgid "<b>Time Remaining:</b>"
+#~ msgstr "<b>Amser Ar Ôl:</b>"
+
+#~ msgid ""
+#~ "<span weight=\"bold\" size=\"larger\">What do you want to do with this "
+#~ "file?\n"
+#~ "</span>\n"
+#~ "It's not possible to view this file type directly in the browser:"
+#~ msgstr ""
+#~ "<span weight=\"bold\" size=\"larger\">Beth ydych chi eisiau gwneud gyda'r "
+#~ "ffeil hwn?\n"
+#~ "</span>\n"
+#~ "Nid yw'n bosib dangos ffeil o'r math hon yn y porwr"
+
+#~ msgid "You can open it with another application or save it on disk."
+#~ msgstr "Gallwch chwi ei agor gyda rhaglen arall, neu ei gadw ar ddisg."
+
+#~ msgid "<b>Tabs</b>"
+#~ msgstr "<b>Tabiau</b>"
+
+#~ msgid "Language Editor"
+#~ msgstr "Golygydd Iaith"
+
+#~ msgid "Open in _tabs by default"
+#~ msgstr "Agor mewn _tabiau yn rhagosodedig"
+
+#~ msgid "S_ans serif:"
+#~ msgstr "S_ans seriff:"
+
+#~ msgid "Sans Serif"
+#~ msgstr "Sans Seriff"
+
+#~ msgid "Serif"
+#~ msgstr "Seriff"
+
+#~ msgid "Si_ze:"
+#~ msgstr "_Maint:"
+
+#~ msgid "Siz_e:"
+#~ msgstr "Mai_nt:"
+
+#~ msgid "_Monospace:"
+#~ msgstr "_Unlled:"
+
+#~ msgid "_Proportional:"
+#~ msgstr "_Cyfrannol:"
+
+#~ msgid "_Serif:"
+#~ msgstr "_Seriff:"
+
+#~ msgid "Choose a file to print to"
+#~ msgstr "Dewiswch ffeil i argraffu iddo"
+
+#~ msgid "%.1f of %.1f MB"
+#~ msgstr "%.1f o %.1f MB"
+
+#~ msgid "%d of %d kB"
+#~ msgstr "%d o %d cB"
+
+#~ msgid "%d kB"
+#~ msgstr "%d cB"
+
+#~ msgid "%s at %.1f kB/s"
+#~ msgstr "%s at %.1f cB/e"
+
+#~ msgid "00.00"
+#~ msgstr "00.00"
+
+#~ msgid "Filename"
+#~ msgstr "Enw Ffeil"
+
+#~ msgid "Size"
+#~ msgstr "Maint"
+
+#~ msgid "Cancel all pending downloads?"
+#~ msgstr "Diddymu pôb lawrlwythiad sydd heb orffen?"
+
+#~ msgid "No available applications to open the specified file."
+#~ msgstr "Nid oes rhaglen ar gael er mwyn agor y ffeil a benodwyd."
+
+#~ msgid "Select the destination filename"
+#~ msgstr "Dewis enw'r ffeil cyrchfannol"
+
+#~ msgid "The specified path does not exist."
+#~ msgstr "Nid yw'r llwybr a benodwyd yn bodoli."
+
+#~ msgid "A file was selected when a folder was expected."
+#~ msgstr "Dewiswyd ffeil pan disgwylwyd plygell."
+
+#~ msgid "A folder was selected when a file was expected."
+#~ msgstr "Dewiswyd plygell pan disgwylwyd ffeil."
+
+#~ msgid "_Arabic"
+#~ msgstr "_Arabeg"
+
+#~ msgid "_Baltic"
+#~ msgstr "_Baltig"
+
+#~ msgid "Central _European"
+#~ msgstr "_Ewrop Canolog"
+
+#~ msgid "Chi_nese"
+#~ msgstr "_Tsieineaidd"
+
+#~ msgid "_Cyrillic"
+#~ msgstr "_Cyrilig"
+
+#~ msgid "_Greek"
+#~ msgstr "_Groegaidd"
+
+#~ msgid "_Hebrew"
+#~ msgstr "_Hebraeg"
+
+#~ msgid "_Indian"
+#~ msgstr "_Indiaidd"
+
+#~ msgid "_Japanese"
+#~ msgstr "_Siapanëaidd"
+
+#~ msgid "_Korean"
+#~ msgstr "C_orëaidd"
+
+#~ msgid "_Turkish"
+#~ msgstr "_Twrcaidd"
+
+#~ msgid "_Vietnamese"
+#~ msgstr "_Fietnamaidd"
+
+#~ msgid "_User Defined"
+#~ msgstr "_Diffiniedig gan y Defnyddiwr"
+
+#~ msgid "_Zoom"
+#~ msgstr "_Chwyddo"
+
+#~ msgid "New Bookmark"
+#~ msgstr "Llyfrnod Newydd"
+
+#~ msgid "Clear history"
+#~ msgstr "Clirio'r hanes"
+
+#~ msgid "Open a new window in an existing Epiphany process"
+#~ msgstr "Agor ffenestr newydd tu fewn i broses Epiphany presennol"
+
+#~ msgid ""
+#~ "Do not raise the window when opening a page in an existing Epiphany "
+#~ "process"
+#~ msgstr ""
+#~ "Peidio â chodi'r ffenestr wrth agor tudalen tu fewn i broses Epiphany "
+#~ "presennol"
+
+#~ msgid "Attempt to load URL in existing Epiphany window"
+#~ msgstr "Ceisio llwytho LAU y tu fewn i ffenestr Epiphany presennol"
+
+#~ msgid ""
+#~ "Don't open any windows; instead act as a server for quick startup of new "
+#~ "Epiphany instances"
+#~ msgstr ""
+#~ "Peidio ag agor ffenestr; yn lle, gweithredu fel gweinydd ar gyfer "
+#~ "ymgychwyn enghreifftiau newydd o Epiphany yn gyflym"
+
+#~ msgid "Close all Epiphany windows"
+#~ msgstr "Cau pôb ffenestr Epiphany"
+
+#~ msgid "Same as --close, but exits server mode too"
+#~ msgstr "Yr un peth a --close, ond yn terfynu'r modd gweinydd hefyd"
+
+#~ msgid ""
+#~ "Epiphany can't be used now. Running the command \"bonobo-slay\" from the "
+#~ "console may fix the problem. If not, you can try rebooting the computer "
+#~ "or installing Epiphany again.\n"
+#~ "\n"
+#~ "Bonobo couldn't locate the GNOME_Epiphany_Automation.server."
+#~ msgstr ""
+#~ "Ni ellir defnyddio Epiphany ar hyn o bryd. Efallai bydd gweithredu'r "
+#~ "gorchymyn \"bonobo-slay\" o'r terfynell yn trwsio'r broblem. Os na, "
+#~ "gallwch geisio ailgychwyn y cyfrifiadur neu ailsefydlu Epiphany.\n"
+#~ "\n"
+#~ "Ni all Bonobo leoli'r GNOME_Epiphany_Automation.server."
+
+#~ msgid "_Download Link..."
+#~ msgstr "_Lawrlwytho Cyswllt..."
+
+#~ msgid "Value:"
+#~ msgstr "Gwerth:"
+
+#~ msgid "Spinner"
+#~ msgstr "Troellydd"
 
 #~ msgid "When to compare cached copy"
 #~ msgstr "Pryd i gymharu copi sydd wedi'i storio"
@@ -3036,9 +3831,6 @@ msgstr "Porwr GNOME yn seiliedig ar Mozilla"
 #~ msgid "Security"
 #~ msgstr "Diogelwch"
 
-#~ msgid "_Automatically"
-#~ msgstr "_Ymysgogol"
-
 #~ msgid "_Never"
 #~ msgstr "_Byth"