Merge branch 'master' into terencehill/translated_keys

diff --cc qcsrc/client/main.qc
Simple merge

diff --cc qcsrc/common/util.qc
Simple merge

diff --cc qcsrc/common/util.qh
Simple merge

diff --cc qcsrc/menu/xonotic/keybinder.qc
index 36b134478cf0a8317c5e928f3fa29ee8eef071cc,200834ec44cc036c9d94548a0beedb6911455bae..ec7792c482446f6b50c8a977766d6c89b33eaa51
--- 1/qcsrc/menu/xonotic/keybinder.qc
--- 2/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);
  }