[enh] update translations, regarding to #221

2 files changed, 284 insertions, 146 deletions

diff --git a/searx/translations/en/LC_MESSAGES/messages.mo b/searx/translations/en/LC_MESSAGES/messages.mo
index c3099bf2..f1e013b3 100644
--- a/searx/translations/en/LC_MESSAGES/messages.mo
+++ b/searx/translations/en/LC_MESSAGES/messages.mo
diff --git a/searx/translations/en/LC_MESSAGES/messages.po b/searx/translations/en/LC_MESSAGES/messages.po
index cd807e6a..eba5c86b 100644
--- a/searx/translations/en/LC_MESSAGES/messages.po
+++ b/searx/translations/en/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-01-05 20:54+0100\n"
+"POT-Creation-Date: 2015-02-11 14:09+0100\n"
 "PO-Revision-Date: 2014-01-30 15:22+0100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: en <LL@li.org>\n"
@@ -17,185 +17,301 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 1.3\n"
 
-#: searx/webapp.py:263
+#: searx/webapp.py:100
+msgid "files"
+msgstr ""
+
+#: searx/webapp.py:101
+msgid "general"
+msgstr ""
+
+#: searx/webapp.py:102
+msgid "music"
+msgstr ""
+
+#: searx/webapp.py:103
+msgid "social media"
+msgstr ""
+
+#: searx/webapp.py:104
+msgid "images"
+msgstr ""
+
+#: searx/webapp.py:105
+msgid "videos"
+msgstr ""
+
+#: searx/webapp.py:106
+msgid "it"
+msgstr ""
+
+#: searx/webapp.py:107
+msgid "news"
+msgstr ""
+
+#: searx/webapp.py:108
+msgid "map"
+msgstr ""
+
+#: searx/webapp.py:361
 msgid "{minutes} minute(s) ago"
 msgstr ""
 
-#: searx/webapp.py:265
+#: searx/webapp.py:363
 msgid "{hours} hour(s), {minutes} minute(s) ago"
 msgstr ""
 
-#: searx/engines/__init__.py:179
+#: searx/engines/__init__.py:182
 msgid "Page loads (sec)"
 msgstr ""
 
-#: searx/engines/__init__.py:183
+#: searx/engines/__init__.py:186
 msgid "Number of results"
 msgstr ""
 
-#: searx/engines/__init__.py:187
+#: searx/engines/__init__.py:190
 msgid "Scores"
 msgstr ""
 
-#: searx/engines/__init__.py:191
+#: searx/engines/__init__.py:194
 msgid "Scores per result"
 msgstr ""
 
-#: searx/engines/__init__.py:195
+#: searx/engines/__init__.py:198
 msgid "Errors"
 msgstr ""
 
-#: searx/templates/courgette/index.html:8 searx/templates/default/index.html:7
-#: searx/templates/oscar/about.html:3 searx/templates/oscar/navbar.html:16
-msgid "about"
+#: 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/oscar/preferences.html:3
+msgid "preferences"
 msgstr ""
 
-#: searx/templates/courgette/index.html:9 searx/templates/default/index.html:8
-#: searx/templates/oscar/navbar.html:17
-#: searx/templates/oscar/preferences.html:2
-msgid "preferences"
+#: 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
+msgid "about"
 msgstr ""
 
 #: searx/templates/courgette/preferences.html:5
 #: searx/templates/default/preferences.html:5
-#: searx/templates/oscar/preferences.html:6
+#: searx/templates/oscar/preferences.html:12
 msgid "Preferences"
 msgstr ""
 
 #: searx/templates/courgette/preferences.html:9
 #: searx/templates/default/preferences.html:9
-#: searx/templates/oscar/preferences.html:24
+#: searx/templates/oscar/preferences.html:34
+#: searx/templates/oscar/preferences.html:36
 msgid "Default categories"
 msgstr ""
 
-#: searx/templates/courgette/preferences.html:15
-#: searx/templates/default/preferences.html:15
-#: searx/templates/oscar/preferences.html:30
+#: searx/templates/courgette/preferences.html:13
+#: searx/templates/default/preferences.html:14
+#: searx/templates/oscar/preferences.html:42
 msgid "Search language"
 msgstr ""
 
