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



commit dadf1744d4f1c8151b20af9c07927fc9cb93cfee
Author: Chao-Hsiung Liao <j_h_liau yahoo com tw>
Date:   Thu Jan 27 18:47:50 2011 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po |  564 ++++++++++++++++++++++++++++++-------------------------
 po/zh_TW.po |  605 +++++++++++++++++++++++++++++++++--------------------------
 2 files changed, 640 insertions(+), 529 deletions(-)
---
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 3f7ff61..595a9ee 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -10,12 +10,14 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: epiphany 2.91.3\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany&component=general\n";
-"POT-Creation-Date: 2010-12-01 10:12+0000\n"
-"PO-Revision-Date: 2010-12-09 20:01+0800\n"
+"Project-Id-Version: epiphany 2.91.5\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
+"product=epiphany\n"
+"POT-Creation-Date: 2011-01-27 18:47+0800\n"
+"PO-Revision-Date: 2011-01-27 18:47+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (Hong Kong) <community linuxhall org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -65,8 +67,7 @@ msgid "Epiphany Web Browser"
 msgstr "Epiphany 網é ?ç??覽å?¨"
 
 #. sets the name to appear in the window list applet when grouping windows
-#: ../data/epiphany.desktop.in.in.h:4
-#: ../src/ephy-main.c:647
+#: ../data/epiphany.desktop.in.in.h:4 ../src/ephy-main.c:647
 msgid "Web Browser"
 msgstr "網é ?ç??覽å?¨"
 
@@ -111,7 +112,7 @@ msgid "Field _Value"
 msgstr "æ¬?ä½?ç??å?¼(_V)"
 
 #: ../data/glade/certificate-dialogs.ui.h:11
-#: ../data/glade/prefs-dialog.ui.h:20
+#: ../data/glade/prefs-dialog.ui.h:22
 msgid "General"
 msgstr "��"
 
@@ -156,10 +157,8 @@ msgid "Cookies"
 msgstr "Cookie"
 
 #. The name of the default downloads folder
-#: ../data/glade/epiphany.ui.h:5
-#: ../lib/ephy-file-helpers.c:129
-#: ../lib/ephy-file-helpers.c:160
-#: ../src/prefs-dialog.c:856
+#: ../data/glade/epiphany.ui.h:5 ../lib/ephy-file-helpers.c:129
+#: ../lib/ephy-file-helpers.c:160 ../src/prefs-dialog.c:856
 msgid "Downloads"
 msgstr "��"
 
@@ -175,8 +174,7 @@ msgstr "å??人è³?æ??"
 msgid "Text Encoding"
 msgstr "�符編碼"
 
-#: ../data/glade/epiphany.ui.h:9
-#: ../src/ephy-encoding-menu.c:338
+#: ../data/glade/epiphany.ui.h:9 ../src/ephy-encoding-menu.c:338
 msgid "Use the encoding specified by the document"
 msgstr "使ç?¨æ??件æ??å®?ç??編碼æ?¹å¼?"
 
@@ -189,7 +187,9 @@ msgid "Sign Text"
 msgstr "簽署æ??å­?"
 
 #: ../data/glade/form-signing-dialog.ui.h:2
-msgid "To confirm that you want to sign the above text, choose a certificate to sign the text with and enter its password below."
+msgid ""
+"To confirm that you want to sign the above text, choose a certificate to "
+"sign the text with and enter its password below."
 msgstr "確å®?è¦?簽署以ä¸?æ??å­?ï¼?è«?é?¸æ??簽署æ??å­?ç??è­?æ?¸å??å?¨ä¸?æ?¹è¼¸å?¥å¯?碼ã??"
 
 #: ../data/glade/form-signing-dialog.ui.h:3
@@ -201,8 +201,8 @@ msgid "_Password:"
 msgstr "�碼(_P)�"
 
 #: ../data/glade/form-signing-dialog.ui.h:5
-msgid "_View Certificateâ?¦"
-msgstr "檢���(_V)�"
+msgid "_View Certificate&#x2026;"
+msgstr "檢���(_V)&#x2026;"
 
 #: ../data/glade/prefs-dialog.ui.h:1
 msgid "<b>Cookies</b>"
@@ -217,43 +217,51 @@ msgid "<b>Encodings</b>"
 msgstr "<b>編碼</b>"
 
 #: ../data/glade/prefs-dialog.ui.h:4
+msgid "<b>Fonts</b>"
+msgstr "<b>å­?å??</b>"
+
+#: ../data/glade/prefs-dialog.ui.h:5
 msgid "<b>Home page</b>"
 msgstr "<b>��</b>"
 
-#: ../data/glade/prefs-dialog.ui.h:5
+#: ../data/glade/prefs-dialog.ui.h:6
 msgid "<b>Languages</b>"
 msgstr "<b>��</b>"
 
-#: ../data/glade/prefs-dialog.ui.h:6
+#: ../data/glade/prefs-dialog.ui.h:7
 msgid "<b>Passwords</b>"
 msgstr "<b>�碼</b>"
 
-#: ../data/glade/prefs-dialog.ui.h:7
+#: ../data/glade/prefs-dialog.ui.h:8
+msgid "<b>Style</b>"
+msgstr "<b>樣�</b>"
+
+#: ../data/glade/prefs-dialog.ui.h:9
 msgid "<b>Temporary Files</b>"
 msgstr "<b>���</b>"
 
-#: ../data/glade/prefs-dialog.ui.h:8
+#: ../data/glade/prefs-dialog.ui.h:10
 msgid "<b>Web Content</b>"
 msgstr "<b>網��容</b>"
 
 #. Refers to "Only from sites you visit" option under Cookies.
-#: ../data/glade/prefs-dialog.ui.h:10
+#: ../data/glade/prefs-dialog.ui.h:12
 msgid "<small>For example, not from advertisers on these sites</small>"
 msgstr "<small>ä¾?å¦?ï¼?ä¸?è¦?ä¾?è?ªé??äº?網ç«?ç??廣å??</small>"
 
-#: ../data/glade/prefs-dialog.ui.h:11
+#: ../data/glade/prefs-dialog.ui.h:13
 msgid "A_utomatically download and open files"
 msgstr "è?ªå??ä¸?è¼?並é??å??æª?æ¡?(_U)"
 
-#: ../data/glade/prefs-dialog.ui.h:12
+#: ../data/glade/prefs-dialog.ui.h:14
 msgid "Add Language"
 msgstr "����"
 
-#: ../data/glade/prefs-dialog.ui.h:13
+#: ../data/glade/prefs-dialog.ui.h:15
 msgid "Allow popup _windows"
 msgstr "å??許å½?å?ºå¼?è¦?çª?(_W)"
 
-#: ../data/glade/prefs-dialog.ui.h:14
+#: ../data/glade/prefs-dialog.ui.h:16
 msgid "Choose a l_anguage:"
 msgstr "é?¸æ??èª?è¨?(_A)ï¼?"
 
@@ -261,103 +269,107 @@ msgstr "é?¸æ??èª?è¨?(_A)ï¼?"
 #. * standard items in the GtkEntry context menu (Cut, Copy, Paste, Delete,
 #. * Select All, Input Methods and Insert Unicode control character.)
 #.
-#: ../data/glade/prefs-dialog.ui.h:15
-#: ../lib/widgets/ephy-location-entry.c:680
-#: ../src/ephy-history-window.c:227
-#: ../src/pdm-dialog.c:356
+#: ../data/glade/prefs-dialog.ui.h:17 ../lib/widgets/ephy-location-entry.c:681
+#: ../src/ephy-history-window.c:227 ../src/pdm-dialog.c:356
 msgid "Cl_ear"
 msgstr "��(_E)"
 
-#: ../data/glade/prefs-dialog.ui.h:16
+#: ../data/glade/prefs-dialog.ui.h:18
 msgid "De_fault:"
 msgstr "�設(_F)�"
 
-#: ../data/glade/prefs-dialog.ui.h:17
+#: ../data/glade/prefs-dialog.ui.h:19
 msgid "Enable Java_Script"
 msgstr "å??ç?¨ Java_Script"
 
-#: ../data/glade/prefs-dialog.ui.h:18
-#| msgid "Enable _Plugins"
+#: ../data/glade/prefs-dialog.ui.h:20
 msgid "Enable _plugins"
 msgstr "å??ç?¨å¤?æ??ç¨?å¼?(_P)"
 
-#: ../data/glade/prefs-dialog.ui.h:19
+#: ../data/glade/prefs-dialog.ui.h:21
 msgid "Fonts & Style"
 msgstr "å­?å??è??樣å¼?"
 
-#: ../data/glade/prefs-dialog.ui.h:21
-#: ../src/prefs-dialog.c:773
+#: ../data/glade/prefs-dialog.ui.h:23 ../src/prefs-dialog.c:773
 msgid "Language"
 msgstr "��"
 
-#: ../data/glade/prefs-dialog.ui.h:22
-msgid "Let web pages specify their own _fonts"
-msgstr "ç?±ç¶²é ?è?ªè¡?æ??å®?å­?å??(_F)"
-
-#: ../data/glade/prefs-dialog.ui.h:23
-msgid "Let web pages specify their own c_olors"
-msgstr "ç?±ç¶²é ?è?ªè¡?æ??å®?é¡?è?²(_O)"
-
 #: ../data/glade/prefs-dialog.ui.h:24
 msgid "MB"
 msgstr "MB"
 
 #: ../data/glade/prefs-dialog.ui.h:25
+msgid "Monospace font:"
+msgstr "ç­?寬å­?å??ï¼?"
+
+#: ../data/glade/prefs-dialog.ui.h:26
 msgid "Only _from sites you visit"
 msgstr "å?ªä¾?è?ªä½ ç??覽ç??網ç«?(_F)"
 
-#: ../data/glade/prefs-dialog.ui.h:26
+#: ../data/glade/prefs-dialog.ui.h:27
 msgid "Preferences"
 msgstr "å??好設å®?"
 
-#: ../data/glade/prefs-dialog.ui.h:27
+#: ../data/glade/prefs-dialog.ui.h:28
 msgid "Privacy"
 msgstr "��"
 
-#: ../data/glade/prefs-dialog.ui.h:28
+#: ../data/glade/prefs-dialog.ui.h:29
+msgid "Sans serif font:"
+msgstr "ç?¡è¥¯ç·?å­?å??ï¼?"
+
+#: ../data/glade/prefs-dialog.ui.h:30
+msgid "Serif font:"
+msgstr "襯ç·?å­?å??ï¼?"
+
+#: ../data/glade/prefs-dialog.ui.h:31
 msgid "Set to Current _Page"
 msgstr "設å®?ç?ºç?®å??é ?é?¢(_P)"
 
-#: ../data/glade/prefs-dialog.ui.h:29
+#: ../data/glade/prefs-dialog.ui.h:32
 msgid "Set to _Blank Page"
 msgstr "使�空���(_B)"
 
-#: ../data/glade/prefs-dialog.ui.h:30
+#: ../data/glade/prefs-dialog.ui.h:33
 msgid "Use custom _stylesheet"
 msgstr "使���樣�表(_S)"
 
-#: ../data/glade/prefs-dialog.ui.h:31
+#: ../data/glade/prefs-dialog.ui.h:34
 msgid "_Address:"
 msgstr "ä½?å??(_A)ï¼?"
 
-#: ../data/glade/prefs-dialog.ui.h:32
+#: ../data/glade/prefs-dialog.ui.h:35
 msgid "_Always accept"
 msgstr "總æ?¯æ?¥å??(_A)"
 
-#: ../data/glade/prefs-dialog.ui.h:33
+#: ../data/glade/prefs-dialog.ui.h:36
 msgid "_Disk space:"
 msgstr "ç£?ç¢?空é??(_D)ï¼?"
 
-#: ../data/glade/prefs-dialog.ui.h:34
+#: ../data/glade/prefs-dialog.ui.h:37
 msgid "_Download folder:"
 msgstr "ä¸?è¼?è³?æ??夾(_D)"
 
-#: ../data/glade/prefs-dialog.ui.h:35
-msgid "_Edit Stylesheetâ?¦"
-msgstr "編輯樣�表(_E)�"
+#: ../data/glade/prefs-dialog.ui.h:38
+msgid "_Edit Stylesheet&#x2026;"
+msgstr "編輯樣�表(_E)&#x2026;"
 
-#: ../data/glade/prefs-dialog.ui.h:36
-msgid "_Minimum size:"
-msgstr "å­?å??大å°?ä¸?é??(_M)ï¼?"
+#: ../data/glade/prefs-dialog.ui.h:39
+msgid "_Minimum font size:"
+msgstr "æ??å°?å­?å??大å°?(_M):"
 
-#: ../data/glade/prefs-dialog.ui.h:37
+#: ../data/glade/prefs-dialog.ui.h:40
 msgid "_Never accept"
 msgstr "æ°¸ä¸?æ?¥å??(_N)"
 
-#: ../data/glade/prefs-dialog.ui.h:38
+#: ../data/glade/prefs-dialog.ui.h:41
 msgid "_Remember passwords"
 msgstr "è¨?é??å¯?碼(_R)"
 
+#: ../data/glade/prefs-dialog.ui.h:42
+msgid "_Use system fonts"
+msgstr "使ç?¨ç³»çµ±å­?å??(_U)"
+
 #: ../data/glade/print.ui.h:1
 msgid "<b>Background</b>"
 msgstr "<b>è??æ?¯</b>"
@@ -434,10 +446,8 @@ msgid "_Resume"
 msgstr "��(_R)"
 
 #. impossible time or broken locale settings
-#: ../embed/downloader-view.c:366
-#: ../embed/downloader-view.c:520
-#: ../embed/downloader-view.c:525
-#: ../lib/ephy-time-helpers.c:279
+#: ../embed/downloader-view.c:366 ../embed/downloader-view.c:520
+#: ../embed/downloader-view.c:525 ../lib/ephy-time-helpers.c:279
 #: ../src/ephy-window.c:1681
 msgid "Unknown"
 msgstr "�詳"
@@ -458,8 +468,7 @@ msgid "%d download"
 msgid_plural "%d downloads"
 msgstr[0] "ä¸?è¼? %d å??æª?æ¡?"
 
-#: ../embed/downloader-view.c:735
-#: ../embed/downloader-view.c:745
+#: ../embed/downloader-view.c:735 ../embed/downloader-view.c:745
 msgctxt "download status"
 msgid "Unknown"
 msgstr "ä¸?æ??"
@@ -474,8 +483,7 @@ msgctxt "download status"
 msgid "Cancelled"
 msgstr "å·²å??æ¶?"
 
-#: ../embed/downloader-view.c:802
-#: ../src/bookmarks/ephy-bookmarks-editor.c:977
+#: ../embed/downloader-view.c:802 ../src/bookmarks/ephy-bookmarks-editor.c:978
 msgid "File"
 msgstr "��"
 
@@ -487,41 +495,41 @@ msgstr "%"
 msgid "Remaining"
 msgstr "��"
 
-#: ../embed/ephy-embed.c:445
-#: ../embed/ephy-embed-persist.c:823
+#: ../embed/ephy-embed.c:404 ../embed/ephy-embed-persist.c:823
 #: ../src/window-commands.c:343
 msgid "Save"
 msgstr "��"
 
-#: ../embed/ephy-embed.c:703
+#: ../embed/ephy-embed.c:662
 msgctxt "file type"
 msgid "Unknown"
 msgstr "ä¸?æ??"
 
-#: ../embed/ephy-embed.c:719
+#: ../embed/ephy-embed.c:678
 msgid "Download this potentially unsafe file?"
 msgstr "ä¸?è¼?é??å??å?¯è?½ä¸?å®?å?¨ç??æª?æ¡?ï¼?"
 
 #. translators: First %s is the file type description, second %s is the
 #. * file name
-#: ../embed/ephy-embed.c:723
+#: ../embed/ephy-embed.c:682
 #, c-format
 msgid ""
 "File Type: â??%sâ??.\n"
 "\n"
-"It is unsafe to open â??%sâ?? as it could potentially damage your documents or invade your privacy. You can download it instead."
+"It is unsafe to open â??%sâ?? as it could potentially damage your documents or "
+"invade your privacy. You can download it instead."
 msgstr ""
 "æª?æ¡?é¡?å??ï¼?â??%sâ??ã??\n"
 "\n"
 "é??å??â??%sâ??並ä¸?å®?å?¨ï¼?å®?æ??å?¯è?½æ??ç ´å£?ä½ ç??æ??件æ??ä¾µç?¯ä½ ç??ç§?é?±æ¬?ã??ä½ å?¯ä»¥ä»¥ä¸?è¼?ä¾?代æ?¿ã??"
 
