Merge remote-tracking branch 'origin/develop' into develop

2017-08-22 16:47:01 +00:00
parent eeadf63b6f 502a0480a0
commit 729d3f7608
47 changed files with 581 additions and 488 deletions
@@ -811,7 +811,6 @@
    "device id: ": "identifiant appareil : ",
    "Device key:": "Clé de l’appareil :",
    "Email address (optional)": "Adresse e-mail (facultatif)",
-    "List this room in %(domain)s's room directory?": "Lister ce salon dans le répertoire de %(domain)s ?",
    "Mobile phone number (optional)": "Numéro de téléphone (facultatif)",
    "Password:": "Mot de passe :",
    "Register": "S'inscrire",