Revert "Fix scr_conHeight. Note that it gets misaligned a little for small values."

This reverts commit 31d71379eeec2a782dacef75d1f3d5ef28c89e91.
Use a different method to partially fix scr_conHeight
Fix the UI language-setting breakage.

UI code was looking for exact language matches without considering country.
If no exact match is found, then the country code is stripped off and the
base language code is checked for instead.
Display client counts for servers as players+bots.
Register cgame cvars as early as possible.

This avoids the options menu showing incorrect defaults for a fresh install
before a game is started.
Minor bot-reporting fix.
Skip whitespace after a command terminator.

This allows code elsewhere to correctly assume that there's no leading whitespace.
Merge branch 'master' into resources