From 486ce54dc72849ae52d9b3ba1af83d27ab4ce29a Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sat, 7 Jan 2012 20:45:18 +0300
Subject: Update and rebuild translations.

---
 po/cs.po        | 219 +++++++++++++++---------------
 po/de.po        | 216 +++++++++++++++---------------
 po/es.po        | 219 +++++++++++++++---------------
 po/fi.po        | 219 +++++++++++++++---------------
 po/fr.po        | 235 +++++++++++++++++----------------
 po/id.po        | 216 +++++++++++++++---------------
 po/ja.po        | 403 ++++++++++++++++++++++++++++----------------------------
 po/manaplus.pot | 216 +++++++++++++++---------------
 po/nl_BE.po     | 219 +++++++++++++++---------------
 po/pl.po        | 231 ++++++++++++++++----------------
 po/pt.po        | 219 +++++++++++++++---------------
 po/pt_BR.po     | 298 ++++++++++++++++++++---------------------
 po/ru.po        | 219 +++++++++++++++---------------
 po/zh_CN.po     | 216 +++++++++++++++---------------
 14 files changed, 1655 insertions(+), 1690 deletions(-)

(limited to 'po')

diff --git a/po/cs.po b/po/cs.po
index b4f7f306d..3c064165c 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-01-05 23:31+0300\n"
+"POT-Creation-Date: 2012-01-07 20:36+0300\n"
 "PO-Revision-Date: 2011-11-11 21:38+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Czech (http://www.transifex.net/projects/p/manaplus/team/"
@@ -312,11 +312,11 @@ msgstr "Vytvořeno:"
 msgid "Deleted:"
 msgstr "Odstraněno:"
 
-#: src/commandhandler.cpp:1180 src/commandhandler.cpp:1187
+#: src/commandhandler.cpp:1226 src/commandhandler.cpp:1233
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1182 src/commandhandler.cpp:1189
+#: src/commandhandler.cpp:1228 src/commandhandler.cpp:1235
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -1275,10 +1275,6 @@ msgstr "NPC"
 msgid "Clear"
 msgstr "Vyprázdnit"
 
-#: src/gui/npcdialog.cpp:223
-msgid "> Next"
-msgstr "> Další"
-
 #: src/gui/npcpostdialog.cpp:48
 msgid "To:"
 msgstr "Komu:"
@@ -3989,33 +3985,33 @@ msgstr "Zabil vás "
 msgid "Tried to pick up nonexistent item."
 msgstr "Snažili jste se sebrat neexistující předmět."
 
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1441
 msgid "Item is too heavy."
 msgstr "Předmět je příliš těžký."
 
-#: src/localplayer.cpp:1442
+#: src/localplayer.cpp:1444
 msgid "Item is too far away."
 msgstr "Předmět je příliš daleko."
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1447
 msgid "Inventory is full."
 msgstr "Inventář je plný."
 
-#: src/localplayer.cpp:1446
+#: src/localplayer.cpp:1450
 msgid "Stack is too big."
 msgstr "Hromada je příliš velká."
 
-#: src/localplayer.cpp:1449
+#: src/localplayer.cpp:1453
 msgid "Item belongs to someone else."
 msgstr "Předmět patří někomu jinému."
 
-#: src/localplayer.cpp:1452
+#: src/localplayer.cpp:1456
 msgid "Unknown problem picking up item."
 msgstr "Neznámý problém při pokusu sebrat předmět."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1476
+#: src/localplayer.cpp:1480
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -4023,390 +4019,390 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: src/localplayer.cpp:1893
+#: src/localplayer.cpp:1897
 msgid "(D) default moves"
 msgstr "(D) výchozí pohyby"
 
-#: src/localplayer.cpp:1894
+#: src/localplayer.cpp:1898
 msgid "(I) invert moves"
 msgstr "(I) invertované pohyby"
 
-#: src/localplayer.cpp:1895
+#: src/localplayer.cpp:1899
 msgid "(c) moves with some crazy moves"
 msgstr "(c) pohyby s trochou šílených pohybů"
 
-#: src/localplayer.cpp:1896
+#: src/localplayer.cpp:1900
 msgid "(C) moves with crazy moves"
 msgstr "(C) pohyby s šílenými pohyby"
 
-#: src/localplayer.cpp:1897
+#: src/localplayer.cpp:1901
 msgid "(d) double normal + crazy"
 msgstr "(d) dvojité normální + šílené"
 
-#: src/localplayer.cpp:1898
+#: src/localplayer.cpp:1902
 #, fuzzy
 msgid "(?) unknown move"
 msgstr "(?) neznámé následování"
 
-#: src/localplayer.cpp:1920
+#: src/localplayer.cpp:1924
 #, fuzzy, c-format
 msgid "(%d) crazy move number %d"
 msgstr "(?) šílené pohyby"
 
-#: src/localplayer.cpp:1925
+#: src/localplayer.cpp:1929
 msgid "(a) custom crazy move"
 msgstr "(a) vlastní šílené pohyby"
 
-#: src/localplayer.cpp:1929
+#: src/localplayer.cpp:1933
 msgid "(?) crazy move"
 msgstr "(?) šílené pohyby"
 
-#: src/localplayer.cpp:1943
+#: src/localplayer.cpp:1947
 msgid "(0) default moves to target"
 msgstr "(0) výchozí pohyb k cíli"
 
-#: src/localplayer.cpp:1944
+#: src/localplayer.cpp:1948
 msgid "(1) moves to target in distance 1"
 msgstr "(1) pohyb k cíli do vzdálenosti 1"
 
-#: src/localplayer.cpp:1945
+#: src/localplayer.cpp:1949
 msgid "(2) moves to target in distance 2"
 msgstr "(2) pohyb k cíli do vzdálenosti 2"
 
-#: src/localplayer.cpp:1946
+#: src/localplayer.cpp:1950
 msgid "(3) moves to target in distance 3"
 msgstr "(3) pohyb k cíli do vzdálenosti 3"
 
-#: src/localplayer.cpp:1947
+#: src/localplayer.cpp:1951
 msgid "(5) moves to target in distance 5"
 msgstr "(5) pohyb k cíli do vzdálenosti 5"
 
-#: src/localplayer.cpp:1948
+#: src/localplayer.cpp:1952
 msgid "(7) moves to target in distance 7"
 msgstr "(7) pohyb k cíli do vzdálenosti 7"
 
-#: src/localplayer.cpp:1949
+#: src/localplayer.cpp:1953
 msgid "(A) moves to target in attack range"
 msgstr "(A) pohyb k cíli na útočný dosah"
 
-#: src/localplayer.cpp:1950
+#: src/localplayer.cpp:1954
 msgid "(a) archer attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1951
+#: src/localplayer.cpp:1955
 msgid "(?) move to target"
 msgstr "(?) pohyb k cíli"
 
-#: src/localplayer.cpp:1970
+#: src/localplayer.cpp:1974
 msgid "(D) default follow"
 msgstr "(D) výchozí následování"
 
-#: src/localplayer.cpp:1971
+#: src/localplayer.cpp:1975
 msgid "(R) relative follow"
 msgstr "(R) relativní následování"
 
-#: src/localplayer.cpp:1972
+#: src/localplayer.cpp:1976
 msgid "(M) mirror follow"
 msgstr "(M) zrcadlené následování"
 
-#: src/localplayer.cpp:1973
+#: src/localplayer.cpp:1977
 msgid "(P) pet follow"
 msgstr ""
 
-#: src/localplayer.cpp:1974
+#: src/localplayer.cpp:1978
 msgid "(?) unknown follow"
 msgstr "(?) neznámé následování"
 
-#: src/localplayer.cpp:1993 src/localplayer.cpp:1997 src/localplayer.cpp:2020
+#: src/localplayer.cpp:1997 src/localplayer.cpp:2001 src/localplayer.cpp:2024
 msgid "(?) attack"
 msgstr "(?) útok"
 
-#: src/localplayer.cpp:1994 src/localplayer.cpp:2016
+#: src/localplayer.cpp:1998 src/localplayer.cpp:2020
 msgid "(D) default attack"
 msgstr "(D) výchozí útok"
 
-#: src/localplayer.cpp:1995
+#: src/localplayer.cpp:1999
 msgid "(s) switch attack without shield"
 msgstr "(s) přepínat útok bez štítu"
 
-#: src/localplayer.cpp:1996
+#: src/localplayer.cpp:2000
 msgid "(S) switch attack with shield"
 msgstr "(S) přepínat útok se štítem"
 
-#: src/localplayer.cpp:2017
+#: src/localplayer.cpp:2021
 msgid "(G) go and attack"
 msgstr "(G) jdi a útoč"
 
-#: src/localplayer.cpp:2018
+#: src/localplayer.cpp:2022
 msgid "(A) go, attack, pickup"
 msgstr "(A) jdi, útoč, sbírej"
 
-#: src/localplayer.cpp:2019
+#: src/localplayer.cpp:2023
 msgid "(d) without auto attack"
 msgstr "(d) bez automatického útoku"
 
-#: src/localplayer.cpp:2053
+#: src/localplayer.cpp:2057
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) malý sběr 1x1 pole"
 
-#: src/localplayer.cpp:2054
+#: src/localplayer.cpp:2058
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) výchozí sběr 2x1 pole"
 
-#: src/localplayer.cpp:2055
+#: src/localplayer.cpp:2059
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) sběr před 2x3 pole"
 
-#: src/localplayer.cpp:2056
+#: src/localplayer.cpp:2060
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) sběr 3x3 pole"
 
-#: src/localplayer.cpp:2057
+#: src/localplayer.cpp:2061
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) jdi a seber do vzdálenosti 4"
 
-#: src/localplayer.cpp:2058
+#: src/localplayer.cpp:2062
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) jdi a seber do vzdálenosti 8"
 
-#: src/localplayer.cpp:2059
+#: src/localplayer.cpp:2063
 msgid "(A) go and pick up in max distance"
 msgstr "(A) jdi a seber do max. vzdálenosti"
 
-#: src/localplayer.cpp:2060
+#: src/localplayer.cpp:2064
 msgid "(?) pick up"
 msgstr "(?) sběr"
 
-#: src/localplayer.cpp:2073
+#: src/localplayer.cpp:2077
 msgid "(N) normal map view"
 msgstr "(N) Normální zobrazení mapy"
 
-#: src/localplayer.cpp:2074
+#: src/localplayer.cpp:2078
 msgid "(D) debug map view"
 msgstr "(D) debug zobrazení mapy"
 
-#: src/localplayer.cpp:2075
+#: src/localplayer.cpp:2079
 msgid "(u) ultra map view"
 msgstr "(u) ultra zobrazení mapy"
 
-#: src/localplayer.cpp:2076
+#: src/localplayer.cpp:2080
 msgid "(U) ultra map view 2"
 msgstr "(U) ultra zobrazení mapy 2"
 
-#: src/localplayer.cpp:2077
+#: src/localplayer.cpp:2081
 msgid "(e) empty map view"
 msgstr "(e) zobrazen prázdné mapy"
 
-#: src/localplayer.cpp:2078
+#: src/localplayer.cpp:2082
 msgid "(b) black & white map view"
 msgstr "(b) zobrazení černobílé mapy"
 
-#: src/localplayer.cpp:2097
+#: src/localplayer.cpp:2101
 msgid "(f) use #flar for magic attack"
 msgstr "(f) použij #flar pro magický útok"
 
-#: src/localplayer.cpp:2098
+#: src/localplayer.cpp:2102
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) použij #chiza pro magický útok"
 
-#: src/localplayer.cpp:2099
+#: src/localplayer.cpp:2103
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) použij #ingrav pro magický útok"
 
-#: src/localplayer.cpp:2100
+#: src/localplayer.cpp:2104
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) použij #frillyar pro magický útok"
 
-#: src/localplayer.cpp:2101
+#: src/localplayer.cpp:2105
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) použij #upmarmu pro magický útok"
 
-#: src/localplayer.cpp:2102
+#: src/localplayer.cpp:2106
 msgid "(?) magic attack"
 msgstr "(?) magický útok attack"
 
-#: src/localplayer.cpp:2121
+#: src/localplayer.cpp:2125
 msgid "(a) attack all players"
 msgstr ""
 
-#: src/localplayer.cpp:2122
+#: src/localplayer.cpp:2126
 msgid "(f) attack not friends"
 msgstr ""
 
-#: src/localplayer.cpp:2123
+#: src/localplayer.cpp:2127
 msgid "(b) attack bad relations"
 msgstr ""
 
-#: src/localplayer.cpp:2124
+#: src/localplayer.cpp:2128
 msgid "(d) dont attack players"
 msgstr ""
 
-#: src/localplayer.cpp:2125
+#: src/localplayer.cpp:2129
 msgid "(?) pvp attack"
 msgstr ""
 
-#: src/localplayer.cpp:2144
+#: src/localplayer.cpp:2148
 msgid "(D) default imitation"
 msgstr "(D) výchozí imitace"
 
-#: src/localplayer.cpp:2145
+#: src/localplayer.cpp:2149
 msgid "(O) outfits imitation"
 msgstr "(O) imitace výstroje"
 
-#: src/localplayer.cpp:2146
+#: src/localplayer.cpp:2150
 msgid "(?) imitation"
 msgstr "(?) imitace"
 
-#: src/localplayer.cpp:2174
+#: src/localplayer.cpp:2178
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:2193
+#: src/localplayer.cpp:2197
 msgid "(O) on keyboard"
 msgstr "(O) u počítače"
 
-#: src/localplayer.cpp:2194
+#: src/localplayer.cpp:2198
 msgid "(A) away"
 msgstr "(A) pryč (away)"
 
-#: src/localplayer.cpp:2195 src/localplayer.cpp:2210
+#: src/localplayer.cpp:2199 src/localplayer.cpp:2214
 msgid "(?) away"
 msgstr "(?) away"
 
-#: src/localplayer.cpp:2208
+#: src/localplayer.cpp:2212
 msgid "(G) game camera mode"
 msgstr "(G) mód herní kamery"
 
-#: src/localplayer.cpp:2209
+#: src/localplayer.cpp:2213
 msgid "(F) free camera mode"
 msgstr "(F) mód volné kamery"
 
-#: src/localplayer.cpp:2234
+#: src/localplayer.cpp:2238
 msgid "Game modifiers are enabled"
 msgstr "Modifikátory hry jsou zapnuty"
 
-#: src/localplayer.cpp:2235
+#: src/localplayer.cpp:2239
 msgid "Game modifiers are disabled"
 msgstr "Modifikátory hry jsou vypnuty"
 
-#: src/localplayer.cpp:2236
+#: src/localplayer.cpp:2240
 #, fuzzy
 msgid "Game modifiers are unknown"
 msgstr "Modifikátory hry jsou zapnuty"
 
-#: src/localplayer.cpp:3752
+#: src/localplayer.cpp:3756
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3754 src/localplayer.cpp:3769
+#: src/localplayer.cpp:3758 src/localplayer.cpp:3773
 msgid "Follow canceled"
 msgstr "Následování zrušeno."
 
-#: src/localplayer.cpp:3761
+#: src/localplayer.cpp:3765
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3763 src/localplayer.cpp:3771
+#: src/localplayer.cpp:3767 src/localplayer.cpp:3775
 msgid "Imitation canceled"
 msgstr "Imitace zrušena."
 
-#: src/localplayer.cpp:4119
+#: src/localplayer.cpp:4123
 msgid "You see "
 msgstr "Vidíte "
 
-#: src/main.cpp:47
+#: src/main.cpp:49
 msgid "manaplus [options] [manaplus-file]"
 msgstr ""
 
-#: src/main.cpp:48
+#: src/main.cpp:50
 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr ""
 
-#: src/main.cpp:50
+#: src/main.cpp:52
 msgid "                  used to set custom parameters"
 msgstr ""
 
-#: src/main.cpp:51
+#: src/main.cpp:53
 msgid "                  to the manaplus client."
 msgstr ""
 
-#: src/main.cpp:53
+#: src/main.cpp:55
 msgid "Options:"
 msgstr "Nastavení:"
 
-#: src/main.cpp:54
+#: src/main.cpp:56
 msgid "  -l --log-file       : Log file to use"
 msgstr ""
 
-#: src/main.cpp:55
+#: src/main.cpp:57
 msgid "  -L --chat-log-dir   : Chat log dir to use"
 msgstr ""
 
-#: src/main.cpp:56
+#: src/main.cpp:58
 msgid "  -v --version        : Display the version"
 msgstr ""
 
-#: src/main.cpp:57
+#: src/main.cpp:59
 msgid "  -h --help           : Display this help"
 msgstr ""
 
-#: src/main.cpp:58
+#: src/main.cpp:60
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:59
+#: src/main.cpp:61
 msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:60
+#: src/main.cpp:62
 msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:61
+#: src/main.cpp:63
 msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:62
+#: src/main.cpp:64
 msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:63
+#: src/main.cpp:65
 msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:64
+#: src/main.cpp:66
 msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:65
+#: src/main.cpp:67
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:67
+#: src/main.cpp:69
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:68
+#: src/main.cpp:70
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:70
+#: src/main.cpp:72
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:72
+#: src/main.cpp:74
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:73
+#: src/main.cpp:75
 msgid "     --safemode       : Start game in safe mode"
 msgstr ""
 
-#: src/main.cpp:74
+#: src/main.cpp:76
 msgid "  -T --tests          : Start testing drivers and auto configuring"
 msgstr ""
 
-#: src/main.cpp:77
+#: src/main.cpp:79
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
@@ -5633,6 +5629,9 @@ msgstr ""
 msgid "Unknown item"
 msgstr "Neznámý předmět"
 
+#~ msgid "> Next"
+#~ msgstr "> Další"
+
 #~ msgid "Waiting for server"
 #~ msgstr "Čeká se na server"
 
diff --git a/po/de.po b/po/de.po
index e07cf9c8e..8d2d92b23 100644
--- a/po/de.po
+++ b/po/de.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-01-05 23:31+0300\n"
+"POT-Creation-Date: 2012-01-07 20:36+0300\n"
 "PO-Revision-Date: 2011-11-11 21:38+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: German (http://www.transifex.net/projects/p/manaplus/team/"
@@ -310,11 +310,11 @@ msgstr ""
 msgid "Deleted:"
 msgstr ""
 
-#: src/commandhandler.cpp:1180 src/commandhandler.cpp:1187
+#: src/commandhandler.cpp:1226 src/commandhandler.cpp:1233
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1182 src/commandhandler.cpp:1189
+#: src/commandhandler.cpp:1228 src/commandhandler.cpp:1235
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -1272,10 +1272,6 @@ msgstr "NPC"
 msgid "Clear"
 msgstr "Frei"
 
-#: src/gui/npcdialog.cpp:223
-msgid "> Next"
-msgstr ""
-
 #: src/gui/npcpostdialog.cpp:48
 msgid "To:"
 msgstr "Nach:"
@@ -3995,421 +3991,421 @@ msgstr ""
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1441
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1442
+#: src/localplayer.cpp:1444
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1447
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1446
+#: src/localplayer.cpp:1450
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1449
+#: src/localplayer.cpp:1453
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1452
+#: src/localplayer.cpp:1456
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1476
+#: src/localplayer.cpp:1480
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/localplayer.cpp:1893
+#: src/localplayer.cpp:1897
 msgid "(D) default moves"
 msgstr ""
 
-#: src/localplayer.cpp:1894
+#: src/localplayer.cpp:1898
 msgid "(I) invert moves"
 msgstr ""
 
-#: src/localplayer.cpp:1895
+#: src/localplayer.cpp:1899
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1896
+#: src/localplayer.cpp:1900
 msgid "(C) moves with crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1897
+#: src/localplayer.cpp:1901
 msgid "(d) double normal + crazy"
 msgstr ""
 
-#: src/localplayer.cpp:1898
+#: src/localplayer.cpp:1902
 msgid "(?) unknown move"
 msgstr ""
 
-#: src/localplayer.cpp:1920
+#: src/localplayer.cpp:1924
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr ""
 
-#: src/localplayer.cpp:1925
+#: src/localplayer.cpp:1929
 msgid "(a) custom crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1929
+#: src/localplayer.cpp:1933
 msgid "(?) crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1943
+#: src/localplayer.cpp:1947
 msgid "(0) default moves to target"
 msgstr ""
 
-#: src/localplayer.cpp:1944
+#: src/localplayer.cpp:1948
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
-#: src/localplayer.cpp:1945
+#: src/localplayer.cpp:1949
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
-#: src/localplayer.cpp:1946
+#: src/localplayer.cpp:1950
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
-#: src/localplayer.cpp:1947
+#: src/localplayer.cpp:1951
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
-#: src/localplayer.cpp:1948
+#: src/localplayer.cpp:1952
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
-#: src/localplayer.cpp:1949
+#: src/localplayer.cpp:1953
 msgid "(A) moves to target in attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1950
+#: src/localplayer.cpp:1954
 msgid "(a) archer attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1951
+#: src/localplayer.cpp:1955
 msgid "(?) move to target"
 msgstr ""
 
-#: src/localplayer.cpp:1970
+#: src/localplayer.cpp:1974
 msgid "(D) default follow"
 msgstr ""
 
-#: src/localplayer.cpp:1971
+#: src/localplayer.cpp:1975
 msgid "(R) relative follow"
 msgstr ""
 
-#: src/localplayer.cpp:1972
+#: src/localplayer.cpp:1976
 msgid "(M) mirror follow"
 msgstr ""
 
-#: src/localplayer.cpp:1973
+#: src/localplayer.cpp:1977
 msgid "(P) pet follow"
 msgstr ""
 
-#: src/localplayer.cpp:1974
+#: src/localplayer.cpp:1978
 msgid "(?) unknown follow"
 msgstr ""
 
-#: src/localplayer.cpp:1993 src/localplayer.cpp:1997 src/localplayer.cpp:2020
+#: src/localplayer.cpp:1997 src/localplayer.cpp:2001 src/localplayer.cpp:2024
 msgid "(?) attack"
 msgstr ""
 
-#: src/localplayer.cpp:1994 src/localplayer.cpp:2016
+#: src/localplayer.cpp:1998 src/localplayer.cpp:2020
 msgid "(D) default attack"
 msgstr ""
 
-#: src/localplayer.cpp:1995
+#: src/localplayer.cpp:1999
 msgid "(s) switch attack without shield"
 msgstr ""
 
-#: src/localplayer.cpp:1996
+#: src/localplayer.cpp:2000
 msgid "(S) switch attack with shield"
 msgstr ""
 
-#: src/localplayer.cpp:2017
+#: src/localplayer.cpp:2021
 msgid "(G) go and attack"
 msgstr ""
 
-#: src/localplayer.cpp:2018
+#: src/localplayer.cpp:2022
 msgid "(A) go, attack, pickup"
 msgstr ""
 
-#: src/localplayer.cpp:2019
+#: src/localplayer.cpp:2023
 msgid "(d) without auto attack"
 msgstr ""
 
-#: src/localplayer.cpp:2053
+#: src/localplayer.cpp:2057
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2054
+#: src/localplayer.cpp:2058
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2055
+#: src/localplayer.cpp:2059
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2056
+#: src/localplayer.cpp:2060
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2057
+#: src/localplayer.cpp:2061
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
-#: src/localplayer.cpp:2058
+#: src/localplayer.cpp:2062
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
-#: src/localplayer.cpp:2059
+#: src/localplayer.cpp:2063
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
-#: src/localplayer.cpp:2060
+#: src/localplayer.cpp:2064
 msgid "(?) pick up"
 msgstr ""
 
-#: src/localplayer.cpp:2073
+#: src/localplayer.cpp:2077
 msgid "(N) normal map view"
 msgstr ""
 
-#: src/localplayer.cpp:2074
+#: src/localplayer.cpp:2078
 msgid "(D) debug map view"
 msgstr ""
 
-#: src/localplayer.cpp:2075
+#: src/localplayer.cpp:2079
 msgid "(u) ultra map view"
 msgstr ""
 
-#: src/localplayer.cpp:2076
+#: src/localplayer.cpp:2080
 msgid "(U) ultra map view 2"
 msgstr ""
 
-#: src/localplayer.cpp:2077
+#: src/localplayer.cpp:2081
 msgid "(e) empty map view"
 msgstr ""
 
-#: src/localplayer.cpp:2078
+#: src/localplayer.cpp:2082
 msgid "(b) black & white map view"
 msgstr ""
 
-#: src/localplayer.cpp:2097
+#: src/localplayer.cpp:2101
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2098
+#: src/localplayer.cpp:2102
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2099
+#: src/localplayer.cpp:2103
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2100
+#: src/localplayer.cpp:2104
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2101
+#: src/localplayer.cpp:2105
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2102
+#: src/localplayer.cpp:2106
 msgid "(?) magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2121
+#: src/localplayer.cpp:2125
 msgid "(a) attack all players"
 msgstr ""
 
-#: src/localplayer.cpp:2122
+#: src/localplayer.cpp:2126
 msgid "(f) attack not friends"
 msgstr ""
 
-#: src/localplayer.cpp:2123
+#: src/localplayer.cpp:2127
 msgid "(b) attack bad relations"
 msgstr ""
 
-#: src/localplayer.cpp:2124
+#: src/localplayer.cpp:2128
 msgid "(d) dont attack players"
 msgstr ""
 
-#: src/localplayer.cpp:2125
+#: src/localplayer.cpp:2129
 msgid "(?) pvp attack"
 msgstr ""
 
-#: src/localplayer.cpp:2144
+#: src/localplayer.cpp:2148
 msgid "(D) default imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2145
+#: src/localplayer.cpp:2149
 msgid "(O) outfits imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2146
+#: src/localplayer.cpp:2150
 msgid "(?) imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2174
+#: src/localplayer.cpp:2178
 msgid "Away"
 msgstr "Abwesend"
 
-#: src/localplayer.cpp:2193
+#: src/localplayer.cpp:2197
 msgid "(O) on keyboard"
 msgstr ""
 
-#: src/localplayer.cpp:2194
+#: src/localplayer.cpp:2198
 msgid "(A) away"
 msgstr ""
 
-#: src/localplayer.cpp:2195 src/localplayer.cpp:2210
+#: src/localplayer.cpp:2199 src/localplayer.cpp:2214
 msgid "(?) away"
 msgstr ""
 
-#: src/localplayer.cpp:2208
+#: src/localplayer.cpp:2212
 msgid "(G) game camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2209
+#: src/localplayer.cpp:2213
 msgid "(F) free camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2234
+#: src/localplayer.cpp:2238
 msgid "Game modifiers are enabled"
 msgstr ""
 
-#: src/localplayer.cpp:2235
+#: src/localplayer.cpp:2239
 msgid "Game modifiers are disabled"
 msgstr ""
 
-#: src/localplayer.cpp:2236
+#: src/localplayer.cpp:2240
 msgid "Game modifiers are unknown"
 msgstr ""
 
-#: src/localplayer.cpp:3752
+#: src/localplayer.cpp:3756
 msgid "Follow: "
 msgstr "Folgen:"
 
-#: src/localplayer.cpp:3754 src/localplayer.cpp:3769
+#: src/localplayer.cpp:3758 src/localplayer.cpp:3773
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3761
+#: src/localplayer.cpp:3765
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3763 src/localplayer.cpp:3771
+#: src/localplayer.cpp:3767 src/localplayer.cpp:3775
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:4119
+#: src/localplayer.cpp:4123
 msgid "You see "
 msgstr "Du siehst"
 
-#: src/main.cpp:47
+#: src/main.cpp:49
 msgid "manaplus [options] [manaplus-file]"
 msgstr ""
 
-#: src/main.cpp:48
+#: src/main.cpp:50
 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr ""
 
-#: src/main.cpp:50
+#: src/main.cpp:52
 msgid "                  used to set custom parameters"
 msgstr ""
 
-#: src/main.cpp:51
+#: src/main.cpp:53
 msgid "                  to the manaplus client."
 msgstr ""
 
-#: src/main.cpp:53
+#: src/main.cpp:55
 msgid "Options:"
 msgstr "Optionen:"
 
-#: src/main.cpp:54
+#: src/main.cpp:56
 msgid "  -l --log-file       : Log file to use"
 msgstr ""
 
-#: src/main.cpp:55
+#: src/main.cpp:57
 msgid "  -L --chat-log-dir   : Chat log dir to use"
 msgstr ""
 
-#: src/main.cpp:56
+#: src/main.cpp:58
 msgid "  -v --version        : Display the version"
 msgstr "  -v --version : Die Version des Spieles anzeigen"
 
-#: src/main.cpp:57
+#: src/main.cpp:59
 msgid "  -h --help           : Display this help"
 msgstr "  - --help : Zeigt diesen Hilfstext an"
 
-#: src/main.cpp:58
+#: src/main.cpp:60
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:59
+#: src/main.cpp:61
 msgid "  -U --username       : Login with this username"
 msgstr "  -U --username : Mit angegebenem Benutzernamen anmelden"
 
-#: src/main.cpp:60
+#: src/main.cpp:62
 msgid "  -P --password       : Login with this password"
 msgstr "  -P --password : Angegebenes Passwort benutzen"
 
-#: src/main.cpp:61
+#: src/main.cpp:63
 msgid "  -c --character      : Login with this character"
 msgstr "  -c --charakter : Mit angegebenem Spieler anmelden"
 
-#: src/main.cpp:62
+#: src/main.cpp:64
 msgid "  -s --server         : Login server name or IP"
 msgstr "  -s --server : Name oder IP-Adresse des Loginservers"
 
-#: src/main.cpp:63
+#: src/main.cpp:65
 msgid "  -p --port           : Login server port"
 msgstr "  -p --port : Port des Loginservers"
 
-#: src/main.cpp:64
+#: src/main.cpp:66
 msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:65
+#: src/main.cpp:67
 msgid "  -D --default        : Choose default character server and character"
 msgstr "  -D --default : Wähle zuletzt benutzten Server und Spieler aus"
 
-#: src/main.cpp:67
+#: src/main.cpp:69
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr "  -u --skip-update : Überspringe das Herunterladen von Updates"
 
-#: src/main.cpp:68
+#: src/main.cpp:70
 msgid "  -d --data           : Directory to load game data from"
 msgstr "  -d --data : Datenverzeichnis, aus dem das Spiel geladen werden soll"
 
-#: src/main.cpp:70
+#: src/main.cpp:72
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:72
+#: src/main.cpp:74
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:73
+#: src/main.cpp:75
 msgid "     --safemode       : Start game in safe mode"
 msgstr ""
 
-#: src/main.cpp:74
+#: src/main.cpp:76
 msgid "  -T --tests          : Start testing drivers and auto configuring"
 msgstr ""
 
-#: src/main.cpp:77
+#: src/main.cpp:79
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
diff --git a/po/es.po b/po/es.po
index cc3b62452..108757cfa 100644
--- a/po/es.po
+++ b/po/es.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-01-05 23:31+0300\n"
+"POT-Creation-Date: 2012-01-07 20:36+0300\n"
 "PO-Revision-Date: 2012-01-05 21:19+0000\n"
 "Last-Translator: Nelson Martell <nelson6e65-manaplus@yahoo.es>\n"
 "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/"
@@ -309,11 +309,11 @@ msgstr "Creado:"
 msgid "Deleted:"
 msgstr "Borrado:"
 
-#: src/commandhandler.cpp:1180 src/commandhandler.cpp:1187
+#: src/commandhandler.cpp:1226 src/commandhandler.cpp:1233
 msgid "Resource images:"
 msgstr "Imágenes de recurso:"
 
-#: src/commandhandler.cpp:1182 src/commandhandler.cpp:1189
+#: src/commandhandler.cpp:1228 src/commandhandler.cpp:1235
 msgid "Resource orphaned images:"
 msgstr "Imágenes de recurso huérfano:"
 
@@ -1271,10 +1271,6 @@ msgstr "NPC"
 msgid "Clear"
 msgstr "Limpiar"
 
-#: src/gui/npcdialog.cpp:223
-msgid "> Next"
-msgstr "> Siguiente"
-
 #: src/gui/npcpostdialog.cpp:48
 msgid "To:"
 msgstr "Para:"
@@ -3990,422 +3986,422 @@ msgstr "Fuiste eliminado por "
 msgid "Tried to pick up nonexistent item."
 msgstr "Intentaste recoger un objeto inexistante."
 
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1441
 msgid "Item is too heavy."
 msgstr "El artículo es muy pesado."
 
-#: src/localplayer.cpp:1442
+#: src/localplayer.cpp:1444
 msgid "Item is too far away."
 msgstr "El artículo está muy lejos."
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1447
 msgid "Inventory is full."
 msgstr "El inventario está lleno."
 
