Merge branch 'master' of https://github.com/asciimoo/searx into code_results

Conflicts:
	searx/engines/searchcode_code.py
	searx/engines/searchcode_doc.py
	searx/static/oscar/js/searx.min.js
	searx/templates/oscar/result_templates/default.html
	searx/templates/oscar/result_templates/images.html
	searx/templates/oscar/result_templates/map.html
	searx/templates/oscar/result_templates/torrent.html
	searx/templates/oscar/result_templates/videos.html

2 files changed, 70 insertions, 56 deletions

diff --git a/searx/translations/de/LC_MESSAGES/messages.mo b/searx/translations/de/LC_MESSAGES/messages.mo
index 2c65bc121..d38001865 100644
--- a/searx/translations/de/LC_MESSAGES/messages.mo
+++ b/searx/translations/de/LC_MESSAGES/messages.mo
diff --git a/searx/translations/de/LC_MESSAGES/messages.po b/searx/translations/de/LC_MESSAGES/messages.po
index 1323b4486..6c6a53da8 100644
--- a/searx/translations/de/LC_MESSAGES/messages.po
+++ b/searx/translations/de/LC_MESSAGES/messages.po
@@ -4,14 +4,14 @@
 #
 # Translators:
 # pointhi, 2014
-# stf <stefan.marsiske@gmail.com>, 2014
 # rike, 2014
+# stf <stefan.marsiske@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version:  searx\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-11-26 20:41+0100\n"
-"PO-Revision-Date: 2014-03-15 18:40+0000\n"
+"POT-Creation-Date: 2015-01-05 20:54+0100\n"
+"PO-Revision-Date: 2014-12-27 10:30+0000\n"
 "Last-Translator: pointhi\n"
 "Language-Team: German "
 "(http://www.transifex.com/projects/p/searx/language/de/)\n"
@@ -21,31 +21,31 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 1.3\n"
 
-#: searx/webapp.py:308
+#: searx/webapp.py:263
 msgid "{minutes} minute(s) ago"
 msgstr "vor {minutes} Minute(n)"
 
-#: searx/webapp.py:310
+#: searx/webapp.py:265
 msgid "{hours} hour(s), {minutes} minute(s) ago"
 msgstr "vor {hours} Stunde(n), {minutes} Minute(n)"
 
-#: searx/engines/__init__.py:177
+#: searx/engines/__init__.py:179
 msgid "Page loads (sec)"
 msgstr "Ladezeit (sek)"
 
-#: searx/engines/__init__.py:181
+#: searx/engines/__init__.py:183
 msgid "Number of results"
 msgstr "Trefferanzahl"
 
-#: searx/engines/__init__.py:185
+#: searx/engines/__init__.py:187
 msgid "Scores"
 msgstr "Punkte"
 
-#: searx/engines/__init__.py:189
+#: searx/engines/__init__.py:191
 msgid "Scores per result"
 msgstr "Punkte pro Treffer"
 
-#: searx/engines/__init__.py:193
+#: searx/engines/__init__.py:195
 msgid "Errors"
 msgstr "Fehler"
 
@@ -125,22 +125,22 @@ msgstr "Kategorie"
 
 #: searx/templates/courgette/preferences.html:72
 #: searx/templates/courgette/preferences.html:83
-#: searx/templates/default/preferences.html:73
-#: searx/templates/default/preferences.html:85
+#: searx/templates/default/preferences.html:72
+#: searx/templates/default/preferences.html:83
 #: searx/templates/oscar/preferences.html:118
 msgid "Allow"
 msgstr "Erlauben"
 
 #: searx/templates/courgette/preferences.html:72
 #: searx/templates/courgette/preferences.html:84
-#: searx/templates/default/preferences.html:73
-#: searx/templates/default/preferences.html:86
+#: searx/templates/default/preferences.html:72
+#: searx/templates/default/preferences.html:84
 #: searx/templates/oscar/preferences.html:117
 msgid "Block"
 msgstr "Blockieren"
 
 #: searx/templates/courgette/preferences.html:92
-#: searx/templates/default/preferences.html:94
+#: searx/templates/default/preferences.html:92
 #: searx/templates/oscar/preferences.html:132
 msgid ""
 "These settings are stored in your cookies, this allows us not to store "
@@ -150,54 +150,54 @@ msgstr ""
 "damit wir keine Ihrer persönlichen Daten speichern müssen."
 
 #: searx/templates/courgette/preferences.html:94
