diff --git a/po/zh_CN.po b/po/zh_CN.po
index 1ef5c09a..a619083b 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: midori\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-08 03:51+0000\n"
+"POT-Creation-Date: 2012-02-12 23:51+0000\n"
 "PO-Revision-Date: 2011-02-15 21:26+0800\n"
 "Last-Translator: Chipong Luo <chipong.luo@yahoo.com>\n"
 "Language-Team: Chinese (Simplified) <xfce-i18n@xfce.org>\n"
@@ -44,7 +44,7 @@ msgstr "Midori 私人浏览"
 msgid "Open a new private browsing window"
 msgstr "打开新的私人浏览窗口"
 
-#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:4013
+#: ../data/midori-private.desktop.in.h:3 ../midori/midori-view.c:3976
 msgid "Private Browsing"
 msgstr "私人浏览"
 
@@ -74,7 +74,7 @@ msgid "Failed to clear history: %s\n"
 msgstr "无法清除历史：%s\n"
 
 #: ../midori/main.c:438 ../midori/main.c:559
-#: ../extensions/formhistory/formhistory.c:249
+#: ../extensions/formhistory/formhistory.c:526
 #, c-format
 msgid "Failed to open database: %s\n"
 msgstr "无法打开数据库：%s\n"
@@ -327,7 +327,7 @@ msgstr "忽略(_I)"
 msgid "_Bookmark"
 msgstr "书签(_B)"
 
-#: ../midori/midori-app.c:1332 ../midori/midori-browser.c:6049
+#: ../midori/midori-app.c:1332 ../midori/midori-browser.c:6036
 msgid "_Bookmarks"
 msgstr "书签(_B)"
 
@@ -344,7 +344,7 @@ msgid "_Extensions"
 msgstr "扩展(_E)"
 
 #. i18n: Browsing history, visited web pages, closed tabs
-#: ../midori/midori-app.c:1336 ../midori/midori-browser.c:4619
+#: ../midori/midori-app.c:1336 ../midori/midori-browser.c:4606
 msgid "_History"
 msgstr "历史(_H)"
 
@@ -372,7 +372,7 @@ msgstr "Netscape 插件(_L)"
 msgid "_Closed Tabs"
 msgstr "已关闭的标签(_C)"
 
-#: ../midori/midori-app.c:1343 ../midori/midori-browser.c:5206
+#: ../midori/midori-app.c:1343 ../midori/midori-browser.c:5193
 msgid "New _Window"
 msgstr "新建窗口(_W)"
 
@@ -397,12 +397,12 @@ msgstr "无法识别的书签格式。"
 msgid "Writing failed."
 msgstr "无法写入。"
 
-#: ../midori/midori-browser.c:326 ../midori/midori-browser.c:5288
-#: ../midori/midori-browser.c:5297
+#: ../midori/midori-browser.c:326 ../midori/midori-browser.c:5275
+#: ../midori/midori-browser.c:5284
 msgid "Reload the current page"
 msgstr "重载当前页面"
 
-#: ../midori/midori-browser.c:335 ../midori/midori-browser.c:5294
+#: ../midori/midori-browser.c:335 ../midori/midori-browser.c:5281
 msgid "Stop loading the current page"
 msgstr "停止载入当前页面"
 
@@ -450,7 +450,7 @@ msgstr "标题(_T)："
 msgid "_Address:"
 msgstr "地址(_A)："
 
-#: ../midori/midori-browser.c:844 ../midori/midori-browser.c:4356
+#: ../midori/midori-browser.c:844 ../midori/midori-browser.c:4343
 msgid "_Folder:"
 msgstr "文件夹(_F)："
 
@@ -486,7 +486,7 @@ msgstr "没有足够的空闲空间用来下载 “%s”。"
 msgid "The file needs %s but only %s are left."
 msgstr "此文件需要 %s 但只剩余 %s。"
 
-#: ../midori/midori-browser.c:1015 ../midori/midori-browser.c:4425
+#: ../midori/midori-browser.c:1015 ../midori/midori-browser.c:4412
 msgid "Save file as"
 msgstr "文件另存为"
 
@@ -526,11 +526,11 @@ msgstr "未能下载选中的图片。"
 msgid "Save file"
 msgstr "保存文件"
 
-#: ../midori/midori-browser.c:2327
+#: ../midori/midori-browser.c:2326
 msgid "Open file"
 msgstr "打开文件"
 
-#: ../midori/midori-browser.c:2458
+#: ../midori/midori-browser.c:2457
 msgid ""
 "To use the above URI open a news aggregator. There is usually a menu or "
 "button \"New Subscription\", \"New News Feed\" or similar.\n"
@@ -543,139 +543,139 @@ msgstr ""
 "您也可以进入首选项、Midori 中的应用程序，并选择一个新闻聚合器。您下次点击新闻"
 "源图标时，将自动添加它。"
 
-#: ../midori/midori-browser.c:2464 ../extensions/feed-panel/main.c:365
+#: ../midori/midori-browser.c:2463 ../extensions/feed-panel/main.c:365
 msgid "New feed"
 msgstr "新建源"
 
-#: ../midori/midori-browser.c:2507 ../midori/midori-browser.c:5357
+#: ../midori/midori-browser.c:2506 ../midori/midori-browser.c:5344
 #: ../panels/midori-bookmarks.c:426
 msgid "Add a new bookmark"
 msgstr "添加新书签"
 
-#: ../midori/midori-browser.c:3004 ../midori/midori-searchaction.c:488
+#: ../midori/midori-browser.c:3005 ../midori/midori-searchaction.c:488
 msgid "Empty"
 msgstr "清空"
 