-#: src/localplayer.cpp:1446
+#: src/localplayer.cpp:1450
 msgid "Stack is too big."
 msgstr "El agrupamiento es demasiado grande."
 
-#: src/localplayer.cpp:1449
+#: src/localplayer.cpp:1453
 msgid "Item belongs to someone else."
 msgstr "El artículo pertenece a alguien más."
 
-#: src/localplayer.cpp:1452
+#: src/localplayer.cpp:1456
 msgid "Unknown problem picking up item."
 msgstr "Problema desconocido al intentar recoger el artículo."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1476
+#: src/localplayer.cpp:1480
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "Usted cogió un/a %d [@@%d|%s@@]."
 msgstr[1] "Usted Cogió %d [@@%d|%s@@]."
 
-#: src/localplayer.cpp:1893
+#: src/localplayer.cpp:1897
 msgid "(D) default moves"
 msgstr "(D) moverse predeterminado"
 
-#: src/localplayer.cpp:1894
+#: src/localplayer.cpp:1898
 msgid "(I) invert moves"
 msgstr "(I) moverse invertido"
 
-#: src/localplayer.cpp:1895
+#: src/localplayer.cpp:1899
 msgid "(c) moves with some crazy moves"
 msgstr "(c) moverse con algunos movimientos locos"
 
-#: src/localplayer.cpp:1896
+#: src/localplayer.cpp:1900
 msgid "(C) moves with crazy moves"
 msgstr "(C) moverse con movimientos locos"
 
-#: src/localplayer.cpp:1897
+#: src/localplayer.cpp:1901
 msgid "(d) double normal + crazy"
 msgstr "(d) doble normal + loco"
 
-#: src/localplayer.cpp:1898
+#: src/localplayer.cpp:1902
 msgid "(?) unknown move"
 msgstr "(?) movimiento desconocido"
 
-#: src/localplayer.cpp:1920
+#: src/localplayer.cpp:1924
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr "(%d) movimiento loco número %d"
 
-#: src/localplayer.cpp:1925
+#: src/localplayer.cpp:1929
 msgid "(a) custom crazy move"
 msgstr "(a) maniobra alocada personalizada"
 
-#: src/localplayer.cpp:1929
+#: src/localplayer.cpp:1933
 msgid "(?) crazy move"
 msgstr "(?) maniobra loca"
 
-#: src/localplayer.cpp:1943
+#: src/localplayer.cpp:1947
 msgid "(0) default moves to target"
 msgstr "(0) moverse por defecto hacia el objetivo"
 
-#: src/localplayer.cpp:1944
+#: src/localplayer.cpp:1948
 msgid "(1) moves to target in distance 1"
 msgstr "(1) moverse al objetivo en distancia 1"
 
-#: src/localplayer.cpp:1945
+#: src/localplayer.cpp:1949
 msgid "(2) moves to target in distance 2"
 msgstr "(2) moverse al objetivo en distancia 2"
 
-#: src/localplayer.cpp:1946
+#: src/localplayer.cpp:1950
 msgid "(3) moves to target in distance 3"
 msgstr "(3) moverse al objetivo en distancia 3"
 
-#: src/localplayer.cpp:1947
+#: src/localplayer.cpp:1951
 msgid "(5) moves to target in distance 5"
 msgstr "(5) moverse al objetivo en distancia 5"
 
-#: src/localplayer.cpp:1948
+#: src/localplayer.cpp:1952
 msgid "(7) moves to target in distance 7"
 msgstr "(7) moverse al objetivo en distancia 7"
 
-#: src/localplayer.cpp:1949
+#: src/localplayer.cpp:1953
 msgid "(A) moves to target in attack range"
 msgstr "(A) desplazarse al objetivo en el rango de ataque"
 
-#: src/localplayer.cpp:1950
+#: src/localplayer.cpp:1954
 msgid "(a) archer attack range"
 msgstr "(a) rango de ataque de arquero"
 
-#: src/localplayer.cpp:1951
+#: src/localplayer.cpp:1955
 msgid "(?) move to target"
 msgstr "(?) mover al objetivo"
 
-#: src/localplayer.cpp:1970
+#: src/localplayer.cpp:1974
 msgid "(D) default follow"
 msgstr "(D) seguimiento predeterminado"
 
-#: src/localplayer.cpp:1971
+#: src/localplayer.cpp:1975
 msgid "(R) relative follow"
 msgstr "(R) seguimiento relativo"
 
-#: src/localplayer.cpp:1972
+#: src/localplayer.cpp:1976
 msgid "(M) mirror follow"
 msgstr "(M) seguimiento tipo espejo"
 
-#: src/localplayer.cpp:1973
+#: src/localplayer.cpp:1977
 msgid "(P) pet follow"
 msgstr "(P) seguimiento como mascota"
 
-#: src/localplayer.cpp:1974
+#: src/localplayer.cpp:1978
 msgid "(?) unknown follow"
 msgstr "(?) seguimiento desconoicido"
 
-#: src/localplayer.cpp:1993 src/localplayer.cpp:1997 src/localplayer.cpp:2020
+#: src/localplayer.cpp:1997 src/localplayer.cpp:2001 src/localplayer.cpp:2024
 msgid "(?) attack"
 msgstr "(?) atacar"
 
-#: src/localplayer.cpp:1994 src/localplayer.cpp:2016
+#: src/localplayer.cpp:1998 src/localplayer.cpp:2020
 msgid "(D) default attack"
 msgstr "(D) ataque predeterminado"
 
-#: src/localplayer.cpp:1995
+#: src/localplayer.cpp:1999
 msgid "(s) switch attack without shield"
 msgstr "(s) intercambiar ataque sin escudo"
 
-#: src/localplayer.cpp:1996
+#: src/localplayer.cpp:2000
 msgid "(S) switch attack with shield"
 msgstr "(S)  intercambiar ataque con escudo"
 
-#: src/localplayer.cpp:2017
+#: src/localplayer.cpp:2021
 msgid "(G) go and attack"
 msgstr "(G) ir y atacar"
 
-#: src/localplayer.cpp:2018
+#: src/localplayer.cpp:2022
 msgid "(A) go, attack, pickup"
 msgstr "(A) ir, atacar, recoger"
 
-#: src/localplayer.cpp:2019
+#: src/localplayer.cpp:2023
 msgid "(d) without auto attack"
 msgstr "(d) sin atacar automáticamente"
 
-#: src/localplayer.cpp:2053
+#: src/localplayer.cpp:2057
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) recoger a 1x1 celdas (pequeño)"
 
-#: src/localplayer.cpp:2054
+#: src/localplayer.cpp:2058
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) recoger a 2x1 celdas (predeterminado)"
 
-#: src/localplayer.cpp:2055
+#: src/localplayer.cpp:2059
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) recoger interesadamente a 2x3 celda"
 
-#: src/localplayer.cpp:2056
+#: src/localplayer.cpp:2060
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) recoger a 3x3 celdas"
 
-#: src/localplayer.cpp:2057
+#: src/localplayer.cpp:2061
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) ir y recoger en distancia 4"
 
-#: src/localplayer.cpp:2058
+#: src/localplayer.cpp:2062
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) ir y recoger en distancia 8"
 
-#: src/localplayer.cpp:2059
+#: src/localplayer.cpp:2063
 msgid "(A) go and pick up in max distance"
 msgstr "(A) ir y recoger a máxima distancia"
 
-#: src/localplayer.cpp:2060
+#: src/localplayer.cpp:2064
 msgid "(?) pick up"
 msgstr "(?) recoger"
 
-#: src/localplayer.cpp:2073
+#: src/localplayer.cpp:2077
 msgid "(N) normal map view"
 msgstr "(N) vista normal del mapa"
 
-#: src/localplayer.cpp:2074
+#: src/localplayer.cpp:2078
 msgid "(D) debug map view"
 msgstr "(D) vista depurar del mapa"
 
-#: src/localplayer.cpp:2075
+#: src/localplayer.cpp:2079
 msgid "(u) ultra map view"
 msgstr "(u) ultra vista del mapa"
 
-#: src/localplayer.cpp:2076
+#: src/localplayer.cpp:2080
 msgid "(U) ultra map view 2"
 msgstr "(U) ultra vista del mapa 2"
 
-#: src/localplayer.cpp:2077
+#: src/localplayer.cpp:2081
 msgid "(e) empty map view"
 msgstr "(e) vista vacía del mapa"
 
-#: src/localplayer.cpp:2078
+#: src/localplayer.cpp:2082
 msgid "(b) black & white map view"
 msgstr "(b) vista del mapa en blanco y negro"
 
-#: src/localplayer.cpp:2097
+#: src/localplayer.cpp:2101
 msgid "(f) use #flar for magic attack"
 msgstr "(f) usar #flar para ataque mágico"
 
-#: src/localplayer.cpp:2098
+#: src/localplayer.cpp:2102
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) usar #chiza para ataque mágico"
 
-#: src/localplayer.cpp:2099
+#: src/localplayer.cpp:2103
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) usar #ingrav para ataque mágico"
 
-#: src/localplayer.cpp:2100
+#: src/localplayer.cpp:2104
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) usar #frillyar para ataque mágico"
 
-#: src/localplayer.cpp:2101
+#: src/localplayer.cpp:2105
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) usar #upmarmu para ataque mágico"
 
-#: src/localplayer.cpp:2102
+#: src/localplayer.cpp:2106
 msgid "(?) magic attack"
 msgstr "(?) ataque mágico"
 
-#: src/localplayer.cpp:2121
+#: src/localplayer.cpp:2125
 msgid "(a) attack all players"
 msgstr "(a) atacar a todos los jugadores"
 
-#: src/localplayer.cpp:2122
+#: src/localplayer.cpp:2126
 msgid "(f) attack not friends"
 msgstr "(f) atacar a los que no son amigos"
 
-#: src/localplayer.cpp:2123
+#: src/localplayer.cpp:2127
 msgid "(b) attack bad relations"
 msgstr "(b) atacar a quienes están en malas relaciones"
 
-#: src/localplayer.cpp:2124
+#: src/localplayer.cpp:2128
 msgid "(d) dont attack players"
 msgstr "(d) no atacar a los jugadores"
 
-#: src/localplayer.cpp:2125
+#: src/localplayer.cpp:2129
 msgid "(?) pvp attack"
 msgstr "(?) ataque pvp"
 
-#: src/localplayer.cpp:2144
+#: src/localplayer.cpp:2148
 msgid "(D) default imitation"
 msgstr "(D) imitación predeterminada"
 
-#: src/localplayer.cpp:2145
+#: src/localplayer.cpp:2149
 msgid "(O) outfits imitation"
 msgstr "(O) imitación de conjuntos"
 
-#: src/localplayer.cpp:2146
+#: src/localplayer.cpp:2150
 msgid "(?) imitation"
 msgstr "(?) imitación"
 
-#: src/localplayer.cpp:2174
+#: src/localplayer.cpp:2178
 msgid "Away"
 msgstr "Fuera del Teclado"
 
-#: src/localplayer.cpp:2193
+#: src/localplayer.cpp:2197
 msgid "(O) on keyboard"
 msgstr "(O) en el teclado"
 
-#: src/localplayer.cpp:2194
+#: src/localplayer.cpp:2198
 msgid "(A) away"
 msgstr "(A) lejos del teclado"
 
-#: src/localplayer.cpp:2195 src/localplayer.cpp:2210
+#: src/localplayer.cpp:2199 src/localplayer.cpp:2214
 msgid "(?) away"
 msgstr "(?) afuera"
 
-#: src/localplayer.cpp:2208
+#: src/localplayer.cpp:2212
 msgid "(G) game camera mode"
 msgstr "(G) modo de cámara de juego"
 
-#: src/localplayer.cpp:2209
+#: src/localplayer.cpp:2213
 msgid "(F) free camera mode"
 msgstr "(F) modo de cámara libre"
 
-#: src/localplayer.cpp:2234
+#: src/localplayer.cpp:2238
 msgid "Game modifiers are enabled"
 msgstr "Modificadores del juego están habilitados"
 
-#: src/localplayer.cpp:2235
+#: src/localplayer.cpp:2239
 msgid "Game modifiers are disabled"
 msgstr "Modificadores del juego están deshabilitados"
 
-#: src/localplayer.cpp:2236
+#: src/localplayer.cpp:2240
 msgid "Game modifiers are unknown"
 msgstr "Los modificadores del juego son desconocidos"
 
-#: src/localplayer.cpp:3752
+#: src/localplayer.cpp:3756
 msgid "Follow: "
 msgstr "Seguir: "
 
-#: src/localplayer.cpp:3754 src/localplayer.cpp:3769
+#: src/localplayer.cpp:3758 src/localplayer.cpp:3773
 msgid "Follow canceled"
 msgstr "Seguir cancelado"
 
-#: src/localplayer.cpp:3761
+#: src/localplayer.cpp:3765
 msgid "Imitation: "
 msgstr "Imitacion: "
 
-#: src/localplayer.cpp:3763 src/localplayer.cpp:3771
+#: src/localplayer.cpp:3767 src/localplayer.cpp:3775
 msgid "Imitation canceled"
 msgstr "Imitación cancelada"
 
-#: src/localplayer.cpp:4119
+#: src/localplayer.cpp:4123
 msgid "You see "
 msgstr "Ves "
 
-#: src/main.cpp:47
+#: src/main.cpp:49
 msgid "manaplus [options] [manaplus-file]"
 msgstr "manaplus [options] [manaplus-file]"
 
-#: src/main.cpp:48
+#: src/main.cpp:50
 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr "[manaplus-file] : El archivo manaplus es un archivo XML (.manaplus)"
 
-#: src/main.cpp:50
+#: src/main.cpp:52
 msgid "                  used to set custom parameters"
 msgstr "              usado para establecer parámetros personalizados."
 
-#: src/main.cpp:51
+#: src/main.cpp:53
 msgid "                  to the manaplus client."
 msgstr "              al cliente manaplus."
 
-#: src/main.cpp:53
+#: src/main.cpp:55
 msgid "Options:"
 msgstr "Opciones:"
 
-#: src/main.cpp:54
+#: src/main.cpp:56
 msgid "  -l --log-file       : Log file to use"
 msgstr "  -l --log-file       : Archivo de registro a usar"
 
-#: src/main.cpp:55
+#: src/main.cpp:57
 msgid "  -L --chat-log-dir   : Chat log dir to use"
 msgstr "  -L --chat-log-dir   : Directorio a usar para registro del Chat"
 
-#: src/main.cpp:56
+#: src/main.cpp:58
 msgid "  -v --version        : Display the version"
 msgstr "  -v --version        :  Muestra la versión"
 
-#: src/main.cpp:57
+#: src/main.cpp:59
 msgid "  -h --help           : Display this help"
 msgstr "  -h --help           : Muestra la ayuda"
 
-#: src/main.cpp:58
+#: src/main.cpp:60
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr "  -C --config-dir     : Carpeta de Configuración a usar"
 
-#: src/main.cpp:59
+#: src/main.cpp:61
 msgid "  -U --username       : Login with this username"
 msgstr "  -U --username       : Acceder con este nombre de usuario"
 
-#: src/main.cpp:60
+#: src/main.cpp:62
 msgid "  -P --password       : Login with this password"
 msgstr "  -P --password       : Acceder con la contraseña"
 
-#: src/main.cpp:61
+#: src/main.cpp:63
 msgid "  -c --character      : Login with this character"
 msgstr "  -c --character      : Acceder con este jugador"
 
-#: src/main.cpp:62
+#: src/main.cpp:64
 msgid "  -s --server         : Login server name or IP"
 msgstr "  -s --server         :  Login server o IP"
 
-#: src/main.cpp:63
+#: src/main.cpp:65
 msgid "  -p --port           : Login server port"
 msgstr "  -p --port           : Puerto del servidor"
 
-#: src/main.cpp:64
+#: src/main.cpp:66
 msgid "     --update-host    : Use this update host"
 msgstr "     --update-host    : Usar este host de actualización"
 
-#: src/main.cpp:65
+#: src/main.cpp:67
 msgid "  -D --default        : Choose default character server and character"
 msgstr "  -D --default        : Escoje el personaje por defecto y el servidor"
 
-#: src/main.cpp:67
+#: src/main.cpp:69
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr "  -u --skip-update    : Saltarse las actualizaciones"
 
-#: src/main.cpp:68
+#: src/main.cpp:70
 msgid "  -d --data           : Directory to load game data from"
 msgstr "  -d --data           : Carpeta por donde cargar los datos del juego"
 
-#: src/main.cpp:70
+#: src/main.cpp:72
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr "  -L --localdata-dir  : Carpeta para usar los datos locales"
 
-#: src/main.cpp:72
+#: src/main.cpp:74
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr "     --screenshot-dir : Carpeta donde guardar los screenshots"
 
-#: src/main.cpp:73
+#: src/main.cpp:75
 msgid "     --safemode       : Start game in safe mode"
 msgstr "     --safemode       : Iniciar el juego en modo seguro"
 
-#: src/main.cpp:74
+#: src/main.cpp:76
 msgid "  -T --tests          : Start testing drivers and auto configuring"
 msgstr ""
 "  -T --tests          : Comenzar a probar controladores y auto configurar"
 
-#: src/main.cpp:77
+#: src/main.cpp:79
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr "     --no-opengl      :  Deshabilita OpenGL en esta sesion"
 
@@ -5649,3 +5645,6 @@ msgstr "PM %+d"
 #: src/resources/itemdb.cpp:169
 msgid "Unknown item"
 msgstr "Objeto desconocido"
+
+#~ msgid "> Next"
+#~ msgstr "> Siguiente"
diff --git a/po/fi.po b/po/fi.po
index 632c44a2c..3f8763111 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-01-05 23:31+0300\n"
+"POT-Creation-Date: 2012-01-07 20:36+0300\n"
 "PO-Revision-Date: 2011-12-08 14:10+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -305,11 +305,11 @@ msgstr "Luotu:"
 msgid "Deleted:"
 msgstr "Poistettu:"
 
-#: src/commandhandler.cpp:1180 src/commandhandler.cpp:1187
+#: src/commandhandler.cpp:1226 src/commandhandler.cpp:1233
 msgid "Resource images:"
 msgstr "Resurssikuvat:"
 
-#: src/commandhandler.cpp:1182 src/commandhandler.cpp:1189
+#: src/commandhandler.cpp:1228 src/commandhandler.cpp:1235
 msgid "Resource orphaned images:"
 msgstr "Orvot resurssikuvat:"
 
@@ -1268,10 +1268,6 @@ msgstr "Ei-pelaajahahmo (NPC)"
 msgid "Clear"
 msgstr "Tyhjennä"
 
-#: src/gui/npcdialog.cpp:223
-msgid "> Next"
-msgstr "> Seuraava"
-
 #: src/gui/npcpostdialog.cpp:48
 msgid "To:"
 msgstr "Vastaanottaja:"
@@ -3985,422 +3981,422 @@ msgstr "Sinut otti hengiltä "
 msgid "Tried to pick up nonexistent item."
 msgstr "Yritit nostaa olemattoman tavaran."
 
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1441
 msgid "Item is too heavy."
 msgstr "Tavara on liian painava."
 
-#: src/localplayer.cpp:1442
+#: src/localplayer.cpp:1444
 msgid "Item is too far away."
 msgstr "Tavara on liian kaukana."
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1447
 msgid "Inventory is full."
 msgstr "Sinulla on liikaa tavaraa ennestään."
 
-#: src/localplayer.cpp:1446
+#: src/localplayer.cpp:1450
 msgid "Stack is too big."
 msgstr "Kasa on liian suuri."
 
-#: src/localplayer.cpp:1449
+#: src/localplayer.cpp:1453
 msgid "Item belongs to someone else."
 msgstr "Tavara kuuluu jollekulle muulle."
 
-#: src/localplayer.cpp:1452
+#: src/localplayer.cpp:1456
 msgid "Unknown problem picking up item."
 msgstr "Tuntematon ongelma esti tavaran nostamisen."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1476
+#: src/localplayer.cpp:1480
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "[@@%2$d|%3$s@@] (%1$d kpl) otettu."
 msgstr[1] "[@@%2$d|%3$s@@] (%1$d kpl) otettu."
 
-#: src/localplayer.cpp:1893
+#: src/localplayer.cpp:1897
 msgid "(D) default moves"
 msgstr "(D) oletusliikkeet"
 
-#: src/localplayer.cpp:1894
+#: src/localplayer.cpp:1898
 msgid "(I) invert moves"
 msgstr "(I) käännetyt liikkeet"
 
-#: src/localplayer.cpp:1895
+#: src/localplayer.cpp:1899
 msgid "(c) moves with some crazy moves"
 msgstr "(c) liikkuu osin villiliikkein"
 
-#: src/localplayer.cpp:1896
+#: src/localplayer.cpp:1900
 msgid "(C) moves with crazy moves"
 msgstr "(C) liikkuu villiliikkein"
 
-#: src/localplayer.cpp:1897
+#: src/localplayer.cpp:1901
 msgid "(d) double normal + crazy"
 msgstr "(d) tuplaa tavallinen + villi"
 
-#: src/localplayer.cpp:1898
+#: src/localplayer.cpp:1902
 msgid "(?) unknown move"
 msgstr ""
 
-#: src/localplayer.cpp:1920
+#: src/localplayer.cpp:1924
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr ""
 
-#: src/localplayer.cpp:1925
+#: src/localplayer.cpp:1929
 msgid "(a) custom crazy move"
 msgstr "(a) oma villiliike"
 
-#: src/localplayer.cpp:1929
+#: src/localplayer.cpp:1933
 msgid "(?) crazy move"
 msgstr "(?) villiliike"
 
-#: src/localplayer.cpp:1943
+#: src/localplayer.cpp:1947
 msgid "(0) default moves to target"
 msgstr "(0) oletussiirtymä kohteen luo"
 
-#: src/localplayer.cpp:1944
+#: src/localplayer.cpp:1948
 msgid "(1) moves to target in distance 1"
 msgstr "(1) siirry kohteen luo etäisyydellä 1"
 
-#: src/localplayer.cpp:1945
+#: src/localplayer.cpp:1949
 msgid "(2) moves to target in distance 2"
 msgstr "(2) siirry kohteen luo etäisyydellä 2"
 
-#: src/localplayer.cpp:1946
+#: src/localplayer.cpp:1950
 msgid "(3) moves to target in distance 3"
 msgstr "(3) siirry kohteen luo etäisyydellä 3"
 
-#: src/localplayer.cpp:1947
+#: src/localplayer.cpp:1951
 msgid "(5) moves to target in distance 5"
 msgstr "(5) siirry kohteen luo etäisyydellä 5"
 
-#: src/localplayer.cpp:1948
+#: src/localplayer.cpp:1952
 msgid "(7) moves to target in distance 7"
 msgstr "(7) siirry kohteen luo etäisyydellä 7"
 
-#: src/localplayer.cpp:1949
+#: src/localplayer.cpp:1953
 msgid "(A) moves to target in attack range"
 msgstr "(A) siirry kohteen luo hyökkäyskantamalla"
 
-#: src/localplayer.cpp:1950
+#: src/localplayer.cpp:1954
 msgid "(a) archer attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1951
+#: src/localplayer.cpp:1955
 msgid "(?) move to target"
 msgstr "(?) siirry kohteen luo"
 
-#: src/localplayer.cpp:1970
+#: src/localplayer.cpp:1974
 msgid "(D) default follow"
 msgstr "(D) oletusseuraaminen"
 
-#: src/localplayer.cpp:1971
+#: src/localplayer.cpp:1975
 msgid "(R) relative follow"
 msgstr "(R) suhteellinen seuraaminen"
 
-#: src/localplayer.cpp:1972
+#: src/localplayer.cpp:1976
 msgid "(M) mirror follow"
 msgstr "(M) peilikuvaseuraaminen"
 
-#: src/localplayer.cpp:1973
+#: src/localplayer.cpp:1977
 msgid "(P) pet follow"
 msgstr "(P) lemmikkiseuraaminen"
 
-#: src/localplayer.cpp:1974
+#: src/localplayer.cpp:1978
 msgid "(?) unknown follow"
 msgstr "(?) tuntematon seuraaminen"
 
-#: src/localplayer.cpp:1993 src/localplayer.cpp:1997 src/localplayer.cpp:2020
+#: src/localplayer.cpp:1997 src/localplayer.cpp:2001 src/localplayer.cpp:2024
 msgid "(?) attack"
 msgstr "(?) hyökkäys"
 
-#: src/localplayer.cpp:1994 src/localplayer.cpp:2016
+#: src/localplayer.cpp:1998 src/localplayer.cpp:2020
 msgid "(D) default attack"
 msgstr "(D) oletushyökkäys"
 
-#: src/localplayer.cpp:1995
+#: src/localplayer.cpp:1999
 msgid "(s) switch attack without shield"
 msgstr "(s) vaihda hyökkäystä, ei kilpeä"
 
-#: src/localplayer.cpp:1996
+#: src/localplayer.cpp:2000
 msgid "(S) switch attack with shield"
 msgstr "(S) vaihda hyökkäystä, kilpi mukana"
 
-#: src/localplayer.cpp:2017
+#: src/localplayer.cpp:2021
 msgid "(G) go and attack"
 msgstr "(G) mene ja hyökkää"
 
-#: src/localplayer.cpp:2018
+#: src/localplayer.cpp:2022
 msgid "(A) go, attack, pickup"
 msgstr "(A) mene, hyökkää, nosta"
 
-#: src/localplayer.cpp:2019
+#: src/localplayer.cpp:2023
 msgid "(d) without auto attack"
 msgstr "(d) ei automaattista hyökkäystä"
 
-#: src/localplayer.cpp:2053
+#: src/localplayer.cpp:2057
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) pieni nosto 1x1 ruutua"
 
-#: src/localplayer.cpp:2054
+#: src/localplayer.cpp:2058
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) oletusnosto 2x1 ruutua"
 
-#: src/localplayer.cpp:2055
+#: src/localplayer.cpp:2059
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) nosto edestä 2x3 ruutua"
 
-#: src/localplayer.cpp:2056
+#: src/localplayer.cpp:2060
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) nosto 3x3 ruutua"
 
-#: src/localplayer.cpp:2057
+#: src/localplayer.cpp:2061
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) mene ja nosta etäisyydellä 4"
 
-#: src/localplayer.cpp:2058
+#: src/localplayer.cpp:2062
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) mene ja nosta etäisyydellä 8"
 
-#: src/localplayer.cpp:2059
+#: src/localplayer.cpp:2063
 msgid "(A) go and pick up in max distance"
 msgstr "(A) mene ja nosta maksimietäisyydellä"
 
-#: src/localplayer.cpp:2060
+#: src/localplayer.cpp:2064
 msgid "(?) pick up"
 msgstr "(?) nosta"
 
-#: src/localplayer.cpp:2073
+#: src/localplayer.cpp:2077
 msgid "(N) normal map view"
 msgstr "(N) normaali karttanäkymä"
 
-#: src/localplayer.cpp:2074
+#: src/localplayer.cpp:2078
 msgid "(D) debug map view"
 msgstr "(D) debug-karttanäkymä"
 
-#: src/localplayer.cpp:2075
+#: src/localplayer.cpp:2079
 msgid "(u) ultra map view"
 msgstr "(u) ultra-karttanäkymä"
 
-#: src/localplayer.cpp:2076
+#: src/localplayer.cpp:2080
 msgid "(U) ultra map view 2"
 msgstr "(U) ultra-karttanäkymä 2"
 
-#: src/localplayer.cpp:2077
+#: src/localplayer.cpp:2081
 msgid "(e) empty map view"
 msgstr "(e) tyhjä karttanäkymä"
 
-#: src/localplayer.cpp:2078
+#: src/localplayer.cpp:2082
 msgid "(b) black & white map view"
 msgstr "(b) mustavalkoinen karttanäkymä"
 
-#: src/localplayer.cpp:2097
+#: src/localplayer.cpp:2101
 msgid "(f) use #flar for magic attack"
 msgstr "(f) #flar taikahyökkäyksenä"
 
-#: src/localplayer.cpp:2098
+#: src/localplayer.cpp:2102
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) #chiza taikahyökkäyksenä"
 
-#: src/localplayer.cpp:2099
+#: src/localplayer.cpp:2103
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) #ingrav taikahyökkäyksenä"
 
-#: src/localplayer.cpp:2100
+#: src/localplayer.cpp:2104
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) #frillyar taikahyökkäyksenä"
 
-#: src/localplayer.cpp:2101
+#: src/localplayer.cpp:2105
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) #upmarmu taikahyökkäyksenä"
 
-#: src/localplayer.cpp:2102
+#: src/localplayer.cpp:2106
 msgid "(?) magic attack"
 msgstr "(?) taikahyökkäys"
 
-#: src/localplayer.cpp:2121
+#: src/localplayer.cpp:2125
 msgid "(a) attack all players"
 msgstr ""
 
-#: src/localplayer.cpp:2122
+#: src/localplayer.cpp:2126
 msgid "(f) attack not friends"
 msgstr ""
 
-#: src/localplayer.cpp:2123
+#: src/localplayer.cpp:2127
 msgid "(b) attack bad relations"
 msgstr ""
 
-#: src/localplayer.cpp:2124
+#: src/localplayer.cpp:2128
 msgid "(d) dont attack players"
 msgstr ""
 
-#: src/localplayer.cpp:2125
+#: src/localplayer.cpp:2129
 msgid "(?) pvp attack"
 msgstr ""
 
-#: src/localplayer.cpp:2144
+#: src/localplayer.cpp:2148
 msgid "(D) default imitation"
 msgstr "(D) oletusmatkinta"
 
-#: src/localplayer.cpp:2145
+#: src/localplayer.cpp:2149
 msgid "(O) outfits imitation"
 msgstr "(O) asun matkinta"
 
-#: src/localplayer.cpp:2146
+#: src/localplayer.cpp:2150
 msgid "(?) imitation"
 msgstr "(?) matkinta"
 
-#: src/localplayer.cpp:2174
+#: src/localplayer.cpp:2178
 msgid "Away"
 msgstr "Poissa"
 
-#: src/localplayer.cpp:2193
+#: src/localplayer.cpp:2197
 msgid "(O) on keyboard"
 msgstr "(O) paikalla"
 
-#: src/localplayer.cpp:2194
+#: src/localplayer.cpp:2198
 msgid "(A) away"
 msgstr "(A) poissa"
 
-#: src/localplayer.cpp:2195 src/localplayer.cpp:2210
+#: src/localplayer.cpp:2199 src/localplayer.cpp:2214
 msgid "(?) away"
 msgstr "(?) poissaolo"
 
-#: src/localplayer.cpp:2208
+#: src/localplayer.cpp:2212
 msgid "(G) game camera mode"
 msgstr "(G) pelin kameratila"
 
-#: src/localplayer.cpp:2209
+#: src/localplayer.cpp:2213
 msgid "(F) free camera mode"
 msgstr "(F) vapaa kamera"
 
-#: src/localplayer.cpp:2234
+#: src/localplayer.cpp:2238
 msgid "Game modifiers are enabled"
 msgstr "Pelimuokkaimet käytössä"
 
-#: src/localplayer.cpp:2235
+#: src/localplayer.cpp:2239
 msgid "Game modifiers are disabled"
 msgstr "Pelimuokkaimet poissa käytöstä"
 
-#: src/localplayer.cpp:2236
+#: src/localplayer.cpp:2240
 msgid "Game modifiers are unknown"
 msgstr ""
 
-#: src/localplayer.cpp:3752
+#: src/localplayer.cpp:3756
 msgid "Follow: "
 msgstr "Seuraa: "
 
-#: src/localplayer.cpp:3754 src/localplayer.cpp:3769
+#: src/localplayer.cpp:3758 src/localplayer.cpp:3773
 msgid "Follow canceled"
 msgstr "Seuraaminen keskeytetty"
 
-#: src/localplayer.cpp:3761
+#: src/localplayer.cpp:3765
 msgid "Imitation: "
 msgstr "Matki: "
 
-#: src/localplayer.cpp:3763 src/localplayer.cpp:3771
+#: src/localplayer.cpp:3767 src/localplayer.cpp:3775
 msgid "Imitation canceled"
 msgstr "Matkiminen keskeytetty"
 
-#: src/localplayer.cpp:4119
+#: src/localplayer.cpp:4123
 msgid "You see "
 msgstr "Näet "
 
-#: src/main.cpp:47
+#: src/main.cpp:49
 msgid "manaplus [options] [manaplus-file]"
 msgstr ""
 
