Merge branch '0.5' of git://gitorious.org/mana/mana into 0.5

27 files changed, 1339 insertions, 1473 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4244dad9..9a139d66 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,7 +4,7 @@ CMAKE_POLICY(VERSION 2.6)
 PROJECT(MANA)
 
 IF (NOT VERSION)
-    SET(VERSION 0.5.1)
+    SET(VERSION 0.5.2)
 ENDIF()
 
 STRING(REPLACE "." " " _VERSION ${VERSION})
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 7d04b66c..698df4ef 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,7 +167,7 @@ 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
@@ -183,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"
@@ -198,7 +200,7 @@ Section "Core files (required)" SecCore
   SetOverwrite ifnewer
   SetOutPath "$INSTDIR"
 
-  File "${EXEDIR}\mana.exe"
+  File "${EXEDIR}\${PRODUCT_NAME_SHORT}.exe"
   File "${DLLDIR}\guichan.dll"
   File "${DLLDIR}\guichan_sdl.dll"
   File "${DLLDIR}\libcurl-4.dll"
@@ -266,10 +268,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/LINGUAS b/po/LINGUAS
index c8a0ef78..2662375c 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -10,7 +10,7 @@ de
 es
 #et    # Not enough translations
 #fa    # Disabled because of current client limitations (shaping, RTL)
-#fi    # Not enough translations
+fi
 fr
 #he    # Disabled because of current client limitations (RTL)
 #hr    # Not enough translations
diff --git a/po/fi.po b/po/fi.po
index 0a27d640..aab72eaa 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-06 19:23+0100\n"
-"PO-Revision-Date: 2009-07-25 15:42+0000\n"
-"Last-Translator: gemis <vienamo@mbnet.fi>\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"
@@ -24,33 +25,28 @@ msgid "Setup"
 msgstr "Asetukset"
 
 #: src/client.cpp:643
-#, fuzzy
 msgid "Connecting to server"
-msgstr "Yhdistetään kartta palvelimelle"
+msgstr "Yhdistän palvelimeen"
 
 #: src/client.cpp:670
-#, fuzzy
 msgid "Logging in"
-msgstr "Kirjaudu sisään"
+msgstr "Kirjaudun sisään"
 
 #: src/client.cpp:703
 msgid "Entering game world"
-msgstr ""
+msgstr "Siirryn pelimaailmaan"
 
 #: src/client.cpp:762
-#, fuzzy
 msgid "Requesting characters"
-msgstr "Valitse hahmo"
+msgstr "Pyydän hahmoja"
 
 #: src/client.cpp:791
-#, fuzzy
 msgid "Connecting to the game server"
-msgstr "Yhdistetään kartta palvelimelle"
+msgstr "Yhdistän pelipalvelimeen"
 
 #: src/client.cpp:801
-#, fuzzy
 msgid "Changing game servers"
-msgstr "Palvelin:"
+msgstr "Vaihdan pelipalvelinta"
 
 #: src/client.cpp:830 src/client.cpp:837 src/client.cpp:972
 #: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
@@ -64,48 +60,46 @@ msgstr "Virhe"
 
 #: src/client.cpp:846
 msgid "Requesting registration details"
-msgstr ""
+msgstr "Pyydän rekisteröitymisen yksityiskohtia"
 
 #: src/client.cpp:873
-#, fuzzy
 msgid "Password Change"
-msgstr "Salasana:"
+msgstr "Salasanan vaihto"
 
 #: src/client.cpp:874
 msgid "Password changed successfully!"
-msgstr ""
+msgstr "Salasana vaihdettu onnistuneesti!"
 
 #: src/client.cpp:893
-#, fuzzy
 msgid "Email Change"
-msgstr "Muuta"
+msgstr "Sähköpostin vaihto"
 
 #: src/client.cpp:894
 msgid "Email changed successfully!"
-msgstr ""
+msgstr "Sähköpostiosoite vaihdettu onnistuneesti!"
 
+# TODO: Unregister?! That's not English.
 #: src/client.cpp:914
-#, fuzzy
 msgid "Unregister Successful"
-msgstr "Poista palvelimelta"
+msgstr "Tietojen poisto onnistui"
 
 #: src/client.cpp:915
 msgid "Farewell, come back any time..."
-msgstr ""
+msgstr "Näkemisiin, tule pian takaisin..."
 
 #: src/client.cpp:1090 src/client.cpp:1113
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
-msgstr ""
+msgstr "%s ei ole olemassa eikä sitä voi luoda! Poistun."
 
 #: src/client.cpp:1232
 #, c-format
 msgid "Invalid update host: %s"
-msgstr ""
+msgstr "Epäkelpo päivitysosoite: %s"
 
 #: src/client.cpp:1266 src/client.cpp:1272
 msgid "Error creating updates directory!"
-msgstr ""
+msgstr "Päivityshakemistoa luodessa tapahtui virhe!"
 
 #: src/commandhandler.cpp:136 src/commandhandler.cpp:333
 msgid "Unknown command."
@@ -113,11 +107,11 @@ msgstr "Tuntematon komento."
 
 #: src/commandhandler.cpp:165
 msgid "-- Help --"
-msgstr "--Apua--"
+msgstr "-- Ohje --"
 
 #: src/commandhandler.cpp:166
 msgid "/help > Display this help"
-msgstr "/help > Näyttää tämän apu tekstin"
+msgstr "/help > Näyttää tämän ohjetekstin"
 
 #: src/commandhandler.cpp:168
 msgid "/where > Display map name"
@@ -127,25 +121,26 @@ msgstr "/where > Näytä kartan nimi"
 msgid "/who > Display number of online users"
 msgstr "/who > Näytä paikalla olevien pelaajien määrä"
 
+# TODO: misunderstandable msgid
 #: src/commandhandler.cpp:170
 msgid "/me > Tell something about yourself"
-msgstr "/me > Kerro jotain itsestäsi"
+msgstr "/me > Kerro tekemisistäsi"
 
 #: src/commandhandler.cpp:172
 msgid "/clear > Clears this window"
-msgstr "/clear > Tyhjennä ikkuna"
+msgstr "/clear > Tyhjennä tämä ikkuna"
 
 #: src/commandhandler.cpp:174
 msgid "/msg > Send a private message to a user"
-msgstr "/msg > Lähetä yksityis viesti käyttäjälle"
+msgstr "/msg > Lähetä yksityisviesti käyttäjälle"
 
 #: src/commandhandler.cpp:175
 msgid "/whisper > Alias of msg"
-msgstr ""
+msgstr "/whisper > Toinen nimi msg-komennolle"
 
 #: src/commandhandler.cpp:176
 msgid "/w > Alias of msg"
-msgstr ""
+msgstr "/w > Kolmas nimi msg-komennolle"
 
 #: src/commandhandler.cpp:177
 msgid "/query > Makes a tab for private messages with another user"
@@ -153,19 +148,19 @@ msgstr "/query > Tekee välilehden toisen käyttäjän yksityisviestejä varten.
 
 #: src/commandhandler.cpp:179
 msgid "/q > Alias of query"
-msgstr ""
+msgstr "/q > Toinen nimi query-komennolle"
 
 #: src/commandhandler.cpp:181
 msgid "/away > Tell the other whispering players you're away from keyboard."
-msgstr ""
+msgstr "/away > Kerro sinulle kuiskaaville pelaajille, ettet ole ruudun äärellä."
 
 #: src/commandhandler.cpp:184
 msgid "/ignore > ignore a player"
-msgstr ""
+msgstr "/ignore > Jätä pelaaja huomiotta"
 
 #: src/commandhandler.cpp:185
 msgid "/unignore > stop ignoring a player"
-msgstr ""
+msgstr "/unignore > Lopeta pelaajan huomiotta jättö"
 
 #: src/commandhandler.cpp:187
 msgid "/list > Display all public channels"
@@ -173,39 +168,39 @@ msgstr "/list > Näytä kaikki julkiset kanavat"
 
 #: src/commandhandler.cpp:188
 msgid "/join > Join or create a channel"
-msgstr "/join > Liity tai luo kanava"
+msgstr "/join > Liity kanavalle tai luo uusi kanava"
 
 #: src/commandhandler.cpp:190
 msgid "/createparty > Create a new party"
-msgstr ""
+msgstr "/createparty > Luo uusi ryhmä"
 
 #: src/commandhandler.cpp:191
 msgid "/party > Invite a user to party"
-msgstr ""
+msgstr "/party > Kutsu pelaaja ryhmään"
 
 #: src/commandhandler.cpp:193
 msgid "/record > Start recording the chat to an external file"
-msgstr "/record > Aloita keskustelun nauhoitus ulkoiseen tiedostoon"
+msgstr "/record > Aloita keskustelulokin tallennus tiedostoon"
 
 #: src/commandhandler.cpp:195
 msgid "/toggle > Determine whether <return> toggles the chat log"
-msgstr ""
+msgstr "/toggle > Määritä, asettaako <rivinvaihto> keskustelulokin päälle/pois päältä"
 
 #: src/commandhandler.cpp:197
 msgid "/present > Get list of players present (sent to chat log, if logging)"
-msgstr ""
+msgstr "/present > Näytä läsnäolevien pelaajien lista (tallennetaan lokiin, jos käytössä)"
 
 #: src/commandhandler.cpp:200
 msgid "/announce > Global announcement (GM only)"
-msgstr ""
+msgstr "/announce > Yleinen ilmoitus (vain GM-pelaajat)"
 
 #: src/commandhandler.cpp:204
 msgid "For more information, type /help <command>."
-msgstr ""
+msgstr "Saat lisätietoa komennoista kirjoittamalla /help <komennon nimi>."
 
 #: src/commandhandler.cpp:208
 msgid "Command: /help"
-msgstr ""
+msgstr "Komento: /help"
 
 #: src/commandhandler.cpp:209
 msgid "This command displays a list of all commands available."
@@ -213,56 +208,55 @@ msgstr "Tämä komento näyttää listan kaikista komennoista."
 
 #: src/commandhandler.cpp:211
 msgid "Command: /help <command>"
-msgstr ""
+msgstr "Komento: /help <komennon nimi>"
 
 #: src/commandhandler.cpp:212
 msgid "This command displays help on <command>."
-msgstr ""
+msgstr "Tämä komento näyttää annetun komennon käyttöohjeen."
 
 #: src/commandhandler.cpp:220
 msgid "Command: /announce <msg>"
-msgstr ""
+msgstr "Komento: /announce <viesti>"
 
 #: src/commandhandler.cpp:221
 msgid "*** only available to a GM ***"
-msgstr ""
+msgstr "*** Vain GM-pelaajien käytettävissä ***"
 
 #: src/commandhandler.cpp:222
 msgid "This command sends the message <msg> to all players currently online."
-msgstr ""
+msgstr "Komento lähettää annetun viestin kaikille sisäänkirjautuneille pelaajille."
 
 #: src/commandhandler.cpp:227
 msgid "Command: /clear"
-msgstr ""
+msgstr "Komento: /clear"
 
 #: src/commandhandler.cpp:228
 msgid "This command clears the chat log of previous chat."
-msgstr ""
+msgstr "Tämä komento tyhjentää viimeisimmän keskustelun loki-ikkunan."
 
 #: src/commandhandler.cpp:232
 msgid "Command: /ignore <player>"
-msgstr ""
+msgstr "Komento: /ignore <pelaaja>"
 
 #: src/commandhandler.cpp:233
-#, fuzzy
 msgid "This command ignores the given player regardless of current relations."
-msgstr "Tämä komento näyttää paikalla olevien pelaajien määrän."
+msgstr "Tämä komento jättää annetun pelaajan huomiotta (nykysuhteilla ei vaikutusta)."
 
 #: src/commandhandler.cpp:238
 msgid "Command: /join <channel>"
-msgstr ""
+msgstr "Komento: /join <kanava>"
 
 #: src/commandhandler.cpp:239
 msgid "This command makes you enter <channel>."
-msgstr ""
+msgstr "Tämä komento liittää sinut keskustelukanavalle."
 
 #: src/commandhandler.cpp:240
 msgid "If <channel> doesn't exist, it's created."
-msgstr "Jos kanavaa <cannel> ei ole, se luodaan."
+msgstr "Jos annettua kanavaa ei ole, se luodaan."
 
 #: src/commandhandler.cpp:244
 msgid "Command: /list"
-msgstr ""
+msgstr "Komento: /list"
 
 #: src/commandhandler.cpp:245
 msgid "This command shows a list of all channels."
@@ -270,149 +264,150 @@ msgstr "Tämä komento näyttää listan kaikista kanavista"
 
 #: src/commandhandler.cpp:249
 msgid "Command: /me <message>"
-msgstr ""
+msgstr "Komento: /me <viesti>"
 
 #: src/commandhandler.cpp:250
 msgid "This command tell others you are (doing) <msg>."
-msgstr ""
+msgstr "Tämä komento kertoo muille, mitä 'teet'. ('<nimi> istuu.')"
 
 #: src/commandhandler.cpp:254
 msgid "Command: /msg <nick> <message>"
-msgstr ""
+msgstr "Komento: /msg <nimi> <viesti>"
 
 #: src/commandhandler.cpp:255
 msgid "Command: /whisper <nick> <message>"
-msgstr ""
+msgstr "Komento: /whisper <nimi> <viesti>"
 
 #: src/commandhandler.cpp:256
 msgid "Command: /w <nick> <message>"
-msgstr ""
+msgstr "Komento: /w <nimi> <viesti>"
 
 #: src/commandhandler.cpp:257
 msgid "This command sends the text <message> to <nick>."
-msgstr "Tämä komento lähettää tekstin <message> käyttäjälle <nick>."
+msgstr "Tämä komento lähettää viestin annetulle käyttäjälle."
 
 #: 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 ""
+msgstr "Jos nimessä on välilyöntejä, laita sen ympärille lainausmerkit (\")."
 
 #: src/commandhandler.cpp:263
 msgid "Command: /query <nick>"
-msgstr ""
+msgstr "Komento: /query <nimi>"
 
 #: src/commandhandler.cpp:264
 msgid "Command: /q <nick>"
-msgstr ""
+msgstr "Komento: /q <nimi>"
 
+# TODO: typo in msgid: betweenyou
 #: src/commandhandler.cpp:265
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
-msgstr ""
+msgstr "Tämä komento yrittää luoda välilehden kuiskausviesteille sinun ja pelaajan välillä."
 
 #: src/commandhandler.cpp:270
 msgid "Command: /away <afk reason>"
-msgstr ""
+msgstr "Komento: /away <poissaolon syy>"
 
 #: src/commandhandler.cpp:271
 msgid "This command tells you're away from keyboard with the given reason."
-msgstr ""
+msgstr "Tämä komento kertoo sinun olevan pois koneen äärestä (annetusta syystä)."
 
 #: src/commandhandler.cpp:273
 msgid "Command: /away"
-msgstr ""
+msgstr "Komento: /away"
 
 #: src/commandhandler.cpp:274
-#, fuzzy
 msgid "This command clears the away status and message."
-msgstr "Tällä komennolla poistut kanvalta."
+msgstr "Tämä komento peruuttaa away-tilan ja sen perusteluviestin."
 
 #: src/commandhandler.cpp:278
 msgid "Command: /createparty <name>"
-msgstr ""
+msgstr "Komento: /createparty <ryhmän nimi>"
 
 #: src/commandhandler.cpp:279
-#, fuzzy
 msgid "This command creates a new party called <name>."
-msgstr "Tällä komennolla poistut kanvalta."
+msgstr "Tämä komento luo uuden, annetunnimisen ryhmän."
 
 #: src/commandhandler.cpp:283
 msgid "Command: /party <nick>"
-msgstr ""
+msgstr "Komento: /party <pelaajan nimi>"
 
 #: src/commandhandler.cpp:284 src/net/tmwa/gui/partytab.cpp:74
 msgid "This command invites <nick> to party with you."
-msgstr ""
+msgstr "Tämä komento kutsuu annetun pelaajan ryhmääsi."
 
 #: src/commandhandler.cpp:290
 msgid "Command: /present"
-msgstr ""
+msgstr "Komento: /present"
 
+# 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 ""
+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/commandhandler.cpp:297
 msgid "Command: /record <filename>"
-msgstr ""
+msgstr "Komento: /record <tiedostonimi>"
 
 #: src/commandhandler.cpp:298
 msgid "This command starts recording the chat log to the file <filename>."
-msgstr "Tämä komento aloittaa keskustelun nauhoituksen tiedostoon <filename>."
+msgstr "Tämä komento aloittaa keskustelun tallentamisen tiedostoon <filename>."
 
 #: src/commandhandler.cpp:300
 msgid "Command: /record"
-msgstr ""
+msgstr "Komento: /record"
 
 #: src/commandhandler.cpp:301
 msgid "This command finishes a recording session."
-msgstr ""
+msgstr "Tämä komento pysäyttää keskustelun tallentamisen omaan tiedostoon."
 
 #: src/commandhandler.cpp:305
 msgid "Command: /toggle <state>"
-msgstr ""
+msgstr "Komento: /toggle <tila>"
 
+# 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 ""
+msgstr "Tämä komento määrittää, aktivoiko <rivinvaihto> keskustelulokin ja poistaa sen erikseen käytöstä, vai poistuuko se käytöstä automaattisesti."
 
 #: 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 ""
+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:311
 msgid "Command: /toggle"
-msgstr ""
+msgstr "Komento: /toggle"
 
 #: src/commandhandler.cpp:312
 msgid "This command displays the return toggle status."
-msgstr ""
+msgstr "Tämä komento näyttää toggle-komennon nykyasetuksen."
 
 #: src/commandhandler.cpp:316 src/gui/widgets/whispertab.cpp:94
 msgid "Command: /unignore <player>"
-msgstr ""
+msgstr "Komento: /unignore <pelaajan nimi>"
 
 #: src/commandhandler.cpp:317
 msgid "This command stops ignoring the given player if they are being ignored"
-msgstr ""
+msgstr "Tämä komento keskeyttää pelaajan huomiotta jätön, jos se on käytössä"
 
 #: src/commandhandler.cpp:322
 msgid "Command: /where"
-msgstr ""
+msgstr "Komento: /where"
 
 #: src/commandhandler.cpp:323
 msgid "This command displays the name of the current map."
-msgstr "Tämä komento näyttää nykyisen kartan nimen"
+msgstr "Tämä komento näyttää nykyisen kartan nimen."
 
 #: src/commandhandler.cpp:327
 msgid "Command: /who"
-msgstr ""
+msgstr "Komento: /who"
 
 #: src/commandhandler.cpp:328
 msgid "This command displays the number of players currently online."
@@ -420,103 +415,103 @@ msgstr "Tämä komento näyttää paikalla olevien pelaajien määrän."
 
 #: src/commandhandler.cpp:334
 msgid "Type /help for a list of commands."
-msgstr "Kirjoita /help jotta näkisit listan komennoista."
+msgstr "Saat listan komennoista kirjoittamalla /help."
 
 #: src/commandhandler.cpp:400
 msgid "Cannot send empty whispers!"
-msgstr ""
+msgstr "Et voi lähettää tyhjiä kuiskauksia!"
 
 #: src/commandhandler.cpp:408
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
-msgstr ""
+msgstr "Kuiskausvälilehden luonti nimelle \"%s\" epäonnistui! Se on joko jo auki tai käytit omaa nimeäsi."
 
 #: src/commandhandler.cpp:422
 #, c-format
 msgid "Requesting to join channel %s."
-msgstr ""
+msgstr "Pyyntö liittyä kanavalle %s lähetetty."
 
 #: src/commandhandler.cpp:435 src/net/tmwa/gui/partytab.cpp:109
 msgid "Party name is missing."
-msgstr ""
+msgstr "Ryhmän nimi puuttuu."
 
 #: src/commandhandler.cpp:448 src/commandhandler.cpp:525
 #: src/commandhandler.cpp:547
 msgid "Please specify a name."
-msgstr ""
+msgstr "Anna nimi."
 
 #: src/commandhandler.cpp:466
 msgid "Return toggles chat."
-msgstr ""
+msgstr "Rivinvaihto aktivoi ja sulkee keskustelun."
 
 #: src/commandhandler.cpp:466
 msgid "Message closes chat."
-msgstr ""
+msgstr "Viesti sulkee keskustelun."
 
 #: src/commandhandler.cpp:475
 msgid "Return now toggles chat."
-msgstr ""
+msgstr "Nyt rivinvaihto aktivoi ja sulkee keskustelun."
 
 #: src/commandhandler.cpp:479
 msgid "Message now closes chat."
-msgstr ""
+msgstr "Nyt viesti sulkee keskustelun."
 
 #: src/commandhandler.cpp:492 src/commandhandler.cpp:505
 msgid "Show IP: On"
-msgstr ""
+msgstr "Näytä IP: päällä"
 
 #: src/commandhandler.cpp:492 src/commandhandler.cpp:501
 msgid "Show IP: Off"
-msgstr ""
+msgstr "Näytä IP: pois päältä"
 
 #: src/commandhandler.cpp:531
 msgid "Player already ignored!"
-msgstr ""
+msgstr "Pelaaja on jo jätetty huomiotta!"
 
 #: src/commandhandler.cpp:538
 msgid "Player successfully ignored!"
-msgstr ""
+msgstr "Pelaaja jää nyt huomiotta."
 
 #: src/commandhandler.cpp:540
 msgid "Player could not be ignored!"
-msgstr ""
+msgstr "Pelaajan huomiotta jättäminen epäonnistui!"
 
+# TODO: come up with a less kludgey translation for "ignore". Like sulkulista.
 #: src/commandhandler.cpp:555
 msgid "Player wasn't ignored!"
-msgstr ""
+msgstr "Pelaajaa ei ollut jätetty huomiotta!"
 
 #: src/commandhandler.cpp:560
 msgid "Player no longer ignored!"
-msgstr ""
+msgstr "Pelaaja huomioidaan taas."
 
+# TODO: <swearing>
 #: src/commandhandler.cpp:562
 msgid "Player could not be unignored!"
-msgstr ""
+msgstr "Pelaajan uudelleenhuomiointi epäonnistui."
 
 #: src/commandhandler.h:31
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr ""
+msgstr "Vaihtoehdot komennolle /%s ovat \"yes\" (kyllä), \"no\" (ei) tai vastaavasti \"true\", \"false\", \"1\" tai \"0\"."
 
 #: src/game.cpp:169
 msgid "General"
 msgstr "Yleiset"
 
 #: src/game.cpp:333
-#, fuzzy
 msgid "Screenshot saved as "
-msgstr "Ruutukaappaus tallennettu ~/"
+msgstr "Ruutukaappaus tallennettu nimellä "
 
 #: src/game.cpp:338
 msgid "Saving screenshot failed!"
 msgstr "Ruutukaappauksen tallentaminen epäonnistui!"
 
 #: src/game.cpp:368
-#, fuzzy
 msgid "The connection to the server was lost."
-msgstr "Yhteys palvelimeen katkesi, ohjelma sulkeutuu nyt"
+msgstr "Yhteys palvelimeen katkesi."
 
 #: src/game.cpp:372
 msgid "Network Error"
@@ -524,26 +519,25 @@ msgstr "Verkkovirhe"
 
 #: src/game.cpp:713
 msgid "Ignoring incoming trade requests"
-msgstr ""
+msgstr "Et huomioi kaupankäyntipyyntöjä"
 
 #: src/game.cpp:720
 msgid "Accepting incoming trade requests"
-msgstr "Hyväksy kauppa pyyntö"
+msgstr "Hyväksyt kaupankäyntipyynnöt"
 
 #: src/game.cpp:950
-#, fuzzy
 msgid "Could Not Load Map"
-msgstr "Karttaa ei voi ladata"
+msgstr "Kartan lataaminen epäonnistui"
 
 #: src/game.cpp:951
 #, c-format
 msgid "Error while loading %s"
-msgstr "Ongelma ladatessa %s"
+msgstr "Kohdetta %s ladattaessa tapahtui virhe."
 
 #: src/gui/beingpopup.cpp:76
 #, c-format
 msgid "Party: %s"
-msgstr ""
+msgstr "Ryhmä: %s"
 
 #: src/gui/buy.cpp:49 src/gui/buy.cpp:78 src/gui/buysell.cpp:47
 msgid "Buy"
@@ -553,21 +547,21 @@ msgstr "Osta"
 #: src/gui/sell.cpp:278
 #, c-format
 msgid "Price: %s / Total: %s"
-msgstr ""
+msgstr "Hinta: %s / Kaikkiaan: %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 ""
+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 ""
+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:232
@@ -609,23 +603,22 @@ 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:"
+msgstr "Kirjoita uusi sähköpostiosoite kahdesti:"
 
 #: src/gui/changeemaildialog.cpp:127
-#, fuzzy, c-format
+#, 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ä"
+msgstr "Uuden osoitteen minimipituus on %d merkkiä."
 
 #: src/gui/changeemaildialog.cpp:134
-#, fuzzy, c-format
+#, 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ä."
+msgstr "Uuden osoitteen enimmäispituus on %d merkkiä."
 
 #: src/gui/changeemaildialog.cpp:141
 msgid "The email address entries mismatch."
-msgstr ""
+msgstr "Annetut sähköpostiosoitteet eivät täsmää."
 
 #: src/gui/changepassworddialog.cpp:47 src/gui/changepassworddialog.cpp:56
 #: src/gui/charselectdialog.cpp:128
@@ -638,27 +631,26 @@ msgid "Password:"
 msgstr "Salasana:"
 
 #: src/gui/changepassworddialog.cpp:63
-#, fuzzy
 msgid "Type new password twice:"
-msgstr "Kirjoita  uusi salasana toisen kerran:"
+msgstr "Kirjoita uusi salasana kahdesti:"
 
 #: src/gui/changepassworddialog.cpp:110
 msgid "Enter the old password first."
-msgstr ""
+msgstr "Anna ensin vanha salasana."
 
 #: src/gui/changepassworddialog.cpp:116
-#, fuzzy, c-format
+#, c-format
 msgid "The new password needs to be at least %d characters long."
-msgstr "Salasanan tulee olla vähintään %d merkkiä pitkä"
+msgstr "Uuden salasanan minimipituus on %d merkkiä."
 
 #: src/gui/changepassworddialog.cpp:123
-#, fuzzy, c-format
+#, c-format
 msgid "The new password needs to be less than %d characters long."
-msgstr "Salasanan tulee olla alle %d merkkiä pitkä."
+msgstr "Uuden salasanan enimmäispituus on %d merkkiä."
 
 #: src/gui/changepassworddialog.cpp:130
 msgid "The new password entries mismatch."
-msgstr ""
+msgstr "Uuden salasanan kopiot eivät täsmää."
 
 #: src/gui/charcreatedialog.cpp:53
 msgid "Create Character"
@@ -674,22 +666,20 @@ msgstr "Nimi:"
 #: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
 #: src/gui/outfitwindow.cpp:67
 msgid ">"
-msgstr ""
+msgstr ">"
 
 #. 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 ""
+msgstr "<"
 
 #: src/gui/charcreatedialog.cpp:74
-#, fuzzy
 msgid "Hair color:"
 msgstr "Hiusten väri:"
 
 #: src/gui/charcreatedialog.cpp:77
-#, fuzzy
 msgid "Hair style:"
 msgstr "Hiustyyli:"
 
@@ -722,11 +712,11 @@ msgstr "Hahmon pistejako OK"
 #: src/gui/charcreatedialog.cpp:256
 #, c-format
 msgid "Please remove %d points"
-msgstr "%d pistettä liikaa"
+msgstr "%d pistettä liikaa, ole hyvä ja poista ylimäärä"
 
 #: src/gui/charselectdialog.cpp:69
 msgid "Confirm Character Delete"
-msgstr "Vahvista hahmon poistopyyntö"
+msgstr "Vahvista hahmon poisto"
 
 #: src/gui/charselectdialog.cpp:70
 msgid "Are you sure you want to delete this character?"
@@ -738,7 +728,7 @@ msgstr "Tilin ja hahmojen hallinta"
 
 #: src/gui/charselectdialog.cpp:127
 msgid "Switch Login"
-msgstr ""
+msgstr "Vaihda sisäänkirjautumistietoja"
 
 #: src/gui/charselectdialog.cpp:141 src/gui/unregisterdialog.cpp:47
 #: src/gui/unregisterdialog.cpp:55
@@ -746,7 +736,6 @@ msgid "Unregister"
 msgstr "Poista palvelimelta"
 
 #: src/gui/charselectdialog.cpp:150
-#, fuzzy
 msgid "Change Email"
 msgstr "Vaihda sähköpostiosoite"
 
@@ -756,13 +745,12 @@ msgid "Delete"
 msgstr "Poista"
 
 #: src/gui/charselectdialog.cpp:380
-#, fuzzy
 msgid "Choose"
-msgstr "Sulje"
+msgstr "Valitse"
 
 #: src/gui/charselectdialog.cpp:392 src/gui/charselectdialog.cpp:393
 msgid "(empty)"
-msgstr ""
+msgstr "(tyhjä)"
 
 #: src/gui/chat.cpp:87
 msgid "Chat"
