2 files changed, 303 insertions, 147 deletions
diff --git a/searx/translations/zh_CN/LC_MESSAGES/messages.mo b/searx/translations/zh_CN/LC_MESSAGES/messages.mo
index b86e19c76..bcf3fd806 100644
--- a/searx/translations/zh_CN/LC_MESSAGES/messages.mo
+++ b/searx/translations/zh_CN/LC_MESSAGES/messages.mo
diff --git a/searx/translations/zh_CN/LC_MESSAGES/messages.po b/searx/translations/zh_CN/LC_MESSAGES/messages.po
index c37c71e85..a0fe8a482 100644
--- a/searx/translations/zh_CN/LC_MESSAGES/messages.po
+++ b/searx/translations/zh_CN/LC_MESSAGES/messages.po
@@ -1,17 +1,17 @@
 # Translations template for PROJECT.
-# Copyright (C) 2016 ORGANIZATION
+# Copyright (C) 2017 ORGANIZATION
 # This file is distributed under the same license as the PROJECT project.
 # 
 # Translators:
 # wenke, 2015
-# wenke, 2015-2016
+# wenke, 2015-2017
 msgid ""
 msgstr ""
 "Project-Id-Version: searx\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2016-12-29 10:42+0100\n"
-"PO-Revision-Date: 2017-03-18 20:30+0000\n"
-"Last-Translator: Adam Tauber <asciimoo@gmail.com>\n"
+"POT-Creation-Date: 2017-10-07 19:18+0200\n"
+"PO-Revision-Date: 2017-10-08 13:28+0000\n"
+"Last-Translator: wenke\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/asciimoo/searx/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,109 +20,126 @@ msgstr ""
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: searx/webapp.py:123
+#: searx/search.py:137 searx/search.py:182
+msgid "timeout"
+msgstr "超时"
+
+#: searx/search.py:144
+msgid "request exception"
+msgstr "请求异常"
+
+#: searx/search.py:151
+msgid "unexpected crash"
+msgstr "意外崩溃"
+
+#: searx/webapp.py:135
 msgid "files"
 msgstr "文件"
 
-#: searx/webapp.py:124
+#: searx/webapp.py:136
 msgid "general"
 msgstr "全部"
 
-#: searx/webapp.py:125
+#: searx/webapp.py:137
 msgid "music"
 msgstr "音乐"
 
-#: searx/webapp.py:126
+#: searx/webapp.py:138
 msgid "social media"
 msgstr "社交媒体"
 
-#: searx/webapp.py:127
+#: searx/webapp.py:139
 msgid "images"
 msgstr "图片"
 
-#: searx/webapp.py:128
+#: searx/webapp.py:140
 msgid "videos"
 msgstr "视频"
 
-#: searx/webapp.py:129
+#: searx/webapp.py:141
 msgid "it"
 msgstr "it"
 
-#: searx/webapp.py:130
+#: searx/webapp.py:142
 msgid "news"
 msgstr "新闻"
 
-#: searx/webapp.py:131
+#: searx/webapp.py:143
 msgid "map"
 msgstr "地图"
 
-#: searx/webapp.py:132
+#: searx/webapp.py:144
 msgid "science"
 msgstr "学术"
 
-#: searx/webapp.py:384 searx/webapp.py:594
+#: searx/webapp.py:398 searx/webapp.py:653
 msgid "Invalid settings, please edit your preferences"
-msgstr "无效设置，请编辑你的首选项"
+msgstr "无效的设置，请编辑你的首选项"
+
+#: searx/webapp.py:410
+msgid "Invalid settings"
+msgstr "设置无效"
 
-#: searx/webapp.py:425
+#: searx/webapp.py:444 searx/webapp.py:488
 msgid "search error"
 msgstr "搜索错误"
 
-#: searx/webapp.py:467
+#: searx/webapp.py:525
 msgid "{minutes} minute(s) ago"
 msgstr "{minutes}分钟之前"
 
-#: searx/webapp.py:469
+#: searx/webapp.py:527
 msgid "{hours} hour(s), {minutes} minute(s) ago"
 msgstr "{hours}小时{minutes}分钟之前"
 
-#: searx/answerers/random/answerer.py:48
+#: searx/answerers/random/answerer.py:53
 msgid "Random value generator"
 msgstr "随机数生成器"
 
-#: searx/answerers/random/answerer.py:49
+#: searx/answerers/random/answerer.py:54
 msgid "Generate different random values"
 msgstr "生成不同的随机数"
 
-#: searx/answerers/statistics/answerer.py:49
+#: searx/answerers/statistics/answerer.py:53
 msgid "Statistics functions"
 msgstr "统计功能"
 
-#: searx/answerers/statistics/answerer.py:50
+#: searx/answerers/statistics/answerer.py:54
 msgid "Compute {functions} of the arguments"
-msgstr ""
+msgstr "计算 {functions}参数"
 
-#: searx/engines/__init__.py:192
+#: searx/engines/__init__.py:194
 msgid "Engine time (sec)"
-msgstr ""
+msgstr "搜索引擎时间（秒）"
 
