Luke Pulverenti d33230d361 fix merge conflicts

2016-01-19 14:49:42 -05:00

..

ar.json

update translations

2016-01-06 14:33:16 -05:00

bg-BG.json

update translations

2016-01-06 14:33:16 -05:00

ca.json

fix merge conflicts

2016-01-19 14:49:42 -05:00

cs.json

update translations

2016-01-06 14:33:16 -05:00

da.json

update translations

2016-01-06 14:33:16 -05:00

de.json

fix merge conflicts

2016-01-19 14:49:42 -05:00

el.json

update translations

2016-01-06 14:33:16 -05:00

en-GB.json

update translations

2016-01-06 14:33:16 -05:00

en-US.json

update translations

2016-01-06 14:33:16 -05:00

es-AR.json

update translations

2016-01-06 14:33:16 -05:00

es-MX.json

fix merge conflicts

2016-01-19 14:49:42 -05:00

es.json

update translations

2016-01-06 14:33:16 -05:00

fi.json

update translations

2016-01-06 14:33:16 -05:00

fr.json

fix merge conflicts

2016-01-19 14:49:42 -05:00

gsw.json

update translations

2016-01-06 14:33:16 -05:00

he.json

update translations

2016-01-06 14:33:16 -05:00

hr.json

update translations

2016-01-06 14:33:16 -05:00

hu.json

update translations

2016-01-06 14:33:16 -05:00

id.json

update translations

2016-01-06 14:33:16 -05:00

it.json

update translations

2016-01-06 14:33:16 -05:00

kk.json

update translations

2016-01-12 01:47:06 -05:00

ko.json

update translations

2016-01-06 14:33:16 -05:00

ms.json

update translations

2016-01-06 14:33:16 -05:00

nb.json

update translations

2016-01-06 14:33:16 -05:00

nl.json

fix merge conflicts

2016-01-19 14:49:42 -05:00

pl.json

update translations

2016-01-06 14:33:16 -05:00

pt-BR.json

fix merge conflicts

2016-01-19 14:49:42 -05:00

pt-PT.json

update translations

2016-01-06 14:33:16 -05:00

ro.json

update translations

2016-01-06 14:33:16 -05:00

ru.json

fix merge conflicts

2016-01-19 14:49:42 -05:00

server.json

fix merge conflicts

2016-01-19 14:49:42 -05:00

sl-SI.json

update translations

2016-01-06 14:33:16 -05:00

sv.json

update translations

2016-01-06 14:33:16 -05:00

tr.json

update translations

2016-01-06 14:33:16 -05:00

uk.json

update translations

2016-01-06 14:33:16 -05:00

vi.json

update translations

2016-01-06 14:33:16 -05:00

zh-CN.json

update translations

2016-01-06 14:33:16 -05:00

zh-HK.json

update translations

2016-01-06 14:33:16 -05:00

zh-TW.json

update translations

2016-01-06 14:33:16 -05:00