@@ -771,16 +759,16 @@ msgstr "Keskustelu"
 #: src/gui/chat.cpp:307
 #, c-format
 msgid "Present: %s; %d players are present."
-msgstr ""
+msgstr "Läsnä: %s; %d pelaajaa paikalla."
 
 #: src/gui/chat.cpp:325
 msgid "Attendance written to record log."
-msgstr ""
+msgstr "Läsnäolijat kirjattu tallennuslokiin."
 
 #: src/gui/chat.cpp:452
 #, c-format
 msgid "Whispering to %s: %s"
-msgstr ""
+msgstr "Kuiskaat pelaajalle %s: %s"
 
 #: src/gui/confirmdialog.cpp:42
 msgid "Yes"
@@ -792,52 +780,53 @@ msgstr "Ei"
 
 #: src/gui/debugwindow.cpp:43
 msgid "Debug"
-msgstr ""
+msgstr "Debug"
 
+# Note: considering Frames Per Second a "standard" unit name here
 #: src/gui/debugwindow.cpp:56
 #, c-format
 msgid "%d FPS (OpenGL)"
-msgstr ""
+msgstr "%d FPS (OpenGL)"
 
 #: src/gui/debugwindow.cpp:61 src/gui/debugwindow.cpp:64
 #, c-format
 msgid "%d FPS"
-msgstr ""
+msgstr "%d FPS"
 
 #: src/gui/debugwindow.cpp:65 src/gui/debugwindow.cpp:104
 #, c-format
 msgid "Music: %s"
-msgstr ""
+msgstr "Musiikki: %s"
 
 #: src/gui/debugwindow.cpp:66 src/gui/debugwindow.cpp:108
-#, fuzzy, c-format
+#, c-format
 msgid "Map: %s"
-msgstr "Nimi: %s"
+msgstr "Kartta: %s"
 
 #: src/gui/debugwindow.cpp:67 src/gui/debugwindow.cpp:106
 #, c-format
 msgid "Minimap: %s"
-msgstr ""
+msgstr "Pikkukartta: %s"
 
 #: src/gui/debugwindow.cpp:68 src/gui/debugwindow.cpp:99
 #, c-format
 msgid "Cursor: (%d, %d)"
-msgstr ""
+msgstr "Kursori: (%d, %d)"
 
 #: src/gui/debugwindow.cpp:69 src/gui/debugwindow.cpp:111
-#, fuzzy, c-format
+#, c-format
 msgid "Particle count: %d"
-msgstr "Hiukkas tehosteet"
+msgstr "Hiukkasluku: %d"
 
 #: src/gui/debugwindow.cpp:116
-#, fuzzy, c-format
+#, c-format
 msgid "Particle detail: %s"
-msgstr "Hiukkas tehosteet"
+msgstr "Hiukkastehosteiden yksityiskohtaisuus: %s"
 
 #: src/gui/debugwindow.cpp:121
-#, fuzzy, c-format
+#, c-format
 msgid "Ambient FX: %s"
-msgstr "Taustaäänet"
+msgstr "Taustaäänet: %s"
 
 #: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:55
 msgid "Equipment"
@@ -858,7 +847,7 @@ msgstr "Sulje"
 
 #: src/gui/inventorywindow.cpp:59 src/gui/windowmenu.cpp:56
 msgid "Inventory"
-msgstr "Varusteluettelo"
+msgstr "Tavarat"
 
 #: src/gui/inventorywindow.cpp:59
 msgid "Storage"
@@ -866,7 +855,7 @@ msgstr "Varasto"
 
 #: src/gui/inventorywindow.cpp:80
 msgid "Slots:"
-msgstr ""
+msgstr "Paikkoja:"
 
 #: src/gui/inventorywindow.cpp:85 src/gui/inventorywindow.cpp:315
 #: src/gui/popupmenu.cpp:352
@@ -880,9 +869,8 @@ msgstr "Käytä"
 
 #: src/gui/inventorywindow.cpp:99 src/gui/inventorywindow.cpp:323
 #: src/gui/popupmenu.cpp:358
-#, fuzzy
 msgid "Drop..."
-msgstr "Pudota"
+msgstr "Pudota..."
 
 #: src/gui/inventorywindow.cpp:100 src/gui/popupmenu.cpp:364
 msgid "Split"
@@ -890,7 +878,7 @@ msgstr "Jaa"
 
 #: src/gui/inventorywindow.cpp:101 src/gui/outfitwindow.cpp:51
 msgid "Outfits"
-msgstr ""
+msgstr "Asukokonaisuudet"
 
 #: src/gui/inventorywindow.cpp:103
 msgid "Weight:"
@@ -898,11 +886,11 @@ msgstr "Paino:"
 
 #: src/gui/inventorywindow.cpp:120 src/gui/popupmenu.cpp:369
 msgid "Store"
-msgstr "Talleta"
+msgstr "Varastoi"
 
 #: src/gui/inventorywindow.cpp:121 src/gui/popupmenu.cpp:376
 msgid "Retrieve"
-msgstr ""
+msgstr "Ota"
 
 #: src/gui/inventorywindow.cpp:325 src/gui/popupmenu.cpp:360
 msgid "Drop"
@@ -920,7 +908,7 @@ msgstr "Kaikki"
 
 #: src/gui/itemamount.cpp:131
 msgid "Select amount of items to trade."
-msgstr "Anna vaihdettavien tavaroiden määrä."
+msgstr "Anna vaihtokaupattavien tavaroiden määrä."
 
 #: src/gui/itemamount.cpp:134
 msgid "Select amount of items to drop."
@@ -928,27 +916,26 @@ msgstr "Anna pudotettavien tavaroiden määrä."
 
 #: src/gui/itemamount.cpp:137
 msgid "Select amount of items to store."
-msgstr ""
+msgstr "Anna varastoitavien tavaroiden määrä."
 
 #: src/gui/itemamount.cpp:140
 msgid "Select amount of items to retrieve."
-msgstr ""
+msgstr "Anna varastosta otettavien tavaroiden määrä."
 
 #: src/gui/itemamount.cpp:143
 msgid "Select amount of items to split."
 msgstr "Anna eri pinoon jaettavien tavaroiden määrä."
 
 #: src/gui/itempopup.cpp:126
-#, fuzzy, c-format
+#, c-format
 msgid "Weight: %s"
-msgstr "Paino: "
+msgstr "Paino: %s"
 
 #: src/gui/login.cpp:51 src/gui/login.cpp:63
 msgid "Login"
 msgstr "Kirjaudu sisään"
 
 #: src/gui/login.cpp:60
-#, fuzzy
 msgid "Remember username"
 msgstr "Muista käyttäjätunnus"
 
@@ -957,25 +944,25 @@ msgid "Register"
 msgstr "Rekisteröidy"
 
 #: src/gui/login.cpp:62
-#, fuzzy
 msgid "Change Server"
-msgstr "Palvelin:"
+msgstr "Vaihda palvelinta"
 
 #: src/gui/login.cpp:129
 msgid "Registration disabled"
-msgstr ""
+msgstr "Rekisteröinti pois käytöstä"
 
 #: src/gui/login.cpp:129
 msgid "You need to use the website to register an account for this server."
-msgstr ""
+msgstr "Joudut käyttämään palvelimen websivuja rekisteröidäksesi uuden tilin tälle palvelimelle."
 
 #: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
 msgid "Map"
 msgstr "Kartta"
 
+# TODO: What?
 #: src/gui/ministatus.cpp:157
 msgid "Need"
-msgstr ""
+msgstr "Tarvitaan"
 
 #: src/gui/npcdialog.cpp:45
 msgid "Waiting for server"
@@ -991,27 +978,27 @@ msgstr "Lähetä"
 
 #: src/gui/npcdialog.cpp:53 src/gui/npcpostdialog.cpp:41
 msgid "NPC"
-msgstr "Epäpelattava hahmo"
+msgstr "Ei-pelaajahahmo (NPC)"
 
 #: src/gui/npcdialog.cpp:98
 msgid "Clear log"
-msgstr ""
+msgstr "Tyhjennä loki"
 
+# TODO: Hmm?
 #: src/gui/npcdialog.cpp:114
 msgid "Reset"
 msgstr "Nollaa"
 
 #. TRANSLATORS: Please leave the \n sequences intact.
 #: src/gui/npcdialog.cpp:183
-#, fuzzy
 msgid ""
 "\n"
 "> Next\n"
-msgstr "Seuraava"
+msgstr "\n> Seuraava\n"
 
 #: src/gui/npcpostdialog.cpp:47
 msgid "To:"
-msgstr ""
+msgstr "Vastaanottaja:"
 
 #: src/gui/npcpostdialog.cpp:54
 msgid "Send"
@@ -1019,95 +1006,95 @@ msgstr "Lähetä"
 
 #: src/gui/npcpostdialog.cpp:96
 msgid "Failed to send as sender or letter invalid."
-msgstr ""
+msgstr "Lähettäminen epäonnistui: vastaanottaja tai kirje ei kelpaa."
 
 #: src/gui/outfitwindow.cpp:68 src/gui/outfitwindow.cpp:141
 #: src/gui/outfitwindow.cpp:154
 #, c-format
 msgid "Outfit: %d"
-msgstr ""
+msgstr "Asu: %d"
 
 #: src/gui/outfitwindow.cpp:70
-#, fuzzy
 msgid "Unequip first"
-msgstr "Poista varuste käytöstä"
+msgstr "Riisu ensin"
 
 #: src/gui/popupmenu.cpp:83
-#, fuzzy, c-format
+#, c-format
 msgid "Trade with %s..."
-msgstr "@@trade|Tee kauppaa %s kanssa@@"
+msgstr "Käy kauppaa pelaajan %s kanssa..."
 
+# TODO: Should clarify that this is a verb in trans comment.
 #: src/gui/popupmenu.cpp:87 src/gui/popupmenu.cpp:158
-#, fuzzy, c-format
+#, c-format
 msgid "Attack %s"
-msgstr "Hyökkäys %+d"
+msgstr "Hyökkää pelaajan %s kimppuun"
 
 #: src/gui/popupmenu.cpp:91
 #, c-format
 msgid "Whisper %s"
-msgstr ""
+msgstr "Kuiskaa pelaajalle %s"
 
 #: src/gui/popupmenu.cpp:100
 #, c-format
 msgid "Befriend %s"
-msgstr ""
+msgstr "Merkitse %s ystäväksesi"
 
 #: src/gui/popupmenu.cpp:105
 #, c-format
 msgid "Disregard %s"
-msgstr ""
+msgstr "Vaimenna %s"
 
 #: src/gui/popupmenu.cpp:108
-#, fuzzy, c-format
+#, c-format
 msgid "Ignore %s"
-msgstr "ohitettu"
+msgstr "Jätä %s huomiotta"
 
 #: src/gui/popupmenu.cpp:114 src/gui/popupmenu.cpp:123
 #, c-format
 msgid "Unignore %s"
-msgstr ""
+msgstr "Huomioi %s"
 
 #: src/gui/popupmenu.cpp:117
 #, c-format
 msgid "Completely ignore %s"
-msgstr ""
+msgstr "Jätä %s täysin huomiotta"
 
 #: src/gui/popupmenu.cpp:130
-#, fuzzy, c-format
+#, c-format
 msgid "Invite %s to join your guild"
-msgstr "@@party|Kutsu %s mukaan ryhmääsi@@"
+msgstr "Kutsu %s kiltaasi"
 
 #: src/gui/popupmenu.cpp:134
-#, fuzzy, c-format
+#, c-format
 msgid "Invite %s to join your party"
-msgstr "@@party|Kutsu %s mukaan ryhmääsi@@"
+msgstr "Kutsu %s ryhmääsi"
 
 #: src/gui/popupmenu.cpp:141
 msgid "Kick player"
-msgstr ""
+msgstr "Potki pelaaja pois"
 
 #: src/gui/popupmenu.cpp:150
 #, c-format
 msgid "Talk to %s"
-msgstr ""
+msgstr "Puhu pelaajalle %s"
 
+# TODO: What?
 #: src/gui/popupmenu.cpp:163
-#, fuzzy
 msgid "Kick monster"
-msgstr "Hirviöt"
+msgstr "Potkaise hirviötä"
 
 #: src/gui/popupmenu.cpp:171
 msgid "Add name to chat"
-msgstr ""
+msgstr "Lisää nimi keskusteluun"
 
 #: src/gui/popupmenu.cpp:188
 #, c-format
 msgid "Pick up %s"
-msgstr ""
+msgstr "Ota %s"
 
 #: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:378
 msgid "Add to chat"
-msgstr ""
+msgstr "Lisää keskusteluun"
 
 #: src/gui/quitdialog.cpp:44
 msgid "Switch server"
@@ -1119,31 +1106,31 @@ msgstr "Vaihda hahmoa"
 
 #: src/gui/recorder.cpp:87
 msgid "Finishing recording."
-msgstr ""
+msgstr "Lopetan tallentamisen."
 
 #: src/gui/recorder.cpp:91
 msgid "Not currently recording."
-msgstr ""
+msgstr "En tallenna tällä hetkellä."
 
 #: src/gui/recorder.cpp:96
 msgid "Already recording."
-msgstr ""
+msgstr "Tallennan jo."
 
 #: src/gui/recorder.cpp:104
 msgid "Starting to record..."
-msgstr ""
+msgstr "Aloitan tallentamisen..."
 
 #: src/gui/recorder.cpp:112
 msgid "Failed to start recording."
-msgstr ""
+msgstr "Tallentamisen aloittaminen epäonnistui."
 
 #: src/gui/recorder.h:38
 msgid "Recording..."
-msgstr ""
+msgstr "Tallennan..."
 
 #: src/gui/recorder.h:39
 msgid "Stop recording"
-msgstr ""
+msgstr "Lopeta tallentaminen"
 
 #: src/gui/register.cpp:69
 msgid "Confirm:"
@@ -1178,9 +1165,8 @@ msgid "Passwords do not match."
 msgstr "Salasanat eivät täsmää."
 
 #: src/gui/serverdialog.cpp:196
-#, fuzzy
 msgid "Choose Your Server"
-msgstr "Valitse palvelin"
+msgstr "Valitse palvelimesi"
 
 #: src/gui/serverdialog.cpp:208 src/gui/widgets/chattab.cpp:141
 msgid "Server:"
@@ -1191,19 +1177,16 @@ msgid "Port:"
 msgstr "Portti:"
 
 #: src/gui/serverdialog.cpp:211
-#, fuzzy
 msgid "Server type:"
-msgstr "Palvelin:"
+msgstr "Palvelintyyppi:"
 
 #: src/gui/serverdialog.cpp:233
-#, fuzzy
 msgid "Connect"
-msgstr "Yhdistetään..."
+msgstr "Yhdistä"
 
 #: src/gui/serverdialog.cpp:234
-#, fuzzy
 msgid "Custom Server"
-msgstr "Tyylitelty hiiren osoitin"
+msgstr "Muu palvelin"
 
 #: src/gui/serverdialog.cpp:337
 msgid "Please type both the address and the port of a server."
@@ -1212,29 +1195,28 @@ msgstr "Kirjoita kenttiin sekä palvelimen osoite että portti"
 #: src/gui/serverdialog.cpp:442
 #, c-format
 msgid "Downloading server list...%2.2f%%"
-msgstr ""
+msgstr "Lataan palvelinluettelon...%2.2f%%"
 
 #: src/gui/serverdialog.cpp:448
-#, fuzzy
 msgid "Waiting for server..."
-msgstr "Odotetaan palvelinta"
+msgstr "Odotan palvelinta..."
 
 #: src/gui/serverdialog.cpp:452
 msgid "Preparing download"
-msgstr ""
+msgstr "Valmistelen latausta"
 
 #: src/gui/serverdialog.cpp:456
 msgid "Error retreiving server list!"
-msgstr ""
+msgstr "Palvelinluettelon hakeminen epäonnistui!"
 
 #: src/gui/serverdialog.cpp:556
 msgid "requires a newer version"
-msgstr ""
+msgstr "vaatii uudemman version"
 
 #: src/gui/serverdialog.cpp:558
 #, c-format
 msgid "requires v%s"
-msgstr ""
+msgstr "vaatii version %s"
 
 #: src/gui/setup_audio.cpp:42
 msgid "Sound"
@@ -1242,7 +1224,7 @@ msgstr "Ääni"
 
 #: src/gui/setup_audio.cpp:43
 msgid "Download music"
-msgstr ""
+msgstr "Lataa musiikki"
 
 #: src/gui/setup_audio.cpp:47
 msgid "Audio"
@@ -1257,21 +1239,20 @@ msgid "Music volume"
 msgstr "Musiikin voimakkuus"
 
 #: src/gui/setup_audio.cpp:94
-#, fuzzy
 msgid "Notice"
-msgstr "Ei tekstiä"
+msgstr "Huomaa"
 
 #: src/gui/setup_audio.cpp:94
 msgid "You may have to restart your client if you want to download new music"
-msgstr ""
+msgstr "Voit joutua uudelleenkäynnistämään asiakasohjelmasi, jos haluat ladata uudet musiikit"
 
 #: src/gui/setup_audio.cpp:106
 msgid "Sound Engine"
-msgstr ""
+msgstr "Äänimoottori"
 
 #: src/gui/setup_colors.cpp:45
 msgid "This is what the color looks like"
-msgstr ""
+msgstr "Väri näyttää tältä"
 
 #: src/gui/setup_colors.cpp:50
 msgid "Colors"
@@ -1279,16 +1260,16 @@ msgstr "Värit"
 
 #: src/gui/setup_colors.cpp:71
 msgid "Type:"
-msgstr ""
+msgstr "Tyyppi:"
 
 #: src/gui/setup_colors.cpp:82 src/gui/setup_colors.cpp:330
 msgid "Static"
-msgstr ""
+msgstr "Staattinen"
 
 #: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
 #: src/gui/setup_colors.cpp:331
 msgid "Pulse"
-msgstr ""
+msgstr "Sykkivä"
 
 #: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:87
 #: src/gui/setup_colors.cpp:332
@@ -1298,23 +1279,23 @@ msgstr "Sateenkaari"
 #: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
 #: src/gui/setup_colors.cpp:332
 msgid "Spectrum"
-msgstr ""
+msgstr "Spektri"
 
 #: src/gui/setup_colors.cpp:93
 msgid "Delay:"
-msgstr ""
+msgstr "Viive:"
 
 #: src/gui/setup_colors.cpp:108
 msgid "Red:"
-msgstr ""
+msgstr "Punainen:"
 
 #: src/gui/setup_colors.cpp:123
 msgid "Green:"
-msgstr ""
+msgstr "Vihreä:"
 
 #: src/gui/setup_colors.cpp:138
 msgid "Blue:"
-msgstr ""
+msgstr "Sininen:"
 
 #: src/gui/setup.cpp:51
 msgid "Apply"
@@ -1334,7 +1315,7 @@ msgstr "Kalibroi"
 
 #: src/gui/setup_joystick.cpp:39
 msgid "Enable joystick"
-msgstr "Peliohjaintuki päälle"
+msgstr "Ota peliohjain käyttöön"
 
 #: src/gui/setup_joystick.cpp:41
 msgid "Joystick"
@@ -1346,7 +1327,7 @@ msgstr "Lopeta"
 
 #: src/gui/setup_joystick.cpp:84
 msgid "Rotate the stick"
-msgstr "Käytä ohjain ääriasennoissaan pyörittämällä"
+msgstr "Pyöräytä ohjainta ääriasennoissaan"
 
 #: src/gui/setup_keyboard.cpp:77
 msgid "Keyboard"
@@ -1354,11 +1335,11 @@ msgstr "Näppäimistö"
 
 #: src/gui/setup_keyboard.cpp:86
 msgid "Assign"
-msgstr ""
+msgstr "Aseta"
 
 #: src/gui/setup_keyboard.cpp:90
 msgid "Unassign"
-msgstr ""
+msgstr "Poista asetus"
 
 #: src/gui/setup_keyboard.cpp:94
 msgid "Default"
@@ -1366,7 +1347,7 @@ msgstr "Oletus"
 
 #: src/gui/setup_keyboard.cpp:125
 msgid "Key Conflict(s) Detected."
-msgstr ""
+msgstr "Päällekkäisiä näppäinoikopolkuja löytyi."
 
 #: src/gui/setup_players.cpp:58
 msgid "Name"
@@ -1386,11 +1367,11 @@ msgstr "Ystävä"
 
 #: src/gui/setup_players.cpp:66
 msgid "Disregarded"
-msgstr ""
+msgstr "Vaimennettu"
 
 #: src/gui/setup_players.cpp:67
 msgid "Ignored"
-msgstr "ohitettu"
+msgstr "Huomiotta jätetty"
 
 #: src/gui/setup_players.cpp:206 src/gui/setup_video.cpp:153
 msgid "???"
@@ -1402,16 +1383,15 @@ msgstr "Salli kaupakäynti"
 
 #: src/gui/setup_players.cpp:226
 msgid "Allow whispers"
-msgstr ""
+msgstr "Salli kuiskaukset"
 
 #: src/gui/setup_players.cpp:230
 msgid "Put all whispers in tabs"
-msgstr ""
+msgstr "Laita kaikki kuiskaukset välilehtiin"
 
 #: src/gui/setup_players.cpp:232
-#, fuzzy
 msgid "Show gender"
-msgstr "Näytä nimi"
+msgstr "Näytä sukupuoli"
 
 #: src/gui/setup_players.cpp:234
 msgid "Players"
@@ -1419,7 +1399,7 @@ msgstr "Pelaajat"
 
 #: src/gui/setup_players.cpp:259
 msgid "When ignoring:"
-msgstr ""
+msgstr "Kun jätät huomiotta:"
 
 #: src/gui/setup_video.cpp:134
 msgid "Tiny"
@@ -1431,7 +1411,7 @@ msgstr "Pieni"
 
 #: src/gui/setup_video.cpp:136
 msgid "Medium"
-msgstr ""
+msgstr "Keskikokoinen"
 
 #: src/gui/setup_video.cpp:137
 msgid "Large"
@@ -1447,11 +1427,11 @@ msgstr "Teksti"
 
 #: src/gui/setup_video.cpp:165
 msgid "Bubbles, no names"
-msgstr ""
+msgstr "Puhekuplat, ei nimiä"
 
 #: src/gui/setup_video.cpp:166
 msgid "Bubbles with names"
-msgstr ""
+msgstr "Puhekuplat nimillä"
 
 #: src/gui/setup_video.cpp:178
 msgid "off"
@@ -1467,11 +1447,11 @@ msgstr "korkea"
 
 #: src/gui/setup_video.cpp:193
 msgid "medium"
-msgstr ""
+msgstr "keskitaso"
 
 #: src/gui/setup_video.cpp:195
 msgid "max"
-msgstr ""
+msgstr "maksimi"
 
 #: src/gui/setup_video.cpp:219
 msgid "Full screen"
@@ -1491,52 +1471,49 @@ msgstr "Näytä nimet"
 
 #: src/gui/setup_video.cpp:225
 msgid "Particle effects"
-msgstr "Hiukkas tehosteet"
+msgstr "Hiukkastehosteet"
 
 #: src/gui/setup_video.cpp:227
-#, fuzzy
 msgid "Show own name"
-msgstr "Näytä nimi"
+msgstr "Näytä oma nimi"
 
 #: src/gui/setup_video.cpp:228
 msgid "Log NPC dialogue"
-msgstr ""
+msgstr "Kirjaa keskustelut ei-pelaajahahmojen kanssa lokiin"
 
 #: src/gui/setup_video.cpp:229
 msgid "Show pickup notification"
-msgstr ""
+msgstr "Näytä ottoviesti"
 
 #. TRANSLATORS: Refers to "Show pickup notification"
 #: src/gui/setup_video.cpp:231
 msgid "in chat"
-msgstr ""
+msgstr "keskusteluikkunassa"
 
 #. TRANSLATORS: Refers to "Show pickup notification"
 #: src/gui/setup_video.cpp:233
 msgid "as particle"
-msgstr ""
+msgstr "leijuvana"
 
 #: src/gui/setup_video.cpp:238
-#, fuzzy
 msgid "FPS limit:"
-msgstr "Piirtonopeusrajoitin (kuvaa / sekunti)"
+msgstr "Piirtonopeusrajoitin (kuvaa / sekunti):"
 
 #: src/gui/setup_video.cpp:249
 msgid "Disable transparency (Low CPU mode)"
-msgstr ""
+msgstr "Poista läpinäkyvyys (hitaille suorittimille)"
 
 #: src/gui/setup_video.cpp:252
 msgid "Video"
 msgstr "Kuva"
 
 #: src/gui/setup_video.cpp:254
-#, fuzzy
 msgid "Show damage"
-msgstr "Näytä nimi"
+msgstr "Näytä vahinko"
 
 #: src/gui/setup_video.cpp:260
 msgid "Overhead text"
-msgstr ""
+msgstr "Tekstinä yläpuolella"
 
 #: src/gui/setup_video.cpp:261
 msgid "Gui opacity"
@@ -1547,91 +1524,87 @@ msgid "Ambient FX"
 msgstr "Taustaäänet"
 
 #: src/gui/setup_video.cpp:263
-#, fuzzy
 msgid "Particle detail"
-msgstr "Hiukkas tehosteet"
+msgstr "Hiukkastehosteiden yksityiskohtaisuus"
 
 #: src/gui/setup_video.cpp:264
 msgid "Font size"
 msgstr "Kirjasimen koko"
 
+# TODO: Hm.
 #: src/gui/setup_video.cpp:279 src/gui/setup_video.cpp:535
 #: src/gui/setup_video.cpp:665
-#, fuzzy
 msgid "None"
-msgstr "Ei"
+msgstr "-"
 
 #: src/gui/setup_video.cpp:428
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
-msgstr ""
+msgstr "Ikkunoituun tilaan vaihto epäonnistui, samoin paluu edelliseen tilaan!"
 
 #: src/gui/setup_video.cpp:434
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
-msgstr ""
+msgstr "Kokoruututilaan vaihto epäonnistui, samoin paluu edelliseen tilaan!"
 
 #: src/gui/setup_video.cpp:445
-#, fuzzy
 msgid "Switching to Full Screen"
-msgstr "Kokoruututilaan siirtyminen"
+msgstr "Vaihdan kokoruututilaan"
 
 #: src/gui/setup_video.cpp:446
 msgid "Restart needed for changes to take effect."
 msgstr "Ohjelma pitää käynnistää uudelleen, jotta muutokset astuvat voimaan."
 
 #: src/gui/setup_video.cpp:460
-#, fuzzy
 msgid "Changing to OpenGL"
-msgstr "Vaihdetaan OpenGL -toimintatilaan"
+msgstr "Vaihdetaan käyttämään OpenGL:ää"
 
 #: 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 ""
+msgstr "OpenGL:n käyttöönotto tai poisto vaatii uudelleenkäynnistyksen. Jos OpenGL sotkee peligrafiikkasi, käynnistä peli uudelleen komentoriviparametrilla \"--no-opengl\"."
 
 #: src/gui/setup_video.cpp:468
 msgid "Deactivating OpenGL"
-msgstr ""
+msgstr "Kytken OpenGL:n pois käytöstä"
 
 #: src/gui/setup_video.cpp:469
 msgid "Applying change to OpenGL requires restart."
-msgstr "OpenGL -asetusten muutokset vaativat ohjelman uudelleenkäynnistyksen"
+msgstr "OpenGL -asetuksen muutos vaatii ohjelman uudelleenkäynnistyksen."
 
 #: src/gui/setup_video.cpp:477
 msgid "Transparency disabled"
-msgstr ""
+msgstr "Läpinäkyvyys poistettu käytöstä"
 
 #: src/gui/setup_video.cpp:478 src/gui/setup_video.cpp:486
 msgid "You must restart to apply changes."
-msgstr ""
+msgstr "Käynnistä ohjelma uudelleen, jotta muutos astuu voimaan."
 
 #: src/gui/setup_video.cpp:485
 msgid "Transparency enabled"
-msgstr ""
+msgstr "Läpinäkyvyys käytössä"
 
+# TODO: Screen resolution?? It's really used for window size, AFAIK.
 #: src/gui/setup_video.cpp:579 src/gui/setup_video.cpp:584
-#, fuzzy
 msgid "Screen Resolution Changed"
-msgstr "Näytön resoluutio vaihdettu"
+msgstr "Ikkunan koko vaihdettu"
 
 #: src/gui/setup_video.cpp:580 src/gui/setup_video.cpp:585
 msgid "Restart your client for the change to take effect."
-msgstr ""
+msgstr "Käynnistä ohjelma uudelleen, jotta muutos astuu voimaan."
 
 #: src/gui/setup_video.cpp:582
 msgid "Some windows may be moved to fit the lowered resolution."
-msgstr ""
+msgstr "Joitakin ikkunoita on siirretty, jotta ne mahtuvat pienemmälle ruudulle."
 
 #: src/gui/setup_video.cpp:615
