diff --git a/po/zh_CN.po b/po/zh_CN.po
index 2c17b106..51177d3f 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: midori 0.1.7\n"
+"Project-Id-Version: midori 0.1.9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-19 09:03+0800\n"
-"PO-Revision-Date: 2009-06-19 09:12+0800\n"
+"POT-Creation-Date: 2009-08-03 09:37+0800\n"
+"PO-Revision-Date: 2009-08-03 10:10+0800\n"
 "Last-Translator: Stanley Zhang <yatzhang@gmail.com>\n"
 "Language-Team: Simplified Chinese <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -21,11 +21,11 @@ msgid "Lightweight web browser"
 msgstr "轻量的 Web 浏览器"
 
 #: ../data/midori.desktop.in.h:2
-#: ../midori/main.c:1339
-#: ../midori/main.c:1480
-#: ../midori/main.c:1488
-#: ../midori/main.c:1499
-#: ../midori/midori-websettings.c:285
+#: ../midori/main.c:1343
+#: ../midori/main.c:1517
+#: ../midori/main.c:1525
+#: ../midori/main.c:1536
+#: ../midori/midori-websettings.c:287
 msgid "Midori"
 msgstr "Midori"
 
@@ -127,1343 +127,1405 @@ msgstr "重置最后的会话(_s)"
 msgid "Disable all _extensions"
 msgstr "关闭所有的扩展(_e)"
 
-#: ../midori/main.c:1339
+#: ../midori/main.c:1343
 msgid "No filename specified"
 msgstr "没有指定文件名"
 
-#: ../midori/main.c:1362
+#: ../midori/main.c:1366
 msgid "An unknown error occured."
 msgstr "发生了一个未知的错误."
 
-#: ../midori/main.c:1395
+#: ../midori/main.c:1398
 #, c-format
 msgid "Snapshot saved to: %s\n"
 msgstr "截图保存到: %s\n"
 
-#: ../midori/main.c:1417
+#: ../midori/main.c:1447
 msgid "Run ADDRESS as a web application"
 msgstr "将 ADDRESS 作为 Web 应用程序运行"
 
-#: ../midori/main.c:1417
+#: ../midori/main.c:1447
 msgid "ADDRESS"
 msgstr "ADDRESS"
 
-#: ../midori/main.c:1419
+#: ../midori/main.c:1449
 msgid "Use FOLDER as configuration folder"
 msgstr "使用 FOLDER 作为设置目录"
 
-#: ../midori/main.c:1419
+#: ../midori/main.c:1449
 msgid "FOLDER"
 msgstr "FOLDER"
 
-#: ../midori/main.c:1422
+#: ../midori/main.c:1451
 msgid "Run the specified filename as javascript"
 msgstr "将指定的文件当作 Javascript 执行"
 
-#: ../midori/main.c:1426
+#: ../midori/main.c:1454
 msgid "Take a snapshot of the specified URI"
 msgstr "对指定 URI 截图"
 
-#: ../midori/main.c:1429
+#: ../midori/main.c:1457
 msgid "Execute the specified command"
 msgstr "执行特定命令"
 
-#: ../midori/main.c:1431
+#: ../midori/main.c:1459
 msgid "Display program version"
 msgstr "显示程序版本"
 
-#: ../midori/main.c:1433
+#: ../midori/main.c:1461
 msgid "Addresses"
 msgstr "地址"
 
-#: ../midori/main.c:1477
+#: ../midori/main.c:1514
 msgid "[Addresses]"
 msgstr "[地址]"
 
-#: ../midori/main.c:1500
+#: ../midori/main.c:1537
 msgid "Please report comments, suggestions and bugs to:"
 msgstr "请将意见、建议和问题反馈到:"
 
-#: ../midori/main.c:1502
+#: ../midori/main.c:1539
 msgid "Check for new versions at:"
 msgstr "在此检查新版本:"
 
-#: ../midori/main.c:1581
+#: ../midori/main.c:1619
 msgid "The specified configuration folder is invalid."
 msgstr "无效的配置文件目录. "
 
-#: ../midori/main.c:1617
+#: ../midori/main.c:1655
 msgid "An instance of Midori is already running but not responding.\n"
 msgstr "已经有一个 Midori 在运行, 但没有响应.\n"
 
-#: ../midori/main.c:1667
+#: ../midori/main.c:1715
 #, c-format
 msgid "The search engines couldn't be loaded. %s\n"
 msgstr "搜索引擎无法加载. %s\n"
 
-#: ../midori/main.c:1679
+#: ../midori/main.c:1727
 #, c-format
 msgid "The bookmarks couldn't be loaded: %s\n"
 msgstr "书签无法加载: %s\n"
 
-#: ../midori/main.c:1694
+#: ../midori/main.c:1742
 #, c-format
 msgid "The session couldn't be loaded: %s\n"
 msgstr "会话无法加载: %s\n"
 
-#: ../midori/main.c:1707
+#: ../midori/main.c:1755
 #, c-format
 msgid "The trash couldn't be loaded: %s\n"
 msgstr "垃圾箱无法加载: %s\n"
 
-#: ../midori/main.c:1720
+#: ../midori/main.c:1768
 #, c-format
 msgid "The history couldn't be loaded: %s\n"
 msgstr "历史记录无法加载: %s\n"
 
-#: ../midori/main.c:1732
+#: ../midori/main.c:1780
 msgid "The following errors occured:"
 msgstr "发生以下错误:"
 
-#: ../midori/main.c:1748
+#: ../midori/main.c:1796
 msgid "_Ignore"
 msgstr "忽略(_I)"
 
-#: ../midori/midori-array.c:195
+#: ../midori/midori-array.c:250
 msgid "File not found."
 msgstr "没有找到文件."
 
-#: ../midori/midori-array.c:203
-#: ../midori/midori-array.c:212
+#: ../midori/midori-array.c:258
+#: ../midori/midori-array.c:267
 msgid "Malformed document."
 msgstr "异常的文件."
 
-#: ../midori/midori-array.c:338
-#: ../midori/sokoke.c:700
+#: ../midori/midori-array.c:429
+#: ../midori/sokoke.c:694
 #, c-format
 msgid "Writing failed."
 msgstr "写失败."
 
-#: ../midori/midori-browser.c:296
-#: ../midori/midori-browser.c:4021
-#: ../midori/midori-browser.c:4027
+#: ../midori/midori-browser.c:307
+#: ../midori/midori-browser.c:4260
+#: ../midori/midori-browser.c:4266
 msgid "Reload the current page"
 msgstr "重新载入当前页"
 
-#: ../midori/midori-browser.c:307
-#: ../midori/midori-browser.c:4024
+#: ../midori/midori-browser.c:318
+#: ../midori/midori-browser.c:4263
 msgid "Stop loading the current page"
 msgstr "停止载入当前页"
 
-#: ../midori/midori-browser.c:368
+#: ../midori/midori-browser.c:409
 #, c-format
 msgid "%d%% loaded"
 msgstr "%d%% 已加载"
 
-#: ../midori/midori-browser.c:393
+#: ../midori/midori-browser.c:434
 #, c-format
 msgid "Unexpected action '%s'."
 msgstr "意外的活动 '%s'."
 
-#: ../midori/midori-browser.c:575
+#: ../midori/midori-browser.c:616
 msgid "New folder"
 msgstr "新建目录"
 
-#: ../midori/midori-browser.c:575
+#: ../midori/midori-browser.c:616
 msgid "Edit folder"
 msgstr "编辑目录"
 
-#: ../midori/midori-browser.c:577
+#: ../midori/midori-browser.c:618
 msgid "New bookmark"
 msgstr "新建书签"
 
-#: ../midori/midori-browser.c:577
+#: ../midori/midori-browser.c:618
 msgid "Edit bookmark"
 msgstr "编辑书签"
 
-#: ../midori/midori-browser.c:607
+#: ../midori/midori-browser.c:648
 msgid "_Title:"
 msgstr "标题(_T): "
 
-#: ../midori/midori-browser.c:620
-#: ../midori/midori-searchaction.c:948
+#: ../midori/midori-browser.c:661
+#: ../midori/midori-searchaction.c:952
 msgid "_Description:"
 msgstr "描述(_D):"
 
-#: ../midori/midori-browser.c:639
-#: ../midori/midori-searchaction.c:962
+#: ../midori/midori-browser.c:680
+#: ../midori/midori-searchaction.c:966
 #: ../extensions/feed-panel/main.c:343
 msgid "_Address:"
 msgstr "地址(_A):"
 
-#: ../midori/midori-browser.c:658
+#: ../midori/midori-browser.c:699
 msgid "_Folder:"
 msgstr "目录(_F):"
 
-#: ../midori/midori-browser.c:663
 #: ../midori/midori-browser.c:704
+#: ../midori/midori-browser.c:745
 msgid "Toplevel folder"
 msgstr "最上层目录"
 
-#: ../midori/midori-browser.c:780
+#: ../midori/midori-browser.c:821
 msgid "Save file as"
 msgstr "文件另存为"
 
-#: ../midori/midori-browser.c:1127
+#: ../midori/midori-browser.c:1203
 #, c-format
-msgid "The file <b>%s</b> has been downloaded."
-msgstr "文件 <b>%s</b> 已下载."
+msgid "The file '<b>%s</b>' has been downloaded."
+msgstr "文件 '<b>%s</b>' 已下载."
 
