Merge in xonotic/xonotic-data.pk3dir.git: samual/fix_csqc_strings
git-manager created issue #391 on 2011-04-05T13:39:36Z:
Purpose of the branch:
Just to fix a little oversight with the gettext stuff -- this makes the warmup string render properly again
Repository: xonotic/xonotic-data.pk3dir.git Commit: 83f64548 Branch: samual/fix_csqc_strings
Merge commands:
cd data/xonotic-data.pk3dir
git checkout master
git reset --hard origin/master
git pull && git diff '83f645486d160af5191101d6267292f88d2e3c6d'..'origin/samual/fix_csqc_strings'
git merge --no-ff 'origin/samual/fix_csqc_strings'
git push && git push --delete origin 'samual/fix_csqc_strings'
Diffstat:
qcsrc/client/hud.qc | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
Revision log:
commit 83f645486d160af5191101d6267292f88d2e3c6d
Author: Samual
Commit: Samual
gettext a string which was missed for warmup
User agreed to the GPLv2*.
Diff:
<pre>diff —git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc
index 07ca884..4728284 100644
— a/qcsrc/client/hud.qc
**+ b/qcsrc/client/hud.qc
@ -4958,7 +4958,7
@ void HUD_InfoMessages
}
else if
{
- s = strcat);
- s = sprintf(_(“2Press3%s^2 to end warmup”), getcommandkey(“ready”, “ready”)); drawInfoMessage(s) }