-#, fuzzy
 msgid "Particle Effect Settings Changed."
-msgstr "Hiukkas tehoste asetukset vaihdettu."
+msgstr "Hiukkastehosteiden asetuksia on muutettu."
 
 #: src/gui/setup_video.cpp:616
 msgid "Changes will take effect on map change."
-msgstr ""
+msgstr "Muutokset astuvat voimaan kartan vaihtuessa."
 
 #: src/gui/skilldialog.cpp:210 src/gui/windowmenu.cpp:59
 msgid "Skills"
@@ -1644,216 +1617,216 @@ msgstr "Ylös"
 #: src/gui/skilldialog.cpp:271
 #, c-format
 msgid "Skill points available: %d"
-msgstr ""
+msgstr "%d taitopistettä käyttämättä"
 
 #: src/gui/skilldialog.cpp:353
 #, c-format
 msgid "Skill Set %d"
-msgstr ""
+msgstr "Taitojoukko %d"
 
 #: src/gui/skilldialog.cpp:362
-#, fuzzy, c-format
+#, c-format
 msgid "Skill %d"
-msgstr "Taidot"
+msgstr "Taito %d"
 
 #: src/gui/skilldialog.cpp:444
-#, fuzzy, c-format
+#, c-format
 msgid "Lvl: %d (%+d)"
-msgstr "Taso: %d"
+msgstr "Taso: %d (%+d)"
 
 #: src/gui/skilldialog.cpp:455
-#, fuzzy, c-format
+#, c-format
 msgid "Lvl: %d"
 msgstr "Taso: %d"
 
 #: src/gui/socialwindow.cpp:128
 #, c-format
 msgid "Invited user %s to guild %s."
-msgstr ""
+msgstr "Kutsuit käyttäjän %s kiltaan %s."
 
+# TODO: Guild quit? Leave or remove?
 #: src/gui/socialwindow.cpp:143
 #, c-format
 msgid "Guild %s quit requested."
-msgstr ""
+msgstr "Killasta %s eroa pyydetty."
 
 #: src/gui/socialwindow.cpp:157
 msgid "Member Invite to Guild"
-msgstr ""
+msgstr "Jäsenen kutsuminen kiltaan"
 
 #: src/gui/socialwindow.cpp:158
 #, c-format
 msgid "Who would you like to invite to guild %s?"
-msgstr ""
+msgstr "Kenet haluaisit kutsua kiltaan %s?"
 
 #: src/gui/socialwindow.cpp:167
 msgid "Leave Guild?"
-msgstr ""
+msgstr "Eroa killasta?"
 
 #: src/gui/socialwindow.cpp:168
-#, fuzzy, c-format
+#, c-format
 msgid "Are you sure you want to leave guild %s?"
-msgstr "Haluatko varmasti lopettaa?"
+msgstr "Haluatko varmasti erota killasta %s?"
 
+# TODO: quit? leave or remove?
 #: src/gui/socialwindow.cpp:222
 #, c-format
 msgid "Party %s quit requested."
-msgstr ""
+msgstr "Ryhmästä %s eroamista pyydetty."
 
 #: src/gui/socialwindow.cpp:236
 msgid "Member Invite to Party"
-msgstr ""
+msgstr "Jäsenen kutsuminen ryhmään"
 
 #: src/gui/socialwindow.cpp:237
 #, c-format
 msgid "Who would you like to invite to party %s?"
-msgstr ""
+msgstr "Kenet haluaisit kutsua ryhmään %s?"
 
 #: src/gui/socialwindow.cpp:246
 msgid "Leave Party?"
-msgstr ""
+msgstr "Eroa ryhmästä?"
 
 #: src/gui/socialwindow.cpp:247
-#, fuzzy, c-format
+#, c-format
 msgid "Are you sure you want to leave party %s?"
-msgstr "Haluatko varmasti lopettaa?"
+msgstr "Haluatko varmasti erota ryhmästä %s?"
 
 #: src/gui/socialwindow.cpp:276
 msgid "Create Guild"
-msgstr ""
+msgstr "Luo kilta"
 
 #: src/gui/socialwindow.cpp:277 src/gui/socialwindow.cpp:623
-#, fuzzy
 msgid "Create Party"
-msgstr "Luo hahmo"
+msgstr "Luo ryhmä"
 
 #: src/gui/socialwindow.cpp:316 src/gui/windowmenu.cpp:64
 msgid "Social"
-msgstr ""
+msgstr "Suhteet"
 
 #: src/gui/socialwindow.cpp:334
-#, fuzzy
 msgid "Invite"
-msgstr "Kutsu käyttäjä"
+msgstr "Kutsu"
 
 #: src/gui/socialwindow.cpp:335
-#, fuzzy
 msgid "Leave"
-msgstr "Suuri"
+msgstr "Eroa"
 
 #: src/gui/socialwindow.cpp:447
 #, c-format
 msgid "Accepted party invite from %s."
-msgstr ""
+msgstr "Otit vastaan ryhmäkutsun pelaajalta %s."
 
 #: src/gui/socialwindow.cpp:453
 #, c-format
 msgid "Rejected party invite from %s."
-msgstr ""
+msgstr "Kieltäydyit pelaajan %s ryhmäkutsusta."
 
 #: src/gui/socialwindow.cpp:466
 #, c-format
 msgid "Accepted guild invite from %s."
-msgstr ""
+msgstr "Otit vastaan kiltakutsun pelaajalta %s."
 
 #: src/gui/socialwindow.cpp:472
 #, c-format
 msgid "Rejected guild invite from %s."
-msgstr ""
+msgstr "Kieltäydyit pelaajan %s kiltakutsusta."
 
 #: src/gui/socialwindow.cpp:501
 msgid "Creating guild failed, please choose a shorter name."
-msgstr ""
+msgstr "Killan luonti epäonnistui, ole hyvä ja valitse lyhyempi nimi."
 
 #: src/gui/socialwindow.cpp:507
 #, c-format
 msgid "Creating guild called %s."
-msgstr ""
+msgstr "Luon killan %s."
 
 #: src/gui/socialwindow.cpp:523
 msgid "Creating party failed, please choose a shorter name."
-msgstr ""
+msgstr "Ryhmän luonti epäonnistui, ole hyvä ja valitse lyhyempi nimi."
 
 #: src/gui/socialwindow.cpp:529
 #, c-format
 msgid "Creating party called %s."
-msgstr ""
+msgstr "Luon ryhmän %s."
 
 #: src/gui/socialwindow.cpp:543
-#, fuzzy
 msgid "Guild Name"
-msgstr "T"
+msgstr "Killan nimi"
 
 #: src/gui/socialwindow.cpp:544
-#, fuzzy
 msgid "Choose your guild's name."
-msgstr "Valitse palvelin"
+msgstr "Valitse killallesi nimi."
 
+# 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:556
 msgid "Received guild request, but one already exists."
-msgstr ""
+msgstr "Vastaanotin kiltapyynnön, mutta sellainen on jo olemassa."
 
 #: src/gui/socialwindow.cpp:561
 #, c-format
 msgid "%s has invited you to join the guild %s."
-msgstr ""
+msgstr "%s on kutsunut sinut liittymään kiltaan %s."
 
 #: src/gui/socialwindow.cpp:566
 msgid "Accept Guild Invite"
-msgstr ""
+msgstr "Ota kiltakutsu vastaan"
 
+# TODO: see similar msgid for guild request
 #: src/gui/socialwindow.cpp:578
 msgid "Received party request, but one already exists."
-msgstr ""
+msgstr "Sain ryhmäpyynnön, mutta sellainen on jo olemassa."
 
 #: src/gui/socialwindow.cpp:588
 msgid "You have been invited you to join a party."
-msgstr ""
+msgstr "Sinut on kutsuttu liittymään ryhmään."
 
 #: src/gui/socialwindow.cpp:592
 #, c-format
 msgid "You have been invited to join the %s party."
-msgstr ""
+msgstr "Sinut on kutsuttu liittymään ryhmään %s."
 
 #: src/gui/socialwindow.cpp:600
 #, c-format
 msgid "%s has invited you to join their party."
-msgstr ""
+msgstr "%s on kutsunut sinut liittymään ryhmäänsä."
 
 #: src/gui/socialwindow.cpp:605
 #, c-format
 msgid "%s has invited you to join the %s party."
-msgstr ""
+msgstr "%s on kutsunut sinut liittymään ryhmäänsä %s."
 
 #: src/gui/socialwindow.cpp:613
 msgid "Accept Party Invite"
-msgstr ""
+msgstr "Ota ryhmäkutsu vastaan"
 
+# TODO: missing period intentional?
 #: src/gui/socialwindow.cpp:624
 msgid "Cannot create party. You are already in a party"
-msgstr ""
+msgstr "Ryhmän luominen epäonnistui, olet jo ryhmän jäsen."
 
 #: src/gui/socialwindow.cpp:629
 msgid "Party Name"
-msgstr ""
+msgstr "Ryhmän nimi"
 
 #: src/gui/socialwindow.cpp:630
-#, fuzzy
 msgid "Choose your party's name."
-msgstr "Valitse palvelin"
+msgstr "Anna ryhmällesi nimi."
 
+# TODO: Say what
 #: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:62
 msgid "Specials"
-msgstr ""
+msgstr "Erikoisuudet"
 
 #: src/gui/specialswindow.cpp:174
 #, c-format
 msgid "Specials Set %d"
-msgstr ""
+msgstr "Erikoisuusjoukko %d"
 
 #: src/gui/specialswindow.cpp:191
 #, c-format
 msgid "Special %d"
-msgstr ""
+msgstr "Erikoisuus %d"
 
 #: src/gui/statuswindow.cpp:109 src/gui/statuswindow.cpp:253
 #, c-format
@@ -1863,64 +1836,62 @@ msgstr "Taso: %d"
 #: src/gui/statuswindow.cpp:110 src/gui/statuswindow.cpp:220
 #, c-format
 msgid "Money: %s"
-msgstr ""
+msgstr "Rahat: %s"
 
 #: src/gui/statuswindow.cpp:113
 msgid "HP:"
-msgstr ""
+msgstr "VP:"
 
 #: src/gui/statuswindow.cpp:118
 msgid "Exp:"
-msgstr ""
+msgstr "Kok:"
 
 #: src/gui/statuswindow.cpp:123
 msgid "MP:"
-msgstr ""
+msgstr "MP:"
 
 #: src/gui/statuswindow.cpp:141 src/gui/statuswindow.cpp:228
 #, c-format
 msgid "Job: %d"
-msgstr ""
+msgstr "Työ: %d"
 
 #: src/gui/statuswindow.cpp:142
 msgid "Job:"
-msgstr ""
+msgstr "Työ:"
 
 #: src/gui/statuswindow.cpp:203
 msgid "HP"
-msgstr ""
+msgstr "VP"
 
 #: src/gui/statuswindow.cpp:209
 msgid "MP"
-msgstr ""
+msgstr "MP"
 
 #: src/gui/statuswindow.cpp:215
 msgid "Exp"
-msgstr ""
+msgstr "Kok"
 
 #: src/gui/statuswindow.cpp:224
-#, fuzzy
 msgid "Money"
-msgstr "Rahatilanne: %d"
+msgstr "Rahaa"
 
 #: src/gui/statuswindow.cpp:234
 msgid "Job"
-msgstr ""
+msgstr "Työ"
 
 #: src/gui/statuswindow.cpp:238
-#, fuzzy, c-format
+#, c-format
 msgid "Character points: %d"
-msgstr "Hahmon pistejako OK"
+msgstr "Hahmopisteitä: %d"
 
 #: src/gui/statuswindow.cpp:244
 #, c-format
 msgid "Correction points: %d"
-msgstr ""
+msgstr "Korjauspisteitä: %d"
 
 #: src/gui/statuswindow.cpp:257
-#, fuzzy
 msgid "Level"
-msgstr "Taso: %d"
+msgstr "Taso"
 
 #: src/gui/trade.cpp:52
 msgid "Propose trade"
@@ -1940,20 +1911,21 @@ msgstr "Hyväksytty. Odotetaan..."
 
 #: src/gui/trade.cpp:58
 msgid "Trade: You"
-msgstr ""
+msgstr "Kauppa: Sinä"
 
+# TODO: Check where this really appears: verb or noun?
 #: src/gui/trade.cpp:72 src/gui/trade.cpp:73
 msgid "Trade"
-msgstr ""
+msgstr "Tee kaupat"
 
 #: src/gui/trade.cpp:75
 msgid "Add"
 msgstr "Lisää"
 
 #: src/gui/trade.cpp:97 src/gui/trade.cpp:133
-#, fuzzy, c-format
+#, c-format
 msgid "You get %s"
-msgstr "Annat:"
+msgstr "Saat %s"
 
 #: src/gui/trade.cpp:98
 msgid "You give:"
@@ -1963,9 +1935,10 @@ msgstr "Annat:"
 msgid "Change"
 msgstr "Muuta"
 
+# TODO: WTF? 
 #: src/gui/trade.cpp:273
 msgid "Failed adding item. You can not overlap one kind of item on the window."
-msgstr ""
+msgstr "Esineen lisääminen epäonnistui. Et voi limittää jotakin esinetyyppiä ikkunassa."
 
 #: src/gui/trade.cpp:316
 msgid "You don't have enough money."
@@ -1986,20 +1959,19 @@ msgstr "Yhdistetään..."
 
 #: src/gui/updatewindow.cpp:145
 msgid "Play"
-msgstr ""
+msgstr "Pelaa"
 
 #: src/gui/updatewindow.cpp:417
 msgid "##1  The update process is incomplete."
-msgstr "##1  Päivitys prosessi keskeytyi"
+msgstr "##1  Päivitysprosessi keskeytyi"
 
 #. TRANSLATORS: Continues "you try again later.".
 #: src/gui/updatewindow.cpp:419
 msgid "##1  It is strongly recommended that"
-msgstr "##1  On vahvasti suositeltavaa että"
+msgstr "##1  Suosittelemme vahvasti että"
 
 #. 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"
 
@@ -2007,9 +1979,10 @@ msgstr "##1  yrität myöhemmin uudelleen"
 msgid "Completed"
 msgstr "Valmis"
 
+# TODO: WTF?
 #: src/gui/userpalette.cpp:91
 msgid "Being"
-msgstr ""
+msgstr "Olo"
 
 #: src/gui/userpalette.cpp:92
 msgid "Other Players' Names"
@@ -2021,7 +1994,7 @@ msgstr "Oma nimi"
 
 #: src/gui/userpalette.cpp:94
 msgid "GM Names"
-msgstr "T"
+msgstr "GM-nimet"
 
 #: src/gui/userpalette.cpp:95
 msgid "NPCs"
@@ -2033,57 +2006,57 @@ msgstr "Hirviöt"
 
 #: src/gui/userpalette.cpp:97
 msgid "Party Members"
-msgstr ""
+msgstr "Ryhmän jäsenet"
 
 #: src/gui/userpalette.cpp:98
-#, fuzzy
 msgid "Guild Members"
-msgstr "T"
+msgstr "Killan jäsenet"
 
 #: src/gui/userpalette.cpp:99
 msgid "Particle Effects"
-msgstr ""
+msgstr "Hiukkastehosteet"
 
 #: src/gui/userpalette.cpp:100
 msgid "Pickup Notification"
-msgstr ""
+msgstr "Ottoilmoitus"
 
 #: src/gui/userpalette.cpp:101
 msgid "Exp Notification"
-msgstr ""
+msgstr "Kokemusilmoitus"
 
 #: src/gui/userpalette.cpp:103
-#, fuzzy
 msgid "Other Player Hits Monster"
-msgstr "Muiden pelaajien nimet"
+msgstr "Muu pelaaja lyö hirviötä"
 
 #: src/gui/userpalette.cpp:104
 msgid "Monster Hits Player"
-msgstr ""
+msgstr "Hirviö lyö pelaajaa"
 
 #: src/gui/userpalette.cpp:105
 msgid "Critical Hit"
-msgstr ""
+msgstr "Täysosuma"
 
+# TODO: Local player is apparently not you? How should this be interpreted?
 #: src/gui/userpalette.cpp:107
 msgid "Local Player Hits Monster"
-msgstr ""
+msgstr "Paikallinen pelaaja lyö hirviötä"
 
 #: src/gui/userpalette.cpp:109
 msgid "Local Player Critical Hit"
-msgstr ""
+msgstr "Paikallinen pelaaja saa täysosuman"
 
+# 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/gui/userpalette.cpp:111
 msgid "Local Player Miss"
-msgstr ""
+msgstr "Paikallisen pelaajan huti"
 
 #: src/gui/userpalette.cpp:112
 msgid "Misses"
-msgstr ""
+msgstr "Hudit"
 
 #: src/gui/widgets/channeltab.cpp:49
 msgid "/users > Lists the users in the current channel"
-msgstr ""
+msgstr "/users > Näyttää käyttäjät nykyisellä kanavalla"
 
 #: src/gui/widgets/channeltab.cpp:50
 msgid "/topic > Set the topic of the current channel"
@@ -2103,7 +2076,7 @@ msgstr "/kick > Poista käyttäjä kanavalta"
 
 #: src/gui/widgets/channeltab.cpp:63
 msgid "Command: /users"
-msgstr ""
+msgstr "Komento: /users"
 
 #: src/gui/widgets/channeltab.cpp:64
 msgid "This command shows the users in this channel."
@@ -2111,15 +2084,15 @@ msgstr "Tämä komento näyttää käyttäjät kanavalla."
 
 #: src/gui/widgets/channeltab.cpp:68
 msgid "Command: /topic <message>"
-msgstr ""
+msgstr "Komento: /topic <viesti>"
 
 #: src/gui/widgets/channeltab.cpp:69
 msgid "This command sets the topic to <message>."
-msgstr ""
+msgstr "Tämä komento asettaa aihekentän arvoksi <viesti>."
 
 #: src/gui/widgets/channeltab.cpp:73
 msgid "Command: /quit"
-msgstr ""
+msgstr "Komento: /quit"
 
 #: src/gui/widgets/channeltab.cpp:74
 msgid "This command leaves the current channel."
@@ -2131,11 +2104,11 @@ msgstr "Jos olet viimeinen henkilö kanavalla niin se katoaa."
 
 #: src/gui/widgets/channeltab.cpp:80
 msgid "Command: /op <nick>"
-msgstr ""
+msgstr "Komento: /op <nimi>"
 
 #: src/gui/widgets/channeltab.cpp:81
 msgid "This command makes <nick> a channel operator."
-msgstr "Tämä komento tekee <nick> operaattorin."
+msgstr "Tämä komento tekee annetunnimisestä käyttäjästä kanavaoperaattorin."
 
 #: src/gui/widgets/channeltab.cpp:84
 msgid "Channel operators can kick and op other users from the channel."
@@ -2145,71 +2118,69 @@ msgstr ""
 
 #: src/gui/widgets/channeltab.cpp:89
 msgid "Command: /kick <nick>"
-msgstr ""
+msgstr "Komento: /kick <nimi>"
 
 #: src/gui/widgets/channeltab.cpp:90
 msgid "This command makes <nick> leave the channel."
-msgstr ""
+msgstr "Tämä komento poistaa annetunnimisen hahmon kanavalta."
 
 #: src/gui/widgets/channeltab.cpp:119
 msgid "Need a user to op!"
-msgstr ""
+msgstr "Anna operaattoriksi korotettavan käyttäjän nimi!"
 
 #: src/gui/widgets/channeltab.cpp:126
 msgid "Need a user to kick!"
-msgstr ""
+msgstr "Anna potkittavan käyttäjän nimi!"
 
 #: src/gui/widgets/chattab.cpp:120
 msgid "Global announcement:"
-msgstr "Globaali ilmoitus:"
+msgstr "Yleinen ilmoitus:"
 
 #: src/gui/widgets/chattab.cpp:126
 #, c-format
 msgid "Global announcement from %s:"
-msgstr ""
+msgstr "%s ilmoittaa kaikille:"
 
 #: src/gui/widgets/chattab.cpp:152
 #, c-format
 msgid "%s whispers: %s"
-msgstr ""
+msgstr "%s kuiskaa: %s"
 
 #: src/gui/widgets/whispertab.cpp:52
 msgid "Cannot send empty chat!"
-msgstr ""
+msgstr "Tyhjää keskustelua ei voi lähettää!"
 
 #: src/gui/widgets/whispertab.cpp:71
 msgid "/ignore > Ignore the other player"
-msgstr ""
+msgstr "/ignore > Jätä pelaaja huomiotta"
 
 #: src/gui/widgets/whispertab.cpp:72
 msgid "/unignore > Stop ignoring the other player"
-msgstr ""
+msgstr "/unignore > Huomioi pelaaja jälleen"
 
 #: src/gui/widgets/whispertab.cpp:73
 msgid "/close > Close the whisper tab"
-msgstr ""
+msgstr "/close > Sulje kuiskausvälilehti"
 
 #: src/gui/widgets/whispertab.cpp:83
 msgid "Command: /close"
-msgstr ""
+msgstr "Komento: /close"
 
 #: src/gui/widgets/whispertab.cpp:84
 msgid "This command closes the current whisper tab."
-msgstr ""
+msgstr "Tämä komento sulkee avoinna olevan kuiskausvälilehden."
 
 #: src/gui/widgets/whispertab.cpp:88
 msgid "Command: /ignore"
-msgstr ""
+msgstr "Komento: /ignore"
 
 #: src/gui/widgets/whispertab.cpp:89
-#, fuzzy
 msgid "This command ignores the other player regardless of current relations."
-msgstr "Tämä komento näyttää paikalla olevien pelaajien määrän."
+msgstr "Tämä komento jättää annetun pelaajan huomiotta; nykysuhteilla ei ole vaikutusta."
 
 #: src/gui/widgets/whispertab.cpp:95
-#, fuzzy
 msgid "This command stops ignoring the other player if they are being ignored."
-msgstr "Tämä komento aloittaa keskustelun nauhoituksen tiedostoon <filename>."
+msgstr "Tämä komento huomioi pelaajan taas, jos tämä on ensin jätetty huomiotta."
 
 #: src/gui/windowmenu.cpp:54
 msgid "Status"
@@ -2220,19 +2191,16 @@ msgid "Shortcut"
 msgstr "Pikavalinnat"
 
 #: src/gui/worldselectdialog.cpp:71
-#, fuzzy
 msgid "Select World"
-msgstr "Valitse palvelin"
+msgstr "Valitse pelimaailma"
 
 #: src/gui/worldselectdialog.cpp:76
-#, fuzzy
 msgid "Change Login"
-msgstr "Muuta"
+msgstr "Vaihda kirjautumistietoja"
 
 #: src/gui/worldselectdialog.cpp:77
-#, fuzzy
 msgid "Choose World"
-msgstr "Valitse palvelin"
+msgstr "Valitse pelimaailma"
 
 #: src/keyboardconfig.cpp:40
 msgid "Move Up"
@@ -2252,40 +2220,39 @@ msgstr "Oikealle"
 
 #: src/keyboardconfig.cpp:44 src/net/tmwa/generalhandler.cpp:224
 msgid "Attack"
-msgstr ""
+msgstr "Hyökkää"
 
 #: src/keyboardconfig.cpp:45
 msgid "Target & Attack"
-msgstr ""
+msgstr "Kohdista ja hyökkää"
 
 #: src/keyboardconfig.cpp:46
 msgid "Smilie"
-msgstr ""
+msgstr "Hymiö"
 
 #: src/keyboardconfig.cpp:47
 msgid "Talk"
-msgstr ""
+msgstr "Keskustele"
 
 #: src/keyboardconfig.cpp:48
 msgid "Stop Attack"
-msgstr ""
+msgstr "Keskeytä hyökkäys"
 
 #: src/keyboardconfig.cpp:49
-#, fuzzy
 msgid "Target Monster"
-msgstr "Hirviöt"
+msgstr "Kohdista hirviöön"
 
 #: src/keyboardconfig.cpp:50
 msgid "Target NPC"
-msgstr ""
+msgstr "Kohdista ei-pelaajahahmoon"
 
 #: src/keyboardconfig.cpp:51
 msgid "Target Player"
-msgstr ""
+msgstr "Kohdista pelaajaan"
 
 #: src/keyboardconfig.cpp:52
 msgid "Pickup"
-msgstr ""
+msgstr "Nouki"
 
 #: src/keyboardconfig.cpp:53
 msgid "Hide Windows"
@@ -2301,11 +2268,11 @@ msgstr "Kuvankaappaus"
 
 #: src/keyboardconfig.cpp:56
 msgid "Enable/Disable Trading"
-msgstr ""
+msgstr "Salli/estä kaupankäynti"
 
 #: src/keyboardconfig.cpp:57
 msgid "Find Path to Mouse"
-msgstr ""
+msgstr "Löydä polku hiiren kursorin luo"
 
 #: src/keyboardconfig.cpp:58 src/keyboardconfig.cpp:59
 #: src/keyboardconfig.cpp:60 src/keyboardconfig.cpp:61
@@ -2315,69 +2282,67 @@ msgstr ""
 #: src/keyboardconfig.cpp:68 src/keyboardconfig.cpp:69
 #, c-format
 msgid "Item Shortcut %d"
-msgstr ""
+msgstr "Esinepikavalinta %d"
 
 #: src/keyboardconfig.cpp:70
 msgid "Help Window"
-msgstr ""
+msgstr "Ohjeikkuna"
 
 #: src/keyboardconfig.cpp:71
 msgid "Status Window"
-msgstr ""
+msgstr "Tilaikkuna"
 
 #: src/keyboardconfig.cpp:72
 msgid "Inventory Window"
-msgstr "Inventaario Ikkuna"
+msgstr "Tavaraikkuna"
 
 #: src/keyboardconfig.cpp:73
 msgid "Equipment Window"
-msgstr "Varuste ikkuna"
+msgstr "Varusteikkuna"
 
 #: src/keyboardconfig.cpp:74
 msgid "Skill Window"
-msgstr ""
+msgstr "Taitoikkuna"
 
 #: src/keyboardconfig.cpp:75
 msgid "Minimap Window"
-msgstr ""
+msgstr "Karttaikkuna"
 
 #: src/keyboardconfig.cpp:76
 msgid "Chat Window"
-msgstr ""
+msgstr "Keskusteluikkuna"
 
 #: src/keyboardconfig.cpp:77
 msgid "Item Shortcut Window"
-msgstr ""
+msgstr "Esineiden pikavalintaikkuna"
 
 #: src/keyboardconfig.cpp:78
 msgid "Setup Window"
-msgstr "Asetus ikkuna"
+msgstr "Asetusikkuna"
 
 #: src/keyboardconfig.cpp:79
 msgid "Debug Window"
-msgstr ""
+msgstr "Debug-ikkuna"
 
 #: src/keyboardconfig.cpp:80
-#, fuzzy
 msgid "Social Window"
-msgstr "Piilota ikkunat"
+msgstr "Suhdeikkuna"
 
 #: src/keyboardconfig.cpp:81
 msgid "Emote Shortcut Window"
-msgstr ""
+msgstr "Eleiden pikavalintaikkuna"
 
 #: src/keyboardconfig.cpp:82
-#, fuzzy
 msgid "Outfits Window"
-msgstr "Varuste ikkuna"
+msgstr "Asukokonaisuusikkuna"
 
 #: src/keyboardconfig.cpp:83
 msgid "Wear Outfit"
-msgstr ""
+msgstr "Pue asu"
 
 #: src/keyboardconfig.cpp:84
 msgid "Copy Outfit"
-msgstr ""
+msgstr "Kopioi asu"
 
 #: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86
 #: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88
@@ -2387,532 +2352,515 @@ msgstr ""
 #: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
 #, c-format
 msgid "Emote Shortcut %d"
-msgstr ""
+msgstr "Eleen pikavalinta %d"
 
 #: src/keyboardconfig.cpp:97
 msgid "Toggle Chat"
-msgstr ""
+msgstr "Ota keskustelu käyttöön/pois käytöstä"
 
 #: src/keyboardconfig.cpp:98
 msgid "Scroll Chat Up"
-msgstr ""
+msgstr "Vieritä keskustelua ylös"
 
 #: src/keyboardconfig.cpp:99
 msgid "Scroll Chat Down"
-msgstr ""
+msgstr "Vieritä keskustelua alas"
 
 #: src/keyboardconfig.cpp:100
 msgid "Previous Chat Tab"
-msgstr "Edellinen keskustelu välilehti"
+msgstr "Edellinen keskusteluvälilehti"
 
 #: src/keyboardconfig.cpp:101
 msgid "Next Chat Tab"
-msgstr "Seuraava keskustelu välilehti"
+msgstr "Seuraava keskusteluvälilehti"
 
 #: src/keyboardconfig.cpp:102
 msgid "Select OK"
-msgstr ""
+msgstr "Valitse OK"
 
 #: src/keyboardconfig.cpp:104
 msgid "Ignore input 1"
-msgstr ""
+msgstr "Jätä huomiotta syöte 1"
 
 #: src/keyboardconfig.cpp:105
 msgid "Ignore input 2"
