Merge branch 'master' into develop

locale/fr.json

@@ -118,7 +118,7 @@
     "Cancel the expiration date edit": "Annuler le changement de date d'expiration",
     "Poll rules": "Permissions du sondage",
     "Edit the poll rules": "Modifier les permissions du sondage",
-    "Votes and comments are locked": "Il n'est plus possible de voter.",
+    "Votes and comments are locked": "Il n'est plus possible de voter",
     "Save the new rules": "Enregistrer les nouvelles permissions",
     "Cancel the rules edit": "Annuler le changement de permissions",
     "Results are hidden": "Les résultats sont cachés",