super-tux-commit — Messages about commits to the sourcecode.

[Super-tux-commit] supertux TRANSLATORS,1.2,1.3

[Ricardo C. <rm...@us...>]

Update of /cvsroot/super-tux/supertux
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27075

Modified Files:
	TRANSLATORS 
Log Message:
format this file in a sane way and correct some information

Index: TRANSLATORS
===================================================================
RCS file: /cvsroot/super-tux/supertux/TRANSLATORS,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- TRANSLATORS	4 Jun 2004 19:42:10 -0000	1.2
+++ TRANSLATORS	7 Jun 2004 12:06:57 -0000	1.3
@@ -1,51 +1,67 @@
-                        - SuperTux Translation info -
 
-Last update: June 4, 2004
+- Translation info -
+http://super-tux.sf.net/
+
+Last update: June 7, 2004
 
+ == TRANSLATORS ==
 
 1. Notes for Translators
 ~~~~~~~~~~~~~~~~~~~~~~~~
 
-* If there isn't a good translation for some term (ie. fullscreen), you might
-  consider to just keep it. It's better than making the user confused.
+* If there isn't a good translation for some term (ie. fullscreen), you might consider
+  to just keep it. It's better than making the user confused.
 
-* In English, there is only one singular second person mode (You). If your
-  language does have more than one - a personal and impersonal - remember that
-  this is a game, so you should use the personal one. However, if it is
-  possible to ommit it in your language, it might be a good idea.
+* In English, there is only one singular second person mode (You). If your language does
+  have more than one - a personal and impersonal - remember that this is a game, so you
+  should use the personal one. And if it is possible to ommit it in your language, it might
+  be a good idea.
 
-* Names like SuperTux, Tux, Penny and other game elements should not be
-  translated. If you really think one of these to be a too strange word for
-  your people, first inform us at our mailing list.
+* Names like SuperTux, Tux, Penny and other game elements should not be translated. If you
+  really think one of these to be a too strange word for your people, first inform us at
+  our mailing list.
 
-* Translating lots of strings can be boring and time consuming, but, in my
-  opinion, it worths when lookins at the results ;-)
+A couple of notes:
+* If somewhere in the game, after translating a string, it doesn't look well (bad
+  aligment, overlaps other text...), let us know - will be fixed.
 
-* If somewhere in the game, after translating a string, it doesn't look well
-  (bad aligment, overlaps other text...), contact us. We might be able to change
-  to code.
+* Currently, only the game itself is translatable. Data files, like levels,
+  credits, story... are not yet translatable.
 
-* There are programs that help with translating: KBable and the gettext Emacs
-  plugin can give your productivity a huge boost.
+All in all, translating lots of strings can be boring and time consuming, but it
+worths when lookins at the results ;-)
 
-* Please read gettext documentation on how to start translating.
-   http://www.gnu.org/software/gettext/manual/html_chapter/gettext_5.html#SEC29
+2. Programs to Aid Translation
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-* After translating the file, add it to LINGUAS (ie. Spanish - es) and run
-  'make update-po'.
+ KBabel      - a long dated KDE program that has been maturing over the years, and it's
+               really handy by now.
+ (X)Emacs    - a commonly used program for translating with the respective plugin.
+ QTranslator - made by Qt, has the advantage of running in several platforms.
+ PO files are written in ASCII and are pretty intuitive, so they can be used by any text
+ editor. But it would be wise to use a program made for that effect. If not possible,
+ use a text editor with highlighting for PO files.
 
-* You currently have to install supertux to see the results of the translation.
 
-* Currently, only the game itself is translatable. Data files, like levels, 
-  credits, story... are not yet translatable (but that is planed for later).
+ If all of this is new to you, the translation file that you should use is the supertux.pot
+ that is inside the po/ root folder. Rename it to your language (ie. Spanish - es.po) and
+ then open it with an appropriate program.
+ After translating the file, add an entry of your language to the LINGUAS file (ie. Spanish - es)
+ and run 'make update-po'. Then a binary file will be created. In order to make SuperTux using
+ it, you will have to install it ('make install').
 
 
+ == DEVELOPERS ==
 
-2. DEVELOPERS
-~~~~~~~~~~~~~
+1. Translatable Strings
+~~~~~~~~~~~~~~~~~~~~~~~
 
-* Debugging output should not be translated. That is everything that goes to the
-  console except error messages and the usage text of the program.
+ Output should not be translated, since their purpose is mainly for debugging.
+ However, command description (ie. --help) should obviously be translated. Messages
+ that give the user a solution for a problem, might be translatable, as well.
 
-* Parametars shouldn't also be translatable.
+ Parametars shouldn't also be translatable. It breaks scripting, besides advanced users,
+ the ones that will make use of this, usually don't like it.
 
+
+The SuperTux Team

[Super-tux-commit] former combat pilot strikes it rich

[Dr. K. <no...@e-...>]

No text version was provided

Re: [Super-tux-commit] supertux TRANSLATORS,1.1,1.2

[Ricardo C. <ri...@ae...>]

 I guess it's easier to remove text than to write it.

Ricardo

Em Sexta, 4 de Junho de 2004 20:42, o Matze Braun escreveu:
> Update of /cvsroot/super-tux/supertux
> In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11896
>
> Modified Files:
> 	TRANSLATORS
> Log Message:
> format this file in a sane way and correct some information
>
> Index: TRANSLATORS
> ===================================================================
> RCS file: /cvsroot/super-tux/supertux/TRANSLATORS,v
> retrieving revision 1.1
> retrieving revision 1.2
> diff -u -d -r1.1 -r1.2
> --- TRANSLATORS	4 Jun 2004 14:04:37 -0000	1.1
> +++ TRANSLATORS	4 Jun 2004 19:42:10 -0000	1.2
> @@ -1,60 +1,51 @@
> -
> -- Translation info -
> -http://super-tux.sf.net/
> +                        - SuperTux Translation info -
>
>  Last update: June 4, 2004
>
> - == TRANSLATORS ==
>
> -* Translation Hints *
> +1. Notes for Translators
> +~~~~~~~~~~~~~~~~~~~~~~~~
>
> - If there isn't a good translation for some term (ie. fullscreen), you
> might consider -to just keep it. It's better than making the user confused.
> +* If there isn't a good translation for some term (ie. fullscreen), you
> might +  consider to just keep it. It's better than making the user
> confused.
>
> - In English, there is only one singular second person mode (You). If your
> language does -have more than one - a personal and impersonal - remember
> that this is a game, so you -should use the personal one. However, if it is
> possible to ommit it in your language, -it might be a good idea.
> +* In English, there is only one singular second person mode (You). If your
> +  language does have more than one - a personal and impersonal - remember
> that +  this is a game, so you should use the personal one. However, if it
> is +  possible to ommit it in your language, it might be a good idea.
>
> - Names like SuperTux, Tux, Penny and other game elements should not be
> translated. If you -really think one of these to be a too strange word for
> your people, first inform us at -our mailing list.
> +* Names like SuperTux, Tux, Penny and other game elements should not be
> +  translated. If you really think one of these to be a too strange word
> for +  your people, first inform us at our mailing list.
>
> - Translating lots of strings can be boring and time consuming, but, in my
> opinion, it -worths when lookins at the results ;-)
> +* Translating lots of strings can be boring and time consuming, but, in my
> +  opinion, it worths when lookins at the results ;-)
>
> -Note: If somewhere in the game, after translating a string, it doesn't
> look well (bad -aligment, overlaps other text...), contact us.
> +* If somewhere in the game, after translating a string, it doesn't look
> well +  (bad aligment, overlaps other text...), contact us. We might be
> able to change +  to code.
>
> -* Programs to Aid Translation *
> +* There are programs that help with translating: KBable and the gettext
> Emacs +  plugin can give your productivity a huge boost.
>
> - My personal favourite is KBabel (don't forget to fill the configuration
> regarding your -country).
> - I am also aware that (X)Emacs has also a plugin for this effect. I
> believe Qt also has a -translation aid program called QTranslator.
> +* Please read gettext documentation on how to start translating.
> +  
> http://www.gnu.org/software/gettext/manual/html_chapter/gettext_5.html#SEC2
>9
>
> - If you are new to this, the translation file that you should use is the
> supertux.pot that -is inside the po/ root folder. Rename it to your
> language (ie. Spanish - es.po) and then -open it with any program.
> - It is only a plain text file, so you can even use any text editor you
> want to translate it, -but it may be wise to use a specific program for the
> purpose.
> - After translating the file, add it to LINGUAS (ie. Spanish - es) and run
> 'make update-po'. -Then a binary file will be created. In order to make
> SuperTux using it, you will have to -install it ('make install').
> +* After translating the file, add it to LINGUAS (ie. Spanish - es) and run
> +  'make update-po'.
>
> -Note: Currently, only the game itself is translatable. Data files, like
> levels, -credits, story... are not yet translatable.
> +* You currently have to install supertux to see the results of the
> translation.
>
> +* Currently, only the game itself is translatable. Data files, like
> levels, +  credits, story... are not yet translatable (but that is planed
> for later).
>
> - == DEVELOPERS ==
>
> -* Translatable Strings *
>
> - Output should not be translated, since their purpose is mainly for
> debugging. - However, command description (ie. --help) should obviously be
> translated. Messages -that give the user a solution for a problem, might be
> translatable, as well. +2. DEVELOPERS
> +~~~~~~~~~~~~~
>
> - Parametars shouldn't also be translatable. It breaks scripting. Besides
> advanced users, -the ones that will make use of this, usually don't like
> it.
> +* Debugging output should not be translated. That is everything that goes
> to the +  console except error messages and the usage text of the program.
> +
> +* Parametars shouldn't also be translatable.
>
> -The SuperTux Team
>
>
>
> -------------------------------------------------------
> This SF.Net email is sponsored by the new InstallShield X.
> From Windows to Linux, servers to mobile, InstallShield X is the one
> installation-authoring solution that does it all. Learn more and
> evaluate today! http://www.installshield.com/Dev2Dev/0504
> _______________________________________________
> Super-tux-commit mailing list
> Sup...@li...
> https://lists.sourceforge.net/lists/listinfo/super-tux-commit

-- 
The most common given name in the world is Mohammad; the most common
family name in the world is Chang.  Can you imagine the enormous number
of people in the world named Mohammad Chang?
		-- Derek Wills

[Super-tux-commit] supertux TRANSLATORS,1.1,1.2

[Matze B. <mat...@us...>]

Update of /cvsroot/super-tux/supertux
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11896

Modified Files:
	TRANSLATORS 
Log Message:
format this file in a sane way and correct some information

Index: TRANSLATORS
===================================================================
RCS file: /cvsroot/super-tux/supertux/TRANSLATORS,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- TRANSLATORS	4 Jun 2004 14:04:37 -0000	1.1
+++ TRANSLATORS	4 Jun 2004 19:42:10 -0000	1.2
@@ -1,60 +1,51 @@
-
-- Translation info -
-http://super-tux.sf.net/
+                        - SuperTux Translation info -
 
 Last update: June 4, 2004
 
- == TRANSLATORS ==
 
-* Translation Hints *
+1. Notes for Translators
+~~~~~~~~~~~~~~~~~~~~~~~~
 
- If there isn't a good translation for some term (ie. fullscreen), you might consider
-to just keep it. It's better than making the user confused.
+* If there isn't a good translation for some term (ie. fullscreen), you might
+  consider to just keep it. It's better than making the user confused.
 
- In English, there is only one singular second person mode (You). If your language does
-have more than one - a personal and impersonal - remember that this is a game, so you
-should use the personal one. However, if it is possible to ommit it in your language,
-it might be a good idea.
+* In English, there is only one singular second person mode (You). If your
+  language does have more than one - a personal and impersonal - remember that
+  this is a game, so you should use the personal one. However, if it is
+  possible to ommit it in your language, it might be a good idea.
 
- Names like SuperTux, Tux, Penny and other game elements should not be translated. If you
-really think one of these to be a too strange word for your people, first inform us at
-our mailing list.
+* Names like SuperTux, Tux, Penny and other game elements should not be
+  translated. If you really think one of these to be a too strange word for
+  your people, first inform us at our mailing list.
 
- Translating lots of strings can be boring and time consuming, but, in my opinion, it
-worths when lookins at the results ;-)
+* Translating lots of strings can be boring and time consuming, but, in my
+  opinion, it worths when lookins at the results ;-)
 
-Note: If somewhere in the game, after translating a string, it doesn't look well (bad
-aligment, overlaps other text...), contact us.
+* If somewhere in the game, after translating a string, it doesn't look well
+  (bad aligment, overlaps other text...), contact us. We might be able to change
+  to code.
 
-* Programs to Aid Translation *
+* There are programs that help with translating: KBable and the gettext Emacs
+  plugin can give your productivity a huge boost.
 
- My personal favourite is KBabel (don't forget to fill the configuration regarding your
-country).
- I am also aware that (X)Emacs has also a plugin for this effect. I believe Qt also has a
-translation aid program called QTranslator.
+* Please read gettext documentation on how to start translating.
+   http://www.gnu.org/software/gettext/manual/html_chapter/gettext_5.html#SEC29
 
- If you are new to this, the translation file that you should use is the supertux.pot that
-is inside the po/ root folder. Rename it to your language (ie. Spanish - es.po) and then
-open it with any program.
- It is only a plain text file, so you can even use any text editor you want to translate it,
-but it may be wise to use a specific program for the purpose.
- After translating the file, add it to LINGUAS (ie. Spanish - es) and run 'make update-po'.
-Then a binary file will be created. In order to make SuperTux using it, you will have to
-install it ('make install').
+* After translating the file, add it to LINGUAS (ie. Spanish - es) and run
+  'make update-po'.
 
-Note: Currently, only the game itself is translatable. Data files, like levels,
-credits, story... are not yet translatable.
+* You currently have to install supertux to see the results of the translation.
 
+* Currently, only the game itself is translatable. Data files, like levels, 
+  credits, story... are not yet translatable (but that is planed for later).
 
- == DEVELOPERS ==
 
-* Translatable Strings *
 
- Output should not be translated, since their purpose is mainly for debugging.
- However, command description (ie. --help) should obviously be translated. Messages
-that give the user a solution for a problem, might be translatable, as well.
+2. DEVELOPERS
+~~~~~~~~~~~~~
 
- Parametars shouldn't also be translatable. It breaks scripting. Besides advanced users,
-the ones that will make use of this, usually don't like it.
+* Debugging output should not be translated. That is everything that goes to the
+  console except error messages and the usage text of the program.
+
+* Parametars shouldn't also be translatable.
 
-The SuperTux Team

[Super-tux-commit] supertux/src special.cpp,1.54,1.55

[Ricardo C. <rm...@us...>]

Update of /cvsroot/super-tux/supertux/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21461/src

Modified Files:
	special.cpp 
Log Message:
Fixed bullet position.

Index: special.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/special.cpp,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- special.cpp	31 May 2004 22:13:15 -0000	1.54
+++ special.cpp	4 Jun 2004 14:14:59 -0000	1.55
@@ -63,7 +63,7 @@
       physic.set_velocity_x(-BULLET_XM + xm);
     }
 
-  base.y = pos.y + base.height/2;
+  base.y = pos.y;
   physic.set_velocity_y(-BULLET_STARTING_YM);
   old_base = base;
   kind = kind_;

[Super-tux-commit] supertux TRANSLATORS,NONE,1.1

[Ricardo C. <rm...@us...>]

Update of /cvsroot/super-tux/supertux
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18442

Added Files:
	TRANSLATORS 
Log Message:
A file to aid translators.

It also has our policy regarding what strings should be translatable. Developers, please read it. If you disagree with something or want to add anything, send the comment to the mailing list, in order to be discussed by everyone.

--- NEW FILE: TRANSLATORS ---

- Translation info -
http://super-tux.sf.net/

Last update: June 4, 2004

 == TRANSLATORS ==

* Translation Hints *

 If there isn't a good translation for some term (ie. fullscreen), you might consider
to just keep it. It's better than making the user confused.

 In English, there is only one singular second person mode (You). If your language does
have more than one - a personal and impersonal - remember that this is a game, so you
should use the personal one. However, if it is possible to ommit it in your language,
it might be a good idea.

 Names like SuperTux, Tux, Penny and other game elements should not be translated. If you
really think one of these to be a too strange word for your people, first inform us at
our mailing list.

 Translating lots of strings can be boring and time consuming, but, in my opinion, it
worths when lookins at the results ;-)

Note: If somewhere in the game, after translating a string, it doesn't look well (bad
aligment, overlaps other text...), contact us.

* Programs to Aid Translation *

 My personal favourite is KBabel (don't forget to fill the configuration regarding your
country).
 I am also aware that (X)Emacs has also a plugin for this effect. I believe Qt also has a
translation aid program called QTranslator.

 If you are new to this, the translation file that you should use is the supertux.pot that
is inside the po/ root folder. Rename it to your language (ie. Spanish - es.po) and then
open it with any program.
 It is only a plain text file, so you can even use any text editor you want to translate it,
but it may be wise to use a specific program for the purpose.
 After translating the file, add it to LINGUAS (ie. Spanish - es) and run 'make update-po'.
Then a binary file will be created. In order to make SuperTux using it, you will have to
install it ('make install').

Note: Currently, only the game itself is translatable. Data files, like levels,
credits, story... are not yet translatable.


 == DEVELOPERS ==

* Translatable Strings *

 Output should not be translated, since their purpose is mainly for debugging.
 However, command description (ie. --help) should obviously be translated. Messages
that give the user a solution for a problem, might be translatable, as well.

 Parametars shouldn't also be translatable. It breaks scripting. Besides advanced users,
the ones that will make use of this, usually don't like it.

The SuperTux Team

