Merge branch 'master' of ssh://oroborus@repo.or.cz/srv/git/tuxanci

10 files changed, 1382 insertions, 1341 deletions

diff --git a/data/tuxanci.desktop.in b/data/tuxanci.desktop.in
index b0d265c..c09adfe 100644
--- a/data/tuxanci.desktop.in
+++ b/data/tuxanci.desktop.in
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Name=tuxanci
 Comment=Tuxanci first tux shooter inspired by game Bulanci.
-Exec=tuxanci-@TUXANCI_VERSION@
+Exec=tuxanci
 Terminal=false
 Type=Application
 Icon=tuxanci
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index edc0f64..9bb1c4a 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tuxanci\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-30 00:30+0100\n"
+"POT-Creation-Date: 2008-11-30 23:26+0100\n"
 "PO-Revision-Date: 2008-10-25 11:55+0100\n"
 "Last-Translator: xHire <xhire@tuxportal.cz>\n"
 "Language-Team: \n"
@@ -15,228 +15,122 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/client/client.c:99
-#, c-format
-msgid "Connected to: %s on port: %d via UDP\n"
-msgstr "Připojeno k: %s na portu %d přes UDP\n"
-
-#: src/client/client.c:136
-#, c-format
-msgid "Server did not respond!\n"
-msgstr "Server neodpověděl!\n"
-
-#: src/client/client.c:137
-msgid "Server is not running or being blocked. I was unable to connect."
-msgstr "Server neběží, nebo je blokován. Nemohl jsem se připojit."
-
-#: src/client/client.c:151 src/base/server.c:277
-#, c-format
-msgid "Sending: \"%s\""
-msgstr "Posílám: \"%s\""
-
-#: src/client/client.c:224 src/base/server.c:304
-#, c-format
-msgid "Recieved: \"%s\""
-msgstr "Přijato: \"%s\""
-
-#: src/client/client.c:316
-#, c-format
-msgid "down: %d\n"
-msgstr "dolů: %d\n"
-
-#: src/client/client.c:316
-#, c-format
-msgid "up  : %d\n"
-msgstr "nahoru  : %d\n"
-
-#: src/client/client.c:342
-msgid "Closing UDP connection.\n"
-msgstr "Zavírám UDP spojení.\n"
-
-#: src/client/interface.c:70
-#, c-format
-msgid "Unable to switch to FULLSCREEN mode!\n"
-msgstr "Nemohu přepnout do režimu celé obrazovky!\n"
-
-#: src/client/interface.c:76
-#, c-format
-msgid "Unable to switch to WINDOW mode! Error: %s\n"
-msgstr "Nemohu se přepnout do okenního režimu! Chyba: %s\n"
-
-#: src/client/interface.c:122
-msgid "Initializing SDL system\n"
-msgstr "Inicializuji SDL systém\n"
-
-#: src/client/interface.c:212
-#, c-format
-msgid "Pressed key with SDL value: %d\n"
-msgstr "Stisknuta klávesa s SDL hodnotou: %d\n"
-
-#: src/client/interface.c:303
-#, c-format
-msgid "Unable to change WINDOW resolution! Error: %s\n"
-msgstr "Nemohu změnit rozlišení! Chyba: %s\n"
-
-#: src/client/interface.c:332
-msgid "Quitting SDL\n"
-msgstr "Končím SDL\n"
-
-#: src/client/configFile.c:144
-#, c-format
-msgid "ADDING: \"%s\" into config file.\n"
-msgstr "PŘIDÁVÁM: \"%s\" do konfiguračního souboru.\n"
-
-#: src/client/image.c:29
-msgid "Initializing image database\n"
-msgstr "Inicializuji databázi obrázků\n"
+#: src/audio/audio.c:30
+#, fuzzy, c-format
+msgid "Error! Unable to initialize audio: %s\n"
+msgstr "Nemohu inicializovat zvuk: %s\n"
 
-#: src/client/image.c:189
+#: src/audio/audio.c:36
 #, c-format
-msgid "Loading image %s\n"
-msgstr "Nahrávám obrázek %s\n"
-
-#: src/client/image.c:296
-msgid "Quitting image database\n"
-msgstr "Zavírám databázi obrázků\n"
+msgid "Unable to create proper audio settings: %s\n"
+msgstr "Nemohu správně nastavit zvuk: %s\n"
 
-#: src/client/font.c:39
-#, c-format
-msgid "Loading font: \"%s\"\n"
-msgstr "Nahrávám písmo: \"%s\"\n"
+#: src/audio/audio.c:44
+#, fuzzy
+msgid "Initializing audio\n"
+msgstr "Zapínám zvukový systém...\n"
 
-#: src/client/font.c:131
-msgid "Unloading font\n"
-msgstr "Uvolňuji font\n"
+#: src/audio/audio.c:57
+#, fuzzy
+msgid "Quitting audio\n"
+msgstr "Vypínám zvuk...\n"
 
-#: src/client/keyboardBuffer.c:69
-#, c-format
-msgid "Keyboard Buffer overrun! Dropping key: %02x\n"
-msgstr "Přetečení bufferu klávesnice! Zahazuji klávesu: %02x\n"
+#: src/audio/music.c:48
+#, fuzzy
+msgid "Initializing music\n"
+msgstr "Zapínám hudbu...\n"
 
-#: src/client/keyboardBuffer.c:94
-#, c-format
-msgid "Keyboard Buffer underrun!\n"
-msgstr "Podtečení bufferu klávesnice!\n"
+#: src/audio/music.c:59
+#, fuzzy, c-format
+msgid "Loading a file with music: %s\n"
+msgstr "Nahrávám map file: %s\n"
 
-#: src/client/keyboardBuffer.c:145
-#, c-format
-msgid "Keyboard buffer is not empty!\n"
-msgstr "Buffer klávesnice není prázdný!\n"
+#: src/audio/music.c:72
+#, fuzzy, c-format
+msgid "Unable to load music from file %s\n"
+msgstr "Nemohu načíst hudbu ze souboru: %s\n"
 
-#: src/client/screen.c:60
-#, c-format
-msgid "Registering screen: \"%s\"\n"
-msgstr "Registruji obrazovku: \"%s\"\n"
+#: src/audio/music.c:125
+#, fuzzy
+msgid "Stopping music\n"
+msgstr "Zastavuji přehrávání hudby...\n"
 
-#: src/client/screen.c:107
-#, c-format
-msgid "Stopping screen: \"%s\"\n"
-msgstr "Ukončuji obrazovku: \"%s\"\n"
+#: src/audio/music.c:165
+#, fuzzy, c-format
+msgid "Playing music from file %s\n"
+msgstr "Přehrávám hudbu ze souboru %s\n"
 
-#: src/client/screen.c:116
-#, c-format
-msgid "Starting screen: \"%s\"\n"
-msgstr "Zapínám obrazovku: \"%s\"\n"
+#: src/audio/music.c:229
+#, fuzzy
+msgid "Quitting music\n"
+msgstr "Vypínám hudbu...\n"
 
-#: src/client/saveLoad.c:85
-#, c-format
-msgid "Saving game to: \"%s\"\n"
-msgstr "Ukládám hru do: \"%s\"\n"
+#: src/audio/sound.c:45
+#, fuzzy
+msgid "Initializing sound\n"
+msgstr "Zapínám zvuk...\n"
 
-#: src/client/saveLoad.c:94
+#: src/audio/sound.c:57
 #, c-format
-msgid "I was unable to save: \"%s\"\n"
-msgstr "Nemohl jsem uložit: \"%s\"\n"
+msgid "Loading sound file: %s\n"
+msgstr "Nahrávám soubor se zvukem: %s\n"
 
-#: src/client/saveLoad.c:251
-#, c-format
-msgid "Loadig game from file: \"%s\"\n"
-msgstr "Nahrávám hru ze souboru: \"%s\"\n"
+#: src/audio/sound.c:64
+#, fuzzy, c-format
+msgid "Unable to load sound from file %s with error: %s\n"
+msgstr "Nemohu načíst zvuk ze souboru: %s s chybou: %s\n"
 
-#: src/client/saveLoad.c:259
-#, c-format
-msgid "Unable to load save: \"%s\"\n"
-msgstr "Nemohu nahrát uložení: \"%s\"\n"
+#: src/audio/sound.c:77
+#, fuzzy, c-format
+msgid "Unable to play sound with error: %s\n"
+msgstr "Nemohu na pozadí přehrát zvuk s chybou: %s\n"
 
-#: src/client/game.c:109
-msgid "Quitting TUXANCI...\n"
-msgstr "Končím TUXANCI...\n"
+#: src/audio/sound.c:146
+#, fuzzy
+msgid "Quitting sound\n"
+msgstr "Vypínám zvuk...\n"
 
-#: src/base/textFile.c:82
-#, c-format
-msgid "ERROR: unable to get file status for %s!\n"
-msgstr "CHYBA: nemohu získat status souboru %s!\n"
+#: src/base/arenaFile.c:123
+msgid "Loaded new arena...\n"
+msgstr "Nahrána nová aréna...\n"
 
-#: src/base/textFile.c:88
-#, c-format
-msgid "ERROR: unable to open file %s for reading\n"
-msgstr "CHYBA: nemohu otevřít soubor %s pro čtení\n"
+#: src/base/arenaFile.c:336
+#, fuzzy, c-format
+msgid "Load arena file from %s\n"
+msgstr "Nahrávám arénu: %s\n"
 
-#: src/base/textFile.c:95
+#: src/base/arenaFile.c:341
 #, c-format
-msgid "ERROR: unable to read data from file %s\n"
-msgstr "CHYBA: nemohu číst data ze souboru %s\n"
+msgid "Director %s not found !\n"
+msgstr ""
 
-#: src/base/textFile.c:120
+#: src/base/arenaFile.c:360
 #, c-format
-msgid ""
-"Printing file: \"%s\"\n"
-"\n"
-msgstr "Tisknu soubor: \"%s\"\n"
+msgid "Loading arena: %s\n"
+msgstr "Nahrávám arénu: %s\n"
 
 #: src/base/checkFront.c:90
 msgid "Bad type of front!"
 msgstr "Špatný typ fronty!"
 
-#: src/base/serverSendMsg.c:139 src/base/shot.c:124 src/base/tux.c:153
-msgid "Type variable has a really wierd value!"
-msgstr "Proměnná se směrem Tuxánka má doopravdy podivnou hodnotu!"
-
-#: src/base/tux.c:190
-msgid "p->control has a really wierd value!"
-msgstr "p->control má doopravdy podivnou hodnotu!"
-
-#: src/base/storage.c:75
-#, c-format
-msgid "%s %s was not found in storage!\n"
-msgstr "%s %s nebylo na skladě nalezeno!\n"
-
-#: src/base/udp_server.c:64 src/base/tcp_server.c:66
-#, c-format
-msgid "New client \"%s\" on port \"%d\" connected"
-msgstr "Nový klient \"%s\" připojen na portu \"%d\""
-
-#: src/base/udp_server.c:80 src/base/tcp_server.c:109
-#, c-format
-msgid "Client \"%s\" on port \"%d\" disconnected"
-msgstr "Klient \"%s\" na portu \"%d\" je odpojen"
-
-#: src/base/udp_server.c:100 src/base/udp_server.c:111
-#: src/base/tcp_server.c:134 src/base/tcp_server.c:148
-#, c-format
-msgid "Starting server: \"%s\" on port: \"%d\"\n"
-msgstr "Spouštím server: \"%s\" na portu: \"%d\"\n"
+#: src/base/gun.c:51
+msgid "There is wrong value in course variable!"
+msgstr "V proměnné course je divná hodnota!"
 
-#: src/base/udp_server.c:102 src/base/udp_server.c:113
-#: src/base/tcp_server.c:136 src/base/tcp_server.c:151
+#: src/base/homeDirector.c:22
 #, c-format
-msgid "Starting server: \"%s\" on port: \"%d\" FAILED!\n"
-msgstr "Spouštění serveru: \"%s\" na portu: \"%d\" SELHALO\n"
+msgid "Environment variable HOME not found!\n"
+msgstr "Proměnná prostředí HOME nenalezena!\n"
 
-#: src/base/udp_server.c:182
+#: src/base/homeDirector.c:30
 #, c-format
-msgid "Client was not FOUND!\n"
-msgstr "Klient NENALEZEN!\n"
+msgid "Creating home directory %s.\n"
+msgstr "Vytvářím domovský adresář %s.\n"
 
-#: src/base/udp_server.c:236 src/base/udp_server.c:241
-#: src/base/tcp_server.c:281 src/base/tcp_server.c:286
+#: src/base/homeDirector.c:37
 #, c-format
-msgid "Closing port: \"%d\"\n"
-msgstr "Zavírám port: \"%d\"\n"
-
-#: src/base/udp_server.c:245
-msgid "Quitting UDP\n"
-msgstr "Končím UDP\n"
+msgid "Unable to create home directory!\n"
+msgstr "Nemohu vytvořit domovský adresář!\n"
 
 #: src/base/idManager.c:41
 msgid "Starting ID manger\n"
@@ -264,13 +158,23 @@ msgstr "ID %d (počet %d)\n"
 msgid "Quitting ID manger\n"
 msgstr "Končím ID manger\n"
 
-#: src/base/myTimer.c:126
-msgid "Timer is really weirdly set!"
-msgstr "Časovač je doopravdy podivně nastavený!"
+#: src/base/main.c:97
+#, c-format
+msgid ""
+"File %s not found !\n"
+"Program shutdown !\n"
+msgstr ""
+"Soubor %s nenalezen !\n"
+"Vypínám program !\n"
 
-#: src/base/myTimer.c:147
-msgid "There is no such ID!"
-msgstr "Takové ID tu fakt není!"
+#: src/base/main.c:163
+#, c-format
+msgid ""
+"WinSock initialization failed !\n"
+"Program shutdown !\n"
+msgstr ""
+"Inicializace WinSock selhala !\n"
+"Vypínám program !\n"
 
 #: src/base/modules.c:70 src/base/modules.c:76
 #, c-format
@@ -301,10 +205,13 @@ msgstr "Odebírám modul...\n"
 msgid "Loading module %s failed!\n"
 msgstr "Načítání modulu % selhalo!\n"
 
-#: src/base/shareFunction.c:41
-#, c-format
-msgid "Adding  \"%s\" to share function.\n"
-msgstr "Přidávám \"%s\" do sdílené funkce.\n"
+#: src/base/myTimer.c:126
+msgid "Timer is really weirdly set!"
+msgstr "Časovač je doopravdy podivně nastavený!"
+
+#: src/base/myTimer.c:147
+msgid "There is no such ID!"
+msgstr "Takové ID tu fakt není!"
 
 #: src/base/net_multiplayer.c:57 src/base/net_multiplayer.c:64
 #, c-format
@@ -321,6 +228,110 @@ msgstr "Nemohu spustit síťovou hru!\n"
 msgid "Variable netGameType has a really weird value!"
 msgstr "Proměnná netGameType má doopravdy podivnou hodnotu!"
 
