Make OutputMessage::addRawString available in Lua (#1218)

Co-authored-by: Xagul <eixim@hotmail.com>

.dockerignore

@@ -0,0 +1,2 @@
+/build/
+Dockerfile

.github/workflows/build-vcpkg.yml

@@ -0,0 +1,133 @@
+name: Build with vcpkg
+
+on:
+  push:
+    branches:
+      - master
+      - v*
+
+    tags:
+      - v*
+
+    paths:
+      - .github/workflows/**
+      - cmake/**
+      - src/**
+      - CMakeLists.txt
+
+  pull_request:
+    paths:
+      - .github/workflows/**
+      - cmake/**
+      - src/**
+      - CMakeLists.txt
+
+jobs:
+  job:
+    name: ${{ matrix.os }}-${{ matrix.cxx }}-${{ matrix.buildtype }}-luajit=${{ matrix.luajit }}
+    runs-on: ${{ matrix.os }}-${{ matrix.os-version }}
+    strategy:
+      fail-fast: false
+      max-parallel: 8
+      matrix:
+        name: [ubuntu-gcc, macos-clang, windows-msvc]
+        buildtype: [Debug, Release]
+        luajit: [on, off]
+        include:
+          - name: windows-msvc
+            os: windows
+            os-version: latest
+            cxx: cl.exe
+            cc: cl.exe
+            triplet: x64-windows
+            packages: >
+              boost-iostreams boost-asio boost-system boost-variant boost-lockfree boost-filesystem boost-uuid
+              glew luajit libogg libvorbis openal-soft opengl openssl physfs zlib
+          - name: ubuntu-gcc
+            os: ubuntu
+            os-version: 20.04
+            cxx: g++
+            cc: gcc
+            triplet: x64-linux
+            packages: >
+              boost-iostreams boost-asio boost-system boost-variant boost-lockfree glew
+              boost-filesystem boost-uuid physfs openal-soft libogg libvorbis zlib opengl
+          - name: macos-clang
+            os: macos
+            os-version: latest
+            cxx: clang++
+            cc: clang
+            triplet: x64-osx
+            packages: >
+              boost-iostreams boost-asio boost-system boost-variant boost-lockfree glew
+              boost-filesystem boost-uuid libogg libvorbis zlib opengl
+        exclude:
+          - name: windows-msvc
+            luajit: off
+
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          submodules: true
+
+      - name: Unshallow
+        run: git fetch --prune --unshallow
+
+      - name: Get latest CMake
+        # Using 'latest' branch, the latest CMake is installed.
+        uses: lukka/get-cmake@latest
+
+      - name: Ubuntu - install opengl lua5.1 luajit
+        # vcpkg has lua 5.3+
+        run: sudo apt-get install libglew-dev liblua5.1-0-dev libluajit-5.1-dev
+        if: contains( matrix.os, 'ubuntu')
+
+      - name: MacOS - install physfs pkgconfig lua5.1 luajit xquartz
+        run: brew install physfs pkgconfig lua@5.1 luajit xquartz
+        if: contains( matrix.os, 'macos')
+
+      - name: Set Environment vars
+        run: |
+          echo "CXX=${{ matrix.cxx }}" >> $GITHUB_ENV
+          echo "CC=${{ matrix.cc }}" >> $GITHUB_ENV
+
+      - name: Run vcpkg
+        uses: lukka/run-vcpkg@v7
+        with:
+          vcpkgArguments: ${{ matrix.packages }}
+          vcpkgDirectory: ${{ runner.workspace }}/vcpkg/
+          vcpkgTriplet: ${{ matrix.triplet }}
+          vcpkgGitCommitId: 6f7ffeb18f99796233b958aaaf14ec7bd4fb64b2
+
+      - name: Build with CMake
+        uses: lukka/run-cmake@v3
+        with:
+          buildDirectory: ${{ runner.workspace }}/build
+          cmakeListsOrSettingsJson: CMakeListsTxtAdvanced
+          cmakeAppendedArgs: '-G Ninja -DCMAKE_BUILD_TYPE="${{ matrix.buildtype }}" -DLUAJIT="${{ matrix.luajit }}"'
+          useVcpkgToolchainFile: true
+
+      - name: dir
+        run: find $RUNNER_WORKSPACE
+        shell: bash
+
+      - name: Upload artifact binary
+        uses: actions/upload-artifact@v3
+        with:
+          name: otclient-${{ matrix.name }}-${{ matrix.buildtype }}-luajit=${{ matrix.luajit }}-${{ github.sha }}
+          path: ${{ runner.workspace }}/build/otclient
+        if: "! contains( matrix.os, 'windows')"
+
+      - name: Upload artifact binary (exe)
+        uses: actions/upload-artifact@v3
+        with:
+          name: otclient-${{ matrix.name }}-${{ matrix.buildtype }}-luajit=${{ matrix.luajit }}-${{ github.sha }}
+          path: ${{ runner.workspace }}/build/otclient.exe
+        if: contains( matrix.os, 'windows')
+
+      - name: Upload artifact binary (dlls)
+        uses: actions/upload-artifact@v3
+        with:
+          name: otclient-${{ matrix.name }}-${{ matrix.buildtype }}-luajit=${{ matrix.luajit }}-${{ github.sha }}
+          path: ${{ runner.workspace }}/build/*.dll
+        if: contains( matrix.os, 'windows')

.gitignore

@@ -1,45 +1,3 @@
-build*
-CMakeCache.txt
-CMakeFiles
-cmake_install.cmake
-Makefile
-/otclient
-/*.h
-/*.cxx
-*.o
-*.gch
-*.a
-*.exe
-*.spr
-*.dat
-*.kdev*
-*.cbp
-*~
-*.kate-swap
-*.autosave
-CMakeLists.txt.user*
-*.xml
-*.otb
-*.otbm
-*.log
-*.bak
-*.swp
-*.pic
-.lvimrc
-.clang_complete
-config.otml
-/modules/otclientrc.lua
-/doc
-!.gitignore
-otclient.map
-otclient.layout
-LOCALTODO
-tags
-Thumbs.db
-.directory
-src/framework/graphics/dx/
-modules/.project/modules.sublime-workspace
-
 #################
 ## Visual Studio
 #################
@@ -51,6 +9,8 @@ modules/.project/modules.sublime-workspace
 *.suo
 *.user
 *.sln.docstates
+.idea/
+.vscode/
 
 # Build results
 
@@ -60,6 +20,7 @@ x64/
 build/
 [Bb]in/
 [Oo]bj/
+cmake-build-*/
 
 # MSTest test Results
 [Tt]est[Rr]esult*/
@@ -86,16 +47,19 @@ build/
 *.vssscc
 .builds
 *.pidb
-*.log
 *.scc
+*.dll
+*.exe
 
 # Visual C++ cache files
 ipch/
 *.aps
 *.ncb
 *.opensdf
+*.opendb
 *.sdf
 *.cachefile
+*.VC.db
 
 # Visual Studio profiler
 *.psess
@@ -108,3 +72,184 @@ ipch/
 # ReSharper is a .NET coding add-in
 _ReSharper*/
 *.[Rr]e[Ss]harper
+
+# TeamCity is a build add-in
+_TeamCity*
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# NCrunch
+*.ncrunch*
+.*crunch*.local.xml
+
+# Installshield output folder
+[Ee]xpress/
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish/
+
+# Publish Web Output
+*.Publish.xml
+*.pubxml
+
+# NuGet Packages Directory
+## TODO: If you have NuGet Package Restore enabled, uncomment the next line
+#packages/
+
+# Windows Azure Build Output
+csx
+*.build.csdef
+
+# Windows Store app package directory
+AppPackages/
+
+# Others
+sql/
+*.Cache
+ClientBin/
+[Ss]tyle[Cc]op.*
+~$*
+*~
+*.dbmdl
+*.[Pp]ublish.xml
+*.pfx
+*.publishsettings
+
+# RIA/Silverlight projects
+Generated_Code/
+
+# Backup & report files from converting an old project file to a newer
+# Visual Studio version. Backup files are not needed, because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+
+# SQL Server files
+App_Data/*.mdf
+App_Data/*.ldf
+
+#############
+## Windows detritus
+#############
+
+# Windows image file caches
+Thumbs.db
+ehthumbs.db
+
+# Folder config file
+Desktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Mac crap
+.DS_Store
+
+# Installer logs
+pip-log.txt
+
+# Unit test / coverage reports
+.coverage
+.tox
+
+#Translations
+*.mo
+
+#Mr Developer
+.mr.developer.cfg
+
+# Vim files
+*~
+.*.swp
+.*.swo
+
+#################
+## OTClient
+#################
+
+/otclient
+/modules/otclientrc.lua
+src/framework/graphics/dx/
+
+*.o
+*.gch
+*.a
+*.kdev*
+*.cbp
+*~
+*.kate-swap
+*.autosave
+*.bak
+*.swp
+.lvimrc
+.clang_complete
+LOCALTODO
+tags
+
+# user-specific files
+*.xml
+*.otb
+*.otbm
+*.spr
+*.dat
+*.pic
+config.otml
+
+## Cmake cache
+CMakeLists.txt.user
+CMakeCache.txt
+CMakeFiles
+CMakeScripts
+Testing
+Makefile
+cmake_install.cmake
+install_manifest.txt
+compile_commands.json
+CTestTestfile.cmake
+_deps
+
+## Sublime
+  
+# Cache files for Sublime Text
+*.tmlanguage.cache
+*.tmPreferences.cache
+*.stTheme.cache
+
+# Workspace files are user-specific
+*.sublime-workspace
+
+# Project files should be checked into the repository, unless a significant
+# proportion of contributors will probably not be using Sublime Text
+# *.sublime-project
+
+# SFTP configuration file
+sftp-config.json
+sftp-config-alt*.json
+
+# Package control specific files
+Package Control.last-run
+Package Control.ca-list
+Package Control.ca-bundle
+Package Control.system-ca-bundle
+Package Control.cache/
+Package Control.ca-certs/
+Package Control.merged-ca-bundle
+Package Control.user-ca-bundle
+oscrypto-ca-bundle.crt
+bh_unicode_properties.cache
+
+# Sublime-github package stores a github token in this file
+# https://packagecontrol.io/packages/sublime-github
+GitHub.sublime-settings

.travis.yml

@@ -1,14 +0,0 @@
-language: cpp
-compiler:
-  - gcc
-before_script:
-  - sudo apt-get install libboost1.48-all-dev libphysfs-dev libssl-dev liblua5.1-dev libglew1.6-dev libvorbis-dev libopenal-dev libz-dev -y
-script: |
-  cmake . -DCMAKE_BUILD_TYPE=Release
-  make
-notifications:
-  irc:
-    channels:
-      - "irc.freenode.org#otclient"
-    on_success: change
-    skip_join: true

CMakeLists.txt

@@ -1,7 +1,7 @@
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 3.1)
 project(otclient)
 
-set(VERSION "0.6.5")
+set(VERSION "1.0.0")
 
 option(FRAMEWORK_SOUND "Use SOUND " ON)
 option(FRAMEWORK_GRAPHICS "Use GRAPHICS " ON)
@@ -23,13 +23,24 @@ set(executable_SOURCES
     src/main.cpp
 )
 
-# add executable icon for win32 platforms
 if(WIN32)
-    add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/otcicon.o
-                       COMMAND ${CMAKE_RC_COMPILER}
-                       -I${CMAKE_CURRENT_SOURCE_DIR}/src
-                       -i${CMAKE_CURRENT_SOURCE_DIR}/src/otcicon.rc
-                       -o ${CMAKE_CURRENT_BINARY_DIR}/otcicon.o)
+    if(MSVC)
+        add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/otcicon.o
+                           COMMAND ${CMAKE_RC_COMPILER}
+                           -I${CMAKE_CURRENT_SOURCE_DIR}/src
+                           -fo${CMAKE_CURRENT_BINARY_DIR}/otcicon.o
+                           ${CMAKE_CURRENT_SOURCE_DIR}/src/otcicon.rc
+        )
+        add_definitions(-D_CRT_SECURE_NO_WARNINGS)
+    else()
+        add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/otcicon.o
+                           COMMAND ${CMAKE_RC_COMPILER}
+                           -I${CMAKE_CURRENT_SOURCE_DIR}/src
+                           -i${CMAKE_CURRENT_SOURCE_DIR}/src/otcicon.rc
+                           -o ${CMAKE_CURRENT_BINARY_DIR}/otcicon.o
+        )
+    endif()
+
     set(executable_SOURCES ${executable_SOURCES} otcicon.o)
 endif()
 
@@ -38,9 +49,15 @@ add_definitions(-D"VERSION=\\"${VERSION}\\"")
 # add client executable
 add_executable(${PROJECT_NAME} ${framework_SOURCES} ${client_SOURCES} ${executable_SOURCES})
 
-# target link libraries
+set_target_properties(${PROJECT_NAME} PROPERTIES CXX_STANDARD 14)
+set_target_properties(${PROJECT_NAME} PROPERTIES CXX_STANDARD_REQUIRED ON)
+
 target_link_libraries(${PROJECT_NAME} ${framework_LIBRARIES})
 
+if(APPLE AND USE_STATIC_LIBS)
+    target_link_libraries(${PROJECT_NAME} "-framework Foundation" "-framework IOKit")
+endif()
+
 if(USE_PCH)
     include(cotire)
     cotire(${PROJECT_NAME})
@@ -51,7 +68,10 @@ endif()
 
 # installation
 set(DATA_INSTALL_DIR share/${PROJECT_NAME})
-install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin)
+install(TARGETS ${PROJECT_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)
 

Dockerfile

@@ -0,0 +1,48 @@
+FROM ubuntu@sha256:b88f8848e9a1a4e4558ba7cfc4acc5879e1d0e7ac06401409062ad2627e6fb58 AS builder
+
+RUN apt-get update; \
+  apt-get install -y \
+    build-essential \
+    cmake \
+    git-core \
+    libboost-atomic1.65-dev \
+    libboost-chrono1.65-dev \
+    libboost-date-time1.65-dev \
+    libboost-filesystem1.65-dev \
+    libboost-system1.65-dev \
+    libboost-thread1.65-dev \
+    libglew-dev \
+    liblua5.1-0-dev \
+    libncurses5-dev \
+    libopenal-dev \
+    libssl-dev \
+    libvorbis-dev \
+    zlib1g-dev; \
+  apt-get clean && apt-get autoclean
+
+WORKDIR /
+RUN git clone --branch release-3.0.2 --depth 1 https://github.com/icculus/physfs.git
+WORKDIR /physfs/build/
+RUN cmake ..
+RUN make -j$(nproc)
+RUN make install
+
+COPY ./src/ /otclient/src/.
+COPY CMakeLists.txt /otclient/.
+WORKDIR /otclient/build/
+RUN cmake -DCMAKE_CXX_LINK_FLAGS=-no-pie -DCMAKE_BUILD_TYPE=Release ..
+RUN make -j$(nproc)
+
+FROM ubuntu@sha256:b88f8848e9a1a4e4558ba7cfc4acc5879e1d0e7ac06401409062ad2627e6fb58
+RUN apt-get update; \
+  apt-get install -y \
+    libglew2.0 \
+    libopenal1; \
+  apt-get clean && apt-get autoclean
+COPY --from=builder /otclient/build/otclient /otclient/bin/otclient
+COPY ./data/ /otclient/data/.
+COPY ./mods/ /otclient/mods/.
+COPY ./modules/ /otclient/modules/.
+COPY ./init.lua /otclient/.
+WORKDIR /otclient
+CMD ["./bin/otclient"]

ISSUE_TEMPLATE.md

@@ -0,0 +1,22 @@
+<!-- Welcome to the issues section if it's your first time! -->
+
+### Before creating an issue, please ensure:
+- [ ] This is a bug in the software that resides in this repository, and not a
+      support matter (use https://otland.net/forums/otclient.494/ for support)
+- [ ] This issue is reproducible without changes to the code in this repository
+
+### Steps to reproduce (include any configuration/script required to reproduce)
+1.
+2.
+3.
+
+### Expected behaviour
+<!-- Tell us what should happen -->
+
+### Actual behaviour
+<!-- Tell us what happens instead -->
+
+### Environment
+<!-- Please tell which client version are you using (E.g 10.98 OTClient 0.6.6)
+If the issue is environment specific (e.g. compiling errors), include
+     name and version of the operating system and compiler you are using. -->

LICENSE

@@ -1,6 +1,6 @@
 OTClient is made available under the MIT License
 
-Copyright (c) 2010-2012 OTClient <https://github.com/edubart/otclient>
+Copyright (c) 2010-2020 OTClient <https://github.com/edubart/otclient>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,4 +1,5 @@
-[![Build Status](https://secure.travis-ci.org/edubart/otclient.png?branch=master)](http://travis-ci.org/edubart/otclient)
+[![Build Status](https://github.com/edubart/otclient/actions/workflows/build-vcpkg.yml/badge.svg)](https://github.com/edubart/otclient/actions/workflows/build-vcpkg.yml) [![Join the chat at https://gitter.im/edubart/otclient](https://img.shields.io/badge/GITTER-join%20chat-green.svg)](https://gitter.im/edubart/otclient?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Open Source Helpers](https://www.codetriage.com/edubart/otclient/badges/users.svg)](https://www.codetriage.com/edubart/otclient)
+
 ### What is otclient?
 
 Otclient is an alternative Tibia client for usage with otserv. It aims to be complete and flexible,
@@ -6,19 +7,17 @@ for that it uses LUA scripting for all game interface functionality and configur
 similar to CSS for the client interface design. Otclient works with a modular system, this means
 that each functionality is a separated module, giving the possibility to users modify and customize
 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.
+Otclient is written in C++11 and heavily scripted in lua.
+
+For a server to connect to, you can build your own with the [forgottenserver](https://github.com/otland/forgottenserver)
+or connect to one listed on [otservlist](https://otservlist.org/).
 
 ### Where do I download?
 
-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.
+Compiled for Windows can be found here (but can be outdated):
+* [Windows Builds](http://otland.net/threads/otclient-builds-windows.217977/)
 
-* [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/VER/` (i.e: `data/things/1031/Tibia.spr`)
-
-Older releases can be downloaded from [here](https://www.dropbox.com/sh/se1okacemoqzjve/-oWK4YFm03)
+**NOTE:** You will need to download spr/dat files on your own and place them in `data/things/VERSION/` (i.e: `data/things/1098/Tibia.spr`)
 
 ### Features
 
@@ -32,20 +31,40 @@ client, instead otclient was designed to be a combination of a framework and tib
 
 ### 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)
+* [Compiling on OS X](https://github.com/edubart/otclient/wiki/Compiling-on-Mac-OS-X)
 
+### Build and run with Docker
 
+To build the image:
+
+```sh
+docker build -t edubart/otclient .
+```
+
+To run the built image:
+
+```sh
+# Disable access control for the X server.
+xhost +
+
+# Run the container image with the required bindings to the host devices and volumes.
+docker run -it --rm \
+  --env DISPLAY \
+  --volume /tmp/.X11-unix:/tmp/.X11-unix \
+  --device /dev/dri \
+  --device /dev/snd edubart/otclient /bin/bash
+
+# Enable access control for the X server.
+xhost -
+```
 
 ### Need help?
 
 Try to ask questions in [otland](http://otland.net/f494/), now we have a board for the project there,
-or talk with us at #otclient irc.freenode.net
+or talk with us at the gitter chat.
 
 ### Bugs
 
@@ -57,7 +76,7 @@ We encourage you to contribute to otclient! You can make pull requests of any im
 
 ### Contact
 
-Talk directly with us at #otclient irc.freenode.net or send an email directly to the project leader edub4rt@gmail.com
+Talk directly with us at the gitter chat [![Join the chat at https://gitter.im/edubart/otclient](https://img.shields.io/badge/GITTER-join%20chat-green.svg)](https://gitter.im/edubart/otclient?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge).
 
 ### License
 

data/locales/de.lua

@@ -4,6 +4,10 @@ locale = {
   charset = "cp1252",
   languageName = "Deutsch",
 
+  formatNumbers = true,
+  decimalSeperator = ',',
+  thousandsSeperator = ' ',
+
   translation = {
     ["1a) Offensive Name"] = false,
     ["1b) Invalid Name Format"] = false,
@@ -26,7 +30,7 @@ locale = {
     ["4c) False Report to Gamemaster"] = false,
     ["Accept"] = "Annehmen",
     ["Account name"] = "Benutzername",
-    ["Account Status:"] = false,
+    ["Account Status"] = false,
     ["Action:"] = false,
     ["Add"] = "Hinzufügen",
     ["Add new VIP"] = "Neuen Freund hinzufügen",
@@ -227,7 +231,7 @@ locale = {
     ["Pass Leadership to %s"] = "%s zum Anführer ernennen",
     ["Password"] = "Passwort",
     ["Piece Price:"] = "Stückpreis",
-    ["Please enter a character name:"] = "Bitte gib einen Charakternamen an:",
+    ["Please enter a character name"] = "Bitte gib einen Charakternamen an",
     ["Please, press the key you wish to add onto your hotkeys manager"] = "Bitte die gewünschte Taste drücken",
     ["Please Select"] = false,
     ["Please use this dialog to only report bugs. Do not report rule violations here!"] = false,

data/locales/en.lua

@@ -3,6 +3,10 @@ locale = {
   charset = "cp1252",
   languageName = "English",
 
+  formatNumbers = true,
+  decimalSeperator = '.',
+  thousandsSeperator = ',',
+
   -- translations are not needed because everything is already in english
   translation = {}
 }

data/locales/es.lua

@@ -6,17 +6,21 @@ locale = {
   name = "es",
   charset = "cp1252",
   languageName = "Español",
- 
+
+  formatNumbers = true,
+  decimalSeperator = ',',
+  thousandsSeperator = '.',
+
   translation = {
     ["1a) Offensive Name"] = "1a) Nombre ofensivo",
-    ["1b) Invalid Name Format"] = "1b) Formato invalido para nombre",
+    ["1b) Invalid Name Format"] = "1b) Formato inválido para el nombre",
     ["1c) Unsuitable Name"] = "1c) Nombre no adecuado",
     ["1d) Name Inciting Rule Violation"] = "1d) Nombre que incita una violación al reglamento",
     ["2a) Offensive Statement"] = "2a) Comentario ofensivo",
     ["2b) Spamming"] = "2b) Spamming",
     ["2c) Illegal Advertising"] = "2c) Publicidad ilícita",
     ["2d) Off-Topic Public Statement"] = "2d) Publicación fuera de lugar",
-    ["2e) Non-English Public Statement"] = "2e) Publicación fuera del ingles",
+    ["2e) Non-English Public Statement"] = "2e) Publicación fuera del inglés",
     ["2f) Inciting Rule Violation"] = "2f) Incitar a una violación al reglamento",
     ["3a) Bug Abuse"] = "3a) Abuso de error",
     ["3b) Game Weakness Abuse"] = "3b) Abuso de debilidad del juego",
@@ -24,30 +28,30 @@ locale = {
     ["3d) Hacking"] = "3d) Hackeo",
     ["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",
+    ["4a) Threatening Gamemaster"] = "4a) Amenazar a un Gamemaster",
     ["4b) Pretending to Have Influence on Rule Enforcement"] = "4b) Pretender tener influencia en una parte del reglamento",
     ["4c) False Report to Gamemaster"] = "4c) Reporte falso a un Gamemaster",
     ["Accept"] = "Aceptar",
-    ["Account name"] = "Nombre de cuenta",
-    ["Account Status:"] = "Estado de cuenta:",
+    ["Account name"] = "Nombre de la cuenta",
+    ["Account Status"] = "Estado de la cuenta",
     ["Action:"] = "Acción:",
     ["Add"] = "Añadir",
     ["Add new VIP"] = "Añ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ñ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!"] = "¡Ay! Aventurero valiente, has conocido un triste destino. \nPero no se desespere, porque los dioses te llevarán de vuelta \na este mundo a cambio de un pequeñ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ó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 jugadores de alto nivel.",
-    ["Ambient light: %s%%"] = "Ambiente de luz: %s%%",
+    ["All modules and scripts were reloaded."] = "Todos los módulos y scripts se volvieron a cargar.",
+    ["Allow auto chase override"] = "Desactivar auto persecución al andar",
+    ["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%%"] = "Luz de ambiente: %s%%",
     ["Amount:"] = "Cantidad:",
     ["Amount"] = "Cantidad",
     ["Anonymous"] = "Anónimo",
-    ["Are you sure you want to logout?"] = "¿Estas seguro de que deseas salir?",
+    ["Are you sure you want to logout?"] = "¿Estás seguro de que deseas salir?",
     ["Attack"] = "Atacar",
     ["Author"] = "Autor",
     ["Autoload"] = "Auto carga",
@@ -56,26 +60,26 @@ locale = {
     ["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",
+    ["Banishment"] = "Baneo",
+    ["Banishment + Final Warning"] = "Baneo + Último Aviso",
     ["Battle"] = "Batalla",
     ["Browse"] = "Navegar",
     ["Bug report sent."] = "Reporte de error enviado.",
-    ["Button Assign"] = "Botón asignado",
+    ["Button Assign"] = "Asignar botón",
     ["Buy"] = "Compra",
     ["Buy Now"] = "Compra ahora",
-    ["Buy Offers"] = "Comprar oferta",
+    ["Buy Offers"] = "Comprar ofertas",
     ["Buy with backpack"] = "Comprar con mochila",
     ["Cancel"] = "Cancelar",
-    ["Cannot login while already in game."] = "No se puede iniciar sesión, mientras que estés en el juego.",
+    ["Cannot login while already in game."] = "No se puede iniciar sesión, mientras ya estés en el juego.",
     ["Cap"] = "Cap",
     ["Capacity"] = "Capacidad",
     ["Center"] = "Centrar",
     ["Channels"] = "Canales",
-    ["Character List"] = "Lista de carácter",
-    ["Classic control"] = "Controles Clásicos",
-    ["Clear current message window"] = "Limpiar mensaje actual en ventana",
-    ["Clear Messages"] = "Limpiar mensaje",
+    ["Character List"] = "Lista de caracteres",
+    ["Classic control"] = "Controles clásicos",
+    ["Clear current message window"] = "Limpiar ventana de mensajes actual",
+    ["Clear Messages"] = "Limpiar mensajes",
     ["Clear object"] = "Limpiar objeto",
     ["Client needs update."] = "El cliente necesita una actualización.",
     ["Close"] = "Cerrar",
@@ -83,10 +87,10 @@ locale = {
     ["Club Fighting"] = "Combate con mazo",
     ["Combat Controls"] = "Controles de combate",
     ["Comment:"] = "Comentario:",
-    ["Connecting to game server..."] = "Conectando a servidor game...",
-    ["Connecting to login server..."] = "Conectando a servidor login...",
+    ["Connecting to game server..."] = "Conectando a servidor de juego...",
+    ["Connecting to login server..."] = "Conectando a servidor de login...",
     ["Console"] = "Consola",
-    ["Cooldowns"] = "Descansos",
+    ["Cooldowns"] = "Enfriamientos",
     ["Copy message"] = "Copiar mensaje",
     ["Copy name"] = "Copiar nombre",
     ["Copy Name"] = "Copiar nombre",
@@ -118,7 +122,7 @@ locale = {
     ["Enable vertical synchronization"] = "Habilitar sincronización vertical",
     ["Enable walk booster"] = "Habilitar caminado turbo",
     ["Enter Game"] = "Entrar al juego",
-    ["Enter one name per line."] = "Introducir un nombre por linea.",
+    ["Enter one name per line."] = "Introducir un nombre por línea.",
     ["Enter with your account again to update your client."] = "Ingrese con su cuenta nuevamente para actualizar el cliente.",
     ["Error"] = "Error",
     ["Error"] = "Error",
@@ -126,18 +130,18 @@ locale = {
     ["Exclude from private chat"] = "Ejecutar desde un canal privado",
     ["Exit"] = "Salir",
     ["Experience"] = "Experiencia",
-    ["Filter list to match your level"] = "Lista de filtros que coincida con el nivel",
-    ["Filter list to match your vocation"] = "Lista de filtros que coincida con el vocación",
+    ["Filter list to match your level"] = "Filtrar lista para coincidir con el nivel",
+    ["Filter list to match your vocation"] = "Filtrar lsta para coincidir con la vocación",
     ["Find:"] = "Encontrar:",
     ["Fishing"] = "Pesca",
-    ["Fist Fighting"] = "Combate con puños",
+    ["Fist Fighting"] = "Combate a puños",
     ["Follow"] = "Seguir",
-    ["Force Exit"] = "Forzar salida",
+    ["Force Exit"] = "Forzar Salir", -- "Forzar Salida" is almost too big for a button
     ["For Your Information"] = "Para tu información",
     ["Free Account"] = "Cuenta gratis",
     ["Fullscreen"] = "Pantalla completa",
     ["Game"] = "Juego",
-    ["Game framerate limit: %s"] = "Limite de cuadros por segundo en el juego: %s",
+    ["Game framerate limit: %s"] = "Límite de cuadros por segundo en el juego: %s",
     ["Graphics"] = "Gráficos",
     ["Graphics card driver not detected"] = "Controlador de tarjeta gráfica de video no detectado",
     ["Graphics Engine:"] = "Motor Gráfico:",
@@ -151,32 +155,32 @@ locale = {
     ["Hide Offline"] = "Ocultar fuera de linea",
     ["Hide party members"] = "Ocultar miembros del party",
     ["Hide players"] = "Ocultar players",
-    ["Hide spells for higher exp. levels"] = "Ocultar hechizos para niveles mas altos que tu experiencia.",
+    ["Hide spells for higher exp. levels"] = "Ocultar hechizos para niveles más altos que tu experiencia.",
     ["Hide spells for other vocations"] = "Ocultar hechizos que sean para otra vocació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 presionado el botón derecho del ratón para navegar\nDezplaze la rueda central del ratón para ampliar\nbotó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ón derecho del ratón para navegar\nDesplace la rueda central del ratón para ampliar\nbotón derecho del ratón 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.\nHaga click 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, su personaje puede permanecer en el juego.\nHaga clic en 'Desconectar' para asegurarse de que el personaje deja el juego correctamente.\nHaga clic en 'Forzar Salir' si desea salir del programa igualmente, pudiendo mantener el personaje en el juego.",
     ["Ignore"] = "Ignorar",
-    ["Ignore capacity"] = "Ignorar Capacidad",
+    ["Ignore capacity"] = "Ignorar capacidad",
     ["Ignored players:"] = "Jugadores ignorados:",
     ["Ignore equipped"] = "Ignorar lo equipado",
     ["Ignore List"] = "Ignorar lista",
     ["Ignore players"] = "Ignorar jugadores",
     ["Ignore Private Messages"] = "Ignorar mensajes privados",
     ["Ignore Yelling"] = "Ignorar gritos",
-    ["Interface framerate limit: %s"] = "Interface de cuadros por segundo: %s",
+    ["Interface framerate limit: %s"] = "Interfaz de cuadros por segundo: %s",
     ["Inventory"] = "Inventario",
-    ["Invite to Party"] = "Ivitar al party",
+    ["Invite to Party"] = "Invitar a party",
     ["Invite to private chat"] = "Invitar a canal privado",
-    ["IP Address Banishment"] = "Banishment - Dirección IP",
+    ["IP Address Banishment"] = "Dirección IP Baneada",
     ["Item Offers"] = "Ofertas de objetos",
-    ["It is empty."] = "Está vació.",
-    ["Join %s\'s Party"] = "Unirse al party de %s ",
+    ["It is empty."] = "Está vacío.",
+    ["Join %s\'s Party"] = "Unirse al party de %s",
     ["Leave Party"] = "Dejar el party",
     ["Level"] = "Nivel",
     ["Lifetime Premium Account"] = "Tiempo de Premium Account infinito",
-    ["Limits FPS to 60"] = "Limites FPS a 60",
+    ["Limits FPS to 60"] = "Límites 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",
@@ -184,44 +188,44 @@ locale = {
     ["Login"] = "Ingresar",
     ["Login Error"] = "Error de ingreso",
     ["Login Error"] = "Error de ingreso",
-    ["Logout"] = "Salir",
+    ["Logout"] = "Desconectar",
     ["Look"] = "Mirar",
     ["Magic Level"] = "Nivel mágico",
-    ["Make sure that your client uses\nthe correct game protocol version"] = "Asegúrese de que el cliente este utilizando\nes el versión del protocolo adecuado",
+    ["Make sure that your client uses\nthe correct game protocol version"] = "Asegúrese de que el cliente este utilizando\nla versión del protocolo correcta",
     ["Mana"] = "Mana",
     ["Manage hotkeys:"] = "Administrador de hotkeys:",
     ["Market"] = "Mercado",
-    ["Market Offers"] = "Ofertas en mercado",
+    ["Market Offers"] = "Ofertas del mercado",
     ["Message of the day"] = "Mensaje del día",
-    ["Message to "] = "Mensaje a",
+    ["Message to "] = "Mensaje a ",
     ["Message to %s"] = "Mensaje a %s",
     ["Minimap"] = "Minimapa",
     ["Module Manager"] = "Administrador de módulos",
-    ["Module name"] = "Nombre del modulo",
-    ["Mount"] = "Montar", --Unique name?
+    ["Module name"] = "Nombre del módulo",
+    ["Mount"] = "Montar", --"Montura" if it doesn't refers to the verb
     ["Move Stackable Item"] = "Mover objeto apilable",
     ["Move up"] = "Mover arriba",
     ["My Offers"] = "Mis ofertas",
     ["Name:"] = "Nombre:",
-    ["Name Report"] = "Name Report",
-    ["Name Report + Banishment"] = "Name Report + Banishment",
-    ["Name Report + Banishment + Final Warning"] = "Name Report + Banishment + Final Warning",
+    ["Name Report"] = "Reportar nombre",
+    ["Name Report + Banishment"] = "Reportar nombre + Baneo",
+    ["Name Report + Banishment + Final Warning"] = "Reportar nombre + Baneo + Último Aviso",
     ["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 se ha detectado una tarjeta grá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áficos para tener un rendimiento optimo.",
+    ["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áfica y todo sera procesado por tu procesador,\npor lo tanto el rendimiento va a ser muy malo.\nPor favor, actualice su controlador de la gráfica para tener un rendimiento óptimo.",
     ["No item selected."] = "No hay elemento seleccionado.",
-    ["No Mount"] = "No montura",
+    ["No Mount"] = "No montura", --probably "Sin" instead of "No" is more fitting?
     ["No Outfit"] = "No outfit",
-    ["No statement has been selected."] = "No hay comentario seleccionado.",
-    ["Notation"] = "Notation",
+    ["No statement has been selected."] = "No se ha seleccionado ningún comentario.",
+    ["Notation"] = "Notación",
     ["NPC Trade"] = "Intercambio con NPC",
-    ["Offer History"] = "Historial de oferta",
+    ["Offer History"] = "Historial de ofertas",
     ["Offers"] = "Ofertas",
     ["Offer Type:"] = "Tipo de oferta:",
     ["Offline Training"] = "Entrenamiento offLine",
     ["Ok"] = "OK",
     ["on %s.\n"] = "en %s.\n",
-    ["Open"] = "Abierto",
-    ["Open a private message channel:"] = "Abrir mensaje en canal privado:",
+    ["Open"] = "Abrir",
+    ["Open a private message channel:"] = "Abrir canal privado:",
     ["Open charlist automatically when starting client"] = "Abrir lista de jugadores automáticamente al iniciar el cliente",
     ["Open in new window"] = "Abrir en nueva ventana",
     ["Open new channel"] = "Abrir nuevo canal",
@@ -230,21 +234,21 @@ locale = {
     ["Pass Leadership to %s"] = "Pasar liderazgo a %s",
     ["Password"] = "Contraseña",
     ["Piece Price:"] = "Precio por pieza:",
-    ["Please enter a character name:"] = "Por favor ingresar nombre del jugador:",
+    ["Please enter a character name"] = "Por favor ingresa 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 seleccione",
-    ["Please use this dialog to only report bugs. Do not report rule violations here!"] = "Por favor usa este diálogo solo para reportar errores.\n¡No reportar violaciones del reglamento aquí!",
+    ["Please use this dialog to only report bugs. Do not report rule violations here!"] = "Por favor usa este diálogo sólo para reportar errores.\n¡No reportar violaciones del reglamento aquí!",
     ["Please wait"] = "Por favor espere",
     ["Port"] = "Puerto",
     ["Position:"] = "Posición:",
     ["Position: %i %i %i"] = "Posición: %i %i %i",
-    ["Premium Account (%s) days left"] = "Tienes (%s) días de Premium Account restantes",
+    ["Premium Account (%s) days left"] = "Quedan (%s) días de Premium Account",
     ["Price:"] = "Precio:",
     ["Primary"] = "Primario",
     ["Protocol"] = "Protocolo",
     ["Quest Log"] = "Quest Log", --Unique name
-    ["Randomize"] = "Combinar",
-    ["Randomize characters outfit"] = "Combinar vestimenta del jugador",
+    ["Randomize"] = "Aleatorio",
+    ["Randomize characters outfit"] = "Crear vestimenta del jugador aleatoriamente",
     ["Reason:"] = "Razón:",
     ["Refresh"] = "Refrescar",
     ["Refresh Offers"] = "Refrescar ofertas",
@@ -253,10 +257,10 @@ locale = {
     ["Reload All"] = "Cargar todo de nuevo",
     ["Remember account and password when starts client"] = "Recordar cuenta y contraseña al iniciar el cliente",
     ["Remember password"] = "Recordar contraseña",
-    ["Remove"] = "Remover",
-    ["Remove %s"] = "Remover %s",
+    ["Remove"] = "Eliminar",
+    ["Remove %s"] = "Eliminar %s",
     ["Report Bug"] = "Reportar error",
-    ["Reserved for more functionality later."] = "Reservado para una función futura.",
+    ["Reserved for more functionality later."] = "Reservado para una funcionalidad futura.",
     ["Reset Market"] = "Reiniciar mercado",
     ["Revoke %s\'s Invitation"] = "Anular %s\'s invitación",
     ["Rotate"] = "Rotar",
@@ -268,7 +272,7 @@ locale = {
     ["Secondary"] = "Secundario",
     ["Select object"] = "Seleccionar objeto",
     ["Select Outfit"] = "Seleccionar outfit",
-    ["Select your language"] = "Selectionar tu lenguaje",
+    ["Select your language"] = "Seleccionar tu idioma",
     ["Sell"] = "Vender",
     ["Sell Now"] = "Vender ahora",
     ["Sell Offers"] = "Ofertas de venta",
@@ -296,83 +300,86 @@ locale = {
     ["Show timestamps in console"] = "Mostrar marcas de tiempo en consola",
     ["Show your depot items only"] = "Mostrar solo tus objetos en depot",
     ["Skills"] = "Habilidades",
-    ["Soul"] = "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íritu"
+    ["Sort by name"] = "Ordenar por nombre",
+    ["Sort by status"] = "Ordenar por estado",
+    ["Sort by type"] = "Ordernar por tipo",
+    ["Soul"] = "Soul", --I'm leaving these as is because its a unique name, if you want to change it it can be "Alma" or "Espíritu"
+    ["Soul Points"] = "Puntos de Soul",
     ["Special"] = "Especial",
     ["Speed"] = "Velocidad",
-    ["Spell Cooldowns"] = "Spells Cooldowns", --Could be "Tiempo de recarga para los hechizos".
+    ["Spell Cooldowns"] = "Enfriamiento de hechizos", --Should 'spells'? be an unique name?
     ["Spell List"] = "Lista de hechizos",
     ["Stamina"] = "Resistencia",
     ["Statement:"] = "Comentario:",
-    ["Statement Report"] = "Statement Report", --Could be "reporte del comentario"
+    ["Statement Report"] = "Statement Report", --Could be "reporte del comentario"/Not sure how to translate it correctly.. When is it used in the game?
     ["Statistics"] = "Estadísticas",
     ["Stop Attack"] = "Detener ataque",
     ["Stop Follow"] = "Detener persecució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 on yourself)"] = "%s: (usar objeto en ti mismo)",
     ["%s: (use object with crosshair)"] = "%s: (usar objeto con punto de mira)",
-    ["Sword Fighting"] = "Combate de espada",
+    ["Sword Fighting"] = "Combate con espada",
     ["Terminal"] = "Terminal",
-    ["There is no way."] = "No hay ninguna manera.",
-    ["Title"] = "Titulo",
-    ["Total Price:"] = "Total total:",
+    ["There is no way."] = "No hay forma de llegar.",
+    ["Title"] = "Título",
+    ["Total Price:"] = "Precio total:",
     ["Trade"] = "Intercambio",
     ["Trade with ..."] = "Intercambiar con ...",
-    ["Trying to reconnect in %s seconds."] = "",
+    ["Trying to reconnect in %s seconds."] = "Intentando reconectar en %s segundos.",
     ["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ón-",
+    ["Unable to logout."] = "No se puede cerrar sesión.",
     ["Unignore"] = "Dejar de ignorar",
-    ["Unload"] = "No cargado",
+    ["Unload"] = "Desactivar", -- Should be "Descargar", but not used to prevent misunderstandings with "Download".
     ["Update needed"] = "Es necesario actualizar",
-    ["Use"] = "Uso",
+    ["Use"] = "Usar",
     ["Use on target"] = "Usar en un objetivo",
     ["Use on yourself"] = "Usar en mi mismo",
     ["Use with ..."] = "Usar en ...",
     ["Version"] = "Versión",
-    ["VIP List"] = "Lista Vip",
+    ["VIP List"] = "Lista VIP",
     ["Voc."] = "Voc.",
     ["Vocation"] = "Vocación",
     ["Waiting List"] = "Lista de espera",
     ["Website"] = "Sitio Web",
     ["Weight:"] = "Peso:",
-    ["Will detect when to use diagonal step based on the\nkeys you are pressing"] = "Detectara cuando se camina en diagonal usando las flechas",
+    ["Will detect when to use diagonal step based on the\nkeys you are pressing"] = "Detectará cuando caminar en diagonal en base\n a las teclas pulsadas",
     ["With crosshair"] = "Con punto de mira",
-    ["Yes"] = "Si",
-    ["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"] = "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á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 escudo mágico",
-    ["You are strengthened"] = "Tu estas reforzado",
-    ["You are within a protection zone"] = "Tu estas dentro de una zona de protecció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ón",
-    ["You must enter a comment."] = "Debes ingresar un comentario.",
+    ["Yes"] = "Sí",
+    ["You are bleeding"] = "Te estás desangrando",
+    ["You are burning"] = "Te estás quemando",
+    ["You are cursed"] = "Estás maldecido",
+    ["You are dazzled"] = "Estás deslumbrado",
+    ["You are dead."] = "Has muerto.",
+    ["You are dead"] = "Has muerto",
+    ["You are drowning"] = "Te estás ahogando",
+    ["You are drunk"] = "Estás ebrio",
+    ["You are electrified"] = "Estás electrocutado",
+    ["You are freezing"] = "Te estás congelando",
+    ["You are hasted"] = "Tienes la velocidad incrementada", --The best translation I could thing of ("You have increased speed")
+    ["You are hungry"] = "Tienes hambre",
+    ["You are paralysed"] = "Estás paralizado",
+    ["You are poisoned"] = "Estás envenedado",
+    ["You are protected by a magic shield"] = "Estás protegido por un escudo mágico",
+    ["You are strengthened"] = "Estás reforzado", --"fortificado" maybe?
+    ["You are within a protection zone"] = "Estás dentro de una zona de protección",
+    ["You can enter new text."] = "Puedes escribir texto nuevo.",
+    ["You have %s percent"] = "Tienes el %s por ciento",
+    ["You have %s percent to go"] = "Tienes el %s por ciento para avanzar",
+    ["You may not logout during a fight"] = "No te puedes desconectar durante una pelea",
+    ["You may not logout or enter a protection zone"] = "No te puedes desconectar o entrar en una zona de protección",
+    ["You must enter a comment."] = "Debes escribir un comentario.",
     ["You must enter a valid server address and port."] = "Debes ingresar una dirección válida de servidor y el puerto.",
-    ["You must select a character to login!"] = "¡Debes seleccionar un personaje para ingresar!",
+    ["You must select a character to login!"] = "¡Debes seleccionar un personaje para ingresar!", -- I would use "conectarte" but it's Ok
     ["Your Capacity:"] = "Tu capacidad:",
     ["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"
+    ["Don't stretch or shrink Game Window"] = "No estirar ni encoger la ventana de juego"
   }
 }
- 
+
 modules.client_locales.installLocale(locale)

data/locales/pl.lua

@@ -2,6 +2,10 @@ locale = {
   name = "pl",
   languageName = "Polski",
 
+  formatNumbers = true,
+  decimalSeperator = '.',
+  thousandsSeperator = ' ',
+
   translation = {
     ["1a) Offensive Name"] = "1a) Obrazliwe Imie",
     ["1b) Invalid Name Format"] = "1b) Niepoprawny Format Imienia",
@@ -24,7 +28,7 @@ locale = {
     ["4c) False Report to Gamemaster"] = "4c) Wyslanie Falszywego Raportu Mistrzowi Gry",
     ["Accept"] = "Akceptuj",
     ["Account name"] = "Numer konta",
-    ["Account Status:"] = "Status Konta:",
+    ["Account Status"] = "Status Konta",
     ["Action:"] = "Akcja:",
     ["Add"] = "Dodaj",
     ["Add new VIP"] = "Nowy VIP",
@@ -63,16 +67,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 +85,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 +104,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 +113,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 +122,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 +131,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 +140,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 +187,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 +225,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,
-    ["Please enter a character name:"] = "Podaj nazwe postaci:",
+    ["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 +241,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 +279,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 +292,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,
+    ["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 +315,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 +324,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 +343,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 +367,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/locales/pt.lua

@@ -3,14 +3,22 @@ locale = {
   charset = "cp1252",
   languageName = "Português",
 
+  formatNumbers = true,
+  decimalSeperator = ',',
+  thousandsSeperator = '.',
+
   -- As traduções devem vir sempre em ordem alfabética.
   translation = {
     ["%d of experience per hour"] = "%d de experiência por hora",
+    ["%s has finished the request"] = "%s finalizou o pedido",
+    ["%s has logged in."] = "%s entrou.",
+    ["%s has logged out."] = "%s saiu.",
     ["%s of experience left"] = "%s de experiência faltando",
     ["%s: (use object on target)"] = "%s: (usar objeto no alvo)",
     ["%s: (use object on yourself)"] = "%s: (usar objeto em si)",
     ["%s: (use object with crosshair)"] = "%s: (usar objeto com mira)",
     ["%s: (use object)"] = "%s: (usar objeto)",
+    ["(ERROR %d)"] = "(ERRO %d)",
     ["1a) Offensive Name"] = "1a) Nome ofensivo",
     ["1b) Invalid Name Format"] = "1b) Nome com formato inválido",
     ["1c) Unsuitable Name"] = "1c) Nome não adequado",
@@ -34,6 +42,8 @@ locale = {
     ["Account name"] = "Nome da conta",
     ["Account Status"] = "Estado da Conta",
     ["Action"] = "Ação",
+    ["Activate ignorelist"] = "Ativar lista ignorada",
+    ["Activate whitelist"] = "Ativar lista branca",
     ["Add new server"] = "Adicionar novo servidor",
     ["Add new VIP"] = "Adicionar nova VIP",
     ["Add to VIP list"] = "Adicionar a lista VIP",
@@ -42,17 +52,18 @@ locale = {
     ["Addon 2"] = "Addon 2",
     ["Addon 3"] = "Addon 3",
     ["Adjust volume"] = "Ajustar volume",
-    ["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!"] = false,
     ["All modules and scripts were reloaded."] = "Todos módulos e scripts foram recarregados.",
     ["All"] = "Todos",
     ["Allow auto chase override"] = "Permitir sobrescrever o modo de perseguição",
+    ["Allow VIPs to message you"] = "Permitir que VIPs te mandem mensagem",
+    ["Allowed Players"] = "Jogadores com permissão",
     ["Also known as dash in tibia community, recommended\nfor playing characters with high speed"] = "Também conhecido como dash na comunidade tibiana, recomendado\npara jogar com personagem que possuam velocidade alta",
     ["Ambient light: %s%%"] = "Luz ambiente: %s%%",
     ["Amount"] = "Quantidade",
     ["Anonymous"] = "Anônimo",
     ["Any"] = "Qualquer",
-    ["Are you sure you want to logout?"] = "Você tem certeza que quer sair?",
     ["Attack"] = "Atacar",
+    ["Auction End"] = "Fim do Leilão",
     ["Audio"] = "Áudio",
     ["Author"] = "Autor",
     ["Auto login selected character on next charlist load"] = "Entrar automaticamente com o personagem quando reabrir a lista de personagens",
@@ -64,6 +75,7 @@ locale = {
     ["Banishment + Final Warning"] = "Banimento + Aviso final",
     ["Banishment"] = "Banimento",
     ["Battle"] = "Batalha",
+    ["Browse Field"] = "Navegar Campo",
     ["Browse"] = "Navegar",
     ["Bug report sent."] = "Reporte de bug enviado.",
     ["Button Assign"] = "Selecionar botão",
@@ -71,12 +83,14 @@ locale = {
     ["Buy Offers"] = "Ofertas de compra",
     ["Buy with backpack"] = "Comprar com mochila",
     ["Buy"] = "Comprar",
+    ["Buyer Name"] = "Nome do Comprador",
     ["Cancel"] = "Cancelar",
     ["Cannot login while already in game."] = "Não é possivel logar enquanto já estiver jogando.",
     ["Cap"] = "Cap",
     ["Capacity"] = "Capacidade",
     ["Center"] = "Centro",
     ["Change language"] = "Trocar língua",
+    ["Channel appended to %s"] = "Canais acrescentados a %s",
     ["Channels"] = "Canais",
     ["Character List"] = "Lista de personagens",
     ["Classic control"] = "Controle clássico",
@@ -84,6 +98,7 @@ locale = {
     ["Clear Messages"] = "Limpar mensagens",
     ["Clear object"] = "Limpar objeto",
     ["Client needs update."] = "O client do jogo precisa ser atualizado",
+    ["Client Version"] = "Versão do Client",
     ["Close this channel"] = "Fechar esse canal",
     ["Close"] = "Fechar",
     ["Club Fighting"] = "Combate com Porrete",
@@ -92,35 +107,44 @@ locale = {
     ["Connecting to game server..."] = "Conectando no servidor do jogo...",
     ["Connecting to login server..."] = "Conectando no servidor de autenticação...",
     ["Connection Error"] = "Erro de Conexão",
+    ["Connection failed the server address does not exist."] = "Conexão falhou, servidor não existe.",
+    ["Connection failed."] = "Conexão falhou.",
+    ["Connection refused the server might be offline or restarting.\nPlease try again later."] = "Conexão recusada, servidor pode estar offline ou reiniciando. Por favor, tente novamente mais tarde.",
+    ["Connection timed out. Either your network is failing or the server is offline."] = "Conexão encerrada por tempo limite. Sua rede está falhando, ou o servidor está offline.",
     ["Console"] = "Console",
     ["Cooldown"] = "Cooldown",
     ["Cooldowns"] = "Cooldowns",
     ["Copy message"] = "Copiar mensagem",
     ["Copy name"] = "Copiar nome",
     ["Copy Name"] = "Copiar Nome",
+    ["Copy"] = "Copiar",
     ["Create Map Mark"] = "Criar marca no mapa",
     ["Create mark"] = "Criar marca",
     ["Create New Offer"] = "Criar nova oferta",
     ["Create Offer"] = "Criar oferta",
     ["Current hotkey to add: %s"] = "Atalho atual para adicionar: %s",
-    ["Current hotkeys:"] = "Atalhos atuais",
+    ["Critical Hit Chance"] = "Chance de acerto crítico",
+    ["Critical Hit Damage"] = "Dano de acerto crítico",
+    ["Current hotkeys"] = "Atalhos atuais",
     ["Current Offers"] = "Ofertas atuais",
     ["Default"] = "Padrão",
     ["Delete mark"] = "Deletar marca",
     ["Description"] = "Descrição",
-    ["Description:"] = "Descrição",
     ["Destructive Behaviour"] = "Comportamento destrutivo",
     ["Detail"] = "Detalhe",
     ["Details"] = "Detalhes",
+    ["Disable chat mode allow to walk using ASDW"] = "Desativar modo de chat permite andar usando ASDW",
     ["Disable Shared Experience"] = "Desativar experiência compartilhada",
     ["Dismount"] = "Desmontar",
     ["Display connection speed to the server (milliseconds)"] = "Exibir a velocidade de conexão com o servidor (milisegundos)",
     ["Display creature health bars"] = "Exibir barras de vida das criaturas",
     ["Display creature names"] = "Exibir nomes das criaturas",
+    ["Display player mana bar"] = "Exibir barra de mana",
     ["Display text messages"] = "Exibir mensagens de texto",
     ["Distance Fighting"] = "Combate a Distância",
-    ["Don't stretch or shrink Game Window"] = "Não esticar ou contrair a janela do game",
+    ["Don\'t stretch or shrink Game Window"] = "Não esticar ou contrair a janela do game",
     ["Druid"] = "Druid",
+    ["Edit %s"] = "Editar %s",
     ["Edit hotkey text:"] = "Editar texto do atalho",
     ["Edit List"] = "Editar lista",
     ["Edit Text"] = "Editar Texto",
@@ -253,7 +277,7 @@ locale = {
     ["Pass Leadership to %s"] = "Passar liderança para %s",
     ["Password"] = "Senha",
     ["Piece Price"] = "Preço por peça",
-    ["Please enter a character name:"] = "Por favor, entre com o nome do personagem:",
+    ["Please enter a character name"] = "Por favor, entre com o nome do personagem",
     ["Please Select"] = "Por favor, selecione algo",
     ["Please use this dialog to only report bugs. Do not report rule violations here!"] = "Por favor, use este campo apenas para reportar defeitos. Não reporte violação de regras aqui!",
     ["Please wait"] = "Por favor, espere",

data/locales/sv.lua

@@ -5,6 +5,10 @@ locale = {
   charset = "cp1252",
   languageName = "Svenska",
 
+  formatNumbers = true,
+  decimalSeperator = ',',
+  thousandsSeperator = ' ',
+
   translation = {
     ["1a) Offensive Name"] = "1a) Offensivt Namn",
     ["1b) Invalid Name Format"] = "1b) Ogiltigt Namnformat",
@@ -27,7 +31,7 @@ locale = {
     ["4c) False Report to Gamemaster"] = "4c) Falsk rapport till gamemaster",
     ["Accept"] = "Acceptera",
     ["Account name"] = "Konto namn",
-    ["Account Status:"] = false,
+    ["Account Status"] = false,
     ["Action:"] = "Handling:",
     ["Add"] = "Lägg till",
     ["Add new VIP"] = "Ny VIP",
@@ -228,7 +232,7 @@ locale = {
     ["Pass Leadership to %s"] = "Ge ledarskap till %s",
     ["Password"] = "Lösenord",
     ["Piece Price:"] = "Per Styck:",
-    ["Please enter a character name:"] = "Skriv in ett karaktärsnamn:",
+    ["Please enter a character name"] = "Skriv in ett karaktärsnamn",
     ["Please, press the key you wish to add onto your hotkeys manager"] = "Tryck på knappen som du\nvill lägga till som snabbtangent",
     ["Please Select"] = "Välj",
     ["Please use this dialog to only report bugs. Do not report rule violations here!"] = "Använd den här dialogrutan endast för att rapportera buggar. Rapportera inte regelbrott här!",

data/styles/10-buttons.otui

@@ -1,49 +1,52 @@
 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
+  opacity: 1.0
 
   $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
   image-source: /images/ui/arrow_horizontal
   image-clip: 12 0 12 21
+  image-color: #ffffff
 
   $hover !disabled:
     image-clip: 12 21 12 21
@@ -52,12 +55,13 @@ NextButton < UIButton
     image-clip: 12 21 12 21
 
   $disabled:
-    image-color: #ffffff55
+    image-color: #dfdfdf88
 
 PreviousButton < UIButton
   size: 12 21
   image-source: /images/ui/arrow_horizontal
   image-clip: 0 0 12 21
+  image-color: #ffffff
 
   $hover !disabled:
     image-clip: 0 21 12 21
@@ -66,18 +70,18 @@ PreviousButton < UIButton
     image-clip: 0 21 12 21
 
   $disabled:
-    image-color: #ffffff55
+    image-color: #dfdfdf88
 
 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,35 +1,35 @@
 CheckBox < UICheckBox
   size: 16 16
   text-align: left
-  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:
@@ -40,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,50 @@
 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: #de6f6f
 
 TabBar < UITabBar
-  size: 80 20
+  size: 80 21
   Panel
     id: buttonsPanel
     anchors.fill: parent
 TabBarPanel < Panel
 TabBarButton < UIButton
-  size: 20 20
+  size: 20 21
   image-source: /images/ui/tabbutton_square
-  image-color: white
-  image-clip: 0 0 20 20
+  image-source: /images/ui/tabbutton_square
+  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
   padding: 5
 
@@ -53,24 +56,32 @@ TabBarButton < UIButton
     margin-left: 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: #80c7f8
+    image-clip: 0 42 20 21
+    color: #dfdfdf
 
   $on !checked:
-    color: #F55E5E
+    color: #dfdfdf
 
 TabBarRounded < TabBar
 TabBarRoundedPanel < TabBarPanel
 TabBarRoundedButton < TabBarButton
   image-source: /images/ui/tabbutton_rounded
+  size: 22 23
+  image-clip: 0 0 22 23
+
+  $hover !checked:
+    image-clip: 0 23 22 23
+
+  $checked:
+    image-clip: 0 46 22 23
 
 TabBarVertical < UITabBar
   width: 96
@@ -107,7 +118,7 @@ TabBarVerticalButton < UIButton
     margin-top: 10
   $hover !checked:
     color: white
-    icon-color: #cccccc
+    icon-color: #dfdfdf
   $disabled:
     icon-color: #333333
   $checked:

data/styles/20-tables.otui

@@ -1,26 +1,62 @@
 Table < UITable
   layout: verticalBox
-  header-column-style: HeaderTableColumn
-  header-row-style: HeaderTableRow
+  header-column-style: TableHeaderColumn
+  header-row-style: TableHeaderRow
   column-style: TableColumn
   row-style: TableRow
 
 TableData < UIScrollArea
   layout: verticalBox
 
-TableRow < Label
+TableRow < UITableRow
   layout: horizontalBox
   height: 10
   text-wrap: true
+  focusable: true
+  even-background-color: alpha
+  odd-background-color: #00000022
+
+  $focus:
+    background-color: #294f6d
+    color: #ffffff
 
 TableColumn < Label
   width: 30
   text-wrap: true
+  focusable: false
 
 TableHeaderRow < Label
   layout: horizontalBox
+  focusable: false
   height: 10
   text-wrap: true
 
-TableHeaderColumn < Button
-  width: 30
+TableHeaderColumn < UITableHeaderColumn
+  font: verdana-11px-antialised
+  background-color: alpha
+  color: #dfdfdfff
+  height: 23
+  focusable: true
+  text-offset: 0 0
+  image-source: /images/ui/button
+  image-color: #dfdfdf
+  image-clip: 0 0 22 23
+  image-border: 3
+  padding: 5 10 5 10
+  enabled: false
+  focusable: false
+
+  $hover !disabled:
+    image-clip: 0 23 22 23
+
+  $pressed:
+    image-clip: 0 46 22 23
+    text-offset: 1 1
+
+  $disabled:
+    color: #dfdfdf88
+    opacity: 0.8
+
+SortableTableHeaderColumn < TableHeaderColumn
+  enabled: true
+  focusable: true

init.lua

@@ -22,13 +22,13 @@ end
 g_resources.addSearchPath(g_resources.getWorkDir() .. "mods", true)
 
 -- setup directory for saving configurations
-g_resources.setupUserWriteDir(g_app.getCompactName())
+g_resources.setupUserWriteDir(('%s/'):format(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()
 
@@ -52,4 +52,4 @@ local script = '/' .. g_app.getCompactName() .. 'rc.lua'
 
 if g_resources.fileExists(script) then
   dofile(script)
-end
+end

modules/client/client.lua

@@ -1,5 +1,8 @@
 local musicFilename = "/sounds/startup"
-local musicChannel = g_sounds.getChannel(1)
+local musicChannel = nil
+if g_sounds then
+  musicChannel = g_sounds.getChannel(SoundChannels.Music)
+end
 
 function setMusic(filename)
   musicFilename = filename
@@ -27,12 +30,14 @@ end
 
 function startup()
   -- Play startup music (The Silver Tree, by Mattias Westlund)
-  musicChannel:enqueue(musicFilename, 3)
-  connect(g_game, { onGameStart = function() musicChannel:stop(3) end })
-  connect(g_game, { onGameEnd = function()
-      g_sounds.stopAll()
-      musicChannel:enqueue(musicFilename, 3)
-  end })
+  if musicChannel then
+    musicChannel:enqueue(musicFilename, 3)
+    connect(g_game, { onGameStart = function() musicChannel:stop(3) end })
+    connect(g_game, { onGameEnd = function()
+        g_sounds.stopAll()
+        musicChannel:enqueue(musicFilename, 3)
+    end })
+  end
 
   -- Check for startup errors
   local errtitle = nil
@@ -53,11 +58,13 @@ function startup()
 end
 
 function init()
-  connect(g_app, { onRun = startup, 
+  connect(g_app, { onRun = startup,
                    onExit = exit })
 
   g_window.setMinimumSize({ width = 600, height = 480 })
-  g_sounds.preload(musicFilename)
+  if musicChannel then
+    g_sounds.preload(musicFilename)
+  end
 
   -- initialize in fullscreen mode on mobile devices
   if g_window.getPlatformType() == "X11-EGL" then
@@ -91,14 +98,14 @@ 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()
-  end                   
+  if not g_crypt.setMachineUUID(g_settings.get('uuid')) then
+    g_settings.set('uuid', g_crypt.getMachineUUID())
+    g_settings.save()
+  end
 end
 
 function terminate()
-  disconnect(g_app, { onRun = startup, 
+  disconnect(g_app, { onRun = startup,
                       onExit = exit })
   -- save window configs
   g_settings.set('window-size', g_window.getUnmaximizedSize())

modules/client/client.otmod

@@ -2,7 +2,7 @@ Module
   name: client
   description: Initialize the client and setups its main window
   author: edubart
-  website: www.otclient.info
+  website: https://github.com/edubart/otclient
   reloadable: false
   sandboxed: true
   scripts: [ client ]
@@ -19,4 +19,3 @@ Module
     - client_terminal
     - client_modulemanager
     - client_serverlist
-    - client_stats