-#: ../embed/ephy-embed.c:731
+#: ../embed/ephy-embed.c:690
 msgid "Open this file?"
 msgstr "é??å??æ­¤æª?æ¡?ï¼?"
 
 #. translators: First %s is the file type description, second %s is the
 #. * file name, third %s is the application used to open the file
-#: ../embed/ephy-embed.c:735
+#: ../embed/ephy-embed.c:694
 #, c-format
 msgid ""
 "File Type: â??%sâ??.\n"
@@ -532,13 +540,13 @@ msgstr ""
 "\n"
 "ä½ å?¯ä»¥ä½¿ç?¨â??%sâ??é??å??â??%sâ??æ??å°?å®?å?²å­?ã??"
 
-#: ../embed/ephy-embed.c:740
+#: ../embed/ephy-embed.c:699
 msgid "Download this file?"
 msgstr "��此���"
 
 #. translators: First %s is the file type description, second %s is the
 #. * file name
-#: ../embed/ephy-embed.c:744
+#: ../embed/ephy-embed.c:703
 #, c-format
 msgid ""
 "File Type: â??%sâ??.\n"
@@ -549,16 +557,18 @@ msgstr ""
 "\n"
 "ä½ æ²?æ??ä»»ä½?è»?件è?½å¤ é??å??â??%sâ??ï¼?ä½ å?¯ä»¥ä»¥ä¸?è¼?å®?ä¾?代æ?¿ã??"
 
-#: ../embed/ephy-embed.c:923
+#: ../embed/ephy-embed.c:894
 msgid "Web Inspector"
 msgstr "網�檢��"
 
-#: ../embed/ephy-embed-shell.c:259
+#: ../embed/ephy-embed-shell.c:262
 msgid "Epiphany can't be used now. Initialization failed."
 msgstr "Epiphany ç?®å??ç?¡æ³?使ç?¨ã??å??å§?å??ç¨?åº?失æ??ã??"
 
-#: ../embed/ephy-embed-single.c:504
-msgid "CA Certificates file we should use was not found, all SSL sites will be considered to have a broken certificate."
+#: ../embed/ephy-embed-single.c:505
+msgid ""
+"CA Certificates file we should use was not found, all SSL sites will be "
+"considered to have a broken certificate."
 msgstr "æ?¾ä¸?å?°æ??å??æ??該使ç?¨ç?? CA è­?æ?¸ï¼?æ??æ??ç?? SSL 網ç«?é?½æ??被èª?ç?ºå?¶è­?æ?¸å·²æ??å£?ã??"
 
 #: ../embed/ephy-embed-utils.c:60
@@ -905,17 +915,15 @@ msgstr "����"
 #. characters
 #. ms
 #. RELOAD_DELAY * RELOAD_DELAY_MAX_TICKS = 10 s
-#: ../embed/ephy-web-view.c:67
-#: ../embed/ephy-web-view.c:3319
-#: ../src/ephy-session.c:1420
+#: ../embed/ephy-web-view.c:67 ../embed/ephy-web-view.c:3453
 msgid "Blank page"
 msgstr "空���"
 
-#: ../embed/ephy-web-view.c:763
+#: ../embed/ephy-web-view.c:765
 msgid "Not now"
 msgstr "����"
 
-#: ../embed/ephy-web-view.c:768
+#: ../embed/ephy-web-view.c:770
 msgid "Store password"
 msgstr "���碼"
 
@@ -923,52 +931,89 @@ msgstr "���碼"
 #. * hostname where this is happening. Example: gnome gmail com and
 #. * mail.google.com.
 #.
-#: ../embed/ephy-web-view.c:779
+#: ../embed/ephy-web-view.c:781
 #, c-format
-msgid "<big>Would you like to store the password for <b>%s</b> in <b>%s</b>?</big>"
+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>"
 
 #. Translators: Geolocation policy for a specific site.
-#: ../embed/ephy-web-view.c:1821
+#: ../embed/ephy-web-view.c:1829
 msgid "Deny"
 msgstr "�止"
 
 #. Translators: Geolocation policy for a specific site.
-#: ../embed/ephy-web-view.c:1827
-#| msgid "_Allow"
+#: ../embed/ephy-web-view.c:1835
 msgid "Allow"
 msgstr "å??許"
 
 #. Label
-#: ../embed/ephy-web-view.c:1833
+#: ../embed/ephy-web-view.c:1841
 #, c-format
 msgid "The page at <b>%s</b> wants to know your location."
 msgstr "å?¨ <b>%s</b> ç??網é ?æ?³è¦?ç?¥é??ä½ ç??ä½?ç½®ã??"
 
-#: ../embed/ephy-web-view.c:2003
+#: ../embed/ephy-web-view.c:2074
+msgid "None specified"
+msgstr "æ²?æ??æ??å®?"
+
+#: ../embed/ephy-web-view.c:2083 ../embed/ephy-web-view.c:2095
 #, c-format
-msgid "A problem occurred while loading %s"
-msgstr "è¼?å?¥ %s æ??ç?¼ç??å??é¡?"
+msgid "Oops! Error loading %s"
+msgstr "å?¢ï¼?è¼?å?¥ %s æ??ç?¼ç??é?¯èª¤"
 
-#: ../embed/ephy-web-view.c:2265
+#: ../embed/ephy-web-view.c:2085
+msgid "Oops! It was impossible to load this website"
+msgstr "å?¢ï¼?ç?¡æ³?è¼?å?¥é??å??網ç«?"
+
+#: ../embed/ephy-web-view.c:2086
+#, c-format
+msgid ""
+"The website at <strong>%s</strong> is probably unavailable, the precise "
+"error was:<br/><br/><em>%s</em>.<br/><br/> If this persists you might want "
+"to check your internet connection or if the website at <strong>%s</strong> "
+"is working correctly."
+msgstr "網ç«? <strong>%s</strong> å?¯è?½ç?¡æ³?使ç?¨ï¼?æº?確ä¾?說é?¯èª¤ç?ºï¼?<br/><br/><em>%s</em>ã??<br/><br/>å¦?æ??æ??æ³?ä¸?ç?´æ??çº?ï¼?ä½ å?¯è?½è¦?檢æ?¥äº?è?¯ç¶²é?£ç·?æ??網ç«? <strong>%s</strong> æ?¯å?¦æ­£å¸¸é??ä½?ã??"
+
+#: ../embed/ephy-web-view.c:2089
+msgid "Try again"
+msgstr "å??試ä¸?次"
+
+#: ../embed/ephy-web-view.c:2097
+msgid "Oops! This site might have caused Epiphany to close unexpectedly"
+msgstr "å?¢ï¼?é??å??網ç«?å?¯è?½å·²é? æ?? Epiphany æ?ªé ?æ??ç??é??é??"
+
+#: ../embed/ephy-web-view.c:2098
+#, c-format
+msgid ""
+"This page was loading when the web browser closed unexpectedly.<br/> This "
+"might happen again if you reload the page. If it does, please report the "
+"problem to the <strong>%s</strong> developers."
+msgstr "é??å??網é ?å°?å?¨è®?å??ä½?ç??覽å?¨å·²ç?°å¸¸é??é??äº?ã??<br/>å¦?æ??ä½ é??æ?°è¼?å?¥è©²é ?é?¢ä»?ç?¶å?¯è?½å??度ç?¼ç??é??å??ç??æ³?ã??å¦?æ??ç??ç??é??樣ï¼?è«?å°?å??é¡?å?¯å ±çµ¦ <strong>%s</strong> é??ç?¼é??ä¼?ã??"
+
+#: ../embed/ephy-web-view.c:2101
+msgid "Load again anyway"
+msgstr "强å?¶å??次è¼?å?¥"
+
+#: ../embed/ephy-web-view.c:2399
 #, 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";
 
 #. translators: %s here is the address of the web page
-#: ../embed/ephy-web-view.c:2560
+#: ../embed/ephy-web-view.c:2694
 #, c-format
 msgid "Loading â??%sâ??â?¦"
 msgstr "æ­£å?¨è¼?å?¥â??%sâ??â?¦"
 
-#: ../embed/ephy-web-view.c:2562
+#: ../embed/ephy-web-view.c:2696
 msgid "Loadingâ?¦"
 msgstr "��中�"
 
 #. Translators: this is the directory name to store auxilary files
 #. * when saving html files.
 #.
-#: ../embed/ephy-web-view.c:3523
+#: ../embed/ephy-web-view.c:3657
 #, c-format
 msgid "%s Files"
 msgstr "%s å??æª?æ¡?"
@@ -1016,9 +1061,7 @@ msgstr "å??ç?¨å?°ä½?業é??段管ç??ç¨?å¼?ç??é?£ç·?"
 msgid "Specify file containing saved configuration"
 msgstr "æ??å®?å??å?«å·²å?²å­?çµ?æ??ç??æª?æ¡?"
 
-#: ../lib/egg/eggsmclient.c:228
-#: ../src/ephy-main.c:92
-#: ../src/ephy-main.c:94
+#: ../lib/egg/eggsmclient.c:228 ../src/ephy-main.c:92 ../src/ephy-main.c:94
 msgid "FILE"
 msgstr "��"
 
@@ -1090,29 +1133,27 @@ msgstr "網�"
 msgid "Images"
 msgstr "å??å½¢æª?"
 
-#: ../lib/ephy-file-chooser.c:412
-#: ../src/bookmarks/ephy-bookmarks-editor.c:753
+#: ../lib/ephy-file-chooser.c:412 ../src/bookmarks/ephy-bookmarks-editor.c:754
 msgid "All files"
 msgstr "æ??æ??æª?æ¡?"
 
 #. If we don't have XDG user dirs info, return an educated guess.
-#: ../lib/ephy-file-helpers.c:165
-#: ../lib/ephy-file-helpers.c:212
+#: ../lib/ephy-file-helpers.c:165 ../lib/ephy-file-helpers.c:212
 #: ../src/prefs-dialog.c:862
 msgid "Desktop"
 msgstr "æ¡?é?¢"
 
-#: ../lib/ephy-file-helpers.c:384
+#: ../lib/ephy-file-helpers.c:388
 #, c-format
 msgid "Could not create a temporary directory in â??%sâ??."
 msgstr "ç?¡æ³?å?¨â??%sâ??建ç«?æ?«å­?ç?®é??ã??"
 
-#: ../lib/ephy-file-helpers.c:473
+#: ../lib/ephy-file-helpers.c:477
 #, c-format
 msgid "The file â??%sâ?? exists. Please move it out of the way."
 msgstr "æª?æ¡?â??%sâ?? å·²ç¶?å­?å?¨ï¼?è«?å??å°?å®?移è?³å?¶å®?ä½?ç½®ã??"
 
-#: ../lib/ephy-file-helpers.c:484
+#: ../lib/ephy-file-helpers.c:488
 #, c-format
 msgid "Failed to create directory â??%sâ??."
 msgstr "ç?¡æ³?建ç«?ç?®é??â??%sâ??ã??"
@@ -1136,7 +1177,9 @@ msgid "Cannot overwrite existing file â??%sâ??"
 msgstr "ä¸?è?½è¦?寫已å­?å?¨ç??æª?æ¡?â??%sâ??"
 
 #: ../lib/ephy-gui.c:333
-msgid "A file with this name already exists and you don't have permission to overwrite it."
+msgid ""
+"A file with this name already exists and you don't have permission to "
+"overwrite it."
 msgstr "以此ç?ºå??ç??æª?æ¡?å·²ç¶?å­?å?¨è??ä½ æ²?æ??æ¬?é??å?¯ä»¥è¦?寫å®?ã??"
 
 #: ../lib/ephy-gui.c:336
@@ -1153,23 +1196,21 @@ msgid "Master password needed"
 msgstr "é??è¦?主æ?§å¯?碼"
 
 #: ../lib/ephy-nss-glue.c:64
-msgid "The passwords from the previous version (Gecko) are locked with a master password. If you want Epiphany to import them, please enter your master password below."
+msgid ""
+"The passwords from the previous version (Gecko) are locked with a master "
+"password. If you want Epiphany to import them, please enter your master "
+"password below."
 msgstr "å?¨å??ä¸?ç??æ?¬ (Gecko) 中æ??å?²å­?ç??å¯?碼é?½ä½¿ç?¨ä¸»æ?§å¯?碼é??å®?äº?ã??å¦?æ??ä½ æ?³è¦? Epiphany å?¯å?¥å®?å??ï¼?è«?å?¨ä¸?é?¢è¼¸å?¥ä½ ç??主æ?§å¯?碼ã??"
 
-#: ../lib/ephy-profile-migration.c:83
+#: ../lib/ephy-profile-migrator.c:80
 msgid "Failed to copy cookies file from Mozilla."
 msgstr "å¾? Mozilla è¤?製 cookies æª?æ¡?失æ??ã??"
 
-#: ../lib/ephy-profile-migration.c:558
-msgid "Failed to read latest migration marker, aborting profile migration."
-msgstr "è®?å??æ??æ?°è½?移æ¨?è¨?失æ??ï¼?æ?¾æ£?設å®?çµ?å??ç??è½?移ã??"
-
 #: ../lib/ephy-stock-icons.c:47
 msgid "Popup Windows"
 msgstr "�����"
 
-#: ../lib/ephy-stock-icons.c:48
-#: ../src/ephy-history-window.c:1098
+#: ../lib/ephy-stock-icons.c:48 ../src/ephy-history-window.c:1098
 msgid "History"
 msgstr "ç??覽è¨?é??"
 
@@ -1179,16 +1220,13 @@ msgstr "ç??覽è¨?é??"
 msgid "Bookmark"
 msgstr "���籤"
 
-#: ../lib/ephy-stock-icons.c:50
-#: ../src/bookmarks/ephy-bookmarks-editor.c:884
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1660
-#: ../src/bookmarks/ephy-topic-action.c:443
-#: ../src/ephy-window.c:1448
+#: ../lib/ephy-stock-icons.c:50 ../src/bookmarks/ephy-bookmarks-editor.c:885
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1661
+#: ../src/bookmarks/ephy-topic-action.c:443 ../src/ephy-window.c:1448
 msgid "Bookmarks"
 msgstr "�籤"
 
-#: ../lib/ephy-stock-icons.c:51
-#: ../src/ephy-toolbar.c:278
+#: ../lib/ephy-stock-icons.c:51 ../src/ephy-toolbar.c:278
 msgid "Address Entry"
 msgstr "ä½?å??輸å?¥æ¬?"
 
@@ -1265,7 +1303,7 @@ msgstr "300%"
 msgid "400%"
 msgstr "400%"
 
-#: ../lib/widgets/ephy-location-entry.c:960
+#: ../lib/widgets/ephy-location-entry.c:964
 msgid "Drag and drop this icon to create a link to this page"
 msgstr "æ??æ?¾é??å??å??示ä¾?建ç«?é?£è?³è©²ç¶²é ?ç??é?£çµ?"
 
@@ -1273,12 +1311,12 @@ msgstr "æ??æ?¾é??å??å??示ä¾?建ç«?é?£è?³è©²ç¶²é ?ç??é?£çµ?"
 msgid "Clear"
 msgstr "��"
 
-#: ../src/bookmarks/ephy-bookmark-action.c:320
+#: ../src/bookmarks/ephy-bookmark-action.c:319
 #, c-format
 msgid "%s:"
 msgstr "%sï¼?"
 
-#: ../src/bookmarks/ephy-bookmark-action.c:502
+#: ../src/bookmarks/ephy-bookmark-action.c:501
 #, c-format
 msgid "Executes the script â??%sâ??"
 msgstr "å?·è¡?å?½ä»¤ç¨¿â??%sâ??"
@@ -1418,26 +1456,22 @@ msgstr "��主�中��"
 
 #. Toplevel
 #: ../src/bookmarks/ephy-bookmarks-editor.c:156
-#: ../src/ephy-history-window.c:127
-#: ../src/ephy-window.c:111
+#: ../src/ephy-history-window.c:127 ../src/ephy-window.c:111
 msgid "_File"
 msgstr "��(_F)"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:157
-#: ../src/ephy-history-window.c:128
-#: ../src/ephy-window.c:112
+#: ../src/ephy-history-window.c:128 ../src/ephy-window.c:112
 msgid "_Edit"
 msgstr "編輯(_E)"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:158