+#: src/base/proto.c:66
+#, c-format
+msgid "Proto error code: \"%d\"\n"
+msgstr "Kód protokolové chyby: \"%d\"\n"
+
+#: src/base/proto.c:70
+msgid "Version of your client isn't supported by the server."
+msgstr "Verze tvého klienta není podporována serverem."
+
+#: src/base/proto.c:74
+msgid "The timeout of ping from server is out"
+msgstr "Vypršel čas na odpověď ze serveru"
+
+#: src/base/proto.c:78
+msgid "The maximum amount of connected players has been exceeded!"
+msgstr "Maximum současně připojených hráčů bylo překročeno!"
+
+#: src/base/server.c:277 src/client/client.c:151
+#, c-format
+msgid "Sending: \"%s\""
+msgstr "Posílám: \"%s\""
+
+#: src/base/server.c:304 src/client/client.c:224
+#, c-format
+msgid "Recieved: \"%s\""
+msgstr "Přijato: \"%s\""
+
+#: src/base/serverSendMsg.c:139 src/base/shot.c:124 src/base/tux.c:153
+msgid "Type variable has a really wierd value!"
+msgstr "Proměnná se směrem Tuxánka má doopravdy podivnou hodnotu!"
+
+#: src/base/shareFunction.c:41
+#, c-format
+msgid "Adding  \"%s\" to share function.\n"
+msgstr "Přidávám \"%s\" do sdílené funkce.\n"
+
+#: src/base/storage.c:75
+#, c-format
+msgid "%s %s was not found in storage!\n"
+msgstr "%s %s nebylo na skladě nalezeno!\n"
+
+#: src/base/tcp_server.c:66 src/base/udp_server.c:64
+#, c-format
+msgid "New client \"%s\" on port \"%d\" connected"
+msgstr "Nový klient \"%s\" připojen na portu \"%d\""
+
+#: src/base/tcp_server.c:109 src/base/udp_server.c:80
+#, c-format
+msgid "Client \"%s\" on port \"%d\" disconnected"
+msgstr "Klient \"%s\" na portu \"%d\" je odpojen"
+
+#: src/base/tcp_server.c:134 src/base/tcp_server.c:148
+#: src/base/udp_server.c:100 src/base/udp_server.c:111
+#, c-format
+msgid "Starting server: \"%s\" on port: \"%d\"\n"
+msgstr "Spouštím server: \"%s\" na portu: \"%d\"\n"
+
+#: src/base/tcp_server.c:136 src/base/tcp_server.c:151
+#: src/base/udp_server.c:102 src/base/udp_server.c:113
+#, c-format
+msgid "Starting server: \"%s\" on port: \"%d\" FAILED!\n"
+msgstr "Spouštění serveru: \"%s\" na portu: \"%d\" SELHALO\n"
+
+#: src/base/tcp_server.c:281 src/base/tcp_server.c:286
+#: src/base/udp_server.c:236 src/base/udp_server.c:241
+#, c-format
+msgid "Closing port: \"%d\"\n"
+msgstr "Zavírám port: \"%d\"\n"
+
+#: src/base/textFile.c:82
+#, c-format
+msgid "ERROR: unable to get file status for %s!\n"
+msgstr "CHYBA: nemohu získat status souboru %s!\n"
+
+#: src/base/textFile.c:88
+#, c-format
+msgid "ERROR: unable to open file %s for reading\n"
+msgstr "CHYBA: nemohu otevřít soubor %s pro čtení\n"
+
+#: src/base/textFile.c:95
+#, c-format
+msgid "ERROR: unable to read data from file %s\n"
+msgstr "CHYBA: nemohu číst data ze souboru %s\n"
+
+#: src/base/textFile.c:120
+#, c-format
+msgid ""
+"Printing file: \"%s\"\n"
+"\n"
+msgstr "Tisknu soubor: \"%s\"\n"
+
+#: src/base/tux.c:190
+msgid "p->control has a really wierd value!"
+msgstr "p->control má doopravdy podivnou hodnotu!"
+
+#: src/base/udp_server.c:182
+#, c-format
+msgid "Client was not FOUND!\n"
+msgstr "Klient NENALEZEN!\n"
+
+#: src/base/udp_server.c:245
+msgid "Quitting UDP\n"
+msgstr "Končím UDP\n"
+
 #: src/base/downServer.c:72
 msgid "ERR Arena not found !\n"
 msgstr ""
@@ -334,141 +345,188 @@ msgstr ""
 msgid "Unable to initialize download server!\n"
 msgstr "Nemohu spustit síťovou hru jako server!\n"
 
-#: src/base/main.c:97
+#: src/client/client.c:99
 #, c-format
-msgid ""
-"File %s not found !\n"
-"Program shutdown !\n"
-msgstr ""
-"Soubor %s nenalezen !\n"
-"Vypínám program !\n"
+msgid "Connected to: %s on port: %d via UDP\n"
+msgstr "Připojeno k: %s na portu %d přes UDP\n"
 
-#: src/base/main.c:163
+#: src/client/client.c:136
 #, c-format
-msgid ""
-"WinSock initialization failed !\n"
-"Program shutdown !\n"
-msgstr ""
-"Inicializace WinSock selhala !\n"
-"Vypínám program !\n"
+msgid "Server did not respond!\n"
+msgstr "Server neodpověděl!\n"
 
-#: src/base/arenaFile.c:123
-msgid "Loaded new arena...\n"
-msgstr "Nahrána nová aréna...\n"
+#: src/client/client.c:137
+msgid "Server is not running or being blocked. I was unable to connect."
+msgstr "Server neběží, nebo je blokován. Nemohl jsem se připojit."
 
-#: src/base/arenaFile.c:336
-#, fuzzy, c-format
-msgid "Load arena file from %s\n"
-msgstr "Nahrávám arénu: %s\n"
+#: src/client/client.c:316
+#, c-format
+msgid "down: %d\n"
+msgstr "dolů: %d\n"
 
-#: src/base/arenaFile.c:341
+#: src/client/client.c:316
 #, c-format
-msgid "Director %s not found !\n"
-msgstr ""
+msgid "up  : %d\n"
+msgstr "nahoru  : %d\n"
 
-#: src/base/arenaFile.c:360
+#: src/client/client.c:342
+msgid "Closing UDP connection.\n"
+msgstr "Zavírám UDP spojení.\n"
+
+#: src/client/configFile.c:144
 #, c-format
-msgid "Loading arena: %s\n"
-msgstr "Nahrávám arénu: %s\n"
+msgid "ADDING: \"%s\" into config file.\n"
+msgstr "PŘIDÁVÁM: \"%s\" do konfiguračního souboru.\n"
 
-#: src/base/homeDirector.c:22
+#: src/client/font.c:39
 #, c-format
-msgid "Environment variable HOME not found!\n"
-msgstr "Proměnná prostředí HOME nenalezena!\n"
+msgid "Loading font: \"%s\"\n"
+msgstr "Nahrávám písmo: \"%s\"\n"
 
-#: src/base/homeDirector.c:30
+#: src/client/font.c:131
+msgid "Unloading font\n"
+msgstr "Uvolňuji font\n"
+
+#: src/client/game.c:109
+msgid "Quitting TUXANCI...\n"
+msgstr "Končím TUXANCI...\n"
+
+#: src/client/image.c:29
+msgid "Initializing image database\n"
+msgstr "Inicializuji databázi obrázků\n"
+
+#: src/client/image.c:189
 #, c-format
-msgid "Creating home directory %s.\n"
-msgstr "Vytvářím domovský adresář %s.\n"
+msgid "Loading image %s\n"
+msgstr "Nahrávám obrázek %s\n"
 
-#: src/base/homeDirector.c:37
+#: src/client/image.c:296
+msgid "Quitting image database\n"
+msgstr "Zavírám databázi obrázků\n"
+
+#: src/client/interface.c:70
 #, c-format
-msgid "Unable to create home directory!\n"
-msgstr "Nemohu vytvořit domovský adresář!\n"
+msgid "Unable to switch to FULLSCREEN mode!\n"
+msgstr "Nemohu přepnout do režimu celé obrazovky!\n"
 
-#: src/base/gun.c:51
-msgid "There is wrong value in course variable!"
-msgstr "V proměnné course je divná hodnota!"
+#: src/client/interface.c:76
+#, c-format
+msgid "Unable to switch to WINDOW mode! Error: %s\n"
+msgstr "Nemohu se přepnout do okenního režimu! Chyba: %s\n"
 
-#: src/base/proto.c:66
+#: src/client/interface.c:122
+msgid "Initializing SDL system\n"
+msgstr "Inicializuji SDL systém\n"
+
+#: src/client/interface.c:212
 #, c-format
-msgid "Proto error code: \"%d\"\n"
-msgstr "Kód protokolové chyby: \"%d\"\n"
+msgid "Pressed key with SDL value: %d\n"
+msgstr "Stisknuta klávesa s SDL hodnotou: %d\n"
 
-#: src/base/proto.c:70
-msgid "Version of your client isn't supported by the server."
-msgstr "Verze tvého klienta není podporována serverem."
+#: src/client/interface.c:303
+#, c-format
+msgid "Unable to change WINDOW resolution! Error: %s\n"
+msgstr "Nemohu změnit rozlišení! Chyba: %s\n"
 
-#: src/base/proto.c:74
-msgid "The timeout of ping from server is out"
-msgstr "Vypršel čas na odpověď ze serveru"
+#: src/client/interface.c:332
+msgid "Quitting SDL\n"
+msgstr "Končím SDL\n"
 
-#: src/base/proto.c:78
-msgid "The maximum amount of connected players has been exceeded!"
-msgstr "Maximum současně připojených hráčů bylo překročeno!"
+#: src/client/keyboardBuffer.c:69
+#, c-format
+msgid "Keyboard Buffer overrun! Dropping key: %02x\n"
+msgstr "Přetečení bufferu klávesnice! Zahazuji klávesu: %02x\n"
 
-#: src/screen/screen_table.c:93
+#: src/client/keyboardBuffer.c:94
 #, c-format
-msgid "Highscore file: \"%s\" was not loaded!"
-msgstr "Soubor se skóre: \"%s\" nebyl načten!"
+msgid "Keyboard Buffer underrun!\n"
+msgstr "Podtečení bufferu klávesnice!\n"
 
-#: src/screen/screen_table.c:142 src/screen/screen_setting.c:215
-#: src/server/highScore.c:21
+#: src/client/keyboardBuffer.c:145
 #, c-format
-msgid "I am unable to load: \"%s\"!\n"
-msgstr "Nemohu nahrát: \"%s\"!\n"
+msgid "Keyboard buffer is not empty!\n"
+msgstr "Buffer klávesnice není prázdný!\n"
 
-#: src/screen/screen_table.c:143 src/screen/screen_setting.c:216
-#: src/server/highScore.c:22
+#: src/client/saveLoad.c:85
 #, c-format
-msgid "Creating: \"%s\"\n"
-msgstr "Vytvářím: \"%s\"\n"
+msgid "Saving game to: \"%s\"\n"
+msgstr "Ukládám hru do: \"%s\"\n"
 
-#: src/screen/screen_table.c:150 src/screen/screen_setting.c:222
-#: src/server/highScore.c:31
+#: src/client/saveLoad.c:94
 #, c-format
-msgid "I was unable to create: \"%s\"!\n"
-msgstr "Nemohu vytvořit: \"%s\"!\n"
+msgid "I was unable to save: \"%s\"\n"
+msgstr "Nemohl jsem uložit: \"%s\"\n"
 
-#: src/screen/screen_table.c:195 src/screen/screen_downArena.c:376
-#: src/screen/screen_browser.c:680 src/screen/screen_setting.c:329
-#: src/screen/screen_choiceArena.c:140 src/screen/screen_credits.c:102
-#: src/screen/screen_gameType.c:214
-msgid "back"
-msgstr "zpět"
+#: src/client/saveLoad.c:251
+#, c-format
+msgid "Loadig game from file: \"%s\"\n"
+msgstr "Nahrávám hru ze souboru: \"%s\"\n"
 
-#: src/screen/screen_world.c:69
+#: src/client/saveLoad.c:259
 #, c-format
-msgid "Network initialization error!\n"
-msgstr "Chyba při inicializaci sítě!\n"
+msgid "Unable to load save: \"%s\"\n"
+msgstr "Nemohu nahrát uložení: \"%s\"\n"
 
-#: src/screen/screen_world.c:430
-msgid "Tux has not defined controls!"
-msgstr "Tuxánek nemá nastavené ovládání!"
+#: src/client/screen.c:60
+#, c-format
+msgid "Registering screen: \"%s\"\n"
+msgstr "Registruji obrazovku: \"%s\"\n"
 
-#: src/screen/screen_world.c:607
-msgid "Quitting screen world\n"
-msgstr "Ukončuji hlavní obrazovku\n"
+#: src/client/screen.c:107
+#, c-format
+msgid "Stopping screen: \"%s\"\n"
+msgstr "Ukončuji obrazovku: \"%s\"\n"
 
-#: src/screen/screen_mainMenu.c:101
-msgid "Start game"
-msgstr "Spustit hru"
+#: src/client/screen.c:116
+#, c-format
+msgid "Starting screen: \"%s\"\n"
+msgstr "Zapínám obrazovku: \"%s\"\n"
 
-#: src/screen/screen_mainMenu.c:102
-msgid "Settings"
-msgstr "Nastavení"
+#: src/net/tcp.c:66 src/net/udp.c:129
+#, c-format
+msgid "Unable to create socket when connecting!\n"
+msgstr "Nemohu vytvořit soket během připojování!\n"
 
-#: src/screen/screen_mainMenu.c:103
-msgid "Highscore"
-msgstr "Nejvyšší skóre"
+#: src/net/tcp.c:95
+#, c-format
+msgid "Unable to bint to port: %d\n"
+msgstr "Nemohu se připojit na port: %d\n"
 
-#: src/screen/screen_mainMenu.c:104
-msgid "Credits"
-msgstr "Autoři"
+#: src/net/tcp.c:168 src/net/udp.c:301
+msgid "Bad IP proto!"
+msgstr "Špatný IP protokol!"
 
-#: src/screen/screen_mainMenu.c:105
-msgid "Quit game"
-msgstr "Ukončit hru"
+#: src/net/tcp.c:196
+#, c-format
+msgid "Unable to create TCP socket!\n"
+msgstr "Nemohu vytvořit TCP soket!\n"
+
+#: src/net/udp.c:68
+#, c-format
+msgid "Unable to create socket when binding!\n"
+msgstr "Nemohu vytvořit soket během připojování!\n"
+
+#: src/net/udp.c:96
+#, c-format
+msgid "Unable to set socket %s %d!\n"
+msgstr "Nemohu nastavit soket %s %d!\n"
+
+#: src/net/udp.c:216
+#, c-format
+msgid "Unable to read form socket %d %s %d!\n"
+msgstr "Nemohu číst ze soketu %d %s %d!\n"
+
+#: src/net/udp.c:256
+#, c-format
+msgid "Unable to write on socket %d %s %d!\n"
+msgstr "Nemohu zapisovat do soketu %d %s %d!\n"
+
+#: src/screen/screen_browser.c:680 src/screen/screen_choiceArena.c:140
+#: src/screen/screen_credits.c:102 src/screen/screen_downArena.c:376
+#: src/screen/screen_gameType.c:214 src/screen/screen_setting.c:329
+#: src/screen/screen_table.c:195
+msgid "back"
+msgstr "zpět"
 
 #: src/screen/screen_browser.c:682
 msgid "Play"
@@ -502,6 +560,81 @@ msgstr "klienti"
 msgid "ping"
 msgstr "ping"
 
+#: src/screen/screen_choiceArena.c:141 src/screen/screen_gameType.c:215
+msgid "play"
+msgstr "hraj"
+
+#: src/screen/screen_credits.c:127
+#, c-format
+msgid "Credit file not found... %s/%s"
+msgstr "Soubor s autory nenalezen... %s/%s"
+
+#: src/screen/screen_gameType.c:216
+msgid "browser"
+msgstr "vyhledávač"
+
+#: src/screen/screen_gameType.c:232
+msgid "Local game"
+msgstr "Lokální hra"
+
+#: src/screen/screen_gameType.c:233
+msgid "Set up a server"
+msgstr "Vytvořit server"
+
+#: src/screen/screen_gameType.c:234
+msgid "Network game"
+msgstr "Síťová hra"
+
+#: src/screen/screen_gameType.c:238
+msgid "port"
+msgstr "port"
+
+#: src/screen/screen_gameType.c:288
+msgid "Unknown game type!"
+msgstr "Neznámý typ hry!"
+
+#: src/screen/screen_gameType.c:342
+msgid "Unknown IP protocol!\n"
+msgstr "Neznámý IP protokol!\n"
+
+#: src/screen/screen_mainMenu.c:101
+msgid "Start game"
+msgstr "Spustit hru"
+
+#: src/screen/screen_mainMenu.c:102
+msgid "Settings"
+msgstr "Nastavení"
+
+#: src/screen/screen_mainMenu.c:103
+msgid "Highscore"
+msgstr "Nejvyšší skóre"
+
+#: src/screen/screen_mainMenu.c:104
+msgid "Credits"
+msgstr "Autoři"
+
+#: src/screen/screen_mainMenu.c:105
+msgid "Quit game"
+msgstr "Ukončit hru"
+
+#: src/screen/screen_setting.c:215 src/screen/screen_table.c:142
+#: src/server/highScore.c:21
+#, c-format
+msgid "I am unable to load: \"%s\"!\n"
+msgstr "Nemohu nahrát: \"%s\"!\n"
+
+#: src/screen/screen_setting.c:216 src/screen/screen_table.c:143
+#: src/server/highScore.c:22
+#, c-format
+msgid "Creating: \"%s\"\n"
+msgstr "Vytvářím: \"%s\"\n"
+
+#: src/screen/screen_setting.c:222 src/screen/screen_table.c:150
+#: src/server/highScore.c:31
+#, c-format
+msgid "I was unable to create: \"%s\"!\n"
+msgstr "Nemohu vytvořit: \"%s\"!\n"
+
 #: src/screen/screen_setting.c:285
 #, c-format
 msgid ""