-#: ../midori/midori-browser.c:1131
+#: ../midori/midori-browser.c:1207
 msgid "Transfer completed"
 msgstr "下载完成"
 
-#: ../midori/midori-browser.c:1272
+#: ../midori/midori-browser.c:1348
 msgid "Save file"
 msgstr "保存文件"
 
-#: ../midori/midori-browser.c:1899
+#: ../midori/midori-browser.c:2015
 msgid "Open file"
 msgstr "打开文件"
 
-#: ../midori/midori-browser.c:3290
+#: ../midori/midori-browser.c:3461
 #: ../panels/midori-bookmarks.c:781
 #: ../panels/midori-history.c:812
 msgid "Open all in _Tabs"
 msgstr "在新标签页中打开所有项(_T)"
 
-#: ../midori/midori-browser.c:3297
+#: ../midori/midori-browser.c:3468
 #: ../panels/midori-bookmarks.c:787
 #: ../panels/midori-history.c:818
 #: ../extensions/feed-panel/feed-panel.c:542
 msgid "Open in New _Tab"
 msgstr "在新标签页中打开(_T)"
 
-#: ../midori/midori-browser.c:3300
+#: ../midori/midori-browser.c:3471
 #: ../panels/midori-bookmarks.c:789
 #: ../panels/midori-history.c:820
 #: ../extensions/feed-panel/feed-panel.c:544
 msgid "Open in New _Window"
 msgstr "在新窗口中打开(_W)"
 
-#: ../midori/midori-browser.c:3600
+#: ../midori/midori-browser.c:3781
 msgid "Clear Private Data"
 msgstr "清除隐私数据"
 
-#: ../midori/midori-browser.c:3604
+#: ../midori/midori-browser.c:3785
 msgid "_Clear private data"
 msgstr "清除隐私数据(_C)"
 
-#: ../midori/midori-browser.c:3617
+#: ../midori/midori-browser.c:3798
 msgid "Clear the following data:"
 msgstr "清除以下的数据:"
 
-#: ../midori/midori-browser.c:3627
-#: ../midori/midori-preferences.c:675
+#: ../midori/midori-browser.c:3808
+#: ../midori/midori-preferences.c:671
 #: ../panels/midori-history.c:108
 msgid "History"
 msgstr "历史"
 
-#: ../midori/midori-browser.c:3632
+#: ../midori/midori-browser.c:3813
 msgid "Cookies"
 msgstr "Cookies"
 
-#: ../midori/midori-browser.c:3637
+#: ../midori/midori-browser.c:3818
 msgid "'Flash' Cookies"
 msgstr "由 Flash 建立的 Cookies"
 
-#: ../midori/midori-browser.c:3642
+#: ../midori/midori-browser.c:3823
 msgid "Website icons"
 msgstr "网站图标"
 
-#: ../midori/midori-browser.c:3647
-#: ../midori/sokoke.c:867
-msgid "_Closed Tabs and Windows"
-msgstr "关闭的标签页和窗口(_C)"
+#: ../midori/midori-browser.c:3828
+#: ../midori/sokoke.c:868
+msgid "_Closed Tabs"
+msgstr "关闭的标签页(_C)"
 
-#: ../midori/midori-browser.c:3730
+#: ../midori/midori-browser.c:3836
+msgid "Clear private data when _quitting Midori"
+msgstr "退出 Midori 前清除隐私数据"
+
+#: ../midori/midori-browser.c:3920
 msgid "A lightweight web browser."
 msgstr "轻量级的 Web 浏览器."
 
-#: ../midori/midori-browser.c:3738
+#: ../midori/midori-browser.c:3928
 msgid "translator-credits"
 msgstr "张翼 <yatzhang@gmail.com>"
 
-#: ../midori/midori-browser.c:3955
+#: ../midori/midori-browser.c:4194
 msgid "_File"
 msgstr "文件(_F)"
 
-#: ../midori/midori-browser.c:3958
+#: ../midori/midori-browser.c:4196
+#: ../midori/sokoke.c:869
+msgid "New _Window"
+msgstr "新建窗口(_W)"
+
+#: ../midori/midori-browser.c:4197
 msgid "Open a new window"
 msgstr "新建窗口"
 
-#: ../midori/midori-browser.c:3961
+#: ../midori/midori-browser.c:4200
 msgid "Open a new tab"
 msgstr "新建标签页"
 
-#: ../midori/midori-browser.c:3964
+#: ../midori/midori-browser.c:4203
 msgid "Open a file"
 msgstr "打开文件"
 
-#: ../midori/midori-browser.c:3967
+#: ../midori/midori-browser.c:4206
 msgid "Save to a file"
 msgstr "保存到文件"
 
-#: ../midori/midori-browser.c:3969
-#: ../midori/midori-view.c:1340
+#: ../midori/midori-browser.c:4208
 msgid "Add to Speed _dial"
 msgstr "添加到快速拨号(_d)"
 
-#: ../midori/midori-browser.c:3970
+#: ../midori/midori-browser.c:4209
 msgid "Add shortcut to speed dial"
 msgstr "添加快捷方式到快速拨号"
 
-#: ../midori/midori-browser.c:3972
+#: ../midori/midori-browser.c:4211
 msgid "_Close Tab"
 msgstr "关闭标签页(_C)"
 
-#: ../midori/midori-browser.c:3973
+#: ../midori/midori-browser.c:4212
 msgid "Close the current tab"
 msgstr "关闭当前标签页"
 
-#: ../midori/midori-browser.c:3975
+#: ../midori/midori-browser.c:4214
 msgid "C_lose Window"
 msgstr "关闭窗口(_l)"
 
-#: ../midori/midori-browser.c:3976
+#: ../midori/midori-browser.c:4215
 msgid "Close this window"
 msgstr "关闭此窗口"
 
-#: ../midori/midori-browser.c:3979
+#: ../midori/midori-browser.c:4218
 msgid "Print the current page"
 msgstr "打印当前页"
 
-#: ../midori/midori-browser.c:3982
+#: ../midori/midori-browser.c:4221
 msgid "Quit the application"
 msgstr "退出程序"
 
-#: ../midori/midori-browser.c:3984
+#: ../midori/midori-browser.c:4223
 msgid "_Edit"
 msgstr "编辑(_E)"
 
-#: ../midori/midori-browser.c:3987
+#: ../midori/midori-browser.c:4226
 msgid "Cut the selected text"
 msgstr "剪切选中的文本"
 
-#: ../midori/midori-browser.c:3990
-#: ../midori/midori-browser.c:3993
+#: ../midori/midori-browser.c:4229
+#: ../midori/midori-browser.c:4232
 msgid "Copy the selected text"
 msgstr "复制选中的文本"
 
-#: ../midori/midori-browser.c:3996
+#: ../midori/midori-browser.c:4235
 msgid "Paste text from the clipboard"
 msgstr "从剪贴板粘帖文本"
 
-#: ../midori/midori-browser.c:3999
+#: ../midori/midori-browser.c:4238
 msgid "Delete the selected text"
 msgstr "删除选中的文本"
 
-#: ../midori/midori-browser.c:4002
+#: ../midori/midori-browser.c:4241
 msgid "Select all text"
 msgstr "选取所有文本"
 
-#: ../midori/midori-browser.c:4005
+#: ../midori/midori-browser.c:4244
 msgid "Find a word or phrase in the page"
 msgstr "在页面中查找词或短语"
 
-#: ../midori/midori-browser.c:4007
+#: ../midori/midori-browser.c:4246
 msgid "Find _Next"
 msgstr "查找下一个(_N)"
 
-#: ../midori/midori-browser.c:4008
+#: ../midori/midori-browser.c:4247
 msgid "Find the next occurrence of a word or phrase"
 msgstr "查找下一处"
 
-#: ../midori/midori-browser.c:4010
+#: ../midori/midori-browser.c:4249
 msgid "Find _Previous"
 msgstr "查找上一个(_P)"
 
-#: ../midori/midori-browser.c:4011
+#: ../midori/midori-browser.c:4250
 msgid "Find the previous occurrence of a word or phrase"
 msgstr "查找上一处"
 
-#: ../midori/midori-browser.c:4015
+#: ../midori/midori-browser.c:4254
 msgid "Configure the application preferences"
 msgstr "设置程序首选项"
 
-#: ../midori/midori-browser.c:4017
+#: ../midori/midori-browser.c:4256
 msgid "_View"
 msgstr "查看(_V)"
 
-#: ../midori/midori-browser.c:4018
+#: ../midori/midori-browser.c:4257
 msgid "_Toolbars"
 msgstr "工具栏(_T)"
 
-#: ../midori/midori-browser.c:4030
+#: ../midori/midori-browser.c:4269
 msgid "Increase the zoom level"
 msgstr "提高放大倍数"
 
-#: ../midori/midori-browser.c:4033
+#: ../midori/midori-browser.c:4272
 msgid "Decrease the zoom level"
 msgstr "缩小放大倍数"
 
-#: ../midori/midori-browser.c:4036
+#: ../midori/midori-browser.c:4275
 msgid "Reset the zoom level"
 msgstr "重置放大倍数"
 
-#: ../midori/midori-browser.c:4037
+#: ../midori/midori-browser.c:4276
 msgid "_Encoding"
 msgstr "编码(_E)"
 
