- hromada preklapeni na gettext

- zbyva odstranit language funkci
- pak uz zbyva pouze rozchodit uplne gettext a vyrobit preklady


git-svn-id: http://opensvn.csie.org/tuxanci_ng@222 0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e

8 files changed, 52 insertions, 50 deletions

diff --git a/src/screen/screen_browser.c b/src/screen/screen_browser.c
index ae4a7d5..fe23d09 100644
--- a/src/screen/screen_browser.c
+++ b/src/screen/screen_browser.c
@@ -678,16 +678,16 @@ void initScreenBrowser()
 	image = getImage(IMAGE_GROUP_BASE, "screen_main");
 	image_backgorund  = newWidgetImage(0, 0, image);
 
-	button_back = newWidgetButton(getMyText("BACK"), 100, WINDOW_SIZE_Y-100, eventWidget);
-	button_play = newWidgetButton(getMyText("PLAY"), WINDOW_SIZE_X-200, WINDOW_SIZE_Y-100, eventWidget);
-	button_refresh = newWidgetButton(getMyText("REFRESH"), WINDOW_SIZE_X/2-50, WINDOW_SIZE_Y-100, eventWidget);
-
-	label_server = newWidgetLabel(getMyText("SERVER"), 120, 145, WIDGET_LABEL_LEFT);
-	label_version = newWidgetLabel(getMyText("VERSION"), 290, 145, WIDGET_LABEL_LEFT);
-	label_address = newWidgetLabel(getMyText("ADDRESS"), 400, 145, WIDGET_LABEL_LEFT);
-	label_arena = newWidgetLabel(getMyText("ARENA"), 550, 145, WIDGET_LABEL_LEFT);
-	label_players = newWidgetLabel(getMyText("CLIENTS"), 645, 145, WIDGET_LABEL_LEFT);
-	label_ping = newWidgetLabel(getMyText("PING"), 720, 145, WIDGET_LABEL_LEFT);
+	button_back = newWidgetButton(_("back"), 100, WINDOW_SIZE_Y-100, eventWidget);
+	button_play = newWidgetButton(_("Play"), WINDOW_SIZE_X-200, WINDOW_SIZE_Y-100, eventWidget);
+	button_refresh = newWidgetButton(_("Refresh"), WINDOW_SIZE_X/2-50, WINDOW_SIZE_Y-100, eventWidget);
+
+	label_server = newWidgetLabel(_("server"), 120, 145, WIDGET_LABEL_LEFT);
+	label_version = newWidgetLabel(_("version"), 290, 145, WIDGET_LABEL_LEFT);
+	label_address = newWidgetLabel(_("IP"), 400, 145, WIDGET_LABEL_LEFT);
+	label_arena = newWidgetLabel(_("arena"), 550, 145, WIDGET_LABEL_LEFT);
+	label_players = newWidgetLabel(_("clients"), 645, 145, WIDGET_LABEL_LEFT);
+	label_ping = newWidgetLabel(_("ping"), 720, 145, WIDGET_LABEL_LEFT);
 
 	select_server = newWidgetSelect(50, label_server->y+40, eventWidget);
 
diff --git a/src/screen/screen_choiceArena.c b/src/screen/screen_choiceArena.c
index 336a9aa..1adb04d 100644
--- a/src/screen/screen_choiceArena.c
+++ b/src/screen/screen_choiceArena.c
@@ -140,8 +140,8 @@ void initScreenChoiceArena()
 	image = getImage(IMAGE_GROUP_BASE, "screen_main");
 	image_backgorund  = newWidgetImage(0, 0, image);
 
-	button_back = newWidgetButton(getMyText("BACK"), 100, WINDOW_SIZE_Y-100, eventWidget);
-	button_play = newWidgetButton(getMyText("PLAY"), WINDOW_SIZE_X-200, WINDOW_SIZE_Y-100, eventWidget);
+	button_back = newWidgetButton(_("back"), 100, WINDOW_SIZE_Y-100, eventWidget);
+	button_play = newWidgetButton(_("play"), WINDOW_SIZE_X-200, WINDOW_SIZE_Y-100, eventWidget);
 	
 	listWidgetButtonimage = newList();
 	choiceArenaId = 0;
diff --git a/src/screen/screen_credits.c b/src/screen/screen_credits.c
index 37f16ea..27ba838 100644
--- a/src/screen/screen_credits.c
+++ b/src/screen/screen_credits.c
@@ -103,7 +103,7 @@ void initScreenCredits()
 	image = getImage(IMAGE_GROUP_BASE, "screen_main");
 	image_backgorund  = newWidgetImage(0, 0, image);
 
