From: terencehill <piuntn@gmail.com>
Date: Tue, 23 Apr 2019 14:52:26 +0000 (+0000)
Subject: Merge branch 'terencehill/translated_keys' into 'master'
X-Git-Tag: xonotic-v0.8.5~1533
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b2ecac9b14d12a035ba3c6ef4e11d0e44772d634;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'terencehill/translated_keys' into 'master'

Translatable key names

Closes #1867

See merge request xonotic/xonotic-data.pk3dir!584
---

b2ecac9b14d12a035ba3c6ef4e11d0e44772d634