-#: ../midori/midori-browser.c:3500
+#: ../midori/midori-browser.c:3501
 msgid "Toggle text cursor navigation"
 msgstr "切换文字光标导航"
 
-#: ../midori/midori-browser.c:3818 ../midori/midori-browser.c:5743
+#: ../midori/midori-browser.c:3809 ../midori/midori-browser.c:5730
 #, c-format
 msgid "Failed to insert new history item: %s\n"
 msgstr "无法插入新的历史项目：%s\n"
 
-#: ../midori/midori-browser.c:4153 ../panels/midori-bookmarks.c:742
+#: ../midori/midori-browser.c:4140 ../panels/midori-bookmarks.c:742
 #: ../panels/midori-history.c:747
 msgid "Open all in _Tabs"
 msgstr "全部在标签中打开(_T)"
 
-#: ../midori/midori-browser.c:4160 ../panels/midori-bookmarks.c:748
+#: ../midori/midori-browser.c:4147 ../panels/midori-bookmarks.c:748
 #: ../panels/midori-history.c:753 ../extensions/feed-panel/feed-panel.c:528
 msgid "Open in New _Tab"
 msgstr "在新标签中打开(_T)"
 
-#: ../midori/midori-browser.c:4163 ../midori/midori-view.c:2575
-#: ../midori/midori-view.c:4507 ../panels/midori-bookmarks.c:750
+#: ../midori/midori-browser.c:4150 ../midori/midori-view.c:2538
+#: ../midori/midori-view.c:4470 ../panels/midori-bookmarks.c:750
 #: ../panels/midori-history.c:755 ../extensions/feed-panel/feed-panel.c:530
 msgid "Open in New _Window"
 msgstr "在新窗口中打开(_W)"
 
-#: ../midori/midori-browser.c:4243
+#: ../midori/midori-browser.c:4230
 msgid "Arora"
 msgstr "Arora"
 
-#: ../midori/midori-browser.c:4244
+#: ../midori/midori-browser.c:4231
 msgid "Kazehakase"
 msgstr "Kazehakase"
 
-#: ../midori/midori-browser.c:4245
+#: ../midori/midori-browser.c:4232
 msgid "Opera"
 msgstr "Opera"
 
-#: ../midori/midori-browser.c:4246
+#: ../midori/midori-browser.c:4233
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../midori/midori-browser.c:4247
+#: ../midori/midori-browser.c:4234
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../midori/midori-browser.c:4248
+#: ../midori/midori-browser.c:4235
 #, c-format
 msgid "Firefox (%s)"
 msgstr "Firefox(%s)"
 
-#: ../midori/midori-browser.c:4269
+#: ../midori/midori-browser.c:4256
 msgid "Import bookmarks..."
 msgstr "导入书签..."
 
-#: ../midori/midori-browser.c:4272 ../midori/midori-browser.c:5362
+#: ../midori/midori-browser.c:4259 ../midori/midori-browser.c:5349
 msgid "_Import bookmarks"
 msgstr "导入书签(_I)"
 
-#: ../midori/midori-browser.c:4283
+#: ../midori/midori-browser.c:4270
 msgid "_Application:"
 msgstr "应用程序(_A)："
 
-#: ../midori/midori-browser.c:4348
+#: ../midori/midori-browser.c:4335
 msgid "Import from XBEL or HTML file"
 msgstr "从 XBEL 或 HTML 文件导入"
 
-#: ../midori/midori-browser.c:4383
+#: ../midori/midori-browser.c:4370
 msgid "Import from a file"
 msgstr "从文件导入"
 
-#: ../midori/midori-browser.c:4395
+#: ../midori/midori-browser.c:4382
 msgid "Failed to import bookmarks"
 msgstr "无法导入书签"
 
-#: ../midori/midori-browser.c:4430
+#: ../midori/midori-browser.c:4417
 msgid "XBEL Bookmarks"
 msgstr "XBEL 书签"
 
-#: ../midori/midori-browser.c:4435
+#: ../midori/midori-browser.c:4422
 msgid "Netscape Bookmarks"
 msgstr "Netscape 书签"
 
-#: ../midori/midori-browser.c:4449
+#: ../midori/midori-browser.c:4436
 msgid "Midori can only export to XBEL (*.xbel) and Netscape (*.html)"
 msgstr "Midori 只能导出为 XBEL(*.xbel) 和 Netscape(*.html)"
 
-#: ../midori/midori-browser.c:4464
+#: ../midori/midori-browser.c:4451
 msgid "Failed to export bookmarks"
 msgstr "无法导出书签"
 
 #. i18n: Dialog: Clear Private Data, in the Tools menu
-#: ../midori/midori-browser.c:4586
+#: ../midori/midori-browser.c:4573
 msgid "Clear Private Data"
 msgstr "清除隐私数据"
 
-#: ../midori/midori-browser.c:4590
+#: ../midori/midori-browser.c:4577
 msgid "_Clear private data"
 msgstr "清除隐私数据(_C)"
 
-#: ../midori/midori-browser.c:4603
+#: ../midori/midori-browser.c:4590
 msgid "Clear the following data:"
 msgstr "清除以下数据："
 
-#: ../midori/midori-browser.c:4613
+#: ../midori/midori-browser.c:4600
 msgid "Last open _tabs"
 msgstr "上次打开的标签(_T)"
 