-#: ../midori/midori-browser.c:4039
-msgid "_Automatic"
-msgstr "自动(_A)"
-
-#: ../midori/midori-browser.c:4042
-#: ../midori/midori-websettings.c:212
-msgid "Chinese (BIG5)"
-msgstr "繁体中文 (BIG5)"
-
-#. i18n: A double underscore "__" is used to prevent an unwanted mnemonic
-#: ../midori/midori-browser.c:4046
-msgid "Japanese (SHIFT__JIS)"
-msgstr "日语 (SHIFT__JIS)"
-
-#: ../midori/midori-browser.c:4049
-#: ../midori/midori-websettings.c:214
-msgid "Russian (KOI8-R)"
-msgstr "俄语 (KOI8-R)"
-
-#: ../midori/midori-browser.c:4052
-#: ../midori/midori-websettings.c:215
-msgid "Unicode (UTF-8)"
-msgstr "Unicode (UTF-8)"
-
-#: ../midori/midori-browser.c:4055
-#: ../midori/midori-websettings.c:216
-msgid "Western (ISO-8859-1)"
-msgstr "西方 (ISO-8859-1)"
-
-#: ../midori/midori-browser.c:4058
-#: ../midori/midori-websettings.c:217
-#: ../midori/midori-websettings.c:289
-msgid "Custom..."
-msgstr "定制 ..."
-
-#: ../midori/midori-browser.c:4061
-#: ../midori/midori-view.c:1359
+#: ../midori/midori-browser.c:4278
 msgid "View So_urce"
 msgstr "查看源码(_u)"
 
-#: ../midori/midori-browser.c:4062
+#: ../midori/midori-browser.c:4279
 msgid "View the source code of the page"
 msgstr "查看本页的源代码"
 
-#: ../midori/midori-browser.c:4064
+#: ../midori/midori-browser.c:4281
 msgid "View Selection Source"
 msgstr "查看选中部分的源代码"
 
-#: ../midori/midori-browser.c:4065
+#: ../midori/midori-browser.c:4282
 msgid "View the source code of the selection"
 msgstr "查看选中部分的源代码"
 
-#: ../midori/midori-browser.c:4069
+#: ../midori/midori-browser.c:4286
 msgid "Toggle fullscreen view"
 msgstr "全屏浏览"
 
-#: ../midori/midori-browser.c:4071
+#: ../midori/midori-browser.c:4288
 msgid "_Go"
 msgstr "位置(_G)"
 
-#: ../midori/midori-browser.c:4074
+#: ../midori/midori-browser.c:4291
 msgid "Go back to the previous page"
 msgstr "返回上一页"
 
-#: ../midori/midori-browser.c:4077
+#: ../midori/midori-browser.c:4294
 msgid "Go forward to the next page"
 msgstr "转到下一页"
 
-#: ../midori/midori-browser.c:4080
+#: ../midori/midori-browser.c:4297
 msgid "Go to your homepage"
 msgstr "回到主页"
 
-#: ../midori/midori-browser.c:4082
+#: ../midori/midori-browser.c:4299
 msgid "Empty Trash"
 msgstr "清空垃圾箱"
 
-#: ../midori/midori-browser.c:4083
+#: ../midori/midori-browser.c:4300
 msgid "Delete the contents of the trash"
 msgstr "删除垃圾箱中的内容"
 
-#: ../midori/midori-browser.c:4085
-#: ../midori/midori-view.c:1317
+#: ../midori/midori-browser.c:4302
 msgid "Undo _Close Tab"
 msgstr "撤销关闭标签页(_C)"
 
-#: ../midori/midori-browser.c:4086
+#: ../midori/midori-browser.c:4303
 msgid "Open the last closed tab"
 msgstr "打开最后关闭的标签页"
 
-#: ../midori/midori-browser.c:4090
+#: ../midori/midori-browser.c:4307
 #: ../panels/midori-bookmarks.c:231
 msgid "Add a new bookmark"
 msgstr "添加一个新书签"
 
-#: ../midori/midori-browser.c:4092
+#: ../midori/midori-browser.c:4309
 msgid "Add a new _folder"
 msgstr "添加新目录(_f)"
 
-#: ../midori/midori-browser.c:4093
+#: ../midori/midori-browser.c:4310
 msgid "Add a new bookmark folder"
 msgstr "添加一个新书签目录"
 
-#: ../midori/midori-browser.c:4094
-msgid "_Tools"
-msgstr "工具(_T)"
-
-#: ../midori/midori-browser.c:4096
-#: ../midori/midori-searchaction.c:493
+#: ../midori/midori-browser.c:4312
+#: ../midori/midori-searchaction.c:497
 msgid "_Manage Search Engines"
 msgstr "管理搜索引擎(_M)"
 
-#: ../midori/midori-browser.c:4097
+#: ../midori/midori-browser.c:4313
 msgid "Add, edit and remove search engines..."
 msgstr "添加, 编辑和移除搜索引擎"
 
-#: ../midori/midori-browser.c:4100
+#: ../midori/midori-browser.c:4316
 msgid "_Clear Private Data"
 msgstr "清除隐私数据(_C)"
 
-#: ../midori/midori-browser.c:4101
+#: ../midori/midori-browser.c:4317
 msgid "Clear private data..."
-msgstr "清除隐私数据 ..."
+msgstr "清除隐私数据"
 
-#: ../midori/midori-browser.c:4105
+#: ../midori/midori-browser.c:4321
 msgid "_Previous Tab"
 msgstr "上一个标签页(_P)"
 
-#: ../midori/midori-browser.c:4106
+#: ../midori/midori-browser.c:4322
 msgid "Switch to the previous tab"
 msgstr "转到上一个标签页"
 
-#: ../midori/midori-browser.c:4108
+#: ../midori/midori-browser.c:4324
 msgid "_Next Tab"
 msgstr "下一个标签页(_N)"
 
-#: ../midori/midori-browser.c:4109
+#: ../midori/midori-browser.c:4325
 msgid "Switch to the next tab"
 msgstr "转到上一个标签页"
 
-#: ../midori/midori-browser.c:4111
+#: ../midori/midori-browser.c:4327
 msgid "_Help"
 msgstr "帮助(_H)"
 
-#: ../midori/midori-browser.c:4113
+#: ../midori/midori-browser.c:4329
 msgid "_Contents"
 msgstr "内容(_C)"
 
-#: ../midori/midori-browser.c:4114
+#: ../midori/midori-browser.c:4330
 msgid "Show the documentation"
 msgstr "显示文档"
 
-#: ../midori/midori-browser.c:4116
+#: ../midori/midori-browser.c:4332
 msgid "_Frequent Questions"
 msgstr "常见问题(_F)"
 
-#: ../midori/midori-browser.c:4117
+#: ../midori/midori-browser.c:4333
 msgid "Show the Frequently Asked Questions"
 msgstr "显示常见问题"
 
-#: ../midori/midori-browser.c:4119
+#: ../midori/midori-browser.c:4335
 msgid "_Report a Bug"
 msgstr "反馈错误(_R)"
 
-#: ../midori/midori-browser.c:4120
+#: ../midori/midori-browser.c:4336
 msgid "Open Midori's bug tracker"
 msgstr "打开 Midori 的错误跟踪器"
 
-#: ../midori/midori-browser.c:4123
+#: ../midori/midori-browser.c:4339
 msgid "Show information about the program"
 msgstr "显示此程序的信息"
 
-#: ../midori/midori-browser.c:4130
+#: ../midori/midori-browser.c:4346
 msgid "P_rivate Browsing"
 msgstr "隐私浏览(_r)"
 
-#: ../midori/midori-browser.c:4131
+#: ../midori/midori-browser.c:4347
 msgid "Don't save any private data while browsing"
 msgstr "在浏览时不保存任何隐私数据"
 
-#: ../midori/midori-browser.c:4136
+#: ../midori/midori-browser.c:4352
 msgid "_Menubar"
 msgstr "菜单栏(_M)"
 
-#: ../midori/midori-browser.c:4137
+#: ../midori/midori-browser.c:4353
 msgid "Show menubar"
 msgstr "显示菜单栏"
 
-#: ../midori/midori-browser.c:4140
+#: ../midori/midori-browser.c:4356
 msgid "_Navigationbar"
 msgstr "导航栏(_N)"
 
-#: ../midori/midori-browser.c:4141
+#: ../midori/midori-browser.c:4357
 msgid "Show navigationbar"
 msgstr "显示导航栏"
 
-#: ../midori/midori-browser.c:4144
+#: ../midori/midori-browser.c:4360
 msgid "Side_panel"
 msgstr "侧边栏(_p)"
 
-#: ../midori/midori-browser.c:4145
+#: ../midori/midori-browser.c:4361
 msgid "Show sidepanel"
 msgstr "显示侧边栏"
 
-#: ../midori/midori-browser.c:4148
+#: ../midori/midori-browser.c:4364
 msgid "_Bookmarkbar"
 msgstr "书签栏(_B)"
 
-#: ../midori/midori-browser.c:4149
+#: ../midori/midori-browser.c:4365
 msgid "Show bookmarkbar"
 msgstr "显示书签栏"
 
-#: ../midori/midori-browser.c:4152
+#: ../midori/midori-browser.c:4368
 msgid "_Transferbar"
 msgstr "传输栏(_T)"
 