-#: searx/templates/courgette/preferences.html:18
-#: searx/templates/default/preferences.html:18
-#: searx/templates/oscar/preferences.html:33
+#: searx/templates/courgette/preferences.html:16
+#: searx/templates/default/preferences.html:17
+#: searx/templates/oscar/preferences.html:46
 msgid "Automatic"
 msgstr ""
 
-#: searx/templates/courgette/preferences.html:26
-#: searx/templates/default/preferences.html:26
-#: searx/templates/oscar/preferences.html:42
+#: searx/templates/courgette/preferences.html:24
+#: searx/templates/default/preferences.html:25
+#: searx/templates/oscar/preferences.html:53
 msgid "Interface language"
 msgstr ""
 
-#: searx/templates/courgette/preferences.html:36
-#: searx/templates/default/preferences.html:36
-#: searx/templates/oscar/preferences.html:53
+#: searx/templates/courgette/preferences.html:34
+#: searx/templates/default/preferences.html:35
+#: searx/templates/oscar/preferences.html:63
 msgid "Autocomplete"
 msgstr ""
 
-#: searx/templates/courgette/preferences.html:47
-#: searx/templates/default/preferences.html:47
-#: searx/templates/oscar/preferences.html:66
+#: searx/templates/courgette/preferences.html:45
+#: searx/templates/default/preferences.html:46
+#: searx/templates/oscar/preferences.html:74
+msgid "Image proxy"
+msgstr ""
+
+#: searx/templates/courgette/preferences.html:48
+#: searx/templates/default/preferences.html:49
+#: searx/templates/oscar/preferences.html:78
+msgid "Enabled"
+msgstr ""
+
+#: searx/templates/courgette/preferences.html:49
+#: searx/templates/default/preferences.html:50
+#: searx/templates/oscar/preferences.html:79
+msgid "Disabled"
+msgstr ""
+
+#: searx/templates/courgette/preferences.html:54
+#: searx/templates/default/preferences.html:55
+#: searx/templates/oscar/preferences.html:83
 msgid "Method"
 msgstr ""
 
-#: searx/templates/courgette/preferences.html:56
-#: searx/templates/default/preferences.html:56
-#: searx/templates/oscar/preferences.html:76
-msgid "Themes"
+#: searx/templates/courgette/preferences.html:63
+#: searx/templates/default/preferences.html:64
+#: searx/templates/oscar/preferences.html:92
+msgid "SafeSearch"
 msgstr ""
 
 #: searx/templates/courgette/preferences.html:66
-#: searx/templates/default/preferences.html:66
+#: searx/templates/default/preferences.html:67
+#: searx/templates/oscar/preferences.html:96
+msgid "Strict"
+msgstr ""
+
+#: searx/templates/courgette/preferences.html:67
+#: searx/templates/default/preferences.html:68
+#: searx/templates/oscar/preferences.html:97
+msgid "Moderate"
+msgstr ""
+
+#: searx/templates/courgette/preferences.html:68
+#: searx/templates/default/preferences.html:69
+#: searx/templates/oscar/preferences.html:98
+msgid "None"
+msgstr ""
+
+#: searx/templates/courgette/preferences.html:73
+#: searx/templates/default/preferences.html:74
+#: searx/templates/oscar/preferences.html:102
+msgid "Themes"
+msgstr ""
+
+#: searx/templates/courgette/preferences.html:83
+msgid "Color"
+msgstr ""
+
+#: searx/templates/courgette/preferences.html:86
+msgid "Blue (default)"
+msgstr ""
+
+#: searx/templates/courgette/preferences.html:87
+msgid "Violet"
+msgstr ""
+
+#: searx/templates/courgette/preferences.html:88
+msgid "Green"
+msgstr ""
+
+#: searx/templates/courgette/preferences.html:89
+msgid "Cyan"
+msgstr ""
+
+#: searx/templates/courgette/preferences.html:90
+msgid "Orange"
+msgstr ""
+
+#: searx/templates/courgette/preferences.html:91
+msgid "Red"
+msgstr ""
+
+#: searx/templates/courgette/preferences.html:96
+#: searx/templates/default/preferences.html:84
 msgid "Currently used search engines"
 msgstr ""
 
-#: searx/templates/courgette/preferences.html:70
-#: searx/templates/default/preferences.html:70
+#: searx/templates/courgette/preferences.html:100
+#: searx/templates/default/preferences.html:88
 msgid "Engine name"
 msgstr ""
 
