diff --git a/po/zh_CN.po b/po/zh_CN.po
index c315efaf..5eee5f4d 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: midori 0.2.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-02 10:17+0000\n"
+"POT-Creation-Date: 2011-05-04 22:17+0000\n"
 "PO-Revision-Date: 2011-02-15 21:26+0800\n"
 "Last-Translator: Hunt Xu <huntxu@live.cn>\n"
 "Language-Team: Simplified Chinese <xfce-i18n@xfce.org>\n"
@@ -20,8 +20,8 @@ msgstr ""
 msgid "Lightweight web browser"
 msgstr "轻量级网页浏览器"
 
-#: ../data/midori.desktop.in.h:2 ../midori/main.c:1510 ../midori/main.c:2073
-#: ../midori/main.c:2098 ../midori/main.c:2114
+#: ../data/midori.desktop.in.h:2 ../midori/main.c:1510 ../midori/main.c:2020
+#: ../midori/main.c:2045 ../midori/main.c:2061
 #: ../midori/midori-websettings.c:326
 msgid "Midori"
 msgstr "Midori 浏览器"
@@ -153,7 +153,7 @@ msgstr "重置上次的会话(_S)"
 msgid "Disable all _extensions"
 msgstr "禁用所有扩展(_E)"
 
-#: ../midori/main.c:1388 ../midori/main.c:2432
+#: ../midori/main.c:1388 ../midori/main.c:2379
 #, c-format
 msgid "The session couldn't be loaded: %s\n"
 msgstr "无法载入会话: %s\n"
@@ -171,140 +171,140 @@ msgstr "发生了一个未知的错误。"
 msgid "Snapshot saved to: %s\n"
 msgstr "截图保存至: %s\n"
 
-#: ../midori/main.c:1958
+#: ../midori/main.c:1905
 msgid "Run ADDRESS as a web application"
 msgstr "将 ADDRESS 作为网络程序运行"
 
-#: ../midori/main.c:1958
+#: ../midori/main.c:1905
 msgid "ADDRESS"
 msgstr "ADDRESS"
 
-#: ../midori/main.c:1961
+#: ../midori/main.c:1908
 msgid "Use FOLDER as configuration folder"
 msgstr "使用 FOLDER 作为配置文件夹"
 
-#: ../midori/main.c:1961
+#: ../midori/main.c:1908
 msgid "FOLDER"
 msgstr "FOLDER"
 
-#: ../midori/main.c:1964
+#: ../midori/main.c:1911
 msgid "Private browsing, no changes are saved"
 msgstr "隐私浏览方式，未保存任何更改"
 
-#: ../midori/main.c:1966
+#: ../midori/main.c:1913
 msgid "Show a diagnostic dialog"
 msgstr "显示诊断对话框"
 
-#: ../midori/main.c:1968
+#: ../midori/main.c:1915
 msgid "Run the specified filename as javascript"
 msgstr "将指定的文件当作 javascript 执行"
 
-#: ../midori/main.c:1971
+#: ../midori/main.c:1918
 msgid "Take a snapshot of the specified URI"
 msgstr "对指定 URI 截图"
 
-#: ../midori/main.c:1974
+#: ../midori/main.c:1921
 msgid "Execute the specified command"
 msgstr "执行指定命令"
 
-#: ../midori/main.c:1976
+#: ../midori/main.c:1923
 msgid "List available commands to execute with -e/ --execute"
 msgstr "列出可以使用 -e/ --execute 运行的命令"
 
-#: ../midori/main.c:1978
+#: ../midori/main.c:1925
 msgid "Display program version"
 msgstr "显示程序版本"
 
-#: ../midori/main.c:1980
+#: ../midori/main.c:1927
 msgid "Addresses"
 msgstr "地址"
 
-#: ../midori/main.c:1982
+#: ../midori/main.c:1929
 msgid "Block URIs according to regular expression PATTERN"
 msgstr "按正则表达式 PATTERN 屏蔽 URI"
 
-#: ../midori/main.c:1982
+#: ../midori/main.c:1929
 msgid "PATTERN"
 msgstr "PATTERN"
 
 #. i18n: CLI: Close tabs, clear private data, open starting page
-#: ../midori/main.c:1986
+#: ../midori/main.c:1933
 msgid "Reset Midori after SECONDS seconds of inactivity"
 msgstr "在 SECONDS 秒后无响应则重置 Midori 浏览器"
 
-#: ../midori/main.c:1986
+#: ../midori/main.c:1933
 msgid "SECONDS"
 msgstr "SECONDS"
 
-#: ../midori/main.c:2070
+#: ../midori/main.c:2017
 msgid "[Addresses]"
 msgstr "[地址]"
 
