Add missing files, remove non-existant ones. Updated traditional Chinese

2003-04-20  Abel Cheung  <maddog@linux.org.hk>

	* POTFILES.in: Add missing files, remove non-existant ones.
	* zh_TW.po: Updated traditional Chinese translation.
	* el.po: Fix header for msgfmt check.

4 files changed, 659 insertions, 515 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index 4deb2a9c8..7a252baac 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,9 @@
+2003-04-20  Abel Cheung  <maddog@linux.org.hk>
+
+	* POTFILES.in: Add missing files, remove non-existant ones.
+	* zh_TW.po: Updated traditional Chinese translation.
+	* el.po: Fix header for msgfmt check.
+
 2003-04-17  Duarte Loreto <happyguy_pt@hotmail.com>
 
         * pt.po: Updated Portuguese translation.
diff --git a/po/POTFILES.in b/po/POTFILES.in
index fe46776a9..1dfa122fb 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,13 +1,11 @@
-# List of source files containing translatable strings.
-# Please keep this file sorted alphabetically.
-data/GNOME_Epiphany_Automation.server.in
-data/GNOME_Epiphany_NautilusView.server.in
 data/bme.desktop.in
 data/epiphany.desktop.in
 data/epiphany.schemas.in
 data/glade/epiphany.glade
 data/glade/prefs-dialog.glade
 data/glade/print.glade
+data/GNOME_Epiphany_Automation.server.in
+data/GNOME_Epiphany_NautilusView.server.in
 data/starthere/index.xml.in
 data/starthere/smartbookmarks.xml.in
 data/ui/epiphany-ui.xml.in
@@ -28,18 +26,20 @@ lib/ephy-node.c
 lib/ephy-start-here.c
 lib/ephy-string.c
 lib/widgets/ephy-notebook.c
+# List of source files containing translatable strings.
+# Please keep this file sorted alphabetically.
 src/bookmarks/ephy-bookmark-properties.c
-src/bookmarks/ephy-bookmarks-editor.c
 src/bookmarks/ephy-bookmarks.c
+src/bookmarks/ephy-bookmarks-editor.c
 src/bookmarks/ephy-new-bookmark.c
 src/ephy-go-action.c
+src/ephy-history-window.c
 src/ephy-main.c
 src/ephy-nautilus-view.c
 src/ephy-shell.c
 src/ephy-tab.c
 src/ephy-window.c
 src/general-prefs.c
-src/history-dialog.c
 src/pdm-dialog.c
 src/ppview-toolbar.c
 src/prefs-dialog.c
diff --git a/po/el.po b/po/el.po
index 207745b7b..f233d425e 100644
--- a/po/el.po
+++ b/po/el.po
@@ -6,7 +6,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: epiphany\n"
 "POT-Creation-Date: 2003-03-05 21:00+0200\n"
 "PO-Revision-Date: 2003-03-05 21:01+0200\n"
 "Last-Translator: Kostas Papadimas <pkst@gmx.net>\n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 8963087d3..5d261b662 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -5,53 +5,29 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: epiphany 0.5.0\n"
-"POT-Creation-Date: 2003-02-17 12:36+0800\n"
-"PO-Revision-Date: 2003-02-17 12:36+0800\n"
+"POT-Creation-Date: 2003-04-21 02:41+0800\n"
+"PO-Revision-Date: 2003-04-21 03:37+0800\n"
 "Last-Translator: Abel Cheung <maddog@linux.org.hk>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: data/GNOME_Epiphany_Automation.server.in.h:1
-msgid "Epiphany automation"
-msgstr ""
-
-#: data/GNOME_Epiphany_NautilusView.server.in.h:1
-msgid "Epiphany Nautilus view"
-msgstr "Epiphany Nautilus 顯示模式"
-
-#: data/GNOME_Epiphany_NautilusView.server.in.h:2
-msgid "Epiphany Nautilus view factory"
-msgstr "Epiphany Nautilus 顯示模式工廠"
+#: data/bme.desktop.in.h:1
+msgid "Browse and organize your bookmarks"
+msgstr "瀏覽及管理書籤"
 
-#: data/GNOME_Epiphany_NautilusView.server.in.h:3
-msgid "Epiphany content view component"
-msgstr "Epiphany 內容顯示模式元件"
-
-#: data/GNOME_Epiphany_NautilusView.server.in.h:4
-msgid "Epiphany content view component's factory"
-msgstr "Epiphany 內容顯示模式元件的工廠"
-
-#: data/GNOME_Epiphany_NautilusView.server.in.h:5
-msgid "View as Web Page"
-msgstr "以網頁方式顯示"
-
-#: data/GNOME_Epiphany_NautilusView.server.in.h:6
-msgid "Web Page"
-msgstr "網頁"
-
-#: data/GNOME_Epiphany_NautilusView.server.in.h:7
-msgid "Web Page Viewer"
-msgstr "網頁顯示模式"
+#: data/bme.desktop.in.h:2
+msgid "Web Bookmarks"
+msgstr "網頁書籤"
 
 #: data/epiphany.desktop.in.h:1
 msgid "Browse the web"
 msgstr "瀏覽網頁"
 
 #: data/epiphany.desktop.in.h:2
-msgid "Epiphany Web Browser"
-msgstr "Epiphany 網頁瀏覽器"
+msgid "Web Browser"
+msgstr "網頁瀏覽器"
 
 #: data/epiphany.schemas.in.h:1
 msgid "Allow Java"
@@ -224,98 +200,114 @@ msgid "Match case for find in page."
 msgstr "搜尋時區分大小寫。"
 
 #: data/epiphany.schemas.in.h:42
+msgid "Middle click on the web page will load the url in X clipboard."
+msgstr "在網頁中按滑鼠中央按鈕會將 url 載入 X 剪貼簿。"
+
+#: data/epiphany.schemas.in.h:43
+msgid "Middle click will load the url in X clipboard"
+msgstr "按滑鼠中央按鈕會將 url 載入 X 剪貼簿"
+
+#: data/epiphany.schemas.in.h:44
 msgid "New page type"
 msgstr "新增頁面的預設內容"
 
-#: data/epiphany.schemas.in.h:43
+#: data/epiphany.schemas.in.h:45
 msgid "No proxy for"
 msgstr "不用代理伺服器的網址"
 
-#: data/epiphany.schemas.in.h:44
+#: data/epiphany.schemas.in.h:46
 msgid "Open in tabs by default."
 msgstr "預設用分頁開啟網址。"
 
-#: data/epiphany.schemas.in.h:45
+#: data/epiphany.schemas.in.h:47
 msgid "Open popups in tabs"
 msgstr "在分頁中開啟 JavaScript 視窗"
 
-#: data/epiphany.schemas.in.h:46
+#: data/epiphany.schemas.in.h:48
 msgid "Open popups in tabs instead of new windows."
 msgstr "開啟 JavaScript 視窗時，會開啟新的分頁來代替視窗。"
 
-#: data/epiphany.schemas.in.h:47
+#: data/epiphany.schemas.in.h:49
 msgid "Paper type"
 msgstr "紙張尺寸"
 
-#: data/epiphany.schemas.in.h:48
+#: data/epiphany.schemas.in.h:50
 msgid "Paper type: 0 (Letter), 1 (Legal), 2 (Executive), 3 (A4)."
 msgstr "紙張尺寸：0 (Letter)、1 (Legal)、2 (Executive)、3 (A4)。"
 
-#: data/epiphany.schemas.in.h:49
+#: data/epiphany.schemas.in.h:51
 msgid "Preferred languages, two letter codes."
 msgstr "優先使用的語言的清單。"
 
-#: data/epiphany.schemas.in.h:50
+#: data/epiphany.schemas.in.h:52
 msgid "Print range"
 msgstr "列印範圍"
 
-#: data/epiphany.schemas.in.h:51
+#: data/epiphany.schemas.in.h:53
 msgid "Print range: 0 (all pages), 1 (specific range)."
 msgstr "列印範圍：0 (所有頁數)，1 (指定範圍)。"
 
-#: data/epiphany.schemas.in.h:52
+#: data/epiphany.schemas.in.h:54
 msgid "Printer name"
 msgstr "印表機名稱"
 
-#: data/epiphany.schemas.in.h:53
+#: data/epiphany.schemas.in.h:55
 msgid "Printer name."
 msgstr "印表機名稱。"
 
-#: data/epiphany.schemas.in.h:54
+#: data/epiphany.schemas.in.h:56
 msgid "Printing bottom margin"
 msgstr "列印底部邊緣"
 
-#: data/epiphany.schemas.in.h:55
+#: data/epiphany.schemas.in.h:57
 msgid "Printing bottom margin (in inches)."
 msgstr "列印時底部的邊緣寬度 (以英吋表示)。"
 
-#: data/epiphany.schemas.in.h:56
+#: data/epiphany.schemas.in.h:58
 msgid "Printing left margin"
 msgstr "列印左邊邊緣"
 
-#: data/epiphany.schemas.in.h:57
+#: data/epiphany.schemas.in.h:59
 msgid "Printing left margin (in inches)."
 msgstr "列印時左邊的邊緣寬度 (以英吋表示)。"
 
-#: data/epiphany.schemas.in.h:58
+#: data/epiphany.schemas.in.h:60
 msgid "Printing right margin"
 msgstr "列印右邊邊緣"
 
-#: data/epiphany.schemas.in.h:59
+#: data/epiphany.schemas.in.h:61
 msgid "Printing right margin (in inches)."
 msgstr "列印時右邊的邊緣寬度 (以英吋表示)。"
 
-#: data/epiphany.schemas.in.h:60
+#: data/epiphany.schemas.in.h:62
 msgid "Printing top margin"
 msgstr "列印頂端邊緣"
 
-#: data/epiphany.schemas.in.h:61
+#: data/epiphany.schemas.in.h:63
 msgid "Printing top margin (in inches)."
 msgstr "列印時頂端的邊緣寬度 (以英吋表示)。"
 
-#: data/epiphany.schemas.in.h:62
+#: data/epiphany.schemas.in.h:64
 msgid "Save passwords"
 msgstr "儲存密碼"
 
-#: data/epiphany.schemas.in.h:63
+#: data/epiphany.schemas.in.h:65
 msgid "Save passwords."
 msgstr "儲存密碼。"
 
-#: data/epiphany.schemas.in.h:64
+#: data/epiphany.schemas.in.h:66
+msgid "Show bookmarks toolbar by default"
+msgstr "預設情況下顯示書籤工具列"
+
+#: data/epiphany.schemas.in.h:67
+msgid "Show bookmarks toolbar by default."
+msgstr "預設情況下顯示書籤工具列。"
+
+#: data/epiphany.schemas.in.h:68
 msgid "Show download details"
-msgstr ""
+msgstr "顯示下載檔案詳細資料"
 