-#: searx/templates/courgette/preferences.html:71
-#: searx/templates/default/preferences.html:71
+#: searx/templates/courgette/preferences.html:101
+#: searx/templates/default/preferences.html:89
 msgid "Category"
 msgstr ""
 
-#: searx/templates/courgette/preferences.html:72
-#: searx/templates/courgette/preferences.html:83
-#: searx/templates/default/preferences.html:72
-#: searx/templates/default/preferences.html:83
-#: searx/templates/oscar/preferences.html:118
+#: searx/templates/courgette/preferences.html:102
+#: searx/templates/courgette/preferences.html:113
+#: searx/templates/default/preferences.html:90
+#: searx/templates/default/preferences.html:101
+#: searx/templates/oscar/preferences.html:145
 msgid "Allow"
 msgstr ""
 
-#: searx/templates/courgette/preferences.html:72
-#: searx/templates/courgette/preferences.html:84
-#: searx/templates/default/preferences.html:72
-#: searx/templates/default/preferences.html:84
-#: searx/templates/oscar/preferences.html:117
+#: searx/templates/courgette/preferences.html:102
+#: searx/templates/courgette/preferences.html:114
+#: searx/templates/default/preferences.html:90
+#: searx/templates/default/preferences.html:102
+#: searx/templates/oscar/preferences.html:144
 msgid "Block"
 msgstr ""
 
-#: searx/templates/courgette/preferences.html:92
-#: searx/templates/default/preferences.html:92
-#: searx/templates/oscar/preferences.html:132
+#: searx/templates/courgette/preferences.html:122
+#: searx/templates/default/preferences.html:110
+#: searx/templates/oscar/preferences.html:161
 msgid ""
 "These settings are stored in your cookies, this allows us not to store "
 "this data about you."
 msgstr ""
 
-#: searx/templates/courgette/preferences.html:94
-#: searx/templates/default/preferences.html:94
-#: searx/templates/oscar/preferences.html:134
+#: searx/templates/courgette/preferences.html:124
+#: searx/templates/default/preferences.html:112
+#: searx/templates/oscar/preferences.html:163
 msgid ""
 "These cookies serve your sole convenience, we don't use these cookies to "
 "track you."
 msgstr ""
 
-#: searx/templates/courgette/preferences.html:97
-#: searx/templates/default/preferences.html:97
-#: searx/templates/oscar/preferences.html:137
+#: searx/templates/courgette/preferences.html:127
+#: searx/templates/default/preferences.html:115
+#: searx/templates/oscar/preferences.html:166
 msgid "save"
 msgstr ""
 
-#: searx/templates/courgette/preferences.html:98
-#: searx/templates/default/preferences.html:98
-#: searx/templates/oscar/preferences.html:138
+#: searx/templates/courgette/preferences.html:128
+#: searx/templates/default/preferences.html:116
+#: searx/templates/oscar/preferences.html:167
 msgid "back"
 msgstr ""
 
 #: searx/templates/courgette/results.html:12
-#: searx/templates/default/results.html:12
-#: searx/templates/oscar/results.html:87
+#: searx/templates/default/results.html:13
+#: searx/templates/oscar/results.html:110
 msgid "Search URL"
 msgstr ""
 
 #: searx/templates/courgette/results.html:16
-#: searx/templates/default/results.html:16
-#: searx/templates/oscar/results.html:92
+#: searx/templates/default/results.html:17
+#: searx/templates/oscar/results.html:115
 msgid "Download results"
 msgstr ""
 
 #: searx/templates/courgette/results.html:34
-#: searx/templates/default/results.html:42
-#: searx/templates/oscar/results.html:67
+#: searx/templates/default/results.html:35
+msgid "Answers"
+msgstr ""
+
+#: searx/templates/courgette/results.html:42
+#: searx/templates/default/results.html:43
+#: searx/templates/oscar/results.html:90
 msgid "Suggestions"
 msgstr ""
 
-#: searx/templates/courgette/results.html:62
-#: searx/templates/default/results.html:78
-#: searx/templates/oscar/results.html:41
+#: searx/templates/courgette/results.html:70
+#: searx/templates/default/results.html:81
+#: searx/templates/oscar/results.html:51 searx/templates/oscar/results.html:63
 msgid "previous page"
 msgstr ""
 