-#: searx/engines/__init__.py:196
+#: searx/engines/__init__.py:198
 msgid "Page loads (sec)"
 msgstr "页面加载 （秒）"
 
-#: searx/engines/__init__.py:200 searx/templates/oscar/results.html:88
+#: searx/engines/__init__.py:202 searx/templates/oscar/results.html:95
+#: searx/templates/simple/results.html:20
 msgid "Number of results"
 msgstr "结果数"
 
-#: searx/engines/__init__.py:204
+#: searx/engines/__init__.py:206
 msgid "Scores"
 msgstr "得分"
 
-#: searx/engines/__init__.py:208
+#: searx/engines/__init__.py:210
 msgid "Scores per result"
 msgstr "每个结果等分"
 
-#: searx/engines/__init__.py:212
+#: searx/engines/__init__.py:214
 msgid "Errors"
 msgstr "错误"
 
 #: searx/engines/pdbe.py:87
 msgid "{title}&nbsp;(OBSOLETE)"
-msgstr ""
+msgstr "{title}&nbsp;(OBSOLETE)"
 
 #: searx/engines/pdbe.py:91
 msgid "This entry has been superseded by"
-msgstr ""
+msgstr "此条目已经被取代"
 
 #: searx/plugins/doai_rewrite.py:7
 msgid "DOAI rewrite"
@@ -132,11 +149,11 @@ msgstr "DOAI改写"
 msgid ""
 "Avoid paywalls by redirecting to open-access versions of publications when "
 "available"
-msgstr ""
+msgstr "重定向到可浏览的文章来避免付费墙（如果可用）"
 
-#: searx/plugins/https_rewrite.py:29
+#: searx/plugins/https_rewrite.py:32
 msgid "Rewrite HTTP links to HTTPS if possible"
-msgstr "如果可能的话重定向HTTP链接到HTTPS"
+msgstr "尽可能重定向HTTP链接到HTTPS"
 
 #: searx/plugins/infinite_scroll.py:3
 msgid "Infinite scroll"
@@ -147,7 +164,8 @@ msgid "Automatically load next page when scrolling to bottom of current page"
 msgstr "滚动到当前页面底部时自动加载下一页"
 
 #: searx/plugins/open_results_on_new_tab.py:18
-#: searx/templates/oscar/preferences.html:113
+#: searx/templates/oscar/preferences.html:114
+#: searx/templates/simple/preferences.html:149
 msgid "Open result links on new browser tabs"
 msgstr "在新标签页打开搜索链接"
 
@@ -165,7 +183,7 @@ msgstr "搜索类别选择"
 msgid ""
 "Perform search immediately if a category selected. Disable to select "
 "multiple categories. (JavaScript required)"
-msgstr "选中一个类别立即搜索。禁用可以选择多个类别搜索。（JavaScript 启用）"
+msgstr "选中一个类别立即搜索。禁用可以选择多个类别搜索。（需要启用JavaScript ）"
 
 #: searx/plugins/self_info.py:20
 msgid ""
@@ -193,17 +211,20 @@ msgstr "使用类vim快捷键浏览搜索结果（JavaScript启用）。按“h�
 
 #: searx/templates/courgette/404.html:4 searx/templates/legacy/404.html:4
 #: searx/templates/oscar/404.html:4 searx/templates/pix-art/404.html:4
+#: searx/templates/simple/404.html:4
 msgid "Page not found"
 msgstr "未找到网页"
 
 #: searx/templates/courgette/404.html:6 searx/templates/legacy/404.html:6
 #: searx/templates/oscar/404.html:6 searx/templates/pix-art/404.html:6
+#: searx/templates/simple/404.html:6
 #, python-format
 msgid "Go to %(search_page)s."
 msgstr "返回%(search_page)s。"
 
 #: searx/templates/courgette/404.html:6 searx/templates/legacy/404.html:6
 #: searx/templates/oscar/404.html:6 searx/templates/pix-art/404.html:6
+#: searx/templates/simple/404.html:6
 msgid "search page"
 msgstr "搜索页面"
 
@@ -211,7 +232,7 @@ msgstr "搜索页面"
 #: searx/templates/courgette/index.html:13
 #: searx/templates/courgette/results.html:5
 #: searx/templates/legacy/index.html:8 searx/templates/legacy/index.html:12
-#: searx/templates/oscar/navbar.html:12
+#: searx/templates/oscar/navbar.html:7
 #: searx/templates/oscar/preferences.html:3
 #: searx/templates/pix-art/index.html:8
 msgid "preferences"
@@ -219,28 +240,32 @@ msgstr "首选项"
 
 #: searx/templates/courgette/index.html:11
 #: searx/templates/legacy/index.html:10 searx/templates/oscar/about.html:2
-#: searx/templates/oscar/navbar.html:11 searx/templates/pix-art/index.html:7
+#: searx/templates/oscar/navbar.html:6 searx/templates/pix-art/index.html:7
 msgid "about"
 msgstr "关于"
 
 #: searx/templates/courgette/preferences.html:5
 #: searx/templates/legacy/preferences.html:5
-#: searx/templates/oscar/preferences.html:7
+#: searx/templates/oscar/preferences.html:8
 #: searx/templates/pix-art/preferences.html:5
