Fixing bug 118749 from Chris M. Jackson.

1 files changed, 170 insertions, 157 deletions

diff --git a/po/cy.po b/po/cy.po
index df3abd88c..c15c8c6e3 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -8,13 +8,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: epiphany\n"
-"POT-Creation-Date: 2003-07-24 01:06+0100\n"
-"PO-Revision-Date: 2003-07-24 01:05+0100\n"
-"Last-Translator: Dafydd Harries <daf@parnassus.ath.cx>\n"
+"POT-Creation-Date: 2003-07-31 17:57+0100\n"
+"PO-Revision-Date: 2003-07-31 18:28+0100\n"
+"Last-Translator: Chris M. Jackson <chris@www.linux.org.uk>\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"
+"Report-Msgid-Bugs-To: \n"
 
 #: data/GNOME_Epiphany_Automation.server.in.h:1
 msgid "Epiphany automation"
@@ -66,7 +67,7 @@ msgstr "Porwr Gwe"
 
 #: data/epiphany.schemas.in.h:1
 msgid "Address of the user's home page."
-msgstr "Cyfeiriad tudal catre Ay defnyddiwr."
+msgstr "Cyfeiriad tudalen cartref y defnyddiwr."
 
 #: data/epiphany.schemas.in.h:2
 msgid "Allow popups"
@@ -689,26 +690,22 @@ msgid "_Disk space:"
 msgstr "Gofod _disg:"
 
 #: data/glade/prefs-dialog.glade.h:41
-msgid "_Language encoding:"
-msgstr "Amgodiad _iaith:"
-
-#: data/glade/prefs-dialog.glade.h:42
 msgid "_Language:"
 msgstr "_Iaith:"
 
-#: data/glade/prefs-dialog.glade.h:43
+#: data/glade/prefs-dialog.glade.h:42
 msgid "_Monospace:"
 msgstr "_Unlled:"
 
-#: data/glade/prefs-dialog.glade.h:44
+#: data/glade/prefs-dialog.glade.h:43
 msgid "_Never accept"
 msgstr "Peidio â derby_n"
 
-#: data/glade/prefs-dialog.glade.h:45
+#: data/glade/prefs-dialog.glade.h:44
 msgid "_Proportional:"
 msgstr "_Cyfrannol:"
 
-#: data/glade/prefs-dialog.glade.h:46
+#: data/glade/prefs-dialog.glade.h:45
 msgid "_Serif:"
 msgstr "_Seriff:"
 
@@ -973,14 +970,14 @@ 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:126
+#: src/bookmarks/ephy-bookmarks-editor.c:153 src/ephy-history-window.c:125
 #: src/ephy-window.c:66
 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:125
+#: src/bookmarks/ephy-bookmarks-editor.c:152 src/ephy-history-window.c:124
 #: src/ephy-window.c:65
 msgid "_File"
 msgstr "_Ffeil"
@@ -1078,7 +1075,7 @@ msgstr "Nid yw'r ffeil wedi cael ei gadw."
 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:438 src/bookmarks/ephy-bookmarks.c:691
+#: embed/ephy-history.c:438 src/bookmarks/ephy-bookmarks.c:689
 msgid "All"
 msgstr "Popeth"
 
@@ -1420,7 +1417,7 @@ msgstr "Gorllewinol (_IBM-850)"
 
 #: embed/mozilla/mozilla-embed-single.cpp:166
 msgid "Western (I_SO-8859-1)"
-msgstr "Gorllewinol I_SO-8859-1)"
+msgstr "Gorllewinol (I_SO-8859-1)"
 
 #: embed/mozilla/mozilla-embed-single.cpp:167
 msgid "Western (IS_O-8859-15)"
@@ -1499,11 +1496,17 @@ msgid "End of current session"
 msgstr "Diwedd y sesiwn cyfredol"
 
 #. *
