Update translation files.

7 files changed, 4539 insertions, 5520 deletions

diff --git a/po/es.po b/po/es.po
index bfd9a5bc1..b689bc548 100644
--- a/po/es.po
+++ b/po/es.po
@@ -2,25 +2,24 @@
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: manaplus\n"
+"Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
 "POT-Creation-Date: 2011-04-15 20:28+0300\n"
-"PO-Revision-Date: 2011-03-31 21:00+0000\n"
-"Last-Translator: Jumpy <antoinebcn@hotmail.com>\n"
+"PO-Revision-Date: 2011-04-15 17:45+0000\n"
+"Last-Translator: nelson6e65 <nelson6eeduardo65@gmail.com>\n"
 "Language-Team: Spanish (Castilian) <>\n"
-"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: src/actorspritemanager.cpp:909
-#, fuzzy
 msgid "Visible on map"
-msgstr "Nombres Visibles"
+msgstr "Visible sobre el mapa"
 
 #: src/being.cpp:489
 msgid "dodge"
@@ -86,7 +85,7 @@ msgstr "Cambiar e-mail"
 
 #: src/client.cpp:1122
 msgid "Email changed successfully!"
-msgstr "Email modificado correctamente!"
+msgstr "¡Email modificado correctamente!"
 
 #: src/client.cpp:1142
 msgid "Unregister Successful"
@@ -126,8 +125,8 @@ msgstr "¡No puedes enviar susurros vacíos!"
 #: src/commandhandler.cpp:380
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
-"you."
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
+" you."
 msgstr ""
 "No se puede crear una pestaña de susurro para el nick \"%s\"! O bien ya "
 "existe, o eres tú."
@@ -143,7 +142,7 @@ msgstr "Falta el nombre del grupo."
 
 #: src/commandhandler.cpp:427
 msgid "Guild name is missing."
-msgstr "Falta el nombre del clan."
+msgstr "Falta el nombre del gremio."
 
 #: src/commandhandler.cpp:440 src/commandhandler.cpp:547
 #: src/commandhandler.cpp:588 src/commandhandler.cpp:618
@@ -199,11 +198,11 @@ msgstr "El jugador no estaba ignorado!"
 
 #: src/commandhandler.cpp:606
 msgid "Player no longer ignored!"
-msgstr "El jugador ha sido devuelto al estado normal!"
+msgstr "¡El jugador ya no es ignorado!"
 
 #: src/commandhandler.cpp:608
 msgid "Player could not be unignored!"
-msgstr "El jugador no puede ser devuelto al estado normal!"
+msgstr "¡Al jugador no se le puede dejar de ignorar!"
 
 #: src/commandhandler.cpp:625
 msgid "Player already erased!"
@@ -258,25 +257,21 @@ msgstr[0] "%d segundo"
 msgstr[1] "%d segundos"
 
 #: src/commandhandler.cpp:995
-#, fuzzy
 msgid "font cache size"
-msgstr "Tamaño de fuente"
+msgstr "Cache de polizas"
 
 #: src/commandhandler.cpp:1008
-#, fuzzy
 msgid "Created: "
-msgstr "Crear"
+msgstr "Creado: "
 
 #: src/commandhandler.cpp:1009
-#, fuzzy
 msgid "Deleted: "
-msgstr "Borrar"
+msgstr "Eliminado: "
 
 #: src/commandhandler.h:40
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr ""
-"Opciones para /%s son \"yes\" e \"no\", \"true\" e \"false\", \"1\" e \"0\"."
+msgstr "Opciones para /%s son \"yes\" e \"no\", \"true\" e \"false\", \"1\" e \"0\"."
 
 #: src/game.cpp:228 src/gui/widgets/chattab.cpp:395
 msgid "General"
@@ -288,11 +283,11 @@ msgstr "Depurador"
 
 #: src/game.cpp:444
 msgid "Screenshot saved as "
-msgstr "Screenshot guardada como "
+msgstr "Captura de pantalla guardada como "
 
 #: src/game.cpp:452
 msgid "Saving screenshot failed!"
-msgstr "Fallo al guardar screenshot!"
+msgstr "¡El guardado de la captura de pantalla ha fallado!"
 
 #: src/game.cpp:491
 msgid "The connection to the server was lost."
@@ -361,7 +356,7 @@ msgstr "Resultado"
 
 #: src/gui/botcheckerwindow.cpp:307 src/gui/npcdialog.cpp:121
 msgid "Reset"
-msgstr "Resetear"
+msgstr "Restablecer"
 
 #: src/gui/buydialog.cpp:54 src/gui/buydialog.cpp:61 src/gui/buydialog.cpp:95
 #: src/gui/buyselldialog.cpp:63
@@ -517,7 +512,7 @@ msgstr "Estilo del cabello:"
 
 #: src/gui/charcreatedialog.cpp:87
 msgid "Race:"
-msgstr ""
+msgstr "Race:"
 
 #: src/gui/charcreatedialog.cpp:90 src/gui/charselectdialog.cpp:447
 #: src/gui/socialwindow.cpp:847
@@ -552,7 +547,7 @@ msgstr "Por favor extraiga %d puntos de estado"
 
 #: src/gui/charselectdialog.cpp:73
 msgid "Confirm Character Delete"
-msgstr "Confimar la supresión del personaje"
+msgstr "Confirmar la supresión del personaje"
 
 #: src/gui/charselectdialog.cpp:74
 msgid "Are you sure you want to delete this character?"
@@ -732,7 +727,7 @@ msgstr "Recuento de partículas: %d"
 #: src/gui/debugwindow.cpp:85
 #, c-format
 msgid "Map actors count: %d"
-msgstr "Numero de partes activas en el mapa: %d"
+msgstr "Numero de agentes en el mapa: %d"
 
 #: src/gui/debugwindow.cpp:91 src/gui/debugwindow.cpp:127
 #: src/gui/debugwindow.cpp:132
@@ -747,7 +742,7 @@ msgstr "Objetivo:"
 #: src/gui/debugwindow.cpp:93 src/gui/debugwindow.cpp:144
 #: src/gui/debugwindow.cpp:165
 msgid "Target Id:"
-msgstr "Id diana:"
+msgstr "Seccionar ID:"
 
 #: src/gui/debugwindow.cpp:94 src/gui/debugwindow.cpp:148
 #: src/gui/debugwindow.cpp:153 src/gui/debugwindow.cpp:166
@@ -770,7 +765,7 @@ msgstr "Cursor:"
 
 #: src/gui/debugwindow.cpp:197 src/gui/debugwindow.cpp:210
 msgid "Map actors count:"
-msgstr "Numero de partes activas en el mapa"
+msgstr "Numero de agentes en el mapa:"
 
 #: src/gui/debugwindow.cpp:218
 #, c-format
@@ -901,11 +896,11 @@ msgstr "Todo"
 
 #: src/gui/itemamountwindow.cpp:259
 msgid "Select amount of items to trade."
-msgstr "Selecionar la cantidad de objetos a intercambiar."
+msgstr "Seleccione la cantidad de objetos a intercambiar."
 
 #: src/gui/itemamountwindow.cpp:262
 msgid "Select amount of items to drop."
-msgstr "Selecionar cantidad de objetos a tirar."
+msgstr "Seleccione la cantidad de objetos a tirar."
 
 #: src/gui/itemamountwindow.cpp:265
 msgid "Select amount of items to store."
@@ -913,11 +908,11 @@ msgstr "Seleccione la cantidad de objetos a almacenar."
 
 #: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to retrieve."
-msgstr "Selecciona la cantidad de objetos a retirar."
+msgstr "Seleccione la cantidad de objetos a retirar."
 
 #: src/gui/itemamountwindow.cpp:271
 msgid "Select amount of items to split."
-msgstr "Selecionar la cantidad de objetos para dividir."
+msgstr "Selecione la cantidad de objetos para dividir."
 
 #: src/gui/itemamountwindow.cpp:274
 msgid "Add to buy shop."
@@ -942,7 +937,7 @@ msgstr "Peso: %s"
 
 #: src/gui/killstats.cpp:43 src/gui/windowmenu.cpp:66
 msgid "Kill stats"
-msgstr "Estadisticas"
+msgstr "Estadísticas"
 
 #: src/gui/killstats.cpp:61
 msgid "Reset stats"
@@ -966,16 +961,16 @@ msgstr " Quedan: "
 
 #: src/gui/killstats.cpp:74
 msgid " exp, Avg Mob for 1%: ?"
-msgstr " Promedia de experiencia per monstro 1%: ?"
+msgstr " Promedio de experiencia por monstruo 1%: ?"
 
 #: src/gui/killstats.cpp:75 src/gui/killstats.cpp:128
 msgid "Kills: ?, Total Exp: ?"
-msgstr "Matados: ?, Suma experiencia: ?"
+msgstr "Matados: ?, Experiencia total: ?"
 
 #: src/gui/killstats.cpp:76 src/gui/killstats.cpp:129
 msgid "Avg Exp: ?, No. of Avg mob to next level: ?"
 msgstr ""
-"Promedia experiencia: ?, NUméro promedio de monstros para rproximo nivel: ?"
+"Promedia experiencia: ?, Número promedio de monstruos para próximo nivel: ?"
 
 #: src/gui/killstats.cpp:77 src/gui/killstats.cpp:146
 msgid "Kills/Min: ?, Exp/Min: ?"
@@ -983,15 +978,15 @@ msgstr "Matados/Min: ?, Experiencia/Min: ?"
 
 #: src/gui/killstats.cpp:79
 msgid "Exp speed per 1 min: ?"
-msgstr "Experiencia para 1 minuto: ?"
+msgstr "Experiencia por 1 minuto: ?"
 
 #: src/gui/killstats.cpp:80
 msgid "Time for next level per 1 min: ?"
-msgstr "Tiempo hasta el proximo nivel 1 min: ?"
+msgstr "Tiempo hasta el próximo nivel 1 min: ?"
 
 #: src/gui/killstats.cpp:81
 msgid "Exp speed per 5 min: ?"
-msgstr "Experiencia para 5 minutos: ?"
+msgstr "Experiencia por 5 minutos: ?"
 
 #: src/gui/killstats.cpp:82
 msgid "Time for next level per 5 min: ?"
@@ -999,15 +994,15 @@ msgstr "Tiempo hasta el proximo 5 mInutos: ?"
 
 #: src/gui/killstats.cpp:83
 msgid "Exp speed per 15 min: ?"
-msgstr "Experiencia para 15 Minutos: ?"
+msgstr "Experiencia por 15 Minutos: ?"
 
 #: src/gui/killstats.cpp:84
 msgid "Time for Next level per 15 min: ?"
-msgstr "Tiempo hasta el proximo nivel 15 min: ?"
+msgstr "Tiempo hasta el próximo nivel 15 min: ?"
 
 #: src/gui/killstats.cpp:86
 msgid "Last kill exp: ?"
-msgstr "Expericia del ultimo monstro matado: ?"
+msgstr "Experiencia del último monstro matado: ?"
 
 #: src/gui/killstats.cpp:87
 msgid "Time before jacko spawn: ?"
@@ -1193,7 +1188,7 @@ msgstr "Quitárselo antes"
 
 #: src/gui/outfitwindow.cpp:87
 msgid "Away outfit"
-msgstr "Vestido de ausencia"
+msgstr "Fuera conjunto"
 
 #: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:529
 msgid "@@trade|Trade@@"
@@ -1203,12 +1198,12 @@ msgstr "@@trade|Intercambio@@"
 #: src/gui/popupmenu.cpp:126 src/gui/popupmenu.cpp:246
 #: src/gui/popupmenu.cpp:530
 msgid "@@attack|Attack@@"
-msgstr "@@attack|ataque@@"
+msgstr "@@attack|Ataque@@"
 
 #. TRANSLATORS: Whispering a player.
 #: src/gui/popupmenu.cpp:128 src/gui/popupmenu.cpp:301
 msgid "@@whisper|Whisper@@"
-msgstr "@@whisper|Suspiro@@"
+msgstr "@@whisper|Susurrar@@"
 
 #: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:534
 msgid "@@heal|Heal@@"
@@ -1248,13 +1243,13 @@ msgstr "@@erase|Eliminar@@"
 #: src/gui/popupmenu.cpp:553 src/gui/popupmenu.cpp:559
 #: src/gui/popupmenu.cpp:564
 msgid "@@unignore|Unignore@@"
-msgstr "@@unignore|Desactivar  Ignorar@@"
+msgstr "@@unignore|Dejar de Ignorar@@"
 
 #: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:164
 #: src/gui/popupmenu.cpp:321 src/gui/popupmenu.cpp:333
 #: src/gui/popupmenu.cpp:554 src/gui/popupmenu.cpp:566
 msgid "@@ignore|Completely ignore@@"
-msgstr "@@ignore|Completamente ignorar@@"
+msgstr "@@ignore|Ignorar completamente@@"
 
 #: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:341
 #: src/gui/popupmenu.cpp:574
@@ -1264,11 +1259,11 @@ msgstr "@@follow|Seguir@@"
 #: src/gui/popupmenu.cpp:173 src/gui/popupmenu.cpp:342
 #: src/gui/popupmenu.cpp:575
 msgid "@@imitation|Imitation@@"
-msgstr "@@imitation|Imitacion@@"
+msgstr "@@imitation|Imitación@@"
 
 #: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:594
 msgid "@@party|Invite to party@@"
-msgstr "@@party|Invitar en el grupo@@"
+msgstr "@@party|Invitar al grupo@@"
 
 #: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:350
 #: src/gui/popupmenu.cpp:599
@@ -1278,17 +1273,17 @@ msgstr "@@kick party|Sacar del grupo@@"
 #: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:360
 #: src/gui/popupmenu.cpp:613
 msgid "@@guild-kick|Kick from guild@@"
-msgstr "@@guild-kick|Sacar de la guild@@"
+msgstr "@@guild-kick|Sacar dela gremio@@"
 
 #: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:361
 #: src/gui/popupmenu.cpp:615
 msgid "@@guild-pos|Change pos in guild >@@"
-msgstr "@@guild-pos|Cambiar la posicion en la guild >@@"
+msgstr "@@guild-pos|Cambiar la posición en en gremio >@@"
 
 #: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:365
 #: src/gui/popupmenu.cpp:620
 msgid "@@guild|Invite to guild@@"
-msgstr "@@guild|Invitar en la guild@@"
+msgstr "@@guild|Invitar al gremio@@"
 
 #: src/gui/popupmenu.cpp:217
 msgid "@@admin-kick|Kick player@@"
@@ -1327,7 +1322,7 @@ msgstr "@@admin-kick|Sacar@@"
 
 #: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:376
 msgid "@@name|Add name to chat@@"
-msgstr "@@name|Inscribir el nombre en el dialogo@@"
+msgstr "@@name|Agregar nombre al chat@@"
 
 #: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:284
 #: src/gui/popupmenu.cpp:380 src/gui/popupmenu.cpp:408
@@ -1348,7 +1343,7 @@ msgstr "@@recojer|Recoger@@"
 
 #: src/gui/popupmenu.cpp:404
 msgid "@@chat|Add to chat@@"
-msgstr "@@chat|Inscribir en el dialogo@@"
+msgstr "@@chat|Agregar al chat@@"
 
 #: src/gui/popupmenu.cpp:422
 msgid "Map Item"
@@ -1698,9 +1693,8 @@ msgid "Limit max lines in chat"
 msgstr "Limitar líneas máx. en chat"
 
 #: src/gui/setup_chat.cpp:132
-#, fuzzy
 msgid "Resize chat tabs if need"
-msgstr "Linea siguiente de dialogo"
+msgstr "Si hace falta, cambia el tamaño de ventanas de dialogo"
 
 #: src/gui/setup_colors.cpp:46
 msgid "This is what the color looks like"
@@ -1815,7 +1809,7 @@ msgstr "Mostrar daño infligido a monstruos"
 
 #: src/gui/setup_other.cpp:107
 msgid "Auto target only reachable monsters"
-msgstr "Eligir automaticamente unicamente los monstruos alcanzables"
+msgstr "Eligir automáticamente sólo a los monstruos alcanzables"
 
 #: src/gui/setup_other.cpp:111
 msgid "Highlight map portals"
@@ -1823,11 +1817,11 @@ msgstr "Resaltar las puertas del mapa"
 
 #: src/gui/setup_other.cpp:116
 msgid "Highlight player attack range"
-msgstr "Resaltar elalcanze de ataque del jugador"
+msgstr "Resaltar el alcance de ataque del jugador"
 
 #: src/gui/setup_other.cpp:121
 msgid "Highlight monster attack range"
-msgstr "Resaltar elalcanze de ataque de los monstruos"
+msgstr "Resaltar el alcanze de ataque de los monstruos"
 
 #: src/gui/setup_other.cpp:125
 msgid "Cycle player targets"
@@ -1855,11 +1849,11 @@ msgstr "Habilitar la tienda"
 
 #: src/gui/setup_other.cpp:151
 msgid "Enable buggy servers protection"
-msgstr "Habilitar la protecion contra servidores defectuosos"
+msgstr "Habilitar la proteción contra servidores defectuosos"
 
 #: src/gui/setup_other.cpp:154
 msgid "Enable debug log"
-msgstr "Hablitar registrar a las informaciones"
+msgstr "Habilitar registro de depuración"
 
 #: src/gui/setup_other.cpp:157
 msgid "Enable server side attack"
@@ -1867,7 +1861,7 @@ msgstr "Habilitar los ataques colaterales de servidor"
 
 #: src/gui/setup_other.cpp:160
 msgid "Auto fix position"
-msgstr "Correccion automatica de la posicion"
+msgstr "Corrección automatica de la posición"
 
 #: src/gui/setup_other.cpp:163
 msgid "Attack while moving"
@@ -1879,7 +1873,7 @@ msgstr "Habilitar estadísticas rápidas"
 
 #: src/gui/setup_other.cpp:169
 msgid "Show warps particles"
-msgstr "Mostrar las particulas de effetos"
+msgstr "Mostrar las partículas de efectos"
 
 #: src/gui/setup_other.cpp:172
 msgid "Accept sell/buy requests"
@@ -1895,11 +1889,11 @@ msgstr "Mostrar la propia barra de energía"
 
 #: src/gui/setup_other.cpp:181
 msgid "Show job exp messages"
-msgstr "Mostrar les mensajes de expériencia de competencia"
+msgstr "Mostrar los mensajes de experiencia de trabajo"
 
 #: src/gui/setup_other.cpp:184
 msgid "Show players popups"
-msgstr "Mostrar las ventanas de jugadores"
+msgstr "Mostrar las ventanas emergentes de jugadores"
 
 #: src/gui/setup_other.cpp:187
 msgid "Show extended minimaps"
@@ -2151,7 +2145,7 @@ msgstr "Limite FPS:"
 #: src/gui/setup_video.cpp:312 src/gui/setup_video.cpp:351
 #: src/gui/setup_video.cpp:647 src/gui/setup_video.cpp:810
 msgid "Alt FPS limit: "
-msgstr "Limites alternativas FPS : "
+msgstr "Limites alternativas FPS: "
 
 #: src/gui/setup_video.cpp:322
 msgid "Video"
@@ -2369,7 +2363,7 @@ msgstr "Estás seguro de que quieres salir del grupo %s?"
 
 #: src/gui/socialwindow.cpp:515
 msgid "Nav"
-msgstr "Navegacion"
+msgstr "Navegación"
 
 #: src/gui/socialwindow.cpp:784
 msgid "Create Guild"
@@ -2503,7 +2497,7 @@ msgstr "(C) moverse con movimientos locos"
 
 #: src/gui/statuspopup.cpp:214
 msgid "(d) double normal + crazy"
-msgstr "(d) double normal + loco"
+msgstr "(d) doble normal + loco"
 
 #: src/gui/statuspopup.cpp:219
 msgid "(?) move"
@@ -2543,7 +2537,7 @@ msgstr "(7) moverse al objetivo en distancia 7"
 
 #: src/gui/statuspopup.cpp:281
 msgid "(A) moves to target in attack range"
-msgstr "(A) desplazarse hasta la diana en el rango de ataque"
+msgstr "(A) desplazarse al objetivo en el rango de ataque"
 
 #: src/gui/statuspopup.cpp:286
 msgid "(?) move to target"
@@ -2695,7 +2689,7 @@ msgstr "(?) imitación"
 
 #: src/gui/statuspopup.cpp:491
 msgid "(O) on keyboard"
-msgstr "(O) Presente al teclado"
+msgstr "(O) presente al teclado"
 
 #: src/gui/statuspopup.cpp:494
 msgid "(A) away"
@@ -2715,7 +2709,7 @@ msgstr "(F) modo de cámara libre"
 
 #: src/gui/statuspopup.cpp:513
 msgid "(D) design camera mode"
-msgstr "(D) Definir el modo operativo de la camera"
+msgstr "(D) Definir el modo operativo de la cámara"
 
 #: src/gui/statuspopup.cpp:524
 msgid "Game modifiers are disabled"
@@ -3022,7 +3016,8 @@ msgid "Change"
 msgstr "Cambiar"
 
 #: src/gui/trade.cpp:314
-msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Fallo al añadir objeto. No puedes añadir más de un mismo tipo de objeto en "
 "la ventana."
@@ -3176,11 +3171,11 @@ msgstr "Muchos fallos al atacar"
 
 #: src/gui/userpalette.cpp:145
 msgid "Portal Highlight"
-msgstr "Mostrar las puertas"
+msgstr "Resaltar portal"
 
 #: src/gui/userpalette.cpp:147
 msgid "Collision Highlight"
-msgstr "Mostrar las colisiones"
+msgstr "Resaltar colisión"
 
 #: src/gui/userpalette.cpp:149
 msgid "Walkable Highlight"
@@ -3200,11 +3195,11 @@ msgstr "Alcance de ataque de Monstruos"
 
 #: src/gui/userpalette.cpp:157
 msgid "Home Place"
-msgstr "Situacion"
+msgstr "Lugar de Inicio"
 
 #: src/gui/userpalette.cpp:159
 msgid "Home Place Border"
-msgstr "Limites de la situacion"
+msgstr "Limites de Lugar de Inicio"
 
 #: src/gui/userpalette.cpp:161
 msgid "Road Point"
@@ -3366,7 +3361,8 @@ msgid "Command: /unignore <player>"
 msgstr "Comando: /unignore <jugador>"
 
 #: src/gui/widgets/whispertab.cpp:129
-msgid "This command stops ignoring the other player if they are being ignored."
+msgid ""
+"This command stops ignoring the other player if they are being ignored."
 msgstr "Este comando para de ignorar al jugador si había sido ignorado."
 
 #: src/gui/windowmenu.cpp:62
@@ -3527,7 +3523,7 @@ msgstr "Coger"
 
 #: src/keyboardconfig.cpp:68
 msgid "Change Pickup Type"
-msgstr "Cambiar el tipo  de recogida"
+msgstr "Cambiar el tipo de recogida"
 
 #: src/keyboardconfig.cpp:70
 msgid "Hide Windows"
@@ -3547,11 +3543,11 @@ msgstr "Habilitar/Desabilitar intercambios"
 
 #: src/keyboardconfig.cpp:76
 msgid "Change Map View Mode"
-msgstr "Cambiar el tipo de vison del mapa"
+msgstr "Cambiar el tipo de vista del mapa"
 
 #: src/keyboardconfig.cpp:78
 msgid "Item Shortcuts Key"
-msgstr "Teclas de acceso directo de objetos"
+msgstr "Tecla de acceso directo de objeto"
 
 #: src/keyboardconfig.cpp:80 src/keyboardconfig.cpp:82
 #: src/keyboardconfig.cpp:84 src/keyboardconfig.cpp:86
@@ -3630,7 +3626,7 @@ msgstr "Ventana de lanzamiento de objetos"
 
 #: src/keyboardconfig.cpp:147
 msgid "Kills Stats Window"
-msgstr "ana de estadisticas"
+msgstr "Ventana de estadisticas"
 
 #: src/keyboardconfig.cpp:149
 msgid "Commands Window"
@@ -3638,7 +3634,7 @@ msgstr "Ventana de comandos"
 
 #: src/keyboardconfig.cpp:151
 msgid "Bot Checker Window"
-msgstr "Ventan de control de robot"
+msgstr "Ventana de comprobador de robot"
 
 #: src/keyboardconfig.cpp:154
 msgid "Who Is Online Window"
@@ -3821,7 +3817,7 @@ msgstr "Encender / Apagar audio"
 
 #: src/keyboardconfig.cpp:320
 msgid "Enable / Disable away mode"
-msgstr "Habilitar deshabilitar la ausencia"
+msgstr "Habilitar / Deshabilitar la ausencia"
 
 #: src/keyboardconfig.cpp:322
 msgid "Emulate right click from keyboard"
@@ -3846,7 +3842,7 @@ msgstr "Fuiste eliminado por "
 
 #: src/localplayer.cpp:1344
 msgid "Tried to pick up nonexistent item."
-msgstr "Intenaste recoger un objeto inexistante."
+msgstr "Intentaste recoger un objeto inexistante."
 
 #: src/localplayer.cpp:1346
 msgid "Item is too heavy."
@@ -3887,26 +3883,23 @@ msgstr "Fuera del Teclado"
 
 #: src/localplayer.cpp:3392
 msgid "Follow: "
-msgstr ""
+msgstr "Seguir: "
 
 #: src/localplayer.cpp:3394 src/localplayer.cpp:3409
-#, fuzzy
 msgid "Follow canceled"
-msgstr "Intercambio Cancelado."
+msgstr "Seguir cancelado"
 
 #: src/localplayer.cpp:3401
-#, fuzzy
 msgid "Imitation: "
-msgstr "(?) imitación"
+msgstr "Imitacion: "
 
 #: src/localplayer.cpp:3403 src/localplayer.cpp:3411
-#, fuzzy
 msgid "Imitation canceled"
-msgstr "Intercambio Cancelado."
+msgstr "Imitar cancelado"
 
 #: src/localplayer.cpp:3763
 msgid "You see "
-msgstr "Vez "
+msgstr "Ves "
 
 #: src/main.cpp:45
 msgid "manaplus [options] [mana-file]"
@@ -4087,7 +4080,8 @@ msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
-"Parece que tu plan de romper las armas de tus enemigos con tu garganta falló!"
+"Parece que tu plan de romper las armas de tus enemigos con tu garganta "
+"falló!"
 
 #: src/net/manaserv/beinghandler.cpp:325 src/net/tmwa/playerhandler.cpp:112
 msgid "I guess this did not run too well."
@@ -4594,7 +4588,6 @@ msgid "M.Defense"
 msgstr "Defensa M."
 
 #: src/net/tmwa/generalhandler.cpp:259
-#, fuzzy
 msgid "% Accuracy"
 msgstr "% Presición"
 
@@ -4656,7 +4649,7 @@ msgstr "Ya estás en el gremio."
 
 #: src/net/tmwa/guildhandler.cpp:120
 msgid "Emperium check failed."
-msgstr "La verificacion de la guild no se effe."
+msgstr "La verificación de la guild no se effectuó."
 
 #: src/net/tmwa/guildhandler.cpp:125
 msgid "Unknown server response."
@@ -4695,17 +4688,17 @@ msgstr "Nivel promedio: %d"
 #: src/net/tmwa/guildhandler.cpp:215
 #, c-format
 msgid "Guild exp: %d"
-msgstr "Experiencia de la guild: %d"
+msgstr "Experiencia del gremio: %d"
 
 #: src/net/tmwa/guildhandler.cpp:217
 #, c-format
 msgid "Guild next exp: %d"
-msgstr "Experiencia siguiente de al Guild: %d"
+msgstr "Experiencia siguiente del gremio: %d"
 
 #: src/net/tmwa/guildhandler.cpp:219
 #, c-format
 msgid "Guild castle: %s"
-msgstr "Castillo de la guild: %s"
+msgstr "Castillo del gremio: %s"
 
 #: src/net/tmwa/guildhandler.cpp:434
 msgid "Could not inivte user to guild."
@@ -4738,12 +4731,12 @@ msgstr "%s ha dejado tu gremio."
 
 #: src/net/tmwa/guildhandler.cpp:522
 msgid "You was kicked from guild."
-msgstr "Si, fuiste sacado de la guild."
+msgstr "Usted fue expulsado del gremio."
 
 #: src/net/tmwa/guildhandler.cpp:536
 #, c-format
 msgid "%s has kicked from your guild."
-msgstr "%s saco alguien de tu guild."
+msgstr "%s saco alguien de tu gremio."
 
 #: src/net/tmwa/gui/partytab.cpp:68
 msgid "/invite > Invite a player to your party"
@@ -4795,7 +4788,8 @@ msgstr "Comando: /item"
 
 #: src/net/tmwa/gui/partytab.cpp:100
 msgid "This command displays the party's current item sharing policy."
-msgstr "Este comando muestra el actual estado de compartir objetos en el grupo"
+msgstr ""
+"Este comando muestra el actual estado de compartir objetos en el grupo"
 
 #: src/net/tmwa/gui/partytab.cpp:105
 msgid "Command: /exp <policy>"
@@ -4890,13 +4884,12 @@ msgstr "Rechazado del servidor."
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
-"Has sido baneado permanentemente del juego. Por favor contacta con el equipo "
-"GM."
+"Has sido baneado permanentemente del juego. Por favor contacta con el equipo"
+" GM."
 
 #: src/net/tmwa/loginhandler.cpp:178
-#, fuzzy
 msgid "Client too old."
-msgstr "La version del cliente es demasiado antigua."
+msgstr "Cliente es demasiado viejo."
 
 #: src/net/tmwa/loginhandler.cpp:181
 #, c-format
@@ -4909,16 +4902,15 @@ msgstr ""
 
 #: src/net/tmwa/loginhandler.cpp:188
 msgid "Server overpopulated."
-msgstr ""
+msgstr "Servidor sobrepoblado."
 
 #: src/net/tmwa/loginhandler.cpp:191
 msgid "This user name is already taken."
 msgstr "Este nombre de usuario ya está escogido."
 
 #: src/net/tmwa/loginhandler.cpp:197
-#, fuzzy
 msgid "Username permanently erased."
-msgstr "Usuario ya existe."
+msgstr "Nombre de usuario borrado permanentemente."
 
 #: src/net/tmwa/network.cpp:149
 msgid "Empty address given to Network::connect()!"
@@ -4968,7 +4960,7 @@ msgstr "%s no puede unirse a yu grupo porque está lleno."
 #: src/net/tmwa/partyhandler.cpp:197
 #, c-format
 msgid "QQQ Unknown invite response for %s."
-msgstr "QQQ respuesta desconocida a la invitacion de  %s."
+msgstr "QQQ respuesta desconocida a la invitacion de %s."
 
 #: src/net/tmwa/partyhandler.cpp:357
 msgid "You have left the party."
@@ -5056,11 +5048,13 @@ msgstr "Mensaje"
 
 #: src/net/tmwa/playerhandler.cpp:333
 msgid ""
-"You are carrying more than half your weight. You are unable to regain health."
+"You are carrying more than half your weight. You are unable to regain "
+"health."
 msgstr "Llevas más de la mitad del peso que puedes. No recuperarás PV o PM."
 
 #: src/net/tmwa/playerhandler.cpp:343
-msgid "You are carrying less than half your weight. You are can regain health."
+msgid ""
+"You are carrying less than half your weight. You are can regain health."
 msgstr ""
 "Estás cargando menos de la mitad de tu peso. Ahora puedes recobrar la salud."
 
@@ -5252,287 +5246,3 @@ msgstr "PM %+d"
 #: src/resources/itemdb.cpp:166
 msgid "Unknown item"
 msgstr "Objeto desconocido"
-
-#~ msgid "-- Help --"
-#~ msgstr "--Ayuda--"
-
-#~ msgid "/help > Display this help"
-#~ msgstr "/help > Muestra esta ayuda"
-
-#~ msgid "/where > Display map name"
-#~ msgstr "/where > Muestra el nombre del mapa"
-
-#~ msgid "/who > Display number of online users"
-#~ msgstr "/who > Muestra el número de jugadores on-line"
-
-#~ msgid "/me > Tell something about yourself"
-#~ msgstr "/me > Para decir algo sobre ti"
-
-#~ msgid "/clear > Clears this window"
-#~ msgstr "/clear > Limpia esta ventana"
-
-#~ msgid "/msg > Send a private message to a user"
-#~ msgstr "/msg > Enviar un mensaje privado a un jugador"
-
-#~ msgid "/whisper > Alias of msg"
-#~ msgstr "/whisper > Lo mismo que /msg"
-
-#~ msgid "/w > Alias of msg"
-#~ msgstr "/w > Lo mismo que /msg"
-
-#~ msgid "/query > Makes a tab for private messages with another user"
-#~ msgstr "/query > Abre una pestaña de mensajes con otro jugador"
-
-#~ msgid "/q > Alias of query"
-#~ msgstr "/q > Lo mismo que /query"
-
-#~ msgid "/away > Tell the other whispering players you're away from keyboard."
-#~ msgstr ""
-#~ "/away > Les dice a los otros que estas fuera del PC mensaje privado ."
-
-#~ msgid "/ignore > ignore a player"
-#~ msgstr "/ignore > Ignora un jugador (no se muestran susurros y/o mensajes)"
-
-#~ msgid "/unignore > stop ignoring a player"
-#~ msgstr "/unignore > Deja de ignorar un jugador"
-
-#~ msgid "/ignoreall > Ignore all opened whisper tabs"
-#~ msgstr "/ignoreall > Ignorar todas las pestañas de susurros abiertas"
-
-#~ msgid "/erase > Erase a player"
-#~ msgstr "Borrar un jugador"
-
-#~ msgid "/befriend > Be friend a player"
-#~ msgstr "/befriend > Ser amigo de un jugador"
-
-#~ msgid "/disregard > Disregard a player"
-#~ msgstr "/disregard > Desatender a un jugador"
-
-#~ msgid "/neutral > Neutral a player"
-#~ msgstr "/neutral > Neutral a un jugador"
-
-#~ msgid "/list > Display all public channels"
-#~ msgstr "/list > Muestra todos los canales públicos"
-
-#~ msgid "/join > Join or create a channel"
-#~ msgstr "/join > Unirse o crear un canal"
-
-#~ msgid "/createparty > Create a new party"
-#~ msgstr "/createparty > Crear un nuevo grupo"
-
-#~ msgid "/createguild > Create a new guild"
-#~ msgstr "/createguild > Crear un nuevo gremio"
-
-#~ msgid "/party > Invite a user to party"
-#~ msgstr "/party > Invitar un jugador al grupo"
-
-#~ msgid "/toggle > Determine whether <return> toggles the chat log"
-#~ msgstr "/toggle > Determina si <enter> muestra/esconde el chat"
-
-#~ msgid ""
-#~ "/present > Get list of players present (sent to chat log, if logging)"
-#~ msgstr ""
-#~ "/present > Muestra la lista de jugadores presentes (enviar al log del "
-#~ "chat)"
-
-#~ msgid "/announce > Global announcement (GM only)"
-#~ msgstr "/announce > Anuncio Global (Solo GMs)"
-
-#~ msgid "/closeall > Close all opened whisper tabs"
-#~ msgstr "/closeall > Cerrar todas las pestañas de susurro abiertas"
-
-#~ msgid "/all > Show all visible beings in debug tab"
-#~ msgstr "Mostrar todos los seres visibles en la pestaña de depuración"
-
-#~ msgid "/move > Move to given position"
-#~ msgstr "/move > Mover a la posición dada"
-
-#~ msgid "/navigate > Draw path to given position"
-#~ msgstr "/navigate > Dibujar trayectoria hasta la posición dada"
-
-#~ msgid "/target > Set target to being"
-#~ msgstr "/target > Poner como objetivo a existencia"
-
-#~ msgid "/outfit > Wear outfit by index"
-#~ msgstr "/outfit > Ponerse conjunto por índice"
-
-#~ msgid "/emote > Show emote by index"
-#~ msgstr "Mostrar emoticón por índice"
-
-#~ msgid "/follow > Follow player"
-#~ msgstr "/follow > Seguir a jugador"
-
-#~ msgid "/imitation > Imitate player"
-#~ msgstr "/imitation > Imitar a jugador"
-
-#~ msgid "/heal > Heal player"
-#~ msgstr "/heal > Curar a jugador"
-
-#~ msgid "/mail > Send offline message to player"
-#~ msgstr "/mail > Enviar un mensaje sin conexión a jugador"
-
-#~ msgid "For more information, type /help <command>."
-#~ msgstr "Para más información,  pon /help <comando>."
-
-#~ msgid "Command: /help"
-#~ msgstr "Comando: /help"
-
-#~ msgid "This command displays a list of all commands available."
-#~ msgstr "Para ver la lista de comandos disponibles."
-
-#~ msgid "Command: /help <command>"
-#~ msgstr "Comando: /help <comando>"
-
-#~ msgid "This command displays help on <command>."
-#~ msgstr "Para ver la ayuda en <comando>"
-
-#~ msgid "Command: /announce <msg>"
-#~ msgstr "Comando: /announce <mensaje>"
-
-#~ msgid "*** only available to a GM ***"
-#~ msgstr "*** Disponible solo para GMs ***"
-
-#~ msgid ""
-#~ "This command sends the message <msg> to all players currently online."
-#~ msgstr ""
-#~ "Este comando envía un mensaje <mensaje> para todos los jugadores online."
-
-#~ msgid "Command: /clear"
-#~ msgstr "Comando: /clear"
-
-#~ msgid "This command clears the chat log of previous chat."
-#~ msgstr "Este comando limpia la pestaña actual del chat previo."
-
-#~ msgid "Command: /ignore <player>"
-#~ msgstr "Comando: /ignore <jugador>"
-
-#~ msgid ""
-#~ "This command ignores the given player regardless of current relations."
-#~ msgstr ""
-#~ "Este comando es para ignorar al jugador indicado, independientemente de "
-#~ "la relación actual."
-
-#~ msgid "Command: /join <channel>"
-#~ msgstr "Comando: /join <canal>"
-
-#~ msgid "This command makes you enter <channel>."
-#~ msgstr "Este comando te hace entrar en <canal>."
-
-#~ msgid "If <channel> doesn't exist, it's created."
-#~ msgstr "Si el  <canal> no existe, sera creado."
-
-#~ msgid "Command: /list"
-#~ msgstr "Comando: /list"
-
-#~ msgid "This command shows a list of all channels."
-#~ msgstr "Este comando muestra una lista con todos los canales."
-
-#~ msgid "Command: /me <message>"
-#~ msgstr "Comando: /me <mensaje>"
-
-#~ msgid "This command tell others you are (doing) <msg>."
-#~ msgstr ""
-#~ "Este comando muestra a los otros lo que tú estas (haciendo) <mensaje>."
-
-#~ msgid "Command: /msg <nick> <message>"
-#~ msgstr "Comando: /msg <nick> <mensaje>"
-
-#~ msgid "Command: /whisper <nick> <message>"
-#~ msgstr "Comando: /whisper <nick> <mensaje>"
-
-#~ msgid "Command: /w <nick> <message>"
-#~ msgstr "Comando: /w <nick> <mensaje>"
-
-#~ msgid "This command sends the text <message> to <nick>."
-#~ msgstr "Este comando envía el texto <mensaje> para el jugador <nick>."
-
-#~ msgid "Command: /query <nick>"
-#~ msgstr "Comando: /query <nick>"
-
-#~ msgid "Command: /q <nick>"
-#~ msgstr "Comando: /q <nick>"
-
-#~ msgid "This command tries to make a tab for whispers betweenyou and <nick>."
-#~ msgstr ""
-#~ "Este comando crea una pestaña para mensajes privados con el jugador "
-#~ "<nick>."
-
-#~ msgid "Command: /away <afk reason>"
-#~ msgstr "Comando: /away <motivo>"
-
-#~ msgid "This command tells you're away from keyboard with the given reason."
-#~ msgstr "Este comando muestra que no estas en el PC por una razon dada."
-
-#~ msgid "Command: /away"
-#~ msgstr "Comando: /away"
-
-#~ msgid "This command clears the away status and message."
-#~ msgstr "Este comando limpia el status y los mensajes \"away\"."
-
-#~ msgid "Command: /createparty <name>"
-#~ msgstr "Comando: /createparty <nombre>"
-
-#~ msgid "This command creates a new party called <name>."
-#~ msgstr "Este comando crea un nuevo grupo llamado <nombre>."
-
-#~ msgid "Command: /createguild <name>"
-#~ msgstr "Comando: /createguild <nombre>"
-
-#~ msgid "This command creates a new guild called <name>."
-#~ msgstr "Este comando crea un nuevo gremio llamado <nombre>."
-
-#~ msgid "Command: /party <nick>"
-#~ msgstr "Comando: /party <nick>"
-
-#~ msgid "Command: /present"
-#~ msgstr "Comando: /present"
-
-#~ msgid ""
-#~ "This command gets a list of players within hearing and sends it to chat "
-#~ "log."
-#~ msgstr ""
-#~ "Este comando obtiene una lista de los jugadores dentro de la audiencia y "
-#~ "lo envía al registro de la charla."
-
-#~ msgid "Command: /toggle <state>"
-#~ msgstr "Comando: /toggle <estado>"
-
-#~ msgid ""
-#~ "This command sets whether the return key should toggle the chat log, or "
-#~ "whether the chat log turns off automatically."
-#~ msgstr ""
-#~ "Este comando determina si la tecla de retorno debe cambiar el registro de "
-#~ "charla, o si el registro de charla se apaga automáticamente."
-
-#~ msgid ""
-#~ "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
-#~ "\"0\", \"no\", \"false\" to turn the toggle off."
-#~ msgstr ""
-#~ "<estado> puede ser \"1\", \"yes\" y \"true\" para activar o \"0\", \"no\" "
-#~ "y \"false\" para desactivar."
-
-#~ msgid "Command: /toggle"
-#~ msgstr "Comando: /toggle"
-
-#~ msgid "This command displays the return toggle status."
-#~ msgstr "Este comando muestra el estado de alternar retorno."
-
-#~ msgid ""
-#~ "This command stops ignoring the given player if they are being ignored"
-#~ msgstr ""
-#~ "Este comando deja de ignorar al jugador dado cuando está siendo ignorado"
-
-#~ msgid "Command: /where"
-#~ msgstr "Comando: /where"
-
-#~ msgid "This command displays the name of the current map."
-#~ msgstr "Muestra el nombre del mapa actual."
-
-#~ msgid "Command: /who"
-#~ msgstr "Comando: /who"
-
-#~ msgid "This command displays the number of players currently online."
-#~ msgstr "Este comando muestra el número de jugadores que están en línea."
-
-#~ msgid "Type /help for a list of commands."
-#~ msgstr "Escribe /help para una lista de comandos."
diff --git a/po/fi.po b/po/fi.po
index faab4cb38..9f98ffb67 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,3763 +1,5251 @@
-# 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.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR The ManaPlus Developers
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: mana\n"
-"Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-03-05 21:52+0100\n"
-"PO-Revision-Date: 2009-07-25 15:42+0000\n"
-"Last-Translator: gemis <vienamo@mbnet.fi>\n"
-"Language-Team: Finnish <fi@li.org>\n"
+"Project-Id-Version: ManaPlus\n"
+"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
+"POT-Creation-Date: 2011-04-15 20:28+0300\n"
+"PO-Revision-Date: 2011-04-15 17:33+0000\n"
+"Last-Translator: akaras <akaras@inbox.ru>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"Language: fi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: src/client.cpp:553 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:62
+#: src/actorspritemanager.cpp:909
+msgid "Visible on map"
+msgstr ""
+
+#: src/being.cpp:489
+msgid "dodge"
+msgstr ""
+
+#: src/being.cpp:489
+msgid "miss"
+msgstr ""
+
+#: src/client.cpp:752 src/gui/setup.cpp:48 src/gui/windowmenu.cpp:93
 msgid "Setup"
 msgstr "Asetukset"
 
-#: src/client.cpp:623
-#, fuzzy
+#: src/client.cpp:826
 msgid "Connecting to server"
-msgstr "Yhdistetään kartta palvelimelle"
+msgstr "Yhdistän palvelimeen"
 
-#: src/client.cpp:650
-#, fuzzy
+#: src/client.cpp:857
 msgid "Logging in"
-msgstr "Kirjaudu sisään"
+msgstr "Kirjaudun sisään"
 
-#: src/client.cpp:683
+#: src/client.cpp:890
 msgid "Entering game world"
-msgstr ""
+msgstr "Siirryn pelimaailmaan"
 
-#: src/client.cpp:739
-#, fuzzy
+#: src/client.cpp:982
 msgid "Requesting characters"
-msgstr "Valitse hahmo"
+msgstr "Pyydän hahmoja"
 
-#: src/client.cpp:768
-#, fuzzy
+#: src/client.cpp:1013
 msgid "Connecting to the game server"
-msgstr "Yhdistetään kartta palvelimelle"
-
-#: src/client.cpp:799 src/client.cpp:806 src/client.cpp:940
-#: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
-#: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:261 src/gui/unregisterdialog.cpp:133
-#: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
-#: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
+msgstr "Yhdistän pelipalvelimeen"
+
+#: src/client.cpp:1023
+msgid "Changing game servers"
+msgstr "Vaihdan pelipalvelinta"
+
+#: src/client.cpp:1058 src/client.cpp:1065 src/client.cpp:1202
+#: src/gui/changeemaildialog.cpp:155 src/gui/changepassworddialog.cpp:145
+#: src/gui/charcreatedialog.cpp:211 src/gui/register.cpp:226
+#: src/gui/serverdialog.cpp:369 src/gui/unregisterdialog.cpp:135
+#: src/net/manaserv/charhandler.cpp:184 src/net/manaserv/charhandler.cpp:227
+#: src/net/tmwa/charserverhandler.cpp:188
+#: src/net/tmwa/charserverhandler.cpp:204
 msgid "Error"
 msgstr "Virhe"
 
-#: src/client.cpp:815
+#: src/client.cpp:1074
 msgid "Requesting registration details"
-msgstr ""
+msgstr "Pyydän rekisteröitymisen yksityiskohtia"
 
-#: src/client.cpp:842
-#, fuzzy
+#: src/client.cpp:1101
 msgid "Password Change"
-msgstr "Salasana:"
+msgstr "Salasanan vaihto"
 
-#: src/client.cpp:843
+#: src/client.cpp:1102
 msgid "Password changed successfully!"
-msgstr ""
+msgstr "Salasana vaihdettu onnistuneesti!"
 
-#: src/client.cpp:862
-#, fuzzy
+#: src/client.cpp:1121
 msgid "Email Change"
-msgstr "Muuta"
+msgstr "Sähköpostin vaihto"
 
-#: src/client.cpp:863
+#: src/client.cpp:1122
 msgid "Email changed successfully!"
-msgstr ""
+msgstr "Sähköpostiosoite vaihdettu onnistuneesti!"
 
-#: src/client.cpp:883
-#, fuzzy
+#: src/client.cpp:1142
 msgid "Unregister Successful"
-msgstr "Poista palvelimelta"
+msgstr "Tietojen poisto onnistui"
 
-#: src/client.cpp:884
+#: src/client.cpp:1143
 msgid "Farewell, come back any time..."
-msgstr ""
+msgstr "Näkemisiin, tule pian takaisin..."
 
-#: src/client.cpp:1007 src/client.cpp:1030
+#: src/client.cpp:1332 src/client.cpp:1362 src/client.cpp:1406
 #, 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:1119
+#: src/client.cpp:1535
 #, c-format
 msgid "Invalid update host: %s"
-msgstr ""
+msgstr "Epäkelpo päivitysosoite: %s"
 
-#: src/client.cpp:1153 src/client.cpp:1159
+#: src/client.cpp:1569 src/client.cpp:1575
 msgid "Error creating updates directory!"
+msgstr "Päivityshakemistoa luodessa tapahtui virhe!"
+
+#: src/client.cpp:1596
+#, c-format
+msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/commandhandler.cpp:127 src/commandhandler.cpp:308
+#: src/commandhandler.cpp:272
 msgid "Unknown command."
 msgstr "Tuntematon komento."
 
-#: src/commandhandler.cpp:156
-msgid "-- Help --"
-msgstr "--Apua--"
-
-#: src/commandhandler.cpp:157
-msgid "/help > Display this help"
-msgstr "/help > Näyttää tämän apu tekstin"
-
-#: src/commandhandler.cpp:159
-msgid "/where > Display map name"
-msgstr "/where > Näytä kartan nimi"
-
-#: src/commandhandler.cpp:160
-msgid "/who > Display number of online users"
-msgstr "/who > Näytä paikalla olevien pelaajien määrä"
-
-#: src/commandhandler.cpp:161
-msgid "/me > Tell something about yourself"
-msgstr "/me > Kerro jotain itsestäsi"
-
-#: src/commandhandler.cpp:163
-msgid "/clear > Clears this window"
-msgstr "/clear > Tyhjennä ikkuna"
-
-#: src/commandhandler.cpp:165
-msgid "/msg > Send a private message to a user"
-msgstr "/msg > Lähetä yksityis viesti käyttäjälle"
-
-#: src/commandhandler.cpp:166
-msgid "/whisper > Alias of msg"
-msgstr ""
-
-#: src/commandhandler.cpp:167
-msgid "/w > Alias of msg"
-msgstr ""
-
-#: src/commandhandler.cpp:168
-msgid "/query > Makes a tab for private messages with another user"
-msgstr "/query > Tekee välilehden toisen käyttäjän yksityisviestejä varten."
-
-#: src/commandhandler.cpp:169
-msgid "/q > Alias of query"
-msgstr ""
-
-#: src/commandhandler.cpp:171
-msgid "/ignore > ignore a player"
-msgstr ""
-
-#: src/commandhandler.cpp:172
-msgid "/unignore > stop ignoring a player"
-msgstr ""
-
-#: src/commandhandler.cpp:174
-msgid "/list > Display all public channels"
-msgstr "/list > Näytä kaikki julkiset kanavat"
-
-#: src/commandhandler.cpp:175
-msgid "/join > Join or create a channel"
-msgstr "/join > Liity tai luo kanava"
-
-#: src/commandhandler.cpp:177
-msgid "/createparty > Create a new party"
-msgstr ""
-
-#: src/commandhandler.cpp:178
-msgid "/party > Invite a user to party"
-msgstr ""
-
-#: src/commandhandler.cpp:180
-msgid "/record > Start recording the chat to an external file"
-msgstr "/record > Aloita keskustelun nauhoitus ulkoiseen tiedostoon"
-
-#: src/commandhandler.cpp:181
-msgid "/toggle > Determine whether <return> toggles the chat log"
-msgstr ""
-
-#: src/commandhandler.cpp:182
-msgid "/present > Get list of players present (sent to chat log, if logging)"
-msgstr ""
-
-#: src/commandhandler.cpp:184
-msgid "/announce > Global announcement (GM only)"
-msgstr ""
-
-#: src/commandhandler.cpp:188
-msgid "For more information, type /help <command>."
-msgstr ""
-
-#: src/commandhandler.cpp:192
-msgid "Command: /help"
-msgstr ""
-
-#: src/commandhandler.cpp:193
-msgid "This command displays a list of all commands available."
-msgstr "Tämä komento näyttää listan kaikista komennoista."
-
-#: src/commandhandler.cpp:194
-msgid "Command: /help <command>"
-msgstr ""
-
-#: src/commandhandler.cpp:195
-msgid "This command displays help on <command>."
-msgstr ""
-
-#: src/commandhandler.cpp:203
-msgid "Command: /announce <msg>"
-msgstr ""
-
-#: src/commandhandler.cpp:204
-msgid "*** only available to a GM ***"
-msgstr ""
-
-#: src/commandhandler.cpp:205
-msgid "This command sends the message <msg> to all players currently online."
-msgstr ""
-
-#: src/commandhandler.cpp:210
-msgid "Command: /clear"
-msgstr ""
-
-#: src/commandhandler.cpp:211
-msgid "This command clears the chat log of previous chat."
-msgstr ""
-
-#: src/commandhandler.cpp:215
-msgid "Command: /ignore <player>"
-msgstr ""
-
-#: src/commandhandler.cpp:216
-#, fuzzy
-msgid "This command ignores the given player regardless of current relations."
-msgstr "Tämä komento näyttää paikalla olevien pelaajien määrän."
-
-#: src/commandhandler.cpp:221
-msgid "Command: /join <channel>"
-msgstr ""
-
-#: src/commandhandler.cpp:222
-msgid "This command makes you enter <channel>."
-msgstr ""
-
-#: src/commandhandler.cpp:223
-msgid "If <channel> doesn't exist, it's created."
-msgstr "Jos kanavaa <cannel> ei ole, se luodaan."
-
-#: src/commandhandler.cpp:227
-msgid "Command: /list"
-msgstr ""
-
-#: src/commandhandler.cpp:228
-msgid "This command shows a list of all channels."
-msgstr "Tämä komento näyttää listan kaikista kanavista"
-
-#: src/commandhandler.cpp:232
-msgid "Command: /me <message>"
-msgstr ""
-
-#: src/commandhandler.cpp:233
-msgid "This command tell others you are (doing) <msg>."
-msgstr ""
-
-#: src/commandhandler.cpp:237
-msgid "Command: /msg <nick> <message>"
-msgstr ""
-
-#: src/commandhandler.cpp:238
-msgid "Command: /whisper <nick> <message>"
-msgstr ""
-
-#: src/commandhandler.cpp:239
-msgid "Command: /w <nick> <message>"
-msgstr ""
-
-#: src/commandhandler.cpp:240
-msgid "This command sends the text <message> to <nick>."
-msgstr "Tämä komento lähettää tekstin <message> käyttäjälle <nick>."
-
-#: src/commandhandler.cpp:241 src/commandhandler.cpp:260
-#: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
-#: src/net/ea/gui/guildtab.cpp:75 src/net/ea/gui/partytab.cpp:75
-msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
-msgstr ""
-
-#: src/commandhandler.cpp:246
-msgid "Command: /query <nick>"
-msgstr ""
-
-#: src/commandhandler.cpp:247
-msgid "Command: /q <nick>"
-msgstr ""
+#: src/commandhandler.cpp:372
+msgid "Cannot send empty whispers!"
+msgstr "Et voi lähettää tyhjiä kuiskauksia!"
 
-#: src/commandhandler.cpp:248
-msgid "This command tries to make a tab for whispers betweenyou and <nick>."
+#: src/commandhandler.cpp:380
+#, c-format
+msgid ""
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
+" you."
 msgstr ""
+"Kuiskausvälilehden luonti nimelle \"%s\" epäonnistui! Se on joko jo auki tai"
+" käytit omaa nimeäsi."
 
-#: src/commandhandler.cpp:253
-msgid "Command: /createparty <name>"
-msgstr ""
+#: src/commandhandler.cpp:400
+#, c-format
+msgid "Requesting to join channel %s."
+msgstr "Pyyntö liittyä kanavalle %s lähetetty."
 
-#: src/commandhandler.cpp:254
-#, fuzzy
-msgid "This command creates a new party called <name>."
-msgstr "Tällä komennolla poistut kanvalta."
+#: src/commandhandler.cpp:416 src/net/tmwa/gui/partytab.cpp:123
+msgid "Party name is missing."
+msgstr "Ryhmän nimi puuttuu."
 
-#: src/commandhandler.cpp:258
-msgid "Command: /party <nick>"
-msgstr ""
+#: src/commandhandler.cpp:427
+msgid "Guild name is missing."
+msgstr "Killan nimi puuttuu."
 
-#: src/commandhandler.cpp:259 src/net/ea/gui/partytab.cpp:74
-msgid "This command invites <nick> to party with you."
-msgstr ""
+#: src/commandhandler.cpp:440 src/commandhandler.cpp:547
+#: src/commandhandler.cpp:588 src/commandhandler.cpp:618
+msgid "Please specify a name."
+msgstr "Anna nimi."
 
-#: src/commandhandler.cpp:265
-msgid "Command: /present"
-msgstr ""
+#: src/commandhandler.cpp:481
+msgid "Return toggles chat."
+msgstr "Rivinvaihto aktivoi ja sulkee keskustelun."
 
-#: src/commandhandler.cpp:266
-msgid ""
-"This command gets a list of players within hearing and sends it to either "
-"the record log if recording, or the chat log otherwise."
-msgstr ""
+#: src/commandhandler.cpp:481
+msgid "Message closes chat."
+msgstr "Viesti sulkee keskustelun."
 
-#: src/commandhandler.cpp:272
-msgid "Command: /record <filename>"
-msgstr ""
+#: src/commandhandler.cpp:492
+msgid "Return now toggles chat."
+msgstr "Nyt rivinvaihto aktivoi ja sulkee keskustelun."
 
-#: src/commandhandler.cpp:273
-msgid "This command starts recording the chat log to the file <filename>."
-msgstr "Tämä komento aloittaa keskustelun nauhoituksen tiedostoon <filename>."
+#: src/commandhandler.cpp:498
+msgid "Message now closes chat."
+msgstr "Nyt viesti sulkee keskustelun."
 
-#: src/commandhandler.cpp:275
-msgid "Command: /record"
+#: src/commandhandler.cpp:526
+msgid "friend"
 msgstr ""
 
-#: src/commandhandler.cpp:276
-msgid "This command finishes a recording session."
+#: src/commandhandler.cpp:531
+msgid "disregarded"
 msgstr ""
 
-#: src/commandhandler.cpp:280
-msgid "Command: /toggle <state>"
+#: src/commandhandler.cpp:536
+msgid "neutral"
 msgstr ""
 
-#: src/commandhandler.cpp:281
-msgid ""
-"This command sets whether the return key should toggle the chat log, or "
-"whether the chat log turns off automatically."
+#: src/commandhandler.cpp:555
+#, c-format
+msgid "Player already %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:283
-msgid ""
-"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
-"\", \"no\", \"false\" to turn the toggle off."
+#: src/commandhandler.cpp:569
+#, c-format
+msgid "Player successfully %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:286
-msgid "Command: /toggle"
+#: src/commandhandler.cpp:577
+#, c-format
+msgid "Player could not be %s!"
 msgstr ""
 
-#: src/commandhandler.cpp:287
-msgid "This command displays the return toggle status."
-msgstr ""
+#: src/commandhandler.cpp:599
+msgid "Player wasn't ignored!"
+msgstr "Pelaajaa ei ollut jätetty huomiotta!"
 
-#: src/commandhandler.cpp:291 src/gui/widgets/whispertab.cpp:93
-msgid "Command: /unignore <player>"
-msgstr ""
+#: src/commandhandler.cpp:606
+msgid "Player no longer ignored!"
+msgstr "Pelaaja huomioidaan taas."
 
-#: src/commandhandler.cpp:292
-msgid "This command stops ignoring the given player if they are being ignored"
-msgstr ""
+#: src/commandhandler.cpp:608
+msgid "Player could not be unignored!"
+msgstr "Pelaajan uudelleenhuomiointi epäonnistui."
 
-#: src/commandhandler.cpp:297
-msgid "Command: /where"
+#: src/commandhandler.cpp:625
+msgid "Player already erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:298
-msgid "This command displays the name of the current map."
-msgstr "Tämä komento näyttää nykyisen kartan nimen"
-
-#: src/commandhandler.cpp:302
-msgid "Command: /who"
+#: src/commandhandler.cpp:636
+msgid "Player successfully erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:303
-msgid "This command displays the number of players currently online."
-msgstr "Tämä komento näyttää paikalla olevien pelaajien määrän."
-
-#: src/commandhandler.cpp:309
-msgid "Type /help for a list of commands."
-msgstr "Kirjoita /help jotta näkisit listan komennoista."
-
-#: src/commandhandler.cpp:375
-msgid "Cannot send empty whispers!"
+#: src/commandhandler.cpp:638
+msgid "Player could not be erased!"
 msgstr ""
 
-#: src/commandhandler.cpp:383
+#: src/commandhandler.cpp:931 src/commandhandler.cpp:977
 #, c-format
-msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
-"you."
+msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:397
+#: src/commandhandler.cpp:941
 #, c-format
-msgid "Requesting to join channel %s."
-msgstr ""
-
-#: src/commandhandler.cpp:410 src/net/ea/gui/partytab.cpp:109
-msgid "Party name is missing."
-msgstr ""
-
-#: src/commandhandler.cpp:423 src/commandhandler.cpp:471
-#: src/commandhandler.cpp:493
-msgid "Please specify a name."
-msgstr ""
-
-#: src/commandhandler.cpp:441
-msgid "Return toggles chat."
-msgstr ""
-
-#: src/commandhandler.cpp:441
-msgid "Message closes chat."
-msgstr ""
-
-#: src/commandhandler.cpp:450
-msgid "Return now toggles chat."
-msgstr ""
+msgid "%d week"
+msgid_plural "%d weeks"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/commandhandler.cpp:454
-msgid "Message now closes chat."
-msgstr ""
+#: src/commandhandler.cpp:950
+#, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/commandhandler.cpp:477
-msgid "Player already ignored!"
-msgstr ""
+#: src/commandhandler.cpp:958
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/commandhandler.cpp:484
-msgid "Player successfully ignored!"
-msgstr ""
+#: src/commandhandler.cpp:966
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/commandhandler.cpp:486
-msgid "Player could not be ignored!"
-msgstr ""
+#: src/commandhandler.cpp:974
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/commandhandler.cpp:501
-msgid "Player wasn't ignored!"
+#: src/commandhandler.cpp:995
+msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:506
-msgid "Player no longer ignored!"
+#: src/commandhandler.cpp:1008
+msgid "Created: "
 msgstr ""
 
-#: src/commandhandler.cpp:508
-msgid "Player could not be unignored!"
+#: src/commandhandler.cpp:1009
+msgid "Deleted: "
 msgstr ""
 
-#: src/commandhandler.h:31
+#: src/commandhandler.h:40
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
+"Vaihtoehdot komennolle /%s ovat \"yes\" (kyllä), \"no\" (ei) tai vastaavasti"
+" \"true\", \"false\", \"1\" tai \"0\"."
 
-#: src/game.cpp:172
+#: src/game.cpp:228 src/gui/widgets/chattab.cpp:395
 msgid "General"
 msgstr "Yleiset"
 
-#: src/game.cpp:326
-#, fuzzy
+#: src/game.cpp:232 src/gui/debugwindow.cpp:48 src/gui/widgets/chattab.cpp:397
+msgid "Debug"
+msgstr "Debug"
+
+#: src/game.cpp:444
 msgid "Screenshot saved as "
-msgstr "Ruutukaappaus tallennettu ~/"
+msgstr "Ruutukaappaus tallennettu nimellä "
 
-#: src/game.cpp:331
+#: src/game.cpp:452
 msgid "Saving screenshot failed!"
 msgstr "Ruutukaappauksen tallentaminen epäonnistui!"
 
-#: src/game.cpp:355
-#, fuzzy
+#: src/game.cpp:491
 msgid "The connection to the server was lost."
-msgstr "Yhteys palvelimeen katkesi, ohjelma sulkeutuu nyt"
+msgstr "Yhteys palvelimeen katkesi."
 
-#: src/game.cpp:360
+#: src/game.cpp:505
 msgid "Network Error"
 msgstr "Verkkovirhe"
 
-#: src/game.cpp:705
+#: src/game.cpp:1023
 msgid "Ignoring incoming trade requests"
-msgstr ""
+msgstr "Et huomioi kaupankäyntipyyntöjä"
 
-#: src/game.cpp:712
+#: src/game.cpp:1030
 msgid "Accepting incoming trade requests"
-msgstr "Hyväksy kauppa pyyntö"
+msgstr "Hyväksyt kaupankäyntipyynnöt"
 
-#: src/game.cpp:946
-#, fuzzy
+#: src/game.cpp:1405
 msgid "Could Not Load Map"
-msgstr "Karttaa ei voi ladata"
+msgstr "Kartan lataaminen epäonnistui"
 
-#: src/game.cpp:947
+#: src/game.cpp:1406
 #, c-format
 msgid "Error while loading %s"
-msgstr "Ongelma ladatessa %s"
+msgstr "Kohdetta %s ladattaessa tapahtui virhe."
 
-#: src/gui/beingpopup.cpp:75
+#: src/gui/beingpopup.cpp:90
 #, c-format
 msgid "Party: %s"
+msgstr "Ryhmä: %s"
+
+#: src/gui/beingpopup.cpp:103
+#, c-format
+msgid "Guild: %s"
+msgstr ""
+
+#: src/gui/beingpopup.cpp:115
+#, c-format
+msgid "Pvp rank: %d"
+msgstr ""
+
+#: src/gui/botcheckerwindow.cpp:263
+msgid "Bot Checker"
+msgstr ""
+
+#: src/gui/botcheckerwindow.cpp:293 src/gui/setup_players.cpp:60
+msgid "Name"
+msgstr "Nimi"
+
+#: src/gui/botcheckerwindow.cpp:294 src/keyboardconfig.cpp:46
+#: src/net/tmwa/generalhandler.cpp:255
+msgid "Attack"
+msgstr "Hyökkää"
+
+#: src/gui/botcheckerwindow.cpp:295 src/keyboardconfig.cpp:60
+msgid "Talk"
+msgstr "Keskustele"
+
+#: src/gui/botcheckerwindow.cpp:296
+msgid "Move"
 msgstr ""
 
-#: src/gui/buy.cpp:49 src/gui/buy.cpp:78 src/gui/buysell.cpp:47
+#: src/gui/botcheckerwindow.cpp:297
+msgid "Result"
+msgstr ""
+
+#: src/gui/botcheckerwindow.cpp:307 src/gui/npcdialog.cpp:121
+msgid "Reset"
+msgstr "Nollaa"
+
+#: src/gui/buydialog.cpp:54 src/gui/buydialog.cpp:61 src/gui/buydialog.cpp:95
+#: src/gui/buyselldialog.cpp:63
 msgid "Buy"
 msgstr "Osta"
 
-#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
-#: src/gui/sell.cpp:276
+#: src/gui/buydialog.cpp:86 src/gui/buydialog.cpp:300 src/gui/sell.cpp:85
+#: src/gui/sell.cpp:320
 #, 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:99 src/gui/npcdialog.cpp:100
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:479
+#: src/gui/buydialog.cpp:91 src/gui/itemamountwindow.cpp:205
+#: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:111
+#: src/gui/sell.cpp:88 src/gui/statuswindow.cpp:938
 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:98 src/gui/npcdialog.cpp:101
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:491
+#: src/gui/buydialog.cpp:94 src/gui/itemamountwindow.cpp:204
+#: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:112
+#: src/gui/sell.cpp:89 src/gui/statuswindow.cpp:950
 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:182
-#: src/keyboardconfig.cpp:103
+#: src/gui/buydialog.cpp:96 src/gui/quitdialog.cpp:47
+#: src/gui/quitdialog.cpp:52 src/gui/quitdialog.cpp:53 src/gui/sell.cpp:91
+#: src/gui/serverdialog.cpp:260 src/keyboardconfig.cpp:277
 msgid "Quit"
 msgstr "Sulje"
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:408
-#: src/gui/statuswindow.cpp:478 src/gui/statuswindow.cpp:512
+#: src/gui/buydialog.cpp:97 src/gui/sell.cpp:92 src/gui/statuswindow.cpp:488
+#: src/gui/statuswindow.cpp:537 src/gui/statuswindow.cpp:937
+#: src/gui/statuswindow.cpp:968
 msgid "Max"
 msgstr "Max"
 
-#: src/gui/buysell.cpp:38
+#: src/gui/buyselldialog.cpp:38 src/gui/buyselldialog.cpp:47
+#: src/gui/inventorywindow.cpp:143
 msgid "Shop"
 msgstr "Kauppa"
 
-#: src/gui/buysell.cpp:47 src/gui/sell.cpp:49 src/gui/sell.cpp:76
+#: src/gui/buyselldialog.cpp:63 src/gui/sell.cpp:51 src/gui/sell.cpp:58
+#: src/gui/sell.cpp:90
 msgid "Sell"
 msgstr "Myy"
 
-#: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
-#: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
-#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:101
-#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
-#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
-#: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:242 src/gui/textdialog.cpp:39
-#: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
+#: src/gui/buyselldialog.cpp:63 src/gui/changeemaildialog.cpp:57
+#: src/gui/changepassworddialog.cpp:59 src/gui/charcreatedialog.cpp:91
+#: src/gui/connectiondialog.cpp:45 src/gui/itemamountwindow.cpp:207
+#: src/gui/npcpostdialog.cpp:56 src/gui/popupmenu.cpp:1278
+#: src/gui/popupmenu.cpp:1305 src/gui/popupmenu.cpp:1350
+#: src/gui/popupmenu.cpp:1388 src/gui/popupmenu.cpp:1423
+#: src/gui/popupmenu.cpp:1457 src/gui/quitdialog.cpp:58
+#: src/gui/register.cpp:80 src/gui/setup.cpp:65 src/gui/socialwindow.cpp:787
+#: src/gui/textcommandeditor.cpp:231 src/gui/textdialog.cpp:45
+#: src/gui/unregisterdialog.cpp:57 src/gui/updatewindow.cpp:155
 msgid "Cancel"
 msgstr "Peru"
 
-#: src/gui/changeemaildialog.cpp:45 src/gui/changeemaildialog.cpp:54
+#: src/gui/changeemaildialog.cpp:46 src/gui/changeemaildialog.cpp:55
 msgid "Change Email Address"
 msgstr "Vaihda sähköpostiosoite"
 
-#: src/gui/changeemaildialog.cpp:49 src/gui/changepassworddialog.cpp:52
+#: src/gui/changeemaildialog.cpp:50 src/gui/changepassworddialog.cpp:53
 #, c-format
 msgid "Account: %s"
 msgstr "Tili: %s"
 
-#: src/gui/changeemaildialog.cpp:51
-#, fuzzy
+#: src/gui/changeemaildialog.cpp:52
 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
+#: src/gui/changeemaildialog.cpp:130
+#, 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
+#: src/gui/changeemaildialog.cpp:137
+#, 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
+#: src/gui/changeemaildialog.cpp:144
 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
+#: src/gui/changepassworddialog.cpp:48 src/gui/changepassworddialog.cpp:57
+#: src/gui/charselectdialog.cpp:134
 msgid "Change Password"
 msgstr "Vaihda salasana"
 
-#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:53
-#: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
+#: src/gui/changepassworddialog.cpp:62 src/gui/login.cpp:92
+#: src/gui/register.cpp:74 src/gui/unregisterdialog.cpp:54
 msgid "Password:"
 msgstr "Salasana:"
 
-#: src/gui/changepassworddialog.cpp:63
-#, fuzzy
+#: src/gui/changepassworddialog.cpp:64
 msgid "Type new password twice:"
-msgstr "Kirjoita  uusi salasana toisen kerran:"
+msgstr "Kirjoita uusi salasana kahdesti:"
 
-#: src/gui/changepassworddialog.cpp:110
+#: src/gui/changepassworddialog.cpp:112
 msgid "Enter the old password first."
-msgstr ""
+msgstr "Anna ensin vanha salasana."
 
-#: src/gui/changepassworddialog.cpp:116
-#, fuzzy, c-format
+#: src/gui/changepassworddialog.cpp:118
+#, 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
+#: src/gui/changepassworddialog.cpp:125
+#, 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
+#: src/gui/changepassworddialog.cpp:132
 msgid "The new password entries mismatch."
-msgstr ""
+msgstr "Uuden salasanan kopiot eivät täsmää."
 
-#: src/gui/charcreatedialog.cpp:53
+#: src/gui/charcreatedialog.cpp:56
 msgid "Create Character"
 msgstr "Luo hahmo"
 
-#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:52
-#: src/gui/register.cpp:67
+#: src/gui/charcreatedialog.cpp:71 src/gui/login.cpp:91
+#: src/gui/register.cpp:73
 msgid "Name:"
 msgstr "Nimi:"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
-#: src/gui/outfitwindow.cpp:67
+#: src/gui/charcreatedialog.cpp:74 src/gui/charcreatedialog.cpp:79
+#: src/gui/charcreatedialog.cpp:85 src/gui/outfitwindow.cpp:78
 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
+#: src/gui/charcreatedialog.cpp:77 src/gui/charcreatedialog.cpp:80
+#: src/gui/charcreatedialog.cpp:86 src/gui/outfitwindow.cpp:77
 msgid "<"
-msgstr ""
+msgstr "<"
 
-#: src/gui/charcreatedialog.cpp:74
-#, fuzzy
+#: src/gui/charcreatedialog.cpp:78
 msgid "Hair color:"
 msgstr "Hiusten väri:"
 
-#: src/gui/charcreatedialog.cpp:77
-#, fuzzy
+#: src/gui/charcreatedialog.cpp:81
 msgid "Hair style:"
 msgstr "Hiustyyli:"
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
-#: src/gui/socialwindow.cpp:296
+#: src/gui/charcreatedialog.cpp:87
+msgid "Race:"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:90 src/gui/charselectdialog.cpp:447
+#: src/gui/socialwindow.cpp:847
 msgid "Create"
 msgstr "Luo"
 
-#: src/gui/charcreatedialog.cpp:80 src/gui/register.cpp:90
+#: src/gui/charcreatedialog.cpp:92 src/gui/register.cpp:96
 msgid "Male"
 msgstr "Miespuolinen"
 
-#: src/gui/charcreatedialog.cpp:81 src/gui/register.cpp:91
+#: src/gui/charcreatedialog.cpp:93 src/gui/register.cpp:97
 msgid "Female"
 msgstr "Naispuolinen"
 
-#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:251
+#: src/gui/charcreatedialog.cpp:111 src/gui/charcreatedialog.cpp:293
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Jaa %d pistettä"
 
-#: src/gui/charcreatedialog.cpp:178
+#: src/gui/charcreatedialog.cpp:212
 msgid "Your name needs to be at least 4 characters."
 msgstr "Nimessäsi täytyy olla ainakin 4 merkkiä."
 
-#: src/gui/charcreatedialog.cpp:242
+#: src/gui/charcreatedialog.cpp:284
 msgid "Character stats OK"
 msgstr "Hahmon pistejako OK"
 
-#: src/gui/charcreatedialog.cpp:256
+#: src/gui/charcreatedialog.cpp:298
 #, 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
+#: src/gui/charselectdialog.cpp:73
 msgid "Confirm Character Delete"
-msgstr "Vahvista hahmon poistopyyntö"
+msgstr "Vahvista hahmon poisto"
 
-#: src/gui/charselectdialog.cpp:70
+#: src/gui/charselectdialog.cpp:74
 msgid "Are you sure you want to delete this character?"
 msgstr "Oletko varma, että haluat poistaa tämän hahmon?"
 
-#: src/gui/charselectdialog.cpp:117
+#: src/gui/charselectdialog.cpp:122
 msgid "Account and Character Management"
 msgstr "Tilin ja hahmojen hallinta"
 
-#: src/gui/charselectdialog.cpp:127
+#: src/gui/charselectdialog.cpp:133
 msgid "Switch Login"
-msgstr ""
+msgstr "Vaihda sisäänkirjautumistietoja"
 
-#: src/gui/charselectdialog.cpp:141 src/gui/unregisterdialog.cpp:47
-#: src/gui/unregisterdialog.cpp:55
+#: src/gui/charselectdialog.cpp:147 src/gui/unregisterdialog.cpp:48
+#: src/gui/unregisterdialog.cpp:56
 msgid "Unregister"
 msgstr "Poista palvelimelta"
 
-#: src/gui/charselectdialog.cpp:150
-#, fuzzy
+#: src/gui/charselectdialog.cpp:156
 msgid "Change Email"
 msgstr "Vaihda sähköpostiosoite"
 
-#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:185
-#: src/gui/setup_players.cpp:230
+#: src/gui/charselectdialog.cpp:377 src/gui/serverdialog.cpp:264
+#: src/gui/setup_players.cpp:243 src/gui/shopwindow.cpp:118
+#: src/gui/shopwindow.cpp:121 src/gui/textcommandeditor.cpp:234
 msgid "Delete"
 msgstr "Poista"
 
-#: src/gui/charselectdialog.cpp:387
-#, fuzzy
+#: src/gui/charselectdialog.cpp:435
 msgid "Choose"
-msgstr "Sulje"
+msgstr "Valitse"
 
-#: src/gui/charselectdialog.cpp:399 src/gui/charselectdialog.cpp:400
+#: src/gui/charselectdialog.cpp:438
+#, c-format
+msgid "Level %d"
+msgstr ""
+
+#: src/gui/charselectdialog.cpp:449 src/gui/charselectdialog.cpp:450
 msgid "(empty)"
+msgstr "(tyhjä)"
+
+#: src/gui/chatwindow.cpp:112
+msgid "default"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:113
+msgid "black"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:114
+msgid "red"
 msgstr ""
 
-#: src/gui/chat.cpp:77 src/gui/palette.cpp:96
+#: src/gui/chatwindow.cpp:115
+msgid "green"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:116
+msgid "blue"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:117
+msgid "gold"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:118
+msgid "yellow"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:119
+msgid "pink"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:120
+msgid "purple"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:121
+msgid "grey"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:122
+msgid "brown"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:123
+msgid "rainbow 1"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:124
+msgid "rainbow 2"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:125
+msgid "rainbow 3"
+msgstr ""
+
+#: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:91
+#: src/gui/login.cpp:76 src/gui/setup_players.cpp:216
+#: src/gui/setup_theme.cpp:68 src/gui/setup_video.cpp:164
+#: src/gui/setup_video.cpp:189 src/gui/textcommandeditor.cpp:98
+#: src/gui/textcommandeditor.cpp:137 src/gui/textcommandeditor.cpp:156
+msgid "???"
+msgstr "???"
+
+#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:62
 msgid "Chat"
 msgstr "Keskustelu"
 
-#: src/gui/chat.cpp:287
+#: src/gui/chatwindow.cpp:585
 #, c-format
 msgid "Present: %s; %d players are present."
-msgstr ""
-
-#: src/gui/chat.cpp:305
-msgid "Attendance written to record log."
-msgstr ""
+msgstr "Läsnä: %s; %d pelaajaa paikalla."
 
-#: src/gui/chat.cpp:469
+#: src/gui/chatwindow.cpp:968
 #, c-format
 msgid "Whispering to %s: %s"
-msgstr ""
+msgstr "Kuiskaat pelaajalle %s: %s"
 
-#: src/gui/confirmdialog.cpp:42
+#: src/gui/confirmdialog.cpp:45
 msgid "Yes"
 msgstr "Kyllä"
 
-#: src/gui/confirmdialog.cpp:43
+#: src/gui/confirmdialog.cpp:46
 msgid "No"
 msgstr "Ei"
 
-#: src/gui/debugwindow.cpp:43
-msgid "Debug"
+#: src/gui/confirmdialog.cpp:50
+msgid "Ignore"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:56
+#: src/gui/debugwindow.cpp:64 src/gui/debugwindow.cpp:75
 #, c-format
-msgid "%d FPS (OpenGL)"
+msgid "%d FPS (Software)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:61 src/gui/debugwindow.cpp:64
+#: src/gui/debugwindow.cpp:68
 #, c-format
-msgid "%d FPS"
+msgid "%d FPS (fast OpenGL)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:65 src/gui/debugwindow.cpp:104
+#: src/gui/debugwindow.cpp:71
 #, c-format
-msgid "Music: %s"
+msgid "%d FPS (old OpenGL)"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:66 src/gui/debugwindow.cpp:108
-#, fuzzy, c-format
-msgid "Map: %s"
-msgstr "Nimi: %s"
-
-#: src/gui/debugwindow.cpp:67 src/gui/debugwindow.cpp:106
+#: src/gui/debugwindow.cpp:78
 #, c-format
-msgid "Minimap: %s"
+msgid "%d FPS"
+msgstr "%d FPS"
+
+#: src/gui/debugwindow.cpp:79 src/gui/debugwindow.cpp:182
+#: src/gui/debugwindow.cpp:205
+msgid "Music:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:80 src/gui/debugwindow.cpp:186
+#: src/gui/debugwindow.cpp:207
+msgid "Map:"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:68 src/gui/debugwindow.cpp:99
+#: src/gui/debugwindow.cpp:81 src/gui/debugwindow.cpp:184
+#: src/gui/debugwindow.cpp:206
+msgid "Minimap:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:82
 #, c-format
 msgid "Cursor: (%d, %d)"
-msgstr ""
+msgstr "Kursori: (%d, %d)"
 
-#: src/gui/debugwindow.cpp:69 src/gui/debugwindow.cpp:111
-#, fuzzy, c-format
+#: src/gui/debugwindow.cpp:83 src/gui/debugwindow.cpp:193
+#, c-format
 msgid "Particle count: %d"
-msgstr "Hiukkas tehosteet"
+msgstr "Hiukkasluku: %d"
 
-#: src/gui/debugwindow.cpp:116
-#, fuzzy, c-format
-msgid "Particle detail: %s"
-msgstr "Hiukkas tehosteet"
+#: src/gui/debugwindow.cpp:85
+#, c-format
+msgid "Map actors count: %d"
+msgstr ""
 
-#: src/gui/debugwindow.cpp:121
-#, fuzzy, c-format
-msgid "Ambient FX: %s"
-msgstr "Taustaäänet"
+#: src/gui/debugwindow.cpp:91 src/gui/debugwindow.cpp:127
+#: src/gui/debugwindow.cpp:132
+msgid "Player Position:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:92 src/gui/debugwindow.cpp:139
+#: src/gui/debugwindow.cpp:164
+msgid "Target:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:93 src/gui/debugwindow.cpp:144
+#: src/gui/debugwindow.cpp:165
+msgid "Target Id:"
+msgstr ""
 
-#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:56
+#: src/gui/debugwindow.cpp:94 src/gui/debugwindow.cpp:148
+#: src/gui/debugwindow.cpp:153 src/gui/debugwindow.cpp:166
+msgid "Target Level:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:95 src/gui/debugwindow.cpp:156
+#: src/gui/debugwindow.cpp:167
+msgid "Target Party:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:96 src/gui/debugwindow.cpp:159
+#: src/gui/debugwindow.cpp:168
+msgid "Target Guild:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:180 src/gui/debugwindow.cpp:203
+msgid "Cursor:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:197 src/gui/debugwindow.cpp:210
+msgid "Map actors count:"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:218
+#, c-format
+msgid "Ping: %d ms"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:223
+msgid "Ping: ? ms"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:226
+#, c-format
+msgid "In: %d bytes/s"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:228
+#, c-format
+msgid "Out: %d bytes/s"
+msgstr ""
+
+#: src/gui/editdialog.cpp:44 src/gui/itemamountwindow.cpp:206
+#: src/gui/okdialog.cpp:43 src/gui/quitdialog.cpp:57 src/gui/textdialog.cpp:44
+#: src/gui/trade.cpp:82 src/gui/trade.cpp:84
+msgid "OK"
+msgstr "Ok"
+
+#: src/gui/equipmentwindow.cpp:73 src/gui/windowmenu.cpp:71
 msgid "Equipment"
 msgstr "Varusteet"
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:77
-#: src/gui/inventorywindow.cpp:79 src/gui/inventorywindow.cpp:298
-#: src/gui/popupmenu.cpp:372
+#: src/gui/equipmentwindow.cpp:92 src/gui/inventorywindow.cpp:127
+#: src/gui/inventorywindow.cpp:466 src/gui/inventorywindow.cpp:475
+#: src/gui/popupmenu.cpp:1242 src/gui/popupmenu.cpp:1325
+#: src/gui/popupmenu.cpp:1365
 msgid "Unequip"
 msgstr "Poista varuste käytöstä"
 
-#: src/gui/help.cpp:36
+#: src/gui/helpwindow.cpp:41
 msgid "Help"
 msgstr "Apua"
 
-#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:73
+#: src/gui/helpwindow.cpp:55 src/gui/inventorywindow.cpp:172
+#: src/gui/npcdialog.cpp:51 src/gui/shopwindow.cpp:109
 msgid "Close"
 msgstr "Sulje"
 
-#: src/gui/inventorywindow.cpp:56 src/gui/windowmenu.cpp:57
+#: src/gui/inventorywindow.cpp:77 src/gui/windowmenu.cpp:73
+#: src/inventory.cpp:238
 msgid "Inventory"
-msgstr "Varusteluettelo"
+msgstr "Tavarat"
+
+#: src/gui/inventorywindow.cpp:101
+msgid "Slots:"
+msgstr "Paikkoja:"
+
+#: src/gui/inventorywindow.cpp:112
+msgid "Filter:"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:113
+msgid "Sort:"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:119
+msgid "na"
+msgstr ""
 
-#: src/gui/inventorywindow.cpp:72 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:300 src/gui/popupmenu.cpp:374
+#: src/gui/inventorywindow.cpp:120
+msgid "az"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:121
+msgid "id"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:125 src/gui/inventorywindow.cpp:468
+#: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1244
+#: src/gui/popupmenu.cpp:1327 src/gui/popupmenu.cpp:1367
 msgid "Equip"
 msgstr "Ota käyttöön"
 
-#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:304 src/gui/popupmenu.cpp:377
+#: src/gui/inventorywindow.cpp:126 src/gui/inventorywindow.cpp:469
+#: src/gui/inventorywindow.cpp:473 src/gui/popupmenu.cpp:1247
+#: src/gui/popupmenu.cpp:1300 src/gui/popupmenu.cpp:1331
+#: src/gui/popupmenu.cpp:1370
 msgid "Use"
 msgstr "Käytä"
 
-#: src/gui/inventorywindow.cpp:83 src/gui/inventorywindow.cpp:308
-#: src/gui/popupmenu.cpp:380
-#, fuzzy
+#: src/gui/inventorywindow.cpp:140 src/gui/inventorywindow.cpp:574
+#: src/gui/popupmenu.cpp:1250 src/gui/popupmenu.cpp:1335
+#: src/gui/popupmenu.cpp:1373
 msgid "Drop..."
-msgstr "Pudota"
+msgstr "Pudota..."
 
-#: src/gui/inventorywindow.cpp:84 src/gui/popupmenu.cpp:386
+#: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1255
+#: src/gui/popupmenu.cpp:1340 src/gui/popupmenu.cpp:1378
 msgid "Split"
 msgstr "Jaa"
 
-#: src/gui/inventorywindow.cpp:85 src/gui/outfitwindow.cpp:51
+#: src/gui/inventorywindow.cpp:142 src/gui/outfitwindow.cpp:57
+#: src/gui/popupmenu.cpp:436
 msgid "Outfits"
-msgstr ""
-
-#: src/gui/inventorywindow.cpp:96 src/gui/storagewindow.cpp:83
-msgid "Slots:"
-msgstr ""
+msgstr "Asukokonaisuudet"
 
-#: src/gui/inventorywindow.cpp:97
+#: src/gui/inventorywindow.cpp:145
 msgid "Weight:"
 msgstr "Paino:"
 
-#: src/gui/inventorywindow.cpp:310 src/gui/popupmenu.cpp:382
+#: src/gui/inventorywindow.cpp:170 src/gui/inventorywindow.cpp:565
+#: src/gui/popupmenu.cpp:1223 src/gui/popupmenu.cpp:1343
+#: src/gui/popupmenu.cpp:1381 src/gui/setup.cpp:66
+msgid "Store"
+msgstr "Varastoi"
+
+#: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1262
+msgid "Retrieve"
+msgstr "Ota"
+
+#: src/gui/inventorywindow.cpp:576 src/gui/popupmenu.cpp:1252
+#: src/gui/popupmenu.cpp:1337 src/gui/popupmenu.cpp:1375
+#: src/gui/windowmenu.cpp:92
 msgid "Drop"
 msgstr "Pudota"
 
-#: src/gui/itemamount.cpp:100 src/gui/okdialog.cpp:42
-#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:38 src/gui/trade.cpp:73
-#: src/gui/trade.cpp:75
-msgid "OK"
-msgstr "Ok"
-
-#: src/gui/itemamount.cpp:102
+#: src/gui/itemamountwindow.cpp:208
 msgid "All"
 msgstr "Kaikki"
 
-#: src/gui/itemamount.cpp:128
+#: src/gui/itemamountwindow.cpp:259
 msgid "Select amount of items to trade."
-msgstr "Anna vaihdettavien tavaroiden määrä."
+msgstr "Anna vaihtokaupattavien tavaroiden määrä."
 
-#: src/gui/itemamount.cpp:131
+#: src/gui/itemamountwindow.cpp:262
 msgid "Select amount of items to drop."
 msgstr "Anna pudotettavien tavaroiden määrä."
 
-#: src/gui/itemamount.cpp:134
+#: src/gui/itemamountwindow.cpp:265
 msgid "Select amount of items to store."
-msgstr ""
+msgstr "Anna varastoitavien tavaroiden määrä."
 
-#: src/gui/itemamount.cpp:137
+#: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to retrieve."
-msgstr ""
+msgstr "Anna varastosta otettavien tavaroiden määrä."
 
-#: src/gui/itemamount.cpp:140
+#: src/gui/itemamountwindow.cpp:271
 msgid "Select amount of items to split."
 msgstr "Anna eri pinoon jaettavien tavaroiden määrä."
 
-#: src/gui/itempopup.cpp:92
-#, fuzzy, c-format
+#: src/gui/itemamountwindow.cpp:274
+msgid "Add to buy shop."
+msgstr ""
+
+#: src/gui/itemamountwindow.cpp:277
+msgid "Add to sell shop."
+msgstr ""
+
+#: src/gui/itemamountwindow.cpp:280
+msgid "Unknown."
+msgstr ""
+
+#: src/gui/itempopup.cpp:171 src/gui/itempopup.cpp:177
+msgid ", "
+msgstr ""
+
+#: src/gui/itempopup.cpp:187
+#, c-format
 msgid "Weight: %s"
-msgstr "Paino: "
+msgstr "Paino: %s"
+
+#: src/gui/killstats.cpp:43 src/gui/windowmenu.cpp:66
+msgid "Kill stats"
+msgstr ""
+
+#: src/gui/killstats.cpp:61
+msgid "Reset stats"
+msgstr ""
+
+#: src/gui/killstats.cpp:62
+msgid "Reset timer"
+msgstr ""
+
+#: src/gui/killstats.cpp:66
+msgid "Level: "
+msgstr ""
+
+#: src/gui/killstats.cpp:70
+msgid "Exp: "
+msgstr ""
+
+#: src/gui/killstats.cpp:71
+msgid " Left: "
+msgstr ""
+
+#: src/gui/killstats.cpp:74
+msgid " exp, Avg Mob for 1%: ?"
+msgstr ""
+
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:128
+msgid "Kills: ?, Total Exp: ?"
+msgstr ""
+
+#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:129
+msgid "Avg Exp: ?, No. of Avg mob to next level: ?"
+msgstr ""
+
+#: src/gui/killstats.cpp:77 src/gui/killstats.cpp:146
+msgid "Kills/Min: ?, Exp/Min: ?"
+msgstr ""
+
+#: src/gui/killstats.cpp:79
+msgid "Exp speed per 1 min: ?"
+msgstr ""
+
+#: src/gui/killstats.cpp:80
+msgid "Time for next level per 1 min: ?"
+msgstr ""
+
+#: src/gui/killstats.cpp:81
+msgid "Exp speed per 5 min: ?"
+msgstr ""
+
+#: src/gui/killstats.cpp:82
+msgid "Time for next level per 5 min: ?"
+msgstr ""
+
+#: src/gui/killstats.cpp:83
+msgid "Exp speed per 15 min: ?"
+msgstr ""
+
+#: src/gui/killstats.cpp:84
+msgid "Time for Next level per 15 min: ?"
+msgstr ""
+
+#: src/gui/killstats.cpp:86
+msgid "Last kill exp: ?"
+msgstr ""
+
+#: src/gui/killstats.cpp:87
+msgid "Time before jacko spawn: ?"
+msgstr ""
+
+#: src/gui/killstats.cpp:270
+#, c-format
+msgid "Exp Speed per 1 min: %d"
+msgstr ""
+
+#: src/gui/killstats.cpp:275 src/gui/killstats.cpp:291
+#: src/gui/killstats.cpp:307
+#, c-format
+msgid "  Time For Next Level: %f"
+msgstr ""
+
+#: src/gui/killstats.cpp:281 src/gui/killstats.cpp:297
+#: src/gui/killstats.cpp:313
+msgid "  Time For Next Level: ?"
+msgstr ""
+
+#: src/gui/killstats.cpp:286
+#, c-format
+msgid "Exp Speed per 5 min: %d"
+msgstr ""
+
+#: src/gui/killstats.cpp:302
+#, c-format
+msgid "Exp Speed per 15 min: %d"
+msgstr ""
+
+#: src/gui/killstats.cpp:331
+msgid "Time before jacko spawn: jacko alive"
+msgstr ""
+
+#: src/gui/killstats.cpp:335 src/gui/killstats.cpp:345
+msgid "Time before jacko spawn: "
+msgstr ""
 
-#: src/gui/login.cpp:49 src/gui/login.cpp:61
+#: src/gui/killstats.cpp:336
+msgid "?"
+msgstr ""
+
+#: src/gui/killstats.cpp:341
+msgid "Time before jacko spawn: jacko spawning"
+msgstr ""
+
+#: src/gui/login.cpp:57
+msgid "Normal"
+msgstr ""
+
+#: src/gui/login.cpp:58
+msgid "Auto Close"
+msgstr ""
+
+#: src/gui/login.cpp:59
+msgid "Skip"
+msgstr ""
+
+#: src/gui/login.cpp:84 src/gui/login.cpp:120
 msgid "Login"
 msgstr "Kirjaudu sisään"
 
-#: src/gui/login.cpp:58
-#, fuzzy
+#: src/gui/login.cpp:88 src/gui/serverdialog.cpp:227
+#: src/gui/widgets/chattab.cpp:171
+msgid "Server:"
+msgstr "Palvelin:"
+
+#: src/gui/login.cpp:93
+msgid "Custom update host"
+msgstr ""
+
+#: src/gui/login.cpp:107
 msgid "Remember username"
 msgstr "Muista käyttäjätunnus"
 
-#: src/gui/login.cpp:59 src/gui/register.cpp:58 src/gui/register.cpp:73
+#: src/gui/login.cpp:108
+msgid "Update:"
+msgstr ""
+
+#: src/gui/login.cpp:118 src/gui/register.cpp:64 src/gui/register.cpp:79
 msgid "Register"
 msgstr "Rekisteröidy"
 
-#: src/gui/login.cpp:60
-#, fuzzy
+#: src/gui/login.cpp:119
 msgid "Change Server"
-msgstr "Palvelin:"
+msgstr "Vaihda palvelinta"
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
+#: src/gui/minimap.cpp:47 src/gui/minimap.cpp:87
 msgid "Map"
 msgstr "Kartta"
 
-#: src/gui/npcdialog.cpp:44
+#: src/gui/ministatus.cpp:56
+msgid "health bar"
+msgstr ""
+
+#: src/gui/ministatus.cpp:62
+msgid "mana bar"
+msgstr ""
+
+#: src/gui/ministatus.cpp:74
+msgid "experience bar"
+msgstr ""
+
+#: src/gui/ministatus.cpp:80
+msgid "job bar"
+msgstr ""
+
+#: src/gui/ministatus.cpp:89
+msgid "weight bar"
+msgstr ""
+
+#: src/gui/ministatus.cpp:92
+msgid "inventory slots bar"
+msgstr ""
+
+#: src/gui/ministatus.cpp:95
+msgid "money bar"
+msgstr ""
+
+#: src/gui/ministatus.cpp:98
+msgid "arrows bar"
+msgstr ""
+
+#: src/gui/ministatus.cpp:101
+msgid "status bar"
+msgstr ""
+
+#: src/gui/ministatus.cpp:287 src/gui/ministatus.cpp:327
+msgid "Need"
+msgstr "Tarvitaan"
+
+#: src/gui/npcdialog.cpp:49
 msgid "Waiting for server"
 msgstr "Odotetaan palvelinta"
 
-#: src/gui/npcdialog.cpp:45
+#: src/gui/npcdialog.cpp:50
 msgid "Next"
 msgstr "Seuraava"
 
-#: src/gui/npcdialog.cpp:47
+#: src/gui/npcdialog.cpp:52
 msgid "Submit"
 msgstr "Lähetä"
 
-#: src/gui/npcdialog.cpp:52 src/gui/npcpostdialog.cpp:41
+#: src/gui/npcdialog.cpp:57 src/gui/npcpostdialog.cpp:40
 msgid "NPC"
-msgstr "Epäpelattava hahmo"
+msgstr "Ei-pelaajahahmo (NPC)"
 
-#: src/gui/npcdialog.cpp:110
-msgid "Reset"
-msgstr "Nollaa"
+#: src/gui/npcdialog.cpp:105 src/gui/popupmenu.cpp:475
+msgid "Clear"
+msgstr ""
 
 #. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:171
-#, fuzzy
-msgid ""
-"\n"
-"> Next\n"
-msgstr "Seuraava"
+#: src/gui/npcdialog.cpp:209
+msgid "> Next"
+msgstr ""
 
-#: src/gui/npcpostdialog.cpp:47
+#: src/gui/npcpostdialog.cpp:46
 msgid "To:"
-msgstr ""
+msgstr "Vastaanottaja:"
 
-#: src/gui/npcpostdialog.cpp:54
+#: src/gui/npcpostdialog.cpp:53
 msgid "Send"
 msgstr "Lähetä"
 
-#: src/gui/npcpostdialog.cpp:96
+#: src/gui/npcpostdialog.cpp:97
 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
+#: src/gui/outfitwindow.cpp:79 src/gui/outfitwindow.cpp:850
 #, c-format
 msgid "Outfit: %d"
+msgstr "Asu: %d"
+
+#: src/gui/outfitwindow.cpp:81 src/gui/outfitwindow.cpp:852
+#, c-format
+msgid "Key: %s"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:70
-#, fuzzy
+#: src/gui/outfitwindow.cpp:84
 msgid "Unequip first"
-msgstr "Poista varuste käytöstä"
-
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:143
-msgid "Text"
-msgstr "Teksti"
-
-#: src/gui/palette.cpp:82
-msgid "Text Shadow"
-msgstr "Tekstin varjo"
+msgstr "Riisu ensin"
 
-#: src/gui/palette.cpp:83
-msgid "Text Outline"
+#: src/gui/outfitwindow.cpp:87
+msgid "Away outfit"
 msgstr ""
 
-#: src/gui/palette.cpp:84
-msgid "Progress Bar Labels"
+#: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:529
+msgid "@@trade|Trade@@"
 msgstr ""
 
-#: src/gui/palette.cpp:85
-msgid "Buttons"
+#. TRANSLATORS: Attacking a player.
+#: src/gui/popupmenu.cpp:126 src/gui/popupmenu.cpp:246
+#: src/gui/popupmenu.cpp:530
+msgid "@@attack|Attack@@"
 msgstr ""
 
-#: src/gui/palette.cpp:86
-msgid "Disabled Buttons"
+#. TRANSLATORS: Whispering a player.
+#: src/gui/popupmenu.cpp:128 src/gui/popupmenu.cpp:301
+msgid "@@whisper|Whisper@@"
 msgstr ""
 
-#: src/gui/palette.cpp:87
-msgid "Tabs"
+#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:534
+msgid "@@heal|Heal@@"
 msgstr ""
 
-#: src/gui/palette.cpp:89
-msgid "Background"
-msgstr "Tausta"
-
-#: src/gui/palette.cpp:91
-msgid "Highlight"
-msgstr "Korostus"
-
-#: src/gui/palette.cpp:92
-msgid "Tab Highlight"
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:307
+#: src/gui/popupmenu.cpp:540
+msgid "@@friend|Be friend@@"
 msgstr ""
 
-#: src/gui/palette.cpp:93
-#, fuzzy
-msgid "Item Too Expensive"
-msgstr "Esine on liian kallis"
-
-#: src/gui/palette.cpp:94
-msgid "Item Is Equipped"
+#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:145
+#: src/gui/popupmenu.cpp:163 src/gui/popupmenu.cpp:308
+#: src/gui/popupmenu.cpp:314 src/gui/popupmenu.cpp:332
+#: src/gui/popupmenu.cpp:541 src/gui/popupmenu.cpp:547
+#: src/gui/popupmenu.cpp:565
+msgid "@@disregard|Disregard@@"
 msgstr ""
 
-#: src/gui/palette.cpp:97
-msgid "GM"
+#: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:146
+#: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:315
+#: src/gui/popupmenu.cpp:542 src/gui/popupmenu.cpp:548
+msgid "@@ignore|Ignore@@"
 msgstr ""
 
-#: src/gui/palette.cpp:98
-msgid "Player"
-msgstr "Pelaaja"
-
-#: src/gui/palette.cpp:99
-msgid "Whisper"
+#: src/gui/popupmenu.cpp:141 src/gui/popupmenu.cpp:147
+#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:158
+#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:316
+#: src/gui/popupmenu.cpp:322 src/gui/popupmenu.cpp:327
+#: src/gui/popupmenu.cpp:543 src/gui/popupmenu.cpp:549
+#: src/gui/popupmenu.cpp:555 src/gui/popupmenu.cpp:560
+msgid "@@erase|Erase@@"
 msgstr ""
 
-#: src/gui/palette.cpp:100
-msgid "Is"
+#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:320
+#: src/gui/popupmenu.cpp:326 src/gui/popupmenu.cpp:331
+#: src/gui/popupmenu.cpp:553 src/gui/popupmenu.cpp:559
+#: src/gui/popupmenu.cpp:564
+msgid "@@unignore|Unignore@@"
 msgstr ""
 
-#: src/gui/palette.cpp:101 src/net/ea/gui/partytab.cpp:43
-msgid "Party"
+#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:164
+#: src/gui/popupmenu.cpp:321 src/gui/popupmenu.cpp:333
+#: src/gui/popupmenu.cpp:554 src/gui/popupmenu.cpp:566
+msgid "@@ignore|Completely ignore@@"
 msgstr ""
 
-#: src/gui/palette.cpp:102 src/net/ea/gui/guildtab.cpp:45
-msgid "Guild"
+#: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:341
+#: src/gui/popupmenu.cpp:574
+msgid "@@follow|Follow@@"
 msgstr ""
 
-#: src/gui/palette.cpp:103
-msgid "Server"
-msgstr "Palvelin:"
-
-#: src/gui/palette.cpp:104
-msgid "Logger"
+#: src/gui/popupmenu.cpp:173 src/gui/popupmenu.cpp:342
+#: src/gui/popupmenu.cpp:575
+msgid "@@imitation|Imitation@@"
 msgstr ""
 
-#: src/gui/palette.cpp:105
-msgid "Hyperlink"
-msgstr "Hyperlinkki"
-
-#: src/gui/palette.cpp:107
-msgid "Being"
+#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:594
+msgid "@@party|Invite to party@@"
 msgstr ""
 
-#: src/gui/palette.cpp:108
-msgid "Other Players' Names"
-msgstr "Muiden pelaajien nimet"
-
-#: src/gui/palette.cpp:109
-msgid "Own Name"
-msgstr "Oma nimi"
-
-#: src/gui/palette.cpp:110
-msgid "GM Names"
-msgstr "T"
-
-#: src/gui/palette.cpp:111
-msgid "NPCs"
-msgstr "NPCt"
+#: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:350
+#: src/gui/popupmenu.cpp:599
+msgid "@@kick party|Kick from party@@"
+msgstr ""
 
-#: src/gui/palette.cpp:112
-msgid "Monsters"
-msgstr "Hirviöt"
+#: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:360
+#: src/gui/popupmenu.cpp:613
+msgid "@@guild-kick|Kick from guild@@"
+msgstr ""
 
-#: src/gui/palette.cpp:114
-msgid "Unknown Item Type"
-msgstr "Tuntematon esine tyyppi"
+#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:361
+#: src/gui/popupmenu.cpp:615
+msgid "@@guild-pos|Change pos in guild >@@"
+msgstr ""
 
-#: src/gui/palette.cpp:115
-msgid "Generics"
+#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:365
+#: src/gui/popupmenu.cpp:620
+msgid "@@guild|Invite to guild@@"
 msgstr ""
 
-#: src/gui/palette.cpp:116
-msgid "Hats"
-msgstr "Hatut"
+#: src/gui/popupmenu.cpp:217
+msgid "@@admin-kick|Kick player@@"
+msgstr ""
 
-#: src/gui/palette.cpp:117
-msgid "Usables"
+#: src/gui/popupmenu.cpp:219
+msgid "@@nuke|Nuke@@"
 msgstr ""
 
-#: src/gui/palette.cpp:118
-msgid "Shirts"
-msgstr "Paidat"
+#: src/gui/popupmenu.cpp:220 src/gui/popupmenu.cpp:240
+#: src/gui/popupmenu.cpp:576
+msgid "@@move|Move@@"
+msgstr ""
 
-#: src/gui/palette.cpp:119
-msgid "One Handed Weapons"
+#: src/gui/popupmenu.cpp:221 src/gui/popupmenu.cpp:577
+msgid "@@undress|Undress@@"
 msgstr ""
 
-#: src/gui/palette.cpp:120
-msgid "Pants"
-msgstr "Housut"
+#: src/gui/popupmenu.cpp:226 src/gui/popupmenu.cpp:237
+#: src/gui/popupmenu.cpp:372 src/gui/popupmenu.cpp:582
+msgid "@@buy|Buy@@"
+msgstr ""
 
-#: src/gui/palette.cpp:121
-msgid "Shoes"
-msgstr "Kengät"
+#: src/gui/popupmenu.cpp:227 src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:373 src/gui/popupmenu.cpp:583
+msgid "@@sell|Sell@@"
+msgstr ""
 
-#: src/gui/palette.cpp:122
-msgid "Two Handed Weapons"
+#: src/gui/popupmenu.cpp:235
+msgid "@@talk|Talk@@"
 msgstr ""
 
-#: src/gui/palette.cpp:123
-msgid "Shields"
-msgstr "Kilvet"
+#: src/gui/popupmenu.cpp:249
+msgid "@@admin-kick|Kick@@"
+msgstr ""
 
-#: src/gui/palette.cpp:124
-msgid "Rings"
-msgstr "Sormukset"
+#: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:376
+msgid "@@name|Add name to chat@@"
+msgstr ""
 
-#: src/gui/palette.cpp:125
-msgid "Necklaces"
-msgstr "Kaulanauhat"
+#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:284
+#: src/gui/popupmenu.cpp:380 src/gui/popupmenu.cpp:408
+#: src/gui/popupmenu.cpp:427 src/gui/popupmenu.cpp:440
+#: src/gui/popupmenu.cpp:458 src/gui/popupmenu.cpp:625
+#: src/gui/popupmenu.cpp:649
+msgid "@@cancel|Cancel@@"
+msgstr "@@cancel|Peruuta@@"
 
-#: src/gui/palette.cpp:126
-msgid "Arms"
+#: src/gui/popupmenu.cpp:279
+#, c-format
+msgid "@@player_%u|%s >@@"
 msgstr ""
 
-#: src/gui/palette.cpp:127
-msgid "Ammo"
-msgstr "Panokset"
-
-#: src/gui/palette.cpp:129
-msgid "Particle Effects"
+#: src/gui/popupmenu.cpp:403
+msgid "@@pickup|Pick up@@"
 msgstr ""
 
-#: src/gui/palette.cpp:130
-msgid "Pickup Notification"
+#: src/gui/popupmenu.cpp:404
+msgid "@@chat|Add to chat@@"
 msgstr ""
 
-#: src/gui/palette.cpp:131
-msgid "Exp Notification"
+#: src/gui/popupmenu.cpp:422
+msgid "Map Item"
 msgstr ""
 
-#: src/gui/palette.cpp:133
-msgid "Player Hits Monster"
+#: src/gui/popupmenu.cpp:423
+msgid "@@rename map|Rename@@"
 msgstr ""
 
-#: src/gui/palette.cpp:135
-msgid "Monster Hits Player"
+#: src/gui/popupmenu.cpp:424
+msgid "@@remove map|Remove@@"
 msgstr ""
 
-#: src/gui/palette.cpp:136
-msgid "Critical Hit"
+#: src/gui/popupmenu.cpp:437
+msgid "@@load old outfits|Load old outfits@@"
 msgstr ""
 
-#: src/gui/palette.cpp:137
-msgid "Misses"
+#: src/gui/popupmenu.cpp:453 src/gui/windowmenu.cpp:91
+msgid "Spells"
 msgstr ""
 
-#: src/gui/palette.cpp:139
-msgid "HP Bar"
+#: src/gui/popupmenu.cpp:454
+msgid "@@load old spells|Load old spells@@"
 msgstr ""
 
-#: src/gui/palette.cpp:140
-msgid "3/4 HP Bar"
+#: src/gui/popupmenu.cpp:455
+msgid "@@edit spell|Edit spell@@"
 msgstr ""
 
-#: src/gui/palette.cpp:141
-msgid "1/2 HP Bar"
+#: src/gui/popupmenu.cpp:473
+msgid "@@chat close|Close@@"
 msgstr ""
 
-#: src/gui/palette.cpp:142
-msgid "1/4 HP Bar"
+#: src/gui/popupmenu.cpp:481
+msgid "Disable highlight"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:84
-#, fuzzy, c-format
-msgid "Trade with %s..."
-msgstr "@@trade|Tee kauppaa %s kanssa@@"
+#: src/gui/popupmenu.cpp:486
+msgid "Enable highlight"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:161
-#, fuzzy, c-format
-msgid "Attack %s"
-msgstr "Hyökkäys %+d"
+#: src/gui/popupmenu.cpp:491
+msgid "Dont remove name"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:92
-#, c-format
-msgid "Whisper %s"
+#: src/gui/popupmenu.cpp:496
+msgid "Remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:101
-#, c-format
-msgid "Befriend %s"
+#: src/gui/popupmenu.cpp:501
+msgid "Enable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:106
-#, c-format
-msgid "Disregard %s"
+#: src/gui/popupmenu.cpp:506
+msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:109
-#, fuzzy, c-format
-msgid "Ignore %s"
-msgstr "ohitettu"
+#: src/gui/popupmenu.cpp:512
+msgid "@@leave party|Leave@@"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:115 src/gui/popupmenu.cpp:124
-#, c-format
-msgid "Unignore %s"
+#: src/gui/popupmenu.cpp:633
+msgid "Change guild position"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:118
+#: src/gui/popupmenu.cpp:646
 #, c-format
-msgid "Completely ignore %s"
+msgid "@@guild-pos-%d|%s@@"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:130
-#, c-format
-msgid "Follow %s"
+#: src/gui/popupmenu.cpp:1044
+msgid "Rename map sign          "
 msgstr ""
 
-#: src/gui/popupmenu.cpp:133
-#, fuzzy, c-format
-msgid "Invite %s to join your guild"
-msgstr "@@party|Kutsu %s mukaan ryhmääsi@@"
+#: src/gui/popupmenu.cpp:1045
+msgid "Name:                    "
+msgstr ""
 
-#: src/gui/popupmenu.cpp:137
-#, fuzzy, c-format
-msgid "Invite %s to join your party"
-msgstr "@@party|Kutsu %s mukaan ryhmääsi@@"
+#: src/gui/popupmenu.cpp:1206
+msgid "Add to trade"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:144
-msgid "Kick player"
+#: src/gui/popupmenu.cpp:1212
+msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:153
-#, c-format
-msgid "Talk to %s"
+#: src/gui/popupmenu.cpp:1215
+msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:166
-#, fuzzy
-msgid "Kick monster"
-msgstr "Hirviöt"
+#: src/gui/popupmenu.cpp:1217
+msgid "Add to trade all"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:174
-msgid "Add name to chat"
+#: src/gui/popupmenu.cpp:1229
+msgid "Store 10"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:191
-#, c-format
-msgid "Pick up %s"
+#: src/gui/popupmenu.cpp:1232
+msgid "Store half"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:400
-msgid "Add to chat"
+#: src/gui/popupmenu.cpp:1234
+msgid "Store all"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:70
-msgid "Store"
-msgstr "Talleta"
+#: src/gui/popupmenu.cpp:1268
+msgid "Retrieve 10"
+msgstr ""
 
-#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:71
-msgid "Retrieve"
+#: src/gui/popupmenu.cpp:1271
+msgid "Retrieve half"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:44
-msgid "Switch server"
-msgstr "Vaihda palvelinta"
+#: src/gui/popupmenu.cpp:1273
+msgid "Retrieve all"
+msgstr ""
 
-#: src/gui/quitdialog.cpp:45
-msgid "Switch character"
-msgstr "Vaihda hahmoa"
+#: src/gui/popupmenu.cpp:1276 src/gui/popupmenu.cpp:1344
+#: src/gui/popupmenu.cpp:1382
+msgid "Add to chat"
+msgstr "Lisää keskusteluun"
 
-#: src/gui/recorder.cpp:87
-msgid "Finishing recording."
+#: src/gui/popupmenu.cpp:1303 src/gui/popupmenu.cpp:1348
+msgid "Load old item shortcuts"
 msgstr ""
 
-#: src/gui/recorder.cpp:91
-msgid "Not currently recording."
+#: src/gui/popupmenu.cpp:1386
+msgid "Load old drop shortcuts"
 msgstr ""
 
-#: src/gui/recorder.cpp:96
-msgid "Already recording."
+#: src/gui/popupmenu.cpp:1412 src/gui/popupmenu.cpp:1445
+msgid "Hide"
 msgstr ""
 
-#: src/gui/recorder.cpp:104
-msgid "Starting to record..."
+#: src/gui/popupmenu.cpp:1418 src/gui/popupmenu.cpp:1451
+msgid "Show"
 msgstr ""
 
-#: src/gui/recorder.cpp:112
-msgid "Failed to start recording."
+#: src/gui/quitdialog.cpp:54
+msgid "Save state"
 msgstr ""
 
-#: src/gui/recorder.h:38
-msgid "Recording..."
-msgstr ""
+#: src/gui/quitdialog.cpp:55
+msgid "Switch server"
+msgstr "Vaihda palvelinta"
 
-#: src/gui/recorder.h:39
-msgid "Stop recording"
-msgstr ""
+#: src/gui/quitdialog.cpp:56
+msgid "Switch character"
+msgstr "Vaihda hahmoa"
 
-#: src/gui/register.cpp:69
+#: src/gui/register.cpp:75
 msgid "Confirm:"
 msgstr "Vahvista:"
 
-#: src/gui/register.cpp:100
+#: src/gui/register.cpp:106
 msgid "Email:"
 msgstr "Sähköpostiosoite:"
 
-#: src/gui/register.cpp:166
+#: src/gui/register.cpp:174
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "Käyttäjänimen tulee olla vähintään %d merkkiä pitkä"
 
-#: src/gui/register.cpp:174
+#: src/gui/register.cpp:182
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "Käyttäjänimen tulee olla alle %d merkkiä pitkä."
 
-#: src/gui/register.cpp:182 src/gui/unregisterdialog.cpp:117
+#: src/gui/register.cpp:190 src/gui/unregisterdialog.cpp:119
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "Salasanan tulee olla vähintään %d merkkiä pitkä"
 
-#: src/gui/register.cpp:190 src/gui/unregisterdialog.cpp:124
+#: src/gui/register.cpp:198 src/gui/unregisterdialog.cpp:126
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "Salasanan tulee olla alle %d merkkiä pitkä."
 
-#: src/gui/register.cpp:197
+#: src/gui/register.cpp:205
 msgid "Passwords do not match."
 msgstr "Salasanat eivät täsmää."
 
-#: src/gui/serverdialog.cpp:134
-#, fuzzy
+#: src/gui/serverdialog.cpp:212
 msgid "Choose Your Server"
-msgstr "Valitse palvelin"
+msgstr "Valitse palvelimesi"
 
-#: src/gui/serverdialog.cpp:141 src/gui/widgets/chattab.cpp:139
-msgid "Server:"
-msgstr "Palvelin:"
-
-#: src/gui/serverdialog.cpp:142
+#: src/gui/serverdialog.cpp:228
 msgid "Port:"
 msgstr "Portti:"
 
-#: src/gui/serverdialog.cpp:143
-#, fuzzy
+#: src/gui/serverdialog.cpp:231
+msgid "Use same ip for game sub servers"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:246
 msgid "Server type:"
-msgstr "Palvelin:"
+msgstr "Palvelintyyppi:"
 
-#: src/gui/serverdialog.cpp:183
-#, fuzzy
+#: src/gui/serverdialog.cpp:261
+msgid "Load"
+msgstr ""
+
+#: src/gui/serverdialog.cpp:262
 msgid "Connect"
-msgstr "Yhdistetään..."
+msgstr "Yhdistä"
 
-#: src/gui/serverdialog.cpp:184
-#, fuzzy
+#: src/gui/serverdialog.cpp:263
 msgid "Custom Server"
-msgstr "Tyylitelty hiiren osoitin"
+msgstr "Muu palvelin"
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:370
 msgid "Please type both the address and the port of a server."
 msgstr "Kirjoita kenttiin sekä palvelimen osoite että portti"
 
-#: src/gui/serverdialog.cpp:411
+#: src/gui/serverdialog.cpp:513
 #, c-format
 msgid "Downloading server list...%2.2f%%"
-msgstr ""
+msgstr "Lataan palvelinluettelon...%2.2f%%"
 
-#: src/gui/serverdialog.cpp:417
-#, fuzzy
+#: src/gui/serverdialog.cpp:518
 msgid "Waiting for server..."
-msgstr "Odotetaan palvelinta"
+msgstr "Odotan palvelinta..."
 
-#: src/gui/serverdialog.cpp:421
+#: src/gui/serverdialog.cpp:522
 msgid "Preparing download"
+msgstr "Valmistelen latausta"
+
+#: src/gui/serverdialog.cpp:526
+msgid "Error retreiving server list!"
+msgstr "Palvelinluettelon hakeminen epäonnistui!"
+
+#: src/gui/serverdialog.cpp:624
+msgid "requires a newer version"
+msgstr "vaatii uudemman version"
+
+#: src/gui/serverdialog.cpp:626
+#, c-format
+msgid "requires v%s"
+msgstr "vaatii version %s"
+
+#: src/gui/setup_audio.cpp:48
+msgid "Enable Audio"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:42
-msgid "Sound"
-msgstr "Ääni"
+#: src/gui/setup_audio.cpp:49
+msgid "Enable game sfx"
+msgstr ""
 
-#: src/gui/setup_audio.cpp:43
-msgid "Download music"
+#: src/gui/setup_audio.cpp:50
+msgid "Enable gui sfx"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:51
+msgid "Enable music"
 msgstr ""
 
-#: src/gui/setup_audio.cpp:47
+#: src/gui/setup_audio.cpp:52
+msgid "Enable mumble voice chat"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:54
+msgid "Download music"
+msgstr "Lataa musiikki"
+
+#: src/gui/setup_audio.cpp:59
 msgid "Audio"
 msgstr "Ääni"
 
-#: src/gui/setup_audio.cpp:50
+#: src/gui/setup_audio.cpp:62
 msgid "Sfx volume"
 msgstr "Äänitehosteiden voimakkuus"
 
-#: src/gui/setup_audio.cpp:51
+#: src/gui/setup_audio.cpp:63
 msgid "Music volume"
 msgstr "Musiikin voimakkuus"
 
-#: src/gui/setup_audio.cpp:94
-#, fuzzy
+#: src/gui/setup_audio.cpp:118
 msgid "Notice"
-msgstr "Ei tekstiä"
+msgstr "Huomaa"
 
-#: src/gui/setup_audio.cpp:94
+#: src/gui/setup_audio.cpp:118
 msgid "You may have to restart your client if you want to download new music"
 msgstr ""
+"Voit joutua uudelleenkäynnistämään asiakasohjelmasi, jos haluat ladata uudet"
+" musiikit"
 
-#: src/gui/setup_audio.cpp:106
+#: src/gui/setup_audio.cpp:131
 msgid "Sound Engine"
+msgstr "Äänimoottori"
+
+#: src/gui/setup_chat.cpp:66
+msgid "Remove colors from received chat messages"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:44
-msgid "This is what the color looks like"
+#: src/gui/setup_chat.cpp:70
+msgid "Log magic messages in debug tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:77
+msgid "Allow magic and GM commands in all chat tabs"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:82
+msgid "Show server messages in debug tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:86
+msgid "Enable chat Log"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:90
+msgid "Enable trade tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:94
+msgid "Hide shop messages"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:98
+msgid "Show chat history"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:102
+msgid "Enable battle tab"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:106
+msgid "Show battle events"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:110
+msgid "Show chat colors list"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:113 src/gui/setup_chat.cpp:121
+#: src/gui/setup_other.cpp:142 src/gui/setup_other.cpp:146
+msgid "Edit"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:116
+msgid "Limit max chars in chat line"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:125
+msgid "Limit max lines in chat"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:132
+msgid "Resize chat tabs if need"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:49
+#: src/gui/setup_colors.cpp:46
+msgid "This is what the color looks like"
+msgstr "Väri näyttää tältä"
+
+#: src/gui/setup_colors.cpp:51
 msgid "Colors"
 msgstr "Värit"
 
-#: src/gui/setup_colors.cpp:70
+#: src/gui/setup_colors.cpp:72
 msgid "Type:"
-msgstr ""
+msgstr "Tyyppi:"
 
-#: src/gui/setup_colors.cpp:81 src/gui/setup_colors.cpp:433
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:400
 msgid "Static"
-msgstr ""
+msgstr "Staattinen"
 
-#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:84
-#: src/gui/setup_colors.cpp:434
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:401
 msgid "Pulse"
-msgstr ""
+msgstr "Sykkivä"
 
-#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:402
 msgid "Rainbow"
 msgstr "Sateenkaari"
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
+#: src/gui/setup_colors.cpp:402
 msgid "Spectrum"
-msgstr ""
+msgstr "Spektri"
 
-#: src/gui/setup_colors.cpp:92
+#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:312
 msgid "Delay:"
-msgstr ""
+msgstr "Viive:"
 
-#: src/gui/setup_colors.cpp:107
+#: src/gui/setup_colors.cpp:109
 msgid "Red:"
-msgstr ""
+msgstr "Punainen:"
 
-#: src/gui/setup_colors.cpp:122
+#: src/gui/setup_colors.cpp:124
 msgid "Green:"
-msgstr ""
+msgstr "Vihreä:"
 
-#: src/gui/setup_colors.cpp:137
+#: src/gui/setup_colors.cpp:139
 msgid "Blue:"
+msgstr "Sininen:"
+
+#: src/gui/setup_colors.cpp:307
+msgid "Alpha:"
 msgstr ""
 
-#: src/gui/setup.cpp:51
+#: src/gui/setup.cpp:64
 msgid "Apply"
 msgstr "Hyväksy"
 
-#: src/gui/setup.cpp:51
+#: src/gui/setup.cpp:67
 msgid "Reset Windows"
 msgstr "Palauta ikkunoiden oletusasetukset"
 
-#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:78
+#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:77
 msgid "Press the button to start calibration"
 msgstr "Paina tätä nappia aloittaaksesi peliohjaimen kalibroinnin"
 
-#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:76
+#: src/gui/setup_joystick.cpp:39 src/gui/setup_joystick.cpp:75
 msgid "Calibrate"
 msgstr "Kalibroi"
 
-#: src/gui/setup_joystick.cpp:39
+#: src/gui/setup_joystick.cpp:40
 msgid "Enable joystick"
-msgstr "Peliohjaintuki päälle"
+msgstr "Ota peliohjain käyttöön"
 
-#: src/gui/setup_joystick.cpp:41
+#: src/gui/setup_joystick.cpp:42
 msgid "Joystick"
 msgstr "Peliohjain"
 
-#: src/gui/setup_joystick.cpp:83
+#: src/gui/setup_joystick.cpp:82
 msgid "Stop"
 msgstr "Lopeta"
 
-#: src/gui/setup_joystick.cpp:84
+#: src/gui/setup_joystick.cpp:83
 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
+#: src/gui/setup_keyboard.cpp:78
 msgid "Keyboard"
 msgstr "Näppäimistö"
 
-#: src/gui/setup_keyboard.cpp:86
+#: src/gui/setup_keyboard.cpp:87
 msgid "Assign"
-msgstr ""
+msgstr "Aseta"
+
+#: src/gui/setup_keyboard.cpp:91
+msgid "Unassign"
+msgstr "Poista asetus"
 
-#: src/gui/setup_keyboard.cpp:90
+#: src/gui/setup_keyboard.cpp:95
 msgid "Default"
 msgstr "Oletus"
 
-#: src/gui/setup_keyboard.cpp:119
+#: src/gui/setup_keyboard.cpp:131
 msgid "Key Conflict(s) Detected."
+msgstr "Päällekkäisiä näppäinoikopolkuja löytyi."
+
+#: src/gui/setup_other.cpp:99
+msgid "Misc"
 msgstr ""
 
-#: src/gui/setup_players.cpp:57
-msgid "Name"
-msgstr "Nimi"
+#: src/gui/setup_other.cpp:102
+msgid "Show damage inflicted to monsters"
+msgstr ""
+
+#: src/gui/setup_other.cpp:107
+msgid "Auto target only reachable monsters"
+msgstr ""
+
+#: src/gui/setup_other.cpp:111
+msgid "Highlight map portals"
+msgstr ""
+
+#: src/gui/setup_other.cpp:116
+msgid "Highlight player attack range"
+msgstr ""
+
+#: src/gui/setup_other.cpp:121
+msgid "Highlight monster attack range"
+msgstr ""
+
+#: src/gui/setup_other.cpp:125
+msgid "Cycle player targets"
+msgstr ""
+
+#: src/gui/setup_other.cpp:128
+msgid "Cycle monster targets"
+msgstr ""
+
+#: src/gui/setup_other.cpp:131
+msgid "Enable bot checker"
+msgstr ""
+
+#: src/gui/setup_other.cpp:134
+msgid "Highlight floor items"
+msgstr ""
 
-#: src/gui/setup_players.cpp:58
+#: src/gui/setup_other.cpp:137
+msgid "Crazy move A program"
+msgstr ""
+
+#: src/gui/setup_other.cpp:148
+msgid "Enable shop mode"
+msgstr ""
+
+#: src/gui/setup_other.cpp:151
+msgid "Enable buggy servers protection"
+msgstr ""
+
+#: src/gui/setup_other.cpp:154
+msgid "Enable debug log"
+msgstr ""
+
+#: src/gui/setup_other.cpp:157
+msgid "Enable server side attack"
+msgstr ""
+
+#: src/gui/setup_other.cpp:160
+msgid "Auto fix position"
+msgstr ""
+
+#: src/gui/setup_other.cpp:163
+msgid "Attack while moving"
+msgstr ""
+
+#: src/gui/setup_other.cpp:166
+msgid "Enable quick stats"
+msgstr ""
+
+#: src/gui/setup_other.cpp:169
+msgid "Show warps particles"
+msgstr ""
+
+#: src/gui/setup_other.cpp:172
+msgid "Accept sell/buy requests"
+msgstr ""
+
+#: src/gui/setup_other.cpp:175
+msgid "Show monster hp bar"
+msgstr ""
+
+#: src/gui/setup_other.cpp:178
+msgid "Show own hp bar"
+msgstr ""
+
+#: src/gui/setup_other.cpp:181
+msgid "Show job exp messages"
+msgstr ""
+
+#: src/gui/setup_other.cpp:184
+msgid "Show players popups"
+msgstr ""
+
+#: src/gui/setup_other.cpp:187
+msgid "Show extended minimaps"
+msgstr ""
+
+#: src/gui/setup_players.cpp:61
 msgid "Relation"
 msgstr "Relaatio"
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:66
 msgid "Neutral"
 msgstr "Neutraali"
 
-#: src/gui/setup_players.cpp:64
+#: src/gui/setup_players.cpp:67
 msgid "Friend"
 msgstr "Ystävä"
 
-#: src/gui/setup_players.cpp:65
+#: src/gui/setup_players.cpp:68
 msgid "Disregarded"
-msgstr ""
+msgstr "Vaimennettu"
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_players.cpp:69
 msgid "Ignored"
-msgstr "ohitettu"
+msgstr "Huomiotta jätetty"
 
-#: src/gui/setup_players.cpp:208 src/gui/setup_video.cpp:132
-msgid "???"
-msgstr "???"
+#: src/gui/setup_players.cpp:70
+msgid "Erased"
+msgstr ""
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_players.cpp:239
 msgid "Allow trading"
 msgstr "Salli kaupakäynti"
 
-#: src/gui/setup_players.cpp:228
+#: src/gui/setup_players.cpp:241
 msgid "Allow whispers"
+msgstr "Salli kuiskaukset"
+
+#: src/gui/setup_players.cpp:244
+msgid "Old"
 msgstr ""
 
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:246
 msgid "Put all whispers in tabs"
-msgstr ""
+msgstr "Laita kaikki kuiskaukset välilehtiin"
 
-#: src/gui/setup_players.cpp:234
-#, fuzzy
+#: src/gui/setup_players.cpp:249
 msgid "Show gender"
-msgstr "Näytä nimi"
+msgstr "Näytä sukupuoli"
 
-#: src/gui/setup_players.cpp:236
+#: src/gui/setup_players.cpp:254
 msgid "Players"
 msgstr "Pelaajat"
 
-#: src/gui/setup_players.cpp:261
+#: src/gui/setup_players.cpp:279
 msgid "When ignoring:"
+msgstr "Kun jätät huomiotta:"
+
+#: src/gui/setup_players.cpp:302
+msgid "Show level"
 msgstr ""
 
-#: src/gui/setup_video.cpp:113
-msgid "Tiny"
-msgstr "Pikkuruinen"
+#: src/gui/setup_players.cpp:306
+msgid "Show own name"
+msgstr "Näytä oma nimi"
 
-#: src/gui/setup_video.cpp:114
-msgid "Small"
-msgstr "Pieni"
+#: src/gui/setup_players.cpp:310
+msgid "Target dead players"
+msgstr ""
 
-#: src/gui/setup_video.cpp:115
-msgid "Medium"
+#: src/gui/setup_theme.cpp:107
+msgid "Theme"
 msgstr ""
 
-#: src/gui/setup_video.cpp:116
-msgid "Large"
-msgstr "Suuri"
+#: src/gui/setup_theme.cpp:109
+msgid "Gui theme"
+msgstr ""
 
-#: src/gui/setup_video.cpp:142
-msgid "No text"
-msgstr "Ei tekstiä"
+#: src/gui/setup_theme.cpp:110
+msgid "Main Font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:111
+msgid "Bold font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:112
+msgid "Particle font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:113
+msgid "Help font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:223
+msgid "Theme Changed"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:224 src/gui/setup_video.cpp:715
+#: src/gui/setup_video.cpp:720
+msgid "Restart your client for the change to take effect."
+msgstr "Käynnistä ohjelma uudelleen, jotta muutos astuu voimaan."
 
 #: src/gui/setup_video.cpp:144
-msgid "Bubbles, no names"
+msgid "Tiny (10)"
 msgstr ""
 
 #: src/gui/setup_video.cpp:145
-msgid "Bubbles with names"
+msgid "Small (11)"
+msgstr ""
+
+#: src/gui/setup_video.cpp:146
+msgid "Medium (12)"
+msgstr ""
+
+#: src/gui/setup_video.cpp:147
+msgid "Large (13)"
+msgstr ""
+
+#: src/gui/setup_video.cpp:148
+msgid "Big (14)"
+msgstr ""
+
+#: src/gui/setup_video.cpp:149
+msgid "Huge (15)"
 msgstr ""
 
-#: src/gui/setup_video.cpp:157
+#: src/gui/setup_video.cpp:172
+msgid "Software"
+msgstr ""
+
+#: src/gui/setup_video.cpp:173
+msgid "Fast OpenGL"
+msgstr ""
+
+#: src/gui/setup_video.cpp:174
+msgid "Safe OpenGL"
+msgstr ""
+
+#: src/gui/setup_video.cpp:201
+msgid "No text"
+msgstr "Ei tekstiä"
+
+#: src/gui/setup_video.cpp:203
+msgid "Text"
+msgstr "Teksti"
+
+#: src/gui/setup_video.cpp:205
+msgid "Bubbles, no names"
+msgstr "Puhekuplat, ei nimiä"
+
+#: src/gui/setup_video.cpp:207
+msgid "Bubbles with names"
+msgstr "Puhekuplat nimillä"
+
+#: src/gui/setup_video.cpp:220
 msgid "off"
 msgstr "pois päältä"
 
-#: src/gui/setup_video.cpp:158 src/gui/setup_video.cpp:171
+#: src/gui/setup_video.cpp:222 src/gui/setup_video.cpp:239
 msgid "low"
 msgstr "matala"
 
-#: src/gui/setup_video.cpp:159 src/gui/setup_video.cpp:173
+#: src/gui/setup_video.cpp:224 src/gui/setup_video.cpp:243
 msgid "high"
 msgstr "korkea"
 
-#: src/gui/setup_video.cpp:172
+#: src/gui/setup_video.cpp:241
 msgid "medium"
-msgstr ""
+msgstr "keskitaso"
 
-#: src/gui/setup_video.cpp:174
+#: src/gui/setup_video.cpp:245
 msgid "max"
-msgstr ""
+msgstr "maksimi"
 
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:277
 msgid "Full screen"
 msgstr "Kokoruututila"
 
-#: src/gui/setup_video.cpp:197
-msgid "OpenGL"
-msgstr "OpenGL"
+#: src/gui/setup_video.cpp:278
+msgid "Hw acceleration"
+msgstr ""
 
-#: src/gui/setup_video.cpp:198
+#: src/gui/setup_video.cpp:279
 msgid "Custom cursor"
 msgstr "Tyylitelty hiiren osoitin"
 
-#: src/gui/setup_video.cpp:200
+#: src/gui/setup_video.cpp:281
 msgid "Visible names"
 msgstr "Näytä nimet"
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:283
 msgid "Particle effects"
-msgstr "Hiukkas tehosteet"
+msgstr "Hiukkastehosteet"
 
-#: src/gui/setup_video.cpp:204
-#, fuzzy
-msgid "Show own name"
-msgstr "Näytä nimi"
+#: src/gui/setup_video.cpp:285
+msgid "Log NPC dialogue"
+msgstr "Kirjaa keskustelut ei-pelaajahahmojen kanssa lokiin"
 
-#: src/gui/setup_video.cpp:205
+#: src/gui/setup_video.cpp:286
 msgid "Show pickup notification"
-msgstr ""
+msgstr "Näytä ottoviesti"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:207
+#: src/gui/setup_video.cpp:288
 msgid "in chat"
-msgstr ""
+msgstr "keskusteluikkunassa"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:209
+#: src/gui/setup_video.cpp:290
 msgid "as particle"
+msgstr "leijuvana"
+
+#: src/gui/setup_video.cpp:292
+msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_video.cpp:214
-#, fuzzy
+#: src/gui/setup_video.cpp:294
+msgid "Low traffic mode"
+msgstr ""
+
+#: src/gui/setup_video.cpp:296
+msgid "Sync player move"
+msgstr ""
+
+#: src/gui/setup_video.cpp:298
+msgid "Draw hotkeys on map"
+msgstr ""
+
+#: src/gui/setup_video.cpp:300
+msgid "Draw path"
+msgstr ""
+
+#: src/gui/setup_video.cpp:301
+msgid "Show job"
+msgstr ""
+
+#: src/gui/setup_video.cpp:302
+msgid "Enable opacity cache"
+msgstr ""
+
+#: src/gui/setup_video.cpp:303
+msgid "Show background"
+msgstr ""
+
+#: src/gui/setup_video.cpp:308
 msgid "FPS limit:"
-msgstr "Piirtonopeusrajoitin (kuvaa / sekunti)"
+msgstr "Piirtonopeusrajoitin (kuvaa / sekunti):"
+
+#: src/gui/setup_video.cpp:312 src/gui/setup_video.cpp:351
+#: src/gui/setup_video.cpp:647 src/gui/setup_video.cpp:810
+msgid "Alt FPS limit: "
+msgstr ""
 
-#: src/gui/setup_video.cpp:225
+#: src/gui/setup_video.cpp:322
 msgid "Video"
 msgstr "Kuva"
 
-#: src/gui/setup_video.cpp:227
-#, fuzzy
-msgid "Show monster damage"
-msgstr "Näytä nimi"
-
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:327
 msgid "Overhead text"
-msgstr ""
+msgstr "Tekstinä yläpuolella"
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:328
 msgid "Gui opacity"
 msgstr "Käyttöliittymän läpinäkyvyys"
 
-#: src/gui/setup_video.cpp:235
+#: src/gui/setup_video.cpp:329
 msgid "Ambient FX"
 msgstr "Taustaäänet"
 
-#: src/gui/setup_video.cpp:236
-#, fuzzy
+#: src/gui/setup_video.cpp:330
 msgid "Particle detail"
-msgstr "Hiukkas tehosteet"
+msgstr "Hiukkastehosteiden yksityiskohtaisuus"
 
-#: src/gui/setup_video.cpp:237
+#: src/gui/setup_video.cpp:331
 msgid "Font size"
 msgstr "Kirjasimen koko"
 
-#: src/gui/setup_video.cpp:251 src/gui/setup_video.cpp:454
-#: src/gui/setup_video.cpp:568
-#, fuzzy
+#: src/gui/setup_video.cpp:349 src/gui/setup_video.cpp:352
+#: src/gui/setup_video.cpp:646 src/gui/setup_video.cpp:797
+#: src/gui/setup_video.cpp:808
 msgid "None"
-msgstr "Ei"
+msgstr "-"
 
-#: src/gui/setup_video.cpp:381
+#: src/gui/setup_video.cpp:529
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
+"Ikkunoituun tilaan vaihto epäonnistui, samoin paluu edelliseen tilaan!"
 
-#: src/gui/setup_video.cpp:387
+#: src/gui/setup_video.cpp:535
 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:398
-#, fuzzy
+#: src/gui/setup_video.cpp:546
 msgid "Switching to Full Screen"
-msgstr "Kokoruututilaan siirtyminen"
+msgstr "Vaihdan kokoruututilaan"
 
-#: src/gui/setup_video.cpp:399
+#: src/gui/setup_video.cpp:547
 msgid "Restart needed for changes to take effect."
 msgstr "Ohjelma pitää käynnistää uudelleen, jotta muutokset astuvat voimaan."
 
-#: src/gui/setup_video.cpp:411
-#, fuzzy
+#: src/gui/setup_video.cpp:559
 msgid "Changing to OpenGL"
-msgstr "Vaihdetaan OpenGL -toimintatilaan"
+msgstr "Vaihdetaan käyttämään OpenGL:ää"
 
-#: src/gui/setup_video.cpp:412
+#: src/gui/setup_video.cpp:560
 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:486 src/gui/setup_video.cpp:491
-#, fuzzy
-msgid "Screen Resolution Changed"
-msgstr "Näytön resoluutio vaihdettu"
+#: src/gui/setup_video.cpp:698
+msgid "Custom resolution (example: 1024x768)"
+msgstr ""
 
-#: src/gui/setup_video.cpp:487 src/gui/setup_video.cpp:492
-msgid "Restart your client for the change to take effect."
+#: src/gui/setup_video.cpp:699
+msgid "Enter new resolution:                "
 msgstr ""
 
-#: src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:714 src/gui/setup_video.cpp:719
+msgid "Screen Resolution Changed"
+msgstr "Ikkunan koko vaihdettu"
+
+#: src/gui/setup_video.cpp:717
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
+"Joitakin ikkunoita on siirretty, jotta ne mahtuvat pienemmälle ruudulle."
 
-#: src/gui/setup_video.cpp:522
-#, fuzzy
+#: src/gui/setup_video.cpp:751
 msgid "Particle Effect Settings Changed."
-msgstr "Hiukkas tehoste asetukset vaihdettu."
+msgstr "Hiukkastehosteiden asetuksia on muutettu."
 
-#: src/gui/setup_video.cpp:523
+#: src/gui/setup_video.cpp:752
 msgid "Changes will take effect on map change."
+msgstr "Muutokset astuvat voimaan kartan vaihtuessa."
+
+#: src/gui/shopwindow.cpp:72
+msgid "Personal Shop"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:114
+msgid "Buy items"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:115
+msgid "Sell items"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:117 src/gui/shopwindow.cpp:120 src/gui/trade.cpp:86
+msgid "Add"
+msgstr "Lisää"
+
+#: src/gui/shopwindow.cpp:119 src/gui/shopwindow.cpp:122
+msgid "Announce"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:123
+msgid "Show links in announce"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:712 src/net/manaserv/tradehandler.cpp:127
+#: src/net/tmwa/tradehandler.cpp:122
+msgid "Request for Trade"
+msgstr "Kaupantekoehdotus"
+
+#: src/gui/shopwindow.cpp:713
+#, c-format
+msgid "%s wants to %s %s do you accept?"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:197 src/gui/windowmenu.cpp:58
+#: src/gui/skilldialog.cpp:228 src/gui/windowmenu.cpp:78
 msgid "Skills"
 msgstr "Taidot"
 
-#: src/gui/skilldialog.cpp:208
+#: src/gui/skilldialog.cpp:239
 msgid "Up"
 msgstr "Ylös"
 
-#: src/gui/skilldialog.cpp:262
+#: src/gui/skilldialog.cpp:292
 #, c-format
 msgid "Skill points available: %d"
-msgstr ""
+msgstr "%d taitopistettä käyttämättä"
 
-#: src/gui/skilldialog.cpp:314
+#: src/gui/skilldialog.cpp:379
 #, c-format
 msgid "Skill Set %d"
-msgstr ""
+msgstr "Taitojoukko %d"
 
-#: src/gui/skilldialog.cpp:323
-#, fuzzy, c-format
+#: src/gui/skilldialog.cpp:391
+#, c-format
 msgid "Skill %d"
-msgstr "Taidot"
-
-#: src/gui/skilldialog.cpp:405
-#, fuzzy, c-format
-msgid "Lvl: %d (%+d)"
-msgstr "Taso: %d"
+msgstr "Taito %d"
 
-#: src/gui/skilldialog.cpp:416
-#, fuzzy, c-format
+#: src/gui/skilldialog.cpp:454 src/gui/skilldialog.cpp:507
+#, c-format
 msgid "Lvl: %d"
 msgstr "Taso: %d"
 
-#: src/gui/socialwindow.cpp:117
+#: src/gui/skilldialog.cpp:499
+#, c-format
+msgid "Lvl: %d (%+d)"
+msgstr "Taso: %d (%+d)"
+
+#: src/gui/socialwindow.cpp:115 src/net/tmwa/gui/guildtab.cpp:48
+msgid "Guild"
+msgstr "Kilta"
+
+#: src/gui/socialwindow.cpp:144
 #, c-format
 msgid "Invited user %s to guild %s."
-msgstr ""
+msgstr "Kutsuit käyttäjän %s kiltaan %s."
 
-#: src/gui/socialwindow.cpp:126
+#: src/gui/socialwindow.cpp:158
 #, c-format
 msgid "Guild %s quit requested."
-msgstr ""
+msgstr "Killasta %s eroa pyydetty."
 
-#: src/gui/socialwindow.cpp:136
+#: src/gui/socialwindow.cpp:185
 msgid "Member Invite to Guild"
-msgstr ""
+msgstr "Jäsenen kutsuminen kiltaan"
 
-#: src/gui/socialwindow.cpp:137
+#: src/gui/socialwindow.cpp:186
 #, c-format
 msgid "Who would you like to invite to guild %s?"
-msgstr ""
+msgstr "Kenet haluaisit kutsua kiltaan %s?"
 
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:195
 msgid "Leave Guild?"
-msgstr ""
+msgstr "Eroa killasta?"
 
-#: src/gui/socialwindow.cpp:147
-#, fuzzy, c-format
+#: src/gui/socialwindow.cpp:196
+#, c-format
 msgid "Are you sure you want to leave guild %s?"
-msgstr "Haluatko varmasti lopettaa?"
+msgstr "Haluatko varmasti erota killasta %s?"
 
-#: src/gui/socialwindow.cpp:182
+#: src/gui/socialwindow.cpp:213 src/net/tmwa/gui/partytab.cpp:48
+msgid "Party"
+msgstr "Ryhmä"
+
+#: src/gui/socialwindow.cpp:241
 #, c-format
 msgid "Invited user %s to party."
-msgstr ""
+msgstr "Käyttäjä %s kutsuttu ryhmään."
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:255
 #, c-format
 msgid "Party %s quit requested."
-msgstr ""
+msgstr "Ryhmästä %s eroamista pyydetty."
 
-#: src/gui/socialwindow.cpp:199
+#: src/gui/socialwindow.cpp:282
 msgid "Member Invite to Party"
-msgstr ""
+msgstr "Jäsenen kutsuminen ryhmään"
 
-#: src/gui/socialwindow.cpp:200
+#: src/gui/socialwindow.cpp:283
 #, c-format
 msgid "Who would you like to invite to party %s?"
-msgstr ""
+msgstr "Kenet haluaisit kutsua ryhmään %s?"
 
-#: src/gui/socialwindow.cpp:209
+#: src/gui/socialwindow.cpp:292
 msgid "Leave Party?"
-msgstr ""
+msgstr "Eroa ryhmästä?"
 
-#: src/gui/socialwindow.cpp:210
-#, fuzzy, c-format
+#: src/gui/socialwindow.cpp:293
+#, 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:239
-msgid "Create Guild"
+#: src/gui/socialwindow.cpp:515
+msgid "Nav"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:240 src/gui/socialwindow.cpp:564
-#, fuzzy
+#: src/gui/socialwindow.cpp:784
+msgid "Create Guild"
+msgstr "Luo kilta"
+
+#: src/gui/socialwindow.cpp:785 src/gui/socialwindow.cpp:1187
 msgid "Create Party"
-msgstr "Luo hahmo"
+msgstr "Luo ryhmä"
 
-#: src/gui/socialwindow.cpp:279 src/gui/windowmenu.cpp:60
+#: src/gui/socialwindow.cpp:827 src/gui/windowmenu.cpp:88
 msgid "Social"
-msgstr ""
+msgstr "Suhteet"
 
-#: src/gui/socialwindow.cpp:297
-#, fuzzy
+#: src/gui/socialwindow.cpp:848
 msgid "Invite"
-msgstr "Kutsu käyttäjä"
+msgstr "Kutsu"
 
-#: src/gui/socialwindow.cpp:298
-#, fuzzy
+#: src/gui/socialwindow.cpp:849
 msgid "Leave"
-msgstr "Suuri"
+msgstr "Eroa"
 
-#: src/gui/socialwindow.cpp:394
+#: src/gui/socialwindow.cpp:976
 #, c-format
 msgid "Accepted party invite from %s."
-msgstr ""
+msgstr "Otit vastaan ryhmäkutsun pelaajalta %s."
 
-#: src/gui/socialwindow.cpp:400
+#: src/gui/socialwindow.cpp:986
 #, c-format
 msgid "Rejected party invite from %s."
-msgstr ""
+msgstr "Kieltäydyit pelaajan %s ryhmäkutsusta."
 
-#: src/gui/socialwindow.cpp:413
+#: src/gui/socialwindow.cpp:1003
 #, c-format
 msgid "Accepted guild invite from %s."
-msgstr ""
+msgstr "Otit vastaan kiltakutsun pelaajalta %s."
 
-#: src/gui/socialwindow.cpp:419
+#: src/gui/socialwindow.cpp:1013
 #, c-format
 msgid "Rejected guild invite from %s."
-msgstr ""
+msgstr "Kieltäydyit pelaajan %s kiltakutsusta."
 
-#: src/gui/socialwindow.cpp:463
+#: src/gui/socialwindow.cpp:1057
 #, c-format
 msgid "Creating guild called %s."
-msgstr ""
+msgstr "Luon killan %s."
 
-#: src/gui/socialwindow.cpp:477
+#: src/gui/socialwindow.cpp:1080
 #, c-format
 msgid "Creating party called %s."
-msgstr ""
+msgstr "Luon ryhmän %s."
 
-#: src/gui/socialwindow.cpp:484
-#, fuzzy
+#: src/gui/socialwindow.cpp:1094
 msgid "Guild Name"
-msgstr "T"
+msgstr "Killan nimi"
 
-#: src/gui/socialwindow.cpp:485
-#, fuzzy
+#: src/gui/socialwindow.cpp:1095
 msgid "Choose your guild's name."
-msgstr "Valitse palvelin"
+msgstr "Valitse killallesi nimi."
 
-#: src/gui/socialwindow.cpp:497
+#: src/gui/socialwindow.cpp:1109
 msgid "Received guild request, but one already exists."
-msgstr ""
+msgstr "Vastaanotin kiltapyynnön, mutta sellainen on jo olemassa."
 
-#: src/gui/socialwindow.cpp:502
+#: src/gui/socialwindow.cpp:1115
 #, 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:507
+#: src/gui/socialwindow.cpp:1121
 msgid "Accept Guild Invite"
-msgstr ""
+msgstr "Ota kiltakutsu vastaan"
 
-#: src/gui/socialwindow.cpp:519
+#: src/gui/socialwindow.cpp:1136
 msgid "Received party request, but one already exists."
-msgstr ""
+msgstr "Sain ryhmäpyynnön, mutta sellainen on jo olemassa."
 
-#: src/gui/socialwindow.cpp:529
+#: src/gui/socialwindow.cpp:1147
 msgid "You have been invited you to join a party."
-msgstr ""
+msgstr "Sinut on kutsuttu liittymään ryhmään."
 
-#: src/gui/socialwindow.cpp:533
+#: src/gui/socialwindow.cpp:1151
 #, 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:541
+#: src/gui/socialwindow.cpp:1159
 #, 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:546
+#: src/gui/socialwindow.cpp:1164
 #, 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:554
+#: src/gui/socialwindow.cpp:1173
 msgid "Accept Party Invite"
-msgstr ""
+msgstr "Ota ryhmäkutsu vastaan"
 
-#: src/gui/socialwindow.cpp:565
+#: src/gui/socialwindow.cpp:1188
 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:570
+#: src/gui/socialwindow.cpp:1193
 msgid "Party Name"
-msgstr ""
+msgstr "Ryhmän nimi"
 
-#: src/gui/socialwindow.cpp:571
-#, fuzzy
+#: src/gui/socialwindow.cpp:1194
 msgid "Choose your party's name."
-msgstr "Valitse palvelin"
+msgstr "Anna ryhmällesi nimi."
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:59
+#: src/gui/specialswindow.cpp:77 src/gui/windowmenu.cpp:84
 msgid "Specials"
+msgstr "Erikoisuudet"
+
+#: src/gui/statuspopup.cpp:194
+msgid "(D) default moves"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:174
-#, c-format
-msgid "Specials Set %d"
+#: src/gui/statuspopup.cpp:199
+msgid "(I) invert moves"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:191
-#, c-format
-msgid "Special %d"
+#: src/gui/statuspopup.cpp:204
+msgid "(c) moves with some crazy moves"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:209
+msgid "(C) moves with crazy moves"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:214
+msgid "(d) double normal + crazy"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:219
+msgid "(?) move"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:237
+msgid "(a) custom crazy move"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:241
+msgid "(?) crazy move"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:251
+msgid "(0) default moves to target"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:256
+msgid "(1) moves to target in distance 1"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:261
+msgid "(2) moves to target in distance 2"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:266
+msgid "(3) moves to target in distance 3"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:271
+msgid "(5) moves to target in distance 5"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:276
+msgid "(7) moves to target in distance 7"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:281
+msgid "(A) moves to target in attack range"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:286
+msgid "(?) move to target"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:294
+msgid "(D) default follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:298
+msgid "(R) relative follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:302
+msgid "(M) mirror follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:306
+msgid "(P) pet follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:310
+msgid "(?) unknown follow"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:99 src/gui/statuswindow.cpp:247
+#: src/gui/statuspopup.cpp:319 src/gui/statuspopup.cpp:342
+msgid "(D) default attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:324
+msgid "(s) switch attack without shield"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:329
+msgid "(S) switch attack with shield"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:333 src/gui/statuspopup.cpp:358
+msgid "(?) attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:346
+msgid "(G) go and attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:350
+msgid "(A) go, attack, pickup"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:354
+msgid "(d) without auto attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:372
+msgid "(S) small pick up 1x1 cells"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:376
+msgid "(D) default pick up 2x1 cells"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:380
+msgid "(F) forward pick up 2x3 cells"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:384
+msgid "(3) pick up 3x3 cells"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:388
+msgid "(g) go and pick up in distance 4"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:392
+msgid "(G) go and pick up in distance 8"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:396
+msgid "(A) go and pick up in max distance"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:400
+msgid "(?) pick up"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:409
+msgid "(N) normal map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:413
+msgid "(D) debug map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:417
+msgid "(u) ultra map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:421
+msgid "(U) ultra map view 2"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:425
+msgid "(e) empty map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:429
+msgid "(b) black & white map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:433
+msgid "(?) map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:441
+msgid "(f) use #flar for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:446
+msgid "(c) use #chiza for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:451
+msgid "(I) use #ingrav for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:456
+msgid "(F) use #frillyar for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:461
+msgid "(U) use #upmarmu for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:465
+msgid "(?) magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:474
+msgid "(D) default imitation"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:478
+msgid "(O) outfits imitation"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:482
+msgid "(?) imitation"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:491
+msgid "(O) on keyboard"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:494
+msgid "(A) away"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:497 src/gui/statuspopup.cpp:517
+msgid "(?) away"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:505
+msgid "(G) game camera mode"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:509
+msgid "(F) free camera mode"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:513
+msgid "(D) design camera mode"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:524
+msgid "Game modifiers are disabled"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:529
+msgid "Game modifiers are enabled"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:131 src/gui/statuswindow.cpp:257
+#: src/gui/statuswindow.cpp:320
 #, c-format
 msgid "Level: %d"
 msgstr "Taso: %d"
 
-#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:211
+#: src/gui/statuswindow.cpp:132 src/gui/statuswindow.cpp:243
+#: src/gui/statuswindow.cpp:287
 #, c-format
 msgid "Money: %s"
-msgstr ""
+msgstr "Rahat: %s"
 
-#: src/gui/statuswindow.cpp:102
+#: src/gui/statuswindow.cpp:138
 msgid "HP:"
-msgstr ""
+msgstr "VP:"
 
-#: src/gui/statuswindow.cpp:107
+#: src/gui/statuswindow.cpp:145
 msgid "Exp:"
-msgstr ""
+msgstr "Kok:"
 
-#: src/gui/statuswindow.cpp:112
+#: src/gui/statuswindow.cpp:159
 msgid "MP:"
-msgstr ""
+msgstr "MP:"
 
-#: src/gui/statuswindow.cpp:132 src/gui/statuswindow.cpp:219
+#: src/gui/statuswindow.cpp:191 src/gui/statuswindow.cpp:370
 #, c-format
 msgid "Job: %d"
-msgstr ""
+msgstr "Työ: %d"
 
-#: src/gui/statuswindow.cpp:133
+#: src/gui/statuswindow.cpp:192
 msgid "Job:"
+msgstr "Työ:"
+
+#: src/gui/statuswindow.cpp:246 src/gui/statuswindow.cpp:294
+#, c-format
+msgid "Character points: %d"
+msgstr "Hahmopisteitä: %d"
+
+#: src/gui/statuswindow.cpp:252
+#, c-format
+msgid "Level: %d (GM %d)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:194
-msgid "HP"
+#: src/gui/statuswindow.cpp:308
+#, c-format
+msgid "Correction points: %d"
+msgstr "Korjauspisteitä: %d"
+
+#: src/gui/statuswindow.cpp:631 src/gui/statuswindow.cpp:696
+#: src/gui/statuswindow.cpp:716 src/gui/statuswindow.cpp:732
+#: src/gui/statuswindow.cpp:778 src/gui/statuswindow.cpp:807
+#: src/gui/statuswindow.cpp:830 src/gui/statuswindow.cpp:849
+msgid "(D)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:200
-msgid "MP"
+#: src/gui/statuswindow.cpp:634 src/gui/statuswindow.cpp:757
+msgid "(I)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:206
-msgid "Exp"
+#: src/gui/statuswindow.cpp:637 src/gui/statuswindow.cpp:754
+msgid "(c)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:215
-#, fuzzy
-msgid "Money"
-msgstr "Rahatilanne: %d"
+#: src/gui/statuswindow.cpp:640
+msgid "(C)"
+msgstr ""
 
-#: src/gui/statuswindow.cpp:225
-msgid "Job"
+#: src/gui/statuswindow.cpp:643 src/gui/statuswindow.cpp:741
+msgid "(d)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:229
-#, fuzzy, c-format
-msgid "Character points: %d"
-msgstr "Hahmon pistejako OK"
+#: src/gui/statuswindow.cpp:646 src/gui/statuswindow.cpp:660
+#: src/gui/statuswindow.cpp:689 src/gui/statuswindow.cpp:708
+#: src/gui/statuswindow.cpp:725 src/gui/statuswindow.cpp:744
+#: src/gui/statuswindow.cpp:766 src/gui/statuswindow.cpp:796
+#: src/gui/statuswindow.cpp:822 src/gui/statuswindow.cpp:836
+#: src/gui/statuswindow.cpp:852 src/gui/statuswindow.cpp:865
+msgid "(?)"
+msgstr ""
 
-#: src/gui/statuswindow.cpp:235
-#, c-format
-msgid "Correction points: %d"
+#: src/gui/statuswindow.cpp:657
+msgid "(a)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:251
-#, fuzzy
-msgid "Level"
-msgstr "Taso: %d"
+#: src/gui/statuswindow.cpp:668
+msgid "(0)"
+msgstr ""
 
-#: src/gui/storagewindow.cpp:58
-msgid "Storage"
-msgstr "Varasto"
+#: src/gui/statuswindow.cpp:671
+msgid "(1)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:674
+msgid "(2)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:677 src/gui/statuswindow.cpp:784
+msgid "(3)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:680
+msgid "(5)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:683
+msgid "(7)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:686 src/gui/statuswindow.cpp:738
+#: src/gui/statuswindow.cpp:793 src/gui/statuswindow.cpp:862
+msgid "(A)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:699
+msgid "(R)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:702
+msgid "(M)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:705
+msgid "(P)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:719
+msgid "(s)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:722 src/gui/statuswindow.cpp:775
+msgid "(S)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:735 src/gui/statuswindow.cpp:790
+#: src/gui/statuswindow.cpp:843
+msgid "(G)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:751
+msgid "(f)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:760 src/gui/statuswindow.cpp:781
+#: src/gui/statuswindow.cpp:846
+msgid "(F)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:763 src/gui/statuswindow.cpp:813
+msgid "(U)"
+msgstr ""
 
-#: src/gui/trade.cpp:52
+#: src/gui/statuswindow.cpp:787
+msgid "(g)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:804
+msgid "(N)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:810
+msgid "(u)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:816
+msgid "(e)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:819
+msgid "(b)"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:833 src/gui/statuswindow.cpp:859
+msgid "(O)"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:109
+msgid "No Target"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:110
+msgid "Allow Target"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:111
+msgid "Need Target"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:116
+msgid "General Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:117
+msgid "Life Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:118
+msgid "War Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:119
+msgid "Transmute Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:120
+msgid "Nature Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:121
+msgid "Astral Magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:164
+msgid "Command Editor"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:181
+msgid "magic"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:185
+msgid "other"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:190
+msgid "Symbol:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:193
+msgid "Command:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:196
+msgid "Mana:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:201
+msgid "Target Type:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:206
+msgid "Icon:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:212
+msgid "Magic level:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:217
+msgid "Magic School:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:223
+msgid "School level:"
+msgstr ""
+
+#: src/gui/textcommandeditor.cpp:228
+msgid "Save"
+msgstr ""
+
+#: src/gui/trade.cpp:55
 msgid "Propose trade"
 msgstr "Ehdota vaihtokauppaa"
 
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:56
 msgid "Confirmed. Waiting..."
 msgstr "Varmistettu. Odotetaan..."
 
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:57
 msgid "Agree trade"
 msgstr "Hyväksy kauppa"
 
-#: src/gui/trade.cpp:55
+#: src/gui/trade.cpp:58
 msgid "Agreed. Waiting..."
 msgstr "Hyväksytty. Odotetaan..."
 
-#: src/gui/trade.cpp:58
+#: src/gui/trade.cpp:61
 msgid "Trade: You"
-msgstr ""
+msgstr "Kauppa: Sinä"
 
-#: src/gui/trade.cpp:74 src/gui/trade.cpp:75
+#: src/gui/trade.cpp:83 src/gui/trade.cpp:84 src/gui/widgets/tradetab.cpp:42
 msgid "Trade"
-msgstr ""
+msgstr "Tee kaupat"
 
-#: src/gui/trade.cpp:77
-msgid "Add"
-msgstr "Lisää"
-
-#: src/gui/trade.cpp:99 src/gui/trade.cpp:135
-#, fuzzy, c-format
+#: src/gui/trade.cpp:108 src/gui/trade.cpp:149
+#, c-format
 msgid "You get %s"
-msgstr "Annat:"
+msgstr "Saat %s"
 
-#: src/gui/trade.cpp:100
+#: src/gui/trade.cpp:109
 msgid "You give:"
 msgstr "Annat:"
 
-#: src/gui/trade.cpp:104
+#: src/gui/trade.cpp:113
 msgid "Change"
 msgstr "Muuta"
 
-#: src/gui/trade.cpp:275
-msgid "Failed adding item. You can not overlap one kind of item on the window."
+#: src/gui/trade.cpp:314
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
+"Esineen lisääminen epäonnistui. Et voi limittää jotakin esinetyyppiä "
+"ikkunassa."
 
-#: src/gui/trade.cpp:318
+#: src/gui/trade.cpp:359
 msgid "You don't have enough money."
 msgstr "Sinulla ei ole tarpeeksi rahaa."
 
-#: src/gui/unregisterdialog.cpp:51
+#: src/gui/unregisterdialog.cpp:52
 #, c-format
 msgid "Name: %s"
 msgstr "Nimi: %s"
 
-#: src/gui/updatewindow.cpp:124
+#: src/gui/updatewindow.cpp:134
 msgid "Updating..."
 msgstr "Päivitetään..."
 
-#: src/gui/updatewindow.cpp:142
+#: src/gui/updatewindow.cpp:153
 msgid "Connecting..."
 msgstr "Yhdistetään..."
 
-#: src/gui/updatewindow.cpp:145
+#: src/gui/updatewindow.cpp:156
 msgid "Play"
-msgstr ""
+msgstr "Pelaa"
 
-#: src/gui/updatewindow.cpp:405
+#: src/gui/updatewindow.cpp:545
 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:407
+#: src/gui/updatewindow.cpp:547
 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:409
-#, fuzzy
+#: src/gui/updatewindow.cpp:549
 msgid "##1  you try again later."
 msgstr "##1  yrität myöhemmin uudelleen"
 
-#: src/gui/updatewindow.cpp:501
+#: src/gui/updatewindow.cpp:675
 msgid "Completed"
 msgstr "Valmis"
 
-#: src/gui/widgets/channeltab.cpp:49
-msgid "/users > Lists the users in the current channel"
+#: src/gui/userpalette.cpp:112
+msgid "Being"
+msgstr "Olo"
+
+#: src/gui/userpalette.cpp:113
+msgid "Friend Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:114
+msgid "Disregarded Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:115
+msgid "Ignored Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:116
+msgid "Erased Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:117
+msgid "Other Players' Names"
+msgstr "Muiden pelaajien nimet"
+
+#: src/gui/userpalette.cpp:118
+msgid "Own Name"
+msgstr "Oma nimi"
+
+#: src/gui/userpalette.cpp:119
+msgid "GM Names"
+msgstr "GM-nimet"
+
+#: src/gui/userpalette.cpp:120
+msgid "NPCs"
+msgstr "NPCt"
+
+#: src/gui/userpalette.cpp:121
+msgid "Monsters"
+msgstr "Hirviöt"
+
+#: src/gui/userpalette.cpp:122
+msgid "Monster HP bar"
+msgstr ""
+
+#: src/gui/userpalette.cpp:124
+msgid "Monster HP bar (second color)"
+msgstr ""
+
+#: src/gui/userpalette.cpp:125
+msgid "Party Members"
+msgstr "Ryhmän jäsenet"
+
+#: src/gui/userpalette.cpp:126
+msgid "Guild Members"
+msgstr "Killan jäsenet"
+
+#: src/gui/userpalette.cpp:127
+msgid "Particle Effects"
+msgstr "Hiukkastehosteet"
+
+#: src/gui/userpalette.cpp:128
+msgid "Pickup Notification"
+msgstr "Ottoilmoitus"
+
+#: src/gui/userpalette.cpp:129
+msgid "Exp Notification"
+msgstr "Kokemusilmoitus"
+
+#: src/gui/userpalette.cpp:130
+msgid "Player HP bar"
+msgstr ""
+
+#: src/gui/userpalette.cpp:132
+msgid "Player HP bar (second color)"
+msgstr ""
+
+#: src/gui/userpalette.cpp:133
+msgid "Player Hits Monster"
+msgstr ""
+
+#: src/gui/userpalette.cpp:134
+msgid "Monster Hits Player"
+msgstr "Hirviö lyö pelaajaa"
+
+#: src/gui/userpalette.cpp:136
+msgid "Other Player Hits Local Player"
+msgstr ""
+
+#: src/gui/userpalette.cpp:137
+msgid "Critical Hit"
+msgstr "Täysosuma"
+
+#: src/gui/userpalette.cpp:139
+msgid "Local Player Hits Monster"
+msgstr "Paikallinen pelaaja lyö hirviötä"
+
+#: src/gui/userpalette.cpp:141
+msgid "Local Player Critical Hit"
+msgstr "Paikallinen pelaaja saa täysosuman"
+
+#: src/gui/userpalette.cpp:143
+msgid "Local Player Miss"
+msgstr "Paikallisen pelaajan huti"
+
+#: src/gui/userpalette.cpp:144
+msgid "Misses"
+msgstr "Hudit"
+
+#: src/gui/userpalette.cpp:145
+msgid "Portal Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:147
+msgid "Collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:149
+msgid "Walkable Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:151
+msgid "Local Player Attack Range"
+msgstr ""
+
+#: src/gui/userpalette.cpp:153
+msgid "Local Player Attack Range Border"
+msgstr ""
+
+#: src/gui/userpalette.cpp:155
+msgid "Monster Attack Range"
+msgstr ""
+
+#: src/gui/userpalette.cpp:157
+msgid "Home Place"
+msgstr ""
+
+#: src/gui/userpalette.cpp:159
+msgid "Home Place Border"
+msgstr ""
+
+#: src/gui/userpalette.cpp:161
+msgid "Road Point"
+msgstr ""
+
+#: src/gui/whoisonline.cpp:70 src/gui/whoisonline.cpp:457
+msgid "Who Is Online - Updating"
+msgstr ""
+
+#: src/gui/whoisonline.cpp:90
+msgid "Update"
+msgstr ""
+
+#: src/gui/whoisonline.cpp:283
+msgid "Who Is Online - "
+msgstr ""
+
+#: src/gui/whoisonline.cpp:471
+msgid "Who Is Online - error"
+msgstr ""
+
+#: src/gui/whoisonline.cpp:502
+msgid "Who Is Online - Update"
+msgstr ""
+
+#: src/gui/widgets/battletab.cpp:43
+msgid "Battle"
 msgstr ""
 
 #: src/gui/widgets/channeltab.cpp:50
+msgid "/users > Lists the users in the current channel"
+msgstr "/users > Näyttää käyttäjät nykyisellä kanavalla"
+
+#: src/gui/widgets/channeltab.cpp:51
 msgid "/topic > Set the topic of the current channel"
 msgstr "/topic > Aseta kanavan aihe"
 
-#: src/gui/widgets/channeltab.cpp:51
+#: src/gui/widgets/channeltab.cpp:52
 msgid "/quit > Leave a channel"
 msgstr "/quit > Poistu kanavalta"
 
-#: src/gui/widgets/channeltab.cpp:52
+#: src/gui/widgets/channeltab.cpp:53
 msgid "/op > Make a user a channel operator"
 msgstr "/op > Tee käyttäjästä operaattori"
 
-#: src/gui/widgets/channeltab.cpp:53
+#: src/gui/widgets/channeltab.cpp:54
 msgid "/kick > Kick a user from the channel"
 msgstr "/kick > Poista käyttäjä kanavalta"
 
-#: src/gui/widgets/channeltab.cpp:63
+#: src/gui/widgets/channeltab.cpp:64
 msgid "Command: /users"
-msgstr ""
+msgstr "Komento: /users"
 
-#: src/gui/widgets/channeltab.cpp:64
+#: src/gui/widgets/channeltab.cpp:65
 msgid "This command shows the users in this channel."
 msgstr "Tämä komento näyttää käyttäjät kanavalla."
 
-#: src/gui/widgets/channeltab.cpp:68
+#: src/gui/widgets/channeltab.cpp:69
 msgid "Command: /topic <message>"
-msgstr ""
+msgstr "Komento: /topic <viesti>"
 
-#: src/gui/widgets/channeltab.cpp:69
+#: src/gui/widgets/channeltab.cpp:70
 msgid "This command sets the topic to <message>."
-msgstr ""
+msgstr "Tämä komento asettaa aihekentän arvoksi <viesti>."
 
-#: src/gui/widgets/channeltab.cpp:73
+#: src/gui/widgets/channeltab.cpp:74
 msgid "Command: /quit"
-msgstr ""
+msgstr "Komento: /quit"
 
-#: src/gui/widgets/channeltab.cpp:74
+#: src/gui/widgets/channeltab.cpp:75
 msgid "This command leaves the current channel."
 msgstr "Tällä komennolla poistut kanvalta."
 
-#: src/gui/widgets/channeltab.cpp:75
+#: src/gui/widgets/channeltab.cpp:76
 msgid "If you're the last person in the channel, it will be deleted."
 msgstr "Jos olet viimeinen henkilö kanavalla niin se katoaa."
 
-#: src/gui/widgets/channeltab.cpp:80
+#: src/gui/widgets/channeltab.cpp:81
 msgid "Command: /op <nick>"
-msgstr ""
+msgstr "Komento: /op <nimi>"
 
-#: src/gui/widgets/channeltab.cpp:81
+#: src/gui/widgets/channeltab.cpp:82
 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:83 src/gui/widgets/channeltab.cpp:92
+#: src/net/tmwa/gui/guildtab.cpp:89 src/net/tmwa/gui/partytab.cpp:83
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr "Jos nimessä on välilyöntejä, laita sen ympärille lainausmerkit (\")."
 
-#: src/gui/widgets/channeltab.cpp:84
+#: src/gui/widgets/channeltab.cpp:85
 msgid "Channel operators can kick and op other users from the channel."
 msgstr ""
 "Kanavan operaattori voi poistaa käyttäjiä kanavalta ja jakaa operaattorin "
 "oikeuksia."
 
-#: src/gui/widgets/channeltab.cpp:89
+#: src/gui/widgets/channeltab.cpp:90
 msgid "Command: /kick <nick>"
-msgstr ""
+msgstr "Komento: /kick <nimi>"
 
-#: src/gui/widgets/channeltab.cpp:90
+#: src/gui/widgets/channeltab.cpp:91
 msgid "This command makes <nick> leave the channel."
-msgstr ""
+msgstr "Tämä komento poistaa annetunnimisen hahmon kanavalta."
 
-#: src/gui/widgets/channeltab.cpp:119
+#: src/gui/widgets/channeltab.cpp:120
 msgid "Need a user to op!"
-msgstr ""
+msgstr "Anna operaattoriksi korotettavan käyttäjän nimi!"
 
-#: src/gui/widgets/channeltab.cpp:126
+#: src/gui/widgets/channeltab.cpp:127
 msgid "Need a user to kick!"
-msgstr ""
+msgstr "Anna potkittavan käyttäjän nimi!"
 
-#: src/gui/widgets/chattab.cpp:118
+#: src/gui/widgets/chattab.cpp:149
 msgid "Global announcement:"
-msgstr "Globaali ilmoitus:"
+msgstr "Yleinen ilmoitus:"
 
-#: src/gui/widgets/chattab.cpp:124
+#: src/gui/widgets/chattab.cpp:155
 #, c-format
 msgid "Global announcement from %s:"
-msgstr ""
+msgstr "%s ilmoittaa kaikille:"
 
-#: src/gui/widgets/chattab.cpp:150
+#: src/gui/widgets/chattab.cpp:182
 #, c-format
 msgid "%s whispers: %s"
-msgstr ""
+msgstr "%s kuiskaa: %s"
+
+#: src/gui/widgets/whispertab.cpp:105
+msgid "/ignore > Ignore the other player"
+msgstr "/ignore > Jätä pelaaja huomiotta"
+
+#: src/gui/widgets/whispertab.cpp:106
+msgid "/unignore > Stop ignoring the other player"
+msgstr "/unignore > Huomioi pelaaja jälleen"
+
+#: src/gui/widgets/whispertab.cpp:107
+msgid "/close > Close the whisper tab"
+msgstr "/close > Sulje kuiskausvälilehti"
+
+#: src/gui/widgets/whispertab.cpp:117
+msgid "Command: /close"
+msgstr "Komento: /close"
+
+#: src/gui/widgets/whispertab.cpp:118
+msgid "This command closes the current whisper tab."
+msgstr "Tämä komento sulkee avoinna olevan kuiskausvälilehden."
+
+#: src/gui/widgets/whispertab.cpp:122
+msgid "Command: /ignore"
+msgstr "Komento: /ignore"
 
-#: src/gui/widgets/whispertab.cpp:51
-msgid "Cannot send empty chat!"
+#: src/gui/widgets/whispertab.cpp:123
+msgid "This command ignores the other player regardless of current relations."
 msgstr ""
+"Tämä komento jättää annetun pelaajan huomiotta; nykysuhteilla ei ole "
+"vaikutusta."
 
-#: src/gui/widgets/whispertab.cpp:70
-msgid "/ignore > Ignore the other player"
+#: src/gui/widgets/whispertab.cpp:128
+msgid "Command: /unignore <player>"
+msgstr "Komento: /unignore <pelaajan nimi>"
+
+#: src/gui/widgets/whispertab.cpp:129
+msgid ""
+"This command stops ignoring the other player if they are being ignored."
 msgstr ""
+"Tämä komento huomioi pelaajan taas, jos tämä on ensin jätetty huomiotta."
 
-#: src/gui/widgets/whispertab.cpp:71
-msgid "/unignore > Stop ignoring the other player"
+#: src/gui/windowmenu.cpp:62
+msgid "BC"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:72
-msgid "/close > Close the whisper tab"
+#: src/gui/windowmenu.cpp:62
+msgid "Bot checker"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:82
-msgid "Command: /close"
+#: src/gui/windowmenu.cpp:64
+msgid "ONL"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:83
-msgid "This command closes the current whisper tab."
+#: src/gui/windowmenu.cpp:64
+msgid "Who is online"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:87
-msgid "Command: /ignore"
+#: src/gui/windowmenu.cpp:66
+msgid "KS"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:88
-#, fuzzy
-msgid "This command ignores the other player regardless of current relations."
-msgstr "Tämä komento näyttää paikalla olevien pelaajien määrän."
+#: src/gui/windowmenu.cpp:68
+msgid "Smiles"
+msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:94
-#, fuzzy
-msgid "This command stops ignoring the other player if they are being ignored."
-msgstr "Tämä komento aloittaa keskustelun nauhoituksen tiedostoon <filename>."
+#: src/gui/windowmenu.cpp:70
+msgid "STA"
+msgstr ""
 
-#: src/gui/windowmenu.cpp:55
+#: src/gui/windowmenu.cpp:70
 msgid "Status"
 msgstr "Hahmon tiedot"
 
-#: src/gui/windowmenu.cpp:61
-msgid "Shortcut"
-msgstr "Pikavalinnat"
+#: src/gui/windowmenu.cpp:71
+msgid "EQU"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:73
+msgid "INV"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:78
+msgid "SKI"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:84
+msgid "SPE"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:88
+msgid "SOC"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:89
+msgid "SH"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:89
+msgid "Shortcuts"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:91
+msgid "SP"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:92
+msgid "DR"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:93
+msgid "SET"
+msgstr ""
 
-#: src/gui/worldselectdialog.cpp:71
-#, fuzzy
+#: src/gui/worldselectdialog.cpp:75
 msgid "Select World"
-msgstr "Valitse palvelin"
+msgstr "Valitse pelimaailma"
 
-#: src/gui/worldselectdialog.cpp:76
-#, fuzzy
+#: src/gui/worldselectdialog.cpp:80
 msgid "Change Login"
-msgstr "Muuta"
+msgstr "Vaihda kirjautumistietoja"
 
-#: src/gui/worldselectdialog.cpp:77
-#, fuzzy
+#: src/gui/worldselectdialog.cpp:81
 msgid "Choose World"
-msgstr "Valitse palvelin"
+msgstr "Valitse pelimaailma"
+
+#: src/inventory.cpp:240
+msgid "Storage"
+msgstr "Varasto"
 
-#: src/keyboardconfig.cpp:40
+#: src/inventory.cpp:242
+msgid "Cart"
+msgstr ""
+
+#: src/keyboardconfig.cpp:41
 msgid "Move Up"
 msgstr "Ylöspäin"
 
-#: src/keyboardconfig.cpp:41
+#: src/keyboardconfig.cpp:42
 msgid "Move Down"
 msgstr "Alaspäin"
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:43
 msgid "Move Left"
 msgstr "Vasemmalle"
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:44
 msgid "Move Right"
 msgstr "Oikealle"
 
-#: src/keyboardconfig.cpp:44 src/net/ea/generalhandler.cpp:223
-msgid "Attack"
+#: src/keyboardconfig.cpp:47
+msgid "Target & Attack"
+msgstr "Kohdista ja hyökkää"
+
+#: src/keyboardconfig.cpp:49
+msgid "Move to Target"
 msgstr ""
 
-#: src/keyboardconfig.cpp:45
-msgid "Target & Attack"
+#: src/keyboardconfig.cpp:51
+msgid "Change Move to Target type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:46
-msgid "Smilie"
+#: src/keyboardconfig.cpp:53
+msgid "Move to Home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
-msgid "Talk"
+#: src/keyboardconfig.cpp:55
+msgid "Set home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
-msgid "Stop Attack"
+#: src/keyboardconfig.cpp:57
+msgid "Move to navigation point"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
-#, fuzzy
-msgid "Target Monster"
-msgstr "Hirviöt"
+#: src/keyboardconfig.cpp:59
+msgid "Smilie"
+msgstr "Hymiö"
 
-#: src/keyboardconfig.cpp:50
-msgid "Target NPC"
+#: src/keyboardconfig.cpp:61
+msgid "Stop Attack"
+msgstr "Keskeytä hyökkäys"
+
+#: src/keyboardconfig.cpp:62
+msgid "Target Closest"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:64
+msgid "Target NPC"
+msgstr "Kohdista ei-pelaajahahmoon"
+
+#: src/keyboardconfig.cpp:65
 msgid "Target Player"
-msgstr ""
+msgstr "Kohdista pelaajaan"
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:67
 msgid "Pickup"
+msgstr "Nouki"
+
+#: src/keyboardconfig.cpp:68
+msgid "Change Pickup Type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:70
 msgid "Hide Windows"
 msgstr "Piilota ikkunat"
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:72
 msgid "Sit"
 msgstr "Istu"
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:73
 msgid "Screenshot"
 msgstr "Kuvankaappaus"
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:74
 msgid "Enable/Disable Trading"
-msgstr ""
+msgstr "Salli/estä kaupankäynti"
 
-#: src/keyboardconfig.cpp:57
-msgid "Find Path to Mouse"
+#: src/keyboardconfig.cpp:76
+msgid "Change Map View Mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58 src/keyboardconfig.cpp:59
-#: src/keyboardconfig.cpp:60 src/keyboardconfig.cpp:61
-#: src/keyboardconfig.cpp:62 src/keyboardconfig.cpp:63
-#: src/keyboardconfig.cpp:64 src/keyboardconfig.cpp:65
-#: src/keyboardconfig.cpp:66 src/keyboardconfig.cpp:67
-#: src/keyboardconfig.cpp:68 src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:78
+msgid "Item Shortcuts Key"
+msgstr ""
+
+#: src/keyboardconfig.cpp:80 src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:84 src/keyboardconfig.cpp:86
+#: src/keyboardconfig.cpp:88 src/keyboardconfig.cpp:90
+#: src/keyboardconfig.cpp:92 src/keyboardconfig.cpp:94
+#: src/keyboardconfig.cpp:96 src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:100 src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:104 src/keyboardconfig.cpp:106
+#: src/keyboardconfig.cpp:108 src/keyboardconfig.cpp:111
+#: src/keyboardconfig.cpp:113 src/keyboardconfig.cpp:115
+#: src/keyboardconfig.cpp:117 src/keyboardconfig.cpp:119
+#: src/keyboardconfig.cpp:346
 #, c-format
 msgid "Item Shortcut %d"
-msgstr ""
+msgstr "Esinepikavalinta %d"
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:120
 msgid "Help Window"
-msgstr ""
+msgstr "Ohjeikkuna"
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:121
 msgid "Status Window"
-msgstr ""
+msgstr "Tilaikkuna"
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:123
 msgid "Inventory Window"
-msgstr "Inventaario Ikkuna"
+msgstr "Tavaraikkuna"
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:125
 msgid "Equipment Window"
-msgstr "Varuste ikkuna"
+msgstr "Varusteikkuna"
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:127
 msgid "Skill Window"
-msgstr ""
+msgstr "Taitoikkuna"
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:129
 msgid "Minimap Window"
-msgstr ""
+msgstr "Karttaikkuna"
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:131
 msgid "Chat Window"
-msgstr ""
+msgstr "Keskusteluikkuna"
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:132
 msgid "Item Shortcut Window"
-msgstr ""
+msgstr "Esineiden pikavalintaikkuna"
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:134
 msgid "Setup Window"
-msgstr "Asetus ikkuna"
+msgstr "Asetusikkuna"
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:136
 msgid "Debug Window"
-msgstr ""
+msgstr "Debug-ikkuna"
 
-#: src/keyboardconfig.cpp:80
-#, fuzzy
+#: src/keyboardconfig.cpp:138
 msgid "Social Window"
-msgstr "Piilota ikkunat"
+msgstr "Suhdeikkuna"
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:140
 msgid "Emote Shortcut Window"
-msgstr ""
+msgstr "Eleiden pikavalintaikkuna"
 
-#: src/keyboardconfig.cpp:82
-#, fuzzy
+#: src/keyboardconfig.cpp:142
 msgid "Outfits Window"
-msgstr "Varuste ikkuna"
+msgstr "Asukokonaisuusikkuna"
 
-#: src/keyboardconfig.cpp:83
-msgid "Wear Outfit"
+#: src/keyboardconfig.cpp:144
+msgid "Shop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
-msgid "Copy Outfit"
+#: src/keyboardconfig.cpp:145
+msgid "Quick drop Window"
 msgstr ""
 
-#: 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:147
+msgid "Kills Stats Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:149
+msgid "Commands Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:151
+msgid "Bot Checker Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:154
+msgid "Who Is Online Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:156
+msgid "Previous Social Tab"
+msgstr ""
+
+#: src/keyboardconfig.cpp:157
+msgid "Next Social Tab"
+msgstr ""
+
+#: src/keyboardconfig.cpp:159 src/keyboardconfig.cpp:161
+#: src/keyboardconfig.cpp:163 src/keyboardconfig.cpp:165
+#: src/keyboardconfig.cpp:167 src/keyboardconfig.cpp:169
+#: src/keyboardconfig.cpp:171 src/keyboardconfig.cpp:173
+#: src/keyboardconfig.cpp:175 src/keyboardconfig.cpp:177
+#: src/keyboardconfig.cpp:179 src/keyboardconfig.cpp:181
+#: src/keyboardconfig.cpp:184 src/keyboardconfig.cpp:186
+#: src/keyboardconfig.cpp:188 src/keyboardconfig.cpp:190
+#: src/keyboardconfig.cpp:192 src/keyboardconfig.cpp:194
+#: src/keyboardconfig.cpp:196 src/keyboardconfig.cpp:198
+#: src/keyboardconfig.cpp:200 src/keyboardconfig.cpp:202
+#: src/keyboardconfig.cpp:204 src/keyboardconfig.cpp:206
+#: src/keyboardconfig.cpp:208 src/keyboardconfig.cpp:211
+#: src/keyboardconfig.cpp:214 src/keyboardconfig.cpp:217
+#: src/keyboardconfig.cpp:219 src/keyboardconfig.cpp:221
+#: src/keyboardconfig.cpp:223 src/keyboardconfig.cpp:225
+#: src/keyboardconfig.cpp:227 src/keyboardconfig.cpp:229
+#: src/keyboardconfig.cpp:231 src/keyboardconfig.cpp:233
+#: src/keyboardconfig.cpp:235 src/keyboardconfig.cpp:238
+#: src/keyboardconfig.cpp:240 src/keyboardconfig.cpp:242
+#: src/keyboardconfig.cpp:244 src/keyboardconfig.cpp:246
+#: src/keyboardconfig.cpp:248 src/keyboardconfig.cpp:250
+#: src/keyboardconfig.cpp:341
 #, c-format
 msgid "Emote Shortcut %d"
+msgstr "Eleen pikavalinta %d"
+
+#: src/keyboardconfig.cpp:252
+msgid "Wear Outfit"
+msgstr "Pue asu"
+
+#: src/keyboardconfig.cpp:254
+msgid "Copy Outfit"
+msgstr "Kopioi asu"
+
+#: src/keyboardconfig.cpp:256
+msgid "Copy Equiped to Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:258
 msgid "Toggle Chat"
-msgstr ""
+msgstr "Ota keskustelu käyttöön/pois käytöstä"
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:260
 msgid "Scroll Chat Up"
-msgstr ""
+msgstr "Vieritä keskustelua ylös"
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:262
 msgid "Scroll Chat Down"
-msgstr ""
+msgstr "Vieritä keskustelua alas"
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:264
 msgid "Previous Chat Tab"
-msgstr "Edellinen keskustelu välilehti"
+msgstr "Edellinen keskusteluvälilehti"
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:266
 msgid "Next Chat Tab"
-msgstr "Seuraava keskustelu välilehti"
+msgstr "Seuraava keskusteluvälilehti"
 
-#: src/keyboardconfig.cpp:102
-msgid "Select OK"
+#: src/keyboardconfig.cpp:268
+msgid "Previous chat tab line"
 msgstr ""
 
-#: src/keyboardconfig.cpp:104
-msgid "Ignore input 1"
+#: src/keyboardconfig.cpp:270
+msgid "Next chat tab line"
+msgstr ""
+
+#: src/keyboardconfig.cpp:272
+msgid "Chat Auto Complete"
 msgstr ""
 
-#: src/keyboardconfig.cpp:105
+#: src/keyboardconfig.cpp:274
+msgid "Deactivate Chat Input"
+msgstr ""
+
+#: src/keyboardconfig.cpp:276
+msgid "Select OK"
+msgstr "Valitse OK"
+
+#: src/keyboardconfig.cpp:278
+msgid "Ignore input 1"
+msgstr "Jätä huomiotta syöte 1"
+
+#: src/keyboardconfig.cpp:280
 msgid "Ignore input 2"
+msgstr "Jätä huomiotta syöte 2"
+
+#: src/keyboardconfig.cpp:282
+msgid "Direct Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:178
+#: src/keyboardconfig.cpp:283
+msgid "Direct Down"
+msgstr ""
+
+#: src/keyboardconfig.cpp:285
+msgid "Direct Left"
+msgstr ""
+
+#: src/keyboardconfig.cpp:286
+msgid "Direct Right"
+msgstr ""
+
+#: src/keyboardconfig.cpp:288
+msgid "Crazy moves"
+msgstr ""
+
+#: src/keyboardconfig.cpp:290
+msgid "Change Crazy Move mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:292
+msgid "Quick Drop N Items from 0 slot"
+msgstr ""
+
+#: src/keyboardconfig.cpp:294
+msgid "Quick Drop N Items"
+msgstr ""
+
+#: src/keyboardconfig.cpp:296
+msgid "Switch Quick Drop Counter"
+msgstr ""
+
+#: src/keyboardconfig.cpp:298
+msgid "Quick heal target or self"
+msgstr ""
+
+#: src/keyboardconfig.cpp:300
+msgid "Use #itenplz spell"
+msgstr ""
+
+#: src/keyboardconfig.cpp:302
+msgid "Use magic attack"
+msgstr ""
+
+#: src/keyboardconfig.cpp:304
+msgid "Switch magic attack"
+msgstr ""
+
+#: src/keyboardconfig.cpp:306
+msgid "Change move type"
+msgstr ""
+
+#: src/keyboardconfig.cpp:308
+msgid "Change Attack Weapon Type"
+msgstr ""
+
+#: src/keyboardconfig.cpp:310
+msgid "Change Attack Type"
+msgstr ""
+
+#: src/keyboardconfig.cpp:312
+msgid "Change Follow mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:314
+msgid "Change Imitation mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:317
+msgid "Disable / Enable Game modifier keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:318
+msgid "On / Off audio"
+msgstr ""
+
+#: src/keyboardconfig.cpp:320
+msgid "Enable / Disable away mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:322
+msgid "Emulate right click from keyboard"
+msgstr ""
+
+#: src/keyboardconfig.cpp:324
+msgid "Toggle camera mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:397
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
+"Päällekkäiset näppäinoikotiet \"%s\" ja \"%s\" voivat aiheuttaa outouksia; "
+"ole hyvä ja poista päällekkäisyydet. "
+
+#: src/localplayer.cpp:338
+msgid "You were killed by "
+msgstr ""
+
+#: src/localplayer.cpp:1344
+msgid "Tried to pick up nonexistent item."
+msgstr ""
+
+#: src/localplayer.cpp:1346
+msgid "Item is too heavy."
+msgstr ""
 
-#: src/localplayer.cpp:913
-msgid "Unable to pick up item."
+#: src/localplayer.cpp:1348
+msgid "Item is too far away"
+msgstr ""
+
+#: src/localplayer.cpp:1350
+msgid "Inventory is full."
+msgstr ""
+
+#: src/localplayer.cpp:1352
+msgid "Stack is too big."
+msgstr ""
+
+#: src/localplayer.cpp:1355
+msgid "Item belongs to someone else."
+msgstr ""
+
+#: src/localplayer.cpp:1358
+msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: This sentence may be translated differently
 #. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:922
+#: src/localplayer.cpp:1383
 #, 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/main.cpp:43
-msgid "mana [options] [mana-file]"
+#: src/localplayer.cpp:3099
+msgid "Away"
+msgstr "Poissa"
+
+#: src/localplayer.cpp:3392
+msgid "Follow: "
 msgstr ""
 
-#: src/main.cpp:44
-msgid "Options:"
-msgstr "Asetukset:"
+#: src/localplayer.cpp:3394 src/localplayer.cpp:3409
+msgid "Follow canceled"
+msgstr ""
+
+#: src/localplayer.cpp:3401
+msgid "Imitation: "
+msgstr ""
+
+#: src/localplayer.cpp:3403 src/localplayer.cpp:3411
+msgid "Imitation canceled"
+msgstr ""
+
+#: src/localplayer.cpp:3763
+msgid "You see "
+msgstr ""
 
 #: src/main.cpp:45
-msgid "  -v --version        : Display the version"
+msgid "manaplus [options] [mana-file]"
 msgstr ""
 
 #: src/main.cpp:46
-#, fuzzy
-msgid "  -h --help           : Display this help"
-msgstr "/help > Näyttää tämän apu tekstin"
+msgid "[mana-file] : The mana file is an XML file (.mana)"
+msgstr ""
 
 #: src/main.cpp:47
-msgid "  -C --config-dir     : Configuration directory to use"
+msgid "              used to set custom parameters"
 msgstr ""
 
 #: src/main.cpp:48
-msgid "  -U --username       : Login with this username"
-msgstr ""
-
-#: src/main.cpp:49
-msgid "  -P --password       : Login with this password"
+msgid "              to the manaplus client."
 msgstr ""
 
 #: src/main.cpp:50
-msgid "  -c --character      : Login with this character"
-msgstr ""
+msgid "Options:"
+msgstr "Parametrit:"
 
 #: src/main.cpp:51
-msgid "  -s --server         : Login server name or IP"
+msgid "  -l --log-file       : Log file to use"
 msgstr ""
 
 #: src/main.cpp:52
-msgid "  -p --port           : Login server port"
+msgid "  -L --chat-log-dir   : Chat log dir to use"
 msgstr ""
 
 #: src/main.cpp:53
-msgid "     --update-host    : Use this update host"
-msgstr ""
+msgid "  -v --version        : Display the version"
+msgstr "  -v --version        : Näytä versionumero"
 
 #: src/main.cpp:54
-msgid "  -D --default        : Choose default character server and character"
-msgstr ""
+msgid "  -h --help           : Display this help"
+msgstr "  -h --help           : Näytä tämä ohje"
+
+#: src/main.cpp:55
+msgid "  -C --config-dir     : Configuration directory to use"
+msgstr "  -C --config-dir     : Käytä tätä asetushakemistoa"
 
 #: src/main.cpp:56
-msgid "  -u --skip-update    : Skip the update downloads"
-msgstr ""
+msgid "  -U --username       : Login with this username"
+msgstr "  -U --username       : Käyttäjätunnus sisäänkirjautumiseen"
 
 #: src/main.cpp:57
-msgid "  -d --data           : Directory to load game data from"
-msgstr ""
+msgid "  -P --password       : Login with this password"
+msgstr "  -P --password       : Salasana sisäänkirjautumiseen"
 
 #: src/main.cpp:58
-msgid "  -L --localdata-dir  : Directory to use as local data directory"
-msgstr ""
+msgid "  -c --character      : Login with this character"
+msgstr "  -c --character      : Hahmo sisäänkirjautumiseen"
 
 #: src/main.cpp:59
-msgid "     --screenshot-dir : Directory to store screenshots"
+msgid "  -s --server         : Login server name or IP"
 msgstr ""
+"  -s --server         : Palvelinnimi tai IP-osoite sisäänkirjautumiseen"
+
+#: src/main.cpp:60
+msgid "  -p --port           : Login server port"
+msgstr "  -p --port           : Palvelinportti sisäänkirjautumiseen "
 
 #: src/main.cpp:61
+msgid "     --update-host    : Use this update host"
+msgstr "     --update-host    : Käytä tätä päivityspalvelinta"
+
+#: src/main.cpp:62
+msgid "  -D --default        : Choose default character server and character"
+msgstr "  -D --default        : Aseta oletushahmopalvelin ja -hahmo"
+
+#: src/main.cpp:64
+msgid "  -u --skip-update    : Skip the update downloads"
+msgstr "  -u --skip-update    : Ohita päivityslataukset"
+
+#: src/main.cpp:65
+msgid "  -d --data           : Directory to load game data from"
+msgstr "  -d --data           : Lataa pelidata tästä hakemistosta"
+
+#: src/main.cpp:67
+msgid "  -L --localdata-dir  : Directory to use as local data directory"
+msgstr "  -L --localdata-dir  : Hakemisto paikallisdatan tallennukseen"
+
+#: src/main.cpp:69
+msgid "     --screenshot-dir : Directory to store screenshots"
+msgstr "     --screenshot-dir : Kuvankaappausten tallennushakemisto"
+
+#: src/main.cpp:70
+msgid "     --safemode       : Start game in safe mode"
+msgstr ""
+
+#: src/main.cpp:72
 msgid "     --no-opengl      : Disable OpenGL for this session"
+msgstr "     --no-opengl      : Poista OpenGL käytöstä tämän session ajaksi"
+
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:248
+msgid "Strength"
+msgstr "Voima"
+
+#: src/net/manaserv/attributes.cpp:167
+#, c-format
+msgid "Strength %+.1f"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:63
-msgid "Kick failed!"
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:249
+msgid "Agility"
+msgstr "Ketteryys"
+
+#: src/net/manaserv/attributes.cpp:180
+#, c-format
+msgid "Agility %+.1f"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:65
-msgid "Kick succeeded!"
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:252
+msgid "Dexterity"
+msgstr "Näppäryys"
+
+#: src/net/manaserv/attributes.cpp:193
+#, c-format
+msgid "Dexterity %+.1f"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:110
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:250
+msgid "Vitality"
+msgstr "Elinvoima"
+
+#: src/net/manaserv/attributes.cpp:206
+#, c-format
+msgid "Vitality %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:251
+msgid "Intelligence"
+msgstr "Älykkyys"
+
+#: src/net/manaserv/attributes.cpp:219
+#, c-format
+msgid "Intelligence %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:225
+msgid "Willpower"
+msgstr "Tahdonvoima"
+
+#: src/net/manaserv/attributes.cpp:232
+#, c-format
+msgid "Willpower %+.1f"
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:101
+msgid "You are dead."
+msgstr "Olet kuollut."
+
+#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:102
+msgid "We regret to inform you that your character was killed in battle."
+msgstr "Ikävä kyllä joudumme kertomaan hahmosi kuolleen taistelussa."
+
+#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:104
+msgid "You are not that alive anymore."
+msgstr "Et ole enää erityisen elossa."
+
+#: src/net/manaserv/beinghandler.cpp:319 src/net/tmwa/playerhandler.cpp:105
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr "Tuonelasta käy sieluusi kylmä viima."
+
+#: src/net/manaserv/beinghandler.cpp:320 src/net/tmwa/playerhandler.cpp:106
+msgid "Game Over!"
+msgstr "Se siitä!"
+
+#: src/net/manaserv/beinghandler.cpp:321 src/net/tmwa/playerhandler.cpp:108
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+"Ei, lapsikullat. Hahmonne ei oikeasti kuollut. Se... öhm... meni parempaan "
+"paikkaan."
+
+#: src/net/manaserv/beinghandler.cpp:323 src/net/tmwa/playerhandler.cpp:110
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+"Ovela suunnitelmasi rikkoa vastustajiesi aseet iskemällä ne omaan kurkkuusi "
+"epäonnistui."
+
+#: src/net/manaserv/beinghandler.cpp:325 src/net/tmwa/playerhandler.cpp:112
+msgid "I guess this did not run too well."
+msgstr "Ei tainnut mennä kovin lujaa."
+
+#: src/net/manaserv/beinghandler.cpp:326 src/net/tmwa/playerhandler.cpp:114
+msgid "Do you want your possessions identified?"
+msgstr "Haluatko tietää mitä rojua kanniskelit oikeasti mukanasi?"
+
+#: src/net/manaserv/beinghandler.cpp:327 src/net/tmwa/playerhandler.cpp:116
+msgid "Sadly, no trace of you was ever found..."
+msgstr "Ikävä kyllä sinusta ei jäänyt lopulta jälkeäkään löydettäväksi..."
+
+#: src/net/manaserv/beinghandler.cpp:329 src/net/tmwa/playerhandler.cpp:118
+msgid "Annihilated."
+msgstr "Pim! Olet annihiloitu."
+
+#: src/net/manaserv/beinghandler.cpp:330 src/net/tmwa/playerhandler.cpp:120
+msgid "Looks like you got your head handed to you."
+msgstr "Jäi näköjään oma pää vetävän käteen."
+
+#: src/net/manaserv/beinghandler.cpp:332 src/net/tmwa/playerhandler.cpp:122
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr "Peballeen meni taas, vedä raatosi vessasta alas ja hanki uusi."
+
+#: src/net/manaserv/beinghandler.cpp:337
+msgid "Press OK to respawn."
+msgstr "Paina OK syntyäksesi uudelleen."
+
+#: src/net/manaserv/beinghandler.cpp:338
+msgid "You Died"
+msgstr "Kuolit"
+
+#: src/net/manaserv/charhandler.cpp:145 src/net/manaserv/charhandler.cpp:219
+msgid "Not logged in."
+msgstr "Et ole kirjautunut sisään."
+
+#: src/net/manaserv/charhandler.cpp:148
+msgid "No empty slot."
+msgstr "Ei vapaata paikkaa."
+
+#: src/net/manaserv/charhandler.cpp:151
+msgid "Invalid name."
+msgstr "Epäkelpo nimi."
+
+#: src/net/manaserv/charhandler.cpp:154
+msgid "Character's name already exists."
+msgstr "Hahmon nimi on jo käytössä."
+
+#: src/net/manaserv/charhandler.cpp:157
+msgid "Invalid hairstyle."
+msgstr "Epäkelpo hiustyyli."
+
+#: src/net/manaserv/charhandler.cpp:160
+msgid "Invalid hair color."
+msgstr "Epäkelpo hiusten väri."
+
+#: src/net/manaserv/charhandler.cpp:163
+msgid "Invalid gender."
+msgstr "Epäkelpo sukupuoli."
+
+#: src/net/manaserv/charhandler.cpp:166
+msgid "Character's stats are too high."
+msgstr "Hahmon arvot ovat liian korkeat."
+
+#: src/net/manaserv/charhandler.cpp:169
+msgid "Character's stats are too low."
+msgstr "Hahmon arvot ovat liian matalat. (Lurjus.)"
+
+#: src/net/manaserv/charhandler.cpp:172
+#, c-format
+msgid "At least one statis out of the permitted range: (%u - %u)."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:178
+msgid "Invalid slot number."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
+#: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
+#: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
+#: src/net/tmwa/loginhandler.cpp:100 src/net/tmwa/loginhandler.cpp:200
+msgid "Unknown error."
+msgstr "Tuntematon virhe."
+
+#: src/net/manaserv/charhandler.cpp:210 src/net/tmwa/charserverhandler.cpp:199
+msgid "Info"
+msgstr "Tietoja"
+
+#: src/net/manaserv/charhandler.cpp:210
+msgid "Player deleted."
+msgstr "Hahmo poistettu."
+
+#: src/net/manaserv/charhandler.cpp:222
+msgid "Selection out of range."
+msgstr "Valinta sallittujen arvojen ulkopuolella."
+
+#: src/net/manaserv/charhandler.cpp:225
+#, c-format
+msgid "Unknown error (%d)."
+msgstr "Tuntematon virhe (%d)."
+
+#: src/net/manaserv/charhandler.cpp:261
+msgid "No gameservers are available."
+msgstr "Pelipalvelimia ei ole saatavilla."
+
+#: src/net/manaserv/chathandler.cpp:186 src/net/manaserv/chathandler.cpp:309
+#: src/net/manaserv/guildhandler.cpp:265
+#, c-format
+msgid "Topic: %s"
+msgstr "Aihe: %s"
+
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:269
+msgid "Players in this channel:"
+msgstr "Pelaajia tällä kanavalla:"
+
+#: src/net/manaserv/chathandler.cpp:208
+msgid "Error joining channel."
+msgstr "Kanavalle liittyminen epäonnistui."
+
+#: src/net/manaserv/chathandler.cpp:214
+msgid "Listing channels."
+msgstr "Kanavalistaus:"
+
+#: src/net/manaserv/chathandler.cpp:226
+msgid "End of channel list."
+msgstr "Kanavalistauksen loppu."
+
+#: src/net/manaserv/chathandler.cpp:299
+#, c-format
+msgid "%s entered the channel."
+msgstr "%s liittyi kanavalle."
+
+#: src/net/manaserv/chathandler.cpp:304
+#, c-format
+msgid "%s left the channel."
+msgstr "%s poistui kanavalta."
+
+#: src/net/manaserv/chathandler.cpp:320
+#, c-format
+msgid "%s has set mode %s on user %s."
+msgstr "%s asetti tilan %s käyttäjälle %s."
+
+#: src/net/manaserv/chathandler.cpp:331
+#, c-format
+msgid "%s has kicked %s."
+msgstr "%s potkaisi käyttäjän %s ulos."
+
+#: src/net/manaserv/chathandler.cpp:337
+msgid "Unknown channel event."
+msgstr "Tuntematon kanavatapahtuma."
+
+#: src/net/manaserv/guildhandler.cpp:85 src/net/tmwa/guildhandler.cpp:105
+msgid "Guild created."
+msgstr "Kilta luotu."
+
+#: src/net/manaserv/guildhandler.cpp:90
+msgid "Error creating guild."
+msgstr "Killan luonti epäonnistui."
+
+#: src/net/manaserv/guildhandler.cpp:100
+msgid "Invite sent."
+msgstr "Kutsu lähetetty."
+
+#: src/net/manaserv/guildhandler.cpp:207
+msgid "Member was promoted successfully."
+msgstr "Jäsen ylennettiin onnistuneesti."
+
+#: src/net/manaserv/guildhandler.cpp:212
+msgid "Failed to promote member."
+msgstr "Jäsenen ylennys epäonnistui."
+
+#: src/net/manaserv/loginhandler.cpp:93
+msgid "Wrong magic_token."
+msgstr "Väärä taikalipuke (magic_token)."
+
+#: src/net/manaserv/loginhandler.cpp:96 src/net/manaserv/loginhandler.cpp:281
+msgid "Already logged in."
+msgstr "Tällä tunnuksella on jo kirjauduttu sisään."
+
+#: src/net/manaserv/loginhandler.cpp:99
+msgid "Account banned."
+msgstr "Tili porttikiellossa."
+
+#: src/net/manaserv/loginhandler.cpp:124
+msgid "New password incorrect."
+msgstr "Uusi salasana on väärä."
+
+#: src/net/manaserv/loginhandler.cpp:127 src/net/tmwa/loginhandler.cpp:94
+msgid "Old password incorrect."
+msgstr "Vanha salsana on väärä."
+
+#: src/net/manaserv/loginhandler.cpp:131 src/net/manaserv/loginhandler.cpp:163
+msgid "Account not connected. Please login first."
+msgstr "Tiliin ei ole yhteyttä. Ole hyvä ja kirjaudu ensin sisään."
+
+#: src/net/manaserv/loginhandler.cpp:156
+msgid "New email address incorrect."
+msgstr "Uusi sähköpostiosoite ei kelpaa."
+
+#: src/net/manaserv/loginhandler.cpp:159
+msgid "Old email address incorrect."
+msgstr "Vanha sähköpostiosoite ei kelpaa."
+
+#: src/net/manaserv/loginhandler.cpp:167
+msgid "The new email address already exists."
+msgstr "Uusi sähköpostiosoite on jo käytössä."
+
+#: src/net/manaserv/loginhandler.cpp:249
+msgid ""
+"Client registration is not allowed. Please contact server administration."
+msgstr ""
+"Asiakasohjelmalla ei voi rekisteröityä tälle palvelimelle; ota yhteyttä "
+"palvelimen ylläpitoon."
+
+#: src/net/manaserv/loginhandler.cpp:275 src/net/manaserv/loginhandler.cpp:312
+msgid "Client version is too old."
+msgstr "Asiakasohjelman versio on liian vanha."
+
+#: src/net/manaserv/loginhandler.cpp:278
+msgid "Wrong username or password."
+msgstr "Väärä käyttäjätunnus tai salasana."
+
+#: src/net/manaserv/loginhandler.cpp:284
+msgid "Account banned"
+msgstr "Tili porttikiellossa"
+
+#: src/net/manaserv/loginhandler.cpp:287
+msgid "Login attempt too soon after previous attempt."
+msgstr "Sisäänkirjautumista yritetty liian pian edellisen yrityksen jälḱeen."
+
+#: src/net/manaserv/loginhandler.cpp:315
+msgid "Wrong username, password or email address."
+msgstr "Väärä käyttäjätunnus, salasana tai sähköpostiosoite."
+
+#: src/net/manaserv/loginhandler.cpp:318
+msgid "Username already exists."
+msgstr "Käyttäjätunnus on jo käytössä."
+
+#: src/net/manaserv/loginhandler.cpp:321
+msgid "Email address already exists."
+msgstr "Sähköpostiosoite on jo käytössä."
+
+#: src/net/manaserv/loginhandler.cpp:324
+msgid "You took too long with the captcha or your response was incorrect."
+msgstr ""
+"Käytit captcha-testin käsittelyyn liian paljon aikaa tai vastauksesi oli "
+"väärin."
+
+#: src/net/manaserv/partyhandler.cpp:90
+msgid "Joined party."
+msgstr "Liityit ryhmään."
+
+#: src/net/manaserv/partyhandler.cpp:108
+#, c-format
+msgid "%s joined the party."
+msgstr "%s liittyi ryhmään."
+
+#: src/net/manaserv/partyhandler.cpp:126
+#, c-format
+msgid "%s rejected your invite."
+msgstr "%s ei ottanut kutsuasi vastaan."
+
+#: src/net/manaserv/tradehandler.cpp:107
+msgid "Accepting incoming trade requests."
+msgstr "Hyväksyt tulevat kaupantekoehdotukset."
+
+#: src/net/manaserv/tradehandler.cpp:109
+msgid "Ignoring incoming trade requests."
+msgstr "Jätät tulevat kaupantekoehdotukset huomiotta."
+
+#: src/net/manaserv/tradehandler.cpp:128 src/net/tmwa/tradehandler.cpp:123
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr "%s haluaa tehdä kauppaa kanssasi, katsotko tarjouksen?"
+
+#: src/net/manaserv/tradehandler.cpp:146
+#, c-format
+msgid "Trading with %s"
+msgstr "Kaupantekoa pelaajan %s kanssa"
+
+#: src/net/manaserv/tradehandler.cpp:160 src/net/tmwa/tradehandler.cpp:280
+msgid "Trade canceled."
+msgstr "Kaupat peruttu."
+
+#: src/net/manaserv/tradehandler.cpp:167 src/net/tmwa/tradehandler.cpp:290
+msgid "Trade completed."
+msgstr "Kaupat tuli."
+
+#: src/net/tmwa/adminhandler.cpp:65
+msgid "Kick failed!"
+msgstr "Potkiminen epäonnistui!"
+
+#: src/net/tmwa/adminhandler.cpp:67
+msgid "Kick succeeded!"
+msgstr "Potkiminen onnistui!"
+
+#: src/net/tmwa/buysellhandler.cpp:132
 msgid "Nothing to sell."
 msgstr "Ei mitään myytävää"
 
-#: src/net/ea/buysellhandler.cpp:117
+#: src/net/tmwa/buysellhandler.cpp:139
 msgid "Thanks for buying."
-msgstr ""
+msgstr "Kiitos kaupoista."
 
-#: src/net/ea/buysellhandler.cpp:124
+#: src/net/tmwa/buysellhandler.cpp:147
 msgid "Unable to buy."
-msgstr ""
+msgstr "Ostaminen epäonnistui."
 
-#: src/net/ea/buysellhandler.cpp:130
+#: src/net/tmwa/buysellhandler.cpp:155
 msgid "Thanks for selling."
-msgstr ""
+msgstr "Kiitos kaupoista."
 
-#: src/net/ea/buysellhandler.cpp:132
+#: src/net/tmwa/buysellhandler.cpp:159
 msgid "Unable to sell."
+msgstr "Myyminen epäonnistui."
+
+#: src/net/tmwa/buysellhandler.cpp:162
+msgid "Unable to sell while trading."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:103
-#, fuzzy
-msgid "Access denied."
-msgstr "Pääsy evätty"
+#: src/net/tmwa/buysellhandler.cpp:165
+msgid "Unable to sell unsellable item."
+msgstr ""
+
+#: src/net/tmwa/charserverhandler.cpp:119
+msgid "Access denied. Most likely, there are too many players on this server."
+msgstr "Pääsy evätty. Todennäköisesti palvelimella on liian paljon pelaajia."
 
-#: src/net/ea/charserverhandler.cpp:106
+#: src/net/tmwa/charserverhandler.cpp:123
 msgid "Cannot use this ID."
-msgstr ""
+msgstr "Tätä tunnistetta ei voi käyttää."
 
-#: src/net/ea/charserverhandler.cpp:109
-#, fuzzy
-msgid "Unknown failure to select character."
-msgstr "Hahmon poisto epäonnistui"
+#: src/net/tmwa/charserverhandler.cpp:126
+msgid "Unknown char-server failure."
+msgstr "Tuntematon hahmopalvelinvirhe."
 
-#: src/net/ea/charserverhandler.cpp:135
+#: src/net/tmwa/charserverhandler.cpp:172
 msgid "Failed to create character. Most likely the name is already taken."
-msgstr "Hahmon luonti epäonnistui. Todennäköisesti hahmon nimi on jo käytössä."
+msgstr ""
+"Hahmon luonti epäonnistui. Todennäköisesti hahmon nimi on jo käytössä."
 
-#: src/net/ea/charserverhandler.cpp:147 src/net/manaserv/charhandler.cpp:187
-msgid "Info"
+#: src/net/tmwa/charserverhandler.cpp:176 src/net/tmwa/loginhandler.cpp:194
+msgid "Wrong name."
+msgstr ""
+
+#: src/net/tmwa/charserverhandler.cpp:179
+msgid "Incorrect stats."
+msgstr ""
+
+#: src/net/tmwa/charserverhandler.cpp:182
+msgid "Incorrect hair."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:147
+#: src/net/tmwa/charserverhandler.cpp:185
+msgid "Incorrect slot."
+msgstr ""
+
+#: src/net/tmwa/charserverhandler.cpp:199
 msgid "Character deleted."
-msgstr "Hahmo poistettu"
+msgstr "Hahmo poistettu."
 
-#: src/net/ea/charserverhandler.cpp:152
+#: src/net/tmwa/charserverhandler.cpp:204
 msgid "Failed to delete character."
-msgstr "Hahmon poisto epäonnistui"
+msgstr "Hahmon poisto epäonnistui."
 
-#: src/net/ea/charserverhandler.cpp:237 src/net/manaserv/charhandler.cpp:263
+#: src/net/tmwa/charserverhandler.cpp:381
 msgid "Strength:"
 msgstr "Voima:"
 
-#: src/net/ea/charserverhandler.cpp:238 src/net/manaserv/charhandler.cpp:264
+#: src/net/tmwa/charserverhandler.cpp:382
 msgid "Agility:"
 msgstr "Ketteryys:"
 
-#: src/net/ea/charserverhandler.cpp:239 src/net/manaserv/charhandler.cpp:266
+#: src/net/tmwa/charserverhandler.cpp:383
 msgid "Vitality:"
 msgstr "Elinvoima:"
 
-#: src/net/ea/charserverhandler.cpp:240 src/net/manaserv/charhandler.cpp:267
+#: src/net/tmwa/charserverhandler.cpp:384
 msgid "Intelligence:"
 msgstr "Älykkyys:"
 
-#: src/net/ea/charserverhandler.cpp:241 src/net/manaserv/charhandler.cpp:265
+#: src/net/tmwa/charserverhandler.cpp:385
 msgid "Dexterity:"
 msgstr "Näppäryys:"
 
-#: src/net/ea/charserverhandler.cpp:242
+#: src/net/tmwa/charserverhandler.cpp:386
 msgid "Luck:"
-msgstr ""
+msgstr "Tuuri:"
 
-#: src/net/ea/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
+#: src/net/tmwa/chathandler.cpp:104
+#, c-format
+msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
+#: src/net/tmwa/chathandler.cpp:112
+#, c-format
+msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:171
-#, fuzzy
+#: src/net/tmwa/chathandler.cpp:336
 msgid "MVP player."
-msgstr "Pelaaja"
+msgstr "MVP-pelaaja."
+
+#: src/net/tmwa/chathandler.cpp:340
+msgid "MVP player: "
+msgstr ""
 
-#: src/net/ea/chathandler.cpp:204 src/net/ea/chathandler.cpp:210
-#: src/net/ea/chathandler.cpp:215 src/net/ea/chathandler.cpp:220
-#: src/net/ea/chathandler.cpp:225 src/net/ea/chathandler.cpp:230
-#: src/net/ea/chathandler.cpp:235 src/net/ea/chathandler.cpp:240
+#: src/net/tmwa/chathandler.cpp:393 src/net/tmwa/chathandler.cpp:399
+#: src/net/tmwa/chathandler.cpp:404 src/net/tmwa/chathandler.cpp:410
+#: src/net/tmwa/chathandler.cpp:415 src/net/tmwa/chathandler.cpp:421
+#: src/net/tmwa/chathandler.cpp:428 src/net/tmwa/chathandler.cpp:434
 msgid "Channels are not supported!"
 msgstr "Kanavia ei tueta!"
 
-#: src/net/ea/gamehandler.cpp:86
+#: src/net/tmwa/gamehandler.cpp:94
 #, c-format
 msgid "Online users: %d"
-msgstr ""
+msgstr "Käyttäjiä palvelimella: %d"
 
-#: src/net/ea/gamehandler.cpp:100
-#, fuzzy
+#: src/net/tmwa/gamehandler.cpp:104
 msgid "Game"
-msgstr "Nimi"
+msgstr "Peli"
 
-#: src/net/ea/gamehandler.cpp:100
+#: src/net/tmwa/gamehandler.cpp:104
 msgid "Request to quit denied!"
-msgstr ""
+msgstr "Lopetuspyyntö evätty!"
 
-#: src/net/ea/generalhandler.cpp:102 src/net/manaserv/generalhandler.cpp:95
+#: src/net/tmwa/generalhandler.cpp:105
 #, c-format
 msgid "Strength %+d"
-msgstr ""
+msgstr "Voima %+d"
 
-#: src/net/ea/generalhandler.cpp:103 src/net/manaserv/generalhandler.cpp:96
+#: src/net/tmwa/generalhandler.cpp:106
 #, c-format
 msgid "Agility %+d"
-msgstr ""
+msgstr "Ketteryys %+d"
 
-#: src/net/ea/generalhandler.cpp:104 src/net/manaserv/generalhandler.cpp:98
+#: src/net/tmwa/generalhandler.cpp:107
 #, c-format
 msgid "Vitality %+d"
-msgstr ""
+msgstr "Elinvoima %+d"
 
-#: src/net/ea/generalhandler.cpp:105 src/net/manaserv/generalhandler.cpp:99
+#: src/net/tmwa/generalhandler.cpp:108
 #, c-format
 msgid "Intelligence %+d"
-msgstr ""
+msgstr "Älykkyys %+d"
 
-#: src/net/ea/generalhandler.cpp:106 src/net/manaserv/generalhandler.cpp:97
+#: src/net/tmwa/generalhandler.cpp:109
 #, c-format
 msgid "Dexterity %+d"
-msgstr ""
+msgstr "Näppäryys %+d"
 
-#: src/net/ea/generalhandler.cpp:107
+#: src/net/tmwa/generalhandler.cpp:110
 #, c-format
 msgid "Luck %+d"
-msgstr ""
+msgstr "Tuuri %+d"
 
-#: src/net/ea/generalhandler.cpp:130
-#, fuzzy
+#: src/net/tmwa/generalhandler.cpp:136
 msgid "Authentication failed."
-msgstr "Tunnistus epäonnistui"
+msgstr "Tunnistus epäonnistui."
 
-#: src/net/ea/generalhandler.cpp:133
-#, fuzzy
+#: src/net/tmwa/generalhandler.cpp:139
 msgid "No servers available."
-msgstr "Palvelimia ei saatavilla"
+msgstr "Palvelimia ei saatavilla."
 
-#: src/net/ea/generalhandler.cpp:137
-#, fuzzy
+#: src/net/tmwa/generalhandler.cpp:143
 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/ea/generalhandler.cpp:140
-#, fuzzy
+#: src/net/tmwa/generalhandler.cpp:146
 msgid "This account is already logged in."
-msgstr "Tällä tunnuksella on jo kirjauduttu"
+msgstr "Tällä tunnuksella on jo kirjauduttu."
 
-#: src/net/ea/generalhandler.cpp:143
+#: src/net/tmwa/generalhandler.cpp:149
 msgid "Speed hack detected."
-msgstr ""
+msgstr "Nopeusviritelmä havaittu."
 
-#: src/net/ea/generalhandler.cpp:146
+#: src/net/tmwa/generalhandler.cpp:152
 msgid "Duplicated login."
-msgstr ""
+msgstr "Kaksinkertainen sisäänkirjautuminen."
 
-#: src/net/ea/generalhandler.cpp:149
-#, fuzzy
+#: src/net/tmwa/generalhandler.cpp:155
 msgid "Unknown connection error."
-msgstr "Tuntematon yhteys ongelma"
+msgstr "Tuntematon yhteysongelma."
 
-#: src/net/ea/generalhandler.cpp:205
+#: src/net/tmwa/generalhandler.cpp:221
 msgid "Got disconnected from server!"
-msgstr ""
-
-#: src/net/ea/generalhandler.cpp:216 src/net/manaserv/generalhandler.cpp:166
-msgid "Strength"
-msgstr ""
-
-#: src/net/ea/generalhandler.cpp:217 src/net/manaserv/generalhandler.cpp:167
-msgid "Agility"
-msgstr ""
-
-#: src/net/ea/generalhandler.cpp:218 src/net/manaserv/generalhandler.cpp:169
-msgid "Vitality"
-msgstr ""
+msgstr "Yhteys palvelimeen katkesi!"
 
-#: src/net/ea/generalhandler.cpp:219 src/net/manaserv/generalhandler.cpp:170
-msgid "Intelligence"
-msgstr ""
-
-#: src/net/ea/generalhandler.cpp:220 src/net/manaserv/generalhandler.cpp:168
-msgid "Dexterity"
-msgstr ""
-
-#: src/net/ea/generalhandler.cpp:221
+#: src/net/tmwa/generalhandler.cpp:253
 msgid "Luck"
-msgstr ""
+msgstr "Tuuri"
 
-#: src/net/ea/generalhandler.cpp:224
-#, fuzzy
+#: src/net/tmwa/generalhandler.cpp:256
 msgid "Defense"
-msgstr "Puolustus %+d"
+msgstr "Puolustus"
 
-#: src/net/ea/generalhandler.cpp:225
-#, fuzzy
+#: src/net/tmwa/generalhandler.cpp:257
 msgid "M.Attack"
-msgstr "Hyökkäys %+d"
+msgstr "T.-hyökkäys"
 
-#: src/net/ea/generalhandler.cpp:226
-#, fuzzy
+#: src/net/tmwa/generalhandler.cpp:258
 msgid "M.Defense"
-msgstr "Puolustus %+d"
+msgstr "T.-puolustus"
 
-#: src/net/ea/generalhandler.cpp:227
-#, fuzzy, c-format
+#: src/net/tmwa/generalhandler.cpp:259
 msgid "% Accuracy"
-msgstr "% Tarkkuus:"
+msgstr "% Tarkkuus"
 
-#: src/net/ea/generalhandler.cpp:228
-#, c-format
+#: src/net/tmwa/generalhandler.cpp:260
 msgid "% Evade"
-msgstr ""
+msgstr "% Välttö"
 
-#: src/net/ea/generalhandler.cpp:229
-#, c-format
+#: src/net/tmwa/generalhandler.cpp:261
 msgid "% Critical"
+msgstr "% Täysosuma"
+
+#: src/net/tmwa/generalhandler.cpp:262
+msgid "Attack Delay"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
-msgid "/help > Display this help."
+#: src/net/tmwa/generalhandler.cpp:264
+msgid "Walk Delay"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:62
-msgid "/invite > Invite a player to your guild"
+#: src/net/tmwa/generalhandler.cpp:266
+msgid "Attack Range"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:63
+#: src/net/tmwa/gui/guildtab.cpp:75 src/net/tmwa/gui/partytab.cpp:67
+msgid "/help > Display this help."
+msgstr "/help > Näytä tämä ohje."
+
+#: src/net/tmwa/gui/guildtab.cpp:76
+msgid "/invite > Invite a player to your guild"
+msgstr "/invite > Kutsu pelaaja kiltaasi"
+
+#: src/net/tmwa/gui/guildtab.cpp:77
 msgid "/leave > Leave the guild you are in"
-msgstr ""
+msgstr "/leave > Eroa nykyisestä killastasi"
 
-#: src/net/ea/gui/guildtab.cpp:64
-#, fuzzy
+#: src/net/tmwa/gui/guildtab.cpp:78
 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/ea/gui/guildtab.cpp:73 src/net/ea/gui/partytab.cpp:73
+#: src/net/tmwa/gui/guildtab.cpp:87 src/net/tmwa/gui/partytab.cpp:81
 msgid "Command: /invite <nick>"
-msgstr ""
+msgstr "Komento: /invite <nimi>"
 
-#: src/net/ea/gui/guildtab.cpp:74
-#, fuzzy
+#: src/net/tmwa/gui/guildtab.cpp:88
 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/ea/gui/guildtab.cpp:80 src/net/ea/gui/partytab.cpp:80
+#: src/net/tmwa/gui/guildtab.cpp:94 src/net/tmwa/gui/partytab.cpp:88
 msgid "Command: /leave"
-msgstr ""
+msgstr "Komento: /leave"
 
-#: src/net/ea/gui/guildtab.cpp:81
-#, fuzzy
+#: src/net/tmwa/gui/guildtab.cpp:95
 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/ea/gui/guildtab.cpp:89
-msgid "Guild name is missing."
+#: src/net/tmwa/guildhandler.cpp:110 src/net/tmwa/guildhandler.cpp:115
+msgid "You already in guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:293
-msgid "Could not inivte user to guild."
+#: src/net/tmwa/guildhandler.cpp:120
+msgid "Emperium check failed."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:298
-msgid "User rejected guild invite."
+#: src/net/tmwa/guildhandler.cpp:125
+msgid "Unknown server response."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:303
-msgid "User is now part of your guild."
+#: src/net/tmwa/guildhandler.cpp:203
+#, c-format
+msgid "Guild name: %s"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:308
-msgid "Your guild is full."
+#: src/net/tmwa/guildhandler.cpp:205
+#, c-format
+msgid "Guild master: %s"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:313
+#: src/net/tmwa/guildhandler.cpp:207
+#, c-format
+msgid "Guild level: %d"
+msgstr ""
+
+#: src/net/tmwa/guildhandler.cpp:209
+#, c-format
+msgid "Online members: %d"
+msgstr ""
+
+#: src/net/tmwa/guildhandler.cpp:211
+#, c-format
+msgid "Max members: %d"
+msgstr ""
+
+#: src/net/tmwa/guildhandler.cpp:213
+#, c-format
+msgid "Average level: %d"
+msgstr ""
+
+#: src/net/tmwa/guildhandler.cpp:215
+#, c-format
+msgid "Guild exp: %d"
+msgstr ""
+
+#: src/net/tmwa/guildhandler.cpp:217
+#, c-format
+msgid "Guild next exp: %d"
+msgstr ""
+
+#: src/net/tmwa/guildhandler.cpp:219
+#, c-format
+msgid "Guild castle: %s"
+msgstr ""
+
+#: src/net/tmwa/guildhandler.cpp:434
+msgid "Could not inivte user to guild."
+msgstr "Pelaajan kutsuminen kiltaan epäonnistui."
+
+#: src/net/tmwa/guildhandler.cpp:439
+msgid "User rejected guild invite."
+msgstr "Käyttäjä ei ottanut kiltakutsua vastaan."
+
+#: src/net/tmwa/guildhandler.cpp:444
+msgid "User is now part of your guild."
+msgstr "Käyttäjä liittyi kiltaasi."
+
+#: src/net/tmwa/guildhandler.cpp:449
+msgid "Your guild is full."
+msgstr "Kiltasi on täynnä."
+
+#: src/net/tmwa/guildhandler.cpp:454
 msgid "Unknown guild invite response."
+msgstr "Tuntematon vastaus kiltakutsuun."
+
+#: src/net/tmwa/guildhandler.cpp:476
+msgid "You have left the guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:390
-msgid "Guild creation isn't supported yet."
+#: src/net/tmwa/guildhandler.cpp:490
+#, c-format
+msgid "%s has left your guild."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:60
-msgid "/invite > Invite a player to your party"
+#: src/net/tmwa/guildhandler.cpp:522
+msgid "You was kicked from guild."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:61
-msgid "/leave > Leave the party you are in"
+#: src/net/tmwa/guildhandler.cpp:536
+#, c-format
+msgid "%s has kicked from your guild."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:62
+#: src/net/tmwa/gui/partytab.cpp:68
+msgid "/invite > Invite a player to your party"
+msgstr "/invite > Kutsu pelaaja ryhmääsi"
+
+#: src/net/tmwa/gui/partytab.cpp:69
+msgid "/leave > Leave the party you are in"
+msgstr "/leave > Eroa nykyisestä ryhmästäsi"
+
+#: src/net/tmwa/gui/partytab.cpp:70
 msgid "/kick > Kick some one from the party you are in"
-msgstr ""
+msgstr "/kick > Potki pelaaja ryhmästäsi"
 
-#: src/net/ea/gui/partytab.cpp:63
+#: src/net/tmwa/gui/partytab.cpp:71
 msgid "/item > Show/change party item sharing options"
-msgstr ""
+msgstr "/item > Näytä/muuta ryhmän esineidenjaon asetuksia"
 
-#: src/net/ea/gui/partytab.cpp:64
+#: src/net/tmwa/gui/partytab.cpp:72
 msgid "/exp > Show/change party experience sharing options"
-msgstr ""
+msgstr "/exp > Näytä/muuta ryhmän kokemuksenjaon asetuksia"
+
+#: src/net/tmwa/gui/partytab.cpp:82
+msgid "This command invites <nick> to party with you."
+msgstr "Tämä komento kutsuu annetun pelaajan ryhmääsi."
 
-#: src/net/ea/gui/partytab.cpp:81
+#: src/net/tmwa/gui/partytab.cpp:89
 msgid "This command causes the player to leave the party."
-msgstr ""
+msgstr "Tämä komento erottaa pelaajan ryhmästä."
 
-#: src/net/ea/gui/partytab.cpp:85
+#: src/net/tmwa/gui/partytab.cpp:93
 msgid "Command: /item <policy>"
-msgstr ""
+msgstr "Komento: /item <jakopolitiikka>"
 
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/tmwa/gui/partytab.cpp:95
 msgid "This command changes the party's item sharing policy."
-msgstr ""
+msgstr "Tämä komento muuttaa ryhmän esineiden jakopolitiikkaa."
 
-#: src/net/ea/gui/partytab.cpp:87
+#: src/net/tmwa/gui/partytab.cpp:96
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
+"<jakopolitiikka> voi olla arvoltaan \"1\", \"yes\" tai \"true\", jolloin "
+"esineet jaetaan, tai \"0\", \"no\" tai \"false\", jolloin esineitä ei jaeta."
 
-#: src/net/ea/gui/partytab.cpp:90
+#: src/net/tmwa/gui/partytab.cpp:99
 msgid "Command: /item"
-msgstr ""
+msgstr "Komento: /item"
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/tmwa/gui/partytab.cpp:100
 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/ea/gui/partytab.cpp:95
+#: src/net/tmwa/gui/partytab.cpp:105
 msgid "Command: /exp <policy>"
-msgstr ""
+msgstr "Komento: /exp <jakopolitiikka>"
 
-#: src/net/ea/gui/partytab.cpp:96
+#: src/net/tmwa/gui/partytab.cpp:106
 msgid "This command changes the party's experience sharing policy."
-msgstr ""
+msgstr "Tämä komento muuttaa ryhmän kokemuksenjaon politiikkaa."
 
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/tmwa/gui/partytab.cpp:108
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
+"<jakopolitiikka> voi olla arvoltaan \"1\", \"yes\" tai \"true\", jolloin "
+"kokemuspisteet jaetaan, tai \"0\", \"no\" tai \"false\", jolloin "
+"kokemuspisteitä ei jaeta."
 
-#: src/net/ea/gui/partytab.cpp:100
+#: src/net/tmwa/gui/partytab.cpp:111
 msgid "Command: /exp"
-msgstr ""
+msgstr "Komento: /exp"
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/tmwa/gui/partytab.cpp:112
 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/ea/gui/partytab.cpp:132 src/net/ea/partyhandler.cpp:198
+#: src/net/tmwa/gui/partytab.cpp:146 src/net/tmwa/partyhandler.cpp:287
 msgid "Item sharing enabled."
-msgstr ""
+msgstr "Esineiden jakaminen käytössä."
 
-#: src/net/ea/gui/partytab.cpp:135 src/net/ea/partyhandler.cpp:204
+#: src/net/tmwa/gui/partytab.cpp:149 src/net/tmwa/partyhandler.cpp:297
 msgid "Item sharing disabled."
-msgstr ""
+msgstr "Esineiden jakaminen poistettu käytöstä."
 
-#: src/net/ea/gui/partytab.cpp:138 src/net/ea/partyhandler.cpp:210
+#: src/net/tmwa/gui/partytab.cpp:152 src/net/tmwa/partyhandler.cpp:307
 msgid "Item sharing not possible."
-msgstr ""
+msgstr "Esineiden jakaminen ei ole mahdollista."
 
-#: src/net/ea/gui/partytab.cpp:141
+#: src/net/tmwa/gui/partytab.cpp:155
 msgid "Item sharing unknown."
-msgstr ""
+msgstr "Esineiden jaon tila on tuntematon."
 
-#: src/net/ea/gui/partytab.cpp:167 src/net/ea/partyhandler.cpp:174
+#: src/net/tmwa/gui/partytab.cpp:185 src/net/tmwa/partyhandler.cpp:249
 msgid "Experience sharing enabled."
-msgstr ""
+msgstr "Kokemuksen jako käytössä."
 
-#: src/net/ea/gui/partytab.cpp:170 src/net/ea/partyhandler.cpp:180
+#: src/net/tmwa/gui/partytab.cpp:188 src/net/tmwa/partyhandler.cpp:259
 msgid "Experience sharing disabled."
-msgstr ""
+msgstr "Kokemuksen jako pois käytöstä."
 
-#: src/net/ea/gui/partytab.cpp:173 src/net/ea/partyhandler.cpp:186
+#: src/net/tmwa/gui/partytab.cpp:191 src/net/tmwa/partyhandler.cpp:269
 msgid "Experience sharing not possible."
-msgstr ""
+msgstr "Kokemuksen jako ei ole mahdollista."
 
-#: src/net/ea/gui/partytab.cpp:176
+#: src/net/tmwa/gui/partytab.cpp:194
 msgid "Experience sharing unknown."
-msgstr ""
+msgstr "Kokemuksen jaon tila on tuntematon."
 
-#: src/net/ea/inventoryhandler.cpp:281
+#: src/net/tmwa/inventoryhandler.cpp:376
 msgid "Failed to use item."
-msgstr "Esineen käyttö epä-onnistui"
+msgstr "Esineen käyttö epäonnistui."
 
-#: src/net/ea/inventoryhandler.cpp:391
+#: src/net/tmwa/inventoryhandler.cpp:528
 msgid "Unable to equip."
-msgstr ""
-
-#: src/net/ea/inventoryhandler.cpp:402
-msgid "Unable to unequip."
-msgstr ""
+msgstr "Käyttöönotto epäonnistui."
 
-#: src/net/ea/loginhandler.cpp:79
+#: src/net/tmwa/loginhandler.cpp:91
 msgid "Account was not found. Please re-login."
 msgstr "Tunnusta ei löytynyt. Yritä uudelleen."
 
-#: src/net/ea/loginhandler.cpp:82 src/net/manaserv/loginhandler.cpp:121
-#, fuzzy
-msgid "Old password incorrect."
-msgstr "Vanha salsana on väärin."
-
-#: src/net/ea/loginhandler.cpp:85
-#, fuzzy
+#: src/net/tmwa/loginhandler.cpp:97
 msgid "New password too short."
 msgstr "Uusi salasana on liian lyhyt."
 
-#: src/net/ea/loginhandler.cpp:88 src/net/ea/loginhandler.cpp:175
-#: src/net/manaserv/charhandler.cpp:158 src/net/manaserv/loginhandler.cpp:96
-#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
-#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
-#, fuzzy
-msgid "Unknown error."
-msgstr "Tuntematon virhe"
-
-#: src/net/ea/loginhandler.cpp:149
-#, fuzzy
+#: src/net/tmwa/loginhandler.cpp:162
 msgid "Unregistered ID."
-msgstr "Poista palvelimelta"
+msgstr "Rekisteröimätön tunniste."
 
-#: src/net/ea/loginhandler.cpp:152
-#, fuzzy
+#: src/net/tmwa/loginhandler.cpp:165
 msgid "Wrong password."
-msgstr "Väärä salasana"
+msgstr "Väärä salasana."
 
-#: src/net/ea/loginhandler.cpp:155
+#: src/net/tmwa/loginhandler.cpp:168
 msgid "Account expired."
-msgstr ""
+msgstr "Tili vanhentunut."
 
-#: src/net/ea/loginhandler.cpp:158
+#: src/net/tmwa/loginhandler.cpp:171
 msgid "Rejected from server."
-msgstr ""
+msgstr "Palvelin ei kelpuuttanut yhteydenottoasi."
 
-#: src/net/ea/loginhandler.cpp:161
-#, fuzzy
+#: src/net/tmwa/loginhandler.cpp:174
 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."
+"Pääsysi peliin on pysyvästi estetty. Ole hyvä ja ota yhteyttä GM-tiimiin."
 
-#: src/net/ea/loginhandler.cpp:165
+#: src/net/tmwa/loginhandler.cpp:178
+msgid "Client too old."
+msgstr ""
+
+#: src/net/tmwa/loginhandler.cpp:181
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
 msgstr ""
-"Sinun pääsysi peliin on väliaikaisesti estetty %s asti\n"
-"Ota yhteyttä GM tiimiin foorumeilla."
+"Pääsysi peliin on väliaikaisesti estetty %s asti.\n"
+"Ole hyvä ja ota yhteyttä GM-tiimiin keskustelufoorumin kautta."
+
+#: src/net/tmwa/loginhandler.cpp:188
+msgid "Server overpopulated."
+msgstr ""
 
-#: src/net/ea/loginhandler.cpp:172
-#, fuzzy
+#: src/net/tmwa/loginhandler.cpp:191
 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/ea/network.cpp:145
-msgid "Empty address given to Network::connect()!"
+#: src/net/tmwa/loginhandler.cpp:197
+msgid "Username permanently erased."
 msgstr ""
 
-#: src/net/ea/network.cpp:345
+#: src/net/tmwa/network.cpp:149
+msgid "Empty address given to Network::connect()!"
+msgstr "Tyhjä osoite Network::connect()-pyynnössä!"
+
+#: src/net/tmwa/network.cpp:353
 msgid "Unable to resolve host \""
-msgstr ""
+msgstr "Osoitetta ei löydy: \""
 
-#: src/net/ea/network.cpp:414
-#, fuzzy
+#: src/net/tmwa/network.cpp:423
 msgid "Connection to server terminated. "
-msgstr "Yhdistetään kartta palvelimelle"
+msgstr "Yhteys palvelimeen katkaistu. "
 
-#: src/net/ea/partyhandler.cpp:81
+#: src/net/tmwa/partyhandler.cpp:84
 msgid "Could not create party."
-msgstr ""
+msgstr "Ryhmän luonti epäonnistui."
 
-#: src/net/ea/partyhandler.cpp:84
+#: src/net/tmwa/partyhandler.cpp:86
 msgid "Party successfully created."
+msgstr "Ryhmä luotu."
+
+#: src/net/tmwa/partyhandler.cpp:141
+#, c-format
+msgid "%s has join your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:118
+#: src/net/tmwa/partyhandler.cpp:177
 #, c-format
 msgid "%s is already a member of a party."
-msgstr ""
+msgstr "%s kuuluu jo johonkin ryhmään."
 
-#: src/net/ea/partyhandler.cpp:122
+#: src/net/tmwa/partyhandler.cpp:182
 #, c-format
 msgid "%s refused your invitation."
-msgstr ""
+msgstr "%s ei ottanut kutsuasi vastaan."
 
-#: src/net/ea/partyhandler.cpp:126
+#: src/net/tmwa/partyhandler.cpp:187
 #, c-format
 msgid "%s is now a member of your party."
+msgstr "%s on nyt ryhmäsi jäsen."
+
+#: src/net/tmwa/partyhandler.cpp:192
+#, c-format
+msgid "%s cant joid your party because party is full."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:130
+#: src/net/tmwa/partyhandler.cpp:197
 #, c-format
-msgid "Unknown invite response for %s."
+msgid "QQQ Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:238
+#: src/net/tmwa/partyhandler.cpp:357
 msgid "You have left the party."
-msgstr ""
+msgstr "Erosit ryhmästä."
 
-#: src/net/ea/partyhandler.cpp:249
+#: src/net/tmwa/partyhandler.cpp:369
 #, c-format
 msgid "%s has left your party."
-msgstr ""
+msgstr "%s on eronnut ryhmästä."
 
-#: src/net/ea/partyhandler.cpp:301
+#: src/net/tmwa/partyhandler.cpp:445
 #, c-format
 msgid "An unknown member tried to say: %s"
-msgstr ""
-
-#: src/net/ea/partyhandler.cpp:329
-msgid "Inviting like this isn't supported at the moment."
-msgstr ""
+msgstr "Tuntematon jäsen yritti sanoa: %s"
 
-#: src/net/ea/partyhandler.cpp:334
-msgid "You can only inivte when you are in a party!"
-msgstr ""
-
-#: src/net/ea/partyhandler.cpp:365
+#: src/net/tmwa/partyhandler.cpp:527
 #, c-format
 msgid "%s is not in your party!"
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:304
-msgid "You are dead."
-msgstr "Sinä olet kuollut."
-
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:305
-msgid "We regret to inform you that your character was killed in battle."
-msgstr ""
+msgstr "%s ei ole ryhmässäsi!"
 
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:307
-msgid "You are not that alive anymore."
-msgstr "Et ole enää elossa."
-
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:308
-msgid "The cold hands of the grim reaper are grabbing for your soul."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:309
-msgid "Game Over!"
-msgstr "Peli Loppu!"
-
-#: src/net/ea/playerhandler.cpp:105
+#: src/net/tmwa/playerhandler.cpp:107
 msgid "Insert coin to continue."
 msgstr "Syötä kolikko jatkaaksesi."
 
-#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:310
-msgid ""
-"No, kids. Your character did not really die. It... err... went to a better "
-"place."
-msgstr ""
-"Ei, lapset. Teidän hahmonne ei oikeasti kuollut. Se... öhm... meni parempaan "
-"paikkaan."
-
-#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:312
-msgid ""
-"Your plan of breaking your enemies weapon by bashing it with your throat "
-"failed."
-msgstr ""
-"Suunnitelmasi rikkoa vastustajiesi aseet iskemällä ne omaan kurkkuusi "
-"epäonnistui."
-
-#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:314
-msgid "I guess this did not run too well."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:315
-msgid "Do you want your possessions identified?"
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:316
-msgid "Sadly, no trace of you was ever found..."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:317
-msgid "Annihilated."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:318
-msgid "Looks like you got your head handed to you."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:120 src/net/manaserv/beinghandler.cpp:319
-msgid ""
-"You screwed up again, dump your body down the tubes and get you another one."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/tmwa/playerhandler.cpp:125
 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/ea/playerhandler.cpp:124
+#: src/net/tmwa/playerhandler.cpp:126
 msgid "You are no more."
-msgstr "Sinä et ole enään."
+msgstr "Olet lakannut olemasta."
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/tmwa/playerhandler.cpp:127
 msgid "You have ceased to be."
-msgstr ""
+msgstr "Olet kuollut kuin päivänkakkaraa pukkaava ex-papukaija."
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/tmwa/playerhandler.cpp:128
 msgid "You've expired and gone to meet your maker."
-msgstr ""
+msgstr "Olet lähtenyt moikkaamaan luojaasi."
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/tmwa/playerhandler.cpp:129
 msgid "You're a stiff."
-msgstr ""
+msgstr "Raato mikä raato."
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/tmwa/playerhandler.cpp:130
 msgid "Bereft of life, you rest in peace."
-msgstr ""
+msgstr "Olet eloton, mutta lepäät rauhassa."
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/tmwa/playerhandler.cpp:131
 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/ea/playerhandler.cpp:130
+#: src/net/tmwa/playerhandler.cpp:132
 msgid "Your metabolic processes are now history."
-msgstr ""
+msgstr "Aineenvaihduntaprosessisi ovat historiaa."
 
-#: src/net/ea/playerhandler.cpp:131
+#: src/net/tmwa/playerhandler.cpp:133
 msgid "You're off the twig."
-msgstr ""
+msgstr "Olet lopultakin nakkisuojassa."
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/tmwa/playerhandler.cpp:134
 msgid "You've kicked the bucket."
-msgstr ""
+msgstr "Potkaisit tyhjää."
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/tmwa/playerhandler.cpp:135
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
+"Olet heittänyt henkesi, poistunut keskuudestamme ja loikannut Tuonelan "
+"jokeen."
 
-#: src/net/ea/playerhandler.cpp:135
+#: src/net/tmwa/playerhandler.cpp:137
 msgid "You are an ex-player."
-msgstr ""
+msgstr "Olet entinen pelaaja."
 
-#: src/net/ea/playerhandler.cpp:136
+#: src/net/tmwa/playerhandler.cpp:138
 msgid "You're pining for the fjords."
-msgstr ""
+msgstr "Kaipaat kotivuonoille."
 
-#: src/net/ea/playerhandler.cpp:249 src/net/ea/playerhandler.cpp:310
+#: src/net/tmwa/playerhandler.cpp:332 src/net/tmwa/playerhandler.cpp:342
+#: src/net/tmwa/playerhandler.cpp:421
 msgid "Message"
 msgstr "Viesti"
 
-#: src/net/ea/playerhandler.cpp:250
+#: src/net/tmwa/playerhandler.cpp:333
 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ää."
+"You are carrying more than half your weight. You are unable to regain "
+"health."
+msgstr ""
+"Kannat roinaa yli puolen elopainoasi. Rasitus estää sinua paranemasta."
 
-#: src/net/ea/playerhandler.cpp:333
+#: src/net/tmwa/playerhandler.cpp:343
+msgid ""
+"You are carrying less than half your weight. You are can regain health."
+msgstr ""
+
+#: src/net/tmwa/playerhandler.cpp:448
 #, c-format
 msgid "You picked up %s."
+msgstr "%s noukittu."
+
+#: src/net/tmwa/playerhandler.cpp:454
+#, c-format
+msgid "You spent %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:369
+#: src/net/tmwa/playerhandler.cpp:499
 msgid "Cannot raise skill!"
-msgstr ""
+msgstr "Taidon korottaminen epäonnistui!"
 
-#: src/net/ea/playerhandler.cpp:532
+#: src/net/tmwa/playerhandler.cpp:619
 msgid "Equip arrows first."
-msgstr ""
+msgstr "Varusta ensin nuolia."
 
-#: src/net/ea/specialhandler.cpp:147
+#: src/net/tmwa/specialhandler.cpp:156
 msgid "Trade failed!"
 msgstr "Kauppa epäonnistui!"
 
-#: src/net/ea/specialhandler.cpp:150
+#: src/net/tmwa/specialhandler.cpp:159
 msgid "Emote failed!"
-msgstr ""
+msgstr "Elehtiminen epäonnistui!"
 
-#: src/net/ea/specialhandler.cpp:153
+#: src/net/tmwa/specialhandler.cpp:162
 msgid "Sit failed!"
 msgstr "Istuminen epäonnistui!"
 
-#: src/net/ea/specialhandler.cpp:156
+#: src/net/tmwa/specialhandler.cpp:165
 msgid "Chat creating failed!"
-msgstr ""
+msgstr "Keskustelun luonti epäonnistui!"
 
-#: src/net/ea/specialhandler.cpp:159
+#: src/net/tmwa/specialhandler.cpp:168
 msgid "Could not join party!"
-msgstr ""
+msgstr "Ryhmään liittyminen epäonnistui!"
 
-#: src/net/ea/specialhandler.cpp:162
+#: src/net/tmwa/specialhandler.cpp:171
 msgid "Cannot shout!"
-msgstr ""
+msgstr "Huutaminen epäonnistui!"
 
-#: src/net/ea/specialhandler.cpp:171
+#: src/net/tmwa/specialhandler.cpp:184
 msgid "You have not yet reached a high enough lvl!"
-msgstr ""
+msgstr "Et ole vielä riittävän korkealla tasolla!"
 
-#: src/net/ea/specialhandler.cpp:174
+#: src/net/tmwa/specialhandler.cpp:188
 msgid "Insufficient HP!"
-msgstr ""
+msgstr "Voimapisteesi eivät riitä!"
 
-#: src/net/ea/specialhandler.cpp:177
+#: src/net/tmwa/specialhandler.cpp:191
 msgid "Insufficient SP!"
-msgstr ""
+msgstr "Manapisteesi eivät riitä!"
 
-#: src/net/ea/specialhandler.cpp:180
+#: src/net/tmwa/specialhandler.cpp:194
 msgid "You have no memos!"
-msgstr ""
+msgstr "Sinulla ei ole muistioita (memo)."
 
-#: src/net/ea/specialhandler.cpp:183
+#: src/net/tmwa/specialhandler.cpp:197
 msgid "You cannot do that right now!"
-msgstr "Et voi tehdä sitä juuri nyt!"
+msgstr "Et voi tehdä tätä juuri nyt."
 
-#: src/net/ea/specialhandler.cpp:186
+#: src/net/tmwa/specialhandler.cpp:200
 msgid "Seems you need more money... ;-)"
 msgstr "Näyttää siltä että tarvitset lisää rahaa."
 
-#: src/net/ea/specialhandler.cpp:189
+#: src/net/tmwa/specialhandler.cpp:203
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Et voi käyttää tätä taitoa tuollaisen aseen kanssa."
 
-#: src/net/ea/specialhandler.cpp:192
+#: src/net/tmwa/specialhandler.cpp:207
 msgid "You need another red gem!"
 msgstr "Tarvitset toisen punaisen helmen."
 
-#: src/net/ea/specialhandler.cpp:195
+#: src/net/tmwa/specialhandler.cpp:210
 msgid "You need another blue gem!"
 msgstr "Tarvitset toisen sinisen helmen."
 
-#: src/net/ea/specialhandler.cpp:198
+#: src/net/tmwa/specialhandler.cpp:213
 msgid "You're carrying to much to do this!"
-msgstr ""
+msgstr "Kannat liian paljon tehdäksesi tällaista!"
 
-#: src/net/ea/specialhandler.cpp:201
+#: src/net/tmwa/specialhandler.cpp:216
 msgid "Huh? What's that?"
-msgstr ""
+msgstr "Siis mikä?"
 
-#: src/net/ea/specialhandler.cpp:210
+#: src/net/tmwa/specialhandler.cpp:227
 msgid "Warp failed..."
-msgstr ""
+msgstr "Siirtymä (warp) epäonnistui..."
 
-#: src/net/ea/specialhandler.cpp:213
+#: src/net/tmwa/specialhandler.cpp:230
 msgid "Could not steal anything..."
-msgstr ""
+msgstr "Varastaminen ei onnistunut..."
 
-#: src/net/ea/specialhandler.cpp:216
+#: src/net/tmwa/specialhandler.cpp:233
 msgid "Poison had no effect..."
 msgstr "Myrkyllä ei ollut vaikutusta..."
 
-#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:116
-msgid "Request for Trade"
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:108 src/net/manaserv/tradehandler.cpp:117
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr "%s haluaa käydäkauppaa kanssasi, hyväksytkö pyynnön?"
-
-#: src/net/ea/tradehandler.cpp:124
+#: src/net/tmwa/tradehandler.cpp:146
 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/ea/tradehandler.cpp:128
+#: src/net/tmwa/tradehandler.cpp:150
 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/ea/tradehandler.cpp:132
+#: src/net/tmwa/tradehandler.cpp:154
 msgid "Trade cancelled due to an unknown reason."
-msgstr "Kauppa keskeytyi tuntemattomasta syystä."
+msgstr "Kaupanteko keskeytyi tuntemattomasta syystä."
 
-#: src/net/ea/tradehandler.cpp:137
+#: src/net/tmwa/tradehandler.cpp:162
 #, c-format
 msgid "Trade: You and %s"
-msgstr ""
+msgstr "Kauppa: sinä ja %s"
 
-#: src/net/ea/tradehandler.cpp:144
+#: src/net/tmwa/tradehandler.cpp:172
 #, c-format
 msgid "Trade with %s cancelled."
-msgstr ""
+msgstr "Kaupanteko pelaajan %s kanssa peruttu."
 
-#: src/net/ea/tradehandler.cpp:153
+#: src/net/tmwa/tradehandler.cpp:185
 msgid "Unhandled trade cancel packet."
-msgstr ""
+msgstr "Käsittelemätön kaupan peruutus -paketti."
 
-#: src/net/ea/tradehandler.cpp:202
+#: src/net/tmwa/tradehandler.cpp:248
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
+"Esineen lisääminen epäonnistui; kauppakumppanilla on liian painava lasti."
 
-#: src/net/ea/tradehandler.cpp:207
+#: src/net/tmwa/tradehandler.cpp:253
 msgid "Failed adding item. Trade partner has no free slot."
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:211
-msgid "Failed adding item for unknown reason."
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:224 src/net/manaserv/tradehandler.cpp:149
-msgid "Trade canceled."
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:231 src/net/manaserv/tradehandler.cpp:156
-msgid "Trade completed."
-msgstr ""
-
-#: src/net/manaserv/beinghandler.cpp:324
-msgid "Press OK to respawn."
-msgstr ""
-
-#: src/net/manaserv/beinghandler.cpp:325
-#, fuzzy
-msgid "You Died"
-msgstr "Annat:"
-
-#: src/net/manaserv/charhandler.cpp:128 src/net/manaserv/charhandler.cpp:196
-msgid "Not logged in."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:131
-msgid "No empty slot."
-msgstr ""
+msgstr "Esineen lisääminen epäonnistui; kauppakumppanilla ei ole tilaa sille."
 
-#: src/net/manaserv/charhandler.cpp:134
-msgid "Invalid name."
+#: src/net/tmwa/tradehandler.cpp:258
+msgid "Failed adding item. You cant trade this item."
 msgstr ""
 
-#: src/net/manaserv/charhandler.cpp:137
-#, fuzzy
-msgid "Character's name already exists."
-msgstr "Hahmo poistettu"
-
-#: src/net/manaserv/charhandler.cpp:140
-msgid "Invalid hairstyle."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:143
-msgid "Invalid hair color."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:146
-msgid "Invalid gender."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:149
-#, fuzzy
-msgid "Character's stats are too high."
-msgstr "Hahmon pistejako OK"
-
-#: src/net/manaserv/charhandler.cpp:152
-#, fuzzy
-msgid "Character's stats are too low."
-msgstr "Hahmon pistejako OK"
-
-#: src/net/manaserv/charhandler.cpp:155
-msgid "One stat is zero."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:187
-#, fuzzy
-msgid "Player deleted."
-msgstr "Hahmo poistettu"
-
-#: src/net/manaserv/charhandler.cpp:199
-#, fuzzy
-msgid "Selection out of range."
-msgstr "Anna vaihdettavien tavaroiden määrä."
-
-#: src/net/manaserv/charhandler.cpp:202
-#, fuzzy, c-format
-msgid "Unknown error (%d)."
-msgstr "Tuntematon virhe"
-
-#: src/net/manaserv/charhandler.cpp:242
-msgid "No gameservers are available."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:268
-msgid "Willpower:"
-msgstr "Tahdonvoima:"
-
-#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
-#: src/net/manaserv/guildhandler.cpp:259
-#, c-format
-msgid "Topic: %s"
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
-msgid "Players in this channel:"
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:201
-msgid "Error joining channel."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:207
-msgid "Listing channels."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:219
-msgid "End of channel list."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:291
-#, c-format
-msgid "%s entered the channel."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:296
-#, c-format
-msgid "%s left the channel."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:312
-#, c-format
-msgid "%s has set mode %s on user %s."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:322
-#, c-format
-msgid "%s has kicked %s."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:327
-#, fuzzy
-msgid "Unknown channel event."
-msgstr "Tuntematon komento."
-
-#: src/net/manaserv/generalhandler.cpp:100
-#, c-format
-msgid "Willpower %+d"
-msgstr ""
-
-#: src/net/manaserv/generalhandler.cpp:171
-#, fuzzy
-msgid "Willpower"
-msgstr "Tahdonvoima:"
-
-#: src/net/manaserv/guildhandler.cpp:81
-msgid "Guild created."
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:86
-msgid "Error creating guild."
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:96
-msgid "Invite sent."
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:203
-msgid "Member was promoted successfully."
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:208
-msgid "Failed to promote member."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:87
-msgid "Wrong magic_token."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
-#, fuzzy
-msgid "Already logged in."
-msgstr "Tällä tunnuksella on jo kirjauduttu"
-
-#: src/net/manaserv/loginhandler.cpp:93 src/net/manaserv/loginhandler.cpp:272
-msgid "Server is full."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:118
-#, fuzzy
-msgid "New password incorrect."
-msgstr "Vanha salsana on väärin."
-
-#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
-msgid "Account not connected. Please login first."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:149
-#, fuzzy
-msgid "New email address incorrect."
-msgstr "Kirjoita  uusi sähköposti osoite toisen kerran:"
-
-#: src/net/manaserv/loginhandler.cpp:152
-#, fuzzy
-msgid "Old email address incorrect."
-msgstr "Vanha salsana on väärin."
-
-#: src/net/manaserv/loginhandler.cpp:158
-msgid "The new email address already exists."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:239
-msgid ""
-"Client registration is not allowed. Please contact server administration."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
-msgid "Client version is too old."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:266
-#, fuzzy
-msgid "Wrong username or password."
-msgstr "Väärä salasana"
-
-#: src/net/manaserv/loginhandler.cpp:275
-msgid "Login attempt too soon after previous attempt."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:303
-msgid "Wrong username, password or email address."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:306
-#, fuzzy
-msgid "Username already exists."
-msgstr "Käyttäjänimi on jo käytössä"
-
-#: src/net/manaserv/loginhandler.cpp:309
-msgid "Email address already exists."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:312
-msgid "You took too long with the captcha or your response was incorrect."
-msgstr ""
-
-#: src/net/manaserv/partyhandler.cpp:88
-msgid "Joined party."
-msgstr ""
-
-#: src/net/manaserv/partyhandler.cpp:106
-#, c-format
-msgid "%s joined the party."
-msgstr ""
-
-#: src/net/manaserv/partyhandler.cpp:123
-#, c-format
-msgid "%s rejected your invite."
-msgstr ""
-
-#: src/net/manaserv/tradehandler.cpp:96
-msgid "Accepting incoming trade requests."
-msgstr ""
-
-#: src/net/manaserv/tradehandler.cpp:98
-msgid "Ignoring incoming trade requests."
-msgstr ""
-
-#: src/net/manaserv/tradehandler.cpp:135
-#, c-format
-msgid "Trading with %s"
-msgstr ""
+#: src/net/tmwa/tradehandler.cpp:262
+msgid "Failed adding item for unknown reason."
+msgstr "Esineen lisääminen epäonnistui tuntemattomasta syystä."
 
-#: src/playerrelations.cpp:304
-#, fuzzy
+#: src/playerrelations.cpp:404
 msgid "Completely ignore"
-msgstr "Valmis"
+msgstr "Jätä täysin huomiotta"
 
-#: src/playerrelations.cpp:318
+#: src/playerrelations.cpp:418
 msgid "Print '...'"
-msgstr ""
+msgstr "Tulosta '...'"
 
-#: src/playerrelations.cpp:334
+#: src/playerrelations.cpp:438
 msgid "Blink name"
-msgstr ""
+msgstr "Vilkuta nimeä"
 
-#: src/playerrelations.cpp:371
+#: src/playerrelations.cpp:483
 msgid "Floating '...' bubble"
-msgstr ""
+msgstr "Leijuva '...' -puhekupla"
 
-#: src/playerrelations.cpp:374
+#: src/playerrelations.cpp:486
 msgid "Floating bubble"
-msgstr ""
+msgstr "Leijuva puhekupla"
+
+#: src/resources/beinginfo.cpp:33 src/resources/itemdb.cpp:239
+#: src/resources/monsterdb.cpp:79
+msgid "unnamed"
+msgstr "nimetön"
 
-#: src/resources/itemdb.cpp:52
+#: src/resources/itemdb.cpp:60
 #, c-format
 msgid "Attack %+d"
 msgstr "Hyökkäys %+d"
 
-#: src/resources/itemdb.cpp:53
+#: src/resources/itemdb.cpp:61
 #, c-format
 msgid "Defense %+d"
 msgstr "Puolustus %+d"
 
-#: src/resources/itemdb.cpp:54
+#: src/resources/itemdb.cpp:62
 #, c-format
 msgid "HP %+d"
-msgstr "Iskupisteet %+d"
+msgstr "VP %+d"
 
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:63
 #, c-format
 msgid "MP %+d"
-msgstr "Taikapisteet %+d"
+msgstr "MP %+d"
 
-#: src/resources/itemdb.cpp:114
+#: src/resources/itemdb.cpp:166
 msgid "Unknown item"
-msgstr ""
-
-#: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
-#: src/resources/monsterdb.cpp:67
-msgid "unnamed"
-msgstr ""
-
-#~ msgid "no"
-#~ msgstr "ei"
-
-#~ msgid "Buddy"
-#~ msgstr "Kaveri"
-
-#~ msgid "Buddy List"
-#~ msgstr "Kaverilista"
-
-#~ msgid "Description: %s"
-#~ msgstr "Kuvaus: %s"
-
-#~ msgid "Effect: %s"
-#~ msgstr "Vaikutus: %s"
-
-#~ msgid "Previous"
-#~ msgstr "Edellinen"
-
-#~ msgid "New"
-#~ msgstr "Uusi"
-
-#~ msgid "Ok"
-#~ msgstr "Ok"
-
-#~ msgid "Magic"
-#~ msgstr "Taika"
-
-#~ msgid "@@attack|Attack %s@@"
-#~ msgstr "@@attack|Hyökkää %s kimppuun@@"
-
-#~ msgid "@@cancel|Cancel@@"
-#~ msgstr "@@cancel|Peruuta@@"
-
-#~ msgid "@@use|Equip@@"
-#~ msgstr "@@use|Ota varuste käyttöön@@"
-
-#~ msgid "@@use|Use@@"
-#~ msgstr "@@use|Käytä@@"
-
-#~ msgid "@@drop|Drop@@"
-#~ msgstr "@@drop|Pudota maahan@@"
-
-#~ msgid "@@split|Split@@"
-#~ msgstr "@@split|Pinon jako@@"
-
-#~ msgid "@@store|Store@@"
-#~ msgstr "@@store|Kauppa@@"
-
-#~ msgid "windowed"
-#~ msgstr "ikkunoitu"
-
-#~ msgid "fullscreen"
-#~ msgstr "Kokoruututila"
-
-#~ msgid "Weapons"
-#~ msgstr "Aseet"
-
-#~ msgid "Cost"
-#~ msgstr "Hinta"
-
-#~ msgid "Guilds"
-#~ msgstr "Kiltatoiminta"
-
-#~ msgid "Knife"
-#~ msgstr "Puukko"
-
-#~ msgid "Sword"
-#~ msgstr "Miekka"
-
-#~ msgid "Whip"
-#~ msgstr "Ruoska"
-
-#~ msgid "Bow"
-#~ msgstr "Jousi"
-
-#~ msgid "Shooting"
-#~ msgstr "Ammunta"
-
-#~ msgid "Axe"
-#~ msgstr "Kirves"
-
-#~ msgid "Couldn't set "
-#~ msgstr "Ei voitu asettaa "
-
-#~ msgid " video mode: "
-#~ msgstr " video tila: "
-
-#~ msgid "Connecting to character server..."
-#~ msgstr "Yhdistetään hahmo palvelimelle"
-
-#~ msgid "Connecting to account server..."
-#~ msgstr "Yhdistetään tunnus palvelimelle"
-
-#~ msgid "Scroll radius"
-#~ msgstr "Kameran perässälaahaus"
-
-#~ msgid "Scroll laziness"
-#~ msgstr "Kameran perässälaahauksen tiukkuus"
+msgstr "Tuntematon esine"
diff --git a/po/fr.po b/po/fr.po
index fe0c5959f..582e15039 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -2,25 +2,24 @@
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: manaplus\n"
+"Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
 "POT-Creation-Date: 2011-04-15 20:28+0300\n"
-"PO-Revision-Date: 2011-03-31 19:28+0000\n"
+"PO-Revision-Date: 2011-04-16 09:17+0000\n"
 "Last-Translator: Jumpy <antoinebcn@hotmail.com>\n"
 "Language-Team: French <>\n"
-"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
 #: src/actorspritemanager.cpp:909
-#, fuzzy
 msgid "Visible on map"
-msgstr "Afficher les noms"
+msgstr "Visible sur la carte"
 
 #: src/being.cpp:489
 msgid "dodge"
@@ -94,7 +93,7 @@ msgstr "Désinscription réussie"
 
 #: src/client.cpp:1143
 msgid "Farewell, come back any time..."
-msgstr "Adieu, revenez dès que vous le souhaitez..."
+msgstr "Adieu, revenez quand vous voudrez..."
 
 #: src/client.cpp:1332 src/client.cpp:1362 src/client.cpp:1406
 #, c-format
@@ -113,7 +112,7 @@ msgstr "Impossible de créer le dossier de mise à jour !"
 #: src/client.cpp:1596
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
-msgstr "Erreur : %s n'existe pas et ne peut pas être créer ! Fin et sortie."
+msgstr "Erreur : %s n'existe pas et ne peut pas être créé ! Déconnection"
 
 #: src/commandhandler.cpp:272
 msgid "Unknown command."
@@ -126,11 +125,11 @@ msgstr "Vous ne pouvez pas envoyer des messages privés vides !"
 #: src/commandhandler.cpp:380
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
-"you."
+"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 le personnage \"%s"
-"\" ! Elle existe déjà ou il s'agit de vous même."
+"Il ne peut être créer une fenêtre de conversation avec le personnage \"%s\" "
+"! Elle existe déjà ou il s'agit de vous même."
 
 #: src/commandhandler.cpp:400
 #, c-format
@@ -139,7 +138,7 @@ msgstr "Demande  de rejoindre le canal %s."
 
 #: src/commandhandler.cpp:416 src/net/tmwa/gui/partytab.cpp:123
 msgid "Party name is missing."
-msgstr "Indiquez un nom de groupe."
+msgstr "Le nom du groupe est manquant."
 
 #: src/commandhandler.cpp:427
 msgid "Guild name is missing."
@@ -186,7 +185,7 @@ msgstr "Joueur déjà %s !"
 #: src/commandhandler.cpp:569
 #, c-format
 msgid "Player successfully %s!"
-msgstr "Joueur victorieux %s !"
+msgstr "Joueur  %s avec succès!"
 
 #: src/commandhandler.cpp:577
 #, c-format
@@ -258,26 +257,23 @@ msgstr[0] "%d segondes"
 msgstr[1] "%d secondes"
 
 #: src/commandhandler.cpp:995
-#, fuzzy
 msgid "font cache size"
-msgstr "Taille de police"
+msgstr "Cache de polices"
 
 #: src/commandhandler.cpp:1008
-#, fuzzy
 msgid "Created: "
-msgstr "Créer"
+msgstr "Créé : "
 
 #: src/commandhandler.cpp:1009
-#, fuzzy
 msgid "Deleted: "
-msgstr "Supprimer"
+msgstr "Effacé : "
 
 #: src/commandhandler.h:40
 #, 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\"."
+"Les options qui peuvent être transmises à /%s sont \"yes\", \"no\", "
+"\"true\", \"false\", \"1\", \"0\"."
 
 #: src/game.cpp:228 src/gui/widgets/chattab.cpp:395
 msgid "General"
@@ -519,7 +515,7 @@ msgstr "Coupe de cheveux :"
 
 #: src/gui/charcreatedialog.cpp:87
 msgid "Race:"
-msgstr ""
+msgstr "Race:"
 
 #: src/gui/charcreatedialog.cpp:90 src/gui/charselectdialog.cpp:447
 #: src/gui/socialwindow.cpp:847
@@ -838,7 +834,7 @@ msgstr "Sortilège :"
 
 #: src/gui/inventorywindow.cpp:119
 msgid "na"
-msgstr "na"
+msgstr "indisponible"
 
 #: src/gui/inventorywindow.cpp:120
 msgid "az"
@@ -903,31 +899,31 @@ msgstr "Tout"
 
 #: src/gui/itemamountwindow.cpp:259
 msgid "Select amount of items to trade."
-msgstr "Choisissez le nombre d'objets à troquer."
+msgstr "Choisir le nombre d'objets à troquer."
 
 #: src/gui/itemamountwindow.cpp:262
 msgid "Select amount of items to drop."
-msgstr "Choisissez le nombre d'objets à jeter."
+msgstr "Choisir le nombre d'objets à jeter."
 
 #: src/gui/itemamountwindow.cpp:265
 msgid "Select amount of items to store."
-msgstr "Sélectionnez le nombre d'objets à stocker."
+msgstr "Choisir le nombre d'objets à stocker."
 
 #: src/gui/itemamountwindow.cpp:268
 msgid "Select amount of items to retrieve."
-msgstr "Sélectionnez le nombre d'objet à reprendre"
+msgstr "Choisir le nombre d'objet à reprendre"
 
 #: src/gui/itemamountwindow.cpp:271
 msgid "Select amount of items to split."
-msgstr "Choisissez le nombre d'objets à séparer."
+msgstr "Choisir le nombre d'objets à séparer."
 
 #: src/gui/itemamountwindow.cpp:274
 msgid "Add to buy shop."
-msgstr "Ajouter au magasin pour l'achat."
+msgstr "Ajouter au magasin d'achat."
 
 #: src/gui/itemamountwindow.cpp:277
 msgid "Add to sell shop."
-msgstr "Ajouter au magasin pour la vente."
+msgstr "Ajouter au magasin de vente."
 
 #: src/gui/itemamountwindow.cpp:280
 msgid "Unknown."
@@ -972,11 +968,11 @@ msgstr " exp, Mob moyen pour 1% : ?"
 
 #: src/gui/killstats.cpp:75 src/gui/killstats.cpp:128
 msgid "Kills: ?, Total Exp: ?"
-msgstr "Tués : ?, Exp. Total : ?"
+msgstr "Tués : ?, Exp. Totale : ?"
 
 #: src/gui/killstats.cpp:76 src/gui/killstats.cpp:129
 msgid "Avg Exp: ?, No. of Avg mob to next level: ?"
-msgstr "Exp moyenne : ?, Nb de monstres moyens avant prochain niveau : ?"
+msgstr "Exp moyenne : ?, Nb moyens de monstres  avant prochain niveau : ?"
 
 #: src/gui/killstats.cpp:77 src/gui/killstats.cpp:146
 msgid "Kills/Min: ?, Exp/Min: ?"
@@ -984,11 +980,11 @@ msgstr "Tués/min : ?, Exp/min : ?"
 
 #: src/gui/killstats.cpp:79
 msgid "Exp speed per 1 min: ?"
-msgstr "Exp obtenue en 1 min : ?"
+msgstr "Exp. obtenue en 1 min : ?"
 
 #: src/gui/killstats.cpp:80
 msgid "Time for next level per 1 min: ?"
-msgstr "Temps avant prochain niveau pour 1 min : ?"
+msgstr "Temps avant prochain niveau sur 1 min : ?"
 
 #: src/gui/killstats.cpp:81
 msgid "Exp speed per 5 min: ?"
@@ -996,7 +992,7 @@ msgstr "Exp obtenue en 5 min : ?"
 
 #: src/gui/killstats.cpp:82
 msgid "Time for next level per 5 min: ?"
-msgstr "Temps avant prochain niveau pour 5 min : ?"
+msgstr "Temps avant prochain niveau sur 5 min : ?"
 
 #: src/gui/killstats.cpp:83
 msgid "Exp speed per 15 min: ?"
@@ -1004,7 +1000,7 @@ msgstr "Exp obtenue en 15 min : ?"
 
 #: src/gui/killstats.cpp:84
 msgid "Time for Next level per 15 min: ?"
-msgstr "Temps avant prochain niveau pour 15 min : ?"
+msgstr "Temps avant prochain niveau sur 15 min : ?"
 
 #: src/gui/killstats.cpp:86
 msgid "Last kill exp: ?"
@@ -1012,7 +1008,7 @@ msgstr "Exp du dernier Tué : ?"
 
 #: src/gui/killstats.cpp:87
 msgid "Time before jacko spawn: ?"
-msgstr "Temps avant l'apparition d'un JackO : ?"
+msgstr "Temps avant l'apparition d'un Jack'O : ?"
 
 #: src/gui/killstats.cpp:270
 #, c-format
@@ -1274,12 +1270,12 @@ msgstr "@@party|Inviter dans le groupe@@"
 #: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:350
 #: src/gui/popupmenu.cpp:599
 msgid "@@kick party|Kick from party@@"
-msgstr "@@kick party|Sortir du groupe@@"
+msgstr "@@kick party|renvoyer du groupe@@"
 
 #: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:360
 #: src/gui/popupmenu.cpp:613
 msgid "@@guild-kick|Kick from guild@@"
-msgstr "@@guild-kick|Sortir de la guilde@@"
+msgstr "@@guild-kick|renvoyer de la guilde@@"
 
 #: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:361
 #: src/gui/popupmenu.cpp:615
@@ -1293,7 +1289,7 @@ msgstr "@@guild|Inviter dans la guilde@@"
 
 #: src/gui/popupmenu.cpp:217
 msgid "@@admin-kick|Kick player@@"
-msgstr "@@admin-kick|Sortir un joueur@@"
+msgstr "@@admin-kick|Renvoyer un joueur@@"
 
 #: src/gui/popupmenu.cpp:219
 msgid "@@nuke|Nuke@@"
@@ -1324,7 +1320,7 @@ msgstr "@@talk|Parler@@"
 
 #: src/gui/popupmenu.cpp:249
 msgid "@@admin-kick|Kick@@"
-msgstr "@@admin-kick|Sortir@@"
+msgstr "@@admin-kick|Renvoyer@@"
 
 #: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:376
 msgid "@@name|Add name to chat@@"
@@ -1349,7 +1345,7 @@ msgstr "@@pickup|Ramasser@@"
 
 #: src/gui/popupmenu.cpp:404
 msgid "@@chat|Add to chat@@"
-msgstr "@@chat|Ajouter à la boite de dialogue@@"
+msgstr "@@chat|Ajouter au dialogue@@"
 
 #: src/gui/popupmenu.cpp:422
 msgid "Map Item"
@@ -1385,11 +1381,11 @@ msgstr "@@chat close|Fermer le dialogue@@"
 
 #: src/gui/popupmenu.cpp:481
 msgid "Disable highlight"
-msgstr "Désactiver les surbrillances"
+msgstr "Désactiver l'éclairage"
 
 #: src/gui/popupmenu.cpp:486
 msgid "Enable highlight"
-msgstr "Activer les surbrillances"
+msgstr "Activer l'éclairage"
 
 #: src/gui/popupmenu.cpp:491
 msgid "Dont remove name"
@@ -1507,7 +1503,7 @@ msgstr "Vérification :"
 
 #: src/gui/register.cpp:106
 msgid "Email:"
-msgstr "E-mail :"
+msgstr "Email :"
 
 #: src/gui/register.cpp:174
 #, c-format
@@ -1597,11 +1593,11 @@ msgstr "Activer le son"
 
 #: src/gui/setup_audio.cpp:49
 msgid "Enable game sfx"
-msgstr "Activer les bruitages de jeu"
+msgstr "Activer les effets sonores du jeu"
 
 #: src/gui/setup_audio.cpp:50
 msgid "Enable gui sfx"
-msgstr "Activer les bruitages d'interfaces"
+msgstr "Activer les effets sonores de l'interface"
 
 #: src/gui/setup_audio.cpp:51
 msgid "Enable music"
@@ -1675,7 +1671,7 @@ msgstr "Montrer l'historique de discussion"
 
 #: src/gui/setup_chat.cpp:102
 msgid "Enable battle tab"
-msgstr "Activer le tab de combat"
+msgstr "Activer l'onglet de combat"
 
 #: src/gui/setup_chat.cpp:106
 msgid "Show battle events"
@@ -1692,16 +1688,15 @@ msgstr "Editer"
 
 #: src/gui/setup_chat.cpp:116
 msgid "Limit max chars in chat line"
-msgstr "Limiter le nombre maximum de caractères en une ligne de discussion"
+msgstr "Limiter le nombre maximum de caractères d'une ligne de discussion"
 
 #: src/gui/setup_chat.cpp:125
 msgid "Limit max lines in chat"
 msgstr "Limiter le nombre maximum de lignes dans le chat"
 
 #: src/gui/setup_chat.cpp:132
-#, fuzzy
 msgid "Resize chat tabs if need"
-msgstr "Boite de dialogue : ligne suivante"
+msgstr "Si besoin est, changer la taille des fenêtre de dialogue"
 
 #: src/gui/setup_colors.cpp:46
 msgid "This is what the color looks like"
@@ -1816,19 +1811,19 @@ msgstr "Montrer les dégâts infligés aux monstres"
 
 #: src/gui/setup_other.cpp:107
 msgid "Auto target only reachable monsters"
-msgstr "Prendre automatiquement pour cible les monstres à portée uniquement"
+msgstr "Viser automatiquement  uniquement les monstres à portée de tir "
 
 #: src/gui/setup_other.cpp:111
 msgid "Highlight map portals"
-msgstr "Mettre en évidence les portes d'entrées et les sorties de la carte"
+msgstr "Afficher les portails de changement de carte"
 
 #: src/gui/setup_other.cpp:116
 msgid "Highlight player attack range"
-msgstr "Mettre en surbrillance la portée d'attaque du joueur"
+msgstr "Afficher la portée d'attaque du joueur"
 
 #: src/gui/setup_other.cpp:121
 msgid "Highlight monster attack range"
-msgstr "Mettre en surbrillance la portée d'attaque des monstres"
+msgstr "Afficher la portée d'attaque des monstres"
 
 #: src/gui/setup_other.cpp:125
 msgid "Cycle player targets"
@@ -2452,7 +2447,8 @@ msgstr "Accepter l'invitation dans cette guilde"
 #: src/gui/socialwindow.cpp:1136
 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."
+"Vous avez reçu une demande de rejoindre un groupe, mais il en existe déjà "
+"un."
 
 #: src/gui/socialwindow.cpp:1147
 msgid "You have been invited you to join a party."
@@ -3030,7 +3026,8 @@ msgid "Change"
 msgstr "Changer"
 
 #: src/gui/trade.cpp:314
-msgid "Failed adding item. You can not overlap one kind of item on the window."
+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."
@@ -3268,7 +3265,8 @@ msgstr "Commande : /users"
 
 #: src/gui/widgets/channeltab.cpp:65
 msgid "This command shows the users in this channel."
-msgstr "Cette commande affiche la liste d'utilisateurs présents dans ce salon."
+msgstr ""
+"Cette commande affiche la liste d'utilisateurs présents dans ce salon."
 
 #: src/gui/widgets/channeltab.cpp:69
 msgid "Command: /topic <message>"
@@ -3378,8 +3376,10 @@ msgid "Command: /unignore <player>"
 msgstr "Commande : /unignore <joueur>"
 
 #: src/gui/widgets/whispertab.cpp:129
-msgid "This command stops ignoring the other player if they are being ignored."
-msgstr "Cette commande vous fait cesser d'ignorer un joueur si c'était le cas."
+msgid ""
+"This command stops ignoring the other player if they are being ignored."
+msgstr ""
+"Cette commande vous fait cesser d'ignorer un joueur si c'était le cas."
 
 #: src/gui/windowmenu.cpp:62
 msgid "BC"
@@ -3849,8 +3849,8 @@ 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."
+"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/localplayer.cpp:338
 msgid "You were killed by "
@@ -3899,22 +3899,19 @@ msgstr "Inactif"
 
 #: src/localplayer.cpp:3392
 msgid "Follow: "
-msgstr ""
+msgstr "Suivre : "
 
 #: src/localplayer.cpp:3394 src/localplayer.cpp:3409
-#, fuzzy
 msgid "Follow canceled"
-msgstr "Échange annulé."
+msgstr "Suivi annulé"
 
 #: src/localplayer.cpp:3401
-#, fuzzy
 msgid "Imitation: "
-msgstr "(?) Imitation"
+msgstr "Imitation: "
 
 #: src/localplayer.cpp:3403 src/localplayer.cpp:3411
-#, fuzzy
 msgid "Imitation canceled"
-msgstr "Échange annulé."
+msgstr "Imitation annulée"
 
 #: src/localplayer.cpp:3763
 msgid "You see "
@@ -4009,7 +4006,8 @@ msgstr ""
 
 #: src/main.cpp:69
 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 imprime-écrans"
 
 #: src/main.cpp:70
 msgid "     --safemode       : Start game in safe mode"
@@ -4926,9 +4924,8 @@ msgstr ""
 "contact avec l'équipe des GM."
 
 #: src/net/tmwa/loginhandler.cpp:178
-#, fuzzy
 msgid "Client too old."
-msgstr "La version de votre client est trop ancienne."
+msgstr "Interface trop ancienne."
 
 #: src/net/tmwa/loginhandler.cpp:181
 #, c-format
@@ -4941,16 +4938,15 @@ msgstr ""
 
 #: src/net/tmwa/loginhandler.cpp:188
 msgid "Server overpopulated."
-msgstr ""
+msgstr "Serveur surpeuplé."
 
 #: src/net/tmwa/loginhandler.cpp:191
 msgid "This user name is already taken."
 msgstr "Ce nom d'utilisateur est déjà utilisé."
 
 #: src/net/tmwa/loginhandler.cpp:197
-#, fuzzy
 msgid "Username permanently erased."
-msgstr "Ce nom d'utilisateur existe déjà."
+msgstr "Le nom de l'utilisateur a été eliminé de façon permanente."
 
 #: src/net/tmwa/network.cpp:149
 msgid "Empty address given to Network::connect()!"
@@ -5090,16 +5086,18 @@ msgstr "Message"
 
 #: src/net/tmwa/playerhandler.cpp:333
 msgid ""
-"You are carrying more than half your weight. You are unable to regain health."
+"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."
+"Vous portez plus de la moitié du poids de votre inventaire. Vous n'êtes plus"
+" en mesure de regagner vos points de vie."
 
 #: src/net/tmwa/playerhandler.cpp:343
-msgid "You are carrying less than half your weight. You are can regain health."
+msgid ""
+"You are carrying less than half your weight. You are can regain health."
 msgstr ""
-"Vous portez moins de la moitié du poids de votre inventaire.Vous pouvez vous "
-"régénérez de nouveau."
+"Vous portez moins de la moitié du poids de votre inventaire.Vous pouvez vous"
+" régénérez de nouveau."
 
 #: src/net/tmwa/playerhandler.cpp:448
 #, c-format
@@ -5293,300 +5291,3 @@ msgstr "PM %+d"
 #: src/resources/itemdb.cpp:166
 msgid "Unknown item"
 msgstr "Objet inconnu"
-
-#~ msgid "-- Help --"
-#~ msgstr "-- Aide --"
-
-#~ msgid "/help > Display this help"
-#~ msgstr "/help > Montre l'aide"
-
-#~ msgid "/where > Display map name"
-#~ msgstr "/where > Affiche le nom de la carte et votre localisation"
-
-#~ msgid "/who > Display number of online users"
-#~ msgstr "/who > Affiche le nombre d'utilisateurs en ligne"
-
-#~ msgid "/me > Tell something about yourself"
-#~ msgstr "/me > Dire quelque chose à votre propos"
-
-#~ msgid "/clear > Clears this window"
-#~ msgstr "/clear > Efface le contenu de cette fenêtre"
-
-#~ msgid "/msg > Send a private message to a user"
-#~ msgstr "/msg > Envoie un message privé à un utilisateur"
-
-#~ msgid "/whisper > Alias of msg"
-#~ msgstr "/whisper > Alias de message"
-
-#~ msgid "/w > Alias of msg"
-#~ msgstr "/w > Alias de message"
-
-#~ msgid "/query > Makes a tab for private messages with another user"
-#~ msgstr ""
-#~ "/query > Créé un nouvel onglet pour vos messages privés avec un autre "
-#~ "utilisateur"
-
-#~ msgid "/q > Alias of query"
-#~ msgstr "/q > Alias de query"
-
-#~ msgid "/away > Tell the other whispering players you're away from keyboard."
-#~ msgstr ""
-#~ "/away > Indique aux autres joueurs que vous n'êtes actuellement pas "
-#~ "devant votre écran."
-
-#~ msgid "/ignore > ignore a player"
-#~ msgstr "/ignore > Ignorer un joueur"
-
-#~ msgid "/unignore > stop ignoring a player"
-#~ msgstr "/unignore > Cesser d'ignorer un joueur"
-
-#~ msgid "/ignoreall > Ignore all opened whisper tabs"
-#~ msgstr "/ignoreall > Ignore tous les joueurs dont les onglets sont ouverts"
-
-#~ msgid "/erase > Erase a player"
-#~ msgstr "/erase > Eliminer un joueur"
-
-#~ msgid "/befriend > Be friend a player"
-#~ msgstr "/befriend > Être ami avec un joueur"
-
-#~ msgid "/disregard > Disregard a player"
-#~ msgstr "/disregard > Écarter un joueur"
-
-#~ msgid "/neutral > Neutral a player"
-#~ msgstr "/neutral > Ramener un joueur à l'état par défaut"
-
-#~ msgid "/list > Display all public channels"
-#~ msgstr "/list > Affiche une liste de tous les salons publics"
-
-#~ msgid "/join > Join or create a channel"
-#~ msgstr "/join > Rejoindre ou créer un salon."
-
-#~ msgid "/createparty > Create a new party"
-#~ msgstr "/createparty > Créer un nouveau groupe"
-
-#~ msgid "/createguild > Create a new guild"
-#~ msgstr "/createguild > créer une guilde"
-
-#~ msgid "/party > Invite a user to party"
-#~ msgstr "/party > Invite un utilisateur dans un groupe"
-
-#~ msgid "/toggle > Determine whether <return> toggles the chat log"
-#~ msgstr ""
-#~ "/toggle > Détermine si la touche <entrée> bascule l'historique du tchat"
-
-#~ 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é)"
-
-#~ msgid "/announce > Global announcement (GM only)"
-#~ msgstr "/announce > Annonce globale (GM uniquement)"
-
-#~ msgid "/closeall > Close all opened whisper tabs"
-#~ msgstr "/closeall > Fermer tous les onglets ouverts"
-
-#~ msgid "/all > Show all visible beings in debug tab"
-#~ msgstr ""
-#~ "/all > Montrer tous les personnages visibles dans la fenêtre de "
-#~ "'debug' (informations)"
-
-#~ msgid "/move > Move to given position"
-#~ msgstr "/move > Se déplacer jusqu'à la position donnée"
-
-#~ msgid "/navigate > Draw path to given position"
-#~ msgstr "/navigate > Afficher le chemin jusqu'à la position donnée"
-
-#~ msgid "/target > Set target to being"
-#~ msgstr "/target > Prendre le joueur désigné pour cible"
-
-#~ msgid "/outfit > Wear outfit by index"
-#~ msgstr "/outfit > Revêtir une tenue selon l'index choisi"
-
-#~ msgid "/emote > Show emote by index"
-#~ msgstr "/emote > Afficher l'émoticône selon l'index donné"
-
-#~ msgid "/follow > Follow player"
-#~ msgstr "/follow > Suivre le joueur"
-
-#~ msgid "/imitation > Imitate player"
-#~ msgstr "/imitation > Imiter le joueur"
-
-#~ msgid "/heal > Heal player"
-#~ msgstr "/heal > Soigner un Joueur"
-
-#~ msgid "/mail > Send offline message to player"
-#~ msgstr "/mail > Envoyer un message à un joueur hors ligne"
-
-#~ msgid "For more information, type /help <command>."
-#~ msgstr "Pour plus d'informations, taper /help <commande>"
-
-#~ msgid "Command: /help"
-#~ msgstr "Commande : /help"
-
-#~ msgid "This command displays a list of all commands available."
-#~ msgstr ""
-#~ "Cette commande affiche une liste de toutes les commandes disponibles."
-
-#~ msgid "Command: /help <command>"
-#~ msgstr "Commande : /help <commande>"
-
-#~ msgid "This command displays help on <command>."
-#~ msgstr "Cette commande affiche une aide sur la commande <command>."
-
-#~ msgid "Command: /announce <msg>"
-#~ msgstr "Commande : /announce <message>"
-
-#~ msgid "*** only available to a GM ***"
-#~ msgstr "*** uniquement disponible pour les GM ***"
-
-#~ msgid ""
-#~ "This command sends the message <msg> to all players currently online."
-#~ msgstr ""
-#~ "Cette commande envoie le message <message> à tous les joueurs en ligne."
-
-#~ msgid "Command: /clear"
-#~ msgstr "Commande : /clear"
-
-#~ msgid "This command clears the chat log of previous chat."
-#~ msgstr ""
-#~ "Cette commande vide l'historique de conversation de la conversation "
-#~ "précédente."
-
-#~ msgid "Command: /ignore <player>"
-#~ msgstr "Commande : /ignore <joueur>"
-
-#~ msgid ""
-#~ "This command ignores the given player regardless of current relations."
-#~ msgstr ""
-#~ "Cette commande ignore le joueur qu'il soit indiqué comme ami ou non."
-
-#~ msgid "Command: /join <channel>"
-#~ msgstr "Commande : /join <channel>"
-
-#~ msgid "This command makes you enter <channel>."
-#~ msgstr "Cette commande vous fait rentrer dans le salon <channel>."
-
-#~ msgid "If <channel> doesn't exist, it's created."
-#~ msgstr "Si <channel> n'existe pas, il sera créé."
-
-#~ msgid "Command: /list"
-#~ msgstr "Commande : /list"
-
-#~ msgid "This command shows a list of all channels."
-#~ msgstr "Cette commande affiche une liste de tous les salons publics."
-
-#~ msgid "Command: /me <message>"
-#~ msgstr "Commande : /me <message>"
-
-#~ msgid "This command tell others you are (doing) <msg>."
-#~ msgstr ""
-#~ "Cette commande informe les autres joueurs que vous faites <message>."
-
-#~ msgid "Command: /msg <nick> <message>"
-#~ msgstr "Commande : /msg <nom du personnage> <message>"
-
-#~ msgid "Command: /whisper <nick> <message>"
-#~ msgstr "Commande : /whisper <nom du personnage> <message>"
-
-#~ msgid "Command: /w <nick> <message>"
-#~ msgstr "Commande : /w <nom du personnage> <message>"
-
-#~ msgid "This command sends the text <message> to <nick>."
-#~ msgstr ""
-#~ "Cette commande envoie le texte <message> au joueur <nom du personnage>"
-
-#~ msgid "Command: /query <nick>"
-#~ msgstr "Commande : /query <nom du personnage>"
-
-#~ msgid "Command: /q <nick>"
-#~ msgstr "Commande : /q <nom du personnage>"
-
-#~ msgid "This command tries to make a tab for whispers betweenyou and <nick>."
-#~ msgstr ""
-#~ "Cette commande essaye de créer une fenêtre de dialogue entre vous et <nom "
-#~ "du personnage>"
-
-#~ msgid "Command: /away <afk reason>"
-#~ msgstr "Commande : /away <message d'absence>"
-
-#~ msgid "This command tells you're away from keyboard with the given reason."
-#~ msgstr ""
-#~ "Cette commande indique que vous n'êtes pas devant votre écran en "
-#~ "indiquant la raison."
-
-#~ msgid "Command: /away"
-#~ msgstr "Commande : /away"
-
-#~ msgid "This command clears the away status and message."
-#~ msgstr "Cette commande retire le statut absent."
-
-#~ msgid "Command: /createparty <name>"
-#~ msgstr "Commande : /createparty <nom du groupe>"
-
-#~ msgid "This command creates a new party called <name>."
-#~ msgstr "Cette commande crée un nouveau groupe appelé <nom>"
-
-#~ msgid "Command: /createguild <name>"
-#~ msgstr "Commande: /createguild <nom>"
-
-#~ msgid "This command creates a new guild called <name>."
-#~ msgstr "Cette commande crée une nouvelle guilde appelée <nom>."
-
-#~ msgid "Command: /party <nick>"
-#~ msgstr "Commande : /party <nom du personnage>"
-
-#~ msgid "Command: /present"
-#~ msgstr "Commande : /present"
-
-#~ msgid ""
-#~ "This command gets a list of players within hearing and sends it to chat "
-#~ "log."
-#~ msgstr ""
-#~ "Cette commande renvoie la liste des joueurs présents qui peuvent vous "
-#~ "entendre, dans la fenêtre de discussion."
-
-#~ msgid "Command: /toggle <state>"
-#~ msgstr "Commande : /toggle <état>"
-
-#~ msgid ""
-#~ "This command sets whether the return key should toggle the chat log, or "
-#~ "whether the chat log turns off automatically."
-#~ msgstr ""
-#~ "Cette commande bascule la fonction de la touche \"retour\" entre "
-#~ "\"ouverture / fermeture\" et \"fermeture automatique\" de la ligne de "
-#~ "discussion."
-
-#~ msgid ""
-#~ "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
-#~ "\"0\", \"no\", \"false\" to turn the toggle off."
-#~ msgstr ""
-#~ "<état> peut être en position \"1\", \"yes\", \"true\" pour activer le "
-#~ "bouton sur marche, ou \"0\", \"no\", \"false\" pour désactiver le bouton."
-
-#~ msgid "Command: /toggle"
-#~ msgstr "Commande : /toggle"
-
-#~ msgid "This command displays the return toggle status."
-#~ msgstr "Cette commande vous affiche le statut du toggle courant."
-
-#~ 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."
-
-#~ msgid "Command: /where"
-#~ msgstr "Commande : /where"
-
-#~ msgid "This command displays the name of the current map."
-#~ msgstr "Cette commande affiche le nom de la carte où vous vous trouvez."
-
-#~ msgid "Command: /who"
-#~ msgstr "Commande : /who"
-
-#~ msgid "This command displays the number of players currently online."
-#~ msgstr "Cette commande affiche le nombre de joueurs actuellement connectés."
-
-#~ msgid "Type /help for a list of commands."
-#~ msgstr "Entrer /help pour obtenir une liste des commandes disponibles."
diff --git a/po/it.po b/po/it.po
index 32c6d962a..a398c9964 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1,71 +1,61 @@
-# Italian translation of The Mana World.
-# Copyright (C) 2007 The Mana World Development Team
-# This file is distributed under the same license as the The Mana World package.
-# Eugenio Favalli <eugeniofavalli@gmail.com>, 2007.
-# , fuzzy
-#
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR The ManaPlus Developers
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: The Mana World 0.1.0\n"
+"Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
 "POT-Creation-Date: 2011-04-15 20:28+0300\n"
-"PO-Revision-Date: 2010-02-18 14:01+0000\n"
-"Last-Translator: Gabriel Rota <gabriel.rota@gmail.com>\n"
-"Language-Team: Italian\n"
-"Language: \n"
+"PO-Revision-Date: 2011-04-15 17:33+0000\n"
+"Last-Translator: akaras <akaras@inbox.ru>\n"
+"Language-Team: Italian <>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"Language: it\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: src/actorspritemanager.cpp:909
-#, fuzzy
 msgid "Visible on map"
-msgstr "Nomi visibili"
+msgstr ""
 
 #: src/being.cpp:489
 msgid "dodge"
-msgstr ""
+msgstr "Schivato"
 
 #: src/being.cpp:489
 msgid "miss"
-msgstr ""
+msgstr "Mancato"
 
 #: src/client.cpp:752 src/gui/setup.cpp:48 src/gui/windowmenu.cpp:93
 msgid "Setup"
 msgstr "Impostazioni"
 
 #: src/client.cpp:826
-#, fuzzy
 msgid "Connecting to server"
-msgstr "Connessione al server della mappa..."
+msgstr "Connessione al server"
 
 #: src/client.cpp:857
-#, fuzzy
 msgid "Logging in"
-msgstr "Autenticazione"
+msgstr "Accesso"
 
 #: src/client.cpp:890
 msgid "Entering game world"
-msgstr ""
+msgstr "Accesso al gioco"
 
 #: src/client.cpp:982
-#, fuzzy
 msgid "Requesting characters"
-msgstr "Scelta Personaggio"
+msgstr "Ricerca personaggi"
 
 #: src/client.cpp:1013
-#, fuzzy
 msgid "Connecting to the game server"
-msgstr "Connessione al server della mappa..."
+msgstr "Connessione al server del gioco"
 
 #: src/client.cpp:1023
-#, fuzzy
 msgid "Changing game servers"
-msgstr "Server"
+msgstr "Cambiamento server del gioco"
 
 #: src/client.cpp:1058 src/client.cpp:1065 src/client.cpp:1202
 #: src/gui/changeemaildialog.cpp:155 src/gui/changepassworddialog.cpp:145
@@ -79,44 +69,41 @@ msgstr "Errore"
 
 #: src/client.cpp:1074
 msgid "Requesting registration details"
-msgstr ""
+msgstr "Richiesta dettagli di registrazione"
 
 #: src/client.cpp:1101
-#, fuzzy
 msgid "Password Change"
-msgstr "Password:"
+msgstr "Cambiamento password"
 
 #: src/client.cpp:1102
 msgid "Password changed successfully!"
-msgstr ""
+msgstr "Password modificata con successo!"
 
 #: src/client.cpp:1121
-#, fuzzy
 msgid "Email Change"
-msgstr "Cambia"
+msgstr "Cambio Email"
 
 #: src/client.cpp:1122
 msgid "Email changed successfully!"
-msgstr ""
+msgstr "Email cambiata con successo!"
 
 #: src/client.cpp:1142
-#, fuzzy
 msgid "Unregister Successful"
-msgstr "Cancella registrazione"
+msgstr "Annullamento registrazione effettuato con successo"
 
 #: src/client.cpp:1143
 msgid "Farewell, come back any time..."
-msgstr ""
+msgstr "Addio, torna quando vuoi..."
 
 #: src/client.cpp:1332 src/client.cpp:1362 src/client.cpp:1406
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
-msgstr ""
+msgstr "%s non esiste e non può essere creato! Uscita in corso."
 
 #: src/client.cpp:1535
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid update host: %s"
-msgstr "Host di aggiornamento non valido: "
+msgstr "Invalido aggiornamento host: %s"
 
 #: src/client.cpp:1569 src/client.cpp:1575
 msgid "Error creating updates directory!"
@@ -125,7 +112,7 @@ msgstr "Errore durante la creazione della directory degli aggiornamenti"
 #: src/client.cpp:1596
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
-msgstr ""
+msgstr "Errore: %s non esiste e non può essere creato! Ucita in corso."
 
 #: src/commandhandler.cpp:272
 msgid "Unknown command."
@@ -138,8 +125,8 @@ msgstr "Impossibile inviare un sussurro vuoto!"
 #: src/commandhandler.cpp:380
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
-"you."
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
+" you."
 msgstr ""
 "Impossibile creare una scheda per sussurrare a \"%s\"! Esiste già, oppure "
 "sei tu."
@@ -154,14 +141,13 @@ msgid "Party name is missing."
 msgstr "Manca il nome del party."
 
 #: src/commandhandler.cpp:427
-#, fuzzy
 msgid "Guild name is missing."
-msgstr "Manca il nome del party."
+msgstr "Manca il nome della gilda."
 
 #: src/commandhandler.cpp:440 src/commandhandler.cpp:547
 #: src/commandhandler.cpp:588 src/commandhandler.cpp:618
 msgid "Please specify a name."
-msgstr ""
+msgstr "Prego specificare un nome."
 
 #: src/commandhandler.cpp:481
 msgid "Return toggles chat."
@@ -180,62 +166,55 @@ msgid "Message now closes chat."
 msgstr "I messaggi adesso chiudono la conversazione."
 
 #: src/commandhandler.cpp:526
-#, fuzzy
 msgid "friend"
 msgstr "Amico"
 
 #: src/commandhandler.cpp:531
-#, fuzzy
 msgid "disregarded"
 msgstr "Disprezzato"
 
 #: src/commandhandler.cpp:536
-#, fuzzy
 msgid "neutral"
-msgstr "Neutrale"
+msgstr "Neutro"
 
 #: src/commandhandler.cpp:555
-#, fuzzy, c-format
+#, c-format
 msgid "Player already %s!"
-msgstr "Il bisbiglio non può essere inviato, ignorato dall'utente."
+msgstr "Giocatore già %s!"
 
 #: src/commandhandler.cpp:569
-#, fuzzy, c-format
+#, c-format
 msgid "Player successfully %s!"
-msgstr "Party creato con successo."
+msgstr "Giocatore %s con successo!"
 
 #: src/commandhandler.cpp:577
-#, fuzzy, c-format
+#, c-format
 msgid "Player could not be %s!"
-msgstr "Il bisbiglio non può essere inviato, ignorato dall'utente."
+msgstr "Player non può essere %s!"
 
 #: src/commandhandler.cpp:599
 msgid "Player wasn't ignored!"
-msgstr ""
+msgstr "Il giocatore non era ignorato!"
 
 #: src/commandhandler.cpp:606
 msgid "Player no longer ignored!"
-msgstr ""
+msgstr "Giocatore non più ignorato!"
 
 #: src/commandhandler.cpp:608
-#, fuzzy
 msgid "Player could not be unignored!"
-msgstr "Il bisbiglio non può essere inviato, ignorato dall'utente."
+msgstr "Impossibile annullare l'ignoro!"
 
 #: src/commandhandler.cpp:625
-#, fuzzy
 msgid "Player already erased!"
-msgstr "Il bisbiglio non può essere inviato, ignorato dall'utente."
+msgstr "Il giocatore è già cancellato!"
 
 #: src/commandhandler.cpp:636
-#, fuzzy
 msgid "Player successfully erased!"
-msgstr "Party creato con successo."
+msgstr "Giocatore cancellato dal tuo schermo con successo!"
 
 #: src/commandhandler.cpp:638
-#, fuzzy
 msgid "Player could not be erased!"
-msgstr "Il bisbiglio non può essere inviato, ignorato dall'utente."
+msgstr "Il giocatore non può essere cancellato!"
 
 #: src/commandhandler.cpp:931 src/commandhandler.cpp:977
 #, c-format
@@ -278,26 +257,23 @@ msgstr[0] ""
 msgstr[1] ""
 
 #: src/commandhandler.cpp:995
-#, fuzzy
 msgid "font cache size"
-msgstr "Dimensione caratteri"
+msgstr ""
 
 #: src/commandhandler.cpp:1008
-#, fuzzy
 msgid "Created: "
-msgstr "Crea"
+msgstr ""
 
 #: src/commandhandler.cpp:1009
-#, fuzzy
 msgid "Deleted: "
-msgstr "Elimina"
+msgstr ""
 
 #: src/commandhandler.h:40
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
-"Le opzioni per /%s sono \"yes\" (sì), \"no\", \"true\" (vero), \"false"
-"\" (falso), \"1\", \"0\"."
+"Le opzioni per /%s sono \"yes\" (sì), \"no\", \"true\" (vero), \"false\" "
+"(falso), \"1\", \"0\"."
 
 #: src/game.cpp:228 src/gui/widgets/chattab.cpp:395
 msgid "General"
@@ -305,21 +281,19 @@ msgstr "Generale"
 
 #: src/game.cpp:232 src/gui/debugwindow.cpp:48 src/gui/widgets/chattab.cpp:397
 msgid "Debug"
-msgstr ""
+msgstr "Debug"
 
 #: src/game.cpp:444
-#, fuzzy
 msgid "Screenshot saved as "
-msgstr "Schermata salvata in ~/"
+msgstr "Screenshot salvato come"
 
 #: src/game.cpp:452
 msgid "Saving screenshot failed!"
 msgstr "Salvataggio della schermata fallito!"
 
 #: src/game.cpp:491
-#, fuzzy
 msgid "The connection to the server was lost."
-msgstr "La connessione al server è caduta. Il programma sarà ora chiuso."
+msgstr "La connessione al server è stata persa."
 
 #: src/game.cpp:505
 msgid "Network Error"
@@ -334,9 +308,8 @@ msgid "Accepting incoming trade requests"
 msgstr "Le richieste di scambio in arrivo saranno accettate"
 
 #: src/game.cpp:1405
-#, fuzzy
 msgid "Could Not Load Map"
-msgstr "Impossibile caricare la mappa"
+msgstr "Impossibile caricare la mappa."
 
 #: src/game.cpp:1406
 #, c-format
@@ -344,24 +317,23 @@ msgid "Error while loading %s"
 msgstr "Errore durante il caricamento di %s"
 
 #: src/gui/beingpopup.cpp:90
-#, fuzzy, c-format
+#, c-format
 msgid "Party: %s"
-msgstr "Party (%s)"
+msgstr "Party: %s"
 
 #: src/gui/beingpopup.cpp:103
-#, fuzzy, c-format
+#, c-format
 msgid "Guild: %s"
-msgstr "Gilde"
+msgstr "Gilda: %s"
 
 #: src/gui/beingpopup.cpp:115
 #, c-format
 msgid "Pvp rank: %d"
-msgstr ""
+msgstr "Rango PvP: %d"
 
 #: src/gui/botcheckerwindow.cpp:263
-#, fuzzy
 msgid "Bot Checker"
-msgstr "Finestra della Chat"
+msgstr "Bot Checker"
 
 #: src/gui/botcheckerwindow.cpp:293 src/gui/setup_players.cpp:60
 msgid "Name"
@@ -377,13 +349,12 @@ msgid "Talk"
 msgstr "Parla"
 
 #: src/gui/botcheckerwindow.cpp:296
-#, fuzzy
 msgid "Move"
-msgstr "Muoviti verso l'alto"
+msgstr "Movimento"
 
 #: src/gui/botcheckerwindow.cpp:297
 msgid "Result"
-msgstr ""
+msgstr "Risultato"
 
 #: src/gui/botcheckerwindow.cpp:307 src/gui/npcdialog.cpp:121
 msgid "Reset"
@@ -406,7 +377,7 @@ msgstr "Prezzo: %s / Totale: %s"
 #: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:111
 #: src/gui/sell.cpp:88 src/gui/statuswindow.cpp:938
 msgid "+"
-msgstr ""
+msgstr "+"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
@@ -414,7 +385,7 @@ msgstr ""
 #: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:112
 #: src/gui/sell.cpp:89 src/gui/statuswindow.cpp:950
 msgid "-"
-msgstr ""
+msgstr "-"
 
 #: src/gui/buydialog.cpp:96 src/gui/quitdialog.cpp:47
 #: src/gui/quitdialog.cpp:52 src/gui/quitdialog.cpp:53 src/gui/sell.cpp:91
@@ -461,24 +432,22 @@ msgid "Account: %s"
 msgstr "Account: %s"
 
 #: src/gui/changeemaildialog.cpp:52
-#, fuzzy
 msgid "Type new email address twice:"
-msgstr "Inserire il nuovo indirizzo email due volte:"
+msgstr "Scrivi due volte il nuovo indirizzo email:"
 
 #: src/gui/changeemaildialog.cpp:130
-#, fuzzy, c-format
+#, c-format
 msgid "The new email address needs to be at least %d characters long."
-msgstr "Il nome utente deve contenere almeno %d caratteri."
+msgstr "Il nuovo indirizzo email deve essere lungo almeno %d caratteri."
 
 #: src/gui/changeemaildialog.cpp:137
-#, fuzzy, c-format
+#, c-format
 msgid "The new email address needs to be less than %d characters long."
-msgstr "Il nome utente deve avere meno di %d caratteri."
+msgstr "Il nuovo indirizzo email deve essere lungo meno di %d caratteri."
 
 #: src/gui/changeemaildialog.cpp:144
-#, fuzzy
 msgid "The email address entries mismatch."
-msgstr "Il nuovo indirizzo e-mail esiste già."
+msgstr ""
 
 #: src/gui/changepassworddialog.cpp:48 src/gui/changepassworddialog.cpp:57
 #: src/gui/charselectdialog.cpp:134
@@ -491,23 +460,22 @@ msgid "Password:"
 msgstr "Password:"
 
 #: src/gui/changepassworddialog.cpp:64
-#, fuzzy
 msgid "Type new password twice:"
-msgstr "Inserire la nuova password due volte:"
+msgstr "Digita due volte la nuova password:"
 
 #: src/gui/changepassworddialog.cpp:112
 msgid "Enter the old password first."
-msgstr ""
+msgstr "Inserisci prima la nuova password."
 
 #: src/gui/changepassworddialog.cpp:118
-#, fuzzy, c-format
+#, c-format
 msgid "The new password needs to be at least %d characters long."
-msgstr "La password deve essere lunga almeno %d caratteri."
+msgstr "La nuova password deve essere lunga almeno %d caratteri."
 
 #: src/gui/changepassworddialog.cpp:125
-#, fuzzy, c-format
+#, c-format
 msgid "The new password needs to be less than %d characters long."
-msgstr "La password deve contenere meno di %d caratteri."
+msgstr "La nuova password deve essere più corta di %d caratteri."
 
 #: src/gui/changepassworddialog.cpp:132
 msgid "The new password entries mismatch."
@@ -527,24 +495,22 @@ msgstr "Nome:"
 #: src/gui/charcreatedialog.cpp:74 src/gui/charcreatedialog.cpp:79
 #: src/gui/charcreatedialog.cpp:85 src/gui/outfitwindow.cpp:78
 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:77 src/gui/charcreatedialog.cpp:80
 #: src/gui/charcreatedialog.cpp:86 src/gui/outfitwindow.cpp:77
 msgid "<"
-msgstr ""
+msgstr "<"
 
 #: src/gui/charcreatedialog.cpp:78
-#, fuzzy
 msgid "Hair color:"
-msgstr "Colore Capelli:"
+msgstr "Colore dei capelli:"
 
 #: src/gui/charcreatedialog.cpp:81
-#, fuzzy
 msgid "Hair style:"
-msgstr "Stile Capelli:"
+msgstr "Taglio di capelli:"
 
 #: src/gui/charcreatedialog.cpp:87
 msgid "Race:"
@@ -595,7 +561,7 @@ msgstr "Gestione dell'account e del personaggio"
 
 #: src/gui/charselectdialog.cpp:133
 msgid "Switch Login"
-msgstr ""
+msgstr "Cambia login"
 
 #: src/gui/charselectdialog.cpp:147 src/gui/unregisterdialog.cpp:48
 #: src/gui/unregisterdialog.cpp:56
@@ -603,9 +569,8 @@ msgid "Unregister"
 msgstr "Cancella registrazione"
 
 #: src/gui/charselectdialog.cpp:156
-#, fuzzy
 msgid "Change Email"
-msgstr "Cambia l'indirizzo Email"
+msgstr "Cambia email"
 
 #: src/gui/charselectdialog.cpp:377 src/gui/serverdialog.cpp:264
 #: src/gui/setup_players.cpp:243 src/gui/shopwindow.cpp:118
@@ -614,84 +579,73 @@ msgid "Delete"
 msgstr "Elimina"
 
 #: src/gui/charselectdialog.cpp:435
-#, fuzzy
 msgid "Choose"
-msgstr "Chiudi"
+msgstr "Scegli"
 
 #: src/gui/charselectdialog.cpp:438
-#, fuzzy, c-format
+#, c-format
 msgid "Level %d"
-msgstr "Livello: %d"
+msgstr "Livello %d"
 
 #: src/gui/charselectdialog.cpp:449 src/gui/charselectdialog.cpp:450
 msgid "(empty)"
-msgstr ""
+msgstr "(vuoto)"
 
 #: src/gui/chatwindow.cpp:112
-#, fuzzy
 msgid "default"
 msgstr "Predefinito"
 
 #: src/gui/chatwindow.cpp:113
 msgid "black"
-msgstr ""
+msgstr "Nero"
 
 #: src/gui/chatwindow.cpp:114
-#, fuzzy
 msgid "red"
-msgstr "Amico"
+msgstr "Rosso"
 
 #: src/gui/chatwindow.cpp:115
-#, fuzzy
 msgid "green"
-msgstr "Verde: "
+msgstr "Verde"
 
 #: src/gui/chatwindow.cpp:116
-#, fuzzy
 msgid "blue"
-msgstr "Blu: "
+msgstr "Blu"
 
 #: src/gui/chatwindow.cpp:117
 msgid "gold"
-msgstr ""
+msgstr "Oro"
 
 #: src/gui/chatwindow.cpp:118
-#, fuzzy
 msgid "yellow"
-msgstr "Basso"
+msgstr "Giallo"
 
 #: src/gui/chatwindow.cpp:119
-#, fuzzy
 msgid "pink"
-msgstr "Collegamento ipertestuale"
+msgstr "Rosa"
 
 #: src/gui/chatwindow.cpp:120
 msgid "purple"
-msgstr ""
+msgstr "Viola"
 
 #: src/gui/chatwindow.cpp:121
 msgid "grey"
-msgstr ""
+msgstr "Grigio"
 
 #: src/gui/chatwindow.cpp:122
-#, fuzzy
 msgid "brown"
-msgstr "Deviato"
+msgstr "Marrone"
 
 #: src/gui/chatwindow.cpp:123
-#, fuzzy
 msgid "rainbow 1"
-msgstr "Arcobaleno"
+msgstr "Arcobaleno 1"
 
 #: src/gui/chatwindow.cpp:124
-#, fuzzy
 msgid "rainbow 2"
-msgstr "Arcobaleno"
+msgstr "Arcobaleno 2"
 
 #: src/gui/chatwindow.cpp:125
-#, fuzzy
 msgid "rainbow 3"
-msgstr "Arcobaleno"
+msgstr "Arcobaleno 3"
 
 #: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:91
 #: src/gui/login.cpp:76 src/gui/setup_players.cpp:216
@@ -706,9 +660,9 @@ msgid "Chat"
 msgstr "Chat"
 
 #: src/gui/chatwindow.cpp:585
-#, fuzzy, c-format
+#, c-format
 msgid "Present: %s; %d players are present."
-msgstr "Sono presenti %d giocatori."
+msgstr "Presente: %s; %d giocatori sono presenti."
 
 #: src/gui/chatwindow.cpp:968
 #, c-format
@@ -724,103 +678,92 @@ msgid "No"
 msgstr "No"
 
 #: src/gui/confirmdialog.cpp:50
-#, fuzzy
 msgid "Ignore"
-msgstr "Ignorato"
+msgstr "Ignora"
 
 #: src/gui/debugwindow.cpp:64 src/gui/debugwindow.cpp:75
 #, c-format
 msgid "%d FPS (Software)"
-msgstr ""
+msgstr "%d FPS (Software)"
 
 #: src/gui/debugwindow.cpp:68
 #, c-format
 msgid "%d FPS (fast OpenGL)"
-msgstr ""
+msgstr "%d FPS (OpenGL veloce)"
 
 #: src/gui/debugwindow.cpp:71
 #, c-format
 msgid "%d FPS (old OpenGL)"
-msgstr ""
+msgstr "%d FPS (OpenGL vecchio)"
 
 #: src/gui/debugwindow.cpp:78
 #, c-format
 msgid "%d FPS"
-msgstr ""
+msgstr "%d FPS"
 
 #: src/gui/debugwindow.cpp:79 src/gui/debugwindow.cpp:182
 #: src/gui/debugwindow.cpp:205
-#, fuzzy
 msgid "Music:"
-msgstr "Volume musica"
+msgstr "Musica:"
 
 #: src/gui/debugwindow.cpp:80 src/gui/debugwindow.cpp:186
 #: src/gui/debugwindow.cpp:207
-#, fuzzy
 msgid "Map:"
-msgstr "Nome: %s"
+msgstr "Mappa:"
 
 #: src/gui/debugwindow.cpp:81 src/gui/debugwindow.cpp:184
 #: src/gui/debugwindow.cpp:206
-#, fuzzy
 msgid "Minimap:"
-msgstr "Mini mappa"
+msgstr "Mini mappa:"
 
 #: src/gui/debugwindow.cpp:82
 #, c-format
 msgid "Cursor: (%d, %d)"
-msgstr ""
+msgstr "Cursore: (%d, %d)"
 
 #: src/gui/debugwindow.cpp:83 src/gui/debugwindow.cpp:193
-#, fuzzy, c-format
+#, c-format
 msgid "Particle count: %d"
-msgstr "Effetti particelle"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:85
-#, fuzzy, c-format
+#, c-format
 msgid "Map actors count: %d"
-msgstr "Statistiche personaggio OK"
+msgstr ""
 
 #: src/gui/debugwindow.cpp:91 src/gui/debugwindow.cpp:127
 #: src/gui/debugwindow.cpp:132
-#, fuzzy
 msgid "Player Position:"
-msgstr "Il giocatore colpisce il mostro"
+msgstr "Posizione giocatore:"
 
 #: src/gui/debugwindow.cpp:92 src/gui/debugwindow.cpp:139
 #: src/gui/debugwindow.cpp:164
-#, fuzzy
 msgid "Target:"
-msgstr "Muoviti verso sinistra"
+msgstr "Target:"
 
 #: src/gui/debugwindow.cpp:93 src/gui/debugwindow.cpp:144
 #: src/gui/debugwindow.cpp:165
-#, fuzzy
 msgid "Target Id:"
-msgstr "Punta Giocatore"
+msgstr "Target ID:"
 
 #: src/gui/debugwindow.cpp:94 src/gui/debugwindow.cpp:148
 #: src/gui/debugwindow.cpp:153 src/gui/debugwindow.cpp:166
-#, fuzzy
 msgid "Target Level:"
-msgstr "Punta Giocatore"
+msgstr "Livello Target"
 
 #: src/gui/debugwindow.cpp:95 src/gui/debugwindow.cpp:156
 #: src/gui/debugwindow.cpp:167
-#, fuzzy
 msgid "Target Party:"
-msgstr "Punta Giocatore"
+msgstr "Party del Target:"
 
 #: src/gui/debugwindow.cpp:96 src/gui/debugwindow.cpp:159
 #: src/gui/debugwindow.cpp:168
-#, fuzzy
 msgid "Target Guild:"
-msgstr "Punta Giocatore"
+msgstr "Gilda del Target"
 
 #: src/gui/debugwindow.cpp:180 src/gui/debugwindow.cpp:203
-#, fuzzy
 msgid "Cursor:"
-msgstr "Cursore personalizzato"
+msgstr "Cursore:"
 
 #: src/gui/debugwindow.cpp:197 src/gui/debugwindow.cpp:210
 msgid "Map actors count:"
@@ -829,21 +772,21 @@ msgstr ""
 #: src/gui/debugwindow.cpp:218
 #, c-format
 msgid "Ping: %d ms"
-msgstr ""
+msgstr "Ping: %d ms"
 
 #: src/gui/debugwindow.cpp:223
 msgid "Ping: ? ms"
-msgstr ""
+msgstr "Ping: ? ms"
 
 #: src/gui/debugwindow.cpp:226
 #, c-format
 msgid "In: %d bytes/s"
-msgstr ""
+msgstr "In: %d bytes/s"
 
 #: src/gui/debugwindow.cpp:228
 #, c-format
 msgid "Out: %d bytes/s"
-msgstr ""
+msgstr "Out: %d bytes/s"
 
 #: src/gui/editdialog.cpp:44 src/gui/itemamountwindow.cpp:206
 #: src/gui/okdialog.cpp:43 src/gui/quitdialog.cpp:57 src/gui/textdialog.cpp:44
@@ -860,7 +803,7 @@ msgstr "Equipaggiamento"
 #: src/gui/popupmenu.cpp:1242 src/gui/popupmenu.cpp:1325
 #: src/gui/popupmenu.cpp:1365
 msgid "Unequip"
-msgstr "Rimuovi"
+msgstr "Togli"
 
 #: src/gui/helpwindow.cpp:41
 msgid "Help"
@@ -882,25 +825,23 @@ msgstr "Slot:"
 
 #: src/gui/inventorywindow.cpp:112
 msgid "Filter:"
-msgstr ""
+msgstr "Filtro:"
 
 #: src/gui/inventorywindow.cpp:113
-#, fuzzy
 msgid "Sort:"
-msgstr "Porta:"
+msgstr "Ordina per:"
 
 #: src/gui/inventorywindow.cpp:119
-#, fuzzy
 msgid "na"
-msgstr "mana"
+msgstr "na"
 
 #: src/gui/inventorywindow.cpp:120
 msgid "az"
-msgstr ""
+msgstr "az"
 
 #: src/gui/inventorywindow.cpp:121
 msgid "id"
-msgstr ""
+msgstr "id"
 
 #: src/gui/inventorywindow.cpp:125 src/gui/inventorywindow.cpp:468
 #: src/gui/inventorywindow.cpp:477 src/gui/popupmenu.cpp:1244
@@ -918,9 +859,8 @@ msgstr "Usa"
 #: src/gui/inventorywindow.cpp:140 src/gui/inventorywindow.cpp:574
 #: src/gui/popupmenu.cpp:1250 src/gui/popupmenu.cpp:1335
 #: src/gui/popupmenu.cpp:1373
-#, fuzzy
 msgid "Drop..."
-msgstr "Lascia"
+msgstr "Lascia..."
 
 #: src/gui/inventorywindow.cpp:141 src/gui/popupmenu.cpp:1255
 #: src/gui/popupmenu.cpp:1340 src/gui/popupmenu.cpp:1378
@@ -930,7 +870,7 @@ msgstr "Dividi"
 #: src/gui/inventorywindow.cpp:142 src/gui/outfitwindow.cpp:57
 #: src/gui/popupmenu.cpp:436
 msgid "Outfits"
-msgstr ""
+msgstr "Attrezzatura"
 
 #: src/gui/inventorywindow.cpp:145
 msgid "Weight:"
@@ -940,7 +880,7 @@ msgstr "Peso:"
 #: src/gui/popupmenu.cpp:1223 src/gui/popupmenu.cpp:1343
 #: src/gui/popupmenu.cpp:1381 src/gui/setup.cpp:66
 msgid "Store"
-msgstr ""
+msgstr "Magazzino"
 
 #: src/gui/inventorywindow.cpp:171 src/gui/popupmenu.cpp:1262
 msgid "Retrieve"
@@ -978,158 +918,150 @@ msgstr "Seleziona la quantità di oggetti da dividere."
 
 #: src/gui/itemamountwindow.cpp:274
 msgid "Add to buy shop."
-msgstr ""
+msgstr "Aggiungi allo shop di acquisto."
 
 #: src/gui/itemamountwindow.cpp:277
 msgid "Add to sell shop."
-msgstr ""
+msgstr "Aggiungi allo shop di vendita."
 
 #: src/gui/itemamountwindow.cpp:280
-#, fuzzy
 msgid "Unknown."
-msgstr "Errore sconosciuto"
+msgstr "Sconosciuto"
 
 #: src/gui/itempopup.cpp:171 src/gui/itempopup.cpp:177
 msgid ", "
-msgstr ""
+msgstr ","
 
 #: src/gui/itempopup.cpp:187
-#, fuzzy, c-format
+#, c-format
 msgid "Weight: %s"
-msgstr "Peso: "
+msgstr "Peso: %s"
 
 #: src/gui/killstats.cpp:43 src/gui/windowmenu.cpp:66
-#, fuzzy
 msgid "Kill stats"
-msgstr "Finestra degli Status"
+msgstr "Statistiche uccisioni"
 
 #: src/gui/killstats.cpp:61
-#, fuzzy
 msgid "Reset stats"
-msgstr "Reimposta"
+msgstr "Reset statistiche"
 
 #: src/gui/killstats.cpp:62
-#, fuzzy
 msgid "Reset timer"
-msgstr "Reimposta"
+msgstr "Reset timer"
 
 #: src/gui/killstats.cpp:66
-#, fuzzy
 msgid "Level: "
-msgstr "Livello: %d"
+msgstr "Livello: "
 
 #: src/gui/killstats.cpp:70
-#, fuzzy
 msgid "Exp: "
-msgstr "Esperienza:"
+msgstr "Exp: "
 
 #: src/gui/killstats.cpp:71
-#, fuzzy
 msgid " Left: "
-msgstr "Muoviti verso sinistra"
+msgstr " Rimanente: "
 
 #: src/gui/killstats.cpp:74
 msgid " exp, Avg Mob for 1%: ?"
-msgstr ""
+msgstr "exp, Mob Avg per l'1%: ?"
 
 #: src/gui/killstats.cpp:75 src/gui/killstats.cpp:128
 msgid "Kills: ?, Total Exp: ?"
-msgstr ""
+msgstr "Uccisioni: ?, Exp totale: ?"
 
 #: src/gui/killstats.cpp:76 src/gui/killstats.cpp:129
 msgid "Avg Exp: ?, No. of Avg mob to next level: ?"
-msgstr ""
+msgstr "Avg Exp: ?, N. di media mob per il livello successivo: ?"
 
 #: src/gui/killstats.cpp:77 src/gui/killstats.cpp:146
 msgid "Kills/Min: ?, Exp/Min: ?"
-msgstr ""
+msgstr "Uccisioni al minuto: ?, Exp al minuto: ?"
 
 #: src/gui/killstats.cpp:79
 msgid "Exp speed per 1 min: ?"
-msgstr ""
+msgstr "Velocità exp al minuto: ?"
 
 #: src/gui/killstats.cpp:80
 msgid "Time for next level per 1 min: ?"
-msgstr ""
+msgstr "Tempo per il prossimo livello per 1 min: ?"
 
 #: src/gui/killstats.cpp:81
 msgid "Exp speed per 5 min: ?"
-msgstr ""
+msgstr "Velocità di Exp per 5 min:?"
 
 #: src/gui/killstats.cpp:82
 msgid "Time for next level per 5 min: ?"
-msgstr ""
+msgstr "Tempo per il prossimo livello per 5 min: ?"
 
 #: src/gui/killstats.cpp:83
 msgid "Exp speed per 15 min: ?"
-msgstr ""
+msgstr "Exp velocità per 15 min: ?"
 
 #: src/gui/killstats.cpp:84
 msgid "Time for Next level per 15 min: ?"
-msgstr ""
+msgstr "Tempo per il prossimo livello per 15 min:?"
 
 #: src/gui/killstats.cpp:86
 msgid "Last kill exp: ?"
-msgstr ""
+msgstr "Exp dell'ultima uccisione: ?"
 
 #: src/gui/killstats.cpp:87
 msgid "Time before jacko spawn: ?"
-msgstr ""
+msgstr "Tempo prima dell'apparizione di JackO"
 
 #: src/gui/killstats.cpp:270
 #, c-format
 msgid "Exp Speed per 1 min: %d"
-msgstr ""
+msgstr "Exp Speed ​​per 1 min: %d"
 
 #: src/gui/killstats.cpp:275 src/gui/killstats.cpp:291
 #: src/gui/killstats.cpp:307
 #, c-format
 msgid "  Time For Next Level: %f"
-msgstr ""
+msgstr "Tempo per il prossimo livello: %f"
 
 #: src/gui/killstats.cpp:281 src/gui/killstats.cpp:297
 #: src/gui/killstats.cpp:313
 msgid "  Time For Next Level: ?"
-msgstr ""
+msgstr "Tempo per il prossimo livello: ?"
 
 #: src/gui/killstats.cpp:286
 #, c-format
 msgid "Exp Speed per 5 min: %d"
-msgstr ""
+msgstr "Exp Speed ​​per 5 minuti: %d"
 
 #: src/gui/killstats.cpp:302
 #, c-format
 msgid "Exp Speed per 15 min: %d"
-msgstr ""
+msgstr "Exp Speed ​​per 15 min: %d"
 
 #: src/gui/killstats.cpp:331
 msgid "Time before jacko spawn: jacko alive"
-msgstr ""
+msgstr "Tempo prima dell'apparizione di Jacko: Jacko è vivo!"
 
 #: src/gui/killstats.cpp:335 src/gui/killstats.cpp:345
 msgid "Time before jacko spawn: "
-msgstr ""
+msgstr "Tempo prima dell'apparizione di Jacko:"
 
 #: src/gui/killstats.cpp:336
 msgid "?"
-msgstr ""
+msgstr "?"
 
 #: src/gui/killstats.cpp:341
 msgid "Time before jacko spawn: jacko spawning"
-msgstr ""
+msgstr "Tempo prima dell'apparizione di JackO: JackO sta arrivando."
 
 #: src/gui/login.cpp:57
 msgid "Normal"
-msgstr ""
+msgstr "Normale"
 
 #: src/gui/login.cpp:58
-#, fuzzy
 msgid "Auto Close"
-msgstr "Chiudi"
+msgstr "Chiusura automatica"
 
 #: src/gui/login.cpp:59
 msgid "Skip"
-msgstr ""
+msgstr "Salta"
 
 #: src/gui/login.cpp:84 src/gui/login.cpp:120
 msgid "Login"
@@ -1142,25 +1074,23 @@ msgstr "Server:"
 
 #: src/gui/login.cpp:93
 msgid "Custom update host"
-msgstr ""
+msgstr "Aggiornamento host"
 
 #: src/gui/login.cpp:107
-#, fuzzy
 msgid "Remember username"
-msgstr "Ricorda nome utente"
+msgstr "Ricorda username"
 
 #: src/gui/login.cpp:108
 msgid "Update:"
-msgstr ""
+msgstr "Aggiornamento:"
 
 #: src/gui/login.cpp:118 src/gui/register.cpp:64 src/gui/register.cpp:79
 msgid "Register"
 msgstr "Registra"
 
 #: src/gui/login.cpp:119
-#, fuzzy
 msgid "Change Server"
-msgstr "Server"
+msgstr "Cambia server"
 
 #: src/gui/minimap.cpp:47 src/gui/minimap.cpp:87
 msgid "Map"
@@ -1183,31 +1113,28 @@ msgid "job bar"
 msgstr ""
 
 #: src/gui/ministatus.cpp:89
-#, fuzzy
 msgid "weight bar"
-msgstr "Peso: "
+msgstr ""
 
 #: src/gui/ministatus.cpp:92
 msgid "inventory slots bar"
 msgstr ""
 
 #: src/gui/ministatus.cpp:95
-#, fuzzy
 msgid "money bar"
-msgstr "Il mostro colpisce il giocatore"
+msgstr ""
 
 #: src/gui/ministatus.cpp:98
 msgid "arrows bar"
 msgstr ""
 
 #: src/gui/ministatus.cpp:101
-#, fuzzy
 msgid "status bar"
-msgstr "Stato"
+msgstr ""
 
 #: src/gui/ministatus.cpp:287 src/gui/ministatus.cpp:327
 msgid "Need"
-msgstr ""
+msgstr "Bisogno"
 
 #: src/gui/npcdialog.cpp:49
 msgid "Waiting for server"
@@ -1226,15 +1153,13 @@ msgid "NPC"
 msgstr "NPC"
 
 #: src/gui/npcdialog.cpp:105 src/gui/popupmenu.cpp:475
-#, fuzzy
 msgid "Clear"
-msgstr "Asta"
+msgstr "Cancella"
 
 #. TRANSLATORS: Please leave the \n sequences intact.
 #: src/gui/npcdialog.cpp:209
-#, fuzzy
 msgid "> Next"
-msgstr "Prossimo"
+msgstr ""
 
 #: src/gui/npcpostdialog.cpp:46
 msgid "To:"
@@ -1251,44 +1176,39 @@ msgstr "La lettera non è valida oppure non è stato possibile inviarla."
 #: src/gui/outfitwindow.cpp:79 src/gui/outfitwindow.cpp:850
 #, c-format
 msgid "Outfit: %d"
-msgstr ""
+msgstr "Outfit: %d"
 
 #: src/gui/outfitwindow.cpp:81 src/gui/outfitwindow.cpp:852
-#, fuzzy, c-format
+#, c-format
 msgid "Key: %s"
-msgstr "Soldi: %s"
+msgstr "Chiave: %s"
 
 #: src/gui/outfitwindow.cpp:84
-#, fuzzy
 msgid "Unequip first"
-msgstr "Rimuovi"
+msgstr "Rimuovi prima"
 
 #: src/gui/outfitwindow.cpp:87
 msgid "Away outfit"
-msgstr ""
+msgstr "Away outfit"
 
 #: src/gui/popupmenu.cpp:124 src/gui/popupmenu.cpp:529
-#, fuzzy
 msgid "@@trade|Trade@@"
-msgstr "@@trade|Scambia Con %s@@"
+msgstr "@@trade|Scambio@@"
 
 #. TRANSLATORS: Attacking a player.
 #: src/gui/popupmenu.cpp:126 src/gui/popupmenu.cpp:246
 #: src/gui/popupmenu.cpp:530
-#, fuzzy
 msgid "@@attack|Attack@@"
-msgstr "@@attack|Attacca %s@@"
+msgstr "@@attack|Attacco@@"
 
 #. TRANSLATORS: Whispering a player.
 #: src/gui/popupmenu.cpp:128 src/gui/popupmenu.cpp:301
-#, fuzzy
 msgid "@@whisper|Whisper@@"
-msgstr "@@usa|Usa@@"
+msgstr "@@whisper|Sussurro@@"
 
 #: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:534
-#, fuzzy
 msgid "@@heal|Heal@@"
-msgstr "@@cancel|Cancella@@"
+msgstr "@@heal|Cura@@"
 
 #: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:307
 #: src/gui/popupmenu.cpp:540
@@ -1300,16 +1220,14 @@ msgstr ""
 #: src/gui/popupmenu.cpp:314 src/gui/popupmenu.cpp:332
 #: src/gui/popupmenu.cpp:541 src/gui/popupmenu.cpp:547
 #: src/gui/popupmenu.cpp:565
-#, fuzzy
 msgid "@@disregard|Disregard@@"
-msgstr "@@disregard|Disprezza %s@@"
+msgstr "@@disregard|Disprezza@@"
 
 #: src/gui/popupmenu.cpp:140 src/gui/popupmenu.cpp:146
 #: src/gui/popupmenu.cpp:309 src/gui/popupmenu.cpp:315
 #: src/gui/popupmenu.cpp:542 src/gui/popupmenu.cpp:548
-#, fuzzy
 msgid "@@ignore|Ignore@@"
-msgstr "@@ignore|Ignora %s@@"
+msgstr "@@ignore|Ignora@@"
 
 #: src/gui/popupmenu.cpp:141 src/gui/popupmenu.cpp:147
 #: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:158
@@ -1317,63 +1235,56 @@ msgstr "@@ignore|Ignora %s@@"
 #: src/gui/popupmenu.cpp:322 src/gui/popupmenu.cpp:327
 #: src/gui/popupmenu.cpp:543 src/gui/popupmenu.cpp:549
 #: src/gui/popupmenu.cpp:555 src/gui/popupmenu.cpp:560
-#, fuzzy
 msgid "@@erase|Erase@@"
-msgstr "@@usa|Usa@@"
+msgstr "@@erase|Rimuovi dallo schermo@@"
 
 #: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:157
 #: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:320
 #: src/gui/popupmenu.cpp:326 src/gui/popupmenu.cpp:331
 #: src/gui/popupmenu.cpp:553 src/gui/popupmenu.cpp:559
 #: src/gui/popupmenu.cpp:564
-#, fuzzy
 msgid "@@unignore|Unignore@@"
-msgstr "@@unignore|Non ignorare %s@@"
+msgstr "@@unignore|Annulla ignoro@@"
 
 #: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:164
 #: src/gui/popupmenu.cpp:321 src/gui/popupmenu.cpp:333
 #: src/gui/popupmenu.cpp:554 src/gui/popupmenu.cpp:566
-#, fuzzy
 msgid "@@ignore|Completely ignore@@"
-msgstr "@@ignore|Ignora completamente %s@@"
+msgstr "@@ignore|Ignora completamente@@"
 
 #: src/gui/popupmenu.cpp:172 src/gui/popupmenu.cpp:341
 #: src/gui/popupmenu.cpp:574
 msgid "@@follow|Follow@@"
-msgstr ""
+msgstr "@@follow|Segui@@"
 
 #: src/gui/popupmenu.cpp:173 src/gui/popupmenu.cpp:342
 #: src/gui/popupmenu.cpp:575
 msgid "@@imitation|Imitation@@"
-msgstr ""
+msgstr "@@imitation|Imita@@"
 
 #: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:594
-#, fuzzy
 msgid "@@party|Invite to party@@"
-msgstr "/party > Invita un utente nel party"
+msgstr "@@party|Invita nel party@@"
 
 #: src/gui/popupmenu.cpp:188 src/gui/popupmenu.cpp:350
 #: src/gui/popupmenu.cpp:599
-#, fuzzy
 msgid "@@kick party|Kick from party@@"
-msgstr "@@admin-kick|Espelli giocatore@@"
+msgstr "@@kick party|Escludi dal party@@"
 
 #: src/gui/popupmenu.cpp:203 src/gui/popupmenu.cpp:360
 #: src/gui/popupmenu.cpp:613
-#, fuzzy
 msgid "@@guild-kick|Kick from guild@@"
-msgstr "@@admin-kick|Espelli giocatore@@"
+msgstr "@@guild-kick|Escludi dalla Gilda@@"
 
 #: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:361
 #: src/gui/popupmenu.cpp:615
 msgid "@@guild-pos|Change pos in guild >@@"
-msgstr ""
+msgstr "@@guild-pos|Cambia rango nella Gilda >@@"
 
 #: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:365
 #: src/gui/popupmenu.cpp:620
-#, fuzzy
 msgid "@@guild|Invite to guild@@"
-msgstr "/party > Invita un utente nel party"
+msgstr "@@guild|Invita nella Gilda@@"
 
 #: src/gui/popupmenu.cpp:217
 msgid "@@admin-kick|Kick player@@"
@@ -1381,43 +1292,38 @@ msgstr "@@admin-kick|Espelli giocatore@@"
 
 #: src/gui/popupmenu.cpp:219
 msgid "@@nuke|Nuke@@"
-msgstr ""
+msgstr "@@nuke|Elimina completamente dallo schermo@@"
 
 #: src/gui/popupmenu.cpp:220 src/gui/popupmenu.cpp:240
 #: src/gui/popupmenu.cpp:576
 msgid "@@move|Move@@"
-msgstr ""
+msgstr "@@move|Move@@"
 
 #: src/gui/popupmenu.cpp:221 src/gui/popupmenu.cpp:577
-#, fuzzy
 msgid "@@undress|Undress@@"
-msgstr "@@unignore|Non ignorare %s@@"
+msgstr "@@undress|Svesti@@"
 
 #: src/gui/popupmenu.cpp:226 src/gui/popupmenu.cpp:237
 #: src/gui/popupmenu.cpp:372 src/gui/popupmenu.cpp:582
 msgid "@@buy|Buy@@"
-msgstr ""
+msgstr "@@buy|Compra@@"
 
 #: src/gui/popupmenu.cpp:227 src/gui/popupmenu.cpp:238
 #: src/gui/popupmenu.cpp:373 src/gui/popupmenu.cpp:583
-#, fuzzy
 msgid "@@sell|Sell@@"
-msgstr "@@usa|Usa@@"
+msgstr "@@sell|Sell@@"
 
 #: src/gui/popupmenu.cpp:235
-#, fuzzy
 msgid "@@talk|Talk@@"
-msgstr "@@attack|Attacca %s@@"
+msgstr "@@talk|Parla@@"
 
 #: src/gui/popupmenu.cpp:249
-#, fuzzy
 msgid "@@admin-kick|Kick@@"
-msgstr "@@admin-kick|Espelli giocatore@@"
+msgstr "@@admin-kick|Escludi@@"
 
 #: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:376
-#, fuzzy
 msgid "@@name|Add name to chat@@"
-msgstr "@@name|Aggiungi nome alla conversazione@@"
+msgstr "@@name|Aggiungi il nome alla chat@@"
 
 #: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:284
 #: src/gui/popupmenu.cpp:380 src/gui/popupmenu.cpp:408
@@ -1430,15 +1336,13 @@ msgstr "@@cancel|Cancella@@"
 #: src/gui/popupmenu.cpp:279
 #, c-format
 msgid "@@player_%u|%s >@@"
-msgstr ""
+msgstr "@@player_%u|%s >@@"
 
 #: src/gui/popupmenu.cpp:403
-#, fuzzy
 msgid "@@pickup|Pick up@@"
-msgstr "@@pickup|Raccogli %s@@"
+msgstr "@@pickup|Raccogli@@"
 
 #: src/gui/popupmenu.cpp:404
-#, fuzzy
 msgid "@@chat|Add to chat@@"
 msgstr "@@chat|Aggiungi alla chat@@"
 
@@ -1467,51 +1371,44 @@ msgid "@@load old spells|Load old spells@@"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:455
-#, fuzzy
 msgid "@@edit spell|Edit spell@@"
-msgstr "@@usa|Usa@@"
+msgstr ""
 
 #: src/gui/popupmenu.cpp:473
 msgid "@@chat close|Close@@"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:481
-#, fuzzy
 msgid "Disable highlight"
-msgstr "Evidenziazione scheda"
+msgstr ""
 
 #: src/gui/popupmenu.cpp:486
-#, fuzzy
 msgid "Enable highlight"
-msgstr "Evidenziazione scheda"
+msgstr ""
 
 #: src/gui/popupmenu.cpp:491
 msgid "Dont remove name"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:496
-#, fuzzy
 msgid "Remove name"
-msgstr "Ricorda nome utente"
+msgstr ""
 
 #: src/gui/popupmenu.cpp:501
-#, fuzzy
 msgid "Enable away"
-msgstr "Impossibile acquistare."
+msgstr ""
 
 #: src/gui/popupmenu.cpp:506
-#, fuzzy
 msgid "Disable away"
-msgstr "Abilita/Disabilita Scambi"
+msgstr ""
 
 #: src/gui/popupmenu.cpp:512
 msgid "@@leave party|Leave@@"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:633
-#, fuzzy
 msgid "Change guild position"
-msgstr "Cambia"
+msgstr ""
 
 #: src/gui/popupmenu.cpp:646
 #, c-format
@@ -1527,59 +1424,49 @@ msgid "Name:                    "
 msgstr ""
 
 #: src/gui/popupmenu.cpp:1206
-#, fuzzy
 msgid "Add to trade"
-msgstr "@@chat|Aggiungi alla chat@@"
+msgstr ""
 
 #: src/gui/popupmenu.cpp:1212
-#, fuzzy
 msgid "Add to trade 10"
-msgstr "@@chat|Aggiungi alla chat@@"
+msgstr ""
 
 #: src/gui/popupmenu.cpp:1215
-#, fuzzy
 msgid "Add to trade half"
-msgstr "@@chat|Aggiungi alla chat@@"
+msgstr ""
 
 #: src/gui/popupmenu.cpp:1217
-#, fuzzy
 msgid "Add to trade all"
-msgstr "Storage"
+msgstr ""
 
 #: src/gui/popupmenu.cpp:1229
-#, fuzzy
 msgid "Store 10"
-msgstr "Storage"
+msgstr ""
 
 #: src/gui/popupmenu.cpp:1232
 msgid "Store half"
 msgstr ""
 
 #: src/gui/popupmenu.cpp:1234
-#, fuzzy
 msgid "Store all"
-msgstr "Storage"
+msgstr ""
 
 #: src/gui/popupmenu.cpp:1268
-#, fuzzy
 msgid "Retrieve 10"
-msgstr "Recupera"
+msgstr ""
 
 #: src/gui/popupmenu.cpp:1271
-#, fuzzy
 msgid "Retrieve half"
-msgstr "Recupera"
+msgstr ""
 
 #: src/gui/popupmenu.cpp:1273
-#, fuzzy
 msgid "Retrieve all"
-msgstr "Recupera"
+msgstr ""
 
 #: src/gui/popupmenu.cpp:1276 src/gui/popupmenu.cpp:1344
 #: src/gui/popupmenu.cpp:1382
-#, fuzzy
 msgid "Add to chat"
-msgstr "@@chat|Aggiungi alla chat@@"
+msgstr ""
 
 #: src/gui/popupmenu.cpp:1303 src/gui/popupmenu.cpp:1348
 msgid "Load old item shortcuts"
@@ -1642,9 +1529,8 @@ msgid "Passwords do not match."
 msgstr "Le password non corrispondono."
 
 #: src/gui/serverdialog.cpp:212
-#, fuzzy
 msgid "Choose Your Server"
-msgstr "Scegliere il proprio server"
+msgstr ""
 
 #: src/gui/serverdialog.cpp:228
 msgid "Port:"
@@ -1655,23 +1541,20 @@ msgid "Use same ip for game sub servers"
 msgstr ""
 
 #: src/gui/serverdialog.cpp:246
-#, fuzzy
 msgid "Server type:"
-msgstr "Server:"
+msgstr ""
 
 #: src/gui/serverdialog.cpp:261
 msgid "Load"
 msgstr ""
 
 #: src/gui/serverdialog.cpp:262
-#, fuzzy
 msgid "Connect"
-msgstr "Connessione..."
+msgstr ""
 
 #: src/gui/serverdialog.cpp:263
-#, fuzzy
 msgid "Custom Server"
-msgstr "Cursore personalizzato"
+msgstr ""
 
 #: src/gui/serverdialog.cpp:370
 msgid "Please type both the address and the port of a server."
@@ -1683,9 +1566,8 @@ msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
 #: src/gui/serverdialog.cpp:518
-#, fuzzy
 msgid "Waiting for server..."
-msgstr "In attesa del server"
+msgstr ""
 
 #: src/gui/serverdialog.cpp:522
 msgid "Preparing download"
@@ -1717,14 +1599,12 @@ msgid "Enable gui sfx"
 msgstr ""
 
 #: src/gui/setup_audio.cpp:51
-#, fuzzy
 msgid "Enable music"
-msgstr "Abilita joystick"
+msgstr ""
 
 #: src/gui/setup_audio.cpp:52
-#, fuzzy
 msgid "Enable mumble voice chat"
-msgstr "Abilita joystick"
+msgstr ""
 
 #: src/gui/setup_audio.cpp:54
 msgid "Download music"
@@ -1743,9 +1623,8 @@ msgid "Music volume"
 msgstr "Volume musica"
 
 #: src/gui/setup_audio.cpp:118
-#, fuzzy
 msgid "Notice"
-msgstr "Nessun testo"
+msgstr ""
 
 #: src/gui/setup_audio.cpp:118
 msgid "You may have to restart your client if you want to download new music"
@@ -1776,9 +1655,8 @@ msgid "Enable chat Log"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:90
-#, fuzzy
 msgid "Enable trade tab"
-msgstr "Impossibile acquistare."
+msgstr ""
 
 #: src/gui/setup_chat.cpp:94
 msgid "Hide shop messages"
@@ -1789,14 +1667,12 @@ msgid "Show chat history"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:102
-#, fuzzy
 msgid "Enable battle tab"
-msgstr "Impossibile acquistare."
+msgstr ""
 
 #: src/gui/setup_chat.cpp:106
-#, fuzzy
 msgid "Show battle events"
-msgstr "Mostra nomi"
+msgstr ""
 
 #: src/gui/setup_chat.cpp:110
 msgid "Show chat colors list"
@@ -1816,9 +1692,8 @@ msgid "Limit max lines in chat"
 msgstr ""
 
 #: src/gui/setup_chat.cpp:132
-#, fuzzy
 msgid "Resize chat tabs if need"
-msgstr "Scheda Chat Successiva"
+msgstr ""
 
 #: src/gui/setup_colors.cpp:46
 msgid "This is what the color looks like"
@@ -1829,9 +1704,8 @@ msgid "Colors"
 msgstr "Colori"
 
 #: src/gui/setup_colors.cpp:72
-#, fuzzy
 msgid "Type:"
-msgstr "Tipo: "
+msgstr ""
 
 #: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:400
 msgid "Static"
@@ -1853,24 +1727,20 @@ msgid "Spectrum"
 msgstr "Gamma"
 
 #: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:312
-#, fuzzy
 msgid "Delay:"
-msgstr "Ritardo: "
+msgstr ""
 
 #: src/gui/setup_colors.cpp:109
-#, fuzzy
 msgid "Red:"
-msgstr "Rosso: "
+msgstr ""
 
 #: src/gui/setup_colors.cpp:124
-#, fuzzy
 msgid "Green:"
-msgstr "Verde: "
+msgstr ""
 
 #: src/gui/setup_colors.cpp:139
-#, fuzzy
 msgid "Blue:"
-msgstr "Blu: "
+msgstr ""
 
 #: src/gui/setup_colors.cpp:307
 msgid "Alpha:"
@@ -1917,9 +1787,8 @@ msgid "Assign"
 msgstr "Imposta"
 
 #: src/gui/setup_keyboard.cpp:91
-#, fuzzy
 msgid "Unassign"
-msgstr "Imposta"
+msgstr ""
 
 #: src/gui/setup_keyboard.cpp:95
 msgid "Default"
@@ -1942,9 +1811,8 @@ msgid "Auto target only reachable monsters"
 msgstr ""
 
 #: src/gui/setup_other.cpp:111
-#, fuzzy
 msgid "Highlight map portals"
-msgstr "Evidenziazione"
+msgstr ""
 
 #: src/gui/setup_other.cpp:116
 msgid "Highlight player attack range"
@@ -1959,42 +1827,36 @@ msgid "Cycle player targets"
 msgstr ""
 
 #: src/gui/setup_other.cpp:128
-#, fuzzy
 msgid "Cycle monster targets"
-msgstr "Mostra nomi"
+msgstr ""
 
 #: src/gui/setup_other.cpp:131
-#, fuzzy
 msgid "Enable bot checker"
-msgstr "Abilita joystick"
+msgstr ""
 
 #: src/gui/setup_other.cpp:134
-#, fuzzy
 msgid "Highlight floor items"
-msgstr "Evidenziazione"
+msgstr ""
 
 #: src/gui/setup_other.cpp:137
 msgid "Crazy move A program"
 msgstr ""
 
 #: src/gui/setup_other.cpp:148
-#, fuzzy
 msgid "Enable shop mode"
-msgstr "Abilita/Disabilita Scambi"
+msgstr ""
 
 #: src/gui/setup_other.cpp:151
 msgid "Enable buggy servers protection"
 msgstr ""
 
 #: src/gui/setup_other.cpp:154
-#, fuzzy
 msgid "Enable debug log"
-msgstr "Impossibile acquistare."
+msgstr ""
 
 #: src/gui/setup_other.cpp:157
-#, fuzzy
 msgid "Enable server side attack"
-msgstr "Impossibile acquistare."
+msgstr ""
 
 #: src/gui/setup_other.cpp:160
 msgid "Auto fix position"
@@ -2005,9 +1867,8 @@ msgid "Attack while moving"
 msgstr ""
 
 #: src/gui/setup_other.cpp:166
-#, fuzzy
 msgid "Enable quick stats"
-msgstr "Abilita joystick"
+msgstr ""
 
 #: src/gui/setup_other.cpp:169
 msgid "Show warps particles"
@@ -2022,9 +1883,8 @@ msgid "Show monster hp bar"
 msgstr ""
 
 #: src/gui/setup_other.cpp:178
-#, fuzzy
 msgid "Show own hp bar"
-msgstr "Mostra nomi"
+msgstr ""
 
 #: src/gui/setup_other.cpp:181
 msgid "Show job exp messages"
@@ -2079,9 +1939,8 @@ msgid "Put all whispers in tabs"
 msgstr "Sposta tutti i sussurri in schede"
 
 #: src/gui/setup_players.cpp:249
-#, fuzzy
 msgid "Show gender"
-msgstr "Mostra nomi"
+msgstr ""
 
 #: src/gui/setup_players.cpp:254
 msgid "Players"
@@ -2092,19 +1951,16 @@ msgid "When ignoring:"
 msgstr "Quando si ignora:"
 
 #: src/gui/setup_players.cpp:302
-#, fuzzy
 msgid "Show level"
-msgstr "Mostra nomi"
+msgstr ""
 
 #: src/gui/setup_players.cpp:306
-#, fuzzy
 msgid "Show own name"
-msgstr "Mostra nomi"
+msgstr ""
 
 #: src/gui/setup_players.cpp:310
-#, fuzzy
 msgid "Target dead players"
-msgstr "Punta Giocatore"
+msgstr ""
 
 #: src/gui/setup_theme.cpp:107
 msgid "Theme"
@@ -2123,19 +1979,16 @@ msgid "Bold font"
 msgstr ""
 
 #: src/gui/setup_theme.cpp:112
-#, fuzzy
 msgid "Particle font"
-msgstr "Effetti particelle"
+msgstr ""
 
 #: src/gui/setup_theme.cpp:113
-#, fuzzy
 msgid "Help font"
-msgstr "Aiuto"
+msgstr ""
 
 #: src/gui/setup_theme.cpp:223
-#, fuzzy
 msgid "Theme Changed"
-msgstr "Cambia"
+msgstr ""
 
 #: src/gui/setup_theme.cpp:224 src/gui/setup_video.cpp:715
 #: src/gui/setup_video.cpp:720
@@ -2143,24 +1996,20 @@ msgid "Restart your client for the change to take effect."
 msgstr "Per applicare le modifiche, è necessario riavviare il client."
 
 #: src/gui/setup_video.cpp:144
-#, fuzzy
 msgid "Tiny (10)"
-msgstr "Minuscolo"
+msgstr ""
 
 #: src/gui/setup_video.cpp:145
-#, fuzzy
 msgid "Small (11)"
-msgstr "Piccolo"
+msgstr ""
 
 #: src/gui/setup_video.cpp:146
-#, fuzzy
 msgid "Medium (12)"
-msgstr "Medio"
+msgstr ""
 
 #: src/gui/setup_video.cpp:147
-#, fuzzy
 msgid "Large (13)"
-msgstr "Largo"
+msgstr ""
 
 #: src/gui/setup_video.cpp:148
 msgid "Big (14)"
@@ -2175,14 +2024,12 @@ msgid "Software"
 msgstr ""
 
 #: src/gui/setup_video.cpp:173
-#, fuzzy
 msgid "Fast OpenGL"
-msgstr "OpenGL"
+msgstr ""
 
 #: src/gui/setup_video.cpp:174
-#, fuzzy
 msgid "Safe OpenGL"
-msgstr "OpenGL"
+msgstr ""
 
 #: src/gui/setup_video.cpp:201
 msgid "No text"
@@ -2225,9 +2072,8 @@ msgid "Full screen"
 msgstr "Schermo intero"
 
 #: src/gui/setup_video.cpp:278
-#, fuzzy
 msgid "Hw acceleration"
-msgstr "Relazione"
+msgstr ""
 
 #: src/gui/setup_video.cpp:279
 msgid "Custom cursor"
@@ -2284,25 +2130,21 @@ msgid "Show job"
 msgstr ""
 
 #: src/gui/setup_video.cpp:302
-#, fuzzy
 msgid "Enable opacity cache"
-msgstr "Abilita joystick"
+msgstr ""
 
 #: src/gui/setup_video.cpp:303
-#, fuzzy
 msgid "Show background"
-msgstr "Sfondo"
+msgstr ""
 
 #: src/gui/setup_video.cpp:308
-#, fuzzy
 msgid "FPS limit:"
-msgstr "Limita FPS:"
+msgstr ""
 
 #: src/gui/setup_video.cpp:312 src/gui/setup_video.cpp:351
 #: src/gui/setup_video.cpp:647 src/gui/setup_video.cpp:810
-#, fuzzy
 msgid "Alt FPS limit: "
-msgstr "Limita FPS:"
+msgstr ""
 
 #: src/gui/setup_video.cpp:322
 msgid "Video"
@@ -2321,9 +2163,8 @@ msgid "Ambient FX"
 msgstr "Suoni ambientali"
 
 #: src/gui/setup_video.cpp:330
-#, fuzzy
 msgid "Particle detail"
-msgstr "Dettagli particelle"
+msgstr ""
 
 #: src/gui/setup_video.cpp:331
 msgid "Font size"
@@ -2332,35 +2173,30 @@ msgstr "Dimensione caratteri"
 #: src/gui/setup_video.cpp:349 src/gui/setup_video.cpp:352
 #: src/gui/setup_video.cpp:646 src/gui/setup_video.cpp:797
 #: src/gui/setup_video.cpp:808
-#, fuzzy
 msgid "None"
-msgstr "No"
+msgstr ""
 
 #: src/gui/setup_video.cpp:529
-#, fuzzy
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
-msgstr "e il ripristino della precedente è fallito."
+msgstr ""
 
 #: src/gui/setup_video.cpp:535
-#, fuzzy
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
-msgstr "e il ripristino della precedente è fallito."
+msgstr ""
 
 #: src/gui/setup_video.cpp:546
-#, fuzzy
 msgid "Switching to Full Screen"
-msgstr "Modalità a schermo intero"
+msgstr ""
 
 #: src/gui/setup_video.cpp:547
 msgid "Restart needed for changes to take effect."
 msgstr "Riavvio necessario affinchè i cambiamenti abbiano effetto."
 
 #: src/gui/setup_video.cpp:559
-#, fuzzy
 msgid "Changing to OpenGL"
-msgstr "Modifica OpenGL"
+msgstr ""
 
 #: src/gui/setup_video.cpp:560
 msgid "Applying change to OpenGL requires restart."
@@ -2375,18 +2211,16 @@ msgid "Enter new resolution:                "
 msgstr ""
 
 #: src/gui/setup_video.cpp:714 src/gui/setup_video.cpp:719
-#, fuzzy
 msgid "Screen Resolution Changed"
-msgstr "Risoluzione schermo modificata"
+msgstr ""
 
 #: src/gui/setup_video.cpp:717
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
 #: src/gui/setup_video.cpp:751
-#, fuzzy
 msgid "Particle Effect Settings Changed."
-msgstr "Impostazione effetti particelle modificato."
+msgstr ""
 
 #: src/gui/setup_video.cpp:752
 msgid "Changes will take effect on map change."
@@ -2422,9 +2256,9 @@ msgid "Request for Trade"
 msgstr "Richiesta di commercio"
 
 #: src/gui/shopwindow.cpp:713
-#, fuzzy, c-format
+#, c-format
 msgid "%s wants to %s %s do you accept?"
-msgstr "%s vuole commerciare con te, accetti?"
+msgstr ""
 
 #: src/gui/skilldialog.cpp:228 src/gui/windowmenu.cpp:78
 msgid "Skills"
@@ -2435,29 +2269,29 @@ msgid "Up"
 msgstr "Su"
 
 #: src/gui/skilldialog.cpp:292
-#, fuzzy, c-format
+#, c-format
 msgid "Skill points available: %d"
-msgstr "Punti abilità: %d"
+msgstr ""
 
 #: src/gui/skilldialog.cpp:379
-#, fuzzy, c-format
+#, c-format
 msgid "Skill Set %d"
-msgstr "Punti abilità: %d"
+msgstr ""
 
 #: src/gui/skilldialog.cpp:391
-#, fuzzy, c-format
+#, c-format
 msgid "Skill %d"
-msgstr "Abilità"
+msgstr ""
 
 #: src/gui/skilldialog.cpp:454 src/gui/skilldialog.cpp:507
-#, fuzzy, c-format
+#, c-format
 msgid "Lvl: %d"
-msgstr "Livello: %d"
+msgstr ""
 
 #: src/gui/skilldialog.cpp:499
-#, fuzzy, c-format
+#, c-format
 msgid "Lvl: %d (%+d)"
-msgstr "Livello: %d"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:115 src/net/tmwa/gui/guildtab.cpp:48
 msgid "Guild"
@@ -2469,9 +2303,9 @@ msgid "Invited user %s to guild %s."
 msgstr ""
 
 #: src/gui/socialwindow.cpp:158
-#, fuzzy, c-format
+#, c-format
 msgid "Guild %s quit requested."
-msgstr "La gilda è stata creata."
+msgstr ""
 
 #: src/gui/socialwindow.cpp:185
 msgid "Member Invite to Guild"
@@ -2483,23 +2317,22 @@ msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
 #: src/gui/socialwindow.cpp:195
-#, fuzzy
 msgid "Leave Guild?"
-msgstr "Crea una Gilda"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:196
-#, fuzzy, c-format
+#, c-format
 msgid "Are you sure you want to leave guild %s?"
-msgstr "Sei sicuro di voler uscire?"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:213 src/net/tmwa/gui/partytab.cpp:48
 msgid "Party"
 msgstr "Party"
 
 #: src/gui/socialwindow.cpp:241
-#, fuzzy, c-format
+#, c-format
 msgid "Invited user %s to party."
-msgstr "/party > Invita un utente nel party"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:255
 #, c-format
@@ -2507,9 +2340,8 @@ msgid "Party %s quit requested."
 msgstr ""
 
 #: src/gui/socialwindow.cpp:282
-#, fuzzy
 msgid "Member Invite to Party"
-msgstr "/party > Invita un utente nel party"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:283
 #, c-format
@@ -2521,9 +2353,9 @@ msgid "Leave Party?"
 msgstr ""
 
 #: src/gui/socialwindow.cpp:293
-#, fuzzy, c-format
+#, c-format
 msgid "Are you sure you want to leave party %s?"
-msgstr "Sei sicuro di voler uscire?"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:515
 msgid "Nav"
@@ -2534,48 +2366,45 @@ msgid "Create Guild"
 msgstr "Crea una Gilda"
 
 #: src/gui/socialwindow.cpp:785 src/gui/socialwindow.cpp:1187
-#, fuzzy
 msgid "Create Party"
-msgstr "Crea Personaggio"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:827 src/gui/windowmenu.cpp:88
 msgid "Social"
 msgstr ""
 
 #: src/gui/socialwindow.cpp:848
-#, fuzzy
 msgid "Invite"
-msgstr "Invita un utente"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:849
-#, fuzzy
 msgid "Leave"
-msgstr "Largo"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:976
-#, fuzzy, c-format
+#, c-format
 msgid "Accepted party invite from %s."
-msgstr "Invito accettato da %s."
+msgstr ""
 
 #: src/gui/socialwindow.cpp:986
-#, fuzzy, c-format
+#, c-format
 msgid "Rejected party invite from %s."
-msgstr "Invito rifiutato da %s."
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1003
-#, fuzzy, c-format
+#, c-format
 msgid "Accepted guild invite from %s."
-msgstr "Invito accettato da %s."
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1013
-#, fuzzy, c-format
+#, c-format
 msgid "Rejected guild invite from %s."
-msgstr "Invito rifiutato da %s."
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1057
-#, fuzzy, c-format
+#, c-format
 msgid "Creating guild called %s."
-msgstr "Errore durante la creazione della gilda."
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1080
 #, c-format
@@ -2583,43 +2412,38 @@ msgid "Creating party called %s."
 msgstr ""
 
 #: src/gui/socialwindow.cpp:1094
-#, fuzzy
 msgid "Guild Name"
-msgstr "Gilda"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1095
-#, fuzzy
 msgid "Choose your guild's name."
-msgstr "Scegliere il proprio server"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1109
-#, fuzzy
 msgid "Received guild request, but one already exists."
-msgstr "Ricevuta richiesta di party, ma ne esiste già una."
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1115
-#, fuzzy, c-format
+#, c-format
 msgid "%s has invited you to join the guild %s."
-msgstr "%s ti ha invitato ad unirti al party %s."
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1121
-#, fuzzy
 msgid "Accept Guild Invite"
-msgstr "Accetta invito nel party"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1136
 msgid "Received party request, but one already exists."
 msgstr "Ricevuta richiesta di party, ma ne esiste già una."
 
 #: src/gui/socialwindow.cpp:1147
-#, fuzzy
 msgid "You have been invited you to join a party."
-msgstr "%s ti ha invitato ad unirti al suo party."
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1151
-#, fuzzy, c-format
+#, c-format
 msgid "You have been invited to join the %s party."
-msgstr "%s ti ha invitato ad unirti al party %s."
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1159
 #, c-format
@@ -2640,14 +2464,12 @@ msgid "Cannot create party. You are already in a party"
 msgstr ""
 
 #: src/gui/socialwindow.cpp:1193
-#, fuzzy
 msgid "Party Name"
-msgstr "Party"
+msgstr ""
 
 #: src/gui/socialwindow.cpp:1194
-#, fuzzy
 msgid "Choose your party's name."
-msgstr "Scegliere il proprio server"
+msgstr ""
 
 #: src/gui/specialswindow.cpp:77 src/gui/windowmenu.cpp:84
 msgid "Specials"
@@ -2694,9 +2516,8 @@ msgid "(1) moves to target in distance 1"
 msgstr ""
 
 #: src/gui/statuspopup.cpp:261
-#, fuzzy
 msgid "(2) moves to target in distance 2"
-msgstr "Muoviti verso sinistra"
+msgstr ""
 
 #: src/gui/statuspopup.cpp:266
 msgid "(3) moves to target in distance 3"
@@ -2715,9 +2536,8 @@ msgid "(A) moves to target in attack range"
 msgstr ""
 
 #: src/gui/statuspopup.cpp:286
-#, fuzzy
 msgid "(?) move to target"
-msgstr "Muoviti verso sinistra"
+msgstr ""
 
 #: src/gui/statuspopup.cpp:294
 msgid "(D) default follow"
@@ -2752,9 +2572,8 @@ msgid "(S) switch attack with shield"
 msgstr ""
 
 #: src/gui/statuspopup.cpp:333 src/gui/statuspopup.cpp:358
-#, fuzzy
 msgid "(?) attack"
-msgstr "Attacco"
+msgstr ""
 
 #: src/gui/statuspopup.cpp:346
 msgid "(G) go and attack"
@@ -2765,9 +2584,8 @@ msgid "(A) go, attack, pickup"
 msgstr ""
 
 #: src/gui/statuspopup.cpp:354
-#, fuzzy
 msgid "(d) without auto attack"
-msgstr "Cambia personaggio"
+msgstr ""
 
 #: src/gui/statuspopup.cpp:372
 msgid "(S) small pick up 1x1 cells"
@@ -2834,9 +2652,8 @@ msgid "(f) use #flar for magic attack"
 msgstr ""
 
 #: src/gui/statuspopup.cpp:446
-#, fuzzy
 msgid "(c) use #chiza for magic attack"
-msgstr "Cambia personaggio"
+msgstr ""
 
 #: src/gui/statuspopup.cpp:451
 msgid "(I) use #ingrav for magic attack"
@@ -2851,9 +2668,8 @@ msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
 #: src/gui/statuspopup.cpp:465
-#, fuzzy
 msgid "(?) magic attack"
-msgstr "Cambia personaggio"
+msgstr ""
 
 #: src/gui/statuspopup.cpp:474
 msgid "(D) default imitation"
@@ -2868,9 +2684,8 @@ msgid "(?) imitation"
 msgstr ""
 
 #: src/gui/statuspopup.cpp:491
-#, fuzzy
 msgid "(O) on keyboard"
-msgstr "Tastiera"
+msgstr ""
 
 #: src/gui/statuspopup.cpp:494
 msgid "(A) away"
@@ -2934,19 +2749,19 @@ msgid "Job:"
 msgstr "Lavoro:"
 
 #: src/gui/statuswindow.cpp:246 src/gui/statuswindow.cpp:294
-#, fuzzy, c-format
+#, c-format
 msgid "Character points: %d"
-msgstr "Statistiche personaggio OK"
+msgstr ""
 
 #: src/gui/statuswindow.cpp:252
-#, fuzzy, c-format
+#, c-format
 msgid "Level: %d (GM %d)"
-msgstr "Livello: %d"
+msgstr ""
 
 #: src/gui/statuswindow.cpp:308
-#, fuzzy, c-format
+#, c-format
 msgid "Correction points: %d"
-msgstr "Punti abilità: %d"
+msgstr ""
 
 #: src/gui/statuswindow.cpp:631 src/gui/statuswindow.cpp:696
 #: src/gui/statuswindow.cpp:716 src/gui/statuswindow.cpp:732
@@ -3076,34 +2891,28 @@ msgid "(O)"
 msgstr ""
 
 #: src/gui/textcommandeditor.cpp:109
-#, fuzzy
 msgid "No Target"
-msgstr "Muoviti verso sinistra"
+msgstr ""
 
 #: src/gui/textcommandeditor.cpp:110
-#, fuzzy
 msgid "Allow Target"
-msgstr "Permetti scambi"
+msgstr ""
 
 #: src/gui/textcommandeditor.cpp:111
-#, fuzzy
 msgid "Need Target"
-msgstr "Muoviti verso sinistra"
+msgstr ""
 
 #: src/gui/textcommandeditor.cpp:116
-#, fuzzy
 msgid "General Magic"
-msgstr "Generale"
+msgstr ""
 
 #: src/gui/textcommandeditor.cpp:117
-#, fuzzy
 msgid "Life Magic"
-msgstr "Magia"
+msgstr ""
 
 #: src/gui/textcommandeditor.cpp:118
-#, fuzzy
 msgid "War Magic"
-msgstr "Magia"
+msgstr ""
 
 #: src/gui/textcommandeditor.cpp:119
 msgid "Transmute Magic"
@@ -3118,14 +2927,12 @@ msgid "Astral Magic"
 msgstr ""
 
 #: src/gui/textcommandeditor.cpp:164
-#, fuzzy
 msgid "Command Editor"
-msgstr "Comando: /item"
+msgstr ""
 
 #: src/gui/textcommandeditor.cpp:181
-#, fuzzy
 msgid "magic"
-msgstr "Magia"
+msgstr ""
 
 #: src/gui/textcommandeditor.cpp:185
 msgid "other"
@@ -3136,36 +2943,32 @@ msgid "Symbol:"
 msgstr ""
 
 #: src/gui/textcommandeditor.cpp:193
-#, fuzzy
 msgid "Command:"
-msgstr "Comando: /who"
+msgstr ""
 
 #: src/gui/textcommandeditor.cpp:196
 msgid "Mana:"
 msgstr ""
 
 #: src/gui/textcommandeditor.cpp:201
-#, fuzzy
 msgid "Target Type:"
-msgstr "Punta Giocatore"
+msgstr ""
 
 #: src/gui/textcommandeditor.cpp:206
 msgid "Icon:"
 msgstr ""
 
 #: src/gui/textcommandeditor.cpp:212
-#, fuzzy
 msgid "Magic level:"
-msgstr "Livello massimo"
+msgstr ""
 
 #: src/gui/textcommandeditor.cpp:217
 msgid "Magic School:"
 msgstr ""
 
 #: src/gui/textcommandeditor.cpp:223
-#, fuzzy
 msgid "School level:"
-msgstr "Mostra nomi"
+msgstr ""
 
 #: src/gui/textcommandeditor.cpp:228
 msgid "Save"
@@ -3196,9 +2999,9 @@ msgid "Trade"
 msgstr "Commercia"
 
 #: src/gui/trade.cpp:108 src/gui/trade.cpp:149
-#, fuzzy, c-format
+#, c-format
 msgid "You get %s"
-msgstr "Hai ottenuto %s"
+msgstr ""
 
 #: src/gui/trade.cpp:109
 msgid "You give:"
@@ -3209,10 +3012,11 @@ msgid "Change"
 msgstr "Cambia"
 
 #: src/gui/trade.cpp:314
-msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
-"Aggiunta dell'oggetto fallita. Non puoi sovrapporre un tipo di oggetto sulla "
-"finestra."
+"Aggiunta dell'oggetto fallita. Non puoi sovrapporre un tipo di oggetto sulla"
+" finestra."
 
 #: src/gui/trade.cpp:359
 msgid "You don't have enough money."
@@ -3246,9 +3050,8 @@ msgstr "##1 È fortemente raccomandato"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
 #: src/gui/updatewindow.cpp:549
-#, fuzzy
 msgid "##1  you try again later."
-msgstr "##1 prova più tardi"
+msgstr ""
 
 #: src/gui/updatewindow.cpp:675
 msgid "Completed"
@@ -3259,24 +3062,20 @@ msgid "Being"
 msgstr "Essere"
 
 #: src/gui/userpalette.cpp:113
-#, fuzzy
 msgid "Friend Names"
-msgstr "Amico"
+msgstr ""
 
 #: src/gui/userpalette.cpp:114
-#, fuzzy
 msgid "Disregarded Names"
-msgstr "Disprezzato"
+msgstr ""
 
 #: src/gui/userpalette.cpp:115
-#, fuzzy
 msgid "Ignored Names"
-msgstr "Ignorato"
+msgstr ""
 
 #: src/gui/userpalette.cpp:116
-#, fuzzy
 msgid "Erased Names"
-msgstr "Nomi dei GM"
+msgstr ""
 
 #: src/gui/userpalette.cpp:117
 msgid "Other Players' Names"
@@ -3299,74 +3098,64 @@ msgid "Monsters"
 msgstr "Mostri"
 
 #: src/gui/userpalette.cpp:122
-#, fuzzy
 msgid "Monster HP bar"
-msgstr "Il mostro colpisce il giocatore"
+msgstr ""
 
 #: src/gui/userpalette.cpp:124
 msgid "Monster HP bar (second color)"
 msgstr ""
 
 #: src/gui/userpalette.cpp:125
-#, fuzzy
 msgid "Party Members"
-msgstr "Party"
+msgstr ""
 
 #: src/gui/userpalette.cpp:126
-#, fuzzy
 msgid "Guild Members"
-msgstr "Gilda"
+msgstr ""
 
 #: src/gui/userpalette.cpp:127
 msgid "Particle Effects"
 msgstr "Effetti particelle"
 
 #: src/gui/userpalette.cpp:128
-#, fuzzy
 msgid "Pickup Notification"
-msgstr "Notifica Esperienza"
+msgstr ""
 
 #: src/gui/userpalette.cpp:129
 msgid "Exp Notification"
 msgstr "Notifica Esperienza"
 
 #: src/gui/userpalette.cpp:130
-#, fuzzy
 msgid "Player HP bar"
-msgstr "Il mostro colpisce il giocatore"
+msgstr ""
 
 #: src/gui/userpalette.cpp:132
 msgid "Player HP bar (second color)"
 msgstr ""
 
 #: src/gui/userpalette.cpp:133
-#, fuzzy
 msgid "Player Hits Monster"
-msgstr "Il giocatore colpisce il mostro"
+msgstr ""
 
 #: src/gui/userpalette.cpp:134
-#, fuzzy
 msgid "Monster Hits Player"
-msgstr "Il mostro colpisce il giocatore"
+msgstr ""
 
 #: src/gui/userpalette.cpp:136
-#, fuzzy
 msgid "Other Player Hits Local Player"
-msgstr "Nomi degli altri giocatori"
+msgstr ""
 
 #: src/gui/userpalette.cpp:137
 msgid "Critical Hit"
 msgstr "Colpo critico"
 
 #: src/gui/userpalette.cpp:139
-#, fuzzy
 msgid "Local Player Hits Monster"
-msgstr "Il giocatore colpisce il mostro"
+msgstr ""
 
 #: src/gui/userpalette.cpp:141
-#, fuzzy
 msgid "Local Player Critical Hit"
-msgstr "Il giocatore colpisce il mostro"
+msgstr ""
 
 #: src/gui/userpalette.cpp:143
 msgid "Local Player Miss"
@@ -3377,19 +3166,16 @@ msgid "Misses"
 msgstr "Perde"
 
 #: src/gui/userpalette.cpp:145
-#, fuzzy
 msgid "Portal Highlight"
-msgstr "Evidenziazione scheda"
+msgstr ""
 
 #: src/gui/userpalette.cpp:147
-#, fuzzy
 msgid "Collision Highlight"
-msgstr "Evidenziazione"
+msgstr ""
 
 #: src/gui/userpalette.cpp:149
-#, fuzzy
 msgid "Walkable Highlight"
-msgstr "Evidenziazione scheda"
+msgstr ""
 
 #: src/gui/userpalette.cpp:151
 msgid "Local Player Attack Range"
@@ -3400,9 +3186,8 @@ msgid "Local Player Attack Range Border"
 msgstr ""
 
 #: src/gui/userpalette.cpp:155
-#, fuzzy
 msgid "Monster Attack Range"
-msgstr "Il mostro colpisce il giocatore"
+msgstr ""
 
 #: src/gui/userpalette.cpp:157
 msgid "Home Place"
@@ -3533,9 +3318,9 @@ msgid "Global announcement from %s:"
 msgstr "Annuncio generale da %s:"
 
 #: src/gui/widgets/chattab.cpp:182
-#, fuzzy, c-format
+#, c-format
 msgid "%s whispers: %s"
-msgstr "%s sospira: "
+msgstr ""
 
 #: src/gui/widgets/whispertab.cpp:105
 msgid "/ignore > Ignore the other player"
@@ -3558,33 +3343,29 @@ msgid "This command closes the current whisper tab."
 msgstr "Questo comando chiude la scheda del sussurro attiva."
 
 #: src/gui/widgets/whispertab.cpp:122
-#, fuzzy
 msgid "Command: /ignore"
-msgstr "Comando: /item"
+msgstr ""
 
 #: src/gui/widgets/whispertab.cpp:123
-#, fuzzy
 msgid "This command ignores the other player regardless of current relations."
-msgstr "Questo comando mostra il numero dei giocatori attualmente connessi."
+msgstr ""
 
 #: src/gui/widgets/whispertab.cpp:128
-#, fuzzy
 msgid "Command: /unignore <player>"
-msgstr "Comando: /item <politica>"
+msgstr "Comando: /unignore <giocatore>"
 
 #: src/gui/widgets/whispertab.cpp:129
-#, fuzzy
-msgid "This command stops ignoring the other player if they are being ignored."
-msgstr "Questo comando attiva la registrazione della chat nel file <nome file>"
+msgid ""
+"This command stops ignoring the other player if they are being ignored."
+msgstr ""
 
 #: src/gui/windowmenu.cpp:62
 msgid "BC"
 msgstr ""
 
 #: src/gui/windowmenu.cpp:62
-#, fuzzy
 msgid "Bot checker"
-msgstr "Finestra della Chat"
+msgstr ""
 
 #: src/gui/windowmenu.cpp:64
 msgid "ONL"
@@ -3635,9 +3416,8 @@ msgid "SH"
 msgstr ""
 
 #: src/gui/windowmenu.cpp:89
-#, fuzzy
 msgid "Shortcuts"
-msgstr "Scorciatoia"
+msgstr ""
 
 #: src/gui/windowmenu.cpp:91
 msgid "SP"
@@ -3652,23 +3432,20 @@ msgid "SET"
 msgstr ""
 
 #: src/gui/worldselectdialog.cpp:75
-#, fuzzy
 msgid "Select World"
-msgstr "Seleziona OK"
+msgstr ""
 
 #: src/gui/worldselectdialog.cpp:80
-#, fuzzy
 msgid "Change Login"
-msgstr "Cambia"
+msgstr ""
 
 #: src/gui/worldselectdialog.cpp:81
-#, fuzzy
 msgid "Choose World"
-msgstr "Scegliere il proprio server"
+msgstr ""
 
 #: src/inventory.cpp:240
 msgid "Storage"
-msgstr "Storage"
+msgstr ""
 
 #: src/inventory.cpp:242
 msgid "Cart"
@@ -3695,9 +3472,8 @@ msgid "Target & Attack"
 msgstr "Mirino e attacco"
 
 #: src/keyboardconfig.cpp:49
-#, fuzzy
 msgid "Move to Target"
-msgstr "Muoviti verso sinistra"
+msgstr ""
 
 #: src/keyboardconfig.cpp:51
 msgid "Change Move to Target type"
@@ -3724,9 +3500,8 @@ msgid "Stop Attack"
 msgstr "Ferma attacco"
 
 #: src/keyboardconfig.cpp:62
-#, fuzzy
 msgid "Target Closest"
-msgstr "Punta Più vicino"
+msgstr ""
 
 #: src/keyboardconfig.cpp:64
 msgid "Target NPC"
@@ -3761,14 +3536,12 @@ msgid "Enable/Disable Trading"
 msgstr "Abilita/Disabilita Scambi"
 
 #: src/keyboardconfig.cpp:76
-#, fuzzy
 msgid "Change Map View Mode"
-msgstr "Cambia l'indirizzo Email"
+msgstr ""
 
 #: src/keyboardconfig.cpp:78
-#, fuzzy
 msgid "Item Shortcuts Key"
-msgstr "Scorciatoia %d"
+msgstr ""
 
 #: src/keyboardconfig.cpp:80 src/keyboardconfig.cpp:82
 #: src/keyboardconfig.cpp:84 src/keyboardconfig.cpp:86
@@ -3826,57 +3599,48 @@ msgid "Debug Window"
 msgstr "Finestra di debug"
 
 #: src/keyboardconfig.cpp:138
-#, fuzzy
 msgid "Social Window"
-msgstr "Finestra delle Capacità"
+msgstr ""
 
 #: src/keyboardconfig.cpp:140
 msgid "Emote Shortcut Window"
 msgstr ""
 
 #: src/keyboardconfig.cpp:142
-#, fuzzy
 msgid "Outfits Window"
-msgstr "Finestra degli Status"
+msgstr ""
 
 #: src/keyboardconfig.cpp:144
-#, fuzzy
 msgid "Shop Window"
-msgstr "Finestra del Setup"
+msgstr ""
 
 #: src/keyboardconfig.cpp:145
-#, fuzzy
 msgid "Quick drop Window"
-msgstr "Nascondi la Finestra"
+msgstr ""
 
 #: src/keyboardconfig.cpp:147
-#, fuzzy
 msgid "Kills Stats Window"
-msgstr "Finestra degli Status"
+msgstr ""
 
 #: src/keyboardconfig.cpp:149
-#, fuzzy
 msgid "Commands Window"
-msgstr "Comando: /item"
+msgstr ""
 
 #: src/keyboardconfig.cpp:151
-#, fuzzy
 msgid "Bot Checker Window"
-msgstr "Finestra della Chat"
+msgstr ""
 
 #: src/keyboardconfig.cpp:154
 msgid "Who Is Online Window"
 msgstr ""
 
 #: src/keyboardconfig.cpp:156
-#, fuzzy
 msgid "Previous Social Tab"
-msgstr "Scheda Chat Precedente"
+msgstr ""
 
 #: src/keyboardconfig.cpp:157
-#, fuzzy
 msgid "Next Social Tab"
-msgstr "Scheda Chat Successiva"
+msgstr ""
 
 #: src/keyboardconfig.cpp:159 src/keyboardconfig.cpp:161
 #: src/keyboardconfig.cpp:163 src/keyboardconfig.cpp:165
@@ -3938,14 +3702,12 @@ msgid "Next Chat Tab"
 msgstr "Scheda Chat Successiva"
 
 #: src/keyboardconfig.cpp:268
-#, fuzzy
 msgid "Previous chat tab line"
-msgstr "Scheda Chat Precedente"
+msgstr ""
 
 #: src/keyboardconfig.cpp:270
-#, fuzzy
 msgid "Next chat tab line"
-msgstr "Scheda Chat Successiva"
+msgstr ""
 
 #: src/keyboardconfig.cpp:272
 msgid "Chat Auto Complete"
@@ -3972,19 +3734,16 @@ msgid "Direct Up"
 msgstr ""
 
 #: src/keyboardconfig.cpp:283
-#, fuzzy
 msgid "Direct Down"
-msgstr "Muoviti verso il basso"
+msgstr ""
 
 #: src/keyboardconfig.cpp:285
-#, fuzzy
 msgid "Direct Left"
-msgstr "Muoviti verso sinistra"
+msgstr ""
 
 #: src/keyboardconfig.cpp:286
-#, fuzzy
 msgid "Direct Right"
-msgstr "Muoviti verso destra"
+msgstr ""
 
 #: src/keyboardconfig.cpp:288
 msgid "Crazy moves"
@@ -4019,33 +3778,28 @@ msgid "Use magic attack"
 msgstr ""
 
 #: src/keyboardconfig.cpp:304
-#, fuzzy
 msgid "Switch magic attack"
-msgstr "Cambia personaggio"
+msgstr ""
 
 #: src/keyboardconfig.cpp:306
-#, fuzzy
 msgid "Change move type"
-msgstr "Server"
+msgstr ""
 
 #: src/keyboardconfig.cpp:308
 msgid "Change Attack Weapon Type"
 msgstr ""
 
 #: src/keyboardconfig.cpp:310
-#, fuzzy
 msgid "Change Attack Type"
-msgstr "Mirino e attacco"
+msgstr ""
 
 #: src/keyboardconfig.cpp:312
-#, fuzzy
 msgid "Change Follow mode"
-msgstr "Cambia la Password"
+msgstr ""
 
 #: src/keyboardconfig.cpp:314
-#, fuzzy
 msgid "Change Imitation mode"
-msgstr "Cambia l'indirizzo Email"
+msgstr ""
 
 #: src/keyboardconfig.cpp:317
 msgid "Disable / Enable Game modifier keys"
@@ -4056,9 +3810,8 @@ msgid "On / Off audio"
 msgstr ""
 
 #: src/keyboardconfig.cpp:320
-#, fuzzy
 msgid "Enable / Disable away mode"
-msgstr "Abilita/Disabilita Scambi"
+msgstr ""
 
 #: src/keyboardconfig.cpp:322
 msgid "Emulate right click from keyboard"
@@ -4069,21 +3822,19 @@ msgid "Toggle camera mode"
 msgstr ""
 
 #: src/keyboardconfig.cpp:397
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
-"Se non vengono risolti, il gioco potrebbe comportarsi in modo inaspettato."
 
 #: src/localplayer.cpp:338
 msgid "You were killed by "
 msgstr ""
 
 #: src/localplayer.cpp:1344
-#, fuzzy
 msgid "Tried to pick up nonexistent item."
-msgstr "Impossibile raccogliere l'oggetto."
+msgstr ""
 
 #: src/localplayer.cpp:1346
 msgid "Item is too heavy."
@@ -4094,9 +3845,8 @@ msgid "Item is too far away"
 msgstr ""
 
 #: src/localplayer.cpp:1350
-#, fuzzy
 msgid "Inventory is full."
-msgstr "Il server è pieno"
+msgstr ""
 
 #: src/localplayer.cpp:1352
 msgid "Stack is too big."
@@ -4107,18 +3857,17 @@ msgid "Item belongs to someone else."
 msgstr ""
 
 #: src/localplayer.cpp:1358
-#, fuzzy
 msgid "Unknown problem picking up item."
-msgstr "Impossibile raccogliere l'oggetto."
+msgstr ""
 
 #. TRANSLATORS: This sentence may be translated differently
 #. for different grammatical numbers (singular, plural, ...)
 #: src/localplayer.cpp:1383
-#, fuzzy, c-format
+#, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
-msgstr[0] "Hai raccolto %s [@@%d|%s@@]."
-msgstr[1] "Hai raccolto %s [@@%d|%s@@]."
+msgstr[0] ""
+msgstr[1] ""
 
 #: src/localplayer.cpp:3099
 msgid "Away"
@@ -4129,24 +3878,20 @@ msgid "Follow: "
 msgstr ""
 
 #: src/localplayer.cpp:3394 src/localplayer.cpp:3409
-#, fuzzy
 msgid "Follow canceled"
-msgstr "Scambio cancellato."
+msgstr ""
 
 #: src/localplayer.cpp:3401
-#, fuzzy
 msgid "Imitation: "
-msgstr "Cambia l'indirizzo Email"
+msgstr ""
 
 #: src/localplayer.cpp:3403 src/localplayer.cpp:3411
-#, fuzzy
 msgid "Imitation canceled"
-msgstr "Scambio cancellato."
+msgstr ""
 
 #: src/localplayer.cpp:3763
-#, fuzzy
 msgid "You see "
-msgstr "Hai ottenuto %s"
+msgstr ""
 
 #: src/main.cpp:45
 msgid "manaplus [options] [mana-file]"
@@ -4169,147 +3914,130 @@ msgid "Options:"
 msgstr "Opzioni"
 
 #: src/main.cpp:51
-#, fuzzy
 msgid "  -l --log-file       : Log file to use"
-msgstr "  -C --config-file : File di configurazione da utilizzare"
+msgstr ""
 
 #: src/main.cpp:52
-#, fuzzy
 msgid "  -L --chat-log-dir   : Chat log dir to use"
-msgstr "  -C --config-file : File di configurazione da utilizzare"
+msgstr ""
 
 #: src/main.cpp:53
-#, fuzzy
 msgid "  -v --version        : Display the version"
-msgstr "  -v --version : Mostra la versione"
+msgstr ""
 
 #: src/main.cpp:54
-#, fuzzy
 msgid "  -h --help           : Display this help"
-msgstr "  -h --help        : Mostra questo aiuto"
+msgstr ""
 
 #: src/main.cpp:55
-#, fuzzy
 msgid "  -C --config-dir     : Configuration directory to use"
-msgstr "  -C --config-file : File di configurazione da utilizzare"
+msgstr ""
 
 #: src/main.cpp:56
-#, fuzzy
 msgid "  -U --username       : Login with this username"
-msgstr "  -U --username : Accedi con questo nome utente"
+msgstr ""
 
 #: src/main.cpp:57
-#, fuzzy
 msgid "  -P --password       : Login with this password"
-msgstr "  -P --password : Accedi con questa password"
+msgstr ""
 
 #: src/main.cpp:58
-#, fuzzy
 msgid "  -c --character      : Login with this character"
-msgstr "  -c --character : Accedi con questo personaggio"
+msgstr ""
 
 #: src/main.cpp:59
-#, fuzzy
 msgid "  -s --server         : Login server name or IP"
-msgstr "  -s --server : Nome o IP del server di login"
+msgstr ""
 
 #: src/main.cpp:60
-#, fuzzy
 msgid "  -p --port           : Login server port"
-msgstr "  -s --server : Nome o IP del server di login"
+msgstr ""
 
 #: src/main.cpp:61
-#, fuzzy
 msgid "     --update-host    : Use this update host"
-msgstr "  -H --update-host : Usa questo host per gli aggiornamenti"
+msgstr ""
 
 #: src/main.cpp:62
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
 #: src/main.cpp:64
-#, fuzzy
 msgid "  -u --skip-update    : Skip the update downloads"
-msgstr "  -u --skip-update : Salta i download degli update"
+msgstr ""
 
 #: src/main.cpp:65
-#, fuzzy
 msgid "  -d --data           : Directory to load game data from"
-msgstr "  -d --data : Diectory dalla quale caricare i dati di gioco"
+msgstr ""
 
 #: src/main.cpp:67
-#, fuzzy
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
-msgstr "  -S --home-dir : Directory da usare come home directory"
+msgstr ""
 
 #: src/main.cpp:69
-#, fuzzy
 msgid "     --screenshot-dir : Directory to store screenshots"
-msgstr "  -S --home-dir : Directory da usare come home directory"
+msgstr ""
 
 #: src/main.cpp:70
 msgid "     --safemode       : Start game in safe mode"
 msgstr ""
 
 #: src/main.cpp:72
-#, fuzzy
 msgid "     --no-opengl      : Disable OpenGL for this session"
-msgstr "  -O --no-opengl : Disabilita OpenGL per questa sessione"
+msgstr ""
 
 #: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:248
 msgid "Strength"
 msgstr "Forza"
 
 #: src/net/manaserv/attributes.cpp:167
-#, fuzzy, c-format
+#, c-format
 msgid "Strength %+.1f"
-msgstr "Forza %+d"
+msgstr ""
 
 #: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:249
 msgid "Agility"
 msgstr "Agilità"
 
 #: src/net/manaserv/attributes.cpp:180
-#, fuzzy, c-format
+#, c-format
 msgid "Agility %+.1f"
-msgstr "Agilità %+d"
+msgstr ""
 
 #: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:252
 msgid "Dexterity"
 msgstr "Destrezza"
 
 #: src/net/manaserv/attributes.cpp:193
-#, fuzzy, c-format
+#, c-format
 msgid "Dexterity %+.1f"
-msgstr "Destrezza %+d"
+msgstr ""
 
 #: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:250
 msgid "Vitality"
 msgstr "Vitalità"
 
 #: src/net/manaserv/attributes.cpp:206
-#, fuzzy, c-format
+#, c-format
 msgid "Vitality %+.1f"
-msgstr "Vitalità %+d"
+msgstr ""
 
 #: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:251
 msgid "Intelligence"
 msgstr "Intelligenza"
 
 #: src/net/manaserv/attributes.cpp:219
-#, fuzzy, c-format
+#, c-format
 msgid "Intelligence %+.1f"
-msgstr "Intelligenza %+d"
+msgstr ""
 
 #: src/net/manaserv/attributes.cpp:225
-#, fuzzy
 msgid "Willpower"
-msgstr "Volontà:"
+msgstr ""
 
 #: src/net/manaserv/attributes.cpp:232
-#, fuzzy, c-format
+#, c-format
 msgid "Willpower %+.1f"
-msgstr "Volontà:"
+msgstr ""
 
 #: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:101
 msgid "You are dead."
@@ -4378,9 +4106,8 @@ msgid "Press OK to respawn."
 msgstr ""
 
 #: src/net/manaserv/beinghandler.cpp:338
-#, fuzzy
 msgid "You Died"
-msgstr "Sei morto"
+msgstr ""
 
 #: src/net/manaserv/charhandler.cpp:145 src/net/manaserv/charhandler.cpp:219
 msgid "Not logged in."
@@ -4395,9 +4122,8 @@ msgid "Invalid name."
 msgstr ""
 
 #: src/net/manaserv/charhandler.cpp:154
-#, fuzzy
 msgid "Character's name already exists."
-msgstr "Nome utente già esistente"
+msgstr ""
 
 #: src/net/manaserv/charhandler.cpp:157
 msgid "Invalid hairstyle."
@@ -4412,14 +4138,12 @@ msgid "Invalid gender."
 msgstr ""
 
 #: src/net/manaserv/charhandler.cpp:166
-#, fuzzy
 msgid "Character's stats are too high."
-msgstr "Statistiche personaggio OK"
+msgstr ""
 
 #: src/net/manaserv/charhandler.cpp:169
-#, fuzzy
 msgid "Character's stats are too low."
-msgstr "Statistiche personaggio OK"
+msgstr ""
 
 #: src/net/manaserv/charhandler.cpp:172
 #, c-format
@@ -4434,28 +4158,25 @@ msgstr ""
 #: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
 #: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
 #: src/net/tmwa/loginhandler.cpp:100 src/net/tmwa/loginhandler.cpp:200
-#, fuzzy
 msgid "Unknown error."
-msgstr "Errore sconosciuto"
+msgstr ""
 
 #: src/net/manaserv/charhandler.cpp:210 src/net/tmwa/charserverhandler.cpp:199
 msgid "Info"
 msgstr "Informazioni"
 
 #: src/net/manaserv/charhandler.cpp:210
-#, fuzzy
 msgid "Player deleted."
-msgstr "Personaggio cancellato."
+msgstr ""
 
 #: src/net/manaserv/charhandler.cpp:222
-#, fuzzy
 msgid "Selection out of range."
-msgstr "Seleziona la quantità di oggetti da scambiare."
+msgstr ""
 
 #: src/net/manaserv/charhandler.cpp:225
-#, fuzzy, c-format
+#, c-format
 msgid "Unknown error (%d)."
-msgstr "Errore sconosciuto"
+msgstr ""
 
 #: src/net/manaserv/charhandler.cpp:261
 msgid "No gameservers are available."
@@ -4468,28 +4189,25 @@ msgid "Topic: %s"
 msgstr ""
 
 #: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:269
-#, fuzzy
 msgid "Players in this channel:"
-msgstr "Il giocatore colpisce il mostro"
+msgstr ""
 
 #: src/net/manaserv/chathandler.cpp:208
-#, fuzzy
 msgid "Error joining channel."
-msgstr "Comando: /join <canale>"
+msgstr ""
 
 #: src/net/manaserv/chathandler.cpp:214
-#, fuzzy
 msgid "Listing channels."
-msgstr "Richiesta per accedere al canale %s."
+msgstr ""
 
 #: src/net/manaserv/chathandler.cpp:226
 msgid "End of channel list."
 msgstr ""
 
 #: src/net/manaserv/chathandler.cpp:299
-#, fuzzy, c-format
+#, c-format
 msgid "%s entered the channel."
-msgstr "%s si è unito al party."
+msgstr ""
 
 #: src/net/manaserv/chathandler.cpp:304
 #, c-format
@@ -4507,9 +4225,8 @@ msgid "%s has kicked %s."
 msgstr ""
 
 #: src/net/manaserv/chathandler.cpp:337
-#, fuzzy
 msgid "Unknown channel event."
-msgstr "Comando sconosciuto."
+msgstr ""
 
 #: src/net/manaserv/guildhandler.cpp:85 src/net/tmwa/guildhandler.cpp:105
 msgid "Guild created."
@@ -4536,43 +4253,36 @@ msgid "Wrong magic_token."
 msgstr ""
 
 #: src/net/manaserv/loginhandler.cpp:96 src/net/manaserv/loginhandler.cpp:281
-#, fuzzy
 msgid "Already logged in."
-msgstr "La registrazione è già in corso."
+msgstr ""
 
 #: src/net/manaserv/loginhandler.cpp:99
-#, fuzzy
 msgid "Account banned."
-msgstr "Account scaduto"
+msgstr ""
 
 #: src/net/manaserv/loginhandler.cpp:124
-#, fuzzy
 msgid "New password incorrect."
-msgstr "Nuova password errata"
+msgstr ""
 
 #: src/net/manaserv/loginhandler.cpp:127 src/net/tmwa/loginhandler.cpp:94
-#, fuzzy
 msgid "Old password incorrect."
-msgstr "Vecchia password non corretta"
+msgstr ""
 
 #: src/net/manaserv/loginhandler.cpp:131 src/net/manaserv/loginhandler.cpp:163
 msgid "Account not connected. Please login first."
 msgstr ""
 
 #: src/net/manaserv/loginhandler.cpp:156
-#, fuzzy
 msgid "New email address incorrect."
-msgstr "Nuovo indirizzo email errato"
+msgstr ""
 
 #: src/net/manaserv/loginhandler.cpp:159
-#, fuzzy
 msgid "Old email address incorrect."
-msgstr "Vecchio indirizzo email errato"
+msgstr ""
 
 #: src/net/manaserv/loginhandler.cpp:167
-#, fuzzy
 msgid "The new email address already exists."
-msgstr "Il nuovo indirizzo e-mail esiste già."
+msgstr ""
 
 #: src/net/manaserv/loginhandler.cpp:249
 msgid ""
@@ -4580,38 +4290,32 @@ msgid ""
 msgstr ""
 
 #: src/net/manaserv/loginhandler.cpp:275 src/net/manaserv/loginhandler.cpp:312
-#, fuzzy
 msgid "Client version is too old."
-msgstr "La varsione del client è troppo vecchia"
+msgstr ""
 
 #: src/net/manaserv/loginhandler.cpp:278
-#, fuzzy
 msgid "Wrong username or password."
-msgstr "Nome utente o password errati"
+msgstr ""
 
 #: src/net/manaserv/loginhandler.cpp:284
-#, fuzzy
 msgid "Account banned"
-msgstr "Account scaduto"
+msgstr ""
 
 #: src/net/manaserv/loginhandler.cpp:287
 msgid "Login attempt too soon after previous attempt."
 msgstr ""
 
 #: src/net/manaserv/loginhandler.cpp:315
-#, fuzzy
 msgid "Wrong username, password or email address."
-msgstr "Nome utente, password o indirizzo email errati"
+msgstr ""
 
 #: src/net/manaserv/loginhandler.cpp:318
-#, fuzzy
 msgid "Username already exists."
-msgstr "Nome utente già esistente"
+msgstr ""
 
 #: src/net/manaserv/loginhandler.cpp:321
-#, fuzzy
 msgid "Email address already exists."
-msgstr "Indirizzo email già esistente"
+msgstr ""
 
 #: src/net/manaserv/loginhandler.cpp:324
 msgid "You took too long with the captcha or your response was incorrect."
@@ -4627,9 +4331,9 @@ msgid "%s joined the party."
 msgstr "%s si è unito al party."
 
 #: src/net/manaserv/partyhandler.cpp:126
-#, fuzzy, c-format
+#, c-format
 msgid "%s rejected your invite."
-msgstr "%s ha rifiutato il tuo invito."
+msgstr ""
 
 #: src/net/manaserv/tradehandler.cpp:107
 msgid "Accepting incoming trade requests."
@@ -4686,28 +4390,24 @@ msgid "Unable to sell."
 msgstr "Impossibile vendere."
 
 #: src/net/tmwa/buysellhandler.cpp:162
-#, fuzzy
 msgid "Unable to sell while trading."
-msgstr "Impossibile vendere."
+msgstr ""
 
 #: src/net/tmwa/buysellhandler.cpp:165
-#, fuzzy
 msgid "Unable to sell unsellable item."
-msgstr "Impossibile raccogliere l'oggetto."
+msgstr ""
 
 #: src/net/tmwa/charserverhandler.cpp:119
 msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
 #: src/net/tmwa/charserverhandler.cpp:123
-#, fuzzy
 msgid "Cannot use this ID."
-msgstr "Impossibile usare questo ID"
+msgstr ""
 
 #: src/net/tmwa/charserverhandler.cpp:126
-#, fuzzy
 msgid "Unknown char-server failure."
-msgstr "Errore sconosciuto"
+msgstr ""
 
 #: src/net/tmwa/charserverhandler.cpp:172
 msgid "Failed to create character. Most likely the name is already taken."
@@ -4716,9 +4416,8 @@ msgstr ""
 "stato preso."
 
 #: src/net/tmwa/charserverhandler.cpp:176 src/net/tmwa/loginhandler.cpp:194
-#, fuzzy
 msgid "Wrong name."
-msgstr "Password errata"
+msgstr ""
 
 #: src/net/tmwa/charserverhandler.cpp:179
 msgid "Incorrect stats."
@@ -4765,24 +4464,22 @@ msgid "Luck:"
 msgstr "Fortuna:"
 
 #: src/net/tmwa/chathandler.cpp:104
-#, fuzzy, c-format
+#, c-format
 msgid "Whisper could not be sent, %s is offline."
-msgstr "Il bisbiglio non può essere inviato, l'utente è offline."
+msgstr ""
 
 #: src/net/tmwa/chathandler.cpp:112
-#, fuzzy, c-format
+#, c-format
 msgid "Whisper could not be sent, ignored by %s."
-msgstr "Il bisbiglio non può essere inviato, ignorato dall'utente."
+msgstr ""
 
 #: src/net/tmwa/chathandler.cpp:336
-#, fuzzy
 msgid "MVP player."
-msgstr "Giocatore"
+msgstr ""
 
 #: src/net/tmwa/chathandler.cpp:340
-#, fuzzy
 msgid "MVP player: "
-msgstr "Giocatore"
+msgstr ""
 
 #: src/net/tmwa/chathandler.cpp:393 src/net/tmwa/chathandler.cpp:399
 #: src/net/tmwa/chathandler.cpp:404 src/net/tmwa/chathandler.cpp:410
@@ -4797,14 +4494,12 @@ msgid "Online users: %d"
 msgstr ""
 
 #: src/net/tmwa/gamehandler.cpp:104
-#, fuzzy
 msgid "Game"
-msgstr "Nome"
+msgstr ""
 
 #: src/net/tmwa/gamehandler.cpp:104
-#, fuzzy
 msgid "Request to quit denied!"
-msgstr "Richiesta di commercio"
+msgstr ""
 
 #: src/net/tmwa/generalhandler.cpp:105
 #, c-format
@@ -4837,38 +4532,32 @@ msgid "Luck %+d"
 msgstr "Fortuna %+d"
 
 #: src/net/tmwa/generalhandler.cpp:136
-#, fuzzy
 msgid "Authentication failed."
-msgstr "Autenticazione non riuscita"
+msgstr ""
 
 #: src/net/tmwa/generalhandler.cpp:139
-#, fuzzy
 msgid "No servers available."
-msgstr "Nessun server disponibile"
+msgstr ""
 
 #: src/net/tmwa/generalhandler.cpp:143
-#, fuzzy
 msgid "Someone else is trying to use this account."
-msgstr "Qualcun'altro sta cercando di usare questo account"
+msgstr ""
 
 #: src/net/tmwa/generalhandler.cpp:146
-#, fuzzy
 msgid "This account is already logged in."
-msgstr "Questo accaunt ha già effettuato l'accesso"
+msgstr ""
 
 #: src/net/tmwa/generalhandler.cpp:149
 msgid "Speed hack detected."
 msgstr ""
 
 #: src/net/tmwa/generalhandler.cpp:152
-#, fuzzy
 msgid "Duplicated login."
-msgstr "Accesso duplicato"
+msgstr ""
 
 #: src/net/tmwa/generalhandler.cpp:155
-#, fuzzy
 msgid "Unknown connection error."
-msgstr "Errore di connessione sconosciuto"
+msgstr ""
 
 #: src/net/tmwa/generalhandler.cpp:221
 msgid "Got disconnected from server!"
@@ -4879,115 +4568,99 @@ msgid "Luck"
 msgstr "Fortuna"
 
 #: src/net/tmwa/generalhandler.cpp:256
-#, fuzzy
 msgid "Defense"
-msgstr "Difesa:"
+msgstr ""
 
 #: src/net/tmwa/generalhandler.cpp:257
-#, fuzzy
 msgid "M.Attack"
-msgstr "Attacco Magico:"
+msgstr ""
 
 #: src/net/tmwa/generalhandler.cpp:258
-#, fuzzy
 msgid "M.Defense"
-msgstr "Difesa Magica:"
+msgstr ""
 
 #: src/net/tmwa/generalhandler.cpp:259
-#, fuzzy
 msgid "% Accuracy"
-msgstr "% Accuratezza:"
+msgstr ""
 
 #: src/net/tmwa/generalhandler.cpp:260
-#, fuzzy
 msgid "% Evade"
-msgstr "% Evasione:"
+msgstr ""
 
 #: src/net/tmwa/generalhandler.cpp:261
-#, fuzzy
 msgid "% Critical"
-msgstr "Colpo critico"
+msgstr ""
 
 #: src/net/tmwa/generalhandler.cpp:262
-#, fuzzy
 msgid "Attack Delay"
-msgstr "Attacco %+d"
+msgstr ""
 
 #: src/net/tmwa/generalhandler.cpp:264
-#, fuzzy
 msgid "Walk Delay"
-msgstr "Attacco %+d"
+msgstr ""
 
 #: src/net/tmwa/generalhandler.cpp:266
-#, fuzzy
 msgid "Attack Range"
-msgstr "Il mostro colpisce il giocatore"
+msgstr ""
 
 #: src/net/tmwa/gui/guildtab.cpp:75 src/net/tmwa/gui/partytab.cpp:67
 msgid "/help > Display this help."
 msgstr "/help > Mostra questo messaggio di aiuto"
 
 #: src/net/tmwa/gui/guildtab.cpp:76
-#, fuzzy
 msgid "/invite > Invite a player to your guild"
-msgstr "/invite > Invita un giocatore al tuo party"
+msgstr ""
 
 #: src/net/tmwa/gui/guildtab.cpp:77
-#, fuzzy
 msgid "/leave > Leave the guild you are in"
-msgstr "/leave > Abbandona il party"
+msgstr ""
 
 #: src/net/tmwa/gui/guildtab.cpp:78
-#, fuzzy
 msgid "/kick > Kick some one from the guild you are in"
-msgstr "/kick > Escludi qualcuno dal gruppo in cui ti trovi"
+msgstr ""
 
 #: src/net/tmwa/gui/guildtab.cpp:87 src/net/tmwa/gui/partytab.cpp:81
 msgid "Command: /invite <nick>"
 msgstr "Comando: /invite <nick>"
 
 #: src/net/tmwa/gui/guildtab.cpp:88
-#, fuzzy
 msgid "This command invites <nick> to the guild you're in."
-msgstr "Questo comando invita <nick> nel tuo party."
+msgstr ""
 
 #: src/net/tmwa/gui/guildtab.cpp:94 src/net/tmwa/gui/partytab.cpp:88
 msgid "Command: /leave"
 msgstr "Comando: /leave"
 
 #: src/net/tmwa/gui/guildtab.cpp:95
-#, fuzzy
 msgid "This command causes the player to leave the guild."
-msgstr "Questo comando fa abbandonare il gruppo ad un giocatore."
+msgstr ""
 
 #: src/net/tmwa/guildhandler.cpp:110 src/net/tmwa/guildhandler.cpp:115
-#, fuzzy
 msgid "You already in guild."
-msgstr "Errore durante la creazione della gilda."
+msgstr ""
 
 #: src/net/tmwa/guildhandler.cpp:120
 msgid "Emperium check failed."
 msgstr ""
 
 #: src/net/tmwa/guildhandler.cpp:125
-#, fuzzy
 msgid "Unknown server response."
-msgstr "Errore sconosciuto"
+msgstr ""
 
 #: src/net/tmwa/guildhandler.cpp:203
-#, fuzzy, c-format
+#, c-format
 msgid "Guild name: %s"
-msgstr "Gilda"
+msgstr ""
 
 #: src/net/tmwa/guildhandler.cpp:205
-#, fuzzy, c-format
+#, c-format
 msgid "Guild master: %s"
-msgstr "Gilda"
+msgstr ""
 
 #: src/net/tmwa/guildhandler.cpp:207
-#, fuzzy, c-format
+#, c-format
 msgid "Guild level: %d"
-msgstr "Livello: %d"
+msgstr ""
 
 #: src/net/tmwa/guildhandler.cpp:209
 #, c-format
@@ -5000,24 +4673,24 @@ msgid "Max members: %d"
 msgstr ""
 
 #: src/net/tmwa/guildhandler.cpp:213
-#, fuzzy, c-format
+#, c-format
 msgid "Average level: %d"
-msgstr "Livello massimo"
+msgstr ""
 
 #: src/net/tmwa/guildhandler.cpp:215
-#, fuzzy, c-format
+#, c-format
 msgid "Guild exp: %d"
-msgstr "Gilda"
+msgstr ""
 
 #: src/net/tmwa/guildhandler.cpp:217
-#, fuzzy, c-format
+#, c-format
 msgid "Guild next exp: %d"
-msgstr "La gilda è stata creata."
+msgstr ""
 
 #: src/net/tmwa/guildhandler.cpp:219
-#, fuzzy, c-format
+#, c-format
 msgid "Guild castle: %s"
-msgstr "La gilda è stata creata."
+msgstr ""
 
 #: src/net/tmwa/guildhandler.cpp:434
 msgid "Could not inivte user to guild."
@@ -5028,9 +4701,8 @@ msgid "User rejected guild invite."
 msgstr ""
 
 #: src/net/tmwa/guildhandler.cpp:444
-#, fuzzy
 msgid "User is now part of your guild."
-msgstr "%s è ora un membro del tuo party."
+msgstr ""
 
 #: src/net/tmwa/guildhandler.cpp:449
 msgid "Your guild is full."
@@ -5041,23 +4713,22 @@ msgid "Unknown guild invite response."
 msgstr ""
 
 #: src/net/tmwa/guildhandler.cpp:476
-#, fuzzy
 msgid "You have left the guild."
-msgstr "Hai lasciato il party."
+msgstr ""
 
 #: src/net/tmwa/guildhandler.cpp:490
-#, fuzzy, c-format
+#, c-format
 msgid "%s has left your guild."
-msgstr "%s ha lasciato il tuo party."
+msgstr ""
 
 #: src/net/tmwa/guildhandler.cpp:522
 msgid "You was kicked from guild."
 msgstr ""
 
 #: src/net/tmwa/guildhandler.cpp:536
-#, fuzzy, c-format
+#, c-format
 msgid "%s has kicked from your guild."
-msgstr "%s è ora un membro del tuo party."
+msgstr ""
 
 #: src/net/tmwa/gui/partytab.cpp:68
 msgid "/invite > Invite a player to your party"
@@ -5097,7 +4768,8 @@ msgstr "Comando: /item <politica>"
 #: src/net/tmwa/gui/partytab.cpp:95
 msgid "This command changes the party's item sharing policy."
 msgstr ""
-"Questo comando modifica la politica di condivisione degli oggetti nel gruppo."
+"Questo comando modifica la politica di condivisione degli oggetti nel "
+"gruppo."
 
 #: src/net/tmwa/gui/partytab.cpp:96
 msgid ""
@@ -5150,9 +4822,8 @@ msgid "Item sharing not possible."
 msgstr "Impossibile condividere gli oggetti."
 
 #: src/net/tmwa/gui/partytab.cpp:155
-#, fuzzy
 msgid "Item sharing unknown."
-msgstr "Abilitata la condivisione degli oggetti."
+msgstr ""
 
 #: src/net/tmwa/gui/partytab.cpp:185 src/net/tmwa/partyhandler.cpp:249
 msgid "Experience sharing enabled."
@@ -5167,9 +4838,8 @@ msgid "Experience sharing not possible."
 msgstr "Impossibile condividere l'esperienza."
 
 #: src/net/tmwa/gui/partytab.cpp:194
-#, fuzzy
 msgid "Experience sharing unknown."
-msgstr "Abilitata la condivisione dell'esperienza."
+msgstr ""
 
 #: src/net/tmwa/inventoryhandler.cpp:376
 msgid "Failed to use item."
@@ -5184,29 +4854,24 @@ msgid "Account was not found. Please re-login."
 msgstr "Account non trovato. Perfavore riesegui il login."
 
 #: src/net/tmwa/loginhandler.cpp:97
-#, fuzzy
 msgid "New password too short."
-msgstr "Nuova password troppo corta"
+msgstr ""
 
 #: src/net/tmwa/loginhandler.cpp:162
-#, fuzzy
 msgid "Unregistered ID."
-msgstr "Cancella registrazione"
+msgstr ""
 
 #: src/net/tmwa/loginhandler.cpp:165
-#, fuzzy
 msgid "Wrong password."
-msgstr "Password errata"
+msgstr ""
 
 #: src/net/tmwa/loginhandler.cpp:168
-#, fuzzy
 msgid "Account expired."
-msgstr "Account scaduto"
+msgstr ""
 
 #: src/net/tmwa/loginhandler.cpp:171
-#, fuzzy
 msgid "Rejected from server."
-msgstr "Respinto dal server"
+msgstr ""
 
 #: src/net/tmwa/loginhandler.cpp:174
 msgid ""
@@ -5214,9 +4879,8 @@ msgid ""
 msgstr ""
 
 #: src/net/tmwa/loginhandler.cpp:178
-#, fuzzy
 msgid "Client too old."
-msgstr "La varsione del client è troppo vecchia"
+msgstr ""
 
 #: src/net/tmwa/loginhandler.cpp:181
 #, c-format
@@ -5230,28 +4894,24 @@ msgid "Server overpopulated."
 msgstr ""
 
 #: src/net/tmwa/loginhandler.cpp:191
-#, fuzzy
 msgid "This user name is already taken."
-msgstr "Questo nome utente è già stato preso"
+msgstr ""
 
 #: src/net/tmwa/loginhandler.cpp:197
-#, fuzzy
 msgid "Username permanently erased."
-msgstr "Nome utente già esistente"
+msgstr ""
 
 #: src/net/tmwa/network.cpp:149
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
 #: src/net/tmwa/network.cpp:353
-#, fuzzy
 msgid "Unable to resolve host \""
-msgstr "Impossibile vendere."
+msgstr ""
 
 #: src/net/tmwa/network.cpp:423
-#, fuzzy
 msgid "Connection to server terminated. "
-msgstr "Connessione al server della mappa..."
+msgstr ""
 
 #: src/net/tmwa/partyhandler.cpp:84
 msgid "Could not create party."
@@ -5262,9 +4922,9 @@ msgid "Party successfully created."
 msgstr "Party creato con successo."
 
 #: src/net/tmwa/partyhandler.cpp:141
-#, fuzzy, c-format
+#, c-format
 msgid "%s has join your party."
-msgstr "%s ha lasciato il tuo party."
+msgstr ""
 
 #: src/net/tmwa/partyhandler.cpp:177
 #, c-format
@@ -5375,27 +5035,26 @@ msgstr "Messaggio"
 
 #: src/net/tmwa/playerhandler.cpp:333
 msgid ""
-"You are carrying more than half your weight. You are unable to regain health."
+"You are carrying more than half your weight. You are unable to regain "
+"health."
 msgstr ""
 "Stai trasportando più della metà del tuo peso. Non puoi recuperare le "
 "energie."
 
 #: src/net/tmwa/playerhandler.cpp:343
-#, fuzzy
-msgid "You are carrying less than half your weight. You are can regain health."
+msgid ""
+"You are carrying less than half your weight. You are can regain health."
 msgstr ""
-"Stai trasportando più della metà del tuo peso. Non puoi recuperare le "
-"energie."
 
 #: src/net/tmwa/playerhandler.cpp:448
-#, fuzzy, c-format
+#, c-format
 msgid "You picked up %s."
-msgstr "Hai raccolto "
+msgstr ""
 
 #: src/net/tmwa/playerhandler.cpp:454
-#, fuzzy, c-format
+#, c-format
 msgid "You spent %s."
-msgstr "Hai ottenuto %s"
+msgstr ""
 
 #: src/net/tmwa/playerhandler.cpp:499
 msgid "Cannot raise skill!"
@@ -5520,20 +5179,16 @@ msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
 #: src/net/tmwa/tradehandler.cpp:258
-#, fuzzy
 msgid "Failed adding item. You cant trade this item."
 msgstr ""
-"Aggiunta dell'oggetto fallita. Non puoi sovrapporre un tipo di oggetto sulla "
-"finestra."
 
 #: src/net/tmwa/tradehandler.cpp:262
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
 #: src/playerrelations.cpp:404
-#, fuzzy
 msgid "Completely ignore"
-msgstr "@@ignore|Ignora completamente %s@@"
+msgstr ""
 
 #: src/playerrelations.cpp:418
 msgid "Print '...'"
@@ -5579,671 +5234,3 @@ msgstr "PM %+d"
 #: src/resources/itemdb.cpp:166
 msgid "Unknown item"
 msgstr "Oggetto sconosciuto"
-
-#~ msgid "-- Help --"
-#~ msgstr "-- Aiuto --"
-
-#~ msgid "/help > Display this help"
-#~ msgstr "/help > Mostra questo aiuto"
-
-#~ msgid "/where > Display map name"
-#~ msgstr "/where > Mostra il nome della mappa"
-
-#~ msgid "/who > Display number of online users"
-#~ msgstr "/who > Mostra il numero di utenti in linea"
-
-#~ msgid "/me > Tell something about yourself"
-#~ msgstr "/me > Scrivi un messaggio riguardante te"
-
-#~ msgid "/clear > Clears this window"
-#~ msgstr "/clear > Pulisce questa finestra"
-
-#~ msgid "/msg > Send a private message to a user"
-#~ msgstr "/msg > Invia un messaggio privato ad un utente"
-
-#~ msgid "/whisper > Alias of msg"
-#~ msgstr "/whisper > Equivale a \"msg\""
-
-#~ msgid "/w > Alias of msg"
-#~ msgstr "/w > Equivale a \"msg\""
-
-#~ msgid "/query > Makes a tab for private messages with another user"
-#~ msgstr "/query > Apre una scheda per i messaggi privati con un altro utente"
-
-#~ msgid "/q > Alias of query"
-#~ msgstr "/q > Equivale a \"query\""
-
-#, fuzzy
-#~ msgid "/ignoreall > Ignore all opened whisper tabs"
-#~ msgstr "/close > Chiude la scheda del sussurro"
-
-#, fuzzy
-#~ msgid "/disregard > Disregard a player"
-#~ msgstr "@@disregard|Disprezza %s@@"
-
-#~ msgid "/list > Display all public channels"
-#~ msgstr "/list > Mostra tutti i canali pubblici"
-
-#~ msgid "/join > Join or create a channel"
-#~ msgstr "/join > Partecipa o crea un canale"
-
-#, fuzzy
-#~ msgid "/createparty > Create a new party"
-#~ msgstr "/create > Crea un nuovo party"
-
-#, fuzzy
-#~ msgid "/createguild > Create a new guild"
-#~ msgstr "/create > Crea un nuovo party"
-
-#~ msgid "/party > Invite a user to party"
-#~ msgstr "/party > Invita un utente nel party"
-
-#~ msgid "/toggle > Determine whether <return> toggles the chat log"
-#~ msgstr "/toggle > Determina se <invio> apre/chiude il registro della chat"
-
-#~ msgid ""
-#~ "/present > Get list of players present (sent to chat log, if logging)"
-#~ msgstr ""
-#~ "/present > Ottiene una lista dei giocatori presenti (inviato al registro "
-#~ "di chat, se è attivo)"
-
-#~ msgid "/announce > Global announcement (GM only)"
-#~ msgstr "/announce > Annuncio globale (solo GM)"
-
-#, fuzzy
-#~ msgid "/closeall > Close all opened whisper tabs"
-#~ msgstr "/close > Chiude la scheda del sussurro"
-
-#, fuzzy
-#~ msgid "/mail > Send offline message to player"
-#~ msgstr "/msg > Invia un messaggio privato ad un utente"
-
-#~ msgid "For more information, type /help <command>."
-#~ msgstr "Per maggiori informazioni, digitare /help <comando>."
-
-#~ msgid "Command: /help"
-#~ msgstr "Comando: /help"
-
-#~ msgid "This command displays a list of all commands available."
-#~ msgstr "Questo comando mostra una lista di tutti i comandi disponibili."
-
-#~ msgid "Command: /help <command>"
-#~ msgstr "Comando: /help <comando>"
-
-#~ msgid "This command displays help on <command>."
-#~ msgstr "Questo comando mostra l'aiuto per <comando>."
-
-#~ msgid "Command: /announce <msg>"
-#~ msgstr "Comando: /announce <msg>"
-
-#~ msgid "*** only available to a GM ***"
-#~ msgstr "*** disponibile solo ai GM ***"
-
-#~ msgid ""
-#~ "This command sends the message <msg> to all players currently online."
-#~ msgstr ""
-#~ "Questo comando invia un messaggio <msg> a tutti i giocatori in linea."
-
-#~ msgid "Command: /clear"
-#~ msgstr "Comando: /clear"
-
-#~ msgid "This command clears the chat log of previous chat."
-#~ msgstr "Questo comando pulisce il registro della chat precedente"
-
-#, fuzzy
-#~ msgid "Command: /ignore <player>"
-#~ msgstr "Comando: /item <politica>"
-
-#, fuzzy
-#~ msgid ""
-#~ "This command ignores the given player regardless of current relations."
-#~ msgstr "Questo comando mostra il numero dei giocatori attualmente connessi."
-
-#~ msgid "Command: /join <channel>"
-#~ msgstr "Comando: /join <canale>"
-
-#~ msgid "This command makes you enter <channel>."
-#~ msgstr "Questo comando effettua l'accesso al <canale> specificato."
-
-#~ msgid "If <channel> doesn't exist, it's created."
-#~ msgstr "Se il <canale> non esiste, viene creato."
-
-#~ msgid "Command: /list"
-#~ msgstr "Comando: /list"
-
-#~ msgid "This command shows a list of all channels."
-#~ msgstr "Questo comando mostra una lista di tutti i canali."
-
-#~ msgid "Command: /me <message>"
-#~ msgstr "Comando: /me <messaggio>"
-
-#~ msgid "This command tell others you are (doing) <msg>."
-#~ msgstr "Questo comando mostra agli altri ciò che stai <messaggio>."
-
-#~ msgid "Command: /msg <nick> <message>"
-#~ msgstr "Comando: /msg <nick> <messaggio>"
-
-#~ msgid "Command: /whisper <nick> <message>"
-#~ msgstr "Comando: /whisper <nick> <messaggio>"
-
-#~ msgid "Command: /w <nick> <message>"
-#~ msgstr "Comando: /w <nick> <messaggio>"
-
-#~ msgid "This command sends the text <message> to <nick>."
-#~ msgstr "Questo comando invia il testo <messaggio> all'utente <nick>."
-
-#~ msgid "Command: /query <nick>"
-#~ msgstr "Comando: /query <nick>"
-
-#~ msgid "Command: /q <nick>"
-#~ msgstr "Comando: /q <nick>"
-
-#~ msgid "This command tries to make a tab for whispers betweenyou and <nick>."
-#~ msgstr ""
-#~ "Questo comando tenta di creare una scheda per i sussurri tra te e "
-#~ "l'utente <nick>."
-
-#, fuzzy
-#~ msgid "Command: /away <afk reason>"
-#~ msgstr "Comando: /w <nick> <messaggio>"
-
-#, fuzzy
-#~ msgid "Command: /away"
-#~ msgstr "Comando: /who"
-
-#, fuzzy
-#~ msgid "This command clears the away status and message."
-#~ msgstr "Questo comando imposta l'argomento a <messaggio>"
-
-#, fuzzy
-#~ msgid "Command: /createparty <name>"
-#~ msgstr "Comando: /create <nome-gruppo>"
-
-#, fuzzy
-#~ msgid "This command creates a new party called <name>."
-#~ msgstr "Questi comandi creano un nuovo gruppo chiamato <nome-gruppo>."
-
-#, fuzzy
-#~ msgid "Command: /createguild <name>"
-#~ msgstr "Comando: /create <nome-gruppo>"
-
-#, fuzzy
-#~ msgid "This command creates a new guild called <name>."
-#~ msgstr "Questi comandi creano un nuovo gruppo chiamato <nome-gruppo>."
-
-#~ msgid "Command: /party <nick>"
-#~ msgstr "Comando: /party <nick>"
-
-#~ msgid "Command: /present"
-#~ msgstr "Comando: /present"
-
-#, fuzzy
-#~ msgid ""
-#~ "This command gets a list of players within hearing and sends it to chat "
-#~ "log."
-#~ msgstr ""
-#~ "Questo comando crea una lista dei giocatori che hai attorno e la invia o "
-#~ "alla registrazione della chat se attivata, o alla chat altrimenti."
-
-#~ msgid "Command: /toggle <state>"
-#~ msgstr "Comando: /toggle <stato>"
-
-#~ msgid ""
-#~ "This command sets whether the return key should toggle the chat log, or "
-#~ "whether the chat log turns off automatically."
-#~ msgstr ""
-#~ "Questo comando imposta la chiusura del registro della conversazione "
-#~ "premendo il tasto Invio oppure automaticamente."
-
-#~ msgid ""
-#~ "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
-#~ "\"0\", \"no\", \"false\" to turn the toggle off."
-#~ msgstr ""
-#~ "<stato> può essere \"1\", \"yes\", \"true\" per attivarlo, oppure \"0\", "
-#~ "\"no\", \"false\" per disattivarlo."
-
-#~ msgid "Command: /toggle"
-#~ msgstr "Comando: /toggle"
-
-#~ msgid "This command displays the return toggle status."
-#~ msgstr "Questo comando mostra se il tasto Invio è attivato o meno."
-
-#~ msgid "Command: /where"
-#~ msgstr "Comando: /where"
-
-#~ msgid "This command displays the name of the current map."
-#~ msgstr "Questo comando mostra il nome della mappa attuale."
-
-#~ msgid "Command: /who"
-#~ msgstr "Comando: /who"
-
-#~ msgid "This command displays the number of players currently online."
-#~ msgstr "Questo comando mostra il numero dei giocatori attualmente connessi."
-
-#~ msgid "Type /help for a list of commands."
-#~ msgstr "Digitare /help per una lista dei comandi."
-
-#, fuzzy
-#~ msgid "Particle detail: %s"
-#~ msgstr "Dettagli particelle"
-
-#, fuzzy
-#~ msgid "Ambient FX: %s"
-#~ msgstr "Suoni ambientali"
-
-#, fuzzy
-#~ msgid "Emote Shortcut  %d"
-#~ msgstr "Scorciatoia %d"
-
-#, fuzzy
-#~ msgid "Player position:"
-#~ msgstr "Il giocatore colpisce il mostro"
-
-#, fuzzy
-#~ msgid "Map: %s"
-#~ msgstr "Nome: %s"
-
-#, fuzzy
-#~ msgid "Minimap: %s"
-#~ msgstr "Mini mappa"
-
-#~ msgid "/record > Start recording the chat to an external file"
-#~ msgstr "/record> Inizia la registrazione della chat in un file esterno"
-
-#~ msgid "Command: /record <filename>"
-#~ msgstr "Comando: /record <nome file>"
-
-#~ msgid "This command starts recording the chat log to the file <filename>."
-#~ msgstr ""
-#~ "Questo comando attiva la registrazione della chat nel file <nome file>"
-
-#~ msgid "Command: /record"
-#~ msgstr "Comando: /record"
-
-#~ msgid "This command finishes a recording session."
-#~ msgstr "Questo comando termina la sessione di registrazione."
-
-#~ msgid "Attendance written to record log."
-#~ msgstr "Numero dei presenti registrato."
-
-#~ msgid "Finishing recording."
-#~ msgstr "Registrazione terminata."
-
-#~ msgid "Not currently recording."
-#~ msgstr "Nessuna registrazione in corso."
-
-#~ msgid "Already recording."
-#~ msgstr "La registrazione è già in corso."
-
-#~ msgid "Starting to record..."
-#~ msgstr "Inizio registrazione..."
-
-#~ msgid "Failed to start recording."
-#~ msgstr "Impossibile iniziare la registrazione."
-
-#~ msgid "Recording..."
-#~ msgstr "Registrazione..."
-
-#~ msgid "Stop recording"
-#~ msgstr "Ferma registrazione"
-
-#~ msgid "Find Path to Mouse"
-#~ msgstr "Trova il percorso sino al mouse"
-
-#, fuzzy
-#~ msgid "HP"
-#~ msgstr "HP:"
-
-#, fuzzy
-#~ msgid "MP"
-#~ msgstr "MP:"
-
-#, fuzzy
-#~ msgid "Exp"
-#~ msgstr "Esperienza:"
-
-#, fuzzy
-#~ msgid "Money"
-#~ msgstr "Soldi: %d"
-
-#, fuzzy
-#~ msgid "Job"
-#~ msgstr "Lavoro:"
-
-#, fuzzy
-#~ msgid "Level"
-#~ msgstr "Livello: %d"
-
-#, fuzzy
-#~ msgid "Player successfully ignored!"
-#~ msgstr "Party creato con successo."
-
-#, fuzzy
-#~ msgid "Player could not be ignored!"
-#~ msgstr "Il bisbiglio non può essere inviato, ignorato dall'utente."
-
-#, fuzzy
-#~ msgid "  -C --config-file    : Configuration file to use"
-#~ msgstr "  -C --config-file : File di configurazione da utilizzare"
-
-#, fuzzy
-#~ msgid "  -l --chat-log-dir   : Chat log dir to use"
-#~ msgstr "  -C --config-file : File di configurazione da utilizzare"
-
-#~ msgid "Sound"
-#~ msgstr "Suono"
-
-#, fuzzy
-#~ msgid "Access denied."
-#~ msgstr "Accesso negato"
-
-#, fuzzy
-#~ msgid "Unknown failure to select character."
-#~ msgstr "Cancellazione del personaggio fallita."
-
-#, fuzzy
-#~ msgid "You can only invite when you are in a party!"
-#~ msgstr "%s ti ha invitato ad unirti al suo party."
-
-#~ msgid "Willpower:"
-#~ msgstr "Volontà:"
-
-#, fuzzy
-#~ msgid "Trade with %s..."
-#~ msgstr "Commerciando con %s"
-
-#, fuzzy
-#~ msgid "Whisper %s"
-#~ msgstr "Sussurro"
-
-#, fuzzy
-#~ msgid "Befriend %s"
-#~ msgstr "@@friend|Amico con %s@@"
-
-#, fuzzy
-#~ msgid "Disregard %s"
-#~ msgstr "Disprezzato"
-
-#, fuzzy
-#~ msgid "Completely ignore %s"
-#~ msgstr "@@ignore|Ignora completamente %s@@"
-
-#, fuzzy
-#~ msgid "Invite %s to join your guild"
-#~ msgstr "@@guild|Invita %s ad entrare nella tua gilda@@"
-
-#, fuzzy
-#~ msgid "Invite %s to join your party"
-#~ msgstr "@@party|Invita %s ad entrare nel tuo party@@"
-
-#, fuzzy
-#~ msgid "Kick player"
-#~ msgstr "Espulsione fallita!"
-
-#, fuzzy
-#~ msgid "Talk to %s"
-#~ msgstr "@@talk|Parla a %s@@"
-
-#, fuzzy
-#~ msgid "Kick monster"
-#~ msgstr "@@admin-kick|Espelli mostro@@"
-
-#, fuzzy
-#~ msgid "Pick up %s"
-#~ msgstr "Raccogli"
-
-#~ msgid "Cannot send empty chat!"
-#~ msgstr "Non puoi inviare un messaggio vuoto!"
-
-#~ msgid "Unable to unequip."
-#~ msgstr "Impossibile equipaggiare."
-
-#~ msgid "Text Shadow"
-#~ msgstr "Ombra del testo"
-
-#~ msgid "Text Outline"
-#~ msgstr "Contorno del testo"
-
-#~ msgid "Progress Bar Labels"
-#~ msgstr "Etichetta della barra di progresso"
-
-#, fuzzy
-#~ msgid "Item Too Expensive"
-#~ msgstr "L'oggetto è troppo costoso"
-
-#, fuzzy
-#~ msgid "Item Is Equipped"
-#~ msgstr "L'oggetto è equipaggiato"
-
-#~ msgid "GM"
-#~ msgstr "GM"
-
-#~ msgid "Player"
-#~ msgstr "Giocatore"
-
-#~ msgid "Whisper"
-#~ msgstr "Sussurro"
-
-#~ msgid "Is"
-#~ msgstr "è"
-
-#~ msgid "Server"
-#~ msgstr "Server"
-
-#~ msgid "Unknown Item Type"
-#~ msgstr "Tipo di oggetto sconosciuto"
-
-#~ msgid "Generics"
-#~ msgstr "Generici"
-
-#~ msgid "Hats"
-#~ msgstr "Cappelli"
-
-#~ msgid "Usables"
-#~ msgstr "Utilizzabili"
-
-#~ msgid "Shirts"
-#~ msgstr "Magliette"
-
-#, fuzzy
-#~ msgid "One Handed Weapons"
-#~ msgstr "Armi da mano singola"
-
-#~ msgid "Pants"
-#~ msgstr "Pantaloni"
-
-#~ msgid "Shoes"
-#~ msgstr "Scarpe"
-
-#, fuzzy
-#~ msgid "Two Handed Weapons"
-#~ msgstr "Armi da mano singola"
-
-#~ msgid "Shields"
-#~ msgstr "Scudi"
-
-#~ msgid "Rings"
-#~ msgstr "Anelli"
-
-#~ msgid "Necklaces"
-#~ msgstr "Collane"
-
-#~ msgid "Arms"
-#~ msgstr "Armi"
-
-#~ msgid "Ammo"
-#~ msgstr "Munizioni"
-
-#~ msgid "HP Bar"
-#~ msgstr "Barra HP"
-
-#~ msgid "3/4 HP Bar"
-#~ msgstr "3/4 della barra degli HP"
-
-#~ msgid "1/2 HP Bar"
-#~ msgstr "1/2 della barra degli HP"
-
-#~ msgid "1/4 HP Bar"
-#~ msgstr "1/4 della barra degli HP"
-
-#~ msgid "no"
-#~ msgstr "no"
-
-#~ msgid "Buddy"
-#~ msgstr "Amico"
-
-#~ msgid "Buddy List"
-#~ msgstr "Lista degli amici"
-
-#~ msgid "Description: %s"
-#~ msgstr "Descrizione : %s"
-
-#~ msgid "Effect: %s"
-#~ msgstr "Effetto : %s"
-
-#~ msgid "Previous"
-#~ msgstr "Precedente"
-
-#~ msgid "New"
-#~ msgstr "Nuovo"
-
-#~ msgid "Job Level: %d"
-#~ msgstr "Livello lavoro: %d"
-
-#~ msgid "Present: "
-#~ msgstr "Present: "
-
-#~ msgid "Quit Guild"
-#~ msgstr "Esci dalla Gilda"
-
-#~ msgid "Ok"
-#~ msgstr "Ok"
-
-#~ msgid "Recent:"
-#~ msgstr "Recenti:"
-
-#~ msgid "Cast Test Spell 1"
-#~ msgstr "Invoca l'incantesimo Test Spell 1"
-
-#~ msgid "Cast Test Spell 2"
-#~ msgstr "Invoca l'incantesimo Test Spell 2"
-
-#~ msgid "Cast Test Spell 3"
-#~ msgstr "Invoca l'incantesimo Test Spell 3"
-
-#~ msgid "2 Handed Weapons"
-#~ msgstr "Armi da due mani"
-
-#~ msgid "@@use|Unequip@@"
-#~ msgstr "@@use|Togli@@"
-
-#~ msgid "@@use|Equip@@"
-#~ msgstr "@@use|Equipaggia@@"
-
-#~ msgid "@@drop|Drop@@"
-#~ msgstr "@@drop|Lascia@@"
-
-#~ msgid "@@split|Split@@"
-#~ msgstr "@@split|Lascia@@"
-
-#~ msgid "Select Server"
-#~ msgstr "Selezione server"
-
-#~ msgid "Failed to switch to "
-#~ msgstr "Impossibile passare a modalità "
-
-#~ msgid "windowed"
-#~ msgstr "finestra"
-
-#~ msgid "fullscreen"
-#~ msgstr "schermo intero"
-
-#~ msgid "Mystery Skill"
-#~ msgstr "Abilità misteriosa"
-
-#~ msgid "Weapons"
-#~ msgstr "Armi"
-
-#~ msgid "Stats"
-#~ msgstr "Statistiche"
-
-#~ msgid "Total"
-#~ msgstr "Totale"
-
-#~ msgid "Cost"
-#~ msgstr "Costo"
-
-#~ msgid "Attack:"
-#~ msgstr "Attacco:"
-
-#~ msgid "% Reflex:"
-#~ msgstr "% Riflessi:"
-
-#~ msgid "Remaining Status Points: %d"
-#~ msgstr "Punti Stato rimanenti: %d"
-
-#~ msgid "curl error "
-#~ msgstr "errore di curl "
-
-#~ msgid " host: "
-#~ msgstr " host: "
-
-#~ msgid "Buddys"
-#~ msgstr "Amici"
-
-#~ msgid "Party Window"
-#~ msgstr "Finestra del Party"
-
-#~ msgid "Unarmed"
-#~ msgstr "Disarmato"
-
-#~ msgid "Knife"
-#~ msgstr "Coltello"
-
-#~ msgid "Sword"
-#~ msgstr "Spada"
-
-#~ msgid "Staff"
-#~ msgstr "Staffa"
-
-#~ msgid "Whip"
-#~ msgstr "Frusta"
-
-#~ msgid "Bow"
-#~ msgstr "Arco"
-
-#~ msgid "Mace"
-#~ msgstr "Mazza"
-
-#~ msgid "Axe"
-#~ msgstr "Ascia"
-
-#~ msgid "Unknown Skill"
-#~ msgstr "Capacità sconosciuta"
-
-#~ msgid " can't be created, but it doesn't exist! Exiting."
-#~ msgstr " non può essere creato, perché non esiste! Uscita."
-
-#~ msgid "Couldn't set "
-#~ msgstr "Impossibile impostare "
-
-#~ msgid " video mode: "
-#~ msgstr " modalità video: "
-
-#~ msgid "Connecting to character server..."
-#~ msgstr "Connessione al server del personaggio..."
-
-#~ msgid "Connecting to account server..."
-#~ msgstr "Connessione al server dell'account..."
-
-#~ msgid "Command: /new <party-name>"
-#~ msgstr "Comando: /new <nome-gruppo>"
-
-#~ msgid "@@pickup|Pick Up %s@@"
-#~ msgstr "@@pickup|Raccogli %s@@"
-
-#~ msgid "Scroll radius"
-#~ msgstr "Raggio dello scroll"
-
-#~ msgid "Scroll laziness"
-#~ msgstr "Lentezza dello scroll"
diff --git a/po/pt.po b/po/pt.po
index 9e24f861e..75423cf70 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -2,25 +2,24 @@
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: manaplus\n"
+"Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
 "POT-Creation-Date: 2011-04-15 20:28+0300\n"
-"PO-Revision-Date: 2011-03-29 23:07+0000\n"
-"Last-Translator: freya <freya.df@gmail.com>\n"
+"PO-Revision-Date: 2011-04-15 17:33+0000\n"
+"Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Portuguese <>\n"
-"Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: pt\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
 #: src/actorspritemanager.cpp:909
-#, fuzzy
 msgid "Visible on map"
-msgstr "Nomes visíveis"
+msgstr "Visivel no mapa"
 
 #: src/being.cpp:489
 msgid "dodge"
@@ -126,11 +125,11 @@ msgstr "Não é possível enviar mensagens privadas vazias!"
 #: src/commandhandler.cpp:380
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
-"you."
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
+" you."
 msgstr ""
-"Não é possível  criar uma aba de mensagem privada para o nick \"%s\"! Ou ela "
-"já existe ou é você mesmo."
+"Não é possível  criar uma aba de mensagem privada para o nick \"%s\"! Ou ela"
+" já existe ou é você mesmo."
 
 #: src/commandhandler.cpp:400
 #, c-format
@@ -258,25 +257,21 @@ msgstr[0] "%d segundo"
 msgstr[1] "%d segundos"
 
 #: src/commandhandler.cpp:995
-#, fuzzy
 msgid "font cache size"
-msgstr "Tamanho da fonte"
+msgstr "Tamanho do cache de fonte"
 
 #: src/commandhandler.cpp:1008
-#, fuzzy
 msgid "Created: "
-msgstr "Criar"
+msgstr "Criado:"
 
 #: src/commandhandler.cpp:1009
-#, fuzzy
 msgid "Deleted: "
-msgstr "Excluir"
+msgstr "Deletado:"
 
 #: src/commandhandler.h:40
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr ""
-"Opções para /%s são \"yes\" e \"no\", \"true\" e \"false\", \"1\" e \"0\"."
+msgstr "Opções para /%s são \"yes\" e \"no\", \"true\" e \"false\", \"1\" e \"0\"."
 
 #: src/game.cpp:228 src/gui/widgets/chattab.cpp:395
 msgid "General"
@@ -517,7 +512,7 @@ msgstr "Estilo do Cabelo:"
 
 #: src/gui/charcreatedialog.cpp:87
 msgid "Race:"
-msgstr ""
+msgstr "Corrida:"
 
 #: src/gui/charcreatedialog.cpp:90 src/gui/charselectdialog.cpp:447
 #: src/gui/socialwindow.cpp:847
@@ -1696,9 +1691,8 @@ msgid "Limit max lines in chat"
 msgstr "Limite de linhas máximas no chat"
 
 #: src/gui/setup_chat.cpp:132
-#, fuzzy
 msgid "Resize chat tabs if need"
-msgstr "Passa aba de chat"
+msgstr "Redimensionar as abas de chat caso precisar"
 
 #: src/gui/setup_colors.cpp:46
 msgid "This is what the color looks like"
@@ -3021,7 +3015,8 @@ msgid "Change"
 msgstr "Mudar"
 
 #: src/gui/trade.cpp:314
-msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Falha ao adicionar item. Você não pode duplicar este tipo de item na janela."
 
@@ -3361,7 +3356,8 @@ msgid "Command: /unignore <player>"
 msgstr "Comando: /unignore <jogador>"
 
 #: src/gui/widgets/whispertab.cpp:129
-msgid "This command stops ignoring the other player if they are being ignored."
+msgid ""
+"This command stops ignoring the other player if they are being ignored."
 msgstr ""
 "Este comando para de ignorar o outro jogador se ele estiver sendo ignorado."
 
@@ -3883,22 +3879,19 @@ msgstr "Indisponivel "
 
 #: src/localplayer.cpp:3392
 msgid "Follow: "
-msgstr ""
+msgstr "Seguindo:"
 
 #: src/localplayer.cpp:3394 src/localplayer.cpp:3409
-#, fuzzy
 msgid "Follow canceled"
-msgstr "Negociação cancelada."
+msgstr "Seguir cancelado"
 
 #: src/localplayer.cpp:3401
-#, fuzzy
 msgid "Imitation: "
-msgstr "(?) Mímica"
+msgstr "Imitando:"
 
 #: src/localplayer.cpp:3403 src/localplayer.cpp:3411
-#, fuzzy
 msgid "Imitation canceled"
-msgstr "Negociação cancelada."
+msgstr "Imitação cancelada"
 
 #: src/localplayer.cpp:3763
 msgid "You see "
@@ -4803,7 +4796,8 @@ msgstr "Comando: /exp <policy>"
 
 #: src/net/tmwa/gui/partytab.cpp:106
 msgid "This command changes the party's experience sharing policy."
-msgstr "Este comando muda a opção de compartilhamento de experiência do grupo."
+msgstr ""
+"Este comando muda a opção de compartilhamento de experiência do grupo."
 
 #: src/net/tmwa/gui/partytab.cpp:108
 msgid ""
@@ -4820,7 +4814,8 @@ msgstr "Comando: /exp"
 #: src/net/tmwa/gui/partytab.cpp:112
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
-"Este comando exibe a atual opção de compartilhamento de experiência do grupo."
+"Este comando exibe a atual opção de compartilhamento de experiência do "
+"grupo."
 
 #: src/net/tmwa/gui/partytab.cpp:146 src/net/tmwa/partyhandler.cpp:287
 msgid "Item sharing enabled."
@@ -4894,9 +4889,8 @@ msgstr ""
 "algum GM."
 
 #: src/net/tmwa/loginhandler.cpp:178
-#, fuzzy
 msgid "Client too old."
-msgstr "Versão do cliente é muito antiga."
+msgstr ""
 
 #: src/net/tmwa/loginhandler.cpp:181
 #, c-format
@@ -4916,9 +4910,8 @@ msgid "This user name is already taken."
 msgstr "Este nome de usuário já está em uso."
 
 #: src/net/tmwa/loginhandler.cpp:197
-#, fuzzy
 msgid "Username permanently erased."
-msgstr "Nome de usuário já existe."
+msgstr ""
 
 #: src/net/tmwa/network.cpp:149
 msgid "Empty address given to Network::connect()!"
@@ -5056,13 +5049,15 @@ msgstr "Mensagem"
 
 #: src/net/tmwa/playerhandler.cpp:333
 msgid ""
-"You are carrying more than half your weight. You are unable to regain health."
+"You are carrying more than half your weight. You are unable to regain "
+"health."
 msgstr ""
 "Você está carregando mais que a metade de seu peso. Você não poderá mais "
 "recuperar HP."
 
 #: src/net/tmwa/playerhandler.cpp:343
-msgid "You are carrying less than half your weight. You are can regain health."
+msgid ""
+"You are carrying less than half your weight. You are can regain health."
 msgstr ""
 "Você está carregando mais que a metade de seu peso. Você não poderá mais "
 "recuperar HP."
@@ -5255,287 +5250,3 @@ msgstr "MP %+d"
 #: src/resources/itemdb.cpp:166
 msgid "Unknown item"
 msgstr "Item desconhecido"
-
-#~ msgid "-- Help --"
-#~ msgstr "--Ajuda--"
-
-#~ msgid "/help > Display this help"
-#~ msgstr "/help > Exibe esta ajuda"
-
-#~ msgid "/where > Display map name"
-#~ msgstr "/where > Exibe o nome do mapa"
-
-#~ msgid "/who > Display number of online users"
-#~ msgstr "/who > Exibe o número de usuários online"
-
-#~ msgid "/me > Tell something about yourself"
-#~ msgstr "/me > Diz alguma coisa sobre você"
-
-#~ msgid "/clear > Clears this window"
-#~ msgstr "/clear > Limpa janela atual"
-
-#~ msgid "/msg > Send a private message to a user"
-#~ msgstr "/msg > Envia uma messagem privada a um usuário"
-
-#~ msgid "/whisper > Alias of msg"
-#~ msgstr "/whisper > O mesmo que /msg"
-
-#~ msgid "/w > Alias of msg"
-#~ msgstr "/w > O mesmo que /msg"
-
-#~ msgid "/query > Makes a tab for private messages with another user"
-#~ msgstr "/query > Abre uma aba de chat com outro usuário"
-
-#~ msgid "/q > Alias of query"
-#~ msgstr "/q > O mesmo que /query"
-
-#~ msgid "/away > Tell the other whispering players you're away from keyboard."
-#~ msgstr ""
-#~ "/away > Diz que você está longe do teclado para quem te enviar uma "
-#~ "mensagem privada ."
-
-#~ msgid "/ignore > ignore a player"
-#~ msgstr "/ignore > Ignora um jogador"
-
-#~ msgid "/unignore > stop ignoring a player"
-#~ msgstr "/unignore > Deixa de ignorar um jogador"
-
-#~ msgid "/ignoreall > Ignore all opened whisper tabs"
-#~ msgstr "/ignoreall > Ignorar todas abas abertas"
-
-#~ msgid "/erase > Erase a player"
-#~ msgstr "/erase > Apaga um jogador"
-
-#~ msgid "/befriend > Be friend a player"
-#~ msgstr "/befriend > Ser amigo de um jogador"
-
-#~ msgid "/disregard > Disregard a player"
-#~ msgstr "/disregard > Desconsiderar um jogador"
-
-#~ msgid "/neutral > Neutral a player"
-#~ msgstr "/neutral > Deixar jogador neutro"
-
-#~ msgid "/list > Display all public channels"
-#~ msgstr "/list > Exibir todos os canais públicos"
-
-#~ msgid "/join > Join or create a channel"
-#~ msgstr "/join > Criar ou entrar em um canal"
-
-#~ msgid "/createparty > Create a new party"
-#~ msgstr "/createparty > Cria um novo grupo"
-
-#~ msgid "/createguild > Create a new guild"
-#~ msgstr "/createguild > Cria uma nova guilda"
-
-#~ msgid "/party > Invite a user to party"
-#~ msgstr "/party > Convidar um usuário para o grupo"
-
-#~ msgid "/toggle > Determine whether <return> toggles the chat log"
-#~ msgstr "/toggle > Determina se <enter> exibe a janela de chat"
-
-#~ msgid ""
-#~ "/present > Get list of players present (sent to chat log, if logging)"
-#~ msgstr ""
-#~ "/present > Mostra a lista de jogadores presentes (envia para o log de "
-#~ "chat, se estiver gravando)"
-
-#~ msgid "/announce > Global announcement (GM only)"
-#~ msgstr "/announce > Anúncio Global (Somente GM)"
-
-#~ msgid "/closeall > Close all opened whisper tabs"
-#~ msgstr "/closeall > Fecha todas as abas abertas"
-
-#~ msgid "/all > Show all visible beings in debug tab"
-#~ msgstr "/all > Mostrar todos os seres visíveis na aba do Depurador"
-
-#~ msgid "/move > Move to given position"
-#~ msgstr "/move > Mover para a posição marcada"
-
-#~ msgid "/navigate > Draw path to given position"
-#~ msgstr "/navigate > Marcar um caminho para uma posição determinada"
-
-#~ msgid "/target > Set target to being"
-#~ msgstr "/target > Definir um alvo"
-
-#~ msgid "/outfit > Wear outfit by index"
-#~ msgstr "/outfit > Usar roupa por índice"
-
-#~ msgid "/emote > Show emote by index"
-#~ msgstr "/emote > Mostrar emoticons por índice"
-
-#~ msgid "/follow > Follow player"
-#~ msgstr "/follow > Seguir jogador"
-
-#~ msgid "/imitation > Imitate player"
-#~ msgstr "/imitation > Imitar jogador"
-
-#~ msgid "/heal > Heal player"
-#~ msgstr "/heal > Curar jogador"
-
-#~ msgid "/mail > Send offline message to player"
-#~ msgstr "/mail > Enviar menssagem a um jogador offline"
-
-#~ msgid "For more information, type /help <command>."
-#~ msgstr "Para mais informações, digite /help <comando>."
-
-#~ msgid "Command: /help"
-#~ msgstr "Comando: /help"
-
-#~ msgid "This command displays a list of all commands available."
-#~ msgstr "Exibe uma lista de todos os comandos disponíveis."
-
-#~ msgid "Command: /help <command>"
-#~ msgstr "Comando: /help <comando>"
-
-#~ msgid "This command displays help on <command>."
-#~ msgstr "Exibe o conteúdo de ajuda do <comando>"
-
-#~ msgid "Command: /announce <msg>"
-#~ msgstr "Comando: /announce <msg>"
-
-#~ msgid "*** only available to a GM ***"
-#~ msgstr "*** Disponivel apenas a GM's ***"
-
-#~ msgid ""
-#~ "This command sends the message <msg> to all players currently online."
-#~ msgstr "Este comando envia a mensagem <msg> para todos os jogadores online."
-
-#~ msgid "Command: /clear"
-#~ msgstr "Comando: /clear"
-
-#~ msgid "This command clears the chat log of previous chat."
-#~ msgstr "Este comando limpa a janela de chat."
-
-#~ msgid "Command: /ignore <player>"
-#~ msgstr "Comando: /ignore <nome do jogador>"
-
-#~ msgid ""
-#~ "This command ignores the given player regardless of current relations."
-#~ msgstr ""
-#~ "Este comando ignora o jogador indicado, independente de sua relação com o "
-#~ "mesmo."
-
-#~ msgid "Command: /join <channel>"
-#~ msgstr "Comando: /join <canal>"
-
-#~ msgid "This command makes you enter <channel>."
-#~ msgstr "Este comando faz você entrar em <canal>."
-
-#~ msgid "If <channel> doesn't exist, it's created."
-#~ msgstr "Se o <canal> não existe, ele será criado."
-
-#~ msgid "Command: /list"
-#~ msgstr "Comando: /list"
-
-#~ msgid "This command shows a list of all channels."
-#~ msgstr "Este comando exibe uma lista com todos os canais."
-
-#~ msgid "Command: /me <message>"
-#~ msgstr "Comando: /me <mensagem>"
-
-#~ msgid "This command tell others you are (doing) <msg>."
-#~ msgstr "Este comando diz aos outros o que eu estou (a fazer) <msg>."
-
-#~ msgid "Command: /msg <nick> <message>"
-#~ msgstr "Comando: /msg <nick> <mensagem>"
-
-#~ msgid "Command: /whisper <nick> <message>"
-#~ msgstr "Comando: /whisper <nick> <mensagem>"
-
-#~ msgid "Command: /w <nick> <message>"
-#~ msgstr "Comando: /w <nick> <mensagem>"
-
-#~ msgid "This command sends the text <message> to <nick>."
-#~ msgstr "Este comando envia o texto <mensagem> para <nick>."
-
-#~ msgid "Command: /query <nick>"
-#~ msgstr "Comando: /query <nick>"
-
-#~ msgid "Command: /q <nick>"
-#~ msgstr "Comando: /q <nick>"
-
-#~ msgid "This command tries to make a tab for whispers betweenyou and <nick>."
-#~ msgstr ""
-#~ "Este comando cria uma aba para mensagens privadas entre você e <nick>."
-
-#~ msgid "Command: /away <afk reason>"
-#~ msgstr "Comando: /away <motivo>"
-
-#~ msgid "This command tells you're away from keyboard with the given reason."
-#~ msgstr ""
-#~ "Este comando mostra que você está longe do teclado, indicando a razão "
-#~ "dada."
-
-#~ msgid "Command: /away"
-#~ msgstr "Comando: /away"
-
-#~ msgid "This command clears the away status and message."
-#~ msgstr "Este comando limpa o status e a mensagem \"away\"."
-
-#~ msgid "Command: /createparty <name>"
-#~ msgstr "Comando: /createparty <nome>"
-
-#~ msgid "This command creates a new party called <name>."
-#~ msgstr "Este comando cria um novo grupo chamado <nome>."
-
-#~ msgid "Command: /createguild <name>"
-#~ msgstr "Comando: /createguild <nome>"
-
-#~ msgid "This command creates a new guild called <name>."
-#~ msgstr "Este comando cria uma nova guilda chamada <nome>"
-
-#~ msgid "Command: /party <nick>"
-#~ msgstr "Comando: /party <nick>"
-
-#~ msgid "Command: /present"
-#~ msgstr "Comando: /present"
-
-#~ msgid ""
-#~ "This command gets a list of players within hearing and sends it to chat "
-#~ "log."
-#~ msgstr ""
-#~ "Este comando busca uma lista de jogadores por perto e envia para o chat."
-
-#~ msgid "Command: /toggle <state>"
-#~ msgstr "Comando: /toggle <estado>"
-
-#~ msgid ""
-#~ "This command sets whether the return key should toggle the chat log, or "
-#~ "whether the chat log turns off automatically."
-#~ msgstr ""
-#~ "Este comando define se a tecla enter deve alternar para o log do chat ou "
-#~ "se o log do chat fica oculto automaticamente."
-
-#~ msgid ""
-#~ "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
-#~ "\"0\", \"no\", \"false\" to turn the toggle off."
-#~ msgstr ""
-#~ "<estado> pode ser \"1\", \"yes\" e \"true\" para ativar ou \"0\", \"no\" "
-#~ "e \"false\" para desativar."
-
-#~ msgid "Command: /toggle"
-#~ msgstr "Comando: /toggle"
-
-#~ msgid "This command displays the return toggle status."
-#~ msgstr "Este comando mostra o status da tecla enter."
-
-#~ msgid ""
-#~ "This command stops ignoring the given player if they are being ignored"
-#~ msgstr ""
-#~ "Este comando para de ignorar o jogador indicado se ele estiver sendo "
-#~ "ignorado"
-
-#~ msgid "Command: /where"
-#~ msgstr "Comando: /where"
-
-#~ msgid "This command displays the name of the current map."
-#~ msgstr "Mostra o nome do mapa atual."
-
-#~ msgid "Command: /who"
-#~ msgstr "Comando: /who"
-
-#~ msgid "This command displays the number of players currently online."
-#~ msgstr "Exibe o número total de jogadores online."
-
-#~ msgid "Type /help for a list of commands."
-#~ msgstr "Digite /help para uma lista de todos os comandos."
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 8fee60bdc..7f97dfa21 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -2,25 +2,24 @@
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: manaplus\n"
+"Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
 "POT-Creation-Date: 2011-04-15 20:28+0300\n"
-"PO-Revision-Date: 2011-03-29 22:50+0000\n"
-"Last-Translator: freya <freya.df@gmail.com>\n"
+"PO-Revision-Date: 2011-04-15 17:33+0000\n"
+"Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Portuguese (Brazilian) <>\n"
-"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
 #: src/actorspritemanager.cpp:909
-#, fuzzy
 msgid "Visible on map"
-msgstr "Nomes visíveis"
+msgstr "Mapa visivel "
 
 #: src/being.cpp:489
 msgid "dodge"
@@ -126,11 +125,11 @@ msgstr "Não é possível enviar mensagens privadas vazias!"
 #: src/commandhandler.cpp:380
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
-"you."
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
+" you."
 msgstr ""
-"Não é possível  criar uma aba de mensagem privada para o nick \"%s\"! Ou ela "
-"já existe ou é você mesmo."
+"Não é possível  criar uma aba de mensagem privada para o nick \"%s\"! Ou ela"
+" já existe ou é você mesmo."
 
 #: src/commandhandler.cpp:400
 #, c-format
@@ -258,25 +257,21 @@ msgstr[0] "%d segundo"
 msgstr[1] "%d segundos"
 
 #: src/commandhandler.cpp:995
-#, fuzzy
 msgid "font cache size"
-msgstr "Tamanho da fonte"
+msgstr "Tamanho de fonte Cache"
 
 #: src/commandhandler.cpp:1008
-#, fuzzy
 msgid "Created: "
-msgstr "Criar"
+msgstr "Criado:"
 
 #: src/commandhandler.cpp:1009
-#, fuzzy
 msgid "Deleted: "
-msgstr "Excluir"
+msgstr "Deletado:"
 
 #: src/commandhandler.h:40
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr ""
-"Opções para /%s são \"yes\" e \"no\", \"true\" e \"false\", \"1\" e \"0\"."
+msgstr "Opções para /%s são \"yes\" e \"no\", \"true\" e \"false\", \"1\" e \"0\"."
 
 #: src/game.cpp:228 src/gui/widgets/chattab.cpp:395
 msgid "General"
@@ -517,7 +512,7 @@ msgstr "Estilo do Cabelo:"
 
 #: src/gui/charcreatedialog.cpp:87
 msgid "Race:"
-msgstr ""
+msgstr "Corrida:"
 
 #: src/gui/charcreatedialog.cpp:90 src/gui/charselectdialog.cpp:447
 #: src/gui/socialwindow.cpp:847
@@ -1696,9 +1691,8 @@ msgid "Limit max lines in chat"
 msgstr "Limite de linhas máximas no chat"
 
 #: src/gui/setup_chat.cpp:132
-#, fuzzy
 msgid "Resize chat tabs if need"
-msgstr "Passa aba de chat"
+msgstr "Redimensionar aba de chat caso precisar"
 
 #: src/gui/setup_colors.cpp:46
 msgid "This is what the color looks like"
@@ -3021,7 +3015,8 @@ msgid "Change"
 msgstr "Mudar"
 
 #: src/gui/trade.cpp:314
-msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Falha ao adicionar item. Você não pode duplicar este tipo de item na janela."
 
@@ -3361,7 +3356,8 @@ msgid "Command: /unignore <player>"
 msgstr "Comando: /unignore <jogador>"
 
 #: src/gui/widgets/whispertab.cpp:129
-msgid "This command stops ignoring the other player if they are being ignored."
+msgid ""
+"This command stops ignoring the other player if they are being ignored."
 msgstr ""
 "Este comando para de ignorar o outro jogador se ele estiver sendo ignorado."
 
@@ -3883,22 +3879,19 @@ msgstr "Indisponivel "
 
 #: src/localplayer.cpp:3392
 msgid "Follow: "
-msgstr ""
+msgstr "Seguindo:"
 
 #: src/localplayer.cpp:3394 src/localplayer.cpp:3409
-#, fuzzy
 msgid "Follow canceled"
-msgstr "Negociação cancelada."
+msgstr "Seguindo cancelado"
 
 #: src/localplayer.cpp:3401
-#, fuzzy
 msgid "Imitation: "
-msgstr "(?) Mímica"
+msgstr "Imitando:"
 
 #: src/localplayer.cpp:3403 src/localplayer.cpp:3411
-#, fuzzy
 msgid "Imitation canceled"
-msgstr "Negociação cancelada."
+msgstr "Imitação cancelada"
 
 #: src/localplayer.cpp:3763
 msgid "You see "
@@ -4803,7 +4796,8 @@ msgstr "Comando: /exp <policy>"
 
 #: src/net/tmwa/gui/partytab.cpp:106
 msgid "This command changes the party's experience sharing policy."
-msgstr "Este comando muda a opção de compartilhamento de experiência do grupo."
+msgstr ""
+"Este comando muda a opção de compartilhamento de experiência do grupo."
 
 #: src/net/tmwa/gui/partytab.cpp:108
 msgid ""
@@ -4820,7 +4814,8 @@ msgstr "Comando: /exp"
 #: src/net/tmwa/gui/partytab.cpp:112
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
-"Este comando exibe a atual opção de compartilhamento de experiência do grupo."
+"Este comando exibe a atual opção de compartilhamento de experiência do "
+"grupo."
 
 #: src/net/tmwa/gui/partytab.cpp:146 src/net/tmwa/partyhandler.cpp:287
 msgid "Item sharing enabled."
@@ -4894,9 +4889,8 @@ msgstr ""
 "algum GM."
 
 #: src/net/tmwa/loginhandler.cpp:178
-#, fuzzy
 msgid "Client too old."
-msgstr "Versão do cliente é muito antiga."
+msgstr ""
 
 #: src/net/tmwa/loginhandler.cpp:181
 #, c-format
@@ -4916,9 +4910,8 @@ msgid "This user name is already taken."
 msgstr "Este nome de usuário já está em uso."
 
 #: src/net/tmwa/loginhandler.cpp:197
-#, fuzzy
 msgid "Username permanently erased."
-msgstr "Nome de usuário já existe."
+msgstr ""
 
 #: src/net/tmwa/network.cpp:149
 msgid "Empty address given to Network::connect()!"
@@ -5056,13 +5049,15 @@ msgstr "Mensagem"
 
 #: src/net/tmwa/playerhandler.cpp:333
 msgid ""
-"You are carrying more than half your weight. You are unable to regain health."
+"You are carrying more than half your weight. You are unable to regain "
+"health."
 msgstr ""
 "Você está carregando mais que a metade de seu peso. Você não poderá mais "
 "recuperar HP."
 
 #: src/net/tmwa/playerhandler.cpp:343
-msgid "You are carrying less than half your weight. You are can regain health."
+msgid ""
+"You are carrying less than half your weight. You are can regain health."
 msgstr ""
 "Você está carregando mais que a metade de seu peso. Você não poderá mais "
 "recuperar HP."
@@ -5255,287 +5250,3 @@ msgstr "MP %+d"
 #: src/resources/itemdb.cpp:166
 msgid "Unknown item"
 msgstr "Item desconhecido"
-
-#~ msgid "-- Help --"
-#~ msgstr "--Ajuda--"
-
-#~ msgid "/help > Display this help"
-#~ msgstr "/help > Exibe esta ajuda"
-
-#~ msgid "/where > Display map name"
-#~ msgstr "/where > Exibe o nome do mapa"
-
-#~ msgid "/who > Display number of online users"
-#~ msgstr "/who > Exibe o número de usuários online"
-
-#~ msgid "/me > Tell something about yourself"
-#~ msgstr "/me > Diz alguma coisa sobre você"
-
-#~ msgid "/clear > Clears this window"
-#~ msgstr "/clear > Limpa janela atual"
-
-#~ msgid "/msg > Send a private message to a user"
-#~ msgstr "/msg > Envia uma messagem privada a um usuário"
-
-#~ msgid "/whisper > Alias of msg"
-#~ msgstr "/whisper > O mesmo que /msg"
-
-#~ msgid "/w > Alias of msg"
-#~ msgstr "/w > O mesmo que /msg"
-
-#~ msgid "/query > Makes a tab for private messages with another user"
-#~ msgstr "/query > Abre uma aba de chat com outro usuário"
-
-#~ msgid "/q > Alias of query"
-#~ msgstr "/q > O mesmo que /query"
-
-#~ msgid "/away > Tell the other whispering players you're away from keyboard."
-#~ msgstr ""
-#~ "/away > Diz que você está longe do teclado para quem te enviar uma "
-#~ "mensagem privada ."
-
-#~ msgid "/ignore > ignore a player"
-#~ msgstr "/ignore > Ignora um jogador"
-
-#~ msgid "/unignore > stop ignoring a player"
-#~ msgstr "/unignore > Deixa de ignorar um jogador"
-
-#~ msgid "/ignoreall > Ignore all opened whisper tabs"
-#~ msgstr "/ignoreall > Ignorar todas abas abertas"
-
-#~ msgid "/erase > Erase a player"
-#~ msgstr "/erase > Apagar um jogador"
-
-#~ msgid "/befriend > Be friend a player"
-#~ msgstr "/befriend > Ser amigo de um jogador"
-
-#~ msgid "/disregard > Disregard a player"
-#~ msgstr "/disregard > Desconsiderar um jogador"
-
-#~ msgid "/neutral > Neutral a player"
-#~ msgstr "/neutral > Deixar jogador neutro"
-
-#~ msgid "/list > Display all public channels"
-#~ msgstr "/list > Exibir todos os canais públicos"
-
-#~ msgid "/join > Join or create a channel"
-#~ msgstr "/join > Criar ou entrar em um canal"
-
-#~ msgid "/createparty > Create a new party"
-#~ msgstr "/createparty > Cria um novo grupo"
-
-#~ msgid "/createguild > Create a new guild"
-#~ msgstr "/createguild > Cria uma nova guilda"
-
-#~ msgid "/party > Invite a user to party"
-#~ msgstr "/party > Convidar um usuário para o grupo"
-
-#~ msgid "/toggle > Determine whether <return> toggles the chat log"
-#~ msgstr "/toggle > Determina se <enter> exibe a janela de chat"
-
-#~ msgid ""
-#~ "/present > Get list of players present (sent to chat log, if logging)"
-#~ msgstr ""
-#~ "/present > Mostra a lista de jogadores presentes (envia para o log de "
-#~ "chat, se estiver gravando)"
-
-#~ msgid "/announce > Global announcement (GM only)"
-#~ msgstr "/announce > Anúncio Global (Somente GM)"
-
-#~ msgid "/closeall > Close all opened whisper tabs"
-#~ msgstr "/closeall > Fecha todas as abas abertas"
-
-#~ msgid "/all > Show all visible beings in debug tab"
-#~ msgstr "/all > Mostrar todos os seres visíveis na aba do Depurador"
-
-#~ msgid "/move > Move to given position"
-#~ msgstr "/move > Mover para a posição marcada"
-
-#~ msgid "/navigate > Draw path to given position"
-#~ msgstr "/navigate > Marcar um caminho para uma posição determinada"
-
-#~ msgid "/target > Set target to being"
-#~ msgstr "/target > Definir um alvo"
-
-#~ msgid "/outfit > Wear outfit by index"
-#~ msgstr "/outfit > Usar roupa por índice"
-
-#~ msgid "/emote > Show emote by index"
-#~ msgstr "/emote > Mostrar emoticons por índice"
-
-#~ msgid "/follow > Follow player"
-#~ msgstr "/follow > Seguir jogador"
-
-#~ msgid "/imitation > Imitate player"
-#~ msgstr "/imitation > Imitar jogador"
-
-#~ msgid "/heal > Heal player"
-#~ msgstr "/heal > Curar jogador"
-
-#~ msgid "/mail > Send offline message to player"
-#~ msgstr "/mail > Enviar menssagem a um jogador offline"
-
-#~ msgid "For more information, type /help <command>."
-#~ msgstr "Para mais informações, digite /help <comando>."
-
-#~ msgid "Command: /help"
-#~ msgstr "Comando: /help"
-
-#~ msgid "This command displays a list of all commands available."
-#~ msgstr "Exibe uma lista de todos os comandos disponíveis."
-
-#~ msgid "Command: /help <command>"
-#~ msgstr "Comando: /help <comando>"
-
-#~ msgid "This command displays help on <command>."
-#~ msgstr "Exibe o conteúdo de ajuda do <comando>"
-
-#~ msgid "Command: /announce <msg>"
-#~ msgstr "Comando: /announce <msg>"
-
-#~ msgid "*** only available to a GM ***"
-#~ msgstr "*** Disponivel apenas para GM's ***"
-
-#~ msgid ""
-#~ "This command sends the message <msg> to all players currently online."
-#~ msgstr "Este comando envia a mensagem <msg> para todos os jogadores online."
-
-#~ msgid "Command: /clear"
-#~ msgstr "Comando: /clear"
-
-#~ msgid "This command clears the chat log of previous chat."
-#~ msgstr "Este comando limpa a janela de chat."
-
-#~ msgid "Command: /ignore <player>"
-#~ msgstr "Comando: /ignore <nome do jogador>"
-
-#~ msgid ""
-#~ "This command ignores the given player regardless of current relations."
-#~ msgstr ""
-#~ "Este comando ignora o jogador indicado, independente de sua relação com o "
-#~ "mesmo."
-
-#~ msgid "Command: /join <channel>"
-#~ msgstr "Comando: /join <canal>"
-
-#~ msgid "This command makes you enter <channel>."
-#~ msgstr "Este comando faz você entrar em <canal>."
-
-#~ msgid "If <channel> doesn't exist, it's created."
-#~ msgstr "Se o <canal> não existe, ele será criado."
-
-#~ msgid "Command: /list"
-#~ msgstr "Comando: /list"
-
-#~ msgid "This command shows a list of all channels."
-#~ msgstr "Este comando exibe uma lista com todos os canais."
-
-#~ msgid "Command: /me <message>"
-#~ msgstr "Comando: /me <mensagem>"
-
-#~ msgid "This command tell others you are (doing) <msg>."
-#~ msgstr "Este comando diz aos outros o que eu estou (fazendo) <msg>."
-
-#~ msgid "Command: /msg <nick> <message>"
-#~ msgstr "Comando: /msg <nick> <mensagem>"
-
-#~ msgid "Command: /whisper <nick> <message>"
-#~ msgstr "Comando: /whisper <nick> <mensagem>"
-
-#~ msgid "Command: /w <nick> <message>"
-#~ msgstr "Comando: /w <nick> <mensagem>"
-
-#~ msgid "This command sends the text <message> to <nick>."
-#~ msgstr "Este comando envia o texto <mensagem> para <nick>."
-
-#~ msgid "Command: /query <nick>"
-#~ msgstr "Comando: /query <nick>"
-
-#~ msgid "Command: /q <nick>"
-#~ msgstr "Comando: /q <nick>"
-
-#~ msgid "This command tries to make a tab for whispers betweenyou and <nick>."
-#~ msgstr ""
-#~ "Este comando cria uma aba para mensagens privadas entre você e <nick>."
-
-#~ msgid "Command: /away <afk reason>"
-#~ msgstr "Comando: /away <motivo>"
-
-#~ msgid "This command tells you're away from keyboard with the given reason."
-#~ msgstr ""
-#~ "Este comando mostra que você está longe do teclado, indicando a razão "
-#~ "dada."
-
-#~ msgid "Command: /away"
-#~ msgstr "Comando: /away"
-
-#~ msgid "This command clears the away status and message."
-#~ msgstr "Este comando limpa o status e a mensagem \"away\"."
-
-#~ msgid "Command: /createparty <name>"
-#~ msgstr "Comando: /createparty <nome>"
-
-#~ msgid "This command creates a new party called <name>."
-#~ msgstr "Este comando cria um novo grupo chamado <nome>."
-
-#~ msgid "Command: /createguild <name>"
-#~ msgstr "Comando: /createguild <nome>"
-
-#~ msgid "This command creates a new guild called <name>."
-#~ msgstr "Este comando cria uma nova guilda chamada <nome>"
-
-#~ msgid "Command: /party <nick>"
-#~ msgstr "Comando: /party <nick>"
-
-#~ msgid "Command: /present"
-#~ msgstr "Comando: /present"
-
-#~ msgid ""
-#~ "This command gets a list of players within hearing and sends it to chat "
-#~ "log."
-#~ msgstr ""
-#~ "Este comando busca uma lista de jogadores por perto e envia para o chat."
-
-#~ msgid "Command: /toggle <state>"
-#~ msgstr "Comando: /toggle <estado>"
-
-#~ msgid ""
-#~ "This command sets whether the return key should toggle the chat log, or "
-#~ "whether the chat log turns off automatically."
-#~ msgstr ""
-#~ "Este comando define se a tecla enter deve alternar para o log do chat ou "
-#~ "se o log do chat fica oculto automaticamente."
-
-#~ msgid ""
-#~ "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
-#~ "\"0\", \"no\", \"false\" to turn the toggle off."
-#~ msgstr ""
-#~ "<estado> pode ser \"1\", \"yes\" e \"true\" para ativar ou \"0\", \"no\" "
-#~ "e \"false\" para desativar."
-
-#~ msgid "Command: /toggle"
-#~ msgstr "Comando: /toggle"
-
-#~ msgid "This command displays the return toggle status."
-#~ msgstr "Este comando mostra o status da tecla enter."
-
-#~ msgid ""
-#~ "This command stops ignoring the given player if they are being ignored"
-#~ msgstr ""
-#~ "Este comando para de ignorar o jogador indicado se ele estiver sendo "
-#~ "ignorado"
-
-#~ msgid "Command: /where"
-#~ msgstr "Comando: /where"
-
-#~ msgid "This command displays the name of the current map."
-#~ msgstr "Mostra o nome do mapa atual."
-
-#~ msgid "Command: /who"
-#~ msgstr "Comando: /who"
-
-#~ msgid "This command displays the number of players currently online."
-#~ msgstr "Exibe o número total de jogadores online."
-
-#~ msgid "Type /help for a list of commands."
-#~ msgstr "Digite /help para uma lista de todos os comandos."
diff --git a/po/ru.po b/po/ru.po
index 085fc1f87..788d5b0e8 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -2,26 +2,24 @@
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: manaplus\n"
+"Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
 "POT-Creation-Date: 2011-04-15 20:28+0300\n"
-"PO-Revision-Date: 2011-03-29 19:15+0000\n"
+"PO-Revision-Date: 2011-04-15 17:35+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Russian <>\n"
-"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"Language: ru\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
 #: src/actorspritemanager.cpp:909
-#, fuzzy
 msgid "Visible on map"
-msgstr "Видимые имена"
+msgstr "Видимые на карте"
 
 #: src/being.cpp:489
 msgid "dodge"
@@ -127,11 +125,11 @@ msgstr "Нельзя отправлять пустые сообщения!"
 #: src/commandhandler.cpp:380
 #, c-format
 msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
-"you."
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
+" you."
 msgstr ""
-"Невозможно создать вкладку для личного общения с игроком \"%s\"! Или вкладка "
-"уже создана, или этот игрок вы сами."
+"Невозможно создать вкладку для личного общения с игроком \"%s\"! Или вкладка"
+" уже создана, или этот игрок вы сами."
 
 #: src/commandhandler.cpp:400
 #, c-format
@@ -264,26 +262,21 @@ msgstr[1] "%d секунды"
 msgstr[2] "%d секунд"
 
 #: src/commandhandler.cpp:995
-#, fuzzy
 msgid "font cache size"
-msgstr "Размер шрифта"
+msgstr "размер кеша шрифта"
 
 #: src/commandhandler.cpp:1008
-#, fuzzy
 msgid "Created: "
-msgstr "Создать"
+msgstr "Создано: "
 
 #: src/commandhandler.cpp:1009
-#, fuzzy
 msgid "Deleted: "
-msgstr "Удалить"
+msgstr "Удалено: "
 
 #: src/commandhandler.h:40
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr ""
-"/%s может принимать значение \"yes\", \"no\", \"true\", \"false\", \"1\" или "
-"\"0\"."
+msgstr "/%s может принимать значение \"yes\", \"no\", \"true\", \"false\", \"1\" или \"0\"."
 
 #: src/game.cpp:228 src/gui/widgets/chattab.cpp:395
 msgid "General"
@@ -524,7 +517,7 @@ msgstr "Стрижка:"
 
 #: src/gui/charcreatedialog.cpp:87
 msgid "Race:"
-msgstr ""
+msgstr "Расса:"
 
 #: src/gui/charcreatedialog.cpp:90 src/gui/charselectdialog.cpp:447
 #: src/gui/socialwindow.cpp:847
@@ -1703,9 +1696,8 @@ msgid "Limit max lines in chat"
 msgstr "Ограничить число строк в чате"
 
 #: src/gui/setup_chat.cpp:132
-#, fuzzy
 msgid "Resize chat tabs if need"
-msgstr "Следующая строка вкладки"
+msgstr "Подгонять размер чата"
 
 #: src/gui/setup_colors.cpp:46
 msgid "This is what the color looks like"
@@ -2192,8 +2184,8 @@ msgstr "Нет"
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
-"Не удалось переключиться в оконный режим. Восстановить старый режим также не "
-"удалось!"
+"Не удалось переключиться в оконный режим. Восстановить старый режим также не"
+" удалось!"
 
 #: src/gui/setup_video.cpp:535
 msgid ""
@@ -3030,7 +3022,8 @@ msgid "Change"
 msgstr "Сменить"
 
 #: src/gui/trade.cpp:314
-msgid "Failed adding item. You can not overlap one kind of item on the window."
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 "Отказано в добавлении предмета. Вы не можете добавить какой-либо вид "
 "объектов более одного раза."
@@ -3365,15 +3358,16 @@ msgstr "Команда: /ignore"
 #: src/gui/widgets/whispertab.cpp:123
 msgid "This command ignores the other player regardless of current relations."
 msgstr ""
-"Эта команда позволяет игнорировать другого игрока вне зависимости от текущих "
-"отношений с ним."
+"Эта команда позволяет игнорировать другого игрока вне зависимости от текущих"
+" отношений с ним."
 
 #: src/gui/widgets/whispertab.cpp:128
 msgid "Command: /unignore <player>"
 msgstr "Команда: /unignore <игрок>"
 
 #: src/gui/widgets/whispertab.cpp:129
-msgid "This command stops ignoring the other player if they are being ignored."
+msgid ""
+"This command stops ignoring the other player if they are being ignored."
 msgstr "Эта команда прекращает игнорирование другого игрока."
 
 #: src/gui/windowmenu.cpp:62
@@ -3895,22 +3889,19 @@ msgstr "Отошел"
 
 #: src/localplayer.cpp:3392
 msgid "Follow: "
-msgstr ""
+msgstr "Следование: "
 
 #: src/localplayer.cpp:3394 src/localplayer.cpp:3409
-#, fuzzy
 msgid "Follow canceled"
-msgstr "Торговля отменена."
+msgstr "Следование отменено"
 
 #: src/localplayer.cpp:3401
-#, fuzzy
 msgid "Imitation: "
-msgstr "(?) неизвестная имитация"
+msgstr "Имитация: "
 
 #: src/localplayer.cpp:3403 src/localplayer.cpp:3411
-#, fuzzy
 msgid "Imitation canceled"
-msgstr "Торговля отменена."
+msgstr "Имитация отменена"
 
 #: src/localplayer.cpp:3763
 msgid "You see "
@@ -4107,7 +4098,7 @@ msgstr "Хочешь предскажу твою судьбу?"
 
 #: src/net/manaserv/beinghandler.cpp:327 src/net/tmwa/playerhandler.cpp:116
 msgid "Sadly, no trace of you was ever found..."
-msgstr "Грустно, вас врятли когда-нибудь найдут..."
+msgstr "Грустно, вас врядли когда-нибудь найдут..."
 
 #: src/net/manaserv/beinghandler.cpp:329 src/net/tmwa/playerhandler.cpp:118
 msgid "Annihilated."
@@ -4439,7 +4430,8 @@ msgstr "Неизвестная ошибка сервера чата."
 
 #: src/net/tmwa/charserverhandler.cpp:172
 msgid "Failed to create character. Most likely the name is already taken."
-msgstr "Невозможно создать персонажа. Скорее всего, таке имя уже используется."
+msgstr ""
+"Невозможно создать персонажа. Скорее всего, таке имя уже используется."
 
 #: src/net/tmwa/charserverhandler.cpp:176 src/net/tmwa/loginhandler.cpp:194
 msgid "Wrong name."
@@ -4797,8 +4789,7 @@ msgstr "Команда изменяет политику разделения п
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
-msgstr ""
-"<политикой> может быть \"1\", \"yes\", \"true\" для включения разделения "
+msgstr "<политикой> может быть \"1\", \"yes\", \"true\" для включения разделения "
 
 #: src/net/tmwa/gui/partytab.cpp:99
 msgid "Command: /item"
@@ -4821,8 +4812,8 @@ msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
-"<policy> может быть одним из \"1\", \"yes\", \"true\" -чтобы разрешить общий "
-"опыт, или \"0\", \"no\", \"false\" - чтобы запретить общий опыт"
+"<policy> может быть одним из \"1\", \"yes\", \"true\" -чтобы разрешить общий"
+" опыт, или \"0\", \"no\", \"false\" - чтобы запретить общий опыт"
 
 #: src/net/tmwa/gui/partytab.cpp:111
 msgid "Command: /exp"
@@ -4902,9 +4893,8 @@ msgid ""
 msgstr "Вас навсегда забанили. Пожалуйста, свяжитесь с командой ГМ-ов."
 
 #: src/net/tmwa/loginhandler.cpp:178
-#, fuzzy
 msgid "Client too old."
-msgstr "Версия клиент-программы устарела."
+msgstr "Клиент устарел"
 
 #: src/net/tmwa/loginhandler.cpp:181
 #, c-format
@@ -4916,16 +4906,15 @@ msgstr ""
 
 #: src/net/tmwa/loginhandler.cpp:188
 msgid "Server overpopulated."
-msgstr ""
+msgstr "Сервер переполнен"
 
 #: src/net/tmwa/loginhandler.cpp:191
 msgid "This user name is already taken."
 msgstr "Это имя пользователя уже занято."
 
 #: src/net/tmwa/loginhandler.cpp:197
-#, fuzzy
 msgid "Username permanently erased."
-msgstr "Пользователь с таким именем уже существует."
+msgstr "Пользователь удален"
 
 #: src/net/tmwa/network.cpp:149
 msgid "Empty address given to Network::connect()!"
@@ -5063,13 +5052,15 @@ msgstr "Сообщение"
 
 #: src/net/tmwa/playerhandler.cpp:333
 msgid ""
-"You are carrying more than half your weight. You are unable to regain health."
+"You are carrying more than half your weight. You are unable to regain "
+"health."
 msgstr ""
 "Вы несете груз больший, чем половина вашей грузоподъемности. Не удалось "
 "восстановить здоровье."
 
 #: src/net/tmwa/playerhandler.cpp:343
-msgid "You are carrying less than half your weight. You are can regain health."
+msgid ""
+"You are carrying less than half your weight. You are can regain health."
 msgstr ""
 "Вы несете груз меньше, чем половина вашей грузоподъемности. Вы можете "
 "восстановить здоровье."
@@ -5262,283 +5253,3 @@ msgstr "Мана %+d"
 #: src/resources/itemdb.cpp:166
 msgid "Unknown item"
 msgstr "Неизвестный предмет"
-
-#~ msgid "-- Help --"
-#~ msgstr "-- Помощь --"
-
-#~ msgid "/help > Display this help"
-#~ msgstr "/help > Отображает этот текст"
-
-#~ msgid "/where > Display map name"
-#~ msgstr "/where > Отображает имя карты"
-
-#~ msgid "/who > Display number of online users"
-#~ msgstr "/who > Отображает количество пользователей он-лайн"
-
-#~ msgid "/me > Tell something about yourself"
-#~ msgstr "/me > Расскажите что-нибудь о себе"
-
-#~ msgid "/clear > Clears this window"
-#~ msgstr "/clear > Очищает это окно"
-
-#~ msgid "/msg > Send a private message to a user"
-#~ msgstr "/msg > Послать личное сообщение пользователю"
-
-#~ msgid "/whisper > Alias of msg"
-#~ msgstr "/whisper > Аналог команды msg"
-
-#~ msgid "/w > Alias of msg"
-#~ msgstr "/w > Аналог команды msg"
-
-#~ msgid "/query > Makes a tab for private messages with another user"
-#~ msgstr "/query> Создает вкладку для чата с пользователем."
-
-#~ msgid "/q > Alias of query"
-#~ msgstr "/q> Аналог query"
-
-#~ msgid "/away > Tell the other whispering players you're away from keyboard."
-#~ msgstr "/away > Сообщить тем, с кем вы перешептываетесь, что вы отошли."
-
-#~ msgid "/ignore > ignore a player"
-#~ msgstr "/ignore > Игнорировать игрока"
-
-#~ msgid "/unignore > stop ignoring a player"
-#~ msgstr "/unignore > Убрать пользователя из игнора"
-
-#~ msgid "/ignoreall > Ignore all opened whisper tabs"
-#~ msgstr "/ignoreall > Игнорировать все вкладки с перешептыванием"
-
-#~ msgid "/erase > Erase a player"
-#~ msgstr "/erase > Удалить игрока"
-
-#~ msgid "/befriend > Be friend a player"
-#~ msgstr "/befriend > Подружиться"
-
-#~ msgid "/disregard > Disregard a player"
-#~ msgstr "/disregard > не придавать значения"
-
-#~ msgid "/neutral > Neutral a player"
-#~ msgstr "/neutral > Относиться нейтрально"
-
-#~ msgid "/list > Display all public channels"
-#~ msgstr "/list > Показать список каналов"
-
-#~ msgid "/join > Join or create a channel"
-#~ msgstr "/join > Создать или присоединиться к каналу"
-
-#~ msgid "/createparty > Create a new party"
-#~ msgstr "/createparty > Создать группу"
-
-#~ msgid "/createguild > Create a new guild"
-#~ msgstr "/createguild > Создать гильдию"
-
-#~ msgid "/party > Invite a user to party"
-#~ msgstr "/party > Пригласить пользователя в группу"
-
-#~ msgid "/toggle > Determine whether <return> toggles the chat log"
-#~ msgstr ""
-#~ "/toggle -> Определяет появление строки ввода текста в чат по нажатию "
-#~ "<return>"
-
-#~ msgid ""
-#~ "/present > Get list of players present (sent to chat log, if logging)"
-#~ msgstr ""
-#~ "/present > Показывает список игроков он-лайн (также извещает в окне чата, "
-#~ "если включен лог)"
-
-#~ msgid "/announce > Global announcement (GM only)"
-#~ msgstr "/announce > Глобальное извещение (доступно только ГМ)"
-
-#~ msgid "/closeall > Close all opened whisper tabs"
-#~ msgstr "/closeall > Закрыть все вкладки перешептывания"
-
-#~ msgid "/all > Show all visible beings in debug tab"
-#~ msgstr "/all > Показать всех видимых существ на вкладке отладки"
-
-#~ msgid "/move > Move to given position"
-#~ msgstr "/move > Идти к заданной позиции"
-
-#~ msgid "/navigate > Draw path to given position"
-#~ msgstr "/navigate > Нарисовать путь к заданной позиции"
-
-#~ msgid "/target > Set target to being"
-#~ msgstr "/target > Прицелиться в существо"
-
-#~ msgid "/outfit > Wear outfit by index"
-#~ msgstr "/outfit > Одеть наряд под указанным номером"
-
-#~ msgid "/emote > Show emote by index"
-#~ msgstr "/emote > Показать смайлик под указанным номером"
-
-#~ msgid "/follow > Follow player"
-#~ msgstr "/follow > Следовать за игроком"
-
-#~ msgid "/imitation > Imitate player"
-#~ msgstr "/imitation > Имитировать игрока"
-
-#~ msgid "/heal > Heal player"
-#~ msgstr "/heal > Лечить игрока"
-
-#~ msgid "/mail > Send offline message to player"
-#~ msgstr "/mail > Послать оффлайн сообщение пользователю"
-
-#~ msgid "For more information, type /help <command>."
-#~ msgstr "Для более детальной информации введите: /help <команда>"
-
-#~ msgid "Command: /help"
-#~ msgstr "Команда: /help"
-
-#~ msgid "This command displays a list of all commands available."
-#~ msgstr "Эта команда показывает список доступных команд"
-
-#~ msgid "Command: /help <command>"
-#~ msgstr "Команда: /help <команда>"
-
-#~ msgid "This command displays help on <command>."
-#~ msgstr "Эта команда показывает помощь по <команде>."
-
-#~ msgid "Command: /announce <msg>"
-#~ msgstr "Команда: /announce <сообщение>"
-
-#~ msgid "*** only available to a GM ***"
-#~ msgstr "*** доступно только для GM ***"
-
-#~ msgid ""
-#~ "This command sends the message <msg> to all players currently online."
-#~ msgstr "Эта команда посылает <сообщение> всем игрокам в сети."
-
-#~ msgid "Command: /clear"
-#~ msgstr "Команда: /clear"
-
-#~ msgid "This command clears the chat log of previous chat."
-#~ msgstr "Эта команда очищает лог чата."
-
-#~ msgid "Command: /ignore <player>"
-#~ msgstr "Команда: /ignore <игрок>"
-
-#~ msgid ""
-#~ "This command ignores the given player regardless of current relations."
-#~ msgstr ""
-#~ "Эта команда игнорирует указанного игрока независимо от текущего статуса "
-#~ "взаимоотношений"
-
-#~ msgid "Command: /join <channel>"
-#~ msgstr "Команда: /join <канал>"
-
-#~ msgid "This command makes you enter <channel>."
-#~ msgstr "Команда для входа на <канал>."
-
-#~ msgid "If <channel> doesn't exist, it's created."
-#~ msgstr "Если <канал> не существует, он будет создан."
-
-#~ msgid "Command: /list"
-#~ msgstr "Команда: /list"
-
-#~ msgid "This command shows a list of all channels."
-#~ msgstr "Эта команда показывает список всех каналов."
-
-#~ msgid "Command: /me <message>"
-#~ msgstr "Команда: /me <сообщение>"
-
-#~ msgid "This command tell others you are (doing) <msg>."
-#~ msgstr "Эта команда покажет другим игрокам, что вы (делаете) <сообщение>."
-
-#~ msgid "Command: /msg <nick> <message>"
-#~ msgstr "Команда: /msg <имя персонажа> <сообщение>"
-
-#~ msgid "Command: /whisper <nick> <message>"
-#~ msgstr "Команда: /whisper <имя персонажа> <сообщение>"
-
-#~ msgid "Command: /w <nick> <message>"
-#~ msgstr "Команда: /w <ник> <сообщение>"
-
-#~ msgid "This command sends the text <message> to <nick>."
-#~ msgstr "Эта команда посылает текст <сообщение> пользователю <nick>."
-
-#~ msgid "Command: /query <nick>"
-#~ msgstr "Команда: /query <имя персонажа>"
-
-#~ msgid "Command: /q <nick>"
-#~ msgstr "Команда: /q <имя персонажа>"
-
-#~ msgid "This command tries to make a tab for whispers betweenyou and <nick>."
-#~ msgstr ""
-#~ "Эта команда создаст закладку для личного общения между вами и <имя "
-#~ "игрока>."
-
-#~ msgid "Command: /away <afk reason>"
-#~ msgstr "Команда: /away <причина отсутствия у компьютера>"
-
-#~ msgid "This command tells you're away from keyboard with the given reason."
-#~ msgstr "Команда сообщает, что вы отошли по указанной причине."
-
-#~ msgid "Command: /away"
-#~ msgstr "Команда: /away"
-
-#~ msgid "This command clears the away status and message."
-#~ msgstr "Эта команда очищает статус и сообщение отсутствия."
-
-#~ msgid "Command: /createparty <name>"
-#~ msgstr "Command: /createparty <имя_группы>"
-
-#~ msgid "This command creates a new party called <name>."
-#~ msgstr "Эта Команда создает группу под названием <имя_группы>."
-
-#~ msgid "Command: /createguild <name>"
-#~ msgstr "Команда: /createparty <имя_гильдии>"
-
-#~ msgid "This command creates a new guild called <name>."
-#~ msgstr "Эта Команда создает гильдию под названием <имя_гильдии>."
-
-#~ msgid "Command: /party <nick>"
-#~ msgstr "Команда: /party <имя>"
-
-#~ msgid "Command: /present"
-#~ msgstr "Команда: /present"
-
-#~ msgid ""
-#~ "This command gets a list of players within hearing and sends it to chat "
-#~ "log."
-#~ msgstr "Эта команда выводит список видимых игроков в чат."
-
-#~ msgid "Command: /toggle <state>"
-#~ msgstr "Команда: /toggle <режим>"
-
-#~ msgid ""
-#~ "This command sets whether the return key should toggle the chat log, or "
-#~ "whether the chat log turns off automatically."
-#~ msgstr ""
-#~ "Эта Команда устанавливает, будет ли нажатие клавиши Enter переключать лог "
-#~ "чата или же он (лог) будет выключен автоматически."
-
-#~ msgid ""
-#~ "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
-#~ "\"0\", \"no\", \"false\" to turn the toggle off."
-#~ msgstr ""
-#~ "<режим> может быть \"1\", \"yes\", \"true\" дабы включить опцию или "
-#~ "\"0\", \"no\", \"false\" чтобы выключить."
-
-#~ msgid "Command: /toggle"
-#~ msgstr "Команда: /toggle"
-
-#~ msgid "This command displays the return toggle status."
-#~ msgstr "Эта команда показывает статус переключения строки ввода в чат"
-
-#~ msgid ""
-#~ "This command stops ignoring the given player if they are being ignored"
-#~ msgstr "Эта команда улаляет игрока из списка игнорирования"
-
-#~ msgid "Command: /where"
-#~ msgstr "Команда: /where"
-
-#~ msgid "This command displays the name of the current map."
-#~ msgstr "Эта команда показывает имя текущей карты."
-
-#~ msgid "Command: /who"
-#~ msgstr "Команда: /who"
-
-#~ msgid "This command displays the number of players currently online."
-#~ msgstr "Эта команда показывает число пользователей в сети на данный момент."
-
-#~ msgid "Type /help for a list of commands."
-#~ msgstr "Введите /help для получения списка команд."