Merge branch 'master' into webcrypto

2019-03-25 20:18:10 +01:00
parent a60b86691e 0e18b5d0c1
commit eeca365e18
3 changed files with 8 additions and 8 deletions
--- a/i18n/oc.json
+++ b/i18n/oc.json
@@ -163,5 +163,5 @@
    "+++ no paste text +++": "+++ cap de tèxte pegat +++",
    "Could not get paste data: %s":
        "Recuperacion impossibla de las donadas copiadas : %s",
-    "QR code": "QR code"
+    "QR code": "Còdi QR"
 }