[enh] update translations

2 files changed, 243 insertions, 177 deletions

diff --git a/searx/translations/ja/LC_MESSAGES/messages.mo b/searx/translations/ja/LC_MESSAGES/messages.mo
index 3be04b797..cac0c1f2a 100644
--- a/searx/translations/ja/LC_MESSAGES/messages.mo
+++ b/searx/translations/ja/LC_MESSAGES/messages.mo
diff --git a/searx/translations/ja/LC_MESSAGES/messages.po b/searx/translations/ja/LC_MESSAGES/messages.po
index 9d0dc7e1c..87ee9ac8c 100644
--- a/searx/translations/ja/LC_MESSAGES/messages.po
+++ b/searx/translations/ja/LC_MESSAGES/messages.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: searx\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2016-09-04 18:36+0200\n"
-"PO-Revision-Date: 2016-09-04 16:41+0000\n"
+"POT-Creation-Date: 2016-12-29 10:42+0100\n"
+"PO-Revision-Date: 2016-12-29 09:43+0000\n"
 "Last-Translator: Adam Tauber <asciimoo@gmail.com>\n"
 "Language-Team: Japanese (http://www.transifex.com/asciimoo/searx/language/ja/)\n"
 "MIME-Version: 1.0\n"
@@ -25,83 +25,119 @@ msgstr ""
 "Language: ja\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: searx/webapp.py:115
+#: searx/webapp.py:123
 msgid "files"
 msgstr "ファイル"
 
-#: searx/webapp.py:116
+#: searx/webapp.py:124
 msgid "general"
 msgstr "一般"
 
-#: searx/webapp.py:117
+#: searx/webapp.py:125
 msgid "music"
 msgstr "音楽"
 
-#: searx/webapp.py:118
+#: searx/webapp.py:126
 msgid "social media"
 msgstr "ソーシャルメディア"
 
-#: searx/webapp.py:119
+#: searx/webapp.py:127
 msgid "images"
 msgstr "画像"
 
-#: searx/webapp.py:120
+#: searx/webapp.py:128
 msgid "videos"
 msgstr "動画"
 
-#: searx/webapp.py:121
+#: searx/webapp.py:129
 msgid "it"
 msgstr "情報技術"
 
-#: searx/webapp.py:122
+#: searx/webapp.py:130
 msgid "news"
 msgstr "お知らせ"
 
-#: searx/webapp.py:123
+#: searx/webapp.py:131
 msgid "map"
 msgstr "地図"
 
-#: searx/webapp.py:124
+#: searx/webapp.py:132
 msgid "science"
 msgstr "学問"
 
-#: searx/webapp.py:423
+#: searx/webapp.py:384 searx/webapp.py:594
+msgid "Invalid settings, please edit your preferences"
+msgstr "不正な設定です。設定を編集してください。"
+
+#: searx/webapp.py:425
+msgid "search error"
+msgstr "検索エラー"
+
+#: searx/webapp.py:467
 msgid "{minutes} minute(s) ago"
 msgstr "{minutes}分前"
 
-#: searx/webapp.py:425
+#: searx/webapp.py:469
 msgid "{hours} hour(s), {minutes} minute(s) ago"
 msgstr "{hours}時間と{minutes}分前"
 
-#: searx/engines/__init__.py:179
+#: searx/answerers/random/answerer.py:48
+msgid "Random value generator"
+msgstr "ランダム値の生成"
+
+#: searx/answerers/random/answerer.py:49
+msgid "Generate different random values"
+msgstr "新しいランダム値を生成する"
+
+#: searx/answerers/statistics/answerer.py:49
+msgid "Statistics functions"
+msgstr "統計機能"
+
+#: searx/answerers/statistics/answerer.py:50
+msgid "Compute {functions} of the arguments"
+msgstr "変数の{functions}を計算する"
+
+#: searx/engines/__init__.py:192
+msgid "Engine time (sec)"
+msgstr ""
+
+#: searx/engines/__init__.py:196
 msgid "Page loads (sec)"
 msgstr "ページ読み込み時間 (秒)"
 