-#: ../src/ephy-history-window.c:129
-#: ../src/ephy-window.c:113
+#: ../src/ephy-history-window.c:129 ../src/ephy-window.c:113
 msgid "_View"
 msgstr "顯示(_V)"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:159
-#: ../src/ephy-history-window.c:130
-#: ../src/ephy-window.c:118
+#: ../src/ephy-history-window.c:130 ../src/ephy-window.c:118
 msgid "_Help"
 msgstr "æ±?å?©(_H)"
 
@@ -1453,9 +1487,8 @@ msgstr "建ç«?æ?°ç??主é¡?"
 #. FIXME ngettext
 #. File Menu
 #: ../src/bookmarks/ephy-bookmarks-editor.c:166
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1294
-#: ../src/bookmarks/ephy-bookmarks-ui.c:323
-#: ../src/ephy-history-window.c:134
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1295
+#: ../src/bookmarks/ephy-bookmarks-ui.c:323 ../src/ephy-history-window.c:134
 #: ../src/ephy-history-window.c:612
 msgid "Open in New _Window"
 msgid_plural "Open in New _Windows"
@@ -1467,9 +1500,8 @@ msgstr "å?¨æ?°ç??è¦?çª?中é??å??å·²é?¸ç??æ?¸ç±¤"
 
 #. FIXME ngettext
 #: ../src/bookmarks/ephy-bookmarks-editor.c:169
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1297
-#: ../src/bookmarks/ephy-bookmarks-ui.c:311
-#: ../src/ephy-history-window.c:137
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1298
+#: ../src/bookmarks/ephy-bookmarks-ui.c:311 ../src/ephy-history-window.c:137
 #: ../src/ephy-history-window.c:615
 msgid "Open in New _Tab"
 msgid_plural "Open in New _Tabs"
@@ -1514,8 +1546,7 @@ msgid "Export bookmarks to a file"
 msgstr "��籤�����"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:183
-#: ../src/ephy-history-window.c:143
-#: ../src/ephy-window.c:143
+#: ../src/ephy-history-window.c:143 ../src/ephy-window.c:143
 msgid "_Close"
 msgstr "é??é??(_C)"
 
@@ -1525,34 +1556,29 @@ msgstr "é??é??æ?¸ç±¤è¦?çª?"
 
 #. Edit Menu
 #: ../src/bookmarks/ephy-bookmarks-editor.c:188
-#: ../src/ephy-history-window.c:148
-#: ../src/ephy-window.c:155
+#: ../src/ephy-history-window.c:148 ../src/ephy-window.c:155
 msgid "Cu_t"
 msgstr "��(_T)"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:189
-#: ../src/ephy-history-window.c:149
-#: ../src/ephy-window.c:156
+#: ../src/ephy-history-window.c:149 ../src/ephy-window.c:156
 msgid "Cut the selection"
 msgstr "å?ªä¸?é?¸å®?ç??å?§å®¹"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:191
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1307
-#: ../src/ephy-history-window.c:151
-#: ../src/ephy-history-window.c:625
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1308
+#: ../src/ephy-history-window.c:151 ../src/ephy-history-window.c:625
 #: ../src/ephy-window.c:158
 msgid "_Copy"
 msgstr "�製(_C)"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:192
-#: ../src/ephy-history-window.c:152
-#: ../src/ephy-window.c:159
+#: ../src/ephy-history-window.c:152 ../src/ephy-window.c:159
 msgid "Copy the selection"
 msgstr "è¤?製é?¸å®?ç??å?§å®¹"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:194
-#: ../src/ephy-history-window.c:154
-#: ../src/ephy-window.c:161
+#: ../src/ephy-history-window.c:154 ../src/ephy-window.c:161
 msgid "_Paste"
 msgstr "貼�(_P)"
 
@@ -1571,8 +1597,7 @@ msgid "Delete the selected bookmark or topic"
 msgstr "å?ªé?¤å·²é?¸ç??æ?¸ç±¤æ??主é¡?"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:200
-#: ../src/ephy-history-window.c:160
-#: ../src/ephy-window.c:167
+#: ../src/ephy-history-window.c:160 ../src/ephy-window.c:167
 msgid "Select _All"
 msgstr "å?¨é?¨é?¸å??(_A)"
 
@@ -1583,8 +1608,7 @@ msgstr "é?¸å??æ??æ??æ?¸ç±¤æ??æ??å­?"
 #. Help Menu
 #. Help menu
 #: ../src/bookmarks/ephy-bookmarks-editor.c:205
-#: ../src/ephy-history-window.c:168
-#: ../src/ephy-window.c:261
+#: ../src/ephy-history-window.c:168 ../src/ephy-window.c:261
 msgid "_Contents"
 msgstr "�容(_C)"
 
@@ -1593,14 +1617,12 @@ msgid "Display bookmarks help"
 msgstr "顯示æ?¸ç±¤èªªæ??æ??件"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:208
-#: ../src/ephy-history-window.c:171
-#: ../src/ephy-window.c:264
+#: ../src/ephy-history-window.c:171 ../src/ephy-window.c:264
 msgid "_About"
 msgstr "é??æ?¼(_A)"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:209
-#: ../src/ephy-history-window.c:172
-#: ../src/ephy-window.c:265
+#: ../src/ephy-history-window.c:172 ../src/ephy-window.c:265
 msgid "Display credits for the web browser creators"
 msgstr "é³´è¬?æ??æ??é??å??網é ?ç??覽å?¨ç??å?µä½?è??"
 
@@ -1624,7 +1646,7 @@ msgid "Show the title column"
 msgstr "顯示����"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:220
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1798
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1799
 #: ../src/ephy-history-window.c:1229
 msgid "Address"
 msgstr "ä½?å??"
@@ -1638,113 +1660,117 @@ msgstr "顯示ä½?å??æ¬?ä½?"
 msgid "Type a topic"
 msgstr "è«?輸å?¥ä¸»é¡?å??稱"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:381
+#: ../src/bookmarks/ephy-bookmarks-editor.c:382
 #, c-format
 msgid "Delete topic â??%sâ???"
 msgstr "å?ªé?¤ä¸»é¡?â??%sâ??ï¼?"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:384
+#: ../src/bookmarks/ephy-bookmarks-editor.c:385
 msgid "Delete this topic?"
 msgstr "���主��"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:386
-msgid "Deleting this topic will cause all its bookmarks to become uncategorized, unless they also belong to other topics. The bookmarks will not be deleted."
+#: ../src/bookmarks/ephy-bookmarks-editor.c:387
+msgid ""
+"Deleting this topic will cause all its bookmarks to become uncategorized, "
+"unless they also belong to other topics. The bookmarks will not be deleted."
 msgstr "å?ªé?¤æ?¬ä¸»é¡?æ??使å¾?æ??æ??å?¨å®?ä¹?ä¸?è??ä¸?ä¸?é?¸æ?¼å?¶å®?主é¡?ç??æ?¸ç±¤è®?æ??æ²?æ??å??é¡?ï¼?ä½?æ?¸ç±¤ä¸?æ??被å?ªé?¤ã??"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:389
+#: ../src/bookmarks/ephy-bookmarks-editor.c:390
 msgid "_Delete Topic"
 msgstr "��主�(_D)"
 
 #. FIXME: proper i18n after freeze
-#: ../src/bookmarks/ephy-bookmarks-editor.c:611
-#: ../src/bookmarks/ephy-bookmarks-editor.c:615
+#: ../src/bookmarks/ephy-bookmarks-editor.c:612
+#: ../src/bookmarks/ephy-bookmarks-editor.c:616
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:620
-#: ../src/bookmarks/ephy-bookmarks-editor.c:624
+#: ../src/bookmarks/ephy-bookmarks-editor.c:621
+#: ../src/bookmarks/ephy-bookmarks-editor.c:625
 msgid "Firebird"
 msgstr "Firebird"
 
 #. Translators: The %s is the name of a Mozilla profile.
-#: ../src/bookmarks/ephy-bookmarks-editor.c:629
+#: ../src/bookmarks/ephy-bookmarks-editor.c:630
 #, c-format
 msgid "Mozilla â??%sâ?? profile"
 msgstr "Mozillaâ??%sâ??設å®?çµ?å??"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:633
+#: ../src/bookmarks/ephy-bookmarks-editor.c:634
 msgid "Galeon"
 msgstr "Galeon"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:637
+#: ../src/bookmarks/ephy-bookmarks-editor.c:638
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:666
+#: ../src/bookmarks/ephy-bookmarks-editor.c:667
 msgid "Import failed"
 msgstr "å?¯å?¥å¤±æ??"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:668
+#: ../src/bookmarks/ephy-bookmarks-editor.c:669
 msgid "Import Failed"
 msgstr "å?¯å?¥å¤±æ??"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:671
+#: ../src/bookmarks/ephy-bookmarks-editor.c:672
 #, c-format
-msgid "The bookmarks from â??%sâ?? could not be imported because the file is corrupted or of an unsupported type."
+msgid ""
+"The bookmarks from â??%sâ?? could not be imported because the file is corrupted "
+"or of an unsupported type."
 msgstr "ç?¡æ³?å¾?â??%sâ??å?¯å?¥æ?¸ç±¤ï¼?å??å? æ?¯è©²æª?å?¯è?½å·²ç¶?å??æ??æ??æ?¯ä¸?æ?¯æ?´ç??æ ¼å¼?ã??"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:734
+#: ../src/bookmarks/ephy-bookmarks-editor.c:735
 msgid "Import Bookmarks from File"
 msgstr "������籤"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:741
+#: ../src/bookmarks/ephy-bookmarks-editor.c:742
 msgid "Firefox/Mozilla bookmarks"
 msgstr "Firefox/Mozilla �籤"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:745
+#: ../src/bookmarks/ephy-bookmarks-editor.c:746
 msgid "Galeon/Konqueror bookmarks"
 msgstr "Galeon/Konqueror �籤"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:749
+#: ../src/bookmarks/ephy-bookmarks-editor.c:750
 msgid "Epiphany bookmarks"
 msgstr "Epiphany �籤"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:873
+#: ../src/bookmarks/ephy-bookmarks-editor.c:874
 msgid "Export Bookmarks"
 msgstr "���籤"
 
 #. Make a format selection combo & label
-#: ../src/bookmarks/ephy-bookmarks-editor.c:890
+#: ../src/bookmarks/ephy-bookmarks-editor.c:891
 msgid "File f_ormat:"
 msgstr "��格�(_O)�"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:936
+#: ../src/bookmarks/ephy-bookmarks-editor.c:937
 msgid "Import Bookmarks"
 msgstr "���籤"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:941
+#: ../src/bookmarks/ephy-bookmarks-editor.c:942
 msgid "I_mport"
 msgstr "��(_M)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:957
+#: ../src/bookmarks/ephy-bookmarks-editor.c:958
 msgid "Import bookmarks from:"
 msgstr "å?¯å?¥æ?¸ç±¤ç??ä¾?æº?ï¼?"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1303
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1304
 #: ../src/ephy-history-window.c:621
 msgid "_Copy Address"
 msgstr "è¤?製ä½?å??(_C)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1551
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1552
 #: ../src/ephy-history-window.c:949
 msgid "_Search:"
 msgstr "æ??å°?(_S)ï¼?"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1717
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1718
 msgid "Topics"
 msgstr "主�"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1787
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1788
 #: ../src/ephy-history-window.c:1220
 msgid "Title"
 msgstr "��"
@@ -1817,8 +1843,7 @@ msgstr "���"
 
 #. Create a menu item, and sync it
 #. Case sensitivity
-#: ../src/ephy-find-toolbar.c:459
-#: ../src/ephy-find-toolbar.c:582
+#: ../src/ephy-find-toolbar.c:459 ../src/ephy-find-toolbar.c:582
 msgid "_Case sensitive"
 msgstr "å??å??大å°?寫(_C)"
 
@@ -1839,13 +1864,11 @@ msgid "Find next occurrence of the search string"
 msgstr "å°?æ?¾ä¸?ä¸?å??å?ºç?¾æ??å°?å­?串ç??å?°æ?¹"
 
 #. exit button
-#: ../src/ephy-fullscreen-popup.c:232
-#: ../src/ephy-toolbar.c:618
+#: ../src/ephy-fullscreen-popup.c:232 ../src/ephy-toolbar.c:618
 msgid "Leave Fullscreen"
 msgstr "é?¢é??å?¨è?¢å¹?"
 
-#: ../src/ephy-go-action.c:41
-#: ../src/ephy-toolbar.c:308
+#: ../src/ephy-go-action.c:41 ../src/ephy-toolbar.c:308
 msgid "Go"
 msgstr "å??å¾?"
 
@@ -1906,7 +1929,9 @@ msgid "Clear browsing history?"
 msgstr "æ?¯å?¦æ¸?é?¤ç??覽è¨?é??ï¼?"
 
 #: ../src/ephy-history-window.c:221
-msgid "Clearing the browsing history will cause all history links to be permanently deleted."
+msgid ""
+"Clearing the browsing history will cause all history links to be permanently "
+"deleted."
 msgstr "æ¸?é?¤ç??覽è¨?é??å°?æ??使æ??æ??ç??覽è¨?é??æ°¸é? è¢«å?ªé?¤ã??"
 
 #: ../src/ephy-history-window.c:236
@@ -1923,8 +1948,7 @@ msgstr "ä»?æ?¥"
 
 #. keep this in sync with embed/ephy-history.c's
 #. * HISTORY_PAGE_OBSOLETE_DAYS
-#: ../src/ephy-history-window.c:961
-#: ../src/ephy-history-window.c:965
+#: ../src/ephy-history-window.c:961 ../src/ephy-history-window.c:965
 #: ../src/ephy-history-window.c:971
 #, c-format
 msgid "Last %d day"
@@ -1939,9 +1963,7 @@ msgstr "網�"
 msgid "Date"
 msgstr "æ?¥æ??"
 
-#: ../src/ephy-main.c:77
-#: ../src/ephy-main.c:523
-#: ../src/window-commands.c:1041
+#: ../src/ephy-main.c:77 ../src/ephy-main.c:523 ../src/window-commands.c:1041
 msgid "GNOME Web Browser"
 msgstr "GNOME 網é ?ç??覽å?¨"
 
@@ -2006,7 +2028,7 @@ msgstr ""
 msgid "GNOME Web Browser options"
 msgstr "GNOME 網é ?ç??覽å?¨é?¸é ?"
 
-#: ../src/ephy-notebook.c:627
+#: ../src/ephy-notebook.c:633
 msgid "Close tab"
 msgstr "é??é??å??é ?"
 
@@ -2021,7 +2043,9 @@ msgid "Abort pending downloads?"
 msgstr "å??æ­¢æ?ªå®?æ??ç??ä¸?è¼?ï¼?"
 
 #: ../src/ephy-session.c:235
-msgid "There are still downloads pending. If you log out, they will be aborted and lost."
+msgid ""
+"There are still downloads pending. If you log out, they will be aborted and "
+"lost."
 msgstr "é??æ??ä¸?è¼?æ?ªå®?æ??ã??å¦?æ??ä½ ç?»å?ºï¼?å®?å??å°?æ??被中止å??é?ºå¤±ã??"
 
 #: ../src/ephy-session.c:239
@@ -2044,12 +2068,6 @@ msgstr "å??復ä½?業é??段"
 msgid "Do you want to recover the previous browser windows and tabs?"
 msgstr "æ?¯å?¦è¦?å??復å??å??ç??ç??覽å?¨è¦?çª?å??å??é ?ï¼?"
 
-#. Translators: %s refers to the LSB distributor ID, for instance MandrivaLinux
-#: ../src/ephy-session.c:1364
-#, c-format
-msgid "This page was loading when the web browser closed unexpectedly. This might happen again if you reload the page. If it does, please report the problem to the %s developers."
-msgstr "é??å??網é ?å°?å?¨è®?å??ä½?ç??覽å?¨å·²ç?°å¸¸é??é??äº?ã??å¦?æ??ä½ é??æ?°è¼?å?¥è©²é ?é?¢ä»?ç?¶å?¯è?½å??度ç?¼ç??é??å??ç??æ³?ã??å¦?æ??ç??ç??é??樣ï¼?è«?å°?å??é¡?å?¯å ±çµ¦ %s é??ç?¼é??ä¼?ã??"
-
 #: ../src/ephy-tabs-menu.c:211
 msgid "Switch to this tab"
 msgstr "å??æ??å?°æ­¤å??é ?"