-#: ../midori/midori-browser.c:4639
+#: ../midori/midori-browser.c:4626
 msgid "Clear private data when _quitting Midori"
 msgstr "退出 Midori 时清除隐私数据(_Q)"
 
-#: ../midori/midori-browser.c:4815
+#: ../midori/midori-browser.c:4802
 msgid "A lightweight web browser."
 msgstr "轻量级的网络浏览器。"
 
-#: ../midori/midori-browser.c:4816
+#: ../midori/midori-browser.c:4803
 msgid "See about:version for version info."
 msgstr "查看 about:version 获取版本信息。"
 
-#: ../midori/midori-browser.c:4818
+#: ../midori/midori-browser.c:4805
 msgid ""
 "This library is free software; you can redistribute it and/or modify it "
 "under the terms of the GNU Lesser General Public License as published by the "
@@ -685,366 +685,366 @@ msgstr ""
 "此库文件是自由软件；您可以以自由软件基金会发布的 GNU 宽通用公共许可协议 2.1 "
 "版或(您可以选择)更高版方式重新发布和/或修改它。"
 
-#: ../midori/midori-browser.c:4839
+#: ../midori/midori-browser.c:4826
 msgid "translator-credits"
 msgstr ""
 "张翼 <yatzhang@gmail.com>, 2009.\n"
 "Hunt Xu <mhuntxu@gmail.com>, 2009, 2010, 2011.\n"
 "Chipong Luo <chipong.luo@yahoo.com>, 2011, 2012."
 
-#: ../midori/midori-browser.c:5204
+#: ../midori/midori-browser.c:5191
 msgid "_File"
 msgstr "文件(_F)"
 
-#: ../midori/midori-browser.c:5207
+#: ../midori/midori-browser.c:5194
 msgid "Open a new window"
 msgstr "打开一个新窗口"
 
-#: ../midori/midori-browser.c:5210
+#: ../midori/midori-browser.c:5197
 msgid "Open a new tab"
 msgstr "打开一个新标签"
 
-#: ../midori/midori-browser.c:5212
+#: ../midori/midori-browser.c:5199
 msgid "New P_rivate Browsing Window"
 msgstr "新建私人浏览窗口(_R)"
 
-#: ../midori/midori-browser.c:5216
+#: ../midori/midori-browser.c:5203
 msgid "Open a file"
 msgstr "打开文件"
 
-#: ../midori/midori-browser.c:5218
+#: ../midori/midori-browser.c:5205
 msgid "_Save Page As..."
 msgstr "页面另存为(_S)..."
 
-#: ../midori/midori-browser.c:5219
+#: ../midori/midori-browser.c:5206
 msgid "Save to a file"
 msgstr "保存至文件"
 
-#: ../midori/midori-browser.c:5221
+#: ../midori/midori-browser.c:5208
 msgid "Add to Speed _dial"
 msgstr "添加至快速拨号(_D)"
 
-#: ../midori/midori-browser.c:5225
+#: ../midori/midori-browser.c:5212
 msgid "Add Shortcut to the _desktop"
 msgstr "添加快捷方式至桌面(_D)"
 
-#: ../midori/midori-browser.c:5227
+#: ../midori/midori-browser.c:5214
 msgid "Create _Launcher"
 msgstr "创建启动器(_L)"
 
-#: ../midori/midori-browser.c:5231
+#: ../midori/midori-browser.c:5218
 msgid "Subscribe to News _feed"
 msgstr "订阅至新闻源(_F)"
 
-#: ../midori/midori-browser.c:5237
+#: ../midori/midori-browser.c:5224
 msgid "_Close Tab"
 msgstr "关闭标签(_C)"
 
-#: ../midori/midori-browser.c:5238
+#: ../midori/midori-browser.c:5225
 msgid "Close the current tab"
 msgstr "关闭当前标签"
 
-#: ../midori/midori-browser.c:5240
+#: ../midori/midori-browser.c:5227
 msgid "C_lose Window"
 msgstr "关闭窗口(_L)"
 
-#: ../midori/midori-browser.c:5244
+#: ../midori/midori-browser.c:5231
 msgid "Print the current page"
 msgstr "打印当前页面"
 
-#: ../midori/midori-browser.c:5246
+#: ../midori/midori-browser.c:5233
 msgid "Close a_ll Windows"
 msgstr "关闭所有窗口(_L)"
 
-#: ../midori/midori-browser.c:5249
+#: ../midori/midori-browser.c:5236
 msgid "_Edit"
 msgstr "编辑(_E)"
 
-#: ../midori/midori-browser.c:5272
+#: ../midori/midori-browser.c:5259
 msgid "_Find..."
 msgstr "查找(_F)..."
 
-#: ../midori/midori-browser.c:5273
+#: ../midori/midori-browser.c:5260
 msgid "Find a word or phrase in the page"
 msgstr "在页面中查找字词或短语"
 
-#: ../midori/midori-browser.c:5275
+#: ../midori/midori-browser.c:5262
 msgid "Find _Next"
 msgstr "查找下一个(_N)"
 
-#: ../midori/midori-browser.c:5278
+#: ../midori/midori-browser.c:5265
 msgid "Find _Previous"
 msgstr "查找上一个(_P)"
 
-#: ../midori/midori-browser.c:5282
+#: ../midori/midori-browser.c:5269
 msgid "Configure the application preferences"
 msgstr "配置应用程序首选项"
 
-#: ../midori/midori-browser.c:5284
+#: ../midori/midori-browser.c:5271
 msgid "_View"
 msgstr "视图(_V)"
 
