Update to 0.6.6

Also added missing client versions.

CMakeLists.txt

@@ -1,7 +1,8 @@
 cmake_minimum_required(VERSION 2.6)
 project(otclient)
 
-set(VERSION "0.6.4")
+set(VERSION "0.6.6")
+set(LIB_NAME "otc_framework")
 
 option(FRAMEWORK_SOUND "Use SOUND " ON)
 option(FRAMEWORK_GRAPHICS "Use GRAPHICS " ON)
@@ -35,11 +36,20 @@ endif()
 
 add_definitions(-D"VERSION=\\"${VERSION}\\"")
 
+# we want framework to be a library for faster compilation/linking
+if(USE_STATIC_LIBS)
+    add_library(${LIB_NAME} ${framework_SOURCES})
+else()
+    add_library(${LIB_NAME} SHARED ${framework_SOURCES})
+    message(STATUS "Linking to shared ${LIB_NAME}, make sure you copy the DLL/SO/dylib with the executable!")
+endif()
+target_link_libraries(${LIB_NAME} ${framework_LIBRARIES})
+
 # add client executable
-add_executable(${PROJECT_NAME} ${framework_SOURCES} ${client_SOURCES} ${executable_SOURCES})
+add_executable(${PROJECT_NAME} ${client_SOURCES} ${executable_SOURCES})
 
 # target link libraries
-target_link_libraries(${PROJECT_NAME} ${framework_LIBRARIES})
+target_link_libraries(${PROJECT_NAME} ${LIB_NAME})
 
 if(USE_PCH)
     include(cotire)
@@ -51,7 +61,10 @@ endif()
 
 # installation
 set(DATA_INSTALL_DIR share/${PROJECT_NAME})
-install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin)
+install(TARGETS ${PROJECT_NAME} ${LIB_NAME}
+		RUNTIME DESTINATION bin
+		LIBRARY DESTINATION lib
+		ARCHIVE DESTINATION lib)
 install(FILES README.md BUGS LICENSE AUTHORS init.lua ${PROJECT_NAME}rc.lua DESTINATION ${DATA_INSTALL_DIR})
 install(DIRECTORY data modules DESTINATION ${DATA_INSTALL_DIR} PATTERN ".git" EXCLUDE)
 