@@ -2337,8 +2355,7 @@ msgstr "è?ªé?¸å·¥å?·å??(_C)â?¦"
 msgid "Customize toolbars"
 msgstr "è?ªé?¸å·¥å?·å??"
 
-#: ../src/ephy-window.c:196
-#: ../src/ephy-window.c:199
+#: ../src/ephy-window.c:196 ../src/ephy-window.c:199
 msgid "_Stop"
 msgstr "å??æ­¢(_S)"
 
@@ -2407,8 +2424,7 @@ msgstr "顯示網é ?ç??å®?å?¨è³?è¨?"
 msgid "_Add Bookmarkâ?¦"
 msgstr "���籤(_A)�"
 
-#: ../src/ephy-window.c:226
-#: ../src/ephy-window.c:297
+#: ../src/ephy-window.c:226 ../src/ephy-window.c:297
 msgid "Add a bookmark for the current page"
 msgstr "æ?°å¢?æ??é??æ?¬é ?é?¢ç??æ?¸ç±¤"
 
@@ -2430,8 +2446,7 @@ msgid "Go to a specified location"
 msgstr "å??å¾?æ??å®?ç??ä½?ç½®"
 
 #. History
-#: ../src/ephy-window.c:237
-#: ../src/pdm-dialog.c:403
+#: ../src/ephy-window.c:237 ../src/pdm-dialog.c:403
 msgid "Hi_story"
 msgstr "æ­·å?²è¨?é??(_S)"
 
@@ -2633,8 +2648,7 @@ msgstr "å¦?æ??ä½ ç?¡è«?ç?¡ä½?è¦?é??é??æ­¤æ??件ï¼?ä½ å°?æ??失å?»æ?ªå?²å­?ç??è³?
 msgid "Close _Document"
 msgstr "é??é??æ??件(_D)"
 
-#: ../src/ephy-window.c:1438
-#: ../src/window-commands.c:313
+#: ../src/ephy-window.c:1438 ../src/window-commands.c:313
 msgid "Open"
 msgstr "é??å??"
 
@@ -2731,7 +2745,10 @@ msgid "<b>Select the personal data you want to clear</b>"
 msgstr "<b>é?¸æ??æ?³è¦?æ¸?é?¤ç??å??人è³?æ??</b>"
 
 #: ../src/pdm-dialog.c:340
-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:"
+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:345
@@ -2754,7 +2771,9 @@ msgid "_Temporary files"
 msgstr "����(_T)"
 
 #: ../src/pdm-dialog.c:431
-msgid "<small><i><b>Note:</b> You cannot undo this action. The data you are choosing to clear will be deleted forever.</i></small>"
+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:622
@@ -2826,8 +2845,7 @@ msgstr "å?¦å­?å??ç??"
 #. * second %s is the locale name. Example:
 #. * "French (France)"
 #.
-#: ../src/prefs-dialog.c:467
-#: ../src/prefs-dialog.c:473
+#: ../src/prefs-dialog.c:467 ../src/prefs-dialog.c:473
 #, c-format
 msgctxt "language"
 msgid "%s (%s)"
@@ -2853,19 +2871,29 @@ msgid "Select a Directory"
 msgstr "é?¸æ??ä¸?å??ç?®é??"
 
 #: ../src/window-commands.c:941
-msgid "The GNOME Web Browser 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."
+msgid ""
+"The GNOME Web Browser 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 "GNOME 網é ?ç??覽å?¨ç?ºè?ªç?±è»?件ï¼?ä½ å?¯æ ¹æ??æ??è?ªç?±è»?件å?ºé??æ??æ??ç?¼è¡¨ç?? GNU é??ç?¨å?¬å?±æ??æ¬?æ¢?款è¦?å®?ï¼?å°±æ?¬ç¨?å¼?å??ç?ºæ?£å¸?è??ï¼?æ??ä¿®æ?¹ï¼?ç?¡è«?ä½ æ ¹æ??æ??ç??æ?¯æ?¬æ??æ¬?ç??第äº?ç??æ??ï¼?ä½ è?ªè¡?é?¸æ??ç??ï¼?ä»»ä¸?æ?¥å¾?ç?¼è¡?ç??ç??æ?¬ã??"
 
 #: ../src/window-commands.c:945
-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 or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details."
+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 "
+"or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+"more details."
 msgstr "GNOME 網é ?ç??覽å?¨ä¿?å?ºæ?¼ä½¿ç?¨ç?®ç??è??å? ä»¥æ?£å¸?ï¼?ç?¶è??ä¸?è² ä»»ä½?æ??ä¿?責任ï¼?亦ç?¡å°?é?©å?®æ?§æ??ç?¹å®?ç?®ç??é?©ç?¨æ?§æ??ç?ºç??é»?示æ?§æ??ä¿?ã??詳æ??è«?å??ç?§ GNU é??ç?¨å?¬å?±æ??æ¬?ã??"
 
 #: ../src/window-commands.c:949
-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"
+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:995
-#: ../src/window-commands.c:1011
+#: ../src/window-commands.c:995 ../src/window-commands.c:1011
 #: ../src/window-commands.c:1022
 msgid "Contact us at:"
 msgstr "è?¯çµ¡æ??å??æ?¼ï¼?"
@@ -2915,13 +2943,28 @@ msgid "Enable caret browsing mode?"
 msgstr "æ?¯å?¦å??ç?¨é?µç?¤ç??覽ï¼?"
 
 #: ../src/window-commands.c:1219
-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?"
+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:1222
 msgid "_Enable"
 msgstr "å??ç?¨(_E)"
 
+#~ msgid "Let web pages specify their own _fonts"
+#~ msgstr "ç?±ç¶²é ?è?ªè¡?æ??å®?å­?å??(_F)"
+
+#~ msgid "Let web pages specify their own c_olors"
+#~ msgstr "ç?±ç¶²é ?è?ªè¡?æ??å®?é¡?è?²(_O)"
+
+#~ msgid "A problem occurred while loading %s"
+#~ msgstr "è¼?å?¥ %s æ??ç?¼ç??å??é¡?"
+
+#~ msgid "Failed to read latest migration marker, aborting profile migration."
+#~ msgstr "è®?å??æ??æ?°è½?移æ¨?è¨?失æ??ï¼?æ?¾æ£?設å®?çµ?å??ç??è½?移ã??"
+
 #~ msgid "<b>Web Development</b>"
 #~ msgstr "<b>網é ?é??ç?¼</b>"
 
@@ -3045,13 +3088,33 @@ msgstr "å??ç?¨(_E)"
 #~ msgid ""
 #~ "Default encoding. Accepted values are: \"armscii-8\", \"Big5\", \"Big5-"
 #~ "HKSCS\", \"EUC-JP\", \"EUC-KR\", \"gb18030\", \"GB2312\", \"geostd8\", "
-#~ "\"HZ-GB-2312\", \"IBM850\", \"IBM852\", \"IBM855\", \"IBM857\", \"IBM862"
-#~ "\", \"IBM864\", \"IBM866\", \"ISO-2022-CN\", \"ISO-2022-JP\", \"ISO-2022-"
-#~ "KR\", \"ISO-8859-1\", \"ISO-8859-2\", \"ISO-8859-3\", \"ISO-8859-4\", "
-#~ "\"ISO-8859-5\", \"ISO-8859-6\", \"ISO-8859-7\", \"ISO-8859-8\", \"ISO-"
-#~ "8859-8-I\", \"ISO-8859-9\", \"ISO-8859-10\", \"ISO-8859-11\", \"ISO-8859-"
-#~ "13\", \"ISO-8859-14\", \"ISO-8859-15\", \"ISO-8859-16\", \"ISO-IR-111\", "
-#~ "\"KOI8-R\", \"KOI8-U\", \"Shift_JIS\", \"TIS-620\", \"UTF-7\", \"UTF-8\", "
+#~ "\"HZ-GB-2312\", \"IBM850\", \"IBM852\", \"IBM855\", \"IBM857\", "
+#~ "\"IBM862\", \"IBM864\", \"IBM866\", \"ISO-2022-CN\", \"ISO-2022-JP\", "
+#~ "\"ISO-2022-KR\", \"ISO-8859-1\", \"ISO-8859-2\", \"ISO-8859-3\", "
+#~ "\"ISO-8859-4\", \"ISO-8859-5\", \"ISO-8859-6\", \"ISO-8859-7\", "
+#~ "\"ISO-8859-8\", \"ISO-8859-8-I\", \"ISO-8859-9\", \"ISO-8859-10\", "
+#~ "\"ISO-8859-11\", \"ISO-8859-13\", \"ISO-8859-14\", \"ISO-8859-15\", "
+#~ "\"ISO-8859-16\", \"ISO-IR-111\", \"KOI8-R\", \"KOI8-U\", \"Shift_JIS\", "
+#~ "\"TIS-620\", \"UTF-7\", \"UTF-8\", \"VISCII\", \"windows-874\", "
+#~ "\"windows-1250\", \"windows-1251\", \"windows-1252\", \"windows-1253\", "
+#~ "\"windows-1254\", \"windows-1255\", \"windows-1256\", \"windows-1257\", "
+#~ "\"windows-1258\", \"x-euc-tw\", \"x-gbk\", \"x-johab\", \"x-mac-arabic\", "
+#~ "\"x-mac-ce\", \"x-mac-croatian\", \"x-mac-cyrillic\", \"x-mac-devanagari"
+#~ "\", \"x-mac-farsi\", \"x-mac-greek\", \"x-mac-gujarati\", \"x-mac-gurmukhi"
+#~ "\", \"x-mac-hebrew\", \"x-mac-icelandic\", \"x-mac-roman\", \"x-mac-"
+#~ "romanian\", \"x-mac-turkish\", \"x-mac-ukrainian\", \"x-user-defined\", "
+#~ "\"x-viet-tcvn5712\", \"x-viet-vps\" and \"x-windows-949\"."
+#~ msgstr ""
+#~ "é ?設å­?å??編碼ã??å?¯æ?¥å??ç??å?¼ç?ºï¼?\n"
+#~ "\"armscii-8\", \"Big5\", \"Big5-HKSCS\", \"EUC-JP\", \"EUC-KR\", "
+#~ "\"gb18030\", \"GB2312\", \"geostd8\", \"HZ-GB-2312\", \"IBM850\", "
+#~ "\"IBM852\", \"IBM855\", \"IBM857\", \"IBM862\", \"IBM864\", \"IBM866\", "
+#~ "\"ISO-2022-CN\", \"ISO-2022-JP\", \"ISO-2022-KR\", \"ISO-8859-1\", "
+#~ "\"ISO-8859-2\", \"ISO-8859-3\", \"ISO-8859-4\", \"ISO-8859-5\", "
+#~ "\"ISO-8859-6\", \"ISO-8859-7\", \"ISO-8859-8\", \"ISO-8859-8-I\", "
+#~ "\"ISO-8859-9\", \"ISO-8859-10\", \"ISO-8859-11\", \"ISO-8859-13\", "
+#~ "\"ISO-8859-14\", \"ISO-8859-15\", \"ISO-8859-16\", \"ISO-IR-111\", \"KOI8-"
+#~ "R\", \"KOI8-U\", \"Shift_JIS\", \"TIS-620\", \"UTF-7\", \"UTF-8\", "
 #~ "\"VISCII\", \"windows-874\", \"windows-1250\", \"windows-1251\", "
 #~ "\"windows-1252\", \"windows-1253\", \"windows-1254\", \"windows-1255\", "
 #~ "\"windows-1256\", \"windows-1257\", \"windows-1258\", \"x-euc-tw\", \"x-"
@@ -3060,26 +3123,7 @@ msgstr "å??ç?¨(_E)"
 #~ "\", \"x-mac-gujarati\", \"x-mac-gurmukhi\", \"x-mac-hebrew\", \"x-mac-"
 #~ "icelandic\", \"x-mac-roman\", \"x-mac-romanian\", \"x-mac-turkish\", \"x-"
 #~ "mac-ukrainian\", \"x-user-defined\", \"x-viet-tcvn5712\", \"x-viet-vps\" "
-#~ "and \"x-windows-949\"."
-#~ msgstr ""
-#~ "é ?設å­?å??編碼ã??å?¯æ?¥å??ç??å?¼ç?ºï¼?\n"
-#~ "\"armscii-8\", \"Big5\", \"Big5-HKSCS\", \"EUC-JP\", \"EUC-KR\", \"gb18030"
-#~ "\", \"GB2312\", \"geostd8\", \"HZ-GB-2312\", \"IBM850\", \"IBM852\", "
-#~ "\"IBM855\", \"IBM857\", \"IBM862\", \"IBM864\", \"IBM866\", \"ISO-2022-CN"
-#~ "\", \"ISO-2022-JP\", \"ISO-2022-KR\", \"ISO-8859-1\", \"ISO-8859-2\", "
-#~ "\"ISO-8859-3\", \"ISO-8859-4\", \"ISO-8859-5\", \"ISO-8859-6\", \"ISO-"
-#~ "8859-7\", \"ISO-8859-8\", \"ISO-8859-8-I\", \"ISO-8859-9\", \"ISO-8859-10"
-#~ "\", \"ISO-8859-11\", \"ISO-8859-13\", \"ISO-8859-14\", \"ISO-8859-15\", "
-#~ "\"ISO-8859-16\", \"ISO-IR-111\", \"KOI8-R\", \"KOI8-U\", \"Shift_JIS\", "
-#~ "\"TIS-620\", \"UTF-7\", \"UTF-8\", \"VISCII\", \"windows-874\", \"windows-"
-#~ "1250\", \"windows-1251\", \"windows-1252\", \"windows-1253\", \"windows-"
-#~ "1254\", \"windows-1255\", \"windows-1256\", \"windows-1257\", \"windows-"
-#~ "1258\", \"x-euc-tw\", \"x-gbk\", \"x-johab\", \"x-mac-arabic\", \"x-mac-ce"
-#~ "\", \"x-mac-croatian\", \"x-mac-cyrillic\", \"x-mac-devanagari\", \"x-mac-"
-#~ "farsi\", \"x-mac-greek\", \"x-mac-gujarati\", \"x-mac-gurmukhi\", \"x-mac-"
-#~ "hebrew\", \"x-mac-icelandic\", \"x-mac-roman\", \"x-mac-romanian\", \"x-"
-#~ "mac-turkish\", \"x-mac-ukrainian\", \"x-user-defined\", \"x-viet-tcvn5712"
-#~ "\", \"x-viet-vps\" å?? \"x-windows-949\"ã??"
+#~ "å?? \"x-windows-949\"ã??"
 
 #~ msgid "Default font type"
 #~ msgstr "é ?設å­?å??款å¼?"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 01cc585..6cdb1df 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -10,12 +10,14 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: epiphany 2.91.3\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany&component=general\n";
-"POT-Creation-Date: 2010-12-01 10:12+0000\n"
-"PO-Revision-Date: 2010-12-06 21:22+0800\n"
+"Project-Id-Version: epiphany 2.91.5\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
+"product=epiphany\n"
+"POT-Creation-Date: 2011-01-27 18:47+0800\n"
+"PO-Revision-Date: 2011-01-27 11:54+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (Taiwan) <zh-l10n lists linux org tw>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -65,8 +67,7 @@ msgid "Epiphany Web Browser"
 msgstr "Epiphany 網é ?ç??覽å?¨"
 
 #. sets the name to appear in the window list applet when grouping windows
-#: ../data/epiphany.desktop.in.in.h:4
-#: ../src/ephy-main.c:647
+#: ../data/epiphany.desktop.in.in.h:4 ../src/ephy-main.c:647
 msgid "Web Browser"
 msgstr "網é ?ç??覽å?¨"
 
@@ -111,7 +112,7 @@ msgid "Field _Value"
 msgstr "æ¬?ä½?ç??å?¼(_V)"
 
 #: ../data/glade/certificate-dialogs.ui.h:11
-#: ../data/glade/prefs-dialog.ui.h:20
+#: ../data/glade/prefs-dialog.ui.h:22
 msgid "General"
 msgstr "��"
 
@@ -156,10 +157,8 @@ msgid "Cookies"
 msgstr "Cookie"
 
 #. The name of the default downloads folder
