[epiphany] Updated Traditional Chinese translation(Hong Kong and Taiwan)



commit b8157349612cd043892ebdf180a2f3ab106fd39e
Author: Cheng-Chia Tseng <pswo10680 gmail com>
Date:   Wed Apr 11 09:27:13 2012 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po |  944 +++++++++++++++++++++++++++++------------------------------
 po/zh_TW.po |  948 +++++++++++++++++++++++++++++------------------------------
 2 files changed, 928 insertions(+), 964 deletions(-)
---
diff --git a/po/zh_HK.po b/po/zh_HK.po
index e0cf42d..5df3b5f 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -13,9 +13,9 @@ msgstr ""
 "Project-Id-Version: epiphany 3.3.91\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=epiphany\n"
-"POT-Creation-Date: 2012-03-08 15:57+0800\n"
-"PO-Revision-Date: 2012-03-08 15:57+0800\n"
-"Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
+"POT-Creation-Date: 2012-04-11 09:26+0800\n"
+"PO-Revision-Date: 2012-04-11 09:26+0800\n"
+"Last-Translator: Cheng-Chia Tseng <pswo10680 gmail com>\n"
 "Language-Team: Chinese (Hong Kong) <community linuxhall org>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
@@ -51,7 +51,7 @@ msgid "Epiphany Web Browser"
 msgstr "Epiphany çéçèå"
 
 #: ../data/epiphany.desktop.in.in.h:3 ../src/ephy-main.c:73
-#: ../src/ephy-main.c:321 ../src/ephy-main.c:462 ../src/window-commands.c:1228
+#: ../src/ephy-main.c:321 ../src/ephy-main.c:466 ../src/window-commands.c:1212
 msgid "Web"
 msgstr "çé"
 
@@ -59,219 +59,16 @@ msgstr "çé"
 msgid "Web Browser"
 msgstr "çéçèå"
 
-#: ../data/ui/epiphany.ui.h:1
-msgid "<b>_Automatic</b>"
-msgstr "<b>èå(_A)ï</b>"
-
-#: ../data/ui/epiphany.ui.h:2
-msgid "<b>_Use a different encoding:</b>"
-msgstr "äçäåççç(_U)ï"
-
-#: ../data/ui/epiphany.ui.h:3
-msgid "Content:"
-msgstr "åå"
-
-#: ../data/ui/epiphany.ui.h:4
-msgid "Cookie properties"
-msgstr "Cookie åæ"
-
-#: ../data/ui/epiphany.ui.h:5 ../data/ui/prefs-dialog.ui.h:8
-msgid "Cookies"
-msgstr "Cookie"
-
-#: ../data/ui/epiphany.ui.h:6
-msgid "Expires:"
-msgstr "æéï"
-
-#: ../data/ui/epiphany.ui.h:7 ../data/ui/prefs-dialog.ui.h:22
-msgid "Passwords"
-msgstr "åç"
-
-#: ../data/ui/epiphany.ui.h:8
-msgid "Path:"
-msgstr "èåï"
-
-#: ../data/ui/epiphany.ui.h:9
-msgid "Personal Data"
-msgstr "åäèæ"
-
-#: ../data/ui/epiphany.ui.h:10
-msgid "Send for:"
-msgstr "åéçï"
-
-#: ../data/ui/epiphany.ui.h:11
-msgid "Text Encoding"
-msgstr "åççç"
-
-#: ../data/ui/epiphany.ui.h:12 ../src/ephy-encoding-menu.c:338
-msgid "Use the encoding specified by the document"
-msgstr "äçæäæåçççæå"
-
-#: ../data/ui/epiphany.ui.h:13
-msgid "_Show passwords"
-msgstr "éçåç(_S)"
-
-#. Refers to "Only from sites you visit" option under Cookies.
-#: ../data/ui/prefs-dialog.ui.h:2
-msgid "<small>For example, not from advertisers on these sites</small>"
-msgstr "<small>äåïäèäèéäçççåå</small>"
-
-#: ../data/ui/prefs-dialog.ui.h:3
-msgid "A_utomatically open downloaded files"
-msgstr "èåäèäéåææ(_U)"
-
-#: ../data/ui/prefs-dialog.ui.h:4
-msgid "Add Language"
-msgstr "ååèè"
-
-#: ../data/ui/prefs-dialog.ui.h:5
-msgid "Allow popup _windows"
-msgstr "åèåååèç(_W)"
-
-#: ../data/ui/prefs-dialog.ui.h:6
-msgid "Choose a l_anguage:"
-msgstr "éæèè(_A)ï"
-
-#. Translators: the mnemonic shouldn't conflict with any of the
-#. * standard items in the GtkEntry context menu (Cut, Copy, Paste, Delete,
-#. * Select All, Input Methods and Insert Unicode control character.)
-#.
-#: ../data/ui/prefs-dialog.ui.h:7 ../lib/widgets/ephy-location-entry.c:462
-#: ../src/ephy-history-window.c:231 ../src/pdm-dialog.c:355
-msgid "Cl_ear"
-msgstr "æé(_E)"
-
-#: ../data/ui/prefs-dialog.ui.h:9
-msgid "De_fault:"
-msgstr "éè(_F)ï"
-
-#. If we don't have XDG user dirs info, return an educated guess.
-#: ../data/ui/prefs-dialog.ui.h:10 ../lib/ephy-file-helpers.c:116
-msgid "Downloads"
-msgstr "äè"
-
-#: ../data/ui/prefs-dialog.ui.h:11
-msgid "Enable Java_Script"
-msgstr "åç Java_Script"
-
-#: ../data/ui/prefs-dialog.ui.h:12
-msgid "Enable _plugins"
-msgstr "åçåæçå(_P)"
-
-#: ../data/ui/prefs-dialog.ui.h:13 ../src/ephy-encoding-dialog.c:302
-msgid "Encodings"
-msgstr "çç(_E)"
-
-#: ../data/ui/prefs-dialog.ui.h:14
-msgid "Fonts"
-msgstr "åå"
-
-#: ../data/ui/prefs-dialog.ui.h:15
-msgid "Fonts & Style"
-msgstr "ååèæå"
-
-#: ../data/ui/prefs-dialog.ui.h:16
-msgid "General"
-msgstr "äè"
-
-#: ../data/ui/prefs-dialog.ui.h:17 ../src/prefs-dialog.c:774
-msgid "Language"
-msgstr "èè"
-
-#: ../data/ui/prefs-dialog.ui.h:18
-msgid "Languages"
-msgstr "èè"
-
-#: ../data/ui/prefs-dialog.ui.h:19
-msgid "MB"
-msgstr "MB"
-
-#: ../data/ui/prefs-dialog.ui.h:20
-msgid "Monospace font:"
-msgstr "çåååï"
-
-#: ../data/ui/prefs-dialog.ui.h:21
-msgid "Only _from sites you visit"
-msgstr "åäèäçèççç(_F)"
-
-#: ../data/ui/prefs-dialog.ui.h:23
-msgid "Preferences"
-msgstr "ååèå"
-
-#: ../data/ui/prefs-dialog.ui.h:24
-msgid "Privacy"
-msgstr "çé"
-
-#: ../data/ui/prefs-dialog.ui.h:25
-msgid "Sans serif font:"
-msgstr "çèçååï"
-
-#: ../data/ui/prefs-dialog.ui.h:26
-msgid "Serif font:"
-msgstr "èçååï"
-
-#: ../data/ui/prefs-dialog.ui.h:27
-msgid "Spell checking"
-msgstr "æåææ"
-
-#: ../data/ui/prefs-dialog.ui.h:28
-msgid "Style"
-msgstr "æå"
-
-#: ../data/ui/prefs-dialog.ui.h:29
-msgid "Temporary Files"
-msgstr "æåæ"
-
-#: ../data/ui/prefs-dialog.ui.h:30
-msgid "Use custom _stylesheet"
-msgstr "äçèéæåè(_S)"
-
-#: ../data/ui/prefs-dialog.ui.h:31
-msgid "Web Content"
-msgstr "çéåå"
-
-#: ../data/ui/prefs-dialog.ui.h:32
-msgid "_Always accept"
-msgstr "çææå(_A)"
-
-#: ../data/ui/prefs-dialog.ui.h:33
-msgid "_Disk space:"
-msgstr "çççé(_D)ï"
-
-#: ../data/ui/prefs-dialog.ui.h:34
-msgid "_Download folder:"
-msgstr "äèèæå(_D)"
-
-#: ../data/ui/prefs-dialog.ui.h:35
-msgid "_Edit Stylesheetâ"
-msgstr "çèæåè(_E)â"
-
-#: ../data/ui/prefs-dialog.ui.h:36
-msgid "_Enable spell checking"
-msgstr "åçæåææ(_E)"
-
-#: ../data/ui/prefs-dialog.ui.h:37
-msgid "_Never accept"
-msgstr "æäæå(_N)"
-
-#: ../data/ui/prefs-dialog.ui.h:38
-msgid "_Remember passwords"
-msgstr "èéåç(_R)"
-
-#: ../data/ui/prefs-dialog.ui.h:39
-msgid "_Use system fonts"
-msgstr "äçççåå(_U)"
-
 #: ../embed/ephy-download.c:217
 msgctxt "file type"
 msgid "Unknown"
 msgstr "äæ"
 
-#: ../embed/ephy-embed.c:806
+#: ../embed/ephy-embed.c:692
 msgid "Web Inspector"
 msgstr "çéææå"
 
-#: ../embed/ephy-embed-shell.c:264
+#: ../embed/ephy-embed-shell.c:207
 msgid "Epiphany can't be used now. Initialization failed."
 msgstr "Epiphany çåçæäçãåååçååæã"
 
@@ -604,20 +401,6 @@ msgstr "èåç (UTF-3_2BE)"
 msgid "Unknown (%s)"
 msgstr "äæ (%s)"
 
-#: ../embed/ephy-history.c:474
-msgid "All"
-msgstr "åé"
-
-#: ../embed/ephy-history.c:640
-#: ../lib/history/ephy-history-service-hosts-table.c:360
-msgid "Others"
-msgstr "åå"
-
-#: ../embed/ephy-history.c:646
-#: ../lib/history/ephy-history-service-hosts-table.c:364
-msgid "Local files"
-msgstr "ææææ"
-
 #: ../embed/ephy-request-about.c:101 ../embed/ephy-request-about.c:104
 msgid "Installed plugins"
 msgstr "ååèçåæçå"
@@ -666,15 +449,15 @@ msgstr "åèæï"
 #. characters
 #. ms
 #. RELOAD_DELAY * RELOAD_DELAY_MAX_TICKS = 10 s
-#: ../embed/ephy-web-view.c:71 ../embed/ephy-web-view.c:3470
+#: ../embed/ephy-web-view.c:70 ../embed/ephy-web-view.c:3441
 msgid "Blank page"
 msgstr "ççéé"
 
-#: ../embed/ephy-web-view.c:760
+#: ../embed/ephy-web-view.c:770
 msgid "_Not now"
 msgstr "çåäè(_N)"
 
-#: ../embed/ephy-web-view.c:765
+#: ../embed/ephy-web-view.c:775
 msgid "_Store password"
 msgstr "åååç(_S)"
 
@@ -682,41 +465,45 @@ msgstr "åååç(_S)"
 #. * hostname where this is happening. Example: gnome gmail com and
 #. * mail.google.com.
 #.
-#: ../embed/ephy-web-view.c:776
+#: ../embed/ephy-web-view.c:786
 #, c-format
 msgid ""
 "<big>Would you like to store the password for <b>%s</b> in <b>%s</b>?</big>"
 msgstr "<big>æåèåå <b>%s</b> å <b>%s</b> çåçï</big>"
 
+#: ../embed/ephy-web-view.c:1133
+msgid "Plugins"
+msgstr "åæçå"
+
 #. Translators: Geolocation policy for a specific site.
-#: ../embed/ephy-web-view.c:1747
+#: ../embed/ephy-web-view.c:1784
 msgid "Deny"
 msgstr "çæ"
 
 #. Translators: Geolocation policy for a specific site.
-#: ../embed/ephy-web-view.c:1753
+#: ../embed/ephy-web-view.c:1790
 msgid "Allow"
 msgstr "åè"
 
-#: ../embed/ephy-web-view.c:1760
+#: ../embed/ephy-web-view.c:1797
 #, c-format
 msgid "The page at <b>%s</b> wants to know your location."
 msgstr "å <b>%s</b> ççéæèçéäçäçã"
 
-#: ../embed/ephy-web-view.c:2040
+#: ../embed/ephy-web-view.c:2118
 msgid "None specified"
 msgstr "æææå"
 
-#: ../embed/ephy-web-view.c:2049 ../embed/ephy-web-view.c:2067
+#: ../embed/ephy-web-view.c:2127 ../embed/ephy-web-view.c:2145
 #, c-format
 msgid "Oops! Error loading %s"
 msgstr "åïèå %s æççéè"
 
-#: ../embed/ephy-web-view.c:2051
+#: ../embed/ephy-web-view.c:2129
 msgid "Oops! It was not possible to show this website"
 msgstr "åïçæéçéåçç"
 
-#: ../embed/ephy-web-view.c:2052
+#: ../embed/ephy-web-view.c:2130
 #, c-format
 msgid ""
 "<p>The website at <strong>%s</strong> seems to be unavailable. The precise "
@@ -725,15 +512,15 @@ msgid ""
 "is working correctly.</p>"
 msgstr "<p>çç <strong>%s</strong> åèçæäçïæçäèéèçï</p><p><em>%s</em></p><p>ååèèææééæçååæçäåãäèåäææäèçéçæåæåéäã</p>"
 
-#: ../embed/ephy-web-view.c:2061
+#: ../embed/ephy-web-view.c:2139
 msgid "Try again"
 msgstr "åèäæ"
 
-#: ../embed/ephy-web-view.c:2069
+#: ../embed/ephy-web-view.c:2147
 msgid "Oops! This site might have caused the web browser to close unexpectedly"
 msgstr "åïéåççåèåéæçéçèåæéæçéé"
 
-#: ../embed/ephy-web-view.c:2071
+#: ../embed/ephy-web-view.c:2149
 #, c-format
 msgid ""
 "<p>This page was loading when the web browser closed unexpectedly.</"
@@ -741,33 +528,29 @@ msgid ""
 "report the problem to the <strong>%s</strong> developers.</p>"
 msgstr "<p>éåçéååèåäçèååçåééäã</p><p>åæäéæèåèééäçåèååççéåçæãåæççéæïèååéååç <strong>%s</strong> éçéäã</p>"
 
-#: ../embed/ephy-web-view.c:2079
+#: ../embed/ephy-web-view.c:2157
 msgid "Load again anyway"
 msgstr "åååæèå"
 
-#: ../embed/ephy-web-view.c:2355
+#: ../embed/ephy-web-view.c:2428
 #, c-format
 msgid "http://www.google.com/search?q=%s&ie=UTF-8&oe=UTF-8";
 msgstr "http://www.google.com.tw/search?q=%s&ie=UTF-8&oe=UTF-8";
 
-#: ../embed/ephy-web-view.c:2641
-msgid "Plugins"
-msgstr "åæçå"
-
 #. translators: %s here is the address of the web page
-#: ../embed/ephy-web-view.c:2748
+#: ../embed/ephy-web-view.c:2773
 #, c-format
 msgid "Loading â%sââ"
 msgstr "æåèåâ%sââ"
 
-#: ../embed/ephy-web-view.c:2750
+#: ../embed/ephy-web-view.c:2775
 msgid "Loadingâ"
 msgstr "èåäâ"
 
 #. Translators: this is the directory name to store auxilary files
 #. * when saving html files.
 #.
-#: ../embed/ephy-web-view.c:3674
+#: ../embed/ephy-web-view.c:3645
 #, c-format
 msgid "%s Files"
 msgstr "%s åææ"
@@ -807,34 +590,6 @@ msgstr "äèåéæä URI èãType=Linkãæééç"
 msgid "Not a launchable item"
 msgstr "äæåäååçéç"
 