-#: searx/templates/default/preferences.html:96
+#: searx/templates/default/preferences.html:94
 #: searx/templates/oscar/preferences.html:134
 msgid ""
 "These cookies serve your sole convenience, we don't use these cookies to "
 "track you."
 msgstr ""
-"Diese Cookies dienen einzig Ihrem Komfort, wir verwenden sie nicht, um "
+"Diese Cookies dienen einzig Ihrem Komfort. Wir verwenden sie nicht, um "
 "Sie zu überwachen."
 
 #: searx/templates/courgette/preferences.html:97
-#: searx/templates/default/preferences.html:99
+#: searx/templates/default/preferences.html:97
 #: searx/templates/oscar/preferences.html:137
 msgid "save"
 msgstr "Speichern"
 
 #: searx/templates/courgette/preferences.html:98
-#: searx/templates/default/preferences.html:100
+#: searx/templates/default/preferences.html:98
 #: searx/templates/oscar/preferences.html:138
 msgid "back"
 msgstr "Zurück"
 
 #: searx/templates/courgette/results.html:12
 #: searx/templates/default/results.html:12
-#: searx/templates/oscar/results.html:78
+#: searx/templates/oscar/results.html:87
 msgid "Search URL"
 msgstr "Such-URL"
 
 #: searx/templates/courgette/results.html:16
 #: searx/templates/default/results.html:16
-#: searx/templates/oscar/results.html:83
+#: searx/templates/oscar/results.html:92
 msgid "Download results"
 msgstr "Ergebnisse herunterladen"
 
 #: searx/templates/courgette/results.html:34
 #: searx/templates/default/results.html:42
-#: searx/templates/oscar/results.html:58
+#: searx/templates/oscar/results.html:67
 msgid "Suggestions"
 msgstr "Vorschläge"
 
 #: searx/templates/courgette/results.html:62
 #: searx/templates/default/results.html:78
-#: searx/templates/oscar/results.html:37
+#: searx/templates/oscar/results.html:41
 msgid "previous page"
 msgstr "vorherige Seite"
 
 #: searx/templates/courgette/results.html:73
 #: searx/templates/default/results.html:89
-#: searx/templates/oscar/results.html:45
+#: searx/templates/oscar/results.html:49
 msgid "next page"
 msgstr "nächste Seite"
 
@@ -210,39 +210,27 @@ msgstr "Suche nach..."
 #: searx/templates/courgette/stats.html:4 searx/templates/default/stats.html:4
 #: searx/templates/oscar/stats.html:5
 msgid "Engine stats"
-msgstr "Suchmaschinenstatistik"
+msgstr "Suchmaschinenstatistiken"
 
 #: searx/templates/default/categories.html:8
 msgid "Click on the magnifier to perform search"
-msgstr ""
-
-#: searx/templates/default/preferences.html:72
-msgid "Localization"
-msgstr ""
-
-#: searx/templates/default/preferences.html:82
-msgid "Yes"
-msgstr ""
-
-#: searx/templates/default/preferences.html:82
-msgid "No"
-msgstr ""
+msgstr "klicke auf die Lupe, um die Suche zu starten"
 
 #: searx/templates/default/results.html:34
 msgid "Answers"
-msgstr ""
+msgstr "Antworten"
 
 #: searx/templates/oscar/base.html:69
 msgid "Powered by"
-msgstr ""
+msgstr "Powered by"
 
 #: searx/templates/oscar/base.html:69
 msgid "a privacy-respecting, hackable metasearch engine"
-msgstr "eine privatsphären respektierende, hackbare Metasuchmaschine"
+msgstr "eine privatsphären-respektierende, hackbare Metasuchmaschine"
 
 #: searx/templates/oscar/navbar.html:6
 msgid "Toggle navigation"
-msgstr ""
+msgstr "Navigation umschalten"
 
 #: searx/templates/oscar/navbar.html:15
 msgid "home"
@@ -260,15 +248,15 @@ msgstr "Suchmaschinen"
 
 #: searx/templates/oscar/preferences.html:39
 msgid "What language do you prefer for search?"
-msgstr "Welche Sprache bevorzugst du für die Suche?"
+msgstr "welche Sprache bevorzugst du für die Suche?"
 
 #: searx/templates/oscar/preferences.html:50
 msgid "Change the language of the layout"
-msgstr "Ändere die Sprache des Layouts"
+msgstr "ändere die Sprache des Layouts"
 
 #: searx/templates/oscar/preferences.html:63
 msgid "Find stuff as you type"