-#: src/main.cpp:48
+#: src/main.cpp:50
 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr ""
 
-#: src/main.cpp:50
+#: src/main.cpp:52
 msgid "                  used to set custom parameters"
 msgstr ""
 
-#: src/main.cpp:51
+#: src/main.cpp:53
 msgid "                  to the manaplus client."
 msgstr ""
 
-#: src/main.cpp:53
+#: src/main.cpp:55
 msgid "Options:"
 msgstr "Parametrit:"
 
-#: src/main.cpp:54
+#: src/main.cpp:56
 msgid "  -l --log-file       : Log file to use"
 msgstr "  -l --log-file       : Käytettävä lokitiedosto"
 
-#: src/main.cpp:55
+#: src/main.cpp:57
 msgid "  -L --chat-log-dir   : Chat log dir to use"
 msgstr "  -L --chat-log-dir   : Käytettävä keskustelulokihakemisto"
 
-#: src/main.cpp:56
+#: src/main.cpp:58
 msgid "  -v --version        : Display the version"
 msgstr "  -v --version        : Näytä versionumero"
 
-#: src/main.cpp:57
+#: src/main.cpp:59
 msgid "  -h --help           : Display this help"
 msgstr "  -h --help           : Näytä tämä ohje"
 
-#: src/main.cpp:58
+#: src/main.cpp:60
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr "  -C --config-dir     : Käytä tätä asetushakemistoa"
 
-#: src/main.cpp:59
+#: src/main.cpp:61
 msgid "  -U --username       : Login with this username"
 msgstr "  -U --username       : Käyttäjätunnus sisäänkirjautumiseen"
 
-#: src/main.cpp:60
+#: src/main.cpp:62
 msgid "  -P --password       : Login with this password"
 msgstr "  -P --password       : Salasana sisäänkirjautumiseen"
 
-#: src/main.cpp:61
+#: src/main.cpp:63
 msgid "  -c --character      : Login with this character"
 msgstr "  -c --character      : Hahmo sisäänkirjautumiseen"
 
-#: src/main.cpp:62
+#: src/main.cpp:64
 msgid "  -s --server         : Login server name or IP"
 msgstr ""
 "  -s --server         : Palvelinnimi tai IP-osoite sisäänkirjautumiseen"
 
-#: src/main.cpp:63
+#: src/main.cpp:65
 msgid "  -p --port           : Login server port"
 msgstr "  -p --port           : Palvelinportti sisäänkirjautumiseen "
 
-#: src/main.cpp:64
+#: src/main.cpp:66
 msgid "     --update-host    : Use this update host"
 msgstr "     --update-host    : Käytä tätä päivityspalvelinta"
 
-#: src/main.cpp:65
+#: src/main.cpp:67
 msgid "  -D --default        : Choose default character server and character"
 msgstr "  -D --default        : Aseta oletushahmopalvelin ja -hahmo"
 
-#: src/main.cpp:67
+#: src/main.cpp:69
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr "  -u --skip-update    : Ohita päivityslataukset"
 
-#: src/main.cpp:68
+#: src/main.cpp:70
 msgid "  -d --data           : Directory to load game data from"
 msgstr "  -d --data           : Lataa pelidata tästä hakemistosta"
 
-#: src/main.cpp:70
+#: src/main.cpp:72
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr "  -L --localdata-dir  : Hakemisto paikallisdatan tallennukseen"
 
-#: src/main.cpp:72
+#: src/main.cpp:74
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr "     --screenshot-dir : Kuvankaappausten tallennushakemisto"
 
-#: src/main.cpp:73
+#: src/main.cpp:75
 msgid "     --safemode       : Start game in safe mode"
 msgstr "     --safemode       : Käynnistä peli vikasietotilassa"
 
-#: src/main.cpp:74
+#: src/main.cpp:76
 msgid "  -T --tests          : Start testing drivers and auto configuring"
 msgstr ""
 
-#: src/main.cpp:77
+#: src/main.cpp:79
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr "     --no-opengl      : Poista OpenGL käytöstä tämän session ajaksi"
 
@@ -5638,6 +5634,9 @@ msgstr "MP %+d"
 msgid "Unknown item"
 msgstr "Tuntematon tavara"
 
+#~ msgid "> Next"
+#~ msgstr "> Seuraava"
+
 #~ msgid "Waiting for server"
 #~ msgstr "Odotetaan palvelinta"
 
diff --git a/po/fr.po b/po/fr.po
index 6c149df62..406c18d47 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,14 +7,14 @@
 #   <antoinebcn@hotmail.com>, 2011.
 # Bernard  <nard@bh28.net>, 2011.
 # Jumpy <antoinebcn@hotmail.com>, 2011.
-#   <reidyaro@gmail.com>, 2011.
+#   <reidyaro@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-01-05 23:31+0300\n"
-"PO-Revision-Date: 2012-01-05 20:43+0000\n"
-"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
+"POT-Creation-Date: 2012-01-07 20:36+0300\n"
+"PO-Revision-Date: 2012-01-05 22:09+0000\n"
+"Last-Translator: reid <reidyaro@gmail.com>\n"
 "Language-Team: French (http://www.transifex.net/projects/p/manaplus/team/"
 "fr/)\n"
 "Language: fr\n"
@@ -311,11 +311,11 @@ msgstr "Créé : "
 msgid "Deleted:"
 msgstr "Effacé :"
 
-#: src/commandhandler.cpp:1180 src/commandhandler.cpp:1187
+#: src/commandhandler.cpp:1226 src/commandhandler.cpp:1233
 msgid "Resource images:"
 msgstr "Images des ressources :"
 
-#: src/commandhandler.cpp:1182 src/commandhandler.cpp:1189
+#: src/commandhandler.cpp:1228 src/commandhandler.cpp:1235
 msgid "Resource orphaned images:"
 msgstr "Images des ressources non affectées :"
 
@@ -1255,7 +1255,7 @@ msgstr "Restant"
 
 #: src/gui/npcdialog.cpp:51
 msgid "Stop waiting"
-msgstr ""
+msgstr "Arrêter d'attendre "
 
 #: src/gui/npcdialog.cpp:52
 msgid "Next"
@@ -1274,10 +1274,6 @@ msgstr "PNJ"
 msgid "Clear"
 msgstr "Effacer"
 
-#: src/gui/npcdialog.cpp:223
-msgid "> Next"
-msgstr ">suivant"
-
 #: src/gui/npcpostdialog.cpp:48
 msgid "To:"
 msgstr "A :"
@@ -1507,7 +1503,7 @@ msgstr "Télétransportation"
 
 #: src/gui/popupmenu.cpp:589
 msgid "Clear outfit"
-msgstr ""
+msgstr "Nettoyer les tenues"
 
 #: src/gui/popupmenu.cpp:608 src/gui/windowmenu.cpp:96
 msgid "Spells"
@@ -1551,7 +1547,7 @@ msgstr "Quitter"
 
 #: src/gui/popupmenu.cpp:654
 msgid "Copy to clipboard"
-msgstr ""
+msgstr "Copier vers le presse-papier"
 
 #: src/gui/popupmenu.cpp:849
 msgid "Change guild position"
@@ -2398,7 +2394,7 @@ msgstr "Indonésien"
 
 #: src/gui/setup_theme.cpp:153
 msgid "Polish"
-msgstr ""
+msgstr "Polonais"
 
 #: src/gui/setup_theme.cpp:154
 msgid "Japanese"
@@ -4007,428 +4003,430 @@ msgstr "Vous avez été tué par "
 msgid "Tried to pick up nonexistent item."
 msgstr "Vous avez essayé de prendre un item qui n'existe pas."
 
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1441
 msgid "Item is too heavy."
 msgstr "L'objet est trop lourd."
 
-#: src/localplayer.cpp:1442
+#: src/localplayer.cpp:1444
 msgid "Item is too far away."
 msgstr "L'objet est trop éloigné"
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1447
 msgid "Inventory is full."
 msgstr "L'inventaire est plein"
 
-#: src/localplayer.cpp:1446
+#: src/localplayer.cpp:1450
 msgid "Stack is too big."
 msgstr "La pile est trop grande"
 
-#: src/localplayer.cpp:1449
+#: src/localplayer.cpp:1453
 msgid "Item belongs to someone else."
 msgstr "L'objet appartient a quelqu'un d'autre"
 
-#: src/localplayer.cpp:1452
+#: src/localplayer.cpp:1456
 msgid "Unknown problem picking up item."
 msgstr "Problème inconnu pour ramasser l'objet."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1476
+#: src/localplayer.cpp:1480
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "Vous avez ramassé %d [@@%d|%s@@]."
 msgstr[1] "Vous avez ramassé %d [@@%d|%s@@]."
 
-#: src/localplayer.cpp:1893
+#: src/localplayer.cpp:1897
 msgid "(D) default moves"
 msgstr "(D) Mouvements par défaut"
 
-#: src/localplayer.cpp:1894
+#: src/localplayer.cpp:1898
 msgid "(I) invert moves"
 msgstr "(I) Mouvements inversés"
 
-#: src/localplayer.cpp:1895
+#: src/localplayer.cpp:1899
 msgid "(c) moves with some crazy moves"
 msgstr "(c) mouvements un peu fous"
 
-#: src/localplayer.cpp:1896
+#: src/localplayer.cpp:1900
 msgid "(C) moves with crazy moves"
 msgstr "(C) mouvements complètements fous"
 
-#: src/localplayer.cpp:1897
+#: src/localplayer.cpp:1901
 msgid "(d) double normal + crazy"
 msgstr "(d) double normal et fou"
 
-#: src/localplayer.cpp:1898
+#: src/localplayer.cpp:1902
 msgid "(?) unknown move"
 msgstr "(?) déplacement inconnue"
 
-#: src/localplayer.cpp:1920
+#: src/localplayer.cpp:1924
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr "(%d) mouvement de fou numerique %d"
 
-#: src/localplayer.cpp:1925
+#: src/localplayer.cpp:1929
 msgid "(a) custom crazy move"
 msgstr "(a) mouvements fous personnalisés"
 
-#: src/localplayer.cpp:1929
+#: src/localplayer.cpp:1933
 msgid "(?) crazy move"
 msgstr "(?) mouvements fous"
 
-#: src/localplayer.cpp:1943
+#: src/localplayer.cpp:1947
 msgid "(0) default moves to target"
 msgstr "(0) Aller à la cible distante par défaut"
 
-#: src/localplayer.cpp:1944
+#: src/localplayer.cpp:1948
 msgid "(1) moves to target in distance 1"
 msgstr "(1) Aller à la cible en distante de 1"
 
-#: src/localplayer.cpp:1945
+#: src/localplayer.cpp:1949
 msgid "(2) moves to target in distance 2"
 msgstr "(2) Aller vers la cible jusqu'à 2 de distance"
 
-#: src/localplayer.cpp:1946
+#: src/localplayer.cpp:1950
 msgid "(3) moves to target in distance 3"
 msgstr "(3)  Aller à la cible en distante de 3"
 
-#: src/localplayer.cpp:1947
+#: src/localplayer.cpp:1951
 msgid "(5) moves to target in distance 5"
 msgstr "(5)  Aller à la cible en distante de 5"
 
-#: src/localplayer.cpp:1948
+#: src/localplayer.cpp:1952
 msgid "(7) moves to target in distance 7"
 msgstr "(7) Aller à la cible en distante de 7"
 
-#: src/localplayer.cpp:1949
+#: src/localplayer.cpp:1953
 msgid "(A) moves to target in attack range"
 msgstr "(A) Aller à la cible dans le champ d'attaque"
 
-#: src/localplayer.cpp:1950
+#: src/localplayer.cpp:1954
 msgid "(a) archer attack range"
 msgstr "(a) Portée des attaques des Archéens"
 
-#: src/localplayer.cpp:1951
+#: src/localplayer.cpp:1955
 msgid "(?) move to target"
 msgstr "(?) Aller à la cible"
 
-#: src/localplayer.cpp:1970
+#: src/localplayer.cpp:1974
 msgid "(D) default follow"
 msgstr "(D) Suivre : défaut"
 
-#: src/localplayer.cpp:1971
+#: src/localplayer.cpp:1975
 msgid "(R) relative follow"
 msgstr "(R) Suivre: mouvement relatif"
 
-#: src/localplayer.cpp:1972
+#: src/localplayer.cpp:1976
 msgid "(M) mirror follow"
 msgstr "(M) Suivre effet miroir"
 
-#: src/localplayer.cpp:1973
+#: src/localplayer.cpp:1977
 msgid "(P) pet follow"
 msgstr "(P) Suivre comme un toutou"
 
-#: src/localplayer.cpp:1974
+#: src/localplayer.cpp:1978
 msgid "(?) unknown follow"
 msgstr "(?) Suivre : mode inconnu"
 
-#: src/localplayer.cpp:1993 src/localplayer.cpp:1997 src/localplayer.cpp:2020
+#: src/localplayer.cpp:1997 src/localplayer.cpp:2001 src/localplayer.cpp:2024
 msgid "(?) attack"
 msgstr "(?) Attaque"
 
-#: src/localplayer.cpp:1994 src/localplayer.cpp:2016
+#: src/localplayer.cpp:1998 src/localplayer.cpp:2020
 msgid "(D) default attack"
 msgstr "(D) Attaque : défaut"
 
-#: src/localplayer.cpp:1995
+#: src/localplayer.cpp:1999
 msgid "(s) switch attack without shield"
 msgstr "(s) Attaquer sans protection"
 
-#: src/localplayer.cpp:1996
+#: src/localplayer.cpp:2000
 msgid "(S) switch attack with shield"
 msgstr "(S) Attaquer avec protection"
 
-#: src/localplayer.cpp:2017
+#: src/localplayer.cpp:2021
 msgid "(G) go and attack"
 msgstr "(G) Se déplacer et attaquer"
 
-#: src/localplayer.cpp:2018
+#: src/localplayer.cpp:2022
 msgid "(A) go, attack, pickup"
 msgstr "(A) Se déplacer, attaquer et ramasser"
 
-#: src/localplayer.cpp:2019
+#: src/localplayer.cpp:2023
 msgid "(d) without auto attack"
 msgstr "(d) Sans attaque automatique"
 
-#: src/localplayer.cpp:2053
+#: src/localplayer.cpp:2057
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) Ramassage sur 1x1 case"
 
-#: src/localplayer.cpp:2054
+#: src/localplayer.cpp:2058
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) Ramassage par défaut sur 2x1 cases"
 
-#: src/localplayer.cpp:2055
+#: src/localplayer.cpp:2059
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) Ramassage avant sur  2x3 cases"
 
-#: src/localplayer.cpp:2056
+#: src/localplayer.cpp:2060
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) Ramassage sur 3x3 cases"
 
-#: src/localplayer.cpp:2057
+#: src/localplayer.cpp:2061
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) Aller et ramasser jusqu'à 4 de distance"
 
-#: src/localplayer.cpp:2058
+#: src/localplayer.cpp:2062
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) Aller et ramasser jusqu'à 8 de distance"
 
-#: src/localplayer.cpp:2059
+#: src/localplayer.cpp:2063
 msgid "(A) go and pick up in max distance"
 msgstr "(A) Aller et ramasser jusqu'à la distance max"
 
-#: src/localplayer.cpp:2060
+#: src/localplayer.cpp:2064
 msgid "(?) pick up"
 msgstr "(?) Ramassage"
 
-#: src/localplayer.cpp:2073
+#: src/localplayer.cpp:2077
 msgid "(N) normal map view"
 msgstr "(N) Vue normale du jeu"
 
-#: src/localplayer.cpp:2074
+#: src/localplayer.cpp:2078
 msgid "(D) debug map view"
 msgstr "(D) Vue du jeu mode déverminage"
 
-#: src/localplayer.cpp:2075
+#: src/localplayer.cpp:2079
 msgid "(u) ultra map view"
 msgstr "(u) Vue du jeu mode Ultra 1"
 
-#: src/localplayer.cpp:2076
+#: src/localplayer.cpp:2080
 msgid "(U) ultra map view 2"
 msgstr "(u) Vue du jeu mode Ultra 2"
 
-#: src/localplayer.cpp:2077
+#: src/localplayer.cpp:2081
 msgid "(e) empty map view"
 msgstr "(e) Vue de la carte vide"
 
-#: src/localplayer.cpp:2078
+#: src/localplayer.cpp:2082
 msgid "(b) black & white map view"
 msgstr "(b) Vue de la carte en N&B"
 
-#: src/localplayer.cpp:2097
+#: src/localplayer.cpp:2101
 msgid "(f) use #flar for magic attack"
 msgstr "(f) Utiliser #flar comme sort d'attaque"
 
-#: src/localplayer.cpp:2098
+#: src/localplayer.cpp:2102
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) Utiliser #chiza comme sort d'attaque"
 
-#: src/localplayer.cpp:2099
+#: src/localplayer.cpp:2103
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) Utiliser #ingrav comme sort d'attaque"
 
-#: src/localplayer.cpp:2100
+#: src/localplayer.cpp:2104
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) Utiliser #frillyar comme sort d'attaque"
 
-#: src/localplayer.cpp:2101
+#: src/localplayer.cpp:2105
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) Utiliser #upmarmu comme sort d'attaque"
 
-#: src/localplayer.cpp:2102
+#: src/localplayer.cpp:2106
 msgid "(?) magic attack"
 msgstr "(?) Sorts d'attaque"
 
-#: src/localplayer.cpp:2121
+#: src/localplayer.cpp:2125
 msgid "(a) attack all players"
 msgstr "(a) attaque tous les joueurs"
 
-#: src/localplayer.cpp:2122
+#: src/localplayer.cpp:2126
 msgid "(f) attack not friends"
 msgstr "(f) n'attaque pas des amis"
 
-#: src/localplayer.cpp:2123
+#: src/localplayer.cpp:2127
 msgid "(b) attack bad relations"
 msgstr "(b) attaque les mauvaises relations"
 
-#: src/localplayer.cpp:2124
+#: src/localplayer.cpp:2128
 msgid "(d) dont attack players"
 msgstr "(d) Ne pas attaquer les joueurs"
 
-#: src/localplayer.cpp:2125
+#: src/localplayer.cpp:2129
 msgid "(?) pvp attack"
 msgstr "(?) attaque en PVP"
 
-#: src/localplayer.cpp:2144
+#: src/localplayer.cpp:2148
 msgid "(D) default imitation"
 msgstr "(D) Imitation par défaut"
 
-#: src/localplayer.cpp:2145
+#: src/localplayer.cpp:2149
 msgid "(O) outfits imitation"
 msgstr "(O) Imiter les équipements"
 
-#: src/localplayer.cpp:2146
+#: src/localplayer.cpp:2150
 msgid "(?) imitation"
 msgstr "(?) Imitation"
 
-#: src/localplayer.cpp:2174
+#: src/localplayer.cpp:2178
 msgid "Away"
 msgstr "Inactif"
 
-#: src/localplayer.cpp:2193
+#: src/localplayer.cpp:2197
 msgid "(O) on keyboard"
 msgstr "(O) Présent sur le jeu"
 
-#: src/localplayer.cpp:2194
+#: src/localplayer.cpp:2198
 msgid "(A) away"
 msgstr "(A) Absent"
 
-#: src/localplayer.cpp:2195 src/localplayer.cpp:2210
+#: src/localplayer.cpp:2199 src/localplayer.cpp:2214
 msgid "(?) away"
 msgstr "(?) Absent"
 
-#: src/localplayer.cpp:2208
+#: src/localplayer.cpp:2212
 msgid "(G) game camera mode"
 msgstr "(G) Mode camera du jeu"
 
-#: src/localplayer.cpp:2209
+#: src/localplayer.cpp:2213
 msgid "(F) free camera mode"
 msgstr "(F) Mode camera libre"
 
-#: src/localplayer.cpp:2234
+#: src/localplayer.cpp:2238
 msgid "Game modifiers are enabled"
 msgstr "Modificateurs de mode de jeu activés"
 
-#: src/localplayer.cpp:2235
+#: src/localplayer.cpp:2239
 msgid "Game modifiers are disabled"
 msgstr "Modificateurs de mode de jeu désactivés"
 
-#: src/localplayer.cpp:2236
+#: src/localplayer.cpp:2240
 msgid "Game modifiers are unknown"
 msgstr "Les modificateurs de jeux sont inconnus"
 
-#: src/localplayer.cpp:3752
+#: src/localplayer.cpp:3756
 msgid "Follow: "
 msgstr "Suivre : "
 
-#: src/localplayer.cpp:3754 src/localplayer.cpp:3769
+#: src/localplayer.cpp:3758 src/localplayer.cpp:3773
 msgid "Follow canceled"
 msgstr "Suivi annulé"
 
-#: src/localplayer.cpp:3761
+#: src/localplayer.cpp:3765
 msgid "Imitation: "
 msgstr "Imitation: "
 
-#: src/localplayer.cpp:3763 src/localplayer.cpp:3771
+#: src/localplayer.cpp:3767 src/localplayer.cpp:3775
 msgid "Imitation canceled"
 msgstr "Imitation annulée"
 
-#: src/localplayer.cpp:4119
+#: src/localplayer.cpp:4123
 msgid "You see "
 msgstr "Vous voyez  "
 
-#: src/main.cpp:47
+#: src/main.cpp:49
 msgid "manaplus [options] [manaplus-file]"
 msgstr "manaplus [options] [manaplus-file]"
 
-#: src/main.cpp:48
+#: src/main.cpp:50
 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr "[Manaplus-file]: Le fichier manaplus est un fichier XML (.manaplus)"
 
-#: src/main.cpp:50
+#: src/main.cpp:52
 msgid "                  used to set custom parameters"
 msgstr "utilisé pour définir des paramètres personnalisés"
 
-#: src/main.cpp:51
+#: src/main.cpp:53
 msgid "                  to the manaplus client."
 msgstr "pour le client manaplus."
 
-#: src/main.cpp:53
+#: src/main.cpp:55
 msgid "Options:"
 msgstr "Options :"
 
-#: src/main.cpp:54
+#: src/main.cpp:56
 msgid "  -l --log-file       : Log file to use"
 msgstr "  -l --log-file       : fichier journal à utiliser"
 
-#: src/main.cpp:55
+#: src/main.cpp:57
 msgid "  -L --chat-log-dir   : Chat log dir to use"
 msgstr ""
 "  -L --chat-log-dir   : Dossier a utiliser pour l'enregistrement des "
 "conversatoins"
 
-#: src/main.cpp:56
+#: src/main.cpp:58
 msgid "  -v --version        : Display the version"
 msgstr "  -v --version : Affiche la version"
 
-#: src/main.cpp:57
+#: src/main.cpp:59
 msgid "  -h --help           : Display this help"
 msgstr "  -h --help : Montre cette rubrique d'aide"
 
-#: src/main.cpp:58
+#: src/main.cpp:60
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr "  -C --config-dir : Répertoire de configuration à utiliser"
 
-#: src/main.cpp:59
+#: src/main.cpp:61
 msgid "  -U --username       : Login with this username"
 msgstr "  -U --username : Se connecter avec ce nom d'utilisateur"
 
-#: src/main.cpp:60
+#: src/main.cpp:62
 msgid "  -P --password       : Login with this password"
 msgstr "  -P --password : Se connecter avec ce mot de passe"
 
-#: src/main.cpp:61
+#: src/main.cpp:63
 msgid "  -c --character      : Login with this character"
 msgstr "  -c --character : Se connecter avec ce personnage"
 
-#: src/main.cpp:62
+#: src/main.cpp:64
 msgid "  -s --server         : Login server name or IP"
 msgstr "  -s --server : Nom du serveur (ou IP) pour la connexion"
 
-#: src/main.cpp:63
+#: src/main.cpp:65
 msgid "  -p --port           : Login server port"
 msgstr "  -p --port : Port de connexion au serveur"
 
-#: src/main.cpp:64
+#: src/main.cpp:66
 msgid "     --update-host    : Use this update host"
 msgstr ""
 "     --update-host : Utilise cette URL pour les fichiers de mises à jour"
 
-#: src/main.cpp:65
+#: src/main.cpp:67
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 "  -D --default : Choisir le serveur de personnages et le personnage par "
 "défaut"
 
-#: src/main.cpp:67
+#: src/main.cpp:69
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 "  -u --skip-update : Ne pas effectuer le téléchargement des mises à jour"
 
-#: src/main.cpp:68
+#: src/main.cpp:70
 msgid "  -d --data           : Directory to load game data from"
 msgstr "  -d --data : Répertoire des données du jeu à charger"
 
-#: src/main.cpp:70
+#: src/main.cpp:72
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 "  -L --localdata-dir : Répertoire à utiliser comme répertoire principal"
 
-#: src/main.cpp:72
+#: src/main.cpp:74
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr "      --screenshot-dir : Répertoire à utiliser pour les imprime-écrans"
 
-#: src/main.cpp:73
+#: src/main.cpp:75
 msgid "     --safemode       : Start game in safe mode"
 msgstr "     --safemode       : Démarrer le jeu en mode sûr"
 
-#: src/main.cpp:74
+#: src/main.cpp:76
 msgid "  -T --tests          : Start testing drivers and auto configuring"
 msgstr ""
+"  -T --tests          : Commencer le test des drivers et la configuration "
+"automatique"
 
-#: src/main.cpp:77
+#: src/main.cpp:79
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr "     --no-opengl : Désactive l'OpenGL pour cette session"
 
@@ -5689,3 +5687,6 @@ msgstr "PM %+d"
 #: src/resources/itemdb.cpp:169
 msgid "Unknown item"
 msgstr "Objet inconnu"
+
+#~ msgid "> Next"
+#~ msgstr ">suivant"
diff --git a/po/id.po b/po/id.po
index e27acaa2c..1cc1a28c4 100644
--- a/po/id.po
+++ b/po/id.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-01-05 23:31+0300\n"
+"POT-Creation-Date: 2012-01-07 20:36+0300\n"
 "PO-Revision-Date: 2011-11-11 21:38+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Indonesian (http://www.transifex.net/projects/p/manaplus/team/"
@@ -302,11 +302,11 @@ msgstr "Buat"
 msgid "Deleted:"
 msgstr "Hapus"
 
-#: src/commandhandler.cpp:1180 src/commandhandler.cpp:1187
+#: src/commandhandler.cpp:1226 src/commandhandler.cpp:1233
 msgid "Resource images:"
 msgstr "Sumber gambar"
 
-#: src/commandhandler.cpp:1182 src/commandhandler.cpp:1189
+#: src/commandhandler.cpp:1228 src/commandhandler.cpp:1235
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -1262,10 +1262,6 @@ msgstr "NPC"
 msgid "Clear"
 msgstr "Hapus"
 
-#: src/gui/npcdialog.cpp:223
-msgid "> Next"
-msgstr ""
-
 #: src/gui/npcpostdialog.cpp:48
 msgid "To:"
 msgstr "Kepada:"
@@ -3970,422 +3966,422 @@ msgstr ""
 msgid "Tried to pick up nonexistent item."
 msgstr "Mencoba mengambil item yang tidak lagi ada"
 
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1441
 msgid "Item is too heavy."
 msgstr "item terlalu berat"
 
-#: src/localplayer.cpp:1442
+#: src/localplayer.cpp:1444
 msgid "Item is too far away."
 msgstr "barang terlalu jauh"
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1447
 msgid "Inventory is full."
 msgstr "Perbekalan sudah penuh"
 
-#: src/localplayer.cpp:1446
+#: src/localplayer.cpp:1450
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1449
+#: src/localplayer.cpp:1453
 msgid "Item belongs to someone else."
 msgstr "Barang milik orang lain."
 
-#: src/localplayer.cpp:1452
+#: src/localplayer.cpp:1456
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1476
+#: src/localplayer.cpp:1480
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 
-#: src/localplayer.cpp:1893
+#: src/localplayer.cpp:1897
 msgid "(D) default moves"
 msgstr "(D) jalan normal"
 
-#: src/localplayer.cpp:1894
+#: src/localplayer.cpp:1898
 msgid "(I) invert moves"
 msgstr ""
 
-#: src/localplayer.cpp:1895
+#: src/localplayer.cpp:1899
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1896
+#: src/localplayer.cpp:1900
 msgid "(C) moves with crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1897
+#: src/localplayer.cpp:1901
 msgid "(d) double normal + crazy"
 msgstr "(d) normal ganda + mode gila"
 
-#: src/localplayer.cpp:1898
+#: src/localplayer.cpp:1902
 #, fuzzy
 msgid "(?) unknown move"
 msgstr "(?) jalan"
 
-#: src/localplayer.cpp:1920
+#: src/localplayer.cpp:1924
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr ""
 
-#: src/localplayer.cpp:1925
+#: src/localplayer.cpp:1929
 msgid "(a) custom crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1929
+#: src/localplayer.cpp:1933
 msgid "(?) crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1943
+#: src/localplayer.cpp:1947
 msgid "(0) default moves to target"
 msgstr ""
 
-#: src/localplayer.cpp:1944
+#: src/localplayer.cpp:1948
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
-#: src/localplayer.cpp:1945
+#: src/localplayer.cpp:1949
 msgid "(2) moves to target in distance 2"
 msgstr "(2) jalan ke target di jarak 2"
 
-#: src/localplayer.cpp:1946
+#: src/localplayer.cpp:1950
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
-#: src/localplayer.cpp:1947
+#: src/localplayer.cpp:1951
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
-#: src/localplayer.cpp:1948
+#: src/localplayer.cpp:1952
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
-#: src/localplayer.cpp:1949
+#: src/localplayer.cpp:1953
 msgid "(A) moves to target in attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1950
+#: src/localplayer.cpp:1954
 msgid "(a) archer attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1951
+#: src/localplayer.cpp:1955
 msgid "(?) move to target"
 msgstr "(?)bergerak ke target"
 
-#: src/localplayer.cpp:1970
+#: src/localplayer.cpp:1974
 msgid "(D) default follow"
 msgstr ""
 
-#: src/localplayer.cpp:1971
+#: src/localplayer.cpp:1975
 msgid "(R) relative follow"
 msgstr ""
 
-#: src/localplayer.cpp:1972
+#: src/localplayer.cpp:1976
 msgid "(M) mirror follow"
 msgstr ""
 
-#: src/localplayer.cpp:1973
+#: src/localplayer.cpp:1977
 msgid "(P) pet follow"
 msgstr ""
 
-#: src/localplayer.cpp:1974
+#: src/localplayer.cpp:1978
 msgid "(?) unknown follow"
 msgstr ""
 
-#: src/localplayer.cpp:1993 src/localplayer.cpp:1997 src/localplayer.cpp:2020
+#: src/localplayer.cpp:1997 src/localplayer.cpp:2001 src/localplayer.cpp:2024
 msgid "(?) attack"
 msgstr "(?)serangan"
 
-#: src/localplayer.cpp:1994 src/localplayer.cpp:2016
+#: src/localplayer.cpp:1998 src/localplayer.cpp:2020
 msgid "(D) default attack"
 msgstr "(D) pukulan normal"
 
-#: src/localplayer.cpp:1995
+#: src/localplayer.cpp:1999
 msgid "(s) switch attack without shield"
 msgstr "(s) ganti pukulan tanpa pelindung"
 
-#: src/localplayer.cpp:1996
+#: src/localplayer.cpp:2000
 msgid "(S) switch attack with shield"
 msgstr "(S) pukulan dengan pelindung"
 
-#: src/localplayer.cpp:2017
+#: src/localplayer.cpp:2021
 msgid "(G) go and attack"
 msgstr "(G) jalan dan serang"
 
-#: src/localplayer.cpp:2018
+#: src/localplayer.cpp:2022
 msgid "(A) go, attack, pickup"
 msgstr "(A) jalan, serang, ambil"
 
-#: src/localplayer.cpp:2019
+#: src/localplayer.cpp:2023
 msgid "(d) without auto attack"
 msgstr "(d) tanpa penyerangan otomatis"
 
-#: src/localplayer.cpp:2053
+#: src/localplayer.cpp:2057
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2054
+#: src/localplayer.cpp:2058
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2055
+#: src/localplayer.cpp:2059
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2056
+#: src/localplayer.cpp:2060
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2057
+#: src/localplayer.cpp:2061
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
-#: src/localplayer.cpp:2058
+#: src/localplayer.cpp:2062
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
-#: src/localplayer.cpp:2059
+#: src/localplayer.cpp:2063
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
-#: src/localplayer.cpp:2060
+#: src/localplayer.cpp:2064
 msgid "(?) pick up"
 msgstr "(?)mengambil"
 