+#: searx/templates/simple/preferences.html:26
 msgid "Preferences"
 msgstr "首选项"
 
 #: searx/templates/courgette/preferences.html:9
 #: searx/templates/legacy/preferences.html:9
-#: searx/templates/oscar/preferences.html:32
-#: searx/templates/oscar/preferences.html:34
+#: searx/templates/oscar/preferences.html:33
+#: searx/templates/oscar/preferences.html:35
+#: searx/templates/simple/preferences.html:34
 msgid "Default categories"
 msgstr "默认类别"
 
 #: searx/templates/courgette/preferences.html:13
 #: searx/templates/legacy/preferences.html:14
-#: searx/templates/oscar/preferences.html:40
+#: searx/templates/oscar/preferences.html:41
 #: searx/templates/pix-art/preferences.html:9
+#: searx/templates/simple/preferences.html:39
+#: searx/templates/simple/preferences.html:163
 msgid "Search language"
 msgstr "搜索语言"
 
@@ -248,77 +273,91 @@ msgstr "搜索语言"
 #: searx/templates/legacy/preferences.html:17
 #: searx/templates/oscar/languages.html:6
 #: searx/templates/pix-art/preferences.html:12
+#: searx/templates/simple/languages.html:2
+#: searx/templates/simple/preferences.html:42
 msgid "Default language"
-msgstr ""
+msgstr "默认语言"
 
 #: searx/templates/courgette/preferences.html:24
 #: searx/templates/legacy/preferences.html:25
-#: searx/templates/oscar/preferences.html:46
+#: searx/templates/oscar/preferences.html:47
 #: searx/templates/pix-art/preferences.html:20
+#: searx/templates/simple/preferences.html:120
 msgid "Interface language"
 msgstr "界面语言"
 
 #: searx/templates/courgette/preferences.html:34
 #: searx/templates/legacy/preferences.html:35
-#: searx/templates/oscar/preferences.html:56
+#: searx/templates/oscar/preferences.html:57
+#: searx/templates/simple/preferences.html:51
 msgid "Autocomplete"
 msgstr "自动补全"
 
 #: searx/templates/courgette/preferences.html:45
 #: searx/templates/legacy/preferences.html:46
-#: searx/templates/oscar/preferences.html:67
+#: searx/templates/oscar/preferences.html:68
+#: searx/templates/simple/preferences.html:166
 msgid "Image proxy"
 msgstr "代理图片"
 
 #: searx/templates/courgette/preferences.html:48
 #: searx/templates/legacy/preferences.html:49
-#: searx/templates/oscar/preferences.html:71
+#: searx/templates/oscar/preferences.html:72
+#: searx/templates/simple/preferences.html:169
 msgid "Enabled"
 msgstr "启用"
 
 #: searx/templates/courgette/preferences.html:49
 #: searx/templates/legacy/preferences.html:50
-#: searx/templates/oscar/preferences.html:72
+#: searx/templates/oscar/preferences.html:73
+#: searx/templates/simple/preferences.html:170
 msgid "Disabled"
 msgstr "禁用"
 
 #: searx/templates/courgette/preferences.html:54
 #: searx/templates/legacy/preferences.html:55
-#: searx/templates/oscar/preferences.html:76
+#: searx/templates/oscar/preferences.html:77
 #: searx/templates/pix-art/preferences.html:30
+#: searx/templates/simple/preferences.html:156
 msgid "Method"
 msgstr "方法"
 
 #: searx/templates/courgette/preferences.html:63
 #: searx/templates/legacy/preferences.html:64
-#: searx/templates/oscar/preferences.html:85
-#: searx/templates/oscar/preferences.html:152
-#: searx/templates/oscar/preferences.html:159
+#: searx/templates/oscar/preferences.html:86
+#: searx/templates/oscar/preferences.html:153
+#: searx/templates/oscar/preferences.html:161
+#: searx/templates/simple/preferences.html:63
+#: searx/templates/simple/preferences.html:90
 msgid "SafeSearch"
 msgstr "安全搜索"
 
 #: searx/templates/courgette/preferences.html:66
 #: searx/templates/legacy/preferences.html:67
-#: searx/templates/oscar/preferences.html:89
+#: searx/templates/oscar/preferences.html:90
+#: searx/templates/simple/preferences.html:66
 msgid "Strict"
 msgstr "严格模式"
 
 #: searx/templates/courgette/preferences.html:67
 #: searx/templates/legacy/preferences.html:68
-#: searx/templates/oscar/preferences.html:90
+#: searx/templates/oscar/preferences.html:91
+#: searx/templates/simple/preferences.html:67
 msgid "Moderate"
 msgstr "中等"
 
 #: searx/templates/courgette/preferences.html:68
 #: searx/templates/legacy/preferences.html:69
-#: searx/templates/oscar/preferences.html:91
+#: searx/templates/oscar/preferences.html:92
+#: searx/templates/simple/preferences.html:68
 msgid "None"
 msgstr "不过滤"
 
 #: searx/templates/courgette/preferences.html:73
 #: searx/templates/legacy/preferences.html:74
-#: searx/templates/oscar/preferences.html:95
+#: searx/templates/oscar/preferences.html:96
 #: searx/templates/pix-art/preferences.html:39