-msgstr ""
+msgstr "Jätä huomiotta syöte 2"
 
 #: src/keyboardconfig.cpp:184
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
-msgstr ""
+msgstr "Päällekkäiset näppäinoikotiet \"%s\" ja \"%s\" voivat aiheuttaa outouksia; ole hyvä ja poista päällekkäisyydet. "
 
 #: src/localplayer.cpp:1248
 msgid "Unable to pick up item."
-msgstr ""
+msgstr "Esineen ottaminen epäonnistui."
 
+# 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.
 #. 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] ""
-msgstr[1] ""
+msgstr[0] "[@@%2$d|%3$s@@] (%1$d kpl) otettu."
+msgstr[1] "[@@%2$d|%3$s@@] (%1$d kpl) otettu."
 
 #: src/localplayer.cpp:1435
 msgid "Away"
-msgstr ""
+msgstr "Poissa"
 
 #: src/main.cpp:42
 msgid "mana [options] [mana-file]"
-msgstr ""
+msgstr "mana [parametrit] [mana-tiedosto]"
 
 #: src/main.cpp:43
 msgid "Options:"
-msgstr "Asetukset:"
+msgstr "Parametrit:"
 
 #: src/main.cpp:44
 msgid "  -v --version        : Display the version"
-msgstr ""
+msgstr "  -v --version        : Näytä versionumero"
 
 #: src/main.cpp:45
-#, fuzzy
 msgid "  -h --help           : Display this help"
-msgstr "/help > Näyttää tämän apu tekstin"
+msgstr "  -h --help           : Näytä tämä ohje"
 
 #: src/main.cpp:46
 msgid "  -C --config-dir     : Configuration directory to use"
-msgstr ""
+msgstr "  -C --config-dir     : Käytä tätä asetushakemistoa"
 
 #: src/main.cpp:47
 msgid "  -U --username       : Login with this username"
-msgstr ""
+msgstr "  -U --username       : Käyttäjätunnus sisäänkirjautumiseen"
 
 #: src/main.cpp:48
 msgid "  -P --password       : Login with this password"
-msgstr ""
+msgstr "  -P --password       : Salasana sisäänkirjautumiseen"
 
 #: src/main.cpp:49
 msgid "  -c --character      : Login with this character"
-msgstr ""
+msgstr "  -c --character      : Hahmo sisäänkirjautumiseen"
 
 #: src/main.cpp:50
 msgid "  -s --server         : Login server name or IP"
-msgstr ""
+msgstr "  -s --server         : Palvelinnimi tai IP-osoite sisäänkirjautumiseen"
 
 #: src/main.cpp:51
 msgid "  -p --port           : Login server port"
-msgstr ""
+msgstr "  -p --port           : Palvelinportti sisäänkirjautumiseen "
 
 #: src/main.cpp:52
 msgid "     --update-host    : Use this update host"
-msgstr ""
+msgstr "     --update-host    : Käytä tätä päivityspalvelinta"
 
 #: src/main.cpp:53
 msgid "  -D --default        : Choose default character server and character"
-msgstr ""
+msgstr "  -D --default        : Aseta oletushahmopalvelin ja -hahmo"
 
 #: src/main.cpp:55
 msgid "  -u --skip-update    : Skip the update downloads"
-msgstr ""
+msgstr "  -u --skip-update    : Ohita päivityslataukset"
 
 #: src/main.cpp:56
 msgid "  -d --data           : Directory to load game data from"
-msgstr ""
+msgstr "  -d --data           : Lataa pelidata tästä hakemistosta"
 
 #: src/main.cpp:57
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
-msgstr ""
+msgstr "  -L --localdata-dir  : Hakemisto paikallisdatan tallennukseen"
 
 #: src/main.cpp:58
 msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr ""
+msgstr "     --screenshot-dir : Kuvankaappausten tallennushakemisto"
 
 #: src/main.cpp:60
 msgid "     --no-opengl      : Disable OpenGL for this session"
-msgstr ""
+msgstr "     --no-opengl      : Poista OpenGL käytöstä tämän session ajaksi"
 
 #: src/net/manaserv/beinghandler.cpp:304 src/net/tmwa/playerhandler.cpp:103
 msgid "You are dead."
-msgstr "Sinä olet kuollut."
+msgstr "Olet kuollut."
 
 #: 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 ""
+msgstr "Ikävä kyllä joudumme kertomaan hahmosi kuolleen taistelussa."
 
 #: src/net/manaserv/beinghandler.cpp:307 src/net/tmwa/playerhandler.cpp:106
 msgid "You are not that alive anymore."
-msgstr "Et ole enää elossa."
+msgstr "Et ole enää erityisen elossa."
 
 #: 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 ""
+msgstr "Tuonelasta käy sieluusi kylmä viima."
 
 #: src/net/manaserv/beinghandler.cpp:309 src/net/tmwa/playerhandler.cpp:108
 msgid "Game Over!"
-msgstr "Peli Loppu!"
+msgstr "Se siitä!"
 
 #: 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 ""
-"Ei, lapset. Teidän hahmonne ei oikeasti kuollut. Se... öhm... meni parempaan "
-"paikkaan."
+msgstr "Ei, lapsikullat. Hahmonne ei oikeasti kuollut. Se... öhm... meni parempaan paikkaan."
 
 #: 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 ""
-"Suunnitelmasi rikkoa vastustajiesi aseet iskemällä ne omaan kurkkuusi "
-"epäonnistui."
+msgstr "Ovela suunnitelmasi rikkoa vastustajiesi aseet iskemällä ne omaan kurkkuusi epäonnistui."
 
 #: src/net/manaserv/beinghandler.cpp:314 src/net/tmwa/playerhandler.cpp:114
 msgid "I guess this did not run too well."
-msgstr ""
+msgstr "Ei tainnut mennä kovin lujaa."
 
+# Nethack reference, no point in direct translation.
 #: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:116
 msgid "Do you want your possessions identified?"
-msgstr ""
+msgstr "Haluatko tietää mitä rojua kanniskelit oikeasti mukanasi?"
 
+# Secret of Mana reference.
 #: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:118
 msgid "Sadly, no trace of you was ever found..."
-msgstr ""
+msgstr "Ikävä kyllä sinusta ei jäänyt lopulta jälkeäkään löydettäväksi..."
 
+# Final Fantasy reference mangled to localized D. Duck reference.
 #: src/net/manaserv/beinghandler.cpp:317 src/net/tmwa/playerhandler.cpp:120
 msgid "Annihilated."
-msgstr ""
+msgstr "Pim! Olet annihiloitu."
 
 #: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:122
 msgid "Looks like you got your head handed to you."
-msgstr ""
+msgstr "Jäi näköjään oma pää vetävän käteen."
 
+# Leisure Suit Larry reference. 
 #: 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 ""
+msgstr "Peballeen meni taas, vedä raatosi vessasta alas ja hanki uusi."
 
 #: src/net/manaserv/beinghandler.cpp:324
 msgid "Press OK to respawn."
-msgstr ""
+msgstr "Paina OK syntyäksesi uudelleen."
 
 #: src/net/manaserv/beinghandler.cpp:325
-#, fuzzy
 msgid "You Died"
-msgstr "Annat:"
+msgstr "Kuolit"
 
 #: src/net/manaserv/charhandler.cpp:134 src/net/manaserv/charhandler.cpp:202
 msgid "Not logged in."
-msgstr ""
+msgstr "Et ole kirjautunut sisään."
 
 #: src/net/manaserv/charhandler.cpp:137
 msgid "No empty slot."
-msgstr ""
+msgstr "Ei vapaata paikkaa."
 
 #: src/net/manaserv/charhandler.cpp:140
 msgid "Invalid name."
-msgstr ""
+msgstr "Epäkelpo nimi."
 
 #: src/net/manaserv/charhandler.cpp:143
-#, fuzzy
 msgid "Character's name already exists."
-msgstr "Hahmo poistettu"
+msgstr "Hahmon nimi on jo käytössä."
 
 #: src/net/manaserv/charhandler.cpp:146
 msgid "Invalid hairstyle."
-msgstr ""
+msgstr "Epäkelpo hiustyyli."
 
 #: src/net/manaserv/charhandler.cpp:149
 msgid "Invalid hair color."
-msgstr ""
+msgstr "Epäkelpo hiusten väri."
 
 #: src/net/manaserv/charhandler.cpp:152
 msgid "Invalid gender."
-msgstr ""
+msgstr "Epäkelpo sukupuoli."
 
 #: src/net/manaserv/charhandler.cpp:155
-#, fuzzy
 msgid "Character's stats are too high."
-msgstr "Hahmon pistejako OK"
+msgstr "Hahmon arvot ovat liian korkeat."
 
 #: src/net/manaserv/charhandler.cpp:158
-#, fuzzy
 msgid "Character's stats are too low."
-msgstr "Hahmon pistejako OK"
+msgstr "Hahmon arvot ovat liian matalat. (Lurjus.)"
 
 #: src/net/manaserv/charhandler.cpp:161
 msgid "One stat is zero."
-msgstr ""
+msgstr "Yksi hahmon kykyarvoista on nolla."
 
 #: 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
-#, fuzzy
 msgid "Unknown error."
-msgstr "Tuntematon virhe"
+msgstr "Tuntematon virhe."
 
 #: src/net/manaserv/charhandler.cpp:193 src/net/tmwa/charserverhandler.cpp:150
 msgid "Info"
-msgstr ""
+msgstr "Tietoja"
 
 #: src/net/manaserv/charhandler.cpp:193
-#, fuzzy
 msgid "Player deleted."
-msgstr "Hahmo poistettu"
+msgstr "Hahmo poistettu."
 
 #: src/net/manaserv/charhandler.cpp:205
-#, fuzzy
 msgid "Selection out of range."
-msgstr "Anna vaihdettavien tavaroiden määrä."
+msgstr "Valinta sallittujen arvojen ulkopuolella."
 
 #: src/net/manaserv/charhandler.cpp:208
-#, fuzzy, c-format
+#, c-format
 msgid "Unknown error (%d)."
-msgstr "Tuntematon virhe"
+msgstr "Tuntematon virhe (%d)."
 
 #: src/net/manaserv/charhandler.cpp:242
 msgid "No gameservers are available."
-msgstr ""
+msgstr "Pelipalvelimia ei ole saatavilla."
 
 #: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
 #: src/net/manaserv/guildhandler.cpp:259
 #, c-format
 msgid "Topic: %s"
-msgstr ""
+msgstr "Aihe: %s"
 
 #: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
 msgid "Players in this channel:"
-msgstr ""
+msgstr "Pelaajia tällä kanavalla:"
 
 #: src/net/manaserv/chathandler.cpp:201
 msgid "Error joining channel."
-msgstr ""
+msgstr "Kanavalle liittyminen epäonnistui."
 
+# TODO: Optimistic translation: followed by channel listing?
 #: src/net/manaserv/chathandler.cpp:207
 msgid "Listing channels."
-msgstr ""
+msgstr "Kanavalistaus:"
 
 #: src/net/manaserv/chathandler.cpp:219
 msgid "End of channel list."
-msgstr ""
+msgstr "Kanavalistauksen loppu."
 
 #: src/net/manaserv/chathandler.cpp:291
 #, c-format
 msgid "%s entered the channel."
-msgstr ""
+msgstr "%s liittyi kanavalle."
 
 #: src/net/manaserv/chathandler.cpp:296
 #, c-format
 msgid "%s left the channel."
-msgstr ""
+msgstr "%s poistui kanavalta."
 
 #: src/net/manaserv/chathandler.cpp:312
 #, c-format
 msgid "%s has set mode %s on user %s."
-msgstr ""
+msgstr "%s asetti tilan %s käyttäjälle %s."
 
 #: src/net/manaserv/chathandler.cpp:322
 #, c-format
 msgid "%s has kicked %s."
-msgstr ""
+msgstr "%s potkaisi käyttäjän %s ulos."
 
 #: src/net/manaserv/chathandler.cpp:327
-#, fuzzy
 msgid "Unknown channel event."
-msgstr "Tuntematon komento."
+msgstr "Tuntematon kanavatapahtuma."
 
 #: src/net/manaserv/guildhandler.cpp:81
 msgid "Guild created."
-msgstr ""
+msgstr "Kilta luotu."
 
 #: src/net/manaserv/guildhandler.cpp:86
 msgid "Error creating guild."
-msgstr ""
+msgstr "Killan luonti epäonnistui."
 
 #: src/net/manaserv/guildhandler.cpp:96
 msgid "Invite sent."
-msgstr ""
+msgstr "Kutsu lähetetty."
 
 #: src/net/manaserv/guildhandler.cpp:203
 msgid "Member was promoted successfully."
-msgstr ""
+msgstr "Jäsen ylennettiin onnistuneesti."
 
 #: src/net/manaserv/guildhandler.cpp:208
 msgid "Failed to promote member."
-msgstr ""
+msgstr "Jäsenen ylennys epäonnistui."
 
 #: src/net/manaserv/loginhandler.cpp:87
 msgid "Wrong magic_token."
-msgstr ""
+msgstr "Väärä taikalipuke (magic_token)."
 
 #: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
-#, fuzzy
 msgid "Already logged in."
-msgstr "Tällä tunnuksella on jo kirjauduttu"
+msgstr "Tällä tunnuksella on jo kirjauduttu sisään."
 
 #: src/net/manaserv/loginhandler.cpp:93
-#, fuzzy
 msgid "Account banned."
-msgstr "Tili: %s"
+msgstr "Tili porttikiellossa."
 
 #: src/net/manaserv/loginhandler.cpp:118
-#, fuzzy
 msgid "New password incorrect."
-msgstr "Vanha salsana on väärin."
+msgstr "Uusi salasana on väärä."
 
 #: src/net/manaserv/loginhandler.cpp:121 src/net/tmwa/loginhandler.cpp:89
-#, fuzzy
 msgid "Old password incorrect."
-msgstr "Vanha salsana on väärin."
+msgstr "Vanha salsana on väärä."
 
 #: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
 msgid "Account not connected. Please login first."
-msgstr ""
+msgstr "Tiliin ei ole yhteyttä. Ole hyvä ja kirjaudu ensin sisään."
 
 #: src/net/manaserv/loginhandler.cpp:149
-#, fuzzy
 msgid "New email address incorrect."
-msgstr "Kirjoita  uusi sähköposti osoite toisen kerran:"
+msgstr "Uusi sähköpostiosoite ei kelpaa."
 
 #: src/net/manaserv/loginhandler.cpp:152
-#, fuzzy
 msgid "Old email address incorrect."
-msgstr "Vanha salsana on väärin."
+msgstr "Vanha sähköpostiosoite ei kelpaa."
 
 #: src/net/manaserv/loginhandler.cpp:158
 msgid "The new email address already exists."
-msgstr ""
+msgstr "Uusi sähköpostiosoite on jo käytössä."
 
 #: src/net/manaserv/loginhandler.cpp:239
 msgid ""
 "Client registration is not allowed. Please contact server administration."
-msgstr ""
+msgstr "Asiakasohjelmalla ei voi rekisteröityä tälle palvelimelle; ota yhteyttä palvelimen ylläpitoon."
 
 #: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
 msgid "Client version is too old."
-msgstr ""
+msgstr "Asiakasohjelman versio on liian vanha."
 
 #: src/net/manaserv/loginhandler.cpp:266
-#, fuzzy
 msgid "Wrong username or password."
-msgstr "Väärä salasana"
+msgstr "Väärä käyttäjätunnus tai salasana."
 
 #: src/net/manaserv/loginhandler.cpp:272
-#, fuzzy
 msgid "Account banned"
-msgstr "Tili: %s"
+msgstr "Tili porttikiellossa"
 
 #: src/net/manaserv/loginhandler.cpp:275
 msgid "Login attempt too soon after previous attempt."
-msgstr ""
+msgstr "Sisäänkirjautumista yritetty liian pian edellisen yrityksen jälḱeen."
 
 #: src/net/manaserv/loginhandler.cpp:303
 msgid "Wrong username, password or email address."
-msgstr ""
+msgstr "Väärä käyttäjätunnus, salasana tai sähköpostiosoite."
 
 #: src/net/manaserv/loginhandler.cpp:306
-#, fuzzy
 msgid "Username already exists."
-msgstr "Käyttäjänimi on jo käytössä"
+msgstr "Käyttäjätunnus on jo käytössä."
 
 #: src/net/manaserv/loginhandler.cpp:309
 msgid "Email address already exists."
-msgstr ""
+msgstr "Sähköpostiosoite on jo käytössä."
 
 #: src/net/manaserv/loginhandler.cpp:312
 msgid "You took too long with the captcha or your response was incorrect."
-msgstr ""
+msgstr "Käytit captcha-testin käsittelyyn liian paljon aikaa tai vastauksesi oli väärin."
 
 #: src/net/manaserv/partyhandler.cpp:88
 msgid "Joined party."
-msgstr ""
+msgstr "Liityit ryhmään."
 
 #: src/net/manaserv/partyhandler.cpp:106
 #, c-format
 msgid "%s joined the party."
-msgstr ""
+msgstr "%s liittyi ryhmään."
 
 #: src/net/manaserv/partyhandler.cpp:123
 #, c-format
 msgid "%s rejected your invite."
-msgstr ""
+msgstr "%s ei ottanut kutsuasi vastaan."
 
 #: src/net/manaserv/stats.cpp:56 src/net/tmwa/generalhandler.cpp:217
 msgid "Strength"
-msgstr ""
+msgstr "Voima"
 
 #: src/net/manaserv/stats.cpp:58 src/net/tmwa/generalhandler.cpp:101
 #, c-format
 msgid "Strength %+d"
-msgstr ""
+msgstr "Voima %+d"
 
 #: src/net/manaserv/stats.cpp:68 src/net/tmwa/generalhandler.cpp:218
 msgid "Agility"
-msgstr ""
+msgstr "Ketteryys"
 
 #: src/net/manaserv/stats.cpp:70 src/net/tmwa/generalhandler.cpp:102
 #, c-format
 msgid "Agility %+d"
-msgstr ""
+msgstr "Ketteryys %+d"
 
 #: src/net/manaserv/stats.cpp:80 src/net/tmwa/generalhandler.cpp:221
 msgid "Dexterity"
-msgstr ""
+msgstr "Näppäryys"
 
 #: src/net/manaserv/stats.cpp:82 src/net/tmwa/generalhandler.cpp:105
 #, c-format
 msgid "Dexterity %+d"
-msgstr ""
+msgstr "Näppäryys %+d"
 
 #: src/net/manaserv/stats.cpp:92 src/net/tmwa/generalhandler.cpp:219
 msgid "Vitality"
-msgstr ""
+msgstr "Elinvoima"
 
 #: src/net/manaserv/stats.cpp:94 src/net/tmwa/generalhandler.cpp:103
 #, c-format
 msgid "Vitality %+d"
-msgstr ""
+msgstr "Elinvoima %+d"
 
 #: src/net/manaserv/stats.cpp:104 src/net/tmwa/generalhandler.cpp:220
 msgid "Intelligence"
-msgstr ""
+msgstr "Älykkyys"
 
 #: src/net/manaserv/stats.cpp:106 src/net/tmwa/generalhandler.cpp:104
 #, c-format
 msgid "Intelligence %+d"
-msgstr ""
+msgstr "Älykkyys %+d"
 
 #: src/net/manaserv/stats.cpp:116
-#, fuzzy
 msgid "Willpower"
-msgstr "Tahdonvoima:"
+msgstr "Tahdonvoima"
 
 #: src/net/manaserv/stats.cpp:118
 #, c-format
 msgid "Willpower %+d"
-msgstr ""
+msgstr "Tahdonvoima %+d"
 
 #: src/net/manaserv/tradehandler.cpp:96
 msgid "Accepting incoming trade requests."
-msgstr ""
+msgstr "Hyväksyt tulevat kaupantekoehdotukset."
 
 #: src/net/manaserv/tradehandler.cpp:98
 msgid "Ignoring incoming trade requests."
-msgstr ""
+msgstr "Jätät tulevat kaupantekoehdotukset huomiotta."
 
 #: src/net/manaserv/tradehandler.cpp:116 src/net/tmwa/tradehandler.cpp:107
 msgid "Request for Trade"
-msgstr ""
+msgstr "Kaupantekoehdotus"
 
 #: src/net/manaserv/tradehandler.cpp:117 src/net/tmwa/tradehandler.cpp:108
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
-msgstr "%s haluaa käydäkauppaa kanssasi, hyväksytkö pyynnön?"
+msgstr "%s haluaa tehdä kauppaa kanssasi, katsotko tarjouksen?"
 
 #: src/net/manaserv/tradehandler.cpp:135
 #, c-format
 msgid "Trading with %s"
-msgstr ""
+msgstr "Kaupantekoa pelaajan %s kanssa"
 
 #: src/net/manaserv/tradehandler.cpp:149 src/net/tmwa/tradehandler.cpp:224
 msgid "Trade canceled."
-msgstr ""
+msgstr "Kaupat peruttu."
 
 #: src/net/manaserv/tradehandler.cpp:156 src/net/tmwa/tradehandler.cpp:231
 msgid "Trade completed."
-msgstr ""
+msgstr "Kaupat tuli."
 
 #: src/net/tmwa/adminhandler.cpp:65
 msgid "Kick failed!"
-msgstr ""
+msgstr "Potkiminen epäonnistui!"
 
 #: src/net/tmwa/adminhandler.cpp:67
 msgid "Kick succeeded!"
-msgstr ""
+msgstr "Potkiminen onnistui!"
 
 #: src/net/tmwa/buysellhandler.cpp:110
 msgid "Nothing to sell."
@@ -2920,32 +2868,31 @@ msgstr "Ei mitään myytävää"
 
 #: src/net/tmwa/buysellhandler.cpp:117
 msgid "Thanks for buying."
-msgstr ""
+msgstr "Kiitos kaupoista."
 
 #: src/net/tmwa/buysellhandler.cpp:124
 msgid "Unable to buy."
-msgstr ""
+msgstr "Ostaminen epäonnistui."
 
 #: src/net/tmwa/buysellhandler.cpp:130
 msgid "Thanks for selling."
-msgstr ""
+msgstr "Kiitos kaupoista."
 
 #: src/net/tmwa/buysellhandler.cpp:132
 msgid "Unable to sell."
-msgstr ""
+msgstr "Myyminen epäonnistui."
 
 #: src/net/tmwa/charserverhandler.cpp:105
 msgid "Access denied. Most likely, there are too many players on this server."
-msgstr ""
+msgstr "Pääsy evätty. Todennäköisesti palvelimella on liian paljon pelaajia."
 
 #: src/net/tmwa/charserverhandler.cpp:109
 msgid "Cannot use this ID."
-msgstr ""
+msgstr "Tätä tunnistetta ei voi käyttää."
 
 #: src/net/tmwa/charserverhandler.cpp:112
-#, fuzzy
 msgid "Unknown char-server failure."
-msgstr "Tuntematon virhe"
+msgstr "Tuntematon hahmopalvelinvirhe."
 
 #: src/net/tmwa/charserverhandler.cpp:138
 msgid "Failed to create character. Most likely the name is already taken."
@@ -2953,11 +2900,11 @@ msgstr "Hahmon luonti epäonnistui. Todennäköisesti hahmon nimi on jo käytös
 
 #: src/net/tmwa/charserverhandler.cpp:150
 msgid "Character deleted."
-msgstr "Hahmo poistettu"
+msgstr "Hahmo poistettu."
 
 #: src/net/tmwa/charserverhandler.cpp:155
 msgid "Failed to delete character."
-msgstr "Hahmon poisto epäonnistui"
+msgstr "Hahmon poisto epäonnistui."
 
 #: src/net/tmwa/charserverhandler.cpp:259
 msgid "Strength:"
@@ -2981,20 +2928,20 @@ msgstr "Näppäryys:"
 
 #: src/net/tmwa/charserverhandler.cpp:264
 msgid "Luck:"
-msgstr ""
+msgstr "Tuuri:"
 
 #: src/net/tmwa/chathandler.cpp:80
 msgid "Whisper could not be sent, user is offline."
-msgstr ""
+msgstr "Kuiskauksen lähetys epäonnistui: pelaaja ei ole kirjautuneena sisään."
 
 #: src/net/tmwa/chathandler.cpp:84
 msgid "Whisper could not be sent, ignored by user."
-msgstr ""
+msgstr "Kuiskauksen lähetys epäonnistui: pelaaja ei kuunnellut."
 
+# TODO: WTF is MVP, "most valued player player"?<
 #: src/net/tmwa/chathandler.cpp:190
-#, fuzzy
 msgid "MVP player."
-msgstr "Pelaaja"
+msgstr "MVP-pelaaja."
 
 #: src/net/tmwa/chathandler.cpp:223 src/net/tmwa/chathandler.cpp:229
 #: src/net/tmwa/chathandler.cpp:234 src/net/tmwa/chathandler.cpp:239
@@ -3006,310 +2953,296 @@ msgstr "Kanavia ei tueta!"
 #: src/net/tmwa/gamehandler.cpp:87
 #, c-format
 msgid "Online users: %d"
-msgstr ""
+msgstr "Käyttäjiä palvelimella: %d"
 
 #: src/net/tmwa/gamehandler.cpp:101
-#, fuzzy
 msgid "Game"
-msgstr "Nimi"
+msgstr "Peli"
 
 #: src/net/tmwa/gamehandler.cpp:101
 msgid "Request to quit denied!"
-msgstr ""
+msgstr "Lopetuspyyntö evätty!"
 
 #: src/net/tmwa/generalhandler.cpp:106
 #, c-format
 msgid "Luck %+d"
-msgstr ""
+msgstr "Tuuri %+d"
 
 #: src/net/tmwa/generalhandler.cpp:129
-#, fuzzy
 msgid "Authentication failed."
-msgstr "Tunnistus epäonnistui"
+msgstr "Tunnistus epäonnistui."
 
 #: src/net/tmwa/generalhandler.cpp:132
-#, fuzzy
 msgid "No servers available."
-msgstr "Palvelimia ei saatavilla"
+msgstr "Palvelimia ei saatavilla."
 
 #: src/net/tmwa/generalhandler.cpp:136
-#, fuzzy
 msgid "Someone else is trying to use this account."
-msgstr "Joku muu yrittää käyttää tätä tunnusta"
+msgstr "Joku muu yrittää käyttää tätä tunnusta."
 
 #: src/net/tmwa/generalhandler.cpp:139
-#, fuzzy
 msgid "This account is already logged in."
-msgstr "Tällä tunnuksella on jo kirjauduttu"
+msgstr "Tällä tunnuksella on jo kirjauduttu."
 
 #: src/net/tmwa/generalhandler.cpp:142
 msgid "Speed hack detected."
-msgstr ""
+msgstr "Nopeusviritelmä havaittu."
 
+# TODO: Hm?
 #: src/net/tmwa/generalhandler.cpp:145
 msgid "Duplicated login."
-msgstr ""
+msgstr "Kaksinkertainen sisäänkirjautuminen."
 
 #: src/net/tmwa/generalhandler.cpp:148
-#, fuzzy
 msgid "Unknown connection error."
-msgstr "Tuntematon yhteys ongelma"
+msgstr "Tuntematon yhteysongelma."
 
 #: src/net/tmwa/generalhandler.cpp:206
 msgid "Got disconnected from server!"
-msgstr ""
+msgstr "Yhteys palvelimeen katkesi!"
 
 #: src/net/tmwa/generalhandler.cpp:222
 msgid "Luck"
-msgstr ""
+msgstr "Tuuri"
 
 #: src/net/tmwa/generalhandler.cpp:225
-#, fuzzy
 msgid "Defense"
-msgstr "Puolustus %+d"
+msgstr "Puolustus"
 
 #: src/net/tmwa/generalhandler.cpp:226
-#, fuzzy
 msgid "M.Attack"
-msgstr "Hyökkäys %+d"
+msgstr "T.-hyökkäys"
 
 #: src/net/tmwa/generalhandler.cpp:227
-#, fuzzy
 msgid "M.Defense"
-msgstr "Puolustus %+d"
+msgstr "T.-puolustus"
 
+# TODO: msgfmt -c complains of percentages.
 #: src/net/tmwa/generalhandler.cpp:228
-#, fuzzy, c-format
+#, no-c-format
 msgid "% Accuracy"
-msgstr "% Tarkkuus:"
+msgstr "% Tarkkuus"
 
 #: src/net/tmwa/generalhandler.cpp:229
-#, c-format
+#, no-c-format
 msgid "% Evade"
-msgstr ""
+msgstr "% Välttö"
 
+# Note: "inventive" translation in hopes of proper language
 #: src/net/tmwa/generalhandler.cpp:230
-#, c-format
+#, no-c-format
 msgid "% Critical"
-msgstr ""
+msgstr "% Täysosuma"
 
 #: src/net/tmwa/gui/guildtab.cpp:45
 msgid "Guild"
-msgstr ""
+msgstr "Kilta"
 
 #: src/net/tmwa/gui/guildtab.cpp:61 src/net/tmwa/gui/partytab.cpp:59
 msgid "/help > Display this help."