-#: ../lib/egg/eggsmclient.c:225
-msgid "Disable connection to session manager"
-msgstr "åçåäæéæçççåçéç"
-
-#: ../lib/egg/eggsmclient.c:228
-msgid "Specify file containing saved configuration"
-msgstr "æååååååçæçææ"
-
-#: ../lib/egg/eggsmclient.c:228 ../src/ephy-main.c:88 ../src/ephy-main.c:90
-msgid "FILE"
-msgstr "ææ"
-
-#: ../lib/egg/eggsmclient.c:231
-msgid "Specify session management ID"
-msgstr "æåäæéæçç ID"
-
-#: ../lib/egg/eggsmclient.c:231
-msgid "ID"
-msgstr "ID"
-
-#: ../lib/egg/eggsmclient.c:252
-msgid "Session management options:"
-msgstr "äæéæççééï"
-
-#: ../lib/egg/eggsmclient.c:253
-msgid "Show session management options"
-msgstr "éçäæéæççéé"
-
 #: ../lib/ephy-file-chooser.c:382
 msgid "All supported types"
 msgstr "ææææçéå"
@@ -852,21 +607,26 @@ msgid "All files"
 msgstr "ææææ"
 
 #. If we don't have XDG user dirs info, return an educated guess.
+#: ../lib/ephy-file-helpers.c:116 ../src/prefs-dialog.ui.h:10
+msgid "Downloads"
+msgstr "äè"
+
+#. If we don't have XDG user dirs info, return an educated guess.
 #: ../lib/ephy-file-helpers.c:162
 msgid "Desktop"
 msgstr "æé"
 
-#: ../lib/ephy-file-helpers.c:325
+#: ../lib/ephy-file-helpers.c:326
 #, c-format
 msgid "Could not create a temporary directory in â%sâ."
 msgstr "çæåâ%sâåçæåçéã"
 
-#: ../lib/ephy-file-helpers.c:421
+#: ../lib/ephy-file-helpers.c:422
 #, c-format
 msgid "The file â%sâ exists. Please move it out of the way."
 msgstr "ææâ%sâ åçååïèåååçèååäçã"
 
-#: ../lib/ephy-file-helpers.c:432
+#: ../lib/ephy-file-helpers.c:433
 #, c-format
 msgid "Failed to create directory â%sâ."
 msgstr "çæåççéâ%sâã"
@@ -993,6 +753,14 @@ msgstr "300%"
 msgid "400%"
 msgstr "400%"
 
+#: ../lib/history/ephy-history-service-hosts-table.c:360
+msgid "Others"
+msgstr "åå"
+
+#: ../lib/history/ephy-history-service-hosts-table.c:364
+msgid "Local files"
+msgstr "ææææ"
+
 #: ../lib/widgets/ephy-download-widget.c:88
 #, c-format
 msgid "%u:%02u hour left"
@@ -1030,7 +798,7 @@ msgstr "äèæççéèï%s"
 msgid "Cancel"
 msgstr "åæ"
 
-#: ../lib/widgets/ephy-download-widget.c:280 ../src/ephy-window.c:1276
+#: ../lib/widgets/ephy-download-widget.c:280 ../src/ephy-window.c:1311
 #: ../src/window-commands.c:263
 msgid "Open"
 msgstr "éå"
@@ -1039,18 +807,27 @@ msgstr "éå"
 msgid "Show in folder"
 msgstr "åèæåéç"
 
-#: ../lib/widgets/ephy-download-widget.c:458
+#: ../lib/widgets/ephy-download-widget.c:462
 msgid "Startingâ"
 msgstr "æåéåâ"
 
-#: ../lib/widgets/ephy-hosts-store.c:112
+#: ../lib/widgets/ephy-hosts-store.c:230
 msgid "All sites"
 msgstr "ææçç"
 
-#: ../lib/widgets/ephy-hosts-view.c:43
+#: ../lib/widgets/ephy-hosts-view.c:46
 msgid "Sites"
 msgstr "çç"
 
+#. Translators: the mnemonic shouldn't conflict with any of the
+#. * standard items in the GtkEntry context menu (Cut, Copy, Paste, Delete,
+#. * Select All, Input Methods and Insert Unicode control character.)
+#.
+#: ../lib/widgets/ephy-location-entry.c:462 ../src/ephy-history-window.c:230
+#: ../src/pdm-dialog.c:352 ../src/prefs-dialog.ui.h:7
+msgid "Cl_ear"
+msgstr "æé(_E)"
+
 #: ../lib/widgets/ephy-location-entry.c:742
 msgid "Drag and drop this icon to create a link to this page"
 msgstr "ææéååçäåçéèèçéçéç"
@@ -1060,13 +837,13 @@ msgid "Clear"
 msgstr "æé"
 
 #: ../lib/widgets/ephy-urls-view.c:43
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1646
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1662
 msgid "Title"
 msgstr "æé"
 
 #: ../lib/widgets/ephy-urls-view.c:51
 #: ../src/bookmarks/ephy-bookmarks-editor.c:213
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1657
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1673
 msgid "Address"
 msgstr "åå"
 
@@ -1116,27 +893,27 @@ msgstr "äé(_O)ï"
 msgid "Sho_w all topics"
 msgstr "éçææäé(_W)"
 
-#: ../src/bookmarks/ephy-bookmarks.c:93
+#: ../src/bookmarks/ephy-bookmarks.c:92
 msgid "Entertainment"
 msgstr "åæ"
 
-#: ../src/bookmarks/ephy-bookmarks.c:94
+#: ../src/bookmarks/ephy-bookmarks.c:93
 msgid "News"
 msgstr "æè"
 
-#: ../src/bookmarks/ephy-bookmarks.c:95
+#: ../src/bookmarks/ephy-bookmarks.c:94
 msgid "Shopping"
 msgstr "èç"
 
-#: ../src/bookmarks/ephy-bookmarks.c:96
+#: ../src/bookmarks/ephy-bookmarks.c:95
 msgid "Sports"
 msgstr "éå"
 
-#: ../src/bookmarks/ephy-bookmarks.c:97
+#: ../src/bookmarks/ephy-bookmarks.c:96
 msgid "Travel"
 msgstr "æé"
 
-#: ../src/bookmarks/ephy-bookmarks.c:98
+#: ../src/bookmarks/ephy-bookmarks.c:97
 msgid "Work"
 msgstr "åä"
 
@@ -1179,22 +956,22 @@ msgstr "åæäéäåé"
 
 #. Toplevel
 #: ../src/bookmarks/ephy-bookmarks-editor.c:152
-#: ../src/ephy-history-window.c:129
+#: ../src/ephy-history-window.c:128
 msgid "_File"
 msgstr "ææ(_F)"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:153
-#: ../src/ephy-history-window.c:130
+#: ../src/ephy-history-window.c:129
 msgid "_Edit"
 msgstr "çè(_E)"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:154
-#: ../src/ephy-history-window.c:131
+#: ../src/ephy-history-window.c:130
 msgid "_View"
 msgstr "éç(_V)"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:155
-#: ../src/ephy-history-window.c:132
+#: ../src/ephy-history-window.c:131
 msgid "_Help"
 msgstr "æå(_H)"
 
@@ -1210,7 +987,7 @@ msgstr "åçæçäé"
 #. File Menu
 #: ../src/bookmarks/ephy-bookmarks-editor.c:162
 #: ../src/bookmarks/ephy-bookmarks-editor.c:1161
-#: ../src/ephy-history-window.c:136 ../src/ephy-history-window.c:642
+#: ../src/ephy-history-window.c:135 ../src/ephy-history-window.c:638
 msgid "Open in New _Window"
 msgid_plural "Open in New _Windows"
 msgstr[0] "åæçèçäéå(_W)"
@@ -1221,7 +998,7 @@ msgstr "åæçèçäéååéçæç"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:165
 #: ../src/bookmarks/ephy-bookmarks-editor.c:1164
-#: ../src/ephy-history-window.c:139 ../src/ephy-history-window.c:645
+#: ../src/ephy-history-window.c:138 ../src/ephy-history-window.c:641
 msgid "Open in New _Tab"
 msgid_plural "Open in New _Tabs"
 msgstr[0] "åæçåéäéå(_T)"
@@ -1263,7 +1040,7 @@ msgid "Export bookmarks to a file"
 msgstr "åæçåååææ"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:179
-#: ../src/ephy-history-window.c:145 ../src/ephy-window.c:105
+#: ../src/ephy-history-window.c:144 ../src/ephy-window.c:106
 msgid "_Close"
 msgstr "éé(_C)"
 
@@ -1273,39 +1050,39 @@ msgstr "ééæçèç"
 
 #. Edit Menu
 #: ../src/bookmarks/ephy-bookmarks-editor.c:184
-#: ../src/ephy-history-window.c:150 ../src/ephy-window.c:114
+#: ../src/ephy-history-window.c:149 ../src/ephy-window.c:115
 msgid "Cu_t"
 msgstr "åä(_T)"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:185
-#: ../src/ephy-history-window.c:151
+#: ../src/ephy-history-window.c:150
 msgid "Cut the selection"
 msgstr "åäéåçåå"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:187
 #: ../src/bookmarks/ephy-bookmarks-editor.c:1174
-#: ../src/ephy-history-window.c:153 ../src/ephy-history-window.c:655
-#: ../src/ephy-window.c:116
+#: ../src/ephy-history-window.c:152 ../src/ephy-history-window.c:651
+#: ../src/ephy-window.c:117
 msgid "_Copy"
 msgstr "èè(_C)"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:188
-#: ../src/ephy-history-window.c:154
+#: ../src/ephy-history-window.c:153
 msgid "Copy the selection"
 msgstr "èèéåçåå"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:190
-#: ../src/ephy-history-window.c:156 ../src/ephy-window.c:118
+#: ../src/ephy-history-window.c:155 ../src/ephy-window.c:119
 msgid "_Paste"
 msgstr "èä(_P)"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:191
-#: ../src/ephy-history-window.c:157
+#: ../src/ephy-history-window.c:156
 msgid "Paste the clipboard"
 msgstr "èäåèçäçåå"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:193
-#: ../src/ephy-history-window.c:159
+#: ../src/ephy-history-window.c:158
 msgid "_Delete"
 msgstr "åé(_D)"
 
@@ -1314,7 +1091,7 @@ msgid "Delete the selected bookmark or topic"
 msgstr "åéåéçæçæäé"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:196
-#: ../src/ephy-history-window.c:162 ../src/ephy-window.c:122
+#: ../src/ephy-history-window.c:161 ../src/ephy-window.c:123
 msgid "Select _All"
 msgstr "åééå(_A)"
 
@@ -1324,7 +1101,7 @@ msgstr "éåæææçææå"
 
 #. Help Menu
 #: ../src/bookmarks/ephy-bookmarks-editor.c:201
-#: ../src/ephy-history-window.c:170
+#: ../src/ephy-history-window.c:169
 msgid "_Contents"
 msgstr "åå(_C)"
 
@@ -1333,28 +1110,28 @@ msgid "Display bookmarks help"
 msgstr "éçæçèææä"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:204
-#: ../src/ephy-history-window.c:173
+#: ../src/ephy-history-window.c:172
 msgid "_About"
 msgstr "éæ(_A)"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:205
-#: ../src/ephy-history-window.c:174
+#: ../src/ephy-history-window.c:173
 msgid "Display credits for the web browser creators"
 msgstr "éèææéåçéçèåçåäè"
 
 #. View Menu
 #: ../src/bookmarks/ephy-bookmarks-editor.c:211
-#: ../src/ephy-history-window.c:188
+#: ../src/ephy-history-window.c:187
 msgid "_Title"
 msgstr "æé(_T)"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:212
-#: ../src/ephy-history-window.c:189
+#: ../src/ephy-history-window.c:188
 msgid "Show the title column"
 msgstr "éçæéæä"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:214
-#: ../src/ephy-history-window.c:191
+#: ../src/ephy-history-window.c:190
 msgid "Show the address column"
 msgstr "éçäåæä"
 
@@ -1396,7 +1173,7 @@ msgstr "Firebird"
 #: ../src/bookmarks/ephy-bookmarks-editor.c:511
 #, c-format
 msgid "Mozilla â%sâ profile"
-msgstr "Mozillaâ%sâèåçå"
+msgstr "Mozilla â%sâ èåçå"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:515
 msgid "Galeon"
@@ -1442,7 +1219,7 @@ msgid "Export Bookmarks"
 msgstr "ååæç"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:763
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1520
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1536
 #: ../src/bookmarks/ephy-topic-action.c:217
 msgid "Bookmarks"
 msgstr "æç"
@@ -1469,16 +1246,16 @@ msgid "File"
 msgstr "ææ"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:1170
-#: ../src/ephy-history-window.c:651
+#: ../src/ephy-history-window.c:647
 msgid "_Copy Address"
 msgstr "èèäå(_C)"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:1411
-#: ../src/ephy-history-window.c:804
+#: ../src/ephy-history-window.c:800
 msgid "_Search:"
 msgstr "æå(_S)ï"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1576
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1592
 msgid "Topics"
 msgstr "äé"
 
@@ -1504,7 +1281,7 @@ msgstr "åæ"
 msgid "Stop current data transfer"
 msgstr "åæåéçåçèæ"
 
-#: ../src/ephy-combined-stop-reload-action.c:44 ../src/ephy-window.c:137
+#: ../src/ephy-combined-stop-reload-action.c:44 ../src/ephy-window.c:138
 msgid "_Reload"
 msgstr "éæèå(_R)"
 
@@ -1512,6 +1289,10 @@ msgstr "éæèå(_R)"
 msgid "Display the latest content of the current page"
 msgstr "éçæéçææåå"
 
+#: ../src/ephy-encoding-dialog.c:301 ../src/prefs-dialog.ui.h:13
+msgid "Encodings"
+msgstr "çç"
+
 #: ../src/ephy-encoding-menu.c:330
 msgid "_Otherâ"
 msgstr "åå(_O)â"
@@ -1524,6 +1305,10 @@ msgstr "åäåçççæå"
 msgid "_Automatic"
 msgstr "èå(_A)"
 
+#: ../src/ephy-encoding-menu.c:338 ../src/epiphany.ui.h:12
+msgid "Use the encoding specified by the document"
+msgstr "äçæäæåçççæå"
+
 #: ../src/ephy-find-toolbar.c:153
 msgid "Not found"
 msgstr "æäååä"
@@ -1567,94 +1352,94 @@ msgstr "åæääååçæååäçåæ"
 msgid "Leave Fullscreen"
 msgstr "ééåèå"
 
-#: ../src/ephy-history-window.c:137
+#: ../src/ephy-history-window.c:136
 msgid "Open the selected history link in a new window"
 msgstr "åæçèçäéååéççèèééç"
 
-#: ../src/ephy-history-window.c:140
+#: ../src/ephy-history-window.c:139
 msgid "Open the selected history link in a new tab"
 msgstr "åæçåéäéååéççèèééç"
 
-#: ../src/ephy-history-window.c:142
+#: ../src/ephy-history-window.c:141
 msgid "Add _Bookmarkâ"
 msgstr "ååæç(_B)â"
 
-#: ../src/ephy-history-window.c:143
+#: ../src/ephy-history-window.c:142
 msgid "Bookmark the selected history link"
 msgstr "ååéççèèééçååèæç"
 
-#: ../src/ephy-history-window.c:146
+#: ../src/ephy-history-window.c:145
 msgid "Close the history window"
 msgstr "ééçèèéèç"
 
-#: ../src/ephy-history-window.c:160
+#: ../src/ephy-history-window.c:159
 msgid "Delete the selected history link"
 msgstr "åéåéççèèééç"
 
-#: ../src/ephy-history-window.c:163
+#: ../src/ephy-history-window.c:162
 msgid "Select all history links or text"
 msgstr "éåææçèèééçææå"
 
-#: ../src/ephy-history-window.c:165
+#: ../src/ephy-history-window.c:164
 msgid "Clear _History"
 msgstr "æéçèèé(_H)"
 
-#: ../src/ephy-history-window.c:166
+#: ../src/ephy-history-window.c:165
 msgid "Clear your browsing history"
 msgstr "æéçèèé"
 
-#: ../src/ephy-history-window.c:171
+#: ../src/ephy-history-window.c:170
 msgid "Display history help"
 msgstr "éççèèéèææä"
 
