ansuz f1d1818200 resolve merge conflicts

2019-02-12 11:58:13 +01:00

..

messages.de.js

resolve merge conflicts

2019-02-12 11:58:13 +01:00

messages.el.js

…

messages.es.js

…

messages.fr.js

…

messages.js

resolve merge conflicts

2019-02-12 11:58:13 +01:00

messages.pl.js

…

messages.pt-br.js

…

messages.ro.js

…

messages.zh.js

…