-msgstr ""
+msgstr "/help > Näytä tämä ohje."
 
 #: src/net/tmwa/gui/guildtab.cpp:62
 msgid "/invite > Invite a player to your guild"
-msgstr ""
+msgstr "/invite > Kutsu pelaaja kiltaasi"
 
 #: src/net/tmwa/gui/guildtab.cpp:63
 msgid "/leave > Leave the guild you are in"
-msgstr ""
+msgstr "/leave > Eroa nykyisestä killastasi"
 
 #: 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"
+msgstr "/kick > Poista käyttäjä killastasi"
 
 #: src/net/tmwa/gui/guildtab.cpp:73 src/net/tmwa/gui/partytab.cpp:73
 msgid "Command: /invite <nick>"
-msgstr ""
+msgstr "Komento: /invite <nimi>"
 
 #: 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."
+msgstr "Tämä komento kutsuu annetun pelaajan nykyiseen kiltaasi."
 
 #: src/net/tmwa/gui/guildtab.cpp:80 src/net/tmwa/gui/partytab.cpp:80
 msgid "Command: /leave"
-msgstr ""
+msgstr "Komento: /leave"
 
 #: 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>."
+msgstr "Tämä komento saa sinut eroamaan killasta."
 
 #: src/net/tmwa/gui/guildtab.cpp:89
 msgid "Guild name is missing."
-msgstr ""
+msgstr "Killan nimi puuttuu."
 
 #: src/net/tmwa/guildhandler.cpp:295
 msgid "Could not inivte user to guild."
-msgstr ""
+msgstr "Pelaajan kutsuminen kiltaan epäonnistui."
 
 #: src/net/tmwa/guildhandler.cpp:300
 msgid "User rejected guild invite."
-msgstr ""
+msgstr "Käyttäjä ei ottanut kiltakutsua vastaan."
 
 #: src/net/tmwa/guildhandler.cpp:305
 msgid "User is now part of your guild."
-msgstr ""
+msgstr "Käyttäjä liittyi kiltaasi."
 
 #: src/net/tmwa/guildhandler.cpp:310
 msgid "Your guild is full."
-msgstr ""
+msgstr "Kiltasi on täynnä."
 
 #: src/net/tmwa/guildhandler.cpp:315
 msgid "Unknown guild invite response."
-msgstr ""
+msgstr "Tuntematon vastaus kiltakutsuun."
 
 #: src/net/tmwa/guildhandler.cpp:392
 msgid "Guild creation isn't supported yet."
-msgstr ""
+msgstr "Kiltojen luontia ei tueta vielä."
 
 #: src/net/tmwa/gui/partytab.cpp:43
 msgid "Party"
-msgstr ""
+msgstr "Ryhmä"
 
 #: src/net/tmwa/gui/partytab.cpp:60
 msgid "/invite > Invite a player to your party"
-msgstr ""
+msgstr "/invite > Kutsu pelaaja ryhmääsi"
 
 #: src/net/tmwa/gui/partytab.cpp:61
 msgid "/leave > Leave the party you are in"
-msgstr ""
+msgstr "/leave > Eroa nykyisestä ryhmästäsi"
 
+# 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 ""
+msgstr "/kick > Potki pelaaja ryhmästäsi"
 
 #: src/net/tmwa/gui/partytab.cpp:63
 msgid "/item > Show/change party item sharing options"
-msgstr ""
+msgstr "/item > Näytä/muuta ryhmän esineidenjaon asetuksia"
 
 #: src/net/tmwa/gui/partytab.cpp:64
 msgid "/exp > Show/change party experience sharing options"
-msgstr ""
+msgstr "/exp > Näytä/muuta ryhmän kokemuksenjaon asetuksia"
 
 #: src/net/tmwa/gui/partytab.cpp:81
 msgid "This command causes the player to leave the party."
-msgstr ""
+msgstr "Tämä komento erottaa pelaajan ryhmästä."
 
 #: src/net/tmwa/gui/partytab.cpp:85
 msgid "Command: /item <policy>"
-msgstr ""
+msgstr "Komento: /item <jakopolitiikka>"
 
 #: src/net/tmwa/gui/partytab.cpp:86
 msgid "This command changes the party's item sharing policy."
-msgstr ""
+msgstr "Tämä komento muuttaa ryhmän esineiden jakopolitiikkaa."
 
 #: 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 ""
+msgstr "<jakopolitiikka> voi olla arvoltaan \"1\", \"yes\" tai \"true\", jolloin esineet jaetaan, tai \"0\", \"no\" tai \"false\", jolloin esineitä ei jaeta."
 
 #: src/net/tmwa/gui/partytab.cpp:90
 msgid "Command: /item"
-msgstr ""
+msgstr "Komento: /item"
 
 #: src/net/tmwa/gui/partytab.cpp:91
 msgid "This command displays the party's current item sharing policy."
-msgstr ""
+msgstr "Tämä komento näyttää ryhmän nykyisen esineiden jakopolitiikan."
 
 #: src/net/tmwa/gui/partytab.cpp:95
 msgid "Command: /exp <policy>"
-msgstr ""
+msgstr "Komento: /exp <jakopolitiikka>"
 
 #: src/net/tmwa/gui/partytab.cpp:96
 msgid "This command changes the party's experience sharing policy."
-msgstr ""
+msgstr "Tämä komento muuttaa ryhmän kokemuksenjaon politiikkaa."
 
 #: 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 ""
+msgstr "<jakopolitiikka> voi olla arvoltaan \"1\", \"yes\" tai \"true\", jolloin kokemuspisteet jaetaan, tai \"0\", \"no\" tai \"false\", jolloin kokemuspisteitä ei jaeta."
 
 #: src/net/tmwa/gui/partytab.cpp:100
 msgid "Command: /exp"
-msgstr ""
+msgstr "Komento: /exp"
 
 #: src/net/tmwa/gui/partytab.cpp:101
 msgid "This command displays the party's current experience sharing policy."
-msgstr ""
+msgstr "Tämä komento näyttää ryhmän nykyisen kokemuksenjaon politiikan."
 
 #: src/net/tmwa/gui/partytab.cpp:132 src/net/tmwa/partyhandler.cpp:201
 msgid "Item sharing enabled."
-msgstr ""
+msgstr "Esineiden jakaminen käytössä."
 
 #: src/net/tmwa/gui/partytab.cpp:135 src/net/tmwa/partyhandler.cpp:207
 msgid "Item sharing disabled."
-msgstr ""
+msgstr "Esineiden jakaminen poistettu käytöstä."
 
 #: src/net/tmwa/gui/partytab.cpp:138 src/net/tmwa/partyhandler.cpp:213
 msgid "Item sharing not possible."
-msgstr ""
+msgstr "Esineiden jakaminen ei ole mahdollista."
 
 #: src/net/tmwa/gui/partytab.cpp:141
 msgid "Item sharing unknown."
-msgstr ""
+msgstr "Esineiden jaon tila on tuntematon."
 
 #: src/net/tmwa/gui/partytab.cpp:167 src/net/tmwa/partyhandler.cpp:177
 msgid "Experience sharing enabled."
-msgstr ""
+msgstr "Kokemuksen jako käytössä."
 
 #: src/net/tmwa/gui/partytab.cpp:170 src/net/tmwa/partyhandler.cpp:183
 msgid "Experience sharing disabled."
-msgstr ""
+msgstr "Kokemuksen jako pois käytöstä."
 
 #: src/net/tmwa/gui/partytab.cpp:173 src/net/tmwa/partyhandler.cpp:189
 msgid "Experience sharing not possible."
-msgstr ""
+msgstr "Kokemuksen jako ei ole mahdollista."
 
 #: src/net/tmwa/gui/partytab.cpp:176
 msgid "Experience sharing unknown."
-msgstr ""
+msgstr "Kokemuksen jaon tila on tuntematon."
 
 #: src/net/tmwa/inventoryhandler.cpp:289
 msgid "Failed to use item."
-msgstr "Esineen käyttö epä-onnistui"
+msgstr "Esineen käyttö epäonnistui."
 
 #: src/net/tmwa/inventoryhandler.cpp:406
 msgid "Unable to equip."
-msgstr ""
+msgstr "Käyttöönotto epäonnistui."
 
 #: src/net/tmwa/inventoryhandler.cpp:417
 msgid "Unable to unequip."
-msgstr ""
+msgstr "Käytöstä poisto epäonnistui."
 
 #: src/net/tmwa/loginhandler.cpp:86
 msgid "Account was not found. Please re-login."
 msgstr "Tunnusta ei löytynyt. Yritä uudelleen."
 
 #: src/net/tmwa/loginhandler.cpp:92
-#, fuzzy
 msgid "New password too short."
 msgstr "Uusi salasana on liian lyhyt."
 
 #: src/net/tmwa/loginhandler.cpp:156
-#, fuzzy
 msgid "Unregistered ID."
-msgstr "Poista palvelimelta"
+msgstr "Rekisteröimätön tunniste."
 
 #: src/net/tmwa/loginhandler.cpp:159
-#, fuzzy
 msgid "Wrong password."
-msgstr "Väärä salasana"
+msgstr "Väärä salasana."
 
 #: src/net/tmwa/loginhandler.cpp:162
 msgid "Account expired."
-msgstr ""
+msgstr "Tili vanhentunut."
 
 #: src/net/tmwa/loginhandler.cpp:165
 msgid "Rejected from server."
-msgstr ""
+msgstr "Palvelin ei kelpuuttanut yhteydenottoasi."
 
 #: 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."
+msgstr "Pääsysi peliin on pysyvästi estetty. Ole hyvä ja ota yhteyttä GM-tiimiin."
 
 #: src/net/tmwa/loginhandler.cpp:172
 #, c-format
@@ -3317,87 +3250,88 @@ 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."
+"Pääsysi peliin on väliaikaisesti estetty %s asti.\n"
+"Ole hyvä ja ota yhteyttä GM-tiimiin keskustelufoorumin kautta."
 
 #: src/net/tmwa/loginhandler.cpp:179
-#, fuzzy
 msgid "This user name is already taken."
-msgstr "Käyttäjänimi on jo käytössä"
+msgstr "Käyttäjätunnus on jo käytössä."
 
 #: src/net/tmwa/network.cpp:145
 msgid "Empty address given to Network::connect()!"
-msgstr ""
+msgstr "Tyhjä osoite Network::connect()-pyynnössä!"
 
+# TODO: report as untranslateable, need percent-s
 #: src/net/tmwa/network.cpp:345
 msgid "Unable to resolve host \""
-msgstr ""
+msgstr "Osoitetta ei löydy: \""
 
 #: src/net/tmwa/network.cpp:414
-#, fuzzy
 msgid "Connection to server terminated. "
-msgstr "Yhdistetään kartta palvelimelle"
+msgstr "Yhteys palvelimeen katkaistu. "
 
 #: src/net/tmwa/partyhandler.cpp:81
 msgid "Could not create party."
-msgstr ""
+msgstr "Ryhmän luonti epäonnistui."
 
 #: src/net/tmwa/partyhandler.cpp:84
 msgid "Party successfully created."
-msgstr ""
+msgstr "Ryhmä luotu."
 
 #: src/net/tmwa/partyhandler.cpp:121
 #, c-format
 msgid "%s is already a member of a party."
-msgstr ""
+msgstr "%s kuuluu jo johonkin ryhmään."
 
 #: src/net/tmwa/partyhandler.cpp:125
 #, c-format
 msgid "%s refused your invitation."
-msgstr ""
+msgstr "%s ei ottanut kutsuasi vastaan."
 
 #: src/net/tmwa/partyhandler.cpp:129
 #, c-format
 msgid "%s is now a member of your party."
-msgstr ""
+msgstr "%s on nyt ryhmäsi jäsen."
 
+# TODO: is it a player or something else?
 #: src/net/tmwa/partyhandler.cpp:133
 #, c-format
 msgid "Unknown invite response for %s."
-msgstr ""
+msgstr "Tuntematon vastaus kutsuun pelaajalle %s."
 
 #: src/net/tmwa/partyhandler.cpp:241
 msgid "You have left the party."
-msgstr ""
+msgstr "Erosit ryhmästä."
 
 #: src/net/tmwa/partyhandler.cpp:252
 #, c-format
 msgid "%s has left your party."
-msgstr ""
+msgstr "%s on eronnut ryhmästä."
 
 #: src/net/tmwa/partyhandler.cpp:304
 #, c-format
 msgid "An unknown member tried to say: %s"
-msgstr ""
+msgstr "Tuntematon jäsen yritti sanoa: %s"
 
 #: src/net/tmwa/partyhandler.cpp:335
 #, c-format
 msgid "Invited user %s to party."
-msgstr ""
+msgstr "Käyttäjä %s kutsuttu ryhmään."
 
 #: src/net/tmwa/partyhandler.cpp:340
 #, c-format
 msgid "Inviting failed, because you can't see a player called %s."
-msgstr ""
+msgstr "Kutsu epäonnistui: et näe käyttäjää %s."
 
+# TODO: typo in msgid: inivte
 #: src/net/tmwa/partyhandler.cpp:345
 msgid "You can only inivte when you are in a party!"
-msgstr ""
+msgstr "Voit kutsua ryhmään vain kun olet siinä itse!"
 
 #: src/net/tmwa/partyhandler.cpp:374
 #, c-format
 msgid "%s is not in your party!"
-msgstr ""
+msgstr "%s ei ole ryhmässäsi!"
 
 #: src/net/tmwa/playerhandler.cpp:109
 msgid "Insert coin to continue."
@@ -3405,79 +3339,82 @@ msgstr "Syötä kolikko jatkaaksesi."
 
 #: src/net/tmwa/playerhandler.cpp:127
 msgid "You're not dead yet. You're just resting."
-msgstr "Sinä et ole kuollut vielä. olet vain lepäämässä."
+msgstr "Et ole kuollut vielä, lepäät vain."
 
 #: src/net/tmwa/playerhandler.cpp:128
 msgid "You are no more."
-msgstr "Sinä et ole enään."
+msgstr "Olet lakannut olemasta."
 
+# NOTE: below: various Monty Pythonesque references, translated quite liberally.
 #: src/net/tmwa/playerhandler.cpp:129
 msgid "You have ceased to be."
-msgstr ""
+msgstr "Olet kuollut kuin päivänkakkaraa pukkaava ex-papukaija."
 
 #: src/net/tmwa/playerhandler.cpp:130
 msgid "You've expired and gone to meet your maker."
-msgstr ""
+msgstr "Olet lähtenyt moikkaamaan luojaasi."
 
 #: src/net/tmwa/playerhandler.cpp:131
 msgid "You're a stiff."
-msgstr ""
+msgstr "Raato mikä raato."
 
 #: src/net/tmwa/playerhandler.cpp:132
 msgid "Bereft of life, you rest in peace."
-msgstr ""
+msgstr "Olet eloton, mutta lepäät rauhassa."
 
 #: src/net/tmwa/playerhandler.cpp:133
 msgid "If you weren't so animated, you'd be pushing up the daisies."
-msgstr ""
+msgstr "Ellet olisi näin liikkuvainen, pukkaisit päivänkakkaraa."
 
 #: src/net/tmwa/playerhandler.cpp:134
 msgid "Your metabolic processes are now history."
-msgstr ""
+msgstr "Aineenvaihduntaprosessisi ovat historiaa."
 
+# Note: very liberal translation.
 #: src/net/tmwa/playerhandler.cpp:135
 msgid "You're off the twig."
-msgstr ""
+msgstr "Olet lopultakin nakkisuojassa."
 
 #: src/net/tmwa/playerhandler.cpp:136
 msgid "You've kicked the bucket."
-msgstr ""
+msgstr "Potkaisit tyhjää."
 
 #: src/net/tmwa/playerhandler.cpp:137
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
-msgstr ""
+msgstr "Olet heittänyt henkesi, poistunut keskuudestamme ja loikannut Tuonelan jokeen."
 
 #: src/net/tmwa/playerhandler.cpp:139
 msgid "You are an ex-player."
-msgstr ""
+msgstr "Olet entinen pelaaja."
 
 #: src/net/tmwa/playerhandler.cpp:140
 msgid "You're pining for the fjords."
-msgstr ""
+msgstr "Kaipaat kotivuonoille."
 
 #: src/net/tmwa/playerhandler.cpp:256 src/net/tmwa/playerhandler.cpp:317
 msgid "Message"
 msgstr "Viesti"
 
+# Screamshot: original: "Painat yli puolet painostasi. Et voi saavuttaa terveyttä enää." o.O
 #: src/net/tmwa/playerhandler.cpp:257
 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ää."
+msgstr "Kannat roinaa yli puolen elopainoasi. Rasitus estää sinua paranemasta."
 
 #: src/net/tmwa/playerhandler.cpp:344
 #, c-format
 msgid "You picked up %s."
-msgstr ""
+msgstr "%s noukittu."
 
 #: src/net/tmwa/playerhandler.cpp:380
 msgid "Cannot raise skill!"
-msgstr ""
+msgstr "Taidon korottaminen epäonnistui!"
 
 #: src/net/tmwa/playerhandler.cpp:543
 msgid "Equip arrows first."
-msgstr ""
+msgstr "Varusta ensin nuolia."
 
 #: src/net/tmwa/specialhandler.cpp:147
 msgid "Trade failed!"
@@ -3485,7 +3422,7 @@ msgstr "Kauppa epäonnistui!"
 
 #: src/net/tmwa/specialhandler.cpp:150
 msgid "Emote failed!"
-msgstr ""
+msgstr "Elehtiminen epäonnistui!"
 
 #: src/net/tmwa/specialhandler.cpp:153
 msgid "Sit failed!"
@@ -3493,35 +3430,36 @@ msgstr "Istuminen epäonnistui!"
 
 #: src/net/tmwa/specialhandler.cpp:156
 msgid "Chat creating failed!"
-msgstr ""
+msgstr "Keskustelun luonti epäonnistui!"
 
 #: src/net/tmwa/specialhandler.cpp:159
 msgid "Could not join party!"
-msgstr ""
+msgstr "Ryhmään liittyminen epäonnistui!"
 
 #: src/net/tmwa/specialhandler.cpp:162
 msgid "Cannot shout!"
-msgstr ""
+msgstr "Huutaminen epäonnistui!"
 
 #: src/net/tmwa/specialhandler.cpp:171
 msgid "You have not yet reached a high enough lvl!"
-msgstr ""
+msgstr "Et ole vielä riittävän korkealla tasolla!"
 
 #: src/net/tmwa/specialhandler.cpp:174
 msgid "Insufficient HP!"
-msgstr ""
+msgstr "Voimapisteesi eivät riitä!"
 
+# TODO: ??? It's MP everywhere else!
 #: src/net/tmwa/specialhandler.cpp:177
 msgid "Insufficient SP!"
-msgstr ""
+msgstr "Manapisteesi eivät riitä!"
 
 #: src/net/tmwa/specialhandler.cpp:180
 msgid "You have no memos!"
-msgstr ""
+msgstr "Sinulla ei ole muistioita (memo)."
 
 #: src/net/tmwa/specialhandler.cpp:183
 msgid "You cannot do that right now!"
-msgstr "Et voi tehdä sitä juuri nyt!"
+msgstr "Et voi tehdä tätä juuri nyt."
 
 #: src/net/tmwa/specialhandler.cpp:186
 msgid "Seems you need more money... ;-)"
@@ -3541,19 +3479,19 @@ msgstr "Tarvitset toisen sinisen helmen."
 
 #: src/net/tmwa/specialhandler.cpp:198
 msgid "You're carrying to much to do this!"
-msgstr ""
+msgstr "Kannat liian paljon tehdäksesi tällaista!"
 
 #: src/net/tmwa/specialhandler.cpp:201
 msgid "Huh? What's that?"
-msgstr ""
+msgstr "Siis mikä?"
 
 #: src/net/tmwa/specialhandler.cpp:210
 msgid "Warp failed..."
-msgstr ""
+msgstr "Siirtymä (warp) epäonnistui..."
 
 #: src/net/tmwa/specialhandler.cpp:213
 msgid "Could not steal anything..."
-msgstr ""
+msgstr "Varastaminen ei onnistunut..."
 
 #: src/net/tmwa/specialhandler.cpp:216
 msgid "Poison had no effect..."
@@ -3561,62 +3499,61 @@ msgstr "Myrkyllä ei ollut vaikutusta..."
 
 #: src/net/tmwa/tradehandler.cpp:124
 msgid "Trading isn't possible. Trade partner is too far away."
-msgstr "Kaupankäynti ei ole mahdollista. kauppa kumppani on liian kaukana."
+msgstr "Kaupanteko ei ole mahdollista. kauppa kumppani on liian kaukana."
 
 #: src/net/tmwa/tradehandler.cpp:128
 msgid "Trading isn't possible. Character doesn't exist."
-msgstr "Kaupankäynti ei ole mahdollista. Hahmoa ei ole."
+msgstr "Kaupanteko ei ole mahdollista. Hahmoa ei ole."
 
 #: src/net/tmwa/tradehandler.cpp:132
 msgid "Trade cancelled due to an unknown reason."
-msgstr "Kauppa keskeytyi tuntemattomasta syystä."
+msgstr "Kaupanteko keskeytyi tuntemattomasta syystä."
 
 #: src/net/tmwa/tradehandler.cpp:137
 #, c-format
 msgid "Trade: You and %s"
-msgstr ""
+msgstr "Kauppa: sinä ja %s"
 
 #: src/net/tmwa/tradehandler.cpp:144
 #, c-format
 msgid "Trade with %s cancelled."
-msgstr ""
+msgstr "Kaupanteko pelaajan %s kanssa peruttu."
 
 #: src/net/tmwa/tradehandler.cpp:153
 msgid "Unhandled trade cancel packet."
-msgstr ""
+msgstr "Käsittelemätön kaupan peruutus -paketti."
 
 #: src/net/tmwa/tradehandler.cpp:202
 msgid "Failed adding item. Trade partner is over weighted."
-msgstr ""
+msgstr "Esineen lisääminen epäonnistui; kauppakumppanilla on liian painava lasti."
 
 #: src/net/tmwa/tradehandler.cpp:207
 msgid "Failed adding item. Trade partner has no free slot."
-msgstr ""
+msgstr "Esineen lisääminen epäonnistui; kauppakumppanilla ei ole tilaa sille."
 
 #: src/net/tmwa/tradehandler.cpp:211
 msgid "Failed adding item for unknown reason."
-msgstr ""
+msgstr "Esineen lisääminen epäonnistui tuntemattomasta syystä."
 
 #: src/playerrelations.cpp:312
-#, fuzzy
 msgid "Completely ignore"
-msgstr "Valmis"
+msgstr "Jätä täysin huomiotta"
 
 #: src/playerrelations.cpp:326
 msgid "Print '...'"
-msgstr ""
+msgstr "Tulosta '...'"
 
 #: src/playerrelations.cpp:342
 msgid "Blink name"
-msgstr ""
+msgstr "Vilkuta nimeä"
 
 #: src/playerrelations.cpp:379
 msgid "Floating '...' bubble"
-msgstr ""
+msgstr "Leijuva '...' -puhekupla"
 
 #: src/playerrelations.cpp:382
 msgid "Floating bubble"
-msgstr ""
+msgstr "Leijuva puhekupla"
 
 #: src/resources/itemdb.cpp:53
 #, c-format
@@ -3628,24 +3565,26 @@ msgstr "Hyökkäys %+d"
 msgid "Defense %+d"
 msgstr "Puolustus %+d"
 
+# VP: voimapisteet
 #: src/resources/itemdb.cpp:55
 #, c-format
 msgid "HP %+d"
-msgstr "Iskupisteet %+d"
+msgstr "VP %+d"
 
+# MP: manapisteet (ei taikapisteet, ollaanhan MANA worldissa!)
 #: src/resources/itemdb.cpp:56
 #, c-format
 msgid "MP %+d"
-msgstr "Taikapisteet %+d"
+msgstr "MP %+d"
 
 #: src/resources/itemdb.cpp:117
 msgid "Unknown item"
-msgstr ""
+msgstr "Tuntematon esine"
 
 #: src/resources/itemdb.cpp:162 src/resources/monsterdb.cpp:74
 #: src/resources/monsterinfo.cpp:29
 msgid "unnamed"
-msgstr ""
+msgstr "nimetön"
 
 #~ msgid "Text Shadow"
 #~ msgstr "Tekstin varjo"
@@ -3656,10 +3595,6 @@ msgstr ""
 #~ msgid "Highlight"
 #~ msgstr "Korostus"
 
-#, fuzzy
-#~ msgid "Item Too Expensive"
-#~ msgstr "Esine on liian kallis"
-
 #~ msgid "Player"
 #~ msgstr "Pelaaja"
 
@@ -3696,14 +3631,6 @@ msgstr ""
 #~ msgid "Ammo"
 #~ msgstr "Panokset"
 
-#, fuzzy
-#~ msgid "Access denied."
-#~ msgstr "Pääsy evätty"
-
-#, fuzzy
-#~ msgid "Unknown failure to select character."
-#~ msgstr "Hahmon poisto epäonnistui"
-
 #~ msgid "Willpower:"
 #~ msgstr "Tahdonvoima:"
 
diff --git a/po/fr.po b/po/fr.po
index b15b2d33..2d60bdab 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -4,26 +4,23 @@
 # Guillaume Melquiond <guillaume.melquiond@gmail.com>, 2007.
 #
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2011-02-20 14:34+0100\n"
-"PO-Revision-Date: 2011-01-11 22:42+0100\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"#-#-#-#-#  fr.po (The Mana World 0.1.0)  #-#-#-#-#\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"
-"#-#-#-#-#  po_fr rewiew1.po (The Mana World 0.1.0)  #-#-#-#-#\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"
@@ -44,27 +41,23 @@ msgstr "     --no-opengl : Désactive l'OpenGL pour cette session"
 
 #: ../src/main.cpp:58
 msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr "      --screenshot-dir : Répertoire à utiliser pour les imprime-écrans"
+msgstr "      --screenshot-dir : Répertoire à utiliser pour les impressions écrans"
 
 #: ../src/main.cpp:52
 msgid "     --update-host    : Use this update host"
-msgstr ""
-"     --update-host : Utilise cette URL pour les fichiers de mises à jour"
+msgstr "     --update-host : Utilise cette URL pour les mises à jour"
 
 #: ../src/main.cpp:46
 msgid "  -C --config-dir     : Configuration directory to use"
-msgstr "  -C --config-dir : Répertoire de configuration à utiliser"
+msgstr "  -C --config-dir : Répertoire de configuration a utiliser"
 
 #: ../src/main.cpp:53
 msgid "  -D --default        : Choose default character server and character"
-msgstr ""
-"  -D --default : Choisir le serveur de personnages et le personnage par "
-"défaut"
+msgstr "  -D --default : Choisir le serveur de personnages par défaut et le personnage"
 
 #: ../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"
+msgstr "  -L --localdata-dir : Répertoire à utiliser comme répertoire local"
 
 #: ../src/main.cpp:48
 msgid "  -P --password       : Login with this password"
@@ -76,7 +69,7 @@ msgstr "  -U --username : Se connecter avec ce nom d'utilisateur"
 
 #: ../src/main.cpp:49
 msgid "  -c --character      : Login with this character"
-msgstr "  -c --character : Se connecter avec ce personnage"
+msgstr "  -c --character : Se connecter avec ce nom de personnage"
 
 #: ../src/main.cpp:56
 msgid "  -d --data           : Directory to load game data from"
@@ -96,8 +89,7 @@ msgstr "  -s --server : Nom du serveur (ou IP) pour la connexion"
 
 #: ../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"
+msgstr "  -u --skip-update : Ne pas effectuer le téléchargement des mises à jour"
 
 #: ../src/main.cpp:44
 msgid "  -v --version        : Display the version"
@@ -116,21 +108,22 @@ msgid "##1  you try again later."
 msgstr "##1 Essayez à nouveau plus tard"
 
 #: ../src/net/tmwa/generalhandler.cpp:228
-#, fuzzy, c-format
+#, no-c-format
 msgid "% Accuracy"
 msgstr "% Précision"
 
 #: ../src/net/tmwa/generalhandler.cpp:230
-#, c-format
+#, no-c-format
 msgid "% Critical"
 msgstr "% Coup critique"
 
 #: ../src/net/tmwa/generalhandler.cpp:229
-#, c-format
+#, no-c-format
 msgid "% Evade"
 msgstr "% Esquive"
 
-#: ../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 "%d FPS"
@@ -140,7 +133,8 @@ msgstr "%d FPS"
 msgid "%d FPS (OpenGL)"
 msgstr "%d FPS (OpenGL)"
 
-#: ../src/client.cpp:1102 ../src/client.cpp:1125
+#: ../src/client.cpp:1102
+#: ../src/client.cpp:1125
 #, 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."
@@ -196,13 +190,9 @@ msgid "%s is now a member of your party."
 msgstr "%s est maintenant membre de votre groupe."
 
 #: ../src/net/manaserv/partyhandler.cpp:106