@@ -592,179 +725,59 @@ msgstr "Hráč 1:"
 msgid "Up:"
 msgstr "Nahoru:"
 
-#: src/screen/screen_choiceArena.c:141 src/screen/screen_gameType.c:215
-msgid "play"
-msgstr "hraj"
-
-#: src/screen/screen_credits.c:127
-#, c-format
-msgid "Credit file not found... %s/%s"
-msgstr "Soubor s autory nenalezen... %s/%s"
-
-#: src/screen/screen_gameType.c:216
-msgid "browser"
-msgstr "vyhledávač"
-
-#: src/screen/screen_gameType.c:232
-msgid "Local game"
-msgstr "Lokální hra"
-
-#: src/screen/screen_gameType.c:233
-msgid "Set up a server"
-msgstr "Vytvořit server"
-
-#: src/screen/screen_gameType.c:234
-msgid "Network game"
-msgstr "Síťová hra"
-
-#: src/screen/screen_gameType.c:238
-msgid "port"
-msgstr "port"
-
-#: src/screen/screen_gameType.c:288
-msgid "Unknown game type!"
-msgstr "Neznámý typ hry!"
-
-#: src/screen/screen_gameType.c:342
-msgid "Unknown IP protocol!\n"
-msgstr "Neznámý IP protokol!\n"
-
-#: src/widget/widget_button.c:84
-msgid "Event caught\n"
-msgstr "Událost zachycena\n"
-
-#: src/widget/widget_textfield.c:169
-msgid "Bad filter!"
-msgstr "Špatný filtr!"
-
-#: src/audio/sound.c:44
-msgid "Initializing sound...\n"
-msgstr "Zapínám zvuk...\n"
-
-#: src/audio/sound.c:56
-#, c-format
-msgid "Loading sound file: %s\n"
-msgstr "Nahrávám soubor se zvukem: %s\n"
-
-#: src/audio/sound.c:63
-#, c-format
-msgid "Unable to load sound file: %s with error: %s\n"
-msgstr "Nemohu načíst zvuk ze souboru: %s s chybou: %s\n"
-
-#: src/audio/sound.c:76
-#, c-format
-msgid "Unable to playback sound with error: %s\n"
-msgstr "Nemohu na pozadí přehrát zvuk s chybou: %s\n"
-
-#: src/audio/sound.c:144
-msgid "Quitting sound...\n"
-msgstr "Vypínám zvuk...\n"
-
-#: src/audio/music.c:47
-msgid "Initializing music...\n"
-msgstr "Zapínám hudbu...\n"
-
-#: src/audio/music.c:58
-#, c-format
-msgid "Loading music file: %s\n"
-msgstr "Načítám soubor s hudbou: %s\n"
-
-#: src/audio/music.c:71
-#, c-format
-msgid "Unable to load music from file: %s\n"
-msgstr "Nemohu načíst hudbu ze souboru: %s\n"
-
-#: src/audio/music.c:122
-msgid "Stopping music...\n"
-msgstr "Zastavuji přehrávání hudby...\n"
-
-#: src/audio/music.c:161
-#, c-format
-msgid "Playing music file %s\n"
-msgstr "Přehrávám hudbu ze souboru %s\n"
-
-#: src/audio/music.c:224
-msgid "Quitting music...\n"
-msgstr "Vypínám hudbu...\n"
-
-#: src/audio/audio.c:29
-#, c-format
-msgid "Unable to initialize audio: %s\n"
-msgstr "Nemohu inicializovat zvuk: %s\n"
-
-#: src/audio/audio.c:35
-#, c-format
-msgid "Unable to create proper audio settings: %s\n"
-msgstr "Nemohu správně nastavit zvuk: %s\n"
-
-#: src/audio/audio.c:43
-msgid "Initializing audio system...\n"
-msgstr "Zapínám zvukový systém...\n"
-
-#: src/audio/audio.c:56
-msgid "Quitting audio...\n"
-msgstr "Vypínám zvuk...\n"
-
-#: src/net/udp.c:68
+#: src/screen/screen_table.c:93
 #, c-format
-msgid "Unable to create socket when binding!\n"
-msgstr "Nemohu vytvořit soket během připojování!\n"
+msgid "Highscore file: \"%s\" was not loaded!"
+msgstr "Soubor se skóre: \"%s\" nebyl načten!"
 
-#: src/net/udp.c:96
+#: src/screen/screen_world.c:69
 #, c-format
-msgid "Unable to set socket %s %d!\n"
-msgstr "Nemohu nastavit soket %s %d!\n"
+msgid "Network initialization error!\n"
+msgstr "Chyba při inicializaci sítě!\n"
 
-#: src/net/udp.c:129 src/net/tcp.c:66
-#, c-format
-msgid "Unable to create socket when connecting!\n"
-msgstr "Nemohu vytvořit soket během připojování!\n"
+#: src/screen/screen_world.c:430
+msgid "Tux has not defined controls!"
+msgstr "Tuxánek nemá nastavené ovládání!"
 
-#: src/net/udp.c:216
-#, c-format
-msgid "Unable to read form socket %d %s %d!\n"
-msgstr "Nemohu číst ze soketu %d %s %d!\n"
+#: src/screen/screen_world.c:607
+msgid "Quitting screen world\n"
+msgstr "Ukončuji hlavní obrazovku\n"
 
-#: src/net/udp.c:256
+#: src/server/log.c:19
 #, c-format
-msgid "Unable to write on socket %d %s %d!\n"
-msgstr "Nemohu zapisovat do soketu %d %s %d!\n"
-
-#: src/net/udp.c:301 src/net/tcp.c:168
-msgid "Bad IP proto!"
-msgstr "Špatný IP protokol!"
+msgid "Opening logfile \"%s\" failed!\n"
+msgstr "Otevírání souboru \"%s\" selhalo!\n"
 
-#: src/net/tcp.c:95
+#: src/server/log.c:23
 #, c-format
-msgid "Unable to bint to port: %d\n"
-msgstr "Nemohu se připojit na port: %d\n"
+msgid "I use logfile: \"%s\")\n"
+msgstr "Používám logovací soubor: \"%s\")\n"
 
-#: src/net/tcp.c:196
-#, c-format
-msgid "Unable to create TCP socket!\n"
-msgstr "Nemohu vytvořit TCP soket!\n"
+#: src/server/log.c:54
+msgid "Really bad log value!"
+msgstr "Opravdu špatná hodnota logu!"
 
-#: src/server/publicServer.c:231
+#: src/server/publicServer.c:230
 #, fuzzy, c-format
 msgid "I dont load arena %s!\n"
 msgstr "Nahrávám arénu: %s\n"
 
-#: src/server/publicServer.c:256
+#: src/server/publicServer.c:255
 #, c-format
 msgid "I was unable to open config file!\n"
 msgstr "Nemohu otevřít konfigurační soubor!\n"
 
-#: src/server/publicServer.c:273
+#: src/server/publicServer.c:272
 #, c-format
 msgid "Unable to initialize network socket!\n"
 msgstr "Nemohu inicializovat síťový soket!\n"
 
-#: src/server/publicServer.c:280
+#: src/server/publicServer.c:279
 #, c-format
 msgid "Unable to contact MasterServer!)\n"
 msgstr "Nedaří se kontaktovat MasterServer!)\n"
 
-#: src/server/publicServer.c:327
+#: src/server/publicServer.c:326
 msgid "Quitting public server\n"
 msgstr "Ukončuji veřejný server\n"
 
@@ -778,25 +791,22 @@ msgstr "Načítám nastavení z: \"%s\"\n"
 msgid "I was unable to load config file. Falling back to defaults!\n"
 msgstr "Nemohu načíst konfigurační soubor. Používám výchozí hodnoty!\n"
 
-#: src/server/log.c:19
-#, c-format
-msgid "Opening logfile \"%s\" failed!\n"
-msgstr "Otevírání souboru \"%s\" selhalo!\n"
-
-#: src/server/log.c:23
-#, c-format
-msgid "I use logfile: \"%s\")\n"
-msgstr "Používám logovací soubor: \"%s\")\n"
-
-#: src/server/log.c:54
-msgid "Really bad log value!"
-msgstr "Opravdu špatná hodnota logu!"
-
 #: src/server/highScore.c:26
 #, c-format
 msgid "Scorefile: \"%s\"\n"
 msgstr "Soubor se skóre: \"%s\"\n"
 
+#: src/widget/widget_button.c:84
+msgid "Event caught\n"
+msgstr "Událost zachycena\n"
+
+#: src/widget/widget_textfield.c:169
+msgid "Bad filter!"
+msgstr "Špatný filtr!"
+
+#~ msgid "Loading music file: %s\n"
+#~ msgstr "Načítám soubor s hudbou: %s\n"
+
 #~ msgid ""
 #~ "I've done this once, dont want to mess memory with module %s again!\n"
 #~ msgstr "Toto už jsem provedl, nechtěj znovu zaneřádit paměť modulem %s!\n"
@@ -810,9 +820,6 @@ msgstr "Soubor se skóre: \"%s\"\n"
 #~ msgid "Bad client type (TCP/UDP)!"
 #~ msgstr "Špatný typ klienta (TCP/UDP)!"
 
-#~ msgid "Loading map file: %s\n"
-#~ msgstr "Nahrávám map file: %s\n"
-
 #~ msgid ""
 #~ "I was unable to initialize old nls system (if you see this something "
 #~ "wierd is happening)!\n"
diff --git a/po/de_DE.po b/po/de_DE.po
index f501fb0..46bb72a 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -2,241 +2,127 @@
 # Copyright (C) 2008
 # This file is distributed under the same license as the tuxanci package.
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: tuxanci\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-30 00:30+0100\n"
-"PO-Revision-Date: 2008-08-19 00:37+0200\n"
-"Last-Translator: Marcel 'frostwork' Unbehaun\n"
+"POT-Creation-Date: 2008-11-30 23:26+0100\n"
+"PO-Revision-Date: 2008-12-01 12:31+0100\n"
+"Last-Translator: Evgeni Golov <sargentd@die-welt.net>\n"
 "Language-Team: GERMAN <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/client/client.c:99
-#, c-format
-msgid "Connected to: %s on port: %d via UDP\n"
-msgstr "Verbunden mit: %s auf Port: %d via UDP\n"
-
-#: src/client/client.c:136
-#, c-format
-msgid "Server did not respond!\n"
-msgstr "Server antwortet nicht!\n"
-
-#: src/client/client.c:137
-msgid "Server is not running or being blocked. I was unable to connect."
-msgstr "Server läuft nicht oder wird geblockt. Konnte mich nicht verbinden."
-
-#: src/client/client.c:151 src/base/server.c:277
-#, c-format
-msgid "Sending: \"%s\""
-msgstr "Gesendet: \"%s\""
-
-#: src/client/client.c:224 src/base/server.c:304
-#, c-format
-msgid "Recieved: \"%s\""
-msgstr "Empfangen: \"%s\""
-
-#: src/client/client.c:316
-#, c-format
-msgid "down: %d\n"
-msgstr "Runter: %d\n"
-
-#: src/client/client.c:316
-#, c-format
-msgid "up  : %d\n"
-msgstr "Hoch: %d\n"
-
-#: src/client/client.c:342
-msgid "Closing UDP connection.\n"
-msgstr "Trenne UDP Verbindung.\n"
-
-#: src/client/interface.c:70
-#, c-format
-msgid "Unable to switch to FULLSCREEN mode!\n"
-msgstr "Kann nicht in Vollbild Modus wechseln!\n"
-
-#: src/client/interface.c:76
-#, c-format
-msgid "Unable to switch to WINDOW mode! Error: %s\n"
-msgstr "Kann nicht in Fenster Modus wechseln! Error: %s\n"
-
-#: src/client/interface.c:122
-msgid "Initializing SDL system\n"
-msgstr "Initialisiere SDL System\n"
-
-#: src/client/interface.c:212
-#, c-format
-msgid "Pressed key with SDL value: %d\n"
-msgstr "Taste mit SDL Wert %d gedrückt\n"
-
-#: src/client/interface.c:303
+#: src/audio/audio.c:30
 #, c-format
-msgid "Unable to change WINDOW resolution! Error: %s\n"
-msgstr "Kann Fensterauflösung nicht ändern! Error: %s\n"
-
-#: src/client/interface.c:332
-msgid "Quitting SDL\n"
-msgstr "Beende SDL\n"
+msgid "Error! Unable to initialize audio: %s\n"
+msgstr "Fehler! Konnte Ton nicht initialisieren: %s\n"
 
-#: src/client/configFile.c:144
+#: src/audio/audio.c:36
 #, c-format
-msgid "ADDING: \"%s\" into config file.\n"
-msgstr "Füge \"%s\" zur Config-Datei hinzu.\n"
+msgid "Unable to create proper audio settings: %s\n"
+msgstr "Konnte keine passenden Audio-Einstellungen vornehmen: %s\n"
 
-#: src/client/image.c:29
-msgid "Initializing image database\n"
-msgstr "Initialisiere Bild Datenbank\n"
+#: src/audio/audio.c:44
+msgid "Initializing audio\n"
+msgstr "Initialisiere Audio-System\n"
 
-#: src/client/image.c:189
-#, c-format
-msgid "Loading image %s\n"
-msgstr "Lade Bild %s\n"
+#: src/audio/audio.c:57
+msgid "Quitting audio\n"
+msgstr "Beende Audio-System\n"
 
-#: src/client/image.c:296
-msgid "Quitting image database\n"
-msgstr "Schliesse Bild Datenbank\n"
+#: src/audio/music.c:48
+msgid "Initializing music\n"
+msgstr "Initialisiere Musik\n"
 
-#: src/client/font.c:39
+#: src/audio/music.c:59
 #, c-format
-msgid "Loading font: \"%s\"\n"
-msgstr "Lade Schriftart: \"%s\"\n"
-
-#: src/client/font.c:131
-msgid "Unloading font\n"
-msgstr "Entlade Schriftart\n"
+msgid "Loading a file with music: %s\n"
+msgstr "Lade Musik-Datei: %s\n"
 
-#: src/client/keyboardBuffer.c:69
+#: src/audio/music.c:72
 #, c-format
-msgid "Keyboard Buffer overrun! Dropping key: %02x\n"
-msgstr "Tastatur Pufferüberlauf! Verwerfe Taste: %02x\n"
+msgid "Unable to load music from file %s\n"
+msgstr "Konnte Musik aus Datei %s nicht laden\n"
 
-#: src/client/keyboardBuffer.c:94
-#, c-format
-msgid "Keyboard Buffer underrun!\n"
-msgstr "Tastatur Buffer underrun!\n"
+#: src/audio/music.c:125
+msgid "Stopping music\n"
+msgstr "Beende Musik\n"
 
-#: src/client/keyboardBuffer.c:145
+#: src/audio/music.c:165
 #, c-format
-msgid "Keyboard buffer is not empty!\n"
-msgstr "Tastatur Puffer ist nicht leer!\n"
-
-#: src/client/screen.c:60
-#, c-format
-msgid "Registering screen: \"%s\"\n"
-msgstr "Registriere Bildschirm: \"%s\"\n"
-
-#: src/client/screen.c:107
-#, fuzzy, c-format
-msgid "Stopping screen: \"%s\"\n"
-msgstr "Beende Bildschirm:\" %s\"\n"
+msgid "Playing music from file %s\n"
+msgstr "Spiele Musik-Datei %s\n"
 
-#: src/client/screen.c:116
-#, c-format
-msgid "Starting screen: \"%s\"\n"
-msgstr "Starte Bildschirm: \"%s\"\n"
+#: src/audio/music.c:229
+msgid "Quitting music\n"
+msgstr "Beende Musik\n"
 