[Super-tux-commit] supertux/src player.cpp,1.135,1.136 player.h,1.67,1.68 resources.cpp,1.36,1.37

[Ricardo C. <rm...@us...>]

Update of /cvsroot/super-tux/supertux/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17988/src

Modified Files:
	player.cpp player.h resources.cpp 
Log Message:
Now the growings animation looks pretty cool :)
You can tweak its speed in the GROWING_TIME define on player.h (in ms).

It's strange, but I have to pass 'false' for the use_alpha parameter in Surface. Else, it wouldn't use alpha... Something is definitively wrong.

Index: player.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -d -r1.135 -r1.136
--- player.cpp	1 Jun 2004 14:47:31 -0000	1.135
+++ player.cpp	4 Jun 2004 14:03:06 -0000	1.136
@@ -42,13 +42,15 @@
 // others stuff:
 #define AUTOSCROLL_DEAD_INTERVAL 300
 
+// growing animation
+Surface* growingtux_left[GROWING_FRAMES];
+Surface* growingtux_right[GROWING_FRAMES];
+
 Surface* tux_life;
 
 Sprite* smalltux_gameover;
 Sprite* smalltux_star;
 Sprite* largetux_star;
-Sprite* growingtux_left;
-Sprite* growingtux_right;
 
 PlayerSprite smalltux;
 PlayerSprite largetux;
@@ -116,7 +118,7 @@
 
   frame_main = 0;
   frame_ = 0;
-  
+
   player_input_init(&input);
 
   invincible_timer.init(true);
@@ -633,7 +635,7 @@
   base.y -= 32;
 
   if(animate)
-    growing_timer.start((int)((growingtux_left->get_frames() / growingtux_left->get_fps()) * 1000));
+    growing_timer.start(GROWING_TIME);
 
   old_base = previous_base = base;
 }