-#: data/epiphany.schemas.in.h:65
+#: data/epiphany.schemas.in.h:69
 msgid ""
 "Show only history entries from a particular time. Possible values are 0 (all "
 "items), 1 (today), 2 (yesterday), 3 (two days ago), 4 (this week), 5 (this "
@@ -324,71 +316,71 @@ msgstr ""
 "只顯示特定時間的瀏覽紀錄。可接受的值為 0 (全部)、1 (今日)、2 (昨日)、3 (兩日"
 "前)、4 (本週) 及 5 (本月)。"
 
-#: data/epiphany.schemas.in.h:66
+#: data/epiphany.schemas.in.h:70
 msgid "Show sidebar by default"
 msgstr "預設情況下顯示側列窗格"
 
-#: data/epiphany.schemas.in.h:67
+#: data/epiphany.schemas.in.h:71
 msgid "Show sidebar by default."
 msgstr "預設情況下顯示側列窗格。"
 
-#: data/epiphany.schemas.in.h:68
+#: data/epiphany.schemas.in.h:72
 msgid "Show sidebar in full screen mode"
 msgstr "在全螢幕模式中顯示側列窗格"
 
-#: data/epiphany.schemas.in.h:69
+#: data/epiphany.schemas.in.h:73
 msgid "Show sidebar in full screen mode."
 msgstr "在全螢幕模式中顯示側列窗格。"
 
-#: data/epiphany.schemas.in.h:70
+#: data/epiphany.schemas.in.h:74
 msgid "Show statusbar by default"
 msgstr "預設情況下顯示狀態列"
 
-#: data/epiphany.schemas.in.h:71
+#: data/epiphany.schemas.in.h:75
 msgid "Show statusbar by default."
 msgstr "預設情況下顯示狀態列。"
 
-#: data/epiphany.schemas.in.h:72
+#: data/epiphany.schemas.in.h:76
 msgid "Show statusbar in full screen mode"
 msgstr "在全螢幕模式中顯示狀態列"
 
-#: data/epiphany.schemas.in.h:73
+#: data/epiphany.schemas.in.h:77
 msgid "Show statusbar in full screen mode."
 msgstr "在全螢幕模式中顯示狀態列。"
 
-#: data/epiphany.schemas.in.h:74
+#: data/epiphany.schemas.in.h:78
 msgid "Show toolbars by default"
 msgstr "預設情況下顯示工具列"
 
-#: data/epiphany.schemas.in.h:75
+#: data/epiphany.schemas.in.h:79
 msgid "Show toolbars by default."
 msgstr "預設情況下顯示工具列。"
 
-#: data/epiphany.schemas.in.h:76
+#: data/epiphany.schemas.in.h:80
 msgid "Show toolbars in full screen mode"
 msgstr "在全螢幕模式中顯示工具列"
 
-#: data/epiphany.schemas.in.h:77
+#: data/epiphany.schemas.in.h:81
 msgid "Show toolbars in full screen mode."
 msgstr "在全螢幕模式中顯示工具列。"
 
-#: data/epiphany.schemas.in.h:78
+#: data/epiphany.schemas.in.h:82
 msgid "Size of disk cache"
 msgstr "磁碟快取空間大小"
 
-#: data/epiphany.schemas.in.h:79
+#: data/epiphany.schemas.in.h:83
 msgid "Size of disk cache, in KB."
 msgstr "磁碟快取空間大小，以 KB 表示。"
 
-#: data/epiphany.schemas.in.h:80
+#: data/epiphany.schemas.in.h:84
 msgid "Size of memory cache"
 msgstr "記憶體快取空間"
 
-#: data/epiphany.schemas.in.h:81
+#: data/epiphany.schemas.in.h:85
 msgid "Size of memory cache, in KB."
 msgstr "記憶體快取空間，以 KB 表示。"
 
-#: data/epiphany.schemas.in.h:82
+#: data/epiphany.schemas.in.h:86
 msgid ""
 "The list of controls that will be present in the toolbar. You should edit "
 "this setting with the toolbar editor unless you know what you are doing."
@@ -396,11 +388,11 @@ msgstr ""
 "工具列中顯示的控制項清單。除非閣下十分清楚設定格式，否則請使用工具列編輯器來"
 "修改工具列。"
 
-#: data/epiphany.schemas.in.h:83
+#: data/epiphany.schemas.in.h:87
 msgid "Toolbar setup"
 msgstr "工具列設定"
 
-#: data/epiphany.schemas.in.h:84
+#: data/epiphany.schemas.in.h:88
 msgid ""
 "Type of page to show when opening a new window or tab. Possible values are: "
 "0 (home page), 1 (last page), 2 (blank)"
@@ -408,45 +400,45 @@ msgstr ""
 "開啟新的視窗或分頁時顯示的頁面。可接受的值為：0 (首頁)、1 (最後開啟的網頁)、"
 "2 (空白頁面)"
 
-#: data/epiphany.schemas.in.h:85
+#: data/epiphany.schemas.in.h:89
 msgid ""
 "URL for the user's home page. Displayed on start up and when a new window or "
 "tab is created"
 msgstr "使用者的首頁的 URL。當 Galeon 啟動後，會在新增視窗或分頁時顯示該 URL。"
 
-#: data/epiphany.schemas.in.h:86
+#: data/epiphany.schemas.in.h:90
 msgid "Underline links"
 msgstr "鏈結加底線"
 
-#: data/epiphany.schemas.in.h:87
+#: data/epiphany.schemas.in.h:91
 msgid "Underline links."
 msgstr "鏈結會加上底線。"
 
-#: data/epiphany.schemas.in.h:88
+#: data/epiphany.schemas.in.h:92
 msgid "Use own colors"
 msgstr "使用自選色彩"
 
-#: data/epiphany.schemas.in.h:89
+#: data/epiphany.schemas.in.h:93
 msgid "Use own fonts"
 msgstr "使用自選字型"
 
-#: data/epiphany.schemas.in.h:90
+#: data/epiphany.schemas.in.h:94
 msgid "Use tabs"
 msgstr "使用分頁"
 
-#: data/epiphany.schemas.in.h:91
+#: data/epiphany.schemas.in.h:95
 msgid "Use your own colors instead of the colors the page requests."
 msgstr "使用自選的色彩代替頁面要求的色彩。"
 
-#: data/epiphany.schemas.in.h:92
+#: data/epiphany.schemas.in.h:96
 msgid "Use your own fonts instead of the fonts the page requests."
 msgstr "使用自選的字型代替頁面要求的字型。"
 
-#: data/epiphany.schemas.in.h:93
+#: data/epiphany.schemas.in.h:97
 msgid "When to compare cached copy"
 msgstr "何時會將快取記憶中的內容作比較"
 
-#: data/epiphany.schemas.in.h:94
+#: data/epiphany.schemas.in.h:98
 msgid ""
 "When to compare cached copy to web copy. Possible values are 0 (once per "
 "session), 1 (every time), 2 (never), 3 (automatic)."
@@ -457,29 +449,29 @@ msgstr ""
 "2 (不會比較)\n"
 "3 (自動)"
 
-#: data/epiphany.schemas.in.h:95
+#: data/epiphany.schemas.in.h:99
 msgid "When to load images"
 msgstr "何時會載入圖像"
 
-#: data/epiphany.schemas.in.h:96
+#: data/epiphany.schemas.in.h:100
 msgid ""
 "When to load images. Possible values are 0 (always), 1 (from current server "
 "only), 2 (never)"
 msgstr ""
 
-#: data/epiphany.schemas.in.h:97
+#: data/epiphany.schemas.in.h:101
 msgid "Whether to print the date in the footer."
 msgstr "是否在頁尾印出日期。"
 
-#: data/epiphany.schemas.in.h:98
+#: data/epiphany.schemas.in.h:102
 msgid "Whether to print the page URL in the header"
 msgstr "是否在頁首印出網頁的 URL"
 
-#: data/epiphany.schemas.in.h:99
+#: data/epiphany.schemas.in.h:103
 msgid "Whether to print the page numbers (x of total) in the footer."
 msgstr "是否在頁尾印出頁數。"
 
-#: data/epiphany.schemas.in.h:100
+#: data/epiphany.schemas.in.h:104
 msgid "Whether to print the page title in the header."
 msgstr "是否在頁首印出網頁的標題。"
 
@@ -487,34 +479,34 @@ msgstr "是否在頁首印出網頁的標題。"
 msgid "  "
 msgstr "  "
 
-#: data/glade/epiphany.glade.h:2 data/glade/prefs-dialog.glade.h:3
-#: data/glade/print.glade.h:2 data/glade/prompts.glade.h:1
+#: data/glade/epiphany.glade.h:2 data/glade/prefs-dialog.glade.h:2
+#: data/glade/print.glade.h:2
 msgid "*"
 msgstr "*"
 
 #: data/glade/epiphany.glade.h:3
 msgid "<b>File:</b>"
-msgstr "<u>檔案：</u>"
+msgstr "<b>檔案：</b>"
 
 #: data/glade/epiphany.glade.h:4
 msgid "<b>Find text in the document:</b>"
-msgstr "<u>在文件中搜尋文字：</u>"
+msgstr "<b>在文件中搜尋文字：</b>"
 
 #: data/glade/epiphany.glade.h:5
 msgid "<b>Location:</b>"
-msgstr "<u>位置：</u>"
+msgstr "<b>位置：</b>"
 
 #: data/glade/epiphany.glade.h:6
 msgid "<b>Status:</b>"
-msgstr "<u>狀態：</u>"
+msgstr "<b>狀態：</b>"
 
 #: data/glade/epiphany.glade.h:7
 msgid "<b>Time Elapsed:</b>"
-msgstr "<u>已用時間：</u>"
+msgstr "<b>已用時間：</b>"
 
 #: data/glade/epiphany.glade.h:8
 msgid "<b>Time Remaining:</b>"
-msgstr "<u>剩餘時間：</u>"
+msgstr "<b>剩餘時間：</b>"
 
 #: data/glade/epiphany.glade.h:9
 msgid ""
@@ -542,7 +534,7 @@ msgstr "請選取檔案處理方式"
 msgid "Cookies"
 msgstr "Cookie"
 
-#: data/glade/epiphany.glade.h:16 data/glade/prompts.glade.h:2
+#: data/glade/epiphany.glade.h:16
 msgid "DYNAMIC"
 msgstr "DYNAMIC"
 
@@ -562,7 +554,7 @@ msgstr "永遠"
 msgid "Find text..."
 msgstr "搜尋文字..."
 
-#: data/glade/epiphany.glade.h:21
+#: data/glade/epiphany.glade.h:21 src/ephy-history-window.c:751
 msgid "History"
 msgstr "瀏覽紀錄"
 
@@ -630,350 +622,343 @@ msgstr "續傳(_R)"
 msgid "_Time:"
 msgstr "時間(_T)："
 
-#: data/glade/prefs-dialog.glade.h:1
-msgid "   "
-msgstr "   "
-
-#: data/glade/prefs-dialog.glade.h:2 data/glade/print.glade.h:1
+#: data/glade/prefs-dialog.glade.h:1 data/glade/print.glade.h:1
 msgid "    "
 msgstr "    "
 