-#: ../src/ephy-history-window.c:190
+#: ../src/ephy-history-window.c:189
 msgid "_Address"
 msgstr "äå(_A)"
 
-#: ../src/ephy-history-window.c:192
+#: ../src/ephy-history-window.c:191
 msgid "_Date and Time"
 msgstr "ææåæå(_D)"
 
-#: ../src/ephy-history-window.c:193
+#: ../src/ephy-history-window.c:192
 msgid "Show the date and time column"
 msgstr "éçææåæåæä"
 
-#: ../src/ephy-history-window.c:221
+#: ../src/ephy-history-window.c:220
 msgid "Clear browsing history?"
 msgstr "æåæéçèèéï"
 
-#: ../src/ephy-history-window.c:225
+#: ../src/ephy-history-window.c:224
 msgid ""
 "Clearing the browsing history will cause all history links to be permanently "
 "deleted."
 msgstr "æéçèèéåæäææçèèéæéèåéã"
 
-#: ../src/ephy-history-window.c:240
+#: ../src/ephy-history-window.c:239
 msgid "Clear History"
 msgstr "æéçèèé"
 
-#: ../src/ephy-history-window.c:813
+#: ../src/ephy-history-window.c:809
 msgid "Last 30 minutes"
 msgstr "å 30 åé"
 
-#: ../src/ephy-history-window.c:814
+#: ../src/ephy-history-window.c:810
 msgid "Today"
 msgstr "äæ"
 
 #. keep this in sync with embed/ephy-history.c's
 #. * HISTORY_PAGE_OBSOLETE_DAYS
-#: ../src/ephy-history-window.c:816 ../src/ephy-history-window.c:820
-#: ../src/ephy-history-window.c:826
+#: ../src/ephy-history-window.c:812 ../src/ephy-history-window.c:816
+#: ../src/ephy-history-window.c:822
 #, c-format
 msgid "Last %d day"
 msgid_plural "Last %d days"
 msgstr[0] "æè %d æ"
 
-#: ../src/ephy-history-window.c:830
+#: ../src/ephy-history-window.c:826
 msgid "All history"
 msgstr "ææçèèé"
 
-#: ../src/ephy-history-window.c:1125
+#: ../src/ephy-history-window.c:1123
 msgid "History"
 msgstr "çèèé"
 
@@ -1674,6 +1459,10 @@ msgstr "ååæççèå"
 msgid "Import bookmarks from the given file"
 msgstr "åææåçææååæç"
 
+#: ../src/ephy-main.c:88 ../src/ephy-main.c:90
+msgid "FILE"
+msgstr "ææ"
+
 #: ../src/ephy-main.c:90
 msgid "Load the given session file"
 msgstr "èåæåçäæéæææ"
@@ -1688,7 +1477,7 @@ msgstr "URL"
 
 #: ../src/ephy-main.c:94
 msgid "Start a private instance"
-msgstr "åå private instance"
+msgstr "ååçååé"
 
 #: ../src/ephy-main.c:96
 msgid "Start the browser in application mode"
@@ -1696,7 +1485,7 @@ msgstr "äæççåæåååçèå"
 
 #: ../src/ephy-main.c:98
 msgid "Profile directory to use in the private instance"
-msgstr "å private instance äççèåçåçé"
+msgstr "åçååéääççèåçåçé"
 
 #: ../src/ephy-main.c:98
 msgid "DIR"
@@ -1727,388 +1516,400 @@ msgstr "çééé"
 msgid "Close tab"
 msgstr "ééåé"
 
-#: ../src/ephy-session.c:115
-#, c-format
-msgid "Downloads will be aborted and logout proceed in %d second."
-msgid_plural "Downloads will be aborted and logout proceed in %d seconds."
-msgstr[0] "äèåæèäæåå %d åçåã"
-
-#: ../src/ephy-session.c:219
-msgid "Abort pending downloads?"
-msgstr "åææåæçäèï"
-
-#: ../src/ephy-session.c:224
-msgid ""
-"There are still downloads pending. If you log out, they will be aborted and "
-"lost."
-msgstr "éæäèæåæãåæäçåïåååæèäæåéåã"
-
-#: ../src/ephy-session.c:228
-msgid "_Cancel Logout"
-msgstr "åæçå(_C)"
-
-#: ../src/ephy-session.c:230
-msgid "_Abort Downloads"
-msgstr "åæäè(_A)"
-
-#: ../src/ephy-session.c:770
-msgid "_Don't recover"
-msgstr "äèåå(_D)"
-
-#: ../src/ephy-session.c:775
-msgid "_Recover session"
-msgstr "ååäæéæ(_R)"
-
-#: ../src/ephy-session.c:780
-msgid "Do you want to recover the previous browser windows and tabs?"
-msgstr "æåèååååççèåèçååéï"
-
 #. Toplevel
-#: ../src/ephy-window.c:87
+#: ../src/ephy-window.c:88
 msgid "_Bookmarks"
 msgstr "æç(_B)"
 
-#: ../src/ephy-window.c:91
+#: ../src/ephy-window.c:92
 msgid "_Extensions"
 msgstr "æååè(_E)"
 
 #. File actions.
-#: ../src/ephy-window.c:95
+#: ../src/ephy-window.c:96
 msgid "_Openâ"
 msgstr "éå(_O)â"
 
-#: ../src/ephy-window.c:97
+#: ../src/ephy-window.c:98
 msgid "Save _Asâ"
 msgstr "ååææ(_A)â"
 
-#: ../src/ephy-window.c:99
+#: ../src/ephy-window.c:100
 msgid "Save As _Web Applicationâ"
 msgstr "ååççéæççå(_W)â"
 
-#: ../src/ephy-window.c:101
+#: ../src/ephy-window.c:102
 msgid "_Printâ"
 msgstr "æå(_P)â"
 
-#: ../src/ephy-window.c:103
+#: ../src/ephy-window.c:104
 msgid "S_end Link by Emailâ"
 msgstr "äééåééç(_E)â"
 
 #. Edit actions.
-#: ../src/ephy-window.c:110
+#: ../src/ephy-window.c:111
 msgid "_Undo"
 msgstr "åå(_U)"
 
-#: ../src/ephy-window.c:112
+#: ../src/ephy-window.c:113
 msgid "Re_do"
 msgstr "åæåå(_D)"
 
-#: ../src/ephy-window.c:124
+#: ../src/ephy-window.c:125
 msgid "_Findâ"
 msgstr "åæ(_F)â"
 
-#: ../src/ephy-window.c:126
+#: ../src/ephy-window.c:127
 msgid "Find Ne_xt"
 msgstr "æääå(_X)"
 
-#: ../src/ephy-window.c:128
+#: ../src/ephy-window.c:129
 msgid "Find Pre_vious"
 msgstr "æääå(_V)"
 
 #. View actions.
-#: ../src/ephy-window.c:133 ../src/ephy-window.c:135
+#: ../src/ephy-window.c:134 ../src/ephy-window.c:136
 msgid "_Stop"
 msgstr "åæ(_S)"
 
-#: ../src/ephy-window.c:139
+#: ../src/ephy-window.c:140
 msgid "_Larger Text"
 msgstr "æååå(_L)"
 
-#: ../src/ephy-window.c:141
+#: ../src/ephy-window.c:142
 msgid "S_maller Text"
 msgstr "çååå(_M)"
 
-#: ../src/ephy-window.c:143
+#: ../src/ephy-window.c:144
 msgid "_Normal Size"
 msgstr "æååå(_N)"
 
-#: ../src/ephy-window.c:145
+#: ../src/ephy-window.c:146
 msgid "Text _Encoding"
 msgstr "åççç(_E)"
 
-#: ../src/ephy-window.c:146
+#: ../src/ephy-window.c:147
 msgid "_Page Source"
 msgstr "çéåååå(_P)"
 
 #. Bookmarks actions.
-#: ../src/ephy-window.c:151
+#: ../src/ephy-window.c:152
 msgid "_Add Bookmarkâ"
 msgstr "ååæç(_A)â"
 
 #. Go actions.
-#: ../src/ephy-window.c:156
+#: ../src/ephy-window.c:157
 msgid "_Locationâ"
 msgstr "äç(_L)â"
 
 #. Tabs actions.
-#: ../src/ephy-window.c:161
+#: ../src/ephy-window.c:162
 msgid "_Previous Tab"
 msgstr "ääååé(_P)"
 
-#: ../src/ephy-window.c:163
+#: ../src/ephy-window.c:164
 msgid "_Next Tab"
 msgstr "ääååé(_N)"
 
-#: ../src/ephy-window.c:165
+#: ../src/ephy-window.c:166
 msgid "Move Tab _Left"
 msgstr "åéååç(_L)"
 
-#: ../src/ephy-window.c:167
+#: ../src/ephy-window.c:168
 msgid "Move Tab _Right"
 msgstr "åéååç(_R)"
 
-#: ../src/ephy-window.c:169
+#: ../src/ephy-window.c:170
 msgid "_Detach Tab"
 msgstr "åéåé(_D)"
 
 #. File actions.
-#: ../src/ephy-window.c:177
+#: ../src/ephy-window.c:178
 msgid "_Work Offline"
 msgstr "éçæå(_W)"
 
 #. View actions.
-#: ../src/ephy-window.c:182
+#: ../src/ephy-window.c:183
 msgid "_Downloads Bar"
 msgstr "äèå(_D)"
 
-#: ../src/ephy-window.c:185
+#: ../src/ephy-window.c:186
 msgid "_Fullscreen"
 msgstr "åèå(_F)"
 
-#: ../src/ephy-window.c:187
+#: ../src/ephy-window.c:188
 msgid "Popup _Windows"
 msgstr "åååèç(_W)"
 
-#: ../src/ephy-window.c:189
+#: ../src/ephy-window.c:190
 msgid "Selection Caret"
 msgstr "éæææ"
 
 #. Document.
-#: ../src/ephy-window.c:196
+#: ../src/ephy-window.c:197
 msgid "Add Boo_kmarkâ"
 msgstr "ååæç(_K)â"
 
 #. Links.
-#: ../src/ephy-window.c:201
+#: ../src/ephy-window.c:202
 msgid "_Open Link"
 msgstr "éåéç(_O)"
 
-#: ../src/ephy-window.c:203
+#: ../src/ephy-window.c:204
 msgid "Open Link in New _Window"
 msgstr "åæçèçäéåéç(_W)"
 
-#: ../src/ephy-window.c:205
+#: ../src/ephy-window.c:206
 msgid "Open Link in New _Tab"
 msgstr "åæçåéäéåéç(_T)"
 
-#: ../src/ephy-window.c:207
+#: ../src/ephy-window.c:208
 msgid "_Download Link"
 msgstr "äèéç(_D)"
 
-#: ../src/ephy-window.c:209
+#: ../src/ephy-window.c:210
 msgid "_Save Link Asâ"
 msgstr "ååéç(_S)â"
 
-#: ../src/ephy-window.c:211
+#: ../src/ephy-window.c:212
 msgid "_Bookmark Linkâ"
 msgstr "åéçååæç(_B)â"
 
-#: ../src/ephy-window.c:213
+#: ../src/ephy-window.c:214
 msgid "_Copy Link Address"
 msgstr "èèéçåå(_C)"
 
 #. Images.
-#: ../src/ephy-window.c:218
+#: ../src/ephy-window.c:219
 msgid "Open _Image"
 msgstr "éååç(_I)"
 
-#: ../src/ephy-window.c:220
+#: ../src/ephy-window.c:221
 msgid "_Save Image Asâ"
 msgstr "åååç(_S)â"
 
-#: ../src/ephy-window.c:222
+#: ../src/ephy-window.c:223
 msgid "_Use Image As Background"
 msgstr "äçåçäçæéèæ(_U)"
 
-#: ../src/ephy-window.c:224
+#: ../src/ephy-window.c:225
 msgid "Copy I_mage Address"
 msgstr "èèåçåå(_M)"
 
-#: ../src/ephy-window.c:226
+#: ../src/ephy-window.c:227
 msgid "St_art Animation"
 msgstr "åçéå(_A)"
 
-#: ../src/ephy-window.c:228
+#: ../src/ephy-window.c:229
 msgid "St_op Animation"
 msgstr "åçåæ(_O)"
 
 #. Inspector.
-#: ../src/ephy-window.c:244
+#: ../src/ephy-window.c:245
 msgid "Inspect _Element"
 msgstr "ææåç(_E)"
 
-#: ../src/ephy-window.c:449
+#: ../src/ephy-window.c:450
 msgid "There are unsubmitted changes to form elements"
 msgstr "åèåçåçèèææççèçæè"
 
-#: ../src/ephy-window.c:450
+#: ../src/ephy-window.c:451
 msgid "If you close the document anyway, you will lose that information."
 msgstr "åæäçèçäèééææäïäåæååæååçèèã"
 
-#: ../src/ephy-window.c:452
+#: ../src/ephy-window.c:453
 msgid "Close _Document"
 msgstr "ééæä(_D)"
 
-#: ../src/ephy-window.c:470
+#: ../src/ephy-window.c:471
 msgid "There are ongoing downloads in this window"
 msgstr "éåèçéæéèäçäè"
 
-#: ../src/ephy-window.c:471
+#: ../src/ephy-window.c:472
 msgid "If you close this window, the downloads will be cancelled"
 msgstr "åæäéééåèçïéåäèäæèåæ"
 
-#: ../src/ephy-window.c:472
+#: ../src/ephy-window.c:473
 msgid "Close window and cancel downloads"
 msgstr "ééèçäåæäè"
 
-#: ../src/ephy-window.c:1278
+#: ../src/ephy-window.c:1313
 msgid "Save As"
 msgstr "ååææ"
 
-#: ../src/ephy-window.c:1280
+#: ../src/ephy-window.c:1315
 msgid "Save As Application"
 msgstr "ååçæççå"
 
-#: ../src/ephy-window.c:1282
+#: ../src/ephy-window.c:1317
 msgid "Print"
 msgstr "åå"
 
-#: ../src/ephy-window.c:1284
+#: ../src/ephy-window.c:1319
 msgid "Bookmark"
 msgstr "ååæç"
 
-#: ../src/ephy-window.c:1286
+#: ../src/ephy-window.c:1321
 msgid "Find"
 msgstr "åæ"
 
 #. Translators: This refers to text size
-#: ../src/ephy-window.c:1295
+#: ../src/ephy-window.c:1330
 msgid "Larger"
 msgstr "æå"
 
 #. Translators: This refers to text size
-#: ../src/ephy-window.c:1298
+#: ../src/ephy-window.c:1333
 msgid "Smaller"
 msgstr "çå"
 
-#: ../src/ephy-window.c:1318
+#: ../src/ephy-window.c:1353
 msgid "Back"
 msgstr "ääé"
 
-#: ../src/ephy-window.c:1330
+#: ../src/ephy-window.c:1365
 msgid "Forward"
 msgstr "ääé"
 
-#: ../src/ephy-window.c:1342
+#: ../src/ephy-window.c:1377
 msgid "Zoom"
 msgstr "çæ"
 
-#: ../src/ephy-window.c:1350
+#: ../src/ephy-window.c:1385
 msgid "New _Tab"
 msgstr "æååé(_T)"
 
-#: ../src/pdm-dialog.c:336
+#: ../src/epiphany.ui.h:1
+msgid "<b>_Automatic</b>"
+msgstr "<b>èå(_A)ï</b>"
+
+#: ../src/epiphany.ui.h:2
+msgid "<b>_Use a different encoding:</b>"
+msgstr "äçäåççç(_U)ï"
+
+#: ../src/epiphany.ui.h:3
+msgid "Content:"
+msgstr "åå"
+
+#: ../src/epiphany.ui.h:4
+msgid "Cookie properties"
+msgstr "Cookie åæ"
+
+#: ../src/epiphany.ui.h:5 ../src/prefs-dialog.ui.h:8
+msgid "Cookies"
+msgstr "Cookie"
+
+#: ../src/epiphany.ui.h:6
+msgid "Expires:"
+msgstr "æéï"
+
+#: ../src/epiphany.ui.h:7 ../src/prefs-dialog.ui.h:22
+msgid "Passwords"
+msgstr "åç"
+
+#: ../src/epiphany.ui.h:8
+msgid "Path:"
+msgstr "èåï"
+
+#: ../src/epiphany.ui.h:9
+msgid "Personal Data"
+msgstr "åäèæ"
+
+#: ../src/epiphany.ui.h:10
+msgid "Send for:"
+msgstr "åéçï"
+
+#: ../src/epiphany.ui.h:11
+msgid "Text Encoding"
+msgstr "åççç"
+
+#: ../src/epiphany.ui.h:13
+msgid "_Show passwords"
+msgstr "éçåç(_S)"
+
+#: ../src/pdm-dialog.c:333
 msgid "<b>Select the personal data you want to clear</b>"
 msgstr "<b>éææèæéçåäèæ</b>"
 