-	button_back = newWidgetButton(getMyText("BACK"), WINDOW_SIZE_X/2 -WIDGET_BUTTON_WIDTH/2, WINDOW_SIZE_Y-80, eventWidget);
+	button_back = newWidgetButton(_("back"), WINDOW_SIZE_X/2 -WIDGET_BUTTON_WIDTH/2, WINDOW_SIZE_Y-80, eventWidget);
 
 	listWidgetLabel = newList();
 
@@ -129,7 +129,7 @@ void initScreenCredits()
 			creditExists = 0;
 			widget_t *label;
 			char *line;
-			line = "Credit file not found... %s/%s",PATH_DOC,SCREEN_CREDITS_FILE;
+			line = _("Credit file not found... %s/%s"),PATH_DOC,SCREEN_CREDITS_FILE;
 			label = newWidgetLabel(line, WINDOW_SIZE_X/2, (WINDOW_SIZE_Y-100)+i*20,
 				WIDGET_LABEL_CENTER);
 
diff --git a/src/screen/screen_gameType.c b/src/screen/screen_gameType.c
index 7dab4e4..71420d8 100644
--- a/src/screen/screen_gameType.c
+++ b/src/screen/screen_gameType.c
@@ -229,9 +229,9 @@ void initScreenGameType()
 	image = getImage(IMAGE_GROUP_BASE, "screen_main");
 	image_backgorund  = newWidgetImage(0, 0, image);
 
-	button_back = newWidgetButton(getMyText("BACK"), 100, WINDOW_SIZE_Y-100, eventWidget);
-	button_play = newWidgetButton(getMyText("PLAY"), WINDOW_SIZE_X-200, WINDOW_SIZE_Y-100, eventWidget);
-	button_browser = newWidgetButton(getMyText("BROWSER"), 300, 345, eventWidget);
+	button_back = newWidgetButton(_("back"), 100, WINDOW_SIZE_Y-100, eventWidget);
+	button_play = newWidgetButton(_("play"), WINDOW_SIZE_X-200, WINDOW_SIZE_Y-100, eventWidget);
+	button_browser = newWidgetButton(_("browser"), 300, 345, eventWidget);
 
 	listChoiceGroup = newList();
 	check_none = newWidgetChoicegroup(100, 150, FALSE, listChoiceGroup, eventWidget);
@@ -252,13 +252,13 @@ void initScreenGameType()
 		setWidgetChoiceStatus(check_none, TRUE);
 	}
 
-	label_none = newWidgetLabel(getMyText("NONE"), 130, 145, WIDGET_LABEL_LEFT);
-	label_server = newWidgetLabel(getMyText("SERVER"), 130, 195, WIDGET_LABEL_LEFT);
-	label_client = newWidgetLabel(getMyText("CLIENT"), 130, 245, WIDGET_LABEL_LEFT);
+	label_none = newWidgetLabel(_("Local game"), 130, 145, WIDGET_LABEL_LEFT);
+	label_server = newWidgetLabel(_("Set up a server"), 130, 195, WIDGET_LABEL_LEFT);
+	label_client = newWidgetLabel(_("Network game"), 130, 245, WIDGET_LABEL_LEFT);
 	label_load_session = newWidgetLabel("load session", 130, 295, WIDGET_LABEL_LEFT);
 
-	label_ip = newWidgetLabel(getMyText("IP_ADDR"), 300, 145, WIDGET_LABEL_LEFT);
-	label_port = newWidgetLabel(getMyText("NET_PORT"), 300, 245, WIDGET_LABEL_LEFT);
+	label_ip = newWidgetLabel(_("IP"), 300, 145, WIDGET_LABEL_LEFT);
+	label_port = newWidgetLabel(_("port"), 300, 245, WIDGET_LABEL_LEFT);
 	label_session = newWidgetLabel("load session :", 300, 145, WIDGET_LABEL_LEFT);
 
 	textfield_ip = newWidgetTextfield(
@@ -318,7 +318,7 @@ int getSettingGameType()
 		return NET_GAME_TYPE_CLIENT;
 	}
 
-	assert( ! "Chyba pri zistvani type  hry !" );
+	assert( ! _("Unknown game type!") );
 
 	return -1;
 }
@@ -374,8 +374,9 @@ int getSettingProto()
 	{
 		return PROTO_UDPv6;
 	}
-
-	printf("IP protokol unknown !\n");
+#ifdef DEBUG
+	printf(_("Unknown IP protocol!\n"));
+#endif
 	return -1;
 }
 
diff --git a/src/screen/screen_mainMenu.c b/src/screen/screen_mainMenu.c
index 8c6e656..e5cae8f 100644
--- a/src/screen/screen_mainMenu.c
+++ b/src/screen/screen_mainMenu.c
@@ -102,11 +102,11 @@ void initScreenMainMenu()
 	image = addImageData("screen_main.png", IMAGE_NO_ALPHA, "screen_main", IMAGE_GROUP_BASE);
 	image_backgorund  = newWidgetImage(0, 0, image);
 
