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/fr.json
+++ b/i18n/fr.json
@@ -150,5 +150,9 @@
    "Preview": "Prévisualiser",
    "PrivateBin requires the PATH to end in a \"%s\". Please update the PATH in your index.php.":
        "PrivateBin requires the PATH to end in a \"%s\". Please update the PATH in your index.php.",
+    "Decrypt":
+        "Decrypt",
+    "Enter password":
+        "Entrez le mot de passe",
    "Loading…": "Loading…"
 }