-#, fuzzy, c-format
+#, 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."
+msgstr "%s a rejoint le groupe."
 
 #: ../src/net/manaserv/chathandler.cpp:296
 #, c-format
@@ -217,7 +207,7 @@ msgstr "%s a refusé votre invitation."
 #: ../src/net/manaserv/partyhandler.cpp:123
 #, c-format
 msgid "%s rejected your invite."
-msgstr "%s a refusé votre invitation."
+msgstr "%s a décliné votre invitation."
 
 #: ../src/net/manaserv/tradehandler.cpp:117
 #: ../src/net/tmwa/tradehandler.cpp:108
@@ -230,22 +220,27 @@ msgstr "%s souhaite réaliser un échange avec vous. Acceptez-vous ?"
 msgid "%s whispers: %s"
 msgstr "Message privé de %s : %s"
 
-#: ../src/gui/charselectdialog.cpp:392 ../src/gui/charselectdialog.cpp:393
+#: ../src/gui/charselectdialog.cpp:392
+#: ../src/gui/charselectdialog.cpp:393
 msgid "(empty)"
 msgstr "(vide)"
 
 #: ../src/commandhandler.cpp:222
 msgid "*** only available to a GM ***"
-msgstr "*** uniquement disponible pour les MJ ***"
+msgstr "*** uniquement disponible pour les GM ***"
 
-#: ../src/gui/buy.cpp:74 ../src/gui/itemamount.cpp:102
-#: ../src/gui/npcdialog.cpp:104 ../src/gui/sell.cpp:74
+#: ../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 "+"
 
-#: ../src/gui/buy.cpp:77 ../src/gui/itemamount.cpp:101
-#: ../src/gui/npcdialog.cpp:105 ../src/gui/sell.cpp:75
+#: ../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 "-"
@@ -256,20 +251,19 @@ msgstr "-- Aide --"
 
 #: ../src/commandhandler.cpp:201
 msgid "/announce > Global announcement (GM only)"
-msgstr "/announce > Annonce globale (MJ uniquement)"
+msgstr "/announce > Annonce globale (GM uniquement)"
 
 #: ../src/commandhandler.cpp:182
 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."
+msgstr "/away > Indiquer aux autres joueurs que vous n'êtes actuellement pas actif."
 
 #: ../src/commandhandler.cpp:173
 msgid "/clear > Clears this window"
-msgstr "/clear > Vide cette fenêtre"
+msgstr "/clear > Vider cette fenêtre"
 
 #: ../src/gui/widgets/whispertab.cpp:73
 msgid "/close > Close the whisper tab"
-msgstr "/close > Ferme l'onglet de conversation privée"
+msgstr "/close > Fermer l'onglet de conversation privée"
 
 #: ../src/commandhandler.cpp:191
 msgid "/createparty > Create a new party"
@@ -277,19 +271,20 @@ msgstr "/createparty > Créer un nouveau groupe"
 
 #: ../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"
+msgstr "/exp > Afficher / Modifier les préférences d'expérience du groupe"
 
 #: ../src/commandhandler.cpp:167
 msgid "/help > Display this help"
 msgstr "/help > Montre l'aide"
 
-#: ../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 "/help > Affiche cette aide."
+msgstr "/help > Afficher cette aide."
 
 #: ../src/gui/widgets/whispertab.cpp:71
 msgid "/ignore > Ignore the other player"
-msgstr "/ignore > Ignore l'autre joueur"
+msgstr "/ignore > Ignorer l'autre joueur"
 
 #: ../src/commandhandler.cpp:185
 msgid "/ignore > ignore a player"
@@ -297,15 +292,15 @@ msgstr "/ignore > Ignore un joueur"
 
 #: ../src/net/tmwa/gui/guildtab.cpp:62
 msgid "/invite > Invite a player to your guild"
-msgstr "/invite > Invite un joueur à rejoindre votre guilde"
+msgstr "/invite > Inviter un joueur à rejoindre votre guilde"
 
 #: ../src/net/tmwa/gui/partytab.cpp:60
 msgid "/invite > Invite a player to your party"
-msgstr "/invite > Invite un joueur à rejoindre votre groupe"
+msgstr "/invite > Inviter un joueur à rejoindre votre groupe"
 
 #: ../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"
+msgstr "/item > Afficher / Modifier les préférences d'échange d'objet du groupe"
 
 #: ../src/commandhandler.cpp:189
 msgid "/join > Join or create a channel"
@@ -325,15 +320,15 @@ msgstr "/kick > Sortir quelqu'un du groupe dont vous faites partie"
 
 #: ../src/net/tmwa/gui/guildtab.cpp:63
 msgid "/leave > Leave the guild you are in"
-msgstr "/leave > Quitter la guilde courante"
+msgstr "/leave > Quitter la guilde à laquelle vous appartenez"
 
 #: ../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"
+msgstr "/leave > Quitter le groupe dans lequel vous vous trouvez"
 
 #: ../src/commandhandler.cpp:188
 msgid "/list > Display all public channels"
-msgstr "/list > Affiche une liste de tous les salons publics"
+msgstr "/list > Afficher une liste de tous les salons publics"
 
 #: ../src/commandhandler.cpp:171
 msgid "/me > Tell something about yourself"
@@ -341,7 +336,7 @@ msgstr "/me > Dire quelque chose à votre propos"
 
 #: ../src/commandhandler.cpp:175
 msgid "/msg > Send a private message to a user"
-msgstr "/msg > Envoie un message privé à un utilisateur"
+msgstr "/msg > Envoyer un message privé à un utilisateur"
 
 #: ../src/gui/widgets/channeltab.cpp:52
 msgid "/op > Make a user a channel operator"
@@ -349,13 +344,11 @@ msgstr "/op > Faire de l'utilisateur un opérateur du salon"
 
 #: ../src/commandhandler.cpp:192
 msgid "/party > Invite a user to party"
-msgstr "/party > Invite un utilisateur dans un groupe"
+msgstr "/party > Inviter un utilisateur dans un groupe"
 
 #: ../src/commandhandler.cpp:198
 msgid "/present > Get list of players present (sent to chat log, if logging)"
-msgstr ""
-"/present > Obtiens la liste des joueurs présents (envoyée dans l'historique "
-"du tchat s'il a été activé)"
+msgstr "/present > Obtenir la liste des joueurs présents (envoyée dans l'historique du tchat s'il a été activé)"
 
 #: ../src/commandhandler.cpp:180
 msgid "/q > Alias of query"
@@ -363,9 +356,7 @@ msgstr "/q > Alias de query"
 
 #: ../src/commandhandler.cpp:178
 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"
+msgstr "/query > Crée un nouvel onglet pour vos messages privés avec un autre utilisateur"
 
 #: ../src/gui/widgets/channeltab.cpp:51
 msgid "/quit > Leave a channel"
@@ -373,29 +364,27 @@ msgstr "/quit > Quitter un salon"
 
 #: ../src/commandhandler.cpp:194
 msgid "/record > Start recording the chat to an external file"
-msgstr ""
-"/record > Commence à enregistrer la conversation dans un fichier externe"
+msgstr "/record > Commencer à enregistrer la conversation dans un fichier externe"
 
 #: ../src/commandhandler.cpp:196
 msgid "/toggle > Determine whether <return> toggles the chat log"
-msgstr ""
-"/toggle > Détermine si la touche <entrée> bascule l'historique du tchat"
+msgstr "/toggle > Déterminer si la touche <entrée> basculera l'historique du tchat"
 
 #: ../src/gui/widgets/channeltab.cpp:50
 msgid "/topic > Set the topic of the current channel"
-msgstr "/topic > Change le sujet du salon"
+msgstr "/topic > Changer le sujet du salon"
 
 #: ../src/gui/widgets/whispertab.cpp:72
 msgid "/unignore > Stop ignoring the other player"
-msgstr "/unignore > Cesse d'ignorer l'autre joueur"
+msgstr "/unignore > Cesser d'ignorer l'autre joueur"
 
 #: ../src/commandhandler.cpp:186
 msgid "/unignore > stop ignoring a player"
-msgstr "/unignore > Cesse d'ignorer un joueur"
+msgstr "/unignore > Cesser d'ignorer un joueur"
 
 #: ../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"
+msgstr "/users > Afficher la liste des utilisateurs de ce salon"
 
 #: ../src/commandhandler.cpp:177
 msgid "/w > Alias of msg"
@@ -403,7 +392,7 @@ msgstr "/w > Alias de msg"
 
 #: ../src/commandhandler.cpp:169
 msgid "/where > Display map name"
-msgstr "/where > Affiche le nom de la carte"
+msgstr "/where > Afficher le nom de la carte et vos coordonées de position"
 
 #: ../src/commandhandler.cpp:176
 msgid "/whisper > Alias of msg"
@@ -411,43 +400,34 @@ msgstr "/whisper > Alias de msg"
 
 #: ../src/commandhandler.cpp:170
 msgid "/who > Display number of online users"
-msgstr "/who > Affiche le nombre d'utilisateurs en ligne"
+msgstr "/who > Afficher le nombre d'utilisateurs en ligne"
 
-#: ../src/gui/charcreatedialog.cpp:73 ../src/gui/charcreatedialog.cpp:76
+#: ../src/gui/charcreatedialog.cpp:73
+#: ../src/gui/charcreatedialog.cpp:76
 #: ../src/gui/outfitwindow.cpp:66
 msgid "<"
 msgstr "<"
 
 #: ../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."
+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/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 ""
-"<préférences> peut être \"1\", \"yes\", \"true\" pour activer l'échange "
-"d'objet, ou \"0\", \"no\", \"false\" pour le désactiver."
+msgid "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or \"0\", \"no\", \"false\" to disable item sharing."
+msgstr "<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:309
-msgid ""
-"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
-"\"0\", \"no\", \"false\" to turn the toggle off."
-msgstr ""
-"<state> peut être en position \"1\", \"yes\", \"true\" pour activer le "
-"bouton sur marche, ou \"0\", \"no\", \"false\" pour désactiver le bouton."
+msgid "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0\", \"no\", \"false\" to turn the toggle off."
+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/gui/charcreatedialog.cpp:70 ../src/gui/charcreatedialog.cpp:75
+#: ../src/gui/charcreatedialog.cpp:70
+#: ../src/gui/charcreatedialog.cpp:75
 #: ../src/gui/outfitwindow.cpp:67
 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:153
 msgid "???"
 msgstr "???"
 
@@ -506,7 +486,8 @@ msgstr "Compte non connecté. Identifiez-vous tout d'abord."
 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
+#: ../src/gui/changeemaildialog.cpp:49
+#: ../src/gui/changepassworddialog.cpp:52
 #, c-format
 msgid "Account: %s"
 msgstr "Compte : %s"
@@ -519,15 +500,18 @@ msgstr "Ajouter"
 msgid "Add name to chat"
 msgstr "Ajouter les noms dans le flux de conversation"
 
-#: ../src/gui/popupmenu.cpp:190 ../src/gui/popupmenu.cpp:378
+#: ../src/gui/popupmenu.cpp:190
+#: ../src/gui/popupmenu.cpp:378
 msgid "Add to chat"
 msgstr "Ajouter à la conversation"
 
-#: ../src/net/manaserv/stats.cpp:68 ../src/net/tmwa/generalhandler.cpp:218
+#: ../src/net/manaserv/stats.cpp:68
+#: ../src/net/tmwa/generalhandler.cpp:218
 msgid "Agility"
 msgstr "Agilité"
 
-#: ../src/net/manaserv/stats.cpp:70 ../src/net/tmwa/generalhandler.cpp:102
+#: ../src/net/manaserv/stats.cpp:70
+#: ../src/net/tmwa/generalhandler.cpp:102
 #, c-format
 msgid "Agility %+d"
 msgstr "Agilité %+d"
@@ -590,17 +574,11 @@ msgstr "Appliquer"
 
 #: ../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."
+msgstr "Le changement OpenGL ne sera pris en compte qu'au prochain démarrage du jeu."
 
 #: ../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\"."
+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/charselectdialog.cpp:70
 msgid "Are you sure you want to delete this character?"
@@ -620,23 +598,25 @@ msgstr "Êtes-vous sûr de vouloir quitter le groupe %s ?"
 msgid "Assign"
 msgstr "Assigner"
 
-#: ../src/keyboardconfig.cpp:44 ../src/net/tmwa/generalhandler.cpp:224
+#: ../src/keyboardconfig.cpp:44
+#: ../src/net/tmwa/generalhandler.cpp:224
 msgid "Attack"
-msgstr "Attaquer"
+msgstr "Attaque"
 
 #: ../src/resources/itemdb.cpp:53
 #, c-format
 msgid "Attack %+d"
 msgstr "Attaque %+d"
 
-#: ../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 "Attaquer %s"
+msgstr "Attaque %s"
 
 #: ../src/gui/chat.cpp:325
 msgid "Attendance written to record log."
-msgstr "Présence inscrite dans le fichier d'enregistrement."
+msgstr "Présence dans le jeu inscrite dans le fichier d'enregistrement."
 
 #: ../src/gui/setup_audio.cpp:47
 msgid "Audio"
@@ -665,7 +645,7 @@ msgstr "Privé de toute essence de vie, vous reposez en paix."
 
 #: ../src/playerrelations.cpp:342
 msgid "Blink name"
-msgstr "Fais clignoter le nom"
+msgstr "Faire clignoter le nom"
 
 #: ../src/gui/setup_colors.cpp:138
 msgid "Blue:"
@@ -679,63 +659,65 @@ msgstr "Bulles avec noms"
 msgid "Bubbles, no names"
 msgstr "Bulles, sans noms"
 
-#: ../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 "Acheter"
 
-#: ../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 "Calibrer"
 
-#: ../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/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/commandhandler.cpp:422
 #, 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 "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/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."
+msgstr "Vous ne pouvez pas créer un groupe. Vous faites déjà partie d'un groupe."
 
 #: ../src/net/tmwa/playerhandler.cpp:380
 msgid "Cannot raise skill!"
-msgstr "Ne peut pas augmenter la capacité !"
+msgstr "Ne peut pas augmenter la compétence !"
 
 #: ../src/gui/widgets/whispertab.cpp:52
 msgid "Cannot send empty chat!"
-msgstr "Impossible d'envoyer une conversation vide !"
+msgstr "Impossible de créer une conversation sans mot !"
 
 #: ../src/commandhandler.cpp:401
 msgid "Cannot send empty whispers!"
-msgstr "Vous ne pouvez pas envoyer des messages privés vides !"
+msgstr "Vous ne pouvez pas envoyer des messages privés sans avoir écrit une phrase !"
 
 #: ../src/net/tmwa/specialhandler.cpp:162
 msgid "Cannot shout!"
 msgstr "Vous ne pouvez pas crier !"
 
 #: ../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."
+msgstr "Impossible d'utiliser cette Identification."
 
 #: ../src/gui/trade.cpp:102
 msgid "Change"
@@ -745,7 +727,8 @@ msgstr "Changer"
 msgid "Change Email"
 msgstr "Modifier l'adresse email"
 
-#: ../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 "Modifier l'adresse mail"
 
@@ -754,7 +737,8 @@ msgid "Change Login"
 msgstr "Changer de 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:128
 msgid "Change Password"
 msgstr "Changer le mot de passe"
 
@@ -764,28 +748,30 @@ msgstr "Changer de Serveur"
 
 #: ../src/gui/setup_video.cpp:616
 msgid "Changes will take effect on map change."
-msgstr "Les changements seront appliqués au changement de carte."
+msgstr "Les changements seront appliqués au prochain changement de carte."
 
 #: ../src/client.cpp:813
 msgid "Changing game servers"
-msgstr "Changement de serveur de jeu"
+msgstr "Changement de serveur de jeu en cours"
 
 #: ../src/gui/setup_video.cpp:460
 msgid "Changing to OpenGL"
-msgstr "Activation d'OpenGL"
+msgstr "Passage à OpenGL"
 
 #: ../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/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
+msgstr "Seuls les opérateurs du salon peuvent sortir des utilisateurs et donner les droit d'opérateur aux autres utilisateurs du salon."
+
+#: ../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 !"
+msgstr "Les salons ne sont pas opérationnels !"
 
 #: ../src/net/tmwa/charserverhandler.cpp:150
 msgid "Character deleted."
@@ -830,7 +816,7 @@ msgstr "Choisir"
 
 #: ../src/gui/worldselectdialog.cpp:77
 msgid "Choose World"
-msgstr "Choix du monde"
+msgstr "Choisir le monde"
 
 #: ../src/gui/serverdialog.cpp:196
 msgid "Choose Your Server"
@@ -838,29 +824,27 @@ msgstr "Choisissez le serveur"
 
 #: ../src/gui/socialwindow.cpp:544
 msgid "Choose your guild's name."
-msgstr "Choisissez le nom de la guilde."
+msgstr "Choisissez le nom de votre guilde."
 
 #: ../src/gui/socialwindow.cpp:630
 msgid "Choose your party's name."
-msgstr "Choisissez le nom du groupe."
+msgstr "Choisissez le nom de votre groupe."
 
 #: ../src/gui/npcdialog.cpp:98
 msgid "Clear log"
 msgstr "Effacer le log"
 
 #: ../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."
+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/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/help.cpp:51 ../src/gui/npcdialog.cpp:47
+#: ../src/gui/help.cpp:51
+#: ../src/gui/npcdialog.cpp:47
 msgid "Close"
 msgstr "Fermer"
 
@@ -870,7 +854,7 @@ msgstr "Couleurs"
 
 #: ../src/commandhandler.cpp:221
 msgid "Command: /announce <msg>"
-msgstr "Commande : /announce <msg>"
+msgstr "Commande : /announce <message>"
 
 #: ../src/commandhandler.cpp:274
 msgid "Command: /away"
@@ -916,9 +900,10 @@ msgstr "Commande : /ignore"
 msgid "Command: /ignore <player>"
 msgstr "Commande : /ignore <joueur>"
 
-#: ../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 "Commande : /invite <nick>"
+msgstr "Commande : /invite <nom du personnage>"
 
 #: ../src/net/tmwa/gui/partytab.cpp:90
 msgid "Command: /item"
@@ -934,9 +919,10 @@ msgstr "Commande : /join <channel>"
 
 #: ../src/gui/widgets/channeltab.cpp:89
 msgid "Command: /kick <nick>"
-msgstr "Commande : /kick <nick>"
+msgstr "Commande : /kick <nom du personnage>"
 
-#: ../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 "Commande : /leave"
 
@@ -950,15 +936,15 @@ msgstr "Commande : /me <message>"
 
 #: ../src/commandhandler.cpp:255
 msgid "Command: /msg <nick> <message>"
-msgstr "Commande : /msg <nick> <message>"
+msgstr "Commande : /msg <nom du personnage> <message>"
 
 #: ../src/gui/widgets/channeltab.cpp:80
 msgid "Command: /op <nick>"
-msgstr "Commande : /op <nick>"
+msgstr "Commande : /op <nom du personnage>"
 
 #: ../src/commandhandler.cpp:284
 msgid "Command: /party <nick>"
-msgstr "Commande : /party <nick>"
+msgstr "Commande : /party <nom du personnage>"
 
 #: ../src/commandhandler.cpp:291
 msgid "Command: /present"
@@ -966,11 +952,11 @@ msgstr "Commande : /present"
 
 #: ../src/commandhandler.cpp:265
 msgid "Command: /q <nick>"
-msgstr "Commande : /q <nick>"
+msgstr "Commande : /q <nom du personnage>"
 
 #: ../src/commandhandler.cpp:264
 msgid "Command: /query <nick>"
-msgstr "Commande : /query <nick>"
+msgstr "Commande : /query <nom du personnage>"
 
 #: ../src/gui/widgets/channeltab.cpp:73
 msgid "Command: /quit"
@@ -982,7 +968,7 @@ msgstr "Commande : /record"
 
 #: ../src/commandhandler.cpp:298
 msgid "Command: /record <filename>"
-msgstr "Commande : /record <filename>"
+msgstr "Commande : /record <nom du fichier>"
 
 #: ../src/commandhandler.cpp:312
 msgid "Command: /toggle"
@@ -990,13 +976,14 @@ msgstr "Commande : /toggle"
 
 #: ../src/commandhandler.cpp:306
 msgid "Command: /toggle <state>"
-msgstr "Command: /toggle <state>"
+msgstr "Command: /toggle <état>"
 
 #: ../src/gui/widgets/channeltab.cpp:68
 msgid "Command: /topic <message>"
 msgstr "Commande: /topic <message>"
 
-#: ../src/commandhandler.cpp:317 ../src/gui/widgets/whispertab.cpp:94
+#: ../src/commandhandler.cpp:317
+#: ../src/gui/widgets/whispertab.cpp:94
 msgid "Command: /unignore <player>"
 msgstr "Commande : /unignore <joueur>"
 
@@ -1006,7 +993,7 @@ msgstr "Commande : /users"
 
 #: ../src/commandhandler.cpp:257
 msgid "Command: /w <nick> <message>"
-msgstr "Commande : /w <nick> <message>"
+msgstr "Commande : /w <nom du personnage> <message>"
 
 #: ../src/commandhandler.cpp:323
 msgid "Command: /where"
@@ -1014,7 +1001,7 @@ msgstr "Commande : /where"
 
 #: ../src/commandhandler.cpp:256
 msgid "Command: /whisper <nick> <message>"
-msgstr "Commande : /whisper <nick> <message>"
+msgstr "Commande : /whisper <nom du personnage> <message>"
 
 #: ../src/commandhandler.cpp:328
 msgid "Command: /who"
@@ -1047,12 +1034,8 @@ msgstr "Confirmé. En attente..."
 
 #: ../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."
+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/serverdialog.cpp:233
 msgid "Connect"
@@ -1093,7 +1076,7 @@ msgstr "Le groupe n'a pu être créé."
 
 #: ../src/net/tmwa/guildhandler.cpp:295
 msgid "Could not inivte user to guild."
-msgstr "N'a pas pu inviter le joueur dans la guilde. "
+msgstr "Vous n'avez pas pu inviter le joueur dans la guilde. "
 
 #: ../src/net/tmwa/specialhandler.cpp:159
 msgid "Could not join party!"
@@ -1103,20 +1086,22 @@ msgstr "Vous n'avez pas pu rejoindre le groupe !"
 msgid "Could not steal anything..."
 msgstr "Vous n'avez rien pu voler..."
 
-#: ../src/gui/charcreatedialog.cpp:78 ../src/gui/charselectdialog.cpp:390
+#: ../src/gui/charcreatedialog.cpp:78
+#: ../src/gui/charselectdialog.cpp:390
 #: ../src/gui/socialwindow.cpp:333
 msgid "Create"
 msgstr "Créer"
 
 #: ../src/gui/charcreatedialog.cpp:53
 msgid "Create Character"
-msgstr "Création du personnage"
+msgstr "Créer votre personnage"
 
 #: ../src/gui/socialwindow.cpp:276
 msgid "Create Guild"
 msgstr "Créer une Guilde"
 
-#: ../src/gui/socialwindow.cpp:277 ../src/gui/socialwindow.cpp:623
+#: ../src/gui/socialwindow.cpp:277
+#: ../src/gui/socialwindow.cpp:623
 msgid "Create Party"
 msgstr "Créer un groupe"
 
@@ -1127,7 +1112,7 @@ msgstr "La guilde %s a été créée."
 
 #: ../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."
+msgstr "La création de la guilde a échoué, veuillez choisir un nom plus court."
 
 #: ../src/gui/socialwindow.cpp:529
 #, c-format
@@ -1136,24 +1121,25 @@ msgstr "Le groupe %s a été créé."
 
 #: ../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."
+msgstr "La création du groupe a échoué, veuillez choisir un nom plus court."
 
 #: ../src/gui/userpalette.cpp:105
 msgid "Critical Hit"
 msgstr "Coup critique"
 
-#: ../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 "Curseur : (%d, %d)"
 
 #: ../src/gui/serverdialog.cpp:234
 msgid "Custom Server"
-msgstr "Serveur personnalisé"
+msgstr "Personnaliserun serveur"
 
 #: ../src/gui/setup_video.cpp:221
 msgid "Custom cursor"
-msgstr "Curseur personnalisé"
+msgstr "Personnaliser le curseur"
 
 #: ../src/gui/setup_video.cpp:468
 msgid "Deactivating OpenGL"
@@ -1161,11 +1147,11 @@ msgstr "Désactiver OpenGL"
 
 #: ../src/gui/debugwindow.cpp:43
 msgid "Debug"
-msgstr "Debug"
+msgstr "Informations"
 
 #: ../src/keyboardconfig.cpp:79
 msgid "Debug Window"
-msgstr "Fenêtre de debug"
+msgstr "Fenêtre d'informations"
 
 #: ../src/gui/setup_keyboard.cpp:94
 msgid "Default"
@@ -1184,16 +1170,19 @@ msgstr "Défense %+d"
 msgid "Delay:"
 msgstr "Délai : "
 
-#: ../src/gui/charselectdialog.cpp:336 ../src/gui/serverdialog.cpp:235
+#: ../src/gui/charselectdialog.cpp:336
+#: ../src/gui/serverdialog.cpp:235
 #: ../src/gui/setup_players.cpp:228
 msgid "Delete"
 msgstr "Supprimer"
 
-#: ../src/net/manaserv/stats.cpp:80 ../src/net/tmwa/generalhandler.cpp:221
+#: ../src/net/manaserv/stats.cpp:80
+#: ../src/net/tmwa/generalhandler.cpp:221
 msgid "Dexterity"
 msgstr "Dextérité"
 
-#: ../src/net/manaserv/stats.cpp:82 ../src/net/tmwa/generalhandler.cpp:105
+#: ../src/net/manaserv/stats.cpp:82
+#: ../src/net/tmwa/generalhandler.cpp:105
 #, c-format
 msgid "Dexterity %+d"
 msgstr "Dextérité %+d"
@@ -1204,12 +1193,12 @@ msgstr "Dextérité :"
 
 #: ../src/gui/setup_video.cpp:249
 msgid "Disable transparency (Low CPU mode)"
-msgstr "Désactiver la transparence (Faibles CPUs)"
+msgstr "Désactiver la transparence (Faible usage du CPU)"
 
 #: ../src/gui/popupmenu.cpp:105
 #, c-format
 msgid "Disregard %s"
-msgstr "Ignorer %s"
+msgstr "Négliger %s"
 
 #: ../src/gui/setup_players.cpp:66
 msgid "Disregarded"
@@ -1218,7 +1207,7 @@ msgstr "Négligé"
 #: ../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 ?"
+msgstr "Voulez-vous que vos biens soient identifiés et envoyés à votre famille ?"
 
 #: ../src/gui/setup_audio.cpp:43
 msgid "Download music"
@@ -1229,11 +1218,13 @@ msgstr "Télécharger la musique"
 msgid "Downloading server list...%2.2f%%"
 msgstr "Téléchargement de la liste des serveurs...%2.2f%%"
 
-#: ../src/gui/inventorywindow.cpp:325 ../src/gui/popupmenu.cpp:365
+#: ../src/gui/inventorywindow.cpp:325
+#: ../src/gui/popupmenu.cpp:365
 msgid "Drop"
 msgstr "Jeter"
 
-#: ../src/gui/inventorywindow.cpp:99 ../src/gui/inventorywindow.cpp:323
+#: ../src/gui/inventorywindow.cpp:99
+#: ../src/gui/inventorywindow.cpp:323
 #: ../src/gui/popupmenu.cpp:363
 msgid "Drop..."
 msgstr "Jeter..."
@@ -1258,12 +1249,18 @@ msgstr "L'adresse email a été changé avec succès !"
 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: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"
@@ -1282,7 +1279,7 @@ msgstr "Une adresse vide a été donnée à la commande Network::connect() !"
 
 #: ../src/gui/setup_joystick.cpp:39
 msgid "Enable joystick"
-msgstr "Activer le joystick"
+msgstr "Activer la manette de jeu"
 
 #: ../src/keyboardconfig.cpp:56
 msgid "Enable/Disable Trading"
@@ -1290,7 +1287,7 @@ msgstr "Activer / Désactiver les échanges"
 
 #: ../src/net/manaserv/chathandler.cpp:219
 msgid "End of channel list."
-msgstr "Fin de la liste du canal."
+msgstr "Fin de la liste des salons."
 
 #: ../src/gui/changepassworddialog.cpp:110
 msgid "Enter the old password first."
@@ -1300,7 +1297,8 @@ msgstr "Entrez d'abord l'ancien mot de passe."
 msgid "Entering game world"
 msgstr "Connexion au monde de jeu"
 
-#: ../src/gui/inventorywindow.cpp:85 ../src/gui/inventorywindow.cpp:315
+#: ../src/gui/inventorywindow.cpp:85
+#: ../src/gui/inventorywindow.cpp:315
 #: ../src/gui/popupmenu.cpp:357
 msgid "Equip"
 msgstr "Équiper"
