- dokonceni gettext zakladni podpory

- je treba mozna jeste nekde uklidit zbytky po language - testujte a sezente lidi co nam to prelozi, kdzytak projedete .pot soubor a pokud najdete neco co by se melo jmenovat stejne nebo tak nejak tak opravit... git-svn-id: http://opensvn.csie.org/tuxanci_ng@223 0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e
author: scarab <scarab@0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e> 2008-08-18 23:58:32 +0000
committer: scarab <scarab@0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e> 2008-08-18 23:58:32 +0000
commit: 3cfa5354f2a6b164f0e46ebde60af3b0d697fbcd (patch)
tree: 74fdc662aa084bf64ecd73c650df6250e8ed284b
parent: 9c71274e5c4cde5dd99a0eb927243f6c481df1f2 (diff)
26 files changed, 932 insertions, 338 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c0bc463..adc8dde 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,6 +16,7 @@
 # -DCMAKE_CONF_PATH=/etc	# install path for conf
 # -DLIB_INSTALL_DIR=/other/bla	# install path for lib
 # -DCMAKE_DOC_PATH=/other/bla	# install path for doc
+# -DCMAKE_LOCALE_PATH=/other/bla	# install path for locale
 ###############################################################################
 # IMPORTANT DEFINITIONS [PREFIX,...]
 ###############################################################################
@@ -23,10 +24,11 @@ SET ( TUXANCI_VERSION "svn" CACHE STRING "Version" )
 SET ( WORKDIR ${CMAKE_SOURCE_DIR}/src )
 # data because some distributions want different data placement
 SET ( CMAKE_CONF_PATH "/etc" CACHE PATH "Config path prefix" )
-SET ( CMAKE_DOC_PATH "/usr/local/" CACHE PATH "Data path prefix" )
-SET ( CMAKE_DATA_PATH "/usr/local/share/" CACHE PATH "Data path prefix" )
-SET ( LIB_INSTALL_DIR "/usr/local/lib/" CACHE PATH "Library path prefix" )
 SET ( CMAKE_INSTALL_PREFIX "/usr/local/" CACHE PATH "Install path prefix" )
+SET ( CMAKE_DOC_PATH "/usr/local/doc" CACHE PATH "Data path prefix" )
+SET ( CMAKE_LOCALE_PATH "${CMAKE_INSTALL_PREFIX}/share/locale" CACHE PATH "Locale path prefix" )
+SET ( CMAKE_DATA_PATH "${CMAKE_INSTALL_PREFIX}/share/" CACHE PATH "Data path prefix" )
+SET ( LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib/" CACHE PATH "Library path prefix" )
 ###############################################################################
 # BASIC PROJECT VALUES
 ###############################################################################
@@ -56,6 +58,7 @@ SET ( CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake" )
 #various variables
 SET ( CMAKE_INSTALL_ETCDIR ${CMAKE_CONF_PATH} )
 SET ( CMAKE_INSTALL_BINDIR bin )
+SET ( CMAKE_INSTALL_LOCALEDIR ${CMAKE_LOCALE_PATH} )
 SET ( CMAKE_INSTALL_DATADIR ${CMAKE_DATA_PATH} )
 SET ( CMAKE_INSTALL_LIBDIR ${LIB_INSTALL_DIR} )
 SET ( CMAKE_INSTALL_DOCDIR ${CMAKE_DOC_PATH} )
@@ -143,11 +146,13 @@ IF ( WIN )
 	# override basic directory placement
 	SET ( CMAKE_CONF_PATH "${APPNAME}/etc/" )
 	SET ( CMAKE_DATA_PATH "${APPNAME}/share/" )
+	SET ( CMAKE_LOCALE_PATH "${APPNAME}/share/locale/")
 	SET ( CMAKE_DOC_PATH "${APPNAME}/doc/" )
 	SET ( LIB_INSTALL_DIR "${APPNAME}/bin/" )
 	SET ( CMAKE_INSTALL_PREFIX "./")
 	SET ( CMAKE_INSTALL_BINDIR ${APPNAME}/bin )
 	SET ( CMAKE_INSTALL_DOCDIR ${APPNAME}/doc )
+	SET ( CMAKE_INSTALL_LOCALEDIR ${APPNAME}/share/locale/ )
 	SET ( CMAKE_INSTALL_LIBDIR ${APPNAME}/bin )
 	SET ( CMAKE_INSTALL_DATADIR ${APPNAME}/share/ )
 	SET ( CMAKE_INSTALL_ETCDIR ${APPNAME}/etc )
@@ -179,12 +184,14 @@ ENDIF ( NOT NO_Audio )
 IF ( Bundle )
 	SET ( CMAKE_CONF_PATH "../etc")
 	SET ( CMAKE_DATA_PATH "../share")
+	SET ( CMAKE_LOCALE_PATH "../share/locale/")
 	SET ( CMAKE_DOC_PATH "../doc")
 	SET ( LIB_INSTALL_DIR "../lib")
 	SET ( CMAKE_INSTALL_PREFIX "/")
 	SET ( CMAKE_INSTALL_BINDIR bin )
 	SET ( CMAKE_INSTALL_LIBDIR lib )
 	SET ( CMAKE_INSTALL_DATADIR share )
+	SET ( CMAKE_INSTALL_LOCALEDIR share/locale/ )
 	SET ( CMAKE_INSTALL_ETCDIR etc )
 	SET ( CMAKE_INSTALL_DOCDIR doc )
 	CONFIGURE_FILE ( ${WORKDIR}/base/path.h.in ${WORKDIR}/base/path.h )
@@ -196,6 +203,7 @@ IF ( NLS )
 	MESSAGE ( STATUS "<Compiling LANGUAGES>" )
 	MESSAGE ( STATUS "<******************************>" )
 	ADD_DEFINITIONS ( -DNLS )
+	SET ( GETTEXT_PACKAGE "tuxanci" )
 	ADD_SUBDIRECTORY ( po )
 ENDIF ( NLS )
 ###############################################################################
@@ -215,11 +223,11 @@ ADD_SUBDIRECTORY ( src )
 # path which user send us
 ADD_SUBDIRECTORY ( data )
 INSTALL ( FILES ${CMAKE_SOURCE_DIR}/LICENCE
-	DESTINATION ${CMAKE_INSTALL_DOCDIR}/doc/${APPNAME}/ )
+	DESTINATION ${CMAKE_INSTALL_DOCDIR}/${APPNAME}/ )
 INSTALL ( FILES ${CMAKE_SOURCE_DIR}/AUTHORS
-	DESTINATION ${CMAKE_INSTALL_DOCDIR}/doc/${APPNAME}/ )
+	DESTINATION ${CMAKE_INSTALL_DOCDIR}/${APPNAME}/ )
 INSTALL ( FILES ${CMAKE_SOURCE_DIR}/README
-	DESTINATION ${CMAKE_INSTALL_DOCDIR}/doc/${APPNAME}/ )
+	DESTINATION ${CMAKE_INSTALL_DOCDIR}/${APPNAME}/ )
 # windows quirk
 IF ( NOT Server )
 	IF ( Win )