-#. * translate this as the comma separated list of language ranges
-#. * for your locale, as specified by RFC 2616, 14.4.
-#. * for example for en_NZ locale this could be "en-nz,en-au,en-gb,en"
+#. * This is a comma separated list of language ranges, as specified
+#. * by RFC 2616, 14.4.
+#. * Always include the basic language code last.
+#. *
+#. * Examples:
+#. * "pt"    translation: "pt"
+#. * "pt_BR" translation: "pt-br,pt"
+#. * "zh_CN" translation: "zh-cn,zh"
+#. * "zh_HK" translation: "zh-hk,zh" or maybe "zh-hk,zh-tw,zh"
 #.
-#: embed/mozilla/mozilla-notifiers.cpp:592
+#: embed/mozilla/mozilla-notifiers.cpp:598
 msgid "system-language"
 msgstr "cy-gb,cy"
 
@@ -1516,7 +1519,7 @@ msgstr ""
 "Gwall GConf:\n"
 "  %s"
 
-#: lib/egg/egg-editable-toolbar.c:263
+#: lib/egg/egg-editable-toolbar.c:269
 msgid "_Remove Toolbar"
 msgstr "Gwa_redu'r Bar Offer"
 
@@ -1565,7 +1568,7 @@ msgstr ""
 msgid "Could not display help: %s"
 msgstr "Methwyd dangos cymorth: %s"
 
-#: lib/ephy-langs.c:28 src/prefs-dialog.c:84
+#: lib/ephy-langs.c:28 src/prefs-dialog.c:91
 msgid "Arabic"
 msgstr "Arabig"
 
@@ -1585,27 +1588,27 @@ msgstr "Cyrilig"
 msgid "Devanagari"
 msgstr "Devanagari"
 
-#: lib/ephy-langs.c:33 src/prefs-dialog.c:106
+#: lib/ephy-langs.c:33 src/prefs-dialog.c:113
 msgid "Greek"
 msgstr "Groeg"
 
-#: lib/ephy-langs.c:34 src/prefs-dialog.c:107
+#: lib/ephy-langs.c:34 src/prefs-dialog.c:114
 msgid "Hebrew"
 msgstr "Hebraeg"
 
-#: lib/ephy-langs.c:35 src/prefs-dialog.c:113 src/prefs-dialog.c:152
+#: 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:114 src/prefs-dialog.c:153
+#: 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:91 src/prefs-dialog.c:155
+#: lib/ephy-langs.c:37 src/prefs-dialog.c:98 src/prefs-dialog.c:162
 msgid "Simplified Chinese"
 msgstr "Tsieinëeg Symleiddiedig"
 
-#: lib/ephy-langs.c:38 src/prefs-dialog.c:133
+#: lib/ephy-langs.c:38 src/prefs-dialog.c:140
 msgid "Tamil"
 msgstr "Tamil"
 
@@ -1613,11 +1616,11 @@ msgstr "Tamil"
 msgid "Thai"
 msgstr "Tai"
 
-#: lib/ephy-langs.c:40 src/prefs-dialog.c:92 src/prefs-dialog.c:156
+#: lib/ephy-langs.c:40 src/prefs-dialog.c:99 src/prefs-dialog.c:163
 msgid "Traditional Chinese"
 msgstr "Tsieinëeg Tradoddiadol"
 
-#: lib/ephy-langs.c:41 src/prefs-dialog.c:134
+#: lib/ephy-langs.c:41 src/prefs-dialog.c:141
 msgid "Turkish"
 msgstr "Twrceg"
 
@@ -1693,12 +1696,12 @@ msgstr "_Pynciau:"
 msgid "_Show in bookmarks bar"
 msgstr "Dango_s yn y bar atgofion"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:154 src/ephy-history-window.c:127
+#: src/bookmarks/ephy-bookmarks-editor.c:154 src/ephy-history-window.c:126
 #: src/ephy-window.c:67
 msgid "_View"
 msgstr "_Golwg"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:155 src/ephy-history-window.c:128
+#: src/bookmarks/ephy-bookmarks-editor.c:155 src/ephy-history-window.c:127
 #: src/ephy-window.c:71
 msgid "_Help"
 msgstr "_Cymorth"
