3 Commits (a12f6b322f6321fda3166e760878f8f40ddb1aaf)

Author	SHA1	Message	Date
ansuz	f1d1818200	resolve merge conflicts	2019-02-12 11:58:13 +01:00
ansuz	18b5e1a405	Merge remote-tracking branch 'origin/weblate' into soon	2019-02-11 13:55:08 +01:00
yflory	d97ada3e26	Test new translations	2019-01-29 17:50:02 +01:00