+#: searx/templates/simple/preferences.html:131
 msgid "Themes"
 msgstr "主题"
 
@@ -353,14 +392,16 @@ msgstr "红色"
 #: searx/templates/courgette/preferences.html:96
 #: searx/templates/legacy/preferences.html:93
 #: searx/templates/pix-art/preferences.html:49
+#: searx/templates/simple/preferences.html:77
 msgid "Currently used search engines"
 msgstr "目前使用的搜索引擎"
 
 #: searx/templates/courgette/preferences.html:100
 #: searx/templates/legacy/preferences.html:97
-#: searx/templates/oscar/preferences.html:149
-#: searx/templates/oscar/preferences.html:162
+#: searx/templates/oscar/preferences.html:150
+#: searx/templates/oscar/preferences.html:164
 #: searx/templates/pix-art/preferences.html:53
+#: searx/templates/simple/preferences.html:87
 msgid "Engine name"
 msgstr "搜索引擎名称"
 
@@ -373,10 +414,11 @@ msgstr "类别"
 #: searx/templates/courgette/preferences.html:113
 #: searx/templates/legacy/preferences.html:99
 #: searx/templates/legacy/preferences.html:110
-#: searx/templates/oscar/preferences.html:148
-#: searx/templates/oscar/preferences.html:163
+#: searx/templates/oscar/preferences.html:149
+#: searx/templates/oscar/preferences.html:165
 #: searx/templates/pix-art/preferences.html:54
 #: searx/templates/pix-art/preferences.html:64
+#: searx/templates/simple/preferences.html:86
 msgid "Allow"
 msgstr "允许"
 
@@ -391,86 +433,98 @@ msgstr "阻止"
 
 #: searx/templates/courgette/preferences.html:122
 #: searx/templates/legacy/preferences.html:119
-#: searx/templates/oscar/preferences.html:282
+#: searx/templates/oscar/preferences.html:285
 #: searx/templates/pix-art/preferences.html:73
+#: searx/templates/simple/preferences.html:180
 msgid ""
 "These settings are stored in your cookies, this allows us not to store this "
 "data about you."
-msgstr "这些设置保存在你的cookie，我们不能保存你的数据。"
+msgstr "这些设置保存在你的cookie，我们将不能保存你的数据。"
 
 #: searx/templates/courgette/preferences.html:124
 #: searx/templates/legacy/preferences.html:121
-#: searx/templates/oscar/preferences.html:284
+#: searx/templates/oscar/preferences.html:287
 #: searx/templates/pix-art/preferences.html:75
+#: searx/templates/simple/preferences.html:182
 msgid ""
 "These cookies serve your sole convenience, we don't use these cookies to "
 "track you."
-msgstr "这些cookie是为了让你更加方便，我们不会使用这些cookie追踪你。"
+msgstr "这些cookie是为了让你更加方便，我们不会使用cookie追踪你。"
 
 #: searx/templates/courgette/preferences.html:127
 #: searx/templates/legacy/preferences.html:124
-#: searx/templates/oscar/preferences.html:287
+#: searx/templates/oscar/preferences.html:293
 #: searx/templates/pix-art/preferences.html:78
+#: searx/templates/simple/preferences.html:185
 msgid "save"
 msgstr "保存"
 
 #: searx/templates/courgette/preferences.html:128
 #: searx/templates/legacy/preferences.html:125
-#: searx/templates/oscar/preferences.html:289
+#: searx/templates/oscar/preferences.html:295
+#: searx/templates/simple/preferences.html:186
 msgid "Reset defaults"
 msgstr "恢复默认"
 
 #: searx/templates/courgette/preferences.html:129
 #: searx/templates/legacy/preferences.html:126
-#: searx/templates/oscar/preferences.html:288
+#: searx/templates/oscar/preferences.html:294
 #: searx/templates/pix-art/preferences.html:79
+#: searx/templates/simple/preferences.html:187
 msgid "back"
 msgstr "返回"
 
 #: searx/templates/courgette/results.html:12
 #: searx/templates/legacy/results.html:13
-#: searx/templates/oscar/results.html:124
+#: searx/templates/oscar/results.html:136
+#: searx/templates/simple/results.html:58
 msgid "Search URL"
 msgstr "搜索链接"
 
 #: searx/templates/courgette/results.html:16
 #: searx/templates/legacy/results.html:17
-#: searx/templates/oscar/results.html:129
+#: searx/templates/oscar/results.html:141
+#: searx/templates/simple/results.html:62
 msgid "Download results"
 msgstr "下载结果"
 
 #: searx/templates/courgette/results.html:34
 #: searx/templates/legacy/results.html:35
+#: searx/templates/simple/results.html:10
 msgid "Answers"
 msgstr "回答"
 
 #: searx/templates/courgette/results.html:42
 #: searx/templates/legacy/results.html:43
-#: searx/templates/oscar/results.html:104
+#: searx/templates/oscar/results.html:116
+#: searx/templates/simple/results.html:42
 msgid "Suggestions"
 msgstr "搜索建议"
 
 #: searx/templates/courgette/results.html:70
 #: searx/templates/legacy/results.html:81
