Merge branch 'master' into sdl2.0

This commit is contained in:
Pere Pujal i Carabantes 2021-11-08 23:33:49 +01:00
commit 88d8252952
137 changed files with 9637 additions and 7950 deletions

View file

@ -22,7 +22,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
(See COPYING.txt)
June 14, 2002 - November 3, 2021
June 14, 2002 - November 8, 2021
*/
#include "platform.h"
@ -5953,7 +5953,7 @@ static void mainloop(void)
SDL_UpdateRect(screen, 0, 0, WINDOW_WIDTH, WINDOW_HEIGHT);
#endif
snprintf(angle_tool_text, sizeof(angle_tool_text), TIP_LINE_MOVING, angle);
snprintf(angle_tool_text, sizeof(angle_tool_text), gettext(TIP_LINE_MOVING), angle);
draw_tux_text(TUX_BORED, angle_tool_text, 1);
}
else if (cur_tool == TOOL_SHAPES)
@ -6215,7 +6215,7 @@ static void mainloop(void)
if (deg < 0)
deg += 360;
snprintf(angle_tool_text, sizeof(angle_tool_text), TIP_SHAPE_ROTATING, deg);
snprintf(angle_tool_text, sizeof(angle_tool_text), gettext(TIP_SHAPE_ROTATING), deg);
draw_tux_text(TUX_BORED, angle_tool_text, 1);
/* FIXME: Do something less intensive! */