-#: searx/engines/__init__.py:183 searx/templates/oscar/results.html:88
+#: searx/engines/__init__.py:200 searx/templates/oscar/results.html:88
 msgid "Number of results"
 msgstr "通知の数"
 
-#: searx/engines/__init__.py:187
+#: searx/engines/__init__.py:204
 msgid "Scores"
 msgstr "スコア"
 
-#: searx/engines/__init__.py:191
+#: searx/engines/__init__.py:208
 msgid "Scores per result"
 msgstr "検索結果当たりスコア"
 
-#: searx/engines/__init__.py:195
+#: searx/engines/__init__.py:212
 msgid "Errors"
 msgstr "エラー"
 
+#: searx/engines/pdbe.py:87
+msgid "{title}&nbsp;(OBSOLETE)"
+msgstr "{title}&nbsp;(廃止)"
+
+#: searx/engines/pdbe.py:91
+msgid "This entry has been superseded by"
+msgstr "このエントリーの優先"
+
 #: searx/plugins/doai_rewrite.py:7
 msgid "DOAI rewrite"
-msgstr ""
+msgstr "DOAI再書き込み"
 
 #: searx/plugins/doai_rewrite.py:8
 msgid ""
 "Avoid paywalls by redirecting to open-access versions of publications when "
 "available"
-msgstr ""
+msgstr "可能ならば出版物のオープンアクセス版へリダイレクトして有料の壁を避ける"
 
 #: searx/plugins/https_rewrite.py:29
 msgid "Rewrite HTTP links to HTTPS if possible"
@@ -109,14 +145,14 @@ msgstr "可能ならばHTTPリンクをHTTPSリンクに書き換える"
 
 #: searx/plugins/infinite_scroll.py:3
 msgid "Infinite scroll"
-msgstr ""
+msgstr "無限スクロール"
 
 #: searx/plugins/infinite_scroll.py:4
 msgid "Automatically load next page when scrolling to bottom of current page"
-msgstr ""
+msgstr "現在のページの下端でスクロールすると自動的に次のページを読み込む"
 
 #: searx/plugins/open_results_on_new_tab.py:18
-#: searx/templates/oscar/preferences.html:122
+#: searx/templates/oscar/preferences.html:113
 msgid "Open result links on new browser tabs"
 msgstr "検索結果のリンクを新しいタブで開く"
 
@@ -160,134 +196,133 @@ msgid ""
 "\"h\" key on main or result page to get help."
 msgstr "検索結果をVim風のホットキーで操作します(JavaScriptが必要)。メインページまたは検索結果ページで\"h\"キーを押してヘルプを表示します。"
 
-#: searx/templates/courgette/404.html:4 searx/templates/default/404.html:4
+#: 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
 msgid "Page not found"
-msgstr ""
+msgstr "ページが見付かりません"
 
-#: searx/templates/courgette/404.html:6 searx/templates/default/404.html:6
+#: 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
 #, python-format
 msgid "Go to %(search_page)s."
-msgstr ""
+msgstr "%(search_page)s へ行く。"
 
-#: searx/templates/courgette/404.html:6 searx/templates/default/404.html:6
+#: 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
 msgid "search page"
-msgstr ""
+msgstr "検索ページ"
 
 #: searx/templates/courgette/index.html:9
 #: searx/templates/courgette/index.html:13
 #: searx/templates/courgette/results.html:5
-#: searx/templates/default/index.html:8 searx/templates/default/index.html:12
-#: searx/templates/oscar/navbar.html:7 searx/templates/oscar/navbar.html:35
+#: searx/templates/legacy/index.html:8 searx/templates/legacy/index.html:12
+#: searx/templates/oscar/navbar.html:12
 #: searx/templates/oscar/preferences.html:3
 #: searx/templates/pix-art/index.html:8
 msgid "preferences"
 msgstr "設定"
 
 #: searx/templates/courgette/index.html:11