-#: searx/templates/oscar/results.html:53 searx/templates/oscar/results.html:66
+#: searx/templates/oscar/results.html:68 searx/templates/oscar/results.html:78
+#: searx/templates/simple/results.html:130
 msgid "previous page"
 msgstr "上一页"
 
 #: searx/templates/courgette/results.html:81
 #: searx/templates/legacy/results.html:92
-#: searx/templates/oscar/results.html:45 searx/templates/oscar/results.html:75
+#: searx/templates/oscar/results.html:62 searx/templates/oscar/results.html:84
+#: searx/templates/simple/results.html:145
 msgid "next page"
 msgstr "下一页"
 
 #: searx/templates/courgette/search.html:3
-#: searx/templates/legacy/search.html:3 searx/templates/oscar/search.html:4
+#: searx/templates/legacy/search.html:3 searx/templates/oscar/search.html:6
 #: searx/templates/oscar/search_full.html:9
-#: searx/templates/pix-art/search.html:3
+#: searx/templates/pix-art/search.html:3 searx/templates/simple/search.html:4
 msgid "Search for..."
 msgstr "搜索..."
 
 #: searx/templates/courgette/stats.html:4 searx/templates/legacy/stats.html:4
 #: searx/templates/oscar/stats.html:5 searx/templates/pix-art/stats.html:4
+#: searx/templates/simple/stats.html:7
 msgid "Engine stats"
 msgstr "搜索引擎统计"
 
@@ -483,50 +537,59 @@ msgstr "原始上下文"
 #: searx/templates/courgette/result_templates/torrent.html:7
 #: searx/templates/legacy/result_templates/torrent.html:11
 #: searx/templates/oscar/result_templates/torrent.html:6
+#: searx/templates/simple/result_templates/torrent.html:9
 msgid "Seeder"
 msgstr "Seeder"
 
 #: searx/templates/courgette/result_templates/torrent.html:7
 #: searx/templates/legacy/result_templates/torrent.html:11
 #: searx/templates/oscar/result_templates/torrent.html:6
+#: searx/templates/simple/result_templates/torrent.html:9
 msgid "Leecher"
 msgstr "Leecher"
 
 #: searx/templates/courgette/result_templates/torrent.html:9
 #: searx/templates/legacy/result_templates/torrent.html:9
-#: searx/templates/oscar/macros.html:24
+#: searx/templates/oscar/macros.html:23
+#: searx/templates/simple/result_templates/torrent.html:6
 msgid "magnet link"
 msgstr "磁力链接"
 
 #: searx/templates/courgette/result_templates/torrent.html:10
 #: searx/templates/legacy/result_templates/torrent.html:10
-#: searx/templates/oscar/macros.html:25
+#: searx/templates/oscar/macros.html:24
+#: searx/templates/simple/result_templates/torrent.html:7
 msgid "torrent file"
 msgstr "种子文件"
 
 #: searx/templates/legacy/categories.html:8
+#: searx/templates/simple/categories.html:6
 msgid "Click on the magnifier to perform search"
-msgstr "点击放大镜执行搜索"
+msgstr "点击放大镜开始搜索"
 
 #: searx/templates/legacy/preferences.html:84
-#: searx/templates/oscar/preferences.html:112
+#: searx/templates/oscar/preferences.html:113
+#: searx/templates/simple/preferences.html:142
 msgid "Results on new tabs"
 msgstr "在新标签页打开搜索结果"
 
 #: searx/templates/legacy/preferences.html:87
-#: searx/templates/oscar/preferences.html:116
+#: searx/templates/oscar/preferences.html:117
+#: searx/templates/simple/preferences.html:145
 msgid "On"
-msgstr "开"
+msgstr "启用"
 
 #: searx/templates/legacy/preferences.html:88
-#: searx/templates/oscar/preferences.html:117
+#: searx/templates/oscar/preferences.html:118
+#: searx/templates/simple/preferences.html:146
 msgid "Off"
-msgstr "关"
+msgstr "禁用"
 
 #: searx/templates/legacy/result_templates/code.html:3
 #: searx/templates/legacy/result_templates/default.html:3
 #: searx/templates/legacy/result_templates/map.html:9
-#: searx/templates/oscar/macros.html:35 searx/templates/oscar/macros.html:49
+#: searx/templates/oscar/macros.html:34 searx/templates/oscar/macros.html:48
+#: searx/templates/simple/macros.html:43
 msgid "cached"
 msgstr "缓存"
 
@@ -536,166 +599,211 @@ msgstr "高级设置"
 
 #: searx/templates/oscar/base.html:62
 #: searx/templates/oscar/messages/first_time.html:4
-#: searx/templates/oscar/messages/no_results.html:5
 #: searx/templates/oscar/messages/save_settings_successfull.html:5
 #: searx/templates/oscar/messages/unknow_error.html:5
 msgid "Close"
 msgstr "关闭"
 
 #: searx/templates/oscar/base.html:64
+#: searx/templates/oscar/messages/no_results.html:4
+#: searx/templates/simple/messages/no_results.html:4
+#: searx/templates/simple/results.html:25
 msgid "Error!"