-#: src/localplayer.cpp:2073
+#: src/localplayer.cpp:2077
 msgid "(N) normal map view"
 msgstr "(N) penampilan peta normal"
 
-#: src/localplayer.cpp:2074
+#: src/localplayer.cpp:2078
 msgid "(D) debug map view"
 msgstr ""
 
-#: src/localplayer.cpp:2075
+#: src/localplayer.cpp:2079
 msgid "(u) ultra map view"
 msgstr ""
 
-#: src/localplayer.cpp:2076
+#: src/localplayer.cpp:2080
 msgid "(U) ultra map view 2"
 msgstr ""
 
-#: src/localplayer.cpp:2077
+#: src/localplayer.cpp:2081
 msgid "(e) empty map view"
 msgstr "(e) penampilan peta kosong"
 
-#: src/localplayer.cpp:2078
+#: src/localplayer.cpp:2082
 msgid "(b) black & white map view"
 msgstr "(b)penampilan peta hitam & putih"
 
-#: src/localplayer.cpp:2097
+#: src/localplayer.cpp:2101
 msgid "(f) use #flar for magic attack"
 msgstr "(f) gunakan #flar untuk serangan magic"
 
-#: src/localplayer.cpp:2098
+#: src/localplayer.cpp:2102
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) gunakan #chiza untuk serangan magic"
 
-#: src/localplayer.cpp:2099
+#: src/localplayer.cpp:2103
 msgid "(I) use #ingrav for magic attack"
 msgstr "(l) gunakan #ingrav untuk serangan magic"
 
-#: src/localplayer.cpp:2100
+#: src/localplayer.cpp:2104
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) gunakan #frillyar untuk serangan magic"
 
-#: src/localplayer.cpp:2101
+#: src/localplayer.cpp:2105
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) gunakan #upmarmu untuk serangan magic"
 
-#: src/localplayer.cpp:2102
+#: src/localplayer.cpp:2106
 msgid "(?) magic attack"
 msgstr "(?) serangan magic"
 
-#: src/localplayer.cpp:2121
+#: src/localplayer.cpp:2125
 msgid "(a) attack all players"
 msgstr ""
 
-#: src/localplayer.cpp:2122
+#: src/localplayer.cpp:2126
 msgid "(f) attack not friends"
 msgstr ""
 
-#: src/localplayer.cpp:2123
+#: src/localplayer.cpp:2127
 msgid "(b) attack bad relations"
 msgstr ""
 
-#: src/localplayer.cpp:2124
+#: src/localplayer.cpp:2128
 msgid "(d) dont attack players"
 msgstr ""
 
-#: src/localplayer.cpp:2125
+#: src/localplayer.cpp:2129
 msgid "(?) pvp attack"
 msgstr ""
 
-#: src/localplayer.cpp:2144
+#: src/localplayer.cpp:2148
 msgid "(D) default imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2145
+#: src/localplayer.cpp:2149
 msgid "(O) outfits imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2146
+#: src/localplayer.cpp:2150
 msgid "(?) imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2174
+#: src/localplayer.cpp:2178
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:2193
+#: src/localplayer.cpp:2197
 msgid "(O) on keyboard"
 msgstr "(O) pada keyboard"
 
-#: src/localplayer.cpp:2194
+#: src/localplayer.cpp:2198
 msgid "(A) away"
 msgstr "(A) pergi"
 
-#: src/localplayer.cpp:2195 src/localplayer.cpp:2210
+#: src/localplayer.cpp:2199 src/localplayer.cpp:2214
 msgid "(?) away"
 msgstr "(?) pergi"
 
-#: src/localplayer.cpp:2208
+#: src/localplayer.cpp:2212
 msgid "(G) game camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2209
+#: src/localplayer.cpp:2213
 msgid "(F) free camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2234
+#: src/localplayer.cpp:2238
 msgid "Game modifiers are enabled"
 msgstr "Perombakan game diperbolehkan"
 
-#: src/localplayer.cpp:2235
+#: src/localplayer.cpp:2239
 msgid "Game modifiers are disabled"
 msgstr "Perombakan game tidak diperbolehkan"
 
-#: src/localplayer.cpp:2236
+#: src/localplayer.cpp:2240
 #, fuzzy
 msgid "Game modifiers are unknown"
 msgstr "Perombakan game diperbolehkan"
 
-#: src/localplayer.cpp:3752
+#: src/localplayer.cpp:3756
 msgid "Follow: "
 msgstr "Ikuti:"
 
-#: src/localplayer.cpp:3754 src/localplayer.cpp:3769
+#: src/localplayer.cpp:3758 src/localplayer.cpp:3773
 msgid "Follow canceled"
 msgstr "Batal mengikuti"
 
-#: src/localplayer.cpp:3761
+#: src/localplayer.cpp:3765
 msgid "Imitation: "
 msgstr "Tirukan:"
 
-#: src/localplayer.cpp:3763 src/localplayer.cpp:3771
+#: src/localplayer.cpp:3767 src/localplayer.cpp:3775
 msgid "Imitation canceled"
 msgstr "Batal menirukan"
 
-#: src/localplayer.cpp:4119
+#: src/localplayer.cpp:4123
 msgid "You see "
 msgstr ""
 
-#: src/main.cpp:47
+#: src/main.cpp:49
 msgid "manaplus [options] [manaplus-file]"
 msgstr ""
 
-#: src/main.cpp:48
+#: src/main.cpp:50
 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr ""
 
-#: src/main.cpp:50
+#: src/main.cpp:52
 msgid "                  used to set custom parameters"
 msgstr ""
 
-#: src/main.cpp:51
+#: src/main.cpp:53
 msgid "                  to the manaplus client."
 msgstr ""
 
-#: src/main.cpp:53
+#: src/main.cpp:55
 msgid "Options:"
 msgstr ""
 
-#: src/main.cpp:54
+#: src/main.cpp:56
 msgid "  -l --log-file       : Log file to use"
 msgstr ""
 
-#: src/main.cpp:55
+#: src/main.cpp:57
 msgid "  -L --chat-log-dir   : Chat log dir to use"
 msgstr ""
 
-#: src/main.cpp:56
+#: src/main.cpp:58
 msgid "  -v --version        : Display the version"
 msgstr ""
 
-#: src/main.cpp:57
+#: src/main.cpp:59
 msgid "  -h --help           : Display this help"
 msgstr ""
 
-#: src/main.cpp:58
+#: src/main.cpp:60
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:59
+#: src/main.cpp:61
 msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:60
+#: src/main.cpp:62
 msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:61
+#: src/main.cpp:63
 msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:62
+#: src/main.cpp:64
 msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:63
+#: src/main.cpp:65
 msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:64
+#: src/main.cpp:66
 msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:65
+#: src/main.cpp:67
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:67
+#: src/main.cpp:69
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:68
+#: src/main.cpp:70
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:70
+#: src/main.cpp:72
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:72
+#: src/main.cpp:74
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:73
+#: src/main.cpp:75
 msgid "     --safemode       : Start game in safe mode"
 msgstr ""
 
-#: src/main.cpp:74
+#: src/main.cpp:76
 msgid "  -T --tests          : Start testing drivers and auto configuring"
 msgstr ""
 
-#: src/main.cpp:77
+#: src/main.cpp:79
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
diff --git a/po/ja.po b/po/ja.po
index 5fef0b3ef..9b2074295 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-01-05 23:31+0300\n"
-"PO-Revision-Date: 2012-01-04 22:59+0000\n"
+"POT-Creation-Date: 2012-01-07 20:36+0300\n"
+"PO-Revision-Date: 2012-01-06 20:11+0000\n"
 "Last-Translator: Candy <HarajukuCupcakes@gmail.com>\n"
 "Language-Team: Japanese (http://www.transifex.net/projects/p/manaplus/team/"
 "ja/)\n"
@@ -262,31 +262,31 @@ msgstr "クライアントの稼働時間: %s"
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
-msgstr[0] ""
+msgstr[0] "%d週"
 
 #: src/commandhandler.cpp:950
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
-msgstr[0] ""
+msgstr[0] "%d日"
 
 #: src/commandhandler.cpp:958
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
-msgstr[0] ""
+msgstr[0] "%d時"
 
 #: src/commandhandler.cpp:966
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
-msgstr[0] ""
+msgstr[0] "%d分"
 
 #: src/commandhandler.cpp:974
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
-msgstr[0] ""
+msgstr[0] "%d秒"
 
 #: src/commandhandler.cpp:1053
 msgid "font cache size"
@@ -304,11 +304,11 @@ msgstr ""
 msgid "Deleted:"
 msgstr ""
 
-#: src/commandhandler.cpp:1180 src/commandhandler.cpp:1187
+#: src/commandhandler.cpp:1226 src/commandhandler.cpp:1233
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1182 src/commandhandler.cpp:1189
+#: src/commandhandler.cpp:1228 src/commandhandler.cpp:1235
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -1225,7 +1225,7 @@ msgstr "重量"
 
 #: src/gui/ministatuswindow.cpp:95
 msgid "inventory slots bar"
-msgstr ""
+msgstr "インベントリースロットバー"
 
 #: src/gui/ministatuswindow.cpp:98
 msgid "money bar"
@@ -1264,10 +1264,6 @@ msgstr "NPC"
 msgid "Clear"
 msgstr "クリア"
 
-#: src/gui/npcdialog.cpp:223
-msgid "> Next"
-msgstr "> 次へ"
-
 #: src/gui/npcpostdialog.cpp:48
 msgid "To:"
 msgstr "宛先:"
@@ -1496,9 +1492,8 @@ msgid "Warp"
 msgstr "ワープ"
 
 #: src/gui/popupmenu.cpp:589
-#, fuzzy
 msgid "Clear outfit"
-msgstr "服を着る"
+msgstr ""
 
 #: src/gui/popupmenu.cpp:608 src/gui/windowmenu.cpp:96
 msgid "Spells"
@@ -1526,15 +1521,15 @@ msgstr "名前を消さない"
 
 #: src/gui/popupmenu.cpp:642
 msgid "Remove name"
-msgstr ""
+msgstr "名前を削除する"
 
 #: src/gui/popupmenu.cpp:644
 msgid "Enable away"
-msgstr ""
+msgstr "AFKを有効にする"
 
 #: src/gui/popupmenu.cpp:646
 msgid "Disable away"
-msgstr ""
+msgstr "AFKを無効にする"
 
 #: src/gui/popupmenu.cpp:651 src/gui/socialwindow.cpp:1141
 msgid "Leave"
@@ -1574,15 +1569,15 @@ msgstr "トレードに追加"
 
 #: src/gui/popupmenu.cpp:1780
 msgid "Add to trade 10"
-msgstr ""
+msgstr "トレードに10追加する"
 
 #: src/gui/popupmenu.cpp:1781
 msgid "Add to trade half"
-msgstr ""
+msgstr "トレードに半分追加する"
 
 #: src/gui/popupmenu.cpp:1782
 msgid "Add to trade all"
-msgstr ""
+msgstr "トレードに全て追加する"
 
 #: src/gui/popupmenu.cpp:1792
 msgid "Store 10"
@@ -2055,7 +2050,7 @@ msgstr "攻撃可能範囲を強調表示"
 
 #: src/gui/setup_other.cpp:78
 msgid "Show extended minimaps"
-msgstr ""
+msgstr "拡張ミニマップを表示する"
 
 #: src/gui/setup_other.cpp:81
 msgid "Draw path"
@@ -3941,7 +3936,7 @@ msgstr "真似モード変更"
 
 #: src/keyboardconfig.cpp:341
 msgid "Disable / Enable Game modifier keys"
-msgstr ""
+msgstr "ゲームモディファイアキーを無効 / 有効にする"
 
 #: src/keyboardconfig.cpp:342
 msgid "On / Off audio"
@@ -3978,424 +3973,424 @@ msgstr " によって殺されました"
 
 #: src/localplayer.cpp:1438
 msgid "Tried to pick up nonexistent item."
-msgstr ""
+msgstr "存在しないアイテムは拾えません"
 
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1441
 msgid "Item is too heavy."
-msgstr ""
+msgstr "アイテムが重過ぎます"
 
-#: src/localplayer.cpp:1442
+#: src/localplayer.cpp:1444
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1447
 msgid "Inventory is full."
-msgstr ""
+msgstr "インベントリーが満杯です"
 
-#: src/localplayer.cpp:1446
+#: src/localplayer.cpp:1450
 msgid "Stack is too big."
-msgstr ""
+msgstr "量が多すぎます"
 
-#: src/localplayer.cpp:1449
+#: src/localplayer.cpp:1453
 msgid "Item belongs to someone else."
-msgstr ""
+msgstr "これは他のプレイヤーのアイテムです"
 
-#: src/localplayer.cpp:1452
+#: src/localplayer.cpp:1456
 msgid "Unknown problem picking up item."
-msgstr ""
+msgstr "不明なエラーの為拾えません"
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1476
+#: src/localplayer.cpp:1480
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "%d [@@%d|%s@@]を拾いました"
 
-#: src/localplayer.cpp:1893
+#: src/localplayer.cpp:1897
 msgid "(D) default moves"
-msgstr ""
+msgstr "(D) デフォルトムーブ"
 
-#: src/localplayer.cpp:1894
+#: src/localplayer.cpp:1898
 msgid "(I) invert moves"
-msgstr ""
+msgstr "(I) 逆ムーブ"
 
-#: src/localplayer.cpp:1895
+#: src/localplayer.cpp:1899
 msgid "(c) moves with some crazy moves"
-msgstr ""
+msgstr "(c) クレイジームーブを含んだムーブ"
 
-#: src/localplayer.cpp:1896
+#: src/localplayer.cpp:1900
 msgid "(C) moves with crazy moves"
-msgstr ""
+msgstr "(C) クレイジームーブ"
 
-#: src/localplayer.cpp:1897
+#: src/localplayer.cpp:1901
 msgid "(d) double normal + crazy"
 msgstr ""
 
-#: src/localplayer.cpp:1898
+#: src/localplayer.cpp:1902
 msgid "(?) unknown move"
 msgstr "(?) 不明なムーブ"
 
-#: src/localplayer.cpp:1920
+#: src/localplayer.cpp:1924
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr "(%d) クレイジームーブ %d"
 
-#: src/localplayer.cpp:1925
+#: src/localplayer.cpp:1929
 msgid "(a) custom crazy move"
-msgstr ""
+msgstr "(a) カスタムクレイジームーブ"
 
-#: src/localplayer.cpp:1929
+#: src/localplayer.cpp:1933
 msgid "(?) crazy move"
-msgstr ""
+msgstr "(?) クレイジームーブ"
 
-#: src/localplayer.cpp:1943
+#: src/localplayer.cpp:1947
 msgid "(0) default moves to target"
-msgstr ""
+msgstr "(0) ターゲットへデフォルト接近"
 
-#: src/localplayer.cpp:1944
+#: src/localplayer.cpp:1948
 msgid "(1) moves to target in distance 1"
-msgstr ""
+msgstr "(1) 距離1でターゲットへ接近"
 
-#: src/localplayer.cpp:1945
+#: src/localplayer.cpp:1949
 msgid "(2) moves to target in distance 2"
-msgstr ""
+msgstr "(2) 距離2でターゲットに近付く"
 
-#: src/localplayer.cpp:1946
+#: src/localplayer.cpp:1950
 msgid "(3) moves to target in distance 3"
-msgstr ""
+msgstr "(3) 距離3でターゲットへ接近"
 
-#: src/localplayer.cpp:1947
+#: src/localplayer.cpp:1951
 msgid "(5) moves to target in distance 5"
-msgstr ""
+msgstr "(5) 距離5でターゲットに近付く"
 
-#: src/localplayer.cpp:1948
+#: src/localplayer.cpp:1952
 msgid "(7) moves to target in distance 7"
-msgstr ""
+msgstr "(7) 距離7でターゲットに近付く"
 
-#: src/localplayer.cpp:1949
+#: src/localplayer.cpp:1953
 msgid "(A) moves to target in attack range"
-msgstr ""
+msgstr "(A) 攻撃範囲内のターゲットに近付く"
 
-#: src/localplayer.cpp:1950
+#: src/localplayer.cpp:1954
 msgid "(a) archer attack range"
 msgstr "(a) 弓師攻撃範囲"
 
-#: src/localplayer.cpp:1951
+#: src/localplayer.cpp:1955
 msgid "(?) move to target"
-msgstr ""
+msgstr "(?) ターゲットに近付く"
 
-#: src/localplayer.cpp:1970
+#: src/localplayer.cpp:1974
 msgid "(D) default follow"
-msgstr ""
+msgstr "(D) デフォルトフォロー"
 
-#: src/localplayer.cpp:1971
+#: src/localplayer.cpp:1975
 msgid "(R) relative follow"
-msgstr ""
+msgstr "(R) 友達フォロー"
 
-#: src/localplayer.cpp:1972
+#: src/localplayer.cpp:1976
 msgid "(M) mirror follow"
-msgstr ""
+msgstr "(M) ミラーフォロー"
 
-#: src/localplayer.cpp:1973
+#: src/localplayer.cpp:1977
 msgid "(P) pet follow"
-msgstr ""
+msgstr "(P) ペットフォロー"
 
-#: src/localplayer.cpp:1974
+#: src/localplayer.cpp:1978
 msgid "(?) unknown follow"
-msgstr ""
+msgstr "(?) 不明なフォロー"
 
-#: src/localplayer.cpp:1993 src/localplayer.cpp:1997 src/localplayer.cpp:2020
+#: src/localplayer.cpp:1997 src/localplayer.cpp:2001 src/localplayer.cpp:2024
 msgid "(?) attack"
 msgstr "(?) 攻撃"
 
-#: src/localplayer.cpp:1994 src/localplayer.cpp:2016
+#: src/localplayer.cpp:1998 src/localplayer.cpp:2020
 msgid "(D) default attack"
-msgstr ""
+msgstr "(D) デフォルト攻撃"
 
-#: src/localplayer.cpp:1995
+#: src/localplayer.cpp:1999
 msgid "(s) switch attack without shield"
-msgstr ""
+msgstr "(s) 盾なし攻撃"
 
-#: src/localplayer.cpp:1996
+#: src/localplayer.cpp:2000
 msgid "(S) switch attack with shield"
-msgstr ""
+msgstr "(S) 盾あり攻撃"
 
-#: src/localplayer.cpp:2017
+#: src/localplayer.cpp:2021
 msgid "(G) go and attack"
-msgstr ""
+msgstr "(G) 接近、攻撃"
 
-#: src/localplayer.cpp:2018
+#: src/localplayer.cpp:2022
 msgid "(A) go, attack, pickup"
-msgstr ""
+msgstr "(A) 接近、攻撃、拾う"
 
-#: src/localplayer.cpp:2019
+#: src/localplayer.cpp:2023
 msgid "(d) without auto attack"
-msgstr ""
+msgstr "(d) 自動攻撃なし"
 
-#: src/localplayer.cpp:2053
+#: src/localplayer.cpp:2057
 msgid "(S) small pick up 1x1 cells"
-msgstr ""
+msgstr "(S) 小範囲で拾う 1x1セル"
 
-#: src/localplayer.cpp:2054
+#: src/localplayer.cpp:2058
 msgid "(D) default pick up 2x1 cells"
-msgstr ""
+msgstr "(D) デフォルト範囲で拾う 2x1セル"
 
-#: src/localplayer.cpp:2055
+#: src/localplayer.cpp:2059
 msgid "(F) forward pick up 2x3 cells"
-msgstr ""
+msgstr "(F) 広範囲で拾う 2x3セル"
 
-#: src/localplayer.cpp:2056
+#: src/localplayer.cpp:2060
 msgid "(3) pick up 3x3 cells"
-msgstr ""
+msgstr "(3) 3x3セルの範囲で拾う"
 
-#: src/localplayer.cpp:2057
+#: src/localplayer.cpp:2061
 msgid "(g) go and pick up in distance 4"
-msgstr ""
+msgstr "(g) 距離4の範囲で拾う"
 
-#: src/localplayer.cpp:2058
+#: src/localplayer.cpp:2062
 msgid "(G) go and pick up in distance 8"
-msgstr ""
+msgstr "(G) 距離8で拾う"
 
-#: src/localplayer.cpp:2059
+#: src/localplayer.cpp:2063
 msgid "(A) go and pick up in max distance"
-msgstr ""
+msgstr "(A) 最大範囲で拾う"
 
-#: src/localplayer.cpp:2060
+#: src/localplayer.cpp:2064
 msgid "(?) pick up"
 msgstr "(?) 拾う"
 
-#: src/localplayer.cpp:2073
+#: src/localplayer.cpp:2077
 msgid "(N) normal map view"
-msgstr ""
+msgstr "(N) 通常マップビュー"
 
-#: src/localplayer.cpp:2074
+#: src/localplayer.cpp:2078
 msgid "(D) debug map view"
-msgstr ""
+msgstr "(D) デバッグマップビュー"
 
-#: src/localplayer.cpp:2075
+#: src/localplayer.cpp:2079
 msgid "(u) ultra map view"
-msgstr ""
+msgstr "(u) ウルトラマップビュー"
 
-#: src/localplayer.cpp:2076
+#: src/localplayer.cpp:2080
 msgid "(U) ultra map view 2"
-msgstr ""
+msgstr "(U) ウルトラマップビュー2"
 
-#: src/localplayer.cpp:2077
+#: src/localplayer.cpp:2081
 msgid "(e) empty map view"
-msgstr ""
+msgstr "(e) 空マップビュー"
 
-#: src/localplayer.cpp:2078
+#: src/localplayer.cpp:2082
 msgid "(b) black & white map view"
-msgstr ""
+msgstr "(b) 白黒マップビュー"
 
-#: src/localplayer.cpp:2097
+#: src/localplayer.cpp:2101
 msgid "(f) use #flar for magic attack"
-msgstr ""
+msgstr "(f) 魔法攻撃は #flarを使う"
 
-#: src/localplayer.cpp:2098
+#: src/localplayer.cpp:2102
 msgid "(c) use #chiza for magic attack"
-msgstr ""
+msgstr "(c) 魔法攻撃は #chizaを使う"
 
-#: src/localplayer.cpp:2099
+#: src/localplayer.cpp:2103
 msgid "(I) use #ingrav for magic attack"
-msgstr ""
+msgstr "(I) 魔法攻撃は #ingravを使う"
 
-#: src/localplayer.cpp:2100
+#: src/localplayer.cpp:2104
 msgid "(F) use #frillyar for magic attack"
-msgstr ""
+msgstr "(F) 魔法攻撃は #frillyarを使う"
 
-#: src/localplayer.cpp:2101
+#: src/localplayer.cpp:2105
 msgid "(U) use #upmarmu for magic attack"
-msgstr ""
+msgstr "(U) 魔法攻撃は #upmarmuを使う"
 
-#: src/localplayer.cpp:2102
+#: src/localplayer.cpp:2106
 msgid "(?) magic attack"
-msgstr ""
+msgstr "(?) 魔法攻撃"
 
-#: src/localplayer.cpp:2121
+#: src/localplayer.cpp:2125
 msgid "(a) attack all players"
 msgstr "(a) 全てのプレイヤーを攻撃"
 
-#: src/localplayer.cpp:2122
+#: src/localplayer.cpp:2126
 msgid "(f) attack not friends"
 msgstr "(f) 友達以外を攻撃"
 
-#: src/localplayer.cpp:2123
+#: src/localplayer.cpp:2127
 msgid "(b) attack bad relations"
 msgstr "(b) 敵を攻撃"
 
-#: src/localplayer.cpp:2124
+#: src/localplayer.cpp:2128
 msgid "(d) dont attack players"
 msgstr "(d) 他のプレイヤーを攻撃しない"
 
-#: src/localplayer.cpp:2125
+#: src/localplayer.cpp:2129
 msgid "(?) pvp attack"
 msgstr "(?) PvP攻撃"
 
-#: src/localplayer.cpp:2144
+#: src/localplayer.cpp:2148
 msgid "(D) default imitation"
-msgstr ""
+msgstr "(D) デフォルト真似"
 
-#: src/localplayer.cpp:2145
+#: src/localplayer.cpp:2149
 msgid "(O) outfits imitation"
-msgstr ""
+msgstr "(O) 服装真似"
 
-#: src/localplayer.cpp:2146
+#: src/localplayer.cpp:2150
 msgid "(?) imitation"
 msgstr "(?) 真似をする"
 
-#: src/localplayer.cpp:2174
+#: src/localplayer.cpp:2178
 msgid "Away"
 msgstr "アウェイ"
 
-#: src/localplayer.cpp:2193
+#: src/localplayer.cpp:2197
 msgid "(O) on keyboard"
-msgstr ""
+msgstr "(O) キーボード"
 
-#: src/localplayer.cpp:2194
+#: src/localplayer.cpp:2198
 msgid "(A) away"
 msgstr "(A) アウェイ"
 
-#: src/localplayer.cpp:2195 src/localplayer.cpp:2210
+#: src/localplayer.cpp:2199 src/localplayer.cpp:2214
 msgid "(?) away"
 msgstr "(?) アウェイ"
 
-#: src/localplayer.cpp:2208
+#: src/localplayer.cpp:2212
 msgid "(G) game camera mode"
-msgstr ""
+msgstr "(G) ゲームカメラモード"
 
-#: src/localplayer.cpp:2209
+#: src/localplayer.cpp:2213
 msgid "(F) free camera mode"
-msgstr ""
+msgstr "(F) フリーカメラモード"
 
-#: src/localplayer.cpp:2234
+#: src/localplayer.cpp:2238
 msgid "Game modifiers are enabled"
-msgstr ""
+msgstr "ゲームモディファイアは有効になってます"
 
-#: src/localplayer.cpp:2235
+#: src/localplayer.cpp:2239
 msgid "Game modifiers are disabled"
-msgstr ""
+msgstr "ゲームモディファイアは無効になってます"
 
-#: src/localplayer.cpp:2236
+#: src/localplayer.cpp:2240
 msgid "Game modifiers are unknown"
 msgstr ""
 
-#: src/localplayer.cpp:3752
+#: src/localplayer.cpp:3756
 msgid "Follow: "
 msgstr "フォロー: "
 
-#: src/localplayer.cpp:3754 src/localplayer.cpp:3769
+#: src/localplayer.cpp:3758 src/localplayer.cpp:3773
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3761
+#: src/localplayer.cpp:3765
 msgid "Imitation: "
 msgstr "真似: "
 
-#: src/localplayer.cpp:3763 src/localplayer.cpp:3771
+#: src/localplayer.cpp:3767 src/localplayer.cpp:3775
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:4119
+#: src/localplayer.cpp:4123
 msgid "You see "
 msgstr " が見える"
 
-#: src/main.cpp:47
+#: src/main.cpp:49
 msgid "manaplus [options] [manaplus-file]"
 msgstr "manaplus [オプション] [manaplus-ファイル]"
 
-#: src/main.cpp:48
+#: src/main.cpp:50
 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr "[manaplus-ファイル] : manaplusのファイルはXMLファイルです (.manaplus)"
 
-#: src/main.cpp:50
+#: src/main.cpp:52
 msgid "                  used to set custom parameters"
 msgstr ""
 
-#: src/main.cpp:51
+#: src/main.cpp:53
 msgid "                  to the manaplus client."
 msgstr ""
 
-#: src/main.cpp:53
+#: src/main.cpp:55
 msgid "Options:"
 msgstr "オプション:"
 
-#: src/main.cpp:54
+#: src/main.cpp:56
 msgid "  -l --log-file       : Log file to use"
 msgstr "  -l --log-file       : 使用するログファイル"
 
-#: src/main.cpp:55
+#: src/main.cpp:57
 msgid "  -L --chat-log-dir   : Chat log dir to use"
 msgstr "  -L --chat-log-dir   : チャットログ場所"
 
-#: src/main.cpp:56
+#: src/main.cpp:58
 msgid "  -v --version        : Display the version"
 msgstr "  -v --version        : バージョンを表示"
 
-#: src/main.cpp:57
+#: src/main.cpp:59
 msgid "  -h --help           : Display this help"
 msgstr "  -h --help           : ヘルプメニュー表示"
 
-#: src/main.cpp:58
+#: src/main.cpp:60
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr "  -C --config-dir     : 使用する設定ファイル"
 
-#: src/main.cpp:59
+#: src/main.cpp:61
 msgid "  -U --username       : Login with this username"
 msgstr "  -U --username       : この名前でログインする"
 
-#: src/main.cpp:60
+#: src/main.cpp:62
 msgid "  -P --password       : Login with this password"
 msgstr "  -P --password       : このパスワードでログインする"
 
-#: src/main.cpp:61
+#: src/main.cpp:63
 msgid "  -c --character      : Login with this character"
 msgstr "  -c --character      : このキャラクターでログインする"
 
-#: src/main.cpp:62
+#: src/main.cpp:64
 msgid "  -s --server         : Login server name or IP"
 msgstr "  -s --server         : ログインするサーバー又はIP"
 
-#: src/main.cpp:63
+#: src/main.cpp:65
 msgid "  -p --port           : Login server port"
 msgstr "  -p --port           : ログインするサーバーポート"
 
-#: src/main.cpp:64
+#: src/main.cpp:66
 msgid "     --update-host    : Use this update host"
 msgstr "     --update-host    : このアップデートホストを利用する"
 
-#: src/main.cpp:65
+#: src/main.cpp:67
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 "  -D --default        : デフォルトで使用するキャラクターサーバーとキャラク"
 "ターを選択する"
 
-#: src/main.cpp:67
+#: src/main.cpp:69
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr "  -u --skip-update    : アップデートをスキップする"
 
-#: src/main.cpp:68
+#: src/main.cpp:70
 msgid "  -d --data           : Directory to load game data from"
 msgstr "  -d --data           : ゲームデータを読み込む場所"
 
-#: src/main.cpp:70
+#: src/main.cpp:72
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr "  -L --localdata-dir  : ローカルデータディレクトリの場所"
 
-#: src/main.cpp:72
+#: src/main.cpp:74
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr "     --screenshot-dir : スクリーンショットの保存場所"
 
-#: src/main.cpp:73
+#: src/main.cpp:75
 msgid "     --safemode       : Start game in safe mode"
 msgstr "     --safemode       : セーフモードでゲームを始める"
 
-#: src/main.cpp:74
+#: src/main.cpp:76
 msgid "  -T --tests          : Start testing drivers and auto configuring"
 msgstr ""
 
-#: src/main.cpp:77
+#: src/main.cpp:79
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr "     --openglエラー      : OpenGLを今回のみ無効にする"
 
@@ -4750,7 +4745,7 @@ msgstr "アカウントが見つかりませんでした。再度ログインし
 
 #: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127
 msgid "Old password incorrect."
-msgstr ""
+msgstr "変更前のパスワードが間違っています"
 
 #: src/net/ea/loginhandler.cpp:137
 msgid "New password too short."
@@ -5352,28 +5347,28 @@ msgstr "アカウントが接続されていません。最初にログインし
 
 #: src/net/manaserv/loginhandler.cpp:156
 msgid "New email address incorrect."
-msgstr ""
+msgstr "新しいメールアドレスが間違っています"
 
 #: src/net/manaserv/loginhandler.cpp:159
 msgid "Old email address incorrect."
-msgstr ""
+msgstr "変更前のメールアドレスが間違っています"
 
 #: src/net/manaserv/loginhandler.cpp:167
 msgid "The new email address already exists."
-msgstr ""
+msgstr "新しいメールアドレスは既に使用されています"
 
 #: src/net/manaserv/loginhandler.cpp:249
 msgid ""
 "Client registration is not allowed. Please contact server administration."
-msgstr ""
+msgstr "クライアントからの登録はできません。サーバー管理者に連絡をして下さい。"
 
 #: src/net/manaserv/loginhandler.cpp:275 src/net/manaserv/loginhandler.cpp:312
 msgid "Client version is too old."
-msgstr ""
+msgstr "アップデートが必要です"
 
 #: src/net/manaserv/loginhandler.cpp:278
 msgid "Wrong username or password."
-msgstr ""
+msgstr "ユーザーネームまたはパスワードが間違っています"
 
 #: src/net/manaserv/loginhandler.cpp:284
 msgid "Account banned"
@@ -5381,7 +5376,7 @@ msgstr "アカウントは追放されています"
 
 #: src/net/manaserv/loginhandler.cpp:287
 msgid "Login attempt too soon after previous attempt."
-msgstr ""
+msgstr "時間が経ってから再度ログインして下さい"
 
 #: src/net/manaserv/loginhandler.cpp:315
 msgid "Wrong username, password or email address."