-#: searx/templates/default/index.html:10 searx/templates/oscar/about.html:3
-#: searx/templates/oscar/navbar.html:8 searx/templates/oscar/navbar.html:34
-#: searx/templates/pix-art/index.html:7
+#: 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
 msgid "about"
 msgstr "このサイトについて"
 
 #: searx/templates/courgette/preferences.html:5
-#: searx/templates/default/preferences.html:5
-#: searx/templates/oscar/preferences.html:12
+#: searx/templates/legacy/preferences.html:5
+#: searx/templates/oscar/preferences.html:7
 #: searx/templates/pix-art/preferences.html:5
 msgid "Preferences"
 msgstr "設定"
 
 #: searx/templates/courgette/preferences.html:9
-#: searx/templates/default/preferences.html:9
-#: searx/templates/oscar/preferences.html:36
-#: searx/templates/oscar/preferences.html:38
+#: searx/templates/legacy/preferences.html:9
+#: searx/templates/oscar/preferences.html:32
+#: searx/templates/oscar/preferences.html:34
 msgid "Default categories"
 msgstr "デフォルトのカテゴリ"
 
 #: searx/templates/courgette/preferences.html:13
-#: searx/templates/default/preferences.html:14
-#: searx/templates/oscar/preferences.html:44
+#: searx/templates/legacy/preferences.html:14
+#: searx/templates/oscar/preferences.html:40
 #: searx/templates/pix-art/preferences.html:9
 msgid "Search language"
 msgstr "検索の言語"
 
 #: searx/templates/courgette/preferences.html:16
-#: searx/templates/default/preferences.html:17
-#: searx/templates/oscar/preferences.html:48
+#: searx/templates/legacy/preferences.html:17
+#: searx/templates/oscar/languages.html:6
 #: searx/templates/pix-art/preferences.html:12
-msgid "Automatic"
-msgstr "自動"
+msgid "Default language"
+msgstr ""
 
 #: searx/templates/courgette/preferences.html:24
-#: searx/templates/default/preferences.html:25
-#: searx/templates/oscar/preferences.html:55
+#: searx/templates/legacy/preferences.html:25
+#: searx/templates/oscar/preferences.html:46
 #: searx/templates/pix-art/preferences.html:20
 msgid "Interface language"
 msgstr "インターフェースの言語"
 
 #: searx/templates/courgette/preferences.html:34
-#: searx/templates/default/preferences.html:35
-#: searx/templates/oscar/preferences.html:65
+#: searx/templates/legacy/preferences.html:35
+#: searx/templates/oscar/preferences.html:56
 msgid "Autocomplete"
 msgstr "オートコンプリート"
 
 #: searx/templates/courgette/preferences.html:45
-#: searx/templates/default/preferences.html:46
-#: searx/templates/oscar/preferences.html:76
+#: searx/templates/legacy/preferences.html:46
+#: searx/templates/oscar/preferences.html:67
 msgid "Image proxy"
 msgstr "画像プロキシ"
 
 #: searx/templates/courgette/preferences.html:48
-#: searx/templates/default/preferences.html:49
-#: searx/templates/oscar/preferences.html:80
+#: searx/templates/legacy/preferences.html:49
+#: searx/templates/oscar/preferences.html:71
 msgid "Enabled"
 msgstr "有効にする"
 
 #: searx/templates/courgette/preferences.html:49
-#: searx/templates/default/preferences.html:50
-#: searx/templates/oscar/preferences.html:81
+#: searx/templates/legacy/preferences.html:50
+#: searx/templates/oscar/preferences.html:72
 msgid "Disabled"
 msgstr "使用不可能にする"
 
 #: searx/templates/courgette/preferences.html:54
-#: searx/templates/default/preferences.html:55
-#: searx/templates/oscar/preferences.html:85
+#: searx/templates/legacy/preferences.html:55
+#: searx/templates/oscar/preferences.html:76
 #: searx/templates/pix-art/preferences.html:30
 msgid "Method"
 msgstr "方法"
 
 #: searx/templates/courgette/preferences.html:63
