Engine:
authorsmxx
Wed, 17 Feb 2010 20:03:25 +0000
changeset 2822 0533562bc3a4
parent 2821 67815ee123d7
child 2823 cf002eb2ab65
Engine: * Use included Lua source files to compile a local copy to be used (Koda) Frontend: * Changed the way Xfire code is excluded outside Win32 * Updated slovak translation by jose1711__
CMakeLists.txt
QTfrontend/hwform.cpp
QTfrontend/xfire.h
hedgewars/CMakeLists.txt
hedgewars/LuaPas.pas
misc/liblua/CMakeLists.txt
project_files/hedgewars.pro
share/hedgewars/Data/Locale/hedgewars_sk.ts
--- a/CMakeLists.txt	Wed Feb 17 19:50:22 2010 +0000
+++ b/CMakeLists.txt	Wed Feb 17 20:03:25 2010 +0000
@@ -49,21 +49,18 @@
 	STRING(REGEX REPLACE "([0-9][0-9].[0-9]+).[0-9]" "\\1" current_macosx_version ${MACOSX_VERSION_TMP})
 
 	if(NOT minimum_macosx)
-		#if nothing is set, we build only for the current system
+		#if nothing is set, we deploy only for the current system
 		set(minimum_macosx ${current_macosx_version})
 	endif()
 
+	if(current_macosx_version MATCHES "10.6")
+		set(CMAKE_OSX_ARCHITECTURES "x86_64")
+	endif()
+
 	#create universal binaries only when it's time to bundle the application, also build server
 	IF(BUNDLE)
 		set(WITH_SERVER false)
-		if(current_macosx_version MATCHES "10.6")
-			if(minimum_macosx MATCHES "10.6")
-				#prevent building ppc for 10.6
-				set(CMAKE_OSX_ARCHITECTURES "x86_64;i386")
-			else()
-				set(CMAKE_OSX_ARCHITECTURES "x86_64;i386;ppc7400")
-			endif()
-		else()
+		if(minimum_macosx NOT MATCHES "10.6")
 			set(CMAKE_OSX_ARCHITECTURES "i386;ppc7400")
 		endif()
 	ENDIF()	
@@ -76,7 +73,10 @@
 		set(CMAKE_OSX_SYSROOT "/Developer/SDKs/MacOSX${minimum_macosx}.sdk/")
 	endif()
 
-	set(pascal_compiler_flags_cmn "-k${CMAKE_BINARY_DIR}/bin/libSDLmain.a" "-k-macosx_version_min" "-k${minimum_macosx}" "-XR${CMAKE_OSX_SYSROOT}" ${pascal_compiler_flags_cmn})
+	#1.set deployment target; 2.link with libsdlmain.a; 3.link with liblua.a (which requires readline)
+	set(pascal_compiler_flags_cmn "-k-macosx_version_min" "-k${minimum_macosx}" "-XR${CMAKE_OSX_SYSROOT}" ${pascal_compiler_flags_cmn})
+	set(pascal_compiler_flags_cmn "-k${CMAKE_BINARY_DIR}/bin/libSDLmain.a" ${pascal_compiler_flags_cmn})
+	set(pascal_compiler_flags_cmn "-k${CMAKE_BINARY_DIR}/bin/liblua.a" "-k-lreadline" ${pascal_compiler_flags_cmn})
 else(APPLE)
 	set(target_dir "bin")
 endif(APPLE)
--- a/QTfrontend/hwform.cpp	Wed Feb 17 19:50:22 2010 +0000
+++ b/QTfrontend/hwform.cpp	Wed Feb 17 20:03:25 2010 +0000
@@ -72,7 +72,9 @@
 HWForm::HWForm(QWidget *parent)
   : QMainWindow(parent), pnetserver(0), pRegisterServer(0), editedTeam(0), hwnet(0)
 {
+#ifdef USE_XFIRE
 	xfire_init();
+#endif
     gameSettings = new QSettings(cfgdir->absolutePath() + "/hedgewars.ini", QSettings::IniFormat);
     frontendEffects = gameSettings->value("video/frontendeffects", true).toBool();
 
@@ -207,15 +209,9 @@
 	GoBack();
 }
 