-#: data/glade/prefs-dialog.glade.h:4
+#: data/glade/prefs-dialog.glade.h:3
 msgid "<b>Caches</b>"
-msgstr "<u>快取</u>"
+msgstr "<b>快取</b>"
 
-#: data/glade/prefs-dialog.glade.h:5 data/glade/print.glade.h:3
+#: data/glade/prefs-dialog.glade.h:4 data/glade/print.glade.h:3
 msgid "<b>Colors</b>"
-msgstr "<u>色彩</u>"
+msgstr "<b>色彩</b>"
 
-#: data/glade/prefs-dialog.glade.h:6
+#: data/glade/prefs-dialog.glade.h:5
 msgid "<b>Fonts</b>"
-msgstr "<u>字型</u>"
+msgstr "<b>字型</b>"
 
-#: data/glade/prefs-dialog.glade.h:7
+#: data/glade/prefs-dialog.glade.h:6
 msgid "<b>Home page</b>"
-msgstr "<u>首頁</u>"
+msgstr "<b>首頁</b>"
 
-#: data/glade/prefs-dialog.glade.h:8
+#: data/glade/prefs-dialog.glade.h:7
 msgid "<b>Language</b>"
-msgstr "<u>語言</u>"
+msgstr "<b>語言</b>"
 
-#: data/glade/prefs-dialog.glade.h:9
+#: data/glade/prefs-dialog.glade.h:8
 msgid "<b>Links</b>"
 msgstr "<b>鏈結</b>"
 
-#: data/glade/prefs-dialog.glade.h:10
+#: data/glade/prefs-dialog.glade.h:9
 msgid "<b>On New Page</b>"
-msgstr "<u>在新的頁面中</u>"
+msgstr "<b>在新的頁面中</b>"
 
-#: data/glade/prefs-dialog.glade.h:11
-msgid "<b>Spinner</b>"
-msgstr "<u>動畫圖示</u>"
-
-#: data/glade/prefs-dialog.glade.h:12
+#: data/glade/prefs-dialog.glade.h:10
 msgid "<b>Tabs</b>"
-msgstr "<u>分頁</u>"
+msgstr "<b>分頁</b>"
 
-#: data/glade/prefs-dialog.glade.h:13
+#: data/glade/prefs-dialog.glade.h:11
 msgid "Al_ways use these colors"
 msgstr "永遠使用指定的色彩(_W)"
 
-#: data/glade/prefs-dialog.glade.h:14
-msgid "Always us_e these fonts"
-msgstr "永遠使用指定的字型(_E)"
+#: data/glade/prefs-dialog.glade.h:12
+msgid "Always use t_hese fonts"
+msgstr "一定使用指定的字型(_H)"
 
-#: data/glade/prefs-dialog.glade.h:15 embed/mozilla/mozilla-i18n.c:24
+#: data/glade/prefs-dialog.glade.h:13 embed/mozilla/mozilla-i18n.c:24
 #: src/general-prefs.c:88
 msgid "Arabic"
 msgstr "阿拉伯"
 
-#: data/glade/prefs-dialog.glade.h:16
+#: data/glade/prefs-dialog.glade.h:14
 msgid "Autodetec_t encoding:"
 msgstr "自動偵測編碼(_T)："
 
-#: data/glade/prefs-dialog.glade.h:17 embed/mozilla/mozilla-i18n.c:25
+#: data/glade/prefs-dialog.glade.h:15 embed/mozilla/mozilla-i18n.c:25
 msgid "Baltic"
 msgstr "波羅的海"
 
-#: data/glade/prefs-dialog.glade.h:18 embed/mozilla/mozilla-i18n.c:26
+#: data/glade/prefs-dialog.glade.h:16 embed/mozilla/mozilla-i18n.c:26
 msgid "Central European"
 msgstr "中歐"
 
-#: data/glade/prefs-dialog.glade.h:19 embed/mozilla/mozilla-i18n.c:27
+#: data/glade/prefs-dialog.glade.h:17 embed/mozilla/mozilla-i18n.c:27
 #: src/general-prefs.c:95
 msgid "Chinese"
 msgstr "中國"
 
-#: data/glade/prefs-dialog.glade.h:20
+#: data/glade/prefs-dialog.glade.h:18
 msgid "Clear _Disk Cache"
 msgstr "清除磁碟快取(_D)"
 
-#: data/glade/prefs-dialog.glade.h:21
+#: data/glade/prefs-dialog.glade.h:19
 msgid "Clear _Memory Cache"
 msgstr "清除記憶體快取(_M)"
 
-#: data/glade/prefs-dialog.glade.h:22 embed/mozilla/mozilla-i18n.c:28
+#: data/glade/prefs-dialog.glade.h:20
+msgid "Compare page:"
+msgstr "比較快取資料："
+
+#: data/glade/prefs-dialog.glade.h:21 embed/mozilla/mozilla-i18n.c:28
 msgid "Cyrillic"
 msgstr "斯拉夫"
 
-#: data/glade/prefs-dialog.glade.h:23
+#: data/glade/prefs-dialog.glade.h:22
 msgid "Dis_k cache:"
 msgstr "磁碟快取空間(_K)："
 
-#: data/glade/prefs-dialog.glade.h:24
+#: data/glade/prefs-dialog.glade.h:23
 msgid "E_very time"
 msgstr "每次瀏覽網頁時(_V)"
 
-#: data/glade/prefs-dialog.glade.h:25
+#: data/glade/prefs-dialog.glade.h:24
 msgid "East asian"
 msgstr "東亞"
 
-#: data/glade/prefs-dialog.glade.h:26 embed/mozilla/mozilla-i18n.c:29
+#: data/glade/prefs-dialog.glade.h:25 embed/mozilla/mozilla-i18n.c:29
 #: src/general-prefs.c:108
 msgid "Greek"
 msgstr "希臘"
 
-#: data/glade/prefs-dialog.glade.h:27 embed/mozilla/mozilla-i18n.c:30
+#: data/glade/prefs-dialog.glade.h:26 embed/mozilla/mozilla-i18n.c:30
 #: src/general-prefs.c:109
 msgid "Hebrew"
 msgstr "希伯來"
 
-#: data/glade/prefs-dialog.glade.h:28 embed/mozilla/mozilla-i18n.c:32
+#: data/glade/prefs-dialog.glade.h:27 embed/mozilla/mozilla-i18n.c:32
 #: src/general-prefs.c:115
 msgid "Japanese"
 msgstr "日本"
 
-#: data/glade/prefs-dialog.glade.h:29 embed/mozilla/mozilla-i18n.c:33
+#: data/glade/prefs-dialog.glade.h:28 embed/mozilla/mozilla-i18n.c:33
 #: src/general-prefs.c:116
 msgid "Korean"
 msgstr "韓國"
 
-#: data/glade/prefs-dialog.glade.h:30
+#: data/glade/prefs-dialog.glade.h:29
 msgid "Lan_guage:"
 msgstr "語言(_G)："
 
-#: data/glade/prefs-dialog.glade.h:31
+#: data/glade/prefs-dialog.glade.h:30
 msgid "Language"
 msgstr "語言"
 
-#: data/glade/prefs-dialog.glade.h:32
+#: data/glade/prefs-dialog.glade.h:31
 msgid "Languages editor"
 msgstr "語言編輯器"
 
-#: data/glade/prefs-dialog.glade.h:33
+#: data/glade/prefs-dialog.glade.h:32
 msgid "Memor_y cache:"
 msgstr "記憶體快取空間(_Y)："
 
-#: data/glade/prefs-dialog.glade.h:34
+#: data/glade/prefs-dialog.glade.h:33
 msgid "Min_imum font size:"
 msgstr "字型尺寸下限(_I)："
 
-#: data/glade/prefs-dialog.glade.h:35
+#: data/glade/prefs-dialog.glade.h:34
 msgid "Off"
 msgstr "關閉"
 
-#: data/glade/prefs-dialog.glade.h:36
+#: data/glade/prefs-dialog.glade.h:35
 msgid "Once per _session"
 msgstr "啟動程式後只檢查一次(_S)"
 
-#: data/glade/prefs-dialog.glade.h:37
+#: data/glade/prefs-dialog.glade.h:36
 msgid "Open _popups in tabs"
 msgstr "在分頁中開啟 JavaScript 視窗(_P)"
 
-#: data/glade/prefs-dialog.glade.h:38
+#: data/glade/prefs-dialog.glade.h:37
 msgid "Pick the background color"
 msgstr "請選取背景顏色"
 
-#: data/glade/prefs-dialog.glade.h:39
+#: data/glade/prefs-dialog.glade.h:38
 msgid "Pick the text color"
 msgstr "請選取文字顏色"
 
-#: data/glade/prefs-dialog.glade.h:40
+#: data/glade/prefs-dialog.glade.h:39
 msgid "Pick the unvisited link color"
 msgstr "請選取未瀏覽的鏈結的顏色"
 
-#: data/glade/prefs-dialog.glade.h:41
+#: data/glade/prefs-dialog.glade.h:40
 msgid "Pick the visited link color"
 msgstr "請選取已瀏覽的鏈結的顏色"
 
-#: data/glade/prefs-dialog.glade.h:42 src/general-prefs.c:128
+#: data/glade/prefs-dialog.glade.h:41 src/general-prefs.c:128
 msgid "Russian"
 msgstr "俄文"
 
-#: data/glade/prefs-dialog.glade.h:43
+#: data/glade/prefs-dialog.glade.h:42
 msgid "S_ans serif:"
 msgstr "S_ans Serif(無襯線字體)："
 
-#: data/glade/prefs-dialog.glade.h:44
+#: data/glade/prefs-dialog.glade.h:43
 msgid "Sans Serif"
 msgstr "Sans Serif(無襯線字體)"
 
-#: data/glade/prefs-dialog.glade.h:45
+#: data/glade/prefs-dialog.glade.h:44
 msgid "Serif"
 msgstr "Serif(襯線字體)"
 
+#: data/glade/prefs-dialog.glade.h:45
+msgid "Set to Current _Page"
+msgstr "設定為目前頁面(_P)"
+
 #: data/glade/prefs-dialog.glade.h:46
 msgid "Set to _Blank Page"
 msgstr "使用空白頁面(_B)"
 
 #: data/glade/prefs-dialog.glade.h:47
-msgid "Set to _Current Page"
-msgstr "使用目前網頁(_C)"
-
-#: data/glade/prefs-dialog.glade.h:48
 msgid "Show blan_k page"
 msgstr "顯示空白頁面(_K)"
 
-#: data/glade/prefs-dialog.glade.h:49
+#: data/glade/prefs-dialog.glade.h:48
 msgid "Show hom_e page"
 msgstr "顯示首頁(_E)"
 
