Chapril/xmpp.chapril.org-conversejs
Chapril/xmpp.chapril.org-conversejs
25
0
Fork 0
Code Issues Pull Requests Projects Releases Activity
4,461 Commits 2 Branches 109 Tags 304 MiB
042c1947ed
Commit Graph

303 Commits

Author SHA1 Message Date
Weblate push user
b686fa1672 Update from Weblate. (#938) 
* Translated using Weblate (German)

Currently translated at 98.4% (260 of 264 strings)

Translation: Converse.js/Translations
Translate-URL: https://hosted.weblate.org/projects/conversejs/translations/de/

* Translated using Weblate (French)

Currently translated at 99.6% (263 of 264 strings)

Translation: Converse.js/Translations
Translate-URL: https://hosted.weblate.org/projects/conversejs/translations/fr/

* Translated using Weblate (Indonesian)

Currently translated at 36.3% (97 of 267 strings)

Translation: Converse.js/Translations
Translate-URL: https://hosted.weblate.org/projects/conversejs/translations/id/

* Translated using Weblate (Indonesian)

Currently translated at 34.0% (91 of 267 strings)

Translation: Converse.js/Translations
Translate-URL: https://hosted.weblate.org/projects/conversejs/translations/id/

* Translated using Weblate (Indonesian)

Currently translated at 32.9% (88 of 267 strings)

Translation: Converse.js/Translations
Translate-URL: https://hosted.weblate.org/projects/conversejs/translations/id/

* Translated using Weblate (Indonesian)

Currently translated at 32.9% (88 of 267 strings)

Translation: Converse.js/Translations
Translate-URL: https://hosted.weblate.org/projects/conversejs/translations/id/

* Translated using Weblate (Indonesian)

Currently translated at 33.7% (90 of 267 strings)

Translation: Converse.js/Translations
Translate-URL: https://hosted.weblate.org/projects/conversejs/translations/id/

* Translated using Weblate (German)

Currently translated at 98.1% (262 of 267 strings)

Translation: Converse.js/Translations
Translate-URL: https://hosted.weblate.org/projects/conversejs/translations/de/

* Translated using Weblate (Norwegian Bokmål)

Currently translated at 72.6% (194 of 267 strings)

Translation: Converse.js/Translations
Translate-URL: https://hosted.weblate.org/projects/conversejs/translations/nb/

* Translated using Weblate (German)

Currently translated at 100.0% (283 of 283 strings)

Translation: Converse.js/Translations
Translate-URL: https://hosted.weblate.org/projects/conversejs/translations/de/

* Translated using Weblate (German)

Currently translated at 100.0% (283 of 283 strings)

Translation: Converse.js/Translations
Translate-URL: https://hosted.weblate.org/projects/conversejs/translations/de/

* Translated using Weblate (French)

Currently translated at 92.2% (261 of 283 strings)

Translation: Converse.js/Translations
Translate-URL: https://hosted.weblate.org/projects/conversejs/translations/fr/

* Translated using Weblate (French)

Currently translated at 92.5% (262 of 283 strings)

Translation: Converse.js/Translations
Translate-URL: https://hosted.weblate.org/projects/conversejs/translations/fr/

* Translated using Weblate (French)

Currently translated at 95.7% (271 of 283 strings)

Translation: Converse.js/Translations
Translate-URL: https://hosted.weblate.org/projects/conversejs/translations/fr/

* Translated using Weblate (French)

Currently translated at 96.1% (272 of 283 strings)

Translation: Converse.js/Translations
Translate-URL: https://hosted.weblate.org/projects/conversejs/translations/fr/

* Translated using Weblate (French)

Currently translated at 100.0% (283 of 283 strings)

Translation: Converse.js/Translations
Translate-URL: https://hosted.weblate.org/projects/conversejs/translations/fr/

* Translated using Weblate (Norwegian Bokmål)

Currently translated at 70.3% (199 of 283 strings)

Translation: Converse.js/Translations
Translate-URL: https://hosted.weblate.org/projects/conversejs/translations/nb/
 2017-10-27 11:21:22 +02:00
Giuseppe Pignataro
d5ac15319c Updated italian translation (#932) 2017-10-15 11:42:41 +02:00
JC Brand
80b3692131 More work in removing locales from builds 2017-09-26 18:27:41 +02:00
JC Brand
f0debc61ab Refactor i18n so that only relevant translations are fetched 
instead of bundling all translations in the dist file.
 2017-09-25 12:49:10 +02:00
JC Brand
9375e382b8 Regenerated po and json files 2017-09-24 11:03:47 +02:00
JC Brand
f1519bed1e Generate new po files 2017-09-24 00:33:15 +02:00
JC Brand
3d53943f49 Generate pot file from the converse-no-dependencies build 
This is a workaround for the fact that getttext doesn't support ES2015 template
literals and it also allows us to scan for translateable strings in our HTML
templates.
 2017-09-24 00:30:43 +02:00
Weblate push user
c4f4213bc7 Update from Weblate. (#927) 
* Translated using Weblate (German)

Currently translated at 98.4% (260 of 264 strings)

Translation: Converse.js/Translations
Translate-URL: https://hosted.weblate.org/projects/conversejs/translations/de/

* Translated using Weblate (French)

Currently translated at 99.6% (263 of 264 strings)

Translation: Converse.js/Translations
Translate-URL: https://hosted.weblate.org/projects/conversejs/translations/fr/

* Translated using Weblate (Indonesian)

Currently translated at 36.3% (97 of 267 strings)

Translation: Converse.js/Translations
Translate-URL: https://hosted.weblate.org/projects/conversejs/translations/id/

* Translated using Weblate (Indonesian)

Currently translated at 34.0% (91 of 267 strings)

Translation: Converse.js/Translations
Translate-URL: https://hosted.weblate.org/projects/conversejs/translations/id/

* Translated using Weblate (Indonesian)

Currently translated at 32.9% (88 of 267 strings)

Translation: Converse.js/Translations
Translate-URL: https://hosted.weblate.org/projects/conversejs/translations/id/

* Translated using Weblate (Indonesian)

Currently translated at 32.9% (88 of 267 strings)

Translation: Converse.js/Translations
Translate-URL: https://hosted.weblate.org/projects/conversejs/translations/id/

* Translated using Weblate (Indonesian)

Currently translated at 33.7% (90 of 267 strings)

Translation: Converse.js/Translations
Translate-URL: https://hosted.weblate.org/projects/conversejs/translations/id/

* Translated using Weblate (German)

Currently translated at 98.1% (262 of 267 strings)

Translation: Converse.js/Translations
Translate-URL: https://hosted.weblate.org/projects/conversejs/translations/de/

* Translated using Weblate (Norwegian Bokmål)

Currently translated at 72.6% (194 of 267 strings)

Translation: Converse.js/Translations
Translate-URL: https://hosted.weblate.org/projects/conversejs/translations/nb/
 2017-09-24 00:28:40 +02:00
JC Brand
34e214d0df New release 3.2.1 2017-08-29 13:28:34 +02:00
JC Brand
979d486935 Regenerate pot, po and json files. 
Refs #909
 2017-08-23 12:00:49 +02:00
Weblate push user
b31cdd7754 Update from Weblate. (#910) 
* Translated using Weblate (German and French)

Currently translated at 98.4% (260 of 264 strings)

Translation: Converse.js/Translations
Translate-URL: https://hosted.weblate.org/projects/conversejs/translations/de/

* Translated using Weblate (French)

Currently translated at 99.6% (263 of 264 strings)

Translation: Converse.js/Translations
Translate-URL: https://hosted.weblate.org/projects/conversejs/translations/fr/
 2017-08-23 11:05:11 +02:00
JC Brand
8f88f35e0b New release 3.2.0 2017-08-09 18:00:09 +02:00
JC Brand
8113a14ace Release candicate for 3.2.0 2017-07-22 22:23:44 +02:00
JC Brand
7721275962 New release v3.1.1 2017-07-12 22:51:56 +02:00
JC Brand
c422237668 New release: 3.1.0 2017-07-05 10:07:28 +00:00
JC Brand
2cd0a16655 Merge remote-tracking branch 'weblate/master' 2017-06-25 12:36:08 +02:00
JC Brand
cad77c2e15 Regenerate pot and po files. 2017-06-21 22:27:37 +02:00
Murgl Gurgl
1ed233d011 Translated using Weblate (German) 
Currently translated at 88.2% (241 of 273 strings)

Translation: Converse.js/Translations
Translate-URL: https://hosted.weblate.org/projects/conversejs/translations/de/
 2017-06-21 22:26:25 +02:00
JC Brand
e338afadc2 New release 3.0.2 2017-04-23 17:25:19 +00:00
JC Brand
a24ae16579 Updated locales for next release 2017-04-23 17:19:02 +00:00
JC Brand
362c824368 Translated using Weblate (Afrikaans) 
Currently translated at 100.0% (267 of 267 strings)

Translation: Converse.js/Translations
Translate-URL: https://hosted.weblate.org/projects/conversejs/translations/af/

Translated using Weblate (Dutch)

Currently translated at 36.3% (97 of 267 strings)

Translation: Converse.js/Translations
Translate-URL: https://hosted.weblate.org/projects/conversejs/translations/nl/

Translated using Weblate (French)

Currently translated at 99.2% (265 of 267 strings)

Translation: Converse.js/Translations
Translate-URL: https://hosted.weblate.org/projects/conversejs/translations/fr/

Translated using Weblate (German)

Currently translated at 62.9% (168 of 267 strings)

Translation: Converse.js/Translations
Translate-URL: https://hosted.weblate.org/projects/conversejs/translations/de/
 2017-04-06 11:52:23 +02:00
JC Brand
21bc95a9f3 New release 3.0.1 2017-04-04 15:26:06 +00:00
JC Brand
09251f32c8 Remove the english translation files. No need for them. 2017-03-31 02:26:35 +00:00
Weblate push user
011b40abf7 Update from Weblate. (#830) 
* Translated using Weblate (Afrikaans)

Currently translated at 100.0% (267 of 267 strings)

Translation: Converse.js/Translations
Translate-URL: https://hosted.weblate.org/projects/conversejs/translations/af/

* Translated using Weblate (Dutch)

Currently translated at 36.3% (97 of 267 strings)

Translation: Converse.js/Translations
Translate-URL: https://hosted.weblate.org/projects/conversejs/translations/nl/

* Translated using Weblate (German)

Currently translated at 52.0% (139 of 267 strings)

Translation: Converse.js/Translations
Translate-URL: https://hosted.weblate.org/projects/conversejs/translations/de/

* Translated using Weblate (French)

Currently translated at 99.2% (265 of 267 strings)

Translation: Converse.js/Translations
Translate-URL: https://hosted.weblate.org/projects/conversejs/translations/fr/
 2017-03-29 20:54:39 +02:00
JC Brand
9214c81bbc Updated po files. 2017-03-15 11:02:25 +00:00
Thomas Camaran
ba1bc57d67 Translated using Weblate (Italian) 
Currently translated at 94.7% (253 of 267 strings)

Translation: Converse.js/Translations
Translate-URL: https://hosted.weblate.org/projects/conversejs/translations/it/
 2017-03-15 10:39:12 +00:00
JC Brand
96614a9771 Translated using Weblate (German) 
Currently translated at 52.4% (140 of 267 strings)

Translation: Converse.js/Translations
Translate-URL: https://hosted.weblate.org/projects/conversejs/translations/de/
 2017-03-15 10:37:18 +00:00
JC Brand
4331ac7d11 Remove markup from translations 2017-03-15 10:30:56 +00:00
JC Brand
9df3715ac8 Merge remote-tracking branch 'weblate/master' 2017-03-09 15:14:21 +00:00
JC Brand
22f569edd5 Translated using Weblate (Afrikaans) 
Currently translated at 100.0% (241 of 241 strings)

Translation: Converse.js/Translations
Translate-URL: https://hosted.weblate.org/projects/conversejs/translations/af/
 2017-03-09 15:56:17 +01:00
JC Brand
52433b2e2c Translated using Weblate (Afrikaans) 
Currently translated at 100.0% (241 of 241 strings)

Translation: Converse.js/Translations
Translate-URL: https://hosted.weblate.org/projects/conversejs/translations/af/
 2017-03-09 15:54:29 +01:00
JC Brand
06668d8733 3.0.0 release 2017-03-05 10:39:15 +00:00
JC Brand
2a7e19f957 Updated fuzzy af translations 2017-02-15 11:15:03 +00:00
Jean-Baptiste
0f1eb828d8 improved french translation (#776) 2017-02-06 08:26:39 +01:00
JC Brand
e34adf8000 New release: 2.0.5 2017-02-01 11:08:13 +00:00
JC Brand
06805d80b8 New release 2.0.4 2016-12-13 19:47:00 +00:00
JC Brand
8bbd88ba86 New release 2.0.3 2016-11-30 17:51:17 +00:00
JC Brand
829f9ab216 Release 2.0.2 2016-11-30 16:27:20 +00:00
JC Brand
8c3ffdffbb Release 2.0.1 2016-11-07 14:43:48 +00:00
camaran
9cc6c682a8 Other italian fix (#716) 2016-11-01 14:58:19 +00:00
camaran
d3fe8e63b3 First step for better italian 2016-10-18 11:29:36 +02:00
JC Brand
10da240e7e New release 2.0.0 2016-09-16 12:35:02 +00:00
JC Brand
fccd0860eb New release 1.0.6 2016-08-12 20:52:21 +00:00
Serge Victor
9b130f92b8 Polish translation updated to the current master. (#674) 2016-08-07 22:24:17 +02:00
JC Brand
4c123d51d4 New release: 1.0.5 2016-07-28 16:07:47 +00:00
JC Brand
d7c026e128 New release 1.0.4 2016-07-26 06:00:30 +00:00
JC Brand
598e29c910 New release: 1.0.3 2016-06-20 19:20:47 +00:00
JC Brand
1545018edf New release 1.0.2 2016-05-24 08:47:22 +00:00
JC Brand
8a74cc3323 New release: 1.0.1 2016-05-24 08:23:19 +00:00
JC Brand
5fa5f8272f New release 1.0.0 2016-05-03 15:37:41 +00:00
José María Rubio Moral
902cf0720e Feature/add catalan language (#634) 
* feature add catalan language

* feature add catalan language
 2016-04-14 11:05:22 +02:00
JC Brand
d0c13ea91c Small translation tweaks and then compiled i18n files 2016-04-07 10:42:27 +00:00
JC Brand
e1e37cbdce Regenerated location files (and fix Makefile to do this properly) 2016-04-04 10:34:39 +00:00
badfiles
f9af99e81e Include notification strings into Russian translation 2016-03-16 23:50:03 +03:00
badfiles
501d96e339 More relevant wording 2016-03-16 18:10:37 +03:00
badfiles
f406da6834 Clean up Russain translation 
More relevant wording
Spelling corrections
 2016-03-16 17:57:55 +03:00
badfiles
56b0211b8f Corrected spelling, punctuation and terminology. 2016-03-06 22:38:20 +03:00
badfiles
29f339e9b4 Corrected spelling, punctuation and terminology. 2016-03-06 21:57:27 +03:00
Davide Colombo
69c6749e6a fix typo in italian translation 2016-02-12 14:28:40 +01:00
JC Brand
cbdda26a19 New release: 0.10.1 2016-02-06 09:23:50 +00:00
LaconicTranslator
4b911bc119 Russian translation almost done 2016-01-22 20:50:42 +03:00
LaconicTranslator
ab28a3375b Translation for Russian language updated. Still undone. 2015-12-24 17:41:07 +03:00
Balázs Meskó
2c67853d65 Updated Hungarian translation 
Added the remaining untraslated strings, and also fixed some mistakes in
the translated ones.
 2015-11-11 14:06:12 +01:00
camaran
bf1b64e8f8 Optimized some translations 2015-11-10 10:46:45 +01:00
JC Brand
2253ec3d00 New release 0.10.0 2015-11-05 11:23:19 +00:00
JC Brand
88f043d9ca Merge branch 'master' into sass-refactor 2015-10-31 17:44:59 +00:00
JC Brand
dfcebeb621 Rename participants to occupants. 2015-10-31 16:48:50 +00:00
Serge Victor
a94d95c8a0 Update of Polish translation to version 0.9.6. 2015-10-28 09:46:37 +07:00
JC Brand
af77b3189e New release: 0.9.6 2015-10-12 15:09:47 +00:00
GreenLunar
4f99e9f906 Update Hebrew translation 2015-09-18 15:47:03 +03:00
Charles Huang
d9679ce45f Fix translation error in en locale 
- fix incorrect string mapping in en locale
 2015-09-05 22:25:37 +10:00
camaran
2178822e97 update italian language 2015-08-29 21:30:01 +02:00
JC Brand
6369465661 Making a new 0.9.5 release. 2015-08-24 17:56:50 +02:00
Basilio Ferraz
b9b0b096d8 Adicionando Tradução de palavra 
Procurei pela tradução e não hávia encontrado a tradução dessa frase, por isso venho aqui propor esta melhoria.
 2015-08-05 12:54:43 -03:00
Sami Keinänen
3301a88ae3 Excessive double quote in french translation file 2015-07-31 13:33:32 +03:00
JC Brand
14c64151ab New release: 0.9.4 2015-07-04 17:21:21 +02:00
Christoph
09241fc7ec Translations from po but missing in json 2015-06-11 09:40:54 +02:00
Christoph
f57a24487e Fix unused placeholders in german 'is typing' translation 2015-06-11 09:40:19 +02:00
Christoph
6940f5e290 More small improvements to german locale 2015-06-05 12:51:23 +02:00
JC Brand
712ddb0fca Updates to DE translations. Updates #420 2015-06-04 10:12:20 +02:00
Christoph
8ce4f15a4e Improve de locale 2015-06-03 14:07:04 +02:00
JC Brand
61843c2838 Updated JSON file with French translations. 2015-05-20 09:26:32 +02:00
thierrytiti
871336fe56 French Translation 2015-05-15 19:07:45 +02:00
JC Brand
34630693b7 Merge branch 'master' into roster_refactor 
Conflicts:
	locale/en/LC_MESSAGES/converse.po
 2015-05-01 12:37:43 +02:00
JC Brand
145fd016a3 New release: 0.9.3 2015-05-01 12:29:48 +02:00
JC Brand
ea56df4b63 Updated af and de translations. 2015-05-01 12:25:59 +02:00
JC Brand
e7180f20b1 Add Ukranian translations 2015-05-01 11:16:23 +02:00
JC Brand
aa3de742c0 Merge branch 'master' into roster_refactor 2015-04-25 23:06:59 +02:00
JC Brand
6d0efe0f82 Generate JSON from the new fr po file 2015-04-25 22:49:49 +02:00
thierrytiti
9da6c0e9ec French translation 2015-04-25 22:43:19 +02:00
JC Brand
937e1d3d4f Remove all fuzzy entries in en po 2015-04-13 17:04:30 +02:00
JC Brand
995c5fdb44 Make release 0.9.2 2015-04-08 13:41:31 +02:00
JC Brand
e0e0f1b7d7 Make release 0.9.1 2015-03-26 09:58:09 +01:00
JC Brand
17da00d5c1 Release version 0.9.0 2015-03-06 18:49:31 +01:00
JC Brand
235c3e15aa Ran "make po2json" 2015-02-08 20:03:36 +01:00
GreenLunar
64d0e77a56 Updated hebrew translation (0.8.8) 2015-02-08 13:10:41 +02:00
w3host
12f3431df7 Updated hungarian translation (0.8.8) 2015-01-25 23:54:56 +01:00
JC Brand
8478b432c3 Lazily call parseJSON on translation data. 
Also, moved locales.js to ./src folder.
Add it as dependency to utils.js and remove it from the deps scripts
 2015-01-16 22:33:18 +01:00
JC Brand
31cb3d4b6e Fix the non-AMD case. 2015-01-16 22:07:27 +01:00
JC Brand
0a1a98d278 Load the JSON files directly for other langs as well. 2015-01-16 21:16:47 +01:00
JC Brand
d22ab21bbf Proof of work. Load JSON file directly 
instead of having to create a .js file with translations.
 2015-01-16 21:04:38 +01:00
JC Brand
ba09fa1fbb Generate JSON file from Polish po file. 2015-01-16 20:48:40 +01:00
Serge Victor
09594a7b87 Polish translation of version 0.8.6. 2015-01-12 18:52:22 +07:00
JC Brand
3b65a029cf Update af translations. 2014-12-20 11:56:45 +01:00
JC Brand
8576d9487c Add Norwegian translations. 2014-12-20 11:18:44 +01:00
JC Brand
303a412b38 New release 0.8.6 2014-12-07 22:50:10 +01:00
JC Brand
92ed46f844 New release 0.8.5 2014-12-01 20:53:08 +01:00
JC Brand
c98e516e39 New release 0.8.4 2014-11-15 16:40:34 +01:00
JC Brand
8dedef7002 Create new PO file for Polish. 
Also update documentation to mention msginit.
 2014-10-21 13:18:26 +02:00
JC Brand
d8bf1961a7 Making a 0.8.3 release. 
The 0.8.2 release didn't include new builds due to an unnoticed build error.
 2014-09-22 18:17:40 +02:00
JC Brand
56ec4cf7bc New release 0.8.2 2014-09-22 17:57:56 +02:00
JC Brand
072f9e8534 Add updated hebrew translations. 2014-09-22 17:06:22 +02:00
GreenLunar
cd088427a7 Hebrew translation update 2014-09-19 16:07:22 +03:00
JC Brand
5ee8c5470d Move all path declarations from locales.js to main.js 
Makes it easier to integrate converse.js into other bower/require projects.
 2014-09-06 14:10:48 +02:00
JC Brand
5d4deffc48 Define jed path in main.js, not locales.js 2014-09-06 14:02:05 +02:00
JC Brand
c44649a820 Generate new pot and po files 2014-08-25 14:39:32 +02:00
JC Brand
e3dbbf2eae Merge zh translations and update CHANGES.rst for 0.8 release. 2014-08-04 23:24:41 +02:00
JC Brand
2cc38dec44 Merge pull request #195 from lancelothuxi/patch-1 
Update Chinese translation PO file
 2014-08-04 23:09:39 +02:00
Javier Lopez
aac2acef0a improve Spanish localization 2014-07-20 04:11:42 -05:00
lancelot
81956dcc94 Update Chinese translation PO file 
for 0.8 release, a few more sentences translated, also revised some other sentences translation for easier understanding
 2014-07-16 20:33:39 +08:00
Alan Meira
7ee25f716f add more pt_BR translations and some fixes 2014-07-07 20:31:24 -03:00
JC Brand
bb411b61e8 Wrong translator name 2014-07-06 18:05:47 +02:00
JC Brand
1f7cb9c551 Generate new pot, po and json files (for i18n) 2014-07-06 18:00:11 +02:00
JC Brand
ad90e74260 Simplified Chinese translations, courtesy of Lancelot 2014-07-06 17:56:42 +02:00
JC Brand
8a628f48ca Update Hebrew translations with changes from PO file. Fixes #124 2014-02-23 01:01:11 +02:00
GreenLunar
8b166d0f06 Hebrew translation update 
Fix minor typing errors
 2014-02-21 06:11:33 +02:00
JC Brand
cd144a98ca Add Hebrew translations 2014-01-28 09:41:52 +02:00
JC Brand
24b205536a Fix syntax err in Indonesian translations and update CHANGES 2014-01-28 09:32:21 +02:00
JC Brand
8f40b0e88f Merge pull request #114 from GreenLunar/master 
add Hebrew po
 2014-01-28 16:43:38 -08:00
JC Brand
3800023c8d Merge pull request #115 from priyadi/master 
Added Indonesian translations
 2014-01-28 16:34:20 -08:00
JC Brand
d7c31d5b73 Minor correction of OTR/SMP explanation. Fixes #113 2014-01-28 03:50:51 +02:00
Priyadi Iman Nurcahyo
0ae80be244 Added Indonesian translations 2014-01-25 14:51:51 +00:00
GreenLunar
777f03bbf3 add Hebrew po 2014-01-24 16:01:13 +02:00
JC Brand
cf22003a97 Regenerated Pot file. 2014-01-22 17:07:50 +02:00
JC Brand
7f8c85f10a Integrate Japanese translations 2014-01-08 15:44:13 +02:00
Mako N
17f4c64948 add Japanese po 2014-01-07 11:35:10 +09:00
JC Brand
546204bed6 Merge branch '0.6.x' 2013-10-19 18:28:31 +02:00
JC Brand
61c7174238 Bugfix. Wrong global variable set 2013-10-19 18:24:28 +02:00
JC Brand
6e15986a87 Merge branch '0.6.x' 
Conflicts:
	index.html
 2013-10-15 19:16:11 +02:00
JC Brand
f1a1d36cc4 Add Dutch translation, provided by @maartenkling 2013-10-15 19:15:06 +02:00
JC Brand
32593b755f Merge branch 'master' of git://github.com/bkocherov/converse.js into bkocherov-master 
Conflicts:
	locale/locales.js

Conflicts:
	index.html

Add Russian translation by bkocherov (actually made against master branch)
 2013-10-03 09:10:24 +02:00
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