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 |
|
Sergio Oliveira
|
fc3e2d2714
|
Updating pt-br translations
|
2013-09-13 16:59:47 -03:00 |
|
JC Brand
|
3bd6b4e1cc
|
Regenerated POT and PO files
|
2013-09-13 16:02:33 +02:00 |
|
JC Brand
|
e33b8d34e5
|
Regenerated POT and PO files
|
2013-09-13 10:35:51 +02:00 |
|
JC Brand
|
f6884d90db
|
Regenerated PO and POT files
|
2013-09-13 10:35:25 +02:00 |
|
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 |
|
Matheus Figueiredo
|
476a8e0c3f
|
Fixing some mistranslating
|
2013-07-24 16:52:49 -03:00 |
|
Matheus Figueiredo
|
f0a2ba650f
|
Adding Brasilian Portuguese translation
|
2013-07-24 16:39:25 -03:00 |
|