-#: data/glade/prefs-dialog.glade.h:50
+#: data/glade/prefs-dialog.glade.h:49
 msgid "Show la_st page"
 msgstr "顯示最後瀏覽的網頁(_S)"
 
-#: data/glade/prefs-dialog.glade.h:51
+#: data/glade/prefs-dialog.glade.h:50
 msgid "Si_ze:"
 msgstr "大小(_Z)："
 
-#: data/glade/prefs-dialog.glade.h:52
+#: data/glade/prefs-dialog.glade.h:51
 msgid "Simplified Chinese"
 msgstr "簡體中文"
 
-#: data/glade/prefs-dialog.glade.h:53
+#: data/glade/prefs-dialog.glade.h:52
 msgid "Siz_e:"
 msgstr "大小(_E)："
 
-#: data/glade/prefs-dialog.glade.h:54
+#: data/glade/prefs-dialog.glade.h:53
 msgid "Thai"
 msgstr "泰文"
 
-#: data/glade/prefs-dialog.glade.h:55
+#: data/glade/prefs-dialog.glade.h:54
 msgid "Traditional Chinese"
 msgstr "繁體中文"
 
-#: data/glade/prefs-dialog.glade.h:56 embed/mozilla/mozilla-i18n.c:34
+#: data/glade/prefs-dialog.glade.h:55 embed/mozilla/mozilla-i18n.c:34
 #: src/general-prefs.c:136
 msgid "Turkish"
 msgstr "土耳其"
 
-#: data/glade/prefs-dialog.glade.h:57 src/general-prefs.c:137
+#: data/glade/prefs-dialog.glade.h:56 src/general-prefs.c:137
 msgid "Ukrainian"
 msgstr "烏黑蘭語"
 
-#: data/glade/prefs-dialog.glade.h:58 embed/mozilla/mozilla-i18n.c:35
+#: data/glade/prefs-dialog.glade.h:57 embed/mozilla/mozilla-i18n.c:35
 msgid "Unicode"
 msgstr "Unicode"
 
-#: data/glade/prefs-dialog.glade.h:59
+#: data/glade/prefs-dialog.glade.h:58
 msgid "Use s_ystem colors"
 msgstr "使用系統指定色彩(_Y)"
 
-#: data/glade/prefs-dialog.glade.h:60 embed/mozilla/mozilla-i18n.c:37
+#: data/glade/prefs-dialog.glade.h:59 embed/mozilla/mozilla-i18n.c:37
 msgid "Western"
 msgstr "西歐"
 
-#: data/glade/prefs-dialog.glade.h:61
+#: data/glade/prefs-dialog.glade.h:60
 msgid "_Automatically"
 msgstr "自動(_A)"
 
-#: data/glade/prefs-dialog.glade.h:62
+#: data/glade/prefs-dialog.glade.h:61
 msgid "_Background"
 msgstr "背景(_B)"
 
-#: data/glade/prefs-dialog.glade.h:63
-msgid "_Compare page:"
-msgstr "比較快取資料(_C)："
-
-#: data/glade/prefs-dialog.glade.h:64
+#: data/glade/prefs-dialog.glade.h:62
 msgid "_Default encoding:"
 msgstr "預設編碼(_D)："
 
-#: data/glade/prefs-dialog.glade.h:65
+#: data/glade/prefs-dialog.glade.h:63
 msgid "_Jump to new tabs automatically"
 msgstr "自動跳至新的分頁(_J)"
 
-#: data/glade/prefs-dialog.glade.h:66
+#: data/glade/prefs-dialog.glade.h:64
 msgid "_Language encoding:"
 msgstr "語言編碼(_L)："
 
-#: data/glade/prefs-dialog.glade.h:67
+#: data/glade/prefs-dialog.glade.h:65
+#: src/bookmarks/ephy-bookmark-properties.c:373
 msgid "_Location:"
 msgstr "位置(_L)："
 
-#: data/glade/prefs-dialog.glade.h:68
+#: data/glade/prefs-dialog.glade.h:66
 msgid "_Monospace:"
 msgstr "固定寬度字體(_M)："
 
-#: data/glade/prefs-dialog.glade.h:69
+#: data/glade/prefs-dialog.glade.h:67
 msgid "_More..."
 msgstr "其它(_M)..."
 
-#: data/glade/prefs-dialog.glade.h:70
+#: data/glade/prefs-dialog.glade.h:68
 msgid "_Never"
 msgstr "永不(_N)"
 
-#: data/glade/prefs-dialog.glade.h:71
+#: data/glade/prefs-dialog.glade.h:69
 msgid "_Open in tabs by default"
 msgstr "預設用分頁開啟(_O)"
 
-#: data/glade/prefs-dialog.glade.h:72
+#: data/glade/prefs-dialog.glade.h:70
 msgid "_Proportional:"
 msgstr "比例字型(_P)："
 
-#: data/glade/prefs-dialog.glade.h:73
+#: data/glade/prefs-dialog.glade.h:71
 msgid "_Serif:"
 msgstr "_Serif(襯線字體)："
 
-#: data/glade/prefs-dialog.glade.h:74
+#: data/glade/prefs-dialog.glade.h:72
 msgid "_Text"
 msgstr "文字(_T)"
 
-#: data/glade/prefs-dialog.glade.h:75
+#: data/glade/prefs-dialog.glade.h:73
 msgid "_Unvisited link"
 msgstr "未瀏覽的鏈結(_U)"
 
-#: data/glade/prefs-dialog.glade.h:76
+#: data/glade/prefs-dialog.glade.h:74
 msgid "_Visited link"
 msgstr "已瀏覽的鏈結(_V)"
 
-#: data/glade/prefs-dialog.glade.h:77
+#: data/glade/prefs-dialog.glade.h:75
 msgid "kB"
 msgstr "kB"
 
 #: data/glade/print.glade.h:4
 msgid "<b>Footers</b>"
-msgstr "<u>頁尾</u>"
+msgstr "<b>頁尾</b>"
 
 #: data/glade/print.glade.h:5
 msgid "<b>Headers</b>"
-msgstr "<u>頁首</u>"
+msgstr "<b>頁首</b>"
 
 #: data/glade/print.glade.h:6
 msgid "<b>Margins (inches)</b>"
-msgstr "<u>邊緣(英吋)</u>"
+msgstr "<b>邊緣(英吋)</b>"
 
 #: data/glade/print.glade.h:7
 msgid "<b>Orientation</b>"
-msgstr "<u>方向</u>"
+msgstr "<b>方向</b>"
 
 #: data/glade/print.glade.h:8
 msgid "<b>Pages range</b>"
-msgstr "<u>頁數範圍</u>"
+msgstr "<b>頁數範圍</b>"
 
 #: data/glade/print.glade.h:9
 msgid "<b>Printer</b>"
-msgstr "<u>印表機</u>"
+msgstr "<b>印表機</b>"
 
 #: data/glade/print.glade.h:10
 msgid "<b>Size</b>"
-msgstr "<u>尺寸</u>"
+msgstr "<b>尺寸</b>"
 
 #: data/glade/print.glade.h:11
 msgid "A_4 (8.27\" x 11.69\")"
 msgstr "A_4 (8.27\" ×  11.69\")"
 
-#: data/glade/print.glade.h:12 src/prefs-dialog.c:247
+#: data/glade/print.glade.h:12 src/prefs-dialog.c:305
 msgid "Appearance"
 msgstr "外觀"
 
@@ -989,7 +974,7 @@ msgstr "E_xecutive (7.25\" ×  10.5\")"
 msgid "G_rayscale"
 msgstr "灰階(_R)"
 
-#: data/glade/print.glade.h:16 src/prefs-dialog.c:246
+#: data/glade/print.glade.h:16 src/prefs-dialog.c:304
 msgid "General"
 msgstr "一般"
 
@@ -1030,6 +1015,7 @@ msgid "Paper Details"
 msgstr "紙張詳細資料"
 
 #: data/glade/print.glade.h:26 data/ui/nautilus-epiphany-view.xml.in.h:25
+#: src/ephy-window.c:499
 msgid "Print"
 msgstr "列印"
 
@@ -1051,6 +1037,7 @@ msgstr "日期(_D)"
 
 #. Toplevel
 #: data/glade/print.glade.h:31 data/ui/nautilus-epiphany-view.xml.in.h:35
+#: src/bookmarks/ephy-bookmarks-editor.c:135 src/ephy-history-window.c:115
 #: src/ephy-window.c:58
 msgid "_File"
 msgstr "檔案(_F)"
@@ -1087,29 +1074,37 @@ msgstr "lpr"
 msgid "to:"
 msgstr "至："
 
-#: data/glade/prompts.glade.h:3
-msgid "Password"
-msgstr "密碼"
+#: data/GNOME_Epiphany_Automation.server.in.h:1
+msgid "Epiphany automation"
+msgstr ""
 
-#: data/glade/prompts.glade.h:4
-msgid "Username"
-msgstr "用戶名稱"
+#: data/GNOME_Epiphany_NautilusView.server.in.h:1
+msgid "Epiphany Nautilus view"
+msgstr "Epiphany Nautilus 顯示模式"
+
+#: data/GNOME_Epiphany_NautilusView.server.in.h:2
+msgid "Epiphany Nautilus view factory"
+msgstr "Epiphany Nautilus 顯示模式工廠"
 
-#: data/glade/toolbar-editor.glade.h:1
-msgid "<b>Cu_rrent Controls</b>"
-msgstr "<u>目前的控制項(_R)</u>"
+#: data/GNOME_Epiphany_NautilusView.server.in.h:3
+msgid "Epiphany content view component"
+msgstr "Epiphany 內容顯示模式元件"
 
-#: data/glade/toolbar-editor.glade.h:2
-msgid "<b>_Available Controls</b>"
-msgstr "<u>可用的控制項(_A)</u>"
+#: data/GNOME_Epiphany_NautilusView.server.in.h:4
+msgid "Epiphany content view component's factory"
+msgstr "Epiphany 內容顯示模式元件的工廠"
 
-#: data/glade/toolbar-editor.glade.h:3
-msgid "Toolbar Editor"
-msgstr "工具列編輯器"
+#: data/GNOME_Epiphany_NautilusView.server.in.h:5
+msgid "View as Web Page"
+msgstr "以網頁方式顯示"
 
-#: data/glade/toolbar-editor.glade.h:4
-msgid "_Reset to defaults"
-msgstr "重設為預設值(_R)"
+#: data/GNOME_Epiphany_NautilusView.server.in.h:6
+msgid "Web Page"
+msgstr "網頁"
+
+#: data/GNOME_Epiphany_NautilusView.server.in.h:7
+msgid "Web Page Viewer"
+msgstr "網頁顯示模式"
 
 #: data/starthere/index.xml.in.h:1
 msgid "Getting started"
@@ -1145,11 +1140,11 @@ msgstr ""
 
 #: data/starthere/smartbookmarks.xml.in.h:1
 msgid ""
