Luke Pulverenti d33230d361 fix merge conflicts

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

..

ar.json

fix merge conflicts

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

be-BY.json

update translations

2015-07-28 15:53:57 -04:00

bg-BG.json

fix merge conflicts

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

ca.json

fix merge conflicts

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

cs.json

fix merge conflicts

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

da.json

fix merge conflicts

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

de.json

fix merge conflicts

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

el.json

fix merge conflicts

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

en-GB.json

fix merge conflicts

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

en-US.json

fix merge conflicts

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

es-AR.json

fix merge conflicts

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

es-MX.json

fix merge conflicts

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

es-VE.json

update translations

2015-07-28 15:53:57 -04:00

es.json

fix merge conflicts

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

fi.json

fix merge conflicts

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

fr.json

fix merge conflicts

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

gsw.json

fix merge conflicts

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

he.json

fix merge conflicts

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

hr.json

fix merge conflicts

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

hu.json

update translations

2015-07-28 15:53:57 -04:00

it.json

fix merge conflicts

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

javascript.json

fix merge conflicts

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

kk.json

fix merge conflicts

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

ko.json

fix merge conflicts

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

ms.json

fix merge conflicts

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

nb.json

fix merge conflicts

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

nl.json

fix merge conflicts

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

pl.json

fix merge conflicts

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

pt-BR.json

fix merge conflicts

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

pt-PT.json

fix merge conflicts

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

ro.json

fix merge conflicts

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

ru.json

fix merge conflicts

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

sl-SI.json

fix merge conflicts

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

sv.json

fix merge conflicts

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

tr.json

fix merge conflicts

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

uk.json

fix merge conflicts

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

vi.json

fix merge conflicts

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

zh-CN.json

fix merge conflicts

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

zh-HK.json

fix merge conflicts

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

zh-TW.json

fix merge conflicts

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