-#: ../src/pdm-dialog.c:339
+#: ../src/pdm-dialog.c:336
 msgid ""
 "You are about to clear personal data that is stored about the web pages you "
 "have visited. Before proceeding, check the types of information that you "
 "want to remove:"
 msgstr "äæèæéçåäèæååääæåèéççéãåéåæéäåïèçåèçéåäéåçèèï"
 
-#: ../src/pdm-dialog.c:344
+#: ../src/pdm-dialog.c:341
 msgid "Clear All Personal Data"
 msgstr "æéææçåäèæ"
 
 #. Cookies
-#: ../src/pdm-dialog.c:378
+#: ../src/pdm-dialog.c:375
 msgid "C_ookies"
 msgstr "C_ookies"
 
 #. Passwords
-#: ../src/pdm-dialog.c:390
+#: ../src/pdm-dialog.c:387
 msgid "Saved _passwords"
 msgstr "ååçåç(_P)"
 
 #. History
-#: ../src/pdm-dialog.c:402
+#: ../src/pdm-dialog.c:399
 msgid "Hi_story"
 msgstr "æåèé(_S)"
 
 #. Cache
-#: ../src/pdm-dialog.c:414
+#: ../src/pdm-dialog.c:411
 msgid "_Temporary files"
 msgstr "æåææ(_T)"
 
-#: ../src/pdm-dialog.c:430
+#: ../src/pdm-dialog.c:427
 msgid ""
 "<small><i><b>Note:</b> You cannot undo this action. The data you are "
 "choosing to clear will be deleted forever.</i></small>"
 msgstr "<small><i><b>ææï</b>ääèååéååäãäæéæçèæåèæéåéã</i></small>"
 
-#: ../src/pdm-dialog.c:649
+#: ../src/pdm-dialog.c:646
 msgid "Encrypted connections only"
 msgstr "åéåååçéç"
 
-#: ../src/pdm-dialog.c:650
+#: ../src/pdm-dialog.c:647
 msgid "Any type of connection"
 msgstr "ääéåçéç"
 
 #. Session cookie
-#: ../src/pdm-dialog.c:655
+#: ../src/pdm-dialog.c:652
 msgid "End of current session"
 msgstr "çæçåçäæéæ"
 
-#: ../src/pdm-dialog.c:774
+#: ../src/pdm-dialog.c:771
 msgid "Domain"
 msgstr "çå"
 
-#: ../src/pdm-dialog.c:786
+#: ../src/pdm-dialog.c:783
 msgid "Name"
 msgstr "åç"
 
-#: ../src/pdm-dialog.c:1200
+#: ../src/pdm-dialog.c:1197
 msgid "Host"
 msgstr "äæ"
 
-#: ../src/pdm-dialog.c:1213
+#: ../src/pdm-dialog.c:1210
 msgid "User Name"
 msgstr "äçèåç"
 
-#: ../src/pdm-dialog.c:1226
+#: ../src/pdm-dialog.c:1223
 msgid "User Password"
 msgstr "äçèåç"
 
-#: ../src/popup-commands.c:273
+#: ../src/popup-commands.c:279
 msgid "Download Link"
 msgstr "äèéç"
 
-#: ../src/popup-commands.c:281
+#: ../src/popup-commands.c:287
 msgid "Save Link As"
 msgstr "ååéç(_A)â"
 
-#: ../src/popup-commands.c:288
+#: ../src/popup-commands.c:294
 msgid "Save Image As"
 msgstr "åååç"
 
@@ -2116,7 +1917,7 @@ msgstr "åååç"
 #. * second %s is the locale name. Example:
 #. * "French (France)"
 #.
-#: ../src/prefs-dialog.c:468 ../src/prefs-dialog.c:474
+#: ../src/prefs-dialog.c:467 ../src/prefs-dialog.c:473
 #, c-format
 msgctxt "language"
 msgid "%s (%s)"
@@ -2125,22 +1926,155 @@ msgstr "%s (%s)"
 #. Translators: this refers to a user-define language code
 #. * (one which isn't in our built-in list).
 #.
-#: ../src/prefs-dialog.c:483
+#: ../src/prefs-dialog.c:482
 #, c-format
 msgctxt "language"
 msgid "User defined (%s)"
 msgstr "äçèåç (%s)"
 
-#: ../src/prefs-dialog.c:505
+#: ../src/prefs-dialog.c:504
 #, c-format
 msgid "System language (%s)"
 msgid_plural "System languages (%s)"
 msgstr[0] "ççèè (%s)"
 
-#: ../src/prefs-dialog.c:863
+#: ../src/prefs-dialog.c:773 ../src/prefs-dialog.ui.h:17
+msgid "Language"
+msgstr "èè"
+
+#: ../src/prefs-dialog.c:862
 msgid "Select a Directory"
 msgstr "éæäåçé"
 
+#. Refers to "Only from sites you visit" option under Cookies.
+#: ../src/prefs-dialog.ui.h:2
+msgid "<small>For example, not from advertisers on these sites</small>"
+msgstr "<small>äåïäèäèéäçççåå</small>"
+
+#: ../src/prefs-dialog.ui.h:3
+msgid "A_utomatically open downloaded files"
+msgstr "èåäèäéåææ(_U)"
+
+#: ../src/prefs-dialog.ui.h:4
+msgid "Add Language"
+msgstr "ååèè"
+
+#: ../src/prefs-dialog.ui.h:5
+msgid "Allow popup _windows"
+msgstr "åèåååèç(_W)"
+
+#: ../src/prefs-dialog.ui.h:6
+msgid "Choose a l_anguage:"
+msgstr "éæèè(_A)ï"
+
+#: ../src/prefs-dialog.ui.h:9
+msgid "De_fault:"
+msgstr "éè(_F)ï"
+
+#: ../src/prefs-dialog.ui.h:11
+msgid "Enable Java_Script"
+msgstr "åç Java_Script"
+
+#: ../src/prefs-dialog.ui.h:12
+msgid "Enable _plugins"
+msgstr "åçåæçå(_P)"
+
+#: ../src/prefs-dialog.ui.h:14
+msgid "Fonts"
+msgstr "åå"
+
+#: ../src/prefs-dialog.ui.h:15
+msgid "Fonts & Style"
+msgstr "ååèæå"
+
+#: ../src/prefs-dialog.ui.h:16
+msgid "General"
+msgstr "äè"
+
+#: ../src/prefs-dialog.ui.h:18
+msgid "Languages"
+msgstr "èè"
+
+#: ../src/prefs-dialog.ui.h:19
+msgid "MB"
+msgstr "MB"
+
+#: ../src/prefs-dialog.ui.h:20
+msgid "Monospace font:"
+msgstr "çåååï"
+
+#: ../src/prefs-dialog.ui.h:21
+msgid "Only _from sites you visit"
+msgstr "åäèäçèççç(_F)"
+
+#: ../src/prefs-dialog.ui.h:23
+msgid "Preferences"
+msgstr "ååèå"
+
+#: ../src/prefs-dialog.ui.h:24
+msgid "Privacy"
+msgstr "çé"
+
+#: ../src/prefs-dialog.ui.h:25
+msgid "Sans serif font:"
+msgstr "çèçååï"
+
+#: ../src/prefs-dialog.ui.h:26
+msgid "Serif font:"
+msgstr "èçååï"
+
+#: ../src/prefs-dialog.ui.h:27
+msgid "Spell checking"
+msgstr "æåææ"
+
+#: ../src/prefs-dialog.ui.h:28
+msgid "Style"
+msgstr "æå"
+
+#: ../src/prefs-dialog.ui.h:29
+msgid "Temporary Files"
+msgstr "æåæ"
+
+#: ../src/prefs-dialog.ui.h:30
+msgid "Use custom _stylesheet"
+msgstr "äçèéæåè(_S)"
+
+#: ../src/prefs-dialog.ui.h:31
+msgid "Web Content"
+msgstr "çéåå"
+
+#: ../src/prefs-dialog.ui.h:32
+msgid "_Always accept"
+msgstr "çææå(_A)"
+
+#: ../src/prefs-dialog.ui.h:33
+msgid "_Disk space:"
+msgstr "çççé(_D)ï"
+
+#: ../src/prefs-dialog.ui.h:34
+msgid "_Download folder:"
+msgstr "äèèæå(_D)"
+
+#: ../src/prefs-dialog.ui.h:35
+msgid "_Edit Stylesheetâ"
+msgstr "çèæåè(_E)â"
+
+#: ../src/prefs-dialog.ui.h:36
+msgid "_Enable spell checking"
+msgstr "åçæåææ(_E)"
+
+#: ../src/prefs-dialog.ui.h:37
+msgid "_Never accept"
+msgstr "æäæå(_N)"
+
+#: ../src/prefs-dialog.ui.h:38
+msgid "_Remember passwords"
+msgstr "èéåç(_R)"
+
+#: ../src/prefs-dialog.ui.h:39
+msgid "_Use system fonts"
+msgstr "äçççåå(_U)"
+
 #: ../src/window-commands.c:316
 msgid "Save"
 msgstr "åå"
@@ -2160,38 +2094,38 @@ msgid ""
 "overwrite it."
 msgstr "äæçåçæççååçååãåäåæååèèã"
 
-#: ../src/window-commands.c:530
+#: ../src/window-commands.c:524
 #, c-format
 msgid "The application '%s' is ready to be used"
 msgstr "æççåã%sãåçæåååääç"
 
-#: ../src/window-commands.c:533
+#: ../src/window-commands.c:527
 #, c-format
 msgid "The application '%s' could not be created"
 msgstr "çæåçæççåã%sã"
 
-#: ../src/window-commands.c:541
+#: ../src/window-commands.c:535
 msgid "Launch"
 msgstr "åè"
 
 #. Show dialog with icon, title.
-#: ../src/window-commands.c:574
+#: ../src/window-commands.c:568
 msgid "Create Web Application"
 msgstr "åççéæççå"
 
-#: ../src/window-commands.c:579
+#: ../src/window-commands.c:573
 msgid "C_reate"
 msgstr "åç(_R)"
 
-#: ../src/window-commands.c:1125
+#: ../src/window-commands.c:1109
 msgid ""
 "Web is free software; you can redistribute it and/or modify it under the "
 "terms of the GNU General Public License as published by the Free Software "
 "Foundation; either version 2 of the License, or (at your option) any later "
 "version."
-msgstr "Web çèçèäïäåæææèçèäåéææçèç GNU éçååææææèåïåæçååçæåèïæäæïçèäæææçææææççäçæïäèèéæçïääæåçèççæã"
+msgstr "Web (èåãçéã) çèçèäïäåæææèçèäåéææçèç GNU éçååææææèåïåæçååçæåèïæäæïçèäæææçææææççäçæïäèèéæçïääæåçèççæã"
 
-#: ../src/window-commands.c:1129
+#: ../src/window-commands.c:1113
 msgid ""
 "The GNOME Web Browser is distributed in the hope that it will be useful, but "
 "WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY "
@@ -2199,27 +2133,27 @@ msgid ""
 "more details."
 msgstr "GNOME çéçèåäåæäçççèåäæåïçèäèääæäèäïäçåéåææçåççéçææççéçææäãèæèåç GNU éçååææã"
 
-#: ../src/window-commands.c:1133
+#: ../src/window-commands.c:1117
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "the GNOME Web Browser; if not, write to the Free Software Foundation, Inc., "
 "51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA"
 msgstr "äæåæåééææçåç GNU éçååææçåæïåçïèåäèèçèäåéæï51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA"
 
-#: ../src/window-commands.c:1179 ../src/window-commands.c:1195
-#: ../src/window-commands.c:1206
+#: ../src/window-commands.c:1163 ../src/window-commands.c:1179
+#: ../src/window-commands.c:1190
 msgid "Contact us at:"
 msgstr "èçæåæï"
 
-#: ../src/window-commands.c:1182
+#: ../src/window-commands.c:1166
 msgid "Contributors:"
 msgstr "èçèï"
 
-#: ../src/window-commands.c:1185
+#: ../src/window-commands.c:1169
 msgid "Past developers:"
 msgstr "ååéçäåï"
 
-#: ../src/window-commands.c:1215
+#: ../src/window-commands.c:1199
 #, c-format
 msgid ""
 "Lets you view web pages and find information on the internet.\n"
@@ -2236,7 +2170,7 @@ msgstr ""
 #. * this translation; in that case, please write each of them on a separate
 #. * line seperated by newlines (\n).
 #.
-#: ../src/window-commands.c:1244
+#: ../src/window-commands.c:1228
 msgid "translator-credits"
 msgstr ""
 "ååçèæääæèïèéäåéåéäç\n"
@@ -2247,22 +2181,22 @@ msgstr ""
 "Ching-Hung Lin <billlin wshlab2 ee kuas edu tw>, 2004\n"
 "Abel Cheung <maddog linux org hk>, 2003"
 
-#: ../src/window-commands.c:1247
+#: ../src/window-commands.c:1231
 msgid "Web Website"
 msgstr "çéçç"
 
-#: ../src/window-commands.c:1389
+#: ../src/window-commands.c:1373
 msgid "Enable caret browsing mode?"
 msgstr "æååçéççèï"
 
-#: ../src/window-commands.c:1392
+#: ../src/window-commands.c:1376
 msgid ""
 "Pressing F7 turns caret browsing on or off. This feature places a moveable "
 "cursor in web pages, allowing you to move around with your keyboard. Do you "
 "want to enable caret browsing on?"
 msgstr "æä F7 æéåæéééççèãéååèæåçéäæçäååçåçææïèäåääçéçéèçåãäæåèåçéççèï"
 
-#: ../src/window-commands.c:1395
+#: ../src/window-commands.c:1379
 msgid "_Enable"
 msgstr "åç(_E)"
 
@@ -2275,6 +2209,54 @@ msgstr "åç(_E)"
 #~ msgid "_Quit"
 #~ msgstr "çæ(_Q)"
 
+#~ msgid "Disable connection to session manager"
+#~ msgstr "åçåäæéæçççåçéç"
+
+#~ msgid "Specify file containing saved configuration"
+#~ msgstr "æååååååçæçææ"
+
+#~ msgid "Specify session management ID"
+#~ msgstr "æåäæéæçç ID"
+
+#~ msgid "ID"
+#~ msgstr "ID"
+
+#~ msgid "Session management options:"
+#~ msgstr "äæéæççééï"
+
+#~ msgid "Show session management options"
+#~ msgstr "éçäæéæççéé"
+
+#~ msgid "Downloads will be aborted and logout proceed in %d second."
+#~ msgid_plural "Downloads will be aborted and logout proceed in %d seconds."
+#~ msgstr[0] "äèåæèäæåå %d åçåã"
+
+#~ msgid "Abort pending downloads?"
+#~ msgstr "åææåæçäèï"
+
+#~ msgid ""
+#~ "There are still downloads pending. If you log out, they will be aborted "
+#~ "and lost."
+#~ msgstr "éæäèæåæãåææçåïåååæèäæåéåã"
+
+#~ msgid "_Cancel Logout"
+#~ msgstr "åæçå(_C)"
+
+#~ msgid "_Abort Downloads"
+#~ msgstr "åæäè(_A)"
+
+#~ msgid "_Don't recover"
+#~ msgstr "äèåå(_D)"
+
+#~ msgid "_Recover session"
+#~ msgstr "ååäæéæ(_R)"
+
+#~ msgid "Do you want to recover the previous browser windows and tabs?"
+#~ msgstr "æåèååååççèåèçååéï"
+
+#~ msgid "All"
+#~ msgstr "åé"
+
 #~ msgid "Update bookmark â%sâ?"
 #~ msgstr "æææçâ%sâï"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 214e148..d630386 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -13,9 +13,9 @@ msgstr ""
 "Project-Id-Version: epiphany 3.3.91\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=epiphany\n"
