Sparky4567 308f968576 Resolved merge conflict by incorporating both suggestions.

2018-02-25 20:45:47 +02:00

..

bg_BG.json

Yello

2018-02-25 20:28:26 +02:00

de_CH.json

Yello

2018-02-25 20:28:26 +02:00

de_DE.json

Yello

2018-02-25 20:28:26 +02:00

en.json

Yello

2018-02-25 20:28:26 +02:00

es.json

Yello

2018-02-25 20:28:26 +02:00

fr_FR.json

Yello

2018-02-25 20:28:26 +02:00

ja_JP.json

Yello

2018-02-25 20:28:26 +02:00

nl_NL.json

Yello

2018-02-25 20:28:26 +02:00

pl_PL.json

Yello

2018-02-25 20:28:26 +02:00

ru_RU.json

Yello

2018-02-25 20:28:26 +02:00

tr_TR.json

Resolved merge conflict by incorporating both suggestions.

2018-02-25 20:45:47 +02:00

uk_UA.json

Yello

2018-02-25 20:28:26 +02:00