@@ -1309,7 +1307,8 @@ msgstr "Équiper"
 msgid "Equip arrows first."
 msgstr "Equiper en premier les flèches"
 
-#: ../src/gui/equipmentwindow.cpp:69 ../src/gui/windowmenu.cpp:55
+#: ../src/gui/equipmentwindow.cpp:69
+#: ../src/gui/windowmenu.cpp:55
 msgid "Equipment"
 msgstr "Équipement"
 
@@ -1317,11 +1316,16 @@ msgstr "Équipement"
 msgid "Equipment Window"
 msgstr "Fenêtre d'équipements."
 
-#: ../src/client.cpp:842 ../src/client.cpp:849 ../src/client.cpp:984
+#: ../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/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
@@ -1332,17 +1336,18 @@ msgstr "Erreur"
 msgid "Error creating guild."
 msgstr "Erreur lors de la création de la guilde."
 
-#: ../src/client.cpp:1278 ../src/client.cpp:1284
+#: ../src/client.cpp:1278
+#: ../src/client.cpp:1284
 msgid "Error creating updates directory!"
 msgstr "Impossible de créer le dossier de mise à jour !"
 
 #: ../src/net/manaserv/chathandler.cpp:201
 msgid "Error joining channel."
-msgstr "Erreur lors de la tentative d'entrée dans le canal."
+msgstr "Erreur lors de la tentative d'entrée dans le salon."
 
 #: ../src/gui/serverdialog.cpp:456
 msgid "Error retreiving server list!"
-msgstr "Erreur lors du téléchargement de la liste !"
+msgstr "Erreur lors de la récupération de la liste des serveurs !"
 
 #: ../src/game.cpp:951
 #, c-format
@@ -1361,15 +1366,18 @@ msgstr "Information d'expérience"
 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:183
 msgid "Experience sharing disabled."
-msgstr "Partage d'expérience non authorisé."
+msgstr "Partage d'expérience non activé."
 
-#: ../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:177
 msgid "Experience sharing enabled."
-msgstr "Partage d'expérience authorisé."
+msgstr "Partage d'expérience activé."
 
-#: ../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:189
 msgid "Experience sharing not possible."
 msgstr "Partage d'expérience impossible."
 
@@ -1387,31 +1395,23 @@ msgstr "Impossible de rajouter un objet pour une raison inconnue."
 
 #: ../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."
+msgstr "Impossible de rajouter un objet. Votre partenaire n'a plus de place libre pour faire cet échange."
 
 #: ../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é."
+msgstr "Impossible de rajouter un objet. Votre partenaire porte trop de poids et ne peut faire cette transaction."
 
 #: ../src/gui/trade.cpp:273
 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."
+msgstr "L'objet ne peux être ajouté. Vous ne pouvez ajouter deux fois le même objet dans cette fenêtre."
 
 #: ../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é."
+msgstr "Impossible de créer ce personnage. Il est probable que ce nom soit déjà utilisé."
 
 #: ../src/net/tmwa/charserverhandler.cpp:155
 msgid "Failed to delete character."
-msgstr "La suppresion du personnage n'a pu s\"effectuer."
+msgstr "La suppression du personnage n'a pu s'effectuer."
 
 #: ../src/net/manaserv/guildhandler.cpp:208
 msgid "Failed to promote member."
@@ -1426,18 +1426,12 @@ msgid "Failed to start recording."
 msgstr "Impossible de démarrer l'enregistrement."
 
 #: ../src/gui/setup_video.cpp:434
-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 !"
+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_video.cpp:428
-msgid ""
-"Failed to switch to windowed mode and restoration of old mode also failed!"
-msgstr ""
-"Impossible de passer en mode fenêtré, et l'ancienne résolution n'est "
-"également pas accessible !"
+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/net/tmwa/inventoryhandler.cpp:290
 msgid "Failed to use item."
@@ -1447,7 +1441,8 @@ msgstr "Impossible d'utiliser l'objet."
 msgid "Farewell, come back any time..."
 msgstr "Adieu, revenez dès que vous le souhaitez..."
 
-#: ../src/gui/charcreatedialog.cpp:81 ../src/gui/register.cpp:91
+#: ../src/gui/charcreatedialog.cpp:81
+#: ../src/gui/register.cpp:91
 msgid "Female"
 msgstr "Féminin"
 
@@ -1473,7 +1468,7 @@ msgstr "Taille de police"
 
 #: ../src/commandhandler.cpp:205
 msgid "For more information, type /help <command>."
-msgstr "Pour plus d'informations, taper /help <command>"
+msgstr "Pour plus d'informations, taper /help <commande>"
 
 #: ../src/gui/setup_players.cpp:65
 msgid "Friend"
@@ -1485,7 +1480,7 @@ msgstr "Plein écran"
 
 #: ../src/gui/userpalette.cpp:94
 msgid "GM Names"
-msgstr "Nom des MJ"
+msgstr "Nom des GM"
 
 #: ../src/net/tmwa/gamehandler.cpp:101
 msgid "Game"
@@ -1544,7 +1539,7 @@ msgstr "Guilde créée."
 
 #: ../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."
+msgstr "La création de guilde n'est pas encore possible sur le serveur."
 
 #: ../src/net/tmwa/gui/guildtab.cpp:89
 msgid "Guild name is missing."
@@ -1585,7 +1580,7 @@ msgstr "Cacher les fenêtres"
 
 #: ../src/net/tmwa/specialhandler.cpp:201
 msgid "Huh? What's that?"
-msgstr "Hé ? Qu'est-ce donc que cela ?"
+msgstr "Hé ? Qu'est-ce donc que cela ? !!!"
 
 #: ../src/net/manaserv/beinghandler.cpp:314
 #: ../src/net/tmwa/playerhandler.cpp:114
@@ -1594,26 +1589,24 @@ msgstr "J'ai la sensation que cela ne s'est pas aussi bien passé que prévu."
 
 #: ../src/commandhandler.cpp:241
 msgid "If <channel> doesn't exist, it's created."
-msgstr "Si <channel> n'existe pas, il sera créé."
-
-#: ../src/commandhandler.cpp:259 ../src/commandhandler.cpp:286
-#: ../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
+msgstr "Si <salon> n'existe pas, il sera créé."
+
+#: ../src/commandhandler.cpp:259
+#: ../src/commandhandler.cpp:286
+#: ../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 <nick> contient des espaces, entourez le de guillemets (exemple : \"ni "
-"ck\")."
+msgstr "Si le <nom du personnage> contient des espaces, entourez le de guillemets (exemple : \"nom du personnage\")."
 
 #: ../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."
+msgstr "Si tu n'étais pas aussi motivé, tu serais en train de manger les pissenlits par la racine."
 
 #: ../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é."
+msgstr "Si vous étiez la dernière personne présente dans ce salon, il sera supprimé."
 
 #: ../src/gui/popupmenu.cpp:108
 #, c-format
@@ -1646,13 +1639,8 @@ msgid "Info"
 msgstr "Informations"
 
 #: ../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."
+msgstr "Veuillez insérer une pièce pour continuer."
 
 #: ../src/net/tmwa/specialhandler.cpp:174
 msgid "Insufficient HP!"
@@ -1660,13 +1648,15 @@ msgstr "Pas assez de vie !"
 
 #: ../src/net/tmwa/specialhandler.cpp:177
 msgid "Insufficient SP!"
-msgstr "PV insuffisant !"
+msgstr "SP insuffisant !"
 
-#: ../src/net/manaserv/stats.cpp:104 ../src/net/tmwa/generalhandler.cpp:220
+#: ../src/net/manaserv/stats.cpp:104
+#: ../src/net/tmwa/generalhandler.cpp:220
 msgid "Intelligence"
 msgstr "Intelligence"
 
-#: ../src/net/manaserv/stats.cpp:106 ../src/net/tmwa/generalhandler.cpp:104
+#: ../src/net/manaserv/stats.cpp:106
+#: ../src/net/tmwa/generalhandler.cpp:104
 #, c-format
 msgid "Intelligence %+d"
 msgstr "Intelligence %+d"
@@ -1677,7 +1667,7 @@ msgstr "Intelligence :"
 
 #: ../src/net/manaserv/charhandler.cpp:152
 msgid "Invalid gender."
-msgstr "Genre invalide."
+msgstr "Sexe invalide."
 
 #: ../src/net/manaserv/charhandler.cpp:149
 msgid "Invalid hair color."
@@ -1696,7 +1686,8 @@ msgstr "Nom invalide."
 msgid "Invalid update host: %s"
 msgstr "Hôte de mise à jour incorrect : %s"
 
-#: ../src/gui/inventorywindow.cpp:59 ../src/gui/windowmenu.cpp:56
+#: ../src/gui/inventorywindow.cpp:59
+#: ../src/gui/windowmenu.cpp:56
 msgid "Inventory"
 msgstr "Inventaire"
 
@@ -1705,9 +1696,8 @@ msgid "Inventory Window"
 msgstr "Fenêtre de l'inventaire"
 
 #: ../src/localplayer.cpp:1254
-#, fuzzy
 msgid "Inventory is full."
-msgstr "Le serveur est plein"
+msgstr "Votre inventraire est plein."
 
 #: ../src/gui/socialwindow.cpp:334
 msgid "Invite"
@@ -1721,7 +1711,7 @@ msgstr "Inviter %s à rejoindre votre guilde"
 #: ../src/gui/popupmenu.cpp:134
 #, c-format
 msgid "Invite %s to join your party"
-msgstr "Inviter %s à se joindre votre groupe"
+msgstr "Inviter %s à se joindre à votre groupe"
 
 #: ../src/net/manaserv/guildhandler.cpp:96
 msgid "Invite sent."
@@ -1735,52 +1725,57 @@ msgstr "Le joueur %s a été invité dans la guilde %s."
 #: ../src/net/tmwa/partyhandler.cpp:335
 #, c-format
 msgid "Invited user %s to party."
-msgstr "/party > Inviter l'utilisateur %s dans le groupe."
+msgstr "Inviter l'utilisateur %s dans le groupe."
 
 #: ../src/net/tmwa/partyhandler.cpp:340
-#, fuzzy, c-format
+#, c-format
 msgid "Inviting failed, because you can't see a player called %s."
-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."
-
-#: ../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
+msgstr "L'invitation a échouée, le joueur %s n'est pas à portée de vue."
+
+#: ../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"
+msgstr "Raccourcis Objet %d"
 
 #: ../src/keyboardconfig.cpp:77
 msgid "Item Shortcut Window"
-msgstr "Fenêtre de raccourci objet"
+msgstr "Fenêtre de raccourcis objets"
 
 #: ../src/localplayer.cpp:1257
 msgid "Item belongs to someone else."
-msgstr ""
+msgstr "Cet objet appartient à quelqu'un d'autre."
 
 #: ../src/localplayer.cpp:1253
 msgid "Item is too far away"
-msgstr ""
+msgstr "L'objet est trop loin de vous."
 
 #: ../src/localplayer.cpp:1252
 msgid "Item is too heavy."
-msgstr ""
+msgstr "L'objet est trop lourd."
 
-#: ../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:207
 msgid "Item sharing disabled."
 msgstr "Partage d'objet desactivé."
 
-#: ../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:201
 msgid "Item sharing enabled."
 msgstr "Partage d'objet activé."
 
-#: ../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:213
 msgid "Item sharing not possible."
 msgstr "Partage d'objet impossible."
 
@@ -1796,19 +1791,15 @@ msgstr "Habilité"
 msgid "Job:"
 msgstr "Habilité :"
 
-#: ../src/gui/statuswindow.cpp:141 ../src/gui/statuswindow.cpp:228
+#: ../src/gui/statuswindow.cpp:141
+#: ../src/gui/statuswindow.cpp:228
 #, c-format
 msgid "Job: %d"
 msgstr "Metier : %d"
 
 #: ../src/net/manaserv/partyhandler.cpp:88
-#, fuzzy
 msgid "Joined party."
-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."
+msgstr "Groupe rejoint."
 
 #: ../src/gui/setup_joystick.cpp:41
 msgid "Joystick"
@@ -1816,7 +1807,7 @@ msgstr "Joystick"
 
 #: ../src/gui/setup_keyboard.cpp:125
 msgid "Key Conflict(s) Detected."
-msgstr "Conflit(s) de touche détecté"
+msgstr "Conflit(s) de touches détecté(s)"
 
 #: ../src/gui/setup_keyboard.cpp:77
 msgid "Keyboard"
@@ -1858,7 +1849,8 @@ msgstr "Quitter le groupe ?"
 msgid "Level"
 msgstr "Niveau"
 
-#: ../src/gui/statuswindow.cpp:109 ../src/gui/statuswindow.cpp:253
+#: ../src/gui/statuswindow.cpp:109
+#: ../src/gui/statuswindow.cpp:253
 #, c-format
 msgid "Level: %d"
 msgstr "Niveau : %d"
@@ -1885,17 +1877,16 @@ msgstr "Loguer les conversations avec les PNJ"
 
 #: ../src/client.cpp:682
 msgid "Logging in"
-msgstr "Connexion"
+msgstr "Connexion en cours"
 
-#: ../src/gui/login.cpp:51 ../src/gui/login.cpp:63
+#: ../src/gui/login.cpp:51
+#: ../src/gui/login.cpp:63
 msgid "Login"
 msgstr "Connexion"
 
 #: ../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."
+msgstr "La tentative de connexion a été faite trop rapidement depuis la dernière tentative."
 
 #: ../src/net/manaserv/beinghandler.cpp:318
 #: ../src/net/tmwa/playerhandler.cpp:122
@@ -1950,21 +1941,26 @@ msgstr "PM :"
 msgid "MVP player."
 msgstr "Joueur MVP"
 
-#: ../src/gui/charcreatedialog.cpp:80 ../src/gui/register.cpp:90
+#: ../src/gui/charcreatedialog.cpp:80
+#: ../src/gui/register.cpp:90
 msgid "Male"
 msgstr "Masculin"
 
-#: ../src/gui/minimap.cpp:46 ../src/gui/minimap.cpp:87
+#: ../src/gui/minimap.cpp:46
+#: ../src/gui/minimap.cpp:87
 msgid "Map"
-msgstr "Plan"
+msgstr "Carte"
 
-#: ../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 "Carte : %s"
 
-#: ../src/gui/buy.cpp:80 ../src/gui/sell.cpp:78
-#: ../src/gui/statuswindow.cpp:354 ../src/gui/statuswindow.cpp:429
+#: ../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."
@@ -1985,7 +1981,8 @@ msgstr "Inviter un joueur dans le groupe"
 msgid "Member was promoted successfully."
 msgstr "La promotion de ce membre a réussie."
 
-#: ../src/net/tmwa/playerhandler.cpp:256 ../src/net/tmwa/playerhandler.cpp:317
+#: ../src/net/tmwa/playerhandler.cpp:256
+#: ../src/net/tmwa/playerhandler.cpp:317
 msgid "Message"
 msgstr "Message"
 
@@ -1998,28 +1995,25 @@ msgid "Message now closes chat."
 msgstr "Ce message ferme maintenant la conversation."
 
 #: ../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"
+msgstr "Fenêtre de la mini carte"
 
-#: ../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 "Plan : %s"
 
 #: ../src/gui/userpalette.cpp:112
 msgid "Misses"
-msgstr "Coups manqués"
+msgstr "Raté"
 
 #: ../src/gui/statuswindow.cpp:224
 msgid "Money"
 msgstr "Argent"
 
-#: ../src/gui/statuswindow.cpp:110 ../src/gui/statuswindow.cpp:220
+#: ../src/gui/statuswindow.cpp:110
+#: ../src/gui/statuswindow.cpp:220
 #, c-format
 msgid "Money: %s"
 msgstr "Argent : %s"
@@ -2052,24 +2046,27 @@ msgstr "Monter"
 msgid "Music volume"
 msgstr "Volume de la musique"
 
-#: ../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 "Musique : %s"
 
-#: ../src/gui/npcdialog.cpp:53 ../src/gui/npcpostdialog.cpp:41
+#: ../src/gui/npcdialog.cpp:53
+#: ../src/gui/npcpostdialog.cpp:41
 msgid "NPC"
-msgstr "PNJ"
+msgstr "NPC"
 
 #: ../src/gui/userpalette.cpp:95
 msgid "NPCs"
-msgstr "PNJs"
+msgstr "NPCs"
 
 #: ../src/gui/setup_players.cpp:58
 msgid "Name"
 msgstr "Nom"
 
-#: ../src/gui/charcreatedialog.cpp:67 ../src/gui/login.cpp:54
+#: ../src/gui/charcreatedialog.cpp:67
+#: ../src/gui/login.cpp:54
 #: ../src/gui/register.cpp:67
 msgid "Name:"
 msgstr "Nom :"
@@ -2125,7 +2122,7 @@ msgstr "Non"
 
 #: ../src/commandhandler.cpp:408
 msgid "No <nick> was given."
-msgstr ""
+msgstr "Aucun <nom de personnage> n'a été donné."
 
 #: ../src/net/manaserv/charhandler.cpp:137
 msgid "No empty slot."
@@ -2145,17 +2142,14 @@ msgstr "Pas de texte"
 
 #: ../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."
+msgid "No, kids. Your character did not really die. It... err... went to a better place."
+msgstr "Non mon enfant. Ton personnage n'est pas vraiment mort... Il... enfin,.. il... est parti dans un monde meilleur."
 
-#: ../src/gui/setup_video.cpp:279 ../src/gui/setup_video.cpp:535
+#: ../src/gui/setup_video.cpp:279
+#: ../src/gui/setup_video.cpp:535
 #: ../src/gui/setup_video.cpp:665
 msgid "None"
-msgstr "Rien"
+msgstr "Aucun"
 
 #: ../src/gui/recorder.cpp:91
 msgid "Not currently recording."
@@ -2174,9 +2168,12 @@ msgstr "Rien à vendre."
 msgid "Notice"
 msgstr "Message"
 
-#: ../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
+#: ../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"
 
@@ -2200,14 +2197,12 @@ msgstr "Joueurs en ligne : %d"
 
 #: ../src/gui/setup_video.cpp:220
 msgid "OpenGL"
-msgstr "Ouvrir GL"
+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\"."
+msgstr "Les options qui peuvent être transmises à /%s sont \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 
 #: ../src/main.cpp:43
 msgid "Options:"
@@ -2221,13 +2216,15 @@ msgstr "L'autre joueur touche le monstre"
 msgid "Other Players' Names"
 msgstr "Nom des autres joueurs"
 
-#: ../src/gui/outfitwindow.cpp:68 ../src/gui/outfitwindow.cpp:141
+#: ../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:101 ../src/gui/outfitwindow.cpp:51
+#: ../src/gui/inventorywindow.cpp:101
+#: ../src/gui/outfitwindow.cpp:51
 msgid "Outfits"
 msgstr "Tenues"
 
@@ -2251,7 +2248,8 @@ msgstr "Paramètres d'effet de particules modifiés."
 msgid "Particle Effects"
 msgstr "Effets de particules"
 
-#: ../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 "Effets de particules : %d"
@@ -2286,7 +2284,8 @@ msgstr "Membres du groupe"
 msgid "Party Name"
 msgstr "Nom du groupe"
 
-#: ../src/commandhandler.cpp:449 ../src/net/tmwa/gui/partytab.cpp:109
+#: ../src/commandhandler.cpp:449
+#: ../src/net/tmwa/gui/partytab.cpp:109
 msgid "Party name is missing."
 msgstr "Indiquez un nom de groupe."
 
@@ -2307,8 +2306,10 @@ msgstr "Changement de mot de passe"
 msgid "Password changed successfully!"
 msgstr "Le mot de passe a été changé avec succès !"
 
-#: ../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 "Mot de passe :"
 
@@ -2343,7 +2344,7 @@ msgstr "Le joueur n'a pas pu être ignoré !"
 
 #: ../src/commandhandler.cpp:576
 msgid "Player could not be unignored!"
-msgstr "Le joueur n'a pas pu être à nouveau écouté !"
+msgstr "Le joueur est toujours ignoré !"
 
 #: ../src/net/manaserv/charhandler.cpp:193
 msgid "Player deleted."
@@ -2368,9 +2369,10 @@ msgstr "Joueurs"
 #: ../src/net/manaserv/chathandler.cpp:184
 #: ../src/net/manaserv/chathandler.cpp:262
 msgid "Players in this channel:"
-msgstr "Joueurs dans ce canal :"
+msgstr "Joueurs dans ce salon :"
 
-#: ../src/gui/charcreatedialog.cpp:99 ../src/gui/charcreatedialog.cpp:251
+#: ../src/gui/charcreatedialog.cpp:99
+#: ../src/gui/charcreatedialog.cpp:251
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Veuillez distribuer %d points"
@@ -2380,7 +2382,8 @@ msgstr "Veuillez distribuer %d points"
 msgid "Please remove %d points"
 msgstr "Veuillez retirer %d points"
 
-#: ../src/commandhandler.cpp:462 ../src/commandhandler.cpp:539
+#: ../src/commandhandler.cpp:462
+#: ../src/commandhandler.cpp:539
 #: ../src/commandhandler.cpp:561
 msgid "Please specify a name."
 msgstr "Veuillez indiquer un nom."
@@ -2407,15 +2410,11 @@ msgid "Present: %s; %d players are present."
 msgstr "Présents : %s ; %d joueurs sont présents."
 
 #: ../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"
+msgstr "Cliquer sur OK pour ressusciter."
 
-#: ../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 "Presser le bouton pour démarrer la calibration"
 
@@ -2423,7 +2422,9 @@ msgstr "Presser le bouton pour démarrer la calibration"
 msgid "Previous Chat Tab"
 msgstr "Onglet de la conversation précédente"
 
-#: ../src/gui/buy.cpp:69 ../src/gui/buy.cpp:266 ../src/gui/sell.cpp:71
+#: ../src/gui/buy.cpp:69
+#: ../src/gui/buy.cpp:266
+#: ../src/gui/sell.cpp:71
 #: ../src/gui/sell.cpp:278
 #, c-format
 msgid "Price: %s / Total: %s"
@@ -2437,7 +2438,8 @@ msgstr "Affiche '...'"
 msgid "Propose trade"
 msgstr "Proposer un troc"
 
-#: ../src/gui/setup_colors.cpp:84 ../src/gui/setup_colors.cpp:85
+#: ../src/gui/setup_colors.cpp:84
+#: ../src/gui/setup_colors.cpp:85
 #: ../src/gui/setup_colors.cpp:331
 msgid "Pulse"
 msgstr "Impulsion"
@@ -2446,33 +2448,29 @@ msgstr "Impulsion"
 msgid "Put all whispers in tabs"
 msgstr "Placer tous les messages privés dans des onglets"
 
-#: ../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/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/gui/setup_colors.cpp:86 ../src/gui/setup_colors.cpp:87
+#: ../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/gui/socialwindow.cpp:556
-#, fuzzy
 msgid "Received guild request, but one already exists."
-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."
+msgstr "Vous avez reçu une demande pour rejoindre une guilde, mais il en existe déjà une."
 
 #: ../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."
+msgstr "Vous avez reçu une demande de rejoindre un groupe, mais il en existe déjà un."
 
 #: ../src/gui/recorder.h:38
 msgid "Recording..."
@@ -2482,7 +2480,8 @@ msgstr "En cours d'enregistrement..."
 msgid "Red:"
 msgstr "Rouge : "
 
-#: ../src/gui/login.cpp:61 ../src/gui/register.cpp:58
+#: ../src/gui/login.cpp:61
+#: ../src/gui/register.cpp:58
 #: ../src/gui/register.cpp:73
 msgid "Register"
 msgstr "S'inscrire"
@@ -2531,13 +2530,9 @@ msgid "Requesting registration details"
 msgstr "Demande des paramètres d'enregistrement"
 
 #: ../src/commandhandler.cpp:436
-#, fuzzy, c-format
+#, c-format
 msgid "Requesting to join channel %s."
-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."
+msgstr "Il vous est demandé de rejoindre le salon %s."
 
 #: ../src/gui/npcdialog.cpp:114
 msgid "Reset"
@@ -2549,24 +2544,25 @@ msgstr "Rétablir les fenêtres"
 
 #: ../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."
+msgstr "Les changements ne seront pris en compte qu'au prochain démarrage du jeu."
 
-#: ../src/gui/setup_video.cpp:580 ../src/gui/setup_video.cpp:585
+#: ../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/gui/inventorywindow.cpp:121 ../src/gui/popupmenu.cpp:376
+#: ../src/gui/inventorywindow.cpp:121
+#: ../src/gui/popupmenu.cpp:376
 msgid "Retrieve"
 msgstr "Récupérer"
 
 #: ../src/commandhandler.cpp:489
 msgid "Return now toggles chat."
-msgstr "La touche enter ferme la ligne d'entrée de la conversation."
+msgstr "La touche Entrée ferme la ligne d'entrée de la conversation."
 
 #: ../src/commandhandler.cpp:480
 msgid "Return toggles chat."
-msgstr "La touche enter ferme maintenant la ligne d'entrée du 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"
@@ -2581,7 +2577,8 @@ msgstr "Tristement, aucune trace de vous ne fut jamais retrouvée..."
 msgid "Saving screenshot failed!"
 msgstr "Impossible de sauvegarder la capture d'écran !"
 
-#: ../src/gui/setup_video.cpp:579 ../src/gui/setup_video.cpp:584
+#: ../src/gui/setup_video.cpp:579
+#: ../src/gui/setup_video.cpp:584
 msgid "Screen Resolution Changed"
 msgstr "Résolution de l'écran modifiée"
 
@@ -2637,7 +2634,9 @@ msgstr "Choisissez le nombre d'objets à troquer."
 msgid "Selection out of range."
 msgstr "La sélection est invalide."
 
-#: ../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 "Vendre"
 
@@ -2649,11 +2648,14 @@ msgstr "Envoyer"
 msgid "Server type:"
 msgstr "Type de Serveur :"
 
-#: ../src/gui/serverdialog.cpp:208 ../src/gui/widgets/chattab.cpp:141
+#: ../src/gui/serverdialog.cpp:208
+#: ../src/gui/widgets/chattab.cpp:141
 msgid "Server:"
 msgstr "Serveur :"
 
-#: ../src/client.cpp:575 ../src/gui/setup.cpp:43 ../src/gui/windowmenu.cpp:66
+#: ../src/client.cpp:575
+#: ../src/gui/setup.cpp:43
+#: ../src/gui/windowmenu.cpp:66
 msgid "Setup"
 msgstr "Configuration"
 
@@ -2673,11 +2675,13 @@ msgstr "Magasin"
 msgid "Shortcut"
 msgstr "Raccourcis"
 
-#: ../src/commandhandler.cpp:506 ../src/commandhandler.cpp:515
+#: ../src/commandhandler.cpp:506
+#: ../src/commandhandler.cpp:515
 msgid "Show IP: Off"
 msgstr "Afficher l'IP : Désactivé"
 
-#: ../src/commandhandler.cpp:506 ../src/commandhandler.cpp:519
+#: ../src/commandhandler.cpp:506
+#: ../src/commandhandler.cpp:519
 msgid "Show IP: On"
 msgstr "Afficher l'IP : Activé"
 
@@ -2687,7 +2691,7 @@ msgstr "Afficher les dégâts"
 
 #: ../src/gui/setup_players.cpp:232
 msgid "Show gender"
-msgstr "Afficher le genre"
+msgstr "Afficher le sexe"
 
 #: ../src/gui/setup_video.cpp:227
 msgid "Show own name"
@@ -2724,7 +2728,8 @@ msgstr "Fenêtre de compétences"
 msgid "Skill points available: %d"
 msgstr "Points de compétences : %d"
 
-#: ../src/gui/skilldialog.cpp:210 ../src/gui/windowmenu.cpp:59
+#: ../src/gui/skilldialog.cpp:210
+#: ../src/gui/windowmenu.cpp:59
 msgid "Skills"
 msgstr "Compétences"
 
@@ -2738,26 +2743,20 @@ msgstr "Petit"
 
 #: ../src/keyboardconfig.cpp:46
 msgid "Smilie"
-msgstr "Smilie"
+msgstr "emote"
 
-#: ../src/gui/socialwindow.cpp:316 ../src/gui/windowmenu.cpp:64
+#: ../src/gui/socialwindow.cpp:316
+#: ../src/gui/windowmenu.cpp:64
 msgid "Social"
 msgstr "Social"
 
 #: ../src/keyboardconfig.cpp:80
 msgid "Social Window"
-msgstr "Groupes et Guildes"
+msgstr "Fenêtre de Groupes et Guildes"
 
 #: ../src/gui/setup_video.cpp:582
-#, 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."
+msgstr "Certaines fenêtres pourraient être déplacées pour correspondre à la nouvelle résolution."
 
 #: ../src/net/tmwa/generalhandler.cpp:136
 msgid "Someone else is trying to use this account."
@@ -2776,7 +2775,8 @@ msgstr "Moteur de son"
 msgid "Special %d"
 msgstr "Cpt. spéciale %d"
 