@@ -1714,8 +1717,8 @@ msgstr "Creu pwnc newydd"
 
 #. File Menu
 #: src/bookmarks/ephy-bookmarks-editor.c:162
-#: src/bookmarks/ephy-bookmarks-editor.c:862 src/ephy-history-window.c:132
-#: src/ephy-history-window.c:675
+#: src/bookmarks/ephy-bookmarks-editor.c:853 src/ephy-history-window.c:131
+#: src/ephy-history-window.c:666
 msgid "_Open in New Window"
 msgstr "_Agor Mewn Ffenestr Newydd"
 
@@ -1724,8 +1727,8 @@ msgid "Open the selected bookmark in a new window"
 msgstr "Agor yr atgof dewisiedig mewn ffenestr newydd"
 
 #: src/bookmarks/ephy-bookmarks-editor.c:165
-#: src/bookmarks/ephy-bookmarks-editor.c:863 src/ephy-history-window.c:135
-#: src/ephy-history-window.c:676
+#: src/bookmarks/ephy-bookmarks-editor.c:854 src/ephy-history-window.c:134
+#: src/ephy-history-window.c:667
 msgid "Open in New _Tab"
 msgstr "Agor mewn _Tab Newydd"
 
@@ -1741,7 +1744,7 @@ msgstr "_Ailenwi..."
 msgid "Rename the selected bookmark or topic"
 msgstr "Ailenwi'r atgof neu'r pwnc dewisiedig"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:170 src/ephy-history-window.c:138
+#: src/bookmarks/ephy-bookmarks-editor.c:170 src/ephy-history-window.c:137
 msgid "_Delete"
 msgstr "_Dileu"
 
@@ -1773,7 +1776,7 @@ msgstr "_Mewnforio Atgofion..."
 msgid "Import bookmarks from another browser or a bookmarks file"
 msgstr "Mewnforio atgofion o borwr arall neu o ffeil atgofion"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:182 src/ephy-history-window.c:144
+#: src/bookmarks/ephy-bookmarks-editor.c:182 src/ephy-history-window.c:143
 #: src/ephy-window.c:92
 msgid "_Close"
 msgstr "_Cau"
@@ -1783,37 +1786,37 @@ msgid "Close the bookmarks window"
 msgstr "Cau'r ffenestr atgofion"
 
 #. Edit Menu
-#: src/bookmarks/ephy-bookmarks-editor.c:187 src/ephy-history-window.c:149
+#: src/bookmarks/ephy-bookmarks-editor.c:187 src/ephy-history-window.c:148
 #: src/ephy-window.c:97
 msgid "Cu_t"
 msgstr "_Torri"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:188 src/ephy-history-window.c:150
+#: src/bookmarks/ephy-bookmarks-editor.c:188 src/ephy-history-window.c:149
 #: src/ephy-window.c:98
 msgid "Cut the selection"
 msgstr "Torri'r dewisiad"
 
 #: src/bookmarks/ephy-bookmarks-editor.c:190
-#: src/bookmarks/ephy-bookmarks-editor.c:872 src/ephy-history-window.c:152
-#: src/ephy-history-window.c:685 src/ephy-window.c:100
+#: src/bookmarks/ephy-bookmarks-editor.c:863 src/ephy-history-window.c:151
+#: src/ephy-history-window.c:676 src/ephy-window.c:100
 msgid "_Copy"
 msgstr "_Copïo"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:191 src/ephy-history-window.c:153
+#: src/bookmarks/ephy-bookmarks-editor.c:191 src/ephy-history-window.c:152
 #: src/ephy-window.c:101
 msgid "Copy the selection"
 msgstr "Copïo'r dewisiad"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:193 src/ephy-history-window.c:155
+#: src/bookmarks/ephy-bookmarks-editor.c:193 src/ephy-history-window.c:154
 #: src/ephy-window.c:103
 msgid "_Paste"
 msgstr "_Gludo"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:194 src/ephy-history-window.c:156
+#: src/bookmarks/ephy-bookmarks-editor.c:194 src/ephy-history-window.c:155
 msgid "Paste the clipboard"
 msgstr "Gludo'r clipfwrdd"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:196 src/ephy-history-window.c:158