-#: ../data/glade/epiphany.ui.h:5
-#: ../lib/ephy-file-helpers.c:129
-#: ../lib/ephy-file-helpers.c:160
-#: ../src/prefs-dialog.c:856
+#: ../data/glade/epiphany.ui.h:5 ../lib/ephy-file-helpers.c:129
+#: ../lib/ephy-file-helpers.c:160 ../src/prefs-dialog.c:856
 msgid "Downloads"
 msgstr "��"
 
@@ -175,8 +174,7 @@ msgstr "å??人è³?æ??"
 msgid "Text Encoding"
 msgstr "å­?å??編碼"
 
-#: ../data/glade/epiphany.ui.h:9
-#: ../src/ephy-encoding-menu.c:338
+#: ../data/glade/epiphany.ui.h:9 ../src/ephy-encoding-menu.c:338
 msgid "Use the encoding specified by the document"
 msgstr "使ç?¨æ??件æ??å®?ç??編碼æ?¹å¼?"
 
@@ -189,7 +187,9 @@ msgid "Sign Text"
 msgstr "簽署æ??å­?"
 
 #: ../data/glade/form-signing-dialog.ui.h:2
-msgid "To confirm that you want to sign the above text, choose a certificate to sign the text with and enter its password below."
+msgid ""
+"To confirm that you want to sign the above text, choose a certificate to "
+"sign the text with and enter its password below."
 msgstr "確å®?è¦?簽署以ä¸?æ??å­?ï¼?è«?é?¸æ??簽署æ??å­?ç??æ??è­?å??å?¨ä¸?æ?¹è¼¸å?¥å¯?碼ã??"
 
 #: ../data/glade/form-signing-dialog.ui.h:3
@@ -201,8 +201,8 @@ msgid "_Password:"
 msgstr "�碼(_P)�"
 
 #: ../data/glade/form-signing-dialog.ui.h:5
-msgid "_View Certificateâ?¦"
-msgstr "檢è¦?æ??è­?(_V)â?¦"
+msgid "_View Certificate&#x2026;"
+msgstr "檢è¦?æ??è­?(_V)&#x2026;"
 
 #: ../data/glade/prefs-dialog.ui.h:1
 msgid "<b>Cookies</b>"
@@ -217,43 +217,51 @@ msgid "<b>Encodings</b>"
 msgstr "<b>編碼</b>"
 
 #: ../data/glade/prefs-dialog.ui.h:4
+msgid "<b>Fonts</b>"
+msgstr "<b>å­?å??</b>"
+
+#: ../data/glade/prefs-dialog.ui.h:5
 msgid "<b>Home page</b>"
 msgstr "<b>��</b>"
 
-#: ../data/glade/prefs-dialog.ui.h:5
+#: ../data/glade/prefs-dialog.ui.h:6
 msgid "<b>Languages</b>"
 msgstr "<b>��</b>"
 
-#: ../data/glade/prefs-dialog.ui.h:6
+#: ../data/glade/prefs-dialog.ui.h:7
 msgid "<b>Passwords</b>"
 msgstr "<b>�碼</b>"
 
-#: ../data/glade/prefs-dialog.ui.h:7
+#: ../data/glade/prefs-dialog.ui.h:8
+msgid "<b>Style</b>"
+msgstr "<b>樣�</b>"
+
+#: ../data/glade/prefs-dialog.ui.h:9
 msgid "<b>Temporary Files</b>"
 msgstr "<b>���</b>"
 
-#: ../data/glade/prefs-dialog.ui.h:8
+#: ../data/glade/prefs-dialog.ui.h:10
 msgid "<b>Web Content</b>"
 msgstr "<b>網��容</b>"
 
 #. Refers to "Only from sites you visit" option under Cookies.
-#: ../data/glade/prefs-dialog.ui.h:10
+#: ../data/glade/prefs-dialog.ui.h:12
 msgid "<small>For example, not from advertisers on these sites</small>"
 msgstr "<small>ä¾?å¦?ï¼?ä¸?è¦?ä¾?è?ªé??äº?網ç«?ç??廣å??</small>"
 
-#: ../data/glade/prefs-dialog.ui.h:11
+#: ../data/glade/prefs-dialog.ui.h:13
 msgid "A_utomatically download and open files"
 msgstr "è?ªå??ä¸?è¼?並é??å??æª?æ¡?(_U)"
 
-#: ../data/glade/prefs-dialog.ui.h:12
+#: ../data/glade/prefs-dialog.ui.h:14
 msgid "Add Language"
 msgstr "����"
 
-#: ../data/glade/prefs-dialog.ui.h:13
+#: ../data/glade/prefs-dialog.ui.h:15
 msgid "Allow popup _windows"
 msgstr "å??許å½?å?ºå¼?è¦?çª?(_W)"
 
-#: ../data/glade/prefs-dialog.ui.h:14
+#: ../data/glade/prefs-dialog.ui.h:16
 msgid "Choose a l_anguage:"
 msgstr "é?¸æ??èª?è¨?(_A)ï¼?"
 
@@ -261,103 +269,107 @@ msgstr "é?¸æ??èª?è¨?(_A)ï¼?"
 #. * standard items in the GtkEntry context menu (Cut, Copy, Paste, Delete,
 #. * Select All, Input Methods and Insert Unicode control character.)
 #.
-#: ../data/glade/prefs-dialog.ui.h:15
-#: ../lib/widgets/ephy-location-entry.c:680
-#: ../src/ephy-history-window.c:227
-#: ../src/pdm-dialog.c:356
+#: ../data/glade/prefs-dialog.ui.h:17 ../lib/widgets/ephy-location-entry.c:681
+#: ../src/ephy-history-window.c:227 ../src/pdm-dialog.c:356
 msgid "Cl_ear"
 msgstr "��(_E)"
 
-#: ../data/glade/prefs-dialog.ui.h:16
+#: ../data/glade/prefs-dialog.ui.h:18
 msgid "De_fault:"
 msgstr "�設(_F)�"
 
-#: ../data/glade/prefs-dialog.ui.h:17
+#: ../data/glade/prefs-dialog.ui.h:19
 msgid "Enable Java_Script"
 msgstr "å??ç?¨ Java_Script"
 
-#: ../data/glade/prefs-dialog.ui.h:18
-#| msgid "Enable _Plugins"
+#: ../data/glade/prefs-dialog.ui.h:20
 msgid "Enable _plugins"
 msgstr "å??ç?¨å¤?æ??ç¨?å¼?(_P)"
 
-#: ../data/glade/prefs-dialog.ui.h:19
+#: ../data/glade/prefs-dialog.ui.h:21
 msgid "Fonts & Style"
 msgstr "å­?å??è??樣å¼?"
 
-#: ../data/glade/prefs-dialog.ui.h:21
-#: ../src/prefs-dialog.c:773
+#: ../data/glade/prefs-dialog.ui.h:23 ../src/prefs-dialog.c:773
 msgid "Language"
 msgstr "��"
 
-#: ../data/glade/prefs-dialog.ui.h:22
-msgid "Let web pages specify their own _fonts"
-msgstr "ç?±ç¶²é ?è?ªè¡?æ??å®?å­?å??(_F)"
-
-#: ../data/glade/prefs-dialog.ui.h:23
-msgid "Let web pages specify their own c_olors"
-msgstr "ç?±ç¶²é ?è?ªè¡?æ??å®?é¡?è?²(_O)"
-
 #: ../data/glade/prefs-dialog.ui.h:24
 msgid "MB"
 msgstr "MB"
 
 #: ../data/glade/prefs-dialog.ui.h:25
+msgid "Monospace font:"
+msgstr "ç­?寬å­?å??ï¼?"
+
+#: ../data/glade/prefs-dialog.ui.h:26
 msgid "Only _from sites you visit"
 msgstr "å?ªä¾?è?ªæ?¨ç??覽ç??網ç«?(_F)"
 
-#: ../data/glade/prefs-dialog.ui.h:26
+#: ../data/glade/prefs-dialog.ui.h:27
 msgid "Preferences"
 msgstr "å??好設å®?"
 
-#: ../data/glade/prefs-dialog.ui.h:27
+#: ../data/glade/prefs-dialog.ui.h:28
 msgid "Privacy"
 msgstr "��"
 
-#: ../data/glade/prefs-dialog.ui.h:28
+#: ../data/glade/prefs-dialog.ui.h:29
+msgid "Sans serif font:"
+msgstr "ç?¡è¥¯ç·?å­?å??ï¼?"
+
+#: ../data/glade/prefs-dialog.ui.h:30
+msgid "Serif font:"
+msgstr "襯ç·?å­?å??ï¼?"
+
+#: ../data/glade/prefs-dialog.ui.h:31
 msgid "Set to Current _Page"
 msgstr "設å®?ç?ºç?®å??é ?é?¢(_P)"
 
-#: ../data/glade/prefs-dialog.ui.h:29
+#: ../data/glade/prefs-dialog.ui.h:32
 msgid "Set to _Blank Page"
 msgstr "使�空���(_B)"
 
-#: ../data/glade/prefs-dialog.ui.h:30
+#: ../data/glade/prefs-dialog.ui.h:33
 msgid "Use custom _stylesheet"
 msgstr "使���樣�表(_S)"
 
-#: ../data/glade/prefs-dialog.ui.h:31
+#: ../data/glade/prefs-dialog.ui.h:34
 msgid "_Address:"
 msgstr "ä½?å??(_A)ï¼?"
 
-#: ../data/glade/prefs-dialog.ui.h:32
+#: ../data/glade/prefs-dialog.ui.h:35
 msgid "_Always accept"
 msgstr "總æ?¯æ?¥å??(_A)"
 
-#: ../data/glade/prefs-dialog.ui.h:33
+#: ../data/glade/prefs-dialog.ui.h:36
 msgid "_Disk space:"
 msgstr "ç£?ç¢?空é??(_D)ï¼?"
 
-#: ../data/glade/prefs-dialog.ui.h:34
+#: ../data/glade/prefs-dialog.ui.h:37
 msgid "_Download folder:"
 msgstr "ä¸?è¼?è³?æ??夾(_D)"
 
-#: ../data/glade/prefs-dialog.ui.h:35
-msgid "_Edit Stylesheetâ?¦"
-msgstr "編輯樣�表(_E)�"
+#: ../data/glade/prefs-dialog.ui.h:38
+msgid "_Edit Stylesheet&#x2026;"
+msgstr "編輯樣�表(_E)&#x2026;"
 
-#: ../data/glade/prefs-dialog.ui.h:36
-msgid "_Minimum size:"
-msgstr "å­?å??大å°?ä¸?é??(_M)ï¼?"
+#: ../data/glade/prefs-dialog.ui.h:39
+msgid "_Minimum font size:"
+msgstr "æ??å°?å­?å??大å°?(_M):"
 
-#: ../data/glade/prefs-dialog.ui.h:37
+#: ../data/glade/prefs-dialog.ui.h:40
 msgid "_Never accept"
 msgstr "æ°¸ä¸?æ?¥å??(_N)"
 
-#: ../data/glade/prefs-dialog.ui.h:38
+#: ../data/glade/prefs-dialog.ui.h:41
 msgid "_Remember passwords"
 msgstr "è¨?é??å¯?碼(_R)"
 
+#: ../data/glade/prefs-dialog.ui.h:42
+msgid "_Use system fonts"
+msgstr "使ç?¨ç³»çµ±å­?å??(_U)"
+
 #: ../data/glade/print.ui.h:1
 msgid "<b>Background</b>"
 msgstr "<b>è??æ?¯</b>"
@@ -434,10 +446,8 @@ msgid "_Resume"
 msgstr "��(_R)"
 
 #. impossible time or broken locale settings
-#: ../embed/downloader-view.c:366
-#: ../embed/downloader-view.c:520
-#: ../embed/downloader-view.c:525
-#: ../lib/ephy-time-helpers.c:279
+#: ../embed/downloader-view.c:366 ../embed/downloader-view.c:520
+#: ../embed/downloader-view.c:525 ../lib/ephy-time-helpers.c:279
 #: ../src/ephy-window.c:1681
 msgid "Unknown"
 msgstr "�詳"
@@ -458,8 +468,7 @@ msgid "%d download"
 msgid_plural "%d downloads"
 msgstr[0] "ä¸?è¼? %d å??æª?æ¡?"
 
-#: ../embed/downloader-view.c:735
-#: ../embed/downloader-view.c:745
+#: ../embed/downloader-view.c:735 ../embed/downloader-view.c:745
 msgctxt "download status"
 msgid "Unknown"
 msgstr "ä¸?æ??"
@@ -474,8 +483,7 @@ msgctxt "download status"
 msgid "Cancelled"
 msgstr "å·²å??æ¶?"
 
-#: ../embed/downloader-view.c:802
-#: ../src/bookmarks/ephy-bookmarks-editor.c:977
+#: ../embed/downloader-view.c:802 ../src/bookmarks/ephy-bookmarks-editor.c:978
 msgid "File"
 msgstr "��"
 
@@ -487,41 +495,42 @@ msgstr "%"
 msgid "Remaining"
 msgstr "��"
 
-#: ../embed/ephy-embed.c:445
-#: ../embed/ephy-embed-persist.c:823
+#: ../embed/ephy-embed.c:404 ../embed/ephy-embed-persist.c:823
 #: ../src/window-commands.c:343
 msgid "Save"
 msgstr "��"
 
-#: ../embed/ephy-embed.c:703
+#: ../embed/ephy-embed.c:662
 msgctxt "file type"
 msgid "Unknown"
 msgstr "ä¸?æ??"
 
-#: ../embed/ephy-embed.c:719
+#: ../embed/ephy-embed.c:678
 msgid "Download this potentially unsafe file?"
 msgstr "ä¸?è¼?é??å??å?¯è?½ä¸?å®?å?¨ç??æª?æ¡?ï¼?"
 
 #. translators: First %s is the file type description, second %s is the
 #. * file name
-#: ../embed/ephy-embed.c:723
+#: ../embed/ephy-embed.c:682
 #, c-format
 msgid ""
 "File Type: â??%sâ??.\n"
 "\n"
-"It is unsafe to open â??%sâ?? as it could potentially damage your documents or invade your privacy. You can download it instead."
+"It is unsafe to open â??%sâ?? as it could potentially damage your documents or "
+"invade your privacy. You can download it instead."
 msgstr ""
 "æª?æ¡?é¡?å??ï¼?â??%sâ??ã??\n"
 "\n"
-"é??å??â??%sâ??並ä¸?å®?å?¨ï¼?å®?æ??å?¯è?½æ??ç ´å£?æ?¨ç??æ??件æ??ä¾µç?¯æ?¨ç??é?±ç§?æ¬?ã??æ?¨å?¯ä»¥ä»¥ä¸?è¼?ä¾?代æ?¿ã??"
+"é??å??â??%sâ??並ä¸?å®?å?¨ï¼?å®?æ??å?¯è?½æ??ç ´å£?æ?¨ç??æ??件æ??ä¾µç?¯æ?¨ç??é?±ç§?æ¬?ã??æ?¨å?¯ä»¥ä»¥ä¸?è¼?ä¾?代"
+"æ?¿ã??"
 
-#: ../embed/ephy-embed.c:731
+#: ../embed/ephy-embed.c:690
 msgid "Open this file?"
 msgstr "é??å??æ­¤æª?æ¡?ï¼?"
 
 #. translators: First %s is the file type description, second %s is the
 #. * file name, third %s is the application used to open the file
-#: ../embed/ephy-embed.c:735
+#: ../embed/ephy-embed.c:694
 #, c-format
 msgid ""
 "File Type: â??%sâ??.\n"
@@ -532,13 +541,13 @@ msgstr ""
 "\n"
 "æ?¨å?¯ä»¥ä½¿ç?¨â??%sâ??é??å??â??%sâ??æ??å°?å®?å?²å­?ã??"
 
-#: ../embed/ephy-embed.c:740
+#: ../embed/ephy-embed.c:699
 msgid "Download this file?"
 msgstr "��此���"
 
 #. translators: First %s is the file type description, second %s is the
 #. * file name
-#: ../embed/ephy-embed.c:744
+#: ../embed/ephy-embed.c:703
 #, c-format
 msgid ""
 "File Type: â??%sâ??.\n"
@@ -549,16 +558,18 @@ msgstr ""
 "\n"
 "æ?¨æ²?æ??ä»»ä½?è»?é«?è?½å¤ é??å??â??%sâ??ï¼?æ?¨å?¯ä»¥ä»¥ä¸?è¼?å®?ä¾?代æ?¿ã??"
 