-#: src/client/saveLoad.c:85
-#, c-format
-msgid "Saving game to: \"%s\"\n"
-msgstr "Speichere Spiel nach: \"%s\"\n"
+#: src/audio/sound.c:45
+msgid "Initializing sound\n"
+msgstr "Initialisiere Sound\n"
 
-#: src/client/saveLoad.c:94
+#: src/audio/sound.c:57
 #, c-format
-msgid "I was unable to save: \"%s\"\n"
-msgstr "Ich konnte \"%s\" nicht speichern \n"
+msgid "Loading sound file: %s\n"
+msgstr "Lade Sound-Datei: %s\n"
 
-#: src/client/saveLoad.c:251
+#: src/audio/sound.c:64
 #, c-format
-msgid "Loadig game from file: \"%s\"\n"
-msgstr "Lade Spiel von Datei: \"%s\"\n"
+msgid "Unable to load sound from file %s with error: %s\n"
+msgstr "Laden von Sound-Datei %s fehlgeschlagen mit Fehler: %s\n"
 
-#: src/client/saveLoad.c:259
+#: src/audio/sound.c:77
 #, c-format
-msgid "Unable to load save: \"%s\"\n"
-msgstr "Fehler beim Laden von Spielstand: \"%s\"\n"
+msgid "Unable to play sound with error: %s\n"
+msgstr "Fehler bei Audio-Wiedergabe: %s\n"
 
-#: src/client/game.c:109
-msgid "Quitting TUXANCI...\n"
-msgstr "Beende TUXANCI...\n"
+#: src/audio/sound.c:146
+msgid "Quitting sound\n"
+msgstr "Beende Sound\n"
 
-#: src/base/textFile.c:82
-#, c-format
-msgid "ERROR: unable to get file status for %s!\n"
-msgstr "FEHLER: konnte Status für Datei %s nicht ermitteln!\n"
+#: src/base/arenaFile.c:123
+msgid "Loaded new arena...\n"
+msgstr "Lade neue Arena...\n"
 
-#: src/base/textFile.c:88
+#: src/base/arenaFile.c:336
 #, c-format
-msgid "ERROR: unable to open file %s for reading\n"
-msgstr "FEHLER: konnte die Datei %s nicht öffnen\n"
+msgid "Load arena file from %s\n"
+msgstr "Lade Arena aus Datei: %s\n"
 
-#: src/base/textFile.c:95
+#: src/base/arenaFile.c:341
 #, c-format
-msgid "ERROR: unable to read data from file %s\n"
-msgstr "FEHLER: Konnte keine Daten aus der Datei %s auslesen\n"
+msgid "Director %s not found !\n"
+msgstr "Verzeichniss %s nicht gefunden!\n"
 
-#: src/base/textFile.c:120
+#: src/base/arenaFile.c:360
 #, c-format
-msgid ""
-"Printing file: \"%s\"\n"
-"\n"
-msgstr "Schreibe Datei: \"%s\"\n"
+msgid "Loading arena: %s\n"
+msgstr "Lade Arena: %s\n"
 
 #: src/base/checkFront.c:90
 msgid "Bad type of front!"
 msgstr "Schlechter Warteschleifentyp!"
 
-#: src/base/serverSendMsg.c:139 src/base/shot.c:124 src/base/tux.c:153
-msgid "Type variable has a really wierd value!"
-msgstr "Typ Variable hat einen sehr merkwürdigen Wert!"
-
-#: src/base/tux.c:190
-msgid "p->control has a really wierd value!"
-msgstr "p->control hat einen sehr merkwürdigen Wert!"
-
-#: src/base/storage.c:75
-#, c-format
-msgid "%s %s was not found in storage!\n"
-msgstr "%s %s wurde nicht gefunden!\n"
-
-#: src/base/udp_server.c:64 src/base/tcp_server.c:66
-#, c-format
-msgid "New client \"%s\" on port \"%d\" connected"
-msgstr "Neuer Client \"%s\" auf Port \"%d\" verbunden"
-
-#: src/base/udp_server.c:80 src/base/tcp_server.c:109
-#, c-format
-msgid "Client \"%s\" on port \"%d\" disconnected"
-msgstr "Client \"%s\" auf Port \"%d\" getrennt"
-
-#: src/base/udp_server.c:100 src/base/udp_server.c:111
-#: src/base/tcp_server.c:134 src/base/tcp_server.c:148
-#, c-format
-msgid "Starting server: \"%s\" on port: \"%d\"\n"
-msgstr "Starte Server: \"%s\" auf Port: \"%d\"\n"
+#: src/base/gun.c:51
+msgid "There is wrong value in course variable!"
+msgstr "Falscher Wert in Kurs-Variable!"
 
-#: src/base/udp_server.c:102 src/base/udp_server.c:113
-#: src/base/tcp_server.c:136 src/base/tcp_server.c:151
+#: src/base/homeDirector.c:22
 #, c-format
-msgid "Starting server: \"%s\" on port: \"%d\" FAILED!\n"
-msgstr "Starten von Server: \"%s\" auf Port: \"%d\" FEHLGESCHLAGEN!\n"
+msgid "Environment variable HOME not found!\n"
+msgstr "Umgebungsvariable HOME nicht gefunden!\n"
 
-#: src/base/udp_server.c:182
+#: src/base/homeDirector.c:30
 #, c-format
-msgid "Client was not FOUND!\n"
-msgstr "Client wurde NICHT gefunden!\n"
+msgid "Creating home directory %s.\n"
+msgstr "Erstelle Home Verzeichnis %s.\n"
 
-#: src/base/udp_server.c:236 src/base/udp_server.c:241
-#: src/base/tcp_server.c:281 src/base/tcp_server.c:286
+#: src/base/homeDirector.c:37
 #, c-format
-msgid "Closing port: \"%d\"\n"
-msgstr "Schliesse Port: \"%d\"\n"
-
-#: src/base/udp_server.c:245
-msgid "Quitting UDP\n"
-msgstr "Beende UDP\n"
+msgid "Unable to create home directory!\n"
+msgstr "Konnte Home Verzeichnis nicht erstellen!\n"
 
 #: src/base/idManager.c:41
 msgid "Starting ID manger\n"
@@ -246,7 +132,8 @@ msgstr "Starte ID Manager\n"
 msgid "No free ID left!"
 msgstr "Keine freie ID mehr übrig!"
 
-#: src/base/idManager.c:110 src/base/idManager.c:132
+#: src/base/idManager.c:110
+#: src/base/idManager.c:132
 msgid "This kind of ID was never registered!"
 msgstr "Diese ID wurde nie registriert!"
 
@@ -264,16 +151,26 @@ msgstr "ID %d (count %d)\n"
 msgid "Quitting ID manger\n"
 msgstr "Beende ID Manager\n"
 
-#: src/base/myTimer.c:126
-#, fuzzy
-msgid "Timer is really weirdly set!"
-msgstr "Timer ist sehr seltsam eingestellt!"
+#: src/base/main.c:97
+#, c-format
+msgid ""
+"File %s not found !\n"
+"Program shutdown !\n"
+msgstr ""
+"Datei %s nicht gefunden !\n"
+"Beende Programm!\n"
 
-#: src/base/myTimer.c:147
-msgid "There is no such ID!"
-msgstr "Diese ID gibt es nicht!"
+#: src/base/main.c:163
+#, c-format
+msgid ""
+"WinSock initialization failed !\n"
+"Program shutdown !\n"
+msgstr ""
+"WinSock Initialisierung fehlgeschlagen!\n"
+"Beende Programm!\n"
 
-#: src/base/modules.c:70 src/base/modules.c:76
+#: src/base/modules.c:70
+#: src/base/modules.c:76
 #, c-format
 msgid "Error %s occured when using getFce function!\n"
 msgstr "Fehler %s beim Verwenden der Funktion getFce aufgetreten!\n"
@@ -302,12 +199,16 @@ msgstr "Zerstöre Modul...\n"
 msgid "Loading module %s failed!\n"
 msgstr "Laden des Moduls %s fehlgeschlagen!\n"
 
-#: src/base/shareFunction.c:41
-#, c-format
-msgid "Adding  \"%s\" to share function.\n"
-msgstr "Füge \"%s\" zur share Funktion hinzu.\n"
+#: src/base/myTimer.c:126
+msgid "Timer is really weirdly set!"
+msgstr "Timer ist sehr seltsam eingestellt!"
+
+#: src/base/myTimer.c:147
+msgid "There is no such ID!"
+msgstr "Diese ID gibt es nicht!"
 
-#: src/base/net_multiplayer.c:57 src/base/net_multiplayer.c:64
+#: src/base/net_multiplayer.c:57
+#: src/base/net_multiplayer.c:64
 #, c-format
 msgid "Unable to inicialize network game as server!\n"
 msgstr "Konnte Netzwerk Spiel nicht als Server initialisieren!\n"
@@ -317,12 +218,128 @@ msgstr "Konnte Netzwerk Spiel nicht als Server initialisieren!\n"
 msgid "Unable to inicialize network game as client!\n"
 msgstr "Konnte Netzwerk Spiel nicht als Client initialisieren!\n"
 
-#: src/base/net_multiplayer.c:82 src/base/net_multiplayer.c:105
+#: src/base/net_multiplayer.c:82
+#: src/base/net_multiplayer.c:105
 #: src/base/net_multiplayer.c:126
-#, fuzzy
 msgid "Variable netGameType has a really weird value!"
 msgstr "Variable netGameType hat einen sehr seltsamen Wert!"
 
+#: src/base/proto.c:66
+#, c-format
+msgid "Proto error code: \"%d\"\n"
+msgstr "Proto Fehlermeldung: \"%d\"\n"
+
+#: src/base/proto.c:70
+msgid "Version of your client isn't supported by the server."
+msgstr "Die Version deines Clients wird vom Server nicht unterstützt."
+
+#: src/base/proto.c:74
+msgid "The timeout of ping from server is out"
+msgstr "Zeitüberschreitung des Pings vom Server"
+
+#: src/base/proto.c:78
+msgid "The maximum amount of connected players has been exceeded!"
+msgstr "Die maximale Anzahl der verbundenen Spieler wurde erreicht!"
+
+#: src/base/server.c:277
+#: src/client/client.c:151
+#, c-format
+msgid "Sending: \"%s\""
+msgstr "Gesendet: \"%s\""
+
+#: src/base/server.c:304
+#: src/client/client.c:224
+#, c-format
+msgid "Recieved: \"%s\""
+msgstr "Empfangen: \"%s\""
+
+#: src/base/serverSendMsg.c:139
+#: src/base/shot.c:124
+#: src/base/tux.c:153
+msgid "Type variable has a really wierd value!"
+msgstr "Typ Variable hat einen sehr merkwürdigen Wert!"
+
+#: src/base/shareFunction.c:41
+#, c-format
+msgid "Adding  \"%s\" to share function.\n"
+msgstr "Füge \"%s\" zur share Funktion hinzu.\n"
+
+#: src/base/storage.c:75
+#, c-format
+msgid "%s %s was not found in storage!\n"
+msgstr "%s %s wurde nicht gefunden!\n"
+
+#: src/base/tcp_server.c:66
+#: src/base/udp_server.c:64
+#, c-format
+msgid "New client \"%s\" on port \"%d\" connected"
+msgstr "Neuer Client \"%s\" auf Port \"%d\" verbunden"
+
+#: src/base/tcp_server.c:109
+#: src/base/udp_server.c:80
+#, c-format
+msgid "Client \"%s\" on port \"%d\" disconnected"
+msgstr "Client \"%s\" auf Port \"%d\" getrennt"
+
+#: src/base/tcp_server.c:134
+#: src/base/tcp_server.c:148
+#: src/base/udp_server.c:100
+#: src/base/udp_server.c:111
+#, c-format
+msgid "Starting server: \"%s\" on port: \"%d\"\n"
+msgstr "Starte Server: \"%s\" auf Port: \"%d\"\n"
+
+#: src/base/tcp_server.c:136
+#: src/base/tcp_server.c:151
+#: src/base/udp_server.c:102
+#: src/base/udp_server.c:113
+#, c-format
+msgid "Starting server: \"%s\" on port: \"%d\" FAILED!\n"
+msgstr "Starten von Server: \"%s\" auf Port: \"%d\" FEHLGESCHLAGEN!\n"
+
+#: src/base/tcp_server.c:281
+#: src/base/tcp_server.c:286
+#: src/base/udp_server.c:236
+#: src/base/udp_server.c:241
+#, c-format
+msgid "Closing port: \"%d\"\n"
+msgstr "Schliesse Port: \"%d\"\n"
+
+#: src/base/textFile.c:82
+#, c-format
+msgid "ERROR: unable to get file status for %s!\n"
+msgstr "FEHLER: konnte Status für Datei %s nicht ermitteln!\n"
+
+#: src/base/textFile.c:88
+#, c-format
+msgid "ERROR: unable to open file %s for reading\n"
+msgstr "FEHLER: konnte die Datei %s nicht öffnen\n"
+
+#: src/base/textFile.c:95
+#, c-format
+msgid "ERROR: unable to read data from file %s\n"
+msgstr "FEHLER: Konnte keine Daten aus der Datei %s auslesen\n"
+
+#: src/base/textFile.c:120
+#, c-format
+msgid ""
+"Printing file: \"%s\"\n"
+"\n"
+msgstr "Schreibe Datei: \"%s\"\n"
+
+#: src/base/tux.c:190
+msgid "p->control has a really wierd value!"
+msgstr "p->control hat einen sehr merkwürdigen Wert!"
+
+#: src/base/udp_server.c:182
+#, c-format
+msgid "Client was not FOUND!\n"
+msgstr "Client wurde NICHT gefunden!\n"
+
+#: src/base/udp_server.c:245
+msgid "Quitting UDP\n"
+msgstr "Beende UDP\n"
+
 #: src/base/downServer.c:72
 msgid "ERR Arena not found !\n"
 msgstr "FEHLER Arena nicht gefunden!\n"
@@ -332,145 +349,197 @@ msgid "ERR Server has a problem !\n"
 msgstr "FEHLER Server hatte ein Problem!\n"
 
 #: src/base/downServer.c:134
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to initialize download server!\n"
-msgstr "Konnte Netzwerk Spiel nicht als Server initialisieren!\n"
+msgstr "Konnte Download-Server nicht initialisieren!\n"
 
-#: src/base/main.c:97
+#: src/client/client.c:99
 #, c-format
-msgid ""
-"File %s not found !\n"
-"Program shutdown !\n"
-msgstr ""
-"Datei %s nicht gefunden !\n"
-"Beende Programm!\n"
+msgid "Connected to: %s on port: %d via UDP\n"
+msgstr "Verbunden mit: %s auf Port: %d via UDP\n"
 
-#: src/base/main.c:163
+#: src/client/client.c:136
 #, c-format
-msgid ""
-"WinSock initialization failed !\n"
-"Program shutdown !\n"
-msgstr ""
-"WinSock Initialisierung fehlgeschlagen!\n"
-"Beende Programm!\n"
+msgid "Server did not respond!\n"
+msgstr "Server antwortet nicht!\n"
 
-#: src/base/arenaFile.c:123
-msgid "Loaded new arena...\n"
-msgstr "Lade neue Arena...\n"
+#: src/client/client.c:137
+msgid "Server is not running or being blocked. I was unable to connect."
+msgstr "Server läuft nicht oder wird geblockt. Konnte mich nicht verbinden."
 
-#: src/base/arenaFile.c:336
-#, fuzzy, c-format
-msgid "Load arena file from %s\n"
-msgstr "Lade Bild: %s\n"
+#: src/client/client.c:316
+#, c-format
+msgid "down: %d\n"
+msgstr "Runter: %d\n"
 
-#: src/base/arenaFile.c:341
-#, fuzzy, c-format
-msgid "Director %s not found !\n"
-msgstr "Pipe ID für Pipe \"%d\" wurde nicht gefunden\n"
+#: src/client/client.c:316
+#, c-format
+msgid "up  : %d\n"
+msgstr "Hoch: %d\n"
 
-#: src/base/arenaFile.c:360
-#, fuzzy, c-format
-msgid "Loading arena: %s\n"
-msgstr "Lade Bild: %s\n"
+#: src/client/client.c:342
+msgid "Closing UDP connection.\n"
+msgstr "Trenne UDP Verbindung.\n"
 