+#: src/bookmarks/ephy-bookmarks-editor.c:196 src/ephy-history-window.c:157
 #: src/ephy-window.c:106
 msgid "Select _All"
 msgstr "Dewis _Popeth"
@@ -1823,32 +1826,32 @@ msgid "Select all bookmarks or text"
 msgstr "Dewis pob atgof neu destun"
 
 #. View Menu
-#: src/bookmarks/ephy-bookmarks-editor.c:201 src/ephy-history-window.c:166
+#: 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:167
+#: 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:169
+#: 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:170
+#: 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:172
+#: 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:173
+#: 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:177
+#: src/bookmarks/ephy-bookmarks-editor.c:212 src/ephy-history-window.c:176
 #: src/ephy-window.c:207
 msgid "_Contents"
 msgstr "_Cynnwys"
@@ -1857,12 +1860,12 @@ msgstr "_Cynnwys"
 msgid "Display bookmarks help"
 msgstr "Dangos cymorth atgoftion"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:215 src/ephy-history-window.c:180
+#: src/bookmarks/ephy-bookmarks-editor.c:215 src/ephy-history-window.c:179
 #: src/ephy-window.c:210
 msgid "_About"
 msgstr "_Ynghylch"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:216 src/ephy-history-window.c:181
+#: src/bookmarks/ephy-bookmarks-editor.c:216 src/ephy-history-window.c:180
 #: src/ephy-window.c:211
 msgid "Display credits for the web browser creators"
 msgstr "Dangos clodau creuwyr y porwr gwe"
@@ -1891,31 +1894,31 @@ msgstr "Atgofion Galeon"
 msgid "Konqueror bookmarks"
 msgstr "Atgofion Konqueror"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:857 src/ephy-history-window.c:670
+#: src/bookmarks/ephy-bookmarks-editor.c:848 src/ephy-history-window.c:661
 msgid "_Open in New Windows"
 msgstr "_Agor mewn Ffenestri Newydd"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:858 src/ephy-history-window.c:671
+#: src/bookmarks/ephy-bookmarks-editor.c:849 src/ephy-history-window.c:662
 msgid "Open in New _Tabs"
 msgstr "Agor mewn _Tabiau Newydd"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:868 src/ephy-history-window.c:681
+#: src/bookmarks/ephy-bookmarks-editor.c:859 src/ephy-history-window.c:672
 msgid "_Copy Address"
 msgstr "_Copïo'r Cyfeiriad"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:1115 src/ephy-history-window.c:886
+#: src/bookmarks/ephy-bookmarks-editor.c:1106 src/ephy-history-window.c:877
 msgid "_Search:"
 msgstr "_Chwilio:"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:1202 src/ephy-window.c:672
+#: src/bookmarks/ephy-bookmarks-editor.c:1215 src/ephy-window.c:672
 msgid "Bookmarks"
 msgstr "Atgofion"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:1276
+#: src/bookmarks/ephy-bookmarks-editor.c:1291
 msgid "Topics"
 msgstr "Pynciau"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:1333 src/ephy-history-window.c:1074
+#: src/bookmarks/ephy-bookmarks-editor.c:1352 src/ephy-history-window.c:1071
 msgid "Title"
 msgstr "Teitl"
 
@@ -1961,11 +1964,11 @@ msgstr "Teithio"
 msgid "Work"
 msgstr "Gwaith"
 
-#: src/bookmarks/ephy-bookmarks.c:726
+#: src/bookmarks/ephy-bookmarks.c:724
 msgid "Most Visited"
 msgstr "Ymwelir Mwyaf"
 
-#: src/bookmarks/ephy-bookmarks.c:743
+#: src/bookmarks/ephy-bookmarks.c:741
 msgid "Not Categorized"
 msgstr "Heb eu Trefnu"
 
@@ -1986,77 +1989,77 @@ msgstr "Atgof Ddyblyg"
 msgid "A bookmark titled %s already exists for this page."
 msgstr "Mae atgof a'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:405