@@ -701,9 +703,9 @@
           if(growing_timer.check())
             {
               if (dir == RIGHT)
-                growingtux_right->draw(context, pos, layer);
+                context.draw_surface(growingtux_right[(growing_timer.get_gone() * GROWING_FRAMES) / GROWING_TIME], pos, layer);
               else 
-                growingtux_left->draw(context, pos, layer);
+                context.draw_surface(growingtux_left[(growing_timer.get_gone() * GROWING_FRAMES) / GROWING_TIME], pos, layer);
             }
           else if (duck && size != SMALL)
             {

Index: player.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/player.h,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- player.h	31 May 2004 13:43:30 -0000	1.67
+++ player.h	4 Jun 2004 14:03:06 -0000	1.68
@@ -85,8 +85,11 @@
 extern Sprite* smalltux_gameover;
 extern Sprite* smalltux_star;
 extern Sprite* largetux_star;
-extern Sprite* growingtux_left;
-extern Sprite* growingtux_right;
+
+#define GROWING_TIME 1000
+#define GROWING_FRAMES 7
+extern Surface* growingtux_left[GROWING_FRAMES];
+extern Surface* growingtux_right[GROWING_FRAMES];
 
 struct PlayerSprite
 {

Index: resources.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/resources.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- resources.cpp	31 May 2004 22:13:15 -0000	1.36
+++ resources.cpp	4 Jun 2004 14:03:06 -0000	1.37
@@ -56,8 +56,15 @@
   largetux_star = sprite_manager->load("largetux-star");
   smalltux_gameover = sprite_manager->load("smalltux-gameover");
 
-  growingtux_left = sprite_manager->load("tux-grow-left");
-  growingtux_right = sprite_manager->load("tux-grow-right");
+  char img_name[1024];
+  for (int i = 0; i < GROWING_FRAMES; i++)
+  {
+    sprintf(img_name, "%s/images/shared/tux-grow-left-%i.png", datadir.c_str(), i+1);
+    growingtux_left[i] = new Surface(img_name, false);
+
+    sprintf(img_name, "%s/images/shared/tux-grow-right-%i.png", datadir.c_str(), i+1);
+    growingtux_right[i] = new Surface(img_name, false);
+  }
 
   smalltux.stand_left  = sprite_manager->load("smalltux-stand-left");
   smalltux.stand_right = sprite_manager->load("smalltux-stand-right");
@@ -247,6 +254,12 @@
 
   delete tux_life;
 
+  for (int i = 0; i < GROWING_FRAMES; i++)
+  {
+    delete growingtux_left[i];
+    delete growingtux_right[i];
+  }
+
   for (i = 0; i < NUM_SOUNDS; i++)
     free_chunk(sounds[i]);
 

[Super-tux-commit] supertux TODO,1.61,1.62

[Ryan F. <sik...@us...>]

Update of /cvsroot/super-tux/supertux
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32113

Modified Files:
	TODO 
Log Message:
- updated TODO

Index: TODO
===================================================================
RCS file: /cvsroot/super-tux/supertux/TODO,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- TODO	2 Jun 2004 23:01:46 -0000	1.61
+++ TODO	3 Jun 2004 23:26:41 -0000	1.62
@@ -25,7 +25,12 @@
 
 [H] Make sure there are no invalid tile numbers in the level files
      - Tile 6 occurs in world1/level5.stl as well as other levels
+[H] Adding objects should be done by adding them into a queue and then
+    physically added at the end of Sector::action()
+     - may cause crashes otherwise (due to iterators)
+     - see world1/level7.stl, killing the bombs
 [H] Worldmap needs to allow multiple maps
+     - or just one big map with multiple worlds?
 [H] Change resolution to 800x600
      - Levels need to be updated to resolution
          (half of the levels have been already updated)

[Super-tux-commit] supertux/src gameloop.cpp,1.147,1.148

[Ricardo C. <rm...@us...>]

Update of /cvsroot/super-tux/supertux/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv810/src

Modified Files:
	gameloop.cpp 
Log Message:
Fixed lives positon.

Index: gameloop.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/gameloop.cpp,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -d -r1.147 -r1.148
--- gameloop.cpp	3 Jun 2004 22:09:31 -0000	1.147
+++ gameloop.cpp	3 Jun 2004 22:17:57 -0000	1.148
@@ -726,9 +726,6 @@
   context.draw_text(gold_text, str,
       Vector(screen->w - gold_text->get_text_width(" 99"), 0),LAYER_FOREGROUND1);
 
-  context.draw_text(white_text, _("LIVES"),
-      Vector(screen->w - white_text->get_text_width(_("LIVES"))-white_text->get_text_width(str), 20),
-      LAYER_FOREGROUND1);
   if (player_status.lives >= 5)
     {
       sprintf(str, "%dx", player_status.lives);
@@ -745,6 +742,10 @@
             LAYER_FOREGROUND1);
     }
 
+  context.draw_text(white_text, _("LIVES"),
+      Vector(screen->w - white_text->get_text_width(_("LIVES")) - white_text->get_text_width("   99"), 20),
+      LAYER_FOREGROUND1);
+
   if(show_fps)
     {
       sprintf(str, "%2.1f", fps_fps);

[Super-tux-commit] supertux/po de.po,1.2,1.3 es.po,1.1,1.2 pt.po,1.4,1.5 supertux.pot,1.2,1.3

[Ricardo C. <rm...@us...>]

Update of /cvsroot/super-tux/supertux/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30251/po

Modified Files:
	de.po es.po pt.po supertux.pot 
Log Message:
Updated POs.

Index: pt.po
===================================================================
RCS file: /cvsroot/super-tux/supertux/po/pt.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- pt.po	3 Jun 2004 17:42:10 -0000	1.4
+++ pt.po	3 Jun 2004 22:10:32 -0000	1.5
@@ -1,9 +1,4 @@
 # translation of pt.po to 
-# translation of pt.po to
-# translation of pt.po to
-# translation of pt.po to
-# translation of pt.po to
-# translation of pt.po to
 # This file is distributed under the same license as the PACKAGE package.
 # Copyright (C) YEAR SuperTux Development Team.
 # Ricardo Cruz <ri...@ae...>, 2004.
@@ -12,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: pt\n"
 "Report-Msgid-Bugs-To: sup...@li...\n"
-"POT-Creation-Date: 2004-06-03 18:39+0100\n"
-"PO-Revision-Date: 2004-06-03 18:40+0100\n"
+"POT-Creation-Date: 2004-06-03 22:58+0100\n"
+"PO-Revision-Date: 2004-06-03 23:09+0100\n"
 "Last-Translator: Ricardo Cruz <ri...@ae...>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -49,8 +44,8 @@
 msgid "COINS"
 msgstr "MOEDAS"
 
-#: src/gameloop.cpp:729 src/gameloop.cpp:730 src/worldmap.cpp:859
-#: src/worldmap.cpp:860
+#: src/gameloop.cpp:729 src/gameloop.cpp:730 src/worldmap.cpp:875
+#: src/worldmap.cpp:876
 msgid "LIVES"
 msgstr "VIDAS"
 
@@ -158,6 +153,10 @@
 msgid "Quit"
 msgstr "Sair"
 
+#: src/setup.cpp:398
+msgid "OpenGL    "
+msgstr "OpenGL    "
+
 #: src/setup.cpp:400
 msgid "OpenGL (not supported)"
 msgstr "OpenGL (não suportado)"
@@ -176,15 +175,15 @@
 
 #: src/setup.cpp:413
 msgid "Show FPS  "
-msgstr "Mostrar FPS "
+msgstr "Mostrar FPS"
 
 #: src/setup.cpp:414
-msgid "Keyboard Setup"
-msgstr "Configuração do Teclado"
+msgid "Setup Keys"
+msgstr "Configurar Teclas"
 
-#: src/setup.cpp:417 src/setup.cpp:436
-msgid "Joystick Setup"
-msgstr "Configuração do Joystick"
+#: src/setup.cpp:417
+msgid "Setup Joystick"
+msgstr "Configurar Joystick"
 
 #: src/setup.cpp:420 src/setup.cpp:432 src/setup.cpp:445 src/setup.cpp:456
 #: src/title.cpp:104 src/title.cpp:141
@@ -192,8 +191,8 @@
 msgstr "Recuar"
 
 #: src/setup.cpp:422
-msgid "Key Setup"
-msgstr "Configurar Teclas"
+msgid "Keyboard Setup"
+msgstr "Configuração do Teclado"
 
 #: src/setup.cpp:424
 msgid "Left move"
@@ -219,6 +218,10 @@
 msgid "Power/Run"
 msgstr "Poder/Correr"
 
+#: src/setup.cpp:436
+msgid "Joystick Setup"
+msgstr "Configuração do Joystick"
+
 #: src/setup.cpp:440
 msgid "A button"
 msgstr "Butão A"
@@ -251,6 +254,89 @@
 msgid "Enter your name:"
 msgstr "Insira o seu nome:"
 
+#: src/setup.cpp:1036
+msgid "  SuperTux  "
+msgstr "  SuperTux  "
+
+#: src/setup.cpp:1036
+msgid ""
+"\n"
+"  Please see the file \"README.txt\" for more details.\n"
+msgstr ""
+"\n"
+"  Dá uma olhadela no ficheiro  \"README.txt\" para mais detalhes.\n"
+
+#: src/setup.cpp:1038
+#, c-format
+msgid ""
+"Usage: %s [OPTIONS] FILENAME\n"
+"\n"
+msgstr ""
+"Uso: %s [OPÇÕES] NOME_DO_FICHEIRO\n"
+"\n"
+
+#: src/setup.cpp:1039
+msgid ""
+"Display Options:\n"
+"  --fullscreen        Run in fullscreen mode.\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"
+"                      disable sound for this session of the game.\n"
+"  --disable-music     Like above, but this will disable music.\n"
+"\n"
+"Misc Options:\n"
+"  -j, --joystick NUM  Use joystick NUM (default: 0)\n"
+"  --joymap XAXIS:YAXIS:A:B:START\n"
+"                      Define how joystick buttons and axis should be mapped\n"
+"  --leveleditor       Opens the leveleditor in a file. (Only works when a "
+"file is provided.)\n"
+"  -d, --datadir DIR   Load Game data from DIR (default: automatic)\n"
+"  --debug-mode        Enables the debug-mode, which is useful for "
+"developers.\n"
+"  --help              Display a help message summarizing command-line\n"
+"                      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"
+msgstr ""
+"Opções Gráficas:\n"
+"  --fullscreen        Ocupar todo o ecrã.\n"
+"  --opengl            Caso tenha sido compilado com suporte para OpenGL, isto irá fazer\n"
+"                      com que o SuperTux o use.\n"
+"  --sdl               Usar o SDL como renderer gráfico (software)\n"
+"\n"
+"Opções de Som:\n"
+"  --disable-sound     Se tiver sido compilado com suporte ao som, isto irá\n"
+"                      o desactivar.\n"
+"  --disable-music     Tal como o anterior, mas desactiva a música.\n"
+"\n"
+"Miscelâneos:\n"
+"  -j, --joystick NUM  Usar o joystick NUM (omissão: 0)\n"
+"  --joymap XAXIS:YAXIS:A:B:START\n"
+"                      Define como os botões e eixos devem ser mapeados\n"
+"  --leveleditor       Abre o editor de níveis num dado ficheiro (e apenas quando um é fornecido.)\n"
+"  -d, --datadir DIR   Carregar os dados do jogo do DIR (omissão: automático)\n"
+"  --debug-mode        Activa o modo de depuração, que é útil para programadores.\n"
+"  --help              Mostra um texto de ajuda com os sumários da linha de comando\n"
+"                      opções, licença e contolos do jogo.\n"
+"  --usage             Mostra uma breve listagem das opções via a linha de comandos.\n"
+"  --version           Mostra a versão do SuperTux que está a correr.\n"
+"\n"
+
+#: src/setup.cpp:1095
+#, c-format
+msgid ""
+"Usage: %s [--fullscreen] [--opengl] [--disable-sound] [--disable-music] [--"
+"debug-mode] | [--usage | --help | --version] [--leveleditor] FILENAME\n"
+msgstr ""
+"Uso: %s [--fullscreen] [--opengl] [--disable-sound] [--disable-music] [--"
+"debug-mode] | [--usage | --help | --version] [--leveleditor] NOME_DO_FICHEIRO\n"
+
 #: src/title.cpp:276
 msgid " SuperTux "
 msgstr " SuperTux "
@@ -279,3 +365,4 @@
 #: src/worldmap.cpp:724
 msgid "GAMEOVER"
 msgstr "FIM DO JOGO"
+

Index: es.po
===================================================================
RCS file: /cvsroot/super-tux/supertux/po/es.po,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- es.po	3 Jun 2004 20:48:36 -0000	1.1
+++ es.po	3 Jun 2004 22:10:32 -0000	1.2
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: sup...@li...\n"
-"POT-Creation-Date: 2004-06-03 18:39+0100\n"
+"POT-Creation-Date: 2004-06-03 22:58+0100\n"
 "PO-Revision-Date: 2004-06-03 22:29+0200\n"
 "Last-Translator: Javier Beaumont <de...@zi...>\n"
 "Language-Team: \n"
@@ -45,8 +45,8 @@
 msgid "COINS"
 msgstr "MONEDAS"
 
-#: src/gameloop.cpp:729 src/gameloop.cpp:730 src/worldmap.cpp:859
-#: src/worldmap.cpp:860
+#: src/gameloop.cpp:729 src/gameloop.cpp:730 src/worldmap.cpp:875
+#: src/worldmap.cpp:876
 msgid "LIVES"
 msgstr "VIDAS"
 
@@ -154,6 +154,10 @@
 msgid "Quit"
 msgstr "Salir"
 
+#: src/setup.cpp:398
+msgid "OpenGL    "
+msgstr ""
+
 #: src/setup.cpp:400
 msgid "OpenGL (not supported)"
 msgstr "OpenGL (no soportado)"
@@ -175,12 +179,12 @@
 msgstr "Mostrar FPS  "
 
 #: src/setup.cpp:414
-msgid "Keyboard Setup"
-msgstr "Configuración del teclado"
+msgid "Setup Keys"
+msgstr ""
 
-#: src/setup.cpp:417 src/setup.cpp:436
-msgid "Joystick Setup"
-msgstr "Configuración del Joystick"
+#: src/setup.cpp:417
+msgid "Setup Joystick"
+msgstr ""
 
 #: src/setup.cpp:420 src/setup.cpp:432 src/setup.cpp:445 src/setup.cpp:456
 #: src/title.cpp:104 src/title.cpp:141
@@ -188,8 +192,8 @@
 msgstr "Volver"
 
 #: src/setup.cpp:422
-msgid "Key Setup"
-msgstr "Configurar teclas"
+msgid "Keyboard Setup"
+msgstr "Configuración del teclado"
 
 #: src/setup.cpp:424
 msgid "Left move"
@@ -215,6 +219,10 @@
 msgid "Power/Run"
 msgstr "Poder/Correr"
 
+#: src/setup.cpp:436
+msgid "Joystick Setup"
+msgstr "Configuración del Joystick"
+
 #: src/setup.cpp:440
 msgid "A button"
 msgstr "Botón A"
@@ -247,6 +255,61 @@
 msgid "Enter your name:"
 msgstr "Introduce tu nombre:"
 
+#: src/setup.cpp:1036
+#, fuzzy
+msgid "  SuperTux  "
+msgstr " SuperTux "
+
+#: src/setup.cpp:1036
+msgid ""
+"\n"
+"  Please see the file \"README.txt\" for more details.\n"
+msgstr ""
+
+#: src/setup.cpp:1038
+#, c-format
+msgid ""
+"Usage: %s [OPTIONS] FILENAME\n"
+"\n"
+msgstr ""
+
+#: src/setup.cpp:1039
+msgid ""
+"Display Options:\n"
+"  --fullscreen        Run in fullscreen mode.\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"
+"                      disable sound for this session of the game.\n"
+"  --disable-music     Like above, but this will disable music.\n"
+"\n"
+"Misc Options:\n"
+"  -j, --joystick NUM  Use joystick NUM (default: 0)\n"
+"  --joymap XAXIS:YAXIS:A:B:START\n"
+"                      Define how joystick buttons and axis should be mapped\n"
+"  --leveleditor       Opens the leveleditor in a file. (Only works when a "
+"file is provided.)\n"
+"  -d, --datadir DIR   Load Game data from DIR (default: automatic)\n"
+"  --debug-mode        Enables the debug-mode, which is useful for "
+"developers.\n"
+"  --help              Display a help message summarizing command-line\n"
+"                      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"
+msgstr ""
+
+#: src/setup.cpp:1095
+#, c-format
+msgid ""
+"Usage: %s [--fullscreen] [--opengl] [--disable-sound] [--disable-music] [--"
+"debug-mode] | [--usage | --help | --version] [--leveleditor] FILENAME\n"
+msgstr ""
+
 #: src/title.cpp:276
 msgid " SuperTux "
 msgstr " SuperTux "
@@ -262,7 +325,8 @@
 msgstr ""
 "\n"
 "Copyright (c) 2003 El equipo de SuperTux\n"
-"Este juego viene sin ABSOLUTAMENTE NINGUNA GARANTIA. Esto es software libre, y tu\n"
+"Este juego viene sin ABSOLUTAMENTE NINGUNA GARANTIA. Esto es software libre, "
+"y tu\n"
 "tienes permiso para redistribuirlo bajo ciertas condiciones; mira el archivo "
 "COPYING\n"
 "para detalles.\n"
@@ -276,3 +340,5 @@
 msgid "GAMEOVER"
 msgstr "FIN DEL JUEGO"
 
+#~ msgid "Key Setup"
+#~ msgstr "Configurar teclas"

Index: supertux.pot
===================================================================
RCS file: /cvsroot/super-tux/supertux/po/supertux.pot,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- supertux.pot	3 Jun 2004 17:42:10 -0000	1.2
+++ supertux.pot	3 Jun 2004 22:10:32 -0000	1.3
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: sup...@li...\n"
-"POT-Creation-Date: 2004-06-03 18:39+0100\n"
+"POT-Creation-Date: 2004-06-03 22:58+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -44,8 +44,8 @@
 msgid "COINS"
 msgstr ""
 
-#: src/gameloop.cpp:729 src/gameloop.cpp:730 src/worldmap.cpp:859
-#: src/worldmap.cpp:860
+#: src/gameloop.cpp:729 src/gameloop.cpp:730 src/worldmap.cpp:875
+#: src/worldmap.cpp:876
 msgid "LIVES"
 msgstr ""
 
@@ -153,6 +153,10 @@
 msgid "Quit"
 msgstr ""
 
+#: src/setup.cpp:398
+msgid "OpenGL    "
+msgstr ""
+
 #: src/setup.cpp:400
 msgid "OpenGL (not supported)"
 msgstr ""
@@ -174,11 +178,11 @@
 msgstr ""
 
 #: src/setup.cpp:414
-msgid "Keyboard Setup"
+msgid "Setup Keys"
 msgstr ""
 
-#: src/setup.cpp:417 src/setup.cpp:436
-msgid "Joystick Setup"
+#: src/setup.cpp:417
+msgid "Setup Joystick"
 msgstr ""
 
 #: src/setup.cpp:420 src/setup.cpp:432 src/setup.cpp:445 src/setup.cpp:456
@@ -187,7 +191,7 @@
 msgstr ""
 
 #: src/setup.cpp:422
-msgid "Key Setup"
+msgid "Keyboard Setup"
 msgstr ""
 
 #: src/setup.cpp:424
@@ -214,6 +218,10 @@
 msgid "Power/Run"
 msgstr ""
 
+#: src/setup.cpp:436
+msgid "Joystick Setup"
+msgstr ""
+
 #: src/setup.cpp:440
 msgid "A button"
 msgstr ""
@@ -246,6 +254,60 @@
 msgid "Enter your name:"
 msgstr ""
 
+#: src/setup.cpp:1036
+msgid "  SuperTux  "
+msgstr ""
+
+#: src/setup.cpp:1036
+msgid ""
+"\n"
+"  Please see the file \"README.txt\" for more details.\n"
+msgstr ""
+
+#: src/setup.cpp:1038
+#, c-format
+msgid ""
+"Usage: %s [OPTIONS] FILENAME\n"
+"\n"
+msgstr ""
+
+#: src/setup.cpp:1039
+msgid ""
+"Display Options:\n"
+"  --fullscreen        Run in fullscreen mode.\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"
+"                      disable sound for this session of the game.\n"
+"  --disable-music     Like above, but this will disable music.\n"
+"\n"
+"Misc Options:\n"
+"  -j, --joystick NUM  Use joystick NUM (default: 0)\n"
+"  --joymap XAXIS:YAXIS:A:B:START\n"
+"                      Define how joystick buttons and axis should be mapped\n"
+"  --leveleditor       Opens the leveleditor in a file. (Only works when a "
+"file is provided.)\n"
+"  -d, --datadir DIR   Load Game data from DIR (default: automatic)\n"
+"  --debug-mode        Enables the debug-mode, which is useful for "
+"developers.\n"
+"  --help              Display a help message summarizing command-line\n"
+"                      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"
+msgstr ""
+
+#: src/setup.cpp:1095
+#, c-format
+msgid ""
+"Usage: %s [--fullscreen] [--opengl] [--disable-sound] [--disable-music] [--"
+"debug-mode] | [--usage | --help | --version] [--leveleditor] FILENAME\n"
+msgstr ""
+
 #: src/title.cpp:276
 msgid " SuperTux "
 msgstr ""

Index: de.po
===================================================================
RCS file: /cvsroot/super-tux/supertux/po/de.po,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- de.po	3 Jun 2004 17:42:10 -0000	1.2
+++ de.po	3 Jun 2004 22:10:32 -0000	1.3
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: SuperTux 0.1.1\n"
 "Report-Msgid-Bugs-To: sup...@li...\n"
-"POT-Creation-Date: 2004-06-03 18:39+0100\n"
+"POT-Creation-Date: 2004-06-03 22:58+0100\n"
 "PO-Revision-Date: 2004-06-03 00:29+0200\n"
 "Last-Translator:  <ma...@br...>\n"
 "Language-Team: German <de...@li...>\n"
@@ -45,8 +45,8 @@
 msgid "COINS"
 msgstr ""
 
-#: src/gameloop.cpp:729 src/gameloop.cpp:730 src/worldmap.cpp:859
-#: src/worldmap.cpp:860
+#: src/gameloop.cpp:729 src/gameloop.cpp:730 src/worldmap.cpp:875
+#: src/worldmap.cpp:876
 msgid "LIVES"
 msgstr ""
 
@@ -154,6 +154,10 @@
 msgid "Quit"
 msgstr "Beenden"
 
+#: src/setup.cpp:398
+msgid "OpenGL    "
+msgstr ""
+
 #: src/setup.cpp:400
 msgid "OpenGL (not supported)"
 msgstr ""
@@ -175,11 +179,11 @@
 msgstr ""
 
 #: src/setup.cpp:414
-msgid "Keyboard Setup"
+msgid "Setup Keys"
 msgstr ""
 
-#: src/setup.cpp:417 src/setup.cpp:436
-msgid "Joystick Setup"
+#: src/setup.cpp:417
+msgid "Setup Joystick"
 msgstr ""
 
 #: src/setup.cpp:420 src/setup.cpp:432 src/setup.cpp:445 src/setup.cpp:456
@@ -188,7 +192,7 @@
 msgstr ""
 
 #: src/setup.cpp:422
-msgid "Key Setup"
+msgid "Keyboard Setup"
 msgstr ""
 
 #: src/setup.cpp:424
@@ -215,6 +219,10 @@
 msgid "Power/Run"
 msgstr ""
 
+#: src/setup.cpp:436
+msgid "Joystick Setup"
+msgstr ""
+
 #: src/setup.cpp:440
 msgid "A button"
 msgstr ""
@@ -250,6 +258,60 @@
 msgid "Enter your name:"
 msgstr ""
 
+#: src/setup.cpp:1036
+msgid "  SuperTux  "
+msgstr ""
+
+#: src/setup.cpp:1036
+msgid ""
+"\n"
+"  Please see the file \"README.txt\" for more details.\n"
+msgstr ""
+
+#: src/setup.cpp:1038
+#, c-format
+msgid ""
+"Usage: %s [OPTIONS] FILENAME\n"
+"\n"
+msgstr ""
+
+#: src/setup.cpp:1039
+msgid ""
+"Display Options:\n"
+"  --fullscreen        Run in fullscreen mode.\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"
+"                      disable sound for this session of the game.\n"
+"  --disable-music     Like above, but this will disable music.\n"
+"\n"
+"Misc Options:\n"
+"  -j, --joystick NUM  Use joystick NUM (default: 0)\n"
+"  --joymap XAXIS:YAXIS:A:B:START\n"
+"                      Define how joystick buttons and axis should be mapped\n"
+"  --leveleditor       Opens the leveleditor in a file. (Only works when a "
+"file is provided.)\n"
+"  -d, --datadir DIR   Load Game data from DIR (default: automatic)\n"
+"  --debug-mode        Enables the debug-mode, which is useful for "
+"developers.\n"
+"  --help              Display a help message summarizing command-line\n"
+"                      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"
+msgstr ""
+
+#: src/setup.cpp:1095
+#, c-format
+msgid ""
+"Usage: %s [--fullscreen] [--opengl] [--disable-sound] [--disable-music] [--"
+"debug-mode] | [--usage | --help | --version] [--leveleditor] FILENAME\n"
+msgstr ""
+
 #: src/title.cpp:276
 msgid " SuperTux "
 msgstr ""

[Super-tux-commit] supertux/src gameloop.cpp,1.146,1.147 setup.cpp,1.95,1.96 worldmap.cpp,1.83,1.84

[Ricardo C. <rm...@us...>]

Update of /cvsroot/super-tux/supertux/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29660/src

Modified Files:
	gameloop.cpp setup.cpp worldmap.cpp 
Log Message:
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.

Index: worldmap.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/worldmap.cpp,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -d -r1.83 -r1.84
--- worldmap.cpp	3 Jun 2004 17:49:54 -0000	1.83
+++ worldmap.cpp	3 Jun 2004 22:09:31 -0000	1.84
@@ -856,9 +856,6 @@
   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 @@
             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 @@
 
               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;
             }

Index: gameloop.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/gameloop.cpp,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -d -r1.146 -r1.147
--- gameloop.cpp	3 Jun 2004 17:49:54 -0000	1.146
+++ gameloop.cpp	3 Jun 2004 22:09:31 -0000	1.147
@@ -698,7 +698,7 @@
 {
   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);
 

Index: setup.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/setup.cpp,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -d -r1.95 -r1.96
--- setup.cpp	3 Jun 2004 17:41:22 -0000	1.95
+++ setup.cpp	3 Jun 2004 22:09:31 -0000	1.96
@@ -395,7 +395,7 @@
   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 @@
       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 @@
         }
       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 @@
                "                      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 @@
 
   /* 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);
 
 

[Super-tux-commit] supertux/po es.po,NONE,1.1 LINGUAS,1.4,1.5

[Ryan F. <sik...@us...>]

Update of /cvsroot/super-tux/supertux/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5319

Modified Files:
	LINGUAS 
Added Files:
	es.po 
Log Message:
- added spanish translation

--- NEW FILE: es.po ---
# translation of es.po to 
# translation of supertux.po to 
# This file is distributed under the same license as the PACKAGE package.
# Copyright (C) YEAR SuperTux Development Team, 2004.
# Javier Beaumont <de...@zi...>, 2004.
#
msgid ""
msgstr ""
"Project-Id-Version: es\n"
"Report-Msgid-Bugs-To: sup...@li...\n"
"POT-Creation-Date: 2004-06-03 18:39+0100\n"
"PO-Revision-Date: 2004-06-03 22:29+0200\n"
"Last-Translator: Javier Beaumont <de...@zi...>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.3.1\n"

#: src/gameloop.cpp:163
msgid "by "
msgstr "por "

#: src/gameloop.cpp:523
msgid "PAUSE - Press 'P' To Play"
msgstr "PAUSA - Pulsa 'P' para continuar"

#: src/gameloop.cpp:702 src/worldmap.cpp:850
msgid "SCORE"
msgstr "PUNTOS"

#: src/gameloop.cpp:707
msgid "Press ESC To Return"
msgstr "Pulsa ESC para sair"

#: src/gameloop.cpp:712
msgid "TIME's UP"
msgstr "PASADO DE TIEMPO"

#: src/gameloop.cpp:716
msgid "TIME"
msgstr "TIEMPO"

#: src/gameloop.cpp:723 src/gameloop.cpp:724 src/worldmap.cpp:854
msgid "COINS"
msgstr "MONEDAS"

#: src/gameloop.cpp:729 src/gameloop.cpp:730 src/worldmap.cpp:859
#: src/worldmap.cpp:860
msgid "LIVES"
msgstr "VIDAS"

#: src/gameloop.cpp:767
msgid "Result:"
msgstr "Resultado:"

#: src/gameloop.cpp:770 src/worldmap.cpp:727
#, c-format
msgid "SCORE: %d"
msgstr "PUNTOS: %d"

#: src/gameloop.cpp:773 src/worldmap.cpp:731
#, c-format
msgid "COINS: %d"
msgstr "MONEDAS: %d"

#: src/gameloop.cpp:802
#, c-format
msgid "Slot %d - Savegame"
msgstr "Slot %d - Juego grabado"

#: src/gameloop.cpp:805
#, c-format
msgid "Slot %d - Free"
msgstr "Slot %d - Libre"

#: src/menu.cpp:76
msgid "Yes"
msgstr "Si"

#: src/menu.cpp:77
msgid "No"
msgstr "No"

#: src/menu.cpp:256
msgid "Up cursor"
msgstr "Arriba"

#: src/menu.cpp:259
msgid "Down cursor"
msgstr "Abajo"

#: src/menu.cpp:262
msgid "Left cursor"
msgstr "Izquierda"

#: src/menu.cpp:265
msgid "Right cursor"
msgstr "Derecha"

#: src/menu.cpp:268
msgid "Return"
msgstr "Entrar"

#: src/menu.cpp:271
msgid "Space"
msgstr "Espácio"

#: src/menu.cpp:274
msgid "Right Shift"
msgstr "Shift direcho"

#: src/menu.cpp:277
msgid "Left Shift"
msgstr "Shift izquierdo"

#: src/menu.cpp:280
msgid "Right Control"
msgstr "Control derecho"

#: src/menu.cpp:283
msgid "Left Control"
msgstr "Control izquierdo"

#: src/menu.cpp:286
msgid "Right Alt"
msgstr "Alt derecho"

#: src/menu.cpp:289
msgid "Left Alt"
msgstr "Alt izquierdo"

#: src/setup.cpp:388 src/setup.cpp:448
msgid "Start Game"
msgstr "Comenzar el juego"

#: src/setup.cpp:389 src/title.cpp:91
msgid "Contrib Levels"
msgstr "Niveles de contribuciones"

#: src/setup.cpp:390 src/setup.cpp:395 src/setup.cpp:471 src/setup.cpp:478
msgid "Options"
msgstr "Opciones"

#: src/setup.cpp:391
msgid "Level Editor"
msgstr "Editor de niveles"

#: src/setup.cpp:392
msgid "Credits"
msgstr "Creditos"

#: src/setup.cpp:393
msgid "Quit"
msgstr "Salir"

#: src/setup.cpp:400
msgid "OpenGL (not supported)"
msgstr "OpenGL (no soportado)"

#: src/setup.cpp:402
msgid "Fullscreen"
msgstr "Pantalla completa"

#: src/setup.cpp:405 src/setup.cpp:410
msgid "Sound     "
msgstr "Sonido     "

#: src/setup.cpp:406 src/setup.cpp:411
msgid "Music     "
msgstr "Música     "

#: src/setup.cpp:413
msgid "Show FPS  "
msgstr "Mostrar FPS  "

#: src/setup.cpp:414
msgid "Keyboard Setup"
msgstr "Configuración del teclado"

#: src/setup.cpp:417 src/setup.cpp:436
msgid "Joystick Setup"
msgstr "Configuración del Joystick"

#: src/setup.cpp:420 src/setup.cpp:432 src/setup.cpp:445 src/setup.cpp:456
#: src/title.cpp:104 src/title.cpp:141
msgid "Back"
msgstr "Volver"

#: src/setup.cpp:422
msgid "Key Setup"
msgstr "Configurar teclas"

#: src/setup.cpp:424
msgid "Left move"
msgstr "Para la izquierda"

#: src/setup.cpp:425
msgid "Right move"
msgstr "Para la derecha"

#: src/setup.cpp:426
msgid "Jump"
msgstr "Saltar"

#: src/setup.cpp:427
msgid "Duck"
msgstr "Agacharse"

#: src/setup.cpp:428
msgid "Activate"
msgstr "Activado"

#: src/setup.cpp:430
msgid "Power/Run"
msgstr "Poder/Correr"

#: src/setup.cpp:440
msgid "A button"
msgstr "Botón A"

#: src/setup.cpp:441
msgid "B button"
msgstr "Botón B"

#: src/setup.cpp:458
msgid "Save Game"
msgstr "Salvar el juego"

#: src/setup.cpp:468 src/setup.cpp:475
msgid "Pause"
msgstr "Pausa"

#: src/setup.cpp:470 src/setup.cpp:477
msgid "Continue"
msgstr "Continuar"

#: src/setup.cpp:473
msgid "Abort Level"
msgstr "Abortar el nivel"

#: src/setup.cpp:480
msgid "Quit Game"
msgstr "Salir del juego"

#: src/setup.cpp:482
msgid "Enter your name:"
msgstr "Introduce tu nombre:"

#: src/title.cpp:276
msgid " SuperTux "
msgstr " SuperTux "

#: src/title.cpp:276
msgid ""
"\n"
"Copyright (c) 2003 SuperTux Devel Team\n"
"This game comes with ABSOLUTELY NO WARRANTY. This is free software, and you\n"
"are welcome to redistribute it under certain conditions; see the file "
"COPYING\n"
"for details.\n"
msgstr ""
"\n"
"Copyright (c) 2003 El equipo de SuperTux\n"
"Este juego viene sin ABSOLUTAMENTE NINGUNA GARANTIA. Esto es software libre, y tu\n"
"tienes permiso para redistribuirlo bajo ciertas condiciones; mira el archivo "
"COPYING\n"
"para detalles.\n"

#: src/title.cpp:327
#, c-format
msgid "Are you sure you want to delete slot %d?"
msgstr "¿Estás seguro de que quieres borrar el slot %d?"

#: src/worldmap.cpp:724
msgid "GAMEOVER"
msgstr "FIN DEL JUEGO"


Index: LINGUAS
===================================================================
RCS file: /cvsroot/super-tux/supertux/po/LINGUAS,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- LINGUAS	3 Jun 2004 11:31:51 -0000	1.4
+++ LINGUAS	3 Jun 2004 20:48:36 -0000	1.5
@@ -1,3 +1,4 @@
 # Set of available languages.
 de
+es
 pt

[Super-tux-commit] supertux/src gameloop.cpp,1.145,1.146 worldmap.cpp,1.82,1.83

[Ricardo C. <rm...@us...>]

Update of /cvsroot/super-tux/supertux/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27342/src

Modified Files:
	gameloop.cpp worldmap.cpp 
Log Message:
Fixed a couple of evil spaces.

Index: worldmap.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/worldmap.cpp,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -d -r1.82 -r1.83
--- worldmap.cpp	3 Jun 2004 17:41:22 -0000	1.82
+++ worldmap.cpp	3 Jun 2004 17:49:54 -0000	1.83
@@ -845,7 +845,7 @@
 WorldMap::draw_status(DrawingContext& context)
 {
   char str[80];
-  sprintf(str, "%d", player_status.score);
+  sprintf(str, " %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);

Index: gameloop.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/gameloop.cpp,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -d -r1.145 -r1.146
--- gameloop.cpp	3 Jun 2004 17:41:22 -0000	1.145
+++ gameloop.cpp	3 Jun 2004 17:49:54 -0000	1.146
@@ -712,22 +712,22 @@
     context.draw_text_center(white_text, _("TIME's UP"), Vector(0, 0),
         LAYER_FOREGROUND1);
   } else if (time_left.get_left() > TIME_WARNING || (global_frame_counter % 10) < 5) {
-    sprintf(str, "%d", time_left.get_left() / 1000 );
+    sprintf(str, " %d", time_left.get_left() / 1000 );
     context.draw_text_center(white_text, _("TIME"),
         Vector(0, 0), LAYER_FOREGROUND1);
     context.draw_text_center(gold_text, str,
         Vector(4*16, 0), LAYER_FOREGROUND1);
   }
 
-  sprintf(str, "%d", player_status.distros);
+  sprintf(str, " %d", player_status.distros);
   context.draw_text(white_text, _("COINS"),
-      Vector(screen->w - white_text->get_text_width(_("COINS"))+white_text->get_text_width(str), 0),
+      Vector(screen->w - white_text->get_text_width(_("COINS"))-white_text->get_text_width(str), 0),
         LAYER_FOREGROUND1);
   context.draw_text(gold_text, str,
-      Vector(screen->w - gold_text->get_text_width("99"), 0),LAYER_FOREGROUND1);
+      Vector(screen->w - gold_text->get_text_width(" 99"), 0),LAYER_FOREGROUND1);
 
   context.draw_text(white_text, _("LIVES"),
-      Vector(screen->w - white_text->get_text_width(_("LIVES"))+white_text->get_text_width(str), 20),
+      Vector(screen->w - white_text->get_text_width(_("LIVES"))-white_text->get_text_width(str), 20),
       LAYER_FOREGROUND1);
   if (player_status.lives >= 5)
     {

[Super-tux-commit] supertux/po de.po,1.1,1.2 pt.po,1.3,1.4 supertux.pot,1.1,1.2

[Ricardo C. <rm...@us...>]

Update of /cvsroot/super-tux/supertux/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25738/po

Modified Files:
	de.po pt.po supertux.pot 
Log Message:
Updated POs.

Index: pt.po
===================================================================
RCS file: /cvsroot/super-tux/supertux/po/pt.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- pt.po	3 Jun 2004 11:31:51 -0000	1.3
+++ pt.po	3 Jun 2004 17:42:10 -0000	1.4
@@ -1,4 +1,9 @@
 # translation of pt.po to 
+# translation of pt.po to
+# translation of pt.po to
+# translation of pt.po to
+# translation of pt.po to
+# translation of pt.po to
 # This file is distributed under the same license as the PACKAGE package.
 # Copyright (C) YEAR SuperTux Development Team.
 # Ricardo Cruz <ri...@ae...>, 2004.
@@ -7,8 +12,8 @@
 msgstr ""
 "Project-Id-Version: pt\n"
 "Report-Msgid-Bugs-To: sup...@li...\n"
-"POT-Creation-Date: 2004-06-03 00:22+0200\n"
-"PO-Revision-Date: 2004-06-03 12:32+0100\n"
+"POT-Creation-Date: 2004-06-03 18:39+0100\n"
+"PO-Revision-Date: 2004-06-03 18:40+0100\n"
 "Last-Translator: Ricardo Cruz <ri...@ae...>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -16,15 +21,128 @@
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3\n"
 
-#: src/setup.cpp:388
+#: src/gameloop.cpp:163
+msgid "by "
+msgstr "por "
+
+#: src/gameloop.cpp:523
+msgid "PAUSE - Press 'P' To Play"
+msgstr "PAUSA - Carrega no 'P' para continuar"
+
+#: src/gameloop.cpp:702 src/worldmap.cpp:850
+msgid "SCORE"
+msgstr "PONTOS"
+
+#: src/gameloop.cpp:707
+msgid "Press ESC To Return"
+msgstr "Carrega no ESC para sair"
+
+#: src/gameloop.cpp:712
+msgid "TIME's UP"
+msgstr "PASSOU O TEMPO"
+
+#: src/gameloop.cpp:716
+msgid "TIME"
+msgstr "TEMPO"
+
+#: src/gameloop.cpp:723 src/gameloop.cpp:724 src/worldmap.cpp:854
+msgid "COINS"
+msgstr "MOEDAS"
+
+#: src/gameloop.cpp:729 src/gameloop.cpp:730 src/worldmap.cpp:859
+#: src/worldmap.cpp:860
+msgid "LIVES"
+msgstr "VIDAS"
+
+#: src/gameloop.cpp:767
+msgid "Result:"
+msgstr "Resultado:"
+
+#: src/gameloop.cpp:770 src/worldmap.cpp:727
+#, c-format
+msgid "SCORE: %d"
+msgstr "PONTOS: %d"
+
+#: src/gameloop.cpp:773 src/worldmap.cpp:731
+#, c-format
+msgid "COINS: %d"
+msgstr "MOEDAS: %d"
+
+#: src/gameloop.cpp:802
+#, c-format
+msgid "Slot %d - Savegame"
+msgstr "Slot %d - Jogo gravado"
+
+#: src/gameloop.cpp:805
+#, c-format
+msgid "Slot %d - Free"
+msgstr "Slot %d - Livre"
+
+#: src/menu.cpp:76
+msgid "Yes"
+msgstr "Sim"
+
+#: src/menu.cpp:77
+msgid "No"
+msgstr "Não"
+
+#: src/menu.cpp:256
+msgid "Up cursor"
+msgstr "Cima"
+
+#: src/menu.cpp:259
+msgid "Down cursor"
+msgstr "Baixo"
+
+#: src/menu.cpp:262
+msgid "Left cursor"
+msgstr "Esquerda"
+
+#: src/menu.cpp:265
+msgid "Right cursor"
+msgstr "Direita"
+
+#: src/menu.cpp:268
+msgid "Return"
+msgstr "Enter"
+
+#: src/menu.cpp:271
+msgid "Space"
+msgstr "Espaço"
+
+#: src/menu.cpp:274
+msgid "Right Shift"
+msgstr "Shift direito"
+
+#: src/menu.cpp:277
+msgid "Left Shift"
+msgstr "Shift esquerdo"
+
+#: src/menu.cpp:280
+msgid "Right Control"
+msgstr "Control direito"
+
+#: src/menu.cpp:283
+msgid "Left Control"
+msgstr "Control esquerdo"
+
+#: src/menu.cpp:286
+msgid "Right Alt"
+msgstr "Alt direito"
+
+#: src/menu.cpp:289
+msgid "Left Alt"
+msgstr "Alt esquerdo"
+
+#: src/setup.cpp:388 src/setup.cpp:448
 msgid "Start Game"
 msgstr "Começar o Jogo"
 
-#: src/setup.cpp:389
+#: src/setup.cpp:389 src/title.cpp:91
 msgid "Contrib Levels"
 msgstr "Contribuições"
 
-#: src/setup.cpp:390
+#: src/setup.cpp:390 src/setup.cpp:395 src/setup.cpp:471 src/setup.cpp:478
 msgid "Options"
 msgstr "Opções"
 
@@ -40,3 +158,124 @@
 msgid "Quit"
 msgstr "Sair"
 
+#: src/setup.cpp:400
+msgid "OpenGL (not supported)"
+msgstr "OpenGL (não suportado)"
+
+#: src/setup.cpp:402
+msgid "Fullscreen"
+msgstr "Fullscreen"
+
+#: src/setup.cpp:405 src/setup.cpp:410
+msgid "Sound     "
+msgstr "Som       "
+
+#: src/setup.cpp:406 src/setup.cpp:411
+msgid "Music     "
+msgstr "Música    "
+
+#: src/setup.cpp:413
+msgid "Show FPS  "
+msgstr "Mostrar FPS "
+
+#: src/setup.cpp:414
+msgid "Keyboard Setup"
+msgstr "Configuração do Teclado"
+
+#: src/setup.cpp:417 src/setup.cpp:436
+msgid "Joystick Setup"
+msgstr "Configuração do Joystick"
+
+#: src/setup.cpp:420 src/setup.cpp:432 src/setup.cpp:445 src/setup.cpp:456
+#: src/title.cpp:104 src/title.cpp:141
+msgid "Back"
+msgstr "Recuar"
+
+#: src/setup.cpp:422
+msgid "Key Setup"
+msgstr "Configurar Teclas"
+
+#: src/setup.cpp:424
+msgid "Left move"
+msgstr "Para a Esquerda"
+
+#: src/setup.cpp:425
+msgid "Right move"
+msgstr "Para a Direita"
+
+#: src/setup.cpp:426
+msgid "Jump"
+msgstr "Saltar"
+
+#: src/setup.cpp:427
+msgid "Duck"
+msgstr "Abaixar"
+
+#: src/setup.cpp:428
+msgid "Activate"
+msgstr "Activado"
+
+#: src/setup.cpp:430
+msgid "Power/Run"
+msgstr "Poder/Correr"
+
+#: src/setup.cpp:440
+msgid "A button"
+msgstr "Butão A"
+
+#: src/setup.cpp:441
+msgid "B button"
+msgstr "Butão B"
+
+#: src/setup.cpp:458
+msgid "Save Game"
+msgstr "Gravar o Jogo"
+
+#: src/setup.cpp:468 src/setup.cpp:475
+msgid "Pause"
+msgstr "Pausa"
+
+#: src/setup.cpp:470 src/setup.cpp:477
+msgid "Continue"
+msgstr "Continuar"
+
+#: src/setup.cpp:473
+msgid "Abort Level"
+msgstr "Abortar Nível"
+
+#: src/setup.cpp:480
+msgid "Quit Game"
+msgstr "Sair do Jogo"
+
+#: src/setup.cpp:482
+msgid "Enter your name:"
+msgstr "Insira o seu nome:"
+
+#: src/title.cpp:276
+msgid " SuperTux "
+msgstr " SuperTux "
+
+#: src/title.cpp:276
+msgid ""
+"\n"
+"Copyright (c) 2003 SuperTux Devel Team\n"
+"This game comes with ABSOLUTELY NO WARRANTY. This is free software, and you\n"
+"are welcome to redistribute it under certain conditions; see the file "
+"COPYING\n"
+"for details.\n"
+msgstr ""
+"\n"
+"Copyright (c) 2003 Equipa do SuperTux\n"
+"Este jogo vem sem ABSOLUTAMENTE NENHUMA GARANTIA. Isto é software livre, e\n"
+"és encorajado a o redistribuir, mas sob certas condições; ler o ficheiro "
+"COPYING\n"
+"para mais informações.\n"
+
+#: src/title.cpp:327
+#, c-format
+msgid "Are you sure you want to delete slot %d?"
+msgstr "Tens a certeza que queres remover o slot %d?"
+
+#: src/worldmap.cpp:724
+msgid "GAMEOVER"
+msgstr "FIM DO JOGO"

Index: supertux.pot
===================================================================
RCS file: /cvsroot/super-tux/supertux/po/supertux.pot,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- supertux.pot	2 Jun 2004 23:00:37 -0000	1.1
+++ supertux.pot	3 Jun 2004 17:42:10 -0000	1.2
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: sup...@li...\n"
-"POT-Creation-Date: 2004-06-03 00:22+0200\n"
+"POT-Creation-Date: 2004-06-03 18:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -16,15 +16,128 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/setup.cpp:388
+#: src/gameloop.cpp:163
+msgid "by "
+msgstr ""
+
+#: src/gameloop.cpp:523
+msgid "PAUSE - Press 'P' To Play"
+msgstr ""
+
+#: src/gameloop.cpp:702 src/worldmap.cpp:850
+msgid "SCORE"
+msgstr ""
+
+#: src/gameloop.cpp:707
+msgid "Press ESC To Return"
+msgstr ""
+
+#: src/gameloop.cpp:712
+msgid "TIME's UP"
+msgstr ""
+
+#: src/gameloop.cpp:716
+msgid "TIME"
+msgstr ""
+
+#: src/gameloop.cpp:723 src/gameloop.cpp:724 src/worldmap.cpp:854
+msgid "COINS"
+msgstr ""
+
+#: src/gameloop.cpp:729 src/gameloop.cpp:730 src/worldmap.cpp:859
+#: src/worldmap.cpp:860
+msgid "LIVES"
+msgstr ""
+
+#: src/gameloop.cpp:767
+msgid "Result:"
+msgstr ""
+
+#: src/gameloop.cpp:770 src/worldmap.cpp:727
+#, c-format
+msgid "SCORE: %d"
+msgstr ""
+
+#: src/gameloop.cpp:773 src/worldmap.cpp:731
+#, c-format
+msgid "COINS: %d"
+msgstr ""
+
+#: src/gameloop.cpp:802
+#, c-format
+msgid "Slot %d - Savegame"
+msgstr ""
+
+#: src/gameloop.cpp:805
+#, c-format
+msgid "Slot %d - Free"
+msgstr ""
+
+#: src/menu.cpp:76
+msgid "Yes"
+msgstr ""
+
+#: src/menu.cpp:77
+msgid "No"
+msgstr ""
+
+#: src/menu.cpp:256
+msgid "Up cursor"
+msgstr ""
+
+#: src/menu.cpp:259
+msgid "Down cursor"
+msgstr ""
+
+#: src/menu.cpp:262
+msgid "Left cursor"
+msgstr ""
+
+#: src/menu.cpp:265
+msgid "Right cursor"
+msgstr ""
+
+#: src/menu.cpp:268
+msgid "Return"
+msgstr ""
+
+#: src/menu.cpp:271
+msgid "Space"
+msgstr ""
+
+#: src/menu.cpp:274
+msgid "Right Shift"
+msgstr ""
+
+#: src/menu.cpp:277
+msgid "Left Shift"
+msgstr ""
+
+#: src/menu.cpp:280
+msgid "Right Control"
+msgstr ""
+
+#: src/menu.cpp:283
+msgid "Left Control"
+msgstr ""
+
+#: src/menu.cpp:286
+msgid "Right Alt"
+msgstr ""
+
+#: src/menu.cpp:289
+msgid "Left Alt"
+msgstr ""
+
+#: src/setup.cpp:388 src/setup.cpp:448
 msgid "Start Game"
 msgstr ""
 
-#: src/setup.cpp:389
+#: src/setup.cpp:389 src/title.cpp:91
 msgid "Contrib Levels"
 msgstr ""
 
-#: src/setup.cpp:390
+#: src/setup.cpp:390 src/setup.cpp:395 src/setup.cpp:471 src/setup.cpp:478
 msgid "Options"
 msgstr ""
 
@@ -39,3 +152,119 @@
 #: src/setup.cpp:393
 msgid "Quit"
 msgstr ""
+
+#: src/setup.cpp:400
+msgid "OpenGL (not supported)"
+msgstr ""
+
+#: src/setup.cpp:402
+msgid "Fullscreen"
+msgstr ""
+
+#: src/setup.cpp:405 src/setup.cpp:410
+msgid "Sound     "
+msgstr ""
+
+#: src/setup.cpp:406 src/setup.cpp:411
+msgid "Music     "
+msgstr ""
+
+#: src/setup.cpp:413
+msgid "Show FPS  "
+msgstr ""
+
+#: src/setup.cpp:414
+msgid "Keyboard Setup"
+msgstr ""
+
+#: src/setup.cpp:417 src/setup.cpp:436
+msgid "Joystick Setup"
+msgstr ""
+
+#: src/setup.cpp:420 src/setup.cpp:432 src/setup.cpp:445 src/setup.cpp:456
+#: src/title.cpp:104 src/title.cpp:141
+msgid "Back"
+msgstr ""
+
+#: src/setup.cpp:422
+msgid "Key Setup"
+msgstr ""
+
+#: src/setup.cpp:424
+msgid "Left move"
+msgstr ""
+
+#: src/setup.cpp:425
+msgid "Right move"
+msgstr ""
+
+#: src/setup.cpp:426
+msgid "Jump"
+msgstr ""
+
+#: src/setup.cpp:427
+msgid "Duck"
+msgstr ""
+
+#: src/setup.cpp:428
+msgid "Activate"
+msgstr ""
+
+#: src/setup.cpp:430
+msgid "Power/Run"
+msgstr ""
+
+#: src/setup.cpp:440
+msgid "A button"
+msgstr ""
+
+#: src/setup.cpp:441
+msgid "B button"
+msgstr ""
+
+#: src/setup.cpp:458
+msgid "Save Game"
+msgstr ""
+
+#: src/setup.cpp:468 src/setup.cpp:475
+msgid "Pause"
+msgstr ""
+
+#: src/setup.cpp:470 src/setup.cpp:477
+msgid "Continue"
+msgstr ""
+
+#: src/setup.cpp:473
+msgid "Abort Level"
+msgstr ""
+
+#: src/setup.cpp:480
+msgid "Quit Game"
+msgstr ""
+
+#: src/setup.cpp:482
+msgid "Enter your name:"
+msgstr ""
+
+#: src/title.cpp:276
+msgid " SuperTux "
+msgstr ""
+
+#: src/title.cpp:276
+msgid ""
+"\n"
+"Copyright (c) 2003 SuperTux Devel Team\n"
+"This game comes with ABSOLUTELY NO WARRANTY. This is free software, and you\n"
+"are welcome to redistribute it under certain conditions; see the file "
+"COPYING\n"
+"for details.\n"
+msgstr ""
+
+#: src/title.cpp:327
+#, c-format
+msgid "Are you sure you want to delete slot %d?"
+msgstr ""
+
+#: src/worldmap.cpp:724
+msgid "GAMEOVER"
+msgstr ""

Index: de.po
===================================================================
RCS file: /cvsroot/super-tux/supertux/po/de.po,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- de.po	2 Jun 2004 23:00:37 -0000	1.1
+++ de.po	3 Jun 2004 17:42:10 -0000	1.2
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: SuperTux 0.1.1\n"
 "Report-Msgid-Bugs-To: sup...@li...\n"
-"POT-Creation-Date: 2004-06-03 00:22+0200\n"
+"POT-Creation-Date: 2004-06-03 18:39+0100\n"
 "PO-Revision-Date: 2004-06-03 00:29+0200\n"
 "Last-Translator:  <ma...@br...>\n"
 "Language-Team: German <de...@li...>\n"
@@ -17,15 +17,128 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/setup.cpp:388
+#: src/gameloop.cpp:163
+msgid "by "
+msgstr ""
+
+#: src/gameloop.cpp:523
+msgid "PAUSE - Press 'P' To Play"
+msgstr ""
+
+#: src/gameloop.cpp:702 src/worldmap.cpp:850
+msgid "SCORE"
+msgstr ""
+
+#: src/gameloop.cpp:707
+msgid "Press ESC To Return"
+msgstr ""
+
+#: src/gameloop.cpp:712
+msgid "TIME's UP"
+msgstr ""
+
+#: src/gameloop.cpp:716
+msgid "TIME"
+msgstr ""
+
+#: src/gameloop.cpp:723 src/gameloop.cpp:724 src/worldmap.cpp:854
+msgid "COINS"
+msgstr ""
+
+#: src/gameloop.cpp:729 src/gameloop.cpp:730 src/worldmap.cpp:859
+#: src/worldmap.cpp:860
+msgid "LIVES"
+msgstr ""
+
+#: src/gameloop.cpp:767
+msgid "Result:"
+msgstr ""
+
+#: src/gameloop.cpp:770 src/worldmap.cpp:727
+#, c-format
+msgid "SCORE: %d"
+msgstr ""
+
+#: src/gameloop.cpp:773 src/worldmap.cpp:731
+#, c-format
+msgid "COINS: %d"
+msgstr ""
+
+#: src/gameloop.cpp:802
+#, c-format
+msgid "Slot %d - Savegame"
+msgstr ""
+
+#: src/gameloop.cpp:805
+#, c-format
+msgid "Slot %d - Free"
+msgstr ""
+
+#: src/menu.cpp:76
+msgid "Yes"
+msgstr ""
+
+#: src/menu.cpp:77
+msgid "No"
+msgstr ""
+
+#: src/menu.cpp:256
+msgid "Up cursor"
+msgstr ""
+
+#: src/menu.cpp:259
+msgid "Down cursor"
+msgstr ""
+
+#: src/menu.cpp:262
+msgid "Left cursor"
+msgstr ""
+
+#: src/menu.cpp:265
+msgid "Right cursor"
+msgstr ""
+
+#: src/menu.cpp:268
+msgid "Return"
+msgstr ""
+
+#: src/menu.cpp:271
+msgid "Space"
+msgstr ""
+
+#: src/menu.cpp:274
+msgid "Right Shift"
+msgstr ""
+
+#: src/menu.cpp:277
+msgid "Left Shift"
+msgstr ""
+
+#: src/menu.cpp:280
+msgid "Right Control"
+msgstr ""
+
+#: src/menu.cpp:283
+msgid "Left Control"
+msgstr ""
+
+#: src/menu.cpp:286
+msgid "Right Alt"
+msgstr ""
+
+#: src/menu.cpp:289
+msgid "Left Alt"
+msgstr ""
+
+#: src/setup.cpp:388 src/setup.cpp:448
 msgid "Start Game"
 msgstr "Spiel Beginnen"
 
-#: src/setup.cpp:389
+#: src/setup.cpp:389 src/title.cpp:91
 msgid "Contrib Levels"
 msgstr "Zusatzlevel"
 
-#: src/setup.cpp:390
+#: src/setup.cpp:390 src/setup.cpp:395 src/setup.cpp:471 src/setup.cpp:478
 msgid "Options"
 msgstr "Einstellungen"
 
@@ -40,3 +153,122 @@
 #: src/setup.cpp:393
 msgid "Quit"
 msgstr "Beenden"
+
+#: src/setup.cpp:400
+msgid "OpenGL (not supported)"
+msgstr ""
+
+#: src/setup.cpp:402
+msgid "Fullscreen"
+msgstr ""
+
+#: src/setup.cpp:405 src/setup.cpp:410
+msgid "Sound     "
+msgstr ""
+
+#: src/setup.cpp:406 src/setup.cpp:411
+msgid "Music     "
+msgstr ""
+
+#: src/setup.cpp:413
+msgid "Show FPS  "
+msgstr ""
+
+#: src/setup.cpp:414
+msgid "Keyboard Setup"
+msgstr ""
+
+#: src/setup.cpp:417 src/setup.cpp:436
+msgid "Joystick Setup"
+msgstr ""
+
+#: src/setup.cpp:420 src/setup.cpp:432 src/setup.cpp:445 src/setup.cpp:456
+#: src/title.cpp:104 src/title.cpp:141
+msgid "Back"
+msgstr ""
+
+#: src/setup.cpp:422
+msgid "Key Setup"
+msgstr ""
+
+#: src/setup.cpp:424
+msgid "Left move"
+msgstr ""
+
+#: src/setup.cpp:425
+msgid "Right move"
+msgstr ""
+
+#: src/setup.cpp:426
+msgid "Jump"
+msgstr ""
+
+#: src/setup.cpp:427
+msgid "Duck"
+msgstr ""
+
+#: src/setup.cpp:428
+msgid "Activate"
+msgstr ""
+
+#: src/setup.cpp:430
+msgid "Power/Run"
+msgstr ""
+
+#: src/setup.cpp:440
+msgid "A button"
+msgstr ""
+
+#: src/setup.cpp:441
+msgid "B button"
+msgstr ""
+
+#: src/setup.cpp:458
+#, fuzzy
+msgid "Save Game"
+msgstr "Spiel Beginnen"
+
+#: src/setup.cpp:468 src/setup.cpp:475
+msgid "Pause"
+msgstr ""
+
+#: src/setup.cpp:470 src/setup.cpp:477
+msgid "Continue"
+msgstr ""
+
+#: src/setup.cpp:473
+#, fuzzy
+msgid "Abort Level"
+msgstr "Zusatzlevel"
+
+#: src/setup.cpp:480
+#, fuzzy
+msgid "Quit Game"
+msgstr "Spiel Beginnen"
+
+#: src/setup.cpp:482
+msgid "Enter your name:"
+msgstr ""
+
+#: src/title.cpp:276
+msgid " SuperTux "
+msgstr ""
+
+#: src/title.cpp:276
+msgid ""
+"\n"
+"Copyright (c) 2003 SuperTux Devel Team\n"
+"This game comes with ABSOLUTELY NO WARRANTY. This is free software, and you\n"
+"are welcome to redistribute it under certain conditions; see the file "
+"COPYING\n"
+"for details.\n"
+msgstr ""
+
+#: src/title.cpp:327
+#, c-format
+msgid "Are you sure you want to delete slot %d?"
+msgstr ""
+
+#: src/worldmap.cpp:724
+msgid "GAMEOVER"
+msgstr ""

[Super-tux-commit] supertux/src gameloop.cpp,1.144,1.145 menu.cpp,1.77,1.78 setup.cpp,1.94,1.95 title.cpp,1.94,1.95 worldmap.cpp,1.81,1.82

[Ricardo C. <rm...@us...>]

Update of /cvsroot/super-tux/supertux/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25398/src

Modified Files:
	gameloop.cpp menu.cpp setup.cpp title.cpp worldmap.cpp 
Log Message:
Added more strings to be translated.
In some places for doing the aligment spaces were used. I fixed a couple of places, but there are more there. This is a good time to remove this hacks.

We have to define some policy about what should be translatable.
IMO, error messages should not be translated. Only if they are telling the user what should he do.
Warnings maybe should be translated.

Index: menu.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/menu.cpp,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -d -r1.77 -r1.78
--- menu.cpp	2 Jun 2004 23:33:35 -0000	1.77
+++ menu.cpp	3 Jun 2004 17:41:22 -0000	1.78
@@ -40,6 +40,7 @@
 #include "leveleditor.h"
 #include "timer.h"
 #include "high_scores.h"
+#include "gettext.h"
 
 #define FLICK_CURSOR_TIME 500
 
@@ -72,8 +73,8 @@
   Menu* dialog = new Menu;
   dialog->additem(MN_DEACTIVE, text,0,0);
   dialog->additem(MN_HL,"",0,0);
-  dialog->additem(MN_ACTION,"Yes",0,0,true);
-  dialog->additem(MN_ACTION,"No",0,0,false);
+  dialog->additem(MN_ACTION,_("Yes"),0,0,true);
+  dialog->additem(MN_ACTION,_("No"),0,0,false);
   dialog->additem(MN_HL,"",0,0);
 
   Menu::set_current(dialog);
@@ -252,40 +253,40 @@
   switch(*item->int_p)
   {
   case SDLK_UP:
-    item->change_input("Up cursor");
+    item->change_input(_("Up cursor"));
     break;
   case SDLK_DOWN:
-    item->change_input("Down cursor");
+    item->change_input(_("Down cursor"));
     break;
   case SDLK_LEFT:
-    item->change_input("Left cursor");
+    item->change_input(_("Left cursor"));
     break;
   case SDLK_RIGHT:
-    item->change_input("Right cursor");
+    item->change_input(_("Right cursor"));
     break;
   case SDLK_RETURN:
-    item->change_input("Return");
+    item->change_input(_("Return"));
     break;
   case SDLK_SPACE:
-    item->change_input("Space");
+    item->change_input(_("Space"));
     break;
   case SDLK_RSHIFT:
-    item->change_input("Right Shift");
+    item->change_input(_("Right Shift"));
     break;
   case SDLK_LSHIFT:
-    item->change_input("Left Shift");
+    item->change_input(_("Left Shift"));
     break;
   case SDLK_RCTRL:
-    item->change_input("Right Control");
+    item->change_input(_("Right Control"));
     break;
   case SDLK_LCTRL:
-    item->change_input("Left Control");
+    item->change_input(_("Left Control"));
     break;
   case SDLK_RALT:
-    item->change_input("Right Alt");
+    item->change_input(_("Right Alt"));
     break;
   case SDLK_LALT:
-    item->change_input("Left Alt");
+    item->change_input(_("Left Alt"));
     break;
   default:
     {

Index: title.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/title.cpp,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -d -r1.94 -r1.95
--- title.cpp	3 Jun 2004 11:26:12 -0000	1.94
+++ title.cpp	3 Jun 2004 17:41:22 -0000	1.95
@@ -52,6 +52,7 @@
 #include "sector.h"
 #include "tilemap.h"
 #include "resources.h"
+#include "gettext.h"
 
 static Surface* bkg_title;
 static Surface* logo;
@@ -87,7 +88,7 @@
 
   free_contrib_menu();
 
-  contrib_menu->additem(MN_LABEL,"Contrib Levels",0,0);
+  contrib_menu->additem(MN_LABEL,_("Contrib Levels"),0,0);
   contrib_menu->additem(MN_HL,"",0,0);
 
   for (int i = 0; i < level_subsets.num_items; ++i)
@@ -100,7 +101,7 @@
     }
 
   contrib_menu->additem(MN_HL,"",0,0);
-  contrib_menu->additem(MN_BACK,"Back",0,0);
+  contrib_menu->additem(MN_BACK,_("Back"),0,0);
 
   string_list_free(&level_subsets);
 }
@@ -137,7 +138,7 @@
                 }
               
               contrib_subset_menu->additem(MN_HL,"",0,0);      
-              contrib_subset_menu->additem(MN_BACK, "Back", 0, 0);
+              contrib_subset_menu->additem(MN_BACK, _("Back"), 0, 0);
 
               titlesession->get_current_sector()->activate();
               titlesession->set_current();
@@ -272,11 +273,11 @@
             LAYER_FOREGROUND1+1);
 
       context.draw_text(white_small_text,
-          " SuperTux " VERSION "\n"
+          _(" SuperTux " VERSION "\n"
           "Copyright (c) 2003 SuperTux Devel Team\n"
           "This game comes with ABSOLUTELY NO WARRANTY. This is free software, and you\n"
           "are welcome to redistribute it under certain conditions; see the file COPYING\n"
-          "for details.\n", Vector(0, screen->h - 70), LAYER_FOREGROUND1);
+          "for details.\n"), Vector(0, screen->h - 70), LAYER_FOREGROUND1);
 
       /* Don't draw menu, if quit is true */
       Menu* menu = Menu::current();
