Commit Graph

3 Commits

Author SHA1 Message Date
JC Brand
d402ed8e8e Merge branch 'master' into otr
Conflicts:
	locale/af/LC_MESSAGES/converse.po
	locale/converse.pot
2013-09-12 20:57:51 +02:00
JC Brand
a33e370cec Merge new translations into the PO files 2013-09-12 11:21:21 +02:00
JC Brand
985da9c0ec Add converse.po for en (for Transifex) 2013-08-01 14:14:58 +02:00