-"POT-Creation-Date: 2012-03-08 15:57+0800\n"
-"PO-Revision-Date: 2012-03-08 15:44+0800\n"
-"Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
+"POT-Creation-Date: 2012-04-11 09:26+0800\n"
+"PO-Revision-Date: 2012-04-08 21:43+0800\n"
+"Last-Translator: Cheng-Chia Tseng <pswo10680 gmail com>\n"
 "Language-Team: Chinese (Taiwan) <zh-l10n lists linux org tw>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
@@ -51,7 +51,7 @@ msgid "Epiphany Web Browser"
 msgstr "Epiphany çéçèå"
 
 #: ../data/epiphany.desktop.in.in.h:3 ../src/ephy-main.c:73
-#: ../src/ephy-main.c:321 ../src/ephy-main.c:462 ../src/window-commands.c:1228
+#: ../src/ephy-main.c:321 ../src/ephy-main.c:466 ../src/window-commands.c:1212
 msgid "Web"
 msgstr "çé"
 
@@ -59,219 +59,16 @@ msgstr "çé"
 msgid "Web Browser"
 msgstr "çéçèå"
 
-#: ../data/ui/epiphany.ui.h:1
-msgid "<b>_Automatic</b>"
-msgstr "<b>èå(_A)ï</b>"
-
-#: ../data/ui/epiphany.ui.h:2
-msgid "<b>_Use a different encoding:</b>"
-msgstr "äçäåççç(_U)ï"
-
-#: ../data/ui/epiphany.ui.h:3
-msgid "Content:"
-msgstr "åå"
-
-#: ../data/ui/epiphany.ui.h:4
-msgid "Cookie properties"
-msgstr "Cookie åæ"
-
-#: ../data/ui/epiphany.ui.h:5 ../data/ui/prefs-dialog.ui.h:8
-msgid "Cookies"
-msgstr "Cookie"
-
-#: ../data/ui/epiphany.ui.h:6
-msgid "Expires:"
-msgstr "æéï"
-
-#: ../data/ui/epiphany.ui.h:7 ../data/ui/prefs-dialog.ui.h:22
-msgid "Passwords"
-msgstr "åç"
-
-#: ../data/ui/epiphany.ui.h:8
-msgid "Path:"
-msgstr "èåï"
-
-#: ../data/ui/epiphany.ui.h:9
-msgid "Personal Data"
-msgstr "åäèæ"
-
-#: ../data/ui/epiphany.ui.h:10
-msgid "Send for:"
-msgstr "åéçï"
-
-#: ../data/ui/epiphany.ui.h:11
-msgid "Text Encoding"
-msgstr "ååçç"
-
-#: ../data/ui/epiphany.ui.h:12 ../src/ephy-encoding-menu.c:338
-msgid "Use the encoding specified by the document"
-msgstr "äçæäæåçççæå"
-
-#: ../data/ui/epiphany.ui.h:13
-msgid "_Show passwords"
-msgstr "éçåç(_S)"
-
-#. Refers to "Only from sites you visit" option under Cookies.
-#: ../data/ui/prefs-dialog.ui.h:2
-msgid "<small>For example, not from advertisers on these sites</small>"
-msgstr "<small>äåïäèäèéäçççåå</small>"
-
-#: ../data/ui/prefs-dialog.ui.h:3
-msgid "A_utomatically open downloaded files"
-msgstr "èåäèäéåææ(_U)"
-
-#: ../data/ui/prefs-dialog.ui.h:4
-msgid "Add Language"
-msgstr "ååèè"
-
-#: ../data/ui/prefs-dialog.ui.h:5
-msgid "Allow popup _windows"
-msgstr "åèåååèç(_W)"
-
-#: ../data/ui/prefs-dialog.ui.h:6
-msgid "Choose a l_anguage:"
-msgstr "éæèè(_A)ï"
-
-#. Translators: the mnemonic shouldn't conflict with any of the
-#. * standard items in the GtkEntry context menu (Cut, Copy, Paste, Delete,
-#. * Select All, Input Methods and Insert Unicode control character.)
-#.
-#: ../data/ui/prefs-dialog.ui.h:7 ../lib/widgets/ephy-location-entry.c:462
-#: ../src/ephy-history-window.c:231 ../src/pdm-dialog.c:355
-msgid "Cl_ear"
-msgstr "æé(_E)"
-
-#: ../data/ui/prefs-dialog.ui.h:9
-msgid "De_fault:"
-msgstr "éè(_F)ï"
-
-#. If we don't have XDG user dirs info, return an educated guess.
-#: ../data/ui/prefs-dialog.ui.h:10 ../lib/ephy-file-helpers.c:116
-msgid "Downloads"
-msgstr "äè"
-
-#: ../data/ui/prefs-dialog.ui.h:11
-msgid "Enable Java_Script"
-msgstr "åç Java_Script"
-
-#: ../data/ui/prefs-dialog.ui.h:12
-msgid "Enable _plugins"
-msgstr "åçåæçå(_P)"
-
-#: ../data/ui/prefs-dialog.ui.h:13 ../src/ephy-encoding-dialog.c:302
-msgid "Encodings"
-msgstr "çç(_E)"
-
-#: ../data/ui/prefs-dialog.ui.h:14
-msgid "Fonts"
-msgstr "åå"
-
-#: ../data/ui/prefs-dialog.ui.h:15
-msgid "Fonts & Style"
-msgstr "ååèæå"
-
-#: ../data/ui/prefs-dialog.ui.h:16
-msgid "General"
-msgstr "äè"
-
-#: ../data/ui/prefs-dialog.ui.h:17 ../src/prefs-dialog.c:774
-msgid "Language"
-msgstr "èè"
-
-#: ../data/ui/prefs-dialog.ui.h:18
-msgid "Languages"
-msgstr "èè"
-
-#: ../data/ui/prefs-dialog.ui.h:19
-msgid "MB"
-msgstr "MB"
-
-#: ../data/ui/prefs-dialog.ui.h:20
-msgid "Monospace font:"
-msgstr "çåååï"
-
-#: ../data/ui/prefs-dialog.ui.h:21
-msgid "Only _from sites you visit"
-msgstr "åäèæçèççç(_F)"
-
-#: ../data/ui/prefs-dialog.ui.h:23
-msgid "Preferences"
-msgstr "ååèå"
-
-#: ../data/ui/prefs-dialog.ui.h:24
-msgid "Privacy"
-msgstr "éç"
-
-#: ../data/ui/prefs-dialog.ui.h:25
-msgid "Sans serif font:"
-msgstr "çèçååï"
-
-#: ../data/ui/prefs-dialog.ui.h:26
-msgid "Serif font:"
-msgstr "èçååï"
-
-#: ../data/ui/prefs-dialog.ui.h:27
-msgid "Spell checking"
-msgstr "æåææ"
-
-#: ../data/ui/prefs-dialog.ui.h:28
-msgid "Style"
-msgstr "æå"
-
-#: ../data/ui/prefs-dialog.ui.h:29
-msgid "Temporary Files"
-msgstr "æåæ"
-
-#: ../data/ui/prefs-dialog.ui.h:30
-msgid "Use custom _stylesheet"
-msgstr "äçèèæåè(_S)"
-
-#: ../data/ui/prefs-dialog.ui.h:31
-msgid "Web Content"
-msgstr "çéåå"
-
-#: ../data/ui/prefs-dialog.ui.h:32
-msgid "_Always accept"
-msgstr "çææå(_A)"
-
-#: ../data/ui/prefs-dialog.ui.h:33
-msgid "_Disk space:"
-msgstr "çççé(_D)ï"
-
-#: ../data/ui/prefs-dialog.ui.h:34
-msgid "_Download folder:"
-msgstr "äèèæå(_D)"
-
-#: ../data/ui/prefs-dialog.ui.h:35
-msgid "_Edit Stylesheetâ"
-msgstr "çèæåè(_E)â"
-
-#: ../data/ui/prefs-dialog.ui.h:36
-msgid "_Enable spell checking"
-msgstr "åçæåææ(_E)"
-
-#: ../data/ui/prefs-dialog.ui.h:37
-msgid "_Never accept"
-msgstr "æäæå(_N)"
-
-#: ../data/ui/prefs-dialog.ui.h:38
-msgid "_Remember passwords"
-msgstr "èéåç(_R)"
-
-#: ../data/ui/prefs-dialog.ui.h:39
-msgid "_Use system fonts"
-msgstr "äçççåå(_U)"
-
 #: ../embed/ephy-download.c:217
 msgctxt "file type"
 msgid "Unknown"
 msgstr "äæ"
 
-#: ../embed/ephy-embed.c:806
+#: ../embed/ephy-embed.c:692
 msgid "Web Inspector"
 msgstr "çéææå"
 
-#: ../embed/ephy-embed-shell.c:264
+#: ../embed/ephy-embed-shell.c:207
 msgid "Epiphany can't be used now. Initialization failed."
 msgstr "Epiphany çåçæäçãåååçååæã"
 
@@ -604,20 +401,6 @@ msgstr "èåç (UTF-3_2BE)"
 msgid "Unknown (%s)"
 msgstr "äæ (%s)"
 
-#: ../embed/ephy-history.c:474
-msgid "All"
-msgstr "åé"
-
-#: ../embed/ephy-history.c:640
-#: ../lib/history/ephy-history-service-hosts-table.c:360
-msgid "Others"
-msgstr "åå"
-
-#: ../embed/ephy-history.c:646
-#: ../lib/history/ephy-history-service-hosts-table.c:364
-msgid "Local files"
-msgstr "ææææ"
-
 #: ../embed/ephy-request-about.c:101 ../embed/ephy-request-about.c:104
 msgid "Installed plugins"
 msgstr "ååèçåæçå"
@@ -666,15 +449,15 @@ msgstr "åèæï"
 #. characters
 #. ms
 #. RELOAD_DELAY * RELOAD_DELAY_MAX_TICKS = 10 s
-#: ../embed/ephy-web-view.c:71 ../embed/ephy-web-view.c:3470
+#: ../embed/ephy-web-view.c:70 ../embed/ephy-web-view.c:3441
 msgid "Blank page"
 msgstr "ççéé"
 
-#: ../embed/ephy-web-view.c:760
+#: ../embed/ephy-web-view.c:770
 msgid "_Not now"
 msgstr "çåäè(_N)"
 
-#: ../embed/ephy-web-view.c:765
+#: ../embed/ephy-web-view.c:775
 msgid "_Store password"
 msgstr "åååç(_S)"
 
@@ -682,41 +465,45 @@ msgstr "åååç(_S)"
 #. * hostname where this is happening. Example: gnome gmail com and
 #. * mail.google.com.
 #.
-#: ../embed/ephy-web-view.c:776
+#: ../embed/ephy-web-view.c:786
 #, c-format
 msgid ""
 "<big>Would you like to store the password for <b>%s</b> in <b>%s</b>?</big>"
 msgstr "<big>æåèåå <b>%s</b> å <b>%s</b> çåçï</big>"
 
+#: ../embed/ephy-web-view.c:1133
+msgid "Plugins"
+msgstr "åæçå"
+
 #. Translators: Geolocation policy for a specific site.
-#: ../embed/ephy-web-view.c:1747
+#: ../embed/ephy-web-view.c:1784
 msgid "Deny"
 msgstr "çæ"
 
 #. Translators: Geolocation policy for a specific site.
-#: ../embed/ephy-web-view.c:1753
+#: ../embed/ephy-web-view.c:1790
 msgid "Allow"
 msgstr "åè"
 
-#: ../embed/ephy-web-view.c:1760
+#: ../embed/ephy-web-view.c:1797
 #, c-format
 msgid "The page at <b>%s</b> wants to know your location."
 msgstr "å <b>%s</b> ççéæèçéæçäçã"
 
-#: ../embed/ephy-web-view.c:2040
+#: ../embed/ephy-web-view.c:2118
 msgid "None specified"
 msgstr "æææå"
 
-#: ../embed/ephy-web-view.c:2049 ../embed/ephy-web-view.c:2067
+#: ../embed/ephy-web-view.c:2127 ../embed/ephy-web-view.c:2145
 #, c-format
 msgid "Oops! Error loading %s"
 msgstr "åïèå %s æççéè"
 
-#: ../embed/ephy-web-view.c:2051
+#: ../embed/ephy-web-view.c:2129
 msgid "Oops! It was not possible to show this website"
 msgstr "åïçæéçéåçç"
 
-#: ../embed/ephy-web-view.c:2052
+#: ../embed/ephy-web-view.c:2130
 #, c-format
 msgid ""
 "<p>The website at <strong>%s</strong> seems to be unavailable. The precise "
@@ -728,15 +515,15 @@ msgstr ""
 "em></p><p>ååèèææééæçååæçäåãäèåäææçéçèéçæåæå"
 "éäã</p>"
 
-#: ../embed/ephy-web-view.c:2061
+#: ../embed/ephy-web-view.c:2139
 msgid "Try again"
 msgstr "åèäæ"
 
-#: ../embed/ephy-web-view.c:2069
+#: ../embed/ephy-web-view.c:2147
 msgid "Oops! This site might have caused the web browser to close unexpectedly"
 msgstr "åïéåççåèåéæçéçèåæéæçéé"
 
-#: ../embed/ephy-web-view.c:2071
+#: ../embed/ephy-web-view.c:2149
 #, c-format
 msgid ""
 "<p>This page was loading when the web browser closed unexpectedly.</"
@@ -747,33 +534,29 @@ msgstr ""
 "ååççéåçæãåæççéæïèååéååç <strong>%s</strong> éçåéã"
 "</p>"
 
-#: ../embed/ephy-web-view.c:2079
+#: ../embed/ephy-web-view.c:2157
 msgid "Load again anyway"
 msgstr "åååæèå"
 
-#: ../embed/ephy-web-view.c:2355
+#: ../embed/ephy-web-view.c:2428
 #, c-format
 msgid "http://www.google.com/search?q=%s&ie=UTF-8&oe=UTF-8";
 msgstr "http://www.google.com.tw/search?q=%s&ie=UTF-8&oe=UTF-8";
 
-#: ../embed/ephy-web-view.c:2641
-msgid "Plugins"
-msgstr "åæçå"
-
 #. translators: %s here is the address of the web page
-#: ../embed/ephy-web-view.c:2748
+#: ../embed/ephy-web-view.c:2773
 #, c-format
 msgid "Loading â%sââ"
 msgstr "æåèåâ%sââ"
 
-#: ../embed/ephy-web-view.c:2750
+#: ../embed/ephy-web-view.c:2775
 msgid "Loadingâ"
 msgstr "èåäâ"
 
 #. Translators: this is the directory name to store auxilary files
 #. * when saving html files.
 #.
-#: ../embed/ephy-web-view.c:3674
+#: ../embed/ephy-web-view.c:3645
 #, c-format
 msgid "%s Files"
 msgstr "%s åææ"
@@ -813,34 +596,6 @@ msgstr "äèåéæä URI èãType=Linkãæééç"
 msgid "Not a launchable item"
 msgstr "äæåäååçéç"
 
-#: ../lib/egg/eggsmclient.c:225
-msgid "Disable connection to session manager"
-msgstr "åçåäæéæçççåçéç"
-
-#: ../lib/egg/eggsmclient.c:228
-msgid "Specify file containing saved configuration"
-msgstr "æååååååçæçææ"
-
-#: ../lib/egg/eggsmclient.c:228 ../src/ephy-main.c:88 ../src/ephy-main.c:90
-msgid "FILE"
-msgstr "ææ"
-
-#: ../lib/egg/eggsmclient.c:231
-msgid "Specify session management ID"
-msgstr "æåäæéæçç ID"
-
-#: ../lib/egg/eggsmclient.c:231
-msgid "ID"
-msgstr "ID"
-
-#: ../lib/egg/eggsmclient.c:252
-msgid "Session management options:"
-msgstr "äæéæççééï"
-
-#: ../lib/egg/eggsmclient.c:253
-msgid "Show session management options"
-msgstr "éçäæéæççéé"
-
 #: ../lib/ephy-file-chooser.c:382
 msgid "All supported types"
 msgstr "ææææçéå"