@@ -323,7 +324,7 @@
                 {
                 int slot = menu->get_active_item_id();
                 char str[1024];
-                sprintf(str,"Are you sure you want to delete slot %d?", slot);
+                sprintf(str,_("Are you sure you want to delete slot %d?"), slot);
                 
                 if(confirm_dialog(bkg_title, str))
                   {

Index: worldmap.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/worldmap.cpp,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -d -r1.81 -r1.82
--- worldmap.cpp	2 Jun 2004 20:06:56 -0000	1.81
+++ worldmap.cpp	3 Jun 2004 17:41:22 -0000	1.82
@@ -33,6 +33,7 @@
 #include "worldmap.h"
 #include "sound_manager.h"
 #include "resources.h"
+#include "gettext.h"
 
 namespace WorldMapNS {
 
@@ -720,14 +721,14 @@
                   context.draw_gradient(Color (0, 255, 0), Color (255, 0, 255),
                       LAYER_BACKGROUND0);
 
-                  context.draw_text_center(blue_text, "GAMEOVER", 
+                  context.draw_text_center(blue_text, _("GAMEOVER"), 
                       Vector(0, 200), LAYER_FOREGROUND1);
 
-                  sprintf(str, "SCORE: %d", player_status.score);
+                  sprintf(str, _("SCORE: %d"), player_status.score);
                   context.draw_text_center(gold_text, str,
                       Vector(0, 224), LAYER_FOREGROUND1);
 
-                  sprintf(str, "COINS: %d", player_status.distros);
+                  sprintf(str, _("COINS: %d"), player_status.distros);
                   context.draw_text_center(gold_text, str,
                       Vector(0, screen->w - 32), LAYER_FOREGROUND1);
 
@@ -846,17 +847,17 @@
   char str[80];
   sprintf(str, "%d", player_status.score);
 
-  context.draw_text(white_text, "SCORE", Vector(0, 0), LAYER_FOREGROUND1);
+  context.draw_text(white_text, _("SCORE"), Vector(0, 0), LAYER_FOREGROUND1);
   context.draw_text(gold_text, str, Vector(96, 0), LAYER_FOREGROUND1);
 
   sprintf(str, "%d", player_status.distros);
-  context.draw_text(white_text, "COINS", Vector(screen->w/2 - 16*5, 0),
+  context.draw_text(white_text, _("COINS"), Vector(screen->w/2 - 16*5, 0),
       LAYER_FOREGROUND1);
   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),
+  context.draw_text(white_text, _("LIVES"),
+      Vector(screen->w - white_text->get_text_width(_("LIVES"))*2, 0),
       LAYER_FOREGROUND1);
   if (player_status.lives >= 5)
     {

Index: gameloop.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/gameloop.cpp,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -d -r1.144 -r1.145
--- gameloop.cpp	2 Jun 2004 20:06:55 -0000	1.144
+++ gameloop.cpp	3 Jun 2004 17:41:22 -0000	1.145
@@ -55,6 +55,7 @@
 #include "resources.h"
 #include "background.h"
 #include "tilemap.h"
+#include "gettext.h"
 
 GameSession* GameSession::current_ = 0;
 
@@ -159,7 +160,7 @@
       LAYER_FOREGROUND1);
   
   context.draw_text_center(white_small_text,
-      std::string("by ") + level->get_author(), 
+      std::string(_("by ")) + level->get_author(), 
       Vector(0, 400), LAYER_FOREGROUND1);
 
   context.do_drawing();
@@ -519,7 +520,7 @@
       context->draw_filled_rect(
           Vector(0,0), Vector(screen->w, screen->h),
           Color(rand() % 50, rand() % 50, rand() % 50, 128), LAYER_FOREGROUND1);
-      context->draw_text_center(blue_text, "PAUSE - Press 'P' To Play",
+      context->draw_text_center(blue_text, _("PAUSE - Press 'P' To Play"),
           Vector(0, 230), LAYER_FOREGROUND1+2);
     }
 
@@ -698,35 +699,35 @@
   char str[60];
   
   snprintf(str, 60, "%d", player_status.score);
-  context.draw_text(white_text, "SCORE", Vector(0, 0), LAYER_FOREGROUND1);
+  context.draw_text(white_text, _("SCORE"), Vector(0, 0), LAYER_FOREGROUND1);
   context.draw_text(gold_text, str, Vector(96, 0), LAYER_FOREGROUND1);
 
   if(st_gl_mode == ST_GL_TEST)
     {
-      context.draw_text(white_text, "Press ESC To Return", Vector(0,20),
+      context.draw_text(white_text, _("Press ESC To Return"), Vector(0,20),
           LAYER_FOREGROUND1);
     }
 
   if(!time_left.check()) {
-    context.draw_text_center(white_text, "TIME's UP", Vector(0, 0),
+    context.draw_text_center(white_text, _("TIME's UP"), Vector(0, 0),
         LAYER_FOREGROUND1);
   } else if (time_left.get_left() > TIME_WARNING || (global_frame_counter % 10) < 5) {
     sprintf(str, "%d", time_left.get_left() / 1000 );
-    context.draw_text_center(white_text, "TIME",
+    context.draw_text_center(white_text, _("TIME"),
         Vector(0, 0), LAYER_FOREGROUND1);
     context.draw_text_center(gold_text, str,
         Vector(4*16, 0), LAYER_FOREGROUND1);
   }
 
   sprintf(str, "%d", player_status.distros);
-  context.draw_text(white_text, "COINS",
-      Vector(screen->w - white_text->get_text_width("COINS   "), 0),
+  context.draw_text(white_text, _("COINS"),
+      Vector(screen->w - white_text->get_text_width(_("COINS"))+white_text->get_text_width(str), 0),
         LAYER_FOREGROUND1);
   context.draw_text(gold_text, str,
       Vector(screen->w - gold_text->get_text_width("99"), 0),LAYER_FOREGROUND1);
 
-  context.draw_text(white_text, "LIVES",
-      Vector(screen->w - white_text->get_text_width("LIVES    "), 20),
+  context.draw_text(white_text, _("LIVES"),
+      Vector(screen->w - white_text->get_text_width(_("LIVES"))+white_text->get_text_width(str), 20),
       LAYER_FOREGROUND1);
   if (player_status.lives >= 5)
     {
@@ -763,13 +764,13 @@
   DrawingContext context;
   currentsector->background->draw(context);  
 
-  context.draw_text_center(blue_text, "Result:", Vector(0, 200),
+  context.draw_text_center(blue_text, _("Result:"), Vector(0, 200),
       LAYER_FOREGROUND1);
 
-  sprintf(str, "SCORE: %d", player_status.score);
+  sprintf(str, _("SCORE: %d"), player_status.score);
   context.draw_text_center(gold_text, str, Vector(0, 224), LAYER_FOREGROUND1);
 
-  sprintf(str, "COINS: %d", player_status.distros);
+  sprintf(str, _("COINS: %d"), player_status.distros);
   context.draw_text_center(gold_text, str, Vector(0, 256), LAYER_FOREGROUND1);
 
   context.do_drawing();
@@ -798,10 +799,10 @@
       if (!title.empty())
         snprintf(tmp,1024,"Slot %d - %s",slot, title.c_str());
       else
-        snprintf(tmp, 1024,"Slot %d - Savegame",slot);
+        snprintf(tmp, 1024,_("Slot %d - Savegame"),slot);
     }
   else
-    sprintf(tmp,"Slot %d - Free",slot);
+    sprintf(tmp,_("Slot %d - Free"),slot);
 
   return tmp;
 }

Index: setup.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/setup.cpp,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -d -r1.94 -r1.95
--- setup.cpp	2 Jun 2004 23:00:26 -0000	1.94
+++ setup.cpp	3 Jun 2004 17:41:22 -0000	1.95
@@ -392,60 +392,60 @@
   main_menu->additem(MN_ACTION, _("Credits"),0,0, MNID_CREDITS);
   main_menu->additem(MN_ACTION, _("Quit"),0,0, MNID_QUITMAINMENU);
 
-  options_menu->additem(MN_LABEL,"Options",0,0);
+  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);
 #else
-  options_menu->additem(MN_DEACTIVE,"OpenGL (not supported)",use_gl, 0, MNID_OPENGL);
+  options_menu->additem(MN_DEACTIVE,_("OpenGL (not supported)"),use_gl, 0, MNID_OPENGL);
 #endif
-  options_menu->additem(MN_TOGGLE,"Fullscreen",use_fullscreen,0, MNID_FULLSCREEN);
+  options_menu->additem(MN_TOGGLE,_("Fullscreen"),use_fullscreen,0, MNID_FULLSCREEN);
   if(audio_device)
     {
-      options_menu->additem(MN_TOGGLE,"Sound     ", use_sound,0, MNID_SOUND);
-      options_menu->additem(MN_TOGGLE,"Music     ", use_music,0, MNID_MUSIC);
+      options_menu->additem(MN_TOGGLE,_("Sound     "), use_sound,0, MNID_SOUND);
+      options_menu->additem(MN_TOGGLE,_("Music     "), use_music,0, MNID_MUSIC);
     }
   else
     {
-      options_menu->additem(MN_DEACTIVE,"Sound     ", false,0, MNID_SOUND);
-      options_menu->additem(MN_DEACTIVE,"Music     ", false,0, MNID_MUSIC);
+      options_menu->additem(MN_DEACTIVE,_("Sound     "), false,0, MNID_SOUND);
+      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_TOGGLE,_("Show FPS  "),show_fps,0, MNID_SHOWFPS);
+  options_menu->additem(MN_GOTO,_("Keyboard Setup"),0,options_keys_menu);
 
   if(use_joystick)
-    options_menu->additem(MN_GOTO,"Joystick Setup",0,options_joystick_menu);
+    options_menu->additem(MN_GOTO,_("Joystick Setup"),0,options_joystick_menu);
 
   options_menu->additem(MN_HL,"",0,0);
-  options_menu->additem(MN_BACK,"Back",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,_("Key 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);
-  options_keys_menu->additem(MN_CONTROLFIELD_KB,"Jump", 0,0, 0,&keymap.jump);
-  options_keys_menu->additem(MN_CONTROLFIELD_KB,"Duck", 0,0, 0,&keymap.duck);
-  options_keys_menu->additem(MN_CONTROLFIELD_KB,"Activate", 0, 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);
+  options_keys_menu->additem(MN_CONTROLFIELD_KB,_("Jump"), 0,0, 0,&keymap.jump);
+  options_keys_menu->additem(MN_CONTROLFIELD_KB,_("Duck"), 0,0, 0,&keymap.duck);
+  options_keys_menu->additem(MN_CONTROLFIELD_KB,_("Activate"), 0, 0, 0,
           &keymap.activate);
-  options_keys_menu->additem(MN_CONTROLFIELD_KB,"Power/Run", 0,0, 0,&keymap.fire);
+  options_keys_menu->additem(MN_CONTROLFIELD_KB,_("Power/Run"), 0,0, 0,&keymap.fire);
   options_keys_menu->additem(MN_HL,"",0,0);
-  options_keys_menu->additem(MN_BACK,"Back",0,0);
+  options_keys_menu->additem(MN_BACK,_("Back"),0,0);
 
   if(use_joystick)
     {
-    options_joystick_menu->additem(MN_LABEL,"Joystick Setup",0,0);
+    options_joystick_menu->additem(MN_LABEL,_("Joystick Setup"),0,0);
     options_joystick_menu->additem(MN_HL,"",0,0);
     //options_joystick_menu->additem(MN_CONTROLFIELD_JS,"X axis", 0,0, 0,&joystick_keymap.x_axis);
     //options_joystick_menu->additem(MN_CONTROLFIELD_JS,"Y axis", 0,0, 0,&joystick_keymap.y_axis);
-    options_joystick_menu->additem(MN_CONTROLFIELD_JS,"A button", 0,0, 0,&joystick_keymap.a_button);
-    options_joystick_menu->additem(MN_CONTROLFIELD_JS,"B button", 0,0, 0,&joystick_keymap.b_button);
+    options_joystick_menu->additem(MN_CONTROLFIELD_JS,_("A button"), 0,0, 0,&joystick_keymap.a_button);
+    options_joystick_menu->additem(MN_CONTROLFIELD_JS,_("B button"), 0,0, 0,&joystick_keymap.b_button);
     //options_joystick_menu->additem(MN_CONTROLFIELD_JS,"Start", 0,0, 0,&joystick_keymap.start_button);
     //options_joystick_menu->additem(MN_CONTROLFIELD_JS,"DeadZone", 0,0, 0,&joystick_keymap.dead_zone);
     options_joystick_menu->additem(MN_HL,"",0,0);
-    options_joystick_menu->additem(MN_BACK,"Back",0,0);
+    options_joystick_menu->additem(MN_BACK,_("Back"),0,0);
     }
   
-  load_game_menu->additem(MN_LABEL,"Start Game",0,0);
+  load_game_menu->additem(MN_LABEL,_("Start Game"),0,0);
   load_game_menu->additem(MN_HL,"",0,0);
   load_game_menu->additem(MN_DEACTIVE,"Slot 1",0,0, 1);
   load_game_menu->additem(MN_DEACTIVE,"Slot 2",0,0, 2);
@@ -453,9 +453,9 @@
   load_game_menu->additem(MN_DEACTIVE,"Slot 4",0,0, 4);
   load_game_menu->additem(MN_DEACTIVE,"Slot 5",0,0, 5);
   load_game_menu->additem(MN_HL,"",0,0);
-  load_game_menu->additem(MN_BACK,"Back",0,0);
+  load_game_menu->additem(MN_BACK,_("Back"),0,0);
 
-  save_game_menu->additem(MN_LABEL,"Save Game",0,0);
+  save_game_menu->additem(MN_LABEL,_("Save Game"),0,0);
   save_game_menu->additem(MN_HL,"",0,0);
   save_game_menu->additem(MN_DEACTIVE,"Slot 1",0,0, 1);
   save_game_menu->additem(MN_DEACTIVE,"Slot 2",0,0, 2);
@@ -465,21 +465,21 @@
   save_game_menu->additem(MN_HL,"",0,0);
   save_game_menu->additem(MN_BACK,"Back",0,0);
 
-  game_menu->additem(MN_LABEL,"Pause",0,0);
+  game_menu->additem(MN_LABEL,_("Pause"),0,0);
   game_menu->additem(MN_HL,"",0,0);
-  game_menu->additem(MN_ACTION,"Continue",0,0,MNID_CONTINUE);
-  game_menu->additem(MN_GOTO,"Options",0,options_menu);
+  game_menu->additem(MN_ACTION,_("Continue"),0,0,MNID_CONTINUE);
+  game_menu->additem(MN_GOTO,_("Options"),0,options_menu);
   game_menu->additem(MN_HL,"",0,0);
-  game_menu->additem(MN_ACTION,"Abort Level",0,0,MNID_ABORTLEVEL);
+  game_menu->additem(MN_ACTION,_("Abort Level"),0,0,MNID_ABORTLEVEL);
 
-  worldmap_menu->additem(MN_LABEL,"Pause",0,0);
+  worldmap_menu->additem(MN_LABEL,_("Pause"),0,0);
   worldmap_menu->additem(MN_HL,"",0,0);
-  worldmap_menu->additem(MN_ACTION,"Continue",0,0,MNID_RETURNWORLDMAP);
-  worldmap_menu->additem(MN_GOTO,"Options",0,options_menu);
+  worldmap_menu->additem(MN_ACTION,_("Continue"),0,0,MNID_RETURNWORLDMAP);
+  worldmap_menu->additem(MN_GOTO,_("Options"),0,options_menu);
   worldmap_menu->additem(MN_HL,"",0,0);
-  worldmap_menu->additem(MN_ACTION,"Quit Game",0,0,MNID_QUITWORLDMAP);
+  worldmap_menu->additem(MN_ACTION,_("Quit Game"),0,0,MNID_QUITWORLDMAP);
 
-  highscore_menu->additem(MN_TEXTFIELD,"Enter your name:",0,0);
+  highscore_menu->additem(MN_TEXTFIELD,_("Enter your name:"),0,0);
 }
 
 void update_load_save_game_menu(Menu* pmenu)

[Super-tux-commit] supertux/po POTFILES.in,1.1,1.2

[Ricardo C. <rm...@us...>]

Update of /cvsroot/super-tux/supertux/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15292/po

Modified Files:
	POTFILES.in 
Log Message:
Removed not existing files from the list.
After this the gmo generating works fine for me.

Index: POTFILES.in
===================================================================
RCS file: /cvsroot/super-tux/supertux/po/POTFILES.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- POTFILES.in	2 Jun 2004 23:00:37 -0000	1.1
+++ POTFILES.in	3 Jun 2004 16:56:37 -0000	1.2
@@ -1,105 +1,97 @@
-src/menu.cpp
-src/particlesystem.cpp
-src/game_object.h
-src/leveleditor.h
-src/scene.cpp
-src/bitmask.h
+src/screen/drawing_context.cpp
+src/screen/drawing_context.h
+src/screen/font.cpp
+src/screen/font.h
+src/screen/screen.cpp
+src/screen/screen.h
+src/screen/texture.cpp
+src/screen/texture.h
 src/background.cpp
-src/intro.cpp
-src/serializable.h
-src/door.cpp
-src/tilemap.h
+src/background.h
+src/badguy.cpp
+src/badguy.h
 src/bitmask.cpp
-src/sprite_manager.cpp
+src/bitmask.h
+src/button.cpp
+src/button.h
+src/camera.cpp
+src/camera.h
+src/collision.cpp
+src/collision.h
+src/configfile.cpp
 src/configfile.h
-src/vector.cpp
-src/worldmap.cpp
-src/later/rectangle.h
-src/later/moving_object.cpp
-src/later/badguy.cpp
-src/later/badguy.h
-src/later/moving_object.h
+src/defines.h
+src/door.cpp
+src/door.h
+src/exceptions.h
 src/game_object.cpp
-src/interactive_object.cpp
-src/particlesystem.h
+src/game_object.h
+src/gameloop.cpp
+src/gameloop.h
+src/gameobjs.cpp
+src/gameobjs.h
+src/gettext.h
+src/globals.cpp
+src/globals.h
+src/high_scores.cpp
 src/high_scores.h
-src/type.cpp
-src/sound_manager.cpp
-src/scene.h
-src/sprite.cpp
-src/polygon.cpp
-src/rectangle.h
+src/interactive_object.cpp
+src/interactive_object.h
+src/intro.cpp
+src/intro.h
+src/level.cpp
 src/level.h
+src/leveleditor.cpp
+src/leveleditor.h
+src/lispreader.cpp
+src/lispreader.h
+src/lispwriter.cpp
+src/lispwriter.h
+src/menu.cpp
+src/menu.h
+src/mousecursor.cpp
+src/mousecursor.h
 src/moving_object.cpp
-src/timer.cpp
-src/supertux.cpp
-src/setup.h
-src/collision.h
-src/resources.h
+src/moving_object.h
+src/musicref.cpp
+src/musicref.h
+src/particlesystem.cpp
+src/particlesystem.h
 src/physic.cpp
-src/background.h
-src/tilemap.cpp
-src/gameobjs.cpp
-src/vector.h
-src/sprite.h
-src/title.cpp
-src/sector.cpp
-src/sound.h
-src/camera.h
-src/timer.h
-src/title.h
-src/door.h
 src/physic.h
-src/button.cpp
-src/lispwriter.cpp
-src/gameloop.cpp
-src/level.cpp
-src/setup.cpp
-src/sound.cpp
+src/player.cpp
+src/player.h
 src/resources.cpp
+src/resources.h
+src/scene.cpp
+src/scene.h
+src/sector.cpp
 src/sector.h
-src/musicref.cpp
-src/badguy.cpp
-src/menu.h
-src/gettext.h
-src/mousecursor.h
+src/serializable.h
+src/setup.cpp
+src/setup.h
+src/sound.cpp
+src/sound.h
+src/sound_manager.cpp
+src/sound_manager.h
 src/special.cpp
-src/high_scores.cpp
-src/lispreader.cpp
-src/screen/font.cpp
-src/screen/screen.h
-src/screen/drawing_context.h
-src/screen/font.h
-src/screen/texture.h
-src/screen/texture.cpp
-src/screen/screen.cpp
-src/screen/drawing_context.cpp
-src/polygon.h
-src/tile.h
+src/special.h
+src/sprite.cpp
+src/sprite.h
+src/sprite_manager.cpp
 src/sprite_manager.h
-src/mousecursor.cpp
+src/supertux.cpp
+src/tile.cpp
+src/tile.h
+src/tilemap.cpp
+src/tilemap.h
+src/timer.cpp
+src/timer.h
+src/title.cpp
+src/title.h
+src/type.cpp
 src/type.h
-src/defines.h
-src/badguy.h
-src/exceptions.h
-src/player.h
-src/special.h
-src/sound_manager.h
-src/gameloop.h
+src/vector.cpp
+src/vector.h
+src/worldmap.cpp
 src/worldmap.h
-src/globals.h
-src/gameobjs.h
-src/tile.cpp
-src/configfile.cpp
-src/camera.cpp
-src/moving_object.h
-src/button.h
-src/musicref.h
-src/interactive_object.h
-src/leveleditor.cpp
-src/intro.h
-src/lispreader.h
-src/lispwriter.h
-src/globals.cpp
-src/collision.cpp
-src/player.cpp

[Super-tux-commit] supertux/src leveleditor.cpp,1.133,1.134

[Ricardo C. <rm...@us...>]

Update of /cvsroot/super-tux/supertux/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10085/src

Modified Files:
	leveleditor.cpp 
Log Message:
Fixed scrolling.
The GUI is full of problems, I guess the best solution is to rewrite button.* stuff. The level editor also needs a redesign. I will take care of this, can take awhile.

Index: leveleditor.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/leveleditor.cpp,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -d -r1.133 -r1.134
--- leveleditor.cpp	3 Jun 2004 11:26:12 -0000	1.133
+++ leveleditor.cpp	3 Jun 2004 16:30:35 -0000	1.134
@@ -29,6 +29,7 @@
 #include <SDL.h>
 #include <SDL_image.h>
 #include <algorithm>
+#include <iostream>
 
 #include "leveleditor.h"
 
@@ -82,6 +83,8 @@
   le_show_grid = true;
   show_selections = true;
 
+  pos_x = pos_y = 0;
+
   done = 0;
   le_frame = 0;	/* support for frames in some tiles, like waves and bad guys */
   le_level_changed = false;
@@ -234,12 +237,14 @@
       /* making events results to be in order */
 
       /* draw the level */
+      context.set_translation(Vector(pos_x, pos_y));
       drawlevel(context);
     }
     else
       fillrect(0, 0, screen->w, screen->h, 0, 0, 0);
 
     /* draw editor interface */
+    context.set_translation(Vector(0, 0));
     drawinterface(context);
 
     Menu* menu = Menu::current();
@@ -845,7 +850,7 @@
 
   if(le_current.IsTile())
   {
-le_level->get_sector("main")->solids->draw(context);
+//le_level->get_sector("main")->solids->draw(context);
 /*
     Tile::draw(cursor_x-pos_x, cursor_y-pos_y,le_current.tile,128);
     if(!TileManager::instance()->get(le_current.tile)->images.empty())
@@ -860,7 +865,6 @@
 
   /*       clearscreen(current_level.bkgd_red, current_level.bkgd_green, current_level.bkgd_blue); */
 
-
 le_level->get_sector("main")->solids->draw(context);
 
 // FIXME: make tiles to be drawn semi-transparent when not selected
@@ -1529,8 +1533,6 @@
       pos_y = (le_level->get_sector("main")->solids->get_height() * 32) - screen->h;
     if(pos_y < 0)
       pos_y = 0;
-
-    le_level->get_sector("main")->camera->set_scrolling(pos_x, pos_y);
   }
 }
 

[Super-tux-commit] supertux/po pt.po,1.2,1.3 LINGUAS,1.3,1.4

[Ricardo C. <rm...@us...>]

Update of /cvsroot/super-tux/supertux/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8804/po

Modified Files:
	LINGUAS 
Added Files:
	pt.po 
Log Message:
Fixed PO file.
How can we tell SuperTux to make use of it?

--- NEW FILE: pt.po ---
# translation of pt.po to 
# This file is distributed under the same license as the PACKAGE package.
# Copyright (C) YEAR SuperTux Development Team.
# Ricardo Cruz <ri...@ae...>, 2004.
#
msgid ""
msgstr ""
"Project-Id-Version: pt\n"
"Report-Msgid-Bugs-To: sup...@li...\n"
"POT-Creation-Date: 2004-06-03 00:22+0200\n"
"PO-Revision-Date: 2004-06-03 12:32+0100\n"
"Last-Translator: Ricardo Cruz <ri...@ae...>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.3\n"

#: src/setup.cpp:388
msgid "Start Game"
msgstr "Começar o Jogo"

#: src/setup.cpp:389
msgid "Contrib Levels"
msgstr "Contribuições"

#: src/setup.cpp:390
msgid "Options"
msgstr "Opções"

#: src/setup.cpp:391
msgid "Level Editor"
msgstr "Editor de Níveis"

#: src/setup.cpp:392
msgid "Credits"
msgstr "Méritos"

#: src/setup.cpp:393
msgid "Quit"
msgstr "Sair"


Index: LINGUAS
===================================================================
RCS file: /cvsroot/super-tux/supertux/po/LINGUAS,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- LINGUAS	3 Jun 2004 11:21:50 -0000	1.3
+++ LINGUAS	3 Jun 2004 11:31:51 -0000	1.4
@@ -1,2 +1,3 @@
 # Set of available languages.
 de
+pt

[Super-tux-commit] supertux ABOUT-NLS,NONE,1.1 .cvsignore,1.1,1.2

[Matze B. <mat...@us...>]

Update of /cvsroot/super-tux/supertux
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8376

Modified Files:
	.cvsignore 
Added Files:
	ABOUT-NLS 
Log Message:
another small fix

Index: .cvsignore
===================================================================
RCS file: /cvsroot/super-tux/supertux/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- .cvsignore	3 Jun 2004 11:27:19 -0000	1.1
+++ .cvsignore	3 Jun 2004 11:29:28 -0000	1.2
@@ -10,4 +10,6 @@
 install-sh
 missing
 mkinstalldirs
+Makefile
+autom4te.cache
 

--- NEW FILE: ABOUT-NLS ---
Notes on the Free Translation Project
*************************************

   Free software is going international!  The Free Translation Project
is a way to get maintainers of free software, translators, and users all
together, so that will gradually become able to speak many languages.
A few packages already provide translations for their messages.

   If you found this `ABOUT-NLS' file inside a distribution, you may
assume that the distributed package does use GNU `gettext' internally,
itself available at your nearest GNU archive site.  But you do _not_
need to install GNU `gettext' prior to configuring, installing or using
this package with messages translated.

   Installers will find here some useful hints.  These notes also
explain how users should proceed for getting the programs to use the
available translations.  They tell how people wanting to contribute and
work at translations should contact the appropriate team.

   When reporting bugs in the `intl/' directory or bugs which may be
related to internationalization, you should tell about the version of
`gettext' which is used.  The information can be found in the
`intl/VERSION' file, in internationalized packages.

Quick configuration advice
==========================

   If you want to exploit the full power of internationalization, you
should configure it using

     ./configure --with-included-gettext

to force usage of internationalizing routines provided within this
package, despite the existence of internationalizing capabilities in the
operating system where this package is being installed.  So far, only
the `gettext' implementation in the GNU C library version 2 provides as
many features (such as locale alias, message inheritance, automatic
charset conversion or plural form handling) as the implementation here.
It is also not possible to offer this additional functionality on top
of a `catgets' implementation.  Future versions of GNU `gettext' will
very likely convey even more functionality.  So it might be a good idea
to change to GNU `gettext' as soon as possible.

   So you need _not_ provide this option if you are using GNU libc 2 or
you have installed a recent copy of the GNU gettext package with the
included `libintl'.

INSTALL Matters
===============

   Some packages are "localizable" when properly installed; the
programs they contain can be made to speak your own native language.
Most such packages use GNU `gettext'.  Other packages have their own
ways to internationalization, predating GNU `gettext'.

   By default, this package will be installed to allow translation of
messages.  It will automatically detect whether the system already
provides the GNU `gettext' functions.  If not, the GNU `gettext' own
library will be used.  This library is wholly contained within this
package, usually in the `intl/' subdirectory, so prior installation of
the GNU `gettext' package is _not_ required.  Installers may use
special options at configuration time for changing the default
behaviour.  The commands:

     ./configure --with-included-gettext
     ./configure --disable-nls

will respectively bypass any pre-existing `gettext' to use the
internationalizing routines provided within this package, or else,
_totally_ disable translation of messages.

   When you already have GNU `gettext' installed on your system and run
configure without an option for your new package, `configure' will
probably detect the previously built and installed `libintl.a' file and
will decide to use this.  This might be not what is desirable.  You
should use the more recent version of the GNU `gettext' library.  I.e.
if the file `intl/VERSION' shows that the library which comes with this
package is more recent, you should use

     ./configure --with-included-gettext

to prevent auto-detection.

   The configuration process will not test for the `catgets' function
and therefore it will not be used.  The reason is that even an
emulation of `gettext' on top of `catgets' could not provide all the
extensions of the GNU `gettext' library.

   Internationalized packages have usually many `po/LL.po' files, where
LL gives an ISO 639 two-letter code identifying the language.  Unless
translations have been forbidden at `configure' time by using the
`--disable-nls' switch, all available translations are installed
together with the package.  However, the environment variable `LINGUAS'
may be set, prior to configuration, to limit the installed set.
`LINGUAS' should then contain a space separated list of two-letter
codes, stating which languages are allowed.

Using This Package
==================

   As a user, if your language has been installed for this package, you
only have to set the `LANG' environment variable to the appropriate
`LL_CC' combination.  Here `LL' is an ISO 639 two-letter language code,
and `CC' is an ISO 3166 two-letter country code.  For example, let's
suppose that you speak German and live in Germany.  At the shell
prompt, merely execute `setenv LANG de_DE' (in `csh'),
`export LANG; LANG=de_DE' (in `sh') or `export LANG=de_DE' (in `bash').
This can be done from your `.login' or `.profile' file, once and for
all.

   You might think that the country code specification is redundant.
But in fact, some languages have dialects in different countries.  For
example, `de_AT' is used for Austria, and `pt_BR' for Brazil.  The
country code serves to distinguish the dialects.

   The locale naming convention of `LL_CC', with `LL' denoting the
language and `CC' denoting the country, is the one use on systems based
on GNU libc.  On other systems, some variations of this scheme are
used, such as `LL' or `LL_CC.ENCODING'.  You can get the list of
locales supported by your system for your country by running the command
`locale -a | grep '^LL''.

   Not all programs have translations for all languages.  By default, an
English message is shown in place of a nonexistent translation.  If you
understand other languages, you can set up a priority list of languages.
This is done through a different environment variable, called
`LANGUAGE'.  GNU `gettext' gives preference to `LANGUAGE' over `LANG'
for the purpose of message handling, but you still need to have `LANG'
set to the primary language; this is required by other parts of the
system libraries.  For example, some Swedish users who would rather
read translations in German than English for when Swedish is not
available, set `LANGUAGE' to `sv:de' while leaving `LANG' to `sv_SE'.

   In the `LANGUAGE' environment variable, but not in the `LANG'
environment variable, `LL_CC' combinations can be abbreviated as `LL'
to denote the language's main dialect.  For example, `de' is equivalent
to `de_DE' (German as spoken in Germany), and `pt' to `pt_PT'
(Portuguese as spoken in Portugal) in this context.

Translating Teams
=================

   For the Free Translation Project to be a success, we need interested
people who like their own language and write it well, and who are also
able to synergize with other translators speaking the same language.
Each translation team has its own mailing list.  The up-to-date list of
teams can be found at the Free Translation Project's homepage,
`http://www.iro.umontreal.ca/contrib/po/HTML/', in the "National teams"
area.

   If you'd like to volunteer to _work_ at translating messages, you
should become a member of the translating team for your own language.
The subscribing address is _not_ the same as the list itself, it has
`-request' appended.  For example, speakers of Swedish can send a
message to `sv-...@li...', having this message body:

     subscribe

   Keep in mind that team members are expected to participate
_actively_ in translations, or at solving translational difficulties,
rather than merely lurking around.  If your team does not exist yet and
you want to start one, or if you are unsure about what to do or how to
get started, please write to `tra...@ir...' to reach the
coordinator for all translator teams.

   The English team is special.  It works at improving and uniformizing
the terminology in use.  Proven linguistic skill are praised more than
programming skill, here.

Available Packages
==================

   Languages are not equally supported in all packages.  The following
matrix shows the current state of internationalization, as of May 2003.
The matrix shows, in regard of each package, for which languages PO
files have been submitted to translation coordination, with a
translation percentage of at least 50%.

     Ready PO files       am az be bg ca cs da de el en en_GB eo es
                        +-------------------------------------------+
     a2ps               |       []          [] [] []                |
     aegis              |                      ()                   |
     anubis             |                                           |
     ap-utils           |                                           |
     bash               |                      []             [] [] |
     batchelor          |                                           |
     bfd                |                   []                   [] |
     binutils           |                   []                   [] |
     bison              |                   [] []                [] |
     bluez-pin          |                []                   []    |
     clisp              |                                           |
     clisp              |                      []    []          [] |
     coreutils          |             []    [] []                [] |
     cpio               |                   [] []                [] |
     darkstat           |                   ()                   [] |
     diffutils          |             [] [] [] [] []          [] [] |
     e2fsprogs          |                []    []                   |
     enscript           |             []    [] []        []         |
     error              |             []    [] []        []      [] |
     fetchmail          |             [] () [] [] []             [] |
     fileutils          |                   [] []                [] |
     findutils          |             []    [] [] []          [] [] |
     flex               |             []    [] []                [] |
     gas                |                                        [] |
     gawk               |             []    [] []                [] |
     gcal               |             []                            |
     gcc                |                   []                   [] |
     gettext            |       []    []    [] []                [] |
     gettext-runtime    |       []    []    [] []                [] |
     gettext-tools      |                      []                [] |
     gimp-print         |                [] [] []        []      [] |
     gliv               |                                           |
     glunarclock        |    []             [] []                   |
     gnucash            |                      ()        []         |
     gnucash-glossary   |                   [] ()                [] |
     gnupg              |             [] ()    [] []          [] [] |
     gpe-calendar       |                      []                   |
     gpe-conf           |                      []                   |
     gpe-contacts       |                      []                   |
     gpe-edit           |                                           |
     gpe-login          |                      []                   |
     gpe-ownerinfo      |                      []                   |
     gpe-sketchbook     |                      []                   |
     gpe-timesheet      |                                           |
     gpe-today          |                      []                   |
     gpe-todo           |                      []                   |
     gphoto2            |                [] [] []                [] |
     gprof              |                   []                   [] |
     gpsdrive           |                      ()    ()          () |
     grep               |          [] []       [] []             [] |
     gretl              |                                        [] |
     hello              |             []    [] [] []          [] [] |
     id-utils           |                   [] []                   |
     indent             |             []       []             [] [] |
     jpilot             |                [] [] []                [] |
     jwhois             |                                        [] |
     kbd                |                [] [] [] []             [] |
     ld                 |                   []                   [] |
     libc               |             [] [] [] [] []             [] |
     libgpewidget       |                      []                   |
     libiconv           |             []    [] []             [] [] |
     lifelines          |                   [] ()                   |
     lilypond           |                   []                      |
     lingoteach         |                                           |
     lingoteach_lessons |                      ()                () |
     lynx               |             [] [] [] []                   |
     m4                 |                [] [] [] []                |
     mailutils          |             []                         [] |
     make               |                   [] []                [] |
     man-db             |             [] () [] []                () |
     mysecretdiary      |                   [] []                [] |
     nano               |             [] () [] []                [] |
     nano_1_0           |             [] () [] []                [] |
     opcodes            |                   []                   [] |
     parted             |             [] [] [] []                [] |
     ptx                |             []    [] []             [] [] |
     python             |                                           |
     radius             |                                           |
     recode             |       []          [] [] []          [] [] |
     screem             |                                           |
     sed                |             []    [] []             [] [] |
     sh-utils           |                   [] []                [] |
     sharutils          |             [] [] [] [] []             [] |
     sketch             |                   [] ()                [] |
     soundtracker       |                   [] []                [] |
     sp                 |                      []                   |
     tar                |                [] [] []                [] |
     texinfo            |                [] [] []             []    |
     textutils          |             []    [] []                [] |
     tin                |                      ()        ()         |
     util-linux         |             [] [] [] []                [] |
     vorbis-tools       |                [] []                   [] |
     wastesedge         |                      ()                   |
     wdiff              |             []    [] []                [] |
     wget               |          [] [] [] [] [] []             [] |
     xchat              |             []          []             [] |
     xpad               |                                           |
                        +-------------------------------------------+
                          am az be bg ca cs da de el en en_GB eo es
                           0  1  4  2 31 17 54 60 14  1   4   12 56
     
                          et fa fi fr ga gl he hr hu id it ja ko
                        +----------------------------------------+
     a2ps               | []    [] []                   ()    () |
     aegis              |                                        |
     anubis             |          []                            |
     ap-utils           |          []                            |
     bash               |          []             []             |
     batchelor          |             []                         |
     bfd                |          []                      []    |
     binutils           |          []                      []    |
     bison              | []       []                [] []       |
     bluez-pin          |          [] []          [] []          |
     clisp              |                                        |
     clisp              |          []                            |
     coreutils          | []       []                   [] []    |
     cpio               |          []    []       []          [] |
     darkstat           |          () []          [] []          |
     diffutils          |       [] []    [] []    [] []    []    |
     e2fsprogs          |                                        |
     enscript           |          []          []                |
     error              |       [] [] []          []             |
     fetchmail          |                                  []    |
     fileutils          | []       []             []    [] []    |
     findutils          | []    [] [] [] []    [] [] [] [] [] [] |
     flex               |          []                         [] |
     gas                |          []                            |
     gawk               |          []       []                   |
     gcal               |          []                            |
     gcc                |          []                            |
     gettext            |          []                      [] [] |
     gettext-runtime    |          []                []    [] [] |
     gettext-tools      |                                  []    |
     gimp-print         |          []                      []    |
     gliv               |          ()                            |
     glunarclock        |             [] []       []       []    |
     gnucash            |                               []       |
     gnucash-glossary   |                               []       |
     gnupg              | []    [] []    []          [] [] []    |
     gpe-calendar       |                            []          |
     gpe-conf           |                                        |
     gpe-contacts       |          []                            |
     gpe-edit           |          []                []          |
     gpe-login          |          []                            |
     gpe-ownerinfo      |          []             [] []          |
     gpe-sketchbook     |          []                            |
     gpe-timesheet      |          [] []             []          |
     gpe-today          |          [] []                         |
     gpe-todo           |          []                []          |
     gphoto2            |          []             []       []    |
     gprof              |          []                []          |
     gpsdrive           |          ()             []    () ()    |
     grep               | []    [] [] [] [] [] [] [] [] [] []    |
     gretl              |          []                            |
     hello              | [] [] [] [] [] [] [] [] [] [] [] [] [] |
     id-utils           |          []             [] []          |
     indent             | []    [] []    []       [] [] [] []    |
     jpilot             |          []                      ()    |
     jwhois             |          []             [] [] []       |
     kbd                |          []                            |
     ld                 |          []                            |
     libc               |       [] []    []       []       [] [] |
     libgpewidget       |          [] []             []          |
     libiconv           |       [] [] [] []    [] [] [] []       |
     lifelines          |          ()                            |
     lilypond           |          []                            |
     lingoteach         |          []                []          |
     lingoteach_lessons |                                        |
     lynx               | []                      []    [] []    |
     m4                 |          []    []          []    []    |
     mailutils          |                                        |
     make               |          []    [] [] []          [] [] |
     man-db             |          []                   () ()    |
     mysecretdiary      |          []                []          |
     nano               |          []    []          [] []       |
     nano_1_0           |          []    []          [] []       |
     opcodes            |          []                []          |
     parted             |          []    []                []    |
     ptx                | []    [] [] [] []       [] []          |
     python             |                                        |
     radius             |                                        |
     recode             |          []    [] []    [] [] []       |
     screem             |                                        |
     sed                | []       [] [] []       [] [] [] []    |
     sh-utils           | []    [] []             []    [] []    |
     sharutils          | []       []    []       []       []    |
     sketch             |          []                            |
     soundtracker       |          []    []    []                |
     sp                 |          []                      ()    |
     tar                | []    [] []    []    [] [] [] [] []    |
     texinfo            |          []       [] []          []    |
     textutils          |          []    []       []       [] [] |
     tin                | []       ()                            |
     util-linux         | []    [] []             []    () []    |
     vorbis-tools       |          []                            |
     wastesedge         |          ()                            |
     wdiff              | []       []    []       [] []          |
     wget               | []    [] []    [] [] [] []       []    |
     xchat              | []       []                      []    |
     xpad               |                                        |
                        +----------------------------------------+
                          et fa fi fr ga gl he hr hu id it ja ko
                          20  1 15 73 14 24  8 10 30 31 19 31  9
     
                          lg lt lv ms nb nl nn no pl pt pt_BR ro
                        +----------------------------------------+
     a2ps               |          []    []    () () ()  []   [] |
     aegis              |                ()                      |
     anubis             |          []                         [] |
     ap-utils           |                         ()             |
     bash               |                                []      |
     batchelor          |                                        |
     bfd                |                                        |
     binutils           |                                        |
     bison              |          []    []              []   [] |
     bluez-pin          |                                     [] |
     clisp              |                                        |
     clisp              |                []                      |
     coreutils          |                         []             |
     cpio               |                []       []     []      |
     darkstat           |          []    []              []   [] |
     diffutils          |          []             []     []      |
     e2fsprogs          |                                        |
     enscript           |                []              []      |
     error              |                []              []      |
     fetchmail          |                         ()     ()      |
     fileutils          |                         []             |
     findutils          |                []       []     []   [] |
     flex               |                                []      |
     gas                |                                        |
     gawk               |                                []      |
     gcal               |                                        |
     gcc                |                                        |
     gettext            |                         []             |
     gettext-runtime    |                         []             |
     gettext-tools      |                                        |
     gimp-print         |                []                      |
     gliv               |                                []      |
     glunarclock        |          []                            |
     gnucash            |                                        |
     gnucash-glossary   |                []          []          |
     gnupg              |                                        |
     gpe-calendar       |                            []       [] |
     gpe-conf           |                            []       [] |
     gpe-contacts       |                            []          |
     gpe-edit           |                            []       [] |
     gpe-login          |                            []       [] |
     gpe-ownerinfo      |                            []       [] |
     gpe-sketchbook     |                            []       [] |
     gpe-timesheet      |                            []       [] |
     gpe-today          |                            []       [] |
     gpe-todo           |                            []       [] |
     gphoto2            |                                        |
     gprof              |                                []      |
     gpsdrive           |                ()    ()        ()      |
     grep               |                         [] []  []   [] |
     gretl              |                                        |
     hello              |       [] [] [] [] [] [] []     []   [] |
     id-utils           |                []              []   [] |
     indent             |                []              []   [] |
     jpilot             |                ()    ()                |
     jwhois             |                []              []   [] |
     kbd                |                                        |
     ld                 |                                        |
     libc               |             []       [] []     []      |
     libgpewidget       |                            []       [] |
     libiconv           |                                []   [] |
     lifelines          |                                        |
     lilypond           |                []                      |
     lingoteach         |                                        |
     lingoteach_lessons |                                        |
     lynx               |                []              []      |
     m4                 |                []       []     []   [] |
     mailutils          |                                        |
     make               |                []              []      |
     man-db             |                                []      |
     mysecretdiary      |                                []      |
     nano               |          []    []       []          [] |
     nano_1_0           |          [] []    []    []             |
     opcodes            |                []              []   [] |
     parted             |                   []       []  []      |
     ptx                |             [] []    [] [] []  []   [] |
     python             |                                        |
     radius             |                                        |
     recode             |                         []     []   [] |
     screem             |                                        |
     sed                |                                []   [] |
     sh-utils           |             []                         |
     sharutils          |                []                      |
     sketch             |                                []      |
     soundtracker       |                                        |
     sp                 |                                        |
     tar                |          [] []       [] []     []   [] |
     texinfo            |                                     [] |
     textutils          |             []                         |
     tin                |                                        |
     util-linux         |                []              []      |
     vorbis-tools       |                []                   [] |
     wastesedge         |                                        |
     wdiff              |          []             []     []   [] |
     wget               |                []       []          [] |
     xchat              |       []       []                      |
     xpad               |                                     [] |
                        +----------------------------------------+
                          lg lt lv ms nb nl nn no pl pt pt_BR ro
                           0  0  2 11  7 26  3  4 18 15  34   34
     
                          ru sk sl sr sv ta tr uk vi wa zh_CN zh_TW
                        +-------------------------------------------+
     a2ps               | []    []    []    [] []                   | 16
     aegis              | ()                                        |  0
     anubis             |                   [] []                   |  5
     ap-utils           |                      ()                   |  1
     bash               | []                                        |  7
     batchelor          |                                           |  1
     bfd                |             []    []           []         |  7
     binutils           |             []    []           []         |  7
     bison              | []          []                            | 13
     bluez-pin          |                                           |  7
     clisp              |                                           |  0
     clisp              |                                           |  5
     coreutils          | []    []    []    []                 []   | 14
     cpio               | []          []                 []         | 13
     darkstat           |             []                 ()    ()   |  9
     diffutils          | []          []    []                 []   | 21
     e2fsprogs          |                   []                      |  3
     enscript           | []          []    []                      | 11
     error              |    []             []                 []   | 14
     fetchmail          |                   []                      |  7
     fileutils          | []    []    []    []           []    []   | 15
     findutils          | [] [] []    []    []           []         | 27
     flex               | []          []    []                      | 10
     gas                |                   []                      |  3
     gawk               |             []    []                      |  9
     gcal               |             []    []                      |  4
     gcc                |                   []                      |  4
     gettext            | [] [] []    []    []                 []   | 15
     gettext-runtime    | [] [] []    []    []                 []   | 16
     gettext-tools      |    [] []                                  |  5
     gimp-print         |    []       []                            | 10
     gliv               |                                           |  1
     glunarclock        | []          []             []             | 11
     gnucash            |    []                                []   |  4
     gnucash-glossary   |    []       []                       []   |  8
     gnupg              |    []       []    []                 []   | 16
     gpe-calendar       |                                      []   |  5
     gpe-conf           |                                           |  3
     gpe-contacts       |                                      []   |  4
     gpe-edit           |                                      []   |  5
     gpe-login          |                                      []   |  5
     gpe-ownerinfo      |                                      []   |  7
     gpe-sketchbook     |                                      []   |  5
     gpe-timesheet      |                                      []   |  6
     gpe-today          |                                      []   |  6
     gpe-todo           |                                      []   |  6
     gphoto2            |             []                 []         |  9
     gprof              |             []    []                      |  7
     gpsdrive           |    []       []                            |  3
     grep               | []    []          [] []                   | 24
     gretl              |                                           |  2
     hello              | [] []       []    [] []                   | 33
     id-utils           | []          []    []                      | 11
     indent             | [] []       []    []                      | 19
     jpilot             |             []    []    []     []    []   | 10
     jwhois             | ()          ()    []                 []   | 10
     kbd                |             []    []                      |  8
     ld                 |             []    []                      |  5
     libc               |    []       []    []           []         | 20
     libgpewidget       |                                           |  6
     libiconv           | [] [] []    []    [] []                   | 21
     lifelines          |             []                            |  2
     lilypond           |             []                            |  4
     lingoteach         |                                           |  2
     lingoteach_lessons |                                ()         |  0
     lynx               | []          []    [] []                   | 14
     m4                 | []          []                 []         | 15
     mailutils          |                                           |  2
     make               | []          []    []           []         | 15
     man-db             |             []                            |  6
     mysecretdiary      |             []    []                      |  8
     nano               | []          []       []                   | 15
     nano_1_0           | []          []       []                   | 15
     opcodes            |             []    []                      |  9
     parted             |             []    []                      | 13
     ptx                | []          []    []                      | 22
     python             |                                           |  0
     radius             |                                           |  0
     recode             | []    []    []    []                      | 19
     screem             |             []                            |  1
     sed                |    [] []    []    [] []                   | 20
     sh-utils           | []    []          []                      | 13
     sharutils          | []          []    []                 []   | 16
     sketch             |             []                            |  5
     soundtracker       |             []                            |  7
     sp                 |                   []                      |  3
     tar                |    [] []    []    []           []         | 24
     texinfo            | []          []    []           []         | 13
     textutils          | []    []    []    []                 []   | 15
     tin                |                                           |  1
     util-linux         |             []    []                      | 14
     vorbis-tools       | []                                        |  7
     wastesedge         |                                           |  0
     wdiff              | [] []       []    []                      | 17
     wget               | [] [] []    []    [] []              []   | 25
     xchat              |    [] []    []                            | 11
     xpad               |                                           |  1
                        +-------------------------------------------+
       50 teams           ru sk sl sr sv ta tr uk vi wa zh_CN zh_TW
       97 domains         32 19 16  0 56  0 48 10  1  1  12    23    913

   Some counters in the preceding matrix are higher than the number of
visible blocks let us expect.  This is because a few extra PO files are
used for implementing regional variants of languages, or language
dialects.

   For a PO file in the matrix above to be effective, the package to
which it applies should also have been internationalized and
distributed as such by its maintainer.  There might be an observable
lag between the mere existence a PO file and its wide availability in a
distribution.

   If May 2003 seems to be old, you may fetch a more recent copy of
this `ABOUT-NLS' file on most GNU archive sites.  The most up-to-date
matrix with full percentage details can be found at
`http://www.iro.umontreal.ca/contrib/po/HTML/matrix.html'.

Using `gettext' in new packages
===============================

   If you are writing a freely available program and want to
internationalize it you are welcome to use GNU `gettext' in your
package.  Of course you have to respect the GNU Library General Public
License which covers the use of the GNU `gettext' library.  This means
in particular that even non-free programs can use `libintl' as a shared
library, whereas only free software can use `libintl' as a static
library or use modified versions of `libintl'.

   Once the sources are changed appropriately and the setup can handle
the use of `gettext' the only thing missing are the translations.  The
Free Translation Project is also available for packages which are not
developed inside the GNU project.  Therefore the information given above
applies also for every other Free Software Project.  Contact
`tra...@ir...' to make the `.pot' files available to
the translation teams.

[Super-tux-commit] supertux/intl .cvsignore,NONE,1.1

[Matze B. <mat...@us...>]

Update of /cvsroot/super-tux/supertux/intl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7981/intl

Added Files:
	.cvsignore 
Log Message:
hopefully fixed all configure problems now

--- NEW FILE: .cvsignore ---
Makefile

[Super-tux-commit] supertux/po .cvsignore,NONE,1.1

[Matze B. <mat...@us...>]

Update of /cvsroot/super-tux/supertux/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7981/po

Added Files:
	.cvsignore 
Log Message:
hopefully fixed all configure problems now

--- NEW FILE: .cvsignore ---
Makefile
Makefile.in
POTFILES
*.gmo
stamp-po

[Super-tux-commit] supertux/data .cvsignore,NONE,1.1

[Matze B. <mat...@us...>]

Update of /cvsroot/super-tux/supertux/data
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7981/data

Added Files:
	.cvsignore 
Log Message:
hopefully fixed all configure problems now

--- NEW FILE: .cvsignore ---
Makefile
Makefile.in

[Super-tux-commit] supertux .cvsignore,NONE,1.1 ChangeLog,1.6,1.7 autogen.sh,1.6,1.7 Makefile.am,1.5,1.6

[Matze B. <mat...@us...>]

Update of /cvsroot/super-tux/supertux
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7981

Modified Files:
	ChangeLog autogen.sh Makefile.am 
Added Files:
	.cvsignore 
Log Message:
hopefully fixed all configure problems now

--- NEW FILE: .cvsignore ---
Makefile.in
aclocal.m4
config.log
config.status
config.guess
config.rpath
config.sub
configure
depcomp
install-sh
missing
mkinstalldirs


Index: Makefile.am
===================================================================
RCS file: /cvsroot/super-tux/supertux/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile.am	2 May 2004 23:22:28 -0000	1.5
+++ Makefile.am	3 Jun 2004 11:27:19 -0000	1.6
@@ -1,5 +1,3 @@
-SUBDIRS = src data
-
-EXTRA_DIST = LEVELDESIGN TODO contrib/levelconverter-0.0.6_0.0.7.py $(wildcard mk/autoconf/*.m4) autogen.sh
-
-# EOF #
+SUBDIRS = intl m4 src data po
+EXTRA_DIST = config.rpath mkinstalldirs  config.rpath mkinstalldirs  config.rpath  config.rpath  LEVELDESIGN TODO contrib/levelconverter-0.0.6_0.0.7.py autogen.sh
+ACLOCAL_AMFLAGS = -I m4

Index: autogen.sh
===================================================================
RCS file: /cvsroot/super-tux/supertux/autogen.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- autogen.sh	30 Apr 2004 14:31:02 -0000	1.6
+++ autogen.sh	3 Jun 2004 11:27:19 -0000	1.7
@@ -3,7 +3,7 @@
 # we need a minimum of automake 1.6 and automake 1.8 seems to be buggy
 export WANT_AUTOMAKE=1.6
 
-aclocal -I mk/autoconf
+aclocal -I m4
 automake --copy --add-missing
 autoconf
 

Index: ChangeLog
===================================================================
RCS file: /cvsroot/super-tux/supertux/ChangeLog,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- ChangeLog	10 May 2004 22:55:16 -0000	1.6
+++ ChangeLog	3 Jun 2004 11:27:19 -0000	1.7
@@ -1,3 +1,24 @@
+2004-06-02  gettextize  <bug...@gn...>
+
+	* Makefile.am (SUBDIRS): Add intl,
+	(EXTRA_DIST): Add config.rpath mkinstalldirs.
+	* configure.ac (AC_OUTPUT): Add intl/Makefile,
+
+2004-06-02  gettextize  <bug...@gn...>
+
+	* Makefile.am (EXTRA_DIST): Add config.rpath mkinstalldirs.
+
+2004-06-02  gettextize  <bug...@gn...>
+
+	* Makefile.am (EXTRA_DIST): Add config.rpath.
+
+2004-06-02  gettextize  <bug...@gn...>
+
+	* Makefile.am (SUBDIRS): Add m4.
+	(ACLOCAL_AMFLAGS): New variable.
+	(EXTRA_DIST): Add config.rpath.
+	* configure.ac (AC_OUTPUT): Add po/Makefile.in,
+
 - SuperTux changes -
 http://super-tux.sf.net/
 

[Super-tux-commit] supertux/m4 .cvsignore,NONE,1.1

[Matze B. <mat...@us...>]

Update of /cvsroot/super-tux/supertux/m4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7981/m4

Added Files:
	.cvsignore 
Log Message:
hopefully fixed all configure problems now

--- NEW FILE: .cvsignore ---
Makefile
Makefile.in

[Super-tux-commit] supertux/src .cvsignore,NONE,1.1

[Matze B. <mat...@us...>]

Update of /cvsroot/super-tux/supertux/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7981/src

Added Files:
	.cvsignore 
Log Message:
hopefully fixed all configure problems now

--- NEW FILE: .cvsignore ---
.deps
Makefile
Makefile.in
supertux
supertux.exe