Merge branch 'master' into JSnotWorkingError

2016-11-13 18:30:14 +01:00
parent c2aa931392 3f2de319f3
commit b94d252421
15 changed files with 172 additions and 34 deletions
--- a/i18n/de.json
+++ b/i18n/de.json
@@ -141,5 +141,9 @@
    "Preview": "Vorschau",
    "PrivateBin requires the PATH to end in a \"%s\". Please update the PATH in your index.php.":
        "Der PATH muss bei PrivateBin mit einem \"%s\" enden. Bitte passe Deinen PATH in Deiner index.php an.",
+    "Decrypt":
+        "Entschlüsseln",
+    "Enter password":
+        "Passwort eingeben",
    "Loading…": "Lädt…"
 }