-#: ../midori/midori-browser.c:5285
+#: ../midori/midori-browser.c:5272
 msgid "_Toolbars"
 msgstr "工具栏(_T)"
 
-#: ../midori/midori-browser.c:5290
+#: ../midori/midori-browser.c:5277
 msgid "Reload page without caching"
 msgstr "重载页面但不缓存"
 
-#: ../midori/midori-browser.c:5300
+#: ../midori/midori-browser.c:5287
 msgid "Increase the zoom level"
 msgstr "增加缩放等级"
 
-#: ../midori/midori-browser.c:5303
+#: ../midori/midori-browser.c:5290
 msgid "Decrease the zoom level"
 msgstr "减小缩放等级"
 
-#: ../midori/midori-browser.c:5307
+#: ../midori/midori-browser.c:5294
 msgid "_Encoding"
 msgstr "编码(_E)"
 
-#: ../midori/midori-browser.c:5309
+#: ../midori/midori-browser.c:5296
 msgid "View So_urce"
 msgstr "查看源码(_U)"
 
-#: ../midori/midori-browser.c:5312
+#: ../midori/midori-browser.c:5299
 msgid "Ca_ret Browsing"
 msgstr "光标浏览(_R)"
 
-#: ../midori/midori-browser.c:5316
+#: ../midori/midori-browser.c:5303
 msgid "Toggle fullscreen view"
 msgstr "切换全屏视图"
 
-#: ../midori/midori-browser.c:5318
+#: ../midori/midori-browser.c:5305
 msgid "Scroll _Left"
 msgstr "向左滚动(_L)"
 
-#: ../midori/midori-browser.c:5321
+#: ../midori/midori-browser.c:5308
 msgid "Scroll _Down"
 msgstr "向下滚动(_D)"
 
-#: ../midori/midori-browser.c:5324
+#: ../midori/midori-browser.c:5311
 msgid "Scroll _Up"
 msgstr "向上滚动(_U)"
 
-#: ../midori/midori-browser.c:5327
+#: ../midori/midori-browser.c:5314
 msgid "Scroll _Right"
 msgstr "向右滚动(_R)"
 
-#: ../midori/midori-browser.c:5330
+#: ../midori/midori-browser.c:5317
 msgid "_Go"
 msgstr "转到(_G)"
 
-#: ../midori/midori-browser.c:5333
+#: ../midori/midori-browser.c:5320
 msgid "Go back to the previous page"
 msgstr "返回上一页面"
 
-#: ../midori/midori-browser.c:5336
+#: ../midori/midori-browser.c:5323
 msgid "Go forward to the next page"
 msgstr "进入下一页面"
 
 #. i18n: Visit the previous logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:5340
+#: ../midori/midori-browser.c:5327
 msgid "Go to the previous sub-page"
 msgstr "转到上一子页面"
 
 #. i18n: Visit the following logical page, ie. in a forum or blog
-#: ../midori/midori-browser.c:5344
+#: ../midori/midori-browser.c:5331
 msgid "Go to the next sub-page"
 msgstr "转到下一子页面"
 
-#: ../midori/midori-browser.c:5347
+#: ../midori/midori-browser.c:5334
 msgid "Go to your homepage"
 msgstr "进入您的主页"
 
-#: ../midori/midori-browser.c:5349
+#: ../midori/midori-browser.c:5336
 msgid "Empty Trash"
 msgstr "清空回收站"
 
-#: ../midori/midori-browser.c:5352
+#: ../midori/midori-browser.c:5339
 msgid "Undo _Close Tab"
 msgstr "撤销关闭标签(_C)"
 
-#: ../midori/midori-browser.c:5359
+#: ../midori/midori-browser.c:5346
 msgid "Add a new _folder"
 msgstr "添加新文件夹(_F)"
 
-#: ../midori/midori-browser.c:5365
+#: ../midori/midori-browser.c:5352
 msgid "_Export bookmarks"
 msgstr "导出书签(_E)"
 
-#: ../midori/midori-browser.c:5368 ../midori/midori-searchaction.c:497
+#: ../midori/midori-browser.c:5355 ../midori/midori-searchaction.c:497
 msgid "_Manage Search Engines"
 msgstr "管理搜索引擎(_M)"
 
-#: ../midori/midori-browser.c:5371
+#: ../midori/midori-browser.c:5358
 msgid "_Clear Private Data"
 msgstr "清除隐私数据(_C)"
 
-#: ../midori/midori-browser.c:5374
+#: ../midori/midori-browser.c:5361
 msgid "_Inspect Page"
 msgstr "检查页面(_I)"
 
-#: ../midori/midori-browser.c:5378
+#: ../midori/midori-browser.c:5365
 msgid "_Previous Tab"
 msgstr "上一标签(_P)"
 
-#: ../midori/midori-browser.c:5381
+#: ../midori/midori-browser.c:5368
 msgid "_Next Tab"
 msgstr "下一标签(_N)"
 
-#: ../midori/midori-browser.c:5383
+#: ../midori/midori-browser.c:5370
 msgid "Move Tab _Backward"
 msgstr "向后移动标签(_B)"
 
-#: ../midori/midori-browser.c:5385
+#: ../midori/midori-browser.c:5372
 msgid "_Move Tab Forward"
 msgstr "向前移动标签(_M)"
 
-#: ../midori/midori-browser.c:5388
+#: ../midori/midori-browser.c:5375
 msgid "Focus _Current Tab"
 msgstr "聚焦当前标签(_C)"
 
