28 files changed, 18088 insertions, 16942 deletions
diff --git a/NEWS b/NEWS
index 42b74b82..cca5d461 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,11 @@
+0.5.2 (17 April 2011)
+- Removed NPC "Thanks for buying/selling" messages from the chat
+- Added a few missing authentication failure reasons
+- Avoid kick from server due to picking up items too fast
+- Fixed updating of buy dialog after buying
+- Fixed compile on GNU HURD
+- Updated French and Finnish translations
+
 0.5.1 (14 March 2011)
 - Added particle notification for "Unable to pick up item."
 - Added the amount of items picked up to the particle notification
diff --git a/README b/README
index d8f25567..6e62d537 100644
--- a/README
+++ b/README
@@ -1,14 +1,14 @@
 THE MANA CLIENT
 ===============
 
- Version: 0.5.1       Date: 2011-03-14
+ Version: 0.5.2       Date: 2011-04-17
 
  Development team:
   - See AUTHORS file for a list
 
  Powered by:
 
-  - SDL, SDL_image, SDL_mixer, SDL_ttf, SDL_net (Media framework)
+  - SDL, SDL_gfx, SDL_image, SDL_mixer, SDL_ttf, SDL_net (Media framework)
   - Guichan (GUI framework)
   - libxml2 (XML parsing and writing)
   - PhysFS (Data files)
diff --git a/data/help/changes.txt b/data/help/changes.txt
index d1733f47..2453a608 100644
--- a/data/help/changes.txt
+++ b/data/help/changes.txt
@@ -3,6 +3,14 @@
 
 ##3                         === RECENT CHANGES ===
 
+ 0.5.2 (17 April 2011)
+ - Removed NPC "Thanks for buying/selling" messages from the chat
+ - Added a few missing authentication failure reasons
+ - Avoid kick from server due to picking up items too fast
+ - Fixed updating of buy dialog after buying
+ - Fixed compile on GNU HURD
+ - Updated French and Finnish translations
+
  0.5.1 (14 March 2011)
  - Added particle notification for "Unable to pick up item."
  - Added the amount of items picked up to the particle notification
@@ -142,29 +150,3 @@
  - Obscure precise home directory name when making screenshots
  - Fixed follow-parent of nested and being-following particle emitters
 
- 0.0.27 (9 December 2008)
- - Added support for showing map name above minimap
- - Added showing how long the ban is when banned
- - Added --data parameter for developers
- - Added particle effect for critical hits
- - Added support for dynamic skill names and hair colors
- - Added support for status effects
- - Added ability to add equipment to the shortcut bar
- - Added ability to change configuration during login phase (from Aethyra)
- - Mouse cursor will now hide when not used for some time
- - Inventory window now displays amount of slots used
- - Center minimap on player when it is larger than the minimap window
- - Extended particle emitters with properties that can change over time
- - Extended the GUI font to support more characters
- - Only require a restart to switch to full screen with OpenGL on Windows
- - Make sure news and update file list aren't cached (from Aethyra)
- - Made NPC dialogs resizable (from Aethyra)
- - Made window shortcuts configurable
- - Fixed visibility of trade window on startup
- - Fixed a client input freeze when closing NPC script from server
- - Fixed dead players to lie on the ground instead of standing around
- - Fixed shortcuts being activated when trade window was visible
- - Fixed a crash when equipment window is open
- - Fixed money value on failing to buy (from Aethyra)
- - Fixed crash in right-click menu when used after a being disappeared
-
diff --git a/data/help/header.txt b/data/help/header.txt
index 6ab8172d..505ae25c 100644
--- a/data/help/header.txt
+++ b/data/help/header.txt
@@ -2,7 +2,7 @@
 ##1                      M  A  N  A      S O U R C E
 ##1               ==========================================
 
-           ##2Version:##6 0.5.1          ##2Date:##14 March 2011
+           ##2Version:##6 0.5.2          ##2Date:##3 17 April 2011
 
 ##2                    Website: http://manasource.org
 
diff --git a/packaging/windows/portable.xml b/packaging/windows/portable.xml
index 0059d109..165b8283 100644
--- a/packaging/windows/portable.xml
+++ b/packaging/windows/portable.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <configuration>
- <option name="dataDir" value="logs"/>
- <option name="configDir" value="configs"/>
+ <option name="dataDir" value="settings"/>
+ <option name="configDir" value="settings"/>
  <option name="screenshotDir" value="screenshots"/>
 </configuration>
diff --git a/packaging/windows/setup.nsi b/packaging/windows/setup.nsi
index c845e687..602d8291 100644
--- a/packaging/windows/setup.nsi
+++ b/packaging/windows/setup.nsi
@@ -3,8 +3,8 @@
 ; like the old install script.
 ;
 ; DLLDIR - directory containing required dlls
-; EXEDIR - directory containing mana.exe
-; EXESUFFIX - offset to SRCDIR pointing to a directory containing mana.exe
+; EXEDIR - directory containing ${PRODUCT_NAME_SHORT}.exe
+; EXESUFFIX - offset to SRCDIR pointing to a directory containing ${PRODUCT_NAME_SHORT}.exe
 ; PRODUCT_VERSION - software version
 ; UPX - upx binary name
 ;
@@ -37,17 +37,19 @@ SetCompressor /SOLID lzma
   !define DLLDIR ${SRCDIR}/dll
 !endif
 
-;--- (and without !defines ) ---
-!System "${UPX} --best --crp-ms=999999 --compress-icons=0 --nrv2d ${EXEDIR}\mana.exe"
-
 ; HM NIS Edit helper defines
 !define PRODUCT_NAME "Mana"
+!define PRODUCT_NAME_SHORT "mana"
+
+;--- (and without !defines ) ---
+!System "${UPX} --best --crp-ms=999999 --compress-icons=0 --nrv2d ${EXEDIR}\${PRODUCT_NAME_SHORT}.exe"
+
 !ifndef PRODUCT_VERSION
-  !define PRODUCT_VERSION "0.0.29.1"
+  !define PRODUCT_VERSION "0.5-git"
 !endif
 !define PRODUCT_PUBLISHER "Mana Development Team"
 !define PRODUCT_WEB_SITE "http://manasource.org"
-!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\mana.exe"
+!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\${PRODUCT_NAME_SHORT}.exe"
 !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
 !define PRODUCT_UNINST_ROOT_KEY "HKLM"
 
@@ -93,7 +95,7 @@ SetCompressor /SOLID lzma
 
 Function RunMana
 SetOutPath $INSTDIR
-Exec "$INSTDIR\mana.exe"
+Exec "$INSTDIR\${PRODUCT_NAME_SHORT}.exe"
 FunctionEnd
 
 Function changeFinishImage
@@ -165,11 +167,12 @@ ReserveFile "setup_finish.bmp"
 ; MUI end ------
 
 Name "${PRODUCT_NAME} ${PRODUCT_VERSION}"
-OutFile "mana-${PRODUCT_VERSION}-win32.exe"
+OutFile "${PRODUCT_NAME_SHORT}-${PRODUCT_VERSION}-win32.exe"
 InstallDir "$PROGRAMFILES\Mana"
 InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" ""
 ShowInstDetails show
 ShowUnInstDetails show
+RequestExecutionLevel admin
 
 Function .onInit
   !insertmacro MUI_LANGDLL_DISPLAY
@@ -182,8 +185,8 @@ Section "Core files (required)" SecCore
   SetOutPath "$INSTDIR"
   SetOverwrite ifnewer
   CreateDirectory "$SMPROGRAMS\Mana"
-  CreateShortCut "$SMPROGRAMS\Mana\Mana.lnk" "$INSTDIR\mana.exe"
-  CreateShortCut "$DESKTOP\Mana.lnk" "$INSTDIR\mana.exe"
+  CreateShortCut "$SMPROGRAMS\Mana\Mana.lnk" "$INSTDIR\${PRODUCT_NAME_SHORT}.exe"
+  CreateShortCut "$DESKTOP\Mana.lnk" "$INSTDIR\${PRODUCT_NAME_SHORT}.exe"
   CreateDirectory "$INSTDIR\data"
   CreateDirectory "$INSTDIR\data\fonts"
   CreateDirectory "$INSTDIR\data\graphics"
@@ -197,8 +200,23 @@ Section "Core files (required)" SecCore
   SetOverwrite ifnewer
   SetOutPath "$INSTDIR"
 
-  File "${EXEDIR}\mana.exe"
-  File "${DLLDIR}\*.dll"
+  File "${EXEDIR}\${PRODUCT_NAME_SHORT}.exe"
+  File "${DLLDIR}\guichan.dll"
+  File "${DLLDIR}\guichan_sdl.dll"
+  File "${DLLDIR}\libcurl-4.dll"
+  File "${DLLDIR}\libiconv2.dll"
+  File "${DLLDIR}\libiconv-2.dll"
+  File "${DLLDIR}\libintl3.dll"
+  File "${DLLDIR}\libpng12-0.dll"
+  File "${DLLDIR}\libxml2-2.dll"
+  File "${DLLDIR}\physfs.dll"
+  File "${DLLDIR}\SDL.dll"
+  File "${DLLDIR}\SDL_gfx.dll"
+  File "${DLLDIR}\SDL_image.dll"
+  File "${DLLDIR}\SDL_mixer.dll"
+  File "${DLLDIR}\SDL_net.dll"
+  File "${DLLDIR}\SDL_ttf.dll"
+  File "${DLLDIR}\zlib1.dll"
   File "${SRCDIR}\AUTHORS"
   File "${SRCDIR}\COPYING"
   File "${SRCDIR}\NEWS"
@@ -223,16 +241,6 @@ Section "Core files (required)" SecCore
   File "${SRCDIR}\docs\FAQ.txt"
 SectionEnd
 
-Section /o "Music" SecMusic
-  AddSize 17602
-  CreateDirectory "$INSTDIR\data\music"
-  SetOutPath "$INSTDIR\data\music"
-  NSISdl::download "http://downloads.sourceforge.net/themanaworld/tmwmusic-0.2.tar.gz" "$TEMP\tmwmusic-0.2.tar.gz"
-  ;Requires an additional plugin from http://nsis.sourceforge.net/UnTGZ_plug-in  Place untgz.dll in your nsis/plugin dir
-  untgz::extract -j -d "$INSTDIR\data\music" "$TEMP\tmwmusic-0.2.tar.gz"
-  Delete "$TEMP\tmwmusic-0.2.tar.gz"
-SectionEnd
-
 Section /o "Portable" SecPortable
   SetOutPath "$INSTDIR"
   File "portable.xml"
@@ -246,9 +254,8 @@ SectionEnd
 ;Package descriptions
 !insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
   !insertmacro MUI_DESCRIPTION_TEXT ${SecCore} "The core program files."
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecMusic} "Background music. (If selected the music will be downloaded from the internet.)"
   !insertmacro MUI_DESCRIPTION_TEXT ${SecPortable} "Portable client. (If selected client will work as portable client.)"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecTrans} "Translations for the user interface into 23 different languages. Uncheck this component to leave it in English."
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecTrans} "Translations for the user interface. Uncheck this component to leave it in English."
 !insertmacro MUI_FUNCTION_DESCRIPTION_END
 
 
@@ -263,10 +270,10 @@ SectionEnd
 
 Section -Post
   WriteUninstaller "$INSTDIR\uninst.exe"
-  WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\mana.exe"
+  WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\${PRODUCT_NAME_SHORT}.exe"
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)"
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninst.exe"
-  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\mana.exe"
+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\${PRODUCT_NAME_SHORT}.exe"
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}"
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${PRODUCT_WEB_SITE}"
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}"
diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt
index 4ee62c87..08abb6bf 100644
--- a/po/CMakeLists.txt
+++ b/po/CMakeLists.txt
@@ -66,16 +66,16 @@ ENDMACRO()
 
 
 SET(languages)
+SET(POFILES)
 FILE(STRINGS LINGUAS _languages)
 FOREACH(_lang ${_languages})
    STRING(REGEX REPLACE "#.*" "" _lang "${_lang}")
    IF(NOT ${_lang} STREQUAL "")
       SET(languages ${languages} ${_lang})
+      SET(POFILES ${POFILES} "${_lang}.po")
    ENDIF()
 ENDFOREACH()
 
-FILE(GLOB POFILES *.po)
-
 ADD_CUSTOM_TARGET(update-po)
 
 MANA_GETTEXT_CREATE_TRANSLATIONS(mana.pot ALL ${POFILES})
diff --git a/po/LINGUAS b/po/LINGUAS
index 7900f760..2662375c 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -1,38 +1,38 @@
 # Set of available languages.
-#ar # Disabled because of current client limitations (shaping, RTL)
-#bg # Not enough translations
-#ca # Not enough translations
-#cs # Not enough translations
-da
+#ar    # Disabled because of current client limitations (shaping, RTL)
+#bg    # Not enough translations
+#ca    # Not enough translations
+#cs    # Not enough translations
+#da    # not enough translations
 de
-en_GB
-#eo # Not enough translations
+#en_GB # Not enough translations
+#eo    # Not enough translations
 es
-#et # Not enough translations
-#fa # Disabled because of current client limitations (shaping, RTL)
-#fi # Not enough translations
+#et    # Not enough translations
+#fa    # Disabled because of current client limitations (shaping, RTL)
+fi
 fr
-#he # Disabled because of current client limitations (RTL)
-hr
-hu
-#id # Not enough translations
-it
-#ja # Disabled because of current client limitations (font fallbacking)
-#ka # Not enough translations
-#nb # Not enough translations
-#nds # Not enough translations
-nl
-pl
-pt
+#he    # Disabled because of current client limitations (RTL)
+#hr    # Not enough translations
+#hu    # Not enough translations
+#id    # Not enough translations
+#it    # Not enough translations
+#ja    # Disabled because of current client limitations (font fallbacking)
+#ka    # Not enough translations
+#nb    # Not enough translations
+#nds   # Not enough translations
+#nl    # Not enough translations
+#pl    # Not enough translations
+#pt    # Not enough translations
 pt_BR
 ru
-#sk # Not enough translations
-#sq # Not enough translations
-sv
-#te # Disabled because of current client limitations (font fallbacking)
-#th # Disabled because of current client limitations (font fallbacking)
-#tr # Not enough translations
-#uk # Not enough translations
+#sk    # Not enough translations
+#sq    # Not enough translations
+#sv    # Not enough translations
+#te    # Disabled because of current client limitations (font fallbacking)
+#th    # Disabled because of current client limitations (font fallbacking)
+#tr    # Not enough translations
+#uk    # Not enough translations
 #zh_CN # Disabled because of current client limitations (font fallbacking)
 #zh_HK # Disabled because of current client limitations (font fallbacking)
 #zh_TW # Disabled because of current client limitations (font fallbacking)
diff --git a/po/de.po b/po/de.po
index c813a471..41f60ad1 100644
--- a/po/de.po
+++ b/po/de.po
@@ -18,420 +18,452 @@
 # Andrej, 2009.
 msgid ""
 msgstr ""
-"#-#-#-#-#  po_de.po (The Mana World 0.1.0)  #-#-#-#-#\n"
 "Project-Id-Version: The Mana World 0.1.0\n"
-"Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-12-06 19:23+0100\n"
-"PO-Revision-Date: 2011-01-03 22:40+0100\n"
-"Last-Translator: Matthias Hartmann <hartmann.matthias@gmail.com>\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-04-30 16:41+0200\n"
+"PO-Revision-Date: 2010-01-02 15:26+0000\n"
+"Last-Translator: Jonathan Raphael Joachim Kolberg\n"
 "Language-Team: Deutsch <kde-i18n-de@kde.org>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"#-#-#-#-#  po_de.po (The Mana World 0.1.0)  #-#-#-#-#\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Launchpad-Export-Date: 2009-06-02 17:48+0000\n"
 "X-Generator: Lokalize 1.0\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "#-#-#-#-#  de.po (The Mana World 0.1.0)  #-#-#-#-#\n"
-"Project-Id-Version: The Mana World 0.1.0\n"
-"Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-12-13 20:04+0100\n"
-"PO-Revision-Date: 2010-01-02 15:26+0000\n"
-"Last-Translator: Jonathan Raphael Joachim Kolberg\n"
-"Language-Team: Deutsch <kde-i18n-de@kde.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Launchpad-Export-Date: 2009-06-02 17:48+0000\n"
 "X-Generator: Lokalize 1.0\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: src/client.cpp:598 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
-msgid "Setup"
-msgstr "Einstellungen"
+#: ../src/gui/npcdialog.cpp:208
+msgid ""
+"\n"
+"> Next\n"
+msgstr ""
+"\n"
+"Weiter\n"
 
-#: src/client.cpp:679
+#: ../src/main.cpp:45
+msgid "              to the mana client."
+msgstr ""
+
+#: ../src/main.cpp:44
+msgid "              used to set custom parameters"
+msgstr ""
+
+#: ../src/main.cpp:62
 #, fuzzy
-msgid "Connecting to server"
-msgstr "Verbinde mit [Benutzerdatenserver]..."
+msgid "     --chat-log-dir   : Chat log dir to use"
+msgstr "  -C --config-file     : zu benutzende Konfigurationsdatei"
 
-#: src/client.cpp:706
+#: ../src/main.cpp:61
 #, fuzzy
-msgid "Logging in"
-msgstr "Anmelden"
+msgid "     --localdata-dir  : Directory to use as local data directory"
+msgstr ""
+"  -S --home-dir : Verzeichnis, das als Heimatverzeichnis benutzt werden soll"
 
-#: src/client.cpp:739
-msgid "Entering game world"
-msgstr "Betrete die Spielwelt"
+#: ../src/main.cpp:65
+#, fuzzy
+msgid "     --no-opengl      : Disable OpenGL for this session"
+msgstr "  -O --no-opengl      : OpenGL-Erweiterungen deaktivieren"
 
-#: src/client.cpp:804
+#: ../src/main.cpp:63
 #, fuzzy
-msgid "Requesting characters"
-msgstr "Spielfigur auswählen"
+msgid "     --screenshot-dir : Directory to store screenshots"
+msgstr ""
+"  -S --home-dir : Verzeichnis, das als Heimatverzeichnis benutzt werden soll"
 
-#: src/client.cpp:833
+#: ../src/main.cpp:56
 #, fuzzy
-msgid "Connecting to the game server"
-msgstr "Verbinde mit [Charakterserver]..."
+msgid "     --update-host    : Use this update host"
+msgstr "  -H --update-host    : Benutze angegebenen Updateserver"
 
-#: src/client.cpp:843
+#: ../src/main.cpp:50
 #, fuzzy
-msgid "Changing game servers"
-msgstr "Wechsle den Server"
+msgid "  -C --config-dir     : Configuration directory to use"
+msgstr "  -C --config-file     : zu benutzende Konfigurationsdatei"
 
-#: src/client.cpp:872 src/client.cpp:879 src/client.cpp:1014
-#: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
-#: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:323 src/gui/unregisterdialog.cpp:133
-#: src/net/manaserv/charhandler.cpp:174 src/net/manaserv/charhandler.cpp:217
-#: src/net/tmwa/charserverhandler.cpp:134
-#: src/net/tmwa/charserverhandler.cpp:151
-msgid "Error"
-msgstr "Fehler"
+#: ../src/main.cpp:57
+msgid "  -D --default        : Choose default character server and character"
+msgstr "  -D --default        : Wähle zuletzt benutzten Server und Spieler aus"
 
-#: src/client.cpp:888
-msgid "Requesting registration details"
-msgstr "Fordere Registrierungsdetails an"
+#: ../src/main.cpp:52
+msgid "  -P --password       : Login with this password"
+msgstr "  -P --password       : Angegebenes Passwort benutzen"
 
-#: src/client.cpp:915
-msgid "Password Change"
-msgstr "Passwort ändern:"
+#: ../src/main.cpp:51
+msgid "  -U --username       : Login with this username"
+msgstr "  -U --username       : Mit angegebenem Benutzernamen anmelden"
 
-#: src/client.cpp:916
-msgid "Password changed successfully!"
-msgstr "Passwort erfolgreich geändert!"
+#: ../src/main.cpp:53
+msgid "  -c --character      : Login with this character"
+msgstr "  -c --charakter      : Mit angegebenem Spieler anmelden"
 
-#: src/client.cpp:935
-msgid "Email Change"
-msgstr "E-Mail ändern"
+#: ../src/main.cpp:60
+msgid "  -d --data           : Directory to load game data from"
+msgstr ""
+"  -d --data           : Datenverzeichnis, aus dem das Spiel geladen werden "
+"soll"
 
-#: src/client.cpp:936
-#, fuzzy
-msgid "Email changed successfully!"
-msgstr "Mitglied wurde erfolgreich Befördert."
+#: ../src/main.cpp:49
+msgid "  -h --help           : Display this help"
+msgstr "  - --help           : Zeigt diesen Hilfstext an"
 
-#: src/client.cpp:956
-#, fuzzy
-msgid "Unregister Successful"
-msgstr "Abmelden"
+#: ../src/main.cpp:55
+msgid "  -p --port           : Login server port"
+msgstr "  -p --port           : Port des Loginservers"
 
-#: src/client.cpp:957
-msgid "Farewell, come back any time..."
-msgstr "Leb wohl und komme jeder Zeit wieder..."
+#: ../src/main.cpp:54
+msgid "  -s --server         : Login server name or IP"
+msgstr "  -s --server         : Name oder IP-Adresse des Loginservers"
 
-#: src/client.cpp:1138 src/client.cpp:1161
-#, c-format
-msgid "%s doesn't exist and can't be created! Exiting."
-msgstr "%s existiert nicht und kann nicht erstellt werden! Beende."
+#: ../src/main.cpp:59
+msgid "  -u --skip-update    : Skip the update downloads"
+msgstr "  -u --skip-update    : Überspringe das Herunterladen von Updates"
 
-#: src/client.cpp:1281
-#, fuzzy, c-format
-msgid "Invalid update host: %s"
-msgstr "Ungültiger Updateserver: "
+#: ../src/main.cpp:48
+msgid "  -v --version        : Display the version"
+msgstr "  -v --version        : Die Version des Spieles anzeigen"
 
-#: src/client.cpp:1315 src/client.cpp:1321
-msgid "Error creating updates directory!"
-msgstr "Fehler beim Erstellen des Verzeichnisses für Updates!"
+#: ../src/gui/updatewindow.cpp:419
+msgid "##1  It is strongly recommended that"
+msgstr "##1 Es wird dringend empfohlen,"
 
-#: src/commandhandler.cpp:131 src/commandhandler.cpp:317
-msgid "Unknown command."
-msgstr "Unbekannter Befehl."
+#: ../src/gui/updatewindow.cpp:417
+msgid "##1  The update process is incomplete."
+msgstr "##1 Update wurde nicht erfolgreich abgeschlossen."
 
-#: src/commandhandler.cpp:160
-msgid "-- Help --"
-msgstr "-- Hilfe --"
+#: ../src/gui/updatewindow.cpp:421
+#, fuzzy
+msgid "##1  you try again later."
+msgstr "##1 es später erneut zu versuchen."
 
-#: src/commandhandler.cpp:161
-msgid "/help > Display this help"
-msgstr "/help > diese Hilfe anzeigen"
+#: ../src/net/tmwa/generalhandler.cpp:241
+#, no-c-format
+msgid "% Accuracy"
+msgstr "% Accuracy"
 
-#: src/commandhandler.cpp:163
-msgid "/where > Display map name"
-msgstr "/where > Zeige den Namen der aktuellen Karte"
+#: ../src/net/tmwa/generalhandler.cpp:243
+#, no-c-format
+msgid "% Critical"
+msgstr "% Critical"
 
-#: src/commandhandler.cpp:164
-msgid "/who > Display number of online users"
-msgstr "/who > Zeige Anzahl der angemeldeten Spieler"
+#: ../src/net/tmwa/generalhandler.cpp:242
+#, no-c-format
+msgid "% Evade"
+msgstr "% Evade"
 
-#: src/commandhandler.cpp:165
-msgid "/me > Tell something about yourself"
-msgstr "/me > Erzähle etwas über Dich"
+#: ../src/gui/debugwindow.cpp:61 ../src/gui/debugwindow.cpp:64
+#, c-format
+msgid "%d FPS"
+msgstr "%d FPS"
 
-#: src/commandhandler.cpp:167
-msgid "/clear > Clears this window"
-msgstr "/clear > Löscht den Inhalt dieses Fensters"
+#: ../src/gui/debugwindow.cpp:56
+#, c-format
+msgid "%d FPS (OpenGL)"
+msgstr "%d FPS (OpenGL)"
 
-#: src/commandhandler.cpp:169
-msgid "/msg > Send a private message to a user"
-msgstr "/msg > Sende eine private Nachricht an einen Benutzer"
+#: ../src/client.cpp:1154 ../src/client.cpp:1182
+#, c-format
+msgid "%s doesn't exist and can't be created! Exiting."
+msgstr "%s existiert nicht und kann nicht erstellt werden! Beende."
 
-#: src/commandhandler.cpp:170
-msgid "/whisper > Alias of msg"
-msgstr "/whisper > Ersatz für msg"
+#: ../src/net/manaserv/chathandler.cpp:306
+#, c-format
+msgid "%s entered the channel."
+msgstr "%s ist dem Kanal beigetreten."
 
-#: src/commandhandler.cpp:171
-msgid "/w > Alias of msg"
-msgstr "/w > Ersatz für msg"
+#: ../src/gui/socialwindow.cpp:601
+#, c-format
+msgid "%s has invited you to join the %s party."
+msgstr "%s hat dich eingeladen, an der Party %s teilzunehmen."
 
-#: src/commandhandler.cpp:172
-msgid "/query > Makes a tab for private messages with another user"
-msgstr ""
-"/query > Öffnet einen Tab für private Nachrichten mit einem anderen Benutzer"
+#: ../src/gui/socialwindow.cpp:558
+#, c-format
+msgid "%s has invited you to join the guild %s."
+msgstr "%s hat Dich eingeladen, seiner Gilde %s beizutreten."
 
-#: src/commandhandler.cpp:174
-msgid "/q > Alias of query"
-msgstr "/q > Ersatz für query"
+#: ../src/gui/socialwindow.cpp:596
+#, c-format
+msgid "%s has invited you to join their party."
+msgstr "%s hat dich in seine Party eingeladen."
 
-#: src/commandhandler.cpp:181
-msgid "/away > Tell the other whispering players you're away from keyboard."
-msgstr ""
-"/away > Teilt den anderen flüsternden Spielern deine Abwesenheit von der "
-"Tastatur mit."
+#: ../src/net/manaserv/chathandler.cpp:337
+#, c-format
+msgid "%s has kicked %s."
+msgstr "%s hat %s gekickt."
 
-#: src/commandhandler.cpp:184
-msgid "/ignore > ignore a player"
-msgstr "/ignore > Ignoriere einen Spieler"
+#: ../src/net/tmwa/partyhandler.cpp:246
+#, c-format
+msgid "%s has left your party."
+msgstr "%s hat Deine Party verlassen."
 
-#: src/commandhandler.cpp:177
-msgid "/unignore > stop ignoring a player"
-msgstr "/unignore > Ignorierung eines Spielers aufheben"
+#: ../src/net/manaserv/chathandler.cpp:327
+#, c-format
+msgid "%s has set mode %s on user %s."
+msgstr "%s hat den Modus %s auf den Spieler %s gesetzt."
 
-#: src/commandhandler.cpp:179
-msgid "/list > Display all public channels"
-msgstr "/list > Zeige alle öffentlichen Kanäle"
+#: ../src/net/tmwa/partyhandler.cpp:119
+#, c-format
+msgid "%s is already a member of a party."
+msgstr "%s ist bereits Mitglied einer Party."
 
-#: src/commandhandler.cpp:180
-msgid "/join > Join or create a channel"
-msgstr "/join > Trete einem Kanal bei oder erstelle einen neuen Kanal"
+#: ../src/net/tmwa/partyhandler.cpp:368
+#, c-format
+msgid "%s is not in your party!"
+msgstr "%s ist nicht in Deiner Party!"
 
-#: src/commandhandler.cpp:182
-#, fuzzy
-msgid "/createparty > Create a new party"
-msgstr "/create > Erstelle eine neue Party"
+#: ../src/net/tmwa/partyhandler.cpp:127
+#, c-format
+msgid "%s is now a member of your party."
+msgstr "%s ist nun Mitglied Deiner Party."
 
-#: src/commandhandler.cpp:183
-msgid "/party > Invite a user to party"
-msgstr "/party > Lade einen Benutzer zu deiner Party ein"
+#: ../src/net/manaserv/partyhandler.cpp:105
+#, c-format
+msgid "%s joined the party."
+msgstr "%s ist der Party beigetreten."
 
-#: src/commandhandler.cpp:185
-msgid "/record > Start recording the chat to an external file"
-msgstr "/record > Starte die Aufzeichnung des Chats in eine Datei"
+#: ../src/net/manaserv/chathandler.cpp:311
+#, c-format
+msgid "%s left the channel."
+msgstr "%s hat den Channel verlassen."
 
-#: src/commandhandler.cpp:187
-msgid "/toggle > Determine whether <return> toggles the chat log"
-msgstr "/toggle > Entscheide, ob <return> den Chat-Dialog schließt"
+#: ../src/net/tmwa/partyhandler.cpp:123
+#, c-format
+msgid "%s refused your invitation."
+msgstr "%s hat Deine Einladung zurückgewiesen."
 
-#: src/commandhandler.cpp:189
-msgid "/present > Get list of players present (sent to chat log, if logging)"
-msgstr ""
-"/present > Liste anwesender Spieler (wird im Chat-log aufgezeichnet, falls "
-"das Log aktiviert ist)"
+#: ../src/net/manaserv/partyhandler.cpp:123
+#, c-format
+msgid "%s rejected your invite."
+msgstr "%s hat Deine Einladung zurückgewiesen."
 
-#: src/commandhandler.cpp:192
-msgid "/announce > Global announcement (GM only)"
-msgstr "/announce > Globale Ansage (Nur von GMs nutzbar)"
+#: ../src/net/manaserv/tradehandler.cpp:116
+#: ../src/net/tmwa/tradehandler.cpp:110
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr "%s möchte mit dir handeln, stimmst Du zu?"
 
-#: src/commandhandler.cpp:196
-msgid "For more information, type /help <command>."
-msgstr "Für mehr Informationen, gib /help <Befehl> ein."
+#: ../src/gui/widgets/chattab.cpp:153
+#, fuzzy, c-format
+msgid "%s whispers: %s"
+msgstr "%s flüstert: "
 
-#: src/commandhandler.cpp:200
-msgid "Command: /help"
-msgstr "Befehl: /help"
+#: ../src/gui/charselectdialog.cpp:418 ../src/gui/charselectdialog.cpp:419
+msgid "(empty)"
+msgstr "(leer)"
 
-#: src/commandhandler.cpp:201
-msgid "This command displays a list of all commands available."
-msgstr "Dieser Befehl zeigt alle möglichen Befehle an"
+#: ../src/commandhandler.cpp:221
+msgid "*** only available to a GM ***"
+msgstr "*** Nur für GMs verfügbar ***"
 
-#: src/commandhandler.cpp:203
-msgid "Command: /help <command>"
-msgstr "Befehl: /help <Befehl>"
+#: ../src/gui/buy.cpp:74 ../src/gui/itemamount.cpp:112
+#: ../src/gui/npcdialog.cpp:124 ../src/gui/sell.cpp:74
+#: ../src/gui/statuswindow.cpp:464
+msgid "+"
+msgstr "+"
 
-#: src/commandhandler.cpp:204
-msgid "This command displays help on <command>."
-msgstr "Dieser Befehl zeigt die Hilfe für <Befehl>."
+#: ../src/gui/buy.cpp:77 ../src/gui/itemamount.cpp:111
+#: ../src/gui/npcdialog.cpp:125 ../src/gui/sell.cpp:75
+#: ../src/gui/statuswindow.cpp:476
+msgid "-"
+msgstr "-"
 
-#: src/commandhandler.cpp:212
-msgid "Command: /announce <msg>"
-msgstr "Befehl: /announce <Nachricht>"
+#: ../src/commandhandler.cpp:165
+msgid "-- Help --"
+msgstr "-- Hilfe --"
 
-#: src/commandhandler.cpp:213
-msgid "*** only available to a GM ***"
-msgstr "*** Nur für GMs verfügbar ***"
+#: ../src/commandhandler.cpp:200
+msgid "/announce > Global announcement (GM only)"
+msgstr "/announce > Globale Ansage (Nur von GMs nutzbar)"
 
-#: src/commandhandler.cpp:214
-msgid "This command sends the message <msg> to all players currently online."
+#: ../src/commandhandler.cpp:181
+msgid "/away > Tell the other whispering players you're away from keyboard."
 msgstr ""
-"Dieser Befehl versendet die Nachricht <Nachricht> an alle Spieler die gerade "
-"online sind."
+"/away > Teilt den anderen flüsternden Spielern deine Abwesenheit von der "
+"Tastatur mit."
 
-#: src/commandhandler.cpp:219
-msgid "Command: /clear"
-msgstr "Befehl: /clear"
+#: ../src/commandhandler.cpp:172
+msgid "/clear > Clears this window"
+msgstr "/clear > Löscht den Inhalt dieses Fensters"
 
-#: src/commandhandler.cpp:220
-msgid "This command clears the chat log of previous chat."
-msgstr "Dieser Befehl bereinigt den Chatlog des vorherigen Chats."
+#: ../src/gui/widgets/whispertab.cpp:74
+msgid "/close > Close the whisper tab"
+msgstr "/close > Schließe einen privaten Tab"
 
-#: src/commandhandler.cpp:224
-msgid "Command: /ignore <player>"
-msgstr "Befehl: /item <Wert>"
+#: ../src/commandhandler.cpp:190
+#, fuzzy
+msgid "/createparty > Create a new party"
+msgstr "/create > Erstelle eine neue Party"
 
-#: src/commandhandler.cpp:225
-msgid "This command ignores the given player regardless of current relations."
-msgstr "Dieser Befehl zeigt die Anzahl der Spieler an, die gerade online sind."
+#: ../src/net/tmwa/gui/partytab.cpp:64
+msgid "/exp > Show/change party experience sharing options"
+msgstr ""
+"/exp > Zeige oder ändere die Optionen zum Teilen der Erfahrungspunkte in der "
+"Party"
 
-#: src/commandhandler.cpp:230
-msgid "Command: /join <channel>"
-msgstr "Befehl: /join <Kanal>"
+#: ../src/commandhandler.cpp:166
+msgid "/help > Display this help"
+msgstr "/help > diese Hilfe anzeigen"
 
-#: src/commandhandler.cpp:231
-msgid "This command makes you enter <channel>."
-msgstr "Dieser Befehl lässt dich dem Kanal <Kanal> beitreten."
+#: ../src/net/tmwa/gui/guildtab.cpp:61 ../src/net/tmwa/gui/partytab.cpp:59
+msgid "/help > Display this help."
+msgstr "/help > Diese Hilfe anzeigen"
 
-#: src/commandhandler.cpp:232
-msgid "If <channel> doesn't exist, it's created."
-msgstr "Falls Kanal <Kanal> nicht existiert, wird er erstellt."
+#: ../src/gui/widgets/whispertab.cpp:72
+msgid "/ignore > Ignore the other player"
+msgstr "/ignore > Anderen Spieler ignorieren"
 
-#: src/commandhandler.cpp:236
-msgid "Command: /list"
-msgstr "Befehl: /list"
+#: ../src/commandhandler.cpp:184
+msgid "/ignore > ignore a player"
+msgstr "/ignore > Ignoriere einen Spieler"
 
-#: src/commandhandler.cpp:237
-msgid "This command shows a list of all channels."
-msgstr "Dieser Befehl zeigt eine liste aller Kanäle an."
+#: ../src/net/tmwa/gui/guildtab.cpp:62
+#, fuzzy
+msgid "/invite > Invite a player to your guild"
+msgstr "/invite > Lade einen Spieler zu Deiner Party ein"
 
-#: src/commandhandler.cpp:241
-msgid "Command: /me <message>"
-msgstr "Befehl: /me <Nachricht>"
+#: ../src/net/tmwa/gui/partytab.cpp:60
+msgid "/invite > Invite a player to your party"
+msgstr "/invite > Lade einen Spieler zu Deiner Party ein"
 
-#: src/commandhandler.cpp:242
-msgid "This command tell others you are (doing) <msg>."
-msgstr "Dieser Befehl zeigt eine Aktion <Nachricht> an."
+#: ../src/net/tmwa/gui/partytab.cpp:63
+msgid "/item > Show/change party item sharing options"
+msgstr ""
+"/item > Zeige oder ändere die Optionen zum Teilen der Gegenstände in der "
+"Party"
 
-#: src/commandhandler.cpp:246
-msgid "Command: /msg <nick> <message>"
-msgstr "Befehl: /msg <Name> <Nachricht>"
+#: ../src/commandhandler.cpp:188
+msgid "/join > Join or create a channel"
+msgstr "/join > Trete einem Kanal bei oder erstelle einen neuen Kanal"
 
-#: src/commandhandler.cpp:247
-msgid "Command: /whisper <nick> <message>"
-msgstr "Befehl: /whisper <Name> <Nachricht>"
+#: ../src/gui/widgets/channeltab.cpp:53
+msgid "/kick > Kick a user from the channel"
+msgstr "/kick > Werfe einen Spieler aus dem Kanal"
 
-#: src/commandhandler.cpp:248
-msgid "Command: /w <nick> <message>"
-msgstr "Befehl: /w <Name> <Nachricht>"
+#: ../src/net/tmwa/gui/guildtab.cpp:64
+#, fuzzy
+msgid "/kick > Kick some one from the guild you are in"
+msgstr "/kick > Werfe jemanden aus Deiner Party"
 
-#: src/commandhandler.cpp:249
-msgid "This command sends the text <message> to <nick>."
-msgstr "Dieser Befehl sendet den Text <Nachricht> an den Spieler <Name>."
+#: ../src/net/tmwa/gui/partytab.cpp:62
+msgid "/kick > Kick some one from the party you are in"
+msgstr "/kick > Werfe jemanden aus Deiner Party"
 
-#: src/commandhandler.cpp:250 src/commandhandler.cpp:269
-#: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
-#: src/net/tmwa/gui/guildtab.cpp:75 src/net/tmwa/gui/partytab.cpp:75
-msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
-msgstr ""
-"Wenn im Namen <Name> Leerzeichen vorkommen, setze ihn in Anführungszeichen "
-"(\")."
+#: ../src/net/tmwa/gui/guildtab.cpp:63
+#, fuzzy
+msgid "/leave > Leave the guild you are in"
+msgstr "/leave > Verlasse die Party, in der Du Mitglied bist"
 
-#: src/commandhandler.cpp:255
-msgid "Command: /query <nick>"
-msgstr "Befehl: /query <Name>"
+#: ../src/net/tmwa/gui/partytab.cpp:61
+msgid "/leave > Leave the party you are in"
+msgstr "/leave > Verlasse die Party, in der Du Mitglied bist"
 
-#: src/commandhandler.cpp:256
-msgid "Command: /q <nick>"
-msgstr "Befehl: /q <Name>"
+#: ../src/commandhandler.cpp:187
+msgid "/list > Display all public channels"
+msgstr "/list > Zeige alle öffentlichen Kanäle"
 
-#: src/commandhandler.cpp:257
-msgid "This command tries to make a tab for whispers betweenyou and <nick>."
+#: ../src/commandhandler.cpp:170
+msgid "/me > Tell something about yourself"
+msgstr "/me > Erzähle etwas über Dich"
+
+#: ../src/commandhandler.cpp:174
+msgid "/msg > Send a private message to a user"
+msgstr "/msg > Sende eine private Nachricht an einen Benutzer"
+
+#: ../src/gui/widgets/channeltab.cpp:52
+msgid "/op > Make a user a channel operator"
+msgstr "/op > Ernenne einen Spieler zum Kanalmoderator"
+
+#: ../src/commandhandler.cpp:191
+msgid "/party > Invite a user to party"
+msgstr "/party > Lade einen Benutzer zu deiner Party ein"
+
+#: ../src/commandhandler.cpp:197
+msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
-"Dieser Befehl erstellt einen neuen Tab für private Nachrichten zwischen Dir "
-"und Spieler <Name>."
+"/present > Liste anwesender Spieler (wird im Chat-log aufgezeichnet, falls "
+"das Log aktiviert ist)"
 
-#: src/commandhandler.cpp:270
-#, fuzzy
-msgid "Command: /away <afk reason>"
-msgstr "Befehl: /w <Name> <Nachricht>"
+#: ../src/commandhandler.cpp:179
+msgid "/q > Alias of query"
+msgstr "/q > Ersatz für query"
 
-#: src/commandhandler.cpp:271
-msgid "This command tells you're away from keyboard with the given reason."
-msgstr "Dieser Befehl teilt deine Abwesenheit und deren angegebenen Grund mit."
+#: ../src/commandhandler.cpp:177
+msgid "/query > Makes a tab for private messages with another user"
+msgstr ""
+"/query > Öffnet einen Tab für private Nachrichten mit einem anderen Benutzer"
 
-#: src/commandhandler.cpp:273
-#, fuzzy
-msgid "Command: /away"
-msgstr "Befehl: /who"
+#: ../src/gui/widgets/channeltab.cpp:51
+msgid "/quit > Leave a channel"
+msgstr "/quit > Verlasse einen Kanal"
 
-#: src/commandhandler.cpp:274
-#, fuzzy
-msgid "This command clears the away status and message."
-msgstr "Dieser Befehl setzt das Theme auf <Thema>."
+#: ../src/commandhandler.cpp:193
+msgid "/record > Start recording the chat to an external file"
+msgstr "/record > Starte die Aufzeichnung des Chats in eine Datei"
 
-#: src/commandhandler.cpp:278
-#, fuzzy
-msgid "Command: /createparty <name>"
-msgstr "Befehl: /create <Party-Name>"
+#: ../src/commandhandler.cpp:195
+msgid "/toggle > Determine whether <return> toggles the chat log"
+msgstr "/toggle > Entscheide, ob <return> den Chat-Dialog schließt"
 
-#: src/commandhandler.cpp:263
-#, fuzzy
-msgid "This command creates a new party called <name>."
-msgstr "Dieser Befehl erstellt eine neue Party mit dem Namen <Party-Name>"
+#: ../src/gui/widgets/channeltab.cpp:50
+msgid "/topic > Set the topic of the current channel"
+msgstr "/topic > Setze das Thema des aktuellen Kanals"
 
-#: src/commandhandler.cpp:267
-msgid "Command: /party <nick>"
-msgstr "Befehl: /party <Name>"
+#: ../src/gui/widgets/whispertab.cpp:73
+msgid "/unignore > Stop ignoring the other player"
+msgstr "/unignore > Anderen Spieler nicht mehr ignorieren"
 
-#: src/commandhandler.cpp:268 src/net/tmwa/gui/partytab.cpp:74
-msgid "This command invites <nick> to party with you."
-msgstr "Dieser Befehl lädt Spieler <Name> zu einer Party mit Dir ein."
+#: ../src/commandhandler.cpp:185
+msgid "/unignore > stop ignoring a player"
+msgstr "/unignore > Ignorierung eines Spielers aufheben"
 
-#: src/commandhandler.cpp:274
-msgid "Command: /present"
-msgstr "Befehl: /present"
+#: ../src/gui/widgets/channeltab.cpp:49
+msgid "/users > Lists the users in the current channel"
+msgstr "/users > Zeigt eine Liste der Spieler im aktuellen Kanal"
 
-#: src/commandhandler.cpp:275
-msgid ""
-"This command gets a list of players within hearing and sends it to either "
-"the record log if recording, or the chat log otherwise."
-msgstr ""
-"Dieser Befehl erstellt eine Liste mit allen Spielern in Hörreichweite und "
-"sendet sie entweder an das Chatlog, falls aktiviert, oder zeigt sie im "
-"Chatfenster an."
+#: ../src/commandhandler.cpp:176
+msgid "/w > Alias of msg"
+msgstr "/w > Ersatz für msg"
 
-#: src/commandhandler.cpp:281
-msgid "Command: /record <filename>"
-msgstr "Befehl: /record <Dateiname>"
+#: ../src/commandhandler.cpp:168
+msgid "/where > Display map name"
+msgstr "/where > Zeige den Namen der aktuellen Karte"
 
-#: src/commandhandler.cpp:282
-msgid "This command starts recording the chat log to the file <filename>."
-msgstr ""
-"Dieser Befehl startet den Mitschnitt des Chats (Chatlog) in die Datei "
-"<Dateiname>."
+#: ../src/commandhandler.cpp:175
+msgid "/whisper > Alias of msg"
+msgstr "/whisper > Ersatz für msg"
 
-#: src/commandhandler.cpp:284
-msgid "Command: /record"
-msgstr "Befehl: /record"
+#: ../src/commandhandler.cpp:169
+msgid "/who > Display number of online users"
+msgstr "/who > Zeige Anzahl der angemeldeten Spieler"
 
-#: src/commandhandler.cpp:285
-msgid "This command finishes a recording session."
-msgstr "Dieser Befehl beendet den Mitschnitt des Chats."
+#: ../src/gui/charcreatedialog.cpp:73 ../src/gui/charcreatedialog.cpp:76
+#: ../src/gui/outfitwindow.cpp:66
+msgid "<"
+msgstr "<"
 
-#: src/commandhandler.cpp:289
-msgid "Command: /toggle <state>"
-msgstr "Befehl: /toggle <Status>"
+#: ../src/net/tmwa/gui/partytab.cpp:97
+msgid ""
+"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
+"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
+msgstr ""
+"Gültige Werte für <Wert> sind: \"1\",\"yes\",\"true\" um das Teilen zu "
+"erlauben, \"0\",\"no\",\"false\" verbieten es."
 
-#: src/commandhandler.cpp:290
+#: ../src/net/tmwa/gui/partytab.cpp:87
 msgid ""
-"This command sets whether the return key should toggle the chat log, or "
-"whether the chat log turns off automatically."
+"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
+"\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
-"Mit diesem Befehl kannst Du entscheiden, ob die Chatzeile schließt, sobald "
-"eine Nachricht gesendet wurde, oder erst nachdem die Enter-Taste erneut "
-"gedrückt wurde."
+"<Wert> darf enthalten: \"1\",\"yes\" oder \"true\" um das Teilen von "
+"Gegenständen zu erlauben, \"0\",\"no\" oder \"false\" um es zu verbieten."
 
-#: src/commandhandler.cpp:292
+#: ../src/commandhandler.cpp:308
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
 "\"0\", \"no\", \"false\" to turn the toggle off."
@@ -439,4050 +471,4189 @@ msgstr ""
 "<Status> \"1\",\"yes\",\"true\" aktiviert das Schließen durch Enter,  \"0\","
 "\"no\",\"false\" deaktiviert es."
 
-#: src/commandhandler.cpp:295
-msgid "Command: /toggle"
-msgstr "Befehl: /toggle"
+#: ../src/gui/charcreatedialog.cpp:70 ../src/gui/charcreatedialog.cpp:75
+#: ../src/gui/outfitwindow.cpp:67
+msgid ">"
+msgstr ">"
 
-#: src/commandhandler.cpp:296
-msgid "This command displays the return toggle status."
-msgstr "Dieser Befehl zeigt, wann sich die Chatzeile schließt."
+#: ../src/gui/setup_players.cpp:206 ../src/gui/setup_video.cpp:147
+msgid "???"
+msgstr "???"
 
-#: src/commandhandler.cpp:300 src/gui/widgets/whispertab.cpp:95
+#: ../src/gui/socialwindow.cpp:563
+msgid "Accept Guild Invite"
+msgstr "Nehme Gildeneinladung an"
+
+#: ../src/gui/socialwindow.cpp:609
+msgid "Accept Party Invite"
+msgstr "Nehme Partyeinladung an"
+
+#: ../src/gui/socialwindow.cpp:463
 #, fuzzy
-msgid "Command: /unignore <player>"
-msgstr "Befehl: /item <Wert>"
+msgid "Accepted guild invite"
+msgstr "Nehme Gildeneinladung an"
 
-#: src/commandhandler.cpp:301
-msgid "This command stops ignoring the given player if they are being ignored"
-msgstr ""
-"Dieser Befehl hebt die Ignorierung des angegeben ignorierten Spieler auf."
+#: ../src/gui/socialwindow.cpp:444
+#, fuzzy, c-format
+msgid "Accepted party invite from %s."
+msgstr "Partyeinladung von %s angenommen."
 
-#: src/commandhandler.cpp:306
-msgid "Command: /where"
-msgstr "Befehl: /where"
+#: ../src/game.cpp:738
+msgid "Accepting incoming trade requests"
+msgstr "Akzeptiere eingehende Handelsanfragen"
 
-#: src/commandhandler.cpp:307
-msgid "This command displays the name of the current map."
-msgstr "Dieser Befehl zeigt den Namen der aktuellen Karte an."
+#: ../src/net/manaserv/tradehandler.cpp:95
+msgid "Accepting incoming trade requests."
+msgstr "Akzeptiere eingehende Handelsanfragen."
 
-#: src/commandhandler.cpp:311
-msgid "Command: /who"
-msgstr "Befehl: /who"
+#: ../src/net/tmwa/charserverhandler.cpp:103
+msgid "Access denied. Most likely, there are too many players on this server."
+msgstr "Zugriff verweigert. Wahrscheinlich zu viele Spieler auf dem Server."
 
-#: src/commandhandler.cpp:312
-msgid "This command displays the number of players currently online."
-msgstr "Dieser Befehl zeigt die Anzahl der Spieler an, die gerade online sind."
+#: ../src/gui/charselectdialog.cpp:120
+msgid "Account and Character Management"
+msgstr "Account- und Charakterverwaltung"
 
-#: src/commandhandler.cpp:318
-msgid "Type /help for a list of commands."
-msgstr "Gib /help ein, um eine Liste der Befehle zu erhalten."
+#: ../src/net/manaserv/loginhandler.cpp:272
+#, fuzzy
+msgid "Account banned"
+msgstr "Account abgelaufen"
 
-#: src/commandhandler.cpp:384
-msgid "Cannot send empty whispers!"
-msgstr "Kann keine leeren Nachrichten versenden!"
+#: ../src/net/manaserv/loginhandler.cpp:93
+#, fuzzy
+msgid "Account banned."
+msgstr "Account abgelaufen"
+
+#: ../src/net/tmwa/loginhandler.cpp:162
+msgid "Account expired."
+msgstr "Account abgelaufen"
+
+#: ../src/net/manaserv/loginhandler.cpp:124
+#: ../src/net/manaserv/loginhandler.cpp:155
+msgid "Account not connected. Please login first."
+msgstr "Account nicht verbunden. Bitte melde Dich zuerst an."
 
-#: src/commandhandler.cpp:392
+#: ../src/net/tmwa/loginhandler.cpp:86
+msgid "Account was not found. Please re-login."
+msgstr "Account konnte nicht gefunden werden. Bitte melde dich erneut an."
+
+#: ../src/gui/changeemaildialog.cpp:49 ../src/gui/changepassworddialog.cpp:52
 #, c-format
-msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
-"you."
+msgid "Account: %s"
+msgstr "Account: %s"
+
+#: ../src/gui/inventorywindow.cpp:106 ../src/gui/popupmenu.cpp:369
+msgid "Activate"
 msgstr ""
-"Kann keinen tab für Spieler \"%s\" erstellen! Entweder existiert bereits "
-"einer, oder der Spieler bist du."
 
-#: src/commandhandler.cpp:406
-#, c-format
-msgid "Requesting to join channel %s."
-msgstr "Erbitte Erlaubnis, Kanal %s betreten zu dürfen."
+#: ../src/gui/trade.cpp:76
+msgid "Add"
+msgstr "Hinzufügen"
 
-#: src/commandhandler.cpp:419 src/net/tmwa/gui/partytab.cpp:109
-msgid "Party name is missing."
-msgstr "Name der Party fehlt."
+#: ../src/gui/popupmenu.cpp:171
+msgid "Add name to chat"
+msgstr "Füge Namen zu Chat hinzu"
 
-#: src/commandhandler.cpp:432 src/commandhandler.cpp:509
-#: src/commandhandler.cpp:531
-msgid "Please specify a name."
-msgstr "Bitte gib einen Namen an."
+#: ../src/gui/popupmenu.cpp:190 ../src/gui/popupmenu.cpp:387
+msgid "Add to chat"
+msgstr "Zu Chat hinzufügen"
 
-#: src/commandhandler.cpp:450
-msgid "Return toggles chat."
-msgstr "Enter-Taste schließt Chatzeile."
+#: ../src/net/manaserv/attributes.cpp:179
+#: ../src/net/tmwa/generalhandler.cpp:231
+msgid "Agility"
+msgstr "Beweglichkeit"
 
-#: src/commandhandler.cpp:450
-msgid "Message closes chat."
-msgstr "Nachricht schließt Chatzeile."
+#: ../src/net/manaserv/attributes.cpp:186
+#, fuzzy, c-format
+msgid "Agility %+.1f"
+msgstr "Beweglichkeit %+d"
 
-#: src/commandhandler.cpp:459
-msgid "Return now toggles chat."
-msgstr "Jetzt schließt Enter die Chatzeile."
+#: ../src/net/tmwa/generalhandler.cpp:103
+#, c-format
+msgid "Agility %+d"
+msgstr "Beweglichkeit %+d"
 
-#: src/commandhandler.cpp:463
-msgid "Message now closes chat."
-msgstr "Jetzt schließt jede Nachricht die Chatzeile."
+#: ../src/net/tmwa/charserverhandler.cpp:271
+msgid "Agility:"
+msgstr "Agilität:"
 
-#: src/commandhandler.cpp:476 src/commandhandler.cpp:489
-msgid "Show IP: On"
-msgstr "IP Anzeige: An"
+#: ../src/gui/trade.cpp:55
+msgid "Agree trade"
+msgstr "Handel zustimmen"
 
-#: src/commandhandler.cpp:476 src/commandhandler.cpp:485
-msgid "Show IP: Off"
-msgstr "IP Anzeige: Aus"
+#: ../src/gui/trade.cpp:56
+msgid "Agreed. Waiting..."
+msgstr "Zugestimmt. Warten..."
 
-#: src/commandhandler.cpp:515
-msgid "Player already ignored!"
-msgstr "Spieler wird bereits ignoriert!"
+#: ../src/gui/itemamount.cpp:115
+msgid "All"
+msgstr "Alle"
 
-#: src/commandhandler.cpp:522
-#, fuzzy
-msgid "Player successfully ignored!"
-msgstr "Party erfolgreich erstellt."
+#: ../src/gui/setup_players.cpp:225
+msgid "Allow trading"
+msgstr "Handeln erlauben"
 
-#: src/commandhandler.cpp:524
-#, fuzzy
-msgid "Player could not be ignored!"
-msgstr ""
-"Nachricht konnte nicht gesendet werden, sie wurde vom Spieler ignoriert."
+#: ../src/gui/setup_players.cpp:227
+msgid "Allow whispers"
+msgstr "Flüstern erlauben"
 
-#: src/commandhandler.cpp:539
-msgid "Player wasn't ignored!"
-msgstr "Spieler wurde nicht ignoriert!"
+#: ../src/net/manaserv/loginhandler.cpp:90
+#: ../src/net/manaserv/loginhandler.cpp:269
+msgid "Already logged in."
+msgstr "Bereits angemeldet"
 
-#: src/commandhandler.cpp:544
-msgid "Player no longer ignored!"
-msgstr "Spieler wird nicht länger ignoriert!"
+#: ../src/gui/recorder.cpp:96
+msgid "Already recording."
+msgstr "Es läuft bereits eine Aufzeichnung."
 
-#: src/commandhandler.cpp:546
-#, fuzzy
-msgid "Player could not be unignored!"
-msgstr ""
-"Nachricht konnte nicht gesendet werden, sie wurde vom Spieler ignoriert."
+#: ../src/gui/setup_video.cpp:254
+msgid "Ambient FX"
+msgstr "Hintergrundeffekte"
 
-#: src/commandhandler.h:31
+#: ../src/gui/debugwindow.cpp:121
 #, c-format
-msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr ""
-"Gültige Optionen für /%s sind \"yes\",\"no\",\"true\",\"false\",\"1\",\"0\"."
+msgid "Ambient FX: %s"
+msgstr "Hintergrundeffekte: %s"
 
-#: src/game.cpp:172
-msgid "General"
-msgstr "Öffentlich"
+#: ../src/net/tmwa/partyhandler.cpp:299
+#, c-format
+msgid "An unknown member tried to say: %s"
+msgstr "Ein unbekanntes Mitglied hat versucht, \"%s\" zu sagen."
 
-#: src/game.cpp:342
-#, fuzzy
-msgid "Screenshot saved as "
-msgstr "Bildschirmfoto wurde nach ~/ gespeichert."
+#: ../src/net/manaserv/beinghandler.cpp:296
+#: ../src/net/tmwa/playerhandler.cpp:112
+msgid "Annihilated."
+msgstr "Vernichtet."
 
-#: src/game.cpp:347
-msgid "Saving screenshot failed!"
-msgstr "Bildschirmfoto konnte nicht gespeichert werden!"
+#: ../src/gui/setup.cpp:51
+msgid "Apply"
+msgstr "Anwenden"
 
-#: src/game.cpp:378
-#, fuzzy
-msgid "The connection to the server was lost."
+#: ../src/gui/setup_video.cpp:461
+msgid "Applying change to OpenGL requires restart."
 msgstr ""
-"Die Verbindung zum Server wurde getrennt, das Programm wird jetzt beendet"
+"Änderungen an OpenGL werden erst nach einem Neustart der Anwendung "
+"übernommen."
 
-#: src/game.cpp:382
-msgid "Network Error"
-msgstr "Netzwerkfehler"
+#: ../src/gui/setup_video.cpp:453
+msgid ""
+"Applying change to OpenGL requires restart. In case OpenGL messes up your "
+"game graphics, restart the game with the command line option \"--no-opengl\"."
+msgstr ""
+"Der Wechsel zu OpenGL erfordert einen Neustart. Falls mit OpenGL Grafiken "
+"fehlerhaft dargestellt werden sollten bitte das Spiel mit der "
+"Kommandozeilenoption \"--no-opengl\" neustarten."
 
-#: src/game.cpp:721
-msgid "Ignoring incoming trade requests"
-msgstr "Ignoriere eingehende Handelsanfragen"
+#: ../src/gui/charselectdialog.cpp:73
+msgid "Are you sure you want to delete this character?"
+msgstr "Bist Du sicher, dass du diesen Charakter löschen möchtest?"
 
-#: src/game.cpp:726
-msgid "Accepting incoming trade requests"
-msgstr "Akzeptiere eingehende Handelsanfragen"
+#: ../src/gui/socialwindow.cpp:164
+#, fuzzy, c-format
+msgid "Are you sure you want to leave guild %s?"
+msgstr "Bist Du sicher, dass Du das Spiel verlassen möchtest?"
 
-#: src/game.cpp:954
-#, fuzzy
-msgid "Could Not Load Map"
-msgstr "Karte konnte nicht geladen werden"
+#: ../src/gui/socialwindow.cpp:243
+#, fuzzy, c-format
+msgid "Are you sure you want to leave party %s?"
+msgstr "Bist Du sicher, dass Du das Spiel verlassen möchtest?"
+
+#: ../src/gui/setup_keyboard.cpp:86
+msgid "Assign"
+msgstr "Zuordnen"
 
-#: src/game.cpp:955
+#: ../src/net/manaserv/charhandler.cpp:165
 #, c-format
-msgid "Error while loading %s"
-msgstr "Fehler beim Laden von %s"
+msgid "At least one statis out of the permitted range: (%u - %u)."
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:43 ../src/net/tmwa/generalhandler.cpp:237
+msgid "Attack"
+msgstr "Angriff"
+
+#: ../src/resources/itemdb.cpp:310
+#, c-format
+msgid "Attack %+d"
+msgstr "Angriff %+d"
 
-#: src/gui/beingpopup.cpp:76
+#: ../src/gui/popupmenu.cpp:87 ../src/gui/popupmenu.cpp:158
 #, fuzzy, c-format
-msgid "Party: %s"
-msgstr "Party (%s)"
+msgid "Attack %s"
+msgstr "Angriff %+d"
 
-#: src/gui/buy.cpp:49 src/gui/buy.cpp:78 src/gui/buysell.cpp:47
-msgid "Buy"
-msgstr "Kaufen"
+#: ../src/gui/chat.cpp:329
+msgid "Attendance written to record log."
+msgstr "Anwesenheitsliste wurde ins Chatprotokol geschrieben."
+
+#: ../src/gui/setup_audio.cpp:47
+msgid "Audio"
+msgstr "Audio"
+
+#: ../src/net/tmwa/generalhandler.cpp:132
+msgid "Authentication failed."
+msgstr "Authentifizierung fehlgeschlagen"
+
+#: ../src/localplayer.cpp:1030
+msgid "Away"
+msgstr "Abwesend"
 
-#: src/gui/buy.cpp:69 src/gui/buy.cpp:261 src/gui/sell.cpp:71
-#: src/gui/sell.cpp:288
+#: ../src/gui/popupmenu.cpp:100
 #, c-format
-msgid "Price: %s / Total: %s"
-msgstr "Preis: %s / Gesamt: %s"
+msgid "Befriend %s"
+msgstr "Sei Freund von %s"
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
-#. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:112 src/gui/npcdialog.cpp:124
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:463
-msgid "+"
-msgstr "+"
+#: ../src/resources/userpalette.cpp:91
+msgid "Being"
+msgstr "Aktionen"
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
-#. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:111 src/gui/npcdialog.cpp:125
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:475
-msgid "-"
-msgstr "-"
+#: ../src/net/tmwa/playerhandler.cpp:124
+msgid "Bereft of life, you rest in peace."
+msgstr "Des Lebens beraubt ruhst Du in Frieden."
 
-#: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:228
-#: src/keyboardconfig.cpp:102
-msgid "Quit"
-msgstr "Beenden"
+#: ../src/playerrelations.cpp:340
+msgid "Blink name"
+msgstr "Blinkender Name"
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:384
-#: src/gui/statuswindow.cpp:462 src/gui/statuswindow.cpp:496
-msgid "Max"
-msgstr "Max"
+#: ../src/gui/setup_colors.cpp:139
+msgid "Blue:"
+msgstr "Blau: "
 
-#: src/gui/buysell.cpp:38
-msgid "Shop"
-msgstr "Geschäft"
+#: ../src/gui/setup_video.cpp:160
+msgid "Bubbles with names"
+msgstr "Blasen mit Namen"
 
-#: src/gui/buysell.cpp:47 src/gui/sell.cpp:49 src/gui/sell.cpp:76
-msgid "Sell"
-msgstr "Verkaufen"
+#: ../src/gui/setup_video.cpp:159
+msgid "Bubbles, no names"
+msgstr "Blasen, keine Namen"
+
+#: ../src/gui/buy.cpp:49 ../src/gui/buy.cpp:78 ../src/gui/buysell.cpp:47
+msgid "Buy"
+msgstr "Kaufen"
+
+#: ../src/gui/setup_joystick.cpp:38 ../src/gui/setup_joystick.cpp:76
+msgid "Calibrate"
+msgstr "Kalibrieren"
 
-#: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
-#: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
-#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:114
-#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:175
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:389
-#: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:275 src/gui/textdialog.cpp:40
-#: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
+#: ../src/gui/buysell.cpp:47 ../src/gui/changeemaildialog.cpp:55
+#: ../src/gui/changepassworddialog.cpp:58 ../src/gui/charcreatedialog.cpp:79
+#: ../src/gui/connectiondialog.cpp:44 ../src/gui/itemamount.cpp:114
+#: ../src/gui/npcpostdialog.cpp:57 ../src/gui/popupmenu.cpp:175
+#: ../src/gui/popupmenu.cpp:194 ../src/gui/popupmenu.cpp:389
+#: ../src/gui/quitdialog.cpp:47 ../src/gui/register.cpp:74
+#: ../src/gui/setup.cpp:51 ../src/gui/socialwindow.cpp:275
+#: ../src/gui/textdialog.cpp:40 ../src/gui/unregisterdialog.cpp:56
+#: ../src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: src/gui/changeemaildialog.cpp:45 src/gui/changeemaildialog.cpp:54
-msgid "Change Email Address"
-msgstr "E-MailAdresse ändern"
-
-#: src/gui/changeemaildialog.cpp:49 src/gui/changepassworddialog.cpp:52
+#: ../src/commandhandler.cpp:421
 #, c-format
-msgid "Account: %s"
-msgstr "Account: %s"
+msgid ""
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
+"you."
+msgstr ""
+"Kann keinen tab für Spieler \"%s\" erstellen! Entweder existiert bereits "
+"einer, oder der Spieler bist du."
 
-#: src/gui/changeemaildialog.cpp:51
-msgid "Type new email address twice:"
-msgstr "Gib die neue E-Mailadresse zweimal ein:"
+#: ../src/gui/socialwindow.cpp:620
+msgid "Cannot create party. You are already in a party"
+msgstr "Konnte keine Partie erstellen. Du bist schon in einer Partie."
 
-#: src/gui/changeemaildialog.cpp:127
-#, c-format
-msgid "The new email address needs to be at least %d characters long."
-msgstr "Die neue E-Mailadresse muss aus mindestens %d Zeichen bestehen."
+#: ../src/net/tmwa/playerhandler.cpp:366
+msgid "Cannot raise skill!"
+msgstr "Kann Skill nicht erhöhen!"
 
-#: src/gui/changeemaildialog.cpp:134
-#, c-format
-msgid "The new email address needs to be less than %d characters long."
-msgstr "Die neue E-Mailadresse muss kürzer als %d Zeichen sein."
+#: ../src/gui/widgets/whispertab.cpp:53
+msgid "Cannot send empty chat!"
+msgstr "Kann keine leere Nachricht senden!"
 
-#: src/gui/changeemaildialog.cpp:141
-msgid "The email address entries mismatch."
-msgstr "Die neuen E-Mailadresse stimmen nicht überein."
+#: ../src/commandhandler.cpp:400
+msgid "Cannot send empty whispers!"
+msgstr "Kann keine leeren Nachrichten versenden!"
 
-#: src/gui/changepassworddialog.cpp:47 src/gui/changepassworddialog.cpp:56
-#: src/gui/charselectdialog.cpp:128
+#: ../src/net/tmwa/specialhandler.cpp:160
+msgid "Cannot shout!"
+msgstr "Kann nicht rufen!"
+
+#: ../src/net/tmwa/charserverhandler.cpp:107
+msgid "Cannot use this ID."
+msgstr "Kann diese ID nicht benutzen"
+
+#: ../src/gui/trade.cpp:103
+msgid "Change"
+msgstr "Ändern"
+
+#: ../src/gui/charselectdialog.cpp:154
+msgid "Change Email"
+msgstr "E-Mailadresse ändern"
+
+#: ../src/gui/changeemaildialog.cpp:45 ../src/gui/changeemaildialog.cpp:54
+msgid "Change Email Address"
+msgstr "E-MailAdresse ändern"
+
+#: ../src/gui/worldselectdialog.cpp:76
+#, fuzzy
+msgid "Change Login"
+msgstr "Ändern"
+
+#: ../src/gui/changepassworddialog.cpp:47
+#: ../src/gui/changepassworddialog.cpp:56 ../src/gui/charselectdialog.cpp:132
 msgid "Change Password"
 msgstr "Passwort ändern"
 
-#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:55
-#: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
-msgid "Password:"
-msgstr "Passwort:"
+#: ../src/gui/login.cpp:62
+msgid "Change Server"
+msgstr "Wechsle den Server"
 
-#: src/gui/changepassworddialog.cpp:63
-msgid "Type new password twice:"
-msgstr "Gib dein neues Passwort zweimal ein:"
+#: ../src/gui/setup_video.cpp:607
+msgid "Changes will take effect on map change."
+msgstr "Änderung werden beim nächsten Kartenwechsel übernommen."
 
-#: src/gui/changepassworddialog.cpp:110
-msgid "Enter the old password first."
-msgstr "Gib das alte Passwort zuerst an."
+#: ../src/client.cpp:848
+#, fuzzy
+msgid "Changing game servers"
+msgstr "Wechsle den Server"
 
-#: src/gui/changepassworddialog.cpp:116
-#, c-format
-msgid "The new password needs to be at least %d characters long."
-msgstr "Das neue Passwort muss aus mindestens %d Zeichen bestehen."
+#: ../src/gui/setup_video.cpp:452
+#, fuzzy
+msgid "Changing to OpenGL"
+msgstr "Ändere OpenGL"
 
-#: src/gui/changepassworddialog.cpp:123
-#, c-format
-msgid "The new password needs to be less than %d characters long."
-msgstr "Das neue Passwort muss kürzer als %d Zeichen sein."
+#: ../src/gui/widgets/channeltab.cpp:84
+msgid "Channel operators can kick and op other users from the channel."
+msgstr ""
+"Moderatoren können andere Spieler aus dem Kanal werfen oder ihnen ebenfalls "
+"Moderatorrechte verleihen."
 
-#: src/gui/changepassworddialog.cpp:130
-msgid "The new password entries mismatch."
-msgstr "Die neues Passwörter stimmen nicht überein."
+#: ../src/net/tmwa/chathandler.cpp:265 ../src/net/tmwa/chathandler.cpp:271
+#: ../src/net/tmwa/chathandler.cpp:276 ../src/net/tmwa/chathandler.cpp:281
+#: ../src/net/tmwa/chathandler.cpp:286 ../src/net/tmwa/chathandler.cpp:291
+#: ../src/net/tmwa/chathandler.cpp:296 ../src/net/tmwa/chathandler.cpp:301
+msgid "Channels are not supported!"
+msgstr "Kanäle werden nicht unterstützt!"
 
-#: src/gui/charcreatedialog.cpp:53
-msgid "Create Character"
-msgstr "Charakter erstellen"
+#: ../src/net/tmwa/charserverhandler.cpp:146
+msgid "Character deleted."
+msgstr "Spieler gelöscht."
 
-#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:54
-#: src/gui/register.cpp:67
-msgid "Name:"
-msgstr "Name:"
+#: ../src/gui/statuswindow.cpp:211 ../src/gui/statuswindow.cpp:248
+#, fuzzy, c-format
+msgid "Character points: %d"
+msgstr "Spielfigurattribute OK"
 
-#. TRANSLATORS: This is an arrow symbol used to denote 'next'.
-#. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
-#: src/gui/outfitwindow.cpp:67
-msgid ">"
-msgstr ">"
+#: ../src/gui/charcreatedialog.cpp:248
+msgid "Character stats OK"
+msgstr "Spielfigurattribute OK"
 
-#. TRANSLATORS: This is an arrow symbol used to denote 'previous'.
-#. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
-#: src/gui/outfitwindow.cpp:66
-msgid "<"
-msgstr "<"
+#: ../src/net/manaserv/charhandler.cpp:147
+msgid "Character's name already exists."
+msgstr "Benutzername bereits vorhanden"
 
-#: src/gui/charcreatedialog.cpp:74
-msgid "Hair color:"
-msgstr "Haarfarbe:"
+#: ../src/net/manaserv/charhandler.cpp:159
+msgid "Character's stats are too high."
+msgstr "Spielfigurattribute sind zu groß."
 
-#: src/gui/charcreatedialog.cpp:77
-msgid "Hair style:"
-msgstr "Frisur:"
+#: ../src/net/manaserv/charhandler.cpp:162
+msgid "Character's stats are too low."
+msgstr "Spielfigurattribute sind zu klein"
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:392
-#: src/gui/socialwindow.cpp:329
-msgid "Create"
-msgstr "Erstellen"
+#: ../src/gui/chat.cpp:88
+msgid "Chat"
+msgstr "Chat"
 
-#: src/gui/charcreatedialog.cpp:80 src/gui/register.cpp:90
-msgid "Male"
-msgstr "Männlich"
+#: ../src/keyboardconfig.cpp:75
+msgid "Chat Window"
+msgstr "Chatfenster"
 
-#: src/gui/charcreatedialog.cpp:81 src/gui/register.cpp:91
-msgid "Female"
-msgstr "Weiblich"
+#: ../src/net/tmwa/specialhandler.cpp:154
+msgid "Chat creating failed!"
+msgstr "Chat-Erstellung fehlgeschlagen!"
 
-#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:251
-#, c-format
-msgid "Please distribute %d points"
-msgstr "Bitte verteile %d Punkte"
+#: ../src/gui/charselectdialog.cpp:404
+msgid "Choose"
+msgstr "Wähle"
 
-#: src/gui/charcreatedialog.cpp:178
-msgid "Your name needs to be at least 4 characters."
-msgstr "Dein Name muss aus mindestens 4 Zeichen bestehen."
+#: ../src/gui/worldselectdialog.cpp:77
+#, fuzzy
+msgid "Choose World"
+msgstr "Wähle deinen Server"
 
-#: src/gui/charcreatedialog.cpp:242
-msgid "Character stats OK"
-msgstr "Spielfigurattribute OK"
+#: ../src/gui/serverdialog.cpp:197
+msgid "Choose Your Server"
+msgstr "Wähle deinen Server"
 
-#: src/gui/charcreatedialog.cpp:256
-#, c-format
-msgid "Please remove %d points"
-msgstr "Bitte entferne %d Punkte"
+#: ../src/gui/socialwindow.cpp:541
+msgid "Choose your guild's name."
+msgstr "Wähle den Namen deiner Gilde"
 
-#: src/gui/charselectdialog.cpp:69
-msgid "Confirm Character Delete"
-msgstr "Bestätige Charakter-Löschung"
+#: ../src/gui/socialwindow.cpp:626
+#, fuzzy
+msgid "Choose your party's name."
+msgstr "Wähle den Namen deiner Gilde"
 
-#: src/gui/charselectdialog.cpp:70
-msgid "Are you sure you want to delete this character?"
-msgstr "Bist Du sicher, dass du diesen Charakter löschen möchtest?"
+#: ../src/gui/npcdialog.cpp:118
+msgid "Clear log"
+msgstr "Protokoll leeren"
 
-#: src/gui/charselectdialog.cpp:117
-msgid "Account and Character Management"
-msgstr "Account- und Charakterverwaltung"
+#: ../src/net/manaserv/loginhandler.cpp:239
+msgid ""
+"Client registration is not allowed. Please contact server administration."
+msgstr ""
+"Client Registrierung wurde deaktiviert. Bitte den Serveradministrator "
+"kontaktieren."
 
-#: src/gui/charselectdialog.cpp:127
-msgid "Switch Login"
-msgstr "Login wechseln"
+#: ../src/net/tmwa/loginhandler.cpp:172
+#, fuzzy
+msgid "Client too old."
+msgstr "Die Version des Spiels ist zu alt"
 
-#: src/gui/charselectdialog.cpp:141 src/gui/unregisterdialog.cpp:47
-#: src/gui/unregisterdialog.cpp:55
-msgid "Unregister"
-msgstr "Abmelden"
+#: ../src/net/manaserv/loginhandler.cpp:263
+#: ../src/net/manaserv/loginhandler.cpp:300
+msgid "Client version is too old."
+msgstr "Die Version des Spiels ist zu alt"
 
-#: src/gui/charselectdialog.cpp:150
-msgid "Change Email"
-msgstr "E-Mailadresse ändern"
+#: ../src/gui/help.cpp:51 ../src/gui/npcdialog.cpp:50
+msgid "Close"
+msgstr "Schließen"
 
-#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:231
-#: src/gui/setup_players.cpp:229
-msgid "Delete"
-msgstr "Löschen"
+#: ../src/gui/setup_colors.cpp:51
+msgid "Colors"
+msgstr "Farben"
 
-#: src/gui/charselectdialog.cpp:380
-msgid "Choose"
-msgstr "Wähle"
+#: ../src/commandhandler.cpp:220
+msgid "Command: /announce <msg>"
+msgstr "Befehl: /announce <Nachricht>"
 
-#: src/gui/charselectdialog.cpp:394 src/gui/charselectdialog.cpp:395
-msgid "(empty)"
-msgstr "(leer)"
+#: ../src/commandhandler.cpp:273
+#, fuzzy
+msgid "Command: /away"
+msgstr "Befehl: /who"
 
-#: src/gui/chat.cpp:88
-msgid "Chat"
-msgstr "Chat"
+#: ../src/commandhandler.cpp:270
+#, fuzzy
+msgid "Command: /away <afk reason>"
+msgstr "Befehl: /w <Name> <Nachricht>"
 
-#: src/gui/chat.cpp:311
-#, c-format
-msgid "Present: %s; %d players are present."
-msgstr "Anwesend: %s ;%d Spieler sind anwesend."
+#: ../src/commandhandler.cpp:227
+msgid "Command: /clear"
+msgstr "Befehl: /clear"
 
-#: src/gui/chat.cpp:329
-msgid "Attendance written to record log."
-msgstr "Anwesenheitsliste wurde ins Chatprotokol geschrieben."
+#: ../src/gui/widgets/whispertab.cpp:84
+msgid "Command: /close"
+msgstr "Befehl: /close"
 
-#: src/gui/chat.cpp:493
-#, c-format
-msgid "Whispering to %s: %s"
-msgstr "Flüsternd zu %s: %s"
+#: ../src/commandhandler.cpp:278
+#, fuzzy
+msgid "Command: /createparty <name>"
+msgstr "Befehl: /create <Party-Name>"
 
-#: src/gui/confirmdialog.cpp:42
-msgid "Yes"
-msgstr "Ja"
+#: ../src/net/tmwa/gui/partytab.cpp:100
+msgid "Command: /exp"
+msgstr "Befehl: /exp"
 
-#: src/gui/confirmdialog.cpp:43
-msgid "No"
-msgstr "Nein"
+#: ../src/net/tmwa/gui/partytab.cpp:95
+msgid "Command: /exp <policy>"
+msgstr "Befehl: /exp <Wert>"
 
-#: src/gui/debugwindow.cpp:43
-msgid "Debug"
-msgstr "Debug"
+#: ../src/commandhandler.cpp:208
+msgid "Command: /help"
+msgstr "Befehl: /help"
 
-#: src/gui/debugwindow.cpp:56
-#, c-format
-msgid "%d FPS (OpenGL)"
-msgstr "%d FPS (OpenGL)"
+#: ../src/commandhandler.cpp:211
+msgid "Command: /help <command>"
+msgstr "Befehl: /help <Befehl>"
 
-#: src/gui/debugwindow.cpp:61 src/gui/debugwindow.cpp:64
-#, c-format
-msgid "%d FPS"
-msgstr "%d FPS"
+#: ../src/gui/widgets/whispertab.cpp:89
+#, fuzzy
+msgid "Command: /ignore"
+msgstr "Befehl: /item"
 
-#: src/gui/debugwindow.cpp:65 src/gui/debugwindow.cpp:104
-#, c-format
-msgid "Music: %s"
-msgstr "Musik: %s"
+#: ../src/commandhandler.cpp:232
+msgid "Command: /ignore <player>"
+msgstr "Befehl: /item <Wert>"
 
-#: src/gui/debugwindow.cpp:66 src/gui/debugwindow.cpp:108
-#, c-format
-msgid "Map: %s"
-msgstr "Karte : %s"
+#: ../src/net/tmwa/gui/guildtab.cpp:73 ../src/net/tmwa/gui/partytab.cpp:73
+msgid "Command: /invite <nick>"
+msgstr "Befehl: /invite <Name>"
 
-#: src/gui/debugwindow.cpp:67 src/gui/debugwindow.cpp:106
-#, c-format
-msgid "Minimap: %s"
-msgstr "Übersichtskarte: %s"
+#: ../src/net/tmwa/gui/partytab.cpp:90
+msgid "Command: /item"
+msgstr "Befehl: /item"
 
-#: src/gui/debugwindow.cpp:68 src/gui/debugwindow.cpp:99
-#, c-format
-msgid "Cursor: (%d, %d)"
-msgstr "Cursor: (%d, %d)"
+#: ../src/net/tmwa/gui/partytab.cpp:85
+msgid "Command: /item <policy>"
+msgstr "Befehl: /item <Wert>"
 
-#: src/gui/debugwindow.cpp:69 src/gui/debugwindow.cpp:111
-#, c-format
-msgid "Particle count: %d"
-msgstr "Partikelzählung: %d"
+#: ../src/commandhandler.cpp:238
+msgid "Command: /join <channel>"
+msgstr "Befehl: /join <Kanal>"
 
-#: src/gui/debugwindow.cpp:116
-#, c-format
-msgid "Particle detail: %s"
-msgstr "Partikeldetails: %s"
+#: ../src/gui/widgets/channeltab.cpp:89
+msgid "Command: /kick <nick>"
+msgstr "Befehl: /kick <Name>"
 
-#: src/gui/debugwindow.cpp:121
-#, c-format
-msgid "Ambient FX: %s"
-msgstr "Hintergrundeffekte: %s"
+#: ../src/net/tmwa/gui/guildtab.cpp:80 ../src/net/tmwa/gui/partytab.cpp:80
+msgid "Command: /leave"
+msgstr "Befehl: /leave"
 
-#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:55
-msgid "Equipment"
-msgstr "Ausrüstung"
+#: ../src/commandhandler.cpp:244
+msgid "Command: /list"
+msgstr "Befehl: /list"
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:89
-#: src/gui/inventorywindow.cpp:337 src/gui/popupmenu.cpp:359
-msgid "Unequip"
-msgstr "Ablegen"
+#: ../src/commandhandler.cpp:249
+msgid "Command: /me <message>"
+msgstr "Befehl: /me <Nachricht>"
 
-#: src/gui/help.cpp:37
-msgid "Help"
-msgstr "Hilfe"
+#: ../src/commandhandler.cpp:254
+msgid "Command: /msg <nick> <message>"
+msgstr "Befehl: /msg <Name> <Nachricht>"
 
-#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:50
-msgid "Close"
-msgstr "Schließen"
+#: ../src/gui/widgets/channeltab.cpp:80
+msgid "Command: /op <nick>"
+msgstr "Befehl: /op <Name>"
 
-#: src/gui/inventorywindow.cpp:59 src/gui/windowmenu.cpp:56
-msgid "Inventory"
-msgstr "Inventar"
+#: ../src/commandhandler.cpp:283
+msgid "Command: /party <nick>"
+msgstr "Befehl: /party <Name>"
 
-#: src/gui/inventorywindow.cpp:59
-msgid "Storage"
-msgstr "Lager"
+#: ../src/commandhandler.cpp:290
+msgid "Command: /present"
+msgstr "Befehl: /present"
 
-#: src/gui/inventorywindow.cpp:82
-msgid "Slots:"
-msgstr "Plätze:"
+#: ../src/commandhandler.cpp:264
+msgid "Command: /q <nick>"
+msgstr "Befehl: /q <Name>"
 
-#: src/gui/inventorywindow.cpp:87 src/gui/inventorywindow.cpp:100
-#: src/gui/inventorywindow.cpp:339 src/gui/popupmenu.cpp:361
-msgid "Equip"
-msgstr "Ausrüsten"
+#: ../src/commandhandler.cpp:263
+msgid "Command: /query <nick>"
+msgstr "Befehl: /query <Name>"
 
-#: src/gui/inventorywindow.cpp:88
-msgid "Use"
-msgstr "Benutzen"
+#: ../src/gui/widgets/channeltab.cpp:73
+msgid "Command: /quit"
+msgstr "Befehl: /quit"
 
-#: src/gui/inventorywindow.cpp:101 src/gui/popupmenu.cpp:364
-msgid "Activate"
-msgstr ""
+#: ../src/commandhandler.cpp:300
+msgid "Command: /record"
+msgstr "Befehl: /record"
 
-#: src/gui/inventorywindow.cpp:102 src/gui/inventorywindow.cpp:348
-#: src/gui/popupmenu.cpp:367
-msgid "Drop..."
-msgstr "Wegwerfen"
+#: ../src/commandhandler.cpp:297
+msgid "Command: /record <filename>"
+msgstr "Befehl: /record <Dateiname>"
 
-#: src/gui/inventorywindow.cpp:103 src/gui/popupmenu.cpp:373
-msgid "Split"
-msgstr "Aufteilen"
+#: ../src/commandhandler.cpp:311
+msgid "Command: /toggle"
+msgstr "Befehl: /toggle"
 
-#: src/gui/inventorywindow.cpp:104 src/gui/outfitwindow.cpp:51
-msgid "Outfits"
-msgstr "Ausrüstung"
+#: ../src/commandhandler.cpp:305
+msgid "Command: /toggle <state>"
+msgstr "Befehl: /toggle <Status>"
 
-#: src/gui/inventorywindow.cpp:106
-msgid "Weight:"
-msgstr "Gewicht:"
+#: ../src/gui/widgets/channeltab.cpp:68
+msgid "Command: /topic <message>"
+msgstr "Befehl: /topic <Thema>"
 
-#: src/gui/inventorywindow.cpp:124 src/gui/popupmenu.cpp:378
-msgid "Store"
-msgstr "Einlagern"
+#: ../src/commandhandler.cpp:316 ../src/gui/widgets/whispertab.cpp:95
+#, fuzzy
+msgid "Command: /unignore <player>"
+msgstr "Befehl: /item <Wert>"
 
-#: src/gui/inventorywindow.cpp:125 src/gui/popupmenu.cpp:385
-msgid "Retrieve"
-msgstr "Abholen"
+#: ../src/gui/widgets/channeltab.cpp:63
+msgid "Command: /users"
+msgstr "Befehl: /users"
 
-#: src/gui/inventorywindow.cpp:350 src/gui/popupmenu.cpp:369
-msgid "Drop"
-msgstr "Wegwerfen"
+#: ../src/commandhandler.cpp:256
+msgid "Command: /w <nick> <message>"
+msgstr "Befehl: /w <Name> <Nachricht>"
 
-#: src/gui/itemamount.cpp:113 src/gui/okdialog.cpp:42
-#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:72
-#: src/gui/trade.cpp:74
-msgid "OK"
-msgstr "Ok"
+#: ../src/commandhandler.cpp:322
+msgid "Command: /where"
+msgstr "Befehl: /where"
 
-#: src/gui/itemamount.cpp:115
-msgid "All"
-msgstr "Alle"
+#: ../src/commandhandler.cpp:255
+msgid "Command: /whisper <nick> <message>"
+msgstr "Befehl: /whisper <Name> <Nachricht>"
 
-#: src/gui/itemamount.cpp:141
-msgid "Select amount of items to trade."
-msgstr "Wähle aus, wie viele Gegenstände Du tauschen möchtest."
+#: ../src/commandhandler.cpp:327
+msgid "Command: /who"
+msgstr "Befehl: /who"
 
-#: src/gui/itemamount.cpp:144
-msgid "Select amount of items to drop."
-msgstr "Wähle aus, wie viele Gegenstände Du wegwerfen möchtest."
+#: ../src/gui/updatewindow.cpp:515
+msgid "Completed"
+msgstr "Fertig"
 
-#: src/gui/itemamount.cpp:147
-msgid "Select amount of items to store."
-msgstr "Wähle aus, wie viele Gegenstände Du einlagern möchtest."
+#: ../src/playerrelations.cpp:310
+msgid "Completely ignore"
+msgstr "@@ignore|Ignoriere %s komplett@@"
 
-#: src/gui/itemamount.cpp:150
-msgid "Select amount of items to retrieve."
-msgstr "Wähle aus, wie viele Gegenstände Du wieder haben möchtest."
+#: ../src/gui/popupmenu.cpp:117
+#, c-format
+msgid "Completely ignore %s"
+msgstr "Ignoriere %s komplett"
 
-#: src/gui/itemamount.cpp:153
-msgid "Select amount of items to split."
-msgstr "Wähle aus, wie viel Gegenstände Du aufteilen möchtest."
+#: ../src/gui/charselectdialog.cpp:72
+msgid "Confirm Character Delete"
+msgstr "Bestätige Charakter-Löschung"
 
-#: src/gui/itempopup.cpp:137
-#, c-format
-msgid "Weight: %s"
-msgstr "Gewicht: %s"
+#: ../src/gui/register.cpp:69
+msgid "Confirm:"
+msgstr "Bestätigen:"
 
-#: src/gui/login.cpp:51 src/gui/login.cpp:63
-msgid "Login"
-msgstr "Anmelden"
+#: ../src/gui/trade.cpp:54
+msgid "Confirmed. Waiting..."
+msgstr "Bestätigt. Warten..."
 
-#: src/gui/login.cpp:60
-msgid "Remember username"
-msgstr "Benutzername merken"
+#: ../src/keyboardconfig.cpp:183
+#, fuzzy, c-format
+msgid ""
+"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
+"strange behaviour."
+msgstr "Bitte beheben, oder es wird zu merkwürdigem Verhalten im Spiel kommen."
 
-#: src/gui/login.cpp:61 src/gui/register.cpp:58 src/gui/register.cpp:73
-msgid "Register"
-msgstr "Registrieren"
+#: ../src/gui/serverdialog.cpp:229
+msgid "Connect"
+msgstr "Verbinde..."
 
-#: src/gui/login.cpp:62
-msgid "Change Server"
-msgstr "Wechsle den Server"
+#: ../src/client.cpp:661
+#, fuzzy
+msgid "Connecting to server"
+msgstr "Verbinde mit [Benutzerdatenserver]..."
 
-#: src/gui/login.cpp:129
+#: ../src/client.cpp:838
 #, fuzzy
-msgid "Registration disabled"
-msgstr "Teilen von Gegenständen deaktiviert."
+msgid "Connecting to the game server"
+msgstr "Verbinde mit [Charakterserver]..."
 
-#: src/gui/login.cpp:129
-msgid "You need to use the website to register an account for this server."
-msgstr "Du musst auf der Webseite ein Konto für diesen Server erstellen."
+#: ../src/gui/updatewindow.cpp:142
+msgid "Connecting..."
+msgstr "Verbinde..."
 
-#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:86
-msgid "Map"
-msgstr "Karte"
+#: ../src/net/tmwa/network.cpp:414
+msgid "Connection to server terminated. "
+msgstr "Verbindung mit Server abgebrochen. "
 
-#: src/gui/ministatus.cpp:235
-msgid "Need"
-msgstr "Muss"
+#: ../src/keyboardconfig.cpp:83
+msgid "Copy Outfit"
+msgstr "Ausrüstung kopieren"
 
-#: src/gui/npcdialog.cpp:48
-msgid "Waiting for server"
-msgstr "Warte auf den Server"
+#: ../src/gui/statuswindow.cpp:256
+#, fuzzy, c-format
+msgid "Correction points: %d"
+msgstr "Fähigkeitspunkte: %d"
 
-#: src/gui/npcdialog.cpp:49
-msgid "Next"
-msgstr "Weiter"
+#: ../src/game.cpp:966
+#, fuzzy
+msgid "Could Not Load Map"
+msgstr "Karte konnte nicht geladen werden"
 
-#: src/gui/npcdialog.cpp:51
-msgid "Submit"
-msgstr "Absenden"
+#: ../src/net/tmwa/partyhandler.cpp:82
+msgid "Could not create party."
+msgstr "Konnte Party nicht erstellen."
 
-#: src/gui/npcdialog.cpp:73 src/gui/npcpostdialog.cpp:41
-msgid "NPC"
-msgstr "NPC"
+#: ../src/net/tmwa/guildhandler.cpp:296
+msgid "Could not inivte user to guild."
+msgstr "Konnte User nicht in Gilde einladen."
 
-#: src/gui/npcdialog.cpp:118
-msgid "Clear log"
-msgstr "Protokoll leeren"
+#: ../src/net/tmwa/specialhandler.cpp:157
+msgid "Could not join party!"
+msgstr "Kann der Gruppe nicht beitreten!"
 
-#: src/gui/npcdialog.cpp:134
-msgid "Reset"
-msgstr "Zurücksetzten"
+#: ../src/net/tmwa/specialhandler.cpp:211
+msgid "Could not steal anything..."
+msgstr "Konnte nichts stehlen..."
 
-#. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:208
-msgid ""
-"\n"
-"> Next\n"
-msgstr ""
-"\n"
-"Weiter\n"
+#: ../src/gui/charcreatedialog.cpp:78 ../src/gui/charselectdialog.cpp:416
+#: ../src/gui/socialwindow.cpp:330
+msgid "Create"
+msgstr "Erstellen"
 
-#: src/gui/npcpostdialog.cpp:47
-msgid "To:"
-msgstr "Nach:"
+#: ../src/gui/charcreatedialog.cpp:53
+msgid "Create Character"
+msgstr "Charakter erstellen"
 
-#: src/gui/npcpostdialog.cpp:54
-msgid "Send"
-msgstr "Senden"
+#: ../src/gui/socialwindow.cpp:272
+msgid "Create Guild"
+msgstr "Gilde erstellen"
 
-#: src/gui/npcpostdialog.cpp:99
-msgid "Failed to send as sender or letter invalid."
-msgstr "Es misslang den Brief zu senden oder er war ungültig."
+#: ../src/gui/socialwindow.cpp:273 ../src/gui/socialwindow.cpp:619
+#, fuzzy
+msgid "Create Party"
+msgstr "Charakter erstellen"
 
-#: src/gui/outfitwindow.cpp:68 src/gui/outfitwindow.cpp:141
-#: src/gui/outfitwindow.cpp:154
+#: ../src/gui/socialwindow.cpp:503
 #, c-format
-msgid "Outfit: %d"
-msgstr "Ausrüstung: %d"
+msgid "Creating guild called %s."
+msgstr "Erstelle der Gilde %s."
 
-#: src/gui/outfitwindow.cpp:70
-msgid "Unequip first"
-msgstr "erstes ausziehen"
+#: ../src/gui/socialwindow.cpp:496
+msgid "Creating guild failed, please choose a shorter name."
+msgstr "Gilde konnte nicht erstellt werden, bitte einen kürzen Namen wählen."
 
-#: src/gui/popupmenu.cpp:83
+#: ../src/gui/socialwindow.cpp:526
 #, fuzzy, c-format
-msgid "Trade with %s..."
-msgstr "Handele mit %s"
+msgid "Creating party called %s."
+msgstr "Erstelle der Gilde %s."
 
-#: src/gui/popupmenu.cpp:87 src/gui/popupmenu.cpp:158
-#, fuzzy, c-format
-msgid "Attack %s"
-msgstr "Angriff %+d"
+#: ../src/gui/socialwindow.cpp:519
+msgid "Creating party failed, please choose a shorter name."
+msgstr "Partie konte nicht erstellt werden, bitte einen kürzeren Namen wählen."
 
-#: src/gui/popupmenu.cpp:91
-#, c-format
-msgid "Whisper %s"
-msgstr "flüstere %s"
+#: ../src/resources/userpalette.cpp:105
+msgid "Critical Hit"
+msgstr "Kritischer Treffer"
 
-#: src/gui/popupmenu.cpp:100
+#: ../src/gui/debugwindow.cpp:68 ../src/gui/debugwindow.cpp:99
 #, c-format
-msgid "Befriend %s"
-msgstr "Sei Freund von %s"
+msgid "Cursor: (%d, %d)"
+msgstr "Cursor: (%d, %d)"
 
-#: src/gui/popupmenu.cpp:105
-#, fuzzy, c-format
-msgid "Disregard %s"
-msgstr "Unbeachtet"
+#: ../src/gui/serverdialog.cpp:230
+#, fuzzy
+msgid "Custom Server"
+msgstr "Benutzerdefinierter Zeiger"
 
-#: src/gui/popupmenu.cpp:108
-#, c-format
-msgid "Ignore %s"
-msgstr "Ignoriere %s"
+#: ../src/gui/setup_video.cpp:213
+msgid "Custom cursor"
+msgstr "Benutzerdefinierter Zeiger"
 
-#: src/gui/popupmenu.cpp:114 src/gui/popupmenu.cpp:123
-#, c-format
-msgid "Unignore %s"
-msgstr "Ignoriere %s nicht mehr"
+#: ../src/gui/setup_video.cpp:460
+msgid "Deactivating OpenGL"
+msgstr "Deaktiviere OpenGL"
 
-#: src/gui/popupmenu.cpp:117
-#, c-format
-msgid "Completely ignore %s"
-msgstr "Ignoriere %s komplett"
+#: ../src/gui/debugwindow.cpp:43
+msgid "Debug"
+msgstr "Debug"
 
-#: src/gui/popupmenu.cpp:130
-#, c-format
-msgid "Invite %s to join your guild"
-msgstr "Lade %s in deine Gilde ein"
+#: ../src/keyboardconfig.cpp:78
+msgid "Debug Window"
+msgstr "Debugfenster"
 
-#: src/gui/popupmenu.cpp:134
-#, c-format
-msgid "Invite %s to join your party"
-msgstr "Lade %s in deine Party ein"
+#: ../src/gui/setup_keyboard.cpp:94
+msgid "Default"
+msgstr "Standard"
 
-#: src/gui/popupmenu.cpp:141
-msgid "Kick player"
-msgstr "Spieler rauswerfen"
+#: ../src/net/tmwa/generalhandler.cpp:238
+msgid "Defense"
+msgstr "Verteidigung:"
 
-#: src/gui/popupmenu.cpp:150
+#: ../src/resources/itemdb.cpp:311
 #, c-format
-msgid "Talk to %s"
-msgstr "Rede mit %s"
+msgid "Defense %+d"
+msgstr "Verteidigung %+d"
 
-#: src/gui/popupmenu.cpp:163
-msgid "Kick monster"
-msgstr "Monster töten"
+#: ../src/gui/setup_colors.cpp:94
+msgid "Delay:"
+msgstr "Verzögerung: "
 
-#: src/gui/popupmenu.cpp:171
-msgid "Add name to chat"
-msgstr "Füge Namen zu Chat hinzu"
+#: ../src/gui/charselectdialog.cpp:360 ../src/gui/serverdialog.cpp:231
+#: ../src/gui/setup_players.cpp:229
+msgid "Delete"
+msgstr "Löschen"
+
+#: ../src/net/manaserv/attributes.cpp:192
+#: ../src/net/tmwa/generalhandler.cpp:234
+msgid "Dexterity"
+msgstr "Ausdauer"
 
-#: src/gui/popupmenu.cpp:188
+#: ../src/net/manaserv/attributes.cpp:199
+#, fuzzy, c-format
+msgid "Dexterity %+.1f"
+msgstr "Ausdauer %+d"
+
+#: ../src/net/tmwa/generalhandler.cpp:106
 #, c-format
-msgid "Pick up %s"
-msgstr "Hebe %s auf"
+msgid "Dexterity %+d"
+msgstr "Ausdauer %+d"
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:387
-msgid "Add to chat"
-msgstr "Zu Chat hinzufügen"
+#: ../src/net/tmwa/charserverhandler.cpp:274
+msgid "Dexterity:"
+msgstr "Geschicklichkeit:"
 
-#: src/gui/quitdialog.cpp:44
-msgid "Switch server"
-msgstr "Server wechseln"
+#: ../src/gui/setup_video.cpp:241
+msgid "Disable transparency (Low CPU mode)"
+msgstr "Transparenz deaktivieren (für langsame PCs)"
 
-#: src/gui/quitdialog.cpp:45
-msgid "Switch character"
-msgstr "Spielfigur wechseln"
+#: ../src/gui/popupmenu.cpp:105
+#, fuzzy, c-format
+msgid "Disregard %s"
+msgstr "Unbeachtet"
 
-#: src/gui/recorder.cpp:87
-msgid "Finishing recording."
-msgstr "Aufzeichnung abgeschlossen."
+#: ../src/gui/setup_players.cpp:66
+msgid "Disregarded"
+msgstr "Unbeachtet"
 
-#: src/gui/recorder.cpp:91
-msgid "Not currently recording."
-msgstr "Es läuft keine Aufzeichnung."
+#: ../src/net/manaserv/beinghandler.cpp:294
+#: ../src/net/tmwa/playerhandler.cpp:108
+msgid "Do you want your possessions identified?"
+msgstr "Möchtest du eine Auflistung Deiner Verletzungen?"
 
-#: src/gui/recorder.cpp:96
-msgid "Already recording."
-msgstr "Es läuft bereits eine Aufzeichnung."
+#: ../src/gui/setup_audio.cpp:43
+msgid "Download music"
+msgstr "Lade Musik herunter"
 
-#: src/gui/recorder.cpp:104
-msgid "Starting to record..."
-msgstr "Starte Aufzeichnung..."
+#: ../src/gui/serverdialog.cpp:441
+#, c-format
+msgid "Downloading server list...%2.2f%%"
+msgstr "Lade Serverliste herunter...%2.2f%%"
 
-#: src/gui/recorder.cpp:112
-msgid "Failed to start recording."
-msgstr "Start der Aufzeichnung fehlgeschlagen."
+#: ../src/gui/inventorywindow.cpp:365 ../src/gui/popupmenu.cpp:374
+msgid "Drop"
+msgstr "Wegwerfen"
 
-#: src/gui/recorder.h:38
-msgid "Recording..."
-msgstr "Aufzeichnung läuft..."
+#: ../src/gui/inventorywindow.cpp:107 ../src/gui/inventorywindow.cpp:363
+#: ../src/gui/popupmenu.cpp:372
+msgid "Drop..."
+msgstr "Wegwerfen"
 
-#: src/gui/recorder.h:39
-msgid "Stop recording"
-msgstr "Stoppe Aufzeichnung"
+#: ../src/net/tmwa/generalhandler.cpp:148
+msgid "Duplicated login."
+msgstr "Mehrfache Anmeldung"
 
-#: src/gui/register.cpp:69
-msgid "Confirm:"
-msgstr "Bestätigen:"
+#: ../src/client.cpp:935
+msgid "Email Change"
+msgstr "E-Mail ändern"
 
-#: src/gui/register.cpp:100
+#: ../src/net/manaserv/loginhandler.cpp:309
+msgid "Email address already exists."
+msgstr "E-Mailadresse bereits vorhanden"
+
+#: ../src/client.cpp:936
+#, fuzzy
+msgid "Email changed successfully!"
+msgstr "Mitglied wurde erfolgreich Befördert."
+
+#: ../src/gui/register.cpp:100
 msgid "Email:"
 msgstr "eMail:"
 
-#: src/gui/register.cpp:166
+#: ../src/keyboardconfig.cpp:84 ../src/keyboardconfig.cpp:85
+#: ../src/keyboardconfig.cpp:86 ../src/keyboardconfig.cpp:87
+#: ../src/keyboardconfig.cpp:88 ../src/keyboardconfig.cpp:89
+#: ../src/keyboardconfig.cpp:90 ../src/keyboardconfig.cpp:91
+#: ../src/keyboardconfig.cpp:92 ../src/keyboardconfig.cpp:93
+#: ../src/keyboardconfig.cpp:94 ../src/keyboardconfig.cpp:95
 #, c-format
-msgid "The username needs to be at least %d characters long."
-msgstr "Der Nutzername muss aus mindestens %d Zeichen bestehen."
+msgid "Emote Shortcut %d"
+msgstr "Gefühlstaste %d"
 
-#: src/gui/register.cpp:174
-#, c-format
-msgid "The username needs to be less than %d characters long."
-msgstr "Der Nutzername muss kürzer als %d Zeichen sein."
+#: ../src/keyboardconfig.cpp:80
+msgid "Emote Shortcut Window"
+msgstr "Kurztasten für Gefühle"
 
-#: src/gui/register.cpp:182 src/gui/unregisterdialog.cpp:117
-#, c-format
-msgid "The password needs to be at least %d characters long."
-msgstr "Das Passwort muss aus mindestens %d Zeichen bestehen."
+#: ../src/net/tmwa/specialhandler.cpp:148
+msgid "Emote failed!"
+msgstr "Gefühl fehlgeschlagen!"
 
-#: src/gui/register.cpp:190 src/gui/unregisterdialog.cpp:124
-#, c-format
-msgid "The password needs to be less than %d characters long."
-msgstr "Das Passwort muss kürzer als %d Zeichen sein."
+#: ../src/net/tmwa/network.cpp:145
+msgid "Empty address given to Network::connect()!"
+msgstr "Empty address given to Network::connect()!"
 
-#: src/gui/register.cpp:197
-msgid "Passwords do not match."
-msgstr "Passwörter stimmen nicht überein."
+#: ../src/gui/setup_players.cpp:235
+#, fuzzy
+msgid "Enable Chat log"
+msgstr "Verkauf fehlgeschlagen."
 
-#: src/gui/serverdialog.cpp:197
-msgid "Choose Your Server"
-msgstr "Wähle deinen Server"
+#: ../src/gui/setup_joystick.cpp:39
+msgid "Enable joystick"
+msgstr "Joystick aktivieren"
 
-#: src/gui/serverdialog.cpp:206 src/gui/widgets/chattab.cpp:142
-msgid "Server:"
-msgstr "Server:"
+#: ../src/keyboardconfig.cpp:55
+msgid "Enable/Disable Trading"
+msgstr "Handeln erlauben/verbieten"
 
-#: src/gui/serverdialog.cpp:207
-msgid "Port:"
-msgstr "Port:"
+#: ../src/net/manaserv/chathandler.cpp:229
+msgid "End of channel list."
+msgstr "Ende der Channel-Liste."
 
-#: src/gui/serverdialog.cpp:208
-#, fuzzy
-msgid "Server type:"
-msgstr "Server:"
+#: ../src/gui/changepassworddialog.cpp:110
+msgid "Enter the old password first."
+msgstr "Gib das alte Passwort zuerst an."
 
-#: src/gui/serverdialog.cpp:229
-msgid "Connect"
-msgstr "Verbinde..."
+#: ../src/client.cpp:721
+msgid "Entering game world"
+msgstr "Betrete die Spielwelt"
 
-#: src/gui/serverdialog.cpp:230
-#, fuzzy
-msgid "Custom Server"
-msgstr "Benutzerdefinierter Zeiger"
+#: ../src/gui/inventorywindow.cpp:92 ../src/gui/inventorywindow.cpp:105
+#: ../src/gui/inventorywindow.cpp:354 ../src/gui/popupmenu.cpp:366
+msgid "Equip"
+msgstr "Ausrüsten"
 
-#: src/gui/serverdialog.cpp:324
-msgid "Please type both the address and the port of a server."
-msgstr "Bitte die Adresse und den Port eines Servers eingeben."
+#: ../src/net/tmwa/playerhandler.cpp:506
+msgid "Equip arrows first."
+msgstr "Rüste dich zuerst mit Pfeilen aus."
 
-#: src/gui/serverdialog.cpp:441
-#, c-format
-msgid "Downloading server list...%2.2f%%"
-msgstr "Lade Serverliste herunter...%2.2f%%"
+#: ../src/gui/equipmentwindow.cpp:69 ../src/gui/windowmenu.cpp:55
+msgid "Equipment"
+msgstr "Ausrüstung"
 
-#: src/gui/serverdialog.cpp:447
-msgid "Waiting for server..."
-msgstr "Warte auf den Server"
+#: ../src/keyboardconfig.cpp:72
+msgid "Equipment Window"
+msgstr "Ausrüstungsfenster"
 
-#: src/gui/serverdialog.cpp:451
-msgid "Preparing download"
-msgstr "Download wird vorbereitet"
+#: ../src/client.cpp:1036 ../src/gui/changeemaildialog.cpp:156
+#: ../src/gui/changepassworddialog.cpp:149 ../src/gui/charcreatedialog.cpp:183
+#: ../src/gui/register.cpp:218 ../src/gui/serverdialog.cpp:323
+#: ../src/gui/unregisterdialog.cpp:133 ../src/net/manaserv/charhandler.cpp:177
+#: ../src/net/manaserv/charhandler.cpp:227
+#: ../src/net/tmwa/charserverhandler.cpp:134
+#: ../src/net/tmwa/charserverhandler.cpp:151
+msgid "Error"
+msgstr "Fehler"
+
+#: ../src/net/manaserv/guildhandler.cpp:87
+msgid "Error creating guild."
+msgstr "Fehler beim Erstellen der Gilde."
 
-#: src/gui/serverdialog.cpp:455
+#: ../src/client.cpp:1336 ../src/client.cpp:1342
+msgid "Error creating updates directory!"
+msgstr "Fehler beim Erstellen des Verzeichnisses für Updates!"
+
+#: ../src/net/manaserv/chathandler.cpp:211
+msgid "Error joining channel."
+msgstr "Fehler beim Betreten des Kanals."
+
+#: ../src/gui/serverdialog.cpp:455
 #, fuzzy
 msgid "Error retreiving server list!"
 msgstr "Fehler beim empfangen der Serverliste: %s\n"
 
-#: src/gui/serverdialog.cpp:550
-msgid "requires a newer version"
-msgstr "benötigt eine neuere Version"
-
-#: src/gui/serverdialog.cpp:552
+#: ../src/game.cpp:967
 #, c-format
-msgid "requires v%s"
-msgstr "benötigt v%s"
+msgid "Error while loading %s"
+msgstr "Fehler beim Laden von %s"
 
-#: src/gui/setup_audio.cpp:42
-msgid "Sound"
-msgstr "Ton"
+#: ../src/resources/userpalette.cpp:101
+msgid "Exp Notification"
+msgstr "Anzeige der Erfahrungspunkte"
 
-#: src/gui/setup_audio.cpp:43
-msgid "Download music"
-msgstr "Lade Musik herunter"
+#: ../src/gui/statuswindow.cpp:122
+msgid "Exp:"
+msgstr "Exp:"
 
-#: src/gui/setup_audio.cpp:47
-msgid "Audio"
-msgstr "Audio"
+#: ../src/net/tmwa/gui/partytab.cpp:170 ../src/net/tmwa/partyhandler.cpp:178
+msgid "Experience sharing disabled."
+msgstr "Teilen der Erfahrungspunkte deaktiviert."
 
-#: src/gui/setup_audio.cpp:50
-msgid "Sfx volume"
-msgstr "Lautstärke der Klangeffekte"
+#: ../src/net/tmwa/gui/partytab.cpp:167 ../src/net/tmwa/partyhandler.cpp:172
+msgid "Experience sharing enabled."
+msgstr "Teilen der Erfahrungspunkte aktiviert."
 
-#: src/gui/setup_audio.cpp:51
-msgid "Music volume"
-msgstr "Lautstärke der Musik"
+#: ../src/net/tmwa/gui/partytab.cpp:173 ../src/net/tmwa/partyhandler.cpp:184
+msgid "Experience sharing not possible."
+msgstr "Teilen der Erfahrungspunkte nicht möglich."
 
-#: src/gui/setup_audio.cpp:94
+#: ../src/net/tmwa/gui/partytab.cpp:176
 #, fuzzy
-msgid "Notice"
-msgstr "Kein Text"
-
-#: src/gui/setup_audio.cpp:94
-msgid "You may have to restart your client if you want to download new music"
-msgstr ""
-"Der Client muss neugestartet werden, wenn die neue Musik heruntergeladen "
-"werden soll"
+msgid "Experience sharing unknown."
+msgstr "Teilen der Erfahrungspunkte aktiviert."
 
-#: src/gui/setup_audio.cpp:106
-msgid "Sound Engine"
-msgstr "Soundengine"
+#: ../src/gui/setup_video.cpp:230
+#, fuzzy
+msgid "FPS limit:"
+msgstr "FPS-Limit:"
 
-#: src/gui/setup_colors.cpp:46
-msgid "This is what the color looks like"
-msgstr "So wird die Farbe aussehen"
+#: ../src/net/tmwa/tradehandler.cpp:211
+msgid "Failed adding item for unknown reason."
+msgstr "Gegenstand konnte nicht hinzugefügt werden. Unbekannter Fehler."
 
-#: src/gui/setup_colors.cpp:51
-msgid "Colors"
-msgstr "Farben"
+#: ../src/net/tmwa/tradehandler.cpp:207
+msgid "Failed adding item. Trade partner has no free slot."
+msgstr ""
+"Gegenstand konnte nicht hinzugefügt werden. Handelspartner hat keinen freien "
+"Platz mehr."
 
-#: src/gui/setup_colors.cpp:72
-msgid "Type:"
-msgstr "Typ: "
+#: ../src/net/tmwa/tradehandler.cpp:202
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr ""
+"Gegenstand konnte nicht hinzugefügt werden. Handelspartner ist überladen."
 
-#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:331
-msgid "Static"
-msgstr "Statisch"
+#: ../src/gui/trade.cpp:262
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+"Gegenstand konnte nicht hinzugefügt werden. Du kannst keinen weiteren dieser "
+"Gegenstände hinzufügen."
 
-#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
-#: src/gui/setup_colors.cpp:332
-msgid "Pulse"
-msgstr "Pulsierend"
+#: ../src/net/tmwa/charserverhandler.cpp:134
+msgid "Failed to create character. Most likely the name is already taken."
+msgstr ""
+"Charakter konnte nicht erstellt werden. Wahrscheinlich ist der Name bereits "
+"vergeben."
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:333
-msgid "Rainbow"
-msgstr "Regenbogen"
+#: ../src/net/tmwa/charserverhandler.cpp:151
+msgid "Failed to delete character."
+msgstr "Spieler konnte nicht gelöscht werden."
 
-#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:333
-msgid "Spectrum"
-msgstr "Spektrum"
+#: ../src/net/manaserv/guildhandler.cpp:209
+msgid "Failed to promote member."
+msgstr "Beförderung des Mitglieds gescheitert."
 
-#: src/gui/setup_colors.cpp:94
-msgid "Delay:"
-msgstr "Verzögerung: "
+#: ../src/gui/npcpostdialog.cpp:99
+msgid "Failed to send as sender or letter invalid."
+msgstr "Es misslang den Brief zu senden oder er war ungültig."
 
-#: src/gui/setup_colors.cpp:109
-msgid "Red:"
-msgstr "Rot: "
+#: ../src/gui/recorder.cpp:112
+msgid "Failed to start recording."
+msgstr "Start der Aufzeichnung fehlgeschlagen."
 
-#: src/gui/setup_colors.cpp:124
-msgid "Green:"
-msgstr "Grün: "
+#: ../src/gui/setup_video.cpp:426
+#, fuzzy
+msgid ""
+"Failed to switch to fullscreen mode and restoration of old mode also failed!"
+msgstr "Auflösung und Wiederherstellung der alten Auflösung schlug fehl!"
 
-#: src/gui/setup_colors.cpp:139
-msgid "Blue:"
-msgstr "Blau: "
+#: ../src/gui/setup_video.cpp:420
+#, fuzzy
+msgid ""
+"Failed to switch to windowed mode and restoration of old mode also failed!"
+msgstr "Auflösung und Wiederherstellung der alten Auflösung schlug fehl!"
 
-#: src/gui/setup.cpp:51
-msgid "Apply"
-msgstr "Anwenden"
+#: ../src/net/tmwa/inventoryhandler.cpp:287
+msgid "Failed to use item."
+msgstr "Gegenstand konnte nicht benutzt werden."
 
-#: src/gui/setup.cpp:51
-msgid "Reset Windows"
-msgstr "Fenster zurücksetzen"
+#: ../src/client.cpp:956
+msgid "Farewell, come back any time..."
+msgstr "Leb wohl und komme jeder Zeit wieder..."
 
-#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:78
-msgid "Press the button to start calibration"
-msgstr "Knopf drücken, um die Kalibrierung zu starten"
+#: ../src/gui/charcreatedialog.cpp:81 ../src/gui/register.cpp:91
+msgid "Female"
+msgstr "Weiblich"
 
-#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:76
-msgid "Calibrate"
-msgstr "Kalibrieren"
+#: ../src/keyboardconfig.cpp:56
+msgid "Find Path to Mouse"
+msgstr "Finde Weg zum Mauszeiger"
 
-#: src/gui/setup_joystick.cpp:39
-msgid "Enable joystick"
-msgstr "Joystick aktivieren"
+#: ../src/gui/recorder.cpp:87
+msgid "Finishing recording."
+msgstr "Aufzeichnung abgeschlossen."
 
-#: src/gui/setup_joystick.cpp:41
-msgid "Joystick"
-msgstr "Joystick"
+#: ../src/gui/setup_video.cpp:256
+msgid "Font size"
+msgstr "Schriftgröße"
 
-#: src/gui/setup_joystick.cpp:83
-msgid "Stop"
-msgstr "Stopp"
+#: ../src/commandhandler.cpp:204
+msgid "For more information, type /help <command>."
+msgstr "Für mehr Informationen, gib /help <Befehl> ein."
 
-#: src/gui/setup_joystick.cpp:84
-msgid "Rotate the stick"
-msgstr "Kreise den Steuerknüppel"
+#: ../src/gui/setup_players.cpp:65
+msgid "Friend"
+msgstr "Freund"
 
-#: src/gui/setup_keyboard.cpp:77
-msgid "Keyboard"
-msgstr "Tastatur"
+#: ../src/gui/setup_video.cpp:211
+msgid "Full screen"
+msgstr "Vollbild"
 
-#: src/gui/setup_keyboard.cpp:86
-msgid "Assign"
-msgstr "Zuordnen"
+#: ../src/resources/userpalette.cpp:94
+msgid "GM Names"
+msgstr "Namen von GM"
 
-#: src/gui/setup_keyboard.cpp:90
-#, fuzzy
-msgid "Unassign"
-msgstr "Zuordnen"
+#: ../src/net/tmwa/gamehandler.cpp:102
+msgid "Game"
+msgstr "Spiel"
 
-#: src/gui/setup_keyboard.cpp:94
-msgid "Default"
-msgstr "Standard"
+#: ../src/net/manaserv/beinghandler.cpp:288
+#: ../src/net/tmwa/playerhandler.cpp:100
+msgid "Game Over!"
+msgstr "Game Over!"
 
-#: src/gui/setup_keyboard.cpp:125
-#, fuzzy
-msgid "Key Conflict(s) Detected."
-msgstr "Tastenkonflikte entdeckt."
+#: ../src/game.cpp:181
+msgid "General"
+msgstr "Öffentlich"
 
-#: src/gui/setup_players.cpp:58
-msgid "Name"
-msgstr "Name"
+#: ../src/gui/widgets/chattab.cpp:127
+#, c-format
+msgid "Global announcement from %s:"
+msgstr "Globale Ansage von %s:"
 
-#: src/gui/setup_players.cpp:59
-msgid "Relation"
-msgstr "Beziehung"
+#: ../src/gui/widgets/chattab.cpp:121
+msgid "Global announcement:"
+msgstr "Globale Ansage:"
 
-#: src/gui/setup_players.cpp:64
-msgid "Neutral"
-msgstr "Neutral"
+#: ../src/net/tmwa/generalhandler.cpp:209
+msgid "Got disconnected from server!"
+msgstr "Verbindung zum Server unterbrochen!"
 
-#: src/gui/setup_players.cpp:65
-msgid "Friend"
-msgstr "Freund"
+#: ../src/gui/setup_colors.cpp:124
+msgid "Green:"
+msgstr "Grün: "
 
-#: src/gui/setup_players.cpp:66
-msgid "Disregarded"
-msgstr "Unbeachtet"
+#: ../src/gui/setup_video.cpp:253
+msgid "Gui opacity"
+msgstr "GUI-Transparenz"
 
-#: src/gui/setup_players.cpp:67
-msgid "Ignored"
-msgstr "Ignoriert"
+#: ../src/net/tmwa/gui/guildtab.cpp:45
+msgid "Guild"
+msgstr "Gilde"
 
-#: src/gui/setup_players.cpp:206 src/gui/setup_video.cpp:153
-msgid "???"
-msgstr "???"
+#: ../src/gui/socialwindow.cpp:139
+#, fuzzy, c-format
+msgid "Guild %s quit requested."
+msgstr "Gilde %s wurde aufgelöst."
 
-#: src/gui/setup_players.cpp:225
-msgid "Allow trading"
-msgstr "Handeln erlauben"
+#: ../src/resources/userpalette.cpp:98
+#, fuzzy
+msgid "Guild Members"
+msgstr "Gildenname"
 
-#: src/gui/setup_players.cpp:227
-msgid "Allow whispers"
-msgstr "Flüstern erlauben"
+#: ../src/gui/socialwindow.cpp:540
+msgid "Guild Name"
+msgstr "Gildenname"
 
-#: src/gui/setup_players.cpp:231
-msgid "Put all whispers in tabs"
-msgstr "Alle privaten Nachrichten in Tabs öffnen"
+#: ../src/net/manaserv/guildhandler.cpp:82
+msgid "Guild created."
+msgstr "Gilde erstellt."
 
-#: src/gui/setup_players.cpp:233
-#, fuzzy
-msgid "Show gender"
-msgstr "Geschlecht"
+#: ../src/net/tmwa/guildhandler.cpp:393
+msgid "Guild creation isn't supported yet."
+msgstr "Gildenerstellung wird nocht nicht unterstützt."
 
-#: src/gui/setup_players.cpp:235
+#: ../src/net/tmwa/gui/guildtab.cpp:89
 #, fuzzy
-msgid "Enable Chat log"
-msgstr "Verkauf fehlgeschlagen."
-
-#: src/gui/setup_players.cpp:237
-msgid "Players"
-msgstr "Spieler"
+msgid "Guild name is missing."
+msgstr "Name der Party fehlt."
 
-#: src/gui/setup_players.cpp:262
-msgid "When ignoring:"
-msgstr "Wenn ignorierend:"
+#: ../src/resources/itemdb.cpp:312
+#, c-format
+msgid "HP %+d"
+msgstr "HP %+d"
 
-#: src/gui/setup_video.cpp:134
-msgid "Tiny"
-msgstr "Winzig"
+#: ../src/gui/statuswindow.cpp:117
+msgid "HP:"
+msgstr "HP:"
 
-#: src/gui/setup_video.cpp:135
-msgid "Small"
-msgstr "Klein"
+#: ../src/gui/charcreatedialog.cpp:74
+msgid "Hair color:"
+msgstr "Haarfarbe:"
 
-#: src/gui/setup_video.cpp:136
-msgid "Medium"
-msgstr "Mittel"
+#: ../src/gui/charcreatedialog.cpp:77
+msgid "Hair style:"
+msgstr "Frisur:"
 
-#: src/gui/setup_video.cpp:137
-msgid "Large"
-msgstr "Groß"
+#: ../src/gui/help.cpp:37
+msgid "Help"
+msgstr "Hilfe"
 
-#: src/gui/setup_video.cpp:163
-msgid "No text"
-msgstr "Kein Text"
+#: ../src/keyboardconfig.cpp:69
+msgid "Help Window"
+msgstr "Hilfefenster"
 
-#: src/gui/setup_video.cpp:164
-msgid "Text"
-msgstr "Text"
+#: ../src/keyboardconfig.cpp:52
+msgid "Hide Windows"
+msgstr "Fenster ausblenden"
 
-#: src/gui/setup_video.cpp:165
-msgid "Bubbles, no names"
-msgstr "Blasen, keine Namen"
+#: ../src/net/tmwa/specialhandler.cpp:199
+msgid "Huh? What's that?"
+msgstr "Huch? Was ist das?"
 
-#: src/gui/setup_video.cpp:166
-msgid "Bubbles with names"
-msgstr "Blasen mit Namen"
+#: ../src/net/manaserv/beinghandler.cpp:293
+#: ../src/net/tmwa/playerhandler.cpp:106
+msgid "I guess this did not run too well."
+msgstr "Ich glaube, das war nicht so gut."
 
-#: src/gui/setup_video.cpp:178
-msgid "off"
-msgstr "Aus"
+#: ../src/commandhandler.cpp:240
+msgid "If <channel> doesn't exist, it's created."
+msgstr "Falls Kanal <Kanal> nicht existiert, wird er erstellt."
 
-#: src/gui/setup_video.cpp:179 src/gui/setup_video.cpp:192
-msgid "low"
-msgstr "Niedrig"
+#: ../src/commandhandler.cpp:258 ../src/commandhandler.cpp:285
+#: ../src/gui/widgets/channeltab.cpp:82 ../src/gui/widgets/channeltab.cpp:91
+#: ../src/net/tmwa/gui/guildtab.cpp:75 ../src/net/tmwa/gui/partytab.cpp:75
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr ""
+"Wenn im Namen <Name> Leerzeichen vorkommen, setze ihn in Anführungszeichen "
+"(\")."
 
-#: src/gui/setup_video.cpp:180 src/gui/setup_video.cpp:194
-msgid "high"
-msgstr "Hoch"
+#: ../src/net/tmwa/playerhandler.cpp:125
+msgid "If you weren't so animated, you'd be pushing up the daisies."
+msgstr ""
+"Wenn Du nicht so lebendig wärst, könntest Du die Gänseblümchen von unten "
+"sehen."
 
-#: src/gui/setup_video.cpp:193
-msgid "medium"
-msgstr "Mittel"
+#: ../src/gui/widgets/channeltab.cpp:75
+msgid "If you're the last person in the channel, it will be deleted."
+msgstr "Wenn Du die letzte Person im Kanal bist, wird dieser gelöscht."
 
-#: src/gui/setup_video.cpp:195
-msgid "max"
-msgstr "Maximal"
+#: ../src/gui/popupmenu.cpp:108
+#, c-format
+msgid "Ignore %s"
+msgstr "Ignoriere %s"
 
-#: src/gui/setup_video.cpp:217
-msgid "Full screen"
-msgstr "Vollbild"
+#: ../src/keyboardconfig.cpp:103
+msgid "Ignore input 1"
+msgstr "Ignoriere Eingabe 1"
 
-#: src/gui/setup_video.cpp:218
-msgid "OpenGL"
-msgstr "OpenGL"
+#: ../src/keyboardconfig.cpp:104
+msgid "Ignore input 2"
+msgstr "Ignoriere Eingabe 2"
 
-#: src/gui/setup_video.cpp:219
-msgid "Custom cursor"
-msgstr "Benutzerdefinierter Zeiger"
+#: ../src/gui/setup_players.cpp:67
+msgid "Ignored"
+msgstr "Ignoriert"
 
-#: src/gui/setup_video.cpp:221
-msgid "Visible names"
-msgstr "Sichtbare Namen"
+#: ../src/game.cpp:733
+msgid "Ignoring incoming trade requests"
+msgstr "Ignoriere eingehende Handelsanfragen"
 
-#: src/gui/setup_video.cpp:223
-msgid "Particle effects"
-msgstr "Partikeleffekte"
+#: ../src/net/manaserv/tradehandler.cpp:97
+msgid "Ignoring incoming trade requests."
+msgstr "Ignoriere eingehende Handelsanfragen."
 
-#: src/gui/setup_video.cpp:225
-#, fuzzy
-msgid "Show own name"
-msgstr "Eigener Name"
+#: ../src/net/manaserv/charhandler.cpp:210
+#: ../src/net/tmwa/charserverhandler.cpp:146
+msgid "Info"
+msgstr "Info"
 
-#: src/gui/setup_video.cpp:226
-msgid "Log NPC dialogue"
-msgstr "Protokoliere NPC Gespräche"
+#: ../src/net/tmwa/playerhandler.cpp:101
+msgid "Insert coin to continue."
+msgstr "Gib eine Münze ein um weiter zuspielen."
 
-#: src/gui/setup_video.cpp:227
-msgid "Show pickup notification"
-msgstr "Benachrichtigung beim Aufheben"
+#: ../src/net/tmwa/specialhandler.cpp:172
+msgid "Insufficient HP!"
+msgstr "Nicht genug HP!"
 
-#. TRANSLATORS: Refers to "Show pickup notification"
-#: src/gui/setup_video.cpp:229
-msgid "in chat"
-msgstr "im Chatfenster"
+#: ../src/net/tmwa/specialhandler.cpp:175
+msgid "Insufficient SP!"
+msgstr "Nicht genug SP!"
 
-#. TRANSLATORS: Refers to "Show pickup notification"
-#: src/gui/setup_video.cpp:231
-msgid "as particle"
-msgstr "als Partikeleffekt"
+#: ../src/net/manaserv/attributes.cpp:218
+#: ../src/net/tmwa/generalhandler.cpp:233
+msgid "Intelligence"
+msgstr "Intelligenz"
 
-#: src/gui/setup_video.cpp:236
-#, fuzzy
-msgid "FPS limit:"
-msgstr "FPS-Limit:"
+#: ../src/net/manaserv/attributes.cpp:225
+#, fuzzy, c-format
+msgid "Intelligence %+.1f"
+msgstr "Intelligenz %+d"
 
-#: src/gui/setup_video.cpp:247
-msgid "Disable transparency (Low CPU mode)"
-msgstr "Transparenz deaktivieren (für langsame PCs)"
+#: ../src/net/tmwa/generalhandler.cpp:105
+#, c-format
+msgid "Intelligence %+d"
+msgstr "Intelligenz %+d"
 
-#: src/gui/setup_video.cpp:250
-msgid "Video"
-msgstr "Video"
+#: ../src/net/tmwa/charserverhandler.cpp:273
+msgid "Intelligence:"
+msgstr "Intelligenz:"
 
-#: src/gui/setup_video.cpp:252
+#: ../src/net/manaserv/charhandler.cpp:267
 #, fuzzy
-msgid "Show damage"
-msgstr "Eigener Name"
-
-#: src/gui/setup_video.cpp:258
-msgid "Overhead text"
-msgstr "Chat über Spielern"
+msgid "Invalid character slot selected."
+msgstr "Spieler gelöscht."
 
-#: src/gui/setup_video.cpp:259
-msgid "Gui opacity"
-msgstr "GUI-Transparenz"
+#: ../src/net/manaserv/charhandler.cpp:156
+msgid "Invalid gender."
+msgstr "Ungültiges Geschlecht."
 
-#: src/gui/setup_video.cpp:260
-msgid "Ambient FX"
-msgstr "Hintergrundeffekte"
+#: ../src/net/manaserv/charhandler.cpp:153
+msgid "Invalid hair color."
+msgstr "Ungültige Haarfarbe."
 
-#: src/gui/setup_video.cpp:261
-#, fuzzy
-msgid "Particle detail"
-msgstr "Partikeldetail"
+#: ../src/net/manaserv/charhandler.cpp:150
+msgid "Invalid hairstyle."
+msgstr "Ungültiger Haarstil."
 
-#: src/gui/setup_video.cpp:262
-msgid "Font size"
-msgstr "Schriftgröße"
+#: ../src/net/manaserv/charhandler.cpp:144
+msgid "Invalid name."
+msgstr "Ungültiger Name."
 
-#: src/gui/setup_video.cpp:277 src/gui/setup_video.cpp:532
-#: src/gui/setup_video.cpp:662
+#: ../src/net/manaserv/charhandler.cpp:171
 #, fuzzy
-msgid "None"
-msgstr "Nein"
+msgid "Invalid slot number."
+msgstr "Ungültiger Name."
 
-#: src/gui/setup_video.cpp:426
-#, fuzzy
-msgid ""
-"Failed to switch to windowed mode and restoration of old mode also failed!"
-msgstr "Auflösung und Wiederherstellung der alten Auflösung schlug fehl!"
+#: ../src/client.cpp:1302
+#, fuzzy, c-format
+msgid "Invalid update host: %s"
+msgstr "Ungültiger Updateserver: "
 
-#: src/gui/setup_video.cpp:432
-#, fuzzy
-msgid ""
-"Failed to switch to fullscreen mode and restoration of old mode also failed!"
-msgstr "Auflösung und Wiederherstellung der alten Auflösung schlug fehl!"
+#: ../src/gui/inventorywindow.cpp:59 ../src/gui/windowmenu.cpp:56
+msgid "Inventory"
+msgstr "Inventar"
 
-#: src/gui/setup_video.cpp:443
-#, fuzzy
-msgid "Switching to Full Screen"
-msgstr "Wechsle zum Vollbildmodus"
+#: ../src/keyboardconfig.cpp:71
+msgid "Inventory Window"
+msgstr "Inventarfenster"
 
-#: src/gui/setup_video.cpp:444
-msgid "Restart needed for changes to take effect."
-msgstr "Änderungen treten erst nach einem Neustart des Programms in Kraft."
+#: ../src/localplayer.cpp:898
+#, fuzzy
+msgid "Inventory is full."
+msgstr "Server ist voll"
 
-#: src/gui/setup_video.cpp:458
+#: ../src/gui/socialwindow.cpp:331
 #, fuzzy
-msgid "Changing to OpenGL"
-msgstr "Ändere OpenGL"
+msgid "Invite"
+msgstr "einladen"
 
-#: src/gui/setup_video.cpp:459
-msgid ""
-"Applying change to OpenGL requires restart. In case OpenGL messes up your "
-"game graphics, restart the game with the command line option \"--no-opengl\"."
-msgstr ""
-"Der Wechsel zu OpenGL erfordert einen Neustart. Falls mit OpenGL Grafiken "
-"fehlerhaft dargestellt werden sollten bitte das Spiel mit der "
-"Kommandozeilenoption \"--no-opengl\" neustarten."
+#: ../src/gui/popupmenu.cpp:130
+#, c-format
+msgid "Invite %s to join your guild"
+msgstr "Lade %s in deine Gilde ein"
 
-#: src/gui/setup_video.cpp:466
-msgid "Deactivating OpenGL"
-msgstr "Deaktiviere OpenGL"
+#: ../src/gui/popupmenu.cpp:134
+#, c-format
+msgid "Invite %s to join your party"
+msgstr "Lade %s in deine Party ein"
 
-#: src/gui/setup_video.cpp:467
-msgid "Applying change to OpenGL requires restart."
-msgstr ""
-"Änderungen an OpenGL werden erst nach einem Neustart der Anwendung "
-"übernommen."
+#: ../src/net/manaserv/guildhandler.cpp:97
+msgid "Invite sent."
+msgstr "Einladung gesendet."
 
-#: src/gui/setup_video.cpp:475
-#, fuzzy
-msgid "Transparency disabled"
-msgstr "Teilen der Erfahrungspunkte deaktiviert."
+#: ../src/gui/socialwindow.cpp:126
+#, fuzzy, c-format
+msgid "Invited user %s to guild %s."
+msgstr "Spieler %s einladen"
 
-#: src/gui/setup_video.cpp:476 src/gui/setup_video.cpp:484
-msgid "You must restart to apply changes."
-msgstr "Bitte neustarten um Änderungen zu übernehmen."
+#: ../src/gui/socialwindow.cpp:207 ../src/net/tmwa/partyhandler.cpp:330
+#, fuzzy, c-format
+msgid "Invited user %s to party."
+msgstr "Spieler %s einladen"
 
-#: src/gui/setup_video.cpp:483
-msgid "Transparency enabled"
-msgstr "Transparenz aktiviert."
+#: ../src/net/tmwa/partyhandler.cpp:335
+#, c-format
+msgid "Inviting failed, because you can't see a player called %s."
+msgstr "Einladung fehlgeschlagen, da du den Spieler %s nicht sehen kannst."
 
-#: src/gui/setup_video.cpp:576 src/gui/setup_video.cpp:581
-#, fuzzy
-msgid "Screen Resolution Changed"
-msgstr "Auflösung geändert"
+#: ../src/keyboardconfig.cpp:57 ../src/keyboardconfig.cpp:58
+#: ../src/keyboardconfig.cpp:59 ../src/keyboardconfig.cpp:60
+#: ../src/keyboardconfig.cpp:61 ../src/keyboardconfig.cpp:62
+#: ../src/keyboardconfig.cpp:63 ../src/keyboardconfig.cpp:64
+#: ../src/keyboardconfig.cpp:65 ../src/keyboardconfig.cpp:66
+#: ../src/keyboardconfig.cpp:67 ../src/keyboardconfig.cpp:68
+#, c-format
+msgid "Item Shortcut %d"
+msgstr "Kurztaste %d"
 
-#: src/gui/setup_video.cpp:577 src/gui/setup_video.cpp:582
-msgid "Restart your client for the change to take effect."
-msgstr "Starte das Spiel neu um die Änderungen zu übernehmen."
+#: ../src/keyboardconfig.cpp:76
+msgid "Item Shortcut Window"
+msgstr "Kurztastenfenster"
 
-#: src/gui/setup_video.cpp:579
-msgid "Some windows may be moved to fit the lowered resolution."
+#: ../src/localplayer.cpp:901
+msgid "Item belongs to someone else."
 msgstr ""
-"Einige Fenster können verschoben werden um sich an die geänderte Auflösung "
-"anzupassen."
 
-#: src/gui/setup_video.cpp:612
-#, fuzzy
-msgid "Particle Effect Settings Changed."
-msgstr "Partikeleffekteinstellungen geändert."
+#: ../src/localplayer.cpp:897
+msgid "Item is too far away"
+msgstr ""
 
-#: src/gui/setup_video.cpp:613
-msgid "Changes will take effect on map change."
-msgstr "Änderung werden beim nächsten Kartenwechsel übernommen."
+#: ../src/localplayer.cpp:896
+msgid "Item is too heavy."
+msgstr ""
 
-#: src/gui/skilldialog.cpp:212 src/gui/windowmenu.cpp:59
-msgid "Skills"
-msgstr "Fertigkeiten"
+#: ../src/net/tmwa/gui/partytab.cpp:135 ../src/net/tmwa/partyhandler.cpp:202
+msgid "Item sharing disabled."
+msgstr "Teilen von Gegenständen deaktiviert."
 
-#: src/gui/skilldialog.cpp:223
-msgid "Up"
-msgstr "Erhöhen"
+#: ../src/net/tmwa/gui/partytab.cpp:132 ../src/net/tmwa/partyhandler.cpp:196
+msgid "Item sharing enabled."
+msgstr "Teilen von Gegenständen aktiviert."
 
-#: src/gui/skilldialog.cpp:269
-#, fuzzy, c-format
-msgid "Skill points available: %d"
-msgstr "Fähigkeitspunkte: %d"
+#: ../src/net/tmwa/gui/partytab.cpp:138 ../src/net/tmwa/partyhandler.cpp:208
+msgid "Item sharing not possible."
+msgstr "Teilen von Gegenständen nicht möglich."
 
-#: src/gui/skilldialog.cpp:351
-#, fuzzy, c-format
-msgid "Skill Set %d"
-msgstr "Fähigkeitspunkte: %d"
+#: ../src/net/tmwa/gui/partytab.cpp:141
+#, fuzzy
+msgid "Item sharing unknown."
+msgstr "Teilen von Gegenständen aktiviert."
 
-#: src/gui/skilldialog.cpp:360
-#, fuzzy, c-format
-msgid "Skill %d"
-msgstr "Fertigkeiten"
+#: ../src/client.cpp:785
+#, fuzzy
+msgid "ItemDB: Error while loading "
+msgstr "Fehler beim Laden von item.xml!"
 
-#: src/gui/skilldialog.cpp:442
-#, fuzzy, c-format
-msgid "Lvl: %d (%+d)"
-msgstr "Stufe: %d"
+#: ../src/gui/statuswindow.cpp:159
+msgid "Job:"
+msgstr "Beruf:"
 
-#: src/gui/skilldialog.cpp:453
-#, fuzzy, c-format
-msgid "Lvl: %d"
-msgstr "Stufe: %d"
+#: ../src/gui/statuswindow.cpp:158 ../src/gui/statuswindow.cpp:276
+#, c-format
+msgid "Job: %d"
+msgstr "Beruf: %d"
 
-#: src/gui/socialwindow.cpp:126
-#, fuzzy, c-format
-msgid "Invited user %s to guild %s."
-msgstr "Spieler %s einladen"
+#: ../src/net/manaserv/partyhandler.cpp:87
+msgid "Joined party."
+msgstr "Der Party beigetreten."
 
-#: src/gui/socialwindow.cpp:139
-#, fuzzy, c-format
-msgid "Guild %s quit requested."
-msgstr "Gilde %s wurde aufgelöst."
+#: ../src/gui/setup_joystick.cpp:41
+msgid "Joystick"
+msgstr "Joystick"
 
-#: src/gui/socialwindow.cpp:153
+#: ../src/gui/setup_keyboard.cpp:125
 #, fuzzy
-msgid "Member Invite to Guild"
-msgstr "Spieler einladen"
+msgid "Key Conflict(s) Detected."
+msgstr "Tastenkonflikte entdeckt."
 
-#: src/gui/socialwindow.cpp:154
-#, fuzzy, c-format
-msgid "Who would you like to invite to guild %s?"
-msgstr "Wen möchtest du einladen?"
+#: ../src/gui/setup_keyboard.cpp:77
+msgid "Keyboard"
+msgstr "Tastatur"
 
-#: src/gui/socialwindow.cpp:163
-#, fuzzy
-msgid "Leave Guild?"
-msgstr "Gilde erstellen"
+#: ../src/net/tmwa/adminhandler.cpp:64
+msgid "Kick failed!"
+msgstr "Spieler konnte nicht aus dem Kanal geworfen werden!"
 
-#: src/gui/socialwindow.cpp:164
-#, fuzzy, c-format
-msgid "Are you sure you want to leave guild %s?"
-msgstr "Bist Du sicher, dass Du das Spiel verlassen möchtest?"
+#: ../src/gui/popupmenu.cpp:163
+msgid "Kick monster"
+msgstr "Monster töten"
 
-#: src/gui/socialwindow.cpp:207 src/net/tmwa/partyhandler.cpp:330
-#, fuzzy, c-format
-msgid "Invited user %s to party."
-msgstr "Spieler %s einladen"
+#: ../src/gui/popupmenu.cpp:141
+msgid "Kick player"
+msgstr "Spieler rauswerfen"
 
-#: src/gui/socialwindow.cpp:218
-#, c-format
-msgid "Party %s quit requested."
-msgstr "Partie %s Auflösung beauftragt."
+#: ../src/net/tmwa/adminhandler.cpp:66
+msgid "Kick succeeded!"
+msgstr "Spieler aus dem Kanal geworfen!"
+
+#: ../src/gui/setup_video.cpp:131
+msgid "Large"
+msgstr "Groß"
 
-#: src/gui/socialwindow.cpp:232
+#: ../src/gui/socialwindow.cpp:332
 #, fuzzy
-msgid "Member Invite to Party"
-msgstr "Spieler einladen"
+msgid "Leave"
+msgstr "Stufe: %d"
 
-#: src/gui/socialwindow.cpp:233
-#, fuzzy, c-format
-msgid "Who would you like to invite to party %s?"
-msgstr "Wen möchtest du einladen?"
+#: ../src/gui/socialwindow.cpp:163
+#, fuzzy
+msgid "Leave Guild?"
+msgstr "Gilde erstellen"
 
-#: src/gui/socialwindow.cpp:242
+#: ../src/gui/socialwindow.cpp:242
 msgid "Leave Party?"
 msgstr "Partie verlassen?"
 
-#: src/gui/socialwindow.cpp:243
-#, fuzzy, c-format
-msgid "Are you sure you want to leave party %s?"
-msgstr "Bist Du sicher, dass Du das Spiel verlassen möchtest?"
+#: ../src/gui/statuswindow.cpp:113 ../src/gui/statuswindow.cpp:215
+#: ../src/gui/statuswindow.cpp:263
+#, c-format
+msgid "Level: %d"
+msgstr "Stufe: %d"
 
-#: src/gui/socialwindow.cpp:272
-msgid "Create Guild"
-msgstr "Gilde erstellen"
+#: ../src/net/manaserv/chathandler.cpp:217
+msgid "Listing channels."
+msgstr "Liste Kanäle"
 
-#: src/gui/socialwindow.cpp:273 src/gui/socialwindow.cpp:620
+#: ../src/resources/userpalette.cpp:109
 #, fuzzy
-msgid "Create Party"
-msgstr "Charakter erstellen"
+msgid "Local Player Critical Hit"
+msgstr "Kritischer Treffer"
 
-#: src/gui/socialwindow.cpp:312 src/gui/windowmenu.cpp:64
+#: ../src/resources/userpalette.cpp:107
 #, fuzzy
-msgid "Social"
-msgstr "Special"
+msgid "Local Player Hits Monster"
+msgstr "Spieler trifft Monster"
 
-#: src/gui/socialwindow.cpp:330
+#: ../src/resources/userpalette.cpp:111
 #, fuzzy
-msgid "Invite"
-msgstr "einladen"
+msgid "Local Player Miss"
+msgstr "Spielerliste sichern"
 
-#: src/gui/socialwindow.cpp:331
-#, fuzzy
-msgid "Leave"
-msgstr "Stufe: %d"
+#: ../src/gui/setup_video.cpp:220
+msgid "Log NPC dialogue"
+msgstr "Protokoliere NPC Gespräche"
 
-#: src/gui/socialwindow.cpp:443
-#, fuzzy, c-format
-msgid "Accepted party invite from %s."
-msgstr "Partyeinladung von %s angenommen."
+#: ../src/client.cpp:688
+#, fuzzy
+msgid "Logging in"
+msgstr "Anmelden"
 
-#: src/gui/socialwindow.cpp:449
-#, fuzzy, c-format
-msgid "Rejected party invite from %s."
-msgstr "Partyeinladung von %s abgelehnt."
+#: ../src/gui/login.cpp:51 ../src/gui/login.cpp:63
+msgid "Login"
+msgstr "Anmelden"
 
-#: src/gui/socialwindow.cpp:462
-#, fuzzy, c-format
-msgid "Accepted guild invite from %s."
-msgstr "Partyeinladung von %s angenommen."
+#: ../src/net/manaserv/loginhandler.cpp:275
+msgid "Login attempt too soon after previous attempt."
+msgstr "Anmeldeversuch zu früh nach vorherigem Versuch."
 
-#: src/gui/socialwindow.cpp:468
-#, fuzzy, c-format
-msgid "Rejected guild invite from %s."
-msgstr "Partyeinladung von %s abgelehnt."
+#: ../src/net/manaserv/beinghandler.cpp:297
+#: ../src/net/tmwa/playerhandler.cpp:114
+msgid "Looks like you got your head handed to you."
+msgstr "Sieht aus, als würde Dein Kopf Dich anschauen."
 
-#: src/gui/socialwindow.cpp:497
-msgid "Creating guild failed, please choose a shorter name."
-msgstr "Gilde konnte nicht erstellt werden, bitte einen kürzen Namen wählen."
+#: ../src/net/tmwa/generalhandler.cpp:235
+msgid "Luck"
+msgstr "Glück"
 
-#: src/gui/socialwindow.cpp:504
+#: ../src/net/tmwa/generalhandler.cpp:107
 #, c-format
-msgid "Creating guild called %s."
-msgstr "Erstelle der Gilde %s."
+msgid "Luck %+d"
+msgstr "Glück %+d"
 
-#: src/gui/socialwindow.cpp:520
-msgid "Creating party failed, please choose a shorter name."
-msgstr "Partie konte nicht erstellt werden, bitte einen kürzeren Namen wählen."
+#: ../src/net/tmwa/charserverhandler.cpp:275
+msgid "Luck:"
+msgstr "Glück:"
 
-#: src/gui/socialwindow.cpp:527
+#: ../src/gui/skilldialog.cpp:470
 #, fuzzy, c-format
-msgid "Creating party called %s."
-msgstr "Erstelle der Gilde %s."
+msgid "Lvl: %d"
+msgstr "Stufe: %d"
 
-#: src/gui/socialwindow.cpp:541
-msgid "Guild Name"
-msgstr "Gildenname"
+#: ../src/gui/skilldialog.cpp:459
+#, fuzzy, c-format
+msgid "Lvl: %d (%+d)"
+msgstr "Stufe: %d"
 
-#: src/gui/socialwindow.cpp:542
-msgid "Choose your guild's name."
-msgstr "Wähle den Namen deiner Gilde"
+#: ../src/net/tmwa/generalhandler.cpp:239
+msgid "M.Attack"
+msgstr "M.Angriff:"
 
-#: src/gui/socialwindow.cpp:554
-#, fuzzy
-msgid "Received guild request, but one already exists."
-msgstr "Anfrage für eine Party erhalten, aber du bist bereits in einer Party."
+#: ../src/net/tmwa/generalhandler.cpp:240
+msgid "M.Defense"
+msgstr "M.Verteidigung:"
 
-#: src/gui/socialwindow.cpp:559
+#: ../src/resources/itemdb.cpp:313
 #, c-format
-msgid "%s has invited you to join the guild %s."
-msgstr "%s hat Dich eingeladen, seiner Gilde %s beizutreten."
-
-#: src/gui/socialwindow.cpp:564
-msgid "Accept Guild Invite"
-msgstr "Nehme Gildeneinladung an"
+msgid "MP %+d"
+msgstr "MP %+d"
 
-#: src/gui/socialwindow.cpp:576
-msgid "Received party request, but one already exists."
-msgstr "Anfrage für eine Party erhalten, aber du bist bereits in einer Party."
+#: ../src/gui/statuswindow.cpp:130
+msgid "MP:"
+msgstr "MP:"
 
-#: src/gui/socialwindow.cpp:585
-#, fuzzy
-msgid "You have been invited you to join a party."
-msgstr "%s hat dich in seine Party eingeladen."
+#: ../src/net/tmwa/chathandler.cpp:230
+msgid "MVP player."
+msgstr "Spieler"
 
-#: src/gui/socialwindow.cpp:589
-#, fuzzy, c-format
-msgid "You have been invited to join the %s party."
-msgstr "%s hat dich eingeladen, an der Party %s teilzunehmen."
+#: ../src/gui/charcreatedialog.cpp:80 ../src/gui/register.cpp:90
+msgid "Male"
+msgstr "Männlich"
 
-#: src/gui/socialwindow.cpp:597
-#, c-format
-msgid "%s has invited you to join their party."
-msgstr "%s hat dich in seine Party eingeladen."
+#: ../src/gui/minimap.cpp:45 ../src/gui/minimap.cpp:86
+msgid "Map"
+msgstr "Karte"
 
-#: src/gui/socialwindow.cpp:602
+#: ../src/gui/debugwindow.cpp:66 ../src/gui/debugwindow.cpp:108
 #, c-format
-msgid "%s has invited you to join the %s party."
-msgstr "%s hat dich eingeladen, an der Party %s teilzunehmen."
+msgid "Map: %s"
+msgstr "Karte : %s"
 
-#: src/gui/socialwindow.cpp:610
-msgid "Accept Party Invite"
-msgstr "Nehme Partyeinladung an"
+#: ../src/gui/buy.cpp:80 ../src/gui/sell.cpp:78
+#: ../src/gui/statuswindow.cpp:385 ../src/gui/statuswindow.cpp:463
+#: ../src/gui/statuswindow.cpp:497
+msgid "Max"
+msgstr "Max"
 
-#: src/gui/socialwindow.cpp:621
-msgid "Cannot create party. You are already in a party"
-msgstr "Konnte keine Partie erstellen. Du bist schon in einer Partie."
+#: ../src/gui/setup_video.cpp:130
+msgid "Medium"
+msgstr "Mittel"
 
-#: src/gui/socialwindow.cpp:626
+#: ../src/gui/socialwindow.cpp:153
 #, fuzzy
-msgid "Party Name"
-msgstr "Party"
+msgid "Member Invite to Guild"
+msgstr "Spieler einladen"
 
-#: src/gui/socialwindow.cpp:627
+#: ../src/gui/socialwindow.cpp:232
 #, fuzzy
-msgid "Choose your party's name."
-msgstr "Wähle den Namen deiner Gilde"
-
-#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:62
-msgid "Specials"
-msgstr "Special"
-
-#: src/gui/specialswindow.cpp:174
-#, c-format
-msgid "Specials Set %d"
-msgstr "Spezial Sets %d"
-
-#: src/gui/specialswindow.cpp:191
-#, c-format
-msgid "Special %d"
-msgstr "Spezial %d"
+msgid "Member Invite to Party"
+msgstr "Spieler einladen"
 
-#: src/gui/statuswindow.cpp:109 src/gui/statuswindow.cpp:253
-#, c-format
-msgid "Level: %d"
-msgstr "Stufe: %d"
+#: ../src/net/manaserv/guildhandler.cpp:204
+msgid "Member was promoted successfully."
+msgstr "Mitglied wurde erfolgreich befördert."
 
-#: src/gui/statuswindow.cpp:114 src/gui/statuswindow.cpp:208
-#: src/gui/statuswindow.cpp:239
-#, c-format
-msgid "Money: %s"
-msgstr "Geld: %s"
+#: ../src/net/tmwa/playerhandler.cpp:253 ../src/net/tmwa/playerhandler.cpp:293
+msgid "Message"
+msgstr "Nachricht"
 
-#: src/gui/statuswindow.cpp:117
-msgid "HP:"
-msgstr "HP:"
+#: ../src/commandhandler.cpp:479
+msgid "Message closes chat."
+msgstr "Nachricht schließt Chatzeile."
 
-#: src/gui/statuswindow.cpp:122
-msgid "Exp:"
-msgstr "Exp:"
+#: ../src/commandhandler.cpp:492
+msgid "Message now closes chat."
+msgstr "Jetzt schließt jede Nachricht die Chatzeile."
 
-#: src/gui/statuswindow.cpp:130
-msgid "MP:"
-msgstr "MP:"
+#: ../src/keyboardconfig.cpp:74
+msgid "Minimap Window"
+msgstr "Kartenfenster"
 
-#: src/gui/statuswindow.cpp:158 src/gui/statuswindow.cpp:275
+#: ../src/gui/debugwindow.cpp:67 ../src/gui/debugwindow.cpp:106
 #, c-format
-msgid "Job: %d"
-msgstr "Beruf: %d"
-
-#: src/gui/statuswindow.cpp:159
-msgid "Job:"
-msgstr "Beruf:"
+msgid "Minimap: %s"
+msgstr "Übersichtskarte: %s"
 
-#: src/gui/statuswindow.cpp:211 src/gui/statuswindow.cpp:247
-#, fuzzy, c-format
-msgid "Character points: %d"
-msgstr "Spielfigurattribute OK"
+#: ../src/resources/userpalette.cpp:112
+msgid "Misses"
+msgstr "Verfehlt"
 
-#: src/gui/statuswindow.cpp:255
-#, fuzzy, c-format
-msgid "Correction points: %d"
-msgstr "Fähigkeitspunkte: %d"
+#: ../src/gui/statuswindow.cpp:114 ../src/gui/statuswindow.cpp:208
+#: ../src/gui/statuswindow.cpp:240
+#, c-format
+msgid "Money: %s"
+msgstr "Geld: %s"
 
-#: src/gui/trade.cpp:53
-msgid "Propose trade"
-msgstr "Handel vorschlagen"
+#: ../src/resources/userpalette.cpp:104
+msgid "Monster Hits Player"
+msgstr "Monster trifft Spieler"
 
-#: src/gui/trade.cpp:54
-msgid "Confirmed. Waiting..."
-msgstr "Bestätigt. Warten..."
+#: ../src/resources/userpalette.cpp:96
+msgid "Monsters"
+msgstr "Monster"
 
-#: src/gui/trade.cpp:55
-msgid "Agree trade"
-msgstr "Handel zustimmen"
+#: ../src/keyboardconfig.cpp:40
+msgid "Move Down"
+msgstr "Laufe Runter"
 
-#: src/gui/trade.cpp:56
-msgid "Agreed. Waiting..."
-msgstr "Zugestimmt. Warten..."
+#: ../src/keyboardconfig.cpp:41
+msgid "Move Left"
+msgstr "Laufe nach Links"
 
-#: src/gui/trade.cpp:59
-msgid "Trade: You"
-msgstr "Handel: Du"
+#: ../src/keyboardconfig.cpp:42
+msgid "Move Right"
+msgstr "Laufe nach Rechts"
 
-#: src/gui/trade.cpp:73 src/gui/trade.cpp:74
-msgid "Trade"
-msgstr "Handeln"
+#: ../src/keyboardconfig.cpp:39
+msgid "Move Up"
+msgstr "Laufe Hoch"
 
-#: src/gui/trade.cpp:76
-msgid "Add"
-msgstr "Hinzufügen"
+#: ../src/gui/setup_audio.cpp:51
+msgid "Music volume"
+msgstr "Lautstärke der Musik"
 
-#: src/gui/trade.cpp:98 src/gui/trade.cpp:134
-#, fuzzy, c-format
-msgid "You get %s"
-msgstr "Du erhältst %s."
+#: ../src/gui/debugwindow.cpp:65 ../src/gui/debugwindow.cpp:104
+#, c-format
+msgid "Music: %s"
+msgstr "Musik: %s"
 
-#: src/gui/trade.cpp:99
-msgid "You give:"
-msgstr "Du gibst:"
+#: ../src/gui/npcdialog.cpp:73 ../src/gui/npcpostdialog.cpp:41
+msgid "NPC"
+msgstr "NPC"
 
-#: src/gui/trade.cpp:103
-msgid "Change"
-msgstr "Ändern"
+#: ../src/resources/userpalette.cpp:95
+msgid "NPCs"
+msgstr "NPCs"
 
-#: src/gui/trade.cpp:262
-msgid "Failed adding item. You can not overlap one kind of item on the window."
-msgstr ""
-"Gegenstand konnte nicht hinzugefügt werden. Du kannst keinen weiteren dieser "
-"Gegenstände hinzufügen."
+#: ../src/gui/setup_players.cpp:58
+msgid "Name"
+msgstr "Name"
 
-#: src/gui/trade.cpp:304
-msgid "You don't have enough money."
-msgstr "Du hast nicht genügend Geld."
+#: ../src/gui/charcreatedialog.cpp:67 ../src/gui/login.cpp:54
+#: ../src/gui/register.cpp:67
+msgid "Name:"
+msgstr "Name:"
 
-#: src/gui/unregisterdialog.cpp:51
+#: ../src/gui/unregisterdialog.cpp:51
 #, c-format
 msgid "Name: %s"
 msgstr "Name : %s"
 
-#: src/gui/updatewindow.cpp:124
-msgid "Updating..."
-msgstr "Aktualisiere..."
+#: ../src/gui/ministatus.cpp:236
+msgid "Need"
+msgstr "Muss"
 
-#: src/gui/updatewindow.cpp:142
-msgid "Connecting..."
-msgstr "Verbinde..."
+#: ../src/gui/widgets/channeltab.cpp:126
+msgid "Need a user to kick!"
+msgstr "Gib einen Spieler an, der aus dem Kanal geworfen werden soll"
 
-#: src/gui/updatewindow.cpp:145
-msgid "Play"
-msgstr "Los!"
+#: ../src/gui/widgets/channeltab.cpp:119
+msgid "Need a user to op!"
+msgstr "Gib einen Spieler an, der Moderator werden soll!"
 
-#: src/gui/updatewindow.cpp:417
-msgid "##1  The update process is incomplete."
-msgstr "##1 Update wurde nicht erfolgreich abgeschlossen."
+#: ../src/game.cpp:386
+msgid "Network Error"
+msgstr "Netzwerkfehler"
 
-#. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:419
-msgid "##1  It is strongly recommended that"
-msgstr "##1 Es wird dringend empfohlen,"
+#: ../src/gui/setup_players.cpp:64
+msgid "Neutral"
+msgstr "Neutral"
 
-#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:421
-#, fuzzy
-msgid "##1  you try again later."
-msgstr "##1 es später erneut zu versuchen."
+#: ../src/net/manaserv/loginhandler.cpp:149
+msgid "New email address incorrect."
+msgstr "Neue E-Mailadresse ist fehlerhaft"
 
-#: src/gui/updatewindow.cpp:515
-msgid "Completed"
-msgstr "Fertig"
+#: ../src/net/manaserv/loginhandler.cpp:118
+msgid "New password incorrect."
+msgstr "Neues Passwort fehlerhaft"
 
-#: src/gui/widgets/channeltab.cpp:49
-msgid "/users > Lists the users in the current channel"
-msgstr "/users > Zeigt eine Liste der Spieler im aktuellen Kanal"
+#: ../src/net/tmwa/loginhandler.cpp:92
+msgid "New password too short."
+msgstr "Das neue Passwort ist zu kurz"
 
-#: src/gui/widgets/channeltab.cpp:50
-msgid "/topic > Set the topic of the current channel"
-msgstr "/topic > Setze das Thema des aktuellen Kanals"
+#: ../src/gui/npcdialog.cpp:49
+msgid "Next"
+msgstr "Weiter"
 
-#: src/gui/widgets/channeltab.cpp:51
-msgid "/quit > Leave a channel"
-msgstr "/quit > Verlasse einen Kanal"
+#: ../src/keyboardconfig.cpp:100
+msgid "Next Chat Tab"
+msgstr "Nächster Tab"
 
-#: src/gui/widgets/channeltab.cpp:52
-msgid "/op > Make a user a channel operator"
-msgstr "/op > Ernenne einen Spieler zum Kanalmoderator"
+#: ../src/gui/confirmdialog.cpp:43
+msgid "No"
+msgstr "Nein"
 
-#: src/gui/widgets/channeltab.cpp:53
-msgid "/kick > Kick a user from the channel"
-msgstr "/kick > Werfe einen Spieler aus dem Kanal"
+#: ../src/commandhandler.cpp:407
+msgid "No <nick> was given."
+msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:63
-msgid "Command: /users"
-msgstr "Befehl: /users"
+#: ../src/net/manaserv/charhandler.cpp:141
+msgid "No empty slot."
+msgstr "Kein freier Slot."
 
-#: src/gui/widgets/channeltab.cpp:64
-msgid "This command shows the users in this channel."
-msgstr "Dieser Befehl zeigt eine Liste der Spieler im aktuellen Kanal."
+#: ../src/net/manaserv/charhandler.cpp:264
+msgid "No gameservers are available."
+msgstr "Kein Server verfügbar"
 
-#: src/gui/widgets/channeltab.cpp:68
-msgid "Command: /topic <message>"
-msgstr "Befehl: /topic <Thema>"
+#: ../src/net/tmwa/generalhandler.cpp:135
+msgid "No servers available."
+msgstr "Keine Server verfügbar"
 
-#: src/gui/widgets/channeltab.cpp:69
-msgid "This command sets the topic to <message>."
-msgstr "Dieser Befehl setzt das Theme auf <Thema>."
+#: ../src/gui/setup_video.cpp:157
+msgid "No text"
+msgstr "Kein Text"
 
-#: src/gui/widgets/channeltab.cpp:73
-msgid "Command: /quit"
-msgstr "Befehl: /quit"
+#: ../src/net/manaserv/beinghandler.cpp:289
+#: ../src/net/tmwa/playerhandler.cpp:102
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+"Nein, Kinder. Euer Charakter ist nicht tot. Er... ähm... ist zu einem "
+"besserem Ort gegangen."
 
-#: src/gui/widgets/channeltab.cpp:74
-msgid "This command leaves the current channel."
-msgstr "Mit diesem Befehl verlässt Du den aktuellen Kanal"
+#: ../src/gui/setup_video.cpp:271 ../src/gui/setup_video.cpp:526
+#: ../src/gui/setup_video.cpp:656
+#, fuzzy
+msgid "None"
+msgstr "Nein"
 
-#: src/gui/widgets/channeltab.cpp:75
-msgid "If you're the last person in the channel, it will be deleted."
-msgstr "Wenn Du die letzte Person im Kanal bist, wird dieser gelöscht."
+#: ../src/gui/recorder.cpp:91
+msgid "Not currently recording."
+msgstr "Es läuft keine Aufzeichnung."
 
-#: src/gui/widgets/channeltab.cpp:80
-msgid "Command: /op <nick>"
-msgstr "Befehl: /op <Name>"
+#: ../src/net/manaserv/charhandler.cpp:138
+#: ../src/net/manaserv/charhandler.cpp:219
+msgid "Not logged in."
+msgstr "nicht angemeldet"
 
-#: src/gui/widgets/channeltab.cpp:81
-msgid "This command makes <nick> a channel operator."
-msgstr "Dieser Befehl macht Spieler <Name> zu einem Moderator des Kanals"
+#: ../src/net/tmwa/buysellhandler.cpp:109
+msgid "Nothing to sell."
+msgstr "Du hast nichts zu verkaufen."
 
-#: src/gui/widgets/channeltab.cpp:84
-msgid "Channel operators can kick and op other users from the channel."
-msgstr ""
-"Moderatoren können andere Spieler aus dem Kanal werfen oder ihnen ebenfalls "
-"Moderatorrechte verleihen."
+#: ../src/gui/setup_audio.cpp:94
+#, fuzzy
+msgid "Notice"
+msgstr "Kein Text"
 
-#: src/gui/widgets/channeltab.cpp:89
-msgid "Command: /kick <nick>"
-msgstr "Befehl: /kick <Name>"
+#: ../src/gui/itemamount.cpp:113 ../src/gui/okdialog.cpp:42
+#: ../src/gui/quitdialog.cpp:46 ../src/gui/textdialog.cpp:39
+#: ../src/gui/trade.cpp:72 ../src/gui/trade.cpp:74
+msgid "OK"
+msgstr "Ok"
 
-#: src/gui/widgets/channeltab.cpp:90
-msgid "This command makes <nick> leave the channel."
-msgstr "Diese Befehl wirft Spieler <Name> aus dem Kanal"
+#: ../src/net/manaserv/loginhandler.cpp:152
+msgid "Old email address incorrect."
+msgstr "Alte E-Mailadresse ist fehlerhaft"
 
-#: src/gui/widgets/channeltab.cpp:119
-msgid "Need a user to op!"
-msgstr "Gib einen Spieler an, der Moderator werden soll!"
+#: ../src/net/manaserv/loginhandler.cpp:121
+#: ../src/net/tmwa/loginhandler.cpp:89
+msgid "Old password incorrect."
+msgstr "Altes Passwort fehlerhaft"
 
-#: src/gui/widgets/channeltab.cpp:126
-msgid "Need a user to kick!"
-msgstr "Gib einen Spieler an, der aus dem Kanal geworfen werden soll"
+#: ../src/net/tmwa/gamehandler.cpp:89
+#, c-format
+msgid "Online users: %d"
+msgstr "Benutzer online: %d"
 
-#: src/gui/widgets/chattab.cpp:121
-msgid "Global announcement:"
-msgstr "Globale Ansage:"
+#: ../src/gui/setup_video.cpp:212
+msgid "OpenGL"
+msgstr "OpenGL"
 
-#: src/gui/widgets/chattab.cpp:127
+#: ../src/commandhandler.h:31
 #, c-format
-msgid "Global announcement from %s:"
-msgstr "Globale Ansage von %s:"
-
-#: src/gui/widgets/chattab.cpp:153
-#, fuzzy, c-format
-msgid "%s whispers: %s"
-msgstr "%s flüstert: "
+msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr ""
+"Gültige Optionen für /%s sind \"yes\",\"no\",\"true\",\"false\",\"1\",\"0\"."
 
-#: src/gui/widgets/whispertab.cpp:53
-msgid "Cannot send empty chat!"
-msgstr "Kann keine leere Nachricht senden!"
+#: ../src/main.cpp:47
+msgid "Options:"
+msgstr "Optionen:"
 
-#: src/gui/widgets/whispertab.cpp:72
-msgid "/ignore > Ignore the other player"
-msgstr "/ignore > Anderen Spieler ignorieren"
+#: ../src/resources/userpalette.cpp:103
+#, fuzzy
+msgid "Other Player Hits Monster"
+msgstr "Spieler trifft Monster"
 
-#: src/gui/widgets/whispertab.cpp:73
-msgid "/unignore > Stop ignoring the other player"
-msgstr "/unignore > Anderen Spieler nicht mehr ignorieren"
+#: ../src/resources/userpalette.cpp:92
+msgid "Other Players' Names"
+msgstr "Namen anderer Spieler"
 
-#: src/gui/widgets/whispertab.cpp:74
-msgid "/close > Close the whisper tab"
-msgstr "/close > Schließe einen privaten Tab"
-
-#: src/gui/widgets/whispertab.cpp:84
-msgid "Command: /close"
-msgstr "Befehl: /close"
+#: ../src/gui/outfitwindow.cpp:68 ../src/gui/outfitwindow.cpp:141
+#: ../src/gui/outfitwindow.cpp:154
+#, c-format
+msgid "Outfit: %d"
+msgstr "Ausrüstung: %d"
 
-#: src/gui/widgets/whispertab.cpp:85
-msgid "This command closes the current whisper tab."
-msgstr "Dieser Befehl schließt den aktuellen privaten Tab."
+#: ../src/gui/inventorywindow.cpp:109 ../src/gui/outfitwindow.cpp:51
+msgid "Outfits"
+msgstr "Ausrüstung"
 
-#: src/gui/widgets/whispertab.cpp:89
+#: ../src/keyboardconfig.cpp:81
 #, fuzzy
-msgid "Command: /ignore"
-msgstr "Befehl: /item"
+msgid "Outfits Window"
+msgstr "Statusfenster"
 
-#: src/gui/widgets/whispertab.cpp:90
-#, fuzzy
-msgid "This command ignores the other player regardless of current relations."
-msgstr "Dieser Befehl zeigt die Anzahl der Spieler an, die gerade online sind."
+#: ../src/gui/setup_video.cpp:252
+msgid "Overhead text"
+msgstr "Chat über Spielern"
+
+#: ../src/resources/userpalette.cpp:93
+msgid "Own Name"
+msgstr "Eigener Name"
 
-#: src/gui/widgets/whispertab.cpp:96
+#: ../src/gui/setup_video.cpp:606
 #, fuzzy
-msgid "This command stops ignoring the other player if they are being ignored."
-msgstr ""
-"Dieser Befehl startet den Mitschnitt des Chats (Chatlog) in die Datei "
-"<Dateiname>."
+msgid "Particle Effect Settings Changed."
+msgstr "Partikeleffekteinstellungen geändert."
 
-#: src/gui/windowmenu.cpp:54
-msgid "Status"
-msgstr "Status"
+#: ../src/resources/userpalette.cpp:99
+msgid "Particle Effects"
+msgstr "Partikeleffekte"
 
-#: src/gui/windowmenu.cpp:65
-msgid "Shortcut"
-msgstr "Tastenkürzel"
+#: ../src/gui/debugwindow.cpp:69 ../src/gui/debugwindow.cpp:111
+#, c-format
+msgid "Particle count: %d"
+msgstr "Partikelzählung: %d"
 
-#: src/gui/worldselectdialog.cpp:71
+#: ../src/gui/setup_video.cpp:255
 #, fuzzy
-msgid "Select World"
-msgstr "OK auswählen"
+msgid "Particle detail"
+msgstr "Partikeldetail"
 
-#: src/gui/worldselectdialog.cpp:76
-#, fuzzy
-msgid "Change Login"
-msgstr "Ändern"
+#: ../src/gui/debugwindow.cpp:116
+#, c-format
+msgid "Particle detail: %s"
+msgstr "Partikeldetails: %s"
 
-#: src/gui/worldselectdialog.cpp:77
-#, fuzzy
-msgid "Choose World"
-msgstr "Wähle deinen Server"
+#: ../src/gui/setup_video.cpp:217
+msgid "Particle effects"
+msgstr "Partikeleffekte"
 
-#: src/keyboardconfig.cpp:39
-msgid "Move Up"
-msgstr "Laufe Hoch"
+#: ../src/net/tmwa/gui/partytab.cpp:43
+msgid "Party"
+msgstr "Party"
 
-#: src/keyboardconfig.cpp:40
-msgid "Move Down"
-msgstr "Laufe Runter"
+#: ../src/gui/socialwindow.cpp:218
+#, c-format
+msgid "Party %s quit requested."
+msgstr "Partie %s Auflösung beauftragt."
 
-#: src/keyboardconfig.cpp:41
-msgid "Move Left"
-msgstr "Laufe nach Links"
+#: ../src/resources/userpalette.cpp:97
+#, fuzzy
+msgid "Party Members"
+msgstr "Party"
 
-#: src/keyboardconfig.cpp:42
-msgid "Move Right"
-msgstr "Laufe nach Rechts"
+#: ../src/gui/socialwindow.cpp:625
+#, fuzzy
+msgid "Party Name"
+msgstr "Party"
 
-#: src/keyboardconfig.cpp:43 src/net/tmwa/generalhandler.cpp:237
-msgid "Attack"
-msgstr "Angriff"
+#: ../src/commandhandler.cpp:448 ../src/net/tmwa/gui/partytab.cpp:109
+msgid "Party name is missing."
+msgstr "Name der Party fehlt."
 
-#: src/keyboardconfig.cpp:44
-msgid "Target & Attack"
-msgstr "Zielen & Angreifen"
+#: ../src/net/tmwa/partyhandler.cpp:84
+msgid "Party successfully created."
+msgstr "Party erfolgreich erstellt."
 
-#: src/keyboardconfig.cpp:45
-msgid "Smilie"
-msgstr "Grinsen"
+#: ../src/gui/beingpopup.cpp:76
+#, fuzzy, c-format
+msgid "Party: %s"
+msgstr "Party (%s)"
 
-#: src/keyboardconfig.cpp:46
-msgid "Talk"
-msgstr "Sprechen"
+#: ../src/client.cpp:916
+msgid "Password Change"
+msgstr "Passwort ändern:"
 
-#: src/keyboardconfig.cpp:47
-msgid "Stop Attack"
-msgstr "Angriff abbrechen"
+#: ../src/client.cpp:917
+msgid "Password changed successfully!"
+msgstr "Passwort erfolgreich geändert!"
 
-#: src/keyboardconfig.cpp:48
-#, fuzzy
-msgid "Target Monster"
-msgstr "Nächstes Ziel anvisieren"
+#: ../src/gui/changepassworddialog.cpp:61 ../src/gui/login.cpp:55
+#: ../src/gui/register.cpp:68 ../src/gui/unregisterdialog.cpp:53
+msgid "Password:"
+msgstr "Passwort:"
 
-#: src/keyboardconfig.cpp:49
-msgid "Target NPC"
-msgstr "NPC anvisieren"
+#: ../src/gui/register.cpp:197
+msgid "Passwords do not match."
+msgstr "Passwörter stimmen nicht überein."
 
-#: src/keyboardconfig.cpp:50
-msgid "Target Player"
-msgstr "Spieler anvisieren"
+#: ../src/gui/popupmenu.cpp:188
+#, c-format
+msgid "Pick up %s"
+msgstr "Hebe %s auf"
 
-#: src/keyboardconfig.cpp:51
+#: ../src/keyboardconfig.cpp:51
 msgid "Pickup"
 msgstr "Aufheben"
 
-#: src/keyboardconfig.cpp:52
-msgid "Hide Windows"
-msgstr "Fenster ausblenden"
-
-#: src/keyboardconfig.cpp:53
-msgid "Sit"
-msgstr "Sitzen"
+#: ../src/resources/userpalette.cpp:100
+msgid "Pickup Notification"
+msgstr "aufgehobene Gegenstände"
 
-#: src/keyboardconfig.cpp:54
-msgid "Screenshot"
-msgstr "Bildschirmfoto"
-
-#: src/keyboardconfig.cpp:55
-msgid "Enable/Disable Trading"
-msgstr "Handeln erlauben/verbieten"
-
-#: src/keyboardconfig.cpp:56
-msgid "Find Path to Mouse"
-msgstr "Finde Weg zum Mauszeiger"
+#: ../src/gui/updatewindow.cpp:145
+msgid "Play"
+msgstr "Los!"
 
-#: src/keyboardconfig.cpp:57 src/keyboardconfig.cpp:58
-#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
-#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
-#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
-#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66
-#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68
-#, c-format
-msgid "Item Shortcut %d"
-msgstr "Kurztaste %d"
+#: ../src/commandhandler.cpp:544
+msgid "Player already ignored!"
+msgstr "Spieler wird bereits ignoriert!"
 
-#: src/keyboardconfig.cpp:69
-msgid "Help Window"
-msgstr "Hilfefenster"
+#: ../src/commandhandler.cpp:553
+#, fuzzy
+msgid "Player could not be ignored!"
+msgstr ""
+"Nachricht konnte nicht gesendet werden, sie wurde vom Spieler ignoriert."
 
-#: src/keyboardconfig.cpp:70
-msgid "Status Window"
-msgstr "Statusfenster"
+#: ../src/commandhandler.cpp:575
+#, fuzzy
+msgid "Player could not be unignored!"
+msgstr ""
+"Nachricht konnte nicht gesendet werden, sie wurde vom Spieler ignoriert."
 
-#: src/keyboardconfig.cpp:71
-msgid "Inventory Window"
-msgstr "Inventarfenster"
+#: ../src/net/manaserv/charhandler.cpp:210
+msgid "Player deleted."
+msgstr "Spieler gelöscht"
 
-#: src/keyboardconfig.cpp:72
-msgid "Equipment Window"
-msgstr "Ausrüstungsfenster"
+#: ../src/commandhandler.cpp:573
+msgid "Player no longer ignored!"
+msgstr "Spieler wird nicht länger ignoriert!"
 
-#: src/keyboardconfig.cpp:73
-msgid "Skill Window"
-msgstr "Fertigkeitenfenster"
+#: ../src/commandhandler.cpp:551
+#, fuzzy
+msgid "Player successfully ignored!"
+msgstr "Party erfolgreich erstellt."
 
-#: src/keyboardconfig.cpp:74
-msgid "Minimap Window"
-msgstr "Kartenfenster"
+#: ../src/commandhandler.cpp:568
+msgid "Player wasn't ignored!"
+msgstr "Spieler wurde nicht ignoriert!"
 
-#: src/keyboardconfig.cpp:75
-msgid "Chat Window"
-msgstr "Chatfenster"
+#: ../src/gui/setup_players.cpp:237
+msgid "Players"
+msgstr "Spieler"
 
-#: src/keyboardconfig.cpp:76
-msgid "Item Shortcut Window"
-msgstr "Kurztastenfenster"
+#: ../src/net/manaserv/chathandler.cpp:194
+#: ../src/net/manaserv/chathandler.cpp:277
+msgid "Players in this channel:"
+msgstr "Spieler im Kanal:"
 
-#: src/keyboardconfig.cpp:77
-msgid "Setup Window"
-msgstr "Einstellungen"
+#: ../src/gui/charcreatedialog.cpp:99 ../src/gui/charcreatedialog.cpp:257
+#, c-format
+msgid "Please distribute %d points"
+msgstr "Bitte verteile %d Punkte"
 
-#: src/keyboardconfig.cpp:78
-msgid "Debug Window"
-msgstr "Debugfenster"
+#: ../src/gui/charcreatedialog.cpp:262
+#, c-format
+msgid "Please remove %d points"
+msgstr "Bitte entferne %d Punkte"
 
-#: src/keyboardconfig.cpp:79
-#, fuzzy
-msgid "Social Window"
-msgstr "Fertigkeitenfenster"
+#: ../src/commandhandler.cpp:461 ../src/commandhandler.cpp:538
+#: ../src/commandhandler.cpp:560
+msgid "Please specify a name."
+msgstr "Bitte gib einen Namen an."
 
-#: src/keyboardconfig.cpp:80
-msgid "Emote Shortcut Window"
-msgstr "Kurztasten für Gefühle"
+#: ../src/gui/serverdialog.cpp:324
+msgid "Please type both the address and the port of a server."
+msgstr "Bitte die Adresse und den Port eines Servers eingeben."
 
-#: src/keyboardconfig.cpp:81
-#, fuzzy
-msgid "Outfits Window"
-msgstr "Statusfenster"
+#: ../src/net/tmwa/specialhandler.cpp:214
+msgid "Poison had no effect..."
+msgstr "Das Gift hatte keine Wirkung..."
 
-#: src/keyboardconfig.cpp:82
-msgid "Wear Outfit"
-msgstr "Ausrüstung anziehen"
+#: ../src/gui/serverdialog.cpp:207
+msgid "Port:"
+msgstr "Port:"
 
-#: src/keyboardconfig.cpp:83
-msgid "Copy Outfit"
-msgstr "Ausrüstung kopieren"
+#: ../src/gui/serverdialog.cpp:451
+msgid "Preparing download"
+msgstr "Download wird vorbereitet"
 
-#: src/keyboardconfig.cpp:84 src/keyboardconfig.cpp:85
-#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:87
-#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:89
-#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:91
-#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:93
-#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:95
+#: ../src/gui/chat.cpp:311
 #, c-format
-msgid "Emote Shortcut %d"
-msgstr "Gefühlstaste %d"
-
-#: src/keyboardconfig.cpp:96
-msgid "Toggle Chat"
-msgstr "Chat ein/aus"
+msgid "Present: %s; %d players are present."
+msgstr "Anwesend: %s ;%d Spieler sind anwesend."
 
-#: src/keyboardconfig.cpp:97
-msgid "Scroll Chat Up"
-msgstr "Im Chat hochscrollen"
+#: ../src/net/manaserv/beinghandler.cpp:303
+msgid "Press OK to respawn."
+msgstr "Drücke \"OK\" um neu anzufangen."
 
-#: src/keyboardconfig.cpp:98
-msgid "Scroll Chat Down"
-msgstr "Im Chat runter scrollen"
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:78
+msgid "Press the button to start calibration"
+msgstr "Knopf drücken, um die Kalibrierung zu starten"
 
-#: src/keyboardconfig.cpp:99
+#: ../src/keyboardconfig.cpp:99
 msgid "Previous Chat Tab"
 msgstr "Voriger Tab"
 
-#: src/keyboardconfig.cpp:100
-msgid "Next Chat Tab"
-msgstr "Nächster Tab"
-
-#: src/keyboardconfig.cpp:101
-msgid "Select OK"
-msgstr "OK auswählen"
-
-#: src/keyboardconfig.cpp:103
-msgid "Ignore input 1"
-msgstr "Ignoriere Eingabe 1"
-
-#: src/keyboardconfig.cpp:104
-msgid "Ignore input 2"
-msgstr "Ignoriere Eingabe 2"
+#: ../src/gui/buy.cpp:69 ../src/gui/buy.cpp:267 ../src/gui/sell.cpp:71
+#: ../src/gui/sell.cpp:288
+#, c-format
+msgid "Price: %s / Total: %s"
+msgstr "Preis: %s / Gesamt: %s"
 
-#: src/keyboardconfig.cpp:183
-#, fuzzy, c-format
-msgid ""
-"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
-"strange behaviour."
-msgstr "Bitte beheben, oder es wird zu merkwürdigem Verhalten im Spiel kommen."
+#: ../src/playerrelations.cpp:324
+msgid "Print '...'"
+msgstr "Drucke '..'"
 
-#: src/localplayer.cpp:985
-msgid "Unable to pick up item."
-msgstr "Kann Gegenstand nicht aufheben."
+#: ../src/gui/trade.cpp:53
+msgid "Propose trade"
+msgstr "Handel vorschlagen"
 
-#. TRANSLATORS: This sentence may be translated differently
-#. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:994
-#, fuzzy, c-format
-msgid "You picked up %d [@@%d|%s@@]."
-msgid_plural "You picked up %d [@@%d|%s@@]."
-msgstr[0] "Du hast %s [@@%d|%s@@] aufgehoben."
-msgstr[1] "Du hast %s [@@%d|%s@@] aufgehoben."
+#: ../src/gui/setup_colors.cpp:85 ../src/gui/setup_colors.cpp:86
+#: ../src/gui/setup_colors.cpp:332
+msgid "Pulse"
+msgstr "Pulsierend"
 
-#: src/localplayer.cpp:1435
-msgid "Away"
-msgstr "Abwesend"
+#: ../src/gui/setup_players.cpp:231
+msgid "Put all whispers in tabs"
+msgstr "Alle privaten Nachrichten in Tabs öffnen"
 
-#: src/main.cpp:42
-msgid "mana [options] [mana-file]"
-msgstr "mana [Optionen] [mana-Datei]"
+#: ../src/gui/buy.cpp:79 ../src/gui/quitdialog.cpp:40
+#: ../src/gui/quitdialog.cpp:42 ../src/gui/quitdialog.cpp:43
+#: ../src/gui/sell.cpp:77 ../src/gui/serverdialog.cpp:228
+#: ../src/keyboardconfig.cpp:102
+msgid "Quit"
+msgstr "Beenden"
 
-#: src/main.cpp:43
-msgid "[mana-file] : The mana file is an XML file (.mana)"
-msgstr ""
+#: ../src/gui/setup_colors.cpp:87 ../src/gui/setup_colors.cpp:88
+#: ../src/gui/setup_colors.cpp:333
+msgid "Rainbow"
+msgstr "Regenbogen"
 
-#: src/main.cpp:44
-msgid "              used to set custom parameters"
-msgstr ""
+#: ../src/gui/socialwindow.cpp:553
+#, fuzzy
+msgid "Received guild request, but one already exists."
+msgstr "Anfrage für eine Party erhalten, aber du bist bereits in einer Party."
 
-#: src/main.cpp:45
-msgid "              to the mana client."
-msgstr ""
+#: ../src/gui/socialwindow.cpp:575
+msgid "Received party request, but one already exists."
+msgstr "Anfrage für eine Party erhalten, aber du bist bereits in einer Party."
 
-#: src/main.cpp:47
-msgid "Options:"
-msgstr "Optionen:"
+#: ../src/gui/recorder.h:38
+msgid "Recording..."
+msgstr "Aufzeichnung läuft..."
 
-#: src/main.cpp:48
-msgid "  -v --version        : Display the version"
-msgstr "  -v --version        : Die Version des Spieles anzeigen"
+#: ../src/gui/setup_colors.cpp:109
+msgid "Red:"
+msgstr "Rot: "
 
-#: src/main.cpp:49
-msgid "  -h --help           : Display this help"
-msgstr "  - --help           : Zeigt diesen Hilfstext an"
+#: ../src/gui/login.cpp:61 ../src/gui/register.cpp:58
+#: ../src/gui/register.cpp:73
+msgid "Register"
+msgstr "Registrieren"
 
-#: src/main.cpp:50
+#: ../src/gui/login.cpp:129
 #, fuzzy
-msgid "  -C --config-dir     : Configuration directory to use"
-msgstr "  -C --config-file     : zu benutzende Konfigurationsdatei"
-
-#: src/main.cpp:51
-msgid "  -U --username       : Login with this username"
-msgstr "  -U --username       : Mit angegebenem Benutzernamen anmelden"
-
-#: src/main.cpp:52
-msgid "  -P --password       : Login with this password"
-msgstr "  -P --password       : Angegebenes Passwort benutzen"
-
-#: src/main.cpp:53
-msgid "  -c --character      : Login with this character"
-msgstr "  -c --charakter      : Mit angegebenem Spieler anmelden"
-
-#: src/main.cpp:54
-msgid "  -s --server         : Login server name or IP"
-msgstr "  -s --server         : Name oder IP-Adresse des Loginservers"
+msgid "Registration disabled"
+msgstr "Teilen von Gegenständen deaktiviert."
 
-#: src/main.cpp:55
-msgid "  -p --port           : Login server port"
-msgstr "  -p --port           : Port des Loginservers"
+#: ../src/net/tmwa/loginhandler.cpp:165
+msgid "Rejected from server."
+msgstr "Vom Server zurückgewiesen"
 
-#: src/main.cpp:56
+#: ../src/gui/socialwindow.cpp:468
 #, fuzzy
-msgid "     --update-host    : Use this update host"
-msgstr "  -H --update-host    : Benutze angegebenen Updateserver"
+msgid "Rejected guild invite."
+msgstr "%s hat Deine Einladung zurückgewiesen."
 
-#: src/main.cpp:57
-msgid "  -D --default        : Choose default character server and character"
-msgstr "  -D --default        : Wähle zuletzt benutzten Server und Spieler aus"
+#: ../src/gui/socialwindow.cpp:450
+#, fuzzy, c-format
+msgid "Rejected party invite from %s."
+msgstr "Partyeinladung von %s abgelehnt."
 
-#: src/main.cpp:59
-msgid "  -u --skip-update    : Skip the update downloads"
-msgstr "  -u --skip-update    : Überspringe das Herunterladen von Updates"
+#: ../src/gui/setup_players.cpp:59
+msgid "Relation"
+msgstr "Beziehung"
 
-#: src/main.cpp:60
-msgid "  -d --data           : Directory to load game data from"
-msgstr ""
-"  -d --data           : Datenverzeichnis, aus dem das Spiel geladen werden "
-"soll"
+#: ../src/gui/login.cpp:60
+msgid "Remember username"
+msgstr "Benutzername merken"
 
-#: src/main.cpp:61
-#, fuzzy
-msgid "     --localdata-dir  : Directory to use as local data directory"
-msgstr ""
-"  -S --home-dir : Verzeichnis, das als Heimatverzeichnis benutzt werden soll"
+#: ../src/net/manaserv/tradehandler.cpp:115
+#: ../src/net/tmwa/tradehandler.cpp:109
+msgid "Request for Trade"
+msgstr "Erbitte einen Handel"
 
-#: src/main.cpp:62
+#: ../src/net/tmwa/gamehandler.cpp:102
 #, fuzzy
-msgid "     --chat-log-dir   : Chat log dir to use"
-msgstr "  -C --config-file     : zu benutzende Konfigurationsdatei"
+msgid "Request to quit denied!"
+msgstr "Erbitte einen Handel"
 
-#: src/main.cpp:63
+#: ../src/client.cpp:809
 #, fuzzy
-msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr ""
-"  -S --home-dir : Verzeichnis, das als Heimatverzeichnis benutzt werden soll"
+msgid "Requesting characters"
+msgstr "Spielfigur auswählen"
 
-#: src/main.cpp:65
-#, fuzzy
-msgid "     --no-opengl      : Disable OpenGL for this session"
-msgstr "  -O --no-opengl      : OpenGL-Erweiterungen deaktivieren"
+#: ../src/client.cpp:889
+msgid "Requesting registration details"
+msgstr "Fordere Registrierungsdetails an"
 
-#: src/net/manaserv/beinghandler.cpp:303 src/net/tmwa/playerhandler.cpp:94
-msgid "You are dead."
-msgstr "Ach ja: Du bist Tot."
+#: ../src/commandhandler.cpp:435
+#, c-format
+msgid "Requesting to join channel %s."
+msgstr "Erbitte Erlaubnis, Kanal %s betreten zu dürfen."
 
-#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:95
-msgid "We regret to inform you that your character was killed in battle."
-msgstr ""
-"Es tut uns Leid, Euch mitteilen zu müssen, dass Ihr im Kampfe gefallen seid."
+#: ../src/gui/npcdialog.cpp:134
+msgid "Reset"
+msgstr "Zurücksetzten"
 
-#: src/net/manaserv/beinghandler.cpp:306 src/net/tmwa/playerhandler.cpp:97
-msgid "You are not that alive anymore."
-msgstr "Du bist nicht länger lebendig."
+#: ../src/gui/setup.cpp:51
+msgid "Reset Windows"
+msgstr "Fenster zurücksetzen"
 
-#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:98
-msgid "The cold hands of the grim reaper are grabbing for your soul."
-msgstr "Die kalten Hände des Sensenmanns greifen nach Deiner Seele."
+#: ../src/gui/setup_video.cpp:438
+msgid "Restart needed for changes to take effect."
+msgstr "Änderungen treten erst nach einem Neustart des Programms in Kraft."
 
-#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:99
-msgid "Game Over!"
-msgstr "Game Over!"
+#: ../src/gui/setup_video.cpp:571 ../src/gui/setup_video.cpp:576
+msgid "Restart your client for the change to take effect."
+msgstr "Starte das Spiel neu um die Änderungen zu übernehmen."
 
-#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:101
-msgid ""
-"No, kids. Your character did not really die. It... err... went to a better "
-"place."
-msgstr ""
-"Nein, Kinder. Euer Charakter ist nicht tot. Er... ähm... ist zu einem "
-"besserem Ort gegangen."
+#: ../src/gui/inventorywindow.cpp:132 ../src/gui/popupmenu.cpp:385
+msgid "Retrieve"
+msgstr "Abholen"
 
-#: src/net/manaserv/beinghandler.cpp:311 src/net/tmwa/playerhandler.cpp:103
-msgid ""
-"Your plan of breaking your enemies weapon by bashing it with your throat "
-"failed."
-msgstr ""
-"Dein Plan, die Waffe deines Feindes mit Deinem Hals zu zerstören, war leider "
-"nicht ganz so genial, wie Du dachtest..."
+#: ../src/commandhandler.cpp:488
+msgid "Return now toggles chat."
+msgstr "Jetzt schließt Enter die Chatzeile."
 
-#: src/net/manaserv/beinghandler.cpp:313 src/net/tmwa/playerhandler.cpp:105
-msgid "I guess this did not run too well."
-msgstr "Ich glaube, das war nicht so gut."
+#: ../src/commandhandler.cpp:479
+msgid "Return toggles chat."
+msgstr "Enter-Taste schließt Chatzeile."
 
-#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:107
-msgid "Do you want your possessions identified?"
-msgstr "Möchtest du eine Auflistung Deiner Verletzungen?"
+#: ../src/gui/setup_joystick.cpp:84
+msgid "Rotate the stick"
+msgstr "Kreise den Steuerknüppel"
 
-#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:109
+#: ../src/net/manaserv/beinghandler.cpp:295
+#: ../src/net/tmwa/playerhandler.cpp:110
 msgid "Sadly, no trace of you was ever found..."
 msgstr "Leider wurde niemals eine Spur von Dir gefunden..."
 
-#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:111
-msgid "Annihilated."
-msgstr "Vernichtet."
-
-#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:113
-msgid "Looks like you got your head handed to you."
-msgstr "Sieht aus, als würde Dein Kopf Dich anschauen."
-
-#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:115
-msgid ""
-"You screwed up again, dump your body down the tubes and get you another one."
-msgstr ""
-"Du hast schon wieder versagt. Spül Deine Überreste hinunter und hol Dir "
-"einen paar Neue."
-
-#: src/net/manaserv/beinghandler.cpp:323
-msgid "Press OK to respawn."
-msgstr "Drücke \"OK\" um neu anzufangen."
+#: ../src/game.cpp:354
+msgid "Saving screenshot failed!"
+msgstr "Bildschirmfoto konnte nicht gespeichert werden!"
 
-#: src/net/manaserv/beinghandler.cpp:324
-msgid "You Died"
-msgstr "Du bist tot."
+#: ../src/gui/setup_video.cpp:570 ../src/gui/setup_video.cpp:575
+#, fuzzy
+msgid "Screen Resolution Changed"
+msgstr "Auflösung geändert"
 
-#: src/net/manaserv/charhandler.cpp:138 src/net/manaserv/charhandler.cpp:209
-msgid "Not logged in."
-msgstr "nicht angemeldet"
+#: ../src/keyboardconfig.cpp:54
+msgid "Screenshot"
+msgstr "Bildschirmfoto"
 
-#: src/net/manaserv/charhandler.cpp:141
-msgid "No empty slot."
-msgstr "Kein freier Slot."
+#: ../src/game.cpp:349
+#, fuzzy
+msgid "Screenshot saved as "
+msgstr "Bildschirmfoto wurde nach ~/ gespeichert."
 
-#: src/net/manaserv/charhandler.cpp:144
-msgid "Invalid name."
-msgstr "Ungültiger Name."
+#: ../src/keyboardconfig.cpp:98
+msgid "Scroll Chat Down"
+msgstr "Im Chat runter scrollen"
 
-#: src/net/manaserv/charhandler.cpp:147
-msgid "Character's name already exists."
-msgstr "Benutzername bereits vorhanden"
+#: ../src/keyboardconfig.cpp:97
+msgid "Scroll Chat Up"
+msgstr "Im Chat hochscrollen"
 
-#: src/net/manaserv/charhandler.cpp:150
-msgid "Invalid hairstyle."
-msgstr "Ungültiger Haarstil."
+#: ../src/gui/inventorywindow.cpp:87
+msgid "Search:"
+msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:153
-msgid "Invalid hair color."
-msgstr "Ungültige Haarfarbe."
+#: ../src/net/tmwa/specialhandler.cpp:184
+msgid "Seems you need more money... ;-)"
+msgstr "Es scheint, als bräuchtest Du mehr Geld... ;-)"
 
-#: src/net/manaserv/charhandler.cpp:156
-msgid "Invalid gender."
-msgstr "Ungültiges Geschlecht."
+#: ../src/keyboardconfig.cpp:101
+msgid "Select OK"
+msgstr "OK auswählen"
 
-#: src/net/manaserv/charhandler.cpp:159
-msgid "Character's stats are too high."
-msgstr "Spielfigurattribute sind zu groß."
+#: ../src/gui/worldselectdialog.cpp:71
+#, fuzzy
+msgid "Select World"
+msgstr "OK auswählen"
 
-#: src/net/manaserv/charhandler.cpp:162
-msgid "Character's stats are too low."
-msgstr "Spielfigurattribute sind zu klein"
+#: ../src/gui/itemamount.cpp:144
+msgid "Select amount of items to drop."
+msgstr "Wähle aus, wie viele Gegenstände Du wegwerfen möchtest."
 
-#: src/net/manaserv/charhandler.cpp:165
-#, c-format
-msgid "At least one statis out of the permitted range: (%u - %u)."
-msgstr ""
+#: ../src/gui/itemamount.cpp:150
+msgid "Select amount of items to retrieve."
+msgstr "Wähle aus, wie viele Gegenstände Du wieder haben möchtest."
 
-#: src/net/manaserv/charhandler.cpp:171 src/net/manaserv/loginhandler.cpp:96
-#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
-#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
-#: src/net/tmwa/loginhandler.cpp:95 src/net/tmwa/loginhandler.cpp:182
-msgid "Unknown error."
-msgstr "Unbekannter Fehler"
+#: ../src/gui/itemamount.cpp:153
+msgid "Select amount of items to split."
+msgstr "Wähle aus, wie viel Gegenstände Du aufteilen möchtest."
 
-#: src/net/manaserv/charhandler.cpp:200 src/net/tmwa/charserverhandler.cpp:146
-msgid "Info"
-msgstr "Info"
+#: ../src/gui/itemamount.cpp:147
+msgid "Select amount of items to store."
+msgstr "Wähle aus, wie viele Gegenstände Du einlagern möchtest."
 
-#: src/net/manaserv/charhandler.cpp:200
-msgid "Player deleted."
-msgstr "Spieler gelöscht"
+#: ../src/gui/itemamount.cpp:141
+msgid "Select amount of items to trade."
+msgstr "Wähle aus, wie viele Gegenstände Du tauschen möchtest."
 
-#: src/net/manaserv/charhandler.cpp:212
+#: ../src/net/manaserv/charhandler.cpp:222
 #, fuzzy
 msgid "Selection out of range."
 msgstr "Wähle aus, wie viele Gegenstände Du tauschen möchtest."
 
-#: src/net/manaserv/charhandler.cpp:215
-#, fuzzy, c-format
-msgid "Unknown error (%d)."
-msgstr "Unbekannter Fehler"
+#: ../src/gui/buysell.cpp:47 ../src/gui/sell.cpp:49 ../src/gui/sell.cpp:76
+msgid "Sell"
+msgstr "Verkaufen"
 
-#: src/net/manaserv/charhandler.cpp:250
-msgid "No gameservers are available."
-msgstr "Kein Server verfügbar"
+#: ../src/gui/npcpostdialog.cpp:54
+msgid "Send"
+msgstr "Senden"
 
-#: src/net/manaserv/chathandler.cpp:187 src/net/manaserv/chathandler.cpp:313
-#: src/net/manaserv/guildhandler.cpp:260
-#, c-format
-msgid "Topic: %s"
-msgstr "Thema: %s"
+#: ../src/net/tmwa/loginhandler.cpp:182
+msgid "Server overpopulated."
+msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:274
-msgid "Players in this channel:"
-msgstr "Spieler im Kanal:"
+#: ../src/net/net.cpp:164
+msgid "Server protocol unsupported"
+msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:208
-msgid "Error joining channel."
-msgstr "Fehler beim Betreten des Kanals."
+#: ../src/gui/serverdialog.cpp:208
+#, fuzzy
+msgid "Server type:"
+msgstr "Server:"
 
-#: src/net/manaserv/chathandler.cpp:214
-msgid "Listing channels."
-msgstr "Liste Kanäle"
+#: ../src/gui/serverdialog.cpp:206 ../src/gui/widgets/chattab.cpp:142
+msgid "Server:"
+msgstr "Server:"
 
-#: src/net/manaserv/chathandler.cpp:226
-msgid "End of channel list."
-msgstr "Ende der Channel-Liste."
+#: ../src/client.cpp:580 ../src/gui/setup.cpp:43 ../src/gui/windowmenu.cpp:66
+msgid "Setup"
+msgstr "Einstellungen"
 
-#: src/net/manaserv/chathandler.cpp:303
-#, c-format
-msgid "%s entered the channel."
-msgstr "%s ist dem Kanal beigetreten."
+#: ../src/keyboardconfig.cpp:77
+msgid "Setup Window"
+msgstr "Einstellungen"
 
-#: src/net/manaserv/chathandler.cpp:308
-#, c-format
-msgid "%s left the channel."
-msgstr "%s hat den Channel verlassen."
+#: ../src/gui/setup_audio.cpp:50
+msgid "Sfx volume"
+msgstr "Lautstärke der Klangeffekte"
 
-#: src/net/manaserv/chathandler.cpp:324
-#, c-format
-msgid "%s has set mode %s on user %s."
-msgstr "%s hat den Modus %s auf den Spieler %s gesetzt."
+#: ../src/gui/buysell.cpp:38
+msgid "Shop"
+msgstr "Geschäft"
 
-#: src/net/manaserv/chathandler.cpp:334
-#, c-format
-msgid "%s has kicked %s."
-msgstr "%s hat %s gekickt."
+#: ../src/gui/windowmenu.cpp:65
+msgid "Shortcut"
+msgstr "Tastenkürzel"
 
-#: src/net/manaserv/chathandler.cpp:339
+#: ../src/commandhandler.cpp:505 ../src/commandhandler.cpp:514
+msgid "Show IP: Off"
+msgstr "IP Anzeige: Aus"
+
+#: ../src/commandhandler.cpp:505 ../src/commandhandler.cpp:518
+msgid "Show IP: On"
+msgstr "IP Anzeige: An"
+
+#: ../src/gui/setup_video.cpp:246
 #, fuzzy
-msgid "Unknown channel event."
-msgstr "Unbekannter Befehl."
+msgid "Show damage"
+msgstr "Eigener Name"
 
-#: src/net/manaserv/guildhandler.cpp:82
-msgid "Guild created."
-msgstr "Gilde erstellt."
+#: ../src/gui/setup_players.cpp:233
+#, fuzzy
+msgid "Show gender"
+msgstr "Geschlecht"
 
-#: src/net/manaserv/guildhandler.cpp:87
-msgid "Error creating guild."
-msgstr "Fehler beim Erstellen der Gilde."
+#: ../src/gui/setup_video.cpp:219
+#, fuzzy
+msgid "Show own name"
+msgstr "Eigener Name"
 
-#: src/net/manaserv/guildhandler.cpp:97
-msgid "Invite sent."
-msgstr "Einladung gesendet."
+#: ../src/gui/setup_video.cpp:221
+msgid "Show pickup notification"
+msgstr "Benachrichtigung beim Aufheben"
 
-#: src/net/manaserv/guildhandler.cpp:204
-msgid "Member was promoted successfully."
-msgstr "Mitglied wurde erfolgreich befördert."
+#: ../src/keyboardconfig.cpp:53
+msgid "Sit"
+msgstr "Sitzen"
 
-#: src/net/manaserv/guildhandler.cpp:209
-msgid "Failed to promote member."
-msgstr "Beförderung des Mitglieds gescheitert."
+#: ../src/net/tmwa/specialhandler.cpp:151
+msgid "Sit failed!"
+msgstr "Sitzen fehlgeschlagen!"
 
-#: src/net/manaserv/loginhandler.cpp:87
-msgid "Wrong magic_token."
-msgstr "Fehlerhaftes Magiemerkmal"
+#: ../src/gui/skilldialog.cpp:377
+#, fuzzy, c-format
+msgid "Skill %d"
+msgstr "Fertigkeiten"
 
-#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
-msgid "Already logged in."
-msgstr "Bereits angemeldet"
+#: ../src/gui/skilldialog.cpp:368
+#, fuzzy, c-format
+msgid "Skill Set %d"
+msgstr "Fähigkeitspunkte: %d"
 
-#: src/net/manaserv/loginhandler.cpp:93
-#, fuzzy
-msgid "Account banned."
-msgstr "Account abgelaufen"
+#: ../src/keyboardconfig.cpp:73
+msgid "Skill Window"
+msgstr "Fertigkeitenfenster"
 
-#: src/net/manaserv/loginhandler.cpp:118
-msgid "New password incorrect."
-msgstr "Neues Passwort fehlerhaft"
+#: ../src/gui/skilldialog.cpp:273
+#, fuzzy, c-format
+msgid "Skill points available: %d"
+msgstr "Fähigkeitspunkte: %d"
 
-#: src/net/manaserv/loginhandler.cpp:121 src/net/tmwa/loginhandler.cpp:89
-msgid "Old password incorrect."
-msgstr "Altes Passwort fehlerhaft"
+#: ../src/gui/skilldialog.cpp:215 ../src/gui/windowmenu.cpp:59
+msgid "Skills"
+msgstr "Fertigkeiten"
 
-#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
-msgid "Account not connected. Please login first."
-msgstr "Account nicht verbunden. Bitte melde Dich zuerst an."
+#: ../src/gui/inventorywindow.cpp:86
+msgid "Slots:"
+msgstr "Plätze:"
 
-#: src/net/manaserv/loginhandler.cpp:149
-msgid "New email address incorrect."
-msgstr "Neue E-Mailadresse ist fehlerhaft"
+#: ../src/gui/setup_video.cpp:129
+msgid "Small"
+msgstr "Klein"
 
-#: src/net/manaserv/loginhandler.cpp:152
-msgid "Old email address incorrect."
-msgstr "Alte E-Mailadresse ist fehlerhaft"
+#: ../src/keyboardconfig.cpp:45
+msgid "Smilie"
+msgstr "Grinsen"
 
-#: src/net/manaserv/loginhandler.cpp:158
-msgid "The new email address already exists."
-msgstr "Die neue E-Mailadresse ist bereits vorhanden."
+#: ../src/gui/socialwindow.cpp:312 ../src/gui/windowmenu.cpp:64
+#, fuzzy
+msgid "Social"
+msgstr "Special"
 
-#: src/net/manaserv/loginhandler.cpp:239
-msgid ""
-"Client registration is not allowed. Please contact server administration."
+#: ../src/keyboardconfig.cpp:79
+#, fuzzy
+msgid "Social Window"
+msgstr "Fertigkeitenfenster"
+
+#: ../src/gui/setup_video.cpp:573
+msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
-"Client Registrierung wurde deaktiviert. Bitte den Serveradministrator "
-"kontaktieren."
+"Einige Fenster können verschoben werden um sich an die geänderte Auflösung "
+"anzupassen."
 
-#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
-msgid "Client version is too old."
-msgstr "Die Version des Spiels ist zu alt"
+#: ../src/net/tmwa/generalhandler.cpp:139
+msgid "Someone else is trying to use this account."
+msgstr "Jemand anderes versucht diesen Account zu benutzen"
 
-#: src/net/manaserv/loginhandler.cpp:266
-msgid "Wrong username or password."
-msgstr "Benutzername oder Passwort falsch"
+#: ../src/gui/setup_audio.cpp:42
+msgid "Sound"
+msgstr "Ton"
 
-#: src/net/manaserv/loginhandler.cpp:272
-#, fuzzy
-msgid "Account banned"
-msgstr "Account abgelaufen"
+#: ../src/gui/setup_audio.cpp:106
+msgid "Sound Engine"
+msgstr "Soundengine"
 
-#: src/net/manaserv/loginhandler.cpp:275
-msgid "Login attempt too soon after previous attempt."
-msgstr "Anmeldeversuch zu früh nach vorherigem Versuch."
+#: ../src/gui/specialswindow.cpp:79 ../src/gui/windowmenu.cpp:62
+msgid "Specials"
+msgstr "Special"
 
-#: src/net/manaserv/loginhandler.cpp:303
-msgid "Wrong username, password or email address."
-msgstr "Benutzername, Passwort oder E-Mailadresse falsch"
+#: ../src/gui/setup_colors.cpp:89 ../src/gui/setup_colors.cpp:90
+#: ../src/gui/setup_colors.cpp:333
+msgid "Spectrum"
+msgstr "Spektrum"
 
-#: src/net/manaserv/loginhandler.cpp:306
-msgid "Username already exists."
-msgstr "Benutzername bereits vorhanden"
+#: ../src/net/tmwa/generalhandler.cpp:145
+msgid "Speed hack detected."
+msgstr "Geschwindigkeitsproblem festgestellt"
 
-#: src/net/manaserv/loginhandler.cpp:309
-msgid "Email address already exists."
-msgstr "E-Mailadresse bereits vorhanden"
+#: ../src/gui/inventorywindow.cpp:108 ../src/gui/popupmenu.cpp:378
+msgid "Split"
+msgstr "Aufteilen"
 
-#: src/net/manaserv/loginhandler.cpp:312
-msgid "You took too long with the captcha or your response was incorrect."
+#: ../src/localplayer.cpp:899
+msgid "Stack is too big."
 msgstr ""
-"Du hast für das Captcha zu lange gebraucht oder deine Eingabe war inkorrekt."
 
-#: src/net/manaserv/partyhandler.cpp:87
-msgid "Joined party."
-msgstr "Der Party beigetreten."
-
-#: src/net/manaserv/partyhandler.cpp:105
-#, c-format
-msgid "%s joined the party."
-msgstr "%s ist der Party beigetreten."
-
-#: src/net/manaserv/partyhandler.cpp:123
-#, c-format
-msgid "%s rejected your invite."
-msgstr "%s hat Deine Einladung zurückgewiesen."
+#: ../src/gui/recorder.cpp:104
+msgid "Starting to record..."
+msgstr "Starte Aufzeichnung..."
 
-#: src/net/manaserv/tradehandler.cpp:95
-msgid "Accepting incoming trade requests."
-msgstr "Akzeptiere eingehende Handelsanfragen."
+#: ../src/gui/setup_colors.cpp:83 ../src/gui/setup_colors.cpp:331
+msgid "Static"
+msgstr "Statisch"
 
-#: src/net/manaserv/tradehandler.cpp:97
-msgid "Ignoring incoming trade requests."
-msgstr "Ignoriere eingehende Handelsanfragen."
+#: ../src/gui/windowmenu.cpp:54
+msgid "Status"
+msgstr "Status"
 
-#: src/net/manaserv/tradehandler.cpp:115 src/net/tmwa/tradehandler.cpp:109
-msgid "Request for Trade"
-msgstr "Erbitte einen Handel"
+#: ../src/keyboardconfig.cpp:70
+msgid "Status Window"
+msgstr "Statusfenster"
 
-#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:110
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr "%s möchte mit dir handeln, stimmst Du zu?"
+#: ../src/gui/setup_joystick.cpp:83
+msgid "Stop"
+msgstr "Stopp"
 
-#: src/net/manaserv/tradehandler.cpp:134
-#, c-format
-msgid "Trading with %s"
-msgstr "Handele mit %s"
+#: ../src/keyboardconfig.cpp:47
+msgid "Stop Attack"
+msgstr "Angriff abbrechen"
 
-#: src/net/manaserv/tradehandler.cpp:148 src/net/tmwa/tradehandler.cpp:224
-msgid "Trade canceled."
-msgstr "Handel abgebrochen."
+#: ../src/gui/recorder.h:39
+msgid "Stop recording"
+msgstr "Stoppe Aufzeichnung"
 
-#: src/net/manaserv/tradehandler.cpp:155 src/net/tmwa/tradehandler.cpp:231
-msgid "Trade completed."
-msgstr "Handel abgeschlossen."
+#: ../src/gui/inventorywindow.cpp:59
+msgid "Storage"
+msgstr "Lager"
 
-#: src/net/tmwa/adminhandler.cpp:64
-msgid "Kick failed!"
-msgstr "Spieler konnte nicht aus dem Kanal geworfen werden!"
+#: ../src/gui/inventorywindow.cpp:131 ../src/gui/popupmenu.cpp:358
+msgid "Store"
+msgstr "Einlagern"
 
-#: src/net/tmwa/adminhandler.cpp:66
-msgid "Kick succeeded!"
-msgstr "Spieler aus dem Kanal geworfen!"
+#: ../src/net/manaserv/attributes.cpp:166
+#: ../src/net/tmwa/generalhandler.cpp:230
+msgid "Strength"
+msgstr "Stärke"
 
-#: src/net/tmwa/buysellhandler.cpp:109
-msgid "Nothing to sell."
-msgstr "Du hast nichts zu verkaufen."
+#: ../src/net/manaserv/attributes.cpp:173
+#, fuzzy, c-format
+msgid "Strength %+.1f"
+msgstr "Stärke %+d"
 
-#: src/net/tmwa/buysellhandler.cpp:116
-msgid "Thanks for buying."
-msgstr "Vielen Dank für den Einkauf."
+#: ../src/net/tmwa/generalhandler.cpp:102
+#, c-format
+msgid "Strength %+d"
+msgstr "Stärke %+d"
 
-#: src/net/tmwa/buysellhandler.cpp:123
-msgid "Unable to buy."
-msgstr "Kauf fehlgeschlagen."
+#: ../src/net/tmwa/charserverhandler.cpp:270
+msgid "Strength:"
+msgstr "Stärke:"
 
-#: src/net/tmwa/buysellhandler.cpp:129
-msgid "Thanks for selling."
-msgstr "Vielen Dank für den Verkauf."
+#: ../src/gui/npcdialog.cpp:51
+msgid "Submit"
+msgstr "Absenden"
 
-#: src/net/tmwa/buysellhandler.cpp:131
-msgid "Unable to sell."
-msgstr "Verkauf fehlgeschlagen."
+#: ../src/gui/charselectdialog.cpp:131
+msgid "Switch Login"
+msgstr "Login wechseln"
 
-#: src/net/tmwa/charserverhandler.cpp:103
-msgid "Access denied. Most likely, there are too many players on this server."
-msgstr "Zugriff verweigert. Wahrscheinlich zu viele Spieler auf dem Server."
+#: ../src/gui/quitdialog.cpp:45
+msgid "Switch character"
+msgstr "Spielfigur wechseln"
 
-#: src/net/tmwa/charserverhandler.cpp:107
-msgid "Cannot use this ID."
-msgstr "Kann diese ID nicht benutzen"
+#: ../src/gui/quitdialog.cpp:44
+msgid "Switch server"
+msgstr "Server wechseln"
 
-#: src/net/tmwa/charserverhandler.cpp:110
+#: ../src/gui/setup_video.cpp:437
 #, fuzzy
-msgid "Unknown char-server failure."
-msgstr "Unbekannter Fehler"
+msgid "Switching to Full Screen"
+msgstr "Wechsle zum Vollbildmodus"
 
-#: src/net/tmwa/charserverhandler.cpp:134
-msgid "Failed to create character. Most likely the name is already taken."
-msgstr ""
-"Charakter konnte nicht erstellt werden. Wahrscheinlich ist der Name bereits "
-"vergeben."
+#: ../src/keyboardconfig.cpp:46
+msgid "Talk"
+msgstr "Sprechen"
 
-#: src/net/tmwa/charserverhandler.cpp:146
-msgid "Character deleted."
-msgstr "Spieler gelöscht."
+#: ../src/gui/popupmenu.cpp:150
+#, c-format
+msgid "Talk to %s"
+msgstr "Rede mit %s"
 
-#: src/net/tmwa/charserverhandler.cpp:151
-msgid "Failed to delete character."
-msgstr "Spieler konnte nicht gelöscht werden."
+#: ../src/keyboardconfig.cpp:44
+msgid "Target & Attack"
+msgstr "Zielen & Angreifen"
 
-#: src/net/tmwa/charserverhandler.cpp:266
-msgid "Strength:"
-msgstr "Stärke:"
+#: ../src/keyboardconfig.cpp:48
+#, fuzzy
+msgid "Target Monster"
+msgstr "Nächstes Ziel anvisieren"
 
-#: src/net/tmwa/charserverhandler.cpp:267
-msgid "Agility:"
-msgstr "Agilität:"
+#: ../src/keyboardconfig.cpp:49
+msgid "Target NPC"
+msgstr "NPC anvisieren"
 
-#: src/net/tmwa/charserverhandler.cpp:268
-msgid "Vitality:"
-msgstr "Vitalität:"
+#: ../src/keyboardconfig.cpp:50
+msgid "Target Player"
+msgstr "Spieler anvisieren"
 
-#: src/net/tmwa/charserverhandler.cpp:269
-msgid "Intelligence:"
-msgstr "Intelligenz:"
+#: ../src/gui/setup_video.cpp:158
+msgid "Text"
+msgstr "Text"
 
-#: src/net/tmwa/charserverhandler.cpp:270
-msgid "Dexterity:"
-msgstr "Geschicklichkeit:"
+#: ../src/net/tmwa/buysellhandler.cpp:116
+msgid "Thanks for buying."
+msgstr "Vielen Dank für den Einkauf."
 
-#: src/net/tmwa/charserverhandler.cpp:271
-msgid "Luck:"
-msgstr "Glück:"
+#: ../src/net/tmwa/buysellhandler.cpp:129
+msgid "Thanks for selling."
+msgstr "Vielen Dank für den Verkauf."
 
-#: src/net/tmwa/chathandler.cpp:87
-#, fuzzy, c-format
-msgid "Whisper could not be sent, %s is offline."
-msgstr "Nachricht konnte nicht gesendet werden, Spieler ist offline."
+#: ../src/net/manaserv/beinghandler.cpp:287
+#: ../src/net/tmwa/playerhandler.cpp:99
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr "Die kalten Hände des Sensenmanns greifen nach Deiner Seele."
 
-#: src/net/tmwa/chathandler.cpp:96
-#, fuzzy, c-format
-msgid "Whisper could not be sent, ignored by %s."
+#: ../src/game.cpp:385
+#, fuzzy
+msgid "The connection to the server was lost."
 msgstr ""
-"Nachricht konnte nicht gesendet werden, sie wurde vom Spieler ignoriert."
+"Die Verbindung zum Server wurde getrennt, das Programm wird jetzt beendet"
 
-#: src/net/tmwa/chathandler.cpp:230
-msgid "MVP player."
-msgstr "Spieler"
+#: ../src/gui/changeemaildialog.cpp:141
+msgid "The email address entries mismatch."
+msgstr "Die neuen E-Mailadresse stimmen nicht überein."
 
-#: src/net/tmwa/chathandler.cpp:265 src/net/tmwa/chathandler.cpp:271
-#: src/net/tmwa/chathandler.cpp:276 src/net/tmwa/chathandler.cpp:281
-#: src/net/tmwa/chathandler.cpp:286 src/net/tmwa/chathandler.cpp:291
-#: src/net/tmwa/chathandler.cpp:296 src/net/tmwa/chathandler.cpp:301
-msgid "Channels are not supported!"
-msgstr "Kanäle werden nicht unterstützt!"
+#: ../src/net/manaserv/loginhandler.cpp:158
+msgid "The new email address already exists."
+msgstr "Die neue E-Mailadresse ist bereits vorhanden."
 
-#: src/net/tmwa/gamehandler.cpp:88
+#: ../src/gui/changeemaildialog.cpp:127
 #, c-format
-msgid "Online users: %d"
-msgstr "Benutzer online: %d"
+msgid "The new email address needs to be at least %d characters long."
+msgstr "Die neue E-Mailadresse muss aus mindestens %d Zeichen bestehen."
 
-#: src/net/tmwa/gamehandler.cpp:101
-msgid "Game"
-msgstr "Spiel"
+#: ../src/gui/changeemaildialog.cpp:134
+#, c-format
+msgid "The new email address needs to be less than %d characters long."
+msgstr "Die neue E-Mailadresse muss kürzer als %d Zeichen sein."
 
-#: src/net/tmwa/gamehandler.cpp:101
-#, fuzzy
-msgid "Request to quit denied!"
-msgstr "Erbitte einen Handel"
+#: ../src/gui/changepassworddialog.cpp:130
+msgid "The new password entries mismatch."
+msgstr "Die neues Passwörter stimmen nicht überein."
 
-#: src/net/tmwa/generalhandler.cpp:102
+#: ../src/gui/changepassworddialog.cpp:116
 #, c-format
-msgid "Strength %+d"
-msgstr "Stärke %+d"
+msgid "The new password needs to be at least %d characters long."
+msgstr "Das neue Passwort muss aus mindestens %d Zeichen bestehen."
 
-#: src/net/tmwa/generalhandler.cpp:103
+#: ../src/gui/changepassworddialog.cpp:123
 #, c-format
-msgid "Agility %+d"
-msgstr "Beweglichkeit %+d"
+msgid "The new password needs to be less than %d characters long."
+msgstr "Das neue Passwort muss kürzer als %d Zeichen sein."
 
-#: src/net/tmwa/generalhandler.cpp:104
+#: ../src/gui/register.cpp:182 ../src/gui/unregisterdialog.cpp:117
 #, c-format
-msgid "Vitality %+d"
-msgstr "Gesundheit %+d"
+msgid "The password needs to be at least %d characters long."
+msgstr "Das Passwort muss aus mindestens %d Zeichen bestehen."
 
-#: src/net/tmwa/generalhandler.cpp:105
+#: ../src/gui/register.cpp:190 ../src/gui/unregisterdialog.cpp:124
 #, c-format
-msgid "Intelligence %+d"
-msgstr "Intelligenz %+d"
+msgid "The password needs to be less than %d characters long."
+msgstr "Das Passwort muss kürzer als %d Zeichen sein."
 
-#: src/net/tmwa/generalhandler.cpp:106
+#: ../src/gui/register.cpp:166
 #, c-format
-msgid "Dexterity %+d"
-msgstr "Ausdauer %+d"
+msgid "The username needs to be at least %d characters long."
+msgstr "Der Nutzername muss aus mindestens %d Zeichen bestehen."
 
-#: src/net/tmwa/generalhandler.cpp:107
+#: ../src/gui/register.cpp:174
 #, c-format
-msgid "Luck %+d"
-msgstr "Glück %+d"
-
-#: src/net/tmwa/generalhandler.cpp:132
-msgid "Authentication failed."
-msgstr "Authentifizierung fehlgeschlagen"
-
-#: src/net/tmwa/generalhandler.cpp:135
-msgid "No servers available."
-msgstr "Keine Server verfügbar"
-
-#: src/net/tmwa/generalhandler.cpp:139
-msgid "Someone else is trying to use this account."
-msgstr "Jemand anderes versucht diesen Account zu benutzen"
+msgid "The username needs to be less than %d characters long."
+msgstr "Der Nutzername muss kürzer als %d Zeichen sein."
 
-#: src/net/tmwa/generalhandler.cpp:142
+#: ../src/net/tmwa/generalhandler.cpp:142
 msgid "This account is already logged in."
 msgstr "Dieser Account ist bereits angemeldet"
 
-#: src/net/tmwa/generalhandler.cpp:145
-msgid "Speed hack detected."
-msgstr "Geschwindigkeitsproblem festgestellt"
-
-#: src/net/tmwa/generalhandler.cpp:148
-msgid "Duplicated login."
-msgstr "Mehrfache Anmeldung"
-
-#: src/net/tmwa/generalhandler.cpp:151
-msgid "Unknown connection error."
-msgstr "Unbekannter Verbindungsfehler"
+#: ../src/net/tmwa/gui/guildtab.cpp:81
+#, fuzzy
+msgid "This command causes the player to leave the guild."
+msgstr "Dieser Befehl lässt Dich die Party verlassen"
 
-#: src/net/tmwa/generalhandler.cpp:209
-msgid "Got disconnected from server!"
-msgstr "Verbindung zum Server unterbrochen!"
+#: ../src/net/tmwa/gui/partytab.cpp:81
+msgid "This command causes the player to leave the party."
+msgstr "Dieser Befehl lässt Dich die Party verlassen"
 
-#: src/net/tmwa/generalhandler.cpp:230
-msgid "Strength"
-msgstr "Stärke"
+#: ../src/net/tmwa/gui/partytab.cpp:96
+msgid "This command changes the party's experience sharing policy."
+msgstr "Dieser Befehl ändert das Teilen der Erfahrungspunkte in einer Party."
 
-#: src/net/tmwa/generalhandler.cpp:231
-msgid "Agility"
-msgstr "Beweglichkeit"
+#: ../src/net/tmwa/gui/partytab.cpp:86
+msgid "This command changes the party's item sharing policy."
+msgstr ""
+"Dieser Befehl ändert die Einstellungen zum Teilen von Gegenständen in einer "
+"Party."
 
-#: src/net/tmwa/generalhandler.cpp:232
-msgid "Vitality"
-msgstr "Gesundheit"
+#: ../src/commandhandler.cpp:274
+#, fuzzy
+msgid "This command clears the away status and message."
+msgstr "Dieser Befehl setzt das Theme auf <Thema>."
 
-#: src/net/tmwa/generalhandler.cpp:233
-msgid "Intelligence"
-msgstr "Intelligenz"
+#: ../src/commandhandler.cpp:228
+msgid "This command clears the chat log of previous chat."
+msgstr "Dieser Befehl bereinigt den Chatlog des vorherigen Chats."
 
-#: src/net/tmwa/generalhandler.cpp:234
-msgid "Dexterity"
-msgstr "Ausdauer"
+#: ../src/gui/widgets/whispertab.cpp:85
+msgid "This command closes the current whisper tab."
+msgstr "Dieser Befehl schließt den aktuellen privaten Tab."
 
-#: src/net/tmwa/generalhandler.cpp:235
-msgid "Luck"
-msgstr "Glück"
+#: ../src/commandhandler.cpp:279
+#, fuzzy
+msgid "This command creates a new party called <name>."
+msgstr "Dieser Befehl erstellt eine neue Party mit dem Namen <Party-Name>"
 
-#: src/net/tmwa/generalhandler.cpp:238
-msgid "Defense"
-msgstr "Verteidigung:"
+#: ../src/commandhandler.cpp:209
+msgid "This command displays a list of all commands available."
+msgstr "Dieser Befehl zeigt alle möglichen Befehle an"
 
-#: src/net/tmwa/generalhandler.cpp:239
-msgid "M.Attack"
-msgstr "M.Angriff:"
+#: ../src/commandhandler.cpp:212
+msgid "This command displays help on <command>."
+msgstr "Dieser Befehl zeigt die Hilfe für <Befehl>."
 
-#: src/net/tmwa/generalhandler.cpp:240
-msgid "M.Defense"
-msgstr "M.Verteidigung:"
+#: ../src/commandhandler.cpp:323
+msgid "This command displays the name of the current map."
+msgstr "Dieser Befehl zeigt den Namen der aktuellen Karte an."
 
-#: src/net/tmwa/generalhandler.cpp:241
-#, c-format
-msgid "% Accuracy"
-msgstr "% Accuracy"
+#: ../src/commandhandler.cpp:328
+msgid "This command displays the number of players currently online."
+msgstr "Dieser Befehl zeigt die Anzahl der Spieler an, die gerade online sind."
 
-#: src/net/tmwa/generalhandler.cpp:242
-#, c-format
-msgid "% Evade"
-msgstr "% Evade"
+#: ../src/net/tmwa/gui/partytab.cpp:101
+msgid "This command displays the party's current experience sharing policy."
+msgstr ""
+"Dieser Befehl zeigt an, ob das Teilen von Erfahrungspunkten in der Party "
+"aktiviert ist."
 
-#: src/net/tmwa/generalhandler.cpp:243
-#, c-format
-msgid "% Critical"
-msgstr "% Critical"
+#: ../src/net/tmwa/gui/partytab.cpp:91
+msgid "This command displays the party's current item sharing policy."
+msgstr ""
+"Dieser Befehl zeigt an, ob Gegenstände in der Party geteilt werden, oder "
+"nicht."
 
-#: src/net/tmwa/gui/guildtab.cpp:45
-msgid "Guild"
-msgstr "Gilde"
+#: ../src/commandhandler.cpp:312
+msgid "This command displays the return toggle status."
+msgstr "Dieser Befehl zeigt, wann sich die Chatzeile schließt."
 
-#: src/net/tmwa/gui/guildtab.cpp:61 src/net/tmwa/gui/partytab.cpp:59
-msgid "/help > Display this help."
-msgstr "/help > Diese Hilfe anzeigen"
+#: ../src/commandhandler.cpp:301
+msgid "This command finishes a recording session."
+msgstr "Dieser Befehl beendet den Mitschnitt des Chats."
 
-#: src/net/tmwa/gui/guildtab.cpp:62
-#, fuzzy
-msgid "/invite > Invite a player to your guild"
-msgstr "/invite > Lade einen Spieler zu Deiner Party ein"
+#: ../src/commandhandler.cpp:291
+msgid ""
+"This command gets a list of players within hearing and sends it to either "
+"the record log if recording, or the chat log otherwise."
+msgstr ""
+"Dieser Befehl erstellt eine Liste mit allen Spielern in Hörreichweite und "
+"sendet sie entweder an das Chatlog, falls aktiviert, oder zeigt sie im "
+"Chatfenster an."
 
-#: src/net/tmwa/gui/guildtab.cpp:63
-#, fuzzy
-msgid "/leave > Leave the guild you are in"
-msgstr "/leave > Verlasse die Party, in der Du Mitglied bist"
+#: ../src/commandhandler.cpp:233
+msgid "This command ignores the given player regardless of current relations."
+msgstr "Dieser Befehl zeigt die Anzahl der Spieler an, die gerade online sind."
 
-#: src/net/tmwa/gui/guildtab.cpp:64
+#: ../src/gui/widgets/whispertab.cpp:90
 #, fuzzy
-msgid "/kick > Kick some one from the guild you are in"
-msgstr "/kick > Werfe jemanden aus Deiner Party"
+msgid "This command ignores the other player regardless of current relations."
+msgstr "Dieser Befehl zeigt die Anzahl der Spieler an, die gerade online sind."
 
-#: src/net/tmwa/gui/guildtab.cpp:73 src/net/tmwa/gui/partytab.cpp:73
-msgid "Command: /invite <nick>"
-msgstr "Befehl: /invite <Name>"
+#: ../src/commandhandler.cpp:284 ../src/net/tmwa/gui/partytab.cpp:74
+msgid "This command invites <nick> to party with you."
+msgstr "Dieser Befehl lädt Spieler <Name> zu einer Party mit Dir ein."
 
-#: src/net/tmwa/gui/guildtab.cpp:74
+#: ../src/net/tmwa/gui/guildtab.cpp:74
 #, fuzzy
 msgid "This command invites <nick> to the guild you're in."
 msgstr "Dieser Befehl lädt Spieler <Name> zu einer Party mit Dir ein."
 
-#: src/net/tmwa/gui/guildtab.cpp:80 src/net/tmwa/gui/partytab.cpp:80
-msgid "Command: /leave"
-msgstr "Befehl: /leave"
-
-#: src/net/tmwa/gui/guildtab.cpp:81
-#, fuzzy
-msgid "This command causes the player to leave the guild."
-msgstr "Dieser Befehl lässt Dich die Party verlassen"
-
-#: src/net/tmwa/gui/guildtab.cpp:89
-#, fuzzy
-msgid "Guild name is missing."
-msgstr "Name der Party fehlt."
+#: ../src/gui/widgets/channeltab.cpp:74
+msgid "This command leaves the current channel."
+msgstr "Mit diesem Befehl verlässt Du den aktuellen Kanal"
 
-#: src/net/tmwa/guildhandler.cpp:296
-msgid "Could not inivte user to guild."
-msgstr "Konnte User nicht in Gilde einladen."
+#: ../src/gui/widgets/channeltab.cpp:81
+msgid "This command makes <nick> a channel operator."
+msgstr "Dieser Befehl macht Spieler <Name> zu einem Moderator des Kanals"
 
-#: src/net/tmwa/guildhandler.cpp:301
-#, fuzzy
-msgid "User rejected guild invite."
-msgstr "%s hat Deine Einladung zurückgewiesen."
+#: ../src/gui/widgets/channeltab.cpp:90
+msgid "This command makes <nick> leave the channel."
+msgstr "Diese Befehl wirft Spieler <Name> aus dem Kanal"
 
-#: src/net/tmwa/guildhandler.cpp:306
-#, fuzzy
-msgid "User is now part of your guild."
-msgstr "%s ist nun Mitglied Deiner Party."
+#: ../src/commandhandler.cpp:239
+msgid "This command makes you enter <channel>."
+msgstr "Dieser Befehl lässt dich dem Kanal <Kanal> beitreten."
 
-#: src/net/tmwa/guildhandler.cpp:311
-msgid "Your guild is full."
-msgstr "Deine Gilde ist voll."
+#: ../src/commandhandler.cpp:222
+msgid "This command sends the message <msg> to all players currently online."
+msgstr ""
+"Dieser Befehl versendet die Nachricht <Nachricht> an alle Spieler die gerade "
+"online sind."
 
-#: src/net/tmwa/guildhandler.cpp:316
-#, fuzzy
-msgid "Unknown guild invite response."
-msgstr "Unbekannte Reaktion auf die Einladung von %s."
+#: ../src/commandhandler.cpp:257
+msgid "This command sends the text <message> to <nick>."
+msgstr "Dieser Befehl sendet den Text <Nachricht> an den Spieler <Name>."
 
-#: src/net/tmwa/guildhandler.cpp:393
-msgid "Guild creation isn't supported yet."
-msgstr "Gildenerstellung wird nocht nicht unterstützt."
+#: ../src/gui/widgets/channeltab.cpp:69
+msgid "This command sets the topic to <message>."
+msgstr "Dieser Befehl setzt das Theme auf <Thema>."
 
-#: src/net/tmwa/gui/partytab.cpp:43
-msgid "Party"
-msgstr "Party"
+#: ../src/commandhandler.cpp:306
+msgid ""
+"This command sets whether the return key should toggle the chat log, or "
+"whether the chat log turns off automatically."
+msgstr ""
+"Mit diesem Befehl kannst Du entscheiden, ob die Chatzeile schließt, sobald "
+"eine Nachricht gesendet wurde, oder erst nachdem die Enter-Taste erneut "
+"gedrückt wurde."
 
-#: src/net/tmwa/gui/partytab.cpp:60
-msgid "/invite > Invite a player to your party"
-msgstr "/invite > Lade einen Spieler zu Deiner Party ein"
+#: ../src/commandhandler.cpp:245
+msgid "This command shows a list of all channels."
+msgstr "Dieser Befehl zeigt eine liste aller Kanäle an."
 
-#: src/net/tmwa/gui/partytab.cpp:61
-msgid "/leave > Leave the party you are in"
-msgstr "/leave > Verlasse die Party, in der Du Mitglied bist"
+#: ../src/gui/widgets/channeltab.cpp:64
+msgid "This command shows the users in this channel."
+msgstr "Dieser Befehl zeigt eine Liste der Spieler im aktuellen Kanal."
 
-#: src/net/tmwa/gui/partytab.cpp:62
-msgid "/kick > Kick some one from the party you are in"
-msgstr "/kick > Werfe jemanden aus Deiner Party"
+#: ../src/commandhandler.cpp:298
+msgid "This command starts recording the chat log to the file <filename>."
+msgstr ""
+"Dieser Befehl startet den Mitschnitt des Chats (Chatlog) in die Datei "
+"<Dateiname>."
 
-#: src/net/tmwa/gui/partytab.cpp:63
-msgid "/item > Show/change party item sharing options"
+#: ../src/commandhandler.cpp:317
+msgid "This command stops ignoring the given player if they are being ignored"
 msgstr ""
-"/item > Zeige oder ändere die Optionen zum Teilen der Gegenstände in der "
-"Party"
+"Dieser Befehl hebt die Ignorierung des angegeben ignorierten Spieler auf."
 
-#: src/net/tmwa/gui/partytab.cpp:64
-msgid "/exp > Show/change party experience sharing options"
+#: ../src/gui/widgets/whispertab.cpp:96
+#, fuzzy
+msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
-"/exp > Zeige oder ändere die Optionen zum Teilen der Erfahrungspunkte in der "
-"Party"
+"Dieser Befehl startet den Mitschnitt des Chats (Chatlog) in die Datei "
+"<Dateiname>."
 
-#: src/net/tmwa/gui/partytab.cpp:81
-msgid "This command causes the player to leave the party."
-msgstr "Dieser Befehl lässt Dich die Party verlassen"
+#: ../src/commandhandler.cpp:250
+msgid "This command tell others you are (doing) <msg>."
+msgstr "Dieser Befehl zeigt eine Aktion <Nachricht> an."
 
-#: src/net/tmwa/gui/partytab.cpp:85
-msgid "Command: /item <policy>"
-msgstr "Befehl: /item <Wert>"
+#: ../src/commandhandler.cpp:271
+msgid "This command tells you're away from keyboard with the given reason."
+msgstr "Dieser Befehl teilt deine Abwesenheit und deren angegebenen Grund mit."
 
-#: src/net/tmwa/gui/partytab.cpp:86
-msgid "This command changes the party's item sharing policy."
+#: ../src/commandhandler.cpp:265
+msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
-"Dieser Befehl ändert die Einstellungen zum Teilen von Gegenständen in einer "
-"Party."
+"Dieser Befehl erstellt einen neuen Tab für private Nachrichten zwischen Dir "
+"und Spieler <Name>."
 
-#: src/net/tmwa/gui/partytab.cpp:87
+#: ../src/gui/setup_colors.cpp:46
+msgid "This is what the color looks like"
+msgstr "So wird die Farbe aussehen"
+
+#: ../src/client.cpp:783
+#, fuzzy
 msgid ""
-"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
-"\"0\", \"no\", \"false\" to disable item sharing."
+"This server is missing needed world data. Please contact the administrator"
+"(s)."
 msgstr ""
-"<Wert> darf enthalten: \"1\",\"yes\" oder \"true\" um das Teilen von "
-"Gegenständen zu erlauben, \"0\",\"no\" oder \"false\" um es zu verbieten."
+"Client Registrierung wurde deaktiviert. Bitte den Serveradministrator "
+"kontaktieren."
 
-#: src/net/tmwa/gui/partytab.cpp:90
-msgid "Command: /item"
-msgstr "Befehl: /item"
+#: ../src/net/tmwa/loginhandler.cpp:185
+msgid "This user name is already taken."
+msgstr "Dieser Spielername ist bereits vergeben"
 
-#: src/net/tmwa/gui/partytab.cpp:91
-msgid "This command displays the party's current item sharing policy."
-msgstr ""
-"Dieser Befehl zeigt an, ob Gegenstände in der Party geteilt werden, oder "
-"nicht."
+#: ../src/gui/setup_video.cpp:128
+msgid "Tiny"
+msgstr "Winzig"
 
-#: src/net/tmwa/gui/partytab.cpp:95
-msgid "Command: /exp <policy>"
-msgstr "Befehl: /exp <Wert>"
+#: ../src/gui/npcpostdialog.cpp:47
+msgid "To:"
+msgstr "Nach:"
 
-#: src/net/tmwa/gui/partytab.cpp:96
-msgid "This command changes the party's experience sharing policy."
-msgstr "Dieser Befehl ändert das Teilen der Erfahrungspunkte in einer Party."
+#: ../src/keyboardconfig.cpp:96
+msgid "Toggle Chat"
+msgstr "Chat ein/aus"
 
-#: src/net/tmwa/gui/partytab.cpp:97
-msgid ""
-"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
-"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
-msgstr ""
-"Gültige Werte für <Wert> sind: \"1\",\"yes\",\"true\" um das Teilen zu "
-"erlauben, \"0\",\"no\",\"false\" verbieten es."
+#: ../src/net/manaserv/chathandler.cpp:190
+#: ../src/net/manaserv/chathandler.cpp:316
+#: ../src/net/manaserv/guildhandler.cpp:260
+#, c-format
+msgid "Topic: %s"
+msgstr "Thema: %s"
 
-#: src/net/tmwa/gui/partytab.cpp:100
-msgid "Command: /exp"
-msgstr "Befehl: /exp"
+#: ../src/gui/trade.cpp:73 ../src/gui/trade.cpp:74
+msgid "Trade"
+msgstr "Handeln"
 
-#: src/net/tmwa/gui/partytab.cpp:101
-msgid "This command displays the party's current experience sharing policy."
-msgstr ""
-"Dieser Befehl zeigt an, ob das Teilen von Erfahrungspunkten in der Party "
-"aktiviert ist."
+#: ../src/net/manaserv/tradehandler.cpp:148
+#: ../src/net/tmwa/tradehandler.cpp:224
+msgid "Trade canceled."
+msgstr "Handel abgebrochen."
 
-#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:196
-msgid "Item sharing enabled."
-msgstr "Teilen von Gegenständen aktiviert."
+#: ../src/net/tmwa/tradehandler.cpp:134
+msgid "Trade cancelled due to an unknown reason."
+msgstr "Handel aus unbekanntem Grund abgebrochen"
 
-#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:202
-msgid "Item sharing disabled."
-msgstr "Teilen von Gegenständen deaktiviert."
+#: ../src/net/manaserv/tradehandler.cpp:155
+#: ../src/net/tmwa/tradehandler.cpp:231
+msgid "Trade completed."
+msgstr "Handel abgeschlossen."
 
-#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:208
-msgid "Item sharing not possible."
-msgstr "Teilen von Gegenständen nicht möglich."
+#: ../src/net/tmwa/specialhandler.cpp:145
+msgid "Trade failed!"
+msgstr "Handel fehlgeschlagen!"
 
-#: src/net/tmwa/gui/partytab.cpp:141
-#, fuzzy
-msgid "Item sharing unknown."
-msgstr "Teilen von Gegenständen aktiviert."
+#: ../src/net/tmwa/tradehandler.cpp:146
+#, c-format
+msgid "Trade with %s cancelled."
+msgstr "Handel mit %s abgebrochen."
 
-#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:172
-msgid "Experience sharing enabled."
-msgstr "Teilen der Erfahrungspunkte aktiviert."
+#: ../src/gui/popupmenu.cpp:83
+#, fuzzy, c-format
+msgid "Trade with %s..."
+msgstr "Handele mit %s"
 
-#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:178
-msgid "Experience sharing disabled."
+#: ../src/gui/trade.cpp:59
+msgid "Trade: You"
+msgstr "Handel: Du"
+
+#: ../src/net/tmwa/tradehandler.cpp:139
+#, c-format
+msgid "Trade: You and %s"
+msgstr "Handel: Du und %s"
+
+#: ../src/net/tmwa/tradehandler.cpp:130
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr "Handel nicht möglich. Spieler existiert nicht."
+
+#: ../src/net/tmwa/tradehandler.cpp:126
+msgid "Trading isn't possible. Trade partner is too far away."
+msgstr "Handel nicht möglich. Handelspartner ist zu weit weg."
+
+#: ../src/net/manaserv/tradehandler.cpp:134
+#, c-format
+msgid "Trading with %s"
+msgstr "Handele mit %s"
+
+#: ../src/gui/setup_video.cpp:469
+#, fuzzy
+msgid "Transparency disabled"
 msgstr "Teilen der Erfahrungspunkte deaktiviert."
 
-#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:184
-msgid "Experience sharing not possible."
-msgstr "Teilen der Erfahrungspunkte nicht möglich."
+#: ../src/gui/setup_video.cpp:477
+msgid "Transparency enabled"
+msgstr "Transparenz aktiviert."
 
-#: src/net/tmwa/gui/partytab.cpp:176
+#: ../src/localplayer.cpp:895
 #, fuzzy
-msgid "Experience sharing unknown."
-msgstr "Teilen der Erfahrungspunkte aktiviert."
+msgid "Tried to pick up nonexistent item."
+msgstr "Kann Gegenstand nicht aufheben."
 
-#: src/net/tmwa/inventoryhandler.cpp:285
-msgid "Failed to use item."
-msgstr "Gegenstand konnte nicht benutzt werden."
+#: ../src/commandhandler.cpp:334
+msgid "Type /help for a list of commands."
+msgstr "Gib /help ein, um eine Liste der Befehle zu erhalten."
 
-#: src/net/tmwa/inventoryhandler.cpp:399
-msgid "Unable to equip."
-msgstr "Kann Gegenstand nicht ausrüsten."
+#: ../src/gui/changeemaildialog.cpp:51
+msgid "Type new email address twice:"
+msgstr "Gib die neue E-Mailadresse zweimal ein:"
 
-#: src/net/tmwa/inventoryhandler.cpp:410
-msgid "Unable to unequip."
-msgstr "Kann Gegenstand nicht ablegen."
+#: ../src/gui/changepassworddialog.cpp:63
+msgid "Type new password twice:"
+msgstr "Gib dein neues Passwort zweimal ein:"
 
-#: src/net/tmwa/loginhandler.cpp:86
-msgid "Account was not found. Please re-login."
-msgstr "Account konnte nicht gefunden werden. Bitte melde dich erneut an."
+#: ../src/gui/setup_colors.cpp:72
+msgid "Type:"
+msgstr "Typ: "
 
-#: src/net/tmwa/loginhandler.cpp:92
-msgid "New password too short."
-msgstr "Das neue Passwort ist zu kurz"
+#: ../src/net/tmwa/buysellhandler.cpp:123
+msgid "Unable to buy."
+msgstr "Kauf fehlgeschlagen."
 
-#: src/net/tmwa/loginhandler.cpp:156
-msgid "Unregistered ID."
-msgstr "Unbekannte ID"
+#: ../src/net/tmwa/inventoryhandler.cpp:401
+msgid "Unable to equip."
+msgstr "Kann Gegenstand nicht ausrüsten."
 
-#: src/net/tmwa/loginhandler.cpp:159
-msgid "Wrong password."
-msgstr "Falsches Passwort"
+#: ../src/net/tmwa/network.cpp:345
+msgid "Unable to resolve host \""
+msgstr "Nicht möglich den host \" aufzulösen"
 
-#: src/net/tmwa/loginhandler.cpp:162
-msgid "Account expired."
-msgstr "Account abgelaufen"
+#: ../src/net/tmwa/buysellhandler.cpp:131
+msgid "Unable to sell."
+msgstr "Verkauf fehlgeschlagen."
 
-#: src/net/tmwa/loginhandler.cpp:165
-msgid "Rejected from server."
-msgstr "Vom Server zurückgewiesen"
+#: ../src/net/tmwa/inventoryhandler.cpp:413
+msgid "Unable to unequip."
+msgstr "Kann Gegenstand nicht ablegen."
 
-#: src/net/tmwa/loginhandler.cpp:168
-msgid ""
-"You have been permanently banned from the game. Please contact the GM team."
-msgstr ""
-"Du wurdest permanent vom Spiel ausgeschlossen. Bitte wende Dich an das GM-"
-"Team."
+#: ../src/gui/setup_keyboard.cpp:90
+#, fuzzy
+msgid "Unassign"
+msgstr "Zuordnen"
 
-#: src/net/tmwa/loginhandler.cpp:172
+#: ../src/gui/equipmentwindow.cpp:88 ../src/gui/inventorywindow.cpp:94
+#: ../src/gui/inventorywindow.cpp:352 ../src/gui/popupmenu.cpp:364
+msgid "Unequip"
+msgstr "Ablegen"
+
+#: ../src/gui/outfitwindow.cpp:70
+msgid "Unequip first"
+msgstr "erstes ausziehen"
+
+#: ../src/net/manaserv/charhandler.cpp:270
 #, c-format
-msgid ""
-"You have been temporarily banned from the game until %s.\n"
-"Please contact the GM team via the forums."
+msgid "Unhandled character select error message %i."
 msgstr ""
-"Du wurdest zeitweise, bis %s vom Spiel ausgeschlossen.\n"
-"Bitte wende dich mittels des Forums an das GM-Team."
 
-#: src/net/tmwa/loginhandler.cpp:179
-msgid "This user name is already taken."
-msgstr "Dieser Spielername ist bereits vergeben"
+#: ../src/net/tmwa/tradehandler.cpp:154
+msgid "Unhandled trade cancel packet."
+msgstr "Übergangenes Handelsabbruchspaket."
 
-#: src/net/tmwa/network.cpp:145
-msgid "Empty address given to Network::connect()!"
-msgstr "Empty address given to Network::connect()!"
+#: ../src/gui/popupmenu.cpp:114 ../src/gui/popupmenu.cpp:123
+#, c-format
+msgid "Unignore %s"
+msgstr "Ignoriere %s nicht mehr"
 
-#: src/net/tmwa/network.cpp:345
-msgid "Unable to resolve host \""
-msgstr "Nicht möglich den host \" aufzulösen"
+#: ../src/net/net.cpp:141
+#, fuzzy
+msgid "Unknown Server Type! Exiting."
+msgstr "Unbekannter Gegenstand"
 
-#: src/net/tmwa/network.cpp:414
-msgid "Connection to server terminated. "
-msgstr "Verbindung mit Server abgebrochen. "
+#: ../src/net/manaserv/chathandler.cpp:342
+#, fuzzy
+msgid "Unknown channel event."
+msgstr "Unbekannter Befehl."
 
-#: src/net/tmwa/partyhandler.cpp:82
-msgid "Could not create party."
-msgstr "Konnte Party nicht erstellen."
+#: ../src/net/tmwa/charserverhandler.cpp:110
+#, fuzzy
+msgid "Unknown char-server failure."
+msgstr "Unbekannter Fehler"
 
-#: src/net/tmwa/partyhandler.cpp:84
-msgid "Party successfully created."
-msgstr "Party erfolgreich erstellt."
+#: ../src/commandhandler.cpp:136 ../src/commandhandler.cpp:333
+msgid "Unknown command."
+msgstr "Unbekannter Befehl."
 
-#: src/net/tmwa/partyhandler.cpp:119
-#, c-format
-msgid "%s is already a member of a party."
-msgstr "%s ist bereits Mitglied einer Party."
+#: ../src/net/tmwa/generalhandler.cpp:151
+msgid "Unknown connection error."
+msgstr "Unbekannter Verbindungsfehler"
 
-#: src/net/tmwa/partyhandler.cpp:123
-#, c-format
-msgid "%s refused your invitation."
-msgstr "%s hat Deine Einladung zurückgewiesen."
+#: ../src/net/manaserv/charhandler.cpp:225
+#, fuzzy, c-format
+msgid "Unknown error (%d)."
+msgstr "Unbekannter Fehler"
 
-#: src/net/tmwa/partyhandler.cpp:127
-#, c-format
-msgid "%s is now a member of your party."
-msgstr "%s ist nun Mitglied Deiner Party."
+#: ../src/net/manaserv/charhandler.cpp:174
+#: ../src/net/manaserv/loginhandler.cpp:96
+#: ../src/net/manaserv/loginhandler.cpp:127
+#: ../src/net/manaserv/loginhandler.cpp:161
+#: ../src/net/manaserv/loginhandler.cpp:279
+#: ../src/net/manaserv/loginhandler.cpp:316
+#: ../src/net/tmwa/loginhandler.cpp:95 ../src/net/tmwa/loginhandler.cpp:191
+msgid "Unknown error."
+msgstr "Unbekannter Fehler"
 
-#: src/net/tmwa/partyhandler.cpp:131
+#: ../src/net/tmwa/guildhandler.cpp:316
+#, fuzzy
+msgid "Unknown guild invite response."
+msgstr "Unbekannte Reaktion auf die Einladung von %s."
+
+#: ../src/net/tmwa/partyhandler.cpp:131
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr "Unbekannte Reaktion auf die Einladung von %s."
 
-#: src/net/tmwa/partyhandler.cpp:236
-msgid "You have left the party."
-msgstr "Du hast die Party verlassen."
+#: ../src/resources/itemdb.cpp:324 ../src/resources/itemdb.cpp:425
+msgid "Unknown item"
+msgstr "Unbekannter Gegenstand"
 
-#: src/net/tmwa/partyhandler.cpp:246
-#, c-format
-msgid "%s has left your party."
-msgstr "%s hat Deine Party verlassen."
+#: ../src/localplayer.cpp:902
+#, fuzzy
+msgid "Unknown problem picking up item."
+msgstr "Kann Gegenstand nicht aufheben."
 
-#: src/net/tmwa/partyhandler.cpp:299
-#, c-format
-msgid "An unknown member tried to say: %s"
-msgstr "Ein unbekanntes Mitglied hat versucht, \"%s\" zu sagen."
+#: ../src/gui/charselectdialog.cpp:145 ../src/gui/unregisterdialog.cpp:47
+#: ../src/gui/unregisterdialog.cpp:55
+msgid "Unregister"
+msgstr "Abmelden"
 
-#: src/net/tmwa/partyhandler.cpp:335
-#, c-format
-msgid "Inviting failed, because you can't see a player called %s."
-msgstr "Einladung fehlgeschlagen, da du den Spieler %s nicht sehen kannst."
+#: ../src/client.cpp:955
+#, fuzzy
+msgid "Unregister Successful"
+msgstr "Abmelden"
 
-#: src/net/tmwa/partyhandler.cpp:340
-msgid "You can only inivte when you are in a party!"
-msgstr "Du kannst nur einladen wenn du in einer Partie bist."
+#: ../src/net/tmwa/loginhandler.cpp:156
+msgid "Unregistered ID."
+msgstr "Unbekannte ID"
 
-#: src/net/tmwa/partyhandler.cpp:368
-#, c-format
-msgid "%s is not in your party!"
-msgstr "%s ist nicht in Deiner Party!"
+#: ../src/gui/skilldialog.cpp:228
+msgid "Up"
+msgstr "Erhöhen"
 
-#: src/net/tmwa/playerhandler.cpp:100
-msgid "Insert coin to continue."
-msgstr "Gib eine Münze ein um weiter zuspielen."
+#: ../src/gui/updatewindow.cpp:124
+msgid "Updating..."
+msgstr "Aktualisiere..."
 
-#: src/net/tmwa/playerhandler.cpp:118
-msgid "You're not dead yet. You're just resting."
-msgstr "Du bist nicht tot. Du erholst Dich bloß."
+#: ../src/gui/inventorywindow.cpp:93
+msgid "Use"
+msgstr "Benutzen"
 
-#: src/net/tmwa/playerhandler.cpp:119
-msgid "You are no more."
-msgstr "Du bist nicht mehr."
+#: ../src/net/tmwa/guildhandler.cpp:306
+#, fuzzy
+msgid "User is now part of your guild."
+msgstr "%s ist nun Mitglied Deiner Party."
 
-#: src/net/tmwa/playerhandler.cpp:120
-msgid "You have ceased to be."
-msgstr "Du hast Dich entschieden, dem Irdischen zu entsagen."
+#: ../src/net/tmwa/guildhandler.cpp:301
+#, fuzzy
+msgid "User rejected guild invite."
+msgstr "%s hat Deine Einladung zurückgewiesen."
 
-#: src/net/tmwa/playerhandler.cpp:121
-msgid "You've expired and gone to meet your maker."
-msgstr "Deine Zeit ist abgelaufen. Zeit, deinem Schöpfer gegenüberzutreten."
+#: ../src/net/manaserv/loginhandler.cpp:306
+msgid "Username already exists."
+msgstr "Benutzername bereits vorhanden"
 
-#: src/net/tmwa/playerhandler.cpp:122
-msgid "You're a stiff."
-msgstr "Du bist ein wenig steif."
+#: ../src/net/tmwa/loginhandler.cpp:188
+#, fuzzy
+msgid "Username permanently erased."
+msgstr "Benutzername bereits vorhanden"
 
-#: src/net/tmwa/playerhandler.cpp:123
-msgid "Bereft of life, you rest in peace."
-msgstr "Des Lebens beraubt ruhst Du in Frieden."
+#: ../src/gui/setup_video.cpp:244
+msgid "Video"
+msgstr "Video"
 
-#: src/net/tmwa/playerhandler.cpp:124
-msgid "If you weren't so animated, you'd be pushing up the daisies."
-msgstr ""
-"Wenn Du nicht so lebendig wärst, könntest Du die Gänseblümchen von unten "
-"sehen."
+#: ../src/gui/setup_video.cpp:215
+msgid "Visible names"
+msgstr "Sichtbare Namen"
 
-#: src/net/tmwa/playerhandler.cpp:125
-msgid "Your metabolic processes are now history."
-msgstr "Deine Körperfunktionen sind nun Geschichte."
+#: ../src/net/manaserv/attributes.cpp:205
+#: ../src/net/tmwa/generalhandler.cpp:232
+msgid "Vitality"
+msgstr "Gesundheit"
 
-#: src/net/tmwa/playerhandler.cpp:126
-msgid "You're off the twig."
-msgstr "Du kriegst nichts mehr mit."
+#: ../src/net/manaserv/attributes.cpp:212
+#, fuzzy, c-format
+msgid "Vitality %+.1f"
+msgstr "Gesundheit %+d"
 
-#: src/net/tmwa/playerhandler.cpp:127
-msgid "You've kicked the bucket."
-msgstr "Jetzt passt Du in 'nen Eimer."
+#: ../src/net/tmwa/generalhandler.cpp:104
+#, c-format
+msgid "Vitality %+d"
+msgstr "Gesundheit %+d"
 
-#: src/net/tmwa/playerhandler.cpp:128
-msgid ""
-"You've shuffled off your mortal coil, run down the curtain and joined the "
-"bleedin' choir invisibile."
-msgstr ""
-"Du hast Deine sterbliche Hülle abgelegt, der Schleier legt sich über Dich "
-"und Du trittst dem Chor der blutenden Unsichtbaren bei."
+#: ../src/net/tmwa/charserverhandler.cpp:272
+msgid "Vitality:"
+msgstr "Vitalität:"
 
-#: src/net/tmwa/playerhandler.cpp:130
-msgid "You are an ex-player."
-msgstr "Du warst einmal ein Spieler."
+#: ../src/gui/npcdialog.cpp:48
+msgid "Waiting for server"
+msgstr "Warte auf den Server"
 
-#: src/net/tmwa/playerhandler.cpp:131
-msgid "You're pining for the fjords."
-msgstr "Du schmachtest nach den Fjorden."
+#: ../src/gui/serverdialog.cpp:447
+msgid "Waiting for server..."
+msgstr "Warte auf den Server"
 
-#: src/net/tmwa/playerhandler.cpp:246 src/net/tmwa/playerhandler.cpp:285
-msgid "Message"
-msgstr "Nachricht"
+#: ../src/net/tmwa/specialhandler.cpp:208
+msgid "Warp failed..."
+msgstr "Warp fehlgeschlagen..."
 
-#: src/net/tmwa/playerhandler.cpp:247
-msgid ""
-"You are carrying more than half your weight. You are unable to regain health."
+#: ../src/net/manaserv/beinghandler.cpp:284
+#: ../src/net/tmwa/playerhandler.cpp:96
+msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
-"Du trägst mehr als die Hälfte Deiner Tragkraft. Du kannst Dich nicht mehr "
-"heilen."
+"Es tut uns Leid, Euch mitteilen zu müssen, dass Ihr im Kampfe gefallen seid."
+
+#: ../src/keyboardconfig.cpp:82
+msgid "Wear Outfit"
+msgstr "Ausrüstung anziehen"
 
-#: src/net/tmwa/playerhandler.cpp:313
+#: ../src/gui/inventorywindow.cpp:111
+msgid "Weight:"
+msgstr "Gewicht:"
+
+#: ../src/gui/itempopup.cpp:174
 #, c-format
-msgid "You picked up %s."
-msgstr "Du hast %s aufgehoben "
+msgid "Weight: %s"
+msgstr "Gewicht: %s"
 
-#: src/net/tmwa/playerhandler.cpp:348
-msgid "Cannot raise skill!"
-msgstr "Kann Skill nicht erhöhen!"
+#: ../src/gui/setup_players.cpp:262
+msgid "When ignoring:"
+msgstr "Wenn ignorierend:"
 
-#: src/net/tmwa/playerhandler.cpp:488
-msgid "Equip arrows first."
-msgstr "Rüste dich zuerst mit Pfeilen aus."
+#: ../src/gui/popupmenu.cpp:91
+#, c-format
+msgid "Whisper %s"
+msgstr "flüstere %s"
 
-#: src/net/tmwa/specialhandler.cpp:144
-msgid "Trade failed!"
-msgstr "Handel fehlgeschlagen!"
+#: ../src/net/tmwa/chathandler.cpp:87
+#, fuzzy, c-format
+msgid "Whisper could not be sent, %s is offline."
+msgstr "Nachricht konnte nicht gesendet werden, Spieler ist offline."
 
-#: src/net/tmwa/specialhandler.cpp:147
-msgid "Emote failed!"
-msgstr "Gefühl fehlgeschlagen!"
+#: ../src/net/tmwa/chathandler.cpp:96
+#, fuzzy, c-format
+msgid "Whisper could not be sent, ignored by %s."
+msgstr ""
+"Nachricht konnte nicht gesendet werden, sie wurde vom Spieler ignoriert."
 
-#: src/net/tmwa/specialhandler.cpp:150
-msgid "Sit failed!"
-msgstr "Sitzen fehlgeschlagen!"
+#: ../src/gui/chat.cpp:494
+#, c-format
+msgid "Whispering to %s: %s"
+msgstr "Flüsternd zu %s: %s"
 
-#: src/net/tmwa/specialhandler.cpp:153
-msgid "Chat creating failed!"
-msgstr "Chat-Erstellung fehlgeschlagen!"
+#: ../src/gui/socialwindow.cpp:154
+#, fuzzy, c-format
+msgid "Who would you like to invite to guild %s?"
+msgstr "Wen möchtest du einladen?"
 
-#: src/net/tmwa/specialhandler.cpp:156
-msgid "Could not join party!"
-msgstr "Kann der Gruppe nicht beitreten!"
+#: ../src/gui/socialwindow.cpp:233
+#, fuzzy, c-format
+msgid "Who would you like to invite to party %s?"
+msgstr "Wen möchtest du einladen?"
 
-#: src/net/tmwa/specialhandler.cpp:159
-msgid "Cannot shout!"
-msgstr "Kann nicht rufen!"
+#: ../src/net/manaserv/attributes.cpp:231
+msgid "Willpower"
+msgstr "Willenskraft:"
 
-#: src/net/tmwa/specialhandler.cpp:168
-msgid "You have not yet reached a high enough lvl!"
-msgstr "Dein Level ist noch nicht hoch genug!"
+#: ../src/net/manaserv/attributes.cpp:238
+#, fuzzy, c-format
+msgid "Willpower %+.1f"
+msgstr "Willensstärke %+d"
 
-#: src/net/tmwa/specialhandler.cpp:171
-msgid "Insufficient HP!"
-msgstr "Nicht genug HP!"
+#: ../src/net/manaserv/loginhandler.cpp:87
+msgid "Wrong magic_token."
+msgstr "Fehlerhaftes Magiemerkmal"
 
-#: src/net/tmwa/specialhandler.cpp:174
-msgid "Insufficient SP!"
-msgstr "Nicht genug SP!"
+#: ../src/net/tmwa/loginhandler.cpp:159
+msgid "Wrong password."
+msgstr "Falsches Passwort"
 
-#: src/net/tmwa/specialhandler.cpp:177
-msgid "You have no memos!"
-msgstr "Keine Memos vorhanden!"
+#: ../src/net/manaserv/loginhandler.cpp:266
+msgid "Wrong username or password."
+msgstr "Benutzername oder Passwort falsch"
 
-#: src/net/tmwa/specialhandler.cpp:180
-msgid "You cannot do that right now!"
-msgstr "Du kannst dies momentan nicht tun!"
+#: ../src/net/manaserv/loginhandler.cpp:303
+msgid "Wrong username, password or email address."
+msgstr "Benutzername, Passwort oder E-Mailadresse falsch"
 
-#: src/net/tmwa/specialhandler.cpp:183
-msgid "Seems you need more money... ;-)"
-msgstr "Es scheint, als bräuchtest Du mehr Geld... ;-)"
+#: ../src/gui/confirmdialog.cpp:42
+msgid "Yes"
+msgstr "Ja"
 
-#: src/net/tmwa/specialhandler.cpp:186
-msgid "You cannot use this skill with that kind of weapon!"
-msgstr "Du kannst diese Fähigkeit nicht mit dieser Waffenart benutzen!"
+#: ../src/net/manaserv/beinghandler.cpp:304
+msgid "You Died"
+msgstr "Du bist tot."
 
-#: src/net/tmwa/specialhandler.cpp:189
-msgid "You need another red gem!"
-msgstr "Du brauchst noch einen roten Edelstein!"
+#: ../src/net/tmwa/playerhandler.cpp:131
+msgid "You are an ex-player."
+msgstr "Du warst einmal ein Spieler."
 
-#: src/net/tmwa/specialhandler.cpp:192
-msgid "You need another blue gem!"
-msgstr "Du brauchst noch einen blauen Edelstein!"
+#: ../src/net/tmwa/playerhandler.cpp:254
+msgid ""
+"You are carrying more than half your weight. You are unable to regain health."
+msgstr ""
+"Du trägst mehr als die Hälfte Deiner Tragkraft. Du kannst Dich nicht mehr "
+"heilen."
 
-#: src/net/tmwa/specialhandler.cpp:195
-msgid "You're carrying to much to do this!"
-msgstr "Du schleppst zu viel herum, um das zu machen!"
+#: ../src/net/manaserv/beinghandler.cpp:283
+#: ../src/net/tmwa/playerhandler.cpp:95
+msgid "You are dead."
+msgstr "Ach ja: Du bist Tot."
 
-#: src/net/tmwa/specialhandler.cpp:198
-msgid "Huh? What's that?"
-msgstr "Huch? Was ist das?"
+#: ../src/net/tmwa/playerhandler.cpp:120
+msgid "You are no more."
+msgstr "Du bist nicht mehr."
 
-#: src/net/tmwa/specialhandler.cpp:207
-msgid "Warp failed..."
-msgstr "Warp fehlgeschlagen..."
+#: ../src/net/manaserv/beinghandler.cpp:286
+#: ../src/net/tmwa/playerhandler.cpp:98
+msgid "You are not that alive anymore."
+msgstr "Du bist nicht länger lebendig."
 
-#: src/net/tmwa/specialhandler.cpp:210
-msgid "Could not steal anything..."
-msgstr "Konnte nichts stehlen..."
+#: ../src/net/tmwa/partyhandler.cpp:340
+msgid "You can only inivte when you are in a party!"
+msgstr "Du kannst nur einladen wenn du in einer Partie bist."
 
-#: src/net/tmwa/specialhandler.cpp:213
-msgid "Poison had no effect..."
-msgstr "Das Gift hatte keine Wirkung..."
+#: ../src/net/tmwa/specialhandler.cpp:181
+msgid "You cannot do that right now!"
+msgstr "Du kannst dies momentan nicht tun!"
 
-#: src/net/tmwa/tradehandler.cpp:126
-msgid "Trading isn't possible. Trade partner is too far away."
-msgstr "Handel nicht möglich. Handelspartner ist zu weit weg."
+#: ../src/net/tmwa/specialhandler.cpp:187
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr "Du kannst diese Fähigkeit nicht mit dieser Waffenart benutzen!"
 
-#: src/net/tmwa/tradehandler.cpp:130
-msgid "Trading isn't possible. Character doesn't exist."
-msgstr "Handel nicht möglich. Spieler existiert nicht."
+#: ../src/gui/trade.cpp:304
+msgid "You don't have enough money."
+msgstr "Du hast nicht genügend Geld."
 
-#: src/net/tmwa/tradehandler.cpp:134
-msgid "Trade cancelled due to an unknown reason."
-msgstr "Handel aus unbekanntem Grund abgebrochen"
+#: ../src/gui/trade.cpp:98 ../src/gui/trade.cpp:134
+#, fuzzy, c-format
+msgid "You get %s"
+msgstr "Du erhältst %s."
 
-#: src/net/tmwa/tradehandler.cpp:139
-#, c-format
-msgid "Trade: You and %s"
-msgstr "Handel: Du und %s"
+#: ../src/gui/trade.cpp:99
+msgid "You give:"
+msgstr "Du gibst:"
 
-#: src/net/tmwa/tradehandler.cpp:146
-#, c-format
-msgid "Trade with %s cancelled."
-msgstr "Handel mit %s abgebrochen."
+#: ../src/gui/socialwindow.cpp:588
+#, fuzzy, c-format
+msgid "You have been invited to join the %s party."
+msgstr "%s hat dich eingeladen, an der Party %s teilzunehmen."
 
-#: src/net/tmwa/tradehandler.cpp:154
-msgid "Unhandled trade cancel packet."
-msgstr "Übergangenes Handelsabbruchspaket."
+#: ../src/gui/socialwindow.cpp:584
+#, fuzzy
+msgid "You have been invited you to join a party."
+msgstr "%s hat dich in seine Party eingeladen."
 
-#: src/net/tmwa/tradehandler.cpp:202
-msgid "Failed adding item. Trade partner is over weighted."
+#: ../src/net/tmwa/loginhandler.cpp:168
+msgid ""
+"You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
-"Gegenstand konnte nicht hinzugefügt werden. Handelspartner ist überladen."
+"Du wurdest permanent vom Spiel ausgeschlossen. Bitte wende Dich an das GM-"
+"Team."
 
-#: src/net/tmwa/tradehandler.cpp:207
-msgid "Failed adding item. Trade partner has no free slot."
+#: ../src/net/tmwa/loginhandler.cpp:175
+#, c-format
+msgid ""
+"You have been temporarily banned from the game until %s.\n"
+"Please contact the GM team via the forums."
 msgstr ""
-"Gegenstand konnte nicht hinzugefügt werden. Handelspartner hat keinen freien "
-"Platz mehr."
+"Du wurdest zeitweise, bis %s vom Spiel ausgeschlossen.\n"
+"Bitte wende dich mittels des Forums an das GM-Team."
 
-#: src/net/tmwa/tradehandler.cpp:211
-msgid "Failed adding item for unknown reason."
-msgstr "Gegenstand konnte nicht hinzugefügt werden. Unbekannter Fehler."
+#: ../src/net/tmwa/playerhandler.cpp:121
+msgid "You have ceased to be."
+msgstr "Du hast Dich entschieden, dem Irdischen zu entsagen."
 
-#: src/playerrelations.cpp:310
-msgid "Completely ignore"
-msgstr "@@ignore|Ignoriere %s komplett@@"
+#: ../src/net/tmwa/partyhandler.cpp:236
+msgid "You have left the party."
+msgstr "Du hast die Party verlassen."
 
-#: src/playerrelations.cpp:324
-msgid "Print '...'"
-msgstr "Drucke '..'"
+#: ../src/net/tmwa/specialhandler.cpp:178
+msgid "You have no memos!"
+msgstr "Keine Memos vorhanden!"
 
-#: src/playerrelations.cpp:340
-msgid "Blink name"
-msgstr "Blinkender Name"
+#: ../src/net/tmwa/specialhandler.cpp:169
+msgid "You have not yet reached a high enough lvl!"
+msgstr "Dein Level ist noch nicht hoch genug!"
+
+#: ../src/gui/setup_audio.cpp:94
+msgid "You may have to restart your client if you want to download new music"
+msgstr ""
+"Der Client muss neugestartet werden, wenn die neue Musik heruntergeladen "
+"werden soll"
 
-#: src/playerrelations.cpp:379
-msgid "Floating '...' bubble"
-msgstr "Schwebende '...' Blase"
+#: ../src/gui/setup_video.cpp:470 ../src/gui/setup_video.cpp:478
+msgid "You must restart to apply changes."
+msgstr "Bitte neustarten um Änderungen zu übernehmen."
 
-#: src/playerrelations.cpp:382
-msgid "Floating bubble"
-msgstr "Schwebende Blase"
+#: ../src/net/tmwa/specialhandler.cpp:193
+msgid "You need another blue gem!"
+msgstr "Du brauchst noch einen blauen Edelstein!"
 
-#: src/resources/itemdb.cpp:53
-#, c-format
-msgid "Attack %+d"
-msgstr "Angriff %+d"
+#: ../src/net/tmwa/specialhandler.cpp:190
+msgid "You need another red gem!"
+msgstr "Du brauchst noch einen roten Edelstein!"
 
-#: src/resources/itemdb.cpp:45
-#, c-format
-msgid "Defense %+d"
-msgstr "Verteidigung %+d"
+#: ../src/gui/login.cpp:129
+msgid "You need to use the website to register an account for this server."
+msgstr "Du musst auf der Webseite ein Konto für diesen Server erstellen."
 
-#: src/resources/itemdb.cpp:46
-#, c-format
-msgid "HP %+d"
-msgstr "HP %+d"
+#: ../src/localplayer.cpp:920
+#, fuzzy, c-format
+msgid "You picked up %d [@@%d|%s@@]."
+msgid_plural "You picked up %d [@@%d|%s@@]."
+msgstr[0] "Du hast %s [@@%d|%s@@] aufgehoben."
+msgstr[1] "Du hast %s [@@%d|%s@@] aufgehoben."
 
-#: src/resources/itemdb.cpp:47
+#: ../src/net/tmwa/playerhandler.cpp:327
 #, c-format
-msgid "MP %+d"
-msgstr "MP %+d"
+msgid "You picked up %s."
+msgstr "Du hast %s aufgehoben "
 
-#: src/resources/itemdb.cpp:92
-msgid "Unknown item"
-msgstr "Unbekannter Gegenstand"
+#: ../src/net/manaserv/beinghandler.cpp:298
+#: ../src/net/tmwa/playerhandler.cpp:116
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr ""
+"Du hast schon wieder versagt. Spül Deine Überreste hinunter und hol Dir "
+"einen paar Neue."
 
-#: src/resources/itemdb.cpp:135 src/resources/monsterdb.cpp:77
-msgid "unnamed"
-msgstr "unbenannt"
+#: ../src/net/manaserv/loginhandler.cpp:312
+msgid "You took too long with the captcha or your response was incorrect."
+msgstr ""
+"Du hast für das Captcha zu lange gebraucht oder deine Eingabe war inkorrekt."
 
-#, fuzzy
-#~ msgid "HP"
-#~ msgstr "HP:"
+#: ../src/net/tmwa/playerhandler.cpp:123
+msgid "You're a stiff."
+msgstr "Du bist ein wenig steif."
 
-#, fuzzy
-#~ msgid "MP"
-#~ msgstr "MP:"
+#: ../src/net/tmwa/specialhandler.cpp:196
+msgid "You're carrying to much to do this!"
+msgstr "Du schleppst zu viel herum, um das zu machen!"
 
-#, fuzzy
-#~ msgid "Exp"
-#~ msgstr "Exp:"
+#: ../src/net/tmwa/playerhandler.cpp:119
+msgid "You're not dead yet. You're just resting."
+msgstr "Du bist nicht tot. Du erholst Dich bloß."
 
-#, fuzzy
-#~ msgid "Money"
-#~ msgstr "Geld: %d"
+#: ../src/net/tmwa/playerhandler.cpp:127
+msgid "You're off the twig."
+msgstr "Du kriegst nichts mehr mit."
 
-#, fuzzy
-#~ msgid "Job"
-#~ msgstr "Job:"
+#: ../src/net/tmwa/playerhandler.cpp:132
+msgid "You're pining for the fjords."
+msgstr "Du schmachtest nach den Fjorden."
 
-#, fuzzy
-#~ msgid "Level"
-#~ msgstr "Stufe: %d"
+#: ../src/net/tmwa/playerhandler.cpp:122
+msgid "You've expired and gone to meet your maker."
+msgstr "Deine Zeit ist abgelaufen. Zeit, deinem Schöpfer gegenüberzutreten."
 
-#~ msgid "Access denied."
-#~ msgstr "Zugang verweigert"
+#: ../src/net/tmwa/playerhandler.cpp:128
+msgid "You've kicked the bucket."
+msgstr "Jetzt passt Du in 'nen Eimer."
 
-#~ msgid "Unknown failure to select character."
-#~ msgstr "Unbekannter Fehler bei Auswahl des Charakters"
+#: ../src/net/tmwa/playerhandler.cpp:129
+msgid ""
+"You've shuffled off your mortal coil, run down the curtain and joined the "
+"bleedin' choir invisibile."
+msgstr ""
+"Du hast Deine sterbliche Hülle abgelegt, der Schleier legt sich über Dich "
+"und Du trittst dem Chor der blutenden Unsichtbaren bei."
 
-#~ msgid "Inviting like this isn't supported at the moment."
-#~ msgstr "Einladungen auf diesem Weg werden im Moment nicht unterstützt."
+#: ../src/net/tmwa/guildhandler.cpp:311
+msgid "Your guild is full."
+msgstr "Deine Gilde ist voll."
 
-#~ msgid "Willpower:"
-#~ msgstr "Willenskraft:"
+#: ../src/net/tmwa/playerhandler.cpp:126
+msgid "Your metabolic processes are now history."
+msgstr "Deine Körperfunktionen sind nun Geschichte."
 
-#~ msgid "Willpower %+d"
-#~ msgstr "Willensstärke %+d"
+#: ../src/gui/charcreatedialog.cpp:184
+msgid "Your name needs to be at least 4 characters."
+msgstr "Dein Name muss aus mindestens 4 Zeichen bestehen."
 
-#~ msgid "Willpower"
-#~ msgstr "Willenskraft:"
+#: ../src/net/manaserv/beinghandler.cpp:291
+#: ../src/net/tmwa/playerhandler.cpp:104
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+"Dein Plan, die Waffe deines Feindes mit Deinem Hals zu zerstören, war leider "
+"nicht ganz so genial, wie Du dachtest..."
 
-#~ msgid "Server is full."
-#~ msgstr "Server ist voll"
+#: ../src/main.cpp:43
+msgid "[mana-file] : The mana file is an XML file (.mana)"
+msgstr ""
 
-#~ msgid "Text Shadow"
-#~ msgstr "Textschatten"
+#: ../src/gui/setup_video.cpp:225
+msgid "as particle"
+msgstr "als Partikeleffekt"
 
-#~ msgid "Text Outline"
-#~ msgstr "Textaußenlinie"
+#: ../src/gui/setup_video.cpp:174 ../src/gui/setup_video.cpp:188
+msgid "high"
+msgstr "Hoch"
 
-#~ msgid "Progress Bar Labels"
-#~ msgstr "Fortschrittsbalkenbeschriftungen"
+#: ../src/gui/setup_video.cpp:223
+msgid "in chat"
+msgstr "im Chatfenster"
 
-#~ msgid "Buttons"
-#~ msgstr "Buttons"
+#: ../src/gui/setup_video.cpp:173 ../src/gui/setup_video.cpp:186
+msgid "low"
+msgstr "Niedrig"
 
-#~ msgid "Disabled Buttons"
-#~ msgstr "Deaktivierte Buttons"
+#: ../src/main.cpp:42
+msgid "mana [options] [mana-file]"
+msgstr "mana [Optionen] [mana-Datei]"
 
-#~ msgid "Tabs"
-#~ msgstr "Tabs"
+#: ../src/gui/setup_video.cpp:189
+msgid "max"
+msgstr "Maximal"
 
-#~ msgid "Background"
-#~ msgstr "Hintergrund"
+#: ../src/gui/setup_video.cpp:187
+msgid "medium"
+msgstr "Mittel"
 
-#~ msgid "Highlight"
-#~ msgstr "Hervorgehoben"
+#: ../src/gui/setup_video.cpp:172
+msgid "off"
+msgstr "Aus"
 
-#~ msgid "Tab Highlight"
-#~ msgstr "Hervorgehobener Tab"
+#: ../src/gui/serverdialog.cpp:550
+msgid "requires a newer version"
+msgstr "benötigt eine neuere Version"
 
-#~ msgid "Item Too Expensive"
-#~ msgstr "Gegenstand ist zu teuer"
+#: ../src/gui/serverdialog.cpp:552
+#, c-format
+msgid "requires v%s"
+msgstr "benötigt v%s"
 
-#~ msgid "Item Is Equipped"
-#~ msgstr "Gegenstand ist in Verwendung"
+#: ../src/resources/beinginfo.cpp:32 ../src/resources/itemdb.cpp:260
+#: ../src/resources/monsterdb.cpp:77
+msgid "unnamed"
+msgstr "unbenannt"
 
-#~ msgid "GM"
-#~ msgstr "GM"
+#~ msgid ""
+#~ "\n"
+#~ "> Cancel\n"
+#~ msgstr ""
+#~ "\n"
+#~ "> Abbrechen\n"
 
-#~ msgid "Player"
-#~ msgstr "Spieler"
+#, fuzzy
+#~ msgid " "
+#~ msgstr "; "
 
-#~ msgid "Whisper"
-#~ msgstr "geflüsterte Nachricht"
+#~ msgid "  -D --default    : Bypass the login process with default settings"
+#~ msgstr "  -D --default : Überspringe die Anmeldung mit den Voreinstellungen"
 
-#~ msgid "Is"
-#~ msgstr "Handlungen"
+#, fuzzy
+#~ msgid " (%+d)"
+#~ msgstr "HP %+d"
 
-#~ msgid "Server"
-#~ msgstr "Server"
+#, fuzzy
+#~ msgid " : "
+#~ msgstr " host: "
 
-#~ msgid "Logger"
-#~ msgstr "Logger"
+#~ msgid " cancelled"
+#~ msgstr " abgebrochen"
 
-#~ msgid "Hyperlink"
-#~ msgstr "Verknüpfung"
+#~ msgid "% Reflex:"
+#~ msgstr "% Reaktion:"
 
-#~ msgid "Being"
-#~ msgstr "Aktionen"
+#~ msgid "%s already here"
+#~ msgstr "%s ist bereits hier"
 
-#~ msgid "Other Players' Names"
-#~ msgstr "Namen anderer Spieler"
+#~ msgid "%s/%s"
+#~ msgstr "%s: %s"
 
-#~ msgid "Own Name"
-#~ msgstr "Eigener Name"
+#~ msgid "%s: %s\n"
+#~ msgstr "%s: %s\n"
 
-#~ msgid "GM Names"
-#~ msgstr "Namen von GM"
+#~ msgid ", coordinates: "
+#~ msgstr ", Koordinaten: "
 
-#~ msgid "NPCs"
-#~ msgstr "NPCs"
+#~ msgid "-1"
+#~ msgstr "-1"
 
-#~ msgid "Monsters"
-#~ msgstr "Monster"
+#~ msgid "/new > Alias of create"
+#~ msgstr "/new > Ersatz für create"
 
-#~ msgid "Unknown Item Type"
-#~ msgstr "Unbekannter Gegenstand"
+#~ msgid "1/2 HP Bar"
+#~ msgstr "1/2 HP-Leiste"
 
-#~ msgid "Generics"
-#~ msgstr "Allgemeiner Gegenstand"
+#~ msgid "1/4 HP Bar"
+#~ msgstr "1/4 HP-Leiste"
 
-#~ msgid "Hats"
-#~ msgstr "Hüte"
+#~ msgid "2 Handed Weapons"
+#~ msgstr "zweihändige Waffen"
 
-#~ msgid "Usables"
-#~ msgstr "Benutzbare Gegenstände"
+#~ msgid "3/4 HP Bar"
+#~ msgstr "3/4 HP-Leiste"
 
-#~ msgid "Shirts"
-#~ msgstr "Hemden"
+#~ msgid ":-)"
+#~ msgstr ":-)"
 
-#~ msgid "One Handed Weapons"
-#~ msgstr "Einhänder"
+#, fuzzy
+#~ msgid "Accepted guild invite from %s."
+#~ msgstr "Partyeinladung von %s angenommen."
 
-#~ msgid "Pants"
-#~ msgstr "Hosen"
+#~ msgid "Access denied."
+#~ msgstr "Zugang verweigert"
 
-#~ msgid "Shoes"
-#~ msgstr "Schuhe"
+#~ msgid "Accountserver: Not logged in"
+#~ msgstr "nicht angemeldet"
 
-#~ msgid "Two Handed Weapons"
-#~ msgstr "Zweihänder"
+#~ msgid "Accountserver: Unknown error"
+#~ msgstr "Unbekannter Fehler"
 
-#~ msgid "Shields"
-#~ msgstr "Schilde"
+#~ msgid "Accountserver: Wrong username or password"
+#~ msgstr "Benutzername oder Passwort falsch"
 
-#~ msgid "Rings"
-#~ msgstr "Ringe"
+#~ msgid "Add Entry"
+#~ msgstr "Neuer Eintrag"
 
-#~ msgid "Necklaces"
-#~ msgstr "Halsketten"
+#~ msgid "Adjust scrolling by %d:%d"
+#~ msgstr "Justiere Scrolling %d:%d"
+
+#~ msgid "Ammo"
+#~ msgstr "Munition"
 
 #~ msgid "Arms"
 #~ msgstr "Waffen"
 
-#~ msgid "Ammo"
-#~ msgstr "Munition"
+#~ msgid "Arrows equipped: %i"
+#~ msgstr "Pfeile ausgerüstet: %i"
 
-#~ msgid "Particle Effects"
-#~ msgstr "Partikeleffekte"
+#~ msgid "Attack:"
+#~ msgstr "Angriff:"
 
-#~ msgid "Pickup Notification"
-#~ msgstr "aufgehobene Gegenstände"
+#~ msgid "Axe"
+#~ msgstr "Axt"
 
-#~ msgid "Exp Notification"
-#~ msgstr "Anzeige der Erfahrungspunkte"
+#~ msgid "Background"
+#~ msgstr "Hintergrund"
 
-#~ msgid "Player Hits Monster"
-#~ msgstr "Spieler trifft Monster"
+#~ msgid "Bow"
+#~ msgstr "Bogen"
 
-#~ msgid "Monster Hits Player"
-#~ msgstr "Monster trifft Spieler"
+#~ msgid "Buddy"
+#~ msgstr "Freund"
 
-#~ msgid "Critical Hit"
-#~ msgstr "Kritischer Treffer"
+#~ msgid "Buddy List"
+#~ msgstr "Freundesliste"
 
-#~ msgid "Misses"
-#~ msgstr "Verfehlt"
+#~ msgid "Buddys"
+#~ msgstr "Freunde"
 
-#~ msgid "HP Bar"
-#~ msgstr "HP-Leiste"
+#~ msgid "Buttons"
+#~ msgstr "Buttons"
 
-#~ msgid "3/4 HP Bar"
-#~ msgstr "3/4 HP-Leiste"
+#, fuzzy
+#~ msgid "BuySell"
+#~ msgstr "Verkaufen"
 
-#~ msgid "1/2 HP Bar"
-#~ msgstr "1/2 HP-Leiste"
+#, fuzzy
+#~ msgid "Can't create %s. Using defaults."
+#~ msgstr "Chat-Erstellung fehlgeschlagen!"
 
-#~ msgid "1/4 HP Bar"
-#~ msgstr "1/4 HP-Leiste"
+#~ msgid "Can't find Resources directory\n"
+#~ msgstr "Kann das Ressourcen Verzeichnis nicht finden\n"
 
-#~ msgid "help"
-#~ msgstr "Hilfe"
+#~ msgid "Cancel pressed"
+#~ msgstr "Abbrechen wurde gedrückt"
 
-#~ msgid "announce"
-#~ msgstr "ankündigen"
+#~ msgid "Cast Test Spell 1"
+#~ msgstr "Spruch 1 sprechen"
 
-#~ msgid "where"
-#~ msgstr "Wo"
+#~ msgid "Cast Test Spell 2"
+#~ msgstr "Spruch 2 sprechen"
 
-#~ msgid "who"
-#~ msgstr "Wer"
+#~ msgid "Cast Test Spell 3"
+#~ msgstr "Spruch 3 sprechen"
 
-#~ msgid "whisper"
-#~ msgstr "geflüsterte Nachricht"
+#~ msgid "Chatserver: Unknown error"
+#~ msgstr "Unbekannter Fehler"
 
-#~ msgid "ignore"
-#~ msgstr "Ignoriere"
+#~ msgid "Color"
+#~ msgstr "Farbe"
 
-#~ msgid "unignore"
-#~ msgstr "nicht ignorieren"
+#~ msgid "Command: /new <party-name>"
+#~ msgstr "Befehl: /new <Party-Name>"
 
-#, fuzzy
-#~ msgid "join"
-#~ msgstr "Anmelden"
+#~ msgid "Connection problem: %i"
+#~ msgstr "Verbindungsproblem: %i"
 
-#, fuzzy
-#~ msgid "list"
-#~ msgstr "Aufteilen"
+#~ msgid "Cost"
+#~ msgstr "Preis"
 
 #, fuzzy
-#~ msgid "clear"
-#~ msgstr "Waffenarm"
-
-#~ msgid "party"
-#~ msgstr "Party"
+#~ msgid "Couldn't load news"
+#~ msgstr "Karte konnte nicht geladen werden"
 
-#~ msgid "me"
-#~ msgstr "ich"
+#~ msgid "Couldn't set "
+#~ msgstr "Konnte Einstellung nicht setzen: "
 
-#~ msgid "record"
-#~ msgstr "nehme auf"
+#~ msgid "Couldn't set %dx%dx%d video mode: %s"
+#~ msgstr "Kann Videomodus %dx%dx%d nicht setzten: %s"
 
-#, fuzzy
-#~ msgid "toggle"
-#~ msgstr "Logger"
+#~ msgid "Craft"
+#~ msgstr "Handwerk"
 
-#~ msgid "present"
-#~ msgstr "Anwesend: "
+#~ msgid "Crafts"
+#~ msgstr "Handwerk"
 
-#~ msgid "n"
-#~ msgstr "Nein"
+#~ msgid "Delay"
+#~ msgstr "Verzögerung: "
 
-#~ msgid "N"
-#~ msgstr "Nein"
+#~ msgid "Description: %s"
+#~ msgstr "Beschreibung: %s"
 
-#~ msgid ", coordinates: "
-#~ msgstr ", Koordinaten: "
+#~ msgid "Disabled Buttons"
+#~ msgstr "Deaktivierte Buttons"
 
-#, fuzzy
-#~ msgid " "
-#~ msgstr "; "
+#~ msgid "Effect: %s"
+#~ msgstr "Effekt: %s"
 
-#, fuzzy
-#~ msgid "ItemShortcut"
-#~ msgstr "Kurztaste %d"
+#~ msgid "Emote Window"
+#~ msgstr "Gefühlsfenster"
 
 #, fuzzy
 #~ msgid "EmoteShortcut"
 #~ msgstr "Gefühlstaste %d"
 
 #, fuzzy
-#~ msgid "logToChat"
-#~ msgstr "Chat"
+#~ msgid "EnableSync"
+#~ msgstr "Joystick aktivieren"
 
 #, fuzzy
-#~ msgid "fpslimit"
-#~ msgstr "Aufteilen"
+#~ msgid "Error loading skills file: %s"
+#~ msgstr "Fehler beim Laden von %s"
 
 #, fuzzy
-#~ msgid "Mana_Screenshot_"
-#~ msgstr "Bildschirmfoto"
+#~ msgid "Error loading specials file: %s"
+#~ msgstr "Fehler beim Laden von %s"
 
 #, fuzzy
-#~ msgid "cancel"
-#~ msgstr "Abbrechen"
+#~ msgid "Error loading update file: %s"
+#~ msgstr "Fehler beim Erstellen des Verzeichnisses für Updates!"
 
 #, fuzzy
-#~ msgid "index"
-#~ msgstr "Im Fenster"
+#~ msgid "Error: %s can't be made, but doesn't exist!"
+#~ msgstr " konnte nicht erstellt werden, aber existiert auch nicht! Beende."
 
-#~ msgid "inc"
-#~ msgstr "Verringern"
+#, fuzzy
+#~ msgid "Error: %s/%s can't be made, but doesn't exist!"
+#~ msgstr " konnte nicht erstellt werden, aber existiert auch nicht! Beende."
 
 #, fuzzy
-#~ msgid "buy"
-#~ msgstr "Kaufen"
+#~ msgid "Error: Invalid update host: %s"
+#~ msgstr "Ungültiger Updateserver: "
 
 #, fuzzy
-#~ msgid "quit"
-#~ msgstr "Beenden"
+#~ msgid "Exp"
+#~ msgstr "Exp:"
 
-#~ msgid "Description: %s"
-#~ msgstr "Beschreibung: %s"
+#~ msgid "Failed to switch to "
+#~ msgstr "Konnte Auflösung nicht ändern zu "
 
-#~ msgid "Effect: %s"
-#~ msgstr "Effekt: %s"
+#~ msgid "Floating '...' bubble"
+#~ msgstr "Schwebende '...' Blase"
+
+#~ msgid "Floating bubble"
+#~ msgstr "Schwebende Blase"
+
+#~ msgid "GM"
+#~ msgstr "GM"
+
+#~ msgid "Generics"
+#~ msgstr "Allgemeiner Gegenstand"
 
 #, fuzzy
-#~ msgid "BuySell"
-#~ msgstr "Verkaufen"
+#~ msgid "Gradient"
+#~ msgstr "Handeln"
 
-#~ msgid "change_password"
-#~ msgstr "Passwort ändern"
+#~ msgid "Guilds"
+#~ msgstr "Gilden"
 
-#~ msgid "create"
-#~ msgstr "Erstellen"
+#, fuzzy
+#~ msgid "HP"
+#~ msgstr "HP:"
 
-#~ msgid "yes"
-#~ msgstr "Ja"
+#~ msgid "HP Bar"
+#~ msgstr "HP-Leiste"
+
+#~ msgid "Hats"
+#~ msgstr "Hüte"
+
+#~ msgid "Highlight"
+#~ msgstr "Hervorgehoben"
+
+#~ msgid "Hyperlink"
+#~ msgstr "Verknüpfung"
 
 #, fuzzy
-#~ msgid "unregister"
-#~ msgstr "Abmelden"
+#~ msgid "Invalid guild event"
+#~ msgstr "Ungültiger Updateserver: "
 
-#~ msgid "use"
-#~ msgstr "benutze"
+#~ msgid "Invite User"
+#~ msgstr "Spieler einladen"
 
-#~ msgid "new"
-#~ msgstr "Neu"
+#~ msgid "Inviting like this isn't supported at the moment."
+#~ msgstr "Einladungen auf diesem Weg werden im Moment nicht unterstützt."
 
-#~ msgid "delete"
-#~ msgstr "Löschen"
+#~ msgid "Is"
+#~ msgstr "Handlungen"
 
-#~ msgid "Level %d"
-#~ msgstr "Stufe: %d"
+#~ msgid "Item Is Equipped"
+#~ msgstr "Gegenstand ist in Verwendung"
+
+#~ msgid "Item Too Expensive"
+#~ msgstr "Gegenstand ist zu teuer"
 
 #, fuzzy
-#~ msgid "ReturnToggles"
-#~ msgstr "Enter-Taste schließt Chatzeile."
+#~ msgid "ItemShortcut"
+#~ msgstr "Kurztaste %d"
 
-#~ msgid "whispertab"
-#~ msgstr "geflüsterte Nachricht"
+#, fuzzy
+#~ msgid "Job"
+#~ msgstr "Job:"
+
+#~ msgid "Job Level: %d"
+#~ msgstr "Berufsstufe: %d"
 
 #, fuzzy
-#~ msgid " : "
-#~ msgstr " host: "
+#~ msgid "Level"
+#~ msgstr "Stufe: %d"
 
-#~ msgid "no"
-#~ msgstr "Nein"
+#~ msgid "Level %d"
+#~ msgstr "Stufe: %d"
 
-#~ msgid "Cancel pressed"
-#~ msgstr "Abbrechen wurde gedrückt"
+#~ msgid "Level Progress Update"
+#~ msgstr "Levelaufstiegsfortschritt"
 
-#~ msgid "Music: "
-#~ msgstr "Lautstärke der Musik: "
+#~ msgid "Logger"
+#~ msgstr "Logger"
 
-#~ msgid "music"
-#~ msgstr "Musik"
+#, fuzzy
+#~ msgid "MP"
+#~ msgstr "MP:"
 
-#~ msgid "Minimap: "
-#~ msgstr "Übersichtskarte: "
+#, fuzzy
+#~ msgid "Mana"
+#~ msgstr "Mana"
 
-#~ msgid "minimap"
-#~ msgstr "Übersichtskarte"
+#~ msgid "Mana %s"
+#~ msgstr "Mana: %s"
+
+#, fuzzy
+#~ msgid "Mana_Screenshot_"
+#~ msgstr "Bildschirmfoto"
 
 #~ msgid "Map: "
 #~ msgstr "Karte: "
 
-#, fuzzy
-#~ msgid "_filename"
-#~ msgstr "Sichtbare Namen"
-
-#~ msgid "unequip"
-#~ msgstr "Ausziehen"
+#~ msgid "Max level"
+#~ msgstr "Max Level"
 
-#~ msgid "Invite User"
-#~ msgstr "Spieler einladen"
+#~ msgid "Memorizing selected character %s"
+#~ msgstr "Speichere den gewählten Charakter %s"
 
-#~ msgid "Quit Guild"
-#~ msgstr "Gilde verlassen"
+#~ msgid "Minimap"
+#~ msgstr "Übersichtskarte"
 
-#~ msgid "close"
-#~ msgstr "Schließen"
+#~ msgid "Minimap: "
+#~ msgstr "Übersichtskarte: "
 
-#~ msgid "help/"
-#~ msgstr "Hilfe"
+#, fuzzy
+#~ msgid "Money"
+#~ msgstr "Geld: %d"
 
-#~ msgid "drop"
-#~ msgstr "Wegwerfen"
+#~ msgid "Music: "
+#~ msgstr "Lautstärke der Musik: "
 
-#~ msgid "split"
-#~ msgstr "Aufteilen"
+#~ msgid "Mystery Skill"
+#~ msgstr "Unbekannter Skill"
 
-#~ msgid "%s/%s"
-#~ msgstr "%s: %s"
+#~ msgid "N"
+#~ msgstr "Nein"
 
-#~ msgid "all"
-#~ msgstr "alle"
+#~ msgid "NPC Number Request"
+#~ msgstr "NPC Nummer Anfrage"
 
-#~ msgid "register"
-#~ msgstr "Registrieren"
+#~ msgid "NPC Text Request"
+#~ msgstr "NPC text Anfrage"
 
-#~ msgid "server"
-#~ msgstr "Server"
+#~ msgid "Necklaces"
+#~ msgstr "Halsketten"
 
-#~ msgid "login"
-#~ msgstr "Anmelden"
+#~ msgid "Network error: %s"
+#~ msgstr "Netzwerkfehler: %s"
 
-#~ msgid "Minimap"
-#~ msgstr "Übersichtskarte"
+#~ msgid "Network: Server: %s (%s:%d)"
+#~ msgstr "Netzwerk: Server: %s (%s:%d)"
 
-#~ msgid "Show"
-#~ msgstr "Zeigen"
+#, fuzzy
+#~ msgid "No modes available"
+#~ msgstr "Keine Server verfügbar"
 
 #~ msgid "NpcText"
 #~ msgstr "NpcText"
 
-#~ msgid "reset"
-#~ msgstr "Zurücksetzten"
-
-#~ msgid "send"
-#~ msgstr "Senden"
+#~ msgid "Ok"
+#~ msgstr "Ok"
 
-#~ msgid "previous"
-#~ msgstr "Zurück"
+#~ msgid "One Handed Weapons"
+#~ msgstr "Einhänder"
 
-#~ msgid "next"
-#~ msgstr "Weiter"
+#~ msgid "OutfitUnequip"
+#~ msgstr "Ausziehen"
 
 #~ msgid "OutfitUnequip0"
 #~ msgstr "Ausziehen"
 
-#~ msgid "-1"
-#~ msgstr "-1"
+#~ msgid "Pants"
+#~ msgstr "Hosen"
 
-#~ msgid "OutfitUnequip"
-#~ msgstr "Ausziehen"
+#~ msgid "Party Window"
+#~ msgstr "Partyfenster"
 
-#~ msgid "Color"
-#~ msgstr "Farbe"
+#~ msgid "Player"
+#~ msgstr "Spieler"
 
-#, fuzzy
-#~ msgid "Gradient"
-#~ msgstr "Handeln"
+#~ msgid "PopupMenu: Warning, unknown action '%s'"
+#~ msgstr "PopupMenu: Warnung, unbekannte Aktion '%s'"
 
-#~ msgid "Delay"
-#~ msgstr "Verzögerung: "
+#~ msgid "Progress Bar Labels"
+#~ msgstr "Fortschrittsbalkenbeschriftungen"
 
-#~ msgid "talk"
-#~ msgstr "Sprechen"
+#~ msgid "Quit Guild"
+#~ msgstr "Gilde verlassen"
 
-#~ msgid "trade"
-#~ msgstr "Handeln"
+#~ msgid "Quitting"
+#~ msgstr "Beenden"
 
-#~ msgid "attack"
-#~ msgstr "Angriff"
+#~ msgid "Received update host \"%s\" from login server."
+#~ msgstr "Empfange Updateserver \"%s\" vom Loginserver"
+
+#~ msgid "Recorder"
+#~ msgstr "Aufzeichnung"
 
 #, fuzzy
-#~ msgid "disregard"
-#~ msgstr "Unbeachtet"
+#~ msgid "Rejected guild invite from %s."
+#~ msgstr "Partyeinladung von %s abgelehnt."
 
-#~ msgid "friend"
-#~ msgstr "Freund"
+#~ msgid "Remaining Status Points: %d"
+#~ msgstr "Verbleibende Statuspunkte: %d"
 
-#~ msgid "guild"
-#~ msgstr "Gilde"
+#, fuzzy
+#~ msgid "ReturnToggles"
+#~ msgstr "Enter-Taste schließt Chatzeile."
 
-#~ msgid "pickup"
-#~ msgstr "Aufheben"
+#~ msgid "Rings"
+#~ msgstr "Ringe"
 
-#~ msgid "look"
-#~ msgstr "Schauen "
+#~ msgid "Scroll laziness"
+#~ msgstr "Scroll-Trägheit"
 
-#~ msgid "chat"
-#~ msgstr "Chat"
+#~ msgid "Scroll radius"
+#~ msgstr "Scroll-Radius"
 
-#~ msgid "store"
-#~ msgstr "Einlagern"
+#~ msgid "Server"
+#~ msgstr "Server"
 
-#~ msgid "retrieve"
-#~ msgstr "Abholen"
+#~ msgid "Shields"
+#~ msgstr "Schilde"
 
-#~ msgid "name"
-#~ msgstr "Name"
+#~ msgid "Shirts"
+#~ msgstr "Hemden"
 
-#~ msgid "PopupMenu: Warning, unknown action '%s'"
-#~ msgstr "PopupMenu: Warnung, unbekannte Aktion '%s'"
+#~ msgid "Shoes"
+#~ msgstr "Schuhe"
 
-#~ msgid "Recorder"
-#~ msgstr "Aufzeichnung"
+#~ msgid "Show"
+#~ msgstr "Zeigen"
 
-#~ msgid "sex"
-#~ msgstr "Geschlecht"
+#~ msgid "Slots: "
+#~ msgstr "Plätze: "
 
-#~ msgid "The queue is empty."
-#~ msgstr "Die Warteschlange ist leer."
+#~ msgid "Special %d"
+#~ msgstr "Spezial %d"
 
-#~ msgid "sell"
-#~ msgstr "Verkaufen"
+#~ msgid "Specials Set %d"
+#~ msgstr "Spezial Sets %d"
 
-#~ msgid "connect"
-#~ msgstr "Verbinde..."
+#~ msgid "Stats"
+#~ msgstr "Fähigkeiten"
 
-#~ msgid "Add Entry"
-#~ msgstr "Neuer Eintrag"
+#~ msgid "Tab Highlight"
+#~ msgstr "Hervorgehobener Tab"
 
-#~ msgid "type"
-#~ msgstr "Typ: "
+#~ msgid "Tabs"
+#~ msgstr "Tabs"
+
+#~ msgid "Text Outline"
+#~ msgstr "Textaußenlinie"
+
+#~ msgid "Text Shadow"
+#~ msgstr "Textschatten"
 
 #, fuzzy
-#~ msgid "unknown"
-#~ msgstr "Unbekannter Gegenstand"
+#~ msgid "The Mana World"
+#~ msgstr "The Mana World %s"
 
-#~ msgid "connection"
-#~ msgstr "Verbindung"
+#~ msgid "The Mana World %s"
+#~ msgstr "The Mana World %s"
 
-#~ msgid "manaserv"
-#~ msgstr "manaserver"
+#~ msgid "The queue is empty."
+#~ msgstr "Die Warteschlange ist leer."
 
-#, fuzzy
-#~ msgid "eathena"
-#~ msgstr "Erstellen"
+#~ msgid "Total"
+#~ msgstr "Gesamt"
 
-#~ msgid "hostname"
-#~ msgstr "Servername"
+#~ msgid "Two Handed Weapons"
+#~ msgstr "Zweihänder"
 
-#~ msgid "port"
-#~ msgstr "Port:"
+#~ msgid "Unable to load selection.png"
+#~ msgstr "Konnte selection.png nicht laden"
 
-#~ msgid "musicVolume"
-#~ msgstr "Lautstärke der Musik"
+#~ msgid "Unarmed"
+#~ msgstr "Unbewaffnet"
 
-#~ msgid "sfxVolume"
-#~ msgstr "Lautstärke der Klangeffekte"
+#~ msgid "Unhandled packet: %x"
+#~ msgstr "Nicht behandeltes Paket : %x"
 
-#~ msgid "sound"
-#~ msgstr "Ton"
+#~ msgid "Unknown : "
+#~ msgstr "Unbekannt: "
 
-#~ msgid "calibrate"
-#~ msgstr "Kalibrieren"
+#~ msgid "Unknown failure to select character."
+#~ msgstr "Unbekannter Fehler bei Auswahl des Charakters"
 
-#~ msgid "joystickEnabled"
-#~ msgstr "Joystick"
+#~ msgid "Unknown party exp option: %d\n"
+#~ msgstr "Unbekannte Party exp Option: %d\n"
 
-#~ msgid "makeDefault"
-#~ msgstr "stelle Standardeinstellungen her"
+#~ msgid "Unknown party item option: %d\n"
+#~ msgstr "Unbekannte Party Item Option: %d\n"
 
-#~ msgid "whisper tab"
-#~ msgstr "geflüsterte Nachricht"
+#~ msgid "Usables"
+#~ msgstr "Benutzbare Gegenstände"
 
-#, fuzzy
-#~ msgid "No modes available"
-#~ msgstr "Keine Server verfügbar"
+#~ msgid "Username is %s"
+#~ msgstr "Benutzername ist %s"
 
-#, fuzzy
-#~ msgid "screen"
-#~ msgstr "Vollbild"
+#~ msgid "Warning this server does not have a %s file falling back to %s"
+#~ msgstr ""
+#~ "Dieser Server besitzt keine %s Datei. Benutze stattdessen die Datei %s"
 
-#~ msgid "customcursor"
-#~ msgstr "Benutzerdefinierter Zeiger"
+#~ msgid "Warping to %s (%d, %d)"
+#~ msgstr "Flüsternd zu %s: (%d ,%d)"
 
-#~ msgid "visiblenames"
-#~ msgstr "Sichtbare Namen"
+#~ msgid "Weapons"
+#~ msgstr "Waffen"
 
-#~ msgid "particleeffects"
-#~ msgstr "Partikeleffekte"
+#~ msgid "Welcome"
+#~ msgstr "Wilkommen"
 
-#~ msgid "showownname"
-#~ msgstr "Zeige eigenen Namen"
+#~ msgid "Whisper"
+#~ msgstr "geflüsterte Nachricht"
 
-#~ msgid "showpickupchat"
-#~ msgstr "Benachrichtigung beim Aufheben"
+#~ msgid "Willpower:"
+#~ msgstr "Willenskraft:"
 
 #, fuzzy
-#~ msgid "showpickupparticle"
-#~ msgstr "als Partikeleffekt"
+#~ msgid "_filename"
+#~ msgstr "Sichtbare Namen"
 
-#, fuzzy
-#~ msgid "fontSize"
-#~ msgstr "Schriftgröße"
+#~ msgid "a"
+#~ msgstr "ein"
 
 #, fuzzy
-#~ msgid "videomode"
-#~ msgstr " Auflösung: "
+#~ msgid "action"
+#~ msgstr "Beziehung"
 
 #, fuzzy
-#~ msgid "pickupchat"
-#~ msgstr "Aufheben"
+#~ msgid "add"
+#~ msgstr "Hinzufügen"
 
 #, fuzzy
-#~ msgid "pickupparticle"
-#~ msgstr "als Partikeleffekt"
+#~ msgid "agi"
+#~ msgstr "Magie"
 
-#, fuzzy
-#~ msgid "particledetailslider"
-#~ msgstr "Partikeldetail"
+#~ msgid "all"
+#~ msgstr "alle"
 
-#, fuzzy
-#~ msgid "particledetailfield"
-#~ msgstr "Partikeldetail"
+#~ msgid "announce"
+#~ msgstr "ankündigen"
 
 #, fuzzy
-#~ msgid "screenheight"
-#~ msgstr "Bildschirmfoto"
+#~ msgid "appName"
+#~ msgstr "Name"
 
 #, fuzzy
-#~ msgid "skills"
-#~ msgstr "Fertigkeiten"
+#~ msgid "appShort"
+#~ msgstr "Tastenkürzel"
 
-#, fuzzy
-#~ msgid "Error loading skills file: %s"
-#~ msgstr "Fehler beim Laden von %s"
+#~ msgid "attack"
+#~ msgstr "Angriff"
 
-#, fuzzy
-#~ msgid "set"
-#~ msgstr "Zurücksetzten"
+#~ msgid "attack-range"
+#~ msgstr "Angriffsreichweite"
 
-#, fuzzy
-#~ msgid "skill"
-#~ msgstr "Fertigkeiten"
+#~ msgid "axe"
+#~ msgstr "Axt"
 
 #, fuzzy
-#~ msgid "Error loading specials file: %s"
-#~ msgstr "Fehler beim Laden von %s"
+#~ msgid "blinkname"
+#~ msgstr "Unbenannt"
+
+#~ msgid "bow"
+#~ msgstr "Bogen"
 
 #, fuzzy
-#~ msgid " (%+d)"
-#~ msgstr "HP %+d"
+#~ msgid "buy"
+#~ msgstr "Kaufen"
+
+#~ msgid "calibrate"
+#~ msgstr "Kalibrieren"
 
 #, fuzzy
-#~ msgid "add"
-#~ msgstr "Hinzufügen"
+#~ msgid "cancel"
+#~ msgstr "Abbrechen"
+
+#~ msgid "change_password"
+#~ msgstr "Passwort ändern"
+
+#~ msgid "character"
+#~ msgstr "Spielfigur"
+
+#~ msgid "chat"
+#~ msgstr "Chat"
 
 #, fuzzy
-#~ msgid "money"
-#~ msgstr "Gefühle"
+#~ msgid "clear"
+#~ msgstr "Waffenarm"
+
+#~ msgid "close"
+#~ msgstr "Schließen"
+
+#~ msgid "connect"
+#~ msgstr "Verbinde..."
+
+#~ msgid "connection"
+#~ msgstr "Verbindung"
+
+#~ msgid "create"
+#~ msgstr "Erstellen"
+
+#~ msgid "curl error "
+#~ msgstr "curl-Fehler "
+
+#~ msgid "customcursor"
+#~ msgstr "Benutzerdefinierter Zeiger"
+
+#~ msgid "default"
+#~ msgstr "Standard"
 
 #, fuzzy
-#~ msgid "Error loading update file: %s"
-#~ msgstr "Fehler beim Erstellen des Verzeichnisses für Updates!"
+#~ msgid "defaultPort"
+#~ msgstr "Standard"
 
 #, fuzzy
-#~ msgid "file"
-#~ msgstr "Grinsen"
+#~ msgid "defaultServer"
+#~ msgstr "Server auswählen"
+
+#~ msgid "defense"
+#~ msgstr "Verteidigung:"
+
+#~ msgid "delete"
+#~ msgstr "Löschen"
 
 #, fuzzy
 #~ msgid "description"
 #~ msgstr "Beschreibung: %s"
 
 #, fuzzy
-#~ msgid "play"
-#~ msgstr "Los!"
+#~ msgid "disregard"
+#~ msgstr "Unbeachtet"
 
-#, fuzzy
-#~ msgid "Couldn't load news"
-#~ msgstr "Karte konnte nicht geladen werden"
+#~ msgid "drop"
+#~ msgstr "Wegwerfen"
 
-#~ msgid "Warning this server does not have a %s file falling back to %s"
-#~ msgstr ""
-#~ "Dieser Server besitzt keine %s Datei. Benutze stattdessen die Datei %s"
+#, fuzzy
+#~ msgid "eathena"
+#~ msgstr "Erstellen"
 
-#~ msgid "%s already here"
-#~ msgstr "%s ist bereits hier"
+#~ msgid "effect"
+#~ msgstr "Effekt:"
 
 #, fuzzy
-#~ msgid "users"
-#~ msgstr "benutze"
+#~ msgid "emote0"
+#~ msgstr "Gefühle"
 
 #, fuzzy
-#~ msgid "topic"
-#~ msgstr "Stopp"
+#~ msgid "emote1"
+#~ msgstr "Gefühle"
 
-#, fuzzy
-#~ msgid "op"
-#~ msgstr "Geschäft"
+#~ msgid "equip-1hand"
+#~ msgstr "Einhänder"
 
-#, fuzzy
-#~ msgid "kick"
-#~ msgstr "Aufheben"
+#~ msgid "equip-2hand"
+#~ msgstr "Zweihänder"
 
-#~ msgid "Welcome"
-#~ msgstr "Wilkommen"
+#~ msgid "equip-ammo"
+#~ msgstr "Waffe"
 
-#~ msgid ":-)"
-#~ msgstr ":-)"
+#~ msgid "equip-arms"
+#~ msgstr "Armausrüstung"
 
-#~ msgid "Guilds"
-#~ msgstr "Gilden"
+#~ msgid "equip-feet"
+#~ msgstr "Schuhe & Stiefel"
 
-#, fuzzy
-#~ msgid "world"
-#~ msgstr "Schwertpolarm"
+#~ msgid "equip-head"
+#~ msgstr "Kopfbedeckung"
 
-#, fuzzy
-#~ msgid "keyMoveUp"
-#~ msgstr "Laufe Hoch"
+#~ msgid "equip-legs"
+#~ msgstr "Beinausrüstung"
 
-#, fuzzy
-#~ msgid "keyMoveDown"
-#~ msgstr "Laufe Runter"
+#~ msgid "equip-necklace"
+#~ msgstr "Halsketten"
 
-#, fuzzy
-#~ msgid "keyMoveLeft"
-#~ msgstr "Laufe nach Links"
+#~ msgid "equip-ring"
+#~ msgstr "Ring"
 
-#, fuzzy
-#~ msgid "keyMoveRight"
-#~ msgstr "Laufe nach Rechts"
+#~ msgid "equip-shield"
+#~ msgstr "Schilde"
 
 #, fuzzy
-#~ msgid "keyAttack"
-#~ msgstr "Angriff"
+#~ msgid "event"
+#~ msgstr "Letzter Server:"
 
-#, fuzzy
-#~ msgid "keyTargetAttack"
-#~ msgstr "Zielen & Angreifen"
+#~ msgid "female"
+#~ msgstr "Weiblich"
 
 #, fuzzy
-#~ msgid "keySmilie"
+#~ msgid "file"
 #~ msgstr "Grinsen"
 
 #, fuzzy
-#~ msgid "keyTalk"
-#~ msgstr "Sprechen"
+#~ msgid "fontSize"
+#~ msgstr "Schriftgröße"
 
 #, fuzzy
-#~ msgid "keyTarget"
-#~ msgstr "NPC anvisieren"
+#~ msgid "fpslimit"
+#~ msgstr "Aufteilen"
 
-#, fuzzy
-#~ msgid "keyTargetClosest"
-#~ msgstr "Nächstes Ziel anvisieren"
+#~ msgid "friend"
+#~ msgstr "Freund"
 
-#, fuzzy
-#~ msgid "keyTargetNPC"
-#~ msgstr "NPC anvisieren"
+#~ msgid "generic"
+#~ msgstr "Allgemeiner Gegenstand"
 
-#, fuzzy
-#~ msgid "keyTargetPlayer"
-#~ msgstr "Spieler anvisieren"
+#~ msgid "guild"
+#~ msgstr "Gilde"
 
-#, fuzzy
-#~ msgid "keyPickup"
-#~ msgstr "Aufheben"
+#~ msgid "help"
+#~ msgstr "Hilfe"
 
-#, fuzzy
-#~ msgid "keyHideWindows"
-#~ msgstr "Fenster ausblenden"
+#~ msgid "help/"
+#~ msgstr "Hilfe"
 
-#, fuzzy
-#~ msgid "keyBeingSit"
-#~ msgstr "Aktionen"
+#~ msgid "hit"
+#~ msgstr "getroffen"
 
-#, fuzzy
-#~ msgid "keyScreenshot"
-#~ msgstr "Bildschirmfoto"
+#~ msgid "hostname"
+#~ msgstr "Servername"
 
 #, fuzzy
-#~ msgid "keyTrade"
-#~ msgstr "Handeln"
+#~ msgid "hp"
+#~ msgstr "Geschäft"
 
-#, fuzzy
-#~ msgid "keyShortcut1"
-#~ msgstr "Tastenkürzel"
+#~ msgid "hurt"
+#~ msgstr "verletzten"
 
 #, fuzzy
-#~ msgid "keyShortcut2"
-#~ msgstr "Tastenkürzel"
+#~ msgid "hwaccel"
+#~ msgstr "Abbrechen"
 
-#, fuzzy
-#~ msgid "keyShortcut3"
-#~ msgstr "Tastenkürzel"
+#~ msgid "ignore"
+#~ msgstr "Ignoriere"
 
-#, fuzzy
-#~ msgid "keyShortcut4"
-#~ msgstr "Tastenkürzel"
+#~ msgid "image"
+#~ msgstr "Bild"
 
-#, fuzzy
-#~ msgid "keyShortcut5"
-#~ msgstr "Tastenkürzel"
+#~ msgid "inc"
+#~ msgstr "Verringern"
 
 #, fuzzy
-#~ msgid "keyShortcut6"
-#~ msgstr "Tastenkürzel"
+#~ msgid "index"
+#~ msgstr "Im Fenster"
 
 #, fuzzy
-#~ msgid "keyShortcut7"
-#~ msgstr "Tastenkürzel"
+#~ msgid "int"
+#~ msgstr "Sitzen"
 
 #, fuzzy
-#~ msgid "keyShortcut8"
-#~ msgstr "Tastenkürzel"
+#~ msgid "join"
+#~ msgstr "Anmelden"
 
-#, fuzzy
-#~ msgid "keyShortcut9"
-#~ msgstr "Tastenkürzel"
+#~ msgid "joystickEnabled"
+#~ msgstr "Joystick"
 
 #, fuzzy
-#~ msgid "keyShortcut10"
-#~ msgstr "Tastenkürzel"
+#~ msgid "keyAttack"
+#~ msgstr "Angriff"
 
 #, fuzzy
-#~ msgid "keyShortcut11"
-#~ msgstr "Tastenkürzel"
+#~ msgid "keyBeingSit"
+#~ msgstr "Aktionen"
 
 #, fuzzy
-#~ msgid "keyShortcut12"
-#~ msgstr "Tastenkürzel"
+#~ msgid "keyChat"
+#~ msgstr "Chat"
 
 #, fuzzy
-#~ msgid "keyWindowInventory"
-#~ msgstr "Inventar"
+#~ msgid "keyChatScrollDown"
+#~ msgstr "Im Chat runter scrollen"
 
 #, fuzzy
-#~ msgid "keyWindowEquipment"
-#~ msgstr "Ausrüstung"
+#~ msgid "keyEmoteShortcut1"
+#~ msgstr "Gefühlstaste %d"
 
 #, fuzzy
-#~ msgid "keyWindowSkill"
-#~ msgstr "Unbekannte Fähigkeit"
+#~ msgid "keyEmoteShortcut10"
+#~ msgstr "Gefühlstaste %d"
 
 #, fuzzy
-#~ msgid "keyWindowShortcut"
-#~ msgstr "Tastenkürzel"
-
-#~ msgid "Party Window"
-#~ msgstr "Partyfenster"
+#~ msgid "keyEmoteShortcut11"
+#~ msgstr "Gefühlstaste %d"
 
 #, fuzzy
-#~ msgid "keyEmoteShortcut1"
+#~ msgid "keyEmoteShortcut12"
 #~ msgstr "Gefühlstaste %d"
 
 #, fuzzy
@@ -4518,497 +4689,486 @@ msgstr "unbenannt"
 #~ msgstr "Gefühlstaste %d"
 
 #, fuzzy
-#~ msgid "keyEmoteShortcut10"
-#~ msgstr "Gefühlstaste %d"
+#~ msgid "keyHideWindows"
+#~ msgstr "Fenster ausblenden"
 
 #, fuzzy
-#~ msgid "keyEmoteShortcut11"
-#~ msgstr "Gefühlstaste %d"
+#~ msgid "keyIgnoreInput1"
+#~ msgstr "Ignoriere Eingabe 1"
 
 #, fuzzy
-#~ msgid "keyEmoteShortcut12"
-#~ msgstr "Gefühlstaste %d"
+#~ msgid "keyIgnoreInput2"
+#~ msgstr "Ignoriere Eingabe 2"
 
 #, fuzzy
-#~ msgid "keyChat"
-#~ msgstr "Chat"
+#~ msgid "keyMoveDown"
+#~ msgstr "Laufe Runter"
 
 #, fuzzy
-#~ msgid "keyChatScrollDown"
-#~ msgstr "Im Chat runter scrollen"
+#~ msgid "keyMoveLeft"
+#~ msgstr "Laufe nach Links"
 
 #, fuzzy
-#~ msgid "keyQuit"
-#~ msgstr "Beenden"
+#~ msgid "keyMoveRight"
+#~ msgstr "Laufe nach Rechts"
 
 #, fuzzy
-#~ msgid "keyIgnoreInput1"
-#~ msgstr "Ignoriere Eingabe 1"
+#~ msgid "keyMoveUp"
+#~ msgstr "Laufe Hoch"
 
 #, fuzzy
-#~ msgid "keyIgnoreInput2"
-#~ msgstr "Ignoriere Eingabe 2"
+#~ msgid "keyPickup"
+#~ msgstr "Aufheben"
 
 #, fuzzy
-#~ msgid "updatehost"
-#~ msgstr "Ungültiger Updateserver: "
+#~ msgid "keyQuit"
+#~ msgstr "Beenden"
 
 #, fuzzy
-#~ msgid "Error: Invalid update host: %s"
-#~ msgstr "Ungültiger Updateserver: "
+#~ msgid "keyScreenshot"
+#~ msgstr "Bildschirmfoto"
 
 #, fuzzy
-#~ msgid "Error: %s can't be made, but doesn't exist!"
-#~ msgstr " konnte nicht erstellt werden, aber existiert auch nicht! Beende."
+#~ msgid "keyShortcut1"
+#~ msgstr "Tastenkürzel"
 
 #, fuzzy
-#~ msgid "Error: %s/%s can't be made, but doesn't exist!"
-#~ msgstr " konnte nicht erstellt werden, aber existiert auch nicht! Beende."
+#~ msgid "keyShortcut10"
+#~ msgstr "Tastenkürzel"
 
 #, fuzzy
-#~ msgid "appName"
-#~ msgstr "Name"
+#~ msgid "keyShortcut11"
+#~ msgstr "Tastenkürzel"
 
 #, fuzzy
-#~ msgid "Mana"
-#~ msgstr "Mana"
+#~ msgid "keyShortcut12"
+#~ msgstr "Tastenkürzel"
 
 #, fuzzy
-#~ msgid "appShort"
+#~ msgid "keyShortcut2"
 #~ msgstr "Tastenkürzel"
 
-#~ msgid "mana"
-#~ msgstr "mana"
-
 #, fuzzy
-#~ msgid "defaultServer"
-#~ msgstr "Server auswählen"
+#~ msgid "keyShortcut3"
+#~ msgstr "Tastenkürzel"
 
 #, fuzzy
-#~ msgid "defaultPort"
-#~ msgstr "Standard"
+#~ msgid "keyShortcut4"
+#~ msgstr "Tastenkürzel"
 
 #, fuzzy
-#~ msgid "hwaccel"
-#~ msgstr "Abbrechen"
+#~ msgid "keyShortcut5"
+#~ msgstr "Tastenkürzel"
 
 #, fuzzy
-#~ msgid "Can't create %s. Using defaults."
-#~ msgstr "Chat-Erstellung fehlgeschlagen!"
+#~ msgid "keyShortcut6"
+#~ msgstr "Tastenkürzel"
 
 #, fuzzy
-#~ msgid "The Mana World"
-#~ msgstr "The Mana World %s"
-
-#~ msgid "Can't find Resources directory\n"
-#~ msgstr "Kann das Ressourcen Verzeichnis nicht finden\n"
-
-#~ msgid "Couldn't set %dx%dx%d video mode: %s"
-#~ msgstr "Kann Videomodus %dx%dx%d nicht setzten: %s"
-
-#~ msgid "The Mana World %s"
-#~ msgstr "The Mana World %s"
-
-#~ msgid "default"
-#~ msgstr "Standard"
-
-#~ msgid "password"
-#~ msgstr "Passwort:"
+#~ msgid "keyShortcut7"
+#~ msgstr "Tastenkürzel"
 
-#~ msgid "character"
-#~ msgstr "Spielfigur"
+#, fuzzy
+#~ msgid "keyShortcut8"
+#~ msgstr "Tastenkürzel"
 
-#~ msgid "update-host"
-#~ msgstr "Updateserver: "
+#, fuzzy
+#~ msgid "keyShortcut9"
+#~ msgstr "Tastenkürzel"
 
-#~ msgid "username"
-#~ msgstr "Benutztername"
+#, fuzzy
+#~ msgid "keySmilie"
+#~ msgstr "Grinsen"
 
-#~ msgid "screenshot-dir"
-#~ msgstr "Bildschirmfotoordner"
+#, fuzzy
+#~ msgid "keyTalk"
+#~ msgstr "Sprechen"
 
-#~ msgid "Username is %s"
-#~ msgstr "Benutzername ist %s"
+#, fuzzy
+#~ msgid "keyTarget"
+#~ msgstr "NPC anvisieren"
 
-#~ msgid "Mana %s"
-#~ msgstr "Mana: %s"
+#, fuzzy
+#~ msgid "keyTargetAttack"
+#~ msgstr "Zielen & Angreifen"
 
-#~ msgid "loginMusic"
-#~ msgstr "Loginmusik"
+#, fuzzy
+#~ msgid "keyTargetClosest"
+#~ msgstr "Nächstes Ziel anvisieren"
 
-#~ msgid "lastCharacter"
-#~ msgstr "letzter Charakter"
+#, fuzzy
+#~ msgid "keyTargetNPC"
+#~ msgstr "NPC anvisieren"
 
-#~ msgid "Memorizing selected character %s"
-#~ msgstr "Speichere den gewählten Charakter %s"
+#, fuzzy
+#~ msgid "keyTargetPlayer"
+#~ msgstr "Spieler anvisieren"
 
-#~ msgid "Quitting"
-#~ msgstr "Beenden"
+#, fuzzy
+#~ msgid "keyTrade"
+#~ msgstr "Handeln"
 
 #, fuzzy
-#~ msgid "EnableSync"
-#~ msgstr "Joystick aktivieren"
+#~ msgid "keyWindowEquipment"
+#~ msgstr "Ausrüstung"
 
 #, fuzzy
-#~ msgid "agi"
-#~ msgstr "Magie"
+#~ msgid "keyWindowInventory"
+#~ msgstr "Inventar"
 
 #, fuzzy
-#~ msgid "vit"
-#~ msgstr "Sitzen"
+#~ msgid "keyWindowShortcut"
+#~ msgstr "Tastenkürzel"
 
 #, fuzzy
-#~ msgid "int"
-#~ msgstr "Sitzen"
+#~ msgid "keyWindowSkill"
+#~ msgstr "Unbekannte Fähigkeit"
 
-#~ msgid "luck"
-#~ msgstr "Glück"
+#, fuzzy
+#~ msgid "kick"
+#~ msgstr "Aufheben"
 
-#~ msgid "Connection problem: %i"
-#~ msgstr "Verbindungsproblem: %i"
+#~ msgid "knife"
+#~ msgstr "Messer"
 
-#~ msgid "/new > Alias of create"
-#~ msgstr "/new > Ersatz für create"
+#~ msgid "large"
+#~ msgstr "groß"
 
-#~ msgid "Command: /new <party-name>"
-#~ msgstr "Befehl: /new <Party-Name>"
+#~ msgid "lastCharacter"
+#~ msgstr "letzter Charakter"
 
 #~ msgid "leave"
 #~ msgstr "verlassen"
 
-#~ msgid "Arrows equipped: %i"
-#~ msgstr "Pfeile ausgerüstet: %i"
+#, fuzzy
+#~ msgid "list"
+#~ msgstr "Aufteilen"
 
-#~ msgid "Received update host \"%s\" from login server."
-#~ msgstr "Empfange Updateserver \"%s\" vom Loginserver"
+#, fuzzy
+#~ msgid "logToChat"
+#~ msgstr "Chat"
 
-#~ msgid "Network: Server: %s (%s:%d)"
-#~ msgstr "Netzwerk: Server: %s (%s:%d)"
+#~ msgid "login"
+#~ msgstr "Anmelden"
 
-#~ msgid "Unhandled packet: %x"
-#~ msgstr "Nicht behandeltes Paket : %x"
+#~ msgid "loginMusic"
+#~ msgstr "Loginmusik"
 
-#~ msgid "Network error: %s"
-#~ msgstr "Netzwerkfehler: %s"
+#~ msgid "look"
+#~ msgstr "Schauen "
 
-#~ msgid "Unknown party exp option: %d\n"
-#~ msgstr "Unbekannte Party exp Option: %d\n"
+#~ msgid "luck"
+#~ msgstr "Glück"
 
-#~ msgid "Unknown party item option: %d\n"
-#~ msgstr "Unbekannte Party Item Option: %d\n"
+#~ msgid "mace"
+#~ msgstr "Irrgarten"
 
-#~ msgid "Warping to %s (%d, %d)"
-#~ msgstr "Flüsternd zu %s: (%d ,%d)"
+#~ msgid "makeDefault"
+#~ msgstr "stelle Standardeinstellungen her"
 
-#~ msgid "Adjust scrolling by %d:%d"
-#~ msgstr "Justiere Scrolling %d:%d"
+#~ msgid "male"
+#~ msgstr "Männlich"
 
-#~ msgid "Chatserver: Unknown error"
-#~ msgstr "Unbekannter Fehler"
+#~ msgid "mana"
+#~ msgstr "mana"
 
-#~ msgid "Unknown : "
-#~ msgstr "Unbekannt: "
+#~ msgid "manaserv"
+#~ msgstr "manaserver"
 
-#, fuzzy
-#~ msgid "will"
-#~ msgstr "Fertigkeiten"
+#~ msgid "me"
+#~ msgstr "ich"
 
-#, fuzzy
-#~ msgid "Invalid guild event"
-#~ msgstr "Ungültiger Updateserver: "
+#~ msgid "minimap"
+#~ msgstr "Übersichtskarte"
 
-#~ msgid "Accountserver: Not logged in"
-#~ msgstr "nicht angemeldet"
+#~ msgid "miss"
+#~ msgstr "verfehlt"
 
-#~ msgid "Accountserver: Unknown error"
-#~ msgstr "Unbekannter Fehler"
+#, fuzzy
+#~ msgid "money"
+#~ msgstr "Gefühle"
 
-#~ msgid "Accountserver: Wrong username or password"
-#~ msgstr "Benutzername oder Passwort falsch"
+#~ msgid "monster"
+#~ msgstr "Monster"
 
-#~ msgid "%s: %s\n"
-#~ msgstr "%s: %s\n"
+#~ msgid "monsters"
+#~ msgstr "Monster"
 
-#~ msgid "Level Progress Update"
-#~ msgstr "Levelaufstiegsfortschritt"
+#~ msgid "music"
+#~ msgstr "Musik"
 
-#~ msgid "nop"
-#~ msgstr "Nö"
+#~ msgid "musicVolume"
+#~ msgstr "Lautstärke der Musik"
 
-#, fuzzy
-#~ msgid "emote0"
-#~ msgstr "Gefühle"
+#~ msgid "n"
+#~ msgstr "Nein"
 
-#~ msgid "relation"
-#~ msgstr "Beziehung"
+#~ msgid "name"
+#~ msgstr "Name"
 
-#~ msgid "player"
-#~ msgstr "Spieler"
+#~ msgid "new"
+#~ msgstr "Neu"
 
-#, fuzzy
-#~ msgid "blinkname"
-#~ msgstr "Unbenannt"
+#~ msgid "next"
+#~ msgstr "Weiter"
 
-#, fuzzy
-#~ msgid "emote1"
-#~ msgstr "Gefühle"
+#~ msgid "no"
+#~ msgstr "Nein"
 
-#~ msgid "defense"
-#~ msgstr "Verteidigung:"
+#~ msgid "nop"
+#~ msgstr "Nö"
 
 #, fuzzy
-#~ msgid "hp"
+#~ msgid "op"
 #~ msgstr "Geschäft"
 
-#~ msgid "generic"
-#~ msgstr "Allgemeiner Gegenstand"
-
-#~ msgid "usable"
-#~ msgstr "Benutzbare Gegenstände"
+#~ msgid "other"
+#~ msgstr "andere"
 
-#~ msgid "equip-1hand"
-#~ msgstr "Einhänder"
+#~ msgid "particle-effect"
+#~ msgstr "Partikeleffekte"
 
-#~ msgid "equip-2hand"
-#~ msgstr "Zweihänder"
+#, fuzzy
+#~ msgid "particledetailfield"
+#~ msgstr "Partikeldetail"
 
-#~ msgid "equip-arms"
-#~ msgstr "Armausrüstung"
+#, fuzzy
+#~ msgid "particledetailslider"
+#~ msgstr "Partikeldetail"
 
-#~ msgid "equip-head"
-#~ msgstr "Kopfbedeckung"
+#~ msgid "particleeffects"
+#~ msgstr "Partikeleffekte"
 
-#~ msgid "equip-legs"
-#~ msgstr "Beinausrüstung"
+#~ msgid "particlefx"
+#~ msgstr "als Partikeleffekt"
 
-#~ msgid "equip-shield"
-#~ msgstr "Schilde"
+#~ msgid "party"
+#~ msgstr "Party"
 
-#~ msgid "equip-ring"
-#~ msgstr "Ring"
+#~ msgid "password"
+#~ msgstr "Passwort:"
 
-#~ msgid "equip-necklace"
-#~ msgstr "Halsketten"
+#~ msgid "pickup"
+#~ msgstr "Aufheben"
 
-#~ msgid "equip-feet"
-#~ msgstr "Schuhe & Stiefel"
+#, fuzzy
+#~ msgid "pickupchat"
+#~ msgstr "Aufheben"
 
-#~ msgid "equip-ammo"
-#~ msgstr "Waffe"
+#, fuzzy
+#~ msgid "pickupparticle"
+#~ msgstr "als Partikeleffekt"
 
-#~ msgid "knife"
-#~ msgstr "Messer"
+#, fuzzy
+#~ msgid "play"
+#~ msgstr "Los!"
 
-#~ msgid "sword"
-#~ msgstr "Schwert"
+#~ msgid "player"
+#~ msgstr "Spieler"
 
 #~ msgid "polearm"
 #~ msgstr "Waffenarm"
 
-#~ msgid "staff"
-#~ msgstr "Stab"
-
-#~ msgid "whip"
-#~ msgstr "Peitsche"
-
-#~ msgid "bow"
-#~ msgstr "Bogen"
-
-#~ msgid "shooting"
-#~ msgstr "schießen"
-
-#~ msgid "mace"
-#~ msgstr "Irrgarten"
+#~ msgid "port"
+#~ msgstr "Port:"
 
-#~ msgid "axe"
-#~ msgstr "Axt"
+#~ msgid "present"
+#~ msgstr "Anwesend: "
 
-#~ msgid "thrown"
-#~ msgstr "geworfen"
+#~ msgid "previous"
+#~ msgstr "Zurück"
 
-#~ msgid "ItemDB: Error while loading items.xml!"
-#~ msgstr "Fehler beim Laden von item.xml!"
+#, fuzzy
+#~ msgid "quit"
+#~ msgstr "Beenden"
 
-#~ msgid "other"
-#~ msgstr "andere"
+#~ msgid "record"
+#~ msgstr "nehme auf"
 
-#~ msgid "weight"
-#~ msgstr "Gewicht:"
+#~ msgid "register"
+#~ msgstr "Registrieren"
 
-#~ msgid "view"
-#~ msgstr "Ansicht"
+#~ msgid "relation"
+#~ msgstr "Beziehung"
 
-#~ msgid "image"
-#~ msgstr "Bild"
+#~ msgid "reset"
+#~ msgstr "Zurücksetzten"
 
-#~ msgid "weapon-type"
-#~ msgstr "Waffentyp"
+#~ msgid "retrieve"
+#~ msgstr "Abholen"
 
-#~ msgid "attack-range"
-#~ msgstr "Angriffsreichweite"
+#, fuzzy
+#~ msgid "screen"
+#~ msgstr "Vollbild"
 
-#~ msgid "effect"
-#~ msgstr "Effekt:"
+#, fuzzy
+#~ msgid "screenheight"
+#~ msgstr "Bildschirmfoto"
 
-#~ msgid "particle-effect"
-#~ msgstr "Partikeleffekte"
+#~ msgid "screenshot-dir"
+#~ msgstr "Bildschirmfotoordner"
 
-#, fuzzy
-#~ msgid "unisex"
-#~ msgstr "benutze"
+#~ msgid "sell"
+#~ msgstr "Verkaufen"
 
-#~ msgid "male"
-#~ msgstr "Männlich"
+#~ msgid "send"
+#~ msgstr "Senden"
 
-#~ msgid "female"
-#~ msgstr "Weiblich"
+#~ msgid "server"
+#~ msgstr "Server"
 
 #, fuzzy
-#~ msgid "event"
-#~ msgstr "Letzter Server:"
-
-#~ msgid "hit"
-#~ msgstr "getroffen"
+#~ msgid "set"
+#~ msgstr "Zurücksetzten"
 
-#~ msgid "monsters"
-#~ msgstr "Monster"
+#~ msgid "sex"
+#~ msgstr "Geschlecht"
 
-#~ msgid "monster"
-#~ msgstr "Monster"
+#~ msgid "sfxVolume"
+#~ msgstr "Lautstärke der Klangeffekte"
 
-#~ msgid "small"
-#~ msgstr "klein"
+#~ msgid "shooting"
+#~ msgstr "schießen"
 
-#~ msgid "large"
-#~ msgstr "groß"
+#~ msgid "showownname"
+#~ msgstr "Zeige eigenen Namen"
 
-#~ msgid "miss"
-#~ msgstr "verfehlt"
+#~ msgid "showpickupchat"
+#~ msgstr "Benachrichtigung beim Aufheben"
 
-#~ msgid "hurt"
-#~ msgstr "verletzten"
+#, fuzzy
+#~ msgid "showpickupparticle"
+#~ msgstr "als Partikeleffekt"
 
 #, fuzzy
-#~ msgid "action"
-#~ msgstr "Beziehung"
+#~ msgid "skill"
+#~ msgstr "Fertigkeiten"
 
-#~ msgid "particlefx"
-#~ msgstr "als Partikeleffekt"
+#, fuzzy
+#~ msgid "skills"
+#~ msgstr "Fertigkeiten"
 
-#~ msgid "Buddy"
-#~ msgstr "Freund"
+#~ msgid "small"
+#~ msgstr "klein"
 
-#~ msgid "Buddy List"
-#~ msgstr "Freundesliste"
+#~ msgid "sound"
+#~ msgstr "Ton"
 
-#~ msgid "Job Level: %d"
-#~ msgstr "Berufsstufe: %d"
+#~ msgid "split"
+#~ msgstr "Aufteilen"
 
-#~ msgid "Ok"
-#~ msgstr "Ok"
+#~ msgid "staff"
+#~ msgstr "Stab"
 
-#~ msgid "Cast Test Spell 1"
-#~ msgstr "Spruch 1 sprechen"
+#~ msgid "store"
+#~ msgstr "Einlagern"
 
-#~ msgid "Cast Test Spell 2"
-#~ msgstr "Spruch 2 sprechen"
+#~ msgid "sword"
+#~ msgstr "Schwert"
 
-#~ msgid "Cast Test Spell 3"
-#~ msgstr "Spruch 3 sprechen"
+#~ msgid "talk"
+#~ msgstr "Sprechen"
 
-#~ msgid "2 Handed Weapons"
-#~ msgstr "zweihändige Waffen"
+#~ msgid "thrown"
+#~ msgstr "geworfen"
 
-#~ msgid "Failed to switch to "
-#~ msgstr "Konnte Auflösung nicht ändern zu "
+#, fuzzy
+#~ msgid "toggle"
+#~ msgstr "Logger"
 
-#~ msgid "Mystery Skill"
-#~ msgstr "Unbekannter Skill"
+#, fuzzy
+#~ msgid "topic"
+#~ msgstr "Stopp"
 
-#~ msgid "Weapons"
-#~ msgstr "Waffen"
+#~ msgid "trade"
+#~ msgstr "Handeln"
 
-#~ msgid "Crafts"
-#~ msgstr "Handwerk"
+#~ msgid "type"
+#~ msgstr "Typ: "
 
-#~ msgid "Stats"
-#~ msgstr "Fähigkeiten"
+#~ msgid "unequip"
+#~ msgstr "Ausziehen"
 
-#~ msgid "Total"
-#~ msgstr "Gesamt"
+#~ msgid "unignore"
+#~ msgstr "nicht ignorieren"
 
-#~ msgid "Cost"
-#~ msgstr "Preis"
+#, fuzzy
+#~ msgid "unisex"
+#~ msgstr "benutze"
 
-#~ msgid "Attack:"
-#~ msgstr "Angriff:"
+#, fuzzy
+#~ msgid "unknown"
+#~ msgstr "Unbekannter Gegenstand"
 
-#~ msgid "% Reflex:"
-#~ msgstr "% Reaktion:"
+#, fuzzy
+#~ msgid "unregister"
+#~ msgstr "Abmelden"
 
-#~ msgid "Remaining Status Points: %d"
-#~ msgstr "Verbleibende Statuspunkte: %d"
+#~ msgid "update-host"
+#~ msgstr "Updateserver: "
 
-#~ msgid "Max level"
-#~ msgstr "Max Level"
+#, fuzzy
+#~ msgid "updatehost"
+#~ msgstr "Ungültiger Updateserver: "
 
-#~ msgid "curl error "
-#~ msgstr "curl-Fehler "
+#~ msgid "usable"
+#~ msgstr "Benutzbare Gegenstände"
 
-#~ msgid "Buddys"
-#~ msgstr "Freunde"
+#~ msgid "use"
+#~ msgstr "benutze"
 
-#~ msgid "Unarmed"
-#~ msgstr "Unbewaffnet"
+#~ msgid "username"
+#~ msgstr "Benutztername"
 
-#~ msgid "Bow"
-#~ msgstr "Bogen"
+#, fuzzy
+#~ msgid "users"
+#~ msgstr "benutze"
 
-#~ msgid "Axe"
-#~ msgstr "Axt"
+#, fuzzy
+#~ msgid "videomode"
+#~ msgstr " Auflösung: "
 
-#~ msgid "Craft"
-#~ msgstr "Handwerk"
+#~ msgid "view"
+#~ msgstr "Ansicht"
 
-#~ msgid "Couldn't set "
-#~ msgstr "Konnte Einstellung nicht setzen: "
+#~ msgid "visiblenames"
+#~ msgstr "Sichtbare Namen"
 
-#~ msgid "a"
-#~ msgstr "ein"
+#, fuzzy
+#~ msgid "vit"
+#~ msgstr "Sitzen"
 
-#~ msgid "Scroll radius"
-#~ msgstr "Scroll-Radius"
+#~ msgid "weapon-type"
+#~ msgstr "Waffentyp"
 
-#~ msgid "Scroll laziness"
-#~ msgstr "Scroll-Trägheit"
+#~ msgid "weight"
+#~ msgstr "Gewicht:"
 
-#~ msgid "Save player list"
-#~ msgstr "Spielerliste sichern"
+#~ msgid "where"
+#~ msgstr "Wo"
 
-#~ msgid "Unable to load selection.png"
-#~ msgstr "Konnte selection.png nicht laden"
+#~ msgid "whip"
+#~ msgstr "Peitsche"
 
-#~ msgid " cancelled"
-#~ msgstr " abgebrochen"
+#~ msgid "whisper"
+#~ msgstr "geflüsterte Nachricht"
 
-#~ msgid "  -D --default    : Bypass the login process with default settings"
-#~ msgstr "  -D --default : Überspringe die Anmeldung mit den Voreinstellungen"
+#~ msgid "whisper tab"
+#~ msgstr "geflüsterte Nachricht"
 
-#~ msgid "NPC Number Request"
-#~ msgstr "NPC Nummer Anfrage"
+#~ msgid "whispertab"
+#~ msgstr "geflüsterte Nachricht"
 
-#~ msgid ""
-#~ "\n"
-#~ "> Cancel\n"
-#~ msgstr ""
-#~ "\n"
-#~ "> Abbrechen\n"
+#~ msgid "who"
+#~ msgstr "Wer"
 
-#~ msgid "NPC Text Request"
-#~ msgstr "NPC text Anfrage"
+#, fuzzy
+#~ msgid "will"
+#~ msgstr "Fertigkeiten"
 
-#~ msgid "Slots: "
-#~ msgstr "Plätze: "
+#, fuzzy
+#~ msgid "world"
+#~ msgstr "Schwertpolarm"
 
-#~ msgid "Emote Window"
-#~ msgstr "Gefühlsfenster"
+#~ msgid "yes"
+#~ msgstr "Ja"
diff --git a/po/es.po b/po/es.po
index 3a1cab8d..597746b8 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
-"Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-12-09 22:27+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-04-30 16:41+0200\n"
 "PO-Revision-Date: 2010-12-23 12:08+0100\n"
 "Last-Translator: Yohann Ferreira <yohann ferreira orange fr>\n"
 "Language-Team: Spanish Translator <natsuki.sumon@gmail.com>\n"
@@ -21,343 +21,410 @@ msgstr ""
 "X-Poedit-Language: Spanish\n"
 "X-Poedit-Country: SPAIN\n"
 
-#: src/client.cpp:555 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
-msgid "Setup"
-msgstr "Configuración"
+#: ../src/gui/npcdialog.cpp:208
+msgid ""
+"\n"
+"> Next\n"
+msgstr ""
+"\n"
+"> Siguiente\n"
 
-#: src/client.cpp:625
-msgid "Connecting to server"
-msgstr "Conectando al servidor"
+#: ../src/main.cpp:45
+msgid "              to the mana client."
+msgstr ""
 
-#: src/client.cpp:652
-msgid "Logging in"
-msgstr "Acediendo a la cuenta"
+#: ../src/main.cpp:44
+msgid "              used to set custom parameters"
+msgstr ""
 
-#: src/client.cpp:685
-msgid "Entering game world"
-msgstr "Entrando al juego"
+#: ../src/main.cpp:62
+#, fuzzy
+msgid "     --chat-log-dir   : Chat log dir to use"
+msgstr "  -C --config-dir     : Carpeta de Configuración a usar"
 
-#: src/client.cpp:741
-msgid "Requesting characters"
-msgstr "Cargando jugadores"
+#: ../src/main.cpp:61
+#, fuzzy
+msgid "     --localdata-dir  : Directory to use as local data directory"
+msgstr "  -L --localdata-dir  : Carpeta para usar los datos locales"
 
-#: src/client.cpp:770
-msgid "Connecting to the game server"
-msgstr "Conectando al servidor del juego"
+#: ../src/main.cpp:65
+msgid "     --no-opengl      : Disable OpenGL for this session"
+msgstr "     --no-opengl      :  Deshabilita OpenGL en esta sesion"
 
-#: src/client.cpp:801 src/client.cpp:808 src/client.cpp:942
-#: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
-#: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:241 src/gui/unregisterdialog.cpp:133
-#: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
-#: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
-msgid "Error"
-msgstr "Error"
+#: ../src/main.cpp:63
+msgid "     --screenshot-dir : Directory to store screenshots"
+msgstr "     --screenshot-dir : Carpeta donde guardar los screenshots"
 
-#: src/client.cpp:817
-msgid "Requesting registration details"
-msgstr "Detalles de registración"
+#: ../src/main.cpp:56
+msgid "     --update-host    : Use this update host"
+msgstr "     --update-host    : Usar este host de actualización"
 
-#: src/client.cpp:844
-msgid "Password Change"
-msgstr "Cambiar contraseña"
+#: ../src/main.cpp:50
+msgid "  -C --config-dir     : Configuration directory to use"
+msgstr "  -C --config-dir     : Carpeta de Configuración a usar"
 
-#: src/client.cpp:845
-msgid "Password changed successfully!"
-msgstr "Le contraseña se cambió correctamente!"
+#: ../src/main.cpp:57
+msgid "  -D --default        : Choose default character server and character"
+msgstr "  -D --default        : Escoje el personaje por defecto y el servidor"
 
-#: src/client.cpp:864
-msgid "Email Change"
-msgstr "Cambiar e-mail"
+#: ../src/main.cpp:52
+msgid "  -P --password       : Login with this password"
+msgstr "  -P --password       : Acceder con la contraseña"
 
-#: src/client.cpp:865
-msgid "Email changed successfully!"
-msgstr "Email modificado correctamente!"
+#: ../src/main.cpp:51
+msgid "  -U --username       : Login with this username"
+msgstr "  -U --username       : Acceder con este nombre de usuario"
 
-#: src/client.cpp:885
-msgid "Unregister Successful"
-msgstr "Registro cancelado"
+#: ../src/main.cpp:53
+msgid "  -c --character      : Login with this character"
+msgstr "  -c --character      : Acceder con este jugador"
 
-#: src/client.cpp:886
-msgid "Farewell, come back any time..."
-msgstr "Adiós, vuelve cuando quieras..."
+#: ../src/main.cpp:60
+msgid "  -d --data           : Directory to load game data from"
+msgstr "  -d --data           : Carpeta por donde cargar los datos del juego"
+
+#: ../src/main.cpp:49
+msgid "  -h --help           : Display this help"
+msgstr "  -h --help           : Muestra la ayuda"
+
+#: ../src/main.cpp:55
+msgid "  -p --port           : Login server port"
+msgstr "  -p --port           : Puerto del servidor"
+
+#: ../src/main.cpp:54
+msgid "  -s --server         : Login server name or IP"
+msgstr "  -s --server         :  Login server o IP"
+
+#: ../src/main.cpp:59
+msgid "  -u --skip-update    : Skip the update downloads"
+msgstr "  -u --skip-update    : Saltarse las actualizaciones"
+
+#: ../src/main.cpp:48
+msgid "  -v --version        : Display the version"
+msgstr "  -v --version        :  Muestra la versión"
+
+#: ../src/gui/updatewindow.cpp:419
+msgid "##1  It is strongly recommended that"
+msgstr "##1 Es altamente recomendado que"
+
+#: ../src/gui/updatewindow.cpp:417
+msgid "##1  The update process is incomplete."
+msgstr "##3  El proceso de actualización esta incompleto."
+
+#: ../src/gui/updatewindow.cpp:421
+msgid "##1  you try again later."
+msgstr "##1 lo intentes de nuevo más tarde."
+
+#: ../src/net/tmwa/generalhandler.cpp:241
+#, fuzzy, no-c-format
+msgid "% Accuracy"
+msgstr "% Puntería"
+
+#: ../src/net/tmwa/generalhandler.cpp:243
+#, no-c-format
+msgid "% Critical"
+msgstr "% Crítico"
+
+#: ../src/net/tmwa/generalhandler.cpp:242
+#, no-c-format
+msgid "% Evade"
+msgstr "% Evasión"
 
-#: src/client.cpp:1009 src/client.cpp:1032
+#: ../src/gui/debugwindow.cpp:61 ../src/gui/debugwindow.cpp:64
 #, c-format
-msgid "%s doesn't exist and can't be created! Exiting."
-msgstr "%s no existe y no puede ser creado! Saliendo."
+msgid "%d FPS"
+msgstr "%d FPS"
 
-#: src/client.cpp:1121
+#: ../src/gui/debugwindow.cpp:56
 #, c-format
-msgid "Invalid update host: %s"
-msgstr "Host de actualización inválido: %s"
+msgid "%d FPS (OpenGL)"
+msgstr "%d FPS (OpenGL)"
 
-#: src/client.cpp:1155 src/client.cpp:1161
-msgid "Error creating updates directory!"
-msgstr "Error creando la carpeta de actualizaciones!"
+#: ../src/client.cpp:1154 ../src/client.cpp:1182
+#, c-format
+msgid "%s doesn't exist and can't be created! Exiting."
+msgstr "%s no existe y no puede ser creado! Saliendo."
 
-#: src/commandhandler.cpp:127 src/commandhandler.cpp:308
-msgid "Unknown command."
-msgstr "Comando desconocido."
+#: ../src/net/manaserv/chathandler.cpp:306
+#, c-format
+msgid "%s entered the channel."
+msgstr "%s entró al canal."
 
-#: src/commandhandler.cpp:156
-msgid "-- Help --"
-msgstr "--Ayuda--"
+#: ../src/gui/socialwindow.cpp:601
+#, c-format
+msgid "%s has invited you to join the %s party."
+msgstr "%s te ha invitado para unirte al grupo %s."
 
-#: src/commandhandler.cpp:157
-msgid "/help > Display this help"
-msgstr "/help > Muestra esta ayuda"
+#: ../src/gui/socialwindow.cpp:558
+#, c-format
+msgid "%s has invited you to join the guild %s."
+msgstr "%s te ha invitado al clan %s."
 
-#: src/commandhandler.cpp:159
-msgid "/where > Display map name"
-msgstr "/where > Muestra el nombre del mapa"
+#: ../src/gui/socialwindow.cpp:596
+#, c-format
+msgid "%s has invited you to join their party."
+msgstr "%s te ha invitado a unirte a su grupo."
 
-#: src/commandhandler.cpp:160
-msgid "/who > Display number of online users"
-msgstr "/who > Muestra el número de jugadores on-line"
+#: ../src/net/manaserv/chathandler.cpp:337
+#, c-format
+msgid "%s has kicked %s."
+msgstr "%s expulsó a %s."
 
-#: src/commandhandler.cpp:161
-msgid "/me > Tell something about yourself"
-msgstr "/me > Para decir algo sobre ti"
+#: ../src/net/tmwa/partyhandler.cpp:246
+#, c-format
+msgid "%s has left your party."
+msgstr "%s dejó tu grupo."
 
-#: src/commandhandler.cpp:163
-msgid "/clear > Clears this window"
-msgstr "/clear > Limpia esta ventana"
+#: ../src/net/manaserv/chathandler.cpp:327
+#, c-format
+msgid "%s has set mode %s on user %s."
+msgstr "%s colocó en el modo %s al usuario %s."
 
-#: src/commandhandler.cpp:165
-msgid "/msg > Send a private message to a user"
-msgstr "/msg > Envia un mensaje privado a este jugador"
+#: ../src/net/tmwa/partyhandler.cpp:119
+#, c-format
+msgid "%s is already a member of a party."
+msgstr "%s ya es miembro de otro grupo."
 
-#: src/commandhandler.cpp:166
-msgid "/whisper > Alias of msg"
-msgstr "/whisper > Lo mismo que /msg"
+#: ../src/net/tmwa/partyhandler.cpp:368
+#, c-format
+msgid "%s is not in your party!"
+msgstr "%s no está en tu grupo!"
 
-#: src/commandhandler.cpp:167
-msgid "/w > Alias of msg"
-msgstr "/w > Lo mismo que /msg"
+#: ../src/net/tmwa/partyhandler.cpp:127
+#, c-format
+msgid "%s is now a member of your party."
+msgstr "%s ahora es un miembro de tu grupo."
 
-#: src/commandhandler.cpp:168
-msgid "/query > Makes a tab for private messages with another user"
-msgstr "/query > Abre una pestaña de mensajes con otro jugador"
+#: ../src/net/manaserv/partyhandler.cpp:105
+#, c-format
+msgid "%s joined the party."
+msgstr "%s ha entrado a formar parte del grupo."
 
-#: src/commandhandler.cpp:169
-msgid "/q > Alias of query"
-msgstr "/q > Lo mismo que /query"
+#: ../src/net/manaserv/chathandler.cpp:311
+#, c-format
+msgid "%s left the channel."
+msgstr "%s dejó el canal."
 
-#: src/commandhandler.cpp:171
-msgid "/ignore > ignore a player"
-msgstr "/ignore > Ignora un jugador (no se muestran susurros y/o mensajes)"
+#: ../src/net/tmwa/partyhandler.cpp:123
+#, c-format
+msgid "%s refused your invitation."
+msgstr "%s cancelo tu invitación."
 
-#: src/commandhandler.cpp:172
-msgid "/unignore > stop ignoring a player"
-msgstr "/unignore > Deja de ignorar un jugador"
+#: ../src/net/manaserv/partyhandler.cpp:123
+#, c-format
+msgid "%s rejected your invite."
+msgstr "%s canceló tu invitación."
 
-#: src/commandhandler.cpp:174
-msgid "/list > Display all public channels"
-msgstr "/list > Muestra todos los canales públicos"
+#: ../src/net/manaserv/tradehandler.cpp:116
+#: ../src/net/tmwa/tradehandler.cpp:110
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr "%s quiere comerciar contigo, aceptas?"
 
-#: src/commandhandler.cpp:175
-msgid "/join > Join or create a channel"
-msgstr "/join > Unirse o crear un canal"
+#: ../src/gui/widgets/chattab.cpp:153
+#, c-format
+msgid "%s whispers: %s"
+msgstr "%s envía mensaje privado: %s"
 
-#: src/commandhandler.cpp:177
-msgid "/createparty > Create a new party"
-msgstr "/createparty > Crear un nuevo grupo"
+#: ../src/gui/charselectdialog.cpp:418 ../src/gui/charselectdialog.cpp:419
+msgid "(empty)"
+msgstr "(vacío)"
 
-#: src/commandhandler.cpp:178
-msgid "/party > Invite a user to party"
-msgstr "/party > Invitar un jugador al grupo"
+#: ../src/commandhandler.cpp:221
+msgid "*** only available to a GM ***"
+msgstr "*** Disponible solo para GMs ***"
 
-#: src/commandhandler.cpp:180
-msgid "/record > Start recording the chat to an external file"
-msgstr "/record > Comenzar a guardar el chat en un archivo externo"
+#: ../src/gui/buy.cpp:74 ../src/gui/itemamount.cpp:112
+#: ../src/gui/npcdialog.cpp:124 ../src/gui/sell.cpp:74
+#: ../src/gui/statuswindow.cpp:464
+msgid "+"
+msgstr "+"
 
-#: src/commandhandler.cpp:181
-msgid "/toggle > Determine whether <return> toggles the chat log"
-msgstr "/toggle > Determina si <enter> muestra/esconde el chat"
+#: ../src/gui/buy.cpp:77 ../src/gui/itemamount.cpp:111
+#: ../src/gui/npcdialog.cpp:125 ../src/gui/sell.cpp:75
+#: ../src/gui/statuswindow.cpp:476
+msgid "-"
+msgstr "-"
 
-#: src/commandhandler.cpp:182
-msgid "/present > Get list of players present (sent to chat log, if logging)"
-msgstr ""
-"/present > Muestra la lista de jugadores presentes (enviar al log del chat)"
+#: ../src/commandhandler.cpp:165
+msgid "-- Help --"
+msgstr "--Ayuda--"
 
-#: src/commandhandler.cpp:184
+#: ../src/commandhandler.cpp:200
 msgid "/announce > Global announcement (GM only)"
 msgstr "/announce > Anuncio Global (Solo GMs)"
 
-#: src/commandhandler.cpp:188
-msgid "For more information, type /help <command>."
-msgstr "Para mas informacion,  pon /help <comando>."
+#: ../src/commandhandler.cpp:181
+msgid "/away > Tell the other whispering players you're away from keyboard."
+msgstr "/away > Les dice a los otros que estas fuera del PC mensaje privado ."
 
-#: src/commandhandler.cpp:192
-msgid "Command: /help"
-msgstr "Comando: /help"
+#: ../src/commandhandler.cpp:172
+msgid "/clear > Clears this window"
+msgstr "/clear > Limpia esta ventana"
 
-#: src/commandhandler.cpp:193
-msgid "This command displays a list of all commands available."
-msgstr "Para ver la lista de comandos disponibles."
+#: ../src/gui/widgets/whispertab.cpp:74
+msgid "/close > Close the whisper tab"
+msgstr "/close > Cierra la pestaña de mensajes"
 
-#: src/commandhandler.cpp:194
-msgid "Command: /help <command>"
-msgstr "Comando: /help <comando>"
+#: ../src/commandhandler.cpp:190
+msgid "/createparty > Create a new party"
+msgstr "/createparty > Crear un nuevo grupo"
 
-#: src/commandhandler.cpp:195
-msgid "This command displays help on <command>."
-msgstr "Para ver la ayuda en <comando>"
+#: ../src/net/tmwa/gui/partytab.cpp:64
+msgid "/exp > Show/change party experience sharing options"
+msgstr "/exp > Mostrar/Modificar el compartir experiencia en el grupo "
 
-#: src/commandhandler.cpp:203
-msgid "Command: /announce <msg>"
-msgstr "Comando: /announce <mensaje>"
+#: ../src/commandhandler.cpp:166
+msgid "/help > Display this help"
+msgstr "/help > Muestra esta ayuda"
 
-#: src/commandhandler.cpp:204
-msgid "*** only available to a GM ***"
-msgstr "*** Disponible solo para GMs ***"
+#: ../src/net/tmwa/gui/guildtab.cpp:61 ../src/net/tmwa/gui/partytab.cpp:59
+msgid "/help > Display this help."
+msgstr "/help > Para la ayuda."
 
-#: src/commandhandler.cpp:205
-msgid "This command sends the message <msg> to all players currently online."
-msgstr ""
-"Este comando envía un mensaje <mensaje> para todos los jugadores online."
+#: ../src/gui/widgets/whispertab.cpp:72
+msgid "/ignore > Ignore the other player"
+msgstr "/ignore > Ignora al jugador"
 
-#: src/commandhandler.cpp:210
-msgid "Command: /clear"
-msgstr "Comando: /clear"
+#: ../src/commandhandler.cpp:184
+msgid "/ignore > ignore a player"
+msgstr "/ignore > Ignora un jugador (no se muestran susurros y/o mensajes)"
 
-#: src/commandhandler.cpp:211
-msgid "This command clears the chat log of previous chat."
-msgstr "Este comando limpia la pestaña actual del chat previo."
+#: ../src/net/tmwa/gui/guildtab.cpp:62
+msgid "/invite > Invite a player to your guild"
+msgstr "/invite > Invita un jugador a tu clan"
 
-#: src/commandhandler.cpp:215
-msgid "Command: /ignore <player>"
-msgstr "Comando: /ignore <jugador>"
+#: ../src/net/tmwa/gui/partytab.cpp:60
+msgid "/invite > Invite a player to your party"
+msgstr "/invite > Invita un jugador a tu grupo"
 
-#: src/commandhandler.cpp:216
-msgid "This command ignores the given player regardless of current relations."
-msgstr ""
-"Este comando es para ignorar al jugador indicado, independientemente de la "
-"relación actual."
+#: ../src/net/tmwa/gui/partytab.cpp:63
+msgid "/item > Show/change party item sharing options"
+msgstr "/item > Mostrar/Cambiar el compartir objetos en el grupo"
 
-#: src/commandhandler.cpp:221
-msgid "Command: /join <channel>"
-msgstr "Comando: /join <canal>"
+#: ../src/commandhandler.cpp:188
+msgid "/join > Join or create a channel"
+msgstr "/join > Unirse o crear un canal"
 
-#: src/commandhandler.cpp:222
-msgid "This command makes you enter <channel>."
-msgstr "Este comando te hace entrar en <canal>."
+#: ../src/gui/widgets/channeltab.cpp:53
+msgid "/kick > Kick a user from the channel"
+msgstr "/kick > Expulsar un usuario del canal"
 
-#: src/commandhandler.cpp:223
-msgid "If <channel> doesn't exist, it's created."
-msgstr "Si el  <canal> no existe, sera creado."
+#: ../src/net/tmwa/gui/guildtab.cpp:64
+msgid "/kick > Kick some one from the guild you are in"
+msgstr "/kick > Expulsa a alguien del clan en el que estás."
 
-#: src/commandhandler.cpp:227
-msgid "Command: /list"
-msgstr "Comando: /list"
+#: ../src/net/tmwa/gui/partytab.cpp:62
+msgid "/kick > Kick some one from the party you are in"
+msgstr "/kick > Expulsa a alguien del grupo en el que estás"
 
-#: src/commandhandler.cpp:228
-msgid "This command shows a list of all channels."
-msgstr "Este comando muestra una lista con todos los canales."
+#: ../src/net/tmwa/gui/guildtab.cpp:63
+msgid "/leave > Leave the guild you are in"
+msgstr "/leave > Deja el clan en la que estas"
 
-#: src/commandhandler.cpp:232
-msgid "Command: /me <message>"
-msgstr "Comando: /me <mensaje>"
+#: ../src/net/tmwa/gui/partytab.cpp:61
+msgid "/leave > Leave the party you are in"
+msgstr "/leave > Salir del grupo en el que estás"
 
-#: src/commandhandler.cpp:233
-msgid "This command tell others you are (doing) <msg>."
-msgstr "Este comando muestra a los otros lo que tú estas (haciendo) <mensaje>."
+#: ../src/commandhandler.cpp:187
+msgid "/list > Display all public channels"
+msgstr "/list > Muestra todos los canales públicos"
 
-#: src/commandhandler.cpp:237
-msgid "Command: /msg <nick> <message>"
-msgstr "Comando: /msg <nick> <mensaje>"
+#: ../src/commandhandler.cpp:170
+msgid "/me > Tell something about yourself"
+msgstr "/me > Para decir algo sobre ti"
 
-#: src/commandhandler.cpp:238
-msgid "Command: /whisper <nick> <message>"
-msgstr "Comando: /whisper <nick> <mensaje>"
+#: ../src/commandhandler.cpp:174
+msgid "/msg > Send a private message to a user"
+msgstr "/msg > Envia un mensaje privado a este jugador"
 
-#: src/commandhandler.cpp:239
-msgid "Command: /w <nick> <message>"
-msgstr "Comando: /w <nick> <mensaje>"
+#: ../src/gui/widgets/channeltab.cpp:52
+msgid "/op > Make a user a channel operator"
+msgstr "/op > Hacer a un usuario operador del canal"
 
-#: src/commandhandler.cpp:240
-msgid "This command sends the text <message> to <nick>."
-msgstr "Este comando envía el texto <mensaje> para el jugador <nick>."
+#: ../src/commandhandler.cpp:191
+msgid "/party > Invite a user to party"
+msgstr "/party > Invitar un jugador al grupo"
 
-#: src/commandhandler.cpp:241 src/commandhandler.cpp:260
-#: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
-#: src/net/ea/gui/guildtab.cpp:75 src/net/ea/gui/partytab.cpp:75
-msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
-msgstr "Si <nick> posee espacios, colóquelo entre las comillas dobles (\")."
+#: ../src/commandhandler.cpp:197
+msgid "/present > Get list of players present (sent to chat log, if logging)"
+msgstr ""
+"/present > Muestra la lista de jugadores presentes (enviar al log del chat)"
 
-#: src/commandhandler.cpp:246
-msgid "Command: /query <nick>"
-msgstr "Comando: /query <nick>"
+#: ../src/commandhandler.cpp:179
+msgid "/q > Alias of query"
+msgstr "/q > Lo mismo que /query"
 
-#: src/commandhandler.cpp:247
-msgid "Command: /q <nick>"
-msgstr "Comando: /q <nick>"
+#: ../src/commandhandler.cpp:177
+msgid "/query > Makes a tab for private messages with another user"
+msgstr "/query > Abre una pestaña de mensajes con otro jugador"
 
-#: src/commandhandler.cpp:248
-msgid "This command tries to make a tab for whispers betweenyou and <nick>."
-msgstr ""
-"Este comando crea una pestaña para mensajes privados con el jugador <nick>."
+#: ../src/gui/widgets/channeltab.cpp:51
+msgid "/quit > Leave a channel"
+msgstr "/quit > Salir del canal"
 
-#: src/commandhandler.cpp:253
-msgid "Command: /createparty <name>"
-msgstr "Comando: /createparty <nombre>"
+#: ../src/commandhandler.cpp:193
+msgid "/record > Start recording the chat to an external file"
+msgstr "/record > Comenzar a guardar el chat en un archivo externo"
 
-#: src/commandhandler.cpp:254
-msgid "This command creates a new party called <name>."
-msgstr "Este comando crea un nuevo grupo llamado <nombre>."
+#: ../src/commandhandler.cpp:195
+msgid "/toggle > Determine whether <return> toggles the chat log"
+msgstr "/toggle > Determina si <enter> muestra/esconde el chat"
 
-#: src/commandhandler.cpp:258
-msgid "Command: /party <nick>"
-msgstr "Comando: /party <nick>"
+#: ../src/gui/widgets/channeltab.cpp:50
+msgid "/topic > Set the topic of the current channel"
+msgstr "/topic > Poner un tema en el canal"
 
-#: src/commandhandler.cpp:259 src/net/ea/gui/partytab.cpp:74
-msgid "This command invites <nick> to party with you."
-msgstr "Este comando invita al jugador <nick> a formar parte de tu grupo."
+#: ../src/gui/widgets/whispertab.cpp:73
+msgid "/unignore > Stop ignoring the other player"
+msgstr "/unignore > Parar de ignorar al jugador"
 
-#: src/commandhandler.cpp:265
-msgid "Command: /present"
-msgstr "Comando: /present"
+#: ../src/commandhandler.cpp:185
+msgid "/unignore > stop ignoring a player"
+msgstr "/unignore > Deja de ignorar un jugador"
 
-#: src/commandhandler.cpp:266
-msgid ""
-"This command gets a list of players within hearing and sends it to either "
-"the record log if recording, or the chat log otherwise."
-msgstr ""
-"Este comando recibe una lista de los jugadores dentro de la audición y la "
-"envía ya sea a la entrada de registro cuando el registro del chat está "
-"activado o el registro de conversaciones (pestaña de chat) de otro modo."
+#: ../src/gui/widgets/channeltab.cpp:49
+msgid "/users > Lists the users in the current channel"
+msgstr "/users > Listas de usuarios en el canal"
 
-#: src/commandhandler.cpp:272
-msgid "Command: /record <filename>"
-msgstr "Comando: /record <nombre_del_archivo>"
+#: ../src/commandhandler.cpp:176
+msgid "/w > Alias of msg"
+msgstr "/w > Lo mismo que /msg"
 
-#: src/commandhandler.cpp:273
-msgid "This command starts recording the chat log to the file <filename>."
-msgstr ""
-"Este comando inicia la grabación del chat en el archivo <nombre_del_archivo>."
+#: ../src/commandhandler.cpp:168
+msgid "/where > Display map name"
+msgstr "/where > Muestra el nombre del mapa"
 
-#: src/commandhandler.cpp:275
-msgid "Command: /record"
-msgstr "Comando: /record"
+#: ../src/commandhandler.cpp:175
+msgid "/whisper > Alias of msg"
+msgstr "/whisper > Lo mismo que /msg"
 
-#: src/commandhandler.cpp:276
-msgid "This command finishes a recording session."
-msgstr "Este comando termina una sesión de grabación."
+#: ../src/commandhandler.cpp:169
+msgid "/who > Display number of online users"
+msgstr "/who > Muestra el número de jugadores on-line"
 
-#: src/commandhandler.cpp:280
-msgid "Command: /toggle <state>"
-msgstr "Comando: /toggle <estado>"
+#: ../src/gui/charcreatedialog.cpp:73 ../src/gui/charcreatedialog.cpp:76
+#: ../src/gui/outfitwindow.cpp:66
+msgid "<"
+msgstr "<"
 
-#: src/commandhandler.cpp:281
+#: ../src/net/tmwa/gui/partytab.cpp:97
 msgid ""
-"This command sets whether the return key should toggle the chat log, or "
-"whether the chat log turns off automatically."
+"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
+"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
-"Este comando determina si la tecla de retorno debe cambiar el registro de "
-"charla, o si el registro de charla se apaga automáticamente."
+"<policy> puede ser \"1\", \"yes\" y \"true\" para habilitar compartir "
+"experiencia, o \"0\", \"no\" y \"false\" para deshabilitar."
+
+#: ../src/net/tmwa/gui/partytab.cpp:87
+msgid ""
+"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
+"\"0\", \"no\", \"false\" to disable item sharing."
+msgstr ""
+"<policy> puede ser \"1\", \"yes\" y \"true\" para habilitar el compartir "
+"objetos, o \"0\", \"no\" y \"false\" para deshabilitar."
 
-#: src/commandhandler.cpp:283
+#: ../src/commandhandler.cpp:308
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
 "\"0\", \"no\", \"false\" to turn the toggle off."
@@ -365,3560 +432,3691 @@ msgstr ""
 "<estado> puede ser \"1\", \"yes\" y \"true\" para activar o \"0\", \"no\" y "
 "\"false\" para desactivar."
 
-#: src/commandhandler.cpp:286
-msgid "Command: /toggle"
-msgstr "Comando: /toggle"
-
-#: src/commandhandler.cpp:287
-msgid "This command displays the return toggle status."
-msgstr "Este comando muestra el estado de alternar retorno."
-
-#: src/commandhandler.cpp:291 src/gui/widgets/whispertab.cpp:93
-msgid "Command: /unignore <player>"
-msgstr "Comando: /unignore <jugador>"
+#: ../src/gui/charcreatedialog.cpp:70 ../src/gui/charcreatedialog.cpp:75
+#: ../src/gui/outfitwindow.cpp:67
+msgid ">"
+msgstr ">"
 
-#: src/commandhandler.cpp:292
-msgid "This command stops ignoring the given player if they are being ignored"
-msgstr "Este comando deja de ignorar a <jugador> si es ignorado"
+#: ../src/gui/setup_players.cpp:206 ../src/gui/setup_video.cpp:147
+msgid "???"
+msgstr "???"
 
-#: src/commandhandler.cpp:297
-msgid "Command: /where"
-msgstr "Comando: /where"
+#: ../src/gui/socialwindow.cpp:563
+msgid "Accept Guild Invite"
+msgstr "Aceptar invitación al clan"
 
-#: src/commandhandler.cpp:298
-msgid "This command displays the name of the current map."
-msgstr "Muestra el nombre del mapa actual."
+#: ../src/gui/socialwindow.cpp:609
+msgid "Accept Party Invite"
+msgstr "Aceptar invitación al grupo"
 
-#: src/commandhandler.cpp:302
-msgid "Command: /who"
-msgstr "Comando: /who"
+#: ../src/gui/socialwindow.cpp:463
+#, fuzzy
+msgid "Accepted guild invite"
+msgstr "Aceptar invitación al clan"
 
-#: src/commandhandler.cpp:303
-msgid "This command displays the number of players currently online."
-msgstr "Este comando muestra el número de jugadores que están en línea."
+#: ../src/gui/socialwindow.cpp:444
+#, c-format
+msgid "Accepted party invite from %s."
+msgstr "Aceptada la invitación de   %s."
 
-#: src/commandhandler.cpp:309
-msgid "Type /help for a list of commands."
-msgstr "Escribe /help para una lista de comandos."
+#: ../src/game.cpp:738
+msgid "Accepting incoming trade requests"
+msgstr "Aceptando las propuestas de intercambio"
 
-#: src/commandhandler.cpp:375
-msgid "Cannot send empty whispers!"
-msgstr "No puedes enviar susurros vacíos!"
+#: ../src/net/manaserv/tradehandler.cpp:95
+msgid "Accepting incoming trade requests."
+msgstr "Aceptar propuestas de intercambio entrantes."
 
-#: src/commandhandler.cpp:383
-#, c-format
-msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
-"you."
-msgstr ""
-"No se puede crear una pestaña de susurro para el nick \"%s\"! O bien ya "
-"existe, o eres tú."
+#: ../src/net/tmwa/charserverhandler.cpp:103
+msgid "Access denied. Most likely, there are too many players on this server."
+msgstr "Acesso denegado.Probablemente es que alla muchos jugadores."
 
-#: src/commandhandler.cpp:397
-#, c-format
-msgid "Requesting to join channel %s."
-msgstr "Solicitando la entrada del canal %s."
+#: ../src/gui/charselectdialog.cpp:120
+msgid "Account and Character Management"
+msgstr "Configuración de la cuenta y los personajes"
 
-#: src/commandhandler.cpp:410 src/net/ea/gui/partytab.cpp:109
-msgid "Party name is missing."
-msgstr "Falta el nombre del grupo."
+#: ../src/net/manaserv/loginhandler.cpp:272
+msgid "Account banned"
+msgstr "Cuenta Baneada"
 
-#: src/commandhandler.cpp:423 src/commandhandler.cpp:471
-#: src/commandhandler.cpp:493
-msgid "Please specify a name."
-msgstr "Por favor, especifique un nombre."
+#: ../src/net/manaserv/loginhandler.cpp:93
+msgid "Account banned."
+msgstr "Cuenta Baneada."
 
-#: src/commandhandler.cpp:441
-msgid "Return toggles chat."
-msgstr "Volver a alternar el chat."
+#: ../src/net/tmwa/loginhandler.cpp:162
+msgid "Account expired."
+msgstr "La cuenta expiró."
 
-#: src/commandhandler.cpp:441
-msgid "Message closes chat."
-msgstr "El mensaje cierra el chat."
+#: ../src/net/manaserv/loginhandler.cpp:124
+#: ../src/net/manaserv/loginhandler.cpp:155
+msgid "Account not connected. Please login first."
+msgstr "Cuenta no conectada. Por favor conéctate primero."
 
-#: src/commandhandler.cpp:450
-msgid "Return now toggles chat."
-msgstr "Volver ahora a cambiar de chat."
+#: ../src/net/tmwa/loginhandler.cpp:86
+msgid "Account was not found. Please re-login."
+msgstr "Cuenta no encontrada. Por favor conéctate de nuevo."
 
-#: src/commandhandler.cpp:454
-msgid "Message now closes chat."
-msgstr "Mensaje ahora cierra el chat."
+#: ../src/gui/changeemaildialog.cpp:49 ../src/gui/changepassworddialog.cpp:52
+#, c-format
+msgid "Account: %s"
+msgstr "Cuenta: %s"
 
-#: src/commandhandler.cpp:477
-msgid "Player already ignored!"
-msgstr "El jugador ya está ignorado!"
+#: ../src/gui/inventorywindow.cpp:106 ../src/gui/popupmenu.cpp:369
+msgid "Activate"
+msgstr ""
 
-#: src/commandhandler.cpp:484
-msgid "Player successfully ignored!"
-msgstr "Jugador ignorado!"
+#: ../src/gui/trade.cpp:76
+msgid "Add"
+msgstr "Anadir"
 
-#: src/commandhandler.cpp:486
-msgid "Player could not be ignored!"
-msgstr "El jugador no puede ser ignorado!"
+#: ../src/gui/popupmenu.cpp:171
+msgid "Add name to chat"
+msgstr "Anadir el nombre al chat"
 
-#: src/commandhandler.cpp:501
-msgid "Player wasn't ignored!"
-msgstr "El jugador no estaba ignorado!"
+#: ../src/gui/popupmenu.cpp:190 ../src/gui/popupmenu.cpp:387
+msgid "Add to chat"
+msgstr "Añadir al chat"
 
-#: src/commandhandler.cpp:506
-msgid "Player no longer ignored!"
-msgstr "El jugador ha sido devuelto al estado normal!"
+#: ../src/net/manaserv/attributes.cpp:179
+#: ../src/net/tmwa/generalhandler.cpp:231
+msgid "Agility"
+msgstr "Agilidad"
 
-#: src/commandhandler.cpp:508
-msgid "Player could not be unignored!"
-msgstr "El jugador no puede ser devuelto al estado normal!"
+#: ../src/net/manaserv/attributes.cpp:186
+#, fuzzy, c-format
+msgid "Agility %+.1f"
+msgstr "Agilidad %+d"
 
-#: src/commandhandler.h:31
+#: ../src/net/tmwa/generalhandler.cpp:103
 #, c-format
-msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr ""
-"Opciones para /%s son \"yes\" e \"no\", \"true\" e \"false\", \"1\" e \"0\"."
+msgid "Agility %+d"
+msgstr "Agilidad %+d"
 
-#: src/game.cpp:172
-msgid "General"
-msgstr "General"
+#: ../src/net/tmwa/charserverhandler.cpp:271
+msgid "Agility:"
+msgstr "Agilidad:"
 
-#: src/game.cpp:326
-msgid "Screenshot saved as "
-msgstr "Screenshot guardada como"
+#: ../src/gui/trade.cpp:55
+msgid "Agree trade"
+msgstr "Aceptar intercambio"
 
-#: src/game.cpp:331
-msgid "Saving screenshot failed!"
-msgstr "Fallo al guardar screenshot!"
+#: ../src/gui/trade.cpp:56
+msgid "Agreed. Waiting..."
+msgstr "Aceptado. Esperando..."
 
-#: src/game.cpp:355
-msgid "The connection to the server was lost."
-msgstr "Se ha perdido la conexión del servidor."
+#: ../src/gui/itemamount.cpp:115
+msgid "All"
+msgstr "Todo"
 
-#: src/game.cpp:360
-msgid "Network Error"
-msgstr "Error de conexión"
+#: ../src/gui/setup_players.cpp:225
+msgid "Allow trading"
+msgstr "Permitir intercambios"
 
-#: src/game.cpp:705
-msgid "Ignoring incoming trade requests"
-msgstr "Ignorando las propuestas de intercambio"
+#: ../src/gui/setup_players.cpp:227
+msgid "Allow whispers"
+msgstr "Permitir mensajes privados"
 
-#: src/game.cpp:712
-msgid "Accepting incoming trade requests"
-msgstr "Aceptando las propuestas de intercambio"
+#: ../src/net/manaserv/loginhandler.cpp:90
+#: ../src/net/manaserv/loginhandler.cpp:269
+msgid "Already logged in."
+msgstr "El personaje ya está conectado."
 
-#: src/game.cpp:946
-msgid "Could Not Load Map"
-msgstr "No se pudo cargar el mapa"
+#: ../src/gui/recorder.cpp:96
+msgid "Already recording."
+msgstr "Ya se está llevando a cabo la grabación."
 
-#: src/game.cpp:947
-#, c-format
-msgid "Error while loading %s"
-msgstr "Error mientras cargaba %s"
+#: ../src/gui/setup_video.cpp:254
+msgid "Ambient FX"
+msgstr "Ambiente FX"
 
-#: src/gui/beingpopup.cpp:75
+#: ../src/gui/debugwindow.cpp:121
 #, c-format
-msgid "Party: %s"
-msgstr "Grupo: %s"
-
-#: src/gui/buy.cpp:49 src/gui/buy.cpp:78 src/gui/buysell.cpp:47
-msgid "Buy"
-msgstr "Comprar"
+msgid "Ambient FX: %s"
+msgstr "Ambiente FX: %s"
 
-#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
-#: src/gui/sell.cpp:276
+#: ../src/net/tmwa/partyhandler.cpp:299
 #, c-format
-msgid "Price: %s / Total: %s"
-msgstr "Precio: %s / Total: %s"
+msgid "An unknown member tried to say: %s"
+msgstr "Un miembro desconocido intentó decir: %s"
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
-#. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:404
-msgid "+"
-msgstr "+"
+#: ../src/net/manaserv/beinghandler.cpp:296
+#: ../src/net/tmwa/playerhandler.cpp:112
+msgid "Annihilated."
+msgstr "Aniquilado."
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
-#. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:416
-msgid "-"
-msgstr "-"
+#: ../src/gui/setup.cpp:51
+msgid "Apply"
+msgstr "Aplicar"
 
-#: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:152
-#: src/keyboardconfig.cpp:103
-msgid "Quit"
-msgstr "Salir"
+#: ../src/gui/setup_video.cpp:461
+msgid "Applying change to OpenGL requires restart."
+msgstr "Aplicar el intercambio a OpenGL requiere reiniciar el juego."
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:333
-#: src/gui/statuswindow.cpp:403 src/gui/statuswindow.cpp:437
-msgid "Max"
-msgstr "Máximo"
+#: ../src/gui/setup_video.cpp:453
+msgid ""
+"Applying change to OpenGL requires restart. In case OpenGL messes up your "
+"game graphics, restart the game with the command line option \"--no-opengl\"."
+msgstr ""
+"Cambiar a OpenGL necesita reiniciar el cliente. En caso de OpenGL atrape tus "
+"graficos, abra el juego atraves de linea de comando con la seguinte opcion: "
+"\"--no-opengl\"."
 
-#: src/gui/buysell.cpp:38
-msgid "Shop"
-msgstr "Tienda"
+#: ../src/gui/charselectdialog.cpp:73
+msgid "Are you sure you want to delete this character?"
+msgstr "żEstás seguro de que deseas borrar este personaje?"
 
-#: src/gui/buysell.cpp:47 src/gui/sell.cpp:49 src/gui/sell.cpp:76
-msgid "Sell"
-msgstr "Vender"
+#: ../src/gui/socialwindow.cpp:164
+#, c-format
+msgid "Are you sure you want to leave guild %s?"
+msgstr "Estás seguro de dejar el clan %s?"
 
-#: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
-#: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
-#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:101
-#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
-#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
-#: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:243 src/gui/textdialog.cpp:39
-#: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
-msgid "Cancel"
-msgstr "Cancelar"
+#: ../src/gui/socialwindow.cpp:243
+#, c-format
+msgid "Are you sure you want to leave party %s?"
+msgstr "Estás seguro de que quieres salir del grupo %s?"
 
-#: src/gui/changeemaildialog.cpp:45 src/gui/changeemaildialog.cpp:54
-msgid "Change Email Address"
-msgstr "Cambiar e-mail"
+#: ../src/gui/setup_keyboard.cpp:86
+msgid "Assign"
+msgstr "Atribuir"
 
-#: src/gui/changeemaildialog.cpp:49 src/gui/changepassworddialog.cpp:52
+#: ../src/net/manaserv/charhandler.cpp:165
 #, c-format
-msgid "Account: %s"
-msgstr "Cuenta: %s"
+msgid "At least one statis out of the permitted range: (%u - %u)."
+msgstr ""
 
-#: src/gui/changeemaildialog.cpp:51
-msgid "Type new email address twice:"
-msgstr "Escribe el nuevo email dos veces:"
+#: ../src/keyboardconfig.cpp:43 ../src/net/tmwa/generalhandler.cpp:237
+msgid "Attack"
+msgstr "Atacar"
 
-#: src/gui/changeemaildialog.cpp:127
+#: ../src/resources/itemdb.cpp:310
 #, c-format
-msgid "The new email address needs to be at least %d characters long."
-msgstr "El nuevo email debe tener como mínimo %d caracteres."
+msgid "Attack %+d"
+msgstr "Ataque %+d"
 
-#: src/gui/changeemaildialog.cpp:134
+#: ../src/gui/popupmenu.cpp:87 ../src/gui/popupmenu.cpp:158
 #, c-format
-msgid "The new email address needs to be less than %d characters long."
-msgstr "El nuevo email debe tener como máximo %d caracteres."
-
-#: src/gui/changeemaildialog.cpp:141
-msgid "The email address entries mismatch."
-msgstr "Los e-mail son distintos."
-
-#: src/gui/changepassworddialog.cpp:47 src/gui/changepassworddialog.cpp:56
-#: src/gui/charselectdialog.cpp:128
-msgid "Change Password"
-msgstr "Cambiar contraseña"
+msgid "Attack %s"
+msgstr "Atacar %s"
 
-#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:53
-#: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
-msgid "Password:"
-msgstr "Contraseña:"
+#: ../src/gui/chat.cpp:329
+msgid "Attendance written to record log."
+msgstr "Audición grabada en el registro del log."
 
-#: src/gui/changepassworddialog.cpp:63
-msgid "Type new password twice:"
-msgstr "Escribe la nueva contraseña 2 veces:"
+#: ../src/gui/setup_audio.cpp:47
+msgid "Audio"
+msgstr "Audio"
 
-#: src/gui/changepassworddialog.cpp:110
-msgid "Enter the old password first."
-msgstr "Escribe la contraseña antigua."
+#: ../src/net/tmwa/generalhandler.cpp:132
+msgid "Authentication failed."
+msgstr "Fallo en la autentificación."
 
-#: src/gui/changepassworddialog.cpp:116
-#, c-format
-msgid "The new password needs to be at least %d characters long."
-msgstr "La nueva contraseña debe tener como mínimo %d caracteres."
+#: ../src/localplayer.cpp:1030
+msgid "Away"
+msgstr "Fuera del Teclado"
 
-#: src/gui/changepassworddialog.cpp:123
+#: ../src/gui/popupmenu.cpp:100
 #, c-format
-msgid "The new password needs to be less than %d characters long."
-msgstr "La nueva contraseña debe tener como máximo %d caracteres."
-
-#: src/gui/changepassworddialog.cpp:130
-msgid "The new password entries mismatch."
-msgstr "Las nuevas contraseñas no concuerdan."
+msgid "Befriend %s"
+msgstr "Ser amigo %s"
 
-#: src/gui/charcreatedialog.cpp:53
-msgid "Create Character"
-msgstr "Crear Personaje"
+#: ../src/resources/userpalette.cpp:91
+msgid "Being"
+msgstr "Personaje"
 
-#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:52
-#: src/gui/register.cpp:67
-msgid "Name:"
-msgstr "Nombre:"
+#: ../src/net/tmwa/playerhandler.cpp:124
+msgid "Bereft of life, you rest in peace."
+msgstr "Sin vida, descansa en paz."
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
-#. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
-#: src/gui/outfitwindow.cpp:67
-msgid ">"
-msgstr ">"
+#: ../src/playerrelations.cpp:340
+msgid "Blink name"
+msgstr "Parpadear nombre"
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
-#. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
-#: src/gui/outfitwindow.cpp:66
-msgid "<"
-msgstr "<"
+#: ../src/gui/setup_colors.cpp:139
+msgid "Blue:"
+msgstr "Azul:"
 
-#: src/gui/charcreatedialog.cpp:74
-msgid "Hair color:"
-msgstr "Color del pelo:"
+#: ../src/gui/setup_video.cpp:160
+msgid "Bubbles with names"
+msgstr "Burbujas con nombres"
 
-#: src/gui/charcreatedialog.cpp:77
-msgid "Hair style:"
-msgstr "Estilo de pelo:"
+#: ../src/gui/setup_video.cpp:159
+msgid "Bubbles, no names"
+msgstr "Burbujas sin nombres"
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
-#: src/gui/socialwindow.cpp:297
-msgid "Create"
-msgstr "Crear"
+#: ../src/gui/buy.cpp:49 ../src/gui/buy.cpp:78 ../src/gui/buysell.cpp:47
+msgid "Buy"
+msgstr "Comprar"
 
-#: src/gui/charcreatedialog.cpp:80 src/gui/register.cpp:90
-msgid "Male"
-msgstr "Hombre"
+#: ../src/gui/setup_joystick.cpp:38 ../src/gui/setup_joystick.cpp:76
+msgid "Calibrate"
+msgstr "Calibrar"
 
-#: src/gui/charcreatedialog.cpp:81 src/gui/register.cpp:91
-msgid "Female"
-msgstr "Mujer"
+#: ../src/gui/buysell.cpp:47 ../src/gui/changeemaildialog.cpp:55
+#: ../src/gui/changepassworddialog.cpp:58 ../src/gui/charcreatedialog.cpp:79
+#: ../src/gui/connectiondialog.cpp:44 ../src/gui/itemamount.cpp:114
+#: ../src/gui/npcpostdialog.cpp:57 ../src/gui/popupmenu.cpp:175
+#: ../src/gui/popupmenu.cpp:194 ../src/gui/popupmenu.cpp:389
+#: ../src/gui/quitdialog.cpp:47 ../src/gui/register.cpp:74
+#: ../src/gui/setup.cpp:51 ../src/gui/socialwindow.cpp:275
+#: ../src/gui/textdialog.cpp:40 ../src/gui/unregisterdialog.cpp:56
+#: ../src/gui/updatewindow.cpp:144
+msgid "Cancel"
+msgstr "Cancelar"
 
-#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:251
+#: ../src/commandhandler.cpp:421
 #, c-format
-msgid "Please distribute %d points"
-msgstr "Por favor distribuya %d puntos"
-
-#: src/gui/charcreatedialog.cpp:178
-msgid "Your name needs to be at least 4 characters."
-msgstr "Su nombre debe de tener como mínimo 4 caracteres."
+msgid ""
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
+"you."
+msgstr ""
+"No se puede crear una pestaña de susurro para el nick \"%s\"! O bien ya "
+"existe, o eres tú."
 
-#: src/gui/charcreatedialog.cpp:242
-msgid "Character stats OK"
-msgstr "Puntos de estado del jugador correctamente asignados"
+#: ../src/gui/socialwindow.cpp:620
+msgid "Cannot create party. You are already in a party"
+msgstr "No se pudo crear un grupo. Ya estás en uno."
 
-#: src/gui/charcreatedialog.cpp:256
-#, c-format
-msgid "Please remove %d points"
-msgstr "Por favor extraiga %d puntos de estado"
+#: ../src/net/tmwa/playerhandler.cpp:366
+msgid "Cannot raise skill!"
+msgstr "Imposible incrementar!"
 
-#: src/gui/charselectdialog.cpp:69
-msgid "Confirm Character Delete"
-msgstr "Confimar la supresión del personaje"
+#: ../src/gui/widgets/whispertab.cpp:53
+msgid "Cannot send empty chat!"
+msgstr "No puedes enviar un mensaje vacío!"
 
-#: src/gui/charselectdialog.cpp:70
-msgid "Are you sure you want to delete this character?"
-msgstr "żEstás seguro de que deseas borrar este personaje?"
+#: ../src/commandhandler.cpp:400
+msgid "Cannot send empty whispers!"
+msgstr "No puedes enviar susurros vacíos!"
 
-#: src/gui/charselectdialog.cpp:117
-msgid "Account and Character Management"
-msgstr "Configuración de la cuenta y los personajes"
+#: ../src/net/tmwa/specialhandler.cpp:160
+msgid "Cannot shout!"
+msgstr "Imposible gritar!"
 
-#: src/gui/charselectdialog.cpp:127
-msgid "Switch Login"
-msgstr "Salir del Login"
+#: ../src/net/tmwa/charserverhandler.cpp:107
+msgid "Cannot use this ID."
+msgstr "Imposible usar esta ID."
 
-#: src/gui/charselectdialog.cpp:141 src/gui/unregisterdialog.cpp:47
-#: src/gui/unregisterdialog.cpp:55
-msgid "Unregister"
-msgstr "Cancelar Registro"
+#: ../src/gui/trade.cpp:103
+msgid "Change"
+msgstr "Cambiar"
 
-#: src/gui/charselectdialog.cpp:150
+#: ../src/gui/charselectdialog.cpp:154
 msgid "Change Email"
 msgstr "Cambiar e-mail"
 
-#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:155
-#: src/gui/setup_players.cpp:230
-msgid "Delete"
-msgstr "Borrar"
+#: ../src/gui/changeemaildialog.cpp:45 ../src/gui/changeemaildialog.cpp:54
+msgid "Change Email Address"
+msgstr "Cambiar e-mail"
 
-#: src/gui/charselectdialog.cpp:387
-msgid "Choose"
-msgstr "Seleccionar"
+#: ../src/gui/worldselectdialog.cpp:76
+msgid "Change Login"
+msgstr "Cambiar de Login"
 
-#: src/gui/charselectdialog.cpp:399 src/gui/charselectdialog.cpp:400
-msgid "(empty)"
-msgstr "(vacío)"
+#: ../src/gui/changepassworddialog.cpp:47
+#: ../src/gui/changepassworddialog.cpp:56 ../src/gui/charselectdialog.cpp:132
+msgid "Change Password"
+msgstr "Cambiar contraseña"
 
-#: src/gui/chat.cpp:77
-msgid "Chat"
-msgstr "Chat"
+#: ../src/gui/login.cpp:62
+msgid "Change Server"
+msgstr "Cambiar de servidor"
 
-#: src/gui/chat.cpp:287
-#, c-format
-msgid "Present: %s; %d players are present."
-msgstr "Presentes: %s; %d jugadores estan presentes."
+#: ../src/gui/setup_video.cpp:607
+msgid "Changes will take effect on map change."
+msgstr "Los cambios tendran efecto cuando se cambie de mapa."
 
-#: src/gui/chat.cpp:305
-msgid "Attendance written to record log."
-msgstr "Audición grabada en el registro del log."
+#: ../src/client.cpp:848
+msgid "Changing game servers"
+msgstr "Cambiando el servidor del juego"
 
-#: src/gui/chat.cpp:469
-#, c-format
-msgid "Whispering to %s: %s"
-msgstr "Enviando mensaje privado para %s: %s"
+#: ../src/gui/setup_video.cpp:452
+msgid "Changing to OpenGL"
+msgstr "Cambiando a OpenGL"
 
-#: src/gui/confirmdialog.cpp:42
-msgid "Yes"
-msgstr "Sí"
+#: ../src/gui/widgets/channeltab.cpp:84
+msgid "Channel operators can kick and op other users from the channel."
+msgstr ""
+"Los operadores pueden expulsar y hace operadores a otros jugadores en el "
+"canal."
 
-#: src/gui/confirmdialog.cpp:43
-msgid "No"
-msgstr "No"
+#: ../src/net/tmwa/chathandler.cpp:265 ../src/net/tmwa/chathandler.cpp:271
+#: ../src/net/tmwa/chathandler.cpp:276 ../src/net/tmwa/chathandler.cpp:281
+#: ../src/net/tmwa/chathandler.cpp:286 ../src/net/tmwa/chathandler.cpp:291
+#: ../src/net/tmwa/chathandler.cpp:296 ../src/net/tmwa/chathandler.cpp:301
+msgid "Channels are not supported!"
+msgstr "Canales no son soportados!"
 
-#: src/gui/debugwindow.cpp:43
-msgid "Debug"
-msgstr "Depurador"
+#: ../src/net/tmwa/charserverhandler.cpp:146
+msgid "Character deleted."
+msgstr "Personaje Borrado."
 
-#: src/gui/debugwindow.cpp:56
+#: ../src/gui/statuswindow.cpp:211 ../src/gui/statuswindow.cpp:248
 #, c-format
-msgid "%d FPS (OpenGL)"
-msgstr "%d FPS (OpenGL)"
+msgid "Character points: %d"
+msgstr "Puntos del personaje: %d"
 
-#: src/gui/debugwindow.cpp:61 src/gui/debugwindow.cpp:64
-#, c-format
-msgid "%d FPS"
-msgstr "%d FPS"
+#: ../src/gui/charcreatedialog.cpp:248
+msgid "Character stats OK"
+msgstr "Puntos de estado del jugador correctamente asignados"
 
-#: src/gui/debugwindow.cpp:65 src/gui/debugwindow.cpp:104
-#, c-format
-msgid "Music: %s"
-msgstr "Música: %s"
+#: ../src/net/manaserv/charhandler.cpp:147
+msgid "Character's name already exists."
+msgstr "Nombre del jugador ya existe."
 
-#: src/gui/debugwindow.cpp:66 src/gui/debugwindow.cpp:108
-#, c-format
-msgid "Map: %s"
-msgstr "Mapa: %s"
+#: ../src/net/manaserv/charhandler.cpp:159
+msgid "Character's stats are too high."
+msgstr "Atributos del personaje son muy altos."
 
-#: src/gui/debugwindow.cpp:67 src/gui/debugwindow.cpp:106
-#, c-format
-msgid "Minimap: %s"
-msgstr "Minimapa: %s"
+#: ../src/net/manaserv/charhandler.cpp:162
+msgid "Character's stats are too low."
+msgstr "Atributos del personaje son muy bajos."
 
-#: src/gui/debugwindow.cpp:68 src/gui/debugwindow.cpp:99
-#, c-format
-msgid "Cursor: (%d, %d)"
-msgstr "Cursor: (%d, %d)"
+#: ../src/gui/chat.cpp:88
+msgid "Chat"
+msgstr "Chat"
 
-#: src/gui/debugwindow.cpp:69 src/gui/debugwindow.cpp:111
-#, c-format
-msgid "Particle count: %d"
-msgstr "Recuento de partículas: %d"
+#: ../src/keyboardconfig.cpp:75
+msgid "Chat Window"
+msgstr "Ventana de Chat"
 
-#: src/gui/debugwindow.cpp:116
-#, c-format
-msgid "Particle detail: %s"
-msgstr "Detalle de partícula: %s"
+#: ../src/net/tmwa/specialhandler.cpp:154
+msgid "Chat creating failed!"
+msgstr "Fallo al crear un chat!"
 
-#: src/gui/debugwindow.cpp:121
-#, c-format
-msgid "Ambient FX: %s"
-msgstr "Ambiente FX: %s"
+#: ../src/gui/charselectdialog.cpp:404
+msgid "Choose"
+msgstr "Seleccionar"
 
-#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:55
-msgid "Equipment"
-msgstr "Equipamento"
+#: ../src/gui/worldselectdialog.cpp:77
+msgid "Choose World"
+msgstr "Escojer Mundo"
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:78
-#: src/gui/inventorywindow.cpp:80 src/gui/inventorywindow.cpp:291
-#: src/gui/popupmenu.cpp:372
-msgid "Unequip"
-msgstr "Quitárselo"
+#: ../src/gui/serverdialog.cpp:197
+msgid "Choose Your Server"
+msgstr "Escoja tu servidor"
 
-#: src/gui/help.cpp:36
-msgid "Help"
-msgstr "Ayuda"
+#: ../src/gui/socialwindow.cpp:541
+msgid "Choose your guild's name."
+msgstr "Escoja el nombre de su clan."
+
+#: ../src/gui/socialwindow.cpp:626
+msgid "Choose your party's name."
+msgstr "Escoja el nombre del grupo."
 
-#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:74
+#: ../src/gui/npcdialog.cpp:118
+msgid "Clear log"
+msgstr "Limpiar log"
+
+#: ../src/net/manaserv/loginhandler.cpp:239
+msgid ""
+"Client registration is not allowed. Please contact server administration."
+msgstr ""
+"El registro no está soportado. Por favor contacta un administrador del "
+"server."
+
+#: ../src/net/tmwa/loginhandler.cpp:172
+#, fuzzy
+msgid "Client too old."
+msgstr "La version del cliente es demasiado antigua."
+
+#: ../src/net/manaserv/loginhandler.cpp:263
+#: ../src/net/manaserv/loginhandler.cpp:300
+msgid "Client version is too old."
+msgstr "La version del cliente es demasiado antigua."
+
+#: ../src/gui/help.cpp:51 ../src/gui/npcdialog.cpp:50
 msgid "Close"
 msgstr "Cerrar"
 
-#: src/gui/inventorywindow.cpp:57 src/gui/windowmenu.cpp:56
-msgid "Inventory"
-msgstr "Inventario"
+#: ../src/gui/setup_colors.cpp:51
+msgid "Colors"
+msgstr "Colores"
 
-#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:75
-#: src/gui/inventorywindow.cpp:293 src/gui/popupmenu.cpp:374
-msgid "Equip"
-msgstr "Equipar"
+#: ../src/commandhandler.cpp:220
+msgid "Command: /announce <msg>"
+msgstr "Comando: /announce <mensaje>"
 
-#: src/gui/inventorywindow.cpp:74 src/gui/inventorywindow.cpp:75
-#: src/gui/inventorywindow.cpp:297 src/gui/popupmenu.cpp:377
-msgid "Use"
-msgstr "Usar"
+#: ../src/commandhandler.cpp:273
+msgid "Command: /away"
+msgstr "Comando: /away"
 
-#: src/gui/inventorywindow.cpp:84 src/gui/inventorywindow.cpp:301
-#: src/gui/popupmenu.cpp:380
-msgid "Drop..."
-msgstr "Tirar..."
+#: ../src/commandhandler.cpp:270
+msgid "Command: /away <afk reason>"
+msgstr "Comando: /away <motivo>"
 
-#: src/gui/inventorywindow.cpp:85 src/gui/popupmenu.cpp:386
-msgid "Split"
-msgstr "Dividir"
+#: ../src/commandhandler.cpp:227
+msgid "Command: /clear"
+msgstr "Comando: /clear"
 
-#: src/gui/inventorywindow.cpp:86 src/gui/outfitwindow.cpp:51
-msgid "Outfits"
-msgstr "Conjuntos"
+#: ../src/gui/widgets/whispertab.cpp:84
+msgid "Command: /close"
+msgstr "Comando: /close"
 
-#: src/gui/inventorywindow.cpp:97 src/gui/storagewindow.cpp:84
-msgid "Slots:"
-msgstr "Espacios:"
+#: ../src/commandhandler.cpp:278
+msgid "Command: /createparty <name>"
+msgstr "Comando: /createparty <nombre>"
 
-#: src/gui/inventorywindow.cpp:98
-msgid "Weight:"
-msgstr "Peso:"
+#: ../src/net/tmwa/gui/partytab.cpp:100
+msgid "Command: /exp"
+msgstr "Comando: /exp"
 
-#: src/gui/inventorywindow.cpp:303 src/gui/popupmenu.cpp:382
-msgid "Drop"
-msgstr "Tirar"
+#: ../src/net/tmwa/gui/partytab.cpp:95
+msgid "Command: /exp <policy>"
+msgstr "Comando: /exp <policy>"
 
-#: src/gui/itemamount.cpp:100 src/gui/okdialog.cpp:42
-#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:38 src/gui/trade.cpp:73
-#: src/gui/trade.cpp:75
-msgid "OK"
-msgstr "OK"
+#: ../src/commandhandler.cpp:208
+msgid "Command: /help"
+msgstr "Comando: /help"
 
-#: src/gui/itemamount.cpp:102
-msgid "All"
-msgstr "Todo"
+#: ../src/commandhandler.cpp:211
+msgid "Command: /help <command>"
+msgstr "Comando: /help <comando>"
 
-#: src/gui/itemamount.cpp:128
-msgid "Select amount of items to trade."
-msgstr "Selecionar la cantidad de objetos a intercambiar."
+#: ../src/gui/widgets/whispertab.cpp:89
+msgid "Command: /ignore"
+msgstr "Comando: /ignore"
 
-#: src/gui/itemamount.cpp:131
-msgid "Select amount of items to drop."
-msgstr "Selecionar cantidad de objetos a tirar."
+#: ../src/commandhandler.cpp:232
+msgid "Command: /ignore <player>"
+msgstr "Comando: /ignore <jugador>"
 
-#: src/gui/itemamount.cpp:134
-msgid "Select amount of items to store."
-msgstr "Seleccione la cantidad de objetos a almacenar."
+#: ../src/net/tmwa/gui/guildtab.cpp:73 ../src/net/tmwa/gui/partytab.cpp:73
+msgid "Command: /invite <nick>"
+msgstr "Comando: /invite <nick>"
 
-#: src/gui/itemamount.cpp:137
-msgid "Select amount of items to retrieve."
-msgstr "Selecciona la cantidad de objetos a retirar."
+#: ../src/net/tmwa/gui/partytab.cpp:90
+msgid "Command: /item"
+msgstr "Comando: /item"
 
-#: src/gui/itemamount.cpp:140
-msgid "Select amount of items to split."
-msgstr "Selecionar la cantidad de objetos para dividir."
+#: ../src/net/tmwa/gui/partytab.cpp:85
+msgid "Command: /item <policy>"
+msgstr "Comando> /item <policy>"
 
-#: src/gui/itempopup.cpp:92
-#, c-format
-msgid "Weight: %s"
-msgstr "Peso: %s"
+#: ../src/commandhandler.cpp:238
+msgid "Command: /join <channel>"
+msgstr "Comando: /join <canal>"
 
-#: src/gui/login.cpp:49 src/gui/login.cpp:61
-msgid "Login"
-msgstr "Login"
+#: ../src/gui/widgets/channeltab.cpp:89
+msgid "Command: /kick <nick>"
+msgstr "Comando: /kick <nick>"
 
-#: src/gui/login.cpp:58
-msgid "Remember username"
-msgstr "Recordar nombre de usuario"
+#: ../src/net/tmwa/gui/guildtab.cpp:80 ../src/net/tmwa/gui/partytab.cpp:80
+msgid "Command: /leave"
+msgstr "Comando: /leave"
 
-#: src/gui/login.cpp:59 src/gui/register.cpp:58 src/gui/register.cpp:73
-msgid "Register"
-msgstr "Registrar"
+#: ../src/commandhandler.cpp:244
+msgid "Command: /list"
+msgstr "Comando: /list"
 
-#: src/gui/login.cpp:60
-msgid "Change Server"
-msgstr "Cambiar de servidor"
+#: ../src/commandhandler.cpp:249
+msgid "Command: /me <message>"
+msgstr "Comando: /me <mensaje>"
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
-msgid "Map"
-msgstr "Mapa"
+#: ../src/commandhandler.cpp:254
+msgid "Command: /msg <nick> <message>"
+msgstr "Comando: /msg <nick> <mensaje>"
 
-#: src/gui/npcdialog.cpp:44
-msgid "Waiting for server"
-msgstr "Esperando al servidor"
+#: ../src/gui/widgets/channeltab.cpp:80
+msgid "Command: /op <nick>"
+msgstr "Comando: /op <nick>"
 
-#: src/gui/npcdialog.cpp:45
-msgid "Next"
-msgstr "Siguiente"
+#: ../src/commandhandler.cpp:283
+msgid "Command: /party <nick>"
+msgstr "Comando: /party <nick>"
 
-#: src/gui/npcdialog.cpp:47
-msgid "Submit"
-msgstr "Enviar"
+#: ../src/commandhandler.cpp:290
+msgid "Command: /present"
+msgstr "Comando: /present"
 
-#: src/gui/npcdialog.cpp:52 src/gui/npcpostdialog.cpp:41
-msgid "NPC"
-msgstr "NPC"
+#: ../src/commandhandler.cpp:264
+msgid "Command: /q <nick>"
+msgstr "Comando: /q <nick>"
 
-#: src/gui/npcdialog.cpp:110
-msgid "Reset"
-msgstr "Resetear"
+#: ../src/commandhandler.cpp:263
+msgid "Command: /query <nick>"
+msgstr "Comando: /query <nick>"
 
-#. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:171
-msgid ""
-"\n"
-"> Next\n"
-msgstr ""
-"\n"
-"> Siguiente\n"
+#: ../src/gui/widgets/channeltab.cpp:73
+msgid "Command: /quit"
+msgstr "Comando: /quit"
 
-#: src/gui/npcpostdialog.cpp:47
-msgid "To:"
-msgstr "Para:"
+#: ../src/commandhandler.cpp:300
+msgid "Command: /record"
+msgstr "Comando: /record"
 
-#: src/gui/npcpostdialog.cpp:54
-msgid "Send"
-msgstr "Enviar"
+#: ../src/commandhandler.cpp:297
+msgid "Command: /record <filename>"
+msgstr "Comando: /record <nombre_del_archivo>"
 
-#: src/gui/npcpostdialog.cpp:96
-msgid "Failed to send as sender or letter invalid."
-msgstr "Fallo al enviar o mensaje inválido."
+#: ../src/commandhandler.cpp:311
+msgid "Command: /toggle"
+msgstr "Comando: /toggle"
 
-#: src/gui/outfitwindow.cpp:68 src/gui/outfitwindow.cpp:141
-#: src/gui/outfitwindow.cpp:154
-#, c-format
-msgid "Outfit: %d"
-msgstr "Conjuntos: %d"
+#: ../src/commandhandler.cpp:305
+msgid "Command: /toggle <state>"
+msgstr "Comando: /toggle <estado>"
 
-#: src/gui/outfitwindow.cpp:70
-msgid "Unequip first"
-msgstr "Quitárselo antes"
+#: ../src/gui/widgets/channeltab.cpp:68
+msgid "Command: /topic <message>"
+msgstr "Comando: /topic <mensaje>"
 
-#: src/gui/popupmenu.cpp:84
-#, c-format
-msgid "Trade with %s..."
-msgstr "Negociar con %s..."
+#: ../src/commandhandler.cpp:316 ../src/gui/widgets/whispertab.cpp:95
+msgid "Command: /unignore <player>"
+msgstr "Comando: /unignore <jugador>"
 
-#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:161
-#, c-format
-msgid "Attack %s"
-msgstr "Atacar %s"
+#: ../src/gui/widgets/channeltab.cpp:63
+msgid "Command: /users"
+msgstr "Comando: /users"
 
-#: src/gui/popupmenu.cpp:92
-#, c-format
-msgid "Whisper %s"
-msgstr "Mensaje Privado %s"
+#: ../src/commandhandler.cpp:256
+msgid "Command: /w <nick> <message>"
+msgstr "Comando: /w <nick> <mensaje>"
 
-#: src/gui/popupmenu.cpp:101
-#, c-format
-msgid "Befriend %s"
-msgstr "Ser amigo %s"
+#: ../src/commandhandler.cpp:322
+msgid "Command: /where"
+msgstr "Comando: /where"
 
-#: src/gui/popupmenu.cpp:106
-#, c-format
-msgid "Disregard %s"
-msgstr "Desagregar %s"
+#: ../src/commandhandler.cpp:255
+msgid "Command: /whisper <nick> <message>"
+msgstr "Comando: /whisper <nick> <mensaje>"
 
-#: src/gui/popupmenu.cpp:109
-#, c-format
-msgid "Ignore %s"
-msgstr "Ignorar %s"
+#: ../src/commandhandler.cpp:327
+msgid "Command: /who"
+msgstr "Comando: /who"
 
-#: src/gui/popupmenu.cpp:115 src/gui/popupmenu.cpp:124
-#, c-format
-msgid "Unignore %s"
-msgstr "Dejar de Ignorar %s"
+#: ../src/gui/updatewindow.cpp:515
+msgid "Completed"
+msgstr "Completado"
+
+#: ../src/playerrelations.cpp:310
+msgid "Completely ignore"
+msgstr "Ignorar completamente"
 
-#: src/gui/popupmenu.cpp:118
+#: ../src/gui/popupmenu.cpp:117
 #, c-format
 msgid "Completely ignore %s"
 msgstr "Ignorar completamente %s"
 
-#: src/gui/popupmenu.cpp:130
-#, c-format
-msgid "Follow %s"
-msgstr "Seguir %s"
+#: ../src/gui/charselectdialog.cpp:72
+msgid "Confirm Character Delete"
+msgstr "Confimar la supresión del personaje"
 
-#: src/gui/popupmenu.cpp:133
-#, c-format
-msgid "Invite %s to join your guild"
-msgstr "Invitar a %s para unirse a tu clan"
+#: ../src/gui/register.cpp:69
+msgid "Confirm:"
+msgstr "Confirmar:"
+
+#: ../src/gui/trade.cpp:54
+msgid "Confirmed. Waiting..."
+msgstr "Confirmado. Esperando..."
 
-#: src/gui/popupmenu.cpp:137
+#: ../src/keyboardconfig.cpp:183
 #, c-format
-msgid "Invite %s to join your party"
-msgstr "Invitar a %s para su grupo"
+msgid ""
+"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
+"strange behaviour."
+msgstr ""
+"Conflito con las teclas \"%s\" e \"%s\" . Resuelva el conflicto, o el juego "
+"puede presentar un comportamiento raro."
 
-#: src/gui/popupmenu.cpp:144
-msgid "Kick player"
-msgstr "Expulsar jugador"
+#: ../src/gui/serverdialog.cpp:229
+msgid "Connect"
+msgstr "Conectar"
 
-#: src/gui/popupmenu.cpp:153
-#, c-format
-msgid "Talk to %s"
-msgstr "Hablar con %s"
+#: ../src/client.cpp:661
+msgid "Connecting to server"
+msgstr "Conectando al servidor"
 
-#: src/gui/popupmenu.cpp:166
-msgid "Kick monster"
-msgstr "Expulsar monstruo"
+#: ../src/client.cpp:838
+msgid "Connecting to the game server"
+msgstr "Conectando al servidor del juego"
 
-#: src/gui/popupmenu.cpp:174
-msgid "Add name to chat"
-msgstr "Anadir el nombre al chat"
+#: ../src/gui/updatewindow.cpp:142
+msgid "Connecting..."
+msgstr "Conectando..."
+
+#: ../src/net/tmwa/network.cpp:414
+msgid "Connection to server terminated. "
+msgstr "Conexión al servidor terminada."
 
-#: src/gui/popupmenu.cpp:191
+#: ../src/keyboardconfig.cpp:83
+msgid "Copy Outfit"
+msgstr "Copiar el conjunto"
+
+#: ../src/gui/statuswindow.cpp:256
 #, c-format
-msgid "Pick up %s"
-msgstr "Coger %s"
+msgid "Correction points: %d"
+msgstr "Puntos de corrección: %d"
 
-#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:400
-msgid "Add to chat"
-msgstr "Añadir al chat"
+#: ../src/game.cpp:966
+msgid "Could Not Load Map"
+msgstr "No se pudo cargar el mapa"
 
-#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:71
-msgid "Store"
-msgstr "Almacenar"
+#: ../src/net/tmwa/partyhandler.cpp:82
+msgid "Could not create party."
+msgstr "No es posible crear un grupo."
 
-#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:72
-msgid "Retrieve"
-msgstr "Retirar"
+#: ../src/net/tmwa/guildhandler.cpp:296
+msgid "Could not inivte user to guild."
+msgstr "No se puede invitar jugadores al clan."
 
-#: src/gui/quitdialog.cpp:44
-msgid "Switch server"
-msgstr "Cambiar de servidor"
+#: ../src/net/tmwa/specialhandler.cpp:157
+msgid "Could not join party!"
+msgstr "Imposible entrar en un grupo!"
 
-#: src/gui/quitdialog.cpp:45
-msgid "Switch character"
-msgstr "Cambiar de personaje"
+#: ../src/net/tmwa/specialhandler.cpp:211
+msgid "Could not steal anything..."
+msgstr "No puedes robar nada..."
 
-#: src/gui/recorder.cpp:87
-msgid "Finishing recording."
-msgstr "Finalizando grabación."
+#: ../src/gui/charcreatedialog.cpp:78 ../src/gui/charselectdialog.cpp:416
+#: ../src/gui/socialwindow.cpp:330
+msgid "Create"
+msgstr "Crear"
 
-#: src/gui/recorder.cpp:91
-msgid "Not currently recording."
-msgstr "No se está grabando en este momento."
+#: ../src/gui/charcreatedialog.cpp:53
+msgid "Create Character"
+msgstr "Crear Personaje"
 
-#: src/gui/recorder.cpp:96
-msgid "Already recording."
-msgstr "Ya se está llevando a cabo la grabación."
+#: ../src/gui/socialwindow.cpp:272
+msgid "Create Guild"
+msgstr "Crear clan"
 
-#: src/gui/recorder.cpp:104
-msgid "Starting to record..."
-msgstr "Iniciando la grabación..."
+#: ../src/gui/socialwindow.cpp:273 ../src/gui/socialwindow.cpp:619
+msgid "Create Party"
+msgstr "Crear grupo"
 
-#: src/gui/recorder.cpp:112
-msgid "Failed to start recording."
-msgstr "Fallo al empezar la grabación."
+#: ../src/gui/socialwindow.cpp:503
+#, c-format
+msgid "Creating guild called %s."
+msgstr "Creando clan llamado %s."
 
-#: src/gui/recorder.h:38
-msgid "Recording..."
-msgstr "Grabando..."
+#: ../src/gui/socialwindow.cpp:496
+msgid "Creating guild failed, please choose a shorter name."
+msgstr "Fallo al crear Guild escoja un nombre mas corto."
 
-#: src/gui/recorder.h:39
-msgid "Stop recording"
-msgstr "Parar de grabar"
+#: ../src/gui/socialwindow.cpp:526
+#, c-format
+msgid "Creating party called %s."
+msgstr "Creando grupo llamado %s."
 
-#: src/gui/register.cpp:69
-msgid "Confirm:"
-msgstr "Confirmar:"
+#: ../src/gui/socialwindow.cpp:519
+msgid "Creating party failed, please choose a shorter name."
+msgstr "Fallo al crear un Grupo escoja un nombre mas corto."
 
-#: src/gui/register.cpp:100
-msgid "Email:"
-msgstr "Email:"
+#: ../src/resources/userpalette.cpp:105
+msgid "Critical Hit"
+msgstr "Golpe Critico"
 
-#: src/gui/register.cpp:166
+#: ../src/gui/debugwindow.cpp:68 ../src/gui/debugwindow.cpp:99
 #, c-format
-msgid "The username needs to be at least %d characters long."
-msgstr "El nombre debe tener como mínimo %d caracteres."
+msgid "Cursor: (%d, %d)"
+msgstr "Cursor: (%d, %d)"
 
-#: src/gui/register.cpp:174
-#, c-format
-msgid "The username needs to be less than %d characters long."
-msgstr "El nombre debe tener menos de  %d caracteres."
+#: ../src/gui/serverdialog.cpp:230
+msgid "Custom Server"
+msgstr "Servidor propio"
 
-#: src/gui/register.cpp:182 src/gui/unregisterdialog.cpp:117
-#, c-format
-msgid "The password needs to be at least %d characters long."
-msgstr "La contraseña debe tener al menos %d caracteres."
+#: ../src/gui/setup_video.cpp:213
+msgid "Custom cursor"
+msgstr "Cursor propio"
+
+#: ../src/gui/setup_video.cpp:460
+msgid "Deactivating OpenGL"
+msgstr "Desativando OpenGL"
+
+#: ../src/gui/debugwindow.cpp:43
+msgid "Debug"
+msgstr "Depurador"
+
+#: ../src/keyboardconfig.cpp:78
+msgid "Debug Window"
+msgstr "Ventana de Problemas"
+
+#: ../src/gui/setup_keyboard.cpp:94
+msgid "Default"
+msgstr "Por defecto"
 
-#: src/gui/register.cpp:190 src/gui/unregisterdialog.cpp:124
+#: ../src/net/tmwa/generalhandler.cpp:238
+msgid "Defense"
+msgstr "Defensa"
+
+#: ../src/resources/itemdb.cpp:311
 #, c-format
-msgid "The password needs to be less than %d characters long."
-msgstr "La contraseña debe tener como mínimo %d caracteres."
+msgid "Defense %+d"
+msgstr "Defensa %+d"
 
-#: src/gui/register.cpp:197
-msgid "Passwords do not match."
-msgstr "Las contraseñas no coinciden."
+#: ../src/gui/setup_colors.cpp:94
+msgid "Delay:"
+msgstr "Atraso:"
 
-#: src/gui/serverdialog.cpp:124
-msgid "Choose Your Server"
-msgstr "Escoja tu servidor"
+#: ../src/gui/charselectdialog.cpp:360 ../src/gui/serverdialog.cpp:231
+#: ../src/gui/setup_players.cpp:229
+msgid "Delete"
+msgstr "Borrar"
 
-#: src/gui/serverdialog.cpp:131 src/gui/widgets/chattab.cpp:139
-msgid "Server:"
-msgstr "Servidor:"
+#: ../src/net/manaserv/attributes.cpp:192
+#: ../src/net/tmwa/generalhandler.cpp:234
+msgid "Dexterity"
+msgstr "Destreza"
 
-#: src/gui/serverdialog.cpp:132
-msgid "Port:"
-msgstr "Puerto:"
+#: ../src/net/manaserv/attributes.cpp:199
+#, fuzzy, c-format
+msgid "Dexterity %+.1f"
+msgstr "Destreza %+d"
 
-#: src/gui/serverdialog.cpp:133
-msgid "Server type:"
-msgstr "Tipo de servidor:"
+#: ../src/net/tmwa/generalhandler.cpp:106
+#, c-format
+msgid "Dexterity %+d"
+msgstr "Destreza %+d"
 
-#: src/gui/serverdialog.cpp:153
-msgid "Connect"
-msgstr "Conectar"
+#: ../src/net/tmwa/charserverhandler.cpp:274
+msgid "Dexterity:"
+msgstr "Destreza:"
 
-#: src/gui/serverdialog.cpp:154
-msgid "Custom Server"
-msgstr "Servidor propio"
+#: ../src/gui/setup_video.cpp:241
+msgid "Disable transparency (Low CPU mode)"
+msgstr "Desabilitar transparencia (CPU Modo)"
 
-#: src/gui/serverdialog.cpp:242
-msgid "Please type both the address and the port of a server."
-msgstr "Por favor especifique el nombre y el puerto del servidor."
+#: ../src/gui/popupmenu.cpp:105
+#, c-format
+msgid "Disregard %s"
+msgstr "Desagregar %s"
+
+#: ../src/gui/setup_players.cpp:66
+msgid "Disregarded"
+msgstr "Desconocido"
 
-#: src/gui/serverdialog.cpp:357
+#: ../src/net/manaserv/beinghandler.cpp:294
+#: ../src/net/tmwa/playerhandler.cpp:108
+msgid "Do you want your possessions identified?"
+msgstr "Deseas que tus posesiones sean identificadas?"
+
+#: ../src/gui/setup_audio.cpp:43
+msgid "Download music"
+msgstr "Bajar Música"
+
+#: ../src/gui/serverdialog.cpp:441
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Bajando la lista de servidores...%2.2f%%"
 
-#: src/gui/serverdialog.cpp:363
-msgid "Waiting for server..."
-msgstr "Esperando al servidor..."
+#: ../src/gui/inventorywindow.cpp:365 ../src/gui/popupmenu.cpp:374
+msgid "Drop"
+msgstr "Tirar"
 
-#: src/gui/serverdialog.cpp:367
-msgid "Preparing download"
-msgstr "Preparando la descarga"
+#: ../src/gui/inventorywindow.cpp:107 ../src/gui/inventorywindow.cpp:363
+#: ../src/gui/popupmenu.cpp:372
+msgid "Drop..."
+msgstr "Tirar..."
 
-#: src/gui/setup_audio.cpp:42
-msgid "Sound"
-msgstr "Sonido"
+#: ../src/net/tmwa/generalhandler.cpp:148
+msgid "Duplicated login."
+msgstr "Login duplicado."
 
-#: src/gui/setup_audio.cpp:43
-msgid "Download music"
-msgstr "Bajar Música"
+#: ../src/client.cpp:935
+msgid "Email Change"
+msgstr "Cambiar e-mail"
 
-#: src/gui/setup_audio.cpp:47
-msgid "Audio"
-msgstr "Audio"
+#: ../src/net/manaserv/loginhandler.cpp:309
+msgid "Email address already exists."
+msgstr "El e-mail ya existe."
 
-#: src/gui/setup_audio.cpp:50
-msgid "Sfx volume"
-msgstr "Volumen Sfx"
+#: ../src/client.cpp:936
+msgid "Email changed successfully!"
+msgstr "Email modificado correctamente!"
 
-#: src/gui/setup_audio.cpp:51
-msgid "Music volume"
-msgstr "Volumen de Música"
+#: ../src/gui/register.cpp:100
+msgid "Email:"
+msgstr "Email:"
 
-#: src/gui/setup_audio.cpp:94
-msgid "Notice"
-msgstr "Anuncio"
+#: ../src/keyboardconfig.cpp:84 ../src/keyboardconfig.cpp:85
+#: ../src/keyboardconfig.cpp:86 ../src/keyboardconfig.cpp:87
+#: ../src/keyboardconfig.cpp:88 ../src/keyboardconfig.cpp:89
+#: ../src/keyboardconfig.cpp:90 ../src/keyboardconfig.cpp:91
+#: ../src/keyboardconfig.cpp:92 ../src/keyboardconfig.cpp:93
+#: ../src/keyboardconfig.cpp:94 ../src/keyboardconfig.cpp:95
+#, c-format
+msgid "Emote Shortcut %d"
+msgstr "Atajo para Emoticono %d"
 
-#: src/gui/setup_audio.cpp:94
-msgid "You may have to restart your client if you want to download new music"
-msgstr "Necesitas reiniciar el client si quieres descargar la musica"
+#: ../src/keyboardconfig.cpp:80
+msgid "Emote Shortcut Window"
+msgstr "Ventana de Emoticonos"
 
-#: src/gui/setup_audio.cpp:106
-msgid "Sound Engine"
-msgstr "Mecanismo de Sonido"
+#: ../src/net/tmwa/specialhandler.cpp:148
+msgid "Emote failed!"
+msgstr "Fallo al hacer un emoticono!"
 
-#: src/gui/setup_colors.cpp:45
-msgid "This is what the color looks like"
-msgstr "Así es como se verá el color"
+#: ../src/net/tmwa/network.cpp:145
+msgid "Empty address given to Network::connect()!"
+msgstr "Adress vacía enviada a Network::connect()!"
 
-#: src/gui/setup_colors.cpp:50
-msgid "Colors"
-msgstr "Colores"
+#: ../src/gui/setup_players.cpp:235
+#, fuzzy
+msgid "Enable Chat log"
+msgstr "Imposible vender."
 
-#: src/gui/setup_colors.cpp:71
-msgid "Type:"
-msgstr "Tipo:"
+#: ../src/gui/setup_joystick.cpp:39
+msgid "Enable joystick"
+msgstr "Habilitar joystick"
 
-#: src/gui/setup_colors.cpp:82 src/gui/setup_colors.cpp:330
-msgid "Static"
-msgstr "Estático"
+#: ../src/keyboardconfig.cpp:55
+msgid "Enable/Disable Trading"
+msgstr "Habilitar/Desabilitar intercambios"
 
-#: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
-#: src/gui/setup_colors.cpp:331
-msgid "Pulse"
-msgstr "Pulso"
+#: ../src/net/manaserv/chathandler.cpp:229
+msgid "End of channel list."
+msgstr "Fin de la lista de canales."
 
-#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:87
-#: src/gui/setup_colors.cpp:332
-msgid "Rainbow"
-msgstr "Arcoiris"
+#: ../src/gui/changepassworddialog.cpp:110
+msgid "Enter the old password first."
+msgstr "Escribe la contraseña antigua."
 
-#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
-#: src/gui/setup_colors.cpp:332
-msgid "Spectrum"
-msgstr "Espectro"
+#: ../src/client.cpp:721
+msgid "Entering game world"
+msgstr "Entrando al juego"
 
-#: src/gui/setup_colors.cpp:93
-msgid "Delay:"
-msgstr "Atraso:"
+#: ../src/gui/inventorywindow.cpp:92 ../src/gui/inventorywindow.cpp:105
+#: ../src/gui/inventorywindow.cpp:354 ../src/gui/popupmenu.cpp:366
+msgid "Equip"
+msgstr "Equipar"
 
-#: src/gui/setup_colors.cpp:108
-msgid "Red:"
-msgstr "Rojo:"
+#: ../src/net/tmwa/playerhandler.cpp:506
+msgid "Equip arrows first."
+msgstr "Equipar las flechas primero."
 
-#: src/gui/setup_colors.cpp:123
-msgid "Green:"
-msgstr "Verde:"
+#: ../src/gui/equipmentwindow.cpp:69 ../src/gui/windowmenu.cpp:55
+msgid "Equipment"
+msgstr "Equipamento"
 
-#: src/gui/setup_colors.cpp:138
-msgid "Blue:"
-msgstr "Azul:"
+#: ../src/keyboardconfig.cpp:72
+msgid "Equipment Window"
+msgstr "Ventana de equipamento"
 
-#: src/gui/setup.cpp:51
-msgid "Apply"
-msgstr "Aplicar"
+#: ../src/client.cpp:1036 ../src/gui/changeemaildialog.cpp:156
+#: ../src/gui/changepassworddialog.cpp:149 ../src/gui/charcreatedialog.cpp:183
+#: ../src/gui/register.cpp:218 ../src/gui/serverdialog.cpp:323
+#: ../src/gui/unregisterdialog.cpp:133 ../src/net/manaserv/charhandler.cpp:177
+#: ../src/net/manaserv/charhandler.cpp:227
+#: ../src/net/tmwa/charserverhandler.cpp:134
+#: ../src/net/tmwa/charserverhandler.cpp:151
+msgid "Error"
+msgstr "Error"
 
-#: src/gui/setup.cpp:51
-msgid "Reset Windows"
-msgstr "Restaurar Ventanas"
+#: ../src/net/manaserv/guildhandler.cpp:87
+msgid "Error creating guild."
+msgstr "Error al crear el clan."
 
-#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:78
-msgid "Press the button to start calibration"
-msgstr "Aprieta el botón para empezar a calibrar"
+#: ../src/client.cpp:1336 ../src/client.cpp:1342
+msgid "Error creating updates directory!"
+msgstr "Error creando la carpeta de actualizaciones!"
 
-#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:76
-msgid "Calibrate"
-msgstr "Calibrar"
+#: ../src/net/manaserv/chathandler.cpp:211
+msgid "Error joining channel."
+msgstr "Error al entrar al canal."
 
-#: src/gui/setup_joystick.cpp:39
-msgid "Enable joystick"
-msgstr "Habilitar joystick"
+#: ../src/gui/serverdialog.cpp:455
+msgid "Error retreiving server list!"
+msgstr "Error al recuperar la lista de servers!"
 
-#: src/gui/setup_joystick.cpp:41
-msgid "Joystick"
-msgstr "Joystick"
+#: ../src/game.cpp:967
+#, c-format
+msgid "Error while loading %s"
+msgstr "Error mientras cargaba %s"
 
-#: src/gui/setup_joystick.cpp:83
-msgid "Stop"
-msgstr "Parar"
+#: ../src/resources/userpalette.cpp:101
+msgid "Exp Notification"
+msgstr "Aviso de experiencia"
 
-#: src/gui/setup_joystick.cpp:84
-msgid "Rotate the stick"
-msgstr "Gira el stick"
+#: ../src/gui/statuswindow.cpp:122
+msgid "Exp:"
+msgstr "Exp:"
 
-#: src/gui/setup_keyboard.cpp:77
-msgid "Keyboard"
-msgstr "Teclado"
+#: ../src/net/tmwa/gui/partytab.cpp:170 ../src/net/tmwa/partyhandler.cpp:178
+msgid "Experience sharing disabled."
+msgstr "Compartir experiencia desactivado ."
 
-#: src/gui/setup_keyboard.cpp:86
-msgid "Assign"
-msgstr "Atribuir"
+#: ../src/net/tmwa/gui/partytab.cpp:167 ../src/net/tmwa/partyhandler.cpp:172
+msgid "Experience sharing enabled."
+msgstr "Compartir experiencia activado."
 
-#: src/gui/setup_keyboard.cpp:90
-msgid "Unassign"
-msgstr "Retirar"
+#: ../src/net/tmwa/gui/partytab.cpp:173 ../src/net/tmwa/partyhandler.cpp:184
+msgid "Experience sharing not possible."
+msgstr "Imposible compartir experiencia."
 
-#: src/gui/setup_keyboard.cpp:94
-msgid "Default"
-msgstr "Por defecto"
+#: ../src/net/tmwa/gui/partytab.cpp:176
+msgid "Experience sharing unknown."
+msgstr "Compartir experiencia desconocido."
 
-#: src/gui/setup_keyboard.cpp:125
-msgid "Key Conflict(s) Detected."
-msgstr "Conflicto de teclas detectado."
+#: ../src/gui/setup_video.cpp:230
+msgid "FPS limit:"
+msgstr "Limite FPS:"
 
-#: src/gui/setup_players.cpp:57
-msgid "Name"
-msgstr "Nombre"
+#: ../src/net/tmwa/tradehandler.cpp:211
+msgid "Failed adding item for unknown reason."
+msgstr "Fallo al anadir objeto por una razón desconocida."
 
-#: src/gui/setup_players.cpp:58
-msgid "Relation"
-msgstr "Relación"
+#: ../src/net/tmwa/tradehandler.cpp:207
+msgid "Failed adding item. Trade partner has no free slot."
+msgstr "Error al anadir objeto. El otro jugador no tiene más espacio."
 
-#: src/gui/setup_players.cpp:63
-msgid "Neutral"
-msgstr "Neutral"
+#: ../src/net/tmwa/tradehandler.cpp:202
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr "Error al añadir objeto. El otro jugador lleva mucho peso."
 
-#: src/gui/setup_players.cpp:64
-msgid "Friend"
-msgstr "Amigo"
+#: ../src/gui/trade.cpp:262
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+"Fallo al añadir objeto. No puedes añadir más de un mismo tipo de objeto en "
+"la ventana."
 
-#: src/gui/setup_players.cpp:65
-msgid "Disregarded"
-msgstr "Desconocido"
+#: ../src/net/tmwa/charserverhandler.cpp:134
+msgid "Failed to create character. Most likely the name is already taken."
+msgstr "Error al crear personaje. Probablemente ya esté en uso."
 
-#: src/gui/setup_players.cpp:66
-msgid "Ignored"
-msgstr "Ignorado"
+#: ../src/net/tmwa/charserverhandler.cpp:151
+msgid "Failed to delete character."
+msgstr "Fallo al borrar el personaje."
 
-#: src/gui/setup_players.cpp:208 src/gui/setup_video.cpp:132
-msgid "???"
-msgstr "???"
+#: ../src/net/manaserv/guildhandler.cpp:209
+msgid "Failed to promote member."
+msgstr "Error al cambiar estado del miembro."
 
-#: src/gui/setup_players.cpp:226
-msgid "Allow trading"
-msgstr "Permitir intercambios"
+#: ../src/gui/npcpostdialog.cpp:99
+msgid "Failed to send as sender or letter invalid."
+msgstr "Fallo al enviar o mensaje inválido."
 
-#: src/gui/setup_players.cpp:228
-msgid "Allow whispers"
-msgstr "Permitir mensajes privados"
+#: ../src/gui/recorder.cpp:112
+msgid "Failed to start recording."
+msgstr "Fallo al empezar la grabación."
 
-#: src/gui/setup_players.cpp:232
-msgid "Put all whispers in tabs"
-msgstr "Mostrar nuevos susurros en pestañas"
+#: ../src/gui/setup_video.cpp:426
+msgid ""
+"Failed to switch to fullscreen mode and restoration of old mode also failed!"
+msgstr ""
+"Fallo al cambiar para el modo ventana completa y fallo al restaurar el modo "
+"anterior!"
 
-#: src/gui/setup_players.cpp:234
-msgid "Show gender"
-msgstr "Mostrar género (del personaje)"
+#: ../src/gui/setup_video.cpp:420
+msgid ""
+"Failed to switch to windowed mode and restoration of old mode also failed!"
+msgstr ""
+"Fallo al cambiar para el modo ventana y fallo al restaurar el modo anterior!"
 
-#: src/gui/setup_players.cpp:236
-msgid "Players"
-msgstr "Jugadores"
+#: ../src/net/tmwa/inventoryhandler.cpp:287
+msgid "Failed to use item."
+msgstr "Fallo al usar el objeto."
 
-#: src/gui/setup_players.cpp:261
-msgid "When ignoring:"
-msgstr "Cuando se ignora a alguien:"
+#: ../src/client.cpp:956
+msgid "Farewell, come back any time..."
+msgstr "Adiós, vuelve cuando quieras..."
 
-#: src/gui/setup_video.cpp:113
-msgid "Tiny"
-msgstr "Minúsculo"
+#: ../src/gui/charcreatedialog.cpp:81 ../src/gui/register.cpp:91
+msgid "Female"
+msgstr "Mujer"
 
-#: src/gui/setup_video.cpp:114
-msgid "Small"
-msgstr "Pequeño"
+#: ../src/keyboardconfig.cpp:56
+msgid "Find Path to Mouse"
+msgstr "Encontrar Camino al Mouse"
 
-#: src/gui/setup_video.cpp:115
-msgid "Medium"
-msgstr "Media"
+#: ../src/gui/recorder.cpp:87
+msgid "Finishing recording."
+msgstr "Finalizando grabación."
 
-#: src/gui/setup_video.cpp:116
-msgid "Large"
-msgstr "Grande"
+#: ../src/gui/setup_video.cpp:256
+msgid "Font size"
+msgstr "Tamaño de fuente"
 
-#: src/gui/setup_video.cpp:142
-msgid "No text"
-msgstr "Sin texto"
+#: ../src/commandhandler.cpp:204
+msgid "For more information, type /help <command>."
+msgstr "Para mas informacion,  pon /help <comando>."
 
-#: src/gui/setup_video.cpp:143
-msgid "Text"
-msgstr "Texto"
+#: ../src/gui/setup_players.cpp:65
+msgid "Friend"
+msgstr "Amigo"
 
-#: src/gui/setup_video.cpp:144
-msgid "Bubbles, no names"
-msgstr "Burbujas sin nombres"
+#: ../src/gui/setup_video.cpp:211
+msgid "Full screen"
+msgstr "Pantalla completa"
 
-#: src/gui/setup_video.cpp:145
-msgid "Bubbles with names"
-msgstr "Burbujas con nombres"
+#: ../src/resources/userpalette.cpp:94
+msgid "GM Names"
+msgstr "Nombres De Los GMs"
 
-#: src/gui/setup_video.cpp:157
-msgid "off"
-msgstr "apagado"
+#: ../src/net/tmwa/gamehandler.cpp:102
+msgid "Game"
+msgstr "Juego"
 
-#: src/gui/setup_video.cpp:158 src/gui/setup_video.cpp:171
-msgid "low"
-msgstr "bajo"
+#: ../src/net/manaserv/beinghandler.cpp:288
+#: ../src/net/tmwa/playerhandler.cpp:100
+msgid "Game Over!"
+msgstr "Fin Del Juego!"
 
-#: src/gui/setup_video.cpp:159 src/gui/setup_video.cpp:173
-msgid "high"
-msgstr "alto"
+#: ../src/game.cpp:181
+msgid "General"
+msgstr "General"
 
-#: src/gui/setup_video.cpp:172
-msgid "medium"
-msgstr "medio"
+#: ../src/gui/widgets/chattab.cpp:127
+#, c-format
+msgid "Global announcement from %s:"
+msgstr "Anuncio global de  %s:"
 
-#: src/gui/setup_video.cpp:174
-msgid "max"
-msgstr "máximo"
+#: ../src/gui/widgets/chattab.cpp:121
+msgid "Global announcement:"
+msgstr "Anuncio global:"
 
-#: src/gui/setup_video.cpp:196
-msgid "Full screen"
-msgstr "Pantalla completa"
+#: ../src/net/tmwa/generalhandler.cpp:209
+msgid "Got disconnected from server!"
+msgstr "Desconectado del servidor!"
 
-#: src/gui/setup_video.cpp:197
-msgid "OpenGL"
-msgstr "OpenGL"
+#: ../src/gui/setup_colors.cpp:124
+msgid "Green:"
+msgstr "Verde:"
 
-#: src/gui/setup_video.cpp:198
-msgid "Custom cursor"
-msgstr "Cursor propio"
+#: ../src/gui/setup_video.cpp:253
+msgid "Gui opacity"
+msgstr "Opacidad"
 
-#: src/gui/setup_video.cpp:200
-msgid "Visible names"
-msgstr "Nombres Visibles"
+#: ../src/net/tmwa/gui/guildtab.cpp:45
+msgid "Guild"
+msgstr "Clan"
 
-#: src/gui/setup_video.cpp:202
-msgid "Particle effects"
-msgstr "Efectos de partículas"
+#: ../src/gui/socialwindow.cpp:139
+#, c-format
+msgid "Guild %s quit requested."
+msgstr "Clan %s pidiendo salir."
 
-#: src/gui/setup_video.cpp:204
-msgid "Show own name"
-msgstr "Mostrar nombre propio"
+#: ../src/resources/userpalette.cpp:98
+msgid "Guild Members"
+msgstr "Miembros del guild"
 
-#: src/gui/setup_video.cpp:205
-msgid "Show pickup notification"
-msgstr "Mostrar aviso al coger algo"
+#: ../src/gui/socialwindow.cpp:540
+msgid "Guild Name"
+msgstr "Nombre del clan"
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:207
-msgid "in chat"
-msgstr "en chat"
+#: ../src/net/manaserv/guildhandler.cpp:82
+msgid "Guild created."
+msgstr "Clan creado."
 
-#. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:209
-msgid "as particle"
-msgstr "como partícula"
+#: ../src/net/tmwa/guildhandler.cpp:393
+msgid "Guild creation isn't supported yet."
+msgstr "La creación de guilds no esta soportada."
 
-#: src/gui/setup_video.cpp:214
-msgid "FPS limit:"
-msgstr "Limite FPS:"
+#: ../src/net/tmwa/gui/guildtab.cpp:89
+msgid "Guild name is missing."
+msgstr "Falta el nombre del clan."
 
-#: src/gui/setup_video.cpp:225
-msgid "Video"
-msgstr "Vídeo"
+#: ../src/resources/itemdb.cpp:312
+#, c-format
+msgid "HP %+d"
+msgstr "PV %+d"
 
-#: src/gui/setup_video.cpp:227
-msgid "Show monster damage"
-msgstr "Mostrar daño recibido"
+#: ../src/gui/statuswindow.cpp:117
+msgid "HP:"
+msgstr "PV:"
 
-#: src/gui/setup_video.cpp:233
-msgid "Overhead text"
-msgstr "Texto sobrescrito"
+#: ../src/gui/charcreatedialog.cpp:74
+msgid "Hair color:"
+msgstr "Color del pelo:"
 
-#: src/gui/setup_video.cpp:234
-msgid "Gui opacity"
-msgstr "Opacidad"
+#: ../src/gui/charcreatedialog.cpp:77
+msgid "Hair style:"
+msgstr "Estilo de pelo:"
 
-#: src/gui/setup_video.cpp:235
-msgid "Ambient FX"
-msgstr "Ambiente FX"
+#: ../src/gui/help.cpp:37
+msgid "Help"
+msgstr "Ayuda"
 
-#: src/gui/setup_video.cpp:236
-msgid "Particle detail"
-msgstr "Detalle de partículas"
+#: ../src/keyboardconfig.cpp:69
+msgid "Help Window"
+msgstr "Ventana de ayuda"
 
-#: src/gui/setup_video.cpp:237
-msgid "Font size"
-msgstr "Tamaño de fuente"
+#: ../src/keyboardconfig.cpp:52
+msgid "Hide Windows"
+msgstr "Esconder ventanas"
 
-#: src/gui/setup_video.cpp:251 src/gui/setup_video.cpp:454
-#: src/gui/setup_video.cpp:568
-msgid "None"
-msgstr "Nada"
+#: ../src/net/tmwa/specialhandler.cpp:199
+msgid "Huh? What's that?"
+msgstr "Huh? Qué es eso?"
 
-#: src/gui/setup_video.cpp:381
-msgid ""
-"Failed to switch to windowed mode and restoration of old mode also failed!"
-msgstr ""
-"Fallo al cambiar para el modo ventana y fallo al restaurar el modo anterior!"
+#: ../src/net/manaserv/beinghandler.cpp:293
+#: ../src/net/tmwa/playerhandler.cpp:106
+msgid "I guess this did not run too well."
+msgstr "Creo que esto no fue muy bien."
 
-#: src/gui/setup_video.cpp:387
-msgid ""
-"Failed to switch to fullscreen mode and restoration of old mode also failed!"
-msgstr ""
-"Fallo al cambiar para el modo ventana completa y fallo al restaurar el modo "
-"anterior!"
+#: ../src/commandhandler.cpp:240
+msgid "If <channel> doesn't exist, it's created."
+msgstr "Si el  <canal> no existe, sera creado."
 
-#: src/gui/setup_video.cpp:398
-msgid "Switching to Full Screen"
-msgstr "Cambiando a pantalla completa"
+#: ../src/commandhandler.cpp:258 ../src/commandhandler.cpp:285
+#: ../src/gui/widgets/channeltab.cpp:82 ../src/gui/widgets/channeltab.cpp:91
+#: ../src/net/tmwa/gui/guildtab.cpp:75 ../src/net/tmwa/gui/partytab.cpp:75
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr "Si <nick> posee espacios, colóquelo entre las comillas dobles (\")."
 
-#: src/gui/setup_video.cpp:399
-msgid "Restart needed for changes to take effect."
-msgstr "Reinicio necesario para que los cambios tengan su efecto."
+#: ../src/net/tmwa/playerhandler.cpp:125
+msgid "If you weren't so animated, you'd be pushing up the daisies."
+msgstr "Si no estuvieras tan animado, diría que estás muerto."
 
-#: src/gui/setup_video.cpp:411
-msgid "Changing to OpenGL"
-msgstr "Cambiando a OpenGL"
+#: ../src/gui/widgets/channeltab.cpp:75
+msgid "If you're the last person in the channel, it will be deleted."
+msgstr "Si eres la última persona de este canal , será eliminado."
 
-#: src/gui/setup_video.cpp:412
-msgid "Applying change to OpenGL requires restart."
-msgstr "Aplicar el intercambio a OpenGL requiere reiniciar el juego."
+#: ../src/gui/popupmenu.cpp:108
+#, c-format
+msgid "Ignore %s"
+msgstr "Ignorar %s"
 
-#: src/gui/setup_video.cpp:486 src/gui/setup_video.cpp:491
-msgid "Screen Resolution Changed"
-msgstr "Resolución de pantalla cambiada"
+#: ../src/keyboardconfig.cpp:103
+msgid "Ignore input 1"
+msgstr "Ignorar input 1"
 
-#: src/gui/setup_video.cpp:487 src/gui/setup_video.cpp:492
-msgid "Restart your client for the change to take effect."
-msgstr "Reincie el juego para que los cambios tengan efecto."
+#: ../src/keyboardconfig.cpp:104
+msgid "Ignore input 2"
+msgstr "Ignorar input 2"
 
-#: src/gui/setup_video.cpp:489
-msgid "Some windows may be moved to fit the lowered resolution."
-msgstr "Algunas ventanas deben ser movidas a una resolución más baja."
+#: ../src/gui/setup_players.cpp:67
+msgid "Ignored"
+msgstr "Ignorado"
 
-#: src/gui/setup_video.cpp:522
-msgid "Particle Effect Settings Changed."
-msgstr "Configuración del efecto de las partículas cambiado."
+#: ../src/game.cpp:733
+msgid "Ignoring incoming trade requests"
+msgstr "Ignorando las propuestas de intercambio"
 
-#: src/gui/setup_video.cpp:523
-msgid "Changes will take effect on map change."
-msgstr "Los cambios tendran efecto cuando se cambie de mapa."
+#: ../src/net/manaserv/tradehandler.cpp:97
+msgid "Ignoring incoming trade requests."
+msgstr "Ignorar las propuestas de intercambio entrantes."
 
-#: src/gui/skilldialog.cpp:198 src/gui/windowmenu.cpp:59
-msgid "Skills"
-msgstr "Habilidades"
+#: ../src/net/manaserv/charhandler.cpp:210
+#: ../src/net/tmwa/charserverhandler.cpp:146
+msgid "Info"
+msgstr "Información"
 
-#: src/gui/skilldialog.cpp:209
-msgid "Up"
-msgstr "Encima"
+#: ../src/net/tmwa/playerhandler.cpp:101
+msgid "Insert coin to continue."
+msgstr "Inserta moneda para continuar."
 
-#: src/gui/skilldialog.cpp:263
-#, c-format
-msgid "Skill points available: %d"
-msgstr "Puntos de habilidades: %d"
+#: ../src/net/tmwa/specialhandler.cpp:172
+msgid "Insufficient HP!"
+msgstr "PV insuficiente!"
 
-#: src/gui/skilldialog.cpp:315
-#, c-format
-msgid "Skill Set %d"
-msgstr "Habilidades %d"
+#: ../src/net/tmwa/specialhandler.cpp:175
+msgid "Insufficient SP!"
+msgstr "SP insuficiente!"
 
-#: src/gui/skilldialog.cpp:324
-#, c-format
-msgid "Skill %d"
-msgstr "Habilidad %d"
+#: ../src/net/manaserv/attributes.cpp:218
+#: ../src/net/tmwa/generalhandler.cpp:233
+msgid "Intelligence"
+msgstr "Inteligencia"
 
-#: src/gui/skilldialog.cpp:406
-#, c-format
-msgid "Lvl: %d (%+d)"
-msgstr "Nivel: %d (%+d)"
+#: ../src/net/manaserv/attributes.cpp:225
+#, fuzzy, c-format
+msgid "Intelligence %+.1f"
+msgstr "Inteligencia %+d"
 
-#: src/gui/skilldialog.cpp:417
+#: ../src/net/tmwa/generalhandler.cpp:105
 #, c-format
-msgid "Lvl: %d"
-msgstr "Nivel: %d"
+msgid "Intelligence %+d"
+msgstr "Inteligencia %+d"
 
-#: src/gui/socialwindow.cpp:118
-#, c-format
-msgid "Invited user %s to guild %s."
-msgstr "Invita al jugador %s para su clan %s."
+#: ../src/net/tmwa/charserverhandler.cpp:273
+msgid "Intelligence:"
+msgstr "Inteligencia:"
+
+#: ../src/net/manaserv/charhandler.cpp:267
+#, fuzzy
+msgid "Invalid character slot selected."
+msgstr "Personaje Borrado."
+
+#: ../src/net/manaserv/charhandler.cpp:156
+msgid "Invalid gender."
+msgstr "Género no válido."
+
+#: ../src/net/manaserv/charhandler.cpp:153
+msgid "Invalid hair color."
+msgstr "Color del pelo no válido."
+
+#: ../src/net/manaserv/charhandler.cpp:150
+msgid "Invalid hairstyle."
+msgstr "Estilo de pelo no válido."
+
+#: ../src/net/manaserv/charhandler.cpp:144
+msgid "Invalid name."
+msgstr "Nombre no válido."
+
+#: ../src/net/manaserv/charhandler.cpp:171
+#, fuzzy
+msgid "Invalid slot number."
+msgstr "Nombre no válido."
 
-#: src/gui/socialwindow.cpp:127
+#: ../src/client.cpp:1302
 #, c-format
-msgid "Guild %s quit requested."
-msgstr "Clan %s pidiendo salir."
+msgid "Invalid update host: %s"
+msgstr "Host de actualización inválido: %s"
 
-#: src/gui/socialwindow.cpp:137
-msgid "Member Invite to Guild"
-msgstr "Miembro invitado al clan."
+#: ../src/gui/inventorywindow.cpp:59 ../src/gui/windowmenu.cpp:56
+msgid "Inventory"
+msgstr "Inventario"
+
+#: ../src/keyboardconfig.cpp:71
+msgid "Inventory Window"
+msgstr "Ventana de inventario"
 
-#: src/gui/socialwindow.cpp:138
+#: ../src/localplayer.cpp:898
+#, fuzzy
+msgid "Inventory is full."
+msgstr "Servidor lleno."
+
+#: ../src/gui/socialwindow.cpp:331
+msgid "Invite"
+msgstr "Invitar"
+
+#: ../src/gui/popupmenu.cpp:130
 #, c-format
-msgid "Who would you like to invite to guild %s?"
-msgstr "A quién te gustaría invitar al clan %s?"
+msgid "Invite %s to join your guild"
+msgstr "Invitar a %s para unirse a tu clan"
 
-#: src/gui/socialwindow.cpp:147
-msgid "Leave Guild?"
-msgstr "Salir del clan?"
+#: ../src/gui/popupmenu.cpp:134
+#, c-format
+msgid "Invite %s to join your party"
+msgstr "Invitar a %s para su grupo"
 
-#: src/gui/socialwindow.cpp:148
+#: ../src/net/manaserv/guildhandler.cpp:97
+msgid "Invite sent."
+msgstr "Invitación enviada."
+
+#: ../src/gui/socialwindow.cpp:126
 #, c-format
-msgid "Are you sure you want to leave guild %s?"
-msgstr "Estás seguro de dejar el clan %s?"
+msgid "Invited user %s to guild %s."
+msgstr "Invita al jugador %s para su clan %s."
 
-#: src/gui/socialwindow.cpp:183
+#: ../src/gui/socialwindow.cpp:207 ../src/net/tmwa/partyhandler.cpp:330
 #, c-format
 msgid "Invited user %s to party."
 msgstr "Jugador %s invitado al grupo."
 
-#: src/gui/socialwindow.cpp:190
+#: ../src/net/tmwa/partyhandler.cpp:335
 #, c-format
-msgid "Party %s quit requested."
-msgstr "Grupo %s requisitado."
+msgid "Inviting failed, because you can't see a player called %s."
+msgstr "Imposible invitar por que no puedes ver al jugador %s."
+
+#: ../src/keyboardconfig.cpp:57 ../src/keyboardconfig.cpp:58
+#: ../src/keyboardconfig.cpp:59 ../src/keyboardconfig.cpp:60
+#: ../src/keyboardconfig.cpp:61 ../src/keyboardconfig.cpp:62
+#: ../src/keyboardconfig.cpp:63 ../src/keyboardconfig.cpp:64
+#: ../src/keyboardconfig.cpp:65 ../src/keyboardconfig.cpp:66
+#: ../src/keyboardconfig.cpp:67 ../src/keyboardconfig.cpp:68
+#, c-format
+msgid "Item Shortcut %d"
+msgstr "Atajo para el objeto %d"
 
-#: src/gui/socialwindow.cpp:200
-msgid "Member Invite to Party"
-msgstr "Invitación de un miembro al grupo"
+#: ../src/keyboardconfig.cpp:76
+msgid "Item Shortcut Window"
+msgstr "Ventana de atajos para objetos"
 
-#: src/gui/socialwindow.cpp:201
-#, c-format
-msgid "Who would you like to invite to party %s?"
-msgstr "A quién te gustaría invitar al grupo %s?"
+#: ../src/localplayer.cpp:901
+msgid "Item belongs to someone else."
+msgstr ""
 
-#: src/gui/socialwindow.cpp:210
-msgid "Leave Party?"
-msgstr "Salir del grupo?"
+#: ../src/localplayer.cpp:897
+msgid "Item is too far away"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:211
-#, c-format
-msgid "Are you sure you want to leave party %s?"
-msgstr "Estás seguro de que quieres salir del grupo %s?"
+#: ../src/localplayer.cpp:896
+msgid "Item is too heavy."
+msgstr ""
 
-#: src/gui/socialwindow.cpp:240
-msgid "Create Guild"
-msgstr "Crear clan"
+#: ../src/net/tmwa/gui/partytab.cpp:135 ../src/net/tmwa/partyhandler.cpp:202
+msgid "Item sharing disabled."
+msgstr "Compartir objetos desabilitado."
 
-#: src/gui/socialwindow.cpp:241 src/gui/socialwindow.cpp:565
-msgid "Create Party"
-msgstr "Crear grupo"
+#: ../src/net/tmwa/gui/partytab.cpp:132 ../src/net/tmwa/partyhandler.cpp:196
+msgid "Item sharing enabled."
+msgstr "Compartir objetos habilitado."
 
-#: src/gui/socialwindow.cpp:280 src/gui/windowmenu.cpp:64
-msgid "Social"
-msgstr "Social"
+#: ../src/net/tmwa/gui/partytab.cpp:138 ../src/net/tmwa/partyhandler.cpp:208
+msgid "Item sharing not possible."
+msgstr "No es posible el compartir objetos."
 
-#: src/gui/socialwindow.cpp:298
-msgid "Invite"
-msgstr "Invitar"
+#: ../src/net/tmwa/gui/partytab.cpp:141
+msgid "Item sharing unknown."
+msgstr "Compartir objetos desconocido."
 
-#: src/gui/socialwindow.cpp:299
-msgid "Leave"
-msgstr "Dejar"
+#: ../src/client.cpp:785
+#, fuzzy
+msgid "ItemDB: Error while loading "
+msgstr "Error mientras cargaba %s"
 
-#: src/gui/socialwindow.cpp:395
-#, c-format
-msgid "Accepted party invite from %s."
-msgstr "Aceptada la invitación de   %s."
+#: ../src/gui/statuswindow.cpp:159
+msgid "Job:"
+msgstr "Trabajo:"
 
-#: src/gui/socialwindow.cpp:401
+#: ../src/gui/statuswindow.cpp:158 ../src/gui/statuswindow.cpp:276
 #, c-format
-msgid "Rejected party invite from %s."
-msgstr "Cancelada la invitación de  %s."
+msgid "Job: %d"
+msgstr "Trabajo: %d"
 
-#: src/gui/socialwindow.cpp:414
-#, c-format
-msgid "Accepted guild invite from %s."
-msgstr "Aceptada la invitación a la guild de  %s."
+#: ../src/net/manaserv/partyhandler.cpp:87
+msgid "Joined party."
+msgstr "Entraste al grupo."
 
-#: src/gui/socialwindow.cpp:420
-#, c-format
-msgid "Rejected guild invite from %s."
-msgstr "Cancelada la invitación a la guild de %s."
+#: ../src/gui/setup_joystick.cpp:41
+msgid "Joystick"
+msgstr "Joystick"
 
-#: src/gui/socialwindow.cpp:464
-#, c-format
-msgid "Creating guild called %s."
-msgstr "Creando clan llamado %s."
+#: ../src/gui/setup_keyboard.cpp:125
+msgid "Key Conflict(s) Detected."
+msgstr "Conflicto de teclas detectado."
 
-#: src/gui/socialwindow.cpp:478
-#, c-format
-msgid "Creating party called %s."
-msgstr "Creando grupo llamado %s."
+#: ../src/gui/setup_keyboard.cpp:77
+msgid "Keyboard"
+msgstr "Teclado"
 
-#: src/gui/socialwindow.cpp:485
-msgid "Guild Name"
-msgstr "Nombre del clan"
+#: ../src/net/tmwa/adminhandler.cpp:64
+msgid "Kick failed!"
+msgstr "Error al expulsar!"
 
-#: src/gui/socialwindow.cpp:486
-msgid "Choose your guild's name."
-msgstr "Escoja el nombre de su clan."
+#: ../src/gui/popupmenu.cpp:163
+msgid "Kick monster"
+msgstr "Expulsar monstruo"
 
-#: src/gui/socialwindow.cpp:498
-msgid "Received guild request, but one already exists."
-msgstr "Recibida petición de creación del clan, pero ya existe."
+#: ../src/gui/popupmenu.cpp:141
+msgid "Kick player"
+msgstr "Expulsar jugador"
 
-#: src/gui/socialwindow.cpp:503
-#, c-format
-msgid "%s has invited you to join the guild %s."
-msgstr "%s te ha invitado al clan %s."
+#: ../src/net/tmwa/adminhandler.cpp:66
+msgid "Kick succeeded!"
+msgstr "Expulsado satisfactoriamente!"
 
-#: src/gui/socialwindow.cpp:508
-msgid "Accept Guild Invite"
-msgstr "Aceptar invitación al clan"
+#: ../src/gui/setup_video.cpp:131
+msgid "Large"
+msgstr "Grande"
 
-#: src/gui/socialwindow.cpp:520
-msgid "Received party request, but one already exists."
-msgstr "Recibida petición de creación del grupo, pero ya existe."
+#: ../src/gui/socialwindow.cpp:332
+msgid "Leave"
+msgstr "Dejar"
 
-#: src/gui/socialwindow.cpp:530
-msgid "You have been invited you to join a party."
-msgstr "Fuiste invitado a un grupo."
+#: ../src/gui/socialwindow.cpp:163
+msgid "Leave Guild?"
+msgstr "Salir del clan?"
 
-#: src/gui/socialwindow.cpp:534
-#, c-format
-msgid "You have been invited to join the %s party."
-msgstr "Has sido invitado para unirte al grupo %s."
+#: ../src/gui/socialwindow.cpp:242
+msgid "Leave Party?"
+msgstr "Salir del grupo?"
 
-#: src/gui/socialwindow.cpp:542
+#: ../src/gui/statuswindow.cpp:113 ../src/gui/statuswindow.cpp:215
+#: ../src/gui/statuswindow.cpp:263
 #, c-format
-msgid "%s has invited you to join their party."
-msgstr "%s te ha invitado a unirte a su grupo."
+msgid "Level: %d"
+msgstr "Nivel: %d"
 
-#: src/gui/socialwindow.cpp:547
-#, c-format
-msgid "%s has invited you to join the %s party."
-msgstr "%s te ha invitado para unirte al grupo %s."
+#: ../src/net/manaserv/chathandler.cpp:217
+msgid "Listing channels."
+msgstr "Lista de canales."
 
-#: src/gui/socialwindow.cpp:555
-msgid "Accept Party Invite"
-msgstr "Aceptar invitación al grupo"
+#: ../src/resources/userpalette.cpp:109
+msgid "Local Player Critical Hit"
+msgstr "Golpe Critico del jugador"
 
-#: src/gui/socialwindow.cpp:566
-msgid "Cannot create party. You are already in a party"
-msgstr "No se pudo crear un grupo. Ya estás en uno."
+#: ../src/resources/userpalette.cpp:107
+msgid "Local Player Hits Monster"
+msgstr "Cuando le atacas al monstruo"
 
-#: src/gui/socialwindow.cpp:571
-msgid "Party Name"
-msgstr "Nombre del grupo"
+#: ../src/resources/userpalette.cpp:111
+msgid "Local Player Miss"
+msgstr "Cuando fallas un ataque"
 
-#: src/gui/socialwindow.cpp:572
-msgid "Choose your party's name."
-msgstr "Escoja el nombre del grupo."
+#: ../src/gui/setup_video.cpp:220
+msgid "Log NPC dialogue"
+msgstr "Log dealogos con un NPC"
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:62
-msgid "Specials"
-msgstr "Especiales"
+#: ../src/client.cpp:688
+msgid "Logging in"
+msgstr "Acediendo a la cuenta"
 
-#: src/gui/specialswindow.cpp:174
-#, c-format
-msgid "Specials Set %d"
-msgstr "Especiales %d"
+#: ../src/gui/login.cpp:51 ../src/gui/login.cpp:63
+msgid "Login"
+msgstr "Login"
+
+#: ../src/net/manaserv/loginhandler.cpp:275
+msgid "Login attempt too soon after previous attempt."
+msgstr "Intento de conexión muy pronto tras intento previo."
+
+#: ../src/net/manaserv/beinghandler.cpp:297
+#: ../src/net/tmwa/playerhandler.cpp:114
+msgid "Looks like you got your head handed to you."
+msgstr "Parece que te tiraron tu cabeza a tus manos."
+
+#: ../src/net/tmwa/generalhandler.cpp:235
+msgid "Luck"
+msgstr "Suerte"
 
-#: src/gui/specialswindow.cpp:191
+#: ../src/net/tmwa/generalhandler.cpp:107
 #, c-format
-msgid "Special %d"
-msgstr "Especial %d"
+msgid "Luck %+d"
+msgstr "Suerte %+d"
 
-#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:247
+#: ../src/net/tmwa/charserverhandler.cpp:275
+msgid "Luck:"
+msgstr "Suerte:"
+
+#: ../src/gui/skilldialog.cpp:470
 #, c-format
-msgid "Level: %d"
+msgid "Lvl: %d"
 msgstr "Nivel: %d"
 
-#: src/gui/statuswindow.cpp:101 src/gui/statuswindow.cpp:211
+#: ../src/gui/skilldialog.cpp:459
 #, c-format
-msgid "Money: %s"
-msgstr "Dinero: %s"
+msgid "Lvl: %d (%+d)"
+msgstr "Nivel: %d (%+d)"
 
-#: src/gui/statuswindow.cpp:104
-msgid "HP:"
-msgstr "PV:"
+#: ../src/net/tmwa/generalhandler.cpp:239
+msgid "M.Attack"
+msgstr "Ataque M."
 
-#: src/gui/statuswindow.cpp:109
-msgid "Exp:"
-msgstr "Exp:"
+#: ../src/net/tmwa/generalhandler.cpp:240
+msgid "M.Defense"
+msgstr "Defensa M."
+
+#: ../src/resources/itemdb.cpp:313
+#, c-format
+msgid "MP %+d"
+msgstr "PM %+d"
 
-#: src/gui/statuswindow.cpp:114
+#: ../src/gui/statuswindow.cpp:130
 msgid "MP:"
 msgstr "PM:"
 
-#: src/gui/statuswindow.cpp:132 src/gui/statuswindow.cpp:219
+#: ../src/net/tmwa/chathandler.cpp:230
+msgid "MVP player."
+msgstr "Jugador VIP."
+
+#: ../src/gui/charcreatedialog.cpp:80 ../src/gui/register.cpp:90
+msgid "Male"
+msgstr "Hombre"
+
+#: ../src/gui/minimap.cpp:45 ../src/gui/minimap.cpp:86
+msgid "Map"
+msgstr "Mapa"
+
+#: ../src/gui/debugwindow.cpp:66 ../src/gui/debugwindow.cpp:108
 #, c-format
-msgid "Job: %d"
-msgstr "Trabajo: %d"
+msgid "Map: %s"
+msgstr "Mapa: %s"
 
-#: src/gui/statuswindow.cpp:133
-msgid "Job:"
-msgstr "Trabajo:"
+#: ../src/gui/buy.cpp:80 ../src/gui/sell.cpp:78
+#: ../src/gui/statuswindow.cpp:385 ../src/gui/statuswindow.cpp:463
+#: ../src/gui/statuswindow.cpp:497
+msgid "Max"
+msgstr "Máximo"
 
-#: src/gui/statuswindow.cpp:194
-msgid "HP"
-msgstr "PV"
+#: ../src/gui/setup_video.cpp:130
+msgid "Medium"
+msgstr "Media"
 
-#: src/gui/statuswindow.cpp:200
-msgid "MP"
-msgstr "PM"
+#: ../src/gui/socialwindow.cpp:153
+msgid "Member Invite to Guild"
+msgstr "Miembro invitado al clan."
 
-#: src/gui/statuswindow.cpp:206
-msgid "Exp"
-msgstr "Exp"
+#: ../src/gui/socialwindow.cpp:232
+msgid "Member Invite to Party"
+msgstr "Invitación de un miembro al grupo"
 
-#: src/gui/statuswindow.cpp:215
-msgid "Money"
-msgstr "Dinero"
+#: ../src/net/manaserv/guildhandler.cpp:204
+msgid "Member was promoted successfully."
+msgstr "Estado del miembro fue cambiado satisfactoriamente."
 
-#: src/gui/statuswindow.cpp:225
-msgid "Job"
-msgstr "Trabajo"
+#: ../src/net/tmwa/playerhandler.cpp:253 ../src/net/tmwa/playerhandler.cpp:293
+msgid "Message"
+msgstr "Mensaje"
 
-#: src/gui/statuswindow.cpp:229
-#, c-format
-msgid "Character points: %d"
-msgstr "Puntos del personaje: %d"
+#: ../src/commandhandler.cpp:479
+msgid "Message closes chat."
+msgstr "El mensaje cierra el chat."
+
+#: ../src/commandhandler.cpp:492
+msgid "Message now closes chat."
+msgstr "Mensaje ahora cierra el chat."
 
-#: src/gui/statuswindow.cpp:235
+#: ../src/keyboardconfig.cpp:74
+msgid "Minimap Window"
+msgstr "Ventana del minimapa"
+
+#: ../src/gui/debugwindow.cpp:67 ../src/gui/debugwindow.cpp:106
 #, c-format
-msgid "Correction points: %d"
-msgstr "Puntos de corrección: %d"
+msgid "Minimap: %s"
+msgstr "Minimapa: %s"
 
-#: src/gui/statuswindow.cpp:251
-msgid "Level"
-msgstr "Nivel"
+#: ../src/resources/userpalette.cpp:112
+msgid "Misses"
+msgstr "Muchos fallos al atacar"
 
-#: src/gui/storagewindow.cpp:59
-msgid "Storage"
-msgstr "Almacén"
+#: ../src/gui/statuswindow.cpp:114 ../src/gui/statuswindow.cpp:208
+#: ../src/gui/statuswindow.cpp:240
+#, c-format
+msgid "Money: %s"
+msgstr "Dinero: %s"
 
-#: src/gui/trade.cpp:52
-msgid "Propose trade"
-msgstr "Proponer el intercambio"
+#: ../src/resources/userpalette.cpp:104
+msgid "Monster Hits Player"
+msgstr "Cuando un monstruo te ataca"
 
-#: src/gui/trade.cpp:53
-msgid "Confirmed. Waiting..."
-msgstr "Confirmado. Esperando..."
+#: ../src/resources/userpalette.cpp:96
+msgid "Monsters"
+msgstr "Monstruos"
 
-#: src/gui/trade.cpp:54
-msgid "Agree trade"
-msgstr "Aceptar intercambio"
+#: ../src/keyboardconfig.cpp:40
+msgid "Move Down"
+msgstr "Mover para abajo"
 
-#: src/gui/trade.cpp:55
-msgid "Agreed. Waiting..."
-msgstr "Aceptado. Esperando..."
+#: ../src/keyboardconfig.cpp:41
+msgid "Move Left"
+msgstr "Izquierda"
 
-#: src/gui/trade.cpp:58
-msgid "Trade: You"
-msgstr "Intercambio: Tú"
+#: ../src/keyboardconfig.cpp:42
+msgid "Move Right"
+msgstr "Derecha"
 
-#: src/gui/trade.cpp:74 src/gui/trade.cpp:75
-msgid "Trade"
-msgstr "Intercambio"
+#: ../src/keyboardconfig.cpp:39
+msgid "Move Up"
+msgstr "Mover para arriba"
 
-#: src/gui/trade.cpp:77
-msgid "Add"
-msgstr "Anadir"
+#: ../src/gui/setup_audio.cpp:51
+msgid "Music volume"
+msgstr "Volumen de Música"
 
-#: src/gui/trade.cpp:99 src/gui/trade.cpp:135
+#: ../src/gui/debugwindow.cpp:65 ../src/gui/debugwindow.cpp:104
 #, c-format
-msgid "You get %s"
-msgstr "Tú recibes %s"
+msgid "Music: %s"
+msgstr "Música: %s"
 
-#: src/gui/trade.cpp:100
-msgid "You give:"
-msgstr "Tú das:"
+#: ../src/gui/npcdialog.cpp:73 ../src/gui/npcpostdialog.cpp:41
+msgid "NPC"
+msgstr "NPC"
 
-#: src/gui/trade.cpp:104
-msgid "Change"
-msgstr "Cambiar"
+#: ../src/resources/userpalette.cpp:95
+msgid "NPCs"
+msgstr "NPCs"
 
-#: src/gui/trade.cpp:275
-msgid "Failed adding item. You can not overlap one kind of item on the window."
-msgstr ""
-"Fallo al añadir objeto. No puedes añadir más de un mismo tipo de objeto en "
-"la ventana."
+#: ../src/gui/setup_players.cpp:58
+msgid "Name"
+msgstr "Nombre"
 
-#: src/gui/trade.cpp:318
-msgid "You don't have enough money."
-msgstr "No tienes dinero suficiente."
+#: ../src/gui/charcreatedialog.cpp:67 ../src/gui/login.cpp:54
+#: ../src/gui/register.cpp:67
+msgid "Name:"
+msgstr "Nombre:"
 
-#: src/gui/unregisterdialog.cpp:51
+#: ../src/gui/unregisterdialog.cpp:51
 #, c-format
 msgid "Name: %s"
 msgstr "Nombre: %s"
 
-#: src/gui/updatewindow.cpp:124
-msgid "Updating..."
-msgstr "Actualizando..."
-
-#: src/gui/updatewindow.cpp:142
-msgid "Connecting..."
-msgstr "Conectando..."
+#: ../src/gui/ministatus.cpp:236
+msgid "Need"
+msgstr "Necesitas"
 
-#: src/gui/updatewindow.cpp:145
-msgid "Play"
-msgstr "Jugar"
-
-#: src/gui/updatewindow.cpp:405
-msgid "##1  The update process is incomplete."
-msgstr "##3  El proceso de actualización esta incompleto."
+#: ../src/gui/widgets/channeltab.cpp:126
+msgid "Need a user to kick!"
+msgstr "Se necesita un usuario a expulsar!"
 
-#. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:407
-msgid "##1  It is strongly recommended that"
-msgstr "##1 Es altamente recomendado que"
+#: ../src/gui/widgets/channeltab.cpp:119
+msgid "Need a user to op!"
+msgstr "Se necesita un usuario para ser operador!"
 
-#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:409
-msgid "##1  you try again later."
-msgstr "##1 lo intentes de nuevo más tarde."
+#: ../src/game.cpp:386
+msgid "Network Error"
+msgstr "Error de conexión"
 
-#: src/gui/updatewindow.cpp:501
-msgid "Completed"
-msgstr "Completado"
+#: ../src/gui/setup_players.cpp:64
+msgid "Neutral"
+msgstr "Neutral"
 
-#: src/gui/widgets/channeltab.cpp:49
-msgid "/users > Lists the users in the current channel"
-msgstr "/users > Listas de usuarios en el canal"
+#: ../src/net/manaserv/loginhandler.cpp:149
+msgid "New email address incorrect."
+msgstr "Nuevo e-mail incorrecto."
 
-#: src/gui/widgets/channeltab.cpp:50
-msgid "/topic > Set the topic of the current channel"
-msgstr "/topic > Poner un tema en el canal"
+#: ../src/net/manaserv/loginhandler.cpp:118
+msgid "New password incorrect."
+msgstr "Nueva contraseña incorrecta."
 
-#: src/gui/widgets/channeltab.cpp:51
-msgid "/quit > Leave a channel"
-msgstr "/quit > Salir del canal"
+#: ../src/net/tmwa/loginhandler.cpp:92
+msgid "New password too short."
+msgstr "Nueva contrasena es muy corta."
 
-#: src/gui/widgets/channeltab.cpp:52
-msgid "/op > Make a user a channel operator"
-msgstr "/op > Hacer a un usuario operador del canal"
+#: ../src/gui/npcdialog.cpp:49
+msgid "Next"
+msgstr "Siguiente"
 
-#: src/gui/widgets/channeltab.cpp:53
-msgid "/kick > Kick a user from the channel"
-msgstr "/kick > Expulsar un usuario del canal"
+#: ../src/keyboardconfig.cpp:100
+msgid "Next Chat Tab"
+msgstr "Siguiente Pestaña De Chat"
 
-#: src/gui/widgets/channeltab.cpp:63
-msgid "Command: /users"
-msgstr "Comando: /users"
+#: ../src/gui/confirmdialog.cpp:43
+msgid "No"
+msgstr "No"
 
-#: src/gui/widgets/channeltab.cpp:64
-msgid "This command shows the users in this channel."
-msgstr "Mostrar los usuarios en este canal."
+#: ../src/commandhandler.cpp:407
+msgid "No <nick> was given."
+msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:68
-msgid "Command: /topic <message>"
-msgstr "Comando: /topic <mensaje>"
+#: ../src/net/manaserv/charhandler.cpp:141
+msgid "No empty slot."
+msgstr "Sin espacios"
 
-#: src/gui/widgets/channeltab.cpp:69
-msgid "This command sets the topic to <message>."
-msgstr "Este comando establece el tema a <mensaje> ."
+#: ../src/net/manaserv/charhandler.cpp:264
+msgid "No gameservers are available."
+msgstr "No hay servidores disponibles."
 
-#: src/gui/widgets/channeltab.cpp:73
-msgid "Command: /quit"
-msgstr "Comando: /quit"
+#: ../src/net/tmwa/generalhandler.cpp:135
+msgid "No servers available."
+msgstr "Servidores indiponibles."
 
-#: src/gui/widgets/channeltab.cpp:74
-msgid "This command leaves the current channel."
-msgstr "Salir del canal."
+#: ../src/gui/setup_video.cpp:157
+msgid "No text"
+msgstr "Sin texto"
 
-#: src/gui/widgets/channeltab.cpp:75
-msgid "If you're the last person in the channel, it will be deleted."
-msgstr "Si eres la última persona de este canal , será eliminado."
+#: ../src/net/manaserv/beinghandler.cpp:289
+#: ../src/net/tmwa/playerhandler.cpp:102
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+"No, niños. Tu jugador no murió realmente. Solo... eeeh... fue a un lugar "
+"mejor ."
 
-#: src/gui/widgets/channeltab.cpp:80
-msgid "Command: /op <nick>"
-msgstr "Comando: /op <nick>"
+#: ../src/gui/setup_video.cpp:271 ../src/gui/setup_video.cpp:526
+#: ../src/gui/setup_video.cpp:656
+msgid "None"
+msgstr "Nada"
 
-#: src/gui/widgets/channeltab.cpp:81
-msgid "This command makes <nick> a channel operator."
-msgstr "Hacer al jugador <nick> operador del canal."
+#: ../src/gui/recorder.cpp:91
+msgid "Not currently recording."
+msgstr "No se está grabando en este momento."
 
-#: src/gui/widgets/channeltab.cpp:84
-msgid "Channel operators can kick and op other users from the channel."
-msgstr ""
-"Los operadores pueden expulsar y hace operadores a otros jugadores en el "
-"canal."
+#: ../src/net/manaserv/charhandler.cpp:138
+#: ../src/net/manaserv/charhandler.cpp:219
+msgid "Not logged in."
+msgstr "No estás conectado."
 
-#: src/gui/widgets/channeltab.cpp:89
-msgid "Command: /kick <nick>"
-msgstr "Comando: /kick <nick>"
+#: ../src/net/tmwa/buysellhandler.cpp:109
+msgid "Nothing to sell."
+msgstr "Nada que vender."
 
-#: src/gui/widgets/channeltab.cpp:90
-msgid "This command makes <nick> leave the channel."
-msgstr "Expulsar <nick> del canal."
+#: ../src/gui/setup_audio.cpp:94
+msgid "Notice"
+msgstr "Anuncio"
 
-#: src/gui/widgets/channeltab.cpp:119
-msgid "Need a user to op!"
-msgstr "Se necesita un usuario para ser operador!"
+#: ../src/gui/itemamount.cpp:113 ../src/gui/okdialog.cpp:42
+#: ../src/gui/quitdialog.cpp:46 ../src/gui/textdialog.cpp:39
+#: ../src/gui/trade.cpp:72 ../src/gui/trade.cpp:74
+msgid "OK"
+msgstr "OK"
 
-#: src/gui/widgets/channeltab.cpp:126
-msgid "Need a user to kick!"
-msgstr "Se necesita un usuario a expulsar!"
+#: ../src/net/manaserv/loginhandler.cpp:152
+msgid "Old email address incorrect."
+msgstr "E-mail antiguo incorrecto."
 
-#: src/gui/widgets/chattab.cpp:118
-msgid "Global announcement:"
-msgstr "Anuncio global:"
+#: ../src/net/manaserv/loginhandler.cpp:121
+#: ../src/net/tmwa/loginhandler.cpp:89
+msgid "Old password incorrect."
+msgstr "Contrasena antigua incorrecta."
 
-#: src/gui/widgets/chattab.cpp:124
+#: ../src/net/tmwa/gamehandler.cpp:89
 #, c-format
-msgid "Global announcement from %s:"
-msgstr "Anuncio global de  %s:"
+msgid "Online users: %d"
+msgstr "Jugadores online: %d"
 
-#: src/gui/widgets/chattab.cpp:150
+#: ../src/gui/setup_video.cpp:212
+msgid "OpenGL"
+msgstr "OpenGL"
+
+#: ../src/commandhandler.h:31
 #, c-format
-msgid "%s whispers: %s"
-msgstr "%s envía mensaje privado: %s"
+msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr ""
+"Opciones para /%s son \"yes\" e \"no\", \"true\" e \"false\", \"1\" e \"0\"."
 
-#: src/gui/widgets/whispertab.cpp:51
-msgid "Cannot send empty chat!"
-msgstr "No puedes enviar un mensaje vacío!"
+#: ../src/main.cpp:47
+msgid "Options:"
+msgstr "Opciones:"
 
-#: src/gui/widgets/whispertab.cpp:70
-msgid "/ignore > Ignore the other player"
-msgstr "/ignore > Ignora al jugador"
+#: ../src/resources/userpalette.cpp:103
+msgid "Other Player Hits Monster"
+msgstr "Cuando atacan a otros montruos"
 
-#: src/gui/widgets/whispertab.cpp:71
-msgid "/unignore > Stop ignoring the other player"
-msgstr "/unignore > Parar de ignorar al jugador"
+#: ../src/resources/userpalette.cpp:92
+msgid "Other Players' Names"
+msgstr "Nombres de otros jugadores"
 
-#: src/gui/widgets/whispertab.cpp:72
-msgid "/close > Close the whisper tab"
-msgstr "/close > Cierra la pestaña de mensajes"
+#: ../src/gui/outfitwindow.cpp:68 ../src/gui/outfitwindow.cpp:141
+#: ../src/gui/outfitwindow.cpp:154
+#, c-format
+msgid "Outfit: %d"
+msgstr "Conjuntos: %d"
 
-#: src/gui/widgets/whispertab.cpp:82
-msgid "Command: /close"
-msgstr "Comando: /close"
+#: ../src/gui/inventorywindow.cpp:109 ../src/gui/outfitwindow.cpp:51
+msgid "Outfits"
+msgstr "Conjuntos"
 
-#: src/gui/widgets/whispertab.cpp:83
-msgid "This command closes the current whisper tab."
-msgstr "Este comando cierra la pestaña de mensajes actual"
+#: ../src/keyboardconfig.cpp:81
+msgid "Outfits Window"
+msgstr "Ventana de Conjuntos"
 
-#: src/gui/widgets/whispertab.cpp:87
-msgid "Command: /ignore"
-msgstr "Comando: /ignore"
+#: ../src/gui/setup_video.cpp:252
+msgid "Overhead text"
+msgstr "Texto sobrescrito"
 
-#: src/gui/widgets/whispertab.cpp:88
-msgid "This command ignores the other player regardless of current relations."
-msgstr ""
-"Este comando ignora a otro jugador independientemente de la relación actual "
-"con él."
+#: ../src/resources/userpalette.cpp:93
+msgid "Own Name"
+msgstr "Propio Nombre"
 
-#: src/gui/widgets/whispertab.cpp:94
-msgid "This command stops ignoring the other player if they are being ignored."
-msgstr "Este comando para de ignorar al jugador si había sido ignorado."
+#: ../src/gui/setup_video.cpp:606
+msgid "Particle Effect Settings Changed."
+msgstr "Configuración del efecto de las partículas cambiado."
 
-#: src/gui/windowmenu.cpp:54
-msgid "Status"
-msgstr "Status"
+#: ../src/resources/userpalette.cpp:99
+msgid "Particle Effects"
+msgstr "Efectos Particulares"
 
-#: src/gui/windowmenu.cpp:65
-msgid "Shortcut"
-msgstr "Atajo"
+#: ../src/gui/debugwindow.cpp:69 ../src/gui/debugwindow.cpp:111
+#, c-format
+msgid "Particle count: %d"
+msgstr "Recuento de partículas: %d"
 
-#: src/gui/worldselectdialog.cpp:71
-msgid "Select World"
-msgstr "Seleccionar Mundo"
+#: ../src/gui/setup_video.cpp:255
+msgid "Particle detail"
+msgstr "Detalle de partículas"
 
-#: src/gui/worldselectdialog.cpp:76
-msgid "Change Login"
-msgstr "Cambiar de Login"
+#: ../src/gui/debugwindow.cpp:116
+#, c-format
+msgid "Particle detail: %s"
+msgstr "Detalle de partícula: %s"
 
-#: src/gui/worldselectdialog.cpp:77
-msgid "Choose World"
-msgstr "Escojer Mundo"
+#: ../src/gui/setup_video.cpp:217
+msgid "Particle effects"
+msgstr "Efectos de partículas"
 
-#: src/keyboardconfig.cpp:40
-msgid "Move Up"
-msgstr "Mover para arriba"
+#: ../src/net/tmwa/gui/partytab.cpp:43
+msgid "Party"
+msgstr "Grupo"
 
-#: src/keyboardconfig.cpp:41
-msgid "Move Down"
-msgstr "Mover para abajo"
+#: ../src/gui/socialwindow.cpp:218
+#, c-format
+msgid "Party %s quit requested."
+msgstr "Grupo %s requisitado."
 
-#: src/keyboardconfig.cpp:42
-msgid "Move Left"
-msgstr "Izquierda"
+#: ../src/resources/userpalette.cpp:97
+msgid "Party Members"
+msgstr "Miembros del grupo"
 
-#: src/keyboardconfig.cpp:43
-msgid "Move Right"
-msgstr "Derecha"
+#: ../src/gui/socialwindow.cpp:625
+msgid "Party Name"
+msgstr "Nombre del grupo"
 
-#: src/keyboardconfig.cpp:44 src/net/ea/generalhandler.cpp:223
-msgid "Attack"
-msgstr "Atacar"
+#: ../src/commandhandler.cpp:448 ../src/net/tmwa/gui/partytab.cpp:109
+msgid "Party name is missing."
+msgstr "Falta el nombre del grupo."
 
-#: src/keyboardconfig.cpp:45
-msgid "Target & Attack"
-msgstr "Seleccionar & Atacar"
+#: ../src/net/tmwa/partyhandler.cpp:84
+msgid "Party successfully created."
+msgstr "Grupo creado."
 
-#: src/keyboardconfig.cpp:46
-msgid "Smilie"
-msgstr "Emoticono"
+#: ../src/gui/beingpopup.cpp:76
+#, c-format
+msgid "Party: %s"
+msgstr "Grupo: %s"
 
-#: src/keyboardconfig.cpp:47
-msgid "Talk"
-msgstr "Hablar"
+#: ../src/client.cpp:916
+msgid "Password Change"
+msgstr "Cambiar contraseña"
 
-#: src/keyboardconfig.cpp:48
-msgid "Stop Attack"
-msgstr "Parar el ataque"
+#: ../src/client.cpp:917
+msgid "Password changed successfully!"
+msgstr "Le contraseña se cambió correctamente!"
 
-#: src/keyboardconfig.cpp:49
-msgid "Target Monster"
-msgstr "Seleccionar Monstruo"
+#: ../src/gui/changepassworddialog.cpp:61 ../src/gui/login.cpp:55
+#: ../src/gui/register.cpp:68 ../src/gui/unregisterdialog.cpp:53
+msgid "Password:"
+msgstr "Contraseña:"
 
-#: src/keyboardconfig.cpp:50
-msgid "Target NPC"
-msgstr "Seleccionar NPC"
+#: ../src/gui/register.cpp:197
+msgid "Passwords do not match."
+msgstr "Las contraseñas no coinciden."
 
-#: src/keyboardconfig.cpp:51
-msgid "Target Player"
-msgstr "Seleccionar Jugador"
+#: ../src/gui/popupmenu.cpp:188
+#, c-format
+msgid "Pick up %s"
+msgstr "Coger %s"
 
-#: src/keyboardconfig.cpp:52
+#: ../src/keyboardconfig.cpp:51
 msgid "Pickup"
 msgstr "Coger"
 
-#: src/keyboardconfig.cpp:53
-msgid "Hide Windows"
-msgstr "Esconder ventanas"
+#: ../src/resources/userpalette.cpp:100
+msgid "Pickup Notification"
+msgstr "Aviso al cojer un objeto"
 
-#: src/keyboardconfig.cpp:54
-msgid "Sit"
-msgstr "Sentarse"
+#: ../src/gui/updatewindow.cpp:145
+msgid "Play"
+msgstr "Jugar"
 
-#: src/keyboardconfig.cpp:55
-msgid "Screenshot"
-msgstr "Imprimir pantalla"
+#: ../src/commandhandler.cpp:544
+msgid "Player already ignored!"
+msgstr "El jugador ya está ignorado!"
 
-#: src/keyboardconfig.cpp:56
-msgid "Enable/Disable Trading"
-msgstr "Habilitar/Desabilitar intercambios"
+#: ../src/commandhandler.cpp:553
+msgid "Player could not be ignored!"
+msgstr "El jugador no puede ser ignorado!"
 
-#: src/keyboardconfig.cpp:57
-msgid "Find Path to Mouse"
-msgstr "Encontrar Camino al Mouse"
+#: ../src/commandhandler.cpp:575
+msgid "Player could not be unignored!"
+msgstr "El jugador no puede ser devuelto al estado normal!"
 
-#: src/keyboardconfig.cpp:58 src/keyboardconfig.cpp:59
-#: src/keyboardconfig.cpp:60 src/keyboardconfig.cpp:61
-#: src/keyboardconfig.cpp:62 src/keyboardconfig.cpp:63
-#: src/keyboardconfig.cpp:64 src/keyboardconfig.cpp:65
-#: src/keyboardconfig.cpp:66 src/keyboardconfig.cpp:67
-#: src/keyboardconfig.cpp:68 src/keyboardconfig.cpp:69
-#, c-format
-msgid "Item Shortcut %d"
-msgstr "Atajo para el objeto %d"
+#: ../src/net/manaserv/charhandler.cpp:210
+msgid "Player deleted."
+msgstr "Personaje eliminado."
 
-#: src/keyboardconfig.cpp:70
-msgid "Help Window"
-msgstr "Ventana de ayuda"
+#: ../src/commandhandler.cpp:573
+msgid "Player no longer ignored!"
+msgstr "El jugador ha sido devuelto al estado normal!"
 
-#: src/keyboardconfig.cpp:71
-msgid "Status Window"
-msgstr "Ventana de status"
+#: ../src/commandhandler.cpp:551
+msgid "Player successfully ignored!"
+msgstr "Jugador ignorado!"
 
-#: src/keyboardconfig.cpp:72
-msgid "Inventory Window"
-msgstr "Ventana de inventario"
+#: ../src/commandhandler.cpp:568
+msgid "Player wasn't ignored!"
+msgstr "El jugador no estaba ignorado!"
 
-#: src/keyboardconfig.cpp:73
-msgid "Equipment Window"
-msgstr "Ventana de equipamento"
+#: ../src/gui/setup_players.cpp:237
+msgid "Players"
+msgstr "Jugadores"
 
-#: src/keyboardconfig.cpp:74
-msgid "Skill Window"
-msgstr "Ventana de habilidades"
+#: ../src/net/manaserv/chathandler.cpp:194
+#: ../src/net/manaserv/chathandler.cpp:277
+msgid "Players in this channel:"
+msgstr "Jugadores en este canal:"
 
-#: src/keyboardconfig.cpp:75
-msgid "Minimap Window"
-msgstr "Ventana del minimapa"
+#: ../src/gui/charcreatedialog.cpp:99 ../src/gui/charcreatedialog.cpp:257
+#, c-format
+msgid "Please distribute %d points"
+msgstr "Por favor distribuya %d puntos"
 
-#: src/keyboardconfig.cpp:76
-msgid "Chat Window"
-msgstr "Ventana de Chat"
+#: ../src/gui/charcreatedialog.cpp:262
+#, c-format
+msgid "Please remove %d points"
+msgstr "Por favor extraiga %d puntos de estado"
 
-#: src/keyboardconfig.cpp:77
-msgid "Item Shortcut Window"
-msgstr "Ventana de atajos para objetos"
+#: ../src/commandhandler.cpp:461 ../src/commandhandler.cpp:538
+#: ../src/commandhandler.cpp:560
+msgid "Please specify a name."
+msgstr "Por favor, especifique un nombre."
 
-#: src/keyboardconfig.cpp:78
-msgid "Setup Window"
-msgstr "Ventana de Configuración"
+#: ../src/gui/serverdialog.cpp:324
+msgid "Please type both the address and the port of a server."
+msgstr "Por favor especifique el nombre y el puerto del servidor."
 
-#: src/keyboardconfig.cpp:79
-msgid "Debug Window"
-msgstr "Ventana de Problemas"
+#: ../src/net/tmwa/specialhandler.cpp:214
+msgid "Poison had no effect..."
+msgstr "Veneno no tuvo ningún efecto..."
 
-#: src/keyboardconfig.cpp:80
-msgid "Social Window"
-msgstr "Ventana Social"
+#: ../src/gui/serverdialog.cpp:207
+msgid "Port:"
+msgstr "Puerto:"
 
-#: src/keyboardconfig.cpp:81
-msgid "Emote Shortcut Window"
-msgstr "Ventana de Emoticonos"
+#: ../src/gui/serverdialog.cpp:451
+msgid "Preparing download"
+msgstr "Preparando la descarga"
 
-#: src/keyboardconfig.cpp:82
-msgid "Outfits Window"
-msgstr "Ventana de Conjuntos"
+#: ../src/gui/chat.cpp:311
+#, c-format
+msgid "Present: %s; %d players are present."
+msgstr "Presentes: %s; %d jugadores estan presentes."
 
-#: src/keyboardconfig.cpp:83
-msgid "Wear Outfit"
-msgstr "Ponerse el conjunto"
+#: ../src/net/manaserv/beinghandler.cpp:303
+msgid "Press OK to respawn."
+msgstr "Pulsa OK para reaparecer."
 
-#: src/keyboardconfig.cpp:84
-msgid "Copy Outfit"
-msgstr "Copiar el conjunto"
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:78
+msgid "Press the button to start calibration"
+msgstr "Aprieta el botón para empezar a calibrar"
+
+#: ../src/keyboardconfig.cpp:99
+msgid "Previous Chat Tab"
+msgstr "Pestaña de Chat Anterior"
 
-#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86
-#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
+#: ../src/gui/buy.cpp:69 ../src/gui/buy.cpp:267 ../src/gui/sell.cpp:71
+#: ../src/gui/sell.cpp:288
 #, c-format
-msgid "Emote Shortcut %d"
-msgstr "Atajo para Emoticono %d"
+msgid "Price: %s / Total: %s"
+msgstr "Precio: %s / Total: %s"
 
-#: src/keyboardconfig.cpp:97
-msgid "Toggle Chat"
-msgstr "Cambiar de Chat"
+#: ../src/playerrelations.cpp:324
+msgid "Print '...'"
+msgstr "Imprimir '...'"
 
-#: src/keyboardconfig.cpp:98
-msgid "Scroll Chat Up"
-msgstr "Tirar el chat para arriba"
+#: ../src/gui/trade.cpp:53
+msgid "Propose trade"
+msgstr "Proponer el intercambio"
 
-#: src/keyboardconfig.cpp:99
-msgid "Scroll Chat Down"
-msgstr "Tirar el chat para abajo"
+#: ../src/gui/setup_colors.cpp:85 ../src/gui/setup_colors.cpp:86
+#: ../src/gui/setup_colors.cpp:332
+msgid "Pulse"
+msgstr "Pulso"
 
-#: src/keyboardconfig.cpp:100
-msgid "Previous Chat Tab"
-msgstr "Pestaña de Chat Anterior"
+#: ../src/gui/setup_players.cpp:231
+msgid "Put all whispers in tabs"
+msgstr "Mostrar nuevos susurros en pestañas"
 
-#: src/keyboardconfig.cpp:101
-msgid "Next Chat Tab"
-msgstr "Siguiente Pestaña De Chat"
+#: ../src/gui/buy.cpp:79 ../src/gui/quitdialog.cpp:40
+#: ../src/gui/quitdialog.cpp:42 ../src/gui/quitdialog.cpp:43
+#: ../src/gui/sell.cpp:77 ../src/gui/serverdialog.cpp:228
+#: ../src/keyboardconfig.cpp:102
+msgid "Quit"
+msgstr "Salir"
 
-#: src/keyboardconfig.cpp:102
-msgid "Select OK"
-msgstr "Seleccionar OK"
+#: ../src/gui/setup_colors.cpp:87 ../src/gui/setup_colors.cpp:88
+#: ../src/gui/setup_colors.cpp:333
+msgid "Rainbow"
+msgstr "Arcoiris"
 
-#: src/keyboardconfig.cpp:104
-msgid "Ignore input 1"
-msgstr "Ignorar input 1"
+#: ../src/gui/socialwindow.cpp:553
+msgid "Received guild request, but one already exists."
+msgstr "Recibida petición de creación del clan, pero ya existe."
 
-#: src/keyboardconfig.cpp:105
-msgid "Ignore input 2"
-msgstr "Ignorar input 2"
+#: ../src/gui/socialwindow.cpp:575
+msgid "Received party request, but one already exists."
+msgstr "Recibida petición de creación del grupo, pero ya existe."
+
+#: ../src/gui/recorder.h:38
+msgid "Recording..."
+msgstr "Grabando..."
+
+#: ../src/gui/setup_colors.cpp:109
+msgid "Red:"
+msgstr "Rojo:"
+
+#: ../src/gui/login.cpp:61 ../src/gui/register.cpp:58
+#: ../src/gui/register.cpp:73
+msgid "Register"
+msgstr "Registrar"
 
-#: src/keyboardconfig.cpp:184
+#: ../src/gui/login.cpp:129
+msgid "Registration disabled"
+msgstr "Registro desabilitado."
+
+#: ../src/net/tmwa/loginhandler.cpp:165
+msgid "Rejected from server."
+msgstr "Rechazado del servidor."
+
+#: ../src/gui/socialwindow.cpp:468
+#, fuzzy
+msgid "Rejected guild invite."
+msgstr "El jugador cancel la invitacion a tu guild."
+
+#: ../src/gui/socialwindow.cpp:450
 #, c-format
-msgid ""
-"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
-"strange behaviour."
-msgstr ""
-"Conflito con las teclas \"%s\" e \"%s\" . Resuelva el conflicto, o el juego "
-"puede presentar un comportamiento raro."
+msgid "Rejected party invite from %s."
+msgstr "Cancelada la invitación de  %s."
 
-#: src/localplayer.cpp:914
-msgid "Unable to pick up item."
-msgstr "Imposible coger el objeto."
+#: ../src/gui/setup_players.cpp:59
+msgid "Relation"
+msgstr "Relación"
+
+#: ../src/gui/login.cpp:60
+msgid "Remember username"
+msgstr "Recordar nombre de usuario"
+
+#: ../src/net/manaserv/tradehandler.cpp:115
+#: ../src/net/tmwa/tradehandler.cpp:109
+msgid "Request for Trade"
+msgstr "Propuesta de intercambio"
+
+#: ../src/net/tmwa/gamehandler.cpp:102
+msgid "Request to quit denied!"
+msgstr "Petición de salida denegada!"
+
+#: ../src/client.cpp:809
+msgid "Requesting characters"
+msgstr "Cargando jugadores"
 
-#. TRANSLATORS: This sentence may be translated differently
-#. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:923
+#: ../src/client.cpp:889
+msgid "Requesting registration details"
+msgstr "Detalles de registración"
+
+#: ../src/commandhandler.cpp:435
 #, c-format
-msgid "You picked up %d [@@%d|%s@@]."
-msgid_plural "You picked up %d [@@%d|%s@@]."
-msgstr[0] "Usted cogió un/a %d [@@%d|%s@@]."
-msgstr[1] "Usted Cogió %d [@@%d|%s@@]."
+msgid "Requesting to join channel %s."
+msgstr "Solicitando la entrada del canal %s."
 
-#: src/main.cpp:43
-msgid "mana [options] [mana-file]"
-msgstr "mana  [opciones] [archivo-mana]"
+#: ../src/gui/npcdialog.cpp:134
+msgid "Reset"
+msgstr "Resetear"
 
-#: src/main.cpp:44
-msgid "Options:"
-msgstr "Opciones:"
+#: ../src/gui/setup.cpp:51
+msgid "Reset Windows"
+msgstr "Restaurar Ventanas"
 
-#: src/main.cpp:45
-msgid "  -v --version        : Display the version"
-msgstr "  -v --version        :  Muestra la versión"
+#: ../src/gui/setup_video.cpp:438
+msgid "Restart needed for changes to take effect."
+msgstr "Reinicio necesario para que los cambios tengan su efecto."
 
-#: src/main.cpp:46
-msgid "  -h --help           : Display this help"
-msgstr "  -h --help           : Muestra la ayuda"
+#: ../src/gui/setup_video.cpp:571 ../src/gui/setup_video.cpp:576
+msgid "Restart your client for the change to take effect."
+msgstr "Reincie el juego para que los cambios tengan efecto."
 
-#: src/main.cpp:47
-msgid "  -C --config-dir     : Configuration directory to use"
-msgstr "  -C --config-dir     : Carpeta de Configuración a usar"
+#: ../src/gui/inventorywindow.cpp:132 ../src/gui/popupmenu.cpp:385
+msgid "Retrieve"
+msgstr "Retirar"
 
-#: src/main.cpp:48
-msgid "  -U --username       : Login with this username"
-msgstr "  -U --username       : Acceder con este nombre de usuario"
+#: ../src/commandhandler.cpp:488
+msgid "Return now toggles chat."
+msgstr "Volver ahora a cambiar de chat."
 
-#: src/main.cpp:49
-msgid "  -P --password       : Login with this password"
-msgstr "  -P --password       : Acceder con la contraseña"
+#: ../src/commandhandler.cpp:479
+msgid "Return toggles chat."
+msgstr "Volver a alternar el chat."
 
-#: src/main.cpp:50
-msgid "  -c --character      : Login with this character"
-msgstr "  -c --character      : Acceder con este jugador"
+#: ../src/gui/setup_joystick.cpp:84
+msgid "Rotate the stick"
+msgstr "Gira el stick"
 
-#: src/main.cpp:51
-msgid "  -s --server         : Login server name or IP"
-msgstr "  -s --server         :  Login server o IP"
+#: ../src/net/manaserv/beinghandler.cpp:295
+#: ../src/net/tmwa/playerhandler.cpp:110
+msgid "Sadly, no trace of you was ever found..."
+msgstr "Desgraciadamente, nada de ti fue encontrado..."
 
-#: src/main.cpp:52
-msgid "  -p --port           : Login server port"
-msgstr "  -p --port           : Puerto del servidor"
+#: ../src/game.cpp:354
+msgid "Saving screenshot failed!"
+msgstr "Fallo al guardar screenshot!"
 
-#: src/main.cpp:53
-msgid "     --update-host    : Use this update host"
-msgstr "     --update-host    : Usar este host de actualización"
+#: ../src/gui/setup_video.cpp:570 ../src/gui/setup_video.cpp:575
+msgid "Screen Resolution Changed"
+msgstr "Resolución de pantalla cambiada"
 
-#: src/main.cpp:54
-msgid "  -D --default        : Choose default character server and character"
-msgstr "  -D --default        : Escoje el personaje por defecto y el servidor"
+#: ../src/keyboardconfig.cpp:54
+msgid "Screenshot"
+msgstr "Imprimir pantalla"
 
-#: src/main.cpp:56
-msgid "  -u --skip-update    : Skip the update downloads"
-msgstr "  -u --skip-update    : Saltarse las actualizaciones"
+#: ../src/game.cpp:349
+msgid "Screenshot saved as "
+msgstr "Screenshot guardada como"
 
-#: src/main.cpp:57
-msgid "  -d --data           : Directory to load game data from"
-msgstr "  -d --data           : Carpeta por donde cargar los datos del juego"
+#: ../src/keyboardconfig.cpp:98
+msgid "Scroll Chat Down"
+msgstr "Tirar el chat para abajo"
 
-#: src/main.cpp:58
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
-msgstr "  -L --localdata-dir  : Carpeta para usar los datos locales"
+#: ../src/keyboardconfig.cpp:97
+msgid "Scroll Chat Up"
+msgstr "Tirar el chat para arriba"
 
-#: src/main.cpp:59
-msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr "     --screenshot-dir : Carpeta donde guardar los screenshots"
+#: ../src/gui/inventorywindow.cpp:87
+msgid "Search:"
+msgstr ""
 
-#: src/main.cpp:61
-msgid "     --no-opengl      : Disable OpenGL for this session"
-msgstr "     --no-opengl      :  Deshabilita OpenGL en esta sesion"
+#: ../src/net/tmwa/specialhandler.cpp:184
+msgid "Seems you need more money... ;-)"
+msgstr "Parece que necesitas más dinero... ;-)"
 
-#: src/net/ea/adminhandler.cpp:63
-msgid "Kick failed!"
-msgstr "Error al expulsar!"
+#: ../src/keyboardconfig.cpp:101
+msgid "Select OK"
+msgstr "Seleccionar OK"
 
-#: src/net/ea/adminhandler.cpp:65
-msgid "Kick succeeded!"
-msgstr "Expulsado satisfactoriamente!"
+#: ../src/gui/worldselectdialog.cpp:71
+msgid "Select World"
+msgstr "Seleccionar Mundo"
 
-#: src/net/ea/buysellhandler.cpp:110
-msgid "Nothing to sell."
-msgstr "Nada que vender."
+#: ../src/gui/itemamount.cpp:144
+msgid "Select amount of items to drop."
+msgstr "Selecionar cantidad de objetos a tirar."
 
-#: src/net/ea/buysellhandler.cpp:117
-msgid "Thanks for buying."
-msgstr "Gracias por comprar."
+#: ../src/gui/itemamount.cpp:150
+msgid "Select amount of items to retrieve."
+msgstr "Selecciona la cantidad de objetos a retirar."
 
-#: src/net/ea/buysellhandler.cpp:124
-msgid "Unable to buy."
-msgstr "Imposible comprar."
+#: ../src/gui/itemamount.cpp:153
+msgid "Select amount of items to split."
+msgstr "Selecionar la cantidad de objetos para dividir."
 
-#: src/net/ea/buysellhandler.cpp:130
-msgid "Thanks for selling."
-msgstr "Gracias por vender."
+#: ../src/gui/itemamount.cpp:147
+msgid "Select amount of items to store."
+msgstr "Seleccione la cantidad de objetos a almacenar."
 
-#: src/net/ea/buysellhandler.cpp:132
-msgid "Unable to sell."
-msgstr "Imposible vender."
+#: ../src/gui/itemamount.cpp:141
+msgid "Select amount of items to trade."
+msgstr "Selecionar la cantidad de objetos a intercambiar."
 
-#: src/net/ea/charserverhandler.cpp:103
-msgid "Access denied."
-msgstr "Acesso denegado."
+#: ../src/net/manaserv/charhandler.cpp:222
+msgid "Selection out of range."
+msgstr "Seleccion fuera de rango."
 
-#: src/net/ea/charserverhandler.cpp:106
-msgid "Cannot use this ID."
-msgstr "Imposible usar esta ID."
+#: ../src/gui/buysell.cpp:47 ../src/gui/sell.cpp:49 ../src/gui/sell.cpp:76
+msgid "Sell"
+msgstr "Vender"
 
-#: src/net/ea/charserverhandler.cpp:109
-msgid "Unknown failure to select character."
-msgstr "Error desconocido al seleccionar este jugador."
+#: ../src/gui/npcpostdialog.cpp:54
+msgid "Send"
+msgstr "Enviar"
 
-#: src/net/ea/charserverhandler.cpp:135
-msgid "Failed to create character. Most likely the name is already taken."
-msgstr "Error al crear personaje. Probablemente ya esté en uso."
+#: ../src/net/tmwa/loginhandler.cpp:182
+msgid "Server overpopulated."
+msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:147 src/net/manaserv/charhandler.cpp:187
-msgid "Info"
-msgstr "Información"
+#: ../src/net/net.cpp:164
+msgid "Server protocol unsupported"
+msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:147
-msgid "Character deleted."
-msgstr "Personaje Borrado."
+#: ../src/gui/serverdialog.cpp:208
+msgid "Server type:"
+msgstr "Tipo de servidor:"
 
-#: src/net/ea/charserverhandler.cpp:152
-msgid "Failed to delete character."
-msgstr "Fallo al borrar el personaje."
+#: ../src/gui/serverdialog.cpp:206 ../src/gui/widgets/chattab.cpp:142
+msgid "Server:"
+msgstr "Servidor:"
 
-#: src/net/ea/charserverhandler.cpp:237 src/net/manaserv/charhandler.cpp:263
-msgid "Strength:"
-msgstr "Fuerza:"
+#: ../src/client.cpp:580 ../src/gui/setup.cpp:43 ../src/gui/windowmenu.cpp:66
+msgid "Setup"
+msgstr "Configuración"
 
-#: src/net/ea/charserverhandler.cpp:238 src/net/manaserv/charhandler.cpp:264
-msgid "Agility:"
-msgstr "Agilidad:"
+#: ../src/keyboardconfig.cpp:77
+msgid "Setup Window"
+msgstr "Ventana de Configuración"
 
-#: src/net/ea/charserverhandler.cpp:239 src/net/manaserv/charhandler.cpp:266
-msgid "Vitality:"
-msgstr "Vitalidad:"
+#: ../src/gui/setup_audio.cpp:50
+msgid "Sfx volume"
+msgstr "Volumen Sfx"
 
-#: src/net/ea/charserverhandler.cpp:240 src/net/manaserv/charhandler.cpp:267
-msgid "Intelligence:"
-msgstr "Inteligencia:"
+#: ../src/gui/buysell.cpp:38
+msgid "Shop"
+msgstr "Tienda"
 
-#: src/net/ea/charserverhandler.cpp:241 src/net/manaserv/charhandler.cpp:265
-msgid "Dexterity:"
-msgstr "Destreza:"
+#: ../src/gui/windowmenu.cpp:65
+msgid "Shortcut"
+msgstr "Atajo"
 
-#: src/net/ea/charserverhandler.cpp:242
-msgid "Luck:"
-msgstr "Suerte:"
+#: ../src/commandhandler.cpp:505 ../src/commandhandler.cpp:514
+msgid "Show IP: Off"
+msgstr "Mostrar IP: Cancelado"
 
-#: src/net/ea/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
-msgstr "Imposible enviar mensaje, usuario desconectado."
+#: ../src/commandhandler.cpp:505 ../src/commandhandler.cpp:518
+msgid "Show IP: On"
+msgstr "Mostrar IP: Activado"
 
-#: src/net/ea/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
-msgstr "Imposible enviar mensaje, estás ignorado por el otro jugador."
+#: ../src/gui/setup_video.cpp:246
+#, fuzzy
+msgid "Show damage"
+msgstr "mostrar nombre"
 
-#: src/net/ea/chathandler.cpp:171
-msgid "MVP player."
-msgstr "Jugador VIP."
+#: ../src/gui/setup_players.cpp:233
+msgid "Show gender"
+msgstr "Mostrar género (del personaje)"
 
-#: src/net/ea/chathandler.cpp:204 src/net/ea/chathandler.cpp:210
-#: src/net/ea/chathandler.cpp:215 src/net/ea/chathandler.cpp:220
-#: src/net/ea/chathandler.cpp:225 src/net/ea/chathandler.cpp:230
-#: src/net/ea/chathandler.cpp:235 src/net/ea/chathandler.cpp:240
-msgid "Channels are not supported!"
-msgstr "Canales no son soportados!"
+#: ../src/gui/setup_video.cpp:219
+msgid "Show own name"
+msgstr "Mostrar nombre propio"
 
-#: src/net/ea/gamehandler.cpp:86
-#, c-format
-msgid "Online users: %d"
-msgstr "Jugadores online: %d"
+#: ../src/gui/setup_video.cpp:221
+msgid "Show pickup notification"
+msgstr "Mostrar aviso al coger algo"
 
-#: src/net/ea/gamehandler.cpp:100
-msgid "Game"
-msgstr "Juego"
+#: ../src/keyboardconfig.cpp:53
+msgid "Sit"
+msgstr "Sentarse"
 
-#: src/net/ea/gamehandler.cpp:100
-msgid "Request to quit denied!"
-msgstr "Petición de salida denegada!"
+#: ../src/net/tmwa/specialhandler.cpp:151
+msgid "Sit failed!"
+msgstr "Fallo al sentarse!"
 
-#: src/net/ea/generalhandler.cpp:102 src/net/manaserv/generalhandler.cpp:95
+#: ../src/gui/skilldialog.cpp:377
 #, c-format
-msgid "Strength %+d"
-msgstr "Fuerza %+d"
+msgid "Skill %d"
+msgstr "Habilidad %d"
 
-#: src/net/ea/generalhandler.cpp:103 src/net/manaserv/generalhandler.cpp:96
+#: ../src/gui/skilldialog.cpp:368
 #, c-format
-msgid "Agility %+d"
-msgstr "Agilidad %+d"
+msgid "Skill Set %d"
+msgstr "Habilidades %d"
 
-#: src/net/ea/generalhandler.cpp:104 src/net/manaserv/generalhandler.cpp:98
-#, c-format
-msgid "Vitality %+d"
-msgstr "Vitalidad %+d"
+#: ../src/keyboardconfig.cpp:73
+msgid "Skill Window"
+msgstr "Ventana de habilidades"
 
-#: src/net/ea/generalhandler.cpp:105 src/net/manaserv/generalhandler.cpp:99
+#: ../src/gui/skilldialog.cpp:273
 #, c-format
-msgid "Intelligence %+d"
-msgstr "Inteligencia %+d"
+msgid "Skill points available: %d"
+msgstr "Puntos de habilidades: %d"
 
-#: src/net/ea/generalhandler.cpp:106 src/net/manaserv/generalhandler.cpp:97
-#, c-format
-msgid "Dexterity %+d"
-msgstr "Destreza %+d"
+#: ../src/gui/skilldialog.cpp:215 ../src/gui/windowmenu.cpp:59
+msgid "Skills"
+msgstr "Habilidades"
 
-#: src/net/ea/generalhandler.cpp:107
-#, c-format
-msgid "Luck %+d"
-msgstr "Suerte %+d"
+#: ../src/gui/inventorywindow.cpp:86
+msgid "Slots:"
+msgstr "Espacios:"
 
-#: src/net/ea/generalhandler.cpp:130
-msgid "Authentication failed."
-msgstr "Fallo en la autentificación."
+#: ../src/gui/setup_video.cpp:129
+msgid "Small"
+msgstr "Pequeño"
 
-#: src/net/ea/generalhandler.cpp:133
-msgid "No servers available."
-msgstr "Servidores indiponibles."
+#: ../src/keyboardconfig.cpp:45
+msgid "Smilie"
+msgstr "Emoticono"
+
+#: ../src/gui/socialwindow.cpp:312 ../src/gui/windowmenu.cpp:64
+msgid "Social"
+msgstr "Social"
+
+#: ../src/keyboardconfig.cpp:79
+msgid "Social Window"
+msgstr "Ventana Social"
 
-#: src/net/ea/generalhandler.cpp:137
+#: ../src/gui/setup_video.cpp:573
+msgid "Some windows may be moved to fit the lowered resolution."
+msgstr "Algunas ventanas deben ser movidas a una resolución más baja."
+
+#: ../src/net/tmwa/generalhandler.cpp:139
 msgid "Someone else is trying to use this account."
 msgstr "Alguien está intentando usar tu cuenta."
 
-#: src/net/ea/generalhandler.cpp:140
-msgid "This account is already logged in."
-msgstr "Ya hay alguien conectado con esta cuenta."
+#: ../src/gui/setup_audio.cpp:42
+msgid "Sound"
+msgstr "Sonido"
+
+#: ../src/gui/setup_audio.cpp:106
+msgid "Sound Engine"
+msgstr "Mecanismo de Sonido"
+
+#: ../src/gui/specialswindow.cpp:79 ../src/gui/windowmenu.cpp:62
+msgid "Specials"
+msgstr "Especiales"
+
+#: ../src/gui/setup_colors.cpp:89 ../src/gui/setup_colors.cpp:90
+#: ../src/gui/setup_colors.cpp:333
+msgid "Spectrum"
+msgstr "Espectro"
 
-#: src/net/ea/generalhandler.cpp:143
+#: ../src/net/tmwa/generalhandler.cpp:145
 msgid "Speed hack detected."
 msgstr "Hack de velocidad detectado."
 
-#: src/net/ea/generalhandler.cpp:146
-msgid "Duplicated login."
-msgstr "Login duplicado."
+#: ../src/gui/inventorywindow.cpp:108 ../src/gui/popupmenu.cpp:378
+msgid "Split"
+msgstr "Dividir"
 
-#: src/net/ea/generalhandler.cpp:149
-msgid "Unknown connection error."
-msgstr "Error de conexión desconocido."
+#: ../src/localplayer.cpp:899
+msgid "Stack is too big."
+msgstr ""
 
-#: src/net/ea/generalhandler.cpp:205
-msgid "Got disconnected from server!"
-msgstr "Desconectado del servidor!"
+#: ../src/gui/recorder.cpp:104
+msgid "Starting to record..."
+msgstr "Iniciando la grabación..."
 
-#: src/net/ea/generalhandler.cpp:216 src/net/manaserv/generalhandler.cpp:166
-msgid "Strength"
-msgstr "Fuerza"
+#: ../src/gui/setup_colors.cpp:83 ../src/gui/setup_colors.cpp:331
+msgid "Static"
+msgstr "Estático"
 
-#: src/net/ea/generalhandler.cpp:217 src/net/manaserv/generalhandler.cpp:167
-msgid "Agility"
-msgstr "Agilidad"
+#: ../src/gui/windowmenu.cpp:54
+msgid "Status"
+msgstr "Status"
 
-#: src/net/ea/generalhandler.cpp:218 src/net/manaserv/generalhandler.cpp:169
-msgid "Vitality"
-msgstr "Vitalidad"
+#: ../src/keyboardconfig.cpp:70
+msgid "Status Window"
+msgstr "Ventana de status"
 
-#: src/net/ea/generalhandler.cpp:219 src/net/manaserv/generalhandler.cpp:170
-msgid "Intelligence"
-msgstr "Inteligencia"
+#: ../src/gui/setup_joystick.cpp:83
+msgid "Stop"
+msgstr "Parar"
 
-#: src/net/ea/generalhandler.cpp:220 src/net/manaserv/generalhandler.cpp:168
-msgid "Dexterity"
-msgstr "Destreza"
+#: ../src/keyboardconfig.cpp:47
+msgid "Stop Attack"
+msgstr "Parar el ataque"
 
-#: src/net/ea/generalhandler.cpp:221
-msgid "Luck"
-msgstr "Suerte"
+#: ../src/gui/recorder.h:39
+msgid "Stop recording"
+msgstr "Parar de grabar"
 
-#: src/net/ea/generalhandler.cpp:224
-msgid "Defense"
-msgstr "Defensa"
+#: ../src/gui/inventorywindow.cpp:59
+msgid "Storage"
+msgstr "Almacén"
 
-#: src/net/ea/generalhandler.cpp:225
-msgid "M.Attack"
-msgstr "Ataque M."
+#: ../src/gui/inventorywindow.cpp:131 ../src/gui/popupmenu.cpp:358
+msgid "Store"
+msgstr "Almacenar"
 
-#: src/net/ea/generalhandler.cpp:226
-msgid "M.Defense"
-msgstr "Defensa M."
+#: ../src/net/manaserv/attributes.cpp:166
+#: ../src/net/tmwa/generalhandler.cpp:230
+msgid "Strength"
+msgstr "Fuerza"
 
-#: src/net/ea/generalhandler.cpp:227
-msgid "% Accuracy"
-msgstr "% Puntería"
+#: ../src/net/manaserv/attributes.cpp:173
+#, fuzzy, c-format
+msgid "Strength %+.1f"
+msgstr "Fuerza %+d"
 
-#: src/net/ea/generalhandler.cpp:228
+#: ../src/net/tmwa/generalhandler.cpp:102
 #, c-format
-msgid "% Evade"
-msgstr "% Evasión"
+msgid "Strength %+d"
+msgstr "Fuerza %+d"
+
+#: ../src/net/tmwa/charserverhandler.cpp:270
+msgid "Strength:"
+msgstr "Fuerza:"
+
+#: ../src/gui/npcdialog.cpp:51
+msgid "Submit"
+msgstr "Enviar"
+
+#: ../src/gui/charselectdialog.cpp:131
+msgid "Switch Login"
+msgstr "Salir del Login"
+
+#: ../src/gui/quitdialog.cpp:45
+msgid "Switch character"
+msgstr "Cambiar de personaje"
+
+#: ../src/gui/quitdialog.cpp:44
+msgid "Switch server"
+msgstr "Cambiar de servidor"
+
+#: ../src/gui/setup_video.cpp:437
+msgid "Switching to Full Screen"
+msgstr "Cambiando a pantalla completa"
+
+#: ../src/keyboardconfig.cpp:46
+msgid "Talk"
+msgstr "Hablar"
 
-#: src/net/ea/generalhandler.cpp:229
+#: ../src/gui/popupmenu.cpp:150
 #, c-format
-msgid "% Critical"
-msgstr "% Crítico"
+msgid "Talk to %s"
+msgstr "Hablar con %s"
 
-#: src/net/ea/gui/guildtab.cpp:45
-msgid "Guild"
-msgstr "Clan"
+#: ../src/keyboardconfig.cpp:44
+msgid "Target & Attack"
+msgstr "Seleccionar & Atacar"
 
-#: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
-msgid "/help > Display this help."
-msgstr "/help > Para la ayuda."
+#: ../src/keyboardconfig.cpp:48
+msgid "Target Monster"
+msgstr "Seleccionar Monstruo"
 
-#: src/net/ea/gui/guildtab.cpp:62
-msgid "/invite > Invite a player to your guild"
-msgstr "/invite > Invita un jugador a tu clan"
+#: ../src/keyboardconfig.cpp:49
+msgid "Target NPC"
+msgstr "Seleccionar NPC"
 
-#: src/net/ea/gui/guildtab.cpp:63
-msgid "/leave > Leave the guild you are in"
-msgstr "/leave > Deja el clan en la que estas"
+#: ../src/keyboardconfig.cpp:50
+msgid "Target Player"
+msgstr "Seleccionar Jugador"
 
-#: src/net/ea/gui/guildtab.cpp:64
-msgid "/kick > Kick some one from the guild you are in"
-msgstr "/kick > Expulsa a alguien del clan en el que estás."
+#: ../src/gui/setup_video.cpp:158
+msgid "Text"
+msgstr "Texto"
 
-#: src/net/ea/gui/guildtab.cpp:73 src/net/ea/gui/partytab.cpp:73
-msgid "Command: /invite <nick>"
-msgstr "Comando: /invite <nick>"
+#: ../src/net/tmwa/buysellhandler.cpp:116
+msgid "Thanks for buying."
+msgstr "Gracias por comprar."
 
-#: src/net/ea/gui/guildtab.cpp:74
-msgid "This command invites <nick> to the guild you're in."
-msgstr "Este comando invita a <nick> para el clan en el que estás ."
+#: ../src/net/tmwa/buysellhandler.cpp:129
+msgid "Thanks for selling."
+msgstr "Gracias por vender."
 
-#: src/net/ea/gui/guildtab.cpp:80 src/net/ea/gui/partytab.cpp:80
-msgid "Command: /leave"
-msgstr "Comando: /leave"
+#: ../src/net/manaserv/beinghandler.cpp:287
+#: ../src/net/tmwa/playerhandler.cpp:99
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr "Las frías manos de la muerte se llevaron tu alma su reino."
 
-#: src/net/ea/gui/guildtab.cpp:81
-msgid "This command causes the player to leave the guild."
-msgstr "Este comando hace que dejes el clan."
+#: ../src/game.cpp:385
+msgid "The connection to the server was lost."
+msgstr "Se ha perdido la conexión del servidor."
 
-#: src/net/ea/gui/guildtab.cpp:89
-msgid "Guild name is missing."
-msgstr "Falta el nombre del clan."
+#: ../src/gui/changeemaildialog.cpp:141
+msgid "The email address entries mismatch."
+msgstr "Los e-mail son distintos."
 
-#: src/net/ea/guildhandler.cpp:293
-msgid "Could not inivte user to guild."
-msgstr "No se puede invitar jugadores al clan."
+#: ../src/net/manaserv/loginhandler.cpp:158
+msgid "The new email address already exists."
+msgstr "El nuevo e-mail ya existe."
 
-#: src/net/ea/guildhandler.cpp:298
-msgid "User rejected guild invite."
-msgstr "El jugador cancel la invitacion a tu guild."
+#: ../src/gui/changeemaildialog.cpp:127
+#, c-format
+msgid "The new email address needs to be at least %d characters long."
+msgstr "El nuevo email debe tener como mínimo %d caracteres."
 
-#: src/net/ea/guildhandler.cpp:303
-msgid "User is now part of your guild."
-msgstr "El usuario es ahora de tu clan."
+#: ../src/gui/changeemaildialog.cpp:134
+#, c-format
+msgid "The new email address needs to be less than %d characters long."
+msgstr "El nuevo email debe tener como máximo %d caracteres."
 
-#: src/net/ea/guildhandler.cpp:308
-msgid "Your guild is full."
-msgstr "Tu clan está lleno."
+#: ../src/gui/changepassworddialog.cpp:130
+msgid "The new password entries mismatch."
+msgstr "Las nuevas contraseñas no concuerdan."
 
-#: src/net/ea/guildhandler.cpp:313
-msgid "Unknown guild invite response."
-msgstr "Invitación desconocida a una guild."
+#: ../src/gui/changepassworddialog.cpp:116
+#, c-format
+msgid "The new password needs to be at least %d characters long."
+msgstr "La nueva contraseña debe tener como mínimo %d caracteres."
 
-#: src/net/ea/guildhandler.cpp:390
-msgid "Guild creation isn't supported yet."
-msgstr "La creación de guilds no esta soportada."
+#: ../src/gui/changepassworddialog.cpp:123
+#, c-format
+msgid "The new password needs to be less than %d characters long."
+msgstr "La nueva contraseña debe tener como máximo %d caracteres."
 
-#: src/net/ea/gui/partytab.cpp:43
-msgid "Party"
-msgstr "Grupo"
+#: ../src/gui/register.cpp:182 ../src/gui/unregisterdialog.cpp:117
+#, c-format
+msgid "The password needs to be at least %d characters long."
+msgstr "La contraseña debe tener al menos %d caracteres."
 
-#: src/net/ea/gui/partytab.cpp:60
-msgid "/invite > Invite a player to your party"
-msgstr "/invite > Invita un jugador a tu grupo"
+#: ../src/gui/register.cpp:190 ../src/gui/unregisterdialog.cpp:124
+#, c-format
+msgid "The password needs to be less than %d characters long."
+msgstr "La contraseña debe tener como mínimo %d caracteres."
 
-#: src/net/ea/gui/partytab.cpp:61
-msgid "/leave > Leave the party you are in"
-msgstr "/leave > Salir del grupo en el que estás"
+#: ../src/gui/register.cpp:166
+#, c-format
+msgid "The username needs to be at least %d characters long."
+msgstr "El nombre debe tener como mínimo %d caracteres."
 
-#: src/net/ea/gui/partytab.cpp:62
-msgid "/kick > Kick some one from the party you are in"
-msgstr "/kick > Expulsa a alguien del grupo en el que estás"
+#: ../src/gui/register.cpp:174
+#, c-format
+msgid "The username needs to be less than %d characters long."
+msgstr "El nombre debe tener menos de  %d caracteres."
 
-#: src/net/ea/gui/partytab.cpp:63
-msgid "/item > Show/change party item sharing options"
-msgstr "/item > Mostrar/Cambiar el compartir objetos en el grupo"
+#: ../src/net/tmwa/generalhandler.cpp:142
+msgid "This account is already logged in."
+msgstr "Ya hay alguien conectado con esta cuenta."
 
-#: src/net/ea/gui/partytab.cpp:64
-msgid "/exp > Show/change party experience sharing options"
-msgstr "/exp > Mostrar/Modificar el compartir experiencia en el grupo "
+#: ../src/net/tmwa/gui/guildtab.cpp:81
+msgid "This command causes the player to leave the guild."
+msgstr "Este comando hace que dejes el clan."
 
-#: src/net/ea/gui/partytab.cpp:81
+#: ../src/net/tmwa/gui/partytab.cpp:81
 msgid "This command causes the player to leave the party."
 msgstr "Este comando hace que dejes el grupo."
 
-#: src/net/ea/gui/partytab.cpp:85
-msgid "Command: /item <policy>"
-msgstr "Comando> /item <policy>"
+#: ../src/net/tmwa/gui/partytab.cpp:96
+msgid "This command changes the party's experience sharing policy."
+msgstr "Este comando cambia la opción de compartir experiencia del grupo."
 
-#: src/net/ea/gui/partytab.cpp:86
+#: ../src/net/tmwa/gui/partytab.cpp:86
 msgid "This command changes the party's item sharing policy."
 msgstr "Este comando cambia el compatir objetos en el grupo."
 
-#: src/net/ea/gui/partytab.cpp:87
-msgid ""
-"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
-"\"0\", \"no\", \"false\" to disable item sharing."
-msgstr ""
-"<policy> puede ser \"1\", \"yes\" y \"true\" para habilitar el compartir "
-"objetos, o \"0\", \"no\" y \"false\" para deshabilitar."
+#: ../src/commandhandler.cpp:274
+msgid "This command clears the away status and message."
+msgstr "Este comando limpia el status y los mensajes \"away\"."
 
-#: src/net/ea/gui/partytab.cpp:90
-msgid "Command: /item"
-msgstr "Comando: /item"
+#: ../src/commandhandler.cpp:228
+msgid "This command clears the chat log of previous chat."
+msgstr "Este comando limpia la pestaña actual del chat previo."
 
-#: src/net/ea/gui/partytab.cpp:91
-msgid "This command displays the party's current item sharing policy."
-msgstr "Este comando muestra el actual estado de compartir objetos en el grupo"
+#: ../src/gui/widgets/whispertab.cpp:85
+msgid "This command closes the current whisper tab."
+msgstr "Este comando cierra la pestaña de mensajes actual"
 
-#: src/net/ea/gui/partytab.cpp:95
-msgid "Command: /exp <policy>"
-msgstr "Comando: /exp <policy>"
+#: ../src/commandhandler.cpp:279
+msgid "This command creates a new party called <name>."
+msgstr "Este comando crea un nuevo grupo llamado <nombre>."
 
-#: src/net/ea/gui/partytab.cpp:96
-msgid "This command changes the party's experience sharing policy."
-msgstr "Este comando cambia la opción de compartir experiencia del grupo."
+#: ../src/commandhandler.cpp:209
+msgid "This command displays a list of all commands available."
+msgstr "Para ver la lista de comandos disponibles."
 
-#: src/net/ea/gui/partytab.cpp:97
-msgid ""
-"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
-"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
-msgstr ""
-"<policy> puede ser \"1\", \"yes\" y \"true\" para habilitar compartir "
-"experiencia, o \"0\", \"no\" y \"false\" para deshabilitar."
+#: ../src/commandhandler.cpp:212
+msgid "This command displays help on <command>."
+msgstr "Para ver la ayuda en <comando>"
 
-#: src/net/ea/gui/partytab.cpp:100
-msgid "Command: /exp"
-msgstr "Comando: /exp"
+#: ../src/commandhandler.cpp:323
+msgid "This command displays the name of the current map."
+msgstr "Muestra el nombre del mapa actual."
 
-#: src/net/ea/gui/partytab.cpp:101
+#: ../src/commandhandler.cpp:328
+msgid "This command displays the number of players currently online."
+msgstr "Este comando muestra el número de jugadores que están en línea."
+
+#: ../src/net/tmwa/gui/partytab.cpp:101
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 "Este comando muestra el actual estado de compartir experiencia del grupo."
 
-#: src/net/ea/gui/partytab.cpp:132 src/net/ea/partyhandler.cpp:198
-msgid "Item sharing enabled."
-msgstr "Compartir objetos habilitado."
+#: ../src/net/tmwa/gui/partytab.cpp:91
+msgid "This command displays the party's current item sharing policy."
+msgstr "Este comando muestra el actual estado de compartir objetos en el grupo"
 
-#: src/net/ea/gui/partytab.cpp:135 src/net/ea/partyhandler.cpp:204
-msgid "Item sharing disabled."
-msgstr "Compartir objetos desabilitado."
+#: ../src/commandhandler.cpp:312
+msgid "This command displays the return toggle status."
+msgstr "Este comando muestra el estado de alternar retorno."
 
-#: src/net/ea/gui/partytab.cpp:138 src/net/ea/partyhandler.cpp:210
-msgid "Item sharing not possible."
-msgstr "No es posible el compartir objetos."
+#: ../src/commandhandler.cpp:301
+msgid "This command finishes a recording session."
+msgstr "Este comando termina una sesión de grabación."
 
-#: src/net/ea/gui/partytab.cpp:141
-msgid "Item sharing unknown."
-msgstr "Compartir objetos desconocido."
+#: ../src/commandhandler.cpp:291
+msgid ""
+"This command gets a list of players within hearing and sends it to either "
+"the record log if recording, or the chat log otherwise."
+msgstr ""
+"Este comando recibe una lista de los jugadores dentro de la audición y la "
+"envía ya sea a la entrada de registro cuando el registro del chat está "
+"activado o el registro de conversaciones (pestaña de chat) de otro modo."
 
-#: src/net/ea/gui/partytab.cpp:167 src/net/ea/partyhandler.cpp:174
-msgid "Experience sharing enabled."
-msgstr "Compartir experiencia activado."
+#: ../src/commandhandler.cpp:233
+msgid "This command ignores the given player regardless of current relations."
+msgstr ""
+"Este comando es para ignorar al jugador indicado, independientemente de la "
+"relación actual."
 
-#: src/net/ea/gui/partytab.cpp:170 src/net/ea/partyhandler.cpp:180
-msgid "Experience sharing disabled."
-msgstr "Compartir experiencia desactivado ."
+#: ../src/gui/widgets/whispertab.cpp:90
+msgid "This command ignores the other player regardless of current relations."
+msgstr ""
+"Este comando ignora a otro jugador independientemente de la relación actual "
+"con él."
 
-#: src/net/ea/gui/partytab.cpp:173 src/net/ea/partyhandler.cpp:186
-msgid "Experience sharing not possible."
-msgstr "Imposible compartir experiencia."
+#: ../src/commandhandler.cpp:284 ../src/net/tmwa/gui/partytab.cpp:74
+msgid "This command invites <nick> to party with you."
+msgstr "Este comando invita al jugador <nick> a formar parte de tu grupo."
 
-#: src/net/ea/gui/partytab.cpp:176
-msgid "Experience sharing unknown."
-msgstr "Compartir experiencia desconocido."
+#: ../src/net/tmwa/gui/guildtab.cpp:74
+msgid "This command invites <nick> to the guild you're in."
+msgstr "Este comando invita a <nick> para el clan en el que estás ."
 
-#: src/net/ea/inventoryhandler.cpp:281
-msgid "Failed to use item."
-msgstr "Fallo al usar el objeto."
+#: ../src/gui/widgets/channeltab.cpp:74
+msgid "This command leaves the current channel."
+msgstr "Salir del canal."
 
-#: src/net/ea/inventoryhandler.cpp:391
-msgid "Unable to equip."
-msgstr "Imposible equipar."
+#: ../src/gui/widgets/channeltab.cpp:81
+msgid "This command makes <nick> a channel operator."
+msgstr "Hacer al jugador <nick> operador del canal."
 
-#: src/net/ea/inventoryhandler.cpp:402
-msgid "Unable to unequip."
-msgstr "Imposible quitárselo."
+#: ../src/gui/widgets/channeltab.cpp:90
+msgid "This command makes <nick> leave the channel."
+msgstr "Expulsar <nick> del canal."
 
-#: src/net/ea/loginhandler.cpp:79
-msgid "Account was not found. Please re-login."
-msgstr "Cuenta no encontrada. Por favor conéctate de nuevo."
+#: ../src/commandhandler.cpp:239
+msgid "This command makes you enter <channel>."
+msgstr "Este comando te hace entrar en <canal>."
 
-#: src/net/ea/loginhandler.cpp:82 src/net/manaserv/loginhandler.cpp:121
-msgid "Old password incorrect."
-msgstr "Contrasena antigua incorrecta."
+#: ../src/commandhandler.cpp:222
+msgid "This command sends the message <msg> to all players currently online."
+msgstr ""
+"Este comando envía un mensaje <mensaje> para todos los jugadores online."
 
-#: src/net/ea/loginhandler.cpp:85
-msgid "New password too short."
-msgstr "Nueva contrasena es muy corta."
+#: ../src/commandhandler.cpp:257
+msgid "This command sends the text <message> to <nick>."
+msgstr "Este comando envía el texto <mensaje> para el jugador <nick>."
 
-#: src/net/ea/loginhandler.cpp:88 src/net/ea/loginhandler.cpp:175
-#: src/net/manaserv/charhandler.cpp:158 src/net/manaserv/loginhandler.cpp:96
-#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
-#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
-msgid "Unknown error."
-msgstr "Error desconocido."
+#: ../src/gui/widgets/channeltab.cpp:69
+msgid "This command sets the topic to <message>."
+msgstr "Este comando establece el tema a <mensaje> ."
 
-#: src/net/ea/loginhandler.cpp:149
-msgid "Unregistered ID."
-msgstr "ID no registrada."
+#: ../src/commandhandler.cpp:306
+msgid ""
+"This command sets whether the return key should toggle the chat log, or "
+"whether the chat log turns off automatically."
+msgstr ""
+"Este comando determina si la tecla de retorno debe cambiar el registro de "
+"charla, o si el registro de charla se apaga automáticamente."
 
-#: src/net/ea/loginhandler.cpp:152
-msgid "Wrong password."
-msgstr "Contrasena incorrecta."
+#: ../src/commandhandler.cpp:245
+msgid "This command shows a list of all channels."
+msgstr "Este comando muestra una lista con todos los canales."
 
-#: src/net/ea/loginhandler.cpp:155
-msgid "Account expired."
-msgstr "La cuenta expiró."
+#: ../src/gui/widgets/channeltab.cpp:64
+msgid "This command shows the users in this channel."
+msgstr "Mostrar los usuarios en este canal."
 
-#: src/net/ea/loginhandler.cpp:158
-msgid "Rejected from server."
-msgstr "Rechazado del servidor."
+#: ../src/commandhandler.cpp:298
+msgid "This command starts recording the chat log to the file <filename>."
+msgstr ""
+"Este comando inicia la grabación del chat en el archivo <nombre_del_archivo>."
 
-#: src/net/ea/loginhandler.cpp:161
-msgid ""
-"You have been permanently banned from the game. Please contact the GM team."
+#: ../src/commandhandler.cpp:317
+msgid "This command stops ignoring the given player if they are being ignored"
+msgstr "Este comando deja de ignorar a <jugador> si es ignorado"
+
+#: ../src/gui/widgets/whispertab.cpp:96
+msgid "This command stops ignoring the other player if they are being ignored."
+msgstr "Este comando para de ignorar al jugador si había sido ignorado."
+
+#: ../src/commandhandler.cpp:250
+msgid "This command tell others you are (doing) <msg>."
+msgstr "Este comando muestra a los otros lo que tú estas (haciendo) <mensaje>."
+
+#: ../src/commandhandler.cpp:271
+msgid "This command tells you're away from keyboard with the given reason."
+msgstr "Este comando muestra que no estas en el PC por una razon dada."
+
+#: ../src/commandhandler.cpp:265
+msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
-"Has sido baneado permanentemente del juego. Por favor contacta con el equipo "
-"GM."
+"Este comando crea una pestaña para mensajes privados con el jugador <nick>."
 
-#: src/net/ea/loginhandler.cpp:165
-#, c-format
+#: ../src/gui/setup_colors.cpp:46
+msgid "This is what the color looks like"
+msgstr "Así es como se verá el color"
+
+#: ../src/client.cpp:783
+#, fuzzy
 msgid ""
-"You have been temporarily banned from the game until %s.\n"
-"Please contact the GM team via the forums."
+"This server is missing needed world data. Please contact the administrator"
+"(s)."
 msgstr ""
-"Has sido baneado temporalmente del juego %s.\n"
-"Por favor contacta un GM de nuestro equipo via el foro."
+"El registro no está soportado. Por favor contacta un administrador del "
+"server."
 
-#: src/net/ea/loginhandler.cpp:172
+#: ../src/net/tmwa/loginhandler.cpp:185
 msgid "This user name is already taken."
 msgstr "Este nombre de usuario ya está escogido."
 
-#: src/net/ea/network.cpp:145
-msgid "Empty address given to Network::connect()!"
-msgstr "Adress vacía enviada a Network::connect()!"
-
-#: src/net/ea/network.cpp:345
-msgid "Unable to resolve host \""
-msgstr "No es posible determinar el host \""
-
-#: src/net/ea/network.cpp:414
-msgid "Connection to server terminated. "
-msgstr "Conexión al servidor terminada."
+#: ../src/gui/setup_video.cpp:128
+msgid "Tiny"
+msgstr "Minúsculo"
 
-#: src/net/ea/partyhandler.cpp:81
-msgid "Could not create party."
-msgstr "No es posible crear un grupo."
+#: ../src/gui/npcpostdialog.cpp:47
+msgid "To:"
+msgstr "Para:"
 
-#: src/net/ea/partyhandler.cpp:84
-msgid "Party successfully created."
-msgstr "Grupo creado."
+#: ../src/keyboardconfig.cpp:96
+msgid "Toggle Chat"
+msgstr "Cambiar de Chat"
 
-#: src/net/ea/partyhandler.cpp:118
+#: ../src/net/manaserv/chathandler.cpp:190
+#: ../src/net/manaserv/chathandler.cpp:316
+#: ../src/net/manaserv/guildhandler.cpp:260
 #, c-format
-msgid "%s is already a member of a party."
-msgstr "%s ya es miembro de otro grupo."
+msgid "Topic: %s"
+msgstr "Tópico: %s"
 
-#: src/net/ea/partyhandler.cpp:122
-#, c-format
-msgid "%s refused your invitation."
-msgstr "%s cancelo tu invitación."
+#: ../src/gui/trade.cpp:73 ../src/gui/trade.cpp:74
+msgid "Trade"
+msgstr "Intercambio"
 
-#: src/net/ea/partyhandler.cpp:126
-#, c-format
-msgid "%s is now a member of your party."
-msgstr "%s ahora es un miembro de tu grupo."
+#: ../src/net/manaserv/tradehandler.cpp:148
+#: ../src/net/tmwa/tradehandler.cpp:224
+msgid "Trade canceled."
+msgstr "Intercambio Cancelado."
 
-#: src/net/ea/partyhandler.cpp:130
-#, c-format
-msgid "Unknown invite response for %s."
-msgstr "Invitacion desconocida para %s."
+#: ../src/net/tmwa/tradehandler.cpp:134
+msgid "Trade cancelled due to an unknown reason."
+msgstr "Intercambio cancelado por una razón desconocida."
 
-#: src/net/ea/partyhandler.cpp:238
-msgid "You have left the party."
-msgstr "Has dejado el grupo."
+#: ../src/net/manaserv/tradehandler.cpp:155
+#: ../src/net/tmwa/tradehandler.cpp:231
+msgid "Trade completed."
+msgstr "Intercambio Realizado."
 
-#: src/net/ea/partyhandler.cpp:249
-#, c-format
-msgid "%s has left your party."
-msgstr "%s dejó tu grupo."
+#: ../src/net/tmwa/specialhandler.cpp:145
+msgid "Trade failed!"
+msgstr "Fallo al intercambiar!"
 
-#: src/net/ea/partyhandler.cpp:301
+#: ../src/net/tmwa/tradehandler.cpp:146
 #, c-format
-msgid "An unknown member tried to say: %s"
-msgstr "Un miembro desconocido intentó decir: %s"
+msgid "Trade with %s cancelled."
+msgstr "Intercambio con %s cancelado."
 
-#: src/net/ea/partyhandler.cpp:329
-msgid "Inviting like this isn't supported at the moment."
-msgstr "Invitar así no esta soportado por el momento."
+#: ../src/gui/popupmenu.cpp:83
+#, c-format
+msgid "Trade with %s..."
+msgstr "Negociar con %s..."
 
-#: src/net/ea/partyhandler.cpp:334
-msgid "You can only inivte when you are in a party!"
-msgstr "Sólo puedes invitar cuando estés en un grupo!"
+#: ../src/gui/trade.cpp:59
+msgid "Trade: You"
+msgstr "Intercambio: Tú"
 
-#: src/net/ea/partyhandler.cpp:365
+#: ../src/net/tmwa/tradehandler.cpp:139
 #, c-format
-msgid "%s is not in your party!"
-msgstr "%s no está en tu grupo!"
+msgid "Trade: You and %s"
+msgstr "Intercambio: Tú y %s"
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:304
-msgid "You are dead."
-msgstr "Estás muerto"
+#: ../src/net/tmwa/tradehandler.cpp:130
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr "Intercambio imposible. El personaje no existe."
 
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:305
-msgid "We regret to inform you that your character was killed in battle."
-msgstr "Lamentamos informarte de que tu personaje fue aniquilado en combate."
+#: ../src/net/tmwa/tradehandler.cpp:126
+msgid "Trading isn't possible. Trade partner is too far away."
+msgstr "Intercambio es imposible. El otro personaje está muy alejado."
 
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:307
-msgid "You are not that alive anymore."
-msgstr "Ya no estás tan vivo..."
+#: ../src/net/manaserv/tradehandler.cpp:134
+#, c-format
+msgid "Trading with %s"
+msgstr "Intercambiando con %s"
 
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:308
-msgid "The cold hands of the grim reaper are grabbing for your soul."
-msgstr "Las frías manos de la muerte se llevaron tu alma su reino."
+#: ../src/gui/setup_video.cpp:469
+msgid "Transparency disabled"
+msgstr "Transparencia desabilitada"
 
-#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:309
-msgid "Game Over!"
-msgstr "Fin Del Juego!"
+#: ../src/gui/setup_video.cpp:477
+msgid "Transparency enabled"
+msgstr "Transparencia habilitada."
 
-#: src/net/ea/playerhandler.cpp:105
-msgid "Insert coin to continue."
-msgstr "Inserta moneda para continuar."
+#: ../src/localplayer.cpp:895
+#, fuzzy
+msgid "Tried to pick up nonexistent item."
+msgstr "Imposible coger el objeto."
 
-#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:310
-msgid ""
-"No, kids. Your character did not really die. It... err... went to a better "
-"place."
-msgstr ""
-"No, niños. Tu jugador no murió realmente. Solo... eeeh... fue a un lugar "
-"mejor ."
+#: ../src/commandhandler.cpp:334
+msgid "Type /help for a list of commands."
+msgstr "Escribe /help para una lista de comandos."
 
-#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:312
-msgid ""
-"Your plan of breaking your enemies weapon by bashing it with your throat "
-"failed."
-msgstr ""
-"Parece que tu plan de romper las armas de tus enemigos con tu garganta falló!"
+#: ../src/gui/changeemaildialog.cpp:51
+msgid "Type new email address twice:"
+msgstr "Escribe el nuevo email dos veces:"
 
-#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:314
-msgid "I guess this did not run too well."
-msgstr "Creo que esto no fue muy bien."
+#: ../src/gui/changepassworddialog.cpp:63
+msgid "Type new password twice:"
+msgstr "Escribe la nueva contraseña 2 veces:"
 
-#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:315
-msgid "Do you want your possessions identified?"
-msgstr "Deseas que tus posesiones sean identificadas?"
+#: ../src/gui/setup_colors.cpp:72
+msgid "Type:"
+msgstr "Tipo:"
 
-#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:316
-msgid "Sadly, no trace of you was ever found..."
-msgstr "Desgraciadamente, nada de ti fue encontrado..."
+#: ../src/net/tmwa/buysellhandler.cpp:123
+msgid "Unable to buy."
+msgstr "Imposible comprar."
 
-#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:317
-msgid "Annihilated."
-msgstr "Aniquilado."
+#: ../src/net/tmwa/inventoryhandler.cpp:401
+msgid "Unable to equip."
+msgstr "Imposible equipar."
 
-#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:318
-msgid "Looks like you got your head handed to you."
-msgstr "Parece que te tiraron tu cabeza a tus manos."
+#: ../src/net/tmwa/network.cpp:345
+msgid "Unable to resolve host \""
+msgstr "No es posible determinar el host \""
 
-#: src/net/ea/playerhandler.cpp:120 src/net/manaserv/beinghandler.cpp:319
-msgid ""
-"You screwed up again, dump your body down the tubes and get you another one."
-msgstr "Parece que te asustaste , revive en otro cuerpo y sigue tu aventura ."
+#: ../src/net/tmwa/buysellhandler.cpp:131
+msgid "Unable to sell."
+msgstr "Imposible vender."
 
-#: src/net/ea/playerhandler.cpp:123
-msgid "You're not dead yet. You're just resting."
-msgstr "Tu no estás muerto. Sólo estás descansando."
+#: ../src/net/tmwa/inventoryhandler.cpp:413
+msgid "Unable to unequip."
+msgstr "Imposible quitárselo."
 
-#: src/net/ea/playerhandler.cpp:124
-msgid "You are no more."
-msgstr "Tu ya no existes más."
+#: ../src/gui/setup_keyboard.cpp:90
+msgid "Unassign"
+msgstr "Retirar"
 
-#: src/net/ea/playerhandler.cpp:125
-msgid "You have ceased to be."
-msgstr "Parece que dejaste de existir."
+#: ../src/gui/equipmentwindow.cpp:88 ../src/gui/inventorywindow.cpp:94
+#: ../src/gui/inventorywindow.cpp:352 ../src/gui/popupmenu.cpp:364
+msgid "Unequip"
+msgstr "Quitárselo"
 
-#: src/net/ea/playerhandler.cpp:126
-msgid "You've expired and gone to meet your maker."
-msgstr "Has expirado e ido a ver al tu creador."
+#: ../src/gui/outfitwindow.cpp:70
+msgid "Unequip first"
+msgstr "Quitárselo antes"
 
-#: src/net/ea/playerhandler.cpp:127
-msgid "You're a stiff."
-msgstr "Eres un cadáver."
+#: ../src/net/manaserv/charhandler.cpp:270
+#, c-format
+msgid "Unhandled character select error message %i."
+msgstr ""
 
-#: src/net/ea/playerhandler.cpp:128
-msgid "Bereft of life, you rest in peace."
-msgstr "Sin vida, descansa en paz."
+#: ../src/net/tmwa/tradehandler.cpp:154
+msgid "Unhandled trade cancel packet."
+msgstr "Intercambio no soportado."
 
-#: src/net/ea/playerhandler.cpp:129
-msgid "If you weren't so animated, you'd be pushing up the daisies."
-msgstr "Si no estuvieras tan animado, diría que estás muerto."
+#: ../src/gui/popupmenu.cpp:114 ../src/gui/popupmenu.cpp:123
+#, c-format
+msgid "Unignore %s"
+msgstr "Dejar de Ignorar %s"
 
-#: src/net/ea/playerhandler.cpp:130
-msgid "Your metabolic processes are now history."
-msgstr "Tus procesos metabólicos son ya historia."
+#: ../src/net/net.cpp:141
+#, fuzzy
+msgid "Unknown Server Type! Exiting."
+msgstr "Tipo de objeto desconocido"
 
-#: src/net/ea/playerhandler.cpp:131
-msgid "You're off the twig."
-msgstr "Estás fuera de tus botas."
+#: ../src/net/manaserv/chathandler.cpp:342
+msgid "Unknown channel event."
+msgstr "Evento de canal desconocido."
 
-#: src/net/ea/playerhandler.cpp:132
-msgid "You've kicked the bucket."
-msgstr "Te han echado a patadas."
+#: ../src/net/tmwa/charserverhandler.cpp:110
+msgid "Unknown char-server failure."
+msgstr "Error desconocido del char-server."
 
-#: src/net/ea/playerhandler.cpp:133
-msgid ""
-"You've shuffled off your mortal coil, run down the curtain and joined the "
-"bleedin' choir invisibile."
-msgstr ""
-"Has dejado tu cuerpo mortal, bajado las cortinas y unido al sangriento coro "
-"de los invisibles."
+#: ../src/commandhandler.cpp:136 ../src/commandhandler.cpp:333
+msgid "Unknown command."
+msgstr "Comando desconocido."
 
-#: src/net/ea/playerhandler.cpp:135
-msgid "You are an ex-player."
-msgstr "Eres un ex-jugador."
+#: ../src/net/tmwa/generalhandler.cpp:151
+msgid "Unknown connection error."
+msgstr "Error de conexión desconocido."
 
-#: src/net/ea/playerhandler.cpp:136
-msgid "You're pining for the fjords."
-msgstr "Estas avanzando... hacia el barranco."
+#: ../src/net/manaserv/charhandler.cpp:225
+#, c-format
+msgid "Unknown error (%d)."
+msgstr "Error desconocido (%d)."
 
-#: src/net/ea/playerhandler.cpp:249 src/net/ea/playerhandler.cpp:310
-msgid "Message"
-msgstr "Mensaje"
+#: ../src/net/manaserv/charhandler.cpp:174
+#: ../src/net/manaserv/loginhandler.cpp:96
+#: ../src/net/manaserv/loginhandler.cpp:127
+#: ../src/net/manaserv/loginhandler.cpp:161
+#: ../src/net/manaserv/loginhandler.cpp:279
+#: ../src/net/manaserv/loginhandler.cpp:316
+#: ../src/net/tmwa/loginhandler.cpp:95 ../src/net/tmwa/loginhandler.cpp:191
+msgid "Unknown error."
+msgstr "Error desconocido."
 
-#: src/net/ea/playerhandler.cpp:250
-msgid ""
-"You are carrying more than half your weight. You are unable to regain health."
-msgstr "Llevas más de la mitad del peso que puedes. No recuperarás PV o PM."
+#: ../src/net/tmwa/guildhandler.cpp:316
+msgid "Unknown guild invite response."
+msgstr "Invitación desconocida a una guild."
 
-#: src/net/ea/playerhandler.cpp:333
+#: ../src/net/tmwa/partyhandler.cpp:131
 #, c-format
-msgid "You picked up %s."
-msgstr "Has cogido %s."
+msgid "Unknown invite response for %s."
+msgstr "Invitacion desconocida para %s."
 
-#: src/net/ea/playerhandler.cpp:369
-msgid "Cannot raise skill!"
-msgstr "Imposible incrementar!"
+#: ../src/resources/itemdb.cpp:324 ../src/resources/itemdb.cpp:425
+msgid "Unknown item"
+msgstr "Objeto desconocido"
 
-#: src/net/ea/playerhandler.cpp:532
-msgid "Equip arrows first."
-msgstr "Equipar las flechas primero."
+#: ../src/localplayer.cpp:902
+#, fuzzy
+msgid "Unknown problem picking up item."
+msgstr "Imposible coger el objeto."
 
-#: src/net/ea/specialhandler.cpp:147
-msgid "Trade failed!"
-msgstr "Fallo al intercambiar!"
+#: ../src/gui/charselectdialog.cpp:145 ../src/gui/unregisterdialog.cpp:47
+#: ../src/gui/unregisterdialog.cpp:55
+msgid "Unregister"
+msgstr "Cancelar Registro"
 
-#: src/net/ea/specialhandler.cpp:150
-msgid "Emote failed!"
-msgstr "Fallo al hacer un emoticono!"
+#: ../src/client.cpp:955
+msgid "Unregister Successful"
+msgstr "Registro cancelado"
 
-#: src/net/ea/specialhandler.cpp:153
-msgid "Sit failed!"
-msgstr "Fallo al sentarse!"
+#: ../src/net/tmwa/loginhandler.cpp:156
+msgid "Unregistered ID."
+msgstr "ID no registrada."
 
-#: src/net/ea/specialhandler.cpp:156
-msgid "Chat creating failed!"
-msgstr "Fallo al crear un chat!"
+#: ../src/gui/skilldialog.cpp:228
+msgid "Up"
+msgstr "Encima"
 
-#: src/net/ea/specialhandler.cpp:159
-msgid "Could not join party!"
-msgstr "Imposible entrar en un grupo!"
+#: ../src/gui/updatewindow.cpp:124
+msgid "Updating..."
+msgstr "Actualizando..."
 
-#: src/net/ea/specialhandler.cpp:162
-msgid "Cannot shout!"
-msgstr "Imposible gritar!"
+#: ../src/gui/inventorywindow.cpp:93
+msgid "Use"
+msgstr "Usar"
 
-#: src/net/ea/specialhandler.cpp:171
-msgid "You have not yet reached a high enough lvl!"
-msgstr "Usted no tiene suficiente nivel!"
+#: ../src/net/tmwa/guildhandler.cpp:306
+msgid "User is now part of your guild."
+msgstr "El usuario es ahora de tu clan."
 
-#: src/net/ea/specialhandler.cpp:174
-msgid "Insufficient HP!"
-msgstr "PV insuficiente!"
+#: ../src/net/tmwa/guildhandler.cpp:301
+msgid "User rejected guild invite."
+msgstr "El jugador cancel la invitacion a tu guild."
 
-#: src/net/ea/specialhandler.cpp:177
-msgid "Insufficient SP!"
-msgstr "SP insuficiente!"
+#: ../src/net/manaserv/loginhandler.cpp:306
+msgid "Username already exists."
+msgstr "Usuario ya existe."
 
-#: src/net/ea/specialhandler.cpp:180
-msgid "You have no memos!"
-msgstr "No tienes ninguna nota armenzada!"
+#: ../src/net/tmwa/loginhandler.cpp:188
+#, fuzzy
+msgid "Username permanently erased."
+msgstr "Usuario ya existe."
 
-#: src/net/ea/specialhandler.cpp:183
-msgid "You cannot do that right now!"
-msgstr "No puedes hacer esto ahora mismo!"
+#: ../src/gui/setup_video.cpp:244
+msgid "Video"
+msgstr "Vídeo"
 
-#: src/net/ea/specialhandler.cpp:186
-msgid "Seems you need more money... ;-)"
-msgstr "Parece que necesitas más dinero... ;-)"
+#: ../src/gui/setup_video.cpp:215
+msgid "Visible names"
+msgstr "Nombres Visibles"
 
-#: src/net/ea/specialhandler.cpp:189
-msgid "You cannot use this skill with that kind of weapon!"
-msgstr "No puedes usar estas habilidades con estas armas!"
+#: ../src/net/manaserv/attributes.cpp:205
+#: ../src/net/tmwa/generalhandler.cpp:232
+msgid "Vitality"
+msgstr "Vitalidad"
 
-#: src/net/ea/specialhandler.cpp:192
-msgid "You need another red gem!"
-msgstr "Necesitas otra Gema Roja!"
+#: ../src/net/manaserv/attributes.cpp:212
+#, fuzzy, c-format
+msgid "Vitality %+.1f"
+msgstr "Vitalidad %+d"
 
-#: src/net/ea/specialhandler.cpp:195
-msgid "You need another blue gem!"
-msgstr "Necesitas otra Gema Azul!"
+#: ../src/net/tmwa/generalhandler.cpp:104
+#, c-format
+msgid "Vitality %+d"
+msgstr "Vitalidad %+d"
 
-#: src/net/ea/specialhandler.cpp:198
-msgid "You're carrying to much to do this!"
-msgstr "Llevas muchas cosas para hacer esto!"
+#: ../src/net/tmwa/charserverhandler.cpp:272
+msgid "Vitality:"
+msgstr "Vitalidad:"
 
-#: src/net/ea/specialhandler.cpp:201
-msgid "Huh? What's that?"
-msgstr "Huh? Qué es eso?"
+#: ../src/gui/npcdialog.cpp:48
+msgid "Waiting for server"
+msgstr "Esperando al servidor"
 
-#: src/net/ea/specialhandler.cpp:210
+#: ../src/gui/serverdialog.cpp:447
+msgid "Waiting for server..."
+msgstr "Esperando al servidor..."
+
+#: ../src/net/tmwa/specialhandler.cpp:208
 msgid "Warp failed..."
 msgstr "Fallo al teletransportar..."
 
-#: src/net/ea/specialhandler.cpp:213
-msgid "Could not steal anything..."
-msgstr "No puedes robar nada..."
+#: ../src/net/manaserv/beinghandler.cpp:284
+#: ../src/net/tmwa/playerhandler.cpp:96
+msgid "We regret to inform you that your character was killed in battle."
+msgstr "Lamentamos informarte de que tu personaje fue aniquilado en combate."
 
-#: src/net/ea/specialhandler.cpp:216
-msgid "Poison had no effect..."
-msgstr "Veneno no tuvo ningún efecto..."
+#: ../src/keyboardconfig.cpp:82
+msgid "Wear Outfit"
+msgstr "Ponerse el conjunto"
 
-#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:116
-msgid "Request for Trade"
-msgstr "Propuesta de intercambio"
+#: ../src/gui/inventorywindow.cpp:111
+msgid "Weight:"
+msgstr "Peso:"
 
-#: src/net/ea/tradehandler.cpp:108 src/net/manaserv/tradehandler.cpp:117
+#: ../src/gui/itempopup.cpp:174
 #, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr "%s quiere comerciar contigo, aceptas?"
+msgid "Weight: %s"
+msgstr "Peso: %s"
 
-#: src/net/ea/tradehandler.cpp:124
-msgid "Trading isn't possible. Trade partner is too far away."
-msgstr "Intercambio es imposible. El otro personaje está muy alejado."
+#: ../src/gui/setup_players.cpp:262
+msgid "When ignoring:"
+msgstr "Cuando se ignora a alguien:"
 
-#: src/net/ea/tradehandler.cpp:128
-msgid "Trading isn't possible. Character doesn't exist."
-msgstr "Intercambio imposible. El personaje no existe."
+#: ../src/gui/popupmenu.cpp:91
+#, c-format
+msgid "Whisper %s"
+msgstr "Mensaje Privado %s"
 
-#: src/net/ea/tradehandler.cpp:132
-msgid "Trade cancelled due to an unknown reason."
-msgstr "Intercambio cancelado por una razón desconocida."
+#: ../src/net/tmwa/chathandler.cpp:87
+#, fuzzy, c-format
+msgid "Whisper could not be sent, %s is offline."
+msgstr "Imposible enviar mensaje, usuario desconectado."
 
-#: src/net/ea/tradehandler.cpp:137
+#: ../src/net/tmwa/chathandler.cpp:96
+#, fuzzy, c-format
+msgid "Whisper could not be sent, ignored by %s."
+msgstr "Imposible enviar mensaje, estás ignorado por el otro jugador."
+
+#: ../src/gui/chat.cpp:494
 #, c-format
-msgid "Trade: You and %s"
-msgstr "Intercambio: Tú y %s"
+msgid "Whispering to %s: %s"
+msgstr "Enviando mensaje privado para %s: %s"
 
-#: src/net/ea/tradehandler.cpp:144
+#: ../src/gui/socialwindow.cpp:154
 #, c-format
-msgid "Trade with %s cancelled."
-msgstr "Intercambio con %s cancelado."
+msgid "Who would you like to invite to guild %s?"
+msgstr "A quién te gustaría invitar al clan %s?"
 
-#: src/net/ea/tradehandler.cpp:153
-msgid "Unhandled trade cancel packet."
-msgstr "Intercambio no soportado."
+#: ../src/gui/socialwindow.cpp:233
+#, c-format
+msgid "Who would you like to invite to party %s?"
+msgstr "A quién te gustaría invitar al grupo %s?"
 
-#: src/net/ea/tradehandler.cpp:202
-msgid "Failed adding item. Trade partner is over weighted."
-msgstr "Error al añadir objeto. El otro jugador lleva mucho peso."
+#: ../src/net/manaserv/attributes.cpp:231
+msgid "Willpower"
+msgstr "Fuerza de voluntad"
 
-#: src/net/ea/tradehandler.cpp:207
-msgid "Failed adding item. Trade partner has no free slot."
-msgstr "Error al anadir objeto. El otro jugador no tiene más espacio."
+#: ../src/net/manaserv/attributes.cpp:238
+#, fuzzy, c-format
+msgid "Willpower %+.1f"
+msgstr "Fuerza de voluntad %+d"
 
-#: src/net/ea/tradehandler.cpp:211
-msgid "Failed adding item for unknown reason."
-msgstr "Fallo al anadir objeto por una razón desconocida."
+#: ../src/net/manaserv/loginhandler.cpp:87
+msgid "Wrong magic_token."
+msgstr "Error de Token-mágico ."
 
-#: src/net/ea/tradehandler.cpp:224 src/net/manaserv/tradehandler.cpp:149
-msgid "Trade canceled."
-msgstr "Intercambio Cancelado."
+#: ../src/net/tmwa/loginhandler.cpp:159
+msgid "Wrong password."
+msgstr "Contrasena incorrecta."
 
-#: src/net/ea/tradehandler.cpp:231 src/net/manaserv/tradehandler.cpp:156
-msgid "Trade completed."
-msgstr "Intercambio Realizado."
+#: ../src/net/manaserv/loginhandler.cpp:266
+msgid "Wrong username or password."
+msgstr "Nombre de usuario o contraseña incorrectos."
 
-#: src/net/manaserv/beinghandler.cpp:324
-msgid "Press OK to respawn."
-msgstr "Pulsa OK para reaparecer."
+#: ../src/net/manaserv/loginhandler.cpp:303
+msgid "Wrong username, password or email address."
+msgstr "E-mail, nombre de usuario o contraseña incorrectos."
 
-#: src/net/manaserv/beinghandler.cpp:325
+#: ../src/gui/confirmdialog.cpp:42
+msgid "Yes"
+msgstr "Sí"
+
+#: ../src/net/manaserv/beinghandler.cpp:304
 msgid "You Died"
 msgstr "Has muerto"
 
-#: src/net/manaserv/charhandler.cpp:128 src/net/manaserv/charhandler.cpp:196
-msgid "Not logged in."
-msgstr "No estás conectado."
-
-#: src/net/manaserv/charhandler.cpp:131
-msgid "No empty slot."
-msgstr "Sin espacios"
+#: ../src/net/tmwa/playerhandler.cpp:131
+msgid "You are an ex-player."
+msgstr "Eres un ex-jugador."
 
-#: src/net/manaserv/charhandler.cpp:134
-msgid "Invalid name."
-msgstr "Nombre no válido."
+#: ../src/net/tmwa/playerhandler.cpp:254
+msgid ""
+"You are carrying more than half your weight. You are unable to regain health."
+msgstr "Llevas más de la mitad del peso que puedes. No recuperarás PV o PM."
 
-#: src/net/manaserv/charhandler.cpp:137
-msgid "Character's name already exists."
-msgstr "Nombre del jugador ya existe."
+#: ../src/net/manaserv/beinghandler.cpp:283
+#: ../src/net/tmwa/playerhandler.cpp:95
+msgid "You are dead."
+msgstr "Estás muerto"
 
-#: src/net/manaserv/charhandler.cpp:140
-msgid "Invalid hairstyle."
-msgstr "Estilo de pelo no válido."
+#: ../src/net/tmwa/playerhandler.cpp:120
+msgid "You are no more."
+msgstr "Tu ya no existes más."
 
-#: src/net/manaserv/charhandler.cpp:143
-msgid "Invalid hair color."
-msgstr "Color del pelo no válido."
+#: ../src/net/manaserv/beinghandler.cpp:286
+#: ../src/net/tmwa/playerhandler.cpp:98
+msgid "You are not that alive anymore."
+msgstr "Ya no estás tan vivo..."
 
-#: src/net/manaserv/charhandler.cpp:146
-msgid "Invalid gender."
-msgstr "Género no válido."
+#: ../src/net/tmwa/partyhandler.cpp:340
+msgid "You can only inivte when you are in a party!"
+msgstr "Sólo puedes invitar cuando estés en un grupo!"
 
-#: src/net/manaserv/charhandler.cpp:149
-msgid "Character's stats are too high."
-msgstr "Atributos del personaje son muy altos."
+#: ../src/net/tmwa/specialhandler.cpp:181
+msgid "You cannot do that right now!"
+msgstr "No puedes hacer esto ahora mismo!"
 
-#: src/net/manaserv/charhandler.cpp:152
-msgid "Character's stats are too low."
-msgstr "Atributos del personaje son muy bajos."
+#: ../src/net/tmwa/specialhandler.cpp:187
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr "No puedes usar estas habilidades con estas armas!"
 
-#: src/net/manaserv/charhandler.cpp:155
-msgid "One stat is zero."
-msgstr "Un stat es 0."
+#: ../src/gui/trade.cpp:304
+msgid "You don't have enough money."
+msgstr "No tienes dinero suficiente."
 
-#: src/net/manaserv/charhandler.cpp:187
-msgid "Player deleted."
-msgstr "Personaje eliminado."
+#: ../src/gui/trade.cpp:98 ../src/gui/trade.cpp:134
+#, c-format
+msgid "You get %s"
+msgstr "Tú recibes %s"
 
-#: src/net/manaserv/charhandler.cpp:199
-msgid "Selection out of range."
-msgstr "Seleccion fuera de rango."
+#: ../src/gui/trade.cpp:99
+msgid "You give:"
+msgstr "Tú das:"
 
-#: src/net/manaserv/charhandler.cpp:202
+#: ../src/gui/socialwindow.cpp:588
 #, c-format
-msgid "Unknown error (%d)."
-msgstr "Error desconocido (%d)."
+msgid "You have been invited to join the %s party."
+msgstr "Has sido invitado para unirte al grupo %s."
 
-#: src/net/manaserv/charhandler.cpp:242
-msgid "No gameservers are available."
-msgstr "No hay servidores disponibles."
+#: ../src/gui/socialwindow.cpp:584
+msgid "You have been invited you to join a party."
+msgstr "Fuiste invitado a un grupo."
 
-#: src/net/manaserv/charhandler.cpp:268
-msgid "Willpower:"
-msgstr "Fuerza de voluntad:"
+#: ../src/net/tmwa/loginhandler.cpp:168
+msgid ""
+"You have been permanently banned from the game. Please contact the GM team."
+msgstr ""
+"Has sido baneado permanentemente del juego. Por favor contacta con el equipo "
+"GM."
 
-#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
-#: src/net/manaserv/guildhandler.cpp:259
+#: ../src/net/tmwa/loginhandler.cpp:175
 #, c-format
-msgid "Topic: %s"
-msgstr "Tópico: %s"
+msgid ""
+"You have been temporarily banned from the game until %s.\n"
+"Please contact the GM team via the forums."
+msgstr ""
+"Has sido baneado temporalmente del juego %s.\n"
+"Por favor contacta un GM de nuestro equipo via el foro."
 
-#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
-msgid "Players in this channel:"
-msgstr "Jugadores en este canal:"
+#: ../src/net/tmwa/playerhandler.cpp:121
+msgid "You have ceased to be."
+msgstr "Parece que dejaste de existir."
 
-#: src/net/manaserv/chathandler.cpp:201
-msgid "Error joining channel."
-msgstr "Error al entrar al canal."
+#: ../src/net/tmwa/partyhandler.cpp:236
+msgid "You have left the party."
+msgstr "Has dejado el grupo."
 
-#: src/net/manaserv/chathandler.cpp:207
-msgid "Listing channels."
-msgstr "Lista de canales."
+#: ../src/net/tmwa/specialhandler.cpp:178
+msgid "You have no memos!"
+msgstr "No tienes ninguna nota armenzada!"
 
-#: src/net/manaserv/chathandler.cpp:219
-msgid "End of channel list."
-msgstr "Fin de la lista de canales."
+#: ../src/net/tmwa/specialhandler.cpp:169
+msgid "You have not yet reached a high enough lvl!"
+msgstr "Usted no tiene suficiente nivel!"
 
-#: src/net/manaserv/chathandler.cpp:291
-#, c-format
-msgid "%s entered the channel."
-msgstr "%s entró al canal."
+#: ../src/gui/setup_audio.cpp:94
+msgid "You may have to restart your client if you want to download new music"
+msgstr "Necesitas reiniciar el client si quieres descargar la musica"
 
-#: src/net/manaserv/chathandler.cpp:296
-#, c-format
-msgid "%s left the channel."
-msgstr "%s dejó el canal."
+#: ../src/gui/setup_video.cpp:470 ../src/gui/setup_video.cpp:478
+msgid "You must restart to apply changes."
+msgstr "Debes reiniciar el cliente para aplicar los cambios."
 
-#: src/net/manaserv/chathandler.cpp:312
-#, c-format
-msgid "%s has set mode %s on user %s."
-msgstr "%s colocó en el modo %s al usuario %s."
+#: ../src/net/tmwa/specialhandler.cpp:193
+msgid "You need another blue gem!"
+msgstr "Necesitas otra Gema Azul!"
 
-#: src/net/manaserv/chathandler.cpp:322
-#, c-format
-msgid "%s has kicked %s."
-msgstr "%s expulsó a %s."
+#: ../src/net/tmwa/specialhandler.cpp:190
+msgid "You need another red gem!"
+msgstr "Necesitas otra Gema Roja!"
 
-#: src/net/manaserv/chathandler.cpp:327
-msgid "Unknown channel event."
-msgstr "Evento de canal desconocido."
+#: ../src/gui/login.cpp:129
+msgid "You need to use the website to register an account for this server."
+msgstr "Necesitas registrarte desde la web para difrutar del juego."
 
-#: src/net/manaserv/generalhandler.cpp:100
+#: ../src/localplayer.cpp:920
 #, c-format
-msgid "Willpower %+d"
-msgstr "Fuerza de voluntad %+d"
+msgid "You picked up %d [@@%d|%s@@]."
+msgid_plural "You picked up %d [@@%d|%s@@]."
+msgstr[0] "Usted cogió un/a %d [@@%d|%s@@]."
+msgstr[1] "Usted Cogió %d [@@%d|%s@@]."
 
-#: src/net/manaserv/generalhandler.cpp:171
-msgid "Willpower"
-msgstr "Fuerza de voluntad"
+#: ../src/net/tmwa/playerhandler.cpp:327
+#, c-format
+msgid "You picked up %s."
+msgstr "Has cogido %s."
 
-#: src/net/manaserv/guildhandler.cpp:81
-msgid "Guild created."
-msgstr "Clan creado."
+#: ../src/net/manaserv/beinghandler.cpp:298
+#: ../src/net/tmwa/playerhandler.cpp:116
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr "Parece que te asustaste , revive en otro cuerpo y sigue tu aventura ."
 
-#: src/net/manaserv/guildhandler.cpp:86
-msgid "Error creating guild."
-msgstr "Error al crear el clan."
+#: ../src/net/manaserv/loginhandler.cpp:312
+msgid "You took too long with the captcha or your response was incorrect."
+msgstr "Tardaste mucho con el captcha o tu respuesta fue incorrecta."
 
-#: src/net/manaserv/guildhandler.cpp:96
-msgid "Invite sent."
-msgstr "Invitación enviada."
+#: ../src/net/tmwa/playerhandler.cpp:123
+msgid "You're a stiff."
+msgstr "Eres un cadáver."
 
-#: src/net/manaserv/guildhandler.cpp:203
-msgid "Member was promoted successfully."
-msgstr "Estado del miembro fue cambiado satisfactoriamente."
+#: ../src/net/tmwa/specialhandler.cpp:196
+msgid "You're carrying to much to do this!"
+msgstr "Llevas muchas cosas para hacer esto!"
 
-#: src/net/manaserv/guildhandler.cpp:208
-msgid "Failed to promote member."
-msgstr "Error al cambiar estado del miembro."
+#: ../src/net/tmwa/playerhandler.cpp:119
+msgid "You're not dead yet. You're just resting."
+msgstr "Tu no estás muerto. Sólo estás descansando."
 
-#: src/net/manaserv/loginhandler.cpp:87
-msgid "Wrong magic_token."
-msgstr "Error de Token-mágico ."
+#: ../src/net/tmwa/playerhandler.cpp:127
+msgid "You're off the twig."
+msgstr "Estás fuera de tus botas."
 
-#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
-msgid "Already logged in."
-msgstr "El personaje ya está conectado."
+#: ../src/net/tmwa/playerhandler.cpp:132
+msgid "You're pining for the fjords."
+msgstr "Estas avanzando... hacia el barranco."
 
-#: src/net/manaserv/loginhandler.cpp:93 src/net/manaserv/loginhandler.cpp:272
-msgid "Server is full."
-msgstr "Servidor lleno."
+#: ../src/net/tmwa/playerhandler.cpp:122
+msgid "You've expired and gone to meet your maker."
+msgstr "Has expirado e ido a ver al tu creador."
 
-#: src/net/manaserv/loginhandler.cpp:118
-msgid "New password incorrect."
-msgstr "Nueva contraseña incorrecta."
+#: ../src/net/tmwa/playerhandler.cpp:128
+msgid "You've kicked the bucket."
+msgstr "Te han echado a patadas."
 
-#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
-msgid "Account not connected. Please login first."
-msgstr "Cuenta no conectada. Por favor conéctate primero."
+#: ../src/net/tmwa/playerhandler.cpp:129
+msgid ""
+"You've shuffled off your mortal coil, run down the curtain and joined the "
+"bleedin' choir invisibile."
+msgstr ""
+"Has dejado tu cuerpo mortal, bajado las cortinas y unido al sangriento coro "
+"de los invisibles."
 
-#: src/net/manaserv/loginhandler.cpp:149
-msgid "New email address incorrect."
-msgstr "Nuevo e-mail incorrecto."
+#: ../src/net/tmwa/guildhandler.cpp:311
+msgid "Your guild is full."
+msgstr "Tu clan está lleno."
 
-#: src/net/manaserv/loginhandler.cpp:152
-msgid "Old email address incorrect."
-msgstr "E-mail antiguo incorrecto."
+#: ../src/net/tmwa/playerhandler.cpp:126
+msgid "Your metabolic processes are now history."
+msgstr "Tus procesos metabólicos son ya historia."
 
-#: src/net/manaserv/loginhandler.cpp:158
-msgid "The new email address already exists."
-msgstr "El nuevo e-mail ya existe."
+#: ../src/gui/charcreatedialog.cpp:184
+msgid "Your name needs to be at least 4 characters."
+msgstr "Su nombre debe de tener como mínimo 4 caracteres."
 
-#: src/net/manaserv/loginhandler.cpp:239
+#: ../src/net/manaserv/beinghandler.cpp:291
+#: ../src/net/tmwa/playerhandler.cpp:104
 msgid ""
-"Client registration is not allowed. Please contact server administration."
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
 msgstr ""
-"El registro no está soportado. Por favor contacta un administrador del "
-"server."
-
-#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
-msgid "Client version is too old."
-msgstr "La version del cliente es demasiado antigua."
-
-#: src/net/manaserv/loginhandler.cpp:266
-msgid "Wrong username or password."
-msgstr "Nombre de usuario o contraseña incorrectos."
+"Parece que tu plan de romper las armas de tus enemigos con tu garganta falló!"
 
-#: src/net/manaserv/loginhandler.cpp:275
-msgid "Login attempt too soon after previous attempt."
-msgstr "Intento de conexión muy pronto tras intento previo."
+#: ../src/main.cpp:43
+msgid "[mana-file] : The mana file is an XML file (.mana)"
+msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:303
-msgid "Wrong username, password or email address."
-msgstr "E-mail, nombre de usuario o contraseña incorrectos."
+#: ../src/gui/setup_video.cpp:225
+msgid "as particle"
+msgstr "como partícula"
 
-#: src/net/manaserv/loginhandler.cpp:306
-msgid "Username already exists."
-msgstr "Usuario ya existe."
+#: ../src/gui/setup_video.cpp:174 ../src/gui/setup_video.cpp:188
+msgid "high"
+msgstr "alto"
 
-#: src/net/manaserv/loginhandler.cpp:309
-msgid "Email address already exists."
-msgstr "El e-mail ya existe."
+#: ../src/gui/setup_video.cpp:223
+msgid "in chat"
+msgstr "en chat"
 
-#: src/net/manaserv/loginhandler.cpp:312
-msgid "You took too long with the captcha or your response was incorrect."
-msgstr "Tardaste mucho con el captcha o tu respuesta fue incorrecta."
+#: ../src/gui/setup_video.cpp:173 ../src/gui/setup_video.cpp:186
+msgid "low"
+msgstr "bajo"
 
-#: src/net/manaserv/partyhandler.cpp:88
-msgid "Joined party."
-msgstr "Entraste al grupo."
+#: ../src/main.cpp:42
+msgid "mana [options] [mana-file]"
+msgstr "mana  [opciones] [archivo-mana]"
 
-#: src/net/manaserv/partyhandler.cpp:106
-#, c-format
-msgid "%s joined the party."
-msgstr "%s ha entrado a formar parte del grupo."
+#: ../src/gui/setup_video.cpp:189
+msgid "max"
+msgstr "máximo"
 
-#: src/net/manaserv/partyhandler.cpp:123
-#, c-format
-msgid "%s rejected your invite."
-msgstr "%s canceló tu invitación."
+#: ../src/gui/setup_video.cpp:187
+msgid "medium"
+msgstr "medio"
 
-#: src/net/manaserv/tradehandler.cpp:96
-msgid "Accepting incoming trade requests."
-msgstr "Aceptar propuestas de intercambio entrantes."
+#: ../src/gui/setup_video.cpp:172
+msgid "off"
+msgstr "apagado"
 
-#: src/net/manaserv/tradehandler.cpp:98
-msgid "Ignoring incoming trade requests."
-msgstr "Ignorar las propuestas de intercambio entrantes."
+#: ../src/gui/serverdialog.cpp:550
+msgid "requires a newer version"
+msgstr "requiere una version mas nueva"
 
-#: src/net/manaserv/tradehandler.cpp:135
+#: ../src/gui/serverdialog.cpp:552
 #, c-format
-msgid "Trading with %s"
-msgstr "Intercambiando con %s"
-
-#: src/playerrelations.cpp:304
-msgid "Completely ignore"
-msgstr "Ignorar completamente"
-
-#: src/playerrelations.cpp:318
-msgid "Print '...'"
-msgstr "Imprimir '...'"
+msgid "requires v%s"
+msgstr "requiere v%s"
 
-#: src/playerrelations.cpp:334
-msgid "Blink name"
-msgstr "Parpadear nombre"
-
-#: src/playerrelations.cpp:371
-msgid "Floating '...' bubble"
-msgstr "Burbuja '...' flotante"
+#: ../src/resources/beinginfo.cpp:32 ../src/resources/itemdb.cpp:260
+#: ../src/resources/monsterdb.cpp:77
+msgid "unnamed"
+msgstr "Sin Nombre"
 
-#: src/playerrelations.cpp:374
-msgid "Floating bubble"
-msgstr "Burbuja Flotante"
+#~ msgid " can't be created, but it doesn't exist! Exiting."
+#~ msgstr " No se puede crear, pero no existe! Saliendo."
 
-#: src/resources/itemdb.cpp:52
-#, c-format
-msgid "Attack %+d"
-msgstr "Ataque %+d"
+#~ msgid " cancelled"
+#~ msgstr " cancelado"
 
-#: src/resources/itemdb.cpp:53
-#, c-format
-msgid "Defense %+d"
-msgstr "Defensa %+d"
+#~ msgid " host: "
+#~ msgstr " host: "
 
-#: src/resources/itemdb.cpp:54
-#, c-format
-msgid "HP %+d"
-msgstr "PV %+d"
+#~ msgid " video mode: "
+#~ msgstr " modo de video: "
 
-#: src/resources/itemdb.cpp:55
-#, c-format
-msgid "MP %+d"
-msgstr "PM %+d"
+#~ msgid "% Reflex:"
+#~ msgstr "% Reflexionar:"
 
-#: src/resources/itemdb.cpp:114
-msgid "Unknown item"
-msgstr "Objeto desconocido"
+#~ msgid "/new > Alias of create"
+#~ msgstr "/new > Alias de crear"
 
-#: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
-#: src/resources/monsterdb.cpp:69
-msgid "unnamed"
-msgstr "Sin Nombre"
+#~ msgid "1/2 HP Bar"
+#~ msgstr "1/2 de barra de HP"
 
-#: src/gui/setup_video.cpp:254
-#, fuzzy
-msgid "Show damage"
-msgstr "mostrar nombre"
+#~ msgid "1/4 HP Bar"
+#~ msgstr "1/4 de barra de HP"
 
-#~ msgid "Changing game servers"
-#~ msgstr "Cambiando el servidor del juego"
+#~ msgid "2 Handed Weapons"
+#~ msgstr "Armas para 2 manos"
 
-#~ msgid "/away > Tell the other whispering players you're away from keyboard."
-#~ msgstr ""
-#~ "/away > Les dice a los otros que estas fuera del PC mensaje privado ."
+#~ msgid "3/4 HP Bar"
+#~ msgstr "3/4 de barra de HP"
 
-#~ msgid "Command: /away <afk reason>"
-#~ msgstr "Comando: /away <motivo>"
+#~ msgid "@@admin-kick|Kick player@@"
+#~ msgstr "@@admin-kick|Expulsar jugador@@"
 
-#~ msgid "This command tells you're away from keyboard with the given reason."
-#~ msgstr "Este comando muestra que no estas en el PC por una razon dada."
+#~ msgid "@@attack|Attack %s@@"
+#~ msgstr "@@attack|Atacar %s@@"
 
-#~ msgid "Command: /away"
-#~ msgstr "Comando: /away"
+#~ msgid "@@cancel|Cancel@@"
+#~ msgstr "@@cancel|Cancelar@@"
 
-#~ msgid "This command clears the away status and message."
-#~ msgstr "Este comando limpia el status y los mensajes \"away\"."
+#~ msgid "@@disregard|Disregard %s@@"
+#~ msgstr "@@disregard|Desconsiderar %s@@"
 
-#~ msgid "Show IP: On"
-#~ msgstr "Mostrar IP: Activado"
+#~ msgid "@@drop|Drop@@"
+#~ msgstr "@@drop|Tirar@@"
 
-#~ msgid "Show IP: Off"
-#~ msgstr "Mostrar IP: Cancelado"
+#~ msgid "@@ignore|Ignore %s@@"
+#~ msgstr "@@ignore|Ignorar %s@@"
 
-#~ msgid "Registration disabled"
-#~ msgstr "Registro desabilitado."
+#~ msgid "@@pickup|Pick Up %s@@"
+#~ msgstr "@@pegar|Coger %s@@"
 
-#~ msgid "You need to use the website to register an account for this server."
-#~ msgstr "Necesitas registrarte desde la web para difrutar del juego."
+#~ msgid "@@pickup|Pick up %s@@"
+#~ msgstr "@@pickup|Cojer %s@@"
 
-#~ msgid "Need"
-#~ msgstr "Necesitas"
+#~ msgid "@@retrieve|Retrieve@@"
+#~ msgstr "@@retrieve|Retirar@@"
 
-#~ msgid "Clear log"
-#~ msgstr "Limpiar log"
+#~ msgid "@@split|Split@@"
+#~ msgstr "@@split|Dividir@@"
 
-#~ msgid "Error retreiving server list!"
-#~ msgstr "Error al recuperar la lista de servers!"
+#~ msgid "@@store|Store@@"
+#~ msgstr "@@store|Almacenar@@"
 
-#~ msgid "requires a newer version"
-#~ msgstr "requiere una version mas nueva"
+#~ msgid "@@trade|Trade With %s@@"
+#~ msgstr "@@trade|Intercambiar con %s@@"
 
-#~ msgid "requires v%s"
-#~ msgstr "requiere v%s"
+#~ msgid "@@unignore|Un-Ignore %s@@"
+#~ msgstr "@@unignore|Dejar de ignorar %s@@"
 
-#~ msgid "Log NPC dialogue"
-#~ msgstr "Log dealogos con un NPC"
+#~ msgid "@@use|Equip@@"
+#~ msgstr "@@use|Equipar@@"
 
-#~ msgid "Disable transparency (Low CPU mode)"
-#~ msgstr "Desabilitar transparencia (CPU Modo)"
+#~ msgid "@@use|Unequip@@"
+#~ msgstr "@@use|Desequipar@@"
 
-#~ msgid ""
-#~ "Applying change to OpenGL requires restart. In case OpenGL messes up your "
-#~ "game graphics, restart the game with the command line option \"--no-opengl"
-#~ "\"."
-#~ msgstr ""
-#~ "Cambiar a OpenGL necesita reiniciar el cliente. En caso de OpenGL atrape "
-#~ "tus graficos, abra el juego atraves de linea de comando con la seguinte "
-#~ "opcion: \"--no-opengl\"."
+#~ msgid "@@use|Use@@"
+#~ msgstr "@@use|Usar@@"
 
-#~ msgid "Deactivating OpenGL"
-#~ msgstr "Desativando OpenGL"
+#~ msgid "Accepted guild invite from %s."
+#~ msgstr "Aceptada la invitación a la guild de  %s."
 
-#~ msgid "Transparency disabled"
-#~ msgstr "Transparencia desabilitada"
+#~ msgid "Access denied."
+#~ msgstr "Acesso denegado."
 
-#~ msgid "You must restart to apply changes."
-#~ msgstr "Debes reiniciar el cliente para aplicar los cambios."
+#~ msgid "Ammo"
+#~ msgstr "Municion"
 
-#~ msgid "Transparency enabled"
-#~ msgstr "Transparencia habilitada."
+#~ msgid "Arms"
+#~ msgstr "Armas"
 
-#~ msgid "Creating guild failed, please choose a shorter name."
-#~ msgstr "Fallo al crear Guild escoja un nombre mas corto."
+#~ msgid "Attack:"
+#~ msgstr "Ataque:"
 
-#~ msgid "Creating party failed, please choose a shorter name."
-#~ msgstr "Fallo al crear un Grupo escoja un nombre mas corto."
+#~ msgid "Axe"
+#~ msgstr "Hacha"
 
-#~ msgid "Being"
-#~ msgstr "Personaje"
+#~ msgid "Background"
+#~ msgstr "Fondo"
 
-#~ msgid "Other Players' Names"
-#~ msgstr "Nombres de otros jugadores"
+#~ msgid "Bow"
+#~ msgstr "Arco"
 
-#~ msgid "Own Name"
-#~ msgstr "Propio Nombre"
+#~ msgid "Buddy"
+#~ msgstr "Amigo"
 
-#~ msgid "GM Names"
-#~ msgstr "Nombres De Los GMs"
+#~ msgid "Buddy List"
+#~ msgstr "Lista de amigos"
 
-#~ msgid "NPCs"
-#~ msgstr "NPCs"
+#~ msgid "Buddys"
+#~ msgstr "Amigos"
 
-#~ msgid "Monsters"
-#~ msgstr "Monstruos"
+#~ msgid "Cast Test Spell 1"
+#~ msgstr "Lanzar echizo de prueba   1"
 
-#~ msgid "Party Members"
-#~ msgstr "Miembros del grupo"
+#~ msgid "Cast Test Spell 2"
+#~ msgstr "Lanzar echizo de prueba   2"
 
-#~ msgid "Guild Members"
-#~ msgstr "Miembros del guild"
+#~ msgid "Cast Test Spell 3"
+#~ msgstr "Lanzar echizo de prueba   3"
 
-#~ msgid "Particle Effects"
-#~ msgstr "Efectos Particulares"
+#~ msgid "Command: /new <party-name>"
+#~ msgstr "Comando: /new <nombre-del-grupo>"
 
-#~ msgid "Pickup Notification"
-#~ msgstr "Aviso al cojer un objeto"
+#~ msgid "Connecting to account server..."
+#~ msgstr "Conectando al servidor de cuentas..."
 
-#~ msgid "Exp Notification"
-#~ msgstr "Aviso de experiencia"
+#~ msgid "Connecting to character server..."
+#~ msgstr "Conectando al servidor de personajes..."
 
-#~ msgid "Other Player Hits Monster"
-#~ msgstr "Cuando atacan a otros montruos"
+#~ msgid "Cost"
+#~ msgstr "Precio"
 
-#~ msgid "Monster Hits Player"
-#~ msgstr "Cuando un monstruo te ataca"
+#~ msgid "Couldn't set "
+#~ msgstr "No se puede configurar "
 
-#~ msgid "Critical Hit"
-#~ msgstr "Golpe Critico"
+#~ msgid "Craft"
+#~ msgstr "Embarcaciones"
 
-#~ msgid "Local Player Hits Monster"
-#~ msgstr "Cuando le atacas al monstruo"
+#~ msgid "Crafts"
+#~ msgstr "Artesanos"
 
-#~ msgid "Local Player Critical Hit"
-#~ msgstr "Golpe Critico del jugador"
+#~ msgid "Description: %s"
+#~ msgstr "Descripcion: %s"
 
-#~ msgid "Local Player Miss"
-#~ msgstr "Cuando fallas un ataque"
+#~ msgid "Effect: %s"
+#~ msgstr "Efecto: %s"
 
-#~ msgid "Misses"
-#~ msgstr "Muchos fallos al atacar"
+#~ msgid "Exp"
+#~ msgstr "Exp"
 
-#~ msgid "Away"
-#~ msgstr "Fuera del Teclado"
+#~ msgid "Failed to switch to "
+#~ msgstr "Fallo al cambiar a "
 
-#~ msgid "Account banned."
-#~ msgstr "Cuenta Baneada."
+#~ msgid "Floating '...' bubble"
+#~ msgstr "Burbuja '...' flotante"
 
-#~ msgid "Account banned"
-#~ msgstr "Cuenta Baneada"
+#~ msgid "Floating bubble"
+#~ msgstr "Burbuja Flotante"
 
-#~ msgid ""
-#~ "Access denied. Most likely, there are too many players on this server."
-#~ msgstr "Acesso denegado.Probablemente es que alla muchos jugadores."
+#~ msgid "Follow %s"
+#~ msgstr "Seguir %s"
 
-#~ msgid "Unknown char-server failure."
-#~ msgstr "Error desconocido del char-server."
+#~ msgid "GM"
+#~ msgstr "GM"
 
-#~ msgid "Inviting failed, because you can't see a player called %s."
-#~ msgstr "Imposible invitar por que no puedes ver al jugador %s."
+#~ msgid "Generics"
+#~ msgstr "Genericos"
 
-#~ msgid "Text Shadow"
-#~ msgstr "Sombra de Texto"
+#~ msgid "Guilds"
+#~ msgstr "Guilds"
 
-#~ msgid "Text Outline"
-#~ msgstr "Lados del texto"
+#~ msgid "HP"
+#~ msgstr "PV"
 
-#~ msgid "Progress Bar Labels"
-#~ msgstr "Barra de progreso"
+#~ msgid "HP Bar"
+#~ msgstr "Barra de HP"
 
-#~ msgid "Background"
-#~ msgstr "Fondo"
+#~ msgid "Hats"
+#~ msgstr "Gorros"
 
 #~ msgid "Highlight"
 #~ msgstr "Opacidad"
 
-#~ msgid "Tab Highlight"
-#~ msgstr "Opacidad de una tabla"
+#~ msgid "Hyperlink"
+#~ msgstr "Link"
 
-#, fuzzy
-#~ msgid "Item Too Expensive"
-#~ msgstr "Objeto muy caro"
+#~ msgid "Inviting like this isn't supported at the moment."
+#~ msgstr "Invitar así no esta soportado por el momento."
+
+#~ msgid "Is"
+#~ msgstr "Es"
 
 #, fuzzy
 #~ msgid "Item Is Equipped"
 #~ msgstr "Objeto esta equipado"
 
-#~ msgid "GM"
-#~ msgstr "GM"
+#, fuzzy
+#~ msgid "Item Too Expensive"
+#~ msgstr "Objeto muy caro"
 
-#~ msgid "Player"
-#~ msgstr "Jugador"
+#~ msgid "Job"
+#~ msgstr "Trabajo"
 
-#~ msgid "Whisper"
-#~ msgstr "Sussurrar"
+#~ msgid "Job Level: %d"
+#~ msgstr "Nivel de trabajo: %d"
 
-#~ msgid "Is"
-#~ msgstr "Es"
+#~ msgid "Knife"
+#~ msgstr "Navaja"
 
-#~ msgid "Server"
-#~ msgstr "Servidor"
+#~ msgid "Level"
+#~ msgstr "Nivel"
 
 #~ msgid "Logger"
 #~ msgstr "Historial"
 
-#~ msgid "Hyperlink"
-#~ msgstr "Link"
-
-#~ msgid "Unknown Item Type"
-#~ msgstr "Tipo de objeto desconocido"
-
-#~ msgid "Generics"
-#~ msgstr "Genericos"
-
-#~ msgid "Hats"
-#~ msgstr "Gorros"
-
-#~ msgid "Usables"
-#~ msgstr "Usables"
-
-#~ msgid "Shirts"
-#~ msgstr "Camisas"
+#~ msgid "MP"
+#~ msgstr "PM"
 
-#, fuzzy
-#~ msgid "One Handed Weapons"
-#~ msgstr "Armas para 1 mano"
-
-#~ msgid "Pants"
-#~ msgstr "Pantalones"
+#~ msgid "Mace"
+#~ msgstr "Mazo"
 
-#~ msgid "Shoes"
-#~ msgstr "Zapatos"
+#~ msgid "Magic"
+#~ msgstr "Magia"
 
-#, fuzzy
-#~ msgid "Two Handed Weapons"
-#~ msgstr "Armas con las 2 manos"
+#~ msgid "Max level"
+#~ msgstr "Nivel maximo"
 
-#~ msgid "Shields"
-#~ msgstr "Escudos"
+#~ msgid "Money"
+#~ msgstr "Dinero"
 
-#~ msgid "Rings"
-#~ msgstr "Anillos"
+#~ msgid "Mystery Skill"
+#~ msgstr "Habilidade Misteriosa"
 
 #~ msgid "Necklaces"
 #~ msgstr "Collares"
 
-#~ msgid "Arms"
-#~ msgstr "Armas"
-
-#~ msgid "Ammo"
-#~ msgstr "Municion"
-
-#~ msgid "HP Bar"
-#~ msgstr "Barra de HP"
+#~ msgid "New"
+#~ msgstr "Nuevo"
 
-#~ msgid "3/4 HP Bar"
-#~ msgstr "3/4 de barra de HP"
+#~ msgid "Ok"
+#~ msgstr "Ok"
 
-#~ msgid "1/2 HP Bar"
-#~ msgstr "1/2 de barra de HP"
+#, fuzzy
+#~ msgid "One Handed Weapons"
+#~ msgstr "Armas para 1 mano"
 
-#~ msgid "1/4 HP Bar"
-#~ msgstr "1/4 de barra de HP"
+#~ msgid "One stat is zero."
+#~ msgstr "Un stat es 0."
 
-#~ msgid "no"
-#~ msgstr "No"
+#~ msgid "Pants"
+#~ msgstr "Pantalones"
 
-#~ msgid "Buddy"
-#~ msgstr "Amigo"
+#~ msgid "Party Window"
+#~ msgstr "Ventana de Grupo"
 
-#~ msgid "Buddy List"
-#~ msgstr "Lista de amigos"
+#~ msgid "Player"
+#~ msgstr "Jugador"
 
-#~ msgid "Description: %s"
-#~ msgstr "Descripcion: %s"
+#~ msgid "Polearm"
+#~ msgstr "Lanza"
 
-#~ msgid "Effect: %s"
-#~ msgstr "Efecto: %s"
+#~ msgid "Present: "
+#~ msgstr "Presente: "
 
 #~ msgid "Previous"
 #~ msgstr "Anterior"
 
-#~ msgid "New"
-#~ msgstr "Nuevo"
-
-#~ msgid "Job Level: %d"
-#~ msgstr "Nivel de trabajo: %d"
-
-#~ msgid "Present: "
-#~ msgstr "Presente: "
+#~ msgid "Progress Bar Labels"
+#~ msgstr "Barra de progreso"
 
 #~ msgid "Quit Guild"
 #~ msgstr "Salir del Guild"
 
-#~ msgid "Ok"
-#~ msgstr "Ok"
-
 #~ msgid "Recent:"
 #~ msgstr "Reciente:"
 
-#~ msgid "Magic"
-#~ msgstr "Magia"
-
-#~ msgid "Cast Test Spell 1"
-#~ msgstr "Lanzar echizo de prueba   1"
-
-#~ msgid "Cast Test Spell 2"
-#~ msgstr "Lanzar echizo de prueba   2"
-
-#~ msgid "Cast Test Spell 3"
-#~ msgstr "Lanzar echizo de prueba   3"
-
-#~ msgid "2 Handed Weapons"
-#~ msgstr "Armas para 2 manos"
-
-#~ msgid "@@trade|Trade With %s@@"
-#~ msgstr "@@trade|Intercambiar con %s@@"
-
-#~ msgid "@@attack|Attack %s@@"
-#~ msgstr "@@attack|Atacar %s@@"
-
-#~ msgid "@@disregard|Disregard %s@@"
-#~ msgstr "@@disregard|Desconsiderar %s@@"
-
-#~ msgid "@@ignore|Ignore %s@@"
-#~ msgstr "@@ignore|Ignorar %s@@"
-
-#~ msgid "@@unignore|Un-Ignore %s@@"
-#~ msgstr "@@unignore|Dejar de ignorar %s@@"
-
-#~ msgid "@@admin-kick|Kick player@@"
-#~ msgstr "@@admin-kick|Expulsar jugador@@"
-
-#~ msgid "@@cancel|Cancel@@"
-#~ msgstr "@@cancel|Cancelar@@"
-
-#~ msgid "@@pickup|Pick up %s@@"
-#~ msgstr "@@pickup|Cojer %s@@"
-
-#~ msgid "@@use|Unequip@@"
-#~ msgstr "@@use|Desequipar@@"
+#~ msgid "Rejected guild invite from %s."
+#~ msgstr "Cancelada la invitación a la guild de %s."
 
-#~ msgid "@@use|Equip@@"
-#~ msgstr "@@use|Equipar@@"
-
-#~ msgid "@@use|Use@@"
-#~ msgstr "@@use|Usar@@"
-
-#~ msgid "@@drop|Drop@@"
-#~ msgstr "@@drop|Tirar@@"
+#~ msgid "Remaining Status Points: %d"
+#~ msgstr "Puntos de Status restantes: %d"
 
-#~ msgid "@@split|Split@@"
-#~ msgstr "@@split|Dividir@@"
+#~ msgid "Rings"
+#~ msgstr "Anillos"
 
-#~ msgid "@@store|Store@@"
-#~ msgstr "@@store|Almacenar@@"
+#~ msgid "Scroll laziness"
+#~ msgstr "Desplazar Laziness"
 
-#~ msgid "@@retrieve|Retrieve@@"
-#~ msgstr "@@retrieve|Retirar@@"
+#~ msgid "Scroll radius"
+#~ msgstr "Desplazar Radius"
 
 #~ msgid "Select Server"
 #~ msgstr "Selecionar Servidor"
 
-#~ msgid "Failed to switch to "
-#~ msgstr "Fallo al cambiar a "
-
-#~ msgid "windowed"
-#~ msgstr "en ventana"
-
-#~ msgid "fullscreen"
-#~ msgstr "pantalla completa"
-
-#~ msgid "Mystery Skill"
-#~ msgstr "Habilidade Misteriosa"
-
-#~ msgid "Weapons"
-#~ msgstr "Armas"
-
-#~ msgid "Crafts"
-#~ msgstr "Artesanos"
-
-#~ msgid "Stats"
-#~ msgstr "Status"
-
-#~ msgid "Total"
-#~ msgstr "Total"
-
-#~ msgid "Cost"
-#~ msgstr "Precio"
+#~ msgid "Server"
+#~ msgstr "Servidor"
 
-#~ msgid "Attack:"
-#~ msgstr "Ataque:"
+#~ msgid "Shields"
+#~ msgstr "Escudos"
 
-#~ msgid "% Reflex:"
-#~ msgstr "% Reflexionar:"
+#~ msgid "Shirts"
+#~ msgstr "Camisas"
 
-#~ msgid "Remaining Status Points: %d"
-#~ msgstr "Puntos de Status restantes: %d"
+#~ msgid "Shoes"
+#~ msgstr "Zapatos"
 
-#~ msgid "Max level"
-#~ msgstr "Nivel maximo"
+#~ msgid "Shooting"
+#~ msgstr "Tiro"
 
-#~ msgid "curl error "
-#~ msgstr "Error de curl "
+#~ msgid "Show monster damage"
+#~ msgstr "Mostrar daño recibido"
 
-#~ msgid " host: "
-#~ msgstr " host: "
+#~ msgid "Slots: "
+#~ msgstr "ranuras: "
 
-#~ msgid "Guilds"
-#~ msgstr "Guilds"
+#~ msgid "Special %d"
+#~ msgstr "Especial %d"
 
-#~ msgid "Buddys"
-#~ msgstr "Amigos"
+#~ msgid "Specials Set %d"
+#~ msgstr "Especiales %d"
 
-#~ msgid "Party Window"
-#~ msgstr "Ventana de Grupo"
-
-#~ msgid "Unarmed"
-#~ msgstr "Desarmado"
+#~ msgid "Staff"
+#~ msgstr "Staff"
 
-#~ msgid "Knife"
-#~ msgstr "Navaja"
+#~ msgid "Stats"
+#~ msgstr "Status"
 
 #~ msgid "Sword"
 #~ msgstr "Espada"
 
-#~ msgid "Polearm"
-#~ msgstr "Lanza"
+#~ msgid "Tab Highlight"
+#~ msgstr "Opacidad de una tabla"
 
-#~ msgid "Staff"
-#~ msgstr "Staff"
+#~ msgid "Text Outline"
+#~ msgstr "Lados del texto"
 
-#~ msgid "Whip"
-#~ msgstr "Whip"
+#~ msgid "Text Shadow"
+#~ msgstr "Sombra de Texto"
 
-#~ msgid "Bow"
-#~ msgstr "Arco"
+#~ msgid "The Mana World %s"
+#~ msgstr "The Mana World %s"
 
-#~ msgid "Shooting"
-#~ msgstr "Tiro"
+#~ msgid "Thrown"
+#~ msgstr "Arrojado"
 
-#~ msgid "Mace"
-#~ msgstr "Mazo"
+#~ msgid "Total"
+#~ msgstr "Total"
 
-#~ msgid "Axe"
-#~ msgstr "Hacha"
+#, fuzzy
+#~ msgid "Two Handed Weapons"
+#~ msgstr "Armas con las 2 manos"
 
-#~ msgid "Thrown"
-#~ msgstr "Arrojado"
+#~ msgid "Unable to load selection.png"
+#~ msgstr "no se pudo cargar selection.png"
 
-#~ msgid "Craft"
-#~ msgstr "Embarcaciones"
+#~ msgid "Unarmed"
+#~ msgstr "Desarmado"
 
 #~ msgid "Unknown Skill"
 #~ msgstr "Habilidade desconocida"
 
-#~ msgid " can't be created, but it doesn't exist! Exiting."
-#~ msgstr " No se puede crear, pero no existe! Saliendo."
-
-#~ msgid "Couldn't set "
-#~ msgstr "No se puede configurar "
+#~ msgid "Unknown failure to select character."
+#~ msgstr "Error desconocido al seleccionar este jugador."
 
-#~ msgid " video mode: "
-#~ msgstr " modo de video: "
+#~ msgid "Unnamed"
+#~ msgstr "Sin nombre"
 
-#~ msgid "mana"
-#~ msgstr "Mana"
+#~ msgid "Usables"
+#~ msgstr "Usables"
 
-#~ msgid "Connecting to character server..."
-#~ msgstr "Conectando al servidor de personajes..."
+#~ msgid "Weapons"
+#~ msgstr "Armas"
 
-#~ msgid "Connecting to account server..."
-#~ msgstr "Conectando al servidor de cuentas..."
+#~ msgid "Whip"
+#~ msgstr "Whip"
 
-#~ msgid "/new > Alias of create"
-#~ msgstr "/new > Alias de crear"
+#~ msgid "Whisper"
+#~ msgstr "Sussurrar"
 
-#~ msgid "Command: /new <party-name>"
-#~ msgstr "Comando: /new <nombre-del-grupo>"
+#~ msgid "Willpower:"
+#~ msgstr "Fuerza de voluntad:"
 
 #~ msgid "a"
 #~ msgstr "una(o)"
 
-#~ msgid "Unnamed"
-#~ msgstr "Sin nombre"
+#~ msgid "curl error "
+#~ msgstr "Error de curl "
 
-#~ msgid "@@pickup|Pick Up %s@@"
-#~ msgstr "@@pegar|Coger %s@@"
+#~ msgid "fullscreen"
+#~ msgstr "pantalla completa"
 
-#~ msgid "Scroll radius"
-#~ msgstr "Desplazar Radius"
+#~ msgid "items.xml"
+#~ msgstr "items.xml"
 
-#~ msgid "Scroll laziness"
-#~ msgstr "Desplazar Laziness"
+#~ msgid "mana"
+#~ msgstr "Mana"
 
-#~ msgid "Unable to load selection.png"
-#~ msgstr "no se pudo cargar selection.png"
+#~ msgid "monsters.xml"
+#~ msgstr "monsters.xml"
 
-#~ msgid "Slots: "
-#~ msgstr "ranuras: "
+#~ msgid "no"
+#~ msgstr "No"
 
 #~ msgid "skills.xml"
 #~ msgstr "skills.xml"
 
-#~ msgid " cancelled"
-#~ msgstr " cancelado"
-
-#~ msgid "monsters.xml"
-#~ msgstr "monsters.xml"
-
-#~ msgid "items.xml"
-#~ msgstr "items.xml"
-
-#~ msgid "The Mana World %s"
-#~ msgstr "The Mana World %s"
+#~ msgid "windowed"
+#~ msgstr "en ventana"
diff --git a/po/fi.po b/po/fi.po
index 7cb15b8e..cacb288b 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,15 +1,16 @@
 # Finnish translation for mana
 # Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008
 # This file is distributed under the same license as the mana package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2008.
 #
+# gemis <vienamo@mbnet.fi>, 2009.
+# Sini Ruohomaa <sini.ruohomaa@iki.fi>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
-"Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-12-13 20:04+0100\n"
-"PO-Revision-Date: 2009-07-25 15:42+0000\n"
-"Last-Translator: gemis <vienamo@mbnet.fi>\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-04-30 16:50+0200\n"
+"PO-Revision-Date: 2011-04-10 19:21+0300\n"
+"Last-Translator: Sini Ruohomaa <sini.ruohomaa@iki.fi>\n"
 "Language-Team: Finnish <fi@li.org>\n"
 "Language: fi\n"
 "MIME-Version: 1.0\n"
@@ -19,3597 +20,3795 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/client.cpp:598 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
-msgid "Setup"
-msgstr "Asetukset"
+#: ../src/gui/npcdialog.cpp:208
+msgid ""
+"\n"
+"> Next\n"
+msgstr ""
+"\n"
+"> Seuraava\n"
 
-#: src/client.cpp:679
-#, fuzzy
-msgid "Connecting to server"
-msgstr "Yhdistetään kartta palvelimelle"
+#: ../src/main.cpp:45
+msgid "              to the mana client."
+msgstr ""
 
-#: src/client.cpp:706
-#, fuzzy
-msgid "Logging in"
-msgstr "Kirjaudu sisään"
+#: ../src/main.cpp:44
+msgid "              used to set custom parameters"
+msgstr ""
 
-#: src/client.cpp:739
-msgid "Entering game world"
+#: ../src/main.cpp:62
+msgid "     --chat-log-dir   : Chat log dir to use"
 msgstr ""
 
-#: src/client.cpp:804
-#, fuzzy
-msgid "Requesting characters"
-msgstr "Valitse hahmo"
+#: ../src/main.cpp:61
+msgid "     --localdata-dir  : Directory to use as local data directory"
+msgstr ""
 
-#: src/client.cpp:833
-#, fuzzy
-msgid "Connecting to the game server"
-msgstr "Yhdistetään kartta palvelimelle"
+#: ../src/main.cpp:65
+msgid "     --no-opengl      : Disable OpenGL for this session"
+msgstr "     --no-opengl      : Poista OpenGL käytöstä tämän session ajaksi"
 
-#: src/client.cpp:843
-#, fuzzy
-msgid "Changing game servers"
-msgstr "Palvelin:"
+#: ../src/main.cpp:63
+msgid "     --screenshot-dir : Directory to store screenshots"
+msgstr "     --screenshot-dir : Kuvankaappausten tallennushakemisto"
 
-#: src/client.cpp:872 src/client.cpp:879 src/client.cpp:1014
-#: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
-#: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:323 src/gui/unregisterdialog.cpp:133
-#: src/net/manaserv/charhandler.cpp:174 src/net/manaserv/charhandler.cpp:217
-#: src/net/tmwa/charserverhandler.cpp:134
-#: src/net/tmwa/charserverhandler.cpp:151
-msgid "Error"
-msgstr "Virhe"
+#: ../src/main.cpp:56
+msgid "     --update-host    : Use this update host"
+msgstr "     --update-host    : Käytä tätä päivityspalvelinta"
 
-#: src/client.cpp:888
-msgid "Requesting registration details"
-msgstr ""
+#: ../src/main.cpp:50
+msgid "  -C --config-dir     : Configuration directory to use"
+msgstr "  -C --config-dir     : Käytä tätä asetushakemistoa"
 
-#: src/client.cpp:915
-#, fuzzy
-msgid "Password Change"
-msgstr "Salasana:"
+#: ../src/main.cpp:57
+msgid "  -D --default        : Choose default character server and character"
+msgstr "  -D --default        : Aseta oletushahmopalvelin ja -hahmo"
 
-#: src/client.cpp:916
-msgid "Password changed successfully!"
-msgstr ""
+#: ../src/main.cpp:52
+msgid "  -P --password       : Login with this password"
+msgstr "  -P --password       : Salasana sisäänkirjautumiseen"
 
-#: src/client.cpp:935
-#, fuzzy
-msgid "Email Change"
-msgstr "Muuta"
+#: ../src/main.cpp:51
+msgid "  -U --username       : Login with this username"
+msgstr "  -U --username       : Käyttäjätunnus sisäänkirjautumiseen"
 
-#: src/client.cpp:936
-msgid "Email changed successfully!"
-msgstr ""
+#: ../src/main.cpp:53
+msgid "  -c --character      : Login with this character"
+msgstr "  -c --character      : Hahmo sisäänkirjautumiseen"
 
-#: src/client.cpp:956
-#, fuzzy
-msgid "Unregister Successful"
-msgstr "Poista palvelimelta"
+#: ../src/main.cpp:60
+msgid "  -d --data           : Directory to load game data from"
+msgstr "  -d --data           : Lataa pelidata tästä hakemistosta"
 
-#: src/client.cpp:957
-msgid "Farewell, come back any time..."
+#: ../src/main.cpp:49
+msgid "  -h --help           : Display this help"
+msgstr "  -h --help           : Näytä tämä ohje"
+
+#: ../src/main.cpp:55
+msgid "  -p --port           : Login server port"
+msgstr "  -p --port           : Palvelinportti sisäänkirjautumiseen "
+
+#: ../src/main.cpp:54
+msgid "  -s --server         : Login server name or IP"
 msgstr ""
+"  -s --server         : Palvelinnimi tai IP-osoite sisäänkirjautumiseen"
+
+#: ../src/main.cpp:59
+msgid "  -u --skip-update    : Skip the update downloads"
+msgstr "  -u --skip-update    : Ohita päivityslataukset"
+
+#: ../src/main.cpp:48
+msgid "  -v --version        : Display the version"
+msgstr "  -v --version        : Näytä versionumero"
+
+#: ../src/gui/updatewindow.cpp:419
+msgid "##1  It is strongly recommended that"
+msgstr "##1  Suosittelemme vahvasti että"
+
+#: ../src/gui/updatewindow.cpp:417
+msgid "##1  The update process is incomplete."
+msgstr "##1  Päivitysprosessi keskeytyi"
+
+#: ../src/gui/updatewindow.cpp:421
+msgid "##1  you try again later."
+msgstr "##1  yrität myöhemmin uudelleen"
 
-#: src/client.cpp:1138 src/client.cpp:1161
+# TODO: msgfmt -c complains of percentages.
+#: ../src/net/tmwa/generalhandler.cpp:241
+#, fuzzy, no-c-format
+msgid "% Accuracy"
+msgstr "% Tarkkuus"
+
+# Note: "inventive" translation in hopes of proper language
+#: ../src/net/tmwa/generalhandler.cpp:243
+#, fuzzy, no-c-format
+msgid "% Critical"
+msgstr "% Täysosuma"
+
+#: ../src/net/tmwa/generalhandler.cpp:242
+#, fuzzy, no-c-format
+msgid "% Evade"
+msgstr "% Välttö"
+
+#: ../src/gui/debugwindow.cpp:61 ../src/gui/debugwindow.cpp:64
 #, c-format
-msgid "%s doesn't exist and can't be created! Exiting."
-msgstr ""
+msgid "%d FPS"
+msgstr "%d FPS"
 
-#: src/client.cpp:1281
+# Note: considering Frames Per Second a "standard" unit name here
+#: ../src/gui/debugwindow.cpp:56
 #, c-format
-msgid "Invalid update host: %s"
-msgstr ""
+msgid "%d FPS (OpenGL)"
+msgstr "%d FPS (OpenGL)"
 
-#: src/client.cpp:1315 src/client.cpp:1321
-msgid "Error creating updates directory!"
-msgstr ""
+#: ../src/client.cpp:1154 ../src/client.cpp:1182
+#, c-format
+msgid "%s doesn't exist and can't be created! Exiting."
+msgstr "%s ei ole olemassa eikä sitä voi luoda! Poistun."
 
-#: src/commandhandler.cpp:131 src/commandhandler.cpp:317
-msgid "Unknown command."
-msgstr "Tuntematon komento."
+#: ../src/net/manaserv/chathandler.cpp:306
+#, c-format
+msgid "%s entered the channel."
+msgstr "%s liittyi kanavalle."
 
-#: src/commandhandler.cpp:160
-msgid "-- Help --"
-msgstr "--Apua--"
+#: ../src/gui/socialwindow.cpp:601
+#, c-format
+msgid "%s has invited you to join the %s party."
+msgstr "%s on kutsunut sinut liittymään ryhmäänsä %s."
 
-#: src/commandhandler.cpp:161
-msgid "/help > Display this help"
-msgstr "/help > Näyttää tämän apu tekstin"
+#: ../src/gui/socialwindow.cpp:558
+#, c-format
+msgid "%s has invited you to join the guild %s."
+msgstr "%s on kutsunut sinut liittymään kiltaan %s."
 
-#: src/commandhandler.cpp:163
-msgid "/where > Display map name"
-msgstr "/where > Näytä kartan nimi"
+#: ../src/gui/socialwindow.cpp:596
+#, c-format
+msgid "%s has invited you to join their party."
+msgstr "%s on kutsunut sinut liittymään ryhmäänsä."
 
-#: src/commandhandler.cpp:164
-msgid "/who > Display number of online users"
-msgstr "/who > Näytä paikalla olevien pelaajien määrä"
+#: ../src/net/manaserv/chathandler.cpp:337
+#, c-format
+msgid "%s has kicked %s."
+msgstr "%s potkaisi käyttäjän %s ulos."
 
-#: src/commandhandler.cpp:165
-msgid "/me > Tell something about yourself"
-msgstr "/me > Kerro jotain itsestäsi"
+#: ../src/net/tmwa/partyhandler.cpp:246
+#, c-format
+msgid "%s has left your party."
+msgstr "%s on eronnut ryhmästä."
 
-#: src/commandhandler.cpp:167
-msgid "/clear > Clears this window"
-msgstr "/clear > Tyhjennä ikkuna"
+#: ../src/net/manaserv/chathandler.cpp:327
+#, c-format
+msgid "%s has set mode %s on user %s."
+msgstr "%s asetti tilan %s käyttäjälle %s."
 
-#: src/commandhandler.cpp:169
-msgid "/msg > Send a private message to a user"
-msgstr "/msg > Lähetä yksityis viesti käyttäjälle"
+#: ../src/net/tmwa/partyhandler.cpp:119
+#, c-format
+msgid "%s is already a member of a party."
+msgstr "%s kuuluu jo johonkin ryhmään."
 
-#: src/commandhandler.cpp:170
-msgid "/whisper > Alias of msg"
-msgstr ""
+#: ../src/net/tmwa/partyhandler.cpp:368
+#, c-format
+msgid "%s is not in your party!"
+msgstr "%s ei ole ryhmässäsi!"
 
-#: src/commandhandler.cpp:171
-msgid "/w > Alias of msg"
-msgstr ""
+#: ../src/net/tmwa/partyhandler.cpp:127
+#, c-format
+msgid "%s is now a member of your party."
+msgstr "%s on nyt ryhmäsi jäsen."
 
-#: src/commandhandler.cpp:172
-msgid "/query > Makes a tab for private messages with another user"
-msgstr "/query > Tekee välilehden toisen käyttäjän yksityisviestejä varten."
+#: ../src/net/manaserv/partyhandler.cpp:105
+#, c-format
+msgid "%s joined the party."
+msgstr "%s liittyi ryhmään."
 
-#: src/commandhandler.cpp:174
-msgid "/q > Alias of query"
-msgstr ""
+#: ../src/net/manaserv/chathandler.cpp:311
+#, c-format
+msgid "%s left the channel."
+msgstr "%s poistui kanavalta."
 
-#: src/commandhandler.cpp:176
-msgid "/ignore > ignore a player"
-msgstr ""
+#: ../src/net/tmwa/partyhandler.cpp:123
+#, c-format
+msgid "%s refused your invitation."
+msgstr "%s ei ottanut kutsuasi vastaan."
 
-#: src/commandhandler.cpp:177
-msgid "/unignore > stop ignoring a player"
-msgstr ""
+#: ../src/net/manaserv/partyhandler.cpp:123
+#, c-format
+msgid "%s rejected your invite."
+msgstr "%s ei ottanut kutsuasi vastaan."
 
-#: src/commandhandler.cpp:179
-msgid "/list > Display all public channels"
-msgstr "/list > Näytä kaikki julkiset kanavat"
+#: ../src/net/manaserv/tradehandler.cpp:116
+#: ../src/net/tmwa/tradehandler.cpp:110
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr "%s haluaa tehdä kauppaa kanssasi, katsotko tarjouksen?"
 
-#: src/commandhandler.cpp:180
-msgid "/join > Join or create a channel"
-msgstr "/join > Liity tai luo kanava"
+#: ../src/gui/widgets/chattab.cpp:153
+#, c-format
+msgid "%s whispers: %s"
+msgstr "%s kuiskaa: %s"
 
-#: src/commandhandler.cpp:182
-msgid "/createparty > Create a new party"
-msgstr ""
+#: ../src/gui/charselectdialog.cpp:418 ../src/gui/charselectdialog.cpp:419
+msgid "(empty)"
+msgstr "(tyhjä)"
 
-#: src/commandhandler.cpp:183
-msgid "/party > Invite a user to party"
-msgstr ""
+#: ../src/commandhandler.cpp:221
+msgid "*** only available to a GM ***"
+msgstr "*** Vain GM-pelaajien käytettävissä ***"
 
-#: src/commandhandler.cpp:185
-msgid "/record > Start recording the chat to an external file"
-msgstr "/record > Aloita keskustelun nauhoitus ulkoiseen tiedostoon"
+#: ../src/gui/buy.cpp:74 ../src/gui/itemamount.cpp:112
+#: ../src/gui/npcdialog.cpp:124 ../src/gui/sell.cpp:74
+#: ../src/gui/statuswindow.cpp:464
+msgid "+"
+msgstr "+"
 
-#: src/commandhandler.cpp:187
-msgid "/toggle > Determine whether <return> toggles the chat log"
-msgstr ""
+#: ../src/gui/buy.cpp:77 ../src/gui/itemamount.cpp:111
+#: ../src/gui/npcdialog.cpp:125 ../src/gui/sell.cpp:75
+#: ../src/gui/statuswindow.cpp:476
+msgid "-"
+msgstr "-"
 
-#: src/commandhandler.cpp:189
-msgid "/present > Get list of players present (sent to chat log, if logging)"
-msgstr ""
+#: ../src/commandhandler.cpp:165
+msgid "-- Help --"
+msgstr "-- Ohje --"
 
-#: src/commandhandler.cpp:192
+#: ../src/commandhandler.cpp:200
 msgid "/announce > Global announcement (GM only)"
-msgstr ""
+msgstr "/announce > Yleinen ilmoitus (vain GM-pelaajat)"
 
-#: src/commandhandler.cpp:196
-msgid "For more information, type /help <command>."
+#: ../src/commandhandler.cpp:181
+msgid "/away > Tell the other whispering players you're away from keyboard."
 msgstr ""
+"/away > Kerro sinulle kuiskaaville pelaajille, ettet ole ruudun äärellä."
 
-#: src/commandhandler.cpp:200
-msgid "Command: /help"
-msgstr ""
+#: ../src/commandhandler.cpp:172
+msgid "/clear > Clears this window"
+msgstr "/clear > Tyhjennä tämä ikkuna"
 
-#: src/commandhandler.cpp:201
-msgid "This command displays a list of all commands available."
-msgstr "Tämä komento näyttää listan kaikista komennoista."
+#: ../src/gui/widgets/whispertab.cpp:74
+msgid "/close > Close the whisper tab"
+msgstr "/close > Sulje kuiskausvälilehti"
 
-#: src/commandhandler.cpp:203
-msgid "Command: /help <command>"
-msgstr ""
+#: ../src/commandhandler.cpp:190
+msgid "/createparty > Create a new party"
+msgstr "/createparty > Luo uusi ryhmä"
 
-#: src/commandhandler.cpp:204
-msgid "This command displays help on <command>."
-msgstr ""
+#: ../src/net/tmwa/gui/partytab.cpp:64
+msgid "/exp > Show/change party experience sharing options"
+msgstr "/exp > Näytä/muuta ryhmän kokemuksenjaon asetuksia"
 
-#: src/commandhandler.cpp:212
-msgid "Command: /announce <msg>"
-msgstr ""
+#: ../src/commandhandler.cpp:166
+msgid "/help > Display this help"
+msgstr "/help > Näyttää tämän ohjetekstin"
 
-#: src/commandhandler.cpp:213
-msgid "*** only available to a GM ***"
-msgstr ""
+#: ../src/net/tmwa/gui/guildtab.cpp:61 ../src/net/tmwa/gui/partytab.cpp:59
+msgid "/help > Display this help."
+msgstr "/help > Näytä tämä ohje."
 
-#: src/commandhandler.cpp:214
-msgid "This command sends the message <msg> to all players currently online."
-msgstr ""
+#: ../src/gui/widgets/whispertab.cpp:72
+msgid "/ignore > Ignore the other player"
+msgstr "/ignore > Jätä pelaaja huomiotta"
 
-#: src/commandhandler.cpp:219
-msgid "Command: /clear"
-msgstr ""
+#: ../src/commandhandler.cpp:184
+msgid "/ignore > ignore a player"
+msgstr "/ignore > Jätä pelaaja huomiotta"
 
-#: src/commandhandler.cpp:220
-msgid "This command clears the chat log of previous chat."
-msgstr ""
+#: ../src/net/tmwa/gui/guildtab.cpp:62
+msgid "/invite > Invite a player to your guild"
+msgstr "/invite > Kutsu pelaaja kiltaasi"
 
-#: src/commandhandler.cpp:224
-msgid "Command: /ignore <player>"
-msgstr ""
+#: ../src/net/tmwa/gui/partytab.cpp:60
+msgid "/invite > Invite a player to your party"
+msgstr "/invite > Kutsu pelaaja ryhmääsi"
 
-#: src/commandhandler.cpp:225
-#, fuzzy
-msgid "This command ignores the given player regardless of current relations."
-msgstr "Tämä komento näyttää paikalla olevien pelaajien määrän."
+#: ../src/net/tmwa/gui/partytab.cpp:63
+msgid "/item > Show/change party item sharing options"
+msgstr "/item > Näytä/muuta ryhmän esineidenjaon asetuksia"
 
-#: src/commandhandler.cpp:230
-msgid "Command: /join <channel>"
-msgstr ""
+#: ../src/commandhandler.cpp:188
+msgid "/join > Join or create a channel"
+msgstr "/join > Liity kanavalle tai luo uusi kanava"
 
-#: src/commandhandler.cpp:231
-msgid "This command makes you enter <channel>."
-msgstr ""
+#: ../src/gui/widgets/channeltab.cpp:53
+msgid "/kick > Kick a user from the channel"
+msgstr "/kick > Poista käyttäjä kanavalta"
 
-#: src/commandhandler.cpp:232
-msgid "If <channel> doesn't exist, it's created."
-msgstr "Jos kanavaa <cannel> ei ole, se luodaan."
+#: ../src/net/tmwa/gui/guildtab.cpp:64
+msgid "/kick > Kick some one from the guild you are in"
+msgstr "/kick > Poista käyttäjä killastasi"
 
-#: src/commandhandler.cpp:236
-msgid "Command: /list"
-msgstr ""
+# TODO: Typo in msgid: some one
+#: ../src/net/tmwa/gui/partytab.cpp:62
+msgid "/kick > Kick some one from the party you are in"
+msgstr "/kick > Potki pelaaja ryhmästäsi"
 
-#: src/commandhandler.cpp:237
-msgid "This command shows a list of all channels."
-msgstr "Tämä komento näyttää listan kaikista kanavista"
+#: ../src/net/tmwa/gui/guildtab.cpp:63
+msgid "/leave > Leave the guild you are in"
+msgstr "/leave > Eroa nykyisestä killastasi"
 
-#: src/commandhandler.cpp:241
-msgid "Command: /me <message>"
-msgstr ""
+#: ../src/net/tmwa/gui/partytab.cpp:61
+msgid "/leave > Leave the party you are in"
+msgstr "/leave > Eroa nykyisestä ryhmästäsi"
 
-#: src/commandhandler.cpp:242
-msgid "This command tell others you are (doing) <msg>."
-msgstr ""
+#: ../src/commandhandler.cpp:187
+msgid "/list > Display all public channels"
+msgstr "/list > Näytä kaikki julkiset kanavat"
 
-#: src/commandhandler.cpp:246
-msgid "Command: /msg <nick> <message>"
-msgstr ""
+# TODO: misunderstandable msgid
+#: ../src/commandhandler.cpp:170
+msgid "/me > Tell something about yourself"
+msgstr "/me > Kerro tekemisistäsi"
 
-#: src/commandhandler.cpp:247
-msgid "Command: /whisper <nick> <message>"
-msgstr ""
+#: ../src/commandhandler.cpp:174
+msgid "/msg > Send a private message to a user"
+msgstr "/msg > Lähetä yksityisviesti käyttäjälle"
 
-#: src/commandhandler.cpp:248
-msgid "Command: /w <nick> <message>"
-msgstr ""
+#: ../src/gui/widgets/channeltab.cpp:52
+msgid "/op > Make a user a channel operator"
+msgstr "/op > Tee käyttäjästä operaattori"
 
-#: src/commandhandler.cpp:249
-msgid "This command sends the text <message> to <nick>."
-msgstr "Tämä komento lähettää tekstin <message> käyttäjälle <nick>."
+#: ../src/commandhandler.cpp:191
+msgid "/party > Invite a user to party"
+msgstr "/party > Kutsu pelaaja ryhmään"
 
-#: src/commandhandler.cpp:250 src/commandhandler.cpp:269
-#: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
-#: src/net/tmwa/gui/guildtab.cpp:75 src/net/tmwa/gui/partytab.cpp:75
-msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+#: ../src/commandhandler.cpp:197
+msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
+"/present > Näytä läsnäolevien pelaajien lista (tallennetaan lokiin, jos "
+"käytössä)"
 
-#: src/commandhandler.cpp:255
-msgid "Command: /query <nick>"
-msgstr ""
+#: ../src/commandhandler.cpp:179
+msgid "/q > Alias of query"
+msgstr "/q > Toinen nimi query-komennolle"
 
-#: src/commandhandler.cpp:256
-msgid "Command: /q <nick>"
-msgstr ""
+#: ../src/commandhandler.cpp:177
+msgid "/query > Makes a tab for private messages with another user"
+msgstr "/query > Tekee välilehden toisen käyttäjän yksityisviestejä varten."
 
-#: src/commandhandler.cpp:257
-msgid "This command tries to make a tab for whispers betweenyou and <nick>."
-msgstr ""
+#: ../src/gui/widgets/channeltab.cpp:51
+msgid "/quit > Leave a channel"
+msgstr "/quit > Poistu kanavalta"
 
-#: src/commandhandler.cpp:262
-msgid "Command: /createparty <name>"
+#: ../src/commandhandler.cpp:193
+msgid "/record > Start recording the chat to an external file"
+msgstr "/record > Aloita keskustelulokin tallennus tiedostoon"
+
+#: ../src/commandhandler.cpp:195
+msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr ""
+"/toggle > Määritä, asettaako <rivinvaihto> keskustelulokin päälle/pois päältä"
 
-#: src/commandhandler.cpp:263
-#, fuzzy
-msgid "This command creates a new party called <name>."
-msgstr "Tällä komennolla poistut kanvalta."
+#: ../src/gui/widgets/channeltab.cpp:50
+msgid "/topic > Set the topic of the current channel"
+msgstr "/topic > Aseta kanavan aihe"
 
-#: src/commandhandler.cpp:267
-msgid "Command: /party <nick>"
-msgstr ""
+#: ../src/gui/widgets/whispertab.cpp:73
+msgid "/unignore > Stop ignoring the other player"
+msgstr "/unignore > Huomioi pelaaja jälleen"
 
-#: src/commandhandler.cpp:268 src/net/tmwa/gui/partytab.cpp:74
-msgid "This command invites <nick> to party with you."
-msgstr ""
+#: ../src/commandhandler.cpp:185
+msgid "/unignore > stop ignoring a player"
+msgstr "/unignore > Lopeta pelaajan huomiotta jättö"
 
-#: src/commandhandler.cpp:274
-msgid "Command: /present"
-msgstr ""
+#: ../src/gui/widgets/channeltab.cpp:49
+msgid "/users > Lists the users in the current channel"
+msgstr "/users > Näyttää käyttäjät nykyisellä kanavalla"
 
-#: src/commandhandler.cpp:275
-msgid ""
-"This command gets a list of players within hearing and sends it to either "
-"the record log if recording, or the chat log otherwise."
-msgstr ""
+#: ../src/commandhandler.cpp:176
+msgid "/w > Alias of msg"
+msgstr "/w > Kolmas nimi msg-komennolle"
 
-#: src/commandhandler.cpp:281
-msgid "Command: /record <filename>"
-msgstr ""
+#: ../src/commandhandler.cpp:168
+msgid "/where > Display map name"
+msgstr "/where > Näytä kartan nimi"
 
-#: src/commandhandler.cpp:282
-msgid "This command starts recording the chat log to the file <filename>."
-msgstr "Tämä komento aloittaa keskustelun nauhoituksen tiedostoon <filename>."
+#: ../src/commandhandler.cpp:175
+msgid "/whisper > Alias of msg"
+msgstr "/whisper > Toinen nimi msg-komennolle"
 
-#: src/commandhandler.cpp:284
-msgid "Command: /record"
-msgstr ""
+#: ../src/commandhandler.cpp:169
+msgid "/who > Display number of online users"
+msgstr "/who > Näytä paikalla olevien pelaajien määrä"
 
-#: src/commandhandler.cpp:285
-msgid "This command finishes a recording session."
-msgstr ""
+#: ../src/gui/charcreatedialog.cpp:73 ../src/gui/charcreatedialog.cpp:76
+#: ../src/gui/outfitwindow.cpp:66
+msgid "<"
+msgstr "<"
 
-#: src/commandhandler.cpp:289
-msgid "Command: /toggle <state>"
+#: ../src/net/tmwa/gui/partytab.cpp:97
+msgid ""
+"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
+"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
+"<jakopolitiikka> voi olla arvoltaan \"1\", \"yes\" tai \"true\", jolloin "
+"kokemuspisteet jaetaan, tai \"0\", \"no\" tai \"false\", jolloin "
+"kokemuspisteitä ei jaeta."
 
-#: src/commandhandler.cpp:290
+#: ../src/net/tmwa/gui/partytab.cpp:87
 msgid ""
-"This command sets whether the return key should toggle the chat log, or "
-"whether the chat log turns off automatically."
+"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
+"\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
+"<jakopolitiikka> voi olla arvoltaan \"1\", \"yes\" tai \"true\", jolloin "
+"esineet jaetaan, tai \"0\", \"no\" tai \"false\", jolloin esineitä ei jaeta."
 
-#: src/commandhandler.cpp:292
+#: ../src/commandhandler.cpp:308
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
 "\"0\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
+"<tila> voi olla arvoltaan \"1\", \"yes\" tai \"true\", jolloin rivinvaihto "
+"aktivoi keskustelulokin, tai \"0\", \"no\" tai \"false\", jolloin "
+"rivinvaihdolla ei ole vaikutusta."
 
-#: src/commandhandler.cpp:295
-msgid "Command: /toggle"
-msgstr ""
+#: ../src/gui/charcreatedialog.cpp:70 ../src/gui/charcreatedialog.cpp:75
+#: ../src/gui/outfitwindow.cpp:67
+msgid ">"
+msgstr ">"
 
-#: src/commandhandler.cpp:296
-msgid "This command displays the return toggle status."
-msgstr ""
+#: ../src/gui/setup_players.cpp:206 ../src/gui/setup_video.cpp:147
+msgid "???"
+msgstr "???"
 
-#: src/commandhandler.cpp:300 src/gui/widgets/whispertab.cpp:95
-msgid "Command: /unignore <player>"
-msgstr ""
+#: ../src/gui/socialwindow.cpp:563
+msgid "Accept Guild Invite"
+msgstr "Ota kiltakutsu vastaan"
 
-#: src/commandhandler.cpp:301
-msgid "This command stops ignoring the given player if they are being ignored"
-msgstr ""
+#: ../src/gui/socialwindow.cpp:609
+msgid "Accept Party Invite"
+msgstr "Ota ryhmäkutsu vastaan"
 
-#: src/commandhandler.cpp:306
-msgid "Command: /where"
-msgstr ""
+#: ../src/gui/socialwindow.cpp:463
+#, fuzzy
+msgid "Accepted guild invite"
+msgstr "Ota kiltakutsu vastaan"
 
-#: src/commandhandler.cpp:307
-msgid "This command displays the name of the current map."
-msgstr "Tämä komento näyttää nykyisen kartan nimen"
+#: ../src/gui/socialwindow.cpp:444
+#, c-format
+msgid "Accepted party invite from %s."
+msgstr "Otit vastaan ryhmäkutsun pelaajalta %s."
 
-#: src/commandhandler.cpp:311
-msgid "Command: /who"
-msgstr ""
+#: ../src/game.cpp:738
+msgid "Accepting incoming trade requests"
+msgstr "Hyväksyt kaupankäyntipyynnöt"
 
-#: src/commandhandler.cpp:312
-msgid "This command displays the number of players currently online."
-msgstr "Tämä komento näyttää paikalla olevien pelaajien määrän."
+#: ../src/net/manaserv/tradehandler.cpp:95
+msgid "Accepting incoming trade requests."
+msgstr "Hyväksyt tulevat kaupantekoehdotukset."
 
-#: src/commandhandler.cpp:318
-msgid "Type /help for a list of commands."
-msgstr "Kirjoita /help jotta näkisit listan komennoista."
+#: ../src/net/tmwa/charserverhandler.cpp:103
+msgid "Access denied. Most likely, there are too many players on this server."
+msgstr "Pääsy evätty. Todennäköisesti palvelimella on liian paljon pelaajia."
 
-#: src/commandhandler.cpp:384
-msgid "Cannot send empty whispers!"
-msgstr ""
+#: ../src/gui/charselectdialog.cpp:120
+msgid "Account and Character Management"
+msgstr "Tilin ja hahmojen hallinta"
 
-#: src/commandhandler.cpp:392
-#, c-format
-msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
-"you."
-msgstr ""
+#: ../src/net/manaserv/loginhandler.cpp:272
+msgid "Account banned"
+msgstr "Tili porttikiellossa"
+
+#: ../src/net/manaserv/loginhandler.cpp:93
+msgid "Account banned."
+msgstr "Tili porttikiellossa."
+
+#: ../src/net/tmwa/loginhandler.cpp:162
+msgid "Account expired."
+msgstr "Tili vanhentunut."
 
-#: src/commandhandler.cpp:406
+#: ../src/net/manaserv/loginhandler.cpp:124
+#: ../src/net/manaserv/loginhandler.cpp:155
+msgid "Account not connected. Please login first."
+msgstr "Tiliin ei ole yhteyttä. Ole hyvä ja kirjaudu ensin sisään."
+
+#: ../src/net/tmwa/loginhandler.cpp:86
+msgid "Account was not found. Please re-login."
+msgstr "Tunnusta ei löytynyt. Yritä uudelleen."
+
+#: ../src/gui/changeemaildialog.cpp:49 ../src/gui/changepassworddialog.cpp:52
 #, c-format
-msgid "Requesting to join channel %s."
-msgstr ""
+msgid "Account: %s"
+msgstr "Tili: %s"
 
-#: src/commandhandler.cpp:419 src/net/tmwa/gui/partytab.cpp:109
-msgid "Party name is missing."
+#: ../src/gui/inventorywindow.cpp:106 ../src/gui/popupmenu.cpp:369
+msgid "Activate"
 msgstr ""
 
-#: src/commandhandler.cpp:432 src/commandhandler.cpp:509
-#: src/commandhandler.cpp:531
-msgid "Please specify a name."
-msgstr ""
+#: ../src/gui/trade.cpp:76
+msgid "Add"
+msgstr "Lisää"
 
-#: src/commandhandler.cpp:450
-msgid "Return toggles chat."
-msgstr ""
+#: ../src/gui/popupmenu.cpp:171
+msgid "Add name to chat"
+msgstr "Lisää nimi keskusteluun"
 
-#: src/commandhandler.cpp:450
-msgid "Message closes chat."
-msgstr ""
+#: ../src/gui/popupmenu.cpp:190 ../src/gui/popupmenu.cpp:387
+msgid "Add to chat"
+msgstr "Lisää keskusteluun"
 
-#: src/commandhandler.cpp:459
-msgid "Return now toggles chat."
-msgstr ""
+#: ../src/net/manaserv/attributes.cpp:179
+#: ../src/net/tmwa/generalhandler.cpp:231
+msgid "Agility"
+msgstr "Ketteryys"
 
-#: src/commandhandler.cpp:463
-msgid "Message now closes chat."
-msgstr ""
+#: ../src/net/manaserv/attributes.cpp:186
+#, fuzzy, c-format
+msgid "Agility %+.1f"
+msgstr "Ketteryys %+d"
 
-#: src/commandhandler.cpp:476 src/commandhandler.cpp:489
-msgid "Show IP: On"
-msgstr ""
+#: ../src/net/tmwa/generalhandler.cpp:103
+#, c-format
+msgid "Agility %+d"
+msgstr "Ketteryys %+d"
 
-#: src/commandhandler.cpp:476 src/commandhandler.cpp:485
-msgid "Show IP: Off"
-msgstr ""
+#: ../src/net/tmwa/charserverhandler.cpp:271
+msgid "Agility:"
+msgstr "Ketteryys:"
 
-#: src/commandhandler.cpp:515
-msgid "Player already ignored!"
-msgstr ""
+#: ../src/gui/trade.cpp:55
+msgid "Agree trade"
+msgstr "Hyväksy kauppa"
 
-#: src/commandhandler.cpp:522
-msgid "Player successfully ignored!"
-msgstr ""
+#: ../src/gui/trade.cpp:56
+msgid "Agreed. Waiting..."
+msgstr "Hyväksytty. Odotetaan..."
 
-#: src/commandhandler.cpp:524
-msgid "Player could not be ignored!"
-msgstr ""
+#: ../src/gui/itemamount.cpp:115
+msgid "All"
+msgstr "Kaikki"
 
-#: src/commandhandler.cpp:539
-msgid "Player wasn't ignored!"
-msgstr ""
+#: ../src/gui/setup_players.cpp:225
+msgid "Allow trading"
+msgstr "Salli kaupakäynti"
 
-#: src/commandhandler.cpp:544
-msgid "Player no longer ignored!"
-msgstr ""
+#: ../src/gui/setup_players.cpp:227
+msgid "Allow whispers"
+msgstr "Salli kuiskaukset"
 
-#: src/commandhandler.cpp:546
-msgid "Player could not be unignored!"
-msgstr ""
+#: ../src/net/manaserv/loginhandler.cpp:90
+#: ../src/net/manaserv/loginhandler.cpp:269
+msgid "Already logged in."
+msgstr "Tällä tunnuksella on jo kirjauduttu sisään."
 
-#: src/commandhandler.h:31
-#, c-format
-msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr ""
+#: ../src/gui/recorder.cpp:96
+msgid "Already recording."
+msgstr "Tallennan jo."
 
-#: src/game.cpp:172
-msgid "General"
-msgstr "Yleiset"
+#: ../src/gui/setup_video.cpp:254
+msgid "Ambient FX"
+msgstr "Taustaäänet"
 
-#: src/game.cpp:342
-#, fuzzy
-msgid "Screenshot saved as "
-msgstr "Ruutukaappaus tallennettu ~/"
+#: ../src/gui/debugwindow.cpp:121
+#, c-format
+msgid "Ambient FX: %s"
+msgstr "Taustaäänet: %s"
 
-#: src/game.cpp:347
-msgid "Saving screenshot failed!"
-msgstr "Ruutukaappauksen tallentaminen epäonnistui!"
+#: ../src/net/tmwa/partyhandler.cpp:299
+#, c-format
+msgid "An unknown member tried to say: %s"
+msgstr "Tuntematon jäsen yritti sanoa: %s"
 
-#: src/game.cpp:378
-#, fuzzy
-msgid "The connection to the server was lost."
-msgstr "Yhteys palvelimeen katkesi, ohjelma sulkeutuu nyt"
+# Final Fantasy reference mangled to localized D. Duck reference.
+#: ../src/net/manaserv/beinghandler.cpp:296
+#: ../src/net/tmwa/playerhandler.cpp:112
+msgid "Annihilated."
+msgstr "Pim! Olet annihiloitu."
 
-#: src/game.cpp:382
-msgid "Network Error"
-msgstr "Verkkovirhe"
+#: ../src/gui/setup.cpp:51
+msgid "Apply"
+msgstr "Hyväksy"
 
-#: src/game.cpp:721
-msgid "Ignoring incoming trade requests"
-msgstr ""
+#: ../src/gui/setup_video.cpp:461
+msgid "Applying change to OpenGL requires restart."
+msgstr "OpenGL -asetuksen muutos vaatii ohjelman uudelleenkäynnistyksen."
 
-#: src/game.cpp:726
-msgid "Accepting incoming trade requests"
-msgstr "Hyväksy kauppa pyyntö"
+#: ../src/gui/setup_video.cpp:453
+msgid ""
+"Applying change to OpenGL requires restart. In case OpenGL messes up your "
+"game graphics, restart the game with the command line option \"--no-opengl\"."
+msgstr ""
+"OpenGL:n käyttöönotto tai poisto vaatii uudelleenkäynnistyksen. Jos OpenGL "
+"sotkee peligrafiikkasi, käynnistä peli uudelleen komentoriviparametrilla \"--"
+"no-opengl\"."
 
-#: src/game.cpp:954
-#, fuzzy
-msgid "Could Not Load Map"
-msgstr "Karttaa ei voi ladata"
+#: ../src/gui/charselectdialog.cpp:73
+msgid "Are you sure you want to delete this character?"
+msgstr "Oletko varma, että haluat poistaa tämän hahmon?"
 
-#: src/game.cpp:955
+#: ../src/gui/socialwindow.cpp:164
 #, c-format
-msgid "Error while loading %s"
-msgstr "Ongelma ladatessa %s"
+msgid "Are you sure you want to leave guild %s?"
+msgstr "Haluatko varmasti erota killasta %s?"
 
-#: src/gui/beingpopup.cpp:76
+#: ../src/gui/socialwindow.cpp:243
 #, c-format
-msgid "Party: %s"
-msgstr ""
+msgid "Are you sure you want to leave party %s?"
+msgstr "Haluatko varmasti erota ryhmästä %s?"
 
-#: src/gui/buy.cpp:49 src/gui/buy.cpp:78 src/gui/buysell.cpp:47
-msgid "Buy"
-msgstr "Osta"
+#: ../src/gui/setup_keyboard.cpp:86
+msgid "Assign"
+msgstr "Aseta"
 
-#: src/gui/buy.cpp:69 src/gui/buy.cpp:261 src/gui/sell.cpp:71
-#: src/gui/sell.cpp:288
+#: ../src/net/manaserv/charhandler.cpp:165
 #, c-format
-msgid "Price: %s / Total: %s"
-msgstr ""
-
-#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
-#. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:112 src/gui/npcdialog.cpp:124
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:463
-msgid "+"
+msgid "At least one statis out of the permitted range: (%u - %u)."
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
-#. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:111 src/gui/npcdialog.cpp:125
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:475
-msgid "-"
-msgstr ""
+#: ../src/keyboardconfig.cpp:43 ../src/net/tmwa/generalhandler.cpp:237
+msgid "Attack"
+msgstr "Hyökkää"
 
-#: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:228
-#: src/keyboardconfig.cpp:102
-msgid "Quit"
-msgstr "Sulje"
+#: ../src/resources/itemdb.cpp:310
+#, c-format
+msgid "Attack %+d"
+msgstr "Hyökkäys %+d"
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:384
-#: src/gui/statuswindow.cpp:462 src/gui/statuswindow.cpp:496
-msgid "Max"
-msgstr "Max"
+# TODO: Should clarify that this is a verb in trans comment.
+#: ../src/gui/popupmenu.cpp:87 ../src/gui/popupmenu.cpp:158
+#, c-format
+msgid "Attack %s"
+msgstr "Hyökkää pelaajan %s kimppuun"
 
-#: src/gui/buysell.cpp:38
-msgid "Shop"
-msgstr "Kauppa"
+#: ../src/gui/chat.cpp:329
+msgid "Attendance written to record log."
+msgstr "Läsnäolijat kirjattu tallennuslokiin."
 
-#: src/gui/buysell.cpp:47 src/gui/sell.cpp:49 src/gui/sell.cpp:76
-msgid "Sell"
-msgstr "Myy"
+#: ../src/gui/setup_audio.cpp:47
+msgid "Audio"
+msgstr "Ääni"
 
-#: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
-#: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
-#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:114
-#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:175
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:389
-#: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:275 src/gui/textdialog.cpp:40
-#: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
-msgid "Cancel"
-msgstr "Peru"
+#: ../src/net/tmwa/generalhandler.cpp:132
+msgid "Authentication failed."
+msgstr "Tunnistus epäonnistui."
 
-#: src/gui/changeemaildialog.cpp:45 src/gui/changeemaildialog.cpp:54
-msgid "Change Email Address"
-msgstr "Vaihda sähköpostiosoite"
+#: ../src/localplayer.cpp:1030
+msgid "Away"
+msgstr "Poissa"
 
-#: src/gui/changeemaildialog.cpp:49 src/gui/changepassworddialog.cpp:52
+#: ../src/gui/popupmenu.cpp:100
 #, c-format
-msgid "Account: %s"
-msgstr "Tili: %s"
-
-#: src/gui/changeemaildialog.cpp:51
-#, fuzzy
-msgid "Type new email address twice:"
-msgstr "Kirjoita  uusi sähköposti osoite toisen kerran:"
+msgid "Befriend %s"
+msgstr "Merkitse %s ystäväksesi"
 
-#: src/gui/changeemaildialog.cpp:127
-#, fuzzy, c-format
-msgid "The new email address needs to be at least %d characters long."
-msgstr "Käyttäjänimen tulee olla vähintään %d merkkiä pitkä"
+# TODO: WTF?
+#: ../src/resources/userpalette.cpp:91
+msgid "Being"
+msgstr "Olo"
 
-#: src/gui/changeemaildialog.cpp:134
-#, fuzzy, c-format
-msgid "The new email address needs to be less than %d characters long."
-msgstr "Käyttäjänimen tulee olla alle %d merkkiä pitkä."
+#: ../src/net/tmwa/playerhandler.cpp:124
+msgid "Bereft of life, you rest in peace."
+msgstr "Olet eloton, mutta lepäät rauhassa."
 
-#: src/gui/changeemaildialog.cpp:141
-msgid "The email address entries mismatch."
-msgstr ""
+#: ../src/playerrelations.cpp:340
+msgid "Blink name"
+msgstr "Vilkuta nimeä"
 
-#: src/gui/changepassworddialog.cpp:47 src/gui/changepassworddialog.cpp:56
-#: src/gui/charselectdialog.cpp:128
-msgid "Change Password"
-msgstr "Vaihda salasana"
+#: ../src/gui/setup_colors.cpp:139
+msgid "Blue:"
+msgstr "Sininen:"
 
-#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:55
-#: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
-msgid "Password:"
-msgstr "Salasana:"
+#: ../src/gui/setup_video.cpp:160
+msgid "Bubbles with names"
+msgstr "Puhekuplat nimillä"
 
-#: src/gui/changepassworddialog.cpp:63
-#, fuzzy
-msgid "Type new password twice:"
-msgstr "Kirjoita  uusi salasana toisen kerran:"
+#: ../src/gui/setup_video.cpp:159
+msgid "Bubbles, no names"
+msgstr "Puhekuplat, ei nimiä"
 
-#: src/gui/changepassworddialog.cpp:110
-msgid "Enter the old password first."
-msgstr ""
+#: ../src/gui/buy.cpp:49 ../src/gui/buy.cpp:78 ../src/gui/buysell.cpp:47
+msgid "Buy"
+msgstr "Osta"
 
-#: src/gui/changepassworddialog.cpp:116
-#, fuzzy, c-format
-msgid "The new password needs to be at least %d characters long."
-msgstr "Salasanan tulee olla vähintään %d merkkiä pitkä"
+#: ../src/gui/setup_joystick.cpp:38 ../src/gui/setup_joystick.cpp:76
+msgid "Calibrate"
+msgstr "Kalibroi"
 
-#: src/gui/changepassworddialog.cpp:123
-#, fuzzy, c-format
-msgid "The new password needs to be less than %d characters long."
-msgstr "Salasanan tulee olla alle %d merkkiä pitkä."
+#: ../src/gui/buysell.cpp:47 ../src/gui/changeemaildialog.cpp:55
+#: ../src/gui/changepassworddialog.cpp:58 ../src/gui/charcreatedialog.cpp:79
+#: ../src/gui/connectiondialog.cpp:44 ../src/gui/itemamount.cpp:114
+#: ../src/gui/npcpostdialog.cpp:57 ../src/gui/popupmenu.cpp:175
+#: ../src/gui/popupmenu.cpp:194 ../src/gui/popupmenu.cpp:389
+#: ../src/gui/quitdialog.cpp:47 ../src/gui/register.cpp:74
+#: ../src/gui/setup.cpp:51 ../src/gui/socialwindow.cpp:275
+#: ../src/gui/textdialog.cpp:40 ../src/gui/unregisterdialog.cpp:56
+#: ../src/gui/updatewindow.cpp:144
+msgid "Cancel"
+msgstr "Peru"
 
-#: src/gui/changepassworddialog.cpp:130
-msgid "The new password entries mismatch."
+#: ../src/commandhandler.cpp:421
+#, c-format
+msgid ""
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
+"you."
 msgstr ""
+"Kuiskausvälilehden luonti nimelle \"%s\" epäonnistui! Se on joko jo auki tai "
+"käytit omaa nimeäsi."
 
-#: src/gui/charcreatedialog.cpp:53
-msgid "Create Character"
-msgstr "Luo hahmo"
-
-#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:54
-#: src/gui/register.cpp:67
-msgid "Name:"
-msgstr "Nimi:"
+# TODO: missing period intentional?
+#: ../src/gui/socialwindow.cpp:620
+msgid "Cannot create party. You are already in a party"
+msgstr "Ryhmän luominen epäonnistui, olet jo ryhmän jäsen."
 
-#. TRANSLATORS: This is an arrow symbol used to denote 'next'.
-#. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
-#: src/gui/outfitwindow.cpp:67
-msgid ">"
-msgstr ""
+#: ../src/net/tmwa/playerhandler.cpp:366
+msgid "Cannot raise skill!"
+msgstr "Taidon korottaminen epäonnistui!"
 
-#. TRANSLATORS: This is an arrow symbol used to denote 'previous'.
-#. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
-#: src/gui/outfitwindow.cpp:66
-msgid "<"
-msgstr ""
+#: ../src/gui/widgets/whispertab.cpp:53
+msgid "Cannot send empty chat!"
+msgstr "Tyhjää keskustelua ei voi lähettää!"
 
-#: src/gui/charcreatedialog.cpp:74
-#, fuzzy
-msgid "Hair color:"
-msgstr "Hiusten väri:"
+#: ../src/commandhandler.cpp:400
+msgid "Cannot send empty whispers!"
+msgstr "Et voi lähettää tyhjiä kuiskauksia!"
 
-#: src/gui/charcreatedialog.cpp:77
-#, fuzzy
-msgid "Hair style:"
-msgstr "Hiustyyli:"
+#: ../src/net/tmwa/specialhandler.cpp:160
+msgid "Cannot shout!"
+msgstr "Huutaminen epäonnistui!"
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:392
-#: src/gui/socialwindow.cpp:329
-msgid "Create"
-msgstr "Luo"
+#: ../src/net/tmwa/charserverhandler.cpp:107
+msgid "Cannot use this ID."
+msgstr "Tätä tunnistetta ei voi käyttää."
 
-#: src/gui/charcreatedialog.cpp:80 src/gui/register.cpp:90
-msgid "Male"
-msgstr "Miespuolinen"
+#: ../src/gui/trade.cpp:103
+msgid "Change"
+msgstr "Muuta"
 
-#: src/gui/charcreatedialog.cpp:81 src/gui/register.cpp:91
-msgid "Female"
-msgstr "Naispuolinen"
+#: ../src/gui/charselectdialog.cpp:154
+msgid "Change Email"
+msgstr "Vaihda sähköpostiosoite"
 
-#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:251
-#, c-format
-msgid "Please distribute %d points"
-msgstr "Jaa %d pistettä"
+#: ../src/gui/changeemaildialog.cpp:45 ../src/gui/changeemaildialog.cpp:54
+msgid "Change Email Address"
+msgstr "Vaihda sähköpostiosoite"
 
-#: src/gui/charcreatedialog.cpp:178
-msgid "Your name needs to be at least 4 characters."
-msgstr "Nimessäsi täytyy olla ainakin 4 merkkiä."
+#: ../src/gui/worldselectdialog.cpp:76
+msgid "Change Login"
+msgstr "Vaihda kirjautumistietoja"
 
-#: src/gui/charcreatedialog.cpp:242
-msgid "Character stats OK"
-msgstr "Hahmon pistejako OK"
+#: ../src/gui/changepassworddialog.cpp:47
+#: ../src/gui/changepassworddialog.cpp:56 ../src/gui/charselectdialog.cpp:132
+msgid "Change Password"
+msgstr "Vaihda salasana"
 
-#: src/gui/charcreatedialog.cpp:256
-#, c-format
-msgid "Please remove %d points"
-msgstr "%d pistettä liikaa"
+#: ../src/gui/login.cpp:62
+msgid "Change Server"
+msgstr "Vaihda palvelinta"
 
-#: src/gui/charselectdialog.cpp:69
-msgid "Confirm Character Delete"
-msgstr "Vahvista hahmon poistopyyntö"
+#: ../src/gui/setup_video.cpp:607
+msgid "Changes will take effect on map change."
+msgstr "Muutokset astuvat voimaan kartan vaihtuessa."
 
-#: src/gui/charselectdialog.cpp:70
-msgid "Are you sure you want to delete this character?"
-msgstr "Oletko varma, että haluat poistaa tämän hahmon?"
+#: ../src/client.cpp:848
+msgid "Changing game servers"
+msgstr "Vaihdan pelipalvelinta"
 
-#: src/gui/charselectdialog.cpp:117
-msgid "Account and Character Management"
-msgstr "Tilin ja hahmojen hallinta"
+#: ../src/gui/setup_video.cpp:452
+msgid "Changing to OpenGL"
+msgstr "Vaihdetaan käyttämään OpenGL:ää"
 
-#: src/gui/charselectdialog.cpp:127
-msgid "Switch Login"
+#: ../src/gui/widgets/channeltab.cpp:84
+msgid "Channel operators can kick and op other users from the channel."
 msgstr ""
+"Kanavan operaattori voi poistaa käyttäjiä kanavalta ja jakaa operaattorin "
+"oikeuksia."
 
-#: src/gui/charselectdialog.cpp:141 src/gui/unregisterdialog.cpp:47
-#: src/gui/unregisterdialog.cpp:55
-msgid "Unregister"
-msgstr "Poista palvelimelta"
+#: ../src/net/tmwa/chathandler.cpp:265 ../src/net/tmwa/chathandler.cpp:271
+#: ../src/net/tmwa/chathandler.cpp:276 ../src/net/tmwa/chathandler.cpp:281
+#: ../src/net/tmwa/chathandler.cpp:286 ../src/net/tmwa/chathandler.cpp:291
+#: ../src/net/tmwa/chathandler.cpp:296 ../src/net/tmwa/chathandler.cpp:301
+msgid "Channels are not supported!"
+msgstr "Kanavia ei tueta!"
 
-#: src/gui/charselectdialog.cpp:150
-#, fuzzy
-msgid "Change Email"
-msgstr "Vaihda sähköpostiosoite"
+#: ../src/net/tmwa/charserverhandler.cpp:146
+msgid "Character deleted."
+msgstr "Hahmo poistettu."
 
-#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:231
-#: src/gui/setup_players.cpp:229
-msgid "Delete"
-msgstr "Poista"
+#: ../src/gui/statuswindow.cpp:211 ../src/gui/statuswindow.cpp:248
+#, c-format
+msgid "Character points: %d"
+msgstr "Hahmopisteitä: %d"
 
-#: src/gui/charselectdialog.cpp:380
-#, fuzzy
-msgid "Choose"
-msgstr "Sulje"
+#: ../src/gui/charcreatedialog.cpp:248
+msgid "Character stats OK"
+msgstr "Hahmon pistejako OK"
 
-#: src/gui/charselectdialog.cpp:394 src/gui/charselectdialog.cpp:395
-msgid "(empty)"
-msgstr ""
+#: ../src/net/manaserv/charhandler.cpp:147
+msgid "Character's name already exists."
+msgstr "Hahmon nimi on jo käytössä."
+
+#: ../src/net/manaserv/charhandler.cpp:159
+msgid "Character's stats are too high."
+msgstr "Hahmon arvot ovat liian korkeat."
+
+#: ../src/net/manaserv/charhandler.cpp:162
+msgid "Character's stats are too low."
+msgstr "Hahmon arvot ovat liian matalat. (Lurjus.)"
 
-#: src/gui/chat.cpp:88
+#: ../src/gui/chat.cpp:88
 msgid "Chat"
 msgstr "Keskustelu"
 
-#: src/gui/chat.cpp:311
-#, c-format
-msgid "Present: %s; %d players are present."
-msgstr ""
+#: ../src/keyboardconfig.cpp:75
+msgid "Chat Window"
+msgstr "Keskusteluikkuna"
 
-#: src/gui/chat.cpp:329
-msgid "Attendance written to record log."
-msgstr ""
+#: ../src/net/tmwa/specialhandler.cpp:154
+msgid "Chat creating failed!"
+msgstr "Keskustelun luonti epäonnistui!"
 
-#: src/gui/chat.cpp:493
-#, c-format
-msgid "Whispering to %s: %s"
-msgstr ""
+#: ../src/gui/charselectdialog.cpp:404
+msgid "Choose"
+msgstr "Valitse"
 
-#: src/gui/confirmdialog.cpp:42
-msgid "Yes"
-msgstr "Kyllä"
+#: ../src/gui/worldselectdialog.cpp:77
+msgid "Choose World"
+msgstr "Valitse pelimaailma"
 
-#: src/gui/confirmdialog.cpp:43
-msgid "No"
-msgstr "Ei"
+#: ../src/gui/serverdialog.cpp:197
+msgid "Choose Your Server"
+msgstr "Valitse palvelimesi"
 
-#: src/gui/debugwindow.cpp:43
-msgid "Debug"
-msgstr ""
+#: ../src/gui/socialwindow.cpp:541
+msgid "Choose your guild's name."
+msgstr "Valitse killallesi nimi."
 
-#: src/gui/debugwindow.cpp:56
-#, c-format
-msgid "%d FPS (OpenGL)"
-msgstr ""
+#: ../src/gui/socialwindow.cpp:626
+msgid "Choose your party's name."
+msgstr "Anna ryhmällesi nimi."
 
-#: src/gui/debugwindow.cpp:61 src/gui/debugwindow.cpp:64
-#, c-format
-msgid "%d FPS"
-msgstr ""
+#: ../src/gui/npcdialog.cpp:118
+msgid "Clear log"
+msgstr "Tyhjennä loki"
 
-#: src/gui/debugwindow.cpp:65 src/gui/debugwindow.cpp:104
-#, c-format
-msgid "Music: %s"
+#: ../src/net/manaserv/loginhandler.cpp:239
+msgid ""
+"Client registration is not allowed. Please contact server administration."
 msgstr ""
+"Asiakasohjelmalla ei voi rekisteröityä tälle palvelimelle; ota yhteyttä "
+"palvelimen ylläpitoon."
 
-#: src/gui/debugwindow.cpp:66 src/gui/debugwindow.cpp:108
-#, fuzzy, c-format
-msgid "Map: %s"
-msgstr "Nimi: %s"
-
-#: src/gui/debugwindow.cpp:67 src/gui/debugwindow.cpp:106
-#, c-format
-msgid "Minimap: %s"
-msgstr ""
+#: ../src/net/tmwa/loginhandler.cpp:172
+#, fuzzy
+msgid "Client too old."
+msgstr "Asiakasohjelman versio on liian vanha."
 
-#: src/gui/debugwindow.cpp:68 src/gui/debugwindow.cpp:99
-#, c-format
-msgid "Cursor: (%d, %d)"
-msgstr ""
+#: ../src/net/manaserv/loginhandler.cpp:263
+#: ../src/net/manaserv/loginhandler.cpp:300
+msgid "Client version is too old."
+msgstr "Asiakasohjelman versio on liian vanha."
 
-#: src/gui/debugwindow.cpp:69 src/gui/debugwindow.cpp:111
-#, fuzzy, c-format
-msgid "Particle count: %d"
-msgstr "Hiukkas tehosteet"
+#: ../src/gui/help.cpp:51 ../src/gui/npcdialog.cpp:50
+msgid "Close"
+msgstr "Sulje"
 
-#: src/gui/debugwindow.cpp:116
-#, fuzzy, c-format
-msgid "Particle detail: %s"
-msgstr "Hiukkas tehosteet"
+#: ../src/gui/setup_colors.cpp:51
+msgid "Colors"
+msgstr "Värit"
 
-#: src/gui/debugwindow.cpp:121
-#, fuzzy, c-format
-msgid "Ambient FX: %s"
-msgstr "Taustaäänet"
+#: ../src/commandhandler.cpp:220
+msgid "Command: /announce <msg>"
+msgstr "Komento: /announce <viesti>"
 
-#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:55
-msgid "Equipment"
-msgstr "Varusteet"
+#: ../src/commandhandler.cpp:273
+msgid "Command: /away"
+msgstr "Komento: /away"
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:89
-#: src/gui/inventorywindow.cpp:337 src/gui/popupmenu.cpp:359
-msgid "Unequip"
-msgstr "Poista varuste käytöstä"
+#: ../src/commandhandler.cpp:270
+msgid "Command: /away <afk reason>"
+msgstr "Komento: /away <poissaolon syy>"
 
-#: src/gui/help.cpp:37
-msgid "Help"
-msgstr "Apua"
+#: ../src/commandhandler.cpp:227
+msgid "Command: /clear"
+msgstr "Komento: /clear"
 
-#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:50
-msgid "Close"
-msgstr "Sulje"
+#: ../src/gui/widgets/whispertab.cpp:84
+msgid "Command: /close"
+msgstr "Komento: /close"
 
-#: src/gui/inventorywindow.cpp:59 src/gui/windowmenu.cpp:56
-msgid "Inventory"
-msgstr "Varusteluettelo"
+#: ../src/commandhandler.cpp:278
+msgid "Command: /createparty <name>"
+msgstr "Komento: /createparty <ryhmän nimi>"
 
-#: src/gui/inventorywindow.cpp:59
-msgid "Storage"
-msgstr "Varasto"
+#: ../src/net/tmwa/gui/partytab.cpp:100
+msgid "Command: /exp"
+msgstr "Komento: /exp"
 
-#: src/gui/inventorywindow.cpp:82
-msgid "Slots:"
-msgstr ""
+#: ../src/net/tmwa/gui/partytab.cpp:95
+msgid "Command: /exp <policy>"
+msgstr "Komento: /exp <jakopolitiikka>"
 
-#: src/gui/inventorywindow.cpp:87 src/gui/inventorywindow.cpp:100
-#: src/gui/inventorywindow.cpp:339 src/gui/popupmenu.cpp:361
-msgid "Equip"
-msgstr "Ota käyttöön"
+#: ../src/commandhandler.cpp:208
+msgid "Command: /help"
+msgstr "Komento: /help"
 
-#: src/gui/inventorywindow.cpp:88
-msgid "Use"
-msgstr "Käytä"
+#: ../src/commandhandler.cpp:211
+msgid "Command: /help <command>"
+msgstr "Komento: /help <komennon nimi>"
 
-#: src/gui/inventorywindow.cpp:101 src/gui/popupmenu.cpp:364
-msgid "Activate"
-msgstr ""
+#: ../src/gui/widgets/whispertab.cpp:89
+msgid "Command: /ignore"
+msgstr "Komento: /ignore"
 
-#: src/gui/inventorywindow.cpp:102 src/gui/inventorywindow.cpp:348
-#: src/gui/popupmenu.cpp:367
-#, fuzzy
-msgid "Drop..."
-msgstr "Pudota"
+#: ../src/commandhandler.cpp:232
+msgid "Command: /ignore <player>"
+msgstr "Komento: /ignore <pelaaja>"
 
-#: src/gui/inventorywindow.cpp:103 src/gui/popupmenu.cpp:373
-msgid "Split"
-msgstr "Jaa"
+#: ../src/net/tmwa/gui/guildtab.cpp:73 ../src/net/tmwa/gui/partytab.cpp:73
+msgid "Command: /invite <nick>"
+msgstr "Komento: /invite <nimi>"
 
-#: src/gui/inventorywindow.cpp:104 src/gui/outfitwindow.cpp:51
-msgid "Outfits"
-msgstr ""
+#: ../src/net/tmwa/gui/partytab.cpp:90
+msgid "Command: /item"
+msgstr "Komento: /item"
 
-#: src/gui/inventorywindow.cpp:106
-msgid "Weight:"
-msgstr "Paino:"
+#: ../src/net/tmwa/gui/partytab.cpp:85
+msgid "Command: /item <policy>"
+msgstr "Komento: /item <jakopolitiikka>"
 
-#: src/gui/inventorywindow.cpp:124 src/gui/popupmenu.cpp:378
-msgid "Store"
-msgstr "Talleta"
+#: ../src/commandhandler.cpp:238
+msgid "Command: /join <channel>"
+msgstr "Komento: /join <kanava>"
 
-#: src/gui/inventorywindow.cpp:125 src/gui/popupmenu.cpp:385
-msgid "Retrieve"
-msgstr ""
+#: ../src/gui/widgets/channeltab.cpp:89
+msgid "Command: /kick <nick>"
+msgstr "Komento: /kick <nimi>"
 
-#: src/gui/inventorywindow.cpp:350 src/gui/popupmenu.cpp:369
-msgid "Drop"
-msgstr "Pudota"
+#: ../src/net/tmwa/gui/guildtab.cpp:80 ../src/net/tmwa/gui/partytab.cpp:80
+msgid "Command: /leave"
+msgstr "Komento: /leave"
 
-#: src/gui/itemamount.cpp:113 src/gui/okdialog.cpp:42
-#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:72
-#: src/gui/trade.cpp:74
-msgid "OK"
-msgstr "Ok"
+#: ../src/commandhandler.cpp:244
+msgid "Command: /list"
+msgstr "Komento: /list"
 
-#: src/gui/itemamount.cpp:115
-msgid "All"
-msgstr "Kaikki"
+#: ../src/commandhandler.cpp:249
+msgid "Command: /me <message>"
+msgstr "Komento: /me <viesti>"
 
-#: src/gui/itemamount.cpp:141
-msgid "Select amount of items to trade."
-msgstr "Anna vaihdettavien tavaroiden määrä."
+#: ../src/commandhandler.cpp:254
+msgid "Command: /msg <nick> <message>"
+msgstr "Komento: /msg <nimi> <viesti>"
 
-#: src/gui/itemamount.cpp:144
-msgid "Select amount of items to drop."
-msgstr "Anna pudotettavien tavaroiden määrä."
+#: ../src/gui/widgets/channeltab.cpp:80
+msgid "Command: /op <nick>"
+msgstr "Komento: /op <nimi>"
 
-#: src/gui/itemamount.cpp:147
-msgid "Select amount of items to store."
-msgstr ""
+#: ../src/commandhandler.cpp:283
+msgid "Command: /party <nick>"
+msgstr "Komento: /party <pelaajan nimi>"
 
-#: src/gui/itemamount.cpp:150
-msgid "Select amount of items to retrieve."
-msgstr ""
+#: ../src/commandhandler.cpp:290
+msgid "Command: /present"
+msgstr "Komento: /present"
 
-#: src/gui/itemamount.cpp:153
-msgid "Select amount of items to split."
-msgstr "Anna eri pinoon jaettavien tavaroiden määrä."
+#: ../src/commandhandler.cpp:264
+msgid "Command: /q <nick>"
+msgstr "Komento: /q <nimi>"
 
-#: src/gui/itempopup.cpp:137
-#, fuzzy, c-format
-msgid "Weight: %s"
-msgstr "Paino: "
+#: ../src/commandhandler.cpp:263
+msgid "Command: /query <nick>"
+msgstr "Komento: /query <nimi>"
 
-#: src/gui/login.cpp:51 src/gui/login.cpp:63
-msgid "Login"
-msgstr "Kirjaudu sisään"
+#: ../src/gui/widgets/channeltab.cpp:73
+msgid "Command: /quit"
+msgstr "Komento: /quit"
 
-#: src/gui/login.cpp:60
-#, fuzzy
-msgid "Remember username"
-msgstr "Muista käyttäjätunnus"
+#: ../src/commandhandler.cpp:300
+msgid "Command: /record"
+msgstr "Komento: /record"
 
-#: src/gui/login.cpp:61 src/gui/register.cpp:58 src/gui/register.cpp:73
-msgid "Register"
-msgstr "Rekisteröidy"
+#: ../src/commandhandler.cpp:297
+msgid "Command: /record <filename>"
+msgstr "Komento: /record <tiedostonimi>"
 
-#: src/gui/login.cpp:62
-#, fuzzy
-msgid "Change Server"
-msgstr "Palvelin:"
+#: ../src/commandhandler.cpp:311
+msgid "Command: /toggle"
+msgstr "Komento: /toggle"
 
-#: src/gui/login.cpp:129
-msgid "Registration disabled"
-msgstr ""
+#: ../src/commandhandler.cpp:305
+msgid "Command: /toggle <state>"
+msgstr "Komento: /toggle <tila>"
 
-#: src/gui/login.cpp:129
-msgid "You need to use the website to register an account for this server."
-msgstr ""
+#: ../src/gui/widgets/channeltab.cpp:68
+msgid "Command: /topic <message>"
+msgstr "Komento: /topic <viesti>"
 
-#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:86
-msgid "Map"
-msgstr "Kartta"
+#: ../src/commandhandler.cpp:316 ../src/gui/widgets/whispertab.cpp:95
+msgid "Command: /unignore <player>"
+msgstr "Komento: /unignore <pelaajan nimi>"
 
-#: src/gui/ministatus.cpp:235
-msgid "Need"
-msgstr ""
+#: ../src/gui/widgets/channeltab.cpp:63
+msgid "Command: /users"
+msgstr "Komento: /users"
 
-#: src/gui/npcdialog.cpp:48
-msgid "Waiting for server"
-msgstr "Odotetaan palvelinta"
+#: ../src/commandhandler.cpp:256
+msgid "Command: /w <nick> <message>"
+msgstr "Komento: /w <nimi> <viesti>"
 
-#: src/gui/npcdialog.cpp:49
-msgid "Next"
-msgstr "Seuraava"
+#: ../src/commandhandler.cpp:322
+msgid "Command: /where"
+msgstr "Komento: /where"
 
-#: src/gui/npcdialog.cpp:51
-msgid "Submit"
-msgstr "Lähetä"
+#: ../src/commandhandler.cpp:255
+msgid "Command: /whisper <nick> <message>"
+msgstr "Komento: /whisper <nimi> <viesti>"
 
-#: src/gui/npcdialog.cpp:73 src/gui/npcpostdialog.cpp:41
-msgid "NPC"
-msgstr "Epäpelattava hahmo"
+#: ../src/commandhandler.cpp:327
+msgid "Command: /who"
+msgstr "Komento: /who"
 
-#: src/gui/npcdialog.cpp:118
-msgid "Clear log"
-msgstr ""
+#: ../src/gui/updatewindow.cpp:515
+msgid "Completed"
+msgstr "Valmis"
 
-#: src/gui/npcdialog.cpp:134
-msgid "Reset"
-msgstr "Nollaa"
+#: ../src/playerrelations.cpp:310
+msgid "Completely ignore"
+msgstr "Jätä täysin huomiotta"
 
-#. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:208
-#, fuzzy
-msgid ""
-"\n"
-"> Next\n"
-msgstr "Seuraava"
+#: ../src/gui/popupmenu.cpp:117
+#, c-format
+msgid "Completely ignore %s"
+msgstr "Jätä %s täysin huomiotta"
 
-#: src/gui/npcpostdialog.cpp:47
-msgid "To:"
-msgstr ""
+#: ../src/gui/charselectdialog.cpp:72
+msgid "Confirm Character Delete"
+msgstr "Vahvista hahmon poisto"
 
-#: src/gui/npcpostdialog.cpp:54
-msgid "Send"
-msgstr "Lähetä"
+#: ../src/gui/register.cpp:69
+msgid "Confirm:"
+msgstr "Vahvista:"
 
-#: src/gui/npcpostdialog.cpp:99
-msgid "Failed to send as sender or letter invalid."
-msgstr ""
+#: ../src/gui/trade.cpp:54
+msgid "Confirmed. Waiting..."
+msgstr "Varmistettu. Odotetaan..."
 
-#: src/gui/outfitwindow.cpp:68 src/gui/outfitwindow.cpp:141
-#: src/gui/outfitwindow.cpp:154
+#: ../src/keyboardconfig.cpp:183
 #, c-format
-msgid "Outfit: %d"
+msgid ""
+"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
+"strange behaviour."
 msgstr ""
+"Päällekkäiset näppäinoikotiet \"%s\" ja \"%s\" voivat aiheuttaa outouksia; "
+"ole hyvä ja poista päällekkäisyydet. "
 
-#: src/gui/outfitwindow.cpp:70
-#, fuzzy
-msgid "Unequip first"
-msgstr "Poista varuste käytöstä"
+#: ../src/gui/serverdialog.cpp:229
+msgid "Connect"
+msgstr "Yhdistä"
 
-#: src/gui/popupmenu.cpp:83
-#, fuzzy, c-format
-msgid "Trade with %s..."
-msgstr "@@trade|Tee kauppaa %s kanssa@@"
+#: ../src/client.cpp:661
+msgid "Connecting to server"
+msgstr "Yhdistän palvelimeen"
 
-#: src/gui/popupmenu.cpp:87 src/gui/popupmenu.cpp:158
-#, fuzzy, c-format
-msgid "Attack %s"
-msgstr "Hyökkäys %+d"
+#: ../src/client.cpp:838
+msgid "Connecting to the game server"
+msgstr "Yhdistän pelipalvelimeen"
 
-#: src/gui/popupmenu.cpp:91
-#, c-format
-msgid "Whisper %s"
-msgstr ""
+#: ../src/gui/updatewindow.cpp:142
+msgid "Connecting..."
+msgstr "Yhdistetään..."
 
-#: src/gui/popupmenu.cpp:100
-#, c-format
-msgid "Befriend %s"
-msgstr ""
+#: ../src/net/tmwa/network.cpp:414
+msgid "Connection to server terminated. "
+msgstr "Yhteys palvelimeen katkaistu. "
+
+#: ../src/keyboardconfig.cpp:83
+msgid "Copy Outfit"
+msgstr "Kopioi asu"
 
-#: src/gui/popupmenu.cpp:105
+#: ../src/gui/statuswindow.cpp:256
 #, c-format
-msgid "Disregard %s"
-msgstr ""
+msgid "Correction points: %d"
+msgstr "Korjauspisteitä: %d"
 
-#: src/gui/popupmenu.cpp:108
-#, fuzzy, c-format
-msgid "Ignore %s"
-msgstr "ohitettu"
+#: ../src/game.cpp:966
+msgid "Could Not Load Map"
+msgstr "Kartan lataaminen epäonnistui"
 
-#: src/gui/popupmenu.cpp:114 src/gui/popupmenu.cpp:123
-#, c-format
-msgid "Unignore %s"
-msgstr ""
+#: ../src/net/tmwa/partyhandler.cpp:82
+msgid "Could not create party."
+msgstr "Ryhmän luonti epäonnistui."
 
-#: src/gui/popupmenu.cpp:117
-#, c-format
-msgid "Completely ignore %s"
-msgstr ""
+#: ../src/net/tmwa/guildhandler.cpp:296
+msgid "Could not inivte user to guild."
+msgstr "Pelaajan kutsuminen kiltaan epäonnistui."
 
-#: src/gui/popupmenu.cpp:130
-#, fuzzy, c-format
-msgid "Invite %s to join your guild"
-msgstr "@@party|Kutsu %s mukaan ryhmääsi@@"
+#: ../src/net/tmwa/specialhandler.cpp:157
+msgid "Could not join party!"
+msgstr "Ryhmään liittyminen epäonnistui!"
 
-#: src/gui/popupmenu.cpp:134
-#, fuzzy, c-format
-msgid "Invite %s to join your party"
-msgstr "@@party|Kutsu %s mukaan ryhmääsi@@"
+#: ../src/net/tmwa/specialhandler.cpp:211
+msgid "Could not steal anything..."
+msgstr "Varastaminen ei onnistunut..."
 
-#: src/gui/popupmenu.cpp:141
-msgid "Kick player"
-msgstr ""
+#: ../src/gui/charcreatedialog.cpp:78 ../src/gui/charselectdialog.cpp:416
+#: ../src/gui/socialwindow.cpp:330
+msgid "Create"
+msgstr "Luo"
 
-#: src/gui/popupmenu.cpp:150
-#, c-format
-msgid "Talk to %s"
-msgstr ""
+#: ../src/gui/charcreatedialog.cpp:53
+msgid "Create Character"
+msgstr "Luo hahmo"
 
-#: src/gui/popupmenu.cpp:163
-#, fuzzy
-msgid "Kick monster"
-msgstr "Hirviöt"
+#: ../src/gui/socialwindow.cpp:272
+msgid "Create Guild"
+msgstr "Luo kilta"
 
-#: src/gui/popupmenu.cpp:171
-msgid "Add name to chat"
-msgstr ""
+#: ../src/gui/socialwindow.cpp:273 ../src/gui/socialwindow.cpp:619
+msgid "Create Party"
+msgstr "Luo ryhmä"
 
-#: src/gui/popupmenu.cpp:188
+#: ../src/gui/socialwindow.cpp:503
 #, c-format
-msgid "Pick up %s"
-msgstr ""
+msgid "Creating guild called %s."
+msgstr "Luon killan %s."
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:387
-msgid "Add to chat"
-msgstr ""
+#: ../src/gui/socialwindow.cpp:496
+msgid "Creating guild failed, please choose a shorter name."
+msgstr "Killan luonti epäonnistui, ole hyvä ja valitse lyhyempi nimi."
 
-#: src/gui/quitdialog.cpp:44
-msgid "Switch server"
-msgstr "Vaihda palvelinta"
+#: ../src/gui/socialwindow.cpp:526
+#, c-format
+msgid "Creating party called %s."
+msgstr "Luon ryhmän %s."
 
-#: src/gui/quitdialog.cpp:45
-msgid "Switch character"
-msgstr "Vaihda hahmoa"
+#: ../src/gui/socialwindow.cpp:519
+msgid "Creating party failed, please choose a shorter name."
+msgstr "Ryhmän luonti epäonnistui, ole hyvä ja valitse lyhyempi nimi."
 
-#: src/gui/recorder.cpp:87
-msgid "Finishing recording."
-msgstr ""
+#: ../src/resources/userpalette.cpp:105
+msgid "Critical Hit"
+msgstr "Täysosuma"
 
-#: src/gui/recorder.cpp:91
-msgid "Not currently recording."
-msgstr ""
+#: ../src/gui/debugwindow.cpp:68 ../src/gui/debugwindow.cpp:99
+#, c-format
+msgid "Cursor: (%d, %d)"
+msgstr "Kursori: (%d, %d)"
 
-#: src/gui/recorder.cpp:96
-msgid "Already recording."
-msgstr ""
+#: ../src/gui/serverdialog.cpp:230
+msgid "Custom Server"
+msgstr "Muu palvelin"
 
-#: src/gui/recorder.cpp:104
-msgid "Starting to record..."
-msgstr ""
+#: ../src/gui/setup_video.cpp:213
+msgid "Custom cursor"
+msgstr "Tyylitelty hiiren osoitin"
 
-#: src/gui/recorder.cpp:112
-msgid "Failed to start recording."
-msgstr ""
+#: ../src/gui/setup_video.cpp:460
+msgid "Deactivating OpenGL"
+msgstr "Kytken OpenGL:n pois käytöstä"
 
-#: src/gui/recorder.h:38
-msgid "Recording..."
-msgstr ""
+#: ../src/gui/debugwindow.cpp:43
+msgid "Debug"
+msgstr "Debug"
 
-#: src/gui/recorder.h:39
-msgid "Stop recording"
-msgstr ""
+#: ../src/keyboardconfig.cpp:78
+msgid "Debug Window"
+msgstr "Debug-ikkuna"
 
-#: src/gui/register.cpp:69
-msgid "Confirm:"
-msgstr "Vahvista:"
+#: ../src/gui/setup_keyboard.cpp:94
+msgid "Default"
+msgstr "Oletus"
 
-#: src/gui/register.cpp:100
-msgid "Email:"
-msgstr "Sähköpostiosoite:"
+#: ../src/net/tmwa/generalhandler.cpp:238
+msgid "Defense"
+msgstr "Puolustus"
 
-#: src/gui/register.cpp:166
+#: ../src/resources/itemdb.cpp:311
 #, c-format
-msgid "The username needs to be at least %d characters long."
-msgstr "Käyttäjänimen tulee olla vähintään %d merkkiä pitkä"
+msgid "Defense %+d"
+msgstr "Puolustus %+d"
 
-#: src/gui/register.cpp:174
-#, c-format
-msgid "The username needs to be less than %d characters long."
-msgstr "Käyttäjänimen tulee olla alle %d merkkiä pitkä."
+#: ../src/gui/setup_colors.cpp:94
+msgid "Delay:"
+msgstr "Viive:"
 
-#: src/gui/register.cpp:182 src/gui/unregisterdialog.cpp:117
-#, c-format
-msgid "The password needs to be at least %d characters long."
-msgstr "Salasanan tulee olla vähintään %d merkkiä pitkä"
+#: ../src/gui/charselectdialog.cpp:360 ../src/gui/serverdialog.cpp:231
+#: ../src/gui/setup_players.cpp:229
+msgid "Delete"
+msgstr "Poista"
 
-#: src/gui/register.cpp:190 src/gui/unregisterdialog.cpp:124
-#, c-format
-msgid "The password needs to be less than %d characters long."
-msgstr "Salasanan tulee olla alle %d merkkiä pitkä."
+#: ../src/net/manaserv/attributes.cpp:192
+#: ../src/net/tmwa/generalhandler.cpp:234
+msgid "Dexterity"
+msgstr "Näppäryys"
 
-#: src/gui/register.cpp:197
-msgid "Passwords do not match."
-msgstr "Salasanat eivät täsmää."
+#: ../src/net/manaserv/attributes.cpp:199
+#, fuzzy, c-format
+msgid "Dexterity %+.1f"
+msgstr "Näppäryys %+d"
 
-#: src/gui/serverdialog.cpp:197
-#, fuzzy
-msgid "Choose Your Server"
-msgstr "Valitse palvelin"
+#: ../src/net/tmwa/generalhandler.cpp:106
+#, c-format
+msgid "Dexterity %+d"
+msgstr "Näppäryys %+d"
 
-#: src/gui/serverdialog.cpp:206 src/gui/widgets/chattab.cpp:142
-msgid "Server:"
-msgstr "Palvelin:"
+#: ../src/net/tmwa/charserverhandler.cpp:274
+msgid "Dexterity:"
+msgstr "Näppäryys:"
 
-#: src/gui/serverdialog.cpp:207
-msgid "Port:"
-msgstr "Portti:"
+#: ../src/gui/setup_video.cpp:241
+msgid "Disable transparency (Low CPU mode)"
+msgstr "Poista läpinäkyvyys (hitaille suorittimille)"
 
-#: src/gui/serverdialog.cpp:208
-#, fuzzy
-msgid "Server type:"
-msgstr "Palvelin:"
+#: ../src/gui/popupmenu.cpp:105
+#, c-format
+msgid "Disregard %s"
+msgstr "Vaimenna %s"
 
-#: src/gui/serverdialog.cpp:229
-#, fuzzy
-msgid "Connect"
-msgstr "Yhdistetään..."
+#: ../src/gui/setup_players.cpp:66
+msgid "Disregarded"
+msgstr "Vaimennettu"
 
-#: src/gui/serverdialog.cpp:230
-#, fuzzy
-msgid "Custom Server"
-msgstr "Tyylitelty hiiren osoitin"
+# Nethack reference, no point in direct translation.
+#: ../src/net/manaserv/beinghandler.cpp:294
+#: ../src/net/tmwa/playerhandler.cpp:108
+msgid "Do you want your possessions identified?"
+msgstr "Haluatko tietää mitä rojua kanniskelit oikeasti mukanasi?"
 
-#: src/gui/serverdialog.cpp:324
-msgid "Please type both the address and the port of a server."
-msgstr "Kirjoita kenttiin sekä palvelimen osoite että portti"
+#: ../src/gui/setup_audio.cpp:43
+msgid "Download music"
+msgstr "Lataa musiikki"
 
-#: src/gui/serverdialog.cpp:441
+#: ../src/gui/serverdialog.cpp:441
 #, c-format
 msgid "Downloading server list...%2.2f%%"
-msgstr ""
+msgstr "Lataan palvelinluettelon...%2.2f%%"
 
-#: src/gui/serverdialog.cpp:447
-#, fuzzy
-msgid "Waiting for server..."
-msgstr "Odotetaan palvelinta"
+#: ../src/gui/inventorywindow.cpp:365 ../src/gui/popupmenu.cpp:374
+msgid "Drop"
+msgstr "Pudota"
 
-#: src/gui/serverdialog.cpp:451
-msgid "Preparing download"
-msgstr ""
+#: ../src/gui/inventorywindow.cpp:107 ../src/gui/inventorywindow.cpp:363
+#: ../src/gui/popupmenu.cpp:372
+msgid "Drop..."
+msgstr "Pudota..."
 
-#: src/gui/serverdialog.cpp:455
-msgid "Error retreiving server list!"
-msgstr ""
+# TODO: Hm?
+#: ../src/net/tmwa/generalhandler.cpp:148
+msgid "Duplicated login."
+msgstr "Kaksinkertainen sisäänkirjautuminen."
 
-#: src/gui/serverdialog.cpp:550
-msgid "requires a newer version"
-msgstr ""
+#: ../src/client.cpp:935
+msgid "Email Change"
+msgstr "Sähköpostin vaihto"
 
-#: src/gui/serverdialog.cpp:552
-#, c-format
-msgid "requires v%s"
-msgstr ""
+#: ../src/net/manaserv/loginhandler.cpp:309
+msgid "Email address already exists."
+msgstr "Sähköpostiosoite on jo käytössä."
 
-#: src/gui/setup_audio.cpp:42
-msgid "Sound"
-msgstr "Ääni"
+#: ../src/client.cpp:936
+msgid "Email changed successfully!"
+msgstr "Sähköpostiosoite vaihdettu onnistuneesti!"
 
-#: src/gui/setup_audio.cpp:43
-msgid "Download music"
-msgstr ""
+#: ../src/gui/register.cpp:100
+msgid "Email:"
+msgstr "Sähköpostiosoite:"
 
-#: src/gui/setup_audio.cpp:47
-msgid "Audio"
-msgstr "Ääni"
+#: ../src/keyboardconfig.cpp:84 ../src/keyboardconfig.cpp:85
+#: ../src/keyboardconfig.cpp:86 ../src/keyboardconfig.cpp:87
+#: ../src/keyboardconfig.cpp:88 ../src/keyboardconfig.cpp:89
+#: ../src/keyboardconfig.cpp:90 ../src/keyboardconfig.cpp:91
+#: ../src/keyboardconfig.cpp:92 ../src/keyboardconfig.cpp:93
+#: ../src/keyboardconfig.cpp:94 ../src/keyboardconfig.cpp:95
+#, c-format
+msgid "Emote Shortcut %d"
+msgstr "Eleen pikavalinta %d"
 
-#: src/gui/setup_audio.cpp:50
-msgid "Sfx volume"
-msgstr "Äänitehosteiden voimakkuus"
+#: ../src/keyboardconfig.cpp:80
+msgid "Emote Shortcut Window"
+msgstr "Eleiden pikavalintaikkuna"
 
-#: src/gui/setup_audio.cpp:51
-msgid "Music volume"
-msgstr "Musiikin voimakkuus"
+#: ../src/net/tmwa/specialhandler.cpp:148
+msgid "Emote failed!"
+msgstr "Elehtiminen epäonnistui!"
 
-#: src/gui/setup_audio.cpp:94
-#, fuzzy
-msgid "Notice"
-msgstr "Ei tekstiä"
+#: ../src/net/tmwa/network.cpp:145
+msgid "Empty address given to Network::connect()!"
+msgstr "Tyhjä osoite Network::connect()-pyynnössä!"
 
-#: src/gui/setup_audio.cpp:94
-msgid "You may have to restart your client if you want to download new music"
+#: ../src/gui/setup_players.cpp:235
+msgid "Enable Chat log"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:106
-msgid "Sound Engine"
-msgstr ""
+#: ../src/gui/setup_joystick.cpp:39
+msgid "Enable joystick"
+msgstr "Ota peliohjain käyttöön"
 
-#: src/gui/setup_colors.cpp:46
-msgid "This is what the color looks like"
-msgstr ""
+#: ../src/keyboardconfig.cpp:55
+msgid "Enable/Disable Trading"
+msgstr "Salli/estä kaupankäynti"
 
-#: src/gui/setup_colors.cpp:51
-msgid "Colors"
-msgstr "Värit"
+#: ../src/net/manaserv/chathandler.cpp:229
+msgid "End of channel list."
+msgstr "Kanavalistauksen loppu."
 
-#: src/gui/setup_colors.cpp:72
-msgid "Type:"
-msgstr ""
+#: ../src/gui/changepassworddialog.cpp:110
+msgid "Enter the old password first."
+msgstr "Anna ensin vanha salasana."
 
-#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:331
-msgid "Static"
-msgstr ""
+#: ../src/client.cpp:721
+msgid "Entering game world"
+msgstr "Siirryn pelimaailmaan"
 
-#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
-#: src/gui/setup_colors.cpp:332
-msgid "Pulse"
-msgstr ""
+#: ../src/gui/inventorywindow.cpp:92 ../src/gui/inventorywindow.cpp:105
+#: ../src/gui/inventorywindow.cpp:354 ../src/gui/popupmenu.cpp:366
+msgid "Equip"
+msgstr "Ota käyttöön"
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:333
-msgid "Rainbow"
-msgstr "Sateenkaari"
+#: ../src/net/tmwa/playerhandler.cpp:506
+msgid "Equip arrows first."
+msgstr "Varusta ensin nuolia."
 
-#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:333
-msgid "Spectrum"
-msgstr ""
+#: ../src/gui/equipmentwindow.cpp:69 ../src/gui/windowmenu.cpp:55
+msgid "Equipment"
+msgstr "Varusteet"
 
-#: src/gui/setup_colors.cpp:94
-msgid "Delay:"
-msgstr ""
+#: ../src/keyboardconfig.cpp:72
+msgid "Equipment Window"
+msgstr "Varusteikkuna"
+
+#: ../src/client.cpp:1036 ../src/gui/changeemaildialog.cpp:156
+#: ../src/gui/changepassworddialog.cpp:149 ../src/gui/charcreatedialog.cpp:183
+#: ../src/gui/register.cpp:218 ../src/gui/serverdialog.cpp:323
+#: ../src/gui/unregisterdialog.cpp:133 ../src/net/manaserv/charhandler.cpp:177
+#: ../src/net/manaserv/charhandler.cpp:227
+#: ../src/net/tmwa/charserverhandler.cpp:134
+#: ../src/net/tmwa/charserverhandler.cpp:151
+msgid "Error"
+msgstr "Virhe"
 
-#: src/gui/setup_colors.cpp:109
-msgid "Red:"
-msgstr ""
+#: ../src/net/manaserv/guildhandler.cpp:87
+msgid "Error creating guild."
+msgstr "Killan luonti epäonnistui."
 
-#: src/gui/setup_colors.cpp:124
-msgid "Green:"
-msgstr ""
+#: ../src/client.cpp:1336 ../src/client.cpp:1342
+msgid "Error creating updates directory!"
+msgstr "Päivityshakemistoa luodessa tapahtui virhe!"
 
-#: src/gui/setup_colors.cpp:139
-msgid "Blue:"
-msgstr ""
+#: ../src/net/manaserv/chathandler.cpp:211
+msgid "Error joining channel."
+msgstr "Kanavalle liittyminen epäonnistui."
 
-#: src/gui/setup.cpp:51
-msgid "Apply"
-msgstr "Hyväksy"
+#: ../src/gui/serverdialog.cpp:455
+msgid "Error retreiving server list!"
+msgstr "Palvelinluettelon hakeminen epäonnistui!"
 
-#: src/gui/setup.cpp:51
-msgid "Reset Windows"
-msgstr "Palauta ikkunoiden oletusasetukset"
+#: ../src/game.cpp:967
+#, c-format
+msgid "Error while loading %s"
+msgstr "Kohdetta %s ladattaessa tapahtui virhe."
 
-#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:78
-msgid "Press the button to start calibration"
-msgstr "Paina tätä nappia aloittaaksesi peliohjaimen kalibroinnin"
+#: ../src/resources/userpalette.cpp:101
+msgid "Exp Notification"
+msgstr "Kokemusilmoitus"
 
-#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:76
-msgid "Calibrate"
-msgstr "Kalibroi"
+#: ../src/gui/statuswindow.cpp:122
+msgid "Exp:"
+msgstr "Kok:"
 
-#: src/gui/setup_joystick.cpp:39
-msgid "Enable joystick"
-msgstr "Peliohjaintuki päälle"
+#: ../src/net/tmwa/gui/partytab.cpp:170 ../src/net/tmwa/partyhandler.cpp:178
+msgid "Experience sharing disabled."
+msgstr "Kokemuksen jako pois käytöstä."
 
-#: src/gui/setup_joystick.cpp:41
-msgid "Joystick"
-msgstr "Peliohjain"
+#: ../src/net/tmwa/gui/partytab.cpp:167 ../src/net/tmwa/partyhandler.cpp:172
+msgid "Experience sharing enabled."
+msgstr "Kokemuksen jako käytössä."
 
-#: src/gui/setup_joystick.cpp:83
-msgid "Stop"
-msgstr "Lopeta"
+#: ../src/net/tmwa/gui/partytab.cpp:173 ../src/net/tmwa/partyhandler.cpp:184
+msgid "Experience sharing not possible."
+msgstr "Kokemuksen jako ei ole mahdollista."
 
-#: src/gui/setup_joystick.cpp:84
-msgid "Rotate the stick"
-msgstr "Käytä ohjain ääriasennoissaan pyörittämällä"
+#: ../src/net/tmwa/gui/partytab.cpp:176
+msgid "Experience sharing unknown."
+msgstr "Kokemuksen jaon tila on tuntematon."
 
-#: src/gui/setup_keyboard.cpp:77
-msgid "Keyboard"
-msgstr "Näppäimistö"
+#: ../src/gui/setup_video.cpp:230
+msgid "FPS limit:"
+msgstr "Piirtonopeusrajoitin (kuvaa / sekunti):"
 
-#: src/gui/setup_keyboard.cpp:86
-msgid "Assign"
-msgstr ""
+#: ../src/net/tmwa/tradehandler.cpp:211
+msgid "Failed adding item for unknown reason."
+msgstr "Esineen lisääminen epäonnistui tuntemattomasta syystä."
 
-#: src/gui/setup_keyboard.cpp:90
-msgid "Unassign"
-msgstr ""
+#: ../src/net/tmwa/tradehandler.cpp:207
+msgid "Failed adding item. Trade partner has no free slot."
+msgstr "Esineen lisääminen epäonnistui; kauppakumppanilla ei ole tilaa sille."
 
-#: src/gui/setup_keyboard.cpp:94
-msgid "Default"
-msgstr "Oletus"
+#: ../src/net/tmwa/tradehandler.cpp:202
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr ""
+"Esineen lisääminen epäonnistui; kauppakumppanilla on liian painava lasti."
 
-#: src/gui/setup_keyboard.cpp:125
-msgid "Key Conflict(s) Detected."
+# TODO: WTF? 
+#: ../src/gui/trade.cpp:262
+msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
+"Esineen lisääminen epäonnistui. Et voi limittää jotakin esinetyyppiä "
+"ikkunassa."
 
-#: src/gui/setup_players.cpp:58
-msgid "Name"
-msgstr "Nimi"
+#: ../src/net/tmwa/charserverhandler.cpp:134
+msgid "Failed to create character. Most likely the name is already taken."
+msgstr "Hahmon luonti epäonnistui. Todennäköisesti hahmon nimi on jo käytössä."
 
-#: src/gui/setup_players.cpp:59
-msgid "Relation"
-msgstr "Relaatio"
+#: ../src/net/tmwa/charserverhandler.cpp:151
+msgid "Failed to delete character."
+msgstr "Hahmon poisto epäonnistui."
 
-#: src/gui/setup_players.cpp:64
-msgid "Neutral"
-msgstr "Neutraali"
+#: ../src/net/manaserv/guildhandler.cpp:209
+msgid "Failed to promote member."
+msgstr "Jäsenen ylennys epäonnistui."
 
-#: src/gui/setup_players.cpp:65
-msgid "Friend"
-msgstr "Ystävä"
+#: ../src/gui/npcpostdialog.cpp:99
+msgid "Failed to send as sender or letter invalid."
+msgstr "Lähettäminen epäonnistui: vastaanottaja tai kirje ei kelpaa."
 
-#: src/gui/setup_players.cpp:66
-msgid "Disregarded"
-msgstr ""
+#: ../src/gui/recorder.cpp:112
+msgid "Failed to start recording."
+msgstr "Tallentamisen aloittaminen epäonnistui."
 
-#: src/gui/setup_players.cpp:67
-msgid "Ignored"
-msgstr "ohitettu"
+#: ../src/gui/setup_video.cpp:426
+msgid ""
+"Failed to switch to fullscreen mode and restoration of old mode also failed!"
+msgstr "Kokoruututilaan vaihto epäonnistui, samoin paluu edelliseen tilaan!"
 
-#: src/gui/setup_players.cpp:206 src/gui/setup_video.cpp:153
-msgid "???"
-msgstr "???"
+#: ../src/gui/setup_video.cpp:420
+msgid ""
+"Failed to switch to windowed mode and restoration of old mode also failed!"
+msgstr "Ikkunoituun tilaan vaihto epäonnistui, samoin paluu edelliseen tilaan!"
 
-#: src/gui/setup_players.cpp:225
-msgid "Allow trading"
-msgstr "Salli kaupakäynti"
+#: ../src/net/tmwa/inventoryhandler.cpp:287
+msgid "Failed to use item."
+msgstr "Esineen käyttö epäonnistui."
 
-#: src/gui/setup_players.cpp:227
-msgid "Allow whispers"
-msgstr ""
+#: ../src/client.cpp:956
+msgid "Farewell, come back any time..."
+msgstr "Näkemisiin, tule pian takaisin..."
 
-#: src/gui/setup_players.cpp:231
-msgid "Put all whispers in tabs"
-msgstr ""
+#: ../src/gui/charcreatedialog.cpp:81 ../src/gui/register.cpp:91
+msgid "Female"
+msgstr "Naispuolinen"
 
-#: src/gui/setup_players.cpp:233
-#, fuzzy
-msgid "Show gender"
-msgstr "Näytä nimi"
+#: ../src/keyboardconfig.cpp:56
+msgid "Find Path to Mouse"
+msgstr "Löydä polku hiiren kursorin luo"
 
-#: src/gui/setup_players.cpp:235
-msgid "Enable Chat log"
-msgstr ""
+#: ../src/gui/recorder.cpp:87
+msgid "Finishing recording."
+msgstr "Lopetan tallentamisen."
 
-#: src/gui/setup_players.cpp:237
-msgid "Players"
-msgstr "Pelaajat"
+#: ../src/gui/setup_video.cpp:256
+msgid "Font size"
+msgstr "Kirjasimen koko"
 
-#: src/gui/setup_players.cpp:262
-msgid "When ignoring:"
-msgstr ""
+#: ../src/commandhandler.cpp:204
+msgid "For more information, type /help <command>."
+msgstr "Saat lisätietoa komennoista kirjoittamalla /help <komennon nimi>."
 
-#: src/gui/setup_video.cpp:134
-msgid "Tiny"
-msgstr "Pikkuruinen"
+#: ../src/gui/setup_players.cpp:65
+msgid "Friend"
+msgstr "Ystävä"
 
-#: src/gui/setup_video.cpp:135
-msgid "Small"
-msgstr "Pieni"
+#: ../src/gui/setup_video.cpp:211
+msgid "Full screen"
+msgstr "Kokoruututila"
 
-#: src/gui/setup_video.cpp:136
-msgid "Medium"
-msgstr ""
+#: ../src/resources/userpalette.cpp:94
+msgid "GM Names"
+msgstr "GM-nimet"
 
-#: src/gui/setup_video.cpp:137
-msgid "Large"
-msgstr "Suuri"
+#: ../src/net/tmwa/gamehandler.cpp:102
+msgid "Game"
+msgstr "Peli"
 
-#: src/gui/setup_video.cpp:163
-msgid "No text"
-msgstr "Ei tekstiä"
+#: ../src/net/manaserv/beinghandler.cpp:288
+#: ../src/net/tmwa/playerhandler.cpp:100
+msgid "Game Over!"
+msgstr "Se siitä!"
 
-#: src/gui/setup_video.cpp:164
-msgid "Text"
-msgstr "Teksti"
+#: ../src/game.cpp:181
+msgid "General"
+msgstr "Yleiset"
 
-#: src/gui/setup_video.cpp:165
-msgid "Bubbles, no names"
-msgstr ""
+#: ../src/gui/widgets/chattab.cpp:127
+#, c-format
+msgid "Global announcement from %s:"
+msgstr "%s ilmoittaa kaikille:"
 
-#: src/gui/setup_video.cpp:166
-msgid "Bubbles with names"
-msgstr ""
+#: ../src/gui/widgets/chattab.cpp:121
+msgid "Global announcement:"
+msgstr "Yleinen ilmoitus:"
 
-#: src/gui/setup_video.cpp:178
-msgid "off"
-msgstr "pois päältä"
+#: ../src/net/tmwa/generalhandler.cpp:209
+msgid "Got disconnected from server!"
+msgstr "Yhteys palvelimeen katkesi!"
 
-#: src/gui/setup_video.cpp:179 src/gui/setup_video.cpp:192
-msgid "low"
-msgstr "matala"
+#: ../src/gui/setup_colors.cpp:124
+msgid "Green:"
+msgstr "Vihreä:"
 
-#: src/gui/setup_video.cpp:180 src/gui/setup_video.cpp:194
-msgid "high"
-msgstr "korkea"
+#: ../src/gui/setup_video.cpp:253
+msgid "Gui opacity"
+msgstr "Käyttöliittymän läpinäkyvyys"
 
-#: src/gui/setup_video.cpp:193
-msgid "medium"
-msgstr ""
+#: ../src/net/tmwa/gui/guildtab.cpp:45
+msgid "Guild"
+msgstr "Kilta"
 
-#: src/gui/setup_video.cpp:195
-msgid "max"
-msgstr ""
+# TODO: Guild quit? Leave or remove?
+#: ../src/gui/socialwindow.cpp:139
+#, c-format
+msgid "Guild %s quit requested."
+msgstr "Killasta %s eroa pyydetty."
 
-#: src/gui/setup_video.cpp:217
-msgid "Full screen"
-msgstr "Kokoruututila"
+#: ../src/resources/userpalette.cpp:98
+msgid "Guild Members"
+msgstr "Killan jäsenet"
 
-#: src/gui/setup_video.cpp:218
-msgid "OpenGL"
-msgstr "OpenGL"
+#: ../src/gui/socialwindow.cpp:540
+msgid "Guild Name"
+msgstr "Killan nimi"
 
-#: src/gui/setup_video.cpp:219
-msgid "Custom cursor"
-msgstr "Tyylitelty hiiren osoitin"
+#: ../src/net/manaserv/guildhandler.cpp:82
+msgid "Guild created."
+msgstr "Kilta luotu."
 
-#: src/gui/setup_video.cpp:221
-msgid "Visible names"
-msgstr "Näytä nimet"
+#: ../src/net/tmwa/guildhandler.cpp:393
+msgid "Guild creation isn't supported yet."
+msgstr "Kiltojen luontia ei tueta vielä."
 
-#: src/gui/setup_video.cpp:223
-msgid "Particle effects"
-msgstr "Hiukkas tehosteet"
+#: ../src/net/tmwa/gui/guildtab.cpp:89
+msgid "Guild name is missing."
+msgstr "Killan nimi puuttuu."
 
-#: src/gui/setup_video.cpp:225
-#, fuzzy
-msgid "Show own name"
-msgstr "Näytä nimi"
+# VP: voimapisteet
+#: ../src/resources/itemdb.cpp:312
+#, c-format
+msgid "HP %+d"
+msgstr "VP %+d"
 
-#: src/gui/setup_video.cpp:226
-msgid "Log NPC dialogue"
-msgstr ""
+#: ../src/gui/statuswindow.cpp:117
+msgid "HP:"
+msgstr "VP:"
 
-#: src/gui/setup_video.cpp:227
-msgid "Show pickup notification"
-msgstr ""
+#: ../src/gui/charcreatedialog.cpp:74
+msgid "Hair color:"
+msgstr "Hiusten väri:"
 
-#. TRANSLATORS: Refers to "Show pickup notification"
-#: src/gui/setup_video.cpp:229
-msgid "in chat"
-msgstr ""
+#: ../src/gui/charcreatedialog.cpp:77
+msgid "Hair style:"
+msgstr "Hiustyyli:"
 
-#. TRANSLATORS: Refers to "Show pickup notification"
-#: src/gui/setup_video.cpp:231
-msgid "as particle"
-msgstr ""
+#: ../src/gui/help.cpp:37
+msgid "Help"
+msgstr "Apua"
 
-#: src/gui/setup_video.cpp:236
-#, fuzzy
-msgid "FPS limit:"
-msgstr "Piirtonopeusrajoitin (kuvaa / sekunti)"
+#: ../src/keyboardconfig.cpp:69
+msgid "Help Window"
+msgstr "Ohjeikkuna"
 
-#: src/gui/setup_video.cpp:247
-msgid "Disable transparency (Low CPU mode)"
-msgstr ""
+#: ../src/keyboardconfig.cpp:52
+msgid "Hide Windows"
+msgstr "Piilota ikkunat"
 
-#: src/gui/setup_video.cpp:250
-msgid "Video"
-msgstr "Kuva"
+#: ../src/net/tmwa/specialhandler.cpp:199
+msgid "Huh? What's that?"
+msgstr "Siis mikä?"
 
-#: src/gui/setup_video.cpp:252
-#, fuzzy
-msgid "Show damage"
-msgstr "Näytä nimi"
+#: ../src/net/manaserv/beinghandler.cpp:293
+#: ../src/net/tmwa/playerhandler.cpp:106
+msgid "I guess this did not run too well."
+msgstr "Ei tainnut mennä kovin lujaa."
 
-#: src/gui/setup_video.cpp:258
-msgid "Overhead text"
-msgstr ""
+#: ../src/commandhandler.cpp:240
+msgid "If <channel> doesn't exist, it's created."
+msgstr "Jos annettua kanavaa ei ole, se luodaan."
 
-#: src/gui/setup_video.cpp:259
-msgid "Gui opacity"
-msgstr "Käyttöliittymän läpinäkyvyys"
+#: ../src/commandhandler.cpp:258 ../src/commandhandler.cpp:285
+#: ../src/gui/widgets/channeltab.cpp:82 ../src/gui/widgets/channeltab.cpp:91
+#: ../src/net/tmwa/gui/guildtab.cpp:75 ../src/net/tmwa/gui/partytab.cpp:75
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr "Jos nimessä on välilyöntejä, laita sen ympärille lainausmerkit (\")."
 
-#: src/gui/setup_video.cpp:260
-msgid "Ambient FX"
-msgstr "Taustaäänet"
+#: ../src/net/tmwa/playerhandler.cpp:125
+msgid "If you weren't so animated, you'd be pushing up the daisies."
+msgstr "Ellet olisi näin liikkuvainen, pukkaisit päivänkakkaraa."
 
-#: src/gui/setup_video.cpp:261
-#, fuzzy
-msgid "Particle detail"
-msgstr "Hiukkas tehosteet"
+#: ../src/gui/widgets/channeltab.cpp:75
+msgid "If you're the last person in the channel, it will be deleted."
+msgstr "Jos olet viimeinen henkilö kanavalla niin se katoaa."
 
-#: src/gui/setup_video.cpp:262
-msgid "Font size"
-msgstr "Kirjasimen koko"
+#: ../src/gui/popupmenu.cpp:108
+#, c-format
+msgid "Ignore %s"
+msgstr "Jätä %s huomiotta"
 
-#: src/gui/setup_video.cpp:277 src/gui/setup_video.cpp:532
-#: src/gui/setup_video.cpp:662
-#, fuzzy
-msgid "None"
-msgstr "Ei"
+#: ../src/keyboardconfig.cpp:103
+msgid "Ignore input 1"
+msgstr "Jätä huomiotta syöte 1"
 
-#: src/gui/setup_video.cpp:426
-msgid ""
-"Failed to switch to windowed mode and restoration of old mode also failed!"
-msgstr ""
+#: ../src/keyboardconfig.cpp:104
+msgid "Ignore input 2"
+msgstr "Jätä huomiotta syöte 2"
 
-#: src/gui/setup_video.cpp:432
-msgid ""
-"Failed to switch to fullscreen mode and restoration of old mode also failed!"
-msgstr ""
+#: ../src/gui/setup_players.cpp:67
+msgid "Ignored"
+msgstr "Huomiotta jätetty"
 
-#: src/gui/setup_video.cpp:443
-#, fuzzy
-msgid "Switching to Full Screen"
-msgstr "Kokoruututilaan siirtyminen"
+#: ../src/game.cpp:733
+msgid "Ignoring incoming trade requests"
+msgstr "Et huomioi kaupankäyntipyyntöjä"
 
-#: src/gui/setup_video.cpp:444
-msgid "Restart needed for changes to take effect."
-msgstr "Ohjelma pitää käynnistää uudelleen, jotta muutokset astuvat voimaan."
+#: ../src/net/manaserv/tradehandler.cpp:97
+msgid "Ignoring incoming trade requests."
+msgstr "Jätät tulevat kaupantekoehdotukset huomiotta."
 
-#: src/gui/setup_video.cpp:458
-#, fuzzy
-msgid "Changing to OpenGL"
-msgstr "Vaihdetaan OpenGL -toimintatilaan"
+#: ../src/net/manaserv/charhandler.cpp:210
+#: ../src/net/tmwa/charserverhandler.cpp:146
+msgid "Info"
+msgstr "Tietoja"
 
-#: src/gui/setup_video.cpp:459
-msgid ""
-"Applying change to OpenGL requires restart. In case OpenGL messes up your "
-"game graphics, restart the game with the command line option \"--no-opengl\"."
-msgstr ""
+#: ../src/net/tmwa/playerhandler.cpp:101
+msgid "Insert coin to continue."
+msgstr "Syötä kolikko jatkaaksesi."
 
-#: src/gui/setup_video.cpp:466
-msgid "Deactivating OpenGL"
-msgstr ""
+#: ../src/net/tmwa/specialhandler.cpp:172
+msgid "Insufficient HP!"
+msgstr "Voimapisteesi eivät riitä!"
 
-#: src/gui/setup_video.cpp:467
-msgid "Applying change to OpenGL requires restart."
-msgstr "OpenGL -asetusten muutokset vaativat ohjelman uudelleenkäynnistyksen"
+# TODO: ??? It's MP everywhere else!
+#: ../src/net/tmwa/specialhandler.cpp:175
+msgid "Insufficient SP!"
+msgstr "Manapisteesi eivät riitä!"
 
-#: src/gui/setup_video.cpp:475
-msgid "Transparency disabled"
-msgstr ""
+#: ../src/net/manaserv/attributes.cpp:218
+#: ../src/net/tmwa/generalhandler.cpp:233
+msgid "Intelligence"
+msgstr "Älykkyys"
 
-#: src/gui/setup_video.cpp:476 src/gui/setup_video.cpp:484
-msgid "You must restart to apply changes."
-msgstr ""
+#: ../src/net/manaserv/attributes.cpp:225
+#, fuzzy, c-format
+msgid "Intelligence %+.1f"
+msgstr "Älykkyys %+d"
 
-#: src/gui/setup_video.cpp:483
-msgid "Transparency enabled"
-msgstr ""
+#: ../src/net/tmwa/generalhandler.cpp:105
+#, c-format
+msgid "Intelligence %+d"
+msgstr "Älykkyys %+d"
 
-#: src/gui/setup_video.cpp:576 src/gui/setup_video.cpp:581
-#, fuzzy
-msgid "Screen Resolution Changed"
-msgstr "Näytön resoluutio vaihdettu"
+#: ../src/net/tmwa/charserverhandler.cpp:273
+msgid "Intelligence:"
+msgstr "Älykkyys:"
 
-#: src/gui/setup_video.cpp:577 src/gui/setup_video.cpp:582
-msgid "Restart your client for the change to take effect."
-msgstr ""
+#: ../src/net/manaserv/charhandler.cpp:267
+#, fuzzy
+msgid "Invalid character slot selected."
+msgstr "Hahmo poistettu."
 
-#: src/gui/setup_video.cpp:579
-msgid "Some windows may be moved to fit the lowered resolution."
-msgstr ""
+#: ../src/net/manaserv/charhandler.cpp:156
+msgid "Invalid gender."
+msgstr "Epäkelpo sukupuoli."
 
-#: src/gui/setup_video.cpp:612
-#, fuzzy
-msgid "Particle Effect Settings Changed."
-msgstr "Hiukkas tehoste asetukset vaihdettu."
+#: ../src/net/manaserv/charhandler.cpp:153
+msgid "Invalid hair color."
+msgstr "Epäkelpo hiusten väri."
 
-#: src/gui/setup_video.cpp:613
-msgid "Changes will take effect on map change."
-msgstr ""
+#: ../src/net/manaserv/charhandler.cpp:150
+msgid "Invalid hairstyle."
+msgstr "Epäkelpo hiustyyli."
 
-#: src/gui/skilldialog.cpp:212 src/gui/windowmenu.cpp:59
-msgid "Skills"
-msgstr "Taidot"
+#: ../src/net/manaserv/charhandler.cpp:144
+msgid "Invalid name."
+msgstr "Epäkelpo nimi."
 
-#: src/gui/skilldialog.cpp:223
-msgid "Up"
-msgstr "Ylös"
+#: ../src/net/manaserv/charhandler.cpp:171
+#, fuzzy
+msgid "Invalid slot number."
+msgstr "Epäkelpo nimi."
 
-#: src/gui/skilldialog.cpp:269
+#: ../src/client.cpp:1302
 #, c-format
-msgid "Skill points available: %d"
-msgstr ""
+msgid "Invalid update host: %s"
+msgstr "Epäkelpo päivitysosoite: %s"
 
-#: src/gui/skilldialog.cpp:351
-#, c-format
-msgid "Skill Set %d"
-msgstr ""
+#: ../src/gui/inventorywindow.cpp:59 ../src/gui/windowmenu.cpp:56
+msgid "Inventory"
+msgstr "Tavarat"
 
-#: src/gui/skilldialog.cpp:360
-#, fuzzy, c-format
-msgid "Skill %d"
-msgstr "Taidot"
+#: ../src/keyboardconfig.cpp:71
+msgid "Inventory Window"
+msgstr "Tavaraikkuna"
 
-#: src/gui/skilldialog.cpp:442
-#, fuzzy, c-format
-msgid "Lvl: %d (%+d)"
-msgstr "Taso: %d"
+#: ../src/localplayer.cpp:898
+#, fuzzy
+msgid "Inventory is full."
+msgstr "Tavarat"
 
-#: src/gui/skilldialog.cpp:453
-#, fuzzy, c-format
-msgid "Lvl: %d"
-msgstr "Taso: %d"
+#: ../src/gui/socialwindow.cpp:331
+msgid "Invite"
+msgstr "Kutsu"
 
-#: src/gui/socialwindow.cpp:126
+#: ../src/gui/popupmenu.cpp:130
 #, c-format
-msgid "Invited user %s to guild %s."
-msgstr ""
+msgid "Invite %s to join your guild"
+msgstr "Kutsu %s kiltaasi"
 
-#: src/gui/socialwindow.cpp:139
+#: ../src/gui/popupmenu.cpp:134
 #, c-format
-msgid "Guild %s quit requested."
-msgstr ""
+msgid "Invite %s to join your party"
+msgstr "Kutsu %s ryhmääsi"
 
-#: src/gui/socialwindow.cpp:153
-msgid "Member Invite to Guild"
-msgstr ""
+#: ../src/net/manaserv/guildhandler.cpp:97
+msgid "Invite sent."
+msgstr "Kutsu lähetetty."
 
-#: src/gui/socialwindow.cpp:154
+#: ../src/gui/socialwindow.cpp:126
 #, c-format
-msgid "Who would you like to invite to guild %s?"
-msgstr ""
-
-#: src/gui/socialwindow.cpp:163
-msgid "Leave Guild?"
-msgstr ""
-
-#: src/gui/socialwindow.cpp:164
-#, fuzzy, c-format
-msgid "Are you sure you want to leave guild %s?"
-msgstr "Haluatko varmasti lopettaa?"
+msgid "Invited user %s to guild %s."
+msgstr "Kutsuit käyttäjän %s kiltaan %s."
 
-#: src/gui/socialwindow.cpp:207 src/net/tmwa/partyhandler.cpp:330
+#: ../src/gui/socialwindow.cpp:207 ../src/net/tmwa/partyhandler.cpp:330
 #, c-format
 msgid "Invited user %s to party."
-msgstr ""
+msgstr "Käyttäjä %s kutsuttu ryhmään."
 
-#: src/gui/socialwindow.cpp:218
+#: ../src/net/tmwa/partyhandler.cpp:335
 #, c-format
-msgid "Party %s quit requested."
-msgstr ""
+msgid "Inviting failed, because you can't see a player called %s."
+msgstr "Kutsu epäonnistui: et näe käyttäjää %s."
 
-#: src/gui/socialwindow.cpp:232
-msgid "Member Invite to Party"
+#: ../src/keyboardconfig.cpp:57 ../src/keyboardconfig.cpp:58
+#: ../src/keyboardconfig.cpp:59 ../src/keyboardconfig.cpp:60
+#: ../src/keyboardconfig.cpp:61 ../src/keyboardconfig.cpp:62
+#: ../src/keyboardconfig.cpp:63 ../src/keyboardconfig.cpp:64
+#: ../src/keyboardconfig.cpp:65 ../src/keyboardconfig.cpp:66
+#: ../src/keyboardconfig.cpp:67 ../src/keyboardconfig.cpp:68
+#, c-format
+msgid "Item Shortcut %d"
+msgstr "Esinepikavalinta %d"
+
+#: ../src/keyboardconfig.cpp:76
+msgid "Item Shortcut Window"
+msgstr "Esineiden pikavalintaikkuna"
+
+#: ../src/localplayer.cpp:901
+msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:233
-#, c-format
-msgid "Who would you like to invite to party %s?"
+#: ../src/localplayer.cpp:897
+msgid "Item is too far away"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:242
-msgid "Leave Party?"
+#: ../src/localplayer.cpp:896
+msgid "Item is too heavy."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:243
-#, fuzzy, c-format
-msgid "Are you sure you want to leave party %s?"
-msgstr "Haluatko varmasti lopettaa?"
+#: ../src/net/tmwa/gui/partytab.cpp:135 ../src/net/tmwa/partyhandler.cpp:202
+msgid "Item sharing disabled."
+msgstr "Esineiden jakaminen poistettu käytöstä."
 
-#: src/gui/socialwindow.cpp:272
-msgid "Create Guild"
-msgstr ""
+#: ../src/net/tmwa/gui/partytab.cpp:132 ../src/net/tmwa/partyhandler.cpp:196
+msgid "Item sharing enabled."
+msgstr "Esineiden jakaminen käytössä."
 
-#: src/gui/socialwindow.cpp:273 src/gui/socialwindow.cpp:620
-#, fuzzy
-msgid "Create Party"
-msgstr "Luo hahmo"
+#: ../src/net/tmwa/gui/partytab.cpp:138 ../src/net/tmwa/partyhandler.cpp:208
+msgid "Item sharing not possible."
+msgstr "Esineiden jakaminen ei ole mahdollista."
 
-#: src/gui/socialwindow.cpp:312 src/gui/windowmenu.cpp:64
-msgid "Social"
-msgstr ""
+#: ../src/net/tmwa/gui/partytab.cpp:141
+msgid "Item sharing unknown."
+msgstr "Esineiden jaon tila on tuntematon."
 
-#: src/gui/socialwindow.cpp:330
+#: ../src/client.cpp:785
 #, fuzzy
-msgid "Invite"
-msgstr "Kutsu käyttäjä"
+msgid "ItemDB: Error while loading "
+msgstr "Kohdetta %s ladattaessa tapahtui virhe."
 
-#: src/gui/socialwindow.cpp:331
-#, fuzzy
-msgid "Leave"
-msgstr "Suuri"
+#: ../src/gui/statuswindow.cpp:159
+msgid "Job:"
+msgstr "Työ:"
 
-#: src/gui/socialwindow.cpp:443
+#: ../src/gui/statuswindow.cpp:158 ../src/gui/statuswindow.cpp:276
 #, c-format
-msgid "Accepted party invite from %s."
-msgstr ""
+msgid "Job: %d"
+msgstr "Työ: %d"
 
-#: src/gui/socialwindow.cpp:449
-#, c-format
-msgid "Rejected party invite from %s."
-msgstr ""
+#: ../src/net/manaserv/partyhandler.cpp:87
+msgid "Joined party."
+msgstr "Liityit ryhmään."
 
-#: src/gui/socialwindow.cpp:462
-#, c-format
-msgid "Accepted guild invite from %s."
-msgstr ""
+#: ../src/gui/setup_joystick.cpp:41
+msgid "Joystick"
+msgstr "Peliohjain"
 
-#: src/gui/socialwindow.cpp:468
-#, c-format
-msgid "Rejected guild invite from %s."
-msgstr ""
+#: ../src/gui/setup_keyboard.cpp:125
+msgid "Key Conflict(s) Detected."
+msgstr "Päällekkäisiä näppäinoikopolkuja löytyi."
 
-#: src/gui/socialwindow.cpp:497
-msgid "Creating guild failed, please choose a shorter name."
-msgstr ""
+#: ../src/gui/setup_keyboard.cpp:77
+msgid "Keyboard"
+msgstr "Näppäimistö"
 
-#: src/gui/socialwindow.cpp:504
-#, c-format
-msgid "Creating guild called %s."
-msgstr ""
+#: ../src/net/tmwa/adminhandler.cpp:64
+msgid "Kick failed!"
+msgstr "Potkiminen epäonnistui!"
 
-#: src/gui/socialwindow.cpp:520
-msgid "Creating party failed, please choose a shorter name."
-msgstr ""
+# TODO: What?
+#: ../src/gui/popupmenu.cpp:163
+msgid "Kick monster"
+msgstr "Potkaise hirviötä"
 
-#: src/gui/socialwindow.cpp:527
-#, c-format
-msgid "Creating party called %s."
-msgstr ""
+#: ../src/gui/popupmenu.cpp:141
+msgid "Kick player"
+msgstr "Potki pelaaja pois"
 
-#: src/gui/socialwindow.cpp:541
-#, fuzzy
-msgid "Guild Name"
-msgstr "T"
+#: ../src/net/tmwa/adminhandler.cpp:66
+msgid "Kick succeeded!"
+msgstr "Potkiminen onnistui!"
 
-#: src/gui/socialwindow.cpp:542
-#, fuzzy
-msgid "Choose your guild's name."
-msgstr "Valitse palvelin"
+#: ../src/gui/setup_video.cpp:131
+msgid "Large"
+msgstr "Suuri"
 
-#: src/gui/socialwindow.cpp:554
-msgid "Received guild request, but one already exists."
-msgstr ""
+#: ../src/gui/socialwindow.cpp:332
+msgid "Leave"
+msgstr "Eroa"
 
-#: src/gui/socialwindow.cpp:559
+#: ../src/gui/socialwindow.cpp:163
+msgid "Leave Guild?"
+msgstr "Eroa killasta?"
+
+#: ../src/gui/socialwindow.cpp:242
+msgid "Leave Party?"
+msgstr "Eroa ryhmästä?"
+
+#: ../src/gui/statuswindow.cpp:113 ../src/gui/statuswindow.cpp:215
+#: ../src/gui/statuswindow.cpp:263
 #, c-format
-msgid "%s has invited you to join the guild %s."
-msgstr ""
+msgid "Level: %d"
+msgstr "Taso: %d"
 
-#: src/gui/socialwindow.cpp:564
-msgid "Accept Guild Invite"
-msgstr ""
+# TODO: Optimistic translation: followed by channel listing?
+#: ../src/net/manaserv/chathandler.cpp:217
+msgid "Listing channels."
+msgstr "Kanavalistaus:"
 
-#: src/gui/socialwindow.cpp:576
-msgid "Received party request, but one already exists."
-msgstr ""
+#: ../src/resources/userpalette.cpp:109
+msgid "Local Player Critical Hit"
+msgstr "Paikallinen pelaaja saa täysosuman"
 
-#: src/gui/socialwindow.cpp:585
-msgid "You have been invited you to join a party."
-msgstr ""
+# TODO: Local player is apparently not you? How should this be interpreted?
+#: ../src/resources/userpalette.cpp:107
+msgid "Local Player Hits Monster"
+msgstr "Paikallinen pelaaja lyö hirviötä"
 
-#: src/gui/socialwindow.cpp:589
-#, c-format
-msgid "You have been invited to join the %s party."
-msgstr ""
+# TODO: "miss" isn't directly translateable, becomes local hitting-without-success (not really suitable for arrows); 'huti' would be more colliloq- non-literary but more generic.
+#: ../src/resources/userpalette.cpp:111
+msgid "Local Player Miss"
+msgstr "Paikallisen pelaajan huti"
 
-#: src/gui/socialwindow.cpp:597
-#, c-format
-msgid "%s has invited you to join their party."
-msgstr ""
+#: ../src/gui/setup_video.cpp:220
+msgid "Log NPC dialogue"
+msgstr "Kirjaa keskustelut ei-pelaajahahmojen kanssa lokiin"
 
-#: src/gui/socialwindow.cpp:602
-#, c-format
-msgid "%s has invited you to join the %s party."
-msgstr ""
+#: ../src/client.cpp:688
+msgid "Logging in"
+msgstr "Kirjaudun sisään"
 
-#: src/gui/socialwindow.cpp:610
-msgid "Accept Party Invite"
-msgstr ""
+#: ../src/gui/login.cpp:51 ../src/gui/login.cpp:63
+msgid "Login"
+msgstr "Kirjaudu sisään"
 
-#: src/gui/socialwindow.cpp:621
-msgid "Cannot create party. You are already in a party"
-msgstr ""
+#: ../src/net/manaserv/loginhandler.cpp:275
+msgid "Login attempt too soon after previous attempt."
+msgstr "Sisäänkirjautumista yritetty liian pian edellisen yrityksen jälḱeen."
 
-#: src/gui/socialwindow.cpp:626
-msgid "Party Name"
-msgstr ""
+#: ../src/net/manaserv/beinghandler.cpp:297
+#: ../src/net/tmwa/playerhandler.cpp:114
+msgid "Looks like you got your head handed to you."
+msgstr "Jäi näköjään oma pää vetävän käteen."
 
-#: src/gui/socialwindow.cpp:627
-#, fuzzy
-msgid "Choose your party's name."
-msgstr "Valitse palvelin"
+#: ../src/net/tmwa/generalhandler.cpp:235
+msgid "Luck"
+msgstr "Tuuri"
 
-#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:62
-msgid "Specials"
-msgstr ""
+#: ../src/net/tmwa/generalhandler.cpp:107
+#, c-format
+msgid "Luck %+d"
+msgstr "Tuuri %+d"
+
+#: ../src/net/tmwa/charserverhandler.cpp:275
+msgid "Luck:"
+msgstr "Tuuri:"
 
-#: src/gui/statuswindow.cpp:113 src/gui/statuswindow.cpp:215
-#: src/gui/statuswindow.cpp:262
+#: ../src/gui/skilldialog.cpp:470
 #, c-format
-msgid "Level: %d"
+msgid "Lvl: %d"
 msgstr "Taso: %d"
 
-#: src/gui/statuswindow.cpp:114 src/gui/statuswindow.cpp:208
-#: src/gui/statuswindow.cpp:239
+#: ../src/gui/skilldialog.cpp:459
 #, c-format
-msgid "Money: %s"
-msgstr ""
+msgid "Lvl: %d (%+d)"
+msgstr "Taso: %d (%+d)"
 
-#: src/gui/statuswindow.cpp:117
-msgid "HP:"
-msgstr ""
+#: ../src/net/tmwa/generalhandler.cpp:239
+msgid "M.Attack"
+msgstr "T.-hyökkäys"
 
-#: src/gui/statuswindow.cpp:122
-msgid "Exp:"
-msgstr ""
+#: ../src/net/tmwa/generalhandler.cpp:240
+msgid "M.Defense"
+msgstr "T.-puolustus"
+
+# MP: manapisteet (ei taikapisteet, ollaanhan MANA worldissa!)
+#: ../src/resources/itemdb.cpp:313
+#, c-format
+msgid "MP %+d"
+msgstr "MP %+d"
 
-#: src/gui/statuswindow.cpp:130
+#: ../src/gui/statuswindow.cpp:130
 msgid "MP:"
-msgstr ""
+msgstr "MP:"
 
-#: src/gui/statuswindow.cpp:158 src/gui/statuswindow.cpp:275
-#, c-format
-msgid "Job: %d"
-msgstr ""
+# TODO: WTF is MVP, "most valued player player"?<
+#: ../src/net/tmwa/chathandler.cpp:230
+msgid "MVP player."
+msgstr "MVP-pelaaja."
 
-#: src/gui/statuswindow.cpp:159
-msgid "Job:"
-msgstr ""
+#: ../src/gui/charcreatedialog.cpp:80 ../src/gui/register.cpp:90
+msgid "Male"
+msgstr "Miespuolinen"
 
-#: src/gui/statuswindow.cpp:211 src/gui/statuswindow.cpp:247
-#, fuzzy, c-format
-msgid "Character points: %d"
-msgstr "Hahmon pistejako OK"
+#: ../src/gui/minimap.cpp:45 ../src/gui/minimap.cpp:86
+msgid "Map"
+msgstr "Kartta"
 
-#: src/gui/statuswindow.cpp:255
+#: ../src/gui/debugwindow.cpp:66 ../src/gui/debugwindow.cpp:108
 #, c-format
-msgid "Correction points: %d"
-msgstr ""
-
-#: src/gui/trade.cpp:53
-msgid "Propose trade"
-msgstr "Ehdota vaihtokauppaa"
+msgid "Map: %s"
+msgstr "Kartta: %s"
 
-#: src/gui/trade.cpp:54
-msgid "Confirmed. Waiting..."
-msgstr "Varmistettu. Odotetaan..."
+#: ../src/gui/buy.cpp:80 ../src/gui/sell.cpp:78
+#: ../src/gui/statuswindow.cpp:385 ../src/gui/statuswindow.cpp:463
+#: ../src/gui/statuswindow.cpp:497
+msgid "Max"
+msgstr "Max"
 
-#: src/gui/trade.cpp:55
-msgid "Agree trade"
-msgstr "Hyväksy kauppa"
+#: ../src/gui/setup_video.cpp:130
+msgid "Medium"
+msgstr "Keskikokoinen"
 
-#: src/gui/trade.cpp:56
-msgid "Agreed. Waiting..."
-msgstr "Hyväksytty. Odotetaan..."
+#: ../src/gui/socialwindow.cpp:153
+msgid "Member Invite to Guild"
+msgstr "Jäsenen kutsuminen kiltaan"
 
-#: src/gui/trade.cpp:59
-msgid "Trade: You"
-msgstr ""
+#: ../src/gui/socialwindow.cpp:232
+msgid "Member Invite to Party"
+msgstr "Jäsenen kutsuminen ryhmään"
 
-#: src/gui/trade.cpp:73 src/gui/trade.cpp:74
-msgid "Trade"
-msgstr ""
+#: ../src/net/manaserv/guildhandler.cpp:204
+msgid "Member was promoted successfully."
+msgstr "Jäsen ylennettiin onnistuneesti."
 
-#: src/gui/trade.cpp:76
-msgid "Add"
-msgstr "Lisää"
+#: ../src/net/tmwa/playerhandler.cpp:253 ../src/net/tmwa/playerhandler.cpp:293
+msgid "Message"
+msgstr "Viesti"
 
-#: src/gui/trade.cpp:98 src/gui/trade.cpp:134
-#, fuzzy, c-format
-msgid "You get %s"
-msgstr "Annat:"
+#: ../src/commandhandler.cpp:479
+msgid "Message closes chat."
+msgstr "Viesti sulkee keskustelun."
 
-#: src/gui/trade.cpp:99
-msgid "You give:"
-msgstr "Annat:"
+#: ../src/commandhandler.cpp:492
+msgid "Message now closes chat."
+msgstr "Nyt viesti sulkee keskustelun."
 
-#: src/gui/trade.cpp:103
-msgid "Change"
-msgstr "Muuta"
+#: ../src/keyboardconfig.cpp:74
+msgid "Minimap Window"
+msgstr "Karttaikkuna"
 
-#: src/gui/trade.cpp:262
-msgid "Failed adding item. You can not overlap one kind of item on the window."
-msgstr ""
+#: ../src/gui/debugwindow.cpp:67 ../src/gui/debugwindow.cpp:106
+#, c-format
+msgid "Minimap: %s"
+msgstr "Pikkukartta: %s"
 
-#: src/gui/trade.cpp:304
-msgid "You don't have enough money."
-msgstr "Sinulla ei ole tarpeeksi rahaa."
+#: ../src/resources/userpalette.cpp:112
+msgid "Misses"
+msgstr "Hudit"
 
-#: src/gui/unregisterdialog.cpp:51
+#: ../src/gui/statuswindow.cpp:114 ../src/gui/statuswindow.cpp:208
+#: ../src/gui/statuswindow.cpp:240
 #, c-format
-msgid "Name: %s"
-msgstr "Nimi: %s"
+msgid "Money: %s"
+msgstr "Rahat: %s"
 
-#: src/gui/updatewindow.cpp:124
-msgid "Updating..."
-msgstr "Päivitetään..."
+#: ../src/resources/userpalette.cpp:104
+msgid "Monster Hits Player"
+msgstr "Hirviö lyö pelaajaa"
 
-#: src/gui/updatewindow.cpp:142
-msgid "Connecting..."
-msgstr "Yhdistetään..."
+#: ../src/resources/userpalette.cpp:96
+msgid "Monsters"
+msgstr "Hirviöt"
 
-#: src/gui/updatewindow.cpp:145
-msgid "Play"
-msgstr ""
+#: ../src/keyboardconfig.cpp:40
+msgid "Move Down"
+msgstr "Alaspäin"
 
-#: src/gui/updatewindow.cpp:417
-msgid "##1  The update process is incomplete."
-msgstr "##1  Päivitys prosessi keskeytyi"
+#: ../src/keyboardconfig.cpp:41
+msgid "Move Left"
+msgstr "Vasemmalle"
 
-#. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:419
-msgid "##1  It is strongly recommended that"
-msgstr "##1  On vahvasti suositeltavaa että"
+#: ../src/keyboardconfig.cpp:42
+msgid "Move Right"
+msgstr "Oikealle"
 
-#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:421
-#, fuzzy
-msgid "##1  you try again later."
-msgstr "##1  yrität myöhemmin uudelleen"
+#: ../src/keyboardconfig.cpp:39
+msgid "Move Up"
+msgstr "Ylöspäin"
 
-#: src/gui/updatewindow.cpp:515
-msgid "Completed"
-msgstr "Valmis"
+#: ../src/gui/setup_audio.cpp:51
+msgid "Music volume"
+msgstr "Musiikin voimakkuus"
 
-#: src/gui/widgets/channeltab.cpp:49
-msgid "/users > Lists the users in the current channel"
-msgstr ""
+#: ../src/gui/debugwindow.cpp:65 ../src/gui/debugwindow.cpp:104
+#, c-format
+msgid "Music: %s"
+msgstr "Musiikki: %s"
 
-#: src/gui/widgets/channeltab.cpp:50
-msgid "/topic > Set the topic of the current channel"
-msgstr "/topic > Aseta kanavan aihe"
+#: ../src/gui/npcdialog.cpp:73 ../src/gui/npcpostdialog.cpp:41
+msgid "NPC"
+msgstr "Ei-pelaajahahmo (NPC)"
 
-#: src/gui/widgets/channeltab.cpp:51
-msgid "/quit > Leave a channel"
-msgstr "/quit > Poistu kanavalta"
+#: ../src/resources/userpalette.cpp:95
+msgid "NPCs"
+msgstr "NPCt"
 
-#: src/gui/widgets/channeltab.cpp:52
-msgid "/op > Make a user a channel operator"
-msgstr "/op > Tee käyttäjästä operaattori"
+#: ../src/gui/setup_players.cpp:58
+msgid "Name"
+msgstr "Nimi"
 
-#: src/gui/widgets/channeltab.cpp:53
-msgid "/kick > Kick a user from the channel"
-msgstr "/kick > Poista käyttäjä kanavalta"
+#: ../src/gui/charcreatedialog.cpp:67 ../src/gui/login.cpp:54
+#: ../src/gui/register.cpp:67
+msgid "Name:"
+msgstr "Nimi:"
 
-#: src/gui/widgets/channeltab.cpp:63
-msgid "Command: /users"
-msgstr ""
+#: ../src/gui/unregisterdialog.cpp:51
+#, c-format
+msgid "Name: %s"
+msgstr "Nimi: %s"
 
-#: src/gui/widgets/channeltab.cpp:64
-msgid "This command shows the users in this channel."
-msgstr "Tämä komento näyttää käyttäjät kanavalla."
+# TODO: What?
+#: ../src/gui/ministatus.cpp:236
+msgid "Need"
+msgstr "Tarvitaan"
 
-#: src/gui/widgets/channeltab.cpp:68
-msgid "Command: /topic <message>"
-msgstr ""
+#: ../src/gui/widgets/channeltab.cpp:126
+msgid "Need a user to kick!"
+msgstr "Anna potkittavan käyttäjän nimi!"
 
-#: src/gui/widgets/channeltab.cpp:69
-msgid "This command sets the topic to <message>."
-msgstr ""
+#: ../src/gui/widgets/channeltab.cpp:119
+msgid "Need a user to op!"
+msgstr "Anna operaattoriksi korotettavan käyttäjän nimi!"
 
-#: src/gui/widgets/channeltab.cpp:73
-msgid "Command: /quit"
-msgstr ""
+#: ../src/game.cpp:386
+msgid "Network Error"
+msgstr "Verkkovirhe"
 
-#: src/gui/widgets/channeltab.cpp:74
-msgid "This command leaves the current channel."
-msgstr "Tällä komennolla poistut kanvalta."
+#: ../src/gui/setup_players.cpp:64
+msgid "Neutral"
+msgstr "Neutraali"
 
-#: src/gui/widgets/channeltab.cpp:75
-msgid "If you're the last person in the channel, it will be deleted."
-msgstr "Jos olet viimeinen henkilö kanavalla niin se katoaa."
+#: ../src/net/manaserv/loginhandler.cpp:149
+msgid "New email address incorrect."
+msgstr "Uusi sähköpostiosoite ei kelpaa."
 
-#: src/gui/widgets/channeltab.cpp:80
-msgid "Command: /op <nick>"
-msgstr ""
+#: ../src/net/manaserv/loginhandler.cpp:118
+msgid "New password incorrect."
+msgstr "Uusi salasana on väärä."
 
-#: src/gui/widgets/channeltab.cpp:81
-msgid "This command makes <nick> a channel operator."
-msgstr "Tämä komento tekee <nick> operaattorin."
+#: ../src/net/tmwa/loginhandler.cpp:92
+msgid "New password too short."
+msgstr "Uusi salasana on liian lyhyt."
 
-#: src/gui/widgets/channeltab.cpp:84
-msgid "Channel operators can kick and op other users from the channel."
-msgstr ""
-"Kanavan operaattori voi poistaa käyttäjiä kanavalta ja jakaa operaattorin "
-"oikeuksia."
+#: ../src/gui/npcdialog.cpp:49
+msgid "Next"
+msgstr "Seuraava"
 
-#: src/gui/widgets/channeltab.cpp:89
-msgid "Command: /kick <nick>"
-msgstr ""
+#: ../src/keyboardconfig.cpp:100
+msgid "Next Chat Tab"
+msgstr "Seuraava keskusteluvälilehti"
 
-#: src/gui/widgets/channeltab.cpp:90
-msgid "This command makes <nick> leave the channel."
-msgstr ""
+#: ../src/gui/confirmdialog.cpp:43
+msgid "No"
+msgstr "Ei"
 
-#: src/gui/widgets/channeltab.cpp:119
-msgid "Need a user to op!"
+#: ../src/commandhandler.cpp:407
+msgid "No <nick> was given."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:126
-msgid "Need a user to kick!"
-msgstr ""
+#: ../src/net/manaserv/charhandler.cpp:141
+msgid "No empty slot."
+msgstr "Ei vapaata paikkaa."
 
-#: src/gui/widgets/chattab.cpp:121
-msgid "Global announcement:"
-msgstr "Globaali ilmoitus:"
+#: ../src/net/manaserv/charhandler.cpp:264
+msgid "No gameservers are available."
+msgstr "Pelipalvelimia ei ole saatavilla."
 
-#: src/gui/widgets/chattab.cpp:127
-#, c-format
-msgid "Global announcement from %s:"
-msgstr ""
+#: ../src/net/tmwa/generalhandler.cpp:135
+msgid "No servers available."
+msgstr "Palvelimia ei saatavilla."
 
-#: src/gui/widgets/chattab.cpp:153
-#, c-format
-msgid "%s whispers: %s"
-msgstr ""
+#: ../src/gui/setup_video.cpp:157
+msgid "No text"
+msgstr "Ei tekstiä"
 
-#: src/gui/widgets/whispertab.cpp:53
-msgid "Cannot send empty chat!"
+#: ../src/net/manaserv/beinghandler.cpp:289
+#: ../src/net/tmwa/playerhandler.cpp:102
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
 msgstr ""
+"Ei, lapsikullat. Hahmonne ei oikeasti kuollut. Se... öhm... meni parempaan "
+"paikkaan."
 
-#: src/gui/widgets/whispertab.cpp:72
-msgid "/ignore > Ignore the other player"
-msgstr ""
+# TODO: Hm.
+#: ../src/gui/setup_video.cpp:271 ../src/gui/setup_video.cpp:526
+#: ../src/gui/setup_video.cpp:656
+msgid "None"
+msgstr "-"
 
-#: src/gui/widgets/whispertab.cpp:73
-msgid "/unignore > Stop ignoring the other player"
-msgstr ""
+#: ../src/gui/recorder.cpp:91
+msgid "Not currently recording."
+msgstr "En tallenna tällä hetkellä."
 
-#: src/gui/widgets/whispertab.cpp:74
-msgid "/close > Close the whisper tab"
-msgstr ""
+#: ../src/net/manaserv/charhandler.cpp:138
+#: ../src/net/manaserv/charhandler.cpp:219
+msgid "Not logged in."
+msgstr "Et ole kirjautunut sisään."
 
-#: src/gui/widgets/whispertab.cpp:84
-msgid "Command: /close"
-msgstr ""
+#: ../src/net/tmwa/buysellhandler.cpp:109
+msgid "Nothing to sell."
+msgstr "Ei mitään myytävää"
 
-#: src/gui/widgets/whispertab.cpp:85
-msgid "This command closes the current whisper tab."
-msgstr ""
+#: ../src/gui/setup_audio.cpp:94
+msgid "Notice"
+msgstr "Huomaa"
 
-#: src/gui/widgets/whispertab.cpp:89
-msgid "Command: /ignore"
-msgstr ""
+#: ../src/gui/itemamount.cpp:113 ../src/gui/okdialog.cpp:42
+#: ../src/gui/quitdialog.cpp:46 ../src/gui/textdialog.cpp:39
+#: ../src/gui/trade.cpp:72 ../src/gui/trade.cpp:74
+msgid "OK"
+msgstr "Ok"
 
-#: src/gui/widgets/whispertab.cpp:90
-#, fuzzy
-msgid "This command ignores the other player regardless of current relations."
-msgstr "Tämä komento näyttää paikalla olevien pelaajien määrän."
+#: ../src/net/manaserv/loginhandler.cpp:152
+msgid "Old email address incorrect."
+msgstr "Vanha sähköpostiosoite ei kelpaa."
 
-#: src/gui/widgets/whispertab.cpp:96
-#, fuzzy
-msgid "This command stops ignoring the other player if they are being ignored."
-msgstr "Tämä komento aloittaa keskustelun nauhoituksen tiedostoon <filename>."
+#: ../src/net/manaserv/loginhandler.cpp:121
+#: ../src/net/tmwa/loginhandler.cpp:89
+msgid "Old password incorrect."
+msgstr "Vanha salsana on väärä."
 
-#: src/gui/windowmenu.cpp:54
-msgid "Status"
-msgstr "Hahmon tiedot"
+#: ../src/net/tmwa/gamehandler.cpp:89
+#, c-format
+msgid "Online users: %d"
+msgstr "Käyttäjiä palvelimella: %d"
 
-#: src/gui/windowmenu.cpp:65
-msgid "Shortcut"
-msgstr "Pikavalinnat"
+#: ../src/gui/setup_video.cpp:212
+msgid "OpenGL"
+msgstr "OpenGL"
 
-#: src/gui/worldselectdialog.cpp:71
-#, fuzzy
-msgid "Select World"
-msgstr "Valitse palvelin"
+#: ../src/commandhandler.h:31
+#, c-format
+msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr ""
+"Vaihtoehdot komennolle /%s ovat \"yes\" (kyllä), \"no\" (ei) tai vastaavasti "
+"\"true\", \"false\", \"1\" tai \"0\"."
 
-#: src/gui/worldselectdialog.cpp:76
-#, fuzzy
-msgid "Change Login"
-msgstr "Muuta"
+#: ../src/main.cpp:47
+msgid "Options:"
+msgstr "Parametrit:"
 
-#: src/gui/worldselectdialog.cpp:77
-#, fuzzy
-msgid "Choose World"
-msgstr "Valitse palvelin"
+#: ../src/resources/userpalette.cpp:103
+msgid "Other Player Hits Monster"
+msgstr "Muu pelaaja lyö hirviötä"
 
-#: src/keyboardconfig.cpp:39
-msgid "Move Up"
-msgstr "Ylöspäin"
+#: ../src/resources/userpalette.cpp:92
+msgid "Other Players' Names"
+msgstr "Muiden pelaajien nimet"
 
-#: src/keyboardconfig.cpp:40
-msgid "Move Down"
-msgstr "Alaspäin"
+#: ../src/gui/outfitwindow.cpp:68 ../src/gui/outfitwindow.cpp:141
+#: ../src/gui/outfitwindow.cpp:154
+#, c-format
+msgid "Outfit: %d"
+msgstr "Asu: %d"
 
-#: src/keyboardconfig.cpp:41
-msgid "Move Left"
-msgstr "Vasemmalle"
+#: ../src/gui/inventorywindow.cpp:109 ../src/gui/outfitwindow.cpp:51
+msgid "Outfits"
+msgstr "Asukokonaisuudet"
 
-#: src/keyboardconfig.cpp:42
-msgid "Move Right"
-msgstr "Oikealle"
+#: ../src/keyboardconfig.cpp:81
+msgid "Outfits Window"
+msgstr "Asukokonaisuusikkuna"
 
-#: src/keyboardconfig.cpp:43 src/net/tmwa/generalhandler.cpp:237
-msgid "Attack"
-msgstr ""
+#: ../src/gui/setup_video.cpp:252
+msgid "Overhead text"
+msgstr "Tekstinä yläpuolella"
 
-#: src/keyboardconfig.cpp:44
-msgid "Target & Attack"
-msgstr ""
+#: ../src/resources/userpalette.cpp:93
+msgid "Own Name"
+msgstr "Oma nimi"
 
-#: src/keyboardconfig.cpp:45
-msgid "Smilie"
-msgstr ""
+#: ../src/gui/setup_video.cpp:606
+msgid "Particle Effect Settings Changed."
+msgstr "Hiukkastehosteiden asetuksia on muutettu."
 
-#: src/keyboardconfig.cpp:46
-msgid "Talk"
-msgstr ""
+#: ../src/resources/userpalette.cpp:99
+msgid "Particle Effects"
+msgstr "Hiukkastehosteet"
 
-#: src/keyboardconfig.cpp:47
-msgid "Stop Attack"
-msgstr ""
+#: ../src/gui/debugwindow.cpp:69 ../src/gui/debugwindow.cpp:111
+#, c-format
+msgid "Particle count: %d"
+msgstr "Hiukkasluku: %d"
 
-#: src/keyboardconfig.cpp:48
-#, fuzzy
-msgid "Target Monster"
-msgstr "Hirviöt"
+#: ../src/gui/setup_video.cpp:255
+msgid "Particle detail"
+msgstr "Hiukkastehosteiden yksityiskohtaisuus"
 
-#: src/keyboardconfig.cpp:49
-msgid "Target NPC"
-msgstr ""
+#: ../src/gui/debugwindow.cpp:116
+#, c-format
+msgid "Particle detail: %s"
+msgstr "Hiukkastehosteiden yksityiskohtaisuus: %s"
 
-#: src/keyboardconfig.cpp:50
-msgid "Target Player"
-msgstr ""
+#: ../src/gui/setup_video.cpp:217
+msgid "Particle effects"
+msgstr "Hiukkastehosteet"
 
-#: src/keyboardconfig.cpp:51
-msgid "Pickup"
-msgstr ""
+#: ../src/net/tmwa/gui/partytab.cpp:43
+msgid "Party"
+msgstr "Ryhmä"
 
-#: src/keyboardconfig.cpp:52
-msgid "Hide Windows"
-msgstr "Piilota ikkunat"
+# TODO: quit? leave or remove?
+#: ../src/gui/socialwindow.cpp:218
+#, c-format
+msgid "Party %s quit requested."
+msgstr "Ryhmästä %s eroamista pyydetty."
 
-#: src/keyboardconfig.cpp:53
-msgid "Sit"
-msgstr "Istu"
+#: ../src/resources/userpalette.cpp:97
+msgid "Party Members"
+msgstr "Ryhmän jäsenet"
 
-#: src/keyboardconfig.cpp:54
-msgid "Screenshot"
-msgstr "Kuvankaappaus"
+#: ../src/gui/socialwindow.cpp:625
+msgid "Party Name"
+msgstr "Ryhmän nimi"
 
-#: src/keyboardconfig.cpp:55
-msgid "Enable/Disable Trading"
-msgstr ""
+#: ../src/commandhandler.cpp:448 ../src/net/tmwa/gui/partytab.cpp:109
+msgid "Party name is missing."
+msgstr "Ryhmän nimi puuttuu."
 
-#: src/keyboardconfig.cpp:56
-msgid "Find Path to Mouse"
-msgstr ""
+#: ../src/net/tmwa/partyhandler.cpp:84
+msgid "Party successfully created."
+msgstr "Ryhmä luotu."
 
-#: src/keyboardconfig.cpp:57 src/keyboardconfig.cpp:58
-#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
-#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
-#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
-#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66
-#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68
+#: ../src/gui/beingpopup.cpp:76
 #, c-format
-msgid "Item Shortcut %d"
-msgstr ""
+msgid "Party: %s"
+msgstr "Ryhmä: %s"
 
-#: src/keyboardconfig.cpp:69
-msgid "Help Window"
-msgstr ""
+#: ../src/client.cpp:916
+msgid "Password Change"
+msgstr "Salasanan vaihto"
 
-#: src/keyboardconfig.cpp:70
-msgid "Status Window"
-msgstr ""
+#: ../src/client.cpp:917
+msgid "Password changed successfully!"
+msgstr "Salasana vaihdettu onnistuneesti!"
 
-#: src/keyboardconfig.cpp:71
-msgid "Inventory Window"
-msgstr "Inventaario Ikkuna"
+#: ../src/gui/changepassworddialog.cpp:61 ../src/gui/login.cpp:55
+#: ../src/gui/register.cpp:68 ../src/gui/unregisterdialog.cpp:53
+msgid "Password:"
+msgstr "Salasana:"
 
-#: src/keyboardconfig.cpp:72
-msgid "Equipment Window"
-msgstr "Varuste ikkuna"
+#: ../src/gui/register.cpp:197
+msgid "Passwords do not match."
+msgstr "Salasanat eivät täsmää."
 
-#: src/keyboardconfig.cpp:73
-msgid "Skill Window"
-msgstr ""
+#: ../src/gui/popupmenu.cpp:188
+#, c-format
+msgid "Pick up %s"
+msgstr "Ota %s"
 
-#: src/keyboardconfig.cpp:74
-msgid "Minimap Window"
-msgstr ""
+#: ../src/keyboardconfig.cpp:51
+msgid "Pickup"
+msgstr "Nouki"
 
-#: src/keyboardconfig.cpp:75
-msgid "Chat Window"
-msgstr ""
+#: ../src/resources/userpalette.cpp:100
+msgid "Pickup Notification"
+msgstr "Ottoilmoitus"
 
-#: src/keyboardconfig.cpp:76
-msgid "Item Shortcut Window"
-msgstr ""
+#: ../src/gui/updatewindow.cpp:145
+msgid "Play"
+msgstr "Pelaa"
 
-#: src/keyboardconfig.cpp:77
-msgid "Setup Window"
-msgstr "Asetus ikkuna"
+#: ../src/commandhandler.cpp:544
+msgid "Player already ignored!"
+msgstr "Pelaaja on jo jätetty huomiotta!"
 
-#: src/keyboardconfig.cpp:78
-msgid "Debug Window"
-msgstr ""
+#: ../src/commandhandler.cpp:553
+msgid "Player could not be ignored!"
+msgstr "Pelaajan huomiotta jättäminen epäonnistui!"
 
-#: src/keyboardconfig.cpp:79
-#, fuzzy
-msgid "Social Window"
-msgstr "Piilota ikkunat"
+# TODO: <swearing>
+#: ../src/commandhandler.cpp:575
+msgid "Player could not be unignored!"
+msgstr "Pelaajan uudelleenhuomiointi epäonnistui."
 
-#: src/keyboardconfig.cpp:80
-msgid "Emote Shortcut Window"
-msgstr ""
+#: ../src/net/manaserv/charhandler.cpp:210
+msgid "Player deleted."
+msgstr "Hahmo poistettu."
 
-#: src/keyboardconfig.cpp:81
-#, fuzzy
-msgid "Outfits Window"
-msgstr "Varuste ikkuna"
+#: ../src/commandhandler.cpp:573
+msgid "Player no longer ignored!"
+msgstr "Pelaaja huomioidaan taas."
 
-#: src/keyboardconfig.cpp:82
-msgid "Wear Outfit"
-msgstr ""
+#: ../src/commandhandler.cpp:551
+msgid "Player successfully ignored!"
+msgstr "Pelaaja jää nyt huomiotta."
 
-#: src/keyboardconfig.cpp:83
-msgid "Copy Outfit"
-msgstr ""
+# TODO: come up with a less kludgey translation for "ignore". Like sulkulista.
+#: ../src/commandhandler.cpp:568
+msgid "Player wasn't ignored!"
+msgstr "Pelaajaa ei ollut jätetty huomiotta!"
 
-#: src/keyboardconfig.cpp:84 src/keyboardconfig.cpp:85
-#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:87
-#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:89
-#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:91
-#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:93
-#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:95
-#, c-format
-msgid "Emote Shortcut %d"
-msgstr ""
+#: ../src/gui/setup_players.cpp:237
+msgid "Players"
+msgstr "Pelaajat"
 
-#: src/keyboardconfig.cpp:96
-msgid "Toggle Chat"
-msgstr ""
+#: ../src/net/manaserv/chathandler.cpp:194
+#: ../src/net/manaserv/chathandler.cpp:277
+msgid "Players in this channel:"
+msgstr "Pelaajia tällä kanavalla:"
 
-#: src/keyboardconfig.cpp:97
-msgid "Scroll Chat Up"
-msgstr ""
+#: ../src/gui/charcreatedialog.cpp:99 ../src/gui/charcreatedialog.cpp:257
+#, c-format
+msgid "Please distribute %d points"
+msgstr "Jaa %d pistettä"
 
-#: src/keyboardconfig.cpp:98
-msgid "Scroll Chat Down"
-msgstr ""
+#: ../src/gui/charcreatedialog.cpp:262
+#, c-format
+msgid "Please remove %d points"
+msgstr "%d pistettä liikaa, ole hyvä ja poista ylimäärä"
 
-#: src/keyboardconfig.cpp:99
-msgid "Previous Chat Tab"
-msgstr "Edellinen keskustelu välilehti"
+#: ../src/commandhandler.cpp:461 ../src/commandhandler.cpp:538
+#: ../src/commandhandler.cpp:560
+msgid "Please specify a name."
+msgstr "Anna nimi."
 
-#: src/keyboardconfig.cpp:100
-msgid "Next Chat Tab"
-msgstr "Seuraava keskustelu välilehti"
+#: ../src/gui/serverdialog.cpp:324
+msgid "Please type both the address and the port of a server."
+msgstr "Kirjoita kenttiin sekä palvelimen osoite että portti"
 
-#: src/keyboardconfig.cpp:101
-msgid "Select OK"
-msgstr ""
+#: ../src/net/tmwa/specialhandler.cpp:214
+msgid "Poison had no effect..."
+msgstr "Myrkyllä ei ollut vaikutusta..."
 
-#: src/keyboardconfig.cpp:103
-msgid "Ignore input 1"
-msgstr ""
+#: ../src/gui/serverdialog.cpp:207
+msgid "Port:"
+msgstr "Portti:"
 
-#: src/keyboardconfig.cpp:104
-msgid "Ignore input 2"
-msgstr ""
+#: ../src/gui/serverdialog.cpp:451
+msgid "Preparing download"
+msgstr "Valmistelen latausta"
 
-#: src/keyboardconfig.cpp:183
+#: ../src/gui/chat.cpp:311
 #, c-format
-msgid ""
-"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
-"strange behaviour."
-msgstr ""
-
-#: src/localplayer.cpp:985
-msgid "Unable to pick up item."
-msgstr ""
+msgid "Present: %s; %d players are present."
+msgstr "Läsnä: %s; %d pelaajaa paikalla."
 
-#. TRANSLATORS: This sentence may be translated differently
-#. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:994
-#, c-format
-msgid "You picked up %d [@@%d|%s@@]."
-msgid_plural "You picked up %d [@@%d|%s@@]."
-msgstr[0] ""
-msgstr[1] ""
+#: ../src/net/manaserv/beinghandler.cpp:303
+msgid "Press OK to respawn."
+msgstr "Paina OK syntyäksesi uudelleen."
 
-#: src/main.cpp:42
-msgid "mana [options] [mana-file]"
-msgstr ""
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:78
+msgid "Press the button to start calibration"
+msgstr "Paina tätä nappia aloittaaksesi peliohjaimen kalibroinnin"
 
-#: src/main.cpp:43
-msgid "[mana-file] : The mana file is an XML file (.mana)"
-msgstr ""
+#: ../src/keyboardconfig.cpp:99
+msgid "Previous Chat Tab"
+msgstr "Edellinen keskusteluvälilehti"
 
-#: src/main.cpp:44
-msgid "              used to set custom parameters"
-msgstr ""
+#: ../src/gui/buy.cpp:69 ../src/gui/buy.cpp:267 ../src/gui/sell.cpp:71
+#: ../src/gui/sell.cpp:288
+#, c-format
+msgid "Price: %s / Total: %s"
+msgstr "Hinta: %s / Kaikkiaan: %s"
 
-#: src/main.cpp:45
-msgid "              to the mana client."
-msgstr ""
+#: ../src/playerrelations.cpp:324
+msgid "Print '...'"
+msgstr "Tulosta '...'"
 
-#: src/main.cpp:47
-msgid "Options:"
-msgstr "Asetukset:"
+#: ../src/gui/trade.cpp:53
+msgid "Propose trade"
+msgstr "Ehdota vaihtokauppaa"
 
-#: src/main.cpp:48
-msgid "  -v --version        : Display the version"
-msgstr ""
+#: ../src/gui/setup_colors.cpp:85 ../src/gui/setup_colors.cpp:86
+#: ../src/gui/setup_colors.cpp:332
+msgid "Pulse"
+msgstr "Sykkivä"
 
-#: src/main.cpp:49
-#, fuzzy
-msgid "  -h --help           : Display this help"
-msgstr "/help > Näyttää tämän apu tekstin"
+#: ../src/gui/setup_players.cpp:231
+msgid "Put all whispers in tabs"
+msgstr "Laita kaikki kuiskaukset välilehtiin"
 
-#: src/main.cpp:50
-msgid "  -C --config-dir     : Configuration directory to use"
-msgstr ""
+#: ../src/gui/buy.cpp:79 ../src/gui/quitdialog.cpp:40
+#: ../src/gui/quitdialog.cpp:42 ../src/gui/quitdialog.cpp:43
+#: ../src/gui/sell.cpp:77 ../src/gui/serverdialog.cpp:228
+#: ../src/keyboardconfig.cpp:102
+msgid "Quit"
+msgstr "Sulje"
 
-#: src/main.cpp:51
-msgid "  -U --username       : Login with this username"
-msgstr ""
+#: ../src/gui/setup_colors.cpp:87 ../src/gui/setup_colors.cpp:88
+#: ../src/gui/setup_colors.cpp:333
+msgid "Rainbow"
+msgstr "Sateenkaari"
 
-#: src/main.cpp:52
-msgid "  -P --password       : Login with this password"
-msgstr ""
+# TODO: Who received exactly? What's a guild request? What does it mean that one exists, for this player or in general?
+#: ../src/gui/socialwindow.cpp:553
+msgid "Received guild request, but one already exists."
+msgstr "Vastaanotin kiltapyynnön, mutta sellainen on jo olemassa."
 
-#: src/main.cpp:53
-msgid "  -c --character      : Login with this character"
-msgstr ""
+# TODO: see similar msgid for guild request
+#: ../src/gui/socialwindow.cpp:575
+msgid "Received party request, but one already exists."
+msgstr "Sain ryhmäpyynnön, mutta sellainen on jo olemassa."
 
-#: src/main.cpp:54
-msgid "  -s --server         : Login server name or IP"
-msgstr ""
+#: ../src/gui/recorder.h:38
+msgid "Recording..."
+msgstr "Tallennan..."
 
-#: src/main.cpp:55
-msgid "  -p --port           : Login server port"
-msgstr ""
+#: ../src/gui/setup_colors.cpp:109
+msgid "Red:"
+msgstr "Punainen:"
 
-#: src/main.cpp:56
-msgid "     --update-host    : Use this update host"
-msgstr ""
+#: ../src/gui/login.cpp:61 ../src/gui/register.cpp:58
+#: ../src/gui/register.cpp:73
+msgid "Register"
+msgstr "Rekisteröidy"
 
-#: src/main.cpp:57
-msgid "  -D --default        : Choose default character server and character"
-msgstr ""
+#: ../src/gui/login.cpp:129
+msgid "Registration disabled"
+msgstr "Rekisteröinti pois käytöstä"
 
-#: src/main.cpp:59
-msgid "  -u --skip-update    : Skip the update downloads"
-msgstr ""
+#: ../src/net/tmwa/loginhandler.cpp:165
+msgid "Rejected from server."
+msgstr "Palvelin ei kelpuuttanut yhteydenottoasi."
 
-#: src/main.cpp:60
-msgid "  -d --data           : Directory to load game data from"
-msgstr ""
+#: ../src/gui/socialwindow.cpp:468
+#, fuzzy
+msgid "Rejected guild invite."
+msgstr "Käyttäjä ei ottanut kiltakutsua vastaan."
 
-#: src/main.cpp:61
-msgid "     --localdata-dir  : Directory to use as local data directory"
-msgstr ""
+#: ../src/gui/socialwindow.cpp:450
+#, c-format
+msgid "Rejected party invite from %s."
+msgstr "Kieltäydyit pelaajan %s ryhmäkutsusta."
 
-#: src/main.cpp:62
-msgid "     --chat-log-dir   : Chat log dir to use"
-msgstr ""
+#: ../src/gui/setup_players.cpp:59
+msgid "Relation"
+msgstr "Relaatio"
 
-#: src/main.cpp:63
-msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr ""
+#: ../src/gui/login.cpp:60
+msgid "Remember username"
+msgstr "Muista käyttäjätunnus"
 
-#: src/main.cpp:65
-msgid "     --no-opengl      : Disable OpenGL for this session"
-msgstr ""
+#: ../src/net/manaserv/tradehandler.cpp:115
+#: ../src/net/tmwa/tradehandler.cpp:109
+msgid "Request for Trade"
+msgstr "Kaupantekoehdotus"
 
-#: src/net/manaserv/beinghandler.cpp:303 src/net/tmwa/playerhandler.cpp:94
-msgid "You are dead."
-msgstr "Sinä olet kuollut."
+#: ../src/net/tmwa/gamehandler.cpp:102
+msgid "Request to quit denied!"
+msgstr "Lopetuspyyntö evätty!"
 
-#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:95
-msgid "We regret to inform you that your character was killed in battle."
-msgstr ""
+#: ../src/client.cpp:809
+msgid "Requesting characters"
+msgstr "Pyydän hahmoja"
 
-#: src/net/manaserv/beinghandler.cpp:306 src/net/tmwa/playerhandler.cpp:97
-msgid "You are not that alive anymore."
-msgstr "Et ole enää elossa."
+#: ../src/client.cpp:889
+msgid "Requesting registration details"
+msgstr "Pyydän rekisteröitymisen yksityiskohtia"
 
-#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:98
-msgid "The cold hands of the grim reaper are grabbing for your soul."
-msgstr ""
+#: ../src/commandhandler.cpp:435
+#, c-format
+msgid "Requesting to join channel %s."
+msgstr "Pyyntö liittyä kanavalle %s lähetetty."
 
-#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:99
-msgid "Game Over!"
-msgstr "Peli Loppu!"
+# TODO: Hmm?
+#: ../src/gui/npcdialog.cpp:134
+msgid "Reset"
+msgstr "Nollaa"
 
-#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:101
-msgid ""
-"No, kids. Your character did not really die. It... err... went to a better "
-"place."
-msgstr ""
-"Ei, lapset. Teidän hahmonne ei oikeasti kuollut. Se... öhm... meni parempaan "
-"paikkaan."
+#: ../src/gui/setup.cpp:51
+msgid "Reset Windows"
+msgstr "Palauta ikkunoiden oletusasetukset"
 
-#: src/net/manaserv/beinghandler.cpp:311 src/net/tmwa/playerhandler.cpp:103
-msgid ""
-"Your plan of breaking your enemies weapon by bashing it with your throat "
-"failed."
-msgstr ""
-"Suunnitelmasi rikkoa vastustajiesi aseet iskemällä ne omaan kurkkuusi "
-"epäonnistui."
+#: ../src/gui/setup_video.cpp:438
+msgid "Restart needed for changes to take effect."
+msgstr "Ohjelma pitää käynnistää uudelleen, jotta muutokset astuvat voimaan."
 
-#: src/net/manaserv/beinghandler.cpp:313 src/net/tmwa/playerhandler.cpp:105
-msgid "I guess this did not run too well."
-msgstr ""
+#: ../src/gui/setup_video.cpp:571 ../src/gui/setup_video.cpp:576
+msgid "Restart your client for the change to take effect."
+msgstr "Käynnistä ohjelma uudelleen, jotta muutos astuu voimaan."
 
-#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:107
-msgid "Do you want your possessions identified?"
-msgstr ""
+#: ../src/gui/inventorywindow.cpp:132 ../src/gui/popupmenu.cpp:385
+msgid "Retrieve"
+msgstr "Ota"
 
-#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:109
-msgid "Sadly, no trace of you was ever found..."
-msgstr ""
+#: ../src/commandhandler.cpp:488
+msgid "Return now toggles chat."
+msgstr "Nyt rivinvaihto aktivoi ja sulkee keskustelun."
 
-#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:111
-msgid "Annihilated."
-msgstr ""
+#: ../src/commandhandler.cpp:479
+msgid "Return toggles chat."
+msgstr "Rivinvaihto aktivoi ja sulkee keskustelun."
 
-#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:113
-msgid "Looks like you got your head handed to you."
-msgstr ""
+#: ../src/gui/setup_joystick.cpp:84
+msgid "Rotate the stick"
+msgstr "Pyöräytä ohjainta ääriasennoissaan"
 
-#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:115
-msgid ""
-"You screwed up again, dump your body down the tubes and get you another one."
-msgstr ""
+# Secret of Mana reference.
+#: ../src/net/manaserv/beinghandler.cpp:295
+#: ../src/net/tmwa/playerhandler.cpp:110
+msgid "Sadly, no trace of you was ever found..."
+msgstr "Ikävä kyllä sinusta ei jäänyt lopulta jälkeäkään löydettäväksi..."
 
-#: src/net/manaserv/beinghandler.cpp:323
-msgid "Press OK to respawn."
-msgstr ""
+#: ../src/game.cpp:354
+msgid "Saving screenshot failed!"
+msgstr "Ruutukaappauksen tallentaminen epäonnistui!"
 
-#: src/net/manaserv/beinghandler.cpp:324
-#, fuzzy
-msgid "You Died"
-msgstr "Annat:"
+# TODO: Screen resolution?? It's really used for window size, AFAIK.
+#: ../src/gui/setup_video.cpp:570 ../src/gui/setup_video.cpp:575
+msgid "Screen Resolution Changed"
+msgstr "Ikkunan koko vaihdettu"
 
-#: src/net/manaserv/charhandler.cpp:138 src/net/manaserv/charhandler.cpp:209
-msgid "Not logged in."
-msgstr ""
+#: ../src/keyboardconfig.cpp:54
+msgid "Screenshot"
+msgstr "Kuvankaappaus"
 
-#: src/net/manaserv/charhandler.cpp:141
-msgid "No empty slot."
-msgstr ""
+#: ../src/game.cpp:349
+msgid "Screenshot saved as "
+msgstr "Ruutukaappaus tallennettu nimellä "
 
-#: src/net/manaserv/charhandler.cpp:144
-msgid "Invalid name."
-msgstr ""
+#: ../src/keyboardconfig.cpp:98
+msgid "Scroll Chat Down"
+msgstr "Vieritä keskustelua alas"
 
-#: src/net/manaserv/charhandler.cpp:147
-#, fuzzy
-msgid "Character's name already exists."
-msgstr "Hahmo poistettu"
+#: ../src/keyboardconfig.cpp:97
+msgid "Scroll Chat Up"
+msgstr "Vieritä keskustelua ylös"
 
-#: src/net/manaserv/charhandler.cpp:150
-msgid "Invalid hairstyle."
+#: ../src/gui/inventorywindow.cpp:87
+msgid "Search:"
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:153
-msgid "Invalid hair color."
-msgstr ""
+#: ../src/net/tmwa/specialhandler.cpp:184
+msgid "Seems you need more money... ;-)"
+msgstr "Näyttää siltä että tarvitset lisää rahaa."
 
-#: src/net/manaserv/charhandler.cpp:156
-msgid "Invalid gender."
-msgstr ""
+#: ../src/keyboardconfig.cpp:101
+msgid "Select OK"
+msgstr "Valitse OK"
 
-#: src/net/manaserv/charhandler.cpp:159
-#, fuzzy
-msgid "Character's stats are too high."
-msgstr "Hahmon pistejako OK"
+#: ../src/gui/worldselectdialog.cpp:71
+msgid "Select World"
+msgstr "Valitse pelimaailma"
 
-#: src/net/manaserv/charhandler.cpp:162
-#, fuzzy
-msgid "Character's stats are too low."
-msgstr "Hahmon pistejako OK"
+#: ../src/gui/itemamount.cpp:144
+msgid "Select amount of items to drop."
+msgstr "Anna pudotettavien tavaroiden määrä."
 
-#: src/net/manaserv/charhandler.cpp:165
-#, c-format
-msgid "At least one statis out of the permitted range: (%u - %u)."
-msgstr ""
+#: ../src/gui/itemamount.cpp:150
+msgid "Select amount of items to retrieve."
+msgstr "Anna varastosta otettavien tavaroiden määrä."
 
-#: src/net/manaserv/charhandler.cpp:171 src/net/manaserv/loginhandler.cpp:96
-#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
-#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
-#: src/net/tmwa/loginhandler.cpp:95 src/net/tmwa/loginhandler.cpp:182
-#, fuzzy
-msgid "Unknown error."
-msgstr "Tuntematon virhe"
+#: ../src/gui/itemamount.cpp:153
+msgid "Select amount of items to split."
+msgstr "Anna eri pinoon jaettavien tavaroiden määrä."
 
-#: src/net/manaserv/charhandler.cpp:200 src/net/tmwa/charserverhandler.cpp:146
-msgid "Info"
-msgstr ""
+#: ../src/gui/itemamount.cpp:147
+msgid "Select amount of items to store."
+msgstr "Anna varastoitavien tavaroiden määrä."
 
-#: src/net/manaserv/charhandler.cpp:200
-#, fuzzy
-msgid "Player deleted."
-msgstr "Hahmo poistettu"
+#: ../src/gui/itemamount.cpp:141
+msgid "Select amount of items to trade."
+msgstr "Anna vaihtokaupattavien tavaroiden määrä."
 
-#: src/net/manaserv/charhandler.cpp:212
-#, fuzzy
+#: ../src/net/manaserv/charhandler.cpp:222
 msgid "Selection out of range."
-msgstr "Anna vaihdettavien tavaroiden määrä."
-
-#: src/net/manaserv/charhandler.cpp:215
-#, fuzzy, c-format
-msgid "Unknown error (%d)."
-msgstr "Tuntematon virhe"
+msgstr "Valinta sallittujen arvojen ulkopuolella."
 
-#: src/net/manaserv/charhandler.cpp:250
-msgid "No gameservers are available."
-msgstr ""
+#: ../src/gui/buysell.cpp:47 ../src/gui/sell.cpp:49 ../src/gui/sell.cpp:76
+msgid "Sell"
+msgstr "Myy"
 
-#: src/net/manaserv/chathandler.cpp:187 src/net/manaserv/chathandler.cpp:313
-#: src/net/manaserv/guildhandler.cpp:260
-#, c-format
-msgid "Topic: %s"
-msgstr ""
+#: ../src/gui/npcpostdialog.cpp:54
+msgid "Send"
+msgstr "Lähetä"
 
-#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:274
-msgid "Players in this channel:"
+#: ../src/net/tmwa/loginhandler.cpp:182
+msgid "Server overpopulated."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:208
-msgid "Error joining channel."
+#: ../src/net/net.cpp:164
+msgid "Server protocol unsupported"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:214
-msgid "Listing channels."
-msgstr ""
+#: ../src/gui/serverdialog.cpp:208
+msgid "Server type:"
+msgstr "Palvelintyyppi:"
 
-#: src/net/manaserv/chathandler.cpp:226
-msgid "End of channel list."
-msgstr ""
+#: ../src/gui/serverdialog.cpp:206 ../src/gui/widgets/chattab.cpp:142
+msgid "Server:"
+msgstr "Palvelin:"
 
-#: src/net/manaserv/chathandler.cpp:303
-#, c-format
-msgid "%s entered the channel."
-msgstr ""
+#: ../src/client.cpp:580 ../src/gui/setup.cpp:43 ../src/gui/windowmenu.cpp:66
+msgid "Setup"
+msgstr "Asetukset"
 
-#: src/net/manaserv/chathandler.cpp:308
-#, c-format
-msgid "%s left the channel."
-msgstr ""
+#: ../src/keyboardconfig.cpp:77
+msgid "Setup Window"
+msgstr "Asetusikkuna"
 
-#: src/net/manaserv/chathandler.cpp:324
-#, c-format
-msgid "%s has set mode %s on user %s."
-msgstr ""
+#: ../src/gui/setup_audio.cpp:50
+msgid "Sfx volume"
+msgstr "Äänitehosteiden voimakkuus"
 
-#: src/net/manaserv/chathandler.cpp:334
-#, c-format
-msgid "%s has kicked %s."
-msgstr ""
+#: ../src/gui/buysell.cpp:38
+msgid "Shop"
+msgstr "Kauppa"
 
-#: src/net/manaserv/chathandler.cpp:339
-#, fuzzy
-msgid "Unknown channel event."
-msgstr "Tuntematon komento."
+#: ../src/gui/windowmenu.cpp:65
+msgid "Shortcut"
+msgstr "Pikavalinnat"
 
-#: src/net/manaserv/guildhandler.cpp:82
-msgid "Guild created."
-msgstr ""
+#: ../src/commandhandler.cpp:505 ../src/commandhandler.cpp:514
+msgid "Show IP: Off"
+msgstr "Näytä IP: pois päältä"
 
-#: src/net/manaserv/guildhandler.cpp:87
-msgid "Error creating guild."
-msgstr ""
+#: ../src/commandhandler.cpp:505 ../src/commandhandler.cpp:518
+msgid "Show IP: On"
+msgstr "Näytä IP: päällä"
 
-#: src/net/manaserv/guildhandler.cpp:97
-msgid "Invite sent."
-msgstr ""
+#: ../src/gui/setup_video.cpp:246
+msgid "Show damage"
+msgstr "Näytä vahinko"
 
-#: src/net/manaserv/guildhandler.cpp:204
-msgid "Member was promoted successfully."
-msgstr ""
+#: ../src/gui/setup_players.cpp:233
+msgid "Show gender"
+msgstr "Näytä sukupuoli"
 
-#: src/net/manaserv/guildhandler.cpp:209
-msgid "Failed to promote member."
-msgstr ""
+#: ../src/gui/setup_video.cpp:219
+msgid "Show own name"
+msgstr "Näytä oma nimi"
 
-#: src/net/manaserv/loginhandler.cpp:87
-msgid "Wrong magic_token."
-msgstr ""
+#: ../src/gui/setup_video.cpp:221
+msgid "Show pickup notification"
+msgstr "Näytä ottoviesti"
 
-#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
-#, fuzzy
-msgid "Already logged in."
-msgstr "Tällä tunnuksella on jo kirjauduttu"
+#: ../src/keyboardconfig.cpp:53
+msgid "Sit"
+msgstr "Istu"
 
-#: src/net/manaserv/loginhandler.cpp:93
-#, fuzzy
-msgid "Account banned."
-msgstr "Tili: %s"
+#: ../src/net/tmwa/specialhandler.cpp:151
+msgid "Sit failed!"
+msgstr "Istuminen epäonnistui!"
 
-#: src/net/manaserv/loginhandler.cpp:118
-#, fuzzy
-msgid "New password incorrect."
-msgstr "Vanha salsana on väärin."
+#: ../src/gui/skilldialog.cpp:377
+#, c-format
+msgid "Skill %d"
+msgstr "Taito %d"
 
-#: src/net/manaserv/loginhandler.cpp:121 src/net/tmwa/loginhandler.cpp:89
-#, fuzzy
-msgid "Old password incorrect."
-msgstr "Vanha salsana on väärin."
+#: ../src/gui/skilldialog.cpp:368
+#, c-format
+msgid "Skill Set %d"
+msgstr "Taitojoukko %d"
 
-#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
-msgid "Account not connected. Please login first."
-msgstr ""
+#: ../src/keyboardconfig.cpp:73
+msgid "Skill Window"
+msgstr "Taitoikkuna"
 
-#: src/net/manaserv/loginhandler.cpp:149
-#, fuzzy
-msgid "New email address incorrect."
-msgstr "Kirjoita  uusi sähköposti osoite toisen kerran:"
+#: ../src/gui/skilldialog.cpp:273
+#, c-format
+msgid "Skill points available: %d"
+msgstr "%d taitopistettä käyttämättä"
 
-#: src/net/manaserv/loginhandler.cpp:152
-#, fuzzy
-msgid "Old email address incorrect."
-msgstr "Vanha salsana on väärin."
+#: ../src/gui/skilldialog.cpp:215 ../src/gui/windowmenu.cpp:59
+msgid "Skills"
+msgstr "Taidot"
 
-#: src/net/manaserv/loginhandler.cpp:158
-msgid "The new email address already exists."
-msgstr ""
+#: ../src/gui/inventorywindow.cpp:86
+msgid "Slots:"
+msgstr "Paikkoja:"
 
-#: src/net/manaserv/loginhandler.cpp:239
-msgid ""
-"Client registration is not allowed. Please contact server administration."
-msgstr ""
+#: ../src/gui/setup_video.cpp:129
+msgid "Small"
+msgstr "Pieni"
 
-#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
-msgid "Client version is too old."
-msgstr ""
+#: ../src/keyboardconfig.cpp:45
+msgid "Smilie"
+msgstr "Hymiö"
 
-#: src/net/manaserv/loginhandler.cpp:266
-#, fuzzy
-msgid "Wrong username or password."
-msgstr "Väärä salasana"
+#: ../src/gui/socialwindow.cpp:312 ../src/gui/windowmenu.cpp:64
+msgid "Social"
+msgstr "Suhteet"
 
-#: src/net/manaserv/loginhandler.cpp:272
-#, fuzzy
-msgid "Account banned"
-msgstr "Tili: %s"
+#: ../src/keyboardconfig.cpp:79
+msgid "Social Window"
+msgstr "Suhdeikkuna"
 
-#: src/net/manaserv/loginhandler.cpp:275
-msgid "Login attempt too soon after previous attempt."
+#: ../src/gui/setup_video.cpp:573
+msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
+"Joitakin ikkunoita on siirretty, jotta ne mahtuvat pienemmälle ruudulle."
 
-#: src/net/manaserv/loginhandler.cpp:303
-msgid "Wrong username, password or email address."
-msgstr ""
+#: ../src/net/tmwa/generalhandler.cpp:139
+msgid "Someone else is trying to use this account."
+msgstr "Joku muu yrittää käyttää tätä tunnusta."
 
-#: src/net/manaserv/loginhandler.cpp:306
-#, fuzzy
-msgid "Username already exists."
-msgstr "Käyttäjänimi on jo käytössä"
+#: ../src/gui/setup_audio.cpp:42
+msgid "Sound"
+msgstr "Ääni"
 
-#: src/net/manaserv/loginhandler.cpp:309
-msgid "Email address already exists."
-msgstr ""
+#: ../src/gui/setup_audio.cpp:106
+msgid "Sound Engine"
+msgstr "Äänimoottori"
 
-#: src/net/manaserv/loginhandler.cpp:312
-msgid "You took too long with the captcha or your response was incorrect."
-msgstr ""
+# TODO: Say what
+#: ../src/gui/specialswindow.cpp:79 ../src/gui/windowmenu.cpp:62
+msgid "Specials"
+msgstr "Erikoisuudet"
 
-#: src/net/manaserv/partyhandler.cpp:87
-msgid "Joined party."
-msgstr ""
+#: ../src/gui/setup_colors.cpp:89 ../src/gui/setup_colors.cpp:90
+#: ../src/gui/setup_colors.cpp:333
+msgid "Spectrum"
+msgstr "Spektri"
 
-#: src/net/manaserv/partyhandler.cpp:105
-#, c-format
-msgid "%s joined the party."
-msgstr ""
+#: ../src/net/tmwa/generalhandler.cpp:145
+msgid "Speed hack detected."
+msgstr "Nopeusviritelmä havaittu."
 
-#: src/net/manaserv/partyhandler.cpp:123
-#, c-format
-msgid "%s rejected your invite."
-msgstr ""
+#: ../src/gui/inventorywindow.cpp:108 ../src/gui/popupmenu.cpp:378
+msgid "Split"
+msgstr "Jaa"
 
-#: src/net/manaserv/tradehandler.cpp:95
-msgid "Accepting incoming trade requests."
+#: ../src/localplayer.cpp:899
+msgid "Stack is too big."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:97
-msgid "Ignoring incoming trade requests."
-msgstr ""
+#: ../src/gui/recorder.cpp:104
+msgid "Starting to record..."
+msgstr "Aloitan tallentamisen..."
 
-#: src/net/manaserv/tradehandler.cpp:115 src/net/tmwa/tradehandler.cpp:109
-msgid "Request for Trade"
-msgstr ""
+#: ../src/gui/setup_colors.cpp:83 ../src/gui/setup_colors.cpp:331
+msgid "Static"
+msgstr "Staattinen"
 
-#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:110
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr "%s haluaa käydäkauppaa kanssasi, hyväksytkö pyynnön?"
+#: ../src/gui/windowmenu.cpp:54
+msgid "Status"
+msgstr "Hahmon tiedot"
 
-#: src/net/manaserv/tradehandler.cpp:134
-#, c-format
-msgid "Trading with %s"
-msgstr ""
+#: ../src/keyboardconfig.cpp:70
+msgid "Status Window"
+msgstr "Tilaikkuna"
 
-#: src/net/manaserv/tradehandler.cpp:148 src/net/tmwa/tradehandler.cpp:224
-msgid "Trade canceled."
-msgstr ""
+#: ../src/gui/setup_joystick.cpp:83
+msgid "Stop"
+msgstr "Lopeta"
 
-#: src/net/manaserv/tradehandler.cpp:155 src/net/tmwa/tradehandler.cpp:231
-msgid "Trade completed."
-msgstr ""
+#: ../src/keyboardconfig.cpp:47
+msgid "Stop Attack"
+msgstr "Keskeytä hyökkäys"
 
-#: src/net/tmwa/adminhandler.cpp:64
-msgid "Kick failed!"
-msgstr ""
+#: ../src/gui/recorder.h:39
+msgid "Stop recording"
+msgstr "Lopeta tallentaminen"
 
-#: src/net/tmwa/adminhandler.cpp:66
-msgid "Kick succeeded!"
-msgstr ""
+#: ../src/gui/inventorywindow.cpp:59
+msgid "Storage"
+msgstr "Varasto"
 
-#: src/net/tmwa/buysellhandler.cpp:109
-msgid "Nothing to sell."
-msgstr "Ei mitään myytävää"
+#: ../src/gui/inventorywindow.cpp:131 ../src/gui/popupmenu.cpp:358
+msgid "Store"
+msgstr "Varastoi"
 
-#: src/net/tmwa/buysellhandler.cpp:116
-msgid "Thanks for buying."
-msgstr ""
+#: ../src/net/manaserv/attributes.cpp:166
+#: ../src/net/tmwa/generalhandler.cpp:230
+msgid "Strength"
+msgstr "Voima"
 
-#: src/net/tmwa/buysellhandler.cpp:123
-msgid "Unable to buy."
-msgstr ""
+#: ../src/net/manaserv/attributes.cpp:173
+#, fuzzy, c-format
+msgid "Strength %+.1f"
+msgstr "Voima %+d"
 
-#: src/net/tmwa/buysellhandler.cpp:129
-msgid "Thanks for selling."
-msgstr ""
+#: ../src/net/tmwa/generalhandler.cpp:102
+#, c-format
+msgid "Strength %+d"
+msgstr "Voima %+d"
 
-#: src/net/tmwa/buysellhandler.cpp:131
-msgid "Unable to sell."
-msgstr ""
+#: ../src/net/tmwa/charserverhandler.cpp:270
+msgid "Strength:"
+msgstr "Voima:"
 
-#: src/net/tmwa/charserverhandler.cpp:103
-msgid "Access denied. Most likely, there are too many players on this server."
-msgstr ""
+#: ../src/gui/npcdialog.cpp:51
+msgid "Submit"
+msgstr "Lähetä"
 
-#: src/net/tmwa/charserverhandler.cpp:107
-msgid "Cannot use this ID."
-msgstr ""
+#: ../src/gui/charselectdialog.cpp:131
+msgid "Switch Login"
+msgstr "Vaihda sisäänkirjautumistietoja"
 
-#: src/net/tmwa/charserverhandler.cpp:110
-#, fuzzy
-msgid "Unknown char-server failure."
-msgstr "Tuntematon virhe"
+#: ../src/gui/quitdialog.cpp:45
+msgid "Switch character"
+msgstr "Vaihda hahmoa"
 
-#: src/net/tmwa/charserverhandler.cpp:134
-msgid "Failed to create character. Most likely the name is already taken."
-msgstr "Hahmon luonti epäonnistui. Todennäköisesti hahmon nimi on jo käytössä."
+#: ../src/gui/quitdialog.cpp:44
+msgid "Switch server"
+msgstr "Vaihda palvelinta"
 
-#: src/net/tmwa/charserverhandler.cpp:146
-msgid "Character deleted."
-msgstr "Hahmo poistettu"
+#: ../src/gui/setup_video.cpp:437
+msgid "Switching to Full Screen"
+msgstr "Vaihdan kokoruututilaan"
 
-#: src/net/tmwa/charserverhandler.cpp:151
-msgid "Failed to delete character."
-msgstr "Hahmon poisto epäonnistui"
+#: ../src/keyboardconfig.cpp:46
+msgid "Talk"
+msgstr "Keskustele"
 
-#: src/net/tmwa/charserverhandler.cpp:266
-msgid "Strength:"
-msgstr "Voima:"
+#: ../src/gui/popupmenu.cpp:150
+#, c-format
+msgid "Talk to %s"
+msgstr "Puhu pelaajalle %s"
 
-#: src/net/tmwa/charserverhandler.cpp:267
-msgid "Agility:"
-msgstr "Ketteryys:"
+#: ../src/keyboardconfig.cpp:44
+msgid "Target & Attack"
+msgstr "Kohdista ja hyökkää"
 
-#: src/net/tmwa/charserverhandler.cpp:268
-msgid "Vitality:"
-msgstr "Elinvoima:"
+#: ../src/keyboardconfig.cpp:48
+msgid "Target Monster"
+msgstr "Kohdista hirviöön"
 
-#: src/net/tmwa/charserverhandler.cpp:269
-msgid "Intelligence:"
-msgstr "Älykkyys:"
+#: ../src/keyboardconfig.cpp:49
+msgid "Target NPC"
+msgstr "Kohdista ei-pelaajahahmoon"
 
-#: src/net/tmwa/charserverhandler.cpp:270
-msgid "Dexterity:"
-msgstr "Näppäryys:"
+#: ../src/keyboardconfig.cpp:50
+msgid "Target Player"
+msgstr "Kohdista pelaajaan"
 
-#: src/net/tmwa/charserverhandler.cpp:271
-msgid "Luck:"
-msgstr ""
+#: ../src/gui/setup_video.cpp:158
+msgid "Text"
+msgstr "Teksti"
 
-#: src/net/tmwa/chathandler.cpp:87
-#, c-format
-msgid "Whisper could not be sent, %s is offline."
-msgstr ""
+#: ../src/net/tmwa/buysellhandler.cpp:116
+msgid "Thanks for buying."
+msgstr "Kiitos kaupoista."
 
-#: src/net/tmwa/chathandler.cpp:96
-#, c-format
-msgid "Whisper could not be sent, ignored by %s."
-msgstr ""
+#: ../src/net/tmwa/buysellhandler.cpp:129
+msgid "Thanks for selling."
+msgstr "Kiitos kaupoista."
 
-#: src/net/tmwa/chathandler.cpp:230
-#, fuzzy
-msgid "MVP player."
-msgstr "Pelaaja"
+#: ../src/net/manaserv/beinghandler.cpp:287
+#: ../src/net/tmwa/playerhandler.cpp:99
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr "Tuonelasta käy sieluusi kylmä viima."
 
-#: src/net/tmwa/chathandler.cpp:265 src/net/tmwa/chathandler.cpp:271
-#: src/net/tmwa/chathandler.cpp:276 src/net/tmwa/chathandler.cpp:281
-#: src/net/tmwa/chathandler.cpp:286 src/net/tmwa/chathandler.cpp:291
-#: src/net/tmwa/chathandler.cpp:296 src/net/tmwa/chathandler.cpp:301
-msgid "Channels are not supported!"
-msgstr "Kanavia ei tueta!"
+#: ../src/game.cpp:385
+msgid "The connection to the server was lost."
+msgstr "Yhteys palvelimeen katkesi."
 
-#: src/net/tmwa/gamehandler.cpp:88
-#, c-format
-msgid "Online users: %d"
-msgstr ""
+#: ../src/gui/changeemaildialog.cpp:141
+msgid "The email address entries mismatch."
+msgstr "Annetut sähköpostiosoitteet eivät täsmää."
 
-#: src/net/tmwa/gamehandler.cpp:101
-#, fuzzy
-msgid "Game"
-msgstr "Nimi"
+#: ../src/net/manaserv/loginhandler.cpp:158
+msgid "The new email address already exists."
+msgstr "Uusi sähköpostiosoite on jo käytössä."
 
-#: src/net/tmwa/gamehandler.cpp:101
-msgid "Request to quit denied!"
-msgstr ""
+#: ../src/gui/changeemaildialog.cpp:127
+#, c-format
+msgid "The new email address needs to be at least %d characters long."
+msgstr "Uuden osoitteen minimipituus on %d merkkiä."
 
-#: src/net/tmwa/generalhandler.cpp:102
+#: ../src/gui/changeemaildialog.cpp:134
 #, c-format
-msgid "Strength %+d"
-msgstr ""
+msgid "The new email address needs to be less than %d characters long."
+msgstr "Uuden osoitteen enimmäispituus on %d merkkiä."
 
-#: src/net/tmwa/generalhandler.cpp:103
+#: ../src/gui/changepassworddialog.cpp:130
+msgid "The new password entries mismatch."
+msgstr "Uuden salasanan kopiot eivät täsmää."
+
+#: ../src/gui/changepassworddialog.cpp:116
 #, c-format
-msgid "Agility %+d"
-msgstr ""
+msgid "The new password needs to be at least %d characters long."
+msgstr "Uuden salasanan minimipituus on %d merkkiä."
 
-#: src/net/tmwa/generalhandler.cpp:104
+#: ../src/gui/changepassworddialog.cpp:123
 #, c-format
-msgid "Vitality %+d"
-msgstr ""
+msgid "The new password needs to be less than %d characters long."
+msgstr "Uuden salasanan enimmäispituus on %d merkkiä."
 
-#: src/net/tmwa/generalhandler.cpp:105
+#: ../src/gui/register.cpp:182 ../src/gui/unregisterdialog.cpp:117
 #, c-format
-msgid "Intelligence %+d"
-msgstr ""
+msgid "The password needs to be at least %d characters long."
+msgstr "Salasanan tulee olla vähintään %d merkkiä pitkä"
 
-#: src/net/tmwa/generalhandler.cpp:106
+#: ../src/gui/register.cpp:190 ../src/gui/unregisterdialog.cpp:124
 #, c-format
-msgid "Dexterity %+d"
-msgstr ""
+msgid "The password needs to be less than %d characters long."
+msgstr "Salasanan tulee olla alle %d merkkiä pitkä."
 
-#: src/net/tmwa/generalhandler.cpp:107
+#: ../src/gui/register.cpp:166
 #, c-format
-msgid "Luck %+d"
-msgstr ""
+msgid "The username needs to be at least %d characters long."
+msgstr "Käyttäjänimen tulee olla vähintään %d merkkiä pitkä"
 
-#: src/net/tmwa/generalhandler.cpp:132
-#, fuzzy
-msgid "Authentication failed."
-msgstr "Tunnistus epäonnistui"
+#: ../src/gui/register.cpp:174
+#, c-format
+msgid "The username needs to be less than %d characters long."
+msgstr "Käyttäjänimen tulee olla alle %d merkkiä pitkä."
 
-#: src/net/tmwa/generalhandler.cpp:135
-#, fuzzy
-msgid "No servers available."
-msgstr "Palvelimia ei saatavilla"
+#: ../src/net/tmwa/generalhandler.cpp:142
+msgid "This account is already logged in."
+msgstr "Tällä tunnuksella on jo kirjauduttu."
 
-#: src/net/tmwa/generalhandler.cpp:139
-#, fuzzy
-msgid "Someone else is trying to use this account."
-msgstr "Joku muu yrittää käyttää tätä tunnusta"
+#: ../src/net/tmwa/gui/guildtab.cpp:81
+msgid "This command causes the player to leave the guild."
+msgstr "Tämä komento saa sinut eroamaan killasta."
 
-#: src/net/tmwa/generalhandler.cpp:142
-#, fuzzy
-msgid "This account is already logged in."
-msgstr "Tällä tunnuksella on jo kirjauduttu"
+#: ../src/net/tmwa/gui/partytab.cpp:81
+msgid "This command causes the player to leave the party."
+msgstr "Tämä komento erottaa pelaajan ryhmästä."
 
-#: src/net/tmwa/generalhandler.cpp:145
-msgid "Speed hack detected."
-msgstr ""
+#: ../src/net/tmwa/gui/partytab.cpp:96
+msgid "This command changes the party's experience sharing policy."
+msgstr "Tämä komento muuttaa ryhmän kokemuksenjaon politiikkaa."
 
-#: src/net/tmwa/generalhandler.cpp:148
-msgid "Duplicated login."
-msgstr ""
+#: ../src/net/tmwa/gui/partytab.cpp:86
+msgid "This command changes the party's item sharing policy."
+msgstr "Tämä komento muuttaa ryhmän esineiden jakopolitiikkaa."
 
-#: src/net/tmwa/generalhandler.cpp:151
-#, fuzzy
-msgid "Unknown connection error."
-msgstr "Tuntematon yhteys ongelma"
+#: ../src/commandhandler.cpp:274
+msgid "This command clears the away status and message."
+msgstr "Tämä komento peruuttaa away-tilan ja sen perusteluviestin."
 
-#: src/net/tmwa/generalhandler.cpp:209
-msgid "Got disconnected from server!"
-msgstr ""
+#: ../src/commandhandler.cpp:228
+msgid "This command clears the chat log of previous chat."
+msgstr "Tämä komento tyhjentää viimeisimmän keskustelun loki-ikkunan."
 
-#: src/net/tmwa/generalhandler.cpp:230
-msgid "Strength"
-msgstr ""
+#: ../src/gui/widgets/whispertab.cpp:85
+msgid "This command closes the current whisper tab."
+msgstr "Tämä komento sulkee avoinna olevan kuiskausvälilehden."
 
-#: src/net/tmwa/generalhandler.cpp:231
-msgid "Agility"
-msgstr ""
+#: ../src/commandhandler.cpp:279
+msgid "This command creates a new party called <name>."
+msgstr "Tämä komento luo uuden, annetunnimisen ryhmän."
 
-#: src/net/tmwa/generalhandler.cpp:232
-msgid "Vitality"
-msgstr ""
+#: ../src/commandhandler.cpp:209
+msgid "This command displays a list of all commands available."
+msgstr "Tämä komento näyttää listan kaikista komennoista."
 
-#: src/net/tmwa/generalhandler.cpp:233
-msgid "Intelligence"
-msgstr ""
+#: ../src/commandhandler.cpp:212
+msgid "This command displays help on <command>."
+msgstr "Tämä komento näyttää annetun komennon käyttöohjeen."
 
-#: src/net/tmwa/generalhandler.cpp:234
-msgid "Dexterity"
-msgstr ""
+#: ../src/commandhandler.cpp:323
+msgid "This command displays the name of the current map."
+msgstr "Tämä komento näyttää nykyisen kartan nimen."
 
-#: src/net/tmwa/generalhandler.cpp:235
-msgid "Luck"
-msgstr ""
+#: ../src/commandhandler.cpp:328
+msgid "This command displays the number of players currently online."
+msgstr "Tämä komento näyttää paikalla olevien pelaajien määrän."
 
-#: src/net/tmwa/generalhandler.cpp:238
-#, fuzzy
-msgid "Defense"
-msgstr "Puolustus %+d"
+#: ../src/net/tmwa/gui/partytab.cpp:101
+msgid "This command displays the party's current experience sharing policy."
+msgstr "Tämä komento näyttää ryhmän nykyisen kokemuksenjaon politiikan."
 
-#: src/net/tmwa/generalhandler.cpp:239
-#, fuzzy
-msgid "M.Attack"
-msgstr "Hyökkäys %+d"
+#: ../src/net/tmwa/gui/partytab.cpp:91
+msgid "This command displays the party's current item sharing policy."
+msgstr "Tämä komento näyttää ryhmän nykyisen esineiden jakopolitiikan."
 
-#: src/net/tmwa/generalhandler.cpp:240
-#, fuzzy
-msgid "M.Defense"
-msgstr "Puolustus %+d"
+#: ../src/commandhandler.cpp:312
+msgid "This command displays the return toggle status."
+msgstr "Tämä komento näyttää toggle-komennon nykyasetuksen."
 
-#: src/net/tmwa/generalhandler.cpp:241
-#, fuzzy, c-format
-msgid "% Accuracy"
-msgstr "% Tarkkuus:"
+#: ../src/commandhandler.cpp:301
+msgid "This command finishes a recording session."
+msgstr "Tämä komento pysäyttää keskustelun tallentamisen omaan tiedostoon."
 
-#: src/net/tmwa/generalhandler.cpp:242
-#, c-format
-msgid "% Evade"
+# TODO: The terms "record log" and "chat log" seem unclear.
+#: ../src/commandhandler.cpp:291
+msgid ""
+"This command gets a list of players within hearing and sends it to either "
+"the record log if recording, or the chat log otherwise."
 msgstr ""
+"Tämä komento hakee kuuloetäisyydellä olevien pelaajien listan ja lähettää "
+"sen joko tallennuslokiin jos tallennat keskustelua, tai muussa tapauksessa "
+"yleiseen keskustelulokiin."
 
-#: src/net/tmwa/generalhandler.cpp:243
-#, c-format
-msgid "% Critical"
+#: ../src/commandhandler.cpp:233
+msgid "This command ignores the given player regardless of current relations."
 msgstr ""
+"Tämä komento jättää annetun pelaajan huomiotta (nykysuhteilla ei vaikutusta)."
 
-#: src/net/tmwa/gui/guildtab.cpp:45
-msgid "Guild"
+#: ../src/gui/widgets/whispertab.cpp:90
+msgid "This command ignores the other player regardless of current relations."
 msgstr ""
+"Tämä komento jättää annetun pelaajan huomiotta; nykysuhteilla ei ole "
+"vaikutusta."
 
-#: src/net/tmwa/gui/guildtab.cpp:61 src/net/tmwa/gui/partytab.cpp:59
-msgid "/help > Display this help."
-msgstr ""
+#: ../src/commandhandler.cpp:284 ../src/net/tmwa/gui/partytab.cpp:74
+msgid "This command invites <nick> to party with you."
+msgstr "Tämä komento kutsuu annetun pelaajan ryhmääsi."
 
-#: src/net/tmwa/gui/guildtab.cpp:62
-msgid "/invite > Invite a player to your guild"
-msgstr ""
+#: ../src/net/tmwa/gui/guildtab.cpp:74
+msgid "This command invites <nick> to the guild you're in."
+msgstr "Tämä komento kutsuu annetun pelaajan nykyiseen kiltaasi."
 
-#: src/net/tmwa/gui/guildtab.cpp:63
-msgid "/leave > Leave the guild you are in"
-msgstr ""
+#: ../src/gui/widgets/channeltab.cpp:74
+msgid "This command leaves the current channel."
+msgstr "Tällä komennolla poistut kanvalta."
 
-#: src/net/tmwa/gui/guildtab.cpp:64
-#, fuzzy
-msgid "/kick > Kick some one from the guild you are in"
-msgstr "/kick > Poista käyttäjä kanavalta"
+#: ../src/gui/widgets/channeltab.cpp:81
+msgid "This command makes <nick> a channel operator."
+msgstr "Tämä komento tekee annetunnimisestä käyttäjästä kanavaoperaattorin."
 
-#: src/net/tmwa/gui/guildtab.cpp:73 src/net/tmwa/gui/partytab.cpp:73
-msgid "Command: /invite <nick>"
-msgstr ""
+#: ../src/gui/widgets/channeltab.cpp:90
+msgid "This command makes <nick> leave the channel."
+msgstr "Tämä komento poistaa annetunnimisen hahmon kanavalta."
 
-#: src/net/tmwa/gui/guildtab.cpp:74
-#, fuzzy
-msgid "This command invites <nick> to the guild you're in."
-msgstr "Tämä komento tekee <nick> operaattorin."
+#: ../src/commandhandler.cpp:239
+msgid "This command makes you enter <channel>."
+msgstr "Tämä komento liittää sinut keskustelukanavalle."
 
-#: src/net/tmwa/gui/guildtab.cpp:80 src/net/tmwa/gui/partytab.cpp:80
-msgid "Command: /leave"
+#: ../src/commandhandler.cpp:222
+msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
+"Komento lähettää annetun viestin kaikille sisäänkirjautuneille pelaajille."
 
-#: src/net/tmwa/gui/guildtab.cpp:81
-#, fuzzy
-msgid "This command causes the player to leave the guild."
-msgstr "Tämä komento lähettää tekstin <message> käyttäjälle <nick>."
+#: ../src/commandhandler.cpp:257
+msgid "This command sends the text <message> to <nick>."
+msgstr "Tämä komento lähettää viestin annetulle käyttäjälle."
 
-#: src/net/tmwa/gui/guildtab.cpp:89
-msgid "Guild name is missing."
-msgstr ""
+#: ../src/gui/widgets/channeltab.cpp:69
+msgid "This command sets the topic to <message>."
+msgstr "Tämä komento asettaa aihekentän arvoksi <viesti>."
 
-#: src/net/tmwa/guildhandler.cpp:296
-msgid "Could not inivte user to guild."
+# TODO: msgid is contrived, check if this means "need to press enter twice to close discussion prompt or if it closes after each message".
+#: ../src/commandhandler.cpp:306
+msgid ""
+"This command sets whether the return key should toggle the chat log, or "
+"whether the chat log turns off automatically."
 msgstr ""
+"Tämä komento määrittää, aktivoiko <rivinvaihto> keskustelulokin ja poistaa "
+"sen erikseen käytöstä, vai poistuuko se käytöstä automaattisesti."
 
-#: src/net/tmwa/guildhandler.cpp:301
-msgid "User rejected guild invite."
-msgstr ""
+#: ../src/commandhandler.cpp:245
+msgid "This command shows a list of all channels."
+msgstr "Tämä komento näyttää listan kaikista kanavista"
 
-#: src/net/tmwa/guildhandler.cpp:306
-msgid "User is now part of your guild."
-msgstr ""
+#: ../src/gui/widgets/channeltab.cpp:64
+msgid "This command shows the users in this channel."
+msgstr "Tämä komento näyttää käyttäjät kanavalla."
 
-#: src/net/tmwa/guildhandler.cpp:311
-msgid "Your guild is full."
-msgstr ""
+#: ../src/commandhandler.cpp:298
+msgid "This command starts recording the chat log to the file <filename>."
+msgstr "Tämä komento aloittaa keskustelun tallentamisen tiedostoon <filename>."
 
-#: src/net/tmwa/guildhandler.cpp:316
-msgid "Unknown guild invite response."
-msgstr ""
+#: ../src/commandhandler.cpp:317
+msgid "This command stops ignoring the given player if they are being ignored"
+msgstr "Tämä komento keskeyttää pelaajan huomiotta jätön, jos se on käytössä"
 
-#: src/net/tmwa/guildhandler.cpp:393
-msgid "Guild creation isn't supported yet."
+#: ../src/gui/widgets/whispertab.cpp:96
+msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
+"Tämä komento huomioi pelaajan taas, jos tämä on ensin jätetty huomiotta."
 
-#: src/net/tmwa/gui/partytab.cpp:43
-msgid "Party"
-msgstr ""
+#: ../src/commandhandler.cpp:250
+msgid "This command tell others you are (doing) <msg>."
+msgstr "Tämä komento kertoo muille, mitä 'teet'. ('<nimi> istuu.')"
 
-#: src/net/tmwa/gui/partytab.cpp:60
-msgid "/invite > Invite a player to your party"
+#: ../src/commandhandler.cpp:271
+msgid "This command tells you're away from keyboard with the given reason."
 msgstr ""
+"Tämä komento kertoo sinun olevan pois koneen äärestä (annetusta syystä)."
 
-#: src/net/tmwa/gui/partytab.cpp:61
-msgid "/leave > Leave the party you are in"
+# TODO: typo in msgid: betweenyou
+#: ../src/commandhandler.cpp:265
+msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
+"Tämä komento yrittää luoda välilehden kuiskausviesteille sinun ja pelaajan "
+"välillä."
 
-#: src/net/tmwa/gui/partytab.cpp:62
-msgid "/kick > Kick some one from the party you are in"
-msgstr ""
+#: ../src/gui/setup_colors.cpp:46
+msgid "This is what the color looks like"
+msgstr "Väri näyttää tältä"
 
-#: src/net/tmwa/gui/partytab.cpp:63
-msgid "/item > Show/change party item sharing options"
+#: ../src/client.cpp:783
+#, fuzzy
+msgid ""
+"This server is missing needed world data. Please contact the administrator"
+"(s)."
 msgstr ""
+"Asiakasohjelmalla ei voi rekisteröityä tälle palvelimelle; ota yhteyttä "
+"palvelimen ylläpitoon."
 
-#: src/net/tmwa/gui/partytab.cpp:64
-msgid "/exp > Show/change party experience sharing options"
-msgstr ""
+#: ../src/net/tmwa/loginhandler.cpp:185
+msgid "This user name is already taken."
+msgstr "Käyttäjätunnus on jo käytössä."
 
-#: src/net/tmwa/gui/partytab.cpp:81
-msgid "This command causes the player to leave the party."
-msgstr ""
+#: ../src/gui/setup_video.cpp:128
+msgid "Tiny"
+msgstr "Pikkuruinen"
 
-#: src/net/tmwa/gui/partytab.cpp:85
-msgid "Command: /item <policy>"
-msgstr ""
+#: ../src/gui/npcpostdialog.cpp:47
+msgid "To:"
+msgstr "Vastaanottaja:"
 
-#: src/net/tmwa/gui/partytab.cpp:86
-msgid "This command changes the party's item sharing policy."
-msgstr ""
+#: ../src/keyboardconfig.cpp:96
+msgid "Toggle Chat"
+msgstr "Ota keskustelu käyttöön/pois käytöstä"
 
-#: src/net/tmwa/gui/partytab.cpp:87
-msgid ""
-"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
-"\"0\", \"no\", \"false\" to disable item sharing."
-msgstr ""
+#: ../src/net/manaserv/chathandler.cpp:190
+#: ../src/net/manaserv/chathandler.cpp:316
+#: ../src/net/manaserv/guildhandler.cpp:260
+#, c-format
+msgid "Topic: %s"
+msgstr "Aihe: %s"
 
-#: src/net/tmwa/gui/partytab.cpp:90
-msgid "Command: /item"
-msgstr ""
+# TODO: Check where this really appears: verb or noun?
+#: ../src/gui/trade.cpp:73 ../src/gui/trade.cpp:74
+msgid "Trade"
+msgstr "Tee kaupat"
 
-#: src/net/tmwa/gui/partytab.cpp:91
-msgid "This command displays the party's current item sharing policy."
-msgstr ""
+#: ../src/net/manaserv/tradehandler.cpp:148
+#: ../src/net/tmwa/tradehandler.cpp:224
+msgid "Trade canceled."
+msgstr "Kaupat peruttu."
 
-#: src/net/tmwa/gui/partytab.cpp:95
-msgid "Command: /exp <policy>"
-msgstr ""
+#: ../src/net/tmwa/tradehandler.cpp:134
+msgid "Trade cancelled due to an unknown reason."
+msgstr "Kaupanteko keskeytyi tuntemattomasta syystä."
 
-#: src/net/tmwa/gui/partytab.cpp:96
-msgid "This command changes the party's experience sharing policy."
-msgstr ""
+#: ../src/net/manaserv/tradehandler.cpp:155
+#: ../src/net/tmwa/tradehandler.cpp:231
+msgid "Trade completed."
+msgstr "Kaupat tuli."
 
-#: src/net/tmwa/gui/partytab.cpp:97
-msgid ""
-"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
-"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
-msgstr ""
+#: ../src/net/tmwa/specialhandler.cpp:145
+msgid "Trade failed!"
+msgstr "Kauppa epäonnistui!"
 
-#: src/net/tmwa/gui/partytab.cpp:100
-msgid "Command: /exp"
-msgstr ""
+#: ../src/net/tmwa/tradehandler.cpp:146
+#, c-format
+msgid "Trade with %s cancelled."
+msgstr "Kaupanteko pelaajan %s kanssa peruttu."
 
-#: src/net/tmwa/gui/partytab.cpp:101
-msgid "This command displays the party's current experience sharing policy."
-msgstr ""
+#: ../src/gui/popupmenu.cpp:83
+#, c-format
+msgid "Trade with %s..."
+msgstr "Käy kauppaa pelaajan %s kanssa..."
 
-#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:196
-msgid "Item sharing enabled."
-msgstr ""
+#: ../src/gui/trade.cpp:59
+msgid "Trade: You"
+msgstr "Kauppa: Sinä"
 
-#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:202
-msgid "Item sharing disabled."
-msgstr ""
+#: ../src/net/tmwa/tradehandler.cpp:139
+#, c-format
+msgid "Trade: You and %s"
+msgstr "Kauppa: sinä ja %s"
 
-#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:208
-msgid "Item sharing not possible."
-msgstr ""
+#: ../src/net/tmwa/tradehandler.cpp:130
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr "Kaupanteko ei ole mahdollista. Hahmoa ei ole."
 
-#: src/net/tmwa/gui/partytab.cpp:141
-msgid "Item sharing unknown."
-msgstr ""
+#: ../src/net/tmwa/tradehandler.cpp:126
+msgid "Trading isn't possible. Trade partner is too far away."
+msgstr "Kaupanteko ei ole mahdollista. kauppa kumppani on liian kaukana."
 
-#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:172
-msgid "Experience sharing enabled."
-msgstr ""
+#: ../src/net/manaserv/tradehandler.cpp:134
+#, c-format
+msgid "Trading with %s"
+msgstr "Kaupantekoa pelaajan %s kanssa"
 
-#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:178
-msgid "Experience sharing disabled."
-msgstr ""
+#: ../src/gui/setup_video.cpp:469
+msgid "Transparency disabled"
+msgstr "Läpinäkyvyys poistettu käytöstä"
 
-#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:184
-msgid "Experience sharing not possible."
-msgstr ""
+#: ../src/gui/setup_video.cpp:477
+msgid "Transparency enabled"
+msgstr "Läpinäkyvyys käytössä"
 
-#: src/net/tmwa/gui/partytab.cpp:176
-msgid "Experience sharing unknown."
-msgstr ""
+#: ../src/localplayer.cpp:895
+#, fuzzy
+msgid "Tried to pick up nonexistent item."
+msgstr "Esineen ottaminen epäonnistui."
 
-#: src/net/tmwa/inventoryhandler.cpp:285
-msgid "Failed to use item."
-msgstr "Esineen käyttö epä-onnistui"
+#: ../src/commandhandler.cpp:334
+msgid "Type /help for a list of commands."
+msgstr "Saat listan komennoista kirjoittamalla /help."
+
+#: ../src/gui/changeemaildialog.cpp:51
+msgid "Type new email address twice:"
+msgstr "Kirjoita uusi sähköpostiosoite kahdesti:"
+
+#: ../src/gui/changepassworddialog.cpp:63
+msgid "Type new password twice:"
+msgstr "Kirjoita uusi salasana kahdesti:"
+
+#: ../src/gui/setup_colors.cpp:72
+msgid "Type:"
+msgstr "Tyyppi:"
+
+#: ../src/net/tmwa/buysellhandler.cpp:123
+msgid "Unable to buy."
+msgstr "Ostaminen epäonnistui."
 
-#: src/net/tmwa/inventoryhandler.cpp:399
+#: ../src/net/tmwa/inventoryhandler.cpp:401
 msgid "Unable to equip."
-msgstr ""
+msgstr "Käyttöönotto epäonnistui."
+
+# TODO: report as untranslateable, need percent-s
+#: ../src/net/tmwa/network.cpp:345
+msgid "Unable to resolve host \""
+msgstr "Osoitetta ei löydy: \""
+
+#: ../src/net/tmwa/buysellhandler.cpp:131
+msgid "Unable to sell."
+msgstr "Myyminen epäonnistui."
 
-#: src/net/tmwa/inventoryhandler.cpp:410
+#: ../src/net/tmwa/inventoryhandler.cpp:413
 msgid "Unable to unequip."
+msgstr "Käytöstä poisto epäonnistui."
+
+#: ../src/gui/setup_keyboard.cpp:90
+msgid "Unassign"
+msgstr "Poista asetus"
+
+#: ../src/gui/equipmentwindow.cpp:88 ../src/gui/inventorywindow.cpp:94
+#: ../src/gui/inventorywindow.cpp:352 ../src/gui/popupmenu.cpp:364
+msgid "Unequip"
+msgstr "Poista varuste käytöstä"
+
+#: ../src/gui/outfitwindow.cpp:70
+msgid "Unequip first"
+msgstr "Riisu ensin"
+
+#: ../src/net/manaserv/charhandler.cpp:270
+#, c-format
+msgid "Unhandled character select error message %i."
 msgstr ""
 
-#: src/net/tmwa/loginhandler.cpp:86
-msgid "Account was not found. Please re-login."
-msgstr "Tunnusta ei löytynyt. Yritä uudelleen."
+#: ../src/net/tmwa/tradehandler.cpp:154
+msgid "Unhandled trade cancel packet."
+msgstr "Käsittelemätön kaupan peruutus -paketti."
 
-#: src/net/tmwa/loginhandler.cpp:92
-#, fuzzy
-msgid "New password too short."
-msgstr "Uusi salasana on liian lyhyt."
+#: ../src/gui/popupmenu.cpp:114 ../src/gui/popupmenu.cpp:123
+#, c-format
+msgid "Unignore %s"
+msgstr "Huomioi %s"
 
-#: src/net/tmwa/loginhandler.cpp:156
+#: ../src/net/net.cpp:141
 #, fuzzy
-msgid "Unregistered ID."
-msgstr "Poista palvelimelta"
+msgid "Unknown Server Type! Exiting."
+msgstr "Tuntematon esine tyyppi"
 
-#: src/net/tmwa/loginhandler.cpp:159
-#, fuzzy
-msgid "Wrong password."
-msgstr "Väärä salasana"
+#: ../src/net/manaserv/chathandler.cpp:342
+msgid "Unknown channel event."
+msgstr "Tuntematon kanavatapahtuma."
 
-#: src/net/tmwa/loginhandler.cpp:162
-msgid "Account expired."
-msgstr ""
+#: ../src/net/tmwa/charserverhandler.cpp:110
+msgid "Unknown char-server failure."
+msgstr "Tuntematon hahmopalvelinvirhe."
 
-#: src/net/tmwa/loginhandler.cpp:165
-msgid "Rejected from server."
-msgstr ""
+#: ../src/commandhandler.cpp:136 ../src/commandhandler.cpp:333
+msgid "Unknown command."
+msgstr "Tuntematon komento."
 
-#: src/net/tmwa/loginhandler.cpp:168
-#, fuzzy
-msgid ""
-"You have been permanently banned from the game. Please contact the GM team."
-msgstr ""
-"Sinun pääsysi peliin on väliaikaisesti estetty %s asti\n"
-"Ota yhteyttä GM tiimiin foorumeilla."
+#: ../src/net/tmwa/generalhandler.cpp:151
+msgid "Unknown connection error."
+msgstr "Tuntematon yhteysongelma."
 
-#: src/net/tmwa/loginhandler.cpp:172
+#: ../src/net/manaserv/charhandler.cpp:225
 #, c-format
-msgid ""
-"You have been temporarily banned from the game until %s.\n"
-"Please contact the GM team via the forums."
-msgstr ""
-"Sinun pääsysi peliin on väliaikaisesti estetty %s asti\n"
-"Ota yhteyttä GM tiimiin foorumeilla."
+msgid "Unknown error (%d)."
+msgstr "Tuntematon virhe (%d)."
+
+#: ../src/net/manaserv/charhandler.cpp:174
+#: ../src/net/manaserv/loginhandler.cpp:96
+#: ../src/net/manaserv/loginhandler.cpp:127
+#: ../src/net/manaserv/loginhandler.cpp:161
+#: ../src/net/manaserv/loginhandler.cpp:279
+#: ../src/net/manaserv/loginhandler.cpp:316
+#: ../src/net/tmwa/loginhandler.cpp:95 ../src/net/tmwa/loginhandler.cpp:191
+msgid "Unknown error."
+msgstr "Tuntematon virhe."
 
-#: src/net/tmwa/loginhandler.cpp:179
-#, fuzzy
-msgid "This user name is already taken."
-msgstr "Käyttäjänimi on jo käytössä"
+#: ../src/net/tmwa/guildhandler.cpp:316
+msgid "Unknown guild invite response."
+msgstr "Tuntematon vastaus kiltakutsuun."
 
-#: src/net/tmwa/network.cpp:145
-msgid "Empty address given to Network::connect()!"
-msgstr ""
+# TODO: is it a player or something else?
+#: ../src/net/tmwa/partyhandler.cpp:131
+#, c-format
+msgid "Unknown invite response for %s."
+msgstr "Tuntematon vastaus kutsuun pelaajalle %s."
 
-#: src/net/tmwa/network.cpp:345
-msgid "Unable to resolve host \""
-msgstr ""
+#: ../src/resources/itemdb.cpp:324 ../src/resources/itemdb.cpp:425
+msgid "Unknown item"
+msgstr "Tuntematon esine"
 
-#: src/net/tmwa/network.cpp:414
+#: ../src/localplayer.cpp:902
 #, fuzzy
-msgid "Connection to server terminated. "
-msgstr "Yhdistetään kartta palvelimelle"
+msgid "Unknown problem picking up item."
+msgstr "Esineen ottaminen epäonnistui."
 
-#: src/net/tmwa/partyhandler.cpp:82
-msgid "Could not create party."
-msgstr ""
+#: ../src/gui/charselectdialog.cpp:145 ../src/gui/unregisterdialog.cpp:47
+#: ../src/gui/unregisterdialog.cpp:55
+msgid "Unregister"
+msgstr "Poista palvelimelta"
 
-#: src/net/tmwa/partyhandler.cpp:84
-msgid "Party successfully created."
-msgstr ""
+# TODO: Unregister?! That's not English.
+#: ../src/client.cpp:955
+msgid "Unregister Successful"
+msgstr "Tietojen poisto onnistui"
 
-#: src/net/tmwa/partyhandler.cpp:119
-#, c-format
-msgid "%s is already a member of a party."
-msgstr ""
+#: ../src/net/tmwa/loginhandler.cpp:156
+msgid "Unregistered ID."
+msgstr "Rekisteröimätön tunniste."
 
-#: src/net/tmwa/partyhandler.cpp:123
-#, c-format
-msgid "%s refused your invitation."
-msgstr ""
+#: ../src/gui/skilldialog.cpp:228
+msgid "Up"
+msgstr "Ylös"
 
-#: src/net/tmwa/partyhandler.cpp:127
-#, c-format
-msgid "%s is now a member of your party."
-msgstr ""
+#: ../src/gui/updatewindow.cpp:124
+msgid "Updating..."
+msgstr "Päivitetään..."
 
-#: src/net/tmwa/partyhandler.cpp:131
-#, c-format
-msgid "Unknown invite response for %s."
-msgstr ""
+#: ../src/gui/inventorywindow.cpp:93
+msgid "Use"
+msgstr "Käytä"
 
-#: src/net/tmwa/partyhandler.cpp:236
-msgid "You have left the party."
-msgstr ""
+#: ../src/net/tmwa/guildhandler.cpp:306
+msgid "User is now part of your guild."
+msgstr "Käyttäjä liittyi kiltaasi."
 
-#: src/net/tmwa/partyhandler.cpp:246
-#, c-format
-msgid "%s has left your party."
-msgstr ""
+#: ../src/net/tmwa/guildhandler.cpp:301
+msgid "User rejected guild invite."
+msgstr "Käyttäjä ei ottanut kiltakutsua vastaan."
 
-#: src/net/tmwa/partyhandler.cpp:299
-#, c-format
-msgid "An unknown member tried to say: %s"
-msgstr ""
+#: ../src/net/manaserv/loginhandler.cpp:306
+msgid "Username already exists."
+msgstr "Käyttäjätunnus on jo käytössä."
 
-#: src/net/tmwa/partyhandler.cpp:335
-#, c-format
-msgid "Inviting failed, because you can't see a player called %s."
-msgstr ""
+#: ../src/net/tmwa/loginhandler.cpp:188
+#, fuzzy
+msgid "Username permanently erased."
+msgstr "Käyttäjätunnus on jo käytössä."
 
-#: src/net/tmwa/partyhandler.cpp:340
-msgid "You can only inivte when you are in a party!"
-msgstr ""
+#: ../src/gui/setup_video.cpp:244
+msgid "Video"
+msgstr "Kuva"
 
-#: src/net/tmwa/partyhandler.cpp:368
-#, c-format
-msgid "%s is not in your party!"
-msgstr ""
+#: ../src/gui/setup_video.cpp:215
+msgid "Visible names"
+msgstr "Näytä nimet"
 
-#: src/net/tmwa/playerhandler.cpp:100
-msgid "Insert coin to continue."
-msgstr "Syötä kolikko jatkaaksesi."
+#: ../src/net/manaserv/attributes.cpp:205
+#: ../src/net/tmwa/generalhandler.cpp:232
+msgid "Vitality"
+msgstr "Elinvoima"
 
-#: src/net/tmwa/playerhandler.cpp:118
-msgid "You're not dead yet. You're just resting."
-msgstr "Sinä et ole kuollut vielä. olet vain lepäämässä."
+#: ../src/net/manaserv/attributes.cpp:212
+#, fuzzy, c-format
+msgid "Vitality %+.1f"
+msgstr "Elinvoima %+d"
 
-#: src/net/tmwa/playerhandler.cpp:119
-msgid "You are no more."
-msgstr "Sinä et ole enään."
+#: ../src/net/tmwa/generalhandler.cpp:104
+#, c-format
+msgid "Vitality %+d"
+msgstr "Elinvoima %+d"
 
-#: src/net/tmwa/playerhandler.cpp:120
-msgid "You have ceased to be."
-msgstr ""
+#: ../src/net/tmwa/charserverhandler.cpp:272
+msgid "Vitality:"
+msgstr "Elinvoima:"
 
-#: src/net/tmwa/playerhandler.cpp:121
-msgid "You've expired and gone to meet your maker."
-msgstr ""
+#: ../src/gui/npcdialog.cpp:48
+msgid "Waiting for server"
+msgstr "Odotetaan palvelinta"
 
-#: src/net/tmwa/playerhandler.cpp:122
-msgid "You're a stiff."
-msgstr ""
+#: ../src/gui/serverdialog.cpp:447
+msgid "Waiting for server..."
+msgstr "Odotan palvelinta..."
 
-#: src/net/tmwa/playerhandler.cpp:123
-msgid "Bereft of life, you rest in peace."
-msgstr ""
+#: ../src/net/tmwa/specialhandler.cpp:208
+msgid "Warp failed..."
+msgstr "Siirtymä (warp) epäonnistui..."
 
-#: src/net/tmwa/playerhandler.cpp:124
-msgid "If you weren't so animated, you'd be pushing up the daisies."
-msgstr ""
+#: ../src/net/manaserv/beinghandler.cpp:284
+#: ../src/net/tmwa/playerhandler.cpp:96
+msgid "We regret to inform you that your character was killed in battle."
+msgstr "Ikävä kyllä joudumme kertomaan hahmosi kuolleen taistelussa."
 
-#: src/net/tmwa/playerhandler.cpp:125
-msgid "Your metabolic processes are now history."
-msgstr ""
+#: ../src/keyboardconfig.cpp:82
+msgid "Wear Outfit"
+msgstr "Pue asu"
 
-#: src/net/tmwa/playerhandler.cpp:126
-msgid "You're off the twig."
-msgstr ""
+#: ../src/gui/inventorywindow.cpp:111
+msgid "Weight:"
+msgstr "Paino:"
 
-#: src/net/tmwa/playerhandler.cpp:127
-msgid "You've kicked the bucket."
-msgstr ""
+#: ../src/gui/itempopup.cpp:174
+#, c-format
+msgid "Weight: %s"
+msgstr "Paino: %s"
 
-#: src/net/tmwa/playerhandler.cpp:128
-msgid ""
-"You've shuffled off your mortal coil, run down the curtain and joined the "
-"bleedin' choir invisibile."
-msgstr ""
+#: ../src/gui/setup_players.cpp:262
+msgid "When ignoring:"
+msgstr "Kun jätät huomiotta:"
 
-#: src/net/tmwa/playerhandler.cpp:130
-msgid "You are an ex-player."
+#: ../src/gui/popupmenu.cpp:91
+#, c-format
+msgid "Whisper %s"
+msgstr "Kuiskaa pelaajalle %s"
+
+#: ../src/net/tmwa/chathandler.cpp:87
+#, c-format
+msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:131
-msgid "You're pining for the fjords."
+#: ../src/net/tmwa/chathandler.cpp:96
+#, c-format
+msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:246 src/net/tmwa/playerhandler.cpp:285
-msgid "Message"
-msgstr "Viesti"
+#: ../src/gui/chat.cpp:494
+#, c-format
+msgid "Whispering to %s: %s"
+msgstr "Kuiskaat pelaajalle %s: %s"
 
-#: src/net/tmwa/playerhandler.cpp:247
-msgid ""
-"You are carrying more than half your weight. You are unable to regain health."
-msgstr "Painat yli puolet painostasi. Et voi saavuttaa terveyttä enää."
+#: ../src/gui/socialwindow.cpp:154
+#, c-format
+msgid "Who would you like to invite to guild %s?"
+msgstr "Kenet haluaisit kutsua kiltaan %s?"
 
-#: src/net/tmwa/playerhandler.cpp:313
+#: ../src/gui/socialwindow.cpp:233
 #, c-format
-msgid "You picked up %s."
-msgstr ""
+msgid "Who would you like to invite to party %s?"
+msgstr "Kenet haluaisit kutsua ryhmään %s?"
 
-#: src/net/tmwa/playerhandler.cpp:348
-msgid "Cannot raise skill!"
-msgstr ""
+#: ../src/net/manaserv/attributes.cpp:231
+msgid "Willpower"
+msgstr "Tahdonvoima"
 
-#: src/net/tmwa/playerhandler.cpp:488
-msgid "Equip arrows first."
-msgstr ""
+#: ../src/net/manaserv/attributes.cpp:238
+#, fuzzy, c-format
+msgid "Willpower %+.1f"
+msgstr "Tahdonvoima %+d"
 
-#: src/net/tmwa/specialhandler.cpp:144
-msgid "Trade failed!"
-msgstr "Kauppa epäonnistui!"
+#: ../src/net/manaserv/loginhandler.cpp:87
+msgid "Wrong magic_token."
+msgstr "Väärä taikalipuke (magic_token)."
 
-#: src/net/tmwa/specialhandler.cpp:147
-msgid "Emote failed!"
-msgstr ""
+#: ../src/net/tmwa/loginhandler.cpp:159
+msgid "Wrong password."
+msgstr "Väärä salasana."
 
-#: src/net/tmwa/specialhandler.cpp:150
-msgid "Sit failed!"
-msgstr "Istuminen epäonnistui!"
+#: ../src/net/manaserv/loginhandler.cpp:266
+msgid "Wrong username or password."
+msgstr "Väärä käyttäjätunnus tai salasana."
 
-#: src/net/tmwa/specialhandler.cpp:153
-msgid "Chat creating failed!"
-msgstr ""
+#: ../src/net/manaserv/loginhandler.cpp:303
+msgid "Wrong username, password or email address."
+msgstr "Väärä käyttäjätunnus, salasana tai sähköpostiosoite."
 
-#: src/net/tmwa/specialhandler.cpp:156
-msgid "Could not join party!"
-msgstr ""
+#: ../src/gui/confirmdialog.cpp:42
+msgid "Yes"
+msgstr "Kyllä"
 
-#: src/net/tmwa/specialhandler.cpp:159
-msgid "Cannot shout!"
-msgstr ""
+#: ../src/net/manaserv/beinghandler.cpp:304
+msgid "You Died"
+msgstr "Kuolit"
 
-#: src/net/tmwa/specialhandler.cpp:168
-msgid "You have not yet reached a high enough lvl!"
-msgstr ""
+#: ../src/net/tmwa/playerhandler.cpp:131
+msgid "You are an ex-player."
+msgstr "Olet entinen pelaaja."
 
-#: src/net/tmwa/specialhandler.cpp:171
-msgid "Insufficient HP!"
-msgstr ""
+# Screamshot: original: "Painat yli puolet painostasi. Et voi saavuttaa terveyttä enää." o.O
+#: ../src/net/tmwa/playerhandler.cpp:254
+msgid ""
+"You are carrying more than half your weight. You are unable to regain health."
+msgstr "Kannat roinaa yli puolen elopainoasi. Rasitus estää sinua paranemasta."
 
-#: src/net/tmwa/specialhandler.cpp:174
-msgid "Insufficient SP!"
-msgstr ""
+#: ../src/net/manaserv/beinghandler.cpp:283
+#: ../src/net/tmwa/playerhandler.cpp:95
+msgid "You are dead."
+msgstr "Olet kuollut."
 
-#: src/net/tmwa/specialhandler.cpp:177
-msgid "You have no memos!"
-msgstr ""
+#: ../src/net/tmwa/playerhandler.cpp:120
+msgid "You are no more."
+msgstr "Olet lakannut olemasta."
 
-#: src/net/tmwa/specialhandler.cpp:180
-msgid "You cannot do that right now!"
-msgstr "Et voi tehdä sitä juuri nyt!"
+#: ../src/net/manaserv/beinghandler.cpp:286
+#: ../src/net/tmwa/playerhandler.cpp:98
+msgid "You are not that alive anymore."
+msgstr "Et ole enää erityisen elossa."
 
-#: src/net/tmwa/specialhandler.cpp:183
-msgid "Seems you need more money... ;-)"
-msgstr "Näyttää siltä että tarvitset lisää rahaa."
+# TODO: typo in msgid: inivte
+#: ../src/net/tmwa/partyhandler.cpp:340
+msgid "You can only inivte when you are in a party!"
+msgstr "Voit kutsua ryhmään vain kun olet siinä itse!"
+
+#: ../src/net/tmwa/specialhandler.cpp:181
+msgid "You cannot do that right now!"
+msgstr "Et voi tehdä tätä juuri nyt."
 
-#: src/net/tmwa/specialhandler.cpp:186
+#: ../src/net/tmwa/specialhandler.cpp:187
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Et voi käyttää tätä taitoa tuollaisen aseen kanssa."
 
-#: src/net/tmwa/specialhandler.cpp:189
-msgid "You need another red gem!"
-msgstr "Tarvitset toisen punaisen helmen."
+#: ../src/gui/trade.cpp:304
+msgid "You don't have enough money."
+msgstr "Sinulla ei ole tarpeeksi rahaa."
 
-#: src/net/tmwa/specialhandler.cpp:192
-msgid "You need another blue gem!"
-msgstr "Tarvitset toisen sinisen helmen."
+#: ../src/gui/trade.cpp:98 ../src/gui/trade.cpp:134
+#, c-format
+msgid "You get %s"
+msgstr "Saat %s"
 
-#: src/net/tmwa/specialhandler.cpp:195
-msgid "You're carrying to much to do this!"
-msgstr ""
+#: ../src/gui/trade.cpp:99
+msgid "You give:"
+msgstr "Annat:"
 
-#: src/net/tmwa/specialhandler.cpp:198
-msgid "Huh? What's that?"
-msgstr ""
+#: ../src/gui/socialwindow.cpp:588
+#, c-format
+msgid "You have been invited to join the %s party."
+msgstr "Sinut on kutsuttu liittymään ryhmään %s."
 
-#: src/net/tmwa/specialhandler.cpp:207
-msgid "Warp failed..."
+#: ../src/gui/socialwindow.cpp:584
+msgid "You have been invited you to join a party."
+msgstr "Sinut on kutsuttu liittymään ryhmään."
+
+#: ../src/net/tmwa/loginhandler.cpp:168
+msgid ""
+"You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
+"Pääsysi peliin on pysyvästi estetty. Ole hyvä ja ota yhteyttä GM-tiimiin."
 
-#: src/net/tmwa/specialhandler.cpp:210
-msgid "Could not steal anything..."
+#: ../src/net/tmwa/loginhandler.cpp:175
+#, c-format
+msgid ""
+"You have been temporarily banned from the game until %s.\n"
+"Please contact the GM team via the forums."
 msgstr ""
+"Pääsysi peliin on väliaikaisesti estetty %s asti.\n"
+"Ole hyvä ja ota yhteyttä GM-tiimiin keskustelufoorumin kautta."
 
-#: src/net/tmwa/specialhandler.cpp:213
-msgid "Poison had no effect..."
-msgstr "Myrkyllä ei ollut vaikutusta..."
+# NOTE: below: various Monty Pythonesque references, translated quite liberally.
+#: ../src/net/tmwa/playerhandler.cpp:121
+msgid "You have ceased to be."
+msgstr "Olet kuollut kuin päivänkakkaraa pukkaava ex-papukaija."
 
-#: src/net/tmwa/tradehandler.cpp:126
-msgid "Trading isn't possible. Trade partner is too far away."
-msgstr "Kaupankäynti ei ole mahdollista. kauppa kumppani on liian kaukana."
+#: ../src/net/tmwa/partyhandler.cpp:236
+msgid "You have left the party."
+msgstr "Erosit ryhmästä."
 
-#: src/net/tmwa/tradehandler.cpp:130
-msgid "Trading isn't possible. Character doesn't exist."
-msgstr "Kaupankäynti ei ole mahdollista. Hahmoa ei ole."
+#: ../src/net/tmwa/specialhandler.cpp:178
+msgid "You have no memos!"
+msgstr "Sinulla ei ole muistioita (memo)."
 
-#: src/net/tmwa/tradehandler.cpp:134
-msgid "Trade cancelled due to an unknown reason."
-msgstr "Kauppa keskeytyi tuntemattomasta syystä."
+#: ../src/net/tmwa/specialhandler.cpp:169
+msgid "You have not yet reached a high enough lvl!"
+msgstr "Et ole vielä riittävän korkealla tasolla!"
 
-#: src/net/tmwa/tradehandler.cpp:139
-#, c-format
-msgid "Trade: You and %s"
+#: ../src/gui/setup_audio.cpp:94
+msgid "You may have to restart your client if you want to download new music"
 msgstr ""
+"Voit joutua uudelleenkäynnistämään asiakasohjelmasi, jos haluat ladata uudet "
+"musiikit"
 
-#: src/net/tmwa/tradehandler.cpp:146
-#, c-format
-msgid "Trade with %s cancelled."
-msgstr ""
+#: ../src/gui/setup_video.cpp:470 ../src/gui/setup_video.cpp:478
+msgid "You must restart to apply changes."
+msgstr "Käynnistä ohjelma uudelleen, jotta muutos astuu voimaan."
 
-#: src/net/tmwa/tradehandler.cpp:154
-msgid "Unhandled trade cancel packet."
-msgstr ""
+#: ../src/net/tmwa/specialhandler.cpp:193
+msgid "You need another blue gem!"
+msgstr "Tarvitset toisen sinisen helmen."
 
-#: src/net/tmwa/tradehandler.cpp:202
-msgid "Failed adding item. Trade partner is over weighted."
-msgstr ""
+#: ../src/net/tmwa/specialhandler.cpp:190
+msgid "You need another red gem!"
+msgstr "Tarvitset toisen punaisen helmen."
 
-#: src/net/tmwa/tradehandler.cpp:207
-msgid "Failed adding item. Trade partner has no free slot."
+#: ../src/gui/login.cpp:129
+msgid "You need to use the website to register an account for this server."
 msgstr ""
+"Joudut käyttämään palvelimen websivuja rekisteröidäksesi uuden tilin tälle "
+"palvelimelle."
 
-#: src/net/tmwa/tradehandler.cpp:211
-msgid "Failed adding item for unknown reason."
-msgstr ""
+# TODO: No it can't, really - where are you going to fit the plural indicator here? Hot damn this is tough to formulate grammatically sensibly.
+#: ../src/localplayer.cpp:920
+#, c-format
+msgid "You picked up %d [@@%d|%s@@]."
+msgid_plural "You picked up %d [@@%d|%s@@]."
+msgstr[0] "[@@%2$d|%3$s@@] (%1$d kpl) otettu."
+msgstr[1] "[@@%2$d|%3$s@@] (%1$d kpl) otettu."
 
-#: src/playerrelations.cpp:310
-#, fuzzy
-msgid "Completely ignore"
-msgstr "Valmis"
+#: ../src/net/tmwa/playerhandler.cpp:327
+#, c-format
+msgid "You picked up %s."
+msgstr "%s noukittu."
 
-#: src/playerrelations.cpp:324
-msgid "Print '...'"
-msgstr ""
+# Leisure Suit Larry reference. 
+#: ../src/net/manaserv/beinghandler.cpp:298
+#: ../src/net/tmwa/playerhandler.cpp:116
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr "Peballeen meni taas, vedä raatosi vessasta alas ja hanki uusi."
 
-#: src/playerrelations.cpp:340
-msgid "Blink name"
+#: ../src/net/manaserv/loginhandler.cpp:312
+msgid "You took too long with the captcha or your response was incorrect."
 msgstr ""
+"Käytit captcha-testin käsittelyyn liian paljon aikaa tai vastauksesi oli "
+"väärin."
 
-#: src/resources/itemdb.cpp:44
-#, c-format
-msgid "Attack %+d"
-msgstr "Hyökkäys %+d"
+#: ../src/net/tmwa/playerhandler.cpp:123
+msgid "You're a stiff."
+msgstr "Raato mikä raato."
 
-#: src/resources/itemdb.cpp:45
-#, c-format
-msgid "Defense %+d"
-msgstr "Puolustus %+d"
+#: ../src/net/tmwa/specialhandler.cpp:196
+msgid "You're carrying to much to do this!"
+msgstr "Kannat liian paljon tehdäksesi tällaista!"
 
-#: src/resources/itemdb.cpp:46
-#, c-format
-msgid "HP %+d"
-msgstr "Iskupisteet %+d"
+#: ../src/net/tmwa/playerhandler.cpp:119
+msgid "You're not dead yet. You're just resting."
+msgstr "Et ole kuollut vielä, lepäät vain."
 
-#: src/resources/itemdb.cpp:47
-#, c-format
-msgid "MP %+d"
-msgstr "Taikapisteet %+d"
+# Note: very liberal translation.
+#: ../src/net/tmwa/playerhandler.cpp:127
+msgid "You're off the twig."
+msgstr "Olet lopultakin nakkisuojassa."
 
-#: src/resources/itemdb.cpp:92
-msgid "Unknown item"
-msgstr ""
+#: ../src/net/tmwa/playerhandler.cpp:132
+msgid "You're pining for the fjords."
+msgstr "Kaipaat kotivuonoille."
 
-#: src/resources/itemdb.cpp:135 src/resources/monsterdb.cpp:77
-msgid "unnamed"
+#: ../src/net/tmwa/playerhandler.cpp:122
+msgid "You've expired and gone to meet your maker."
+msgstr "Olet lähtenyt moikkaamaan luojaasi."
+
+#: ../src/net/tmwa/playerhandler.cpp:128
+msgid "You've kicked the bucket."
+msgstr "Potkaisit tyhjää."
+
+#: ../src/net/tmwa/playerhandler.cpp:129
+msgid ""
+"You've shuffled off your mortal coil, run down the curtain and joined the "
+"bleedin' choir invisibile."
 msgstr ""
+"Olet heittänyt henkesi, poistunut keskuudestamme ja loikannut Tuonelan "
+"jokeen."
 
-#~ msgid "Text Shadow"
-#~ msgstr "Tekstin varjo"
+#: ../src/net/tmwa/guildhandler.cpp:311
+msgid "Your guild is full."
+msgstr "Kiltasi on täynnä."
 
-#~ msgid "Background"
-#~ msgstr "Tausta"
+#: ../src/net/tmwa/playerhandler.cpp:126
+msgid "Your metabolic processes are now history."
+msgstr "Aineenvaihduntaprosessisi ovat historiaa."
 
-#~ msgid "Highlight"
-#~ msgstr "Korostus"
+#: ../src/gui/charcreatedialog.cpp:184
+msgid "Your name needs to be at least 4 characters."
+msgstr "Nimessäsi täytyy olla ainakin 4 merkkiä."
 
-#, fuzzy
-#~ msgid "Item Too Expensive"
-#~ msgstr "Esine on liian kallis"
+#: ../src/net/manaserv/beinghandler.cpp:291
+#: ../src/net/tmwa/playerhandler.cpp:104
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+"Ovela suunnitelmasi rikkoa vastustajiesi aseet iskemällä ne omaan kurkkuusi "
+"epäonnistui."
 
-#~ msgid "Player"
-#~ msgstr "Pelaaja"
+#: ../src/main.cpp:43
+msgid "[mana-file] : The mana file is an XML file (.mana)"
+msgstr ""
 
-#~ msgid "Server"
-#~ msgstr "Palvelin:"
+#: ../src/gui/setup_video.cpp:225
+msgid "as particle"
+msgstr "leijuvana"
 
-#~ msgid "Hyperlink"
-#~ msgstr "Hyperlinkki"
+#: ../src/gui/setup_video.cpp:174 ../src/gui/setup_video.cpp:188
+msgid "high"
+msgstr "korkea"
 
-#~ msgid "Other Players' Names"
-#~ msgstr "Muiden pelaajien nimet"
+#: ../src/gui/setup_video.cpp:223
+msgid "in chat"
+msgstr "keskusteluikkunassa"
 
-#~ msgid "Own Name"
-#~ msgstr "Oma nimi"
+#: ../src/gui/setup_video.cpp:173 ../src/gui/setup_video.cpp:186
+msgid "low"
+msgstr "matala"
 
-#~ msgid "GM Names"
-#~ msgstr "T"
+#: ../src/main.cpp:42
+msgid "mana [options] [mana-file]"
+msgstr "mana [parametrit] [mana-tiedosto]"
 
-#~ msgid "NPCs"
-#~ msgstr "NPCt"
+#: ../src/gui/setup_video.cpp:189
+msgid "max"
+msgstr "maksimi"
 
-#~ msgid "Monsters"
-#~ msgstr "Hirviöt"
+#: ../src/gui/setup_video.cpp:187
+msgid "medium"
+msgstr "keskitaso"
 
-#~ msgid "Unknown Item Type"
-#~ msgstr "Tuntematon esine tyyppi"
+#: ../src/gui/setup_video.cpp:172
+msgid "off"
+msgstr "pois päältä"
 
-#~ msgid "Hats"
-#~ msgstr "Hatut"
+#: ../src/gui/serverdialog.cpp:550
+msgid "requires a newer version"
+msgstr "vaatii uudemman version"
 
-#~ msgid "Shirts"
-#~ msgstr "Paidat"
+#: ../src/gui/serverdialog.cpp:552
+#, c-format
+msgid "requires v%s"
+msgstr "vaatii version %s"
 
-#~ msgid "Pants"
-#~ msgstr "Housut"
+#: ../src/resources/beinginfo.cpp:32 ../src/resources/itemdb.cpp:260
+#: ../src/resources/monsterdb.cpp:77
+msgid "unnamed"
+msgstr "nimetön"
 
-#~ msgid "Shoes"
-#~ msgstr "Kengät"
+#~ msgid "  -L --localdata-dir  : Directory to use as local data directory"
+#~ msgstr "  -L --localdata-dir  : Hakemisto paikallisdatan tallennukseen"
 
-#~ msgid "Shields"
-#~ msgstr "Kilvet"
+#~ msgid " video mode: "
+#~ msgstr " video tila: "
 
-#~ msgid "Rings"
-#~ msgstr "Sormukset"
+#~ msgid "@@attack|Attack %s@@"
+#~ msgstr "@@attack|Hyökkää %s kimppuun@@"
 
-#~ msgid "Necklaces"
-#~ msgstr "Kaulanauhat"
+#~ msgid "@@cancel|Cancel@@"
+#~ msgstr "@@cancel|Peruuta@@"
 
-#~ msgid "Ammo"
-#~ msgstr "Panokset"
+#~ msgid "@@drop|Drop@@"
+#~ msgstr "@@drop|Pudota maahan@@"
 
-#, fuzzy
-#~ msgid "Money"
-#~ msgstr "Rahatilanne: %d"
+#~ msgid "@@split|Split@@"
+#~ msgstr "@@split|Pinon jako@@"
 
-#, fuzzy
-#~ msgid "Level"
-#~ msgstr "Taso: %d"
+#~ msgid "@@store|Store@@"
+#~ msgstr "@@store|Kauppa@@"
+
+#~ msgid "@@use|Equip@@"
+#~ msgstr "@@use|Ota varuste käyttöön@@"
+
+#~ msgid "@@use|Use@@"
+#~ msgstr "@@use|Käytä@@"
+
+#~ msgid "Accepted guild invite from %s."
+#~ msgstr "Otit vastaan kiltakutsun pelaajalta %s."
 
 #, fuzzy
 #~ msgid "Access denied."
 #~ msgstr "Pääsy evätty"
 
-#, fuzzy
-#~ msgid "Unknown failure to select character."
-#~ msgstr "Hahmon poisto epäonnistui"
+#~ msgid "Ammo"
+#~ msgstr "Panokset"
 
-#~ msgid "Willpower:"
-#~ msgstr "Tahdonvoima:"
+#~ msgid "Axe"
+#~ msgstr "Kirves"
 
-#, fuzzy
-#~ msgid "Willpower"
-#~ msgstr "Tahdonvoima:"
+#~ msgid "Background"
+#~ msgstr "Tausta"
 
-#~ msgid "no"
-#~ msgstr "ei"
+#~ msgid "Bow"
+#~ msgstr "Jousi"
 
 #~ msgid "Buddy"
 #~ msgstr "Kaveri"
@@ -3617,14 +3816,72 @@ msgstr ""
 #~ msgid "Buddy List"
 #~ msgstr "Kaverilista"
 
+#~ msgid "Connecting to account server..."
+#~ msgstr "Yhdistetään tunnus palvelimelle"
+
+#~ msgid "Connecting to character server..."
+#~ msgstr "Yhdistetään hahmo palvelimelle"
+
+#~ msgid "Cost"
+#~ msgstr "Hinta"
+
+#~ msgid "Couldn't set "
+#~ msgstr "Ei voitu asettaa "
+
 #~ msgid "Description: %s"
 #~ msgstr "Kuvaus: %s"
 
 #~ msgid "Effect: %s"
 #~ msgstr "Vaikutus: %s"
 
-#~ msgid "Previous"
-#~ msgstr "Edellinen"
+#~ msgid "Exp"
+#~ msgstr "Kok"
+
+#~ msgid "Floating '...' bubble"
+#~ msgstr "Leijuva '...' -puhekupla"
+
+#~ msgid "Floating bubble"
+#~ msgstr "Leijuva puhekupla"
+
+#~ msgid "Guilds"
+#~ msgstr "Kiltatoiminta"
+
+#~ msgid "HP"
+#~ msgstr "VP"
+
+#~ msgid "Hats"
+#~ msgstr "Hatut"
+
+#~ msgid "Highlight"
+#~ msgstr "Korostus"
+
+#~ msgid "Hyperlink"
+#~ msgstr "Hyperlinkki"
+
+#, fuzzy
+#~ msgid "Item Too Expensive"
+#~ msgstr "Esine on liian kallis"
+
+#~ msgid "Job"
+#~ msgstr "Työ"
+
+#~ msgid "Knife"
+#~ msgstr "Puukko"
+
+#~ msgid "Level"
+#~ msgstr "Taso"
+
+#~ msgid "MP"
+#~ msgstr "MP"
+
+#~ msgid "Magic"
+#~ msgstr "Taika"
+
+#~ msgid "Money"
+#~ msgstr "Rahaa"
+
+#~ msgid "Necklaces"
+#~ msgstr "Kaulanauhat"
 
 #~ msgid "New"
 #~ msgstr "Uusi"
@@ -3632,77 +3889,82 @@ msgstr ""
 #~ msgid "Ok"
 #~ msgstr "Ok"
 
-#~ msgid "Magic"
-#~ msgstr "Taika"
+#~ msgid "One stat is zero."
+#~ msgstr "Yksi hahmon kykyarvoista on nolla."
 
-#~ msgid "@@attack|Attack %s@@"
-#~ msgstr "@@attack|Hyökkää %s kimppuun@@"
+#~ msgid "Pants"
+#~ msgstr "Housut"
 
-#~ msgid "@@cancel|Cancel@@"
-#~ msgstr "@@cancel|Peruuta@@"
+#~ msgid "Player"
+#~ msgstr "Pelaaja"
 
-#~ msgid "@@use|Equip@@"
-#~ msgstr "@@use|Ota varuste käyttöön@@"
+#~ msgid "Previous"
+#~ msgstr "Edellinen"
 
-#~ msgid "@@use|Use@@"
-#~ msgstr "@@use|Käytä@@"
+#~ msgid "Rejected guild invite from %s."
+#~ msgstr "Kieltäydyit pelaajan %s kiltakutsusta."
 
-#~ msgid "@@drop|Drop@@"
-#~ msgstr "@@drop|Pudota maahan@@"
+#~ msgid "Rings"
+#~ msgstr "Sormukset"
 
-#~ msgid "@@split|Split@@"
-#~ msgstr "@@split|Pinon jako@@"
+#~ msgid "Scroll laziness"
+#~ msgstr "Kameran perässälaahauksen tiukkuus"
 
-#~ msgid "@@store|Store@@"
-#~ msgstr "@@store|Kauppa@@"
+#~ msgid "Scroll radius"
+#~ msgstr "Kameran perässälaahaus"
 
-#~ msgid "windowed"
-#~ msgstr "ikkunoitu"
+#~ msgid "Server"
+#~ msgstr "Palvelin:"
 
-#~ msgid "fullscreen"
-#~ msgstr "Kokoruututila"
+#~ msgid "Shields"
+#~ msgstr "Kilvet"
 
-#~ msgid "Weapons"
-#~ msgstr "Aseet"
+#~ msgid "Shirts"
+#~ msgstr "Paidat"
 
-#~ msgid "Cost"
-#~ msgstr "Hinta"
+#~ msgid "Shoes"
+#~ msgstr "Kengät"
 
-#~ msgid "Guilds"
-#~ msgstr "Kiltatoiminta"
+#~ msgid "Shooting"
+#~ msgstr "Ammunta"
 
-#~ msgid "Knife"
-#~ msgstr "Puukko"
+#~ msgid "Special %d"
+#~ msgstr "Erikoisuus %d"
+
+#~ msgid "Specials Set %d"
+#~ msgstr "Erikoisuusjoukko %d"
 
 #~ msgid "Sword"
 #~ msgstr "Miekka"
 
-#~ msgid "Whip"
-#~ msgstr "Ruoska"
+#~ msgid "Text Shadow"
+#~ msgstr "Tekstin varjo"
 
-#~ msgid "Bow"
-#~ msgstr "Jousi"
+#, fuzzy
+#~ msgid "Unknown failure to select character."
+#~ msgstr "Hahmon poisto epäonnistui"
 
-#~ msgid "Shooting"
-#~ msgstr "Ammunta"
+#~ msgid "Weapons"
+#~ msgstr "Aseet"
 
-#~ msgid "Axe"
-#~ msgstr "Kirves"
+#~ msgid "Whip"
+#~ msgstr "Ruoska"
 
-#~ msgid "Couldn't set "
-#~ msgstr "Ei voitu asettaa "
+#~ msgid "Whisper could not be sent, ignored by user."
+#~ msgstr "Kuiskauksen lähetys epäonnistui: pelaaja ei kuunnellut."
 
-#~ msgid " video mode: "
-#~ msgstr " video tila: "
+#~ msgid "Whisper could not be sent, user is offline."
+#~ msgstr ""
+#~ "Kuiskauksen lähetys epäonnistui: pelaaja ei ole kirjautuneena sisään."
 
-#~ msgid "Connecting to character server..."
-#~ msgstr "Yhdistetään hahmo palvelimelle"
+#~ msgid "Willpower:"
+#~ msgstr "Tahdonvoima:"
 
-#~ msgid "Connecting to account server..."
-#~ msgstr "Yhdistetään tunnus palvelimelle"
+#~ msgid "fullscreen"
+#~ msgstr "Kokoruututila"
 
-#~ msgid "Scroll radius"
-#~ msgstr "Kameran perässälaahaus"
+#~ msgid "no"
+#~ msgstr "ei"
 
-#~ msgid "Scroll laziness"
-#~ msgstr "Kameran perässälaahauksen tiukkuus"
+#~ msgid "windowed"
+#~ msgstr "ikkunoitu"
diff --git a/po/fr.po b/po/fr.po
index e298f710..4856c2f8 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -4,14 +4,12 @@
 # Guillaume Melquiond <guillaume.melquiond@gmail.com>, 2007.
 #
 #
-#, fuzzy
 msgid ""
 msgstr ""
-"#-#-#-#-#  fr.po (The Mana World 0.1.0)  #-#-#-#-#\n"
 "Project-Id-Version: The Mana World 0.1.0\n"
-"Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-12-06 19:23+0100\n"
-"PO-Revision-Date: 2010-12-29 00:51+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-04-30 16:50+0200\n"
+"PO-Revision-Date: 2011-04-10 22:43+0100\n"
 "Last-Translator: Yohann Ferreira <yohann ferreira orange fr>\n"
 "Language-Team: French <Yohann Ferreira <yohann ferreira orange efer>>\n"
 "Language: \n"
@@ -23,401 +21,427 @@ msgstr ""
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Language: French\n"
 "X-Poedit-Country: FRANCE\n"
-"#-#-#-#-#  po_fr rewiew1.po (The Mana World 0.1.0)  #-#-#-#-#\n"
-"Project-Id-Version: The Mana World 0.1.0\n"
-"Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-12-06 19:23+0100\n"
-"PO-Revision-Date: 2011-01-11 22:42+0100\n"
-"Last-Translator: Yohann Ferreira <yohann ferreira orange fr>\n"
-"Language-Team: French <Yohann Ferreira <yohann ferreira orange efer>>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Language: French\n"
 "X-Poedit-Country: FRANCE\n"
 
-#: src/client.cpp:563 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
-msgid "Setup"
-msgstr "Configuration"
+#: ../src/gui/npcdialog.cpp:208
+msgid ""
+"\n"
+"> Next\n"
+msgstr ""
+"\n"
+"> Suivant\n"
 
-#: src/client.cpp:643
-msgid "Connecting to server"
-msgstr "Connexion au serveur"
+#: ../src/main.cpp:45
+msgid "              to the mana client."
+msgstr ""
 
-#: src/client.cpp:670
-msgid "Logging in"
-msgstr "Connexion"
+#: ../src/main.cpp:44
+msgid "              used to set custom parameters"
+msgstr ""
 
-#: src/client.cpp:703
-msgid "Entering game world"
-msgstr "Connexion au monde de jeu"
+#: ../src/main.cpp:62
+#, fuzzy
+msgid "     --chat-log-dir   : Chat log dir to use"
+msgstr "  -C --config-dir : Répertoire de configuration a utiliser"
 
-#: src/client.cpp:762
-msgid "Requesting characters"
-msgstr "Téléchargement des personnnages"
+#: ../src/main.cpp:61
+#, fuzzy
+msgid "     --localdata-dir  : Directory to use as local data directory"
+msgstr "  -L --localdata-dir : Répertoire à utiliser comme répertoire local"
 
-#: src/client.cpp:791
-msgid "Connecting to the game server"
-msgstr "Connexion au serveur de jeu"
+#: ../src/main.cpp:65
+msgid "     --no-opengl      : Disable OpenGL for this session"
+msgstr "     --no-opengl : Désactive l'OpenGL pour cette session"
 
-#: src/client.cpp:801
-msgid "Changing game servers"
-msgstr "Changement de serveur de jeu"
-
-#: src/client.cpp:830 src/client.cpp:837 src/client.cpp:972
-#: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
-#: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:336 src/gui/unregisterdialog.cpp:133
-#: src/net/manaserv/charhandler.cpp:167 src/net/manaserv/charhandler.cpp:210
-#: src/net/tmwa/charserverhandler.cpp:138
-#: src/net/tmwa/charserverhandler.cpp:155
-msgid "Error"
-msgstr "Erreur"
+#: ../src/main.cpp:63
+msgid "     --screenshot-dir : Directory to store screenshots"
+msgstr ""
+"      --screenshot-dir : Répertoire à utiliser pour les impressions écrans"
 
-#: src/client.cpp:846
-msgid "Requesting registration details"
-msgstr "Demande des paramètres d'enregistrement"
+#: ../src/main.cpp:56
+msgid "     --update-host    : Use this update host"
+msgstr "     --update-host : Utilise cette URL pour les mises à jour"
 
-#: src/client.cpp:873
-msgid "Password Change"
-msgstr "Changement de mot de passe"
+#: ../src/main.cpp:50
+msgid "  -C --config-dir     : Configuration directory to use"
+msgstr "  -C --config-dir : Répertoire de configuration a utiliser"
 
-#: src/client.cpp:874
-msgid "Password changed successfully!"
-msgstr "Le mot de passe a été changé avec succès !"
+#: ../src/main.cpp:57
+msgid "  -D --default        : Choose default character server and character"
+msgstr ""
+"  -D --default : Choisir le serveur de personnages par défaut et le "
+"personnage"
 
-#: src/client.cpp:893
-msgid "Email Change"
-msgstr "Changer d'email"
+#: ../src/main.cpp:52
+msgid "  -P --password       : Login with this password"
+msgstr "  -P --password : Se connecter avec ce mot de passe"
 
-#: src/client.cpp:894
-msgid "Email changed successfully!"
-msgstr "L'adresse email a été changé avec succès !"
+#: ../src/main.cpp:51
+msgid "  -U --username       : Login with this username"
+msgstr "  -U --username : Se connecter avec ce nom d'utilisateur"
 
-#: src/client.cpp:914
-msgid "Unregister Successful"
-msgstr "Désincription réussie"
+#: ../src/main.cpp:53
+msgid "  -c --character      : Login with this character"
+msgstr "  -c --character : Se connecter avec ce nom de personnage"
 
-#: src/client.cpp:915
-msgid "Farewell, come back any time..."
-msgstr "Adieu, revenez dès que vous le souhaitez..."
+#: ../src/main.cpp:60
+msgid "  -d --data           : Directory to load game data from"
+msgstr "  -d --data : Répertoire des données du jeu à charger"
 
-#: src/client.cpp:1090 src/client.cpp:1113
+#: ../src/main.cpp:49
+msgid "  -h --help           : Display this help"
+msgstr "  -h --help : Montre cette rubrique d'aide"
+
+#: ../src/main.cpp:55
+msgid "  -p --port           : Login server port"
+msgstr "  -p --port : Port de connexion au serveur"
+
+#: ../src/main.cpp:54
+msgid "  -s --server         : Login server name or IP"
+msgstr "  -s --server : Nom du serveur (ou IP) pour la connexion"
+
+#: ../src/main.cpp:59
+msgid "  -u --skip-update    : Skip the update downloads"
+msgstr ""
+"  -u --skip-update : Ne pas effectuer le téléchargement des mises à jour"
+
+#: ../src/main.cpp:48
+msgid "  -v --version        : Display the version"
+msgstr "  -v --version : Affiche la version"
+
+#: ../src/gui/updatewindow.cpp:419
+msgid "##1  It is strongly recommended that"
+msgstr "##1 Il est fortement recommandé que"
+
+#: ../src/gui/updatewindow.cpp:417
+msgid "##1  The update process is incomplete."
+msgstr "##1 Le processus de mise à jour n'est pas achevé"
+
+#: ../src/gui/updatewindow.cpp:421
+msgid "##1  you try again later."
+msgstr "##1 Essayez à nouveau plus tard"
+
+#: ../src/net/tmwa/generalhandler.cpp:241
+#, fuzzy, no-c-format
+msgid "% Accuracy"
+msgstr "% Précision"
+
+#: ../src/net/tmwa/generalhandler.cpp:243
+#, no-c-format
+msgid "% Critical"
+msgstr "% Coup critique"
+
+#: ../src/net/tmwa/generalhandler.cpp:242
+#, no-c-format
+msgid "% Evade"
+msgstr "% Esquive"
+
+#: ../src/gui/debugwindow.cpp:61 ../src/gui/debugwindow.cpp:64
+#, c-format
+msgid "%d FPS"
+msgstr "%d FPS"
+
+#: ../src/gui/debugwindow.cpp:56
+#, c-format
+msgid "%d FPS (OpenGL)"
+msgstr "%d FPS (OpenGL)"
+
+#: ../src/client.cpp:1154 ../src/client.cpp:1182
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s n'existe pas et ne peut pas être créé ! Fin du programme."
 
-#: src/client.cpp:1232
+#: ../src/net/manaserv/chathandler.cpp:306
 #, c-format
-msgid "Invalid update host: %s"
-msgstr "Hôte de mise à jour incorrect : %s"
-
-#: src/client.cpp:1266 src/client.cpp:1272
-msgid "Error creating updates directory!"
-msgstr "Impossible de créer le dossier de mise à jour !"
+msgid "%s entered the channel."
+msgstr "%s a rejoint le canal."
 
-#: src/commandhandler.cpp:136 src/commandhandler.cpp:333
-msgid "Unknown command."
-msgstr "Commande inconnue."
+#: ../src/gui/socialwindow.cpp:601
+#, c-format
+msgid "%s has invited you to join the %s party."
+msgstr "%s vous a invité à rejoindre le groupe %s."
 
-#: src/commandhandler.cpp:165
-msgid "-- Help --"
-msgstr "-- Aide --"
+#: ../src/gui/socialwindow.cpp:558
+#, c-format
+msgid "%s has invited you to join the guild %s."
+msgstr "%s vous a invité à rejoindre la guilde %s."
 
-#: src/commandhandler.cpp:166
-msgid "/help > Display this help"
-msgstr "/help > Montre l'aide"
+#: ../src/gui/socialwindow.cpp:596
+#, c-format
+msgid "%s has invited you to join their party."
+msgstr "%s vous a invité à rejoindre son groupe."
 
-#: src/commandhandler.cpp:168
-msgid "/where > Display map name"
-msgstr "/where > Affiche le nom de la carte"
+#: ../src/net/manaserv/chathandler.cpp:337
+#, c-format
+msgid "%s has kicked %s."
+msgstr "%s a éjecté %s."
 
-#: src/commandhandler.cpp:169
-msgid "/who > Display number of online users"
-msgstr "/who > Affiche le nombre d'utilisateurs en ligne"
+#: ../src/net/tmwa/partyhandler.cpp:246
+#, c-format
+msgid "%s has left your party."
+msgstr "%s a quitté le groupe."
 
-#: src/commandhandler.cpp:170
-msgid "/me > Tell something about yourself"
-msgstr "/me > Dire quelque chose à votre propos"
+#: ../src/net/manaserv/chathandler.cpp:327
+#, c-format
+msgid "%s has set mode %s on user %s."
+msgstr "%s a activé le mode %s sur le joueur %s."
 
-#: src/commandhandler.cpp:172
-msgid "/clear > Clears this window"
-msgstr "/clear > Vide cette fenêtre"
+#: ../src/net/tmwa/partyhandler.cpp:119
+#, c-format
+msgid "%s is already a member of a party."
+msgstr "%s est déjà membre du groupe."
 
-#: src/commandhandler.cpp:174
-msgid "/msg > Send a private message to a user"
-msgstr "/msg > Envoie un message privé à un utilisateur"
+#: ../src/net/tmwa/partyhandler.cpp:368
+#, c-format
+msgid "%s is not in your party!"
+msgstr "%s n'est pas membre de votre groupe !"
 
-#: src/commandhandler.cpp:175
-msgid "/whisper > Alias of msg"
-msgstr "/whisper > Alias de msg"
+#: ../src/net/tmwa/partyhandler.cpp:127
+#, c-format
+msgid "%s is now a member of your party."
+msgstr "%s est maintenant membre de votre groupe."
 
-#: src/commandhandler.cpp:176
-msgid "/w > Alias of msg"
-msgstr "/w > Alias de msg"
+#: ../src/net/manaserv/partyhandler.cpp:105
+#, c-format
+msgid "%s joined the party."
+msgstr "%s a rejoint le groupe."
 
-#: src/commandhandler.cpp:177
-msgid "/query > Makes a tab for private messages with another user"
-msgstr ""
-"/query > Crée un nouvel onglet pour vos messages privés avec un autre "
-"utilisateur"
+#: ../src/net/manaserv/chathandler.cpp:311
+#, c-format
+msgid "%s left the channel."
+msgstr "%s a quitté le canal"
 
-#: src/commandhandler.cpp:179
-msgid "/q > Alias of query"
-msgstr "/q > Alias de query"
+#: ../src/net/tmwa/partyhandler.cpp:123
+#, c-format
+msgid "%s refused your invitation."
+msgstr "%s a refusé votre invitation."
 
-#: src/commandhandler.cpp:181
-msgid "/away > Tell the other whispering players you're away from keyboard."
-msgstr ""
-"/away > Indique aux autres joueurs que vous n'êtes actuellement pas actif."
+#: ../src/net/manaserv/partyhandler.cpp:123
+#, c-format
+msgid "%s rejected your invite."
+msgstr "%s a décliné votre invitation."
 
-#: src/commandhandler.cpp:184
-msgid "/ignore > ignore a player"
-msgstr "/ignore > Ignore un joueur"
+#: ../src/net/manaserv/tradehandler.cpp:116
+#: ../src/net/tmwa/tradehandler.cpp:110
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr "%s souhaite réaliser un échange avec vous. Acceptez-vous ?"
 
-#: src/commandhandler.cpp:185
-msgid "/unignore > stop ignoring a player"
-msgstr "/unignore > Cesse d'ignorer un joueur"
+#: ../src/gui/widgets/chattab.cpp:153
+#, c-format
+msgid "%s whispers: %s"
+msgstr "Message privé de %s : %s"
 
-#: src/commandhandler.cpp:187
-msgid "/list > Display all public channels"
-msgstr "/list > Affiche une liste de tous les salons publics"
+#: ../src/gui/charselectdialog.cpp:418 ../src/gui/charselectdialog.cpp:419
+msgid "(empty)"
+msgstr "(vide)"
 
-#: src/commandhandler.cpp:188
-msgid "/join > Join or create a channel"
-msgstr "/join > Rejoindre ou créer un salon."
+#: ../src/commandhandler.cpp:221
+msgid "*** only available to a GM ***"
+msgstr "*** uniquement disponible pour les GM ***"
 
-#: src/commandhandler.cpp:190
-msgid "/createparty > Create a new party"
-msgstr "/createparty > Créer un nouveau groupe"
+#: ../src/gui/buy.cpp:74 ../src/gui/itemamount.cpp:112
+#: ../src/gui/npcdialog.cpp:124 ../src/gui/sell.cpp:74
+#: ../src/gui/statuswindow.cpp:464
+msgid "+"
+msgstr "+"
 
-#: src/commandhandler.cpp:191
-msgid "/party > Invite a user to party"
-msgstr "/party > Invite un utilisateur dans un groupe"
+#: ../src/gui/buy.cpp:77 ../src/gui/itemamount.cpp:111
+#: ../src/gui/npcdialog.cpp:125 ../src/gui/sell.cpp:75
+#: ../src/gui/statuswindow.cpp:476
+msgid "-"
+msgstr "-"
 
-#: src/commandhandler.cpp:193
-msgid "/record > Start recording the chat to an external file"
-msgstr ""
-"/record > Commence à enregistrer la conversation dans un fichier externe"
+#: ../src/commandhandler.cpp:165
+msgid "-- Help --"
+msgstr "-- Aide --"
 
-#: src/commandhandler.cpp:195
-msgid "/toggle > Determine whether <return> toggles the chat log"
-msgstr ""
-"/toggle > Détermine si la touche <entrée> bascule l'historique du tchat"
+#: ../src/commandhandler.cpp:200
+msgid "/announce > Global announcement (GM only)"
+msgstr "/announce > Annonce globale (GM uniquement)"
 
-#: src/commandhandler.cpp:197
-msgid "/present > Get list of players present (sent to chat log, if logging)"
+#: ../src/commandhandler.cpp:181
+msgid "/away > Tell the other whispering players you're away from keyboard."
 msgstr ""
-"/present > Obtiens la liste des joueurs présents (envoyée dans l'historique "
-"du tchat s'il a été activé)"
+"/away > Indiquer aux autres joueurs que vous n'êtes actuellement pas actif."
 
-#: src/commandhandler.cpp:200
-msgid "/announce > Global announcement (GM only)"
-msgstr "/announce > Annonce globale (MJ uniquement)"
+#: ../src/commandhandler.cpp:172
+msgid "/clear > Clears this window"
+msgstr "/clear > Vider cette fenêtre"
 
-#: src/commandhandler.cpp:204
-msgid "For more information, type /help <command>."
-msgstr "Pour plus d'informations, taper /help <command>"
+#: ../src/gui/widgets/whispertab.cpp:74
+msgid "/close > Close the whisper tab"
+msgstr "/close > Fermer l'onglet de conversation privée"
 
-#: src/commandhandler.cpp:208
-msgid "Command: /help"
-msgstr "Commande : /help"
+#: ../src/commandhandler.cpp:190
+msgid "/createparty > Create a new party"
+msgstr "/createparty > Créer un nouveau groupe"
 
-#: src/commandhandler.cpp:209
-msgid "This command displays a list of all commands available."
-msgstr "Cette commande affiche une liste de toutes les commandes disponibles."
+#: ../src/net/tmwa/gui/partytab.cpp:64
+msgid "/exp > Show/change party experience sharing options"
+msgstr "/exp > Afficher / Modifier les préférences d'expérience du groupe"
 
-#: src/commandhandler.cpp:211
-msgid "Command: /help <command>"
-msgstr "Commande : /help <commande>"
+#: ../src/commandhandler.cpp:166
+msgid "/help > Display this help"
+msgstr "/help > Montre l'aide"
 
-#: src/commandhandler.cpp:212
-msgid "This command displays help on <command>."
-msgstr "Cette commande affiche une aide sur la commande <command>."
+#: ../src/net/tmwa/gui/guildtab.cpp:61 ../src/net/tmwa/gui/partytab.cpp:59
+msgid "/help > Display this help."
+msgstr "/help > Afficher cette aide."
 
-#: src/commandhandler.cpp:220
-msgid "Command: /announce <msg>"
-msgstr "Commande : /announce <msg>"
+#: ../src/gui/widgets/whispertab.cpp:72
+msgid "/ignore > Ignore the other player"
+msgstr "/ignore > Ignorer l'autre joueur"
 
-#: src/commandhandler.cpp:221
-msgid "*** only available to a GM ***"
-msgstr "*** uniquement disponible pour les MJ ***"
+#: ../src/commandhandler.cpp:184
+msgid "/ignore > ignore a player"
+msgstr "/ignore > Ignore un joueur"
 
-#: src/commandhandler.cpp:222
-msgid "This command sends the message <msg> to all players currently online."
-msgstr "Cette commande envoie le message <msg> à tous les joueurs en ligne."
+#: ../src/net/tmwa/gui/guildtab.cpp:62
+msgid "/invite > Invite a player to your guild"
+msgstr "/invite > Inviter un joueur à rejoindre votre guilde"
 
-#: src/commandhandler.cpp:227
-msgid "Command: /clear"
-msgstr "Commande : /clear"
+#: ../src/net/tmwa/gui/partytab.cpp:60
+msgid "/invite > Invite a player to your party"
+msgstr "/invite > Inviter un joueur à rejoindre votre groupe"
 
-#: src/commandhandler.cpp:228
-msgid "This command clears the chat log of previous chat."
+#: ../src/net/tmwa/gui/partytab.cpp:63
+msgid "/item > Show/change party item sharing options"
 msgstr ""
-"Cette commande vide l'historique de conversation de la conversation "
-"précédente."
+"/item > Afficher / Modifier les préférences d'échange d'objet du groupe"
 
-#: src/commandhandler.cpp:232
-msgid "Command: /ignore <player>"
-msgstr "Commande : /ignore <joueur>"
+#: ../src/commandhandler.cpp:188
+msgid "/join > Join or create a channel"
+msgstr "/join > Rejoindre ou créer un salon."
 
-#: src/commandhandler.cpp:233
-msgid "This command ignores the given player regardless of current relations."
-msgstr "Cette commande ignore le joueur qu'il soit indiqué comme ami ou non."
+#: ../src/gui/widgets/channeltab.cpp:53
+msgid "/kick > Kick a user from the channel"
+msgstr "/kick > Sortir un utilisateur du salon"
 
-#: src/commandhandler.cpp:238
-msgid "Command: /join <channel>"
-msgstr "Commande : /join <channel>"
+#: ../src/net/tmwa/gui/guildtab.cpp:64
+msgid "/kick > Kick some one from the guild you are in"
+msgstr "/kick > Ejecter quelqu'un du groupe dont vous faites partie"
 
-#: src/commandhandler.cpp:239
-msgid "This command makes you enter <channel>."
-msgstr "Cette commande vous fait rentrer dans le salon <channel>."
+#: ../src/net/tmwa/gui/partytab.cpp:62
+msgid "/kick > Kick some one from the party you are in"
+msgstr "/kick > Sortir quelqu'un du groupe dont vous faites partie"
 
-#: src/commandhandler.cpp:240
-msgid "If <channel> doesn't exist, it's created."
-msgstr "Si <channel> n'existe pas, il sera créé."
+#: ../src/net/tmwa/gui/guildtab.cpp:63
+msgid "/leave > Leave the guild you are in"
+msgstr "/leave > Quitter la guilde à laquelle vous appartenez"
 
-#: src/commandhandler.cpp:244
-msgid "Command: /list"
-msgstr "Commande : /list"
+#: ../src/net/tmwa/gui/partytab.cpp:61
+msgid "/leave > Leave the party you are in"
+msgstr "/leave > Quitter le groupe dans lequel vous vous trouvez"
 
-#: src/commandhandler.cpp:245
-msgid "This command shows a list of all channels."
-msgstr "Cette commande affiche une liste de tous les salons publics."
+#: ../src/commandhandler.cpp:187
+msgid "/list > Display all public channels"
+msgstr "/list > Afficher une liste de tous les salons publics"
 
-#: src/commandhandler.cpp:249
-msgid "Command: /me <message>"
-msgstr "Commande : /me <message>"
+#: ../src/commandhandler.cpp:170
+msgid "/me > Tell something about yourself"
+msgstr "/me > Dire quelque chose à votre propos"
 
-#: src/commandhandler.cpp:250
-msgid "This command tell others you are (doing) <msg>."
-msgstr "Cette commande informe les autres joueurs que vous faites <msg>."
+#: ../src/commandhandler.cpp:174
+msgid "/msg > Send a private message to a user"
+msgstr "/msg > Envoyer un message privé à un utilisateur"
 
-#: src/commandhandler.cpp:254
-msgid "Command: /msg <nick> <message>"
-msgstr "Commande : /msg <nick> <message>"
+#: ../src/gui/widgets/channeltab.cpp:52
+msgid "/op > Make a user a channel operator"
+msgstr "/op > Faire de l'utilisateur un opérateur du salon"
 
-#: src/commandhandler.cpp:255
-msgid "Command: /whisper <nick> <message>"
-msgstr "Commande : /whisper <nick> <message>"
+#: ../src/commandhandler.cpp:191
+msgid "/party > Invite a user to party"
+msgstr "/party > Inviter un utilisateur dans un groupe"
 
-#: src/commandhandler.cpp:256
-msgid "Command: /w <nick> <message>"
-msgstr "Commande : /w <nick> <message>"
+#: ../src/commandhandler.cpp:197
+msgid "/present > Get list of players present (sent to chat log, if logging)"
+msgstr ""
+"/present > Obtenir la liste des joueurs présents (envoyée dans l'historique "
+"du tchat s'il a été activé)"
 
-#: src/commandhandler.cpp:257
-msgid "This command sends the text <message> to <nick>."
-msgstr "Cette commande envoie le texte <message> au joueur <nick>"
+#: ../src/commandhandler.cpp:179
+msgid "/q > Alias of query"
+msgstr "/q > Alias de query"
 
-#: src/commandhandler.cpp:258 src/commandhandler.cpp:285
-#: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
-#: src/net/tmwa/gui/guildtab.cpp:75 src/net/tmwa/gui/partytab.cpp:75
-msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+#: ../src/commandhandler.cpp:177
+msgid "/query > Makes a tab for private messages with another user"
 msgstr ""
-"Si le <nick> contient des espaces, entourez le de guillemets (exemple : \"ni "
-"ck\")."
-
-#: src/commandhandler.cpp:263
-msgid "Command: /query <nick>"
-msgstr "Commande : /query <nick>"
+"/query > Crée un nouvel onglet pour vos messages privés avec un autre "
+"utilisateur"
 
-#: src/commandhandler.cpp:264
-msgid "Command: /q <nick>"
-msgstr "Commande : /q <nick>"
+#: ../src/gui/widgets/channeltab.cpp:51
+msgid "/quit > Leave a channel"
+msgstr "/quit > Quitter un salon"
 
-#: src/commandhandler.cpp:265
-msgid "This command tries to make a tab for whispers betweenyou and <nick>."
+#: ../src/commandhandler.cpp:193
+msgid "/record > Start recording the chat to an external file"
 msgstr ""
-"Cette commande essaye de créer une fenêtre de dialogue entre vous et <nick>"
-
-#: src/commandhandler.cpp:270
-msgid "Command: /away <afk reason>"
-msgstr "Commande : /away <message d'absence>"
+"/record > Commencer à enregistrer la conversation dans un fichier externe"
 
-#: src/commandhandler.cpp:271
-msgid "This command tells you're away from keyboard with the given reason."
+#: ../src/commandhandler.cpp:195
+msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr ""
-"Cette commande indique que vous n'êtes pas actif en indiquant la raison."
+"/toggle > Déterminer si la touche <entrée> basculera l'historique du tchat"
 
-#: src/commandhandler.cpp:273
-msgid "Command: /away"
-msgstr "Commande : /away"
+#: ../src/gui/widgets/channeltab.cpp:50
+msgid "/topic > Set the topic of the current channel"
+msgstr "/topic > Changer le sujet du salon"
 
-#: src/commandhandler.cpp:274
-msgid "This command clears the away status and message."
-msgstr "Cette commande retire le statut absent."
+#: ../src/gui/widgets/whispertab.cpp:73
+msgid "/unignore > Stop ignoring the other player"
+msgstr "/unignore > Cesser d'ignorer l'autre joueur"
 
-#: src/commandhandler.cpp:278
-msgid "Command: /createparty <name>"
-msgstr "Commande : /createparty <nom du groupe>"
+#: ../src/commandhandler.cpp:185
+msgid "/unignore > stop ignoring a player"
+msgstr "/unignore > Cesser d'ignorer un joueur"
 
-#: src/commandhandler.cpp:279
-msgid "This command creates a new party called <name>."
-msgstr "Cette commande crée un nouveau groupe appelé <name>"
+#: ../src/gui/widgets/channeltab.cpp:49
+msgid "/users > Lists the users in the current channel"
+msgstr "/users > Afficher la liste des utilisateurs de ce salon"
 
-#: src/commandhandler.cpp:283
-msgid "Command: /party <nick>"
-msgstr "Commande : /party <nick>"
+#: ../src/commandhandler.cpp:176
+msgid "/w > Alias of msg"
+msgstr "/w > Alias de msg"
 
-#: src/commandhandler.cpp:284 src/net/tmwa/gui/partytab.cpp:74
-msgid "This command invites <nick> to party with you."
-msgstr "Cette commande invite <nick> à rejoindre votre groupe."
+#: ../src/commandhandler.cpp:168
+msgid "/where > Display map name"
+msgstr "/where > Afficher le nom de la carte et vos coordonées de position"
 
-#: src/commandhandler.cpp:290
-msgid "Command: /present"
-msgstr "Commande : /present"
+#: ../src/commandhandler.cpp:175
+msgid "/whisper > Alias of msg"
+msgstr "/whisper > Alias de msg"
 
-#: src/commandhandler.cpp:291
-msgid ""
-"This command gets a list of players within hearing and sends it to either "
-"the record log if recording, or the chat log otherwise."
-msgstr ""
-"Cette commande récupère une liste de tous les joueurs présents et l'envoie "
-"dans le fichier d'enregistrement s'il est activé, ou dans l'enregistrement "
-"de la conversation."
+#: ../src/commandhandler.cpp:169
+msgid "/who > Display number of online users"
+msgstr "/who > Afficher le nombre d'utilisateurs en ligne"
 
-#: src/commandhandler.cpp:297
-msgid "Command: /record <filename>"
-msgstr "Commande : /record <filename>"
+#: ../src/gui/charcreatedialog.cpp:73 ../src/gui/charcreatedialog.cpp:76
+#: ../src/gui/outfitwindow.cpp:66
+msgid "<"
+msgstr "<"
 
-#: src/commandhandler.cpp:298
-msgid "This command starts recording the chat log to the file <filename>."
+#: ../src/net/tmwa/gui/partytab.cpp:97
+msgid ""
+"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
+"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
-"Cette commande active l'enregistrement de la conversation dans le fichier "
-"<filename>."
-
-#: src/commandhandler.cpp:300
-msgid "Command: /record"
-msgstr "Commande : /record"
-
-#: src/commandhandler.cpp:301
-msgid "This command finishes a recording session."
-msgstr "Cette commande termine une session d'enregistrement."
-
-#: src/commandhandler.cpp:305
-msgid "Command: /toggle <state>"
-msgstr "Command: /toggle <state>"
+"<préférences> peut être \"1\", \"yes\", \"true\" pour activer le partage "
+"d'expérience, ou \"0\", \"no\", \"false\" pour le désactiver."
 
-#: src/commandhandler.cpp:306
-#, fuzzy
+#: ../src/net/tmwa/gui/partytab.cpp:87
 msgid ""
-"This command sets whether the return key should toggle the chat log, or "
-"whether the chat log turns off automatically."
+"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
+"\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
-"#-#-#-#-#  fr.po (The Mana World 0.1.0)  #-#-#-#-#\n"
-"Cette commande définie si la touche entrée doit fermer le fichier "
-"d'enregistrement de la conversation ou si celui-ci se fermera "
-"automatiquement.\n"
-"#-#-#-#-#  po_fr rewiew1.po (The Mana World 0.1.0)  #-#-#-#-#\n"
-"Cette commande définit si la touche entrée doit fermer le fichier "
-"d'enregistrement de la conversation ou si celui-ci se fermera "
-"automatiquement."
+"<préférences> peut être \"1\", \"yes\", \"true\" pour activer l'échange "
+"d'objet, ou \"0\", \"no\", \"false\" pour le désactiver."
 
-#: src/commandhandler.cpp:308
+#: ../src/commandhandler.cpp:308
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
 "\"0\", \"no\", \"false\" to turn the toggle off."
@@ -425,3107 +449,3256 @@ msgstr ""
 "<state> peut être en position \"1\", \"yes\", \"true\" pour activer le "
 "bouton sur marche, ou \"0\", \"no\", \"false\" pour désactiver le bouton."
 
-#: src/commandhandler.cpp:311
-msgid "Command: /toggle"
-msgstr "Commande : /toggle"
+#: ../src/gui/charcreatedialog.cpp:70 ../src/gui/charcreatedialog.cpp:75
+#: ../src/gui/outfitwindow.cpp:67
+msgid ">"
+msgstr ">"
 
-#: src/commandhandler.cpp:312
-msgid "This command displays the return toggle status."
-msgstr "Cette commande vous affiche le status du toggle courant."
+#: ../src/gui/setup_players.cpp:206 ../src/gui/setup_video.cpp:147
+msgid "???"
+msgstr "???"
 
-#: src/commandhandler.cpp:316 src/gui/widgets/whispertab.cpp:94
-msgid "Command: /unignore <player>"
-msgstr "Commande : /unignore <joueur>"
+#: ../src/gui/socialwindow.cpp:563
+msgid "Accept Guild Invite"
+msgstr "Accepter l'invitation dans cette guilde"
 
-#: src/commandhandler.cpp:317
-msgid "This command stops ignoring the given player if they are being ignored"
-msgstr ""
-"Cette commande fait cesser d'ignorer le joueur donné s'il l'était "
-"précédemment."
+#: ../src/gui/socialwindow.cpp:609
+msgid "Accept Party Invite"
+msgstr "Accepter l'invitation pour ce groupe"
 
-#: src/commandhandler.cpp:322
-msgid "Command: /where"
-msgstr "Commande : /where"
+#: ../src/gui/socialwindow.cpp:463
+#, fuzzy
+msgid "Accepted guild invite"
+msgstr "Accepter l'invitation dans cette guilde"
 
-#: src/commandhandler.cpp:323
-msgid "This command displays the name of the current map."
-msgstr "Cette commande affiche le nom de la carte où vous vous trouvez."
+#: ../src/gui/socialwindow.cpp:444
+#, c-format
+msgid "Accepted party invite from %s."
+msgstr "Invitation dans le groupe acceptée de la part de %s."
 
-#: src/commandhandler.cpp:327
-msgid "Command: /who"
-msgstr "Commande : /who"
+#: ../src/game.cpp:738
+msgid "Accepting incoming trade requests"
+msgstr "Accepter les requêtes d'échanges entrantes"
 
-#: src/commandhandler.cpp:328
-msgid "This command displays the number of players currently online."
-msgstr "Cette commande affiche le nombre de joueurs actuellement connectés."
+#: ../src/net/manaserv/tradehandler.cpp:95
+msgid "Accepting incoming trade requests."
+msgstr "Accepter les demandes d'échanges."
 
-#: src/commandhandler.cpp:334
-msgid "Type /help for a list of commands."
-msgstr "Entrer /help pour obtenir une liste des commandes disponibles."
+#: ../src/net/tmwa/charserverhandler.cpp:103
+msgid "Access denied. Most likely, there are too many players on this server."
+msgstr "Accès refusé. Il y a probablement trop de joueurs sur le serveur."
 
-#: src/commandhandler.cpp:400
-msgid "Cannot send empty whispers!"
-msgstr "Vous ne pouvez pas envoyer des messages privés vides !"
+#: ../src/gui/charselectdialog.cpp:120
+msgid "Account and Character Management"
+msgstr "Gestion du compte et du personnage"
+
+#: ../src/net/manaserv/loginhandler.cpp:272
+msgid "Account banned"
+msgstr "Compte banni"
+
+#: ../src/net/manaserv/loginhandler.cpp:93
+msgid "Account banned."
+msgstr "Compte banni."
+
+#: ../src/net/tmwa/loginhandler.cpp:162
+msgid "Account expired."
+msgstr "Le compte a expiré."
 
-#: src/commandhandler.cpp:408
+#: ../src/net/manaserv/loginhandler.cpp:124
+#: ../src/net/manaserv/loginhandler.cpp:155
+msgid "Account not connected. Please login first."
+msgstr "Compte non connecté. Identifiez-vous tout d'abord."
+
+#: ../src/net/tmwa/loginhandler.cpp:86
+msgid "Account was not found. Please re-login."
+msgstr "Le compte n'a pas été trouvé. Reconnectez vous svp."
+
+#: ../src/gui/changeemaildialog.cpp:49 ../src/gui/changepassworddialog.cpp:52
 #, c-format
-msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
-"you."
-msgstr ""
-"Il ne peut être créer une fenêtre de conversation avec nick \"%s\" ! Elle "
-"existe déjà ou il s'agit de vous même."
+msgid "Account: %s"
+msgstr "Compte : %s"
 
-#: src/commandhandler.cpp:422
-#, fuzzy, c-format
-msgid "Requesting to join channel %s."
+#: ../src/gui/inventorywindow.cpp:106 ../src/gui/popupmenu.cpp:369
+msgid "Activate"
 msgstr ""
-"#-#-#-#-#  fr.po (The Mana World 0.1.0)  #-#-#-#-#\n"
-"Il vous est demandé de rejoindre le chan %s.\n"
-"#-#-#-#-#  po_fr rewiew1.po (The Mana World 0.1.0)  #-#-#-#-#\n"
-"Il vous est demandé de rejoindre le salon %s."
 
-#: src/commandhandler.cpp:435 src/net/tmwa/gui/partytab.cpp:109
-msgid "Party name is missing."
-msgstr "Indiquez un nom de groupe."
+#: ../src/gui/trade.cpp:76
+msgid "Add"
+msgstr "Ajouter"
 
-#: src/commandhandler.cpp:448 src/commandhandler.cpp:525
-#: src/commandhandler.cpp:547
-msgid "Please specify a name."
-msgstr "Veuillez indiquer un nom."
+#: ../src/gui/popupmenu.cpp:171
+msgid "Add name to chat"
+msgstr "Ajouter les noms dans le flux de conversation"
 
-#: src/commandhandler.cpp:466
-msgid "Return toggles chat."
-msgstr "La touche enter ferme maintenant la ligne d'entrée du chat."
+#: ../src/gui/popupmenu.cpp:190 ../src/gui/popupmenu.cpp:387
+msgid "Add to chat"
+msgstr "Ajouter à la conversation"
 
-#: src/commandhandler.cpp:466
-msgid "Message closes chat."
-msgstr "Ce message ferme la conversation."
+#: ../src/net/manaserv/attributes.cpp:179
+#: ../src/net/tmwa/generalhandler.cpp:231
+msgid "Agility"
+msgstr "Agilité"
 
-#: src/commandhandler.cpp:475
-msgid "Return now toggles chat."
-msgstr "La touche enter ferme la ligne d'entrée de la conversation."
+#: ../src/net/manaserv/attributes.cpp:186
+#, fuzzy, c-format
+msgid "Agility %+.1f"
+msgstr "Agilité %+d"
 
-#: src/commandhandler.cpp:479
-msgid "Message now closes chat."
-msgstr "Ce message ferme maintenant la conversation."
+#: ../src/net/tmwa/generalhandler.cpp:103
+#, c-format
+msgid "Agility %+d"
+msgstr "Agilité %+d"
 
-#: src/commandhandler.cpp:492 src/commandhandler.cpp:505
-msgid "Show IP: On"
-msgstr "Afficher l'IP : Activé"
+#: ../src/net/tmwa/charserverhandler.cpp:271
+msgid "Agility:"
+msgstr "Agilité :"
 
-#: src/commandhandler.cpp:492 src/commandhandler.cpp:501
-msgid "Show IP: Off"
-msgstr "Afficher l'IP : Désactivé"
+#: ../src/gui/trade.cpp:55
+msgid "Agree trade"
+msgstr "Accepter l'échange"
 
-#: src/commandhandler.cpp:531
-msgid "Player already ignored!"
-msgstr "Le joueur est déjà ignoré !"
+#: ../src/gui/trade.cpp:56
+msgid "Agreed. Waiting..."
+msgstr "Accepté. En attente..."
 
-#: src/commandhandler.cpp:538
-msgid "Player successfully ignored!"
-msgstr "Le joueur est désormais ignoré !"
+#: ../src/gui/itemamount.cpp:115
+msgid "All"
+msgstr "Tout"
 
-#: src/commandhandler.cpp:540
-msgid "Player could not be ignored!"
-msgstr "Le joueur n'a pas pu être ignoré !"
+#: ../src/gui/setup_players.cpp:225
+msgid "Allow trading"
+msgstr "Autoriser les échanges"
 
-#: src/commandhandler.cpp:555
-msgid "Player wasn't ignored!"
-msgstr "Le joueur n'était pas ignoré !"
+#: ../src/gui/setup_players.cpp:227
+msgid "Allow whispers"
+msgstr "Autoriser les messages privés"
 
-#: src/commandhandler.cpp:560
-msgid "Player no longer ignored!"
-msgstr "Le joueur n'est plus ignoré !"
+#: ../src/net/manaserv/loginhandler.cpp:90
+#: ../src/net/manaserv/loginhandler.cpp:269
+msgid "Already logged in."
+msgstr "Déjà connecté."
 
-#: src/commandhandler.cpp:562
-msgid "Player could not be unignored!"
-msgstr "Le joueur n'a pas pu être à nouveau écouté !"
+#: ../src/gui/recorder.cpp:96
+msgid "Already recording."
+msgstr "Enregistrement en cours."
 
-#: src/commandhandler.h:31
+#: ../src/gui/setup_video.cpp:254
+msgid "Ambient FX"
+msgstr "Effets ambiants"
+
+#: ../src/gui/debugwindow.cpp:121
 #, c-format
-msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr ""
-"Les options qui peuvent être transmises à /%s sont \"yes\", \"no\", \"true"
-"\", \"false\", \"1\", \"0\"."
+msgid "Ambient FX: %s"
+msgstr "Effets ambiants : %s"
 
-#: src/game.cpp:169
-msgid "General"
-msgstr "Général"
+#: ../src/net/tmwa/partyhandler.cpp:299
+#, c-format
+msgid "An unknown member tried to say: %s"
+msgstr "Un membre inconnu a essayé de dire : %s"
 
-#: src/game.cpp:333
-msgid "Screenshot saved as "
-msgstr "Capture d'écran sauvegardée en tant que"
+#: ../src/net/manaserv/beinghandler.cpp:296
+#: ../src/net/tmwa/playerhandler.cpp:112
+msgid "Annihilated."
+msgstr "Vaporisé."
 
-#: src/game.cpp:338
-msgid "Saving screenshot failed!"
-msgstr "Impossible de sauvegarder la capture d'écran !"
+#: ../src/gui/setup.cpp:51
+msgid "Apply"
+msgstr "Appliquer"
 
-#: src/game.cpp:368
-msgid "The connection to the server was lost."
+#: ../src/gui/setup_video.cpp:461
+msgid "Applying change to OpenGL requires restart."
 msgstr ""
-"La connexion au serveur a été coupée, le programme va maintenant se fermer."
-
-#: src/game.cpp:372
-msgid "Network Error"
-msgstr "Erreur Réseau"
-
-#: src/game.cpp:713
-msgid "Ignoring incoming trade requests"
-msgstr "Ignorer les requêtes d'échanges entrantes"
+"Le changement OpenGL ne sera pris en compte qu'au prochain démarrage du jeu."
 
-#: src/game.cpp:720
-msgid "Accepting incoming trade requests"
-msgstr "Accepter les requêtes d'échanges entrantes"
+#: ../src/gui/setup_video.cpp:453
+msgid ""
+"Applying change to OpenGL requires restart. In case OpenGL messes up your "
+"game graphics, restart the game with the command line option \"--no-opengl\"."
+msgstr ""
+"Il est nécessaire de redémarrer le client pour appliquer les changements "
+"liés à OpenGL. Si OpenGL empêche un affichage correct, redémarrez le jeu "
+"avec l'option en ligne de commande : \"--no-opengl\"."
 
-#: src/game.cpp:950
-msgid "Could Not Load Map"
-msgstr "La carte n'a pu être chargé"
+#: ../src/gui/charselectdialog.cpp:73
+msgid "Are you sure you want to delete this character?"
+msgstr "Êtes-vous certain de vouloir supprimer ce personnage ?"
 
-#: src/game.cpp:951
+#: ../src/gui/socialwindow.cpp:164
 #, c-format
-msgid "Error while loading %s"
-msgstr "Erreur durant le chargement %s"
+msgid "Are you sure you want to leave guild %s?"
+msgstr "Êtes-vous sûr de vouloir quitter la guilde %s ?"
 
-#: src/gui/beingpopup.cpp:76
+#: ../src/gui/socialwindow.cpp:243
 #, c-format
-msgid "Party: %s"
-msgstr "Groupe : %s"
+msgid "Are you sure you want to leave party %s?"
+msgstr "Êtes-vous sûr de vouloir quitter le groupe %s ?"
 
-#: src/gui/buy.cpp:49 src/gui/buy.cpp:78 src/gui/buysell.cpp:47
-msgid "Buy"
-msgstr "Acheter"
+#: ../src/gui/setup_keyboard.cpp:86
+msgid "Assign"
+msgstr "Assigner"
 
-#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
-#: src/gui/sell.cpp:278
+#: ../src/net/manaserv/charhandler.cpp:165
 #, c-format
-msgid "Price: %s / Total: %s"
-msgstr "Prix : %s / Total : %s"
-
-#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
-#. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:102 src/gui/npcdialog.cpp:104
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:430
-msgid "+"
-msgstr "+"
+msgid "At least one statis out of the permitted range: (%u - %u)."
+msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
-#. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:101 src/gui/npcdialog.cpp:105
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:442
-msgid "-"
-msgstr "-"
+#: ../src/keyboardconfig.cpp:43 ../src/net/tmwa/generalhandler.cpp:237
+msgid "Attack"
+msgstr "Attaque"
 
-#: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:232
-#: src/keyboardconfig.cpp:103
-msgid "Quit"
-msgstr "Quitter"
+#: ../src/resources/itemdb.cpp:310
+#, c-format
+msgid "Attack %+d"
+msgstr "Attaque %+d"
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:354
-#: src/gui/statuswindow.cpp:429 src/gui/statuswindow.cpp:463
-msgid "Max"
-msgstr "Max."
+#: ../src/gui/popupmenu.cpp:87 ../src/gui/popupmenu.cpp:158
+#, c-format
+msgid "Attack %s"
+msgstr "Attaque %s"
 
-#: src/gui/buysell.cpp:38
-msgid "Shop"
-msgstr "Magasin"
+#: ../src/gui/chat.cpp:329
+msgid "Attendance written to record log."
+msgstr "Présence dans le jeu inscrite dans le fichier d'enregistrement."
 
-#: src/gui/buysell.cpp:47 src/gui/sell.cpp:49 src/gui/sell.cpp:76
-msgid "Sell"
-msgstr "Vendre"
+#: ../src/gui/setup_audio.cpp:47
+msgid "Audio"
+msgstr "Audio"
 
-#: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
-#: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
-#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:104
-#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:175
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:380
-#: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:279 src/gui/textdialog.cpp:40
-#: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
-msgid "Cancel"
-msgstr "Annuler"
+#: ../src/net/tmwa/generalhandler.cpp:132
+msgid "Authentication failed."
+msgstr "Échec de l'authentification."
 
-#: src/gui/changeemaildialog.cpp:45 src/gui/changeemaildialog.cpp:54
-msgid "Change Email Address"
-msgstr "Modifier l'adresse mail"
+#: ../src/localplayer.cpp:1030
+msgid "Away"
+msgstr "Inactif"
 
-#: src/gui/changeemaildialog.cpp:49 src/gui/changepassworddialog.cpp:52
+#: ../src/gui/popupmenu.cpp:100
 #, c-format
-msgid "Account: %s"
-msgstr "Compte : %s"
+msgid "Befriend %s"
+msgstr "Être ami avec %s"
 
-#: src/gui/changeemaildialog.cpp:51
-msgid "Type new email address twice:"
-msgstr "Entrer l'adresse email deux fois :"
+#: ../src/resources/userpalette.cpp:91
+msgid "Being"
+msgstr "Forme de vie"
 
-#: src/gui/changeemaildialog.cpp:127
-#, c-format
-msgid "The new email address needs to be at least %d characters long."
-msgstr "L'adresse email doit être longue d'au moins %d caractères."
+#: ../src/net/tmwa/playerhandler.cpp:124
+msgid "Bereft of life, you rest in peace."
+msgstr "Privé de toute essence de vie, vous reposez en paix."
 
-#: src/gui/changeemaildialog.cpp:134
-#, c-format
-msgid "The new email address needs to be less than %d characters long."
-msgstr "L'adresse email ne doit pas être plus longue que %d caractères."
+#: ../src/playerrelations.cpp:340
+msgid "Blink name"
+msgstr "Faire clignoter le nom"
 
-#: src/gui/changeemaildialog.cpp:141
-msgid "The email address entries mismatch."
-msgstr "Les deux adresses email ne correspondent pas."
+#: ../src/gui/setup_colors.cpp:139
+msgid "Blue:"
+msgstr "Bleu : "
 
-#: src/gui/changepassworddialog.cpp:47 src/gui/changepassworddialog.cpp:56
-#: src/gui/charselectdialog.cpp:128
-msgid "Change Password"
-msgstr "Changer le mot de passe"
+#: ../src/gui/setup_video.cpp:160
+msgid "Bubbles with names"
+msgstr "Bulles avec noms"
 
-#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:55
-#: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
-msgid "Password:"
-msgstr "Mot de passe :"
+#: ../src/gui/setup_video.cpp:159
+msgid "Bubbles, no names"
+msgstr "Bulles, sans noms"
 
-#: src/gui/changepassworddialog.cpp:63
-msgid "Type new password twice:"
-msgstr "Entrer le mot de passe deux fois :"
+#: ../src/gui/buy.cpp:49 ../src/gui/buy.cpp:78 ../src/gui/buysell.cpp:47
+msgid "Buy"
+msgstr "Acheter"
 
-#: src/gui/changepassworddialog.cpp:110
-msgid "Enter the old password first."
-msgstr "Entrez d'abord l'ancien mot de passe."
+#: ../src/gui/setup_joystick.cpp:38 ../src/gui/setup_joystick.cpp:76
+msgid "Calibrate"
+msgstr "Calibrer"
 
-#: src/gui/changepassworddialog.cpp:116
-#, c-format
-msgid "The new password needs to be at least %d characters long."
-msgstr "Le mot de passe doit être long d'au moins %d caractères."
+#: ../src/gui/buysell.cpp:47 ../src/gui/changeemaildialog.cpp:55
+#: ../src/gui/changepassworddialog.cpp:58 ../src/gui/charcreatedialog.cpp:79
+#: ../src/gui/connectiondialog.cpp:44 ../src/gui/itemamount.cpp:114
+#: ../src/gui/npcpostdialog.cpp:57 ../src/gui/popupmenu.cpp:175
+#: ../src/gui/popupmenu.cpp:194 ../src/gui/popupmenu.cpp:389
+#: ../src/gui/quitdialog.cpp:47 ../src/gui/register.cpp:74
+#: ../src/gui/setup.cpp:51 ../src/gui/socialwindow.cpp:275
+#: ../src/gui/textdialog.cpp:40 ../src/gui/unregisterdialog.cpp:56
+#: ../src/gui/updatewindow.cpp:144
+msgid "Cancel"
+msgstr "Annuler"
 
-#: src/gui/changepassworddialog.cpp:123
+#: ../src/commandhandler.cpp:421
 #, c-format
-msgid "The new password needs to be less than %d characters long."
-msgstr "Le mot de passe ne doit pas être plus long que %d caractères."
+msgid ""
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
+"you."
+msgstr ""
+"Il ne peut être créé une fenêtre de conversation avec nick \"%s\" ! Elle "
+"existe déjà ou il s'agit de vous même."
 
-#: src/gui/changepassworddialog.cpp:130
-#, fuzzy
-msgid "The new password entries mismatch."
+#: ../src/gui/socialwindow.cpp:620
+msgid "Cannot create party. You are already in a party"
 msgstr ""
-"#-#-#-#-#  fr.po (The Mana World 0.1.0)  #-#-#-#-#\n"
-"Les anciens mots de passe ne correspondent pas.\n"
-"#-#-#-#-#  po_fr rewiew1.po (The Mana World 0.1.0)  #-#-#-#-#\n"
-"Les nouveaux mots de passe ne correspondent pas."
+"Vous ne pouvez pas créer un groupe. Vous faites déjà partie d'un groupe."
 
-#: src/gui/charcreatedialog.cpp:53
-msgid "Create Character"
-msgstr "Création du personnage"
+#: ../src/net/tmwa/playerhandler.cpp:366
+msgid "Cannot raise skill!"
+msgstr "Ne peut pas augmenter la compétence !"
 
-#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:54
-#: src/gui/register.cpp:67
-msgid "Name:"
-msgstr "Nom :"
+#: ../src/gui/widgets/whispertab.cpp:53
+msgid "Cannot send empty chat!"
+msgstr "Impossible de créer une conversation sans mot !"
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
-#. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
-#: src/gui/outfitwindow.cpp:67
-msgid ">"
-msgstr ">"
+#: ../src/commandhandler.cpp:400
+msgid "Cannot send empty whispers!"
+msgstr ""
+"Vous ne pouvez pas envoyer des messages privés sans avoir écrit une phrase !"
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
-#. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
-#: src/gui/outfitwindow.cpp:66
-msgid "<"
-msgstr "<"
+#: ../src/net/tmwa/specialhandler.cpp:160
+msgid "Cannot shout!"
+msgstr "Vous ne pouvez pas crier !"
 
-#: src/gui/charcreatedialog.cpp:74
-msgid "Hair color:"
-msgstr "Couleur des cheveux :"
+#: ../src/net/tmwa/charserverhandler.cpp:107
+msgid "Cannot use this ID."
+msgstr "Impossible d'utiliser cette Identification."
 
-#: src/gui/charcreatedialog.cpp:77
-msgid "Hair style:"
-msgstr "Coupe de cheveux :"
+#: ../src/gui/trade.cpp:103
+msgid "Change"
+msgstr "Changer"
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:390
-#: src/gui/socialwindow.cpp:333
-msgid "Create"
-msgstr "Créer"
+#: ../src/gui/charselectdialog.cpp:154
+msgid "Change Email"
+msgstr "Modifier l'adresse email"
 
-#: src/gui/charcreatedialog.cpp:80 src/gui/register.cpp:90
-msgid "Male"
-msgstr "Masculin"
+#: ../src/gui/changeemaildialog.cpp:45 ../src/gui/changeemaildialog.cpp:54
+msgid "Change Email Address"
+msgstr "Modifier l'adresse mail"
 
-#: src/gui/charcreatedialog.cpp:81 src/gui/register.cpp:91
-msgid "Female"
-msgstr "Féminin"
+#: ../src/gui/worldselectdialog.cpp:76
+msgid "Change Login"
+msgstr "Changer de Login"
 
-#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:251
-#, c-format
-msgid "Please distribute %d points"
-msgstr "Veuillez distribuer %d points"
+#: ../src/gui/changepassworddialog.cpp:47
+#: ../src/gui/changepassworddialog.cpp:56 ../src/gui/charselectdialog.cpp:132
+msgid "Change Password"
+msgstr "Changer le mot de passe"
 
-#: src/gui/charcreatedialog.cpp:178
-msgid "Your name needs to be at least 4 characters."
-msgstr "Votre nom doit comporter un minimum de 4 caractères."
+#: ../src/gui/login.cpp:62
+msgid "Change Server"
+msgstr "Changer de Serveur"
 
-#: src/gui/charcreatedialog.cpp:242
-msgid "Character stats OK"
-msgstr "Caractéristiques du personnage Ok"
+#: ../src/gui/setup_video.cpp:607
+msgid "Changes will take effect on map change."
+msgstr "Les changements seront appliqués au prochain changement de carte."
 
-#: src/gui/charcreatedialog.cpp:256
-#, c-format
-msgid "Please remove %d points"
-msgstr "Veuillez retirer %d points"
+#: ../src/client.cpp:848
+msgid "Changing game servers"
+msgstr "Changement de serveur de jeu en cours"
 
-#: src/gui/charselectdialog.cpp:69
-msgid "Confirm Character Delete"
-msgstr "Confirmer la suppression du personnage"
+#: ../src/gui/setup_video.cpp:452
+msgid "Changing to OpenGL"
+msgstr "Passage à OpenGL"
 
-#: src/gui/charselectdialog.cpp:70
-msgid "Are you sure you want to delete this character?"
-msgstr "Êtes-vous certain de vouloir supprimer ce personnage ?"
+#: ../src/gui/widgets/channeltab.cpp:84
+msgid "Channel operators can kick and op other users from the channel."
+msgstr ""
+"Seuls les opérateurs du salon peuvent sortir des utilisateurs et donner les "
+"droit d'opérateur aux autres utilisateurs du salon."
 
-#: src/gui/charselectdialog.cpp:117
-msgid "Account and Character Management"
-msgstr "Gestion du compte et du personnage"
+#: ../src/net/tmwa/chathandler.cpp:265 ../src/net/tmwa/chathandler.cpp:271
+#: ../src/net/tmwa/chathandler.cpp:276 ../src/net/tmwa/chathandler.cpp:281
+#: ../src/net/tmwa/chathandler.cpp:286 ../src/net/tmwa/chathandler.cpp:291
+#: ../src/net/tmwa/chathandler.cpp:296 ../src/net/tmwa/chathandler.cpp:301
+msgid "Channels are not supported!"
+msgstr "Les salons ne sont pas opérationnels !"
 
-#: src/gui/charselectdialog.cpp:127
-msgid "Switch Login"
-msgstr "Changer de login"
+#: ../src/net/tmwa/charserverhandler.cpp:146
+msgid "Character deleted."
+msgstr "Personnage supprimé."
 
-#: src/gui/charselectdialog.cpp:141 src/gui/unregisterdialog.cpp:47
-#: src/gui/unregisterdialog.cpp:55
-msgid "Unregister"
-msgstr "Se désinscrire"
+#: ../src/gui/statuswindow.cpp:211 ../src/gui/statuswindow.cpp:248
+#, c-format
+msgid "Character points: %d"
+msgstr "Points de personnage : %d"
 
-#: src/gui/charselectdialog.cpp:150
-msgid "Change Email"
-msgstr "Modifier l'adresse email"
+#: ../src/gui/charcreatedialog.cpp:248
+msgid "Character stats OK"
+msgstr "Caractéristiques du personnage Ok"
 
-#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:235
-#: src/gui/setup_players.cpp:228
-msgid "Delete"
-msgstr "Supprimer"
+#: ../src/net/manaserv/charhandler.cpp:147
+msgid "Character's name already exists."
+msgstr "Ce personnage existe déjà."
 
-#: src/gui/charselectdialog.cpp:380
-msgid "Choose"
-msgstr "Choisir"
+#: ../src/net/manaserv/charhandler.cpp:159
+msgid "Character's stats are too high."
+msgstr "Les caractéristiques du personnage sont trop hautes."
 
-#: src/gui/charselectdialog.cpp:392 src/gui/charselectdialog.cpp:393
-msgid "(empty)"
-msgstr "(vide)"
+#: ../src/net/manaserv/charhandler.cpp:162
+msgid "Character's stats are too low."
+msgstr "Les caractéristiques du personnage sont trop basses."
 
-#: src/gui/chat.cpp:87
+#: ../src/gui/chat.cpp:88
 msgid "Chat"
 msgstr "Conversation"
 
-#: src/gui/chat.cpp:307
-#, c-format
-msgid "Present: %s; %d players are present."
-msgstr "Présents : %s ; %d joueurs sont présents."
+#: ../src/keyboardconfig.cpp:75
+msgid "Chat Window"
+msgstr "Fenêtre de conversation"
 
-#: src/gui/chat.cpp:325
-msgid "Attendance written to record log."
-msgstr "Présence inscrite dans le fichier d'enregistrement."
+#: ../src/net/tmwa/specialhandler.cpp:154
+msgid "Chat creating failed!"
+msgstr "Vous n'avez pas pu créer la conversation !"
 
-#: src/gui/chat.cpp:452
-#, c-format
-msgid "Whispering to %s: %s"
-msgstr "Message privé envoyé à %s : %s"
+#: ../src/gui/charselectdialog.cpp:404
+msgid "Choose"
+msgstr "Choisir"
 
-#: src/gui/confirmdialog.cpp:42
-msgid "Yes"
-msgstr "Oui"
+#: ../src/gui/worldselectdialog.cpp:77
+msgid "Choose World"
+msgstr "Choisir le monde"
 
-#: src/gui/confirmdialog.cpp:43
-msgid "No"
-msgstr "Non"
+#: ../src/gui/serverdialog.cpp:197
+msgid "Choose Your Server"
+msgstr "Choisissez le serveur"
 
-#: src/gui/debugwindow.cpp:43
-msgid "Debug"
-msgstr "Debug"
+#: ../src/gui/socialwindow.cpp:541
+msgid "Choose your guild's name."
+msgstr "Choisissez le nom de votre guilde."
 
-#: src/gui/debugwindow.cpp:56
-#, c-format
-msgid "%d FPS (OpenGL)"
-msgstr "%d FPS (OpenGL)"
+#: ../src/gui/socialwindow.cpp:626
+msgid "Choose your party's name."
+msgstr "Choisissez le nom de votre groupe."
 
-#: src/gui/debugwindow.cpp:61 src/gui/debugwindow.cpp:64
-#, c-format
-msgid "%d FPS"
-msgstr "%d FPS"
+#: ../src/gui/npcdialog.cpp:118
+msgid "Clear log"
+msgstr "Effacer le log"
 
-#: src/gui/debugwindow.cpp:65 src/gui/debugwindow.cpp:104
-#, c-format
-msgid "Music: %s"
-msgstr "Musique : %s"
+#: ../src/net/manaserv/loginhandler.cpp:239
+msgid ""
+"Client registration is not allowed. Please contact server administration."
+msgstr ""
+"L'enregistrement de comptes en utilisant le client n'est pas permis. "
+"Veuillez contacter l'administrateur du serveur."
 
-#: src/gui/debugwindow.cpp:66 src/gui/debugwindow.cpp:108
-#, c-format
-msgid "Map: %s"
-msgstr "Carte : %s"
+#: ../src/net/tmwa/loginhandler.cpp:172
+#, fuzzy
+msgid "Client too old."
+msgstr "La version de votre client est trop ancienne."
 
-#: src/gui/debugwindow.cpp:67 src/gui/debugwindow.cpp:106
-#, c-format
-msgid "Minimap: %s"
-msgstr "Plan : %s"
+#: ../src/net/manaserv/loginhandler.cpp:263
+#: ../src/net/manaserv/loginhandler.cpp:300
+msgid "Client version is too old."
+msgstr "La version de votre client est trop ancienne."
 
-#: src/gui/debugwindow.cpp:68 src/gui/debugwindow.cpp:99
-#, c-format
-msgid "Cursor: (%d, %d)"
-msgstr "Curseur : (%d, %d)"
+#: ../src/gui/help.cpp:51 ../src/gui/npcdialog.cpp:50
+msgid "Close"
+msgstr "Fermer"
 
-#: src/gui/debugwindow.cpp:69 src/gui/debugwindow.cpp:111
-#, c-format
-msgid "Particle count: %d"
-msgstr "Effets de particules : %d"
+#: ../src/gui/setup_colors.cpp:51
+msgid "Colors"
+msgstr "Couleurs"
 
-#: src/gui/debugwindow.cpp:116
-#, c-format
-msgid "Particle detail: %s"
-msgstr "Détail des particules : %s"
+#: ../src/commandhandler.cpp:220
+msgid "Command: /announce <msg>"
+msgstr "Commande : /announce <message>"
 
-#: src/gui/debugwindow.cpp:121
-#, c-format
-msgid "Ambient FX: %s"
-msgstr "Effets ambiants : %s"
+#: ../src/commandhandler.cpp:273
+msgid "Command: /away"
+msgstr "Commande : /away"
 
-#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:55
-msgid "Equipment"
-msgstr "Équipement"
+#: ../src/commandhandler.cpp:270
+msgid "Command: /away <afk reason>"
+msgstr "Commande : /away <message d'absence>"
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:87
-#: src/gui/inventorywindow.cpp:313 src/gui/popupmenu.cpp:350
-msgid "Unequip"
-msgstr "Retirer"
+#: ../src/commandhandler.cpp:227
+msgid "Command: /clear"
+msgstr "Commande : /clear"
 
-#: src/gui/help.cpp:37
-msgid "Help"
-msgstr "Aide"
+#: ../src/gui/widgets/whispertab.cpp:84
+msgid "Command: /close"
+msgstr "Commande : /close"
 
-#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:47
-msgid "Close"
-msgstr "Fermer"
+#: ../src/commandhandler.cpp:278
+msgid "Command: /createparty <name>"
+msgstr "Commande : /createparty <nom du groupe>"
 
-#: src/gui/inventorywindow.cpp:59 src/gui/windowmenu.cpp:56
-msgid "Inventory"
-msgstr "Inventaire"
+#: ../src/net/tmwa/gui/partytab.cpp:100
+msgid "Command: /exp"
+msgstr "Commande : /exp"
 
-#: src/gui/inventorywindow.cpp:59
-msgid "Storage"
-msgstr "Stockage"
+#: ../src/net/tmwa/gui/partytab.cpp:95
+msgid "Command: /exp <policy>"
+msgstr "Commande : /exp <policy>"
 
-#: src/gui/inventorywindow.cpp:80
-msgid "Slots:"
-msgstr "Cases :"
+#: ../src/commandhandler.cpp:208
+msgid "Command: /help"
+msgstr "Commande : /help"
 
-#: src/gui/inventorywindow.cpp:85 src/gui/inventorywindow.cpp:315
-#: src/gui/popupmenu.cpp:352
-msgid "Equip"
-msgstr "Équiper"
+#: ../src/commandhandler.cpp:211
+msgid "Command: /help <command>"
+msgstr "Commande : /help <commande>"
 
-#: src/gui/inventorywindow.cpp:86 src/gui/inventorywindow.cpp:319
-#: src/gui/popupmenu.cpp:355
-msgid "Use"
-msgstr "Utiliser"
+#: ../src/gui/widgets/whispertab.cpp:89
+msgid "Command: /ignore"
+msgstr "Commande : /ignore"
 
-#: src/gui/inventorywindow.cpp:99 src/gui/inventorywindow.cpp:323
-#: src/gui/popupmenu.cpp:358
-msgid "Drop..."
-msgstr "Jeter..."
+#: ../src/commandhandler.cpp:232
+msgid "Command: /ignore <player>"
+msgstr "Commande : /ignore <joueur>"
 
-#: src/gui/inventorywindow.cpp:100 src/gui/popupmenu.cpp:364
-msgid "Split"
-msgstr "Partager"
+#: ../src/net/tmwa/gui/guildtab.cpp:73 ../src/net/tmwa/gui/partytab.cpp:73
+msgid "Command: /invite <nick>"
+msgstr "Commande : /invite <nom du personnage>"
 
-#: src/gui/inventorywindow.cpp:101 src/gui/outfitwindow.cpp:51
-msgid "Outfits"
-msgstr "Tenues"
+#: ../src/net/tmwa/gui/partytab.cpp:90
+msgid "Command: /item"
+msgstr "Commande : /item"
 
-#: src/gui/inventorywindow.cpp:103
-msgid "Weight:"
-msgstr "Poids :"
+#: ../src/net/tmwa/gui/partytab.cpp:85
+msgid "Command: /item <policy>"
+msgstr "Commande : /item <policy>"
 
-#: src/gui/inventorywindow.cpp:120 src/gui/popupmenu.cpp:369
-msgid "Store"
-msgstr "Entreposer"
+#: ../src/commandhandler.cpp:238
+msgid "Command: /join <channel>"
+msgstr "Commande : /join <channel>"
 
-#: src/gui/inventorywindow.cpp:121 src/gui/popupmenu.cpp:376
-msgid "Retrieve"
-msgstr "Récupérer"
+#: ../src/gui/widgets/channeltab.cpp:89
+msgid "Command: /kick <nick>"
+msgstr "Commande : /kick <nom du personnage>"
 
-#: src/gui/inventorywindow.cpp:325 src/gui/popupmenu.cpp:360
-msgid "Drop"
-msgstr "Jeter"
+#: ../src/net/tmwa/gui/guildtab.cpp:80 ../src/net/tmwa/gui/partytab.cpp:80
+msgid "Command: /leave"
+msgstr "Commande : /leave"
 
-#: src/gui/itemamount.cpp:103 src/gui/okdialog.cpp:42
-#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:71
-#: src/gui/trade.cpp:73
-msgid "OK"
-msgstr "Ok"
+#: ../src/commandhandler.cpp:244
+msgid "Command: /list"
+msgstr "Commande : /list"
 
-#: src/gui/itemamount.cpp:105
-msgid "All"
-msgstr "Tout"
+#: ../src/commandhandler.cpp:249
+msgid "Command: /me <message>"
+msgstr "Commande : /me <message>"
 
-#: src/gui/itemamount.cpp:131
-msgid "Select amount of items to trade."
-msgstr "Choisissez le nombre d'objets à troquer."
+#: ../src/commandhandler.cpp:254
+msgid "Command: /msg <nick> <message>"
+msgstr "Commande : /msg <nom du personnage> <message>"
 
-#: src/gui/itemamount.cpp:134
-msgid "Select amount of items to drop."
-msgstr "Choisissez le nombre d'objets à jeter."
+#: ../src/gui/widgets/channeltab.cpp:80
+msgid "Command: /op <nick>"
+msgstr "Commande : /op <nom du personnage>"
 
-#: src/gui/itemamount.cpp:137
-msgid "Select amount of items to store."
-msgstr "Sélectionnez le nombre d'objets à stocker."
+#: ../src/commandhandler.cpp:283
+msgid "Command: /party <nick>"
+msgstr "Commande : /party <nom du personnage>"
 
-#: src/gui/itemamount.cpp:140
-msgid "Select amount of items to retrieve."
-msgstr "Sélectionnez le nombre d'objet à reprendre"
+#: ../src/commandhandler.cpp:290
+msgid "Command: /present"
+msgstr "Commande : /present"
 
-#: src/gui/itemamount.cpp:143
-msgid "Select amount of items to split."
-msgstr "Choisissez le nombre d'objets à déplacer."
+#: ../src/commandhandler.cpp:264
+msgid "Command: /q <nick>"
+msgstr "Commande : /q <nom du personnage>"
 
-#: src/gui/itempopup.cpp:126
-#, c-format
-msgid "Weight: %s"
-msgstr "Poids : %s"
+#: ../src/commandhandler.cpp:263
+msgid "Command: /query <nick>"
+msgstr "Commande : /query <nom du personnage>"
 
-#: src/gui/login.cpp:51 src/gui/login.cpp:63
-msgid "Login"
-msgstr "Connexion"
+#: ../src/gui/widgets/channeltab.cpp:73
+msgid "Command: /quit"
+msgstr "Commande : /quit"
 
-#: src/gui/login.cpp:60
-msgid "Remember username"
-msgstr "Se souvenir du nom d'utilisateur"
+#: ../src/commandhandler.cpp:300
+msgid "Command: /record"
+msgstr "Commande : /record"
 
-#: src/gui/login.cpp:61 src/gui/register.cpp:58 src/gui/register.cpp:73
-msgid "Register"
-msgstr "S'inscrire"
+#: ../src/commandhandler.cpp:297
+msgid "Command: /record <filename>"
+msgstr "Commande : /record <nom du fichier>"
 
-#: src/gui/login.cpp:62
-msgid "Change Server"
-msgstr "Changer de Serveur"
+#: ../src/commandhandler.cpp:311
+msgid "Command: /toggle"
+msgstr "Commande : /toggle"
 
-#: src/gui/login.cpp:129
-msgid "Registration disabled"
-msgstr "Enregistrement désactivé"
+#: ../src/commandhandler.cpp:305
+msgid "Command: /toggle <state>"
+msgstr "Command: /toggle <état>"
 
-#: src/gui/login.cpp:129
-msgid "You need to use the website to register an account for this server."
-msgstr ""
-"Veuillez enregistrer votre compte sur la page du site prévue à cet effet."
+#: ../src/gui/widgets/channeltab.cpp:68
+msgid "Command: /topic <message>"
+msgstr "Commande: /topic <message>"
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
-msgid "Map"
-msgstr "Plan"
+#: ../src/commandhandler.cpp:316 ../src/gui/widgets/whispertab.cpp:95
+msgid "Command: /unignore <player>"
+msgstr "Commande : /unignore <joueur>"
 
-#: src/gui/ministatus.cpp:157
-msgid "Need"
-msgstr "Restant"
+#: ../src/gui/widgets/channeltab.cpp:63
+msgid "Command: /users"
+msgstr "Commande : /users"
 
-#: src/gui/npcdialog.cpp:45
-msgid "Waiting for server"
-msgstr "Attente du serveur"
+#: ../src/commandhandler.cpp:256
+msgid "Command: /w <nick> <message>"
+msgstr "Commande : /w <nom du personnage> <message>"
 
-#: src/gui/npcdialog.cpp:46
-msgid "Next"
-msgstr "Suivant"
+#: ../src/commandhandler.cpp:322
+msgid "Command: /where"
+msgstr "Commande : /where"
 
-#: src/gui/npcdialog.cpp:48
-msgid "Submit"
-msgstr "Soumettre"
+#: ../src/commandhandler.cpp:255
+msgid "Command: /whisper <nick> <message>"
+msgstr "Commande : /whisper <nom du personnage> <message>"
 
-#: src/gui/npcdialog.cpp:53 src/gui/npcpostdialog.cpp:41
-msgid "NPC"
-msgstr "PNJ"
+#: ../src/commandhandler.cpp:327
+msgid "Command: /who"
+msgstr "Commande : /who"
 
-#: src/gui/npcdialog.cpp:98
-msgid "Clear log"
-msgstr "Effacer le log"
+#: ../src/gui/updatewindow.cpp:515
+msgid "Completed"
+msgstr "Terminé"
 
-#: src/gui/npcdialog.cpp:114
-msgid "Reset"
-msgstr "Réinitialiser"
+#: ../src/playerrelations.cpp:310
+msgid "Completely ignore"
+msgstr "Ignorer complètement"
 
-#. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:183
-msgid ""
-"\n"
-"> Next\n"
-msgstr ""
-"\n"
-"> Suivant\n"
+#: ../src/gui/popupmenu.cpp:117
+#, c-format
+msgid "Completely ignore %s"
+msgstr "Ignorer complètement %s"
 
-#: src/gui/npcpostdialog.cpp:47
-msgid "To:"
-msgstr "A :"
+#: ../src/gui/charselectdialog.cpp:72
+msgid "Confirm Character Delete"
+msgstr "Confirmer la suppression du personnage"
 
-#: src/gui/npcpostdialog.cpp:54
-msgid "Send"
-msgstr "Envoyer"
+#: ../src/gui/register.cpp:69
+msgid "Confirm:"
+msgstr "Vérification :"
 
-#: src/gui/npcpostdialog.cpp:96
-msgid "Failed to send as sender or letter invalid."
-msgstr "Echec de l'envoi comme émetteur ou caractère invalide."
+#: ../src/gui/trade.cpp:54
+msgid "Confirmed. Waiting..."
+msgstr "Confirmé. En attente..."
 
-#: src/gui/outfitwindow.cpp:68 src/gui/outfitwindow.cpp:141
-#: src/gui/outfitwindow.cpp:154
+#: ../src/keyboardconfig.cpp:183
 #, c-format
-msgid "Outfit: %d"
-msgstr "Tenue : %d"
+msgid ""
+"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
+"strange behaviour."
+msgstr ""
+"Conflit entre les touches \"%s\" and \"%s\". Veuillez changer au moins l'une "
+"des touches ou attendez-vous à un possible comportement étrange du jeu."
 
-#: src/gui/outfitwindow.cpp:70
-msgid "Unequip first"
-msgstr "Retirer d'abord l'équipement"
+#: ../src/gui/serverdialog.cpp:229
+msgid "Connect"
+msgstr "Connexion..."
 
-#: src/gui/popupmenu.cpp:83
-#, c-format
-msgid "Trade with %s..."
-msgstr "Troquer avec %s..."
+#: ../src/client.cpp:661
+msgid "Connecting to server"
+msgstr "Connexion au serveur"
 
-#: src/gui/popupmenu.cpp:87 src/gui/popupmenu.cpp:158
-#, c-format
-msgid "Attack %s"
-msgstr "Attaquer %s"
+#: ../src/client.cpp:838
+msgid "Connecting to the game server"
+msgstr "Connexion au serveur de jeu"
 
-#: src/gui/popupmenu.cpp:91
-#, c-format
-msgid "Whisper %s"
-msgstr "Chuchoter à %s"
+#: ../src/gui/updatewindow.cpp:142
+msgid "Connecting..."
+msgstr "Connexion..."
 
-#: src/gui/popupmenu.cpp:100
-#, c-format
-msgid "Befriend %s"
-msgstr "Être ami avec %s"
+#: ../src/net/tmwa/network.cpp:414
+msgid "Connection to server terminated. "
+msgstr "Connexion au serveur terminée."
 
-#: src/gui/popupmenu.cpp:105
-#, c-format
-msgid "Disregard %s"
-msgstr "Ignorer %s"
+#: ../src/keyboardconfig.cpp:83
+msgid "Copy Outfit"
+msgstr "Copier la tenue"
 
-#: src/gui/popupmenu.cpp:108
+#: ../src/gui/statuswindow.cpp:256
 #, c-format
-msgid "Ignore %s"
-msgstr "Ignorer %s"
+msgid "Correction points: %d"
+msgstr "Points de correction : %d"
 
-#: src/gui/popupmenu.cpp:114 src/gui/popupmenu.cpp:123
-#, c-format
-msgid "Unignore %s"
-msgstr "Cesser d'ignorer %s"
+#: ../src/game.cpp:966
+msgid "Could Not Load Map"
+msgstr "La carte n'a pu être chargé"
 
-#: src/gui/popupmenu.cpp:117
-#, c-format
-msgid "Completely ignore %s"
-msgstr "Ignorer complètement %s"
+#: ../src/net/tmwa/partyhandler.cpp:82
+msgid "Could not create party."
+msgstr "Le groupe n'a pu être créé."
 
-#: src/gui/popupmenu.cpp:130
-#, c-format
-msgid "Invite %s to join your guild"
-msgstr "Inviter %s à rejoindre votre guilde"
+#: ../src/net/tmwa/guildhandler.cpp:296
+msgid "Could not inivte user to guild."
+msgstr "Vous n'avez pas pu inviter le joueur dans la guilde. "
 
-#: src/gui/popupmenu.cpp:134
-#, c-format
-msgid "Invite %s to join your party"
-msgstr "Inviter %s à se joindre votre groupe"
+#: ../src/net/tmwa/specialhandler.cpp:157
+msgid "Could not join party!"
+msgstr "Vous n'avez pas pu rejoindre le groupe !"
 
-#: src/gui/popupmenu.cpp:141
-msgid "Kick player"
-msgstr "Ejecter un joueur"
+#: ../src/net/tmwa/specialhandler.cpp:211
+msgid "Could not steal anything..."
+msgstr "Vous n'avez rien pu voler..."
 
-#: src/gui/popupmenu.cpp:150
-#, c-format
-msgid "Talk to %s"
-msgstr "Parler à %s"
+#: ../src/gui/charcreatedialog.cpp:78 ../src/gui/charselectdialog.cpp:416
+#: ../src/gui/socialwindow.cpp:330
+msgid "Create"
+msgstr "Créer"
 
-#: src/gui/popupmenu.cpp:163
-msgid "Kick monster"
-msgstr "Ejecter un monstre"
+#: ../src/gui/charcreatedialog.cpp:53
+msgid "Create Character"
+msgstr "Créer votre personnage"
 
-#: src/gui/popupmenu.cpp:171
-msgid "Add name to chat"
-msgstr "Ajouter les noms dans le flux de conversation"
+#: ../src/gui/socialwindow.cpp:272
+msgid "Create Guild"
+msgstr "Créer une Guilde"
 
-#: src/gui/popupmenu.cpp:188
+#: ../src/gui/socialwindow.cpp:273 ../src/gui/socialwindow.cpp:619
+msgid "Create Party"
+msgstr "Créer un groupe"
+
+#: ../src/gui/socialwindow.cpp:503
 #, c-format
-msgid "Pick up %s"
-msgstr "Ramasser %s"
+msgid "Creating guild called %s."
+msgstr "La guilde %s a été créée."
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:378
-msgid "Add to chat"
-msgstr "Ajouter à la conversation"
+#: ../src/gui/socialwindow.cpp:496
+msgid "Creating guild failed, please choose a shorter name."
+msgstr "La création de la guilde a échoué, veuillez choisir un nom plus court."
 
-#: src/gui/quitdialog.cpp:44
-msgid "Switch server"
-msgstr "Changer de serveur"
+#: ../src/gui/socialwindow.cpp:526
+#, c-format
+msgid "Creating party called %s."
+msgstr "Le groupe %s a été créé."
 
-#: src/gui/quitdialog.cpp:45
-msgid "Switch character"
-msgstr "Changer de personnage"
+#: ../src/gui/socialwindow.cpp:519
+msgid "Creating party failed, please choose a shorter name."
+msgstr "La création du groupe a échoué, veuillez choisir un nom plus court."
 
-#: src/gui/recorder.cpp:87
-msgid "Finishing recording."
-msgstr "Fin de l'engistrement."
+#: ../src/resources/userpalette.cpp:105
+msgid "Critical Hit"
+msgstr "Coup critique"
 
-#: src/gui/recorder.cpp:91
-msgid "Not currently recording."
-msgstr "Pas d'enregistrement en cours."
+#: ../src/gui/debugwindow.cpp:68 ../src/gui/debugwindow.cpp:99
+#, c-format
+msgid "Cursor: (%d, %d)"
+msgstr "Curseur : (%d, %d)"
 
-#: src/gui/recorder.cpp:96
-msgid "Already recording."
-msgstr "Enregistrement en cours."
+#: ../src/gui/serverdialog.cpp:230
+msgid "Custom Server"
+msgstr "Personnaliserun serveur"
 
-#: src/gui/recorder.cpp:104
-msgid "Starting to record..."
-msgstr "Début de l'enregistrement..."
+#: ../src/gui/setup_video.cpp:213
+msgid "Custom cursor"
+msgstr "Personnaliser le curseur"
 
-#: src/gui/recorder.cpp:112
-msgid "Failed to start recording."
-msgstr "Impossible de démarrer l'enregistrement."
+#: ../src/gui/setup_video.cpp:460
+msgid "Deactivating OpenGL"
+msgstr "Désactiver OpenGL"
 
-#: src/gui/recorder.h:38
-msgid "Recording..."
-msgstr "En cours d'enregistrement..."
+#: ../src/gui/debugwindow.cpp:43
+msgid "Debug"
+msgstr "Informations"
 
-#: src/gui/recorder.h:39
-msgid "Stop recording"
-msgstr "Arrêter l'enregistrement"
+#: ../src/keyboardconfig.cpp:78
+msgid "Debug Window"
+msgstr "Fenêtre d'informations"
 
-#: src/gui/register.cpp:69
-msgid "Confirm:"
-msgstr "Vérification :"
+#: ../src/gui/setup_keyboard.cpp:94
+msgid "Default"
+msgstr "Par défaut"
 
-#: src/gui/register.cpp:100
-msgid "Email:"
-msgstr "Email :"
+#: ../src/net/tmwa/generalhandler.cpp:238
+msgid "Defense"
+msgstr "Défense"
 
-#: src/gui/register.cpp:166
+#: ../src/resources/itemdb.cpp:311
 #, c-format
-msgid "The username needs to be at least %d characters long."
-msgstr "Le nom d'utilisateur doit faire au moins %d caractères."
+msgid "Defense %+d"
+msgstr "Défense %+d"
 
-#: src/gui/register.cpp:174
-#, c-format
-msgid "The username needs to be less than %d characters long."
-msgstr "Le nom d'utilisateur doit faire moins de %d caractères."
+#: ../src/gui/setup_colors.cpp:94
+msgid "Delay:"
+msgstr "Délai : "
 
-#: src/gui/register.cpp:182 src/gui/unregisterdialog.cpp:117
-#, c-format
-msgid "The password needs to be at least %d characters long."
-msgstr "Le mot de passe doit faire au moins %d caractères."
+#: ../src/gui/charselectdialog.cpp:360 ../src/gui/serverdialog.cpp:231
+#: ../src/gui/setup_players.cpp:229
+msgid "Delete"
+msgstr "Supprimer"
 
-#: src/gui/register.cpp:190 src/gui/unregisterdialog.cpp:124
-#, c-format
-msgid "The password needs to be less than %d characters long."
-msgstr "Le mot de passe doit faire moins de %d caractères."
+#: ../src/net/manaserv/attributes.cpp:192
+#: ../src/net/tmwa/generalhandler.cpp:234
+msgid "Dexterity"
+msgstr "Dextérité"
 
-#: src/gui/register.cpp:197
-msgid "Passwords do not match."
-msgstr "Les deux mots de passe sont différents"
+#: ../src/net/manaserv/attributes.cpp:199
+#, fuzzy, c-format
+msgid "Dexterity %+.1f"
+msgstr "Dextérité %+d"
 
-#: src/gui/serverdialog.cpp:196
-msgid "Choose Your Server"
-msgstr "Choisissez le serveur"
+#: ../src/net/tmwa/generalhandler.cpp:106
+#, c-format
+msgid "Dexterity %+d"
+msgstr "Dextérité %+d"
 
-#: src/gui/serverdialog.cpp:208 src/gui/widgets/chattab.cpp:141
-msgid "Server:"
-msgstr "Serveur :"
+#: ../src/net/tmwa/charserverhandler.cpp:274
+msgid "Dexterity:"
+msgstr "Dextérité :"
 
-#: src/gui/serverdialog.cpp:209
-msgid "Port:"
-msgstr "Port :"
+#: ../src/gui/setup_video.cpp:241
+msgid "Disable transparency (Low CPU mode)"
+msgstr "Désactiver la transparence (Faible usage du CPU)"
 
-#: src/gui/serverdialog.cpp:211
-msgid "Server type:"
-msgstr "Type de Serveur :"
+#: ../src/gui/popupmenu.cpp:105
+#, c-format
+msgid "Disregard %s"
+msgstr "Négliger %s"
 
-#: src/gui/serverdialog.cpp:233
-msgid "Connect"
-msgstr "Connexion..."
+#: ../src/gui/setup_players.cpp:66
+msgid "Disregarded"
+msgstr "Négligé"
 
-#: src/gui/serverdialog.cpp:234
-msgid "Custom Server"
-msgstr "Serveur personnalisé"
+#: ../src/net/manaserv/beinghandler.cpp:294
+#: ../src/net/tmwa/playerhandler.cpp:108
+msgid "Do you want your possessions identified?"
+msgstr ""
+"Voulez-vous que vos biens soient identifiés et envoyés à votre famille ?"
 
-#: src/gui/serverdialog.cpp:337
-msgid "Please type both the address and the port of a server."
-msgstr "Veuillez entrer l'adresse et le port du serveur."
+#: ../src/gui/setup_audio.cpp:43
+msgid "Download music"
+msgstr "Télécharger la musique"
 
-#: src/gui/serverdialog.cpp:442
+#: ../src/gui/serverdialog.cpp:441
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Téléchargement de la liste des serveurs...%2.2f%%"
 
-#: src/gui/serverdialog.cpp:448
-msgid "Waiting for server..."
-msgstr "En attente du serveur..."
-
-#: src/gui/serverdialog.cpp:452
-msgid "Preparing download"
-msgstr "Préparation du téléchargement"
-
-#: src/gui/serverdialog.cpp:456
-msgid "Error retreiving server list!"
-msgstr "Erreur lors du téléchargement de la liste !"
+#: ../src/gui/inventorywindow.cpp:365 ../src/gui/popupmenu.cpp:374
+msgid "Drop"
+msgstr "Jeter"
 
-#: src/gui/serverdialog.cpp:556
-msgid "requires a newer version"
-msgstr "requiert une nouvelle version"
+#: ../src/gui/inventorywindow.cpp:107 ../src/gui/inventorywindow.cpp:363
+#: ../src/gui/popupmenu.cpp:372
+msgid "Drop..."
+msgstr "Jeter..."
 
-#: src/gui/serverdialog.cpp:558
-#, c-format
-msgid "requires v%s"
-msgstr "requiert la v%s"
+#: ../src/net/tmwa/generalhandler.cpp:148
+msgid "Duplicated login."
+msgstr "Authentification déjà effectuée."
 
-#: src/gui/setup_audio.cpp:42
-msgid "Sound"
-msgstr "Son"
+#: ../src/client.cpp:935
+msgid "Email Change"
+msgstr "Changer d'email"
 
-#: src/gui/setup_audio.cpp:43
-msgid "Download music"
-msgstr "Télécharger la musique"
+#: ../src/net/manaserv/loginhandler.cpp:309
+msgid "Email address already exists."
+msgstr "Cette adresse email existe déjà."
 
-#: src/gui/setup_audio.cpp:47
-msgid "Audio"
-msgstr "Audio"
+#: ../src/client.cpp:936
+msgid "Email changed successfully!"
+msgstr "L'adresse email a été changé avec succès !"
 
-#: src/gui/setup_audio.cpp:50
-msgid "Sfx volume"
-msgstr "Volume des effets sonores"
+#: ../src/gui/register.cpp:100
+msgid "Email:"
+msgstr "Email :"
 
-#: src/gui/setup_audio.cpp:51
-msgid "Music volume"
-msgstr "Volume de la musique"
+#: ../src/keyboardconfig.cpp:84 ../src/keyboardconfig.cpp:85
+#: ../src/keyboardconfig.cpp:86 ../src/keyboardconfig.cpp:87
+#: ../src/keyboardconfig.cpp:88 ../src/keyboardconfig.cpp:89
+#: ../src/keyboardconfig.cpp:90 ../src/keyboardconfig.cpp:91
+#: ../src/keyboardconfig.cpp:92 ../src/keyboardconfig.cpp:93
+#: ../src/keyboardconfig.cpp:94 ../src/keyboardconfig.cpp:95
+#, c-format
+msgid "Emote Shortcut %d"
+msgstr "Raccourci d'emote %d"
 
-#: src/gui/setup_audio.cpp:94
-msgid "Notice"
-msgstr "Message"
+#: ../src/keyboardconfig.cpp:80
+msgid "Emote Shortcut Window"
+msgstr "Fenêtre de raccourcis d'emote"
 
-#: src/gui/setup_audio.cpp:94
-msgid "You may have to restart your client if you want to download new music"
-msgstr ""
-"Le client devra être redémarré afin de vous permettre de télécharger la "
-"musique."
+#: ../src/net/tmwa/specialhandler.cpp:148
+msgid "Emote failed!"
+msgstr "Emote non realisé !"
 
-#: src/gui/setup_audio.cpp:106
-msgid "Sound Engine"
-msgstr "Moteur de son"
+#: ../src/net/tmwa/network.cpp:145
+msgid "Empty address given to Network::connect()!"
+msgstr "Une adresse vide a été donnée à la commande Network::connect() !"
 
-#: src/gui/setup_colors.cpp:45
-msgid "This is what the color looks like"
-msgstr "Voilà à quoi ressemble cette couleur"
+#: ../src/gui/setup_players.cpp:235
+#, fuzzy
+msgid "Enable Chat log"
+msgstr "Impossible de vendre."
 
-#: src/gui/setup_colors.cpp:50
-msgid "Colors"
-msgstr "Couleurs"
+#: ../src/gui/setup_joystick.cpp:39
+msgid "Enable joystick"
+msgstr "Activer la manette de jeu"
 
-#: src/gui/setup_colors.cpp:71
-msgid "Type:"
-msgstr "Type : "
+#: ../src/keyboardconfig.cpp:55
+msgid "Enable/Disable Trading"
+msgstr "Activer / Désactiver les échanges"
 
-#: src/gui/setup_colors.cpp:82 src/gui/setup_colors.cpp:330
-msgid "Static"
-msgstr "Statique"
+#: ../src/net/manaserv/chathandler.cpp:229
+msgid "End of channel list."
+msgstr "Fin de la liste des salons."
 
-#: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
-#: src/gui/setup_colors.cpp:331
-msgid "Pulse"
-msgstr "Impulsion"
+#: ../src/gui/changepassworddialog.cpp:110
+msgid "Enter the old password first."
+msgstr "Entrez d'abord l'ancien mot de passe."
 
-#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:87
-#: src/gui/setup_colors.cpp:332
-msgid "Rainbow"
-msgstr "Arc-en-ciel"
+#: ../src/client.cpp:721
+msgid "Entering game world"
+msgstr "Connexion au monde de jeu"
 
-#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
-#: src/gui/setup_colors.cpp:332
-msgid "Spectrum"
-msgstr "Spectre"
+#: ../src/gui/inventorywindow.cpp:92 ../src/gui/inventorywindow.cpp:105
+#: ../src/gui/inventorywindow.cpp:354 ../src/gui/popupmenu.cpp:366
+msgid "Equip"
+msgstr "Équiper"
 
-#: src/gui/setup_colors.cpp:93
-msgid "Delay:"
-msgstr "Délai : "
+#: ../src/net/tmwa/playerhandler.cpp:506
+msgid "Equip arrows first."
+msgstr "Equiper en premier les flèches"
 
-#: src/gui/setup_colors.cpp:108
-msgid "Red:"
-msgstr "Rouge : "
+#: ../src/gui/equipmentwindow.cpp:69 ../src/gui/windowmenu.cpp:55
+msgid "Equipment"
+msgstr "Équipement"
 
-#: src/gui/setup_colors.cpp:123
-msgid "Green:"
-msgstr "Vert : "
+#: ../src/keyboardconfig.cpp:72
+msgid "Equipment Window"
+msgstr "Fenêtre d'équipements."
 
-#: src/gui/setup_colors.cpp:138
-msgid "Blue:"
-msgstr "Bleu : "
+#: ../src/client.cpp:1036 ../src/gui/changeemaildialog.cpp:156
+#: ../src/gui/changepassworddialog.cpp:149 ../src/gui/charcreatedialog.cpp:183
+#: ../src/gui/register.cpp:218 ../src/gui/serverdialog.cpp:323
+#: ../src/gui/unregisterdialog.cpp:133 ../src/net/manaserv/charhandler.cpp:177
+#: ../src/net/manaserv/charhandler.cpp:227
+#: ../src/net/tmwa/charserverhandler.cpp:134
+#: ../src/net/tmwa/charserverhandler.cpp:151
+msgid "Error"
+msgstr "Erreur"
 
-#: src/gui/setup.cpp:51
-msgid "Apply"
-msgstr "Appliquer"
+#: ../src/net/manaserv/guildhandler.cpp:87
+msgid "Error creating guild."
+msgstr "Erreur lors de la création de la guilde."
 
-#: src/gui/setup.cpp:51
-msgid "Reset Windows"
-msgstr "Rétablir les fenêtres"
+#: ../src/client.cpp:1336 ../src/client.cpp:1342
+msgid "Error creating updates directory!"
+msgstr "Impossible de créer le dossier de mise à jour !"
 
-#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:78
-msgid "Press the button to start calibration"
-msgstr "Presser le bouton pour démarrer la calibration"
+#: ../src/net/manaserv/chathandler.cpp:211
+msgid "Error joining channel."
+msgstr "Erreur lors de la tentative d'entrée dans le salon."
 
-#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:76
-msgid "Calibrate"
-msgstr "Calibrer"
+#: ../src/gui/serverdialog.cpp:455
+msgid "Error retreiving server list!"
+msgstr "Erreur lors de la récupération de la liste des serveurs !"
 
-#: src/gui/setup_joystick.cpp:39
-msgid "Enable joystick"
-msgstr "Activer le joystick"
+#: ../src/game.cpp:967
+#, c-format
+msgid "Error while loading %s"
+msgstr "Erreur durant le chargement %s"
 
-#: src/gui/setup_joystick.cpp:41
-msgid "Joystick"
-msgstr "Joystick"
+#: ../src/resources/userpalette.cpp:101
+msgid "Exp Notification"
+msgstr "Information d'expérience"
 
-#: src/gui/setup_joystick.cpp:83
-msgid "Stop"
-msgstr "Stop"
+#: ../src/gui/statuswindow.cpp:122
+msgid "Exp:"
+msgstr "Exp :"
 
-#: src/gui/setup_joystick.cpp:84
-msgid "Rotate the stick"
-msgstr "Tourner le joystick"
+#: ../src/net/tmwa/gui/partytab.cpp:170 ../src/net/tmwa/partyhandler.cpp:178
+msgid "Experience sharing disabled."
+msgstr "Partage d'expérience non activé."
 
-#: src/gui/setup_keyboard.cpp:77
-msgid "Keyboard"
-msgstr "Clavier"
+#: ../src/net/tmwa/gui/partytab.cpp:167 ../src/net/tmwa/partyhandler.cpp:172
+msgid "Experience sharing enabled."
+msgstr "Partage d'expérience activé."
 
-#: src/gui/setup_keyboard.cpp:86
-msgid "Assign"
-msgstr "Assigner"
+#: ../src/net/tmwa/gui/partytab.cpp:173 ../src/net/tmwa/partyhandler.cpp:184
+msgid "Experience sharing not possible."
+msgstr "Partage d'expérience impossible."
 
-#: src/gui/setup_keyboard.cpp:90
-msgid "Unassign"
-msgstr "Désassigner"
+#: ../src/net/tmwa/gui/partytab.cpp:176
+msgid "Experience sharing unknown."
+msgstr "Paramètre de partage d'expérience inconnu."
 
-#: src/gui/setup_keyboard.cpp:94
-msgid "Default"
-msgstr "Par défaut"
+#: ../src/gui/setup_video.cpp:230
+msgid "FPS limit:"
+msgstr "Limite FPS :"
 
-#: src/gui/setup_keyboard.cpp:125
-msgid "Key Conflict(s) Detected."
-msgstr "Conflit(s) de touche détecté"
+#: ../src/net/tmwa/tradehandler.cpp:211
+msgid "Failed adding item for unknown reason."
+msgstr "Impossible de rajouter un objet pour une raison inconnue."
 
-#: src/gui/setup_players.cpp:58
-msgid "Name"
-msgstr "Nom"
+#: ../src/net/tmwa/tradehandler.cpp:207
+msgid "Failed adding item. Trade partner has no free slot."
+msgstr ""
+"Impossible de rajouter un objet. Votre partenaire n'a plus de place libre "
+"pour faire cet échange."
 
-#: src/gui/setup_players.cpp:59
-msgid "Relation"
-msgstr "Relation"
+#: ../src/net/tmwa/tradehandler.cpp:202
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr ""
+"Impossible de rajouter un objet. Votre partenaire porte trop de poids et ne "
+"peut faire cette transaction."
 
-#: src/gui/setup_players.cpp:64
-msgid "Neutral"
-msgstr "Neutre"
+#: ../src/gui/trade.cpp:262
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
+"L'objet ne peux être ajouté. Vous ne pouvez ajouter deux fois le même objet "
+"dans cette fenêtre."
 
-#: src/gui/setup_players.cpp:65
-msgid "Friend"
-msgstr "Ami"
+#: ../src/net/tmwa/charserverhandler.cpp:134
+msgid "Failed to create character. Most likely the name is already taken."
+msgstr ""
+"Impossible de créer ce personnage. Il est probable que ce nom soit déjà "
+"utilisé."
 
-#: src/gui/setup_players.cpp:66
-msgid "Disregarded"
-msgstr "Négligé"
+#: ../src/net/tmwa/charserverhandler.cpp:151
+msgid "Failed to delete character."
+msgstr "La suppression du personnage n'a pu s'effectuer."
 
-#: src/gui/setup_players.cpp:67
-msgid "Ignored"
-msgstr "Ignoré"
+#: ../src/net/manaserv/guildhandler.cpp:209
+msgid "Failed to promote member."
+msgstr "Echec lors de la promotion du membre"
 
-#: src/gui/setup_players.cpp:206 src/gui/setup_video.cpp:153
-msgid "???"
-msgstr "???"
+#: ../src/gui/npcpostdialog.cpp:99
+msgid "Failed to send as sender or letter invalid."
+msgstr "Echec de l'envoi comme émetteur ou caractère invalide."
 
-#: src/gui/setup_players.cpp:224
-msgid "Allow trading"
-msgstr "Autoriser les échanges"
+#: ../src/gui/recorder.cpp:112
+msgid "Failed to start recording."
+msgstr "Impossible de démarrer l'enregistrement."
 
-#: src/gui/setup_players.cpp:226
-msgid "Allow whispers"
-msgstr "Autoriser les messages privés"
+#: ../src/gui/setup_video.cpp:426
+msgid ""
+"Failed to switch to fullscreen mode and restoration of old mode also failed!"
+msgstr ""
+"Impossible de passer en mode plein-écran, et l'ancienne résolution n'est "
+"également pas accessible !"
 
-#: src/gui/setup_players.cpp:230
-msgid "Put all whispers in tabs"
-msgstr "Placer tous les messages privés dans des onglets"
+#: ../src/gui/setup_video.cpp:420
+msgid ""
+"Failed to switch to windowed mode and restoration of old mode also failed!"
+msgstr ""
+"Impossible de passer en mode fenêtre, et l'ancienne résolution n'est "
+"également pas accessible !"
 
-#: src/gui/setup_players.cpp:232
-msgid "Show gender"
-msgstr "Afficher le genre"
+#: ../src/net/tmwa/inventoryhandler.cpp:287
+msgid "Failed to use item."
+msgstr "Impossible d'utiliser l'objet."
 
-#: src/gui/setup_players.cpp:234
-msgid "Players"
-msgstr "Joueurs"
+#: ../src/client.cpp:956
+msgid "Farewell, come back any time..."
+msgstr "Adieu, revenez dès que vous le souhaitez..."
 
-#: src/gui/setup_players.cpp:259
-msgid "When ignoring:"
-msgstr "Quand ignoré :"
+#: ../src/gui/charcreatedialog.cpp:81 ../src/gui/register.cpp:91
+msgid "Female"
+msgstr "Féminin"
 
-#: src/gui/setup_video.cpp:134
-#, fuzzy
-msgid "Tiny"
-msgstr ""
-"#-#-#-#-#  fr.po (The Mana World 0.1.0)  #-#-#-#-#\n"
-"fin\n"
-"#-#-#-#-#  po_fr rewiew1.po (The Mana World 0.1.0)  #-#-#-#-#\n"
-"Fin"
+#: ../src/keyboardconfig.cpp:56
+msgid "Find Path to Mouse"
+msgstr "Trouver le chemin vers la souris"
 
-#: src/gui/setup_video.cpp:135
-msgid "Small"
-msgstr "Petit"
+#: ../src/gui/recorder.cpp:87
+msgid "Finishing recording."
+msgstr "Fin de l'engistrement."
 
-#: src/gui/setup_video.cpp:136
-msgid "Medium"
-msgstr "Medium"
+#: ../src/gui/setup_video.cpp:256
+msgid "Font size"
+msgstr "Taille de police"
 
-#: src/gui/setup_video.cpp:137
-msgid "Large"
-msgstr "Grand"
+#: ../src/commandhandler.cpp:204
+msgid "For more information, type /help <command>."
+msgstr "Pour plus d'informations, taper /help <commande>"
 
-#: src/gui/setup_video.cpp:163
-msgid "No text"
-msgstr "Pas de texte"
+#: ../src/gui/setup_players.cpp:65
+msgid "Friend"
+msgstr "Ami"
 
-#: src/gui/setup_video.cpp:164
-msgid "Text"
-msgstr "Texte"
+#: ../src/gui/setup_video.cpp:211
+msgid "Full screen"
+msgstr "Plein écran"
 
-#: src/gui/setup_video.cpp:165
-msgid "Bubbles, no names"
-msgstr "Bulles, sans noms"
+#: ../src/resources/userpalette.cpp:94
+msgid "GM Names"
+msgstr "Nom des GM"
 
-#: src/gui/setup_video.cpp:166
-msgid "Bubbles with names"
-msgstr "Bulles avec noms"
+#: ../src/net/tmwa/gamehandler.cpp:102
+msgid "Game"
+msgstr "Jeu"
 
-#: src/gui/setup_video.cpp:178
-msgid "off"
-msgstr "aucun"
+#: ../src/net/manaserv/beinghandler.cpp:288
+#: ../src/net/tmwa/playerhandler.cpp:100
+msgid "Game Over!"
+msgstr "Fin de la partie !"
 
-#: src/gui/setup_video.cpp:179 src/gui/setup_video.cpp:192
-msgid "low"
-msgstr "léger"
+#: ../src/game.cpp:181
+msgid "General"
+msgstr "Général"
 
-#: src/gui/setup_video.cpp:180 src/gui/setup_video.cpp:194
-msgid "high"
-msgstr "élevé"
+#: ../src/gui/widgets/chattab.cpp:127
+#, c-format
+msgid "Global announcement from %s:"
+msgstr "Annonce globale de %s :"
 
-#: src/gui/setup_video.cpp:193
-msgid "medium"
-msgstr "moyen"
+#: ../src/gui/widgets/chattab.cpp:121
+msgid "Global announcement:"
+msgstr "Annonce globale :"
 
-#: src/gui/setup_video.cpp:195
-msgid "max"
-msgstr "max"
+#: ../src/net/tmwa/generalhandler.cpp:209
+msgid "Got disconnected from server!"
+msgstr "Vous avez été déconnecté du serveur !"
 
-#: src/gui/setup_video.cpp:219
-msgid "Full screen"
-msgstr "Plein écran"
+#: ../src/gui/setup_colors.cpp:124
+msgid "Green:"
+msgstr "Vert : "
 
-#: src/gui/setup_video.cpp:220
-msgid "OpenGL"
-msgstr "Ouvrir GL"
+#: ../src/gui/setup_video.cpp:253
+msgid "Gui opacity"
+msgstr "Opacité de l'interface"
 
-#: src/gui/setup_video.cpp:221
-msgid "Custom cursor"
-msgstr "Curseur personnalisé"
+#: ../src/net/tmwa/gui/guildtab.cpp:45
+msgid "Guild"
+msgstr "Guilde"
 
-#: src/gui/setup_video.cpp:223
-msgid "Visible names"
-msgstr "Afficher les noms"
+#: ../src/gui/socialwindow.cpp:139
+#, c-format
+msgid "Guild %s quit requested."
+msgstr "Demande pour quitter la guilde %s effectuée."
 
-#: src/gui/setup_video.cpp:225
-msgid "Particle effects"
-msgstr "Effets de particules"
+#: ../src/resources/userpalette.cpp:98
+msgid "Guild Members"
+msgstr "Membres de la guilde"
 
-#: src/gui/setup_video.cpp:227
-msgid "Show own name"
-msgstr "Afficher son propre nom"
+#: ../src/gui/socialwindow.cpp:540
+msgid "Guild Name"
+msgstr "Nom de la guilde"
 
-#: src/gui/setup_video.cpp:228
-msgid "Log NPC dialogue"
-msgstr "Loguer les conversations avec les PNJ"
+#: ../src/net/manaserv/guildhandler.cpp:82
+msgid "Guild created."
+msgstr "Guilde créée."
 
-#: src/gui/setup_video.cpp:229
-msgid "Show pickup notification"
-msgstr "Afficher les messages de ramassage"
+#: ../src/net/tmwa/guildhandler.cpp:393
+msgid "Guild creation isn't supported yet."
+msgstr "La création de guilde n'est pas encore possible sur le serveur."
 
-#. TRANSLATORS: Refers to "Show pickup notification"
-#: src/gui/setup_video.cpp:231
-msgid "in chat"
-msgstr "dans la conversation"
+#: ../src/net/tmwa/gui/guildtab.cpp:89
+msgid "Guild name is missing."
+msgstr "Le nom de la guilde est manquant."
 
-#. TRANSLATORS: Refers to "Show pickup notification"
-#: src/gui/setup_video.cpp:233
-msgid "as particle"
-msgstr "avec des particules"
+#: ../src/resources/itemdb.cpp:312
+#, c-format
+msgid "HP %+d"
+msgstr "PV %+d"
 
-#: src/gui/setup_video.cpp:238
-msgid "FPS limit:"
-msgstr "Limite FPS :"
+#: ../src/gui/statuswindow.cpp:117
+msgid "HP:"
+msgstr "Vie :"
 
-#: src/gui/setup_video.cpp:249
-msgid "Disable transparency (Low CPU mode)"
-msgstr "Désactiver la transparence (Faibles CPUs)"
+#: ../src/gui/charcreatedialog.cpp:74
+msgid "Hair color:"
+msgstr "Couleur des cheveux :"
 
-#: src/gui/setup_video.cpp:252
-msgid "Video"
-msgstr "Vidéo"
+#: ../src/gui/charcreatedialog.cpp:77
+msgid "Hair style:"
+msgstr "Coupe de cheveux :"
 
-#: src/gui/setup_video.cpp:254
-msgid "Show damage"
-msgstr "Afficher les dégâts"
+#: ../src/gui/help.cpp:37
+msgid "Help"
+msgstr "Aide"
 
-#: src/gui/setup_video.cpp:260
-msgid "Overhead text"
-msgstr "Texte aérien"
+#: ../src/keyboardconfig.cpp:69
+msgid "Help Window"
+msgstr "Fenêtre d'Aide"
 
-#: src/gui/setup_video.cpp:261
-msgid "Gui opacity"
-msgstr "Opacité de l'interface"
+#: ../src/keyboardconfig.cpp:52
+msgid "Hide Windows"
+msgstr "Cacher les fenêtres"
 
-#: src/gui/setup_video.cpp:262
-msgid "Ambient FX"
-msgstr "Effets ambiants"
+#: ../src/net/tmwa/specialhandler.cpp:199
+msgid "Huh? What's that?"
+msgstr "Hé ? Qu'est-ce donc que cela ? !!!"
 
-#: src/gui/setup_video.cpp:263
-msgid "Particle detail"
-msgstr "Détail des particules"
+#: ../src/net/manaserv/beinghandler.cpp:293
+#: ../src/net/tmwa/playerhandler.cpp:106
+msgid "I guess this did not run too well."
+msgstr "J'ai la sensation que cela ne s'est pas aussi bien passé que prévu."
 
-#: src/gui/setup_video.cpp:264
-msgid "Font size"
-msgstr "Taille de police"
+#: ../src/commandhandler.cpp:240
+msgid "If <channel> doesn't exist, it's created."
+msgstr "Si <salon> n'existe pas, il sera créé."
 
-#: src/gui/setup_video.cpp:279 src/gui/setup_video.cpp:535
-#: src/gui/setup_video.cpp:665
-msgid "None"
-msgstr "Rien"
+#: ../src/commandhandler.cpp:258 ../src/commandhandler.cpp:285
+#: ../src/gui/widgets/channeltab.cpp:82 ../src/gui/widgets/channeltab.cpp:91
+#: ../src/net/tmwa/gui/guildtab.cpp:75 ../src/net/tmwa/gui/partytab.cpp:75
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr ""
+"Si le <nom du personnage> contient des espaces, entourez le de guillemets "
+"(exemple : \"nom du personnage\")."
 
-#: src/gui/setup_video.cpp:428
-msgid ""
-"Failed to switch to windowed mode and restoration of old mode also failed!"
+#: ../src/net/tmwa/playerhandler.cpp:125
+msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
-"Impossible de passer en mode fenêtré, et l'ancienne résolution n'est "
-"également pas accessible !"
+"Si tu n'étais pas aussi motivé, tu serais en train de manger les pissenlits "
+"par la racine."
 
-#: src/gui/setup_video.cpp:434
-msgid ""
-"Failed to switch to fullscreen mode and restoration of old mode also failed!"
+#: ../src/gui/widgets/channeltab.cpp:75
+msgid "If you're the last person in the channel, it will be deleted."
 msgstr ""
-"Impossible de passer en mode plein-écran, et l'ancienne résolution n'est "
-"également pas accessible !"
+"Si vous étiez la dernière personne présente dans ce salon, il sera supprimé."
 
-#: src/gui/setup_video.cpp:445
-msgid "Switching to Full Screen"
-msgstr "Passage en plein écran"
+#: ../src/gui/popupmenu.cpp:108
+#, c-format
+msgid "Ignore %s"
+msgstr "Ignorer %s"
 
-#: src/gui/setup_video.cpp:446
-msgid "Restart needed for changes to take effect."
-msgstr ""
-"Les changements ne seront pris en compte qu'au prochain démarrage du jeu."
+#: ../src/keyboardconfig.cpp:103
+msgid "Ignore input 1"
+msgstr "Ignorer l'entrée 1"
 
-#: src/gui/setup_video.cpp:460
-msgid "Changing to OpenGL"
-msgstr "Activation d'OpenGL"
+#: ../src/keyboardconfig.cpp:104
+msgid "Ignore input 2"
+msgstr "Ignorer l'entrée 2"
 
-#: src/gui/setup_video.cpp:461
-msgid ""
-"Applying change to OpenGL requires restart. In case OpenGL messes up your "
-"game graphics, restart the game with the command line option \"--no-opengl\"."
-msgstr ""
-"Il est nécessaire de redémarrer le client pour appliquer les changements "
-"liés à OpenGL. Si OpenGL empêche un affichage correct, redémarrez le jeu "
-"avec l'option en ligne de commande : \"--no-opengl\"."
+#: ../src/gui/setup_players.cpp:67
+msgid "Ignored"
+msgstr "Ignoré"
 
-#: src/gui/setup_video.cpp:468
-msgid "Deactivating OpenGL"
-msgstr "Désactiver OpenGL"
+#: ../src/game.cpp:733
+msgid "Ignoring incoming trade requests"
+msgstr "Ignorer les requêtes d'échanges entrantes"
 
-#: src/gui/setup_video.cpp:469
-msgid "Applying change to OpenGL requires restart."
-msgstr ""
-"Le changement OpenGL ne sera pris en compte qu'au prochain démarrage du jeu."
+#: ../src/net/manaserv/tradehandler.cpp:97
+msgid "Ignoring incoming trade requests."
+msgstr "Ignorer les demandes d'échanges."
 
-#: src/gui/setup_video.cpp:477
-msgid "Transparency disabled"
-msgstr "Transparence désactivée"
+#: ../src/net/manaserv/charhandler.cpp:210
+#: ../src/net/tmwa/charserverhandler.cpp:146
+msgid "Info"
+msgstr "Informations"
 
-#: src/gui/setup_video.cpp:478 src/gui/setup_video.cpp:486
-msgid "You must restart to apply changes."
-msgstr "Vous devez redémarrer pour appliquer les changements."
+#: ../src/net/tmwa/playerhandler.cpp:101
+msgid "Insert coin to continue."
+msgstr "Veuillez insérer une pièce pour continuer."
 
-#: src/gui/setup_video.cpp:485
-msgid "Transparency enabled"
-msgstr "Transparence activée."
+#: ../src/net/tmwa/specialhandler.cpp:172
+msgid "Insufficient HP!"
+msgstr "Pas assez de vie !"
 
-#: src/gui/setup_video.cpp:579 src/gui/setup_video.cpp:584
-msgid "Screen Resolution Changed"
-msgstr "Résolution de l'écran modifiée"
+#: ../src/net/tmwa/specialhandler.cpp:175
+msgid "Insufficient SP!"
+msgstr "SP insuffisant !"
 
-#: src/gui/setup_video.cpp:580 src/gui/setup_video.cpp:585
-msgid "Restart your client for the change to take effect."
-msgstr "Redémarrez le jeu pour que les changements soient appliqués."
+#: ../src/net/manaserv/attributes.cpp:218
+#: ../src/net/tmwa/generalhandler.cpp:233
+msgid "Intelligence"
+msgstr "Intelligence"
+
+#: ../src/net/manaserv/attributes.cpp:225
+#, fuzzy, c-format
+msgid "Intelligence %+.1f"
+msgstr "Intelligence %+d"
 
-#: src/gui/setup_video.cpp:582
+#: ../src/net/tmwa/generalhandler.cpp:105
+#, c-format
+msgid "Intelligence %+d"
+msgstr "Intelligence %+d"
+
+#: ../src/net/tmwa/charserverhandler.cpp:273
+msgid "Intelligence:"
+msgstr "Intelligence :"
+
+#: ../src/net/manaserv/charhandler.cpp:267
 #, fuzzy
-msgid "Some windows may be moved to fit the lowered resolution."
-msgstr ""
-"#-#-#-#-#  fr.po (The Mana World 0.1.0)  #-#-#-#-#\n"
-"Certaines fenêtre pourraient avoir été recentrée pour correspondre à la "
-"nouvelle résolution.\n"
-"#-#-#-#-#  po_fr rewiew1.po (The Mana World 0.1.0)  #-#-#-#-#\n"
-"Certaines fenêtre pourraient avoir été recentrées pour correspondre à la "
-"nouvelle résolution."
-
-#: src/gui/setup_video.cpp:615
-msgid "Particle Effect Settings Changed."
-msgstr "Paramètres d'effet de particules modifiés."
+msgid "Invalid character slot selected."
+msgstr "Personnage supprimé."
 
-#: src/gui/setup_video.cpp:616
-msgid "Changes will take effect on map change."
-msgstr "Les changements seront appliqués au changement de carte."
+#: ../src/net/manaserv/charhandler.cpp:156
+msgid "Invalid gender."
+msgstr "Sexe invalide."
 
-#: src/gui/skilldialog.cpp:210 src/gui/windowmenu.cpp:59
-msgid "Skills"
-msgstr "Compétences"
+#: ../src/net/manaserv/charhandler.cpp:153
+msgid "Invalid hair color."
+msgstr "Couleur de cheveux invalide."
 
-#: src/gui/skilldialog.cpp:221
-msgid "Up"
-msgstr "Augmenter"
+#: ../src/net/manaserv/charhandler.cpp:150
+msgid "Invalid hairstyle."
+msgstr "Style de chevelure invalide."
 
-#: src/gui/skilldialog.cpp:271
-#, c-format
-msgid "Skill points available: %d"
-msgstr "Points de compétences : %d"
+#: ../src/net/manaserv/charhandler.cpp:144
+msgid "Invalid name."
+msgstr "Nom invalide."
 
-#: src/gui/skilldialog.cpp:353
-#, c-format
-msgid "Skill Set %d"
-msgstr "Compétences : %d"
+#: ../src/net/manaserv/charhandler.cpp:171
+#, fuzzy
+msgid "Invalid slot number."
+msgstr "Nom invalide."
 
-#: src/gui/skilldialog.cpp:362
+#: ../src/client.cpp:1302
 #, c-format
-msgid "Skill %d"
-msgstr "Compétence %d"
+msgid "Invalid update host: %s"
+msgstr "Hôte de mise à jour incorrect : %s"
+
+#: ../src/gui/inventorywindow.cpp:59 ../src/gui/windowmenu.cpp:56
+msgid "Inventory"
+msgstr "Inventaire"
+
+#: ../src/keyboardconfig.cpp:71
+msgid "Inventory Window"
+msgstr "Fenêtre de l'inventaire"
+
+#: ../src/localplayer.cpp:898
+msgid "Inventory is full."
+msgstr "Votre inventraire est plein."
+
+#: ../src/gui/socialwindow.cpp:331
+msgid "Invite"
+msgstr "Inviter"
 
-#: src/gui/skilldialog.cpp:444
+#: ../src/gui/popupmenu.cpp:130
 #, c-format
-msgid "Lvl: %d (%+d)"
-msgstr "Niveau : %d (%+d)"
+msgid "Invite %s to join your guild"
+msgstr "Inviter %s à rejoindre votre guilde"
 
-#: src/gui/skilldialog.cpp:455
+#: ../src/gui/popupmenu.cpp:134
 #, c-format
-msgid "Lvl: %d"
-msgstr "Niveau : %d"
+msgid "Invite %s to join your party"
+msgstr "Inviter %s à se joindre à votre groupe"
+
+#: ../src/net/manaserv/guildhandler.cpp:97
+msgid "Invite sent."
+msgstr "Invitation envoyée."
 
-#: src/gui/socialwindow.cpp:128
+#: ../src/gui/socialwindow.cpp:126
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr "Le joueur %s a été invité dans la guilde %s."
 
-#: src/gui/socialwindow.cpp:143
+#: ../src/gui/socialwindow.cpp:207 ../src/net/tmwa/partyhandler.cpp:330
 #, c-format
-msgid "Guild %s quit requested."
-msgstr "Demande pour quitter la guilde %s effectuée."
-
-#: src/gui/socialwindow.cpp:157
-msgid "Member Invite to Guild"
-msgstr "Inviter le membre de la guilde"
+msgid "Invited user %s to party."
+msgstr "Inviter l'utilisateur %s dans le groupe."
 
-#: src/gui/socialwindow.cpp:158
+#: ../src/net/tmwa/partyhandler.cpp:335
 #, c-format
-msgid "Who would you like to invite to guild %s?"
-msgstr "Qui voudriez-vous inviter dans la guilde %s ?"
+msgid "Inviting failed, because you can't see a player called %s."
+msgstr "L'invitation a échouée, le joueur %s n'est pas à portée de vue."
+
+#: ../src/keyboardconfig.cpp:57 ../src/keyboardconfig.cpp:58
+#: ../src/keyboardconfig.cpp:59 ../src/keyboardconfig.cpp:60
+#: ../src/keyboardconfig.cpp:61 ../src/keyboardconfig.cpp:62
+#: ../src/keyboardconfig.cpp:63 ../src/keyboardconfig.cpp:64
+#: ../src/keyboardconfig.cpp:65 ../src/keyboardconfig.cpp:66
+#: ../src/keyboardconfig.cpp:67 ../src/keyboardconfig.cpp:68
+#, c-format
+msgid "Item Shortcut %d"
+msgstr "Raccourcis Objet %d"
 
-#: src/gui/socialwindow.cpp:167
-msgid "Leave Guild?"
-msgstr "Quitter la guilde ?"
+#: ../src/keyboardconfig.cpp:76
+msgid "Item Shortcut Window"
+msgstr "Fenêtre de raccourcis objets"
 
-#: src/gui/socialwindow.cpp:168
-#, c-format
-msgid "Are you sure you want to leave guild %s?"
-msgstr "Êtes-vous sûr de vouloir quitter la guilde %s ?"
+#: ../src/localplayer.cpp:901
+msgid "Item belongs to someone else."
+msgstr "Cet objet appartient à quelqu'un d'autre."
 
-#: src/gui/socialwindow.cpp:222
-#, c-format
-msgid "Party %s quit requested."
-msgstr "Vous avez demandé à quitter le groupe %s."
+#: ../src/localplayer.cpp:897
+msgid "Item is too far away"
+msgstr "L'objet est trop loin de vous."
 
-#: src/gui/socialwindow.cpp:236
-msgid "Member Invite to Party"
-msgstr "Inviter un joueur dans le groupe"
+#: ../src/localplayer.cpp:896
+msgid "Item is too heavy."
+msgstr "L'objet est trop lourd."
 
-#: src/gui/socialwindow.cpp:237
-#, c-format
-msgid "Who would you like to invite to party %s?"
-msgstr "Qui voudriez vous inviter dans le groupe %s ?"
+#: ../src/net/tmwa/gui/partytab.cpp:135 ../src/net/tmwa/partyhandler.cpp:202
+msgid "Item sharing disabled."
+msgstr "Partage d'objet desactivé."
 
-#: src/gui/socialwindow.cpp:246
-msgid "Leave Party?"
-msgstr "Quitter le groupe ?"
+#: ../src/net/tmwa/gui/partytab.cpp:132 ../src/net/tmwa/partyhandler.cpp:196
+msgid "Item sharing enabled."
+msgstr "Partage d'objet activé."
+
+#: ../src/net/tmwa/gui/partytab.cpp:138 ../src/net/tmwa/partyhandler.cpp:208
+msgid "Item sharing not possible."
+msgstr "Partage d'objet impossible."
+
+#: ../src/net/tmwa/gui/partytab.cpp:141
+msgid "Item sharing unknown."
+msgstr "Paramètre de partage d'objets inconnu."
+
+#: ../src/client.cpp:785
+#, fuzzy
+msgid "ItemDB: Error while loading "
+msgstr "Erreur durant le chargement %s"
 
-#: src/gui/socialwindow.cpp:247
+#: ../src/gui/statuswindow.cpp:159
+msgid "Job:"
+msgstr "Habilité :"
+
+#: ../src/gui/statuswindow.cpp:158 ../src/gui/statuswindow.cpp:276
 #, c-format
-msgid "Are you sure you want to leave party %s?"
-msgstr "Êtes-vous sûr de vouloir quitter le groupe %s ?"
+msgid "Job: %d"
+msgstr "Metier : %d"
 
-#: src/gui/socialwindow.cpp:276
-msgid "Create Guild"
-msgstr "Créer une Guilde"
+#: ../src/net/manaserv/partyhandler.cpp:87
+msgid "Joined party."
+msgstr "Groupe rejoint."
 
-#: src/gui/socialwindow.cpp:277 src/gui/socialwindow.cpp:623
-msgid "Create Party"
-msgstr "Créer un groupe"
+#: ../src/gui/setup_joystick.cpp:41
+msgid "Joystick"
+msgstr "Joystick"
 
-#: src/gui/socialwindow.cpp:316 src/gui/windowmenu.cpp:64
-msgid "Social"
-msgstr "Social"
+#: ../src/gui/setup_keyboard.cpp:125
+msgid "Key Conflict(s) Detected."
+msgstr "Conflit(s) de touches détecté(s)"
 
-#: src/gui/socialwindow.cpp:334
-msgid "Invite"
-msgstr "Inviter"
+#: ../src/gui/setup_keyboard.cpp:77
+msgid "Keyboard"
+msgstr "Clavier"
+
+#: ../src/net/tmwa/adminhandler.cpp:64
+msgid "Kick failed!"
+msgstr "Impossible de sortir la personne !"
+
+#: ../src/gui/popupmenu.cpp:163
+msgid "Kick monster"
+msgstr "Ejecter un monstre"
 
-#: src/gui/socialwindow.cpp:335
+#: ../src/gui/popupmenu.cpp:141
+msgid "Kick player"
+msgstr "Ejecter un joueur"
+
+#: ../src/net/tmwa/adminhandler.cpp:66
+msgid "Kick succeeded!"
+msgstr "Sortie de la personne effectuée avec succès !"
+
+#: ../src/gui/setup_video.cpp:131
+msgid "Large"
+msgstr "Grand"
+
+#: ../src/gui/socialwindow.cpp:332
 msgid "Leave"
 msgstr "Quitter"
 
-#: src/gui/socialwindow.cpp:447
-#, c-format
-msgid "Accepted party invite from %s."
-msgstr "Invitation dans le groupe acceptée de la part de %s."
+#: ../src/gui/socialwindow.cpp:163
+msgid "Leave Guild?"
+msgstr "Quitter la guilde ?"
 
-#: src/gui/socialwindow.cpp:453
-#, c-format
-msgid "Rejected party invite from %s."
-msgstr "Invitation dans le groupe de la part de %s refusée."
+#: ../src/gui/socialwindow.cpp:242
+msgid "Leave Party?"
+msgstr "Quitter le groupe ?"
 
-#: src/gui/socialwindow.cpp:466
+#: ../src/gui/statuswindow.cpp:113 ../src/gui/statuswindow.cpp:215
+#: ../src/gui/statuswindow.cpp:263
 #, c-format
-msgid "Accepted guild invite from %s."
-msgstr "Invitation dans la guilde acceptée de la part de %s."
+msgid "Level: %d"
+msgstr "Niveau : %d"
 
-#: src/gui/socialwindow.cpp:472
-#, c-format
-msgid "Rejected guild invite from %s."
-msgstr "Invitation dans la guilde de la part de %s refusée."
+#: ../src/net/manaserv/chathandler.cpp:217
+msgid "Listing channels."
+msgstr "Liste des canaux."
 
-#: src/gui/socialwindow.cpp:501
-msgid "Creating guild failed, please choose a shorter name."
-msgstr "La création de la guilde à échoué, veuillez choisir un nom plus court."
+#: ../src/resources/userpalette.cpp:109
+msgid "Local Player Critical Hit"
+msgstr "Coup critique"
 
-#: src/gui/socialwindow.cpp:507
-#, c-format
-msgid "Creating guild called %s."
-msgstr "La guilde %s a été créée."
+#: ../src/resources/userpalette.cpp:107
+msgid "Local Player Hits Monster"
+msgstr "Votre personnage touche le monstre"
 
-#: src/gui/socialwindow.cpp:523
-msgid "Creating party failed, please choose a shorter name."
-msgstr "La création du groupe à échoué, veuillez choisir un nom plus court."
+#: ../src/resources/userpalette.cpp:111
+msgid "Local Player Miss"
+msgstr "Votre personnage manque son coup"
 
-#: src/gui/socialwindow.cpp:529
-#, c-format
-msgid "Creating party called %s."
-msgstr "Le groupe %s a été créé."
+#: ../src/gui/setup_video.cpp:220
+msgid "Log NPC dialogue"
+msgstr "Loguer les conversations avec les PNJ"
 
-#: src/gui/socialwindow.cpp:543
-msgid "Guild Name"
-msgstr "Nom de la guilde"
+#: ../src/client.cpp:688
+msgid "Logging in"
+msgstr "Connexion en cours"
 
-#: src/gui/socialwindow.cpp:544
-msgid "Choose your guild's name."
-msgstr "Choisissez le nom de la guilde."
+#: ../src/gui/login.cpp:51 ../src/gui/login.cpp:63
+msgid "Login"
+msgstr "Connexion"
 
-#: src/gui/socialwindow.cpp:556
-#, fuzzy
-msgid "Received guild request, but one already exists."
+#: ../src/net/manaserv/loginhandler.cpp:275
+msgid "Login attempt too soon after previous attempt."
 msgstr ""
-"#-#-#-#-#  fr.po (The Mana World 0.1.0)  #-#-#-#-#\n"
-"Vous avez reçu une demande pour rejoindre une guilde, mais il en existe déjà "
-"une autre.\n"
-"#-#-#-#-#  po_fr rewiew1.po (The Mana World 0.1.0)  #-#-#-#-#\n"
-"Vous avez reçu une demande pour rejoindre une guilde, mais il en existe déjà "
-"une."
+"La tentative de connexion a été faite trop rapidement depuis la dernière "
+"tentative."
 
-#: src/gui/socialwindow.cpp:561
-#, c-format
-msgid "%s has invited you to join the guild %s."
-msgstr "%s vous a invité à rejoindre la guilde %s."
+#: ../src/net/manaserv/beinghandler.cpp:297
+#: ../src/net/tmwa/playerhandler.cpp:114
+msgid "Looks like you got your head handed to you."
+msgstr "Il semble que l'on vous ait rendu votre tête."
 
-#: src/gui/socialwindow.cpp:566
-msgid "Accept Guild Invite"
-msgstr "Accepter l'invitation dans cette guilde"
+#: ../src/net/tmwa/generalhandler.cpp:235
+msgid "Luck"
+msgstr "Chance"
 
-#: src/gui/socialwindow.cpp:578
-msgid "Received party request, but one already exists."
-msgstr ""
-"Vous avez reçu une demande de rejoindre un groupe, mais il en existe déjà un."
+#: ../src/net/tmwa/generalhandler.cpp:107
+#, c-format
+msgid "Luck %+d"
+msgstr "Chance %+d"
 
-#: src/gui/socialwindow.cpp:588
-msgid "You have been invited you to join a party."
-msgstr "Vous avez été invité à rejoindre un groupe."
+#: ../src/net/tmwa/charserverhandler.cpp:275
+msgid "Luck:"
+msgstr "Chance :"
 
-#: src/gui/socialwindow.cpp:592
+#: ../src/gui/skilldialog.cpp:470
 #, c-format
-msgid "You have been invited to join the %s party."
-msgstr "Vous avez été invité à rejoindre le groupe %s."
+msgid "Lvl: %d"
+msgstr "Niveau : %d"
 
-#: src/gui/socialwindow.cpp:600
+#: ../src/gui/skilldialog.cpp:459
 #, c-format
-msgid "%s has invited you to join their party."
-msgstr "%s vous a invité à rejoindre son groupe."
+msgid "Lvl: %d (%+d)"
+msgstr "Niveau : %d (%+d)"
 
-#: src/gui/socialwindow.cpp:605
-#, c-format
-msgid "%s has invited you to join the %s party."
-msgstr "%s vous a invité à rejoindre le groupe %s."
+#: ../src/net/tmwa/generalhandler.cpp:239
+msgid "M.Attack"
+msgstr "Attaque M."
 
-#: src/gui/socialwindow.cpp:613
-msgid "Accept Party Invite"
-msgstr "Accepter l'invitation pour ce groupe"
+#: ../src/net/tmwa/generalhandler.cpp:240
+msgid "M.Defense"
+msgstr "Défense M."
 
-#: src/gui/socialwindow.cpp:624
-msgid "Cannot create party. You are already in a party"
-msgstr "Ne peut pas créer un groupe. Vous faites déjà partie d'un groupe."
+#: ../src/resources/itemdb.cpp:313
+#, c-format
+msgid "MP %+d"
+msgstr "PM %+d"
 
-#: src/gui/socialwindow.cpp:629
-msgid "Party Name"
-msgstr "Nom du groupe"
+#: ../src/gui/statuswindow.cpp:130
+msgid "MP:"
+msgstr "PM :"
 
-#: src/gui/socialwindow.cpp:630
-msgid "Choose your party's name."
-msgstr "Choisissez le nom du groupe."
+#: ../src/net/tmwa/chathandler.cpp:230
+msgid "MVP player."
+msgstr "Joueur MVP"
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:62
-msgid "Specials"
-msgstr "Cpt. spéciales"
+#: ../src/gui/charcreatedialog.cpp:80 ../src/gui/register.cpp:90
+msgid "Male"
+msgstr "Masculin"
 
-#: src/gui/specialswindow.cpp:174
-#, c-format
-msgid "Specials Set %d"
-msgstr "Set de Cpt. spéciales %d"
+#: ../src/gui/minimap.cpp:45 ../src/gui/minimap.cpp:86
+msgid "Map"
+msgstr "Carte"
 
-#: src/gui/specialswindow.cpp:191
+#: ../src/gui/debugwindow.cpp:66 ../src/gui/debugwindow.cpp:108
 #, c-format
-msgid "Special %d"
-msgstr "Cpt. spéciale %d"
+msgid "Map: %s"
+msgstr "Carte : %s"
+
+#: ../src/gui/buy.cpp:80 ../src/gui/sell.cpp:78
+#: ../src/gui/statuswindow.cpp:385 ../src/gui/statuswindow.cpp:463
+#: ../src/gui/statuswindow.cpp:497
+msgid "Max"
+msgstr "Max."
+
+#: ../src/gui/setup_video.cpp:130
+msgid "Medium"
+msgstr "Medium"
 
-#: src/gui/statuswindow.cpp:109 src/gui/statuswindow.cpp:253
+#: ../src/gui/socialwindow.cpp:153
+msgid "Member Invite to Guild"
+msgstr "Inviter le membre de la guilde"
+
+#: ../src/gui/socialwindow.cpp:232
+msgid "Member Invite to Party"
+msgstr "Inviter un joueur dans le groupe"
+
+#: ../src/net/manaserv/guildhandler.cpp:204
+msgid "Member was promoted successfully."
+msgstr "La promotion de ce membre a réussie."
+
+#: ../src/net/tmwa/playerhandler.cpp:253 ../src/net/tmwa/playerhandler.cpp:293
+msgid "Message"
+msgstr "Message"
+
+#: ../src/commandhandler.cpp:479
+msgid "Message closes chat."
+msgstr "Ce message ferme la conversation."
+
+#: ../src/commandhandler.cpp:492
+msgid "Message now closes chat."
+msgstr "Ce message ferme maintenant la conversation."
+
+#: ../src/keyboardconfig.cpp:74
+msgid "Minimap Window"
+msgstr "Fenêtre de la mini carte"
+
+#: ../src/gui/debugwindow.cpp:67 ../src/gui/debugwindow.cpp:106
 #, c-format
-msgid "Level: %d"
-msgstr "Niveau : %d"
+msgid "Minimap: %s"
+msgstr "Plan : %s"
+
+#: ../src/resources/userpalette.cpp:112
+msgid "Misses"
+msgstr "Raté"
 
-#: src/gui/statuswindow.cpp:110 src/gui/statuswindow.cpp:220
+#: ../src/gui/statuswindow.cpp:114 ../src/gui/statuswindow.cpp:208
+#: ../src/gui/statuswindow.cpp:240
 #, c-format
 msgid "Money: %s"
 msgstr "Argent : %s"
 
-#: src/gui/statuswindow.cpp:113
-msgid "HP:"
-msgstr "Vie :"
+#: ../src/resources/userpalette.cpp:104
+msgid "Monster Hits Player"
+msgstr "Le monstre touche le joueur"
 
-#: src/gui/statuswindow.cpp:118
-msgid "Exp:"
-msgstr "Exp :"
+#: ../src/resources/userpalette.cpp:96
+msgid "Monsters"
+msgstr "Monstres"
 
-#: src/gui/statuswindow.cpp:123
-msgid "MP:"
-msgstr "PM :"
+#: ../src/keyboardconfig.cpp:40
+msgid "Move Down"
+msgstr "Descendre"
 
-#: src/gui/statuswindow.cpp:141 src/gui/statuswindow.cpp:228
-#, c-format
-msgid "Job: %d"
-msgstr "Metier : %d"
+#: ../src/keyboardconfig.cpp:41
+msgid "Move Left"
+msgstr "Aller à gauche"
 
-#: src/gui/statuswindow.cpp:142
-msgid "Job:"
-msgstr "Habilité :"
+#: ../src/keyboardconfig.cpp:42
+msgid "Move Right"
+msgstr "Aller à droite"
 
-#: src/gui/statuswindow.cpp:203
-msgid "HP"
-msgstr "Vie"
+#: ../src/keyboardconfig.cpp:39
+msgid "Move Up"
+msgstr "Monter"
 
-#: src/gui/statuswindow.cpp:209
-msgid "MP"
-msgstr "PM"
+#: ../src/gui/setup_audio.cpp:51
+msgid "Music volume"
+msgstr "Volume de la musique"
 
-#: src/gui/statuswindow.cpp:215
-msgid "Exp"
-msgstr "Exp"
+#: ../src/gui/debugwindow.cpp:65 ../src/gui/debugwindow.cpp:104
+#, c-format
+msgid "Music: %s"
+msgstr "Musique : %s"
 
-#: src/gui/statuswindow.cpp:224
-msgid "Money"
-msgstr "Argent"
+#: ../src/gui/npcdialog.cpp:73 ../src/gui/npcpostdialog.cpp:41
+msgid "NPC"
+msgstr "NPC"
 
-#: src/gui/statuswindow.cpp:234
-msgid "Job"
-msgstr "Habilité"
+#: ../src/resources/userpalette.cpp:95
+msgid "NPCs"
+msgstr "NPCs"
 
-#: src/gui/statuswindow.cpp:238
-#, c-format
-msgid "Character points: %d"
-msgstr "Points de personnage : %d"
+#: ../src/gui/setup_players.cpp:58
+msgid "Name"
+msgstr "Nom"
+
+#: ../src/gui/charcreatedialog.cpp:67 ../src/gui/login.cpp:54
+#: ../src/gui/register.cpp:67
+msgid "Name:"
+msgstr "Nom :"
 
-#: src/gui/statuswindow.cpp:244
+#: ../src/gui/unregisterdialog.cpp:51
 #, c-format
-msgid "Correction points: %d"
-msgstr "Points de correction : %d"
+msgid "Name: %s"
+msgstr "Nom : %s"
 
-#: src/gui/statuswindow.cpp:257
-msgid "Level"
-msgstr "Niveau"
+#: ../src/gui/ministatus.cpp:236
+msgid "Need"
+msgstr "Restant"
 
-#: src/gui/trade.cpp:52
-msgid "Propose trade"
-msgstr "Proposer un troc"
+#: ../src/gui/widgets/channeltab.cpp:126
+msgid "Need a user to kick!"
+msgstr "Indiquez quel utilisateur sortir !"
 
-#: src/gui/trade.cpp:53
-msgid "Confirmed. Waiting..."
-msgstr "Confirmé. En attente..."
+#: ../src/gui/widgets/channeltab.cpp:119
+msgid "Need a user to op!"
+msgstr "Indiquez à quel utilisateur donner les droit d'opérateur !"
 
-#: src/gui/trade.cpp:54
-msgid "Agree trade"
-msgstr "Accepter l'échange"
+#: ../src/game.cpp:386
+msgid "Network Error"
+msgstr "Erreur Réseau"
 
-#: src/gui/trade.cpp:55
-msgid "Agreed. Waiting..."
-msgstr "Accepté. En attente..."
+#: ../src/gui/setup_players.cpp:64
+msgid "Neutral"
+msgstr "Neutre"
 
-#: src/gui/trade.cpp:58
-msgid "Trade: You"
-msgstr "Échange : Vous"
+#: ../src/net/manaserv/loginhandler.cpp:149
+msgid "New email address incorrect."
+msgstr "Nouvelle adresse email incorrecte."
 
-#: src/gui/trade.cpp:72 src/gui/trade.cpp:73
-msgid "Trade"
-msgstr "Échange"
+#: ../src/net/manaserv/loginhandler.cpp:118
+msgid "New password incorrect."
+msgstr "Nouveau mot de passe incorrect."
 
-#: src/gui/trade.cpp:75
-msgid "Add"
-msgstr "Ajouter"
+#: ../src/net/tmwa/loginhandler.cpp:92
+msgid "New password too short."
+msgstr "Le nouveau mot de passe est trop court."
 
-#: src/gui/trade.cpp:97 src/gui/trade.cpp:133
-#, c-format
-msgid "You get %s"
-msgstr "Vous recevez %s"
+#: ../src/gui/npcdialog.cpp:49
+msgid "Next"
+msgstr "Suivant"
 
-#: src/gui/trade.cpp:98
-msgid "You give:"
-msgstr "Vous donnez :"
+#: ../src/keyboardconfig.cpp:100
+msgid "Next Chat Tab"
+msgstr "Onglet de la conversation suivante"
 
-#: src/gui/trade.cpp:102
-msgid "Change"
-msgstr "Changer"
+#: ../src/gui/confirmdialog.cpp:43
+msgid "No"
+msgstr "Non"
 
-#: src/gui/trade.cpp:273
-msgid "Failed adding item. You can not overlap one kind of item on the window."
+#: ../src/commandhandler.cpp:407
+msgid "No <nick> was given."
+msgstr "Aucun <nom de personnage> n'a été donné."
+
+#: ../src/net/manaserv/charhandler.cpp:141
+msgid "No empty slot."
+msgstr "Pas d'emplacement vide."
+
+#: ../src/net/manaserv/charhandler.cpp:264
+msgid "No gameservers are available."
+msgstr "Pas de serveur de jeu disponible."
+
+#: ../src/net/tmwa/generalhandler.cpp:135
+msgid "No servers available."
+msgstr "Aucun serveur n'est disponible."
+
+#: ../src/gui/setup_video.cpp:157
+msgid "No text"
+msgstr "Pas de texte"
+
+#: ../src/net/manaserv/beinghandler.cpp:289
+#: ../src/net/tmwa/playerhandler.cpp:102
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
 msgstr ""
-"L'objet ne peux être ajouté. Vous ne pouvez ajouter deux fois le même objet "
-"dans cette fenêtre."
+"Non mon enfant. Ton personnage n'est pas vraiment mort... Il... enfin,.. "
+"il... est parti dans un monde meilleur."
 
-#: src/gui/trade.cpp:316
-msgid "You don't have enough money."
-msgstr "Vous n'avez pas assez d'argent."
+#: ../src/gui/setup_video.cpp:271 ../src/gui/setup_video.cpp:526
+#: ../src/gui/setup_video.cpp:656
+msgid "None"
+msgstr "Aucun"
 
-#: src/gui/unregisterdialog.cpp:51
-#, c-format
-msgid "Name: %s"
-msgstr "Nom : %s"
+#: ../src/gui/recorder.cpp:91
+msgid "Not currently recording."
+msgstr "Pas d'enregistrement en cours."
 
-#: src/gui/updatewindow.cpp:124
-msgid "Updating..."
-msgstr "Mise à jour en cours..."
+#: ../src/net/manaserv/charhandler.cpp:138
+#: ../src/net/manaserv/charhandler.cpp:219
+msgid "Not logged in."
+msgstr "Non connecté."
 
-#: src/gui/updatewindow.cpp:142
-msgid "Connecting..."
-msgstr "Connexion..."
+#: ../src/net/tmwa/buysellhandler.cpp:109
+msgid "Nothing to sell."
+msgstr "Rien à vendre."
 
-#: src/gui/updatewindow.cpp:145
-msgid "Play"
-msgstr "Jouer"
+#: ../src/gui/setup_audio.cpp:94
+msgid "Notice"
+msgstr "Message"
 
-#: src/gui/updatewindow.cpp:417
-msgid "##1  The update process is incomplete."
-msgstr "##1 Le processus de mise à jour n'est pas achevé"
+#: ../src/gui/itemamount.cpp:113 ../src/gui/okdialog.cpp:42
+#: ../src/gui/quitdialog.cpp:46 ../src/gui/textdialog.cpp:39
+#: ../src/gui/trade.cpp:72 ../src/gui/trade.cpp:74
+msgid "OK"
+msgstr "Ok"
 
-#. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:419
-msgid "##1  It is strongly recommended that"
-msgstr "##1 Il est fortement recommandé que"
+#: ../src/net/manaserv/loginhandler.cpp:152
+msgid "Old email address incorrect."
+msgstr "Ancienne adresse email incorrecte."
 
-#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:421
-msgid "##1  you try again later."
-msgstr "##1 Essayez à nouveau plus tard"
+#: ../src/net/manaserv/loginhandler.cpp:121
+#: ../src/net/tmwa/loginhandler.cpp:89
+msgid "Old password incorrect."
+msgstr "Ancien mot de passe incorrect."
 
-#: src/gui/updatewindow.cpp:515
-msgid "Completed"
-msgstr "Terminé"
+#: ../src/net/tmwa/gamehandler.cpp:89
+#, c-format
+msgid "Online users: %d"
+msgstr "Joueurs en ligne : %d"
 
-#: src/gui/userpalette.cpp:91
-msgid "Being"
-msgstr "Forme de vie"
+#: ../src/gui/setup_video.cpp:212
+msgid "OpenGL"
+msgstr "OpenGL"
+
+#: ../src/commandhandler.h:31
+#, c-format
+msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr ""
+"Les options qui peuvent être transmises à /%s sont \"yes\", \"no\", \"true"
+"\", \"false\", \"1\", \"0\"."
+
+#: ../src/main.cpp:47
+msgid "Options:"
+msgstr "Options :"
 
-#: src/gui/userpalette.cpp:92
+#: ../src/resources/userpalette.cpp:103
+msgid "Other Player Hits Monster"
+msgstr "L'autre joueur touche le monstre"
+
+#: ../src/resources/userpalette.cpp:92
 msgid "Other Players' Names"
 msgstr "Nom des autres joueurs"
 
-#: src/gui/userpalette.cpp:93
+#: ../src/gui/outfitwindow.cpp:68 ../src/gui/outfitwindow.cpp:141
+#: ../src/gui/outfitwindow.cpp:154
+#, c-format
+msgid "Outfit: %d"
+msgstr "Tenue : %d"
+
+#: ../src/gui/inventorywindow.cpp:109 ../src/gui/outfitwindow.cpp:51
+msgid "Outfits"
+msgstr "Tenues"
+
+#: ../src/keyboardconfig.cpp:81
+msgid "Outfits Window"
+msgstr "Fenêtre des tenues"
+
+#: ../src/gui/setup_video.cpp:252
+msgid "Overhead text"
+msgstr "Texte aérien"
+
+#: ../src/resources/userpalette.cpp:93
 msgid "Own Name"
 msgstr "Mon nom"
 
-#: src/gui/userpalette.cpp:94
-msgid "GM Names"
-msgstr "Nom des MJ"
+#: ../src/gui/setup_video.cpp:606
+msgid "Particle Effect Settings Changed."
+msgstr "Paramètres d'effet de particules modifiés."
 
-#: src/gui/userpalette.cpp:95
-msgid "NPCs"
-msgstr "PNJs"
+#: ../src/resources/userpalette.cpp:99
+msgid "Particle Effects"
+msgstr "Effets de particules"
 
-#: src/gui/userpalette.cpp:96
-msgid "Monsters"
-msgstr "Monstres"
+#: ../src/gui/debugwindow.cpp:69 ../src/gui/debugwindow.cpp:111
+#, c-format
+msgid "Particle count: %d"
+msgstr "Effets de particules : %d"
 
-#: src/gui/userpalette.cpp:97
-msgid "Party Members"
-msgstr "Membres du groupe"
+#: ../src/gui/setup_video.cpp:255
+msgid "Particle detail"
+msgstr "Détail des particules"
 
-#: src/gui/userpalette.cpp:98
-msgid "Guild Members"
-msgstr "Membres de la guilde"
+#: ../src/gui/debugwindow.cpp:116
+#, c-format
+msgid "Particle detail: %s"
+msgstr "Détail des particules : %s"
 
-#: src/gui/userpalette.cpp:99
-msgid "Particle Effects"
+#: ../src/gui/setup_video.cpp:217
+msgid "Particle effects"
 msgstr "Effets de particules"
 
-#: src/gui/userpalette.cpp:100
-msgid "Pickup Notification"
-msgstr "Information de récupération"
+#: ../src/net/tmwa/gui/partytab.cpp:43
+msgid "Party"
+msgstr "Groupe"
 
-#: src/gui/userpalette.cpp:101
-msgid "Exp Notification"
-msgstr "Information d'expérience"
+#: ../src/gui/socialwindow.cpp:218
+#, c-format
+msgid "Party %s quit requested."
+msgstr "Vous avez demandé à quitter le groupe %s."
 
-#: src/gui/userpalette.cpp:103
-msgid "Other Player Hits Monster"
-msgstr "L'autre joueur touche le monstre"
+#: ../src/resources/userpalette.cpp:97
+msgid "Party Members"
+msgstr "Membres du groupe"
 
-#: src/gui/userpalette.cpp:104
-msgid "Monster Hits Player"
-msgstr "Le monstre touche le joueur"
+#: ../src/gui/socialwindow.cpp:625
+msgid "Party Name"
+msgstr "Nom du groupe"
 
-#: src/gui/userpalette.cpp:105
-msgid "Critical Hit"
-msgstr "Coup critique"
+#: ../src/commandhandler.cpp:448 ../src/net/tmwa/gui/partytab.cpp:109
+msgid "Party name is missing."
+msgstr "Indiquez un nom de groupe."
 
-#: src/gui/userpalette.cpp:107
-msgid "Local Player Hits Monster"
-msgstr "Votre personnage touche le monstre"
+#: ../src/net/tmwa/partyhandler.cpp:84
+msgid "Party successfully created."
+msgstr "Création du groupe réussie."
 
-#: src/gui/userpalette.cpp:109
-msgid "Local Player Critical Hit"
-msgstr "Coup critique"
+#: ../src/gui/beingpopup.cpp:76
+#, c-format
+msgid "Party: %s"
+msgstr "Groupe : %s"
 
-#: src/gui/userpalette.cpp:111
-msgid "Local Player Miss"
-msgstr "Votre personnage manque son coup"
+#: ../src/client.cpp:916
+msgid "Password Change"
+msgstr "Changement de mot de passe"
 
-#: src/gui/userpalette.cpp:112
-msgid "Misses"
-msgstr "Coups manqués"
+#: ../src/client.cpp:917
+msgid "Password changed successfully!"
+msgstr "Le mot de passe a été changé avec succès !"
 
-#: src/gui/widgets/channeltab.cpp:49
-msgid "/users > Lists the users in the current channel"
-msgstr "/users > Affiche la liste des utilisateurs de ce salon"
+#: ../src/gui/changepassworddialog.cpp:61 ../src/gui/login.cpp:55
+#: ../src/gui/register.cpp:68 ../src/gui/unregisterdialog.cpp:53
+msgid "Password:"
+msgstr "Mot de passe :"
 
-#: src/gui/widgets/channeltab.cpp:50
-msgid "/topic > Set the topic of the current channel"
-msgstr "/topic > Change le sujet du salon"
+#: ../src/gui/register.cpp:197
+msgid "Passwords do not match."
+msgstr "Les deux mots de passe sont différents"
 
-#: src/gui/widgets/channeltab.cpp:51
-msgid "/quit > Leave a channel"
-msgstr "/quit > Quitter un salon"
+#: ../src/gui/popupmenu.cpp:188
+#, c-format
+msgid "Pick up %s"
+msgstr "Ramasser %s"
 
-#: src/gui/widgets/channeltab.cpp:52
-msgid "/op > Make a user a channel operator"
-msgstr "/op > Faire de l'utilisateur un opérateur du salon"
+#: ../src/keyboardconfig.cpp:51
+msgid "Pickup"
+msgstr "Ramasser"
 
-#: src/gui/widgets/channeltab.cpp:53
-msgid "/kick > Kick a user from the channel"
-msgstr "/kick > Sortir un utilisateur du salon"
+#: ../src/resources/userpalette.cpp:100
+msgid "Pickup Notification"
+msgstr "Information de récupération"
 
-#: src/gui/widgets/channeltab.cpp:63
-msgid "Command: /users"
-msgstr "Commande : /users"
+#: ../src/gui/updatewindow.cpp:145
+msgid "Play"
+msgstr "Jouer"
 
-#: src/gui/widgets/channeltab.cpp:64
-msgid "This command shows the users in this channel."
-msgstr "Cette commande affiche la liste d'utilisateurs présents dans ce salon."
+#: ../src/commandhandler.cpp:544
+msgid "Player already ignored!"
+msgstr "Le joueur est déjà ignoré !"
 
-#: src/gui/widgets/channeltab.cpp:68
-msgid "Command: /topic <message>"
-msgstr "Commande: /topic <message>"
+#: ../src/commandhandler.cpp:553
+msgid "Player could not be ignored!"
+msgstr "Le joueur n'a pas pu être ignoré !"
 
-#: src/gui/widgets/channeltab.cpp:69
-msgid "This command sets the topic to <message>."
-msgstr "Cette commande change le sujet du salon en <message>"
+#: ../src/commandhandler.cpp:575
+msgid "Player could not be unignored!"
+msgstr "Le joueur est toujours ignoré !"
 
-#: src/gui/widgets/channeltab.cpp:73
-msgid "Command: /quit"
-msgstr "Commande : /quit"
+#: ../src/net/manaserv/charhandler.cpp:210
+msgid "Player deleted."
+msgstr "Personnage effacé."
 
-#: src/gui/widgets/channeltab.cpp:74
-msgid "This command leaves the current channel."
-msgstr "Cette commande quitte le salon."
+#: ../src/commandhandler.cpp:573
+msgid "Player no longer ignored!"
+msgstr "Le joueur n'est plus ignoré !"
 
-#: src/gui/widgets/channeltab.cpp:75
-msgid "If you're the last person in the channel, it will be deleted."
-msgstr ""
-"Si vous étiez la dernière personne présente dans ce salon, il sera supprimé."
+#: ../src/commandhandler.cpp:551
+msgid "Player successfully ignored!"
+msgstr "Le joueur est désormais ignoré !"
 
-#: src/gui/widgets/channeltab.cpp:80
-msgid "Command: /op <nick>"
-msgstr "Commande : /op <nick>"
+#: ../src/commandhandler.cpp:568
+msgid "Player wasn't ignored!"
+msgstr "Le joueur n'était pas ignoré !"
 
-#: src/gui/widgets/channeltab.cpp:81
-msgid "This command makes <nick> a channel operator."
-msgstr "Cette commande donne les droit d'opérateur du salon à <nick>"
+#: ../src/gui/setup_players.cpp:237
+msgid "Players"
+msgstr "Joueurs"
 
-#: src/gui/widgets/channeltab.cpp:84
-msgid "Channel operators can kick and op other users from the channel."
-msgstr ""
-"Seul les opérateurs du salon peuvent sortir des utilisateurs et donner les "
-"droit d'opérateur aux autres utilisateurs du salon."
+#: ../src/net/manaserv/chathandler.cpp:194
+#: ../src/net/manaserv/chathandler.cpp:277
+msgid "Players in this channel:"
+msgstr "Joueurs dans ce salon :"
 
-#: src/gui/widgets/channeltab.cpp:89
-msgid "Command: /kick <nick>"
-msgstr "Commande : /kick <nick>"
+#: ../src/gui/charcreatedialog.cpp:99 ../src/gui/charcreatedialog.cpp:257
+#, c-format
+msgid "Please distribute %d points"
+msgstr "Veuillez distribuer %d points"
 
-#: src/gui/widgets/channeltab.cpp:90
-msgid "This command makes <nick> leave the channel."
-msgstr "Cette commande sort <nick> du salon."
+#: ../src/gui/charcreatedialog.cpp:262
+#, c-format
+msgid "Please remove %d points"
+msgstr "Veuillez retirer %d points"
 
-#: src/gui/widgets/channeltab.cpp:119
-msgid "Need a user to op!"
-msgstr "Indiquez à quel utilisateur donner les droit d'opérateur !"
+#: ../src/commandhandler.cpp:461 ../src/commandhandler.cpp:538
+#: ../src/commandhandler.cpp:560
+msgid "Please specify a name."
+msgstr "Veuillez indiquer un nom."
 
-#: src/gui/widgets/channeltab.cpp:126
-msgid "Need a user to kick!"
-msgstr "Indiquez quel utilisateur sortir !"
+#: ../src/gui/serverdialog.cpp:324
+msgid "Please type both the address and the port of a server."
+msgstr "Veuillez entrer l'adresse et le port du serveur."
 
-#: src/gui/widgets/chattab.cpp:120
-msgid "Global announcement:"
-msgstr "Annonce globale :"
+#: ../src/net/tmwa/specialhandler.cpp:214
+msgid "Poison had no effect..."
+msgstr "Le poison fut sans effet..."
+
+#: ../src/gui/serverdialog.cpp:207
+msgid "Port:"
+msgstr "Port :"
 
-#: src/gui/widgets/chattab.cpp:126
+#: ../src/gui/serverdialog.cpp:451
+msgid "Preparing download"
+msgstr "Préparation du téléchargement"
+
+#: ../src/gui/chat.cpp:311
 #, c-format
-msgid "Global announcement from %s:"
-msgstr "Annonce globale de %s :"
+msgid "Present: %s; %d players are present."
+msgstr "Présents : %s ; %d joueurs sont présents."
+
+#: ../src/net/manaserv/beinghandler.cpp:303
+msgid "Press OK to respawn."
+msgstr "Cliquer sur OK pour ressusciter."
 
-#: src/gui/widgets/chattab.cpp:152
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:78
+msgid "Press the button to start calibration"
+msgstr "Presser le bouton pour démarrer la calibration"
+
+#: ../src/keyboardconfig.cpp:99
+msgid "Previous Chat Tab"
+msgstr "Onglet de la conversation précédente"
+
+#: ../src/gui/buy.cpp:69 ../src/gui/buy.cpp:267 ../src/gui/sell.cpp:71
+#: ../src/gui/sell.cpp:288
 #, c-format
-msgid "%s whispers: %s"
-msgstr "Message privé de %s : %s"
+msgid "Price: %s / Total: %s"
+msgstr "Prix : %s / Total : %s"
 
-#: src/gui/widgets/whispertab.cpp:52
-msgid "Cannot send empty chat!"
-msgstr "Impossible d'envoyer une conversation vide !"
+#: ../src/playerrelations.cpp:324
+msgid "Print '...'"
+msgstr "Affiche '...'"
 
-#: src/gui/widgets/whispertab.cpp:71
-msgid "/ignore > Ignore the other player"
-msgstr "/ignore > Ignore l'autre joueur"
+#: ../src/gui/trade.cpp:53
+msgid "Propose trade"
+msgstr "Proposer un troc"
 
-#: src/gui/widgets/whispertab.cpp:72
-msgid "/unignore > Stop ignoring the other player"
-msgstr "/unignore > Cesse d'ignorer l'autre joueur"
+#: ../src/gui/setup_colors.cpp:85 ../src/gui/setup_colors.cpp:86
+#: ../src/gui/setup_colors.cpp:332
+msgid "Pulse"
+msgstr "Impulsion"
 
-#: src/gui/widgets/whispertab.cpp:73
-msgid "/close > Close the whisper tab"
-msgstr "/close > Ferme l'onglet de conversation privée"
+#: ../src/gui/setup_players.cpp:231
+msgid "Put all whispers in tabs"
+msgstr "Placer tous les messages privés dans des onglets"
 
-#: src/gui/widgets/whispertab.cpp:83
-msgid "Command: /close"
-msgstr "Commande : /close"
+#: ../src/gui/buy.cpp:79 ../src/gui/quitdialog.cpp:40
+#: ../src/gui/quitdialog.cpp:42 ../src/gui/quitdialog.cpp:43
+#: ../src/gui/sell.cpp:77 ../src/gui/serverdialog.cpp:228
+#: ../src/keyboardconfig.cpp:102
+msgid "Quit"
+msgstr "Quitter"
 
-#: src/gui/widgets/whispertab.cpp:84
-msgid "This command closes the current whisper tab."
-msgstr "Cette commande ferme l'onglet courant de conversation privée."
+#: ../src/gui/setup_colors.cpp:87 ../src/gui/setup_colors.cpp:88
+#: ../src/gui/setup_colors.cpp:333
+msgid "Rainbow"
+msgstr "Arc-en-ciel"
 
-#: src/gui/widgets/whispertab.cpp:88
-msgid "Command: /ignore"
-msgstr "Commande : /ignore"
+#: ../src/gui/socialwindow.cpp:553
+msgid "Received guild request, but one already exists."
+msgstr ""
+"Vous avez reçu une demande pour rejoindre une guilde, mais il en existe déjà "
+"une."
 
-#: src/gui/widgets/whispertab.cpp:89
-msgid "This command ignores the other player regardless of current relations."
+#: ../src/gui/socialwindow.cpp:575
+msgid "Received party request, but one already exists."
 msgstr ""
-"Cette commande permet d'ignorer un joueur qu'il soit indiqué comme ami ou "
-"non."
+"Vous avez reçu une demande de rejoindre un groupe, mais il en existe déjà un."
 
-#: src/gui/widgets/whispertab.cpp:95
-msgid "This command stops ignoring the other player if they are being ignored."
-msgstr "Cette commande vous fait cesser d'ignorer un joueur si c'était le cas."
+#: ../src/gui/recorder.h:38
+msgid "Recording..."
+msgstr "En cours d'enregistrement..."
 
-#: src/gui/windowmenu.cpp:54
-msgid "Status"
-msgstr "Statut"
+#: ../src/gui/setup_colors.cpp:109
+msgid "Red:"
+msgstr "Rouge : "
 
-#: src/gui/windowmenu.cpp:65
-msgid "Shortcut"
-msgstr "Raccourcis"
+#: ../src/gui/login.cpp:61 ../src/gui/register.cpp:58
+#: ../src/gui/register.cpp:73
+msgid "Register"
+msgstr "S'inscrire"
 
-#: src/gui/worldselectdialog.cpp:71
-msgid "Select World"
-msgstr "Sélection du monde"
+#: ../src/gui/login.cpp:129
+msgid "Registration disabled"
+msgstr "Enregistrement désactivé"
 
-#: src/gui/worldselectdialog.cpp:76
-msgid "Change Login"
-msgstr "Changer de Login"
+#: ../src/net/tmwa/loginhandler.cpp:165
+msgid "Rejected from server."
+msgstr "Rejeté par le serveur."
 
-#: src/gui/worldselectdialog.cpp:77
-msgid "Choose World"
-msgstr "Choix du monde"
+#: ../src/gui/socialwindow.cpp:468
+#, fuzzy
+msgid "Rejected guild invite."
+msgstr "Le joueur a refusé l'invitation dans la guilde."
 
-#: src/keyboardconfig.cpp:40
-msgid "Move Up"
-msgstr "Monter"
+#: ../src/gui/socialwindow.cpp:450
+#, c-format
+msgid "Rejected party invite from %s."
+msgstr "Invitation dans le groupe de la part de %s refusée."
 
-#: src/keyboardconfig.cpp:41
-msgid "Move Down"
-msgstr "Descendre"
+#: ../src/gui/setup_players.cpp:59
+msgid "Relation"
+msgstr "Relation"
 
-#: src/keyboardconfig.cpp:42
-msgid "Move Left"
-msgstr "Aller à gauche"
+#: ../src/gui/login.cpp:60
+msgid "Remember username"
+msgstr "Se souvenir du nom d'utilisateur"
 
-#: src/keyboardconfig.cpp:43
-msgid "Move Right"
-msgstr "Aller à droite"
+#: ../src/net/manaserv/tradehandler.cpp:115
+#: ../src/net/tmwa/tradehandler.cpp:109
+msgid "Request for Trade"
+msgstr "Demande d'échange"
 
-#: src/keyboardconfig.cpp:44 src/net/tmwa/generalhandler.cpp:224
-msgid "Attack"
-msgstr "Attaquer"
+#: ../src/net/tmwa/gamehandler.cpp:102
+msgid "Request to quit denied!"
+msgstr "Requête de départ refusée !"
 
-#: src/keyboardconfig.cpp:45
-msgid "Target & Attack"
-msgstr "Cibler et Attaquer"
+#: ../src/client.cpp:809
+msgid "Requesting characters"
+msgstr "Téléchargement des personnnages"
 
-#: src/keyboardconfig.cpp:46
-msgid "Smilie"
-msgstr "Smilie"
+#: ../src/client.cpp:889
+msgid "Requesting registration details"
+msgstr "Demande des paramètres d'enregistrement"
 
-#: src/keyboardconfig.cpp:47
-msgid "Talk"
-msgstr "Parler"
+#: ../src/commandhandler.cpp:435
+#, c-format
+msgid "Requesting to join channel %s."
+msgstr "Il vous est demandé de rejoindre le salon %s."
 
-#: src/keyboardconfig.cpp:48
-msgid "Stop Attack"
-msgstr "Arrêter d'attaquer"
+#: ../src/gui/npcdialog.cpp:134
+msgid "Reset"
+msgstr "Réinitialiser"
 
-#: src/keyboardconfig.cpp:49
-msgid "Target Monster"
-msgstr "Cibler un monstre"
+#: ../src/gui/setup.cpp:51
+msgid "Reset Windows"
+msgstr "Rétablir les fenêtres"
 
-#: src/keyboardconfig.cpp:50
-msgid "Target NPC"
-msgstr "Cibler le PNJ"
+#: ../src/gui/setup_video.cpp:438
+msgid "Restart needed for changes to take effect."
+msgstr ""
+"Les changements ne seront pris en compte qu'au prochain démarrage du jeu."
 
-#: src/keyboardconfig.cpp:51
-msgid "Target Player"
-msgstr "Cibler le Joueur"
+#: ../src/gui/setup_video.cpp:571 ../src/gui/setup_video.cpp:576
+msgid "Restart your client for the change to take effect."
+msgstr "Redémarrez le jeu pour que les changements soient appliqués."
 
-#: src/keyboardconfig.cpp:52
-msgid "Pickup"
-msgstr "Ramasser"
+#: ../src/gui/inventorywindow.cpp:132 ../src/gui/popupmenu.cpp:385
+msgid "Retrieve"
+msgstr "Récupérer"
 
-#: src/keyboardconfig.cpp:53
-msgid "Hide Windows"
-msgstr "Cacher les fenêtres"
+#: ../src/commandhandler.cpp:488
+msgid "Return now toggles chat."
+msgstr "La touche Entrée ferme la ligne d'entrée de la conversation."
 
-#: src/keyboardconfig.cpp:54
-msgid "Sit"
-msgstr "S'assoir"
+#: ../src/commandhandler.cpp:479
+msgid "Return toggles chat."
+msgstr "La touche Entrée ferme maintenant la ligne d'entrée du chat."
+
+#: ../src/gui/setup_joystick.cpp:84
+msgid "Rotate the stick"
+msgstr "Tourner le joystick"
+
+#: ../src/net/manaserv/beinghandler.cpp:295
+#: ../src/net/tmwa/playerhandler.cpp:110
+msgid "Sadly, no trace of you was ever found..."
+msgstr "Tristement, aucune trace de vous ne fut jamais retrouvée..."
 
-#: src/keyboardconfig.cpp:55
+#: ../src/game.cpp:354
+msgid "Saving screenshot failed!"
+msgstr "Impossible de sauvegarder la capture d'écran !"
+
+#: ../src/gui/setup_video.cpp:570 ../src/gui/setup_video.cpp:575
+msgid "Screen Resolution Changed"
+msgstr "Résolution de l'écran modifiée"
+
+#: ../src/keyboardconfig.cpp:54
 msgid "Screenshot"
 msgstr "Capture d'écran"
 
-#: src/keyboardconfig.cpp:56
-msgid "Enable/Disable Trading"
-msgstr "Activer / Désactiver les échanges"
+#: ../src/game.cpp:349
+msgid "Screenshot saved as "
+msgstr "Capture d'écran sauvegardée en tant que"
 
-#: src/keyboardconfig.cpp:57
-msgid "Find Path to Mouse"
-msgstr "Trouver le chemin vers la souris"
+#: ../src/keyboardconfig.cpp:98
+msgid "Scroll Chat Down"
+msgstr "Défiler la conversation (bas)"
 
-#: src/keyboardconfig.cpp:58 src/keyboardconfig.cpp:59
-#: src/keyboardconfig.cpp:60 src/keyboardconfig.cpp:61
-#: src/keyboardconfig.cpp:62 src/keyboardconfig.cpp:63
-#: src/keyboardconfig.cpp:64 src/keyboardconfig.cpp:65
-#: src/keyboardconfig.cpp:66 src/keyboardconfig.cpp:67
-#: src/keyboardconfig.cpp:68 src/keyboardconfig.cpp:69
-#, c-format
-msgid "Item Shortcut %d"
-msgstr "Raccourci Objet %d"
+#: ../src/keyboardconfig.cpp:97
+msgid "Scroll Chat Up"
+msgstr "Défiler la conversation (haut)"
 
-#: src/keyboardconfig.cpp:70
-msgid "Help Window"
-msgstr "Fenêtre d'Aide"
+#: ../src/gui/inventorywindow.cpp:87
+msgid "Search:"
+msgstr ""
 
-#: src/keyboardconfig.cpp:71
-msgid "Status Window"
-msgstr "Fenêtre d'état"
+#: ../src/net/tmwa/specialhandler.cpp:184
+msgid "Seems you need more money... ;-)"
+msgstr "Il semblerait que vous ayez besoin de plus d'argent... ;)"
 
-#: src/keyboardconfig.cpp:72
-msgid "Inventory Window"
-msgstr "Fenêtre de l'inventaire"
+#: ../src/keyboardconfig.cpp:101
+msgid "Select OK"
+msgstr "Sélectionner OK"
 
-#: src/keyboardconfig.cpp:73
-msgid "Equipment Window"
-msgstr "Fenêtre d'équipements."
+#: ../src/gui/worldselectdialog.cpp:71
+msgid "Select World"
+msgstr "Sélection du monde"
 
-#: src/keyboardconfig.cpp:74
-msgid "Skill Window"
-msgstr "Fenêtre de compétences"
+#: ../src/gui/itemamount.cpp:144
+msgid "Select amount of items to drop."
+msgstr "Choisissez le nombre d'objets à jeter."
 
-#: src/keyboardconfig.cpp:75
-#, fuzzy
-msgid "Minimap Window"
-msgstr ""
-"#-#-#-#-#  fr.po (The Mana World 0.1.0)  #-#-#-#-#\n"
-"Fenêtre du plan\n"
-"#-#-#-#-#  po_fr rewiew1.po (The Mana World 0.1.0)  #-#-#-#-#\n"
-"Fenêtre du miniplan"
+#: ../src/gui/itemamount.cpp:150
+msgid "Select amount of items to retrieve."
+msgstr "Sélectionnez le nombre d'objet à reprendre"
 
-#: src/keyboardconfig.cpp:76
-msgid "Chat Window"
-msgstr "Fenêtre de conversation"
+#: ../src/gui/itemamount.cpp:153
+msgid "Select amount of items to split."
+msgstr "Choisissez le nombre d'objets à déplacer."
 
-#: src/keyboardconfig.cpp:77
-msgid "Item Shortcut Window"
-msgstr "Fenêtre de raccourci objet"
+#: ../src/gui/itemamount.cpp:147
+msgid "Select amount of items to store."
+msgstr "Sélectionnez le nombre d'objets à stocker."
 
-#: src/keyboardconfig.cpp:78
-msgid "Setup Window"
-msgstr "Fenêtre de configuration"
+#: ../src/gui/itemamount.cpp:141
+msgid "Select amount of items to trade."
+msgstr "Choisissez le nombre d'objets à troquer."
 
-#: src/keyboardconfig.cpp:79
-msgid "Debug Window"
-msgstr "Fenêtre de debug"
+#: ../src/net/manaserv/charhandler.cpp:222
+msgid "Selection out of range."
+msgstr "La sélection est invalide."
 
-#: src/keyboardconfig.cpp:80
-msgid "Social Window"
-msgstr "Groupes et Guildes"
+#: ../src/gui/buysell.cpp:47 ../src/gui/sell.cpp:49 ../src/gui/sell.cpp:76
+msgid "Sell"
+msgstr "Vendre"
 
-#: src/keyboardconfig.cpp:81
-msgid "Emote Shortcut Window"
-msgstr "Fenêtre de raccourcis d'emote"
+#: ../src/gui/npcpostdialog.cpp:54
+msgid "Send"
+msgstr "Envoyer"
 
-#: src/keyboardconfig.cpp:82
-msgid "Outfits Window"
-msgstr "Fenêtre des tenues"
+#: ../src/net/tmwa/loginhandler.cpp:182
+msgid "Server overpopulated."
+msgstr ""
 
-#: src/keyboardconfig.cpp:83
-msgid "Wear Outfit"
-msgstr "Mettre la tenue"
+#: ../src/net/net.cpp:164
+msgid "Server protocol unsupported"
+msgstr ""
 
-#: src/keyboardconfig.cpp:84
-msgid "Copy Outfit"
-msgstr "Copier la tenue"
+#: ../src/gui/serverdialog.cpp:208
+msgid "Server type:"
+msgstr "Type de Serveur :"
 
-#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86
-#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
-#, c-format
-msgid "Emote Shortcut %d"
-msgstr "Raccourci d'emote %d"
+#: ../src/gui/serverdialog.cpp:206 ../src/gui/widgets/chattab.cpp:142
+msgid "Server:"
+msgstr "Serveur :"
 
-#: src/keyboardconfig.cpp:97
-msgid "Toggle Chat"
-msgstr "Activer / Désactiver la conversation"
+#: ../src/client.cpp:580 ../src/gui/setup.cpp:43 ../src/gui/windowmenu.cpp:66
+msgid "Setup"
+msgstr "Configuration"
 
-#: src/keyboardconfig.cpp:98
-msgid "Scroll Chat Up"
-msgstr "Défiler la conversation (haut)"
+#: ../src/keyboardconfig.cpp:77
+msgid "Setup Window"
+msgstr "Fenêtre de configuration"
 
-#: src/keyboardconfig.cpp:99
-msgid "Scroll Chat Down"
-msgstr "Défiler la conversation (bas)"
+#: ../src/gui/setup_audio.cpp:50
+msgid "Sfx volume"
+msgstr "Volume des effets sonores"
 
-#: src/keyboardconfig.cpp:100
-msgid "Previous Chat Tab"
-msgstr "Onglet de la conversation précédente"
+#: ../src/gui/buysell.cpp:38
+msgid "Shop"
+msgstr "Magasin"
 
-#: src/keyboardconfig.cpp:101
-msgid "Next Chat Tab"
-msgstr "Onglet de la conversation suivante"
+#: ../src/gui/windowmenu.cpp:65
+msgid "Shortcut"
+msgstr "Raccourcis"
 
-#: src/keyboardconfig.cpp:102
-msgid "Select OK"
-msgstr "Sélectionner OK"
+#: ../src/commandhandler.cpp:505 ../src/commandhandler.cpp:514
+msgid "Show IP: Off"
+msgstr "Afficher l'IP : Désactivé"
 
-#: src/keyboardconfig.cpp:104
-msgid "Ignore input 1"
-msgstr "Ignorer l'entrée 1"
+#: ../src/commandhandler.cpp:505 ../src/commandhandler.cpp:518
+msgid "Show IP: On"
+msgstr "Afficher l'IP : Activé"
 
-#: src/keyboardconfig.cpp:105
-msgid "Ignore input 2"
-msgstr "Ignorer l'entrée 2"
+#: ../src/gui/setup_video.cpp:246
+msgid "Show damage"
+msgstr "Afficher les dégâts"
 
-#: src/keyboardconfig.cpp:184
-#, c-format
-msgid ""
-"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
-"strange behaviour."
-msgstr ""
-"Conflit entre les touches \"%s\" and \"%s\". Veuillez changer au moins l'une "
-"des touches ou attendez vous à un possible comportement étrange du jeu."
+#: ../src/gui/setup_players.cpp:233
+msgid "Show gender"
+msgstr "Afficher le sexe"
 
-#: src/localplayer.cpp:1248
-msgid "Unable to pick up item."
-msgstr "Impossible de ramasser l'objet."
+#: ../src/gui/setup_video.cpp:219
+msgid "Show own name"
+msgstr "Afficher son propre nom"
 
-#. TRANSLATORS: This sentence may be translated differently
-#. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:1257
-#, c-format
-msgid "You picked up %d [@@%d|%s@@]."
-msgid_plural "You picked up %d [@@%d|%s@@]."
-msgstr[0] "Vous avez ramassé %d [@@%d|%s@@]."
-msgstr[1] "Vous avez ramassé %d [@@%d|%s@@]."
+#: ../src/gui/setup_video.cpp:221
+msgid "Show pickup notification"
+msgstr "Afficher les messages de ramassage"
 
-#: src/localplayer.cpp:1435
-msgid "Away"
-msgstr "Inactif"
+#: ../src/keyboardconfig.cpp:53
+msgid "Sit"
+msgstr "S'assoir"
 
-#: src/main.cpp:42
-msgid "mana [options] [mana-file]"
-msgstr "mana [options] [fichier-mana]"
+#: ../src/net/tmwa/specialhandler.cpp:151
+msgid "Sit failed!"
+msgstr "Vous n'avez pas pu vous assoir !"
 
-#: src/main.cpp:43
-msgid "Options:"
-msgstr "Options :"
+#: ../src/gui/skilldialog.cpp:377
+#, c-format
+msgid "Skill %d"
+msgstr "Compétence %d"
 
-#: src/main.cpp:44
-msgid "  -v --version        : Display the version"
-msgstr "  -v --version : Affiche la version"
+#: ../src/gui/skilldialog.cpp:368
+#, c-format
+msgid "Skill Set %d"
+msgstr "Compétences : %d"
 
-#: src/main.cpp:45
-msgid "  -h --help           : Display this help"
-msgstr "  -h --help : Montre cette rubrique d'aide"
+#: ../src/keyboardconfig.cpp:73
+msgid "Skill Window"
+msgstr "Fenêtre de compétences"
 
-#: src/main.cpp:46
-msgid "  -C --config-dir     : Configuration directory to use"
-msgstr "  -C --config-dir : Répertoire de configuration à utiliser"
+#: ../src/gui/skilldialog.cpp:273
+#, c-format
+msgid "Skill points available: %d"
+msgstr "Points de compétences : %d"
 
-#: src/main.cpp:47
-msgid "  -U --username       : Login with this username"
-msgstr "  -U --username : Se connecter avec ce nom d'utilisateur"
+#: ../src/gui/skilldialog.cpp:215 ../src/gui/windowmenu.cpp:59
+msgid "Skills"
+msgstr "Compétences"
 
-#: src/main.cpp:48
-msgid "  -P --password       : Login with this password"
-msgstr "  -P --password : Se connecter avec ce mot de passe"
+#: ../src/gui/inventorywindow.cpp:86
+msgid "Slots:"
+msgstr "Cases :"
 
-#: src/main.cpp:49
-msgid "  -c --character      : Login with this character"
-msgstr "  -c --character : Se connecter avec ce personnage"
+#: ../src/gui/setup_video.cpp:129
+msgid "Small"
+msgstr "Petit"
 
-#: src/main.cpp:50
-msgid "  -s --server         : Login server name or IP"
-msgstr "  -s --server : Nom du serveur (ou IP) pour la connexion"
+#: ../src/keyboardconfig.cpp:45
+msgid "Smilie"
+msgstr "emote"
 
-#: src/main.cpp:51
-msgid "  -p --port           : Login server port"
-msgstr "  -p --port : Port de connexion au serveur"
+#: ../src/gui/socialwindow.cpp:312 ../src/gui/windowmenu.cpp:64
+msgid "Social"
+msgstr "Social"
 
-#: src/main.cpp:52
-msgid "     --update-host    : Use this update host"
-msgstr ""
-"     --update-host : Utilise cette URL pour les fichiers de mises à jour"
+#: ../src/keyboardconfig.cpp:79
+msgid "Social Window"
+msgstr "Fenêtre de Groupes et Guildes"
 
-#: src/main.cpp:53
-msgid "  -D --default        : Choose default character server and character"
+#: ../src/gui/setup_video.cpp:573
+msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
-"  -D --default : Choisir le serveur de personnages et le personnage par "
-"défaut"
+"Certaines fenêtres pourraient être déplacées pour correspondre à la nouvelle "
+"résolution."
 
-#: src/main.cpp:55
-msgid "  -u --skip-update    : Skip the update downloads"
-msgstr ""
-"  -u --skip-update : Ne pas effectuer le téléchargement des mises à jour"
+#: ../src/net/tmwa/generalhandler.cpp:139
+msgid "Someone else is trying to use this account."
+msgstr "Quelqu'un d'autre essaie d'utiliser ce compte."
 
-#: src/main.cpp:56
-msgid "  -d --data           : Directory to load game data from"
-msgstr "  -d --data : Répertoire des données du jeu à charger"
+#: ../src/gui/setup_audio.cpp:42
+msgid "Sound"
+msgstr "Son"
 
-#: src/main.cpp:57
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
-msgstr ""
-"  -L --localdata-dir : Répertoire à utiliser comme répertoire principal"
+#: ../src/gui/setup_audio.cpp:106
+msgid "Sound Engine"
+msgstr "Moteur de son"
 
-#: src/main.cpp:58
-msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr "      --screenshot-dir : Répertoire à utiliser pour les imprime-écrans"
+#: ../src/gui/specialswindow.cpp:79 ../src/gui/windowmenu.cpp:62
+msgid "Specials"
+msgstr "Cpt. spéciales"
 
-#: src/main.cpp:60
-msgid "     --no-opengl      : Disable OpenGL for this session"
-msgstr "     --no-opengl : Désactive l'OpenGL pour cette session"
+#: ../src/gui/setup_colors.cpp:89 ../src/gui/setup_colors.cpp:90
+#: ../src/gui/setup_colors.cpp:333
+msgid "Spectrum"
+msgstr "Spectre"
 
-#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:103
-msgid "You are dead."
-msgstr "Vous êtes mort."
+#: ../src/net/tmwa/generalhandler.cpp:145
+msgid "Speed hack detected."
+msgstr "Speed hack detecté."
 
-#: src/net/manaserv/beinghandler.cpp:305 src/net/tmwa/playerhandler.cpp:104
-msgid "We regret to inform you that your character was killed in battle."
-msgstr ""
-"Nous avons le regret de vous informer que votre personnage est mort sur le "
-"champ de bataille."
+#: ../src/gui/inventorywindow.cpp:108 ../src/gui/popupmenu.cpp:378
+msgid "Split"
+msgstr "Partager"
 
-#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:106
-msgid "You are not that alive anymore."
-msgstr "Vous n'êtes plus vraiment en vie."
+#: ../src/localplayer.cpp:899
+msgid "Stack is too big."
+msgstr "Le groupe est trop grand."
 
-#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:107
-msgid "The cold hands of the grim reaper are grabbing for your soul."
-msgstr "Les mains gelées de la faucheuse viennent réclamer votre âme."
+#: ../src/gui/recorder.cpp:104
+msgid "Starting to record..."
+msgstr "Début de l'enregistrement..."
 
-#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:108
-msgid "Game Over!"
-msgstr "Fin de la partie !"
+#: ../src/gui/setup_colors.cpp:83 ../src/gui/setup_colors.cpp:331
+msgid "Static"
+msgstr "Statique"
 
-#: src/net/manaserv/beinghandler.cpp:310 src/net/tmwa/playerhandler.cpp:110
-msgid ""
-"No, kids. Your character did not really die. It... err... went to a better "
-"place."
-msgstr ""
-"Non, les  enfants. Ton personnage n'est pas vraiment mort... Il... enfin,.. "
-"il... est parti dans un monde meilleur."
+#: ../src/gui/windowmenu.cpp:54
+msgid "Status"
+msgstr "Statut"
 
-#: src/net/manaserv/beinghandler.cpp:312 src/net/tmwa/playerhandler.cpp:112
-msgid ""
-"Your plan of breaking your enemies weapon by bashing it with your throat "
-"failed."
-msgstr ""
-"Votre tentative de casser l'arme de votre ennemi en la frappant avec votre "
-"gorge a échoué."
+#: ../src/keyboardconfig.cpp:70
+msgid "Status Window"
+msgstr "Fenêtre d'état"
 
-#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:114
-msgid "I guess this did not run too well."
-msgstr "J'ai la sensation que cela ne s'est pas aussi bien passé que prévu."
+#: ../src/gui/setup_joystick.cpp:83
+msgid "Stop"
+msgstr "Stop"
 
-#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:116
-msgid "Do you want your possessions identified?"
-msgstr "Voulez-vous que vos biens soient identifiés ?"
+#: ../src/keyboardconfig.cpp:47
+msgid "Stop Attack"
+msgstr "Arrêter d'attaquer"
 
-#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:118
-msgid "Sadly, no trace of you was ever found..."
-msgstr "Tristement, aucune trace de vous ne fut jamais retrouvée..."
+#: ../src/gui/recorder.h:39
+msgid "Stop recording"
+msgstr "Arrêter l'enregistrement"
 
-#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:120
-msgid "Annihilated."
-msgstr "Vaporisé."
+#: ../src/gui/inventorywindow.cpp:59
+msgid "Storage"
+msgstr "Stockage"
 
-#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:122
-msgid "Looks like you got your head handed to you."
-msgstr "Il semble que l'on vous ait rendu votre tête."
+#: ../src/gui/inventorywindow.cpp:131 ../src/gui/popupmenu.cpp:358
+msgid "Store"
+msgstr "Entreposer"
 
-#: src/net/manaserv/beinghandler.cpp:319 src/net/tmwa/playerhandler.cpp:124
-msgid ""
-"You screwed up again, dump your body down the tubes and get you another one."
-msgstr ""
-"Vous avez encore échoué, jetez votre corps aux oubliettes et prenez en un "
-"autre."
+#: ../src/net/manaserv/attributes.cpp:166
+#: ../src/net/tmwa/generalhandler.cpp:230
+msgid "Strength"
+msgstr "Force"
 
-#: src/net/manaserv/beinghandler.cpp:324
-#, fuzzy
-msgid "Press OK to respawn."
-msgstr ""
-"#-#-#-#-#  fr.po (The Mana World 0.1.0)  #-#-#-#-#\n"
-" Cliquer sur OK pour ressusciter\n"
-"#-#-#-#-#  po_fr rewiew1.po (The Mana World 0.1.0)  #-#-#-#-#\n"
-"Cliquer sur OK pour ressusciter"
+#: ../src/net/manaserv/attributes.cpp:173
+#, fuzzy, c-format
+msgid "Strength %+.1f"
+msgstr "Force %+d"
 
-#: src/net/manaserv/beinghandler.cpp:325
-msgid "You Died"
-msgstr "Vous êtes mort"
+#: ../src/net/tmwa/generalhandler.cpp:102
+#, c-format
+msgid "Strength %+d"
+msgstr "Force %+d"
 
-#: src/net/manaserv/charhandler.cpp:134 src/net/manaserv/charhandler.cpp:202
-msgid "Not logged in."
-msgstr "Non connecté."
+#: ../src/net/tmwa/charserverhandler.cpp:270
+msgid "Strength:"
+msgstr "Force :"
 
-#: src/net/manaserv/charhandler.cpp:137
-msgid "No empty slot."
-msgstr "Pas d'emplacement vide."
+#: ../src/gui/npcdialog.cpp:51
+msgid "Submit"
+msgstr "Soumettre"
 
-#: src/net/manaserv/charhandler.cpp:140
-msgid "Invalid name."
-msgstr "Nom invalide."
+#: ../src/gui/charselectdialog.cpp:131
+msgid "Switch Login"
+msgstr "Changer de login"
 
-#: src/net/manaserv/charhandler.cpp:143
-msgid "Character's name already exists."
-msgstr "Ce personnage existe déjà."
+#: ../src/gui/quitdialog.cpp:45
+msgid "Switch character"
+msgstr "Changer de personnage"
 
-#: src/net/manaserv/charhandler.cpp:146
-msgid "Invalid hairstyle."
-msgstr "Style de chevelure invalide."
+#: ../src/gui/quitdialog.cpp:44
+msgid "Switch server"
+msgstr "Changer de serveur"
 
-#: src/net/manaserv/charhandler.cpp:149
-msgid "Invalid hair color."
-msgstr "Couleur de cheveux invalide."
+#: ../src/gui/setup_video.cpp:437
+msgid "Switching to Full Screen"
+msgstr "Passage en plein écran"
 
-#: src/net/manaserv/charhandler.cpp:152
-msgid "Invalid gender."
-msgstr "Genre invalide."
+#: ../src/keyboardconfig.cpp:46
+msgid "Talk"
+msgstr "Parler"
 
-#: src/net/manaserv/charhandler.cpp:155
-msgid "Character's stats are too high."
-msgstr "Les caractéristiques du personnage sont trop hautes."
+#: ../src/gui/popupmenu.cpp:150
+#, c-format
+msgid "Talk to %s"
+msgstr "Parler à %s"
 
-#: src/net/manaserv/charhandler.cpp:158
-msgid "Character's stats are too low."
-msgstr "Les caractéristiques du personnage sont trop basses."
+#: ../src/keyboardconfig.cpp:44
+msgid "Target & Attack"
+msgstr "Cibler et Attaquer"
 
-#: src/net/manaserv/charhandler.cpp:161
-msgid "One stat is zero."
-msgstr "L'une des statistiques est à zéro."
+#: ../src/keyboardconfig.cpp:48
+msgid "Target Monster"
+msgstr "Cibler un monstre"
 
-#: src/net/manaserv/charhandler.cpp:164 src/net/manaserv/loginhandler.cpp:96
-#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
-#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
-#: src/net/tmwa/loginhandler.cpp:95 src/net/tmwa/loginhandler.cpp:182
-msgid "Unknown error."
-msgstr "Erreur inconnue."
+#: ../src/keyboardconfig.cpp:49
+msgid "Target NPC"
+msgstr "Cibler le NPC"
 
-#: src/net/manaserv/charhandler.cpp:193 src/net/tmwa/charserverhandler.cpp:150
-msgid "Info"
-msgstr "Informations"
+#: ../src/keyboardconfig.cpp:50
+msgid "Target Player"
+msgstr "Cibler le Joueur"
 
-#: src/net/manaserv/charhandler.cpp:193
-msgid "Player deleted."
-msgstr "Personnage effacé."
+#: ../src/gui/setup_video.cpp:158
+msgid "Text"
+msgstr "Texte"
 
-#: src/net/manaserv/charhandler.cpp:205
-msgid "Selection out of range."
-msgstr "La sélection est invalide."
+#: ../src/net/tmwa/buysellhandler.cpp:116
+msgid "Thanks for buying."
+msgstr "Merci pour votre achat."
 
-#: src/net/manaserv/charhandler.cpp:208
-#, c-format
-msgid "Unknown error (%d)."
-msgstr "Erreur inconnue (%d)."
+#: ../src/net/tmwa/buysellhandler.cpp:129
+msgid "Thanks for selling."
+msgstr "Merci pour votre vente."
 
-#: src/net/manaserv/charhandler.cpp:242
-msgid "No gameservers are available."
-msgstr "Pas de serveur de jeu disponible."
+#: ../src/net/manaserv/beinghandler.cpp:287
+#: ../src/net/tmwa/playerhandler.cpp:99
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr "Les mains gelées de la faucheuse viennent réclamer votre âme."
+
+#: ../src/game.cpp:385
+msgid "The connection to the server was lost."
+msgstr "La connexion au serveur a été perdue."
+
+#: ../src/gui/changeemaildialog.cpp:141
+msgid "The email address entries mismatch."
+msgstr "Les deux adresses email ne correspondent pas."
 
-#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
-#: src/net/manaserv/guildhandler.cpp:259
+#: ../src/net/manaserv/loginhandler.cpp:158
+msgid "The new email address already exists."
+msgstr "Cette adresse email existe déjà pour un autre compte."
+
+#: ../src/gui/changeemaildialog.cpp:127
 #, c-format
-msgid "Topic: %s"
-msgstr "Sujet : %s"
+msgid "The new email address needs to be at least %d characters long."
+msgstr "L'adresse email doit être longue d'au moins %d caractères."
 
-#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
-msgid "Players in this channel:"
-msgstr "Joueurs dans ce canal :"
+#: ../src/gui/changeemaildialog.cpp:134
+#, c-format
+msgid "The new email address needs to be less than %d characters long."
+msgstr "L'adresse email ne doit pas être plus longue que %d caractères."
 
-#: src/net/manaserv/chathandler.cpp:201
-msgid "Error joining channel."
-msgstr "Erreur lors de la tentative d'entrée dans le canal."
+#: ../src/gui/changepassworddialog.cpp:130
+msgid "The new password entries mismatch."
+msgstr "Les nouveaux mots de passe ne correspondent pas."
 
-#: src/net/manaserv/chathandler.cpp:207
-msgid "Listing channels."
-msgstr "Liste des canaux."
+#: ../src/gui/changepassworddialog.cpp:116
+#, c-format
+msgid "The new password needs to be at least %d characters long."
+msgstr "Le mot de passe doit être long d'au moins %d caractères."
 
-#: src/net/manaserv/chathandler.cpp:219
-msgid "End of channel list."
-msgstr "Fin de la liste du canal."
+#: ../src/gui/changepassworddialog.cpp:123
+#, c-format
+msgid "The new password needs to be less than %d characters long."
+msgstr "Le mot de passe ne doit pas être plus long que %d caractères."
 
-#: src/net/manaserv/chathandler.cpp:291
+#: ../src/gui/register.cpp:182 ../src/gui/unregisterdialog.cpp:117
 #, c-format
-msgid "%s entered the channel."
-msgstr "%s a rejoint le canal."
+msgid "The password needs to be at least %d characters long."
+msgstr "Le mot de passe doit faire au moins %d caractères."
 
-#: src/net/manaserv/chathandler.cpp:296
+#: ../src/gui/register.cpp:190 ../src/gui/unregisterdialog.cpp:124
 #, c-format
-msgid "%s left the channel."
-msgstr "%s a quitté le canal"
+msgid "The password needs to be less than %d characters long."
+msgstr "Le mot de passe doit faire moins de %d caractères."
 
-#: src/net/manaserv/chathandler.cpp:312
+#: ../src/gui/register.cpp:166
 #, c-format
-msgid "%s has set mode %s on user %s."
-msgstr "%s a activé le mode %s sur le joueur %s."
+msgid "The username needs to be at least %d characters long."
+msgstr "Le nom d'utilisateur doit faire au moins %d caractères."
 
-#: src/net/manaserv/chathandler.cpp:322
+#: ../src/gui/register.cpp:174
 #, c-format
-msgid "%s has kicked %s."
-msgstr "%s a éjecté %s."
+msgid "The username needs to be less than %d characters long."
+msgstr "Le nom d'utilisateur doit faire moins de %d caractères."
 
-#: src/net/manaserv/chathandler.cpp:327
-msgid "Unknown channel event."
-msgstr "Événement inconnu dans le canal."
+#: ../src/net/tmwa/generalhandler.cpp:142
+msgid "This account is already logged in."
+msgstr "Ce compte est déjà connecté."
 
-#: src/net/manaserv/guildhandler.cpp:81
-msgid "Guild created."
-msgstr "Guilde créée."
+#: ../src/net/tmwa/gui/guildtab.cpp:81
+msgid "This command causes the player to leave the guild."
+msgstr ""
+"Cette commande vous fait quitter la guilde dans laquelle vous vous trouvez."
 
-#: src/net/manaserv/guildhandler.cpp:86
-msgid "Error creating guild."
-msgstr "Erreur lors de la création de la guilde."
+#: ../src/net/tmwa/gui/partytab.cpp:81
+msgid "This command causes the player to leave the party."
+msgstr "Cette commande vous fait quitter votre groupe actuel."
 
-#: src/net/manaserv/guildhandler.cpp:96
-msgid "Invite sent."
-msgstr "Invitation envoyée."
+#: ../src/net/tmwa/gui/partytab.cpp:96
+msgid "This command changes the party's experience sharing policy."
+msgstr ""
+"Cette commande change les préférences du groupe sur le partage d'expérience."
 
-#: src/net/manaserv/guildhandler.cpp:203
-msgid "Member was promoted successfully."
-msgstr "La promotion de ce membre a réussie."
+#: ../src/net/tmwa/gui/partytab.cpp:86
+msgid "This command changes the party's item sharing policy."
+msgstr ""
+"Cette commande change les préférences de partage de rammassage d'objet du "
+"groupe."
 
-#: src/net/manaserv/guildhandler.cpp:208
-msgid "Failed to promote member."
-msgstr "Echec lors de la promotion du membre"
+#: ../src/commandhandler.cpp:274
+msgid "This command clears the away status and message."
+msgstr "Cette commande retire le statut absent."
 
-#: src/net/manaserv/loginhandler.cpp:87
-msgid "Wrong magic_token."
-msgstr "Mauvais jeton de sécurité."
+#: ../src/commandhandler.cpp:228
+msgid "This command clears the chat log of previous chat."
+msgstr ""
+"Cette commande vide l'historique de conversation de la conversation "
+"précédente."
 
-#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
-msgid "Already logged in."
-msgstr "Déjà connecté."
+#: ../src/gui/widgets/whispertab.cpp:85
+msgid "This command closes the current whisper tab."
+msgstr "Cette commande ferme l'onglet courant de conversation privée."
 
-#: src/net/manaserv/loginhandler.cpp:93
-msgid "Account banned."
-msgstr "Compte banni."
+#: ../src/commandhandler.cpp:279
+msgid "This command creates a new party called <name>."
+msgstr "Cette commande crée un nouveau groupe appelé <nom>"
 
-#: src/net/manaserv/loginhandler.cpp:118
-msgid "New password incorrect."
-msgstr "Nouveau mot de passe incorrect."
+#: ../src/commandhandler.cpp:209
+msgid "This command displays a list of all commands available."
+msgstr "Cette commande affiche une liste de toutes les commandes disponibles."
 
-#: src/net/manaserv/loginhandler.cpp:121 src/net/tmwa/loginhandler.cpp:89
-msgid "Old password incorrect."
-msgstr "Ancien mot de passe incorrect."
+#: ../src/commandhandler.cpp:212
+msgid "This command displays help on <command>."
+msgstr "Cette commande affiche une aide sur la commande <commande>."
 
-#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
-msgid "Account not connected. Please login first."
-msgstr "Compte non connecté. Identifiez-vous tout d'abord."
+#: ../src/commandhandler.cpp:323
+msgid "This command displays the name of the current map."
+msgstr ""
+"Cette commande affiche le nom de la carte où vous vous trouvez ainsi que "
+"votre emplacement sur la carte."
 
-#: src/net/manaserv/loginhandler.cpp:149
-msgid "New email address incorrect."
-msgstr "Nouvelle adresse email incorrecte."
+#: ../src/commandhandler.cpp:328
+msgid "This command displays the number of players currently online."
+msgstr "Cette commande affiche le nombre de joueurs actuellement connectés."
 
-#: src/net/manaserv/loginhandler.cpp:152
-msgid "Old email address incorrect."
-msgstr "Ancienne adresse email incorrecte."
+#: ../src/net/tmwa/gui/partytab.cpp:101
+msgid "This command displays the party's current experience sharing policy."
+msgstr ""
+"Cette commande affiche les préférences actuelles du groupe sur le partage "
+"d'expérience."
 
-#: src/net/manaserv/loginhandler.cpp:158
-msgid "The new email address already exists."
-msgstr "Cette adresse email existe déjà pour un autre compte."
+#: ../src/net/tmwa/gui/partytab.cpp:91
+msgid "This command displays the party's current item sharing policy."
+msgstr ""
+"Cette commande affiche les préférences actuelles du groupe sur le partage de "
+"ramassage d'objets."
 
-#: src/net/manaserv/loginhandler.cpp:239
+#: ../src/commandhandler.cpp:312
+msgid "This command displays the return toggle status."
+msgstr "Cette commande vous affiche le status du toggle courant."
+
+#: ../src/commandhandler.cpp:301
+msgid "This command finishes a recording session."
+msgstr "Cette commande termine une session d'enregistrement."
+
+#: ../src/commandhandler.cpp:291
 msgid ""
-"Client registration is not allowed. Please contact server administration."
+"This command gets a list of players within hearing and sends it to either "
+"the record log if recording, or the chat log otherwise."
 msgstr ""
-"L'enregistrement de comptes en utilisant le client n'est pas permis. "
-"Veuillez contacter l'administrateur du serveur."
+"Cette commande récupère une liste de tous les joueurs présents et l'envoie "
+"dans le fichier d'enregistrement s'il est activé, ou dans l'enregistrement "
+"de la conversation."
 
-#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
-msgid "Client version is too old."
-msgstr "La version de votre client est trop ancienne."
+#: ../src/commandhandler.cpp:233
+msgid "This command ignores the given player regardless of current relations."
+msgstr "Cette commande ignore le joueur qu'il soit indiqué comme ami ou non."
 
-#: src/net/manaserv/loginhandler.cpp:266
-msgid "Wrong username or password."
-msgstr "Mauvais nom d'utilisateur ou mot de passe."
+#: ../src/gui/widgets/whispertab.cpp:90
+msgid "This command ignores the other player regardless of current relations."
+msgstr ""
+"Cette commande permet d'ignorer un joueur qu'il soit indiqué comme ami ou "
+"non."
 
-#: src/net/manaserv/loginhandler.cpp:272
-msgid "Account banned"
-msgstr "Compte banni"
+#: ../src/commandhandler.cpp:284 ../src/net/tmwa/gui/partytab.cpp:74
+msgid "This command invites <nick> to party with you."
+msgstr "Cette commande invite <nom du personnage> à rejoindre votre groupe."
 
-#: src/net/manaserv/loginhandler.cpp:275
-msgid "Login attempt too soon after previous attempt."
-msgstr ""
-"La tentative de connexion a été faite trop rapidement depuis la dernière "
-"tentative."
+#: ../src/net/tmwa/gui/guildtab.cpp:74
+msgid "This command invites <nick> to the guild you're in."
+msgstr "Cette commande invite <nom du personnage> à rejoindre votre groupe."
 
-#: src/net/manaserv/loginhandler.cpp:303
-msgid "Wrong username, password or email address."
-msgstr "Mauvais nom d'utilisateur, mot de passe ou adresse email."
+#: ../src/gui/widgets/channeltab.cpp:74
+msgid "This command leaves the current channel."
+msgstr "Cette commande quitte le salon."
 
-#: src/net/manaserv/loginhandler.cpp:306
-msgid "Username already exists."
-msgstr "Ce nom d'utilisateur existe déjà."
+#: ../src/gui/widgets/channeltab.cpp:81
+msgid "This command makes <nick> a channel operator."
+msgstr "Cette commande donne les droit d'opérateur du salon à <nick>"
 
-#: src/net/manaserv/loginhandler.cpp:309
-msgid "Email address already exists."
-msgstr "Cette adresse email existe déjà."
+#: ../src/gui/widgets/channeltab.cpp:90
+msgid "This command makes <nick> leave the channel."
+msgstr "Cette commande sort <nom du personnage> du salon."
 
-#: src/net/manaserv/loginhandler.cpp:312
-msgid "You took too long with the captcha or your response was incorrect."
-msgstr ""
-"Vous avez mis trop de temps pour répondre au Captcha ou votre réponse est "
-"incorrecte."
+#: ../src/commandhandler.cpp:239
+msgid "This command makes you enter <channel>."
+msgstr "Cette commande vous fait rentrer dans le salon <salon>."
 
-#: src/net/manaserv/partyhandler.cpp:88
-#, fuzzy
-msgid "Joined party."
+#: ../src/commandhandler.cpp:222
+msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
-"#-#-#-#-#  fr.po (The Mana World 0.1.0)  #-#-#-#-#\n"
-"Groupe rejoind.\n"
-"#-#-#-#-#  po_fr rewiew1.po (The Mana World 0.1.0)  #-#-#-#-#\n"
-"Groupe rejoint."
+"Cette commande envoie le message <message> à tous les joueurs en ligne."
 
-#: src/net/manaserv/partyhandler.cpp:106
-#, fuzzy, c-format
-msgid "%s joined the party."
-msgstr ""
-"#-#-#-#-#  fr.po (The Mana World 0.1.0)  #-#-#-#-#\n"
-"%s a rejoind le groupe.\n"
-"#-#-#-#-#  po_fr rewiew1.po (The Mana World 0.1.0)  #-#-#-#-#\n"
-"%s a rejoint le groupe."
+#: ../src/commandhandler.cpp:257
+msgid "This command sends the text <message> to <nick>."
+msgstr "Cette commande envoie le texte <message> au joueur <nom du personnage>"
 
-#: src/net/manaserv/partyhandler.cpp:123
-#, c-format
-msgid "%s rejected your invite."
-msgstr "%s a refusé votre invitation."
+#: ../src/gui/widgets/channeltab.cpp:69
+msgid "This command sets the topic to <message>."
+msgstr "Cette commande change le sujet du salon en <message>"
 
-#: src/net/manaserv/stats.cpp:56 src/net/tmwa/generalhandler.cpp:217
-msgid "Strength"
-msgstr "Force"
+#: ../src/commandhandler.cpp:306
+msgid ""
+"This command sets whether the return key should toggle the chat log, or "
+"whether the chat log turns off automatically."
+msgstr ""
+"Cette commande définit si la touche entrée doit fermer le fichier "
+"d'enregistrement de la conversation ou si celui-ci se fermera "
+"automatiquement."
 
-#: src/net/manaserv/stats.cpp:58 src/net/tmwa/generalhandler.cpp:101
-#, c-format
-msgid "Strength %+d"
-msgstr "Force %+d"
+#: ../src/commandhandler.cpp:245
+msgid "This command shows a list of all channels."
+msgstr "Cette commande affiche une liste de tous les salons publics."
 
-#: src/net/manaserv/stats.cpp:68 src/net/tmwa/generalhandler.cpp:218
-msgid "Agility"
-msgstr "Agilité"
+#: ../src/gui/widgets/channeltab.cpp:64
+msgid "This command shows the users in this channel."
+msgstr "Cette commande affiche la liste d'utilisateurs présents dans ce salon."
 
-#: src/net/manaserv/stats.cpp:70 src/net/tmwa/generalhandler.cpp:102
-#, c-format
-msgid "Agility %+d"
-msgstr "Agilité %+d"
+#: ../src/commandhandler.cpp:298
+msgid "This command starts recording the chat log to the file <filename>."
+msgstr ""
+"Cette commande active l'enregistrement de la conversation dans le fichier "
+"<nom du fichier>."
 
-#: src/net/manaserv/stats.cpp:80 src/net/tmwa/generalhandler.cpp:221
-msgid "Dexterity"
-msgstr "Dextérité"
+#: ../src/commandhandler.cpp:317
+msgid "This command stops ignoring the given player if they are being ignored"
+msgstr ""
+"Cette commande fait cesser d'ignorer le joueur donné s'il l'était "
+"précédemment."
 
-#: src/net/manaserv/stats.cpp:82 src/net/tmwa/generalhandler.cpp:105
-#, c-format
-msgid "Dexterity %+d"
-msgstr "Dextérité %+d"
+#: ../src/gui/widgets/whispertab.cpp:96
+msgid "This command stops ignoring the other player if they are being ignored."
+msgstr "Cette commande vous fait cesser d'ignorer un joueur si c'était le cas."
 
-#: src/net/manaserv/stats.cpp:92 src/net/tmwa/generalhandler.cpp:219
-msgid "Vitality"
-msgstr "Vitalité"
+#: ../src/commandhandler.cpp:250
+msgid "This command tell others you are (doing) <msg>."
+msgstr "Cette commande informe les autres joueurs que vous faites <message>."
 
-#: src/net/manaserv/stats.cpp:94 src/net/tmwa/generalhandler.cpp:103
-#, c-format
-msgid "Vitality %+d"
-msgstr "Vitalité %+d"
+#: ../src/commandhandler.cpp:271
+msgid "This command tells you're away from keyboard with the given reason."
+msgstr ""
+"Cette commande indique que vous n'êtes pas actif en indiquant la raison."
 
-#: src/net/manaserv/stats.cpp:104 src/net/tmwa/generalhandler.cpp:220
-msgid "Intelligence"
-msgstr "Intelligence"
+#: ../src/commandhandler.cpp:265
+msgid "This command tries to make a tab for whispers betweenyou and <nick>."
+msgstr ""
+"Cette commande essaye de créer une fenêtre de dialogue entre vous et <nom du "
+"personnage>"
 
-#: src/net/manaserv/stats.cpp:106 src/net/tmwa/generalhandler.cpp:104
-#, c-format
-msgid "Intelligence %+d"
-msgstr "Intelligence %+d"
+#: ../src/gui/setup_colors.cpp:46
+msgid "This is what the color looks like"
+msgstr "Voilà à quoi ressemble cette couleur"
 
-#: src/net/manaserv/stats.cpp:116
-msgid "Willpower"
-msgstr "Volonté"
+#: ../src/client.cpp:783
+#, fuzzy
+msgid ""
+"This server is missing needed world data. Please contact the administrator"
+"(s)."
+msgstr ""
+"L'enregistrement de comptes en utilisant le client n'est pas permis. "
+"Veuillez contacter l'administrateur du serveur."
 
-#: src/net/manaserv/stats.cpp:118
-#, c-format
-msgid "Willpower %+d"
-msgstr "Volonté %+d"
+#: ../src/net/tmwa/loginhandler.cpp:185
+msgid "This user name is already taken."
+msgstr "Ce nom d'utilisateur est déjà utilisé."
 
-#: src/net/manaserv/tradehandler.cpp:96
-msgid "Accepting incoming trade requests."
-msgstr "Accepter les demandes d'échanges."
+#: ../src/gui/setup_video.cpp:128
+msgid "Tiny"
+msgstr "Fine"
 
-#: src/net/manaserv/tradehandler.cpp:98
-msgid "Ignoring incoming trade requests."
-msgstr "Ignorer les demandes d'échanges."
+#: ../src/gui/npcpostdialog.cpp:47
+msgid "To:"
+msgstr "A :"
 
-#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:107
-msgid "Request for Trade"
-msgstr "Demande d'échange"
+#: ../src/keyboardconfig.cpp:96
+msgid "Toggle Chat"
+msgstr "Activer / Désactiver la conversation"
 
-#: src/net/manaserv/tradehandler.cpp:117 src/net/tmwa/tradehandler.cpp:108
+#: ../src/net/manaserv/chathandler.cpp:190
+#: ../src/net/manaserv/chathandler.cpp:316
+#: ../src/net/manaserv/guildhandler.cpp:260
 #, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr "%s souhaite réaliser un échange avec vous. Acceptez-vous ?"
+msgid "Topic: %s"
+msgstr "Sujet : %s"
 
-#: src/net/manaserv/tradehandler.cpp:135
-#, c-format
-msgid "Trading with %s"
-msgstr "Echange avec %s"
+#: ../src/gui/trade.cpp:73 ../src/gui/trade.cpp:74
+msgid "Trade"
+msgstr "Échange"
 
-#: src/net/manaserv/tradehandler.cpp:149 src/net/tmwa/tradehandler.cpp:224
+#: ../src/net/manaserv/tradehandler.cpp:148
+#: ../src/net/tmwa/tradehandler.cpp:224
 msgid "Trade canceled."
 msgstr "Echange annulé."
 
-#: src/net/manaserv/tradehandler.cpp:156 src/net/tmwa/tradehandler.cpp:231
+#: ../src/net/tmwa/tradehandler.cpp:134
+msgid "Trade cancelled due to an unknown reason."
+msgstr "Echange annulé pour une raison inconnue."
+
+#: ../src/net/manaserv/tradehandler.cpp:155
+#: ../src/net/tmwa/tradehandler.cpp:231
 msgid "Trade completed."
 msgstr "Echange finalisé."
 
-#: src/net/tmwa/adminhandler.cpp:65
-msgid "Kick failed!"
-msgstr "Impossible de sortir la personne !"
+#: ../src/net/tmwa/specialhandler.cpp:145
+msgid "Trade failed!"
+msgstr "Echange non réalisé !"
 
-#: src/net/tmwa/adminhandler.cpp:67
-msgid "Kick succeeded!"
-msgstr "Sortie de la personne effectuée avec succès !"
+#: ../src/net/tmwa/tradehandler.cpp:146
+#, c-format
+msgid "Trade with %s cancelled."
+msgstr "Echange avec %s annulé."
 
-#: src/net/tmwa/buysellhandler.cpp:110
-msgid "Nothing to sell."
-msgstr "Rien à vendre."
+#: ../src/gui/popupmenu.cpp:83
+#, c-format
+msgid "Trade with %s..."
+msgstr "Troquer avec %s..."
 
-#: src/net/tmwa/buysellhandler.cpp:117
-msgid "Thanks for buying."
-msgstr "Merci pour votre achat."
+#: ../src/gui/trade.cpp:59
+msgid "Trade: You"
+msgstr "Échange : Vous"
 
-#: src/net/tmwa/buysellhandler.cpp:124
-msgid "Unable to buy."
-msgstr "Impossible d'acheter."
+#: ../src/net/tmwa/tradehandler.cpp:139
+#, c-format
+msgid "Trade: You and %s"
+msgstr "Echange : Vous et %s"
 
-#: src/net/tmwa/buysellhandler.cpp:130
-msgid "Thanks for selling."
-msgstr "Merci pour votre vente."
+#: ../src/net/tmwa/tradehandler.cpp:130
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr "Echange impossible. Ce personnage n'existe pas."
 
-#: src/net/tmwa/buysellhandler.cpp:132
-msgid "Unable to sell."
-msgstr "Impossible de vendre."
+#: ../src/net/tmwa/tradehandler.cpp:126
+msgid "Trading isn't possible. Trade partner is too far away."
+msgstr "L'échange est impossible. Votre partenaire est trop éloigné."
 
-#: src/net/tmwa/charserverhandler.cpp:105
-msgid "Access denied. Most likely, there are too many players on this server."
-msgstr "Accès refusé. Il y a probablement trop de joueurs sur le serveur."
+#: ../src/net/manaserv/tradehandler.cpp:134
+#, c-format
+msgid "Trading with %s"
+msgstr "Echange avec %s"
 
-#: src/net/tmwa/charserverhandler.cpp:109
-#, fuzzy
-msgid "Cannot use this ID."
-msgstr ""
-"#-#-#-#-#  fr.po (The Mana World 0.1.0)  #-#-#-#-#\n"
-"Impossible d'utiliser cet Id.\n"
-"#-#-#-#-#  po_fr rewiew1.po (The Mana World 0.1.0)  #-#-#-#-#\n"
-"Impossible d'utiliser cette Id."
+#: ../src/gui/setup_video.cpp:469
+msgid "Transparency disabled"
+msgstr "Transparence désactivée"
 
-#: src/net/tmwa/charserverhandler.cpp:112
-#, fuzzy
-msgid "Unknown char-server failure."
-msgstr ""
-"#-#-#-#-#  fr.po (The Mana World 0.1.0)  #-#-#-#-#\n"
-"Erreur inconnue provenant du serveur de personnages\n"
-"#-#-#-#-#  po_fr rewiew1.po (The Mana World 0.1.0)  #-#-#-#-#\n"
-"Erreur inconnue provenant du serveur de personnages."
+#: ../src/gui/setup_video.cpp:477
+msgid "Transparency enabled"
+msgstr "Transparence activée."
 
-#: src/net/tmwa/charserverhandler.cpp:138
-msgid "Failed to create character. Most likely the name is already taken."
-msgstr ""
-"Impossible de créer ce personnage. Il est probable que ce nom soit déjà "
-"utilisé."
+#: ../src/localplayer.cpp:895
+msgid "Tried to pick up nonexistent item."
+msgstr "Vous avez essayé de ramasser un objet inexistant."
 
-#: src/net/tmwa/charserverhandler.cpp:150
-msgid "Character deleted."
-msgstr "Personnage supprimé."
+#: ../src/commandhandler.cpp:334
+msgid "Type /help for a list of commands."
+msgstr "Entrer /help pour obtenir une liste des commandes disponibles."
 
-#: src/net/tmwa/charserverhandler.cpp:155
-msgid "Failed to delete character."
-msgstr "La suppresion du personnage n'a pu s\"effectuer."
+#: ../src/gui/changeemaildialog.cpp:51
+msgid "Type new email address twice:"
+msgstr "Entrer l'adresse email deux fois :"
 
-#: src/net/tmwa/charserverhandler.cpp:259
-msgid "Strength:"
-msgstr "Force :"
+#: ../src/gui/changepassworddialog.cpp:63
+msgid "Type new password twice:"
+msgstr "Entrer le mot de passe deux fois :"
 
-#: src/net/tmwa/charserverhandler.cpp:260
-msgid "Agility:"
-msgstr "Agilité :"
+#: ../src/gui/setup_colors.cpp:72
+msgid "Type:"
+msgstr "Type : "
 
-#: src/net/tmwa/charserverhandler.cpp:261
-msgid "Vitality:"
-msgstr "Vitalité :"
+#: ../src/net/tmwa/buysellhandler.cpp:123
+msgid "Unable to buy."
+msgstr "Impossible d'acheter."
 
-#: src/net/tmwa/charserverhandler.cpp:262
-msgid "Intelligence:"
-msgstr "Intelligence :"
+#: ../src/net/tmwa/inventoryhandler.cpp:401
+msgid "Unable to equip."
+msgstr "Impossible d'équiper cet objet."
 
-#: src/net/tmwa/charserverhandler.cpp:263
-msgid "Dexterity:"
-msgstr "Dextérité :"
+#: ../src/net/tmwa/network.cpp:345
+msgid "Unable to resolve host \""
+msgstr "Impossible de résoudre le nom \""
 
-#: src/net/tmwa/charserverhandler.cpp:264
-msgid "Luck:"
-msgstr "Chance :"
+#: ../src/net/tmwa/buysellhandler.cpp:131
+msgid "Unable to sell."
+msgstr "Impossible de vendre."
 
-#: src/net/tmwa/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
-msgstr ""
-"Le message privé n'a pu être envoyé, le destinataire n'est pas connecté."
+#: ../src/net/tmwa/inventoryhandler.cpp:413
+msgid "Unable to unequip."
+msgstr "Impossible de deséquiper cet objet."
 
-#: src/net/tmwa/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
-msgstr "Le message privé n'a pu être envoyé, le destinataire l'a ignoré."
+#: ../src/gui/setup_keyboard.cpp:90
+msgid "Unassign"
+msgstr "Désassigner"
 
-#: src/net/tmwa/chathandler.cpp:190
-msgid "MVP player."
-msgstr "Joueur MVP"
+#: ../src/gui/equipmentwindow.cpp:88 ../src/gui/inventorywindow.cpp:94
+#: ../src/gui/inventorywindow.cpp:352 ../src/gui/popupmenu.cpp:364
+msgid "Unequip"
+msgstr "Retirer"
 
-#: src/net/tmwa/chathandler.cpp:223 src/net/tmwa/chathandler.cpp:229
-#: src/net/tmwa/chathandler.cpp:234 src/net/tmwa/chathandler.cpp:239
-#: src/net/tmwa/chathandler.cpp:244 src/net/tmwa/chathandler.cpp:249
-#: src/net/tmwa/chathandler.cpp:254 src/net/tmwa/chathandler.cpp:259
-msgid "Channels are not supported!"
-msgstr "Les salons ne sont pas gérés !"
+#: ../src/gui/outfitwindow.cpp:70
+msgid "Unequip first"
+msgstr "Retirer d'abord l'équipement"
 
-#: src/net/tmwa/gamehandler.cpp:87
+#: ../src/net/manaserv/charhandler.cpp:270
 #, c-format
-msgid "Online users: %d"
-msgstr "Joueurs en ligne : %d"
-
-#: src/net/tmwa/gamehandler.cpp:101
-msgid "Game"
-msgstr "Jeu"
+msgid "Unhandled character select error message %i."
+msgstr ""
 
-#: src/net/tmwa/gamehandler.cpp:101
-msgid "Request to quit denied!"
-msgstr "Requête de départ refusée !"
+#: ../src/net/tmwa/tradehandler.cpp:154
+msgid "Unhandled trade cancel packet."
+msgstr "Echange non pris en compte."
 
-#: src/net/tmwa/generalhandler.cpp:106
+#: ../src/gui/popupmenu.cpp:114 ../src/gui/popupmenu.cpp:123
 #, c-format
-msgid "Luck %+d"
-msgstr "Chance %+d"
-
-#: src/net/tmwa/generalhandler.cpp:129
-msgid "Authentication failed."
-msgstr "Échec de l'authentification."
-
-#: src/net/tmwa/generalhandler.cpp:132
-msgid "No servers available."
-msgstr "Aucun serveur n'est disponible."
+msgid "Unignore %s"
+msgstr "Cesser d'ignorer %s"
 
-#: src/net/tmwa/generalhandler.cpp:136
-msgid "Someone else is trying to use this account."
-msgstr "Quelqu'un d'autre essaie d'utiliser ce compte."
+#: ../src/net/net.cpp:141
+msgid "Unknown Server Type! Exiting."
+msgstr "Type de serveur inconnu. Fin du programme."
 
-#: src/net/tmwa/generalhandler.cpp:139
-msgid "This account is already logged in."
-msgstr "Ce compte est déjà connecté."
+#: ../src/net/manaserv/chathandler.cpp:342
+msgid "Unknown channel event."
+msgstr "Événement inconnu dans le canal."
 
-#: src/net/tmwa/generalhandler.cpp:142
-msgid "Speed hack detected."
-msgstr "Speed hack detecté."
+#: ../src/net/tmwa/charserverhandler.cpp:110
+msgid "Unknown char-server failure."
+msgstr "Erreur inconnue provenant du serveur de personnages."
 
-#: src/net/tmwa/generalhandler.cpp:145
-msgid "Duplicated login."
-msgstr "Authentification déjà effectuée."
+#: ../src/commandhandler.cpp:136 ../src/commandhandler.cpp:333
+msgid "Unknown command."
+msgstr "Commande inconnue."
 
-#: src/net/tmwa/generalhandler.cpp:148
+#: ../src/net/tmwa/generalhandler.cpp:151
 msgid "Unknown connection error."
 msgstr "Erreur de connexion inconnue."
 
-#: src/net/tmwa/generalhandler.cpp:206
-msgid "Got disconnected from server!"
-msgstr "Vous avez été déconnecté du serveur !"
-
-#: src/net/tmwa/generalhandler.cpp:222
-msgid "Luck"
-msgstr "Chance"
-
-#: src/net/tmwa/generalhandler.cpp:225
-msgid "Defense"
-msgstr "Défense"
-
-#: src/net/tmwa/generalhandler.cpp:226
-msgid "M.Attack"
-msgstr "Attaque M."
+#: ../src/net/manaserv/charhandler.cpp:225
+#, c-format
+msgid "Unknown error (%d)."
+msgstr "Erreur inconnue (%d)."
 
-#: src/net/tmwa/generalhandler.cpp:227
-msgid "M.Defense"
-msgstr "Défense M."
+#: ../src/net/manaserv/charhandler.cpp:174
+#: ../src/net/manaserv/loginhandler.cpp:96
+#: ../src/net/manaserv/loginhandler.cpp:127
+#: ../src/net/manaserv/loginhandler.cpp:161
+#: ../src/net/manaserv/loginhandler.cpp:279
+#: ../src/net/manaserv/loginhandler.cpp:316
+#: ../src/net/tmwa/loginhandler.cpp:95 ../src/net/tmwa/loginhandler.cpp:191
+msgid "Unknown error."
+msgstr "Erreur inconnue."
 
-#: src/net/tmwa/generalhandler.cpp:228
-msgid "% Accuracy"
-msgstr "% Précision"
+#: ../src/net/tmwa/guildhandler.cpp:316
+msgid "Unknown guild invite response."
+msgstr "Réponse d'invitation à la guilde inconnue."
 
-#: src/net/tmwa/generalhandler.cpp:229
+#: ../src/net/tmwa/partyhandler.cpp:131
 #, c-format
-msgid "% Evade"
-msgstr "% Esquive"
+msgid "Unknown invite response for %s."
+msgstr "Réponse d'invitation de %s inconnue."
 
-#: src/net/tmwa/generalhandler.cpp:230
-#, c-format
-msgid "% Critical"
-msgstr "% Coup critique"
+#: ../src/resources/itemdb.cpp:324 ../src/resources/itemdb.cpp:425
+msgid "Unknown item"
+msgstr "Objet inconnu"
 
-#: src/net/tmwa/gui/guildtab.cpp:45
-msgid "Guild"
-msgstr "Guilde"
+#: ../src/localplayer.cpp:902
+msgid "Unknown problem picking up item."
+msgstr "Problème inconnu pour rammasser l'objet."
 
-#: src/net/tmwa/gui/guildtab.cpp:61 src/net/tmwa/gui/partytab.cpp:59
-msgid "/help > Display this help."
-msgstr "/help > Affiche cette aide."
+#: ../src/gui/charselectdialog.cpp:145 ../src/gui/unregisterdialog.cpp:47
+#: ../src/gui/unregisterdialog.cpp:55
+msgid "Unregister"
+msgstr "Se désinscrire"
 
-#: src/net/tmwa/gui/guildtab.cpp:62
-msgid "/invite > Invite a player to your guild"
-msgstr "/invite > Invite un joueur à rejoindre votre guilde"
+#: ../src/client.cpp:955
+msgid "Unregister Successful"
+msgstr "Désincription réussie"
 
-#: src/net/tmwa/gui/guildtab.cpp:63
-msgid "/leave > Leave the guild you are in"
-msgstr "/leave > Quitter la guilde courante"
+#: ../src/net/tmwa/loginhandler.cpp:156
+msgid "Unregistered ID."
+msgstr "Id non enregistrée."
 
-#: src/net/tmwa/gui/guildtab.cpp:64
-msgid "/kick > Kick some one from the guild you are in"
-msgstr "/kick > Ejecter quelqu'un du groupe dont vous faites partie"
+#: ../src/gui/skilldialog.cpp:228
+msgid "Up"
+msgstr "Augmenter"
 
-#: src/net/tmwa/gui/guildtab.cpp:73 src/net/tmwa/gui/partytab.cpp:73
-msgid "Command: /invite <nick>"
-msgstr "Commande : /invite <nick>"
+#: ../src/gui/updatewindow.cpp:124
+msgid "Updating..."
+msgstr "Mise à jour en cours..."
 
-#: src/net/tmwa/gui/guildtab.cpp:74
-msgid "This command invites <nick> to the guild you're in."
-msgstr "Cette commande invite <nick> à rejoindre votre groupe."
+#: ../src/gui/inventorywindow.cpp:93
+msgid "Use"
+msgstr "Utiliser"
 
-#: src/net/tmwa/gui/guildtab.cpp:80 src/net/tmwa/gui/partytab.cpp:80
-msgid "Command: /leave"
-msgstr "Commande : /leave"
+#: ../src/net/tmwa/guildhandler.cpp:306
+msgid "User is now part of your guild."
+msgstr "%s est maintenant membre de la guilde."
 
-#: src/net/tmwa/gui/guildtab.cpp:81
-msgid "This command causes the player to leave the guild."
-msgstr "Cette commande vous fait quitter la guilde actuelle."
+#: ../src/net/tmwa/guildhandler.cpp:301
+msgid "User rejected guild invite."
+msgstr "Le joueur a refusé l'invitation dans la guilde."
 
-#: src/net/tmwa/gui/guildtab.cpp:89
-msgid "Guild name is missing."
-msgstr "Le nom de la guilde est manquant."
+#: ../src/net/manaserv/loginhandler.cpp:306
+msgid "Username already exists."
+msgstr "Ce nom d'utilisateur existe déjà."
 
-#: src/net/tmwa/guildhandler.cpp:295
-msgid "Could not inivte user to guild."
-msgstr "N'a pas pu inviter le joueur dans la guilde. "
+#: ../src/net/tmwa/loginhandler.cpp:188
+#, fuzzy
+msgid "Username permanently erased."
+msgstr "Ce nom d'utilisateur existe déjà."
 
-#: src/net/tmwa/guildhandler.cpp:300
-msgid "User rejected guild invite."
-msgstr "Le joueur a refusé l'invitation dans la guilde."
+#: ../src/gui/setup_video.cpp:244
+msgid "Video"
+msgstr "Vidéo"
 
-#: src/net/tmwa/guildhandler.cpp:305
-msgid "User is now part of your guild."
-msgstr "%s est maintenant membre de la guilde."
+#: ../src/gui/setup_video.cpp:215
+msgid "Visible names"
+msgstr "Afficher les noms"
 
-#: src/net/tmwa/guildhandler.cpp:310
-msgid "Your guild is full."
-msgstr "Votre guilde est complète."
+#: ../src/net/manaserv/attributes.cpp:205
+#: ../src/net/tmwa/generalhandler.cpp:232
+msgid "Vitality"
+msgstr "Vitalité"
 
-#: src/net/tmwa/guildhandler.cpp:315
-msgid "Unknown guild invite response."
-msgstr "Réponse d'invitation à la guilde inconnue."
+#: ../src/net/manaserv/attributes.cpp:212
+#, fuzzy, c-format
+msgid "Vitality %+.1f"
+msgstr "Vitalité %+d"
 
-#: src/net/tmwa/guildhandler.cpp:392
-msgid "Guild creation isn't supported yet."
-msgstr "La création de guilde n'est pas encore supportée."
+#: ../src/net/tmwa/generalhandler.cpp:104
+#, c-format
+msgid "Vitality %+d"
+msgstr "Vitalité %+d"
 
-#: src/net/tmwa/gui/partytab.cpp:43
-msgid "Party"
-msgstr "Groupe"
+#: ../src/net/tmwa/charserverhandler.cpp:272
+msgid "Vitality:"
+msgstr "Vitalité :"
 
-#: src/net/tmwa/gui/partytab.cpp:60
-msgid "/invite > Invite a player to your party"
-msgstr "/invite > Invite un joueur à rejoindre votre groupe"
+#: ../src/gui/npcdialog.cpp:48
+msgid "Waiting for server"
+msgstr "Attente du serveur"
 
-#: src/net/tmwa/gui/partytab.cpp:61
-msgid "/leave > Leave the party you are in"
-msgstr "/leave > Quitte le groupe dans lequel vous vous trouvez"
+#: ../src/gui/serverdialog.cpp:447
+msgid "Waiting for server..."
+msgstr "En attente du serveur..."
 
-#: src/net/tmwa/gui/partytab.cpp:62
-msgid "/kick > Kick some one from the party you are in"
-msgstr "/kick > Sortir quelqu'un du groupe dont vous faites partie"
+#: ../src/net/tmwa/specialhandler.cpp:208
+msgid "Warp failed..."
+msgstr "Enchainement échoué..."
 
-#: src/net/tmwa/gui/partytab.cpp:63
-msgid "/item > Show/change party item sharing options"
-msgstr "/item > Affiche / Modifie les préférences d'échange d'objet du groupe"
+#: ../src/net/manaserv/beinghandler.cpp:284
+#: ../src/net/tmwa/playerhandler.cpp:96
+msgid "We regret to inform you that your character was killed in battle."
+msgstr ""
+"Nous avons le regret de vous informer que votre personnage est mort sur le "
+"champ de bataille."
 
-#: src/net/tmwa/gui/partytab.cpp:64
-msgid "/exp > Show/change party experience sharing options"
-msgstr "/exp > Affiche / Modifie les préférences d'expérience du groupe"
+#: ../src/keyboardconfig.cpp:82
+msgid "Wear Outfit"
+msgstr "Mettre la tenue"
 
-#: src/net/tmwa/gui/partytab.cpp:81
-msgid "This command causes the player to leave the party."
-msgstr "Cette commande vous fait quitter votre groupe actuel."
+#: ../src/gui/inventorywindow.cpp:111
+msgid "Weight:"
+msgstr "Poids :"
 
-#: src/net/tmwa/gui/partytab.cpp:85
-msgid "Command: /item <policy>"
-msgstr "Commande : /item <policy>"
+#: ../src/gui/itempopup.cpp:174
+#, c-format
+msgid "Weight: %s"
+msgstr "Poids : %s"
 
-#: src/net/tmwa/gui/partytab.cpp:86
-msgid "This command changes the party's item sharing policy."
-msgstr "Cette commande change les préférences d'échange d'objet du groupe."
+#: ../src/gui/setup_players.cpp:262
+msgid "When ignoring:"
+msgstr "Quand ignoré :"
 
-#: src/net/tmwa/gui/partytab.cpp:87
-msgid ""
-"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
-"\"0\", \"no\", \"false\" to disable item sharing."
+#: ../src/gui/popupmenu.cpp:91
+#, c-format
+msgid "Whisper %s"
+msgstr "Chuchoter à %s"
+
+#: ../src/net/tmwa/chathandler.cpp:87
+#, fuzzy, c-format
+msgid "Whisper could not be sent, %s is offline."
 msgstr ""
-"<préférences> peut être \"1\", \"yes\", \"true\" pour activer l'échange "
-"d'objet, ou \"0\", \"no\", \"false\" pour le désactiver."
+"Le message privé n'a pu être envoyé, le destinataire n'est pas connecté."
 
-#: src/net/tmwa/gui/partytab.cpp:90
-msgid "Command: /item"
-msgstr "Commande : /item"
+#: ../src/net/tmwa/chathandler.cpp:96
+#, fuzzy, c-format
+msgid "Whisper could not be sent, ignored by %s."
+msgstr "Le message privé n'a pu être envoyé, le destinataire l'a ignoré."
 
-#: src/net/tmwa/gui/partytab.cpp:91
-msgid "This command displays the party's current item sharing policy."
-msgstr ""
-"Cette commande affiche les préférences actuelles du groupe sur le partage "
-"d'objet."
+#: ../src/gui/chat.cpp:494
+#, c-format
+msgid "Whispering to %s: %s"
+msgstr "Message privé envoyé à %s : %s"
 
-#: src/net/tmwa/gui/partytab.cpp:95
-msgid "Command: /exp <policy>"
-msgstr "Commande : /exp <policy>"
+#: ../src/gui/socialwindow.cpp:154
+#, c-format
+msgid "Who would you like to invite to guild %s?"
+msgstr "Qui voudriez-vous inviter dans la guilde %s ?"
 
-#: src/net/tmwa/gui/partytab.cpp:96
-msgid "This command changes the party's experience sharing policy."
-msgstr ""
-"Cette commande change les préférences du groupe sur le partage d'expérience."
+#: ../src/gui/socialwindow.cpp:233
+#, c-format
+msgid "Who would you like to invite to party %s?"
+msgstr "Qui voudriez vous inviter dans le groupe %s ?"
 
-#: src/net/tmwa/gui/partytab.cpp:97
-msgid ""
-"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
-"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
-msgstr ""
-"<préférences> peut être \"1\", \"yes\", \"true\" pour activer le partage "
-"d'expérience, ou \"0\", \"no\", \"false\" pour le désactiver."
+#: ../src/net/manaserv/attributes.cpp:231
+msgid "Willpower"
+msgstr "Volonté"
 
-#: src/net/tmwa/gui/partytab.cpp:100
-msgid "Command: /exp"
-msgstr "Commande : /exp"
+#: ../src/net/manaserv/attributes.cpp:238
+#, fuzzy, c-format
+msgid "Willpower %+.1f"
+msgstr "Volonté %+d"
 
-#: src/net/tmwa/gui/partytab.cpp:101
-msgid "This command displays the party's current experience sharing policy."
-msgstr ""
-"Cette commande affiche les préférences actuelles du groupe sur le partage "
-"d'expérience."
+#: ../src/net/manaserv/loginhandler.cpp:87
+msgid "Wrong magic_token."
+msgstr "Mauvais jeton de sécurité."
 
-#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:201
-msgid "Item sharing enabled."
-msgstr "Partage d'objet activé."
+#: ../src/net/tmwa/loginhandler.cpp:159
+msgid "Wrong password."
+msgstr "Mauvais mot de passe."
 
-#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:207
-msgid "Item sharing disabled."
-msgstr "Partage d'objet desactivé."
+#: ../src/net/manaserv/loginhandler.cpp:266
+msgid "Wrong username or password."
+msgstr "Mauvais nom d'utilisateur ou mot de passe."
 
-#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:213
-msgid "Item sharing not possible."
-msgstr "Partage d'objet impossible."
+#: ../src/net/manaserv/loginhandler.cpp:303
+msgid "Wrong username, password or email address."
+msgstr "Mauvais nom d'utilisateur, mot de passe ou adresse email."
 
-#: src/net/tmwa/gui/partytab.cpp:141
-msgid "Item sharing unknown."
-msgstr "Paramètre de partage d'objets inconnu."
+#: ../src/gui/confirmdialog.cpp:42
+msgid "Yes"
+msgstr "Oui"
 
-#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:177
-msgid "Experience sharing enabled."
-msgstr "Partage d'expérience authorisé."
+#: ../src/net/manaserv/beinghandler.cpp:304
+msgid "You Died"
+msgstr "Vous êtes mort"
 
-#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:183
-msgid "Experience sharing disabled."
-msgstr "Partage d'expérience non authorisé."
+#: ../src/net/tmwa/playerhandler.cpp:131
+msgid "You are an ex-player."
+msgstr "Tu n'es plus qu'un ancien joueur sans intérêt."
 
-#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:189
-msgid "Experience sharing not possible."
-msgstr "Partage d'expérience impossible."
+#: ../src/net/tmwa/playerhandler.cpp:254
+msgid ""
+"You are carrying more than half your weight. You are unable to regain health."
+msgstr ""
+"Vous portez plus de la moitié du poids de votre inventaire. Vous n'êtes plus "
+"en mesure de regagner vos points de vie."
 
-#: src/net/tmwa/gui/partytab.cpp:176
-msgid "Experience sharing unknown."
-msgstr "Paramètre de partage d'expérience inconnu."
+#: ../src/net/manaserv/beinghandler.cpp:283
+#: ../src/net/tmwa/playerhandler.cpp:95
+msgid "You are dead."
+msgstr "Vous êtes mort."
 
-#: src/net/tmwa/inventoryhandler.cpp:289
-msgid "Failed to use item."
-msgstr "Impossible d'utiliser l'objet."
+#: ../src/net/tmwa/playerhandler.cpp:120
+msgid "You are no more."
+msgstr "Vous n'existez plus."
 
-#: src/net/tmwa/inventoryhandler.cpp:406
-msgid "Unable to equip."
-msgstr "Impossible d'équiper cet objet."
+#: ../src/net/manaserv/beinghandler.cpp:286
+#: ../src/net/tmwa/playerhandler.cpp:98
+msgid "You are not that alive anymore."
+msgstr "Vous n'êtes plus vraiment en vie."
 
-#: src/net/tmwa/inventoryhandler.cpp:417
-msgid "Unable to unequip."
-msgstr "Impossible de deséquiper cet objet."
+#: ../src/net/tmwa/partyhandler.cpp:340
+msgid "You can only inivte when you are in a party!"
+msgstr "Vous ne pouvez inviter que lorsque vous faites partie d'un groupe."
 
-#: src/net/tmwa/loginhandler.cpp:86
-msgid "Account was not found. Please re-login."
-msgstr "Le compte n'a pas été trouvé. Reconnectez vous svp."
+#: ../src/net/tmwa/specialhandler.cpp:181
+msgid "You cannot do that right now!"
+msgstr "Vous ne pouvez faire cela maintenant !"
 
-#: src/net/tmwa/loginhandler.cpp:92
-msgid "New password too short."
-msgstr "Le nouveau mot de passe est trop court."
+#: ../src/net/tmwa/specialhandler.cpp:187
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr "Vous ne pouvez utiliser ce pouvoir avec ce type d'arme !"
 
-#: src/net/tmwa/loginhandler.cpp:156
-msgid "Unregistered ID."
-msgstr "Id non enregistrée."
+#: ../src/gui/trade.cpp:304
+msgid "You don't have enough money."
+msgstr "Vous n'avez pas assez d'argent."
 
-#: src/net/tmwa/loginhandler.cpp:159
-msgid "Wrong password."
-msgstr "Mauvais mot de passe."
+#: ../src/gui/trade.cpp:98 ../src/gui/trade.cpp:134
+#, c-format
+msgid "You get %s"
+msgstr "Vous recevez %s"
 
-#: src/net/tmwa/loginhandler.cpp:162
-msgid "Account expired."
-msgstr "Le compte a expiré."
+#: ../src/gui/trade.cpp:99
+msgid "You give:"
+msgstr "Vous donnez :"
 
-#: src/net/tmwa/loginhandler.cpp:165
-msgid "Rejected from server."
-msgstr "Rejeté par le serveur."
+#: ../src/gui/socialwindow.cpp:588
+#, c-format
+msgid "You have been invited to join the %s party."
+msgstr "Vous avez été invité à rejoindre le groupe %s."
+
+#: ../src/gui/socialwindow.cpp:584
+msgid "You have been invited you to join a party."
+msgstr "Vous avez été invité à rejoindre un groupe."
 
-#: src/net/tmwa/loginhandler.cpp:168
+#: ../src/net/tmwa/loginhandler.cpp:168
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 "Vous avez été banni de façon permanente du jeu. Merci de vous mettre en "
 "contact avec l'équipe des GM."
 
-#: src/net/tmwa/loginhandler.cpp:172
-#, fuzzy, c-format
+#: ../src/net/tmwa/loginhandler.cpp:175
+#, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
 msgstr ""
-"#-#-#-#-#  fr.po (The Mana World 0.1.0)  #-#-#-#-#\n"
-"Vous avez été banni temporairement du jeu depuis %s.\n"
-"Merci de contacter un MJ par le forum.\n"
-"#-#-#-#-#  po_fr rewiew1.po (The Mana World 0.1.0)  #-#-#-#-#\n"
 "Vous avez été banni temporairement du jeu depuis %s.\n"
 "Merci de contacter un GM par le forum."
 
-#: src/net/tmwa/loginhandler.cpp:179
-msgid "This user name is already taken."
-msgstr "Ce nom d'utilisateur est déjà utilisé."
-
-#: src/net/tmwa/network.cpp:145
-msgid "Empty address given to Network::connect()!"
-msgstr "Une adresse vide a été donnée à la commande Network::connect() !"
-
-#: src/net/tmwa/network.cpp:345
-msgid "Unable to resolve host \""
-msgstr "Impossible de résoudre le nom \""
+#: ../src/net/tmwa/playerhandler.cpp:121
+msgid "You have ceased to be."
+msgstr "Vous avez cessez d'exister."
 
-#: src/net/tmwa/network.cpp:414
-msgid "Connection to server terminated. "
-msgstr "Connexion au serveur terminée."
+#: ../src/net/tmwa/partyhandler.cpp:236
+msgid "You have left the party."
+msgstr "Vous avez quitté le groupe."
 
-#: src/net/tmwa/partyhandler.cpp:81
-msgid "Could not create party."
-msgstr "Le groupe n'a pu être créé."
+#: ../src/net/tmwa/specialhandler.cpp:178
+msgid "You have no memos!"
+msgstr "Vous n'avez pas de messages !"
 
-#: src/net/tmwa/partyhandler.cpp:84
-msgid "Party successfully created."
-msgstr "Création du groupe réussie."
+#: ../src/net/tmwa/specialhandler.cpp:169
+msgid "You have not yet reached a high enough lvl!"
+msgstr "Vous n'avez pas encore atteint le niveau requis !"
 
-#: src/net/tmwa/partyhandler.cpp:121
-#, c-format
-msgid "%s is already a member of a party."
-msgstr "%s est déjà membre du groupe."
+#: ../src/gui/setup_audio.cpp:94
+msgid "You may have to restart your client if you want to download new music"
+msgstr ""
+"Le client devra être redémarré afin de vous permettre de télécharger la "
+"musique."
 
-#: src/net/tmwa/partyhandler.cpp:125
-#, c-format
-msgid "%s refused your invitation."
-msgstr "%s a refusé votre invitation."
+#: ../src/gui/setup_video.cpp:470 ../src/gui/setup_video.cpp:478
+msgid "You must restart to apply changes."
+msgstr "Vous devez redémarrer pour appliquer les changements."
 
-#: src/net/tmwa/partyhandler.cpp:129
-#, c-format
-msgid "%s is now a member of your party."
-msgstr "%s est maintenant membre de votre groupe."
+#: ../src/net/tmwa/specialhandler.cpp:193
+msgid "You need another blue gem!"
+msgstr "Vous avez besoin d'une autre pierre précieuse bleue !"
 
-#: src/net/tmwa/partyhandler.cpp:133
-#, c-format
-msgid "Unknown invite response for %s."
-msgstr "Réponse d'invitation de %s inconnue."
+#: ../src/net/tmwa/specialhandler.cpp:190
+msgid "You need another red gem!"
+msgstr "Vous avez besoin d'une autre pierre précieuse rouge !"
 
-#: src/net/tmwa/partyhandler.cpp:241
-#, fuzzy
-msgid "You have left the party."
+#: ../src/gui/login.cpp:129
+msgid "You need to use the website to register an account for this server."
 msgstr ""
-"#-#-#-#-#  fr.po (The Mana World 0.1.0)  #-#-#-#-#\n"
-"vous avez quitté le groupe.\n"
-"#-#-#-#-#  po_fr rewiew1.po (The Mana World 0.1.0)  #-#-#-#-#\n"
-"Vous avez quitté le groupe."
-
-#: src/net/tmwa/partyhandler.cpp:252
-#, c-format
-msgid "%s has left your party."
-msgstr "%s a quitté le groupe."
+"Veuillez enregistrer votre compte sur la page du site prévue à cet effet."
 
-#: src/net/tmwa/partyhandler.cpp:304
+#: ../src/localplayer.cpp:920
 #, c-format
-msgid "An unknown member tried to say: %s"
-msgstr "Un membre inconnu a essayé de dire : %s"
+msgid "You picked up %d [@@%d|%s@@]."
+msgid_plural "You picked up %d [@@%d|%s@@]."
+msgstr[0] "Vous avez ramassé %d [@@%d|%s@@]."
+msgstr[1] "Vous avez ramassé %d [@@%d|%s@@]."
 
-#: src/net/tmwa/partyhandler.cpp:335
+#: ../src/net/tmwa/playerhandler.cpp:327
 #, c-format
-msgid "Invited user %s to party."
-msgstr "/party > Inviter l'utilisateur %s dans le groupe."
+msgid "You picked up %s."
+msgstr "Vous avez ramassé  %s."
 
-#: src/net/tmwa/partyhandler.cpp:340
-#, fuzzy, c-format
-msgid "Inviting failed, because you can't see a player called %s."
+#: ../src/net/manaserv/beinghandler.cpp:298
+#: ../src/net/tmwa/playerhandler.cpp:116
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
-"#-#-#-#-#  fr.po (The Mana World 0.1.0)  #-#-#-#-#\n"
-"L'invitation à échouée, le joueur %s n'est pas à portée de vue.\n"
-"#-#-#-#-#  po_fr rewiew1.po (The Mana World 0.1.0)  #-#-#-#-#\n"
-"L'invitation a échouée, le joueur %s n'est pas à portée de vue."
+"Vous avez encore échoué, jetez votre corps aux oubliettes et prenez en un "
+"autre."
 
-#: src/net/tmwa/partyhandler.cpp:345
-msgid "You can only inivte when you are in a party!"
-msgstr "Vous ne pouvez inviter que lorsque vous faites partie d'un groupe."
+#: ../src/net/manaserv/loginhandler.cpp:312
+msgid "You took too long with the captcha or your response was incorrect."
+msgstr ""
+"Vous avez mis trop de temps pour répondre au Captcha ou votre réponse est "
+"incorrecte."
 
-#: src/net/tmwa/partyhandler.cpp:374
-#, c-format
-msgid "%s is not in your party!"
-msgstr "%s n'est pas membre de votre groupe !"
+#: ../src/net/tmwa/playerhandler.cpp:123
+msgid "You're a stiff."
+msgstr "Tu es un dur."
 
-#: src/net/tmwa/playerhandler.cpp:109
-#, fuzzy
-msgid "Insert coin to continue."
-msgstr ""
-"#-#-#-#-#  fr.po (The Mana World 0.1.0)  #-#-#-#-#\n"
-"veuillez insérer une pièce pour continuer.\n"
-"#-#-#-#-#  po_fr rewiew1.po (The Mana World 0.1.0)  #-#-#-#-#\n"
-"Veuillez insérer une pièce pour continuer."
+#: ../src/net/tmwa/specialhandler.cpp:196
+msgid "You're carrying to much to do this!"
+msgstr "Vous portez trop de choses pour pouvoir faire cela !"
 
-#: src/net/tmwa/playerhandler.cpp:127
+#: ../src/net/tmwa/playerhandler.cpp:119
 msgid "You're not dead yet. You're just resting."
 msgstr "Vous n'êtes pas encore mort. Vous vous reposez seulement."
 
-#: src/net/tmwa/playerhandler.cpp:128
-msgid "You are no more."
-msgstr "Vous n'existez plus."
+#: ../src/net/tmwa/playerhandler.cpp:127
+msgid "You're off the twig."
+msgstr "Tu es en dehors des clous"
 
-#: src/net/tmwa/playerhandler.cpp:129
-msgid "You have ceased to be."
-msgstr "Vous avez cessez d'exister."
+#: ../src/net/tmwa/playerhandler.cpp:132
+msgid "You're pining for the fjords."
+msgstr "Tu reposes au fond de l'eau."
 
-#: src/net/tmwa/playerhandler.cpp:130
+#: ../src/net/tmwa/playerhandler.cpp:122
 msgid "You've expired and gone to meet your maker."
 msgstr "Tu es fini. Tu es parti retrouver ton créateur."
 
-#: src/net/tmwa/playerhandler.cpp:131
-msgid "You're a stiff."
-msgstr "Tu es un dur."
-
-#: src/net/tmwa/playerhandler.cpp:132
-msgid "Bereft of life, you rest in peace."
-msgstr "Privé de toute essence de vie, vous reposez en paix."
-
-#: src/net/tmwa/playerhandler.cpp:133
-msgid "If you weren't so animated, you'd be pushing up the daisies."
-msgstr ""
-"Si tu n'étais pas autant en forme, tu serais en train de manger les "
-"pissenlits par la racine."
-
-#: src/net/tmwa/playerhandler.cpp:134
-msgid "Your metabolic processes are now history."
-msgstr "Vos processus métaboliques appartiennent au passé maintenant."
-
-#: src/net/tmwa/playerhandler.cpp:135
-msgid "You're off the twig."
-msgstr "Tu es en dehors des clous"
-
-#: src/net/tmwa/playerhandler.cpp:136
+#: ../src/net/tmwa/playerhandler.cpp:128
 msgid "You've kicked the bucket."
 msgstr "Tu viens de toucher le fond."
 
-#: src/net/tmwa/playerhandler.cpp:137
+#: ../src/net/tmwa/playerhandler.cpp:129
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
@@ -3533,621 +3706,526 @@ msgstr ""
 "Vous êtes sorti de votre enveloppe charnelle et mortelle. Vous avez rejoint "
 "l'armée de l'ombre."
 
-#: src/net/tmwa/playerhandler.cpp:139
-msgid "You are an ex-player."
-msgstr "Tu n'es plus qu'un ancien joueur sans intérêt."
+#: ../src/net/tmwa/guildhandler.cpp:311
+msgid "Your guild is full."
+msgstr "Votre guilde est complète."
 
-#: src/net/tmwa/playerhandler.cpp:140
-msgid "You're pining for the fjords."
-msgstr "Tu reposes au fond de l'eau."
+#: ../src/net/tmwa/playerhandler.cpp:126
+msgid "Your metabolic processes are now history."
+msgstr "Vos processus métaboliques appartiennent au passé maintenant."
 
-#: src/net/tmwa/playerhandler.cpp:256 src/net/tmwa/playerhandler.cpp:317
-msgid "Message"
-msgstr "Message"
+#: ../src/gui/charcreatedialog.cpp:184
+msgid "Your name needs to be at least 4 characters."
+msgstr "Votre nom doit comporter un minimum de 4 caractères."
 
-#: src/net/tmwa/playerhandler.cpp:257
+#: ../src/net/manaserv/beinghandler.cpp:291
+#: ../src/net/tmwa/playerhandler.cpp:104
 msgid ""
-"You are carrying more than half your weight. You are unable to regain health."
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
 msgstr ""
-"Vous portez plus de la moitié du poids de votre inventaire. Vous n'êtes plus "
-"en mesure de regagner vos points de vie."
+"Votre tentative de casser l'arme de votre ennemi en la frappant avec votre "
+"gorge a échoué."
 
-#: src/net/tmwa/playerhandler.cpp:344
-#, c-format
-msgid "You picked up %s."
-msgstr "Vous avez ramassé  %s."
+#: ../src/main.cpp:43
+msgid "[mana-file] : The mana file is an XML file (.mana)"
+msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:380
-msgid "Cannot raise skill!"
-msgstr "Ne peut pas augmenter la capacité !"
+#: ../src/gui/setup_video.cpp:225
+msgid "as particle"
+msgstr "avec des particules"
 
-#: src/net/tmwa/playerhandler.cpp:543
-msgid "Equip arrows first."
-msgstr "Equiper en premier les flèches"
+#: ../src/gui/setup_video.cpp:174 ../src/gui/setup_video.cpp:188
+msgid "high"
+msgstr "élevé"
 
-#: src/net/tmwa/specialhandler.cpp:147
-msgid "Trade failed!"
-msgstr "Echange non réalisé !"
+#: ../src/gui/setup_video.cpp:223
+msgid "in chat"
+msgstr "dans la conversation"
 
-#: src/net/tmwa/specialhandler.cpp:150
-msgid "Emote failed!"
-msgstr "Emote non realisé !"
+#: ../src/gui/setup_video.cpp:173 ../src/gui/setup_video.cpp:186
+msgid "low"
+msgstr "léger"
 
-#: src/net/tmwa/specialhandler.cpp:153
-msgid "Sit failed!"
-msgstr "Vous n'avez pas pu vous assoir !"
+#: ../src/main.cpp:42
+msgid "mana [options] [mana-file]"
+msgstr "mana [options] [fichier-mana]"
 
-#: src/net/tmwa/specialhandler.cpp:156
-msgid "Chat creating failed!"
-msgstr "Vous n'avez pas pu créer la conversation !"
+#: ../src/gui/setup_video.cpp:189
+msgid "max"
+msgstr "max"
 
-#: src/net/tmwa/specialhandler.cpp:159
-msgid "Could not join party!"
-msgstr "Vous n'avez pas pu rejoindre le groupe !"
+#: ../src/gui/setup_video.cpp:187
+msgid "medium"
+msgstr "moyen"
 
-#: src/net/tmwa/specialhandler.cpp:162
-msgid "Cannot shout!"
-msgstr "Vous ne pouvez pas crier !"
+#: ../src/gui/setup_video.cpp:172
+msgid "off"
+msgstr "aucun"
 
-#: src/net/tmwa/specialhandler.cpp:171
-#, fuzzy
-msgid "You have not yet reached a high enough lvl!"
-msgstr ""
-"#-#-#-#-#  fr.po (The Mana World 0.1.0)  #-#-#-#-#\n"
-"Vous n'avez pas encore atteind le niveau requis !\n"
-"#-#-#-#-#  po_fr rewiew1.po (The Mana World 0.1.0)  #-#-#-#-#\n"
-"Vous n'avez pas encore atteint le niveau requis !"
+#: ../src/gui/serverdialog.cpp:550
+msgid "requires a newer version"
+msgstr "requiert une nouvelle version"
 
-#: src/net/tmwa/specialhandler.cpp:174
-msgid "Insufficient HP!"
-msgstr "Pas assez de vie !"
+#: ../src/gui/serverdialog.cpp:552
+#, c-format
+msgid "requires v%s"
+msgstr "requiert la v%s"
 
-#: src/net/tmwa/specialhandler.cpp:177
-msgid "Insufficient SP!"
-msgstr "PV insuffisant !"
+#: ../src/resources/beinginfo.cpp:32 ../src/resources/itemdb.cpp:260
+#: ../src/resources/monsterdb.cpp:77
+msgid "unnamed"
+msgstr "anonyme"
 
-#: src/net/tmwa/specialhandler.cpp:180
-msgid "You have no memos!"
-msgstr "Vous n'avez pas de messages !"
+#~ msgid ""
+#~ "\n"
+#~ "> Cancel\n"
+#~ msgstr ""
+#~ "\n"
+#~ "> Annuler\n"
 
-#: src/net/tmwa/specialhandler.cpp:183
-msgid "You cannot do that right now!"
-msgstr "Vous ne pouvez faire cela maintenant !"
+#~ msgid "  -D --default    : Bypass the login process with default settings"
+#~ msgstr ""
+#~ "  -D --default : Bypasser le processus de connexion par la configuration "
+#~ "par défaut"
 
-#: src/net/tmwa/specialhandler.cpp:186
-msgid "Seems you need more money... ;-)"
-msgstr "Il semblerait que vous ayez besoin de plus d'argent... ;)"
+#~ msgid " can't be created, but it doesn't exist! Exiting."
+#~ msgstr ""
+#~ " ne peut pas être créé, mais il n'existe pourtant pas ! Fermeture du "
+#~ "programme."
 
-#: src/net/tmwa/specialhandler.cpp:189
-msgid "You cannot use this skill with that kind of weapon!"
-msgstr "Vous ne pouvez utiliser ce pouvoir avec ce type d'arme !"
+#~ msgid " cancelled"
+#~ msgstr " annulé"
 
-#: src/net/tmwa/specialhandler.cpp:192
-msgid "You need another red gem!"
-msgstr "Vous avez besoin d'une autre pierre précieuse rouge !"
+#~ msgid " host: "
+#~ msgstr " hôte : "
 
-#: src/net/tmwa/specialhandler.cpp:195
-msgid "You need another blue gem!"
-msgstr "Vous avez besoin d'une autre pierre précieuse bleue !"
+#~ msgid " video mode: "
+#~ msgstr " mode d'affichage "
 
-#: src/net/tmwa/specialhandler.cpp:198
-msgid "You're carrying to much to do this!"
-msgstr "Vous portez trop de choses pour pouvoir faire cela !"
+#~ msgid "% Reflex:"
+#~ msgstr "% Réflexe :"
 
-#: src/net/tmwa/specialhandler.cpp:201
-msgid "Huh? What's that?"
-msgstr "Hé ? Qu'est-ce donc que cela ?"
+#~ msgid "%s: %s"
+#~ msgstr "%s : %s"
 
-#: src/net/tmwa/specialhandler.cpp:210
-msgid "Warp failed..."
-msgstr "Enchainement échoué..."
+#~ msgid "/new > Alias of create"
+#~ msgstr "/new > Alias de création"
 
-#: src/net/tmwa/specialhandler.cpp:213
-msgid "Could not steal anything..."
-msgstr "Vous n'avez rien pu voler..."
+#~ msgid "1/2 HP Bar"
+#~ msgstr "1/2 Barre de vie"
 
-#: src/net/tmwa/specialhandler.cpp:216
-msgid "Poison had no effect..."
-msgstr "Le poison fut sans effet..."
+#~ msgid "1/4 HP Bar"
+#~ msgstr "1/4 Barre de vie"
 
-#: src/net/tmwa/tradehandler.cpp:124
-msgid "Trading isn't possible. Trade partner is too far away."
-msgstr "L'échange est impossible. Votre partenaire est trop éloigné."
+#~ msgid "2 Handed Weapons"
+#~ msgstr "Armes à deux mains"
 
-#: src/net/tmwa/tradehandler.cpp:128
-msgid "Trading isn't possible. Character doesn't exist."
-msgstr "Echange impossible. Ce personnage n'existe pas."
+#~ msgid "3/4 HP Bar"
+#~ msgstr "3/4 Barre de vie"
 
-#: src/net/tmwa/tradehandler.cpp:132
-msgid "Trade cancelled due to an unknown reason."
-msgstr "Echange annulé pour une raison inconnue."
+#~ msgid "; "
+#~ msgstr "; "
 
-#: src/net/tmwa/tradehandler.cpp:137
-#, c-format
-msgid "Trade: You and %s"
-msgstr "Echange : Vous et %s"
+#~ msgid "@@admin-kick|Kick player@@"
+#~ msgstr "@@admin-kick|Kick player@@"
 
-#: src/net/tmwa/tradehandler.cpp:144
-#, c-format
-msgid "Trade with %s cancelled."
-msgstr "Echange avec %s annulé."
+#~ msgid "@@attack|Attack %s@@"
+#~ msgstr "@@attack|Attaquer %s@@"
 
-#: src/net/tmwa/tradehandler.cpp:153
-msgid "Unhandled trade cancel packet."
-msgstr "Echange non pris en compte."
+#~ msgid "@@cancel|Cancel@@"
+#~ msgstr "@@cancel|Annuler@@"
 
-#: src/net/tmwa/tradehandler.cpp:202
-msgid "Failed adding item. Trade partner is over weighted."
-msgstr ""
-"Impossible de rajouter un objet. Votre partenaire pour cet échange est "
-"surchargé."
+#~ msgid "@@disregard|Disregard %s@@"
+#~ msgstr "@@disregard|Négliger%s@@"
 
-#: src/net/tmwa/tradehandler.cpp:207
-msgid "Failed adding item. Trade partner has no free slot."
-msgstr ""
-"Impossible de rajouter un objet. Votre partenaire pour cet échange n'a plus "
-"de place libre."
+#~ msgid "@@drop|Drop@@"
+#~ msgstr "@@drop|Jeter@@"
 
-#: src/net/tmwa/tradehandler.cpp:211
-msgid "Failed adding item for unknown reason."
-msgstr "Impossible de rajouter un objet pour une raison inconnue."
+#~ msgid "@@ignore|Ignore %s@@"
+#~ msgstr "@@ignore|Ignorer %s@@"
 
-#: src/playerrelations.cpp:312
-msgid "Completely ignore"
-msgstr "Ignorer complètement"
+#~ msgid "@@pickup|Pick Up %s@@"
+#~ msgstr "@@pickup|Ramasser %s@@"
 
-#: src/playerrelations.cpp:326
-msgid "Print '...'"
-msgstr "Affiche '...'"
+#~ msgid "@@pickup|Pick up %s@@"
+#~ msgstr "@@pickup|Ramasser %s@@"
 
-#: src/playerrelations.cpp:342
-msgid "Blink name"
-msgstr "Fais clignoter le nom"
+#~ msgid "@@retrieve|Retrieve@@"
+#~ msgstr "@@retrieve|Retirer@@"
 
-#: src/playerrelations.cpp:379
-msgid "Floating '...' bubble"
-msgstr "Bulle flottante '...'"
+#~ msgid "@@split|Split@@"
+#~ msgstr "@@split|Partager@@"
 
-#: src/playerrelations.cpp:382
-msgid "Floating bubble"
-msgstr "Bulle flottante"
+#~ msgid "@@store|Store@@"
+#~ msgstr "@@store|Magasin@@"
 
-#: src/resources/itemdb.cpp:53
-#, c-format
-msgid "Attack %+d"
-msgstr "Attaque %+d"
+#~ msgid "@@trade|Trade With %s@@"
+#~ msgstr "@@trade|Troquer avec %s@@"
 
-#: src/resources/itemdb.cpp:54
-#, c-format
-msgid "Defense %+d"
-msgstr "Défense %+d"
+#~ msgid "@@unignore|Un-Ignore %s@@"
+#~ msgstr "@@unignore|Ne plus ignorer %s@@"
 
-#: src/resources/itemdb.cpp:55
-#, c-format
-msgid "HP %+d"
-msgstr "PV %+d"
+#~ msgid "@@use|Equip@@"
+#~ msgstr "@@use|Équiper@@"
 
-#: src/resources/itemdb.cpp:56
-#, c-format
-msgid "MP %+d"
-msgstr "PM %+d"
+#~ msgid "@@use|Unequip@@"
+#~ msgstr "@@use|Déséquiper@@"
 
-#: src/resources/itemdb.cpp:117
-msgid "Unknown item"
-msgstr "Objet inconnu"
+#~ msgid "@@use|Use@@"
+#~ msgstr "@@use|Utiliser@@"
 
-#: src/resources/itemdb.cpp:162 src/resources/monsterdb.cpp:74
-#: src/resources/monsterinfo.cpp:29
-msgid "unnamed"
-msgstr "anonyme"
+#~ msgid "Accepted guild invite from %s."
+#~ msgstr "Invitation dans la guilde acceptée de la part de %s."
 
 #, fuzzy
 #~ msgid "Access denied."
 #~ msgstr "Accès refusé"
 
-#, fuzzy
-#~ msgid "Unknown failure to select character."
-#~ msgstr "Problème inconnu lors de la séléction du personnage"
-
-#~ msgid "Inviting like this isn't supported at the moment."
-#~ msgstr "Cette manière d'inviter n'est pas en place actuellement."
-
-#~ msgid "Willpower:"
-#~ msgstr "Volonté :"
-
-#, fuzzy
-#~ msgid "Server is full."
-#~ msgstr "Le serveur est plein"
+#~ msgid "Ammo"
+#~ msgstr "Munitions"
 
-#~ msgid "Text Shadow"
-#~ msgstr "Ombre du texte"
+#~ msgid "Arms"
+#~ msgstr "Bras"
 
-#~ msgid "Text Outline"
-#~ msgstr "Bordure du texte"
+#~ msgid "Attack:"
+#~ msgstr "Attaque :"
 
-#~ msgid "Progress Bar Labels"
-#~ msgstr "Texte des barres de progression"
+#~ msgid "Axe"
+#~ msgstr "Hache"
 
 #~ msgid "Background"
 #~ msgstr "Arrière-plan"
 
-#~ msgid "Highlight"
-#~ msgstr "Surbrillance"
+#~ msgid "Bow"
+#~ msgstr "Arc"
 
-#~ msgid "Tab Highlight"
-#~ msgstr "Onglet mis en surbrillance"
+#~ msgid "Buddy"
+#~ msgstr "Contact"
 
-#, fuzzy
-#~ msgid "Item Too Expensive"
-#~ msgstr "Objet trop cher"
+#~ msgid "Buddy List"
+#~ msgstr "Liste de contacts"
 
-#, fuzzy
-#~ msgid "Item Is Equipped"
-#~ msgstr "L'objet est équipé"
+#~ msgid "Buddys"
+#~ msgstr "Contacts"
 
-#~ msgid "GM"
-#~ msgstr "MJ"
+#~ msgid "Cast Test Spell 1"
+#~ msgstr "Jeter le sort d'essai 1"
 
-#~ msgid "Player"
-#~ msgstr "Joueur"
+#~ msgid "Cast Test Spell 2"
+#~ msgstr "Jeter le sort d'essai 2"
 
-#~ msgid "Whisper"
-#~ msgstr "Message privé"
+#~ msgid "Cast Test Spell 3"
+#~ msgstr "Jeter le sort d'essai 3"
 
-#~ msgid "Is"
-#~ msgstr "Est"
+#~ msgid "Command: /new <party-name>"
+#~ msgstr "Commande : /new <party-name>"
 
-#~ msgid "Server"
-#~ msgstr "Serveur"
+#~ msgid "Connecting to account server..."
+#~ msgstr "Connexion au serveur de comptes..."
 
-#~ msgid "Logger"
-#~ msgstr "Historique"
+#~ msgid "Connecting to character server..."
+#~ msgstr "Connexion au serveur de personnages..."
 
-#~ msgid "Hyperlink"
-#~ msgstr "Lien"
+#~ msgid "Cost"
+#~ msgstr "Coût"
 
-#~ msgid "Unknown Item Type"
-#~ msgstr "Type inconnu d'objet"
+#~ msgid "Couldn't set "
+#~ msgstr "Impossibler d'assigner "
 
-#~ msgid "Generics"
-#~ msgstr "Génériques"
+#~ msgid "Craft"
+#~ msgstr "Compétences"
 
-#~ msgid "Hats"
-#~ msgstr "Chapeaux"
+#~ msgid "Crafts"
+#~ msgstr "Metiers"
 
-#~ msgid "Usables"
-#~ msgstr "Utilisables"
+#~ msgid "Description: %s"
+#~ msgstr "Description : %s"
 
-#~ msgid "Shirts"
-#~ msgstr "Chemises"
+#~ msgid "Effect: %s"
+#~ msgstr "Effet : %s"
 
-#, fuzzy
-#~ msgid "One Handed Weapons"
-#~ msgstr "Armes à une main"
+#~ msgid "Emote"
+#~ msgstr "Emote"
 
-#~ msgid "Pants"
-#~ msgstr "Pantalon"
+#~ msgid "Emote Window"
+#~ msgstr "Fenêtre d'emote"
 
-#~ msgid "Shoes"
-#~ msgstr "Chaussures"
+#~ msgid "Exp"
+#~ msgstr "Exp"
 
-#, fuzzy
-#~ msgid "Two Handed Weapons"
-#~ msgstr "Armes à une main"
+#~ msgid "Failed to switch to "
+#~ msgstr "Impossible de passer à "
 
-#~ msgid "Shields"
-#~ msgstr "Boucliers"
+#~ msgid "Floating '...' bubble"
+#~ msgstr "Bulle flottante '...'"
 
-#~ msgid "Rings"
-#~ msgstr "Anneaux"
+#~ msgid "Floating bubble"
+#~ msgstr "Bulle flottante"
 
-#~ msgid "Necklaces"
-#~ msgstr "Colliers"
+#~ msgid "GM"
+#~ msgstr "MJ"
 
-#~ msgid "Arms"
-#~ msgstr "Bras"
+#~ msgid "Generics"
+#~ msgstr "Génériques"
 
-#~ msgid "Ammo"
-#~ msgstr "Munitions"
+#~ msgid "Guilds"
+#~ msgstr "Guildes"
+
+#~ msgid "HP"
+#~ msgstr "Vie"
 
 #~ msgid "HP Bar"
 #~ msgstr "Barre de vie (niveau maximum)"
 
-#~ msgid "3/4 HP Bar"
-#~ msgstr "3/4 Barre de vie"
-
-#~ msgid "1/2 HP Bar"
-#~ msgstr "1/2 Barre de vie"
-
-#~ msgid "1/4 HP Bar"
-#~ msgstr "1/4 Barre de vie"
+#~ msgid "Hats"
+#~ msgstr "Chapeaux"
 
-#~ msgid "no"
-#~ msgstr "non"
+#~ msgid "Highlight"
+#~ msgstr "Surbrillance"
 
-#~ msgid "Buddy"
-#~ msgstr "Contact"
+#~ msgid "Hyperlink"
+#~ msgstr "Lien"
 
-#~ msgid "Buddy List"
-#~ msgstr "Liste de contacts"
+#~ msgid "Inviting like this isn't supported at the moment."
+#~ msgstr "Cette manière d'inviter n'est pas en place actuellement."
 
-#~ msgid "Description: %s"
-#~ msgstr "Description : %s"
+#~ msgid "Is"
+#~ msgstr "Est"
 
-#~ msgid "Effect: %s"
-#~ msgstr "Effet : %s"
+#, fuzzy
+#~ msgid "Item Is Equipped"
+#~ msgstr "L'objet est équipé"
 
-#~ msgid "Previous"
-#~ msgstr "Précédent"
+#, fuzzy
+#~ msgid "Item Too Expensive"
+#~ msgstr "Objet trop cher"
 
-#~ msgid "New"
-#~ msgstr "Nouveau"
+#~ msgid "Job"
+#~ msgstr "Habilité"
 
 #~ msgid "Job Level: %d"
 #~ msgstr "Niveau de Compétences : %d"
 
-#~ msgid "Present: "
-#~ msgstr "Présent : "
+#~ msgid "Knife"
+#~ msgstr "Couteau"
 
-#~ msgid "Quit Guild"
-#~ msgstr "Quitter la guilde"
+#~ msgid "Level"
+#~ msgstr "Niveau"
 
-#~ msgid "Ok"
-#~ msgstr "Ok"
+#~ msgid "Logger"
+#~ msgstr "Historique"
 
-#~ msgid "Recent:"
-#~ msgstr "Récent :"
+#~ msgid "MP"
+#~ msgstr "PM"
+
+#~ msgid "Mace"
+#~ msgstr "Masse"
 
 #~ msgid "Magic"
 #~ msgstr "Magie"
 
-#~ msgid "Cast Test Spell 1"
-#~ msgstr "Jeter le sort d'essai 1"
-
-#~ msgid "Cast Test Spell 2"
-#~ msgstr "Jeter le sort d'essai 2"
-
-#~ msgid "Cast Test Spell 3"
-#~ msgstr "Jeter le sort d'essai 3"
-
-#~ msgid "2 Handed Weapons"
-#~ msgstr "Armes à deux mains"
-
-#~ msgid "@@trade|Trade With %s@@"
-#~ msgstr "@@trade|Troquer avec %s@@"
+#~ msgid "Max level"
+#~ msgstr "Niveau max."
 
-#~ msgid "@@attack|Attack %s@@"
-#~ msgstr "@@attack|Attaquer %s@@"
+#~ msgid "Money"
+#~ msgstr "Argent"
 
-#~ msgid "@@disregard|Disregard %s@@"
-#~ msgstr "@@disregard|Négliger%s@@"
+#~ msgid "Mystery Skill"
+#~ msgstr "Aptitude mystérieuse"
 
-#~ msgid "@@ignore|Ignore %s@@"
-#~ msgstr "@@ignore|Ignorer %s@@"
+#~ msgid "NPC Number Request"
+#~ msgstr "Requête de nombre PNJ"
 
-#~ msgid "@@unignore|Un-Ignore %s@@"
-#~ msgstr "@@unignore|Ne plus ignorer %s@@"
+#~ msgid "NPC Text Request"
+#~ msgstr "Requête de texte PNJ"
 
-#~ msgid "@@admin-kick|Kick player@@"
-#~ msgstr "@@admin-kick|Kick player@@"
+#~ msgid "Necklaces"
+#~ msgstr "Colliers"
 
-#~ msgid "@@cancel|Cancel@@"
-#~ msgstr "@@cancel|Annuler@@"
+#~ msgid "New"
+#~ msgstr "Nouveau"
 
-#~ msgid "@@pickup|Pick up %s@@"
-#~ msgstr "@@pickup|Ramasser %s@@"
+#~ msgid "Ok"
+#~ msgstr "Ok"
 
-#~ msgid "@@use|Unequip@@"
-#~ msgstr "@@use|Déséquiper@@"
+#, fuzzy
+#~ msgid "One Handed Weapons"
+#~ msgstr "Armes à une main"
 
-#~ msgid "@@use|Equip@@"
-#~ msgstr "@@use|Équiper@@"
+#~ msgid "One stat is zero."
+#~ msgstr "L'une des statistiques est à zéro."
 
-#~ msgid "@@use|Use@@"
-#~ msgstr "@@use|Utiliser@@"
+#~ msgid "Pants"
+#~ msgstr "Pantalon"
 
-#~ msgid "@@drop|Drop@@"
-#~ msgstr "@@drop|Jeter@@"
+#~ msgid "Party Window"
+#~ msgstr "Fenêtre de groupe"
 
-#~ msgid "@@split|Split@@"
-#~ msgstr "@@split|Partager@@"
+#~ msgid "Player"
+#~ msgstr "Joueur"
 
-#~ msgid "@@store|Store@@"
-#~ msgstr "@@store|Magasin@@"
+#~ msgid "Polearm"
+#~ msgstr "Pique"
 
-#~ msgid "@@retrieve|Retrieve@@"
-#~ msgstr "@@retrieve|Retirer@@"
+#~ msgid "Present: "
+#~ msgstr "Présent : "
 
-#~ msgid "Select Server"
-#~ msgstr "Sélectionner un serveur"
+#~ msgid "Previous"
+#~ msgstr "Précédent"
 
-#~ msgid "Failed to switch to "
-#~ msgstr "Impossible de passer à "
+#~ msgid "Progress Bar Labels"
+#~ msgstr "Texte des barres de progression"
 
-#~ msgid "windowed"
-#~ msgstr "fenetré"
+#~ msgid "Quit Guild"
+#~ msgstr "Quitter la guilde"
 
-#~ msgid "fullscreen"
-#~ msgstr "plein écran"
+#~ msgid "Recent:"
+#~ msgstr "Récent :"
 
-#~ msgid "Mystery Skill"
-#~ msgstr "Aptitude mystérieuse"
+#~ msgid "Rejected guild invite from %s."
+#~ msgstr "Invitation dans la guilde de la part de %s refusée."
 
-#~ msgid "Weapons"
-#~ msgstr "Armes"
+#~ msgid "Remaining Status Points: %d"
+#~ msgstr "Point(s) de statut restant(s) : %d"
 
-#~ msgid "Crafts"
-#~ msgstr "Metiers"
+#~ msgid "Rings"
+#~ msgstr "Anneaux"
 
-#~ msgid "Stats"
-#~ msgstr "Statut"
+#~ msgid "Scroll laziness"
+#~ msgstr "Lenteur du défilement"
 
-#~ msgid "Total"
-#~ msgstr "Total"
+#~ msgid "Scroll radius"
+#~ msgstr "Rayon du défilement"
 
-#~ msgid "Cost"
-#~ msgstr "Coût"
+#~ msgid "Select Server"
+#~ msgstr "Sélectionner un serveur"
 
-#~ msgid "Attack:"
-#~ msgstr "Attaque :"
+#~ msgid "Server"
+#~ msgstr "Serveur"
 
-#~ msgid "% Reflex:"
-#~ msgstr "% Réflexe :"
+#, fuzzy
+#~ msgid "Server is full."
+#~ msgstr "Le serveur est plein"
 
-#~ msgid "Remaining Status Points: %d"
-#~ msgstr "Point(s) de statut restant(s) : %d"
+#~ msgid "Shields"
+#~ msgstr "Boucliers"
 
-#~ msgid "Max level"
-#~ msgstr "Niveau max."
+#~ msgid "Shirts"
+#~ msgstr "Chemises"
 
-#~ msgid "curl error "
-#~ msgstr "Courbe d'erreur "
+#~ msgid "Shoes"
+#~ msgstr "Chaussures"
 
-#~ msgid " host: "
-#~ msgstr " hôte : "
+#~ msgid "Shooting"
+#~ msgstr "Tirer"
 
-#~ msgid "Guilds"
-#~ msgstr "Guildes"
+#~ msgid "Slots: "
+#~ msgstr "Cases : "
 
-#~ msgid "Buddys"
-#~ msgstr "Contacts"
+#~ msgid "Special %d"
+#~ msgstr "Cpt. spéciale %d"
 
-#~ msgid "Party Window"
-#~ msgstr "Fenêtre de groupe"
+#~ msgid "Specials Set %d"
+#~ msgstr "Set de Cpt. spéciales %d"
 
-#~ msgid "Unarmed"
-#~ msgstr "Désarmé"
+#~ msgid "Staff"
+#~ msgstr "Bâton"
 
-#~ msgid "Knife"
-#~ msgstr "Couteau"
+#~ msgid "Stats"
+#~ msgstr "Statut"
 
 #~ msgid "Sword"
 #~ msgstr "Épée"
 
-#~ msgid "Polearm"
-#~ msgstr "Pique"
-
-#~ msgid "Staff"
-#~ msgstr "Bâton"
-
-#~ msgid "Whip"
-#~ msgstr "Fouet"
-
-#~ msgid "Bow"
-#~ msgstr "Arc"
+#~ msgid "Tab Highlight"
+#~ msgstr "Onglet mis en surbrillance"
 
-#~ msgid "Shooting"
-#~ msgstr "Tirer"
+#~ msgid "Text Outline"
+#~ msgstr "Bordure du texte"
 
-#~ msgid "Mace"
-#~ msgstr "Masse"
+#~ msgid "Text Shadow"
+#~ msgstr "Ombre du texte"
 
-#~ msgid "Axe"
-#~ msgstr "Hache"
+#~ msgid "The Mana World %s"
+#~ msgstr "The Mana World %s"
 
 #~ msgid "Thrown"
 #~ msgstr "Lancé"
 
-#~ msgid "Craft"
-#~ msgstr "Compétences"
-
-#~ msgid "Unknown Skill"
-#~ msgstr "Compétence inconnue"
-
-#~ msgid " can't be created, but it doesn't exist! Exiting."
-#~ msgstr ""
-#~ " ne peut pas être créé, mais il n'existe pourtant pas ! Fermeture du "
-#~ "programme."
-
-#~ msgid "Couldn't set "
-#~ msgstr "Impossibler d'assigner "
+#~ msgid "Total"
+#~ msgstr "Total"
 
-#~ msgid " video mode: "
-#~ msgstr " mode d'affichage "
+#, fuzzy
+#~ msgid "Two Handed Weapons"
+#~ msgstr "Armes à une main"
 
-#~ msgid "mana"
-#~ msgstr "mana"
+#~ msgid "Unable to load selection.png"
+#~ msgstr "Impossible de charger le fichier selection.png"
 
-#~ msgid "Connecting to character server..."
-#~ msgstr "Connexion au serveur de personnages..."
+#~ msgid "Unable to pick up item."
+#~ msgstr "Impossible de ramasser l'objet."
 
-#~ msgid "Connecting to account server..."
-#~ msgstr "Connexion au serveur de comptes..."
+#~ msgid "Unarmed"
+#~ msgstr "Désarmé"
 
-#~ msgid "/new > Alias of create"
-#~ msgstr "/new > Alias de création"
+#~ msgid "Unknown Item Type"
+#~ msgstr "Type inconnu d'objet"
 
-#~ msgid "Command: /new <party-name>"
-#~ msgstr "Commande : /new <party-name>"
+#~ msgid "Unknown Skill"
+#~ msgstr "Compétence inconnue"
 
-#~ msgid "a"
-#~ msgstr "un(e)"
+#, fuzzy
+#~ msgid "Unknown failure to select character."
+#~ msgstr "Problème inconnu lors de la séléction du personnage"
 
 #~ msgid "Unnamed"
 #~ msgstr "Aonyme"
 
-#~ msgid "@@pickup|Pick Up %s@@"
-#~ msgstr "@@pickup|Ramasser %s@@"
-
-#~ msgid "Unable to load selection.png"
-#~ msgstr "Impossible de charger le fichier selection.png"
-
-#~ msgid "Emote"
-#~ msgstr "Emote"
-
-#~ msgid "NPC Text Request"
-#~ msgstr "Requête de texte PNJ"
-
-#~ msgid "NPC Number Request"
-#~ msgstr "Requête de nombre PNJ"
+#~ msgid "Usables"
+#~ msgstr "Utilisables"
 
-#~ msgid ""
-#~ "\n"
-#~ "> Cancel\n"
-#~ msgstr ""
-#~ "\n"
-#~ "> Annuler\n"
+#~ msgid "Weapons"
+#~ msgstr "Armes"
 
-#~ msgid "skills.xml"
-#~ msgstr "skills.xml"
+#~ msgid "Whip"
+#~ msgstr "Fouet"
 
-#~ msgid "use"
-#~ msgstr "Utiliser"
+#~ msgid "Whisper"
+#~ msgstr "Message privé"
 
-#~ msgid "%s: %s"
-#~ msgstr "%s : %s"
+#~ msgid "Willpower:"
+#~ msgstr "Volonté :"
 
-#~ msgid "Scroll radius"
-#~ msgstr "Rayon du défilement"
+#~ msgid "a"
+#~ msgstr "un(e)"
 
-#~ msgid "Scroll laziness"
-#~ msgstr "Lenteur du défilement"
+#~ msgid "curl error "
+#~ msgstr "Courbe d'erreur "
 
-#~ msgid "Slots: "
-#~ msgstr "Cases : "
+#~ msgid "fullscreen"
+#~ msgstr "plein écran"
 
-#~ msgid "Emote Window"
-#~ msgstr "Fenêtre d'emote"
+#~ msgid "inc"
+#~ msgstr "inc"
 
-#~ msgid "  -D --default    : Bypass the login process with default settings"
-#~ msgstr ""
-#~ "  -D --default : Bypasser le processus de connexion par la configuration "
-#~ "par défaut"
+#~ msgid "items.xml"
+#~ msgstr "items.xml"
 
-#~ msgid " cancelled"
-#~ msgstr " annulé"
+#~ msgid "mana"
+#~ msgstr "mana"
 
 #~ msgid "monsters.xml"
 #~ msgstr "monsters.xml"
 
-#~ msgid "items.xml"
-#~ msgstr "items.xml"
+#~ msgid "no"
+#~ msgstr "non"
 
-#~ msgid "inc"
-#~ msgstr "inc"
+#~ msgid "skills.xml"
+#~ msgstr "skills.xml"
 
-#~ msgid "; "
-#~ msgstr "; "
+#~ msgid "use"
+#~ msgstr "Utiliser"
 
-#~ msgid "The Mana World %s"
-#~ msgstr "The Mana World %s"
+#~ msgid "windowed"
+#~ msgstr "fenetré"
diff --git a/po/mana.pot b/po/mana.pot
index d380b9fb..d71f242c 100644
--- a/po/mana.pot
+++ b/po/mana.pot
@@ -1,5 +1,5 @@
 # SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR The Mana Developers
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-12-13 20:04+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-04-30 16:50+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,3399 +18,3627 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: src/client.cpp:598 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
+#: ../src/client.cpp:580 ../src/gui/setup.cpp:43 ../src/gui/windowmenu.cpp:66
 msgid "Setup"
 msgstr ""
 
-#: src/client.cpp:679
+#: ../src/client.cpp:661
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:706
+#: ../src/client.cpp:688
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:739
+#: ../src/client.cpp:721
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:804
+#: ../src/client.cpp:783
+msgid ""
+"This server is missing needed world data. Please contact the administrator"
+"(s)."
+msgstr ""
+
+#: ../src/client.cpp:785
+msgid "ItemDB: Error while loading "
+msgstr ""
+
+#: ../src/client.cpp:809
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:833
+#: ../src/client.cpp:838
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:843
+#: ../src/client.cpp:848
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:872 src/client.cpp:879 src/client.cpp:1014
-#: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
-#: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:323 src/gui/unregisterdialog.cpp:133
-#: src/net/manaserv/charhandler.cpp:174 src/net/manaserv/charhandler.cpp:217
-#: src/net/tmwa/charserverhandler.cpp:134
-#: src/net/tmwa/charserverhandler.cpp:151
-msgid "Error"
-msgstr ""
-
-#: src/client.cpp:888
+#: ../src/client.cpp:889
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:915
+#: ../src/client.cpp:916
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:916
+#: ../src/client.cpp:917
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:935
+#: ../src/client.cpp:935
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:936
+#: ../src/client.cpp:936
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:956
+#: ../src/client.cpp:955
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:957
+#: ../src/client.cpp:956
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1138 src/client.cpp:1161
+#: ../src/client.cpp:1036 ../src/gui/changeemaildialog.cpp:156
+#: ../src/gui/changepassworddialog.cpp:149 ../src/gui/charcreatedialog.cpp:183
+#: ../src/gui/register.cpp:218 ../src/gui/serverdialog.cpp:323
+#: ../src/gui/unregisterdialog.cpp:133 ../src/net/manaserv/charhandler.cpp:177
+#: ../src/net/manaserv/charhandler.cpp:227
+#: ../src/net/tmwa/charserverhandler.cpp:134
+#: ../src/net/tmwa/charserverhandler.cpp:151
+msgid "Error"
+msgstr ""
+
+#: ../src/client.cpp:1154 ../src/client.cpp:1182
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1281
+#: ../src/client.cpp:1302
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1315 src/client.cpp:1321
+#: ../src/client.cpp:1336 ../src/client.cpp:1342
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/commandhandler.cpp:131 src/commandhandler.cpp:317
+#: ../src/commandhandler.cpp:136 ../src/commandhandler.cpp:333
 msgid "Unknown command."
 msgstr ""
 
-#: src/commandhandler.cpp:160
+#: ../src/commandhandler.cpp:165
 msgid "-- Help --"
 msgstr ""
 
-#: src/commandhandler.cpp:161
+#: ../src/commandhandler.cpp:166
 msgid "/help > Display this help"
 msgstr ""
 
-#: src/commandhandler.cpp:163
+#: ../src/commandhandler.cpp:168
 msgid "/where > Display map name"
 msgstr ""
 
-#: src/commandhandler.cpp:164
+#: ../src/commandhandler.cpp:169
 msgid "/who > Display number of online users"
 msgstr ""
 
-#: src/commandhandler.cpp:165
+#: ../src/commandhandler.cpp:170
 msgid "/me > Tell something about yourself"
 msgstr ""
 
-#: src/commandhandler.cpp:167
+#: ../src/commandhandler.cpp:172
 msgid "/clear > Clears this window"
 msgstr ""
 
-#: src/commandhandler.cpp:169
+#: ../src/commandhandler.cpp:174
 msgid "/msg > Send a private message to a user"
 msgstr ""
 
-#: src/commandhandler.cpp:170
+#: ../src/commandhandler.cpp:175
 msgid "/whisper > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:171
+#: ../src/commandhandler.cpp:176
 msgid "/w > Alias of msg"
 msgstr ""
 
-#: src/commandhandler.cpp:172
+#: ../src/commandhandler.cpp:177
 msgid "/query > Makes a tab for private messages with another user"
 msgstr ""
 
-#: src/commandhandler.cpp:174
+#: ../src/commandhandler.cpp:179
 msgid "/q > Alias of query"
 msgstr ""
 
-#: src/commandhandler.cpp:176
+#: ../src/commandhandler.cpp:181
+msgid "/away > Tell the other whispering players you're away from keyboard."
+msgstr ""
+
+#: ../src/commandhandler.cpp:184
 msgid "/ignore > ignore a player"
 msgstr ""
 
-#: src/commandhandler.cpp:177
+#: ../src/commandhandler.cpp:185
 msgid "/unignore > stop ignoring a player"
 msgstr ""
 
-#: src/commandhandler.cpp:179
+#: ../src/commandhandler.cpp:187
 msgid "/list > Display all public channels"
 msgstr ""
 
-#: src/commandhandler.cpp:180
+#: ../src/commandhandler.cpp:188
 msgid "/join > Join or create a channel"
 msgstr ""
 
-#: src/commandhandler.cpp:182
+#: ../src/commandhandler.cpp:190
 msgid "/createparty > Create a new party"
 msgstr ""
 
-#: src/commandhandler.cpp:183
+#: ../src/commandhandler.cpp:191
 msgid "/party > Invite a user to party"
 msgstr ""
 
-#: src/commandhandler.cpp:185
+#: ../src/commandhandler.cpp:193
 msgid "/record > Start recording the chat to an external file"
 msgstr ""
 
-#: src/commandhandler.cpp:187
+#: ../src/commandhandler.cpp:195
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr ""
 
-#: src/commandhandler.cpp:189
+#: ../src/commandhandler.cpp:197
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 
-#: src/commandhandler.cpp:192
+#: ../src/commandhandler.cpp:200
 msgid "/announce > Global announcement (GM only)"
 msgstr ""
 
-#: src/commandhandler.cpp:196
+#: ../src/commandhandler.cpp:204
 msgid "For more information, type /help <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:200
+#: ../src/commandhandler.cpp:208
 msgid "Command: /help"
 msgstr ""
 
-#: src/commandhandler.cpp:201
+#: ../src/commandhandler.cpp:209
 msgid "This command displays a list of all commands available."
 msgstr ""
 
-#: src/commandhandler.cpp:203
+#: ../src/commandhandler.cpp:211
 msgid "Command: /help <command>"
 msgstr ""
 
-#: src/commandhandler.cpp:204
+#: ../src/commandhandler.cpp:212
 msgid "This command displays help on <command>."
 msgstr ""
 
-#: src/commandhandler.cpp:212
+#: ../src/commandhandler.cpp:220
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/commandhandler.cpp:213
+#: ../src/commandhandler.cpp:221
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/commandhandler.cpp:214
+#: ../src/commandhandler.cpp:222
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:219
+#: ../src/commandhandler.cpp:227
 msgid "Command: /clear"
 msgstr ""
 
-#: src/commandhandler.cpp:220
+#: ../src/commandhandler.cpp:228
 msgid "This command clears the chat log of previous chat."
 msgstr ""
 
-#: src/commandhandler.cpp:224
+#: ../src/commandhandler.cpp:232
 msgid "Command: /ignore <player>"
 msgstr ""
 
-#: src/commandhandler.cpp:225
+#: ../src/commandhandler.cpp:233
 msgid "This command ignores the given player regardless of current relations."
 msgstr ""
 
-#: src/commandhandler.cpp:230
+#: ../src/commandhandler.cpp:238
 msgid "Command: /join <channel>"
 msgstr ""
 
-#: src/commandhandler.cpp:231
+#: ../src/commandhandler.cpp:239
 msgid "This command makes you enter <channel>."
 msgstr ""
 
-#: src/commandhandler.cpp:232
+#: ../src/commandhandler.cpp:240
 msgid "If <channel> doesn't exist, it's created."
 msgstr ""
 
-#: src/commandhandler.cpp:236
+#: ../src/commandhandler.cpp:244
 msgid "Command: /list"
 msgstr ""
 
-#: src/commandhandler.cpp:237
+#: ../src/commandhandler.cpp:245
 msgid "This command shows a list of all channels."
 msgstr ""
 
-#: src/commandhandler.cpp:241
+#: ../src/commandhandler.cpp:249
 msgid "Command: /me <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:242
+#: ../src/commandhandler.cpp:250
 msgid "This command tell others you are (doing) <msg>."
 msgstr ""
 
-#: src/commandhandler.cpp:246
+#: ../src/commandhandler.cpp:254
 msgid "Command: /msg <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:247
+#: ../src/commandhandler.cpp:255
 msgid "Command: /whisper <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:248
+#: ../src/commandhandler.cpp:256
 msgid "Command: /w <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:249
+#: ../src/commandhandler.cpp:257
 msgid "This command sends the text <message> to <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:250 src/commandhandler.cpp:269
-#: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
-#: src/net/tmwa/gui/guildtab.cpp:75 src/net/tmwa/gui/partytab.cpp:75
+#: ../src/commandhandler.cpp:258 ../src/commandhandler.cpp:285
+#: ../src/gui/widgets/channeltab.cpp:82 ../src/gui/widgets/channeltab.cpp:91
+#: ../src/net/tmwa/gui/guildtab.cpp:75 ../src/net/tmwa/gui/partytab.cpp:75
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr ""
 
-#: src/commandhandler.cpp:255
+#: ../src/commandhandler.cpp:263
 msgid "Command: /query <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:256
+#: ../src/commandhandler.cpp:264
 msgid "Command: /q <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:257
+#: ../src/commandhandler.cpp:265
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:262
+#: ../src/commandhandler.cpp:270
+msgid "Command: /away <afk reason>"
+msgstr ""
+
+#: ../src/commandhandler.cpp:271
+msgid "This command tells you're away from keyboard with the given reason."
+msgstr ""
+
+#: ../src/commandhandler.cpp:273
+msgid "Command: /away"
+msgstr ""
+
+#: ../src/commandhandler.cpp:274
+msgid "This command clears the away status and message."
+msgstr ""
+
+#: ../src/commandhandler.cpp:278
 msgid "Command: /createparty <name>"
 msgstr ""
 
-#: src/commandhandler.cpp:263
+#: ../src/commandhandler.cpp:279
 msgid "This command creates a new party called <name>."
 msgstr ""
 
-#: src/commandhandler.cpp:267
+#: ../src/commandhandler.cpp:283
 msgid "Command: /party <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:268 src/net/tmwa/gui/partytab.cpp:74
+#: ../src/commandhandler.cpp:284 ../src/net/tmwa/gui/partytab.cpp:74
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/commandhandler.cpp:274
+#: ../src/commandhandler.cpp:290
 msgid "Command: /present"
 msgstr ""
 
-#: src/commandhandler.cpp:275
+#: ../src/commandhandler.cpp:291
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: src/commandhandler.cpp:281
+#: ../src/commandhandler.cpp:297
 msgid "Command: /record <filename>"
 msgstr ""
 
-#: src/commandhandler.cpp:282
+#: ../src/commandhandler.cpp:298
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr ""
 
-#: src/commandhandler.cpp:284
+#: ../src/commandhandler.cpp:300
 msgid "Command: /record"
 msgstr ""
 
-#: src/commandhandler.cpp:285
+#: ../src/commandhandler.cpp:301
 msgid "This command finishes a recording session."
 msgstr ""
 
-#: src/commandhandler.cpp:289
+#: ../src/commandhandler.cpp:305
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: src/commandhandler.cpp:290
+#: ../src/commandhandler.cpp:306
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: src/commandhandler.cpp:292
+#: ../src/commandhandler.cpp:308
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
 "\"0\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: src/commandhandler.cpp:295
+#: ../src/commandhandler.cpp:311
 msgid "Command: /toggle"
 msgstr ""
 
-#: src/commandhandler.cpp:296
+#: ../src/commandhandler.cpp:312
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: src/commandhandler.cpp:300 src/gui/widgets/whispertab.cpp:95
+#: ../src/commandhandler.cpp:316 ../src/gui/widgets/whispertab.cpp:95
 msgid "Command: /unignore <player>"
 msgstr ""
 
-#: src/commandhandler.cpp:301
+#: ../src/commandhandler.cpp:317
 msgid "This command stops ignoring the given player if they are being ignored"
 msgstr ""
 
-#: src/commandhandler.cpp:306
+#: ../src/commandhandler.cpp:322
 msgid "Command: /where"
 msgstr ""
 
-#: src/commandhandler.cpp:307
+#: ../src/commandhandler.cpp:323
 msgid "This command displays the name of the current map."
 msgstr ""
 
-#: src/commandhandler.cpp:311
+#: ../src/commandhandler.cpp:327
 msgid "Command: /who"
 msgstr ""
 
-#: src/commandhandler.cpp:312
+#: ../src/commandhandler.cpp:328
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:318
+#: ../src/commandhandler.cpp:334
 msgid "Type /help for a list of commands."
 msgstr ""
 
-#: src/commandhandler.cpp:384
+#: ../src/commandhandler.cpp:400
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:392
+#: ../src/commandhandler.cpp:407
+msgid "No <nick> was given."
+msgstr ""
+
+#: ../src/commandhandler.cpp:421
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:406
+#: ../src/commandhandler.cpp:435
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:419 src/net/tmwa/gui/partytab.cpp:109
+#: ../src/commandhandler.cpp:448 ../src/net/tmwa/gui/partytab.cpp:109
 msgid "Party name is missing."
 msgstr ""
 
-#: src/commandhandler.cpp:432 src/commandhandler.cpp:509
-#: src/commandhandler.cpp:531
+#: ../src/commandhandler.cpp:461 ../src/commandhandler.cpp:538
+#: ../src/commandhandler.cpp:560
 msgid "Please specify a name."
 msgstr ""
 
-#: src/commandhandler.cpp:450
+#: ../src/commandhandler.cpp:479
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:450
+#: ../src/commandhandler.cpp:479
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:459
+#: ../src/commandhandler.cpp:488
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:463
+#: ../src/commandhandler.cpp:492
 msgid "Message now closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:476 src/commandhandler.cpp:489
+#: ../src/commandhandler.cpp:505 ../src/commandhandler.cpp:518
 msgid "Show IP: On"
 msgstr ""
 
-#: src/commandhandler.cpp:476 src/commandhandler.cpp:485
+#: ../src/commandhandler.cpp:505 ../src/commandhandler.cpp:514
 msgid "Show IP: Off"
 msgstr ""
 
-#: src/commandhandler.cpp:515
+#: ../src/commandhandler.cpp:544
 msgid "Player already ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:522
+#: ../src/commandhandler.cpp:551
 msgid "Player successfully ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:524
+#: ../src/commandhandler.cpp:553
 msgid "Player could not be ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:539
+#: ../src/commandhandler.cpp:568
 msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:544
+#: ../src/commandhandler.cpp:573
 msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/commandhandler.cpp:546
+#: ../src/commandhandler.cpp:575
 msgid "Player could not be unignored!"
 msgstr ""
 
-#: src/commandhandler.h:31
+#: ../src/commandhandler.h:31
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:172
+#: ../src/game.cpp:181
 msgid "General"
 msgstr ""
 
-#: src/game.cpp:342
+#: ../src/game.cpp:349
 msgid "Screenshot saved as "
 msgstr ""
 
-#: src/game.cpp:347
+#: ../src/game.cpp:354
 msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:378
+#: ../src/game.cpp:385
 msgid "The connection to the server was lost."
 msgstr ""
 
-#: src/game.cpp:382
+#: ../src/game.cpp:386
 msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:721
+#: ../src/game.cpp:733
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:726
+#: ../src/game.cpp:738
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:954
+#: ../src/game.cpp:966
 msgid "Could Not Load Map"
 msgstr ""
 
-#: src/game.cpp:955
+#: ../src/game.cpp:967
 #, c-format
 msgid "Error while loading %s"
 msgstr ""
 
-#: src/gui/beingpopup.cpp:76
+#: ../src/gui/beingpopup.cpp:76
 #, c-format
 msgid "Party: %s"
 msgstr ""
 
-#: src/gui/buy.cpp:49 src/gui/buy.cpp:78 src/gui/buysell.cpp:47
+#: ../src/gui/buy.cpp:49 ../src/gui/buy.cpp:78 ../src/gui/buysell.cpp:47
 msgid "Buy"
 msgstr ""
 
-#: src/gui/buy.cpp:69 src/gui/buy.cpp:261 src/gui/sell.cpp:71
-#: src/gui/sell.cpp:288
+#: ../src/gui/buy.cpp:69 ../src/gui/buy.cpp:267 ../src/gui/sell.cpp:71
+#: ../src/gui/sell.cpp:288
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
-#. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:112 src/gui/npcdialog.cpp:124
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:463
+#: ../src/gui/buy.cpp:74 ../src/gui/itemamount.cpp:112
+#: ../src/gui/npcdialog.cpp:124 ../src/gui/sell.cpp:74
+#: ../src/gui/statuswindow.cpp:464
 msgid "+"
 msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
-#. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:111 src/gui/npcdialog.cpp:125
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:475
+#: ../src/gui/buy.cpp:77 ../src/gui/itemamount.cpp:111
+#: ../src/gui/npcdialog.cpp:125 ../src/gui/sell.cpp:75
+#: ../src/gui/statuswindow.cpp:476
 msgid "-"
 msgstr ""
 
-#: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:228
-#: src/keyboardconfig.cpp:102
+#: ../src/gui/buy.cpp:79 ../src/gui/quitdialog.cpp:40
+#: ../src/gui/quitdialog.cpp:42 ../src/gui/quitdialog.cpp:43
+#: ../src/gui/sell.cpp:77 ../src/gui/serverdialog.cpp:228
+#: ../src/keyboardconfig.cpp:102
 msgid "Quit"
 msgstr ""
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:384
-#: src/gui/statuswindow.cpp:462 src/gui/statuswindow.cpp:496
+#: ../src/gui/buy.cpp:80 ../src/gui/sell.cpp:78
+#: ../src/gui/statuswindow.cpp:385 ../src/gui/statuswindow.cpp:463
+#: ../src/gui/statuswindow.cpp:497
 msgid "Max"
 msgstr ""
 
-#: src/gui/buysell.cpp:38
+#: ../src/gui/buysell.cpp:38
 msgid "Shop"
 msgstr ""
 
-#: src/gui/buysell.cpp:47 src/gui/sell.cpp:49 src/gui/sell.cpp:76
+#: ../src/gui/buysell.cpp:47 ../src/gui/sell.cpp:49 ../src/gui/sell.cpp:76
 msgid "Sell"
 msgstr ""
 
-#: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
-#: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
-#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:114
-#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:175
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:389
-#: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:275 src/gui/textdialog.cpp:40
-#: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
+#: ../src/gui/buysell.cpp:47 ../src/gui/changeemaildialog.cpp:55
+#: ../src/gui/changepassworddialog.cpp:58 ../src/gui/charcreatedialog.cpp:79
+#: ../src/gui/connectiondialog.cpp:44 ../src/gui/itemamount.cpp:114
+#: ../src/gui/npcpostdialog.cpp:57 ../src/gui/popupmenu.cpp:175
+#: ../src/gui/popupmenu.cpp:194 ../src/gui/popupmenu.cpp:389
+#: ../src/gui/quitdialog.cpp:47 ../src/gui/register.cpp:74
+#: ../src/gui/setup.cpp:51 ../src/gui/socialwindow.cpp:275
+#: ../src/gui/textdialog.cpp:40 ../src/gui/unregisterdialog.cpp:56
+#: ../src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:45 src/gui/changeemaildialog.cpp:54
+#: ../src/gui/changeemaildialog.cpp:45 ../src/gui/changeemaildialog.cpp:54
 msgid "Change Email Address"
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:49 src/gui/changepassworddialog.cpp:52
+#: ../src/gui/changeemaildialog.cpp:49 ../src/gui/changepassworddialog.cpp:52
 #, c-format
 msgid "Account: %s"
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:51
+#: ../src/gui/changeemaildialog.cpp:51
 msgid "Type new email address twice:"
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:127
+#: ../src/gui/changeemaildialog.cpp:127
 #, c-format
 msgid "The new email address needs to be at least %d characters long."
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:134
+#: ../src/gui/changeemaildialog.cpp:134
 #, c-format
 msgid "The new email address needs to be less than %d characters long."
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:141
+#: ../src/gui/changeemaildialog.cpp:141
 msgid "The email address entries mismatch."
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:47 src/gui/changepassworddialog.cpp:56
-#: src/gui/charselectdialog.cpp:128
+#: ../src/gui/changepassworddialog.cpp:47
+#: ../src/gui/changepassworddialog.cpp:56 ../src/gui/charselectdialog.cpp:132
 msgid "Change Password"
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:55
-#: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
+#: ../src/gui/changepassworddialog.cpp:61 ../src/gui/login.cpp:55
+#: ../src/gui/register.cpp:68 ../src/gui/unregisterdialog.cpp:53
 msgid "Password:"
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:63
+#: ../src/gui/changepassworddialog.cpp:63
 msgid "Type new password twice:"
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:110
+#: ../src/gui/changepassworddialog.cpp:110
 msgid "Enter the old password first."
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:116
+#: ../src/gui/changepassworddialog.cpp:116
 #, c-format
 msgid "The new password needs to be at least %d characters long."
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:123
+#: ../src/gui/changepassworddialog.cpp:123
 #, c-format
 msgid "The new password needs to be less than %d characters long."
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:130
+#: ../src/gui/changepassworddialog.cpp:130
 msgid "The new password entries mismatch."
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:53
+#: ../src/gui/charcreatedialog.cpp:53
 msgid "Create Character"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:54
-#: src/gui/register.cpp:67
+#: ../src/gui/charcreatedialog.cpp:67 ../src/gui/login.cpp:54
+#: ../src/gui/register.cpp:67
 msgid "Name:"
 msgstr ""
 
-#. TRANSLATORS: This is an arrow symbol used to denote 'next'.
-#. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
-#: src/gui/outfitwindow.cpp:67
+#: ../src/gui/charcreatedialog.cpp:70 ../src/gui/charcreatedialog.cpp:75
+#: ../src/gui/outfitwindow.cpp:67
 msgid ">"
 msgstr ""
 
-#. TRANSLATORS: This is an arrow symbol used to denote 'previous'.
-#. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
-#: src/gui/outfitwindow.cpp:66
+#: ../src/gui/charcreatedialog.cpp:73 ../src/gui/charcreatedialog.cpp:76
+#: ../src/gui/outfitwindow.cpp:66
 msgid "<"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:74
+#: ../src/gui/charcreatedialog.cpp:74
 msgid "Hair color:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:77
+#: ../src/gui/charcreatedialog.cpp:77
 msgid "Hair style:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:392
-#: src/gui/socialwindow.cpp:329
+#: ../src/gui/charcreatedialog.cpp:78 ../src/gui/charselectdialog.cpp:416
+#: ../src/gui/socialwindow.cpp:330
 msgid "Create"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:80 src/gui/register.cpp:90
+#: ../src/gui/charcreatedialog.cpp:80 ../src/gui/register.cpp:90
 msgid "Male"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:81 src/gui/register.cpp:91
+#: ../src/gui/charcreatedialog.cpp:81 ../src/gui/register.cpp:91
 msgid "Female"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:251
+#: ../src/gui/charcreatedialog.cpp:99 ../src/gui/charcreatedialog.cpp:257
 #, c-format
 msgid "Please distribute %d points"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:178
+#: ../src/gui/charcreatedialog.cpp:184
 msgid "Your name needs to be at least 4 characters."
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:242
+#: ../src/gui/charcreatedialog.cpp:248
 msgid "Character stats OK"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:256
+#: ../src/gui/charcreatedialog.cpp:262
 #, c-format
 msgid "Please remove %d points"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:69
+#: ../src/gui/charselectdialog.cpp:72
 msgid "Confirm Character Delete"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:70
+#: ../src/gui/charselectdialog.cpp:73
 msgid "Are you sure you want to delete this character?"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:117
+#: ../src/gui/charselectdialog.cpp:120
 msgid "Account and Character Management"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:127
+#: ../src/gui/charselectdialog.cpp:131
 msgid "Switch Login"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:141 src/gui/unregisterdialog.cpp:47
-#: src/gui/unregisterdialog.cpp:55
+#: ../src/gui/charselectdialog.cpp:145 ../src/gui/unregisterdialog.cpp:47
+#: ../src/gui/unregisterdialog.cpp:55
 msgid "Unregister"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:150
+#: ../src/gui/charselectdialog.cpp:154
 msgid "Change Email"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:231
-#: src/gui/setup_players.cpp:229
+#: ../src/gui/charselectdialog.cpp:360 ../src/gui/serverdialog.cpp:231
+#: ../src/gui/setup_players.cpp:229
 msgid "Delete"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:380
+#: ../src/gui/charselectdialog.cpp:404
 msgid "Choose"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:394 src/gui/charselectdialog.cpp:395
+#: ../src/gui/charselectdialog.cpp:418 ../src/gui/charselectdialog.cpp:419
 msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:88
+#: ../src/gui/chat.cpp:88
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:311
+#: ../src/gui/chat.cpp:311
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:329
+#: ../src/gui/chat.cpp:329
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:493
+#: ../src/gui/chat.cpp:494
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
 
-#: src/gui/confirmdialog.cpp:42
+#: ../src/gui/confirmdialog.cpp:42
 msgid "Yes"
 msgstr ""
 
-#: src/gui/confirmdialog.cpp:43
+#: ../src/gui/confirmdialog.cpp:43
 msgid "No"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:43
+#: ../src/gui/debugwindow.cpp:43
 msgid "Debug"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:56
+#: ../src/gui/debugwindow.cpp:56
 #, c-format
 msgid "%d FPS (OpenGL)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:61 src/gui/debugwindow.cpp:64
+#: ../src/gui/debugwindow.cpp:61 ../src/gui/debugwindow.cpp:64
 #, c-format
 msgid "%d FPS"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:65 src/gui/debugwindow.cpp:104
+#: ../src/gui/debugwindow.cpp:65 ../src/gui/debugwindow.cpp:104
 #, c-format
 msgid "Music: %s"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:66 src/gui/debugwindow.cpp:108
+#: ../src/gui/debugwindow.cpp:66 ../src/gui/debugwindow.cpp:108
 #, c-format
 msgid "Map: %s"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:67 src/gui/debugwindow.cpp:106
+#: ../src/gui/debugwindow.cpp:67 ../src/gui/debugwindow.cpp:106
 #, c-format
 msgid "Minimap: %s"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:68 src/gui/debugwindow.cpp:99
+#: ../src/gui/debugwindow.cpp:68 ../src/gui/debugwindow.cpp:99
 #, c-format
 msgid "Cursor: (%d, %d)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:69 src/gui/debugwindow.cpp:111
+#: ../src/gui/debugwindow.cpp:69 ../src/gui/debugwindow.cpp:111
 #, c-format
 msgid "Particle count: %d"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:116
+#: ../src/gui/debugwindow.cpp:116
 #, c-format
 msgid "Particle detail: %s"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:121
+#: ../src/gui/debugwindow.cpp:121
 #, c-format
 msgid "Ambient FX: %s"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:55
+#: ../src/gui/equipmentwindow.cpp:69 ../src/gui/windowmenu.cpp:55
 msgid "Equipment"
 msgstr ""
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:89
-#: src/gui/inventorywindow.cpp:337 src/gui/popupmenu.cpp:359
+#: ../src/gui/equipmentwindow.cpp:88 ../src/gui/inventorywindow.cpp:94
+#: ../src/gui/inventorywindow.cpp:352 ../src/gui/popupmenu.cpp:364
 msgid "Unequip"
 msgstr ""
 
-#: src/gui/help.cpp:37
+#: ../src/gui/help.cpp:37
 msgid "Help"
 msgstr ""
 
-#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:50
+#: ../src/gui/help.cpp:51 ../src/gui/npcdialog.cpp:50
 msgid "Close"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:59 src/gui/windowmenu.cpp:56
+#: ../src/gui/inventorywindow.cpp:59 ../src/gui/windowmenu.cpp:56
 msgid "Inventory"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:59
+#: ../src/gui/inventorywindow.cpp:59
 msgid "Storage"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:82
+#: ../src/gui/inventorywindow.cpp:86
 msgid "Slots:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:87 src/gui/inventorywindow.cpp:100
-#: src/gui/inventorywindow.cpp:339 src/gui/popupmenu.cpp:361
+#: ../src/gui/inventorywindow.cpp:87
+msgid "Search:"
+msgstr ""
+
+#: ../src/gui/inventorywindow.cpp:92 ../src/gui/inventorywindow.cpp:105
+#: ../src/gui/inventorywindow.cpp:354 ../src/gui/popupmenu.cpp:366
 msgid "Equip"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:88
+#: ../src/gui/inventorywindow.cpp:93
 msgid "Use"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:101 src/gui/popupmenu.cpp:364
+#: ../src/gui/inventorywindow.cpp:106 ../src/gui/popupmenu.cpp:369
 msgid "Activate"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:102 src/gui/inventorywindow.cpp:348
-#: src/gui/popupmenu.cpp:367
+#: ../src/gui/inventorywindow.cpp:107 ../src/gui/inventorywindow.cpp:363
+#: ../src/gui/popupmenu.cpp:372
 msgid "Drop..."
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:103 src/gui/popupmenu.cpp:373
+#: ../src/gui/inventorywindow.cpp:108 ../src/gui/popupmenu.cpp:378
 msgid "Split"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:104 src/gui/outfitwindow.cpp:51
+#: ../src/gui/inventorywindow.cpp:109 ../src/gui/outfitwindow.cpp:51
 msgid "Outfits"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:106
+#: ../src/gui/inventorywindow.cpp:111
 msgid "Weight:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:124 src/gui/popupmenu.cpp:378
+#: ../src/gui/inventorywindow.cpp:131 ../src/gui/popupmenu.cpp:358
 msgid "Store"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:125 src/gui/popupmenu.cpp:385
+#: ../src/gui/inventorywindow.cpp:132 ../src/gui/popupmenu.cpp:385
 msgid "Retrieve"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:350 src/gui/popupmenu.cpp:369
+#: ../src/gui/inventorywindow.cpp:365 ../src/gui/popupmenu.cpp:374
 msgid "Drop"
 msgstr ""
 
-#: src/gui/itemamount.cpp:113 src/gui/okdialog.cpp:42
-#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:72
-#: src/gui/trade.cpp:74
+#: ../src/gui/itemamount.cpp:113 ../src/gui/okdialog.cpp:42
+#: ../src/gui/quitdialog.cpp:46 ../src/gui/textdialog.cpp:39
+#: ../src/gui/trade.cpp:72 ../src/gui/trade.cpp:74
 msgid "OK"
 msgstr ""
 
-#: src/gui/itemamount.cpp:115
+#: ../src/gui/itemamount.cpp:115
 msgid "All"
 msgstr ""
 
-#: src/gui/itemamount.cpp:141
+#: ../src/gui/itemamount.cpp:141
 msgid "Select amount of items to trade."
 msgstr ""
 
-#: src/gui/itemamount.cpp:144
+#: ../src/gui/itemamount.cpp:144
 msgid "Select amount of items to drop."
 msgstr ""
 
-#: src/gui/itemamount.cpp:147
+#: ../src/gui/itemamount.cpp:147
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamount.cpp:150
+#: ../src/gui/itemamount.cpp:150
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamount.cpp:153
+#: ../src/gui/itemamount.cpp:153
 msgid "Select amount of items to split."
 msgstr ""
 
-#: src/gui/itempopup.cpp:137
+#: ../src/gui/itempopup.cpp:174
 #, c-format
 msgid "Weight: %s"
 msgstr ""
 
-#: src/gui/login.cpp:51 src/gui/login.cpp:63
+#: ../src/gui/login.cpp:51 ../src/gui/login.cpp:63
 msgid "Login"
 msgstr ""
 
-#: src/gui/login.cpp:60
+#: ../src/gui/login.cpp:60
 msgid "Remember username"
 msgstr ""
 
-#: src/gui/login.cpp:61 src/gui/register.cpp:58 src/gui/register.cpp:73
+#: ../src/gui/login.cpp:61 ../src/gui/register.cpp:58
+#: ../src/gui/register.cpp:73
 msgid "Register"
 msgstr ""
 
-#: src/gui/login.cpp:62
+#: ../src/gui/login.cpp:62
 msgid "Change Server"
 msgstr ""
 
-#: src/gui/login.cpp:129
+#: ../src/gui/login.cpp:129
 msgid "Registration disabled"
 msgstr ""
 
-#: src/gui/login.cpp:129
+#: ../src/gui/login.cpp:129
 msgid "You need to use the website to register an account for this server."
 msgstr ""
 
-#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:86
+#: ../src/gui/minimap.cpp:45 ../src/gui/minimap.cpp:86
 msgid "Map"
 msgstr ""
 
-#: src/gui/ministatus.cpp:235
+#: ../src/gui/ministatus.cpp:236
 msgid "Need"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:48
+#: ../src/gui/npcdialog.cpp:48
 msgid "Waiting for server"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:49
+#: ../src/gui/npcdialog.cpp:49
 msgid "Next"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:51
+#: ../src/gui/npcdialog.cpp:51
 msgid "Submit"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:73 src/gui/npcpostdialog.cpp:41
+#: ../src/gui/npcdialog.cpp:73 ../src/gui/npcpostdialog.cpp:41
 msgid "NPC"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:118
+#: ../src/gui/npcdialog.cpp:118
 msgid "Clear log"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:134
+#: ../src/gui/npcdialog.cpp:134
 msgid "Reset"
 msgstr ""
 
-#. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:208
+#: ../src/gui/npcdialog.cpp:208
 msgid ""
 "\n"
 "> Next\n"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:47
+#: ../src/gui/npcpostdialog.cpp:47
 msgid "To:"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:54
+#: ../src/gui/npcpostdialog.cpp:54
 msgid "Send"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:99
+#: ../src/gui/npcpostdialog.cpp:99
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:68 src/gui/outfitwindow.cpp:141
-#: src/gui/outfitwindow.cpp:154
+#: ../src/gui/outfitwindow.cpp:68 ../src/gui/outfitwindow.cpp:141
+#: ../src/gui/outfitwindow.cpp:154
 #, c-format
 msgid "Outfit: %d"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:70
+#: ../src/gui/outfitwindow.cpp:70
 msgid "Unequip first"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:83
+#: ../src/gui/popupmenu.cpp:83
 #, c-format
 msgid "Trade with %s..."
 msgstr ""
 
-#: src/gui/popupmenu.cpp:87 src/gui/popupmenu.cpp:158
+#: ../src/gui/popupmenu.cpp:87 ../src/gui/popupmenu.cpp:158
 #, c-format
 msgid "Attack %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:91
+#: ../src/gui/popupmenu.cpp:91
 #, c-format
 msgid "Whisper %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:100
+#: ../src/gui/popupmenu.cpp:100
 #, c-format
 msgid "Befriend %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:105
+#: ../src/gui/popupmenu.cpp:105
 #, c-format
 msgid "Disregard %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:108
+#: ../src/gui/popupmenu.cpp:108
 #, c-format
 msgid "Ignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:114 src/gui/popupmenu.cpp:123
+#: ../src/gui/popupmenu.cpp:114 ../src/gui/popupmenu.cpp:123
 #, c-format
 msgid "Unignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:117
+#: ../src/gui/popupmenu.cpp:117
 #, c-format
 msgid "Completely ignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:130
+#: ../src/gui/popupmenu.cpp:130
 #, c-format
 msgid "Invite %s to join your guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:134
+#: ../src/gui/popupmenu.cpp:134
 #, c-format
 msgid "Invite %s to join your party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:141
+#: ../src/gui/popupmenu.cpp:141
 msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:150
+#: ../src/gui/popupmenu.cpp:150
 #, c-format
 msgid "Talk to %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:163
+#: ../src/gui/popupmenu.cpp:163
 msgid "Kick monster"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:171
+#: ../src/gui/popupmenu.cpp:171
 msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:188
+#: ../src/gui/popupmenu.cpp:188
 #, c-format
 msgid "Pick up %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:387
+#: ../src/gui/popupmenu.cpp:190 ../src/gui/popupmenu.cpp:387
 msgid "Add to chat"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:44
+#: ../src/gui/quitdialog.cpp:44
 msgid "Switch server"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:45
+#: ../src/gui/quitdialog.cpp:45
 msgid "Switch character"
 msgstr ""
 
-#: src/gui/recorder.cpp:87
+#: ../src/gui/recorder.cpp:87
 msgid "Finishing recording."
 msgstr ""
 
-#: src/gui/recorder.cpp:91
+#: ../src/gui/recorder.cpp:91
 msgid "Not currently recording."
 msgstr ""
 
-#: src/gui/recorder.cpp:96
+#: ../src/gui/recorder.cpp:96
 msgid "Already recording."
 msgstr ""
 
-#: src/gui/recorder.cpp:104
+#: ../src/gui/recorder.cpp:104
 msgid "Starting to record..."
 msgstr ""
 
-#: src/gui/recorder.cpp:112
+#: ../src/gui/recorder.cpp:112
 msgid "Failed to start recording."
 msgstr ""
 
-#: src/gui/recorder.h:38
+#: ../src/gui/recorder.h:38
 msgid "Recording..."
 msgstr ""
 
-#: src/gui/recorder.h:39
+#: ../src/gui/recorder.h:39
 msgid "Stop recording"
 msgstr ""
 
-#: src/gui/register.cpp:69
+#: ../src/gui/register.cpp:69
 msgid "Confirm:"
 msgstr ""
 
-#: src/gui/register.cpp:100
+#: ../src/gui/register.cpp:100
 msgid "Email:"
 msgstr ""
 
-#: src/gui/register.cpp:166
+#: ../src/gui/register.cpp:166
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:174
+#: ../src/gui/register.cpp:174
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:182 src/gui/unregisterdialog.cpp:117
+#: ../src/gui/register.cpp:182 ../src/gui/unregisterdialog.cpp:117
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:190 src/gui/unregisterdialog.cpp:124
+#: ../src/gui/register.cpp:190 ../src/gui/unregisterdialog.cpp:124
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr ""
 
-#: src/gui/register.cpp:197
+#: ../src/gui/register.cpp:197
 msgid "Passwords do not match."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:197
+#: ../src/gui/serverdialog.cpp:197
 msgid "Choose Your Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:206 src/gui/widgets/chattab.cpp:142
+#: ../src/gui/serverdialog.cpp:206 ../src/gui/widgets/chattab.cpp:142
 msgid "Server:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:207
+#: ../src/gui/serverdialog.cpp:207
 msgid "Port:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:208
+#: ../src/gui/serverdialog.cpp:208
 msgid "Server type:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:229
+#: ../src/gui/serverdialog.cpp:229
 msgid "Connect"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:230
+#: ../src/gui/serverdialog.cpp:230
 msgid "Custom Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:324
+#: ../src/gui/serverdialog.cpp:324
 msgid "Please type both the address and the port of a server."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:441
+#: ../src/gui/serverdialog.cpp:441
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:447
+#: ../src/gui/serverdialog.cpp:447
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:451
+#: ../src/gui/serverdialog.cpp:451
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:455
+#: ../src/gui/serverdialog.cpp:455
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:550
+#: ../src/gui/serverdialog.cpp:550
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:552
+#: ../src/gui/serverdialog.cpp:552
 #, c-format
 msgid "requires v%s"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:42
+#: ../src/gui/setup_audio.cpp:42
 msgid "Sound"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:43
+#: ../src/gui/setup_audio.cpp:43
 msgid "Download music"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:47
+#: ../src/gui/setup_audio.cpp:47
 msgid "Audio"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:50
+#: ../src/gui/setup_audio.cpp:50
 msgid "Sfx volume"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:51
+#: ../src/gui/setup_audio.cpp:51
 msgid "Music volume"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:94
+#: ../src/gui/setup_audio.cpp:94
 msgid "Notice"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:94
+#: ../src/gui/setup_audio.cpp:94
 msgid "You may have to restart your client if you want to download new music"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:106
+#: ../src/gui/setup_audio.cpp:106
 msgid "Sound Engine"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:46
+#: ../src/gui/setup_colors.cpp:46
 msgid "This is what the color looks like"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:51
+#: ../src/gui/setup_colors.cpp:51
 msgid "Colors"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:72
+#: ../src/gui/setup_colors.cpp:72
 msgid "Type:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:331
+#: ../src/gui/setup_colors.cpp:83 ../src/gui/setup_colors.cpp:331
 msgid "Static"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
-#: src/gui/setup_colors.cpp:332
+#: ../src/gui/setup_colors.cpp:85 ../src/gui/setup_colors.cpp:86
+#: ../src/gui/setup_colors.cpp:332
 msgid "Pulse"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:333
+#: ../src/gui/setup_colors.cpp:87 ../src/gui/setup_colors.cpp:88
+#: ../src/gui/setup_colors.cpp:333
 msgid "Rainbow"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:333
+#: ../src/gui/setup_colors.cpp:89 ../src/gui/setup_colors.cpp:90
+#: ../src/gui/setup_colors.cpp:333
 msgid "Spectrum"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:94
+#: ../src/gui/setup_colors.cpp:94
 msgid "Delay:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:109
+#: ../src/gui/setup_colors.cpp:109
 msgid "Red:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:124
+#: ../src/gui/setup_colors.cpp:124
 msgid "Green:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:139
+#: ../src/gui/setup_colors.cpp:139
 msgid "Blue:"
 msgstr ""
 
-#: src/gui/setup.cpp:51
+#: ../src/gui/setup.cpp:51
 msgid "Apply"
 msgstr ""
 
-#: src/gui/setup.cpp:51
+#: ../src/gui/setup.cpp:51
 msgid "Reset Windows"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:78
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:78
 msgid "Press the button to start calibration"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:76
+#: ../src/gui/setup_joystick.cpp:38 ../src/gui/setup_joystick.cpp:76
 msgid "Calibrate"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:39
+#: ../src/gui/setup_joystick.cpp:39
 msgid "Enable joystick"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:41
+#: ../src/gui/setup_joystick.cpp:41
 msgid "Joystick"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:83
+#: ../src/gui/setup_joystick.cpp:83
 msgid "Stop"
 msgstr ""
 
-#: src/gui/setup_joystick.cpp:84
+#: ../src/gui/setup_joystick.cpp:84
 msgid "Rotate the stick"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:77
+#: ../src/gui/setup_keyboard.cpp:77
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:86
+#: ../src/gui/setup_keyboard.cpp:86
 msgid "Assign"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:90
+#: ../src/gui/setup_keyboard.cpp:90
 msgid "Unassign"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:94
+#: ../src/gui/setup_keyboard.cpp:94
 msgid "Default"
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:125
+#: ../src/gui/setup_keyboard.cpp:125
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_players.cpp:58
+#: ../src/gui/setup_players.cpp:58
 msgid "Name"
 msgstr ""
 
-#: src/gui/setup_players.cpp:59
+#: ../src/gui/setup_players.cpp:59
 msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_players.cpp:64
+#: ../src/gui/setup_players.cpp:64
 msgid "Neutral"
 msgstr ""
 
-#: src/gui/setup_players.cpp:65
+#: ../src/gui/setup_players.cpp:65
 msgid "Friend"
 msgstr ""
 
-#: src/gui/setup_players.cpp:66
+#: ../src/gui/setup_players.cpp:66
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:67
+#: ../src/gui/setup_players.cpp:67
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_players.cpp:206 src/gui/setup_video.cpp:153
+#: ../src/gui/setup_players.cpp:206 ../src/gui/setup_video.cpp:147
 msgid "???"
 msgstr ""
 
-#: src/gui/setup_players.cpp:225
+#: ../src/gui/setup_players.cpp:225
 msgid "Allow trading"
 msgstr ""
 
-#: src/gui/setup_players.cpp:227
+#: ../src/gui/setup_players.cpp:227
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:231
+#: ../src/gui/setup_players.cpp:231
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_players.cpp:233
+#: ../src/gui/setup_players.cpp:233
 msgid "Show gender"
 msgstr ""
 
-#: src/gui/setup_players.cpp:235
+#: ../src/gui/setup_players.cpp:235
 msgid "Enable Chat log"
 msgstr ""
 
-#: src/gui/setup_players.cpp:237
+#: ../src/gui/setup_players.cpp:237
 msgid "Players"
 msgstr ""
 
-#: src/gui/setup_players.cpp:262
+#: ../src/gui/setup_players.cpp:262
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:134
+#: ../src/gui/setup_video.cpp:128
 msgid "Tiny"
 msgstr ""
 
-#: src/gui/setup_video.cpp:135
+#: ../src/gui/setup_video.cpp:129
 msgid "Small"
 msgstr ""
 
-#: src/gui/setup_video.cpp:136
+#: ../src/gui/setup_video.cpp:130
 msgid "Medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:137
+#: ../src/gui/setup_video.cpp:131
 msgid "Large"
 msgstr ""
 
-#: src/gui/setup_video.cpp:163
+#: ../src/gui/setup_video.cpp:157
 msgid "No text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:164
+#: ../src/gui/setup_video.cpp:158
 msgid "Text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:165
+#: ../src/gui/setup_video.cpp:159
 msgid "Bubbles, no names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:166
+#: ../src/gui/setup_video.cpp:160
 msgid "Bubbles with names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:178
+#: ../src/gui/setup_video.cpp:172
 msgid "off"
 msgstr ""
 
-#: src/gui/setup_video.cpp:179 src/gui/setup_video.cpp:192
+#: ../src/gui/setup_video.cpp:173 ../src/gui/setup_video.cpp:186
 msgid "low"
 msgstr ""
 
-#: src/gui/setup_video.cpp:180 src/gui/setup_video.cpp:194
+#: ../src/gui/setup_video.cpp:174 ../src/gui/setup_video.cpp:188
 msgid "high"
 msgstr ""
 
-#: src/gui/setup_video.cpp:193
+#: ../src/gui/setup_video.cpp:187
 msgid "medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:195
+#: ../src/gui/setup_video.cpp:189
 msgid "max"
 msgstr ""
 
-#: src/gui/setup_video.cpp:217
+#: ../src/gui/setup_video.cpp:211
 msgid "Full screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:218
+#: ../src/gui/setup_video.cpp:212
 msgid "OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:219
+#: ../src/gui/setup_video.cpp:213
 msgid "Custom cursor"
 msgstr ""
 
-#: src/gui/setup_video.cpp:221
+#: ../src/gui/setup_video.cpp:215
 msgid "Visible names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:223
+#: ../src/gui/setup_video.cpp:217
 msgid "Particle effects"
 msgstr ""
 
-#: src/gui/setup_video.cpp:225
+#: ../src/gui/setup_video.cpp:219
 msgid "Show own name"
 msgstr ""
 
-#: src/gui/setup_video.cpp:226
+#: ../src/gui/setup_video.cpp:220
 msgid "Log NPC dialogue"
 msgstr ""
 
-#: src/gui/setup_video.cpp:227
+#: ../src/gui/setup_video.cpp:221
 msgid "Show pickup notification"
 msgstr ""
 
-#. TRANSLATORS: Refers to "Show pickup notification"
-#: src/gui/setup_video.cpp:229
+#: ../src/gui/setup_video.cpp:223
 msgid "in chat"
 msgstr ""
 
-#. TRANSLATORS: Refers to "Show pickup notification"
-#: src/gui/setup_video.cpp:231
+#: ../src/gui/setup_video.cpp:225
 msgid "as particle"
 msgstr ""
 
-#: src/gui/setup_video.cpp:236
+#: ../src/gui/setup_video.cpp:230
 msgid "FPS limit:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:247
+#: ../src/gui/setup_video.cpp:241
 msgid "Disable transparency (Low CPU mode)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:250
+#: ../src/gui/setup_video.cpp:244
 msgid "Video"
 msgstr ""
 
-#: src/gui/setup_video.cpp:252
+#: ../src/gui/setup_video.cpp:246
 msgid "Show damage"
 msgstr ""
 
-#: src/gui/setup_video.cpp:258
+#: ../src/gui/setup_video.cpp:252
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:259
+#: ../src/gui/setup_video.cpp:253
 msgid "Gui opacity"
 msgstr ""
 
-#: src/gui/setup_video.cpp:260
+#: ../src/gui/setup_video.cpp:254
 msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:261
+#: ../src/gui/setup_video.cpp:255
 msgid "Particle detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:262
+#: ../src/gui/setup_video.cpp:256
 msgid "Font size"
 msgstr ""
 
-#: src/gui/setup_video.cpp:277 src/gui/setup_video.cpp:532
-#: src/gui/setup_video.cpp:662
+#: ../src/gui/setup_video.cpp:271 ../src/gui/setup_video.cpp:526
+#: ../src/gui/setup_video.cpp:656
 msgid "None"
 msgstr ""
 
-#: src/gui/setup_video.cpp:426
+#: ../src/gui/setup_video.cpp:420
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:432
+#: ../src/gui/setup_video.cpp:426
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:443
+#: ../src/gui/setup_video.cpp:437
 msgid "Switching to Full Screen"
 msgstr ""
 
-#: src/gui/setup_video.cpp:444
+#: ../src/gui/setup_video.cpp:438
 msgid "Restart needed for changes to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:458
+#: ../src/gui/setup_video.cpp:452
 msgid "Changing to OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:459
+#: ../src/gui/setup_video.cpp:453
 msgid ""
 "Applying change to OpenGL requires restart. In case OpenGL messes up your "
 "game graphics, restart the game with the command line option \"--no-opengl\"."
 msgstr ""
 
-#: src/gui/setup_video.cpp:466
+#: ../src/gui/setup_video.cpp:460
 msgid "Deactivating OpenGL"
 msgstr ""
 
-#: src/gui/setup_video.cpp:467
+#: ../src/gui/setup_video.cpp:461
 msgid "Applying change to OpenGL requires restart."
 msgstr ""
 
-#: src/gui/setup_video.cpp:475
+#: ../src/gui/setup_video.cpp:469
 msgid "Transparency disabled"
 msgstr ""
 
-#: src/gui/setup_video.cpp:476 src/gui/setup_video.cpp:484
+#: ../src/gui/setup_video.cpp:470 ../src/gui/setup_video.cpp:478
 msgid "You must restart to apply changes."
 msgstr ""
 
-#: src/gui/setup_video.cpp:483
+#: ../src/gui/setup_video.cpp:477
 msgid "Transparency enabled"
 msgstr ""
 
-#: src/gui/setup_video.cpp:576 src/gui/setup_video.cpp:581
+#: ../src/gui/setup_video.cpp:570 ../src/gui/setup_video.cpp:575
 msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:577 src/gui/setup_video.cpp:582
+#: ../src/gui/setup_video.cpp:571 ../src/gui/setup_video.cpp:576
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:579
+#: ../src/gui/setup_video.cpp:573
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:612
+#: ../src/gui/setup_video.cpp:606
 msgid "Particle Effect Settings Changed."
 msgstr ""
 
-#: src/gui/setup_video.cpp:613
+#: ../src/gui/setup_video.cpp:607
 msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skilldialog.cpp:212 src/gui/windowmenu.cpp:59
+#: ../src/gui/skilldialog.cpp:215 ../src/gui/windowmenu.cpp:59
 msgid "Skills"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:223
+#: ../src/gui/skilldialog.cpp:228
 msgid "Up"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:269
+#: ../src/gui/skilldialog.cpp:273
 #, c-format
 msgid "Skill points available: %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:351
+#: ../src/gui/skilldialog.cpp:368
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:360
+#: ../src/gui/skilldialog.cpp:377
 #, c-format
 msgid "Skill %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:442
+#: ../src/gui/skilldialog.cpp:459
 #, c-format
 msgid "Lvl: %d (%+d)"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:453
+#: ../src/gui/skilldialog.cpp:470
 #, c-format
 msgid "Lvl: %d"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:126
+#: ../src/gui/socialwindow.cpp:126
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:139
+#: ../src/gui/socialwindow.cpp:139
 #, c-format
 msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:153
+#: ../src/gui/socialwindow.cpp:153
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:154
+#: ../src/gui/socialwindow.cpp:154
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:163
+#: ../src/gui/socialwindow.cpp:163
 msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:164
+#: ../src/gui/socialwindow.cpp:164
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:207 src/net/tmwa/partyhandler.cpp:330
+#: ../src/gui/socialwindow.cpp:207 ../src/net/tmwa/partyhandler.cpp:330
 #, c-format
 msgid "Invited user %s to party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:218
+#: ../src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:232
+#: ../src/gui/socialwindow.cpp:232
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:233
+#: ../src/gui/socialwindow.cpp:233
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:242
+#: ../src/gui/socialwindow.cpp:242
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:243
+#: ../src/gui/socialwindow.cpp:243
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:272
+#: ../src/gui/socialwindow.cpp:272
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:273 src/gui/socialwindow.cpp:620
+#: ../src/gui/socialwindow.cpp:273 ../src/gui/socialwindow.cpp:619
 msgid "Create Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:312 src/gui/windowmenu.cpp:64
+#: ../src/gui/socialwindow.cpp:312 ../src/gui/windowmenu.cpp:64
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:330
+#: ../src/gui/socialwindow.cpp:331
 msgid "Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:331
+#: ../src/gui/socialwindow.cpp:332
 msgid "Leave"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:443
+#: ../src/gui/socialwindow.cpp:444
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:449
+#: ../src/gui/socialwindow.cpp:450
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:462
-#, c-format
-msgid "Accepted guild invite from %s."
+#: ../src/gui/socialwindow.cpp:463
+msgid "Accepted guild invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:468
-#, c-format
-msgid "Rejected guild invite from %s."
+#: ../src/gui/socialwindow.cpp:468
+msgid "Rejected guild invite."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:497
+#: ../src/gui/socialwindow.cpp:496
 msgid "Creating guild failed, please choose a shorter name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:504
+#: ../src/gui/socialwindow.cpp:503
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:520
+#: ../src/gui/socialwindow.cpp:519
 msgid "Creating party failed, please choose a shorter name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:527
+#: ../src/gui/socialwindow.cpp:526
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:541
+#: ../src/gui/socialwindow.cpp:540
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:542
+#: ../src/gui/socialwindow.cpp:541
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:554
+#: ../src/gui/socialwindow.cpp:553
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:559
+#: ../src/gui/socialwindow.cpp:558
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:564
+#: ../src/gui/socialwindow.cpp:563
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:576
+#: ../src/gui/socialwindow.cpp:575
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:585
+#: ../src/gui/socialwindow.cpp:584
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:589
+#: ../src/gui/socialwindow.cpp:588
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:597
+#: ../src/gui/socialwindow.cpp:596
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:602
+#: ../src/gui/socialwindow.cpp:601
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:610
+#: ../src/gui/socialwindow.cpp:609
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:621
+#: ../src/gui/socialwindow.cpp:620
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:626
+#: ../src/gui/socialwindow.cpp:625
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:627
+#: ../src/gui/socialwindow.cpp:626
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:62
+#: ../src/gui/specialswindow.cpp:79 ../src/gui/windowmenu.cpp:62
 msgid "Specials"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:113 src/gui/statuswindow.cpp:215
-#: src/gui/statuswindow.cpp:262
+#: ../src/gui/statuswindow.cpp:113 ../src/gui/statuswindow.cpp:215
+#: ../src/gui/statuswindow.cpp:263
 #, c-format
 msgid "Level: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:114 src/gui/statuswindow.cpp:208
-#: src/gui/statuswindow.cpp:239
+#: ../src/gui/statuswindow.cpp:114 ../src/gui/statuswindow.cpp:208
+#: ../src/gui/statuswindow.cpp:240
 #, c-format
 msgid "Money: %s"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:117
+#: ../src/gui/statuswindow.cpp:117
 msgid "HP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:122
+#: ../src/gui/statuswindow.cpp:122
 msgid "Exp:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:130
+#: ../src/gui/statuswindow.cpp:130
 msgid "MP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:158 src/gui/statuswindow.cpp:275
+#: ../src/gui/statuswindow.cpp:158 ../src/gui/statuswindow.cpp:276
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:159
+#: ../src/gui/statuswindow.cpp:159
 msgid "Job:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:211 src/gui/statuswindow.cpp:247
+#: ../src/gui/statuswindow.cpp:211 ../src/gui/statuswindow.cpp:248
 #, c-format
 msgid "Character points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:255
+#: ../src/gui/statuswindow.cpp:256
 #, c-format
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/trade.cpp:53
+#: ../src/gui/trade.cpp:53
 msgid "Propose trade"
 msgstr ""
 
-#: src/gui/trade.cpp:54
+#: ../src/gui/trade.cpp:54
 msgid "Confirmed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:55
+#: ../src/gui/trade.cpp:55
 msgid "Agree trade"
 msgstr ""
 
-#: src/gui/trade.cpp:56
+#: ../src/gui/trade.cpp:56
 msgid "Agreed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:59
+#: ../src/gui/trade.cpp:59
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/trade.cpp:73 src/gui/trade.cpp:74
+#: ../src/gui/trade.cpp:73 ../src/gui/trade.cpp:74
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:76
+#: ../src/gui/trade.cpp:76
 msgid "Add"
 msgstr ""
 
-#: src/gui/trade.cpp:98 src/gui/trade.cpp:134
+#: ../src/gui/trade.cpp:98 ../src/gui/trade.cpp:134
 #, c-format
 msgid "You get %s"
 msgstr ""
 
-#: src/gui/trade.cpp:99
+#: ../src/gui/trade.cpp:99
 msgid "You give:"
 msgstr ""
 
-#: src/gui/trade.cpp:103
+#: ../src/gui/trade.cpp:103
 msgid "Change"
 msgstr ""
 
-#: src/gui/trade.cpp:262
+#: ../src/gui/trade.cpp:262
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/trade.cpp:304
+#: ../src/gui/trade.cpp:304
 msgid "You don't have enough money."
 msgstr ""
 
-#: src/gui/unregisterdialog.cpp:51
+#: ../src/gui/unregisterdialog.cpp:51
 #, c-format
 msgid "Name: %s"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:124
+#: ../src/gui/updatewindow.cpp:124
 msgid "Updating..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:142
+#: ../src/gui/updatewindow.cpp:142
 msgid "Connecting..."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:145
+#: ../src/gui/updatewindow.cpp:145
 msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:417
+#: ../src/gui/updatewindow.cpp:417
 msgid "##1  The update process is incomplete."
 msgstr ""
 
-#. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:419
+#: ../src/gui/updatewindow.cpp:419
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
-#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:421
+#: ../src/gui/updatewindow.cpp:421
 msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:515
+#: ../src/gui/updatewindow.cpp:515
 msgid "Completed"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:49
+#: ../src/gui/widgets/channeltab.cpp:49
 msgid "/users > Lists the users in the current channel"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:50
+#: ../src/gui/widgets/channeltab.cpp:50
 msgid "/topic > Set the topic of the current channel"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:51
+#: ../src/gui/widgets/channeltab.cpp:51
 msgid "/quit > Leave a channel"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:52
+#: ../src/gui/widgets/channeltab.cpp:52
 msgid "/op > Make a user a channel operator"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:53
+#: ../src/gui/widgets/channeltab.cpp:53
 msgid "/kick > Kick a user from the channel"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:63
+#: ../src/gui/widgets/channeltab.cpp:63
 msgid "Command: /users"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:64
+#: ../src/gui/widgets/channeltab.cpp:64
 msgid "This command shows the users in this channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:68
+#: ../src/gui/widgets/channeltab.cpp:68
 msgid "Command: /topic <message>"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:69
+#: ../src/gui/widgets/channeltab.cpp:69
 msgid "This command sets the topic to <message>."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:73
+#: ../src/gui/widgets/channeltab.cpp:73
 msgid "Command: /quit"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:74
+#: ../src/gui/widgets/channeltab.cpp:74
 msgid "This command leaves the current channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:75
+#: ../src/gui/widgets/channeltab.cpp:75
 msgid "If you're the last person in the channel, it will be deleted."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:80
+#: ../src/gui/widgets/channeltab.cpp:80
 msgid "Command: /op <nick>"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:81
+#: ../src/gui/widgets/channeltab.cpp:81
 msgid "This command makes <nick> a channel operator."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:84
+#: ../src/gui/widgets/channeltab.cpp:84
 msgid "Channel operators can kick and op other users from the channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:89
+#: ../src/gui/widgets/channeltab.cpp:89
 msgid "Command: /kick <nick>"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:90
+#: ../src/gui/widgets/channeltab.cpp:90
 msgid "This command makes <nick> leave the channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:119
+#: ../src/gui/widgets/channeltab.cpp:119
 msgid "Need a user to op!"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:126
+#: ../src/gui/widgets/channeltab.cpp:126
 msgid "Need a user to kick!"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:121
+#: ../src/gui/widgets/chattab.cpp:121
 msgid "Global announcement:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:127
+#: ../src/gui/widgets/chattab.cpp:127
 #, c-format
 msgid "Global announcement from %s:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:153
+#: ../src/gui/widgets/chattab.cpp:153
 #, c-format
 msgid "%s whispers: %s"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:53
+#: ../src/gui/widgets/whispertab.cpp:53
 msgid "Cannot send empty chat!"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:72
+#: ../src/gui/widgets/whispertab.cpp:72
 msgid "/ignore > Ignore the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:73
+#: ../src/gui/widgets/whispertab.cpp:73
 msgid "/unignore > Stop ignoring the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:74
+#: ../src/gui/widgets/whispertab.cpp:74
 msgid "/close > Close the whisper tab"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:84
+#: ../src/gui/widgets/whispertab.cpp:84
 msgid "Command: /close"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:85
+#: ../src/gui/widgets/whispertab.cpp:85
 msgid "This command closes the current whisper tab."
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:89
+#: ../src/gui/widgets/whispertab.cpp:89
 msgid "Command: /ignore"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:90
+#: ../src/gui/widgets/whispertab.cpp:90
 msgid "This command ignores the other player regardless of current relations."
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:96
+#: ../src/gui/widgets/whispertab.cpp:96
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:54
+#: ../src/gui/windowmenu.cpp:54
 msgid "Status"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:65
+#: ../src/gui/windowmenu.cpp:65
 msgid "Shortcut"
 msgstr ""
 
-#: src/gui/worldselectdialog.cpp:71
+#: ../src/gui/worldselectdialog.cpp:71
 msgid "Select World"
 msgstr ""
 
-#: src/gui/worldselectdialog.cpp:76
+#: ../src/gui/worldselectdialog.cpp:76
 msgid "Change Login"
 msgstr ""
 
-#: src/gui/worldselectdialog.cpp:77
+#: ../src/gui/worldselectdialog.cpp:77
 msgid "Choose World"
 msgstr ""
 
-#: src/keyboardconfig.cpp:39
+#: ../src/keyboardconfig.cpp:39
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:40
+#: ../src/keyboardconfig.cpp:40
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:41
+#: ../src/keyboardconfig.cpp:41
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:42
+#: ../src/keyboardconfig.cpp:42
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:43 src/net/tmwa/generalhandler.cpp:237
+#: ../src/keyboardconfig.cpp:43 ../src/net/tmwa/generalhandler.cpp:237
 msgid "Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:44
+#: ../src/keyboardconfig.cpp:44
 msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:45
+#: ../src/keyboardconfig.cpp:45
 msgid "Smilie"
 msgstr ""
 
-#: src/keyboardconfig.cpp:46
+#: ../src/keyboardconfig.cpp:46
 msgid "Talk"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
+#: ../src/keyboardconfig.cpp:47
 msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: ../src/keyboardconfig.cpp:48
 msgid "Target Monster"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
+#: ../src/keyboardconfig.cpp:49
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:50
+#: ../src/keyboardconfig.cpp:50
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: ../src/keyboardconfig.cpp:51
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:52
+#: ../src/keyboardconfig.cpp:52
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: ../src/keyboardconfig.cpp:53
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:54
+#: ../src/keyboardconfig.cpp:54
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:55
+#: ../src/keyboardconfig.cpp:55
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:56
+#: ../src/keyboardconfig.cpp:56
 msgid "Find Path to Mouse"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57 src/keyboardconfig.cpp:58
-#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
-#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
-#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
-#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66
-#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68
+#: ../src/keyboardconfig.cpp:57 ../src/keyboardconfig.cpp:58
+#: ../src/keyboardconfig.cpp:59 ../src/keyboardconfig.cpp:60
+#: ../src/keyboardconfig.cpp:61 ../src/keyboardconfig.cpp:62
+#: ../src/keyboardconfig.cpp:63 ../src/keyboardconfig.cpp:64
+#: ../src/keyboardconfig.cpp:65 ../src/keyboardconfig.cpp:66
+#: ../src/keyboardconfig.cpp:67 ../src/keyboardconfig.cpp:68
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:69
+#: ../src/keyboardconfig.cpp:69
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: ../src/keyboardconfig.cpp:70
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:71
+#: ../src/keyboardconfig.cpp:71
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: ../src/keyboardconfig.cpp:72
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: ../src/keyboardconfig.cpp:73
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: ../src/keyboardconfig.cpp:74
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: ../src/keyboardconfig.cpp:75
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: ../src/keyboardconfig.cpp:76
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:77
+#: ../src/keyboardconfig.cpp:77
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: ../src/keyboardconfig.cpp:78
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:79
+#: ../src/keyboardconfig.cpp:79
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: ../src/keyboardconfig.cpp:80
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:81
+#: ../src/keyboardconfig.cpp:81
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82
+#: ../src/keyboardconfig.cpp:82
 msgid "Wear Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:83
+#: ../src/keyboardconfig.cpp:83
 msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84 src/keyboardconfig.cpp:85
-#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:87
-#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:89
-#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:91
-#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:93
-#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:95
+#: ../src/keyboardconfig.cpp:84 ../src/keyboardconfig.cpp:85
+#: ../src/keyboardconfig.cpp:86 ../src/keyboardconfig.cpp:87
+#: ../src/keyboardconfig.cpp:88 ../src/keyboardconfig.cpp:89
+#: ../src/keyboardconfig.cpp:90 ../src/keyboardconfig.cpp:91
+#: ../src/keyboardconfig.cpp:92 ../src/keyboardconfig.cpp:93
+#: ../src/keyboardconfig.cpp:94 ../src/keyboardconfig.cpp:95
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:96
+#: ../src/keyboardconfig.cpp:96
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: ../src/keyboardconfig.cpp:97
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:98
+#: ../src/keyboardconfig.cpp:98
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:99
+#: ../src/keyboardconfig.cpp:99
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:100
+#: ../src/keyboardconfig.cpp:100
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:101
+#: ../src/keyboardconfig.cpp:101
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:103
+#: ../src/keyboardconfig.cpp:103
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:104
+#: ../src/keyboardconfig.cpp:104
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:183
+#: ../src/keyboardconfig.cpp:183
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:985
-msgid "Unable to pick up item."
+#: ../src/localplayer.cpp:895
+msgid "Tried to pick up nonexistent item."
+msgstr ""
+
+#: ../src/localplayer.cpp:896
+msgid "Item is too heavy."
+msgstr ""
+
+#: ../src/localplayer.cpp:897
+msgid "Item is too far away"
+msgstr ""
+
+#: ../src/localplayer.cpp:898
+msgid "Inventory is full."
+msgstr ""
+
+#: ../src/localplayer.cpp:899
+msgid "Stack is too big."
+msgstr ""
+
+#: ../src/localplayer.cpp:901
+msgid "Item belongs to someone else."
 msgstr ""
 
-#. TRANSLATORS: This sentence may be translated differently
-#. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:994
+#: ../src/localplayer.cpp:902
+msgid "Unknown problem picking up item."
+msgstr ""
+
+#: ../src/localplayer.cpp:920
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/main.cpp:42
+#: ../src/localplayer.cpp:1030
+msgid "Away"
+msgstr ""
+
+#: ../src/main.cpp:42
 msgid "mana [options] [mana-file]"
 msgstr ""
 
-#: src/main.cpp:43
+#: ../src/main.cpp:43
 msgid "[mana-file] : The mana file is an XML file (.mana)"
 msgstr ""
 
-#: src/main.cpp:44
+#: ../src/main.cpp:44
 msgid "              used to set custom parameters"
 msgstr ""
 
-#: src/main.cpp:45
+#: ../src/main.cpp:45
 msgid "              to the mana client."
 msgstr ""
 
-#: src/main.cpp:47
+#: ../src/main.cpp:47
 msgid "Options:"
 msgstr ""
 
-#: src/main.cpp:48
+#: ../src/main.cpp:48
 msgid "  -v --version        : Display the version"
 msgstr ""
 
-#: src/main.cpp:49
+#: ../src/main.cpp:49
 msgid "  -h --help           : Display this help"
 msgstr ""
 
-#: src/main.cpp:50
+#: ../src/main.cpp:50
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:51
+#: ../src/main.cpp:51
 msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:52
+#: ../src/main.cpp:52
 msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:53
+#: ../src/main.cpp:53
 msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:54
+#: ../src/main.cpp:54
 msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:55
+#: ../src/main.cpp:55
 msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:56
+#: ../src/main.cpp:56
 msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:57
+#: ../src/main.cpp:57
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:59
+#: ../src/main.cpp:59
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:60
+#: ../src/main.cpp:60
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:61
+#: ../src/main.cpp:61
 msgid "     --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:62
+#: ../src/main.cpp:62
 msgid "     --chat-log-dir   : Chat log dir to use"
 msgstr ""
 
-#: src/main.cpp:63
+#: ../src/main.cpp:63
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:65
+#: ../src/main.cpp:65
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:303 src/net/tmwa/playerhandler.cpp:94
+#: ../src/net/manaserv/attributes.cpp:166
+#: ../src/net/tmwa/generalhandler.cpp:230
+msgid "Strength"
+msgstr ""
+
+#: ../src/net/manaserv/attributes.cpp:173
+#, c-format
+msgid "Strength %+.1f"
+msgstr ""
+
+#: ../src/net/manaserv/attributes.cpp:179
+#: ../src/net/tmwa/generalhandler.cpp:231
+msgid "Agility"
+msgstr ""
+
+#: ../src/net/manaserv/attributes.cpp:186
+#, c-format
+msgid "Agility %+.1f"
+msgstr ""
+
+#: ../src/net/manaserv/attributes.cpp:192
+#: ../src/net/tmwa/generalhandler.cpp:234
+msgid "Dexterity"
+msgstr ""
+
+#: ../src/net/manaserv/attributes.cpp:199
+#, c-format
+msgid "Dexterity %+.1f"
+msgstr ""
+
+#: ../src/net/manaserv/attributes.cpp:205
+#: ../src/net/tmwa/generalhandler.cpp:232
+msgid "Vitality"
+msgstr ""
+
+#: ../src/net/manaserv/attributes.cpp:212
+#, c-format
+msgid "Vitality %+.1f"
+msgstr ""
+
+#: ../src/net/manaserv/attributes.cpp:218
+#: ../src/net/tmwa/generalhandler.cpp:233
+msgid "Intelligence"
+msgstr ""
+
+#: ../src/net/manaserv/attributes.cpp:225
+#, c-format
+msgid "Intelligence %+.1f"
+msgstr ""
+
+#: ../src/net/manaserv/attributes.cpp:231
+msgid "Willpower"
+msgstr ""
+
+#: ../src/net/manaserv/attributes.cpp:238
+#, c-format
+msgid "Willpower %+.1f"
+msgstr ""
+
+#: ../src/net/manaserv/beinghandler.cpp:283
+#: ../src/net/tmwa/playerhandler.cpp:95
 msgid "You are dead."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:95
+#: ../src/net/manaserv/beinghandler.cpp:284
+#: ../src/net/tmwa/playerhandler.cpp:96
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:306 src/net/tmwa/playerhandler.cpp:97
+#: ../src/net/manaserv/beinghandler.cpp:286
+#: ../src/net/tmwa/playerhandler.cpp:98
 msgid "You are not that alive anymore."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:98
+#: ../src/net/manaserv/beinghandler.cpp:287
+#: ../src/net/tmwa/playerhandler.cpp:99
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:99
+#: ../src/net/manaserv/beinghandler.cpp:288
+#: ../src/net/tmwa/playerhandler.cpp:100
 msgid "Game Over!"
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:101
+#: ../src/net/manaserv/beinghandler.cpp:289
+#: ../src/net/tmwa/playerhandler.cpp:102
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:311 src/net/tmwa/playerhandler.cpp:103
+#: ../src/net/manaserv/beinghandler.cpp:291
+#: ../src/net/tmwa/playerhandler.cpp:104
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:313 src/net/tmwa/playerhandler.cpp:105
+#: ../src/net/manaserv/beinghandler.cpp:293
+#: ../src/net/tmwa/playerhandler.cpp:106
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:107
+#: ../src/net/manaserv/beinghandler.cpp:294
+#: ../src/net/tmwa/playerhandler.cpp:108
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:109
+#: ../src/net/manaserv/beinghandler.cpp:295
+#: ../src/net/tmwa/playerhandler.cpp:110
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:111
+#: ../src/net/manaserv/beinghandler.cpp:296
+#: ../src/net/tmwa/playerhandler.cpp:112
 msgid "Annihilated."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:113
+#: ../src/net/manaserv/beinghandler.cpp:297
+#: ../src/net/tmwa/playerhandler.cpp:114
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:115
+#: ../src/net/manaserv/beinghandler.cpp:298
+#: ../src/net/tmwa/playerhandler.cpp:116
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:323
+#: ../src/net/manaserv/beinghandler.cpp:303
 msgid "Press OK to respawn."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:324
+#: ../src/net/manaserv/beinghandler.cpp:304
 msgid "You Died"
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:138 src/net/manaserv/charhandler.cpp:209
+#: ../src/net/manaserv/charhandler.cpp:138
+#: ../src/net/manaserv/charhandler.cpp:219
 msgid "Not logged in."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:141
+#: ../src/net/manaserv/charhandler.cpp:141
 msgid "No empty slot."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:144
+#: ../src/net/manaserv/charhandler.cpp:144
 msgid "Invalid name."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:147
+#: ../src/net/manaserv/charhandler.cpp:147
 msgid "Character's name already exists."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:150
+#: ../src/net/manaserv/charhandler.cpp:150
 msgid "Invalid hairstyle."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:153
+#: ../src/net/manaserv/charhandler.cpp:153
 msgid "Invalid hair color."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:156
+#: ../src/net/manaserv/charhandler.cpp:156
 msgid "Invalid gender."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:159
+#: ../src/net/manaserv/charhandler.cpp:159
 msgid "Character's stats are too high."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:162
+#: ../src/net/manaserv/charhandler.cpp:162
 msgid "Character's stats are too low."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:165
+#: ../src/net/manaserv/charhandler.cpp:165
 #, c-format
 msgid "At least one statis out of the permitted range: (%u - %u)."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:171 src/net/manaserv/loginhandler.cpp:96
-#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
-#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
-#: src/net/tmwa/loginhandler.cpp:95 src/net/tmwa/loginhandler.cpp:182
+#: ../src/net/manaserv/charhandler.cpp:171
+msgid "Invalid slot number."
+msgstr ""
+
+#: ../src/net/manaserv/charhandler.cpp:174
+#: ../src/net/manaserv/loginhandler.cpp:96
+#: ../src/net/manaserv/loginhandler.cpp:127
+#: ../src/net/manaserv/loginhandler.cpp:161
+#: ../src/net/manaserv/loginhandler.cpp:279
+#: ../src/net/manaserv/loginhandler.cpp:316
+#: ../src/net/tmwa/loginhandler.cpp:95 ../src/net/tmwa/loginhandler.cpp:191
 msgid "Unknown error."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:200 src/net/tmwa/charserverhandler.cpp:146
+#: ../src/net/manaserv/charhandler.cpp:210
+#: ../src/net/tmwa/charserverhandler.cpp:146
 msgid "Info"
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:200
+#: ../src/net/manaserv/charhandler.cpp:210
 msgid "Player deleted."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:212
+#: ../src/net/manaserv/charhandler.cpp:222
 msgid "Selection out of range."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:215
+#: ../src/net/manaserv/charhandler.cpp:225
 #, c-format
 msgid "Unknown error (%d)."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:250
+#: ../src/net/manaserv/charhandler.cpp:264
 msgid "No gameservers are available."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:187 src/net/manaserv/chathandler.cpp:313
-#: src/net/manaserv/guildhandler.cpp:260
+#: ../src/net/manaserv/charhandler.cpp:267
+msgid "Invalid character slot selected."
+msgstr ""
+
+#: ../src/net/manaserv/charhandler.cpp:270
+#, c-format
+msgid "Unhandled character select error message %i."
+msgstr ""
+
+#: ../src/net/manaserv/chathandler.cpp:190
+#: ../src/net/manaserv/chathandler.cpp:316
+#: ../src/net/manaserv/guildhandler.cpp:260
 #, c-format
 msgid "Topic: %s"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:274
+#: ../src/net/manaserv/chathandler.cpp:194
+#: ../src/net/manaserv/chathandler.cpp:277
 msgid "Players in this channel:"
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:208
+#: ../src/net/manaserv/chathandler.cpp:211
 msgid "Error joining channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:214
+#: ../src/net/manaserv/chathandler.cpp:217
 msgid "Listing channels."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:226
+#: ../src/net/manaserv/chathandler.cpp:229
 msgid "End of channel list."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:303
+#: ../src/net/manaserv/chathandler.cpp:306
 #, c-format
 msgid "%s entered the channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:308
+#: ../src/net/manaserv/chathandler.cpp:311
 #, c-format
 msgid "%s left the channel."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:324
+#: ../src/net/manaserv/chathandler.cpp:327
 #, c-format
 msgid "%s has set mode %s on user %s."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:334
+#: ../src/net/manaserv/chathandler.cpp:337
 #, c-format
 msgid "%s has kicked %s."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:339
+#: ../src/net/manaserv/chathandler.cpp:342
 msgid "Unknown channel event."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:82
+#: ../src/net/manaserv/guildhandler.cpp:82
 msgid "Guild created."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:87
+#: ../src/net/manaserv/guildhandler.cpp:87
 msgid "Error creating guild."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:97
+#: ../src/net/manaserv/guildhandler.cpp:97
 msgid "Invite sent."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:204
+#: ../src/net/manaserv/guildhandler.cpp:204
 msgid "Member was promoted successfully."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:209
+#: ../src/net/manaserv/guildhandler.cpp:209
 msgid "Failed to promote member."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:87
+#: ../src/net/manaserv/loginhandler.cpp:87
 msgid "Wrong magic_token."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
+#: ../src/net/manaserv/loginhandler.cpp:90
+#: ../src/net/manaserv/loginhandler.cpp:269
 msgid "Already logged in."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:93
+#: ../src/net/manaserv/loginhandler.cpp:93
 msgid "Account banned."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:118
+#: ../src/net/manaserv/loginhandler.cpp:118
 msgid "New password incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:121 src/net/tmwa/loginhandler.cpp:89
+#: ../src/net/manaserv/loginhandler.cpp:121
+#: ../src/net/tmwa/loginhandler.cpp:89
 msgid "Old password incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
+#: ../src/net/manaserv/loginhandler.cpp:124
+#: ../src/net/manaserv/loginhandler.cpp:155
 msgid "Account not connected. Please login first."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:149
+#: ../src/net/manaserv/loginhandler.cpp:149
 msgid "New email address incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:152
+#: ../src/net/manaserv/loginhandler.cpp:152
 msgid "Old email address incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:158
+#: ../src/net/manaserv/loginhandler.cpp:158
 msgid "The new email address already exists."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:239
+#: ../src/net/manaserv/loginhandler.cpp:239
 msgid ""
 "Client registration is not allowed. Please contact server administration."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
+#: ../src/net/manaserv/loginhandler.cpp:263
+#: ../src/net/manaserv/loginhandler.cpp:300
 msgid "Client version is too old."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:266
+#: ../src/net/manaserv/loginhandler.cpp:266
 msgid "Wrong username or password."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:272
+#: ../src/net/manaserv/loginhandler.cpp:272
 msgid "Account banned"
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:275
+#: ../src/net/manaserv/loginhandler.cpp:275
 msgid "Login attempt too soon after previous attempt."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:303
+#: ../src/net/manaserv/loginhandler.cpp:303
 msgid "Wrong username, password or email address."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:306
+#: ../src/net/manaserv/loginhandler.cpp:306
 msgid "Username already exists."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:309
+#: ../src/net/manaserv/loginhandler.cpp:309
 msgid "Email address already exists."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:312
+#: ../src/net/manaserv/loginhandler.cpp:312
 msgid "You took too long with the captcha or your response was incorrect."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:87
+#: ../src/net/manaserv/partyhandler.cpp:87
 msgid "Joined party."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:105
+#: ../src/net/manaserv/partyhandler.cpp:105
 #, c-format
 msgid "%s joined the party."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:123
+#: ../src/net/manaserv/partyhandler.cpp:123
 #, c-format
 msgid "%s rejected your invite."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:95
+#: ../src/net/manaserv/tradehandler.cpp:95
 msgid "Accepting incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:97
+#: ../src/net/manaserv/tradehandler.cpp:97
 msgid "Ignoring incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:115 src/net/tmwa/tradehandler.cpp:109
+#: ../src/net/manaserv/tradehandler.cpp:115
+#: ../src/net/tmwa/tradehandler.cpp:109
 msgid "Request for Trade"
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:110
+#: ../src/net/manaserv/tradehandler.cpp:116
+#: ../src/net/tmwa/tradehandler.cpp:110
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:134
+#: ../src/net/manaserv/tradehandler.cpp:134
 #, c-format
 msgid "Trading with %s"
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:148 src/net/tmwa/tradehandler.cpp:224
+#: ../src/net/manaserv/tradehandler.cpp:148
+#: ../src/net/tmwa/tradehandler.cpp:224
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:155 src/net/tmwa/tradehandler.cpp:231
+#: ../src/net/manaserv/tradehandler.cpp:155
+#: ../src/net/tmwa/tradehandler.cpp:231
 msgid "Trade completed."
 msgstr ""
 
-#: src/net/tmwa/adminhandler.cpp:64
+#: ../src/net/net.cpp:141
+msgid "Unknown Server Type! Exiting."
+msgstr ""
+
+#: ../src/net/net.cpp:164
+msgid "Server protocol unsupported"
+msgstr ""
+
+#: ../src/net/tmwa/adminhandler.cpp:64
 msgid "Kick failed!"
 msgstr ""
 
-#: src/net/tmwa/adminhandler.cpp:66
+#: ../src/net/tmwa/adminhandler.cpp:66
 msgid "Kick succeeded!"
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:109
+#: ../src/net/tmwa/buysellhandler.cpp:109
 msgid "Nothing to sell."
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:116
+#: ../src/net/tmwa/buysellhandler.cpp:116
 msgid "Thanks for buying."
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:123
+#: ../src/net/tmwa/buysellhandler.cpp:123
 msgid "Unable to buy."
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:129
+#: ../src/net/tmwa/buysellhandler.cpp:129
 msgid "Thanks for selling."
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:131
+#: ../src/net/tmwa/buysellhandler.cpp:131
 msgid "Unable to sell."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:103
+#: ../src/net/tmwa/charserverhandler.cpp:103
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:107
+#: ../src/net/tmwa/charserverhandler.cpp:107
 msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:110
+#: ../src/net/tmwa/charserverhandler.cpp:110
 msgid "Unknown char-server failure."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:134
+#: ../src/net/tmwa/charserverhandler.cpp:134
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:146
+#: ../src/net/tmwa/charserverhandler.cpp:146
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:151
+#: ../src/net/tmwa/charserverhandler.cpp:151
 msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:266
+#: ../src/net/tmwa/charserverhandler.cpp:270
 msgid "Strength:"
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:267
+#: ../src/net/tmwa/charserverhandler.cpp:271
 msgid "Agility:"
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:268
+#: ../src/net/tmwa/charserverhandler.cpp:272
 msgid "Vitality:"
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:269
+#: ../src/net/tmwa/charserverhandler.cpp:273
 msgid "Intelligence:"
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:270
+#: ../src/net/tmwa/charserverhandler.cpp:274
 msgid "Dexterity:"
 msgstr ""
 
-#: src/net/tmwa/charserverhandler.cpp:271
+#: ../src/net/tmwa/charserverhandler.cpp:275
 msgid "Luck:"
 msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:87
+#: ../src/net/tmwa/chathandler.cpp:87
 #, c-format
 msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:96
+#: ../src/net/tmwa/chathandler.cpp:96
 #, c-format
 msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:230
+#: ../src/net/tmwa/chathandler.cpp:230
 msgid "MVP player."
 msgstr ""
 
-#: src/net/tmwa/chathandler.cpp:265 src/net/tmwa/chathandler.cpp:271
-#: src/net/tmwa/chathandler.cpp:276 src/net/tmwa/chathandler.cpp:281
-#: src/net/tmwa/chathandler.cpp:286 src/net/tmwa/chathandler.cpp:291
-#: src/net/tmwa/chathandler.cpp:296 src/net/tmwa/chathandler.cpp:301
+#: ../src/net/tmwa/chathandler.cpp:265 ../src/net/tmwa/chathandler.cpp:271
+#: ../src/net/tmwa/chathandler.cpp:276 ../src/net/tmwa/chathandler.cpp:281
+#: ../src/net/tmwa/chathandler.cpp:286 ../src/net/tmwa/chathandler.cpp:291
+#: ../src/net/tmwa/chathandler.cpp:296 ../src/net/tmwa/chathandler.cpp:301
 msgid "Channels are not supported!"
 msgstr ""
 
-#: src/net/tmwa/gamehandler.cpp:88
+#: ../src/net/tmwa/gamehandler.cpp:89
 #, c-format
 msgid "Online users: %d"
 msgstr ""
 
-#: src/net/tmwa/gamehandler.cpp:101
+#: ../src/net/tmwa/gamehandler.cpp:102
 msgid "Game"
 msgstr ""
 
-#: src/net/tmwa/gamehandler.cpp:101
+#: ../src/net/tmwa/gamehandler.cpp:102
 msgid "Request to quit denied!"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:102
+#: ../src/net/tmwa/generalhandler.cpp:102
 #, c-format
 msgid "Strength %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:103
+#: ../src/net/tmwa/generalhandler.cpp:103
 #, c-format
 msgid "Agility %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:104
+#: ../src/net/tmwa/generalhandler.cpp:104
 #, c-format
 msgid "Vitality %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:105
+#: ../src/net/tmwa/generalhandler.cpp:105
 #, c-format
 msgid "Intelligence %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:106
+#: ../src/net/tmwa/generalhandler.cpp:106
 #, c-format
 msgid "Dexterity %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:107
+#: ../src/net/tmwa/generalhandler.cpp:107
 #, c-format
 msgid "Luck %+d"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:132
+#: ../src/net/tmwa/generalhandler.cpp:132
 msgid "Authentication failed."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:135
+#: ../src/net/tmwa/generalhandler.cpp:135
 msgid "No servers available."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:139
+#: ../src/net/tmwa/generalhandler.cpp:139
 msgid "Someone else is trying to use this account."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:142
+#: ../src/net/tmwa/generalhandler.cpp:142
 msgid "This account is already logged in."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:145
+#: ../src/net/tmwa/generalhandler.cpp:145
 msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:148
+#: ../src/net/tmwa/generalhandler.cpp:148
 msgid "Duplicated login."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:151
+#: ../src/net/tmwa/generalhandler.cpp:151
 msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:209
+#: ../src/net/tmwa/generalhandler.cpp:209
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:230
-msgid "Strength"
-msgstr ""
-
-#: src/net/tmwa/generalhandler.cpp:231
-msgid "Agility"
-msgstr ""
-
-#: src/net/tmwa/generalhandler.cpp:232
-msgid "Vitality"
-msgstr ""
-
-#: src/net/tmwa/generalhandler.cpp:233
-msgid "Intelligence"
-msgstr ""
-
-#: src/net/tmwa/generalhandler.cpp:234
-msgid "Dexterity"
-msgstr ""
-
-#: src/net/tmwa/generalhandler.cpp:235
+#: ../src/net/tmwa/generalhandler.cpp:235
 msgid "Luck"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:238
+#: ../src/net/tmwa/generalhandler.cpp:238
 msgid "Defense"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:239
+#: ../src/net/tmwa/generalhandler.cpp:239
 msgid "M.Attack"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:240
+#: ../src/net/tmwa/generalhandler.cpp:240
 msgid "M.Defense"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:241
+#: ../src/net/tmwa/generalhandler.cpp:241
 #, c-format
 msgid "% Accuracy"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:242
+#: ../src/net/tmwa/generalhandler.cpp:242
 #, c-format
 msgid "% Evade"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:243
+#: ../src/net/tmwa/generalhandler.cpp:243
 #, c-format
 msgid "% Critical"
 msgstr ""
 
-#: src/net/tmwa/gui/guildtab.cpp:45
+#: ../src/net/tmwa/gui/guildtab.cpp:45
 msgid "Guild"
 msgstr ""
 
-#: src/net/tmwa/gui/guildtab.cpp:61 src/net/tmwa/gui/partytab.cpp:59
+#: ../src/net/tmwa/gui/guildtab.cpp:61 ../src/net/tmwa/gui/partytab.cpp:59
 msgid "/help > Display this help."
 msgstr ""
 
-#: src/net/tmwa/gui/guildtab.cpp:62
+#: ../src/net/tmwa/gui/guildtab.cpp:62
 msgid "/invite > Invite a player to your guild"
 msgstr ""
 
-#: src/net/tmwa/gui/guildtab.cpp:63
+#: ../src/net/tmwa/gui/guildtab.cpp:63
 msgid "/leave > Leave the guild you are in"
 msgstr ""
 
-#: src/net/tmwa/gui/guildtab.cpp:64
+#: ../src/net/tmwa/gui/guildtab.cpp:64
 msgid "/kick > Kick some one from the guild you are in"
 msgstr ""
 
-#: src/net/tmwa/gui/guildtab.cpp:73 src/net/tmwa/gui/partytab.cpp:73
+#: ../src/net/tmwa/gui/guildtab.cpp:73 ../src/net/tmwa/gui/partytab.cpp:73
 msgid "Command: /invite <nick>"
 msgstr ""
 
-#: src/net/tmwa/gui/guildtab.cpp:74
+#: ../src/net/tmwa/gui/guildtab.cpp:74
 msgid "This command invites <nick> to the guild you're in."
 msgstr ""
 
-#: src/net/tmwa/gui/guildtab.cpp:80 src/net/tmwa/gui/partytab.cpp:80
+#: ../src/net/tmwa/gui/guildtab.cpp:80 ../src/net/tmwa/gui/partytab.cpp:80
 msgid "Command: /leave"
 msgstr ""
 
-#: src/net/tmwa/gui/guildtab.cpp:81
+#: ../src/net/tmwa/gui/guildtab.cpp:81
 msgid "This command causes the player to leave the guild."
 msgstr ""
 
-#: src/net/tmwa/gui/guildtab.cpp:89
+#: ../src/net/tmwa/gui/guildtab.cpp:89
 msgid "Guild name is missing."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:296
+#: ../src/net/tmwa/guildhandler.cpp:296
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:301
+#: ../src/net/tmwa/guildhandler.cpp:301
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:306
+#: ../src/net/tmwa/guildhandler.cpp:306
 msgid "User is now part of your guild."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:311
+#: ../src/net/tmwa/guildhandler.cpp:311
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:316
+#: ../src/net/tmwa/guildhandler.cpp:316
 msgid "Unknown guild invite response."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:393
+#: ../src/net/tmwa/guildhandler.cpp:393
 msgid "Guild creation isn't supported yet."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:43
+#: ../src/net/tmwa/gui/partytab.cpp:43
 msgid "Party"
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:60
+#: ../src/net/tmwa/gui/partytab.cpp:60
 msgid "/invite > Invite a player to your party"
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:61
+#: ../src/net/tmwa/gui/partytab.cpp:61
 msgid "/leave > Leave the party you are in"
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:62
+#: ../src/net/tmwa/gui/partytab.cpp:62
 msgid "/kick > Kick some one from the party you are in"
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:63
+#: ../src/net/tmwa/gui/partytab.cpp:63
 msgid "/item > Show/change party item sharing options"
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:64
+#: ../src/net/tmwa/gui/partytab.cpp:64
 msgid "/exp > Show/change party experience sharing options"
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:81
+#: ../src/net/tmwa/gui/partytab.cpp:81
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:85
+#: ../src/net/tmwa/gui/partytab.cpp:85
 msgid "Command: /item <policy>"
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:86
+#: ../src/net/tmwa/gui/partytab.cpp:86
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:87
+#: ../src/net/tmwa/gui/partytab.cpp:87
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:90
+#: ../src/net/tmwa/gui/partytab.cpp:90
 msgid "Command: /item"
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:91
+#: ../src/net/tmwa/gui/partytab.cpp:91
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:95
+#: ../src/net/tmwa/gui/partytab.cpp:95
 msgid "Command: /exp <policy>"
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:96
+#: ../src/net/tmwa/gui/partytab.cpp:96
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:97
+#: ../src/net/tmwa/gui/partytab.cpp:97
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:100
+#: ../src/net/tmwa/gui/partytab.cpp:100
 msgid "Command: /exp"
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:101
+#: ../src/net/tmwa/gui/partytab.cpp:101
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:196
+#: ../src/net/tmwa/gui/partytab.cpp:132 ../src/net/tmwa/partyhandler.cpp:196
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:202
+#: ../src/net/tmwa/gui/partytab.cpp:135 ../src/net/tmwa/partyhandler.cpp:202
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:208
+#: ../src/net/tmwa/gui/partytab.cpp:138 ../src/net/tmwa/partyhandler.cpp:208
 msgid "Item sharing not possible."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:141
+#: ../src/net/tmwa/gui/partytab.cpp:141
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:172
+#: ../src/net/tmwa/gui/partytab.cpp:167 ../src/net/tmwa/partyhandler.cpp:172
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:178
+#: ../src/net/tmwa/gui/partytab.cpp:170 ../src/net/tmwa/partyhandler.cpp:178
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:184
+#: ../src/net/tmwa/gui/partytab.cpp:173 ../src/net/tmwa/partyhandler.cpp:184
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:176
+#: ../src/net/tmwa/gui/partytab.cpp:176
 msgid "Experience sharing unknown."
 msgstr ""
 
-#: src/net/tmwa/inventoryhandler.cpp:285
+#: ../src/net/tmwa/inventoryhandler.cpp:287
 msgid "Failed to use item."
 msgstr ""
 
-#: src/net/tmwa/inventoryhandler.cpp:399
+#: ../src/net/tmwa/inventoryhandler.cpp:401
 msgid "Unable to equip."
 msgstr ""
 
-#: src/net/tmwa/inventoryhandler.cpp:410
+#: ../src/net/tmwa/inventoryhandler.cpp:413
 msgid "Unable to unequip."
 msgstr ""
 
-#: src/net/tmwa/loginhandler.cpp:86
+#: ../src/net/tmwa/loginhandler.cpp:86
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/tmwa/loginhandler.cpp:92
+#: ../src/net/tmwa/loginhandler.cpp:92
 msgid "New password too short."
 msgstr ""
 
-#: src/net/tmwa/loginhandler.cpp:156
+#: ../src/net/tmwa/loginhandler.cpp:156
 msgid "Unregistered ID."
 msgstr ""
 
-#: src/net/tmwa/loginhandler.cpp:159
+#: ../src/net/tmwa/loginhandler.cpp:159
 msgid "Wrong password."
 msgstr ""
 
-#: src/net/tmwa/loginhandler.cpp:162
+#: ../src/net/tmwa/loginhandler.cpp:162
 msgid "Account expired."
 msgstr ""
 
-#: src/net/tmwa/loginhandler.cpp:165
+#: ../src/net/tmwa/loginhandler.cpp:165
 msgid "Rejected from server."
 msgstr ""
 
-#: src/net/tmwa/loginhandler.cpp:168
+#: ../src/net/tmwa/loginhandler.cpp:168
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
-#: src/net/tmwa/loginhandler.cpp:172
+#: ../src/net/tmwa/loginhandler.cpp:172
+msgid "Client too old."
+msgstr ""
+
+#: ../src/net/tmwa/loginhandler.cpp:175
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
 msgstr ""
 
-#: src/net/tmwa/loginhandler.cpp:179
+#: ../src/net/tmwa/loginhandler.cpp:182
+msgid "Server overpopulated."
+msgstr ""
+
+#: ../src/net/tmwa/loginhandler.cpp:185
 msgid "This user name is already taken."
 msgstr ""
 
-#: src/net/tmwa/network.cpp:145
+#: ../src/net/tmwa/loginhandler.cpp:188
+msgid "Username permanently erased."
+msgstr ""
+
+#: ../src/net/tmwa/network.cpp:145
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/tmwa/network.cpp:345
+#: ../src/net/tmwa/network.cpp:345
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/tmwa/network.cpp:414
+#: ../src/net/tmwa/network.cpp:414
 msgid "Connection to server terminated. "
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:82
+#: ../src/net/tmwa/partyhandler.cpp:82
 msgid "Could not create party."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:84
+#: ../src/net/tmwa/partyhandler.cpp:84
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:119
+#: ../src/net/tmwa/partyhandler.cpp:119
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:123
+#: ../src/net/tmwa/partyhandler.cpp:123
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:127
+#: ../src/net/tmwa/partyhandler.cpp:127
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:131
+#: ../src/net/tmwa/partyhandler.cpp:131
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:236
+#: ../src/net/tmwa/partyhandler.cpp:236
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:246
+#: ../src/net/tmwa/partyhandler.cpp:246
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:299
+#: ../src/net/tmwa/partyhandler.cpp:299
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:335
+#: ../src/net/tmwa/partyhandler.cpp:335
 #, c-format
 msgid "Inviting failed, because you can't see a player called %s."
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:340
+#: ../src/net/tmwa/partyhandler.cpp:340
 msgid "You can only inivte when you are in a party!"
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:368
+#: ../src/net/tmwa/partyhandler.cpp:368
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:100
+#: ../src/net/tmwa/playerhandler.cpp:101
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:118
+#: ../src/net/tmwa/playerhandler.cpp:119
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:119
+#: ../src/net/tmwa/playerhandler.cpp:120
 msgid "You are no more."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:120
+#: ../src/net/tmwa/playerhandler.cpp:121
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:121
+#: ../src/net/tmwa/playerhandler.cpp:122
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:122
+#: ../src/net/tmwa/playerhandler.cpp:123
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:123
+#: ../src/net/tmwa/playerhandler.cpp:124
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:124
+#: ../src/net/tmwa/playerhandler.cpp:125
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:125
+#: ../src/net/tmwa/playerhandler.cpp:126
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:126
+#: ../src/net/tmwa/playerhandler.cpp:127
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:127
+#: ../src/net/tmwa/playerhandler.cpp:128
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:128
+#: ../src/net/tmwa/playerhandler.cpp:129
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:130
+#: ../src/net/tmwa/playerhandler.cpp:131
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:131
+#: ../src/net/tmwa/playerhandler.cpp:132
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:246 src/net/tmwa/playerhandler.cpp:285
+#: ../src/net/tmwa/playerhandler.cpp:253 ../src/net/tmwa/playerhandler.cpp:293
 msgid "Message"
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:247
+#: ../src/net/tmwa/playerhandler.cpp:254
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:313
+#: ../src/net/tmwa/playerhandler.cpp:327
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:348
+#: ../src/net/tmwa/playerhandler.cpp:366
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:488
+#: ../src/net/tmwa/playerhandler.cpp:506
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:144
+#: ../src/net/tmwa/specialhandler.cpp:145
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:147
+#: ../src/net/tmwa/specialhandler.cpp:148
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:150
+#: ../src/net/tmwa/specialhandler.cpp:151
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:153
+#: ../src/net/tmwa/specialhandler.cpp:154
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:156
+#: ../src/net/tmwa/specialhandler.cpp:157
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:159
+#: ../src/net/tmwa/specialhandler.cpp:160
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:168
+#: ../src/net/tmwa/specialhandler.cpp:169
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:171
+#: ../src/net/tmwa/specialhandler.cpp:172
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:174
+#: ../src/net/tmwa/specialhandler.cpp:175
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:177
+#: ../src/net/tmwa/specialhandler.cpp:178
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:180
+#: ../src/net/tmwa/specialhandler.cpp:181
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:183
+#: ../src/net/tmwa/specialhandler.cpp:184
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:186
+#: ../src/net/tmwa/specialhandler.cpp:187
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:189
+#: ../src/net/tmwa/specialhandler.cpp:190
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:192
+#: ../src/net/tmwa/specialhandler.cpp:193
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:195
+#: ../src/net/tmwa/specialhandler.cpp:196
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:198
+#: ../src/net/tmwa/specialhandler.cpp:199
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:207
+#: ../src/net/tmwa/specialhandler.cpp:208
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:210
+#: ../src/net/tmwa/specialhandler.cpp:211
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:213
+#: ../src/net/tmwa/specialhandler.cpp:214
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:126
+#: ../src/net/tmwa/tradehandler.cpp:126
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:130
+#: ../src/net/tmwa/tradehandler.cpp:130
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:134
+#: ../src/net/tmwa/tradehandler.cpp:134
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:139
+#: ../src/net/tmwa/tradehandler.cpp:139
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:146
+#: ../src/net/tmwa/tradehandler.cpp:146
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:154
+#: ../src/net/tmwa/tradehandler.cpp:154
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:202
+#: ../src/net/tmwa/tradehandler.cpp:202
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:207
+#: ../src/net/tmwa/tradehandler.cpp:207
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:211
+#: ../src/net/tmwa/tradehandler.cpp:211
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/playerrelations.cpp:310
+#: ../src/playerrelations.cpp:310
 msgid "Completely ignore"
 msgstr ""
 
-#: src/playerrelations.cpp:324
+#: ../src/playerrelations.cpp:324
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:340
+#: ../src/playerrelations.cpp:340
 msgid "Blink name"
 msgstr ""
 
-#: src/resources/itemdb.cpp:44
+#: ../src/resources/beinginfo.cpp:32 ../src/resources/itemdb.cpp:260
+#: ../src/resources/monsterdb.cpp:77
+msgid "unnamed"
+msgstr ""
+
+#: ../src/resources/itemdb.cpp:310
 #, c-format
 msgid "Attack %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:45
+#: ../src/resources/itemdb.cpp:311
 #, c-format
 msgid "Defense %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:46
+#: ../src/resources/itemdb.cpp:312
 #, c-format
 msgid "HP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:47
+#: ../src/resources/itemdb.cpp:313
 #, c-format
 msgid "MP %+d"
 msgstr ""
 
-#: src/resources/itemdb.cpp:92
+#: ../src/resources/itemdb.cpp:324 ../src/resources/itemdb.cpp:425
 msgid "Unknown item"
 msgstr ""
 
-#: src/resources/itemdb.cpp:135 src/resources/monsterdb.cpp:77
-msgid "unnamed"
+#: ../src/resources/userpalette.cpp:91
+msgid "Being"
+msgstr ""
+
+#: ../src/resources/userpalette.cpp:92
+msgid "Other Players' Names"
+msgstr ""
+
+#: ../src/resources/userpalette.cpp:93
+msgid "Own Name"
+msgstr ""
+
+#: ../src/resources/userpalette.cpp:94
+msgid "GM Names"
+msgstr ""
+
+#: ../src/resources/userpalette.cpp:95
+msgid "NPCs"
+msgstr ""
+
+#: ../src/resources/userpalette.cpp:96
+msgid "Monsters"
+msgstr ""
+
+#: ../src/resources/userpalette.cpp:97
+msgid "Party Members"
+msgstr ""
+
+#: ../src/resources/userpalette.cpp:98
+msgid "Guild Members"
+msgstr ""
+
+#: ../src/resources/userpalette.cpp:99
+msgid "Particle Effects"
+msgstr ""
+
+#: ../src/resources/userpalette.cpp:100
+msgid "Pickup Notification"
+msgstr ""
+
+#: ../src/resources/userpalette.cpp:101
+msgid "Exp Notification"
+msgstr ""
+
+#: ../src/resources/userpalette.cpp:103
+msgid "Other Player Hits Monster"
+msgstr ""
+
+#: ../src/resources/userpalette.cpp:104
+msgid "Monster Hits Player"
+msgstr ""
+
+#: ../src/resources/userpalette.cpp:105
+msgid "Critical Hit"
+msgstr ""
+
+#: ../src/resources/userpalette.cpp:107
+msgid "Local Player Hits Monster"
+msgstr ""
+
+#: ../src/resources/userpalette.cpp:109
+msgid "Local Player Critical Hit"
+msgstr ""
+
+#: ../src/resources/userpalette.cpp:111
+msgid "Local Player Miss"
+msgstr ""
+
+#: ../src/resources/userpalette.cpp:112
+msgid "Misses"
 msgstr ""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 78423e0c..42ee532d 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-02-20 14:34+0100\n"
+"POT-Creation-Date: 2011-04-30 16:50+0200\n"
 "PO-Revision-Date: 2011-02-26 19:45-0300\n"
 "Last-Translator: alastrim <alasmirt@gmail.com>\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
@@ -19,7 +19,7 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: ../src/gui/npcdialog.cpp:183
+#: ../src/gui/npcdialog.cpp:208
 msgid ""
 "\n"
 "> Next\n"
@@ -27,67 +27,81 @@ msgstr ""
 "\n"
 "> Próximo\n"
 
-#: ../src/main.cpp:60
+#: ../src/main.cpp:45
+msgid "              to the mana client."
+msgstr ""
+
+#: ../src/main.cpp:44
+msgid "              used to set custom parameters"
+msgstr ""
+
+#: ../src/main.cpp:62
+#, fuzzy
+msgid "     --chat-log-dir   : Chat log dir to use"
+msgstr "  -C --config-dir     : Diretório de configuração a ser usado"
+
+#: ../src/main.cpp:61
+#, fuzzy
+msgid "     --localdata-dir  : Directory to use as local data directory"
+msgstr ""
+"  -L --localdata-dir  : Diretório a ser usado como pasta de dados local"
+
+#: ../src/main.cpp:65
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr "     --no-opengl      :  Desabilita OpenGL nesta sessão"
 
-#: ../src/main.cpp:58
+#: ../src/main.cpp:63
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr "     --screenshot-dir : Diretório onde serão salvas as screenshots"
 
-#: ../src/main.cpp:52
+#: ../src/main.cpp:56
 msgid "     --update-host    : Use this update host"
 msgstr "     --update-host    : Usa este host de update"
 
-#: ../src/main.cpp:46
+#: ../src/main.cpp:50
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr "  -C --config-dir     : Diretório de configuração a ser usado"
 
-#: ../src/main.cpp:53
+#: ../src/main.cpp:57
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 "  -D --default        : Escolhe um personagem e um servidor de personagem "
 "padrão"
 
-#: ../src/main.cpp:57
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
-msgstr ""
-"  -L --localdata-dir  : Diretório a ser usado como pasta de dados local"
-
-#: ../src/main.cpp:48
+#: ../src/main.cpp:52
 msgid "  -P --password       : Login with this password"
 msgstr "  -P --password       :Efetua login com esta senha"
 
-#: ../src/main.cpp:47
+#: ../src/main.cpp:51
 msgid "  -U --username       : Login with this username"
 msgstr "  -U --username       : Efetua login com este usuário"
 
-#: ../src/main.cpp:49
+#: ../src/main.cpp:53
 msgid "  -c --character      : Login with this character"
 msgstr "  -c --character      :Efetua login com este personagem"
 
-#: ../src/main.cpp:56
+#: ../src/main.cpp:60
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 "  -d --data           : Pasta de onde os dados do jogo vão ser carregados"
 
-#: ../src/main.cpp:45
+#: ../src/main.cpp:49
 msgid "  -h --help           : Display this help"
 msgstr "  -h --help           : Exibe esta ajuda"
 
-#: ../src/main.cpp:51
+#: ../src/main.cpp:55
 msgid "  -p --port           : Login server port"
 msgstr "  -p --port           : Porta do servidor de login"
 
-#: ../src/main.cpp:50
+#: ../src/main.cpp:54
 msgid "  -s --server         : Login server name or IP"
 msgstr "  -s --server         :  Nome ou IP do servidor de login"
 
-#: ../src/main.cpp:55
+#: ../src/main.cpp:59
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr "  -u --skip-update    : Não faz downloads de atualização"
 
-#: ../src/main.cpp:44
+#: ../src/main.cpp:48
 msgid "  -v --version        : Display the version"
 msgstr "  -v --version        :  Exibe a versão"
 
@@ -103,23 +117,23 @@ msgstr "##1  O processo de update está incompleto."
 msgid "##1  you try again later."
 msgstr "##1 você tente novamente mais tarde."
 
-#: ../src/net/tmwa/generalhandler.cpp:228
-#, c-format
+#: ../src/net/tmwa/generalhandler.cpp:241
+#, no-c-format
 msgid "% Accuracy"
 msgstr "% Exatidão"
 
-#: ../src/net/tmwa/generalhandler.cpp:230
-#, c-format
+#: ../src/net/tmwa/generalhandler.cpp:243
+#, no-c-format
 msgid "% Critical"
 msgstr "% Críticos"
 
-#: ../src/net/tmwa/generalhandler.cpp:229
-#, c-format
+#: ../src/net/tmwa/generalhandler.cpp:242
+#, no-c-format
 msgid "% Evade"
 msgstr "% Evasão"
 
 #: ../src/gui/debugwindow.cpp:61 ../src/gui/debugwindow.cpp:64
-#, c-format
+#, no-c-format
 msgid "%d FPS"
 msgstr "%d FPS"
 
@@ -128,72 +142,72 @@ msgstr "%d FPS"
 msgid "%d FPS (OpenGL)"
 msgstr "%d FPS (OpenGL)"
 
-#: ../src/client.cpp:1102 ../src/client.cpp:1125
+#: ../src/client.cpp:1154 ../src/client.cpp:1182
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s não existe e não pode ser criado! Saindo."
 
-#: ../src/net/manaserv/chathandler.cpp:291
+#: ../src/net/manaserv/chathandler.cpp:306
 #, c-format
 msgid "%s entered the channel."
 msgstr "%s entrou no canal."
 
-#: ../src/gui/socialwindow.cpp:605
+#: ../src/gui/socialwindow.cpp:601
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s te convidou para entrar no grupo %s."
 
-#: ../src/gui/socialwindow.cpp:561
+#: ../src/gui/socialwindow.cpp:558
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s te convidou para entrar na guilda %s."
 
-#: ../src/gui/socialwindow.cpp:600
+#: ../src/gui/socialwindow.cpp:596
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s te convidou para entrar em seu grupo."
 
-#: ../src/net/manaserv/chathandler.cpp:322
+#: ../src/net/manaserv/chathandler.cpp:337
 #, c-format
 msgid "%s has kicked %s."
 msgstr "%s expulsou %s."
 
-#: ../src/net/tmwa/partyhandler.cpp:252
+#: ../src/net/tmwa/partyhandler.cpp:246
 #, c-format
 msgid "%s has left your party."
 msgstr "%s saiu do seu grupo."
 
-#: ../src/net/manaserv/chathandler.cpp:312
+#: ../src/net/manaserv/chathandler.cpp:327
 #, c-format
 msgid "%s has set mode %s on user %s."
 msgstr "%s colocou o modo %s no usuário %s."
 
-#: ../src/net/tmwa/partyhandler.cpp:121
+#: ../src/net/tmwa/partyhandler.cpp:119
 #, c-format
 msgid "%s is already a member of a party."
 msgstr "%s já é membro de um grupo."
 
-#: ../src/net/tmwa/partyhandler.cpp:374
+#: ../src/net/tmwa/partyhandler.cpp:368
 #, c-format
 msgid "%s is not in your party!"
 msgstr "%s não está em seu grupo!"
 
-#: ../src/net/tmwa/partyhandler.cpp:129
+#: ../src/net/tmwa/partyhandler.cpp:127
 #, c-format
 msgid "%s is now a member of your party."
 msgstr "%s agora é um membro do seu grupo."
 
-#: ../src/net/manaserv/partyhandler.cpp:106
+#: ../src/net/manaserv/partyhandler.cpp:105
 #, c-format
 msgid "%s joined the party."
 msgstr "%s entrou para o grupo."
 
-#: ../src/net/manaserv/chathandler.cpp:296
+#: ../src/net/manaserv/chathandler.cpp:311
 #, c-format
 msgid "%s left the channel."
 msgstr "%s saiu do canal."
 
-#: ../src/net/tmwa/partyhandler.cpp:125
+#: ../src/net/tmwa/partyhandler.cpp:123
 #, c-format
 msgid "%s refused your invitation."
 msgstr "%s recusou seu convite."
@@ -203,60 +217,60 @@ msgstr "%s recusou seu convite."
 msgid "%s rejected your invite."
 msgstr "%s recusou seu convite."
 
-#: ../src/net/manaserv/tradehandler.cpp:117
-#: ../src/net/tmwa/tradehandler.cpp:108
+#: ../src/net/manaserv/tradehandler.cpp:116
+#: ../src/net/tmwa/tradehandler.cpp:110
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr "%s quer negociar com você, você aceita?"
 
-#: ../src/gui/widgets/chattab.cpp:152
+#: ../src/gui/widgets/chattab.cpp:153
 #, c-format
 msgid "%s whispers: %s"
 msgstr "%s envia mensagem privada: %s"
 
-#: ../src/gui/charselectdialog.cpp:392 ../src/gui/charselectdialog.cpp:393
+#: ../src/gui/charselectdialog.cpp:418 ../src/gui/charselectdialog.cpp:419
 msgid "(empty)"
 msgstr "(vazio)"
 
-#: ../src/commandhandler.cpp:222
+#: ../src/commandhandler.cpp:221
 msgid "*** only available to a GM ***"
 msgstr "*** Disponivel apenas para GM's ***"
 
-#: ../src/gui/buy.cpp:74 ../src/gui/itemamount.cpp:102
-#: ../src/gui/npcdialog.cpp:104 ../src/gui/sell.cpp:74
-#: ../src/gui/statuswindow.cpp:430
+#: ../src/gui/buy.cpp:74 ../src/gui/itemamount.cpp:112
+#: ../src/gui/npcdialog.cpp:124 ../src/gui/sell.cpp:74
+#: ../src/gui/statuswindow.cpp:464
 msgid "+"
 msgstr "+"
 
-#: ../src/gui/buy.cpp:77 ../src/gui/itemamount.cpp:101
-#: ../src/gui/npcdialog.cpp:105 ../src/gui/sell.cpp:75
-#: ../src/gui/statuswindow.cpp:442
+#: ../src/gui/buy.cpp:77 ../src/gui/itemamount.cpp:111
+#: ../src/gui/npcdialog.cpp:125 ../src/gui/sell.cpp:75
+#: ../src/gui/statuswindow.cpp:476
 msgid "-"
 msgstr "-"
 
-#: ../src/commandhandler.cpp:166
+#: ../src/commandhandler.cpp:165
 msgid "-- Help --"
 msgstr "--Ajuda--"
 
-#: ../src/commandhandler.cpp:201
+#: ../src/commandhandler.cpp:200
 msgid "/announce > Global announcement (GM only)"
 msgstr "/announce > Anúncio Global (Somente GM)"
 
-#: ../src/commandhandler.cpp:182
+#: ../src/commandhandler.cpp:181
 msgid "/away > Tell the other whispering players you're away from keyboard."
 msgstr ""
 "/away > Diz que você está longe do teclado para quem te enviar uma mensagem "
 "privada ."
 
-#: ../src/commandhandler.cpp:173
+#: ../src/commandhandler.cpp:172
 msgid "/clear > Clears this window"
 msgstr "/clear > Limpa janela atual"
 
-#: ../src/gui/widgets/whispertab.cpp:73
+#: ../src/gui/widgets/whispertab.cpp:74
 msgid "/close > Close the whisper tab"
 msgstr "/close > Fecha a aba de mensagem privada"
 
-#: ../src/commandhandler.cpp:191
+#: ../src/commandhandler.cpp:190
 msgid "/createparty > Create a new party"
 msgstr "/createparty > Cria um novo grupo"
 
@@ -265,7 +279,7 @@ msgid "/exp > Show/change party experience sharing options"
 msgstr ""
 "/exp > Mostra/Modifica opções de compartilhamento de experiência do grupo"
 
-#: ../src/commandhandler.cpp:167
+#: ../src/commandhandler.cpp:166
 msgid "/help > Display this help"
 msgstr "/help > Exibe esta ajuda"
 
@@ -273,11 +287,11 @@ msgstr "/help > Exibe esta ajuda"
 msgid "/help > Display this help."
 msgstr "/help > Exibe esta ajuda."
 
-#: ../src/gui/widgets/whispertab.cpp:71
+#: ../src/gui/widgets/whispertab.cpp:72
 msgid "/ignore > Ignore the other player"
 msgstr "/ignore > Ignora o outro jogador"
 
-#: ../src/commandhandler.cpp:185
+#: ../src/commandhandler.cpp:184
 msgid "/ignore > ignore a player"
 msgstr "/ignore > Ignora um jogador"
 
@@ -293,7 +307,7 @@ msgstr "/invite > Convida um jogador para o seu grupo"
 msgid "/item > Show/change party item sharing options"
 msgstr "/item > Mostra/Muda opções de compartilhamento de itens do grupo"
 
-#: ../src/commandhandler.cpp:189
+#: ../src/commandhandler.cpp:188
 msgid "/join > Join or create a channel"
 msgstr "/join > Criar ou entrar em um canal"
 
@@ -317,15 +331,15 @@ msgstr "/leave > Sai da guilda em que você está"
 msgid "/leave > Leave the party you are in"
 msgstr "/leave > Sai do grupo em que você está"
 
-#: ../src/commandhandler.cpp:188
+#: ../src/commandhandler.cpp:187
 msgid "/list > Display all public channels"
 msgstr "/list > Exibir todos os canais públicos"
 
-#: ../src/commandhandler.cpp:171
+#: ../src/commandhandler.cpp:170
 msgid "/me > Tell something about yourself"
 msgstr "/me > Diz alguma coisa sobre você"
 
-#: ../src/commandhandler.cpp:175
+#: ../src/commandhandler.cpp:174
 msgid "/msg > Send a private message to a user"
 msgstr "/msg > Envia uma messagem privada a um usuário"
 
@@ -333,21 +347,21 @@ msgstr "/msg > Envia uma messagem privada a um usuário"
 msgid "/op > Make a user a channel operator"
 msgstr "/op > Transdorma um usuário em operador do canal"
 
-#: ../src/commandhandler.cpp:192
+#: ../src/commandhandler.cpp:191
 msgid "/party > Invite a user to party"
 msgstr "/party > Convidar um usuário para o grupo"
 
-#: ../src/commandhandler.cpp:198
+#: ../src/commandhandler.cpp:197
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 "/present > Mostra a lista de jogadores presentes (envia para o log de chat, "
 "se estiver gravando)"
 
-#: ../src/commandhandler.cpp:180
+#: ../src/commandhandler.cpp:179
 msgid "/q > Alias of query"
 msgstr "/q > O mesmo que /query"
 
-#: ../src/commandhandler.cpp:178
+#: ../src/commandhandler.cpp:177
 msgid "/query > Makes a tab for private messages with another user"
 msgstr "/query > Abre uma aba de chat com outro usuário"
 
@@ -355,11 +369,11 @@ msgstr "/query > Abre uma aba de chat com outro usuário"
 msgid "/quit > Leave a channel"
 msgstr "/quit > Sair do canal"
 
-#: ../src/commandhandler.cpp:194
+#: ../src/commandhandler.cpp:193
 msgid "/record > Start recording the chat to an external file"
 msgstr "/record > Começar a gravar o chat em um arquivo externo"
 
-#: ../src/commandhandler.cpp:196
+#: ../src/commandhandler.cpp:195
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr "/toggle > Determina se <enter> exibe a janela de chat"
 
@@ -367,11 +381,11 @@ msgstr "/toggle > Determina se <enter> exibe a janela de chat"
 msgid "/topic > Set the topic of the current channel"
 msgstr "/topic > Setar o tópico deste canal"
 
-#: ../src/gui/widgets/whispertab.cpp:72
+#: ../src/gui/widgets/whispertab.cpp:73
 msgid "/unignore > Stop ignoring the other player"
 msgstr "/unignore > Para de ignorar o outro jogador"
 
-#: ../src/commandhandler.cpp:186
+#: ../src/commandhandler.cpp:185
 msgid "/unignore > stop ignoring a player"
 msgstr "/unignore > Deixa de ignorar um jogador"
 
@@ -379,19 +393,19 @@ msgstr "/unignore > Deixa de ignorar um jogador"
 msgid "/users > Lists the users in the current channel"
 msgstr "/users > Listar os usuários deste canal"
 
-#: ../src/commandhandler.cpp:177
+#: ../src/commandhandler.cpp:176
 msgid "/w > Alias of msg"
 msgstr "/w > O mesmo que /msg"
 
-#: ../src/commandhandler.cpp:169
+#: ../src/commandhandler.cpp:168
 msgid "/where > Display map name"
 msgstr "/where > Exibe o nome do mapa"
 
-#: ../src/commandhandler.cpp:176
+#: ../src/commandhandler.cpp:175
 msgid "/whisper > Alias of msg"
 msgstr "/whisper > O mesmo que /msg"
 
-#: ../src/commandhandler.cpp:170
+#: ../src/commandhandler.cpp:169
 msgid "/who > Display number of online users"
 msgstr "/who > Exibe o número de usuários online"
 
@@ -416,7 +430,7 @@ msgstr ""
 "<policy> pode ser \"1\", \"yes\" e \"true\" para habilitar compartilhamento "
 "de itens, ou \"0\", \"no\" e \"false\" para desabilitar."
 
-#: ../src/commandhandler.cpp:309
+#: ../src/commandhandler.cpp:308
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
 "\"0\", \"no\", \"false\" to turn the toggle off."
@@ -429,41 +443,41 @@ msgstr ""
 msgid ">"
 msgstr ">"
 
-#: ../src/gui/setup_players.cpp:206 ../src/gui/setup_video.cpp:153
+#: ../src/gui/setup_players.cpp:206 ../src/gui/setup_video.cpp:147
 msgid "???"
 msgstr "???"
 
-#: ../src/gui/socialwindow.cpp:566
+#: ../src/gui/socialwindow.cpp:563
 msgid "Accept Guild Invite"
 msgstr "Aceitar convite para a guilda"
 
-#: ../src/gui/socialwindow.cpp:613
+#: ../src/gui/socialwindow.cpp:609
 msgid "Accept Party Invite"
 msgstr "Aceitar convite para o grupo"
 
-#: ../src/gui/socialwindow.cpp:466
-#, c-format
-msgid "Accepted guild invite from %s."
-msgstr "Aceitou convite para a guilda de  %s."
+#: ../src/gui/socialwindow.cpp:463
+#, fuzzy
+msgid "Accepted guild invite"
+msgstr "Aceitar convite para a guilda"
 
-#: ../src/gui/socialwindow.cpp:447
+#: ../src/gui/socialwindow.cpp:444
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "Aceitou convite para o grupo de  %s."
 
-#: ../src/game.cpp:720
+#: ../src/game.cpp:738
 msgid "Accepting incoming trade requests"
 msgstr "Aceitando propostas de negócios"
 
-#: ../src/net/manaserv/tradehandler.cpp:96
+#: ../src/net/manaserv/tradehandler.cpp:95
 msgid "Accepting incoming trade requests."
 msgstr "Aceitando propostas de negócios."
 
-#: ../src/net/tmwa/charserverhandler.cpp:105
+#: ../src/net/tmwa/charserverhandler.cpp:103
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr "Acesso negado. Provavelmente há jogadores demais neste servidor."
 
-#: ../src/gui/charselectdialog.cpp:117
+#: ../src/gui/charselectdialog.cpp:120
 msgid "Account and Character Management"
 msgstr "Gerenciamento de Conta e Personagem"
 
@@ -493,7 +507,11 @@ msgstr "Conta não encontrada. Por favor, tente novamente."
 msgid "Account: %s"
 msgstr "Conta: %s"
 
-#: ../src/gui/trade.cpp:75
+#: ../src/gui/inventorywindow.cpp:106 ../src/gui/popupmenu.cpp:369
+msgid "Activate"
+msgstr ""
+
+#: ../src/gui/trade.cpp:76
 msgid "Add"
 msgstr "Adicionar"
 
@@ -501,40 +519,46 @@ msgstr "Adicionar"
 msgid "Add name to chat"
 msgstr "Adicionar nome ao chat"
 
-#: ../src/gui/popupmenu.cpp:190 ../src/gui/popupmenu.cpp:378
+#: ../src/gui/popupmenu.cpp:190 ../src/gui/popupmenu.cpp:387
 msgid "Add to chat"
 msgstr "Adicionar ao chat"
 
-#: ../src/net/manaserv/stats.cpp:68 ../src/net/tmwa/generalhandler.cpp:218
+#: ../src/net/manaserv/attributes.cpp:179
+#: ../src/net/tmwa/generalhandler.cpp:231
 msgid "Agility"
 msgstr "Agilidade"
 
-#: ../src/net/manaserv/stats.cpp:70 ../src/net/tmwa/generalhandler.cpp:102
+#: ../src/net/manaserv/attributes.cpp:186
+#, fuzzy, c-format
+msgid "Agility %+.1f"
+msgstr "Agilidade %+d"
+
+#: ../src/net/tmwa/generalhandler.cpp:103
 #, c-format
 msgid "Agility %+d"
 msgstr "Agilidade %+d"
 
-#: ../src/net/tmwa/charserverhandler.cpp:260
+#: ../src/net/tmwa/charserverhandler.cpp:271
 msgid "Agility:"
 msgstr "Agilidade:"
 
-#: ../src/gui/trade.cpp:54
+#: ../src/gui/trade.cpp:55
 msgid "Agree trade"
 msgstr "Aceitar negociação"
 
-#: ../src/gui/trade.cpp:55
+#: ../src/gui/trade.cpp:56
 msgid "Agreed. Waiting..."
 msgstr "Aceitou. Aguarde..."
 
-#: ../src/gui/itemamount.cpp:105
+#: ../src/gui/itemamount.cpp:115
 msgid "All"
 msgstr "Tudo"
 
-#: ../src/gui/setup_players.cpp:224
+#: ../src/gui/setup_players.cpp:225
 msgid "Allow trading"
 msgstr "Permitir negociações"
 
-#: ../src/gui/setup_players.cpp:226
+#: ../src/gui/setup_players.cpp:227
 msgid "Allow whispers"
 msgstr "Permitir mensagens particulares"
 
@@ -547,7 +571,7 @@ msgstr "Já está conectado."
 msgid "Already recording."
 msgstr "Já está gravando."
 
-#: ../src/gui/setup_video.cpp:262
+#: ../src/gui/setup_video.cpp:254
 msgid "Ambient FX"
 msgstr "Ambiente FX"
 
@@ -556,13 +580,13 @@ msgstr "Ambiente FX"
 msgid "Ambient FX: %s"
 msgstr "Ambiente FX: %s"
 
-#: ../src/net/tmwa/partyhandler.cpp:304
+#: ../src/net/tmwa/partyhandler.cpp:299
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr "Um membro desconhecido tentou dizer: %s"
 
-#: ../src/net/manaserv/beinghandler.cpp:317
-#: ../src/net/tmwa/playerhandler.cpp:120
+#: ../src/net/manaserv/beinghandler.cpp:296
+#: ../src/net/tmwa/playerhandler.cpp:112
 msgid "Annihilated."
 msgstr "Aniquilado."
 
@@ -570,11 +594,11 @@ msgstr "Aniquilado."
 msgid "Apply"
 msgstr "Aplicar"
 
-#: ../src/gui/setup_video.cpp:469
+#: ../src/gui/setup_video.cpp:461
 msgid "Applying change to OpenGL requires restart."
 msgstr "Aplicando mudança a OpenGL requer reiniciar o jogo."
 
-#: ../src/gui/setup_video.cpp:461
+#: ../src/gui/setup_video.cpp:453
 msgid ""
 "Applying change to OpenGL requires restart. In case OpenGL messes up your "
 "game graphics, restart the game with the command line option \"--no-opengl\"."
@@ -583,16 +607,16 @@ msgstr ""
 "seu gráfico, abra o jogo através da linha de comando com a seguinte opção: "
 "\"--no-opengl\"."
 
-#: ../src/gui/charselectdialog.cpp:70
+#: ../src/gui/charselectdialog.cpp:73
 msgid "Are you sure you want to delete this character?"
 msgstr "Tem certeza que deseja excluir este personagem?"
 
-#: ../src/gui/socialwindow.cpp:168
+#: ../src/gui/socialwindow.cpp:164
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "Tem certeza que deseja sair da guilda %s?"
 
-#: ../src/gui/socialwindow.cpp:247
+#: ../src/gui/socialwindow.cpp:243
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr "Tem certeza que deseja sair do grupo %s?"
@@ -601,11 +625,16 @@ msgstr "Tem certeza que deseja sair do grupo %s?"
 msgid "Assign"
 msgstr "Atribuir"
 
-#: ../src/keyboardconfig.cpp:44 ../src/net/tmwa/generalhandler.cpp:224
+#: ../src/net/manaserv/charhandler.cpp:165
+#, c-format
+msgid "At least one statis out of the permitted range: (%u - %u)."
+msgstr ""
+
+#: ../src/keyboardconfig.cpp:43 ../src/net/tmwa/generalhandler.cpp:237
 msgid "Attack"
 msgstr "Ataque"
 
-#: ../src/resources/itemdb.cpp:53
+#: ../src/resources/itemdb.cpp:310
 #, c-format
 msgid "Attack %+d"
 msgstr "Ataque %+d"
@@ -615,7 +644,7 @@ msgstr "Ataque %+d"
 msgid "Attack %s"
 msgstr "Ataque %s"
 
-#: ../src/gui/chat.cpp:325
+#: ../src/gui/chat.cpp:329
 msgid "Attendance written to record log."
 msgstr "Presença gravada no registro do log."
 
@@ -623,11 +652,11 @@ msgstr "Presença gravada no registro do log."
 msgid "Audio"
 msgstr "Áudio"
 
-#: ../src/net/tmwa/generalhandler.cpp:129
+#: ../src/net/tmwa/generalhandler.cpp:132
 msgid "Authentication failed."
 msgstr "Falha de autenticação."
 
-#: ../src/localplayer.cpp:1458
+#: ../src/localplayer.cpp:1030
 msgid "Away"
 msgstr "Fora do Teclado"
 
@@ -636,27 +665,27 @@ msgstr "Fora do Teclado"
 msgid "Befriend %s"
 msgstr "Amizade %s"
 
-#: ../src/gui/userpalette.cpp:91
+#: ../src/resources/userpalette.cpp:91
 msgid "Being"
 msgstr "Personagem"
 
-#: ../src/net/tmwa/playerhandler.cpp:132
+#: ../src/net/tmwa/playerhandler.cpp:124
 msgid "Bereft of life, you rest in peace."
 msgstr "Sem vida, você descansa em paz."
 
-#: ../src/playerrelations.cpp:342
+#: ../src/playerrelations.cpp:340
 msgid "Blink name"
 msgstr "Piscar nome"
 
-#: ../src/gui/setup_colors.cpp:138
+#: ../src/gui/setup_colors.cpp:139
 msgid "Blue:"
 msgstr "Azul:"
 
-#: ../src/gui/setup_video.cpp:166
+#: ../src/gui/setup_video.cpp:160
 msgid "Bubbles with names"
 msgstr "Bolhas com nomes"
 
-#: ../src/gui/setup_video.cpp:165
+#: ../src/gui/setup_video.cpp:159
 msgid "Bubbles, no names"
 msgstr "Bolhas, sem nomes"
 
@@ -670,17 +699,17 @@ msgstr "Calibrar"
 
 #: ../src/gui/buysell.cpp:47 ../src/gui/changeemaildialog.cpp:55
 #: ../src/gui/changepassworddialog.cpp:58 ../src/gui/charcreatedialog.cpp:79
-#: ../src/gui/connectiondialog.cpp:44 ../src/gui/itemamount.cpp:104
+#: ../src/gui/connectiondialog.cpp:44 ../src/gui/itemamount.cpp:114
 #: ../src/gui/npcpostdialog.cpp:57 ../src/gui/popupmenu.cpp:175
-#: ../src/gui/popupmenu.cpp:194 ../src/gui/popupmenu.cpp:380
+#: ../src/gui/popupmenu.cpp:194 ../src/gui/popupmenu.cpp:389
 #: ../src/gui/quitdialog.cpp:47 ../src/gui/register.cpp:74
-#: ../src/gui/setup.cpp:51 ../src/gui/socialwindow.cpp:279
+#: ../src/gui/setup.cpp:51 ../src/gui/socialwindow.cpp:275
 #: ../src/gui/textdialog.cpp:40 ../src/gui/unregisterdialog.cpp:56
 #: ../src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../src/commandhandler.cpp:422
+#: ../src/commandhandler.cpp:421
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -689,35 +718,35 @@ msgstr ""
 "Não é possível  criar uma aba de mensagem privada para o nick \"%s\"! Ou ela "
 "já existe ou é você mesmo."
 
-#: ../src/gui/socialwindow.cpp:624
+#: ../src/gui/socialwindow.cpp:620
 msgid "Cannot create party. You are already in a party"
 msgstr "Não foi possível criar o grupo. Você já faz parte de um."
 
-#: ../src/net/tmwa/playerhandler.cpp:380
+#: ../src/net/tmwa/playerhandler.cpp:366
 msgid "Cannot raise skill!"
 msgstr "Impossível aumentar o atributo!"
 
-#: ../src/gui/widgets/whispertab.cpp:52
+#: ../src/gui/widgets/whispertab.cpp:53
 msgid "Cannot send empty chat!"
 msgstr "Não é possível enviar chat vazio!"
 
-#: ../src/commandhandler.cpp:401
+#: ../src/commandhandler.cpp:400
 msgid "Cannot send empty whispers!"
 msgstr "Não é possível enviar mensagens privadas vazias!"
 
-#: ../src/net/tmwa/specialhandler.cpp:162
+#: ../src/net/tmwa/specialhandler.cpp:160
 msgid "Cannot shout!"
 msgstr "Impossivel gritar!"
 
-#: ../src/net/tmwa/charserverhandler.cpp:109
+#: ../src/net/tmwa/charserverhandler.cpp:107
 msgid "Cannot use this ID."
 msgstr "Não é possível usar este ID."
 
-#: ../src/gui/trade.cpp:102
+#: ../src/gui/trade.cpp:103
 msgid "Change"
 msgstr "Mudar"
 
-#: ../src/gui/charselectdialog.cpp:150
+#: ../src/gui/charselectdialog.cpp:154
 msgid "Change Email"
 msgstr "Alterar email"
 
@@ -730,7 +759,7 @@ msgid "Change Login"
 msgstr "Trocar Login"
 
 #: ../src/gui/changepassworddialog.cpp:47
-#: ../src/gui/changepassworddialog.cpp:56 ../src/gui/charselectdialog.cpp:128
+#: ../src/gui/changepassworddialog.cpp:56 ../src/gui/charselectdialog.cpp:132
 msgid "Change Password"
 msgstr "Alterar senha"
 
@@ -738,15 +767,15 @@ msgstr "Alterar senha"
 msgid "Change Server"
 msgstr "Trocar servidor"
 
-#: ../src/gui/setup_video.cpp:616
+#: ../src/gui/setup_video.cpp:607
 msgid "Changes will take effect on map change."
 msgstr "As mudanças terão efeito ao mudar de mapa."
 
-#: ../src/client.cpp:813
+#: ../src/client.cpp:848
 msgid "Changing game servers"
 msgstr "Mudando servidores do jogo"
 
-#: ../src/gui/setup_video.cpp:460
+#: ../src/gui/setup_video.cpp:452
 msgid "Changing to OpenGL"
 msgstr "Mudando para OpenGL"
 
@@ -755,51 +784,51 @@ msgid "Channel operators can kick and op other users from the channel."
 msgstr ""
 "Operadores de canal podem expulsar e dar op a outros usuários do canal."
 
-#: ../src/net/tmwa/chathandler.cpp:223 ../src/net/tmwa/chathandler.cpp:229
-#: ../src/net/tmwa/chathandler.cpp:234 ../src/net/tmwa/chathandler.cpp:239
-#: ../src/net/tmwa/chathandler.cpp:244 ../src/net/tmwa/chathandler.cpp:249
-#: ../src/net/tmwa/chathandler.cpp:254 ../src/net/tmwa/chathandler.cpp:259
+#: ../src/net/tmwa/chathandler.cpp:265 ../src/net/tmwa/chathandler.cpp:271
+#: ../src/net/tmwa/chathandler.cpp:276 ../src/net/tmwa/chathandler.cpp:281
+#: ../src/net/tmwa/chathandler.cpp:286 ../src/net/tmwa/chathandler.cpp:291
+#: ../src/net/tmwa/chathandler.cpp:296 ../src/net/tmwa/chathandler.cpp:301
 msgid "Channels are not supported!"
 msgstr "Não há suporte para canais!"
 
-#: ../src/net/tmwa/charserverhandler.cpp:150
+#: ../src/net/tmwa/charserverhandler.cpp:146
 msgid "Character deleted."
 msgstr "Personagem deletado."
 
-#: ../src/gui/statuswindow.cpp:238
+#: ../src/gui/statuswindow.cpp:211 ../src/gui/statuswindow.cpp:248
 #, c-format
 msgid "Character points: %d"
 msgstr "Pontos do personagem: %d"
 
-#: ../src/gui/charcreatedialog.cpp:242
+#: ../src/gui/charcreatedialog.cpp:248
 msgid "Character stats OK"
 msgstr "Atributos do personagem OK"
 
-#: ../src/net/manaserv/charhandler.cpp:143
+#: ../src/net/manaserv/charhandler.cpp:147
 msgid "Character's name already exists."
 msgstr "Nome de usuário já existe."
 
-#: ../src/net/manaserv/charhandler.cpp:155
+#: ../src/net/manaserv/charhandler.cpp:159
 msgid "Character's stats are too high."
 msgstr "Atributos do personagem estão muito altos."
 
-#: ../src/net/manaserv/charhandler.cpp:158
+#: ../src/net/manaserv/charhandler.cpp:162
 msgid "Character's stats are too low."
 msgstr "Atributos do personagem estão muito baixos."
 
-#: ../src/gui/chat.cpp:87
+#: ../src/gui/chat.cpp:88
 msgid "Chat"
 msgstr "Chat"
 
-#: ../src/keyboardconfig.cpp:76
+#: ../src/keyboardconfig.cpp:75
 msgid "Chat Window"
 msgstr "Janela de chat"
 
-#: ../src/net/tmwa/specialhandler.cpp:156
+#: ../src/net/tmwa/specialhandler.cpp:154
 msgid "Chat creating failed!"
 msgstr "Falha ao criar Chat!"
 
-#: ../src/gui/charselectdialog.cpp:380
+#: ../src/gui/charselectdialog.cpp:404
 msgid "Choose"
 msgstr "Escolher"
 
@@ -807,19 +836,19 @@ msgstr "Escolher"
 msgid "Choose World"
 msgstr "Escolher Mundo"
 
-#: ../src/gui/serverdialog.cpp:196
+#: ../src/gui/serverdialog.cpp:197
 msgid "Choose Your Server"
 msgstr "Escolha seu servidor"
 
-#: ../src/gui/socialwindow.cpp:544
+#: ../src/gui/socialwindow.cpp:541
 msgid "Choose your guild's name."
 msgstr "Escolha o nome da sua guilda."
 
-#: ../src/gui/socialwindow.cpp:630
+#: ../src/gui/socialwindow.cpp:626
 msgid "Choose your party's name."
 msgstr "Escolha o nome do seu grupo."
 
-#: ../src/gui/npcdialog.cpp:98
+#: ../src/gui/npcdialog.cpp:118
 msgid "Clear log"
 msgstr "Limpar log"
 
@@ -830,40 +859,45 @@ msgstr ""
 "Registro pelo cliente não é permitido. Favor contactar o administrador do "
 "servidor."
 
+#: ../src/net/tmwa/loginhandler.cpp:172
+#, fuzzy
+msgid "Client too old."
+msgstr "Versão do cliente é muito antiga."
+
 #: ../src/net/manaserv/loginhandler.cpp:263
 #: ../src/net/manaserv/loginhandler.cpp:300
 msgid "Client version is too old."
 msgstr "Versão do cliente é muito antiga."
 
-#: ../src/gui/help.cpp:51 ../src/gui/npcdialog.cpp:47
+#: ../src/gui/help.cpp:51 ../src/gui/npcdialog.cpp:50
 msgid "Close"
 msgstr "Fechar"
 
-#: ../src/gui/setup_colors.cpp:50
+#: ../src/gui/setup_colors.cpp:51
 msgid "Colors"
 msgstr "Cores"
 
-#: ../src/commandhandler.cpp:221
+#: ../src/commandhandler.cpp:220
 msgid "Command: /announce <msg>"
 msgstr "Comando: /announce <msg>"
 
-#: ../src/commandhandler.cpp:274
+#: ../src/commandhandler.cpp:273
 msgid "Command: /away"
 msgstr "Comando: /away"
 
-#: ../src/commandhandler.cpp:271
+#: ../src/commandhandler.cpp:270
 msgid "Command: /away <afk reason>"
 msgstr "Comando: /away <motivo>"
 
-#: ../src/commandhandler.cpp:228
+#: ../src/commandhandler.cpp:227
 msgid "Command: /clear"
 msgstr "Comando: /clear"
 
-#: ../src/gui/widgets/whispertab.cpp:83
+#: ../src/gui/widgets/whispertab.cpp:84
 msgid "Command: /close"
 msgstr "Comando: /close"
 
-#: ../src/commandhandler.cpp:279
+#: ../src/commandhandler.cpp:278
 msgid "Command: /createparty <name>"
 msgstr "Comando: /createparty <nome>"
 
@@ -875,19 +909,19 @@ msgstr "Comando: /exp"
 msgid "Command: /exp <policy>"
 msgstr "Comando: /exp <policy>"
 
-#: ../src/commandhandler.cpp:209
+#: ../src/commandhandler.cpp:208
 msgid "Command: /help"
 msgstr "Comando: /help"
 
-#: ../src/commandhandler.cpp:212
+#: ../src/commandhandler.cpp:211
 msgid "Command: /help <command>"
 msgstr "Comando: /help <comando>"
 
-#: ../src/gui/widgets/whispertab.cpp:88
+#: ../src/gui/widgets/whispertab.cpp:89
 msgid "Command: /ignore"
 msgstr "Comando: /ignore"
 
-#: ../src/commandhandler.cpp:233
+#: ../src/commandhandler.cpp:232
 msgid "Command: /ignore <player>"
 msgstr "Comando: /ignore <jogador>"
 
@@ -903,7 +937,7 @@ msgstr "Comando: /item"
 msgid "Command: /item <policy>"
 msgstr "Comando> /item <opção>"
 
-#: ../src/commandhandler.cpp:239
+#: ../src/commandhandler.cpp:238
 msgid "Command: /join <channel>"
 msgstr "Comando: /join <canal>"
 
@@ -915,15 +949,15 @@ msgstr "Comando: /kick <nick>"
 msgid "Command: /leave"
 msgstr "Comando: /leave"
 
-#: ../src/commandhandler.cpp:245
+#: ../src/commandhandler.cpp:244
 msgid "Command: /list"
 msgstr "Comando: /list"
 
-#: ../src/commandhandler.cpp:250
+#: ../src/commandhandler.cpp:249
 msgid "Command: /me <message>"
 msgstr "Comando: /me <mensagem>"
 
-#: ../src/commandhandler.cpp:255
+#: ../src/commandhandler.cpp:254
 msgid "Command: /msg <nick> <message>"
 msgstr "Comando: /msg <nick> <mensagem>"
 
@@ -931,19 +965,19 @@ msgstr "Comando: /msg <nick> <mensagem>"
 msgid "Command: /op <nick>"
 msgstr "Comando: /op <nick>"
 
-#: ../src/commandhandler.cpp:284
+#: ../src/commandhandler.cpp:283
 msgid "Command: /party <nick>"
 msgstr "Comando: /party <nick>"
 
-#: ../src/commandhandler.cpp:291
+#: ../src/commandhandler.cpp:290
 msgid "Command: /present"
 msgstr "Comando: /present"
 
-#: ../src/commandhandler.cpp:265
+#: ../src/commandhandler.cpp:264
 msgid "Command: /q <nick>"
 msgstr "Comando: /q <nick>"
 
-#: ../src/commandhandler.cpp:264
+#: ../src/commandhandler.cpp:263
 msgid "Command: /query <nick>"
 msgstr "Comando: /query <nick>"
 
@@ -951,19 +985,19 @@ msgstr "Comando: /query <nick>"
 msgid "Command: /quit"
 msgstr "Comando: /quit"
 
-#: ../src/commandhandler.cpp:301
+#: ../src/commandhandler.cpp:300
 msgid "Command: /record"
 msgstr "Comando: /record"
 
-#: ../src/commandhandler.cpp:298
+#: ../src/commandhandler.cpp:297
 msgid "Command: /record <filename>"
 msgstr "Comando: /record <nome_do_arquivo>"
 
-#: ../src/commandhandler.cpp:312
+#: ../src/commandhandler.cpp:311
 msgid "Command: /toggle"
 msgstr "Comando: /toggle"
 
-#: ../src/commandhandler.cpp:306
+#: ../src/commandhandler.cpp:305
 msgid "Command: /toggle <state>"
 msgstr "Comando: /toggle <estado>"
 
@@ -971,7 +1005,7 @@ msgstr "Comando: /toggle <estado>"
 msgid "Command: /topic <message>"
 msgstr "Comando: /topic <mensagem>"
 
-#: ../src/commandhandler.cpp:317 ../src/gui/widgets/whispertab.cpp:94
+#: ../src/commandhandler.cpp:316 ../src/gui/widgets/whispertab.cpp:95
 msgid "Command: /unignore <player>"
 msgstr "Comando: /unignore <jogador>"
 
@@ -979,19 +1013,19 @@ msgstr "Comando: /unignore <jogador>"
 msgid "Command: /users"
 msgstr "Comando: /users"
 
-#: ../src/commandhandler.cpp:257
+#: ../src/commandhandler.cpp:256
 msgid "Command: /w <nick> <message>"
 msgstr "Comando: /w <nick> <mensagem>"
 
-#: ../src/commandhandler.cpp:323
+#: ../src/commandhandler.cpp:322
 msgid "Command: /where"
 msgstr "Comando: /where"
 
-#: ../src/commandhandler.cpp:256
+#: ../src/commandhandler.cpp:255
 msgid "Command: /whisper <nick> <message>"
 msgstr "Comando: /whisper <nick> <mensagem>"
 
-#: ../src/commandhandler.cpp:328
+#: ../src/commandhandler.cpp:327
 msgid "Command: /who"
 msgstr "Comando: /who"
 
@@ -999,7 +1033,7 @@ msgstr "Comando: /who"
 msgid "Completed"
 msgstr "Concluído"
 
-#: ../src/playerrelations.cpp:312
+#: ../src/playerrelations.cpp:310
 msgid "Completely ignore"
 msgstr "Ignorar completamente"
 
@@ -1008,7 +1042,7 @@ msgstr "Ignorar completamente"
 msgid "Completely ignore %s"
 msgstr "Ignorar completamente %s"
 
-#: ../src/gui/charselectdialog.cpp:69
+#: ../src/gui/charselectdialog.cpp:72
 msgid "Confirm Character Delete"
 msgstr "Confimar exclusão do personagem"
 
@@ -1016,11 +1050,11 @@ msgstr "Confimar exclusão do personagem"
 msgid "Confirm:"
 msgstr "Confirmar:"
 
-#: ../src/gui/trade.cpp:53
+#: ../src/gui/trade.cpp:54
 msgid "Confirmed. Waiting..."
 msgstr "Confirmado. Aguardando..."
 
-#: ../src/keyboardconfig.cpp:184
+#: ../src/keyboardconfig.cpp:183
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -1029,15 +1063,15 @@ msgstr ""
 "Conflito com as teclas \"%s\" e \"%s\" . Resolva o conflito para não "
 "comprometer a jogabilidade."
 
-#: ../src/gui/serverdialog.cpp:233
+#: ../src/gui/serverdialog.cpp:229
 msgid "Connect"
 msgstr "Conectar"
 
-#: ../src/client.cpp:655
+#: ../src/client.cpp:661
 msgid "Connecting to server"
 msgstr "Conectando ao servidor"
 
-#: ../src/client.cpp:803
+#: ../src/client.cpp:838
 msgid "Connecting to the game server"
 msgstr "Conectando ao servidor do jogo"
 
@@ -1049,37 +1083,37 @@ msgstr "Conectando..."
 msgid "Connection to server terminated. "
 msgstr "Conexão com o servidor interrompida."
 
-#: ../src/keyboardconfig.cpp:84
+#: ../src/keyboardconfig.cpp:83
 msgid "Copy Outfit"
 msgstr "Copiar roupas"
 
-#: ../src/gui/statuswindow.cpp:244
+#: ../src/gui/statuswindow.cpp:256
 #, c-format
 msgid "Correction points: %d"
 msgstr "Pontos de correção: %d"
 
-#: ../src/game.cpp:950
+#: ../src/game.cpp:966
 msgid "Could Not Load Map"
 msgstr "Não foi possível carregar o mapa"
 
-#: ../src/net/tmwa/partyhandler.cpp:81
+#: ../src/net/tmwa/partyhandler.cpp:82
 msgid "Could not create party."
 msgstr "Não foi possível criar o grupo."
 
-#: ../src/net/tmwa/guildhandler.cpp:295
+#: ../src/net/tmwa/guildhandler.cpp:296
 msgid "Could not inivte user to guild."
 msgstr "Não foi possível convidar jogador para a guilda."
 
-#: ../src/net/tmwa/specialhandler.cpp:159
+#: ../src/net/tmwa/specialhandler.cpp:157
 msgid "Could not join party!"
 msgstr "Impossivel entrar no grupo!"
 
-#: ../src/net/tmwa/specialhandler.cpp:213
+#: ../src/net/tmwa/specialhandler.cpp:211
 msgid "Could not steal anything..."
 msgstr "Não foi possível roubar nada..."
 
-#: ../src/gui/charcreatedialog.cpp:78 ../src/gui/charselectdialog.cpp:390
-#: ../src/gui/socialwindow.cpp:333
+#: ../src/gui/charcreatedialog.cpp:78 ../src/gui/charselectdialog.cpp:416
+#: ../src/gui/socialwindow.cpp:330
 msgid "Create"
 msgstr "Criar"
 
@@ -1087,33 +1121,33 @@ msgstr "Criar"
 msgid "Create Character"
 msgstr "Criar Personagem"
 
-#: ../src/gui/socialwindow.cpp:276
+#: ../src/gui/socialwindow.cpp:272
 msgid "Create Guild"
 msgstr "Criar guilda"
 
-#: ../src/gui/socialwindow.cpp:277 ../src/gui/socialwindow.cpp:623
+#: ../src/gui/socialwindow.cpp:273 ../src/gui/socialwindow.cpp:619
 msgid "Create Party"
 msgstr "Criar grupo"
 
-#: ../src/gui/socialwindow.cpp:507
+#: ../src/gui/socialwindow.cpp:503
 #, c-format
 msgid "Creating guild called %s."
 msgstr "Criando guilda chamada %s."
 
-#: ../src/gui/socialwindow.cpp:501
+#: ../src/gui/socialwindow.cpp:496
 msgid "Creating guild failed, please choose a shorter name."
 msgstr "Falha ao criar guilda, escolha um nome mais curto."
 
-#: ../src/gui/socialwindow.cpp:529
+#: ../src/gui/socialwindow.cpp:526
 #, c-format
 msgid "Creating party called %s."
 msgstr "Criando grupo chamado %s."
 
-#: ../src/gui/socialwindow.cpp:523
+#: ../src/gui/socialwindow.cpp:519
 msgid "Creating party failed, please choose a shorter name."
 msgstr "Falha ao criar grupo, escolha um nome mais curto."
 
-#: ../src/gui/userpalette.cpp:105
+#: ../src/resources/userpalette.cpp:105
 msgid "Critical Hit"
 msgstr "Golpe crítico"
 
@@ -1122,15 +1156,15 @@ msgstr "Golpe crítico"
 msgid "Cursor: (%d, %d)"
 msgstr "Cursor: (%d, %d)"
 
-#: ../src/gui/serverdialog.cpp:234
+#: ../src/gui/serverdialog.cpp:230
 msgid "Custom Server"
 msgstr "Servidor customizado"
 
-#: ../src/gui/setup_video.cpp:221
+#: ../src/gui/setup_video.cpp:213
 msgid "Custom cursor"
 msgstr "Cursor customizado"
 
-#: ../src/gui/setup_video.cpp:468
+#: ../src/gui/setup_video.cpp:460
 msgid "Deactivating OpenGL"
 msgstr "Desativando OpenGL"
 
@@ -1138,7 +1172,7 @@ msgstr "Desativando OpenGL"
 msgid "Debug"
 msgstr "Depurador"
 
-#: ../src/keyboardconfig.cpp:79
+#: ../src/keyboardconfig.cpp:78
 msgid "Debug Window"
 msgstr "Janela de depuração"
 
@@ -1146,38 +1180,44 @@ msgstr "Janela de depuração"
 msgid "Default"
 msgstr "Padrão"
 
-#: ../src/net/tmwa/generalhandler.cpp:225
+#: ../src/net/tmwa/generalhandler.cpp:238
 msgid "Defense"
 msgstr "Defesa"
 
-#: ../src/resources/itemdb.cpp:54
+#: ../src/resources/itemdb.cpp:311
 #, c-format
 msgid "Defense %+d"
 msgstr "Defesa %+d"
 
-#: ../src/gui/setup_colors.cpp:93
+#: ../src/gui/setup_colors.cpp:94
 msgid "Delay:"
 msgstr "Atraso:"
 
-#: ../src/gui/charselectdialog.cpp:336 ../src/gui/serverdialog.cpp:235
-#: ../src/gui/setup_players.cpp:228
+#: ../src/gui/charselectdialog.cpp:360 ../src/gui/serverdialog.cpp:231
+#: ../src/gui/setup_players.cpp:229
 msgid "Delete"
 msgstr "Excluir"
 
-#: ../src/net/manaserv/stats.cpp:80 ../src/net/tmwa/generalhandler.cpp:221
+#: ../src/net/manaserv/attributes.cpp:192
+#: ../src/net/tmwa/generalhandler.cpp:234
 msgid "Dexterity"
 msgstr "Destreza"
 
-#: ../src/net/manaserv/stats.cpp:82 ../src/net/tmwa/generalhandler.cpp:105
+#: ../src/net/manaserv/attributes.cpp:199
+#, fuzzy, c-format
+msgid "Dexterity %+.1f"
+msgstr "Destreza %+d"
+
+#: ../src/net/tmwa/generalhandler.cpp:106
 #, c-format
 msgid "Dexterity %+d"
 msgstr "Destreza %+d"
 
-#: ../src/net/tmwa/charserverhandler.cpp:263
+#: ../src/net/tmwa/charserverhandler.cpp:274
 msgid "Dexterity:"
 msgstr "Destreza:"
 
-#: ../src/gui/setup_video.cpp:249
+#: ../src/gui/setup_video.cpp:241
 msgid "Disable transparency (Low CPU mode)"
 msgstr "Desabilitar transparência (CPU Modo Econômico)"
 
@@ -1190,8 +1230,8 @@ msgstr "Desprezar %s"
 msgid "Disregarded"
 msgstr "Desconsiderado"
 
-#: ../src/net/manaserv/beinghandler.cpp:315
-#: ../src/net/tmwa/playerhandler.cpp:116
+#: ../src/net/manaserv/beinghandler.cpp:294
+#: ../src/net/tmwa/playerhandler.cpp:108
 msgid "Do you want your possessions identified?"
 msgstr "Você quer uma identificação de suas posses?"
 
@@ -1199,25 +1239,25 @@ msgstr "Você quer uma identificação de suas posses?"
 msgid "Download music"
 msgstr "Baixar música"
 
-#: ../src/gui/serverdialog.cpp:442
+#: ../src/gui/serverdialog.cpp:441
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Baixando lista de servidores...%2.2f%%"
 
-#: ../src/gui/inventorywindow.cpp:325 ../src/gui/popupmenu.cpp:365
+#: ../src/gui/inventorywindow.cpp:365 ../src/gui/popupmenu.cpp:374
 msgid "Drop"
 msgstr "Descartar"
 
-#: ../src/gui/inventorywindow.cpp:99 ../src/gui/inventorywindow.cpp:323
-#: ../src/gui/popupmenu.cpp:363
+#: ../src/gui/inventorywindow.cpp:107 ../src/gui/inventorywindow.cpp:363
+#: ../src/gui/popupmenu.cpp:372
 msgid "Drop..."
 msgstr "Descartar..."
 
-#: ../src/net/tmwa/generalhandler.cpp:145
+#: ../src/net/tmwa/generalhandler.cpp:148
 msgid "Duplicated login."
 msgstr "Login duplicado."
 
-#: ../src/client.cpp:905
+#: ../src/client.cpp:935
 msgid "Email Change"
 msgstr "Mudar email"
 
@@ -1225,7 +1265,7 @@ msgstr "Mudar email"
 msgid "Email address already exists."
 msgstr "Endereço de email já existe."
 
-#: ../src/client.cpp:906
+#: ../src/client.cpp:936
 msgid "Email changed successfully!"
 msgstr "Email modificado com sucesso!"
 
@@ -1233,21 +1273,21 @@ msgstr "Email modificado com sucesso!"
 msgid "Email:"
 msgstr "Email:"
 
-#: ../src/keyboardconfig.cpp:85 ../src/keyboardconfig.cpp:86
-#: ../src/keyboardconfig.cpp:87 ../src/keyboardconfig.cpp:88
-#: ../src/keyboardconfig.cpp:89 ../src/keyboardconfig.cpp:90
-#: ../src/keyboardconfig.cpp:91 ../src/keyboardconfig.cpp:92
-#: ../src/keyboardconfig.cpp:93 ../src/keyboardconfig.cpp:94
-#: ../src/keyboardconfig.cpp:95 ../src/keyboardconfig.cpp:96
+#: ../src/keyboardconfig.cpp:84 ../src/keyboardconfig.cpp:85
+#: ../src/keyboardconfig.cpp:86 ../src/keyboardconfig.cpp:87
+#: ../src/keyboardconfig.cpp:88 ../src/keyboardconfig.cpp:89
+#: ../src/keyboardconfig.cpp:90 ../src/keyboardconfig.cpp:91
+#: ../src/keyboardconfig.cpp:92 ../src/keyboardconfig.cpp:93
+#: ../src/keyboardconfig.cpp:94 ../src/keyboardconfig.cpp:95
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr "Atalho para Emoticon %d"
 
-#: ../src/keyboardconfig.cpp:81
+#: ../src/keyboardconfig.cpp:80
 msgid "Emote Shortcut Window"
 msgstr "Janela de atalho para Emoticons"
 
-#: ../src/net/tmwa/specialhandler.cpp:150
+#: ../src/net/tmwa/specialhandler.cpp:148
 msgid "Emote failed!"
 msgstr "Falha no Emote!"
 
@@ -1255,15 +1295,20 @@ msgstr "Falha no Emote!"
 msgid "Empty address given to Network::connect()!"
 msgstr "Endereço vazio enviado para Network::connect()!"
 
+#: ../src/gui/setup_players.cpp:235
+#, fuzzy
+msgid "Enable Chat log"
+msgstr "Impossibilitado de vender."
+
 #: ../src/gui/setup_joystick.cpp:39
 msgid "Enable joystick"
 msgstr "Habilitar joystick"
 
-#: ../src/keyboardconfig.cpp:56
+#: ../src/keyboardconfig.cpp:55
 msgid "Enable/Disable Trading"
 msgstr "Habilitar/Desabilitar Negociações"
 
-#: ../src/net/manaserv/chathandler.cpp:219
+#: ../src/net/manaserv/chathandler.cpp:229
 msgid "End of channel list."
 msgstr "Fim da lista de canais."
 
@@ -1271,16 +1316,16 @@ msgstr "Fim da lista de canais."
 msgid "Enter the old password first."
 msgstr "Primeiro entre com a antiga senha."
 
-#: ../src/client.cpp:715
+#: ../src/client.cpp:721
 msgid "Entering game world"
 msgstr "Entrando no domínio do jogo"
 
-#: ../src/gui/inventorywindow.cpp:85 ../src/gui/inventorywindow.cpp:315
-#: ../src/gui/popupmenu.cpp:357
+#: ../src/gui/inventorywindow.cpp:92 ../src/gui/inventorywindow.cpp:105
+#: ../src/gui/inventorywindow.cpp:354 ../src/gui/popupmenu.cpp:366
 msgid "Equip"
 msgstr "Equipar"
 
-#: ../src/net/tmwa/playerhandler.cpp:543
+#: ../src/net/tmwa/playerhandler.cpp:506
 msgid "Equip arrows first."
 msgstr "Equipe as flechas primeiro."
 
@@ -1288,63 +1333,58 @@ msgstr "Equipe as flechas primeiro."
 msgid "Equipment"
 msgstr "Equipamento"
 
-#: ../src/keyboardconfig.cpp:73
+#: ../src/keyboardconfig.cpp:72
 msgid "Equipment Window"
 msgstr "Janela de equipamento"
 
-#: ../src/client.cpp:842 ../src/client.cpp:849 ../src/client.cpp:984
-#: ../src/gui/changeemaildialog.cpp:156
-#: ../src/gui/changepassworddialog.cpp:149 ../src/gui/charcreatedialog.cpp:177
-#: ../src/gui/register.cpp:218 ../src/gui/serverdialog.cpp:336
-#: ../src/gui/unregisterdialog.cpp:133 ../src/net/manaserv/charhandler.cpp:167
-#: ../src/net/manaserv/charhandler.cpp:210
-#: ../src/net/tmwa/charserverhandler.cpp:138
-#: ../src/net/tmwa/charserverhandler.cpp:155
+#: ../src/client.cpp:1036 ../src/gui/changeemaildialog.cpp:156
+#: ../src/gui/changepassworddialog.cpp:149 ../src/gui/charcreatedialog.cpp:183
+#: ../src/gui/register.cpp:218 ../src/gui/serverdialog.cpp:323
+#: ../src/gui/unregisterdialog.cpp:133 ../src/net/manaserv/charhandler.cpp:177
+#: ../src/net/manaserv/charhandler.cpp:227
+#: ../src/net/tmwa/charserverhandler.cpp:134
+#: ../src/net/tmwa/charserverhandler.cpp:151
 msgid "Error"
 msgstr "Erro"
 
-#: ../src/net/manaserv/guildhandler.cpp:86
+#: ../src/net/manaserv/guildhandler.cpp:87
 msgid "Error creating guild."
 msgstr "Erro ao criar Guilda."
 
-#: ../src/client.cpp:1278 ../src/client.cpp:1284
+#: ../src/client.cpp:1336 ../src/client.cpp:1342
 msgid "Error creating updates directory!"
 msgstr "Erro ao criar pasta de atualizações!"
 
-#: ../src/net/manaserv/chathandler.cpp:201
+#: ../src/net/manaserv/chathandler.cpp:211
 msgid "Error joining channel."
 msgstr "Erro ao entrar no canal."
 
-#: ../src/gui/serverdialog.cpp:456
+#: ../src/gui/serverdialog.cpp:455
 msgid "Error retreiving server list!"
 msgstr "Erro ao recuperar lista!"
 
-#: ../src/game.cpp:951
+#: ../src/game.cpp:967
 #, c-format
 msgid "Error while loading %s"
 msgstr "Erro ao carregar %s"
 
-#: ../src/gui/statuswindow.cpp:215
-msgid "Exp"
-msgstr "Exp"
-
-#: ../src/gui/userpalette.cpp:101
+#: ../src/resources/userpalette.cpp:101
 msgid "Exp Notification"
 msgstr "Aviso de experiência"
 
-#: ../src/gui/statuswindow.cpp:118
+#: ../src/gui/statuswindow.cpp:122
 msgid "Exp:"
 msgstr "Exp:"
 
-#: ../src/net/tmwa/gui/partytab.cpp:170 ../src/net/tmwa/partyhandler.cpp:183
+#: ../src/net/tmwa/gui/partytab.cpp:170 ../src/net/tmwa/partyhandler.cpp:178
 msgid "Experience sharing disabled."
 msgstr "Compartilhamento de experiência desabilitado."
 
-#: ../src/net/tmwa/gui/partytab.cpp:167 ../src/net/tmwa/partyhandler.cpp:177
+#: ../src/net/tmwa/gui/partytab.cpp:167 ../src/net/tmwa/partyhandler.cpp:172
 msgid "Experience sharing enabled."
 msgstr "Compartilhamento de experiência habilitado."
 
-#: ../src/net/tmwa/gui/partytab.cpp:173 ../src/net/tmwa/partyhandler.cpp:189
+#: ../src/net/tmwa/gui/partytab.cpp:173 ../src/net/tmwa/partyhandler.cpp:184
 msgid "Experience sharing not possible."
 msgstr "Não é possível compartilhar experiência."
 
@@ -1352,7 +1392,7 @@ msgstr "Não é possível compartilhar experiência."
 msgid "Experience sharing unknown."
 msgstr "Compartilhamento de experiência desconhecido."
 
-#: ../src/gui/setup_video.cpp:238
+#: ../src/gui/setup_video.cpp:230
 msgid "FPS limit:"
 msgstr "Limite FPS:"
 
@@ -1368,24 +1408,24 @@ msgstr "Erro ao adicionar item. Parceiro de negócios não tem slots livres."
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr "Erro ao adicionar item. Parceiro de negócios carregando muito peso."
 
-#: ../src/gui/trade.cpp:273
+#: ../src/gui/trade.cpp:262
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Falha ao adicionar item. Você não pode duplicar este tipo de item na janela."
 
-#: ../src/net/tmwa/charserverhandler.cpp:138
+#: ../src/net/tmwa/charserverhandler.cpp:134
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr "Erro ao criar personagem. Provavelmente o nome já está sendo usado."
 
-#: ../src/net/tmwa/charserverhandler.cpp:155
+#: ../src/net/tmwa/charserverhandler.cpp:151
 msgid "Failed to delete character."
 msgstr "Falha ao deletar personagem."
 
-#: ../src/net/manaserv/guildhandler.cpp:208
+#: ../src/net/manaserv/guildhandler.cpp:209
 msgid "Failed to promote member."
 msgstr "Erro ao promover o membro."
 
-#: ../src/gui/npcpostdialog.cpp:96
+#: ../src/gui/npcpostdialog.cpp:99
 msgid "Failed to send as sender or letter invalid."
 msgstr "Falha ao enviar como remetente ou a carta é inválida."
 
@@ -1393,24 +1433,24 @@ msgstr "Falha ao enviar como remetente ou a carta é inválida."
 msgid "Failed to start recording."
 msgstr "Falha ao iniciar gravação."
 
-#: ../src/gui/setup_video.cpp:434
+#: ../src/gui/setup_video.cpp:426
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 "Falha ao mudar para o modo tela cheia e falha na restauração do modo "
 "anterior!"
 
-#: ../src/gui/setup_video.cpp:428
+#: ../src/gui/setup_video.cpp:420
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 "Falha ao mudar para o modo janela e falha na restauração do modo anterior!"
 
-#: ../src/net/tmwa/inventoryhandler.cpp:290
+#: ../src/net/tmwa/inventoryhandler.cpp:287
 msgid "Failed to use item."
 msgstr "Falha ao usar item."
 
-#: ../src/client.cpp:927
+#: ../src/client.cpp:956
 msgid "Farewell, come back any time..."
 msgstr "Tchau, volte sempre..."
 
@@ -1418,7 +1458,7 @@ msgstr "Tchau, volte sempre..."
 msgid "Female"
 msgstr "Mulher"
 
-#: ../src/keyboardconfig.cpp:57
+#: ../src/keyboardconfig.cpp:56
 msgid "Find Path to Mouse"
 msgstr "Encontrar rota para o mouse"
 
@@ -1426,19 +1466,11 @@ msgstr "Encontrar rota para o mouse"
 msgid "Finishing recording."
 msgstr "Finalizando gravação."
 
-#: ../src/playerrelations.cpp:379
-msgid "Floating '...' bubble"
-msgstr "Bolha '...' flutuante"
-
-#: ../src/playerrelations.cpp:382
-msgid "Floating bubble"
-msgstr "Bolha Flutuante"
-
-#: ../src/gui/setup_video.cpp:264
+#: ../src/gui/setup_video.cpp:256
 msgid "Font size"
 msgstr "Tamanho da fonte"
 
-#: ../src/commandhandler.cpp:205
+#: ../src/commandhandler.cpp:204
 msgid "For more information, type /help <command>."
 msgstr "Para mais informações, digite /help <comando>."
 
@@ -1446,45 +1478,45 @@ msgstr "Para mais informações, digite /help <comando>."
 msgid "Friend"
 msgstr "Amigo"
 
-#: ../src/gui/setup_video.cpp:219
+#: ../src/gui/setup_video.cpp:211
 msgid "Full screen"
 msgstr "Tela cheia"
 
-#: ../src/gui/userpalette.cpp:94
+#: ../src/resources/userpalette.cpp:94
 msgid "GM Names"
 msgstr "Nomes dos GMs"
 
-#: ../src/net/tmwa/gamehandler.cpp:101
+#: ../src/net/tmwa/gamehandler.cpp:102
 msgid "Game"
 msgstr "Jogo"
 
-#: ../src/net/manaserv/beinghandler.cpp:309
-#: ../src/net/tmwa/playerhandler.cpp:108
+#: ../src/net/manaserv/beinghandler.cpp:288
+#: ../src/net/tmwa/playerhandler.cpp:100
 msgid "Game Over!"
 msgstr "Fim de jogo!"
 
-#: ../src/game.cpp:169
+#: ../src/game.cpp:181
 msgid "General"
 msgstr "Geral"
 
-#: ../src/gui/widgets/chattab.cpp:126
+#: ../src/gui/widgets/chattab.cpp:127
 #, c-format
 msgid "Global announcement from %s:"
 msgstr "Anúncio geral de %s:"
 
-#: ../src/gui/widgets/chattab.cpp:120
+#: ../src/gui/widgets/chattab.cpp:121
 msgid "Global announcement:"
 msgstr "Anúncio geral:"
 
-#: ../src/net/tmwa/generalhandler.cpp:206
+#: ../src/net/tmwa/generalhandler.cpp:209
 msgid "Got disconnected from server!"
 msgstr "Você foi desconectado do servidor!"
 
-#: ../src/gui/setup_colors.cpp:123
+#: ../src/gui/setup_colors.cpp:124
 msgid "Green:"
 msgstr "Verde:"
 
-#: ../src/gui/setup_video.cpp:261
+#: ../src/gui/setup_video.cpp:253
 msgid "Gui opacity"
 msgstr "Opacidade"
 
@@ -1492,24 +1524,24 @@ msgstr "Opacidade"
 msgid "Guild"
 msgstr "Guilda"
 
-#: ../src/gui/socialwindow.cpp:143
+#: ../src/gui/socialwindow.cpp:139
 #, c-format
 msgid "Guild %s quit requested."
 msgstr "Saída da Guilda %s requisitada."
 
-#: ../src/gui/userpalette.cpp:98
+#: ../src/resources/userpalette.cpp:98
 msgid "Guild Members"
 msgstr "Membros da guilda"
 
-#: ../src/gui/socialwindow.cpp:543
+#: ../src/gui/socialwindow.cpp:540
 msgid "Guild Name"
 msgstr "Nome da guilda"
 
-#: ../src/net/manaserv/guildhandler.cpp:81
+#: ../src/net/manaserv/guildhandler.cpp:82
 msgid "Guild created."
 msgstr "Guilda criada."
 
-#: ../src/net/tmwa/guildhandler.cpp:392
+#: ../src/net/tmwa/guildhandler.cpp:393
 msgid "Guild creation isn't supported yet."
 msgstr "A criação de guildas ainda não é suportada."
 
@@ -1517,16 +1549,12 @@ msgstr "A criação de guildas ainda não é suportada."
 msgid "Guild name is missing."
 msgstr "Falta o nome da guilda."
 
-#: ../src/gui/statuswindow.cpp:203
-msgid "HP"
-msgstr "HP"
-
-#: ../src/resources/itemdb.cpp:55
+#: ../src/resources/itemdb.cpp:312
 #, c-format
 msgid "HP %+d"
 msgstr "HP %+d"
 
-#: ../src/gui/statuswindow.cpp:113
+#: ../src/gui/statuswindow.cpp:117
 msgid "HP:"
 msgstr "HP:"
 
@@ -1542,34 +1570,34 @@ msgstr "Estilo do Cabelo:"
 msgid "Help"
 msgstr "Ajuda"
 
-#: ../src/keyboardconfig.cpp:70
+#: ../src/keyboardconfig.cpp:69
 msgid "Help Window"
 msgstr "Janela de Ajuda"
 
-#: ../src/keyboardconfig.cpp:53
+#: ../src/keyboardconfig.cpp:52
 msgid "Hide Windows"
 msgstr "Esconder janelas"
 
-#: ../src/net/tmwa/specialhandler.cpp:201
+#: ../src/net/tmwa/specialhandler.cpp:199
 msgid "Huh? What's that?"
 msgstr "Hã? O que é isso?"
 
-#: ../src/net/manaserv/beinghandler.cpp:314
-#: ../src/net/tmwa/playerhandler.cpp:114
+#: ../src/net/manaserv/beinghandler.cpp:293
+#: ../src/net/tmwa/playerhandler.cpp:106
 msgid "I guess this did not run too well."
 msgstr "Eu acho que as coisas não correram tão bem."
 
-#: ../src/commandhandler.cpp:241
+#: ../src/commandhandler.cpp:240
 msgid "If <channel> doesn't exist, it's created."
 msgstr "Se o <canal> não existe, ele será criado."
 
-#: ../src/commandhandler.cpp:259 ../src/commandhandler.cpp:286
+#: ../src/commandhandler.cpp:258 ../src/commandhandler.cpp:285
 #: ../src/gui/widgets/channeltab.cpp:82 ../src/gui/widgets/channeltab.cpp:91
 #: ../src/net/tmwa/gui/guildtab.cpp:75 ../src/net/tmwa/gui/partytab.cpp:75
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr "Se <nick> possuir espaços, coloque entre aspas (\")."
 
-#: ../src/net/tmwa/playerhandler.cpp:133
+#: ../src/net/tmwa/playerhandler.cpp:125
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr "Se não fosse tão animado, estaria comendo grama pela raiz."
 
@@ -1582,11 +1610,11 @@ msgstr "Se você for a última pessoa no canal, ele será deletado."
 msgid "Ignore %s"
 msgstr "Ignorar %s"
 
-#: ../src/keyboardconfig.cpp:104
+#: ../src/keyboardconfig.cpp:103
 msgid "Ignore input 1"
 msgstr "Ignorar input 1"
 
-#: ../src/keyboardconfig.cpp:105
+#: ../src/keyboardconfig.cpp:104
 msgid "Ignore input 2"
 msgstr "Ignorar input 2"
 
@@ -1594,61 +1622,77 @@ msgstr "Ignorar input 2"
 msgid "Ignored"
 msgstr "Ignorado"
 
-#: ../src/game.cpp:713
+#: ../src/game.cpp:733
 msgid "Ignoring incoming trade requests"
 msgstr "Ignorando propostas de negócios"
 
-#: ../src/net/manaserv/tradehandler.cpp:98
+#: ../src/net/manaserv/tradehandler.cpp:97
 msgid "Ignoring incoming trade requests."
 msgstr "Ignorando propostas de negócios."
 
-#: ../src/net/manaserv/charhandler.cpp:193
-#: ../src/net/tmwa/charserverhandler.cpp:150
+#: ../src/net/manaserv/charhandler.cpp:210
+#: ../src/net/tmwa/charserverhandler.cpp:146
 msgid "Info"
 msgstr "Informações"
 
-#: ../src/net/tmwa/playerhandler.cpp:109
+#: ../src/net/tmwa/playerhandler.cpp:101
 msgid "Insert coin to continue."
 msgstr "Insira uma moeda para continuar."
 
-#: ../src/net/tmwa/specialhandler.cpp:174
+#: ../src/net/tmwa/specialhandler.cpp:172
 msgid "Insufficient HP!"
 msgstr "HP insuficiente!"
 
-#: ../src/net/tmwa/specialhandler.cpp:177
+#: ../src/net/tmwa/specialhandler.cpp:175
 msgid "Insufficient SP!"
 msgstr "SP insuficiente!"
 
-#: ../src/net/manaserv/stats.cpp:104 ../src/net/tmwa/generalhandler.cpp:220
+#: ../src/net/manaserv/attributes.cpp:218
+#: ../src/net/tmwa/generalhandler.cpp:233
 msgid "Intelligence"
 msgstr "Inteligência"
 
-#: ../src/net/manaserv/stats.cpp:106 ../src/net/tmwa/generalhandler.cpp:104
+#: ../src/net/manaserv/attributes.cpp:225
+#, fuzzy, c-format
+msgid "Intelligence %+.1f"
+msgstr "Inteligência %+d"
+
+#: ../src/net/tmwa/generalhandler.cpp:105
 #, c-format
 msgid "Intelligence %+d"
 msgstr "Inteligência %+d"
 
-#: ../src/net/tmwa/charserverhandler.cpp:262
+#: ../src/net/tmwa/charserverhandler.cpp:273
 msgid "Intelligence:"
 msgstr "Inteligência:"
 
-#: ../src/net/manaserv/charhandler.cpp:152
+#: ../src/net/manaserv/charhandler.cpp:267
+#, fuzzy
+msgid "Invalid character slot selected."
+msgstr "Personagem deletado."
+
+#: ../src/net/manaserv/charhandler.cpp:156
 msgid "Invalid gender."
 msgstr "Gênero inválido."
 
-#: ../src/net/manaserv/charhandler.cpp:149
+#: ../src/net/manaserv/charhandler.cpp:153
 msgid "Invalid hair color."
 msgstr "Cor inválida."
 
-#: ../src/net/manaserv/charhandler.cpp:146
+#: ../src/net/manaserv/charhandler.cpp:150
 msgid "Invalid hairstyle."
 msgstr "Estilo inválido."
 
-#: ../src/net/manaserv/charhandler.cpp:140
+#: ../src/net/manaserv/charhandler.cpp:144
 msgid "Invalid name."
 msgstr "Nome inválido."
 
-#: ../src/client.cpp:1244
+#: ../src/net/manaserv/charhandler.cpp:171
+#, fuzzy
+msgid "Invalid slot number."
+msgstr "Nome inválido."
+
+#: ../src/client.cpp:1302
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Host de atualização inválido: %s"
@@ -1657,15 +1701,15 @@ msgstr "Host de atualização inválido: %s"
 msgid "Inventory"
 msgstr "Inventário"
 
-#: ../src/keyboardconfig.cpp:72
+#: ../src/keyboardconfig.cpp:71
 msgid "Inventory Window"
 msgstr "Janela de inventário"
 
-#: ../src/localplayer.cpp:1254
+#: ../src/localplayer.cpp:898
 msgid "Inventory is full."
 msgstr "O inventário está cheio."
 
-#: ../src/gui/socialwindow.cpp:334
+#: ../src/gui/socialwindow.cpp:331
 msgid "Invite"
 msgstr "Convidar"
 
@@ -1679,61 +1723,61 @@ msgstr "Convidar %s para a sua guilda"
 msgid "Invite %s to join your party"
 msgstr "Convidar %s para o seu grupo"
 
-#: ../src/net/manaserv/guildhandler.cpp:96
+#: ../src/net/manaserv/guildhandler.cpp:97
 msgid "Invite sent."
 msgstr "Convite enviado."
 
-#: ../src/gui/socialwindow.cpp:128
+#: ../src/gui/socialwindow.cpp:126
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr "Convidou o jogador %s para a guilda %s."
 
-#: ../src/net/tmwa/partyhandler.cpp:335
+#: ../src/gui/socialwindow.cpp:207 ../src/net/tmwa/partyhandler.cpp:330
 #, c-format
 msgid "Invited user %s to party."
 msgstr "Convidou usuário %s para o grupo."
 
-#: ../src/net/tmwa/partyhandler.cpp:340
+#: ../src/net/tmwa/partyhandler.cpp:335
 #, c-format
 msgid "Inviting failed, because you can't see a player called %s."
 msgstr ""
 "Não foi possível fazer o convite, pois você não vê um jogador chamado %s."
 
-#: ../src/keyboardconfig.cpp:58 ../src/keyboardconfig.cpp:59
-#: ../src/keyboardconfig.cpp:60 ../src/keyboardconfig.cpp:61
-#: ../src/keyboardconfig.cpp:62 ../src/keyboardconfig.cpp:63
-#: ../src/keyboardconfig.cpp:64 ../src/keyboardconfig.cpp:65
-#: ../src/keyboardconfig.cpp:66 ../src/keyboardconfig.cpp:67
-#: ../src/keyboardconfig.cpp:68 ../src/keyboardconfig.cpp:69
+#: ../src/keyboardconfig.cpp:57 ../src/keyboardconfig.cpp:58
+#: ../src/keyboardconfig.cpp:59 ../src/keyboardconfig.cpp:60
+#: ../src/keyboardconfig.cpp:61 ../src/keyboardconfig.cpp:62
+#: ../src/keyboardconfig.cpp:63 ../src/keyboardconfig.cpp:64
+#: ../src/keyboardconfig.cpp:65 ../src/keyboardconfig.cpp:66
+#: ../src/keyboardconfig.cpp:67 ../src/keyboardconfig.cpp:68
 #, c-format
 msgid "Item Shortcut %d"
 msgstr "Atalho para item %d"
 
-#: ../src/keyboardconfig.cpp:77
+#: ../src/keyboardconfig.cpp:76
 msgid "Item Shortcut Window"
 msgstr "Janela de atalhos para itens"
 
-#: ../src/localplayer.cpp:1257
+#: ../src/localplayer.cpp:901
 msgid "Item belongs to someone else."
 msgstr "Este item pertence a outra pessoa."
 
-#: ../src/localplayer.cpp:1253
+#: ../src/localplayer.cpp:897
 msgid "Item is too far away"
 msgstr "Este item está muito longe."
 
-#: ../src/localplayer.cpp:1252
+#: ../src/localplayer.cpp:896
 msgid "Item is too heavy."
 msgstr "Este item é muito pesado."
 
-#: ../src/net/tmwa/gui/partytab.cpp:135 ../src/net/tmwa/partyhandler.cpp:207
+#: ../src/net/tmwa/gui/partytab.cpp:135 ../src/net/tmwa/partyhandler.cpp:202
 msgid "Item sharing disabled."
 msgstr "Compartilhamento de itens desabilitado."
 
-#: ../src/net/tmwa/gui/partytab.cpp:132 ../src/net/tmwa/partyhandler.cpp:201
+#: ../src/net/tmwa/gui/partytab.cpp:132 ../src/net/tmwa/partyhandler.cpp:196
 msgid "Item sharing enabled."
 msgstr "Compartilhamento de itens habilitado."
 
-#: ../src/net/tmwa/gui/partytab.cpp:138 ../src/net/tmwa/partyhandler.cpp:213
+#: ../src/net/tmwa/gui/partytab.cpp:138 ../src/net/tmwa/partyhandler.cpp:208
 msgid "Item sharing not possible."
 msgstr "Não é possível compartilhar itens."
 
@@ -1741,20 +1785,21 @@ msgstr "Não é possível compartilhar itens."
 msgid "Item sharing unknown."
 msgstr "Compartilhamento de itens desconhecido."
 
-#: ../src/gui/statuswindow.cpp:234
-msgid "Job"
-msgstr "Trabalho"
+#: ../src/client.cpp:785
+#, fuzzy
+msgid "ItemDB: Error while loading "
+msgstr "Erro ao carregar %s"
 
-#: ../src/gui/statuswindow.cpp:142
+#: ../src/gui/statuswindow.cpp:159
 msgid "Job:"
 msgstr "Trabalho:"
 
-#: ../src/gui/statuswindow.cpp:141 ../src/gui/statuswindow.cpp:228
+#: ../src/gui/statuswindow.cpp:158 ../src/gui/statuswindow.cpp:276
 #, c-format
 msgid "Job: %d"
 msgstr "Trabalho: %d"
 
-#: ../src/net/manaserv/partyhandler.cpp:88
+#: ../src/net/manaserv/partyhandler.cpp:87
 msgid "Joined party."
 msgstr "Entrou para o grupo."
 
@@ -1770,7 +1815,7 @@ msgstr "Conflitos de teclas detectado."
 msgid "Keyboard"
 msgstr "Teclado"
 
-#: ../src/net/tmwa/adminhandler.cpp:65
+#: ../src/net/tmwa/adminhandler.cpp:64
 msgid "Kick failed!"
 msgstr "Erro na expulsão!"
 
@@ -1782,56 +1827,53 @@ msgstr "Expulsar monstro"
 msgid "Kick player"
 msgstr "Expulsar jogador"
 
-#: ../src/net/tmwa/adminhandler.cpp:67
+#: ../src/net/tmwa/adminhandler.cpp:66
 msgid "Kick succeeded!"
 msgstr "Expulsão bem sucedida!"
 
-#: ../src/gui/setup_video.cpp:137
+#: ../src/gui/setup_video.cpp:131
 msgid "Large"
 msgstr "Grande"
 
-#: ../src/gui/socialwindow.cpp:335
+#: ../src/gui/socialwindow.cpp:332
 msgid "Leave"
 msgstr "Sair"
 
-#: ../src/gui/socialwindow.cpp:167
+#: ../src/gui/socialwindow.cpp:163
 msgid "Leave Guild?"
 msgstr "Sair da guilda?"
 
-#: ../src/gui/socialwindow.cpp:246
+#: ../src/gui/socialwindow.cpp:242
 msgid "Leave Party?"
 msgstr "Sair do grupo?"
 
-#: ../src/gui/statuswindow.cpp:257
-msgid "Level"
-msgstr "Nível"
-
-#: ../src/gui/statuswindow.cpp:109 ../src/gui/statuswindow.cpp:253
+#: ../src/gui/statuswindow.cpp:113 ../src/gui/statuswindow.cpp:215
+#: ../src/gui/statuswindow.cpp:263
 #, c-format
 msgid "Level: %d"
 msgstr "Nível: %d"
 
-#: ../src/net/manaserv/chathandler.cpp:207
+#: ../src/net/manaserv/chathandler.cpp:217
 msgid "Listing channels."
 msgstr "Listando canais."
 
-#: ../src/gui/userpalette.cpp:109
+#: ../src/resources/userpalette.cpp:109
 msgid "Local Player Critical Hit"
 msgstr "Golpe Crítico do Jogador"
 
-#: ../src/gui/userpalette.cpp:107
+#: ../src/resources/userpalette.cpp:107
 msgid "Local Player Hits Monster"
 msgstr "Jogador Acerta Monstro"
 
-#: ../src/gui/userpalette.cpp:111
+#: ../src/resources/userpalette.cpp:111
 msgid "Local Player Miss"
 msgstr "Jogador Erra o Golpe"
 
-#: ../src/gui/setup_video.cpp:228
+#: ../src/gui/setup_video.cpp:220
 msgid "Log NPC dialogue"
 msgstr "Log diálogos com NPC"
 
-#: ../src/client.cpp:682
+#: ../src/client.cpp:688
 msgid "Logging in"
 msgstr "Efetuando login"
 
@@ -1843,56 +1885,52 @@ msgstr "Login"
 msgid "Login attempt too soon after previous attempt."
 msgstr "Tentativa de login muito próxima da última tentativa."
 
-#: ../src/net/manaserv/beinghandler.cpp:318
-#: ../src/net/tmwa/playerhandler.cpp:122
+#: ../src/net/manaserv/beinghandler.cpp:297
+#: ../src/net/tmwa/playerhandler.cpp:114
 msgid "Looks like you got your head handed to you."
 msgstr "Parece que te ofereceram sua própria cabeça."
 
-#: ../src/net/tmwa/generalhandler.cpp:222
+#: ../src/net/tmwa/generalhandler.cpp:235
 msgid "Luck"
 msgstr "Sorte"
 
-#: ../src/net/tmwa/generalhandler.cpp:106
+#: ../src/net/tmwa/generalhandler.cpp:107
 #, c-format
 msgid "Luck %+d"
 msgstr "Sorte %+d"
 
-#: ../src/net/tmwa/charserverhandler.cpp:264
+#: ../src/net/tmwa/charserverhandler.cpp:275
 msgid "Luck:"
 msgstr "Sorte:"
 
-#: ../src/gui/skilldialog.cpp:455
+#: ../src/gui/skilldialog.cpp:470
 #, c-format
 msgid "Lvl: %d"
 msgstr "Nível: %d"
 
-#: ../src/gui/skilldialog.cpp:444
+#: ../src/gui/skilldialog.cpp:459
 #, c-format
 msgid "Lvl: %d (%+d)"
 msgstr "Nível: %d (%+d)"
 
-#: ../src/net/tmwa/generalhandler.cpp:226
+#: ../src/net/tmwa/generalhandler.cpp:239
 msgid "M.Attack"
 msgstr "Ataque Mágico"
 
-#: ../src/net/tmwa/generalhandler.cpp:227
+#: ../src/net/tmwa/generalhandler.cpp:240
 msgid "M.Defense"
 msgstr "Defesa Mágica"
 
-#: ../src/gui/statuswindow.cpp:209
-msgid "MP"
-msgstr "MP"
-
-#: ../src/resources/itemdb.cpp:56
+#: ../src/resources/itemdb.cpp:313
 #, c-format
 msgid "MP %+d"
 msgstr "MP %+d"
 
-#: ../src/gui/statuswindow.cpp:123
+#: ../src/gui/statuswindow.cpp:130
 msgid "MP:"
 msgstr "MP:"
 
-#: ../src/net/tmwa/chathandler.cpp:190
+#: ../src/net/tmwa/chathandler.cpp:230
 msgid "MVP player."
 msgstr "Jogador VIP."
 
@@ -1900,7 +1938,7 @@ msgstr "Jogador VIP."
 msgid "Male"
 msgstr "Homem"
 
-#: ../src/gui/minimap.cpp:46 ../src/gui/minimap.cpp:87
+#: ../src/gui/minimap.cpp:45 ../src/gui/minimap.cpp:86
 msgid "Map"
 msgstr "Mapa"
 
@@ -1910,40 +1948,40 @@ msgid "Map: %s"
 msgstr "Mapa: %s"
 
 #: ../src/gui/buy.cpp:80 ../src/gui/sell.cpp:78
-#: ../src/gui/statuswindow.cpp:354 ../src/gui/statuswindow.cpp:429
-#: ../src/gui/statuswindow.cpp:463
+#: ../src/gui/statuswindow.cpp:385 ../src/gui/statuswindow.cpp:463
+#: ../src/gui/statuswindow.cpp:497
 msgid "Max"
 msgstr "Máximo"
 
-#: ../src/gui/setup_video.cpp:136
+#: ../src/gui/setup_video.cpp:130
 msgid "Medium"
 msgstr "Média"
 
-#: ../src/gui/socialwindow.cpp:157
+#: ../src/gui/socialwindow.cpp:153
 msgid "Member Invite to Guild"
 msgstr "Convite de membros para a Guilda."
 
-#: ../src/gui/socialwindow.cpp:236
+#: ../src/gui/socialwindow.cpp:232
 msgid "Member Invite to Party"
 msgstr "Convite de membros para o grupo"
 
-#: ../src/net/manaserv/guildhandler.cpp:203
+#: ../src/net/manaserv/guildhandler.cpp:204
 msgid "Member was promoted successfully."
 msgstr "Membro foi promovido com sucesso."
 
-#: ../src/net/tmwa/playerhandler.cpp:256 ../src/net/tmwa/playerhandler.cpp:317
+#: ../src/net/tmwa/playerhandler.cpp:253 ../src/net/tmwa/playerhandler.cpp:293
 msgid "Message"
 msgstr "Mensagem"
 
-#: ../src/commandhandler.cpp:480
+#: ../src/commandhandler.cpp:479
 msgid "Message closes chat."
 msgstr "A mensagem fecha o chat."
 
-#: ../src/commandhandler.cpp:493
+#: ../src/commandhandler.cpp:492
 msgid "Message now closes chat."
 msgstr "Agora a mensagem fecha o chat."
 
-#: ../src/keyboardconfig.cpp:75
+#: ../src/keyboardconfig.cpp:74
 msgid "Minimap Window"
 msgstr "Janela de Minimapa"
 
@@ -1952,40 +1990,37 @@ msgstr "Janela de Minimapa"
 msgid "Minimap: %s"
 msgstr "Minimapa: %s"
 
-#: ../src/gui/userpalette.cpp:112
+#: ../src/resources/userpalette.cpp:112
 msgid "Misses"
 msgstr "Golpes errados"
 
-#: ../src/gui/statuswindow.cpp:224
-msgid "Money"
-msgstr "Dinheiro"
-
-#: ../src/gui/statuswindow.cpp:110 ../src/gui/statuswindow.cpp:220
+#: ../src/gui/statuswindow.cpp:114 ../src/gui/statuswindow.cpp:208
+#: ../src/gui/statuswindow.cpp:240
 #, c-format
 msgid "Money: %s"
 msgstr "Dinheiro: %s"
 
-#: ../src/gui/userpalette.cpp:104
+#: ../src/resources/userpalette.cpp:104
 msgid "Monster Hits Player"
 msgstr "Monstro Acerta Jogador"
 
-#: ../src/gui/userpalette.cpp:96
+#: ../src/resources/userpalette.cpp:96
 msgid "Monsters"
 msgstr "Monstros"
 
-#: ../src/keyboardconfig.cpp:41
+#: ../src/keyboardconfig.cpp:40
 msgid "Move Down"
 msgstr "Mover para Baixo"
 
-#: ../src/keyboardconfig.cpp:42
+#: ../src/keyboardconfig.cpp:41
 msgid "Move Left"
 msgstr "Esquerda"
 
-#: ../src/keyboardconfig.cpp:43
+#: ../src/keyboardconfig.cpp:42
 msgid "Move Right"
 msgstr "Direita"
 
-#: ../src/keyboardconfig.cpp:40
+#: ../src/keyboardconfig.cpp:39
 msgid "Move Up"
 msgstr "Mover para Cima"
 
@@ -1998,11 +2033,11 @@ msgstr "Volume da Música"
 msgid "Music: %s"
 msgstr "Música: %s"
 
-#: ../src/gui/npcdialog.cpp:53 ../src/gui/npcpostdialog.cpp:41
+#: ../src/gui/npcdialog.cpp:73 ../src/gui/npcpostdialog.cpp:41
 msgid "NPC"
 msgstr "NPC"
 
-#: ../src/gui/userpalette.cpp:95
+#: ../src/resources/userpalette.cpp:95
 msgid "NPCs"
 msgstr "NPCs"
 
@@ -2020,7 +2055,7 @@ msgstr "Nome:"
 msgid "Name: %s"
 msgstr "Nome: %s"
 
-#: ../src/gui/ministatus.cpp:157
+#: ../src/gui/ministatus.cpp:236
 msgid "Need"
 msgstr "Precisa"
 
@@ -2032,7 +2067,7 @@ msgstr "É preciso um usuário para expulsar!"
 msgid "Need a user to op!"
 msgstr "É preciso um usuário para dar op!"
 
-#: ../src/game.cpp:372
+#: ../src/game.cpp:386
 msgid "Network Error"
 msgstr "Erro de conexão"
 
@@ -2052,11 +2087,11 @@ msgstr "Nova senha incorreta."
 msgid "New password too short."
 msgstr "Nova senha é muito curta."
 
-#: ../src/gui/npcdialog.cpp:46
+#: ../src/gui/npcdialog.cpp:49
 msgid "Next"
 msgstr "Próximo"
 
-#: ../src/keyboardconfig.cpp:101
+#: ../src/keyboardconfig.cpp:100
 msgid "Next Chat Tab"
 msgstr "Próxima aba de chat"
 
@@ -2064,28 +2099,28 @@ msgstr "Próxima aba de chat"
 msgid "No"
 msgstr "Não"
 
-#: ../src/commandhandler.cpp:408
+#: ../src/commandhandler.cpp:407
 msgid "No <nick> was given."
 msgstr "<nick> não foi informado."
 
-#: ../src/net/manaserv/charhandler.cpp:137
+#: ../src/net/manaserv/charhandler.cpp:141
 msgid "No empty slot."
 msgstr "Sem espaço"
 
-#: ../src/net/manaserv/charhandler.cpp:242
+#: ../src/net/manaserv/charhandler.cpp:264
 msgid "No gameservers are available."
 msgstr "Não há servidores disponíveis."
 
-#: ../src/net/tmwa/generalhandler.cpp:132
+#: ../src/net/tmwa/generalhandler.cpp:135
 msgid "No servers available."
 msgstr "Servidores indisponíveis."
 
-#: ../src/gui/setup_video.cpp:163
+#: ../src/gui/setup_video.cpp:157
 msgid "No text"
 msgstr "Sem texto"
 
-#: ../src/net/manaserv/beinghandler.cpp:310
-#: ../src/net/tmwa/playerhandler.cpp:110
+#: ../src/net/manaserv/beinghandler.cpp:289
+#: ../src/net/tmwa/playerhandler.cpp:102
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
@@ -2093,8 +2128,8 @@ msgstr ""
 "Não, criança. Seu personagem não morreu de verdade. Ele... err... foi para "
 "um lugar melhor."
 
-#: ../src/gui/setup_video.cpp:279 ../src/gui/setup_video.cpp:535
-#: ../src/gui/setup_video.cpp:665
+#: ../src/gui/setup_video.cpp:271 ../src/gui/setup_video.cpp:526
+#: ../src/gui/setup_video.cpp:656
 msgid "None"
 msgstr "Nenhum"
 
@@ -2102,12 +2137,12 @@ msgstr "Nenhum"
 msgid "Not currently recording."
 msgstr "Não está gravando no momento."
 
-#: ../src/net/manaserv/charhandler.cpp:134
-#: ../src/net/manaserv/charhandler.cpp:202
+#: ../src/net/manaserv/charhandler.cpp:138
+#: ../src/net/manaserv/charhandler.cpp:219
 msgid "Not logged in."
 msgstr "Não está conectado."
 
-#: ../src/net/tmwa/buysellhandler.cpp:110
+#: ../src/net/tmwa/buysellhandler.cpp:109
 msgid "Nothing to sell."
 msgstr "Nada para vender."
 
@@ -2115,9 +2150,9 @@ msgstr "Nada para vender."
 msgid "Notice"
 msgstr "Anúncio"
 
-#: ../src/gui/itemamount.cpp:103 ../src/gui/okdialog.cpp:42
+#: ../src/gui/itemamount.cpp:113 ../src/gui/okdialog.cpp:42
 #: ../src/gui/quitdialog.cpp:46 ../src/gui/textdialog.cpp:39
-#: ../src/gui/trade.cpp:71 ../src/gui/trade.cpp:73
+#: ../src/gui/trade.cpp:72 ../src/gui/trade.cpp:74
 msgid "OK"
 msgstr "OK"
 
@@ -2130,16 +2165,12 @@ msgstr "Antigo endereço de email incorreto."
 msgid "Old password incorrect."
 msgstr "Senha antiga incorreta."
 
-#: ../src/net/manaserv/charhandler.cpp:161
-msgid "One stat is zero."
-msgstr "Um atributo é zero."
-
-#: ../src/net/tmwa/gamehandler.cpp:87
+#: ../src/net/tmwa/gamehandler.cpp:89
 #, c-format
 msgid "Online users: %d"
 msgstr "Jogadores online: %d"
 
-#: ../src/gui/setup_video.cpp:220
+#: ../src/gui/setup_video.cpp:212
 msgid "OpenGL"
 msgstr "OpenGL"
 
@@ -2149,15 +2180,15 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 "Opções para /%s são \"yes\" e \"no\", \"true\" e \"false\", \"1\" e \"0\"."
 
-#: ../src/main.cpp:43
+#: ../src/main.cpp:47
 msgid "Options:"
 msgstr "Opções:"
 
-#: ../src/gui/userpalette.cpp:103
+#: ../src/resources/userpalette.cpp:103
 msgid "Other Player Hits Monster"
 msgstr "Outro Jogador Acerta Monstro"
 
-#: ../src/gui/userpalette.cpp:92
+#: ../src/resources/userpalette.cpp:92
 msgid "Other Players' Names"
 msgstr "Nomes de outros jogadores"
 
@@ -2167,27 +2198,27 @@ msgstr "Nomes de outros jogadores"
 msgid "Outfit: %d"
 msgstr "Roupas: %d"
 
-#: ../src/gui/inventorywindow.cpp:101 ../src/gui/outfitwindow.cpp:51
+#: ../src/gui/inventorywindow.cpp:109 ../src/gui/outfitwindow.cpp:51
 msgid "Outfits"
 msgstr "Roupas"
 
-#: ../src/keyboardconfig.cpp:82
+#: ../src/keyboardconfig.cpp:81
 msgid "Outfits Window"
 msgstr "Janela de roupas"
 
-#: ../src/gui/setup_video.cpp:260
+#: ../src/gui/setup_video.cpp:252
 msgid "Overhead text"
 msgstr "Texto sobrescrito"
 
-#: ../src/gui/userpalette.cpp:93
+#: ../src/resources/userpalette.cpp:93
 msgid "Own Name"
 msgstr "Próprio nome"
 
-#: ../src/gui/setup_video.cpp:615
+#: ../src/gui/setup_video.cpp:606
 msgid "Particle Effect Settings Changed."
 msgstr "Configurações de efeito de partícula modificadas."
 
-#: ../src/gui/userpalette.cpp:99
+#: ../src/resources/userpalette.cpp:99
 msgid "Particle Effects"
 msgstr "Efeitos de partícula"
 
@@ -2196,7 +2227,7 @@ msgstr "Efeitos de partícula"
 msgid "Particle count: %d"
 msgstr "Contagem de partículas: %d"
 
-#: ../src/gui/setup_video.cpp:263
+#: ../src/gui/setup_video.cpp:255
 msgid "Particle detail"
 msgstr "Detalhe de partículas"
 
@@ -2205,7 +2236,7 @@ msgstr "Detalhe de partículas"
 msgid "Particle detail: %s"
 msgstr "Detalhe de partículas: %s"
 
-#: ../src/gui/setup_video.cpp:225
+#: ../src/gui/setup_video.cpp:217
 msgid "Particle effects"
 msgstr "Efeitos de partícula"
 
@@ -2213,20 +2244,20 @@ msgstr "Efeitos de partícula"
 msgid "Party"
 msgstr "Grupo"
 
-#: ../src/gui/socialwindow.cpp:222
+#: ../src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Party %s quit requested."
 msgstr "Saída do grupo %s requisitada."
 
-#: ../src/gui/userpalette.cpp:97
+#: ../src/resources/userpalette.cpp:97
 msgid "Party Members"
 msgstr "Membros do grupo"
 
-#: ../src/gui/socialwindow.cpp:629
+#: ../src/gui/socialwindow.cpp:625
 msgid "Party Name"
 msgstr "Nome do grupo"
 
-#: ../src/commandhandler.cpp:449 ../src/net/tmwa/gui/partytab.cpp:109
+#: ../src/commandhandler.cpp:448 ../src/net/tmwa/gui/partytab.cpp:109
 msgid "Party name is missing."
 msgstr "Falta o nome do grupo."
 
@@ -2239,11 +2270,11 @@ msgstr "Grupo criado."
 msgid "Party: %s"
 msgstr "Grupo: %s"
 
-#: ../src/client.cpp:885
+#: ../src/client.cpp:916
 msgid "Password Change"
 msgstr "Mudar senha"
 
-#: ../src/client.cpp:886
+#: ../src/client.cpp:917
 msgid "Password changed successfully!"
 msgstr "Senha modificada com sucesso!"
 
@@ -2261,11 +2292,11 @@ msgstr "Senhas não conferem."
 msgid "Pick up %s"
 msgstr "Pegar %s"
 
-#: ../src/keyboardconfig.cpp:52
+#: ../src/keyboardconfig.cpp:51
 msgid "Pickup"
 msgstr "Pegar"
 
-#: ../src/gui/userpalette.cpp:100
+#: ../src/resources/userpalette.cpp:100
 msgid "Pickup Notification"
 msgstr "Aviso ao pegar algo"
 
@@ -2273,80 +2304,80 @@ msgstr "Aviso ao pegar algo"
 msgid "Play"
 msgstr "Jogar"
 
-#: ../src/commandhandler.cpp:545
+#: ../src/commandhandler.cpp:544
 msgid "Player already ignored!"
 msgstr "O jogador já está sendo ignorado!"
 
-#: ../src/commandhandler.cpp:554
+#: ../src/commandhandler.cpp:553
 msgid "Player could not be ignored!"
 msgstr "Não foi possível ignorar o jogador!"
 
-#: ../src/commandhandler.cpp:576
+#: ../src/commandhandler.cpp:575
 msgid "Player could not be unignored!"
 msgstr "Não foi possível deixar de ignorar o jogador!"
 
-#: ../src/net/manaserv/charhandler.cpp:193
+#: ../src/net/manaserv/charhandler.cpp:210
 msgid "Player deleted."
 msgstr "Personagem deletado."
 
-#: ../src/commandhandler.cpp:574
+#: ../src/commandhandler.cpp:573
 msgid "Player no longer ignored!"
 msgstr "O jogador não está mais ignorado!"
 
-#: ../src/commandhandler.cpp:552
+#: ../src/commandhandler.cpp:551
 msgid "Player successfully ignored!"
 msgstr "Jogador ignorado com sucesso!"
 
-#: ../src/commandhandler.cpp:569
+#: ../src/commandhandler.cpp:568
 msgid "Player wasn't ignored!"
 msgstr "O jogador não estava ignorado!"
 
-#: ../src/gui/setup_players.cpp:234
+#: ../src/gui/setup_players.cpp:237
 msgid "Players"
 msgstr "Jogadores"
 
-#: ../src/net/manaserv/chathandler.cpp:184
-#: ../src/net/manaserv/chathandler.cpp:262
+#: ../src/net/manaserv/chathandler.cpp:194
+#: ../src/net/manaserv/chathandler.cpp:277
 msgid "Players in this channel:"
 msgstr "Jogadores neste canal:"
 
-#: ../src/gui/charcreatedialog.cpp:99 ../src/gui/charcreatedialog.cpp:251
+#: ../src/gui/charcreatedialog.cpp:99 ../src/gui/charcreatedialog.cpp:257
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Por favor distribua %d pontos"
 
-#: ../src/gui/charcreatedialog.cpp:256
+#: ../src/gui/charcreatedialog.cpp:262
 #, c-format
 msgid "Please remove %d points"
 msgstr "Por favor remova %d pontos"
 
-#: ../src/commandhandler.cpp:462 ../src/commandhandler.cpp:539
-#: ../src/commandhandler.cpp:561
+#: ../src/commandhandler.cpp:461 ../src/commandhandler.cpp:538
+#: ../src/commandhandler.cpp:560
 msgid "Please specify a name."
 msgstr "Por favor, especifique um nome."
 
-#: ../src/gui/serverdialog.cpp:337
+#: ../src/gui/serverdialog.cpp:324
 msgid "Please type both the address and the port of a server."
 msgstr "Por favor especifique o endereço e a porta do servidor."
 
-#: ../src/net/tmwa/specialhandler.cpp:216
+#: ../src/net/tmwa/specialhandler.cpp:214
 msgid "Poison had no effect..."
 msgstr "Veneno não surtiu efeito..."
 
-#: ../src/gui/serverdialog.cpp:209
+#: ../src/gui/serverdialog.cpp:207
 msgid "Port:"
 msgstr "Porta:"
 
-#: ../src/gui/serverdialog.cpp:452
+#: ../src/gui/serverdialog.cpp:451
 msgid "Preparing download"
 msgstr "Preparando download"
 
-#: ../src/gui/chat.cpp:307
+#: ../src/gui/chat.cpp:311
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr "Presentes: %s; %d jogadores estão presentes."
 
-#: ../src/net/manaserv/beinghandler.cpp:324
+#: ../src/net/manaserv/beinghandler.cpp:303
 msgid "Press OK to respawn."
 msgstr "Clique em OK para repopular."
 
@@ -2354,50 +2385,50 @@ msgstr "Clique em OK para repopular."
 msgid "Press the button to start calibration"
 msgstr "Aperte o botão para começar a calibrar"
 
-#: ../src/keyboardconfig.cpp:100
+#: ../src/keyboardconfig.cpp:99
 msgid "Previous Chat Tab"
 msgstr "Aba de chat anterior"
 
-#: ../src/gui/buy.cpp:69 ../src/gui/buy.cpp:266 ../src/gui/sell.cpp:71
-#: ../src/gui/sell.cpp:278
+#: ../src/gui/buy.cpp:69 ../src/gui/buy.cpp:267 ../src/gui/sell.cpp:71
+#: ../src/gui/sell.cpp:288
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "Preço: %s / Total: %s"
 
-#: ../src/playerrelations.cpp:326
+#: ../src/playerrelations.cpp:324
 msgid "Print '...'"
 msgstr "Imprimir '...'"
 
-#: ../src/gui/trade.cpp:52
+#: ../src/gui/trade.cpp:53
 msgid "Propose trade"
 msgstr "Propor negócio"
 
-#: ../src/gui/setup_colors.cpp:84 ../src/gui/setup_colors.cpp:85
-#: ../src/gui/setup_colors.cpp:331
+#: ../src/gui/setup_colors.cpp:85 ../src/gui/setup_colors.cpp:86
+#: ../src/gui/setup_colors.cpp:332
 msgid "Pulse"
 msgstr "Pulso"
 
-#: ../src/gui/setup_players.cpp:230
+#: ../src/gui/setup_players.cpp:231
 msgid "Put all whispers in tabs"
 msgstr "Deixar as mensagens particulares em abas"
 
 #: ../src/gui/buy.cpp:79 ../src/gui/quitdialog.cpp:40
 #: ../src/gui/quitdialog.cpp:42 ../src/gui/quitdialog.cpp:43
-#: ../src/gui/sell.cpp:77 ../src/gui/serverdialog.cpp:232
-#: ../src/keyboardconfig.cpp:103
+#: ../src/gui/sell.cpp:77 ../src/gui/serverdialog.cpp:228
+#: ../src/keyboardconfig.cpp:102
 msgid "Quit"
 msgstr "Sair"
 
-#: ../src/gui/setup_colors.cpp:86 ../src/gui/setup_colors.cpp:87
-#: ../src/gui/setup_colors.cpp:332
+#: ../src/gui/setup_colors.cpp:87 ../src/gui/setup_colors.cpp:88
+#: ../src/gui/setup_colors.cpp:333
 msgid "Rainbow"
 msgstr "Arco-íris"
 
-#: ../src/gui/socialwindow.cpp:556
+#: ../src/gui/socialwindow.cpp:553
 msgid "Received guild request, but one already exists."
 msgstr "Requisição de guilda recebida, mas já existe uma."
 
-#: ../src/gui/socialwindow.cpp:578
+#: ../src/gui/socialwindow.cpp:575
 msgid "Received party request, but one already exists."
 msgstr "Requisição de grupo recebida, mas já existe um."
 
@@ -2405,7 +2436,7 @@ msgstr "Requisição de grupo recebida, mas já existe um."
 msgid "Recording..."
 msgstr "Gravando..."
 
-#: ../src/gui/setup_colors.cpp:108
+#: ../src/gui/setup_colors.cpp:109
 msgid "Red:"
 msgstr "Vermelho:"
 
@@ -2422,12 +2453,12 @@ msgstr "Registro desabilitado."
 msgid "Rejected from server."
 msgstr "Rejeitado pelo servidor."
 
-#: ../src/gui/socialwindow.cpp:472
-#, c-format
-msgid "Rejected guild invite from %s."
-msgstr "Rejeitou convite para a guilda de  %s."
+#: ../src/gui/socialwindow.cpp:468
+#, fuzzy
+msgid "Rejected guild invite."
+msgstr "O jogador rejeitou o convite."
 
-#: ../src/gui/socialwindow.cpp:453
+#: ../src/gui/socialwindow.cpp:450
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "Rejeitou convite para o grupo de  %s."
@@ -2440,29 +2471,29 @@ msgstr "Relação"
 msgid "Remember username"
 msgstr "Lembrar usuário"
 
-#: ../src/net/manaserv/tradehandler.cpp:116
-#: ../src/net/tmwa/tradehandler.cpp:107
+#: ../src/net/manaserv/tradehandler.cpp:115
+#: ../src/net/tmwa/tradehandler.cpp:109
 msgid "Request for Trade"
 msgstr "Proposta de negociação"
 
-#: ../src/net/tmwa/gamehandler.cpp:101
+#: ../src/net/tmwa/gamehandler.cpp:102
 msgid "Request to quit denied!"
 msgstr "Requisição de saída negada!"
 
-#: ../src/client.cpp:774
+#: ../src/client.cpp:809
 msgid "Requesting characters"
 msgstr "Requisitando personagens"
 
-#: ../src/client.cpp:858
+#: ../src/client.cpp:889
 msgid "Requesting registration details"
 msgstr "Requisitando detalhes do registro"
 
-#: ../src/commandhandler.cpp:436
+#: ../src/commandhandler.cpp:435
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr "Solicitando entrada no canal %s."
 
-#: ../src/gui/npcdialog.cpp:114
+#: ../src/gui/npcdialog.cpp:134
 msgid "Reset"
 msgstr "Resetar"
 
@@ -2470,23 +2501,23 @@ msgstr "Resetar"
 msgid "Reset Windows"
 msgstr "Restaurar janelas"
 
-#: ../src/gui/setup_video.cpp:446
+#: ../src/gui/setup_video.cpp:438
 msgid "Restart needed for changes to take effect."
 msgstr "É preciso reiniciar para as mudanças terem efeito."
 
-#: ../src/gui/setup_video.cpp:580 ../src/gui/setup_video.cpp:585
+#: ../src/gui/setup_video.cpp:571 ../src/gui/setup_video.cpp:576
 msgid "Restart your client for the change to take effect."
 msgstr "Reincie o jogo para que as mudanças surtam efeito."
 
-#: ../src/gui/inventorywindow.cpp:121 ../src/gui/popupmenu.cpp:376
+#: ../src/gui/inventorywindow.cpp:132 ../src/gui/popupmenu.cpp:385
 msgid "Retrieve"
 msgstr "Retirar"
 
-#: ../src/commandhandler.cpp:489
+#: ../src/commandhandler.cpp:488
 msgid "Return now toggles chat."
 msgstr "Agora Enter alterna para o chat."
 
-#: ../src/commandhandler.cpp:480
+#: ../src/commandhandler.cpp:479
 msgid "Return toggles chat."
 msgstr "Enter alterna para o chat."
 
@@ -2494,40 +2525,44 @@ msgstr "Enter alterna para o chat."
 msgid "Rotate the stick"
 msgstr "Gire o bastão"
 
-#: ../src/net/manaserv/beinghandler.cpp:316
-#: ../src/net/tmwa/playerhandler.cpp:118
+#: ../src/net/manaserv/beinghandler.cpp:295
+#: ../src/net/tmwa/playerhandler.cpp:110
 msgid "Sadly, no trace of you was ever found..."
 msgstr "Infelizmente, seus traços nunca foram encontrados..."
 
-#: ../src/game.cpp:338
+#: ../src/game.cpp:354
 msgid "Saving screenshot failed!"
 msgstr "Falha ao salvar screenshot!"
 
-#: ../src/gui/setup_video.cpp:579 ../src/gui/setup_video.cpp:584
+#: ../src/gui/setup_video.cpp:570 ../src/gui/setup_video.cpp:575
 msgid "Screen Resolution Changed"
 msgstr "Resolução de tela alterada"
 
-#: ../src/keyboardconfig.cpp:55
+#: ../src/keyboardconfig.cpp:54
 msgid "Screenshot"
 msgstr "Screenshot"
 
-#: ../src/game.cpp:333
+#: ../src/game.cpp:349
 msgid "Screenshot saved as "
 msgstr "Screenshot salva como "
 
-#: ../src/keyboardconfig.cpp:99
+#: ../src/keyboardconfig.cpp:98
 msgid "Scroll Chat Down"
 msgstr "Rolar chat para baixo"
 
-#: ../src/keyboardconfig.cpp:98
+#: ../src/keyboardconfig.cpp:97
 msgid "Scroll Chat Up"
 msgstr "Rolar chat para cima"
 
-#: ../src/net/tmwa/specialhandler.cpp:186
+#: ../src/gui/inventorywindow.cpp:87
+msgid "Search:"
+msgstr ""
+
+#: ../src/net/tmwa/specialhandler.cpp:184
 msgid "Seems you need more money... ;-)"
 msgstr "Parece que você precisa de mais dinheiro... ;-)"
 
-#: ../src/keyboardconfig.cpp:102
+#: ../src/keyboardconfig.cpp:101
 msgid "Select OK"
 msgstr "Selecionar OK"
 
@@ -2535,27 +2570,27 @@ msgstr "Selecionar OK"
 msgid "Select World"
 msgstr "Selecionar Mundo"
 
-#: ../src/gui/itemamount.cpp:134
+#: ../src/gui/itemamount.cpp:144
 msgid "Select amount of items to drop."
 msgstr "Selecionar quantidade de itens para descartar."
 
-#: ../src/gui/itemamount.cpp:140
+#: ../src/gui/itemamount.cpp:150
 msgid "Select amount of items to retrieve."
 msgstr "Escolha a quantidade de itens para retirar."
 
-#: ../src/gui/itemamount.cpp:143
+#: ../src/gui/itemamount.cpp:153
 msgid "Select amount of items to split."
 msgstr "Selecionar quantidade de itens para dividir."
 
-#: ../src/gui/itemamount.cpp:137
+#: ../src/gui/itemamount.cpp:147
 msgid "Select amount of items to store."
 msgstr "Escolha a quantidade de itens para armazenar."
 
-#: ../src/gui/itemamount.cpp:131
+#: ../src/gui/itemamount.cpp:141
 msgid "Select amount of items to trade."
 msgstr "Selecionar quantidade de itens para negociar."
 
-#: ../src/net/manaserv/charhandler.cpp:205
+#: ../src/net/manaserv/charhandler.cpp:222
 msgid "Selection out of range."
 msgstr "Seleção fora de alcançe."
 
@@ -2567,19 +2602,27 @@ msgstr "Vender"
 msgid "Send"
 msgstr "Enviar"
 
-#: ../src/gui/serverdialog.cpp:211
+#: ../src/net/tmwa/loginhandler.cpp:182
+msgid "Server overpopulated."
+msgstr ""
+
+#: ../src/net/net.cpp:164
+msgid "Server protocol unsupported"
+msgstr ""
+
+#: ../src/gui/serverdialog.cpp:208
 msgid "Server type:"
 msgstr "Tipo de servidor:"
 
-#: ../src/gui/serverdialog.cpp:208 ../src/gui/widgets/chattab.cpp:141
+#: ../src/gui/serverdialog.cpp:206 ../src/gui/widgets/chattab.cpp:142
 msgid "Server:"
 msgstr "Servidor:"
 
-#: ../src/client.cpp:575 ../src/gui/setup.cpp:43 ../src/gui/windowmenu.cpp:66
+#: ../src/client.cpp:580 ../src/gui/setup.cpp:43 ../src/gui/windowmenu.cpp:66
 msgid "Setup"
 msgstr "Configurar"
 
-#: ../src/keyboardconfig.cpp:78
+#: ../src/keyboardconfig.cpp:77
 msgid "Setup Window"
 msgstr "Janela de Configurações"
 
@@ -2595,87 +2638,87 @@ msgstr "Loja"
 msgid "Shortcut"
 msgstr "Atalho"
 
-#: ../src/commandhandler.cpp:506 ../src/commandhandler.cpp:515
+#: ../src/commandhandler.cpp:505 ../src/commandhandler.cpp:514
 msgid "Show IP: Off"
 msgstr "Mostrar IP: Desligado"
 
-#: ../src/commandhandler.cpp:506 ../src/commandhandler.cpp:519
+#: ../src/commandhandler.cpp:505 ../src/commandhandler.cpp:518
 msgid "Show IP: On"
 msgstr "Mostrar IP: Ligado"
 
-#: ../src/gui/setup_video.cpp:254
+#: ../src/gui/setup_video.cpp:246
 msgid "Show damage"
 msgstr "Mostrar dano"
 
-#: ../src/gui/setup_players.cpp:232
+#: ../src/gui/setup_players.cpp:233
 msgid "Show gender"
 msgstr "Mostrar gênero"
 
-#: ../src/gui/setup_video.cpp:227
+#: ../src/gui/setup_video.cpp:219
 msgid "Show own name"
 msgstr "Mostrar o próprio nome"
 
-#: ../src/gui/setup_video.cpp:229
+#: ../src/gui/setup_video.cpp:221
 msgid "Show pickup notification"
 msgstr "Mostrar aviso ao pegar algo"
 
-#: ../src/keyboardconfig.cpp:54
+#: ../src/keyboardconfig.cpp:53
 msgid "Sit"
 msgstr "Sentar"
 
-#: ../src/net/tmwa/specialhandler.cpp:153
+#: ../src/net/tmwa/specialhandler.cpp:151
 msgid "Sit failed!"
 msgstr "Falha ao sentar!"
 
-#: ../src/gui/skilldialog.cpp:362
+#: ../src/gui/skilldialog.cpp:377
 #, c-format
 msgid "Skill %d"
 msgstr "Habilidade %d"
 
-#: ../src/gui/skilldialog.cpp:353
+#: ../src/gui/skilldialog.cpp:368
 #, c-format
 msgid "Skill Set %d"
 msgstr "Habilidade %d"
 
-#: ../src/keyboardconfig.cpp:74
+#: ../src/keyboardconfig.cpp:73
 msgid "Skill Window"
 msgstr "Janela de Habilidade"
 
-#: ../src/gui/skilldialog.cpp:271
+#: ../src/gui/skilldialog.cpp:273
 #, c-format
 msgid "Skill points available: %d"
 msgstr "Pontos de habilidade disponíveis: %d"
 
-#: ../src/gui/skilldialog.cpp:210 ../src/gui/windowmenu.cpp:59
+#: ../src/gui/skilldialog.cpp:215 ../src/gui/windowmenu.cpp:59
 msgid "Skills"
 msgstr "Habilidades"
 
-#: ../src/gui/inventorywindow.cpp:80
+#: ../src/gui/inventorywindow.cpp:86
 msgid "Slots:"
 msgstr "Espaços:"
 
-#: ../src/gui/setup_video.cpp:135
+#: ../src/gui/setup_video.cpp:129
 msgid "Small"
 msgstr "Pequena"
 
-#: ../src/keyboardconfig.cpp:46
+#: ../src/keyboardconfig.cpp:45
 msgid "Smilie"
 msgstr "Emoticon"
 
-#: ../src/gui/socialwindow.cpp:316 ../src/gui/windowmenu.cpp:64
+#: ../src/gui/socialwindow.cpp:312 ../src/gui/windowmenu.cpp:64
 msgid "Social"
 msgstr "Social"
 
-#: ../src/keyboardconfig.cpp:80
+#: ../src/keyboardconfig.cpp:79
 msgid "Social Window"
 msgstr "Janela social"
 
-#: ../src/gui/setup_video.cpp:582
+#: ../src/gui/setup_video.cpp:573
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 "Algumas janelas podem ser movidas para se adequar à resolução mais baixa."
 
-#: ../src/net/tmwa/generalhandler.cpp:136
+#: ../src/net/tmwa/generalhandler.cpp:139
 msgid "Someone else is trying to use this account."
 msgstr "Outra pessoa está tentando utilizar esta conta."
 
@@ -2687,34 +2730,24 @@ msgstr "Som"
 msgid "Sound Engine"
 msgstr "Mecanismo de som"
 
-#: ../src/gui/specialswindow.cpp:191
-#, c-format
-msgid "Special %d"
-msgstr "Especial %d"
-
-#: ../src/gui/specialswindow.cpp:85 ../src/gui/windowmenu.cpp:62
+#: ../src/gui/specialswindow.cpp:79 ../src/gui/windowmenu.cpp:62
 msgid "Specials"
 msgstr "Especiais"
 
-#: ../src/gui/specialswindow.cpp:174
-#, c-format
-msgid "Specials Set %d"
-msgstr "Especiais %d"
-
-#: ../src/gui/setup_colors.cpp:88 ../src/gui/setup_colors.cpp:89
-#: ../src/gui/setup_colors.cpp:332
+#: ../src/gui/setup_colors.cpp:89 ../src/gui/setup_colors.cpp:90
+#: ../src/gui/setup_colors.cpp:333
 msgid "Spectrum"
 msgstr "Espectro"
 
-#: ../src/net/tmwa/generalhandler.cpp:142
+#: ../src/net/tmwa/generalhandler.cpp:145
 msgid "Speed hack detected."
 msgstr "Hack de velocidade detectado."
 
-#: ../src/gui/inventorywindow.cpp:100 ../src/gui/popupmenu.cpp:369
+#: ../src/gui/inventorywindow.cpp:108 ../src/gui/popupmenu.cpp:378
 msgid "Split"
 msgstr "Dividir"
 
-#: ../src/localplayer.cpp:1255
+#: ../src/localplayer.cpp:899
 msgid "Stack is too big."
 msgstr "Esta pilha é muito grande."
 
@@ -2722,7 +2755,7 @@ msgstr "Esta pilha é muito grande."
 msgid "Starting to record..."
 msgstr "Iniciando a gravação..."
 
-#: ../src/gui/setup_colors.cpp:82 ../src/gui/setup_colors.cpp:330
+#: ../src/gui/setup_colors.cpp:83 ../src/gui/setup_colors.cpp:331
 msgid "Static"
 msgstr "Estático"
 
@@ -2730,7 +2763,7 @@ msgstr "Estático"
 msgid "Status"
 msgstr "Status"
 
-#: ../src/keyboardconfig.cpp:71
+#: ../src/keyboardconfig.cpp:70
 msgid "Status Window"
 msgstr "Janela de Status"
 
@@ -2738,7 +2771,7 @@ msgstr "Janela de Status"
 msgid "Stop"
 msgstr "Parar"
 
-#: ../src/keyboardconfig.cpp:48
+#: ../src/keyboardconfig.cpp:47
 msgid "Stop Attack"
 msgstr "Parar ataque"
 
@@ -2750,28 +2783,34 @@ msgstr "Parar gravação"
 msgid "Storage"
 msgstr "Armazenamento"
 
-#: ../src/gui/inventorywindow.cpp:120 ../src/gui/popupmenu.cpp:349
+#: ../src/gui/inventorywindow.cpp:131 ../src/gui/popupmenu.cpp:358
 msgid "Store"
 msgstr "Armazenar"
 
-#: ../src/net/manaserv/stats.cpp:56 ../src/net/tmwa/generalhandler.cpp:217
+#: ../src/net/manaserv/attributes.cpp:166
+#: ../src/net/tmwa/generalhandler.cpp:230
 msgid "Strength"
 msgstr "Força"
 
-#: ../src/net/manaserv/stats.cpp:58 ../src/net/tmwa/generalhandler.cpp:101
+#: ../src/net/manaserv/attributes.cpp:173
+#, fuzzy, c-format
+msgid "Strength %+.1f"
+msgstr "Força %+d"
+
+#: ../src/net/tmwa/generalhandler.cpp:102
 #, c-format
 msgid "Strength %+d"
 msgstr "Força %+d"
 
-#: ../src/net/tmwa/charserverhandler.cpp:259
+#: ../src/net/tmwa/charserverhandler.cpp:270
 msgid "Strength:"
 msgstr "Força:"
 
-#: ../src/gui/npcdialog.cpp:48
+#: ../src/gui/npcdialog.cpp:51
 msgid "Submit"
 msgstr "Enviar"
 
-#: ../src/gui/charselectdialog.cpp:127
+#: ../src/gui/charselectdialog.cpp:131
 msgid "Switch Login"
 msgstr "Trocar Login"
 
@@ -2783,11 +2822,11 @@ msgstr "Trocar de Personagem"
 msgid "Switch server"
 msgstr "Trocar servidor"
 
-#: ../src/gui/setup_video.cpp:445
+#: ../src/gui/setup_video.cpp:437
 msgid "Switching to Full Screen"
 msgstr "Mudando para tela cheia"
 
-#: ../src/keyboardconfig.cpp:47
+#: ../src/keyboardconfig.cpp:46
 msgid "Talk"
 msgstr "Falar"
 
@@ -2796,40 +2835,40 @@ msgstr "Falar"
 msgid "Talk to %s"
 msgstr "Falar com %s"
 
-#: ../src/keyboardconfig.cpp:45
+#: ../src/keyboardconfig.cpp:44
 msgid "Target & Attack"
 msgstr "Selecionar & Atacar"
 
-#: ../src/keyboardconfig.cpp:49
+#: ../src/keyboardconfig.cpp:48
 msgid "Target Monster"
 msgstr "Selecionar Monstro"
 
-#: ../src/keyboardconfig.cpp:50
+#: ../src/keyboardconfig.cpp:49
 msgid "Target NPC"
 msgstr "Selecionar NPC"
 
-#: ../src/keyboardconfig.cpp:51
+#: ../src/keyboardconfig.cpp:50
 msgid "Target Player"
 msgstr "Selecionar Jogador"
 
-#: ../src/gui/setup_video.cpp:164
+#: ../src/gui/setup_video.cpp:158
 msgid "Text"
 msgstr "Texto"
 
-#: ../src/net/tmwa/buysellhandler.cpp:117
+#: ../src/net/tmwa/buysellhandler.cpp:116
 msgid "Thanks for buying."
 msgstr "Obrigado pela compra."
 
-#: ../src/net/tmwa/buysellhandler.cpp:130
+#: ../src/net/tmwa/buysellhandler.cpp:129
 msgid "Thanks for selling."
 msgstr "Obrigado pela venda."
 
-#: ../src/net/manaserv/beinghandler.cpp:308
-#: ../src/net/tmwa/playerhandler.cpp:107
+#: ../src/net/manaserv/beinghandler.cpp:287
+#: ../src/net/tmwa/playerhandler.cpp:99
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr "As mãos frias da morte estão levando sua alma."
 
-#: ../src/game.cpp:368
+#: ../src/game.cpp:385
 msgid "The connection to the server was lost."
 msgstr "A conexão com o servidor caiu."
 
@@ -2885,7 +2924,7 @@ msgstr "O nome do usuário precisa ter pelo menos %d caracteres."
 msgid "The username needs to be less than %d characters long."
 msgstr "O nome do usuário tem que ser inferior a %d caracteres."
 
-#: ../src/net/tmwa/generalhandler.cpp:139
+#: ../src/net/tmwa/generalhandler.cpp:142
 msgid "This account is already logged in."
 msgstr "Existe alguém conectado a esta conta."
 
@@ -2905,35 +2944,35 @@ msgstr "Este comando muda a opção de compartilhamento de experiência do grupo
 msgid "This command changes the party's item sharing policy."
 msgstr "Este comando muda a opção de compartilhamento de itens do grupo."
 
-#: ../src/commandhandler.cpp:275
+#: ../src/commandhandler.cpp:274
 msgid "This command clears the away status and message."
 msgstr "Este comando limpa o status e a mensagem \"away\"."
 
-#: ../src/commandhandler.cpp:229
+#: ../src/commandhandler.cpp:228
 msgid "This command clears the chat log of previous chat."
 msgstr "Este comando limpa a janela de chat."
 
-#: ../src/gui/widgets/whispertab.cpp:84
+#: ../src/gui/widgets/whispertab.cpp:85
 msgid "This command closes the current whisper tab."
 msgstr "Este comando fecha a atual aba de mensagem privada"
 
-#: ../src/commandhandler.cpp:280
+#: ../src/commandhandler.cpp:279
 msgid "This command creates a new party called <name>."
 msgstr "Este comando cria um novo grupo chamado <nome>."
 
-#: ../src/commandhandler.cpp:210
+#: ../src/commandhandler.cpp:209
 msgid "This command displays a list of all commands available."
 msgstr "Exibe uma lista de todos os comandos disponíveis."
 
-#: ../src/commandhandler.cpp:213
+#: ../src/commandhandler.cpp:212
 msgid "This command displays help on <command>."
 msgstr "Exibe o conteúdo de ajuda de <comando>"
 
-#: ../src/commandhandler.cpp:324
+#: ../src/commandhandler.cpp:323
 msgid "This command displays the name of the current map."
 msgstr "Mostra o nome do mapa atual."
 
-#: ../src/commandhandler.cpp:329
+#: ../src/commandhandler.cpp:328
 msgid "This command displays the number of players currently online."
 msgstr "Exibe o número total de jogadores online."
 
@@ -2947,15 +2986,15 @@ msgid "This command displays the party's current item sharing policy."
 msgstr ""
 "Este comando exibe a atual opção de compartilhamento de itens do grupo."
 
-#: ../src/commandhandler.cpp:313
+#: ../src/commandhandler.cpp:312
 msgid "This command displays the return toggle status."
 msgstr "Este comando mostra o status da tecla enter."
 
-#: ../src/commandhandler.cpp:302
+#: ../src/commandhandler.cpp:301
 msgid "This command finishes a recording session."
 msgstr "Este comando finaliza a sessão de gravação."
 
-#: ../src/commandhandler.cpp:292
+#: ../src/commandhandler.cpp:291
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
@@ -2964,17 +3003,17 @@ msgstr ""
 "de registro do chat ou, caso haja uma gravação em andamento, para o log de "
 "gravação."
 
-#: ../src/commandhandler.cpp:234
+#: ../src/commandhandler.cpp:233
 msgid "This command ignores the given player regardless of current relations."
 msgstr ""
 "Este comando ignora o jogador indicado, independente de sua relação com o "
 "mesmo."
 
-#: ../src/gui/widgets/whispertab.cpp:89
+#: ../src/gui/widgets/whispertab.cpp:90
 msgid "This command ignores the other player regardless of current relations."
 msgstr "Este comando ignora o outro jogador."
 
-#: ../src/commandhandler.cpp:285 ../src/net/tmwa/gui/partytab.cpp:74
+#: ../src/commandhandler.cpp:284 ../src/net/tmwa/gui/partytab.cpp:74
 msgid "This command invites <nick> to party with you."
 msgstr "Este comando convida <nick> para o seu grupo."
 
@@ -2994,15 +3033,15 @@ msgstr "Tornar <nick> operador do canal."
 msgid "This command makes <nick> leave the channel."
 msgstr "Retirar <nick> do canal."
 
-#: ../src/commandhandler.cpp:240
+#: ../src/commandhandler.cpp:239
 msgid "This command makes you enter <channel>."
 msgstr "Este comando faz você entrar em <canal>."
 
-#: ../src/commandhandler.cpp:223
+#: ../src/commandhandler.cpp:222
 msgid "This command sends the message <msg> to all players currently online."
 msgstr "Este comando envia a mensagem <msg> para todos os jogadores online."
 
-#: ../src/commandhandler.cpp:258
+#: ../src/commandhandler.cpp:257
 msgid "This command sends the text <message> to <nick>."
 msgstr "Este comando envia o texto <mensagem> para <nick>."
 
@@ -3010,7 +3049,7 @@ msgstr "Este comando envia o texto <mensagem> para <nick>."
 msgid "This command sets the topic to <message>."
 msgstr "Seta <mensagem> como o tópico."
 
-#: ../src/commandhandler.cpp:307
+#: ../src/commandhandler.cpp:306
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
@@ -3018,7 +3057,7 @@ msgstr ""
 "Este comando define se a tecla enter deve alternar para o log do chat ou se "
 "o log do chat fica oculto automaticamente."
 
-#: ../src/commandhandler.cpp:246
+#: ../src/commandhandler.cpp:245
 msgid "This command shows a list of all channels."
 msgstr "Este comando exibe uma lista com todos os canais."
 
@@ -3026,44 +3065,53 @@ msgstr "Este comando exibe uma lista com todos os canais."
 msgid "This command shows the users in this channel."
 msgstr "Mostra os usuários neste canal."
 
-#: ../src/commandhandler.cpp:299
+#: ../src/commandhandler.cpp:298
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr ""
 "Este comando inicia a gravação do registro de chat para o arquivo "
 "<nome_do_arquivo>."
 
-#: ../src/commandhandler.cpp:318
+#: ../src/commandhandler.cpp:317
 msgid "This command stops ignoring the given player if they are being ignored"
 msgstr ""
 "Este comando para de ignorar o jogador indicado se ele estiver sendo ignorado"
 
-#: ../src/gui/widgets/whispertab.cpp:95
+#: ../src/gui/widgets/whispertab.cpp:96
 msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 "Este comando para de ignorar o outro jogador se ele estiver sendo ignorado."
 
-#: ../src/commandhandler.cpp:251
+#: ../src/commandhandler.cpp:250
 msgid "This command tell others you are (doing) <msg>."
 msgstr "Este comando diz aos outros o que eu estou (fazendo) <msg>."
 
-#: ../src/commandhandler.cpp:272
+#: ../src/commandhandler.cpp:271
 msgid "This command tells you're away from keyboard with the given reason."
 msgstr ""
 "Este comando mostra que você está longe do teclado, indicando a razão dada."
 
-#: ../src/commandhandler.cpp:266
+#: ../src/commandhandler.cpp:265
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr "Este comando cria uma aba para mensagens privadas entre você e <nick>."
 
-#: ../src/gui/setup_colors.cpp:45
+#: ../src/gui/setup_colors.cpp:46
 msgid "This is what the color looks like"
 msgstr "A cor se parece com isso"
 
-#: ../src/net/tmwa/loginhandler.cpp:179
+#: ../src/client.cpp:783
+#, fuzzy
+msgid ""
+"This server is missing needed world data. Please contact the administrator"
+"(s)."
+msgstr ""
+"Registro pelo cliente não é permitido. Favor contactar o administrador do "
+"servidor."
+
+#: ../src/net/tmwa/loginhandler.cpp:185
 msgid "This user name is already taken."
 msgstr "Este nome de usuário já está em uso."
 
-#: ../src/gui/setup_video.cpp:134
+#: ../src/gui/setup_video.cpp:128
 msgid "Tiny"
 msgstr "Minúsculo"
 
@@ -3071,40 +3119,40 @@ msgstr "Minúsculo"
 msgid "To:"
 msgstr "Para:"
 
-#: ../src/keyboardconfig.cpp:97
+#: ../src/keyboardconfig.cpp:96
 msgid "Toggle Chat"
 msgstr "Alternar para chat"
 
-#: ../src/net/manaserv/chathandler.cpp:180
-#: ../src/net/manaserv/chathandler.cpp:301
-#: ../src/net/manaserv/guildhandler.cpp:259
+#: ../src/net/manaserv/chathandler.cpp:190
+#: ../src/net/manaserv/chathandler.cpp:316
+#: ../src/net/manaserv/guildhandler.cpp:260
 #, c-format
 msgid "Topic: %s"
 msgstr "Tópico: %s"
 
-#: ../src/gui/trade.cpp:72 ../src/gui/trade.cpp:73
+#: ../src/gui/trade.cpp:73 ../src/gui/trade.cpp:74
 msgid "Trade"
 msgstr "Negócio"
 
-#: ../src/net/manaserv/tradehandler.cpp:149
+#: ../src/net/manaserv/tradehandler.cpp:148
 #: ../src/net/tmwa/tradehandler.cpp:224
 msgid "Trade canceled."
 msgstr "Negociação cancelada."
 
-#: ../src/net/tmwa/tradehandler.cpp:132
+#: ../src/net/tmwa/tradehandler.cpp:134
 msgid "Trade cancelled due to an unknown reason."
 msgstr "Negociação cancelada devido a uma razão desconhecida."
 
-#: ../src/net/manaserv/tradehandler.cpp:156
+#: ../src/net/manaserv/tradehandler.cpp:155
 #: ../src/net/tmwa/tradehandler.cpp:231
 msgid "Trade completed."
 msgstr "Negociação realizada."
 
-#: ../src/net/tmwa/specialhandler.cpp:147
+#: ../src/net/tmwa/specialhandler.cpp:145
 msgid "Trade failed!"
 msgstr "Falha na negociação!"
 
-#: ../src/net/tmwa/tradehandler.cpp:144
+#: ../src/net/tmwa/tradehandler.cpp:146
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr "Negociação com %s cancelada."
@@ -3114,41 +3162,41 @@ msgstr "Negociação com %s cancelada."
 msgid "Trade with %s..."
 msgstr "Negociar com %s..."
 
-#: ../src/gui/trade.cpp:58
+#: ../src/gui/trade.cpp:59
 msgid "Trade: You"
 msgstr "Negócio: você"
 
-#: ../src/net/tmwa/tradehandler.cpp:137
+#: ../src/net/tmwa/tradehandler.cpp:139
 #, c-format
 msgid "Trade: You and %s"
 msgstr "Negociação: Você e %s"
 
-#: ../src/net/tmwa/tradehandler.cpp:128
+#: ../src/net/tmwa/tradehandler.cpp:130
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr "Negociação impossível. O personagem não existe."
 
-#: ../src/net/tmwa/tradehandler.cpp:124
+#: ../src/net/tmwa/tradehandler.cpp:126
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr "Negociação impossível. O parceiro de negócios está muito longe."
 
-#: ../src/net/manaserv/tradehandler.cpp:135
+#: ../src/net/manaserv/tradehandler.cpp:134
 #, c-format
 msgid "Trading with %s"
 msgstr "Negociando com %s"
 
-#: ../src/gui/setup_video.cpp:477
+#: ../src/gui/setup_video.cpp:469
 msgid "Transparency disabled"
 msgstr "Transparência desabilitada"
 
-#: ../src/gui/setup_video.cpp:485
+#: ../src/gui/setup_video.cpp:477
 msgid "Transparency enabled"
 msgstr "Transparência habilitada."
 
-#: ../src/localplayer.cpp:1251
+#: ../src/localplayer.cpp:895
 msgid "Tried to pick up nonexistent item."
 msgstr "Você tentou pegar um item não existente."
 
-#: ../src/commandhandler.cpp:335
+#: ../src/commandhandler.cpp:334
 msgid "Type /help for a list of commands."
 msgstr "Digite /help para uma lista de todos os comandos."
 
@@ -3160,15 +3208,15 @@ msgstr "Digite o novo email duas vezes:"
 msgid "Type new password twice:"
 msgstr "Digite a nova senha duas vezes:"
 
-#: ../src/gui/setup_colors.cpp:71
+#: ../src/gui/setup_colors.cpp:72
 msgid "Type:"
 msgstr "Tipo:"
 
-#: ../src/net/tmwa/buysellhandler.cpp:124
+#: ../src/net/tmwa/buysellhandler.cpp:123
 msgid "Unable to buy."
 msgstr "Impossível comprar."
 
-#: ../src/net/tmwa/inventoryhandler.cpp:407
+#: ../src/net/tmwa/inventoryhandler.cpp:401
 msgid "Unable to equip."
 msgstr "Impossível equipar."
 
@@ -3176,11 +3224,11 @@ msgstr "Impossível equipar."
 msgid "Unable to resolve host \""
 msgstr "Não foi possível determinar o host \""
 
-#: ../src/net/tmwa/buysellhandler.cpp:132
+#: ../src/net/tmwa/buysellhandler.cpp:131
 msgid "Unable to sell."
 msgstr "Impossibilitado de vender."
 
-#: ../src/net/tmwa/inventoryhandler.cpp:418
+#: ../src/net/tmwa/inventoryhandler.cpp:413
 msgid "Unable to unequip."
 msgstr "Impossível desequipar."
 
@@ -3188,8 +3236,8 @@ msgstr "Impossível desequipar."
 msgid "Unassign"
 msgstr "Retirar"
 
-#: ../src/gui/equipmentwindow.cpp:87 ../src/gui/inventorywindow.cpp:87
-#: ../src/gui/inventorywindow.cpp:313 ../src/gui/popupmenu.cpp:355
+#: ../src/gui/equipmentwindow.cpp:88 ../src/gui/inventorywindow.cpp:94
+#: ../src/gui/inventorywindow.cpp:352 ../src/gui/popupmenu.cpp:364
 msgid "Unequip"
 msgstr "Desequipar"
 
@@ -3197,7 +3245,12 @@ msgstr "Desequipar"
 msgid "Unequip first"
 msgstr "Desequipar antes"
 
-#: ../src/net/tmwa/tradehandler.cpp:153
+#: ../src/net/manaserv/charhandler.cpp:270
+#, c-format
+msgid "Unhandled character select error message %i."
+msgstr ""
+
+#: ../src/net/tmwa/tradehandler.cpp:154
 msgid "Unhandled trade cancel packet."
 msgstr "Troca injusta pacote cancelado."
 
@@ -3206,64 +3259,64 @@ msgstr "Troca injusta pacote cancelado."
 msgid "Unignore %s"
 msgstr "Deixar de Ignorar %s"
 
-#: ../src/net/net.cpp:145
+#: ../src/net/net.cpp:141
 msgid "Unknown Server Type! Exiting."
 msgstr "Tipo de servidor desconhecido! Saindo."
 
-#: ../src/net/manaserv/chathandler.cpp:327
+#: ../src/net/manaserv/chathandler.cpp:342
 msgid "Unknown channel event."
 msgstr "Evento de canal desconhecido."
 
-#: ../src/net/tmwa/charserverhandler.cpp:112
+#: ../src/net/tmwa/charserverhandler.cpp:110
 msgid "Unknown char-server failure."
 msgstr "Erro desconhecido do char-server."
 
-#: ../src/commandhandler.cpp:137 ../src/commandhandler.cpp:334
+#: ../src/commandhandler.cpp:136 ../src/commandhandler.cpp:333
 msgid "Unknown command."
 msgstr "Comando desconhecido."
 
-#: ../src/net/tmwa/generalhandler.cpp:148
+#: ../src/net/tmwa/generalhandler.cpp:151
 msgid "Unknown connection error."
 msgstr "Erro de conexão desconhecido."
 
-#: ../src/net/manaserv/charhandler.cpp:208
+#: ../src/net/manaserv/charhandler.cpp:225
 #, c-format
 msgid "Unknown error (%d)."
 msgstr "Erro desconhecido (%d)."
 
-#: ../src/net/manaserv/charhandler.cpp:164
+#: ../src/net/manaserv/charhandler.cpp:174
 #: ../src/net/manaserv/loginhandler.cpp:96
 #: ../src/net/manaserv/loginhandler.cpp:127
 #: ../src/net/manaserv/loginhandler.cpp:161
 #: ../src/net/manaserv/loginhandler.cpp:279
 #: ../src/net/manaserv/loginhandler.cpp:316
-#: ../src/net/tmwa/loginhandler.cpp:95 ../src/net/tmwa/loginhandler.cpp:182
+#: ../src/net/tmwa/loginhandler.cpp:95 ../src/net/tmwa/loginhandler.cpp:191
 msgid "Unknown error."
 msgstr "Erro desconhecido."
 
-#: ../src/net/tmwa/guildhandler.cpp:315
+#: ../src/net/tmwa/guildhandler.cpp:316
 msgid "Unknown guild invite response."
 msgstr "Resposta desconhecida de convite para guilda."
 
-#: ../src/net/tmwa/partyhandler.cpp:133
+#: ../src/net/tmwa/partyhandler.cpp:131
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr "Resposta de convite desconhecida para %s."
 
-#: ../src/resources/itemdb.cpp:117
+#: ../src/resources/itemdb.cpp:324 ../src/resources/itemdb.cpp:425
 msgid "Unknown item"
 msgstr "Item desconhecido"
 
-#: ../src/localplayer.cpp:1258
+#: ../src/localplayer.cpp:902
 msgid "Unknown problem picking up item."
 msgstr "Problema desconhecido ao tentar pegar item."
 
-#: ../src/gui/charselectdialog.cpp:141 ../src/gui/unregisterdialog.cpp:47
+#: ../src/gui/charselectdialog.cpp:145 ../src/gui/unregisterdialog.cpp:47
 #: ../src/gui/unregisterdialog.cpp:55
 msgid "Unregister"
 msgstr "Cancelar Registro"
 
-#: ../src/client.cpp:926
+#: ../src/client.cpp:955
 msgid "Unregister Successful"
 msgstr "Registro cancelado com sucesso"
 
@@ -3271,7 +3324,7 @@ msgstr "Registro cancelado com sucesso"
 msgid "Unregistered ID."
 msgstr "ID não registrado."
 
-#: ../src/gui/skilldialog.cpp:221
+#: ../src/gui/skilldialog.cpp:228
 msgid "Up"
 msgstr "+"
 
@@ -3279,16 +3332,15 @@ msgstr "+"
 msgid "Updating..."
 msgstr "Atualizando..."
 
-#: ../src/gui/inventorywindow.cpp:86 ../src/gui/inventorywindow.cpp:319
-#: ../src/gui/popupmenu.cpp:360
+#: ../src/gui/inventorywindow.cpp:93
 msgid "Use"
 msgstr "Usar"
 
-#: ../src/net/tmwa/guildhandler.cpp:305
+#: ../src/net/tmwa/guildhandler.cpp:306
 msgid "User is now part of your guild."
 msgstr "Usuário agora é um membro da sua guilda."
 
-#: ../src/net/tmwa/guildhandler.cpp:300
+#: ../src/net/tmwa/guildhandler.cpp:301
 msgid "User rejected guild invite."
 msgstr "O jogador rejeitou o convite."
 
@@ -3296,58 +3348,69 @@ msgstr "O jogador rejeitou o convite."
 msgid "Username already exists."
 msgstr "Nome de usuário já existe."
 
-#: ../src/gui/setup_video.cpp:252
+#: ../src/net/tmwa/loginhandler.cpp:188
+#, fuzzy
+msgid "Username permanently erased."
+msgstr "Nome de usuário já existe."
+
+#: ../src/gui/setup_video.cpp:244
 msgid "Video"
 msgstr "Vídeo"
 
-#: ../src/gui/setup_video.cpp:223
+#: ../src/gui/setup_video.cpp:215
 msgid "Visible names"
 msgstr "Nomes visíveis"
 
-#: ../src/net/manaserv/stats.cpp:92 ../src/net/tmwa/generalhandler.cpp:219
+#: ../src/net/manaserv/attributes.cpp:205
+#: ../src/net/tmwa/generalhandler.cpp:232
 msgid "Vitality"
 msgstr "Vitalidade"
 
-#: ../src/net/manaserv/stats.cpp:94 ../src/net/tmwa/generalhandler.cpp:103
+#: ../src/net/manaserv/attributes.cpp:212
+#, fuzzy, c-format
+msgid "Vitality %+.1f"
+msgstr "Vitalidade %+d"
+
+#: ../src/net/tmwa/generalhandler.cpp:104
 #, c-format
 msgid "Vitality %+d"
 msgstr "Vitalidade %+d"
 
-#: ../src/net/tmwa/charserverhandler.cpp:261
+#: ../src/net/tmwa/charserverhandler.cpp:272
 msgid "Vitality:"
 msgstr "Vitalidade:"
 
-#: ../src/gui/npcdialog.cpp:45
+#: ../src/gui/npcdialog.cpp:48
 msgid "Waiting for server"
 msgstr "Aguardando servidor"
 
-#: ../src/gui/serverdialog.cpp:448
+#: ../src/gui/serverdialog.cpp:447
 msgid "Waiting for server..."
 msgstr "Aguardando servidor..."
 
-#: ../src/net/tmwa/specialhandler.cpp:210
+#: ../src/net/tmwa/specialhandler.cpp:208
 msgid "Warp failed..."
 msgstr "Falha ao transportar..."
 
-#: ../src/net/manaserv/beinghandler.cpp:305
-#: ../src/net/tmwa/playerhandler.cpp:104
+#: ../src/net/manaserv/beinghandler.cpp:284
+#: ../src/net/tmwa/playerhandler.cpp:96
 msgid "We regret to inform you that your character was killed in battle."
 msgstr "Lamentamos informar que seu personagem foi morto em combate."
 
-#: ../src/keyboardconfig.cpp:83
+#: ../src/keyboardconfig.cpp:82
 msgid "Wear Outfit"
 msgstr "Vestir roupas"
 
-#: ../src/gui/inventorywindow.cpp:103
+#: ../src/gui/inventorywindow.cpp:111
 msgid "Weight:"
 msgstr "Peso:"
 
-#: ../src/gui/itempopup.cpp:126
+#: ../src/gui/itempopup.cpp:174
 #, c-format
 msgid "Weight: %s"
 msgstr "Peso: %s"
 
-#: ../src/gui/setup_players.cpp:259
+#: ../src/gui/setup_players.cpp:262
 msgid "When ignoring:"
 msgstr "Quando ignorar:"
 
@@ -3356,36 +3419,38 @@ msgstr "Quando ignorar:"
 msgid "Whisper %s"
 msgstr "Mensagem Privada %s"
 
-#: ../src/net/tmwa/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
-msgstr "Impossível enviar mensagem privada, você foi ignorado pelo usuário."
-
-#: ../src/net/tmwa/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
+#: ../src/net/tmwa/chathandler.cpp:87
+#, fuzzy, c-format
+msgid "Whisper could not be sent, %s is offline."
 msgstr "Impossível enviar mensagem privada, o usuário está desconectado."
 
-#: ../src/gui/chat.cpp:452
+#: ../src/net/tmwa/chathandler.cpp:96
+#, fuzzy, c-format
+msgid "Whisper could not be sent, ignored by %s."
+msgstr "Impossível enviar mensagem privada, você foi ignorado pelo usuário."
+
+#: ../src/gui/chat.cpp:494
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "Enviando MP para %s: %s"
 
-#: ../src/gui/socialwindow.cpp:158
+#: ../src/gui/socialwindow.cpp:154
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr "Quem você gostaria de convidar para a guilda %s?"
 
-#: ../src/gui/socialwindow.cpp:237
+#: ../src/gui/socialwindow.cpp:233
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr "Quem você gostaria de convidar para o grupo %s?"
 
-#: ../src/net/manaserv/stats.cpp:116
+#: ../src/net/manaserv/attributes.cpp:231
 msgid "Willpower"
 msgstr "Força de Vontade"
 
-#: ../src/net/manaserv/stats.cpp:118
-#, c-format
-msgid "Willpower %+d"
+#: ../src/net/manaserv/attributes.cpp:238
+#, fuzzy, c-format
+msgid "Willpower %+.1f"
 msgstr "Força de vontade %+d"
 
 #: ../src/net/manaserv/loginhandler.cpp:87
@@ -3408,66 +3473,66 @@ msgstr "Nome de usuário, senha ou email inválidos."
 msgid "Yes"
 msgstr "Sim"
 
-#: ../src/net/manaserv/beinghandler.cpp:325
+#: ../src/net/manaserv/beinghandler.cpp:304
 msgid "You Died"
 msgstr "Você morreu"
 
-#: ../src/net/tmwa/playerhandler.cpp:139
+#: ../src/net/tmwa/playerhandler.cpp:131
 msgid "You are an ex-player."
 msgstr "Você é um ex-jogador"
 
-#: ../src/net/tmwa/playerhandler.cpp:257
+#: ../src/net/tmwa/playerhandler.cpp:254
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 "Você está carregando mais que a metade de seu peso. Você não poderá mais "
 "recuperar HP."
 
-#: ../src/net/manaserv/beinghandler.cpp:304
-#: ../src/net/tmwa/playerhandler.cpp:103
+#: ../src/net/manaserv/beinghandler.cpp:283
+#: ../src/net/tmwa/playerhandler.cpp:95
 msgid "You are dead."
 msgstr "Você está morto."
 
-#: ../src/net/tmwa/playerhandler.cpp:128
+#: ../src/net/tmwa/playerhandler.cpp:120
 msgid "You are no more."
 msgstr "Você não é mais."
 
-#: ../src/net/manaserv/beinghandler.cpp:307
-#: ../src/net/tmwa/playerhandler.cpp:106
+#: ../src/net/manaserv/beinghandler.cpp:286
+#: ../src/net/tmwa/playerhandler.cpp:98
 msgid "You are not that alive anymore."
 msgstr "Você não me parece assim tão vivo."
 
-#: ../src/net/tmwa/partyhandler.cpp:345
+#: ../src/net/tmwa/partyhandler.cpp:340
 msgid "You can only inivte when you are in a party!"
 msgstr "Você só pode fazer convites se estiver em um grupo!"
 
-#: ../src/net/tmwa/specialhandler.cpp:183
+#: ../src/net/tmwa/specialhandler.cpp:181
 msgid "You cannot do that right now!"
 msgstr "Você não pode fazer isso agora!"
 
-#: ../src/net/tmwa/specialhandler.cpp:189
+#: ../src/net/tmwa/specialhandler.cpp:187
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Você não pode usar essa habilidade com esse tipo de arma!"
 
-#: ../src/gui/trade.cpp:316
+#: ../src/gui/trade.cpp:304
 msgid "You don't have enough money."
 msgstr "Você não tem dinheiro suficiente."
 
-#: ../src/gui/trade.cpp:97 ../src/gui/trade.cpp:133
+#: ../src/gui/trade.cpp:98 ../src/gui/trade.cpp:134
 #, c-format
 msgid "You get %s"
 msgstr "Você pegou %s"
 
-#: ../src/gui/trade.cpp:98
+#: ../src/gui/trade.cpp:99
 msgid "You give:"
 msgstr "Você dá:"
 
-#: ../src/gui/socialwindow.cpp:592
+#: ../src/gui/socialwindow.cpp:588
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "Você foi convidado para entrar no grupo %s."
 
-#: ../src/gui/socialwindow.cpp:588
+#: ../src/gui/socialwindow.cpp:584
 msgid "You have been invited you to join a party."
 msgstr "Você foi convidado para entrar em um grupo."
 
@@ -3478,7 +3543,7 @@ msgstr ""
 "Você foi permanentemente banido do jogo. Por favor entre em contato com "
 "algum GM."
 
-#: ../src/net/tmwa/loginhandler.cpp:172
+#: ../src/net/tmwa/loginhandler.cpp:175
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
@@ -3487,19 +3552,19 @@ msgstr ""
 "Você banido do jogo até %s.\n"
 "Por favor entre em contato com algum GM através dos fóruns."
 
-#: ../src/net/tmwa/playerhandler.cpp:129
+#: ../src/net/tmwa/playerhandler.cpp:121
 msgid "You have ceased to be."
 msgstr "Você deixou de ser."
 
-#: ../src/net/tmwa/partyhandler.cpp:241
+#: ../src/net/tmwa/partyhandler.cpp:236
 msgid "You have left the party."
 msgstr "Você saiu do grupo."
 
-#: ../src/net/tmwa/specialhandler.cpp:180
+#: ../src/net/tmwa/specialhandler.cpp:178
 msgid "You have no memos!"
 msgstr "Você não tem nenhuma nota armazenada!"
 
-#: ../src/net/tmwa/specialhandler.cpp:171
+#: ../src/net/tmwa/specialhandler.cpp:169
 msgid "You have not yet reached a high enough lvl!"
 msgstr "Você ainda não tem o nivel necessário!"
 
@@ -3508,15 +3573,15 @@ msgid "You may have to restart your client if you want to download new music"
 msgstr ""
 "Talvez você precise reiniciar o cliente se você quiser baixar novas músicas"
 
-#: ../src/gui/setup_video.cpp:478 ../src/gui/setup_video.cpp:486
+#: ../src/gui/setup_video.cpp:470 ../src/gui/setup_video.cpp:478
 msgid "You must restart to apply changes."
 msgstr "Você deve reiniciar o cliente para aplicar as mudanças."
 
-#: ../src/net/tmwa/specialhandler.cpp:195
+#: ../src/net/tmwa/specialhandler.cpp:193
 msgid "You need another blue gem!"
 msgstr "Você precisa de outra jóia azul!"
 
-#: ../src/net/tmwa/specialhandler.cpp:192
+#: ../src/net/tmwa/specialhandler.cpp:190
 msgid "You need another red gem!"
 msgstr "Você precisa de outra gema vermelha!"
 
@@ -3525,20 +3590,20 @@ msgid "You need to use the website to register an account for this server."
 msgstr ""
 "Você precisa usar o website para registrar uma nova conta neste servidor."
 
-#: ../src/localplayer.cpp:1276
+#: ../src/localplayer.cpp:920
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "Você pegou %d [@@%d|%s@@]."
 msgstr[1] "Você pegou %d [@@%d|%s@@]."
 
-#: ../src/net/tmwa/playerhandler.cpp:344
+#: ../src/net/tmwa/playerhandler.cpp:327
 #, c-format
 msgid "You picked up %s."
 msgstr "Você pegou %s."
 
-#: ../src/net/manaserv/beinghandler.cpp:319
-#: ../src/net/tmwa/playerhandler.cpp:124
+#: ../src/net/manaserv/beinghandler.cpp:298
+#: ../src/net/tmwa/playerhandler.cpp:116
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr "Você estragou tudo de novo, jogue fora seu corpo e arranje outro."
@@ -3547,35 +3612,35 @@ msgstr "Você estragou tudo de novo, jogue fora seu corpo e arranje outro."
 msgid "You took too long with the captcha or your response was incorrect."
 msgstr "Você demorou demais no Captcha ou sua resposta foi incorreta."
 
-#: ../src/net/tmwa/playerhandler.cpp:131
+#: ../src/net/tmwa/playerhandler.cpp:123
 msgid "You're a stiff."
 msgstr "Você é um cadáver."
 
-#: ../src/net/tmwa/specialhandler.cpp:198
+#: ../src/net/tmwa/specialhandler.cpp:196
 msgid "You're carrying to much to do this!"
 msgstr "Você está com muita carga para fazer isso!"
 
-#: ../src/net/tmwa/playerhandler.cpp:127
+#: ../src/net/tmwa/playerhandler.cpp:119
 msgid "You're not dead yet. You're just resting."
 msgstr "Você não morreu ainda. Está apenas descansando."
 
-#: ../src/net/tmwa/playerhandler.cpp:135
+#: ../src/net/tmwa/playerhandler.cpp:127
 msgid "You're off the twig."
 msgstr "Você bateu as botas."
 
-#: ../src/net/tmwa/playerhandler.cpp:140
+#: ../src/net/tmwa/playerhandler.cpp:132
 msgid "You're pining for the fjords."
 msgstr "Você foi desta para melhor."
 
-#: ../src/net/tmwa/playerhandler.cpp:130
+#: ../src/net/tmwa/playerhandler.cpp:122
 msgid "You've expired and gone to meet your maker."
 msgstr "Você expirou e foi encontrar seu criador."
 
-#: ../src/net/tmwa/playerhandler.cpp:136
+#: ../src/net/tmwa/playerhandler.cpp:128
 msgid "You've kicked the bucket."
 msgstr "Você chutou o balde."
 
-#: ../src/net/tmwa/playerhandler.cpp:137
+#: ../src/net/tmwa/playerhandler.cpp:129
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
@@ -3583,39 +3648,43 @@ msgstr ""
 "Você dispensou seu corpo mortal, abaixou as cortinas e juntou-se ao maldito "
 "coro invisível."
 
-#: ../src/net/tmwa/guildhandler.cpp:310
+#: ../src/net/tmwa/guildhandler.cpp:311
 msgid "Your guild is full."
 msgstr "Sua guilda está cheia."
 
-#: ../src/net/tmwa/playerhandler.cpp:134
+#: ../src/net/tmwa/playerhandler.cpp:126
 msgid "Your metabolic processes are now history."
 msgstr "Seus processos metabólicos agora são história."
 
-#: ../src/gui/charcreatedialog.cpp:178
+#: ../src/gui/charcreatedialog.cpp:184
 msgid "Your name needs to be at least 4 characters."
 msgstr "Seu nome deve ter pelo menos 4 caracteres."
 
-#: ../src/net/manaserv/beinghandler.cpp:312
-#: ../src/net/tmwa/playerhandler.cpp:112
+#: ../src/net/manaserv/beinghandler.cpp:291
+#: ../src/net/tmwa/playerhandler.cpp:104
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 "Seu plano de quebrar a arma de seu inimigo com a sua cabeça não deu certo."
 
-#: ../src/gui/setup_video.cpp:233
+#: ../src/main.cpp:43
+msgid "[mana-file] : The mana file is an XML file (.mana)"
+msgstr ""
+
+#: ../src/gui/setup_video.cpp:225
 msgid "as particle"
 msgstr "como partícula"
 
-#: ../src/gui/setup_video.cpp:180 ../src/gui/setup_video.cpp:194
+#: ../src/gui/setup_video.cpp:174 ../src/gui/setup_video.cpp:188
 msgid "high"
 msgstr "alto"
 
-#: ../src/gui/setup_video.cpp:231
+#: ../src/gui/setup_video.cpp:223
 msgid "in chat"
 msgstr "em chat"
 
-#: ../src/gui/setup_video.cpp:179 ../src/gui/setup_video.cpp:192
+#: ../src/gui/setup_video.cpp:173 ../src/gui/setup_video.cpp:186
 msgid "low"
 msgstr "baixo"
 
@@ -3623,29 +3692,29 @@ msgstr "baixo"
 msgid "mana [options] [mana-file]"
 msgstr "mana  [opções] [arquivo-mana]"
 
-#: ../src/gui/setup_video.cpp:195
+#: ../src/gui/setup_video.cpp:189
 msgid "max"
 msgstr "máximo"
 
-#: ../src/gui/setup_video.cpp:193
+#: ../src/gui/setup_video.cpp:187
 msgid "medium"
 msgstr "médio"
 
-#: ../src/gui/setup_video.cpp:178
+#: ../src/gui/setup_video.cpp:172
 msgid "off"
 msgstr "desligado"
 
-#: ../src/gui/serverdialog.cpp:556
+#: ../src/gui/serverdialog.cpp:550
 msgid "requires a newer version"
 msgstr "requer uma versão mais nova"
 
-#: ../src/gui/serverdialog.cpp:558
+#: ../src/gui/serverdialog.cpp:552
 #, c-format
 msgid "requires v%s"
 msgstr "requer v%s"
 
-#: ../src/resources/itemdb.cpp:162 ../src/resources/monsterdb.cpp:74
-#: ../src/resources/monsterinfo.cpp:29
+#: ../src/resources/beinginfo.cpp:32 ../src/resources/itemdb.cpp:260
+#: ../src/resources/monsterdb.cpp:77
 msgid "unnamed"
 msgstr "sem nome"
 
@@ -3724,6 +3793,9 @@ msgstr "sem nome"
 #~ msgid "@@use|Use@@"
 #~ msgstr "@@use|Usar@@"
 
+#~ msgid "Accepted guild invite from %s."
+#~ msgstr "Aceitou convite para a guilda de  %s."
+
 #~ msgid "Access denied."
 #~ msgstr "Acesso negado."
 
@@ -3790,9 +3862,18 @@ msgstr "sem nome"
 #~ msgid "Effect: %s"
 #~ msgstr "Efeito: %s"
 
+#~ msgid "Exp"
+#~ msgstr "Exp"
+
 #~ msgid "Failed to switch to "
 #~ msgstr "Falha ao mudar para "
 
+#~ msgid "Floating '...' bubble"
+#~ msgstr "Bolha '...' flutuante"
+
+#~ msgid "Floating bubble"
+#~ msgstr "Bolha Flutuante"
+
 #~ msgid "Follow %s"
 #~ msgstr "Seguir %s"
 
@@ -3805,6 +3886,9 @@ msgstr "sem nome"
 #~ msgid "Guilds"
 #~ msgstr "Corporações"
 
+#~ msgid "HP"
+#~ msgstr "HP"
+
 #~ msgid "HP Bar"
 #~ msgstr "Barra de HP"
 
@@ -3831,15 +3915,24 @@ msgstr "sem nome"
 #~ msgid "Item Too Expensive"
 #~ msgstr "Item muito caro"
 
+#~ msgid "Job"
+#~ msgstr "Trabalho"
+
 #~ msgid "Job Level: %d"
 #~ msgstr "Nível de Trabalho: %d"
 
 #~ msgid "Knife"
 #~ msgstr "Faca"
 
+#~ msgid "Level"
+#~ msgstr "Nível"
+
 #~ msgid "Logger"
 #~ msgstr "Histórico"
 
+#~ msgid "MP"
+#~ msgstr "MP"
+
 #~ msgid "Mace"
 #~ msgstr "Cetro"
 
@@ -3849,6 +3942,9 @@ msgstr "sem nome"
 #~ msgid "Max level"
 #~ msgstr "Nível máximo"
 
+#~ msgid "Money"
+#~ msgstr "Dinheiro"
+
 #~ msgid "Mystery Skill"
 #~ msgstr "Habilidade Mistério"
 
@@ -3865,6 +3961,9 @@ msgstr "sem nome"
 #~ msgid "One Handed Weapons"
 #~ msgstr "Armas para 1 mão"
 
+#~ msgid "One stat is zero."
+#~ msgstr "Um atributo é zero."
+
 #~ msgid "Pants"
 #~ msgstr "Calças"
 
@@ -3892,6 +3991,9 @@ msgstr "sem nome"
 #~ msgid "Recent:"
 #~ msgstr "Recente:"
 
+#~ msgid "Rejected guild invite from %s."
+#~ msgstr "Rejeitou convite para a guilda de  %s."
+
 #~ msgid "Remaining Status Points: %d"
 #~ msgstr "Pontos de Status Restantes: %d"
 
@@ -3922,6 +4024,12 @@ msgstr "sem nome"
 #~ msgid "Shooting"
 #~ msgstr "Tiro"
 
+#~ msgid "Special %d"
+#~ msgstr "Especial %d"
+
+#~ msgid "Specials Set %d"
+#~ msgstr "Especiais %d"
+
 #~ msgid "Staff"
 #~ msgstr "Cajado"
 
diff --git a/po/ru.po b/po/ru.po
index fdb9d4c5..e2900416 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
-"Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-12-13 20:04+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-04-30 16:41+0200\n"
 "PO-Revision-Date: 2011-02-23 01:02+0500\n"
 "Last-Translator: Mpa4Hu <ymen9@pisem.net>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -20,345 +20,408 @@ msgstr ""
 "X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/client.cpp:598 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:66
-msgid "Setup"
-msgstr "Настройка"
+#: ../src/gui/npcdialog.cpp:208
+msgid ""
+"\n"
+"> Next\n"
+msgstr ""
+"\n"
+"> Следующий\n"
 
-#: src/client.cpp:679
-msgid "Connecting to server"
-msgstr "Подключение к серверу"
+#: ../src/main.cpp:45
+msgid "              to the mana client."
+msgstr ""
 
-#: src/client.cpp:706
-msgid "Logging in"
-msgstr "Вход"
+#: ../src/main.cpp:44
+msgid "              used to set custom parameters"
+msgstr ""
 
-#: src/client.cpp:739
-msgid "Entering game world"
-msgstr "Вход в игровой мир"
+#: ../src/main.cpp:62
+msgid "     --chat-log-dir   : Chat log dir to use"
+msgstr ""
 
-#: src/client.cpp:804
-msgid "Requesting characters"
-msgstr "Запрос персонажей"
+#: ../src/main.cpp:61
+msgid "     --localdata-dir  : Directory to use as local data directory"
+msgstr ""
+"     --localdata-dir  : Директория для использования в качестве локальных "
+"данных"
 
-#: src/client.cpp:833
-msgid "Connecting to the game server"
-msgstr "Подключение к игровому серверу"
+#: ../src/main.cpp:65
+msgid "     --no-opengl      : Disable OpenGL for this session"
+msgstr "     --no-opengl      : Отключить OpenGL для этой сессии"
 
-#: src/client.cpp:843
-msgid "Changing game servers"
-msgstr "Изменение игровых серверов"
+#: ../src/main.cpp:63
+msgid "     --screenshot-dir : Directory to store screenshots"
+msgstr "     --screenshot-dir : Директория для скриншотов"
 
-#: src/client.cpp:872 src/client.cpp:879 src/client.cpp:1014
-#: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
-#: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:323 src/gui/unregisterdialog.cpp:133
-#: src/net/manaserv/charhandler.cpp:174 src/net/manaserv/charhandler.cpp:217
-#: src/net/tmwa/charserverhandler.cpp:134
-#: src/net/tmwa/charserverhandler.cpp:151
-msgid "Error"
-msgstr "Ошибка"
+#: ../src/main.cpp:56
+msgid "     --update-host    : Use this update host"
+msgstr "     --update-host    : Use this update host"
 
-#: src/client.cpp:888
-msgid "Requesting registration details"
-msgstr "Запрос регистрационных данных"
+#: ../src/main.cpp:50
+msgid "  -C --config-dir     : Configuration directory to use"
+msgstr "  -C --config-dir     : конфигурация директории"
 
-#: src/client.cpp:915
-msgid "Password Change"
-msgstr "Изменение пароля"
+#: ../src/main.cpp:57
+msgid "  -D --default        : Choose default character server and character"
+msgstr "  -D --default        : Выберите сервер и персонажа по умолчанию"
 
-#: src/client.cpp:916
-msgid "Password changed successfully!"
-msgstr "Пароль успешно изменен!"
+#: ../src/main.cpp:52
+msgid "  -P --password       : Login with this password"
+msgstr "  -P --password       : Войти с этим паролем"
 
-#: src/client.cpp:935
-msgid "Email Change"
-msgstr "Сменить E-MAIL"
+#: ../src/main.cpp:51
+msgid "  -U --username       : Login with this username"
+msgstr "  -U --username       : Войти с именем пользователя"
 
-#: src/client.cpp:936
-msgid "Email changed successfully!"
-msgstr "E-mail успешно изменена!"
+#: ../src/main.cpp:53
+msgid "  -c --character      : Login with this character"
+msgstr "  -c --character        : Авторизоваться под этим персонажем"
 
-#: src/client.cpp:956
-msgid "Unregister Successful"
-msgstr "Удаление аккаунта прошла успешно"
+#: ../src/main.cpp:60
+msgid "  -d --data           : Directory to load game data from"
+msgstr "  -d --data           : Директория для загрузки данных игры"
 
-#: src/client.cpp:957
-msgid "Farewell, come back any time..."
-msgstr "Прощайте, возвращайтесь в любое время..."
+#: ../src/main.cpp:49
+msgid "  -h --help           : Display this help"
+msgstr "  -h --help           : Отображает этот текст"
+
+#: ../src/main.cpp:55
+msgid "  -p --port           : Login server port"
+msgstr "  -p --port           : порт сервера"
 
-#: src/client.cpp:1138 src/client.cpp:1161
+#: ../src/main.cpp:54
+msgid "  -s --server         : Login server name or IP"
+msgstr "  -s --server         : Имя сервера или IP"
+
+#: ../src/main.cpp:59
+msgid "  -u --skip-update    : Skip the update downloads"
+msgstr "  -u --skip-update    : пропустить скачивание обновлений"
+
+#: ../src/main.cpp:48
+msgid "  -v --version        : Display the version"
+msgstr "  -v --version        : показать версию"
+
+#: ../src/gui/updatewindow.cpp:419
+msgid "##1  It is strongly recommended that"
+msgstr "##1  Настоятельно рекомендуется"
+
+#: ../src/gui/updatewindow.cpp:417
+msgid "##1  The update process is incomplete."
+msgstr "##1  Процесс обновления не завершен!"
+
+#: ../src/gui/updatewindow.cpp:421
+msgid "##1  you try again later."
+msgstr "##1  попробуйте позднее."
+
+#: ../src/net/tmwa/generalhandler.cpp:241
+#, fuzzy, no-c-format
+msgid "% Accuracy"
+msgstr "% Точность"
+
+#: ../src/net/tmwa/generalhandler.cpp:243
+#, fuzzy, no-c-format
+msgid "% Critical"
+msgstr "% Критический"
+
+#: ../src/net/tmwa/generalhandler.cpp:242
+#, fuzzy, no-c-format
+msgid "% Evade"
+msgstr "% Уварот"
+
+#: ../src/gui/debugwindow.cpp:61 ../src/gui/debugwindow.cpp:64
 #, c-format
-msgid "%s doesn't exist and can't be created! Exiting."
-msgstr ""
+msgid "%d FPS"
+msgstr "%d FPS"
 
-#: src/client.cpp:1281
+#: ../src/gui/debugwindow.cpp:56
 #, c-format
-msgid "Invalid update host: %s"
-msgstr "Неверный хост обновления: %s"
+msgid "%d FPS (OpenGL)"
+msgstr "%d FPS (OpenGL)"
 
-#: src/client.cpp:1315 src/client.cpp:1321
-msgid "Error creating updates directory!"
-msgstr "Ошибка при создании директории обновления!"
+#: ../src/client.cpp:1154 ../src/client.cpp:1182
+#, c-format
+msgid "%s doesn't exist and can't be created! Exiting."
+msgstr ""
 
-#: src/commandhandler.cpp:131 src/commandhandler.cpp:317
-msgid "Unknown command."
-msgstr "Неизвестная команда."
+#: ../src/net/manaserv/chathandler.cpp:306
+#, c-format
+msgid "%s entered the channel."
+msgstr "%s вступил в канал"
 
-#: src/commandhandler.cpp:160
-msgid "-- Help --"
-msgstr "-- Помощь --"
+#: ../src/gui/socialwindow.cpp:601
+#, c-format
+msgid "%s has invited you to join the %s party."
+msgstr "%s приглашает присоединиться к %s группе."
 
-#: src/commandhandler.cpp:161
-msgid "/help > Display this help"
-msgstr "/help > Отображает этот текст"
+#: ../src/gui/socialwindow.cpp:558
+#, c-format
+msgid "%s has invited you to join the guild %s."
+msgstr "%s приглашает присоединиться в гильдию к %s ."
 
-#: src/commandhandler.cpp:163
-msgid "/where > Display map name"
-msgstr "/where > Отображает имя карты"
+#: ../src/gui/socialwindow.cpp:596
+#, c-format
+msgid "%s has invited you to join their party."
+msgstr "%s приглашает вас к себе в группу."
 
-#: src/commandhandler.cpp:164
-msgid "/who > Display number of online users"
-msgstr "/who > Отображает количество пользователей он-лайн"
+#: ../src/net/manaserv/chathandler.cpp:337
+#, c-format
+msgid "%s has kicked %s."
+msgstr ""
 
-#: src/commandhandler.cpp:165
-msgid "/me > Tell something about yourself"
-msgstr "/me > Расскажите что-нибудь о себе"
+#: ../src/net/tmwa/partyhandler.cpp:246
+#, c-format
+msgid "%s has left your party."
+msgstr "%s вышел из группы"
 
-#: src/commandhandler.cpp:167
-msgid "/clear > Clears this window"
-msgstr "/clear > Очищает это окно"
+#: ../src/net/manaserv/chathandler.cpp:327
+#, c-format
+msgid "%s has set mode %s on user %s."
+msgstr ""
 
-#: src/commandhandler.cpp:169
-msgid "/msg > Send a private message to a user"
-msgstr "/msg > Послать приватное сообщение пользователю"
+#: ../src/net/tmwa/partyhandler.cpp:119
+#, c-format
+msgid "%s is already a member of a party."
+msgstr "%s уже является членом группы"
 
-#: src/commandhandler.cpp:170
-msgid "/whisper > Alias of msg"
-msgstr "/whisper > Вариант команды msg"
+#: ../src/net/tmwa/partyhandler.cpp:368
+#, c-format
+msgid "%s is not in your party!"
+msgstr "%s не находится в вашей группе!"
 
-#: src/commandhandler.cpp:171
-msgid "/w > Alias of msg"
-msgstr "/w > Вариант команды msg"
+#: ../src/net/tmwa/partyhandler.cpp:127
+#, c-format
+msgid "%s is now a member of your party."
+msgstr "%s теперь является членом вашей группы."
 
-#: src/commandhandler.cpp:172
-msgid "/query > Makes a tab for private messages with another user"
-msgstr "/query> Создает вкладку для чата с пользователем."
+#: ../src/net/manaserv/partyhandler.cpp:105
+#, c-format
+msgid "%s joined the party."
+msgstr "%s теперь в группе."
 
-#: src/commandhandler.cpp:174
-msgid "/q > Alias of query"
-msgstr "/q> Вариант query"
+#: ../src/net/manaserv/chathandler.cpp:311
+#, c-format
+msgid "%s left the channel."
+msgstr ""
 
-#: src/commandhandler.cpp:176
-msgid "/ignore > ignore a player"
-msgstr "/ignore > игнорировать игрока"
+#: ../src/net/tmwa/partyhandler.cpp:123
+#, c-format
+msgid "%s refused your invitation."
+msgstr "%s отклонил ваше приглашение."
 
-#: src/commandhandler.cpp:177
-msgid "/unignore > stop ignoring a player"
-msgstr "/unignore > прекратить игнорировать игрока"
+#: ../src/net/manaserv/partyhandler.cpp:123
+#, c-format
+msgid "%s rejected your invite."
+msgstr "%s отклонил ваше приглашение."
 
-#: src/commandhandler.cpp:179
-msgid "/list > Display all public channels"
-msgstr "/list > Показать список каналов"
+#: ../src/net/manaserv/tradehandler.cpp:116
+#: ../src/net/tmwa/tradehandler.cpp:110
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr "%s хочет торговатся с вами, вы принимаете?"
 
-#: src/commandhandler.cpp:180
-msgid "/join > Join or create a channel"
-msgstr "/join > Создать или присоединиться к каналу"
+#: ../src/gui/widgets/chattab.cpp:153
+#, c-format
+msgid "%s whispers: %s"
+msgstr "%s шепчет: %s"
 
-#: src/commandhandler.cpp:182
-msgid "/createparty > Create a new party"
-msgstr "/createparty > Создать группу"
+#: ../src/gui/charselectdialog.cpp:418 ../src/gui/charselectdialog.cpp:419
+msgid "(empty)"
+msgstr "(пусто)"
 
-#: src/commandhandler.cpp:183
-msgid "/party > Invite a user to party"
-msgstr "Пригласить пользователя на канал"
+#: ../src/commandhandler.cpp:221
+msgid "*** only available to a GM ***"
+msgstr "*** доступно только для GM ***"
 
-#: src/commandhandler.cpp:185
-msgid "/record > Start recording the chat to an external file"
-msgstr "/record > Записывать чат во внешний файл"
+#: ../src/gui/buy.cpp:74 ../src/gui/itemamount.cpp:112
+#: ../src/gui/npcdialog.cpp:124 ../src/gui/sell.cpp:74
+#: ../src/gui/statuswindow.cpp:464
+msgid "+"
+msgstr "+"
 
-#: src/commandhandler.cpp:187
-msgid "/toggle > Determine whether <return> toggles the chat log"
-msgstr ""
+#: ../src/gui/buy.cpp:77 ../src/gui/itemamount.cpp:111
+#: ../src/gui/npcdialog.cpp:125 ../src/gui/sell.cpp:75
+#: ../src/gui/statuswindow.cpp:476
+msgid "-"
+msgstr "-"
 
-#: src/commandhandler.cpp:189
-msgid "/present > Get list of players present (sent to chat log, if logging)"
-msgstr ""
-"/present > Показывает список игроков он-лайн (посылается в окно чата, если "
-"включен лог)"
+#: ../src/commandhandler.cpp:165
+msgid "-- Help --"
+msgstr "-- Помощь --"
 
-#: src/commandhandler.cpp:192
+#: ../src/commandhandler.cpp:200
 msgid "/announce > Global announcement (GM only)"
 msgstr "/announce > Глобальное извещение (доступно только админу)"
 
-#: src/commandhandler.cpp:196
-msgid "For more information, type /help <command>."
-msgstr "Для более точной информации введите /help <команда>"
+#: ../src/commandhandler.cpp:181
+msgid "/away > Tell the other whispering players you're away from keyboard."
+msgstr ""
 
-#: src/commandhandler.cpp:200
-msgid "Command: /help"
-msgstr "Команда: /help"
+#: ../src/commandhandler.cpp:172
+msgid "/clear > Clears this window"
+msgstr "/clear > Очищает это окно"
 
-#: src/commandhandler.cpp:201
-msgid "This command displays a list of all commands available."
-msgstr "Эта команда показывает список доступных команд"
+#: ../src/gui/widgets/whispertab.cpp:74
+msgid "/close > Close the whisper tab"
+msgstr "/close > Закрыть вкладку перешептывания"
 
-#: src/commandhandler.cpp:203
-msgid "Command: /help <command>"
-msgstr "Команда: /help <команда>"
+#: ../src/commandhandler.cpp:190
+msgid "/createparty > Create a new party"
+msgstr "/createparty > Создать группу"
 
-#: src/commandhandler.cpp:204
-msgid "This command displays help on <command>."
-msgstr "Эта команда показывает помощь по <команде>."
+#: ../src/net/tmwa/gui/partytab.cpp:64
+msgid "/exp > Show/change party experience sharing options"
+msgstr "/exp > Показать/Скрыть текущее состояние распределения опыта в группе"
 
-#: src/commandhandler.cpp:212
-msgid "Command: /announce <msg>"
-msgstr "Команда: /announce <сообщение>"
+#: ../src/commandhandler.cpp:166
+msgid "/help > Display this help"
+msgstr "/help > Отображает этот текст"
 
-#: src/commandhandler.cpp:213
-msgid "*** only available to a GM ***"
-msgstr "*** доступно только для GM ***"
+#: ../src/net/tmwa/gui/guildtab.cpp:61 ../src/net/tmwa/gui/partytab.cpp:59
+msgid "/help > Display this help."
+msgstr "/help > Показать сию справку"
 
-#: src/commandhandler.cpp:214
-msgid "This command sends the message <msg> to all players currently online."
-msgstr "Эта команда посылает <сообщение> всем игрокам в сети."
+#: ../src/gui/widgets/whispertab.cpp:72
+msgid "/ignore > Ignore the other player"
+msgstr "/ignore > Игнорировать игрока"
 
-#: src/commandhandler.cpp:219
-msgid "Command: /clear"
-msgstr "Команда: /clear"
+#: ../src/commandhandler.cpp:184
+msgid "/ignore > ignore a player"
+msgstr "/ignore > игнорировать игрока"
 
-#: src/commandhandler.cpp:220
-msgid "This command clears the chat log of previous chat."
-msgstr "Эта команда очищает лог чата."
+#: ../src/net/tmwa/gui/guildtab.cpp:62
+msgid "/invite > Invite a player to your guild"
+msgstr "/invite > Пригласить игрока в вашу гильдию"
 
-#: src/commandhandler.cpp:224
-msgid "Command: /ignore <player>"
-msgstr "Комманда: /ignore <пользователь>"
+#: ../src/net/tmwa/gui/partytab.cpp:60
+msgid "/invite > Invite a player to your party"
+msgstr "/invite > Пригласить игрока в вашу группу"
 
-#: src/commandhandler.cpp:225
-msgid "This command ignores the given player regardless of current relations."
+#: ../src/net/tmwa/gui/partytab.cpp:63
+msgid "/item > Show/change party item sharing options"
 msgstr ""
-"Эта команда игнорирует данного игрока, независимо от текущих отношений."
+"/item > Показать/Скрыть текущее состояние распределения предметов в группе"
 
-#: src/commandhandler.cpp:230
-msgid "Command: /join <channel>"
-msgstr "Команда: /join <канал>"
+#: ../src/commandhandler.cpp:188
+msgid "/join > Join or create a channel"
+msgstr "/join > Создать или присоединиться к каналу"
 
-#: src/commandhandler.cpp:231
-msgid "This command makes you enter <channel>."
-msgstr "Команда для входа на <канал>."
+#: ../src/gui/widgets/channeltab.cpp:53
+msgid "/kick > Kick a user from the channel"
+msgstr "/kick > Вышвырнуть пользователя с канала"
 
-#: src/commandhandler.cpp:232
-msgid "If <channel> doesn't exist, it's created."
-msgstr "Если <канал> не существует, он будет создан."
+#: ../src/net/tmwa/gui/guildtab.cpp:64
+msgid "/kick > Kick some one from the guild you are in"
+msgstr "/kick > Вышвырнуть кого-либо из вашей текущей гильдии"
 
-#: src/commandhandler.cpp:236
-msgid "Command: /list"
-msgstr "Команда: /list"
+#: ../src/net/tmwa/gui/partytab.cpp:62
+msgid "/kick > Kick some one from the party you are in"
+msgstr "/kick > Вышвырнуть кого-либо из вашей текущей группы"
 
-#: src/commandhandler.cpp:237
-msgid "This command shows a list of all channels."
-msgstr "Эта команда показывает список всех каналов."
+#: ../src/net/tmwa/gui/guildtab.cpp:63
+msgid "/leave > Leave the guild you are in"
+msgstr "/leave > Покинуть текущую гильдию"
 
-#: src/commandhandler.cpp:241
-msgid "Command: /me <message>"
-msgstr "Комманда: /me <сообщение>"
+#: ../src/net/tmwa/gui/partytab.cpp:61
+msgid "/leave > Leave the party you are in"
+msgstr "/leave > Покинуть текущую группу"
 
-#: src/commandhandler.cpp:242
-msgid "This command tell others you are (doing) <msg>."
-msgstr "Эта команда покажет другим игрокам, что вы (делаете) <сообщение>."
+#: ../src/commandhandler.cpp:187
+msgid "/list > Display all public channels"
+msgstr "/list > Показать список каналов"
 
-#: src/commandhandler.cpp:246
-msgid "Command: /msg <nick> <message>"
-msgstr "Комманда: /msg <имя персонажа> <сообщение>"
+#: ../src/commandhandler.cpp:170
+msgid "/me > Tell something about yourself"
+msgstr "/me > Расскажите что-нибудь о себе"
 
-#: src/commandhandler.cpp:247
-msgid "Command: /whisper <nick> <message>"
-msgstr "Команда: /whisper <имя персонажа> <сообщение>"
+#: ../src/commandhandler.cpp:174
+msgid "/msg > Send a private message to a user"
+msgstr "/msg > Послать приватное сообщение пользователю"
 
-#: src/commandhandler.cpp:248
-msgid "Command: /w <nick> <message>"
-msgstr "Команда: /w <ник> <сообщение>"
+#: ../src/gui/widgets/channeltab.cpp:52
+msgid "/op > Make a user a channel operator"
+msgstr "/op > Сделать пользователя оператором канала"
 
-#: src/commandhandler.cpp:249
-msgid "This command sends the text <message> to <nick>."
-msgstr "Эта команда посылает текст <сообщение> пользователю <nick>."
+#: ../src/commandhandler.cpp:191
+msgid "/party > Invite a user to party"
+msgstr "Пригласить пользователя на канал"
 
-#: src/commandhandler.cpp:250 src/commandhandler.cpp:269
-#: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
-#: src/net/tmwa/gui/guildtab.cpp:75 src/net/tmwa/gui/partytab.cpp:75
-msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
-msgstr "Если ник содержит пробелы, заключите его в кавычки (\")."
+#: ../src/commandhandler.cpp:197
+msgid "/present > Get list of players present (sent to chat log, if logging)"
+msgstr ""
+"/present > Показывает список игроков он-лайн (посылается в окно чата, если "
+"включен лог)"
 
-#: src/commandhandler.cpp:255
-msgid "Command: /query <nick>"
-msgstr "Команда: /query <имя персонажа>"
+#: ../src/commandhandler.cpp:179
+msgid "/q > Alias of query"
+msgstr "/q> Вариант query"
 
-#: src/commandhandler.cpp:256
-msgid "Command: /q <nick>"
-msgstr "Команда: /q <имя персонажа>"
+#: ../src/commandhandler.cpp:177
+msgid "/query > Makes a tab for private messages with another user"
+msgstr "/query> Создает вкладку для чата с пользователем."
 
-#: src/commandhandler.cpp:257
-msgid "This command tries to make a tab for whispers betweenyou and <nick>."
-msgstr ""
-"Эта команда создаст закладку для личного общения между вами и <имя игрока>."
+#: ../src/gui/widgets/channeltab.cpp:51
+msgid "/quit > Leave a channel"
+msgstr "/quit > Покинуть канал"
 
-#: src/commandhandler.cpp:262
-msgid "Command: /createparty <name>"
-msgstr "Комманда: /createparty <имя_группы>"
+#: ../src/commandhandler.cpp:193
+msgid "/record > Start recording the chat to an external file"
+msgstr "/record > Записывать чат во внешний файл"
 
-#: src/commandhandler.cpp:263
-msgid "This command creates a new party called <name>."
-msgstr "Эта комманда создает группу под названием <имя_группы>."
+#: ../src/commandhandler.cpp:195
+msgid "/toggle > Determine whether <return> toggles the chat log"
+msgstr ""
 
-#: src/commandhandler.cpp:267
-msgid "Command: /party <nick>"
-msgstr "Комманда: /party <имя>"
+#: ../src/gui/widgets/channeltab.cpp:50
+msgid "/topic > Set the topic of the current channel"
+msgstr "/topic > Задать тему текущего канала"
 
-#: src/commandhandler.cpp:268 src/net/tmwa/gui/partytab.cpp:74
-msgid "This command invites <nick> to party with you."
-msgstr "Эта команда приглашает <имя персонажа> к вам в группу."
+#: ../src/gui/widgets/whispertab.cpp:73
+msgid "/unignore > Stop ignoring the other player"
+msgstr "/unignore > Прекратить игнорировать игрока"
 
-#: src/commandhandler.cpp:274
-msgid "Command: /present"
-msgstr "Комманда: /present"
+#: ../src/commandhandler.cpp:185
+msgid "/unignore > stop ignoring a player"
+msgstr "/unignore > прекратить игнорировать игрока"
 
-#: src/commandhandler.cpp:275
-msgid ""
-"This command gets a list of players within hearing and sends it to either "
-"the record log if recording, or the chat log otherwise."
-msgstr ""
-"Комманда получпет список всех игроков, которых вы слышите и посылает его "
-"либо в лог-файл (если включена такая опция), либо в окно чата."
+#: ../src/gui/widgets/channeltab.cpp:49
+msgid "/users > Lists the users in the current channel"
+msgstr "/users > Список пользователей текущего канала"
 
-#: src/commandhandler.cpp:281
-msgid "Command: /record <filename>"
-msgstr "Команда: /record <имя файла>"
+#: ../src/commandhandler.cpp:176
+msgid "/w > Alias of msg"
+msgstr "/w > Вариант команды msg"
 
-#: src/commandhandler.cpp:282
-msgid "This command starts recording the chat log to the file <filename>."
-msgstr "Эта команда начнет протоколирование окна чата в файл <имя файла>."
+#: ../src/commandhandler.cpp:168
+msgid "/where > Display map name"
+msgstr "/where > Отображает имя карты"
 
-#: src/commandhandler.cpp:284
-msgid "Command: /record"
-msgstr "Команда: /record"
+#: ../src/commandhandler.cpp:175
+msgid "/whisper > Alias of msg"
+msgstr "/whisper > Вариант команды msg"
 
-#: src/commandhandler.cpp:285
-msgid "This command finishes a recording session."
-msgstr "Эта команда завершает запись."
+#: ../src/commandhandler.cpp:169
+msgid "/who > Display number of online users"
+msgstr "/who > Отображает количество пользователей он-лайн"
 
-#: src/commandhandler.cpp:289
-msgid "Command: /toggle <state>"
-msgstr "Комманда: /toggle <режим>"
+#: ../src/gui/charcreatedialog.cpp:73 ../src/gui/charcreatedialog.cpp:76
+#: ../src/gui/outfitwindow.cpp:66
+msgid "<"
+msgstr "<"
 
-#: src/commandhandler.cpp:290
+#: ../src/net/tmwa/gui/partytab.cpp:97
 msgid ""
-"This command sets whether the return key should toggle the chat log, or "
-"whether the chat log turns off automatically."
+"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
+"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
-"Эта комманда устанавливает, будет ли нажатие клавиши Enter переключать лог "
-"чата или же он (лог) будет выключен автоматически."
 
-#: src/commandhandler.cpp:292
+#: ../src/net/tmwa/gui/partytab.cpp:87
+msgid ""
+"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
+"\"0\", \"no\", \"false\" to disable item sharing."
+msgstr ""
+
+#: ../src/commandhandler.cpp:308
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
 "\"0\", \"no\", \"false\" to turn the toggle off."
@@ -366,3417 +429,3394 @@ msgstr ""
 "<режим> может быть \"1\", \"yes\", \"true\" дабы включить опцию или \"0\", "
 "\"no\", \"false\" чтобы выключить."
 
-#: src/commandhandler.cpp:295
-msgid "Command: /toggle"
-msgstr "Команда: /toggle"
+#: ../src/gui/charcreatedialog.cpp:70 ../src/gui/charcreatedialog.cpp:75
+#: ../src/gui/outfitwindow.cpp:67
+msgid ">"
+msgstr ">"
 
-#: src/commandhandler.cpp:296
-msgid "This command displays the return toggle status."
-msgstr ""
+#: ../src/gui/setup_players.cpp:206 ../src/gui/setup_video.cpp:147
+msgid "???"
+msgstr "???"
 
-#: src/commandhandler.cpp:300 src/gui/widgets/whispertab.cpp:95
-msgid "Command: /unignore <player>"
-msgstr "Комманда: /unignore <имя_игрока>"
+#: ../src/gui/socialwindow.cpp:563
+msgid "Accept Guild Invite"
+msgstr "Принять приглашение в гильдию"
 
-#: src/commandhandler.cpp:301
-msgid "This command stops ignoring the given player if they are being ignored"
-msgstr ""
-"Эта команда останавливает игнорирование данного игрока, если они игнорируетса"
+#: ../src/gui/socialwindow.cpp:609
+msgid "Accept Party Invite"
+msgstr "Принять приглашение в группу"
 
-#: src/commandhandler.cpp:306
-msgid "Command: /where"
-msgstr "Команда: /where"
+#: ../src/gui/socialwindow.cpp:463
+#, fuzzy
+msgid "Accepted guild invite"
+msgstr "Принять приглашение в гильдию"
 
-#: src/commandhandler.cpp:307
-msgid "This command displays the name of the current map."
-msgstr "Эта команда показывает имя текущей карты."
+#: ../src/gui/socialwindow.cpp:444
+#, c-format
+msgid "Accepted party invite from %s."
+msgstr "Принято приглашение от %s."
 
-#: src/commandhandler.cpp:311
-msgid "Command: /who"
-msgstr "Команда: /who"
+#: ../src/game.cpp:738
+msgid "Accepting incoming trade requests"
+msgstr "Принимать предложения о торговле"
 
-#: src/commandhandler.cpp:312
-msgid "This command displays the number of players currently online."
-msgstr "Эта команда показывает число пользователей в сети на данный момент."
+#: ../src/net/manaserv/tradehandler.cpp:95
+msgid "Accepting incoming trade requests."
+msgstr "Входящих запросов торговли принимаются."
 
-#: src/commandhandler.cpp:318
-msgid "Type /help for a list of commands."
-msgstr "Введите /help для получения списка команд."
+#: ../src/net/tmwa/charserverhandler.cpp:103
+msgid "Access denied. Most likely, there are too many players on this server."
+msgstr ""
+"Отказано в доступе. Скорее всего, слишком много игроков на этом сервере."
 
-#: src/commandhandler.cpp:384
-msgid "Cannot send empty whispers!"
-msgstr "Нельзя отправлять пустые сообщения!"
+#: ../src/gui/charselectdialog.cpp:120
+msgid "Account and Character Management"
+msgstr "Управление учётной записью"
 
-#: src/commandhandler.cpp:392
-#, c-format
-msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
-"you."
+#: ../src/net/manaserv/loginhandler.cpp:272
+msgid "Account banned"
+msgstr "Учётная запись заблокированна"
+
+#: ../src/net/manaserv/loginhandler.cpp:93
+msgid "Account banned."
+msgstr "Учётная запись заблокирована"
+
+#: ../src/net/tmwa/loginhandler.cpp:162
+msgid "Account expired."
+msgstr ""
+
+#: ../src/net/manaserv/loginhandler.cpp:124
+#: ../src/net/manaserv/loginhandler.cpp:155
+msgid "Account not connected. Please login first."
+msgstr ""
+
+#: ../src/net/tmwa/loginhandler.cpp:86
+msgid "Account was not found. Please re-login."
 msgstr ""
-"Невозможно создать вкладку для личного общения с игроком \"%s\"! Или вкладка "
-"уже создана, или этот игрок вы сами."
 
-#: src/commandhandler.cpp:406
+#: ../src/gui/changeemaildialog.cpp:49 ../src/gui/changepassworddialog.cpp:52
 #, c-format
-msgid "Requesting to join channel %s."
-msgstr "Запрос на присоединение к каналу %s."
+msgid "Account: %s"
+msgstr "Учётная запись: %s"
 
-#: src/commandhandler.cpp:419 src/net/tmwa/gui/partytab.cpp:109
-msgid "Party name is missing."
-msgstr "Имя группы отсутствует."
+#: ../src/gui/inventorywindow.cpp:106 ../src/gui/popupmenu.cpp:369
+msgid "Activate"
+msgstr "Активировать"
 
-#: src/commandhandler.cpp:432 src/commandhandler.cpp:509
-#: src/commandhandler.cpp:531
-msgid "Please specify a name."
-msgstr "Пожалуйста, укажите имя."
+#: ../src/gui/trade.cpp:76
+msgid "Add"
+msgstr "Добавить"
 
-#: src/commandhandler.cpp:450
-msgid "Return toggles chat."
-msgstr "Enter переключает вас на окно чата."
+#: ../src/gui/popupmenu.cpp:171
+msgid "Add name to chat"
+msgstr "Добавить в чат"
 
-#: src/commandhandler.cpp:450
-msgid "Message closes chat."
-msgstr "Сообщение закрывает чат."
+#: ../src/gui/popupmenu.cpp:190 ../src/gui/popupmenu.cpp:387
+msgid "Add to chat"
+msgstr "Добавить в чат"
 
-#: src/commandhandler.cpp:459
-msgid "Return now toggles chat."
-msgstr "Теперь Return переключает чат."
+#: ../src/net/manaserv/attributes.cpp:179
+#: ../src/net/tmwa/generalhandler.cpp:231
+msgid "Agility"
+msgstr "Ловкость"
 
-#: src/commandhandler.cpp:463
-msgid "Message now closes chat."
-msgstr "Теперь сообщение закрывает чат."
+#: ../src/net/manaserv/attributes.cpp:186
+#, fuzzy, c-format
+msgid "Agility %+.1f"
+msgstr "Ловкость %+d"
 
-#: src/commandhandler.cpp:476 src/commandhandler.cpp:489
-msgid "Show IP: On"
-msgstr "Показ IP: Включен"
+#: ../src/net/tmwa/generalhandler.cpp:103
+#, c-format
+msgid "Agility %+d"
+msgstr "Ловкость %+d"
 
-#: src/commandhandler.cpp:476 src/commandhandler.cpp:485
-msgid "Show IP: Off"
-msgstr "Показ IP: Отключен"
+#: ../src/net/tmwa/charserverhandler.cpp:271
+msgid "Agility:"
+msgstr "Выносливость:"
 
-#: src/commandhandler.cpp:515
-msgid "Player already ignored!"
-msgstr "Игрок уже игнорируется!"
+#: ../src/gui/trade.cpp:55
+msgid "Agree trade"
+msgstr "Подтвердить торговлю"
 
-#: src/commandhandler.cpp:522
-msgid "Player successfully ignored!"
-msgstr "Игрок успешно игнорирован!"
+#: ../src/gui/trade.cpp:56
+msgid "Agreed. Waiting..."
+msgstr "Подтверждено. Ждем-с..."
 
-#: src/commandhandler.cpp:524
-msgid "Player could not be ignored!"
-msgstr "Игрок не может быть игнорирован!"
+#: ../src/gui/itemamount.cpp:115
+msgid "All"
+msgstr "Всё"
 
-#: src/commandhandler.cpp:539
-msgid "Player wasn't ignored!"
-msgstr "Игрок не было игнорирован!"
+#: ../src/gui/setup_players.cpp:225
+msgid "Allow trading"
+msgstr "Разрешить торговлю"
 
-#: src/commandhandler.cpp:544
-msgid "Player no longer ignored!"
-msgstr "Игрок больше не игнорируется!"
+#: ../src/gui/setup_players.cpp:227
+msgid "Allow whispers"
+msgstr "Разрешить шептание"
 
-#: src/commandhandler.cpp:546
-#, fuzzy
-msgid "Player could not be unignored!"
-msgstr "Низзя прошептать: пользователь игнорирует шептание..."
+#: ../src/net/manaserv/loginhandler.cpp:90
+#: ../src/net/manaserv/loginhandler.cpp:269
+msgid "Already logged in."
+msgstr "Уже в сети."
 
-#: src/commandhandler.h:31
-#, c-format
-msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr ""
-"/%s может принимать значение \"yes\", \"no\", \"true\", \"false\", \"1\" или "
-"\"0\"."
+#: ../src/gui/recorder.cpp:96
+msgid "Already recording."
+msgstr "Запись уже ведётся."
 
-#: src/game.cpp:172
-msgid "General"
-msgstr "Общие"
+#: ../src/gui/setup_video.cpp:254
+msgid "Ambient FX"
+msgstr "Эффекты окружающей среды"
 
-#: src/game.cpp:342
-msgid "Screenshot saved as "
-msgstr "Снимок экрана сохранен как"
+#: ../src/gui/debugwindow.cpp:121
+#, fuzzy, c-format
+msgid "Ambient FX: %s"
+msgstr "Эффекты окружающей среды"
 
-#: src/game.cpp:347
-msgid "Saving screenshot failed!"
-msgstr "Ошибка при сохранении снимка экрана!"
+#: ../src/net/tmwa/partyhandler.cpp:299
+#, c-format
+msgid "An unknown member tried to say: %s"
+msgstr "Неизвестный член хотел сказать: %s"
 
-#: src/game.cpp:378
-msgid "The connection to the server was lost."
-msgstr "Соединение с сервером потеряно."
+#: ../src/net/manaserv/beinghandler.cpp:296
+#: ../src/net/tmwa/playerhandler.cpp:112
+msgid "Annihilated."
+msgstr "Уничтожены."
 
-#: src/game.cpp:382
-msgid "Network Error"
-msgstr "Ошибка сети"
+#: ../src/gui/setup.cpp:51
+msgid "Apply"
+msgstr "Применить"
 
-#: src/game.cpp:721
-msgid "Ignoring incoming trade requests"
-msgstr "Игнорировать предложения о торговле"
+#: ../src/gui/setup_video.cpp:461
+msgid "Applying change to OpenGL requires restart."
+msgstr "Переход к OpenGL требует перезагрузки игры."
 
-#: src/game.cpp:726
-msgid "Accepting incoming trade requests"
-msgstr "Принимать предложения о торговле"
+#: ../src/gui/setup_video.cpp:453
+msgid ""
+"Applying change to OpenGL requires restart. In case OpenGL messes up your "
+"game graphics, restart the game with the command line option \"--no-opengl\"."
+msgstr ""
+"Применение изменений в OpenGL требует перезапуски. В случае, если OpenGL не "
+"будет работать, перезагрузите игру с параметром командной строки \"--no-"
+"opengl\"."
 
-#: src/game.cpp:954
-msgid "Could Not Load Map"
-msgstr "Не удалось загрузить карту"
+#: ../src/gui/charselectdialog.cpp:73
+msgid "Are you sure you want to delete this character?"
+msgstr "Вы уверены, что хотите удалить этого персонажа?"
 
-#: src/game.cpp:955
+#: ../src/gui/socialwindow.cpp:164
 #, c-format
-msgid "Error while loading %s"
-msgstr "Ошибка во время загрузки %s"
+msgid "Are you sure you want to leave guild %s?"
+msgstr "Вы действительно хотите покинуть %s?"
 
-#: src/gui/beingpopup.cpp:76
+#: ../src/gui/socialwindow.cpp:243
 #, c-format
-msgid "Party: %s"
-msgstr "Группа: %s"
+msgid "Are you sure you want to leave party %s?"
+msgstr "Вы действительно хотите покинуть группу  %s? "
 
-#: src/gui/buy.cpp:49 src/gui/buy.cpp:78 src/gui/buysell.cpp:47
-msgid "Buy"
-msgstr "Купить"
+#: ../src/gui/setup_keyboard.cpp:86
+msgid "Assign"
+msgstr "Назначить"
 
-#: src/gui/buy.cpp:69 src/gui/buy.cpp:261 src/gui/sell.cpp:71
-#: src/gui/sell.cpp:288
+#: ../src/net/manaserv/charhandler.cpp:165
 #, c-format
-msgid "Price: %s / Total: %s"
-msgstr "Цена: %s / Всего: %s"
-
-#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
-#. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:112 src/gui/npcdialog.cpp:124
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:463
-msgid "+"
-msgstr "+"
+msgid "At least one statis out of the permitted range: (%u - %u)."
+msgstr ""
 
-#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
-#. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:111 src/gui/npcdialog.cpp:125
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:475
-msgid "-"
-msgstr "-"
+#: ../src/keyboardconfig.cpp:43 ../src/net/tmwa/generalhandler.cpp:237
+msgid "Attack"
+msgstr "Атаковать"
 
-#: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:228
-#: src/keyboardconfig.cpp:102
-msgid "Quit"
-msgstr "Выход"
+#: ../src/resources/itemdb.cpp:310
+#, c-format
+msgid "Attack %+d"
+msgstr "Атака %+d"
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:384
-#: src/gui/statuswindow.cpp:462 src/gui/statuswindow.cpp:496
-msgid "Max"
-msgstr "Макс"
+#: ../src/gui/popupmenu.cpp:87 ../src/gui/popupmenu.cpp:158
+#, c-format
+msgid "Attack %s"
+msgstr "Атаковать %s"
 
-#: src/gui/buysell.cpp:38
-msgid "Shop"
-msgstr "Магазин"
+#: ../src/gui/chat.cpp:329
+msgid "Attendance written to record log."
+msgstr ""
 
-#: src/gui/buysell.cpp:47 src/gui/sell.cpp:49 src/gui/sell.cpp:76
-msgid "Sell"
-msgstr "Продать"
+#: ../src/gui/setup_audio.cpp:47
+msgid "Audio"
+msgstr "Аудио"
 
-#: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
-#: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
-#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:114
-#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:175
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:389
-#: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:275 src/gui/textdialog.cpp:40
-#: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
-msgid "Cancel"
-msgstr "Отмена"
+#: ../src/net/tmwa/generalhandler.cpp:132
+msgid "Authentication failed."
+msgstr "Ошибка авторизации."
 
-#: src/gui/changeemaildialog.cpp:45 src/gui/changeemaildialog.cpp:54
-msgid "Change Email Address"
-msgstr "Сменить адрес E-mail"
+#: ../src/localplayer.cpp:1030
+msgid "Away"
+msgstr ""
 
-#: src/gui/changeemaildialog.cpp:49 src/gui/changepassworddialog.cpp:52
+#: ../src/gui/popupmenu.cpp:100
 #, c-format
-msgid "Account: %s"
-msgstr "Учётная запись: %s"
+msgid "Befriend %s"
+msgstr ""
 
-#: src/gui/changeemaildialog.cpp:51
-msgid "Type new email address twice:"
-msgstr "Дважды введите новый E-mail адрес:"
+#: ../src/resources/userpalette.cpp:91
+msgid "Being"
+msgstr ""
 
-#: src/gui/changeemaildialog.cpp:127
-#, c-format
-msgid "The new email address needs to be at least %d characters long."
-msgstr "Новый E-MAIL адрес должен содержать не менее %d символов."
+#: ../src/net/tmwa/playerhandler.cpp:124
+msgid "Bereft of life, you rest in peace."
+msgstr ""
 
-#: src/gui/changeemaildialog.cpp:134
-#, c-format
-msgid "The new email address needs to be less than %d characters long."
-msgstr "Новый E-MAIL адрес не должно содержать более %d символов."
+#: ../src/playerrelations.cpp:340
+msgid "Blink name"
+msgstr ""
 
-#: src/gui/changeemaildialog.cpp:141
-msgid "The email address entries mismatch."
-msgstr "Введенный E-mail адреса не совпадают."
+#: ../src/gui/setup_colors.cpp:139
+msgid "Blue:"
+msgstr "Синий:"
 
-#: src/gui/changepassworddialog.cpp:47 src/gui/changepassworddialog.cpp:56
-#: src/gui/charselectdialog.cpp:128
-msgid "Change Password"
-msgstr "Изменить пароль"
+#: ../src/gui/setup_video.cpp:160
+msgid "Bubbles with names"
+msgstr "Пузырьки с названиями"
 
-#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:55
-#: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
-msgid "Password:"
-msgstr "Пароль:"
+#: ../src/gui/setup_video.cpp:159
+msgid "Bubbles, no names"
+msgstr "Пузырьки, без названий"
 
-#: src/gui/changepassworddialog.cpp:63
-msgid "Type new password twice:"
-msgstr "Введите новый пароль дважды:"
+#: ../src/gui/buy.cpp:49 ../src/gui/buy.cpp:78 ../src/gui/buysell.cpp:47
+msgid "Buy"
+msgstr "Купить"
 
-#: src/gui/changepassworddialog.cpp:110
-msgid "Enter the old password first."
-msgstr "Сначала введите старый пароль"
+#: ../src/gui/setup_joystick.cpp:38 ../src/gui/setup_joystick.cpp:76
+msgid "Calibrate"
+msgstr "Калибровать"
 
-#: src/gui/changepassworddialog.cpp:116
-#, c-format
-msgid "The new password needs to be at least %d characters long."
-msgstr "Новый пароль должен быть не менше %d символов."
+#: ../src/gui/buysell.cpp:47 ../src/gui/changeemaildialog.cpp:55
+#: ../src/gui/changepassworddialog.cpp:58 ../src/gui/charcreatedialog.cpp:79
+#: ../src/gui/connectiondialog.cpp:44 ../src/gui/itemamount.cpp:114
+#: ../src/gui/npcpostdialog.cpp:57 ../src/gui/popupmenu.cpp:175
+#: ../src/gui/popupmenu.cpp:194 ../src/gui/popupmenu.cpp:389
+#: ../src/gui/quitdialog.cpp:47 ../src/gui/register.cpp:74
+#: ../src/gui/setup.cpp:51 ../src/gui/socialwindow.cpp:275
+#: ../src/gui/textdialog.cpp:40 ../src/gui/unregisterdialog.cpp:56
+#: ../src/gui/updatewindow.cpp:144
+msgid "Cancel"
+msgstr "Отмена"
 
-#: src/gui/changepassworddialog.cpp:123
+#: ../src/commandhandler.cpp:421
 #, c-format
-msgid "The new password needs to be less than %d characters long."
-msgstr "Новый пароль должен быть меньше, чем %d символов."
+msgid ""
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
+"you."
+msgstr ""
+"Невозможно создать вкладку для личного общения с игроком \"%s\"! Или вкладка "
+"уже создана, или этот игрок вы сами."
 
-#: src/gui/changepassworddialog.cpp:130
-msgid "The new password entries mismatch."
-msgstr "Пароли не совпадают"
+#: ../src/gui/socialwindow.cpp:620
+msgid "Cannot create party. You are already in a party"
+msgstr "Невозможно создать группу. Вы уже в группе"
 
-#: src/gui/charcreatedialog.cpp:53
-msgid "Create Character"
-msgstr "Создать персонажа"
+#: ../src/net/tmwa/playerhandler.cpp:366
+msgid "Cannot raise skill!"
+msgstr "Невозможно повысить умение!"
 
-#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:54
-#: src/gui/register.cpp:67
-msgid "Name:"
-msgstr "Имя:"
+#: ../src/gui/widgets/whispertab.cpp:53
+msgid "Cannot send empty chat!"
+msgstr "Низзя послать пустое сообщение!"
 
-#. TRANSLATORS: This is an arrow symbol used to denote 'next'.
-#. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
-#: src/gui/outfitwindow.cpp:67
-msgid ">"
-msgstr ">"
+#: ../src/commandhandler.cpp:400
+msgid "Cannot send empty whispers!"
+msgstr "Нельзя отправлять пустые сообщения!"
 
-#. TRANSLATORS: This is an arrow symbol used to denote 'previous'.
-#. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
-#: src/gui/outfitwindow.cpp:66
-msgid "<"
-msgstr "<"
+#: ../src/net/tmwa/specialhandler.cpp:160
+msgid "Cannot shout!"
+msgstr ""
 
-#: src/gui/charcreatedialog.cpp:74
-msgid "Hair color:"
-msgstr "Цвет волос:"
+#: ../src/net/tmwa/charserverhandler.cpp:107
+msgid "Cannot use this ID."
+msgstr "Низзя использовать данный ID."
 
-#: src/gui/charcreatedialog.cpp:77
-msgid "Hair style:"
-msgstr "Стрижка:"
+#: ../src/gui/trade.cpp:103
+msgid "Change"
+msgstr "Сменить"
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:392
-#: src/gui/socialwindow.cpp:329
-msgid "Create"
-msgstr "Создать"
+#: ../src/gui/charselectdialog.cpp:154
+msgid "Change Email"
+msgstr "Сменить E-mail"
 
-#: src/gui/charcreatedialog.cpp:80 src/gui/register.cpp:90
-msgid "Male"
-msgstr "Мужчина"
+#: ../src/gui/changeemaildialog.cpp:45 ../src/gui/changeemaildialog.cpp:54
+msgid "Change Email Address"
+msgstr "Сменить адрес E-mail"
 
-#: src/gui/charcreatedialog.cpp:81 src/gui/register.cpp:91
-msgid "Female"
-msgstr "Женщина"
+#: ../src/gui/worldselectdialog.cpp:76
+msgid "Change Login"
+msgstr "Сменить аккаунт"
 
-#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:251
-#, c-format
-msgid "Please distribute %d points"
-msgstr "Распределите очки (%d)"
+#: ../src/gui/changepassworddialog.cpp:47
+#: ../src/gui/changepassworddialog.cpp:56 ../src/gui/charselectdialog.cpp:132
+msgid "Change Password"
+msgstr "Изменить пароль"
 
-#: src/gui/charcreatedialog.cpp:178
-msgid "Your name needs to be at least 4 characters."
-msgstr "Имя должно содержать не менее четырех символов."
+#: ../src/gui/login.cpp:62
+msgid "Change Server"
+msgstr "Сменить сервер"
 
-#: src/gui/charcreatedialog.cpp:242
-msgid "Character stats OK"
-msgstr "Данные персонажа в порядке"
+#: ../src/gui/setup_video.cpp:607
+msgid "Changes will take effect on map change."
+msgstr "Изменения вступят в силу при переходе на другую карты."
 
-#: src/gui/charcreatedialog.cpp:256
-#, c-format
-msgid "Please remove %d points"
-msgstr "Снимите очки (%d)"
+#: ../src/client.cpp:848
+msgid "Changing game servers"
+msgstr "Изменение игровых серверов"
 
-#: src/gui/charselectdialog.cpp:69
-msgid "Confirm Character Delete"
-msgstr "Подтвердите удаление героя"
+#: ../src/gui/setup_video.cpp:452
+msgid "Changing to OpenGL"
+msgstr "Переключение на OpenGL"
 
-#: src/gui/charselectdialog.cpp:70
-msgid "Are you sure you want to delete this character?"
-msgstr "Вы уверены, что хотите удалить этого персонажа?"
+#: ../src/gui/widgets/channeltab.cpp:84
+msgid "Channel operators can kick and op other users from the channel."
+msgstr ""
+"Операторы канала могут вышвыривать пользователей и делать их операторами."
 
-#: src/gui/charselectdialog.cpp:117
-msgid "Account and Character Management"
-msgstr "Управление учётной записью"
+#: ../src/net/tmwa/chathandler.cpp:265 ../src/net/tmwa/chathandler.cpp:271
+#: ../src/net/tmwa/chathandler.cpp:276 ../src/net/tmwa/chathandler.cpp:281
+#: ../src/net/tmwa/chathandler.cpp:286 ../src/net/tmwa/chathandler.cpp:291
+#: ../src/net/tmwa/chathandler.cpp:296 ../src/net/tmwa/chathandler.cpp:301
+msgid "Channels are not supported!"
+msgstr "Каналы не поддерживаются!"
 
-#: src/gui/charselectdialog.cpp:127
-msgid "Switch Login"
-msgstr "Сменить аккаунт"
+#: ../src/net/tmwa/charserverhandler.cpp:146
+msgid "Character deleted."
+msgstr "Персонаж удален"
 
-#: src/gui/charselectdialog.cpp:141 src/gui/unregisterdialog.cpp:47
-#: src/gui/unregisterdialog.cpp:55
-msgid "Unregister"
-msgstr "Удалить регистрацию"
+#: ../src/gui/statuswindow.cpp:211 ../src/gui/statuswindow.cpp:248
+#, c-format
+msgid "Character points: %d"
+msgstr "Очки персонажа: %d"
 
-#: src/gui/charselectdialog.cpp:150
-msgid "Change Email"
-msgstr "Сменить E-mail"
+#: ../src/gui/charcreatedialog.cpp:248
+msgid "Character stats OK"
+msgstr "Данные персонажа в порядке"
 
-#: src/gui/charselectdialog.cpp:336 src/gui/serverdialog.cpp:231
-#: src/gui/setup_players.cpp:229
-msgid "Delete"
-msgstr "Удалить"
+#: ../src/net/manaserv/charhandler.cpp:147
+msgid "Character's name already exists."
+msgstr "Персонаж с таким именем уже существует."
 
-#: src/gui/charselectdialog.cpp:380
-msgid "Choose"
-msgstr "Выбрать"
+#: ../src/net/manaserv/charhandler.cpp:159
+msgid "Character's stats are too high."
+msgstr "Данные персонажа слишком высоки."
 
-#: src/gui/charselectdialog.cpp:394 src/gui/charselectdialog.cpp:395
-msgid "(empty)"
-msgstr "(пусто)"
+#: ../src/net/manaserv/charhandler.cpp:162
+msgid "Character's stats are too low."
+msgstr "Данные персонажа слишком низки"
 
-#: src/gui/chat.cpp:88
+#: ../src/gui/chat.cpp:88
 msgid "Chat"
 msgstr "Чат"
 
-#: src/gui/chat.cpp:311
-#, fuzzy, c-format
-msgid "Present: %s; %d players are present."
-msgstr "%d игроков он-лайн."
-
-#: src/gui/chat.cpp:329
-msgid "Attendance written to record log."
-msgstr ""
+#: ../src/keyboardconfig.cpp:75
+msgid "Chat Window"
+msgstr "Окно чата"
 
-#: src/gui/chat.cpp:493
-#, c-format
-msgid "Whispering to %s: %s"
-msgstr "Вы прошептали %s: %s"
+#: ../src/net/tmwa/specialhandler.cpp:154
+msgid "Chat creating failed!"
+msgstr "Создания чат не удалось!"
 
-#: src/gui/confirmdialog.cpp:42
-msgid "Yes"
-msgstr "Да"
+#: ../src/gui/charselectdialog.cpp:404
+msgid "Choose"
+msgstr "Выбрать"
 
-#: src/gui/confirmdialog.cpp:43
-msgid "No"
-msgstr "Нет"
+#: ../src/gui/worldselectdialog.cpp:77
+#, fuzzy
+msgid "Choose World"
+msgstr "Выберите сервер"
 
-#: src/gui/debugwindow.cpp:43
-msgid "Debug"
-msgstr "отлаживать"
+#: ../src/gui/serverdialog.cpp:197
+msgid "Choose Your Server"
+msgstr "Выберите сервер"
 
-#: src/gui/debugwindow.cpp:56
-#, c-format
-msgid "%d FPS (OpenGL)"
-msgstr "%d FPS (OpenGL)"
+#: ../src/gui/socialwindow.cpp:541
+msgid "Choose your guild's name."
+msgstr "Выберите имя для гильдии."
 
-#: src/gui/debugwindow.cpp:61 src/gui/debugwindow.cpp:64
-#, c-format
-msgid "%d FPS"
-msgstr "%d FPS"
+#: ../src/gui/socialwindow.cpp:626
+msgid "Choose your party's name."
+msgstr "Выберите название для вашей группы."
 
-#: src/gui/debugwindow.cpp:65 src/gui/debugwindow.cpp:104
-#, c-format
-msgid "Music: %s"
-msgstr "Музыка: %s"
+#: ../src/gui/npcdialog.cpp:118
+msgid "Clear log"
+msgstr "Очистить запись"
 
-#: src/gui/debugwindow.cpp:66 src/gui/debugwindow.cpp:108
-#, c-format
-msgid "Map: %s"
-msgstr "Карта: %s"
+#: ../src/net/manaserv/loginhandler.cpp:239
+msgid ""
+"Client registration is not allowed. Please contact server administration."
+msgstr ""
 
-#: src/gui/debugwindow.cpp:67 src/gui/debugwindow.cpp:106
-#, c-format
-msgid "Minimap: %s"
-msgstr "Миникарта: %s"
+#: ../src/net/tmwa/loginhandler.cpp:172
+#, fuzzy
+msgid "Client too old."
+msgstr "Версия клиента устарела."
 
-#: src/gui/debugwindow.cpp:68 src/gui/debugwindow.cpp:99
-#, c-format
-msgid "Cursor: (%d, %d)"
-msgstr "Курсор: (%d, %d)"
+#: ../src/net/manaserv/loginhandler.cpp:263
+#: ../src/net/manaserv/loginhandler.cpp:300
+msgid "Client version is too old."
+msgstr "Версия клиента устарела."
 
-#: src/gui/debugwindow.cpp:69 src/gui/debugwindow.cpp:111
-#, fuzzy, c-format
-msgid "Particle count: %d"
-msgstr "Эффекты частиц"
+#: ../src/gui/help.cpp:51 ../src/gui/npcdialog.cpp:50
+msgid "Close"
+msgstr "Закрыть"
 
-#: src/gui/debugwindow.cpp:116
-#, fuzzy, c-format
-msgid "Particle detail: %s"
-msgstr "Качество частиц"
+#: ../src/gui/setup_colors.cpp:51
+msgid "Colors"
+msgstr "Цвета"
 
-#: src/gui/debugwindow.cpp:121
-#, fuzzy, c-format
-msgid "Ambient FX: %s"
-msgstr "Эффекты окружающей среды"
+#: ../src/commandhandler.cpp:220
+msgid "Command: /announce <msg>"
+msgstr "Команда: /announce <сообщение>"
 
-#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:55
-msgid "Equipment"
-msgstr "Снаряжение"
+#: ../src/commandhandler.cpp:273
+#, fuzzy
+msgid "Command: /away"
+msgstr "Команда: /who"
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:89
-#: src/gui/inventorywindow.cpp:337 src/gui/popupmenu.cpp:359
-msgid "Unequip"
-msgstr "Снять"
+#: ../src/commandhandler.cpp:270
+#, fuzzy
+msgid "Command: /away <afk reason>"
+msgstr "Команда: /w <ник> <сообщение>"
 
-#: src/gui/help.cpp:37
-msgid "Help"
-msgstr "Помощь"
+#: ../src/commandhandler.cpp:227
+msgid "Command: /clear"
+msgstr "Команда: /clear"
 
-#: src/gui/help.cpp:51 src/gui/npcdialog.cpp:50
-msgid "Close"
-msgstr "Закрыть"
+#: ../src/gui/widgets/whispertab.cpp:84
+msgid "Command: /close"
+msgstr "Комманда: /close"
 
-#: src/gui/inventorywindow.cpp:59 src/gui/windowmenu.cpp:56
-msgid "Inventory"
-msgstr "Инвентарь"
+#: ../src/commandhandler.cpp:278
+msgid "Command: /createparty <name>"
+msgstr "Комманда: /createparty <имя_группы>"
 
-#: src/gui/inventorywindow.cpp:59
-msgid "Storage"
-msgstr "Хранение"
+#: ../src/net/tmwa/gui/partytab.cpp:100
+msgid "Command: /exp"
+msgstr ""
 
-#: src/gui/inventorywindow.cpp:82
-msgid "Slots:"
-msgstr "Вместимость:"
+#: ../src/net/tmwa/gui/partytab.cpp:95
+msgid "Command: /exp <policy>"
+msgstr ""
 
-#: src/gui/inventorywindow.cpp:87 src/gui/inventorywindow.cpp:100
-#: src/gui/inventorywindow.cpp:339 src/gui/popupmenu.cpp:361
-msgid "Equip"
-msgstr "Надеть"
+#: ../src/commandhandler.cpp:208
+msgid "Command: /help"
+msgstr "Команда: /help"
 
-#: src/gui/inventorywindow.cpp:88
-msgid "Use"
-msgstr "Использовать"
+#: ../src/commandhandler.cpp:211
+msgid "Command: /help <command>"
+msgstr "Команда: /help <команда>"
 
-#: src/gui/inventorywindow.cpp:101 src/gui/popupmenu.cpp:364
-msgid "Activate"
-msgstr "Активировать"
+#: ../src/gui/widgets/whispertab.cpp:89
+msgid "Command: /ignore"
+msgstr "Команда: /ignore"
 
-#: src/gui/inventorywindow.cpp:102 src/gui/inventorywindow.cpp:348
-#: src/gui/popupmenu.cpp:367
-msgid "Drop..."
-msgstr "Бросить..."
+#: ../src/commandhandler.cpp:232
+msgid "Command: /ignore <player>"
+msgstr "Комманда: /ignore <пользователь>"
 
-#: src/gui/inventorywindow.cpp:103 src/gui/popupmenu.cpp:373
-msgid "Split"
-msgstr "Разделить"
+#: ../src/net/tmwa/gui/guildtab.cpp:73 ../src/net/tmwa/gui/partytab.cpp:73
+msgid "Command: /invite <nick>"
+msgstr "Комманда: /invite <игрок>"
 
-#: src/gui/inventorywindow.cpp:104 src/gui/outfitwindow.cpp:51
-msgid "Outfits"
+#: ../src/net/tmwa/gui/partytab.cpp:90
+msgid "Command: /item"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:106
-msgid "Weight:"
-msgstr "Вес:"
+#: ../src/net/tmwa/gui/partytab.cpp:85
+msgid "Command: /item <policy>"
+msgstr ""
 
-#: src/gui/inventorywindow.cpp:124 src/gui/popupmenu.cpp:378
-msgid "Store"
-msgstr "Хранить"
+#: ../src/commandhandler.cpp:238
+msgid "Command: /join <channel>"
+msgstr "Команда: /join <канал>"
 
-#: src/gui/inventorywindow.cpp:125 src/gui/popupmenu.cpp:385
-msgid "Retrieve"
-msgstr "Получить"
+#: ../src/gui/widgets/channeltab.cpp:89
+msgid "Command: /kick <nick>"
+msgstr "Комманда: /kick <имя персонажа>"
 
-#: src/gui/inventorywindow.cpp:350 src/gui/popupmenu.cpp:369
-msgid "Drop"
-msgstr "Бросить"
+#: ../src/net/tmwa/gui/guildtab.cpp:80 ../src/net/tmwa/gui/partytab.cpp:80
+msgid "Command: /leave"
+msgstr "Комманда: /leave"
 
-#: src/gui/itemamount.cpp:113 src/gui/okdialog.cpp:42
-#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:39 src/gui/trade.cpp:72
-#: src/gui/trade.cpp:74
-msgid "OK"
-msgstr "ОК"
+#: ../src/commandhandler.cpp:244
+msgid "Command: /list"
+msgstr "Команда: /list"
 
-#: src/gui/itemamount.cpp:115
-msgid "All"
-msgstr "Всё"
+#: ../src/commandhandler.cpp:249
+msgid "Command: /me <message>"
+msgstr "Комманда: /me <сообщение>"
 
-#: src/gui/itemamount.cpp:141
-msgid "Select amount of items to trade."
-msgstr "Сколько предметов продать."
+#: ../src/commandhandler.cpp:254
+msgid "Command: /msg <nick> <message>"
+msgstr "Комманда: /msg <имя персонажа> <сообщение>"
 
-#: src/gui/itemamount.cpp:144
-msgid "Select amount of items to drop."
-msgstr "Сколько предметов сбросить."
+#: ../src/gui/widgets/channeltab.cpp:80
+msgid "Command: /op <nick>"
+msgstr "Комманда: /op <имя>"
 
-#: src/gui/itemamount.cpp:147
-msgid "Select amount of items to store."
-msgstr "Укажите количество вещей для хранения."
+#: ../src/commandhandler.cpp:283
+msgid "Command: /party <nick>"
+msgstr "Комманда: /party <имя>"
 
-#: src/gui/itemamount.cpp:150
-msgid "Select amount of items to retrieve."
-msgstr "Укажите количество вещей для изъятия."
+#: ../src/commandhandler.cpp:290
+msgid "Command: /present"
+msgstr "Комманда: /present"
 
-#: src/gui/itemamount.cpp:153
-msgid "Select amount of items to split."
-msgstr "Сколько предметов разделить."
+#: ../src/commandhandler.cpp:264
+msgid "Command: /q <nick>"
+msgstr "Команда: /q <имя персонажа>"
 
-#: src/gui/itempopup.cpp:137
-#, c-format
-msgid "Weight: %s"
-msgstr "Вес: %s"
+#: ../src/commandhandler.cpp:263
+msgid "Command: /query <nick>"
+msgstr "Команда: /query <имя персонажа>"
 
-#: src/gui/login.cpp:51 src/gui/login.cpp:63
-msgid "Login"
-msgstr "Вход"
+#: ../src/gui/widgets/channeltab.cpp:73
+msgid "Command: /quit"
+msgstr "Комманда: /quit"
 
-#: src/gui/login.cpp:60
-msgid "Remember username"
-msgstr "Запомнить имя пользователя"
+#: ../src/commandhandler.cpp:300
+msgid "Command: /record"
+msgstr "Команда: /record"
 
-#: src/gui/login.cpp:61 src/gui/register.cpp:58 src/gui/register.cpp:73
-msgid "Register"
-msgstr "Зарегистрироваться"
+#: ../src/commandhandler.cpp:297
+msgid "Command: /record <filename>"
+msgstr "Команда: /record <имя файла>"
 
-#: src/gui/login.cpp:62
-msgid "Change Server"
-msgstr "Сменить сервер"
+#: ../src/commandhandler.cpp:311
+msgid "Command: /toggle"
+msgstr "Команда: /toggle"
 
-#: src/gui/login.cpp:129
-msgid "Registration disabled"
-msgstr "Регистрация приостановлена"
+#: ../src/commandhandler.cpp:305
+msgid "Command: /toggle <state>"
+msgstr "Комманда: /toggle <режим>"
 
-#: src/gui/login.cpp:129
-msgid "You need to use the website to register an account for this server."
-msgstr ""
-"Вам необходимо использовать веб-сайт, чтобы зарегистрировать новый аккаунт"
+#: ../src/gui/widgets/channeltab.cpp:68
+msgid "Command: /topic <message>"
+msgstr "Комманда: /topic <сообщение>"
 
-#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:86
-msgid "Map"
-msgstr "Карта"
+#: ../src/commandhandler.cpp:316 ../src/gui/widgets/whispertab.cpp:95
+msgid "Command: /unignore <player>"
+msgstr "Комманда: /unignore <имя_игрока>"
 
-#: src/gui/ministatus.cpp:235
-msgid "Need"
-msgstr "Необходимо"
+#: ../src/gui/widgets/channeltab.cpp:63
+msgid "Command: /users"
+msgstr "Комманды: /users"
 
-#: src/gui/npcdialog.cpp:48
-msgid "Waiting for server"
-msgstr "Ожидание ответа от сервера"
+#: ../src/commandhandler.cpp:256
+msgid "Command: /w <nick> <message>"
+msgstr "Команда: /w <ник> <сообщение>"
 
-#: src/gui/npcdialog.cpp:49
-msgid "Next"
-msgstr "Следующий"
+#: ../src/commandhandler.cpp:322
+msgid "Command: /where"
+msgstr "Команда: /where"
 
-#: src/gui/npcdialog.cpp:51
-msgid "Submit"
-msgstr "Применить"
+#: ../src/commandhandler.cpp:255
+msgid "Command: /whisper <nick> <message>"
+msgstr "Команда: /whisper <имя персонажа> <сообщение>"
 
-#: src/gui/npcdialog.cpp:73 src/gui/npcpostdialog.cpp:41
-msgid "NPC"
-msgstr "NPC"
+#: ../src/commandhandler.cpp:327
+msgid "Command: /who"
+msgstr "Команда: /who"
 
-#: src/gui/npcdialog.cpp:118
-msgid "Clear log"
-msgstr "Очистить запись"
+#: ../src/gui/updatewindow.cpp:515
+msgid "Completed"
+msgstr "Завершено"
 
-#: src/gui/npcdialog.cpp:134
-msgid "Reset"
-msgstr "Сбросить"
+#: ../src/playerrelations.cpp:310
+msgid "Completely ignore"
+msgstr "Полностью игнорировать"
 
-#. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:208
-msgid ""
-"\n"
-"> Next\n"
-msgstr ""
-"\n"
-"> Следующий\n"
+#: ../src/gui/popupmenu.cpp:117
+#, c-format
+msgid "Completely ignore %s"
+msgstr "Полностью игнорировать %s"
 
-#: src/gui/npcpostdialog.cpp:47
-msgid "To:"
-msgstr "Для:"
+#: ../src/gui/charselectdialog.cpp:72
+msgid "Confirm Character Delete"
+msgstr "Подтвердите удаление героя"
 
-#: src/gui/npcpostdialog.cpp:54
-msgid "Send"
-msgstr "Отправить"
+#: ../src/gui/register.cpp:69
+msgid "Confirm:"
+msgstr "Подтвердите:"
 
-#: src/gui/npcpostdialog.cpp:99
-msgid "Failed to send as sender or letter invalid."
-msgstr "Невозможно послать ибо отправитель либо сообщение неверны."
+#: ../src/gui/trade.cpp:54
+msgid "Confirmed. Waiting..."
+msgstr "Подтверждено. Ждем-с..."
 
-#: src/gui/outfitwindow.cpp:68 src/gui/outfitwindow.cpp:141
-#: src/gui/outfitwindow.cpp:154
+#: ../src/keyboardconfig.cpp:183
 #, c-format
-msgid "Outfit: %d"
+msgid ""
+"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
+"strange behaviour."
 msgstr ""
+"Конфликт между  \"%s\" и  \"%s\" ключами. Исправьте их, или игра может себя "
+"странно вести."
 
-#: src/gui/outfitwindow.cpp:70
-msgid "Unequip first"
-msgstr "Сначало снемите"
+#: ../src/gui/serverdialog.cpp:229
+msgid "Connect"
+msgstr "Соединение"
 
-#: src/gui/popupmenu.cpp:83
-#, c-format
-msgid "Trade with %s..."
-msgstr "Торговать с %s..."
+#: ../src/client.cpp:661
+msgid "Connecting to server"
+msgstr "Подключение к серверу"
 
-#: src/gui/popupmenu.cpp:87 src/gui/popupmenu.cpp:158
-#, c-format
-msgid "Attack %s"
-msgstr "Атаковать %s"
+#: ../src/client.cpp:838
+msgid "Connecting to the game server"
+msgstr "Подключение к игровому серверу"
 
-#: src/gui/popupmenu.cpp:91
-#, c-format
-msgid "Whisper %s"
-msgstr "Шептать %s"
+#: ../src/gui/updatewindow.cpp:142
+msgid "Connecting..."
+msgstr "Соединение..."
 
-#: src/gui/popupmenu.cpp:100
-#, c-format
-msgid "Befriend %s"
-msgstr ""
+#: ../src/net/tmwa/network.cpp:414
+msgid "Connection to server terminated. "
+msgstr "Подключение к карт прекращено"
 
-#: src/gui/popupmenu.cpp:105
-#, c-format
-msgid "Disregard %s"
+#: ../src/keyboardconfig.cpp:83
+msgid "Copy Outfit"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:108
-#, c-format
-msgid "Ignore %s"
-msgstr "Игнорировано %s"
+#: ../src/gui/statuswindow.cpp:256
+#, fuzzy, c-format
+msgid "Correction points: %d"
+msgstr "Очков навыков: %d"
 
-#: src/gui/popupmenu.cpp:114 src/gui/popupmenu.cpp:123
-#, c-format
-msgid "Unignore %s"
-msgstr ""
+#: ../src/game.cpp:966
+msgid "Could Not Load Map"
+msgstr "Не удалось загрузить карту"
 
-#: src/gui/popupmenu.cpp:117
-#, c-format
-msgid "Completely ignore %s"
-msgstr "Полностью игнорировать %s"
+#: ../src/net/tmwa/partyhandler.cpp:82
+msgid "Could not create party."
+msgstr "Не удалось создать группу."
 
-#: src/gui/popupmenu.cpp:130
-#, c-format
-msgid "Invite %s to join your guild"
-msgstr "Пригласить %s в вашу гильдию"
+#: ../src/net/tmwa/guildhandler.cpp:296
+msgid "Could not inivte user to guild."
+msgstr "Не удалось пригласить пользователя в гильдию."
 
-#: src/gui/popupmenu.cpp:134
-#, c-format
-msgid "Invite %s to join your party"
-msgstr "Пригласить %s в вашу группу"
+#: ../src/net/tmwa/specialhandler.cpp:157
+msgid "Could not join party!"
+msgstr "Невозможно присоединиться к группе!"
 
-#: src/gui/popupmenu.cpp:141
-msgid "Kick player"
-msgstr ""
+#: ../src/net/tmwa/specialhandler.cpp:211
+msgid "Could not steal anything..."
+msgstr "Нечего не удалось украсть..."
 
-#: src/gui/popupmenu.cpp:150
-#, c-format
-msgid "Talk to %s"
-msgstr "Говорить с %s"
+#: ../src/gui/charcreatedialog.cpp:78 ../src/gui/charselectdialog.cpp:416
+#: ../src/gui/socialwindow.cpp:330
+msgid "Create"
+msgstr "Создать"
 
-#: src/gui/popupmenu.cpp:163
-msgid "Kick monster"
-msgstr "Вышвырнуть монстра"
+#: ../src/gui/charcreatedialog.cpp:53
+msgid "Create Character"
+msgstr "Создать персонажа"
 
-#: src/gui/popupmenu.cpp:171
-msgid "Add name to chat"
-msgstr "Добавить в чат"
+#: ../src/gui/socialwindow.cpp:272
+msgid "Create Guild"
+msgstr "Создать Гильдию"
 
-#: src/gui/popupmenu.cpp:188
+#: ../src/gui/socialwindow.cpp:273 ../src/gui/socialwindow.cpp:619
+msgid "Create Party"
+msgstr "Создать группу"
+
+#: ../src/gui/socialwindow.cpp:503
 #, c-format
-msgid "Pick up %s"
-msgstr "Поднять %s"
+msgid "Creating guild called %s."
+msgstr "Создаетса гилдия %s."
 
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:387
-msgid "Add to chat"
-msgstr "Добавить в чат"
+#: ../src/gui/socialwindow.cpp:496
+msgid "Creating guild failed, please choose a shorter name."
+msgstr "Создание гильдии не удалось, пожалуйста, выберите более короткое имя."
 
-#: src/gui/quitdialog.cpp:44
-msgid "Switch server"
-msgstr "Сменить сервер"
+#: ../src/gui/socialwindow.cpp:526
+#, c-format
+msgid "Creating party called %s."
+msgstr "Создание группи %s."
 
-#: src/gui/quitdialog.cpp:45
-msgid "Switch character"
-msgstr "Сменить персонажа"
+#: ../src/gui/socialwindow.cpp:519
+msgid "Creating party failed, please choose a shorter name."
+msgstr "Создание группи не удалось, пожалуйста, выберите более короткое имя."
 
-#: src/gui/recorder.cpp:87
-msgid "Finishing recording."
-msgstr "Запись завершена."
+#: ../src/resources/userpalette.cpp:105
+msgid "Critical Hit"
+msgstr "Критический удар"
 
-#: src/gui/recorder.cpp:91
-msgid "Not currently recording."
-msgstr "Запись не ведётся."
+#: ../src/gui/debugwindow.cpp:68 ../src/gui/debugwindow.cpp:99
+#, c-format
+msgid "Cursor: (%d, %d)"
+msgstr "Курсор: (%d, %d)"
 
-#: src/gui/recorder.cpp:96
-msgid "Already recording."
-msgstr "Запись уже ведётся."
+#: ../src/gui/serverdialog.cpp:230
+msgid "Custom Server"
+msgstr "Собственный сервер"
 
-#: src/gui/recorder.cpp:104
-msgid "Starting to record..."
-msgstr "Начало записи..."
+#: ../src/gui/setup_video.cpp:213
+msgid "Custom cursor"
+msgstr "Выборочный курсор"
 
-#: src/gui/recorder.cpp:112
-msgid "Failed to start recording."
-msgstr "Не удалось начать запись."
+#: ../src/gui/setup_video.cpp:460
+msgid "Deactivating OpenGL"
+msgstr "Отключение OpenGL"
 
-#: src/gui/recorder.h:38
-msgid "Recording..."
-msgstr "Запись..."
+#: ../src/gui/debugwindow.cpp:43
+msgid "Debug"
+msgstr "отлаживать"
 
-#: src/gui/recorder.h:39
-msgid "Stop recording"
-msgstr ""
+#: ../src/keyboardconfig.cpp:78
+msgid "Debug Window"
+msgstr "Окно отладки"
 
-#: src/gui/register.cpp:69
-msgid "Confirm:"
-msgstr "Подтвердите:"
+#: ../src/gui/setup_keyboard.cpp:94
+msgid "Default"
+msgstr "По умолчанию"
 
-#: src/gui/register.cpp:100
-msgid "Email:"
-msgstr "Email:"
+#: ../src/net/tmwa/generalhandler.cpp:238
+msgid "Defense"
+msgstr "Защита"
 
-#: src/gui/register.cpp:166
+#: ../src/resources/itemdb.cpp:311
 #, c-format
-msgid "The username needs to be at least %d characters long."
-msgstr "Имя пользователя должно содержать не менее %d символов."
+msgid "Defense %+d"
+msgstr "Защита %+d"
 
-#: src/gui/register.cpp:174
-#, c-format
-msgid "The username needs to be less than %d characters long."
-msgstr "Имя пользователя не должно содержать более %d символов."
+#: ../src/gui/setup_colors.cpp:94
+msgid "Delay:"
+msgstr "Задержка:"
 
-#: src/gui/register.cpp:182 src/gui/unregisterdialog.cpp:117
-#, c-format
-msgid "The password needs to be at least %d characters long."
-msgstr "Пароль должен содержать не менее %d символов."
+#: ../src/gui/charselectdialog.cpp:360 ../src/gui/serverdialog.cpp:231
+#: ../src/gui/setup_players.cpp:229
+msgid "Delete"
+msgstr "Удалить"
 
-#: src/gui/register.cpp:190 src/gui/unregisterdialog.cpp:124
-#, c-format
-msgid "The password needs to be less than %d characters long."
-msgstr "Пароль не должен содержать более %d символов."
+#: ../src/net/manaserv/attributes.cpp:192
+#: ../src/net/tmwa/generalhandler.cpp:234
+msgid "Dexterity"
+msgstr "Ловкость"
 
-#: src/gui/register.cpp:197
-msgid "Passwords do not match."
-msgstr "Пароли не совпадают."
+#: ../src/net/manaserv/attributes.cpp:199
+#, fuzzy, c-format
+msgid "Dexterity %+.1f"
+msgstr "Ловкость %+d"
 
-#: src/gui/serverdialog.cpp:197
-msgid "Choose Your Server"
-msgstr "Выберите сервер"
+#: ../src/net/tmwa/generalhandler.cpp:106
+#, c-format
+msgid "Dexterity %+d"
+msgstr "Ловкость %+d"
 
-#: src/gui/serverdialog.cpp:206 src/gui/widgets/chattab.cpp:142
-msgid "Server:"
-msgstr "Сервер:"
+#: ../src/net/tmwa/charserverhandler.cpp:274
+msgid "Dexterity:"
+msgstr "Ловкость:"
 
-#: src/gui/serverdialog.cpp:207
-msgid "Port:"
-msgstr "Порт:"
+#: ../src/gui/setup_video.cpp:241
+msgid "Disable transparency (Low CPU mode)"
+msgstr "Отключить прозрачность (режим низкой нагрузки процессора)"
 
-#: src/gui/serverdialog.cpp:208
-msgid "Server type:"
-msgstr "Тип сервера:"
+#: ../src/gui/popupmenu.cpp:105
+#, c-format
+msgid "Disregard %s"
+msgstr ""
 
-#: src/gui/serverdialog.cpp:229
-msgid "Connect"
-msgstr "Соединение"
+#: ../src/gui/setup_players.cpp:66
+msgid "Disregarded"
+msgstr ""
 
-#: src/gui/serverdialog.cpp:230
-msgid "Custom Server"
-msgstr "Собственный сервер"
+#: ../src/net/manaserv/beinghandler.cpp:294
+#: ../src/net/tmwa/playerhandler.cpp:108
+msgid "Do you want your possessions identified?"
+msgstr ""
 
-#: src/gui/serverdialog.cpp:324
-msgid "Please type both the address and the port of a server."
-msgstr "Следует указать адрес и порт сервера."
+#: ../src/gui/setup_audio.cpp:43
+msgid "Download music"
+msgstr "Скачать музыку"
 
-#: src/gui/serverdialog.cpp:441
+#: ../src/gui/serverdialog.cpp:441
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Загрузка список серверов...%2.2f%%"
 
-#: src/gui/serverdialog.cpp:447
-msgid "Waiting for server..."
-msgstr "Ожидание ответа от сервера..."
+#: ../src/gui/inventorywindow.cpp:365 ../src/gui/popupmenu.cpp:374
+msgid "Drop"
+msgstr "Бросить"
 
-#: src/gui/serverdialog.cpp:451
-msgid "Preparing download"
-msgstr "Подготовка к загрузке"
+#: ../src/gui/inventorywindow.cpp:107 ../src/gui/inventorywindow.cpp:363
+#: ../src/gui/popupmenu.cpp:372
+msgid "Drop..."
+msgstr "Бросить..."
 
-#: src/gui/serverdialog.cpp:455
-msgid "Error retreiving server list!"
-msgstr "Ошибка получения списка серверов!"
+#: ../src/net/tmwa/generalhandler.cpp:148
+msgid "Duplicated login."
+msgstr "Дублированный логин."
 
-#: src/gui/serverdialog.cpp:550
-msgid "requires a newer version"
-msgstr "Требует более новую версию"
+#: ../src/client.cpp:935
+msgid "Email Change"
+msgstr "Сменить E-MAIL"
+
+#: ../src/net/manaserv/loginhandler.cpp:309
+msgid "Email address already exists."
+msgstr "E-mail уже зарегистрирован."
 
-#: src/gui/serverdialog.cpp:552
+#: ../src/client.cpp:936
+msgid "Email changed successfully!"
+msgstr "E-mail успешно изменена!"
+
+#: ../src/gui/register.cpp:100
+msgid "Email:"
+msgstr "Email:"
+
+#: ../src/keyboardconfig.cpp:84 ../src/keyboardconfig.cpp:85
+#: ../src/keyboardconfig.cpp:86 ../src/keyboardconfig.cpp:87
+#: ../src/keyboardconfig.cpp:88 ../src/keyboardconfig.cpp:89
+#: ../src/keyboardconfig.cpp:90 ../src/keyboardconfig.cpp:91
+#: ../src/keyboardconfig.cpp:92 ../src/keyboardconfig.cpp:93
+#: ../src/keyboardconfig.cpp:94 ../src/keyboardconfig.cpp:95
 #, c-format
-msgid "requires v%s"
-msgstr "Требует v%s"
+msgid "Emote Shortcut %d"
+msgstr "Комбинация клавиш для емоции %d"
 
-#: src/gui/setup_audio.cpp:42
-msgid "Sound"
-msgstr "Звук"
+#: ../src/keyboardconfig.cpp:80
+msgid "Emote Shortcut Window"
+msgstr "Окно емоций"
 
-#: src/gui/setup_audio.cpp:43
-msgid "Download music"
-msgstr "Скачать музыку"
+#: ../src/net/tmwa/specialhandler.cpp:148
+msgid "Emote failed!"
+msgstr "Эмоция не удалась!"
 
-#: src/gui/setup_audio.cpp:47
-msgid "Audio"
-msgstr "Аудио"
+#: ../src/net/tmwa/network.cpp:145
+msgid "Empty address given to Network::connect()!"
+msgstr ""
 
-#: src/gui/setup_audio.cpp:50
-msgid "Sfx volume"
-msgstr "Громкость эффектов"
+#: ../src/gui/setup_players.cpp:235
+#, fuzzy
+msgid "Enable Chat log"
+msgstr "Низзя продать!"
 
-#: src/gui/setup_audio.cpp:51
-msgid "Music volume"
-msgstr "Громкость музыки"
+#: ../src/gui/setup_joystick.cpp:39
+msgid "Enable joystick"
+msgstr "Использовать джойстик"
 
-#: src/gui/setup_audio.cpp:94
-msgid "Notice"
-msgstr "Уведомление"
+#: ../src/keyboardconfig.cpp:55
+msgid "Enable/Disable Trading"
+msgstr "Разрешить/Запретить торговлю"
 
-#: src/gui/setup_audio.cpp:94
-msgid "You may have to restart your client if you want to download new music"
+#: ../src/net/manaserv/chathandler.cpp:229
+msgid "End of channel list."
 msgstr ""
-"Возможно придется перезагрузить клиент, чтобы вы смогли скачать новую музыку"
 
-#: src/gui/setup_audio.cpp:106
-msgid "Sound Engine"
-msgstr ""
+#: ../src/gui/changepassworddialog.cpp:110
+msgid "Enter the old password first."
+msgstr "Сначала введите старый пароль"
 
-#: src/gui/setup_colors.cpp:46
-msgid "This is what the color looks like"
-msgstr "Вот, как выглядит сей цвет"
+#: ../src/client.cpp:721
+msgid "Entering game world"
+msgstr "Вход в игровой мир"
 
-#: src/gui/setup_colors.cpp:51
-msgid "Colors"
-msgstr "Цвета"
+#: ../src/gui/inventorywindow.cpp:92 ../src/gui/inventorywindow.cpp:105
+#: ../src/gui/inventorywindow.cpp:354 ../src/gui/popupmenu.cpp:366
+msgid "Equip"
+msgstr "Надеть"
 
-#: src/gui/setup_colors.cpp:72
-msgid "Type:"
-msgstr "Тип:"
+#: ../src/net/tmwa/playerhandler.cpp:506
+msgid "Equip arrows first."
+msgstr "Сначала оденьте стрелы"
 
-#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:331
-msgid "Static"
-msgstr "Статичный"
+#: ../src/gui/equipmentwindow.cpp:69 ../src/gui/windowmenu.cpp:55
+msgid "Equipment"
+msgstr "Снаряжение"
 
-#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
-#: src/gui/setup_colors.cpp:332
-msgid "Pulse"
-msgstr "Пульсирующий"
+#: ../src/keyboardconfig.cpp:72
+msgid "Equipment Window"
+msgstr "Окно екипировки"
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:333
-msgid "Rainbow"
-msgstr "Радуга"
+#: ../src/client.cpp:1036 ../src/gui/changeemaildialog.cpp:156
+#: ../src/gui/changepassworddialog.cpp:149 ../src/gui/charcreatedialog.cpp:183
+#: ../src/gui/register.cpp:218 ../src/gui/serverdialog.cpp:323
+#: ../src/gui/unregisterdialog.cpp:133 ../src/net/manaserv/charhandler.cpp:177
+#: ../src/net/manaserv/charhandler.cpp:227
+#: ../src/net/tmwa/charserverhandler.cpp:134
+#: ../src/net/tmwa/charserverhandler.cpp:151
+msgid "Error"
+msgstr "Ошибка"
 
-#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:333
-msgid "Spectrum"
-msgstr "спектр"
+#: ../src/net/manaserv/guildhandler.cpp:87
+msgid "Error creating guild."
+msgstr "Ошибка создания гильдии"
 
-#: src/gui/setup_colors.cpp:94
-msgid "Delay:"
-msgstr "Задержка:"
+#: ../src/client.cpp:1336 ../src/client.cpp:1342
+msgid "Error creating updates directory!"
+msgstr "Ошибка при создании директории обновления!"
 
-#: src/gui/setup_colors.cpp:109
-msgid "Red:"
-msgstr "Красный:"
+#: ../src/net/manaserv/chathandler.cpp:211
+msgid "Error joining channel."
+msgstr "Ошибка присоединения к каналу."
 
-#: src/gui/setup_colors.cpp:124
-msgid "Green:"
-msgstr "Зеленый:"
+#: ../src/gui/serverdialog.cpp:455
+msgid "Error retreiving server list!"
+msgstr "Ошибка получения списка серверов!"
 
-#: src/gui/setup_colors.cpp:139
-msgid "Blue:"
-msgstr "Синий:"
+#: ../src/game.cpp:967
+#, c-format
+msgid "Error while loading %s"
+msgstr "Ошибка во время загрузки %s"
 
-#: src/gui/setup.cpp:51
-msgid "Apply"
-msgstr "Применить"
+#: ../src/resources/userpalette.cpp:101
+msgid "Exp Notification"
+msgstr "Сообщение об изменении опыта"
 
-#: src/gui/setup.cpp:51
-msgid "Reset Windows"
-msgstr "Восстановить расположение окон"
+#: ../src/gui/statuswindow.cpp:122
+msgid "Exp:"
+msgstr "Exp:"
 
-#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:78
-msgid "Press the button to start calibration"
-msgstr "Нажмите кнопку, чтобы начать калибровку"
+#: ../src/net/tmwa/gui/partytab.cpp:170 ../src/net/tmwa/partyhandler.cpp:178
+msgid "Experience sharing disabled."
+msgstr ""
 
-#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:76
-msgid "Calibrate"
-msgstr "Калибровать"
+#: ../src/net/tmwa/gui/partytab.cpp:167 ../src/net/tmwa/partyhandler.cpp:172
+msgid "Experience sharing enabled."
+msgstr ""
 
-#: src/gui/setup_joystick.cpp:39
-msgid "Enable joystick"
-msgstr "Использовать джойстик"
+#: ../src/net/tmwa/gui/partytab.cpp:173 ../src/net/tmwa/partyhandler.cpp:184
+msgid "Experience sharing not possible."
+msgstr ""
 
-#: src/gui/setup_joystick.cpp:41
-msgid "Joystick"
-msgstr "Джойстик"
+#: ../src/net/tmwa/gui/partytab.cpp:176
+msgid "Experience sharing unknown."
+msgstr ""
 
-#: src/gui/setup_joystick.cpp:83
-msgid "Stop"
-msgstr "Стоп"
+#: ../src/gui/setup_video.cpp:230
+msgid "FPS limit:"
+msgstr "FPS Предел:"
 
-#: src/gui/setup_joystick.cpp:84
-msgid "Rotate the stick"
-msgstr "Вращайте рукоять"
+#: ../src/net/tmwa/tradehandler.cpp:211
+msgid "Failed adding item for unknown reason."
+msgstr ""
 
-#: src/gui/setup_keyboard.cpp:77
-msgid "Keyboard"
-msgstr "Клавиатура"
+#: ../src/net/tmwa/tradehandler.cpp:207
+msgid "Failed adding item. Trade partner has no free slot."
+msgstr ""
 
-#: src/gui/setup_keyboard.cpp:86
-msgid "Assign"
-msgstr "Назначить"
+#: ../src/net/tmwa/tradehandler.cpp:202
+msgid "Failed adding item. Trade partner is over weighted."
+msgstr ""
 
-#: src/gui/setup_keyboard.cpp:90
-msgid "Unassign"
-msgstr "Снять"
+#: ../src/gui/trade.cpp:262
+msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgstr ""
 
-#: src/gui/setup_keyboard.cpp:94
-msgid "Default"
-msgstr "По умолчанию"
+#: ../src/net/tmwa/charserverhandler.cpp:134
+msgid "Failed to create character. Most likely the name is already taken."
+msgstr "Невозможно создать персонажа. Скорее всего, таке имя уже используется."
 
-#: src/gui/setup_keyboard.cpp:125
-msgid "Key Conflict(s) Detected."
-msgstr "Обнаружены конфликты клавиш!"
+#: ../src/net/tmwa/charserverhandler.cpp:151
+msgid "Failed to delete character."
+msgstr "Невозможно удалить персонажа"
 
-#: src/gui/setup_players.cpp:58
-msgid "Name"
-msgstr "Имя"
+#: ../src/net/manaserv/guildhandler.cpp:209
+msgid "Failed to promote member."
+msgstr ""
 
-#: src/gui/setup_players.cpp:59
-msgid "Relation"
-msgstr "Отношение"
+#: ../src/gui/npcpostdialog.cpp:99
+msgid "Failed to send as sender or letter invalid."
+msgstr "Невозможно послать ибо отправитель либо сообщение неверны."
 
-#: src/gui/setup_players.cpp:64
-msgid "Neutral"
-msgstr "Нейтральное"
+#: ../src/gui/recorder.cpp:112
+msgid "Failed to start recording."
+msgstr "Не удалось начать запись."
 
-#: src/gui/setup_players.cpp:65
-msgid "Friend"
-msgstr "Друг"
+#: ../src/gui/setup_video.cpp:426
+msgid ""
+"Failed to switch to fullscreen mode and restoration of old mode also failed!"
+msgstr ""
+"Не удалось перейти в полноэкранный режим и восстановить старый режим тоже не "
+"удалось!"
 
-#: src/gui/setup_players.cpp:66
-msgid "Disregarded"
+#: ../src/gui/setup_video.cpp:420
+msgid ""
+"Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
+"Не удалось перейти в окновой режим и восстановить старый режим тоже не "
+"удалось!"
 
-#: src/gui/setup_players.cpp:67
-msgid "Ignored"
-msgstr "Игнорировано"
+#: ../src/net/tmwa/inventoryhandler.cpp:287
+msgid "Failed to use item."
+msgstr ""
 
-#: src/gui/setup_players.cpp:206 src/gui/setup_video.cpp:153
-msgid "???"
-msgstr "???"
+#: ../src/client.cpp:956
+msgid "Farewell, come back any time..."
+msgstr "Прощайте, возвращайтесь в любое время..."
 
-#: src/gui/setup_players.cpp:225
-msgid "Allow trading"
-msgstr "Разрешить торговлю"
+#: ../src/gui/charcreatedialog.cpp:81 ../src/gui/register.cpp:91
+msgid "Female"
+msgstr "Женщина"
 
-#: src/gui/setup_players.cpp:227
-msgid "Allow whispers"
-msgstr "Разрешить шептание"
+#: ../src/keyboardconfig.cpp:56
+msgid "Find Path to Mouse"
+msgstr "Идти за курсором мыши"
 
-#: src/gui/setup_players.cpp:231
-msgid "Put all whispers in tabs"
-msgstr "Личные сообщения во вкладках"
+#: ../src/gui/recorder.cpp:87
+msgid "Finishing recording."
+msgstr "Запись завершена."
 
-#: src/gui/setup_players.cpp:233
-msgid "Show gender"
-msgstr "Показать пол"
+#: ../src/gui/setup_video.cpp:256
+msgid "Font size"
+msgstr "Размер шрифта"
 
-#: src/gui/setup_players.cpp:235
-#, fuzzy
-msgid "Enable Chat log"
-msgstr "Низзя продать!"
+#: ../src/commandhandler.cpp:204
+msgid "For more information, type /help <command>."
+msgstr "Для более точной информации введите /help <команда>"
 
-#: src/gui/setup_players.cpp:237
-msgid "Players"
-msgstr "Игроки"
+#: ../src/gui/setup_players.cpp:65
+msgid "Friend"
+msgstr "Друг"
 
-#: src/gui/setup_players.cpp:262
-msgid "When ignoring:"
-msgstr "При игнорировании:"
+#: ../src/gui/setup_video.cpp:211
+msgid "Full screen"
+msgstr "На полный экран"
 
-#: src/gui/setup_video.cpp:134
-msgid "Tiny"
-msgstr "Маленький"
+#: ../src/resources/userpalette.cpp:94
+msgid "GM Names"
+msgstr "Имена ГМ"
 
-#: src/gui/setup_video.cpp:135
-msgid "Small"
-msgstr "Маленький"
+#: ../src/net/tmwa/gamehandler.cpp:102
+msgid "Game"
+msgstr "Игра"
 
-#: src/gui/setup_video.cpp:136
-msgid "Medium"
-msgstr "Средний"
+#: ../src/net/manaserv/beinghandler.cpp:288
+#: ../src/net/tmwa/playerhandler.cpp:100
+msgid "Game Over!"
+msgstr "Игра окончена!"
 
-#: src/gui/setup_video.cpp:137
-msgid "Large"
-msgstr "Большой"
+#: ../src/game.cpp:181
+msgid "General"
+msgstr "Общие"
 
-#: src/gui/setup_video.cpp:163
-msgid "No text"
-msgstr "Нет текста"
+#: ../src/gui/widgets/chattab.cpp:127
+#, c-format
+msgid "Global announcement from %s:"
+msgstr "Глобальное объявление от %s:"
 
-#: src/gui/setup_video.cpp:164
-msgid "Text"
-msgstr "Текст"
+#: ../src/gui/widgets/chattab.cpp:121
+msgid "Global announcement:"
+msgstr "Глобальное объявление:"
 
-#: src/gui/setup_video.cpp:165
-msgid "Bubbles, no names"
-msgstr "Пузырьки, без названий"
+#: ../src/net/tmwa/generalhandler.cpp:209
+msgid "Got disconnected from server!"
+msgstr "Отключено от сервера!"
 
-#: src/gui/setup_video.cpp:166
-msgid "Bubbles with names"
-msgstr "Пузырьки с названиями"
+#: ../src/gui/setup_colors.cpp:124
+msgid "Green:"
+msgstr "Зеленый:"
 
-#: src/gui/setup_video.cpp:178
-msgid "off"
-msgstr "выкл"
+#: ../src/gui/setup_video.cpp:253
+msgid "Gui opacity"
+msgstr "Прозрачность интерфейса"
 
-#: src/gui/setup_video.cpp:179 src/gui/setup_video.cpp:192
-msgid "low"
-msgstr "низ."
+#: ../src/net/tmwa/gui/guildtab.cpp:45
+msgid "Guild"
+msgstr "Гильдия"
 
-#: src/gui/setup_video.cpp:180 src/gui/setup_video.cpp:194
-msgid "high"
-msgstr "выс."
+#: ../src/gui/socialwindow.cpp:139
+#, c-format
+msgid "Guild %s quit requested."
+msgstr ""
 
-#: src/gui/setup_video.cpp:193
-msgid "medium"
-msgstr "средне"
+#: ../src/resources/userpalette.cpp:98
+#, fuzzy
+msgid "Guild Members"
+msgstr "Гильдия"
 
-#: src/gui/setup_video.cpp:195
-msgid "max"
-msgstr "максимальное"
+#: ../src/gui/socialwindow.cpp:540
+msgid "Guild Name"
+msgstr "Имя гильдии"
 
-#: src/gui/setup_video.cpp:217
-msgid "Full screen"
-msgstr "На полный экран"
+#: ../src/net/manaserv/guildhandler.cpp:82
+msgid "Guild created."
+msgstr "Гильдия создана."
 
-#: src/gui/setup_video.cpp:218
-msgid "OpenGL"
-msgstr "OpenGL"
+#: ../src/net/tmwa/guildhandler.cpp:393
+msgid "Guild creation isn't supported yet."
+msgstr "Создания гильдии еще не поддерживается."
 
-#: src/gui/setup_video.cpp:219
-msgid "Custom cursor"
-msgstr "Выборочный курсор"
+#: ../src/net/tmwa/gui/guildtab.cpp:89
+msgid "Guild name is missing."
+msgstr "Отсутствует имя гильдии."
 
-#: src/gui/setup_video.cpp:221
-msgid "Visible names"
-msgstr "Видимые имена"
+#: ../src/resources/itemdb.cpp:312
+#, c-format
+msgid "HP %+d"
+msgstr "HP %+d"
 
-#: src/gui/setup_video.cpp:223
-msgid "Particle effects"
-msgstr "Эффекты частиц"
+#: ../src/gui/statuswindow.cpp:117
+msgid "HP:"
+msgstr "ЖО:"
 
-#: src/gui/setup_video.cpp:225
-msgid "Show own name"
-msgstr "Показать собственное имя"
+#: ../src/gui/charcreatedialog.cpp:74
+msgid "Hair color:"
+msgstr "Цвет волос:"
 
-#: src/gui/setup_video.cpp:226
-msgid "Log NPC dialogue"
-msgstr "записывать диалог с NPC"
+#: ../src/gui/charcreatedialog.cpp:77
+msgid "Hair style:"
+msgstr "Стрижка:"
 
-#: src/gui/setup_video.cpp:227
-msgid "Show pickup notification"
-msgstr "Показать уведомление о подборе предмета"
+#: ../src/gui/help.cpp:37
+msgid "Help"
+msgstr "Помощь"
 
-#. TRANSLATORS: Refers to "Show pickup notification"
-#: src/gui/setup_video.cpp:229
-msgid "in chat"
-msgstr "в чате"
+#: ../src/keyboardconfig.cpp:69
+msgid "Help Window"
+msgstr "Окно помощи"
 
-#. TRANSLATORS: Refers to "Show pickup notification"
-#: src/gui/setup_video.cpp:231
-msgid "as particle"
-msgstr ""
+#: ../src/keyboardconfig.cpp:52
+msgid "Hide Windows"
+msgstr "Скрыть окна"
 
-#: src/gui/setup_video.cpp:236
-msgid "FPS limit:"
-msgstr "FPS Предел:"
+#: ../src/net/tmwa/specialhandler.cpp:199
+msgid "Huh? What's that?"
+msgstr "А? Что это?"
 
-#: src/gui/setup_video.cpp:247
-msgid "Disable transparency (Low CPU mode)"
-msgstr "Отключить прозрачность (режим низкой нагрузки процессора)"
+#: ../src/net/manaserv/beinghandler.cpp:293
+#: ../src/net/tmwa/playerhandler.cpp:106
+msgid "I guess this did not run too well."
+msgstr "Я думаю, это не слишком хорошо сработало."
 
-#: src/gui/setup_video.cpp:250
-msgid "Video"
-msgstr "Видео"
+#: ../src/commandhandler.cpp:240
+msgid "If <channel> doesn't exist, it's created."
+msgstr "Если <канал> не существует, он будет создан."
 
-#: src/gui/setup_video.cpp:252
-msgid "Show damage"
-msgstr "Показать ущерб"
+#: ../src/commandhandler.cpp:258 ../src/commandhandler.cpp:285
+#: ../src/gui/widgets/channeltab.cpp:82 ../src/gui/widgets/channeltab.cpp:91
+#: ../src/net/tmwa/gui/guildtab.cpp:75 ../src/net/tmwa/gui/partytab.cpp:75
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr "Если ник содержит пробелы, заключите его в кавычки (\")."
 
-#: src/gui/setup_video.cpp:258
-msgid "Overhead text"
+#: ../src/net/tmwa/playerhandler.cpp:125
+msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/gui/setup_video.cpp:259
-msgid "Gui opacity"
-msgstr "Прозрачность интерфейса"
+#: ../src/gui/widgets/channeltab.cpp:75
+msgid "If you're the last person in the channel, it will be deleted."
+msgstr "Если вы - последний пользователь канала, канал будет удален"
 
-#: src/gui/setup_video.cpp:260
-msgid "Ambient FX"
-msgstr "Эффекты окружающей среды"
+#: ../src/gui/popupmenu.cpp:108
+#, c-format
+msgid "Ignore %s"
+msgstr "Игнорировано %s"
 
-#: src/gui/setup_video.cpp:261
-#, fuzzy
-msgid "Particle detail"
-msgstr "Качество частиц"
+#: ../src/keyboardconfig.cpp:103
+msgid "Ignore input 1"
+msgstr "Игнорировать ввод 1"
 
-#: src/gui/setup_video.cpp:262
-msgid "Font size"
-msgstr "Размер шрифта"
+#: ../src/keyboardconfig.cpp:104
+msgid "Ignore input 2"
+msgstr "Игнорировать ввод 2"
 
-#: src/gui/setup_video.cpp:277 src/gui/setup_video.cpp:532
-#: src/gui/setup_video.cpp:662
-msgid "None"
-msgstr "ни один"
+#: ../src/gui/setup_players.cpp:67
+msgid "Ignored"
+msgstr "Игнорировано"
 
-#: src/gui/setup_video.cpp:426
-msgid ""
-"Failed to switch to windowed mode and restoration of old mode also failed!"
-msgstr ""
-"Не удалось перейти в окновой режим и восстановить старый режим тоже не "
-"удалось!"
+#: ../src/game.cpp:733
+msgid "Ignoring incoming trade requests"
+msgstr "Игнорировать предложения о торговле"
 
-#: src/gui/setup_video.cpp:432
-msgid ""
-"Failed to switch to fullscreen mode and restoration of old mode also failed!"
-msgstr ""
-"Не удалось перейти в полноэкранный режим и восстановить старый режим тоже не "
-"удалось!"
+#: ../src/net/manaserv/tradehandler.cpp:97
+msgid "Ignoring incoming trade requests."
+msgstr "Входящих запросов торговли игнарируютса."
 
-#: src/gui/setup_video.cpp:443
-msgid "Switching to Full Screen"
-msgstr "Переключение в полноэкранный режим"
+#: ../src/net/manaserv/charhandler.cpp:210
+#: ../src/net/tmwa/charserverhandler.cpp:146
+msgid "Info"
+msgstr "Сведения"
 
-#: src/gui/setup_video.cpp:444
-msgid "Restart needed for changes to take effect."
-msgstr "Для вступления в силу выбранных настроек требуется перезагрузка игры."
+#: ../src/net/tmwa/playerhandler.cpp:101
+msgid "Insert coin to continue."
+msgstr "Вставьте монету, чтобы продолжить."
 
-#: src/gui/setup_video.cpp:458
-msgid "Changing to OpenGL"
-msgstr "Переключение на OpenGL"
+#: ../src/net/tmwa/specialhandler.cpp:172
+msgid "Insufficient HP!"
+msgstr "Недостаточно HP!"
 
-#: src/gui/setup_video.cpp:459
-msgid ""
-"Applying change to OpenGL requires restart. In case OpenGL messes up your "
-"game graphics, restart the game with the command line option \"--no-opengl\"."
-msgstr ""
-"Применение изменений в OpenGL требует перезапуски. В случае, если OpenGL не "
-"будет работать, перезагрузите игру с параметром командной строки \"--no-"
-"opengl\"."
+#: ../src/net/tmwa/specialhandler.cpp:175
+msgid "Insufficient SP!"
+msgstr "Недостаточно SP!"
 
-#: src/gui/setup_video.cpp:466
-msgid "Deactivating OpenGL"
-msgstr "Отключение OpenGL"
+#: ../src/net/manaserv/attributes.cpp:218
+#: ../src/net/tmwa/generalhandler.cpp:233
+msgid "Intelligence"
+msgstr "Интеллект"
 
-#: src/gui/setup_video.cpp:467
-msgid "Applying change to OpenGL requires restart."
-msgstr "Переход к OpenGL требует перезагрузки игры."
+#: ../src/net/manaserv/attributes.cpp:225
+#, fuzzy, c-format
+msgid "Intelligence %+.1f"
+msgstr "Интеллект %+d"
 
-#: src/gui/setup_video.cpp:475
-msgid "Transparency disabled"
-msgstr "Прозрачность отключена"
+#: ../src/net/tmwa/generalhandler.cpp:105
+#, c-format
+msgid "Intelligence %+d"
+msgstr "Интеллект %+d"
 
-#: src/gui/setup_video.cpp:476 src/gui/setup_video.cpp:484
-msgid "You must restart to apply changes."
-msgstr "Вы должны перезагрузитса, чтобы изменения вступили в силу."
+#: ../src/net/tmwa/charserverhandler.cpp:273
+msgid "Intelligence:"
+msgstr "Интеллект:"
 
-#: src/gui/setup_video.cpp:483
-msgid "Transparency enabled"
-msgstr "Прозрачность включена"
+#: ../src/net/manaserv/charhandler.cpp:267
+#, fuzzy
+msgid "Invalid character slot selected."
+msgstr "Персонаж удален"
 
-#: src/gui/setup_video.cpp:576 src/gui/setup_video.cpp:581
-msgid "Screen Resolution Changed"
-msgstr "Разрешение экрана изменены"
+#: ../src/net/manaserv/charhandler.cpp:156
+msgid "Invalid gender."
+msgstr "Неверный пол."
 
-#: src/gui/setup_video.cpp:577 src/gui/setup_video.cpp:582
-msgid "Restart your client for the change to take effect."
-msgstr "Перезегрузите игру дабы изменения вступили в силу"
+#: ../src/net/manaserv/charhandler.cpp:153
+msgid "Invalid hair color."
+msgstr "Неверный цвет волос."
 
-#: src/gui/setup_video.cpp:579
-msgid "Some windows may be moved to fit the lowered resolution."
-msgstr ""
-"Некоторые окна могут быть перемещены в соответствии пониженной разрешении."
+#: ../src/net/manaserv/charhandler.cpp:150
+msgid "Invalid hairstyle."
+msgstr "Неверное прическа."
+
+#: ../src/net/manaserv/charhandler.cpp:144
+msgid "Invalid name."
+msgstr "Неверное имя."
 
-#: src/gui/setup_video.cpp:612
+#: ../src/net/manaserv/charhandler.cpp:171
 #, fuzzy
-msgid "Particle Effect Settings Changed."
-msgstr "Эффекты частиц"
+msgid "Invalid slot number."
+msgstr "Неверное имя."
 
-#: src/gui/setup_video.cpp:613
-msgid "Changes will take effect on map change."
-msgstr "Изменения вступят в силу при переходе на другую карты."
+#: ../src/client.cpp:1302
+#, c-format
+msgid "Invalid update host: %s"
+msgstr "Неверный хост обновления: %s"
 
-#: src/gui/skilldialog.cpp:212 src/gui/windowmenu.cpp:59
-msgid "Skills"
-msgstr "Умения"
+#: ../src/gui/inventorywindow.cpp:59 ../src/gui/windowmenu.cpp:56
+msgid "Inventory"
+msgstr "Инвентарь"
 
-#: src/gui/skilldialog.cpp:223
-msgid "Up"
-msgstr "Верх"
+#: ../src/keyboardconfig.cpp:71
+msgid "Inventory Window"
+msgstr "Окно инвентаря"
 
-#: src/gui/skilldialog.cpp:269
-#, c-format
-msgid "Skill points available: %d"
-msgstr ""
+#: ../src/localplayer.cpp:898
+#, fuzzy
+msgid "Inventory is full."
+msgstr "Инвентарь"
 
-#: src/gui/skilldialog.cpp:351
-#, c-format
-msgid "Skill Set %d"
-msgstr "Навыков %d"
+#: ../src/gui/socialwindow.cpp:331
+msgid "Invite"
+msgstr "Пригласить"
 
-#: src/gui/skilldialog.cpp:360
+#: ../src/gui/popupmenu.cpp:130
 #, c-format
-msgid "Skill %d"
-msgstr "Умения %d"
+msgid "Invite %s to join your guild"
+msgstr "Пригласить %s в вашу гильдию"
 
-#: src/gui/skilldialog.cpp:442
+#: ../src/gui/popupmenu.cpp:134
 #, c-format
-msgid "Lvl: %d (%+d)"
-msgstr "Уровень: %d (%+d)"
+msgid "Invite %s to join your party"
+msgstr "Пригласить %s в вашу группу"
 
-#: src/gui/skilldialog.cpp:453
-#, c-format
-msgid "Lvl: %d"
-msgstr "Уровень: %d"
+#: ../src/net/manaserv/guildhandler.cpp:97
+msgid "Invite sent."
+msgstr "Приглашение отправлено."
 
-#: src/gui/socialwindow.cpp:126
+#: ../src/gui/socialwindow.cpp:126
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr "Пригласить игрока %s  в гильдию %s."
 
-#: src/gui/socialwindow.cpp:139
+#: ../src/gui/socialwindow.cpp:207 ../src/net/tmwa/partyhandler.cpp:330
 #, c-format
-msgid "Guild %s quit requested."
-msgstr ""
-
-#: src/gui/socialwindow.cpp:153
-msgid "Member Invite to Guild"
-msgstr "Приглашение игрока в гильдию"
+msgid "Invited user %s to party."
+msgstr "Пользователь %s приглашен  в группу"
 
-#: src/gui/socialwindow.cpp:154
+#: ../src/net/tmwa/partyhandler.cpp:335
 #, c-format
-msgid "Who would you like to invite to guild %s?"
-msgstr "Кого бы вы хотели пригласить в гильдию %s?"
-
-#: src/gui/socialwindow.cpp:163
-msgid "Leave Guild?"
-msgstr "Покинуть Гильдию?"
+msgid "Inviting failed, because you can't see a player called %s."
+msgstr "Приглашение не удалось, потому что вы не можете видеть игрока %s."
 
-#: src/gui/socialwindow.cpp:164
+#: ../src/keyboardconfig.cpp:57 ../src/keyboardconfig.cpp:58
+#: ../src/keyboardconfig.cpp:59 ../src/keyboardconfig.cpp:60
+#: ../src/keyboardconfig.cpp:61 ../src/keyboardconfig.cpp:62
+#: ../src/keyboardconfig.cpp:63 ../src/keyboardconfig.cpp:64
+#: ../src/keyboardconfig.cpp:65 ../src/keyboardconfig.cpp:66
+#: ../src/keyboardconfig.cpp:67 ../src/keyboardconfig.cpp:68
 #, c-format
-msgid "Are you sure you want to leave guild %s?"
-msgstr "Вы действительно хотите покинуть %s?"
+msgid "Item Shortcut %d"
+msgstr "Комбинация клавиш предмета %d"
 
-#: src/gui/socialwindow.cpp:207 src/net/tmwa/partyhandler.cpp:330
-#, c-format
-msgid "Invited user %s to party."
-msgstr "Пользователь %s приглашен  в группу"
+#: ../src/keyboardconfig.cpp:76
+msgid "Item Shortcut Window"
+msgstr "Окно комбинаций клавиш предметов"
 
-#: src/gui/socialwindow.cpp:218
-#, c-format
-msgid "Party %s quit requested."
+#: ../src/localplayer.cpp:901
+msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:232
-msgid "Member Invite to Party"
-msgstr "Пригласить пользователя в группу"
-
-#: src/gui/socialwindow.cpp:233
-#, c-format
-msgid "Who would you like to invite to party %s?"
-msgstr "Кого бы вы хотели пригласить в группу %s?"
+#: ../src/localplayer.cpp:897
+msgid "Item is too far away"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:242
-msgid "Leave Party?"
-msgstr "Покинуть группу?"
+#: ../src/localplayer.cpp:896
+msgid "Item is too heavy."
+msgstr ""
 
-#: src/gui/socialwindow.cpp:243
-#, c-format
-msgid "Are you sure you want to leave party %s?"
-msgstr "Вы действительно хотите покинуть группу  %s? "
+#: ../src/net/tmwa/gui/partytab.cpp:135 ../src/net/tmwa/partyhandler.cpp:202
+msgid "Item sharing disabled."
+msgstr ""
 
-#: src/gui/socialwindow.cpp:272
-msgid "Create Guild"
-msgstr "Создать Гильдию"
+#: ../src/net/tmwa/gui/partytab.cpp:132 ../src/net/tmwa/partyhandler.cpp:196
+msgid "Item sharing enabled."
+msgstr ""
 
-#: src/gui/socialwindow.cpp:273 src/gui/socialwindow.cpp:620
-msgid "Create Party"
-msgstr "Создать группу"
+#: ../src/net/tmwa/gui/partytab.cpp:138 ../src/net/tmwa/partyhandler.cpp:208
+msgid "Item sharing not possible."
+msgstr ""
 
-#: src/gui/socialwindow.cpp:312 src/gui/windowmenu.cpp:64
-msgid "Social"
+#: ../src/net/tmwa/gui/partytab.cpp:141
+msgid "Item sharing unknown."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:330
-msgid "Invite"
-msgstr "Пригласить"
+#: ../src/client.cpp:785
+#, fuzzy
+msgid "ItemDB: Error while loading "
+msgstr "Ошибка во время загрузки %s"
 
-#: src/gui/socialwindow.cpp:331
-msgid "Leave"
-msgstr "Покинуть"
+#: ../src/gui/statuswindow.cpp:159
+msgid "Job:"
+msgstr "Профессия:"
 
-#: src/gui/socialwindow.cpp:443
+#: ../src/gui/statuswindow.cpp:158 ../src/gui/statuswindow.cpp:276
 #, c-format
-msgid "Accepted party invite from %s."
-msgstr "Принято приглашение от %s."
+msgid "Job: %d"
+msgstr "Профессия: %d"
 
-#: src/gui/socialwindow.cpp:449
-#, c-format
-msgid "Rejected party invite from %s."
-msgstr "Отклонено приглашение от %s."
+#: ../src/net/manaserv/partyhandler.cpp:87
+msgid "Joined party."
+msgstr "Присоединился к группе."
 
-#: src/gui/socialwindow.cpp:462
-#, c-format
-msgid "Accepted guild invite from %s."
-msgstr "Принять приглашение в гильдию от %s."
+#: ../src/gui/setup_joystick.cpp:41
+msgid "Joystick"
+msgstr "Джойстик"
 
-#: src/gui/socialwindow.cpp:468
-#, c-format
-msgid "Rejected guild invite from %s."
-msgstr "Отклонено приглашение в гильдию от %s."
+#: ../src/gui/setup_keyboard.cpp:125
+msgid "Key Conflict(s) Detected."
+msgstr "Обнаружены конфликты клавиш!"
 
-#: src/gui/socialwindow.cpp:497
-msgid "Creating guild failed, please choose a shorter name."
-msgstr "Создание гильдии не удалось, пожалуйста, выберите более короткое имя."
+#: ../src/gui/setup_keyboard.cpp:77
+msgid "Keyboard"
+msgstr "Клавиатура"
 
-#: src/gui/socialwindow.cpp:504
-#, c-format
-msgid "Creating guild called %s."
-msgstr "Создаетса гилдия %s."
+#: ../src/net/tmwa/adminhandler.cpp:64
+msgid "Kick failed!"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:520
-msgid "Creating party failed, please choose a shorter name."
-msgstr "Создание группи не удалось, пожалуйста, выберите более короткое имя."
+#: ../src/gui/popupmenu.cpp:163
+msgid "Kick monster"
+msgstr "Вышвырнуть монстра"
 
-#: src/gui/socialwindow.cpp:527
-#, c-format
-msgid "Creating party called %s."
-msgstr "Создание группи %s."
+#: ../src/gui/popupmenu.cpp:141
+msgid "Kick player"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:541
-msgid "Guild Name"
-msgstr "Имя гильдии"
+#: ../src/net/tmwa/adminhandler.cpp:66
+msgid "Kick succeeded!"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:542
-msgid "Choose your guild's name."
-msgstr "Выберите имя для гильдии."
+#: ../src/gui/setup_video.cpp:131
+msgid "Large"
+msgstr "Большой"
 
-#: src/gui/socialwindow.cpp:554
-msgid "Received guild request, but one already exists."
-msgstr "Получено приглашение в гильдию, но уже одно есть"
+#: ../src/gui/socialwindow.cpp:332
+msgid "Leave"
+msgstr "Покинуть"
+
+#: ../src/gui/socialwindow.cpp:163
+msgid "Leave Guild?"
+msgstr "Покинуть Гильдию?"
 
-#: src/gui/socialwindow.cpp:559
+#: ../src/gui/socialwindow.cpp:242
+msgid "Leave Party?"
+msgstr "Покинуть группу?"
+
+#: ../src/gui/statuswindow.cpp:113 ../src/gui/statuswindow.cpp:215
+#: ../src/gui/statuswindow.cpp:263
 #, c-format
-msgid "%s has invited you to join the guild %s."
-msgstr "%s приглашает присоединиться в гильдию к %s ."
+msgid "Level: %d"
+msgstr "Уровень: %d"
 
-#: src/gui/socialwindow.cpp:564
-msgid "Accept Guild Invite"
-msgstr "Принять приглашение в гильдию"
+#: ../src/net/manaserv/chathandler.cpp:217
+msgid "Listing channels."
+msgstr "Запрос на присоединение к каналу."
 
-#: src/gui/socialwindow.cpp:576
-msgid "Received party request, but one already exists."
-msgstr "Получено приглашение в группу, но уже одно есть"
+#: ../src/resources/userpalette.cpp:109
+#, fuzzy
+msgid "Local Player Critical Hit"
+msgstr "Критический удар"
 
-#: src/gui/socialwindow.cpp:585
-msgid "You have been invited you to join a party."
-msgstr "Вы были приглашены вступить в группу."
+#: ../src/resources/userpalette.cpp:107
+#, fuzzy
+msgid "Local Player Hits Monster"
+msgstr "Удары игрока по монстру"
 
-#: src/gui/socialwindow.cpp:589
-#, c-format
-msgid "You have been invited to join the %s party."
-msgstr "Вы были приглашены присоединиться к группе %s."
+#: ../src/resources/userpalette.cpp:111
+#, fuzzy
+msgid "Local Player Miss"
+msgstr "Сохранить список игроков"
 
-#: src/gui/socialwindow.cpp:597
-#, c-format
-msgid "%s has invited you to join their party."
-msgstr "%s приглашает вас к себе в группу."
+#: ../src/gui/setup_video.cpp:220
+msgid "Log NPC dialogue"
+msgstr "записывать диалог с NPC"
 
-#: src/gui/socialwindow.cpp:602
-#, c-format
-msgid "%s has invited you to join the %s party."
-msgstr "%s приглашает присоединиться к %s группе."
+#: ../src/client.cpp:688
+msgid "Logging in"
+msgstr "Вход"
 
-#: src/gui/socialwindow.cpp:610
-msgid "Accept Party Invite"
-msgstr "Принять приглашение в группу"
+#: ../src/gui/login.cpp:51 ../src/gui/login.cpp:63
+msgid "Login"
+msgstr "Вход"
 
-#: src/gui/socialwindow.cpp:621
-msgid "Cannot create party. You are already in a party"
-msgstr "Невозможно создать группу. Вы уже в группе"
+#: ../src/net/manaserv/loginhandler.cpp:275
+msgid "Login attempt too soon after previous attempt."
+msgstr ""
 
-#: src/gui/socialwindow.cpp:626
-msgid "Party Name"
-msgstr "имя группы"
+#: ../src/net/manaserv/beinghandler.cpp:297
+#: ../src/net/tmwa/playerhandler.cpp:114
+msgid "Looks like you got your head handed to you."
+msgstr ""
 
-#: src/gui/socialwindow.cpp:627
-msgid "Choose your party's name."
-msgstr "Выберите название для вашей группы."
+#: ../src/net/tmwa/generalhandler.cpp:235
+msgid "Luck"
+msgstr "Удача"
 
-#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:62
-msgid "Specials"
-msgstr "Специальные"
+#: ../src/net/tmwa/generalhandler.cpp:107
+#, c-format
+msgid "Luck %+d"
+msgstr "Удача %+d"
 
-#: src/gui/statuswindow.cpp:113 src/gui/statuswindow.cpp:215
-#: src/gui/statuswindow.cpp:262
+#: ../src/net/tmwa/charserverhandler.cpp:275
+msgid "Luck:"
+msgstr "Удача:"
+
+#: ../src/gui/skilldialog.cpp:470
 #, c-format
-msgid "Level: %d"
+msgid "Lvl: %d"
 msgstr "Уровень: %d"
 
-#: src/gui/statuswindow.cpp:114 src/gui/statuswindow.cpp:208
-#: src/gui/statuswindow.cpp:239
+#: ../src/gui/skilldialog.cpp:459
 #, c-format
-msgid "Money: %s"
-msgstr "Деньги: %s"
+msgid "Lvl: %d (%+d)"
+msgstr "Уровень: %d (%+d)"
 
-#: src/gui/statuswindow.cpp:117
-msgid "HP:"
-msgstr "ЖО:"
+#: ../src/net/tmwa/generalhandler.cpp:239
+msgid "M.Attack"
+msgstr "Магическая атака"
 
-#: src/gui/statuswindow.cpp:122
-msgid "Exp:"
-msgstr "Exp:"
+#: ../src/net/tmwa/generalhandler.cpp:240
+msgid "M.Defense"
+msgstr "Магическая защита"
+
+#: ../src/resources/itemdb.cpp:313
+#, c-format
+msgid "MP %+d"
+msgstr "Мана %+d"
 
-#: src/gui/statuswindow.cpp:130
+#: ../src/gui/statuswindow.cpp:130
 msgid "MP:"
 msgstr "Мана:"
 
-#: src/gui/statuswindow.cpp:158 src/gui/statuswindow.cpp:275
-#, c-format
-msgid "Job: %d"
-msgstr "Профессия: %d"
-
-#: src/gui/statuswindow.cpp:159
-msgid "Job:"
-msgstr "Профессия:"
+#: ../src/net/tmwa/chathandler.cpp:230
+#, fuzzy
+msgid "MVP player."
+msgstr "Игрок"
 
-#: src/gui/statuswindow.cpp:211 src/gui/statuswindow.cpp:247
-#, c-format
-msgid "Character points: %d"
-msgstr "Очки персонажа: %d"
+#: ../src/gui/charcreatedialog.cpp:80 ../src/gui/register.cpp:90
+msgid "Male"
+msgstr "Мужчина"
 
-#: src/gui/statuswindow.cpp:255
-#, fuzzy, c-format
-msgid "Correction points: %d"
-msgstr "Очков навыков: %d"
+#: ../src/gui/minimap.cpp:45 ../src/gui/minimap.cpp:86
+msgid "Map"
+msgstr "Карта"
 
-#: src/gui/trade.cpp:53
-msgid "Propose trade"
-msgstr "Предложить торговлю"
+#: ../src/gui/debugwindow.cpp:66 ../src/gui/debugwindow.cpp:108
+#, c-format
+msgid "Map: %s"
+msgstr "Карта: %s"
 
-#: src/gui/trade.cpp:54
-msgid "Confirmed. Waiting..."
-msgstr "Подтверждено. Ждем-с..."
+#: ../src/gui/buy.cpp:80 ../src/gui/sell.cpp:78
+#: ../src/gui/statuswindow.cpp:385 ../src/gui/statuswindow.cpp:463
+#: ../src/gui/statuswindow.cpp:497
+msgid "Max"
+msgstr "Макс"
 
-#: src/gui/trade.cpp:55
-msgid "Agree trade"
-msgstr "Подтвердить торговлю"
+#: ../src/gui/setup_video.cpp:130
+msgid "Medium"
+msgstr "Средний"
 
-#: src/gui/trade.cpp:56
-msgid "Agreed. Waiting..."
-msgstr "Подтверждено. Ждем-с..."
+#: ../src/gui/socialwindow.cpp:153
+msgid "Member Invite to Guild"
+msgstr "Приглашение игрока в гильдию"
 
-#: src/gui/trade.cpp:59
-msgid "Trade: You"
-msgstr "Торговля: Вы"
+#: ../src/gui/socialwindow.cpp:232
+msgid "Member Invite to Party"
+msgstr "Пригласить пользователя в группу"
 
-#: src/gui/trade.cpp:73 src/gui/trade.cpp:74
-msgid "Trade"
-msgstr "Торговать"
+#: ../src/net/manaserv/guildhandler.cpp:204
+msgid "Member was promoted successfully."
+msgstr ""
 
-#: src/gui/trade.cpp:76
-msgid "Add"
-msgstr "Добавить"
+#: ../src/net/tmwa/playerhandler.cpp:253 ../src/net/tmwa/playerhandler.cpp:293
+msgid "Message"
+msgstr "Сообщение"
 
-#: src/gui/trade.cpp:98 src/gui/trade.cpp:134
-#, c-format
-msgid "You get %s"
-msgstr "Вы получили %s"
+#: ../src/commandhandler.cpp:479
+msgid "Message closes chat."
+msgstr "Сообщение закрывает чат."
 
-#: src/gui/trade.cpp:99
-msgid "You give:"
-msgstr "Вы отдаете:"
+#: ../src/commandhandler.cpp:492
+msgid "Message now closes chat."
+msgstr "Теперь сообщение закрывает чат."
 
-#: src/gui/trade.cpp:103
-msgid "Change"
-msgstr "Сменить"
+#: ../src/keyboardconfig.cpp:74
+msgid "Minimap Window"
+msgstr "Окно мини-карты"
 
-#: src/gui/trade.cpp:262
-msgid "Failed adding item. You can not overlap one kind of item on the window."
-msgstr ""
+#: ../src/gui/debugwindow.cpp:67 ../src/gui/debugwindow.cpp:106
+#, c-format
+msgid "Minimap: %s"
+msgstr "Миникарта: %s"
 
-#: src/gui/trade.cpp:304
-msgid "You don't have enough money."
-msgstr "У вас недостаточно денег"
+#: ../src/resources/userpalette.cpp:112
+msgid "Misses"
+msgstr "Промахи"
 
-#: src/gui/unregisterdialog.cpp:51
+#: ../src/gui/statuswindow.cpp:114 ../src/gui/statuswindow.cpp:208
+#: ../src/gui/statuswindow.cpp:240
 #, c-format
-msgid "Name: %s"
-msgstr "Имя: %s"
+msgid "Money: %s"
+msgstr "Деньги: %s"
 
-#: src/gui/updatewindow.cpp:124
-msgid "Updating..."
-msgstr "Обновление..."
+#: ../src/resources/userpalette.cpp:104
+#, fuzzy
+msgid "Monster Hits Player"
+msgstr "Удары монстра по игроку"
 
-#: src/gui/updatewindow.cpp:142
-msgid "Connecting..."
-msgstr "Соединение..."
+#: ../src/resources/userpalette.cpp:96
+msgid "Monsters"
+msgstr "Монстры"
 
-#: src/gui/updatewindow.cpp:145
-msgid "Play"
-msgstr "Играть"
+#: ../src/keyboardconfig.cpp:40
+msgid "Move Down"
+msgstr "Двигаться вниз"
 
-#: src/gui/updatewindow.cpp:417
-msgid "##1  The update process is incomplete."
-msgstr "##1  Процесс обновления не завершен!"
+#: ../src/keyboardconfig.cpp:41
+msgid "Move Left"
+msgstr "Двигаться влево"
 
-#. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:419
-msgid "##1  It is strongly recommended that"
-msgstr "##1  Настоятельно рекомендуется"
+#: ../src/keyboardconfig.cpp:42
+msgid "Move Right"
+msgstr "Двигаться вправо"
 
-#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:421
-msgid "##1  you try again later."
-msgstr "##1  попробуйте позднее."
+#: ../src/keyboardconfig.cpp:39
+msgid "Move Up"
+msgstr "Двигаться вверх"
 
-#: src/gui/updatewindow.cpp:515
-msgid "Completed"
-msgstr "Завершено"
+#: ../src/gui/setup_audio.cpp:51
+msgid "Music volume"
+msgstr "Громкость музыки"
 
-#: src/gui/widgets/channeltab.cpp:49
-msgid "/users > Lists the users in the current channel"
-msgstr "/users > Список пользователей текущего канала"
+#: ../src/gui/debugwindow.cpp:65 ../src/gui/debugwindow.cpp:104
+#, c-format
+msgid "Music: %s"
+msgstr "Музыка: %s"
 
-#: src/gui/widgets/channeltab.cpp:50
-msgid "/topic > Set the topic of the current channel"
-msgstr "/topic > Задать тему текущего канала"
+#: ../src/gui/npcdialog.cpp:73 ../src/gui/npcpostdialog.cpp:41
+msgid "NPC"
+msgstr "NPC"
 
-#: src/gui/widgets/channeltab.cpp:51
-msgid "/quit > Leave a channel"
-msgstr "/quit > Покинуть канал"
+#: ../src/resources/userpalette.cpp:95
+msgid "NPCs"
+msgstr "Боты"
 
-#: src/gui/widgets/channeltab.cpp:52
-msgid "/op > Make a user a channel operator"
-msgstr "/op > Сделать пользователя оператором канала"
+#: ../src/gui/setup_players.cpp:58
+msgid "Name"
+msgstr "Имя"
 
-#: src/gui/widgets/channeltab.cpp:53
-msgid "/kick > Kick a user from the channel"
-msgstr "/kick > Вышвырнуть пользователя с канала"
+#: ../src/gui/charcreatedialog.cpp:67 ../src/gui/login.cpp:54
+#: ../src/gui/register.cpp:67
+msgid "Name:"
+msgstr "Имя:"
 
-#: src/gui/widgets/channeltab.cpp:63
-msgid "Command: /users"
-msgstr "Комманды: /users"
+#: ../src/gui/unregisterdialog.cpp:51
+#, c-format
+msgid "Name: %s"
+msgstr "Имя: %s"
 
-#: src/gui/widgets/channeltab.cpp:64
-msgid "This command shows the users in this channel."
-msgstr "Эта комманда показывает пользователей канала"
+#: ../src/gui/ministatus.cpp:236
+msgid "Need"
+msgstr "Необходимо"
 
-#: src/gui/widgets/channeltab.cpp:68
-msgid "Command: /topic <message>"
-msgstr "Комманда: /topic <сообщение>"
+#: ../src/gui/widgets/channeltab.cpp:126
+msgid "Need a user to kick!"
+msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:69
-msgid "This command sets the topic to <message>."
-msgstr "Задает тему для <сообщение>."
+#: ../src/gui/widgets/channeltab.cpp:119
+msgid "Need a user to op!"
+msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:73
-msgid "Command: /quit"
-msgstr "Комманда: /quit"
+#: ../src/game.cpp:386
+msgid "Network Error"
+msgstr "Ошибка сети"
 
-#: src/gui/widgets/channeltab.cpp:74
-msgid "This command leaves the current channel."
-msgstr "Комманда покидает текущий канал"
+#: ../src/gui/setup_players.cpp:64
+msgid "Neutral"
+msgstr "Нейтральное"
 
-#: src/gui/widgets/channeltab.cpp:75
-msgid "If you're the last person in the channel, it will be deleted."
-msgstr "Если вы - последний пользователь канала, канал будет удален"
+#: ../src/net/manaserv/loginhandler.cpp:149
+msgid "New email address incorrect."
+msgstr "Новый E-mail адрес указан неверно"
 
-#: src/gui/widgets/channeltab.cpp:80
-msgid "Command: /op <nick>"
-msgstr "Комманда: /op <имя>"
+#: ../src/net/manaserv/loginhandler.cpp:118
+msgid "New password incorrect."
+msgstr "Новый пароль указан неверно"
 
-#: src/gui/widgets/channeltab.cpp:81
-msgid "This command makes <nick> a channel operator."
-msgstr "Эта комманда делает <пользователь> оператором канала."
+#: ../src/net/tmwa/loginhandler.cpp:92
+msgid "New password too short."
+msgstr "Новый пароль слишком короткий."
 
-#: src/gui/widgets/channeltab.cpp:84
-msgid "Channel operators can kick and op other users from the channel."
-msgstr ""
-"Операторы канала могут вышвыривать пользователей и делать их операторами."
+#: ../src/gui/npcdialog.cpp:49
+msgid "Next"
+msgstr "Следующий"
 
-#: src/gui/widgets/channeltab.cpp:89
-msgid "Command: /kick <nick>"
-msgstr "Комманда: /kick <имя персонажа>"
+#: ../src/keyboardconfig.cpp:100
+msgid "Next Chat Tab"
+msgstr "Следующая закладка чата"
 
-#: src/gui/widgets/channeltab.cpp:90
-msgid "This command makes <nick> leave the channel."
-msgstr ""
+#: ../src/gui/confirmdialog.cpp:43
+msgid "No"
+msgstr "Нет"
 
-#: src/gui/widgets/channeltab.cpp:119
-msgid "Need a user to op!"
+#: ../src/commandhandler.cpp:407
+msgid "No <nick> was given."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:126
-msgid "Need a user to kick!"
+#: ../src/net/manaserv/charhandler.cpp:141
+msgid "No empty slot."
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:121
-msgid "Global announcement:"
-msgstr "Глобальное объявление:"
+#: ../src/net/manaserv/charhandler.cpp:264
+msgid "No gameservers are available."
+msgstr ""
 
-#: src/gui/widgets/chattab.cpp:127
-#, c-format
-msgid "Global announcement from %s:"
-msgstr "Глобальное объявление от %s:"
+#: ../src/net/tmwa/generalhandler.cpp:135
+msgid "No servers available."
+msgstr "Нет доступных серверов"
 
-#: src/gui/widgets/chattab.cpp:153
-#, c-format
-msgid "%s whispers: %s"
-msgstr "%s шепчет: %s"
+#: ../src/gui/setup_video.cpp:157
+msgid "No text"
+msgstr "Нет текста"
 
-#: src/gui/widgets/whispertab.cpp:53
-msgid "Cannot send empty chat!"
-msgstr "Низзя послать пустое сообщение!"
+#: ../src/net/manaserv/beinghandler.cpp:289
+#: ../src/net/tmwa/playerhandler.cpp:102
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+"Нет, дети. Ваш персонаж не умирает. Он ... ммм ... пошел к лучшей жызни."
 
-#: src/gui/widgets/whispertab.cpp:72
-msgid "/ignore > Ignore the other player"
-msgstr "/ignore > Игнорировать игрока"
+#: ../src/gui/setup_video.cpp:271 ../src/gui/setup_video.cpp:526
+#: ../src/gui/setup_video.cpp:656
+msgid "None"
+msgstr "ни один"
 
-#: src/gui/widgets/whispertab.cpp:73
-msgid "/unignore > Stop ignoring the other player"
-msgstr "/unignore > Прекратить игнорировать игрока"
+#: ../src/gui/recorder.cpp:91
+msgid "Not currently recording."
+msgstr "Запись не ведётся."
 
-#: src/gui/widgets/whispertab.cpp:74
-msgid "/close > Close the whisper tab"
-msgstr "/close > Закрыть вкладку перешептывания"
+#: ../src/net/manaserv/charhandler.cpp:138
+#: ../src/net/manaserv/charhandler.cpp:219
+msgid "Not logged in."
+msgstr "Не авторизован."
 
-#: src/gui/widgets/whispertab.cpp:84
-msgid "Command: /close"
-msgstr "Комманда: /close"
+#: ../src/net/tmwa/buysellhandler.cpp:109
+msgid "Nothing to sell."
+msgstr "Нечего продавать..."
 
-#: src/gui/widgets/whispertab.cpp:85
-msgid "This command closes the current whisper tab."
-msgstr "Закрывает вкладку перешептывания"
+#: ../src/gui/setup_audio.cpp:94
+msgid "Notice"
+msgstr "Уведомление"
 
-#: src/gui/widgets/whispertab.cpp:89
-msgid "Command: /ignore"
-msgstr "Команда: /ignore"
+#: ../src/gui/itemamount.cpp:113 ../src/gui/okdialog.cpp:42
+#: ../src/gui/quitdialog.cpp:46 ../src/gui/textdialog.cpp:39
+#: ../src/gui/trade.cpp:72 ../src/gui/trade.cpp:74
+msgid "OK"
+msgstr "ОК"
 
-#: src/gui/widgets/whispertab.cpp:90
-msgid "This command ignores the other player regardless of current relations."
-msgstr "Эта команда не игнорирует игрока вне зависимости от текущих отношений."
+#: ../src/net/manaserv/loginhandler.cpp:152
+msgid "Old email address incorrect."
+msgstr "Старый E-mail адрес указан неверно."
 
-#: src/gui/widgets/whispertab.cpp:96
-msgid "This command stops ignoring the other player if they are being ignored."
-msgstr ""
-"Эта команда прекращает игнорировать других игроков, если они игнорируютса."
+#: ../src/net/manaserv/loginhandler.cpp:121
+#: ../src/net/tmwa/loginhandler.cpp:89
+msgid "Old password incorrect."
+msgstr "Старый пароль указан неверно"
 
-#: src/gui/windowmenu.cpp:54
-msgid "Status"
-msgstr "Состояние"
+#: ../src/net/tmwa/gamehandler.cpp:89
+#, c-format
+msgid "Online users: %d"
+msgstr "Сейчас в сети: %d"
 
-#: src/gui/windowmenu.cpp:65
-msgid "Shortcut"
-msgstr "Клавиша"
+#: ../src/gui/setup_video.cpp:212
+msgid "OpenGL"
+msgstr "OpenGL"
 
-#: src/gui/worldselectdialog.cpp:71
-msgid "Select World"
-msgstr "Выбрать мир"
+#: ../src/commandhandler.h:31
+#, c-format
+msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+msgstr ""
+"/%s может принимать значение \"yes\", \"no\", \"true\", \"false\", \"1\" или "
+"\"0\"."
 
-#: src/gui/worldselectdialog.cpp:76
-msgid "Change Login"
-msgstr "Сменить аккаунт"
+#: ../src/main.cpp:47
+msgid "Options:"
+msgstr "Опции:"
 
-#: src/gui/worldselectdialog.cpp:77
+#: ../src/resources/userpalette.cpp:103
 #, fuzzy
-msgid "Choose World"
-msgstr "Выберите сервер"
+msgid "Other Player Hits Monster"
+msgstr "Удары игрока по монстру"
 
-#: src/keyboardconfig.cpp:39
-msgid "Move Up"
-msgstr "Двигаться вверх"
+#: ../src/resources/userpalette.cpp:92
+msgid "Other Players' Names"
+msgstr "Имена других игроков"
 
-#: src/keyboardconfig.cpp:40
-msgid "Move Down"
-msgstr "Двигаться вниз"
+#: ../src/gui/outfitwindow.cpp:68 ../src/gui/outfitwindow.cpp:141
+#: ../src/gui/outfitwindow.cpp:154
+#, c-format
+msgid "Outfit: %d"
+msgstr ""
 
-#: src/keyboardconfig.cpp:41
-msgid "Move Left"
-msgstr "Двигаться влево"
+#: ../src/gui/inventorywindow.cpp:109 ../src/gui/outfitwindow.cpp:51
+msgid "Outfits"
+msgstr ""
 
-#: src/keyboardconfig.cpp:42
-msgid "Move Right"
-msgstr "Двигаться вправо"
+#: ../src/keyboardconfig.cpp:81
+#, fuzzy
+msgid "Outfits Window"
+msgstr "Окно статуса"
 
-#: src/keyboardconfig.cpp:43 src/net/tmwa/generalhandler.cpp:237
-msgid "Attack"
-msgstr "Атаковать"
+#: ../src/gui/setup_video.cpp:252
+msgid "Overhead text"
+msgstr ""
 
-#: src/keyboardconfig.cpp:44
-msgid "Target & Attack"
-msgstr "Прицелиться и атаковать"
+#: ../src/resources/userpalette.cpp:93
+msgid "Own Name"
+msgstr "Собственное имя"
 
-#: src/keyboardconfig.cpp:45
-msgid "Smilie"
-msgstr "Улыбнуться"
+#: ../src/gui/setup_video.cpp:606
+#, fuzzy
+msgid "Particle Effect Settings Changed."
+msgstr "Эффекты частиц"
 
-#: src/keyboardconfig.cpp:46
-msgid "Talk"
-msgstr "Говорить"
+#: ../src/resources/userpalette.cpp:99
+msgid "Particle Effects"
+msgstr "Эффекты частиц"
 
-#: src/keyboardconfig.cpp:47
-msgid "Stop Attack"
-msgstr "Прекратить атаку"
+#: ../src/gui/debugwindow.cpp:69 ../src/gui/debugwindow.cpp:111
+#, fuzzy, c-format
+msgid "Particle count: %d"
+msgstr "Эффекты частиц"
 
-#: src/keyboardconfig.cpp:48
-msgid "Target Monster"
-msgstr "Прицелиться в монстра"
+#: ../src/gui/setup_video.cpp:255
+#, fuzzy
+msgid "Particle detail"
+msgstr "Качество частиц"
 
-#: src/keyboardconfig.cpp:49
-msgid "Target NPC"
-msgstr "Прицелиться на NPC"
+#: ../src/gui/debugwindow.cpp:116
+#, fuzzy, c-format
+msgid "Particle detail: %s"
+msgstr "Качество частиц"
 
-#: src/keyboardconfig.cpp:50
-msgid "Target Player"
-msgstr "Прицелиться на игрока"
+#: ../src/gui/setup_video.cpp:217
+msgid "Particle effects"
+msgstr "Эффекты частиц"
 
-#: src/keyboardconfig.cpp:51
-msgid "Pickup"
-msgstr "Поднять"
+#: ../src/net/tmwa/gui/partytab.cpp:43
+msgid "Party"
+msgstr "Группа"
 
-#: src/keyboardconfig.cpp:52
-msgid "Hide Windows"
-msgstr "Скрыть окна"
+#: ../src/gui/socialwindow.cpp:218
+#, c-format
+msgid "Party %s quit requested."
+msgstr ""
 
-#: src/keyboardconfig.cpp:53
-msgid "Sit"
-msgstr "Сесть"
+#: ../src/resources/userpalette.cpp:97
+#, fuzzy
+msgid "Party Members"
+msgstr "Группа"
 
-#: src/keyboardconfig.cpp:54
-msgid "Screenshot"
-msgstr "Сделать скриншот"
+#: ../src/gui/socialwindow.cpp:625
+msgid "Party Name"
+msgstr "имя группы"
 
-#: src/keyboardconfig.cpp:55
-msgid "Enable/Disable Trading"
-msgstr "Разрешить/Запретить торговлю"
+#: ../src/commandhandler.cpp:448 ../src/net/tmwa/gui/partytab.cpp:109
+msgid "Party name is missing."
+msgstr "Имя группы отсутствует."
 
-#: src/keyboardconfig.cpp:56
-msgid "Find Path to Mouse"
-msgstr "Идти за курсором мыши"
+#: ../src/net/tmwa/partyhandler.cpp:84
+msgid "Party successfully created."
+msgstr "Группа успешно создана."
 
-#: src/keyboardconfig.cpp:57 src/keyboardconfig.cpp:58
-#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
-#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
-#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
-#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66
-#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68
+#: ../src/gui/beingpopup.cpp:76
 #, c-format
-msgid "Item Shortcut %d"
-msgstr "Комбинация клавиш предмета %d"
+msgid "Party: %s"
+msgstr "Группа: %s"
 
-#: src/keyboardconfig.cpp:69
-msgid "Help Window"
-msgstr "Окно помощи"
+#: ../src/client.cpp:916
+msgid "Password Change"
+msgstr "Изменение пароля"
 
-#: src/keyboardconfig.cpp:70
-msgid "Status Window"
-msgstr "Окно статуса"
+#: ../src/client.cpp:917
+msgid "Password changed successfully!"
+msgstr "Пароль успешно изменен!"
 
-#: src/keyboardconfig.cpp:71
-msgid "Inventory Window"
-msgstr "Окно инвентаря"
+#: ../src/gui/changepassworddialog.cpp:61 ../src/gui/login.cpp:55
+#: ../src/gui/register.cpp:68 ../src/gui/unregisterdialog.cpp:53
+msgid "Password:"
+msgstr "Пароль:"
 
-#: src/keyboardconfig.cpp:72
-msgid "Equipment Window"
-msgstr "Окно екипировки"
+#: ../src/gui/register.cpp:197
+msgid "Passwords do not match."
+msgstr "Пароли не совпадают."
 
-#: src/keyboardconfig.cpp:73
-msgid "Skill Window"
-msgstr "Окно навыков"
+#: ../src/gui/popupmenu.cpp:188
+#, c-format
+msgid "Pick up %s"
+msgstr "Поднять %s"
 
-#: src/keyboardconfig.cpp:74
-msgid "Minimap Window"
-msgstr "Окно мини-карты"
+#: ../src/keyboardconfig.cpp:51
+msgid "Pickup"
+msgstr "Поднять"
 
-#: src/keyboardconfig.cpp:75
-msgid "Chat Window"
-msgstr "Окно чата"
+#: ../src/resources/userpalette.cpp:100
+msgid "Pickup Notification"
+msgstr "Сообщение о подборе предмета"
 
-#: src/keyboardconfig.cpp:76
-msgid "Item Shortcut Window"
-msgstr "Окно комбинаций клавиш предметов"
+#: ../src/gui/updatewindow.cpp:145
+msgid "Play"
+msgstr "Играть"
 
-#: src/keyboardconfig.cpp:77
-msgid "Setup Window"
-msgstr "Окно настроек"
+#: ../src/commandhandler.cpp:544
+msgid "Player already ignored!"
+msgstr "Игрок уже игнорируется!"
 
-#: src/keyboardconfig.cpp:78
-msgid "Debug Window"
-msgstr "Окно отладки"
+#: ../src/commandhandler.cpp:553
+msgid "Player could not be ignored!"
+msgstr "Игрок не может быть игнорирован!"
 
-#: src/keyboardconfig.cpp:79
+#: ../src/commandhandler.cpp:575
 #, fuzzy
-msgid "Social Window"
-msgstr "Окно навыков"
+msgid "Player could not be unignored!"
+msgstr "Низзя прошептать: пользователь игнорирует шептание..."
 
-#: src/keyboardconfig.cpp:80
-msgid "Emote Shortcut Window"
-msgstr "Окно емоций"
+#: ../src/net/manaserv/charhandler.cpp:210
+msgid "Player deleted."
+msgstr "Персонаж удален."
 
-#: src/keyboardconfig.cpp:81
-#, fuzzy
-msgid "Outfits Window"
-msgstr "Окно статуса"
+#: ../src/commandhandler.cpp:573
+msgid "Player no longer ignored!"
+msgstr "Игрок больше не игнорируется!"
 
-#: src/keyboardconfig.cpp:82
-msgid "Wear Outfit"
-msgstr ""
+#: ../src/commandhandler.cpp:551
+msgid "Player successfully ignored!"
+msgstr "Игрок успешно игнорирован!"
 
-#: src/keyboardconfig.cpp:83
-msgid "Copy Outfit"
-msgstr ""
+#: ../src/commandhandler.cpp:568
+msgid "Player wasn't ignored!"
+msgstr "Игрок не было игнорирован!"
 
-#: src/keyboardconfig.cpp:84 src/keyboardconfig.cpp:85
-#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:87
-#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:89
-#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:91
-#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:93
-#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:95
-#, c-format
-msgid "Emote Shortcut %d"
-msgstr "Комбинация клавиш для емоции %d"
+#: ../src/gui/setup_players.cpp:237
+msgid "Players"
+msgstr "Игроки"
 
-#: src/keyboardconfig.cpp:96
-msgid "Toggle Chat"
-msgstr "Переключится на чат"
+#: ../src/net/manaserv/chathandler.cpp:194
+#: ../src/net/manaserv/chathandler.cpp:277
+msgid "Players in this channel:"
+msgstr "Игроки в этом канале:"
 
-#: src/keyboardconfig.cpp:97
-msgid "Scroll Chat Up"
-msgstr "Прокрутить чат вверх"
+#: ../src/gui/charcreatedialog.cpp:99 ../src/gui/charcreatedialog.cpp:257
+#, c-format
+msgid "Please distribute %d points"
+msgstr "Распределите очки (%d)"
 
-#: src/keyboardconfig.cpp:98
-msgid "Scroll Chat Down"
-msgstr "Прокрутить чат вниз"
+#: ../src/gui/charcreatedialog.cpp:262
+#, c-format
+msgid "Please remove %d points"
+msgstr "Снимите очки (%d)"
 
-#: src/keyboardconfig.cpp:99
-msgid "Previous Chat Tab"
-msgstr "Предыдущая закладка чата"
+#: ../src/commandhandler.cpp:461 ../src/commandhandler.cpp:538
+#: ../src/commandhandler.cpp:560
+msgid "Please specify a name."
+msgstr "Пожалуйста, укажите имя."
 
-#: src/keyboardconfig.cpp:100
-msgid "Next Chat Tab"
-msgstr "Следующая закладка чата"
+#: ../src/gui/serverdialog.cpp:324
+msgid "Please type both the address and the port of a server."
+msgstr "Следует указать адрес и порт сервера."
 
-#: src/keyboardconfig.cpp:101
-msgid "Select OK"
-msgstr "Выбрать Ok"
+#: ../src/net/tmwa/specialhandler.cpp:214
+msgid "Poison had no effect..."
+msgstr "Яд не подействовал..."
 
-#: src/keyboardconfig.cpp:103
-msgid "Ignore input 1"
-msgstr "Игнорировать ввод 1"
+#: ../src/gui/serverdialog.cpp:207
+msgid "Port:"
+msgstr "Порт:"
 
-#: src/keyboardconfig.cpp:104
-msgid "Ignore input 2"
-msgstr "Игнорировать ввод 2"
+#: ../src/gui/serverdialog.cpp:451
+msgid "Preparing download"
+msgstr "Подготовка к загрузке"
 
-#: src/keyboardconfig.cpp:183
-#, c-format
-msgid ""
-"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
-"strange behaviour."
+#: ../src/gui/chat.cpp:311
+#, fuzzy, c-format
+msgid "Present: %s; %d players are present."
+msgstr "%d игроков он-лайн."
+
+#: ../src/net/manaserv/beinghandler.cpp:303
+msgid "Press OK to respawn."
 msgstr ""
-"Конфликт между  \"%s\" и  \"%s\" ключами. Исправьте их, или игра может себя "
-"странно вести."
 
-#: src/localplayer.cpp:985
-msgid "Unable to pick up item."
-msgstr "Невозможно подобрать предмет."
+#: ../src/gui/setup_joystick.cpp:37 ../src/gui/setup_joystick.cpp:78
+msgid "Press the button to start calibration"
+msgstr "Нажмите кнопку, чтобы начать калибровку"
 
-#. TRANSLATORS: This sentence may be translated differently
-#. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:994
+#: ../src/keyboardconfig.cpp:99
+msgid "Previous Chat Tab"
+msgstr "Предыдущая закладка чата"
+
+#: ../src/gui/buy.cpp:69 ../src/gui/buy.cpp:267 ../src/gui/sell.cpp:71
+#: ../src/gui/sell.cpp:288
 #, c-format
-msgid "You picked up %d [@@%d|%s@@]."
-msgid_plural "You picked up %d [@@%d|%s@@]."
-msgstr[0] ""
-msgstr[1] ""
+msgid "Price: %s / Total: %s"
+msgstr "Цена: %s / Всего: %s"
 
-#: src/main.cpp:42
-msgid "mana [options] [mana-file]"
+#: ../src/playerrelations.cpp:324
+msgid "Print '...'"
 msgstr ""
 
-#: src/main.cpp:43
-msgid "[mana-file] : The mana file is an XML file (.mana)"
-msgstr ""
+#: ../src/gui/trade.cpp:53
+msgid "Propose trade"
+msgstr "Предложить торговлю"
 
-#: src/main.cpp:44
-msgid "              used to set custom parameters"
-msgstr ""
+#: ../src/gui/setup_colors.cpp:85 ../src/gui/setup_colors.cpp:86
+#: ../src/gui/setup_colors.cpp:332
+msgid "Pulse"
+msgstr "Пульсирующий"
 
-#: src/main.cpp:45
-msgid "              to the mana client."
-msgstr ""
+#: ../src/gui/setup_players.cpp:231
+msgid "Put all whispers in tabs"
+msgstr "Личные сообщения во вкладках"
 
-#: src/main.cpp:47
-msgid "Options:"
-msgstr "Опции:"
+#: ../src/gui/buy.cpp:79 ../src/gui/quitdialog.cpp:40
+#: ../src/gui/quitdialog.cpp:42 ../src/gui/quitdialog.cpp:43
+#: ../src/gui/sell.cpp:77 ../src/gui/serverdialog.cpp:228
+#: ../src/keyboardconfig.cpp:102
+msgid "Quit"
+msgstr "Выход"
 
-#: src/main.cpp:48
-msgid "  -v --version        : Display the version"
-msgstr "  -v --version        : показать версию"
+#: ../src/gui/setup_colors.cpp:87 ../src/gui/setup_colors.cpp:88
+#: ../src/gui/setup_colors.cpp:333
+msgid "Rainbow"
+msgstr "Радуга"
 
-#: src/main.cpp:49
-msgid "  -h --help           : Display this help"
-msgstr "  -h --help           : Отображает этот текст"
+#: ../src/gui/socialwindow.cpp:553
+msgid "Received guild request, but one already exists."
+msgstr "Получено приглашение в гильдию, но уже одно есть"
 
-#: src/main.cpp:50
-msgid "  -C --config-dir     : Configuration directory to use"
-msgstr "  -C --config-dir     : конфигурация директории"
+#: ../src/gui/socialwindow.cpp:575
+msgid "Received party request, but one already exists."
+msgstr "Получено приглашение в группу, но уже одно есть"
 
-#: src/main.cpp:51
-msgid "  -U --username       : Login with this username"
-msgstr "  -U --username       : Войти с именем пользователя"
+#: ../src/gui/recorder.h:38
+msgid "Recording..."
+msgstr "Запись..."
 
-#: src/main.cpp:52
-msgid "  -P --password       : Login with this password"
-msgstr "  -P --password       : Войти с этим паролем"
+#: ../src/gui/setup_colors.cpp:109
+msgid "Red:"
+msgstr "Красный:"
 
-#: src/main.cpp:53
-msgid "  -c --character      : Login with this character"
-msgstr "  -c --character        : Авторизоваться под этим персонажем"
+#: ../src/gui/login.cpp:61 ../src/gui/register.cpp:58
+#: ../src/gui/register.cpp:73
+msgid "Register"
+msgstr "Зарегистрироваться"
 
-#: src/main.cpp:54
-msgid "  -s --server         : Login server name or IP"
-msgstr "  -s --server         : Имя сервера или IP"
+#: ../src/gui/login.cpp:129
+msgid "Registration disabled"
+msgstr "Регистрация приостановлена"
 
-#: src/main.cpp:55
-msgid "  -p --port           : Login server port"
-msgstr "  -p --port           : порт сервера"
+#: ../src/net/tmwa/loginhandler.cpp:165
+msgid "Rejected from server."
+msgstr "отклонены от сервера."
 
-#: src/main.cpp:56
-msgid "     --update-host    : Use this update host"
-msgstr "     --update-host    : Use this update host"
+#: ../src/gui/socialwindow.cpp:468
+#, fuzzy
+msgid "Rejected guild invite."
+msgstr "Пользователь отклонил приглашение в гильдию."
 
-#: src/main.cpp:57
-msgid "  -D --default        : Choose default character server and character"
-msgstr "  -D --default        : Выберите сервер и персонажа по умолчанию"
+#: ../src/gui/socialwindow.cpp:450
+#, c-format
+msgid "Rejected party invite from %s."
+msgstr "Отклонено приглашение от %s."
 
-#: src/main.cpp:59
-msgid "  -u --skip-update    : Skip the update downloads"
-msgstr "  -u --skip-update    : пропустить скачивание обновлений"
+#: ../src/gui/setup_players.cpp:59
+msgid "Relation"
+msgstr "Отношение"
 
-#: src/main.cpp:60
-msgid "  -d --data           : Directory to load game data from"
-msgstr "  -d --data           : Директория для загрузки данных игры"
+#: ../src/gui/login.cpp:60
+msgid "Remember username"
+msgstr "Запомнить имя пользователя"
 
-#: src/main.cpp:61
-msgid "     --localdata-dir  : Directory to use as local data directory"
+#: ../src/net/manaserv/tradehandler.cpp:115
+#: ../src/net/tmwa/tradehandler.cpp:109
+msgid "Request for Trade"
 msgstr ""
-"     --localdata-dir  : Директория для использования в качестве локальных "
-"данных"
 
-#: src/main.cpp:62
-msgid "     --chat-log-dir   : Chat log dir to use"
-msgstr ""
+#: ../src/net/tmwa/gamehandler.cpp:102
+msgid "Request to quit denied!"
+msgstr "Запрос на выход отклонен!"
 
-#: src/main.cpp:63
-msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr "     --screenshot-dir : Директория для скриншотов"
+#: ../src/client.cpp:809
+msgid "Requesting characters"
+msgstr "Запрос персонажей"
 
-#: src/main.cpp:65
-msgid "     --no-opengl      : Disable OpenGL for this session"
-msgstr "     --no-opengl      : Отключить OpenGL для этой сессии"
+#: ../src/client.cpp:889
+msgid "Requesting registration details"
+msgstr "Запрос регистрационных данных"
 
-#: src/net/manaserv/beinghandler.cpp:303 src/net/tmwa/playerhandler.cpp:94
-msgid "You are dead."
-msgstr "Вы мертвы."
+#: ../src/commandhandler.cpp:435
+#, c-format
+msgid "Requesting to join channel %s."
+msgstr "Запрос на присоединение к каналу %s."
 
-#: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:95
-msgid "We regret to inform you that your character was killed in battle."
-msgstr "Мы с сожалением сообщаем, что ваш персонаж был убит в бою."
+#: ../src/gui/npcdialog.cpp:134
+msgid "Reset"
+msgstr "Сбросить"
 
-#: src/net/manaserv/beinghandler.cpp:306 src/net/tmwa/playerhandler.cpp:97
-msgid "You are not that alive anymore."
-msgstr "Больше вас нет в живых"
+#: ../src/gui/setup.cpp:51
+msgid "Reset Windows"
+msgstr "Восстановить расположение окон"
 
-#: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:98
-msgid "The cold hands of the grim reaper are grabbing for your soul."
-msgstr "Холодные руки смерти захватывают вашу души."
+#: ../src/gui/setup_video.cpp:438
+msgid "Restart needed for changes to take effect."
+msgstr "Для вступления в силу выбранных настроек требуется перезагрузка игры."
 
-#: src/net/manaserv/beinghandler.cpp:308 src/net/tmwa/playerhandler.cpp:99
-msgid "Game Over!"
-msgstr "Игра окончена!"
+#: ../src/gui/setup_video.cpp:571 ../src/gui/setup_video.cpp:576
+msgid "Restart your client for the change to take effect."
+msgstr "Перезегрузите игру дабы изменения вступили в силу"
 
-#: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:101
-msgid ""
-"No, kids. Your character did not really die. It... err... went to a better "
-"place."
-msgstr ""
-"Нет, дети. Ваш персонаж не умирает. Он ... ммм ... пошел к лучшей жызни."
+#: ../src/gui/inventorywindow.cpp:132 ../src/gui/popupmenu.cpp:385
+msgid "Retrieve"
+msgstr "Получить"
 
-#: src/net/manaserv/beinghandler.cpp:311 src/net/tmwa/playerhandler.cpp:103
-msgid ""
-"Your plan of breaking your enemies weapon by bashing it with your throat "
-"failed."
-msgstr ""
+#: ../src/commandhandler.cpp:488
+msgid "Return now toggles chat."
+msgstr "Теперь Return переключает чат."
 
-#: src/net/manaserv/beinghandler.cpp:313 src/net/tmwa/playerhandler.cpp:105
-msgid "I guess this did not run too well."
-msgstr "Я думаю, это не слишком хорошо сработало."
+#: ../src/commandhandler.cpp:479
+msgid "Return toggles chat."
+msgstr "Enter переключает вас на окно чата."
 
-#: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:107
-msgid "Do you want your possessions identified?"
-msgstr ""
+#: ../src/gui/setup_joystick.cpp:84
+msgid "Rotate the stick"
+msgstr "Вращайте рукоять"
 
-#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:109
+#: ../src/net/manaserv/beinghandler.cpp:295
+#: ../src/net/tmwa/playerhandler.cpp:110
 msgid "Sadly, no trace of you was ever found..."
 msgstr "К сожалению, никаких ваших остатков не было найдено ..."
 
-#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:111
-msgid "Annihilated."
-msgstr "Уничтожены."
+#: ../src/game.cpp:354
+msgid "Saving screenshot failed!"
+msgstr "Ошибка при сохранении снимка экрана!"
 
-#: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:113
-msgid "Looks like you got your head handed to you."
-msgstr ""
+#: ../src/gui/setup_video.cpp:570 ../src/gui/setup_video.cpp:575
+msgid "Screen Resolution Changed"
+msgstr "Разрешение экрана изменены"
 
-#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:115
-msgid ""
-"You screwed up again, dump your body down the tubes and get you another one."
-msgstr ""
+#: ../src/keyboardconfig.cpp:54
+msgid "Screenshot"
+msgstr "Сделать скриншот"
 
-#: src/net/manaserv/beinghandler.cpp:323
-msgid "Press OK to respawn."
-msgstr ""
+#: ../src/game.cpp:349
+msgid "Screenshot saved as "
+msgstr "Снимок экрана сохранен как"
 
-#: src/net/manaserv/beinghandler.cpp:324
-msgid "You Died"
-msgstr "Вы умерли"
+#: ../src/keyboardconfig.cpp:98
+msgid "Scroll Chat Down"
+msgstr "Прокрутить чат вниз"
 
-#: src/net/manaserv/charhandler.cpp:138 src/net/manaserv/charhandler.cpp:209
-msgid "Not logged in."
-msgstr "Не авторизован."
+#: ../src/keyboardconfig.cpp:97
+msgid "Scroll Chat Up"
+msgstr "Прокрутить чат вверх"
 
-#: src/net/manaserv/charhandler.cpp:141
-msgid "No empty slot."
+#: ../src/gui/inventorywindow.cpp:87
+msgid "Search:"
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:144
-msgid "Invalid name."
-msgstr "Неверное имя."
-
-#: src/net/manaserv/charhandler.cpp:147
-msgid "Character's name already exists."
-msgstr "Персонаж с таким именем уже существует."
-
-#: src/net/manaserv/charhandler.cpp:150
-msgid "Invalid hairstyle."
-msgstr "Неверное прическа."
-
-#: src/net/manaserv/charhandler.cpp:153
-msgid "Invalid hair color."
-msgstr "Неверный цвет волос."
+#: ../src/net/tmwa/specialhandler.cpp:184
+msgid "Seems you need more money... ;-)"
+msgstr "Кажется, вам нужно больше денег... ;-)"
 
-#: src/net/manaserv/charhandler.cpp:156
-msgid "Invalid gender."
-msgstr "Неверный пол."
+#: ../src/keyboardconfig.cpp:101
+msgid "Select OK"
+msgstr "Выбрать Ok"
 
-#: src/net/manaserv/charhandler.cpp:159
-msgid "Character's stats are too high."
-msgstr "Данные персонажа слишком высоки."
+#: ../src/gui/worldselectdialog.cpp:71
+msgid "Select World"
+msgstr "Выбрать мир"
 
-#: src/net/manaserv/charhandler.cpp:162
-msgid "Character's stats are too low."
-msgstr "Данные персонажа слишком низки"
+#: ../src/gui/itemamount.cpp:144
+msgid "Select amount of items to drop."
+msgstr "Сколько предметов сбросить."
 
-#: src/net/manaserv/charhandler.cpp:165
-#, c-format
-msgid "At least one statis out of the permitted range: (%u - %u)."
-msgstr ""
+#: ../src/gui/itemamount.cpp:150
+msgid "Select amount of items to retrieve."
+msgstr "Укажите количество вещей для изъятия."
 
-#: src/net/manaserv/charhandler.cpp:171 src/net/manaserv/loginhandler.cpp:96
-#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
-#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
-#: src/net/tmwa/loginhandler.cpp:95 src/net/tmwa/loginhandler.cpp:182
-msgid "Unknown error."
-msgstr "Неизвестная ошибка."
+#: ../src/gui/itemamount.cpp:153
+msgid "Select amount of items to split."
+msgstr "Сколько предметов разделить."
 
-#: src/net/manaserv/charhandler.cpp:200 src/net/tmwa/charserverhandler.cpp:146
-msgid "Info"
-msgstr "Сведения"
+#: ../src/gui/itemamount.cpp:147
+msgid "Select amount of items to store."
+msgstr "Укажите количество вещей для хранения."
 
-#: src/net/manaserv/charhandler.cpp:200
-msgid "Player deleted."
-msgstr "Персонаж удален."
+#: ../src/gui/itemamount.cpp:141
+msgid "Select amount of items to trade."
+msgstr "Сколько предметов продать."
 
-#: src/net/manaserv/charhandler.cpp:212
+#: ../src/net/manaserv/charhandler.cpp:222
 msgid "Selection out of range."
 msgstr "Выбор вне зоне достижения"
 
-#: src/net/manaserv/charhandler.cpp:215
-#, c-format
-msgid "Unknown error (%d)."
-msgstr "Неизвестная ошибка (%d)."
+#: ../src/gui/buysell.cpp:47 ../src/gui/sell.cpp:49 ../src/gui/sell.cpp:76
+msgid "Sell"
+msgstr "Продать"
 
-#: src/net/manaserv/charhandler.cpp:250
-msgid "No gameservers are available."
-msgstr ""
+#: ../src/gui/npcpostdialog.cpp:54
+msgid "Send"
+msgstr "Отправить"
 
-#: src/net/manaserv/chathandler.cpp:187 src/net/manaserv/chathandler.cpp:313
-#: src/net/manaserv/guildhandler.cpp:260
-#, c-format
-msgid "Topic: %s"
+#: ../src/net/tmwa/loginhandler.cpp:182
+msgid "Server overpopulated."
 msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:274
-msgid "Players in this channel:"
-msgstr "Игроки в этом канале:"
+#: ../src/net/net.cpp:164
+msgid "Server protocol unsupported"
+msgstr ""
 
-#: src/net/manaserv/chathandler.cpp:208
-msgid "Error joining channel."
-msgstr "Ошибка присоединения к каналу."
+#: ../src/gui/serverdialog.cpp:208
+msgid "Server type:"
+msgstr "Тип сервера:"
 
-#: src/net/manaserv/chathandler.cpp:214
-msgid "Listing channels."
-msgstr "Запрос на присоединение к каналу."
+#: ../src/gui/serverdialog.cpp:206 ../src/gui/widgets/chattab.cpp:142
+msgid "Server:"
+msgstr "Сервер:"
 
-#: src/net/manaserv/chathandler.cpp:226
-msgid "End of channel list."
-msgstr ""
+#: ../src/client.cpp:580 ../src/gui/setup.cpp:43 ../src/gui/windowmenu.cpp:66
+msgid "Setup"
+msgstr "Настройка"
 
-#: src/net/manaserv/chathandler.cpp:303
-#, c-format
-msgid "%s entered the channel."
-msgstr "%s вступил в канал"
+#: ../src/keyboardconfig.cpp:77
+msgid "Setup Window"
+msgstr "Окно настроек"
 
-#: src/net/manaserv/chathandler.cpp:308
-#, c-format
-msgid "%s left the channel."
-msgstr ""
+#: ../src/gui/setup_audio.cpp:50
+msgid "Sfx volume"
+msgstr "Громкость эффектов"
 
-#: src/net/manaserv/chathandler.cpp:324
-#, c-format
-msgid "%s has set mode %s on user %s."
-msgstr ""
+#: ../src/gui/buysell.cpp:38
+msgid "Shop"
+msgstr "Магазин"
 
-#: src/net/manaserv/chathandler.cpp:334
-#, c-format
-msgid "%s has kicked %s."
-msgstr ""
+#: ../src/gui/windowmenu.cpp:65
+msgid "Shortcut"
+msgstr "Клавиша"
 
-#: src/net/manaserv/chathandler.cpp:339
-msgid "Unknown channel event."
-msgstr "Неизвестная события канала."
+#: ../src/commandhandler.cpp:505 ../src/commandhandler.cpp:514
+msgid "Show IP: Off"
+msgstr "Показ IP: Отключен"
 
-#: src/net/manaserv/guildhandler.cpp:82
-msgid "Guild created."
-msgstr "Гильдия создана."
+#: ../src/commandhandler.cpp:505 ../src/commandhandler.cpp:518
+msgid "Show IP: On"
+msgstr "Показ IP: Включен"
 
-#: src/net/manaserv/guildhandler.cpp:87
-msgid "Error creating guild."
-msgstr "Ошибка создания гильдии"
+#: ../src/gui/setup_video.cpp:246
+msgid "Show damage"
+msgstr "Показать ущерб"
 
-#: src/net/manaserv/guildhandler.cpp:97
-msgid "Invite sent."
-msgstr "Приглашение отправлено."
+#: ../src/gui/setup_players.cpp:233
+msgid "Show gender"
+msgstr "Показать пол"
 
-#: src/net/manaserv/guildhandler.cpp:204
-msgid "Member was promoted successfully."
-msgstr ""
+#: ../src/gui/setup_video.cpp:219
+msgid "Show own name"
+msgstr "Показать собственное имя"
 
-#: src/net/manaserv/guildhandler.cpp:209
-msgid "Failed to promote member."
-msgstr ""
+#: ../src/gui/setup_video.cpp:221
+msgid "Show pickup notification"
+msgstr "Показать уведомление о подборе предмета"
 
-#: src/net/manaserv/loginhandler.cpp:87
-msgid "Wrong magic_token."
-msgstr ""
+#: ../src/keyboardconfig.cpp:53
+msgid "Sit"
+msgstr "Сесть"
 
-#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
-msgid "Already logged in."
-msgstr "Уже в сети."
+#: ../src/net/tmwa/specialhandler.cpp:151
+msgid "Sit failed!"
+msgstr "Не удалось сесть!"
 
-#: src/net/manaserv/loginhandler.cpp:93
-msgid "Account banned."
-msgstr "Учётная запись заблокирована"
+#: ../src/gui/skilldialog.cpp:377
+#, c-format
+msgid "Skill %d"
+msgstr "Умения %d"
 
-#: src/net/manaserv/loginhandler.cpp:118
-msgid "New password incorrect."
-msgstr "Новый пароль указан неверно"
+#: ../src/gui/skilldialog.cpp:368
+#, c-format
+msgid "Skill Set %d"
+msgstr "Навыков %d"
 
-#: src/net/manaserv/loginhandler.cpp:121 src/net/tmwa/loginhandler.cpp:89
-msgid "Old password incorrect."
-msgstr "Старый пароль указан неверно"
+#: ../src/keyboardconfig.cpp:73
+msgid "Skill Window"
+msgstr "Окно навыков"
 
-#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
-msgid "Account not connected. Please login first."
+#: ../src/gui/skilldialog.cpp:273
+#, c-format
+msgid "Skill points available: %d"
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:149
-msgid "New email address incorrect."
-msgstr "Новый E-mail адрес указан неверно"
-
-#: src/net/manaserv/loginhandler.cpp:152
-msgid "Old email address incorrect."
-msgstr "Старый E-mail адрес указан неверно."
+#: ../src/gui/skilldialog.cpp:215 ../src/gui/windowmenu.cpp:59
+msgid "Skills"
+msgstr "Умения"
 
-#: src/net/manaserv/loginhandler.cpp:158
-msgid "The new email address already exists."
-msgstr "Введенный E-mail адрес уже зарегистрирован."
+#: ../src/gui/inventorywindow.cpp:86
+msgid "Slots:"
+msgstr "Вместимость:"
 
-#: src/net/manaserv/loginhandler.cpp:239
-msgid ""
-"Client registration is not allowed. Please contact server administration."
-msgstr ""
+#: ../src/gui/setup_video.cpp:129
+msgid "Small"
+msgstr "Маленький"
 
-#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
-msgid "Client version is too old."
-msgstr "Версия клиента устарела."
+#: ../src/keyboardconfig.cpp:45
+msgid "Smilie"
+msgstr "Улыбнуться"
 
-#: src/net/manaserv/loginhandler.cpp:266
-msgid "Wrong username or password."
-msgstr "Неверное имя пользователя или пароль."
+#: ../src/gui/socialwindow.cpp:312 ../src/gui/windowmenu.cpp:64
+msgid "Social"
+msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:272
-msgid "Account banned"
-msgstr "Учётная запись заблокированна"
+#: ../src/keyboardconfig.cpp:79
+#, fuzzy
+msgid "Social Window"
+msgstr "Окно навыков"
 
-#: src/net/manaserv/loginhandler.cpp:275
-msgid "Login attempt too soon after previous attempt."
+#: ../src/gui/setup_video.cpp:573
+msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
+"Некоторые окна могут быть перемещены в соответствии пониженной разрешении."
 
-#: src/net/manaserv/loginhandler.cpp:303
-msgid "Wrong username, password or email address."
-msgstr "Неверное имя пользователя, пароль или адрес E-mail."
-
-#: src/net/manaserv/loginhandler.cpp:306
-msgid "Username already exists."
-msgstr "Пользователь с таким именем уже существует."
+#: ../src/net/tmwa/generalhandler.cpp:139
+msgid "Someone else is trying to use this account."
+msgstr "Кто-то еще пытается воспользоваться данным аккаунтом."
 
-#: src/net/manaserv/loginhandler.cpp:309
-msgid "Email address already exists."
-msgstr "E-mail уже зарегистрирован."
+#: ../src/gui/setup_audio.cpp:42
+msgid "Sound"
+msgstr "Звук"
 
-#: src/net/manaserv/loginhandler.cpp:312
-msgid "You took too long with the captcha or your response was incorrect."
+#: ../src/gui/setup_audio.cpp:106
+msgid "Sound Engine"
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:87
-msgid "Joined party."
-msgstr "Присоединился к группе."
-
-#: src/net/manaserv/partyhandler.cpp:105
-#, c-format
-msgid "%s joined the party."
-msgstr "%s теперь в группе."
+#: ../src/gui/specialswindow.cpp:79 ../src/gui/windowmenu.cpp:62
+msgid "Specials"
+msgstr "Специальные"
 
-#: src/net/manaserv/partyhandler.cpp:123
-#, c-format
-msgid "%s rejected your invite."
-msgstr "%s отклонил ваше приглашение."
+#: ../src/gui/setup_colors.cpp:89 ../src/gui/setup_colors.cpp:90
+#: ../src/gui/setup_colors.cpp:333
+msgid "Spectrum"
+msgstr "спектр"
 
-#: src/net/manaserv/tradehandler.cpp:95
-msgid "Accepting incoming trade requests."
-msgstr "Входящих запросов торговли принимаются."
+#: ../src/net/tmwa/generalhandler.cpp:145
+msgid "Speed hack detected."
+msgstr "Обнаружен хак скорости."
 
-#: src/net/manaserv/tradehandler.cpp:97
-msgid "Ignoring incoming trade requests."
-msgstr "Входящих запросов торговли игнарируютса."
+#: ../src/gui/inventorywindow.cpp:108 ../src/gui/popupmenu.cpp:378
+msgid "Split"
+msgstr "Разделить"
 
-#: src/net/manaserv/tradehandler.cpp:115 src/net/tmwa/tradehandler.cpp:109
-msgid "Request for Trade"
+#: ../src/localplayer.cpp:899
+msgid "Stack is too big."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:110
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr "%s хочет торговатся с вами, вы принимаете?"
+#: ../src/gui/recorder.cpp:104
+msgid "Starting to record..."
+msgstr "Начало записи..."
 
-#: src/net/manaserv/tradehandler.cpp:134
-#, c-format
-msgid "Trading with %s"
-msgstr "Торговаться с  %s"
+#: ../src/gui/setup_colors.cpp:83 ../src/gui/setup_colors.cpp:331
+msgid "Static"
+msgstr "Статичный"
 
-#: src/net/manaserv/tradehandler.cpp:148 src/net/tmwa/tradehandler.cpp:224
-msgid "Trade canceled."
-msgstr "Торговля отменена."
+#: ../src/gui/windowmenu.cpp:54
+msgid "Status"
+msgstr "Состояние"
 
-#: src/net/manaserv/tradehandler.cpp:155 src/net/tmwa/tradehandler.cpp:231
-msgid "Trade completed."
-msgstr "Торговля завершена."
+#: ../src/keyboardconfig.cpp:70
+msgid "Status Window"
+msgstr "Окно статуса"
 
-#: src/net/tmwa/adminhandler.cpp:64
-msgid "Kick failed!"
-msgstr ""
+#: ../src/gui/setup_joystick.cpp:83
+msgid "Stop"
+msgstr "Стоп"
 
-#: src/net/tmwa/adminhandler.cpp:66
-msgid "Kick succeeded!"
+#: ../src/keyboardconfig.cpp:47
+msgid "Stop Attack"
+msgstr "Прекратить атаку"
+
+#: ../src/gui/recorder.h:39
+msgid "Stop recording"
 msgstr ""
 
-#: src/net/tmwa/buysellhandler.cpp:109
-msgid "Nothing to sell."
-msgstr "Нечего продавать..."
+#: ../src/gui/inventorywindow.cpp:59
+msgid "Storage"
+msgstr "Хранение"
 
-#: src/net/tmwa/buysellhandler.cpp:116
-msgid "Thanks for buying."
-msgstr "Спасибо за покупку!"
+#: ../src/gui/inventorywindow.cpp:131 ../src/gui/popupmenu.cpp:358
+msgid "Store"
+msgstr "Хранить"
 
-#: src/net/tmwa/buysellhandler.cpp:123
-msgid "Unable to buy."
-msgstr "Низзя купить!"
+#: ../src/net/manaserv/attributes.cpp:166
+#: ../src/net/tmwa/generalhandler.cpp:230
+msgid "Strength"
+msgstr "Сила"
 
-#: src/net/tmwa/buysellhandler.cpp:129
-msgid "Thanks for selling."
-msgstr "Спасибо за продажу!"
+#: ../src/net/manaserv/attributes.cpp:173
+#, fuzzy, c-format
+msgid "Strength %+.1f"
+msgstr "Сила %+d"
 
-#: src/net/tmwa/buysellhandler.cpp:131
-msgid "Unable to sell."
-msgstr "Низзя продать!"
+#: ../src/net/tmwa/generalhandler.cpp:102
+#, c-format
+msgid "Strength %+d"
+msgstr "Сила %+d"
 
-#: src/net/tmwa/charserverhandler.cpp:103
-msgid "Access denied. Most likely, there are too many players on this server."
-msgstr ""
-"Отказано в доступе. Скорее всего, слишком много игроков на этом сервере."
+#: ../src/net/tmwa/charserverhandler.cpp:270
+msgid "Strength:"
+msgstr "Сила:"
 
-#: src/net/tmwa/charserverhandler.cpp:107
-msgid "Cannot use this ID."
-msgstr "Низзя использовать данный ID."
+#: ../src/gui/npcdialog.cpp:51
+msgid "Submit"
+msgstr "Применить"
 
-#: src/net/tmwa/charserverhandler.cpp:110
-#, fuzzy
-msgid "Unknown char-server failure."
-msgstr "Неизвестный предмет"
+#: ../src/gui/charselectdialog.cpp:131
+msgid "Switch Login"
+msgstr "Сменить аккаунт"
 
-#: src/net/tmwa/charserverhandler.cpp:134
-msgid "Failed to create character. Most likely the name is already taken."
-msgstr "Невозможно создать персонажа. Скорее всего, таке имя уже используется."
+#: ../src/gui/quitdialog.cpp:45
+msgid "Switch character"
+msgstr "Сменить персонажа"
 
-#: src/net/tmwa/charserverhandler.cpp:146
-msgid "Character deleted."
-msgstr "Персонаж удален"
+#: ../src/gui/quitdialog.cpp:44
+msgid "Switch server"
+msgstr "Сменить сервер"
 
-#: src/net/tmwa/charserverhandler.cpp:151
-msgid "Failed to delete character."
-msgstr "Невозможно удалить персонажа"
+#: ../src/gui/setup_video.cpp:437
+msgid "Switching to Full Screen"
+msgstr "Переключение в полноэкранный режим"
 
-#: src/net/tmwa/charserverhandler.cpp:266
-msgid "Strength:"
-msgstr "Сила:"
+#: ../src/keyboardconfig.cpp:46
+msgid "Talk"
+msgstr "Говорить"
 
-#: src/net/tmwa/charserverhandler.cpp:267
-msgid "Agility:"
-msgstr "Выносливость:"
+#: ../src/gui/popupmenu.cpp:150
+#, c-format
+msgid "Talk to %s"
+msgstr "Говорить с %s"
 
-#: src/net/tmwa/charserverhandler.cpp:268
-msgid "Vitality:"
-msgstr "Живучесть:"
+#: ../src/keyboardconfig.cpp:44
+msgid "Target & Attack"
+msgstr "Прицелиться и атаковать"
 
-#: src/net/tmwa/charserverhandler.cpp:269
-msgid "Intelligence:"
-msgstr "Интеллект:"
+#: ../src/keyboardconfig.cpp:48
+msgid "Target Monster"
+msgstr "Прицелиться в монстра"
 
-#: src/net/tmwa/charserverhandler.cpp:270
-msgid "Dexterity:"
-msgstr "Ловкость:"
+#: ../src/keyboardconfig.cpp:49
+msgid "Target NPC"
+msgstr "Прицелиться на NPC"
 
-#: src/net/tmwa/charserverhandler.cpp:271
-msgid "Luck:"
-msgstr "Удача:"
+#: ../src/keyboardconfig.cpp:50
+msgid "Target Player"
+msgstr "Прицелиться на игрока"
 
-#: src/net/tmwa/chathandler.cpp:87
-#, c-format
-msgid "Whisper could not be sent, %s is offline."
-msgstr "Низзя прошептать: %s оффлайн"
+#: ../src/gui/setup_video.cpp:158
+msgid "Text"
+msgstr "Текст"
 
-#: src/net/tmwa/chathandler.cpp:96
-#, c-format
-msgid "Whisper could not be sent, ignored by %s."
-msgstr "Низзя прошептать: %s игнорирует шептание..."
+#: ../src/net/tmwa/buysellhandler.cpp:116
+msgid "Thanks for buying."
+msgstr "Спасибо за покупку!"
 
-#: src/net/tmwa/chathandler.cpp:230
-#, fuzzy
-msgid "MVP player."
-msgstr "Игрок"
+#: ../src/net/tmwa/buysellhandler.cpp:129
+msgid "Thanks for selling."
+msgstr "Спасибо за продажу!"
 
-#: src/net/tmwa/chathandler.cpp:265 src/net/tmwa/chathandler.cpp:271
-#: src/net/tmwa/chathandler.cpp:276 src/net/tmwa/chathandler.cpp:281
-#: src/net/tmwa/chathandler.cpp:286 src/net/tmwa/chathandler.cpp:291
-#: src/net/tmwa/chathandler.cpp:296 src/net/tmwa/chathandler.cpp:301
-msgid "Channels are not supported!"
-msgstr "Каналы не поддерживаются!"
+#: ../src/net/manaserv/beinghandler.cpp:287
+#: ../src/net/tmwa/playerhandler.cpp:99
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr "Холодные руки смерти захватывают вашу души."
 
-#: src/net/tmwa/gamehandler.cpp:88
-#, c-format
-msgid "Online users: %d"
-msgstr "Сейчас в сети: %d"
+#: ../src/game.cpp:385
+msgid "The connection to the server was lost."
+msgstr "Соединение с сервером потеряно."
 
-#: src/net/tmwa/gamehandler.cpp:101
-msgid "Game"
-msgstr "Игра"
+#: ../src/gui/changeemaildialog.cpp:141
+msgid "The email address entries mismatch."
+msgstr "Введенный E-mail адреса не совпадают."
 
-#: src/net/tmwa/gamehandler.cpp:101
-msgid "Request to quit denied!"
-msgstr "Запрос на выход отклонен!"
+#: ../src/net/manaserv/loginhandler.cpp:158
+msgid "The new email address already exists."
+msgstr "Введенный E-mail адрес уже зарегистрирован."
 
-#: src/net/tmwa/generalhandler.cpp:102
+#: ../src/gui/changeemaildialog.cpp:127
 #, c-format
-msgid "Strength %+d"
-msgstr "Сила %+d"
+msgid "The new email address needs to be at least %d characters long."
+msgstr "Новый E-MAIL адрес должен содержать не менее %d символов."
 
-#: src/net/tmwa/generalhandler.cpp:103
+#: ../src/gui/changeemaildialog.cpp:134
 #, c-format
-msgid "Agility %+d"
-msgstr "Ловкость %+d"
+msgid "The new email address needs to be less than %d characters long."
+msgstr "Новый E-MAIL адрес не должно содержать более %d символов."
 
-#: src/net/tmwa/generalhandler.cpp:104
-#, c-format
-msgid "Vitality %+d"
-msgstr "Выносливость %+d"
+#: ../src/gui/changepassworddialog.cpp:130
+msgid "The new password entries mismatch."
+msgstr "Пароли не совпадают"
 
-#: src/net/tmwa/generalhandler.cpp:105
+#: ../src/gui/changepassworddialog.cpp:116
 #, c-format
-msgid "Intelligence %+d"
-msgstr "Интеллект %+d"
+msgid "The new password needs to be at least %d characters long."
+msgstr "Новый пароль должен быть не менше %d символов."
 
-#: src/net/tmwa/generalhandler.cpp:106
+#: ../src/gui/changepassworddialog.cpp:123
 #, c-format
-msgid "Dexterity %+d"
-msgstr "Ловкость %+d"
+msgid "The new password needs to be less than %d characters long."
+msgstr "Новый пароль должен быть меньше, чем %d символов."
 
-#: src/net/tmwa/generalhandler.cpp:107
+#: ../src/gui/register.cpp:182 ../src/gui/unregisterdialog.cpp:117
 #, c-format
-msgid "Luck %+d"
-msgstr "Удача %+d"
+msgid "The password needs to be at least %d characters long."
+msgstr "Пароль должен содержать не менее %d символов."
 
-#: src/net/tmwa/generalhandler.cpp:132
-msgid "Authentication failed."
-msgstr "Ошибка авторизации."
+#: ../src/gui/register.cpp:190 ../src/gui/unregisterdialog.cpp:124
+#, c-format
+msgid "The password needs to be less than %d characters long."
+msgstr "Пароль не должен содержать более %d символов."
 
-#: src/net/tmwa/generalhandler.cpp:135
-msgid "No servers available."
-msgstr "Нет доступных серверов"
+#: ../src/gui/register.cpp:166
+#, c-format
+msgid "The username needs to be at least %d characters long."
+msgstr "Имя пользователя должно содержать не менее %d символов."
 
-#: src/net/tmwa/generalhandler.cpp:139
-msgid "Someone else is trying to use this account."
-msgstr "Кто-то еще пытается воспользоваться данным аккаунтом."
+#: ../src/gui/register.cpp:174
+#, c-format
+msgid "The username needs to be less than %d characters long."
+msgstr "Имя пользователя не должно содержать более %d символов."
 
-#: src/net/tmwa/generalhandler.cpp:142
+#: ../src/net/tmwa/generalhandler.cpp:142
 msgid "This account is already logged in."
 msgstr "Этот аккаунт уже авторизован."
 
-#: src/net/tmwa/generalhandler.cpp:145
-msgid "Speed hack detected."
-msgstr "Обнаружен хак скорости."
-
-#: src/net/tmwa/generalhandler.cpp:148
-msgid "Duplicated login."
-msgstr "Дублированный логин."
-
-#: src/net/tmwa/generalhandler.cpp:151
-msgid "Unknown connection error."
-msgstr "Неизвестный Глюк авторизации."
+#: ../src/net/tmwa/gui/guildtab.cpp:81
+msgid "This command causes the player to leave the guild."
+msgstr "Эта комманда заставляет игрока покинуть группу."
 
-#: src/net/tmwa/generalhandler.cpp:209
-msgid "Got disconnected from server!"
-msgstr "Отключено от сервера!"
+#: ../src/net/tmwa/gui/partytab.cpp:81
+msgid "This command causes the player to leave the party."
+msgstr "Эта комманда заставляет игрока покинуть группу"
 
-#: src/net/tmwa/generalhandler.cpp:230
-msgid "Strength"
-msgstr "Сила"
+#: ../src/net/tmwa/gui/partytab.cpp:96
+msgid "This command changes the party's experience sharing policy."
+msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:231
-msgid "Agility"
-msgstr "Ловкость"
+#: ../src/net/tmwa/gui/partytab.cpp:86
+msgid "This command changes the party's item sharing policy."
+msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:232
-msgid "Vitality"
-msgstr "Выносливость"
+#: ../src/commandhandler.cpp:274
+#, fuzzy
+msgid "This command clears the away status and message."
+msgstr "Задает тему для <сообщение>."
 
-#: src/net/tmwa/generalhandler.cpp:233
-msgid "Intelligence"
-msgstr "Интеллект"
+#: ../src/commandhandler.cpp:228
+msgid "This command clears the chat log of previous chat."
+msgstr "Эта команда очищает лог чата."
 
-#: src/net/tmwa/generalhandler.cpp:234
-msgid "Dexterity"
-msgstr "Ловкость"
+#: ../src/gui/widgets/whispertab.cpp:85
+msgid "This command closes the current whisper tab."
+msgstr "Закрывает вкладку перешептывания"
 
-#: src/net/tmwa/generalhandler.cpp:235
-msgid "Luck"
-msgstr "Удача"
+#: ../src/commandhandler.cpp:279
+msgid "This command creates a new party called <name>."
+msgstr "Эта комманда создает группу под названием <имя_группы>."
 
-#: src/net/tmwa/generalhandler.cpp:238
-msgid "Defense"
-msgstr "Защита"
+#: ../src/commandhandler.cpp:209
+msgid "This command displays a list of all commands available."
+msgstr "Эта команда показывает список доступных команд"
 
-#: src/net/tmwa/generalhandler.cpp:239
-msgid "M.Attack"
-msgstr "Магическая атака"
+#: ../src/commandhandler.cpp:212
+msgid "This command displays help on <command>."
+msgstr "Эта команда показывает помощь по <команде>."
 
-#: src/net/tmwa/generalhandler.cpp:240
-msgid "M.Defense"
-msgstr "Магическая защита"
+#: ../src/commandhandler.cpp:323
+msgid "This command displays the name of the current map."
+msgstr "Эта команда показывает имя текущей карты."
 
-#: src/net/tmwa/generalhandler.cpp:241
-msgid "% Accuracy"
-msgstr "% Точность"
+#: ../src/commandhandler.cpp:328
+msgid "This command displays the number of players currently online."
+msgstr "Эта команда показывает число пользователей в сети на данный момент."
 
-#: src/net/tmwa/generalhandler.cpp:242
-msgid "% Evade"
-msgstr "% Уварот"
+#: ../src/net/tmwa/gui/partytab.cpp:101
+msgid "This command displays the party's current experience sharing policy."
+msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:243
-msgid "% Critical"
-msgstr "% Критический"
+#: ../src/net/tmwa/gui/partytab.cpp:91
+msgid "This command displays the party's current item sharing policy."
+msgstr ""
 
-#: src/net/tmwa/gui/guildtab.cpp:45
-msgid "Guild"
-msgstr "Гильдия"
+#: ../src/commandhandler.cpp:312
+msgid "This command displays the return toggle status."
+msgstr ""
 
-#: src/net/tmwa/gui/guildtab.cpp:61 src/net/tmwa/gui/partytab.cpp:59
-msgid "/help > Display this help."
-msgstr "/help > Показать сию справку"
+#: ../src/commandhandler.cpp:301
+msgid "This command finishes a recording session."
+msgstr "Эта команда завершает запись."
 
-#: src/net/tmwa/gui/guildtab.cpp:62
-msgid "/invite > Invite a player to your guild"
-msgstr "/invite > Пригласить игрока в вашу гильдию"
+#: ../src/commandhandler.cpp:291
+msgid ""
+"This command gets a list of players within hearing and sends it to either "
+"the record log if recording, or the chat log otherwise."
+msgstr ""
+"Комманда получпет список всех игроков, которых вы слышите и посылает его "
+"либо в лог-файл (если включена такая опция), либо в окно чата."
 
-#: src/net/tmwa/gui/guildtab.cpp:63
-msgid "/leave > Leave the guild you are in"
-msgstr "/leave > Покинуть текущую гильдию"
+#: ../src/commandhandler.cpp:233
+msgid "This command ignores the given player regardless of current relations."
+msgstr ""
+"Эта команда игнорирует данного игрока, независимо от текущих отношений."
 
-#: src/net/tmwa/gui/guildtab.cpp:64
-msgid "/kick > Kick some one from the guild you are in"
-msgstr "/kick > Вышвырнуть кого-либо из вашей текущей гильдии"
+#: ../src/gui/widgets/whispertab.cpp:90
+msgid "This command ignores the other player regardless of current relations."
+msgstr "Эта команда не игнорирует игрока вне зависимости от текущих отношений."
 
-#: src/net/tmwa/gui/guildtab.cpp:73 src/net/tmwa/gui/partytab.cpp:73
-msgid "Command: /invite <nick>"
-msgstr "Комманда: /invite <игрок>"
+#: ../src/commandhandler.cpp:284 ../src/net/tmwa/gui/partytab.cpp:74
+msgid "This command invites <nick> to party with you."
+msgstr "Эта команда приглашает <имя персонажа> к вам в группу."
 
-#: src/net/tmwa/gui/guildtab.cpp:74
+#: ../src/net/tmwa/gui/guildtab.cpp:74
 msgid "This command invites <nick> to the guild you're in."
 msgstr "Эта команда приглашает <имя персонажа> к вам в гильдию."
 
-#: src/net/tmwa/gui/guildtab.cpp:80 src/net/tmwa/gui/partytab.cpp:80
-msgid "Command: /leave"
-msgstr "Комманда: /leave"
-
-#: src/net/tmwa/gui/guildtab.cpp:81
-msgid "This command causes the player to leave the guild."
-msgstr "Эта комманда заставляет игрока покинуть группу."
-
-#: src/net/tmwa/gui/guildtab.cpp:89
-msgid "Guild name is missing."
-msgstr "Отсутствует имя гильдии."
-
-#: src/net/tmwa/guildhandler.cpp:296
-msgid "Could not inivte user to guild."
-msgstr "Не удалось пригласить пользователя в гильдию."
-
-#: src/net/tmwa/guildhandler.cpp:301
-msgid "User rejected guild invite."
-msgstr "Пользователь отклонил приглашение в гильдию."
-
-#: src/net/tmwa/guildhandler.cpp:306
-msgid "User is now part of your guild."
-msgstr "Пользователь теперь является частью вашей гильдии."
+#: ../src/gui/widgets/channeltab.cpp:74
+msgid "This command leaves the current channel."
+msgstr "Комманда покидает текущий канал"
 
-#: src/net/tmwa/guildhandler.cpp:311
-msgid "Your guild is full."
-msgstr "Ваша гильдия полна."
+#: ../src/gui/widgets/channeltab.cpp:81
+msgid "This command makes <nick> a channel operator."
+msgstr "Эта комманда делает <пользователь> оператором канала."
 
-#: src/net/tmwa/guildhandler.cpp:316
-msgid "Unknown guild invite response."
+#: ../src/gui/widgets/channeltab.cpp:90
+msgid "This command makes <nick> leave the channel."
 msgstr ""
 
-#: src/net/tmwa/guildhandler.cpp:393
-msgid "Guild creation isn't supported yet."
-msgstr "Создания гильдии еще не поддерживается."
-
-#: src/net/tmwa/gui/partytab.cpp:43
-msgid "Party"
-msgstr "Группа"
+#: ../src/commandhandler.cpp:239
+msgid "This command makes you enter <channel>."
+msgstr "Команда для входа на <канал>."
 
-#: src/net/tmwa/gui/partytab.cpp:60
-msgid "/invite > Invite a player to your party"
-msgstr "/invite > Пригласить игрока в вашу группу"
+#: ../src/commandhandler.cpp:222
+msgid "This command sends the message <msg> to all players currently online."
+msgstr "Эта команда посылает <сообщение> всем игрокам в сети."
 
-#: src/net/tmwa/gui/partytab.cpp:61
-msgid "/leave > Leave the party you are in"
-msgstr "/leave > Покинуть текущую группу"
+#: ../src/commandhandler.cpp:257
+msgid "This command sends the text <message> to <nick>."
+msgstr "Эта команда посылает текст <сообщение> пользователю <nick>."
 
-#: src/net/tmwa/gui/partytab.cpp:62
-msgid "/kick > Kick some one from the party you are in"
-msgstr "/kick > Вышвырнуть кого-либо из вашей текущей группы"
+#: ../src/gui/widgets/channeltab.cpp:69
+msgid "This command sets the topic to <message>."
+msgstr "Задает тему для <сообщение>."
 
-#: src/net/tmwa/gui/partytab.cpp:63
-msgid "/item > Show/change party item sharing options"
+#: ../src/commandhandler.cpp:306
+msgid ""
+"This command sets whether the return key should toggle the chat log, or "
+"whether the chat log turns off automatically."
 msgstr ""
-"/item > Показать/Скрыть текущее состояние распределения предметов в группе"
+"Эта комманда устанавливает, будет ли нажатие клавиши Enter переключать лог "
+"чата или же он (лог) будет выключен автоматически."
 
-#: src/net/tmwa/gui/partytab.cpp:64
-msgid "/exp > Show/change party experience sharing options"
-msgstr "/exp > Показать/Скрыть текущее состояние распределения опыта в группе"
+#: ../src/commandhandler.cpp:245
+msgid "This command shows a list of all channels."
+msgstr "Эта команда показывает список всех каналов."
 
-#: src/net/tmwa/gui/partytab.cpp:81
-msgid "This command causes the player to leave the party."
-msgstr "Эта комманда заставляет игрока покинуть группу"
+#: ../src/gui/widgets/channeltab.cpp:64
+msgid "This command shows the users in this channel."
+msgstr "Эта комманда показывает пользователей канала"
 
-#: src/net/tmwa/gui/partytab.cpp:85
-msgid "Command: /item <policy>"
-msgstr ""
+#: ../src/commandhandler.cpp:298
+msgid "This command starts recording the chat log to the file <filename>."
+msgstr "Эта команда начнет протоколирование окна чата в файл <имя файла>."
 
-#: src/net/tmwa/gui/partytab.cpp:86
-msgid "This command changes the party's item sharing policy."
+#: ../src/commandhandler.cpp:317
+msgid "This command stops ignoring the given player if they are being ignored"
 msgstr ""
+"Эта команда останавливает игнорирование данного игрока, если они игнорируетса"
 
-#: src/net/tmwa/gui/partytab.cpp:87
-msgid ""
-"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
-"\"0\", \"no\", \"false\" to disable item sharing."
+#: ../src/gui/widgets/whispertab.cpp:96
+msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
+"Эта команда прекращает игнорировать других игроков, если они игнорируютса."
 
-#: src/net/tmwa/gui/partytab.cpp:90
-msgid "Command: /item"
-msgstr ""
+#: ../src/commandhandler.cpp:250
+msgid "This command tell others you are (doing) <msg>."
+msgstr "Эта команда покажет другим игрокам, что вы (делаете) <сообщение>."
 
-#: src/net/tmwa/gui/partytab.cpp:91
-msgid "This command displays the party's current item sharing policy."
+#: ../src/commandhandler.cpp:271
+msgid "This command tells you're away from keyboard with the given reason."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:95
-msgid "Command: /exp <policy>"
+#: ../src/commandhandler.cpp:265
+msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
+"Эта команда создаст закладку для личного общения между вами и <имя игрока>."
 
-#: src/net/tmwa/gui/partytab.cpp:96
-msgid "This command changes the party's experience sharing policy."
-msgstr ""
+#: ../src/gui/setup_colors.cpp:46
+msgid "This is what the color looks like"
+msgstr "Вот, как выглядит сей цвет"
 
-#: src/net/tmwa/gui/partytab.cpp:97
+#: ../src/client.cpp:783
 msgid ""
-"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
-"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
+"This server is missing needed world data. Please contact the administrator"
+"(s)."
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:100
-msgid "Command: /exp"
-msgstr ""
+#: ../src/net/tmwa/loginhandler.cpp:185
+msgid "This user name is already taken."
+msgstr "Этот аккаунт уже зарегистрирован"
 
-#: src/net/tmwa/gui/partytab.cpp:101
-msgid "This command displays the party's current experience sharing policy."
-msgstr ""
+#: ../src/gui/setup_video.cpp:128
+msgid "Tiny"
+msgstr "Маленький"
 
-#: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:196
-msgid "Item sharing enabled."
-msgstr ""
+#: ../src/gui/npcpostdialog.cpp:47
+msgid "To:"
+msgstr "Для:"
 
-#: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:202
-msgid "Item sharing disabled."
-msgstr ""
+#: ../src/keyboardconfig.cpp:96
+msgid "Toggle Chat"
+msgstr "Переключится на чат"
 
-#: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:208
-msgid "Item sharing not possible."
+#: ../src/net/manaserv/chathandler.cpp:190
+#: ../src/net/manaserv/chathandler.cpp:316
+#: ../src/net/manaserv/guildhandler.cpp:260
+#, c-format
+msgid "Topic: %s"
 msgstr ""
 
-#: src/net/tmwa/gui/partytab.cpp:141
-msgid "Item sharing unknown."
-msgstr ""
+#: ../src/gui/trade.cpp:73 ../src/gui/trade.cpp:74
+msgid "Trade"
+msgstr "Торговать"
 
-#: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:172
-msgid "Experience sharing enabled."
-msgstr ""
+#: ../src/net/manaserv/tradehandler.cpp:148
+#: ../src/net/tmwa/tradehandler.cpp:224
+msgid "Trade canceled."
+msgstr "Торговля отменена."
 
-#: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:178
-msgid "Experience sharing disabled."
-msgstr ""
+#: ../src/net/tmwa/tradehandler.cpp:134
+msgid "Trade cancelled due to an unknown reason."
+msgstr "Торговля отменена из-за неизвестной причины."
 
-#: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:184
-msgid "Experience sharing not possible."
-msgstr ""
+#: ../src/net/manaserv/tradehandler.cpp:155
+#: ../src/net/tmwa/tradehandler.cpp:231
+msgid "Trade completed."
+msgstr "Торговля завершена."
 
-#: src/net/tmwa/gui/partytab.cpp:176
-msgid "Experience sharing unknown."
-msgstr ""
+#: ../src/net/tmwa/specialhandler.cpp:145
+msgid "Trade failed!"
+msgstr "Торговля не удалась!"
 
-#: src/net/tmwa/inventoryhandler.cpp:285
-msgid "Failed to use item."
-msgstr ""
+#: ../src/net/tmwa/tradehandler.cpp:146
+#, c-format
+msgid "Trade with %s cancelled."
+msgstr "Торговля с %s отменена"
 
-#: src/net/tmwa/inventoryhandler.cpp:399
-msgid "Unable to equip."
-msgstr "Низзя екипировать!"
+#: ../src/gui/popupmenu.cpp:83
+#, c-format
+msgid "Trade with %s..."
+msgstr "Торговать с %s..."
 
-#: src/net/tmwa/inventoryhandler.cpp:410
-msgid "Unable to unequip."
-msgstr "Низзя разекипировать"
+#: ../src/gui/trade.cpp:59
+msgid "Trade: You"
+msgstr "Торговля: Вы"
 
-#: src/net/tmwa/loginhandler.cpp:86
-msgid "Account was not found. Please re-login."
-msgstr ""
+#: ../src/net/tmwa/tradehandler.cpp:139
+#, c-format
+msgid "Trade: You and %s"
+msgstr "Торговля: Вы и %s"
 
-#: src/net/tmwa/loginhandler.cpp:92
-msgid "New password too short."
-msgstr "Новый пароль слишком короткий."
+#: ../src/net/tmwa/tradehandler.cpp:130
+msgid "Trading isn't possible. Character doesn't exist."
+msgstr "Торговля невозможна. Персонаж не существует."
 
-#: src/net/tmwa/loginhandler.cpp:156
-msgid "Unregistered ID."
-msgstr "Незарегестрированый ID."
+#: ../src/net/tmwa/tradehandler.cpp:126
+msgid "Trading isn't possible. Trade partner is too far away."
+msgstr "Торговля невозможна. Партнер находится слишком далеко."
 
-#: src/net/tmwa/loginhandler.cpp:159
-msgid "Wrong password."
-msgstr "Неправильный пароль."
+#: ../src/net/manaserv/tradehandler.cpp:134
+#, c-format
+msgid "Trading with %s"
+msgstr "Торговаться с  %s"
 
-#: src/net/tmwa/loginhandler.cpp:162
-msgid "Account expired."
+#: ../src/gui/setup_video.cpp:469
+msgid "Transparency disabled"
+msgstr "Прозрачность отключена"
+
+#: ../src/gui/setup_video.cpp:477
+msgid "Transparency enabled"
+msgstr "Прозрачность включена"
+
+#: ../src/localplayer.cpp:895
+msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/net/tmwa/loginhandler.cpp:165
-msgid "Rejected from server."
-msgstr "отклонены от сервера."
+#: ../src/commandhandler.cpp:334
+msgid "Type /help for a list of commands."
+msgstr "Введите /help для получения списка команд."
 
-#: src/net/tmwa/loginhandler.cpp:168
-msgid ""
-"You have been permanently banned from the game. Please contact the GM team."
-msgstr "Вы были заблокированы от игры. Пожалуйста, свяжитесь с командой GM."
+#: ../src/gui/changeemaildialog.cpp:51
+msgid "Type new email address twice:"
+msgstr "Дважды введите новый E-mail адрес:"
 
-#: src/net/tmwa/loginhandler.cpp:172
-#, c-format
-msgid ""
-"You have been temporarily banned from the game until %s.\n"
-"Please contact the GM team via the forums."
-msgstr ""
-"Вы были заблокированы от игры до %s.\n"
-"Пожалуйста, свяжитесь с командой GM с помощю форума"
+#: ../src/gui/changepassworddialog.cpp:63
+msgid "Type new password twice:"
+msgstr "Введите новый пароль дважды:"
 
-#: src/net/tmwa/loginhandler.cpp:179
-msgid "This user name is already taken."
-msgstr "Этот аккаунт уже зарегистрирован"
+#: ../src/gui/setup_colors.cpp:72
+msgid "Type:"
+msgstr "Тип:"
 
-#: src/net/tmwa/network.cpp:145
-msgid "Empty address given to Network::connect()!"
-msgstr ""
+#: ../src/net/tmwa/buysellhandler.cpp:123
+msgid "Unable to buy."
+msgstr "Низзя купить!"
 
-#: src/net/tmwa/network.cpp:345
+#: ../src/net/tmwa/inventoryhandler.cpp:401
+msgid "Unable to equip."
+msgstr "Низзя екипировать!"
+
+#: ../src/net/tmwa/network.cpp:345
 msgid "Unable to resolve host \""
 msgstr "Невозможно подключиться к хосту \""
 
-#: src/net/tmwa/network.cpp:414
-msgid "Connection to server terminated. "
-msgstr "Подключение к карт прекращено"
+#: ../src/net/tmwa/buysellhandler.cpp:131
+msgid "Unable to sell."
+msgstr "Низзя продать!"
 
-#: src/net/tmwa/partyhandler.cpp:82
-msgid "Could not create party."
-msgstr "Не удалось создать группу."
+#: ../src/net/tmwa/inventoryhandler.cpp:413
+msgid "Unable to unequip."
+msgstr "Низзя разекипировать"
 
-#: src/net/tmwa/partyhandler.cpp:84
-msgid "Party successfully created."
-msgstr "Группа успешно создана."
+#: ../src/gui/setup_keyboard.cpp:90
+msgid "Unassign"
+msgstr "Снять"
 
-#: src/net/tmwa/partyhandler.cpp:119
-#, c-format
-msgid "%s is already a member of a party."
-msgstr "%s уже является членом группы"
+#: ../src/gui/equipmentwindow.cpp:88 ../src/gui/inventorywindow.cpp:94
+#: ../src/gui/inventorywindow.cpp:352 ../src/gui/popupmenu.cpp:364
+msgid "Unequip"
+msgstr "Снять"
 
-#: src/net/tmwa/partyhandler.cpp:123
-#, c-format
-msgid "%s refused your invitation."
-msgstr "%s отклонил ваше приглашение."
+#: ../src/gui/outfitwindow.cpp:70
+msgid "Unequip first"
+msgstr "Сначало снемите"
 
-#: src/net/tmwa/partyhandler.cpp:127
+#: ../src/net/manaserv/charhandler.cpp:270
 #, c-format
-msgid "%s is now a member of your party."
-msgstr "%s теперь является членом вашей группы."
+msgid "Unhandled character select error message %i."
+msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:131
+#: ../src/net/tmwa/tradehandler.cpp:154
+msgid "Unhandled trade cancel packet."
+msgstr ""
+
+#: ../src/gui/popupmenu.cpp:114 ../src/gui/popupmenu.cpp:123
 #, c-format
-msgid "Unknown invite response for %s."
+msgid "Unignore %s"
 msgstr ""
 
-#: src/net/tmwa/partyhandler.cpp:236
-msgid "You have left the party."
-msgstr "Вы покинули группу."
+#: ../src/net/net.cpp:141
+#, fuzzy
+msgid "Unknown Server Type! Exiting."
+msgstr "Вещь неизвестного типа"
 
-#: src/net/tmwa/partyhandler.cpp:246
-#, c-format
-msgid "%s has left your party."
-msgstr "%s вышел из группы"
+#: ../src/net/manaserv/chathandler.cpp:342
+msgid "Unknown channel event."
+msgstr "Неизвестная события канала."
 
-#: src/net/tmwa/partyhandler.cpp:299
-#, c-format
-msgid "An unknown member tried to say: %s"
-msgstr "Неизвестный член хотел сказать: %s"
+#: ../src/net/tmwa/charserverhandler.cpp:110
+#, fuzzy
+msgid "Unknown char-server failure."
+msgstr "Неизвестный предмет"
 
-#: src/net/tmwa/partyhandler.cpp:335
-#, c-format
-msgid "Inviting failed, because you can't see a player called %s."
-msgstr "Приглашение не удалось, потому что вы не можете видеть игрока %s."
+#: ../src/commandhandler.cpp:136 ../src/commandhandler.cpp:333
+msgid "Unknown command."
+msgstr "Неизвестная команда."
 
-#: src/net/tmwa/partyhandler.cpp:340
-msgid "You can only inivte when you are in a party!"
-msgstr "Вы можете приглашать только когда вы находитесь в группе!"
+#: ../src/net/tmwa/generalhandler.cpp:151
+msgid "Unknown connection error."
+msgstr "Неизвестный Глюк авторизации."
 
-#: src/net/tmwa/partyhandler.cpp:368
+#: ../src/net/manaserv/charhandler.cpp:225
 #, c-format
-msgid "%s is not in your party!"
-msgstr "%s не находится в вашей группе!"
+msgid "Unknown error (%d)."
+msgstr "Неизвестная ошибка (%d)."
 
-#: src/net/tmwa/playerhandler.cpp:100
-msgid "Insert coin to continue."
-msgstr "Вставьте монету, чтобы продолжить."
+#: ../src/net/manaserv/charhandler.cpp:174
+#: ../src/net/manaserv/loginhandler.cpp:96
+#: ../src/net/manaserv/loginhandler.cpp:127
+#: ../src/net/manaserv/loginhandler.cpp:161
+#: ../src/net/manaserv/loginhandler.cpp:279
+#: ../src/net/manaserv/loginhandler.cpp:316
+#: ../src/net/tmwa/loginhandler.cpp:95 ../src/net/tmwa/loginhandler.cpp:191
+msgid "Unknown error."
+msgstr "Неизвестная ошибка."
 
-#: src/net/tmwa/playerhandler.cpp:118
-msgid "You're not dead yet. You're just resting."
+#: ../src/net/tmwa/guildhandler.cpp:316
+msgid "Unknown guild invite response."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:119
-msgid "You are no more."
-msgstr "Вас больше нет."
-
-#: src/net/tmwa/playerhandler.cpp:120
-msgid "You have ceased to be."
+#: ../src/net/tmwa/partyhandler.cpp:131
+#, c-format
+msgid "Unknown invite response for %s."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:121
-msgid "You've expired and gone to meet your maker."
-msgstr ""
+#: ../src/resources/itemdb.cpp:324 ../src/resources/itemdb.cpp:425
+msgid "Unknown item"
+msgstr "Неизвестный предмет"
 
-#: src/net/tmwa/playerhandler.cpp:122
-msgid "You're a stiff."
+#: ../src/localplayer.cpp:902
+msgid "Unknown problem picking up item."
 msgstr ""
 
-#: src/net/tmwa/playerhandler.cpp:123
-msgid "Bereft of life, you rest in peace."
-msgstr ""
+#: ../src/gui/charselectdialog.cpp:145 ../src/gui/unregisterdialog.cpp:47
+#: ../src/gui/unregisterdialog.cpp:55
+msgid "Unregister"
+msgstr "Удалить регистрацию"
 
-#: src/net/tmwa/playerhandler.cpp:124
-msgid "If you weren't so animated, you'd be pushing up the daisies."
-msgstr ""
+#: ../src/client.cpp:955
+msgid "Unregister Successful"
+msgstr "Удаление аккаунта прошла успешно"
 
-#: src/net/tmwa/playerhandler.cpp:125
-msgid "Your metabolic processes are now history."
-msgstr ""
+#: ../src/net/tmwa/loginhandler.cpp:156
+msgid "Unregistered ID."
+msgstr "Незарегестрированый ID."
 
-#: src/net/tmwa/playerhandler.cpp:126
-msgid "You're off the twig."
-msgstr ""
+#: ../src/gui/skilldialog.cpp:228
+msgid "Up"
+msgstr "Верх"
 
-#: src/net/tmwa/playerhandler.cpp:127
-msgid "You've kicked the bucket."
-msgstr ""
+#: ../src/gui/updatewindow.cpp:124
+msgid "Updating..."
+msgstr "Обновление..."
 
-#: src/net/tmwa/playerhandler.cpp:128
-msgid ""
-"You've shuffled off your mortal coil, run down the curtain and joined the "
-"bleedin' choir invisibile."
-msgstr ""
+#: ../src/gui/inventorywindow.cpp:93
+msgid "Use"
+msgstr "Использовать"
 
-#: src/net/tmwa/playerhandler.cpp:130
-msgid "You are an ex-player."
-msgstr "Вы бывшый игрок."
+#: ../src/net/tmwa/guildhandler.cpp:306
+msgid "User is now part of your guild."
+msgstr "Пользователь теперь является частью вашей гильдии."
 
-#: src/net/tmwa/playerhandler.cpp:131
-msgid "You're pining for the fjords."
-msgstr ""
+#: ../src/net/tmwa/guildhandler.cpp:301
+msgid "User rejected guild invite."
+msgstr "Пользователь отклонил приглашение в гильдию."
 
-#: src/net/tmwa/playerhandler.cpp:246 src/net/tmwa/playerhandler.cpp:285
-msgid "Message"
-msgstr "Сообщение"
+#: ../src/net/manaserv/loginhandler.cpp:306
+msgid "Username already exists."
+msgstr "Пользователь с таким именем уже существует."
 
-#: src/net/tmwa/playerhandler.cpp:247
-msgid ""
-"You are carrying more than half your weight. You are unable to regain health."
-msgstr ""
+#: ../src/net/tmwa/loginhandler.cpp:188
+#, fuzzy
+msgid "Username permanently erased."
+msgstr "Пользователь с таким именем уже существует."
 
-#: src/net/tmwa/playerhandler.cpp:313
-#, c-format
-msgid "You picked up %s."
-msgstr "Вы получили %s."
+#: ../src/gui/setup_video.cpp:244
+msgid "Video"
+msgstr "Видео"
 
-#: src/net/tmwa/playerhandler.cpp:348
-msgid "Cannot raise skill!"
-msgstr "Невозможно повысить умение!"
+#: ../src/gui/setup_video.cpp:215
+msgid "Visible names"
+msgstr "Видимые имена"
 
-#: src/net/tmwa/playerhandler.cpp:488
-msgid "Equip arrows first."
-msgstr "Сначала оденьте стрелы"
+#: ../src/net/manaserv/attributes.cpp:205
+#: ../src/net/tmwa/generalhandler.cpp:232
+msgid "Vitality"
+msgstr "Выносливость"
 
-#: src/net/tmwa/specialhandler.cpp:144
-msgid "Trade failed!"
-msgstr "Торговля не удалась!"
+#: ../src/net/manaserv/attributes.cpp:212
+#, fuzzy, c-format
+msgid "Vitality %+.1f"
+msgstr "Выносливость %+d"
 
-#: src/net/tmwa/specialhandler.cpp:147
-msgid "Emote failed!"
-msgstr "Эмоция не удалась!"
+#: ../src/net/tmwa/generalhandler.cpp:104
+#, c-format
+msgid "Vitality %+d"
+msgstr "Выносливость %+d"
 
-#: src/net/tmwa/specialhandler.cpp:150
-msgid "Sit failed!"
-msgstr "Не удалось сесть!"
+#: ../src/net/tmwa/charserverhandler.cpp:272
+msgid "Vitality:"
+msgstr "Живучесть:"
 
-#: src/net/tmwa/specialhandler.cpp:153
-msgid "Chat creating failed!"
-msgstr "Создания чат не удалось!"
+#: ../src/gui/npcdialog.cpp:48
+msgid "Waiting for server"
+msgstr "Ожидание ответа от сервера"
 
-#: src/net/tmwa/specialhandler.cpp:156
-msgid "Could not join party!"
-msgstr "Невозможно присоединиться к группе!"
+#: ../src/gui/serverdialog.cpp:447
+msgid "Waiting for server..."
+msgstr "Ожидание ответа от сервера..."
 
-#: src/net/tmwa/specialhandler.cpp:159
-msgid "Cannot shout!"
+#: ../src/net/tmwa/specialhandler.cpp:208
+msgid "Warp failed..."
 msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:168
-msgid "You have not yet reached a high enough lvl!"
-msgstr "У Вас недостаточный уровень!"
+#: ../src/net/manaserv/beinghandler.cpp:284
+#: ../src/net/tmwa/playerhandler.cpp:96
+msgid "We regret to inform you that your character was killed in battle."
+msgstr "Мы с сожалением сообщаем, что ваш персонаж был убит в бою."
 
-#: src/net/tmwa/specialhandler.cpp:171
-msgid "Insufficient HP!"
-msgstr "Недостаточно HP!"
+#: ../src/keyboardconfig.cpp:82
+msgid "Wear Outfit"
+msgstr ""
 
-#: src/net/tmwa/specialhandler.cpp:174
-msgid "Insufficient SP!"
-msgstr "Недостаточно SP!"
+#: ../src/gui/inventorywindow.cpp:111
+msgid "Weight:"
+msgstr "Вес:"
 
-#: src/net/tmwa/specialhandler.cpp:177
-msgid "You have no memos!"
-msgstr ""
+#: ../src/gui/itempopup.cpp:174
+#, c-format
+msgid "Weight: %s"
+msgstr "Вес: %s"
 
-#: src/net/tmwa/specialhandler.cpp:180
-msgid "You cannot do that right now!"
-msgstr "Вы не можете сделать это сейчас!"
+#: ../src/gui/setup_players.cpp:262
+msgid "When ignoring:"
+msgstr "При игнорировании:"
 
-#: src/net/tmwa/specialhandler.cpp:183
-msgid "Seems you need more money... ;-)"
-msgstr "Кажется, вам нужно больше денег... ;-)"
+#: ../src/gui/popupmenu.cpp:91
+#, c-format
+msgid "Whisper %s"
+msgstr "Шептать %s"
 
-#: src/net/tmwa/specialhandler.cpp:186
-msgid "You cannot use this skill with that kind of weapon!"
-msgstr "Вы не можете использовать это умение с этим видом оружия!"
+#: ../src/net/tmwa/chathandler.cpp:87
+#, c-format
+msgid "Whisper could not be sent, %s is offline."
+msgstr "Низзя прошептать: %s оффлайн"
 
-#: src/net/tmwa/specialhandler.cpp:189
-msgid "You need another red gem!"
-msgstr ""
+#: ../src/net/tmwa/chathandler.cpp:96
+#, c-format
+msgid "Whisper could not be sent, ignored by %s."
+msgstr "Низзя прошептать: %s игнорирует шептание..."
 
-#: src/net/tmwa/specialhandler.cpp:192
-msgid "You need another blue gem!"
-msgstr ""
+#: ../src/gui/chat.cpp:494
+#, c-format
+msgid "Whispering to %s: %s"
+msgstr "Вы прошептали %s: %s"
 
-#: src/net/tmwa/specialhandler.cpp:195
-msgid "You're carrying to much to do this!"
-msgstr "Вы несёте слишком много, чтобы сделать это!"
+#: ../src/gui/socialwindow.cpp:154
+#, c-format
+msgid "Who would you like to invite to guild %s?"
+msgstr "Кого бы вы хотели пригласить в гильдию %s?"
 
-#: src/net/tmwa/specialhandler.cpp:198
-msgid "Huh? What's that?"
-msgstr "А? Что это?"
+#: ../src/gui/socialwindow.cpp:233
+#, c-format
+msgid "Who would you like to invite to party %s?"
+msgstr "Кого бы вы хотели пригласить в группу %s?"
 
-#: src/net/tmwa/specialhandler.cpp:207
-msgid "Warp failed..."
-msgstr ""
+#: ../src/net/manaserv/attributes.cpp:231
+#, fuzzy
+msgid "Willpower"
+msgstr "Сила волиr:"
 
-#: src/net/tmwa/specialhandler.cpp:210
-msgid "Could not steal anything..."
-msgstr "Нечего не удалось украсть..."
+#: ../src/net/manaserv/attributes.cpp:238
+#, fuzzy, c-format
+msgid "Willpower %+.1f"
+msgstr "Сила волиr:"
 
-#: src/net/tmwa/specialhandler.cpp:213
-msgid "Poison had no effect..."
-msgstr "Яд не подействовал..."
+#: ../src/net/manaserv/loginhandler.cpp:87
+msgid "Wrong magic_token."
+msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:126
-msgid "Trading isn't possible. Trade partner is too far away."
-msgstr "Торговля невозможна. Партнер находится слишком далеко."
+#: ../src/net/tmwa/loginhandler.cpp:159
+msgid "Wrong password."
+msgstr "Неправильный пароль."
 
-#: src/net/tmwa/tradehandler.cpp:130
-msgid "Trading isn't possible. Character doesn't exist."
-msgstr "Торговля невозможна. Персонаж не существует."
+#: ../src/net/manaserv/loginhandler.cpp:266
+msgid "Wrong username or password."
+msgstr "Неверное имя пользователя или пароль."
 
-#: src/net/tmwa/tradehandler.cpp:134
-msgid "Trade cancelled due to an unknown reason."
-msgstr "Торговля отменена из-за неизвестной причины."
+#: ../src/net/manaserv/loginhandler.cpp:303
+msgid "Wrong username, password or email address."
+msgstr "Неверное имя пользователя, пароль или адрес E-mail."
 
-#: src/net/tmwa/tradehandler.cpp:139
-#, c-format
-msgid "Trade: You and %s"
-msgstr "Торговля: Вы и %s"
+#: ../src/gui/confirmdialog.cpp:42
+msgid "Yes"
+msgstr "Да"
 
-#: src/net/tmwa/tradehandler.cpp:146
-#, c-format
-msgid "Trade with %s cancelled."
-msgstr "Торговля с %s отменена"
+#: ../src/net/manaserv/beinghandler.cpp:304
+msgid "You Died"
+msgstr "Вы умерли"
 
-#: src/net/tmwa/tradehandler.cpp:154
-msgid "Unhandled trade cancel packet."
-msgstr ""
+#: ../src/net/tmwa/playerhandler.cpp:131
+msgid "You are an ex-player."
+msgstr "Вы бывшый игрок."
 
-#: src/net/tmwa/tradehandler.cpp:202
-msgid "Failed adding item. Trade partner is over weighted."
+#: ../src/net/tmwa/playerhandler.cpp:254
+msgid ""
+"You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
-#: src/net/tmwa/tradehandler.cpp:207
-msgid "Failed adding item. Trade partner has no free slot."
-msgstr ""
+#: ../src/net/manaserv/beinghandler.cpp:283
+#: ../src/net/tmwa/playerhandler.cpp:95
+msgid "You are dead."
+msgstr "Вы мертвы."
 
-#: src/net/tmwa/tradehandler.cpp:211
-msgid "Failed adding item for unknown reason."
-msgstr ""
+#: ../src/net/tmwa/playerhandler.cpp:120
+msgid "You are no more."
+msgstr "Вас больше нет."
 
-#: src/playerrelations.cpp:310
-msgid "Completely ignore"
-msgstr "Полностью игнорировать"
+#: ../src/net/manaserv/beinghandler.cpp:286
+#: ../src/net/tmwa/playerhandler.cpp:98
+msgid "You are not that alive anymore."
+msgstr "Больше вас нет в живых"
 
-#: src/playerrelations.cpp:324
-msgid "Print '...'"
-msgstr ""
+#: ../src/net/tmwa/partyhandler.cpp:340
+msgid "You can only inivte when you are in a party!"
+msgstr "Вы можете приглашать только когда вы находитесь в группе!"
 
-#: src/playerrelations.cpp:340
-msgid "Blink name"
-msgstr ""
+#: ../src/net/tmwa/specialhandler.cpp:181
+msgid "You cannot do that right now!"
+msgstr "Вы не можете сделать это сейчас!"
 
-#: src/resources/itemdb.cpp:44
-msgid "Attack %+d"
-msgstr "Атака %+d"
+#: ../src/net/tmwa/specialhandler.cpp:187
+msgid "You cannot use this skill with that kind of weapon!"
+msgstr "Вы не можете использовать это умение с этим видом оружия!"
 
-#: src/resources/itemdb.cpp:45
-#, c-format
-msgid "Defense %+d"
-msgstr "Защита %+d"
+#: ../src/gui/trade.cpp:304
+msgid "You don't have enough money."
+msgstr "У вас недостаточно денег"
 
-#: src/resources/itemdb.cpp:46
+#: ../src/gui/trade.cpp:98 ../src/gui/trade.cpp:134
 #, c-format
-msgid "HP %+d"
-msgstr "HP %+d"
+msgid "You get %s"
+msgstr "Вы получили %s"
+
+#: ../src/gui/trade.cpp:99
+msgid "You give:"
+msgstr "Вы отдаете:"
 
-#: src/resources/itemdb.cpp:47
+#: ../src/gui/socialwindow.cpp:588
 #, c-format
-msgid "MP %+d"
-msgstr "Мана %+d"
+msgid "You have been invited to join the %s party."
+msgstr "Вы были приглашены присоединиться к группе %s."
 
-#: src/resources/itemdb.cpp:92
-msgid "Unknown item"
-msgstr "Неизвестный предмет"
+#: ../src/gui/socialwindow.cpp:584
+msgid "You have been invited you to join a party."
+msgstr "Вы были приглашены вступить в группу."
 
-#: src/resources/itemdb.cpp:135 src/resources/monsterdb.cpp:77
-msgid "unnamed"
-msgstr "безымянный"
+#: ../src/net/tmwa/loginhandler.cpp:168
+msgid ""
+"You have been permanently banned from the game. Please contact the GM team."
+msgstr "Вы были заблокированы от игры. Пожалуйста, свяжитесь с командой GM."
 
-#: ../src/main.cpp:57
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
+#: ../src/net/tmwa/loginhandler.cpp:175
+#, c-format
+msgid ""
+"You have been temporarily banned from the game until %s.\n"
+"Please contact the GM team via the forums."
 msgstr ""
+"Вы были заблокированы от игры до %s.\n"
+"Пожалуйста, свяжитесь с командой GM с помощю форума"
 
-#: ../src/commandhandler.cpp:182
-msgid "/away > Tell the other whispering players you're away from keyboard."
+#: ../src/net/tmwa/playerhandler.cpp:121
+msgid "You have ceased to be."
 msgstr ""
 
-#: ../src/localplayer.cpp:1458
-msgid "Away"
-msgstr ""
+#: ../src/net/tmwa/partyhandler.cpp:236
+msgid "You have left the party."
+msgstr "Вы покинули группу."
 
-#: ../src/gui/userpalette.cpp:91
-msgid "Being"
+#: ../src/net/tmwa/specialhandler.cpp:178
+msgid "You have no memos!"
 msgstr ""
 
-#: ../src/commandhandler.cpp:274
-#, fuzzy
-msgid "Command: /away"
-msgstr "Команда: /who"
-
-#: ../src/commandhandler.cpp:271
-#, fuzzy
-msgid "Command: /away <afk reason>"
-msgstr "Команда: /w <ник> <сообщение>"
-
-#: ../src/playerrelations.cpp:379
-msgid "Floating '...' bubble"
-msgstr ""
+#: ../src/net/tmwa/specialhandler.cpp:169
+msgid "You have not yet reached a high enough lvl!"
+msgstr "У Вас недостаточный уровень!"
 
-#: ../src/playerrelations.cpp:382
-msgid "Floating bubble"
+#: ../src/gui/setup_audio.cpp:94
+msgid "You may have to restart your client if you want to download new music"
 msgstr ""
+"Возможно придется перезагрузить клиент, чтобы вы смогли скачать новую музыку"
 
-#: ../src/gui/userpalette.cpp:98
-#, fuzzy
-msgid "Guild Members"
-msgstr "Гильдия"
-
-#: ../src/localplayer.cpp:1254
-#, fuzzy
-msgid "Inventory is full."
-msgstr "Инвентарь"
+#: ../src/gui/setup_video.cpp:470 ../src/gui/setup_video.cpp:478
+msgid "You must restart to apply changes."
+msgstr "Вы должны перезагрузитса, чтобы изменения вступили в силу."
 
-#: ../src/localplayer.cpp:1257
-msgid "Item belongs to someone else."
+#: ../src/net/tmwa/specialhandler.cpp:193
+msgid "You need another blue gem!"
 msgstr ""
 
-#: ../src/localplayer.cpp:1253
-msgid "Item is too far away"
+#: ../src/net/tmwa/specialhandler.cpp:190
+msgid "You need another red gem!"
 msgstr ""
 
-#: ../src/localplayer.cpp:1252
-msgid "Item is too heavy."
+#: ../src/gui/login.cpp:129
+msgid "You need to use the website to register an account for this server."
 msgstr ""
+"Вам необходимо использовать веб-сайт, чтобы зарегистрировать новый аккаунт"
 
-#: ../src/gui/userpalette.cpp:109
-#, fuzzy
-msgid "Local Player Critical Hit"
-msgstr "Критический удар"
-
-#: ../src/gui/userpalette.cpp:107
-#, fuzzy
-msgid "Local Player Hits Monster"
-msgstr "Удары игрока по монстру"
+#: ../src/localplayer.cpp:920
+#, c-format
+msgid "You picked up %d [@@%d|%s@@]."
+msgid_plural "You picked up %d [@@%d|%s@@]."
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../src/gui/userpalette.cpp:111
-#, fuzzy
-msgid "Local Player Miss"
-msgstr "Сохранить список игроков"
+#: ../src/net/tmwa/playerhandler.cpp:327
+#, c-format
+msgid "You picked up %s."
+msgstr "Вы получили %s."
 
-#: ../src/commandhandler.cpp:408
-msgid "No <nick> was given."
+#: ../src/net/manaserv/beinghandler.cpp:298
+#: ../src/net/tmwa/playerhandler.cpp:116
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
 
-#: ../src/net/manaserv/charhandler.cpp:161
-msgid "One stat is zero."
+#: ../src/net/manaserv/loginhandler.cpp:312
+msgid "You took too long with the captcha or your response was incorrect."
 msgstr ""
 
-#: ../src/gui/userpalette.cpp:103
-#, fuzzy
-msgid "Other Player Hits Monster"
-msgstr "Удары игрока по монстру"
+#: ../src/net/tmwa/playerhandler.cpp:123
+msgid "You're a stiff."
+msgstr ""
 
-#: ../src/gui/userpalette.cpp:97
-#, fuzzy
-msgid "Party Members"
-msgstr "Группа"
+#: ../src/net/tmwa/specialhandler.cpp:196
+msgid "You're carrying to much to do this!"
+msgstr "Вы несёте слишком много, чтобы сделать это!"
 
-#: ../src/gui/specialswindow.cpp:191
-#, c-format
-msgid "Special %d"
+#: ../src/net/tmwa/playerhandler.cpp:119
+msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: ../src/gui/specialswindow.cpp:174
-#, c-format
-msgid "Specials Set %d"
+#: ../src/net/tmwa/playerhandler.cpp:127
+msgid "You're off the twig."
 msgstr ""
 
-#: ../src/localplayer.cpp:1255
-msgid "Stack is too big."
+#: ../src/net/tmwa/playerhandler.cpp:132
+msgid "You're pining for the fjords."
 msgstr ""
 
-#: ../src/commandhandler.cpp:275
-#, fuzzy
-msgid "This command clears the away status and message."
-msgstr "Задает тему для <сообщение>."
-
-#: ../src/commandhandler.cpp:272
-msgid "This command tells you're away from keyboard with the given reason."
+#: ../src/net/tmwa/playerhandler.cpp:122
+msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: ../src/localplayer.cpp:1251
-msgid "Tried to pick up nonexistent item."
+#: ../src/net/tmwa/playerhandler.cpp:128
+msgid "You've kicked the bucket."
 msgstr ""
 
-#: ../src/net/net.cpp:145
-#, fuzzy
-msgid "Unknown Server Type! Exiting."
-msgstr "Вещь неизвестного типа"
-
-#: ../src/localplayer.cpp:1258
-msgid "Unknown problem picking up item."
+#: ../src/net/tmwa/playerhandler.cpp:129
+msgid ""
+"You've shuffled off your mortal coil, run down the curtain and joined the "
+"bleedin' choir invisibile."
 msgstr ""
 
-#: ../src/net/tmwa/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
-msgstr "Низзя прошептать: пользователь игнорирует шептание..."
-
-#: ../src/net/tmwa/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
-msgstr "Низзя прошептать: пользователь оффлайн"
+#: ../src/net/tmwa/guildhandler.cpp:311
+msgid "Your guild is full."
+msgstr "Ваша гильдия полна."
 
-#: ../src/net/manaserv/stats.cpp:118
-#, c-format
-msgid "Willpower %+d"
+#: ../src/net/tmwa/playerhandler.cpp:126
+msgid "Your metabolic processes are now history."
 msgstr ""
 
-#, fuzzy
-#~ msgid "HP"
-#~ msgstr "ЖО:"
-
-#, fuzzy
-#~ msgid "MP"
-#~ msgstr "Мана:"
-
-#, fuzzy
-#~ msgid "Exp"
-#~ msgstr "Exp:"
-
-#, fuzzy
-#~ msgid "Money"
-#~ msgstr "Деньги: %d"
+#: ../src/gui/charcreatedialog.cpp:184
+msgid "Your name needs to be at least 4 characters."
+msgstr "Имя должно содержать не менее четырех символов."
 
-#, fuzzy
-#~ msgid "Job"
-#~ msgstr "Профессия:"
+#: ../src/net/manaserv/beinghandler.cpp:291
+#: ../src/net/tmwa/playerhandler.cpp:104
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
 
-#, fuzzy
-#~ msgid "Level"
-#~ msgstr "Уровень: %d"
+#: ../src/main.cpp:43
+msgid "[mana-file] : The mana file is an XML file (.mana)"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Access denied."
-#~ msgstr "Доступ запрещен"
+#: ../src/gui/setup_video.cpp:225
+msgid "as particle"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Unknown failure to select character."
-#~ msgstr "Неизвестный Глюк при выборе персонажа"
+#: ../src/gui/setup_video.cpp:174 ../src/gui/setup_video.cpp:188
+msgid "high"
+msgstr "выс."
 
-#~ msgid "Willpower:"
-#~ msgstr "Сила волиr:"
+#: ../src/gui/setup_video.cpp:223
+msgid "in chat"
+msgstr "в чате"
 
-#, fuzzy
-#~ msgid "Willpower"
-#~ msgstr "Сила волиr:"
+#: ../src/gui/setup_video.cpp:173 ../src/gui/setup_video.cpp:186
+msgid "low"
+msgstr "низ."
 
-#~ msgid "Text Shadow"
-#~ msgstr "Затенение текста"
+#: ../src/main.cpp:42
+msgid "mana [options] [mana-file]"
+msgstr ""
 
-#~ msgid "Progress Bar Labels"
-#~ msgstr "Подписи Progress Bar'ов"
+#: ../src/gui/setup_video.cpp:189
+msgid "max"
+msgstr "максимальное"
 
-#~ msgid "Background"
-#~ msgstr "Фон"
+#: ../src/gui/setup_video.cpp:187
+msgid "medium"
+msgstr "средне"
 
-#~ msgid "Highlight"
-#~ msgstr "Подсветка"
+#: ../src/gui/setup_video.cpp:172
+msgid "off"
+msgstr "выкл"
 
-#~ msgid "Tab Highlight"
-#~ msgstr "Подсветка закладок"
+#: ../src/gui/serverdialog.cpp:550
+msgid "requires a newer version"
+msgstr "Требует более новую версию"
 
-#, fuzzy
-#~ msgid "Item Too Expensive"
-#~ msgstr "Предмет слишком дорогой для вас"
+#: ../src/gui/serverdialog.cpp:552
+#, c-format
+msgid "requires v%s"
+msgstr "Требует v%s"
 
-#, fuzzy
-#~ msgid "Item Is Equipped"
-#~ msgstr "Предмет екипирован"
+#: ../src/resources/beinginfo.cpp:32 ../src/resources/itemdb.cpp:260
+#: ../src/resources/monsterdb.cpp:77
+msgid "unnamed"
+msgstr "безымянный"
 
-#~ msgid "GM"
-#~ msgstr "ГМ"
+#~ msgid " host: "
+#~ msgstr " хост: "
 
-#~ msgid "Player"
-#~ msgstr "Игрок"
+#~ msgid "% Reflex:"
+#~ msgstr "% Рефлекс"
 
-#~ msgid "Whisper"
-#~ msgstr "Шептать"
+#~ msgid "/new > Alias of create"
+#~ msgstr "/new > Имя для создания"
 
-#~ msgid "Is"
-#~ msgstr "Есть"
+#~ msgid "1/2 HP Bar"
+#~ msgstr "Половина строки ЖО"
 
-#~ msgid "Server"
-#~ msgstr "Сервер"
+#~ msgid "1/4 HP Bar"
+#~ msgstr "1/4 строки ЖО"
 
-#~ msgid "Hyperlink"
-#~ msgstr "Ссылка"
+#~ msgid "2 Handed Weapons"
+#~ msgstr "Двуручное оружие"
 
-#~ msgid "Other Players' Names"
-#~ msgstr "Имена других игроков"
+#~ msgid "3/4 HP Bar"
+#~ msgstr "3/4 строки ЖО"
 
-#~ msgid "Own Name"
-#~ msgstr "Собственное имя"
+#~ msgid "@@admin-kick|Kick player@@"
+#~ msgstr "@@admin-kick|Вышвырнуть игрока@@"
 
-#~ msgid "GM Names"
-#~ msgstr "Имена ГМ"
+#~ msgid "@@attack|Attack %s@@"
+#~ msgstr "@@attack|Атаковать %s@@"
 
-#~ msgid "NPCs"
-#~ msgstr "Боты"
+#~ msgid "@@cancel|Cancel@@"
+#~ msgstr "@@cancelОтмена@@"
 
-#~ msgid "Monsters"
-#~ msgstr "Монстры"
+#~ msgid "@@drop|Drop@@"
+#~ msgstr "@@drop|Сбросить@@"
 
-#~ msgid "Unknown Item Type"
-#~ msgstr "Вещь неизвестного типа"
+#~ msgid "@@pickup|Pick Up %s@@"
+#~ msgstr "@@pickup|Подобрать %s@@"
 
-#~ msgid "Generics"
-#~ msgstr "Общие"
+#~ msgid "@@pickup|Pick up %s@@"
+#~ msgstr "@@pickup|Поднять %s@@"
 
-#~ msgid "Hats"
-#~ msgstr "Шляпы"
+#~ msgid "@@split|Split@@"
+#~ msgstr "@@split|Разделить@@"
 
-#~ msgid "Usables"
-#~ msgstr "используемый"
+#~ msgid "@@unignore|Un-Ignore %s@@"
+#~ msgstr "@@unignore|Не игнорировать %s@@"
 
-#~ msgid "Shirts"
-#~ msgstr "Рубашки"
+#~ msgid "@@use|Equip@@"
+#~ msgstr "@@use|Надеть@@"
 
-#, fuzzy
-#~ msgid "One Handed Weapons"
-#~ msgstr "Одноручное оружие"
+#~ msgid "@@use|Unequip@@"
+#~ msgstr "@@use|Разекипировать@@"
 
-#~ msgid "Pants"
-#~ msgstr "Штаны"
+#~ msgid "@@use|Use@@"
+#~ msgstr "@@use|Использовать@@"
 
-#~ msgid "Shoes"
-#~ msgstr "Обувь"
+#~ msgid "Accepted guild invite from %s."
+#~ msgstr "Принять приглашение в гильдию от %s."
 
 #, fuzzy
-#~ msgid "Two Handed Weapons"
-#~ msgstr "Одноручное оружие"
-
-#~ msgid "Shields"
-#~ msgstr "Щиты"
-
-#~ msgid "Rings"
-#~ msgstr "Кольца"
-
-#~ msgid "Necklaces"
-#~ msgstr "Ожерелья"
+#~ msgid "Access denied."
+#~ msgstr "Доступ запрещен"
 
 #~ msgid "Ammo"
 #~ msgstr "Боеприпасы"
 
-#~ msgid "Particle Effects"
-#~ msgstr "Эффекты частиц"
+#~ msgid "Attack:"
+#~ msgstr "Атака:"
 
-#~ msgid "Pickup Notification"
-#~ msgstr "Сообщение о подборе предмета"
+#~ msgid "Axe"
+#~ msgstr "Топор"
 
-#~ msgid "Exp Notification"
-#~ msgstr "Сообщение об изменении опыта"
+#~ msgid "Background"
+#~ msgstr "Фон"
 
-#, fuzzy
-#~ msgid "Player Hits Monster"
-#~ msgstr "Удары игрока по монстру"
+#~ msgid "Bow"
+#~ msgstr "Лук"
 
-#, fuzzy
-#~ msgid "Monster Hits Player"
-#~ msgstr "Удары монстра по игроку"
+#~ msgid "Buddy"
+#~ msgstr "Друг"
 
-#~ msgid "Critical Hit"
-#~ msgstr "Критический удар"
+#~ msgid "Buddy List"
+#~ msgstr "Список друзей"
 
-#~ msgid "Misses"
-#~ msgstr "Промахи"
+#~ msgid "Buddys"
+#~ msgstr "Приятели"
 
-#~ msgid "HP Bar"
-#~ msgstr "Строка жизненных очков (ЖО)"
+#~ msgid "Cast Test Spell 1"
+#~ msgstr "Прочитать Тестовое Заклинание №1"
 
-#~ msgid "3/4 HP Bar"
-#~ msgstr "3/4 строки ЖО"
+#~ msgid "Cast Test Spell 2"
+#~ msgstr "Прочитать Тестовое Заклинание №2"
 
-#~ msgid "1/2 HP Bar"
-#~ msgstr "Половина строки ЖО"
+#~ msgid "Cast Test Spell 3"
+#~ msgstr "Прочитать Тестовое Заклинание №3"
 
-#~ msgid "1/4 HP Bar"
-#~ msgstr "1/4 строки ЖО"
+#~ msgid "Connecting to account server..."
+#~ msgstr "Соединение с сервером авторизации..."
 
-#~ msgid "no"
-#~ msgstr "Нет"
+#~ msgid "Connecting to character server..."
+#~ msgstr "Подключение к серверу персонажей..."
 
-#~ msgid "Buddy"
-#~ msgstr "Друг"
+#~ msgid "Cost"
+#~ msgstr "Стоимость"
 
-#~ msgid "Buddy List"
-#~ msgstr "Список друзей"
+#~ msgid "Craft"
+#~ msgstr "Сотворить"
 
 #~ msgid "Description: %s"
 #~ msgstr "Описание: %s"
@@ -3784,158 +3824,209 @@ msgstr ""
 #~ msgid "Effect: %s"
 #~ msgstr "Эффект: %s"
 
-#~ msgid "Previous"
-#~ msgstr "Предыдущий"
+#, fuzzy
+#~ msgid "Exp"
+#~ msgstr "Exp:"
 
-#~ msgid "New"
-#~ msgstr "Новый"
+#~ msgid "GM"
+#~ msgstr "ГМ"
 
-#~ msgid "Job Level: %d"
-#~ msgstr "Уровень профессии: %d"
+#~ msgid "Generics"
+#~ msgstr "Общие"
 
-#~ msgid "Quit Guild"
-#~ msgstr "Распустить гильдию"
+#~ msgid "Guilds"
+#~ msgstr "Гильдии"
 
-#~ msgid "Ok"
-#~ msgstr "Ok"
+#, fuzzy
+#~ msgid "HP"
+#~ msgstr "ЖО:"
 
-#~ msgid "Magic"
-#~ msgstr "Магия"
+#~ msgid "HP Bar"
+#~ msgstr "Строка жизненных очков (ЖО)"
 
-#~ msgid "Cast Test Spell 1"
-#~ msgstr "Прочитать Тестовое Заклинание №1"
+#~ msgid "Hats"
+#~ msgstr "Шляпы"
 
-#~ msgid "Cast Test Spell 2"
-#~ msgstr "Прочитать Тестовое Заклинание №2"
+#~ msgid "Highlight"
+#~ msgstr "Подсветка"
 
-#~ msgid "Cast Test Spell 3"
-#~ msgstr "Прочитать Тестовое Заклинание №3"
+#~ msgid "Hyperlink"
+#~ msgstr "Ссылка"
 
-#~ msgid "2 Handed Weapons"
-#~ msgstr "Двуручное оружие"
+#~ msgid "Is"
+#~ msgstr "Есть"
 
-#~ msgid "@@attack|Attack %s@@"
-#~ msgstr "@@attack|Атаковать %s@@"
+#, fuzzy
+#~ msgid "Item Is Equipped"
+#~ msgstr "Предмет екипирован"
 
-#~ msgid "@@unignore|Un-Ignore %s@@"
-#~ msgstr "@@unignore|Не игнорировать %s@@"
+#, fuzzy
+#~ msgid "Item Too Expensive"
+#~ msgstr "Предмет слишком дорогой для вас"
 
-#~ msgid "@@admin-kick|Kick player@@"
-#~ msgstr "@@admin-kick|Вышвырнуть игрока@@"
+#, fuzzy
+#~ msgid "Job"
+#~ msgstr "Профессия:"
 
-#~ msgid "@@cancel|Cancel@@"
-#~ msgstr "@@cancelОтмена@@"
+#~ msgid "Job Level: %d"
+#~ msgstr "Уровень профессии: %d"
 
-#~ msgid "@@pickup|Pick up %s@@"
-#~ msgstr "@@pickup|Поднять %s@@"
+#~ msgid "Knife"
+#~ msgstr "Нож"
 
-#~ msgid "@@use|Unequip@@"
-#~ msgstr "@@use|Разекипировать@@"
+#, fuzzy
+#~ msgid "Level"
+#~ msgstr "Уровень: %d"
 
-#~ msgid "@@use|Equip@@"
-#~ msgstr "@@use|Надеть@@"
+#, fuzzy
+#~ msgid "MP"
+#~ msgstr "Мана:"
 
-#~ msgid "@@use|Use@@"
-#~ msgstr "@@use|Использовать@@"
+#~ msgid "Mace"
+#~ msgstr "Булава"
 
-#~ msgid "@@drop|Drop@@"
-#~ msgstr "@@drop|Сбросить@@"
+#~ msgid "Magic"
+#~ msgstr "Магия"
 
-#~ msgid "@@split|Split@@"
-#~ msgstr "@@split|Разделить@@"
+#~ msgid "Max level"
+#~ msgstr "Максимальный уровень"
 
-#~ msgid "Select Server"
-#~ msgstr "Выберите сервер"
+#, fuzzy
+#~ msgid "Money"
+#~ msgstr "Деньги: %d"
 
 #~ msgid "Mystery Skill"
 #~ msgstr "Мистичный Навык"
 
-#~ msgid "Weapons"
-#~ msgstr "Оружие"
+#~ msgid "Necklaces"
+#~ msgstr "Ожерелья"
 
-#~ msgid "Stats"
-#~ msgstr "Статистика"
+#~ msgid "New"
+#~ msgstr "Новый"
 
-#~ msgid "Total"
-#~ msgstr "Всего"
+#~ msgid "Ok"
+#~ msgstr "Ok"
 
-#~ msgid "Cost"
-#~ msgstr "Стоимость"
+#, fuzzy
+#~ msgid "One Handed Weapons"
+#~ msgstr "Одноручное оружие"
 
-#~ msgid "Attack:"
-#~ msgstr "Атака:"
+#~ msgid "Pants"
+#~ msgstr "Штаны"
 
-#~ msgid "% Reflex:"
-#~ msgstr "% Рефлекс"
+#~ msgid "Party Window"
+#~ msgstr "Окно группы"
+
+#~ msgid "Player"
+#~ msgstr "Игрок"
+
+#, fuzzy
+#~ msgid "Player Hits Monster"
+#~ msgstr "Удары игрока по монстру"
+
+#~ msgid "Previous"
+#~ msgstr "Предыдущий"
+
+#~ msgid "Progress Bar Labels"
+#~ msgstr "Подписи Progress Bar'ов"
+
+#~ msgid "Quit Guild"
+#~ msgstr "Распустить гильдию"
+
+#~ msgid "Rejected guild invite from %s."
+#~ msgstr "Отклонено приглашение в гильдию от %s."
 
 #~ msgid "Remaining Status Points: %d"
 #~ msgstr "Осталось очков статуса: %d"
 
-#~ msgid "Max level"
-#~ msgstr "Максимальный уровень"
+#~ msgid "Rings"
+#~ msgstr "Кольца"
 
-#~ msgid " host: "
-#~ msgstr " хост: "
+#~ msgid "Save player list"
+#~ msgstr "Сохранить список игроков"
 
-#~ msgid "Guilds"
-#~ msgstr "Гильдии"
+#~ msgid "Scroll laziness"
+#~ msgstr "Заторможенность прокрутки"
 
-#~ msgid "Buddys"
-#~ msgstr "Приятели"
+#~ msgid "Scroll radius"
+#~ msgstr "Радиус прокрутки"
 
-#~ msgid "Party Window"
-#~ msgstr "Окно группы"
+#~ msgid "Select Server"
+#~ msgstr "Выберите сервер"
 
-#~ msgid "Unarmed"
-#~ msgstr "Обезоруженный"
+#~ msgid "Server"
+#~ msgstr "Сервер"
 
-#~ msgid "Knife"
-#~ msgstr "Нож"
+#~ msgid "Shields"
+#~ msgstr "Щиты"
 
-#~ msgid "Sword"
-#~ msgstr "Меч"
+#~ msgid "Shirts"
+#~ msgstr "Рубашки"
 
-#~ msgid "Bow"
-#~ msgstr "Лук"
+#~ msgid "Shoes"
+#~ msgstr "Обувь"
 
 #~ msgid "Shooting"
 #~ msgstr "Стрельба"
 
-#~ msgid "Mace"
-#~ msgstr "Булава"
+#~ msgid "Stats"
+#~ msgstr "Статистика"
 
-#~ msgid "Axe"
-#~ msgstr "Топор"
+#~ msgid "Sword"
+#~ msgstr "Меч"
+
+#~ msgid "Tab Highlight"
+#~ msgstr "Подсветка закладок"
+
+#~ msgid "Text Shadow"
+#~ msgstr "Затенение текста"
 
 #~ msgid "Thrown"
 #~ msgstr "Бросить"
 
-#~ msgid "Craft"
-#~ msgstr "Сотворить"
+#~ msgid "Total"
+#~ msgstr "Всего"
 
-#~ msgid "Unknown Skill"
-#~ msgstr "Неизвестный Навык"
+#, fuzzy
+#~ msgid "Two Handed Weapons"
+#~ msgstr "Одноручное оружие"
 
-#~ msgid "Connecting to character server..."
-#~ msgstr "Подключение к серверу персонажей..."
+#~ msgid "Unable to pick up item."
+#~ msgstr "Невозможно подобрать предмет."
 
-#~ msgid "Connecting to account server..."
-#~ msgstr "Соединение с сервером авторизации..."
+#~ msgid "Unarmed"
+#~ msgstr "Обезоруженный"
 
-#~ msgid "/new > Alias of create"
-#~ msgstr "/new > Имя для создания"
+#~ msgid "Unknown Item Type"
+#~ msgstr "Вещь неизвестного типа"
+
+#~ msgid "Unknown Skill"
+#~ msgstr "Неизвестный Навык"
+
+#, fuzzy
+#~ msgid "Unknown failure to select character."
+#~ msgstr "Неизвестный Глюк при выборе персонажа"
 
 #~ msgid "Unnamed"
 #~ msgstr "Без имени"
 
-#~ msgid "@@pickup|Pick Up %s@@"
-#~ msgstr "@@pickup|Подобрать %s@@"
+#~ msgid "Usables"
+#~ msgstr "используемый"
 
-#~ msgid "Scroll radius"
-#~ msgstr "Радиус прокрутки"
+#~ msgid "Weapons"
+#~ msgstr "Оружие"
 
-#~ msgid "Scroll laziness"
-#~ msgstr "Заторможенность прокрутки"
+#~ msgid "Whisper"
+#~ msgstr "Шептать"
 
-#~ msgid "Save player list"
-#~ msgstr "Сохранить список игроков"
+#~ msgid "Whisper could not be sent, ignored by user."
+#~ msgstr "Низзя прошептать: пользователь игнорирует шептание..."
+
+#~ msgid "Whisper could not be sent, user is offline."
+#~ msgstr "Низзя прошептать: пользователь оффлайн"
+
+#~ msgid "Willpower:"
+#~ msgstr "Сила волиr:"
+
+#~ msgid "no"
+#~ msgstr "Нет"
diff --git a/src/gui/buy.cpp b/src/gui/buy.cpp
index 4a8dae17..8e9f13e8 100644
--- a/src/gui/buy.cpp
+++ b/src/gui/buy.cpp
@@ -208,11 +208,7 @@ void BuyDialog::action(const gcn::ActionEvent &event)
         if (price < 0)
             price = 0;
         setMoney(mMoney - mAmountItems * price);
-
-        // Reset selection
-        mAmountItems = 1;
-        mSlider->setValue(1);
-        mSlider->gcn::Slider::setScale(1, mMaxItems);
+        valueChanged(gcn::SelectionEvent(mShopItemList));
     }
 }
 
diff --git a/src/gui/skilldialog.cpp b/src/gui/skilldialog.cpp
index c7976caa..19bd06d6 100644
--- a/src/gui/skilldialog.cpp
+++ b/src/gui/skilldialog.cpp
@@ -56,6 +56,8 @@
 #include <set>
 #include <string>
 
+#define SKILLS_FILE "skills.xml"
+
 class SkillModel;
 class SkillEntry;
 
@@ -235,8 +237,7 @@ SkillDialog::SkillDialog():
 
 SkillDialog::~SkillDialog()
 {
-    // Clear gui
-    loadSkills("");
+    clearSkills();
 }
 
 void SkillDialog::action(const gcn::ActionEvent &event)
@@ -291,7 +292,7 @@ void SkillDialog::event(Event::Channel channel, const Event &event)
     }
 }
 
-void SkillDialog::loadSkills(const std::string &file)
+void SkillDialog::clearSkills()
 {
     // Fixes issues with removing tabs
     if (mTabs->getSelectedTabIndex() != -1)
@@ -308,11 +309,13 @@ void SkillDialog::loadSkills(const std::string &file)
 
     delete_all(mSkills);
     mSkills.clear();
+}
 
-    if (file.length() == 0)
-        return;
+void SkillDialog::loadSkills()
+{
+    clearSkills();
 
-    XML::Document doc(file);
+    XML::Document doc(SKILLS_FILE);
     xmlNodePtr root = doc.rootNode();
 
     int setCount = 0;
@@ -323,7 +326,7 @@ void SkillDialog::loadSkills(const std::string &file)
 
     if (!root || !xmlStrEqual(root->name, BAD_CAST "skills"))
     {
-        logger->log("Error loading skills file: %s", file.c_str());
+        logger->log("Error loading skills file: %s", SKILLS_FILE);
 
         if (Net::getNetworkType() == ServerInfo::TMWATHENA)
         {
diff --git a/src/gui/skilldialog.h b/src/gui/skilldialog.h
index a49c537b..ba908697 100644
--- a/src/gui/skilldialog.h
+++ b/src/gui/skilldialog.h
@@ -66,7 +66,9 @@ class SkillDialog : public Window, public gcn::ActionListener, public EventListe
          */
         void update();
 
-        void loadSkills(const std::string &file);
+        void loadSkills();
+
+        void clearSkills();
 
         void setModifiable(int id, bool modifiable);
 
diff --git a/src/log.cpp b/src/log.cpp
index a147c107..bb8a78bb 100644
--- a/src/log.cpp
+++ b/src/log.cpp
@@ -60,12 +60,13 @@ void Logger::setLogFile(const std::string &logFilename)
 
 void Logger::log(const char *log_text, ...)
 {
-    char* buf = new char[1024];
+    const size_t bufSize = 1024;
+    char* buf = new char[bufSize];
     va_list ap;
 
     // Use a temporary buffer to fill in the variables
     va_start(ap, log_text);
-    vsprintf(buf, log_text, ap);
+    vsnprintf(buf, bufSize, log_text, ap);
     va_end(ap);
 
     // Get the current system time
diff --git a/src/main.h b/src/main.h
index 3a644100..3fe52f5d 100644
--- a/src/main.h
+++ b/src/main.h
@@ -55,7 +55,7 @@
 #elif defined WIN32
 #include "winver.h"
 #elif defined __APPLE__
-#define PACKAGE_VERSION "0.5.1"
+#define PACKAGE_VERSION "0.5.2"
 #endif
 
 #ifdef PACKAGE_VERSION
diff --git a/src/net/manaserv/generalhandler.cpp b/src/net/manaserv/generalhandler.cpp
index 68d5ee9e..a1ba746f 100644
--- a/src/net/manaserv/generalhandler.cpp
+++ b/src/net/manaserv/generalhandler.cpp
@@ -197,7 +197,7 @@ void GeneralHandler::event(Event::Channel channel,
         if (event.getType() == Event::GuiWindowsLoaded)
         {
             inventoryWindow->setSplitAllowed(true);
-            skillDialog->loadSkills("mana-skills.xml");
+            skillDialog->loadSkills();
 
             PlayerInfo::setAttribute(EXP_NEEDED, 100);
 
diff --git a/src/net/tmwa/buysellhandler.cpp b/src/net/tmwa/buysellhandler.cpp
index 5368ba9d..8daebdec 100644
--- a/src/net/tmwa/buysellhandler.cpp
+++ b/src/net/tmwa/buysellhandler.cpp
@@ -129,7 +129,6 @@ void BuySellHandler::handleMessage(Net::MessageIn &msg)
                 SERVER_NOTICE(_("Thanks for selling."))
             else
                 SERVER_NOTICE(_("Unable to sell."))
-
             break;
     }
 }
diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp
index ef59ee12..b03fb3b8 100644
--- a/src/net/tmwa/generalhandler.cpp
+++ b/src/net/tmwa/generalhandler.cpp
@@ -225,7 +225,7 @@ void GeneralHandler::event(Event::Channel channel,
         if (event.getType() == Event::GuiWindowsLoaded)
         {
             inventoryWindow->setSplitAllowed(false);
-            skillDialog->loadSkills("ea-skills.xml");
+            skillDialog->loadSkills();
 
             statusWindow->addAttribute(STR, _("Strength"), true, "");
             statusWindow->addAttribute(AGI, _("Agility"), true, "");
diff --git a/src/net/tmwa/loginhandler.cpp b/src/net/tmwa/loginhandler.cpp
index 00b7b145..e03ff042 100644
--- a/src/net/tmwa/loginhandler.cpp
+++ b/src/net/tmwa/loginhandler.cpp
@@ -168,6 +168,9 @@ void LoginHandler::handleMessage(Net::MessageIn &msg)
                     errorMessage = _("You have been permanently banned from "
                                      "the game. Please contact the GM team.");
                     break;
+                case 5:
+                    errorMessage = _("Client too old.");
+                    break;
                 case 6:
                     errorMessage = strprintf(_("You have been temporarily "
                                                "banned from the game until "
@@ -175,9 +178,15 @@ void LoginHandler::handleMessage(Net::MessageIn &msg)
                                                "team via the forums."),
                                                msg.readString(20).c_str());
                     break;
+                case 7:
+                    errorMessage = _("Server overpopulated.");
+                    break;
                 case 9:
                     errorMessage = _("This user name is already taken.");
                     break;
+                case 99:
+                    errorMessage = _("Username permanently erased.");
+                    break;
                 default:
                     errorMessage = _("Unknown error.");
                     break;
diff --git a/src/net/tmwa/playerhandler.cpp b/src/net/tmwa/playerhandler.cpp
index 4bd637c3..ab63cc1d 100644
--- a/src/net/tmwa/playerhandler.cpp
+++ b/src/net/tmwa/playerhandler.cpp
@@ -22,8 +22,7 @@
 #include "net/tmwa/playerhandler.h"
 #include "net/tmwa/beinghandler.h"
 
-#include "client.h"
-#include "event.h"
+#include "configuration.h"
 #include "game.h"
 #include "localplayer.h"
 #include "log.h"
@@ -227,6 +226,8 @@ void PlayerHandler::handleMessage(Net::MessageIn &msg)
 
         case SMSG_PLAYER_STAT_UPDATE_1:
             {
+                if (!player_node)
+                    break;
                 int type = msg.readInt16();
                 int value = msg.readInt32();
 
@@ -312,14 +313,24 @@ void PlayerHandler::handleMessage(Net::MessageIn &msg)
                     PlayerInfo::setStatExperience(JOB, msg.readInt32(),
                                                   PlayerInfo::getStatExperience(JOB).second);
                     break;
-                case 0x0014: {
+
+                case 0x0014:
+                    {
                         int oldMoney = PlayerInfo::getAttribute(MONEY);
                         int newMoney = msg.readInt32();
+                        std::string money = Units::formatCurrency(
+                                            newMoney - oldMoney);
                         PlayerInfo::setAttribute(MONEY, newMoney);
                         if (newMoney > oldMoney)
-                            SERVER_NOTICE(strprintf(_("You picked up %s."),
-                                         Units::formatCurrency(newMoney -
-                                         oldMoney).c_str()))
+                        {
+                            if (config.getBoolValue("showpickupchat"))
+                                SERVER_NOTICE(strprintf(_("You picked up %s."),
+                                            Units::formatCurrency(newMoney -
+                                            oldMoney).c_str()))
+                            if (config.getBoolValue("showpickupparticle"))
+                                player_node->addMessageToQueue(money,
+                                                      UserPalette::PICKUP_INFO);
+                        }
                     }
                     break;
                 case 0x0016:
@@ -543,11 +554,17 @@ void PlayerHandler::increaseSkill(int skillId)
 
 void PlayerHandler::pickUp(FloorItem *floorItem)
 {
-    if (floorItem)
-    {
-        MessageOut outMsg(CMSG_ITEM_PICKUP);
-        outMsg.writeInt32(floorItem->getId());
-    }
+    static Uint32 lastTime = 0;
+
+    // Avoid spamming the server with pick-up requests to prevent the player
+    // from being kicked.
+    if (!floorItem || SDL_GetTicks() < lastTime + 100)
+        return;
+
+    MessageOut outMsg(CMSG_ITEM_PICKUP);
+    outMsg.writeInt32(floorItem->getId());
+
+    lastTime = SDL_GetTicks();
 }
 
 void PlayerHandler::setDirection(char direction)
diff --git a/src/net/tmwa/specialhandler.cpp b/src/net/tmwa/specialhandler.cpp
index 577bda7e..661d9e2c 100644
--- a/src/net/tmwa/specialhandler.cpp
+++ b/src/net/tmwa/specialhandler.cpp
@@ -105,7 +105,8 @@ void SpecialHandler::handleMessage(Net::MessageIn &msg)
                 int up = msg.readInt8();
 
                 PlayerInfo::setStatBase(skillId, level);
-                skillDialog->setModifiable(skillId, up);
+                if (skillDialog)
+                    skillDialog->setModifiable(skillId, up);
             }
             break;
 
diff --git a/src/resources/spritedef.cpp b/src/resources/spritedef.cpp
index 311c9d1a..51e7ae8e 100644
--- a/src/resources/spritedef.cpp
+++ b/src/resources/spritedef.cpp
@@ -268,7 +268,7 @@ void SpriteDef::loadAnimation(xmlNodePtr animationNode,
                 if (!img)
                 {
                     logger->log("No image at index %d", start + variant_offset);
-                    continue;
+                    break;
                 }
 
                 animation->addFrame(img, delay, offsetX, offsetY);
diff --git a/src/utils/mkdir.cpp b/src/utils/mkdir.cpp
index 549e77a2..75ab8595 100644
--- a/src/utils/mkdir.cpp
+++ b/src/utils/mkdir.cpp
@@ -36,17 +36,13 @@
 
 #include "mkdir.h"
 
+/// Create a directory, making leading components first if necessary
 int mkdir_r(const char *pathname) {
-    char tmp[PATH_MAX];
+    size_t len = strlen(pathname);
+    char tmp[len+2];
     char *p;
 
-    if (strlen(pathname) >= PATH_MAX-2)
-        return -1;
-
-    strncpy(tmp, pathname, sizeof(tmp)-1);
-    tmp[PATH_MAX-1] = '\0';
-
-    int len=strlen(tmp);
+    strcpy(tmp, pathname);
 
     // terminate the pathname with '/'
     if (tmp[len-1] != '/') {