@@ -858,21 +613,26 @@ msgid "All files"
 msgstr "ææææ"
 
 #. If we don't have XDG user dirs info, return an educated guess.
+#: ../lib/ephy-file-helpers.c:116 ../src/prefs-dialog.ui.h:10
+msgid "Downloads"
+msgstr "äè"
+
+#. If we don't have XDG user dirs info, return an educated guess.
 #: ../lib/ephy-file-helpers.c:162
 msgid "Desktop"
 msgstr "æé"
 
-#: ../lib/ephy-file-helpers.c:325
+#: ../lib/ephy-file-helpers.c:326
 #, c-format
 msgid "Could not create a temporary directory in â%sâ."
 msgstr "çæåâ%sâåçæåçéã"
 
-#: ../lib/ephy-file-helpers.c:421
+#: ../lib/ephy-file-helpers.c:422
 #, c-format
 msgid "The file â%sâ exists. Please move it out of the way."
 msgstr "ææâ%sâ åçååïèåååçèååäçã"
 
-#: ../lib/ephy-file-helpers.c:432
+#: ../lib/ephy-file-helpers.c:433
 #, c-format
 msgid "Failed to create directory â%sâ."
 msgstr "çæåççéâ%sâã"
@@ -1001,6 +761,14 @@ msgstr "300%"
 msgid "400%"
 msgstr "400%"
 
+#: ../lib/history/ephy-history-service-hosts-table.c:360
+msgid "Others"
+msgstr "åå"
+
+#: ../lib/history/ephy-history-service-hosts-table.c:364
+msgid "Local files"
+msgstr "ææææ"
+
 #: ../lib/widgets/ephy-download-widget.c:88
 #, c-format
 msgid "%u:%02u hour left"
@@ -1038,7 +806,7 @@ msgstr "äèæççéèï%s"
 msgid "Cancel"
 msgstr "åæ"
 
-#: ../lib/widgets/ephy-download-widget.c:280 ../src/ephy-window.c:1276
+#: ../lib/widgets/ephy-download-widget.c:280 ../src/ephy-window.c:1311
 #: ../src/window-commands.c:263
 msgid "Open"
 msgstr "éå"
@@ -1047,18 +815,27 @@ msgstr "éå"
 msgid "Show in folder"
 msgstr "åèæåéç"
 
-#: ../lib/widgets/ephy-download-widget.c:458
+#: ../lib/widgets/ephy-download-widget.c:462
 msgid "Startingâ"
 msgstr "æåéåâ"
 
-#: ../lib/widgets/ephy-hosts-store.c:112
+#: ../lib/widgets/ephy-hosts-store.c:230
 msgid "All sites"
 msgstr "ææçç"
 
-#: ../lib/widgets/ephy-hosts-view.c:43
+#: ../lib/widgets/ephy-hosts-view.c:46
 msgid "Sites"
 msgstr "çç"
 
+#. Translators: the mnemonic shouldn't conflict with any of the
+#. * standard items in the GtkEntry context menu (Cut, Copy, Paste, Delete,
+#. * Select All, Input Methods and Insert Unicode control character.)
+#.
+#: ../lib/widgets/ephy-location-entry.c:462 ../src/ephy-history-window.c:230
+#: ../src/pdm-dialog.c:352 ../src/prefs-dialog.ui.h:7
+msgid "Cl_ear"
+msgstr "æé(_E)"
+
 #: ../lib/widgets/ephy-location-entry.c:742
 msgid "Drag and drop this icon to create a link to this page"
 msgstr "ææéååçäåçéèèçéçéç"
@@ -1068,13 +845,13 @@ msgid "Clear"
 msgstr "æé"
 
 #: ../lib/widgets/ephy-urls-view.c:43
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1646
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1662
 msgid "Title"
 msgstr "æé"
 
 #: ../lib/widgets/ephy-urls-view.c:51
 #: ../src/bookmarks/ephy-bookmarks-editor.c:213
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1657
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1673
 msgid "Address"
 msgstr "åå"
 
@@ -1124,27 +901,27 @@ msgstr "äé(_O)ï"
 msgid "Sho_w all topics"
 msgstr "éçææäé(_W)"
 
-#: ../src/bookmarks/ephy-bookmarks.c:93
+#: ../src/bookmarks/ephy-bookmarks.c:92
 msgid "Entertainment"
 msgstr "åæ"
 
-#: ../src/bookmarks/ephy-bookmarks.c:94
+#: ../src/bookmarks/ephy-bookmarks.c:93
 msgid "News"
 msgstr "æè"
 
-#: ../src/bookmarks/ephy-bookmarks.c:95
+#: ../src/bookmarks/ephy-bookmarks.c:94
 msgid "Shopping"
 msgstr "èç"
 
-#: ../src/bookmarks/ephy-bookmarks.c:96
+#: ../src/bookmarks/ephy-bookmarks.c:95
 msgid "Sports"
 msgstr "éå"
 
-#: ../src/bookmarks/ephy-bookmarks.c:97
+#: ../src/bookmarks/ephy-bookmarks.c:96
 msgid "Travel"
 msgstr "æé"
 
-#: ../src/bookmarks/ephy-bookmarks.c:98
+#: ../src/bookmarks/ephy-bookmarks.c:97
 msgid "Work"
 msgstr "åä"
 
@@ -1187,22 +964,22 @@ msgstr "åæäéäåé"
 
 #. Toplevel
 #: ../src/bookmarks/ephy-bookmarks-editor.c:152
-#: ../src/ephy-history-window.c:129
+#: ../src/ephy-history-window.c:128
 msgid "_File"
 msgstr "ææ(_F)"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:153
-#: ../src/ephy-history-window.c:130
+#: ../src/ephy-history-window.c:129
 msgid "_Edit"
 msgstr "çè(_E)"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:154
-#: ../src/ephy-history-window.c:131
+#: ../src/ephy-history-window.c:130
 msgid "_View"
 msgstr "éç(_V)"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:155
-#: ../src/ephy-history-window.c:132
+#: ../src/ephy-history-window.c:131
 msgid "_Help"
 msgstr "æå(_H)"
 
@@ -1218,7 +995,7 @@ msgstr "åçæçäé"
 #. File Menu
 #: ../src/bookmarks/ephy-bookmarks-editor.c:162
 #: ../src/bookmarks/ephy-bookmarks-editor.c:1161
-#: ../src/ephy-history-window.c:136 ../src/ephy-history-window.c:642
+#: ../src/ephy-history-window.c:135 ../src/ephy-history-window.c:638
 msgid "Open in New _Window"
 msgid_plural "Open in New _Windows"
 msgstr[0] "åæçèçäéå(_W)"
@@ -1229,7 +1006,7 @@ msgstr "åæçèçäéååéçæç"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:165
 #: ../src/bookmarks/ephy-bookmarks-editor.c:1164
-#: ../src/ephy-history-window.c:139 ../src/ephy-history-window.c:645
+#: ../src/ephy-history-window.c:138 ../src/ephy-history-window.c:641
 msgid "Open in New _Tab"
 msgid_plural "Open in New _Tabs"
 msgstr[0] "åæçåéäéå(_T)"
@@ -1271,7 +1048,7 @@ msgid "Export bookmarks to a file"
 msgstr "åæçåååææ"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:179
-#: ../src/ephy-history-window.c:145 ../src/ephy-window.c:105
+#: ../src/ephy-history-window.c:144 ../src/ephy-window.c:106
 msgid "_Close"
 msgstr "éé(_C)"
 
@@ -1281,39 +1058,39 @@ msgstr "ééæçèç"
 
 #. Edit Menu
 #: ../src/bookmarks/ephy-bookmarks-editor.c:184
-#: ../src/ephy-history-window.c:150 ../src/ephy-window.c:114
+#: ../src/ephy-history-window.c:149 ../src/ephy-window.c:115
 msgid "Cu_t"
 msgstr "åä(_T)"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:185
-#: ../src/ephy-history-window.c:151
+#: ../src/ephy-history-window.c:150
 msgid "Cut the selection"
 msgstr "åäéåçåå"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:187
 #: ../src/bookmarks/ephy-bookmarks-editor.c:1174
-#: ../src/ephy-history-window.c:153 ../src/ephy-history-window.c:655
-#: ../src/ephy-window.c:116
+#: ../src/ephy-history-window.c:152 ../src/ephy-history-window.c:651
+#: ../src/ephy-window.c:117
 msgid "_Copy"
 msgstr "èè(_C)"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:188
-#: ../src/ephy-history-window.c:154
+#: ../src/ephy-history-window.c:153
 msgid "Copy the selection"
 msgstr "èèéåçåå"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:190
-#: ../src/ephy-history-window.c:156 ../src/ephy-window.c:118
+#: ../src/ephy-history-window.c:155 ../src/ephy-window.c:119
 msgid "_Paste"
 msgstr "èä(_P)"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:191
-#: ../src/ephy-history-window.c:157
+#: ../src/ephy-history-window.c:156
 msgid "Paste the clipboard"
 msgstr "èäåèçäçåå"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:193
-#: ../src/ephy-history-window.c:159
+#: ../src/ephy-history-window.c:158
 msgid "_Delete"
 msgstr "åé(_D)"
 
@@ -1322,7 +1099,7 @@ msgid "Delete the selected bookmark or topic"
 msgstr "åéåéçæçæäé"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:196
-#: ../src/ephy-history-window.c:162 ../src/ephy-window.c:122
+#: ../src/ephy-history-window.c:161 ../src/ephy-window.c:123
 msgid "Select _All"
 msgstr "åééå(_A)"
 
@@ -1332,7 +1109,7 @@ msgstr "éåæææçææå"
 
 #. Help Menu
 #: ../src/bookmarks/ephy-bookmarks-editor.c:201
-#: ../src/ephy-history-window.c:170
+#: ../src/ephy-history-window.c:169
 msgid "_Contents"
 msgstr "åå(_C)"
 
@@ -1341,28 +1118,28 @@ msgid "Display bookmarks help"
 msgstr "éçæçèææä"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:204
-#: ../src/ephy-history-window.c:173
+#: ../src/ephy-history-window.c:172
 msgid "_About"
 msgstr "éæ(_A)"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:205
-#: ../src/ephy-history-window.c:174
+#: ../src/ephy-history-window.c:173
 msgid "Display credits for the web browser creators"
 msgstr "éèææéåçéçèåçåäè"
 
 #. View Menu
 #: ../src/bookmarks/ephy-bookmarks-editor.c:211
-#: ../src/ephy-history-window.c:188
+#: ../src/ephy-history-window.c:187
 msgid "_Title"
 msgstr "æé(_T)"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:212
-#: ../src/ephy-history-window.c:189
+#: ../src/ephy-history-window.c:188
 msgid "Show the title column"
 msgstr "éçæéæä"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:214
-#: ../src/ephy-history-window.c:191
+#: ../src/ephy-history-window.c:190
 msgid "Show the address column"
 msgstr "éçäåæä"
 
@@ -1406,7 +1183,7 @@ msgstr "Firebird"
 #: ../src/bookmarks/ephy-bookmarks-editor.c:511
 #, c-format
 msgid "Mozilla â%sâ profile"
-msgstr "Mozillaâ%sâèåçå"
+msgstr "Mozilla â%sâ èåçå"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:515
 msgid "Galeon"
@@ -1452,7 +1229,7 @@ msgid "Export Bookmarks"
 msgstr "ååæç"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:763
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1520
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1536
 #: ../src/bookmarks/ephy-topic-action.c:217
 msgid "Bookmarks"
 msgstr "æç"
@@ -1479,16 +1256,16 @@ msgid "File"
 msgstr "ææ"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:1170
-#: ../src/ephy-history-window.c:651
+#: ../src/ephy-history-window.c:647
 msgid "_Copy Address"
 msgstr "èèäå(_C)"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:1411
-#: ../src/ephy-history-window.c:804
+#: ../src/ephy-history-window.c:800
 msgid "_Search:"
 msgstr "æå(_S)ï"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1576
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1592
 msgid "Topics"
 msgstr "äé"
 
@@ -1514,7 +1291,7 @@ msgstr "åæ"
 msgid "Stop current data transfer"
 msgstr "åæåéçåçèæ"
 
-#: ../src/ephy-combined-stop-reload-action.c:44 ../src/ephy-window.c:137
+#: ../src/ephy-combined-stop-reload-action.c:44 ../src/ephy-window.c:138
 msgid "_Reload"
 msgstr "éæèå(_R)"
 
@@ -1522,6 +1299,10 @@ msgstr "éæèå(_R)"
 msgid "Display the latest content of the current page"
 msgstr "éçæéçææåå"
 
+#: ../src/ephy-encoding-dialog.c:301 ../src/prefs-dialog.ui.h:13
+msgid "Encodings"
+msgstr "çç"
+
 #: ../src/ephy-encoding-menu.c:330
 msgid "_Otherâ"
 msgstr "åå(_O)â"
@@ -1534,6 +1315,10 @@ msgstr "åäååççæå"
 msgid "_Automatic"
 msgstr "èå(_A)"
 
+#: ../src/ephy-encoding-menu.c:338 ../src/epiphany.ui.h:12
+msgid "Use the encoding specified by the document"
+msgstr "äçæäæåçççæå"
+
 #: ../src/ephy-find-toolbar.c:153
 msgid "Not found"
 msgstr "æäååä"
@@ -1577,94 +1362,94 @@ msgstr "åæääååçæååäçåæ"
 msgid "Leave Fullscreen"
 msgstr "ééåèå"
 
-#: ../src/ephy-history-window.c:137
+#: ../src/ephy-history-window.c:136
 msgid "Open the selected history link in a new window"
 msgstr "åæçèçäéååéççèèééç"
 
-#: ../src/ephy-history-window.c:140
+#: ../src/ephy-history-window.c:139
 msgid "Open the selected history link in a new tab"
 msgstr "åæçåéäéååéççèèééç"
 
-#: ../src/ephy-history-window.c:142
+#: ../src/ephy-history-window.c:141
 msgid "Add _Bookmarkâ"
 msgstr "ååæç(_B)â"
 
-#: ../src/ephy-history-window.c:143
+#: ../src/ephy-history-window.c:142
 msgid "Bookmark the selected history link"
 msgstr "ååéççèèééçååèæç"
 
-#: ../src/ephy-history-window.c:146
+#: ../src/ephy-history-window.c:145
 msgid "Close the history window"
 msgstr "ééçèèéèç"
 
-#: ../src/ephy-history-window.c:160
+#: ../src/ephy-history-window.c:159
 msgid "Delete the selected history link"
 msgstr "åéåéççèèééç"
 
-#: ../src/ephy-history-window.c:163
+#: ../src/ephy-history-window.c:162
 msgid "Select all history links or text"
 msgstr "éåææçèèééçææå"
 
-#: ../src/ephy-history-window.c:165
+#: ../src/ephy-history-window.c:164
 msgid "Clear _History"
 msgstr "æéçèèé(_H)"
 
-#: ../src/ephy-history-window.c:166
+#: ../src/ephy-history-window.c:165
 msgid "Clear your browsing history"
 msgstr "æéçèèé"
 
-#: ../src/ephy-history-window.c:171
+#: ../src/ephy-history-window.c:170
 msgid "Display history help"
 msgstr "éççèèéèææä"
 
-#: ../src/ephy-history-window.c:190
+#: ../src/ephy-history-window.c:189
 msgid "_Address"
 msgstr "äå(_A)"
 
-#: ../src/ephy-history-window.c:192
+#: ../src/ephy-history-window.c:191
 msgid "_Date and Time"
 msgstr "ææåæå(_D)"
 
-#: ../src/ephy-history-window.c:193
+#: ../src/ephy-history-window.c:192
 msgid "Show the date and time column"
 msgstr "éçææåæåæä"
 