README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://secure.travis-ci.org/edubart/otclient.png?branch=master)](http://travis-ci.org/edubart/otclient)
+[![Build Status](https://secure.travis-ci.org/edubart/otclient.svg?branch=master)](http://travis-ci.org/edubart/otclient)
 ### What is otclient?
 
 Otclient is an alternative Tibia client for usage with otserv. It aims to be complete and flexible,
@@ -8,6 +8,20 @@ that each functionality is a separated module, giving the possibility to users m
 anything easily. Users can also create new mods and extend game interface for their own purposes.
 Otclient is written in C++2011, the upcoming C++ standard and heavily scripted in lua.
 
+### Where do I download?
+
+The latest commits compiled for Windows can be found here.
+* [Windows Builds](http://otland.net/threads/otclient-builds-windows.217977/)
+
+Here is the latest v0.6.5 release compiled for both i686(32 bit) and x86_64(64 bit) machines, with OpenGL renderer.
+This release is compatible with protocols ranges from 7.60 up to 10.31.
+* [For Windows](https://www.dropbox.com/sh/se1okacemoqzjve/XFqFoSKLCg/otclient-win-0.6.5.zip)
+* [For Linux](https://www.dropbox.com/sh/se1okacemoqzjve/xKJL7j6vEo/otclient-linux-0.6.5.tar.gz)
+
+**NOTE:** You will need to download spr/dat files on your own and place them in `data/things/VERSION/` (i.e: `data/things/1041/Tibia.spr`)
+
+Older releases can be downloaded from [here](https://www.dropbox.com/sh/se1okacemoqzjve/-oWK4YFm03)
+
 ### Features
 
 Beyond of it's flexibility with scripts, otclient comes with tons of other features that make possible
@@ -18,17 +32,18 @@ to port to mobile platforms. Otclient is also flexible enough to
 create tibia tools like map editors just using scripts, because it wasn't designed to be just a
 client, instead otclient was designed to be a combination of a framework and tibia APIs.
 
-### Download
-
-Stable versions of otclient master branch compiled for Windows and Linux is available
-in the [downloads section](https://github.com/edubart/otclient/downloads) of the project's github page.
-
 ### Compiling
 
+A package with all required libraries for compiling OTClient on Windows can be found here:
+* [For MSVC 2013](https://www.dropbox.com/sh/se1okacemoqzjve/dI4ODbq7OT/otclient-msvc13-libs.zip)
+* [For MingW32](https://www.dropbox.com/sh/se1okacemoqzjve/UAkRCiGXXR/otclient-libs_mingw32-dwarf2.zip)
+
 In short, if you need to compile OTClient, follow these tutorials:
 * [Compiling on Windows](https://github.com/edubart/otclient/wiki/Compiling-on-Windows)
 * [Compiling on Linux](https://github.com/edubart/otclient/wiki/Compiling-on-Linux)
 
+
+
 ### Need help?
 
 Try to ask questions in [otland](http://otland.net/f494/), now we have a board for the project there,
@@ -50,4 +65,3 @@ Talk directly with us at #otclient irc.freenode.net or send an email directly to
 
 Otclient is made available under the MIT License, thus this means that you are free
 to do whatever you want, commercial, non-commercial, closed or open.
-

data/locales/es.lua

@@ -1,4 +1,6 @@
 -- special thanks for Shaday, who made these translations
+--Dominique120 edits: I made some statements to sound more formal and appropriate as well as correcting a few words that were not translated. I also added a few notes for future translators to keep in mind.
+
 
 locale = {
   name = "es",
@@ -9,18 +11,18 @@ locale = {
     ["1a) Offensive Name"] = "1a) Nombre ofensivo",
     ["1b) Invalid Name Format"] = "1b) Formato invalido para nombre",
     ["1c) Unsuitable Name"] = "1c) Nombre no adecuado",
-    ["1d) Name Inciting Rule Violation"] = "1d) Nombre que incita una violacion al reglamento",
+    ["1d) Name Inciting Rule Violation"] = "1d) Nombre que incita una violaci<EFBFBD>n al reglamento",
     ["2a) Offensive Statement"] = "2a) Comentario ofensivo",
     ["2b) Spamming"] = "2b) Spamming",
-    ["2c) Illegal Advertising"] = "2c) Publicidad ilicita",
-    ["2d) Off-Topic Public Statement"] = "2d) Publicacion fuera de lugar",
-    ["2e) Non-English Public Statement"] = "2e) Publicacion fuera del ingles",
-    ["2f) Inciting Rule Violation"] = "2f) Incitar a una violacion al reglamento",
+    ["2c) Illegal Advertising"] = "2c) Publicidad il<EFBFBD>cita",
+    ["2d) Off-Topic Public Statement"] = "2d) Publicaci<EFBFBD>n fuera de lugar",
+    ["2e) Non-English Public Statement"] = "2e) Publicaci<EFBFBD>n fuera del ingles",
+    ["2f) Inciting Rule Violation"] = "2f) Incitar a una violaci<EFBFBD>n al reglamento",
     ["3a) Bug Abuse"] = "3a) Abuso de error",
     ["3b) Game Weakness Abuse"] = "3b) Abuso de debilidad del juego",
     ["3c) Using Unofficial Software to Play"] = "3c) Usando software ilegal para jugar",
     ["3d) Hacking"] = "3d) Hackeo",
-    ["3e) Multi-Clienting"] = "3e) Multiple Cliente",
+    ["3e) Multi-Clienting"] = "3e) Uso de m<>ltiples clientes",
     ["3f) Account Trading or Sharing"] = "3f) Intercambio de cuenta",
     ["4a) Threatening Gamemaster"] = "4a) Amenzar a un Gamemaster",
     ["4b) Pretending to Have Influence on Rule Enforcement"] = "4b) Pretender tener influencia en una parte del reglamento",
@@ -28,54 +30,54 @@ locale = {
     ["Accept"] = "Aceptar",
     ["Account name"] = "Nombre de cuenta",
     ["Account Status:"] = "Estado de cuenta:",
-    ["Action:"] = "Accion:",
+    ["Action:"] = "Acci<EFBFBD>n:",
     ["Add"] = "A<EFBFBD>adir",
     ["Add new VIP"] = "A<EFBFBD>adir nuevo VIP",
     ["Addon 1"] = "Addon 1",
-    ["Addon 2"] = "Addon 1",
-    ["Addon 3"] = "Addon 1",
+    ["Addon 2"] = "Addon 2",
+    ["Addon 3"] = "Addon 3",
     ["Add to VIP list"] = "A<EFBFBD>adir a lista VIP",
     ["Adjust volume"] = "Ajustar volumen",
-    ["Alas! Brave adventurer, you have met a sad fate.\nBut do not despair, for the gods will bring you back\ninto this world in exchange for a small sacrifice\n\nSimply click on Ok to resume your journeys!"] = "<EFBFBD>Ay! Aventurero valiente, que ha conocido a un triste destino. \nPero no se desespere, porque los dioses le llevar<61> de vuelta \na este mundo a cambio de un peque<75>o sacrificio \n\nSimply haga clic en Aceptar para continuar con sus viajes!",
+    ["Alas! Brave adventurer, you have met a sad fate.\nBut do not despair, for the gods will bring you back\ninto this world in exchange for a small sacrifice\n\nSimply click on Ok to resume your journeys!"] = "<EFBFBD>Ay! Aventurero valiente, has conocido un triste destino. \nPero no se desespere, porque los dioses te llevar<61>n de vuelta \na este mundo a cambio de un peque<75>o sacrificio \n\nSimplemente haga clic en Aceptar para continuar con sus viajes!",
     ["All"] = "Todo",
     ["All modules and scripts were reloaded."] = "Todos los m<>dulos y scripts se vuelven a cargar.",
     ["Allow auto chase override"] = "Permitur auto persecuci<63>n override",
-    ["Also known as dash in tibia community, recommended\nfor playing characters with high speed"] = "Conocido por la comunidad de tibia como dash.\nRecomenada para players de alto nivel.",
+    ["Also known as dash in tibia community, recommended\nfor playing characters with high speed"] = "Conocido por la comunidad de tibia como dash.\nRecomenada para jugadores de alto nivel.",
     ["Ambient light: %s%%"] = "Ambiente de luz: %s%%",
     ["Amount:"] = "Cantidad:",
     ["Amount"] = "Cantidad",
     ["Anonymous"] = "An<EFBFBD>nimo",
-    ["Are you sure you want to logout?"] = "<EFBFBD>Estas seguro de que quieres salir?",
+    ["Are you sure you want to logout?"] = "<EFBFBD>Estas seguro de que deseas salir?",
     ["Attack"] = "Atacar",
     ["Author"] = "Autor",
     ["Autoload"] = "Auto carga",
     ["Autoload priority"] = "Auto carga prioritaria",
-    ["Auto login"] = "Auto iniciar",
-    ["Auto login selected character on next charlist load"] = "Auto cargar car<61>cter seleccionado en la carga charlist siguiente",
-    ["Axe Fighting"] = "Combate con acha",
+    ["Auto login"] = "Auto ingresar",
+    ["Auto login selected character on next charlist load"] = "Ingresar la siguiente vez que aparece el charlist con el personaje seleccionado",
+    ["Axe Fighting"] = "Combate con hacha",
     ["Balance:"] = "Saldo:",
     ["Banishment"] = "Banishment",
     ["Banishment + Final Warning"] = "Banishment + Final Warning",
     ["Battle"] = "Batalla",
     ["Browse"] = "Navegar",
     ["Bug report sent."] = "Reporte de error enviado.",
-    ["Button Assign"] = "Boton asignado",
+    ["Button Assign"] = "Bot<EFBFBD>n asignado",
     ["Buy"] = "Compra",
     ["Buy Now"] = "Compra ahora",
     ["Buy Offers"] = "Comprar oferta",
-    ["Buy with backpack"] = "Comprar con backpack",
+    ["Buy with backpack"] = "Comprar con mochila",
     ["Cancel"] = "Cancelar",
-    ["Cannot login while already in game."] = "No se puede iniciar sesi<73>n, mientras que estes en el juego.",
+    ["Cannot login while already in game."] = "No se puede iniciar sesi<73>n, mientras que est<EFBFBD>s en el juego.",
     ["Cap"] = "Cap",
     ["Capacity"] = "Capacidad",
     ["Center"] = "Centrar",
     ["Channels"] = "Canales",
     ["Character List"] = "Lista de car<61>cter",
-    ["Classic control"] = "Control Clasico",
+    ["Classic control"] = "Controles Cl<EFBFBD>sicos",
     ["Clear current message window"] = "Limpiar mensaje actual en ventana",
     ["Clear Messages"] = "Limpiar mensaje",
     ["Clear object"] = "Limpiar objeto",
-    ["Client needs update."] = "El cliente necesita actualizacion.",
+    ["Client needs update."] = "El cliente necesita una actualizaci<EFBFBD>n.",
     ["Close"] = "Cerrar",
     ["Close this channel"] = "Cerrar este canal",
     ["Club Fighting"] = "Combate con mazo",
@@ -99,28 +101,28 @@ locale = {
     ["Delete mark"] = "Borrar Marca",
     ["Description:"] = "Descripci<EFBFBD>n:",
     ["Description"] = "Descripci<EFBFBD>n",
-    ["Destructive Behaviour"] = "Comportamiento agresivo",
+    ["Destructive Behaviour"] = "Comportamiento destructivo",
     ["Detail"] = "Detalle",
     ["Details"] = "Detalles",
     ["Disable Shared Experience"] = "Desactivar experiencia compartida",
     ["Dismount"] = "Desmontar",
-    ["Display connection speed to the server (milliseconds)"] = "Mostrar velocidad de conexion en el servidor (millisegundos)",
+    ["Display connection speed to the server (milliseconds)"] = "Mostrar velocidad de conexi<EFBFBD>n en el servidor (millisegundos)",
     ["Distance Fighting"] = "Combate a distancia",
     ["Don\'t stretch/shrink Game Window"] = "No estirar ni reducir el tama<6D>o de ventana",
     ["Edit hotkey text:"] = "Editar texto de hotkey:",
     ["Edit List"] = "Editar lista",
     ["Edit Text"] = "Editar texto",
-    ["Enable music"] = "Habilitar musica",
+    ["Enable music"] = "Habilitar m<EFBFBD>sica",
     ["Enable Shared Experience"] = "Habilitar experiencia compartida",
     ["Enable smart walking"] = "Habilitar caminado inteligente",
     ["Enable vertical synchronization"] = "Habilitar sincronizaci<63>n vertical",
     ["Enable walk booster"] = "Habilitar caminado turbo",
     ["Enter Game"] = "Entrar al juego",
     ["Enter one name per line."] = "Introducir un nombre por linea.",
-    ["Enter with your account again to update your client."] = "",
+    ["Enter with your account again to update your client."] = "Ingrese con su cuenta nuevamente para actualizar el cliente.",
     ["Error"] = "Error",
     ["Error"] = "Error",
-    ["Excessive Unjustified Player Killing"] = "Asesinato excesivo injustivicado de players",
+    ["Excessive Unjustified Player Killing"] = "Asesinato excesivo injustificado de jugadores",
     ["Exclude from private chat"] = "Ejecutar desde un canal privado",
     ["Exit"] = "Salir",
     ["Experience"] = "Experiencia",
@@ -132,71 +134,71 @@ locale = {
     ["Follow"] = "Seguir",
     ["Force Exit"] = "Forzar salida",
     ["For Your Information"] = "Para tu informaci<63>n",
-    ["Free Account"] = "Account gratis",
+    ["Free Account"] = "Cuenta gratis",
     ["Fullscreen"] = "Pantalla completa",
     ["Game"] = "Juego",
-    ["Game framerate limit: %s"] = "Imagenes por segundo en juego: %s",
+    ["Game framerate limit: %s"] = "Limite de cuadros por segundo en el juego: %s",
     ["Graphics"] = "Gr<EFBFBD>ficos",
     ["Graphics card driver not detected"] = "Controlador de tarjeta gr<67>fica de video no detectado",
-    ["Graphics Engine:"] = "Motor Grafico:",
+    ["Graphics Engine:"] = "Motor Gr<EFBFBD>fico:",
     ["Head"] = "Cabeza",
-    ["Healing"] = "Curacion",
-    ["Health Info"] = "HP Info",
-    ["Health Information"] = "HP Informaci<63>n",
-    ["Hide monsters"] = "Ocultar monsters",
-    ["Hide non-skull players"] = "Ocultar no-skull players",
+    ["Healing"] = "Curaci<EFBFBD>n",
+    ["Health Info"] = "HP Info",--This can be better
+    ["Health Information"] = "HP Informaci<63>n",--This can be better
+    ["Hide monsters"] = "Ocultar monstruos",
+    ["Hide non-skull players"] = "Ocultar jugadores sin skull",
     ["Hide Npcs"] = "Ocultar NPCs",
     ["Hide Offline"] = "Ocultar fuera de linea",
-    ["Hide party members"] = "Ocultar miembros de party",
+    ["Hide party members"] = "Ocultar miembros del party",
     ["Hide players"] = "Ocultar players",
-    ["Hide spells for higher exp. levels"] = "Ocultar spells para niveles mas altos que tu experiencia.",
-    ["Hide spells for other vocations"] = "Ocultar spells que sean para otra vocaci<63>n",
+    ["Hide spells for higher exp. levels"] = "Ocultar hechizos para niveles mas altos que tu experiencia.",
+    ["Hide spells for other vocations"] = "Ocultar hechizos que sean para otra vocaci<63>n",
     ["Hit Points"] = "Puntos de vida",
-    ["Hold left mouse button to navigate\nScroll mouse middle button to zoom\nRight mouse button to create map marks"] = "Mantenga pulsado el bot<6F>n derecho del rat<61>n para navegar\nScroll bot<6F>n central del rat<61>n para ampliar\nbot<EFBFBD>n derecho del mouse para crear marcas del mapa",
+    ["Hold left mouse button to navigate\nScroll mouse middle button to zoom\nRight mouse button to create map marks"] = "Mantenga presionado el bot<6F>n derecho del rat<61>n para navegar\nDezplaze la rueda central del rat<61>n para ampliar\nbot<EFBFBD>n derecho del mouse para crear marcas del mapa",
     ["Hotkeys"] = "Hotkeys",
-    ["If you shut down the program, your character might stay in the game.\nClick on 'Logout' to ensure that you character leaves the game properly.\nClick on 'Exit' if you want to exit the program without logging out your character."] = "Si se cierra el programa, tu personaje puede permanecer en el juego.\nHaga clic en 'Salir' para asegurarse de que personaje deja el juego correctamente.\nClick en 'Salir' si desea salir del programa sin tener que salir de tu personaje.",
+    ["If you shut down the program, your character might stay in the game.\nClick on 'Logout' to ensure that you character leaves the game properly.\nClick on 'Exit' if you want to exit the program without logging out your character."] = "Si se cierra el programa, tu personaje puede permanecer en el juego.\nHaga clic en 'Salir' para asegurarse de que personaje deja el juego correctamente.\nHaga click en 'Salir' si desea salir del programa sin tener que salir de tu personaje.",
     ["Ignore"] = "Ignorar",
     ["Ignore capacity"] = "Ignorar Capacidad",
-    ["Ignored players:"] = "Players ignorados:",
-    ["Ignore equipped"] = "Ignorar lo equipodo",
+    ["Ignored players:"] = "Jugadores ignorados:",
+    ["Ignore equipped"] = "Ignorar lo equipado",
     ["Ignore List"] = "Ignorar lista",
-    ["Ignore players"] = "Ignorar players",
+    ["Ignore players"] = "Ignorar jugadores",
     ["Ignore Private Messages"] = "Ignorar mensajes privados",
     ["Ignore Yelling"] = "Ignorar gritos",
-    ["Interface framerate limit: %s"] = "Interface de imagenes por segundo: %s",
+    ["Interface framerate limit: %s"] = "Interface de cuadros por segundo: %s",
     ["Inventory"] = "Inventario",
-    ["Invite to Party"] = "Ivitar a party",
+    ["Invite to Party"] = "Ivitar al party",
     ["Invite to private chat"] = "Invitar a canal privado",
-    ["IP Address Banishment"] = "Banishment - Direccion IP",
+    ["IP Address Banishment"] = "Banishment - Direcci<EFBFBD>n IP",
     ["Item Offers"] = "Ofertas de objetos",
-    ["It is empty."] = "Est<EFBFBD> vasio.",
-    ["Join %s\'s Party"] = "Unir %s\'s party",
-    ["Leave Party"] = "Dejar party",
+    ["It is empty."] = "Est<EFBFBD> vaci<EFBFBD>.",
+    ["Join %s\'s Party"] = "Unirse al party de %s ",
+    ["Leave Party"] = "Dejar el party",
     ["Level"] = "Nivel",
-    ["Lifetime Premium Account"] = "Tiempo de Premium Account",
+    ["Lifetime Premium Account"] = "Tiempo de Premium Account infinito",
     ["Limits FPS to 60"] = "Limites FPS a 60",
     ["List of items that you're able to buy"] = "Lista de objetos que puedes de comprar",
     ["List of items that you're able to sell"] = "Lista de objetos que puedes de vender",
     ["Load"] = "Cargar",
-    ["Logging out..."] = "Cerrando sesion...",
+    ["Logging out..."] = "Cerrando sesi<EFBFBD>n...",
     ["Login"] = "Ingresar",
     ["Login Error"] = "Error de ingreso",
     ["Login Error"] = "Error de ingreso",
     ["Logout"] = "Salir",
     ["Look"] = "Mirar",
     ["Magic Level"] = "Nivel m<>gico",
-    ["Make sure that your client uses\nthe correct game protocol version"] = "Aseg<EFBFBD>rese de que el cliente utiliza\nes el correcto de versi<EFBFBD>n del protocolo",
+    ["Make sure that your client uses\nthe correct game protocol version"] = "Aseg<EFBFBD>rese de que el cliente este utilizando\nes el versi<73>n del protocolo adecuado",
     ["Mana"] = "Mana",
     ["Manage hotkeys:"] = "Administrador de hotkeys:",
     ["Market"] = "Mercado",
     ["Market Offers"] = "Ofertas en mercado",
-    ["Message of the day"] = "Mensaje del dia",
+    ["Message of the day"] = "Mensaje del d<EFBFBD>a",
     ["Message to "] = "Mensaje a",
     ["Message to %s"] = "Mensaje a %s",
     ["Minimap"] = "Minimapa",
-    ["Module Manager"] = "Administrador de modulos",
-    ["Module name"] = "Nombre de modulo",
-    ["Mount"] = "Montura",
+    ["Module Manager"] = "Administrador de m<EFBFBD>dulos",
+    ["Module name"] = "Nombre del modulo",
+    ["Mount"] = "Montar", --Unique name?
     ["Move Stackable Item"] = "Mover objeto apilable",
     ["Move up"] = "Mover arriba",
     ["My Offers"] = "Mis ofertas",
@@ -205,7 +207,7 @@ locale = {
     ["Name Report + Banishment"] = "Name Report + Banishment",
     ["Name Report + Banishment + Final Warning"] = "Name Report + Banishment + Final Warning",
     ["No"] = "No",
-    ["No graphics card detected, everything will be drawn using the CPU,\nthus the performance will be really bad.\nPlease update your graphics driver to have a better performance."] = "No graphics card detected, everything will be drawn using the CPU,\npor lo tanto el rendimiento va a ser muy malo.\nPor favor, actualice su controlador de gr<67>ficos para tener un mejor rendimiento.",
+    ["No graphics card detected, everything will be drawn using the CPU,\nthus the performance will be really bad.\nPlease update your graphics driver to have a better performance."] = "No se ha detectado una tarjeta gr<67>fica y todo sera procesado por tu procesador,\npor lo tanto el rendimiento va a ser muy malo.\nPor favor, actualice su controlador de gr<67>ficos para tener un rendimiento optimo.",
     ["No item selected."] = "No hay elemento seleccionado.",
     ["No Mount"] = "No montura",
     ["No Outfit"] = "No outfit",
@@ -220,30 +222,30 @@ locale = {
     ["on %s.\n"] = "en %s.\n",
     ["Open"] = "Abierto",
     ["Open a private message channel:"] = "Abrir mensaje en canal privado:",
-    ["Open charlist automatically when starting client"] = "Abrir lista de players automaticamente al iniciar el cliente",
+    ["Open charlist automatically when starting client"] = "Abrir lista de jugadores autom<EFBFBD>ticamente al iniciar el cliente",
     ["Open in new window"] = "Abrir en nueva ventana",
     ["Open new channel"] = "Abrir nuevo canal",
     ["Options"] = "Opciones",
-    ["Overview"] = "Descripcion",
+    ["Overview"] = "Descripci<EFBFBD>n",
     ["Pass Leadership to %s"] = "Pasar liderazgo a %s",
     ["Password"] = "Contrase<EFBFBD>a",
     ["Piece Price:"] = "Precio por pieza:",
-    ["Please enter a character name:"] = "Por favor ingresar nombre del player:",
+    ["Please enter a character name:"] = "Por favor ingresar nombre del jugador:",
     ["Please, press the key you wish to add onto your hotkeys manager"] = "Por favor, presiona la tecla que desees para que sea registrada en\nel administrador de hotkeys",
-    ["Please Select"] = "Por favor selecciona",
-    ["Please use this dialog to only report bugs. Do not report rule violations here!"] = "Por favor usa estos dialogos solo para reportar errores.\n<EFBFBD>No reportar violaciones al reglamento aqu<71>!",
-    ["Please wait"] = "Por favor espera",
+    ["Please Select"] = "Por favor seleccione",
+    ["Please use this dialog to only report bugs. Do not report rule violations here!"] = "Por favor usa este di<EFBFBD>logo solo para reportar errores.\n<EFBFBD>No reportar violaciones del reglamento aqu<71>!",
+    ["Please wait"] = "Por favor espere",
     ["Port"] = "Puerto",
     ["Position:"] = "Posici<EFBFBD>n:",
     ["Position: %i %i %i"] = "Posici<EFBFBD>n: %i %i %i",
-    ["Premium Account (%s) days left"] = "Premium Accoun restan dias (%s)",
+    ["Premium Account (%s) days left"] = "Tienes (%s) d<>as de Premium Account restantes",
     ["Price:"] = "Precio:",
     ["Primary"] = "Primario",
     ["Protocol"] = "Protocolo",
-    ["Quest Log"] = "Quest Log",
+    ["Quest Log"] = "Quest Log", --Unique name
     ["Randomize"] = "Combinar",
-    ["Randomize characters outfit"] = "Combinar oufit del jugador",
-    ["Reason:"] = "Reason:",
+    ["Randomize characters outfit"] = "Combinar vestimenta del jugador",
+    ["Reason:"] = "Raz<EFBFBD>n:",
     ["Refresh"] = "Refrescar",
     ["Refresh Offers"] = "Refrescar ofertas",
     ["Regeneration Time"] = "Tiempo de regeneraci<63>n",
@@ -254,13 +256,13 @@ locale = {
     ["Remove"] = "Remover",
     ["Remove %s"] = "Remover %s",
     ["Report Bug"] = "Reportar error",
-    ["Reserved for more functionality later."] = "eservado para una funcion futura.",
+    ["Reserved for more functionality later."] = "Reservado para una funci<EFBFBD>n futura.",
     ["Reset Market"] = "Reiniciar mercado",
     ["Revoke %s\'s Invitation"] = "Anular %s\'s invitaci<63>n",
     ["Rotate"] = "Rotar",
-    ["Rule Violation"] = "Violacion de regla",
-    ["Save"] = "Salvar",
-    ["Save Messages"] = "Salvar mensaje",
+    ["Rule Violation"] = "Violaci<EFBFBD>n del reglamento",
+    ["Save"] = "Guardar",
+    ["Save Messages"] = "Guardar mensaje",
     ["Search:"] = "Buscar:",
     ["Search all items"] = "Buscar todos los objetos",
     ["Secondary"] = "Secundario",
@@ -268,24 +270,24 @@ locale = {
     ["Select Outfit"] = "Seleccionar outfit",
     ["Select your language"] = "Selectionar tu lenguaje",
     ["Sell"] = "Vender",
-    ["Sell Now"] = "Vender ya",
+    ["Sell Now"] = "Vender ahora",
     ["Sell Offers"] = "Ofertas de venta",
     ["Send"] = "Enviar",
-    ["Send automatically"] = "Enviar automaticamente",
+    ["Send automatically"] = "Enviar autom<EFBFBD>ticamente",
     ["Send Message"] = "Enviar mensaje",
-    ["Server"] = "Server",
-    ["Server Log"] = "Server Log",
-    ["Set Outfit"] = "Fijar outfit",
+    ["Server"] = "Server", --Unique name
+    ["Server Log"] = "Server Log", --Unique name
+    ["Set Outfit"] = "Escoger vestimenta",
     ["Shielding"] = "Escudo",
     ["Show all items"] = "Mostrar todos los objetos",
     ["Show connection ping"] = "Mostrar ping de conexi<78>n",
     ["Show Depot Only"] = "Mostrar solo el Depot",
     ["Show event messages in console"] = "Mostrar mensajes de evento en consola",
-    ["Show frame rate"] = "Mostrar velocidad por cuadro",
+    ["Show frame rate"] = "Mostrar informaci<EFBFBD>n de cuadros por secundo",
     ["Show info messages in console"] = "Mostrar mensajes de informaci<63>n en consola",
     ["Show left panel"] = "Mostrar panel izquierdo",
     ["Show levels in console"] = "Mostrar niveles en consola",
-    ["Show Offline"] = "Mostrar offLine",
+    ["Show Offline"] = "Mostrar Desconectados",
     ["Show private messages in console"] = "Mostrar mensajes privados en consola",
     ["Show private messages on screen"] = "Mostrar mensajes privados en pantalla",
     ["Show Server Messages"] = "Mostrar mensajes del servidor",
@@ -295,26 +297,26 @@ locale = {
     ["Show your depot items only"] = "Mostrar solo tus objetos en depot",
     ["Skills"] = "Habilidades",
     ["Soul"] = "Soul",
-    ["Soul Points"] = "Puntos de Soul",
+    ["Soul Points"] = "Puntos de Soul", --I'm leaving these as is because its a unique name, if you want to change it it can be "Alma" or "Esp<73>ritu"
     ["Special"] = "Especial",
     ["Speed"] = "Velocidad",
-    ["Spell Cooldowns"] = "Spells Cooldowns",
-    ["Spell List"] = "Lista de spells",
-    ["Stamina"] = "Stamina",
+    ["Spell Cooldowns"] = "Spells Cooldowns", --Could be "Tiempo de recarga para los hechizos".
+    ["Spell List"] = "Lista de hechizos",
+    ["Stamina"] = "Resistencia",
     ["Statement:"] = "Comentario:",
-    ["Statement Report"] = "Statement Report",
-    ["Statistics"] = "Estadisticas",
+    ["Statement Report"] = "Statement Report", --Could be "reporte del comentario"
+    ["Statistics"] = "Estad<EFBFBD>sticas",
     ["Stop Attack"] = "Detener ataque",
-    ["Stop Follow"] = "Detener persecucion",
+    ["Stop Follow"] = "Detener persecuci<EFBFBD>n",
     ["Support"] = "Soporte",
     ["%s: (use object)"] = "%s: (usar objeto)",
     ["%s: (use object on target)"] = "%s: (usar objeto en un objetivo)",
     ["%s: (use object on yourself)"] = "%s: (usar objeto en mi mismo)",
-    ["%s: (use object with crosshair)"] = "%s: (usar objeto en aire)",
+    ["%s: (use object with crosshair)"] = "%s: (usar objeto con punto de mira)",
     ["Sword Fighting"] = "Combate de espada",
     ["Terminal"] = "Terminal",
     ["There is no way."] = "No hay ninguna manera.",
-    ["Title"] = "T<EFBFBD>tulo",
+    ["Title"] = "Titulo",
     ["Total Price:"] = "Total total:",
     ["Trade"] = "Intercambio",
     ["Trade with ..."] = "Intercambiar con ...",
@@ -322,51 +324,51 @@ locale = {
     ["Unable to load dat file, please place a valid dat in '%s'"] = "No se puede cargar el archivo dat, por favor coloque un dat v<>lido en '%s'",
     ["Unable to load spr file, please place a valid spr in '%s'"] = "No se puede cargar el archivo spr, por favor coloque un spr v<>lido en '%s'",
     ["Unable to logout."] = "No se puede cerrar sesi<73>n-",
-    ["Unignore"] = "Desactivar ignorado",
+    ["Unignore"] = "Dejar de ignorar",
     ["Unload"] = "No cargado",
     ["Update needed"] = "Es necesario actualizar",
     ["Use"] = "Uso",
     ["Use on target"] = "Usar en un objetivo",
     ["Use on yourself"] = "Usar en mi mismo",
     ["Use with ..."] = "Usar en ...",
-    ["Version"] = "Version",
+    ["Version"] = "Versi<EFBFBD>n",
     ["VIP List"] = "Lista Vip",
     ["Voc."] = "Voc.",
     ["Vocation"] = "Vocaci<EFBFBD>n",
     ["Waiting List"] = "Lista de espera",
-    ["Website"] = "Sitio WEB",
+    ["Website"] = "Sitio Web",
     ["Weight:"] = "Peso:",
-    ["Will detect when to use diagonal step based on the\nkeys you are pressing"] = "Detectar cuando se camina en diagonal usando las flechas",
+    ["Will detect when to use diagonal step based on the\nkeys you are pressing"] = "Detectara cuando se camina en diagonal usando las flechas",
     ["With crosshair"] = "Con punto de mira",
     ["Yes"] = "Si",
-    ["You are bleeding"] = "Tu estas sangrado",
-    ["You are burning"] = "Tu estas quemado",
+    ["You are bleeding"] = "Te estas desangrando",
+    ["You are burning"] = "Te estas quemando",
     ["You are cursed"] = "Tu estas maldecido",
     ["You are dazzled"] = "Tu estas deslumbrado",
     ["You are dead."] = "Tu estas muerto.",
     ["You are dead"] = "Tu estas muerto",
-    ["You are drowning"] = "Tu estas ahotado",
-    ["You are drunk"] = "Tu estas borracho",
-    ["You are electrified"] = "Tu estas electrificado",
-    ["You are freezing"] = "Tu estas congelado",
-    ["You are hasted"] = "Tu estas rapido",
+    ["You are drowning"] = "Te estas ahogando",
+    ["You are drunk"] = "Tu estas ebrio",
+    ["You are electrified"] = "Tu estas electrocutado",
+    ["You are freezing"] = "Te estas congelando",
+    ["You are hasted"] = "Tu estas r<EFBFBD>pido", --I dont know what is the best way to translate this so I'm leaving it as I found it.
     ["You are hungry"] = "Tu estas hambriento",
     ["You are paralysed"] = "Tu estas paralizado",
     ["You are poisoned"] = "Tu estas envenedado",
-    ["You are protected by a magic shield"] = "Tu estas protegido por un campo magico",
+    ["You are protected by a magic shield"] = "Tu estas protegido por un escudo m<EFBFBD>gico",
     ["You are strengthened"] = "Tu estas reforzado",
-    ["You are within a protection zone"] = "Tu estas dentro de una zona segura",
-    ["You can enter new text."] = "Tu puedes introducir un texto nuevo.",
-    ["You have %s percent"] = "Tu tienes %s porciento",
-    ["You have %s percent to go"] = "Tu tienes %s porciento para ir",
+    ["You are within a protection zone"] = "Tu estas dentro de una zona de protecci<63>n",
+    ["You can enter new text."] = "Tu puedes ingresar un texto nuevo.",
+    ["You have %s percent"] = "Tu tienes %s por ciento",
+    ["You have %s percent to go"] = "Tu tienes %s por ciento para ir",
     ["You may not logout during a fight"] = "No puedes salir durante una pelea",
     ["You may not logout or enter a protection zone"] = "No puedes salir o entrar en una zona de protecci<63>n",
-    ["You must enter a comment."] = "Debes introducir un comentario.",
-    ["You must enter a valid server address and port."] = "Debes introducir una direcci<63>n v<>lida de servidor y el puerto.",
+    ["You must enter a comment."] = "Debes ingresar un comentario.",
+    ["You must enter a valid server address and port."] = "Debes ingresar una direcci<63>n v<>lida de servidor y el puerto.",
     ["You must select a character to login!"] = "<EFBFBD>Debes seleccionar un personaje para ingresar!",
     ["Your Capacity:"] = "Tu capacidad:",
-    ["You read the following, written by \n%s\n"] = "Uno lee lo siguiente, escrito por \n%s\n",
-    ["You read the following, written on \n%s.\n"] = "Uno lee lo siguiente, escrito en \n%s\n",
+    ["You read the following, written by \n%s\n"] = "Lees lo siguiente, escrito por \n%s\n",
+    ["You read the following, written on \n%s.\n"] = "Lees lo siguiente, escrito en \n%s\n",
     ["Your Money:"] = "Tu dinero:",
     ["Change language"] = "Cambiar idioma",
     ["Don't stretch or shrink Game Window"] = "No estirar o encoger Ventana de Juego"

data/locales/pl.lua

@@ -63,16 +63,16 @@ locale = {
     ["Buy with backpack"] = "Kupuj z plecakami",
     ["Cancel"] = "Anuluj",
     ["Cannot login while already in game."] = "Nie mozna zalogowac gdy juz w grze",
-    ["Cap"] = false,
+    ["Cap"] = "Ladownosc",
     ["Capacity"] = "Ladownosc",
-    ["Center"] = false,
+    ["Center"] = "Wysrodkuj",
     ["Channels"] = "Kanaly",
     ["Character List"] = "Lista postaci",
     ["Classic control"] = "Klasyczne sterowaie",
-    ["Clear current message window"] = false,
-    ["Clear Messages"] = false,
+    ["Clear current message window"] = "Wyczysc bierzace okno",
+    ["Clear Messages"] = "Wyczysc wiadomosci",
     ["Clear object"] = "Wyczysc obiekt",
-    ["Client needs update."] = false,
+    ["Client needs update."] = "Klient wymaga aktalizacji",
     ["Close"] = "Zamknij",
     ["Close this channel"] = "Zamknij kanal",
     ["Club Fighting"] = "Walka obuchem",
@@ -81,7 +81,7 @@ locale = {
     ["Connecting to game server..."] = "Laczenie z serwerem gry...",
     ["Connecting to login server..."] = "Laczenie z serwerem logowania...",
     ["Console"] = "Konsola",
-    ["Cooldowns"] = false,
+    ["Cooldowns"] = "Czasy odnowienia",
     ["Copy message"] = "Kopiuj wiadomosc",
     ["Copy name"] = "Kopiuj imie",
     ["Copy Name"] = "Kopiuj Imie",
@@ -100,7 +100,7 @@ locale = {
     ["Detail"] = "Szczegoly",
     ["Details"] = "Szczegoly",
     ["Disable Shared Experience"] = "Wylacz Dzielenie Doswiadczenia",
-    ["Dismount"] = false,
+    ["Dismount"] = "Zejdz z wierzchowca",
     ["Display connection speed to the server (milliseconds)"] = "Wyswietl ping do serwera (ms)",
     ["Distance Fighting"] = "Walka na odleglosc",
     ["Don't stretch/shrink Game Window"] = "Nie rozszerzaj/zwezaj Okna Gry",
@@ -109,7 +109,7 @@ locale = {
     ["Edit Text"] = "Edytuj tekst",
     ["Enable music"] = "Odtwarzaj muzyke",
     ["Enable Shared Experience"] = "Wlacz dzielenie doswiadczenia",
-    ["Enable smart walking"] = false,
+    ["Enable smart walking"] = "Wlacz inteligentne chodzenie",
     ["Enable vertical synchronization"] = "Wlacz synchronizacje pionowa",
     ["Enable walk booster"] = false,
     ["Enter Game"] = "Wejdz do gry",
@@ -118,7 +118,7 @@ locale = {
     ["Error"] = "Blad",
     ["Excessive Unjustified Player Killing"] = "Nadmierne Nieusprawiedliwione Zabijanie Graczy",
     ["Exclude from private chat"] = "Wyrzuc w prywatnej konwersacji",
-    ["Exit"] = false,
+    ["Exit"] = "Wyjdz",
     ["Experience"] = "Doswiadczenie",
     ["Filter list to match your level"] = "Wyswietl tylko odpowiednie dla mojego poziomu",
     ["Filter list to match your vocation"] = "Wyswietl tylko odpowiednie dla mojej klasy",
@@ -127,7 +127,7 @@ locale = {
     ["Fist Fighting"] = "Walka wrecz",
     ["Follow"] = "Podazaj",
     ["Force Exit"] = "Wymus Zamkniecie",
-    ["For Your Information"] = false,
+    ["For Your Information"] = "Dla twojej informacji",
     ["Free Account"] = "Darmowe Konto",
     ["Fullscreen"] = "Pelen ekran",
     ["Game"] = "Gra",
@@ -136,9 +136,9 @@ locale = {
     ["Graphics card driver not detected"] = "Nie wykryto karty graficznej",
     ["Graphics Engine:"] = "Silnik graficzny:",
     ["Head"] = "Glowa",
-    ["Healing"] = false,
-    ["Health Info"] = false,
-    ["Health Information"] = false,
+    ["Healing"] = "Leczenie",
+    ["Health Info"] = "Info o zyciu",
+    ["Health Information"] = "Informacje o zyciu",
     ["Hide monsters"] = "Ukryj potwory",
     ["Hide non-skull players"] = "Ukryj graczy bez skulla",
     ["Hide Npcs"] = "Ukryj NPCe",
@@ -183,16 +183,16 @@ locale = {
     ["Magic Level"] = "Poziom Magiczny",
     ["Make sure that your client uses\nthe correct game protocol version"] = "Upewnij sie, ze twoj klient\nuzywa wlasciwego protokolu gry.",
     ["Mana"] = "Mana",
-    ["Manage hotkeys:"] = "Skonfiguruj hotkeye:",
+    ["Manage hotkeys:"] = "Zarzadzaj hotkeyami:",
     ["Market"] = false,
-    ["Market Offers"] = false,
+    ["Market Offers"] = "Oferty",
     ["Message of the day"] = "Wiadomosc dnia",
     ["Message to "] = "Wiadomosc do ",
     ["Message to %s"] = "Wiadomosc do %s",
     ["Minimap"] = "Minimapa",
     ["Module Manager"] = "Menedzer modulow",
     ["Module name"] = "Nazwa modulu",
-    ["Mount"] = false,
+    ["Mount"] = "Wierzchowiec",
     ["Move Stackable Item"] = "Przenies przedmiot",
     ["Move up"] = "Przenies wyzej",
     ["My Offers"] = "Moje Oferty",
@@ -221,13 +221,13 @@ locale = {
     ["Open new channel"] = "Otworz nowy kanal",
     ["Options"] = "Opcje",
     ["Overview"] = "Podsumowanie",
-    ["Pass Leadership to %s"] = "Przekaz przywodztwo %s",
+    ["Pass Leadership to %s"] = "Oddaj przywodztwo %s",
     ["Password"] = "Haslo",
-    ["Piece Price:"] = false,
+    ["Piece Price:"] = "Cena jednego przedmiotu",
     ["Please enter a character name:"] = "Podaj nazwe postaci:",
     ["Please, press the key you wish to add onto your hotkeys manager"] = "Nacisnij klawisz, ktory chcesz dodac do menedzera skrotow klawiszowych",
-    ["Please Select"] = false,
-    ["Please use this dialog to only report bugs. Do not report rule violations here!"] = false,
+    ["Please Select"] = "Prosze wybrac",
+    ["Please use this dialog to only report bugs. Do not report rule violations here!"] = "Zglaszaj tylko bledy gry, nie lamanie zasad",
     ["Please wait"] = "Prosze czekac",
     ["Port"] = "Port",
     ["Position:"] = "Pozycja:",
@@ -237,21 +237,21 @@ locale = {
     ["Primary"] = "Podstawowy",
     ["Protocol"] = "Protokol",
     ["Quest Log"] = "Dziennik Misji",
-    ["Randomize"] = false,
-    ["Randomize characters outfit"] = false,
+    ["Randomize"] = "Losuj",
+    ["Randomize characters outfit"] = "Ustaw losowy wyglad",
     ["Reason:"] = "Powod:",
     ["Refresh"] = "Odswiez",
     ["Refresh Offers"] = "Odswiez Oferty",
     ["Regeneration Time"] = "Czas Regeneracji",
     ["Reject"] = "Odrzuc",
-    ["Reload All"] = "Przeladuj Wszystko",
+    ["Reload All"] = "Zaladuj ponownie wszystko",
     ["Remember account and password when starts client"] = "Zapamietaj identyfikator konta oraz haslo",
     ["Remember password"] = "Zapamietaj haslo",
     ["Remove"] = "Usun",
     ["Remove %s"] = "Usun %s",
     ["Report Bug"] = "Zglos Blad",
     ["Reserved for more functionality later."] = "Zarezerowane dla przyszlych funkcjonalnosci.",
-    ["Reset Market"] = false,
+    ["Reset Market"] = "Zaladuj market ponownie",
     ["Revoke %s's Invitation"] = "Odmow na zaproszenie gracza %s",
     ["Rotate"] = "Obroc",
     ["Rule Violation"] = "Zlamanie Regul",
@@ -275,7 +275,7 @@ locale = {
     ["Shielding"] = "Obrona tarcza",
     ["Show all items"] = "Pokaz wszystkie przedmioty",
     ["Show connection ping"] = "Wyswietl ping",
-    ["Show Depot Only"] = false,
+    ["Show Depot Only"] = "Pokaz tylko przedmioty z depozytu",
     ["Show event messages in console"] = "Pokaz wydarzenia w konsoli",
     ["Show frame rate"] = "Pokaz FPS",
     ["Show info messages in console"] = "Pokaz informacje w konsoli",
@@ -288,17 +288,17 @@ locale = {
     ["Show status messages in console"] = "Pokaz status w konsoli",
     ["Show Text"] = "Pokaz Tekst",
     ["Show timestamps in console"] = "Pokaz znaczniki czasu w konsoli",
-    ["Show your depot items only"] = false,
+    ["Show your depot items only"] = "Pokaz tylko przedmioty z depozytu",
     ["Skills"] = "Umiejetnosci",
     ["Soul"] = "Dusze",
-    ["Soul Points"] = "Punkty Duszy",
-    ["Special"] = false,
+    ["Soul Points"] = "Punktey Duszy",
+    ["Special"] = "Specialne",
     ["Speed"] = "Predkosc",
-    ["Spell Cooldowns"] = false,
+    ["Spell Cooldowns"] = "Czas odnowienia czaru",
     ["Spell List"] = "Lista Zaklec",
     ["Stamina"] = "Wytrzymalosc",
-    ["Statement:"] = false,
-    ["Statement Report"] = false,
+    ["Statement:"] = "Wyrazenie",
+    ["Statement Report"] = "Reportuj wyrazenie",
     ["Statistics"] = "Statystki",
     ["Stop Attack"] = "Anuluj atak",
     ["Stop Follow"] = "Przestan podazac",
@@ -311,7 +311,7 @@ locale = {
     ["Terminal"] = "Terminal",
     ["There is no way."] = "Nie ma drogi.",
     ["Title"] = "Tytul",
-    ["Total Price"] = "Cena sumaryczna",
+    ["Total Price"] = "Cena calosci",
     ["Trade"] = "Handel",
     ["Trade with ..."] = "Handluj z ...",
     ["Trying to reconnect in %s seconds."] = "Ponowna proba laczenia za %s sekund.",
@@ -320,15 +320,15 @@ locale = {
     ["Unable to logout."] = "Nie mozna sie wylogowac.",
     ["Unignore"] = "Anuluj Ignorowanie",
     ["Unload"] = "Wylacz",
-    ["Update needed"] = false,
+    ["Update needed"] = "Wymagana aktualizacja",
     ["Use"] = "Uzyj",
     ["Use on target"] = "Uzyj na celu",
     ["Use on yourself"] = "Uzyj na sobie",
     ["Use with ..."] = "Uzyj z ...",
     ["Version"] = "Wersja",
     ["VIP List"] = "Lista VIP",
-    ["Voc."] = false,
-    ["Vocation"] = "Klasa",
+    ["Voc."] = "Profesja",
+    ["Vocation"] = "Profesja",
     ["Waiting List"] = "Lista Oczekujacych",
     ["Website"] = "Strona:",
     ["Weight:"] = "Waga:",
@@ -339,14 +339,14 @@ locale = {
     ["You are burning"] = "Palisz sie",
     ["You are cursed"] = "Jestes przeklety",
     ["You are dazzled"] = "Jestes oslepiony",
-    ["You are dead."] = "Zginales marnie.",
+    ["You are dead."] = "Jestes martwy.",
     ["You are dead"] = "Jestes martwy",
     ["You are drowning"] = "Topisz sie",
-    ["You are drunk"] = "Caly swiat wiruje",
+    ["You are drunk"] = "Jestes pijany",
     ["You are electrified"] = "Jestes porazony pradem",
-    ["You are freezing"] = "Marzniesz",
-    ["You are hasted"] = "Zapieprzasz",
-    ["You are hungry"] = "Burczy ci w brzuchu",
+    ["You are freezing"] = "Zamarzasz",
+    ["You are hasted"] = "Masz zwiekszona predkosc ruchu",
+    ["You are hungry"] = "Jestes glodny",
     ["You are paralysed"] = "Jestes sparalizowany",
     ["You are poisoned"] = "Jestes zatruty",
     ["You are protected by a magic shield"] = "Jestes chroniony magiczna tarcza",
@@ -363,52 +363,52 @@ locale = {
     ["Your Capacity:"] = "Twoja Ladownosc:",
     ["You read the following, written by \n%s\n"] = false,
     ["You read the following, written on \n%s.\n"] = false,
-    ["Your Money:"] = false,
-    ["Enable dash walking"] = false,
+    ["Your Money:"] = "Twoje pieniadze",
+    ["Enable dash walking"] = "Wlacz szybsze chodzenie (dash walking)",
     ["Will boost your walk on high speed characters"] = "Przyspieszy poruszanie sie postaci o wysokiej predkosci",
     ["Display creature names"] = "Wyswietlaj nazwy potworow",
     ["Display creature health bars"] = "Wyswietlaj paski zycia potworow",
     ["Display text messages"] = "Wyswietlaj wiadomosci tekstowe",
     ["Change language"] = "Zmien jezyk",
-    ["Enable lights"] = "Odblokuj oswietlenie",
-    ["Enable audio"] = "Odblokuj dzwiek",
-    ["Enable music sound"] = "Odblokuj muzyke",
+    ["Enable lights"] = "Wlacz oswietlenie",
+    ["Enable audio"] = "Wlacz dzwiek",
+    ["Enable music sound"] = "Wlacz muzyke",
     ["Music volume: %d"] = "Glosnosc muzyki: %d",
-		["Audio"] = "Dzwiek",
-		["Server List"] = "Lista serwerow",
-		["Server list"] = "Lista serwerow",
-		["Client Version"] = "Wersja klienta",
-		["Add new server"] = "Dodaj nowy serwer",
-		["Select"] = "Wybierz",
-		["New Server"] = "Nowy serwer",
-		["Host"] = false,
-		["Reset All"] = "Ustaw domyslne",
-		["Disable chat mode, allow to walk using ASDW"] = "Zablokuj tryb rozmow, zezwol na poruszanie sie za pomoca klawiszy ADSW",
-		["Name"] = "Imie",
-		["Price"] = "Cena",
-		["Your Money"] = "Twoje fundusze",
-		["Weight"] = "Waga",
-		["Your Capacity"] = "Twoj udzwig",
-		["Search"] = "Szukaj",
-		["Sell All"] = "Sprzedaj wszystko",
-		["Statement"] = false,
-		["Reason"] = "Powod",
-		["Action"] = "Akcja",
-		["Comment"] = "Komentarz",
-		["Balance"] = false,
-		["Offer Type"] = "Typ oferty",
-		["Piece Price"] = false,
-		["Find"] = "Szukaj",
-		["Formula"] = "Formula",
-		["Group"] = "Groupa",
-		["Type"] = "Typ",
-		["Cooldown"] = false,
-		["Premium"] = false,
-		["Any"] = "Dowolny",
-		["Sorcerer"] = "Czarodziej",
-		["Druid"] = false,
-		["Paladin"] = "Paladyn",
-		["Knight"] = "Rycerz"
+    ["Audio"] = "Dzwiek",
+    ["Server List"] = "Lista serwerow",
+    ["Server list"] = "Lista serwerow",
+    ["Client Version"] = "Wersja klienta",
+    ["Add new server"] = "Dodaj nowy serwer",
+    ["Select"] = "Wybierz",
+    ["New Server"] = "Nowy serwer",
+    ["Host"] = false,
+    ["Reset All"] = "Ustaw domyslne",
+    ["Disable chat mode, allow to walk using ASDW"] = "Zablokuj tryb rozmow, zezwol na poruszanie sie za pomoca klawiszy ADSW",
+    ["Name"] = "Imie",
+    ["Price"] = "Cena",
+    ["Your Money"] = "Twoje fundusze",
+    ["Weight"] = "Waga",
+    ["Your Capacity"] = "Twoj udzwig",
+    ["Search"] = "Szukaj",
+    ["Sell All"] = "Sprzedaj wszystko",
+    ["Statement"] = "Stanowisko",
+    ["Reason"] = "Powod",
+    ["Action"] = "Akcja",
+    ["Comment"] = "Komentarz",
+    ["Balance"] = "Stan konta",
+    ["Offer Type"] = "Typ oferty",
+    ["Piece Price"] = "Cena jednego",
+    ["Find"] = "Szukaj",
+    ["Formula"] = "Formula",
+    ["Group"] = "Groupa",
+    ["Type"] = "Typ",
+    ["Cooldown"] = "Czas odnowienia",
+    ["Premium"] = false,
+    ["Any"] = "Dowolny",
+    ["Sorcerer"] = "Czarodziej",
+    ["Druid"] = false,
+    ["Paladin"] = "Paladyn",
+    ["Knight"] = "Rycerz"
   }
 }
 

data/styles/10-buttons.otui

@@ -1,44 +1,45 @@
 Button < UIButton
   font: verdana-11px-antialised
-  color: #f0ad4dff
-  size: 106 22
+  color: #dfdfdfff
+  size: 106 23
   text-offset: 0 0
-  image-source: /images/ui/button_rounded
-  image-color: white
-  image-clip: 0 0 20 20
+  image-source: /images/ui/button
+  image-color: #dfdfdf
+  image-clip: 0 0 22 23
   image-border: 3
   padding: 5 10 5 10
 
   $hover !disabled:
-    image-clip: 0 20 20 20
+    image-clip: 0 23 22 23
 
   $pressed:
-    image-clip: 0 40 20 20
+    image-clip: 0 46 22 23
     text-offset: 1 1
 
   $disabled:
-    color: #f0ad4d88
+    color: #dfdfdf88
+    opacity: 0.8
 
 TabButton < UIButton
-  size: 20 20
+  size: 22 23
   image-source: /images/ui/tabbutton_rounded
-  image-color: white
-  image-clip: 0 0 20 20
+  image-color: #dfdfdf
+  image-clip: 0 0 22 23
   image-border: 3
-  icon-color: white
-  color: #aaaaaa
+  icon-color: #dfdfdf
+  color: #dfdfdf
 
   $hover !on:
-    image-clip: 0 20 20 20
-    color: white
+    image-clip: 0 23 22 23
+    color: #dfdfdf
 
   $disabled:
-    image-color: #ffffff66
-    icon-color: #888888
+    image-color: #dfdfdf66
+    icon-color: #dfdfdf
 
   $on:
-    image-clip: 0 40 20 20
-    color: #80c7f8
+    image-clip: 0 46 22 23
+    color: #dfdfdf
 
 NextButton < UIButton
   size: 12 21
@@ -52,7 +53,7 @@ NextButton < UIButton
     image-clip: 12 21 12 21
 
   $disabled:
-    image-color: #ffffff55
+    image-color: #dfdfdf55
 
 PreviousButton < UIButton
   size: 12 21
@@ -66,18 +67,18 @@ PreviousButton < UIButton
     image-clip: 0 21 12 21
 
   $disabled:
-    image-color: #ffffff55
+    image-color: #dfdfdf55
 
 AddButton < UIButton
   size: 20 20
   image-source: /images/ui/icon_add
-  image-color: #ffffffff
+  image-color: #dfdfdfff
 
   $hover !disabled:
-    image-color: #ffffff99
+    image-color: #dfdfdf99
 
   $pressed:
-    image-color: #ffffff44
+    image-color: #dfdfdf44
 
   $disabled:
-    image-color: #ffffff55
+    image-color: #dfdfdf55

data/styles/10-checkboxes.otui

@@ -1,36 +1,35 @@
 CheckBox < UICheckBox
   size: 16 16
   text-align: left
-  text: aa
-  text-offset: 16 0
-  color: #aaaaaa
-  image-color: #ffffffff
-  image-rect: 0 0 12 12
-  image-offset: 0 2
+  text-offset: 18 1
+  color: #dfdfdf
+  image-color: #dfdfdfff
+  image-rect: 0 0 15 15
   image-source: /images/ui/checkbox
 
   $hover !disabled:
-    color: #cccccc
+    color: #ffffff
 
   $!checked:
-    image-clip: 0 0 12 12
+    image-clip: 0 0 15 15
 
   $hover !checked:
-    image-clip: 0 12 12 12
+    image-clip: 0 15 15 15
 
   $checked:
-    image-clip: 0 24 12 12
+    image-clip: 0 30 15 15
 
   $hover checked:
-    image-clip: 0 36 12 12
+    image-clip: 0 45 15 15
 
   $disabled:
-    image-color: #ffffff88
-    color: #aaaaaa88
+    image-color: #dfdfdf88
+    color: #dfdfdf88
+    opacity: 0.8
 
 ColorBox < UICheckBox
   size: 16 16
-  image-color: #ffffffff
+  image-color: #dfdfdfff
   image-source: /images/ui/colorbox
 
   $checked:
@@ -41,26 +40,25 @@ ColorBox < UICheckBox
 
 ButtonBox < UICheckBox
   font: verdana-11px-antialised
-  color: #ffffffff
-  size: 106 22
+  color: #dfdfdfff
+  size: 106 23
   text-offset: 0 0
   text-align: center
-  image-source: /images/ui/tabbutton_rounded
-  image-color: white
-  image-clip: 0 0 20 20
+  image-source: /images/ui/button
+  image-color: #dfdfdf
+  image-clip: 0 0 22 23
   image-border: 3
 
   $hover !disabled:
-    image-clip: 0 20 20 20
+    image-clip: 0 23 22 23
 
   $checked:
-    image-clip: 0 40 20 20
-    color: #80c7f8
+    image-clip: 0 46 22 23
+    color: #dfdfdf
 
   $disabled:
-    color: #666666ff
-    image-color: #ffffff88
+    color: #dfdfdf88
+    image-color: #dfdfdf88
 
 ButtonBoxRounded < ButtonBox
-  image-source: /images/ui/tabbutton_rounded
-  image-border: 2
+  image-source: /images/ui/button_rounded

data/styles/10-comboboxes.otui

@@ -1,62 +1,106 @@
-ComboBoxPopupMenuButton < UIButton
-  height: 20
+ComboBoxPopupScrollMenuButton < UIButton
+  height: 23
   font: verdana-11px-antialised
   text-align: left
   text-offset: 4 0
-  color: #aaaaaa
+  color: #dfdfdf
   background-color: alpha
+  margin: 1
 
   $hover !disabled:
-    color: #ffffff
-    background-color: #ffffff44
+    color: #dfdfdf
+    background-color: #355d89
 
   $disabled:
-    color: #555555
+    color: #dfdfdf88
+
+ComboBoxPopupScrollMenu < UIPopupScrollMenu
+  image-source: /images/ui/combobox_square
+  image-clip: 0 69 91 23
+  image-border: 1
+
+ComboBoxPopupMenuButton < UIButton
+  height: 23
+  font: verdana-11px-antialised
+  text-align: left
+  text-offset: 4 0
+  color: #dfdfdf
+  background-color: alpha
+  margin: 1
+
+  $hover !disabled:
+    color: #dfdfdf
+    background-color: #355d89
+
+  $disabled:
+    color: #dfdfdf88
 
 ComboBoxPopupMenu < UIPopupMenu
   image-source: /images/ui/combobox_square
-  image-clip: 0 60 89 20
-  image-border-left: 1
-  image-border-right: 1
+  image-clip: 0 69 91 23
+  image-border: 1
 
 ComboBox < UIComboBox
   font: verdana-11px-antialised
-  color: #aaaaaa
-  size: 89 20
+  color: #dfdfdf
+  size: 91 23
   text-offset: 3 0
   text-align: left
   image-source: /images/ui/combobox_square
-  image-border: 1
-  image-border-right: 17
-  image-clip: 0 0 89 20
+  image-border: 3
+  image-border-right: 19
+  image-clip: 0 0 91 23
 
   $hover !disabled:
-    image-clip: 0 20 89 20
+    image-clip: 0 23 91 23
 
   $on:
-    image-clip: 0 40 89 20
+    image-clip: 0 46 91 23
 
-ComboBoxRoundedPopupMenuButton < UIButton
-  height: 20
+  $disabled:
+    color: #dfdfdf88
+    opacity: 0.8
+
+ComboBoxRoundedPopupScrollMenuButton < UIButton
+  height: 23
   font: verdana-11px-antialised
   text-align: left
   text-offset: 4 0
-  color: #aaaaaa
+  color: #dfdfdf
   background-color: alpha
 
   $hover !disabled:
     color: #ffffff
-    background-color: #ffffff44
+    background-color: #355d89
 
   $disabled:
-    color: #555555
+    color: #dfdfdf88
+
+ComboBoxRoundedPopupScrollMenu < UIPopupScrollMenu
+  image-source: /images/ui/combobox_rounded
+  image-clip: 0 69 91 23
+  image-border: 3
+
+ComboBoxRoundedPopupMenuButton < UIButton
+  height: 23
+  font: verdana-11px-antialised
+  text-align: left
+  text-offset: 4 0
+  color: #dfdfdf
+  background-color: alpha
+
+  $hover !disabled:
+    color: #ffffff
+    background-color: #355d89
+
+  $disabled:
+    color: #dfdfdf88
 
 ComboBoxRoundedPopupMenu < UIPopupMenu
   image-source: /images/ui/combobox_rounded
-  image-clip: 0 60 89 20
-  image-border-left: 1
-  image-border-right: 1
+  image-clip: 0 69 91 23
+  image-border: 3
 
 ComboBoxRounded < ComboBox
   image-source: /images/ui/combobox_rounded
-  image-border: 2
+  image-border: 3

data/styles/10-labels.otui

@@ -1,23 +1,23 @@
 Label < UILabel
   font: verdana-11px-antialised
-  color: #bbbbbb
+  color: #dfdfdf
 
   $disabled:
-    color: #bbbbbb88
+    color: #dfdfdf88
 
 FlatLabel < UILabel
   font: verdana-11px-antialised
-  color: #aaaaaa
+  color: #dfdfdf
   size: 86 20
   text-offset: 3 3
   image-source: /images/ui/panel_flat
   image-border: 1
 
   $disabled:
-    color: #aaaaaa88
+    color: #dfdfdf88
 
 MenuLabel < Label
 
 GameLabel < UILabel
   font: verdana-11px-antialised
-  color: #bbbbbb
+  color: #dfdfdf

data/styles/10-listboxes.otui

@@ -1,19 +1,19 @@
 TextList < UIScrollArea
   layout: verticalBox
   border-width: 1
-  border-color: #1d222b
-  background-color: #222833
+  border-color: #272727
+  background-color: #636363
   padding: 1
   auto-focus: none
 
 HorizontalList < UIScrollArea
   layout: horizontalBox
   border-width: 1
-  border-color: #1d222b
-  background-color: #222833
+  border-color: #272727
+  background-color: #636363
 
 VerticalList < UIScrollArea
   layout: verticalBox
   border-width: 1
-  border-color: #1d222b
-  background-color: #222833
+  border-color: #272727
+  background-color: #636363

data/styles/10-scrollbars.otui

@@ -10,7 +10,6 @@ ScrollBarSlider < UIButton
     image-clip: 13 26 13 13
   $pressed:
     image-clip: 26 26 13 13
-    image-color: #ffffff99
   $disabled:
     image-color: #ffffff66
 

data/styles/10-separators.otui

@@ -1,13 +1,13 @@
 HorizontalSeparator < UIWidget
   image-source: /images/ui/separator_horizontal
-  image-border-top: 2
+  image-border: 1
   height: 2
   phantom: true
   focusable: false
 
 VerticalSeparator < UIWidget
   image-source: /images/ui/separator_vertical
-  image-border-left: 2
+  image-border: 1
   width: 2
   phantom: true
   focusable: false

data/styles/10-textedits.otui

@@ -1,15 +1,17 @@
 TextEdit < UITextEdit
   font: verdana-11px-antialised
-  color: #aaaaaa
-  size: 86 20
-  text-offset: 0 3
-  padding: 3
+  color: #272727
+  size: 86 22
+  text-offset: 0 4
+  opacity: 1
+  padding: 4
   image-source: /images/ui/textedit
   image-border: 1
-  selection-color: #111416
-  selection-background-color: #999999
+  selection-color: #272727
+  selection-background-color: #cccccc
   $disabled:
-    color: #aaaaaa88
+    color: #27272788
+    opacity: 0.5
 
 PasswordTextEdit < TextEdit
   text-hidden: true

data/styles/10-windows.otui

@@ -2,20 +2,19 @@ Window < UIWindow
   font: verdana-11px-antialised
   size: 200 200
   opacity: 1
-  color: white
-  text-offset: 0 4
+  color: #dfdfdf
+  text-offset: 0 6
   text-align: top
   image-source: /images/ui/window
-  image-border: 5
-  image-border-top: 22
-  opacity: 1
-  padding-top: 30
+  image-border: 6
+  image-border-top: 27
+  padding-top: 36
   padding-left: 16
   padding-right: 16
   padding-bottom: 16
 
   $disabled:
-    color: #aaaaaa88
+    color: #dfdfdf88
 
   $dragging:
     opacity: 0.8

data/styles/20-popupmenus.otui

@@ -39,3 +39,45 @@ PopupMenu < UIPopupMenu
   image-source: /images/ui/menubox
   image-border: 3
   padding: 3
+
+PopupScrollMenuButton < UIButton
+  height: 18
+  size: 0 21
+  text-offset: 4 0
+  text-align: left
+  font: verdana-11px-antialised
+
+  color: #aaaaaa
+  background-color: alpha
+
+  $hover !disabled:
+    color: #ffffff
+    background-color: #ffffff44
+    image-clip: 0 40 20 20
+
+  $disabled:
+    color: #555555
+
+PopupScrollMenuShortcutLabel < Label
+  font: verdana-11px-antialised
+  text-align: right
+  anchors.fill: parent
+  margin-right: 2
+  margin-left: 5
+
+PopupScrollMenuSeparator < UIWidget
+  margin-left: 2
+  margin-right: 2
+  margin-bottom: 1
+  image-source: /images/ui/menubox
+  image-border-left: 1
+  image-border-right: 1
+  image-clip: 0 0 32 2
+  height: 2
+  phantom: true
+
+PopupScrollMenu < UIPopupScrollMenu
+  width: 50
+  image-source: /images/ui/menubox
+  image-border: 3
+  padding: 3

data/styles/20-spinboxes.otui

@@ -1,13 +1,13 @@
 SpinBox < TextEdit
   __class: UISpinBox
   text-align: left
-  size: 86 20
+  size: 86 22
   padding: 0
   padding-left: 2
 
   Button
     id: up
-    size: 10 10
+    size: 11 11
     image-source: /images/ui/spinbox_up
     image-border: 1
     image-clip: 0 0 10 10
@@ -21,7 +21,7 @@ SpinBox < TextEdit
 
   Button
     id: down
-    size: 10 10
+    size: 11 11
     image-source: /images/ui/spinbox_down
     image-border: 1
     image-clip: 0 0 10 10

data/styles/20-tabbars.otui

@@ -1,47 +1,49 @@
 MoveableTabBar < UIMoveableTabBar
-  size: 80 20
+  size: 80 21
 MoveableTabBarPanel < Panel
 MoveableTabBarButton < UIButton
-  size: 20 20
+  size: 20 21
   image-source: /images/ui/tabbutton_square
-  image-color: white
-  image-clip: 0 0 20 20
+  image-color: #dfdfdf
+  image-clip: 0 0 20 21
   image-border: 3
-  icon-color: white
-  color: #aaaaaa
+  image-border-bottom: 0
+  icon-color: #dfdfdf
+  color: #dfdfdf
   anchors.top: parent.top
   anchors.left: parent.left
   padding: 5
 
   $hover !checked:
-    image-clip: 0 20 20 20
-    color: white
+    image-clip: 0 21 20 21
+    color: #dfdfdf
 
   $disabled:
-    image-color: #ffffff66
-    icon-color: #888888
+    image-color: #dfdfdf88
+    icon-color: #dfdfdf
 
   $checked:
-    image-clip: 0 40 20 20
-    color: #D8E7F0
+    image-clip: 0 42 20 21
+    color: #dfdfdf
 
   $on !checked:
-    color: #F55E5E
+    color: #dfdfdf
 
 TabBar < UITabBar
-  size: 80 20
+  size: 80 21
   Panel
     id: buttonsPanel
     anchors.fill: parent
 TabBarPanel < Panel
 TabBarButton < UIButton
-  size: 20 20
+  size: 22 23
   image-source: /images/ui/tabbutton_square
-  image-color: white
-  image-clip: 0 0 20 20
+  image-color: #dfdfdf
+  image-clip: 0 0 22 23
   image-border: 3
-  icon-color: white
-  color: #aaaaaa
+  image-border-bottom: 0
+  icon-color: #dfdfdf
+  color: #dfdfdf
   anchors.top: parent.top
   padding: 5
 
@@ -53,19 +55,19 @@ TabBarButton < UIButton
     margin-left: 5
 
   $hover !checked:
-    image-clip: 0 20 20 20
-    color: white
+    image-clip: 0 23 22 23
+    color: #dfdfdf
 
   $disabled:
-    image-color: #ffffff66
-    icon-color: #888888
+    image-color: #dfdfdf88
+    icon-color: #dfdfdf
 
   $checked:
-    image-clip: 0 40 20 20
-    color: #80c7f8
+    image-clip: 0 46 22 23
+    color: #dfdfdf
 
   $on !checked:
-    color: #F55E5E
+    color: #dfdfdf
 
 TabBarRounded < TabBar
 TabBarRoundedPanel < TabBarPanel
@@ -107,7 +109,7 @@ TabBarVerticalButton < UIButton
     margin-top: 10
   $hover !checked:
     color: white
-    icon-color: #cccccc
+    icon-color: #dfdfdf
   $disabled:
     icon-color: #333333
   $checked:

init.lua

@@ -27,8 +27,8 @@ g_resources.setupUserWriteDir(g_app.getCompactName())
 -- search all packages
 g_resources.searchAndAddPackages('/', '.otpkg', true)
 
--- load configurations
-g_configs.load("/config.otml")
+-- load settings
+g_configs.loadSettings("/config.otml")
 
 g_modules.discoverModules()
 
@@ -48,7 +48,7 @@ g_modules.ensureModuleLoaded("game_interface")
 -- mods 1000-9999
 g_modules.autoLoadModules(9999)
 
-local script = '/' .. g_app.getCompactName() .. 'rc'
+local script = '/' .. g_app.getCompactName() .. 'rc.lua'
 
 if g_resources.fileExists(script) then
   dofile(script)

modules/client/client.lua

@@ -14,7 +14,7 @@ function reloadScripts()
   g_textures.clearCache()
   g_modules.reloadModules()
 
-  local script = '/' .. g_app.getCompactName() .. 'rc'
+  local script = '/' .. g_app.getCompactName() .. 'rc.lua'
   if g_resources.fileExists(script) then
     dofile(script)
   end
@@ -91,9 +91,9 @@ function init()
   g_keyboard.bindKeyDown('Ctrl+Shift+R', reloadScripts)
 
   -- generate machine uuid, this is a security measure for storing passwords
-  if not g_crypt.setMachineUUID(g_configs.get('uuid')) then
-    g_configs.set('uuid', g_crypt.getMachineUUID())
-    g_configs.save()
+  if not g_crypt.setMachineUUID(g_settings.get('uuid')) then
+    g_settings.set('uuid', g_crypt.getMachineUUID())
+    g_settings.save()
   end
 end
 

modules/client_entergame/entergame.lua

@@ -35,7 +35,7 @@ end
 
 local function onCharacterList(protocol, characters, account, otui)
   -- Try add server to the server list
-  ServerList.add(G.host, G.port, g_game.getProtocolVersion())
+  ServerList.add(G.host, G.port, g_game.getClientVersion())
 
   if enterGame:getChildById('rememberPasswordBox'):isChecked() then
     local account = g_crypt.encrypt(G.account)
@@ -82,7 +82,7 @@ local function onUpdateNeeded(protocol, signature)
     local cancelFunc = EnterGame.show
     EnterGame.updateFunc(signature, continueFunc, cancelFunc)
   else
-    local errorBox = displayErrorBox(tr('Update needed'), tr('Your client needs update, try redownloading it.'))
+    local errorBox = displayErrorBox(tr('Update needed'), tr('Your client needs updating, try redownloading it.'))
     connect(errorBox, { onOk = EnterGame.show })
   end
 end
@@ -242,7 +242,7 @@ function EnterGame.doLogin()
 
   g_game.chooseRsa(G.host)
   g_game.setClientVersion(clientVersion)
-  g_game.setProtocolVersion(g_game.getProtocolVersionForClient(clientVersion))
+  g_game.setProtocolVersion(g_game.getClientProtocolVersion(clientVersion))
 
   if modules.game_things.isLoaded() then
     protocolLogin:login(G.host, G.port, G.account, G.password)

modules/client_entergame/entergame.otui

@@ -92,6 +92,9 @@ EnterGameWindow
     margin-top: 2
     margin-right: 3
     width: 90
+    menu-scroll: true
+    menu-height: 125
+    menu-scroll-step: 25
 
   MenuLabel
     id: portLabel

modules/client_modulemanager/modulemanager.lua

@@ -14,7 +14,8 @@ function init()
   g_keyboard.bindKeyPress('Up', function() moduleList:focusPreviousChild(KeyboardFocusReason) end, moduleManagerWindow)
   g_keyboard.bindKeyPress('Down', function() moduleList:focusNextChild(KeyboardFocusReason) end, moduleManagerWindow)
 
-  moduleManagerButton = modules.client_topmenu.addLeftButton('moduleManagerButton', tr('Module Manager'), '/images/topbuttons/modulemanager', toggle)
+  moduleManagerButton = modules.client_topmenu.addLeftButton('moduleManagerButton', 
+    tr('Module Manager'), '/images/topbuttons/modulemanager', toggle)
 
   -- refresh modules only after all modules are loaded
   addEvent(listModules)

modules/client_serverlist/addserver.otui

@@ -1,7 +1,7 @@
 MainWindow
   id: addServerWindow
   !text: tr('New Server')
-  size: 180 180
+  size: 180 195
   visible: false
   @onEscape: AddServer.hide()
   @onEnter: AddServer.add()
@@ -48,6 +48,9 @@ MainWindow
     anchors.top: protocolLabel.bottom
     anchors.left: protocolLabel.left
     anchors.right: port.right
+    menu-scroll: true
+    menu-height: 125
+    menu-scroll-step: 25
     @onSetup: |
       for _, proto in pairs(g_game.getSupportedClients()) do
         self:addOption(proto)

modules/client_stats/stats.lua

@@ -79,6 +79,10 @@ function onConnect(protocol)
   post = post .. '&window_height='     .. g_window.getHeight()
   post = post .. '&player_name='       .. g_game.getCharacterName()
   post = post .. '&world_name='        .. g_game.getWorldName()
+  post = post .. '&otserv_host='       .. G.host
+  post = post .. '&otserv_port='       .. G.port
+  post = post .. '&otserv_protocol='   .. g_game.getProtocolVersion()
+  post = post .. '&otserv_client='     .. g_game.getClientVersion()
   post = post .. '&build_version='     .. g_app.getVersion()
   post = post .. '&build_revision='    .. g_app.getBuildRevision()
   post = post .. '&build_commit='      .. g_app.getBuildCommit()

modules/client_terminal/terminal.lua

@@ -202,9 +202,9 @@ function popWindow()
   else
     terminalWindow:breakAnchors()
     terminalWindow:setOn(true)
-    local size = oldSize or { width = g_window.getWidth()/2, height = g_window.getHeight()/2 }
+    local size = oldSize or { width = g_window.getWidth()/2.5, height = g_window.getHeight()/4 }
     terminalWindow:setSize(size)
-    local pos = oldPos or { x = (g_window.getWidth() - terminalWindow:getWidth())/2, y = (g_window.getHeight() - terminalWindow:getHeight())/2 }
+    local pos = oldPos or { x = 0, y = g_window.getHeight() }
     terminalWindow:setPosition(pos)
     terminalWindow:getChildById('bottomResizeBorder'):enable()
     terminalWindow:getChildById('rightResizeBorder'):enable()
@@ -221,10 +221,10 @@ function toggle()
   if terminalWindow:isVisible() then
     hide()
   else
-    if not firstShow then
+    if not firstShown then
       local settings = g_settings.getNode('terminal-window')
       if settings then
-        if settings.size then  oldSize = size end
+        if settings.size then oldSize = settings.size end
         if settings.pos then oldPos = settings.pos end
         if settings.poped then popWindow() end
       end

modules/client_topmenu/topmenu.lua

@@ -27,7 +27,7 @@ local function addButton(id, description, icon, callback, panel, toggle, front)
   button:setTooltip(description)
   button:setIcon(resolvepath(icon, 3))
   button.onMouseRelease = function(widget, mousePos, mouseButton)
-    if widget:containsPoint(mousePos) and mouseButton ~= MouseMiddleButton then
+    if widget:containsPoint(mousePos) and mouseButton ~= MouseMidButton then
       callback()
       return true
     end

modules/corelib/config.lua

@@ -0,0 +1,73 @@
+-- @docclass
+
+local function convertSettingValue(value)
+  if type(value) == 'table' then
+    if value.x and value.width then
+      return recttostring(value)
+    elseif value.x then
+      return pointtostring(value)
+    elseif value.width then
+      return sizetostring(value)
+    elseif value.r then
+      return colortostring(value)
+    else
+      return value
+    end
+  elseif value == nil then
+    return ''
+  else
+    return tostring(value)
+  end
+end
+
+function Config:set(key, value)
+  self:setValue(key, convertSettingValue(value))
+end
+
+function Config:setDefault(key, value)
+  if self:exists(key) then return false end
+  self:set(key, value)
+  return true
+end
+
+function Config:get(key, default)
+  if not self:exists(key) and default ~= nil then
+    self:set(key, default)
+  end
+  return self:getValue(key)
+end
+
+function Config:getString(key, default)
+  return self:get(key, default)
+end
+
+function Config:getInteger(key, default)
+  local v = tonumber(self:get(key, default)) or 0
+  return v
+end
+
+function Config:getNumber(key, default)
+  local v = tonumber(self:get(key, default)) or 0
+  return v
+end
+
+function Config:getBoolean(key, default)
+  return toboolean(self:get(key, default))
+end
+
+function Config:getPoint(key, default)
+  return topoint(self:get(key, default))
+end
+
+function Config:getRect(key, default)
+  return torect(self:get(key, default))
+end
+
+function Config:getSize(key, default)
+  return tosize(self:get(key, default))
+end
+
+function Config:getColor(key, default)
+  return tocolor(self:get(key, default))
+end
+

modules/corelib/corelib.otmod

@@ -14,11 +14,13 @@ Module
     dofile 'const'
     dofile 'util'
     dofile 'globals'
+    dofile 'config'
     dofile 'settings'
     dofile 'keyboard'
     dofile 'mouse'
     dofile 'net'
 
+    dofiles 'classes'
     dofiles 'ui'
 
     dofile 'inputmessage'

modules/corelib/settings.lua

@@ -1,86 +1,3 @@
--- @docclass
-g_settings = {}
+g_settings = makesingleton(g_configs.getSettings())
 
-g_settings.exists = g_configs.exists
-g_settings.setNode = g_configs.setNode
-g_settings.mergeNode = g_configs.mergeNode
-g_settings.getNode = g_configs.getNode
-g_settings.remove = g_configs.remove
-g_settings.setList = g_configs.setList
-g_settings.getList = g_configs.getList
-g_settings.save = g_configs.save
-
-local function convertSettingValue(value)
-  if type(value) == 'table' then
-    if value.x and value.width then
-      return recttostring(value)
-    elseif value.x then
-      return pointtostring(value)
-    elseif value.width then
-      return sizetostring(value)
-    elseif value.r then
-      return colortostring(value)
-    else
-      return value
-    end
-  elseif value == nil then
-    return ''
-  else
-    return tostring(value)
-  end
-end
-
-function g_settings.set(key, value)
-  g_configs.set(key, convertSettingValue(value))
-end
-
-function g_settings.setDefault(key, value)
-  if g_settings.exists(key) then return false end
-  g_settings.set(key, value)
-  return true
-end
-
-function g_settings.get(key, default)
-  if not g_settings.exists(key) and default ~= nil then
-    g_settings.set(key, default)
-  end
-  return g_configs.get(key)
-end
-
-function g_settings.getString(key, default)
-  return g_settings.get(key, default)
-end
-
-function g_settings.getInteger(key, default)
-  local v = tonumber(g_settings.get(key, default)) or 0
-  return v
-end
-
-function g_settings.getNumber(key, default)
-  local v = tonumber(g_settings.get(key, default)) or 0
-  return v
-end
-
-function g_settings.getBoolean(key, default)
-  return toboolean(g_settings.get(key, default))
-end
-
-function g_settings.getPoint(key, default)
-  return topoint(g_settings.get(key, default))
-end
-
-function g_settings.getRect(key, default)
-  return torect(g_settings.get(key, default))
-end
-
-function g_settings.getSize(key, default)
-  return tosize(g_settings.get(key, default))
-end
-
-function g_settings.getColor(key, default)
-  return tocolor(g_settings.get(key, default))
-end
-
-function g_settings.getColor(key, default)
-  return tocolor(g_settings.get(key, default))
-end
+-- Reserved for future functionality

modules/corelib/string.lua

@@ -49,3 +49,11 @@ function string:explode(sep, limit)
   table.insert(t, tmp)
   return t
 end
+
+function string:contains(str, checkCase, start, plain)
+  if(not checkCase) then
+    self = self:lower()
+    str = str:lower()
+  end
+  return string.find(self, str, start and start or 1, plain == nil and true or false)
+end

modules/corelib/table.lua

@@ -157,6 +157,7 @@ function table.tostring(t)
   local maxn = #t
   local str = ""
   for k,v in pairs(t) do
+    v = tostring(v)
     if k == maxn and k ~= 1 then
       str = str .. " and " .. v
     elseif maxn > 1 and k ~= 1 then
@@ -181,3 +182,11 @@ function table.collect(t, func)
   return res
 end
 
+function table.equals(t, comp)
+  if type(t) == "table" and type(comp) == "table" then
+    for k,v in pairs(t) do
+      if v ~= comp[k] then return false end
+    end
+  end
+  return true
+end

modules/corelib/ui/uibutton.lua

@@ -1,5 +1,5 @@
 -- @docclass
-UIButton = extends(UIWidget)
+UIButton = extends(UIWidget, "UIButton")
 
 function UIButton.create()
   local button = UIButton.internalCreate()

modules/corelib/ui/uicheckbox.lua

@@ -1,5 +1,5 @@
 -- @docclass
-UICheckBox = extends(UIWidget)
+UICheckBox = extends(UIWidget, "UICheckBox")
 
 function UICheckBox.create()
   local checkbox = UICheckBox.internalCreate()

modules/corelib/ui/uicombobox.lua

@@ -1,5 +1,5 @@
 -- @docclass
-UIComboBox = extends(UIWidget)
+UIComboBox = extends(UIWidget, "UIComboBox")
 
 function UIComboBox.create()
   local combobox = UIComboBox.internalCreate()
@@ -7,6 +7,9 @@ function UIComboBox.create()
   combobox.options = {}
   combobox.currentIndex = -1
   combobox.mouseScroll = true
+  combobox.menuScroll = false
+  combobox.menuHeight = 100
+  combobox.menuScrollStep = 0
   return combobox
 end
 
@@ -25,25 +28,33 @@ function UIComboBox:getOption(text)
   end
 end
 
-function UIComboBox:setCurrentOption(text)
+function UIComboBox:setOption(text, dontSignal)
+  self:setCurrentOption(text, dontSignal)
+end
+
+function UIComboBox:setCurrentOption(text, dontSignal)
   if not self.options then return end
   for i,v in ipairs(self.options) do
     if v.text == text and self.currentIndex ~= i then
       self.currentIndex = i
       self:setText(text)
-      signalcall(self.onOptionChange, self, text, v.data)
+      if not dontSignal then
+        signalcall(self.onOptionChange, self, text, v.data)
+      end
       return
     end
   end
 end
 
-function UIComboBox:setCurrentOptionByData(data)
+function UIComboBox:setCurrentOptionByData(data, dontSignal)
   if not self.options then return end
   for i,v in ipairs(self.options) do
     if v.data == data and self.currentIndex ~= i then
       self.currentIndex = i
       self:setText(v.text)
-      signalcall(self.onOptionChange, self, v.text, v.data)
+      if not dontSignal then
+        signalcall(self.onOptionChange, self, v.text, v.data)
+      end
       return
     end
   end
@@ -86,7 +97,16 @@ function UIComboBox:removeOption(text)
 end
 
 function UIComboBox:onMousePress(mousePos, mouseButton)
-  local menu = g_ui.createWidget(self:getStyleName() .. 'PopupMenu')
+  local menu
+  if self.menuScroll then
+    menu = g_ui.createWidget(self:getStyleName() .. 'PopupScrollMenu')
+    menu:setHeight(self.menuHeight)
+    if self.menuScrollStep > 0 then
+      menu:setScrollbarStep(self.menuScrollStep)
+    end
+  else
+    menu = g_ui.createWidget(self:getStyleName() .. 'PopupMenu')
+  end
   menu:setId(self:getId() .. 'PopupMenu')
   for i,v in ipairs(self.options) do
     menu:addOption(v.text, function() self:setCurrentOption(v.text) end)
@@ -129,6 +149,12 @@ function UIComboBox:onStyleApply(styleName, styleNode)
   for name,value in pairs(styleNode) do
     if name == 'mouse-scroll' then
       self.mouseScroll = value
+    elseif name == 'menu-scroll' then
+      self.menuScroll = value
+    elseif name == 'menu-height' then
+      self.menuHeight = value
+    elseif name == 'menu-scroll-step' then
+      self.menuScrollStep = value
     end
   end
 end

modules/corelib/ui/uiimageview.lua

@@ -1,5 +1,5 @@
 -- @docclass
-UIImageView = extends(UIWidget)
+UIImageView = extends(UIWidget, "UIImageView")
 
 function UIImageView.create()
   local imageView = UIImageView.internalCreate()

modules/corelib/ui/uiinputbox.lua

@@ -1,7 +1,7 @@
 if not UIWindow then dofile 'uiwindow' end
 
 -- @docclass
-UIInputBox = extends(UIWindow)
+UIInputBox = extends(UIWindow, "UIInputBox")
 
 function UIInputBox.create(title, okCallback, cancelCallback)
   local inputBox = UIInputBox.internalCreate()

modules/corelib/ui/uilabel.lua

@@ -1,5 +1,5 @@
 -- @docclass
-UILabel = extends(UIWidget)
+UILabel = extends(UIWidget, "UILabel")
 
 function UILabel.create()
   local label = UILabel.internalCreate()

modules/corelib/ui/uimessagebox.lua

@@ -1,7 +1,7 @@
 if not UIWindow then dofile 'uiwindow' end
 
 -- @docclass
-UIMessageBox = extends(UIWindow)
+UIMessageBox = extends(UIWindow, "UIMessageBox")
 
 -- messagebox cannot be created from otui files
 UIMessageBox.create = nil

modules/corelib/ui/uiminiwindow.lua

@@ -1,15 +1,11 @@
 -- @docclass
-UIMiniWindow = extends(UIWindow)
+UIMiniWindow = extends(UIWindow, "UIMiniWindow")
 
 function UIMiniWindow.create()
   local miniwindow = UIMiniWindow.internalCreate()
   return miniwindow
 end
 
-function UIMiniWindow:getClassName()
-  return 'UIMiniWindow'
-end
-
 function UIMiniWindow:open(dontSave)
   self:setVisible(true)
 

modules/corelib/ui/uiminiwindowcontainer.lua

@@ -1,5 +1,5 @@
 -- @docclass
-UIMiniWindowContainer = extends(UIWidget)
+UIMiniWindowContainer = extends(UIWidget, "UIMiniWindowContainer")
 
 function UIMiniWindowContainer.create()
   local container = UIMiniWindowContainer.internalCreate()
@@ -9,10 +9,6 @@ function UIMiniWindowContainer.create()
   return container
 end
 
-function UIMiniWindowContainer:getClassName()
-  return 'UIMiniWindowContainer'
-end
-
 -- TODO: connect to window onResize event
 -- TODO: try to resize another widget?
 -- TODO: try to find another panel?

modules/corelib/ui/uimovabletabbar.lua

@@ -1,5 +1,5 @@
 -- @docclass
-UIMoveableTabBar = extends(UIWidget)
+UIMoveableTabBar = extends(UIWidget, "UIMoveableTabBar")
 
 -- private functions
 local function onTabClick(tab)
@@ -16,6 +16,24 @@ local function updateMargins(tabBar, ignored)
   end
 end
 
+local function updateNavigation(tabBar)
+  if prevNavigation then
+    if #tabBar.preTabs > 0 or table.find(tabBar.tabs, tabBar.currentTab) ~= 1 then
+      prevNavigation:enable()
+    else
+      prevNavigation:disable()
+    end
+  end
+
+  if nextNavigation then
+    if #tabBar.postTabs > 0 or table.find(tabBar.tabs, tabBar.currentTab) ~= #tabBar.tabs then
+      nextNavigation:enable()
+    else
+      nextNavigation:disable()
+    end
+  end
+end
+
 local function updateIndexes(tabBar, tab, xoff)
   local tabs = tabBar.tabs
   local currentMargin = 0
@@ -33,10 +51,11 @@ local function updateIndexes(tabBar, tab, xoff)
     table.remove(tabs, table.find(tabs, tab))
     table.insert(tabs, newIndex, tab)
   end
+  updateNavigation(tabBar)
 end
 
 local function getMaxMargin(tabBar, tab)
-  if #tabBar.tabs == 0 then return end
+  if #tabBar.tabs == 0 then return 0 end
 
   local maxMargin = 0
   for i = 1, #tabBar.tabs do
@@ -44,7 +63,91 @@ local function getMaxMargin(tabBar, tab)
       maxMargin = maxMargin + tabBar.tabs[i]:getWidth()
     end
   end
-  return maxMargin + tabBar.tabSpacing * (#tabBar.tabs- 1)
+  return maxMargin + tabBar.tabSpacing * (#tabBar.tabs - 1)
+end
+
+local function updateTabs(tabBar)
+  if #tabBar.postTabs > 0 then
+    local i = 1
+    while i <= #tabBar.postTabs do
+      local tab = tabBar.postTabs[i]
+      if getMaxMargin(tabBar) + tab:getWidth() > tabBar:getWidth() then
+        break
+      end
+
+      table.remove(tabBar.postTabs, i)
+      table.insert(tabBar.tabs, tab)
+      tab:setVisible(true)
+    end
+  end
+  if #tabBar.preTabs > 0 then
+    for i = #tabBar.preTabs, 1, -1 do
+      local tab = tabBar.preTabs[i]
+      if getMaxMargin(tabBar) + tab:getWidth() > tabBar:getWidth() then
+        break
+      end
+
+      table.remove(tabBar.preTabs, i)
+      table.insert(tabBar.tabs, 1, tab)
+      tab:setVisible(true)
+    end
+  end
+  updateNavigation(tabBar)
+  updateMargins(tabBar)
+
+  if not tabBar.currentTab and #tabBar.tabs > 0 then
+    tabBar:selectTab(tabBar.tabs[1])
+  end
+end
+
+local function hideTabs(tabBar, fromBack, toArray, width)
+  while #tabBar.tabs > 0 and getMaxMargin(tabBar) + width > tabBar:getWidth() do
+    local index = fromBack and #tabBar.tabs or 1
+    local tab = tabBar.tabs[index]
+    table.remove(tabBar.tabs, index)
+    if fromBack then
+      table.insert(toArray, 1, tab)
+    else
+      table.insert(toArray, tab)
+    end
+    if tabBar.currentTab == tab then
+      if #tabBar.tabs > 0 then
+        tabBar:selectTab(tabBar.tabs[#tabBar.tabs])
+      else
+        tabBar.currentTab:setChecked(false)
+        tabBar.currentTab = nil
+      end
+    end
+    tab:setVisible(false)
+  end
+end
+
+local function showPreTab(tabBar)
+  if #tabBar.preTabs == 0 then
+    return nil
+  end
+
+  local tmpTab = tabBar.preTabs[#tabBar.preTabs]
+  hideTabs(tabBar, true, tabBar.postTabs, tmpTab:getWidth())
+
+  table.remove(tabBar.preTabs, #tabBar.preTabs)
+  table.insert(tabBar.tabs, 1, tmpTab)
+  tmpTab:setVisible(true)
+  return tmpTab
+end
+
+local function showPostTab(tabBar)
+  if #tabBar.postTabs == 0 then
+    return nil
+  end
+
+  local tmpTab = tabBar.postTabs[1]
+  hideTabs(tabBar, false, tabBar.preTabs, tmpTab:getWidth())
+
+  table.remove(tabBar.postTabs, 1)
+  table.insert(tabBar.tabs, tmpTab)
+  tmpTab:setVisible(true)
+  return tmpTab
 end
 
 local function onTabMousePress(tab, mousePos, mouseButton)
@@ -104,6 +207,14 @@ function UIMoveableTabBar.create()
   tabbar.selected = nil  -- dragged tab
   tabbar.tabSpacing = 0
   tabbar.tabsMoveable = false
+  tabbar.preTabs = {}
+  tabbar.postTabs = {}
+  tabbar.prevNavigation = nil
+  tabbar.nextNavigation = nil
+  tabbar.onGeometryChange = function()
+                              hideTabs(tabbar, true, tabbar.postTabs, 0)
+                              updateTabs(tabbar)
+                            end
   return tabbar
 end
 
@@ -141,18 +252,26 @@ function UIMoveableTabBar:addTab(text, panel, menuCallback)
   tab.onDragMove = onTabDragMove
   tab.onDestroy = function() tab.tabPanel:destroy() end
 
-  table.insert(self.tabs, tab)
-  if #self.tabs == 1 then
+  if #self.tabs == 0 then
     self:selectTab(tab)
     tab:setMarginLeft(0)
+    table.insert(self.tabs, tab)
   else
-    local newMargin = self.tabSpacing * (#self.tabs - 1)
-    for i = 1, #self.tabs - 1 do
+    local newMargin = self.tabSpacing * #self.tabs
+    for i = 1, #self.tabs do
       newMargin = newMargin + self.tabs[i]:getWidth()
     end
     tab:setMarginLeft(newMargin)
+
+    hideTabs(self, true, self.postTabs, tab:getWidth())
+    table.insert(self.tabs, tab)
+    if #self.tabs == 1 then
+      self:selectTab(tab)
+    end
+    updateMargins(self)
   end
 
+  updateNavigation(self)
   return tab
 end
 
@@ -183,17 +302,33 @@ function UIMoveableTabBar:onStyleApply(styleName, styleNode)
 end
 
 function UIMoveableTabBar:removeTab(tab)
-  local index = table.find(self.tabs, tab)
-  if index == nil then return end
+  local tabTables = {self.tabs, self.preTabs, self.postTabs}
+  local index = nil
+  local tabTable = nil
+  for i = 1, #tabTables do
+    index = table.find(tabTables[i], tab)
+    if index ~= nil then
+      tabTable = tabTables[i]
+      break
+    end
+  end
+
+  if tabTable == nil then
+    return
+  end
+
   if self.currentTab == tab then
     self:selectPrevTab()
+    if #self.tabs == 1 then
+      self.currentTab = nil
+    end
   end
-  table.remove(self.tabs, index)
+  table.remove(tabTable, index)
   if tab.blinkEvent then
     removeEvent(tab.blinkEvent)
   end
   tab:destroy()
-  updateMargins(self)
+  updateTabs(self)
 end
 
 function UIMoveableTabBar:getTab(text)
@@ -202,6 +337,16 @@ function UIMoveableTabBar:getTab(text)
       return tab
     end
   end
+  for k,tab in pairs(self.preTabs) do
+    if tab:getText():lower() == text:lower() then
+      return tab
+    end
+  end
+  for k,tab in pairs(self.postTabs) do
+    if tab:getText():lower() == text:lower() then
+      return tab
+    end
+  end
 end
 
 function UIMoveableTabBar:selectTab(tab)
@@ -226,23 +371,78 @@ function UIMoveableTabBar:selectTab(tab)
 
   local parent = tab:getParent()
   parent:focusChild(tab, MouseFocusReason)
+  updateNavigation(self)
 end
 
 function UIMoveableTabBar:selectNextTab()
-  if self.currentTab == nil then return end
+  if self.currentTab == nil then
+    return
+  end
+
   local index = table.find(self.tabs, self.currentTab)
-  if index == nil then return end
-  local nextTab = self.tabs[index + 1] or self.tabs[1]
-  if not nextTab then return end
+  if index == nil then
+    return
+  end
+
+  local newIndex = index + 1
+  if newIndex > #self.tabs then
+    if #self.postTabs > 0 then
+      local widget = showPostTab(self)
+      self:selectTab(widget)
+    else
+      if #self.preTabs > 0 then
+        for i = 1, #self.preTabs do
+          showPreTab(self)
+        end
+      end
+
+      self:selectTab(self.tabs[1])
+    end
+    updateTabs(self)
+    return
+  end
+
+  local nextTab = self.tabs[newIndex]
+  if not nextTab then
+    return
+  end
+
   self:selectTab(nextTab)
 end
 
 function UIMoveableTabBar:selectPrevTab()
-  if self.currentTab == nil then return end
+  if self.currentTab == nil then
+    return
+  end
+
   local index = table.find(self.tabs, self.currentTab)
-  if index == nil then return end
-  local prevTab = self.tabs[index - 1] or self.tabs[#self.tabs]
-  if not prevTab then return end
+  if index == nil then
+    return
+  end
+
+  local newIndex = index - 1
+  if newIndex <= 0 then
+    if #self.preTabs > 0 then
+      local widget = showPreTab(self)
+      self:selectTab(widget)
+    else
+      if #self.postTabs > 0 then
+        for i = 1, #self.postTabs do
+          showPostTab(self)
+        end
+      end
+
+      self:selectTab(self.tabs[#self.tabs])
+    end
+    updateTabs(self)
+    return
+  end
+
+  local prevTab = self.tabs[newIndex]
+  if not prevTab then
+    return
+  end
+
   self:selectTab(prevTab)
 end
 
@@ -265,3 +465,16 @@ end
 function UIMoveableTabBar:getCurrentTab()
   return self.currentTab
 end
+
+function UIMoveableTabBar:setNavigation(prevButton, nextButton)
+  prevNavigation = prevButton
+  nextNavigation = nextButton
+
+  if prevNavigation then
+    prevNavigation.onClick = function() self:selectPrevTab() end
+  end
+  if nextNavigation then
+    nextNavigation.onClick = function() self:selectNextTab() end
+  end
+  updateNavigation(self)
+end

modules/corelib/ui/uipopupmenu.lua

@@ -1,5 +1,5 @@
 -- @docclass
-UIPopupMenu = extends(UIWidget)
+UIPopupMenu = extends(UIWidget, "UIPopupMenu")
 
 local currentMenu
 
@@ -56,9 +56,8 @@ end
 
 function UIPopupMenu:addOption(optionName, optionCallback, shortcut)
   local optionWidget = g_ui.createWidget(self:getStyleName() .. 'Button', self)
-  local lastOptionWidget = self:getLastChild()
-  optionWidget.onClick = function(self)
-    self:getParent():destroy()
+  optionWidget.onClick = function(widget)
+    self:destroy()
     optionCallback()
   end
   optionWidget:setText(optionName)

modules/corelib/ui/uipopupscrollmenu.lua

@@ -0,0 +1,129 @@
+-- @docclass
+UIPopupScrollMenu = extends(UIWidget, "UIPopupScrollMenu")
+
+local currentMenu
+
+function UIPopupScrollMenu.create()
+  local menu = UIPopupScrollMenu.internalCreate()
+
+  local scrollArea = g_ui.createWidget('UIScrollArea', menu)
+  scrollArea:setLayout(UIVerticalLayout.create(menu))
+  scrollArea:setId('scrollArea')
+
+  local scrollBar = g_ui.createWidget('VerticalScrollBar', menu)
+  scrollBar:setId('scrollBar')
+  scrollBar.pixelsScroll = false
+
+  scrollBar:addAnchor(AnchorRight, 'parent', AnchorRight)
+  scrollBar:addAnchor(AnchorTop, 'parent', AnchorTop)
+  scrollBar:addAnchor(AnchorBottom, 'parent', AnchorBottom)
+
+  scrollArea:addAnchor(AnchorLeft, 'parent', AnchorLeft)
+  scrollArea:addAnchor(AnchorTop, 'parent', AnchorTop)
+  scrollArea:addAnchor(AnchorBottom, 'parent', AnchorBottom)
+  scrollArea:addAnchor(AnchorRight, 'next', AnchorLeft)
+  scrollArea:setVerticalScrollBar(scrollBar)
+
+  menu.scrollArea = scrollArea
+  menu.scrollBar = scrollBar
+  return menu
+end
+
+function UIPopupScrollMenu:setScrollbarStep(step)
+  self.scrollBar:setStep(step)
+end
+
+function UIPopupScrollMenu:display(pos)
+  -- don't display if not options was added
+  if self.scrollArea:getChildCount() == 0 then
+    self:destroy()
+    return
+  end
+
+  if g_ui.isMouseGrabbed() then
+    self:destroy()
+    return
+  end
+
+  if currentMenu then
+    currentMenu:destroy()
+  end
+
+  if pos == nil then
+    pos = g_window.getMousePosition()
+  end
+
+  rootWidget:addChild(self)
+  self:setPosition(pos)
+  self:grabMouse()
+  currentMenu = self
+end
+
+function UIPopupScrollMenu:onGeometryChange(oldRect, newRect)
+  local parent = self:getParent()
+  if not parent then return end
+  local ymax = parent:getY() + parent:getHeight()
+  local xmax = parent:getX() + parent:getWidth()
+  if newRect.y + newRect.height > ymax then
+    local newy = newRect.y - newRect.height
+    if newy > 0 and newy + newRect.height < ymax then self:setY(newy) end
+  end
+  if newRect.x + newRect.width > xmax then
+    local newx = newRect.x - newRect.width
+    if newx > 0 and newx + newRect.width < xmax then self:setX(newx) end
+  end
+  self:bindRectToParent()
+end
+
+function UIPopupScrollMenu:addOption(optionName, optionCallback, shortcut)
+  local optionWidget = g_ui.createWidget(self:getStyleName() .. 'Button', self.scrollArea)
+  optionWidget.onClick = function(widget)
+    self:destroy()
+    optionCallback()
+  end
+  optionWidget:setText(optionName)
+  local width = optionWidget:getTextSize().width + optionWidget:getMarginLeft() + optionWidget:getMarginRight() + 15
+
+  if shortcut then
+    local shortcutLabel = g_ui.createWidget(self:getStyleName() .. 'ShortcutLabel', optionWidget)
+    shortcutLabel:setText(shortcut)
+    width = width + shortcutLabel:getTextSize().width + shortcutLabel:getMarginLeft() + shortcutLabel:getMarginRight()
+  end
+
+  self:setWidth(math.max(self:getWidth(), width))
+end
+
+function UIPopupScrollMenu:addSeparator()
+  g_ui.createWidget(self:getStyleName() .. 'Separator', self.scrollArea)
+end
+
+function UIPopupScrollMenu:onDestroy()
+  if currentMenu == self then
+    currentMenu = nil
+  end
+  self:ungrabMouse()
+end
+
+function UIPopupScrollMenu:onMousePress(mousePos, mouseButton)
+  -- clicks outside menu area destroys the menu
+  if not self:containsPoint(mousePos) then
+    self:destroy()
+  end
+  return true
+end
+
+function UIPopupScrollMenu:onKeyPress(keyCode, keyboardModifiers)
+  if keyCode == KeyEscape then
+    self:destroy()
+    return true
+  end
+  return false
+end
+
+-- close all menus when the window is resized
+local function onRootGeometryUpdate()
+  if currentMenu then
+    currentMenu:destroy()
+  end
+end
+connect(rootWidget, { onGeometryChange = onRootGeometryUpdate} )

modules/corelib/ui/uiprogressbar.lua

@@ -1,5 +1,5 @@
 -- @docclass
-UIProgressBar = extends(UIWidget)
+UIProgressBar = extends(UIWidget, "UIProgressBar")
 
 function UIProgressBar.create()
   local progressbar = UIProgressBar.internalCreate()

modules/corelib/ui/uiradiogroup.lua

@@ -1,5 +1,5 @@
 -- @docclass
-UIRadioGroup = newclass()
+UIRadioGroup = newclass("UIRadioGroup")
 
 function UIRadioGroup.create()
   local radiogroup = UIRadioGroup.internalCreate()
@@ -28,7 +28,7 @@ function UIRadioGroup:removeWidget(widget)
   table.removevalue(self.widgets, widget)
 end
 
-function UIRadioGroup:selectWidget(selectedWidget)
+function UIRadioGroup:selectWidget(selectedWidget, dontSignal)
   if selectedWidget == self.selectedWidget then return end
 
   local previousSelectedWidget = self.selectedWidget
@@ -42,7 +42,9 @@ function UIRadioGroup:selectWidget(selectedWidget)
     selectedWidget:setChecked(true)
   end
 
-  signalcall(self.onSelectionChange, self, selectedWidget, previousSelectedWidget)
+  if not dontSignal then
+    signalcall(self.onSelectionChange, self, selectedWidget, previousSelectedWidget)
+  end
 end
 
 function UIRadioGroup:clearSelected()

modules/corelib/ui/uiresizeborder.lua

@@ -1,5 +1,5 @@
 -- @docclass
-UIResizeBorder = extends(UIWidget)
+UIResizeBorder = extends(UIWidget, "UIResizeBorder")
 
 function UIResizeBorder.create()
   local resizeborder = UIResizeBorder.internalCreate()

modules/corelib/ui/uiscrollarea.lua

@@ -1,5 +1,5 @@
 -- @docclass
-UIScrollArea = extends(UIWidget)
+UIScrollArea = extends(UIWidget, "UIScrollArea")
 
 -- public functions
 function UIScrollArea.create()
@@ -107,15 +107,37 @@ end
 
 function UIScrollArea:onMouseWheel(mousePos, mouseWheel)
   if self.verticalScrollBar then
+    if not self.verticalScrollBar:isOn() then
+      return false
+    end
     if mouseWheel == MouseWheelUp then
+      local minimum = self.verticalScrollBar:getMinimum()
+      if self.verticalScrollBar:getValue() <= minimum then
+        return false
+      end
       self.verticalScrollBar:decrement()
     else
+      local maximum = self.verticalScrollBar:getMaximum()
+      if self.verticalScrollBar:getValue() >= maximum then
+        return false
+      end
       self.verticalScrollBar:increment()
     end
   elseif self.horizontalScrollBar then
+    if not self.horizontalScrollBar:isOn() then
+      return false
+    end
     if mouseWheel == MouseWheelUp then
+      local maximum = self.horizontalScrollBar:getMaximum()
+      if self.horizontalScrollBar:getValue() >= maximum then
+        return false
+      end
       self.horizontalScrollBar:increment()
     else
+      local minimum = self.horizontalScrollBar:getMinimum()
+      if self.horizontalScrollBar:getValue() <= minimum then
+        return false
+      end
       self.horizontalScrollBar:decrement()
     end
   end

modules/corelib/ui/uiscrollbar.lua

@@ -1,5 +1,5 @@
 -- @docclass
-UIScrollBar = extends(UIWidget)
+UIScrollBar = extends(UIWidget, "UIScrollBar")
 
 -- private functions
 local function calcValues(self)
@@ -234,19 +234,23 @@ function UIScrollBar:onGeometryChange()
 end
 
 function UIScrollBar:onMouseWheel(mousePos, mouseWheel)
-  if not self.mouseScroll then
+  if not self.mouseScroll or not self:isOn() then
     return false
   end
   if mouseWheel == MouseWheelUp then
     if self.orientation == 'vertical' then
+      if self.value <= self.minimum then  return false end
       self:decrement()
     else
+      if self.value >= self.maximum then return false end
       self:increment()
     end
   else
     if self.orientation == 'vertical' then
+      if self.value >= self.maximum then return false end
       self:increment()
     else
+      if self.value <= self.minimum then  return false end
       self:decrement()
     end
   end

modules/corelib/ui/uispinbox.lua

@@ -1,5 +1,5 @@
 -- @docclass
-UISpinBox = extends(UITextEdit)
+UISpinBox = extends(UITextEdit, "UISpinBox")
 
 function UISpinBox.create()
   local spinbox = UISpinBox.internalCreate()
@@ -7,11 +7,13 @@ function UISpinBox.create()
   spinbox:setValidCharacters('0123456789')
   spinbox.displayButtons = true
   spinbox.minimum = 0
-  spinbox.maximum = 0
+  spinbox.maximum = 1
   spinbox.value = 0
   spinbox.step = 1
   spinbox.firstchange = true
+  spinbox.mouseScroll = true
   spinbox:setText("0")
+  spinbox:setValue(1)
   return spinbox
 end
 
@@ -21,6 +23,9 @@ function UISpinBox:onSetup()
 end
 
 function UISpinBox:onMouseWheel(mousePos, direction)
+  if not self.mouseScroll then 
+    return false
+  end
   if direction == MouseWheelUp then
     self:up()
   elseif direction == MouseWheelDown then
@@ -70,6 +75,8 @@ function UISpinBox:onStyleApply(styleName, styleNode)
       addEvent(function() self:setMaximum(value) end)
     elseif name == 'minimum' then
       addEvent(function() self:setMinimum(value) end)
+    elseif name == 'mouse-scroll' then
+      addEvent(function() self:setMouseScroll(value) end)
     elseif name == 'buttons' then
       addEvent(function()
         if value then
@@ -157,3 +164,11 @@ end
 function UISpinBox:setStep(step)
   self.step = step or 1
 end
+
+function UISpinBox:setMouseScroll(mouseScroll)
+  self.mouseScroll = mouseScroll
+end
+
+function UISpinBox:getMouseScroll()
+  return self.mouseScroll
+end

modules/corelib/ui/uisplitter.lua

@@ -1,5 +1,5 @@
 -- @docclass
-UISplitter = extends(UIWidget)
+UISplitter = extends(UIWidget, "UISplitter")
 
 function UISplitter.create()
   local splitter = UISplitter.internalCreate()

modules/corelib/ui/uitabbar.lua

@@ -1,5 +1,5 @@
 -- @docclass
-UITabBar = extends(UIWidget)
+UITabBar = extends(UIWidget, "UITabBar")
 
 -- private functions
 local function onTabClick(tab)

modules/corelib/ui/uitable.lua

@@ -5,7 +5,7 @@
     * Get dynamic row heights working with text wrapping.
     * Every second row different background color applied.
 ]]
-UITable = extends(UIWidget)
+UITable = extends(UIWidget, "UITable")
 
 local HEADER_ID = 'row0'
 

modules/corelib/ui/uiwindow.lua

@@ -1,5 +1,5 @@
 -- @docclass
-UIWindow = extends(UIWidget)
+UIWindow = extends(UIWidget, "UIWindow")
 
 function UIWindow.create()
   local window = UIWindow.internalCreate()
@@ -9,10 +9,6 @@ function UIWindow.create()
   return window
 end
 
-function UIWindow:getClassName()
-  return 'UIWindow'
-end
-
 function UIWindow:onKeyDown(keyCode, keyboardModifiers)
   if keyboardModifiers == KeyboardNoModifier then
     if keyCode == KeyEnter then

modules/corelib/util.lua

@@ -117,7 +117,11 @@ function disconnect(object, arg1, arg2)
   end
 end
 
-function newclass()
+function newclass(name)
+  if not name then
+    perror(debug.traceback('new class has no name.'))
+  end
+
   local class = {}
   function class.internalCreate()
     local instance = {}
@@ -127,10 +131,16 @@ function newclass()
     return instance
   end
   class.create = class.internalCreate
+  class.__class = name
+  class.getClassName = function() return name end
   return class
 end
 
-function extends(base)
+function extends(base, name)
+  if not name then
+    perror(debug.traceback('extended class has no name.'))
+  end
+
   local derived = {}
   function derived.internalCreate()
     local instance = base.create()
@@ -140,6 +150,8 @@ function extends(base)
     return instance
   end
   derived.create = derived.internalCreate
+  derived.__class = name
+  derived.getClassName = function() return name end
   return derived
 end
 
@@ -328,4 +340,16 @@ function getOppositeAnchor(anchor)
   return anchor
 end
 
+function makesingleton(obj)
+  local singleton = {}
+  if obj.getClassName then
+    for key,value in pairs(_G[obj:getClassName()]) do
+      if type(value) == 'function' then
+        singleton[key] = function(...) return value(obj, ...) end
+      end
+    end
+  end
+  return singleton
+end
+
 -- @}