Merge branch 'master' into plugins-refactor

efae4a7e · JC Brand · 6dcda4ad · 61843c28 · efae4a7e · efae4a7e
Commit efae4a7e authored May 20, 2015 by JC Brand
Showing with 204 additions and 335 deletions

docs/CHANGES.rst docs/CHANGES.rst +1 -0

locale/fr/LC_MESSAGES/converse.json locale/fr/LC_MESSAGES/converse.json +111 -250

locale/fr/LC_MESSAGES/converse.po locale/fr/LC_MESSAGES/converse.po +92 -85

No files found.
--- a/docs/CHANGES.rst
+++ b/docs/CHANGES.rst
@@ -10,6 +10,7 @@ Changelog
 * Bugfix. wrong callback argument mapping in XmppStatus initialize: fullname is null [thierrytiti]
 * #389 Allow login panel placeholders and roster item 'Name' translations. [gbonvehi]
 * Add placeholder for "Insert a smiley" translation [thierrytiti]
+* Updated French translation [thierrytiti]

 0.9.3 (2015-05-01)
 ------------------

--- a/locale/fr/LC_MESSAGES/converse.json
+++ b/locale/fr/LC_MESSAGES/converse.json
--- a/locale/fr/LC_MESSAGES/converse.po
+++ b/locale/fr/LC_MESSAGES/converse.po