-#: ../src/ephy-history-window.c:221
+#: ../src/ephy-history-window.c:220
 msgid "Clear browsing history?"
 msgstr "æåæéçèèéï"
 
-#: ../src/ephy-history-window.c:225
+#: ../src/ephy-history-window.c:224
 msgid ""
 "Clearing the browsing history will cause all history links to be permanently "
 "deleted."
 msgstr "æéçèèéåæäææçèèéæéèåéã"
 
-#: ../src/ephy-history-window.c:240
+#: ../src/ephy-history-window.c:239
 msgid "Clear History"
 msgstr "æéçèèé"
 
-#: ../src/ephy-history-window.c:813
+#: ../src/ephy-history-window.c:809
 msgid "Last 30 minutes"
 msgstr "å 30 åé"
 
-#: ../src/ephy-history-window.c:814
+#: ../src/ephy-history-window.c:810
 msgid "Today"
 msgstr "äæ"
 
 #. keep this in sync with embed/ephy-history.c's
 #. * HISTORY_PAGE_OBSOLETE_DAYS
-#: ../src/ephy-history-window.c:816 ../src/ephy-history-window.c:820
-#: ../src/ephy-history-window.c:826
+#: ../src/ephy-history-window.c:812 ../src/ephy-history-window.c:816
+#: ../src/ephy-history-window.c:822
 #, c-format
 msgid "Last %d day"
 msgid_plural "Last %d days"
 msgstr[0] "æè %d æ"
 
-#: ../src/ephy-history-window.c:830
+#: ../src/ephy-history-window.c:826
 msgid "All history"
 msgstr "ææçèèé"
 
-#: ../src/ephy-history-window.c:1125
+#: ../src/ephy-history-window.c:1123
 msgid "History"
 msgstr "çèèé"
 
@@ -1684,6 +1469,10 @@ msgstr "ååæççèå"
 msgid "Import bookmarks from the given file"
 msgstr "åææåçææååæç"
 
+#: ../src/ephy-main.c:88 ../src/ephy-main.c:90
+msgid "FILE"
+msgstr "ææ"
+
 #: ../src/ephy-main.c:90
 msgid "Load the given session file"
 msgstr "èåæåçäæéæææ"
@@ -1698,7 +1487,7 @@ msgstr "URL"
 
 #: ../src/ephy-main.c:94
 msgid "Start a private instance"
-msgstr "åå private instance"
+msgstr "ååçååé"
 
 #: ../src/ephy-main.c:96
 msgid "Start the browser in application mode"
@@ -1706,7 +1495,7 @@ msgstr "äæççåæåååçèå"
 
 #: ../src/ephy-main.c:98
 msgid "Profile directory to use in the private instance"
-msgstr "å private instance äççèåçåçé"
+msgstr "åçååéääççèåçåçé"
 
 #: ../src/ephy-main.c:98
 msgid "DIR"
@@ -1737,310 +1526,322 @@ msgstr "çééé"
 msgid "Close tab"
 msgstr "ééåé"
 
-#: ../src/ephy-session.c:115
-#, c-format
-msgid "Downloads will be aborted and logout proceed in %d second."
-msgid_plural "Downloads will be aborted and logout proceed in %d seconds."
-msgstr[0] "äèåæèäæåå %d åçåã"
-
-#: ../src/ephy-session.c:219
-msgid "Abort pending downloads?"
-msgstr "åææåæçäèï"
-
-#: ../src/ephy-session.c:224
-msgid ""
-"There are still downloads pending. If you log out, they will be aborted and "
-"lost."
-msgstr "éæäèæåæãåææçåïåååæèäæåéåã"
-
-#: ../src/ephy-session.c:228
-msgid "_Cancel Logout"
-msgstr "åæçå(_C)"
-
-#: ../src/ephy-session.c:230
-msgid "_Abort Downloads"
-msgstr "åæäè(_A)"
-
-#: ../src/ephy-session.c:770
-msgid "_Don't recover"
-msgstr "äèåå(_D)"
-
-#: ../src/ephy-session.c:775
-msgid "_Recover session"
-msgstr "ååäæéæ(_R)"
-
-#: ../src/ephy-session.c:780
-msgid "Do you want to recover the previous browser windows and tabs?"
-msgstr "æåèååååççèåèçååéï"
-
 #. Toplevel
-#: ../src/ephy-window.c:87
+#: ../src/ephy-window.c:88
 msgid "_Bookmarks"
 msgstr "æç(_B)"
 
-#: ../src/ephy-window.c:91
+#: ../src/ephy-window.c:92
 msgid "_Extensions"
 msgstr "æååè(_E)"
 
 #. File actions.
-#: ../src/ephy-window.c:95
+#: ../src/ephy-window.c:96
 msgid "_Openâ"
 msgstr "éå(_O)â"
 
-#: ../src/ephy-window.c:97
+#: ../src/ephy-window.c:98
 msgid "Save _Asâ"
 msgstr "ååææ(_A)â"
 
-#: ../src/ephy-window.c:99
+#: ../src/ephy-window.c:100
 msgid "Save As _Web Applicationâ"
 msgstr "ååççéæççå(_W)â"
 
-#: ../src/ephy-window.c:101
+#: ../src/ephy-window.c:102
 msgid "_Printâ"
 msgstr "åå(_P)â"
 
-#: ../src/ephy-window.c:103
+#: ../src/ephy-window.c:104
 msgid "S_end Link by Emailâ"
 msgstr "äééåééç(_E)â"
 
 #. Edit actions.
-#: ../src/ephy-window.c:110
+#: ../src/ephy-window.c:111
 msgid "_Undo"
 msgstr "åå(_U)"
 
-#: ../src/ephy-window.c:112
+#: ../src/ephy-window.c:113
 msgid "Re_do"
 msgstr "åæåå(_D)"
 
-#: ../src/ephy-window.c:124
+#: ../src/ephy-window.c:125
 msgid "_Findâ"
 msgstr "åæ(_F)â"
 
-#: ../src/ephy-window.c:126
+#: ../src/ephy-window.c:127
 msgid "Find Ne_xt"
 msgstr "æääå(_X)"
 
-#: ../src/ephy-window.c:128
+#: ../src/ephy-window.c:129
 msgid "Find Pre_vious"
 msgstr "æääå(_V)"
 
 #. View actions.
-#: ../src/ephy-window.c:133 ../src/ephy-window.c:135
+#: ../src/ephy-window.c:134 ../src/ephy-window.c:136
 msgid "_Stop"
 msgstr "åæ(_S)"
 
-#: ../src/ephy-window.c:139
+#: ../src/ephy-window.c:140
 msgid "_Larger Text"
 msgstr "æååå(_L)"
 
-#: ../src/ephy-window.c:141
+#: ../src/ephy-window.c:142
 msgid "S_maller Text"
 msgstr "çååå(_M)"
 
-#: ../src/ephy-window.c:143
+#: ../src/ephy-window.c:144
 msgid "_Normal Size"
 msgstr "æååå(_N)"
 
-#: ../src/ephy-window.c:145
+#: ../src/ephy-window.c:146
 msgid "Text _Encoding"
 msgstr "ååçç(_E)"
 
-#: ../src/ephy-window.c:146
+#: ../src/ephy-window.c:147
 msgid "_Page Source"
 msgstr "çéåååå(_P)"
 
 #. Bookmarks actions.
-#: ../src/ephy-window.c:151
+#: ../src/ephy-window.c:152
 msgid "_Add Bookmarkâ"
 msgstr "ååæç(_A)â"
 
 #. Go actions.
-#: ../src/ephy-window.c:156
+#: ../src/ephy-window.c:157
 msgid "_Locationâ"
 msgstr "äç(_L)â"
 
 #. Tabs actions.
-#: ../src/ephy-window.c:161
+#: ../src/ephy-window.c:162
 msgid "_Previous Tab"
 msgstr "ääååé(_P)"
 
-#: ../src/ephy-window.c:163
+#: ../src/ephy-window.c:164
 msgid "_Next Tab"
 msgstr "ääååé(_N)"
 
-#: ../src/ephy-window.c:165
+#: ../src/ephy-window.c:166
 msgid "Move Tab _Left"
 msgstr "åéååç(_L)"
 
-#: ../src/ephy-window.c:167
+#: ../src/ephy-window.c:168
 msgid "Move Tab _Right"
 msgstr "åéååç(_R)"
 
-#: ../src/ephy-window.c:169
+#: ../src/ephy-window.c:170
 msgid "_Detach Tab"
 msgstr "åéåé(_D)"
 
 #. File actions.
-#: ../src/ephy-window.c:177
+#: ../src/ephy-window.c:178
 msgid "_Work Offline"
 msgstr "éçæå(_W)"
 
 #. View actions.
-#: ../src/ephy-window.c:182
+#: ../src/ephy-window.c:183
 msgid "_Downloads Bar"
 msgstr "äèå(_D)"
 
-#: ../src/ephy-window.c:185
+#: ../src/ephy-window.c:186
 msgid "_Fullscreen"
 msgstr "åèå(_F)"
 
-#: ../src/ephy-window.c:187
+#: ../src/ephy-window.c:188
 msgid "Popup _Windows"
 msgstr "åååèç(_W)"
 
-#: ../src/ephy-window.c:189
+#: ../src/ephy-window.c:190
 msgid "Selection Caret"
 msgstr "éæææ"
 
 #. Document.
-#: ../src/ephy-window.c:196
+#: ../src/ephy-window.c:197
 msgid "Add Boo_kmarkâ"
 msgstr "ååæç(_K)â"
 
 #. Links.
-#: ../src/ephy-window.c:201
+#: ../src/ephy-window.c:202
 msgid "_Open Link"
 msgstr "éåéç(_O)"
 
-#: ../src/ephy-window.c:203
+#: ../src/ephy-window.c:204
 msgid "Open Link in New _Window"
 msgstr "åæçèçäéåéç(_W)"
 
-#: ../src/ephy-window.c:205
+#: ../src/ephy-window.c:206
 msgid "Open Link in New _Tab"
 msgstr "åæçåéäéåéç(_T)"
 
-#: ../src/ephy-window.c:207
+#: ../src/ephy-window.c:208
 msgid "_Download Link"
 msgstr "äèéç(_D)"
 
-#: ../src/ephy-window.c:209
+#: ../src/ephy-window.c:210
 msgid "_Save Link Asâ"
 msgstr "ååéç(_S)â"
 
-#: ../src/ephy-window.c:211
+#: ../src/ephy-window.c:212
 msgid "_Bookmark Linkâ"
 msgstr "åéçååæç(_B)â"
 
-#: ../src/ephy-window.c:213
+#: ../src/ephy-window.c:214
 msgid "_Copy Link Address"
 msgstr "èèéçåå(_C)"
 
 #. Images.
-#: ../src/ephy-window.c:218
+#: ../src/ephy-window.c:219
 msgid "Open _Image"
 msgstr "éååç(_I)"
 
-#: ../src/ephy-window.c:220
+#: ../src/ephy-window.c:221
 msgid "_Save Image Asâ"
 msgstr "åååç(_S)â"
 
-#: ../src/ephy-window.c:222
+#: ../src/ephy-window.c:223
 msgid "_Use Image As Background"
 msgstr "äçåçäçæéèæ(_U)"
 
-#: ../src/ephy-window.c:224
+#: ../src/ephy-window.c:225
 msgid "Copy I_mage Address"
 msgstr "èèåçåå(_M)"
 
-#: ../src/ephy-window.c:226
+#: ../src/ephy-window.c:227
 msgid "St_art Animation"
 msgstr "åçéå(_A)"
 
-#: ../src/ephy-window.c:228
+#: ../src/ephy-window.c:229
 msgid "St_op Animation"
 msgstr "åçåæ(_O)"
 
 #. Inspector.
-#: ../src/ephy-window.c:244
+#: ../src/ephy-window.c:245
 msgid "Inspect _Element"
 msgstr "ææåç(_E)"
 
-#: ../src/ephy-window.c:449
+#: ../src/ephy-window.c:450
 msgid "There are unsubmitted changes to form elements"
 msgstr "åèåçåçèèææççèçæè"
 
-#: ../src/ephy-window.c:450
+#: ../src/ephy-window.c:451
 msgid "If you close the document anyway, you will lose that information."
 msgstr "åææçèçäèééææäïæåæååæååçèèã"
 
-#: ../src/ephy-window.c:452
+#: ../src/ephy-window.c:453
 msgid "Close _Document"
 msgstr "ééæä(_D)"
 
-#: ../src/ephy-window.c:470
+#: ../src/ephy-window.c:471
 msgid "There are ongoing downloads in this window"
 msgstr "éåèçéæéèäçäè"
 
-#: ../src/ephy-window.c:471
+#: ../src/ephy-window.c:472
 msgid "If you close this window, the downloads will be cancelled"
 msgstr "åææéééåèçïéåäèäæèåæ"
 
-#: ../src/ephy-window.c:472
+#: ../src/ephy-window.c:473
 msgid "Close window and cancel downloads"
 msgstr "ééèçäåæäè"
 
-#: ../src/ephy-window.c:1278
+#: ../src/ephy-window.c:1313
 msgid "Save As"
 msgstr "ååææ"
 
-#: ../src/ephy-window.c:1280
+#: ../src/ephy-window.c:1315
 msgid "Save As Application"
 msgstr "ååçæççå"
 
-#: ../src/ephy-window.c:1282
+#: ../src/ephy-window.c:1317
 msgid "Print"
 msgstr "åå"
 
-#: ../src/ephy-window.c:1284
+#: ../src/ephy-window.c:1319
 msgid "Bookmark"
 msgstr "ååæç"
 
-#: ../src/ephy-window.c:1286
+#: ../src/ephy-window.c:1321
 msgid "Find"
 msgstr "åæ"
 
 #. Translators: This refers to text size
-#: ../src/ephy-window.c:1295
+#: ../src/ephy-window.c:1330
 msgid "Larger"
 msgstr "æå"
 
 #. Translators: This refers to text size
-#: ../src/ephy-window.c:1298
+#: ../src/ephy-window.c:1333
 msgid "Smaller"
 msgstr "çå"
 
-#: ../src/ephy-window.c:1318
+#: ../src/ephy-window.c:1353
 msgid "Back"
 msgstr "ääé"
 
-#: ../src/ephy-window.c:1330
+#: ../src/ephy-window.c:1365
 msgid "Forward"
 msgstr "ääé"
 
-#: ../src/ephy-window.c:1342
+#: ../src/ephy-window.c:1377
 msgid "Zoom"
 msgstr "çæ"
 
-#: ../src/ephy-window.c:1350
+#: ../src/ephy-window.c:1385
 msgid "New _Tab"
 msgstr "æååé(_T)"
 
-#: ../src/pdm-dialog.c:336
+#: ../src/epiphany.ui.h:1
+msgid "<b>_Automatic</b>"
+msgstr "<b>èå(_A)ï</b>"
+
+#: ../src/epiphany.ui.h:2
+msgid "<b>_Use a different encoding:</b>"
+msgstr "äçäåççç(_U)ï"
+
+#: ../src/epiphany.ui.h:3
+msgid "Content:"
+msgstr "åå"
+
+#: ../src/epiphany.ui.h:4
+msgid "Cookie properties"
+msgstr "Cookie åæ"
+
+#: ../src/epiphany.ui.h:5 ../src/prefs-dialog.ui.h:8
+msgid "Cookies"
+msgstr "Cookie"
+
+#: ../src/epiphany.ui.h:6
+msgid "Expires:"
+msgstr "æéï"
+
+#: ../src/epiphany.ui.h:7 ../src/prefs-dialog.ui.h:22
+msgid "Passwords"
+msgstr "åç"
+
+#: ../src/epiphany.ui.h:8
+msgid "Path:"
+msgstr "èåï"
+
+#: ../src/epiphany.ui.h:9
+msgid "Personal Data"
+msgstr "åäèæ"
+
+#: ../src/epiphany.ui.h:10
+msgid "Send for:"
+msgstr "åéçï"
+
+#: ../src/epiphany.ui.h:11
+msgid "Text Encoding"
+msgstr "ååçç"
+
+#: ../src/epiphany.ui.h:13
+msgid "_Show passwords"
+msgstr "éçåç(_S)"
+
+#: ../src/pdm-dialog.c:333
 msgid "<b>Select the personal data you want to clear</b>"
 msgstr "<b>éææèæéçåäèæ</b>"
 