-"Right click the icon and choose \"Add Bookmark\" from the menu list. When "
-"you will type a word in the toolbar entry, a list of your smart bookmarks "
-"will be displayed. Just choose one of them to perform the search. The next "
-"time you type a word, just pressing the Enter key will be enough to perform "
-"the same action."
+"Right click the links and choose \"Bookmark Link...\" from the menu list. "
+"When you will type a word in the toolbar entry, a list of your smart "
+"bookmarks will be displayed. Just choose one of them to perform the search. "
+"The next time you type a word, just pressing the Enter key will be enough to "
+"perform the same action."
 msgstr ""
 
 #: data/starthere/smartbookmarks.xml.in.h:2
@@ -1232,7 +1227,7 @@ msgstr "開啟圖片"
 
 #: data/ui/nautilus-epiphany-view.xml.in.h:18
 msgid "Open Image With"
-msgstr ""
+msgstr "以其它程式開啟圖片"
 
 #: data/ui/nautilus-epiphany-view.xml.in.h:19
 msgid "Open Image in New Window"
@@ -1290,7 +1285,9 @@ msgstr "選取整個頁面的內容"
 msgid "Use Image As Background"
 msgstr "使用圖片作為桌面背景"
 
-#: data/ui/nautilus-epiphany-view.xml.in.h:34 src/ephy-window.c:59
+#: data/ui/nautilus-epiphany-view.xml.in.h:34
+#: src/bookmarks/ephy-bookmarks-editor.c:136 src/ephy-history-window.c:116
+#: src/ephy-window.c:59
 msgid "_Edit"
 msgstr "編輯(_E)"
 
@@ -1302,27 +1299,27 @@ msgstr "搜尋(_F)..."
 msgid "_Print..."
 msgstr "列印(_P)..."
 
-#: embed/downloader-view.c:383
+#: embed/downloader-view.c:382
 #, c-format
 msgid "%.1f of %.1f MB"
 msgstr "%.1f / %.1f MB"
 
-#: embed/downloader-view.c:389
+#: embed/downloader-view.c:388
 #, c-format
 msgid "%d of %d KB"
 msgstr "%d / %d KB"
 
-#: embed/downloader-view.c:395
+#: embed/downloader-view.c:394
 #, c-format
 msgid "%d KB"
 msgstr "%d KB"
 
-#: embed/downloader-view.c:499 embed/downloader-view.c:517
-#: src/ephy-window.c:1048
+#: embed/downloader-view.c:498 embed/downloader-view.c:516
+#: src/ephy-window.c:1087
 msgid "Unknown"
 msgstr "不明"
 
-#: embed/downloader-view.c:516
+#: embed/downloader-view.c:515
 msgid "00.00"
 msgstr "00.00"
 
@@ -1342,27 +1339,31 @@ msgstr "大小"
 msgid "Remaining"
 msgstr "剩餘"
 
-#: embed/downloader-view.c:1011
+#: embed/downloader-view.c:1014
 msgid "Cancel all pending downloads?"
 msgstr "是否取消下載所有未完成下載的檔案？"
 
-#: embed/ephy-embed-utils.c:132 embed/mozilla/ContentHandler.cpp:302
+#: embed/ephy-embed-utils.c:133 embed/mozilla/ContentHandler.cpp:300
 msgid "Select the destination filename"
 msgstr "請選取目的地檔案名稱"
 
-#: embed/ephy-embed-utils.c:316
+#: embed/ephy-embed-utils.c:317
 msgid "No available applications to open the specified file."
 msgstr "沒有任何應用程式可開啟指定的檔案。"
 
-#: embed/ephy-history.c:552
+#: embed/ephy-history.c:399 src/bookmarks/ephy-bookmarks.c:490
+msgid "All"
+msgstr "全部"
+
+#: embed/ephy-history.c:546
 msgid "Others"
 msgstr "其它"
 
-#: embed/ephy-history.c:558
+#: embed/ephy-history.c:552
 msgid "Local files"
 msgstr "本機檔案"
 
-#: embed/mozilla/ExternalProtocolService.cpp:121
+#: embed/mozilla/ExternalProtocolService.cpp:120
 msgid ""
 "Epiphany cannot handle this protocol,\n"
 "and no GNOME default handler is set"
@@ -1370,7 +1371,7 @@ msgstr ""
 "Epiphany 無法處理這種通訊協定，\n"
 "GNOME 亦沒有預設的處理方式"
 
-#: embed/mozilla/ExternalProtocolService.cpp:135
+#: embed/mozilla/ExternalProtocolService.cpp:134
 msgid ""
 "The protocol specified is not recognised.\n"
 "\n"
@@ -1380,38 +1381,22 @@ msgstr ""
 "\n"
 "是否嘗試使用 GNOME 預設的處理方式？"
 
-#: embed/mozilla/FilePicker.cpp:261
+#: embed/mozilla/FilePicker.cpp:259
 msgid "Save with content"
 msgstr "連同內容一併儲存"
 
-#: embed/mozilla/FilePicker.cpp:374
+#: embed/mozilla/FilePicker.cpp:372
 msgid "The specified path does not exist."
 msgstr "指定的路徑並不存在。"
 
-#: embed/mozilla/FilePicker.cpp:393
+#: embed/mozilla/FilePicker.cpp:391
 msgid "A file was selected when a folder was expected."
 msgstr "請選取一個資料夾而不是選取檔案。"
 
-#: embed/mozilla/FilePicker.cpp:400
+#: embed/mozilla/FilePicker.cpp:398
 msgid "A folder was selected when a file was expected."
 msgstr "請選取一個檔案而不是選取資料夾。"
 
-#: embed/mozilla/PromptService.cpp:248
-msgid "Save"
-msgstr "儲存"
-
-#: embed/mozilla/PromptService.cpp:251
-msgid "Revert"
-msgstr "復原"
-
-#: embed/mozilla/PromptService.cpp:254
-msgid "Don't save"
-msgstr "不儲存"
-
-#: embed/mozilla/PromptService.cpp:661
-msgid "Epiphany"
-msgstr "Epiphany"
-
 #: embed/mozilla/mozilla-embed-single.cpp:760
 msgid "Yes"
 msgstr "是"
@@ -1422,7 +1407,7 @@ msgstr "否"
 
 #: embed/mozilla/mozilla-embed-single.cpp:767
 msgid "End of current session"
-msgstr ""
+msgstr "本程式結束為止"
 
 #: embed/mozilla/mozilla-i18n.c:31
 msgid "Indian"
@@ -1792,7 +1777,7 @@ msgstr ""
 msgid "Failed to create directory %s."
 msgstr "無法建立目錄 %s。"
 
-#: lib/ephy-gui.c:249
+#: lib/ephy-gui.c:135
 #, c-format
 msgid ""
 "File %s will be overwritten.\n"
@@ -1806,31 +1791,31 @@ msgstr ""
 "\n"
 "是否繼續？"
 
-#: lib/ephy-node.c:821 lib/ephy-node.c:827 lib/ephy-node.c:858
+#: lib/ephy-node.c:815 lib/ephy-node.c:821 lib/ephy-node.c:852
 msgid "Never"
 msgstr "永不"
 
-#: lib/ephy-node.c:849
+#: lib/ephy-node.c:843
 msgid "Today at %-H:%M"
 msgstr ""
 
-#: lib/ephy-node.c:851
+#: lib/ephy-node.c:845
 msgid "Yesterday at %-H:%M"
 msgstr ""
 
-#: lib/ephy-node.c:853
+#: lib/ephy-node.c:847
 msgid "%A, %B %-d %Y at %-H:%M"
 msgstr ""
 
-#: lib/ephy-start-here.c:274
+#: lib/ephy-start-here.c:275
 msgid "Import Mozilla bookmarks"
 msgstr "匯入 Mozilla 書籤"
 
-#: lib/ephy-start-here.c:285
+#: lib/ephy-start-here.c:286
 msgid "Import Galeon bookmarks"
 msgstr "匯入 Galeon 書籤"
 
-#: lib/ephy-start-here.c:296
+#: lib/ephy-start-here.c:297
 msgid "Import Konqueror bookmarks"
 msgstr "匯入 Konqueror 書籤"
 
@@ -1838,115 +1823,233 @@ msgstr "匯入 Konqueror 書籤"
 msgid "%Y-%m-%d"
 msgstr "%Y-%m-%d"
 
-#: lib/widgets/ephy-editable-toolbar.c:743
-msgid ""
-"Drag an item onto the toolbars above to add it, from the toolbars in the "
-"items table to remove it."
-msgstr ""
-
-#: lib/widgets/ephy-editable-toolbar.c:757
-msgid "Add Toolbar"
-msgstr "新增工具列"
-
 #. setup label
-#: lib/widgets/ephy-notebook.c:714 src/ephy-tab.c:524 src/ephy-tab.c:992
-#: src/window-commands.c:286
+#: lib/widgets/ephy-notebook.c:744 src/ephy-tab.c:579 src/ephy-tab.c:1036
+#: src/window-commands.c:270
 msgid "Untitled"
 msgstr "未命名"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:95