@@ -5397,7 +5392,7 @@ msgstr "既に使用されているメールアドレスです"
 
 #: src/net/manaserv/loginhandler.cpp:324
 msgid "You took too long with the captcha or your response was incorrect."
-msgstr ""
+msgstr "キャプチャ画像の時間切れまたは答えが間違っています"
 
 #: src/net/manaserv/partyhandler.cpp:90
 msgid "Joined party."
@@ -5444,11 +5439,11 @@ msgstr "販売できません"
 
 #: src/net/tmwa/buysellhandler.cpp:140
 msgid "Unable to sell while trading."
-msgstr ""
+msgstr "トレード中は売買できません"
 
 #: src/net/tmwa/buysellhandler.cpp:143
 msgid "Unable to sell unsellable item."
-msgstr ""
+msgstr "トレード中は売買できません"
 
 #: src/net/tmwa/generalhandler.cpp:108
 #, c-format
@@ -5486,19 +5481,19 @@ msgstr "認証に失敗しました"
 
 #: src/net/tmwa/generalhandler.cpp:142
 msgid "No servers available."
-msgstr ""
+msgstr "利用できるサーバーがありません"
 
 #: src/net/tmwa/generalhandler.cpp:147
 msgid "Someone else is trying to use this account."
-msgstr ""
+msgstr "他からのログインがありました"
 
 #: src/net/tmwa/generalhandler.cpp:152
 msgid "This account is already logged in."
-msgstr ""
+msgstr "このアカウントは既にログイン中です"
 
 #: src/net/tmwa/generalhandler.cpp:156
 msgid "Speed hack detected."
-msgstr ""
+msgstr "スピードハックが探知されました"
 
 #: src/net/tmwa/generalhandler.cpp:159
 msgid "Duplicated login."
@@ -5506,7 +5501,7 @@ msgstr "重複ログイン"
 
 #: src/net/tmwa/generalhandler.cpp:162
 msgid "Unknown connection error."
-msgstr ""
+msgstr "不明な接続エラーです"
 
 #: src/net/tmwa/generalhandler.cpp:235
 msgid "Got disconnected from server!"
@@ -5561,7 +5556,7 @@ msgstr "ダメージ/秒"
 
 #: src/net/tmwa/network.cpp:153
 msgid "Empty address given to Network::connect()!"
-msgstr ""
+msgstr "ネットワークに空のアドレスが送信されました::connect()!"
 
 #: src/net/tmwa/network.cpp:357
 msgid "Unable to resolve host \""
@@ -5569,7 +5564,7 @@ msgstr "ホスト名を解決できません"
 
 #: src/net/tmwa/network.cpp:427
 msgid "Connection to server terminated. "
-msgstr ""
+msgstr "サーバーへの接続が切断されました"
 
 #: src/net/tmwa/partyhandler.cpp:171
 #, c-format
@@ -5621,5 +5616,5 @@ msgstr "MP %+d"
 msgid "Unknown item"
 msgstr "不明なアイテム"
 
-#~ msgid "Waiting for server"
-#~ msgstr "サーバからの応答を待っています…"
+#~ msgid "> Next"
+#~ msgstr "> 次へ"
diff --git a/po/manaplus.pot b/po/manaplus.pot
index 71b8d1557..078e1b619 100644
--- a/po/manaplus.pot
+++ b/po/manaplus.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-01-05 23:31+0300\n"
+"POT-Creation-Date: 2012-01-07 20:36+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -302,11 +302,11 @@ msgstr ""
 msgid "Deleted:"
 msgstr ""
 
-#: src/commandhandler.cpp:1180 src/commandhandler.cpp:1187
+#: src/commandhandler.cpp:1226 src/commandhandler.cpp:1233
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1182 src/commandhandler.cpp:1189
+#: src/commandhandler.cpp:1228 src/commandhandler.cpp:1235
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -1263,10 +1263,6 @@ msgstr ""
 msgid "Clear"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:223
-msgid "> Next"
-msgstr ""
-
 #: src/gui/npcpostdialog.cpp:48
 msgid "To:"
 msgstr ""
@@ -3969,421 +3965,421 @@ msgstr ""
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1441
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1442
+#: src/localplayer.cpp:1444
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1447
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1446
+#: src/localplayer.cpp:1450
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1449
+#: src/localplayer.cpp:1453
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1452
+#: src/localplayer.cpp:1456
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1476
+#: src/localplayer.cpp:1480
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/localplayer.cpp:1893
+#: src/localplayer.cpp:1897
 msgid "(D) default moves"
 msgstr ""
 
-#: src/localplayer.cpp:1894
+#: src/localplayer.cpp:1898
 msgid "(I) invert moves"
 msgstr ""
 
-#: src/localplayer.cpp:1895
+#: src/localplayer.cpp:1899
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1896
+#: src/localplayer.cpp:1900
 msgid "(C) moves with crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1897
+#: src/localplayer.cpp:1901
 msgid "(d) double normal + crazy"
 msgstr ""
 
-#: src/localplayer.cpp:1898
+#: src/localplayer.cpp:1902
 msgid "(?) unknown move"
 msgstr ""
 
-#: src/localplayer.cpp:1920
+#: src/localplayer.cpp:1924
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr ""
 
-#: src/localplayer.cpp:1925
+#: src/localplayer.cpp:1929
 msgid "(a) custom crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1929
+#: src/localplayer.cpp:1933
 msgid "(?) crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1943
+#: src/localplayer.cpp:1947
 msgid "(0) default moves to target"
 msgstr ""
 
-#: src/localplayer.cpp:1944
+#: src/localplayer.cpp:1948
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
-#: src/localplayer.cpp:1945
+#: src/localplayer.cpp:1949
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
-#: src/localplayer.cpp:1946
+#: src/localplayer.cpp:1950
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
-#: src/localplayer.cpp:1947
+#: src/localplayer.cpp:1951
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
-#: src/localplayer.cpp:1948
+#: src/localplayer.cpp:1952
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
-#: src/localplayer.cpp:1949
+#: src/localplayer.cpp:1953
 msgid "(A) moves to target in attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1950
+#: src/localplayer.cpp:1954
 msgid "(a) archer attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1951
+#: src/localplayer.cpp:1955
 msgid "(?) move to target"
 msgstr ""
 
-#: src/localplayer.cpp:1970
+#: src/localplayer.cpp:1974
 msgid "(D) default follow"
 msgstr ""
 
-#: src/localplayer.cpp:1971
+#: src/localplayer.cpp:1975
 msgid "(R) relative follow"
 msgstr ""
 
-#: src/localplayer.cpp:1972
+#: src/localplayer.cpp:1976
 msgid "(M) mirror follow"
 msgstr ""
 
-#: src/localplayer.cpp:1973
+#: src/localplayer.cpp:1977
 msgid "(P) pet follow"
 msgstr ""
 
-#: src/localplayer.cpp:1974
+#: src/localplayer.cpp:1978
 msgid "(?) unknown follow"
 msgstr ""
 
-#: src/localplayer.cpp:1993 src/localplayer.cpp:1997 src/localplayer.cpp:2020
+#: src/localplayer.cpp:1997 src/localplayer.cpp:2001 src/localplayer.cpp:2024
 msgid "(?) attack"
 msgstr ""
 
-#: src/localplayer.cpp:1994 src/localplayer.cpp:2016
+#: src/localplayer.cpp:1998 src/localplayer.cpp:2020
 msgid "(D) default attack"
 msgstr ""
 
-#: src/localplayer.cpp:1995
+#: src/localplayer.cpp:1999
 msgid "(s) switch attack without shield"
 msgstr ""
 
-#: src/localplayer.cpp:1996
+#: src/localplayer.cpp:2000
 msgid "(S) switch attack with shield"
 msgstr ""
 
-#: src/localplayer.cpp:2017
+#: src/localplayer.cpp:2021
 msgid "(G) go and attack"
 msgstr ""
 
-#: src/localplayer.cpp:2018
+#: src/localplayer.cpp:2022
 msgid "(A) go, attack, pickup"
 msgstr ""
 
-#: src/localplayer.cpp:2019
+#: src/localplayer.cpp:2023
 msgid "(d) without auto attack"
 msgstr ""
 
-#: src/localplayer.cpp:2053
+#: src/localplayer.cpp:2057
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2054
+#: src/localplayer.cpp:2058
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2055
+#: src/localplayer.cpp:2059
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2056
+#: src/localplayer.cpp:2060
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2057
+#: src/localplayer.cpp:2061
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
-#: src/localplayer.cpp:2058
+#: src/localplayer.cpp:2062
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
-#: src/localplayer.cpp:2059
+#: src/localplayer.cpp:2063
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
-#: src/localplayer.cpp:2060
+#: src/localplayer.cpp:2064
 msgid "(?) pick up"
 msgstr ""
 
-#: src/localplayer.cpp:2073
+#: src/localplayer.cpp:2077
 msgid "(N) normal map view"
 msgstr ""
 
-#: src/localplayer.cpp:2074
+#: src/localplayer.cpp:2078
 msgid "(D) debug map view"
 msgstr ""
 
-#: src/localplayer.cpp:2075
+#: src/localplayer.cpp:2079
 msgid "(u) ultra map view"
 msgstr ""
 
-#: src/localplayer.cpp:2076
+#: src/localplayer.cpp:2080
 msgid "(U) ultra map view 2"
 msgstr ""
 
-#: src/localplayer.cpp:2077
+#: src/localplayer.cpp:2081
 msgid "(e) empty map view"
 msgstr ""
 
-#: src/localplayer.cpp:2078
+#: src/localplayer.cpp:2082
 msgid "(b) black & white map view"
 msgstr ""
 
-#: src/localplayer.cpp:2097
+#: src/localplayer.cpp:2101
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2098
+#: src/localplayer.cpp:2102
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2099
+#: src/localplayer.cpp:2103
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2100
+#: src/localplayer.cpp:2104
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2101
+#: src/localplayer.cpp:2105
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2102
+#: src/localplayer.cpp:2106
 msgid "(?) magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2121
+#: src/localplayer.cpp:2125
 msgid "(a) attack all players"
 msgstr ""
 
-#: src/localplayer.cpp:2122
+#: src/localplayer.cpp:2126
 msgid "(f) attack not friends"
 msgstr ""
 
-#: src/localplayer.cpp:2123
+#: src/localplayer.cpp:2127
 msgid "(b) attack bad relations"
 msgstr ""
 
-#: src/localplayer.cpp:2124
+#: src/localplayer.cpp:2128
 msgid "(d) dont attack players"
 msgstr ""
 
-#: src/localplayer.cpp:2125
+#: src/localplayer.cpp:2129
 msgid "(?) pvp attack"
 msgstr ""
 
-#: src/localplayer.cpp:2144
+#: src/localplayer.cpp:2148
 msgid "(D) default imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2145
+#: src/localplayer.cpp:2149
 msgid "(O) outfits imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2146
+#: src/localplayer.cpp:2150
 msgid "(?) imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2174
+#: src/localplayer.cpp:2178
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:2193
+#: src/localplayer.cpp:2197
 msgid "(O) on keyboard"
 msgstr ""
 
-#: src/localplayer.cpp:2194
+#: src/localplayer.cpp:2198
 msgid "(A) away"
 msgstr ""
 
-#: src/localplayer.cpp:2195 src/localplayer.cpp:2210
+#: src/localplayer.cpp:2199 src/localplayer.cpp:2214
 msgid "(?) away"
 msgstr ""
 
-#: src/localplayer.cpp:2208
+#: src/localplayer.cpp:2212
 msgid "(G) game camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2209
+#: src/localplayer.cpp:2213
 msgid "(F) free camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2234
+#: src/localplayer.cpp:2238
 msgid "Game modifiers are enabled"
 msgstr ""
 
-#: src/localplayer.cpp:2235
+#: src/localplayer.cpp:2239
 msgid "Game modifiers are disabled"
 msgstr ""
 
-#: src/localplayer.cpp:2236
+#: src/localplayer.cpp:2240
 msgid "Game modifiers are unknown"
 msgstr ""
 
-#: src/localplayer.cpp:3752
+#: src/localplayer.cpp:3756
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3754 src/localplayer.cpp:3769
+#: src/localplayer.cpp:3758 src/localplayer.cpp:3773
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3761
+#: src/localplayer.cpp:3765
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3763 src/localplayer.cpp:3771
+#: src/localplayer.cpp:3767 src/localplayer.cpp:3775
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:4119
+#: src/localplayer.cpp:4123
 msgid "You see "
 msgstr ""
 
-#: src/main.cpp:47
+#: src/main.cpp:49
 msgid "manaplus [options] [manaplus-file]"
 msgstr ""
 
-#: src/main.cpp:48
+#: src/main.cpp:50
 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr ""
 
-#: src/main.cpp:50
+#: src/main.cpp:52
 msgid "                  used to set custom parameters"
 msgstr ""
 
-#: src/main.cpp:51
+#: src/main.cpp:53
 msgid "                  to the manaplus client."
 msgstr ""
 
-#: src/main.cpp:53
+#: src/main.cpp:55
 msgid "Options:"
 msgstr ""
 
-#: src/main.cpp:54
+#: src/main.cpp:56
 msgid "  -l --log-file       : Log file to use"
 msgstr ""
 
-#: src/main.cpp:55
+#: src/main.cpp:57
 msgid "  -L --chat-log-dir   : Chat log dir to use"
 msgstr ""
 
-#: src/main.cpp:56
+#: src/main.cpp:58
 msgid "  -v --version        : Display the version"
 msgstr ""
 
-#: src/main.cpp:57
+#: src/main.cpp:59
 msgid "  -h --help           : Display this help"
 msgstr ""
 
-#: src/main.cpp:58
+#: src/main.cpp:60
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:59
+#: src/main.cpp:61
 msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:60
+#: src/main.cpp:62
 msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:61
+#: src/main.cpp:63
 msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:62
+#: src/main.cpp:64
 msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:63
+#: src/main.cpp:65
 msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:64
+#: src/main.cpp:66
 msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:65
+#: src/main.cpp:67
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:67
+#: src/main.cpp:69
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:68
+#: src/main.cpp:70
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:70
+#: src/main.cpp:72
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:72
+#: src/main.cpp:74
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:73
+#: src/main.cpp:75
 msgid "     --safemode       : Start game in safe mode"
 msgstr ""
 
-#: src/main.cpp:74
+#: src/main.cpp:76
 msgid "  -T --tests          : Start testing drivers and auto configuring"
 msgstr ""
 
-#: src/main.cpp:77
+#: src/main.cpp:79
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
diff --git a/po/nl_BE.po b/po/nl_BE.po
index 97d354580..0cd2e9100 100644
--- a/po/nl_BE.po
+++ b/po/nl_BE.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-01-05 23:31+0300\n"
+"POT-Creation-Date: 2012-01-07 20:36+0300\n"
 "PO-Revision-Date: 2011-11-11 21:38+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Dutch (Belgium/Flemish) (http://www.transifex.net/projects/p/"
@@ -306,11 +306,11 @@ msgstr "Aangemaakt:"
 msgid "Deleted:"
 msgstr "Verwijdered:"
 
-#: src/commandhandler.cpp:1180 src/commandhandler.cpp:1187
+#: src/commandhandler.cpp:1226 src/commandhandler.cpp:1233
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1182 src/commandhandler.cpp:1189
+#: src/commandhandler.cpp:1228 src/commandhandler.cpp:1235
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -1268,10 +1268,6 @@ msgstr "NPC"
 msgid "Clear"
 msgstr "Wissen"
 
-#: src/gui/npcdialog.cpp:223
-msgid "> Next"
-msgstr "> Volgende"
-
 #: src/gui/npcpostdialog.cpp:48
 msgid "To:"
 msgstr "Aan:"
@@ -3995,422 +3991,422 @@ msgstr "U bent gedoodt door "
 msgid "Tried to pick up nonexistent item."
 msgstr "Geprobeerd een nietbestaand voorwerp op te rapen."
 
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1441
 msgid "Item is too heavy."
 msgstr "Voorwerp is te zwaar."
 
-#: src/localplayer.cpp:1442
+#: src/localplayer.cpp:1444
 msgid "Item is too far away."
 msgstr "Voorwerp is te ver weg."
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1447
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1446
+#: src/localplayer.cpp:1450
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1449
+#: src/localplayer.cpp:1453
 msgid "Item belongs to someone else."
 msgstr "Voorwerp behoort bij iemand anders."
 
-#: src/localplayer.cpp:1452
+#: src/localplayer.cpp:1456
 msgid "Unknown problem picking up item."
 msgstr "Onbekend probleem bij het oprapen van voorwerp."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1476
+#: src/localplayer.cpp:1480
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "U raapte op %d [@@%d|%s@@]."
 msgstr[1] "U raapte op %d [@@%d|%s@@]."
 
-#: src/localplayer.cpp:1893
+#: src/localplayer.cpp:1897
 msgid "(D) default moves"
 msgstr "(D) standaard bewegingen"
 
-#: src/localplayer.cpp:1894
+#: src/localplayer.cpp:1898
 msgid "(I) invert moves"
 msgstr "(I) geïnverteerde bewegingen"
 
-#: src/localplayer.cpp:1895
+#: src/localplayer.cpp:1899
 msgid "(c) moves with some crazy moves"
 msgstr "(c) bewegingen met enkele vreemde bewegingen"
 
-#: src/localplayer.cpp:1896
+#: src/localplayer.cpp:1900
 msgid "(C) moves with crazy moves"
 msgstr "(C) bewegingen met vreemde bewegingen"
 
-#: src/localplayer.cpp:1897
+#: src/localplayer.cpp:1901
 msgid "(d) double normal + crazy"
 msgstr "(d) dubbel normaal + raar"
 
-#: src/localplayer.cpp:1898
+#: src/localplayer.cpp:1902
 #, fuzzy
 msgid "(?) unknown move"
 msgstr "(?) onbekend volgen"
 
-#: src/localplayer.cpp:1920
+#: src/localplayer.cpp:1924
 #, fuzzy, c-format
 msgid "(%d) crazy move number %d"
 msgstr "(?) vreemde beweging"
 
-#: src/localplayer.cpp:1925
+#: src/localplayer.cpp:1929
 msgid "(a) custom crazy move"
 msgstr "(a) manuele vreemde beweging"
 
-#: src/localplayer.cpp:1929
+#: src/localplayer.cpp:1933
 msgid "(?) crazy move"
 msgstr "(?) vreemde beweging"
 
-#: src/localplayer.cpp:1943
+#: src/localplayer.cpp:1947
 msgid "(0) default moves to target"
 msgstr "(0) standaard bewegingen tot aan doel"
 
-#: src/localplayer.cpp:1944
+#: src/localplayer.cpp:1948
 msgid "(1) moves to target in distance 1"
 msgstr "(1) bewegen tot aan doel in bereik 1"
 
-#: src/localplayer.cpp:1945
+#: src/localplayer.cpp:1949
 msgid "(2) moves to target in distance 2"
 msgstr "(2) bewegen tot aan doel in bereik 2"
 
-#: src/localplayer.cpp:1946
+#: src/localplayer.cpp:1950
 msgid "(3) moves to target in distance 3"
 msgstr "(3) bewegen tot aan doel in bereik 3"
 
-#: src/localplayer.cpp:1947
+#: src/localplayer.cpp:1951
 msgid "(5) moves to target in distance 5"
 msgstr "(5) bewegen tot aan doel in bereik 5"
 
-#: src/localplayer.cpp:1948
+#: src/localplayer.cpp:1952
 msgid "(7) moves to target in distance 7"
 msgstr "(7) bewegen tot aan doel in bereik 7"
 
-#: src/localplayer.cpp:1949
+#: src/localplayer.cpp:1953
 msgid "(A) moves to target in attack range"
 msgstr "(A) beweeg tot aan doel in aanvalsbereik"
 
-#: src/localplayer.cpp:1950
+#: src/localplayer.cpp:1954
 msgid "(a) archer attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1951
+#: src/localplayer.cpp:1955
 msgid "(?) move to target"
 msgstr "(?) beweeg tot aan doel"
 
-#: src/localplayer.cpp:1970
+#: src/localplayer.cpp:1974
 msgid "(D) default follow"
 msgstr "(D) standaard volgen"
 
-#: src/localplayer.cpp:1971
+#: src/localplayer.cpp:1975
 msgid "(R) relative follow"
 msgstr "(R) relatief volgen"
 
-#: src/localplayer.cpp:1972
+#: src/localplayer.cpp:1976
 msgid "(M) mirror follow"
 msgstr "(M) gespiegeld volgen"
 
-#: src/localplayer.cpp:1973
+#: src/localplayer.cpp:1977
 msgid "(P) pet follow"
 msgstr "(P) huisdier volgen"
 
-#: src/localplayer.cpp:1974
+#: src/localplayer.cpp:1978
 msgid "(?) unknown follow"
 msgstr "(?) onbekend volgen"
 
-#: src/localplayer.cpp:1993 src/localplayer.cpp:1997 src/localplayer.cpp:2020
+#: src/localplayer.cpp:1997 src/localplayer.cpp:2001 src/localplayer.cpp:2024
 msgid "(?) attack"
 msgstr "(?) aanval"
 
-#: src/localplayer.cpp:1994 src/localplayer.cpp:2016
+#: src/localplayer.cpp:1998 src/localplayer.cpp:2020
 msgid "(D) default attack"
 msgstr "(D) standaard aanval"
 
-#: src/localplayer.cpp:1995
+#: src/localplayer.cpp:1999
 msgid "(s) switch attack without shield"
 msgstr "(s) wissel aanval zonder schild"
 
-#: src/localplayer.cpp:1996
+#: src/localplayer.cpp:2000
 msgid "(S) switch attack with shield"
 msgstr "(S) wissel aanval met schild"
 
-#: src/localplayer.cpp:2017
+#: src/localplayer.cpp:2021
 msgid "(G) go and attack"
 msgstr "(G) ga en val aan"
 
-#: src/localplayer.cpp:2018
+#: src/localplayer.cpp:2022
 msgid "(A) go, attack, pickup"
 msgstr "(A) ga, val aan, raap op"
 
-#: src/localplayer.cpp:2019
+#: src/localplayer.cpp:2023
 msgid "(d) without auto attack"
 msgstr "(d) zonder auto aanval"
 
-#: src/localplayer.cpp:2053
+#: src/localplayer.cpp:2057
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) klein raap op 1x1 velden"
 
-#: src/localplayer.cpp:2054
+#: src/localplayer.cpp:2058
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) standaard raap op 2x1 velden"
 
-#: src/localplayer.cpp:2055
+#: src/localplayer.cpp:2059
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) vooruit raap op 2x3 velden"
 
-#: src/localplayer.cpp:2056
+#: src/localplayer.cpp:2060
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) raap op 3x3 velden"
 
-#: src/localplayer.cpp:2057
+#: src/localplayer.cpp:2061
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) go en raap op met bereik 4"
 
-#: src/localplayer.cpp:2058
+#: src/localplayer.cpp:2062
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) ga en raap op met bereik 8"
 
-#: src/localplayer.cpp:2059
+#: src/localplayer.cpp:2063
 msgid "(A) go and pick up in max distance"
 msgstr "(A) ga en raap op zonder bereiklimiet"
 
-#: src/localplayer.cpp:2060
+#: src/localplayer.cpp:2064
 msgid "(?) pick up"
 msgstr "(?) raap op"
 
-#: src/localplayer.cpp:2073
+#: src/localplayer.cpp:2077
 msgid "(N) normal map view"
 msgstr "(N) normale map tonen"
 
-#: src/localplayer.cpp:2074
+#: src/localplayer.cpp:2078
 msgid "(D) debug map view"
 msgstr "(D) debug map tonen"
 
-#: src/localplayer.cpp:2075
+#: src/localplayer.cpp:2079
 msgid "(u) ultra map view"
 msgstr "(u) ultra map tonen"
 
-#: src/localplayer.cpp:2076
+#: src/localplayer.cpp:2080
 msgid "(U) ultra map view 2"
 msgstr "(U) ultra map tonen 2"
 
-#: src/localplayer.cpp:2077
+#: src/localplayer.cpp:2081
 msgid "(e) empty map view"
 msgstr "(e) lege map tonen"
 
-#: src/localplayer.cpp:2078
+#: src/localplayer.cpp:2082
 msgid "(b) black & white map view"
 msgstr "(b) zwart & witte map tonen"
 
-#: src/localplayer.cpp:2097
+#: src/localplayer.cpp:2101
 msgid "(f) use #flar for magic attack"
 msgstr "(f) gebruik #flar voor magie aanval"
 
-#: src/localplayer.cpp:2098
+#: src/localplayer.cpp:2102
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) gebruik #chiza voor magie aanval"
 
-#: src/localplayer.cpp:2099
+#: src/localplayer.cpp:2103
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) gebruik #ingrav voor magie aanval"
 
-#: src/localplayer.cpp:2100
+#: src/localplayer.cpp:2104
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) gebruik #frillyar voor magie aanval"
 
-#: src/localplayer.cpp:2101
+#: src/localplayer.cpp:2105
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) gebruik #upmarmu voor magie aanval"
 
-#: src/localplayer.cpp:2102
+#: src/localplayer.cpp:2106
 msgid "(?) magic attack"
 msgstr "(?) magie aanval"
 
-#: src/localplayer.cpp:2121
+#: src/localplayer.cpp:2125
 msgid "(a) attack all players"
 msgstr ""
 
-#: src/localplayer.cpp:2122
+#: src/localplayer.cpp:2126
 msgid "(f) attack not friends"
 msgstr ""
 
-#: src/localplayer.cpp:2123
+#: src/localplayer.cpp:2127
 msgid "(b) attack bad relations"
 msgstr ""
 
-#: src/localplayer.cpp:2124
+#: src/localplayer.cpp:2128
 msgid "(d) dont attack players"
 msgstr ""
 
-#: src/localplayer.cpp:2125
+#: src/localplayer.cpp:2129
 msgid "(?) pvp attack"
 msgstr ""
 
-#: src/localplayer.cpp:2144
+#: src/localplayer.cpp:2148
 msgid "(D) default imitation"
 msgstr "(D) standaard imitatie"
 
-#: src/localplayer.cpp:2145
+#: src/localplayer.cpp:2149
 msgid "(O) outfits imitation"
 msgstr "(O) kleren imitatie"
 
-#: src/localplayer.cpp:2146
+#: src/localplayer.cpp:2150
 msgid "(?) imitation"
 msgstr "(?) imitatie"
 
-#: src/localplayer.cpp:2174
+#: src/localplayer.cpp:2178
 msgid "Away"
 msgstr "Weg"
 
-#: src/localplayer.cpp:2193
+#: src/localplayer.cpp:2197
 msgid "(O) on keyboard"
 msgstr "(O) op toetsenbord"
 
-#: src/localplayer.cpp:2194
+#: src/localplayer.cpp:2198
 msgid "(A) away"
 msgstr "(A) weg"
 
-#: src/localplayer.cpp:2195 src/localplayer.cpp:2210
+#: src/localplayer.cpp:2199 src/localplayer.cpp:2214
 msgid "(?) away"
 msgstr "(?) weg"
 
-#: src/localplayer.cpp:2208
+#: src/localplayer.cpp:2212
 msgid "(G) game camera mode"
 msgstr "(G) spel camera modus"
 
-#: src/localplayer.cpp:2209
+#: src/localplayer.cpp:2213
 msgid "(F) free camera mode"
 msgstr "(F) vrije camera modus"
 
-#: src/localplayer.cpp:2234
+#: src/localplayer.cpp:2238
 msgid "Game modifiers are enabled"
 msgstr ""
 
-#: src/localplayer.cpp:2235
+#: src/localplayer.cpp:2239
 msgid "Game modifiers are disabled"
 msgstr ""
 
-#: src/localplayer.cpp:2236
+#: src/localplayer.cpp:2240
 msgid "Game modifiers are unknown"
 msgstr ""
 
-#: src/localplayer.cpp:3752
+#: src/localplayer.cpp:3756
 msgid "Follow: "
 msgstr "Volg: "
 
-#: src/localplayer.cpp:3754 src/localplayer.cpp:3769
+#: src/localplayer.cpp:3758 src/localplayer.cpp:3773
 msgid "Follow canceled"
 msgstr "Volgen onderbroken"
 
-#: src/localplayer.cpp:3761
+#: src/localplayer.cpp:3765
 msgid "Imitation: "
 msgstr "Imitatie: "
 
-#: src/localplayer.cpp:3763 src/localplayer.cpp:3771
+#: src/localplayer.cpp:3767 src/localplayer.cpp:3775
 msgid "Imitation canceled"
 msgstr "Imitatie onderbroken"
 
-#: src/localplayer.cpp:4119
+#: src/localplayer.cpp:4123
 msgid "You see "
 msgstr ""
 
-#: src/main.cpp:47
+#: src/main.cpp:49
 msgid "manaplus [options] [manaplus-file]"
 msgstr ""
 
-#: src/main.cpp:48
+#: src/main.cpp:50
 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr ""
 
-#: src/main.cpp:50
+#: src/main.cpp:52
 msgid "                  used to set custom parameters"
 msgstr ""
 
-#: src/main.cpp:51
+#: src/main.cpp:53
 msgid "                  to the manaplus client."
 msgstr ""
 
-#: src/main.cpp:53
+#: src/main.cpp:55
 msgid "Options:"
 msgstr "Opties:"
 
-#: src/main.cpp:54
+#: src/main.cpp:56
 msgid "  -l --log-file       : Log file to use"
 msgstr "  -l --log-file       : Log bestand te gebruiken"
 
-#: src/main.cpp:55
+#: src/main.cpp:57
 msgid "  -L --chat-log-dir   : Chat log dir to use"
 msgstr "  -L --chat-log-dir   : Chat log bestand te gebruiken"
 
-#: src/main.cpp:56
+#: src/main.cpp:58
 msgid "  -v --version        : Display the version"
 msgstr "  -v --version        : Toon de versie"
 
-#: src/main.cpp:57
+#: src/main.cpp:59
 msgid "  -h --help           : Display this help"
 msgstr "  -h --help           : Toon deze help"
 
-#: src/main.cpp:58
+#: src/main.cpp:60
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr "  -C --config-dir     : Configuratie map te gebruiken"
 
-#: src/main.cpp:59
+#: src/main.cpp:61
 msgid "  -U --username       : Login with this username"
 msgstr "  -U --username       : Login met deze gebruikersnaam"
 
-#: src/main.cpp:60
+#: src/main.cpp:62
 msgid "  -P --password       : Login with this password"
 msgstr "  -P --password       : Loging met dit wachtwoord"
 
-#: src/main.cpp:61
+#: src/main.cpp:63
 msgid "  -c --character      : Login with this character"
 msgstr "  -c --character      : Login met dit karakter"
 
-#: src/main.cpp:62
+#: src/main.cpp:64
 msgid "  -s --server         : Login server name or IP"
 msgstr "  -s --server         : Login servernaam of IP"
 
-#: src/main.cpp:63
+#: src/main.cpp:65
 msgid "  -p --port           : Login server port"
 msgstr "  -p --port           : Login serverpoort"
 
-#: src/main.cpp:64
+#: src/main.cpp:66
 msgid "     --update-host    : Use this update host"
 msgstr "     --update-host    : Updateserver te gebruiken"
 
-#: src/main.cpp:65
+#: src/main.cpp:67
 msgid "  -D --default        : Choose default character server and character"
 msgstr "  -D --default        : Kies standaard karakterserver en karakter"
 
-#: src/main.cpp:67
+#: src/main.cpp:69
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr "  -u --skip-update    : update downloads overslaan"
 
-#: src/main.cpp:68
+#: src/main.cpp:70
 msgid "  -d --data           : Directory to load game data from"
 msgstr "  -d --data           : Map om spelgegevens te laden"
 
-#: src/main.cpp:70
+#: src/main.cpp:72
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr "  -L --localdata-dir  : Map te gebruiken als lokale data map"
 
-#: src/main.cpp:72
+#: src/main.cpp:74
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr "     --screenshot-dir: Map te gebruiken om screenshots te bewaren"
 
-#: src/main.cpp:73
+#: src/main.cpp:75
 msgid "     --safemode       : Start game in safe mode"
 msgstr "     --safemode       : Start spel in veilige modus"
 
-#: src/main.cpp:74
+#: src/main.cpp:76
 msgid "  -T --tests          : Start testing drivers and auto configuring"
 msgstr ""
 
-#: src/main.cpp:77
+#: src/main.cpp:79
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr "     --no-opengl      : Zet OpenGL af voor deze sessie"
 