-#: ../src/pdm-dialog.c:339
+#: ../src/pdm-dialog.c:336
 msgid ""
 "You are about to clear personal data that is stored about the web pages you "
 "have visited. Before proceeding, check the types of information that you "
@@ -2049,31 +1850,31 @@ msgstr ""
 "ææèæéçåäèæååäææåèéççéãåéåæéäåïèçåèçéåä"
 "éåçèèï"
 
-#: ../src/pdm-dialog.c:344
+#: ../src/pdm-dialog.c:341
 msgid "Clear All Personal Data"
 msgstr "æéææçåäèæ"
 
 #. Cookies
-#: ../src/pdm-dialog.c:378
+#: ../src/pdm-dialog.c:375
 msgid "C_ookies"
 msgstr "C_ookies"
 
 #. Passwords
-#: ../src/pdm-dialog.c:390
+#: ../src/pdm-dialog.c:387
 msgid "Saved _passwords"
 msgstr "ååçåç(_P)"
 
 #. History
-#: ../src/pdm-dialog.c:402
+#: ../src/pdm-dialog.c:399
 msgid "Hi_story"
 msgstr "æåèé(_S)"
 
 #. Cache
-#: ../src/pdm-dialog.c:414
+#: ../src/pdm-dialog.c:411
 msgid "_Temporary files"
 msgstr "æåææ(_T)"
 
-#: ../src/pdm-dialog.c:430
+#: ../src/pdm-dialog.c:427
 msgid ""
 "<small><i><b>Note:</b> You cannot undo this action. The data you are "
 "choosing to clear will be deleted forever.</i></small>"
@@ -2081,48 +1882,48 @@ msgstr ""
 "<small><i><b>ææï</b>æäèååéååäãææéæçèæåèæéåéã</i></"
 "small>"
 
-#: ../src/pdm-dialog.c:649
+#: ../src/pdm-dialog.c:646
 msgid "Encrypted connections only"
 msgstr "åéåååçéç"
 
-#: ../src/pdm-dialog.c:650
+#: ../src/pdm-dialog.c:647
 msgid "Any type of connection"
 msgstr "ääéåçéç"
 
 #. Session cookie
-#: ../src/pdm-dialog.c:655
+#: ../src/pdm-dialog.c:652
 msgid "End of current session"
 msgstr "çæçåçäæéæ"
 
-#: ../src/pdm-dialog.c:774
+#: ../src/pdm-dialog.c:771
 msgid "Domain"
 msgstr "çå"
 
-#: ../src/pdm-dialog.c:786
+#: ../src/pdm-dialog.c:783
 msgid "Name"
 msgstr "åç"
 
-#: ../src/pdm-dialog.c:1200
+#: ../src/pdm-dialog.c:1197
 msgid "Host"
 msgstr "äæ"
 
-#: ../src/pdm-dialog.c:1213
+#: ../src/pdm-dialog.c:1210
 msgid "User Name"
 msgstr "äçèåç"
 
-#: ../src/pdm-dialog.c:1226
+#: ../src/pdm-dialog.c:1223
 msgid "User Password"
 msgstr "äçèåç"
 
-#: ../src/popup-commands.c:273
+#: ../src/popup-commands.c:279
 msgid "Download Link"
 msgstr "äèéç"
 
-#: ../src/popup-commands.c:281
+#: ../src/popup-commands.c:287
 msgid "Save Link As"
 msgstr "ååéç(_A)â"
 
-#: ../src/popup-commands.c:288
+#: ../src/popup-commands.c:294
 msgid "Save Image As"
 msgstr "åååç"
 
@@ -2130,7 +1931,7 @@ msgstr "åååç"
 #. * second %s is the locale name. Example:
 #. * "French (France)"
 #.
-#: ../src/prefs-dialog.c:468 ../src/prefs-dialog.c:474
+#: ../src/prefs-dialog.c:467 ../src/prefs-dialog.c:473
 #, c-format
 msgctxt "language"
 msgid "%s (%s)"
@@ -2139,22 +1940,155 @@ msgstr "%s (%s)"
 #. Translators: this refers to a user-define language code
 #. * (one which isn't in our built-in list).
 #.
-#: ../src/prefs-dialog.c:483
+#: ../src/prefs-dialog.c:482
 #, c-format
 msgctxt "language"
 msgid "User defined (%s)"
 msgstr "äçèåç (%s)"
 
-#: ../src/prefs-dialog.c:505
+#: ../src/prefs-dialog.c:504
 #, c-format
 msgid "System language (%s)"
 msgid_plural "System languages (%s)"
 msgstr[0] "ççèè (%s)"
 
-#: ../src/prefs-dialog.c:863
+#: ../src/prefs-dialog.c:773 ../src/prefs-dialog.ui.h:17
+msgid "Language"
+msgstr "èè"
+
+#: ../src/prefs-dialog.c:862
 msgid "Select a Directory"
 msgstr "éæäåçé"
 
+#. Refers to "Only from sites you visit" option under Cookies.
+#: ../src/prefs-dialog.ui.h:2
+msgid "<small>For example, not from advertisers on these sites</small>"
+msgstr "<small>äåïäèäèéäçççåå</small>"
+
+#: ../src/prefs-dialog.ui.h:3
+msgid "A_utomatically open downloaded files"
+msgstr "èåäèäéåææ(_U)"
+
+#: ../src/prefs-dialog.ui.h:4
+msgid "Add Language"
+msgstr "ååèè"
+
+#: ../src/prefs-dialog.ui.h:5
+msgid "Allow popup _windows"
+msgstr "åèåååèç(_W)"
+
+#: ../src/prefs-dialog.ui.h:6
+msgid "Choose a l_anguage:"
+msgstr "éæèè(_A)ï"
+
+#: ../src/prefs-dialog.ui.h:9
+msgid "De_fault:"
+msgstr "éè(_F)ï"
+
+#: ../src/prefs-dialog.ui.h:11
+msgid "Enable Java_Script"
+msgstr "åç Java_Script"
+
+#: ../src/prefs-dialog.ui.h:12
+msgid "Enable _plugins"
+msgstr "åçåæçå(_P)"
+
+#: ../src/prefs-dialog.ui.h:14
+msgid "Fonts"
+msgstr "åå"
+
+#: ../src/prefs-dialog.ui.h:15
+msgid "Fonts & Style"
+msgstr "ååèæå"
+
+#: ../src/prefs-dialog.ui.h:16
+msgid "General"
+msgstr "äè"
+
+#: ../src/prefs-dialog.ui.h:18
+msgid "Languages"
+msgstr "èè"
+
+#: ../src/prefs-dialog.ui.h:19
+msgid "MB"
+msgstr "MB"
+
+#: ../src/prefs-dialog.ui.h:20
+msgid "Monospace font:"
+msgstr "çåååï"
+
+#: ../src/prefs-dialog.ui.h:21
+msgid "Only _from sites you visit"
+msgstr "åäèæçèççç(_F)"
+
+#: ../src/prefs-dialog.ui.h:23
+msgid "Preferences"
+msgstr "ååèå"
+
+#: ../src/prefs-dialog.ui.h:24
+msgid "Privacy"
+msgstr "éç"
+
+#: ../src/prefs-dialog.ui.h:25
+msgid "Sans serif font:"
+msgstr "çèçååï"
+
+#: ../src/prefs-dialog.ui.h:26
+msgid "Serif font:"
+msgstr "èçååï"
+
+#: ../src/prefs-dialog.ui.h:27
+msgid "Spell checking"
+msgstr "æåææ"
+
+#: ../src/prefs-dialog.ui.h:28
+msgid "Style"
+msgstr "æå"
+
+#: ../src/prefs-dialog.ui.h:29
+msgid "Temporary Files"
+msgstr "æåæ"
+
+#: ../src/prefs-dialog.ui.h:30
+msgid "Use custom _stylesheet"
+msgstr "äçèèæåè(_S)"
+
+#: ../src/prefs-dialog.ui.h:31
+msgid "Web Content"
+msgstr "çéåå"
+
+#: ../src/prefs-dialog.ui.h:32
+msgid "_Always accept"
+msgstr "çææå(_A)"
+
+#: ../src/prefs-dialog.ui.h:33
+msgid "_Disk space:"
+msgstr "çççé(_D)ï"
+
+#: ../src/prefs-dialog.ui.h:34
+msgid "_Download folder:"
+msgstr "äèèæå(_D)"
+
+#: ../src/prefs-dialog.ui.h:35
+msgid "_Edit Stylesheetâ"
+msgstr "çèæåè(_E)â"
+
+#: ../src/prefs-dialog.ui.h:36
+msgid "_Enable spell checking"
+msgstr "åçæåææ(_E)"
+
+#: ../src/prefs-dialog.ui.h:37
+msgid "_Never accept"
+msgstr "æäæå(_N)"
+
+#: ../src/prefs-dialog.ui.h:38
+msgid "_Remember passwords"
+msgstr "èéåç(_R)"
+
+#: ../src/prefs-dialog.ui.h:39
+msgid "_Use system fonts"
+msgstr "äçççåå(_U)"
+
 #: ../src/window-commands.c:316
 msgid "Save"
 msgstr "åå"
@@ -2174,41 +2108,41 @@ msgid ""
 "overwrite it."
 msgstr "äæçåçæççååçååãåäåæååèèã"
 
-#: ../src/window-commands.c:530
+#: ../src/window-commands.c:524
 #, c-format
 msgid "The application '%s' is ready to be used"
 msgstr "æççåã%sãåçæåååääç"
 
-#: ../src/window-commands.c:533
+#: ../src/window-commands.c:527
 #, c-format
 msgid "The application '%s' could not be created"
 msgstr "çæåçæççåã%sã"
 
-#: ../src/window-commands.c:541
+#: ../src/window-commands.c:535
 msgid "Launch"
 msgstr "åè"
 
 #. Show dialog with icon, title.
-#: ../src/window-commands.c:574
+#: ../src/window-commands.c:568
 msgid "Create Web Application"
 msgstr "åççéæççå"
 
-#: ../src/window-commands.c:579
+#: ../src/window-commands.c:573
 msgid "C_reate"
 msgstr "åç(_R)"
 
-#: ../src/window-commands.c:1125
+#: ../src/window-commands.c:1109
 msgid ""
 "Web is free software; you can redistribute it and/or modify it under the "
 "terms of the GNU General Public License as published by the Free Software "
 "Foundation; either version 2 of the License, or (at your option) any later "
 "version."
 msgstr ""
-"Web çèçèéïæåäæèçèéåéææçèç GNU éçååææææèåïåæ"
-"çååçæåèïæäæïçèæäæçææææççäçæïæèèéæçïääæ"
-"åçèççæã"
+"Web (èåãçéã) çèçèéïæåäæèçèéåéææçèç GNU éçååæ"
+"æææèåïåæçååçæåèïæäæïçèæäæçææææççäçæïæè"
+"èéæçïääæåçèççæã"
 
-#: ../src/window-commands.c:1129
+#: ../src/window-commands.c:1113
 msgid ""
 "The GNOME Web Browser is distributed in the hope that it will be useful, but "
 "WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY "
@@ -2218,7 +2152,7 @@ msgstr ""
 "GNOME çéçèåäåæäçççèåäæåïçèäèääæäèäïäçåéåæ"
 "æçåççéçææççéçææäãèæèåç GNU éçååææã"
 
-#: ../src/window-commands.c:1133
+#: ../src/window-commands.c:1117
 msgid ""
 "You should have received a copy of the GNU General Public License along with "
 "the GNOME Web Browser; if not, write to the Free Software Foundation, Inc., "
@@ -2227,20 +2161,20 @@ msgstr ""
 "ææåæåééææçåç GNU éçååææçåæïåçïèåäèèçèéåé"
 "æï51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA"
 
-#: ../src/window-commands.c:1179 ../src/window-commands.c:1195
-#: ../src/window-commands.c:1206
+#: ../src/window-commands.c:1163 ../src/window-commands.c:1179
+#: ../src/window-commands.c:1190
 msgid "Contact us at:"
 msgstr "èçæåæï"
 
-#: ../src/window-commands.c:1182
+#: ../src/window-commands.c:1166
 msgid "Contributors:"
 msgstr "èçèï"
 
-#: ../src/window-commands.c:1185
+#: ../src/window-commands.c:1169
 msgid "Past developers:"
 msgstr "ååéçäåï"
 
-#: ../src/window-commands.c:1215
+#: ../src/window-commands.c:1199
 #, c-format
 msgid ""
 "Lets you view web pages and find information on the internet.\n"
@@ -2257,7 +2191,7 @@ msgstr ""
 #. * this translation; in that case, please write each of them on a separate
 #. * line seperated by newlines (\n).
 #.
-#: ../src/window-commands.c:1244
+#: ../src/window-commands.c:1228
 msgid "translator-credits"
 msgstr ""
 "ååçèæääæèïèéäåéåéäç\n"
@@ -2268,15 +2202,15 @@ msgstr ""
 "Ching-Hung Lin <billlin wshlab2 ee kuas edu tw>, 2004\n"
 "Abel Cheung <maddog linux org hk>, 2003"
 
-#: ../src/window-commands.c:1247
+#: ../src/window-commands.c:1231
 msgid "Web Website"
 msgstr "çéçç"
 
-#: ../src/window-commands.c:1389
+#: ../src/window-commands.c:1373
 msgid "Enable caret browsing mode?"
 msgstr "æååçéççèï"
 
-#: ../src/window-commands.c:1392
+#: ../src/window-commands.c:1376
 msgid ""
 "Pressing F7 turns caret browsing on or off. This feature places a moveable "
 "cursor in web pages, allowing you to move around with your keyboard. Do you "
@@ -2285,7 +2219,7 @@ msgstr ""
 "æä F7 æéåæéééççèãéååèæåçéäæçäååçåçææïèæå"
 "ääçéçéèçåãææåèåçéççèï"
 
-#: ../src/window-commands.c:1395
+#: ../src/window-commands.c:1379
 msgid "_Enable"
 msgstr "åç(_E)"
 
@@ -2298,6 +2232,54 @@ msgstr "åç(_E)"
 #~ msgid "_Quit"
 #~ msgstr "çæ(_Q)"
 
+#~ msgid "Disable connection to session manager"
+#~ msgstr "åçåäæéæçççåçéç"
+
+#~ msgid "Specify file containing saved configuration"
+#~ msgstr "æååååååçæçææ"
+
+#~ msgid "Specify session management ID"
+#~ msgstr "æåäæéæçç ID"
+
+#~ msgid "ID"
+#~ msgstr "ID"
+
+#~ msgid "Session management options:"
+#~ msgstr "äæéæççééï"
+
+#~ msgid "Show session management options"
+#~ msgstr "éçäæéæççéé"
+
+#~ msgid "Downloads will be aborted and logout proceed in %d second."
+#~ msgid_plural "Downloads will be aborted and logout proceed in %d seconds."
+#~ msgstr[0] "äèåæèäæåå %d åçåã"
+
+#~ msgid "Abort pending downloads?"
+#~ msgstr "åææåæçäèï"
+
+#~ msgid ""
+#~ "There are still downloads pending. If you log out, they will be aborted "
+#~ "and lost."
+#~ msgstr "éæäèæåæãåææçåïåååæèäæåéåã"
+
+#~ msgid "_Cancel Logout"
+#~ msgstr "åæçå(_C)"
+
+#~ msgid "_Abort Downloads"
+#~ msgstr "åæäè(_A)"
+
+#~ msgid "_Don't recover"
+#~ msgstr "äèåå(_D)"
+
+#~ msgid "_Recover session"
+#~ msgstr "ååäæéæ(_R)"
+
+#~ msgid "Do you want to recover the previous browser windows and tabs?"
+#~ msgstr "æåèååååççèåèçååéï"
+
+#~ msgid "All"
+#~ msgstr "åé"
+
 #~ msgid "Update bookmark â%sâ?"
 #~ msgstr "æææçâ%sâï"
 



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