-#: ../midori/midori-browser.c:4153
+#: ../midori/midori-browser.c:4369
 msgid "Show transferbar"
 msgstr "显示传输栏"
 
-#: ../midori/midori-browser.c:4156
+#: ../midori/midori-browser.c:4372
 msgid "_Statusbar"
 msgstr "状态栏(_S)"
 
-#: ../midori/midori-browser.c:4157
+#: ../midori/midori-browser.c:4373
 msgid "Show statusbar"
 msgstr "显示状态栏"
 
-#: ../midori/midori-browser.c:4581
+#: ../midori/midori-browser.c:4380
+msgid "_Automatic"
+msgstr "自动(_A)"
+
+#: ../midori/midori-browser.c:4383
+#: ../midori/midori-websettings.c:214
+msgid "Chinese (BIG5)"
+msgstr "繁体中文 (BIG5)"
+
+#. i18n: A double underscore "__" is used to prevent an unwanted mnemonic
+#: ../midori/midori-browser.c:4387
+msgid "Japanese (SHIFT__JIS)"
+msgstr "日语 (SHIFT__JIS)"
+
+#: ../midori/midori-browser.c:4390
+#: ../midori/midori-websettings.c:216
+msgid "Russian (KOI8-R)"
+msgstr "俄语 (KOI8-R)"
+
+#: ../midori/midori-browser.c:4393
+#: ../midori/midori-websettings.c:217
+msgid "Unicode (UTF-8)"
+msgstr "Unicode (UTF-8)"
+
+#: ../midori/midori-browser.c:4396
+#: ../midori/midori-websettings.c:218
+msgid "Western (ISO-8859-1)"
+msgstr "西方 (ISO-8859-1)"
+
+#: ../midori/midori-browser.c:4399
+#: ../midori/midori-websettings.c:219
+#: ../midori/midori-websettings.c:291
+msgid "Custom..."
+msgstr "定制..."
+
+#: ../midori/midori-browser.c:4837
 msgid "_Separator"
 msgstr "分割符(_S)"
 
-#: ../midori/midori-browser.c:4588
+#: ../midori/midori-browser.c:4844
 msgid "_Location..."
 msgstr "位置(_L)"
 
-#: ../midori/midori-browser.c:4590
+#: ../midori/midori-browser.c:4846
 msgid "Open a particular location"
 msgstr "打开一个指定位置"
 
-#: ../midori/midori-browser.c:4614
+#: ../midori/midori-browser.c:4870
 msgid "_Web Search..."
 msgstr "搜索 Web(_W)"
 
-#: ../midori/midori-browser.c:4616
+#: ../midori/midori-browser.c:4872
 msgid "Run a web search"
 msgstr "执行 Web 搜索"
 
-#: ../midori/midori-browser.c:4637
+#: ../midori/midori-browser.c:4893
 msgid "Reopen a previously closed tab or window"
 msgstr "重新打开以前关闭的标签页或窗口"
 
-#: ../midori/midori-browser.c:4652
+#: ../midori/midori-browser.c:4908
 msgid "_Recently visited pages"
 msgstr "最近访问的页面(_R)"
 
-#: ../midori/midori-browser.c:4654
+#: ../midori/midori-browser.c:4910
 msgid "Reopen pages that you visited earlier"
 msgstr "重新打开以前访问过的页面"
 
-#: ../midori/midori-browser.c:4669
-#: ../midori/sokoke.c:856
+#: ../midori/midori-browser.c:4925
+#: ../midori/sokoke.c:857
 msgid "_Bookmarks"
 msgstr "书签(_B)"
 
-#: ../midori/midori-browser.c:4671
+#: ../midori/midori-browser.c:4927
 msgid "Show the saved bookmarks"
 msgstr "显示保存的书签"
 
-#: ../midori/midori-browser.c:4686
+#: ../midori/midori-browser.c:4942
+msgid "_Tools"
+msgstr "工具(_T)"
+
+#: ../midori/midori-browser.c:4954
 msgid "_Window"
 msgstr "窗口(_W)"
 
-#: ../midori/midori-browser.c:4688
+#: ../midori/midori-browser.c:4956
 msgid "Show a list of all open tabs"
 msgstr "显示所有标签页的列表"
 
+#: ../midori/midori-browser.c:4970
+msgid "_Menu"
+msgstr "菜单(_M)"
+
+#: ../midori/midori-browser.c:4972
+msgid "Menu"
+msgstr "菜单"
+
 #. i18n: A panel at the bottom, to search text in pages
-#: ../midori/midori-browser.c:4863
+#: ../midori/midori-browser.c:5158
 msgid "_Inline Find:"
 msgstr "查找(_I):"
 
-#: ../midori/midori-browser.c:4888
+#: ../midori/midori-browser.c:5183
 msgid "Previous"
 msgstr "上一个"
 
-#: ../midori/midori-browser.c:4893
+#: ../midori/midori-browser.c:5188
 msgid "Next"
 msgstr "下一个"
 
-#: ../midori/midori-browser.c:4898
+#: ../midori/midori-browser.c:5193
 msgid "Match Case"
 msgstr "区分大小写"
 
-#: ../midori/midori-browser.c:4906
+#: ../midori/midori-browser.c:5201
 msgid "Highlight Matches"
 msgstr "高亮显示匹配"
 
-#: ../midori/midori-browser.c:4916
+#: ../midori/midori-browser.c:5211
 msgid "Close Findbar"
 msgstr "关闭查找栏"
 
-#: ../midori/midori-browser.c:4951
+#: ../midori/midori-browser.c:5246
 #: ../extensions/cookie-manager/cookie-manager-page.c:109
 msgid "Delete All"
 msgstr "删除所有项目"
 
-#: ../midori/midori-browser.c:5265
+#: ../midori/midori-browser.c:5583
 #, c-format
 msgid "Unexpected setting '%s'"
 msgstr "意外的设置 '%s'"
 
-#: ../midori/midori-locationaction.c:915
+#: ../midori/midori-locationaction.c:901
 #, c-format
 msgid "Search with %s"
-msgstr "使用%s搜索"
+msgstr "用 %s 搜索"
 
-#: ../midori/midori-panel.c:333
+#: ../midori/midori-panel.c:382
+#: ../midori/midori-panel.c:384
 msgid "Detach chosen panel from the window"
 msgstr "从窗口中分离选择的面板"
 
-#: ../midori/midori-panel.c:343
-#: ../midori/midori-panel.c:508
+#: ../midori/midori-panel.c:394
+#: ../midori/midori-panel.c:396
+#: ../midori/midori-panel.c:577
+#: ../midori/midori-panel.c:580
 msgid "Align sidepanel to the right"
-msgstr "侧边栏放置到右侧"
+msgstr "侧边栏摆放到右侧"
 
-#: ../midori/midori-panel.c:353
-#: ../midori/midori-panel.c:354
+#: ../midori/midori-panel.c:406
+#: ../midori/midori-panel.c:407
 msgid "Close panel"
 msgstr "关闭侧边栏"
 
-#: ../midori/midori-panel.c:509
+#: ../midori/midori-panel.c:578
+#: ../midori/midori-panel.c:581
 msgid "Align sidepanel to the left"
-msgstr "侧边栏放置到左侧"
+msgstr "侧边栏摆放到左侧"
 
-#: ../midori/midori-websettings.c:195
-#: ../midori/midori-view.c:2262
-msgid "Blank page"
-msgstr "空白页面"
+#: ../midori/midori-panel.c:704
+msgid "Show panel _titles"
+msgstr "显示面板标题(_t)"
 
-#: ../midori/midori-websettings.c:196
-#: ../midori/midori-websettings.c:563
-msgid "Homepage"
-msgstr "主页"
+#: ../midori/midori-panel.c:712
+msgid "Show operating _controls"
+msgstr "显示操作控件(_c)"
+
+#: ../midori/midori-panel.c:783
+msgid "Options"
+msgstr "选项"
 
 #: ../midori/midori-websettings.c:197
-msgid "Last open pages"
-msgstr "最后打开页面"
+msgid "Show Blank page"
+msgstr "显示空白页面"
 
-#: ../midori/midori-websettings.c:213
+#: ../midori/midori-websettings.c:198
+msgid "Show Homepage"
+msgstr "显示主页"
+
+#: ../midori/midori-websettings.c:199
+msgid "Show last open tabs"
+msgstr "显示最后打开的标签页"
+
+#: ../midori/midori-websettings.c:215
 msgid "Japanese (SHIFT_JIS)"
 msgstr "日语 (SHIFT_JIS)"
 
-#: ../midori/midori-websettings.c:232
+#: ../midori/midori-websettings.c:234
 msgid "New tab"
 msgstr "新建标签页"
 
-#: ../midori/midori-websettings.c:233
+#: ../midori/midori-websettings.c:235
 msgid "New window"
 msgstr "新建窗口"
 
-#: ../midori/midori-websettings.c:234
+#: ../midori/midori-websettings.c:236
 msgid "Current tab"
 msgstr "当前标签页"
 
-#: ../midori/midori-websettings.c:249
+#: ../midori/midori-websettings.c:251
 msgid "Default"
 msgstr "缺省"
 
-#: ../midori/midori-websettings.c:250
+#: ../midori/midori-websettings.c:252
 msgid "Icons"
 msgstr "图标"
 