-#: src/base/homeDirector.c:22
+#: src/client/configFile.c:144
 #, c-format
-msgid "Environment variable HOME not found!\n"
-msgstr "Umgebungsvariable HOME nicht gefunden!\n"
+msgid "ADDING: \"%s\" into config file.\n"
+msgstr "Füge \"%s\" zur Config-Datei hinzu.\n"
 
-#: src/base/homeDirector.c:30
+#: src/client/font.c:39
 #, c-format
-msgid "Creating home directory %s.\n"
-msgstr "Erstelle Home Verzeichnis %s.\n"
+msgid "Loading font: \"%s\"\n"
+msgstr "Lade Schriftart: \"%s\"\n"
 
-#: src/base/homeDirector.c:37
+#: src/client/font.c:131
+msgid "Unloading font\n"
+msgstr "Entlade Schriftart\n"
+
+#: src/client/game.c:109
+msgid "Quitting TUXANCI...\n"
+msgstr "Beende TUXANCI...\n"
+
+#: src/client/image.c:29
+msgid "Initializing image database\n"
+msgstr "Initialisiere Bild Datenbank\n"
+
+#: src/client/image.c:189
 #, c-format
-msgid "Unable to create home directory!\n"
-msgstr "Konnte Home Verzeichnis nicht erstellen!\n"
+msgid "Loading image %s\n"
+msgstr "Lade Bild %s\n"
 
-#: src/base/gun.c:51
-msgid "There is wrong value in course variable!"
-msgstr "Falscher Wert in Kurs-Variable!"
+#: src/client/image.c:296
+msgid "Quitting image database\n"
+msgstr "Schliesse Bild Datenbank\n"
 
-#: src/base/proto.c:66
+#: src/client/interface.c:70
 #, c-format
-msgid "Proto error code: \"%d\"\n"
-msgstr "Proto Fehlermeldung: \"%d\"\n"
+msgid "Unable to switch to FULLSCREEN mode!\n"
+msgstr "Kann nicht in Vollbild Modus wechseln!\n"
 
-#: src/base/proto.c:70
-msgid "Version of your client isn't supported by the server."
-msgstr "Die Version deines Clients wird vom Server nicht unterstützt."
+#: src/client/interface.c:76
+#, c-format
+msgid "Unable to switch to WINDOW mode! Error: %s\n"
+msgstr "Kann nicht in Fenster Modus wechseln! Error: %s\n"
 
-#: src/base/proto.c:74
-msgid "The timeout of ping from server is out"
-msgstr "Zeitüberschreitung des Pings vom Server"
+#: src/client/interface.c:122
+msgid "Initializing SDL system\n"
+msgstr "Initialisiere SDL System\n"
 
-#: src/base/proto.c:78
-msgid "The maximum amount of connected players has been exceeded!"
-msgstr "Die maximale Anzahl der verbundenen Spieler wurde erreicht!"
+#: src/client/interface.c:212
+#, c-format
+msgid "Pressed key with SDL value: %d\n"
+msgstr "Taste mit SDL Wert %d gedrückt\n"
 
-#: src/screen/screen_table.c:93
+#: src/client/interface.c:303
 #, c-format
-msgid "Highscore file: \"%s\" was not loaded!"
-msgstr "Highscore Datei: \"%s\" wurde nicht geladen!"
+msgid "Unable to change WINDOW resolution! Error: %s\n"
+msgstr "Kann Fensterauflösung nicht ändern! Error: %s\n"
 
-#: src/screen/screen_table.c:142 src/screen/screen_setting.c:215
-#: src/server/highScore.c:21
-#, fuzzy, c-format
-msgid "I am unable to load: \"%s\"!\n"
-msgstr "Ich konnte dies nicht laden: \"%s\" !\n"
+#: src/client/interface.c:332
+msgid "Quitting SDL\n"
+msgstr "Beende SDL\n"
 
-#: src/screen/screen_table.c:143 src/screen/screen_setting.c:216
-#: src/server/highScore.c:22
+#: src/client/keyboardBuffer.c:69
 #, c-format
-msgid "Creating: \"%s\"\n"
-msgstr "Erstelle: \"%s\"\n"
+msgid "Keyboard Buffer overrun! Dropping key: %02x\n"
+msgstr "Tastatur Pufferüberlauf! Verwerfe Taste: %02x\n"
 
-#: src/screen/screen_table.c:150 src/screen/screen_setting.c:222
-#: src/server/highScore.c:31
-#, fuzzy, c-format
-msgid "I was unable to create: \"%s\"!\n"
-msgstr "Ich konnte \"%s\" nicht erstellen!\n"
+#: src/client/keyboardBuffer.c:94
+#, c-format
+msgid "Keyboard Buffer underrun!\n"
+msgstr "Tastatur Buffer underrun!\n"
 
-#: src/screen/screen_table.c:195 src/screen/screen_downArena.c:376
-#: src/screen/screen_browser.c:680 src/screen/screen_setting.c:329
-#: src/screen/screen_choiceArena.c:140 src/screen/screen_credits.c:102
-#: src/screen/screen_gameType.c:214
-msgid "back"
-msgstr "Zurück"
+#: src/client/keyboardBuffer.c:145
+#, c-format
+msgid "Keyboard buffer is not empty!\n"
+msgstr "Tastatur Puffer ist nicht leer!\n"
 
-#: src/screen/screen_world.c:69
+#: src/client/saveLoad.c:85
 #, c-format
-msgid "Network initialization error!\n"
-msgstr "Netzwerk Fehler!\n"
+msgid "Saving game to: \"%s\"\n"
+msgstr "Speichere Spiel nach: \"%s\"\n"
 
-#: src/screen/screen_world.c:430
-msgid "Tux has not defined controls!"
-msgstr "Tux hat keine definierte Steuerung!"
+#: src/client/saveLoad.c:94
+#, c-format
+msgid "I was unable to save: \"%s\"\n"
+msgstr "Ich konnte \"%s\" nicht speichern \n"
 
-#: src/screen/screen_world.c:607
-msgid "Quitting screen world\n"
-msgstr "Beende Welt\n"
+#: src/client/saveLoad.c:251
+#, c-format
+msgid "Loadig game from file: \"%s\"\n"
+msgstr "Lade Spiel von Datei: \"%s\"\n"
 
-#: src/screen/screen_mainMenu.c:101
-msgid "Start game"
-msgstr "Starte Spiel"
+#: src/client/saveLoad.c:259
+#, c-format
+msgid "Unable to load save: \"%s\"\n"
+msgstr "Fehler beim Laden von Spielstand: \"%s\"\n"
 
-#: src/screen/screen_mainMenu.c:102
-msgid "Settings"
-msgstr "Einstellungen"
+#: src/client/screen.c:60
+#, c-format
+msgid "Registering screen: \"%s\"\n"
+msgstr "Registriere Bildschirm: \"%s\"\n"
 
-#: src/screen/screen_mainMenu.c:103
-msgid "Highscore"
-msgstr "Highscore"
+#: src/client/screen.c:107
+#, c-format
+msgid "Stopping screen: \"%s\"\n"
+msgstr "Beende Bildschirm: \"%s\"\n"
 
-#: src/screen/screen_mainMenu.c:104
-msgid "Credits"
-msgstr "Credits"
+#: src/client/screen.c:116
+#, c-format
+msgid "Starting screen: \"%s\"\n"
+msgstr "Starte Bildschirm: \"%s\"\n"
 
-#: src/screen/screen_mainMenu.c:105
-msgid "Quit game"
-msgstr "Beende Spiel"
+#: src/net/tcp.c:66
+#: src/net/udp.c:129
+#, c-format
+msgid "Unable to create socket when connecting!\n"
+msgstr "Konnte Socket beim Verbinden nicht erstellen!\n"
+
+#: src/net/tcp.c:95
+#, c-format
+msgid "Unable to bint to port: %d\n"
+msgstr "Fehler beim Binden an Port: %d\n"
+
+#: src/net/tcp.c:168
+#: src/net/udp.c:301
+msgid "Bad IP proto!"
+msgstr "Schlechte IP proto!"
+
+#: src/net/tcp.c:196
+#, c-format
+msgid "Unable to create TCP socket!\n"
+msgstr "Fehler beim Erstellen des TCP Sockets!\n"
+
+#: src/net/udp.c:68
+#, c-format
+msgid "Unable to create socket when binding!\n"
+msgstr "Konnte Socket beim Binden nicht erstellen!\n"
+
+#: src/net/udp.c:96
+#, c-format
+msgid "Unable to set socket %s %d!\n"
+msgstr "Konnte Socket %s %d nicht setzen!\n"
+
+#: src/net/udp.c:216
+#, c-format
+msgid "Unable to read form socket %d %s %d!\n"
+msgstr "Fehler beim Lesen von Socket %d %s %d!\n"
+
+#: src/net/udp.c:256
+#, c-format
+msgid "Unable to write on socket %d %s %d!\n"
+msgstr "Fehler beim Schreiben auf Socket %d %s %d!\n"
+
+#: src/screen/screen_browser.c:680
+#: src/screen/screen_choiceArena.c:140
+#: src/screen/screen_credits.c:102
+#: src/screen/screen_downArena.c:376
+#: src/screen/screen_gameType.c:214
+#: src/screen/screen_setting.c:329
+#: src/screen/screen_table.c:195
+msgid "back"
+msgstr "Zurück"
 
 #: src/screen/screen_browser.c:682
 msgid "Play"
@@ -488,7 +557,8 @@ msgstr "Server"
 msgid "version"
 msgstr "Version"
 
-#: src/screen/screen_browser.c:690 src/screen/screen_gameType.c:237
+#: src/screen/screen_browser.c:690
+#: src/screen/screen_gameType.c:237
 msgid "IP"
 msgstr "IP"
 
@@ -504,13 +574,89 @@ msgstr "Clients"
 msgid "ping"
 msgstr "Ping"
 
+#: src/screen/screen_choiceArena.c:141
+#: src/screen/screen_gameType.c:215
+msgid "play"
+msgstr "spielen"
+
+#: src/screen/screen_credits.c:127
+#, c-format
+msgid "Credit file not found... %s/%s"
+msgstr "Credit Datei nicht gefunden... %s/%s"
+
+#: src/screen/screen_gameType.c:216
+msgid "browser"
+msgstr "Browser"
+
+#: src/screen/screen_gameType.c:232
+msgid "Local game"
+msgstr "Lokales Spiel"
+
+#: src/screen/screen_gameType.c:233
+msgid "Set up a server"
+msgstr "Erstelle einen Server"
+
+#: src/screen/screen_gameType.c:234
+msgid "Network game"
+msgstr "Netzwerk Spiel"
+
+#: src/screen/screen_gameType.c:238
+msgid "port"
+msgstr "Port"
+
+#: src/screen/screen_gameType.c:288
+msgid "Unknown game type!"
+msgstr "Unbekannter Spieltyp!"
+
+#: src/screen/screen_gameType.c:342
+msgid "Unknown IP protocol!\n"
+msgstr "Unbekanntes IP Protokoll!\n"
+
+#: src/screen/screen_mainMenu.c:101
+msgid "Start game"
+msgstr "Starte Spiel"
+
+#: src/screen/screen_mainMenu.c:102
+msgid "Settings"
+msgstr "Einstellungen"
+
+#: src/screen/screen_mainMenu.c:103
+msgid "Highscore"
+msgstr "Highscore"
+
+#: src/screen/screen_mainMenu.c:104
+msgid "Credits"
+msgstr "Credits"
+
+#: src/screen/screen_mainMenu.c:105
+msgid "Quit game"
+msgstr "Beende Spiel"
+
+#: src/screen/screen_setting.c:215
+#: src/screen/screen_table.c:142
+#: src/server/highScore.c:21
+#, c-format
+msgid "I am unable to load: \"%s\"!\n"
+msgstr "Ich konnte dies nicht laden: \"%s\"!\n"
+
+#: src/screen/screen_setting.c:216
+#: src/screen/screen_table.c:143
+#: src/server/highScore.c:22
+#, c-format
+msgid "Creating: \"%s\"\n"
+msgstr "Erstelle: \"%s\"\n"
+
+#: src/screen/screen_setting.c:222
+#: src/screen/screen_table.c:150
+#: src/server/highScore.c:31
+#, c-format
+msgid "I was unable to create: \"%s\"!\n"
+msgstr "Ich konnte \"%s\" nicht erstellen!\n"
+
 #: src/screen/screen_setting.c:285
 #, c-format
-msgid ""
-"I am unable to save configure file, because config file was not "
-"initialised!\n"
-msgstr ""
-"Konnte Config-Datei nicht speichern, da sie nicht initialisiert wurde!\n"
+msgid "I am unable to save configure file, because config file was not initialised!\n"
+msgstr "Konnte Config-Datei nicht speichern, da sie nicht initialisiert wurde!\n"
 
 #: src/screen/screen_setting.c:331
 msgid "controls"
@@ -524,7 +670,8 @@ msgstr "Musik:"
 msgid "Sound:"
 msgstr "Ton:"
 
-#: src/screen/screen_setting.c:345 src/screen/screen_setting.c:348
+#: src/screen/screen_setting.c:345
+#: src/screen/screen_setting.c:348
 msgid "AI:"
 msgstr "KI"
 
@@ -567,23 +714,28 @@ msgstr "Spieler 2"
 msgid "Up"
 msgstr "Hoch:"
 
-#: src/screen/screen_settingKeys.c:393 src/screen/screen_settingKeys.c:421
+#: src/screen/screen_settingKeys.c:393
+#: src/screen/screen_settingKeys.c:421
 msgid "Down:"
 msgstr "Runter:"
 
-#: src/screen/screen_settingKeys.c:397 src/screen/screen_settingKeys.c:425
+#: src/screen/screen_settingKeys.c:397
+#: src/screen/screen_settingKeys.c:425
 msgid "Left:"
 msgstr "Links:"
 
-#: src/screen/screen_settingKeys.c:401 src/screen/screen_settingKeys.c:429
+#: src/screen/screen_settingKeys.c:401
+#: src/screen/screen_settingKeys.c:429
 msgid "Right:"
 msgstr "Rechts:"
 
-#: src/screen/screen_settingKeys.c:405 src/screen/screen_settingKeys.c:433
+#: src/screen/screen_settingKeys.c:405
+#: src/screen/screen_settingKeys.c:433
 msgid "Fire gun:"
 msgstr "Feuer:"
 
-#: src/screen/screen_settingKeys.c:409 src/screen/screen_settingKeys.c:437
+#: src/screen/screen_settingKeys.c:409
+#: src/screen/screen_settingKeys.c:437
 msgid "Switch gun:"
 msgstr "Wechsle Waffe:"
 
@@ -595,179 +747,59 @@ msgstr "Spieler 1"
 msgid "Up:"
 msgstr "Hoch:"
 