-#: searx/templates/courgette/results.html:73
-#: searx/templates/default/results.html:89
-#: searx/templates/oscar/results.html:49
+#: searx/templates/courgette/results.html:81
+#: searx/templates/default/results.html:92
+#: searx/templates/oscar/results.html:44 searx/templates/oscar/results.html:71
 msgid "next page"
 msgstr ""
 
 #: searx/templates/courgette/search.html:3
 #: searx/templates/default/search.html:3 searx/templates/oscar/search.html:4
-#: searx/templates/oscar/search_full.html:5
+#: searx/templates/oscar/search_full.html:9
 msgid "Search for..."
 msgstr ""
 
@@ -204,80 +320,118 @@ msgstr ""
 msgid "Engine stats"
 msgstr ""
 
-#: searx/templates/default/categories.html:8
-msgid "Click on the magnifier to perform search"
+#: searx/templates/courgette/result_templates/images.html:4
+#: searx/templates/default/result_templates/images.html:4
+msgid "original context"
 msgstr ""
 
-#: searx/templates/default/results.html:34
-msgid "Answers"
+#: searx/templates/courgette/result_templates/torrent.html:7
+#: searx/templates/default/result_templates/torrent.html:11
+#: searx/templates/oscar/result_templates/torrent.html:6
+msgid "Seeder"
 msgstr ""
 
-#: searx/templates/oscar/base.html:69
+#: searx/templates/courgette/result_templates/torrent.html:7
+#: searx/templates/default/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/oscar/macros.html:21
+msgid "magnet link"
+msgstr ""
+
+#: searx/templates/courgette/result_templates/torrent.html:10
+#: searx/templates/default/result_templates/torrent.html:10
+#: searx/templates/oscar/macros.html:22
+msgid "torrent file"
+msgstr ""
+
+#: searx/templates/default/categories.html:8
+msgid "Click on the magnifier to perform search"
+msgstr ""
+
+#: searx/templates/oscar/base.html:74
 msgid "Powered by"
 msgstr ""
 
-#: searx/templates/oscar/base.html:69
+#: searx/templates/oscar/base.html:74
 msgid "a privacy-respecting, hackable metasearch engine"
 msgstr ""
 
-#: searx/templates/oscar/navbar.html:6
-msgid "Toggle navigation"
+#: searx/templates/oscar/macros.html:20
+msgid "cached"
 msgstr ""
 
-#: searx/templates/oscar/navbar.html:15
+#: searx/templates/oscar/navbar.html:9 searx/templates/oscar/navbar.html:33
 msgid "home"
 msgstr ""
 
-#: searx/templates/oscar/preferences.html:11
+#: searx/templates/oscar/navbar.html:14 searx/templates/oscar/navbar.html:24
+msgid "Toggle navigation"
+msgstr ""
+
 #: searx/templates/oscar/preferences.html:17
+#: searx/templates/oscar/preferences.html:23
 msgid "General"
 msgstr ""
 
-#: searx/templates/oscar/preferences.html:12
-#: searx/templates/oscar/preferences.html:99
+#: searx/templates/oscar/preferences.html:18
+#: searx/templates/oscar/preferences.html:124
 msgid "Engines"
 msgstr ""
 
-#: searx/templates/oscar/preferences.html:39
+#: searx/templates/oscar/preferences.html:43
 msgid "What language do you prefer for search?"
 msgstr ""
 
-#: searx/templates/oscar/preferences.html:50
+#: searx/templates/oscar/preferences.html:54
 msgid "Change the language of the layout"
 msgstr ""
 
-#: searx/templates/oscar/preferences.html:63
+#: searx/templates/oscar/preferences.html:64
 msgid "Find stuff as you type"
 msgstr ""
 
-#: searx/templates/oscar/preferences.html:73
+#: searx/templates/oscar/preferences.html:75
+msgid "Proxying image results through searx"
+msgstr ""
+
+#: searx/templates/oscar/preferences.html:84
 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 ""
 
-#: searx/templates/oscar/preferences.html:84
+#: searx/templates/oscar/preferences.html:93
+msgid "Filter content"
+msgstr ""
+
+#: searx/templates/oscar/preferences.html:103
 msgid "Change searx layout"
 msgstr ""
 
-#: searx/templates/oscar/results.html:6
+#: searx/templates/oscar/results.html:7
 msgid "Search results"
 msgstr ""
 
-#: searx/templates/oscar/results.html:82
+#: searx/templates/oscar/results.html:105
 msgid "Links"
 msgstr ""
 
