3 Commits (5bbfb4c71f485d6f5e60ccf83c4ed96f2c0f6e37)

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