-msgstr ""
+msgstr "错误！"
 
-#: searx/templates/oscar/base.html:90
+#: searx/templates/oscar/base.html:90 searx/templates/simple/base.html:55
 msgid "Powered by"
-msgstr "Powered by"
+msgstr "技术支持来自"
 
-#: searx/templates/oscar/base.html:90
+#: searx/templates/oscar/base.html:90 searx/templates/simple/base.html:55
 msgid "a privacy-respecting, hackable metasearch engine"
 msgstr "一个尊重隐私，可再开发的元搜索引擎"
 
-#: searx/templates/oscar/macros.html:37 searx/templates/oscar/macros.html:51
+#: searx/templates/oscar/macros.html:36 searx/templates/oscar/macros.html:50
+#: searx/templates/simple/macros.html:43
 msgid "proxied"
-msgstr ""
+msgstr "代理"
+
+#: searx/templates/oscar/macros.html:92
+msgid "supported"
+msgstr "支持的"
+
+#: searx/templates/oscar/macros.html:96
+msgid "not supported"
+msgstr "不支持的"
 
-#: searx/templates/oscar/preferences.html:12
-#: searx/templates/oscar/preferences.html:21
+#: searx/templates/oscar/preferences.html:13
+#: searx/templates/oscar/preferences.html:22
+#: searx/templates/simple/preferences.html:32
 msgid "General"
 msgstr "常规"
 
-#: searx/templates/oscar/preferences.html:13
-#: searx/templates/oscar/preferences.html:133
+#: searx/templates/oscar/preferences.html:14
+#: searx/templates/oscar/preferences.html:134
+#: searx/templates/simple/preferences.html:76
 msgid "Engines"
 msgstr "搜索引擎"
 
-#: searx/templates/oscar/preferences.html:14
-#: searx/templates/oscar/preferences.html:204
+#: searx/templates/oscar/preferences.html:15
+#: searx/templates/oscar/preferences.html:207
 msgid "Plugins"
 msgstr "插件"
 
-#: searx/templates/oscar/preferences.html:15
-#: searx/templates/oscar/preferences.html:230
+#: searx/templates/oscar/preferences.html:16
+#: searx/templates/oscar/preferences.html:233
 msgid "Answerers"
-msgstr ""
+msgstr "智能答复"
 
-#: searx/templates/oscar/preferences.html:16
-#: searx/templates/oscar/preferences.html:257
+#: searx/templates/oscar/preferences.html:17
+#: searx/templates/oscar/preferences.html:260
 msgid "Cookies"
 msgstr "Cookie"
 
-#: searx/templates/oscar/preferences.html:41
+#: searx/templates/oscar/preferences.html:42
+#: searx/templates/simple/preferences.html:48
 msgid "What language do you prefer for search?"
-msgstr "你更喜欢搜索什么语言？"
+msgstr "你搜索时更喜欢什么语言？"
 
-#: searx/templates/oscar/preferences.html:47
+#: searx/templates/oscar/preferences.html:48
+#: searx/templates/simple/preferences.html:128
 msgid "Change the language of the layout"
 msgstr "改变界面语言"
 
-#: searx/templates/oscar/preferences.html:57
+#: searx/templates/oscar/preferences.html:58
+#: searx/templates/simple/preferences.html:60
 msgid "Find stuff as you type"
 msgstr "自动补全搜索字词"
 
-#: searx/templates/oscar/preferences.html:68
+#: searx/templates/oscar/preferences.html:69
+#: searx/templates/simple/preferences.html:173
 msgid "Proxying image results through searx"
 msgstr "通过searx代理图片"
 
-#: searx/templates/oscar/preferences.html:77
+#: searx/templates/oscar/preferences.html:78
 msgid ""
 "Change how forms are submited, <a "
 "href=\"http://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Request_methods\""
 " rel=\"external\">learn more about request methods</a>"
 msgstr "更改请求方法，<a href=\"http://zh.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Request_methods\" rel=\"external\">深入了解请求方法</a>"
 
-#: searx/templates/oscar/preferences.html:86
+#: searx/templates/oscar/preferences.html:87
+#: searx/templates/simple/preferences.html:71
 msgid "Filter content"
 msgstr "过滤内容"
 
-#: searx/templates/oscar/preferences.html:96
+#: searx/templates/oscar/preferences.html:97
+#: searx/templates/simple/preferences.html:139
 msgid "Change searx layout"
 msgstr "改变searx布局"
 
-#: searx/templates/oscar/preferences.html:105
-#: searx/templates/oscar/preferences.html:110
+#: searx/templates/oscar/preferences.html:106
+#: searx/templates/oscar/preferences.html:111
 msgid "Choose style for this theme"
 msgstr "选择这个主题的样式"
 
-#: searx/templates/oscar/preferences.html:105
-#: searx/templates/oscar/preferences.html:110
+#: searx/templates/oscar/preferences.html:106
+#: searx/templates/oscar/preferences.html:111
 msgid "Style"
 msgstr "样式"
 
