xmpp.chapril.org-conversejs/locale
JC Brand 6517b9bb9d Merge branch 'otr'
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
2013-09-15 22:08:34 +02:00
..
af/LC_MESSAGES Merge branch 'otr' 2013-09-15 22:08:34 +02:00
de/LC_MESSAGES Merge branch 'otr' 2013-09-15 22:08:34 +02:00
en/LC_MESSAGES Merge branch 'otr' 2013-09-15 22:08:34 +02:00
es/LC_MESSAGES Merge branch 'otr' 2013-09-15 22:08:34 +02:00
fr/LC_MESSAGES Merge branch 'otr' 2013-09-15 22:08:34 +02:00
it/LC_MESSAGES Merge branch 'otr' 2013-09-15 22:08:34 +02:00
pt_BR/LC_MESSAGES Merge branch 'otr' 2013-09-15 22:08:34 +02:00
converse.pot Merge branch 'otr' 2013-09-15 22:08:34 +02:00
locales.js Add French translations, courtesy of @tdesvenain 2013-09-02 12:31:35 +02:00
nolocales.js Bugfix. factory isn't defined. 2013-08-27 10:19:14 +02:00
single_locale.js Add single_locale.js 2013-07-27 01:21:08 +02:00