-#: ../midori/main.c:2084
+#: ../midori/main.c:2031
 msgid "The specified configuration folder is invalid."
 msgstr "指定的配置文件夹无效。"
 
-#: ../midori/main.c:2091
+#: ../midori/main.c:2038
 msgid "Midori (Private Browsing)"
 msgstr "Midori 浏览器(隐私浏览方式)"
 
-#: ../midori/main.c:2115
+#: ../midori/main.c:2062
 msgid "Please report comments, suggestions and bugs to:"
 msgstr "请将意见、建议和错误反馈到:"
 
-#: ../midori/main.c:2117
+#: ../midori/main.c:2064
 msgid "Check for new versions at:"
 msgstr "在此查找新的版本:"
 
-#: ../midori/main.c:2181
+#: ../midori/main.c:2128
 msgid "Website icons"
 msgstr "网站图标"
 
-#: ../midori/main.c:2183
+#: ../midori/main.c:2130
 msgid "Cookies"
 msgstr "Cookie"
 
-#: ../midori/main.c:2186
+#: ../midori/main.c:2133
 msgid "'Flash' Cookies"
 msgstr "'Flash' Cookie"
 
-#: ../midori/main.c:2190
+#: ../midori/main.c:2137
 msgid "HTML5 _Databases"
 msgstr "HTML5 数据库(_D)"
 
-#: ../midori/main.c:2194 ../midori/midori-websettings.c:1058
+#: ../midori/main.c:2141 ../midori/midori-websettings.c:1058
 #: ../extensions/web-cache.c:478 ../extensions/web-cache.c:487
 msgid "Web Cache"
 msgstr "网页缓存"
 
-#: ../midori/main.c:2198
+#: ../midori/main.c:2145
 msgid "Offline Application Cache"
 msgstr "离线程序缓存"
 
-#: ../midori/main.c:2361
+#: ../midori/main.c:2308
 msgid "An instance of Midori is already running but not responding.\n"
 msgstr "已经有一个 Midori 请求在运行，但是无法响应。\n"
 
-#: ../midori/main.c:2399
+#: ../midori/main.c:2346
 #, c-format
 msgid "Bookmarks couldn't be loaded: %s\n"
 msgstr "无法载人书签: %s\n"
 
-#: ../midori/main.c:2447
+#: ../midori/main.c:2394
 #, c-format
 msgid "The trash couldn't be loaded: %s\n"
 msgstr "无法载人回收站: %s\n"
 
-#: ../midori/main.c:2460
+#: ../midori/main.c:2407
 #, c-format
 msgid "The history couldn't be loaded: %s\n"
 msgstr "无法载人历史记录: %s\n"
 
-#: ../midori/main.c:2475
+#: ../midori/main.c:2422
 msgid "The following errors occured:"
 msgstr "发生了以下错误:"
 
-#: ../midori/main.c:2491
+#: ../midori/main.c:2438
 msgid "_Ignore"
 msgstr "忽略(_I)"
 
@@ -364,11 +364,11 @@ msgstr "编辑书签"
 msgid "_Title:"
 msgstr "标题(_T):"
 
-#: ../midori/midori-browser.c:784 ../midori/midori-searchaction.c:951
+#: ../midori/midori-browser.c:784 ../midori/midori-searchaction.c:953
 msgid "_Description:"
 msgstr "描述(_D):"
 
-#: ../midori/midori-browser.c:803 ../midori/midori-searchaction.c:965
+#: ../midori/midori-browser.c:803 ../midori/midori-searchaction.c:967
 #: ../extensions/feed-panel/main.c:377
 msgid "_Address:"
 msgstr "地址(_A):"
@@ -459,7 +459,7 @@ msgstr "新订阅"
 msgid "Add a new bookmark"
 msgstr "添加新书签"
 
-#: ../midori/midori-browser.c:2963 ../midori/midori-searchaction.c:486
+#: ../midori/midori-browser.c:2963 ../midori/midori-searchaction.c:488
 msgid "Empty"
 msgstr "清空"
 
@@ -485,7 +485,7 @@ msgid "Open in New _Tab"
 msgstr "在新标签中打开(_T)"
 
 #: ../midori/midori-browser.c:4027 ../midori/midori-view.c:2726
-#: ../midori/midori-view.c:4667 ../panels/midori-bookmarks.c:778
+#: ../midori/midori-view.c:4693 ../panels/midori-bookmarks.c:778
 #: ../panels/midori-history.c:748 ../extensions/feed-panel/feed-panel.c:535
 msgid "Open in New _Window"
 msgstr "在新窗口中打开(_W)"