-#: ../midori/midori-websettings.c:251
+#: ../midori/midori-websettings.c:253
 msgid "Text"
 msgstr "文字"
 
-#: ../midori/midori-websettings.c:252
-msgid "Both"
-msgstr "图标及文字"
+#: ../midori/midori-websettings.c:254
+msgid "Icons and text"
+msgstr "图标和文字"
 
-#: ../midori/midori-websettings.c:253
-msgid "Both horizontal"
-msgstr "水平摆放的图标和文字"
+#: ../midori/midori-websettings.c:255
+msgid "Text beside icons"
+msgstr "文字在图标旁"
 
-#: ../midori/midori-websettings.c:268
+#: ../midori/midori-websettings.c:270
 msgid "All cookies"
 msgstr "所有 Cookies"
 
-#: ../midori/midori-websettings.c:269
+#: ../midori/midori-websettings.c:271
 msgid "Session cookies"
 msgstr "会话 Cookies"
 
-#: ../midori/midori-websettings.c:270
+#: ../midori/midori-websettings.c:272
 #: ../panels/midori-addons.c:94
+#: ../extensions/shortcuts.c:93
 msgid "None"
 msgstr "无"
 
-#: ../midori/midori-websettings.c:286
+#: ../midori/midori-websettings.c:288
 msgid "Safari"
 msgstr "Safari"
 
-#: ../midori/midori-websettings.c:287
+#: ../midori/midori-websettings.c:289
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../midori/midori-websettings.c:288
+#: ../midori/midori-websettings.c:290
 msgid "Internet Explorer"
 msgstr "Internet Explorer"
 
-#: ../midori/midori-websettings.c:341
+#: ../midori/midori-websettings.c:343
 msgid "Remember last window size"
 msgstr "记住上次窗口的大小"
 
-#: ../midori/midori-websettings.c:342
+#: ../midori/midori-websettings.c:344
 msgid "Whether to save the last window size"
 msgstr "是否保存上次窗口的大小"
 
-#: ../midori/midori-websettings.c:350
+#: ../midori/midori-websettings.c:352
 msgid "Last window width"
 msgstr "上次窗口的宽度"
 
-#: ../midori/midori-websettings.c:351
+#: ../midori/midori-websettings.c:353
 msgid "The last saved window width"
 msgstr "上次保存的窗口宽度"
 
-#: ../midori/midori-websettings.c:359
+#: ../midori/midori-websettings.c:361
 msgid "Last window height"
 msgstr "上次窗口的高度"
 
-#: ../midori/midori-websettings.c:360
+#: ../midori/midori-websettings.c:362
 msgid "The last saved window height"
 msgstr "上次保存的窗口高度"
 
-#: ../midori/midori-websettings.c:385
+#: ../midori/midori-websettings.c:387
 msgid "Last panel position"
 msgstr "上次的侧边栏位置"
 
-#: ../midori/midori-websettings.c:386
+#: ../midori/midori-websettings.c:388
 msgid "The last saved panel position"
 msgstr "上次保存的侧边栏位置"
 
 #. i18n: The internal index of the last opened panel
-#: ../midori/midori-websettings.c:395
+#: ../midori/midori-websettings.c:397
 msgid "Last panel page"
 msgstr "上次的侧边栏页"
 
-#: ../midori/midori-websettings.c:396
+#: ../midori/midori-websettings.c:398
 msgid "The last saved panel page"
 msgstr "上次保存的侧边栏页"
 
-#: ../midori/midori-websettings.c:404
+#: ../midori/midori-websettings.c:406
 msgid "Last Web search"
 msgstr "上次的 Web 搜索"
 
-#: ../midori/midori-websettings.c:405
+#: ../midori/midori-websettings.c:407
 msgid "The last saved Web search"
 msgstr "上次保存的 Web 搜索"
 
-#: ../midori/midori-websettings.c:414
+#: ../midori/midori-websettings.c:416
 msgid "Show Menubar"
 msgstr "显示菜单栏"
 
-#: ../midori/midori-websettings.c:415
+#: ../midori/midori-websettings.c:417
 msgid "Whether to show the menubar"
 msgstr "是否显示菜单栏"
 
-#: ../midori/midori-websettings.c:423
+#: ../midori/midori-websettings.c:425
 msgid "Show Navigationbar"
 msgstr "显示导航栏"
 
-#: ../midori/midori-websettings.c:424
+#: ../midori/midori-websettings.c:426
 msgid "Whether to show the navigationbar"
 msgstr "是否显示导航栏"
 
-#: ../midori/midori-websettings.c:432
+#: ../midori/midori-websettings.c:434
 msgid "Show Bookmarkbar"
 msgstr "显示书签栏"
 
-#: ../midori/midori-websettings.c:433
+#: ../midori/midori-websettings.c:435
 msgid "Whether to show the bookmarkbar"
 msgstr "是否显示书签栏"
 
-#: ../midori/midori-websettings.c:441
+#: ../midori/midori-websettings.c:443
 msgid "Show Panel"
 msgstr "显示侧边栏"
 
-#: ../midori/midori-websettings.c:442
+#: ../midori/midori-websettings.c:444
 msgid "Whether to show the panel"
 msgstr "是否显示侧边栏"
 
-#: ../midori/midori-websettings.c:457
+#: ../midori/midori-websettings.c:459
 msgid "Show Transferbar"
 msgstr "显示传输栏"
 
-#: ../midori/midori-websettings.c:458
+#: ../midori/midori-websettings.c:460
 msgid "Whether to show the transferbar"
 msgstr "是否显示传输栏"
 
-#: ../midori/midori-websettings.c:466
+#: ../midori/midori-websettings.c:468
 msgid "Show Statusbar"
 msgstr "显示状态栏"
 
-#: ../midori/midori-websettings.c:467
+#: ../midori/midori-websettings.c:469
 msgid "Whether to show the statusbar"
 msgstr "是否显示状态栏"
 
-#: ../midori/midori-websettings.c:476
-msgid "Toolbar Style"
-msgstr "工具栏样式"
+#: ../midori/midori-websettings.c:478
+msgid "Toolbar Style:"
+msgstr "工具栏样式:"
 
-#: ../midori/midori-websettings.c:477
+#: ../midori/midori-websettings.c:479
 msgid "The style of the toolbar"
 msgstr "工具栏的样式"
 
-#: ../midori/midori-websettings.c:493
+#: ../midori/midori-websettings.c:495
 msgid "Show progress in location entry"
 msgstr "在地址输入框中显示进度"
 
-#: ../midori/midori-websettings.c:494
+#: ../midori/midori-websettings.c:496
 msgid "Whether to show loading progress in the location entry"
 msgstr "是否在地址输入框中显示加载进度"
 
-#: ../midori/midori-websettings.c:509
+#: ../midori/midori-websettings.c:511
 msgid "Search engines in location completion"
 msgstr "地址补全中显示搜索引擎"
 
-#: ../midori/midori-websettings.c:510
+#: ../midori/midori-websettings.c:512
 msgid "Whether to show search engines in the location completion"
 msgstr "是否在地址补全中显示搜索引擎"
 
-#: ../midori/midori-websettings.c:518
+#: ../midori/midori-websettings.c:520
 msgid "Toolbar Items"
 msgstr "工具栏中的项目"
 
-#: ../midori/midori-websettings.c:519
+#: ../midori/midori-websettings.c:521
 msgid "The items to show on the toolbar"
 msgstr "在工具栏中显示的项目"
 
-#: ../midori/midori-websettings.c:527
+#: ../midori/midori-websettings.c:529
 msgid "Compact Sidepanel"
 msgstr "紧凑侧边栏"
 
-#: ../midori/midori-websettings.c:528
+#: ../midori/midori-websettings.c:530
 msgid "Whether to make the sidepanel compact"
 msgstr "是否让侧边栏紧凑显示"
 
-#: ../midori/midori-websettings.c:543
+#: ../midori/midori-websettings.c:545
+msgid "Show operating controls of the panel"
+msgstr "显示面板的操作控件"
+
+#: ../midori/midori-websettings.c:546
+msgid "Whether to show the operating controls of the panel"
+msgstr "是否显示面板的操作控件"
+
+#: ../midori/midori-websettings.c:561
 msgid "Align sidepanel on the right"
 msgstr "侧边栏摆放到右侧"
 
-#: ../midori/midori-websettings.c:544
+#: ../midori/midori-websettings.c:562
 msgid "Whether to align the sidepanel on the right"
 msgstr "让侧边栏摆放到右侧"
 
-#: ../midori/midori-websettings.c:553
-msgid "Load on Startup"
-msgstr "启动时加载"
+#: ../midori/midori-websettings.c:571
+msgid "When Midori starts:"
+msgstr "当 Midori 启动时:"
 
-#: ../midori/midori-websettings.c:554
-msgid "What to load on startup"
-msgstr "启动时加载的项目"
+#: ../midori/midori-websettings.c:572
+msgid "What to do when Midori starts"
+msgstr "Midori启动时做什么"
 
-#: ../midori/midori-websettings.c:564
+#: ../midori/midori-websettings.c:581
+msgid "Homepage:"
+msgstr "主页:"
+
+#: ../midori/midori-websettings.c:582
 msgid "The homepage"
 msgstr "主页"
 