@@ -5652,6 +5648,9 @@ msgstr "Magie %+d"
 msgid "Unknown item"
 msgstr "Onbekend voorwerp"
 
+#~ msgid "> Next"
+#~ msgstr "> Volgende"
+
 #~ msgid "Waiting for server"
 #~ msgstr "Wachten op server"
 
diff --git a/po/pl.po b/po/pl.po
index 49b1c39c1..156e274a2 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -4,14 +4,14 @@
 #
 # Translators:
 # Andrei Karas <akaras@inbox.ru>, 2011.
-#   <matwa@poczta.pl>, 2011.
+#   <matwa@poczta.pl>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-01-05 23:31+0300\n"
-"PO-Revision-Date: 2012-01-05 20:43+0000\n"
-"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
+"POT-Creation-Date: 2012-01-07 20:36+0300\n"
+"PO-Revision-Date: 2012-01-06 15:36+0000\n"
+"Last-Translator: derpella <matwa@poczta.pl>\n"
 "Language-Team: Polish (http://www.transifex.net/projects/p/manaplus/team/"
 "pl/)\n"
 "Language: pl\n"
@@ -311,11 +311,11 @@ msgstr "Stworzono:"
 msgid "Deleted:"
 msgstr "Usunięto:"
 
-#: src/commandhandler.cpp:1180 src/commandhandler.cpp:1187
+#: src/commandhandler.cpp:1226 src/commandhandler.cpp:1233
 msgid "Resource images:"
 msgstr "Obrazy źródłowe:"
 
-#: src/commandhandler.cpp:1182 src/commandhandler.cpp:1189
+#: src/commandhandler.cpp:1228 src/commandhandler.cpp:1235
 msgid "Resource orphaned images:"
 msgstr "Osierocone obrazy źródłowe:"
 
@@ -1255,7 +1255,7 @@ msgstr "Potrzeba"
 
 #: src/gui/npcdialog.cpp:51
 msgid "Stop waiting"
-msgstr ""
+msgstr "Przerwij"
 
 #: src/gui/npcdialog.cpp:52
 msgid "Next"
@@ -1274,10 +1274,6 @@ msgstr "NPC"
 msgid "Clear"
 msgstr "Wyczyść"
 
-#: src/gui/npcdialog.cpp:223
-msgid "> Next"
-msgstr ">Dalej"
-
 #: src/gui/npcpostdialog.cpp:48
 msgid "To:"
 msgstr "Do:"
@@ -1507,7 +1503,7 @@ msgstr "Teleport"
 
 #: src/gui/popupmenu.cpp:589
 msgid "Clear outfit"
-msgstr ""
+msgstr "Usuń ubiór"
 
 #: src/gui/popupmenu.cpp:608 src/gui/windowmenu.cpp:96
 msgid "Spells"
@@ -3989,33 +3985,33 @@ msgstr "Zostałeś/aś zabity/a przez "
 msgid "Tried to pick up nonexistent item."
 msgstr "Próbowano podnieść nieistniejący przedmiot."
 
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1441
 msgid "Item is too heavy."
 msgstr "Przedmiot zbyt ciężki."
 
-#: src/localplayer.cpp:1442
+#: src/localplayer.cpp:1444
 msgid "Item is too far away."
 msgstr "Przedmiot za daleko"
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1447
 msgid "Inventory is full."
 msgstr "Inwentarz jest pełny."
 
-#: src/localplayer.cpp:1446
+#: src/localplayer.cpp:1450
 msgid "Stack is too big."
 msgstr "Za duży stos."
 
-#: src/localplayer.cpp:1449
+#: src/localplayer.cpp:1453
 msgid "Item belongs to someone else."
 msgstr "Przedmiot należy do kogoś innego."
 
-#: src/localplayer.cpp:1452
+#: src/localplayer.cpp:1456
 msgid "Unknown problem picking up item."
 msgstr "Nieznany problem podczas próby podniesienia przedmiotu."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1476
+#: src/localplayer.cpp:1480
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -4023,388 +4019,388 @@ msgstr[0] "Podniosłeś/aś %d [@@%d|%s@@]."
 msgstr[1] "Podniosłeś/aś %d [@@%d|%s@@]."
 msgstr[2] "Podniosłeś/aś %d [@@%d|%s@@]."
 
-#: src/localplayer.cpp:1893
+#: src/localplayer.cpp:1897
 msgid "(D) default moves"
 msgstr "(D) domyślne poruszanie się"
 
-#: src/localplayer.cpp:1894
+#: src/localplayer.cpp:1898
 msgid "(I) invert moves"
 msgstr "(I) odwrócone ruchy"
 
-#: src/localplayer.cpp:1895
+#: src/localplayer.cpp:1899
 msgid "(c) moves with some crazy moves"
 msgstr "(c) trochę szalonych ruchów"
 
-#: src/localplayer.cpp:1896
+#: src/localplayer.cpp:1900
 msgid "(C) moves with crazy moves"
 msgstr "(C) dużo szalonych ruchów"
 
-#: src/localplayer.cpp:1897
+#: src/localplayer.cpp:1901
 msgid "(d) double normal + crazy"
 msgstr "(d) podwójne normalne + szalone"
 
-#: src/localplayer.cpp:1898
+#: src/localplayer.cpp:1902
 msgid "(?) unknown move"
 msgstr "(?) nieznany sposób poruszania się"
 
-#: src/localplayer.cpp:1920
+#: src/localplayer.cpp:1924
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr "(%d) szalone ruchy numer %d"
 
-#: src/localplayer.cpp:1925
+#: src/localplayer.cpp:1929
 msgid "(a) custom crazy move"
 msgstr "(a) własne szalone ruchy"
 
-#: src/localplayer.cpp:1929
+#: src/localplayer.cpp:1933
 msgid "(?) crazy move"
 msgstr "(?) szalone ruchy"
 
-#: src/localplayer.cpp:1943
+#: src/localplayer.cpp:1947
 msgid "(0) default moves to target"
 msgstr "(0) domyślne przybliżenie do celu"
 
-#: src/localplayer.cpp:1944
+#: src/localplayer.cpp:1948
 msgid "(1) moves to target in distance 1"
 msgstr "(1) podejdź do 1 pola od celu"
 
-#: src/localplayer.cpp:1945
+#: src/localplayer.cpp:1949
 msgid "(2) moves to target in distance 2"
 msgstr "(2) podejdź do 2 pól od celu"
 
-#: src/localplayer.cpp:1946
+#: src/localplayer.cpp:1950
 msgid "(3) moves to target in distance 3"
 msgstr "(3) podejdź do 3 pól od celu"
 
-#: src/localplayer.cpp:1947
+#: src/localplayer.cpp:1951
 msgid "(5) moves to target in distance 5"
 msgstr "(5) podejdź do 5 pól od celu"
 
-#: src/localplayer.cpp:1948
+#: src/localplayer.cpp:1952
 msgid "(7) moves to target in distance 7"
 msgstr "(7) podejdź do 7 pól od celu"
 
-#: src/localplayer.cpp:1949
+#: src/localplayer.cpp:1953
 msgid "(A) moves to target in attack range"
 msgstr "(A) podejdź do celu na zasięg ataku"
 
-#: src/localplayer.cpp:1950
+#: src/localplayer.cpp:1954
 msgid "(a) archer attack range"
 msgstr "(a) zasięg ataku łucznika"
 
-#: src/localplayer.cpp:1951
+#: src/localplayer.cpp:1955
 msgid "(?) move to target"
 msgstr "(?) pól do celu"
 
-#: src/localplayer.cpp:1970
+#: src/localplayer.cpp:1974
 msgid "(D) default follow"
 msgstr "(D) domyślne podążanie"
 
-#: src/localplayer.cpp:1971
+#: src/localplayer.cpp:1975
 msgid "(R) relative follow"
 msgstr "(R) relatywne podążanie"
 
-#: src/localplayer.cpp:1972
+#: src/localplayer.cpp:1976
 msgid "(M) mirror follow"
 msgstr "(M) lustrzane podążanie"
 
-#: src/localplayer.cpp:1973
+#: src/localplayer.cpp:1977
 msgid "(P) pet follow"
 msgstr "(P) niewolnicze podążanie"
 
-#: src/localplayer.cpp:1974
+#: src/localplayer.cpp:1978
 msgid "(?) unknown follow"
 msgstr "(?) nieznane podążanie"
 
-#: src/localplayer.cpp:1993 src/localplayer.cpp:1997 src/localplayer.cpp:2020
+#: src/localplayer.cpp:1997 src/localplayer.cpp:2001 src/localplayer.cpp:2024
 msgid "(?) attack"
 msgstr "(?) atak"
 
-#: src/localplayer.cpp:1994 src/localplayer.cpp:2016
+#: src/localplayer.cpp:1998 src/localplayer.cpp:2020
 msgid "(D) default attack"
 msgstr "(D) domyślny atak"
 
-#: src/localplayer.cpp:1995
+#: src/localplayer.cpp:1999
 msgid "(s) switch attack without shield"
 msgstr "(s) zdejmij tarczę do ataku"
 
-#: src/localplayer.cpp:1996
+#: src/localplayer.cpp:2000
 msgid "(S) switch attack with shield"
 msgstr "(S) załóż tarczę do ataku"
 
-#: src/localplayer.cpp:2017
+#: src/localplayer.cpp:2021
 msgid "(G) go and attack"
 msgstr "(G) idź, atakuj"
 
-#: src/localplayer.cpp:2018
+#: src/localplayer.cpp:2022
 msgid "(A) go, attack, pickup"
 msgstr "(A) idź, atakuj, podnieś"
 
-#: src/localplayer.cpp:2019
+#: src/localplayer.cpp:2023
 msgid "(d) without auto attack"
 msgstr "(d) bez autoataku"
 
-#: src/localplayer.cpp:2053
+#: src/localplayer.cpp:2057
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) podnoś w promieniu 1x1"
 
-#: src/localplayer.cpp:2054
+#: src/localplayer.cpp:2058
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) podnoś w promieniu 2x1"
 
-#: src/localplayer.cpp:2055
+#: src/localplayer.cpp:2059
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) podnoś w promieniu 2x3"
 
-#: src/localplayer.cpp:2056
+#: src/localplayer.cpp:2060
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) podnoś w promieniu 3x3"
 
-#: src/localplayer.cpp:2057
+#: src/localplayer.cpp:2061
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) podejdź i podnoś do 4 pól"
 
-#: src/localplayer.cpp:2058
+#: src/localplayer.cpp:2062
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) podejdź i podnoś do 8 pól"
 
-#: src/localplayer.cpp:2059
+#: src/localplayer.cpp:2063
 msgid "(A) go and pick up in max distance"
 msgstr "(A) podejdź i podnoś w zasięgu wzroku"
 
-#: src/localplayer.cpp:2060
+#: src/localplayer.cpp:2064
 msgid "(?) pick up"
 msgstr "(?) podnoś"
 
-#: src/localplayer.cpp:2073
+#: src/localplayer.cpp:2077
 msgid "(N) normal map view"
 msgstr "(N) normalny widok mapy"
 
-#: src/localplayer.cpp:2074
+#: src/localplayer.cpp:2078
 msgid "(D) debug map view"
 msgstr "(D) widok debug"
 
-#: src/localplayer.cpp:2075
+#: src/localplayer.cpp:2079
 msgid "(u) ultra map view"
 msgstr "(u) płaska mapa"
 
-#: src/localplayer.cpp:2076
+#: src/localplayer.cpp:2080
 msgid "(U) ultra map view 2"
 msgstr "(U) płaska mapa 2"
 
-#: src/localplayer.cpp:2077
+#: src/localplayer.cpp:2081
 msgid "(e) empty map view"
 msgstr "(e) mapa bez tekstur"
 
-#: src/localplayer.cpp:2078
+#: src/localplayer.cpp:2082
 msgid "(b) black & white map view"
 msgstr "(b) dwukolorowa mapa"
 
-#: src/localplayer.cpp:2097
+#: src/localplayer.cpp:2101
 msgid "(f) use #flar for magic attack"
 msgstr "(f) użyj #flar jako M.A."
 
-#: src/localplayer.cpp:2098
+#: src/localplayer.cpp:2102
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) użyj #chiza jako M.A."
 
-#: src/localplayer.cpp:2099
+#: src/localplayer.cpp:2103
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) użyj #ingrav jako M.A."
 
-#: src/localplayer.cpp:2100
+#: src/localplayer.cpp:2104
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) użyj #frillyar jako M.A."
 
-#: src/localplayer.cpp:2101
+#: src/localplayer.cpp:2105
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) użyj #upmarmu jako M.A."
 
-#: src/localplayer.cpp:2102
+#: src/localplayer.cpp:2106
 msgid "(?) magic attack"
 msgstr "(?) magiczny atak"
 
-#: src/localplayer.cpp:2121
+#: src/localplayer.cpp:2125
 msgid "(a) attack all players"
 msgstr "(a) atakuj wszystkich graczy"
 
-#: src/localplayer.cpp:2122
+#: src/localplayer.cpp:2126
 msgid "(f) attack not friends"
 msgstr "(f) nie atakuj przyjaciół"
 
-#: src/localplayer.cpp:2123
+#: src/localplayer.cpp:2127
 msgid "(b) attack bad relations"
 msgstr "(b) atakuj nielubianych"
 
-#: src/localplayer.cpp:2124
+#: src/localplayer.cpp:2128
 msgid "(d) dont attack players"
 msgstr "(d) nie atakuj nikogo"
 
-#: src/localplayer.cpp:2125
+#: src/localplayer.cpp:2129
 msgid "(?) pvp attack"
 msgstr "(?) atak PvP"
 
-#: src/localplayer.cpp:2144
+#: src/localplayer.cpp:2148
 msgid "(D) default imitation"
 msgstr "(D) domyślna imitacja"
 
-#: src/localplayer.cpp:2145
+#: src/localplayer.cpp:2149
 msgid "(O) outfits imitation"
 msgstr "(O) Imituj strój"
 
-#: src/localplayer.cpp:2146
+#: src/localplayer.cpp:2150
 msgid "(?) imitation"
 msgstr "(?) imitacja"
 
-#: src/localplayer.cpp:2174
+#: src/localplayer.cpp:2178
 msgid "Away"
 msgstr "AFK"
 
-#: src/localplayer.cpp:2193
+#: src/localplayer.cpp:2197
 msgid "(O) on keyboard"
 msgstr "(O) przy klawiaturze"
 
-#: src/localplayer.cpp:2194
+#: src/localplayer.cpp:2198
 msgid "(A) away"
 msgstr "(A) AFK"
 
-#: src/localplayer.cpp:2195 src/localplayer.cpp:2210
+#: src/localplayer.cpp:2199 src/localplayer.cpp:2214
 msgid "(?) away"
 msgstr "(?) stan"
 
-#: src/localplayer.cpp:2208
+#: src/localplayer.cpp:2212
 msgid "(G) game camera mode"
 msgstr "(G) tryb kamery gry"
 
-#: src/localplayer.cpp:2209
+#: src/localplayer.cpp:2213
 msgid "(F) free camera mode"
 msgstr "(F) wolny tryb kamery"
 
-#: src/localplayer.cpp:2234
+#: src/localplayer.cpp:2238
 msgid "Game modifiers are enabled"
 msgstr "Modyfikatory gry włączone."
 
-#: src/localplayer.cpp:2235
+#: src/localplayer.cpp:2239
 msgid "Game modifiers are disabled"
 msgstr "Modyfikatory gry wyłączone."
 
-#: src/localplayer.cpp:2236
+#: src/localplayer.cpp:2240
 msgid "Game modifiers are unknown"
 msgstr "Modyfikatory gry nieznane"
 
-#: src/localplayer.cpp:3752
+#: src/localplayer.cpp:3756
 msgid "Follow: "
 msgstr "Podążasz za: "
 
-#: src/localplayer.cpp:3754 src/localplayer.cpp:3769
+#: src/localplayer.cpp:3758 src/localplayer.cpp:3773
 msgid "Follow canceled"
 msgstr "Podążanie anulowane."
 
-#: src/localplayer.cpp:3761
+#: src/localplayer.cpp:3765
 msgid "Imitation: "
 msgstr "Imitujesz: "
 
-#: src/localplayer.cpp:3763 src/localplayer.cpp:3771
+#: src/localplayer.cpp:3767 src/localplayer.cpp:3775
 msgid "Imitation canceled"
 msgstr "Imitacja anulowana"
 
-#: src/localplayer.cpp:4119
+#: src/localplayer.cpp:4123
 msgid "You see "
 msgstr "Widzisz "
 
-#: src/main.cpp:47
+#: src/main.cpp:49
 msgid "manaplus [options] [manaplus-file]"
 msgstr "manaplus [opcje] [manaplus-file]"
 
-#: src/main.cpp:48
+#: src/main.cpp:50
 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr "[manaplus-file] : Plik manaplus jest plikiem XML (.manaplus)"
 
-#: src/main.cpp:50
+#: src/main.cpp:52
 msgid "                  used to set custom parameters"
 msgstr "                  używane do wprowadzania własnych parametrów"
 
-#: src/main.cpp:51
+#: src/main.cpp:53
 msgid "                  to the manaplus client."
 msgstr "                  do klienta manaplus."
 
-#: src/main.cpp:53
+#: src/main.cpp:55
 msgid "Options:"
 msgstr "Opcje:"
 
-#: src/main.cpp:54
+#: src/main.cpp:56
 msgid "  -l --log-file       : Log file to use"
 msgstr "  -l --log-file       : Używany plik logów"
 
-#: src/main.cpp:55
+#: src/main.cpp:57
 msgid "  -L --chat-log-dir   : Chat log dir to use"
 msgstr "  -L --chat-log-dir   : Używany katalog logów"
 
-#: src/main.cpp:56
+#: src/main.cpp:58
 msgid "  -v --version        : Display the version"
 msgstr "  -v --version        : Pokaż wersję"
 
-#: src/main.cpp:57
+#: src/main.cpp:59
 msgid "  -h --help           : Display this help"
 msgstr "  -h --help           : Pokaż tą pomoc"
 
-#: src/main.cpp:58
+#: src/main.cpp:60
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr "  -C --config-dir     : Katalog konfiguracyjny"
 
-#: src/main.cpp:59
+#: src/main.cpp:61
 msgid "  -U --username       : Login with this username"
 msgstr "  -U --username       : Zaloguj się tym loginem"
 
-#: src/main.cpp:60
+#: src/main.cpp:62
 msgid "  -P --password       : Login with this password"
 msgstr "  -P --password       : Zaloguj się tym hasłem"
 
-#: src/main.cpp:61
+#: src/main.cpp:63
 msgid "  -c --character      : Login with this character"
 msgstr "  -c --character      : Zaloguj się tą postacią"
 
-#: src/main.cpp:62
+#: src/main.cpp:64
 msgid "  -s --server         : Login server name or IP"
 msgstr "  -s --server         : Nazwa serwera lub IP"
 
-#: src/main.cpp:63
+#: src/main.cpp:65
 msgid "  -p --port           : Login server port"
 msgstr "  -p --port           : Port serwera"
 
-#: src/main.cpp:64
+#: src/main.cpp:66
 msgid "     --update-host    : Use this update host"
 msgstr "     --update-host    : Użyj tego serwera aktualizacji"
 
-#: src/main.cpp:65
+#: src/main.cpp:67
 msgid "  -D --default        : Choose default character server and character"
 msgstr "  -D --default        : Wybierz domyślny serwer i postać"
 
-#: src/main.cpp:67
+#: src/main.cpp:69
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr "  -u --skip-update    : Omiń aktualizację"
 
-#: src/main.cpp:68
+#: src/main.cpp:70
 msgid "  -d --data           : Directory to load game data from"
 msgstr "  -d --data           : Katalog z danymi gry"
 
-#: src/main.cpp:70
+#: src/main.cpp:72
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr "  -L --localdata-dir  : Katalog z lokalnymi danymi"
 
-#: src/main.cpp:72
+#: src/main.cpp:74
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr "     --screenshot-dir : Katalog ze zrzutami ekranu"
 
-#: src/main.cpp:73
+#: src/main.cpp:75
 msgid "     --safemode       : Start game in safe mode"
 msgstr "     --safemode       : Rozpocznij grę w trybie bezpieczeństwa"
 
-#: src/main.cpp:74
+#: src/main.cpp:76
 msgid "  -T --tests          : Start testing drivers and auto configuring"
-msgstr ""
+msgstr "  -T --test          :Rozpocznij test sterowników i autokonfigurację"
 
-#: src/main.cpp:77
+#: src/main.cpp:79
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr "     --no-opengl      : Wyłącz OpenGL w tej sesji"
 
@@ -5650,3 +5646,6 @@ msgstr "MP %+d"
 #: src/resources/itemdb.cpp:169
 msgid "Unknown item"
 msgstr "Nieznany przedmiot"
+
+#~ msgid "> Next"
+#~ msgstr ">Dalej"
diff --git a/po/pt.po b/po/pt.po
index 60b688895..0a207c1d9 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-01-05 23:31+0300\n"
+"POT-Creation-Date: 2012-01-07 20:36+0300\n"
 "PO-Revision-Date: 2011-12-08 14:10+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Portuguese (http://www.transifex.net/projects/p/manaplus/team/"
@@ -307,11 +307,11 @@ msgstr "Criado:"
 msgid "Deleted:"
 msgstr "Deletado:"
 
-#: src/commandhandler.cpp:1180 src/commandhandler.cpp:1187
+#: src/commandhandler.cpp:1226 src/commandhandler.cpp:1233
 msgid "Resource images:"
 msgstr "Recursos de imagens:"
 
-#: src/commandhandler.cpp:1182 src/commandhandler.cpp:1189
+#: src/commandhandler.cpp:1228 src/commandhandler.cpp:1235
 msgid "Resource orphaned images:"
 msgstr "Recursos de imagens orfãos:"
 
@@ -1269,10 +1269,6 @@ msgstr "NPC"
 msgid "Clear"
 msgstr "Limpar"
 
-#: src/gui/npcdialog.cpp:223
-msgid "> Next"
-msgstr "> Próximo"
-
 #: src/gui/npcpostdialog.cpp:48
 msgid "To:"
 msgstr "Para:"
@@ -3986,425 +3982,425 @@ msgstr "Você foi morto por "
 msgid "Tried to pick up nonexistent item."
 msgstr "Você tentou pegar um item não existente."
 
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1441
 msgid "Item is too heavy."
 msgstr "Este item é muito pesado."
 
-#: src/localplayer.cpp:1442
+#: src/localplayer.cpp:1444
 msgid "Item is too far away."
 msgstr "Item está muito longe"
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1447
 msgid "Inventory is full."
 msgstr "O inventário está cheio."
 
-#: src/localplayer.cpp:1446
+#: src/localplayer.cpp:1450
 msgid "Stack is too big."
 msgstr "Esta pilha é muito grande."
 
-#: src/localplayer.cpp:1449
+#: src/localplayer.cpp:1453
 msgid "Item belongs to someone else."
 msgstr "Este item pertence a outra pessoa."
 
-#: src/localplayer.cpp:1452
+#: src/localplayer.cpp:1456
 msgid "Unknown problem picking up item."
 msgstr "Problema desconhecido ao tentar pegar item."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1476
+#: src/localplayer.cpp:1480
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "Você pegou %d [@@%d|%s@@]."
 msgstr[1] "Você pegou %d [@@%d|%s@@]."
 
-#: src/localplayer.cpp:1893
+#: src/localplayer.cpp:1897
 msgid "(D) default moves"
 msgstr "(D) movimentos padrão"
 
-#: src/localplayer.cpp:1894
+#: src/localplayer.cpp:1898
 msgid "(I) invert moves"
 msgstr "(l) inserir movimentos"
 
-#: src/localplayer.cpp:1895
+#: src/localplayer.cpp:1899
 msgid "(c) moves with some crazy moves"
 msgstr "(c) Alguns movimentos loucos"
 
-#: src/localplayer.cpp:1896
+#: src/localplayer.cpp:1900
 msgid "(C) moves with crazy moves"
 msgstr "(C) Movimentos loucos"
 
-#: src/localplayer.cpp:1897
+#: src/localplayer.cpp:1901
 msgid "(d) double normal + crazy"
 msgstr "(d) dobro normal + louco"
 
-#: src/localplayer.cpp:1898
+#: src/localplayer.cpp:1902
 msgid "(?) unknown move"
 msgstr ""
 
-#: src/localplayer.cpp:1920
+#: src/localplayer.cpp:1924
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr ""
 
-#: src/localplayer.cpp:1925
+#: src/localplayer.cpp:1929
 msgid "(a) custom crazy move"
 msgstr "(a) movimentos loucos customizados"
 
-#: src/localplayer.cpp:1929
+#: src/localplayer.cpp:1933
 msgid "(?) crazy move"
 msgstr "(?) movimentos loucos"
 
-#: src/localplayer.cpp:1943
+#: src/localplayer.cpp:1947
 msgid "(0) default moves to target"
 msgstr "(0) Mover ao alvo padrão"
 
-#: src/localplayer.cpp:1944
+#: src/localplayer.cpp:1948
 msgid "(1) moves to target in distance 1"
 msgstr "(1) Mover ao alvo com distância 1"
 
-#: src/localplayer.cpp:1945
+#: src/localplayer.cpp:1949
 msgid "(2) moves to target in distance 2"
 msgstr "(2) mover ao alvo em distância 2"
 
-#: src/localplayer.cpp:1946
+#: src/localplayer.cpp:1950
 msgid "(3) moves to target in distance 3"
 msgstr "(3) Mover ao alvo com distância 3"
 
-#: src/localplayer.cpp:1947
+#: src/localplayer.cpp:1951
 msgid "(5) moves to target in distance 5"
 msgstr "(5) Mover ao alvo com distância 5"
 
-#: src/localplayer.cpp:1948
+#: src/localplayer.cpp:1952
 msgid "(7) moves to target in distance 7"
 msgstr "(7) Mover ao alvo com distância 7"
 
-#: src/localplayer.cpp:1949
+#: src/localplayer.cpp:1953
 msgid "(A) moves to target in attack range"
 msgstr "(A)  Mover ao alvo com a distância de ataque"
 
-#: src/localplayer.cpp:1950
+#: src/localplayer.cpp:1954
 msgid "(a) archer attack range"
 msgstr "(a) Alcance de arqueiros"
 
-#: src/localplayer.cpp:1951
+#: src/localplayer.cpp:1955
 msgid "(?) move to target"
 msgstr "(?)  Mover ao alvo"
 
-#: src/localplayer.cpp:1970
+#: src/localplayer.cpp:1974
 msgid "(D) default follow"
 msgstr "(D) Seguir em modo padrão"
 
-#: src/localplayer.cpp:1971
+#: src/localplayer.cpp:1975
 msgid "(R) relative follow"
 msgstr "(R) Seguir em modo relativo"
 
-#: src/localplayer.cpp:1972
+#: src/localplayer.cpp:1976
 msgid "(M) mirror follow"
 msgstr "(M) Seguir em modo espelhado"
 
-#: src/localplayer.cpp:1973
+#: src/localplayer.cpp:1977
 msgid "(P) pet follow"
 msgstr "(P) Seguir em modo animal de extimação"
 
-#: src/localplayer.cpp:1974
+#: src/localplayer.cpp:1978
 msgid "(?) unknown follow"
 msgstr "(?) Seguir em modo desconhecido"
 
-#: src/localplayer.cpp:1993 src/localplayer.cpp:1997 src/localplayer.cpp:2020
+#: src/localplayer.cpp:1997 src/localplayer.cpp:2001 src/localplayer.cpp:2024
 msgid "(?) attack"
 msgstr "(?) Ataque"
 
-#: src/localplayer.cpp:1994 src/localplayer.cpp:2016
+#: src/localplayer.cpp:1998 src/localplayer.cpp:2020
 msgid "(D) default attack"
 msgstr "(D) Ataque padrão"
 
-#: src/localplayer.cpp:1995
+#: src/localplayer.cpp:1999
 msgid "(s) switch attack without shield"
 msgstr "(s) Trocar ataque sem escudo"
 
-#: src/localplayer.cpp:1996
+#: src/localplayer.cpp:2000
 msgid "(S) switch attack with shield"
 msgstr "(S) Trocar ataque com escudo"
 
-#: src/localplayer.cpp:2017
+#: src/localplayer.cpp:2021
 msgid "(G) go and attack"
 msgstr "(G) Ir e atacar"
 
-#: src/localplayer.cpp:2018
+#: src/localplayer.cpp:2022
 msgid "(A) go, attack, pickup"
 msgstr "(A) Ir, atacar, pegar"
 
-#: src/localplayer.cpp:2019
+#: src/localplayer.cpp:2023
 msgid "(d) without auto attack"
 msgstr "(d) sem auto ataque"
 
-#: src/localplayer.cpp:2053
+#: src/localplayer.cpp:2057
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) Pequeno pegar 1x1 celulas"
 
-#: src/localplayer.cpp:2054
+#: src/localplayer.cpp:2058
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) Pegar padrão 2x1 células"
 
-#: src/localplayer.cpp:2055
+#: src/localplayer.cpp:2059
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) Pegar em frente 2x3 células"
 
-#: src/localplayer.cpp:2056
+#: src/localplayer.cpp:2060
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) Pegar 3x3 células"
 
-#: src/localplayer.cpp:2057
+#: src/localplayer.cpp:2061
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) Ir e pegar em distância 4"
 
-#: src/localplayer.cpp:2058
+#: src/localplayer.cpp:2062
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) Ir e pegar em distância 8"
 
-#: src/localplayer.cpp:2059
+#: src/localplayer.cpp:2063
 msgid "(A) go and pick up in max distance"
 msgstr "(A) Ir e pegar em distância mâxima"
 
-#: src/localplayer.cpp:2060
+#: src/localplayer.cpp:2064
 msgid "(?) pick up"
 msgstr "(?) Pegar item"
 
-#: src/localplayer.cpp:2073
+#: src/localplayer.cpp:2077
 msgid "(N) normal map view"
 msgstr "(N) Visualizardor de mapa normal"
 
-#: src/localplayer.cpp:2074
+#: src/localplayer.cpp:2078
 msgid "(D) debug map view"
 msgstr "(D) Visualizador de mapa depurador"
 
-#: src/localplayer.cpp:2075
+#: src/localplayer.cpp:2079
 msgid "(u) ultra map view"
 msgstr "(u) Visualizador de mapa ultra"
 
-#: src/localplayer.cpp:2076
+#: src/localplayer.cpp:2080
 msgid "(U) ultra map view 2"
 msgstr "(U) Visualizador de mapa ultra 2"
 
-#: src/localplayer.cpp:2077
+#: src/localplayer.cpp:2081
 msgid "(e) empty map view"
 msgstr "(e) Visualizador de mapa vazio"
 
-#: src/localplayer.cpp:2078
+#: src/localplayer.cpp:2082
 msgid "(b) black & white map view"
 msgstr "(b) Visualizador de mapa preto e branco"
 
-#: src/localplayer.cpp:2097
+#: src/localplayer.cpp:2101
 msgid "(f) use #flar for magic attack"
 msgstr "(f) Usar #flar para feitiço de ataque"
 
-#: src/localplayer.cpp:2098
+#: src/localplayer.cpp:2102
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) Usar #chiza para feitiço de ataque"
 
-#: src/localplayer.cpp:2099
+#: src/localplayer.cpp:2103
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) Usar #ingrav para feitiço de ataque"
 
-#: src/localplayer.cpp:2100
+#: src/localplayer.cpp:2104
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) Usar #frillyar para feitiço de ataque"
 
-#: src/localplayer.cpp:2101
+#: src/localplayer.cpp:2105
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) Usar #upmarmu para feitiço de ataque"
 
-#: src/localplayer.cpp:2102
+#: src/localplayer.cpp:2106
 msgid "(?) magic attack"
 msgstr "(?) Feitiço de ataque"
 
-#: src/localplayer.cpp:2121
+#: src/localplayer.cpp:2125
 msgid "(a) attack all players"
 msgstr ""
 
-#: src/localplayer.cpp:2122
+#: src/localplayer.cpp:2126
 msgid "(f) attack not friends"
 msgstr ""
 
-#: src/localplayer.cpp:2123
+#: src/localplayer.cpp:2127
 msgid "(b) attack bad relations"
 msgstr ""
 
-#: src/localplayer.cpp:2124
+#: src/localplayer.cpp:2128
 msgid "(d) dont attack players"
 msgstr ""
 
-#: src/localplayer.cpp:2125
+#: src/localplayer.cpp:2129
 msgid "(?) pvp attack"
 msgstr ""
 
