From: terencehill <piuntn@gmail.com>
Date: Sun, 21 Apr 2019 15:44:04 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/translated_keys
X-Git-Tag: xonotic-v0.8.5~1533^2~4
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=45d8904a100765555e622598a39967963733df1d;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into terencehill/translated_keys
---

45d8904a100765555e622598a39967963733df1d
diff --cc qcsrc/menu/xonotic/keybinder.qc
index 36b134478,200834ec4..ec7792c48
--- a/qcsrc/menu/xonotic/keybinder.qc
+++ b/qcsrc/menu/xonotic/keybinder.qc
@@@ -438,10 -459,10 +460,10 @@@ void XonoticKeyBinder_drawListBoxItem(e
  			{
  				if(s != "")
  					s = strcat(s, ", ");
 -				s = strcat(s, keynumtostring(k));
 +				s = strcat(s, translate_key(keynumtostring(k)));
  			}
  		}
- 		s = draw_TextShortenToWidth(s, me.columnKeysSize, 0, me.realFontSize);
- 		draw_CenterText(me.realUpperMargin * eY + (me.columnKeysOrigin + 0.5 * me.columnKeysSize) * eX, s, me.realFontSize, theColor, theAlpha, 0);
  	}
+ 	s = draw_TextShortenToWidth(s, me.columnKeysSize, 0, me.realFontSize);
+ 	draw_CenterText(me.realUpperMargin * eY + (me.columnKeysOrigin + 0.5 * me.columnKeysSize) * eX, s, me.realFontSize, theColor, theAlpha, 0);
  }