-#: searx/templates/default/preferences.html:64
-#: searx/templates/oscar/preferences.html:94
-#: searx/templates/oscar/preferences.html:160
-#: searx/templates/oscar/preferences.html:166
+#: searx/templates/legacy/preferences.html:64
+#: searx/templates/oscar/preferences.html:85
+#: searx/templates/oscar/preferences.html:152
+#: searx/templates/oscar/preferences.html:159
 msgid "SafeSearch"
 msgstr "安全な検索"
 
 #: searx/templates/courgette/preferences.html:66
-#: searx/templates/default/preferences.html:67
-#: searx/templates/oscar/preferences.html:98
+#: searx/templates/legacy/preferences.html:67
+#: searx/templates/oscar/preferences.html:89
 msgid "Strict"
 msgstr "厳しく"
 
 #: searx/templates/courgette/preferences.html:67
-#: searx/templates/default/preferences.html:68
-#: searx/templates/oscar/preferences.html:99
+#: searx/templates/legacy/preferences.html:68
+#: searx/templates/oscar/preferences.html:90
 msgid "Moderate"
 msgstr "ゆるく"
 
 #: searx/templates/courgette/preferences.html:68
-#: searx/templates/default/preferences.html:69
-#: searx/templates/oscar/preferences.html:100
+#: searx/templates/legacy/preferences.html:69
+#: searx/templates/oscar/preferences.html:91
 msgid "None"
 msgstr "なし"
 
 #: searx/templates/courgette/preferences.html:73
-#: searx/templates/default/preferences.html:74
-#: searx/templates/oscar/preferences.html:104
+#: searx/templates/legacy/preferences.html:74
+#: searx/templates/oscar/preferences.html:95
 #: searx/templates/pix-art/preferences.html:39
 msgid "Themes"
 msgstr "テーマ"
@@ -321,30 +356,30 @@ msgid "Red"
 msgstr "赤"
 
 #: searx/templates/courgette/preferences.html:96
-#: searx/templates/default/preferences.html:93
+#: searx/templates/legacy/preferences.html:93
 #: searx/templates/pix-art/preferences.html:49
 msgid "Currently used search engines"
 msgstr "現在使用中の検索エンジン"
 
 #: searx/templates/courgette/preferences.html:100
-#: searx/templates/default/preferences.html:97
-#: searx/templates/oscar/preferences.html:158
-#: searx/templates/oscar/preferences.html:168
+#: searx/templates/legacy/preferences.html:97
+#: searx/templates/oscar/preferences.html:149
+#: searx/templates/oscar/preferences.html:162
 #: searx/templates/pix-art/preferences.html:53
 msgid "Engine name"
 msgstr "検索エンジン名"
 
 #: searx/templates/courgette/preferences.html:101
-#: searx/templates/default/preferences.html:98
+#: searx/templates/legacy/preferences.html:98
 msgid "Category"
 msgstr "カテゴリー"
 
 #: searx/templates/courgette/preferences.html:102
 #: searx/templates/courgette/preferences.html:113
-#: searx/templates/default/preferences.html:99
-#: searx/templates/default/preferences.html:110
-#: searx/templates/oscar/preferences.html:157
-#: searx/templates/oscar/preferences.html:169
+#: 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/pix-art/preferences.html:54
 #: searx/templates/pix-art/preferences.html:64
 msgid "Allow"
@@ -352,16 +387,16 @@ msgstr "許可する"
 
 #: searx/templates/courgette/preferences.html:102
 #: searx/templates/courgette/preferences.html:114
-#: searx/templates/default/preferences.html:99
-#: searx/templates/default/preferences.html:111
+#: searx/templates/legacy/preferences.html:99
+#: searx/templates/legacy/preferences.html:111
 #: searx/templates/pix-art/preferences.html:54
 #: searx/templates/pix-art/preferences.html:65
 msgid "Block"
 msgstr "禁止する"
 
 #: searx/templates/courgette/preferences.html:122
