Merge remote-tracking branch 'asciimoo/master'

2 files changed, 67 insertions, 57 deletions

diff --git a/searx/translations/de/LC_MESSAGES/messages.mo b/searx/translations/de/LC_MESSAGES/messages.mo
index 8cf0ccbf9..279075e1d 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 a72d84f84..d1009eb81 100644
--- a/searx/translations/de/LC_MESSAGES/messages.po
+++ b/searx/translations/de/LC_MESSAGES/messages.po
@@ -1,60 +1,45 @@
-# English translations for .
+# English translations for PROJECT.
 # Copyright (C) 2014 ORGANIZATION
-# This file is distributed under the same license as the  project.
-#
+# This file is distributed under the same license as the PROJECT project.
+# 
 # Translators:
+# pointhi, 2014
 # stf <stefan.marsiske@gmail.com>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version:  searx\n"
+"Project-Id-Version: searx\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-01-31 13:40+0100\n"
-"PO-Revision-Date: 2014-01-30 17:40+0000\n"
-"Last-Translator: stf <stefan.marsiske@gmail.com>\n"
-"Language-Team: German "
-"(http://www.transifex.com/projects/p/searx/language/de/)\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"POT-Creation-Date: 2014-03-04 20:54+0100\n"
+"PO-Revision-Date: 2014-03-04 22:00+0000\n"
+"Last-Translator: pointhi\n"
+"Language-Team: German (http://www.transifex.com/projects/p/searx/language/de/)\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 1.3\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: searx/engines/__init__.py:290
+#: searx/engines/__init__.py:308
 msgid "Page loads (sec)"
 msgstr "Ladezeit (sek)"
 
-#: searx/engines/__init__.py:294
+#: searx/engines/__init__.py:312
 msgid "Number of results"
 msgstr "Trefferanzahl"
 
-#: searx/engines/__init__.py:298
+#: searx/engines/__init__.py:316
 msgid "Scores"
 msgstr "Punkte"
 
-#: searx/engines/__init__.py:302
+#: searx/engines/__init__.py:320
 msgid "Scores per result"
 msgstr "Punkte pro Treffer"
 
-#: searx/engines/__init__.py:306
+#: searx/engines/__init__.py:324
 msgid "Errors"
 msgstr "Fehler"
 
-#: searx/templates/engines.html:4
-msgid "Currently used search engines"
-msgstr "Aktuell benutzte Suchmachinen"
-
-#: searx/templates/engines.html:8
-msgid "Engine name"
-msgstr "Suchmaschinenname"
-
-#: searx/templates/engines.html:9
-msgid "Category"
-msgstr "Kategorie"
-
-#: searx/templates/engines.html:23 searx/templates/preferences.html:42
-msgid "back"
-msgstr "Zurück"
-
 #: searx/templates/index.html:7
 msgid "about"
 msgstr "Über uns"
@@ -69,56 +54,79 @@ msgstr "Einstellungen"
 
 #: searx/templates/preferences.html:9
 msgid "Default categories"
-msgstr "Default Kategorien"
+msgstr "Standard Kategorien"
 
 #: searx/templates/preferences.html:15
-#, fuzzy
 msgid "Search language"
-msgstr "Oberflaechensprache"
+msgstr "Suchsprache"
 
 #: searx/templates/preferences.html:18
 msgid "Automatic"
-msgstr ""
+msgstr "Automatisch"
 
 #: searx/templates/preferences.html:26
 msgid "Interface language"
-msgstr "Oberflaechensprache"
+msgstr "Oberflächensprache"
+
+#: searx/templates/preferences.html:36
+msgid "Currently used search engines"
+msgstr "Aktuell benutzte Suchmaschinen"
+
+#: searx/templates/preferences.html:40
+msgid "Engine name"
+msgstr "Suchmaschinenname"
+
+#: searx/templates/preferences.html:41
+msgid "Category"
+msgstr "Kategorie"
+
+#: searx/templates/preferences.html:42 searx/templates/preferences.html:53
+msgid "Allow"
+msgstr "Erlauben"
+
+#: searx/templates/preferences.html:42 searx/templates/preferences.html:54
+msgid "Block"
+msgstr "Blockieren"
 
-#: searx/templates/preferences.html:35
+#: searx/templates/preferences.html:62
 msgid ""
-"These settings are stored in your cookies, this allows us not to store "
-"this data about you."
-msgstr ""
-"Diese Informationen werden in Cookies gespeichert, damit wir keine ihrer "
-"persönlichen Daten speichern müssen."
+"These settings are stored in your cookies, this allows us not to store this "
+"data about you."
+msgstr "Diese Informationen werden in Cookies gespeichert, damit wir keine ihrer persönlichen Daten speichern müssen."
 
-#: searx/templates/preferences.html:37
+#: searx/templates/preferences.html:64
 msgid ""
 "These cookies serve your sole convenience, we don't use these cookies to "
 "track you."
-msgstr ""
-"Diese Cookies dienen ihrer Gemütlichkeit, wir verwenden sie nicht zum "
-"überwachen."
+msgstr "Diese Cookies dienen ihrer Gemütlichkeit, wir verwenden sie nicht zum überwachen."
 
-#: searx/templates/preferences.html:40
+#: searx/templates/preferences.html:67
 msgid "save"
 msgstr "Speichern"
 
+#: searx/templates/preferences.html:69
+msgid "back"
+msgstr "Zurück"
+
 #: searx/templates/results.html:11
 msgid "Suggestions"
-msgstr "Vorschlaege"
+msgstr "Vorschläge"
 
 #: searx/templates/results.html:22
+msgid "Search URL"
+msgstr "Such-URL"
+
+#: searx/templates/results.html:26
 msgid "Download results"
-msgstr "Download Ergebnisse"
+msgstr "Ergebnisse herunterladen"
 
-#: searx/templates/results.html:66
+#: searx/templates/results.html:62
 msgid "previous page"
-msgstr "vorige Seite"
+msgstr "vorherige Seite"
 
-#: searx/templates/results.html:74
+#: searx/templates/results.html:73
 msgid "next page"
-msgstr "naechste Seite"
+msgstr "nächste Seite"
 
 #: searx/templates/stats.html:4
 msgid "Engine stats"
@@ -130,13 +138,13 @@ msgid "files"
 msgstr "Dateien"
 
 msgid "general"
-msgstr "General"
+msgstr "allgemein"
 
 msgid "music"
-msgstr "Music"
+msgstr "Musik"
 
 msgid "social media"
-msgstr "Social Media"
+msgstr "Soziale Medien"
 
 msgid "images"
 msgstr "Bilder"
@@ -147,3 +155,5 @@ msgstr "Videos"
 msgid "it"
 msgstr "IT"
 
+msgid "news"
+msgstr "Neuigkeiten"