-#: searx/templates/oscar/preferences.html:150
-#: searx/templates/oscar/preferences.html:161
+#: searx/templates/oscar/preferences.html:151
+#: searx/templates/oscar/preferences.html:163
+#: searx/templates/simple/preferences.html:88
 msgid "Shortcut"
 msgstr "快捷键"
 
-#: searx/templates/oscar/preferences.html:151
-#: searx/templates/oscar/preferences.html:160
-msgid "Supports selected language"
-msgstr ""
+#: searx/templates/oscar/preferences.html:152
+#: searx/templates/oscar/preferences.html:162
+msgid "Selected language"
+msgstr "选择语言"
 
-#: searx/templates/oscar/preferences.html:153
+#: searx/templates/oscar/preferences.html:154
+#: searx/templates/oscar/preferences.html:160
+#: searx/templates/simple/preferences.html:91
 msgid "Time range"
-msgstr ""
+msgstr "时间范围"
 
-#: searx/templates/oscar/preferences.html:154
-#: searx/templates/oscar/preferences.html:158
+#: searx/templates/oscar/preferences.html:155
+#: searx/templates/oscar/preferences.html:159
+#: searx/templates/simple/preferences.html:92
 msgid "Avg. time"
 msgstr "平均时间"
 
-#: searx/templates/oscar/preferences.html:155
-#: searx/templates/oscar/preferences.html:157
+#: searx/templates/oscar/preferences.html:156
+#: searx/templates/oscar/preferences.html:158
+#: searx/templates/simple/preferences.html:93
 msgid "Max time"
 msgstr "最大时间"
 
-#: searx/templates/oscar/preferences.html:233
+#: searx/templates/oscar/preferences.html:236
 msgid "This is the list of searx's instant answering modules."
-msgstr ""
+msgstr "这是searx的即时回答模块。"
 
-#: searx/templates/oscar/preferences.html:237
+#: searx/templates/oscar/preferences.html:240
 msgid "Name"
 msgstr "名称"
 
-#: searx/templates/oscar/preferences.html:238
+#: searx/templates/oscar/preferences.html:241
 msgid "Keywords"
 msgstr "关键词"
 
-#: searx/templates/oscar/preferences.html:239
+#: searx/templates/oscar/preferences.html:242
 msgid "Description"
 msgstr "描述"
 
-#: searx/templates/oscar/preferences.html:240
+#: searx/templates/oscar/preferences.html:243
 msgid "Examples"
 msgstr "例子"
 
-#: searx/templates/oscar/preferences.html:260
+#: searx/templates/oscar/preferences.html:263
 msgid ""
 "This is the list of cookies and their values searx is storing on your "
 "computer."
 msgstr "这里展示了searx保存在你的电脑上的cookie。"
 
-#: searx/templates/oscar/preferences.html:261
+#: searx/templates/oscar/preferences.html:264
 msgid "With that list, you can assess searx transparency."
 msgstr "有了这个列表，你可以评估searx透明度。"
 
-#: searx/templates/oscar/preferences.html:266
+#: searx/templates/oscar/preferences.html:269
 msgid "Cookie name"
 msgstr "cookie名称"
 
-#: searx/templates/oscar/preferences.html:267
+#: searx/templates/oscar/preferences.html:270
 msgid "Value"
 msgstr "值"
 
-#: searx/templates/oscar/results.html:7
+#: searx/templates/oscar/preferences.html:289
+msgid "Search URL of the currently saved preferences"
+msgstr "当前保存选项的搜索链接"
+
+#: searx/templates/oscar/preferences.html:289
+msgid ""
+"Note: specifying custom settings in the search URL can reduce privacy by "
+"leaking data to the clicked result sites."
+msgstr "注意：在搜索链接中保存自定义设置会把数据泄露给点击的网站泄漏隐私。"
+
+#: searx/templates/oscar/results.html:17
 msgid "Search results"
 msgstr "搜索结果"
 
-#: searx/templates/oscar/results.html:119
+#: searx/templates/oscar/results.html:21
+#: searx/templates/simple/results.html:84
+msgid "Try searching for:"
+msgstr "尝试搜索："
+
+#: searx/templates/oscar/results.html:100
+#: searx/templates/simple/results.html:25
+msgid "Engines cannot retrieve results"
+msgstr "引擎无法检索结果"
+
+#: searx/templates/oscar/results.html:131
 msgid "Links"
 msgstr "链接"
 
-#: searx/templates/oscar/search.html:6
+#: searx/templates/oscar/search.html:8
 #: searx/templates/oscar/search_full.html:11
+#: searx/templates/simple/search.html:5
 msgid "Start search"
 msgstr "开始搜索"
 
@@ -704,24 +812,29 @@ msgid "stats"
 msgstr "统计"
 
 #: searx/templates/oscar/time-range.html:3
+#: searx/templates/simple/time-range.html:3
 msgid "Anytime"
 msgstr "时间不限"
 
 #: searx/templates/oscar/time-range.html:6
+#: searx/templates/simple/time-range.html:6
 msgid "Last day"
-msgstr "过去一天内"
+msgstr "一天内"
 
 #: searx/templates/oscar/time-range.html:9
+#: searx/templates/simple/time-range.html:9
 msgid "Last week"
-msgstr "过去一周内"
+msgstr "一周内"
 
 #: searx/templates/oscar/time-range.html:12