+#: src/ephy-go-action.c:80 src/ephy-go-action.c:97 src/toolbar.c:347
 msgid "Go"
 msgstr "Mynd"
 
-#: src/ephy-history-window.c:133
+#: src/ephy-history-window.c:132
 msgid "Open the selected history link in a new window"
 msgstr "Agor y cyswllt hanes ddewisiedig mewn ffenestr newydd"
 
-#: src/ephy-history-window.c:136
+#: src/ephy-history-window.c:135
 msgid "Open the selected history link in a new tab"
 msgstr "Agor y cyswllt hanes ddewisiedig mewn tab newydd"
 
-#: src/ephy-history-window.c:139
+#: src/ephy-history-window.c:138
 msgid "Delete the selected history link"
 msgstr "Dileu'r cyswllt hanes dewisiedig"
 
-#: src/ephy-history-window.c:141
+#: src/ephy-history-window.c:140
 msgid "Boo_kmark Link..."
 msgstr "_Cyswllt Nôd Tudalen..."
 
-#: src/ephy-history-window.c:142
+#: src/ephy-history-window.c:141
 msgid "Bookmark the selected history link"
 msgstr "Creu atgof o'r cyswllt hanes a ddewiswyd"
 
-#: src/ephy-history-window.c:145
+#: src/ephy-history-window.c:144
 msgid "Close the history window"
 msgstr "Cau'r ffenestr hanes"
 
-#: src/ephy-history-window.c:159
+#: src/ephy-history-window.c:158
 msgid "Select all history links or text"
 msgstr "Dewis pob cyswllt hanes neu destun"
 
-#: src/ephy-history-window.c:161
+#: src/ephy-history-window.c:160
 msgid "C_lear History"
 msgstr "C_lirio'r Hanes"
 
-#: src/ephy-history-window.c:162
+#: src/ephy-history-window.c:161
 msgid "Clear your browsing history"
 msgstr "Clirio eich hanes pori"
 
-#: src/ephy-history-window.c:178
+#: src/ephy-history-window.c:177
 msgid "Display history help"
 msgstr "Dangos cymorth hanes"
 
-#: src/ephy-history-window.c:224
+#: src/ephy-history-window.c:223
 msgid "Clear history"
 msgstr "Clirio'r hanes"
 
-#: src/ephy-history-window.c:256
+#: src/ephy-history-window.c:255
 msgid "C_lear"
 msgstr "C_lirio"
 
-#: src/ephy-history-window.c:278
+#: src/ephy-history-window.c:277
 msgid "Clear browsing history?"
 msgstr "Clirio eich hanes pori?"
 
-#: src/ephy-history-window.c:285
+#: src/ephy-history-window.c:284
 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:960
+#: src/ephy-history-window.c:951
 msgid "History"
 msgstr "Hanes"
 
-#: src/ephy-history-window.c:1027
+#: src/ephy-history-window.c:1021
 msgid "Sites"
 msgstr "Safleoedd"
 
-#: src/ephy-history-window.c:1079
+#: src/ephy-history-window.c:1076
 msgid "Address"
 msgstr "Cyfeiriadau"
 
@@ -2616,39 +2619,39 @@ msgstr ""
 msgid "Security level: %s"
 msgstr "Safon Diogelwch: %s"
 
-#: src/pdm-dialog.c:250
+#: src/pdm-dialog.c:253
 msgid "Host"
 msgstr "Gwesteiwr"
 
-#: src/pdm-dialog.c:262
+#: src/pdm-dialog.c:265
 msgid "User Name"
 msgstr "Enw Defnyddiwr"
 
-#: src/pdm-dialog.c:307
+#: src/pdm-dialog.c:313
 msgid "Domain"
 msgstr "Parth"
 
-#: src/pdm-dialog.c:319
+#: src/pdm-dialog.c:325
 msgid "Name"
 msgstr "Enw"
 
-#: src/pdm-dialog.c:694
+#: src/pdm-dialog.c:705
 msgid "Cookie Properties"
 msgstr "Priodweddau Bisgedi"
 