-msgid "Open In New Tab..."
-msgstr "在新的分頁中開啟..."
+#: src/bookmarks/ephy-bookmark-properties.c:257
+#, c-format
+msgid "%s Properties"
+msgstr "%s 屬性"
+
+#: src/bookmarks/ephy-bookmark-properties.c:354
+#: src/bookmarks/ephy-new-bookmark.c:216
+msgid "_Title:"
+msgstr "標題(_T)："
+
+#: src/bookmarks/ephy-bookmark-properties.c:396
+#: src/bookmarks/ephy-new-bookmark.c:239
+msgid "To_pics:"
+msgstr ""
+
+#: src/bookmarks/ephy-bookmark-properties.c:405
+msgid "Show in the bookmarks _toolbar"
+msgstr "在書籤工具列中顯示(_T)"
+
+#: src/bookmarks/ephy-bookmarks.c:54
+msgid "Search the web"
+msgstr ""
+
+#: src/bookmarks/ephy-bookmarks.c:60
+msgid "News"
+msgstr "新聞"
+
+#: src/bookmarks/ephy-bookmarks.c:61
+msgid "People"
+msgstr ""
+
+#: src/bookmarks/ephy-bookmarks.c:62
+msgid "Shop"
+msgstr ""
+
+#: src/bookmarks/ephy-bookmarks.c:63
+msgid "Art"
+msgstr "藝術"
+
+#: src/bookmarks/ephy-bookmarks.c:64
+msgid "Work"
+msgstr "工作"
+
+#: src/bookmarks/ephy-bookmarks.c:528
+msgid "Most Visited"
+msgstr "經常到訪"
+
+#: src/bookmarks/ephy-bookmarks.c:545
+msgid "Not Categorized"
+msgstr "未分類"
+
+#: src/bookmarks/ephy-bookmarks-editor.c:137 src/ephy-history-window.c:117
+#: src/ephy-window.c:63
+msgid "_Help"
+msgstr "求助(_H)"
+
+#: src/bookmarks/ephy-bookmarks-editor.c:140
+msgid "_New Topic"
+msgstr ""
+
+#: src/bookmarks/ephy-bookmarks-editor.c:143
+#: src/bookmarks/ephy-bookmarks-editor.c:572 src/ephy-history-window.c:120
+#: src/ephy-history-window.c:518
+msgid "_Open in New Window"
+msgstr "在新的視窗開啟(_O)"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:98
-msgid "Open In New Browser..."
-msgstr "在新的視窗中開啟..."
+#: src/bookmarks/ephy-bookmarks-editor.c:146
+#: src/bookmarks/ephy-bookmarks-editor.c:573 src/ephy-history-window.c:123
+#: src/ephy-history-window.c:519
+msgid "Open in New _Tab"
+msgstr "在新的分頁開啟(_T)"
+
+#. Edit menu
+#: src/bookmarks/ephy-bookmarks-editor.c:149 src/ephy-history-window.c:138
+#: src/ephy-window.c:92
+msgid "Cu_t"
+msgstr "剪下(_T)"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:101
-msgid "Remove..."
-msgstr "移除..."
+#: src/bookmarks/ephy-bookmarks-editor.c:152
+#: src/bookmarks/ephy-bookmarks-editor.c:582 src/ephy-history-window.c:141
+#: src/ephy-history-window.c:528 src/ephy-window.c:95
+msgid "_Copy"
+msgstr "複製(_C)"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:476
-#: src/bookmarks/ephy-new-bookmark.c:195
-msgid "Title:"
-msgstr "標題："
+#: src/bookmarks/ephy-bookmarks-editor.c:155 src/ephy-history-window.c:144
+#: src/ephy-window.c:98
+msgid "_Paste"
+msgstr "貼上(_P)"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:493
-msgid "Location:"
-msgstr "位置："
+#: src/bookmarks/ephy-bookmarks-editor.c:158 src/ephy-history-window.c:147
+#: src/ephy-window.c:101
+msgid "Select _All"
+msgstr "全部選取(_A)"
+
+#: src/bookmarks/ephy-bookmarks-editor.c:161
+msgid "_Rename"
+msgstr "重新命名(_R)"
+
+#: src/bookmarks/ephy-bookmarks-editor.c:164 src/ephy-history-window.c:129
+msgid "_Delete"
+msgstr "刪除(_D)"
+
+#: src/bookmarks/ephy-bookmarks-editor.c:167
+msgid "_Properties"
+msgstr "屬性(_P)"
+
+#: src/bookmarks/ephy-bookmarks-editor.c:170 src/ephy-history-window.c:135
+#: src/ephy-window.c:87
+msgid "_Close"
+msgstr "關閉(_C)"
+
+#. Help menu
+#: src/bookmarks/ephy-bookmarks-editor.c:173 src/ephy-history-window.c:150
+#: src/ephy-window.c:197
+msgid "_Contents"
+msgstr "內容(_C)"
+
+#: src/bookmarks/ephy-bookmarks-editor.c:176 src/ephy-history-window.c:153
+#: src/ephy-window.c:200
+msgid "_About"
+msgstr "關於(_A)"
+
+#: src/bookmarks/ephy-bookmarks-editor.c:189
+msgid "Type a topic"
+msgstr ""
 
-#: src/bookmarks/ephy-bookmarks-editor.c:510
-#: src/bookmarks/ephy-new-bookmark.c:209
-msgid "Keywords:"
-msgstr "關鍵字："
+#: src/bookmarks/ephy-bookmarks-editor.c:567 src/ephy-history-window.c:513
+msgid "_Open in New Windows"
+msgstr "在新的視窗開啟(_O)"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:602
-msgid "Search:"
-msgstr "搜尋："
+#: src/bookmarks/ephy-bookmarks-editor.c:568 src/ephy-history-window.c:514
+msgid "Open in New _Tabs"
+msgstr "在新的分頁開啟(_T)"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:651
+#: src/bookmarks/ephy-bookmarks-editor.c:578 src/ephy-history-window.c:524
+msgid "_Copy Location"
+msgstr "複製網址(_C)"
+
+#: src/bookmarks/ephy-bookmarks-editor.c:808 src/ephy-history-window.c:677
+msgid "_Search:"
+msgstr "搜尋(_S)："
+
+#: src/bookmarks/ephy-bookmarks-editor.c:904
 msgid "Bookmarks"
 msgstr "書籤"
 
-#: src/bookmarks/ephy-bookmarks-editor.c:672
-msgid "Keywords"
-msgstr "關鍵字"
+#: src/bookmarks/ephy-bookmarks-editor.c:973
+msgid "Topics"
+msgstr ""
 
-#: src/bookmarks/ephy-bookmarks-editor.c:697 src/history-dialog.c:272
+#: src/bookmarks/ephy-bookmarks-editor.c:1030 src/ephy-history-window.c:857
 msgid "Title"
 msgstr "標題"
 
-#: src/bookmarks/ephy-bookmarks.c:465
-msgid "All"
-msgstr "全部"
-
-#: src/bookmarks/ephy-new-bookmark.c:231
-msgid "Add bookmark"
+#: src/bookmarks/ephy-new-bookmark.c:261
+msgid "New Bookmark"
 msgstr "新增書籤"
 
-#: src/ephy-main.c:71
+#: src/ephy-go-action.c:74
+msgid "Go"
+msgstr "進入"
+
+#: src/ephy-history-window.c:126
+msgid "C_lear History"
+msgstr "清除紀錄(_L)"
+
+#: src/ephy-history-window.c:132 src/ephy-window.c:84
+msgid "Boo_kmark Page..."
+msgstr ""
+
+#: src/ephy-history-window.c:817
+msgid "Sites"
+msgstr "網站"
+
+#: src/ephy-history-window.c:861
+msgid "Location"
+msgstr "位置"
+
+#: src/ephy-main.c:72
 msgid "Open a new tab in an existing Ephy window"
 msgstr ""
 
-#: src/ephy-main.c:74
+#: src/ephy-main.c:75
 msgid "Open a new window in an existing Ephy process"
 msgstr ""
 
-#: src/ephy-main.c:77
+#: src/ephy-main.c:78
 msgid "Do not raise the window when opening a page in an existing Ephy process"
 msgstr ""
 
-#: src/ephy-main.c:80
+#: src/ephy-main.c:81
 msgid "Run Ephy in full screen mode"
-msgstr ""
+msgstr "以全螢幕模式啟動 Ephy"
 
-#: src/ephy-main.c:83
+#: src/ephy-main.c:84
 msgid "Attempt to load URL in existing Ephy window"
-msgstr ""
+msgstr "嘗試在現有的 Ephy 視窗中載入指定的 URL"
 
-#: src/ephy-main.c:86
+#: src/ephy-main.c:87
 msgid "Load the given session file"
 msgstr "載入指定的作業階段檔案"
 
-#: src/ephy-main.c:87
+#: src/ephy-main.c:88
 msgid "FILE"
 msgstr "檔案"
 
-#: src/ephy-main.c:89
+#: src/ephy-main.c:90
 msgid ""
 "Don't open any windows; instead act as a server for quick startup of new "
 "Ephy instances"
 msgstr "不開啟任何視窗；只以伺服程式的形式執行，加快將來啟動 Ephy 的速度"
 
-#: src/ephy-main.c:93
+#: src/ephy-main.c:94
 msgid "Add a bookmark (don't open any window)"
 msgstr "新增書籤 (不開啟任何視窗)"
 
-#: src/ephy-main.c:94
+#: src/ephy-main.c:95
 msgid "URL"
 msgstr "網址"
 
-#: src/ephy-main.c:96
+#: src/ephy-main.c:97
 msgid ""
 "Create the initial window with the given geometry.\n"
 "see X(1) for the GEOMETRY format"
@@ -1954,27 +2057,35 @@ msgstr ""
 "以指定的位置及尺寸顯示最開始的視窗\n"
 "請參考 X(1) 對於 GEOMETRY 格式的說明"
 
-#: src/ephy-main.c:98
+#: src/ephy-main.c:99
 msgid "GEOMETRY"
 msgstr "位置尺寸"
 
-#: src/ephy-main.c:100
+#: src/ephy-main.c:101
 msgid "Close all Ephy windows"
 msgstr "關閉所有 Ephy 視窗"
 
-#: src/ephy-main.c:103
+#: src/ephy-main.c:104
 msgid "Same as --close, but exits server mode too"
 msgstr "等於 --close，並且離開伺服程式模式"
 
-#: src/ephy-main.c:106
+#: src/ephy-main.c:107
 msgid "Used internally by the nautilus view"
 msgstr "供 nautilus 顯示模式內部使用"
 
+#: src/ephy-main.c:110
+msgid "Launch the bookmarks editor"
+msgstr "啟動書籤編輯器"
+
 #: src/ephy-main.c:131
+msgid "Epiphany Web Browser"
+msgstr "Epiphany 網頁瀏覽器"
+
+#: src/ephy-main.c:136
 msgid "Ephy"
 msgstr "Ephy"
 
-#: src/ephy-main.c:291
+#: src/ephy-main.c:302
 msgid "Ephy already running, using existing process"
 msgstr "因 Ephy 已在執行，會用現有的行程"
 
@@ -1984,65 +2095,65 @@ msgstr "mozilla 顯示模式中的圖示名稱"
 
 #: src/ephy-nautilus-view.c:747
 msgid "mozilla summary info"
-msgstr ""
+msgstr "mozilla 摘要資訊"
 
-#: src/ephy-shell.c:149
+#: src/ephy-shell.c:155
 msgid "Mozilla bookmarks imported successfully."
 msgstr "成功匯入 Mozilla 書籤。"
 
-#: src/ephy-shell.c:158
+#: src/ephy-shell.c:164
 msgid "Importing Mozilla bookmarks failed."
 msgstr "無法匯入 Mozilla 書籤。"
 
-#: src/ephy-shell.c:166
+#: src/ephy-shell.c:172
 msgid "Galeon"
 msgstr "Galeon"
 
-#: src/ephy-shell.c:173
+#: src/ephy-shell.c:179
 msgid "Galeon bookmarks imported successfully."
 msgstr "成功匯入 Galeon 書籤。"
 
-#: src/ephy-shell.c:182
+#: src/ephy-shell.c:188
 msgid "Importing Galeon bookmarks failed."
 msgstr "無法匯入 Galeon 書籤。"
 
-#: src/ephy-shell.c:190
+#: src/ephy-shell.c:196
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: src/ephy-shell.c:197
+#: src/ephy-shell.c:203
 msgid "Konqueror bookmarks imported successfully."
 msgstr "成功匯入 Konqueror 書籤。"
 
-#: src/ephy-shell.c:206
+#: src/ephy-shell.c:212
 msgid "Importing Konqueror bookmarks failed."
 msgstr "無法匯入 Konqueror 書籤。"
 