-	button_play = newWidgetButton(getMyText("PLAY"), WINDOW_SIZE_X/2 -WIDGET_BUTTON_WIDTH/2, 200, eventWidget);
-	button_setting = newWidgetButton(getMyText("SETTING"), WINDOW_SIZE_X/2 -WIDGET_BUTTON_WIDTH/2, 250, eventWidget);
-	button_table = newWidgetButton(getMyText("TABLE"), WINDOW_SIZE_X/2 -WIDGET_BUTTON_WIDTH/2, 300, eventWidget);
-	button_credits = newWidgetButton(getMyText("CREDITS"), WINDOW_SIZE_X/2 -WIDGET_BUTTON_WIDTH/2, 350, eventWidget);
-	button_end = newWidgetButton(getMyText("END"), WINDOW_SIZE_X/2 -WIDGET_BUTTON_WIDTH/2, 400, eventWidget);
+	button_play = newWidgetButton(_("Start game"), WINDOW_SIZE_X/2 -WIDGET_BUTTON_WIDTH/2, 200, eventWidget);
+	button_setting = newWidgetButton(_("Settings"), WINDOW_SIZE_X/2 -WIDGET_BUTTON_WIDTH/2, 250, eventWidget);
+	button_table = newWidgetButton(_("Highscore"), WINDOW_SIZE_X/2 -WIDGET_BUTTON_WIDTH/2, 300, eventWidget);
+	button_credits = newWidgetButton(_("Credits"), WINDOW_SIZE_X/2 -WIDGET_BUTTON_WIDTH/2, 350, eventWidget);
+	button_end = newWidgetButton(_("Quit game"), WINDOW_SIZE_X/2 -WIDGET_BUTTON_WIDTH/2, 400, eventWidget);
 
 #ifndef NO_SOUND
 	addMusic("menu.ogg", "menu", MUSIC_GROUP_BASE);
diff --git a/src/screen/screen_setting.c b/src/screen/screen_setting.c
index 1f77d2a..46ea84a 100644
--- a/src/screen/screen_setting.c
+++ b/src/screen/screen_setting.c
@@ -223,15 +223,15 @@ static void initSettingFile()
 
 	if( configFile == NULL )
 	{
-		fprintf(stderr, "Don't load %s\n", path);
-		fprintf(stderr, "I create %s\n", path);
+		fprintf(stderr, _("I am unable to load: \"%s\" !\n"), path);
+		fprintf(stderr, _("Creating: \"%s\"\n"), path);
 
 		configFile = newTextFile(path);
 	}
 
 	if( configFile == NULL )
 	{
-		fprintf(stderr, "Don't create %s\n", path);
+		fprintf(stderr, _("I was unable to create: \"%s\" !\n"), path);
 		return;
 	}
 