-#: ../midori/midori-browser.c:5391
+#: ../midori/midori-browser.c:5378
 msgid "Focus _Next view"
 msgstr "聚焦下一视图(_N)"
 
-#: ../midori/midori-browser.c:5394
+#: ../midori/midori-browser.c:5381
 msgid "Only show the Icon of the _Current Tab"
 msgstr "仅显示当前标签的图标(_C)"
 
-#: ../midori/midori-browser.c:5397
+#: ../midori/midori-browser.c:5384
 msgid "_Duplicate Current Tab"
 msgstr "复制当前标签(_D)"
 
-#: ../midori/midori-browser.c:5400
+#: ../midori/midori-browser.c:5387
 msgid "Close Ot_her Tabs"
 msgstr "关闭其它标签(_H)"
 
-#: ../midori/midori-browser.c:5403
+#: ../midori/midori-browser.c:5390
 msgid "Open last _session"
 msgstr "打开上次会话(_S)"
 
-#: ../midori/midori-browser.c:5406
+#: ../midori/midori-browser.c:5393
 msgid "_Help"
 msgstr "帮助(_H)"
 
-#: ../midori/midori-browser.c:5408
+#: ../midori/midori-browser.c:5395
 msgid "_Frequent Questions"
 msgstr "常见问题(_F)"
 
-#: ../midori/midori-browser.c:5411
+#: ../midori/midori-browser.c:5398
 msgid "_Report a Problem..."
 msgstr "报告问题(_R)..."
 
-#: ../midori/midori-browser.c:5423
+#: ../midori/midori-browser.c:5410
 msgid "_Menubar"
 msgstr "菜单栏(_M)"
 
-#: ../midori/midori-browser.c:5427
+#: ../midori/midori-browser.c:5414
 msgid "_Navigationbar"
 msgstr "导航栏(_N)"
 
-#: ../midori/midori-browser.c:5431
+#: ../midori/midori-browser.c:5418
 msgid "Side_panel"
 msgstr "侧边栏(_P)"
 
-#: ../midori/midori-browser.c:5432
+#: ../midori/midori-browser.c:5419
 msgid "Sidepanel"
 msgstr "侧边栏"
 
-#: ../midori/midori-browser.c:5435
+#: ../midori/midori-browser.c:5422
 msgid "_Bookmarkbar"
 msgstr "书签栏(_B)"
 
-#: ../midori/midori-browser.c:5439
+#: ../midori/midori-browser.c:5426
 msgid "_Statusbar"
 msgstr "状态栏(_S)"
 
-#: ../midori/midori-browser.c:5448 ../midori/midori-websettings.c:303
+#: ../midori/midori-browser.c:5435 ../midori/midori-websettings.c:303
 msgid "_Automatic"
 msgstr "自动(_A)"
 
-#: ../midori/midori-browser.c:5451 ../midori/midori-websettings.c:228
+#: ../midori/midori-browser.c:5438 ../midori/midori-websettings.c:228
 msgid "Chinese (BIG5)"
 msgstr "中文(BIG5)"
 
 #. i18n: A double underscore "__" is used to prevent the mnemonic
-#: ../midori/midori-browser.c:5455
+#: ../midori/midori-browser.c:5442
 msgid "Japanese (SHIFT__JIS)"
 msgstr "日语(SHIFT_JIS)"
 
-#: ../midori/midori-browser.c:5458 ../midori/midori-websettings.c:230
+#: ../midori/midori-browser.c:5445 ../midori/midori-websettings.c:230
 msgid "Korean (EUC-KR)"
 msgstr "韩语(EUC-KR)"
 
-#: ../midori/midori-browser.c:5461 ../midori/midori-websettings.c:231
+#: ../midori/midori-browser.c:5448 ../midori/midori-websettings.c:231
 msgid "Russian (KOI8-R)"
 msgstr "俄语(KOI8-R)"
 
-#: ../midori/midori-browser.c:5464 ../midori/midori-websettings.c:232
+#: ../midori/midori-browser.c:5451 ../midori/midori-websettings.c:232
 msgid "Unicode (UTF-8)"
 msgstr "Unicode(UTF-8)"
 
-#: ../midori/midori-browser.c:5467 ../midori/midori-websettings.c:233
+#: ../midori/midori-browser.c:5454 ../midori/midori-websettings.c:233
 msgid "Western (ISO-8859-1)"
 msgstr "西方语言(ISO-8859-1)"
 
-#: ../midori/midori-browser.c:5470 ../midori/midori-websettings.c:234
+#: ../midori/midori-browser.c:5457 ../midori/midori-websettings.c:234
 #: ../midori/midori-websettings.c:309 ../katze/katze-utils.c:635
 msgid "Custom..."
 msgstr "自定义..."
 
-#: ../midori/midori-browser.c:5976
+#: ../midori/midori-browser.c:5963
 msgid "_Separator"
 msgstr "分隔符(_S)"
 
-#: ../midori/midori-browser.c:5983
+#: ../midori/midori-browser.c:5970
 msgid "_Location..."
 msgstr "位置(_L)..."
 
-#: ../midori/midori-browser.c:5985
+#: ../midori/midori-browser.c:5972
 msgid "Open a particular location"
 msgstr "打开特定位置"
 
-#: ../midori/midori-browser.c:6007
+#: ../midori/midori-browser.c:5994
 msgid "_Web Search..."
 msgstr "网络搜索(_W)..."
 
-#: ../midori/midori-browser.c:6009
+#: ../midori/midori-browser.c:5996
 msgid "Run a web search"
 msgstr "运行网络搜索"
 