-#: searx/templates/default/preferences.html:119
-#: searx/templates/oscar/preferences.html:257
+#: searx/templates/legacy/preferences.html:119
+#: searx/templates/oscar/preferences.html:282
 #: searx/templates/pix-art/preferences.html:73
 msgid ""
 "These settings are stored in your cookies, this allows us not to store this "
@@ -369,8 +404,8 @@ msgid ""
 msgstr "これらの設定はあなたのクッキーに保存されますが、これはサーバーがあなたの情報の保存するわけではありません。"
 
 #: searx/templates/courgette/preferences.html:124
-#: searx/templates/default/preferences.html:121
-#: searx/templates/oscar/preferences.html:259
+#: searx/templates/legacy/preferences.html:121
+#: searx/templates/oscar/preferences.html:284
 #: searx/templates/pix-art/preferences.html:75
 msgid ""
 "These cookies serve your sole convenience, we don't use these cookies to "
@@ -378,239 +413,281 @@ msgid ""
 msgstr "クッキーはあなたが便利に使えるようにするために使うのであって、サーバーはあなたを追跡するためにクッキーを使うことはありません。"
 
 #: searx/templates/courgette/preferences.html:127
-#: searx/templates/default/preferences.html:124
-#: searx/templates/oscar/preferences.html:262
+#: searx/templates/legacy/preferences.html:124
+#: searx/templates/oscar/preferences.html:287
 #: searx/templates/pix-art/preferences.html:78
 msgid "save"
 msgstr "保存"
 
 #: searx/templates/courgette/preferences.html:128
-#: searx/templates/default/preferences.html:125
-#: searx/templates/oscar/preferences.html:264
+#: searx/templates/legacy/preferences.html:125
+#: searx/templates/oscar/preferences.html:289
 msgid "Reset defaults"
 msgstr "デフォルト設定に戻す"
 
 #: searx/templates/courgette/preferences.html:129
-#: searx/templates/default/preferences.html:126
-#: searx/templates/oscar/preferences.html:263
+#: searx/templates/legacy/preferences.html:126
+#: searx/templates/oscar/preferences.html:288
 #: searx/templates/pix-art/preferences.html:79
 msgid "back"
 msgstr "戻る"
 
 #: searx/templates/courgette/results.html:12
-#: searx/templates/default/results.html:13
+#: searx/templates/legacy/results.html:13
 #: searx/templates/oscar/results.html:124
 msgid "Search URL"
 msgstr "URLを検索する"
 
 #: searx/templates/courgette/results.html:16
-#: searx/templates/default/results.html:17
+#: searx/templates/legacy/results.html:17
 #: searx/templates/oscar/results.html:129
 msgid "Download results"
 msgstr "ダウンロードするファイル形式"
 
 #: searx/templates/courgette/results.html:34
-#: searx/templates/default/results.html:35
+#: searx/templates/legacy/results.html:35
 msgid "Answers"
 msgstr "回答"
 
 #: searx/templates/courgette/results.html:42
-#: searx/templates/default/results.html:43
+#: searx/templates/legacy/results.html:43
 #: searx/templates/oscar/results.html:104
 msgid "Suggestions"
 msgstr "提案"
 
 #: searx/templates/courgette/results.html:70
-#: searx/templates/default/results.html:81
+#: searx/templates/legacy/results.html:81
 #: searx/templates/oscar/results.html:53 searx/templates/oscar/results.html:66
 msgid "previous page"
 msgstr "前のページ"
 
 #: searx/templates/courgette/results.html:81
-#: searx/templates/default/results.html:92
+#: searx/templates/legacy/results.html:92
 #: searx/templates/oscar/results.html:45 searx/templates/oscar/results.html:75
 msgid "next page"
 msgstr "次のページ"
 
 #: searx/templates/courgette/search.html:3
-#: searx/templates/default/search.html:3 searx/templates/oscar/search.html:4
+#: searx/templates/legacy/search.html:3 searx/templates/oscar/search.html:4
 #: searx/templates/oscar/search_full.html:9
 #: searx/templates/pix-art/search.html:3
 msgid "Search for..."
 msgstr "検索する..."
 