-#: src/screen/screen_choiceArena.c:141 src/screen/screen_gameType.c:215
-msgid "play"
-msgstr "spielen"
-
-#: src/screen/screen_credits.c:127
-#, c-format
-msgid "Credit file not found... %s/%s"
-msgstr "Credit Datei nicht gefunden... %s/%s"
-
-#: src/screen/screen_gameType.c:216
-msgid "browser"
-msgstr "Browser"
-
-#: src/screen/screen_gameType.c:232
-msgid "Local game"
-msgstr "Lokales Spiel"
-
-#: src/screen/screen_gameType.c:233
-msgid "Set up a server"
-msgstr "Erstelle einen Server"
-
-#: src/screen/screen_gameType.c:234
-msgid "Network game"
-msgstr "Netzwerk Spiel"
-
-#: src/screen/screen_gameType.c:238
-msgid "port"
-msgstr "Port"
-
-#: src/screen/screen_gameType.c:288
-msgid "Unknown game type!"
-msgstr "Unbekannter Spieltyp!"
-
-#: src/screen/screen_gameType.c:342
-msgid "Unknown IP protocol!\n"
-msgstr "Unbekanntes IP Protokoll!\n"
-
-#: src/widget/widget_button.c:84
-msgid "Event caught\n"
-msgstr "Event caught\n"
-
-#: src/widget/widget_textfield.c:169
-msgid "Bad filter!"
-msgstr "Schlechter Filter!"
-
-#: src/audio/sound.c:44
-msgid "Initializing sound...\n"
-msgstr "Initialisiere Sound...\n"
-
-#: src/audio/sound.c:56
-#, c-format
-msgid "Loading sound file: %s\n"
-msgstr "Lade Sound-Datei: %s\n"
-
-#: src/audio/sound.c:63
-#, c-format
-msgid "Unable to load sound file: %s with error: %s\n"
-msgstr "Laden von Sound-Datei: %s fehlgeschlagen mit Fehler: %s\n"
-
-#: src/audio/sound.c:76
-#, c-format
-msgid "Unable to playback sound with error: %s\n"
-msgstr "Folgender Fehler bei Audio-Wiedergabe: %s\n"
-
-#: src/audio/sound.c:144
-msgid "Quitting sound...\n"
-msgstr "Beende Ton...\n"
-
-#: src/audio/music.c:47
-msgid "Initializing music...\n"
-msgstr "Initialisiere Musik...\n"
-
-#: src/audio/music.c:58
-#, c-format
-msgid "Loading music file: %s\n"
-msgstr "Lade Musik-Datei: %s\n"
-
-#: src/audio/music.c:71
-#, c-format
-msgid "Unable to load music from file: %s\n"
-msgstr "Konnte Musik von Datei %s nicht laden\n"
-
-#: src/audio/music.c:122
-msgid "Stopping music...\n"
-msgstr "Beende Musik...\n"
-
-#: src/audio/music.c:161
-#, c-format
-msgid "Playing music file %s\n"
-msgstr "Spiele Musik-Datei %s\n"
-
-#: src/audio/music.c:224
-msgid "Quitting music...\n"
-msgstr "Beende Musik...\n"
-
-#: src/audio/audio.c:29
-#, c-format
-msgid "Unable to initialize audio: %s\n"
-msgstr "Konnte Ton nicht initialisieren: %s\n"
-
-#: src/audio/audio.c:35
+#: src/screen/screen_table.c:93
 #, c-format
-msgid "Unable to create proper audio settings: %s\n"
-msgstr "Konnte keine passenden Audio-Einstellungen vornehmen: %s\n"
-
-#: src/audio/audio.c:43
-msgid "Initializing audio system...\n"
-msgstr "Initialisiere Audio-System...\n"
-
-#: src/audio/audio.c:56
-msgid "Quitting audio...\n"
-msgstr "Beende Audio...\n"
+msgid "Highscore file: \"%s\" was not loaded!"
+msgstr "Highscore Datei: \"%s\" wurde nicht geladen!"
 
-#: src/net/udp.c:68
+#: src/screen/screen_world.c:69
 #, c-format
-msgid "Unable to create socket when binding!\n"
-msgstr "Konnte Socket beim Binden nicht erstellen!\n"
+msgid "Network initialization error!\n"
+msgstr "Netzwerk Fehler!\n"
 
-#: src/net/udp.c:96
-#, c-format
-msgid "Unable to set socket %s %d!\n"
-msgstr "Konnte Socket %s %d nicht setzen!\n"
+#: src/screen/screen_world.c:430
+msgid "Tux has not defined controls!"
+msgstr "Tux hat keine definierte Steuerung!"
 
-#: src/net/udp.c:129 src/net/tcp.c:66
-#, c-format
-msgid "Unable to create socket when connecting!\n"
-msgstr "Konnte Socket beim Verbinden nicht erstellen!\n"
+#: src/screen/screen_world.c:607
+msgid "Quitting screen world\n"
+msgstr "Beende Welt\n"
 
-#: src/net/udp.c:216
+#: src/server/log.c:19
 #, c-format
-msgid "Unable to read form socket %d %s %d!\n"
-msgstr "Fehler beim Lesen von Socket %d %s %d!\n"
+msgid "Opening logfile \"%s\" failed!\n"
+msgstr "Öffnen von Logfile \"%s\" fehlgeschlagen!\n"
 
-#: src/net/udp.c:256
+#: src/server/log.c:23
 #, c-format
-msgid "Unable to write on socket %d %s %d!\n"
-msgstr "Fehler beim Schreiben auf Socket %d %s %d!\n"
-
-#: src/net/udp.c:301 src/net/tcp.c:168
-msgid "Bad IP proto!"
-msgstr "Schlechte IP proto!"
+msgid "I use logfile: \"%s\")\n"
+msgstr "Ich verwende Logfile: \"%s\")\n"
 
-#: src/net/tcp.c:95
-#, c-format
-msgid "Unable to bint to port: %d\n"
-msgstr "Fehler beim Binden an Port: %d\n"
+#: src/server/log.c:54
+msgid "Really bad log value!"
+msgstr "Sehr schlechter Log-Wert!"
 
-#: src/net/tcp.c:196
+#: src/server/publicServer.c:230
 #, c-format
-msgid "Unable to create TCP socket!\n"
-msgstr "Fehler beim Erstellen des TCP Sockets!\n"
-
-#: src/server/publicServer.c:231
-#, fuzzy, c-format
 msgid "I dont load arena %s!\n"
-msgstr "Lade Bild: %s\n"
+msgstr "Lade Arena %s nicht!\n"
 
-#: src/server/publicServer.c:256
+#: src/server/publicServer.c:255
 #, c-format
 msgid "I was unable to open config file!\n"
 msgstr "Konnte Config-Datei nicht öffnen.!\n"
 
-#: src/server/publicServer.c:273
+#: src/server/publicServer.c:272
 #, c-format
 msgid "Unable to initialize network socket!\n"
 msgstr "Fehler beim Initialisieren des Netzwerk Sockets!\n"
 
-#: src/server/publicServer.c:280
+#: src/server/publicServer.c:279
 #, c-format
 msgid "Unable to contact MasterServer!)\n"
 msgstr "Kann mich mit MasterServer nicht verbinden!\n"
 
-#: src/server/publicServer.c:327
+#: src/server/publicServer.c:326
 msgid "Quitting public server\n"
 msgstr "Beende öffentlichen Server\n"
 
@@ -781,21 +813,16 @@ msgstr "Lade Config-Datei von: \"%s\"\n"
 msgid "I was unable to load config file. Falling back to defaults!\n"
 msgstr "Konnte Config-Datei nicht öffnen. Starte mit Standardwerten!\n"
 
-#: src/server/log.c:19
-#, c-format
-msgid "Opening logfile \"%s\" failed!\n"
-msgstr "Öffnen von Logfile \"%s\" fehlgeschlagen!\n"
-
-#: src/server/log.c:23
-#, c-format
-msgid "I use logfile: \"%s\")\n"
-msgstr "Ich verwende Logfile: \"%s\")\n"
-
-#: src/server/log.c:54
-msgid "Really bad log value!"
-msgstr "Sehr schlechter Log-Wert!"
-
 #: src/server/highScore.c:26
 #, c-format
 msgid "Scorefile: \"%s\"\n"
 msgstr "Scorefile: \"%s\"\n"
+
+#: src/widget/widget_button.c:84
+msgid "Event caught\n"
+msgstr "Event caught\n"
+
+#: src/widget/widget_textfield.c:169
+msgid "Bad filter!"
+msgstr "Schlechter Filter!"
+
diff --git a/po/tuxanci.pot b/po/tuxanci.pot
index 44efb15..866f97c 100644
--- a/po/tuxanci.pot
+++ b/po/tuxanci.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-30 00:30+0100\n"
+"POT-Creation-Date: 2008-11-30 23:26+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,185 +16,242 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/client/client.c:99
+#: src/audio/audio.c:30
 #, c-format
-msgid "Connected to: %s on port: %d via UDP\n"
+msgid "Error! Unable to initialize audio: %s\n"
 msgstr ""
 
-#: src/client/client.c:136
+#: src/audio/audio.c:36
 #, c-format
-msgid "Server did not respond!\n"
+msgid "Unable to create proper audio settings: %s\n"
 msgstr ""
 
-#: src/client/client.c:137
-msgid "Server is not running or being blocked. I was unable to connect."
+#: src/audio/audio.c:44
+msgid "Initializing audio\n"
 msgstr ""
 
-#: src/client/client.c:151 src/base/server.c:277
-#, c-format
-msgid "Sending: \"%s\""
+#: src/audio/audio.c:57
+msgid "Quitting audio\n"
 msgstr ""
 
-#: src/client/client.c:224 src/base/server.c:304
-#, c-format
-msgid "Recieved: \"%s\""
+#: src/audio/music.c:48
+msgid "Initializing music\n"
 msgstr ""
 
-#: src/client/client.c:316
+#: src/audio/music.c:59
 #, c-format
-msgid "down: %d\n"
+msgid "Loading a file with music: %s\n"
 msgstr ""
 
-#: src/client/client.c:316
+#: src/audio/music.c:72
 #, c-format
-msgid "up  : %d\n"
+msgid "Unable to load music from file %s\n"
 msgstr ""
 
-#: src/client/client.c:342
-msgid "Closing UDP connection.\n"
+#: src/audio/music.c:125
+msgid "Stopping music\n"
 msgstr ""
 
-#: src/client/interface.c:70
+#: src/audio/music.c:165
 #, c-format
-msgid "Unable to switch to FULLSCREEN mode!\n"
+msgid "Playing music from file %s\n"
 msgstr ""
 
-#: src/client/interface.c:76
-#, c-format
-msgid "Unable to switch to WINDOW mode! Error: %s\n"
+#: src/audio/music.c:229
+msgid "Quitting music\n"
 msgstr ""
 
-#: src/client/interface.c:122
-msgid "Initializing SDL system\n"
+#: src/audio/sound.c:45
+msgid "Initializing sound\n"
 msgstr ""
 
-#: src/client/interface.c:212
+#: src/audio/sound.c:57
 #, c-format
-msgid "Pressed key with SDL value: %d\n"
+msgid "Loading sound file: %s\n"
 msgstr ""
 
-#: src/client/interface.c:303
+#: src/audio/sound.c:64
 #, c-format
-msgid "Unable to change WINDOW resolution! Error: %s\n"
+msgid "Unable to load sound from file %s with error: %s\n"
 msgstr ""
 
-#: src/client/interface.c:332
-msgid "Quitting SDL\n"
+#: src/audio/sound.c:77
+#, c-format
+msgid "Unable to play sound with error: %s\n"
 msgstr ""
 
-#: src/client/configFile.c:144
+#: src/audio/sound.c:146
+msgid "Quitting sound\n"
+msgstr ""
+
+#: src/base/arenaFile.c:123
+msgid "Loaded new arena...\n"
+msgstr ""
+
+#: src/base/arenaFile.c:336
 #, c-format
-msgid "ADDING: \"%s\" into config file.\n"
+msgid "Load arena file from %s\n"
 msgstr ""
 
-#: src/client/image.c:29
-msgid "Initializing image database\n"
+#: src/base/arenaFile.c:341
+#, c-format
+msgid "Director %s not found !\n"
 msgstr ""
 
-#: src/client/image.c:189
+#: src/base/arenaFile.c:360
 #, c-format
-msgid "Loading image %s\n"
+msgid "Loading arena: %s\n"
 msgstr ""
 
-#: src/client/image.c:296
-msgid "Quitting image database\n"
+#: src/base/checkFront.c:90
+msgid "Bad type of front!"
 msgstr ""
 
-#: src/client/font.c:39
+#: src/base/gun.c:51
+msgid "There is wrong value in course variable!"
+msgstr ""
+
+#: src/base/homeDirector.c:22
 #, c-format
-msgid "Loading font: \"%s\"\n"
+msgid "Environment variable HOME not found!\n"
 msgstr ""
 
-#: src/client/font.c:131
-msgid "Unloading font\n"
+#: src/base/homeDirector.c:30
+#, c-format
+msgid "Creating home directory %s.\n"
 msgstr ""
 
-#: src/client/keyboardBuffer.c:69
+#: src/base/homeDirector.c:37
 #, c-format
-msgid "Keyboard Buffer overrun! Dropping key: %02x\n"
+msgid "Unable to create home directory!\n"
 msgstr ""
 
-#: src/client/keyboardBuffer.c:94
+#: src/base/idManager.c:41
+msgid "Starting ID manger\n"
+msgstr ""
+
+#: src/base/idManager.c:71
+msgid "No free ID left!"
+msgstr ""
+
+#: src/base/idManager.c:110 src/base/idManager.c:132
+msgid "This kind of ID was never registered!"
+msgstr ""
+
+#: src/base/idManager.c:179
 #, c-format
-msgid "Keyboard Buffer underrun!\n"
+msgid "ID %d does not exist\n"
 msgstr ""
 
-#: src/client/keyboardBuffer.c:145
+#: src/base/idManager.c:186
 #, c-format
-msgid "Keyboard buffer is not empty!\n"
+msgid "ID %d (count %d)\n"
 msgstr ""
 
-#: src/client/screen.c:60
+#: src/base/idManager.c:193
+msgid "Quitting ID manger\n"
+msgstr ""
+
+#: src/base/main.c:97
 #, c-format
-msgid "Registering screen: \"%s\"\n"
+msgid ""
+"File %s not found !\n"
+"Program shutdown !\n"
 msgstr ""
 
-#: src/client/screen.c:107
+#: src/base/main.c:163
 #, c-format
-msgid "Stopping screen: \"%s\"\n"
+msgid ""
+"WinSock initialization failed !\n"
+"Program shutdown !\n"
 msgstr ""
 
-#: src/client/screen.c:116
+#: src/base/modules.c:70 src/base/modules.c:76
 #, c-format
-msgid "Starting screen: \"%s\"\n"
+msgid "Error %s occured when using getFce function!\n"
 msgstr ""
 
-#: src/client/saveLoad.c:85
+#: src/base/modules.c:146
 #, c-format
-msgid "Saving game to: \"%s\"\n"
+msgid "Unable to map file %s!\n"
 msgstr ""
 
-#: src/client/saveLoad.c:94
+#: src/base/modules.c:163
 #, c-format
-msgid "I was unable to save: \"%s\"\n"
+msgid "Loading module: \"%s\"\n"
 msgstr ""
 
-#: src/client/saveLoad.c:251
+#: src/base/modules.c:166
 #, c-format
-msgid "Loadig game from file: \"%s\"\n"
+msgid "Failed initialization of module \"%s\""
 msgstr ""
 
-#: src/client/saveLoad.c:259
+#: src/base/modules.c:184
+msgid "Destroing module...\n"
+msgstr ""
+
+#: src/base/modules.c:222
 #, c-format
-msgid "Unable to load save: \"%s\"\n"
+msgid "Loading module %s failed!\n"
 msgstr ""
 
-#: src/client/game.c:109
-msgid "Quitting TUXANCI...\n"
+#: src/base/myTimer.c:126
+msgid "Timer is really weirdly set!"
 msgstr ""
 
-#: src/base/textFile.c:82
+#: src/base/myTimer.c:147
+msgid "There is no such ID!"
+msgstr ""
+
+#: src/base/net_multiplayer.c:57 src/base/net_multiplayer.c:64
 #, c-format
-msgid "ERROR: unable to get file status for %s!\n"
+msgid "Unable to inicialize network game as server!\n"
 msgstr ""
 
-#: src/base/textFile.c:88
+#: src/base/net_multiplayer.c:75
 #, c-format
-msgid "ERROR: unable to open file %s for reading\n"
+msgid "Unable to inicialize network game as client!\n"
 msgstr ""
 
-#: src/base/textFile.c:95
+#: src/base/net_multiplayer.c:82 src/base/net_multiplayer.c:105
+#: src/base/net_multiplayer.c:126
+msgid "Variable netGameType has a really weird value!"
+msgstr ""
+
+#: src/base/proto.c:66
 #, c-format
-msgid "ERROR: unable to read data from file %s\n"
+msgid "Proto error code: \"%d\"\n"
 msgstr ""
 
-#: src/base/textFile.c:120
+#: src/base/proto.c:70
+msgid "Version of your client isn't supported by the server."
+msgstr ""
+
+#: src/base/proto.c:74
+msgid "The timeout of ping from server is out"
+msgstr ""
+
+#: src/base/proto.c:78
+msgid "The maximum amount of connected players has been exceeded!"
+msgstr ""
+
+#: src/base/server.c:277 src/client/client.c:151
 #, c-format