-#: ../midori/midori-browser.c:6036
+#: ../midori/midori-browser.c:6023
 msgid "Reopen a previously closed tab or window"
 msgstr "重新打开先前关闭的标签或窗口"
 
-#: ../midori/midori-browser.c:6051
+#: ../midori/midori-browser.c:6038
 msgid "Show the saved bookmarks"
 msgstr "显示已保存的书签"
 
-#: ../midori/midori-browser.c:6065
+#: ../midori/midori-browser.c:6052
 msgid "_Tools"
 msgstr "工具(_T)"
 
-#: ../midori/midori-browser.c:6080
+#: ../midori/midori-browser.c:6067
 msgid "_Window"
 msgstr "窗口(_W)"
 
-#: ../midori/midori-browser.c:6082
+#: ../midori/midori-browser.c:6069
 msgid "Show a list of all open tabs"
 msgstr "显示所有打开标签的列表"
 
-#: ../midori/midori-browser.c:6096
+#: ../midori/midori-browser.c:6083
 msgid "_Menu"
 msgstr "菜单(_M)"
 
-#: ../midori/midori-browser.c:6098
+#: ../midori/midori-browser.c:6085
 msgid "Menu"
 msgstr "菜单"
 
-#: ../midori/midori-browser.c:6768
+#: ../midori/midori-browser.c:6755
 #, c-format
 msgid "Unexpected setting '%s'"
 msgstr "意外的设置 ‘%s’"
@@ -1638,252 +1638,252 @@ msgstr "总是使用我的字体选择"
 msgid "Override fonts picked by websites with user preferences"
 msgstr "使用用户首选项替换网站采用的字体"
 
-#: ../midori/midori-view.c:1327
+#: ../midori/midori-view.c:1288
 #, c-format
 msgid "%s wants to save an HTML5 database."
 msgstr "%s 要保存 HTML5 数据库。"
 
-#: ../midori/midori-view.c:1331 ../midori/midori-view.c:1361
+#: ../midori/midori-view.c:1292 ../midori/midori-view.c:1322
 msgid "_Deny"
 msgstr "拒绝(_D)"
 
-#: ../midori/midori-view.c:1331 ../midori/midori-view.c:1361
+#: ../midori/midori-view.c:1292 ../midori/midori-view.c:1322
 msgid "_Allow"
 msgstr "允许(_A)"
 
-#: ../midori/midori-view.c:1357
+#: ../midori/midori-view.c:1318
 #, c-format
 msgid "%s wants to know your location."
 msgstr "%s 要获知您的位置。"
 
-#: ../midori/midori-view.c:1448
+#: ../midori/midori-view.c:1409
 #, c-format
 msgid "Error - %s"
 msgstr "错误-%s"
 
-#: ../midori/midori-view.c:1449
+#: ../midori/midori-view.c:1410
 #, c-format
 msgid "The page '%s' couldn't be loaded."
 msgstr "未能载入 ‘%s’ 页面。"
 
-#: ../midori/midori-view.c:1451
+#: ../midori/midori-view.c:1412
 msgid "Try again"
 msgstr "重试"
 
-#: ../midori/midori-view.c:1613 ../midori/midori-view.c:2516
+#: ../midori/midori-view.c:1576 ../midori/midori-view.c:2479
 #, c-format
 msgid "Send a message to %s"
 msgstr "向 %s 发送邮件"
 
-#: ../midori/midori-view.c:2347 ../midori/midori-view.c:2665
+#: ../midori/midori-view.c:2310 ../midori/midori-view.c:2628
 msgid "Inspect _Element"
 msgstr "检查元素(_E)"
 
-#: ../midori/midori-view.c:2399
+#: ../midori/midori-view.c:2362
 msgid "Open Link in New _Tab"
 msgstr "在新标签中打开链接(_T)"
 
-#: ../midori/midori-view.c:2403
+#: ../midori/midori-view.c:2366
 msgid "Open Link in _Foreground Tab"
 msgstr "在前台标签中打开链接(_F)"
 
-#: ../midori/midori-view.c:2404
+#: ../midori/midori-view.c:2367
 msgid "Open Link in _Background Tab"
 msgstr "在后台标签中打开链接(_B)"
 
-#: ../midori/midori-view.c:2407
+#: ../midori/midori-view.c:2370
 msgid "Open Link in New _Window"
 msgstr "在新窗口中打开链接(_W)"
 
-#: ../midori/midori-view.c:2410
+#: ../midori/midori-view.c:2373
 msgid "Open Link as Web A_pplication"
 msgstr "将链接作为网络应用程序打开(_P)"
 
-#: ../midori/midori-view.c:2415
+#: ../midori/midori-view.c:2378
 msgid "Copy Link de_stination"
 msgstr "复制链接目的地(_S)"
 
-#: ../midori/midori-view.c:2431
+#: ../midori/midori-view.c:2394
 msgid "Open _Image in New Tab"
 msgstr "在新标签中打开图片(_I)"
 
-#: ../midori/midori-view.c:2434
+#: ../midori/midori-view.c:2397
 msgid "Copy Image _Address"
 msgstr "复制图片地址(_A)"
 
-#: ../midori/midori-view.c:2437
+#: ../midori/midori-view.c:2400
 msgid "Save I_mage"
 msgstr "保存图片(_M)"
 
-#: ../midori/midori-view.c:2440
+#: ../midori/midori-view.c:2403
 msgid "Open in Image _Viewer"
 msgstr "在图片查看器中打开(_V)"
 