-#: ../midori/midori-websettings.c:579
+#: ../midori/midori-websettings.c:597
 msgid "Show crash dialog"
 msgstr "显示崩溃提示对话框"
 
-#: ../midori/midori-websettings.c:580
+#: ../midori/midori-websettings.c:598
 msgid "Show a dialog after Midori crashed"
 msgstr "当 Midori 崩溃后显示提示对话框"
 
 #. i18n: Speed dial, webpage shortcuts, named for the phone function
-#: ../midori/midori-websettings.c:596
+#: ../midori/midori-websettings.c:614
 msgid "Show speed dial in new tabs"
 msgstr "在新标签页中显示快速拨号"
 
-#: ../midori/midori-websettings.c:597
+#: ../midori/midori-websettings.c:615
 msgid "Show speed dial in newly opened tabs"
 msgstr "在新标签页中显示快速拨号"
 
-#: ../midori/midori-websettings.c:605
-msgid "Download Folder"
-msgstr "下载目录"
+#: ../midori/midori-websettings.c:623
+msgid "Save downloaded files to:"
+msgstr "保存下载的文件到:"
 
-#: ../midori/midori-websettings.c:606
+#: ../midori/midori-websettings.c:624
 msgid "The folder downloaded files are saved to"
 msgstr "下载的文件将保存到此目录"
 
-#: ../midori/midori-websettings.c:625
+#: ../midori/midori-websettings.c:643
 msgid "Ask for the destination folder"
 msgstr "询问保存目录"
 
-#: ../midori/midori-websettings.c:626
+#: ../midori/midori-websettings.c:644
 msgid "Whether to ask for the destination folder when downloading a file"
 msgstr "是否在下载文件时询问保存目录"
 
-#: ../midori/midori-websettings.c:645
+#: ../midori/midori-websettings.c:663
 msgid "Notify when a transfer has been completed"
 msgstr "下载完成后显示提示"
 
-#: ../midori/midori-websettings.c:646
+#: ../midori/midori-websettings.c:664
 msgid "Whether to show a notification when a transfer has been completed"
 msgstr "是否在下载完成时显示提示信息"
 
-#: ../midori/midori-websettings.c:658
+#: ../midori/midori-websettings.c:676
 msgid "Download Manager"
 msgstr "下载管理器"
 
-#: ../midori/midori-websettings.c:659
+#: ../midori/midori-websettings.c:677
 msgid "An external download manager"
 msgstr "外部的下载管理器"
 
-#: ../midori/midori-websettings.c:667
+#: ../midori/midori-websettings.c:685
 msgid "Text Editor"
 msgstr "文本编辑器"
 
-#: ../midori/midori-websettings.c:668
+#: ../midori/midori-websettings.c:686
 msgid "An external text editor"
 msgstr "外部的文本编辑器"
 
-#: ../midori/midori-websettings.c:683
+#: ../midori/midori-websettings.c:701
 msgid "News Aggregator"
 msgstr "新闻聚合器"
 
-#: ../midori/midori-websettings.c:684
+#: ../midori/midori-websettings.c:702
 msgid "An external news aggregator"
 msgstr "外部的新闻聚合查看器"
 
-#: ../midori/midori-websettings.c:692
+#: ../midori/midori-websettings.c:710
 msgid "Location entry Search"
 msgstr "地址栏查找"
 
-#: ../midori/midori-websettings.c:693
+#: ../midori/midori-websettings.c:711
 msgid "The search to perform inside the location entry"
 msgstr "在地址输入框中执行的查找"
 
-#: ../midori/midori-websettings.c:701
+#: ../midori/midori-websettings.c:719
 msgid "Preferred Encoding"
 msgstr "首选的编码"
 
-#: ../midori/midori-websettings.c:702
+#: ../midori/midori-websettings.c:720
 msgid "The preferred character encoding"
 msgstr "首选的字符编码集"
 
-#: ../midori/midori-websettings.c:712
+#: ../midori/midori-websettings.c:730
 msgid "Always Show Tabbar"
 msgstr "总是显示标签栏"
 
-#: ../midori/midori-websettings.c:713
+#: ../midori/midori-websettings.c:731
 msgid "Always show the tabbar"
 msgstr "总是显示标签栏"
 
-#: ../midori/midori-websettings.c:721
+#: ../midori/midori-websettings.c:739
 msgid "Close Buttons on Tabs"
 msgstr "标签栏上显示关闭按钮"
 
-#: ../midori/midori-websettings.c:722
+#: ../midori/midori-websettings.c:740
 msgid "Whether tabs have close buttons"
 msgstr "是否在标签栏上显示关闭按钮"
 
-#: ../midori/midori-websettings.c:730
-msgid "Open new pages in"
-msgstr "打开新的页面在"
+#: ../midori/midori-websettings.c:748
+msgid "Open new pages in:"
+msgstr "打开新的页面在:"
 
-#: ../midori/midori-websettings.c:731
+#: ../midori/midori-websettings.c:749
 msgid "Where to open new pages"
 msgstr "在那里打开新的页面"
 
-#: ../midori/midori-websettings.c:740
-msgid "Open external pages in"
-msgstr "打开外部页面在"
+#: ../midori/midori-websettings.c:758
+msgid "Open external pages in:"
+msgstr "打开外部页面在:"
 
-#: ../midori/midori-websettings.c:741
+#: ../midori/midori-websettings.c:759
 msgid "Where to open externally opened pages"
 msgstr "在那里打开外部页面"
 
-#: ../midori/midori-websettings.c:754
+#: ../midori/midori-websettings.c:768
 msgid "Middle click opens Selection"
 msgstr "鼠标中键打开地址"
 
-#: ../midori/midori-websettings.c:755
+#: ../midori/midori-websettings.c:769
 msgid "Load an address from the selection via middle click"
 msgstr "用鼠标中键单击打开选中地址"
 
-#: ../midori/midori-websettings.c:763
+#: ../midori/midori-websettings.c:777
 msgid "Open tabs in the background"
 msgstr "在后台打开标签页"
 
-#: ../midori/midori-websettings.c:764
+#: ../midori/midori-websettings.c:778
 msgid "Whether to open new tabs in the background"
 msgstr "是否在后台打开标签页"
 
-#: ../midori/midori-websettings.c:772
+#: ../midori/midori-websettings.c:786
 msgid "Open Tabs next to Current"
 msgstr "在当前标签页后打开新标签"
 
-#: ../midori/midori-websettings.c:773
+#: ../midori/midori-websettings.c:787
 msgid "Whether to open new tabs next to the current tab or after the last one"
 msgstr "是否在当前标签页后打开新标签或者在最后的标签页后打开"
 
-#: ../midori/midori-websettings.c:781
+#: ../midori/midori-websettings.c:795
 msgid "Open popups in tabs"
 msgstr "在标签页中打开弹出窗口"
 
-#: ../midori/midori-websettings.c:782
+#: ../midori/midori-websettings.c:796
 msgid "Whether to open popup windows in tabs"
 msgstr "是否在标签页中打开弹出窗口"
 
-#: ../midori/midori-websettings.c:798
+#: ../midori/midori-websettings.c:812
 msgid "Zoom Text and Images"
 msgstr "缩放文字和图像"
 
-#: ../midori/midori-websettings.c:799
+#: ../midori/midori-websettings.c:813
 msgid "Whether to zoom text and images"
 msgstr "是否缩放文字和图像"
 
-#: ../midori/midori-websettings.c:814
+#: ../midori/midori-websettings.c:828
 msgid "Find inline while typing"
-msgstr "输入时自动补全"
+msgstr "输入时在线查找"
 
-#: ../midori/midori-websettings.c:815
+#: ../midori/midori-websettings.c:829
 msgid "Whether to automatically find inline while typing"
-msgstr "是否输入时自动补全地址"
+msgstr "是否输入时自动在线查找"
 
-#: ../midori/midori-websettings.c:823
+#: ../midori/midori-websettings.c:837
 msgid "Accept cookies"
 msgstr "接收 Cookies"
 
-#: ../midori/midori-websettings.c:824
+#: ../midori/midori-websettings.c:838
 msgid "What type of cookies to accept"
 msgstr "接收什么类型的 Cookies"
 
-#: ../midori/midori-websettings.c:833
+#: ../midori/midori-websettings.c:847
 msgid "Original cookies only"
 msgstr "只接收原始 Cookies"
 
-#: ../midori/midori-websettings.c:834
+#: ../midori/midori-websettings.c:848
 msgid "Accept cookies from the original website only"
 msgstr "只接收原始网站的 Cookies"
 
-#: ../midori/midori-websettings.c:842
+#: ../midori/midori-websettings.c:856
 msgid "Maximum cookie age"
 msgstr "最长 Cookie 有效期"
 
-#: ../midori/midori-websettings.c:843
+#: ../midori/midori-websettings.c:857
 msgid "The maximum number of days to save cookies for"
 msgstr "最长保存 Cookie 多少天"
 
-#: ../midori/midori-websettings.c:853
+#: ../midori/midori-websettings.c:867
 msgid "Remember last visited pages"
 msgstr "记录上次访问的页面"
 
-#: ../midori/midori-websettings.c:854
+#: ../midori/midori-websettings.c:868
 msgid "Whether the last visited pages are saved"
 msgstr "是否记录上次访问的页面"
 