-msgid ""
-"Printing file: \"%s\"\n"
-"\n"
+msgid "Sending: \"%s\""
 msgstr ""
 
-#: src/base/checkFront.c:90
-msgid "Bad type of front!"
+#: src/base/server.c:304 src/client/client.c:224
+#, c-format
+msgid "Recieved: \"%s\""
 msgstr ""
 
 #: src/base/serverSendMsg.c:139 src/base/shot.c:124 src/base/tux.c:153
 msgid "Type variable has a really wierd value!"
 msgstr ""
 
-#: src/base/tux.c:190
-msgid "p->control has a really wierd value!"
+#: src/base/shareFunction.c:41
+#, c-format
+msgid "Adding  \"%s\" to share function.\n"
 msgstr ""
 
 #: src/base/storage.c:75
@@ -202,269 +259,263 @@ msgstr ""
 msgid "%s %s was not found in storage!\n"
 msgstr ""
 
-#: src/base/udp_server.c:64 src/base/tcp_server.c:66
+#: src/base/tcp_server.c:66 src/base/udp_server.c:64
 #, c-format
 msgid "New client \"%s\" on port \"%d\" connected"
 msgstr ""
 
-#: src/base/udp_server.c:80 src/base/tcp_server.c:109
+#: src/base/tcp_server.c:109 src/base/udp_server.c:80
 #, c-format
 msgid "Client \"%s\" on port \"%d\" disconnected"
 msgstr ""
 
-#: src/base/udp_server.c:100 src/base/udp_server.c:111
 #: src/base/tcp_server.c:134 src/base/tcp_server.c:148
+#: src/base/udp_server.c:100 src/base/udp_server.c:111
 #, c-format
 msgid "Starting server: \"%s\" on port: \"%d\"\n"
 msgstr ""
 
-#: src/base/udp_server.c:102 src/base/udp_server.c:113
 #: src/base/tcp_server.c:136 src/base/tcp_server.c:151
+#: src/base/udp_server.c:102 src/base/udp_server.c:113
 #, c-format
 msgid "Starting server: \"%s\" on port: \"%d\" FAILED!\n"
 msgstr ""
 
-#: src/base/udp_server.c:182
-#, c-format
-msgid "Client was not FOUND!\n"
-msgstr ""
-
-#: src/base/udp_server.c:236 src/base/udp_server.c:241
 #: src/base/tcp_server.c:281 src/base/tcp_server.c:286
+#: src/base/udp_server.c:236 src/base/udp_server.c:241
 #, c-format
 msgid "Closing port: \"%d\"\n"
 msgstr ""
 
-#: src/base/udp_server.c:245
-msgid "Quitting UDP\n"
+#: src/base/textFile.c:82
+#, c-format
+msgid "ERROR: unable to get file status for %s!\n"
 msgstr ""
 
-#: src/base/idManager.c:41
-msgid "Starting ID manger\n"
+#: src/base/textFile.c:88
+#, c-format
+msgid "ERROR: unable to open file %s for reading\n"
 msgstr ""
 
-#: src/base/idManager.c:71
-msgid "No free ID left!"
+#: src/base/textFile.c:95
+#, c-format
+msgid "ERROR: unable to read data from file %s\n"
 msgstr ""
 
-#: src/base/idManager.c:110 src/base/idManager.c:132
-msgid "This kind of ID was never registered!"
+#: src/base/textFile.c:120
+#, c-format
+msgid ""
+"Printing file: \"%s\"\n"
+"\n"
 msgstr ""
 
-#: src/base/idManager.c:179
-#, c-format
-msgid "ID %d does not exist\n"
+#: src/base/tux.c:190
+msgid "p->control has a really wierd value!"
 msgstr ""
 
-#: src/base/idManager.c:186
+#: src/base/udp_server.c:182
 #, c-format
-msgid "ID %d (count %d)\n"
+msgid "Client was not FOUND!\n"
 msgstr ""
 
-#: src/base/idManager.c:193
-msgid "Quitting ID manger\n"
+#: src/base/udp_server.c:245
+msgid "Quitting UDP\n"
 msgstr ""
 
-#: src/base/myTimer.c:126
-msgid "Timer is really weirdly set!"
+#: src/base/downServer.c:72
+msgid "ERR Arena not found !\n"
 msgstr ""
 
-#: src/base/myTimer.c:147
-msgid "There is no such ID!"
+#: src/base/downServer.c:81
+msgid "ERR Server has a problem !\n"
 msgstr ""
 
-#: src/base/modules.c:70 src/base/modules.c:76
+#: src/base/downServer.c:134
 #, c-format
-msgid "Error %s occured when using getFce function!\n"
+msgid "Unable to initialize download server!\n"
 msgstr ""
 
-#: src/base/modules.c:146
+#: src/client/client.c:99
 #, c-format
-msgid "Unable to map file %s!\n"
+msgid "Connected to: %s on port: %d via UDP\n"
 msgstr ""
 
-#: src/base/modules.c:163
+#: src/client/client.c:136
 #, c-format
-msgid "Loading module: \"%s\"\n"
+msgid "Server did not respond!\n"
 msgstr ""
 
-#: src/base/modules.c:166
-#, c-format
-msgid "Failed initialization of module \"%s\""
+#: src/client/client.c:137
+msgid "Server is not running or being blocked. I was unable to connect."
 msgstr ""
 
-#: src/base/modules.c:184
-msgid "Destroing module...\n"
+#: src/client/client.c:316
+#, c-format
+msgid "down: %d\n"
 msgstr ""
 
-#: src/base/modules.c:222
+#: src/client/client.c:316
 #, c-format
-msgid "Loading module %s failed!\n"
+msgid "up  : %d\n"
 msgstr ""
 
-#: src/base/shareFunction.c:41
-#, c-format
-msgid "Adding  \"%s\" to share function.\n"
+#: src/client/client.c:342
+msgid "Closing UDP connection.\n"
 msgstr ""
 
-#: src/base/net_multiplayer.c:57 src/base/net_multiplayer.c:64
+#: src/client/configFile.c:144
 #, c-format
-msgid "Unable to inicialize network game as server!\n"
+msgid "ADDING: \"%s\" into config file.\n"
 msgstr ""
 
-#: src/base/net_multiplayer.c:75
+#: src/client/font.c:39
 #, c-format
-msgid "Unable to inicialize network game as client!\n"
+msgid "Loading font: \"%s\"\n"
 msgstr ""
 
-#: src/base/net_multiplayer.c:82 src/base/net_multiplayer.c:105
-#: src/base/net_multiplayer.c:126
-msgid "Variable netGameType has a really weird value!"
+#: src/client/font.c:131
+msgid "Unloading font\n"
 msgstr ""
 
-#: src/base/downServer.c:72
-msgid "ERR Arena not found !\n"
+#: src/client/game.c:109
+msgid "Quitting TUXANCI...\n"
 msgstr ""
 
-#: src/base/downServer.c:81
-msgid "ERR Server has a problem !\n"
+#: src/client/image.c:29
+msgid "Initializing image database\n"
 msgstr ""
 
-#: src/base/downServer.c:134
+#: src/client/image.c:189
 #, c-format
-msgid "Unable to initialize download server!\n"
+msgid "Loading image %s\n"
 msgstr ""
 
-#: src/base/main.c:97
-#, c-format
-msgid ""
-"File %s not found !\n"
-"Program shutdown !\n"
+#: src/client/image.c:296
+msgid "Quitting image database\n"
 msgstr ""
 
-#: src/base/main.c:163
+#: src/client/interface.c:70
 #, c-format
-msgid ""
-"WinSock initialization failed !\n"
-"Program shutdown !\n"
-msgstr ""
-
-#: src/base/arenaFile.c:123
-msgid "Loaded new arena...\n"
+msgid "Unable to switch to FULLSCREEN mode!\n"
 msgstr ""
 
-#: src/base/arenaFile.c:336
+#: src/client/interface.c:76
 #, c-format
-msgid "Load arena file from %s\n"
+msgid "Unable to switch to WINDOW mode! Error: %s\n"
 msgstr ""
 
-#: src/base/arenaFile.c:341
-#, c-format
-msgid "Director %s not found !\n"
+#: src/client/interface.c:122
+msgid "Initializing SDL system\n"
 msgstr ""
 
-#: src/base/arenaFile.c:360
+#: src/client/interface.c:212
 #, c-format
-msgid "Loading arena: %s\n"
+msgid "Pressed key with SDL value: %d\n"
 msgstr ""
 
-#: src/base/homeDirector.c:22
+#: src/client/interface.c:303
 #, c-format
-msgid "Environment variable HOME not found!\n"
+msgid "Unable to change WINDOW resolution! Error: %s\n"
 msgstr ""
 
-#: src/base/homeDirector.c:30
-#, c-format
-msgid "Creating home directory %s.\n"
+#: src/client/interface.c:332
+msgid "Quitting SDL\n"
 msgstr ""
 
-#: src/base/homeDirector.c:37
+#: src/client/keyboardBuffer.c:69
 #, c-format
-msgid "Unable to create home directory!\n"
+msgid "Keyboard Buffer overrun! Dropping key: %02x\n"
 msgstr ""
 
-#: src/base/gun.c:51
-msgid "There is wrong value in course variable!"
+#: src/client/keyboardBuffer.c:94
+#, c-format
+msgid "Keyboard Buffer underrun!\n"
 msgstr ""
 
-#: src/base/proto.c:66
+#: src/client/keyboardBuffer.c:145
 #, c-format
-msgid "Proto error code: \"%d\"\n"
+msgid "Keyboard buffer is not empty!\n"
 msgstr ""
 
-#: src/base/proto.c:70
-msgid "Version of your client isn't supported by the server."
+#: src/client/saveLoad.c:85
+#, c-format
+msgid "Saving game to: \"%s\"\n"
 msgstr ""
 
-#: src/base/proto.c:74
-msgid "The timeout of ping from server is out"
+#: src/client/saveLoad.c:94
+#, c-format
+msgid "I was unable to save: \"%s\"\n"
 msgstr ""
 
-#: src/base/proto.c:78
-msgid "The maximum amount of connected players has been exceeded!"
+#: src/client/saveLoad.c:251
+#, c-format
+msgid "Loadig game from file: \"%s\"\n"
 msgstr ""
 
-#: src/screen/screen_table.c:93
+#: src/client/saveLoad.c:259
 #, c-format
-msgid "Highscore file: \"%s\" was not loaded!"
+msgid "Unable to load save: \"%s\"\n"
 msgstr ""
 
-#: src/screen/screen_table.c:142 src/screen/screen_setting.c:215
-#: src/server/highScore.c:21
+#: src/client/screen.c:60
 #, c-format
-msgid "I am unable to load: \"%s\"!\n"
+msgid "Registering screen: \"%s\"\n"
 msgstr ""
 
-#: src/screen/screen_table.c:143 src/screen/screen_setting.c:216
-#: src/server/highScore.c:22
+#: src/client/screen.c:107
 #, c-format
-msgid "Creating: \"%s\"\n"
+msgid "Stopping screen: \"%s\"\n"
 msgstr ""
 
-#: src/screen/screen_table.c:150 src/screen/screen_setting.c:222
-#: src/server/highScore.c:31
+#: src/client/screen.c:116
 #, c-format
-msgid "I was unable to create: \"%s\"!\n"
+msgid "Starting screen: \"%s\"\n"
 msgstr ""
 
-#: src/screen/screen_table.c:195 src/screen/screen_downArena.c:376
-#: src/screen/screen_browser.c:680 src/screen/screen_setting.c:329
-#: src/screen/screen_choiceArena.c:140 src/screen/screen_credits.c:102
-#: src/screen/screen_gameType.c:214
-msgid "back"
+#: src/net/tcp.c:66 src/net/udp.c:129
+#, c-format
+msgid "Unable to create socket when connecting!\n"
 msgstr ""
 
-#: src/screen/screen_world.c:69
+#: src/net/tcp.c:95
 #, c-format
-msgid "Network initialization error!\n"
+msgid "Unable to bint to port: %d\n"
 msgstr ""
 
-#: src/screen/screen_world.c:430
-msgid "Tux has not defined controls!"
+#: src/net/tcp.c:168 src/net/udp.c:301
+msgid "Bad IP proto!"
 msgstr ""
 
-#: src/screen/screen_world.c:607
-msgid "Quitting screen world\n"
+#: src/net/tcp.c:196
+#, c-format
+msgid "Unable to create TCP socket!\n"
 msgstr ""
 
-#: src/screen/screen_mainMenu.c:101
-msgid "Start game"
+#: src/net/udp.c:68
+#, c-format
+msgid "Unable to create socket when binding!\n"
 msgstr ""
 
-#: src/screen/screen_mainMenu.c:102
-msgid "Settings"
+#: src/net/udp.c:96
+#, c-format
+msgid "Unable to set socket %s %d!\n"
 msgstr ""
 
-#: src/screen/screen_mainMenu.c:103
-msgid "Highscore"
+#: src/net/udp.c:216
+#, c-format
+msgid "Unable to read form socket %d %s %d!\n"
 msgstr ""
 
-#: src/screen/screen_mainMenu.c:104
-msgid "Credits"
+#: src/net/udp.c:256
+#, c-format
+msgid "Unable to write on socket %d %s %d!\n"
 msgstr ""
 
-#: src/screen/screen_mainMenu.c:105
-msgid "Quit game"
+#: src/screen/screen_browser.c:680 src/screen/screen_choiceArena.c:140
+#: src/screen/screen_credits.c:102 src/screen/screen_downArena.c:376
+#: src/screen/screen_gameType.c:214 src/screen/screen_setting.c:329
+#: src/screen/screen_table.c:195
+msgid "back"
 msgstr ""
 
 #: src/screen/screen_browser.c:682
@@ -499,6 +550,81 @@ msgstr ""
 msgid "ping"
 msgstr ""
 
+#: src/screen/screen_choiceArena.c:141 src/screen/screen_gameType.c:215
+msgid "play"
+msgstr ""
+
+#: src/screen/screen_credits.c:127
+#, c-format
+msgid "Credit file not found... %s/%s"
+msgstr ""
+
+#: src/screen/screen_gameType.c:216
+msgid "browser"
+msgstr ""
+
+#: src/screen/screen_gameType.c:232
+msgid "Local game"
+msgstr ""
+
+#: src/screen/screen_gameType.c:233
+msgid "Set up a server"
+msgstr ""
+
+#: src/screen/screen_gameType.c:234
+msgid "Network game"
+msgstr ""
+
+#: src/screen/screen_gameType.c:238
+msgid "port"
+msgstr ""
+
+#: src/screen/screen_gameType.c:288
+msgid "Unknown game type!"
+msgstr ""
+
+#: src/screen/screen_gameType.c:342
+msgid "Unknown IP protocol!\n"
+msgstr ""
+
+#: src/screen/screen_mainMenu.c:101
+msgid "Start game"
+msgstr ""
+
+#: src/screen/screen_mainMenu.c:102
+msgid "Settings"
+msgstr ""
+
+#: src/screen/screen_mainMenu.c:103
+msgid "Highscore"
+msgstr ""
+
+#: src/screen/screen_mainMenu.c:104
+msgid "Credits"
+msgstr ""
+
+#: src/screen/screen_mainMenu.c:105
+msgid "Quit game"
+msgstr ""
+
+#: src/screen/screen_setting.c:215 src/screen/screen_table.c:142
+#: src/server/highScore.c:21
+#, c-format
+msgid "I am unable to load: \"%s\"!\n"
+msgstr ""
+
+#: src/screen/screen_setting.c:216 src/screen/screen_table.c:143
+#: src/server/highScore.c:22
+#, c-format
+msgid "Creating: \"%s\"\n"
+msgstr ""
+
+#: src/screen/screen_setting.c:222 src/screen/screen_table.c:150
+#: src/server/highScore.c:31
+#, c-format
+msgid "I was unable to create: \"%s\"!\n"
+msgstr ""
+
 #: src/screen/screen_setting.c:285
 #, c-format
 msgid ""
@@ -589,179 +715,59 @@ msgstr ""
 msgid "Up:"
 msgstr ""
 
