154 Commits (ead767658fc3bc6beca815d58c4c049b69f8096f)

Author	SHA1	Message	Date
ansuz	f1d1818200	resolve merge conflicts	6 years ago
ansuz	905e6b0fa1	add new translation keys to English text	6 years ago
yflory	6018f57ec1	Change translation format to JSON	6 years ago
yflory	d97ada3e26	Test new translations	6 years ago