-#: ../embed/ephy-embed.c:923
+#: ../embed/ephy-embed.c:894
 msgid "Web Inspector"
 msgstr "網�檢��"
 
-#: ../embed/ephy-embed-shell.c:259
+#: ../embed/ephy-embed-shell.c:262
 msgid "Epiphany can't be used now. Initialization failed."
 msgstr "Epiphany ç?®å??ç?¡æ³?使ç?¨ã??å??å§?å??ç¨?åº?失æ??ã??"
 
-#: ../embed/ephy-embed-single.c:504
-msgid "CA Certificates file we should use was not found, all SSL sites will be considered to have a broken certificate."
+#: ../embed/ephy-embed-single.c:505
+msgid ""
+"CA Certificates file we should use was not found, all SSL sites will be "
+"considered to have a broken certificate."
 msgstr "æ?¾ä¸?å?°æ??å??æ??該使ç?¨ç?? CA æ??è­?ï¼?æ??æ??ç?? SSL 網ç«?é?½æ??被èª?ç?ºå?¶æ??è­?å·²æ??å£?ã??"
 
 #: ../embed/ephy-embed-utils.c:60
@@ -905,17 +916,15 @@ msgstr "����"
 #. characters
 #. ms
 #. RELOAD_DELAY * RELOAD_DELAY_MAX_TICKS = 10 s
-#: ../embed/ephy-web-view.c:67
-#: ../embed/ephy-web-view.c:3319
-#: ../src/ephy-session.c:1420
+#: ../embed/ephy-web-view.c:67 ../embed/ephy-web-view.c:3453
 msgid "Blank page"
 msgstr "空���"
 
-#: ../embed/ephy-web-view.c:763
+#: ../embed/ephy-web-view.c:765
 msgid "Not now"
 msgstr "����"
 
-#: ../embed/ephy-web-view.c:768
+#: ../embed/ephy-web-view.c:770
 msgid "Store password"
 msgstr "���碼"
 
@@ -923,52 +932,94 @@ msgstr "���碼"
 #. * hostname where this is happening. Example: gnome gmail com and
 #. * mail.google.com.
 #.
-#: ../embed/ephy-web-view.c:779
+#: ../embed/ephy-web-view.c:781
 #, c-format
-msgid "<big>Would you like to store the password for <b>%s</b> in <b>%s</b>?</big>"
+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>"
 
 #. Translators: Geolocation policy for a specific site.
-#: ../embed/ephy-web-view.c:1821
+#: ../embed/ephy-web-view.c:1829
 msgid "Deny"
 msgstr "�止"
 
 #. Translators: Geolocation policy for a specific site.
-#: ../embed/ephy-web-view.c:1827
-#| msgid "_Allow"
+#: ../embed/ephy-web-view.c:1835
 msgid "Allow"
 msgstr "å??許"
 
 #. Label
-#: ../embed/ephy-web-view.c:1833
+#: ../embed/ephy-web-view.c:1841
 #, c-format
 msgid "The page at <b>%s</b> wants to know your location."
 msgstr "å?¨ <b>%s</b> ç??網é ?æ?³è¦?ç?¥é??æ?¨ç??ä½?ç½®ã??"
 
-#: ../embed/ephy-web-view.c:2003
+#: ../embed/ephy-web-view.c:2074
+msgid "None specified"
+msgstr "æ²?æ??æ??å®?"
+
+#: ../embed/ephy-web-view.c:2083 ../embed/ephy-web-view.c:2095
+#, c-format
+msgid "Oops! Error loading %s"
+msgstr "å?¢ï¼?è¼?å?¥ %s æ??ç?¼ç??é?¯èª¤"
+
+#: ../embed/ephy-web-view.c:2085
+msgid "Oops! It was impossible to load this website"
+msgstr "å?¢ï¼?ç?¡æ³?è¼?å?¥é??å??網ç«?"
+
+#: ../embed/ephy-web-view.c:2086
+#, c-format
+msgid ""
+"The website at <strong>%s</strong> is probably unavailable, the precise "
+"error was:<br/><br/><em>%s</em>.<br/><br/> If this persists you might want "
+"to check your internet connection or if the website at <strong>%s</strong> "
+"is working correctly."
+msgstr ""
+"網� <strong>%s</strong> ����使���確�說�誤��<br/><br/><em>%s</"
+"em>ã??<br/><br/>å¦?æ??æ??æ³?ä¸?ç?´æ??çº?ï¼?æ?¨å?¯è?½è¦?檢æ?¥ç¶²é??網路é?£ç·?æ??網ç«? <strong>%s</"
+"strong> æ?¯å?¦æ­£å¸¸é??ä½?ã??"
+
+#: ../embed/ephy-web-view.c:2089
+msgid "Try again"
+msgstr "å??試ä¸?次"
+
+#: ../embed/ephy-web-view.c:2097
+msgid "Oops! This site might have caused Epiphany to close unexpectedly"
+msgstr "å?¢ï¼?é??å??網ç«?å?¯è?½å·²é? æ?? Epiphany æ?ªé ?æ??ç??é??é??"
+
+#: ../embed/ephy-web-view.c:2098
 #, c-format
-msgid "A problem occurred while loading %s"
-msgstr "è¼?å?¥ %s æ??ç?¼ç??å??é¡?"
+msgid ""
+"This page was loading when the web browser closed unexpectedly.<br/> This "
+"might happen again if you reload the page. If it does, please report the "
+"problem to the <strong>%s</strong> developers."
+msgstr ""
+"é??å??網é ?å°?å?¨è®?å??ä½?ç??覽å?¨å·²ç?°å¸¸é??é??äº?ã??<br/>å¦?æ??æ?¨é??æ?°è¼?å?¥è©²é ?é?¢ä»?ç?¶å?¯è?½å??度ç?¼"
+"ç??é??å??ç??æ³?ã??å¦?æ??ç??ç??é??樣ï¼?è«?å°?å??é¡?å??報給 <strong>%s</strong> é??ç?¼å??é??ã??"
+
+#: ../embed/ephy-web-view.c:2101
+msgid "Load again anyway"
+msgstr "强å?¶å??次è¼?å?¥"
 
-#: ../embed/ephy-web-view.c:2265
+#: ../embed/ephy-web-view.c:2399
 #, 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";
 
 #. translators: %s here is the address of the web page
-#: ../embed/ephy-web-view.c:2560
+#: ../embed/ephy-web-view.c:2694
 #, c-format
 msgid "Loading â??%sâ??â?¦"
 msgstr "æ­£å?¨è¼?å?¥â??%sâ??â?¦"
 
-#: ../embed/ephy-web-view.c:2562
+#: ../embed/ephy-web-view.c:2696
 msgid "Loadingâ?¦"
 msgstr "��中�"
 
 #. Translators: this is the directory name to store auxilary files
 #. * when saving html files.
 #.
-#: ../embed/ephy-web-view.c:3523
+#: ../embed/ephy-web-view.c:3657
 #, c-format
 msgid "%s Files"
 msgstr "%s å??æª?æ¡?"
@@ -1016,9 +1067,7 @@ msgstr "å??ç?¨å?°ä½?業é??段管ç??ç¨?å¼?ç??é?£ç·?"
 msgid "Specify file containing saved configuration"
 msgstr "æ??å®?å??å?«å·²å?²å­?çµ?æ??ç??æª?æ¡?"
 
-#: ../lib/egg/eggsmclient.c:228
-#: ../src/ephy-main.c:92
-#: ../src/ephy-main.c:94
+#: ../lib/egg/eggsmclient.c:228 ../src/ephy-main.c:92 ../src/ephy-main.c:94
 msgid "FILE"
 msgstr "��"
 
@@ -1090,29 +1139,27 @@ msgstr "網�"
 msgid "Images"
 msgstr "å??å½¢æª?"
 
-#: ../lib/ephy-file-chooser.c:412
-#: ../src/bookmarks/ephy-bookmarks-editor.c:753
+#: ../lib/ephy-file-chooser.c:412 ../src/bookmarks/ephy-bookmarks-editor.c:754
 msgid "All files"
 msgstr "æ??æ??æª?æ¡?"
 
 #. If we don't have XDG user dirs info, return an educated guess.
-#: ../lib/ephy-file-helpers.c:165
-#: ../lib/ephy-file-helpers.c:212
+#: ../lib/ephy-file-helpers.c:165 ../lib/ephy-file-helpers.c:212
 #: ../src/prefs-dialog.c:862
 msgid "Desktop"
 msgstr "æ¡?é?¢"
 
-#: ../lib/ephy-file-helpers.c:384
+#: ../lib/ephy-file-helpers.c:388
 #, c-format
 msgid "Could not create a temporary directory in â??%sâ??."
 msgstr "ç?¡æ³?å?¨â??%sâ??建ç«?æ?«å­?ç?®é??ã??"
 
-#: ../lib/ephy-file-helpers.c:473
+#: ../lib/ephy-file-helpers.c:477
 #, c-format
 msgid "The file â??%sâ?? exists. Please move it out of the way."
 msgstr "æª?æ¡?â??%sâ?? å·²ç¶?å­?å?¨ï¼?è«?å??å°?å®?移è?³å?¶å®?ä½?ç½®ã??"
 
-#: ../lib/ephy-file-helpers.c:484
+#: ../lib/ephy-file-helpers.c:488
 #, c-format
 msgid "Failed to create directory â??%sâ??."
 msgstr "ç?¡æ³?建ç«?ç?®é??â??%sâ??ã??"
@@ -1136,7 +1183,9 @@ msgid "Cannot overwrite existing file â??%sâ??"
 msgstr "ä¸?è?½è¦?寫已å­?å?¨ç??æª?æ¡?â??%sâ??"
 
 #: ../lib/ephy-gui.c:333
-msgid "A file with this name already exists and you don't have permission to overwrite it."
+msgid ""
+"A file with this name already exists and you don't have permission to "
+"overwrite it."
 msgstr "以此ç?ºå??ç??æª?æ¡?å·²ç¶?å­?å?¨è??æ?¨æ²?æ??æ¬?é??å?¯ä»¥è¦?寫å®?ã??"
 
 #: ../lib/ephy-gui.c:336
@@ -1153,23 +1202,23 @@ msgid "Master password needed"
 msgstr "é??è¦?主æ?§å¯?碼"
 
 #: ../lib/ephy-nss-glue.c:64
-msgid "The passwords from the previous version (Gecko) are locked with a master password. If you want Epiphany to import them, please enter your master password below."
-msgstr "å?¨å??ä¸?ç??æ?¬ (Gecko) 中æ??å?²å­?ç??å¯?碼é?½ä½¿ç?¨ä¸»æ?§å¯?碼é??å®?äº?ã??å¦?æ??æ?¨æ?³è¦? Epiphany å?¯å?¥å®?å??ï¼?è«?å?¨ä¸?é?¢è¼¸å?¥æ?¨ç??主æ?§å¯?碼ã??"
+msgid ""
+"The passwords from the previous version (Gecko) are locked with a master "
+"password. If you want Epiphany to import them, please enter your master "
+"password below."
+msgstr ""
+"å?¨å??ä¸?ç??æ?¬ (Gecko) 中æ??å?²å­?ç??å¯?碼é?½ä½¿ç?¨ä¸»æ?§å¯?碼é??å®?äº?ã??å¦?æ??æ?¨æ?³è¦? Epiphany å?¯"
+"å?¥å®?å??ï¼?è«?å?¨ä¸?é?¢è¼¸å?¥æ?¨ç??主æ?§å¯?碼ã??"
 
-#: ../lib/ephy-profile-migration.c:83
+#: ../lib/ephy-profile-migrator.c:80
 msgid "Failed to copy cookies file from Mozilla."
 msgstr "å¾? Mozilla è¤?製 cookies æª?æ¡?失æ??ã??"
 
-#: ../lib/ephy-profile-migration.c:558
-msgid "Failed to read latest migration marker, aborting profile migration."
-msgstr "è®?å??æ??æ?°è½?移æ¨?è¨?失æ??ï¼?æ?¾æ£?設å®?çµ?å??ç??è½?移ã??"
-
 #: ../lib/ephy-stock-icons.c:47
 msgid "Popup Windows"
 msgstr "�����"
 
-#: ../lib/ephy-stock-icons.c:48
-#: ../src/ephy-history-window.c:1098
+#: ../lib/ephy-stock-icons.c:48 ../src/ephy-history-window.c:1098
 msgid "History"
 msgstr "ç??覽è¨?é??"
 
@@ -1179,16 +1228,13 @@ msgstr "ç??覽è¨?é??"
 msgid "Bookmark"
 msgstr "���籤"
 
-#: ../lib/ephy-stock-icons.c:50
-#: ../src/bookmarks/ephy-bookmarks-editor.c:884
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1660
-#: ../src/bookmarks/ephy-topic-action.c:443
-#: ../src/ephy-window.c:1448
+#: ../lib/ephy-stock-icons.c:50 ../src/bookmarks/ephy-bookmarks-editor.c:885
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1661
+#: ../src/bookmarks/ephy-topic-action.c:443 ../src/ephy-window.c:1448
 msgid "Bookmarks"
 msgstr "�籤"
 
-#: ../lib/ephy-stock-icons.c:51
-#: ../src/ephy-toolbar.c:278
+#: ../lib/ephy-stock-icons.c:51 ../src/ephy-toolbar.c:278
 msgid "Address Entry"
 msgstr "ä½?å??輸å?¥æ¬?"
 
@@ -1265,7 +1311,7 @@ msgstr "300%"
 msgid "400%"
 msgstr "400%"
 
-#: ../lib/widgets/ephy-location-entry.c:960
+#: ../lib/widgets/ephy-location-entry.c:964
 msgid "Drag and drop this icon to create a link to this page"
 msgstr "æ??æ?¾é??å??å??示ä¾?建ç«?é?£è?³è©²ç¶²é ?ç??é?£çµ?"
 
@@ -1273,12 +1319,12 @@ msgstr "æ??æ?¾é??å??å??示ä¾?建ç«?é?£è?³è©²ç¶²é ?ç??é?£çµ?"
 msgid "Clear"
 msgstr "��"
 
-#: ../src/bookmarks/ephy-bookmark-action.c:320
+#: ../src/bookmarks/ephy-bookmark-action.c:319
 #, c-format
 msgid "%s:"
 msgstr "%sï¼?"
 
-#: ../src/bookmarks/ephy-bookmark-action.c:502
+#: ../src/bookmarks/ephy-bookmark-action.c:501
 #, c-format
 msgid "Executes the script â??%sâ??"
 msgstr "å?·è¡?å?½ä»¤ç¨¿â??%sâ??"
@@ -1418,26 +1464,22 @@ msgstr "��主�中��"
 
 #. Toplevel
 #: ../src/bookmarks/ephy-bookmarks-editor.c:156
-#: ../src/ephy-history-window.c:127
-#: ../src/ephy-window.c:111
+#: ../src/ephy-history-window.c:127 ../src/ephy-window.c:111
 msgid "_File"
 msgstr "��(_F)"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:157
-#: ../src/ephy-history-window.c:128
-#: ../src/ephy-window.c:112
+#: ../src/ephy-history-window.c:128 ../src/ephy-window.c:112
 msgid "_Edit"
 msgstr "編輯(_E)"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:158
-#: ../src/ephy-history-window.c:129
-#: ../src/ephy-window.c:113
+#: ../src/ephy-history-window.c:129 ../src/ephy-window.c:113
 msgid "_View"
 msgstr "顯示(_V)"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:159
-#: ../src/ephy-history-window.c:130
-#: ../src/ephy-window.c:118
+#: ../src/ephy-history-window.c:130 ../src/ephy-window.c:118
 msgid "_Help"
 msgstr "æ±?å?©(_H)"
 
@@ -1453,9 +1495,8 @@ msgstr "建ç«?æ?°ç??主é¡?"
 #. FIXME ngettext
 #. File Menu
 #: ../src/bookmarks/ephy-bookmarks-editor.c:166
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1294
-#: ../src/bookmarks/ephy-bookmarks-ui.c:323
-#: ../src/ephy-history-window.c:134
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1295
+#: ../src/bookmarks/ephy-bookmarks-ui.c:323 ../src/ephy-history-window.c:134
 #: ../src/ephy-history-window.c:612
 msgid "Open in New _Window"
 msgid_plural "Open in New _Windows"