@@ -227,4 +235,4 @@ IF ( NOT Server )
 		INSTALL ( FILES ${files} DESTINATION ${APPNAME}/bin/ )
 	ENDIF ( Win )
 ENDIF ( NOT Server )
-###############################################################################
-\ No newline at end of file
+###############################################################################
diff --git a/README b/README
index aa4c3bf..67a5fd9 100644
--- a/README
+++ b/README
@@ -94,7 +94,7 @@ HOWTO COMPILE
 		# -DCMAKE_CONF_PATH=/etc	# install path for conf. files
 		# -DLIB_INSTALL_DIR=/other/bla	# install path for libraries
 		# -DCMAKE_DOC_PATH=/other/bla	# install path for doc
-
+		# -DCMAKE_LOCALE_PATH=/bla	# install path for locale
 GAME USAGE
 ==========
 	Starting game is simple tuxanci-VERSION or tuxanci-server-V. based on what we
diff --git a/ci b/ci
deleted file mode 100644
index f0f6128..0000000
--- a/ci
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-svn up || exit 1
-echo "#define TUXANCI_VERSION \"svn$(( `svn info | grep Revision |awk -F ': ' '{print $2}'` + 1 ))\"" > ./config.h
-if [ $# -eq "0" ]; then
-	svn ci
-	exit 0
-fi
-while getopts :F:m: arg; do
-	case $arg in
-		F) svn ci -F "${OPTARG}";;
-		m) svn ci -m "\"${OPTARG}\"";;
-		*) svn ci;;
-	esac
-done
diff --git a/cmake/FindGettext.cmake b/cmake/FindGettext.cmake
new file mode 100644
index 0000000..14ea623
--- /dev/null
+++ b/cmake/FindGettext.cmake
@@ -0,0 +1,65 @@
+# - Find GNU gettext tools
+# This module looks for the GNU gettext tools. This module defines the 
+# following values:
+#  GETTEXT_MSGMERGE_EXECUTABLE: the full path to the msgmerge tool.
+#  GETTEXT_MSGFMT_EXECUTABLE: the full path to the msgfmt tool.
+#  GETTEXT_FOUND: True if gettext has been found.
+#
+# Additionally it provides the following macros:
+# GETTEXT_CREATE_TRANSLATIONS ( outputFile [ALL] file1 ... fileN )
+#    This will create a target "translations" which will convert the 
+#    given input po files into the binary output mo file. If the 
+#    ALL option is used, the translations will also be created when
+#    building the default target.
+
+
+
+FIND_PROGRAM(GETTEXT_MSGMERGE_EXECUTABLE msgmerge)
+
+FIND_PROGRAM(GETTEXT_MSGFMT_EXECUTABLE msgfmt)
+
+MACRO(GETTEXT_CREATE_TRANSLATIONS _potFile _firstPoFile)
+
+   SET(_gmoFiles)
+   GET_FILENAME_COMPONENT(_potBasename ${_potFile} NAME_WE)
+   GET_FILENAME_COMPONENT(_absPotFile ${_potFile} ABSOLUTE)
+
+   SET(_addToAll)
+   IF(${_firstPoFile} STREQUAL "ALL")
+      SET(_addToAll "ALL")
+      SET(_firstPoFile)
+   ENDIF(${_firstPoFile} STREQUAL "ALL")
+
+   FOREACH (_currentPoFile ${ARGN})
+      GET_FILENAME_COMPONENT(_absFile ${_currentPoFile} ABSOLUTE)
+      GET_FILENAME_COMPONENT(_abs_PATH ${_absFile} PATH)
+      GET_FILENAME_COMPONENT(_lang ${_absFile} NAME_WE)
+      SET(_gmoFile ${CMAKE_CURRENT_BINARY_DIR}/${_lang}.gmo)
+
+      ADD_CUSTOM_COMMAND( 
+         OUTPUT ${_gmoFile} 
+         COMMAND ${GETTEXT_MSGMERGE_EXECUTABLE} --quiet --update --backup=none -s ${_absFile} ${_absPotFile}
+         COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} -o ${_gmoFile} ${_absFile}
+         DEPENDS ${_absPotFile} ${_absFile} 
+      )
+
+      INSTALL(FILES ${_gmoFile} DESTINATION share/locale/${_lang}/LC_MESSAGES RENAME ${_potBasename}.mo) 
+      SET(_gmoFiles ${_gmoFiles} ${_gmoFile})
+
+   ENDFOREACH (_currentPoFile )
+
+   ADD_CUSTOM_TARGET(translations ${_addToAll} DEPENDS ${_gmoFiles})
+
+ENDMACRO(GETTEXT_CREATE_TRANSLATIONS )
+
+IF (GETTEXT_MSGMERGE_EXECUTABLE AND GETTEXT_MSGFMT_EXECUTABLE )
+   SET(GETTEXT_FOUND TRUE)
+ELSE (GETTEXT_MSGMERGE_EXECUTABLE AND GETTEXT_MSGFMT_EXECUTABLE )
+   SET(GETTEXT_FOUND FALSE)
+   IF (GetText_REQUIRED)
+      MESSAGE(FATAL_ERROR "GetText not found")
+   ENDIF (GetText_REQUIRED)
+ENDIF (GETTEXT_MSGMERGE_EXECUTABLE AND GETTEXT_MSGFMT_EXECUTABLE )
+
+
+
diff --git a/cmake/Po.cmake b/cmake/Po.cmake
deleted file mode 100644
index 8c6d5f0..0000000
--- a/cmake/Po.cmake
+++ /dev/null
@@ -1,54 +0,0 @@
-# a small macro to create mo files out of po's
-# Taken from sim-im.org
-
-MACRO(FIND_MSGFMT)
-    IF(NOT MSGFMT_EXECUTABLE)
-        IF(NOT MSGFMT_NOT_FOUND)
-            SET(MSGFMT_NAME "msgfmt")
-            FIND_PROGRAM(MSGFMT_EXECUTABLE ${MSGFMT_NAME})
-
-            IF (NOT MSGFMT_EXECUTABLE)
-              MESSAGE(FATAL_ERROR "${MSGFMT_NAME} not found - po files can't be processed")
-              SET(MSGFMT_NOT_FOUND "1")     # to avoid double checking in one cmake run
-            ENDIF (NOT MSGFMT_EXECUTABLE)
-
-            MARK_AS_ADVANCED(MSGFMT_EXECUTABLE)
-        ENDIF(NOT MSGFMT_NOT_FOUND)
-    ENDIF(NOT MSGFMT_EXECUTABLE)
-ENDMACRO(FIND_MSGFMT)
-
-MACRO(COMPILE_PO_FILES po_subdir _sources)
-    FIND_MSGFMT()
-    SET(_basename avidemux2)
-	
-    IF(MSGFMT_EXECUTABLE)
-        FILE(GLOB po_files ${po_subdir}/*.po)
-
-        FOREACH(po_input ${po_files})
-
-            GET_FILENAME_COMPONENT(_in       ${po_input} ABSOLUTE)
-            GET_FILENAME_COMPONENT(_basename ${po_input} NAME_WE)
-
-            FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
-            GET_FILENAME_COMPONENT(_out ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.mo ABSOLUTE)
-            
-            ADD_CUSTOM_COMMAND(
-                OUTPUT ${_out}
-                COMMAND ${CMAKE_COMMAND}
-                    -E echo
-                    "Generating" ${_out} "from" ${_in}
-                COMMAND ${MSGFMT_EXECUTABLE}
-                    ${_in}
-                    -o ${_out}
-                DEPENDS ${_in}
-            )
-                
-            SET(mo_files ${mo_files} ${_out})
-
-            INSTALL(FILES ${_out} DESTINATION "${CMAKE_INSTALL_PREFIX}/share/locale/${_basename}/LC_MESSAGES" RENAME avidemux.mo)
-        ENDFOREACH(po_input ${po_files})
-
-        SET(${_sources} ${${_sources}} ${mo_files})
-    ENDIF(MSGFMT_EXECUTABLE)
-ENDMACRO(COMPILE_PO_FILES)
-
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index 2e742d6..874a412 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -7,7 +7,6 @@ ADD_SUBDIRECTORY ( arena )
 ADD_SUBDIRECTORY ( conf )
 ADD_SUBDIRECTORY ( font )
 ADD_SUBDIRECTORY ( images )
-ADD_SUBDIRECTORY ( lang )
 ADD_SUBDIRECTORY ( music )
 ADD_SUBDIRECTORY ( sound )
 ###############################################################################
@@ -15,10 +14,10 @@ ADD_SUBDIRECTORY ( sound )
 ###############################################################################
 IF ( NOT Server )
 	INSTALL ( FILES tuxanci.desktop
-		DESTINATION ${CMAKE_INSTALL_DOCDIR}/doc/${APPNAME}/)
+		DESTINATION ${CMAKE_INSTALL_DOCDIR}/${APPNAME}/)
 	IF ( NOT Win )
 		INSTALL ( FILES tuxanci.ico
-			DESTINATION ${CMAKE_INSTALL_DOCDIR}/doc/${APPNAME}/ )
+			DESTINATION ${CMAKE_INSTALL_DOCDIR}/${APPNAME}/ )
 	ENDIF ( NOT Win )
 ENDIF ( NOT Server )
-###############################################################################
-\ No newline at end of file
+###############################################################################
diff --git a/generate_gettext_pot.sh b/generate_gettext_pot.sh
new file mode 100644
index 0000000..cca50e6
--- /dev/null
+++ b/generate_gettext_pot.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+xgettext --add-comments=/// -k_ `find ./ -name \*.c |grep -v .svn |tr '\n' ' '` -o ../po/tuxanci.pot
diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt
index 17feca8..a477ffc 100644
--- a/po/CMakeLists.txt
+++ b/po/CMakeLists.txt
@@ -1,6 +1,26 @@
-# vyroba jazyku pomoci gettexu doufam ze na nej prejdem
-IF ( HAVE_GETTEXT )
-	INCLUDE( Po )
-	COMPILE_PO_FILES( ${CMAKE_SOURCE_DIR}/po MO_FILES )
-	ADD_CUSTOM_TARGET( mofiles ALL DEPENDS ${MO_FILES} )
-ENDIF ( HAVE_GETTEXT )
+###############################################################################
+# WE NEED GETTEXT
+##############################################################################
+FIND_PACKAGE ( Gettext REQUIRED )
+IF ( NOT GETTEXT_MSGFMT_EXECUTABLE )
+	MESSAGE ( FATAL_ERROR "Please install the msgfmt binary" )
+ENDIF ( NOT GETTEXT_MSGFMT_EXECUTABLE )
+FILE ( GLOB _po_files *.po )
+SET ( _gmoFiles )
+###############################################################################
+# CREATE .MO FOR EACH .PO
+###############################################################################
+FOREACH ( _current_PO_FILE ${_po_files} )
+	GET_FILENAME_COMPONENT( _lang ${_current_PO_FILE} NAME_WE )
+	SET( _gmoFile ${CMAKE_CURRENT_SOURCE_DIR}/${_lang}.gmo )
+	add_custom_command( OUTPUT ${_gmoFile}
+		COMMAND ${GETTEXT_MSGFMT_EXECUTABLE} -o ${_gmoFile} ${_current_PO_FILE}
+		WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+		DEPENDS ${_current_PO_FILE}
+	)
+	INSTALL ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/${_lang}.gmo
+		DESTINATION ${CMAKE_INSTALL_LOCALEDIR}/${_lang}/LC_MESSAGES/ RENAME tuxanci.mo )
+	LIST(APPEND _gmoFiles ${_gmoFile})
+ENDFOREACH(_current_PO_FILE)
+ADD_CUSTOM_TARGET(pofiles ALL DEPENDS ${_gmoFiles})
+###############################################################################
diff --git a/po/tuxanci.pot b/po/tuxanci.pot
new file mode 100644
index 0000000..7886282
--- /dev/null
+++ b/po/tuxanci.pot
@@ -0,0 +1,815 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-08-19 00:37+0200\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"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: src/client/client.c:106
+#, c-format
+msgid "Connected to: %s on port: %d via UDP\n"
+msgstr ""
+
+#: src/client/client.c:124
+#, c-format
+msgid "Connected to: %s on port: %d via TCP\n"
+msgstr ""
+
+#: src/client/client.c:185
+#, c-format
+msgid "Server did not respond!\n"
+msgstr ""
+
+#: src/client/client.c:186
+msgid "Server is not running or being blocked. I was unable to connect."
+msgstr ""
+
+#: src/client/client.c:225 src/base/server.c:311
+#, c-format
+msgid "Sending: \"%s\""
+msgstr ""
+
+#: src/client/client.c:314 src/base/server.c:353
+#, c-format
+msgid "Recieved: \"%s\""
+msgstr ""
+
+#: src/client/client.c:417
+#, c-format
+msgid "down: %d\n"
+msgstr ""
+
+#: src/client/client.c:418
+#, c-format
+msgid "up  : %d\n"
+msgstr ""
+
+#: src/client/client.c:445
+#, c-format
+msgid "Closing UDP connection.\n"
+msgstr ""
+
+#: src/client/client.c:454
+#, c-format
+msgid "Closing TCP connection.\n"
+msgstr ""
+
+#: src/client/interface.c:55
+#, c-format
+msgid "Initializing SDL system\n"
+msgstr ""
+
+#: src/client/interface.c:122
+#, c-format
+msgid "Unable to switch to FULLSCREEN mode!\n"
+msgstr ""
+
+#: src/client/interface.c:129
+#, c-format
+msgid "Unable to switch to WINDOW mode! Error: %s\n"
+msgstr ""
+
+#: src/client/interface.c:173
+#, c-format
+msgid "Pressed key with SDL value: %d\n"
+msgstr ""
+
+#: src/client/interface.c:245
+#, c-format
+msgid "Unable to change WINDOW resolution! Error: %s\n"
+msgstr ""
+
+#: src/client/interface.c:274
+#, c-format
+msgid "Quitting SDL\n"
+msgstr ""
+
+#: src/client/configFile.c:135
+#, c-format
+msgid "ADDING: \"%s\" into config file.\n"
+msgstr ""
+
+#: src/client/image.c:29
+#, c-format
+msgid "Initializing image database\n"
+msgstr ""
+
+#: src/client/image.c:105
+#, c-format
+msgid "Loading image %s\n"
+msgstr ""
+
+#: src/client/image.c:164
+#, c-format
+msgid "Quitting image database\n"
+msgstr ""
+
+#: src/client/font.c:138
+#, c-format
+msgid "Unloading font\n"
+msgstr ""
+
+#: src/client/keyboardBuffer.c:64
+#, c-format
+msgid "Keyboard Buffer overrun! Dropping key: %02x\n"
+msgstr ""
+
+#: src/client/keyboardBuffer.c:87
+#, c-format
+msgid "Keyboard Buffer underrun!\n"
+msgstr ""
+
+#: src/client/keyboardBuffer.c:132
+#, c-format
+msgid "Keyboard buffer is not empty!\n"
+msgstr ""
+
+#: src/client/screen.c:61
+#, c-format
+msgid "Registering screen: \"%s\"\n"
+msgstr ""
+
+#: src/client/screen.c:113
+#, c-format
+msgid "Stopping screen:\" %s\"\n"
+msgstr ""
+
+#: src/client/screen.c:123
+#, c-format
+msgid "Starting screen: \"%s\"\n"
+msgstr ""
+
+#: src/client/saveLoad.c:82
+#, c-format
+msgid "Saving game to: \"%s\"\n"
+msgstr ""
+
+#: src/client/saveLoad.c:94
+#, c-format
+msgid "I was unable to save: \"%s\"\n"
+msgstr ""
+
+#: src/client/saveLoad.c:255
+#, c-format
+msgid "Loadig game from file: \"%s\"\n"
+msgstr ""
+
+#: src/client/saveLoad.c:266
+#, c-format
+msgid "Unable to load save: \"%s\"\n"
+msgstr ""
+
+#: src/client/game.c:52
+#, c-format
+msgid ""
+"I was unable to initialize old nls system (if you see this something wierd "
+"is happening)!\n"
+msgstr ""
+
+#: src/client/game.c:117
+#, c-format
+msgid "Quitting TUXANCI...\n"
+msgstr ""
+
+#: src/base/textFile.c:85
+#, c-format
+msgid "ERROR: unable to get file status for %s!\n"
+msgstr ""
+
+#: src/base/textFile.c:92
+#, c-format
+msgid "ERROR: unable to open file %s for reading\n"
+msgstr ""
+
+#: src/base/textFile.c:100
+#, c-format
+msgid "ERROR: unable to read data from file %s\n"
+msgstr ""
+
+#: src/base/textFile.c:125
+#, c-format
+msgid ""
+"Printing file: \"%s\"\n"
+"\n"
+msgstr ""
+
+#: src/base/checkFront.c:86
+msgid "Bad type of front!"
+msgstr ""
+
+#: src/base/serverSendMsg.c:142 src/base/shot.c:128 src/base/tux.c:157
+msgid "Type variable has a really wierd value!"
+msgstr ""
+
+#: src/base/tux.c:196
+msgid "p->control has a really wierd value!"
+msgstr ""
+
+#: src/base/storage.c:71
+#, c-format
+msgid "%s %s was not found in storage!\n"
+msgstr ""
+
+#: src/base/udp_server.c:64 src/base/tcp_server.c:66
+#, c-format
+msgid "New client \"%s\" on port \"%d\" connected"
+msgstr ""
+
+#: src/base/udp_server.c:80 src/base/tcp_server.c:110
+#, c-format
+msgid "Client \"%s\" on port \"%d\" disconnected"
+msgstr ""
+
+#: src/base/udp_server.c:103 src/base/udp_server.c:122
+#: src/base/tcp_server.c:136 src/base/tcp_server.c:156
+#, c-format
+msgid "Starting server: \"%s\" on port: \"%d\"\n"
+msgstr ""
+
+#: src/base/udp_server.c:109 src/base/udp_server.c:128
+#: src/base/tcp_server.c:142 src/base/tcp_server.c:162
+#, c-format
+msgid "Starting server: \"%s\" on port: \"%d\" FAILED!\n"
+msgstr ""
+
+#: src/base/udp_server.c:208
+#, c-format
+msgid "Client was not FOUND!\n"
+msgstr ""
+
+#: src/base/udp_server.c:272 src/base/udp_server.c:280
+#: src/base/tcp_server.c:309 src/base/tcp_server.c:317
+#, c-format
+msgid "Closing port: \"%d\"\n"
+msgstr ""
+
+#: src/base/udp_server.c:285
+#, c-format
+msgid "Quitting UDP\n"
+msgstr ""
+
+#: src/base/idManager.c:42
+#, c-format
+msgid "Starting ID manger\n"
+msgstr ""
+
+#: src/base/idManager.c:75
+msgid "No free ID left!"
+msgstr ""
+
+#: src/base/idManager.c:115 src/base/idManager.c:138
+msgid "This kind of ID was never registered!"
+msgstr ""
+
+#: src/base/idManager.c:189
+#, c-format
+msgid "ID %d does not exist\n"
+msgstr ""
+
+#: src/base/idManager.c:196
+#, c-format
+msgid "ID %d (count %d)\n"
+msgstr ""
+
+#: src/base/idManager.c:204
+#, c-format
+msgid "Quitting ID manger\n"
+msgstr ""
+
+#: src/base/server.c:162 src/base/server.c:324
+msgid "Bad client type (TCP/UDP)!"
+msgstr ""
+
+#: src/base/myTimer.c:113
+msgid "Timer is really wierdly set!"
+msgstr ""
+
+#: src/base/myTimer.c:132
+msgid "There is no such ID!"
+msgstr ""
+
+#: src/base/modules.c:70 src/base/modules.c:76
+#, c-format
+msgid "Error %s occured when using getFce function!\n"
+msgstr ""
+
+#: src/base/modules.c:147
+#, c-format
+msgid "Unable to map file %s!\n"
+msgstr ""
+
+#: src/base/modules.c:163
+#, c-format
+msgid "Loading module: \"%s\"\n"
+msgstr ""
+
+#: src/base/modules.c:166
+#, c-format
+msgid "Failed initialization of module \"%s\""
+msgstr ""
+
+#: src/base/modules.c:183
+#, c-format
+msgid "Destroing module...\n"
+msgstr ""
+
+#: src/base/modules.c:213
+#, c-format
+msgid "I've done this once, dont want to mess memory with module %s again!\n"
+msgstr ""
+
+#: src/base/modules.c:218
+#, c-format
+msgid "Loading module %s failed!\n"
+msgstr ""
+
+#: src/base/shareFunction.c:42
+#, c-format
+msgid "Adding  \"%s\" to share function.\n"
+msgstr ""
+
+#: src/base/net_multiplayer.c:61 src/base/net_multiplayer.c:69
+#, c-format
+msgid "Unable to inicialize network game as server!\n"
+msgstr ""
+
+#: src/base/net_multiplayer.c:81
+#, c-format
+msgid "Unable to inicialize network game as client!\n"
+msgstr ""
+
+#: src/base/net_multiplayer.c:88 src/base/net_multiplayer.c:112
+#: src/base/net_multiplayer.c:134
+msgid "Variable netGameType has a really wierd value!"
+msgstr ""
+
+#: src/base/main.c:102
+#, c-format
+msgid ""
+"File %s not found !\n"
+"Program shutdown !\n"
+msgstr ""
+
+#: src/base/main.c:155
+#, c-format
+msgid ""
+"WinSock initialization failed !\n"
+"Program shutdown !\n"
+msgstr ""
+
+#: src/base/arenaFile.c:83
+#, c-format
+msgid "Loaded new arena...\n"
+msgstr ""
+
+#: src/base/arenaFile.c:242
+#, c-format
+msgid "Loading map file: %s\n"
+msgstr ""
+
+#: src/base/homeDirector.c:22
+#, c-format
+msgid "Environment variable HOME not found!\n"
+msgstr ""
+
+#: src/base/homeDirector.c:30
+#, c-format
+msgid "Creating home directory %s.\n"
+msgstr ""
+
+#: src/base/homeDirector.c:37
+#, c-format
+msgid "Unable to create home directory!\n"
+msgstr ""
+
+#: src/base/gun.c:50
+msgid "There is wrong value in course variable!"
+msgstr ""
+
+#: src/base/proto.c:68
+#, c-format
+msgid "Proto error code: \"%d\"\n"
+msgstr ""
+
+#: src/base/proto.c:73
+msgid "Version of your client isn't supported by the server."
+msgstr ""
+
+#: src/screen/screen_table.c:99
+#, c-format
+msgid "Highscore file: \"%s\" was not loaded!"
+msgstr ""
+
+#: src/screen/screen_table.c:152 src/screen/screen_setting.c:226
+#: src/server/heightScore.c:22
+#, c-format
+msgid "I am unable to load: \"%s\" !\n"
+msgstr ""
+
+#: src/screen/screen_table.c:153 src/screen/screen_setting.c:227
+#: src/server/heightScore.c:23
+#, c-format
+msgid "Creating: \"%s\"\n"
+msgstr ""
+
+#: src/screen/screen_table.c:163 src/screen/screen_setting.c:234
+#: src/server/heightScore.c:36
+#, c-format
+msgid "I was unable to create: \"%s\" !\n"
+msgstr ""
+
+#: src/screen/screen_table.c:211 src/screen/screen_browser.c:681
+#: src/screen/screen_setting.c:338 src/screen/screen_choiceArena.c:143
+#: src/screen/screen_credits.c:106 src/screen/screen_gameType.c:232
+msgid "back"
+msgstr ""
+
+#: src/screen/screen_world.c:67
+#, c-format
+msgid "Network initialization error!\n"
+msgstr ""
+
+#: src/screen/screen_world.c:435
+msgid "Tux has not defined controls!"
+msgstr ""
+
+#: src/screen/screen_world.c:620
+#, c-format
+msgid "Quitting screen world\n"
+msgstr ""
+
+#: src/screen/screen_mainMenu.c:105
+msgid "Start game"
+msgstr ""
+
+#: src/screen/screen_mainMenu.c:106
+msgid "Settings"
+msgstr ""
+
+#: src/screen/screen_mainMenu.c:107
+msgid "Highscore"
+msgstr ""
+
+#: src/screen/screen_mainMenu.c:108
+msgid "Credits"
+msgstr ""
+
+#: src/screen/screen_mainMenu.c:109
+msgid "Quit game"
+msgstr ""
+
+#: src/screen/screen_browser.c:682
+msgid "Play"
+msgstr ""
+
+#: src/screen/screen_browser.c:683
+msgid "Refresh"
+msgstr ""
+
+#: src/screen/screen_browser.c:685
+msgid "server"
+msgstr ""
+
+#: src/screen/screen_browser.c:686
+msgid "version"
+msgstr ""
+
+#: src/screen/screen_browser.c:687 src/screen/screen_gameType.c:260
+msgid "IP"
+msgstr ""
+
+#: src/screen/screen_browser.c:688
+msgid "arena"
+msgstr ""
+
+#: src/screen/screen_browser.c:689
+msgid "clients"
+msgstr ""
+
+#: src/screen/screen_browser.c:690
+msgid "ping"
+msgstr ""
+
+#: src/screen/screen_setting.c:294
+#, c-format
+msgid ""
+"I am unable to save configure file, because config file was not "
+"initialised!\n"
+msgstr ""
+
+#: src/screen/screen_setting.c:339
+msgid "controls"
+msgstr ""
+
+#: src/screen/screen_setting.c:342
+msgid "Music:"
+msgstr ""
+
+#: src/screen/screen_setting.c:345
+msgid "Sound:"
+msgstr ""
+
+#: src/screen/screen_setting.c:356
+msgid "No. of rounds:"
+msgstr ""
+
+#: src/screen/screen_setting.c:357
+msgid "Player 1:"
+msgstr ""
+
+#: src/screen/screen_setting.c:358
+msgid "Player 2:"
+msgstr ""
+
+#: src/screen/screen_settingKeys.c:113
+#, c-format
+msgid "I was unable to load file: %s\n"
+msgstr ""
+
+#: src/screen/screen_settingKeys.c:114
+#, c-format
+msgid "I try to create file: %s\n"
+msgstr ""
+
+#: src/screen/screen_settingKeys.c:118
+#, c-format
+msgid "I was unable to create file: %s\n"
+msgstr ""
+
+#: src/screen/screen_settingKeys.c:236
+msgid "Back"
+msgstr ""
+
+#: src/screen/screen_settingKeys.c:237
+msgid "Player 2"
+msgstr ""
+
+#: src/screen/screen_settingKeys.c:238
+msgid "Up"
+msgstr ""
+
+#: src/screen/screen_settingKeys.c:239 src/screen/screen_settingKeys.c:246
+msgid "Down:"
+msgstr ""
+
+#: src/screen/screen_settingKeys.c:240 src/screen/screen_settingKeys.c:247
+msgid "Left:"
+msgstr ""
+
+#: src/screen/screen_settingKeys.c:241 src/screen/screen_settingKeys.c:248
+msgid "Right:"
+msgstr ""
+
+#: src/screen/screen_settingKeys.c:242 src/screen/screen_settingKeys.c:249
+msgid "Fire gun:"
+msgstr ""
+
+#: src/screen/screen_settingKeys.c:243 src/screen/screen_settingKeys.c:250
+msgid "Switch gun:"
+msgstr ""
+
+#: src/screen/screen_settingKeys.c:244
+msgid "Player 1"
+msgstr ""
+
+#: src/screen/screen_settingKeys.c:245
+msgid "Up:"
+msgstr ""
+
+#: src/screen/screen_choiceArena.c:144 src/screen/screen_gameType.c:233
+msgid "play"
+msgstr ""
+
+#: src/screen/screen_credits.c:132
+#, c-format
+msgid "Credit file not found... %s/%s"
+msgstr ""
+
+#: src/screen/screen_gameType.c:234
+msgid "browser"
+msgstr ""
+
+#: src/screen/screen_gameType.c:255
+msgid "Local game"
+msgstr ""
+
+#: src/screen/screen_gameType.c:256
+msgid "Set up a server"
+msgstr ""
+
+#: src/screen/screen_gameType.c:257
+msgid "Network game"
+msgstr ""
+
+#: src/screen/screen_gameType.c:261
+msgid "port"
+msgstr ""
+
+#: src/screen/screen_gameType.c:321
+msgid "Unknown game type!"
+msgstr ""
+
+#: src/screen/screen_gameType.c:378
+#, c-format
+msgid "Unknown IP protocol!\n"
+msgstr ""
+
+#: src/widget/widget_button.c:90
+#, c-format
+msgid "Event caught\n"
+msgstr ""
+
+#: src/widget/widget_textfield.c:182
+msgid "Bad filter!"
+msgstr ""
+
+#: src/modules/modTeleport.c:195
+msgid "When generating random value in range 0 to 3 i got some other value?!"
+msgstr ""
+
+#: src/modules/modPipe.c:184
+#, c-format
+msgid "Pipe ID for pipe \"%d\" was not found\n"
+msgstr ""
+
+#: src/modules/modPipe.c:249
+msgid "Tux is moving in another dimension maybe!"
+msgstr ""
+
+#: src/modules/modMove.c:67
+msgid "Variable p->control has a really wierd value!"
+msgstr ""
+
+#: src/audio/sound.c:41
+#, c-format
+msgid "Initializing sound...\n"
+msgstr ""
+
+#: src/audio/sound.c:53
+#, c-format
+msgid "Loading sound file: %s\n"
+msgstr ""
+
+#: src/audio/sound.c:59
+#, c-format
+msgid "Unable to load sound file: %s with error: %s\n"
+msgstr ""
+
+#: src/audio/sound.c:71
+#, c-format
+msgid "Unable to playback sound with error: %s\n"
+msgstr ""
+
+#: src/audio/sound.c:131
+#, c-format
+msgid "Quitting sound...\n"
+msgstr ""
+
+#: src/audio/music.c:43
+#, c-format
+msgid "Initializing music...\n"
+msgstr ""
+
+#: src/audio/music.c:54
+#, c-format
+msgid "Loading music file: %s\n"
+msgstr ""
+
+#: src/audio/music.c:60
+#, c-format
+msgid "Unable to load music from file: %s\n"
+msgstr ""
+
+#: src/audio/music.c:108
+#, c-format
+msgid "Stopping music...\n"
+msgstr ""
+
+#: src/audio/music.c:148
+#, c-format
+msgid "Playing music file %s\n"
+msgstr ""
+
+#: src/audio/music.c:206
+#, c-format
+msgid "Quitting music...\n"
+msgstr ""
+
+#: src/audio/audio.c:29
+#, c-format
+msgid "Unable to initialize audio: %s\n"
+msgstr ""
+
+#: src/audio/audio.c:33
+#, c-format
+msgid "Unable to create proper audio settings: %s\n"
+msgstr ""
+
+#: src/audio/audio.c:39
+#, c-format
+msgid "Initializing audio system...\n"
+msgstr ""
+
+#: src/audio/audio.c:51
+#, c-format
+msgid "Quitting audio...\n"
+msgstr ""
+
+#: src/net/udp.c:71
+#, c-format
+msgid "Unable to create socket when binding!\n"
+msgstr ""
+
+#: src/net/udp.c:103
+#, c-format
+msgid "Unable to set socket %s %d!\n"
+msgstr ""
+
+#: src/net/udp.c:139 src/net/tcp.c:68
+#, c-format
+msgid "Unable to create socket when connecting!\n"
+msgstr ""
+
+#: src/net/udp.c:229
+#, c-format
+msgid "Unable to read form socket %d %s %d!\n"
+msgstr ""
+
+#: src/net/udp.c:270
+#, c-format
+msgid "Unable to write on socket %d %s %d!\n"
+msgstr ""
+
+#: src/net/udp.c:320 src/net/tcp.c:183
+msgid "Bad IP proto!"
+msgstr ""
+
+#: src/net/tcp.c:98
+#, c-format
+msgid "Unable to bint to port: %d\n"
+msgstr ""
+
+#: src/net/tcp.c:213
+#, c-format
+msgid "Unable to create TCP socket!\n"
+msgstr ""
+
+#: src/server/publicServer.c:247
+#, c-format
+msgid "I was unable to open config file!\n"
+msgstr ""
+
+#: src/server/publicServer.c:268
+#, c-format
+msgid "Unable to initialize network socket!\n"
+msgstr ""
+
+#: src/server/publicServer.c:276
+#, c-format
+msgid "Unable to contact MasterServer!)\n"
+msgstr ""
+
+#: src/server/publicServer.c:329
+#, c-format
+msgid "Quitting public server\n"
+msgstr ""
+
+#: src/server/serverConfigFile.c:42
+#, c-format
+msgid "Loading configuration from: \"%s\"\n"
+msgstr ""
+
+#: src/server/serverConfigFile.c:48
+#, c-format
+msgid "I was unable to load config file. Falling back to defaults!\n"
+msgstr ""
+
+#: src/server/log.c:20
+#, c-format
+msgid "Opening logfile \"%s\" failed!\n"
+msgstr ""
+
+#: src/server/log.c:24
+#, c-format
+msgid "I use logfile: \"%s\")\n"
+msgstr ""
+
+#: src/server/log.c:48
+msgid "Really bad log value!"
+msgstr ""
+
+#: src/server/heightScore.c:29
+#, c-format
+msgid "Scorefile: \"%s\"\n"
+msgstr ""
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a15fb35..c6f7e3f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -48,12 +48,11 @@ SET ( SRC_client
 	${WORKDIR}/client/layer	${WORKDIR}/client/term
 	${WORKDIR}/client/screen	${WORKDIR}/client/interface
 	${WORKDIR}/client/client	${WORKDIR}/client/chat
-	${WORKDIR}/client/configFile	${WORKDIR}/client/language
+	${WORKDIR}/client/configFile	${WORKDIR}/client/saveLoad
 	${WORKDIR}/client/font	${WORKDIR}/client/game
 	${WORKDIR}/client/radar	${WORKDIR}/client/panel
 	${WORKDIR}/client/image	${WORKDIR}/client/keyboardBuffer
 	${WORKDIR}/client/pauza	${WORKDIR}/client/saveDialog
-	${WORKDIR}/client/saveLoad
 
 	${WORKDIR}/screen/screen_choiceArena
 	${WORKDIR}/screen/screen_settingKeys	${WORKDIR}/screen/screen_table
diff --git a/src/base/path.h.in b/src/base/path.h.in
index 5333ae8..cf4e47d 100644
--- a/src/base/path.h.in
+++ b/src/base/path.h.in
@@ -22,9 +22,8 @@
 	#define PATH_ARENA	PATH_DIR	"arena/"
 	#define PATH_SOUND	PATH_DIR	"sound/"
 	#define PATH_MUSIC	PATH_DIR	"music/"
-	#define PATH_CONFIG	PATH_DIR	"conf/"
-	#define PATH_LANG	PATH_DIR	"lang/"
-	#define PATH_DOC	"@CMAKE_DOC_PATH@"	"doc/"	APPNAME	"-" "@TUXANCI_VERSION@" "/"
-	#define PATH_LOCALE	PREFIX		"share/locale/"
+	#define PATH_LOCALE	"@CMAKE_LOCALE_PATH@"	"/"
+	#define PATH_DOC	"@CMAKE_DOC_PATH@"	"/"		APPNAME	"-" "@TUXANCI_VERSION@" "/"
+	#define GETTEXT_PACKAGE	"@GETTEXT_PACKAGE@"
 	#include "main.h"
 #endif
diff --git a/src/base/proto.c b/src/base/proto.c
index 646b550..e833225 100644
--- a/src/base/proto.c
+++ b/src/base/proto.c
@@ -21,7 +21,6 @@
 #include "serverSendMsg.h"
 
 #ifndef PUBLIC_SERVER
-#include "language.h"
 #include "screen_world.h"
 #include "screen_setting.h"
 #include "screen_choiceArena.h"
diff --git a/src/client/client.c b/src/client/client.c
index edffc54..4637d01 100644
--- a/src/client/client.c
+++ b/src/client/client.c
@@ -22,7 +22,6 @@
 #include "proto.h"
 
 #include "client.h"
-#include "language.h"
 
 #include "screen_analyze.h"
 #include "screen_world.h"
diff --git a/src/client/game.c b/src/client/game.c
index 1c2688f..66e179c 100644
--- a/src/client/game.c
+++ b/src/client/game.c
@@ -21,7 +21,6 @@
 #include "screen.h"
 #include "font.h"
 #include "screen_settingKeys.h"
-#include "language.h"
 #include "panel.h"
 #include "radar.h"
 
@@ -46,18 +45,9 @@ static void initGame()
 {
 	createHomeDirector();
 
-	if( initLanguage() == -1 )
-	{
-#ifdef DEBUG
-		printf(_("I was unable to initialize old nls system (if you see this something wierd is happening)!\n"));
-#endif
-		exit(-1);
-	}
-
 	initSDL();
 
 	initLayer();
-	initFont(getLanguageFont(), getLanguageSize());
 	initImageData();
 #ifndef NO_SOUND
 	initAudio();
@@ -99,7 +89,6 @@ void quitGame()
 
 	quitLayer();
 	quitFont();
-	quitLanguage();
 	quitScreen();
 	quitArenaFile();
 	quitItem();
diff --git a/src/client/language.c b/src/client/language.c
deleted file mode 100644
index eb915ed..0000000
--- a/src/client/language.c
+++ /dev/null
@@ -1,210 +0,0 @@
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
-#include <sys/stat.h>
-
-#include "main.h"
-#include "list.h"
-#include "homeDirector.h"
-#include "textFile.h"
-
-#include "configFile.h"
-#include "language.h"
-#include "director.h"
-
-static textFile_t *languageFile;
-static char fontFile[STR_FILE_NAME_SIZE];
-static int fontSize;
-
-static char* getHead(textFile_t *ts)
-{
-	int i;
-
-	for( i = 0 ; i < ts->text->count ; i++ )
-	{
-		char *line;
-		line = (char *) (ts->text->list[i]);
-
-		if( strncmp(line, "HEAD", 4) == 0 )
-		{
-			return line;
-		}
-	}
-
-	return NULL;
-}
-
-static char* getSupportLanguage()
-{
-	director_t *director;
-	char *envLang;
-	char lang[STR_SIZE];
-	int i;
-
-	printf("I search language..\n");
-
-	envLang = getenv("LANG");
-
-	if( envLang == NULL )
-	{
-		printf("Environment LANG not defined, I use default value \"en\"\n");
-		return strdup("en");
-	}
-
-	memset(lang, 0, STR_SIZE);
-	strncpy(lang, envLang, 2);
-
-	director = loadDirector(PATH_LANG);
-
-	if( director == NULL )
-	{
-		fprintf(stderr, "Do not open director %s\n", PATH_LANG);
-		return strdup("en");
-	}
-
-	for( i = 0 ; i < director->list->count ; i++ )
-	{
-		char *line;
-
-		line = (char *)director->list->list[i];
-
-		if( strncmp(lang, line, 2) == 0 )
-		{
-			printf("I choice lang %s in file %s\n", lang, line);
-			return strdup(lang);
-		}
-	}
-
-	destroyDirector(director);
-
-	printf("Lang %s not support, I use default language english\n", lang);
-
-	return strdup("en");
-}
- 
-int initLanguage()
-{
-	textFile_t *languageTypeFile;
-	char path[STR_PATH_SIZE];
-	char *lang;
-	char *head;
-
-	sprintf(path, "%s/lang.conf", getHomeDirector());
-	printf("open %s\n", path);
-	languageTypeFile = loadTextFile(path);
-
-	if( languageTypeFile == NULL )
-	{
-		char *defaultLang;
-
-		fprintf(stderr, "Don't load %s\n", path);
-		fprintf(stderr, "I create %s\n", path);
-
-		languageTypeFile = newTextFile(path);
-		defaultLang = getSupportLanguage();
-		addList(languageTypeFile->text, strdup(defaultLang) );
-		saveTextFile(languageTypeFile);
-		free(defaultLang);
-	}
-
-	if( languageTypeFile == NULL )
-	{
-		fprintf(stderr, "Don't create %s\n", path);
-		return -1;
-	}
-
-	if( languageTypeFile->text->count == 0 )
-	{
-		fprintf(stderr, "File %s empty\n", path);
-		return -1;
-	}
-
-	lang = ((char *)languageTypeFile->text->list[0]);
-	printf("select lang %s\n", lang);
-
-	sprintf(path, PATH_LANG "%s.lang", lang);
-
-	destroyTextFile(languageTypeFile);
-	
-	accessExistFile(path);
-	languageFile = loadTextFile(path);
-
-	if( languageFile == NULL )
-	{
-		fprintf(stderr, "Don't load %s\n", path);
-		return -1;
-	}
-
-	head = getHead(languageFile);
-
-	if( head != NULL )
-	{
-		char val[STR_SIZE];
-	
-		if( getValue(head, "fontfile", val, STR_SIZE) == 0 )
-		{
-			strcpy(fontFile, val);
-		}
-		else
-		{
-			fprintf(stderr, "fontfile in lang file %s not found\n", path);
-			return -1;
-		}
-
-		if( getValue(head, "fontsize", val, STR_SIZE) == 0 )
-		{
-			fontSize = atoi(val);
-		}
-		else
-		{
-			fprintf(stderr, "fontsize in lang file %s not found\n", path);
-			return -1;
-		}
-	}
-	else
-	{
-		fprintf(stderr, "head in lang file %s not found\n", path);
-		return -1;
-	}
-
-	return 0;
-}
-
-char* getMyText(char *key)
-{
-	int i;
-	int len;
-
-	len = strlen(key);
-
-	for( i = 0 ; i < languageFile->text->count ; i++ )
-	{
-		char *line;
-		line = (char *) (languageFile->text->list[i]);
-
-		if( strncmp(key, line, len) == 0 )
-		{
-			return line+strlen(key)+1;
-		}
-	}
-
-	return NULL;
-}
-
-char* getLanguageFont()
-{
-	return fontFile;
-}
-
-int getLanguageSize()
-{
-	return fontSize;
-}
-
-void quitLanguage()
-{
-	destroyTextFile(languageFile);
-}
-
diff --git a/src/client/language.h b/src/client/language.h
deleted file mode 100644
index 23fc1a4..0000000
--- a/src/client/language.h
+++ /dev/null
@@ -1,12 +0,0 @@
-
-#ifndef LANGUAGE_H
-
-#define LANGUAGE_H
-
-extern int initLanguage();
-extern char* getMyText(char *key);
-extern char* getLanguageFont();
-extern int getLanguageSize();
-extern void quitLanguage();
-
-#endif
diff --git a/src/modules/modMove.c b/src/modules/modMove.c
index d1c626c..69af165 100755
--- a/src/modules/modMove.c
+++ b/src/modules/modMove.c
@@ -22,7 +22,6 @@
 #include "publicServer.h"
 #endif
 
-
 static export_fce_t *export_fce;
 
 static void move_tux(tux_t *tux, int x,  int y, int w, int h)
@@ -59,7 +58,7 @@ static void move_tux(tux_t *tux, int x,  int y, int w, int h)
 		break;
 	
 		default :
-			assert( ! _("Variable p->control has a really wierd value!") );
+			assert( ! "Variable p->control has a really wierd value!" );
 		break;
 	}
 	
diff --git a/src/net/tcp.c b/src/net/tcp.c
index d623d86..0d5d03c 100755
--- a/src/net/tcp.c
+++ b/src/net/tcp.c
@@ -19,7 +19,6 @@
 #include <netinet/tcp.h> 
 #include <fcntl.h>
 
-#include "main.h"
 #include "tcp.h"
 
 sock_tcp_t* newSockTcp(int proto)
diff --git a/src/screen/screen_browser.c b/src/screen/screen_browser.c
index fe23d09..9d82ffe 100644
--- a/src/screen/screen_browser.c
+++ b/src/screen/screen_browser.c
@@ -9,7 +9,6 @@
 #include "homeDirector.h"
 #include "net_multiplayer.h"
 
-#include "language.h"
 #include "interface.h"
 #include "screen.h"
 #include "image.h"
diff --git a/src/screen/screen_choiceArena.c b/src/screen/screen_choiceArena.c
index 1adb04d..6d10649 100644
--- a/src/screen/screen_choiceArena.c
+++ b/src/screen/screen_choiceArena.c
@@ -6,7 +6,6 @@
 #include "list.h"
 #include "arenaFile.h"
 
-#include "language.h"
 #include "interface.h"
 #include "screen.h"
 #include "image.h"
diff --git a/src/screen/screen_credits.c b/src/screen/screen_credits.c
index 27ba838..d2fcee2 100644
--- a/src/screen/screen_credits.c
+++ b/src/screen/screen_credits.c
@@ -6,7 +6,6 @@
 #include "list.h"
 #include "textFile.h"
 
-#include "language.h"
 #include "interface.h"
 #include "screen.h"
 #include "image.h"
diff --git a/src/screen/screen_gameType.c b/src/screen/screen_gameType.c
index 71420d8..ae2e350 100644
--- a/src/screen/screen_gameType.c
+++ b/src/screen/screen_gameType.c
@@ -10,7 +10,6 @@
 #include "net_multiplayer.h"
 #include "tux.h"
 
-#include "language.h"
 #include "interface.h"
 #include "screen.h"
 #include "image.h"
diff --git a/src/screen/screen_mainMenu.c b/src/screen/screen_mainMenu.c
index e5cae8f..46cfb5e 100644
--- a/src/screen/screen_mainMenu.c
+++ b/src/screen/screen_mainMenu.c
@@ -6,7 +6,6 @@
 
 #include "game.h"
 #include "interface.h"
-#include "language.h"
 #include "screen.h"
 #include "image.h"
 
diff --git a/src/screen/screen_setting.c b/src/screen/screen_setting.c
index 46ea84a..452164d 100644
--- a/src/screen/screen_setting.c
+++ b/src/screen/screen_setting.c
@@ -12,7 +12,6 @@
 #include "arenaFile.h"
 
 #include "configFile.h"
-#include "language.h"
 #include "interface.h"
 #include "screen.h"
 #include "image.h"
diff --git a/src/screen/screen_settingKeys.c b/src/screen/screen_settingKeys.c
index 970c38d..d40db6d 100644
--- a/src/screen/screen_settingKeys.c
+++ b/src/screen/screen_settingKeys.c
@@ -10,7 +10,6 @@
 #include "director.h"
 #include "homeDirector.h"
 #include "configFile.h"
-#include "language.h"
 #include "interface.h"
 #include "screen.h"
 #include "image.h"
diff --git a/src/screen/screen_table.c b/src/screen/screen_table.c
index fa8e738..f4c981c 100644
--- a/src/screen/screen_table.c
+++ b/src/screen/screen_table.c
@@ -8,7 +8,6 @@
 #include "textFile.h"
 #include "homeDirector.h"
 
-#include "language.h"
 #include "interface.h"
 #include "screen.h"
 #include "image.h"
author	scarab <scarab@0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e>	2008-08-18 23:58:32 +0000
committer	scarab <scarab@0ee4d065-81f0-4d1e-b06c-ff20ad07cc3e>	2008-08-18 23:58:32 +0000
commit	3cfa5354f2a6b164f0e46ebde60af3b0d697fbcd (patch)
tree	74fdc662aa084bf64ecd73c650df6250e8ed284b
parent	9c71274e5c4cde5dd99a0eb927243f6c481df1f2 (diff)