@@ -779,8 +779,8 @@ msgid "View the source code of the page"
 msgstr "查看页面源码"
 
 #: ../midori/midori-browser.c:5147
-msgid "Se_ret Browsing"
-msgstr "隐私浏览"
+msgid "Ca_ret Browsing"
+msgstr "光标浏览"
 
 #: ../midori/midori-browser.c:5148
 msgid "Toggle text cursor navigation"
@@ -876,7 +876,7 @@ msgstr "添加一个新书签文件夹"
 msgid "_Export bookmarks"
 msgstr "导出书签(_E)"
 
-#: ../midori/midori-browser.c:5206 ../midori/midori-searchaction.c:495
+#: ../midori/midori-browser.c:5206 ../midori/midori-searchaction.c:497
 msgid "_Manage Search Engines"
 msgstr "管理搜索引擎(_M)"
 
@@ -1787,8 +1787,8 @@ msgstr "%s 要获得您的地址。"
 #. so reloading via Javascript works but not via API calls.
 #. Error pages are special, we want to try loading the destination
 #. again, not the error page which isn't even a proper page
-#: ../midori/midori-view.c:1512 ../midori/midori-view.c:5130
-#: ../midori/midori-view.c:5134
+#: ../midori/midori-view.c:1512 ../midori/midori-view.c:5156
+#: ../midori/midori-view.c:5160
 #, c-format
 msgid "Error - %s"
 msgstr "错误 - %s"
@@ -1910,109 +1910,109 @@ msgstr "打开 %s"
 msgid "Inspect page - %s"
 msgstr "检查页面 - %s"
 
-#: ../midori/midori-view.c:4099
+#: ../midori/midori-view.c:4125
 msgid "Speed Dial"
 msgstr "快速拨号"
 
-#: ../midori/midori-view.c:4100
+#: ../midori/midori-view.c:4126
 msgid "Click to add a shortcut"
 msgstr "点击添加快捷方式"
 
-#: ../midori/midori-view.c:4101
+#: ../midori/midori-view.c:4127
 msgid "Enter shortcut address"
 msgstr "输入快捷方式地址"
 
-#: ../midori/midori-view.c:4102
+#: ../midori/midori-view.c:4128
 msgid "Enter shortcut title"
 msgstr "输入快捷方式标题"
 
-#: ../midori/midori-view.c:4103
+#: ../midori/midori-view.c:4129
 msgid "Are you sure you want to delete this shortcut?"
 msgstr "确实要删除此快捷方式吗？"
 
-#: ../midori/midori-view.c:4104
+#: ../midori/midori-view.c:4130
 msgid "Set number of columns and rows"
 msgstr "设置列数和行数"
 
-#: ../midori/midori-view.c:4105
+#: ../midori/midori-view.c:4131
 msgid "Enter number of columns and rows:"
 msgstr "输入列数和行数:"
 
-#: ../midori/midori-view.c:4106
+#: ../midori/midori-view.c:4132
 msgid "Invalid input for the size of the speed dial"
 msgstr "输入的快速拨号大小无效"
 
-#: ../midori/midori-view.c:4107
+#: ../midori/midori-view.c:4133
 msgid "Thumb size:"
 msgstr "缩略图大小:"
 
-#: ../midori/midori-view.c:4108
+#: ../midori/midori-view.c:4134
 msgid "Small"
 msgstr "小"
 
-#: ../midori/midori-view.c:4109
+#: ../midori/midori-view.c:4135
 msgid "Medium"
 msgstr "中"
 
-#: ../midori/midori-view.c:4110
+#: ../midori/midori-view.c:4136
 msgid "Big"
 msgstr "大"
 
-#: ../midori/midori-view.c:4146
+#: ../midori/midori-view.c:4172
 #, c-format
 msgid "Document cannot be displayed"
 msgstr "文档无法显示"
 
-#: ../midori/midori-view.c:4169
+#: ../midori/midori-view.c:4195
 #, c-format
 msgid "No documentation installed"
 msgstr "文档没有安装"
 
-#: ../midori/midori-view.c:4238
+#: ../midori/midori-view.c:4264
 msgid "Version numbers in brackets show the version used at runtime."
 msgstr "在括号中的版本号显示运行时环境的版本。"
 
-#: ../midori/midori-view.c:4288
+#: ../midori/midori-view.c:4314
 msgid "Page loading delayed"
 msgstr "页面载入发生延迟"
 
-#: ../midori/midori-view.c:4289
+#: ../midori/midori-view.c:4315
 msgid "Loading delayed either due to a recent crash or startup preferences."
 msgstr "由于最近的程序崩溃或由于首选项设定，载人页面发生延迟"
 