-#: ../midori/midori-websettings.c:862
+#: ../midori/midori-websettings.c:876
 msgid "Maximum history age"
 msgstr "最长历史有效期"
 
-#: ../midori/midori-websettings.c:863
+#: ../midori/midori-websettings.c:877
 msgid "The maximum number of days to save the history for"
 msgstr "最长保存历史多少天"
 
-#: ../midori/midori-websettings.c:871
+#: ../midori/midori-websettings.c:885
 msgid "Remember last form inputs"
 msgstr "记录上次的表格输入"
 
-#: ../midori/midori-websettings.c:872
+#: ../midori/midori-websettings.c:886
 msgid "Whether the last form inputs are saved"
 msgstr "是否记录上次的表格输入"
 
-#: ../midori/midori-websettings.c:880
+#: ../midori/midori-websettings.c:894
 msgid "Remember last downloaded files"
 msgstr "记录上次下载的文件"
 
-#: ../midori/midori-websettings.c:881
+#: ../midori/midori-websettings.c:895
 msgid "Whether the last downloaded files are saved"
 msgstr "是否保存上次下载的文件"
 
-#: ../midori/midori-websettings.c:891
+#: ../midori/midori-websettings.c:905
 msgid "Proxy Server"
 msgstr "代理服务器"
 
-#: ../midori/midori-websettings.c:892
+#: ../midori/midori-websettings.c:906
 msgid "The proxy server used for HTTP connections"
 msgstr "HTTP 连接所使用的代理服务器"
 
-#: ../midori/midori-websettings.c:907
+#: ../midori/midori-websettings.c:921
 msgid "Detect proxy server automatically"
 msgstr "自动检测代理服务器"
 
-#: ../midori/midori-websettings.c:908
+#: ../midori/midori-websettings.c:922
 msgid "Whether to detect the proxy server automatically from the environment"
 msgstr "是否自动检测系统环境中的代理服务器设置"
 
 #. i18n: This refers to an application, not the 'user agent' string
-#: ../midori/midori-websettings.c:924
+#: ../midori/midori-websettings.c:938
 msgid "Identify as"
 msgstr "识别为"
 
-#: ../midori/midori-websettings.c:925
+#: ../midori/midori-websettings.c:939
 msgid "What to identify as to web pages"
 msgstr "让页面识别为什么"
 
-#: ../midori/midori-websettings.c:941
+#: ../midori/midori-websettings.c:955
 msgid "Identification string"
 msgstr "识别字符串"
 
-#: ../midori/midori-websettings.c:942
+#: ../midori/midori-websettings.c:956
 msgid "The application identification string"
 msgstr "应用程序识别字符串"
 
-#: ../midori/midori-websettings.c:950
+#: ../midori/midori-websettings.c:964
 msgid "Cache size"
 msgstr "缓存大小"
 
-#: ../midori/midori-websettings.c:951
+#: ../midori/midori-websettings.c:965
 msgid "The allowed size of the cache"
 msgstr "允许的缓存大小"
 
-#: ../midori/midori-websettings.c:966
+#: ../midori/midori-websettings.c:980
 msgid "Clear private data"
 msgstr "清除隐私数据"
 
-#: ../midori/midori-websettings.c:967
+#: ../midori/midori-websettings.c:981
 msgid "The private data selected for deletion"
-msgstr "选择删除的隐私数据"
+msgstr "选中要删除的隐私数据"
 
-#: ../midori/midori-view.c:749
+#: ../midori/midori-view.c:781
 #, c-format
 msgid "The page '%s' couldn't be loaded."
 msgstr "页面 '%s' 无法加载."
 
 #. WebKit 1.1.6 doesn't handle "alternate content" flawlessly,
 #. so reloading via Javascript works but not via API calls.
-#: ../midori/midori-view.c:751
-#: ../midori/midori-view.c:2807
+#: ../midori/midori-view.c:783
+#: ../midori/midori-view.c:3019
 #: ../extensions/feed-panel/main.c:112
 msgid "Error"
 msgstr "错误"
 
-#: ../midori/midori-view.c:754
+#: ../midori/midori-view.c:786
 msgid "Try again"
 msgstr "重试"
 
 #. i18n: The title of the 404 - Not found error page
 #. 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:784
-#: ../midori/midori-view.c:2811
+#: ../midori/midori-view.c:818
+#: ../midori/midori-view.c:3023
 #, c-format
 msgid "Not found - %s"
 msgstr "没有找到 - %s"
 
-#: ../midori/midori-view.c:1182
+#: ../midori/midori-view.c:1210
 msgid "Open _Link"
 msgstr "打开链接(_L)"
 
-#: ../midori/midori-view.c:1184
+#: ../midori/midori-view.c:1212
 msgid "Open Link in New _Tab"
 msgstr "在新标签页中打开链接(_T)"
 
-#: ../midori/midori-view.c:1201
+#: ../midori/midori-view.c:1229
 msgid "Open Link in New _Window"
 msgstr "在新窗口中打开链接(_W)"
 
-#: ../midori/midori-view.c:1207
+#: ../midori/midori-view.c:1235
 msgid "_Download Link destination"
 msgstr "下载链接目标(_D)"
 
-#: ../midori/midori-view.c:1213
+#: ../midori/midori-view.c:1241
 msgid "_Save Link destination"
 msgstr "保存链接目标(_S)"
 
-#: ../midori/midori-view.c:1222
+#: ../midori/midori-view.c:1250
 msgid "Download with Download _Manager"
 msgstr "用下载管理器下载(_M)"
 
-#: ../midori/midori-view.c:1251
+#: ../midori/midori-view.c:1279
 msgid "Search _with"
 msgstr "搜索(_w)"
 
-#: ../midori/midori-view.c:1279
+#: ../midori/midori-view.c:1311
 msgid "_Search the Web"
 msgstr "搜索 Web(_S)"
 
-#: ../midori/midori-view.c:1289
+#: ../midori/midori-view.c:1321
 msgid "Open Address in New _Tab"
 msgstr "在新标签页中打开地址(_T)"
 
-#: ../midori/midori-view.c:1456
+#: ../midori/midori-view.c:1499
 msgid "Open or download file"
 msgstr "打开或下载文件"
 
-#: ../midori/midori-view.c:1473
+#: ../midori/midori-view.c:1516
 #, c-format
 msgid "File Type: '%s'"
 msgstr "文件类型: '%s'"
 
-#: ../midori/midori-view.c:1476
+#: ../midori/midori-view.c:1519
 #, c-format
 msgid "File Type: %s ('%s')"
 msgstr "文件类型: %s ('%s')"
 
 #. i18n: A file open dialog title, ie. "Open http://fila.com/manual.tgz"
-#: ../midori/midori-view.c:1480
+#: ../midori/midori-view.c:1523
 #, c-format
 msgid "Open %s"
 msgstr "打开 %s"
 
-#: ../midori/midori-view.c:1898
+#: ../midori/midori-view.c:1962
 #, c-format
 msgid "Inspect page - %s"
 msgstr "检查页面 - %s"
 
-#: ../midori/midori-view.c:2088
+#: ../midori/midori-view.c:2152
 msgid "Speed dial"
 msgstr "快速拨号"
 
-#: ../midori/midori-view.c:2089
+#: ../midori/midori-view.c:2153
 msgid "Click to add a shortcut"
 msgstr "单击添加快捷方式"
 
-#: ../midori/midori-view.c:2090
+#: ../midori/midori-view.c:2154
 msgid "Enter shortcut address"
 msgstr "输入快捷方式地址"
 
-#: ../midori/midori-view.c:2091
+#: ../midori/midori-view.c:2155
 msgid "Enter shortcut title"
 msgstr "输入快捷方式标题"
 
-#: ../midori/midori-view.c:2092
+#: ../midori/midori-view.c:2156
 msgid "Are you sure you want to delete this shortcut?"
 msgstr "确认删除此快捷方式?"
 
-#: ../midori/midori-view.c:2122
+#: ../midori/midori-view.c:2186
 #, c-format
 msgid "Document cannot be displayed"
 msgstr "文档无法显示"
 
-#: ../midori/midori-view.c:2139
+#: ../midori/midori-view.c:2203
 #, c-format
 msgid "No documentation installed"
 msgstr "没有安装文档"
 
+#: ../midori/midori-view.c:2328
+msgid "Blank page"
+msgstr "空白页"
+
+#: ../midori/midori-view.c:2557
+#: ../midori/sokoke.c:865
+msgid "New _Tab"
+msgstr "新建标签页(_T)"
+
+#: ../midori/midori-view.c:2571
+msgid "_Duplicate Tab"
+msgstr "复制标签页(_D)"
+
+#: ../midori/midori-view.c:2576
+msgid "_Restore Tab"
+msgstr "恢复标签页(_R)"
+
+#: ../midori/midori-view.c:2576
+msgid "_Minimize Tab"
+msgstr "最小化标签页(_M)"
+
 #: ../midori/midori-preferences.c:91
 #, c-format
 msgid "Preferences for %s"
@@ -1643,124 +1705,116 @@ msgid "Browsing"
 msgstr "浏览"
 
 #. Page "Applications"
-#: ../midori/midori-preferences.c:578
+#: ../midori/midori-preferences.c:574
 msgid "Applications"
 msgstr "应用"
 