@@ -1467,9 +1508,8 @@ msgstr "å?¨æ?°ç??è¦?çª?中é??å??å·²é?¸ç??æ?¸ç±¤"
 
 #. FIXME ngettext
 #: ../src/bookmarks/ephy-bookmarks-editor.c:169
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1297
-#: ../src/bookmarks/ephy-bookmarks-ui.c:311
-#: ../src/ephy-history-window.c:137
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1298
+#: ../src/bookmarks/ephy-bookmarks-ui.c:311 ../src/ephy-history-window.c:137
 #: ../src/ephy-history-window.c:615
 msgid "Open in New _Tab"
 msgid_plural "Open in New _Tabs"
@@ -1514,8 +1554,7 @@ msgid "Export bookmarks to a file"
 msgstr "��籤�����"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:183
-#: ../src/ephy-history-window.c:143
-#: ../src/ephy-window.c:143
+#: ../src/ephy-history-window.c:143 ../src/ephy-window.c:143
 msgid "_Close"
 msgstr "é??é??(_C)"
 
@@ -1525,34 +1564,29 @@ msgstr "é??é??æ?¸ç±¤è¦?çª?"
 
 #. Edit Menu
 #: ../src/bookmarks/ephy-bookmarks-editor.c:188
-#: ../src/ephy-history-window.c:148
-#: ../src/ephy-window.c:155
+#: ../src/ephy-history-window.c:148 ../src/ephy-window.c:155
 msgid "Cu_t"
 msgstr "��(_T)"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:189
-#: ../src/ephy-history-window.c:149
-#: ../src/ephy-window.c:156
+#: ../src/ephy-history-window.c:149 ../src/ephy-window.c:156
 msgid "Cut the selection"
 msgstr "å?ªä¸?é?¸å®?ç??å?§å®¹"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:191
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1307
-#: ../src/ephy-history-window.c:151
-#: ../src/ephy-history-window.c:625
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1308
+#: ../src/ephy-history-window.c:151 ../src/ephy-history-window.c:625
 #: ../src/ephy-window.c:158
 msgid "_Copy"
 msgstr "�製(_C)"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:192
-#: ../src/ephy-history-window.c:152
-#: ../src/ephy-window.c:159
+#: ../src/ephy-history-window.c:152 ../src/ephy-window.c:159
 msgid "Copy the selection"
 msgstr "è¤?製é?¸å®?ç??å?§å®¹"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:194
-#: ../src/ephy-history-window.c:154
-#: ../src/ephy-window.c:161
+#: ../src/ephy-history-window.c:154 ../src/ephy-window.c:161
 msgid "_Paste"
 msgstr "貼�(_P)"
 
@@ -1571,8 +1605,7 @@ msgid "Delete the selected bookmark or topic"
 msgstr "å?ªé?¤å·²é?¸ç??æ?¸ç±¤æ??主é¡?"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:200
-#: ../src/ephy-history-window.c:160
-#: ../src/ephy-window.c:167
+#: ../src/ephy-history-window.c:160 ../src/ephy-window.c:167
 msgid "Select _All"
 msgstr "å?¨é?¨é?¸å??(_A)"
 
@@ -1583,8 +1616,7 @@ msgstr "é?¸å??æ??æ??æ?¸ç±¤æ??æ??å­?"
 #. Help Menu
 #. Help menu
 #: ../src/bookmarks/ephy-bookmarks-editor.c:205
-#: ../src/ephy-history-window.c:168
-#: ../src/ephy-window.c:261
+#: ../src/ephy-history-window.c:168 ../src/ephy-window.c:261
 msgid "_Contents"
 msgstr "�容(_C)"
 
@@ -1593,14 +1625,12 @@ msgid "Display bookmarks help"
 msgstr "顯示æ?¸ç±¤èªªæ??æ??件"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:208
-#: ../src/ephy-history-window.c:171
-#: ../src/ephy-window.c:264
+#: ../src/ephy-history-window.c:171 ../src/ephy-window.c:264
 msgid "_About"
 msgstr "é??æ?¼(_A)"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:209
-#: ../src/ephy-history-window.c:172
-#: ../src/ephy-window.c:265
+#: ../src/ephy-history-window.c:172 ../src/ephy-window.c:265
 msgid "Display credits for the web browser creators"
 msgstr "é³´è¬?æ??æ??é??å??網é ?ç??覽å?¨ç??å?µä½?è??"
 
@@ -1624,7 +1654,7 @@ msgid "Show the title column"
 msgstr "顯示����"
 
 #: ../src/bookmarks/ephy-bookmarks-editor.c:220
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1798
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1799
 #: ../src/ephy-history-window.c:1229
 msgid "Address"
 msgstr "ä½?å??"
@@ -1638,113 +1668,119 @@ msgstr "顯示ä½?å??æ¬?ä½?"
 msgid "Type a topic"
 msgstr "è«?輸å?¥ä¸»é¡?å??稱"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:381
+#: ../src/bookmarks/ephy-bookmarks-editor.c:382
 #, c-format
 msgid "Delete topic â??%sâ???"
 msgstr "å?ªé?¤ä¸»é¡?â??%sâ??ï¼?"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:384
+#: ../src/bookmarks/ephy-bookmarks-editor.c:385
 msgid "Delete this topic?"
 msgstr "���主��"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:386
-msgid "Deleting this topic will cause all its bookmarks to become uncategorized, unless they also belong to other topics. The bookmarks will not be deleted."
-msgstr "å?ªé?¤æ?¬ä¸»é¡?æ??使å¾?æ??æ??å?¨å®?ä¹?ä¸?è??ä¸?ä¸?é?¸æ?¼å?¶å®?主é¡?ç??æ?¸ç±¤è®?æ??æ²?æ??å??é¡?ï¼?ä½?æ?¸ç±¤ä¸?æ??被å?ªé?¤ã??"
+#: ../src/bookmarks/ephy-bookmarks-editor.c:387
+msgid ""
+"Deleting this topic will cause all its bookmarks to become uncategorized, "
+"unless they also belong to other topics. The bookmarks will not be deleted."
+msgstr ""
+"å?ªé?¤æ?¬ä¸»é¡?æ??使å¾?æ??æ??å?¨å®?ä¹?ä¸?è??ä¸?ä¸?é?¸æ?¼å?¶å®?主é¡?ç??æ?¸ç±¤è®?æ??æ²?æ??å??é¡?ï¼?ä½?æ?¸ç±¤ä¸?æ??"
+"被å?ªé?¤ã??"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:389
+#: ../src/bookmarks/ephy-bookmarks-editor.c:390
 msgid "_Delete Topic"
 msgstr "��主�(_D)"
 
 #. FIXME: proper i18n after freeze
-#: ../src/bookmarks/ephy-bookmarks-editor.c:611
-#: ../src/bookmarks/ephy-bookmarks-editor.c:615
+#: ../src/bookmarks/ephy-bookmarks-editor.c:612
+#: ../src/bookmarks/ephy-bookmarks-editor.c:616
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:620
-#: ../src/bookmarks/ephy-bookmarks-editor.c:624
+#: ../src/bookmarks/ephy-bookmarks-editor.c:621
+#: ../src/bookmarks/ephy-bookmarks-editor.c:625
 msgid "Firebird"
 msgstr "Firebird"
 
 #. Translators: The %s is the name of a Mozilla profile.
-#: ../src/bookmarks/ephy-bookmarks-editor.c:629
+#: ../src/bookmarks/ephy-bookmarks-editor.c:630
 #, c-format
 msgid "Mozilla â??%sâ?? profile"
 msgstr "Mozillaâ??%sâ??設å®?çµ?å??"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:633
+#: ../src/bookmarks/ephy-bookmarks-editor.c:634
 msgid "Galeon"
 msgstr "Galeon"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:637
+#: ../src/bookmarks/ephy-bookmarks-editor.c:638
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:666
+#: ../src/bookmarks/ephy-bookmarks-editor.c:667
 msgid "Import failed"
 msgstr "å?¯å?¥å¤±æ??"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:668
+#: ../src/bookmarks/ephy-bookmarks-editor.c:669
 msgid "Import Failed"
 msgstr "å?¯å?¥å¤±æ??"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:671
+#: ../src/bookmarks/ephy-bookmarks-editor.c:672
 #, c-format
-msgid "The bookmarks from â??%sâ?? could not be imported because the file is corrupted or of an unsupported type."
+msgid ""
+"The bookmarks from â??%sâ?? could not be imported because the file is corrupted "
+"or of an unsupported type."
 msgstr "ç?¡æ³?å¾?â??%sâ??å?¯å?¥æ?¸ç±¤ï¼?å??å? æ?¯è©²æª?å?¯è?½å·²ç¶?å??æ??æ??æ?¯ä¸?æ?¯æ?´ç??æ ¼å¼?ã??"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:734
+#: ../src/bookmarks/ephy-bookmarks-editor.c:735
 msgid "Import Bookmarks from File"
 msgstr "������籤"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:741
+#: ../src/bookmarks/ephy-bookmarks-editor.c:742
 msgid "Firefox/Mozilla bookmarks"
 msgstr "Firefox/Mozilla �籤"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:745
+#: ../src/bookmarks/ephy-bookmarks-editor.c:746
 msgid "Galeon/Konqueror bookmarks"
 msgstr "Galeon/Konqueror �籤"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:749
+#: ../src/bookmarks/ephy-bookmarks-editor.c:750
 msgid "Epiphany bookmarks"
 msgstr "Epiphany �籤"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:873
+#: ../src/bookmarks/ephy-bookmarks-editor.c:874
 msgid "Export Bookmarks"
 msgstr "���籤"
 
 #. Make a format selection combo & label
-#: ../src/bookmarks/ephy-bookmarks-editor.c:890
+#: ../src/bookmarks/ephy-bookmarks-editor.c:891
 msgid "File f_ormat:"
 msgstr "��格�(_O)�"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:936
+#: ../src/bookmarks/ephy-bookmarks-editor.c:937
 msgid "Import Bookmarks"
 msgstr "���籤"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:941
+#: ../src/bookmarks/ephy-bookmarks-editor.c:942
 msgid "I_mport"
 msgstr "��(_M)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:957
+#: ../src/bookmarks/ephy-bookmarks-editor.c:958
 msgid "Import bookmarks from:"
 msgstr "å?¯å?¥æ?¸ç±¤ç??ä¾?æº?ï¼?"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1303
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1304
 #: ../src/ephy-history-window.c:621
 msgid "_Copy Address"
 msgstr "è¤?製ä½?å??(_C)"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1551
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1552
 #: ../src/ephy-history-window.c:949
 msgid "_Search:"
 msgstr "æ??å°?(_S)ï¼?"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1717
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1718
 msgid "Topics"
 msgstr "主�"
 
-#: ../src/bookmarks/ephy-bookmarks-editor.c:1787
+#: ../src/bookmarks/ephy-bookmarks-editor.c:1788
 #: ../src/ephy-history-window.c:1220
 msgid "Title"
 msgstr "��"
@@ -1817,8 +1853,7 @@ msgstr "���"
 
 #. Create a menu item, and sync it
 #. Case sensitivity
-#: ../src/ephy-find-toolbar.c:459
-#: ../src/ephy-find-toolbar.c:582
+#: ../src/ephy-find-toolbar.c:459 ../src/ephy-find-toolbar.c:582
 msgid "_Case sensitive"
 msgstr "å??å??大å°?寫(_C)"
 
@@ -1839,13 +1874,11 @@ msgid "Find next occurrence of the search string"
 msgstr "å°?æ?¾ä¸?ä¸?å??å?ºç?¾æ??å°?å­?串ç??å?°æ?¹"
 
 #. exit button
-#: ../src/ephy-fullscreen-popup.c:232
-#: ../src/ephy-toolbar.c:618
+#: ../src/ephy-fullscreen-popup.c:232 ../src/ephy-toolbar.c:618
 msgid "Leave Fullscreen"
 msgstr "é?¢é??å?¨è?¢å¹?"
 
-#: ../src/ephy-go-action.c:41
-#: ../src/ephy-toolbar.c:308
+#: ../src/ephy-go-action.c:41 ../src/ephy-toolbar.c:308
 msgid "Go"
 msgstr "å??å¾?"
 
@@ -1906,7 +1939,9 @@ msgid "Clear browsing history?"
 msgstr "æ?¯å?¦æ¸?é?¤ç??覽è¨?é??ï¼?"
 
 #: ../src/ephy-history-window.c:221
-msgid "Clearing the browsing history will cause all history links to be permanently deleted."
+msgid ""
+"Clearing the browsing history will cause all history links to be permanently "
+"deleted."
 msgstr "æ¸?é?¤ç??覽è¨?é??å°?æ??使æ??æ??ç??覽è¨?é??æ°¸é? è¢«å?ªé?¤ã??"
 
 #: ../src/ephy-history-window.c:236
@@ -1923,8 +1958,7 @@ msgstr "ä»?æ?¥"
 
 #. keep this in sync with embed/ephy-history.c's
 #. * HISTORY_PAGE_OBSOLETE_DAYS
-#: ../src/ephy-history-window.c:961
-#: ../src/ephy-history-window.c:965
+#: ../src/ephy-history-window.c:961 ../src/ephy-history-window.c:965
 #: ../src/ephy-history-window.c:971
 #, c-format
 msgid "Last %d day"
@@ -1939,9 +1973,7 @@ msgstr "網�"
 msgid "Date"
 msgstr "æ?¥æ??"
 
-#: ../src/ephy-main.c:77
-#: ../src/ephy-main.c:523
-#: ../src/window-commands.c:1041
+#: ../src/ephy-main.c:77 ../src/ephy-main.c:523 ../src/window-commands.c:1041
 msgid "GNOME Web Browser"
 msgstr "GNOME 網é ?ç??覽å?¨"
 
@@ -2006,7 +2038,7 @@ msgstr ""
 msgid "GNOME Web Browser options"
 msgstr "GNOME 網é ?ç??覽å?¨é?¸é ?"
 
-#: ../src/ephy-notebook.c:627
+#: ../src/ephy-notebook.c:633
 msgid "Close tab"
 msgstr "é??é??å??é ?"
 
@@ -2021,7 +2053,9 @@ msgid "Abort pending downloads?"
 msgstr "å??æ­¢æ?ªå®?æ??ç??ä¸?è¼?ï¼?"
 
 #: ../src/ephy-session.c:235
-msgid "There are still downloads pending. If you log out, they will be aborted and lost."
+msgid ""
+"There are still downloads pending. If you log out, they will be aborted and "
+"lost."
 msgstr "é??æ??ä¸?è¼?æ?ªå®?æ??ã??å¦?æ??æ?¨ç?»å?ºï¼?å®?å??å°?æ??被中止å??é?ºå¤±ã??"
 
 #: ../src/ephy-session.c:239
@@ -2044,12 +2078,6 @@ msgstr "å??復ä½?業é??段"
 msgid "Do you want to recover the previous browser windows and tabs?"
 msgstr "æ?¯å?¦è¦?å??復å??å??ç??ç??覽å?¨è¦?çª?å??å??é ?ï¼?"
 
-#. Translators: %s refers to the LSB distributor ID, for instance MandrivaLinux
-#: ../src/ephy-session.c:1364
-#, c-format
-msgid "This page was loading when the web browser closed unexpectedly. This might happen again if you reload the page. If it does, please report the problem to the %s developers."
-msgstr "é??å??網é ?å°?å?¨è®?å??ä½?ç??覽å?¨å·²ç?°å¸¸é??é??äº?ã??å¦?æ??æ?¨é??æ?°è¼?å?¥è©²é ?é?¢ä»?ç?¶å?¯è?½å??度ç?¼ç??é??å??ç??æ³?ã??å¦?æ??ç??ç??é??樣ï¼?è«?å°?å??é¡?å??報給 %s é??ç?¼å??é??ã??"
-
 #: ../src/ephy-tabs-menu.c:211
 msgid "Switch to this tab"
 msgstr "å??æ??å?°æ­¤å??é ?"
@@ -2337,8 +2365,7 @@ msgstr "è?ªè¨?å·¥å?·å??(_C)â?¦"
 msgid "Customize toolbars"
 msgstr "è?ªè¨?å·¥å?·å??"
 
-#: ../src/ephy-window.c:196
-#: ../src/ephy-window.c:199
+#: ../src/ephy-window.c:196 ../src/ephy-window.c:199
 msgid "_Stop"
 msgstr "å??æ­¢(_S)"
 
