Commit 20c2a577 authored by JC Brand's avatar JC Brand

Merge branch 'master' of github.com:jcbrand/converse.js

parents a37bcc30 fa4aae38
......@@ -282,7 +282,7 @@ msgstr "Vos messges ne sont pas cryptés. Cliquez ici pour activer le cryptage O
#: converse.js:1554
msgid "Your messages are encrypted, but your contact has not been verified."
msgstr "Vos messges sont cryptés, mais votre contact n'a pas été vérifié""
msgstr "Vos messges sont cryptés, mais votre contact n'a pas été vérifié"
#: converse.js:1556
msgid "Your messages are encrypted and your contact verified."
......
......@@ -619,6 +619,11 @@
null,
"Anexado"
]
,
"Type to filter": [
null,
"Escreva para filtrar"
]
}
}
};
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment