From: Mario <zacjardine@y7mail.com>
Date: Sun, 8 May 2016 12:03:54 +0000 (+0000)
Subject: Merge branch 'terencehill/translate_colors_2' into 'master'
X-Git-Tag: xonotic-v0.8.2~935
X-Git-Url: https://de.git.xonotic.org/?a=commitdiff_plain;h=4dbee49b466f6636e0a49224ae81975e8b234148;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'terencehill/translate_colors_2' into 'master'

Disambiguate translation of team colors

It allows correct translation of team colors in many languages without changing color codes (```^TT```) in the messages, so there's no need to retranslate anything (no need to add other strreplace calls either).

See merge request !290
---

4dbee49b466f6636e0a49224ae81975e8b234148