More strings set as translatable.

Didn't made level editor translatable. Would be just waste of time for translators, since it will have to be submitted for a few clean-ups.

SVN-Revision: 1408

diff --git a/src/gameloop.cpp b/src/gameloop.cpp
index 651d39a..0fc9978 100644 (file)
--- a/src/gameloop.cpp
+++ b/src/gameloop.cpp
@@ -698,7 +698,7 @@ GameSession::drawstatus(DrawingContext& context)
 {
   char str[60];
   
-  snprintf(str, 60, "%d", player_status.score);
+  snprintf(str, 60, " %d", player_status.score);
   context.draw_text(white_text, _("SCORE"), Vector(0, 0), LAYER_FOREGROUND1);
   context.draw_text(gold_text, str, Vector(96, 0), LAYER_FOREGROUND1);
 

diff --git a/src/setup.cpp b/src/setup.cpp
index 3a2774f..a248d2c 100644 (file)
--- a/src/setup.cpp
+++ b/src/setup.cpp
@@ -395,7 +395,7 @@ void st_menu(void)
   options_menu->additem(MN_LABEL,_("Options"),0,0);
   options_menu->additem(MN_HL,"",0,0);
 #ifndef NOOPENGL
-  options_menu->additem(MN_TOGGLE,"OpenGL",use_gl,0, MNID_OPENGL);
+  options_menu->additem(MN_TOGGLE,_("OpenGL    "),use_gl,0, MNID_OPENGL);
 #else
   options_menu->additem(MN_DEACTIVE,_("OpenGL (not supported)"),use_gl, 0, MNID_OPENGL);
 #endif
@@ -411,15 +411,15 @@ void st_menu(void)
       options_menu->additem(MN_DEACTIVE,_("Music     "), false,0, MNID_MUSIC);
     }
   options_menu->additem(MN_TOGGLE,_("Show FPS  "),show_fps,0, MNID_SHOWFPS);
-  options_menu->additem(MN_GOTO,_("Keyboard Setup"),0,options_keys_menu);
+  options_menu->additem(MN_GOTO,_("Setup Keys"),0,options_keys_menu);
 
   if(use_joystick)
-    options_menu->additem(MN_GOTO,_("Joystick Setup"),0,options_joystick_menu);
+    options_menu->additem(MN_GOTO,_("Setup Joystick"),0,options_joystick_menu);
 
   options_menu->additem(MN_HL,"",0,0);
   options_menu->additem(MN_BACK,_("Back"),0,0);
   
-  options_keys_menu->additem(MN_LABEL,_("Key Setup"),0,0);
+  options_keys_menu->additem(MN_LABEL,_("Keyboard Setup"),0,0);
   options_keys_menu->additem(MN_HL,"",0,0);
   options_keys_menu->additem(MN_CONTROLFIELD_KB,_("Left move"), 0,0, 0,&keymap.left);
   options_keys_menu->additem(MN_CONTROLFIELD_KB,_("Right move"), 0,0, 0,&keymap.right);
@@ -1033,14 +1033,14 @@ void parseargs(int argc, char * argv[])
         }
       else if (strcmp(argv[i], "--help") == 0)
         {     /* Show help: */
-          puts("Super Tux " VERSION "\n"
-               "  Please see the file \"README.txt\" for more details.\n");
-          printf("Usage: %s [OPTIONS] FILENAME\n\n", argv[0]);
-          puts("Display Options:\n"
+          puts(_("  SuperTux  " VERSION "\n"
+               "  Please see the file \"README.txt\" for more details.\n"));
+          printf(_("Usage: %s [OPTIONS] FILENAME\n\n"), argv[0]);
+          puts(_("Display Options:\n"
                "  --fullscreen        Run in fullscreen mode.\n"
-               "  --opengl            If opengl support was compiled in, this will enable\n"
-               "                      the EXPERIMENTAL OpenGL mode.\n"
-               "  --sdl               Use non-opengl renderer\n"
+               "  --opengl            If OpenGL support was compiled in, this will tell\n"
+               "                      SuperTux to make use of it.\n"
+               "  --sdl               Use the SDL software graphical renderer\n"
                "\n"
                "Sound Options:\n"
                "  --disable-sound     If sound support was compiled in,  this will\n"
@@ -1058,7 +1058,7 @@ void parseargs(int argc, char * argv[])
                "                      options, license and game controls.\n"
                "  --usage             Display a brief message summarizing command-line options.\n"
                "  --version           Display the version of SuperTux you're running.\n\n"
-               );
+               ));
           exit(0);
         }
       else if (argv[i][0] != '-')
@@ -1092,7 +1092,7 @@ void usage(char * prog, int ret)
 
   /* Display the usage message: */
 
-  fprintf(fi, "Usage: %s [--fullscreen] [--opengl] [--disable-sound] [--disable-music] [--debug-mode] | [--usage | --help | --version] [--leveleditor] FILENAME\n",
+  fprintf(fi, _("Usage: %s [--fullscreen] [--opengl] [--disable-sound] [--disable-music] [--debug-mode] | [--usage | --help | --version] [--leveleditor] FILENAME\n"),
           prog);
 
 

diff --git a/src/worldmap.cpp b/src/worldmap.cpp
index e969525..ea37ab4 100644 (file)
--- a/src/worldmap.cpp
+++ b/src/worldmap.cpp
@@ -856,9 +856,6 @@ WorldMap::draw_status(DrawingContext& context)
   context.draw_text(gold_text, str, Vector(screen->w/2 + (16*5)/2, 0),
         LAYER_FOREGROUND1);
 
-  context.draw_text(white_text, _("LIVES"),
-      Vector(screen->w - white_text->get_text_width(_("LIVES"))*2, 0),
-      LAYER_FOREGROUND1);
   if (player_status.lives >= 5)
     {
       sprintf(str, "%dx", player_status.lives);
@@ -875,6 +872,9 @@ WorldMap::draw_status(DrawingContext& context)
             Vector(screen->w - tux_life->w*4 + (tux_life->w*i), 0),
             LAYER_FOREGROUND1);
     }
+  context.draw_text(white_text, _("LIVES"),
+      Vector(screen->w - white_text->get_text_width(_("LIVES")) - white_text->get_text_width("   99"), 0),
+      LAYER_FOREGROUND1);
 
   if (!tux->is_moving())
     {
@@ -888,7 +888,7 @@ WorldMap::draw_status(DrawingContext& context)
 
               context.draw_text(white_text, i->title, 
                   Vector(screen->w/2 - white_text->get_text_width(i->title)/2,
-                         screen->h - white_text->get_height() - 50),
+                         screen->h - white_text->get_height() - 30),
                   LAYER_FOREGROUND1);
               break;
             }