-#: searx/templates/oscar/search.html:6 searx/templates/oscar/search_full.html:7
+#: searx/templates/oscar/search.html:6
+#: searx/templates/oscar/search_full.html:11
 msgid "Start search"
 msgstr ""
 
-#: searx/templates/oscar/search_full.html:11
+#: searx/templates/oscar/search_full.html:15
 msgid "Show search filters"
 msgstr ""
 
-#: searx/templates/oscar/search_full.html:11
+#: searx/templates/oscar/search_full.html:15
 msgid "Hide search filters"
 msgstr ""
 
@@ -339,96 +493,80 @@ msgstr ""
 msgid "Something went wrong."
 msgstr ""
 
-#: searx/templates/oscar/result_templates/default.html:6
-#: searx/templates/oscar/result_templates/map.html:7
-#: searx/templates/oscar/result_templates/torrent.html:6
-#: searx/templates/oscar/result_templates/videos.html:6
-msgid "cached"
-msgstr ""
-
-#: searx/templates/oscar/result_templates/default.html:9
+#: searx/templates/oscar/result_templates/default.html:7
 msgid "show media"
 msgstr ""
 
-#: searx/templates/oscar/result_templates/default.html:9
+#: searx/templates/oscar/result_templates/default.html:7
 msgid "hide media"
 msgstr ""
 
-#: searx/templates/oscar/result_templates/images.html:21
+#: searx/templates/oscar/result_templates/images.html:23
 msgid "Get image"
 msgstr ""
 
-#: searx/templates/oscar/result_templates/images.html:22
+#: searx/templates/oscar/result_templates/images.html:24
 msgid "View source"
 msgstr ""
 
-#: searx/templates/oscar/result_templates/map.html:10
+#: searx/templates/oscar/result_templates/map.html:7
 msgid "show map"
 msgstr ""
 
-#: searx/templates/oscar/result_templates/map.html:10
+#: searx/templates/oscar/result_templates/map.html:7
 msgid "hide map"
 msgstr ""
 
-#: searx/templates/oscar/result_templates/map.html:14
+#: searx/templates/oscar/result_templates/map.html:11
 msgid "show details"
 msgstr ""
 
-#: searx/templates/oscar/result_templates/map.html:14
+#: searx/templates/oscar/result_templates/map.html:11
 msgid "hide details"
 msgstr ""
 
-#: searx/templates/oscar/result_templates/torrent.html:8
-msgid "Seeder"
+#: searx/templates/oscar/result_templates/torrent.html:7
+msgid "Filesize"
 msgstr ""
 
-#: searx/templates/oscar/result_templates/torrent.html:8
-msgid "Leecher"
+#: searx/templates/oscar/result_templates/torrent.html:9
+msgid "Bytes"
 msgstr ""
 
-#: searx/templates/oscar/result_templates/videos.html:9
-msgid "show video"
+#: searx/templates/oscar/result_templates/torrent.html:10
+msgid "kiB"
 msgstr ""
 
-#: searx/templates/oscar/result_templates/videos.html:9
-msgid "hide video"
+#: searx/templates/oscar/result_templates/torrent.html:11
+msgid "MiB"
 msgstr ""
 
-msgid "Localization"
+#: searx/templates/oscar/result_templates/torrent.html:12
+msgid "GiB"
 msgstr ""
 
-msgid "Yes"
+#: searx/templates/oscar/result_templates/torrent.html:13
+msgid "TiB"
 msgstr ""
 
-msgid "No"
+#: searx/templates/oscar/result_templates/torrent.html:15
+msgid "Number of Files"
 msgstr ""
 
-# categories - manually added
-# TODO - automatically add
-msgid "files"
-msgstr ""
-
-msgid "general"
-msgstr ""
-
-msgid "music"
-msgstr ""
-
-msgid "social media"
-msgstr ""
-
-msgid "images"
+#: searx/templates/oscar/result_templates/videos.html:7
+msgid "show video"
 msgstr ""
 
-msgid "videos"
+#: searx/templates/oscar/result_templates/videos.html:7
+msgid "hide video"
 msgstr ""
 
-msgid "it"
-msgstr ""
+#~ msgid "Localization"
+#~ msgstr ""
 
-msgid "news"
-msgstr ""
+#~ msgid "Yes"
+#~ msgstr ""
 
-msgid "map"
-msgstr ""
+#~ msgid "No"
+#~ msgstr ""