-#: ../midori/midori-view.c:4290
+#: ../midori/midori-view.c:4316
 msgid "Load Page"
 msgstr "载入页面"
 
-#: ../midori/midori-view.c:4431
+#: ../midori/midori-view.c:4457
 msgid "Blank page"
 msgstr "空白页"
 
-#: ../midori/midori-view.c:4671
+#: ../midori/midori-view.c:4697
 msgid "_Duplicate Tab"
 msgstr "复制标签(_D)"
 
-#: ../midori/midori-view.c:4676
+#: ../midori/midori-view.c:4702
 msgid "Show Tab _Label"
 msgstr "显示标签名称(_L)"
 
-#: ../midori/midori-view.c:4676
+#: ../midori/midori-view.c:4702
 msgid "Show Tab _Icon Only"
 msgstr "仅显示标签图标(_I)"
 
-#: ../midori/midori-view.c:4682
+#: ../midori/midori-view.c:4708
 msgid "Close ot_her Tabs"
 msgstr "关闭其它标签(_H)"
 
-#: ../midori/midori-view.c:5317
+#: ../midori/midori-view.c:5343
 msgid "Print background images"
 msgstr "打印背景图片"
 
-#: ../midori/midori-view.c:5318
+#: ../midori/midori-view.c:5344
 msgid "Whether background images should be printed"
 msgstr "是否显示页面的背景图片"
 
-#: ../midori/midori-view.c:5354
+#: ../midori/midori-view.c:5380
 msgid "Features"
 msgstr "功能"
 
@@ -2105,31 +2105,31 @@ msgstr "主机名"
 msgid "MB"
 msgstr "MB"
 
-#: ../midori/midori-searchaction.c:906
+#: ../midori/midori-searchaction.c:908
 msgid "Add search engine"
 msgstr "添加搜索引擎"
 
-#: ../midori/midori-searchaction.c:906
+#: ../midori/midori-searchaction.c:908
 msgid "Edit search engine"
 msgstr "编辑搜索引擎"
 
-#: ../midori/midori-searchaction.c:935
+#: ../midori/midori-searchaction.c:937
 msgid "_Name:"
 msgstr "名称(_N):"
 
-#: ../midori/midori-searchaction.c:979
+#: ../midori/midori-searchaction.c:981
 msgid "_Icon:"
 msgstr "图标(_I):"
 
-#: ../midori/midori-searchaction.c:993
+#: ../midori/midori-searchaction.c:995
 msgid "_Token:"
 msgstr "标记(_T):"
 
-#: ../midori/midori-searchaction.c:1293
+#: ../midori/midori-searchaction.c:1295
 msgid "Manage Search Engines"
 msgstr "管理搜索引擎"
 
-#: ../midori/midori-searchaction.c:1393
+#: ../midori/midori-searchaction.c:1395
 msgid "Use as _default"
 msgstr "作为默认(_D)"
 
@@ -2724,8 +2724,8 @@ msgid "Feed Panel"
 msgstr "订阅面板"
 
 #: ../extensions/feed-panel/main.c:519
-msgid "Read Atom/RSS feeds"
-msgstr "阅读 Atom 及 RSS 订阅"
+msgid "Read Atom/ RSS feeds"
+msgstr "阅读 Atom/ RSS 订阅"
 
 #: ../extensions/formhistory.c:146
 #, c-format
@@ -2763,27 +2763,27 @@ msgstr "表单历史(_F)"
 msgid "There are no unvisited tabs"
 msgstr "没有未浏览的标签"
 
-#: ../extensions/history-list.vala:244
+#: ../extensions/history-list.vala:249
 msgid "Next new Tab (History List)"
 msgstr "下一个新标签 (历史列表)"
 
-#: ../extensions/history-list.vala:245
+#: ../extensions/history-list.vala:250
 msgid "Next new tab from history"
 msgstr "历史中的下一个新标签"
 
-#: ../extensions/history-list.vala:254
+#: ../extensions/history-list.vala:259
 msgid "Previous new Tab (History List)"
 msgstr "上一个新标签 (历史列表)"
 
-#: ../extensions/history-list.vala:255
+#: ../extensions/history-list.vala:260
 msgid "Previous new tab from history"
 msgstr "历史中的先前的新标签"
 
-#: ../extensions/history-list.vala:354
+#: ../extensions/history-list.vala:359
 msgid "History List"
 msgstr "历史列表"
 
-#: ../extensions/history-list.vala:355
+#: ../extensions/history-list.vala:360
 msgid "Switch tabs with Ctrl+Tab sorted by last usage"
 msgstr "按上次用法用 Ctrl+Tab 切换标签"