-#: src/localplayer.cpp:2144
+#: src/localplayer.cpp:2148
 msgid "(D) default imitation"
 msgstr "(D) Mímica padrão"
 
-#: src/localplayer.cpp:2145
+#: src/localplayer.cpp:2149
 msgid "(O) outfits imitation"
 msgstr "(O) Mímica de roupas"
 
-#: src/localplayer.cpp:2146
+#: src/localplayer.cpp:2150
 msgid "(?) imitation"
 msgstr "(?) Mímica"
 
-#: src/localplayer.cpp:2174
+#: src/localplayer.cpp:2178
 msgid "Away"
 msgstr "Indisponivel "
 
-#: src/localplayer.cpp:2193
+#: src/localplayer.cpp:2197
 msgid "(O) on keyboard"
 msgstr "(O) No teclado"
 
-#: src/localplayer.cpp:2194
+#: src/localplayer.cpp:2198
 msgid "(A) away"
 msgstr "(A) Ausente"
 
-#: src/localplayer.cpp:2195 src/localplayer.cpp:2210
+#: src/localplayer.cpp:2199 src/localplayer.cpp:2214
 msgid "(?) away"
 msgstr "(?) Ausente"
 
-#: src/localplayer.cpp:2208
+#: src/localplayer.cpp:2212
 msgid "(G) game camera mode"
 msgstr "(G) Modo de jogo câmera"
 
-#: src/localplayer.cpp:2209
+#: src/localplayer.cpp:2213
 msgid "(F) free camera mode"
 msgstr "(F) Modo de jogo câmera livre"
 
-#: src/localplayer.cpp:2234
+#: src/localplayer.cpp:2238
 msgid "Game modifiers are enabled"
 msgstr "Modificadores de jogo ativados"
 
-#: src/localplayer.cpp:2235
+#: src/localplayer.cpp:2239
 msgid "Game modifiers are disabled"
 msgstr "Modificadores de jogo desativados"
 
-#: src/localplayer.cpp:2236
+#: src/localplayer.cpp:2240
 msgid "Game modifiers are unknown"
 msgstr ""
 
-#: src/localplayer.cpp:3752
+#: src/localplayer.cpp:3756
 msgid "Follow: "
 msgstr "Seguindo:"
 
-#: src/localplayer.cpp:3754 src/localplayer.cpp:3769
+#: src/localplayer.cpp:3758 src/localplayer.cpp:3773
 msgid "Follow canceled"
 msgstr "Seguir cancelado"
 
-#: src/localplayer.cpp:3761
+#: src/localplayer.cpp:3765
 msgid "Imitation: "
 msgstr "Imitando:"
 
-#: src/localplayer.cpp:3763 src/localplayer.cpp:3771
+#: src/localplayer.cpp:3767 src/localplayer.cpp:3775
 msgid "Imitation canceled"
 msgstr "Imitação cancelada"
 
-#: src/localplayer.cpp:4119
+#: src/localplayer.cpp:4123
 msgid "You see "
 msgstr "Você vê "
 
-#: src/main.cpp:47
+#: src/main.cpp:49
 msgid "manaplus [options] [manaplus-file]"
 msgstr "manaplus [opções] [manaplus-arquivo]"
 
-#: src/main.cpp:48
+#: src/main.cpp:50
 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr "[manaplus-arquivo] : O arquivo manaplus é um XML (.manaplus)"
 
-#: src/main.cpp:50
+#: src/main.cpp:52
 msgid "                  used to set custom parameters"
 msgstr "usado para definir parâmetros customizados"
 
-#: src/main.cpp:51
+#: src/main.cpp:53
 msgid "                  to the manaplus client."
 msgstr "para o cliente manaplus. "
 
-#: src/main.cpp:53
+#: src/main.cpp:55
 msgid "Options:"
 msgstr "Opções:"
 
-#: src/main.cpp:54
+#: src/main.cpp:56
 msgid "  -l --log-file       : Log file to use"
 msgstr "  -l --log-file       : Usar arquivo de log"
 
-#: src/main.cpp:55
+#: src/main.cpp:57
 msgid "  -L --chat-log-dir   : Chat log dir to use"
 msgstr "  -L --chat-log-dir   : Diretório para log de chat "
 
-#: src/main.cpp:56
+#: src/main.cpp:58
 msgid "  -v --version        : Display the version"
 msgstr "  -v --version        :  Exibe a versão"
 
-#: src/main.cpp:57
+#: src/main.cpp:59
 msgid "  -h --help           : Display this help"
 msgstr "  -h --help           : Exibe esta ajuda"
 
-#: src/main.cpp:58
+#: src/main.cpp:60
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr "  -C --config-dir     : Diretório de configuração a ser usado"
 
-#: src/main.cpp:59
+#: src/main.cpp:61
 msgid "  -U --username       : Login with this username"
 msgstr "  -U --username       : Efetua login com este usuário"
 
-#: src/main.cpp:60
+#: src/main.cpp:62
 msgid "  -P --password       : Login with this password"
 msgstr "  -P --password       :Efetua login com esta senha"
 
-#: src/main.cpp:61
+#: src/main.cpp:63
 msgid "  -c --character      : Login with this character"
 msgstr "  -c --character      :Efetua login com este personagem"
 
-#: src/main.cpp:62
+#: src/main.cpp:64
 msgid "  -s --server         : Login server name or IP"
 msgstr "  -s --server         :  Nome ou IP do servidor de login"
 
-#: src/main.cpp:63
+#: src/main.cpp:65
 msgid "  -p --port           : Login server port"
 msgstr "  -p --port           : Porta do servidor de login"
 
-#: src/main.cpp:64
+#: src/main.cpp:66
 msgid "     --update-host    : Use this update host"
 msgstr "     --update-host    : Usa este host de update"
 
-#: src/main.cpp:65
+#: src/main.cpp:67
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 "  -D --default        : Escolhe um personagem e um servidor de personagem "
 "padrão"
 
-#: src/main.cpp:67
+#: src/main.cpp:69
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr "  -u --skip-update    : Não faz downloads de atualização"
 
-#: src/main.cpp:68
+#: src/main.cpp:70
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 "  -d --data           : Pasta de onde os dados do jogo vão ser carregados"
 
-#: src/main.cpp:70
+#: src/main.cpp:72
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 "  -L --localdata-dir  : Diretório a ser usado como pasta de dados local"
 
-#: src/main.cpp:72
+#: src/main.cpp:74
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr "     --screenshot-dir : Diretório onde serão salvas as screenshots"
 
-#: src/main.cpp:73
+#: src/main.cpp:75
 msgid "     --safemode       : Start game in safe mode"
 msgstr "     --safemode       : Inicia o jogo em modo seguro"
 
-#: src/main.cpp:74
+#: src/main.cpp:76
 msgid "  -T --tests          : Start testing drivers and auto configuring"
 msgstr ""
 
-#: src/main.cpp:77
+#: src/main.cpp:79
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr "     --no-opengl      :  Desabilita OpenGL nesta sessão"
 
@@ -5645,6 +5641,9 @@ msgstr "MP %+d"
 msgid "Unknown item"
 msgstr "Item desconhecido"
 
+#~ msgid "> Next"
+#~ msgstr "> Próximo"
+
 #~ msgid "Waiting for server"
 #~ msgstr "Aguarde"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 85dda848d..4bb4425b0 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -3,7 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Translators:
-#   <alasmirt@gmail.com>, 2011.
+#   <alasmirt@gmail.com>, 2011, 2012.
 # alastrim <alasmirt@gmail.com>, 2011.
 # Andrei Karas <akaras@inbox.ru>, 2011.
 #   <freya.df@gmail.com>, 2011.
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-01-05 23:31+0300\n"
-"PO-Revision-Date: 2011-12-08 14:10+0000\n"
-"Last-Translator: akaras <akaras@inbox.ru>\n"
+"POT-Creation-Date: 2012-01-07 20:36+0300\n"
+"PO-Revision-Date: 2012-01-06 14:53+0000\n"
+"Last-Translator: alastrim <alasmirt@gmail.com>\n"
 "Language-Team: Portuguese (Brazilian) (http://www.transifex.net/projects/p/"
 "manaplus/team/pt_BR/)\n"
 "Language: pt_BR\n"
@@ -239,7 +239,7 @@ msgstr "Na Lista Negra"
 
 #: src/commandhandler.cpp:596
 msgid "enemy"
-msgstr ""
+msgstr "inimigo"
 
 #: src/commandhandler.cpp:611
 msgid "Player already erased!"
@@ -309,11 +309,11 @@ msgstr "Criado:"
 msgid "Deleted:"
 msgstr "Deletado:"
 
-#: src/commandhandler.cpp:1180 src/commandhandler.cpp:1187
+#: src/commandhandler.cpp:1226 src/commandhandler.cpp:1233
 msgid "Resource images:"
 msgstr "Recursos de imagem:"
 
-#: src/commandhandler.cpp:1182 src/commandhandler.cpp:1189
+#: src/commandhandler.cpp:1228 src/commandhandler.cpp:1235
 msgid "Resource orphaned images:"
 msgstr "Recurso de imagem orfão:"
 
@@ -1252,7 +1252,7 @@ msgstr "Precisa"
 
 #: src/gui/npcdialog.cpp:51
 msgid "Stop waiting"
-msgstr ""
+msgstr "Parar de esperar"
 
 #: src/gui/npcdialog.cpp:52
 msgid "Next"
@@ -1271,10 +1271,6 @@ msgstr "NPC"
 msgid "Clear"
 msgstr "Limpar"
 
-#: src/gui/npcdialog.cpp:223
-msgid "> Next"
-msgstr "> Próximo"
-
 #: src/gui/npcpostdialog.cpp:48
 msgid "To:"
 msgstr "Para:"
@@ -1348,7 +1344,7 @@ msgstr "Lista Negra"
 #: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:694
 #: src/gui/popupmenu.cpp:702
 msgid "Set as enemy"
-msgstr ""
+msgstr "Definir como inimigo"
 
 #: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
 #: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:177
@@ -1503,9 +1499,8 @@ msgid "Warp"
 msgstr "Urdidura"
 
 #: src/gui/popupmenu.cpp:589
-#, fuzzy
 msgid "Clear outfit"
-msgstr "Vestir roupas"
+msgstr "Limpar conjunto de roupas"
 
 #: src/gui/popupmenu.cpp:608 src/gui/windowmenu.cpp:96
 msgid "Spells"
@@ -1549,7 +1544,7 @@ msgstr "Sair"
 
 #: src/gui/popupmenu.cpp:654
 msgid "Copy to clipboard"
-msgstr ""
+msgstr "Copiar para a área de transferência"
 
 #: src/gui/popupmenu.cpp:849
 msgid "Change guild position"
@@ -1982,7 +1977,7 @@ msgstr "Habilitar joystick"
 
 #: src/gui/setup_joystick.cpp:75
 msgid "Use joystick if client window inactive"
-msgstr ""
+msgstr "Usar joystick se a janela do cliente estiver inativa"
 
 #: src/gui/setup_joystick.cpp:78
 msgid "Joystick"
@@ -1994,7 +1989,7 @@ msgstr "Parar"
 
 #: src/gui/setup_joystick.cpp:149
 msgid "Rotate the stick and dont press buttons"
-msgstr ""
+msgstr "Gire o bastão e não aperte os botões"
 
 #: src/gui/setup_keyboard.cpp:80
 msgid "Keyboard"
@@ -2178,7 +2173,7 @@ msgstr "Habilitar Analisador de bot"
 
 #: src/gui/setup_other.cpp:174
 msgid "Enable buggy servers protection (do not disable)"
-msgstr ""
+msgstr "Habilitar proteção para servidores com bugs (não desabilitar)"
 
 #: src/gui/setup_other.cpp:178
 msgid "Enable debug log"
@@ -2318,7 +2313,7 @@ msgstr "Na Lista Negra "
 
 #: src/gui/setup_relations.cpp:76
 msgid "Enemy"
-msgstr ""
+msgstr "Inimigo"
 
 #: src/gui/setup_relations.cpp:240
 msgid "Allow trading"
@@ -2366,59 +2361,59 @@ msgstr "Enorme (15)"
 
 #: src/gui/setup_theme.cpp:146
 msgid "Chinese (China)"
-msgstr ""
+msgstr "Chinês(China)"
 
 #: src/gui/setup_theme.cpp:147
 msgid "Czech"
-msgstr ""
+msgstr "Tcheco"
 
 #: src/gui/setup_theme.cpp:148
 msgid "English"
-msgstr ""
+msgstr "Inglês"
 
 #: src/gui/setup_theme.cpp:149
 msgid "Finnish"
-msgstr ""
+msgstr "Finlandês"
 
 #: src/gui/setup_theme.cpp:150
 msgid "French"
-msgstr ""
+msgstr "Francês"
 
 #: src/gui/setup_theme.cpp:151
 msgid "German"
-msgstr ""
+msgstr "Alemão"
 
 #: src/gui/setup_theme.cpp:152
 msgid "Indonesian"
-msgstr ""
+msgstr "Indonésio"
 
 #: src/gui/setup_theme.cpp:153
 msgid "Polish"
-msgstr ""
+msgstr "Polonês"
 
 #: src/gui/setup_theme.cpp:154
 msgid "Japanese"
-msgstr ""
+msgstr "Japonês"
 
 #: src/gui/setup_theme.cpp:155
 msgid "Dutch (Belgium/Flemish)"
-msgstr ""
+msgstr "Holandês"
 
 #: src/gui/setup_theme.cpp:156
 msgid "Portuguese"
-msgstr ""
+msgstr "Português"
 
 #: src/gui/setup_theme.cpp:157
 msgid "Portuguese (Brazilian)"
-msgstr ""
+msgstr "Português (Brasileiro)"
 
 #: src/gui/setup_theme.cpp:158
 msgid "Russian"
-msgstr ""
+msgstr "Russo"
 
 #: src/gui/setup_theme.cpp:159
 msgid "Spanish (Castilian)"
-msgstr ""
+msgstr "Espanhol"
 
 #: src/gui/setup_theme.cpp:191
 msgid "Theme"
@@ -2430,7 +2425,7 @@ msgstr "Tema"
 
 #: src/gui/setup_theme.cpp:194
 msgid "Language"
-msgstr ""
+msgstr "Linguagem"
 
 #: src/gui/setup_theme.cpp:195
 msgid "Main Font"
@@ -3925,7 +3920,7 @@ msgstr "Trocar feitiço de ataque"
 
 #: src/keyboardconfig.cpp:329
 msgid "Switch pvp attack"
-msgstr ""
+msgstr "Mudar ataque em pvp"
 
 #: src/keyboardconfig.cpp:330
 msgid "Change move type"
@@ -3988,425 +3983,425 @@ msgstr "Você foi morto por "
 msgid "Tried to pick up nonexistent item."
 msgstr "Você tentou pegar um item não existente."
 
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1441
 msgid "Item is too heavy."
 msgstr "Este item é muito pesado."
 
-#: src/localplayer.cpp:1442
+#: src/localplayer.cpp:1444
 msgid "Item is too far away."
 msgstr "Item está muito longe"
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1447
 msgid "Inventory is full."
 msgstr "O inventário está cheio."
 
-#: src/localplayer.cpp:1446
+#: src/localplayer.cpp:1450
 msgid "Stack is too big."
 msgstr "Esta pilha é muito grande."
 
-#: src/localplayer.cpp:1449
+#: src/localplayer.cpp:1453
 msgid "Item belongs to someone else."
 msgstr "Este item pertence a outra pessoa."
 
-#: src/localplayer.cpp:1452
+#: src/localplayer.cpp:1456
 msgid "Unknown problem picking up item."
 msgstr "Problema desconhecido ao tentar pegar item."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1476
+#: src/localplayer.cpp:1480
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "Você pegou %d [@@%d|%s@@]."
 msgstr[1] "Você pegou %d [@@%d|%s@@]."
 
-#: src/localplayer.cpp:1893
+#: src/localplayer.cpp:1897
 msgid "(D) default moves"
 msgstr "(D) movimentos padrão"
 
-#: src/localplayer.cpp:1894
+#: src/localplayer.cpp:1898
 msgid "(I) invert moves"
 msgstr "(l) inserir movimentos"
 
-#: src/localplayer.cpp:1895
+#: src/localplayer.cpp:1899
 msgid "(c) moves with some crazy moves"
 msgstr "(c) Alguns movimentos loucos"
 
-#: src/localplayer.cpp:1896
+#: src/localplayer.cpp:1900
 msgid "(C) moves with crazy moves"
 msgstr "(C) Movimentos loucos"
 
-#: src/localplayer.cpp:1897
+#: src/localplayer.cpp:1901
 msgid "(d) double normal + crazy"
 msgstr "(d) dobro normal + louco"
 
-#: src/localplayer.cpp:1898
+#: src/localplayer.cpp:1902
 msgid "(?) unknown move"
-msgstr ""
+msgstr "(?) movimento desconhecido"
 
-#: src/localplayer.cpp:1920
+#: src/localplayer.cpp:1924
 #, c-format
 msgid "(%d) crazy move number %d"
-msgstr ""
+msgstr "(%d) movimento louco número %d"
 
-#: src/localplayer.cpp:1925
+#: src/localplayer.cpp:1929
 msgid "(a) custom crazy move"
 msgstr "(a) movimentos loucos customizados"
 
-#: src/localplayer.cpp:1929
+#: src/localplayer.cpp:1933
 msgid "(?) crazy move"
 msgstr "(?) Movimentos loucos"
 
-#: src/localplayer.cpp:1943
+#: src/localplayer.cpp:1947
 msgid "(0) default moves to target"
 msgstr "(0) Mover ao alvo padrão"
 
-#: src/localplayer.cpp:1944
+#: src/localplayer.cpp:1948
 msgid "(1) moves to target in distance 1"
 msgstr "(1) Mover ao alvo com distância 1"
 
-#: src/localplayer.cpp:1945
+#: src/localplayer.cpp:1949
 msgid "(2) moves to target in distance 2"
 msgstr "(2) mover ao alvo em distância 2"
 
-#: src/localplayer.cpp:1946
+#: src/localplayer.cpp:1950
 msgid "(3) moves to target in distance 3"
 msgstr "(3) Mover ao alvo com distância 3"
 
-#: src/localplayer.cpp:1947
+#: src/localplayer.cpp:1951
 msgid "(5) moves to target in distance 5"
 msgstr "(5) Mover ao alvo com distância 5"
 
-#: src/localplayer.cpp:1948
+#: src/localplayer.cpp:1952
 msgid "(7) moves to target in distance 7"
 msgstr "(7) Mover ao alvo com distância 7"
 
-#: src/localplayer.cpp:1949
+#: src/localplayer.cpp:1953
 msgid "(A) moves to target in attack range"
 msgstr "(A)  Mover ao alvo com a distância de ataque"
 
-#: src/localplayer.cpp:1950
+#: src/localplayer.cpp:1954
 msgid "(a) archer attack range"
 msgstr "(a) Alcance ataque de arqueiro"
 
-#: src/localplayer.cpp:1951
+#: src/localplayer.cpp:1955
 msgid "(?) move to target"
 msgstr "(?) Mover ao alvo"
 
-#: src/localplayer.cpp:1970
+#: src/localplayer.cpp:1974
 msgid "(D) default follow"
 msgstr "(D) Seguir em modo padrão"
 
-#: src/localplayer.cpp:1971
+#: src/localplayer.cpp:1975
 msgid "(R) relative follow"
 msgstr "(R) Seguir em modo relativo"
 
-#: src/localplayer.cpp:1972
+#: src/localplayer.cpp:1976
 msgid "(M) mirror follow"
 msgstr "(M) Seguir em modo espelhado"
 
-#: src/localplayer.cpp:1973
+#: src/localplayer.cpp:1977
 msgid "(P) pet follow"
 msgstr "(P) Seguir em modo animal de extimação"
 
-#: src/localplayer.cpp:1974
+#: src/localplayer.cpp:1978
 msgid "(?) unknown follow"
 msgstr "(?) Seguir em modo desconhecido"
 
-#: src/localplayer.cpp:1993 src/localplayer.cpp:1997 src/localplayer.cpp:2020
+#: src/localplayer.cpp:1997 src/localplayer.cpp:2001 src/localplayer.cpp:2024
 msgid "(?) attack"
 msgstr "(?) Ataque"
 
-#: src/localplayer.cpp:1994 src/localplayer.cpp:2016
+#: src/localplayer.cpp:1998 src/localplayer.cpp:2020
 msgid "(D) default attack"
 msgstr "(D) Ataque padrão"
 
-#: src/localplayer.cpp:1995
+#: src/localplayer.cpp:1999
 msgid "(s) switch attack without shield"
 msgstr "(s) Trocar ataque sem escudo"
 
-#: src/localplayer.cpp:1996
+#: src/localplayer.cpp:2000
 msgid "(S) switch attack with shield"
 msgstr "(S) Trocar ataque com escudo"
 
-#: src/localplayer.cpp:2017
+#: src/localplayer.cpp:2021
 msgid "(G) go and attack"
 msgstr "(G) Ir e atacar"
 
-#: src/localplayer.cpp:2018
+#: src/localplayer.cpp:2022
 msgid "(A) go, attack, pickup"
 msgstr "(A) Ir, atacar, pegar"
 
-#: src/localplayer.cpp:2019
+#: src/localplayer.cpp:2023
 msgid "(d) without auto attack"
 msgstr "(d) sem auto ataque"
 
-#: src/localplayer.cpp:2053
+#: src/localplayer.cpp:2057
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) Pequeno pegar 1x1 celulas"
 
-#: src/localplayer.cpp:2054
+#: src/localplayer.cpp:2058
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) Pegar padrão 2x1 células"
 
-#: src/localplayer.cpp:2055
+#: src/localplayer.cpp:2059
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) Pegar em frente 2x3 células"
 
-#: src/localplayer.cpp:2056
+#: src/localplayer.cpp:2060
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) Pegar 3x3 células"
 
-#: src/localplayer.cpp:2057
+#: src/localplayer.cpp:2061
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) Ir e pegar em distância 4"
 
-#: src/localplayer.cpp:2058
+#: src/localplayer.cpp:2062
 msgid "(G) go and pick up in distance 8"
 msgstr "(G) Ir e pegar em distância 8"
 
-#: src/localplayer.cpp:2059
+#: src/localplayer.cpp:2063
 msgid "(A) go and pick up in max distance"
 msgstr "(A) Ir e pegar em distância mâxima"
 
-#: src/localplayer.cpp:2060
+#: src/localplayer.cpp:2064
 msgid "(?) pick up"
 msgstr "(?) Pegar item"
 
-#: src/localplayer.cpp:2073
+#: src/localplayer.cpp:2077
 msgid "(N) normal map view"
 msgstr "(N) Visualizardor de mapa normal"
 
-#: src/localplayer.cpp:2074
+#: src/localplayer.cpp:2078
 msgid "(D) debug map view"
 msgstr "(D) Visualizador de mapa depurador"
 
-#: src/localplayer.cpp:2075
+#: src/localplayer.cpp:2079
 msgid "(u) ultra map view"
 msgstr "(u) Visualizador de mapa ultra"
 
-#: src/localplayer.cpp:2076
+#: src/localplayer.cpp:2080
 msgid "(U) ultra map view 2"
 msgstr "(U) Visualizador de mapa ultra 2"
 
-#: src/localplayer.cpp:2077
+#: src/localplayer.cpp:2081
 msgid "(e) empty map view"
 msgstr "(e) Visualizador de mapa vazio"
 
-#: src/localplayer.cpp:2078
+#: src/localplayer.cpp:2082
 msgid "(b) black & white map view"
 msgstr "(b) Visualizador de mapa preto e branco"
 
-#: src/localplayer.cpp:2097
+#: src/localplayer.cpp:2101
 msgid "(f) use #flar for magic attack"
 msgstr "(f) Usar #flar para feitiço de ataque"
 
-#: src/localplayer.cpp:2098
+#: src/localplayer.cpp:2102
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) Usar #chiza para feitiço de ataque"
 
-#: src/localplayer.cpp:2099
+#: src/localplayer.cpp:2103
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) Usar #ingrav para feitiço de ataque"
 
-#: src/localplayer.cpp:2100
+#: src/localplayer.cpp:2104
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) Usar #frillyar para feitiço de ataque"
 
-#: src/localplayer.cpp:2101
+#: src/localplayer.cpp:2105
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) Usar #upmarmu para feitiço de ataque"
 
-#: src/localplayer.cpp:2102
+#: src/localplayer.cpp:2106
 msgid "(?) magic attack"
 msgstr "(?) Feitiço de ataque"
 
-#: src/localplayer.cpp:2121
+#: src/localplayer.cpp:2125
 msgid "(a) attack all players"
-msgstr ""
+msgstr "(a) atacar qualquer jogador"
 
-#: src/localplayer.cpp:2122
+#: src/localplayer.cpp:2126
 msgid "(f) attack not friends"
-msgstr ""
+msgstr "(f) não atacar amigos"
 
-#: src/localplayer.cpp:2123
+#: src/localplayer.cpp:2127
 msgid "(b) attack bad relations"
-msgstr ""
+msgstr "(b) atacar más relações"
 
-#: src/localplayer.cpp:2124
+#: src/localplayer.cpp:2128
 msgid "(d) dont attack players"
-msgstr ""
+msgstr "(d) não atacar jogadores"
 
-#: src/localplayer.cpp:2125
+#: src/localplayer.cpp:2129
 msgid "(?) pvp attack"
-msgstr ""
+msgstr "(?) ataque em pvp"
 
-#: src/localplayer.cpp:2144
+#: src/localplayer.cpp:2148
 msgid "(D) default imitation"
 msgstr "(D) Mímica padrão"
 
-#: src/localplayer.cpp:2145
+#: src/localplayer.cpp:2149
 msgid "(O) outfits imitation"
 msgstr "(O) Mímica de roupas"
 
-#: src/localplayer.cpp:2146
+#: src/localplayer.cpp:2150
 msgid "(?) imitation"
 msgstr "(?) Mímica"
 
-#: src/localplayer.cpp:2174
+#: src/localplayer.cpp:2178
 msgid "Away"
 msgstr "Indisponivel "
 
-#: src/localplayer.cpp:2193
+#: src/localplayer.cpp:2197
 msgid "(O) on keyboard"
 msgstr "(O) No teclado"
 
-#: src/localplayer.cpp:2194
+#: src/localplayer.cpp:2198
 msgid "(A) away"
 msgstr "(A) Ausente"
 
-#: src/localplayer.cpp:2195 src/localplayer.cpp:2210
+#: src/localplayer.cpp:2199 src/localplayer.cpp:2214
 msgid "(?) away"
 msgstr "(?) Ausente"
 
-#: src/localplayer.cpp:2208
+#: src/localplayer.cpp:2212
 msgid "(G) game camera mode"
 msgstr "(G) Modo de jogo câmera"
 
-#: src/localplayer.cpp:2209
+#: src/localplayer.cpp:2213
 msgid "(F) free camera mode"
 msgstr "(F) Modo de jogo câmera livre"
 
-#: src/localplayer.cpp:2234
+#: src/localplayer.cpp:2238
 msgid "Game modifiers are enabled"
 msgstr "Modificadores de jogo desativados"
 
-#: src/localplayer.cpp:2235
+#: src/localplayer.cpp:2239
 msgid "Game modifiers are disabled"
 msgstr "Modificadores de jogo desativados"
 
-#: src/localplayer.cpp:2236
+#: src/localplayer.cpp:2240
 msgid "Game modifiers are unknown"
-msgstr ""
+msgstr "Modificadores são desconhecidos"
 
-#: src/localplayer.cpp:3752
+#: src/localplayer.cpp:3756
 msgid "Follow: "
 msgstr "Seguindo:"
 
-#: src/localplayer.cpp:3754 src/localplayer.cpp:3769
+#: src/localplayer.cpp:3758 src/localplayer.cpp:3773
 msgid "Follow canceled"
 msgstr "Seguindo cancelado"
 
-#: src/localplayer.cpp:3761
+#: src/localplayer.cpp:3765
 msgid "Imitation: "
 msgstr "Imitando:"
 
-#: src/localplayer.cpp:3763 src/localplayer.cpp:3771
+#: src/localplayer.cpp:3767 src/localplayer.cpp:3775
 msgid "Imitation canceled"
 msgstr "Imitação cancelada"
 
-#: src/localplayer.cpp:4119
+#: src/localplayer.cpp:4123
 msgid "You see "
 msgstr "Você vê "
 
-#: src/main.cpp:47
+#: src/main.cpp:49
 msgid "manaplus [options] [manaplus-file]"
 msgstr "Manaplus [opções] [manaplus-arquivo]"
 
-#: src/main.cpp:48
+#: src/main.cpp:50
 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr "[Manaplus-Arquivo]: O arquivo Manaplus é um arquivo XML (.manaplus)"
 
-#: src/main.cpp:50
+#: src/main.cpp:52
 msgid "                  used to set custom parameters"
 msgstr "Usado para parâmetros customizados"
 
-#: src/main.cpp:51
+#: src/main.cpp:53
 msgid "                  to the manaplus client."
 msgstr "Para o cliente Manaplus."
 
-#: src/main.cpp:53
+#: src/main.cpp:55
 msgid "Options:"
 msgstr "Opções:"
 
-#: src/main.cpp:54
+#: src/main.cpp:56
 msgid "  -l --log-file       : Log file to use"
 msgstr "  -l --log-file       : Usar arquivo de log"
 
-#: src/main.cpp:55
+#: src/main.cpp:57
 msgid "  -L --chat-log-dir   : Chat log dir to use"
 msgstr "  -L --chat-log-dir   : Diretório para log de chat "
 
-#: src/main.cpp:56
+#: src/main.cpp:58
 msgid "  -v --version        : Display the version"
 msgstr "  -v --version        :  Exibe a versão"
 
-#: src/main.cpp:57
+#: src/main.cpp:59
 msgid "  -h --help           : Display this help"
 msgstr "  -h --help           : Exibe esta ajuda"
 
-#: src/main.cpp:58
+#: src/main.cpp:60
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr "  -C --config-dir     : Diretório de configuração a ser usado"
 
-#: src/main.cpp:59
+#: src/main.cpp:61
 msgid "  -U --username       : Login with this username"
 msgstr "  -U --username       : Efetua login com este usuário"
 
-#: src/main.cpp:60
+#: src/main.cpp:62
 msgid "  -P --password       : Login with this password"
 msgstr "  -P --password       :Efetua login com esta senha"
 
-#: src/main.cpp:61
+#: src/main.cpp:63
 msgid "  -c --character      : Login with this character"
 msgstr "  -c --character      :Efetua login com este personagem"
 
-#: src/main.cpp:62
+#: src/main.cpp:64
 msgid "  -s --server         : Login server name or IP"
 msgstr "  -s --server         :  Nome ou IP do servidor de login"
 
-#: src/main.cpp:63
+#: src/main.cpp:65
 msgid "  -p --port           : Login server port"
 msgstr "  -p --port           : Porta do servidor de login"
 
-#: src/main.cpp:64
+#: src/main.cpp:66
 msgid "     --update-host    : Use this update host"
 msgstr "     --update-host    : Usa este host de update"
 
-#: src/main.cpp:65
+#: src/main.cpp:67
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 "  -D --default        : Escolhe um personagem e um servidor de personagem "
 "padrão"
 
-#: src/main.cpp:67
+#: src/main.cpp:69
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr "  -u --skip-update    : Não faz downloads de atualização"
 
-#: src/main.cpp:68
+#: src/main.cpp:70
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 "  -d --data           : Pasta de onde os dados do jogo vão ser carregados"
 
-#: src/main.cpp:70
+#: src/main.cpp:72
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 "  -L --localdata-dir  : Diretório a ser usado como pasta de dados local"
 
-#: src/main.cpp:72
+#: src/main.cpp:74
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr "     --screenshot-dir : Diretório onde serão salvas as screenshots"
 
-#: src/main.cpp:73
+#: src/main.cpp:75
 msgid "     --safemode       : Start game in safe mode"
 msgstr "     --safemode       : Inicia o jogo em modo seguro"
 
-#: src/main.cpp:74
+#: src/main.cpp:76
 msgid "  -T --tests          : Start testing drivers and auto configuring"
-msgstr ""
+msgstr "  -T --testes          : Começa a testar drivers e a auto-configurar"
 
-#: src/main.cpp:77
+#: src/main.cpp:79
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr "     --no-opengl      :  Desabilita OpenGL nesta sessão"
 