-#: ../midori/midori-preferences.c:579
+#: ../midori/midori-preferences.c:575
 msgid "External applications"
 msgstr "外部应用程序"
 
 #. Page "Network"
-#: ../midori/midori-preferences.c:625
-#: ../midori/midori-preferences.c:626
+#: ../midori/midori-preferences.c:621
+#: ../midori/midori-preferences.c:622
 msgid "Network"
 msgstr "网络"
 
-#: ../midori/midori-preferences.c:653
+#: ../midori/midori-preferences.c:649
 msgid "MB"
 msgstr "MB"
 
 #. Page "Privacy"
-#: ../midori/midori-preferences.c:658
+#: ../midori/midori-preferences.c:654
 msgid "Privacy"
 msgstr "隐私"
 
-#: ../midori/midori-preferences.c:659
+#: ../midori/midori-preferences.c:655
 msgid "Web Cookies"
 msgstr "网页 Cookies"
 
-#: ../midori/midori-preferences.c:672
-#: ../midori/midori-preferences.c:682
+#: ../midori/midori-preferences.c:668
+#: ../midori/midori-preferences.c:678
 msgid "days"
 msgstr "天"
 
-#: ../midori/midori-searchaction.c:484
-#: ../katze/katze-arrayaction.c:331
+#: ../midori/midori-searchaction.c:488
+#: ../katze/katze-arrayaction.c:335
 msgid "Empty"
 msgstr "清空"
 
-#: ../midori/midori-searchaction.c:904
+#: ../midori/midori-searchaction.c:908
 msgid "Add search engine"
 msgstr "添加搜索引擎"
 
-#: ../midori/midori-searchaction.c:904
+#: ../midori/midori-searchaction.c:908
 msgid "Edit search engine"
 msgstr "编辑搜索引擎"
 
-#: ../midori/midori-searchaction.c:932
+#: ../midori/midori-searchaction.c:936
 msgid "_Name:"
 msgstr "名称(_N)"
 
-#: ../midori/midori-searchaction.c:976
+#: ../midori/midori-searchaction.c:980
 msgid "_Icon:"
 msgstr "图标(_I)"
 
-#: ../midori/midori-searchaction.c:990
+#: ../midori/midori-searchaction.c:994
 msgid "_Token:"
 msgstr "记号(_T):"
 
-#: ../midori/midori-searchaction.c:1209
+#: ../midori/midori-searchaction.c:1213
 msgid "Manage Search Engines"
 msgstr "管理搜索引擎"
 
-#: ../midori/midori-searchaction.c:1308
+#: ../midori/midori-searchaction.c:1312
 msgid "Use as _default"
 msgstr "作为缺省(_d)"
 
-#: ../midori/sokoke.c:172
-#: ../midori/sokoke.c:184
+#: ../midori/sokoke.c:162
+#: ../midori/sokoke.c:174
 msgid "Could not run external program."
 msgstr "无法运行外部程序."
 
-#: ../midori/sokoke.c:855
+#: ../midori/sokoke.c:856
 msgid "_Bookmark"
 msgstr "书签(_B)"
 
-#: ../midori/sokoke.c:857
+#: ../midori/sokoke.c:858
 msgid "Add Boo_kmark"
 msgstr "添加书签(_k)"
 
-#: ../midori/sokoke.c:858
+#: ../midori/sokoke.c:859
 msgid "_Console"
 msgstr "控制台(_C)"
 
-#: ../midori/sokoke.c:859
+#: ../midori/sokoke.c:860
 msgid "_Extensions"
 msgstr "扩展(_E)"
 
-#: ../midori/sokoke.c:860
+#: ../midori/sokoke.c:861
 msgid "_History"
 msgstr "历史(_H)"
 
-#: ../midori/sokoke.c:861
+#: ../midori/sokoke.c:862
 msgid "_Homepage"
 msgstr "主页(_H)"
 
-#: ../midori/sokoke.c:862
+#: ../midori/sokoke.c:863
 msgid "_Userscripts"
 msgstr "用户脚本(_U)"
 
-#: ../midori/sokoke.c:863
+#: ../midori/sokoke.c:864
 msgid "User_styles"
 msgstr "用户样式(_s)"
 
-#: ../midori/sokoke.c:864
-msgid "New _Tab"
-msgstr "新建标签页(_T)"
-
-#: ../midori/sokoke.c:865
+#: ../midori/sokoke.c:866
 msgid "_Transfers"
 msgstr "传输(_T)"
 
-#: ../midori/sokoke.c:866
+#: ../midori/sokoke.c:867
 msgid "Netscape p_lugins"
 msgstr "Netscape 插件(_l)"
 
-#: ../midori/sokoke.c:868
-msgid "New _Window"
-msgstr "新建窗口(_W)"
-
 #: ../panels/midori-addons.c:95
 #: ../panels/midori-addons.c:141
 msgid "Userscripts"
@@ -1820,7 +1874,6 @@ msgid "A week ago"
 msgstr "一周以前"
 
 #: ../panels/midori-history.c:606
-#, fuzzy, c-format
 msgid "%d day ago"
 msgid_plural "%d days ago"
 msgstr[0] "%d 天以前"
@@ -1846,11 +1899,11 @@ msgstr "已下载 %s, 共 %s "
 
 #: ../panels/midori-transfers.c:479
 msgid "Open Destination _Folder"
-msgstr "打开保存目录(_F)"
+msgstr "打开保存文件目录(_F)"
 
 #: ../panels/midori-transfers.c:482
 msgid "Copy Link Loc_ation"
-msgstr "复制连接地址(_a)"
+msgstr "复制链接地址(_a)"
 
 #: ../katze/katze-http-auth.c:97
 msgid "Authentication Required"
@@ -1901,21 +1954,21 @@ msgstr "选择文件"
 msgid "Choose folder"
 msgstr "选择目录"
 
-#: ../extensions/adblock.c:78
+#: ../extensions/adblock.c:167
 msgid "Configure Advertisement filters"
 msgstr "设置广告过滤器"
 
-#: ../extensions/adblock.c:214
+#: ../extensions/adblock.c:304
 msgid "Configure _Advertisement filters..."
 msgstr "设置广告过滤器(_A)"
 
-#: ../extensions/adblock.c:374
+#: ../extensions/adblock.c:562
 msgid "Advertisement blocker"
-msgstr "广告屏蔽"
+msgstr "广告拦截器"
 
-#: ../extensions/adblock.c:375
+#: ../extensions/adblock.c:563
 msgid "Block advertisements according to a filter list"
-msgstr "根据过滤列表屏蔽广告"
+msgstr "使用过滤列表拦截广告"
 
 #: ../extensions/colorful-tabs.c:115
 msgid "Tint tabs distinctly"
@@ -2117,19 +2170,19 @@ msgstr "常驻页面"
 msgid "_Pageholder"
 msgstr "常驻页面(_P)"
 
-#: ../extensions/shortcuts.c:156
-msgid "Configure Keyboard shortcuts"
-msgstr "设置快捷键"
+#: ../extensions/shortcuts.c:172
+msgid "Customize Keyboard shortcuts"
+msgstr "定制快捷键"
 
-#: ../extensions/shortcuts.c:253
-msgid "Configure Sh_ortcuts..."
-msgstr "设置快捷键(_o)"
+#: ../extensions/shortcuts.c:264
+msgid "Customize Sh_ortcuts..."
+msgstr "定制快捷键(_o)"
 
-#: ../extensions/shortcuts.c:285
+#: ../extensions/shortcuts.c:303
 msgid "Shortcuts"
 msgstr "快捷键"
 
-#: ../extensions/shortcuts.c:286
+#: ../extensions/shortcuts.c:304
 msgid "View and edit keyboard shortcuts"
 msgstr "查看和编辑快捷键"
 
@@ -2149,3 +2202,44 @@ msgstr "状态栏特性"
 msgid "Easily toggle features on web pages on and off"
 msgstr "方便的开关网页中的特性"
 
+#: ../extensions/tab-panel.c:371
+#: ../extensions/tab-panel.c:431
+msgid "Tab Panel"
+msgstr "标签页面板"
+
+#: ../extensions/tab-panel.c:415
+msgid "T_ab Panel"
+msgstr "标签页面板(_a)"
+
+#: ../extensions/tab-panel.c:432
+msgid "Show tabs in a vertical panel"
+msgstr "在垂直面板里显示标签页"
+
+#: ../extensions/toolbar-editor.c:391
+msgid "Customize Toolbar"
+msgstr "定制工具栏"
+
+#: ../extensions/toolbar-editor.c:407
+msgid "Select items to be displayed on the toolbar. Items can be reodered by drag and drop."
+msgstr "选择在工具栏上显示的项目, 可以拖动各项调整显示顺序."
+
+#: ../extensions/toolbar-editor.c:423
+msgid "Available Items"
+msgstr "可用的项目"
+
+#: ../extensions/toolbar-editor.c:444
+msgid "Displayed Items"
+msgstr "显示的项目"
+
+#: ../extensions/toolbar-editor.c:579
+msgid "Customize _Toolbar..."
+msgstr "定制工具栏(_T)"
+
+#: ../extensions/toolbar-editor.c:611
+msgid "Toolbar Editor"
+msgstr "工具栏编辑器"
+
+#: ../extensions/toolbar-editor.c:612
+msgid "Easily edit the toolbar layout"
+msgstr "轻松编辑工具栏布局"
+