-#: src/screen/screen_choiceArena.c:141 src/screen/screen_gameType.c:215
-msgid "play"
-msgstr ""
-
-#: src/screen/screen_credits.c:127
-#, c-format
-msgid "Credit file not found... %s/%s"
-msgstr ""
-
-#: src/screen/screen_gameType.c:216
-msgid "browser"
-msgstr ""
-
-#: src/screen/screen_gameType.c:232
-msgid "Local game"
-msgstr ""
-
-#: src/screen/screen_gameType.c:233
-msgid "Set up a server"
-msgstr ""
-
-#: src/screen/screen_gameType.c:234
-msgid "Network game"
-msgstr ""
-
-#: src/screen/screen_gameType.c:238
-msgid "port"
-msgstr ""
-
-#: src/screen/screen_gameType.c:288
-msgid "Unknown game type!"
-msgstr ""
-
-#: src/screen/screen_gameType.c:342
-msgid "Unknown IP protocol!\n"
-msgstr ""
-
-#: src/widget/widget_button.c:84
-msgid "Event caught\n"
-msgstr ""
-
-#: src/widget/widget_textfield.c:169
-msgid "Bad filter!"
-msgstr ""
-
-#: src/audio/sound.c:44
-msgid "Initializing sound...\n"
-msgstr ""
-
-#: src/audio/sound.c:56
-#, c-format
-msgid "Loading sound file: %s\n"
-msgstr ""
-
-#: src/audio/sound.c:63
-#, c-format
-msgid "Unable to load sound file: %s with error: %s\n"
-msgstr ""
-
-#: src/audio/sound.c:76
-#, c-format
-msgid "Unable to playback sound with error: %s\n"
-msgstr ""
-
-#: src/audio/sound.c:144
-msgid "Quitting sound...\n"
-msgstr ""
-
-#: src/audio/music.c:47
-msgid "Initializing music...\n"
-msgstr ""
-
-#: src/audio/music.c:58
-#, c-format
-msgid "Loading music file: %s\n"
-msgstr ""
-
-#: src/audio/music.c:71
-#, c-format
-msgid "Unable to load music from file: %s\n"
-msgstr ""
-
-#: src/audio/music.c:122
-msgid "Stopping music...\n"
-msgstr ""
-
-#: src/audio/music.c:161
-#, c-format
-msgid "Playing music file %s\n"
-msgstr ""
-
-#: src/audio/music.c:224
-msgid "Quitting music...\n"
-msgstr ""
-
-#: src/audio/audio.c:29
-#, c-format
-msgid "Unable to initialize audio: %s\n"
-msgstr ""
-
-#: src/audio/audio.c:35
-#, c-format
-msgid "Unable to create proper audio settings: %s\n"
-msgstr ""
-
-#: src/audio/audio.c:43
-msgid "Initializing audio system...\n"
-msgstr ""
-
-#: src/audio/audio.c:56
-msgid "Quitting audio...\n"
-msgstr ""
-
-#: src/net/udp.c:68
+#: src/screen/screen_table.c:93
 #, c-format
-msgid "Unable to create socket when binding!\n"
+msgid "Highscore file: \"%s\" was not loaded!"
 msgstr ""
 
-#: src/net/udp.c:96
+#: src/screen/screen_world.c:69
 #, c-format
-msgid "Unable to set socket %s %d!\n"
+msgid "Network initialization error!\n"
 msgstr ""
 
-#: src/net/udp.c:129 src/net/tcp.c:66
-#, c-format
-msgid "Unable to create socket when connecting!\n"
+#: src/screen/screen_world.c:430
+msgid "Tux has not defined controls!"
 msgstr ""
 
-#: src/net/udp.c:216
-#, c-format
-msgid "Unable to read form socket %d %s %d!\n"
+#: src/screen/screen_world.c:607
+msgid "Quitting screen world\n"
 msgstr ""
 
-#: src/net/udp.c:256
+#: src/server/log.c:19
 #, c-format
-msgid "Unable to write on socket %d %s %d!\n"
-msgstr ""
-
-#: src/net/udp.c:301 src/net/tcp.c:168
-msgid "Bad IP proto!"
+msgid "Opening logfile \"%s\" failed!\n"
 msgstr ""
 
-#: src/net/tcp.c:95
+#: src/server/log.c:23
 #, c-format
-msgid "Unable to bint to port: %d\n"
+msgid "I use logfile: \"%s\")\n"
 msgstr ""
 
-#: src/net/tcp.c:196
-#, c-format
-msgid "Unable to create TCP socket!\n"
+#: src/server/log.c:54
+msgid "Really bad log value!"
 msgstr ""
 
-#: src/server/publicServer.c:231
+#: src/server/publicServer.c:230
 #, c-format
 msgid "I dont load arena %s!\n"
 msgstr ""
 
-#: src/server/publicServer.c:256
+#: src/server/publicServer.c:255
 #, c-format
 msgid "I was unable to open config file!\n"
 msgstr ""
 
-#: src/server/publicServer.c:273
+#: src/server/publicServer.c:272
 #, c-format
 msgid "Unable to initialize network socket!\n"
 msgstr ""
 
-#: src/server/publicServer.c:280
+#: src/server/publicServer.c:279
 #, c-format
 msgid "Unable to contact MasterServer!)\n"
 msgstr ""
 
-#: src/server/publicServer.c:327
+#: src/server/publicServer.c:326
 msgid "Quitting public server\n"
 msgstr ""
 
@@ -775,21 +781,15 @@ msgstr ""
 msgid "I was unable to load config file. Falling back to defaults!\n"
 msgstr ""
 
-#: src/server/log.c:19
-#, c-format
-msgid "Opening logfile \"%s\" failed!\n"
-msgstr ""
-
-#: src/server/log.c:23
+#: src/server/highScore.c:26
 #, c-format
-msgid "I use logfile: \"%s\")\n"
+msgid "Scorefile: \"%s\"\n"
 msgstr ""
 
-#: src/server/log.c:54
-msgid "Really bad log value!"
+#: src/widget/widget_button.c:84
+msgid "Event caught\n"
 msgstr ""
 
-#: src/server/highScore.c:26
-#, c-format
-msgid "Scorefile: \"%s\"\n"
+#: src/widget/widget_textfield.c:169
+msgid "Bad filter!"
 msgstr ""
diff --git a/src/audio/audio.c b/src/audio/audio.c
index 9d629eb..14297af 100644
--- a/src/audio/audio.c
+++ b/src/audio/audio.c
@@ -8,6 +8,7 @@
 #include "interface.h"
 
 static bool_t isAudioInit = FALSE;
+
 /*
  * Returns state of audio
  */
@@ -17,16 +18,16 @@ bool_t isAudioInicialized()
 }
 
 /*
- * Inicialize audio
+ * Initialize audio
  */
 void initAudio()
 {
-	if (isParamFlag("--noaudio")) {
+	if (isParamFlag("--no-audio")) {
 		return;
 	}
 
 	if (SDL_Init(SDL_INIT_AUDIO) == -1) {
-		fprintf(stderr, _("Unable to initialize audio: %s\n"), SDL_GetError());
+		fprintf(stderr, _("Error! Unable to initialize audio: %s\n"), SDL_GetError());
 		return;
 	}
 
@@ -40,7 +41,7 @@ void initAudio()
 	Mix_AllocateChannels(16);
 	Mix_Volume(-1, MIX_MAX_VOLUME);
 
-	DEBUG_MSG(_("Initializing audio system...\n"));
+	DEBUG_MSG(_("Initializing audio\n"));
 
 	isAudioInit = TRUE;
 }
@@ -53,5 +54,5 @@ void quitAudio()
 	Mix_CloseAudio();
 	isAudioInit = TRUE;
 
-	DEBUG_MSG(_("Quitting audio...\n"));
+	DEBUG_MSG(_("Quitting audio\n"));
 }
diff --git a/src/audio/music.c b/src/audio/music.c
index 5af9dda..feabb90 100644
--- a/src/audio/music.c
+++ b/src/audio/music.c
@@ -15,6 +15,7 @@ static list_t *listStorage;
 static bool_t isMusicInit = FALSE;
 static bool_t var_isMusicActive = TRUE;
 static Mix_Music *currentMusic;
+
 /*
  * Return state of music initialization
  */
@@ -38,24 +39,24 @@ void initMusic()
 	isMusicInit = TRUE;
 	var_isMusicActive = TRUE;
 
-	if (isParamFlag("--nomusic"))
+	if (isParamFlag("--no-music"))
 		setMusicActive(FALSE);
 
 	if (isParamFlag("--music"))
 		setMusicActive(TRUE);
 
-	DEBUG_MSG(_("Initializing music...\n"));
+	DEBUG_MSG(_("Initializing music\n"));
 }
 
 /*
- * Load music file and returns it
+ * Load a file with music and returns it
  */
 static Mix_Music *loadMixMusic(char *file)
 {
 	Mix_Music *mixer;
 	char str[STR_PATH_SIZE];
 
-	DEBUG_MSG(_("Loading music file: %s\n"), file);
+	DEBUG_MSG(_("Loading a file with music: %s\n"), file);
 
 	if (isFillPath(file)) {
 		strcpy(str, file);
@@ -68,7 +69,7 @@ static Mix_Music *loadMixMusic(char *file)
 	mixer = Mix_LoadMUS(str);
 
 	if (mixer == NULL) {
-		fprintf(stderr, _("Unable to load music from file: %s\n"), file);
+		fprintf(stderr, _("Unable to load music from file %s\n"), file);
 		return NULL;
 	}
 
@@ -80,8 +81,9 @@ static Mix_Music *loadMixMusic(char *file)
  */
 static void playMixMusic()
 {
-	if (currentMusic != NULL)
+	if (currentMusic != NULL) {
 		Mix_PlayMusic(currentMusic, 1000);
+	}
 }
 
 /*
@@ -115,11 +117,12 @@ void addMusic(char *file, char *name, char *group)
  */
 void stopMusic()
 {
-	if (isMusicInit == FALSE || var_isMusicActive == FALSE)
+	if (isMusicInit == FALSE || var_isMusicActive == FALSE) {
 		return;
+	}
 
 	if (currentMusic != NULL) {
-		DEBUG_MSG(_("Stopping music...\n"));
+		DEBUG_MSG(_("Stopping music\n"));
 
 		Mix_HaltMusic();
 		currentMusic = NULL;
@@ -127,7 +130,7 @@ void stopMusic()
 }
 
 /*
- * start music playback
+ * Play music playback
  */
 void playMusic(char *name, char *group)
 {
@@ -145,27 +148,28 @@ void playMusic(char *name, char *group)
 		return;
 
 	if (currentMusic != NULL &&
-		strcmp(currentMusic_group, group) == 0 &&
-		strcmp(currentMusic_name, name) == 0) {
+	    strcmp(currentMusic_group, group) == 0 &&
+	    strcmp(currentMusic_name, name) == 0) {
 		return;
 	}
 
-	if (currentMusic != NULL)
+	if (currentMusic != NULL) {
 		stopMusic();
+	}
 
 	currentMusic = getItemFromStorage(listStorage, group, name);
 	strcpy(currentMusic_group, group);
 	strcpy(currentMusic_name, name);
 
 	if (currentMusic != NULL) {
-		DEBUG_MSG(_("Playing music file %s\n"), name);
+		DEBUG_MSG(_("Playing music from file %s\n"), name);
 
 		playMixMusic();
 	}
 }
 
 /*
- * Set music active/deactivated
+ * Set music status to active/inactive
  */
 void setMusicActive(bool_t n)
 {
@@ -206,6 +210,7 @@ void delAllMusicInGroup(char *group)
 {
 	if (isMusicInit == FALSE)
 		return;
+
 	delAllItemFromStorage(listStorage, group, destroyMusic);
 }
 
@@ -221,5 +226,5 @@ void quitMusic()
 	destroyStorage(listStorage, destroyMusic);
 	isMusicInit = FALSE;
 
-	DEBUG_MSG(_("Quitting music...\n"));
+	DEBUG_MSG(_("Quitting music\n"));
 }
diff --git a/src/audio/music.h b/src/audio/music.h
index 1b0e1fb..17e4409 100644
--- a/src/audio/music.h
+++ b/src/audio/music.h
@@ -8,14 +8,14 @@
 #        define MUSIC_GROUP_BASE "base"
 #        define MUSIC_GROUP_USER "user"
 
-				/*
-				   typedef struct music_struct
-				   {
-				   char *name;
-				   int group;
-				   Mix_Music *music;
-				   } music_t;
-				 */
+/*
+   typedef struct music_struct
+   {
+   char *name;
+   int group;
+   Mix_Music *music;
+   } music_t;
+ */
 
 extern bool_t isMusicInicialized();
 extern void initMusic();
diff --git a/src/audio/sound.c b/src/audio/sound.c
index 63d4566..dee6c2d 100644
--- a/src/audio/sound.c
+++ b/src/audio/sound.c
@@ -13,8 +13,9 @@
 static list_t *listStorage;
 static bool_t isSoundInit = FALSE;
 static bool_t var_isSoundActive = TRUE;
+
 /*
- * Return state of sound
+ * Return status of sound
  */
 bool_t isSoundInicialized()
 {
@@ -22,7 +23,7 @@ bool_t isSoundInicialized()
 }
 
 /*
- * Audio initialization
+ * Initialize sound
  */
 void initSound()
 {
@@ -35,18 +36,18 @@ void initSound()
 	isSoundInit = TRUE;
 	var_isSoundActive = TRUE;
 
-	if (isParamFlag("--nosound"))
+	if (isParamFlag("--no-sound"))
 		setSoundActive(FALSE);
 
 	if (isParamFlag("--sound"))
 		setSoundActive(TRUE);
 
-	DEBUG_MSG(_("Initializing sound...\n"));
+	DEBUG_MSG(_("Initializing sound\n"));
 
 }
 
 /*
- * Load sound file (Null/mixer)
+ * Load sound from file (Null/mixer)
  */
 static Mix_Chunk *loadMixSound(char *file)
 {
@@ -60,7 +61,7 @@ static Mix_Chunk *loadMixSound(char *file)
 	new = Mix_LoadWAV(str);
 
 	if (new == NULL) {
-		fprintf(stderr, _("Unable to load sound file: %s with error: %s\n"), str, Mix_GetError());
+		fprintf(stderr, _("Unable to load sound from file %s with error: %s\n"), str, Mix_GetError());
 		return NULL;
 	}
 
@@ -73,7 +74,7 @@ static Mix_Chunk *loadMixSound(char *file)
 static void playMixSound(Mix_Chunk * p)
 {
 	if (Mix_PlayChannel(-1, p, 0) == -1) {
-		fprintf(stderr, _("Unable to playback sound with error: %s\n"), Mix_GetError());
+		fprintf(stderr, _("Unable to play sound with error: %s\n"), Mix_GetError());
 		return;
 	}
 }
@@ -138,8 +139,9 @@ void quitSound()
 {
 	if (isSoundInit == FALSE)
 		return;
+
 	destroyStorage(listStorage, destroySound);
 	isSoundInit = FALSE;
 
-	DEBUG_MSG(_("Quitting sound...\n"));
+	DEBUG_MSG(_("Quitting sound\n"));
 }
diff --git a/src/audio/sound.h b/src/audio/sound.h
index f63af13..a5d69d4 100644
--- a/src/audio/sound.h
+++ b/src/audio/sound.h
@@ -8,14 +8,14 @@
 #        define SOUND_GROUP_BASE "base"
 #        define SOUND_GROUP_USER "user"
 
-				/*
-				   typedef struct sound_struct
-				   {
-				   char *name;
-				   int group;
-				   Mix_Chunk *sound;
-				   } sound_t;
-				 */
+/*
+   typedef struct sound_struct
+   {
+   char *name;
+   int group;
+   Mix_Chunk *sound;
+   } sound_t;
+ */
 
 extern bool_t isSoundInicialized();
 extern void initSound();
diff --git a/src/server/publicServer.c b/src/server/publicServer.c
index 10ac39f..ccf044f 100644
--- a/src/server/publicServer.c
+++ b/src/server/publicServer.c
@@ -226,8 +226,7 @@ static void loadArena()
 {
 	choice_arenaFile = getArenaFileFormNetName(getSetting("ARENA", "--arena", "FAGN"));
 
-	if( choice_arenaFile == NULL )
-	{
+	if (choice_arenaFile == NULL) {
 		fprintf(stderr, _("I dont load arena %s!\n"), getSetting("ARENA", "--arena", "FAGN"));
 		exit(-1);
 	}