@@ -291,8 +291,7 @@ static void saveAndDestroyConfigFile()
 {
 	if( configFile == NULL )
 	{
-		fprintf(stderr, "i can't save configure, "
-			"because config file not created !\n");
+		fprintf(stderr, _("I am unable to save configure file, because config file was not initialised!\n"));
 
 		return;
 	}
@@ -336,14 +335,14 @@ void initScreenSetting()
 	image = getImage(IMAGE_GROUP_BASE, "screen_main");
 	image_backgorund  = newWidgetImage(0, 0, image);
 
-	button_back = newWidgetButton(getMyText("BACK"), WINDOW_SIZE_X - 200, WINDOW_SIZE_Y - 100, eventWidget);
-	button_keys = newWidgetButton(getMyText("CONTROLS"), WINDOW_SIZE_X - 200, button_back->y - WIDGET_BUTTON_HEIGHT - 10, eventWidget);
+	button_back = newWidgetButton(_("back"), WINDOW_SIZE_X - 200, WINDOW_SIZE_Y - 100, eventWidget);
+	button_keys = newWidgetButton(_("controls"), WINDOW_SIZE_X - 200, button_back->y - WIDGET_BUTTON_HEIGHT - 10, eventWidget);
 
 #ifndef NO_SOUND
-	label_music = newWidgetLabel(getMyText("MUSIC"), 100, WINDOW_SIZE_Y-85, WIDGET_LABEL_LEFT);
+	label_music = newWidgetLabel(_("Music:"), 100, WINDOW_SIZE_Y-85, WIDGET_LABEL_LEFT);
 	check_music = newWidgetCheck(label_music->x + label_music->w  + 10,
 		WINDOW_SIZE_Y-80, isMusicActive() , eventWidget);
-	label_sound = newWidgetLabel(getMyText("SOUND"), check_music->x + WIDGET_CHECK_WIDTH + 10,
+	label_sound = newWidgetLabel(_("Sound:"), check_music->x + WIDGET_CHECK_WIDTH + 10,
 		WINDOW_SIZE_Y-85, WIDGET_LABEL_LEFT);
 	check_sound = newWidgetCheck(label_sound->x + label_sound->w + 10,
 		WINDOW_SIZE_Y-80, isSoundActive() , eventWidget);
@@ -354,9 +353,9 @@ void initScreenSetting()
 
 	check_ai = newWidgetCheck(label_ai->x + label_ai->w + 10, WINDOW_SIZE_Y-80, FALSE, eventWidget);
 
-	label_count_round = newWidgetLabel(getMyText("COUNT_ROUND"), 100, WINDOW_SIZE_Y-200, WIDGET_LABEL_LEFT);
-	label_name_player1 = newWidgetLabel(getMyText("NAME_PLAYER1"), 100, WINDOW_SIZE_Y-160, WIDGET_LABEL_LEFT);
-	label_name_player2 = newWidgetLabel(getMyText("NAME_PLAYER2"), 100, WINDOW_SIZE_Y-120, WIDGET_LABEL_LEFT);
+	label_count_round = newWidgetLabel(_("No. of rounds:"), 100, WINDOW_SIZE_Y-200, WIDGET_LABEL_LEFT);
+	label_name_player1 = newWidgetLabel(_("Player 1:"), 100, WINDOW_SIZE_Y-160, WIDGET_LABEL_LEFT);
+	label_name_player2 = newWidgetLabel(_("Player 2:"), 100, WINDOW_SIZE_Y-120, WIDGET_LABEL_LEFT);
 
 	textfield_count_cound = newWidgetTextfield(
 		getParamElse("--count", "15"),
diff --git a/src/screen/screen_table.c b/src/screen/screen_table.c
index 3c26c0a..fa8e738 100644
--- a/src/screen/screen_table.c
+++ b/src/screen/screen_table.c
@@ -96,7 +96,7 @@ static void setWidgetLabel()
 
 	if( textFile == NULL )
 	{
-		fprintf(stderr, "File %s not loaded !",
+		fprintf(stderr, _("Highscore file: \"%s\" was not loaded!"),
 			SCREEN_TABLE_FILE_HIGHSCORE_NAME);
 		
 		return;
@@ -149,8 +149,8 @@ static void loadHighscoreFile()
 
 	if( textFile == NULL )
 	{
-		fprintf(stderr, "I can't load %s !\n", path);
-		fprintf(stderr, "I create %s\n", path);
+		fprintf(stderr, _("I am unable to load: \"%s\" !\n"), path);
+		fprintf(stderr, _("Creating: \"%s\"\n"), path);
 		textFile = newTextFile(path);
 	}
 	else
@@ -160,7 +160,7 @@ static void loadHighscoreFile()
 
 	if( textFile == NULL )
 	{
-		fprintf(stderr, "I can't create %s !\n", path);
+		fprintf(stderr, _("I was unable to create: \"%s\" !\n"), path);
 		return;
 	}
 
@@ -208,7 +208,7 @@ void initScreenTable()
 	image = addImageData("screen_table.png", IMAGE_NO_ALPHA, "screen_table", IMAGE_GROUP_BASE);
 	image_backgorund  = newWidgetImage(0, 0, image);
 
-	button_back = newWidgetButton(getMyText("BACK"), WINDOW_SIZE_X/2 -WIDGET_BUTTON_WIDTH/2,
+	button_back = newWidgetButton(_("back"), WINDOW_SIZE_X/2 -WIDGET_BUTTON_WIDTH/2,
 		WINDOW_SIZE_Y-100, eventWidget);
 
 	loadHighscoreFile();
diff --git a/src/screen/screen_world.c b/src/screen/screen_world.c
index 4229556..cbfca38 100644
--- a/src/screen/screen_world.c
+++ b/src/screen/screen_world.c
@@ -64,7 +64,7 @@ void setGameType()
 
 	if( ret != 0 )
 	{
-		fprintf(stderr, "Chyba inicalizacie sieti !\n");
+		fprintf(stderr, _("Network initialization error!\n"));
 		setWorldEnd();
 	}
 }
@@ -432,7 +432,7 @@ void tuxControl(tux_t *p)
 	switch( p->control )
 	{
 		case TUX_CONTROL_NONE :
-			assert( ! "Tux nema definovane ovladanie !" );
+			assert( ! _("Tux has not defined controls!") );
 		break;
 
 		case TUX_CONTROL_KEYBOARD_LEFT :
@@ -616,6 +616,8 @@ void initWorld()
 
 void quitWorld()
 {
-	printf("quit world\n");
+#ifdef DEBUG
+	printf(_("Quitting screen world\n"));
+#endif
 	isScreenWorldInit = FALSE;
 }