X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fscoreboard.qc;h=364f9e969e27aeee9a5ca91c3a3310f2b4ee3740;hb=77c8f18d6cf54ac0c0b1e426ac79842e7f593c80;hp=b14a74f29e2f989d5788baf6fc23c2ba81357b99;hpb=cb0709da8ee360c0b175ed4cede85dbe276faf9c;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/scoreboard.qc b/qcsrc/client/scoreboard.qc
index b14a74f29..364f9e969 100644
--- a/qcsrc/client/scoreboard.qc
+++ b/qcsrc/client/scoreboard.qc
@@ -1377,24 +1377,23 @@ void HUD_DrawScoreboard()
 	pos_y += 1.2 * hud_fontsize_y;
 	drawcolorcodedstring(pos + '0.5 0 0' * (sbwidth - stringwidth(str, TRUE, hud_fontsize)), str, hud_fontsize, scoreboard_alpha_fg, DRAWFLAG_NORMAL);
 
-	// add information about respawn status
-	float respawn_time = getstatf(STAT_RESPAWN_SCHEDULE);
+	// print information about respawn status
+	float respawn_time = getstatf(STAT_RESPAWN_TIME);
 	if(respawn_time)
 	{
 		if(respawn_time < 0)
 		{
-			// a negative value means we are awaiting respawn, time value is still the same
-			respawn_time *= -1; // remove our mark now that we checked it
-			str = strcat("Respawning in ^3", ftos(respawn_time - time), "^7 seconds...");
+			// a negative number means we are awaiting respawn, time value is still the same
+			respawn_time *= -1; // remove mark now that we checked it
+			if(time >= respawn_time) // don't show a negative value while the server is respawning the player (lag)
+				str = _("^1Respawning...");
+			else
+				str = sprintf(_("^1Respawning in ^3%s^1 seconds..."), ftos_decimals(respawn_time - time, autocvar_scoreboard_respawntime_decimals));
 		}
 		else if(time < respawn_time)
-		{
-			str = strcat("You are dead, wait ^3", ftos(respawn_time - time), "^7 seconds before respawning");
-		}
+			str = sprintf(_("You are dead, wait ^3%s^7 seconds before respawning"), ftos_decimals(respawn_time - time, autocvar_scoreboard_respawntime_decimals));
 		else if(time >= respawn_time)
-		{
-			str = strcat("You are dead, press ^1", getcommandkey("primary fire", "+fire"), "^7 to respawn");
-		}
+			str = sprintf(_("You are dead, press ^2%s^7 to respawn"), getcommandkey("jump", "+jump"));
 
 		pos_y += 1.2 * hud_fontsize_y;
 		drawcolorcodedstring(pos + '0.5 0 0' * (sbwidth - stringwidth(str, TRUE, hud_fontsize)), str, hud_fontsize, scoreboard_alpha_fg, DRAWFLAG_NORMAL);