-#: ../src/gui/specialswindow.cpp:85 ../src/gui/windowmenu.cpp:62
+#: ../src/gui/specialswindow.cpp:85
+#: ../src/gui/windowmenu.cpp:62
 msgid "Specials"
 msgstr "Cpt. spéciales"
 
@@ -2785,7 +2785,8 @@ msgstr "Cpt. spéciales"
 msgid "Specials Set %d"
 msgstr "Set de Cpt. spéciales %d"
 
-#: ../src/gui/setup_colors.cpp:88 ../src/gui/setup_colors.cpp:89
+#: ../src/gui/setup_colors.cpp:88
+#: ../src/gui/setup_colors.cpp:89
 #: ../src/gui/setup_colors.cpp:332
 msgid "Spectrum"
 msgstr "Spectre"
@@ -2794,19 +2795,21 @@ msgstr "Spectre"
 msgid "Speed hack detected."
 msgstr "Speed hack detecté."
 
-#: ../src/gui/inventorywindow.cpp:100 ../src/gui/popupmenu.cpp:369
+#: ../src/gui/inventorywindow.cpp:100
+#: ../src/gui/popupmenu.cpp:369
 msgid "Split"
 msgstr "Partager"
 
 #: ../src/localplayer.cpp:1255
 msgid "Stack is too big."
-msgstr ""
+msgstr "Le groupe est trop grand."
 
 #: ../src/gui/recorder.cpp:104
 msgid "Starting to record..."
 msgstr "Début de l'enregistrement..."
 
-#: ../src/gui/setup_colors.cpp:82 ../src/gui/setup_colors.cpp:330
+#: ../src/gui/setup_colors.cpp:82
+#: ../src/gui/setup_colors.cpp:330
 msgid "Static"
 msgstr "Statique"
 
@@ -2834,15 +2837,18 @@ msgstr "Arrêter l'enregistrement"
 msgid "Storage"
 msgstr "Stockage"
 
-#: ../src/gui/inventorywindow.cpp:120 ../src/gui/popupmenu.cpp:349
+#: ../src/gui/inventorywindow.cpp:120
+#: ../src/gui/popupmenu.cpp:349
 msgid "Store"
 msgstr "Entreposer"
 
-#: ../src/net/manaserv/stats.cpp:56 ../src/net/tmwa/generalhandler.cpp:217
+#: ../src/net/manaserv/stats.cpp:56
+#: ../src/net/tmwa/generalhandler.cpp:217
 msgid "Strength"
 msgstr "Force"
 
-#: ../src/net/manaserv/stats.cpp:58 ../src/net/tmwa/generalhandler.cpp:101
+#: ../src/net/manaserv/stats.cpp:58
+#: ../src/net/tmwa/generalhandler.cpp:101
 #, c-format
 msgid "Strength %+d"
 msgstr "Force %+d"
@@ -2890,7 +2896,7 @@ msgstr "Cibler un monstre"
 
 #: ../src/keyboardconfig.cpp:50
 msgid "Target NPC"
-msgstr "Cibler le PNJ"
+msgstr "Cibler le NPC"
 
 #: ../src/keyboardconfig.cpp:51
 msgid "Target Player"
@@ -2915,8 +2921,7 @@ msgstr "Les mains gelées de la faucheuse viennent réclamer votre âme."
 
 #: ../src/game.cpp:368
 msgid "The connection to the server was lost."
-msgstr ""
-"La connexion au serveur a été coupée, le programme va maintenant se fermer."
+msgstr "La connexion au serveur a été perdue."
 
 #: ../src/gui/changeemaildialog.cpp:141
 msgid "The email address entries mismatch."
@@ -2937,13 +2942,8 @@ 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/gui/changepassworddialog.cpp:130
-#, fuzzy
 msgid "The new password entries mismatch."
-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."
+msgstr "Les nouveaux mots de passe ne correspondent pas."
 
 #: ../src/gui/changepassworddialog.cpp:116
 #, c-format
@@ -2955,12 +2955,14 @@ msgstr "Le mot de passe doit être long d'au moins %d caractères."
 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/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 "Le mot de passe doit faire au moins %d caractères."
 
-#: ../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 "Le mot de passe doit faire moins de %d caractères."
@@ -2981,7 +2983,7 @@ msgstr "Ce compte est déjà connecté."
 
 #: ../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."
+msgstr "Cette commande vous fait quitter la guilde dans laquelle vous vous trouvez."
 
 #: ../src/net/tmwa/gui/partytab.cpp:81
 msgid "This command causes the player to leave the party."
@@ -2989,12 +2991,11 @@ msgstr "Cette commande vous fait quitter votre groupe actuel."
 
 #: ../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."
+msgstr "Cette commande change les préférences du groupe sur le partage d'expérience."
 
 #: ../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."
+msgstr "Cette commande change les préférences de partage de rammassage d'objet du groupe."
 
 #: ../src/commandhandler.cpp:275
 msgid "This command clears the away status and message."
@@ -3002,9 +3003,7 @@ msgstr "Cette commande retire le statut absent."
 
 #: ../src/commandhandler.cpp:229
 msgid "This command clears the chat log of previous chat."
-msgstr ""
-"Cette commande vide l'historique de conversation de la conversation "
-"précédente."
+msgstr "Cette commande vide l'historique de conversation de la conversation précédente."
 
 #: ../src/gui/widgets/whispertab.cpp:84
 msgid "This command closes the current whisper tab."
@@ -3012,7 +3011,7 @@ msgstr "Cette commande ferme l'onglet courant de conversation privée."
 
 #: ../src/commandhandler.cpp:280
 msgid "This command creates a new party called <name>."
-msgstr "Cette commande crée un nouveau groupe appelé <name>"
+msgstr "Cette commande crée un nouveau groupe appelé <nom>"
 
 #: ../src/commandhandler.cpp:210
 msgid "This command displays a list of all commands available."
@@ -3020,11 +3019,11 @@ msgstr "Cette commande affiche une liste de toutes les commandes disponibles."
 
 #: ../src/commandhandler.cpp:213
 msgid "This command displays help on <command>."
-msgstr "Cette commande affiche une aide sur la commande <command>."
+msgstr "Cette commande affiche une aide sur la commande <commande>."
 
 #: ../src/commandhandler.cpp:324
 msgid "This command displays the name of the current map."
-msgstr "Cette commande affiche le nom de la carte où vous vous trouvez."
+msgstr "Cette commande affiche le nom de la carte où vous vous trouvez ainsi que votre emplacement sur la carte."
 
 #: ../src/commandhandler.cpp:329
 msgid "This command displays the number of players currently online."
@@ -3032,15 +3031,11 @@ msgstr "Cette commande affiche le nombre de joueurs actuellement connectés."
 
 #: ../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."
+msgstr "Cette commande affiche les préférences actuelles du groupe sur le partage d'expérience."
 
 #: ../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."
+msgstr "Cette commande affiche les préférences actuelles du groupe sur le partage de ramassage d'objets."
 
 #: ../src/commandhandler.cpp:313
 msgid "This command displays the return toggle status."
@@ -3051,13 +3046,8 @@ msgid "This command finishes a recording session."
 msgstr "Cette commande termine une session d'enregistrement."
 
 #: ../src/commandhandler.cpp:292
-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."
+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:234
 msgid "This command ignores the given player regardless of current relations."
@@ -3065,17 +3055,16 @@ msgstr "Cette commande ignore le joueur qu'il soit indiqué comme ami ou non."
 
 #: ../src/gui/widgets/whispertab.cpp:89
 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."
+msgstr "Cette commande permet d'ignorer un joueur qu'il soit indiqué comme ami ou non."
 
-#: ../src/commandhandler.cpp:285 ../src/net/tmwa/gui/partytab.cpp:74
+#: ../src/commandhandler.cpp:285
+#: ../src/net/tmwa/gui/partytab.cpp:74
 msgid "This command invites <nick> to party with you."
-msgstr "Cette commande invite <nick> à rejoindre votre groupe."
+msgstr "Cette commande invite <nom du personnage> à rejoindre votre groupe."
 
 #: ../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."
+msgstr "Cette commande invite <nom du personnage> à rejoindre votre groupe."
 
 #: ../src/gui/widgets/channeltab.cpp:74
 msgid "This command leaves the current channel."
@@ -3087,38 +3076,27 @@ msgstr "Cette commande donne les droit d'opérateur du salon à <nick>"
 
 #: ../src/gui/widgets/channeltab.cpp:90
 msgid "This command makes <nick> leave the channel."
-msgstr "Cette commande sort <nick> du salon."
+msgstr "Cette commande sort <nom du personnage> du salon."
 
 #: ../src/commandhandler.cpp:240
 msgid "This command makes you enter <channel>."
-msgstr "Cette commande vous fait rentrer dans le salon <channel>."
+msgstr "Cette commande vous fait rentrer dans le salon <salon>."
 
 #: ../src/commandhandler.cpp:223
 msgid "This command sends the message <msg> to all players currently online."
-msgstr "Cette commande envoie le message <msg> à tous les joueurs en ligne."
+msgstr "Cette commande envoie le message <message> à tous les joueurs en ligne."
 
 #: ../src/commandhandler.cpp:258
 msgid "This command sends the text <message> to <nick>."
-msgstr "Cette commande envoie le texte <message> au joueur <nick>"
+msgstr "Cette commande envoie le texte <message> au joueur <nom du personnage>"
 
 #: ../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:307
-#, fuzzy
-msgid ""
-"This command sets whether the return key should toggle the chat log, or "
-"whether the chat log turns off automatically."
-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."
+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/commandhandler.cpp:246
 msgid "This command shows a list of all channels."
@@ -3130,15 +3108,11 @@ msgstr "Cette commande affiche la liste d'utilisateurs présents dans ce salon."
 
 #: ../src/commandhandler.cpp:299
 msgid "This command starts recording the chat log to the file <filename>."
-msgstr ""
-"Cette commande active l'enregistrement de la conversation dans le fichier "
-"<filename>."
+msgstr "Cette commande active l'enregistrement de la conversation dans le fichier <nom du fichier>."
 
 #: ../src/commandhandler.cpp:318
 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."
+msgstr "Cette commande fait cesser d'ignorer le joueur donné s'il l'était précédemment."
 
 #: ../src/gui/widgets/whispertab.cpp:95
 msgid "This command stops ignoring the other player if they are being ignored."
@@ -3146,17 +3120,15 @@ msgstr "Cette commande vous fait cesser d'ignorer un joueur si c'était le cas."
 
 #: ../src/commandhandler.cpp:251
 msgid "This command tell others you are (doing) <msg>."
-msgstr "Cette commande informe les autres joueurs que vous faites <msg>."
+msgstr "Cette commande informe les autres joueurs que vous faites <message>."
 
 #: ../src/commandhandler.cpp:272
 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."
+msgstr "Cette commande indique que vous n'êtes pas actif en indiquant la raison."
 
 #: ../src/commandhandler.cpp:266
 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 <nick>"
+msgstr "Cette commande essaye de créer une fenêtre de dialogue entre vous et <nom du personnage>"
 
 #: ../src/gui/setup_colors.cpp:45
 msgid "This is what the color looks like"
@@ -3167,13 +3139,8 @@ msgid "This user name is already taken."
 msgstr "Ce nom d'utilisateur est déjà utilisé."
 
 #: ../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"
+msgstr "Fine"
 
 #: ../src/gui/npcpostdialog.cpp:47
 msgid "To:"
@@ -3190,7 +3157,8 @@ msgstr "Activer / Désactiver la conversation"
 msgid "Topic: %s"
 msgstr "Sujet : %s"
 
-#: ../src/gui/trade.cpp:72 ../src/gui/trade.cpp:73
+#: ../src/gui/trade.cpp:72
+#: ../src/gui/trade.cpp:73
 msgid "Trade"
 msgstr "Échange"
 
@@ -3253,9 +3221,8 @@ msgid "Transparency enabled"
 msgstr "Transparence activée."
 
 #: ../src/localplayer.cpp:1251
-#, fuzzy
 msgid "Tried to pick up nonexistent item."
-msgstr "Impossible de ramasser l'objet."
+msgstr "Vous avez essayé de ramasser un objet inexistant."
 
 #: ../src/commandhandler.cpp:335
 msgid "Type /help for a list of commands."
@@ -3297,8 +3264,10 @@ msgstr "Impossible de deséquiper cet objet."
 msgid "Unassign"
 msgstr "Désassigner"
 
-#: ../src/gui/equipmentwindow.cpp:87 ../src/gui/inventorywindow.cpp:87
-#: ../src/gui/inventorywindow.cpp:313 ../src/gui/popupmenu.cpp:355
+#: ../src/gui/equipmentwindow.cpp:87
+#: ../src/gui/inventorywindow.cpp:87
+#: ../src/gui/inventorywindow.cpp:313
+#: ../src/gui/popupmenu.cpp:355
 msgid "Unequip"
 msgstr "Retirer"
 
@@ -3310,30 +3279,26 @@ msgstr "Retirer d'abord l'équipement"
 msgid "Unhandled trade cancel packet."
 msgstr "Echange non pris en compte."
 
-#: ../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 "Cesser d'ignorer %s"
 
 #: ../src/net/net.cpp:145
-#, fuzzy
 msgid "Unknown Server Type! Exiting."
-msgstr "Type inconnu d'objet"
+msgstr "Type de serveur inconnu. Fin du programme."
 
 #: ../src/net/manaserv/chathandler.cpp:327
 msgid "Unknown channel event."
 msgstr "Événement inconnu dans le canal."
 
 #: ../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."
+msgstr "Erreur inconnue provenant du serveur de personnages."
 
-#: ../src/commandhandler.cpp:137 ../src/commandhandler.cpp:334
+#: ../src/commandhandler.cpp:137
+#: ../src/commandhandler.cpp:334
 msgid "Unknown command."
 msgstr "Commande inconnue."
 
@@ -3352,7 +3317,8 @@ msgstr "Erreur inconnue (%d)."
 #: ../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:182
 msgid "Unknown error."
 msgstr "Erreur inconnue."
 
@@ -3370,11 +3336,11 @@ msgid "Unknown item"
 msgstr "Objet inconnu"
 
 #: ../src/localplayer.cpp:1258
-#, fuzzy
 msgid "Unknown problem picking up item."
-msgstr "Impossible de ramasser l'objet."
+msgstr "Problème inconnu pour rammasser l'objet."
 
-#: ../src/gui/charselectdialog.cpp:141 ../src/gui/unregisterdialog.cpp:47
+#: ../src/gui/charselectdialog.cpp:141
+#: ../src/gui/unregisterdialog.cpp:47
 #: ../src/gui/unregisterdialog.cpp:55
 msgid "Unregister"
 msgstr "Se désinscrire"
@@ -3395,7 +3361,8 @@ msgstr "Augmenter"
 msgid "Updating..."
 msgstr "Mise à jour en cours..."
 
-#: ../src/gui/inventorywindow.cpp:86 ../src/gui/inventorywindow.cpp:319
+#: ../src/gui/inventorywindow.cpp:86
+#: ../src/gui/inventorywindow.cpp:319
 #: ../src/gui/popupmenu.cpp:360
 msgid "Use"
 msgstr "Utiliser"
@@ -3420,11 +3387,13 @@ msgstr "Vidéo"
 msgid "Visible names"
 msgstr "Afficher les noms"
 
-#: ../src/net/manaserv/stats.cpp:92 ../src/net/tmwa/generalhandler.cpp:219
+#: ../src/net/manaserv/stats.cpp:92
+#: ../src/net/tmwa/generalhandler.cpp:219
 msgid "Vitality"
 msgstr "Vitalité"
 
-#: ../src/net/manaserv/stats.cpp:94 ../src/net/tmwa/generalhandler.cpp:103
+#: ../src/net/manaserv/stats.cpp:94
+#: ../src/net/tmwa/generalhandler.cpp:103
 #, c-format
 msgid "Vitality %+d"
 msgstr "Vitalité %+d"
@@ -3448,9 +3417,7 @@ msgstr "Enchainement échoué..."
 #: ../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."
+msgstr "Nous avons le regret de vous informer que votre personnage est mort sur le champ de bataille."
 
 #: ../src/keyboardconfig.cpp:83
 msgid "Wear Outfit"
@@ -3480,8 +3447,7 @@ msgstr "Le message privé n'a pu être envoyé, le destinataire l'a ignoré."
 
 #: ../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é."
+msgstr "Le message privé n'a pu être envoyé, le destinataire n'est pas connecté."
 
 #: ../src/gui/chat.cpp:452
 #, c-format
@@ -3536,11 +3502,8 @@ msgid "You are an ex-player."
 msgstr "Tu n'es plus qu'un ancien joueur sans intérêt."
 
 #: ../src/net/tmwa/playerhandler.cpp:257
-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."
+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/manaserv/beinghandler.cpp:304
 #: ../src/net/tmwa/playerhandler.cpp:103
@@ -3572,7 +3535,8 @@ msgstr "Vous ne pouvez utiliser ce pouvoir avec ce type d'arme !"
 msgid "You don't have enough money."
 msgstr "Vous n'avez pas assez d'argent."
 
-#: ../src/gui/trade.cpp:97 ../src/gui/trade.cpp:133
+#: ../src/gui/trade.cpp:97
+#: ../src/gui/trade.cpp:133
 #, c-format
 msgid "You get %s"
 msgstr "Vous recevez %s"
@@ -3591,22 +3555,15 @@ msgid "You have been invited you to join a party."
 msgstr "Vous avez été invité à rejoindre un groupe."
 
 #: ../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."
+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
+#, 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."
 
@@ -3615,34 +3572,23 @@ msgid "You have ceased to be."
 msgstr "Vous avez cessez d'exister."
 
 #: ../src/net/tmwa/partyhandler.cpp:241
-#, fuzzy
 msgid "You have left the party."
-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."
+msgstr "Vous avez quitté le groupe."
 
 #: ../src/net/tmwa/specialhandler.cpp:180
 msgid "You have no memos!"
 msgstr "Vous n'avez pas de messages !"
 
 #: ../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 !"
+msgstr "Vous n'avez pas encore atteint le niveau requis !"
 
 #: ../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."
+msgstr "Le client devra être redémarré afin de vous permettre de télécharger la musique."
 
-#: ../src/gui/setup_video.cpp:478 ../src/gui/setup_video.cpp:486
+#: ../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."
 
@@ -3656,8 +3602,7 @@ msgstr "Vous avez besoin d'une autre pierre précieuse rouge !"
 
 #: ../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."
+msgstr "Veuillez enregistrer votre compte sur la page du site prévue à cet effet."
 
 #: ../src/localplayer.cpp:1276
 #, c-format
@@ -3673,17 +3618,12 @@ msgstr "Vous avez ramassé  %s."
 
 #: ../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."
+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/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."
+msgstr "Vous avez mis trop de temps pour répondre au Captcha ou votre réponse est incorrecte."
 
 #: ../src/net/tmwa/playerhandler.cpp:131
 msgid "You're a stiff."
@@ -3714,12 +3654,8 @@ msgid "You've kicked the bucket."
 msgstr "Tu viens de toucher le fond."
 
 #: ../src/net/tmwa/playerhandler.cpp:137
-msgid ""
-"You've shuffled off your mortal coil, run down the curtain and joined the "
-"bleedin' choir invisibile."
-msgstr ""
-"Vous êtes sorti de votre enveloppe charnelle et mortelle. Vous avez rejoint "
-"l'armée de l'ombre."
+msgid "You've shuffled off your mortal coil, run down the curtain and joined the bleedin' choir invisibile."
+msgstr "Vous êtes sorti de votre enveloppe charnelle et mortelle. Vous avez rejoint l'armée de l'ombre."
 
 #: ../src/net/tmwa/guildhandler.cpp:310
 msgid "Your guild is full."
@@ -3735,18 +3671,15 @@ msgstr "Votre nom doit comporter un minimum de 4 caractères."
 
 #: ../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é."
+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/gui/setup_video.cpp:233
 msgid "as particle"
 msgstr "avec des particules"
 
-#: ../src/gui/setup_video.cpp:180 ../src/gui/setup_video.cpp:194
+#: ../src/gui/setup_video.cpp:180
+#: ../src/gui/setup_video.cpp:194
 msgid "high"
 msgstr "élevé"
 
@@ -3754,7 +3687,8 @@ msgstr "élevé"
 msgid "in chat"
 msgstr "dans la conversation"
 
-#: ../src/gui/setup_video.cpp:179 ../src/gui/setup_video.cpp:192
+#: ../src/gui/setup_video.cpp:179
+#: ../src/gui/setup_video.cpp:192
 msgid "low"
 msgstr "léger"
 
@@ -3783,7 +3717,8 @@ msgstr "requiert une nouvelle version"
 msgid "requires v%s"
 msgstr "requiert la v%s"
 
-#: ../src/resources/itemdb.cpp:162 ../src/resources/monsterdb.cpp:74
+#: ../src/resources/itemdb.cpp:162
+#: ../src/resources/monsterdb.cpp:74
 #: ../src/resources/monsterinfo.cpp:29
 msgid "unnamed"
 msgstr "anonyme"
diff --git a/src/client.cpp b/src/client.cpp
index d88c32c9..e955a75c 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -489,8 +489,6 @@ int Client::exec()
 
     while (mState != STATE_EXIT)
     {
-        bool handledEvents = false;
-
         if (game)
         {
             // Let the game handle the events while it is active
@@ -501,8 +499,6 @@ int Client::exec()
             // Handle SDL events
             while (SDL_PollEvent(&event))
             {
-                handledEvents = true;
-
                 switch (event.type)
                 {
                     case SDL_QUIT:
diff --git a/src/gui/buy.cpp b/src/gui/buy.cpp
index faa86cc9..299633e9 100644
--- a/src/gui/buy.cpp
+++ b/src/gui/buy.cpp
@@ -203,11 +203,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 207e3ded..b48df8df 100644
--- a/src/gui/skilldialog.cpp
+++ b/src/gui/skilldialog.cpp
@@ -54,6 +54,8 @@
 #include <set>
 #include <string>
 
+#define SKILLS_FILE "skills.xml"
+
 class SkillModel;
 class SkillEntry;
 
@@ -230,8 +232,7 @@ SkillDialog::SkillDialog():
 
 SkillDialog::~SkillDialog()
 {
-    // Clear gui
-    loadSkills("");
+    clearSkills();
 }
 
 void SkillDialog::action(const gcn::ActionEvent &event)
@@ -279,7 +280,7 @@ void SkillDialog::update()
     }
 }
 
-void SkillDialog::loadSkills(const std::string &file)
+void SkillDialog::clearSkills()
 {
     // Fixes issues with removing tabs
     if (mTabs->getSelectedTabIndex() != -1)
@@ -296,11 +297,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;
@@ -311,7 +314,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 95f8ef25..40fa988d 100644
--- a/src/gui/skilldialog.h
+++ b/src/gui/skilldialog.h
@@ -65,7 +65,9 @@ class SkillDialog : public Window, public gcn::ActionListener
          */
         void update();
 
-        void loadSkills(const std::string &file);
+        void loadSkills();
+
+        void clearSkills();
 
         void setModifiable(int id, bool modifiable);
 
diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index cea27960..4d0ad17e 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -1090,7 +1090,8 @@ void LocalPlayer::setMaxWeight(int value)
 {
     mMaxWeight = value;
 
-    inventoryWindow->updateWeight();
+    if (inventoryWindow)
+        inventoryWindow->updateWeight();
 }
 
 void LocalPlayer::setAttributeBase(int num, int value, bool notify)
diff --git a/src/log.cpp b/src/log.cpp
index acb9f67c..9fc6aa55 100644
--- a/src/log.cpp
+++ b/src/log.cpp
@@ -62,12 +62,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 341ab1d0..b1db3258 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 0d3073f1..4f6ade4e 100644
--- a/src/net/manaserv/generalhandler.cpp
+++ b/src/net/manaserv/generalhandler.cpp
@@ -166,7 +166,7 @@ void GeneralHandler::flushNetwork()
 void GeneralHandler::guiWindowsLoaded()
 {
     inventoryWindow->setSplitAllowed(true);
-    skillDialog->loadSkills("mana-skills.xml");
+    skillDialog->loadSkills();
     specialsWindow->loadSpecials("specials.xml");
 
     player_node->setExpNeeded(100);
diff --git a/src/net/tmwa/buysellhandler.cpp b/src/net/tmwa/buysellhandler.cpp
index 209f034d..fae63c67 100644
--- a/src/net/tmwa/buysellhandler.cpp
+++ b/src/net/tmwa/buysellhandler.cpp
@@ -112,11 +112,7 @@ void BuySellHandler::handleMessage(Net::MessageIn &msg)
             break;
 
         case SMSG_NPC_BUY_RESPONSE:
-            if (msg.readInt8() == 0)
-            {
-                localChatTab->chatLog(_("Thanks for buying."), BY_SERVER);
-            }
-            else
+            if (msg.readInt8() != 0)
             {
                 // Reset player money since buy dialog already assumed purchase
                 // would go fine
@@ -126,11 +122,8 @@ void BuySellHandler::handleMessage(Net::MessageIn &msg)
             break;
 
         case SMSG_NPC_SELL_RESPONSE:
-            if (msg.readInt8() == 0)
-                localChatTab->chatLog(_("Thanks for selling."), BY_SERVER);
-            else
+            if (msg.readInt8() != 0)
                 localChatTab->chatLog(_("Unable to sell."), BY_SERVER);
-
             break;
     }
 }
diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp
index 14f48055..12768807 100644
--- a/src/net/tmwa/generalhandler.cpp
+++ b/src/net/tmwa/generalhandler.cpp
@@ -212,7 +212,7 @@ void GeneralHandler::flushNetwork()
 void GeneralHandler::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 e58acb4d..7e654951 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 48e7f4b3..3dab8c34 100644
--- a/src/net/tmwa/playerhandler.cpp
+++ b/src/net/tmwa/playerhandler.cpp
@@ -21,6 +21,7 @@
 
 #include "net/tmwa/playerhandler.h"
 
+#include "configuration.h"
 #include "game.h"
 #include "localplayer.h"
 #include "log.h"
@@ -232,6 +233,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();
 
@@ -337,14 +340,20 @@ void PlayerHandler::handleMessage(Net::MessageIn &msg)
                     player_node->setExperience(JOB, msg.readInt32(),
                                     player_node->getExperience(JOB).second);
                     break;
-                case 0x0014: {
-                        int curGp = player_node->getMoney();
+                case 0x0014:
+                    {
+                        const int curGp = player_node->getMoney();
                         player_node->setMoney(msg.readInt32());
-                        if (player_node->getMoney() > curGp)
+                        if (player_node->getMoney() <= curGp)
+                            break;
+                        std::string money = Units::formatCurrency(
+                                            player_node->getMoney() - curGp);
+                        if (config.getValue("showpickupchat", 1))
                             localChatTab->chatLog(strprintf(_("You picked up "
-                                                              "%s."),
-                                Units::formatCurrency(player_node->getMoney()
-                                    - curGp).c_str()), BY_SERVER);
+                                            "%s."), money.c_str()), BY_SERVER);
+                        if (config.getValue("showpickupparticle", 1))
+                            player_node->addMessageToQueue(money,
+                                                    UserPalette::PICKUP_INFO);
                     }
                     break;
                 case 0x0016:
@@ -591,8 +600,13 @@ void PlayerHandler::increaseSkill(int skillId)
 
 void PlayerHandler::pickUp(FloorItem *floorItem)
 {
+    static Uint32 lastTime = 0;
+    if (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 c5f5d540..bcf5ba44 100644
--- a/src/net/tmwa/specialhandler.cpp
+++ b/src/net/tmwa/specialhandler.cpp
@@ -107,7 +107,8 @@ void SpecialHandler::handleMessage(Net::MessageIn &msg)
 
                 player_node->setAttributeBase(skillId, level);
                 player_node->setAttributeEffective(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 c524c43c..9ad8382b 100644
--- a/src/resources/spritedef.cpp
+++ b/src/resources/spritedef.cpp
@@ -260,7 +260,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 43f5264e..bd9fd2b1 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] != '/') {
diff --git a/src/utils/xml.cpp b/src/utils/xml.cpp
index 9835f88c..1970b062 100644
--- a/src/utils/xml.cpp
+++ b/src/utils/xml.cpp
@@ -149,7 +149,7 @@ namespace XML
             logger->log("Error in unknown xml file on line %d",
                         error->line);
 
-        logger->log(error->message);
+        logger->log("%s", error->message);
 
         // No need to keep errors around
         xmlCtxtResetLastError(error->ctxt);
diff --git a/src/winver.h b/src/winver.h
index fa85216e..89b7004f 100644
--- a/src/winver.h
+++ b/src/winver.h
@@ -1,6 +1,6 @@
 /* VERSION DEFINITIONS */
 #define VER_MAJOR 0
 #define VER_MINOR 5
-#define VER_RELEASE 1
+#define VER_RELEASE 2
 #define VER_BUILD 0
-#define PACKAGE_VERSION "0.5.1.0"
+#define PACKAGE_VERSION "0.5.2.0"