-msgstr "finde Sachen während der Eingabe"
+msgstr "zeige Vorschläge während der Eingabe an"
 
 #: searx/templates/oscar/preferences.html:73
 msgid ""
@@ -288,9 +276,9 @@ msgstr "ändere das Aussehen von searx"
 msgid "Search results"
 msgstr "Suchergebnisse"
 
-#: searx/templates/oscar/results.html:73
+#: searx/templates/oscar/results.html:82
 msgid "Links"
-msgstr ""
+msgstr "Links"
 
 #: searx/templates/oscar/search.html:6 searx/templates/oscar/search_full.html:7
 msgid "Start search"
@@ -302,7 +290,7 @@ msgstr "Suchfilter anzeigen"
 
 #: searx/templates/oscar/search_full.html:11
 msgid "Hide search filters"
-msgstr "Suchfilter verstecke"
+msgstr "Suchfilter verstecken"
 
 #: searx/templates/oscar/stats.html:2
 msgid "stats"
@@ -318,11 +306,11 @@ msgstr "Schließen"
 #: searx/templates/oscar/messages/first_time.html:6
 #: searx/templates/oscar/messages/no_data_available.html:3
 msgid "Heads up!"
-msgstr "Information!"
+msgstr "Achtung!"
 
 #: searx/templates/oscar/messages/first_time.html:7
 msgid "It look like you are using searx first time."
-msgstr ""
+msgstr "Es sieht so aus, als ob das erstes mal mit searx arbeitest."
 
 #: searx/templates/oscar/messages/js_disabled.html:2
 msgid "Warning!"
@@ -330,7 +318,7 @@ msgstr "Warnung!"
 
 #: searx/templates/oscar/messages/js_disabled.html:3
 msgid "Please enable JavaScript to use full functionality of this site."
-msgstr "Bitte aktiviere JavaScript um alle möglichkeiten dieser Seite zu nutzen."
+msgstr "Bitte aktiviere JavaScript, um alle Funktionen dieser Seite zu nutzen. "
 
 #: searx/templates/oscar/messages/no_data_available.html:4
 msgid "There is currently no data available. "
@@ -346,7 +334,8 @@ msgid ""
 "categories."
 msgstr ""
 "Es konnten keine Suchergebnisse gefunden werden. Bitte nutze einen "
-"anderen Suchbegriff oder Suche das gewünschte in einer anderen Kategorie."
+"anderen Suchbegriff, oder suche das gewünschte in einer anderen "
+"Kategorie. "
 
 #: searx/templates/oscar/messages/save_settings_successfull.html:7
 msgid "Well done!"
@@ -358,7 +347,7 @@ msgstr "Einstellungen wurden erfolgreich gespeichert."
 
 #: searx/templates/oscar/messages/unknow_error.html:7
 msgid "Oh snap!"
-msgstr "Verdammt!"
+msgstr "Oh nein!"
 
 #: searx/templates/oscar/messages/unknow_error.html:8
 msgid "Something went wrong."
@@ -369,7 +358,15 @@ msgstr "Irgendetwas ist falsch gelaufen."
 #: searx/templates/oscar/result_templates/torrent.html:6
 #: searx/templates/oscar/result_templates/videos.html:6
 msgid "cached"
-msgstr "cached"
+msgstr "Im Cache"
+
+#: searx/templates/oscar/result_templates/default.html:9
+msgid "show media"
+msgstr ""
+
+#: searx/templates/oscar/result_templates/default.html:9
+msgid "hide media"
+msgstr ""
 
 #: searx/templates/oscar/result_templates/images.html:21
 msgid "Get image"
@@ -393,16 +390,33 @@ msgstr "Details anzeigen"
 
 #: searx/templates/oscar/result_templates/map.html:14
 msgid "hide details"
-msgstr "Details verstecke"
+msgstr "Details verstecken"
 
 #: searx/templates/oscar/result_templates/torrent.html:8
 msgid "Seeder"
-msgstr ""
+msgstr "Seeder"
 
 #: searx/templates/oscar/result_templates/torrent.html:8
 msgid "Leecher"
+msgstr "Leecher"
+
+#: searx/templates/oscar/result_templates/videos.html:9
+msgid "show video"
+msgstr ""
+
+#: searx/templates/oscar/result_templates/videos.html:9
+msgid "hide video"
 msgstr ""
 
+msgid "Localization"
+msgstr "Übersetzung"
+
+msgid "Yes"
+msgstr "Ja"
+
+msgid "No"
+msgstr "Nein"
+
 # categories - manually added
 # TODO - automatically add
 msgid "files"