-#: ../midori/midori-view.c:2447
+#: ../midori/midori-view.c:2410
 msgid "Copy Video _Address"
 msgstr "复制视频地址(_A)"
 
-#: ../midori/midori-view.c:2450
+#: ../midori/midori-view.c:2413
 msgid "Save _Video"
 msgstr "保存视频(_V)"
 
-#: ../midori/midori-view.c:2450
+#: ../midori/midori-view.c:2413
 msgid "Download _Video"
 msgstr "下载视频(_V)"
 
-#: ../midori/midori-view.c:2476
+#: ../midori/midori-view.c:2439
 msgid "Search _with"
 msgstr "搜索方式(_W)"
 
-#: ../midori/midori-view.c:2508
+#: ../midori/midori-view.c:2471
 msgid "_Search the Web"
 msgstr "搜索网络(_S)"
 
-#: ../midori/midori-view.c:2524
+#: ../midori/midori-view.c:2487
 msgid "Open Address in New _Tab"
 msgstr "在新标签中打开地址(_T)"
 
-#: ../midori/midori-view.c:2815
+#: ../midori/midori-view.c:2778
 msgid "Open or download file"
 msgstr "打开或下载文件"
 
-#: ../midori/midori-view.c:2834
+#: ../midori/midori-view.c:2797
 #, c-format
 msgid "File Type: '%s'"
 msgstr "文件类型：‘%s’"
 
-#: ../midori/midori-view.c:2836
+#: ../midori/midori-view.c:2799
 #, 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:2853
+#: ../midori/midori-view.c:2816
 #, c-format
 msgid "Open %s"
 msgstr "打开 %s"
 
-#: ../midori/midori-view.c:3478
+#: ../midori/midori-view.c:3441
 #, c-format
 msgid "Inspect page - %s"
 msgstr "检查页面-%s"
 
-#: ../midori/midori-view.c:3772
+#: ../midori/midori-view.c:3735
 msgid "Speed Dial"
 msgstr "快速拨号"
 
-#: ../midori/midori-view.c:3773 ../midori/midori-view.c:3869
+#: ../midori/midori-view.c:3736 ../midori/midori-view.c:3832
 msgid "Click to add a shortcut"
 msgstr "点击添加快捷方式"
 
-#: ../midori/midori-view.c:3774
+#: ../midori/midori-view.c:3737
 msgid "Enter shortcut address"
 msgstr "输入快捷方式地址"
 
-#: ../midori/midori-view.c:3775
+#: ../midori/midori-view.c:3738
 msgid "Enter shortcut title"
 msgstr "输入快捷方式标题"
 
-#: ../midori/midori-view.c:3776
+#: ../midori/midori-view.c:3739
 msgid "Are you sure you want to delete this shortcut?"
 msgstr "您确定要删除此快捷方式吗？"
 
-#: ../midori/midori-view.c:3938
+#: ../midori/midori-view.c:3901
 #, c-format
 msgid "No documentation installed"
 msgstr "未安装文档"
 
-#: ../midori/midori-view.c:4014
+#: ../midori/midori-view.c:3977
 msgid "Midori doesn't store any personal data:"
 msgstr "Midori 没有存储任何个人数据："
 
-#: ../midori/midori-view.c:4015
+#: ../midori/midori-view.c:3978
 msgid "No history or web cookies are being saved."
 msgstr "未保存历史或网络隐私信息。"
 
-#: ../midori/midori-view.c:4016
+#: ../midori/midori-view.c:3979
 msgid "Extensions are disabled."
 msgstr "已禁用扩展。"
 
-#: ../midori/midori-view.c:4017
+#: ../midori/midori-view.c:3980
 msgid "HTML5 storage, local database and application caches are disabled."
 msgstr "已禁用 HTML5 存储、本地数据库和应用程序缓存。"
 
-#: ../midori/midori-view.c:4018
+#: ../midori/midori-view.c:3981
 msgid "Midori prevents websites from tracking the user:"
 msgstr "Midori 阻止网站追踪用户："
 
-#: ../midori/midori-view.c:4019
+#: ../midori/midori-view.c:3982
 msgid "Referrer URLs are stripped down to the hostname."
 msgstr "剥离提交信息 URL 为主机名。"
 
-#: ../midori/midori-view.c:4020
+#: ../midori/midori-view.c:3983
 msgid "DNS prefetching is disabled."
 msgstr "已禁用 DNS 预取。"
 
-#: ../midori/midori-view.c:4021
+#: ../midori/midori-view.c:3984
 msgid "The language and timezone are not revealed to websites."
 msgstr "不向网站透露语言和时区。"
 
-#: ../midori/midori-view.c:4022
+#: ../midori/midori-view.c:3985
 msgid "Flash and other Netscape plugins cannot be listed by websites."
 msgstr "网站未能列出动画和其它 Netscape 插件。"
 
-#: ../midori/midori-view.c:4060
+#: ../midori/midori-view.c:4023
 msgid "Version numbers in brackets show the version used at runtime."
 msgstr "在括号中的版本号显示运行时的版本。"
 
-#: ../midori/midori-view.c:4108
+#: ../midori/midori-view.c:4071
 msgid "Page loading delayed"
 msgstr "页面载入发生延迟"
 
-#: ../midori/midori-view.c:4109
+#: ../midori/midori-view.c:4072
 msgid "Loading delayed either due to a recent crash or startup preferences."
 msgstr "由于最近的崩溃或启动首选项，载入页面发生延迟。"
 
-#: ../midori/midori-view.c:4110
+#: ../midori/midori-view.c:4073
 msgid "Load Page"
 msgstr "载入页面"
 