@@ -5647,8 +5642,5 @@ msgstr "MP %+d"
 msgid "Unknown item"
 msgstr "Item desconhecido"
 
-#~ msgid "Waiting for server"
-#~ msgstr "Aguarde"
-
-#~ msgid "Load old outfits"
-#~ msgstr "Carregar velhas roupas"
+#~ msgid "> Next"
+#~ msgstr "> Próximo"
diff --git a/po/ru.po b/po/ru.po
index ba8643059..d5d4dd067 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-01-05 23:31+0300\n"
+"POT-Creation-Date: 2012-01-07 20:36+0300\n"
 "PO-Revision-Date: 2012-01-05 20:44+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Russian (http://www.transifex.net/projects/p/manaplus/team/"
@@ -314,11 +314,11 @@ msgstr "Создано:"
 msgid "Deleted:"
 msgstr "Удалено:"
 
-#: src/commandhandler.cpp:1180 src/commandhandler.cpp:1187
+#: src/commandhandler.cpp:1226 src/commandhandler.cpp:1233
 msgid "Resource images:"
 msgstr "Изображений:"
 
-#: src/commandhandler.cpp:1182 src/commandhandler.cpp:1189
+#: src/commandhandler.cpp:1228 src/commandhandler.cpp:1235
 msgid "Resource orphaned images:"
 msgstr "Удаленных изображений:"
 
@@ -1279,10 +1279,6 @@ msgstr "NPC"
 msgid "Clear"
 msgstr "Очистить"
 
-#: src/gui/npcdialog.cpp:223
-msgid "> Next"
-msgstr "> Далее"
-
 #: src/gui/npcpostdialog.cpp:48
 msgid "To:"
 msgstr "Для:"
@@ -4004,33 +4000,33 @@ msgstr "Вы были убиты "
 msgid "Tried to pick up nonexistent item."
 msgstr "Попытка поднять несуществующий предмет."
 
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1441
 msgid "Item is too heavy."
 msgstr "Предмет слишком тяжелый."
 
-#: src/localplayer.cpp:1442
+#: src/localplayer.cpp:1444
 msgid "Item is too far away."
 msgstr "Предмет слишком далеко"
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1447
 msgid "Inventory is full."
 msgstr "Инвентарь переполнен."
 
-#: src/localplayer.cpp:1446
+#: src/localplayer.cpp:1450
 msgid "Stack is too big."
 msgstr "Слишком много предметов."
 
-#: src/localplayer.cpp:1449
+#: src/localplayer.cpp:1453
 msgid "Item belongs to someone else."
 msgstr "Предмет принадлежит кому-то еще."
 
-#: src/localplayer.cpp:1452
+#: src/localplayer.cpp:1456
 msgid "Unknown problem picking up item."
 msgstr "Неизвестная проблема при поднятии предмета."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1476
+#: src/localplayer.cpp:1480
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -4038,390 +4034,390 @@ msgstr[0] "Вы подняли %d [@@%d|%s@@]."
 msgstr[1] "Вы подняли %d [@@%d|%s@@]."
 msgstr[2] "Вы подняли %d [@@%d|%s@@]."
 
-#: src/localplayer.cpp:1893
+#: src/localplayer.cpp:1897
 msgid "(D) default moves"
 msgstr "(D) движения по умолчанию"
 
-#: src/localplayer.cpp:1894
+#: src/localplayer.cpp:1898
 msgid "(I) invert moves"
 msgstr "(I) обратное движение"
 
-#: src/localplayer.cpp:1895
+#: src/localplayer.cpp:1899
 msgid "(c) moves with some crazy moves"
 msgstr "(c) обычное движение иногда с сумашедшими движениями"
 
-#: src/localplayer.cpp:1896
+#: src/localplayer.cpp:1900
 msgid "(C) moves with crazy moves"
 msgstr "(C) движение с сумашедшими движениями"
 
-#: src/localplayer.cpp:1897
+#: src/localplayer.cpp:1901
 msgid "(d) double normal + crazy"
 msgstr "(d) нормальные и сумашедшие движения"
 
-#: src/localplayer.cpp:1898
+#: src/localplayer.cpp:1902
 msgid "(?) unknown move"
 msgstr "(?) неизвестное движение"
 
-#: src/localplayer.cpp:1920
+#: src/localplayer.cpp:1924
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr "(%d) сумасшедшее движение %d"
 
-#: src/localplayer.cpp:1925
+#: src/localplayer.cpp:1929
 msgid "(a) custom crazy move"
 msgstr "(a) пользовательские сумашедшие движения"
 
-#: src/localplayer.cpp:1929
+#: src/localplayer.cpp:1933
 msgid "(?) crazy move"
 msgstr "(?) неизвестные сумасшедшие движения"
 
-#: src/localplayer.cpp:1943
+#: src/localplayer.cpp:1947
 msgid "(0) default moves to target"
 msgstr "(0) обычное движение к цели"
 
-#: src/localplayer.cpp:1944
+#: src/localplayer.cpp:1948
 msgid "(1) moves to target in distance 1"
 msgstr "(1) движение к цели на расстояние 1"
 
-#: src/localplayer.cpp:1945
+#: src/localplayer.cpp:1949
 msgid "(2) moves to target in distance 2"
 msgstr "(2) движение к цели на расстояние 2"
 
-#: src/localplayer.cpp:1946
+#: src/localplayer.cpp:1950
 msgid "(3) moves to target in distance 3"
 msgstr "(3) движение к цели на расстояние 3"
 
-#: src/localplayer.cpp:1947
+#: src/localplayer.cpp:1951
 msgid "(5) moves to target in distance 5"
 msgstr "(5) движение к цели на расстояние 5"
 
-#: src/localplayer.cpp:1948
+#: src/localplayer.cpp:1952
 msgid "(7) moves to target in distance 7"
 msgstr "(7) движение к цели на расстояние 7"
 
-#: src/localplayer.cpp:1949
+#: src/localplayer.cpp:1953
 msgid "(A) moves to target in attack range"
 msgstr "(A) движение к цели на расстояние атаки"
 
-#: src/localplayer.cpp:1950
+#: src/localplayer.cpp:1954
 msgid "(a) archer attack range"
 msgstr "(a) атака лучника"
 
-#: src/localplayer.cpp:1951
+#: src/localplayer.cpp:1955
 msgid "(?) move to target"
 msgstr "(?) неизвестное движение к цели"
 
-#: src/localplayer.cpp:1970
+#: src/localplayer.cpp:1974
 msgid "(D) default follow"
 msgstr "(D) следование по умолчанию"
 
-#: src/localplayer.cpp:1971
+#: src/localplayer.cpp:1975
 msgid "(R) relative follow"
 msgstr "(R) относительное следование"
 
-#: src/localplayer.cpp:1972
+#: src/localplayer.cpp:1976
 msgid "(M) mirror follow"
 msgstr "(M) зеркальное следование"
 
-#: src/localplayer.cpp:1973
+#: src/localplayer.cpp:1977
 msgid "(P) pet follow"
 msgstr "(P) следование как животное"
 
-#: src/localplayer.cpp:1974
+#: src/localplayer.cpp:1978
 msgid "(?) unknown follow"
 msgstr "(?) неизвестное следование"
 
-#: src/localplayer.cpp:1993 src/localplayer.cpp:1997 src/localplayer.cpp:2020
+#: src/localplayer.cpp:1997 src/localplayer.cpp:2001 src/localplayer.cpp:2024
 msgid "(?) attack"
 msgstr "(?) неизвестная атака"
 
-#: src/localplayer.cpp:1994 src/localplayer.cpp:2016
+#: src/localplayer.cpp:1998 src/localplayer.cpp:2020
 msgid "(D) default attack"
 msgstr "(D) обычная атака"
 
-#: src/localplayer.cpp:1995
+#: src/localplayer.cpp:1999
 msgid "(s) switch attack without shield"
 msgstr "(s) переключение атаки без щита"
 
-#: src/localplayer.cpp:1996
+#: src/localplayer.cpp:2000
 msgid "(S) switch attack with shield"
 msgstr "(S) переключение атаки со щитом"
 
-#: src/localplayer.cpp:2017
+#: src/localplayer.cpp:2021
 msgid "(G) go and attack"
 msgstr "(G) идти и атаковать"
 
-#: src/localplayer.cpp:2018
+#: src/localplayer.cpp:2022
 msgid "(A) go, attack, pickup"
 msgstr "(A) идти, атаковать, собирать"
 
-#: src/localplayer.cpp:2019
+#: src/localplayer.cpp:2023
 msgid "(d) without auto attack"
 msgstr "(d) без автоатаки"
 
-#: src/localplayer.cpp:2053
+#: src/localplayer.cpp:2057
 msgid "(S) small pick up 1x1 cells"
 msgstr "(S) поднятие в области 1x1"
 
-#: src/localplayer.cpp:2054
+#: src/localplayer.cpp:2058
 msgid "(D) default pick up 2x1 cells"
 msgstr "(D) поднятие из области 2x1"
 
-#: src/localplayer.cpp:2055
+#: src/localplayer.cpp:2059
 msgid "(F) forward pick up 2x3 cells"
 msgstr "(F) поднятие из области спереди 2x3"
 
-#: src/localplayer.cpp:2056
+#: src/localplayer.cpp:2060
 msgid "(3) pick up 3x3 cells"
 msgstr "(3) поднятие из области 3x3"
 
-#: src/localplayer.cpp:2057
+#: src/localplayer.cpp:2061
 msgid "(g) go and pick up in distance 4"
 msgstr "(g) движение и поднятие на расстоянии 4"
 
-#: src/localplayer.cpp:2058
+#: src/localplayer.cpp:2062
 msgid "(G) go and pick up in distance 8"
 msgstr "(g) движение и поднятие на расстоянии 8"
 
-#: src/localplayer.cpp:2059
+#: src/localplayer.cpp:2063
 msgid "(A) go and pick up in max distance"
 msgstr "(A) движение и поднятие на максимальном расстоянии"
 
-#: src/localplayer.cpp:2060
+#: src/localplayer.cpp:2064
 msgid "(?) pick up"
 msgstr "(?) неизвестный режим поднятия"
 
-#: src/localplayer.cpp:2073
+#: src/localplayer.cpp:2077
 msgid "(N) normal map view"
 msgstr "(N) обычный режим карты"
 
-#: src/localplayer.cpp:2074
+#: src/localplayer.cpp:2078
 msgid "(D) debug map view"
 msgstr "(D) отладочный режим карты"
 
-#: src/localplayer.cpp:2075
+#: src/localplayer.cpp:2079
 msgid "(u) ultra map view"
 msgstr "(u) специальный режим карты"
 
-#: src/localplayer.cpp:2076
+#: src/localplayer.cpp:2080
 msgid "(U) ultra map view 2"
 msgstr "(U) специальный режим карты 2"
 
-#: src/localplayer.cpp:2077
+#: src/localplayer.cpp:2081
 msgid "(e) empty map view"
 msgstr "(e) режим пустой карты"
 
-#: src/localplayer.cpp:2078
+#: src/localplayer.cpp:2082
 msgid "(b) black & white map view"
 msgstr "(b) черно-белый режим карты"
 
-#: src/localplayer.cpp:2097
+#: src/localplayer.cpp:2101
 msgid "(f) use #flar for magic attack"
 msgstr "(f) использовать #flar для атаки"
 
-#: src/localplayer.cpp:2098
+#: src/localplayer.cpp:2102
 msgid "(c) use #chiza for magic attack"
 msgstr "(c) использовать #chiza для атаки"
 
-#: src/localplayer.cpp:2099
+#: src/localplayer.cpp:2103
 msgid "(I) use #ingrav for magic attack"
 msgstr "(I) использовать #ingrav для атаки"
 
-#: src/localplayer.cpp:2100
+#: src/localplayer.cpp:2104
 msgid "(F) use #frillyar for magic attack"
 msgstr "(F) использовать #frillyar для атаки"
 
-#: src/localplayer.cpp:2101
+#: src/localplayer.cpp:2105
 msgid "(U) use #upmarmu for magic attack"
 msgstr "(U) использовать #upmarmu для атаки"
 
-#: src/localplayer.cpp:2102
+#: src/localplayer.cpp:2106
 msgid "(?) magic attack"
 msgstr "(?) неизвестная магическая атака"
 
-#: src/localplayer.cpp:2121
+#: src/localplayer.cpp:2125
 msgid "(a) attack all players"
 msgstr "(a) атаковать всех игроков"
 
-#: src/localplayer.cpp:2122
+#: src/localplayer.cpp:2126
 msgid "(f) attack not friends"
 msgstr "(f) атаковать всех кроме друзей"
 
-#: src/localplayer.cpp:2123
+#: src/localplayer.cpp:2127
 msgid "(b) attack bad relations"
 msgstr "(b) атаковать врагов"
 
-#: src/localplayer.cpp:2124
+#: src/localplayer.cpp:2128
 msgid "(d) dont attack players"
 msgstr "(d) не атаковать игроков"
 
-#: src/localplayer.cpp:2125
+#: src/localplayer.cpp:2129
 msgid "(?) pvp attack"
 msgstr "(?) pvp атака"
 
-#: src/localplayer.cpp:2144
+#: src/localplayer.cpp:2148
 msgid "(D) default imitation"
 msgstr "(D) имитация по умолчанию"
 
-#: src/localplayer.cpp:2145
+#: src/localplayer.cpp:2149
 msgid "(O) outfits imitation"
 msgstr "(O) имитация нарядов"
 
-#: src/localplayer.cpp:2146
+#: src/localplayer.cpp:2150
 msgid "(?) imitation"
 msgstr "(?) неизвестная имитация"
 
-#: src/localplayer.cpp:2174
+#: src/localplayer.cpp:2178
 msgid "Away"
 msgstr "Отошел"
 
-#: src/localplayer.cpp:2193
+#: src/localplayer.cpp:2197
 msgid "(O) on keyboard"
 msgstr "(O) возле компьютера"
 
-#: src/localplayer.cpp:2194
+#: src/localplayer.cpp:2198
 msgid "(A) away"
 msgstr "(A) отошел"
 
-#: src/localplayer.cpp:2195 src/localplayer.cpp:2210
+#: src/localplayer.cpp:2199 src/localplayer.cpp:2214
 msgid "(?) away"
 msgstr "(?) неизвестный режим отошел"
 
-#: src/localplayer.cpp:2208
+#: src/localplayer.cpp:2212
 msgid "(G) game camera mode"
 msgstr "(G) игровая камера"
 
-#: src/localplayer.cpp:2209
+#: src/localplayer.cpp:2213
 msgid "(F) free camera mode"
 msgstr "(F) свободная камера"
 
-#: src/localplayer.cpp:2234
+#: src/localplayer.cpp:2238
 msgid "Game modifiers are enabled"
 msgstr "Игровые модификаторы включены"
 
-#: src/localplayer.cpp:2235
+#: src/localplayer.cpp:2239
 msgid "Game modifiers are disabled"
 msgstr "Игровые модификаторы выключены"
 
-#: src/localplayer.cpp:2236
+#: src/localplayer.cpp:2240
 msgid "Game modifiers are unknown"
 msgstr "Игровые модификаторы в неизвестном положении"
 
-#: src/localplayer.cpp:3752
+#: src/localplayer.cpp:3756
 msgid "Follow: "
 msgstr "Следование: "
 
-#: src/localplayer.cpp:3754 src/localplayer.cpp:3769
+#: src/localplayer.cpp:3758 src/localplayer.cpp:3773
 msgid "Follow canceled"
 msgstr "Следование отменено"
 
-#: src/localplayer.cpp:3761
+#: src/localplayer.cpp:3765
 msgid "Imitation: "
 msgstr "Имитация: "
 
-#: src/localplayer.cpp:3763 src/localplayer.cpp:3771
+#: src/localplayer.cpp:3767 src/localplayer.cpp:3775
 msgid "Imitation canceled"
 msgstr "Имитация отменена"
 
-#: src/localplayer.cpp:4119
+#: src/localplayer.cpp:4123
 msgid "You see "
 msgstr "Вы видите "
 
-#: src/main.cpp:47
+#: src/main.cpp:49
 msgid "manaplus [options] [manaplus-file]"
 msgstr "manaplus [параметры] [файл-manaplus]"
 
-#: src/main.cpp:48
+#: src/main.cpp:50
 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr "[файл-manaplus] : Файл manaplus это xml файл (.manaplus)"
 
-#: src/main.cpp:50
+#: src/main.cpp:52
 msgid "                  used to set custom parameters"
 msgstr "                  используется для указания дополнительных параметров"
 
-#: src/main.cpp:51
+#: src/main.cpp:53
 msgid "                  to the manaplus client."
 msgstr "                  в клиенте."
 
-#: src/main.cpp:53
+#: src/main.cpp:55
 msgid "Options:"
 msgstr "Опции:"
 
-#: src/main.cpp:54
+#: src/main.cpp:56
 msgid "  -l --log-file       : Log file to use"
 msgstr "  -l --log-file       : Использовать указанный файл как лог"
 
-#: src/main.cpp:55
+#: src/main.cpp:57
 msgid "  -L --chat-log-dir   : Chat log dir to use"
 msgstr "  -L --chat-log-dir   : Использовать указанный каталог для лога"
 
-#: src/main.cpp:56
+#: src/main.cpp:58
 msgid "  -v --version        : Display the version"
 msgstr "  -v --version        : Показать версию"
 
-#: src/main.cpp:57
+#: src/main.cpp:59
 msgid "  -h --help           : Display this help"
 msgstr "  -h --help           : Показать эту справку"
 
-#: src/main.cpp:58
+#: src/main.cpp:60
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr "  -C --config-dir     : Использовать указанный каталог конфигурации"
 
-#: src/main.cpp:59
+#: src/main.cpp:61
 msgid "  -U --username       : Login with this username"
 msgstr "  -U --username       : Войти с указанным логином"
 
-#: src/main.cpp:60
+#: src/main.cpp:62
 msgid "  -P --password       : Login with this password"
 msgstr "  -P --password       : Войти с указанным паролем"
 
-#: src/main.cpp:61
+#: src/main.cpp:63
 msgid "  -c --character      : Login with this character"
 msgstr "  -c --character      : Использовать указанный персонаж"
 
-#: src/main.cpp:62
+#: src/main.cpp:64
 msgid "  -s --server         : Login server name or IP"
 msgstr "  -s --server         : Имя или IP сервера авторизации"
 
-#: src/main.cpp:63
+#: src/main.cpp:65
 msgid "  -p --port           : Login server port"
 msgstr "  -p --port           : Порт сервера авторизации"
 
-#: src/main.cpp:64
+#: src/main.cpp:66
 msgid "     --update-host    : Use this update host"
 msgstr "     --update-host    : Использовать этот узел обновлений"
 
-#: src/main.cpp:65
+#: src/main.cpp:67
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 "  -D --default        : Выбрать персонаж и сервер персонажей по умолчанию"
 
-#: src/main.cpp:67
+#: src/main.cpp:69
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr "  -u --skip-update    : Пропустить обновление"
 
-#: src/main.cpp:68
+#: src/main.cpp:70
 msgid "  -d --data           : Directory to load game data from"
 msgstr "  -d --data           : Загрузить игровые данные из этого каталога"
 
-#: src/main.cpp:70
+#: src/main.cpp:72
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr "  -L --localdata-dir  : Каталог для локальных данных"
 
-#: src/main.cpp:72
+#: src/main.cpp:74
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr "     --screenshot-dir : Сохранять скриншоты в указанном каталоге"
 
-#: src/main.cpp:73
+#: src/main.cpp:75
 msgid "     --safemode       : Start game in safe mode"
 msgstr "     --safemode       : Запуск игры в безопасном режиме"
 
-#: src/main.cpp:74
+#: src/main.cpp:76
 msgid "  -T --tests          : Start testing drivers and auto configuring"
 msgstr ""
 "  -T --tests          : Запускает проверку драйверов и автоконфигурацию"
 
-#: src/main.cpp:77
+#: src/main.cpp:79
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr "     --no-opengl      : Не использовать OpenGL для этой сессии"
 
@@ -5660,3 +5656,6 @@ msgstr "Мана %+d"
 #: src/resources/itemdb.cpp:169
 msgid "Unknown item"
 msgstr "Неизвестный предмет"
+
+#~ msgid "> Next"
+#~ msgstr "> Далее"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index ff3889043..5696a3ea5 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-01-05 23:31+0300\n"
+"POT-Creation-Date: 2012-01-07 20:36+0300\n"
 "PO-Revision-Date: 2011-11-11 21:38+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Chinese (China) (http://www.transifex.net/projects/p/manaplus/"
@@ -300,11 +300,11 @@ msgstr "创建于:"
 msgid "Deleted:"
 msgstr "删除:"
 
-#: src/commandhandler.cpp:1180 src/commandhandler.cpp:1187
+#: src/commandhandler.cpp:1226 src/commandhandler.cpp:1233
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1182 src/commandhandler.cpp:1189
+#: src/commandhandler.cpp:1228 src/commandhandler.cpp:1235
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -1259,10 +1259,6 @@ msgstr "NPC"
 msgid "Clear"
 msgstr "清除"
 
-#: src/gui/npcdialog.cpp:223
-msgid "> Next"
-msgstr ""
-
 #: src/gui/npcpostdialog.cpp:48
 msgid "To:"
 msgstr "至:"
@@ -3966,420 +3962,420 @@ msgstr "你被打死"
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1441
 msgid "Item is too heavy."
 msgstr "项目是太重了。"
 
-#: src/localplayer.cpp:1442
+#: src/localplayer.cpp:1444
 msgid "Item is too far away."
 msgstr "物品太远了。"
 
-#: src/localplayer.cpp:1444
+#: src/localplayer.cpp:1447
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1446
+#: src/localplayer.cpp:1450
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1449
+#: src/localplayer.cpp:1453
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1452
+#: src/localplayer.cpp:1456
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1476
+#: src/localplayer.cpp:1480
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "你拾起%d[@@%d|%s @@]。"
 
-#: src/localplayer.cpp:1893
+#: src/localplayer.cpp:1897
 msgid "(D) default moves"
 msgstr ""
 
-#: src/localplayer.cpp:1894
+#: src/localplayer.cpp:1898
 msgid "(I) invert moves"
 msgstr ""
 
-#: src/localplayer.cpp:1895
+#: src/localplayer.cpp:1899
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1896
+#: src/localplayer.cpp:1900
 msgid "(C) moves with crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1897
+#: src/localplayer.cpp:1901
 msgid "(d) double normal + crazy"
 msgstr ""
 
-#: src/localplayer.cpp:1898
+#: src/localplayer.cpp:1902
 msgid "(?) unknown move"
 msgstr ""
 
-#: src/localplayer.cpp:1920
+#: src/localplayer.cpp:1924
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr ""
 
-#: src/localplayer.cpp:1925
+#: src/localplayer.cpp:1929
 msgid "(a) custom crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1929
+#: src/localplayer.cpp:1933
 msgid "(?) crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1943
+#: src/localplayer.cpp:1947
 msgid "(0) default moves to target"
 msgstr ""
 
-#: src/localplayer.cpp:1944
+#: src/localplayer.cpp:1948
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
-#: src/localplayer.cpp:1945
+#: src/localplayer.cpp:1949
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
-#: src/localplayer.cpp:1946
+#: src/localplayer.cpp:1950
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
-#: src/localplayer.cpp:1947
+#: src/localplayer.cpp:1951
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
-#: src/localplayer.cpp:1948
+#: src/localplayer.cpp:1952
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
-#: src/localplayer.cpp:1949
+#: src/localplayer.cpp:1953
 msgid "(A) moves to target in attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1950
+#: src/localplayer.cpp:1954
 msgid "(a) archer attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1951
+#: src/localplayer.cpp:1955
 msgid "(?) move to target"
 msgstr "(?)移动到目标"
 
-#: src/localplayer.cpp:1970
+#: src/localplayer.cpp:1974
 msgid "(D) default follow"
 msgstr ""
 
-#: src/localplayer.cpp:1971
+#: src/localplayer.cpp:1975
 msgid "(R) relative follow"
 msgstr ""
 
-#: src/localplayer.cpp:1972
+#: src/localplayer.cpp:1976
 msgid "(M) mirror follow"
 msgstr ""
 
-#: src/localplayer.cpp:1973
+#: src/localplayer.cpp:1977
 msgid "(P) pet follow"
 msgstr ""
 
-#: src/localplayer.cpp:1974
+#: src/localplayer.cpp:1978
 msgid "(?) unknown follow"
 msgstr ""
 
-#: src/localplayer.cpp:1993 src/localplayer.cpp:1997 src/localplayer.cpp:2020
+#: src/localplayer.cpp:1997 src/localplayer.cpp:2001 src/localplayer.cpp:2024
 msgid "(?) attack"
 msgstr "(?) 攻击"
 
-#: src/localplayer.cpp:1994 src/localplayer.cpp:2016
+#: src/localplayer.cpp:1998 src/localplayer.cpp:2020
 msgid "(D) default attack"
 msgstr ""
 
-#: src/localplayer.cpp:1995
+#: src/localplayer.cpp:1999
 msgid "(s) switch attack without shield"
 msgstr ""
 
-#: src/localplayer.cpp:1996
+#: src/localplayer.cpp:2000
 msgid "(S) switch attack with shield"
 msgstr ""
 
-#: src/localplayer.cpp:2017
+#: src/localplayer.cpp:2021
 msgid "(G) go and attack"
 msgstr "(G) 去攻击"
 
-#: src/localplayer.cpp:2018
+#: src/localplayer.cpp:2022
 msgid "(A) go, attack, pickup"
 msgstr ""
 
-#: src/localplayer.cpp:2019
+#: src/localplayer.cpp:2023
 msgid "(d) without auto attack"
 msgstr ""
 
-#: src/localplayer.cpp:2053
+#: src/localplayer.cpp:2057
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2054
+#: src/localplayer.cpp:2058
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2055
+#: src/localplayer.cpp:2059
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2056
+#: src/localplayer.cpp:2060
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2057
+#: src/localplayer.cpp:2061
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
-#: src/localplayer.cpp:2058
+#: src/localplayer.cpp:2062
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
-#: src/localplayer.cpp:2059
+#: src/localplayer.cpp:2063
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
-#: src/localplayer.cpp:2060
+#: src/localplayer.cpp:2064
 msgid "(?) pick up"
 msgstr "(?)拿起"
 
-#: src/localplayer.cpp:2073
+#: src/localplayer.cpp:2077
 msgid "(N) normal map view"
 msgstr ""
 
-#: src/localplayer.cpp:2074
+#: src/localplayer.cpp:2078
 msgid "(D) debug map view"
 msgstr ""
 
-#: src/localplayer.cpp:2075
+#: src/localplayer.cpp:2079
 msgid "(u) ultra map view"
 msgstr ""
 
-#: src/localplayer.cpp:2076
+#: src/localplayer.cpp:2080
 msgid "(U) ultra map view 2"
 msgstr ""
 
-#: src/localplayer.cpp:2077
+#: src/localplayer.cpp:2081
 msgid "(e) empty map view"
 msgstr ""
 
-#: src/localplayer.cpp:2078
+#: src/localplayer.cpp:2082
 msgid "(b) black & white map view"
 msgstr ""
 
-#: src/localplayer.cpp:2097
+#: src/localplayer.cpp:2101
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2098
+#: src/localplayer.cpp:2102
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2099
+#: src/localplayer.cpp:2103
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2100
+#: src/localplayer.cpp:2104
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2101
+#: src/localplayer.cpp:2105
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2102
+#: src/localplayer.cpp:2106
 msgid "(?) magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2121
+#: src/localplayer.cpp:2125
 msgid "(a) attack all players"
 msgstr ""
 
-#: src/localplayer.cpp:2122
+#: src/localplayer.cpp:2126
 msgid "(f) attack not friends"
 msgstr ""
 
-#: src/localplayer.cpp:2123
+#: src/localplayer.cpp:2127
 msgid "(b) attack bad relations"
 msgstr ""
 
-#: src/localplayer.cpp:2124
+#: src/localplayer.cpp:2128
 msgid "(d) dont attack players"
 msgstr ""
 
-#: src/localplayer.cpp:2125
+#: src/localplayer.cpp:2129
 msgid "(?) pvp attack"
 msgstr ""
 
-#: src/localplayer.cpp:2144
+#: src/localplayer.cpp:2148
 msgid "(D) default imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2145
+#: src/localplayer.cpp:2149
 msgid "(O) outfits imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2146
+#: src/localplayer.cpp:2150
 msgid "(?) imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2174
+#: src/localplayer.cpp:2178
 msgid "Away"
 msgstr "距离"
 
-#: src/localplayer.cpp:2193
+#: src/localplayer.cpp:2197
 msgid "(O) on keyboard"
 msgstr ""
 
-#: src/localplayer.cpp:2194
+#: src/localplayer.cpp:2198
 msgid "(A) away"
 msgstr ""
 
-#: src/localplayer.cpp:2195 src/localplayer.cpp:2210
+#: src/localplayer.cpp:2199 src/localplayer.cpp:2214
 msgid "(?) away"
 msgstr ""
 
-#: src/localplayer.cpp:2208
+#: src/localplayer.cpp:2212
 msgid "(G) game camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2209
+#: src/localplayer.cpp:2213
 msgid "(F) free camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2234
+#: src/localplayer.cpp:2238
 msgid "Game modifiers are enabled"
 msgstr ""
 
-#: src/localplayer.cpp:2235
+#: src/localplayer.cpp:2239
 msgid "Game modifiers are disabled"
 msgstr ""
 
-#: src/localplayer.cpp:2236
+#: src/localplayer.cpp:2240
 msgid "Game modifiers are unknown"
 msgstr ""
 
-#: src/localplayer.cpp:3752
+#: src/localplayer.cpp:3756
 msgid "Follow: "
 msgstr "跟随:"
 
-#: src/localplayer.cpp:3754 src/localplayer.cpp:3769
+#: src/localplayer.cpp:3758 src/localplayer.cpp:3773
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3761
+#: src/localplayer.cpp:3765
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3763 src/localplayer.cpp:3771
+#: src/localplayer.cpp:3767 src/localplayer.cpp:3775
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:4119
+#: src/localplayer.cpp:4123
 msgid "You see "
 msgstr "你看"
 
-#: src/main.cpp:47
+#: src/main.cpp:49
 msgid "manaplus [options] [manaplus-file]"
 msgstr ""
 
-#: src/main.cpp:48
+#: src/main.cpp:50
 msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
 msgstr ""
 
-#: src/main.cpp:50
+#: src/main.cpp:52
 msgid "                  used to set custom parameters"
 msgstr ""
 
-#: src/main.cpp:51
+#: src/main.cpp:53
 msgid "                  to the manaplus client."
 msgstr ""
 
-#: src/main.cpp:53
+#: src/main.cpp:55
 msgid "Options:"
 msgstr "选项:"
 
-#: src/main.cpp:54
+#: src/main.cpp:56
 msgid "  -l --log-file       : Log file to use"
 msgstr "-l--log-file 日志文件"
 
-#: src/main.cpp:55
+#: src/main.cpp:57
 msgid "  -L --chat-log-dir   : Chat log dir to use"
 msgstr ""
 
-#: src/main.cpp:56
+#: src/main.cpp:58
 msgid "  -v --version        : Display the version"
 msgstr "-v --version: 显示版本"
 
-#: src/main.cpp:57
+#: src/main.cpp:59
 msgid "  -h --help           : Display this help"
 msgstr ""
 
-#: src/main.cpp:58
+#: src/main.cpp:60
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:59
+#: src/main.cpp:61
 msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:60
+#: src/main.cpp:62
 msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:61
+#: src/main.cpp:63
 msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:62
+#: src/main.cpp:64
 msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:63
+#: src/main.cpp:65
 msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:64
+#: src/main.cpp:66
 msgid "     --update-host    : Use this update host"
 msgstr "--update-host:    使用此更新主机"
 
-#: src/main.cpp:65
+#: src/main.cpp:67
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:67
+#: src/main.cpp:69
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:68
+#: src/main.cpp:70
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:70
+#: src/main.cpp:72
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:72
+#: src/main.cpp:74
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:73
+#: src/main.cpp:75
 msgid "     --safemode       : Start game in safe mode"
 msgstr ""
 
-#: src/main.cpp:74
+#: src/main.cpp:76
 msgid "  -T --tests          : Start testing drivers and auto configuring"
 msgstr ""
 
-#: src/main.cpp:77
+#: src/main.cpp:79
 msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
-- 
cgit v1.2.3-70-g09d2