Merge branch 'master' into terencehill/screenshot_viewer

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / scoreboard.qc

diff --git a/qcsrc/client/scoreboard.qc b/qcsrc/client/scoreboard.qc
index 4a6c210ca960d3fcd4644a14827e30f1f3841862..7b90fcda3192e2561843fe7de15ed878d9aec320 100644 (file)
--- a/qcsrc/client/scoreboard.qc
+++ b/qcsrc/client/scoreboard.qc
@@ -1249,12 +1249,12 @@ void HUD_DrawScoreboard()
        if(gametype == GAME_LMS)
        {
                if(tl > 0)
-                       str = strcat(str, sprintf(_(" for up to ^1%.1g minutes^7"), tl));
+                       str = strcat(str, sprintf(_(" for up to ^1%.1f minutes^7"), tl));
        }
        else
        {
                if(tl > 0)
-                       str = strcat(str, sprintf(_(" for up to ^1%.1g minutes^7"), tl));
+                       str = strcat(str, sprintf(_(" for up to ^1%.1f minutes^7"), tl));
                if(fl > 0)
                {
                        if(tl > 0)
@@ -1281,15 +1281,15 @@ void HUD_DrawScoreboard()
                        if(teamplay)
                        {
                                str = strcat(str, sprintf(_(" until a lead of ^3%s %s^7"), ScoreString(teamscores_flags[ts_primary], ll), 
-                                       (teamscores_label[ts_primary] == _("score"))   ? CTX(_("SCO^points")) :
-                                       (teamscores_label[ts_primary] == _("fastest")) ? CTX(_("SCO^is beaten")) :
+                                       (teamscores_label[ts_primary] == "score")   ? CTX(_("SCO^points")) :
+                                       (teamscores_label[ts_primary] == "fastest") ? CTX(_("SCO^is beaten")) :
                                        TranslateScoresLabel(teamscores_label[ts_primary])));
                        }
                        else
                        {
                                str = strcat(str, sprintf(_(" until a lead of ^3%s %s^7"), ScoreString(scores_flags[ps_primary], ll), 
-                                       (scores_label[ps_primary] == _("score"))   ? CTX(_("SCO^points")) :
-                                       (scores_label[ps_primary] == _("fastest")) ? CTX(_("SCO^is beaten")) :
+                                       (scores_label[ps_primary] == "score")   ? CTX(_("SCO^points")) :
+                                       (scores_label[ps_primary] == "fastest") ? CTX(_("SCO^is beaten")) :
                                        TranslateScoresLabel(scores_label[ps_primary])));
                        }
                }