+#ifdef USE_XFIRE
 void HWForm::updateXfire(void)
 {
-//	xfire_setvalue(XFIRE_ROOM, "None");
-//	xfire_setvalue(XFIRE_GAMEMODE, "Multiplayer");
-//	xfire_setvalue(XFIRE_NICKNAME, ui.pageOptions->editNetNick->text().toAscii());
-//	if(!host.compare("netserver.hedgewars.org"))
-//		xfire_setvalue(XFIRE_SERVER, "Official server");
-//	else
-//		xfire_setvalue(XFIRE_SERVER, "Custom or local LAN server");
 	if(hwnet)
 	{
 		xfire_setvalue(XFIRE_SERVER, !hwnet->getHost().compare("netserver.hedgewars.org:46631") ? "Official server" : hwnet->getHost().toAscii());
@@ -253,6 +249,7 @@
 	}
 	xfire_update();
 }
+#endif
 
 void HWForm::onFrontendFullscreen(bool value)
 {
@@ -408,7 +405,9 @@
 
 void HWForm::OnPageShown(quint8 id, quint8 lastid)
 {
+#ifdef USE_XFIRE
 	updateXfire();
+#endif
 	if (id == ID_PAGE_MULTIPLAYER || id == ID_PAGE_NETGAME) {
 		QStringList tmNames = config->GetTeamsList();
 		TeamSelWidget* curTeamSelWidget;
@@ -941,7 +940,9 @@
 
 void HWForm::closeEvent(QCloseEvent *event)
 {
+#ifdef USE_XFIRE
 	xfire_free();
+#endif
 	config->SaveOptions();
 	event->accept();
 }
--- a/QTfrontend/xfire.h	Wed Feb 17 19:50:22 2010 +0000
+++ b/QTfrontend/xfire.h	Wed Feb 17 20:03:25 2010 +0000
@@ -24,6 +24,7 @@
 #define USE_XFIRE
 #endif
 
+#ifdef USE_XFIRE
 enum XFIRE_KEYS
 {
 	XFIRE_STATUS = 0,
@@ -33,16 +34,10 @@
 	XFIRE_KEY_COUNT,
 };
 
-#ifdef USE_XFIRE
 void xfire_init(void);
 void xfire_free(void);
 void xfire_setvalue(const XFIRE_KEYS status, const char *value);
 void xfire_update(void);
-#else
-#define xfire_init() /*xfire_init()*/
-#define xfire_free() /*xfire_free()*/
-#define xfire_setvalue(a, b) /*xfire_setvalue(a, b)*/
-#define xfire_update() /*xfire_update()*/
 #endif
 
 #endif // XFIRE_H
--- a/hedgewars/CMakeLists.txt	Wed Feb 17 19:50:22 2010 +0000
+++ b/hedgewars/CMakeLists.txt	Wed Feb 17 20:03:25 2010 +0000
@@ -148,14 +148,11 @@
 	include_directories(${SDL_INCLUDE_DIR})
 
 	add_library (SDLmain STATIC SDLMain.m)
-#	set_target_properties(SDLmain PROPERTIES COMPILE_FLAGS "-mmacosx-version-min=${minimum_macosx} --sysroot=${CMAKE_OSX_SYSROOT} ")
 
-	#let's tell freepacal where to find libraries
-	set(pascal_compiler_flags "-k${CMAKE_BINARY_DIR}/misc/liblua/liblua.a" "-k-lreadline" ${pascal_compiler_flags})
 
 	#these are the dependencies for building a universal binary on Mac OS X
 	foreach (build_arch ${powerpc_build} ${i386_build} ${x86_64_build})
-		set(lipo_args_list "${EXECUTABLE_OUTPUT_PATH}/hwengine.${build_arch}" ${lipo_args_list})
+		set(lipo_args_list "${EXECUTABLE_OUTPUT_PATH}/hwengine.${build_arch}")
 		add_custom_command(OUTPUT "${EXECUTABLE_OUTPUT_PATH}/hwengine.${build_arch}"
 			COMMAND "${pascal_compiler}"
 			ARGS ${pascal_compiler_flags} -ohwengine.${build_arch} -P${build_arch}
--- a/hedgewars/LuaPas.pas	Wed Feb 17 19:50:22 2010 +0000
+++ b/hedgewars/LuaPas.pas	Wed Feb 17 20:03:25 2010 +0000
@@ -24,10 +24,10 @@
   {$IFDEF DARWIN}
     LuaLibName = 'lua';
   {$ELSE}
-    LuaLibName = 'lua5.1.so';
+    LuaLibName = 'lua.so';
   {$ENDIF}
 {$ELSE}
-  LuaLibName = 'lua5.1.dll';
+  LuaLibName = 'lua.dll';
 {$ENDIF}
 
 
--- a/misc/liblua/CMakeLists.txt	Wed Feb 17 19:50:22 2010 +0000
+++ b/misc/liblua/CMakeLists.txt	Wed Feb 17 20:03:25 2010 +0000
@@ -1,8 +1,24 @@
+file(GLOB lua_src *.c *.h) 
+set(LIBRARY_OUTPUT_PATH ${EXECUTABLE_OUTPUT_PATH})
+
 IF(APPLE)
-	file(GLOB lua_src *.c *.h) 
 	set(CMAKE_OSX_ARCHITECTURES "x86_64;i386;ppc7400")	
 	
-	set (build_type STATIC)
+	set(build_type STATIC)
 	add_definitions(-DLUA_USE_LINUX)
-	add_library (lua ${build_type} ${lua_src})
 ENDIF(APPLE)
+
+IF(WIN32)
+	set(build_type SHARED)
+	add_definitions(-DLUA_BUILD_AS_DLL)
+ENDIF(WIN32)
+
+add_library (lua ${build_type} ${lua_src})
+
+if(WIN32)
+	SET_TARGET_PROPERTIES(lua PROPERTIES PREFIX "")
+	install(TARGETS lua DESTINATION ${target_dir})
+endif(WIN32)
+
+
+
--- a/project_files/hedgewars.pro	Wed Feb 17 19:50:22 2010 +0000
+++ b/project_files/hedgewars.pro	Wed Feb 17 20:03:25 2010 +0000
@@ -55,7 +55,10 @@
 	../QTfrontend/teamselect.cpp ../QTfrontend/teamselhelper.cpp \
 	../QTfrontend/togglebutton.cpp ../QTfrontend/ui_hwform.cpp \
 	../QTfrontend/vertScrollArea.cpp ../QTfrontend/weaponItem.cpp \
-	../QTfrontend/xfire.cpp
+
+win32 {
+SOURCES += ../QTfrontend/xfire.cpp
+}
 
 TRANSLATIONS += ../share/hedgewars/Data/Locale/hedgewars_bg.ts 	 
 TRANSLATIONS += ../share/hedgewars/Data/Locale/hedgewars_de.ts 	 
--- a/share/hedgewars/Data/Locale/hedgewars_sk.ts	Wed Feb 17 19:50:22 2010 +0000
+++ b/share/hedgewars/Data/Locale/hedgewars_sk.ts	Wed Feb 17 20:03:25 2010 +0000
@@ -12,14 +12,14 @@
     <name>FreqSpinBox</name>
     <message>
         <source>Never</source>
-        <translation type="unfinished"></translation>
+        <translation>Nikdy</translation>
     </message>
     <message numerus="yes">
         <source>Every %1 turn</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-            <numerusform></numerusform>
+        <translation>
+            <numerusform>Každý ťah</numerusform>
+            <numerusform>Každé %1 ťahy</numerusform>
+            <numerusform>Každých %1 ťahov</numerusform>
         </translation>
     </message>
 </context>
@@ -169,23 +169,26 @@
 registered on Hedgewars.org
 Please provide your password
 or pick another nickname:</source>
-        <translation type="unfinished"></translation>
+        <translation>Vaša prezývka %1 je
+zaregistrovaná na Hedgewars.org
+Prosím, zadajte heslo alebo
+si vyberte inú prezývku:</translation>
     </message>
     <message>
         <source>%1 *** %2 has joined the room</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 *** %2 prišiel do miestnosti</translation>
     </message>
     <message>
         <source>%1 *** %2 has joined</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 *** %2 sa pridal</translation>
     </message>
     <message>
         <source>%1 *** %2 has left (%3)</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 *** %2 odišiel (%3)</translation>
     </message>
     <message>
         <source>%1 *** %2 has left</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 *** %2 odišiel</translation>
     </message>
 </context>
 <context>
@@ -207,7 +210,7 @@
     </message>
     <message>
         <source>Clear Accounts Cache</source>
-        <translation type="unfinished"></translation>
+        <translation>Vymazať vyrovnávaciu pamäť účtov</translation>
     </message>
 </context>
 <context>
@@ -236,18 +239,18 @@
     </message>
     <message numerus="yes">
         <source>&lt;p&gt;The best killer is &lt;b&gt;%1&lt;/b&gt; with &lt;b&gt;%2&lt;/b&gt; kills in a turn.&lt;/p&gt;</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-            <numerusform></numerusform>
+        <translation>
+            <numerusform>&lt;p&gt;Najlepším zabijákom je &lt;b&gt;%1&lt;/b&gt; s &lt;b&gt;jedným&lt;/b&gt; zabitím počas ťahu.&lt;/p&gt;</numerusform>
+            <numerusform>&lt;p&gt;Najlepším zabijákom je &lt;b&gt;%1&lt;/b&gt; s &lt;b&gt;%2&lt;/b&gt; zabitiami počas ťahu.&lt;/p&gt;</numerusform>
+            <numerusform>&lt;p&gt;Najlepším zabijákom je &lt;b&gt;%1&lt;/b&gt; s &lt;b&gt;%2&lt;/b&gt; zabitiami počas ťahu.&lt;/p&gt;</numerusform>
         </translation>
     </message>
     <message numerus="yes">
         <source>&lt;p&gt;A total of &lt;b&gt;%1&lt;/b&gt; hedgehog(s) were killed during this round.&lt;/p&gt;</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-            <numerusform></numerusform>
+        <translation>
+            <numerusform>&lt;p&gt;Celkovo bol v tomto kole zabitý &lt;b&gt;jeden&lt;/b&gt; ježko.&lt;/p&gt;</numerusform>
+            <numerusform>&lt;p&gt;Celkovo boli v tomto kole zabití &lt;b&gt;%1&lt;/b&gt; ježkovia.&lt;/p&gt;</numerusform>
+            <numerusform>&lt;p&gt;Celkovo boli v tomto kole zabití &lt;b&gt;%1&lt;/b&gt; ježkovia.&lt;/p&gt;</numerusform>
         </translation>
     </message>
 </context>
@@ -376,52 +379,54 @@
     </message>
     <message>
         <source>Room Name:</source>
-        <translation type="unfinished"></translation>
+        <translation>Názov miestnosti:</translation>
     </message>
     <message>
         <source>This game is in lobby.
 You may join and start playing once the game starts.</source>
-        <translation type="unfinished"></translation>
+        <translation>Táto hra je v lobby.
+Môžete sa pridať a začať hru akonáhle hra skončí.</translation>
     </message>
     <message>
         <source>This game is in progress.
 You may join and spectate now but you&apos;ll have to wait for the game to end to start playing.</source>
-        <translation type="unfinished"></translation>
+        <translation>Táto hra práve prebieha.
+Môžete sa pridať a sledovať hru, ale ak chcete hrať budete musieť počkať na koniec hry.</translation>
     </message>
     <message>
         <source>%1 is the host. He may adjust settings and start the game.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 je hostiteľom. Može meniť nastavenia a spúšťať hru.</translation>
     </message>
     <message>
         <source>Random Map</source>
-        <translation type="unfinished"></translation>
+        <translation>Náhodná mapa</translation>
     </message>
     <message>
         <source>Games may be played on precreated or randomized maps.</source>
-        <translation type="unfinished"></translation>
+        <translation>Hry môžu byť hrané na predvytvorených alebo náhodných mapách.</translation>
     </message>
     <message>
         <source>The Game Scheme defines general options and preferences like Round Time, Sudden Death or Vampirism.</source>
-        <translation type="unfinished"></translation>
+        <translation>Schéma hry určuje všeobecné voľby ako napríklad Dĺžka kola, Režim rýchlej smrti alebo Vampírizmus.</translation>
     </message>
     <message>
         <source>The Weapon Scheme defines available weapons and their ammunition count.</source>
-        <translation type="unfinished"></translation>
+        <translation>Schémy hry určuje dostupné zbrane a množstvo výzbroje.</translation>
     </message>
     <message numerus="yes">
         <source>There are %1 clients connected to this room.</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-            <numerusform></numerusform>
+        <translation>
+            <numerusform>K tejto miestnosti je pripojený jeden klient.</numerusform>
+            <numerusform>K tejto miestnosti sú pripojení %1 klienti.</numerusform>
+            <numerusform>K tejto miestnosti je pripojených %1 klientov.</numerusform>
         </translation>
     </message>
     <message numerus="yes">
         <source>There are %1 teams participating in this room.</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-            <numerusform></numerusform>
+        <translation>
+            <numerusform>V tejto miestnosti je jeden hrajúci team.</numerusform>
+            <numerusform>V tejto miestnosti sú %1 hrajúce teamy.</numerusform>
+            <numerusform>V tejto miestnosti je %1 hrajúcich teamov.</numerusform>
         </translation>
     </message>
     <message>
@@ -497,11 +502,11 @@
     </message>
     <message>
         <source>Order of play is random instead of in room order.</source>
-        <translation type="unfinished"></translation>
+        <translation>Poradie hrania je náhodné miesto poradia hráčov v miestnosti.</translation>
     </message>
     <message>
         <source>Play with a King. If he dies, your side dies.</source>
-        <translation type="unfinished"></translation>
+        <translation>Hra s Kráľom. Ak zomrie, vaša strana prehráva.</translation>
     </message>
 </context>
 <context>
@@ -566,14 +571,14 @@
     </message>
     <message>
         <source>Follow</source>
-        <translation type="unfinished"></translation>
+        <translation>Nasledovať</translation>
     </message>
 </context>
 <context>
     <name>QCheckBox</name>
     <message>
         <source>Check for updates at startup</source>
-        <translation type="unfinished"></translation>
+        <translation>Kontrolovať aktualizácie pri štarte</translation>
     </message>
     <message>
         <source>Fullscreen</source>
@@ -605,11 +610,11 @@
     </message>
     <message>
         <source>Frontend effects (requires restart)</source>
-        <translation type="unfinished"></translation>
+        <translation>Efekty frontendu (vyžaduje reštart)</translation>
     </message>
     <message>
         <source>Reduced quality</source>
-        <translation type="unfinished"></translation>
+        <translation>Znížená kvalita</translation>
     </message>
 </context>
 <context>
@@ -846,11 +851,11 @@
     </message>
     <message>
         <source>Nickname</source>
-        <translation type="unfinished"></translation>
+        <translation>Prezývka</translation>
     </message>
     <message>
         <source>Please enter your nickname</source>
-        <translation type="unfinished"></translation>
+        <translation>Prosím, zadajte vašu prezývku</translation>
     </message>
 </context>
 <context>
@@ -920,42 +925,42 @@
     <name>QTableWidget</name>
     <message>
         <source>Room Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Názov miestnosti</translation>
     </message>
     <message>
         <source>C</source>
-        <translation type="unfinished"></translation>
+        <translation>C</translation>
     </message>
     <message>
         <source>T</source>
-        <translation type="unfinished"></translation>
+        <translation>T</translation>
     </message>
     <message>
         <source>Owner</source>
-        <translation type="unfinished"></translation>
+        <translation>Majiteľ</translation>
     </message>
     <message>
         <source>Map</source>
-        <translation type="unfinished">Mapa</translation>
+        <translation>Mapa</translation>
     </message>
     <message>
         <source>Rules</source>
-        <translation type="unfinished"></translation>
+        <translation>Pravidlá</translation>
     </message>
     <message>
         <source>Weapons</source>
-        <translation type="unfinished"></translation>
+        <translation>Zbrane</translation>
     </message>
 </context>
 <context>
     <name>SelWeaponWidget</name>
     <message>
         <source>Weapon set</source>
-        <translation type="unfinished"></translation>
+        <translation>Sada zbraní</translation>
     </message>
     <message>
         <source>Probabilities</source>
-        <translation type="unfinished"></translation>
+        <translation>Pravdepodobnosti</translation>
     </message>
 </context>
 <context>
@@ -1021,11 +1026,11 @@
     </message>
     <message>
         <source>Random Order</source>
-        <translation type="unfinished"></translation>
+        <translation>Náhodné poradie</translation>
     </message>
     <message>
         <source>King</source>
-        <translation type="unfinished"></translation>
+        <translation>Kráľ</translation>
     </message>
 </context>
 <context>
@@ -1170,384 +1175,384 @@
     </message>
     <message>
         <source>zoom in</source>
-        <translation type="unfinished"></translation>
+        <translation>priblíženie</translation>
     </message>
     <message>
         <source>zoom out</source>
-        <translation type="unfinished"></translation>
+        <translation>oddialenie</translation>
     </message>
     <message>
         <source>reset zoom</source>
-        <translation type="unfinished"></translation>
+        <translation>reštartovať priblíženie</translation>
     </message>
     <message>
         <source>long jump</source>
-        <translation type="unfinished"></translation>
+        <translation>dlhý skok</translation>
     </message>
     <message>
         <source>high jump</source>
-        <translation type="unfinished"></translation>
+        <translation>vysoký skok</translation>
     </message>
 </context>
 <context>
     <name>binds (categories)</name>
     <message>
         <source>Basic controls</source>
-        <translation type="unfinished"></translation>
+        <translation>Základné ovládanie</translation>
     </message>
     <message>
         <source>Weapon controls</source>
-        <translation type="unfinished"></translation>
+        <translation>Ovládanie zbraní</translation>
     </message>
     <message>
         <source>Camera and cursor controls</source>
-        <translation type="unfinished"></translation>
+        <translation>Ovládanie kurzora a kamery</translation>
     </message>
     <message>
         <source>Other</source>
-        <translation type="unfinished">Iné</translation>
+        <translation>Iné</translation>
     </message>
 </context>
 <context>
     <name>binds (descriptions)</name>
     <message>
         <source>Move your hogs and aim:</source>
-        <translation type="unfinished"></translation>
+        <translation>Presun ježka a mierenie:</translation>
     </message>
     <message>
         <source>Traverse gaps and obstacles by jumping:</source>
-        <translation type="unfinished"></translation>
+        <translation>Prekoná priepasti a prekážky skokom:</translation>
     </message>
     <message>
         <source>Fire your selected weapon or trigger an utility item:</source>
-        <translation type="unfinished"></translation>
+        <translation>Vypáli vami zvolenú zbraň alebo zapne nástroj:</translation>
     </message>
     <message>
         <source>Pick a weapon or a target location under the cursor:</source>
-        <translation type="unfinished"></translation>
+        <translation>Položí zbraň alebo vyberie cieľ v mieste pod kurzorom:</translation>
     </message>
     <message>
         <source>Switch your currently active hog (if possible):</source>
-        <translation type="unfinished"></translation>
+        <translation>Prepne vášho momentálne vybraného ježka (ak je to možné):</translation>
     </message>
     <message>
         <source>Pick a weapon or utility item:</source>
-        <translation type="unfinished"></translation>
+        <translation>Zodvihne zbraň alebo nástroj:</translation>
     </message>
     <message>
         <source>Set the timer on bombs and timed weapons:</source>
-        <translation type="unfinished"></translation>
+        <translation>Nastaví časovač na bombách a iných zbraniach s časovou rozbuškou:</translation>
     </message>
     <message>
         <source>Move the camera to the active hog:</source>
-        <translation type="unfinished"></translation>
+        <translation>Presunie kameru na aktívneho ježka:</translation>
     </message>
     <message>
         <source>Move the cursor or camera without using the mouse:</source>
-        <translation type="unfinished"></translation>
+        <translation>Presunie kurzor alebo kameru bez použitia myši:</translation>
     </message>
     <message>
         <source>Modify the camera&apos;s zoom level:</source>
-        <translation type="unfinished"></translation>
+        <translation>Zmeniť stupeň priblíženia kamery:</translation>
     </message>
     <message>
         <source>Talk to your team or all participants:</source>
-        <translation type="unfinished"></translation>
+        <translation>Umožní vám rozhovor s vašim teamom alebo všetkými účastníkmi hry:</translation>
     </message>
     <message>
         <source>Pause, continue or leave your game:</source>
-        <translation type="unfinished"></translation>
+        <translation>Pauza, pokračovanie alebo opustenie hry:</translation>
     </message>
     <message>
         <source>Modify the game&apos;s volume while playing:</source>
-        <translation type="unfinished"></translation>
+        <translation>Zmena hlasitosti v hre počas hrania:</translation>
     </message>
     <message>
         <source>Toggle fullscreen mode:</source>
-        <translation type="unfinished"></translation>
+        <translation>Prepne celoobrazovkový režim:</translation>
     </message>
     <message>
         <source>Take a screenshot:</source>
-        <translation type="unfinished"></translation>
+        <translation>Urobí snímok obrazovky:</translation>
     </message>
     <message>
         <source>Toggle labels above hedgehogs:</source>
-        <translation type="unfinished"></translation>
+        <translation>Prepnúť nápisy nad ježkami:</translation>
     </message>
 </context>
 <context>
     <name>binds (keys)</name>
     <message>
         <source>Axis</source>
-        <translation type="unfinished"></translation>
+        <translation>Os</translation>
     </message>
     <message>
         <source>(Up)</source>
-        <translation type="unfinished"></translation>
+        <translation>(Hore)</translation>
     </message>
     <message>
         <source>(Down)</source>
-        <translation type="unfinished"></translation>
+        <translation>(Dole)</translation>
     </message>
     <message>
         <source>Hat</source>
-        <translation type="unfinished"></translation>
+        <translation>Klobúk</translation>
     </message>
     <message>
         <source>(Left)</source>
-        <translation type="unfinished"></translation>
+        <translation>(Vľavo)</translation>
     </message>
     <message>
         <source>(Right)</source>
-        <translation type="unfinished"></translation>
+        <translation>(Vpravo)</translation>
     </message>
     <message>
         <source>Button</source>
-        <translation type="unfinished"></translation>
+        <translation>Tlačidlo</translation>
     </message>
     <message>
         <source>Keyboard</source>
-        <translation type="unfinished"></translation>
+        <translation>Klávesnica</translation>
     </message>
     <message>
         <source>Mouse: Left button</source>
-        <translation type="unfinished"></translation>
+        <translation>Myš: Ľavé tlačidlo</translation>
     </message>
     <message>
         <source>Mouse: Middle button</source>
-        <translation type="unfinished"></translation>
+        <translation>Myš: Prostredné tlačidlo</translation>
     </message>
     <message>
         <source>Mouse: Right button</source>
-        <translation type="unfinished"></translation>
+        <translation>Myš: Pravé tlačidlo</translation>
     </message>
     <message>
         <source>Mouse: Wheel up</source>
-        <translation type="unfinished"></translation>
+        <translation>Myš: Kolečko smerom nahor</translation>
     </message>
     <message>
         <source>Mouse: Wheel down</source>
-        <translation type="unfinished"></translation>
+        <translation>Myš: Kolečko smerom nadol</translation>
     </message>
     <message>
         <source>Backspace</source>
-        <translation type="unfinished"></translation>
+        <translation>Backspace</translation>
     </message>
     <message>
         <source>Tab</source>
-        <translation type="unfinished"></translation>
+        <translation>Tabulátor</translation>
     </message>
     <message>
         <source>Clear</source>
-        <translation type="unfinished"></translation>
+        <translation>Clear</translation>
     </message>
     <message>
         <source>Return</source>
-        <translation type="unfinished"></translation>
+        <translation>Enter</translation>
     </message>
     <message>
         <source>Pause</source>
-        <translation type="unfinished"></translation>
+        <translation>Pause</translation>
     </message>
     <message>
         <source>Escape</source>
-        <translation type="unfinished"></translation>
+        <translation>Escape</translation>
     </message>
     <message>
         <source>Space</source>
-        <translation type="unfinished"></translation>
+        <translation>Medzera</translation>
     </message>
     <message>
         <source>Delete</source>
-        <translation type="unfinished">Vymazať</translation>
+        <translation>Delete</translation>
     </message>
     <message>
         <source>Numpad 0</source>
-        <translation type="unfinished"></translation>
+        <translation>Numpad 0</translation>
     </message>
     <message>
         <source>Numpad 1</source>
-        <translation type="unfinished"></translation>
+        <translation>Numpad 1</translation>
     </message>
     <message>
         <source>Numpad 2</source>
-        <translation type="unfinished"></translation>
+        <translation>Numpad 2</translation>
     </message>
     <message>
         <source>Numpad 3</source>
-        <translation type="unfinished"></translation>
+        <translation>Numpad 3</translation>
     </message>
     <message>
         <source>Numpad 4</source>
-        <translation type="unfinished"></translation>
+        <translation>Numpad 4</translation>
     </message>
     <message>
         <source>Numpad 5</source>
-        <translation type="unfinished"></translation>
+        <translation>Numpad 5</translation>
     </message>
     <message>
         <source>Numpad 6</source>
-        <translation type="unfinished"></translation>
+        <translation>Numpad 6</translation>
     </message>
     <message>
         <source>Numpad 7</source>
-        <translation type="unfinished"></translation>
+        <translation>Numpad 7</translation>
     </message>
     <message>
         <source>Numpad 8</source>
-        <translation type="unfinished"></translation>
+        <translation>Numpad 8</translation>
     </message>
     <message>
         <source>Numpad 9</source>
-        <translation type="unfinished"></translation>
+        <translation>Numpad 9</translation>
     </message>
     <message>
         <source>Numpad .</source>
-        <translation type="unfinished"></translation>
+        <translation>Numpad .</translation>
     </message>
     <message>
         <source>Numpad /</source>
-        <translation type="unfinished"></translation>
+        <translation>Numpad /</translation>
     </message>
     <message>
         <source>Numpad *</source>
-        <translation type="unfinished"></translation>
+        <translation>Numpad *</translation>
     </message>
     <message>
         <source>Numpad -</source>
-        <translation type="unfinished"></translation>
+        <translation>Numpad -</translation>
     </message>
     <message>
         <source>Numpad +</source>
-        <translation type="unfinished"></translation>
+        <translation>Numpad +</translation>
     </message>
     <message>
         <source>Enter</source>
-        <translation type="unfinished"></translation>
+        <translation>Enter</translation>
     </message>
     <message>
         <source>Equals</source>
-        <translation type="unfinished"></translation>
+        <translation>Rovná sa</translation>
     </message>
     <message>
         <source>Up</source>
-        <translation type="unfinished"></translation>
+        <translation>Hore</translation>
     </message>
     <message>
         <source>Down</source>
-        <translation type="unfinished"></translation>
+        <translation>Dole</translation>
     </message>
     <message>
         <source>Right</source>
-        <translation type="unfinished"></translation>
+        <translation>Vpravo</translation>
     </message>
     <message>
         <source>Left</source>
-        <translation type="unfinished"></translation>
+        <translation>Vľavo</translation>
     </message>
     <message>
         <source>Insert</source>
-        <translation type="unfinished"></translation>
+        <translation>Insert</translation>
     </message>
     <message>
         <source>Home</source>
-        <translation type="unfinished"></translation>
+        <translation>Home</translation>
     </message>
     <message>
         <source>End</source>
-        <translation type="unfinished"></translation>
+        <translation>End</translation>
     </message>
     <message>
         <source>Page up</source>
-        <translation type="unfinished"></translation>
+        <translation>Page up</translation>
     </message>
     <message>
         <source>Page down</source>
-        <translation type="unfinished"></translation>
+        <translation>Page down</translation>
     </message>
     <message>
         <source>Num lock</source>
-        <translation type="unfinished"></translation>
+        <translation>Num lock</translation>
     </message>
     <message>
         <source>Caps lock</source>
-        <translation type="unfinished"></translation>
+        <translation>Caps lock</translation>
     </message>
     <message>
         <source>Scroll lock</source>
-        <translation type="unfinished"></translation>
+        <translation>Scroll lock</translation>
     </message>
     <message>
         <source>Right shift</source>
-        <translation type="unfinished"></translation>
+        <translation>Pravý shift</translation>
     </message>
     <message>
         <source>Left shift</source>
-        <translation type="unfinished"></translation>
+        <translation>Ľavý shift</translation>
     </message>
     <message>
         <source>Right ctrl</source>
-        <translation type="unfinished"></translation>
+        <translation>Pravý ctrl</translation>
     </message>
     <message>
         <source>Left ctrl</source>
-        <translation type="unfinished"></translation>
+        <translation>Ľavý ctrl</translation>
     </message>
     <message>
         <source>Right alt</source>
-        <translation type="unfinished"></translation>
+        <translation>Pravý alt</translation>
     </message>
     <message>
         <source>Left alt</source>
-        <translation type="unfinished"></translation>
+        <translation>Ľavý alt</translation>
     </message>
     <message>
         <source>Right meta</source>
-        <translation type="unfinished"></translation>
+        <translation>Pravý meta</translation>
     </message>
     <message>
         <source>Left meta</source>
-        <translation type="unfinished"></translation>
+        <translation>Ľavý meta</translation>
     </message>
     <message>
         <source>A button</source>
-        <translation type="unfinished"></translation>
+        <translation>Tlačidlo A</translation>
     </message>
     <message>
         <source>B button</source>
-        <translation type="unfinished"></translation>
+        <translation>Tlačidlo B</translation>
     </message>
     <message>
         <source>X button</source>
-        <translation type="unfinished"></translation>
+        <translation>Tlačidlo X</translation>
     </message>
     <message>
         <source>Y button</source>
-        <translation type="unfinished"></translation>
+        <translation>Tlačidlo Y</translation>
     </message>
     <message>
         <source>LB button</source>
-        <translation type="unfinished"></translation>
+        <translation>Tlačidlo LB</translation>
     </message>
     <message>
         <source>RB button</source>
-        <translation type="unfinished"></translation>
+        <translation>Tlačidlo RB</translation>
     </message>
     <message>
         <source>Back button</source>
-        <translation type="unfinished"></translation>
+        <translation>Tlačidlo Back</translation>
     </message>
     <message>
         <source>Start button</source>
-        <translation type="unfinished"></translation>
+        <translation>Tlačidlo Start</translation>
     </message>
     <message>
         <source>Left stick</source>
-        <translation type="unfinished"></translation>
+        <translation>Joystick doľava</translation>
     </message>
     <message>
         <source>Right stick</source>
-        <translation type="unfinished"></translation>
+        <translation>Joystick doprava</translation>
     </message>
     <message>
         <source>Left stick (Right)</source>
@@ -1567,11 +1572,11 @@
     </message>
     <message>
         <source>Left trigger</source>
-        <translation type="unfinished"></translation>
+        <translation>Ľavý prepínač</translation>
     </message>
     <message>
         <source>Right trigger</source>
-        <translation type="unfinished"></translation>
+        <translation>Pravý prepínač</translation>
     </message>
     <message>
         <source>Right stick (Down)</source>
@@ -1591,7 +1596,7 @@
     </message>
     <message>
         <source>DPad</source>
-        <translation type="unfinished"></translation>
+        <translation>DPad</translation>
     </message>
 </context>
 </TS>