3 Commits (ba95ad6bf5e94d787b00707b61b369c0b97faffd)

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