@@ -2407,8 +2434,7 @@ msgstr "顯示網é ?ç??å®?å?¨è³?è¨?"
 msgid "_Add Bookmarkâ?¦"
 msgstr "���籤(_A)�"
 
-#: ../src/ephy-window.c:226
-#: ../src/ephy-window.c:297
+#: ../src/ephy-window.c:226 ../src/ephy-window.c:297
 msgid "Add a bookmark for the current page"
 msgstr "æ?°å¢?æ??é??æ?¬é ?é?¢ç??æ?¸ç±¤"
 
@@ -2430,8 +2456,7 @@ msgid "Go to a specified location"
 msgstr "å??å¾?æ??å®?ç??ä½?ç½®"
 
 #. History
-#: ../src/ephy-window.c:237
-#: ../src/pdm-dialog.c:403
+#: ../src/ephy-window.c:237 ../src/pdm-dialog.c:403
 msgid "Hi_story"
 msgstr "æ­·å?²è¨?é??(_S)"
 
@@ -2633,8 +2658,7 @@ msgstr "å¦?æ??æ?¨ç?¡è«?ç?¡ä½?è¦?é??é??æ­¤æ??件ï¼?æ?¨å°?æ??失å?»æ?ªå?²å­?ç??è³?
 msgid "Close _Document"
 msgstr "é??é??æ??件(_D)"
 
-#: ../src/ephy-window.c:1438
-#: ../src/window-commands.c:313
+#: ../src/ephy-window.c:1438 ../src/window-commands.c:313
 msgid "Open"
 msgstr "é??å??"
 
@@ -2731,8 +2755,13 @@ msgid "<b>Select the personal data you want to clear</b>"
 msgstr "<b>é?¸æ??æ?³è¦?æ¸?é?¤ç??å??人è³?æ??</b>"
 
 #: ../src/pdm-dialog.c:340
-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 "æ?¨æ?³è¦?æ¸?é?¤ç??å??人è³?æ??å?²å­?äº?æ?¨æ??å??訪é??ç??網é ?ã??å?¨é??å§?æ¸?é?¤ä¹?å??ï¼?è«?確å®?è¦?移é?¤å?ªäº?é¡?å??ç??è³?è¨?ï¼?"
+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:345
 msgid "Clear All Personal Data"
@@ -2754,8 +2783,12 @@ msgid "_Temporary files"
 msgstr "����(_T)"
 
 #: ../src/pdm-dialog.c:431
-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>"
+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:622
 msgid "Cookie Properties"
@@ -2826,8 +2859,7 @@ msgstr "å?¦å­?å??ç??"
 #. * second %s is the locale name. Example:
 #. * "French (France)"
 #.
-#: ../src/prefs-dialog.c:467
-#: ../src/prefs-dialog.c:473
+#: ../src/prefs-dialog.c:467 ../src/prefs-dialog.c:473
 #, c-format
 msgctxt "language"
 msgid "%s (%s)"
@@ -2853,19 +2885,36 @@ msgid "Select a Directory"
 msgstr "é?¸æ??ä¸?å??ç?®é??"
 
 #: ../src/window-commands.c:941
-msgid "The GNOME Web Browser 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 "GNOME 網é ?ç??覽å?¨ç?ºè?ªç?±è»?é«?ï¼?æ?¨å?¯ä¾?æ??è?ªç?±è»?é«?å?ºé??æ??æ??ç?¼è¡¨ç?? GNU é??ç?¨å?¬å?±æ??æ¬?æ¢?款è¦?å®?ï¼?å°±æ?¬ç¨?å¼?å??ç?ºæ?£å¸?è??ï¼?æ??ä¿®æ?¹ï¼?ç?¡è«?æ?¨ä¾?æ??ç??æ?¯æ?¬æ??æ¬?ç??第äº?ç??æ??ï¼?æ?¨è?ªè¡?é?¸æ??ç??ï¼?ä»»ä¸?æ?¥å¾?ç?¼è¡?ç??ç??æ?¬ã??"
+msgid ""
+"The GNOME Web Browser 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 ""
+"GNOME 網é ?ç??覽å?¨ç?ºè?ªç?±è»?é«?ï¼?æ?¨å?¯ä¾?æ??è?ªç?±è»?é«?å?ºé??æ??æ??ç?¼è¡¨ç?? GNU é??ç?¨å?¬å?±æ??æ¬?æ¢?"
+"款è¦?å®?ï¼?å°±æ?¬ç¨?å¼?å??ç?ºæ?£å¸?è??ï¼?æ??ä¿®æ?¹ï¼?ç?¡è«?æ?¨ä¾?æ??ç??æ?¯æ?¬æ??æ¬?ç??第äº?ç??æ??ï¼?æ?¨è?ªè¡?é?¸"
+"æ??ç??ï¼?ä»»ä¸?æ?¥å¾?ç?¼è¡?ç??ç??æ?¬ã??"
 
 #: ../src/window-commands.c:945
-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 or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details."
-msgstr "GNOME 網é ?ç??覽å?¨ä¿?å?ºæ?¼ä½¿ç?¨ç?®ç??è??å? ä»¥æ?£å¸?ï¼?ç?¶è??ä¸?è² ä»»ä½?æ??ä¿?責任ï¼?亦ç?¡å°?é?©å?®æ?§æ??ç?¹å®?ç?®ç??é?©ç?¨æ?§æ??ç?ºç??é»?示æ?§æ??ä¿?ã??詳æ??è«?å??ç?§ GNU é??ç?¨å?¬å?±æ??æ¬?ã??"
+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 "
+"or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for "
+"more details."
+msgstr ""
+"GNOME 網é ?ç??覽å?¨ä¿?å?ºæ?¼ä½¿ç?¨ç?®ç??è??å? ä»¥æ?£å¸?ï¼?ç?¶è??ä¸?è² ä»»ä½?æ??ä¿?責任ï¼?亦ç?¡å°?é?©å?®æ?§"
+"æ??ç?¹å®?ç?®ç??é?©ç?¨æ?§æ??ç?ºç??é»?示æ?§æ??ä¿?ã??詳æ??è«?å??ç?§ GNU é??ç?¨å?¬å?±æ??æ¬?ã??"
 
 #: ../src/window-commands.c:949
-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"
+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:995
-#: ../src/window-commands.c:1011
+#: ../src/window-commands.c:995 ../src/window-commands.c:1011
 #: ../src/window-commands.c:1022
 msgid "Contact us at:"
 msgstr "è?¯çµ¡æ??å??æ?¼ï¼?"
@@ -2915,13 +2964,30 @@ msgid "Enable caret browsing mode?"
 msgstr "æ?¯å?¦å??ç?¨é?µç?¤ç??覽ï¼?"
 
 #: ../src/window-commands.c:1219
-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 æ??é??å??æ??é??é??é?µç?¤ç??覽ã??é??å??å??è?½æ??å?¨ç¶²é ?中æ?¾ç½®ä¸?å??å?¯ç§»å??ç??游æ¨?ï¼?è®?æ?¨å?¯ä»¥ä½¿ç?¨é?µç?¤é?¨è??移å??ã??æ?¨æ?¯å?¦è¦?å??ç?¨é?µç?¤ç??覽ï¼?"
+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:1222
 msgid "_Enable"
 msgstr "å??ç?¨(_E)"
 
+#~ msgid "Let web pages specify their own _fonts"
+#~ msgstr "ç?±ç¶²é ?è?ªè¡?æ??å®?å­?å??(_F)"
+
+#~ msgid "Let web pages specify their own c_olors"
+#~ msgstr "ç?±ç¶²é ?è?ªè¡?æ??å®?é¡?è?²(_O)"
+
+#~ msgid "A problem occurred while loading %s"
+#~ msgstr "è¼?å?¥ %s æ??ç?¼ç??å??é¡?"
+
+#~ msgid "Failed to read latest migration marker, aborting profile migration."
+#~ msgstr "è®?å??æ??æ?°è½?移æ¨?è¨?失æ??ï¼?æ?¾æ£?設å®?çµ?å??ç??è½?移ã??"
+
 #~ msgid "<b>Web Development</b>"
 #~ msgstr "<b>網é ?é??ç?¼</b>"
 
@@ -3045,13 +3111,33 @@ msgstr "å??ç?¨(_E)"
 #~ msgid ""
 #~ "Default encoding. Accepted values are: \"armscii-8\", \"Big5\", \"Big5-"
 #~ "HKSCS\", \"EUC-JP\", \"EUC-KR\", \"gb18030\", \"GB2312\", \"geostd8\", "
-#~ "\"HZ-GB-2312\", \"IBM850\", \"IBM852\", \"IBM855\", \"IBM857\", \"IBM862"
-#~ "\", \"IBM864\", \"IBM866\", \"ISO-2022-CN\", \"ISO-2022-JP\", \"ISO-2022-"
-#~ "KR\", \"ISO-8859-1\", \"ISO-8859-2\", \"ISO-8859-3\", \"ISO-8859-4\", "
-#~ "\"ISO-8859-5\", \"ISO-8859-6\", \"ISO-8859-7\", \"ISO-8859-8\", \"ISO-"
-#~ "8859-8-I\", \"ISO-8859-9\", \"ISO-8859-10\", \"ISO-8859-11\", \"ISO-8859-"
-#~ "13\", \"ISO-8859-14\", \"ISO-8859-15\", \"ISO-8859-16\", \"ISO-IR-111\", "
-#~ "\"KOI8-R\", \"KOI8-U\", \"Shift_JIS\", \"TIS-620\", \"UTF-7\", \"UTF-8\", "
+#~ "\"HZ-GB-2312\", \"IBM850\", \"IBM852\", \"IBM855\", \"IBM857\", "
+#~ "\"IBM862\", \"IBM864\", \"IBM866\", \"ISO-2022-CN\", \"ISO-2022-JP\", "
+#~ "\"ISO-2022-KR\", \"ISO-8859-1\", \"ISO-8859-2\", \"ISO-8859-3\", "
+#~ "\"ISO-8859-4\", \"ISO-8859-5\", \"ISO-8859-6\", \"ISO-8859-7\", "
+#~ "\"ISO-8859-8\", \"ISO-8859-8-I\", \"ISO-8859-9\", \"ISO-8859-10\", "
+#~ "\"ISO-8859-11\", \"ISO-8859-13\", \"ISO-8859-14\", \"ISO-8859-15\", "
+#~ "\"ISO-8859-16\", \"ISO-IR-111\", \"KOI8-R\", \"KOI8-U\", \"Shift_JIS\", "
+#~ "\"TIS-620\", \"UTF-7\", \"UTF-8\", \"VISCII\", \"windows-874\", "
+#~ "\"windows-1250\", \"windows-1251\", \"windows-1252\", \"windows-1253\", "
+#~ "\"windows-1254\", \"windows-1255\", \"windows-1256\", \"windows-1257\", "
+#~ "\"windows-1258\", \"x-euc-tw\", \"x-gbk\", \"x-johab\", \"x-mac-arabic\", "
+#~ "\"x-mac-ce\", \"x-mac-croatian\", \"x-mac-cyrillic\", \"x-mac-devanagari"
+#~ "\", \"x-mac-farsi\", \"x-mac-greek\", \"x-mac-gujarati\", \"x-mac-gurmukhi"
+#~ "\", \"x-mac-hebrew\", \"x-mac-icelandic\", \"x-mac-roman\", \"x-mac-"
+#~ "romanian\", \"x-mac-turkish\", \"x-mac-ukrainian\", \"x-user-defined\", "
+#~ "\"x-viet-tcvn5712\", \"x-viet-vps\" and \"x-windows-949\"."
+#~ msgstr ""
+#~ "é ?設å­?å??編碼ã??å?¯æ?¥å??ç??å?¼ç?ºï¼?\n"
+#~ "\"armscii-8\", \"Big5\", \"Big5-HKSCS\", \"EUC-JP\", \"EUC-KR\", "
+#~ "\"gb18030\", \"GB2312\", \"geostd8\", \"HZ-GB-2312\", \"IBM850\", "
+#~ "\"IBM852\", \"IBM855\", \"IBM857\", \"IBM862\", \"IBM864\", \"IBM866\", "
+#~ "\"ISO-2022-CN\", \"ISO-2022-JP\", \"ISO-2022-KR\", \"ISO-8859-1\", "
+#~ "\"ISO-8859-2\", \"ISO-8859-3\", \"ISO-8859-4\", \"ISO-8859-5\", "
+#~ "\"ISO-8859-6\", \"ISO-8859-7\", \"ISO-8859-8\", \"ISO-8859-8-I\", "
+#~ "\"ISO-8859-9\", \"ISO-8859-10\", \"ISO-8859-11\", \"ISO-8859-13\", "
+#~ "\"ISO-8859-14\", \"ISO-8859-15\", \"ISO-8859-16\", \"ISO-IR-111\", \"KOI8-"
+#~ "R\", \"KOI8-U\", \"Shift_JIS\", \"TIS-620\", \"UTF-7\", \"UTF-8\", "
 #~ "\"VISCII\", \"windows-874\", \"windows-1250\", \"windows-1251\", "
 #~ "\"windows-1252\", \"windows-1253\", \"windows-1254\", \"windows-1255\", "
 #~ "\"windows-1256\", \"windows-1257\", \"windows-1258\", \"x-euc-tw\", \"x-"
@@ -3060,26 +3146,7 @@ msgstr "å??ç?¨(_E)"
 #~ "\", \"x-mac-gujarati\", \"x-mac-gurmukhi\", \"x-mac-hebrew\", \"x-mac-"
 #~ "icelandic\", \"x-mac-roman\", \"x-mac-romanian\", \"x-mac-turkish\", \"x-"
 #~ "mac-ukrainian\", \"x-user-defined\", \"x-viet-tcvn5712\", \"x-viet-vps\" "
-#~ "and \"x-windows-949\"."
-#~ msgstr ""
-#~ "é ?設å­?å??編碼ã??å?¯æ?¥å??ç??å?¼ç?ºï¼?\n"
-#~ "\"armscii-8\", \"Big5\", \"Big5-HKSCS\", \"EUC-JP\", \"EUC-KR\", \"gb18030"
-#~ "\", \"GB2312\", \"geostd8\", \"HZ-GB-2312\", \"IBM850\", \"IBM852\", "
-#~ "\"IBM855\", \"IBM857\", \"IBM862\", \"IBM864\", \"IBM866\", \"ISO-2022-CN"
-#~ "\", \"ISO-2022-JP\", \"ISO-2022-KR\", \"ISO-8859-1\", \"ISO-8859-2\", "
-#~ "\"ISO-8859-3\", \"ISO-8859-4\", \"ISO-8859-5\", \"ISO-8859-6\", \"ISO-"
-#~ "8859-7\", \"ISO-8859-8\", \"ISO-8859-8-I\", \"ISO-8859-9\", \"ISO-8859-10"
-#~ "\", \"ISO-8859-11\", \"ISO-8859-13\", \"ISO-8859-14\", \"ISO-8859-15\", "
-#~ "\"ISO-8859-16\", \"ISO-IR-111\", \"KOI8-R\", \"KOI8-U\", \"Shift_JIS\", "
-#~ "\"TIS-620\", \"UTF-7\", \"UTF-8\", \"VISCII\", \"windows-874\", \"windows-"
-#~ "1250\", \"windows-1251\", \"windows-1252\", \"windows-1253\", \"windows-"
-#~ "1254\", \"windows-1255\", \"windows-1256\", \"windows-1257\", \"windows-"
-#~ "1258\", \"x-euc-tw\", \"x-gbk\", \"x-johab\", \"x-mac-arabic\", \"x-mac-ce"
-#~ "\", \"x-mac-croatian\", \"x-mac-cyrillic\", \"x-mac-devanagari\", \"x-mac-"
-#~ "farsi\", \"x-mac-greek\", \"x-mac-gujarati\", \"x-mac-gurmukhi\", \"x-mac-"
-#~ "hebrew\", \"x-mac-icelandic\", \"x-mac-roman\", \"x-mac-romanian\", \"x-"
-#~ "mac-turkish\", \"x-mac-ukrainian\", \"x-user-defined\", \"x-viet-tcvn5712"
-#~ "\", \"x-viet-vps\" å?? \"x-windows-949\"ã??"
+#~ "å?? \"x-windows-949\"ã??"
 
 #~ msgid "Default font type"
 #~ msgstr "é ?設å­?å??款å¼?"



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