-#: src/pdm-dialog.c:707
+#: src/pdm-dialog.c:718
 msgid "Value:"
 msgstr "Gwerth:"
 
-#: src/pdm-dialog.c:721
+#: src/pdm-dialog.c:732
 msgid "Path:"
 msgstr "Llwybr:"
 
-#: src/pdm-dialog.c:735
+#: src/pdm-dialog.c:746
 msgid "Secure:"
 msgstr "Diogel:"
 
-#: src/pdm-dialog.c:749
+#: src/pdm-dialog.c:760
 msgid "Expire:"
 msgstr "Darfod:"
 
@@ -2680,211 +2683,218 @@ msgstr "Cau"
 msgid "Close print preview"
 msgstr "Cau'e rhagolwg argraffu"
 
-#: src/prefs-dialog.c:81
+#. *
+#. * please translate like this: "<your language> (System setting)"
+#. * Examples:
+#. * "de"    translation: "Deutsch (Systemeinstellung)"
+#. * "en_AU" translation: "English, Australia (System setting)" or
+#. *                      "Australian English (System setting)"
+#.
+#: src/prefs-dialog.c:88
 msgid "System language"
 msgstr "Iaith y system"
 
-#: src/prefs-dialog.c:82
+#: src/prefs-dialog.c:89
 msgid "Afrikaans"
 msgstr "Afrikaans"
 
-#: src/prefs-dialog.c:83
+#: src/prefs-dialog.c:90
 msgid "Albanian"
 msgstr "Albaneg"
 
-#: src/prefs-dialog.c:85
+#: src/prefs-dialog.c:92
 msgid "Azerbaijani"
 msgstr "Azerbaijani"
 
-#: src/prefs-dialog.c:86
+#: src/prefs-dialog.c:93
 msgid "Basque"
 msgstr "Basg"
 
-#: src/prefs-dialog.c:87
+#: src/prefs-dialog.c:94
 msgid "Breton"
 msgstr "Llydaweg"
 
-#: src/prefs-dialog.c:88
+#: src/prefs-dialog.c:95
 msgid "Bulgarian"
 msgstr "Bwlgareg"
 
-#: src/prefs-dialog.c:89
+#: src/prefs-dialog.c:96
 msgid "Byelorussian"
 msgstr "Belorwseg"
 
-#: src/prefs-dialog.c:90
+#: src/prefs-dialog.c:97
 msgid "Catalan"
 msgstr "Catalaneg"
 
-#: src/prefs-dialog.c:93 src/prefs-dialog.c:150
+#: src/prefs-dialog.c:100 src/prefs-dialog.c:157
 msgid "Chinese"
 msgstr "Tsieinëeg"
 
-#: src/prefs-dialog.c:94
+#: src/prefs-dialog.c:101
 msgid "Croatian"
 msgstr "Croateg"
 
-#: src/prefs-dialog.c:95
+#: src/prefs-dialog.c:102
 msgid "Czech"
 msgstr "Tsieceg"
 
-#: src/prefs-dialog.c:96
+#: src/prefs-dialog.c:103
 msgid "Danish"
 msgstr "Daneg"
 
-#: src/prefs-dialog.c:97
+#: src/prefs-dialog.c:104
 msgid "Dutch"
 msgstr "Iseldireg"
 
-#: src/prefs-dialog.c:98
+#: src/prefs-dialog.c:105
 msgid "English"
 msgstr "Saesneg"
 
-#: src/prefs-dialog.c:99
+#: src/prefs-dialog.c:106
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: src/prefs-dialog.c:100
+#: src/prefs-dialog.c:107
 msgid "Estonian"
 msgstr "Estoneg"
 
-#: src/prefs-dialog.c:101
+#: src/prefs-dialog.c:108
 msgid "Faeroese"
 msgstr "Ffaroeg"
 
-#: src/prefs-dialog.c:102
+#: src/prefs-dialog.c:109
 msgid "Finnish"
 msgstr "Ffineg"
 
