6517b9bb9d
Conflicts: CHANGES.rst locale/af/LC_MESSAGES/af.js locale/af/LC_MESSAGES/converse.json locale/af/LC_MESSAGES/converse.po locale/converse.pot locale/de/LC_MESSAGES/converse.po locale/en/LC_MESSAGES/converse.po locale/es/LC_MESSAGES/converse.po locale/fr/LC_MESSAGES/converse.po locale/it/LC_MESSAGES/converse.po locale/pt_BR/LC_MESSAGES/converse.po |
||
---|---|---|
.. | ||
af/LC_MESSAGES | ||
de/LC_MESSAGES | ||
en/LC_MESSAGES | ||
es/LC_MESSAGES | ||
fr/LC_MESSAGES | ||
it/LC_MESSAGES | ||
pt_BR/LC_MESSAGES | ||
converse.pot | ||
locales.js | ||
nolocales.js | ||
single_locale.js |