-#: searx/templates/courgette/stats.html:4 searx/templates/default/stats.html:4
+#: 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
 msgid "Engine stats"
 msgstr "検索エンジンの状態"
 
 #: searx/templates/courgette/result_templates/images.html:4
-#: searx/templates/default/result_templates/images.html:4
+#: searx/templates/legacy/result_templates/images.html:4
 #: searx/templates/pix-art/result_templates/images.html:4
 msgid "original context"
 msgstr "元の文脈"
 
 #: searx/templates/courgette/result_templates/torrent.html:7
-#: searx/templates/default/result_templates/torrent.html:11
+#: searx/templates/legacy/result_templates/torrent.html:11
 #: searx/templates/oscar/result_templates/torrent.html:6
 msgid "Seeder"
 msgstr "シーダー"
 
 #: searx/templates/courgette/result_templates/torrent.html:7
-#: searx/templates/default/result_templates/torrent.html:11
+#: searx/templates/legacy/result_templates/torrent.html:11
 #: searx/templates/oscar/result_templates/torrent.html:6
 msgid "Leecher"
 msgstr "リーチャー"
 
 #: searx/templates/courgette/result_templates/torrent.html:9
-#: searx/templates/default/result_templates/torrent.html:9
+#: searx/templates/legacy/result_templates/torrent.html:9
 #: searx/templates/oscar/macros.html:24
 msgid "magnet link"
 msgstr "マグネットリンク"
 
 #: searx/templates/courgette/result_templates/torrent.html:10
-#: searx/templates/default/result_templates/torrent.html:10
+#: searx/templates/legacy/result_templates/torrent.html:10
 #: searx/templates/oscar/macros.html:25
 msgid "torrent file"
 msgstr "トレントファイル"
 
-#: searx/templates/default/categories.html:8
+#: searx/templates/legacy/categories.html:8
 msgid "Click on the magnifier to perform search"
 msgstr "検索を実行するには虫めがねをクリックしてください"
 
-#: searx/templates/default/preferences.html:84
-#: searx/templates/oscar/preferences.html:121
+#: searx/templates/legacy/preferences.html:84
+#: searx/templates/oscar/preferences.html:112
 msgid "Results on new tabs"
-msgstr ""
+msgstr "新しいタブに結果を表示"
 
-#: searx/templates/default/preferences.html:87
-#: searx/templates/oscar/preferences.html:125
+#: searx/templates/legacy/preferences.html:87
+#: searx/templates/oscar/preferences.html:116
 msgid "On"
-msgstr ""
+msgstr "有効"
 
-#: searx/templates/default/preferences.html:88
-#: searx/templates/oscar/preferences.html:126
+#: searx/templates/legacy/preferences.html:88
+#: searx/templates/oscar/preferences.html:117
 msgid "Off"
-msgstr ""
+msgstr "無効"
 
-#: searx/templates/default/result_templates/code.html:3
-#: searx/templates/default/result_templates/default.html:3
-#: searx/templates/default/result_templates/map.html:9
-#: searx/templates/oscar/macros.html:35 searx/templates/oscar/macros.html:46
+#: 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
 msgid "cached"
 msgstr "キャッシュ"
 
 #: searx/templates/oscar/advanced.html:4
 msgid "Advanced settings"
-msgstr ""
+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:82
+#: searx/templates/oscar/base.html:64
+msgid "Error!"
+msgstr "エラー!"
+
+#: searx/templates/oscar/base.html:90
 msgid "Powered by"
 msgstr "提供:"
 
-#: searx/templates/oscar/base.html:82
+#: searx/templates/oscar/base.html:90
 msgid "a privacy-respecting, hackable metasearch engine"
 msgstr "プライバシー保護を重視した、ハッカブルなメタサーチエンジン"
 
-#: searx/templates/oscar/navbar.html:9 searx/templates/oscar/navbar.html:33
-msgid "home"
-msgstr "スタートページ"
-
-#: searx/templates/oscar/navbar.html:14 searx/templates/oscar/navbar.html:24
-msgid "Toggle navigation"
-msgstr "ナビゲーションをトグルする"
+#: searx/templates/oscar/macros.html:37 searx/templates/oscar/macros.html:51
+msgid "proxied"
+msgstr "プロキシされている"
 