-#: src/prefs-dialog.c:103
+#: src/prefs-dialog.c:110
 msgid "French"
 msgstr "Ffrangeg"
 
-#: src/prefs-dialog.c:104
+#: src/prefs-dialog.c:111
 msgid "Galician"
 msgstr "Galiseg"
 
-#: src/prefs-dialog.c:105
+#: src/prefs-dialog.c:112
 msgid "German"
 msgstr "Almaeneg"
 
-#: src/prefs-dialog.c:108
+#: src/prefs-dialog.c:115
 msgid "Hungarian"
 msgstr "Hwngareg"
 
-#: src/prefs-dialog.c:109
+#: src/prefs-dialog.c:116
 msgid "Icelandic"
 msgstr "Islandeg"
 
-#: src/prefs-dialog.c:110
+#: src/prefs-dialog.c:117
 msgid "Indonesian"
 msgstr "Indoneseg"
 
-#: src/prefs-dialog.c:111
+#: src/prefs-dialog.c:118
 msgid "Irish"
 msgstr "Gwyddeleg"
 
-#: src/prefs-dialog.c:112
+#: src/prefs-dialog.c:119
 msgid "Italian"
 msgstr "Eidaleg"
 
-#: src/prefs-dialog.c:115
+#: src/prefs-dialog.c:122
 msgid "Latvian"
 msgstr "Latfieg"
 
-#: src/prefs-dialog.c:116
+#: src/prefs-dialog.c:123
 msgid "Lithuanian"
 msgstr "Lithiwaneg"
 
-#: src/prefs-dialog.c:117
+#: src/prefs-dialog.c:124
 msgid "Macedonian"
 msgstr "Macedoneg"
 
-#: src/prefs-dialog.c:118
+#: src/prefs-dialog.c:125
 msgid "Malay"
 msgstr "Malay"
 
-#: src/prefs-dialog.c:119
+#: src/prefs-dialog.c:126
 msgid "Norwegian/Nynorsk"
 msgstr "Norwyeg/Nynorsk"
 
-#: src/prefs-dialog.c:120
+#: src/prefs-dialog.c:127
 msgid "Norwegian/Bokmal"
 msgstr "Norwyeg/Bokmaal"
 
-#: src/prefs-dialog.c:121
+#: src/prefs-dialog.c:128
 msgid "Norwegian"
 msgstr "Norwyeg"
 
-#: src/prefs-dialog.c:122
+#: src/prefs-dialog.c:129
 msgid "Polish"
 msgstr "Pwyleg"
 
-#: src/prefs-dialog.c:123
+#: src/prefs-dialog.c:130
 msgid "Portuguese"
 msgstr "Portiwgaleg"
 
-#: src/prefs-dialog.c:124
+#: src/prefs-dialog.c:131
 msgid "Portuguese of Brazil"
 msgstr "Portiwgaleg Brasil"
 
-#: src/prefs-dialog.c:125
+#: src/prefs-dialog.c:132
 msgid "Romanian"
 msgstr "Romaneg"
 
-#: src/prefs-dialog.c:126 src/prefs-dialog.c:154
+#: src/prefs-dialog.c:133 src/prefs-dialog.c:161
 msgid "Russian"
 msgstr "Rwsieg"
 
-#: src/prefs-dialog.c:127
+#: src/prefs-dialog.c:134
 msgid "Scottish"
 msgstr "Gaeleg"
 
-#: src/prefs-dialog.c:128
+#: src/prefs-dialog.c:135
 msgid "Serbian"
 msgstr "Serbieg"
 
-#: src/prefs-dialog.c:129
+#: src/prefs-dialog.c:136
 msgid "Slovak"
 msgstr "Slovaceg"
 
-#: src/prefs-dialog.c:130
+#: src/prefs-dialog.c:137
 msgid "Slovenian"
 msgstr "Slofeneg"
 
-#: src/prefs-dialog.c:131
+#: src/prefs-dialog.c:138
 msgid "Spanish"
 msgstr "Sbaeneg"
 
-#: src/prefs-dialog.c:132
+#: src/prefs-dialog.c:139
 msgid "Swedish"
 msgstr "Swedeg"
 
