3 Commits (fb50fe09ce0e5c5f7c4d8d305b7a7d1d88b10349)

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