-#: searx/templates/oscar/preferences.html:17
-#: searx/templates/oscar/preferences.html:25
+#: searx/templates/oscar/preferences.html:12
+#: searx/templates/oscar/preferences.html:21
 msgid "General"
 msgstr "一般設定"
 
-#: searx/templates/oscar/preferences.html:18
-#: searx/templates/oscar/preferences.html:142
+#: searx/templates/oscar/preferences.html:13
+#: searx/templates/oscar/preferences.html:133
 msgid "Engines"
 msgstr "検索エンジン"
 
-#: searx/templates/oscar/preferences.html:19
-#: searx/templates/oscar/preferences.html:207
+#: searx/templates/oscar/preferences.html:14
+#: searx/templates/oscar/preferences.html:204
 msgid "Plugins"
 msgstr "プラグイン"
 
-#: searx/templates/oscar/preferences.html:20
-#: searx/templates/oscar/preferences.html:232
+#: searx/templates/oscar/preferences.html:15
+#: searx/templates/oscar/preferences.html:230
+msgid "Answerers"
+msgstr "回答者"
+
+#: searx/templates/oscar/preferences.html:16
+#: searx/templates/oscar/preferences.html:257
 msgid "Cookies"
 msgstr "クッキー"
 
-#: searx/templates/oscar/preferences.html:45
+#: searx/templates/oscar/preferences.html:41
 msgid "What language do you prefer for search?"
 msgstr "検索に使う言語はどれが良いですか？"
 
-#: searx/templates/oscar/preferences.html:56
+#: searx/templates/oscar/preferences.html:47
 msgid "Change the language of the layout"
 msgstr "表示する言語を変更できます"
 
-#: searx/templates/oscar/preferences.html:66
+#: searx/templates/oscar/preferences.html:57
 msgid "Find stuff as you type"
 msgstr "入力補助に使う検索エンジン"
 
-#: searx/templates/oscar/preferences.html:77
+#: searx/templates/oscar/preferences.html:68
 msgid "Proxying image results through searx"
 msgstr "画像検索結果をsearxでプロキシする"
 
-#: searx/templates/oscar/preferences.html:86
+#: searx/templates/oscar/preferences.html:77
 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://en.wikipedia.org/wiki/Hypertext_Transfer_Protocol#Request_methods\" rel=\"external\">リクエストメソッドについて詳しく知るにはここをクリック</a>。"
 
-#: searx/templates/oscar/preferences.html:95
+#: searx/templates/oscar/preferences.html:86
 msgid "Filter content"
 msgstr "コンテンツをフィルタリングする"
 
-#: searx/templates/oscar/preferences.html:105
+#: searx/templates/oscar/preferences.html:96
 msgid "Change searx layout"
 msgstr "searxのレイアウトの変更"
 
-#: searx/templates/oscar/preferences.html:114
-#: searx/templates/oscar/preferences.html:119
+#: searx/templates/oscar/preferences.html:105
+#: searx/templates/oscar/preferences.html:110
 msgid "Choose style for this theme"
 msgstr "このテーマのスタイルを選択"
 
-#: searx/templates/oscar/preferences.html:114
-#: searx/templates/oscar/preferences.html:119
+#: searx/templates/oscar/preferences.html:105
+#: searx/templates/oscar/preferences.html:110
 msgid "Style"
 msgstr "スタイル"
 
-#: searx/templates/oscar/preferences.html:159
-#: searx/templates/oscar/preferences.html:167
+#: searx/templates/oscar/preferences.html:150
+#: searx/templates/oscar/preferences.html:161
 msgid "Shortcut"
 msgstr "ショートカット"
 