-#: src/prefs-dialog.c:135 src/prefs-dialog.c:158
+#: src/prefs-dialog.c:142 src/prefs-dialog.c:165
 msgid "Ukrainian"
 msgstr "Wcraineg"
 
-#: src/prefs-dialog.c:136
+#: src/prefs-dialog.c:143
 msgid "Vietnamese"
 msgstr "Fietnameg"
 
-#: src/prefs-dialog.c:137
+#: src/prefs-dialog.c:144
 msgid "Walloon"
 msgstr "Walwneg"
 
-#: src/prefs-dialog.c:149
+#: src/prefs-dialog.c:156
 msgid "Off"
 msgstr "I Ffwrdd"
 
-#: src/prefs-dialog.c:151
+#: src/prefs-dialog.c:158
 msgid "East Asian"
 msgstr "Dwyrain Asia"
 
-#: src/prefs-dialog.c:157
+#: src/prefs-dialog.c:164
 msgid "Universal"
 msgstr "Cyffredinol"
 
-#: src/prefs-dialog.c:943
+#: src/prefs-dialog.c:950
 #, c-format
 msgid "Custom [%s]"
 msgstr "Addasiedig [%s]"
@@ -2912,55 +2922,55 @@ msgstr ""
 msgid "You can recover the opened tabs and windows."
 msgstr "Gallwch adfer y tabiau a ffenestri a oedd ar agor."
 
-#: src/toolbar.c:326
+#: src/toolbar.c:268
 msgid "Back"
 msgstr "Nôl"
 
-#: src/toolbar.c:328
+#: src/toolbar.c:270
 msgid "Go back"
 msgstr "Mynd yn ôl"
 
-#: src/toolbar.c:339
+#: src/toolbar.c:281
 msgid "Forward"
 msgstr "Ymlaen"
 
-#: src/toolbar.c:341
+#: src/toolbar.c:283
 msgid "Go forward"
 msgstr "Mynd ymlaen"
 
-#: src/toolbar.c:352
+#: src/toolbar.c:294
 msgid "Up"
 msgstr "I Fyny"
 
-#: src/toolbar.c:354
+#: src/toolbar.c:296
 msgid "Go up"
 msgstr "Mynd i fyny"
 
-#: src/toolbar.c:365
+#: src/toolbar.c:307
 msgid "Spinner"
 msgstr "Troellydd"
 
-#: src/toolbar.c:375
+#: src/toolbar.c:317
 msgid "Address Entry"
 msgstr "Cofnod Cyfeiriad"
 
-#: src/toolbar.c:377
+#: src/toolbar.c:319
 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"
 
-#: src/toolbar.c:386
+#: src/toolbar.c:328
 msgid "Zoom"
 msgstr "Chwyddo"
 
-#: src/toolbar.c:387
+#: src/toolbar.c:329
 msgid "Adjust the text size"
 msgstr "Addasu maint y testun"
 
-#: src/toolbar.c:397
+#: src/toolbar.c:339
 msgid "Favicon"
 msgstr "Hoffeicon"
 
-#: src/toolbar.c:407
+#: src/toolbar.c:349
 msgid "Go to the address entered in the address entry"
 msgstr "Mynd i'r cyfeiriad a roddwyd yn y maes cyfeiriad"
 
@@ -2983,12 +2993,15 @@ msgstr "_Ychwanegu Bar Offer Newydd"
 #. Translator credits
 #: src/window-commands.c:747
 msgid "translator_credits"
-msgstr "Keith Willoughby, Dafydd Harries"
+msgstr "Keith Willoughby, Dafydd Harries, Chris M. Jackson"
 
 #: src/window-commands.c:775
 msgid "A GNOME browser based on Mozilla"
 msgstr "Porwr GNOME yn seiliedig ar Mozilla"
 
+#~ msgid "_Language encoding:"
+#~ msgstr "Amgodiad _iaith:"
+
 #~ msgid "When to compare cached copy"
 #~ msgstr "Pryd i gymharu copi sydd wedi'i storio"