3 Commits (4a4146f39dee31eab1a51e337ca5a4c57f0bbcf1)

Author	SHA1	Message	Date
ansuz	f1d1818200	resolve merge conflicts	6 years ago
ansuz	18b5e1a405	Merge remote-tracking branch 'origin/weblate' into soon	6 years ago
yflory	d97ada3e26	Test new translations	6 years ago