-#: searx/templates/oscar/preferences.html:161
-#: searx/templates/oscar/preferences.html:165
+#: searx/templates/oscar/preferences.html:151
+#: searx/templates/oscar/preferences.html:160
+msgid "Supports selected language"
+msgstr ""
+
+#: searx/templates/oscar/preferences.html:153
+msgid "Time range"
+msgstr "時間範囲"
+
+#: searx/templates/oscar/preferences.html:154
+#: searx/templates/oscar/preferences.html:158
 msgid "Avg. time"
 msgstr "平均時間"
 
-#: searx/templates/oscar/preferences.html:162
-#: searx/templates/oscar/preferences.html:164
+#: searx/templates/oscar/preferences.html:155
+#: searx/templates/oscar/preferences.html:157
 msgid "Max time"
 msgstr "最大時間"
 
-#: searx/templates/oscar/preferences.html:235
+#: searx/templates/oscar/preferences.html:233
+msgid "This is the list of searx's instant answering modules."
+msgstr "これはsearxの即席回答モジュールのリストです。"
+
+#: searx/templates/oscar/preferences.html:237
+msgid "Name"
+msgstr "名前"
+
+#: searx/templates/oscar/preferences.html:238
+msgid "Keywords"
+msgstr "キーワード"
+
+#: searx/templates/oscar/preferences.html:239
+msgid "Description"
+msgstr "説明"
+
+#: searx/templates/oscar/preferences.html:240
+msgid "Examples"
+msgstr "例"
+
+#: searx/templates/oscar/preferences.html:260
 msgid ""
 "This is the list of cookies and their values searx is storing on your "
 "computer."
 msgstr "これはクッキーのリストで、これらの値はあなたのコンピュータに保存されています。"
 
-#: searx/templates/oscar/preferences.html:236
+#: searx/templates/oscar/preferences.html:261
 msgid "With that list, you can assess searx transparency."
 msgstr "このリストによって、あなたはsearxの透明性を評価できます。"
 
-#: searx/templates/oscar/preferences.html:241
+#: searx/templates/oscar/preferences.html:266
 msgid "Cookie name"
 msgstr "クッキー名"
 
-#: searx/templates/oscar/preferences.html:242
+#: searx/templates/oscar/preferences.html:267
 msgid "Value"
 msgstr "値"
 
@@ -633,26 +710,23 @@ msgstr "統計"
 
 #: searx/templates/oscar/time-range.html:3
 msgid "Anytime"
-msgstr ""
+msgstr "いつでも"
 
 #: searx/templates/oscar/time-range.html:6
 msgid "Last day"
-msgstr ""
+msgstr "先日"
 
 #: searx/templates/oscar/time-range.html:9
 msgid "Last week"
-msgstr ""
+msgstr "先週"
 
 #: searx/templates/oscar/time-range.html:12
 msgid "Last month"
-msgstr ""
+msgstr "先月"
 
-#: 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/time-range.html:15
+msgid "Last year"
+msgstr ""
 
 #: searx/templates/oscar/messages/first_time.html:6
 #: searx/templates/oscar/messages/no_data_available.html:3
@@ -663,14 +737,6 @@ msgstr "お知らせ"
 msgid "It look like you are using searx first time."
 msgstr "searxを使うのは初めてようですね。"
 
-#: searx/templates/oscar/messages/js_disabled.html:2
-msgid "Warning!"
-msgstr "意見"
-
-#: searx/templates/oscar/messages/js_disabled.html:3
-msgid "Please enable JavaScript to use full functionality of this site."
-msgstr "このサイトの機能を全て使うためにはJavaScriptを有効にしてください。"
-
 #: searx/templates/oscar/messages/no_cookies.html:3
 msgid "Information!"
 msgstr "お知らせ"
@@ -717,11 +783,11 @@ msgstr "メディアを表示する"
 msgid "hide media"
 msgstr "メディアを隠す"
 
-#: searx/templates/oscar/result_templates/images.html:23
+#: searx/templates/oscar/result_templates/images.html:30
 msgid "Get image"
 msgstr "画像を取得する"
 
-#: searx/templates/oscar/result_templates/images.html:24
+#: searx/templates/oscar/result_templates/images.html:33
 msgid "View source"
 msgstr "ソースを閲覧する"