Commit Graph

62 Commits

Author SHA1 Message Date
JC Brand
b13ae5af69 Merge branch 'master' of git://github.com/bkocherov/converse.js into bkocherov-master
Conflicts:
	locale/locales.js
2013-10-03 08:58:25 +02:00
JC Brand
22395999ca Merge branch '0.6.x'
Conflicts:
	converse.css

I didn't merge converse.css or converse.min.css, instead fell back to master versions.
2013-10-03 08:41:14 +02:00
Boris Kocherov
155b8e6a40 Russian translation: continue translation. 2013-09-29 17:30:38 +04:00
w3host
d0e9618efa Hungarian translation 2013-09-26 15:19:14 +02:00
Boris Kocherov
f21dffbc27 Add Russian translation. 2013-09-25 14:49:17 +04:00
JC Brand
40c9c397de Updated js translation files (after OTR merge) 2013-09-15 22:20:32 +02:00
JC Brand
5598dd0379 Add make command po2json and run it 2013-09-15 22:16:33 +02:00
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
JC Brand
2be1b58721 Update DE and AF translations 2013-09-15 11:48:43 +02:00
JC Brand
a8fbfad073 update json and js pt-BR translation files 2013-09-15 11:48:43 +02:00
Sergio Oliveira
154df6c2d5 Updating pt-br translations 2013-09-15 11:48:43 +02:00
JC Brand
6dd0160a5b Update DE and AF translations 2013-09-15 11:46:41 +02:00
JC Brand
40b8435a19 update json and js pt-BR translation files 2013-09-15 11:25:40 +02:00
Sergio Oliveira
fc3e2d2714 Updating pt-br translations 2013-09-13 16:59:47 -03:00
JC Brand
2cab56b66c Update af translations 2013-09-13 16:10:37 +02:00
JC Brand
4610dfb24c Regenerated POT and PO files 2013-09-13 16:10:37 +02:00
JC Brand
359a19f7d5 Update af translations 2013-09-13 16:09:30 +02: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
JC Brand
9734ccdeff The word 'me' wasn't translation aware.
Conflicts:
	locale/converse.pot
2013-09-12 08:37:41 +02:00
JC Brand
00cb015d6a Merge branch 'master' into otr
Conflicts:
	converse.js
2013-09-10 23:33:30 +02:00
JC Brand
778b8a7c2e The word 'me' wasn't translation aware. 2013-09-10 23:31:29 +02:00
JC Brand
cf6c1e2140 Update af translations 2013-09-10 23:31:09 +02:00
JC Brand
4bb22b5c97 Translated strings may not be broken up. Regenerated POT file 2013-09-10 22:52:15 +02:00
JC Brand
44cd3168c8 Add French translations, courtesy of @tdesvenain 2013-09-02 12:31:35 +02:00
JC Brand
a2c70b47d8 Bugfix. factory isn't defined. 2013-08-27 10:19:14 +02:00
JC Brand
b61c936790 Don't reference LC_MESSAGES/en Bungle doesn't seem to find it. 2013-08-27 09:59:14 +02:00
JC Brand
563987cf29 Include Jed for the nolocales option.
We need variable sprintf type var interpolation
2013-08-27 09:37:33 +02:00
JC Brand
832c2eae90 Regenerated POT file. 2013-08-26 16:21:47 +02:00
JC Brand
7b0e1d331b Working on a way to build converse without locales.
- Add nolocales.js and let the __ function handle case where there aren't any
  locales specified.

Also:
In require config, change localstorage to backbone.localStorage (for better
integration with bungle).
2013-08-26 14:37:35 +02:00
JC Brand
c389c0f77d Allow the use of hyphens for country codes. 2013-08-25 22:45:41 +02:00
JC Brand
985da9c0ec Add converse.po for en (for Transifex) 2013-08-01 14:14:58 +02:00
JC Brand
868ae82bb0 Fixed paths to bower's components dir 2013-07-29 22:40:19 +02:00
JC Brand
45bd56753d Bugfix in translation files. Make sure Jed is defined. 2013-07-28 23:12:21 +02:00
JC Brand
63a4a57b3b Remove (empty) hungarian translation files.
I added them for someone who promised hu translations, but they are now just
taking up space.
2013-07-28 23:11:08 +02:00
JC Brand
33fd8b3cc6 Renamed pt_BR file for consistency. Fixed some bugs. 2013-07-27 02:05:55 +02:00
JC Brand
f96515b989 Merge pull request #28 from matheus-morfi/languageptbr
Adding pt_BR translations
2013-07-26 16:54:08 -07:00
JC Brand
9501bad94c Add single_locale.js 2013-07-27 01:21:08 +02:00
JC Brand
1fa11d01f7 Remove dependency on AMD/require.js. Updates #9 2013-07-27 01:10:18 +02:00
Matheus Figueiredo
6c5a9efe0c Using dict format to allow standard lang codes
Allowing standard language code makes easier to backends to send it to
converse.js keeping coherence.
2013-07-25 17:26:48 -03:00
Matheus Figueiredo
db45b1d9b4 Merge branch 'master' into languageptbr
Conflicts:
	locale/locales.js
2013-07-25 15:35:46 -03:00
JC Brand
9a0531120d Add docstring 2013-07-24 23:56:03 +02:00
Matheus Figueiredo
cb41094d9e Brasilian Portuguese + back with italian 2013-07-24 17:12:17 -03: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
JC Brand
3271f797e2 Bugfix. Typo in path. 2013-07-23 22:17:19 +02:00
Leonardo J. Caballero G
1b0923f9d8 Add Spanish translations 2013-07-22 18:20:58 -04:30