+#: searx/templates/simple/time-range.html:12
 msgid "Last month"
-msgstr "过去一个月内"
+msgstr "一月内"
 
 #: searx/templates/oscar/time-range.html:15
+#: searx/templates/simple/time-range.html:15
 msgid "Last year"
-msgstr ""
+msgstr "一年内"
 
 #: searx/templates/oscar/messages/first_time.html:6
 #: searx/templates/oscar/messages/no_data_available.html:3
@@ -744,11 +857,23 @@ msgstr "目前还未保存cookie。"
 msgid "There is currently no data available. "
 msgstr "目前没有数据可用。"
 
-#: searx/templates/oscar/messages/no_results.html:7
+#: searx/templates/oscar/messages/no_results.html:4
+#: searx/templates/simple/messages/no_results.html:4
+msgid "Engines cannot retrieve results."
+msgstr "引擎无法检索结果。"
+
+#: searx/templates/oscar/messages/no_results.html:10
+#: searx/templates/simple/messages/no_results.html:10
+msgid "Please, try again later or find another searx instance."
+msgstr "请稍后再试或使用其他的searx实例。"
+
+#: searx/templates/oscar/messages/no_results.html:14
+#: searx/templates/simple/messages/no_results.html:14
 msgid "Sorry!"
 msgstr "抱歉！"
 
-#: searx/templates/oscar/messages/no_results.html:8
+#: searx/templates/oscar/messages/no_results.html:15
+#: searx/templates/simple/messages/no_results.html:15
 msgid ""
 "we didn't find any results. Please use another query or search in more "
 "categories."
@@ -771,10 +896,12 @@ msgid "Something went wrong."
 msgstr "出了些问题。"
 
 #: searx/templates/oscar/result_templates/default.html:7
+#: searx/templates/simple/result_templates/default.html:6
 msgid "show media"
 msgstr "显示媒体"
 
 #: searx/templates/oscar/result_templates/default.html:7
+#: searx/templates/simple/result_templates/default.html:6
 msgid "hide media"
 msgstr "隐藏媒体"
 
@@ -787,57 +914,86 @@ msgid "View source"
 msgstr "查看来源"
 
 #: searx/templates/oscar/result_templates/map.html:7
+#: searx/templates/simple/result_templates/map.html:7
 msgid "show map"
 msgstr "显示地图"
 
 #: searx/templates/oscar/result_templates/map.html:7
+#: searx/templates/simple/result_templates/map.html:7
 msgid "hide map"
 msgstr "隐藏地图"
 
 #: searx/templates/oscar/result_templates/map.html:11
+#: searx/templates/simple/result_templates/map.html:11
 msgid "show details"
 msgstr "显示详细信息"
 
 #: searx/templates/oscar/result_templates/map.html:11
+#: searx/templates/simple/result_templates/map.html:11
 msgid "hide details"
 msgstr "隐藏详细信息"
 
 #: searx/templates/oscar/result_templates/torrent.html:7
+#: searx/templates/simple/result_templates/torrent.html:11
 msgid "Filesize"
 msgstr "文件大小"
 
 #: searx/templates/oscar/result_templates/torrent.html:9
+#: searx/templates/simple/result_templates/torrent.html:12
 msgid "Bytes"
 msgstr "B"
 
 #: searx/templates/oscar/result_templates/torrent.html:10
+#: searx/templates/simple/result_templates/torrent.html:13
 msgid "kiB"
 msgstr "KB"
 
 #: searx/templates/oscar/result_templates/torrent.html:11
+#: searx/templates/simple/result_templates/torrent.html:14
 msgid "MiB"
 msgstr "MB"
 
 #: searx/templates/oscar/result_templates/torrent.html:12
+#: searx/templates/simple/result_templates/torrent.html:15
 msgid "GiB"
 msgstr "GB"
 
 #: searx/templates/oscar/result_templates/torrent.html:13
+#: searx/templates/simple/result_templates/torrent.html:16
 msgid "TiB"
 msgstr "TB"
 
 #: searx/templates/oscar/result_templates/torrent.html:15
+#: searx/templates/simple/result_templates/torrent.html:20
 msgid "Number of Files"
 msgstr "文件数"
 
 #: searx/templates/oscar/result_templates/videos.html:7
+#: searx/templates/simple/result_templates/videos.html:6
 msgid "show video"
 msgstr "显示视频"
 
 #: searx/templates/oscar/result_templates/videos.html:7
+#: searx/templates/simple/result_templates/videos.html:6
 msgid "hide video"
 msgstr "隐藏视频"
 
 #: searx/templates/pix-art/results.html:28
 msgid "Load more..."
 msgstr "载入更多..."
+
+#: searx/templates/simple/base.html:31
+msgid "No item found"
+msgstr "未找到条目"
+
+#: searx/templates/simple/preferences.html:89
+msgid "Supports selected language"
+msgstr "是否支持选定的语言"
+
+#: searx/templates/simple/preferences.html:118
+msgid "User interface"
+msgstr "用户界面"
+
+#: searx/templates/simple/preferences.html:154
+msgid "Privacy"
+msgstr "隐私"