-#: src/ephy-tab.c:568
+#: src/ephy-tab.c:623
 msgid "site"
 msgstr "站台"
 
-#: src/ephy-tab.c:594
+#: src/ephy-tab.c:649
 #, c-format
 msgid "Redirecting to %s..."
 msgstr "重新導向至 %s..."
 
-#: src/ephy-tab.c:598
+#: src/ephy-tab.c:653
 #, c-format
 msgid "Transferring data from %s..."
 msgstr "正在從 %s 傳送資料..."
 
-#: src/ephy-tab.c:602
+#: src/ephy-tab.c:657
 #, c-format
 msgid "Waiting for authorization from %s..."
 msgstr "正在等待 %s 發出授權..."
 
-#: src/ephy-tab.c:610
+#: src/ephy-tab.c:665
 #, c-format
 msgid "Loading %s..."
 msgstr "正在載入 %s..."
 
-#: src/ephy-tab.c:614
+#: src/ephy-tab.c:669
 msgid "Done."
 msgstr "完成。"
 
@@ -2050,8 +2161,7 @@ msgstr "完成。"
 msgid "_View"
 msgstr "顯示(_V)"
 
-#. Toolbar only
-#: src/ephy-window.c:61 src/ephy-window.c:202
+#: src/ephy-window.c:61
 msgid "_Go"
 msgstr "進入(_G)"
 
@@ -2059,10 +2169,6 @@ msgstr "進入(_G)"
 msgid "_Tabs"
 msgstr "分頁(_T)"
 
-#: src/ephy-window.c:63
-msgid "_Help"
-msgstr "求助(_H)"
-
 #. File menu
 #: src/ephy-window.c:66
 msgid "_New Window"
@@ -2070,7 +2176,7 @@ msgstr "新增視窗(_N)"
 
 #: src/ephy-window.c:67
 msgid "Create a new window"
-msgstr "建立一個新的視窗"
+msgstr "顯示新的視窗"
 
 #: src/ephy-window.c:69
 msgid "New _Tab"
@@ -2078,7 +2184,7 @@ msgstr "新增分頁(_T)"
 
 #: src/ephy-window.c:70
 msgid "Create a new tab"
-msgstr ""
+msgstr "顯示新的分頁"
 
 #: src/ephy-window.c:72
 msgid "_Open..."
@@ -2106,53 +2212,28 @@ msgstr "傳送網址(_E)..."
 
 #: src/ephy-window.c:82
 msgid "Send a link of the current page"
-msgstr ""
-
-#: src/ephy-window.c:84
-msgid "Boo_kmark Page..."
-msgstr ""
+msgstr "傳送本頁面的網址"
 
 #: src/ephy-window.c:85
 msgid "Add a bookmark for the current page"
 msgstr "新增有關本頁面的書籤"
 
-#: src/ephy-window.c:87
-msgid "_Close"
-msgstr "關閉(_C)"
-
 #: src/ephy-window.c:88
 msgid "Close this window"
 msgstr "關閉本視窗"
 
-#. Edit menu
-#: src/ephy-window.c:92
-msgid "Cu_t"
-msgstr "剪下(_T)"
-
 #: src/ephy-window.c:93
 msgid "Cut the selection"
 msgstr "剪下選定的內容"
 
-#: src/ephy-window.c:95
-msgid "_Copy"
-msgstr "複製(_C)"
-
 #: src/ephy-window.c:96
 msgid "Copy the selection"
 msgstr "複製選定的內容"
 
-#: src/ephy-window.c:98
-msgid "_Paste"
-msgstr "貼上(_P)"
-
 #: src/ephy-window.c:99
 msgid "Paste clipboard"
 msgstr "貼上剪貼板的內容"
 
-#: src/ephy-window.c:101
-msgid "Select _All"
-msgstr "全部選取(_A)"
-
 #: src/ephy-window.c:102
 msgid "Select the entire page"
 msgstr "選取整個頁面的內容"
@@ -2194,8 +2275,8 @@ msgid "T_oolbars"
 msgstr "工具列(_O)"
 
 #: src/ephy-window.c:117
-msgid "Costumize toolbars"
-msgstr "自選工具列"
+msgid "Customize toolbars"
+msgstr "自行修改工具列"
 
 #: src/ephy-window.c:119
 msgid "P_references"
@@ -2231,273 +2312,276 @@ msgid "Show or hide toolbar"
 msgstr "顯示或隱藏工具列"
 
 #: src/ephy-window.c:133
+msgid "_Bookmarks Toolbar"
+msgstr "書籤工具列(_B)"
+
+#: src/ephy-window.c:134
+msgid "Show or hide bookmarks toolbar"
+msgstr "顯示或隱藏書籤工具列"
+
+#: src/ephy-window.c:136
 msgid "St_atusbar"
 msgstr "狀態列(_A)"
 
-#: src/ephy-window.c:134
+#: src/ephy-window.c:137
 msgid "Show or hide statusbar"
 msgstr "顯示或隱藏狀態列"
 
-#: src/ephy-window.c:136
+#: src/ephy-window.c:139
 msgid "_Fullscreen"
 msgstr "全螢幕(_F)"
 
-#: src/ephy-window.c:137
+#: src/ephy-window.c:140
 msgid "Browse at full screen"
 msgstr "以全螢幕模式瀏覽網頁"
 
-#: src/ephy-window.c:139
+#: src/ephy-window.c:142
 msgid "Zoom _In"
 msgstr "放大(_I)"
 
-#: src/ephy-window.c:140
+#: src/ephy-window.c:143
 msgid "Show the contents in more detail"
 msgstr "顯示較多內容細節"
 
-#: src/ephy-window.c:142
+#: src/ephy-window.c:145
 msgid "Zoom _Out"
 msgstr "縮小(_O)"
 
-#: src/ephy-window.c:143
+#: src/ephy-window.c:146
 msgid "Show the contents in less detail"
 msgstr "顯示較少內容細節"
 
-#: src/ephy-window.c:145
+#: src/ephy-window.c:148
 msgid "_Normal Size"
 msgstr "正常大小(_N)"
 
-#: src/ephy-window.c:146
+#: src/ephy-window.c:149
 msgid "Show the contents at the normal size"
 msgstr "以正常大小顯示內容"
 
-#: src/ephy-window.c:148
+#: src/ephy-window.c:151
 msgid "_Encoding"
 msgstr "編碼(_E)"
 
-#: src/ephy-window.c:149
+#: src/ephy-window.c:152
 msgid "_Page Source"
 msgstr "網頁原始內容(_P)"
 
-#: src/ephy-window.c:150
+#: src/ephy-window.c:153
 msgid "View the source code of the page"
 msgstr "顯示該頁面的原始內容"
 
 #. Go menu
-#: src/ephy-window.c:154
+#: src/ephy-window.c:157
 msgid "_Back"
 msgstr "上一頁(_B)"
 
-#: src/ephy-window.c:155
+#: src/ephy-window.c:158
 msgid "Go to the previous visited page"
 msgstr "進入上一個瀏覽的頁面"
 
-#: src/ephy-window.c:157
+#: src/ephy-window.c:160
 msgid "_Forward"
 msgstr "下一頁(_F)"
 
-#: src/ephy-window.c:158
+#: src/ephy-window.c:161
 msgid "Go to the next visited page"
 msgstr "進入下一個瀏覽的頁面"
 
-#: src/ephy-window.c:160
+#: src/ephy-window.c:163
 msgid "_Up"
 msgstr "上一層(_U)"
 
-#: src/ephy-window.c:161
+#: src/ephy-window.c:164
 msgid "Go up one level"
-msgstr ""
+msgstr "進入上一層的頁面"
 
-#: src/ephy-window.c:163
+#: src/ephy-window.c:166
 msgid "_Home"
 msgstr "首頁(_H)"
 
-#: src/ephy-window.c:164
+#: src/ephy-window.c:167
 msgid "Go to the home page"
 msgstr "進入首頁"
 
-#: src/ephy-window.c:166
+#: src/ephy-window.c:169
 msgid "_Location..."
 msgstr "位置(_L)..."
 
-#: src/ephy-window.c:167
+#: src/ephy-window.c:170
 msgid "Go to a specified location"
 msgstr "瀏覽指定位置"
 
-#: src/ephy-window.c:169
+#: src/ephy-window.c:172
 msgid "H_istory"
 msgstr "瀏覽紀錄(_I)"
 
-#: src/ephy-window.c:170
+#: src/ephy-window.c:173
 msgid "Go to an already visited page"
-msgstr ""
+msgstr "進入曾經瀏覽的頁面"
 
-#: src/ephy-window.c:172
+#: src/ephy-window.c:175
 msgid "Boo_kmarks"
 msgstr "書籤(_K)"
 
-#: src/ephy-window.c:173
+#: src/ephy-window.c:176
 msgid "Go to a bookmark"
 msgstr "進入某書籤中指定的網頁"
 
 #. Tabs menu
-#: src/ephy-window.c:177
+#: src/ephy-window.c:180
 msgid "_Previous Tab"
 msgstr "上一個分頁(_P)"
 
-#: src/ephy-window.c:178
+#: src/ephy-window.c:181
 msgid "Activate previous tab"
 msgstr "啟用上一個分頁"
 
-#: src/ephy-window.c:180
+#: src/ephy-window.c:183
 msgid "_Next Tab"
 msgstr "下一個分頁(_N)"
 
-#: src/ephy-window.c:181
+#: src/ephy-window.c:184
 msgid "Activate next tab"
 msgstr "啟用下一個分頁"
 
-#: src/ephy-window.c:183
+#: src/ephy-window.c:186
 msgid "Move Tab _Left"
 msgstr "將分頁左移(_L)"
 
-#: src/ephy-window.c:184
+#: src/ephy-window.c:187
 msgid "Move current tab to left"
 msgstr "將目前的分頁向左移動"
 
-#: src/ephy-window.c:186
+#: src/ephy-window.c:189
 msgid "Move Tab _Right"
 msgstr "將分頁右移(_R)"
 
-#: src/ephy-window.c:187
+#: src/ephy-window.c:190
 msgid "Move current tab to right"
 msgstr "將目前的分頁向右移動"
 
-#: src/ephy-window.c:189
+#: src/ephy-window.c:192
 msgid "_Detach Tab"
 msgstr "轉為獨立視窗(_D)"
 
-#: src/ephy-window.c:190
+#: src/ephy-window.c:193
 msgid "Detach current tab"
-msgstr ""
-
-#. Help menu
-#: src/ephy-window.c:194
-msgid "_Contents"
-msgstr "內容(_C)"
+msgstr "將目前的分頁轉為獨立視窗"
 
-#: src/ephy-window.c:195
+#: src/ephy-window.c:198
 msgid "Display web browser help"
 msgstr ""
 
-#: src/ephy-window.c:197
-msgid "_About"
-msgstr "關於(_A)"
-
-#: src/ephy-window.c:198
+#: src/ephy-window.c:201
 msgid "Display credits for the web browser creators"
 msgstr ""
 