-#: ../midori/midori-view.c:4249
+#: ../midori/midori-view.c:4212
 msgid "Blank page"
 msgstr "空白页面"
 
-#: ../midori/midori-view.c:4511
+#: ../midori/midori-view.c:4474
 msgid "_Duplicate Tab"
 msgstr "复制标签(_D)"
 
-#: ../midori/midori-view.c:4516
+#: ../midori/midori-view.c:4479
 msgid "Show Tab _Label"
 msgstr "显示标签标记(_L)"
 
-#: ../midori/midori-view.c:4516
+#: ../midori/midori-view.c:4479
 msgid "Show Tab _Icon Only"
 msgstr "仅显示标签图标(_I)"
 
-#: ../midori/midori-view.c:4522
+#: ../midori/midori-view.c:4485
 msgid "Close ot_her Tabs"
 msgstr "关闭其它标签(_H)"
 
 #. i18n: word stem of "previous page" type links, case is not important
-#: ../midori/midori-view.c:5176
+#: ../midori/midori-view.c:5139
 msgid "previous"
 msgstr "上一个"
 
 #. i18n: word stem of "next page" type links, case is not important
-#: ../midori/midori-view.c:5195
+#: ../midori/midori-view.c:5158
 msgid "next"
 msgstr "下一个"
 
-#: ../midori/midori-view.c:5208
+#: ../midori/midori-view.c:5171
 msgid "Print background images"
 msgstr "打印背景图片"
 
-#: ../midori/midori-view.c:5209
+#: ../midori/midori-view.c:5172
 msgid "Whether background images should be printed"
 msgstr "是否打印页面的背景图片"
 
-#: ../midori/midori-view.c:5241
+#: ../midori/midori-view.c:5204
 msgid "Features"
 msgstr "功能"
 
@@ -2590,37 +2590,65 @@ msgstr "源面板"
 msgid "Read Atom/ RSS feeds"
 msgstr "阅读 Atom/RSS 源"
 
-#: ../extensions/formhistory/formhistory.c:41
+#: ../extensions/formhistory/formhistory.c:40
 #, c-format
 msgid "Failed to add form value: %s\n"
 msgstr "无法添加表单值：%s\n"
 
-#: ../extensions/formhistory/formhistory.c:161
+#: ../extensions/formhistory/formhistory.c:96
+msgid "Form history"
+msgstr "表单历史"
+
+#: ../extensions/formhistory/formhistory.c:113
+msgid ""
+"Master password required\n"
+"to open password database"
+msgstr ""
+"需要主密码来\n"
+"打开密码数据库："
+
+#: ../extensions/formhistory/formhistory.c:289
+msgid "Remember password on this page?"
+msgstr "记住此页的密码？"
+
+#: ../extensions/formhistory/formhistory.c:294
+msgid "Remember"
+msgstr "记住"
+
+#: ../extensions/formhistory/formhistory.c:295
+msgid "Not now"
+msgstr "现在不"
+
+#: ../extensions/formhistory/formhistory.c:296
+msgid "Never for this page"
+msgstr "对此页从不"
+
+#: ../extensions/formhistory/formhistory.c:426
 msgid "Toggle form history state"
 msgstr "切换表单历史状态"
 
-#: ../extensions/formhistory/formhistory.c:162
+#: ../extensions/formhistory/formhistory.c:427
 msgid "Activate or deactivate form history for the current tab."
 msgstr "为当前标签激活或停用表单历史。"
 
-#: ../extensions/formhistory/formhistory.c:263
-#: ../extensions/formhistory/formhistory.c:267
+#: ../extensions/formhistory/formhistory.c:540
+#: ../extensions/formhistory/formhistory.c:544
 #, c-format
 msgid "Failed to execute database statement: %s\n"
 msgstr "无法执行数据库语句：%s\n"
 
-#: ../extensions/formhistory/formhistory.c:343
-msgid "only activate form history via hotkey (Ctrl+Shift+F) per tab"
-msgstr "只通过热键(Ctrl + Shift + F)在每个标签上激活表单历史"
+#: ../extensions/formhistory/formhistory.c:620
+msgid "Only activate form history via hotkey (Ctrl+Shift+F) per tab"
+msgstr "在每个标签上通过热键(Ctrl + Shift + F)只激活表单历史"
 
-#: ../extensions/formhistory/formhistory.c:399
-msgid "Stores history of entered form data"
-msgstr "存储已输入的表单数据历史"
-
-#: ../extensions/formhistory/formhistory.c:402
+#: ../extensions/formhistory/formhistory.c:659
 msgid "Form history filler"
 msgstr "表单历史填写器"
 
+#: ../extensions/formhistory/formhistory.c:660
+msgid "Stores history of entered form data"
+msgstr "存储已输入的表单数据历史"
+
 #: ../extensions/formhistory/formhistory-gdom-frontend.c:219
 #: ../extensions/formhistory/formhistory-js-frontend.c:106
 #, c-format
@@ -2732,11 +2760,11 @@ msgstr "脚本"
 msgid "Netscape plugins"
 msgstr "Netscape 插件"
 
-#: ../extensions/statusbar-features.c:192
+#: ../extensions/statusbar-features.c:193
 msgid "Statusbar Features"
 msgstr "状态栏功能"
 
-#: ../extensions/statusbar-features.c:193
+#: ../extensions/statusbar-features.c:194
 msgid "Easily toggle features on web pages on and off"
 msgstr "方便地打开或关闭网页中的功能"