-#: src/ephy-window.c:203
-msgid "Type a web address or a word in the field on the left, then click Go"
-msgstr ""
-
 #. Document
-#: src/ephy-window.c:213
+#: src/ephy-window.c:211
 msgid "_Save Background As..."
-msgstr ""
-
-#: src/ephy-window.c:215
-msgid "_Copy Page Location"
-msgstr "複製網址(_C)"
+msgstr "另存背景圖片(_S)..."
 
 #. Framed document
-#: src/ephy-window.c:219
+#: src/ephy-window.c:215
 msgid "_Open Frame"
 msgstr "開啟頁框(_O)"
 
-#: src/ephy-window.c:221
+#: src/ephy-window.c:217
 msgid "Open Frame in _New Window"
-msgstr ""
+msgstr "在新視窗中顯示本頁框的內容(_N)"
 
-#: src/ephy-window.c:223
+#: src/ephy-window.c:219
 msgid "Open Frame in New _Tab"
-msgstr ""
+msgstr "在新分頁中顯示本頁框的內容(_T)"
 
 #. Links
-#: src/ephy-window.c:227
+#: src/ephy-window.c:223
 msgid "_Open Link"
 msgstr "開啟鏈結(_O)"
 
-#: src/ephy-window.c:229
+#: src/ephy-window.c:225
 msgid "Open Link in _New Window"
 msgstr "在新的視窗開啟鏈結(_N)"
 
-#: src/ephy-window.c:231
+#: src/ephy-window.c:227
 msgid "Open Link in New _Tab"
 msgstr "在新的分頁開啟鏈結(_T)"
 
-#: src/ephy-window.c:233
+#: src/ephy-window.c:229
 msgid "_Download Link"
 msgstr "下載鏈結(_D)"
 
-#: src/ephy-window.c:235
+#: src/ephy-window.c:231
 msgid "_Bookmark Link..."
 msgstr ""
 
-#: src/ephy-window.c:237
+#: src/ephy-window.c:233
 msgid "_Copy Link Location"
 msgstr "複製鏈結位置(_C)"
 
-#: src/ephy-window.c:239
+#: src/ephy-window.c:235
 msgid "Copy _Email"
-msgstr ""
+msgstr "複製郵件地址(_E)"
 
 #. Images
-#: src/ephy-window.c:243
+#: src/ephy-window.c:239
 msgid "_Open Image"
 msgstr "開啟圖片(_O)"
 
-#: src/ephy-window.c:245
+#: src/ephy-window.c:241
 msgid "Open Image in _New Window"
 msgstr "在新的視窗開啟圖片(_N)"
 
-#: src/ephy-window.c:247
+#: src/ephy-window.c:243
 msgid "Open Image in New _Tab"
 msgstr "在新的分頁開啟圖片(_T)"
 
-#: src/ephy-window.c:249
+#: src/ephy-window.c:245
 msgid "_Save Image As..."
-msgstr ""
+msgstr "另存圖片(_S)..."
 
-#: src/ephy-window.c:251
+#: src/ephy-window.c:247
 msgid "Use Image As _Background"
 msgstr "使用圖片作為桌面背景"
 
-#: src/ephy-window.c:253
+#: src/ephy-window.c:249
 msgid "_Copy Image Location"
 msgstr "複製圖片位置(_C)"
 
-#: src/ephy-window.c:1051
+#: src/ephy-window.c:495
+msgid "Open"
+msgstr "開啟"
+
+#: src/ephy-window.c:497
+msgid "Save As"
+msgstr "另存新檔"
+
+#: src/ephy-window.c:501
+msgid "Bookmark"
+msgstr "書籤"
+
+#: src/ephy-window.c:1090
 msgid "Insecure"
 msgstr "不安全"
 
-#: src/ephy-window.c:1054
+#: src/ephy-window.c:1093
 msgid "Broken"
 msgstr "中斷"
 
-#: src/ephy-window.c:1057
+#: src/ephy-window.c:1096
 msgid "Medium"
 msgstr "中"
 
-#: src/ephy-window.c:1061
+#: src/ephy-window.c:1100
 msgid "Low"
 msgstr "低"
 
-#: src/ephy-window.c:1065
+#: src/ephy-window.c:1104
 msgid "High"
 msgstr "高"
 
-#: src/ephy-window.c:1075
+#: src/ephy-window.c:1114
 #, c-format
 msgid ""
 "Security level: %s\n"
@@ -2506,7 +2590,7 @@ msgstr ""
 "安全等級：%s\n"
 "%s"
 
-#: src/ephy-window.c:1081
+#: src/ephy-window.c:1120
 #, c-format
 msgid "Security level: %s"
 msgstr "安全等級：%s"
@@ -2691,14 +2775,6 @@ msgstr "越南語"
 msgid "Walloon"
 msgstr "華隆語(比利時)"
 
-#: src/history-dialog.c:273
-msgid "Location"
-msgstr "位置"
-
-#: src/history-dialog.c:274
-msgid "Last Visit"
-msgstr "最後瀏覽時間"
-
 #: src/pdm-dialog.c:224
 msgid "Host"
 msgstr "主機"
@@ -2715,41 +2791,41 @@ msgstr "網域"
 msgid "Name"
 msgstr "名稱"
 
-#: src/pdm-dialog.c:572
+#: src/pdm-dialog.c:599
 msgid "Cookie properties"
 msgstr "Cookie 屬性"
 
-#: src/pdm-dialog.c:585
+#: src/pdm-dialog.c:612
 msgid "Value"
 msgstr "設定值"
 
-#: src/pdm-dialog.c:599
+#: src/pdm-dialog.c:626
 msgid "Path"
 msgstr "路徑"
 
-#: src/pdm-dialog.c:613
+#: src/pdm-dialog.c:640
 msgid "Secure"
 msgstr "安全"
 
-#: src/pdm-dialog.c:627
+#: src/pdm-dialog.c:654
 msgid "Expire"
-msgstr ""
+msgstr "時限"
 
 #: src/ppview-toolbar.c:88
 msgid "Go to the first page"
-msgstr ""
+msgstr "進入第一頁"
 
 #: src/ppview-toolbar.c:92
 msgid "Go to the last page"
-msgstr ""
+msgstr "進入最後一頁"
 
 #: src/ppview-toolbar.c:96
 msgid "Go to the previous page"
-msgstr ""
+msgstr "進入上一頁"
 
 #: src/ppview-toolbar.c:100
 msgid "Go to next page"
-msgstr ""
+msgstr "進入下一頁"
 
 #: src/ppview-toolbar.c:102
 msgid "Close"
@@ -2759,15 +2835,20 @@ msgstr "關閉"
 msgid "Close print preview"
 msgstr "關閉列印預覽視窗"
 
-#: src/prefs-dialog.c:248
+#: src/prefs-dialog.c:264 src/window-commands.c:669
+#, c-format
+msgid "Could not display help: %s"
+msgstr "無法顯示說明文件：%s"
+
+#: src/prefs-dialog.c:306
 msgid "User Interface"
 msgstr "用戶界面"
 
-#: src/prefs-dialog.c:249
+#: src/prefs-dialog.c:307
 msgid "Advanced"
 msgstr "進階"
 
-#: src/prefs-dialog.c:301
+#: src/prefs-dialog.c:351
 msgid "Preferences"
 msgstr "偏好設定"
 
@@ -2777,11 +2858,11 @@ msgstr ""
 
 #: src/session.c:191
 msgid "_Don't Recover"
-msgstr ""
+msgstr "不恢復狀態(_D)"
 
 #: src/session.c:192
 msgid "_Recover"
-msgstr ""
+msgstr "恢復狀態(_R)"
 
 #: src/session.c:220
 msgid ""
@@ -2790,30 +2871,30 @@ msgstr "Epiphany 在上次執行時似乎是因某些漏洞而結束，或是被
 
 #: src/session.c:226
 msgid "You can recover the opened tabs and windows."
-msgstr ""
+msgstr "閣下可以恢復曾經開啟的分頁及視窗。"
 
-#: src/toolbar.c:264
+#: src/toolbar.c:319
 msgid "Back"
 msgstr "上頁"
 
-#: src/toolbar.c:276
+#: src/toolbar.c:331
 msgid "Forward"
 msgstr "下頁"
 
-#: src/toolbar.c:288
+#: src/toolbar.c:343
 msgid "Up"
 msgstr "上層"
 
-#: src/window-commands.c:149
+#: src/window-commands.c:139
 msgid "Check this out!"
-msgstr ""
+msgstr "請看看！"
 
-#: src/window-commands.c:326
+#: src/window-commands.c:310
 msgid "Select the file to open"
 msgstr "請選取準備開啟的檔案"
 
 #. Translator credits
-#: src/window-commands.c:672
+#: src/window-commands.c:699
 msgid "translator_credits"
 msgstr ""
 "i18n 程式中文化計劃\n"
@@ -2824,6 +2905,63 @@ msgstr ""
 "以 Galeon 的翻譯為基礎：\n"
 "Joe Man <trmetal@yahoo.com.hk>, 2001"
 
-#: src/window-commands.c:684
+#: src/window-commands.c:711
 msgid "A GNOME browser based on Mozilla"
 msgstr "以 Mozilla 為基礎的 GNOME 網頁瀏覽器"
+
+#~ msgid "Always us_e these fonts"
+#~ msgstr "永遠使用指定的字型(_E)"
+
+#~ msgid "Set to _Current Page"
+#~ msgstr "使用目前網頁(_C)"
+
+#~ msgid "_Compare page:"
+#~ msgstr "比較快取資料(_C)："
+
+#~ msgid "Password"
+#~ msgstr "密碼"
+
+#~ msgid "Username"
+#~ msgstr "用戶名稱"
+
+#~ msgid "Toolbar Editor"
+#~ msgstr "工具列編輯器"
+
+#~ msgid "_Reset to defaults"
+#~ msgstr "重設為預設值(_R)"
+
+#~ msgid "Save"
+#~ msgstr "儲存"
+
+#~ msgid "Revert"
+#~ msgstr "復原"
+
+#~ msgid "Don't save"
+#~ msgstr "不儲存"
+
+#~ msgid "Add Toolbar"
+#~ msgstr "新增工具列"
+
+#~ msgid "Open In New Tab..."
+#~ msgstr "在新的分頁中開啟..."
+
+#~ msgid "Open In New Browser..."
+#~ msgstr "在新的視窗中開啟..."
+
+#~ msgid "Remove..."
+#~ msgstr "移除..."
+
+#~ msgid "Location:"
+#~ msgstr "位置："
+
+#~ msgid "Keywords:"
+#~ msgstr "關鍵字："
+
+#~ msgid "Keywords"
+#~ msgstr "關鍵字"
+
+#~ msgid "Add bookmark"
+#~ msgstr "新增書籤"
+
+#~ msgid "Last Visit"
+#~ msgstr "最後瀏覽時間"