Add xgettext:no-c-format comment for some strings.

Rebuild languge files and update translations.
Disable and enable some translations.

19 files changed, 4917 insertions, 3093 deletions

diff --git a/po/LINGUAS b/po/LINGUAS
index 3d9488544..a85877412 100644
--- a/po/LINGUAS
+++ b/po/LINGUAS
@@ -3,9 +3,9 @@
 #bg # Not enough translations
 #ca # Not enough translations
 #cs # Not enough translations
-da
+#da # Not enough translations
 de
-en_GB
+#en_GB # Not enough translations
 #eo # Not enough translations
 es
 #et # Not enough translations
@@ -15,21 +15,21 @@ fr
 #he # Disabled because of current client limitations (RTL)
 hr
 hu
-#id # Not enough translations
-it
+id
+#it # Not enough translations
 #ja # Disabled because of current client limitations (font fallbacking)
 #ka # Not enough translations
 #nb # Not enough translations
 #nds # Not enough translations
-nl
+#nl # Not enough translations
 nl_BE
-pl
+#pl # Not enough translations
 pt
 pt_BR
 ru
 #sk # Not enough translations
 #sq # Not enough translations
-sv
+#sv # Not enough translations
 #te # Disabled because of current client limitations (font fallbacking)
 #th # Disabled because of current client limitations (font fallbacking)
 #tr # Not enough translations
diff --git a/po/da.po b/po/da.po
index f92307739..d3247ea64 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-06-25 18:01+0300\n"
+"POT-Creation-Date: 2011-07-02 00:39+0300\n"
 "PO-Revision-Date: 2009-07-25 17:33+0000\n"
 "Last-Translator: Niels L Ellegaard <niels.ellegaard@gmail.com>\n"
 "Language-Team: Danish <none@none.none>\n"
@@ -32,96 +32,96 @@ msgstr ""
 msgid "miss"
 msgstr ""
 
-#: src/client.cpp:817 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
+#: src/client.cpp:821 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Opsætning"
 
-#: src/client.cpp:896
+#: src/client.cpp:900
 #, fuzzy
 msgid "Connecting to server"
 msgstr "Opretter forbindelse til kort-serveren..."
 
-#: src/client.cpp:927
+#: src/client.cpp:931
 #, fuzzy
 msgid "Logging in"
 msgstr "Log Ind"
 
-#: src/client.cpp:960
+#: src/client.cpp:964
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1052
+#: src/client.cpp:1056
 #, fuzzy
 msgid "Requesting characters"
 msgstr "Vælg Karakter"
 
-#: src/client.cpp:1083
+#: src/client.cpp:1087
 #, fuzzy
 msgid "Connecting to the game server"
 msgstr "Opretter forbindelse til kort-serveren..."
 
-#: src/client.cpp:1093
+#: src/client.cpp:1097
 #, fuzzy
 msgid "Changing game servers"
 msgstr "Server"
 
-#: src/client.cpp:1130 src/client.cpp:1137 src/client.cpp:1274
+#: src/client.cpp:1134 src/client.cpp:1141 src/client.cpp:1278
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:391
+#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
 #: src/gui/unregisterdialog.cpp:137 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227 src/net/tmwa/charserverhandler.cpp:190
 #: src/net/tmwa/charserverhandler.cpp:206
 msgid "Error"
 msgstr "Fejl"
 
-#: src/client.cpp:1146
+#: src/client.cpp:1150
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1173
+#: src/client.cpp:1177
 #, fuzzy
 msgid "Password Change"
 msgstr "Adgangskode:"
 
-#: src/client.cpp:1174
+#: src/client.cpp:1178
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1193
+#: src/client.cpp:1197
 #, fuzzy
 msgid "Email Change"
 msgstr "Ændre"
 
-#: src/client.cpp:1194
+#: src/client.cpp:1198
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1214
+#: src/client.cpp:1218
 #, fuzzy
 msgid "Unregister Successful"
 msgstr "Frameld"
 
-#: src/client.cpp:1215
+#: src/client.cpp:1219
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1404 src/client.cpp:1434 src/client.cpp:1478
-#: src/client.cpp:1894
+#: src/client.cpp:1408 src/client.cpp:1438 src/client.cpp:1482
+#: src/client.cpp:1898
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1608
+#: src/client.cpp:1612
 #, fuzzy, c-format
 msgid "Invalid update host: %s"
 msgstr "Ugyldig opdaterings host: "
 
-#: src/client.cpp:1642 src/client.cpp:1648
+#: src/client.cpp:1646 src/client.cpp:1652
 msgid "Error creating updates directory!"
 msgstr "Fejl under oprettelsen af opdateringen mappen!"
 
-#: src/client.cpp:1669
+#: src/client.cpp:1673
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -436,7 +436,7 @@ msgstr ""
 
 #: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
 #: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
-#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:284
+#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:285
 #: src/keyboardconfig.cpp:287
 msgid "Quit"
 msgstr "Afslut"
@@ -512,7 +512,7 @@ msgstr "Den nye  email-adresse eksisterer allerede."
 msgid "Change Password"
 msgstr "Skift adgangskode"
 
-#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:94
+#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:95
 #: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56
 msgid "Password:"
 msgstr "Adgangskode:"
@@ -544,7 +544,7 @@ msgstr ""
 msgid "Create Character"
 msgstr "Lav en ny karakter."
 
-#: src/gui/charcreatedialog.cpp:73 src/gui/logindialog.cpp:93
+#: src/gui/charcreatedialog.cpp:73 src/gui/logindialog.cpp:94
 #: src/gui/register.cpp:75
 msgid "Name:"
 msgstr "Navn:"
@@ -649,7 +649,7 @@ msgstr "Kunne ikke slette karakteren."
 msgid "Enter password:"
 msgstr "Forkert brugernavn eller password"
 
-#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:288
+#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
 #: src/gui/setup_players.cpp:251 src/gui/shopwindow.cpp:120
 #: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:240
 msgid "Delete"
@@ -1201,33 +1201,33 @@ msgstr "Luk"
 msgid "Skip"
 msgstr ""
 
-#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:122
+#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:123
 msgid "Login"
 msgstr "Log Ind"
 
-#: src/gui/logindialog.cpp:90 src/gui/serverdialog.cpp:243
+#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:243
 #: src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr "Server:"
 
-#: src/gui/logindialog.cpp:95
+#: src/gui/logindialog.cpp:96
 msgid "Custom update host"
 msgstr ""
 
-#: src/gui/logindialog.cpp:109
+#: src/gui/logindialog.cpp:110
 #, fuzzy
 msgid "Remember username"
 msgstr "Husk Brugernavn"
 
-#: src/gui/logindialog.cpp:110
+#: src/gui/logindialog.cpp:111
 msgid "Update:"
 msgstr ""
 
-#: src/gui/logindialog.cpp:120 src/gui/register.cpp:66 src/gui/register.cpp:81
+#: src/gui/logindialog.cpp:121 src/gui/register.cpp:66 src/gui/register.cpp:81
 msgid "Register"
 msgstr "Registrer"
 
-#: src/gui/logindialog.cpp:121
+#: src/gui/logindialog.cpp:122
 #, fuzzy
 msgid "Change Server"
 msgstr "Server"
@@ -1728,60 +1728,65 @@ msgstr "De indtastede adgangskoder stemmer ikke overens."
 msgid "Choose Your Server"
 msgstr "Vælg din server"
 
+#: src/gui/serverdialog.cpp:239
+#, fuzzy
+msgid "Choose Your Server  *** SAFE MODE ***"
+msgstr "Vælg din server"
+
 #: src/gui/serverdialog.cpp:244
 msgid "Port:"
 msgstr "Port:"
 
-#: src/gui/serverdialog.cpp:247
+#: src/gui/serverdialog.cpp:248
 msgid "Use same ip for game sub servers"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:261
+#: src/gui/serverdialog.cpp:262
 #, fuzzy
 msgid "Server type:"
 msgstr "Server:"
 
-#: src/gui/serverdialog.cpp:285
+#: src/gui/serverdialog.cpp:286
 msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:286
+#: src/gui/serverdialog.cpp:287
 #, fuzzy
 msgid "Connect"
 msgstr "Opretter forbindelse..."
 
-#: src/gui/serverdialog.cpp:287
+#: src/gui/serverdialog.cpp:288
 #, fuzzy
 msgid "Custom Server"
 msgstr "Brugerdefineret cursor"
 
-#: src/gui/serverdialog.cpp:392
+#: src/gui/serverdialog.cpp:393
 msgid "Please type both the address and the port of a server."
 msgstr "Skriv både adressen og porten på serveren."
 
-#: src/gui/serverdialog.cpp:550
+#: src/gui/serverdialog.cpp:551
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:555
+#: src/gui/serverdialog.cpp:556
 #, fuzzy
 msgid "Waiting for server..."
 msgstr "Venter på serveren"
 
-#: src/gui/serverdialog.cpp:559
+#: src/gui/serverdialog.cpp:560
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:563
+#: src/gui/serverdialog.cpp:564
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:661
+#: src/gui/serverdialog.cpp:662
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:663
+#: src/gui/serverdialog.cpp:664
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -4235,69 +4240,69 @@ msgstr "Løs problemet, ellers kan spillet risikere at opfører sig ustabilt."
 msgid "You were killed by "
 msgstr ""
 
-#: src/localplayer.cpp:1379
+#: src/localplayer.cpp:1375
 #, fuzzy
 msgid "Tried to pick up nonexistent item."
 msgstr "Du kunne ikke bruge denne genstand."
 
-#: src/localplayer.cpp:1381
+#: src/localplayer.cpp:1377
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1383
+#: src/localplayer.cpp:1379
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1385
+#: src/localplayer.cpp:1381
 #, fuzzy
 msgid "Inventory is full."
 msgstr "Serveren er fuld"
 
-#: src/localplayer.cpp:1387
+#: src/localplayer.cpp:1383
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1390
+#: src/localplayer.cpp:1386
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1393
+#: src/localplayer.cpp:1389
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1417
+#: src/localplayer.cpp:1413
 #, fuzzy, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "Du samlede %s [@@%d|%s@@] op."
 msgstr[1] "Du samlede %s [@@%d|%s@@] op."
 
-#: src/localplayer.cpp:3146
+#: src/localplayer.cpp:3142
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3450
+#: src/localplayer.cpp:3446
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3452 src/localplayer.cpp:3467
+#: src/localplayer.cpp:3448 src/localplayer.cpp:3463
 #, fuzzy
 msgid "Follow canceled"
 msgstr "Handel annulleret."
 
-#: src/localplayer.cpp:3459
+#: src/localplayer.cpp:3455
 #, fuzzy
 msgid "Imitation: "
 msgstr "Skift e-mail adresse"
 
-#: src/localplayer.cpp:3461 src/localplayer.cpp:3469
+#: src/localplayer.cpp:3457 src/localplayer.cpp:3465
 #, fuzzy
 msgid "Imitation canceled"
 msgstr "Handel annulleret."
 
-#: src/localplayer.cpp:3821
+#: src/localplayer.cpp:3817
 #, fuzzy
 msgid "You see "
 msgstr "Du får %s."
@@ -5046,32 +5051,32 @@ msgstr "M.Angreb:"
 msgid "M.Defense"
 msgstr "M.Forsvar:"
 
-#: src/net/tmwa/generalhandler.cpp:268
-#, fuzzy
+#: src/net/tmwa/generalhandler.cpp:269
+#, fuzzy, no-c-format
 msgid "% Accuracy"
 msgstr "% præcission:"
 
-#: src/net/tmwa/generalhandler.cpp:269
-#, fuzzy
+#: src/net/tmwa/generalhandler.cpp:271
+#, fuzzy, no-c-format
 msgid "% Evade"
 msgstr "% Undgå angreb."
 
-#: src/net/tmwa/generalhandler.cpp:270
-#, fuzzy
+#: src/net/tmwa/generalhandler.cpp:273
+#, fuzzy, no-c-format
 msgid "% Critical"
 msgstr "Kritisk sår"
 
-#: src/net/tmwa/generalhandler.cpp:271
+#: src/net/tmwa/generalhandler.cpp:274
 #, fuzzy
 msgid "Attack Delay"
 msgstr "Angreb %+d"
 
-#: src/net/tmwa/generalhandler.cpp:273
+#: src/net/tmwa/generalhandler.cpp:276
 #, fuzzy
 msgid "Walk Delay"
 msgstr "Angreb %+d"
 
-#: src/net/tmwa/generalhandler.cpp:275
+#: src/net/tmwa/generalhandler.cpp:278
 #, fuzzy
 msgid "Attack Range"
 msgstr "Monster rammer spiller"
diff --git a/po/de.po b/po/de.po
index 6839da1ec..d1e2f9eb9 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-06-25 18:01+0300\n"
+"POT-Creation-Date: 2011-07-02 00:39+0300\n"
 "PO-Revision-Date: 2011-06-20 00:31+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: German (http://www.transifex.net/projects/p/manaplus/team/"
@@ -32,88 +32,88 @@ msgstr "ausweichen"
 msgid "miss"
 msgstr "verfehlt"
 
-#: src/client.cpp:817 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
+#: src/client.cpp:821 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Einstellungen"
 
-#: src/client.cpp:896
+#: src/client.cpp:900
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:927
+#: src/client.cpp:931
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:960
+#: src/client.cpp:964
 msgid "Entering game world"
 msgstr "Betrete die Spielwelt"
 
-#: src/client.cpp:1052
+#: src/client.cpp:1056
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:1083
+#: src/client.cpp:1087
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:1093
+#: src/client.cpp:1097
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1130 src/client.cpp:1137 src/client.cpp:1274
+#: src/client.cpp:1134 src/client.cpp:1141 src/client.cpp:1278
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:391
+#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
 #: src/gui/unregisterdialog.cpp:137 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227 src/net/tmwa/charserverhandler.cpp:190
 #: src/net/tmwa/charserverhandler.cpp:206
 msgid "Error"
 msgstr "Fehler"
 
-#: src/client.cpp:1146
+#: src/client.cpp:1150
 msgid "Requesting registration details"
 msgstr "Fordere Registrierungsdetails an"
 
-#: src/client.cpp:1173
+#: src/client.cpp:1177
 msgid "Password Change"
 msgstr "Passwort ändern:"
 
-#: src/client.cpp:1174
+#: src/client.cpp:1178
 msgid "Password changed successfully!"
 msgstr "Passwort erfolgreich geändert!"
 
-#: src/client.cpp:1193
+#: src/client.cpp:1197
 msgid "Email Change"
 msgstr "E-Mail ändern"
 
-#: src/client.cpp:1194
+#: src/client.cpp:1198
 msgid "Email changed successfully!"
 msgstr "E-Mail erfolgreich geändert!"
 
-#: src/client.cpp:1214
+#: src/client.cpp:1218
 msgid "Unregister Successful"
 msgstr "erfolgreich abgemeldet."
 
-#: src/client.cpp:1215
+#: src/client.cpp:1219
 msgid "Farewell, come back any time..."
 msgstr "Leb wohl und komme jeder Zeit wieder..."
 
-#: src/client.cpp:1404 src/client.cpp:1434 src/client.cpp:1478
-#: src/client.cpp:1894
+#: src/client.cpp:1408 src/client.cpp:1438 src/client.cpp:1482
+#: src/client.cpp:1898
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s existiert nicht und kann nicht erstellt werden! Beende."
 
-#: src/client.cpp:1608
+#: src/client.cpp:1612
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Unbekannter Update-Rechner: %s"
 
-#: src/client.cpp:1642 src/client.cpp:1648
+#: src/client.cpp:1646 src/client.cpp:1652
 msgid "Error creating updates directory!"
 msgstr "Fehler beim Erstellen des Verzeichnisses für Updates!"
 
-#: src/client.cpp:1669
+#: src/client.cpp:1673
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -415,7 +415,7 @@ msgstr "-"
 
 #: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
 #: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
-#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:284
+#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:285
 #: src/keyboardconfig.cpp:287
 msgid "Quit"
 msgstr "Beenden"
@@ -489,7 +489,7 @@ msgstr "Die neuen E-Mailadresse stimmen nicht überein."
 msgid "Change Password"
 msgstr "Passwort ändern"
 
-#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:94
+#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:95
 #: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56
 msgid "Password:"
 msgstr "Passwort:"
@@ -520,7 +520,7 @@ msgstr "Die neues Passwörter stimmen nicht überein."
 msgid "Create Character"
 msgstr "Charakter erstellen"
 
-#: src/gui/charcreatedialog.cpp:73 src/gui/logindialog.cpp:93
+#: src/gui/charcreatedialog.cpp:73 src/gui/logindialog.cpp:94
 #: src/gui/register.cpp:75
 msgid "Name:"
 msgstr "Name :"
@@ -619,7 +619,7 @@ msgstr ""
 msgid "Enter password:"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:288
+#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
 #: src/gui/setup_players.cpp:251 src/gui/shopwindow.cpp:120
 #: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:240
 msgid "Delete"
@@ -1132,32 +1132,32 @@ msgstr ""
 msgid "Skip"
 msgstr ""
 
-#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:122
+#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:123
 msgid "Login"
 msgstr "Anmelden"
 
-#: src/gui/logindialog.cpp:90 src/gui/serverdialog.cpp:243
+#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:243
 #: src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr "Server:"
 
-#: src/gui/logindialog.cpp:95
+#: src/gui/logindialog.cpp:96
 msgid "Custom update host"
 msgstr ""
 
-#: src/gui/logindialog.cpp:109
+#: src/gui/logindialog.cpp:110
 msgid "Remember username"
 msgstr "Benutzername merken"
 
-#: src/gui/logindialog.cpp:110
+#: src/gui/logindialog.cpp:111
 msgid "Update:"
 msgstr ""
 
-#: src/gui/logindialog.cpp:120 src/gui/register.cpp:66 src/gui/register.cpp:81
+#: src/gui/logindialog.cpp:121 src/gui/register.cpp:66 src/gui/register.cpp:81
 msgid "Register"
 msgstr "Registrieren"
 
-#: src/gui/logindialog.cpp:121
+#: src/gui/logindialog.cpp:122
 msgid "Change Server"
 msgstr "Wechsle den Server"
 
@@ -1606,56 +1606,61 @@ msgstr "Passwörter stimmen nicht überein."
 msgid "Choose Your Server"
 msgstr "Wähle deinen Server"
 
+#: src/gui/serverdialog.cpp:239
+#, fuzzy
+msgid "Choose Your Server  *** SAFE MODE ***"
+msgstr "Wähle deinen Server"
+
 #: src/gui/serverdialog.cpp:244
 msgid "Port:"
 msgstr "Port:"
 
-#: src/gui/serverdialog.cpp:247
+#: src/gui/serverdialog.cpp:248
 msgid "Use same ip for game sub servers"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:261
+#: src/gui/serverdialog.cpp:262
 msgid "Server type:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:285
+#: src/gui/serverdialog.cpp:286
 msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:286
+#: src/gui/serverdialog.cpp:287
 msgid "Connect"
 msgstr "Verbinde..."
 
-#: src/gui/serverdialog.cpp:287
+#: src/gui/serverdialog.cpp:288
 msgid "Custom Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:392
+#: src/gui/serverdialog.cpp:393
 msgid "Please type both the address and the port of a server."
 msgstr "Bitte die Adresse und den Port eines Servers eingeben"
 
-#: src/gui/serverdialog.cpp:550
+#: src/gui/serverdialog.cpp:551
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Lade Serverliste herunter...%2.2f%%"
 
-#: src/gui/serverdialog.cpp:555
+#: src/gui/serverdialog.cpp:556
 msgid "Waiting for server..."
 msgstr "Warte auf den Server"
 
-#: src/gui/serverdialog.cpp:559
+#: src/gui/serverdialog.cpp:560
 msgid "Preparing download"
 msgstr "Download wird vorbereitet"
 
-#: src/gui/serverdialog.cpp:563
+#: src/gui/serverdialog.cpp:564
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:661
+#: src/gui/serverdialog.cpp:662
 msgid "requires a newer version"
 msgstr "benötigt eine neuere Version"
 
-#: src/gui/serverdialog.cpp:663
+#: src/gui/serverdialog.cpp:664
 #, c-format
 msgid "requires v%s"
 msgstr "benötigt v%s"
@@ -3969,64 +3974,64 @@ msgstr ""
 msgid "You were killed by "
 msgstr ""
 
-#: src/localplayer.cpp:1379
+#: src/localplayer.cpp:1375
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1381
+#: src/localplayer.cpp:1377
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1383
+#: src/localplayer.cpp:1379
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1385
+#: src/localplayer.cpp:1381
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1387
+#: src/localplayer.cpp:1383
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1390
+#: src/localplayer.cpp:1386
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1393
+#: src/localplayer.cpp:1389
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1417
+#: src/localplayer.cpp:1413
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/localplayer.cpp:3146
+#: src/localplayer.cpp:3142
 msgid "Away"
 msgstr "Abwesend"
 
-#: src/localplayer.cpp:3450
+#: src/localplayer.cpp:3446
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3452 src/localplayer.cpp:3467
+#: src/localplayer.cpp:3448 src/localplayer.cpp:3463
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3459
+#: src/localplayer.cpp:3455
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3461 src/localplayer.cpp:3469
+#: src/localplayer.cpp:3457 src/localplayer.cpp:3465
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3821
+#: src/localplayer.cpp:3817
 msgid "You see "
 msgstr ""
 
@@ -4721,27 +4726,30 @@ msgstr "M.Angriff:"
 msgid "M.Defense"
 msgstr "M.Verteidigung:"
 
-#: src/net/tmwa/generalhandler.cpp:268
+#: src/net/tmwa/generalhandler.cpp:269
+#, no-c-format
 msgid "% Accuracy"
 msgstr "% Accuracy"
 
-#: src/net/tmwa/generalhandler.cpp:269
+#: src/net/tmwa/generalhandler.cpp:271
+#, no-c-format
 msgid "% Evade"
 msgstr "% Evade"
 
-#: src/net/tmwa/generalhandler.cpp:270
+#: src/net/tmwa/generalhandler.cpp:273
+#, no-c-format
 msgid "% Critical"
 msgstr "% Critical"
 
-#: src/net/tmwa/generalhandler.cpp:271
+#: src/net/tmwa/generalhandler.cpp:274
 msgid "Attack Delay"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:273
+#: src/net/tmwa/generalhandler.cpp:276
 msgid "Walk Delay"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:275
+#: src/net/tmwa/generalhandler.cpp:278
 msgid "Attack Range"
 msgstr ""
 
diff --git a/po/en_GB.po b/po/en_GB.po
index 32c2bb0f5..2adb8fad6 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-06-25 18:01+0300\n"
+"POT-Creation-Date: 2011-07-02 00:39+0300\n"
 "PO-Revision-Date: 2010-03-04 21:01+0000\n"
 "Last-Translator: issyl0 <isabell121@gmail.com>\n"
 "Language-Team: English (United Kingdom) <en_GB@li.org>\n"
@@ -32,97 +32,97 @@ msgstr ""
 msgid "miss"
 msgstr ""
 
-#: src/client.cpp:817 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
+#: src/client.cpp:821 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Setup"
 
-#: src/client.cpp:896
+#: src/client.cpp:900
 #, fuzzy
 msgid "Connecting to server"
 msgstr "Connecting to map server..."
 
-#: src/client.cpp:927
+#: src/client.cpp:931
 #, fuzzy
 msgid "Logging in"
 msgstr "Login"
 
-#: src/client.cpp:960
+#: src/client.cpp:964
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1052
+#: src/client.cpp:1056
 #, fuzzy
 msgid "Requesting characters"
 msgstr "Select Character"
 
-#: src/client.cpp:1083
+#: src/client.cpp:1087
 #, fuzzy
 msgid "Connecting to the game server"
 msgstr "Connecting to map server..."
 
-#: src/client.cpp:1093
+#: src/client.cpp:1097
 #, fuzzy
 msgid "Changing game servers"
 msgstr "Server"
 
-#: src/client.cpp:1130 src/client.cpp:1137 src/client.cpp:1274
+#: src/client.cpp:1134 src/client.cpp:1141 src/client.cpp:1278
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:391
+#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
 #: src/gui/unregisterdialog.cpp:137 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227 src/net/tmwa/charserverhandler.cpp:190
 #: src/net/tmwa/charserverhandler.cpp:206
 msgid "Error"
 msgstr "Error"
 
-#: src/client.cpp:1146
+#: src/client.cpp:1150
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1173
+#: src/client.cpp:1177
 #, fuzzy
 msgid "Password Change"
 msgstr "Password:"
 
-#: src/client.cpp:1174
+#: src/client.cpp:1178
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1193
+#: src/client.cpp:1197
 #, fuzzy
 msgid "Email Change"
 msgstr "Change"
 
-#: src/client.cpp:1194
+#: src/client.cpp:1198
 #, fuzzy
 msgid "Email changed successfully!"
 msgstr "Member was promoted successfully."
 
-#: src/client.cpp:1214
+#: src/client.cpp:1218
 #, fuzzy
 msgid "Unregister Successful"
 msgstr "Unregister"
 
-#: src/client.cpp:1215
+#: src/client.cpp:1219
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1404 src/client.cpp:1434 src/client.cpp:1478
-#: src/client.cpp:1894
+#: src/client.cpp:1408 src/client.cpp:1438 src/client.cpp:1482
+#: src/client.cpp:1898
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1608
+#: src/client.cpp:1612
 #, fuzzy, c-format
 msgid "Invalid update host: %s"
 msgstr "Invalid update host: "
 
-#: src/client.cpp:1642 src/client.cpp:1648
+#: src/client.cpp:1646 src/client.cpp:1652
 msgid "Error creating updates directory!"
 msgstr "Error creating updates directory!"
 
-#: src/client.cpp:1669
+#: src/client.cpp:1673
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -439,7 +439,7 @@ msgstr ""
 
 #: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
 #: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
-#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:284
+#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:285
 #: src/keyboardconfig.cpp:287
 msgid "Quit"
 msgstr "Exit"
@@ -515,7 +515,7 @@ msgstr "The new Email Address already exists."
 msgid "Change Password"
 msgstr "Change Password"
 
-#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:94
+#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:95
 #: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56
 msgid "Password:"
 msgstr "Password:"
@@ -547,7 +547,7 @@ msgstr ""
 msgid "Create Character"
 msgstr "Create Character"
 
-#: src/gui/charcreatedialog.cpp:73 src/gui/logindialog.cpp:93
+#: src/gui/charcreatedialog.cpp:73 src/gui/logindialog.cpp:94
 #: src/gui/register.cpp:75
 msgid "Name:"
 msgstr "Name:"
@@ -652,7 +652,7 @@ msgstr "Failed to delete character."
 msgid "Enter password:"
 msgstr "Wrong password"
 
-#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:288
+#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
 #: src/gui/setup_players.cpp:251 src/gui/shopwindow.cpp:120
 #: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:240
 msgid "Delete"
@@ -1204,33 +1204,33 @@ msgstr "Close"
 msgid "Skip"
 msgstr ""
 
-#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:122
+#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:123
 msgid "Login"
 msgstr "Login"
 
-#: src/gui/logindialog.cpp:90 src/gui/serverdialog.cpp:243
+#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:243
 #: src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr "Server:"
 
-#: src/gui/logindialog.cpp:95
+#: src/gui/logindialog.cpp:96
 msgid "Custom update host"
 msgstr ""
 
-#: src/gui/logindialog.cpp:109
+#: src/gui/logindialog.cpp:110
 #, fuzzy
 msgid "Remember username"
 msgstr "Remember Username"
 
-#: src/gui/logindialog.cpp:110
+#: src/gui/logindialog.cpp:111
 msgid "Update:"
 msgstr ""
 
-#: src/gui/logindialog.cpp:120 src/gui/register.cpp:66 src/gui/register.cpp:81
+#: src/gui/logindialog.cpp:121 src/gui/register.cpp:66 src/gui/register.cpp:81
 msgid "Register"
 msgstr "Register"
 
-#: src/gui/logindialog.cpp:121
+#: src/gui/logindialog.cpp:122
 #, fuzzy
 msgid "Change Server"
 msgstr "Server"
@@ -1731,60 +1731,65 @@ msgstr "Passwords do not match."
 msgid "Choose Your Server"
 msgstr "Choose your server"
 
+#: src/gui/serverdialog.cpp:239
+#, fuzzy
+msgid "Choose Your Server  *** SAFE MODE ***"
+msgstr "Choose your server"
+
 #: src/gui/serverdialog.cpp:244
 msgid "Port:"
 msgstr "Port:"
 
-#: src/gui/serverdialog.cpp:247
+#: src/gui/serverdialog.cpp:248
 msgid "Use same ip for game sub servers"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:261
+#: src/gui/serverdialog.cpp:262
 #, fuzzy
 msgid "Server type:"
 msgstr "Server:"
 
-#: src/gui/serverdialog.cpp:285
+#: src/gui/serverdialog.cpp:286
 msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:286
+#: src/gui/serverdialog.cpp:287
 #, fuzzy
 msgid "Connect"
 msgstr "Connecting..."
 
-#: src/gui/serverdialog.cpp:287
+#: src/gui/serverdialog.cpp:288
 #, fuzzy
 msgid "Custom Server"
 msgstr "Custom cursor"
 
-#: src/gui/serverdialog.cpp:392
+#: src/gui/serverdialog.cpp:393
 msgid "Please type both the address and the port of a server."
 msgstr "Please type both the address and the port of a server."
 
-#: src/gui/serverdialog.cpp:550
+#: src/gui/serverdialog.cpp:551
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:555
+#: src/gui/serverdialog.cpp:556
 #, fuzzy
 msgid "Waiting for server..."
 msgstr "Waiting for server"
 
-#: src/gui/serverdialog.cpp:559
+#: src/gui/serverdialog.cpp:560
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:563
+#: src/gui/serverdialog.cpp:564
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:661
+#: src/gui/serverdialog.cpp:662
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:663
+#: src/gui/serverdialog.cpp:664
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -4227,70 +4232,70 @@ msgstr "Resolve them, or gameplay may result in strange behaviour."
 msgid "You were killed by "
 msgstr ""
 
-#: src/localplayer.cpp:1379
+#: src/localplayer.cpp:1375
 #, fuzzy
 msgid "Tried to pick up nonexistent item."
 msgstr "Unable to pick up item."
 
-#: src/localplayer.cpp:1381
+#: src/localplayer.cpp:1377
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1383
+#: src/localplayer.cpp:1379
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1385
+#: src/localplayer.cpp:1381
 #, fuzzy
 msgid "Inventory is full."
 msgstr "Server is full"
 
-#: src/localplayer.cpp:1387
+#: src/localplayer.cpp:1383
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1390
+#: src/localplayer.cpp:1386
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1393
+#: src/localplayer.cpp:1389
 #, fuzzy
 msgid "Unknown problem picking up item."
 msgstr "Unable to pick up item."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1417
+#: src/localplayer.cpp:1413
 #, fuzzy, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "You picked up %s [@@%d|%s@@]."
 msgstr[1] "You picked up %s [@@%d|%s@@]."
 
-#: src/localplayer.cpp:3146
+#: src/localplayer.cpp:3142
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3450
+#: src/localplayer.cpp:3446
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3452 src/localplayer.cpp:3467
+#: src/localplayer.cpp:3448 src/localplayer.cpp:3463
 #, fuzzy
 msgid "Follow canceled"
 msgstr "Trade canceled."
 
-#: src/localplayer.cpp:3459
+#: src/localplayer.cpp:3455
 #, fuzzy
 msgid "Imitation: "
 msgstr "Change Email Address"
 
-#: src/localplayer.cpp:3461 src/localplayer.cpp:3469
+#: src/localplayer.cpp:3457 src/localplayer.cpp:3465
 #, fuzzy
 msgid "Imitation canceled"
 msgstr "Trade canceled."
 
-#: src/localplayer.cpp:3821
+#: src/localplayer.cpp:3817
 #, fuzzy
 msgid "You see "
 msgstr "You get %s."
@@ -5044,32 +5049,32 @@ msgstr "M.Attack:"
 msgid "M.Defense"
 msgstr "M.Defense:"
 
-#: src/net/tmwa/generalhandler.cpp:268
-#, fuzzy
+#: src/net/tmwa/generalhandler.cpp:269
+#, fuzzy, no-c-format
 msgid "% Accuracy"
 msgstr "% Accuracy:"
 
-#: src/net/tmwa/generalhandler.cpp:269
-#, fuzzy
+#: src/net/tmwa/generalhandler.cpp:271
+#, fuzzy, no-c-format
 msgid "% Evade"
 msgstr "% Evade:"
 
-#: src/net/tmwa/generalhandler.cpp:270
-#, fuzzy
+#: src/net/tmwa/generalhandler.cpp:273
+#, fuzzy, no-c-format
 msgid "% Critical"
 msgstr "Critical Hit"
 
-#: src/net/tmwa/generalhandler.cpp:271
+#: src/net/tmwa/generalhandler.cpp:274
 #, fuzzy
 msgid "Attack Delay"
 msgstr "Attack %+d"
 
-#: src/net/tmwa/generalhandler.cpp:273
+#: src/net/tmwa/generalhandler.cpp:276
 #, fuzzy
 msgid "Walk Delay"
 msgstr "Attack %+d"
 
-#: src/net/tmwa/generalhandler.cpp:275
+#: src/net/tmwa/generalhandler.cpp:278
 #, fuzzy
 msgid "Attack Range"
 msgstr "Monster hits Player"
diff --git a/po/es.po b/po/es.po
index e29c962b7..bb2ed0ec8 100644
--- a/po/es.po
+++ b/po/es.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-06-25 18:01+0300\n"
+"POT-Creation-Date: 2011-07-02 00:39+0300\n"
 "PO-Revision-Date: 2011-06-20 14:11+0000\n"
 "Last-Translator: nelson6e65 <nelson6eeduardo65@gmail.com>\n"
 "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/"
@@ -33,88 +33,88 @@ msgstr "evade"
 msgid "miss"
 msgstr "falla"
 
-#: src/client.cpp:817 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
+#: src/client.cpp:821 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Configuración"
 
-#: src/client.cpp:896
+#: src/client.cpp:900
 msgid "Connecting to server"
 msgstr "Conectando al servidor"
 
-#: src/client.cpp:927
+#: src/client.cpp:931
 msgid "Logging in"
 msgstr "Accediendo a la cuenta"
 
-#: src/client.cpp:960
+#: src/client.cpp:964
 msgid "Entering game world"
 msgstr "Entrando al mundo del juego"
 
-#: src/client.cpp:1052
+#: src/client.cpp:1056
 msgid "Requesting characters"
 msgstr "Cargando jugadores"
 
-#: src/client.cpp:1083
+#: src/client.cpp:1087
 msgid "Connecting to the game server"
 msgstr "Conectando al servidor del juego"
 
-#: src/client.cpp:1093
+#: src/client.cpp:1097
 msgid "Changing game servers"
 msgstr "Cambiando el servidor del juego"
 
-#: src/client.cpp:1130 src/client.cpp:1137 src/client.cpp:1274
+#: src/client.cpp:1134 src/client.cpp:1141 src/client.cpp:1278
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:391
+#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
 #: src/gui/unregisterdialog.cpp:137 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227 src/net/tmwa/charserverhandler.cpp:190
 #: src/net/tmwa/charserverhandler.cpp:206
 msgid "Error"
 msgstr "Error"
 
-#: src/client.cpp:1146
+#: src/client.cpp:1150
 msgid "Requesting registration details"
 msgstr "Solicitando detalles de registro"
 
-#: src/client.cpp:1173
+#: src/client.cpp:1177
 msgid "Password Change"
 msgstr "Cambio de contraseña"
 
-#: src/client.cpp:1174
+#: src/client.cpp:1178
 msgid "Password changed successfully!"
 msgstr "¡La contraseña se cambió correctamente!"
 
-#: src/client.cpp:1193
+#: src/client.cpp:1197
 msgid "Email Change"
 msgstr "Cambio de Email"
 
-#: src/client.cpp:1194
+#: src/client.cpp:1198
 msgid "Email changed successfully!"
 msgstr "¡Email modificado correctamente!"
 
-#: src/client.cpp:1214
+#: src/client.cpp:1218
 msgid "Unregister Successful"
 msgstr "Registro cancelado"
 
-#: src/client.cpp:1215
+#: src/client.cpp:1219
 msgid "Farewell, come back any time..."
 msgstr "Adiós, vuelve cuando quieras..."
 
-#: src/client.cpp:1404 src/client.cpp:1434 src/client.cpp:1478
-#: src/client.cpp:1894
+#: src/client.cpp:1408 src/client.cpp:1438 src/client.cpp:1482
+#: src/client.cpp:1898
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "¡%s no existe y no puede ser creado! Saliendo."
 
-#: src/client.cpp:1608
+#: src/client.cpp:1612
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Host de actualización inválido: %s"
 
-#: src/client.cpp:1642 src/client.cpp:1648
+#: src/client.cpp:1646 src/client.cpp:1652
 msgid "Error creating updates directory!"
 msgstr "¡Error creando la carpeta de actualizaciones!"
 
-#: src/client.cpp:1669
+#: src/client.cpp:1673
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Error: ¡%s no existe y no puede ser creado! Saliendo."
@@ -415,7 +415,7 @@ msgstr "-"
 
 #: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
 #: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
-#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:284
+#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:285
 #: src/keyboardconfig.cpp:287
 msgid "Quit"
 msgstr "Salir"
@@ -489,7 +489,7 @@ msgstr "Los e-mail son distintos."
 msgid "Change Password"
 msgstr "Cambiar contraseña"
 
-#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:94
+#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:95
 #: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56
 msgid "Password:"
 msgstr "Contraseña:"
@@ -520,7 +520,7 @@ msgstr "Las nuevas contraseñas no concuerdan."
 msgid "Create Character"
 msgstr "Crear Personaje"
 
-#: src/gui/charcreatedialog.cpp:73 src/gui/logindialog.cpp:93
+#: src/gui/charcreatedialog.cpp:73 src/gui/logindialog.cpp:94
 #: src/gui/register.cpp:75
 msgid "Name:"
 msgstr "Nombre:"
@@ -619,7 +619,7 @@ msgstr "Ingrese la contraseña para borrar el personaje"
 msgid "Enter password:"
 msgstr "Ingrese contraseña:"
 
-#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:288
+#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
 #: src/gui/setup_players.cpp:251 src/gui/shopwindow.cpp:120
 #: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:240
 msgid "Delete"
@@ -1132,32 +1132,32 @@ msgstr "Auto Cerrar"
 msgid "Skip"
 msgstr "Saltar"
 
-#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:122
+#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:123
 msgid "Login"
 msgstr "Login"
 
-#: src/gui/logindialog.cpp:90 src/gui/serverdialog.cpp:243
+#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:243
 #: src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr "Servidor:"
 
-#: src/gui/logindialog.cpp:95
+#: src/gui/logindialog.cpp:96
 msgid "Custom update host"
 msgstr "Host de actualización personalizado"
 
-#: src/gui/logindialog.cpp:109
+#: src/gui/logindialog.cpp:110
 msgid "Remember username"
 msgstr "Recordar nombre de usuario"
 
-#: src/gui/logindialog.cpp:110
+#: src/gui/logindialog.cpp:111
 msgid "Update:"
 msgstr "Actualizar:"
 
-#: src/gui/logindialog.cpp:120 src/gui/register.cpp:66 src/gui/register.cpp:81
+#: src/gui/logindialog.cpp:121 src/gui/register.cpp:66 src/gui/register.cpp:81
 msgid "Register"
 msgstr "Registrar"
 
-#: src/gui/logindialog.cpp:121
+#: src/gui/logindialog.cpp:122
 msgid "Change Server"
 msgstr "Cambiar de servidor"
 
@@ -1606,56 +1606,61 @@ msgstr "Las contraseñas no coinciden."
 msgid "Choose Your Server"
 msgstr "Escoja tu servidor"
 
+#: src/gui/serverdialog.cpp:239
+#, fuzzy
+msgid "Choose Your Server  *** SAFE MODE ***"
+msgstr "Escoja tu servidor"
+
 #: src/gui/serverdialog.cpp:244
 msgid "Port:"
 msgstr "Puerto:"
 
-#: src/gui/serverdialog.cpp:247
+#: src/gui/serverdialog.cpp:248
 msgid "Use same ip for game sub servers"
 msgstr "Usar el mismo ip para los subservidores del juego"
 
-#: src/gui/serverdialog.cpp:261
+#: src/gui/serverdialog.cpp:262
 msgid "Server type:"
 msgstr "Tipo de servidor:"
 
-#: src/gui/serverdialog.cpp:285
+#: src/gui/serverdialog.cpp:286
 msgid "Load"
 msgstr "Cargar"
 
-#: src/gui/serverdialog.cpp:286
+#: src/gui/serverdialog.cpp:287
 msgid "Connect"
 msgstr "Conectar"
 
-#: src/gui/serverdialog.cpp:287
+#: src/gui/serverdialog.cpp:288
 msgid "Custom Server"
 msgstr "Servidor propio"
 
-#: src/gui/serverdialog.cpp:392
+#: src/gui/serverdialog.cpp:393
 msgid "Please type both the address and the port of a server."
 msgstr "Por favor especifique el nombre y el puerto del servidor."
 
-#: src/gui/serverdialog.cpp:550
+#: src/gui/serverdialog.cpp:551
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Bajando la lista de servidores...%2.2f%%"
 
-#: src/gui/serverdialog.cpp:555
+#: src/gui/serverdialog.cpp:556
 msgid "Waiting for server..."
 msgstr "Esperando al servidor..."
 
-#: src/gui/serverdialog.cpp:559
+#: src/gui/serverdialog.cpp:560
 msgid "Preparing download"
 msgstr "Preparando la descarga"
 
-#: src/gui/serverdialog.cpp:563
+#: src/gui/serverdialog.cpp:564
 msgid "Error retreiving server list!"
 msgstr "Error al recuperar la lista de servers!"
 
-#: src/gui/serverdialog.cpp:661
+#: src/gui/serverdialog.cpp:662
 msgid "requires a newer version"
 msgstr "requiere una version mas nueva"
 
-#: src/gui/serverdialog.cpp:663
+#: src/gui/serverdialog.cpp:664
 #, c-format
 msgid "requires v%s"
 msgstr "requiere v%s"
@@ -3970,64 +3975,64 @@ msgstr ""
 msgid "You were killed by "
 msgstr "Fuiste eliminado por "
 
-#: src/localplayer.cpp:1379
+#: src/localplayer.cpp:1375
 msgid "Tried to pick up nonexistent item."
 msgstr "Intentaste recoger un objeto inexistante."
 
-#: src/localplayer.cpp:1381
+#: src/localplayer.cpp:1377
 msgid "Item is too heavy."
 msgstr "El artículo es muy pesado."
 
-#: src/localplayer.cpp:1383
+#: src/localplayer.cpp:1379
 msgid "Item is too far away."
 msgstr "El artículo está muy lejos."
 
-#: src/localplayer.cpp:1385
+#: src/localplayer.cpp:1381
 msgid "Inventory is full."
 msgstr "El inventario está lleno."
 
-#: src/localplayer.cpp:1387
+#: src/localplayer.cpp:1383
 msgid "Stack is too big."
 msgstr "El agrupamiento es demasiado grande."
 
-#: src/localplayer.cpp:1390
+#: src/localplayer.cpp:1386
 msgid "Item belongs to someone else."
 msgstr "El artículo pertenece a alguien más."
 
-#: src/localplayer.cpp:1393
+#: src/localplayer.cpp:1389
 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:1417
+#: src/localplayer.cpp:1413
 #, 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:3146
+#: src/localplayer.cpp:3142
 msgid "Away"
 msgstr "Fuera del Teclado"
 
-#: src/localplayer.cpp:3450
+#: src/localplayer.cpp:3446
 msgid "Follow: "
 msgstr "Seguir: "
 
-#: src/localplayer.cpp:3452 src/localplayer.cpp:3467
+#: src/localplayer.cpp:3448 src/localplayer.cpp:3463
 msgid "Follow canceled"
 msgstr "Seguir cancelado"
 
-#: src/localplayer.cpp:3459
+#: src/localplayer.cpp:3455
 msgid "Imitation: "
 msgstr "Imitacion: "
 
-#: src/localplayer.cpp:3461 src/localplayer.cpp:3469
+#: src/localplayer.cpp:3457 src/localplayer.cpp:3465
 msgid "Imitation canceled"
 msgstr "Imitar cancelado"
 
-#: src/localplayer.cpp:3821
+#: src/localplayer.cpp:3817
 msgid "You see "
 msgstr "Ves "
 
@@ -4718,27 +4723,30 @@ msgstr "Ataque M."
 msgid "M.Defense"
 msgstr "Defensa M."
 
-#: src/net/tmwa/generalhandler.cpp:268
+#: src/net/tmwa/generalhandler.cpp:269
+#, no-c-format
 msgid "% Accuracy"
 msgstr "% Precisión"
 
-#: src/net/tmwa/generalhandler.cpp:269
+#: src/net/tmwa/generalhandler.cpp:271
+#, no-c-format
 msgid "% Evade"
 msgstr "% Evasión"
 
-#: src/net/tmwa/generalhandler.cpp:270
+#: src/net/tmwa/generalhandler.cpp:273
+#, no-c-format
 msgid "% Critical"
 msgstr "% Crítico"
 
-#: src/net/tmwa/generalhandler.cpp:271
+#: src/net/tmwa/generalhandler.cpp:274
 msgid "Attack Delay"
 msgstr "Retardo de Ataque"
 
-#: src/net/tmwa/generalhandler.cpp:273
+#: src/net/tmwa/generalhandler.cpp:276
 msgid "Walk Delay"
 msgstr "Retardo de Marcha"
 
-#: src/net/tmwa/generalhandler.cpp:275
+#: src/net/tmwa/generalhandler.cpp:278
 msgid "Attack Range"
 msgstr "Alcance de Ataque"
 
diff --git a/po/fi.po b/po/fi.po
index c03fad6b6..517a0e7f6 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-06-25 18:01+0300\n"
+"POT-Creation-Date: 2011-07-02 00:39+0300\n"
 "PO-Revision-Date: 2011-06-20 00:31+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -30,88 +30,88 @@ msgstr "väistö"
 msgid "miss"
 msgstr "huti"
 
-#: src/client.cpp:817 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
+#: src/client.cpp:821 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Asetukset"
 
-#: src/client.cpp:896
+#: src/client.cpp:900
 msgid "Connecting to server"
 msgstr "Yhdistän palvelimeen"
 
-#: src/client.cpp:927
+#: src/client.cpp:931
 msgid "Logging in"
 msgstr "Kirjaudun sisään"
 
-#: src/client.cpp:960
+#: src/client.cpp:964
 msgid "Entering game world"
 msgstr "Siirryn pelimaailmaan"
 
-#: src/client.cpp:1052
+#: src/client.cpp:1056
 msgid "Requesting characters"
 msgstr "Pyydän hahmoja"
 
-#: src/client.cpp:1083
+#: src/client.cpp:1087
 msgid "Connecting to the game server"
 msgstr "Yhdistän pelipalvelimeen"
 
-#: src/client.cpp:1093
+#: src/client.cpp:1097
 msgid "Changing game servers"
 msgstr "Vaihdan pelipalvelinta"
 
-#: src/client.cpp:1130 src/client.cpp:1137 src/client.cpp:1274
+#: src/client.cpp:1134 src/client.cpp:1141 src/client.cpp:1278
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:391
+#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
 #: src/gui/unregisterdialog.cpp:137 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227 src/net/tmwa/charserverhandler.cpp:190
 #: src/net/tmwa/charserverhandler.cpp:206
 msgid "Error"
 msgstr "Virhe"
 
-#: src/client.cpp:1146
+#: src/client.cpp:1150
 msgid "Requesting registration details"
 msgstr "Pyydän rekisteröitymisen yksityiskohtia"
 
-#: src/client.cpp:1173
+#: src/client.cpp:1177
 msgid "Password Change"
 msgstr "Salasanan vaihto"
 
-#: src/client.cpp:1174
+#: src/client.cpp:1178
 msgid "Password changed successfully!"
 msgstr "Salasana vaihdettu onnistuneesti!"
 
-#: src/client.cpp:1193
+#: src/client.cpp:1197
 msgid "Email Change"
 msgstr "Sähköpostin vaihto"
 
-#: src/client.cpp:1194
+#: src/client.cpp:1198
 msgid "Email changed successfully!"
 msgstr "Sähköpostiosoite vaihdettu onnistuneesti!"
 
-#: src/client.cpp:1214
+#: src/client.cpp:1218
 msgid "Unregister Successful"
 msgstr "Tietojen poisto onnistui"
 
-#: src/client.cpp:1215
+#: src/client.cpp:1219
 msgid "Farewell, come back any time..."
 msgstr "Näkemisiin, tule pian takaisin..."
 
-#: src/client.cpp:1404 src/client.cpp:1434 src/client.cpp:1478
-#: src/client.cpp:1894
+#: src/client.cpp:1408 src/client.cpp:1438 src/client.cpp:1482
+#: src/client.cpp:1898
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s ei ole olemassa eikä sitä voi luoda! Poistun."
 
-#: src/client.cpp:1608
+#: src/client.cpp:1612
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Epäkelpo päivitysosoite: %s"
 
-#: src/client.cpp:1642 src/client.cpp:1648
+#: src/client.cpp:1646 src/client.cpp:1652
 msgid "Error creating updates directory!"
 msgstr "Päivityshakemistoa luodessa tapahtui virhe!"
 
-#: src/client.cpp:1669
+#: src/client.cpp:1673
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Virhe: %s ei ole olemassa eikä sitä voi luoda! Poistun."
@@ -413,7 +413,7 @@ msgstr "-"
 
 #: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
 #: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
-#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:284
+#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:285
 #: src/keyboardconfig.cpp:287
 msgid "Quit"
 msgstr "Sulje"
@@ -487,7 +487,7 @@ msgstr "Annetut sähköpostiosoitteet eivät täsmää."
 msgid "Change Password"
 msgstr "Vaihda salasana"
 
-#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:94
+#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:95
 #: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56
 msgid "Password:"
 msgstr "Salasana:"
@@ -518,7 +518,7 @@ msgstr "Uuden salasanan kopiot eivät täsmää."
 msgid "Create Character"
 msgstr "Luo hahmo"
 
-#: src/gui/charcreatedialog.cpp:73 src/gui/logindialog.cpp:93
+#: src/gui/charcreatedialog.cpp:73 src/gui/logindialog.cpp:94
 #: src/gui/register.cpp:75
 msgid "Name:"
 msgstr "Nimi:"
@@ -617,7 +617,7 @@ msgstr "Anna salasana hahmon poistamiseksi"
 msgid "Enter password:"
 msgstr "Salasana:"
 
-#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:288
+#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
 #: src/gui/setup_players.cpp:251 src/gui/shopwindow.cpp:120
 #: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:240
 msgid "Delete"
@@ -1130,32 +1130,32 @@ msgstr "Sulje kun valmis"
 msgid "Skip"
 msgstr "Ohita"
 
-#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:122
+#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:123
 msgid "Login"
 msgstr "Kirjaudu sisään"
 
-#: src/gui/logindialog.cpp:90 src/gui/serverdialog.cpp:243
+#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:243
 #: src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr "Palvelin:"
 
-#: src/gui/logindialog.cpp:95
+#: src/gui/logindialog.cpp:96
 msgid "Custom update host"
 msgstr "Käytä omaa päivityspalvelinta"
 
-#: src/gui/logindialog.cpp:109
+#: src/gui/logindialog.cpp:110
 msgid "Remember username"
 msgstr "Muista käyttäjätunnus"
 
-#: src/gui/logindialog.cpp:110
+#: src/gui/logindialog.cpp:111
 msgid "Update:"
 msgstr "Päivitys:"
 
-#: src/gui/logindialog.cpp:120 src/gui/register.cpp:66 src/gui/register.cpp:81
+#: src/gui/logindialog.cpp:121 src/gui/register.cpp:66 src/gui/register.cpp:81
 msgid "Register"
 msgstr "Rekisteröidy"
 
-#: src/gui/logindialog.cpp:121
+#: src/gui/logindialog.cpp:122
 msgid "Change Server"
 msgstr "Vaihda palvelinta"
 
@@ -1604,56 +1604,61 @@ msgstr "Salasanat eivät täsmää."
 msgid "Choose Your Server"
 msgstr "Valitse palvelimesi"
 
+#: src/gui/serverdialog.cpp:239
+#, fuzzy
+msgid "Choose Your Server  *** SAFE MODE ***"
+msgstr "Valitse palvelimesi"
+
 #: src/gui/serverdialog.cpp:244
 msgid "Port:"
 msgstr "Portti:"
 
-#: src/gui/serverdialog.cpp:247
+#: src/gui/serverdialog.cpp:248
 msgid "Use same ip for game sub servers"
 msgstr "Käytä samaa IP-osoitetta alipalvelimille"
 
-#: src/gui/serverdialog.cpp:261
+#: src/gui/serverdialog.cpp:262
 msgid "Server type:"
 msgstr "Palvelintyyppi:"
 
-#: src/gui/serverdialog.cpp:285
+#: src/gui/serverdialog.cpp:286
 msgid "Load"
 msgstr "Lataa"
 
-#: src/gui/serverdialog.cpp:286
+#: src/gui/serverdialog.cpp:287
 msgid "Connect"
 msgstr "Yhdistä"
 
-#: src/gui/serverdialog.cpp:287
+#: src/gui/serverdialog.cpp:288
 msgid "Custom Server"
 msgstr "Muu palvelin"
 
-#: src/gui/serverdialog.cpp:392
+#: src/gui/serverdialog.cpp:393
 msgid "Please type both the address and the port of a server."
 msgstr "Kirjoita kenttiin sekä palvelimen osoite että portti"
 
-#: src/gui/serverdialog.cpp:550
+#: src/gui/serverdialog.cpp:551
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Lataan palvelinluettelon...%2.2f%%"
 
-#: src/gui/serverdialog.cpp:555
+#: src/gui/serverdialog.cpp:556
 msgid "Waiting for server..."
 msgstr "Odotan palvelinta..."
 
-#: src/gui/serverdialog.cpp:559
+#: src/gui/serverdialog.cpp:560
 msgid "Preparing download"
 msgstr "Valmistelen latausta"
 
-#: src/gui/serverdialog.cpp:563
+#: src/gui/serverdialog.cpp:564
 msgid "Error retreiving server list!"
 msgstr "Palvelinluettelon hakeminen epäonnistui!"
 
-#: src/gui/serverdialog.cpp:661
+#: src/gui/serverdialog.cpp:662
 msgid "requires a newer version"
 msgstr "vaatii uudemman version"
 
-#: src/gui/serverdialog.cpp:663
+#: src/gui/serverdialog.cpp:664
 #, c-format
 msgid "requires v%s"
 msgstr "vaatii version %s"
@@ -3965,64 +3970,64 @@ msgstr ""
 msgid "You were killed by "
 msgstr "Sinut otti hengiltä "
 
-#: src/localplayer.cpp:1379
+#: src/localplayer.cpp:1375
 msgid "Tried to pick up nonexistent item."
 msgstr "Yritit nostaa olemattoman tavaran."
 
-#: src/localplayer.cpp:1381
+#: src/localplayer.cpp:1377
 msgid "Item is too heavy."
 msgstr "Tavara on liian painava."
 
-#: src/localplayer.cpp:1383
+#: src/localplayer.cpp:1379
 msgid "Item is too far away."
 msgstr "Tavara on liian kaukana."
 
-#: src/localplayer.cpp:1385
+#: src/localplayer.cpp:1381
 msgid "Inventory is full."
 msgstr "Sinulla on liikaa tavaraa ennestään."
 
-#: src/localplayer.cpp:1387
+#: src/localplayer.cpp:1383
 msgid "Stack is too big."
 msgstr "Kasa on liian suuri."
 
-#: src/localplayer.cpp:1390
+#: src/localplayer.cpp:1386
 msgid "Item belongs to someone else."
 msgstr "Tavara kuuluu jollekulle muulle."
 
-#: src/localplayer.cpp:1393
+#: src/localplayer.cpp:1389
 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:1417
+#: src/localplayer.cpp:1413
 #, 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:3146
+#: src/localplayer.cpp:3142
 msgid "Away"
 msgstr "Poissa"
 
-#: src/localplayer.cpp:3450
+#: src/localplayer.cpp:3446
 msgid "Follow: "
 msgstr "Seuraa: "
 
-#: src/localplayer.cpp:3452 src/localplayer.cpp:3467
+#: src/localplayer.cpp:3448 src/localplayer.cpp:3463
 msgid "Follow canceled"
 msgstr "Seuraaminen keskeytetty"
 
-#: src/localplayer.cpp:3459
+#: src/localplayer.cpp:3455
 msgid "Imitation: "
 msgstr "Matki: "
 
-#: src/localplayer.cpp:3461 src/localplayer.cpp:3469
+#: src/localplayer.cpp:3457 src/localplayer.cpp:3465
 msgid "Imitation canceled"
 msgstr "Matkiminen keskeytetty"
 
-#: src/localplayer.cpp:3821
+#: src/localplayer.cpp:3817
 msgid "You see "
 msgstr "Näet "
 
@@ -4714,27 +4719,30 @@ msgstr "T.-hyökkäys"
 msgid "M.Defense"
 msgstr "T.-puolustus"
 
-#: src/net/tmwa/generalhandler.cpp:268
+#: src/net/tmwa/generalhandler.cpp:269
+#, no-c-format
 msgid "% Accuracy"
 msgstr "% Tarkkuus"
 
-#: src/net/tmwa/generalhandler.cpp:269
+#: src/net/tmwa/generalhandler.cpp:271
+#, no-c-format
 msgid "% Evade"
 msgstr "% Välttö"
 
-#: src/net/tmwa/generalhandler.cpp:270
+#: src/net/tmwa/generalhandler.cpp:273
+#, no-c-format
 msgid "% Critical"
 msgstr "% Täysosuma"
 
-#: src/net/tmwa/generalhandler.cpp:271
+#: src/net/tmwa/generalhandler.cpp:274
 msgid "Attack Delay"
 msgstr "Hyökkäysviive"
 
-#: src/net/tmwa/generalhandler.cpp:273
+#: src/net/tmwa/generalhandler.cpp:276
 msgid "Walk Delay"
 msgstr "Kävelyviive"
 
-#: src/net/tmwa/generalhandler.cpp:275
+#: src/net/tmwa/generalhandler.cpp:278
 msgid "Attack Range"
 msgstr "Hyökkäyskantama"
 
diff --git a/po/fr.po b/po/fr.po
index c46103e7d..589dfcb51 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-06-25 18:01+0300\n"
+"POT-Creation-Date: 2011-07-02 00:39+0300\n"
 "PO-Revision-Date: 2011-06-20 00:31+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: French (http://www.transifex.net/projects/p/manaplus/team/"
@@ -33,88 +33,88 @@ msgstr "esquivé"
 msgid "miss"
 msgstr "raté"
 
-#: src/client.cpp:817 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
+#: src/client.cpp:821 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Configuration"
 
-#: src/client.cpp:896
+#: src/client.cpp:900
 msgid "Connecting to server"
 msgstr "Connexion au serveur"
 
-#: src/client.cpp:927
+#: src/client.cpp:931
 msgid "Logging in"
 msgstr "Connexion"
 
-#: src/client.cpp:960
+#: src/client.cpp:964
 msgid "Entering game world"
 msgstr "Vous entrez dans un nouveau monde"
 
-#: src/client.cpp:1052
+#: src/client.cpp:1056
 msgid "Requesting characters"
 msgstr "Téléchargement des personnages"
 
-#: src/client.cpp:1083
+#: src/client.cpp:1087
 msgid "Connecting to the game server"
 msgstr "Connexion au serveur de jeu"
 
-#: src/client.cpp:1093
+#: src/client.cpp:1097
 msgid "Changing game servers"
 msgstr "Changement de serveur de jeu"
 
-#: src/client.cpp:1130 src/client.cpp:1137 src/client.cpp:1274
+#: src/client.cpp:1134 src/client.cpp:1141 src/client.cpp:1278
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:391
+#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
 #: src/gui/unregisterdialog.cpp:137 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227 src/net/tmwa/charserverhandler.cpp:190
 #: src/net/tmwa/charserverhandler.cpp:206
 msgid "Error"
 msgstr "Erreur"
 
-#: src/client.cpp:1146
+#: src/client.cpp:1150
 msgid "Requesting registration details"
 msgstr "Demande des paramètres d'inscription"
 
-#: src/client.cpp:1173
+#: src/client.cpp:1177
 msgid "Password Change"
 msgstr "Changement de mot de passe"
 
-#: src/client.cpp:1174
+#: src/client.cpp:1178
 msgid "Password changed successfully!"
 msgstr "Le mot de passe a été changé avec succès !"
 
-#: src/client.cpp:1193
+#: src/client.cpp:1197
 msgid "Email Change"
 msgstr "Changer d'e-mail"
 
-#: src/client.cpp:1194
+#: src/client.cpp:1198
 msgid "Email changed successfully!"
 msgstr "L'adresse e-mail a été changée avec succès !"
 
-#: src/client.cpp:1214
+#: src/client.cpp:1218
 msgid "Unregister Successful"
 msgstr "Désinscription réussie"
 
-#: src/client.cpp:1215
+#: src/client.cpp:1219
 msgid "Farewell, come back any time..."
 msgstr "A bientôt, revenez quand vous voudrez..."
 
-#: src/client.cpp:1404 src/client.cpp:1434 src/client.cpp:1478
-#: src/client.cpp:1894
+#: src/client.cpp:1408 src/client.cpp:1438 src/client.cpp:1482
+#: src/client.cpp:1898
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s n'existe pas et ne peut pas être créé ! Fermeture du programme."
 
-#: src/client.cpp:1608
+#: src/client.cpp:1612
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Site de mise à jour invalide : %s"
 
-#: src/client.cpp:1642 src/client.cpp:1648
+#: src/client.cpp:1646 src/client.cpp:1652
 msgid "Error creating updates directory!"
 msgstr "Impossible de créer le dossier de mise à jour !"
 
-#: src/client.cpp:1669
+#: src/client.cpp:1673
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -418,7 +418,7 @@ msgstr "-"
 
 #: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
 #: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
-#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:284
+#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:285
 #: src/keyboardconfig.cpp:287
 msgid "Quit"
 msgstr "Quitter"
@@ -492,7 +492,7 @@ msgstr "Les deux adresses e-mail ne correspondent pas."
 msgid "Change Password"
 msgstr "Changer le mot de passe"
 
-#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:94
+#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:95
 #: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56
 msgid "Password:"
 msgstr "Mot de passe :"
@@ -523,7 +523,7 @@ msgstr "Les nouveaux mots de passe ne correspondent pas."
 msgid "Create Character"
 msgstr "Créer le personnage"
 
-#: src/gui/charcreatedialog.cpp:73 src/gui/logindialog.cpp:93
+#: src/gui/charcreatedialog.cpp:73 src/gui/logindialog.cpp:94
 #: src/gui/register.cpp:75
 msgid "Name:"
 msgstr "Nom :"
@@ -622,7 +622,7 @@ msgstr "Entrer le mot de passe pour effacer le personnage"
 msgid "Enter password:"
 msgstr "Entrer le mot de passe :"
 
-#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:288
+#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
 #: src/gui/setup_players.cpp:251 src/gui/shopwindow.cpp:120
 #: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:240
 msgid "Delete"
@@ -1135,32 +1135,32 @@ msgstr "Fermeture automatique"
 msgid "Skip"
 msgstr "Sauter"
 
-#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:122
+#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:123
 msgid "Login"
 msgstr "Compte"
 
-#: src/gui/logindialog.cpp:90 src/gui/serverdialog.cpp:243
+#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:243
 #: src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr "Serveur :"
 
-#: src/gui/logindialog.cpp:95
+#: src/gui/logindialog.cpp:96
 msgid "Custom update host"
 msgstr "Serveur de mise à jour personnalisé"
 
-#: src/gui/logindialog.cpp:109
+#: src/gui/logindialog.cpp:110
 msgid "Remember username"
 msgstr "Se souvenir du nom d'utilisateur"
 
-#: src/gui/logindialog.cpp:110
+#: src/gui/logindialog.cpp:111
 msgid "Update:"
 msgstr "Mise à jour : "
 
-#: src/gui/logindialog.cpp:120 src/gui/register.cpp:66 src/gui/register.cpp:81
+#: src/gui/logindialog.cpp:121 src/gui/register.cpp:66 src/gui/register.cpp:81
 msgid "Register"
 msgstr "S'inscrire"
 
-#: src/gui/logindialog.cpp:121
+#: src/gui/logindialog.cpp:122
 msgid "Change Server"
 msgstr "Changer de Serveur"
 
@@ -1609,56 +1609,61 @@ msgstr "Les deux mots de passe sont différents"
 msgid "Choose Your Server"
 msgstr "Choisissez le serveur"
 
+#: src/gui/serverdialog.cpp:239
+#, fuzzy
+msgid "Choose Your Server  *** SAFE MODE ***"
+msgstr "Choisissez le serveur"
+
 #: src/gui/serverdialog.cpp:244
 msgid "Port:"
 msgstr "Port :"
 
-#: src/gui/serverdialog.cpp:247
+#: src/gui/serverdialog.cpp:248
 msgid "Use same ip for game sub servers"
 msgstr "Utiliser la même ip pour les sous-serveurs de jeu"
 
-#: src/gui/serverdialog.cpp:261
+#: src/gui/serverdialog.cpp:262
 msgid "Server type:"
 msgstr "Type de Serveur :"
 
-#: src/gui/serverdialog.cpp:285
+#: src/gui/serverdialog.cpp:286
 msgid "Load"
 msgstr "Charger"
 
-#: src/gui/serverdialog.cpp:286
+#: src/gui/serverdialog.cpp:287
 msgid "Connect"
 msgstr "Connexion..."
 
-#: src/gui/serverdialog.cpp:287
+#: src/gui/serverdialog.cpp:288
 msgid "Custom Server"
 msgstr "Serveur personnalisé"
 
-#: src/gui/serverdialog.cpp:392
+#: src/gui/serverdialog.cpp:393
 msgid "Please type both the address and the port of a server."
 msgstr "Veuillez entrer l'adresse et le port du serveur."
 
-#: src/gui/serverdialog.cpp:550
+#: src/gui/serverdialog.cpp:551
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Téléchargement de la liste des serveurs...%2.2f%%"
 
-#: src/gui/serverdialog.cpp:555
+#: src/gui/serverdialog.cpp:556
 msgid "Waiting for server..."
 msgstr "En attente du serveur..."
 
-#: src/gui/serverdialog.cpp:559
+#: src/gui/serverdialog.cpp:560
 msgid "Preparing download"
 msgstr "Préparation du téléchargement"
 
-#: src/gui/serverdialog.cpp:563
+#: src/gui/serverdialog.cpp:564
 msgid "Error retreiving server list!"
 msgstr "Erreur lors du téléchargement de la liste de serveur !"
 
-#: src/gui/serverdialog.cpp:661
+#: src/gui/serverdialog.cpp:662
 msgid "requires a newer version"
 msgstr "requiert une nouvelle version"
 
-#: src/gui/serverdialog.cpp:663
+#: src/gui/serverdialog.cpp:664
 #, c-format
 msgid "requires v%s"
 msgstr "requiert la v%s"
@@ -3985,64 +3990,64 @@ msgstr ""
 msgid "You were killed by "
 msgstr "Vous avez été tué par "
 
-#: src/localplayer.cpp:1379
+#: src/localplayer.cpp:1375
 msgid "Tried to pick up nonexistent item."
 msgstr "Vous avez essayé de prendre un item qui n'existe pas."
 
-#: src/localplayer.cpp:1381
+#: src/localplayer.cpp:1377
 msgid "Item is too heavy."
 msgstr "L'objet est trop lourd."
 
-#: src/localplayer.cpp:1383
+#: src/localplayer.cpp:1379
 msgid "Item is too far away."
 msgstr "L'objet est trop éloigné"
 
-#: src/localplayer.cpp:1385
+#: src/localplayer.cpp:1381
 msgid "Inventory is full."
 msgstr "L'inventaire est plein"
 
-#: src/localplayer.cpp:1387
+#: src/localplayer.cpp:1383
 msgid "Stack is too big."
 msgstr "La pile est trop grande"
 
-#: src/localplayer.cpp:1390
+#: src/localplayer.cpp:1386
 msgid "Item belongs to someone else."
 msgstr "L'objet appartient a quelqu'un d'autre"
 
-#: src/localplayer.cpp:1393
+#: src/localplayer.cpp:1389
 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:1417
+#: src/localplayer.cpp:1413
 #, 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:3146
+#: src/localplayer.cpp:3142
 msgid "Away"
 msgstr "Inactif"
 
-#: src/localplayer.cpp:3450
+#: src/localplayer.cpp:3446
 msgid "Follow: "
 msgstr "Suivre : "
 
-#: src/localplayer.cpp:3452 src/localplayer.cpp:3467
+#: src/localplayer.cpp:3448 src/localplayer.cpp:3463
 msgid "Follow canceled"
 msgstr "Suivi annulé"
 
-#: src/localplayer.cpp:3459
+#: src/localplayer.cpp:3455
 msgid "Imitation: "
 msgstr "Imitation: "
 
-#: src/localplayer.cpp:3461 src/localplayer.cpp:3469
+#: src/localplayer.cpp:3457 src/localplayer.cpp:3465
 msgid "Imitation canceled"
 msgstr "Imitation annulée"
 
-#: src/localplayer.cpp:3821
+#: src/localplayer.cpp:3817
 msgid "You see "
 msgstr "Vous voyez  "
 
@@ -4750,27 +4755,30 @@ msgstr "Attaque M."
 msgid "M.Defense"
 msgstr "Défense M."
 
-#: src/net/tmwa/generalhandler.cpp:268
+#: src/net/tmwa/generalhandler.cpp:269
+#, no-c-format
 msgid "% Accuracy"
 msgstr "% Précision"
 
-#: src/net/tmwa/generalhandler.cpp:269
+#: src/net/tmwa/generalhandler.cpp:271
+#, no-c-format
 msgid "% Evade"
 msgstr "% Esquive"
 
-#: src/net/tmwa/generalhandler.cpp:270
+#: src/net/tmwa/generalhandler.cpp:273
+#, no-c-format
 msgid "% Critical"
 msgstr "% Coup critique"
 
-#: src/net/tmwa/generalhandler.cpp:271
+#: src/net/tmwa/generalhandler.cpp:274
 msgid "Attack Delay"
 msgstr "Temps de l'attaque"
 
-#: src/net/tmwa/generalhandler.cpp:273
+#: src/net/tmwa/generalhandler.cpp:276
 msgid "Walk Delay"
 msgstr "Temps de déplacement"
 
-#: src/net/tmwa/generalhandler.cpp:275
+#: src/net/tmwa/generalhandler.cpp:278
 msgid "Attack Range"
 msgstr "Portée de l'attaque"
 
diff --git a/po/hr.po b/po/hr.po
index 27c148825..801be75a7 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-06-25 18:01+0300\n"
+"POT-Creation-Date: 2011-07-02 00:39+0300\n"
 "PO-Revision-Date: 2009-12-13 09:30+0000\n"
 "Last-Translator: nafterburner <nafterburner@gmail.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
@@ -33,97 +33,97 @@ msgstr ""
 msgid "miss"
 msgstr ""
 
-#: src/client.cpp:817 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
+#: src/client.cpp:821 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Podešavanje"
 
-#: src/client.cpp:896
+#: src/client.cpp:900
 #, fuzzy
 msgid "Connecting to server"
 msgstr "Spajanje na poslužitelja karti..."
 
-#: src/client.cpp:927
+#: src/client.cpp:931
 #, fuzzy
 msgid "Logging in"
 msgstr "Korisničko ime"
 
-#: src/client.cpp:960
+#: src/client.cpp:964
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1052
+#: src/client.cpp:1056
 #, fuzzy
 msgid "Requesting characters"
 msgstr "Odaberi lika"
 
-#: src/client.cpp:1083
+#: src/client.cpp:1087
 #, fuzzy
 msgid "Connecting to the game server"
 msgstr "Spajanje na poslužitelja karti..."
 
-#: src/client.cpp:1093
+#: src/client.cpp:1097
 #, fuzzy
 msgid "Changing game servers"
 msgstr "Server"
 
-#: src/client.cpp:1130 src/client.cpp:1137 src/client.cpp:1274
+#: src/client.cpp:1134 src/client.cpp:1141 src/client.cpp:1278
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:391
+#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
 #: src/gui/unregisterdialog.cpp:137 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227 src/net/tmwa/charserverhandler.cpp:190
 #: src/net/tmwa/charserverhandler.cpp:206
 msgid "Error"
 msgstr "Greška"
 
-#: src/client.cpp:1146
+#: src/client.cpp:1150
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1173
+#: src/client.cpp:1177
 #, fuzzy
 msgid "Password Change"
 msgstr "Lozinka"
 
-#: src/client.cpp:1174
+#: src/client.cpp:1178
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1193
+#: src/client.cpp:1197
 #, fuzzy
 msgid "Email Change"
 msgstr "Izmijeni"
 
-#: src/client.cpp:1194
+#: src/client.cpp:1198
 #, fuzzy
 msgid "Email changed successfully!"
 msgstr "Član je uspješno unaprijeđen."
 
-#: src/client.cpp:1214
+#: src/client.cpp:1218
 #, fuzzy
 msgid "Unregister Successful"
 msgstr "Odjavi"
 
-#: src/client.cpp:1215
+#: src/client.cpp:1219
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1404 src/client.cpp:1434 src/client.cpp:1478
-#: src/client.cpp:1894
+#: src/client.cpp:1408 src/client.cpp:1438 src/client.cpp:1482
+#: src/client.cpp:1898
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1608
+#: src/client.cpp:1612
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1642 src/client.cpp:1648
+#: src/client.cpp:1646 src/client.cpp:1652
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:1669
+#: src/client.cpp:1673
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -445,7 +445,7 @@ msgstr ""
 
 #: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
 #: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
-#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:284
+#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:285
 #: src/keyboardconfig.cpp:287
 msgid "Quit"
 msgstr "Izlaz"
@@ -521,7 +521,7 @@ msgstr "Nova E-mail Adresa već postoji."
 msgid "Change Password"
 msgstr "Promijeni Lozinku"
 
-#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:94
+#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:95
 #: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56
 msgid "Password:"
 msgstr "Lozinka"
@@ -553,7 +553,7 @@ msgstr ""
 msgid "Create Character"
 msgstr "Stvori Lika"
 
-#: src/gui/charcreatedialog.cpp:73 src/gui/logindialog.cpp:93
+#: src/gui/charcreatedialog.cpp:73 src/gui/logindialog.cpp:94
 #: src/gui/register.cpp:75
 msgid "Name:"
 msgstr "Ime:"
@@ -658,7 +658,7 @@ msgstr "Neuspješno brisanje znaka."
 msgid "Enter password:"
 msgstr "Pogrešna lozinka"
 
-#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:288
+#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
 #: src/gui/setup_players.cpp:251 src/gui/shopwindow.cpp:120
 #: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:240
 msgid "Delete"
@@ -1211,33 +1211,33 @@ msgstr "Zatvori"
 msgid "Skip"
 msgstr ""
 
-#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:122
+#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:123
 msgid "Login"
 msgstr "Korisničko ime"
 
-#: src/gui/logindialog.cpp:90 src/gui/serverdialog.cpp:243
+#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:243
 #: src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr "Poslužitelj:"
 
-#: src/gui/logindialog.cpp:95
+#: src/gui/logindialog.cpp:96
 msgid "Custom update host"
 msgstr ""
 
-#: src/gui/logindialog.cpp:109
+#: src/gui/logindialog.cpp:110
 #, fuzzy
 msgid "Remember username"
 msgstr "Zapamti korisničko ime"
 
-#: src/gui/logindialog.cpp:110
+#: src/gui/logindialog.cpp:111
 msgid "Update:"
 msgstr ""
 
-#: src/gui/logindialog.cpp:120 src/gui/register.cpp:66 src/gui/register.cpp:81
+#: src/gui/logindialog.cpp:121 src/gui/register.cpp:66 src/gui/register.cpp:81
 msgid "Register"
 msgstr "Registriraj se"
 
-#: src/gui/logindialog.cpp:121
+#: src/gui/logindialog.cpp:122
 #, fuzzy
 msgid "Change Server"
 msgstr "Server"
@@ -1738,60 +1738,65 @@ msgstr "Lozinke se ne podudaraju."
 msgid "Choose Your Server"
 msgstr "Izaberite vaš server"
 
+#: src/gui/serverdialog.cpp:239
+#, fuzzy
+msgid "Choose Your Server  *** SAFE MODE ***"
+msgstr "Izaberite vaš server"
+
 #: src/gui/serverdialog.cpp:244
 msgid "Port:"
 msgstr "Port:"
 
-#: src/gui/serverdialog.cpp:247
+#: src/gui/serverdialog.cpp:248
 msgid "Use same ip for game sub servers"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:261
+#: src/gui/serverdialog.cpp:262
 #, fuzzy
 msgid "Server type:"
 msgstr "Poslužitelj:"
 
-#: src/gui/serverdialog.cpp:285
+#: src/gui/serverdialog.cpp:286
 msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:286
+#: src/gui/serverdialog.cpp:287
 #, fuzzy
 msgid "Connect"
 msgstr "Spajanje..."
 
-#: src/gui/serverdialog.cpp:287
+#: src/gui/serverdialog.cpp:288
 #, fuzzy
 msgid "Custom Server"
 msgstr "Vlastiti kursor"
 
-#: src/gui/serverdialog.cpp:392
+#: src/gui/serverdialog.cpp:393
 msgid "Please type both the address and the port of a server."
 msgstr "Molimo upišite adresu poslužitelja i port poslužitelja."
 
-#: src/gui/serverdialog.cpp:550
+#: src/gui/serverdialog.cpp:551
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:555
+#: src/gui/serverdialog.cpp:556
 #, fuzzy
 msgid "Waiting for server..."
 msgstr "Čekanje servera"
 
-#: src/gui/serverdialog.cpp:559
+#: src/gui/serverdialog.cpp:560
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:563
+#: src/gui/serverdialog.cpp:564
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:661
+#: src/gui/serverdialog.cpp:662
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:663
+#: src/gui/serverdialog.cpp:664
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -4232,69 +4237,69 @@ msgstr ""
 msgid "You were killed by "
 msgstr ""
 
-#: src/localplayer.cpp:1379
+#: src/localplayer.cpp:1375
 #, fuzzy
 msgid "Tried to pick up nonexistent item."
 msgstr "Neuspješno korištenje predmeta."
 
-#: src/localplayer.cpp:1381
+#: src/localplayer.cpp:1377
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1383
+#: src/localplayer.cpp:1379
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1385
+#: src/localplayer.cpp:1381
 #, fuzzy
 msgid "Inventory is full."
 msgstr "Server je pun"
 
-#: src/localplayer.cpp:1387
+#: src/localplayer.cpp:1383
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1390
+#: src/localplayer.cpp:1386
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1393
+#: src/localplayer.cpp:1389
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1417
+#: src/localplayer.cpp:1413
 #, fuzzy, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "Pokupili ste %s [@@%d|%s@@]."
 msgstr[1] "Pokupili ste %s [@@%d|%s@@]."
 
-#: src/localplayer.cpp:3146
+#: src/localplayer.cpp:3142
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3450
+#: src/localplayer.cpp:3446
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3452 src/localplayer.cpp:3467
+#: src/localplayer.cpp:3448 src/localplayer.cpp:3463
 #, fuzzy
 msgid "Follow canceled"
 msgstr "Otkazano trgovanje."
 
-#: src/localplayer.cpp:3459
+#: src/localplayer.cpp:3455
 #, fuzzy
 msgid "Imitation: "
 msgstr "Promijeni Email Adresu"
 
-#: src/localplayer.cpp:3461 src/localplayer.cpp:3469
+#: src/localplayer.cpp:3457 src/localplayer.cpp:3465
 #, fuzzy
 msgid "Imitation canceled"
 msgstr "Otkazano trgovanje."
 
-#: src/localplayer.cpp:3821
+#: src/localplayer.cpp:3817
 #, fuzzy
 msgid "You see "
 msgstr "Vi dobijete %s."
@@ -5042,32 +5047,32 @@ msgstr "M.Napad:"
 msgid "M.Defense"
 msgstr "M.Obrana:"
 
-#: src/net/tmwa/generalhandler.cpp:268
-#, fuzzy
+#: src/net/tmwa/generalhandler.cpp:269
+#, fuzzy, no-c-format
 msgid "% Accuracy"
 msgstr "% Preciznost:"
 
-#: src/net/tmwa/generalhandler.cpp:269
-#, fuzzy
+#: src/net/tmwa/generalhandler.cpp:271
+#, fuzzy, no-c-format
 msgid "% Evade"
 msgstr "% Izbjegavanje:"
 
-#: src/net/tmwa/generalhandler.cpp:270
-#, fuzzy
+#: src/net/tmwa/generalhandler.cpp:273
+#, fuzzy, no-c-format
 msgid "% Critical"
 msgstr "Kritični Udarac"
 
-#: src/net/tmwa/generalhandler.cpp:271
+#: src/net/tmwa/generalhandler.cpp:274
 #, fuzzy
 msgid "Attack Delay"
 msgstr "Napad %+d"
 
-#: src/net/tmwa/generalhandler.cpp:273
+#: src/net/tmwa/generalhandler.cpp:276
 #, fuzzy
 msgid "Walk Delay"
 msgstr "Napad %+d"
 
-#: src/net/tmwa/generalhandler.cpp:275
+#: src/net/tmwa/generalhandler.cpp:278
 #, fuzzy
 msgid "Attack Range"
 msgstr "Čudovište pogađa Igrača"
diff --git a/po/hu.po b/po/hu.po
index 5384cb37f..21acf7705 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-06-25 18:01+0300\n"
+"POT-Creation-Date: 2011-07-02 00:39+0300\n"
 "PO-Revision-Date: 2009-07-07 19:52+0000\n"
 "Last-Translator: Tatsukichi <artit91@gmail.com>\n"
 "Language-Team: Hungarian <hu@li.org>\n"
@@ -32,97 +32,97 @@ msgstr ""
 msgid "miss"
 msgstr ""
 
-#: src/client.cpp:817 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
+#: src/client.cpp:821 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Beállítások"
 
-#: src/client.cpp:896
+#: src/client.cpp:900
 #, fuzzy
 msgid "Connecting to server"
 msgstr "Csatlakozás a térkép szerverhez...."
 
-#: src/client.cpp:927
+#: src/client.cpp:931
 #, fuzzy
 msgid "Logging in"
 msgstr "Belépés"
 
-#: src/client.cpp:960
+#: src/client.cpp:964
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1052
+#: src/client.cpp:1056
 #, fuzzy
 msgid "Requesting characters"
 msgstr "Kapcsolódási kérelem a %s nevű csatornába."
 
-#: src/client.cpp:1083
+#: src/client.cpp:1087
 #, fuzzy
 msgid "Connecting to the game server"
 msgstr "Csatlakozás a térkép szerverhez...."
 
-#: src/client.cpp:1093
+#: src/client.cpp:1097
 #, fuzzy
 msgid "Changing game servers"
 msgstr "Szerver"
 
-#: src/client.cpp:1130 src/client.cpp:1137 src/client.cpp:1274
+#: src/client.cpp:1134 src/client.cpp:1141 src/client.cpp:1278
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:391
+#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
 #: src/gui/unregisterdialog.cpp:137 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227 src/net/tmwa/charserverhandler.cpp:190
 #: src/net/tmwa/charserverhandler.cpp:206
 msgid "Error"
 msgstr "Hiba"
 
-#: src/client.cpp:1146
+#: src/client.cpp:1150
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1173
+#: src/client.cpp:1177
 #, fuzzy
 msgid "Password Change"
 msgstr "Jelszó:"
 
-#: src/client.cpp:1174
+#: src/client.cpp:1178
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1193
+#: src/client.cpp:1197
 #, fuzzy
 msgid "Email Change"
 msgstr "Változtatás"
 
-#: src/client.cpp:1194
+#: src/client.cpp:1198
 #, fuzzy
 msgid "Email changed successfully!"
 msgstr "A tag előléptetése sikeres."
 
-#: src/client.cpp:1214
+#: src/client.cpp:1218
 #, fuzzy
 msgid "Unregister Successful"
 msgstr "Regisztráció megszüntetése"
 
-#: src/client.cpp:1215
+#: src/client.cpp:1219
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1404 src/client.cpp:1434 src/client.cpp:1478
-#: src/client.cpp:1894
+#: src/client.cpp:1408 src/client.cpp:1438 src/client.cpp:1482
+#: src/client.cpp:1898
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1608
+#: src/client.cpp:1612
 #, fuzzy, c-format
 msgid "Invalid update host: %s"
 msgstr "Helytelen frissítési kiszolgáló: "
 
-#: src/client.cpp:1642 src/client.cpp:1648
+#: src/client.cpp:1646 src/client.cpp:1652
 msgid "Error creating updates directory!"
 msgstr "Hiba a frissítési könyvtár létrehozása közben!"
 
-#: src/client.cpp:1669
+#: src/client.cpp:1673
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -440,7 +440,7 @@ msgstr ""
 
 #: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
 #: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
-#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:284
+#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:285
 #: src/keyboardconfig.cpp:287
 msgid "Quit"
 msgstr "Kilépés"
@@ -516,7 +516,7 @@ msgstr "Az új email cím már foglalt."
 msgid "Change Password"
 msgstr "Jelszó módosítása"
 
-#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:94
+#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:95
 #: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56
 msgid "Password:"
 msgstr "Jelszó:"
@@ -548,7 +548,7 @@ msgstr ""
 msgid "Create Character"
 msgstr "Karakter létrehozása"
 
-#: src/gui/charcreatedialog.cpp:73 src/gui/logindialog.cpp:93
+#: src/gui/charcreatedialog.cpp:73 src/gui/logindialog.cpp:94
 #: src/gui/register.cpp:75
 msgid "Name:"
 msgstr "Név:"
@@ -653,7 +653,7 @@ msgstr "Karakter törlése sikertelen."
 msgid "Enter password:"
 msgstr "Hibás jelszó"
 
-#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:288
+#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
 #: src/gui/setup_players.cpp:251 src/gui/shopwindow.cpp:120
 #: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:240
 msgid "Delete"
@@ -1205,33 +1205,33 @@ msgstr "Bezár"
 msgid "Skip"
 msgstr ""
 
-#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:122
+#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:123
 msgid "Login"
 msgstr "Belépés"
 
-#: src/gui/logindialog.cpp:90 src/gui/serverdialog.cpp:243
+#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:243
 #: src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr "Szerver:"
 
-#: src/gui/logindialog.cpp:95
+#: src/gui/logindialog.cpp:96
 msgid "Custom update host"
 msgstr ""
 
-#: src/gui/logindialog.cpp:109
+#: src/gui/logindialog.cpp:110
 #, fuzzy
 msgid "Remember username"
 msgstr "Felhasználónév megjegyzése"
 
-#: src/gui/logindialog.cpp:110
+#: src/gui/logindialog.cpp:111
 msgid "Update:"
 msgstr ""
 
-#: src/gui/logindialog.cpp:120 src/gui/register.cpp:66 src/gui/register.cpp:81
+#: src/gui/logindialog.cpp:121 src/gui/register.cpp:66 src/gui/register.cpp:81
 msgid "Register"
 msgstr "Regisztráció"
 
-#: src/gui/logindialog.cpp:121
+#: src/gui/logindialog.cpp:122
 #, fuzzy
 msgid "Change Server"
 msgstr "Szerver"
@@ -1732,60 +1732,65 @@ msgstr "A jelszavak nem egyeznek."
 msgid "Choose Your Server"
 msgstr "Válassz szervert"
 
+#: src/gui/serverdialog.cpp:239
+#, fuzzy
+msgid "Choose Your Server  *** SAFE MODE ***"
+msgstr "Válassz szervert"
+
 #: src/gui/serverdialog.cpp:244
 msgid "Port:"
 msgstr "Port:"
 
-#: src/gui/serverdialog.cpp:247
+#: src/gui/serverdialog.cpp:248
 msgid "Use same ip for game sub servers"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:261
+#: src/gui/serverdialog.cpp:262
 #, fuzzy
 msgid "Server type:"
 msgstr "Szerver:"
 
-#: src/gui/serverdialog.cpp:285
+#: src/gui/serverdialog.cpp:286
 msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:286
+#: src/gui/serverdialog.cpp:287
 #, fuzzy
 msgid "Connect"
 msgstr "Csatlakozás…"
 
-#: src/gui/serverdialog.cpp:287
+#: src/gui/serverdialog.cpp:288
 #, fuzzy
 msgid "Custom Server"
 msgstr "Egyéni kurzor"
 
-#: src/gui/serverdialog.cpp:392
+#: src/gui/serverdialog.cpp:393
 msgid "Please type both the address and the port of a server."
 msgstr "Kérlek írd be a szerver címét és portját egyaránt."
 
-#: src/gui/serverdialog.cpp:550
+#: src/gui/serverdialog.cpp:551
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:555
+#: src/gui/serverdialog.cpp:556
 #, fuzzy
 msgid "Waiting for server..."
 msgstr "Várakozás a szerverre"
 
-#: src/gui/serverdialog.cpp:559
+#: src/gui/serverdialog.cpp:560
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:563
+#: src/gui/serverdialog.cpp:564
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:661
+#: src/gui/serverdialog.cpp:662
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:663
+#: src/gui/serverdialog.cpp:664
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -4232,70 +4237,70 @@ msgstr "Állítsd át, vagy a játék érdekesen fog viselkedni."
 msgid "You were killed by "
 msgstr ""
 
-#: src/localplayer.cpp:1379
+#: src/localplayer.cpp:1375
 #, fuzzy
 msgid "Tried to pick up nonexistent item."
 msgstr "Nem tudod felvenni a tárgyat."
 
-#: src/localplayer.cpp:1381
+#: src/localplayer.cpp:1377
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1383
+#: src/localplayer.cpp:1379
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1385
+#: src/localplayer.cpp:1381
 #, fuzzy
 msgid "Inventory is full."
 msgstr "A szerver tele van"
 
-#: src/localplayer.cpp:1387
+#: src/localplayer.cpp:1383
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1390
+#: src/localplayer.cpp:1386
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1393
+#: src/localplayer.cpp:1389
 #, fuzzy
 msgid "Unknown problem picking up item."
 msgstr "Nem tudod felvenni a tárgyat."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1417
+#: src/localplayer.cpp:1413
 #, fuzzy, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "Zsákmányod%s [@@%d|%s@@]."
 msgstr[1] "Zsákmányod%s [@@%d|%s@@]."
 
-#: src/localplayer.cpp:3146
+#: src/localplayer.cpp:3142
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3450
+#: src/localplayer.cpp:3446
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3452 src/localplayer.cpp:3467
+#: src/localplayer.cpp:3448 src/localplayer.cpp:3463
 #, fuzzy
 msgid "Follow canceled"
 msgstr "Az üzlet megszakadt."
 
-#: src/localplayer.cpp:3459
+#: src/localplayer.cpp:3455
 #, fuzzy
 msgid "Imitation: "
 msgstr "Email cím módosírása"
 
-#: src/localplayer.cpp:3461 src/localplayer.cpp:3469
+#: src/localplayer.cpp:3457 src/localplayer.cpp:3465
 #, fuzzy
 msgid "Imitation canceled"
 msgstr "Az üzlet megszakadt."
 
-#: src/localplayer.cpp:3821
+#: src/localplayer.cpp:3817
 #, fuzzy
 msgid "You see "
 msgstr "Kapott tárgy: %s."
@@ -5047,32 +5052,32 @@ msgstr "Mágikus támadás:"
 msgid "M.Defense"
 msgstr "Mágikus védelem:"
 
-#: src/net/tmwa/generalhandler.cpp:268
-#, fuzzy
+#: src/net/tmwa/generalhandler.cpp:269
+#, fuzzy, no-c-format
 msgid "% Accuracy"
 msgstr "Találati esély (%):"
 
-#: src/net/tmwa/generalhandler.cpp:269
-#, fuzzy
+#: src/net/tmwa/generalhandler.cpp:271
+#, fuzzy, no-c-format
 msgid "% Evade"
 msgstr "Kitérés (%):"
 
-#: src/net/tmwa/generalhandler.cpp:270
-#, fuzzy
+#: src/net/tmwa/generalhandler.cpp:273
+#, fuzzy, no-c-format
 msgid "% Critical"
 msgstr "Kritikális ütéskor"
 
-#: src/net/tmwa/generalhandler.cpp:271
+#: src/net/tmwa/generalhandler.cpp:274
 #, fuzzy
 msgid "Attack Delay"
 msgstr "Támadás %+d"
 
-#: src/net/tmwa/generalhandler.cpp:273
+#: src/net/tmwa/generalhandler.cpp:276
 #, fuzzy
 msgid "Walk Delay"
 msgstr "Támadás %+d"
 
-#: src/net/tmwa/generalhandler.cpp:275
+#: src/net/tmwa/generalhandler.cpp:278
 #, fuzzy
 msgid "Attack Range"
 msgstr "Sérüléskor"
diff --git a/po/id.po b/po/id.po
index 457e0dfcc..9cf17d546 100644
--- a/po/id.po
+++ b/po/id.po
@@ -1,3632 +1,5341 @@
-# Indonesian translation for mana
-# Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008
-# This file is distributed under the same license as the mana package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2008.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR The ManaPlus Developers
+# This file is distributed under the same license as the PACKAGE package.
+# 
+#   <adjieps@yahoo.com>, 2011.
+#   <Genesis_Junior@yahoo.com>, 2011.
+# Andrei Karas <akaras@inbox.ru>, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: mana\n"
-"Report-Msgid-Bugs-To: dev@manasource.org\n"
-"POT-Creation-Date: 2010-03-05 21:52+0100\n"
-"PO-Revision-Date: 2009-11-21 12:11+0000\n"
-"Last-Translator: Rainfeed <Unknown>\n"
-"Language-Team: Indonesian <id@li.org>\n"
+"Project-Id-Version: ManaPlus\n"
+"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
+"POT-Creation-Date: 2011-06-25 18:01+0300\n"
+"PO-Revision-Date: 2011-07-01 15:54+0000\n"
+"Last-Translator: adjieps <adjieps@yahoo.com>\n"
+"Language-Team: Indonesian (http://www.transifex.net/projects/p/manaplus/team/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2010-03-05 19:28+0000\n"
-"X-Generator: Launchpad (build Unknown)\n"
+"Language: id\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 
-#: src/client.cpp:553 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:62
+#: src/actorspritemanager.cpp:1030
+msgid "Visible on map"
+msgstr "Terlihat di peta"
+
+#: src/being.cpp:517
+msgid "dodge"
+msgstr "Menghindar"
+
+#: src/being.cpp:517
+msgid "miss"
+msgstr "Luput"
+
+#: src/client.cpp:817 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
 msgid "Setup"
-msgstr "Atur"
+msgstr "Pengaturan"
 
-#: src/client.cpp:623
-#, fuzzy
+#: src/client.cpp:896
 msgid "Connecting to server"
-msgstr "Menyambung..."
+msgstr "Terhubung dengan server"
 
-#: src/client.cpp:650
-#, fuzzy
+#: src/client.cpp:927
 msgid "Logging in"
-msgstr "Login"
+msgstr "Masuk"
 
-#: src/client.cpp:683
+#: src/client.cpp:960
 msgid "Entering game world"
-msgstr ""
+msgstr "Memasuki arena permainan"
 
-#: src/client.cpp:739
-#, fuzzy
+#: src/client.cpp:1052
 msgid "Requesting characters"
-msgstr "Pilih Karakter"
+msgstr "Pemilihan karakter"
 
-#: src/client.cpp:768
+#: src/client.cpp:1083
 msgid "Connecting to the game server"
-msgstr ""
-
-#: src/client.cpp:799 src/client.cpp:806 src/client.cpp:940
-#: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
-#: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
-#: src/gui/serverdialog.cpp:261 src/gui/unregisterdialog.cpp:133
-#: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
-#: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
+msgstr "terhubung dengan server"
+
+#: src/client.cpp:1093
+msgid "Changing game servers"
+msgstr "Pergantian server"
+
+#: src/client.cpp:1130 src/client.cpp:1137 src/client.cpp:1274
+#: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
+#: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
+#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:391
+#: src/gui/unregisterdialog.cpp:137 src/net/manaserv/charhandler.cpp:184
+#: src/net/manaserv/charhandler.cpp:227 src/net/tmwa/charserverhandler.cpp:190
+#: src/net/tmwa/charserverhandler.cpp:206
 msgid "Error"
 msgstr "Kesalahan"
 
-#: src/client.cpp:815
+#: src/client.cpp:1146
 msgid "Requesting registration details"
-msgstr ""
+msgstr "Meminta detail registrasi"
 
-#: src/client.cpp:842
-#, fuzzy
+#: src/client.cpp:1173
 msgid "Password Change"
-msgstr "Kata Sandi:"
+msgstr "Ubah sandi"
 
-#: src/client.cpp:843
+#: src/client.cpp:1174
 msgid "Password changed successfully!"
-msgstr ""
+msgstr "Perubahan sandi berhasil"
 
-#: src/client.cpp:862
-#, fuzzy
+#: src/client.cpp:1193
 msgid "Email Change"
-msgstr "Ubah"
+msgstr "Perubahan email"
 
-#: src/client.cpp:863
+#: src/client.cpp:1194
 msgid "Email changed successfully!"
-msgstr ""
+msgstr "Perubahan email berhasil"
 
-#: src/client.cpp:883
-#, fuzzy
+#: src/client.cpp:1214
 msgid "Unregister Successful"
-msgstr "Tidak terdaftar"
+msgstr "Telah tidak terdaftar"
 
-#: src/client.cpp:884
+#: src/client.cpp:1215
 msgid "Farewell, come back any time..."
-msgstr ""
+msgstr "Selamat tinggal, datang kembali setiap saat"
 
-#: src/client.cpp:1007 src/client.cpp:1030
+#: src/client.cpp:1404 src/client.cpp:1434 src/client.cpp:1478
+#: src/client.cpp:1894
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
-msgstr ""
+msgstr "%s tidak ada dan tidak dapat dibuat!keluar."
 
-#: src/client.cpp:1119
+#: src/client.cpp:1608
 #, c-format
 msgid "Invalid update host: %s"
-msgstr ""
+msgstr "Gagal mengupdate host: %s"
 
-#: src/client.cpp:1153 src/client.cpp:1159
+#: src/client.cpp:1642 src/client.cpp:1648
 msgid "Error creating updates directory!"
-msgstr ""
+msgstr "Gagal membuat direktori update!"
+
+#: src/client.cpp:1669
+#, c-format
+msgid "Error: %s doesn't exist and can't be created! Exiting."
+msgstr "kesalahan %s tidak ada dan tidak dapat dibuat!keluar."
 
-#: src/commandhandler.cpp:127 src/commandhandler.cpp:308
+#: src/commandhandler.cpp:301
 msgid "Unknown command."
 msgstr "Perintah tidak dikenal."
 
-#: src/commandhandler.cpp:156
-msgid "-- Help --"
-msgstr ""
-
-#: src/commandhandler.cpp:157
-msgid "/help > Display this help"
-msgstr ""
-
-#: src/commandhandler.cpp:159
-msgid "/where > Display map name"
-msgstr ""
-
-#: src/commandhandler.cpp:160
-msgid "/who > Display number of online users"
-msgstr ""
-
-#: src/commandhandler.cpp:161
-msgid "/me > Tell something about yourself"
-msgstr ""
-
-#: src/commandhandler.cpp:163
-msgid "/clear > Clears this window"
-msgstr ""
-
-#: src/commandhandler.cpp:165
-msgid "/msg > Send a private message to a user"
-msgstr ""
-
-#: src/commandhandler.cpp:166
-msgid "/whisper > Alias of msg"
-msgstr ""
-
-#: src/commandhandler.cpp:167
-msgid "/w > Alias of msg"
-msgstr ""
-
-#: src/commandhandler.cpp:168
-msgid "/query > Makes a tab for private messages with another user"
-msgstr ""
-
-#: src/commandhandler.cpp:169
-msgid "/q > Alias of query"
-msgstr ""
-
-#: src/commandhandler.cpp:171
-msgid "/ignore > ignore a player"
-msgstr ""
-
-#: src/commandhandler.cpp:172
-msgid "/unignore > stop ignoring a player"
-msgstr ""
-
-#: src/commandhandler.cpp:174
-msgid "/list > Display all public channels"
-msgstr ""
-
-#: src/commandhandler.cpp:175
-msgid "/join > Join or create a channel"
-msgstr ""
-
-#: src/commandhandler.cpp:177
-msgid "/createparty > Create a new party"
-msgstr ""
-
-#: src/commandhandler.cpp:178
-msgid "/party > Invite a user to party"
-msgstr ""
-
-#: src/commandhandler.cpp:180
-msgid "/record > Start recording the chat to an external file"
-msgstr ""
-
-#: src/commandhandler.cpp:181
-msgid "/toggle > Determine whether <return> toggles the chat log"
-msgstr ""
-
-#: src/commandhandler.cpp:182
-msgid "/present > Get list of players present (sent to chat log, if logging)"
-msgstr ""
-
-#: src/commandhandler.cpp:184
-msgid "/announce > Global announcement (GM only)"
-msgstr "/announce > Pengumuman global (khusus GM)"
-
-#: src/commandhandler.cpp:188
-msgid "For more information, type /help <command>."
-msgstr ""
-
-#: src/commandhandler.cpp:192
-msgid "Command: /help"
-msgstr "Perintah: /help"
-
-#: src/commandhandler.cpp:193
-msgid "This command displays a list of all commands available."
-msgstr ""
-
-#: src/commandhandler.cpp:194
-msgid "Command: /help <command>"
-msgstr ""
-
-#: src/commandhandler.cpp:195
-msgid "This command displays help on <command>."
-msgstr ""
-
-#: src/commandhandler.cpp:203
-msgid "Command: /announce <msg>"
-msgstr "Perintah: /announce <pesan>"
-
-#: src/commandhandler.cpp:204
-msgid "*** only available to a GM ***"
-msgstr "*** hanya tersedia bagi GM ***"
-
-#: src/commandhandler.cpp:205
-msgid "This command sends the message <msg> to all players currently online."
-msgstr ""
-
-#: src/commandhandler.cpp:210
-msgid "Command: /clear"
-msgstr "Perintah: /clear"
-
-#: src/commandhandler.cpp:211
-msgid "This command clears the chat log of previous chat."
-msgstr ""
-
-#: src/commandhandler.cpp:215
-#, fuzzy
-msgid "Command: /ignore <player>"
-msgstr "Perintah: /announce <pesan>"
-
-#: src/commandhandler.cpp:216
-msgid "This command ignores the given player regardless of current relations."
-msgstr ""
-
-#: src/commandhandler.cpp:221
-msgid "Command: /join <channel>"
-msgstr ""
-
-#: src/commandhandler.cpp:222
-msgid "This command makes you enter <channel>."
-msgstr ""
-
-#: src/commandhandler.cpp:223
-msgid "If <channel> doesn't exist, it's created."
-msgstr ""
-
-#: src/commandhandler.cpp:227
-msgid "Command: /list"
-msgstr ""
-
-#: src/commandhandler.cpp:228
-msgid "This command shows a list of all channels."
-msgstr ""
-
-#: src/commandhandler.cpp:232
-msgid "Command: /me <message>"
-msgstr ""
-
-#: src/commandhandler.cpp:233
-msgid "This command tell others you are (doing) <msg>."
-msgstr ""
-
-#: src/commandhandler.cpp:237
-msgid "Command: /msg <nick> <message>"
-msgstr ""
-
-#: src/commandhandler.cpp:238
-msgid "Command: /whisper <nick> <message>"
-msgstr ""
-
-#: src/commandhandler.cpp:239
-msgid "Command: /w <nick> <message>"
-msgstr ""
-
-#: src/commandhandler.cpp:240
-msgid "This command sends the text <message> to <nick>."
-msgstr ""
-
-#: src/commandhandler.cpp:241 src/commandhandler.cpp:260
-#: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
-#: src/net/ea/gui/guildtab.cpp:75 src/net/ea/gui/partytab.cpp:75
-msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
-msgstr ""
-
-#: src/commandhandler.cpp:246
-msgid "Command: /query <nick>"
-msgstr ""
-
-#: src/commandhandler.cpp:247
-msgid "Command: /q <nick>"
-msgstr ""
-
-#: src/commandhandler.cpp:248
-msgid "This command tries to make a tab for whispers betweenyou and <nick>."
-msgstr ""
-
-#: src/commandhandler.cpp:253
-#, fuzzy
-msgid "Command: /createparty <name>"
-msgstr "Perintah: /clear"
-
-#: src/commandhandler.cpp:254
-msgid "This command creates a new party called <name>."
-msgstr ""
+#: src/commandhandler.cpp:401
+msgid "Cannot send empty whispers!"
+msgstr "Tidak dapat mengirimkan pesan tanpa nama"
 
-#: src/commandhandler.cpp:258
-msgid "Command: /party <nick>"
+#: src/commandhandler.cpp:409
+#, c-format
+msgid ""
+"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
+" you."
 msgstr ""
+"Tidak dapat membuat kolom whisper baru untuk nama \"%s\"! nama telah ada, "
+"atau nama anda sendiri"
 
-#: src/commandhandler.cpp:259 src/net/ea/gui/partytab.cpp:74
-msgid "This command invites <nick> to party with you."
-msgstr ""
+#: src/commandhandler.cpp:429
+#, c-format
+msgid "Requesting to join channel %s."
+msgstr "Meminta untuk masuk ke channel %s."
 
-#: src/commandhandler.cpp:265
-msgid "Command: /present"
-msgstr ""
+#: src/commandhandler.cpp:445 src/net/tmwa/gui/partytab.cpp:125
+msgid "Party name is missing."
+msgstr "Nama kelompok tidak dapat di temukan"
 
-#: src/commandhandler.cpp:266
-msgid ""
-"This command gets a list of players within hearing and sends it to either "
-"the record log if recording, or the chat log otherwise."
-msgstr ""
+#: src/commandhandler.cpp:456
+msgid "Guild name is missing."
+msgstr "Nama organisasi tidak ditemukan."
 
-#: src/commandhandler.cpp:272
-msgid "Command: /record <filename>"
-msgstr ""
+#: src/commandhandler.cpp:469 src/commandhandler.cpp:576
+#: src/commandhandler.cpp:617 src/commandhandler.cpp:647
+msgid "Please specify a name."
+msgstr "Tetapkan sebuah nama"
 
-#: src/commandhandler.cpp:273
-msgid "This command starts recording the chat log to the file <filename>."
-msgstr ""
+#: src/commandhandler.cpp:510
+msgid "Return toggles chat."
+msgstr "Kembalikan pengalihan obrolan"
 
-#: src/commandhandler.cpp:275
-msgid "Command: /record"
-msgstr ""
+#: src/commandhandler.cpp:510
+msgid "Message closes chat."
+msgstr "Tutup pesan obrolan"
 
-#: src/commandhandler.cpp:276
-msgid "This command finishes a recording session."
-msgstr ""
+#: src/commandhandler.cpp:521
+msgid "Return now toggles chat."
+msgstr "Kembalikan sekarang pengalihan obrolan"
 
-#: src/commandhandler.cpp:280
-msgid "Command: /toggle <state>"
-msgstr ""
+#: src/commandhandler.cpp:527
+msgid "Message now closes chat."
+msgstr "Pesan menutup obrolan"
 
-#: src/commandhandler.cpp:281
-msgid ""
-"This command sets whether the return key should toggle the chat log, or "
-"whether the chat log turns off automatically."
-msgstr ""
+#: src/commandhandler.cpp:555
+msgid "friend"
+msgstr "Teman"
 
-#: src/commandhandler.cpp:283
-msgid ""
-"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
-"\", \"no\", \"false\" to turn the toggle off."
-msgstr ""
+#: src/commandhandler.cpp:560
+msgid "disregarded"
+msgstr "Diabaikan"
 
-#: src/commandhandler.cpp:286
-msgid "Command: /toggle"
-msgstr ""
+#: src/commandhandler.cpp:565
+msgid "neutral"
+msgstr "netral"
 
-#: src/commandhandler.cpp:287
-msgid "This command displays the return toggle status."
-msgstr ""
+#: src/commandhandler.cpp:584
+#, c-format
+msgid "Player already %s!"
+msgstr "Pemain telah %s!"
 
-#: src/commandhandler.cpp:291 src/gui/widgets/whispertab.cpp:93
-#, fuzzy
-msgid "Command: /unignore <player>"
-msgstr "Perintah: /announce <pesan>"
+#: src/commandhandler.cpp:598
+#, c-format
+msgid "Player successfully %s!"
+msgstr "Pemain telah berhasil %s!"
 
-#: src/commandhandler.cpp:292
-msgid "This command stops ignoring the given player if they are being ignored"
-msgstr ""
+#: src/commandhandler.cpp:606
+#, c-format
+msgid "Player could not be %s!"
+msgstr "Pemain tidak bisa %s!"
 
-#: src/commandhandler.cpp:297
-msgid "Command: /where"
-msgstr ""
+#: src/commandhandler.cpp:628
+msgid "Player wasn't ignored!"
+msgstr "Pemain tidak diabaikan!"
 
-#: src/commandhandler.cpp:298
-msgid "This command displays the name of the current map."
-msgstr ""
+#: src/commandhandler.cpp:635
+msgid "Player no longer ignored!"
+msgstr "Pemain tidak lagi diabaikan!"
 
-#: src/commandhandler.cpp:302
-msgid "Command: /who"
-msgstr ""
+#: src/commandhandler.cpp:637
+msgid "Player could not be unignored!"
+msgstr "Pemain tidak dapat diabaikan"
 
-#: src/commandhandler.cpp:303
-msgid "This command displays the number of players currently online."
-msgstr ""
+#: src/commandhandler.cpp:654
+msgid "Player already erased!"
+msgstr "Pemain telah terhapus"
 
-#: src/commandhandler.cpp:309
-msgid "Type /help for a list of commands."
-msgstr ""
+#: src/commandhandler.cpp:665
+msgid "Player successfully erased!"
+msgstr "Pemain telah berhasil dihapus"
 
-#: src/commandhandler.cpp:375
-msgid "Cannot send empty whispers!"
-msgstr ""
+#: src/commandhandler.cpp:667
+msgid "Player could not be erased!"
+msgstr "Pemain tidak dapat dihapus"
 
-#: src/commandhandler.cpp:383
+#: src/commandhandler.cpp:960 src/commandhandler.cpp:1006
 #, c-format
-msgid ""
-"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
-"you."
+msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:397
+#: src/commandhandler.cpp:970
 #, c-format
-msgid "Requesting to join channel %s."
-msgstr ""
-
-#: src/commandhandler.cpp:410 src/net/ea/gui/partytab.cpp:109
-msgid "Party name is missing."
-msgstr ""
-
-#: src/commandhandler.cpp:423 src/commandhandler.cpp:471
-#: src/commandhandler.cpp:493
-msgid "Please specify a name."
-msgstr ""
+msgid "%d week"
+msgid_plural "%d weeks"
+msgstr[0] ""
 
-#: src/commandhandler.cpp:441
-msgid "Return toggles chat."
-msgstr ""
+#: src/commandhandler.cpp:979
+#, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] ""
 
-#: src/commandhandler.cpp:441
-msgid "Message closes chat."
-msgstr ""
+#: src/commandhandler.cpp:987
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] ""
 
-#: src/commandhandler.cpp:450
-msgid "Return now toggles chat."
-msgstr ""
+#: src/commandhandler.cpp:995
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] ""
 
-#: src/commandhandler.cpp:454
-msgid "Message now closes chat."
-msgstr ""
+#: src/commandhandler.cpp:1003
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] ""
 
-#: src/commandhandler.cpp:477
-msgid "Player already ignored!"
+#: src/commandhandler.cpp:1082
+msgid "font cache size"
 msgstr ""
 
-#: src/commandhandler.cpp:484
-msgid "Player successfully ignored!"
+#: src/commandhandler.cpp:1094
+msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:486
-msgid "Player could not be ignored!"
-msgstr ""
+#: src/commandhandler.cpp:1098
+msgid "Created:"
+msgstr "Buat"
 
-#: src/commandhandler.cpp:501
-msgid "Player wasn't ignored!"
-msgstr ""
+#: src/commandhandler.cpp:1100
+msgid "Deleted:"
+msgstr "Hapus"
 
-#: src/commandhandler.cpp:506
-msgid "Player no longer ignored!"
-msgstr ""
+#: src/commandhandler.cpp:1147 src/commandhandler.cpp:1154
+msgid "Resource images:"
+msgstr "Sumber gambar"
 
-#: src/commandhandler.cpp:508
-msgid "Player could not be unignored!"
+#: src/commandhandler.cpp:1149 src/commandhandler.cpp:1156
+msgid "Resource orphaned images:"
 msgstr ""
 
-#: src/commandhandler.h:31
+#: src/commandhandler.h:40
 #, c-format
 msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-msgstr ""
+msgstr "Pilihan untuk /%s adalah \"ya\", \"tidak\", \"benar\",\"salah\", \"1\",\"0\"."
 
-#: src/game.cpp:172
+#: src/game.cpp:244 src/gui/widgets/chattab.cpp:410
 msgid "General"
-msgstr ""
+msgstr "Umum"
 
-#: src/game.cpp:326
+#: src/game.cpp:248 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
+msgid "Debug"
+msgstr "Debug"
+
+#: src/game.cpp:464
 msgid "Screenshot saved as "
-msgstr ""
+msgstr "Screenshot disimpan sebagai"
 
-#: src/game.cpp:331
+#: src/game.cpp:472
 msgid "Saving screenshot failed!"
-msgstr ""
+msgstr "Gagal menyimpan screenshot!"
 
-#: src/game.cpp:355
+#: src/game.cpp:511
 msgid "The connection to the server was lost."
-msgstr ""
+msgstr "Koneksi ke server terputus"
 
-#: src/game.cpp:360
+#: src/game.cpp:525
 msgid "Network Error"
-msgstr ""
+msgstr "Kesalahan jaringan"
 
-#: src/game.cpp:705
+#: src/game.cpp:1043
 msgid "Ignoring incoming trade requests"
-msgstr ""
+msgstr "Abaikan permohonan transaksi"
 
-#: src/game.cpp:712
+#: src/game.cpp:1050
 msgid "Accepting incoming trade requests"
-msgstr ""
+msgstr "Terima permohonan transaksi"
 
-#: src/game.cpp:946
+#: src/game.cpp:1425
 msgid "Could Not Load Map"
-msgstr ""
+msgstr "Tidak dapat menampilkan peta"
 
-#: src/game.cpp:947
+#: src/game.cpp:1426
 #, c-format
 msgid "Error while loading %s"
-msgstr ""
+msgstr "Error ketika menunggu %s"
 
-#: src/gui/beingpopup.cpp:75
+#: src/gui/beingpopup.cpp:108
 #, c-format
 msgid "Party: %s"
-msgstr ""
+msgstr "Kelompok: %s"
+
+#: src/gui/beingpopup.cpp:122
+#, c-format
+msgid "Guild: %s"
+msgstr "Organisasi: %s"
+
+#: src/gui/beingpopup.cpp:135
+#, c-format
+msgid "Pvp rank: %d"
+msgstr "Peringkat Pvp: %d"
+
+#: src/gui/beingpopup.cpp:146
+#, c-format
+msgid "Comment: %s"
+msgstr "Komentar: %s"
+
+#: src/gui/botcheckerwindow.cpp:265
+msgid "Bot Checker"
+msgstr "Pengecek Bot"
 
-#: src/gui/buy.cpp:49 src/gui/buy.cpp:78 src/gui/buysell.cpp:47
+#: src/gui/botcheckerwindow.cpp:295 src/gui/setup_players.cpp:64
+msgid "Name"
+msgstr "Nama"
+
+#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:130
+#: src/gui/popupmenu.cpp:271 src/gui/popupmenu.cpp:589
+#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:264
+msgid "Attack"
+msgstr "Pukul"
+
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:260
+#: src/keyboardconfig.cpp:62
+msgid "Talk"
+msgstr "Berbicara"
+
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:241
+#: src/gui/popupmenu.cpp:265 src/gui/popupmenu.cpp:646
+msgid "Move"
+msgstr "Jalan"
+
+#: src/gui/botcheckerwindow.cpp:299
+msgid "Result"
+msgstr "Hasil"
+
+#: src/gui/botcheckerwindow.cpp:309 src/gui/npcdialog.cpp:123
+msgid "Reset"
+msgstr "Reset"
+
+#: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:251
+#: src/gui/popupmenu.cpp:262 src/gui/popupmenu.cpp:431
+#: src/gui/popupmenu.cpp:655
 msgid "Buy"
 msgstr "Beli"
 
-#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
-#: src/gui/sell.cpp:276
+#: src/gui/buydialog.cpp:88 src/gui/buydialog.cpp:302
+#: src/gui/selldialog.cpp:87 src/gui/selldialog.cpp:324
 #, c-format
 msgid "Price: %s / Total: %s"
-msgstr ""
+msgstr "Harga: %s/ Total: %s"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
-#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:479
+#: src/gui/buydialog.cpp:93 src/gui/itemamountwindow.cpp:207
+#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:113
+#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:940
 msgid "+"
-msgstr ""
+msgstr "+"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
-#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:491
+#: src/gui/buydialog.cpp:96 src/gui/itemamountwindow.cpp:206
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:114
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:952
 msgid "-"
-msgstr ""
+msgstr "-"
 
-#: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
-#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:182
-#: src/keyboardconfig.cpp:103
+#: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
+#: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
+#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:284
+#: src/keyboardconfig.cpp:287
 msgid "Quit"
 msgstr "Keluar"
 
-#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:408
-#: src/gui/statuswindow.cpp:478 src/gui/statuswindow.cpp:512
+#: src/gui/buydialog.cpp:99 src/gui/selldialog.cpp:94
+#: src/gui/statuswindow.cpp:490 src/gui/statuswindow.cpp:539
+#: src/gui/statuswindow.cpp:939 src/gui/statuswindow.cpp:970
 msgid "Max"
-msgstr ""
+msgstr "Max"
 
-#: src/gui/buysell.cpp:38
+#: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
+#: src/gui/inventorywindow.cpp:145
 msgid "Shop"
-msgstr ""
+msgstr "Toko"
 
-#: src/gui/buysell.cpp:47 src/gui/sell.cpp:49 src/gui/sell.cpp:76
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:252
+#: src/gui/popupmenu.cpp:263 src/gui/popupmenu.cpp:432
+#: src/gui/popupmenu.cpp:656 src/gui/selldialog.cpp:53
+#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:92
 msgid "Sell"
 msgstr "Jual"
 
-#: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
-#: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
-#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:101
-#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
-#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
-#: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
-#: src/gui/socialwindow.cpp:242 src/gui/textdialog.cpp:39
-#: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
+#: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
+#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
+#: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:315
+#: src/gui/popupmenu.cpp:336 src/gui/popupmenu.cpp:438
+#: src/gui/popupmenu.cpp:465 src/gui/popupmenu.cpp:484
+#: src/gui/popupmenu.cpp:498 src/gui/popupmenu.cpp:517
+#: src/gui/popupmenu.cpp:707 src/gui/popupmenu.cpp:731
+#: src/gui/popupmenu.cpp:1618 src/gui/popupmenu.cpp:1646
+#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1745
+#: src/gui/popupmenu.cpp:1780 src/gui/popupmenu.cpp:1820
+#: src/gui/popupmenu.cpp:1886 src/gui/popupmenu.cpp:1906
+#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:67
+#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:237
+#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
+#: src/gui/updatewindow.cpp:157
 msgid "Cancel"
 msgstr "Batal"
 
-#: src/gui/changeemaildialog.cpp:45 src/gui/changeemaildialog.cpp:54
+#: src/gui/changeemaildialog.cpp:48 src/gui/changeemaildialog.cpp:57
 msgid "Change Email Address"
-msgstr ""
+msgstr "Ganti alamat email"
 
-#: src/gui/changeemaildialog.cpp:49 src/gui/changepassworddialog.cpp:52
+#: src/gui/changeemaildialog.cpp:52 src/gui/changepassworddialog.cpp:55
 #, c-format
 msgid "Account: %s"
-msgstr ""
+msgstr "Akun:%s"
 
-#: src/gui/changeemaildialog.cpp:51
+#: src/gui/changeemaildialog.cpp:54
 msgid "Type new email address twice:"
-msgstr ""
+msgstr "Tulis alamat email yang baru dua kali:"
 
-#: src/gui/changeemaildialog.cpp:127
-#, fuzzy, c-format
+#: src/gui/changeemaildialog.cpp:132
+#, c-format
 msgid "The new email address needs to be at least %d characters long."
-msgstr "Panjang username setidak-tidaknya %d karakter"
+msgstr "Alamat email baru harus paling sedikit terdiri dari %d karakter."
 
-#: src/gui/changeemaildialog.cpp:134
-#, fuzzy, c-format
+#: src/gui/changeemaildialog.cpp:139
+#, c-format
 msgid "The new email address needs to be less than %d characters long."
-msgstr "Panjang username setidak-tidaknya %d karakter"
+msgstr "Alamat email baru harus kurang dari %d karakter."
 
-#: src/gui/changeemaildialog.cpp:141
+#: src/gui/changeemaildialog.cpp:146
 msgid "The email address entries mismatch."
-msgstr ""
+msgstr "Pengisian alamat email tidak cocok"
 
-#: src/gui/changepassworddialog.cpp:47 src/gui/changepassworddialog.cpp:56
-#: src/gui/charselectdialog.cpp:128
+#: src/gui/changepassworddialog.cpp:50 src/gui/changepassworddialog.cpp:59
+#: src/gui/charselectdialog.cpp:140
 msgid "Change Password"
-msgstr ""
+msgstr "Ganti sandi"
 
-#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:53
-#: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
+#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:94
+#: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56
 msgid "Password:"
 msgstr "Kata Sandi:"
 
-#: src/gui/changepassworddialog.cpp:63
+#: src/gui/changepassworddialog.cpp:66
 msgid "Type new password twice:"
-msgstr ""
+msgstr "ketik sandi baru dua kali"
 
-#: src/gui/changepassworddialog.cpp:110
+#: src/gui/changepassworddialog.cpp:114
 msgid "Enter the old password first."
-msgstr ""
+msgstr "Masukkan sandi lama dahulu"
 
-#: src/gui/changepassworddialog.cpp:116
-#, fuzzy, c-format
+#: src/gui/changepassworddialog.cpp:120
+#, c-format
 msgid "The new password needs to be at least %d characters long."
-msgstr "Panjang kata-sandi setidak-tidaknya %d karakter"
+msgstr "Password baru harus paling sedikit terdiri dari %d karakter."
 
-#: src/gui/changepassworddialog.cpp:123
-#, fuzzy, c-format
+#: src/gui/changepassworddialog.cpp:127
+#, c-format
 msgid "The new password needs to be less than %d characters long."
-msgstr "Panjang kata-sandi setidak-tidaknya %d karakter"
+msgstr "Password baru harus kurang dari %d karakter."
 
-#: src/gui/changepassworddialog.cpp:130
+#: src/gui/changepassworddialog.cpp:134
 msgid "The new password entries mismatch."
-msgstr ""
+msgstr "Password baru yang dimasukkan tidak cocok."
 
-#: src/gui/charcreatedialog.cpp:53
+#: src/gui/charcreatedialog.cpp:58
 msgid "Create Character"
 msgstr "Buat Karakter"
 
-#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:52
-#: src/gui/register.cpp:67
+#: src/gui/charcreatedialog.cpp:73 src/gui/logindialog.cpp:93
+#: src/gui/register.cpp:75
 msgid "Name:"
 msgstr "Nama:"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'next'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
-#: src/gui/outfitwindow.cpp:67
+#: src/gui/charcreatedialog.cpp:76 src/gui/charcreatedialog.cpp:81
+#: src/gui/charcreatedialog.cpp:87 src/gui/outfitwindow.cpp:81
 msgid ">"
-msgstr ""
+msgstr ">"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
 #. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
-#: src/gui/outfitwindow.cpp:66
+#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:82
+#: src/gui/charcreatedialog.cpp:88 src/gui/outfitwindow.cpp:80
 msgid "<"
-msgstr ""
+msgstr "<"
 
-#: src/gui/charcreatedialog.cpp:74
-#, fuzzy
+#: src/gui/charcreatedialog.cpp:80
 msgid "Hair color:"
-msgstr "Warna Rambut:"
+msgstr "Warna rambut"
 
-#: src/gui/charcreatedialog.cpp:77
-#, fuzzy
+#: src/gui/charcreatedialog.cpp:83
 msgid "Hair style:"
-msgstr "Gaya Rambut:"
+msgstr "Gaya rambut"
 
-#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
-#: src/gui/socialwindow.cpp:296
+#: src/gui/charcreatedialog.cpp:89
+msgid "Race:"
+msgstr "Ras:"
+
+#: src/gui/charcreatedialog.cpp:92 src/gui/charselectdialog.cpp:479
+#: src/gui/socialwindow.cpp:1033
 msgid "Create"
 msgstr "Buat"
 
-#: src/gui/charcreatedialog.cpp:80 src/gui/register.cpp:90
+#: src/gui/charcreatedialog.cpp:94 src/gui/register.cpp:98
 msgid "Male"
-msgstr ""
+msgstr "Laki-laki"
 
-#: src/gui/charcreatedialog.cpp:81 src/gui/register.cpp:91
+#: src/gui/charcreatedialog.cpp:95 src/gui/register.cpp:99
 msgid "Female"
-msgstr ""
+msgstr "Perempuan"
 
-#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:251
+#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:300
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Tolong distribusikan %d point"
 
-#: src/gui/charcreatedialog.cpp:178
+#: src/gui/charcreatedialog.cpp:219
 msgid "Your name needs to be at least 4 characters."
-msgstr "Nama anda sekurang-kurangnya harus 4 karakter"
+msgstr "Nama anda paling sedikit harus mengandung 4 karakter"
 
-#: src/gui/charcreatedialog.cpp:242
+#: src/gui/charcreatedialog.cpp:291
 msgid "Character stats OK"
 msgstr "Stats Karakter OK"
 
-#: src/gui/charcreatedialog.cpp:256
+#: src/gui/charcreatedialog.cpp:305
 #, c-format
 msgid "Please remove %d points"
-msgstr "Tolong hilangkan %d point"
+msgstr "Tolong hilangkan %d poin"
 
-#: src/gui/charselectdialog.cpp:69
+#: src/gui/charselectdialog.cpp:77
 msgid "Confirm Character Delete"
-msgstr ""
+msgstr "Konfirmasi penghapusan karakter"
 
-#: src/gui/charselectdialog.cpp:70
+#: src/gui/charselectdialog.cpp:78
 msgid "Are you sure you want to delete this character?"
 msgstr "Apakah anda bersungguh-sungguh ingin menghapus karakter ini?"
 
-#: src/gui/charselectdialog.cpp:117
+#: src/gui/charselectdialog.cpp:126
 msgid "Account and Character Management"
-msgstr ""
+msgstr "Manajemen Akun dan Karakter"
 
-#: src/gui/charselectdialog.cpp:127
+#: src/gui/charselectdialog.cpp:139
 msgid "Switch Login"
-msgstr ""
+msgstr "Ubah Login"
 
-#: src/gui/charselectdialog.cpp:141 src/gui/unregisterdialog.cpp:47
-#: src/gui/unregisterdialog.cpp:55
+#: src/gui/charselectdialog.cpp:153 src/gui/unregisterdialog.cpp:50
+#: src/gui/unregisterdialog.cpp:58
 msgid "Unregister"
-msgstr "Tidak terdaftar"
+msgstr "Tidak jadi mendaftar"
 
-#: src/gui/charselectdialog.cpp:150
-#, fuzzy
+#: src/gui/charselectdialog.cpp:162
 msgid "Change Email"
-msgstr "Ubah"
+msgstr "Ganti email"
+
+#: src/gui/charselectdialog.cpp:254
+msgid "Incorrect password"
+msgstr "Sandi tidak benar"
 
-#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:185
-#: src/gui/setup_players.cpp:230
+#: src/gui/charselectdialog.cpp:287
+msgid "Enter password for deleting character"
+msgstr "Masukan Sandi untuk menghapus karakter"
+
+#: src/gui/charselectdialog.cpp:287
+msgid "Enter password:"
+msgstr "Masukkan sandi"
+
+#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:288
+#: src/gui/setup_players.cpp:251 src/gui/shopwindow.cpp:120
+#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:240
 msgid "Delete"
 msgstr "Hapus"
 
-#: src/gui/charselectdialog.cpp:387
+#: src/gui/charselectdialog.cpp:467
 msgid "Choose"
-msgstr ""
+msgstr "Pilih"
 
-#: src/gui/charselectdialog.cpp:399 src/gui/charselectdialog.cpp:400
+#: src/gui/charselectdialog.cpp:470
+#, c-format
+msgid "Level %d"
+msgstr "Level %d"
+
+#: src/gui/charselectdialog.cpp:481 src/gui/charselectdialog.cpp:482
 msgid "(empty)"
-msgstr ""
+msgstr "(kosong)"
+
+#: src/gui/chatwindow.cpp:112
+msgid "default"
+msgstr "kembalikan ke semula"
+
+#: src/gui/chatwindow.cpp:113
+msgid "black"
+msgstr "hitam"
+
+#: src/gui/chatwindow.cpp:114
+msgid "red"
+msgstr "merah"
+
+#: src/gui/chatwindow.cpp:115
+msgid "green"
+msgstr "hijau"
+
+#: src/gui/chatwindow.cpp:116
+msgid "blue"
+msgstr "biru"
+
+#: src/gui/chatwindow.cpp:117
+msgid "gold"
+msgstr "emas"
+
+#: src/gui/chatwindow.cpp:118
+msgid "yellow"
+msgstr "kuning"
+
+#: src/gui/chatwindow.cpp:119
+msgid "pink"
+msgstr "merah muda"
+
+#: src/gui/chatwindow.cpp:120
+msgid "purple"
+msgstr "ungu"
+
+#: src/gui/chatwindow.cpp:121
+msgid "grey"
+msgstr "abu-abu"
+
+#: src/gui/chatwindow.cpp:122
+msgid "brown"
+msgstr "coklat"
+
+#: src/gui/chatwindow.cpp:123
+msgid "rainbow 1"
+msgstr "pelangi 1"
+
+#: src/gui/chatwindow.cpp:124
+msgid "rainbow 2"
+msgstr "pelangi 2"
+
+#: src/gui/chatwindow.cpp:125
+msgid "rainbow 3"
+msgstr "pelangi 3"
+
+#: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
+#: src/gui/logindialog.cpp:78 src/gui/setup_players.cpp:220
+#: src/gui/setup_theme.cpp:71 src/gui/setup_video.cpp:214
+#: src/gui/setup_video.cpp:239 src/gui/textcommandeditor.cpp:101
+#: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:159
+msgid "???"
+msgstr "???"
 
-#: src/gui/chat.cpp:77 src/gui/palette.cpp:96
+#: src/gui/chatwindow.cpp:152 src/gui/setup_chat.cpp:48
 msgid "Chat"
-msgstr ""
+msgstr "Obrolan"
 
-#: src/gui/chat.cpp:287
+#: src/gui/chatwindow.cpp:589
 #, c-format
 msgid "Present: %s; %d players are present."
-msgstr ""
-
-#: src/gui/chat.cpp:305
-msgid "Attendance written to record log."
-msgstr ""
+msgstr "Kehadiran: %s; %d pemain yang hadir."
 
-#: src/gui/chat.cpp:469
+#: src/gui/chatwindow.cpp:972
 #, c-format
 msgid "Whispering to %s: %s"
-msgstr ""
+msgstr "Berbisik ke %s: %s"
 
-#: src/gui/confirmdialog.cpp:42
+#: src/gui/confirmdialog.cpp:47
 msgid "Yes"
 msgstr "Ya"
 
-#: src/gui/confirmdialog.cpp:43
+#: src/gui/confirmdialog.cpp:48
 msgid "No"
 msgstr "Tidak"
 
-#: src/gui/debugwindow.cpp:43
-msgid "Debug"
-msgstr ""
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
+#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:362
+#: src/gui/popupmenu.cpp:368 src/gui/popupmenu.cpp:604
+#: src/gui/popupmenu.cpp:612
+msgid "Ignore"
+msgstr "Abaikan"
 
-#: src/gui/debugwindow.cpp:56
+#: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
+msgid "Map"
+msgstr "Peta"
+
+#: src/gui/debugwindow.cpp:71
+msgid "Target"
+msgstr "Target"
+
+#: src/gui/debugwindow.cpp:72
+msgid "Net"
+msgstr "Jaring"
+
+#: src/gui/debugwindow.cpp:145 src/gui/debugwindow.cpp:220
+#: src/gui/debugwindow.cpp:249
+msgid "Music:"
+msgstr "Musik"
+
+#: src/gui/debugwindow.cpp:146 src/gui/debugwindow.cpp:224
+#: src/gui/debugwindow.cpp:251
+msgid "Map:"
+msgstr "Peta"
+
+#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
+#: src/gui/debugwindow.cpp:250
+msgid "Minimap:"
+msgstr "Peta mini"
+
+#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:218
+#: src/gui/debugwindow.cpp:247
+msgid "Cursor:"
+msgstr "Kursor"
+
+#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:201
+#: src/gui/debugwindow.cpp:206
+msgid "Player Position:"
+msgstr "Posisi Pemain"
+
+#: src/gui/debugwindow.cpp:152
+msgid "Particle count:"
+msgstr "Hitung partikel:"
+
+#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:235
+#: src/gui/debugwindow.cpp:254
+msgid "Map actors count:"
+msgstr "Hitung pemain di peta:"
+
+#: src/gui/debugwindow.cpp:162 src/gui/debugwindow.cpp:173
 #, c-format
-msgid "%d FPS (OpenGL)"
-msgstr ""
+msgid "%d FPS (Software)"
+msgstr "%d FPS (Perangkat lunak)"
 
-#: src/gui/debugwindow.cpp:61 src/gui/debugwindow.cpp:64
+#: src/gui/debugwindow.cpp:166
 #, c-format
-msgid "%d FPS"
-msgstr ""
+msgid "%d FPS (fast OpenGL)"
+msgstr "%d FPS (fast OpenGL)"
 
-#: src/gui/debugwindow.cpp:65 src/gui/debugwindow.cpp:104
+#: src/gui/debugwindow.cpp:169
 #, c-format
-msgid "Music: %s"
-msgstr ""
-
-#: src/gui/debugwindow.cpp:66 src/gui/debugwindow.cpp:108
-#, fuzzy, c-format
-msgid "Map: %s"
-msgstr "Nama: %s"
-
-#: src/gui/debugwindow.cpp:67 src/gui/debugwindow.cpp:106
-#, fuzzy, c-format
-msgid "Minimap: %s"
-msgstr "MiniMap"
+msgid "%d FPS (old OpenGL)"
+msgstr "%d FPS (old OpenGL)"
 
-#: src/gui/debugwindow.cpp:68 src/gui/debugwindow.cpp:99
+#: src/gui/debugwindow.cpp:176
 #, c-format
-msgid "Cursor: (%d, %d)"
-msgstr ""
+msgid "%d FPS"
+msgstr "%d FPS"
 
-#: src/gui/debugwindow.cpp:69 src/gui/debugwindow.cpp:111
+#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:240
+msgid "Textures count:"
+msgstr "Penghitungan tekstur:"
+
+#: src/gui/debugwindow.cpp:231
 #, c-format
 msgid "Particle count: %d"
+msgstr "Hitung partikel: %d"
+
+#: src/gui/debugwindow.cpp:268 src/gui/debugwindow.cpp:299
+#: src/gui/debugwindow.cpp:343
+msgid "Target:"
+msgstr "Target"
+
+#: src/gui/debugwindow.cpp:269 src/gui/debugwindow.cpp:304
+#: src/gui/debugwindow.cpp:344
+msgid "Target Id:"
+msgstr "Id target:"
+
+#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:308
+#: src/gui/debugwindow.cpp:313 src/gui/debugwindow.cpp:345
+msgid "Target Level:"
+msgstr "Target Level"
+
+#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:316
+#: src/gui/debugwindow.cpp:346
+msgid "Target Party:"
+msgstr "Target Kelompok:"
+
+#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:319
+#: src/gui/debugwindow.cpp:347
+msgid "Target Guild:"
+msgstr "Target Organisasi:"
+
+#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:333
+#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:348
+msgid "Attack delay:"
+msgstr "Kecepatan menyerang:"
+
+#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:323
+#: src/gui/debugwindow.cpp:349
+msgid "Minimal hit:"
+msgstr "Pukulan minimal:"
+
+#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:325
+#: src/gui/debugwindow.cpp:350
+msgid "Maximum hit:"
+msgstr "Pukulan maksimal:"
+
+#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:327
+#: src/gui/debugwindow.cpp:351
+msgid "Critical hit:"
+msgstr "Pukulan kritis:"
+
+#: src/gui/debugwindow.cpp:385 src/gui/debugwindow.cpp:390
+#, c-format
+msgid "Ping: %s ms"
 msgstr ""
 
-#: src/gui/debugwindow.cpp:116
+#: src/gui/debugwindow.cpp:393
 #, c-format
-msgid "Particle detail: %s"
-msgstr ""
+msgid "In: %d bytes/s"
+msgstr "Masuk: %d bytes/det"
 
-#: src/gui/debugwindow.cpp:121
+#: src/gui/debugwindow.cpp:395
 #, c-format
-msgid "Ambient FX: %s"
-msgstr ""
+msgid "Out: %d bytes/s"
+msgstr "Keluar: %d bytes/det"
 
-#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:56
+#: src/gui/didyouknowwindow.cpp:47
+msgid "Did You Know?"
+msgstr "Apakah kamu tau?"
+
+#: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
+#: src/gui/inventorywindow.cpp:174 src/gui/npcdialog.cpp:53
+#: src/gui/popupmenu.cpp:532 src/gui/shopwindow.cpp:111
+msgid "Close"
+msgstr "Tutup"
+
+#: src/gui/didyouknowwindow.cpp:62
+msgid "< Previous"
+msgstr "Sebelumnya"
+
+#: src/gui/didyouknowwindow.cpp:63
+msgid "Next >"
+msgstr "Selanjutnya"
+
+#: src/gui/didyouknowwindow.cpp:64
+msgid "Auto open this window"
+msgstr "Buka jendela otomatis"
+
+#: src/gui/editdialog.cpp:46 src/gui/itemamountwindow.cpp:208
+#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
+#: src/gui/tradewindow.cpp:88 src/gui/tradewindow.cpp:90
+msgid "OK"
+msgstr "OK"
+
+#: src/gui/equipmentwindow.cpp:78 src/gui/windowmenu.cpp:74
 msgid "Equipment"
 msgstr "Perlengkapan"
 
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:77
-#: src/gui/inventorywindow.cpp:79 src/gui/inventorywindow.cpp:298
-#: src/gui/popupmenu.cpp:372
+#: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:129
+#: src/gui/inventorywindow.cpp:490 src/gui/inventorywindow.cpp:499
+#: src/gui/popupmenu.cpp:1577 src/gui/popupmenu.cpp:1672
+#: src/gui/popupmenu.cpp:1717
 msgid "Unequip"
-msgstr ""
+msgstr "Lepaskan"
 
-#: src/gui/help.cpp:36
+#: src/gui/helpwindow.cpp:43
 msgid "Help"
-msgstr ""
-
-#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:73
-msgid "Close"
-msgstr ""
+msgstr "Bantuan"
 
-#: src/gui/inventorywindow.cpp:56 src/gui/windowmenu.cpp:57
+#: src/gui/inventorywindow.cpp:79 src/gui/windowmenu.cpp:76
+#: src/inventory.cpp:246
 msgid "Inventory"
-msgstr "Inventaris"
+msgstr "Perbekalan"
+
+#: src/gui/inventorywindow.cpp:103
+msgid "Slots:"
+msgstr "Slot"
+
+#: src/gui/inventorywindow.cpp:114
+msgid "Filter:"
+msgstr "Penyaring:"
+
+#: src/gui/inventorywindow.cpp:115
+msgid "Sort:"
+msgstr "Susun"
 
-#: src/gui/inventorywindow.cpp:72 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:300 src/gui/popupmenu.cpp:374
+#: src/gui/inventorywindow.cpp:121
+msgid "na"
+msgstr "t/a"
+
+#: src/gui/inventorywindow.cpp:122
+msgid "az"
+msgstr "az"
+
+#: src/gui/inventorywindow.cpp:123
+msgid "id"
+msgstr "id"
+
+#: src/gui/inventorywindow.cpp:127 src/gui/inventorywindow.cpp:492
+#: src/gui/inventorywindow.cpp:501 src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1674 src/gui/popupmenu.cpp:1719
 msgid "Equip"
-msgstr ""
+msgstr "Pakai"
 
-#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:304 src/gui/popupmenu.cpp:377
+#: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:493
+#: src/gui/inventorywindow.cpp:497 src/gui/popupmenu.cpp:1582
+#: src/gui/popupmenu.cpp:1641 src/gui/popupmenu.cpp:1678
+#: src/gui/popupmenu.cpp:1722
 msgid "Use"
 msgstr "Gunakan"
 
-#: src/gui/inventorywindow.cpp:83 src/gui/inventorywindow.cpp:308
-#: src/gui/popupmenu.cpp:380
-#, fuzzy
+#: src/gui/inventorywindow.cpp:142 src/gui/inventorywindow.cpp:598
+#: src/gui/popupmenu.cpp:1586 src/gui/popupmenu.cpp:1683
+#: src/gui/popupmenu.cpp:1726
 msgid "Drop..."
-msgstr "Jatuh"
+msgstr "Buang..."
 
-#: src/gui/inventorywindow.cpp:84 src/gui/popupmenu.cpp:386
+#: src/gui/inventorywindow.cpp:143 src/gui/popupmenu.cpp:1595
+#: src/gui/popupmenu.cpp:1692 src/gui/popupmenu.cpp:1735
 msgid "Split"
 msgstr "Pecah"
 
-#: src/gui/inventorywindow.cpp:85 src/gui/outfitwindow.cpp:51
+#: src/gui/inventorywindow.cpp:144 src/gui/outfitwindow.cpp:59
+#: src/gui/popupmenu.cpp:493
 msgid "Outfits"
-msgstr ""
-
-#: src/gui/inventorywindow.cpp:96 src/gui/storagewindow.cpp:83
-msgid "Slots:"
-msgstr ""
+msgstr "Setelan"
 
-#: src/gui/inventorywindow.cpp:97
+#: src/gui/inventorywindow.cpp:147
 msgid "Weight:"
-msgstr ""
+msgstr "Berat"
 
-#: src/gui/inventorywindow.cpp:310 src/gui/popupmenu.cpp:382
-msgid "Drop"
-msgstr "Jatuh"
+#: src/gui/inventorywindow.cpp:172 src/gui/inventorywindow.cpp:589
+#: src/gui/popupmenu.cpp:1558 src/gui/popupmenu.cpp:1695
+#: src/gui/popupmenu.cpp:1738 src/gui/setup.cpp:68
+msgid "Store"
+msgstr "Simpan"
 
-#: src/gui/itemamount.cpp:100 src/gui/okdialog.cpp:42
-#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:38 src/gui/trade.cpp:73
-#: src/gui/trade.cpp:75
-msgid "OK"
-msgstr ""
+#: src/gui/inventorywindow.cpp:173 src/gui/popupmenu.cpp:1602
+msgid "Retrieve"
+msgstr "Kembalikan"
 
-#: src/gui/itemamount.cpp:102
+#: src/gui/inventorywindow.cpp:600 src/gui/popupmenu.cpp:1591
+#: src/gui/popupmenu.cpp:1688 src/gui/popupmenu.cpp:1731
+#: src/gui/windowmenu.cpp:97
+msgid "Drop"
+msgstr "Buang"
+
+#: src/gui/itemamountwindow.cpp:210
 msgid "All"
-msgstr ""
+msgstr "Semua"
 
-#: src/gui/itemamount.cpp:128
+#: src/gui/itemamountwindow.cpp:261
 msgid "Select amount of items to trade."
 msgstr "Pilih jumlah item yang mau di perdagangkan"
 
-#: src/gui/itemamount.cpp:131
+#: src/gui/itemamountwindow.cpp:264
 msgid "Select amount of items to drop."
-msgstr "Pilih jumlah item yang mau di buang"
+msgstr "Pilih jumlah item yang ingin dibuang"
 
-#: src/gui/itemamount.cpp:134
+#: src/gui/itemamountwindow.cpp:267
 msgid "Select amount of items to store."
-msgstr ""
+msgstr "Pilih jumlah item yang ingin disimpan"
 
-#: src/gui/itemamount.cpp:137
+#: src/gui/itemamountwindow.cpp:270
 msgid "Select amount of items to retrieve."
-msgstr ""
+msgstr "Pilih jumlah item yang ingin diambil kembali"
 
-#: src/gui/itemamount.cpp:140
+#: src/gui/itemamountwindow.cpp:273
 msgid "Select amount of items to split."
-msgstr "Pilih jumlah item yang mau di pisahkan"
+msgstr "Pilih jumlah item yang ingin dipisahkan"
+
+#: src/gui/itemamountwindow.cpp:276
+msgid "Add to buy shop."
+msgstr "Tambahkan ke daftar beli"
+
+#: src/gui/itemamountwindow.cpp:279
+msgid "Add to sell shop."
+msgstr "Tambahkan ke daftar jual"
+
+#: src/gui/itemamountwindow.cpp:282
+msgid "Unknown."
+msgstr "Tidak diketahui"
 
-#: src/gui/itempopup.cpp:92
-#, fuzzy, c-format
+#: src/gui/itempopup.cpp:176 src/gui/itempopup.cpp:182
+msgid ", "
+msgstr ","
+
+#: src/gui/itempopup.cpp:192
+#, c-format
 msgid "Weight: %s"
-msgstr "Efek: %s"
+msgstr "Berat: %s"
 
-#: src/gui/login.cpp:49 src/gui/login.cpp:61
-msgid "Login"
-msgstr "Login"
+#: src/gui/killstats.cpp:45 src/gui/windowmenu.cpp:69
+msgid "Kill stats"
+msgstr "Stat membunuh"
 
-#: src/gui/login.cpp:58
-msgid "Remember username"
-msgstr ""
+#: src/gui/killstats.cpp:63
+msgid "Reset stats"
+msgstr "Atur ulang stats"
 
-#: src/gui/login.cpp:59 src/gui/register.cpp:58 src/gui/register.cpp:73
-msgid "Register"
-msgstr "Mendaftar"
+#: src/gui/killstats.cpp:64
+msgid "Reset timer"
+msgstr "Atur ulang penghitung waktu"
 
-#: src/gui/login.cpp:60
-#, fuzzy
-msgid "Change Server"
-msgstr "Ubah"
+#: src/gui/killstats.cpp:68 src/gui/killstats.cpp:204
+#, c-format
+msgid "Level: %d at %f%%"
+msgstr "Level: %d pada %f%%"
 
-#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
-msgid "Map"
-msgstr ""
+#: src/gui/killstats.cpp:72 src/gui/killstats.cpp:209
+#, c-format
+msgid "Exp: %d/%d Left: %d"
+msgstr "Exp: %d%d Tersisa:%d"
 
-#: src/gui/npcdialog.cpp:44
-msgid "Waiting for server"
-msgstr ""
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:215
+#: src/gui/killstats.cpp:224
+#, c-format
+msgid "1%% = %d exp, avg mob for 1%%: %s"
+msgstr "%%= %d exp, rata-rata mob untuk 1%%: %s"
 
-#: src/gui/npcdialog.cpp:45
-msgid "Next"
-msgstr "Berikutnya"
+#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:141
+#: src/gui/killstats.cpp:233
+#, c-format
+msgid "Kills: %s, total exp: %s"
+msgstr "Membunuh: %s, exp total: %s"
 
-#: src/gui/npcdialog.cpp:47
-msgid "Submit"
-msgstr ""
+#: src/gui/killstats.cpp:80 src/gui/killstats.cpp:143
+#: src/gui/killstats.cpp:219 src/gui/killstats.cpp:229
+#, c-format
+msgid "Avg Exp: %s, No. of avg mob to next level: %s"
+msgstr "Rata-rata: %s, No. dari rata-rata mob ke level selanjutnya: %s"
 
-#: src/gui/npcdialog.cpp:52 src/gui/npcpostdialog.cpp:41
-msgid "NPC"
-msgstr "NPC"
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:161
+#: src/gui/killstats.cpp:236
+#, c-format
+msgid "Kills/Min: %s, Exp/Min: %s"
+msgstr "Membunuh/menit: %s, Exp/menit: %s"
 
-#: src/gui/npcdialog.cpp:110
-msgid "Reset"
-msgstr ""
+#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:88 src/gui/killstats.cpp:93
+#: src/gui/killstats.cpp:288 src/gui/killstats.cpp:304
+#: src/gui/killstats.cpp:322
+#, c-format
+msgid "Exp speed per %d min: %s"
+msgid_plural "Exp speed per %d min: %s"
+msgstr[0] ""
+"satu: Kecepatan Exp per %d menit: %s\n"
+"\n"
+"lainnya: Kecepatan Exp per %d menit: %s"
 
-#. TRANSLATORS: Please leave the \n sequences intact.
-#: src/gui/npcdialog.cpp:171
-#, fuzzy
-msgid ""
+#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
+#, c-format
+msgid "Time for next level per %d min: %s"
+msgid_plural "Time for next level per %d min: %s"
+msgstr[0] ""
+"satu: Waktu sebelum naik ke level selanjutnya %d menit: %s\n"
 "\n"
-"> Next\n"
-msgstr "Berikutnya"
+"Lainnya: Waktu sebelum naik ke level selanjutnya %d menit: %s"
 
-#: src/gui/npcpostdialog.cpp:47
-msgid "To:"
-msgstr ""
+#: src/gui/killstats.cpp:99 src/gui/killstats.cpp:240
+msgid "Last kill exp:"
+msgstr "Exp terakhir"
 
-#: src/gui/npcpostdialog.cpp:54
-msgid "Send"
-msgstr ""
+#: src/gui/killstats.cpp:101 src/gui/killstats.cpp:354
+#: src/gui/killstats.cpp:360 src/gui/killstats.cpp:366
+#: src/gui/killstats.cpp:371
+msgid "Time before jacko spawn:"
+msgstr "waktu sebelum Jacko kembali"
 
-#: src/gui/npcpostdialog.cpp:96
-msgid "Failed to send as sender or letter invalid."
-msgstr ""
+#: src/gui/killstats.cpp:293 src/gui/killstats.cpp:300
+#: src/gui/killstats.cpp:310 src/gui/killstats.cpp:317
+#: src/gui/killstats.cpp:329 src/gui/killstats.cpp:336
+#, c-format
+msgid "  Time for next level: %s"
+msgstr "waktu untuk ke level selanjutnya: %s"
 
-#: src/gui/outfitwindow.cpp:68 src/gui/outfitwindow.cpp:141
-#: src/gui/outfitwindow.cpp:154
+#: src/gui/killstats.cpp:360
 #, c-format
-msgid "Outfit: %d"
-msgstr ""
+msgid "%s %d?"
+msgstr "%s %d?"
 
-#: src/gui/outfitwindow.cpp:70
-msgid "Unequip first"
-msgstr ""
+#: src/gui/killstats.cpp:366
+msgid "jacko spawning"
+msgstr "Jacko bertelur"
 
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:143
-msgid "Text"
-msgstr ""
+#: src/gui/logindialog.cpp:59
+msgid "Normal"
+msgstr "Normal"
 
-#: src/gui/palette.cpp:82
-msgid "Text Shadow"
-msgstr ""
+#: src/gui/logindialog.cpp:60
+msgid "Auto Close"
+msgstr "Tutup otomatis"
 
-#: src/gui/palette.cpp:83
-msgid "Text Outline"
-msgstr ""
+#: src/gui/logindialog.cpp:61
+msgid "Skip"
+msgstr "lanjutkan"
 
-#: src/gui/palette.cpp:84
-msgid "Progress Bar Labels"
-msgstr ""
+#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:122
+msgid "Login"
+msgstr "Login"
 
-#: src/gui/palette.cpp:85
-msgid "Buttons"
-msgstr ""
+#: src/gui/logindialog.cpp:90 src/gui/serverdialog.cpp:243
+#: src/gui/widgets/chattab.cpp:173
+msgid "Server:"
+msgstr "Server:"
 
-#: src/gui/palette.cpp:86
-msgid "Disabled Buttons"
-msgstr ""
+#: src/gui/logindialog.cpp:95
+msgid "Custom update host"
+msgstr "Modifikasi sumber update"
 
-#: src/gui/palette.cpp:87
-msgid "Tabs"
-msgstr ""
+#: src/gui/logindialog.cpp:109
+msgid "Remember username"
+msgstr "Ingat username"
 
-#: src/gui/palette.cpp:89
-msgid "Background"
-msgstr ""
+#: src/gui/logindialog.cpp:110
+msgid "Update:"
+msgstr "Update:"
 
-#: src/gui/palette.cpp:91
-msgid "Highlight"
-msgstr ""
+#: src/gui/logindialog.cpp:120 src/gui/register.cpp:66 src/gui/register.cpp:81
+msgid "Register"
+msgstr "Mendaftar"
 
-#: src/gui/palette.cpp:92
-msgid "Tab Highlight"
-msgstr ""
+#: src/gui/logindialog.cpp:121
+msgid "Change Server"
+msgstr "Menganti Server"
 
-#: src/gui/palette.cpp:93
-msgid "Item Too Expensive"
+#: src/gui/ministatus.cpp:59
+msgid "health bar"
 msgstr ""
 
-#: src/gui/palette.cpp:94
-msgid "Item Is Equipped"
+#: src/gui/ministatus.cpp:65
+msgid "mana bar"
 msgstr ""
 
-#: src/gui/palette.cpp:97
-msgid "GM"
+#: src/gui/ministatus.cpp:77
+msgid "experience bar"
 msgstr ""
 
-#: src/gui/palette.cpp:98
-msgid "Player"
+#: src/gui/ministatus.cpp:83
+msgid "job bar"
 msgstr ""
 
-#: src/gui/palette.cpp:99
-msgid "Whisper"
+#: src/gui/ministatus.cpp:92
+msgid "weight bar"
 msgstr ""
 
-#: src/gui/palette.cpp:100
-msgid "Is"
+#: src/gui/ministatus.cpp:95
+msgid "inventory slots bar"
 msgstr ""
 
-#: src/gui/palette.cpp:101 src/net/ea/gui/partytab.cpp:43
-msgid "Party"
+#: src/gui/ministatus.cpp:98
+msgid "money bar"
 msgstr ""
 
-#: src/gui/palette.cpp:102 src/net/ea/gui/guildtab.cpp:45
-msgid "Guild"
+#: src/gui/ministatus.cpp:101
+msgid "arrows bar"
 msgstr ""
 
-#: src/gui/palette.cpp:103
-msgid "Server"
+#: src/gui/ministatus.cpp:104
+msgid "status bar"
 msgstr ""
 
-#: src/gui/palette.cpp:104
-msgid "Logger"
-msgstr ""
+#: src/gui/ministatus.cpp:296 src/gui/ministatus.cpp:336
+msgid "Need"
+msgstr "Butuh"
 
-#: src/gui/palette.cpp:105
-msgid "Hyperlink"
-msgstr ""
+#: src/gui/npcdialog.cpp:51
+msgid "Waiting for server"
+msgstr "Menunggu ke server"
 
-#: src/gui/palette.cpp:107
-msgid "Being"
-msgstr ""
+#: src/gui/npcdialog.cpp:52
+msgid "Next"
+msgstr "Berikutnya"
 
-#: src/gui/palette.cpp:108
-msgid "Other Players' Names"
-msgstr ""
+#: src/gui/npcdialog.cpp:54
+msgid "Submit"
+msgstr "Masukan"
 
-#: src/gui/palette.cpp:109
-msgid "Own Name"
-msgstr ""
+#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
+msgid "NPC"
+msgstr "NPC"
 
-#: src/gui/palette.cpp:110
-msgid "GM Names"
-msgstr ""
+#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:534
+msgid "Clear"
+msgstr "Hapus"
 
-#: src/gui/palette.cpp:111
-msgid "NPCs"
+#: src/gui/npcdialog.cpp:222
+msgid "> Next"
 msgstr ""
 
-#: src/gui/palette.cpp:112
-msgid "Monsters"
-msgstr ""
+#: src/gui/npcpostdialog.cpp:48
+msgid "To:"
+msgstr "Kepada:"
 
-#: src/gui/palette.cpp:114
-msgid "Unknown Item Type"
-msgstr ""
+#: src/gui/npcpostdialog.cpp:55
+msgid "Send"
+msgstr "Kirim"
 
-#: src/gui/palette.cpp:115
-msgid "Generics"
-msgstr ""
+#: src/gui/npcpostdialog.cpp:99
+msgid "Failed to send as sender or letter invalid."
+msgstr "Gagal untuk mengirim sebagai pengirim atau surat tidak valid."
 
-#: src/gui/palette.cpp:116
-msgid "Hats"
-msgstr ""
+#: src/gui/outfitwindow.cpp:82 src/gui/outfitwindow.cpp:886
+#, c-format
+msgid "Outfit: %d"
+msgstr "Setelan: %d"
 
-#: src/gui/palette.cpp:117
-msgid "Usables"
-msgstr ""
+#: src/gui/outfitwindow.cpp:84 src/gui/outfitwindow.cpp:888
+#, c-format
+msgid "Key: %s"
+msgstr "Kunci: %s"
 
-#: src/gui/palette.cpp:118
-msgid "Shirts"
-msgstr ""
+#: src/gui/outfitwindow.cpp:87
+msgid "Unequip first"
+msgstr "Copot lebih dahulu"
 
-#: src/gui/palette.cpp:119
-msgid "One Handed Weapons"
-msgstr ""
+#: src/gui/outfitwindow.cpp:90
+msgid "Away outfit"
+msgstr "Setelan saat bepergian"
 
-#: src/gui/palette.cpp:120
-msgid "Pants"
-msgstr ""
+#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:588
+#: src/gui/tradewindow.cpp:89 src/gui/tradewindow.cpp:90
+#: src/gui/widgets/tradetab.cpp:44
+msgid "Trade"
+msgstr "Tukar"
 
-#: src/gui/palette.cpp:121
-msgid "Shoes"
-msgstr ""
+#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:353
+msgid "Whisper"
+msgstr "Berbisik"
+
+#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:593
+msgid "Heal"
+msgstr "Menyembuhkan"
+
+#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:359
+#: src/gui/popupmenu.cpp:600
+msgid "Be friend"
+msgstr "Jadikan teman"
+
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:153
+#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:361
+#: src/gui/popupmenu.cpp:367 src/gui/popupmenu.cpp:386
+#: src/gui/popupmenu.cpp:602 src/gui/popupmenu.cpp:610
+#: src/gui/popupmenu.cpp:634
+msgid "Disregard"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
+#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:173
+#: src/gui/popupmenu.cpp:363 src/gui/popupmenu.cpp:369
+#: src/gui/popupmenu.cpp:376 src/gui/popupmenu.cpp:381
+#: src/gui/popupmenu.cpp:605 src/gui/popupmenu.cpp:613
+#: src/gui/popupmenu.cpp:621 src/gui/popupmenu.cpp:627
+msgid "Erase"
+msgstr "Hapus"
 
-#: src/gui/palette.cpp:122
-msgid "Two Handed Weapons"
+#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:171
+#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:373
+#: src/gui/popupmenu.cpp:380 src/gui/popupmenu.cpp:385
+#: src/gui/popupmenu.cpp:618 src/gui/popupmenu.cpp:626
+#: src/gui/popupmenu.cpp:632
+msgid "Unignore"
+msgstr "Batalkan pengabaian"
+
+#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:182
+#: src/gui/popupmenu.cpp:375 src/gui/popupmenu.cpp:388
+#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:636
+#: src/playerrelations.cpp:400
+msgid "Completely ignore"
 msgstr ""
 
-#: src/gui/palette.cpp:123
-msgid "Shields"
-msgstr ""
+#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:396
+#: src/gui/popupmenu.cpp:644
+msgid "Follow"
+msgstr "Mengikuti"
 
-#: src/gui/palette.cpp:124
-msgid "Rings"
-msgstr ""
+#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:397
+#: src/gui/popupmenu.cpp:645
+msgid "Imitation"
+msgstr "Tirukan"
 
-#: src/gui/palette.cpp:125
-msgid "Necklaces"
-msgstr ""
+#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:668
+msgid "Invite to party"
+msgstr "Undang ke kelompok"
 
-#: src/gui/palette.cpp:126
-msgid "Arms"
-msgstr ""
+#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:406
+#: src/gui/popupmenu.cpp:673
+msgid "Kick from party"
+msgstr "Keluarkan dari kelompok"
 
-#: src/gui/palette.cpp:127
-msgid "Ammo"
-msgstr ""
+#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:417
+#: src/gui/popupmenu.cpp:687
+msgid "Kick from guild"
+msgstr "Keluarkan dari organisasi"
 
-#: src/gui/palette.cpp:129
-msgid "Particle Effects"
-msgstr ""
+#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:419
+#: src/gui/popupmenu.cpp:689
+msgid "Change pos in guild"
+msgstr "Ubah posisi di organisasi"
 
-#: src/gui/palette.cpp:130
-msgid "Pickup Notification"
-msgstr ""
+#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:424
+#: src/gui/popupmenu.cpp:695
+msgid "Invite to guild"
+msgstr "Undang ke organisasi"
 
-#: src/gui/palette.cpp:131
-msgid "Exp Notification"
-msgstr ""
+#: src/gui/popupmenu.cpp:238
+msgid "Kick player"
+msgstr "keluarkan  pemain"
 
-#: src/gui/palette.cpp:133
-msgid "Player Hits Monster"
+#: src/gui/popupmenu.cpp:240
+msgid "Nuke"
 msgstr ""
 
-#: src/gui/palette.cpp:135
-msgid "Monster Hits Player"
-msgstr ""
+#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:647
+msgid "Show Items"
+msgstr "Perlihatkan item"
 
-#: src/gui/palette.cpp:136
-msgid "Critical Hit"
-msgstr ""
+#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:648
+#: src/gui/popupmenu.cpp:1903
+msgid "Undress"
+msgstr "Tanggalkan pakaian"
 
-#: src/gui/palette.cpp:137
-msgid "Misses"
-msgstr ""
+#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:398
+#: src/gui/popupmenu.cpp:650 src/gui/popupmenu.cpp:703
+msgid "Add comment"
+msgstr "Penambahan komentar"
 
-#: src/gui/palette.cpp:139
-msgid "HP Bar"
-msgstr ""
+#: src/gui/popupmenu.cpp:277
+msgid "Kick"
+msgstr "keluarkan"
 
-#: src/gui/palette.cpp:140
-msgid "3/4 HP Bar"
-msgstr ""
+#: src/gui/popupmenu.cpp:288
+msgid "Remove from attack list"
+msgstr "Hapus dari daftar menyerang"
 
-#: src/gui/palette.cpp:141
-msgid "1/2 HP Bar"
-msgstr ""
+#: src/gui/popupmenu.cpp:294
+msgid "Add to priority attack list"
+msgstr "Tambahkan prioritas daftar menyerang"
 
-#: src/gui/palette.cpp:142
-msgid "1/4 HP Bar"
-msgstr ""
+#: src/gui/popupmenu.cpp:296
+msgid "Add to attack list"
+msgstr "Tambahkan ke daftar menyerang"
 
-#: src/gui/popupmenu.cpp:84
-#, fuzzy, c-format
-msgid "Trade with %s..."
-msgstr "@@trade|Dagang Dengan %s@@"
+#: src/gui/popupmenu.cpp:299
+msgid "Add to ignore list"
+msgstr "Tambahkan ke daftar Abaikan"
 
-#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:161
-#, fuzzy, c-format
-msgid "Attack %s"
-msgstr "Serangan %+d"
+#: src/gui/popupmenu.cpp:312 src/gui/popupmenu.cpp:435
+msgid "Add name to chat"
+msgstr "Tambahkan nama ke Obrolan"
 
-#: src/gui/popupmenu.cpp:92
-#, c-format
-msgid "Whisper %s"
-msgstr ""
+#: src/gui/popupmenu.cpp:461
+msgid "Pick up"
+msgstr "Ambil"
 
-#: src/gui/popupmenu.cpp:101
-#, c-format
-msgid "Befriend %s"
-msgstr ""
+#: src/gui/popupmenu.cpp:462 src/gui/popupmenu.cpp:1616
+#: src/gui/popupmenu.cpp:1696 src/gui/popupmenu.cpp:1739
+msgid "Add to chat"
+msgstr "Ambil ke obrolan"
 
-#: src/gui/popupmenu.cpp:106
-#, c-format
-msgid "Disregard %s"
-msgstr ""
+#: src/gui/popupmenu.cpp:479
+msgid "Map Item"
+msgstr "Daftar barang"
 
-#: src/gui/popupmenu.cpp:109
-#, c-format
-msgid "Ignore %s"
-msgstr ""
+#: src/gui/popupmenu.cpp:480
+msgid "Rename"
+msgstr "Ganti nama"
 
-#: src/gui/popupmenu.cpp:115 src/gui/popupmenu.cpp:124
-#, c-format
-msgid "Unignore %s"
-msgstr ""
+#: src/gui/popupmenu.cpp:481 src/gui/popupmenu.cpp:1856
+#: src/gui/popupmenu.cpp:1874 src/gui/popupmenu.cpp:1879
+msgid "Remove"
+msgstr "Hapus"
 
-#: src/gui/popupmenu.cpp:118
-#, c-format
-msgid "Completely ignore %s"
-msgstr ""
+#: src/gui/popupmenu.cpp:495
+msgid "Load old outfits"
+msgstr "Memuat setelan lama"
 
-#: src/gui/popupmenu.cpp:130
-#, c-format
-msgid "Follow %s"
-msgstr ""
+#: src/gui/popupmenu.cpp:511 src/gui/windowmenu.cpp:96
+msgid "Spells"
+msgstr "Mantra"
 
-#: src/gui/popupmenu.cpp:133
-#, c-format
-msgid "Invite %s to join your guild"
-msgstr ""
+#: src/gui/popupmenu.cpp:513
+msgid "Load old spells"
+msgstr "Memuat mantra lama"
 
-#: src/gui/popupmenu.cpp:137
-#, c-format
-msgid "Invite %s to join your party"
-msgstr ""
+#: src/gui/popupmenu.cpp:514
+msgid "Edit spell"
+msgstr "Edit mantra"
 
-#: src/gui/popupmenu.cpp:144
-msgid "Kick player"
-msgstr ""
+#: src/gui/popupmenu.cpp:540
+msgid "Disable highlight"
+msgstr "Nonaktifkan sorotan"
 
-#: src/gui/popupmenu.cpp:153
-#, c-format
-msgid "Talk to %s"
-msgstr ""
+#: src/gui/popupmenu.cpp:545
+msgid "Enable highlight"
+msgstr "Aktifkan sorotan"
 
-#: src/gui/popupmenu.cpp:166
-msgid "Kick monster"
+#: src/gui/popupmenu.cpp:550
+msgid "Dont remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:174
-msgid "Add name to chat"
+#: src/gui/popupmenu.cpp:555
+msgid "Remove name"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:191
-#, c-format
-msgid "Pick up %s"
+#: src/gui/popupmenu.cpp:560
+msgid "Enable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:400
-msgid "Add to chat"
+#: src/gui/popupmenu.cpp:565
+msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:70
-msgid "Store"
+#: src/gui/popupmenu.cpp:571 src/gui/socialwindow.cpp:1035
+msgid "Leave"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:71
-msgid "Retrieve"
-msgstr ""
+#: src/gui/popupmenu.cpp:715
+msgid "Change guild position"
+msgstr "Ubah posisi Organisasi"
 
-#: src/gui/quitdialog.cpp:44
-msgid "Switch server"
-msgstr "Ganti Server"
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1137
+msgid "Rename map sign          "
+msgstr "Ubah nama tanda peta"
 
-#: src/gui/quitdialog.cpp:45
-msgid "Switch character"
-msgstr "Ganti Karakter"
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1139
+msgid "Name:                    "
+msgstr "Nama:"
+
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1189
+msgid "Player comment            "
+msgstr "Komentar pemain"
 
-#: src/gui/recorder.cpp:87
-msgid "Finishing recording."
+#. TRANSLATORS: number of chars in string should be near original
+#: src/gui/popupmenu.cpp:1191
+msgid "Comment:                      "
+msgstr "komentar"
+
+#: src/gui/popupmenu.cpp:1541
+msgid "Add to trade"
 msgstr ""
 
-#: src/gui/recorder.cpp:91
-msgid "Not currently recording."
+#: src/gui/popupmenu.cpp:1547
+msgid "Add to trade 10"
 msgstr ""
 
-#: src/gui/recorder.cpp:96
-msgid "Already recording."
+#: src/gui/popupmenu.cpp:1550
+msgid "Add to trade half"
 msgstr ""
 
-#: src/gui/recorder.cpp:104
-msgid "Starting to record..."
+#: src/gui/popupmenu.cpp:1552
+msgid "Add to trade all"
 msgstr ""
 
-#: src/gui/recorder.cpp:112
-msgid "Failed to start recording."
+#: src/gui/popupmenu.cpp:1564
+msgid "Store 10"
+msgstr "Masukkan 10"
+
+#: src/gui/popupmenu.cpp:1567
+msgid "Store half"
+msgstr "Masukkan setengah"
+
+#: src/gui/popupmenu.cpp:1569
+msgid "Store all"
+msgstr "Masukkan semua"
+
+#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1684
+#: src/gui/popupmenu.cpp:1727
+msgid "Drop all"
+msgstr "Buang semuanya"
+
+#: src/gui/popupmenu.cpp:1608
+msgid "Retrieve 10"
+msgstr "Ambil 10"
+
+#: src/gui/popupmenu.cpp:1611
+msgid "Retrieve half"
+msgstr "Ambil setengah"
+
+#: src/gui/popupmenu.cpp:1613
+msgid "Retrieve all"
+msgstr "Ambil semua"
+
+#: src/gui/popupmenu.cpp:1644 src/gui/popupmenu.cpp:1700
+msgid "Load old item shortcuts"
+msgstr "Muat jalan pintas iItem lama"
+
+#: src/gui/popupmenu.cpp:1743
+msgid "Load old drop shortcuts"
+msgstr "Muat jalan pintas Buang yang lama"
+
+#: src/gui/popupmenu.cpp:1769 src/gui/popupmenu.cpp:1804
+msgid "Hide"
 msgstr ""
 
-#: src/gui/recorder.h:38
-msgid "Recording..."
+#: src/gui/popupmenu.cpp:1775 src/gui/popupmenu.cpp:1810
+msgid "Show"
 msgstr ""
 
-#: src/gui/recorder.h:39
-msgid "Stop recording"
+#: src/gui/popupmenu.cpp:1817
+msgid "Reset yellow bar"
 msgstr ""
 
-#: src/gui/register.cpp:69
+#: src/gui/popupmenu.cpp:1819
+msgid "Copy to chat"
+msgstr "Pindahkan ke chat"
+
+#: src/gui/popupmenu.cpp:1836 src/gui/socialwindow.cpp:854
+#: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
+msgid "(default)"
+msgstr "(kembalikan)"
+
+#: src/gui/popupmenu.cpp:1848 src/gui/popupmenu.cpp:1866
+msgid "Move up"
+msgstr "Bergerak keatas"
+
+#: src/gui/popupmenu.cpp:1853 src/gui/popupmenu.cpp:1871
+msgid "Move down"
+msgstr "Bergerak kebawah"
+
+#: src/gui/quitdialog.cpp:56
+msgid "Save state"
+msgstr "Simpan posisi"
+
+#: src/gui/quitdialog.cpp:57
+msgid "Switch server"
+msgstr "Ganti Server"
+
+#: src/gui/quitdialog.cpp:58
+msgid "Switch character"
+msgstr "Ganti Karakter"
+
+#: src/gui/register.cpp:77
 msgid "Confirm:"
 msgstr "Konfirmasi:"
 
-#: src/gui/register.cpp:100
+#: src/gui/register.cpp:108
 msgid "Email:"
 msgstr "Email:"
 
-#: src/gui/register.cpp:166
+#: src/gui/register.cpp:176
 #, c-format
 msgid "The username needs to be at least %d characters long."
-msgstr "Panjang username setidak-tidaknya %d karakter"
+msgstr "Panjang username sedikitnya harus terdiri dari %d karakter."
 
-#: src/gui/register.cpp:174
+#: src/gui/register.cpp:184
 #, c-format
 msgid "The username needs to be less than %d characters long."
-msgstr ""
+msgstr "Panjang username tidak boleh kurang dari %d karakter."
 
-#: src/gui/register.cpp:182 src/gui/unregisterdialog.cpp:117
+#: src/gui/register.cpp:192 src/gui/unregisterdialog.cpp:121
 #, c-format
 msgid "The password needs to be at least %d characters long."
-msgstr "Panjang kata-sandi setidak-tidaknya %d karakter"
+msgstr "Panjang kata sandi sedikitnya harus terdiri dari %d karakter"
 
-#: src/gui/register.cpp:190 src/gui/unregisterdialog.cpp:124
+#: src/gui/register.cpp:200 src/gui/unregisterdialog.cpp:128
 #, c-format
 msgid "The password needs to be less than %d characters long."
-msgstr ""
+msgstr "Panjang kata sandi tidak boleh kurang dari %d karakter."
 
-#: src/gui/register.cpp:197
+#: src/gui/register.cpp:207
 msgid "Passwords do not match."
-msgstr "Kata sandi tidak sama."
+msgstr "Kata sandi cocok."
 
-#: src/gui/serverdialog.cpp:134
+#: src/gui/serverdialog.cpp:228
 msgid "Choose Your Server"
-msgstr ""
+msgstr "Pilih Server Anda"
 
-#: src/gui/serverdialog.cpp:141 src/gui/widgets/chattab.cpp:139
-msgid "Server:"
-msgstr "Server:"
-
-#: src/gui/serverdialog.cpp:142
+#: src/gui/serverdialog.cpp:244
 msgid "Port:"
 msgstr "Port:"
 
-#: src/gui/serverdialog.cpp:143
-#, fuzzy
+#: src/gui/serverdialog.cpp:247
+msgid "Use same ip for game sub servers"
+msgstr "Gunakan ip yang sama untuk sub server game"
+
+#: src/gui/serverdialog.cpp:261
 msgid "Server type:"
-msgstr "Server:"
+msgstr "Tipe server:"
+
+#: src/gui/serverdialog.cpp:285
+msgid "Load"
+msgstr "Memuat"
 
-#: src/gui/serverdialog.cpp:183
-#, fuzzy
+#: src/gui/serverdialog.cpp:286
 msgid "Connect"
-msgstr "Menyambung..."
+msgstr "Menyambung"
 
-#: src/gui/serverdialog.cpp:184
-#, fuzzy
+#: src/gui/serverdialog.cpp:287
 msgid "Custom Server"
-msgstr "Server:"
+msgstr "Modifikasi server"
 
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:392
 msgid "Please type both the address and the port of a server."
 msgstr "Tolong tulis address dan port dari server"
 
-#: src/gui/serverdialog.cpp:411
+#: src/gui/serverdialog.cpp:550
 #, c-format
 msgid "Downloading server list...%2.2f%%"
-msgstr ""
+msgstr "Mengunduh daftar server... %2.2f%%"
 
-#: src/gui/serverdialog.cpp:417
+#: src/gui/serverdialog.cpp:555
 msgid "Waiting for server..."
-msgstr ""
+msgstr "Menyambung ke server..."
 
-#: src/gui/serverdialog.cpp:421
+#: src/gui/serverdialog.cpp:559
 msgid "Preparing download"
-msgstr ""
+msgstr "Menyiapkan pengunduhan"
 
-#: src/gui/setup_audio.cpp:42
-msgid "Sound"
-msgstr "Suara"
+#: src/gui/serverdialog.cpp:563
+msgid "Error retreiving server list!"
+msgstr "Gagal mengunduh data server!"
+
+#: src/gui/serverdialog.cpp:661
+msgid "requires a newer version"
+msgstr "Membutuhkan versi terbaru"
+
+#: src/gui/serverdialog.cpp:663
+#, c-format
+msgid "requires v%s"
+msgstr "Membutuhkan v%s"
 
-#: src/gui/setup_audio.cpp:43
+#: src/gui/setup_audio.cpp:50
+msgid "Enable Audio"
+msgstr "Perbolehkan Audio"
+
+#: src/gui/setup_audio.cpp:51
+msgid "Enable game sfx"
+msgstr "Perbolehkan game sfx"
+
+#: src/gui/setup_audio.cpp:52
+msgid "Enable gui sfx"
+msgstr "Perbolehkan gui sfx"
+
+#: src/gui/setup_audio.cpp:53
+msgid "Enable music"
+msgstr "Perbolehkan musik"
+
+#: src/gui/setup_audio.cpp:54
+msgid "Enable mumble voice chat"
+msgstr "Perbolehkan gumaman obrolan suara"
+
+#: src/gui/setup_audio.cpp:56
 msgid "Download music"
-msgstr ""
+msgstr "Unduh musik"
 
-#: src/gui/setup_audio.cpp:47
+#: src/gui/setup_audio.cpp:61
 msgid "Audio"
 msgstr "Suara"
 
-#: src/gui/setup_audio.cpp:50
+#: src/gui/setup_audio.cpp:64
 msgid "Sfx volume"
 msgstr "Volume sfx"
 
-#: src/gui/setup_audio.cpp:51
+#: src/gui/setup_audio.cpp:65
 msgid "Music volume"
 msgstr "Volume Musik"
 
-#: src/gui/setup_audio.cpp:94
+#: src/gui/setup_audio.cpp:120
 msgid "Notice"
-msgstr ""
+msgstr "Peringatan"
 
-#: src/gui/setup_audio.cpp:94
+#: src/gui/setup_audio.cpp:120
 msgid "You may have to restart your client if you want to download new music"
-msgstr ""
+msgstr "Anda harus merestart klien anda untuk mengunduh musik baru."
 
-#: src/gui/setup_audio.cpp:106
+#: src/gui/setup_audio.cpp:133
 msgid "Sound Engine"
-msgstr ""
+msgstr "Pengaturan suara"
 
-#: src/gui/setup_colors.cpp:44
-msgid "This is what the color looks like"
-msgstr ""
+#: src/gui/setup_chat.cpp:55
+msgid "Remove colors from received chat messages"
+msgstr "Hapus warna dari pesan obrolan yang masuk"
+
+#: src/gui/setup_chat.cpp:58
+msgid "Log magic messages in debug tab"
+msgstr "Riwayat pesan sihir di jendela debug"
+
+#: src/gui/setup_chat.cpp:61
+msgid "Allow magic and GM commands in all chat tabs"
+msgstr "Perbolehkan sihir dan Perintah GM di semua jendela obrolan"
+
+#: src/gui/setup_chat.cpp:64
+msgid "Show server messages in debug tab"
+msgstr "Tujukkan pesan server di jendela debug"
+
+#: src/gui/setup_chat.cpp:67
+msgid "Show chat colors list"
+msgstr "Tunjukkan daftar warna obrolan"
+
+#: src/gui/setup_chat.cpp:70
+msgid "Limit max chars in chat line"
+msgstr "Batas maksimal karakter di garis obrolan"
+
+#: src/gui/setup_chat.cpp:73
+msgid "Enable chat Log"
+msgstr "Perbolehkan riwayat obrolan"
+
+#: src/gui/setup_chat.cpp:76
+msgid "Limit max lines in chat"
+msgstr "Batas maksimal baris di obrolan"
+
+#: src/gui/setup_chat.cpp:79
+msgid "Enable trade tab"
+msgstr "Perbolehkan jendela transkaksi/trade"
+
+#: src/gui/setup_chat.cpp:82
+msgid "Hide shop messages"
+msgstr "Sembunyikan pesan Jual"
+
+#: src/gui/setup_chat.cpp:85
+msgid "Show chat history"
+msgstr "Tunjukkan riwayat obrolan"
+
+#: src/gui/setup_chat.cpp:88
+msgid "Enable battle tab"
+msgstr "Perbolehkan jendela pertarungan"
+
+#: src/gui/setup_chat.cpp:91
+msgid "Show battle events"
+msgstr "Tunjukkan event pertarungan"
+
+#: src/gui/setup_chat.cpp:94
+msgid "Resize chat tabs if need"
+msgstr "Atur besar jendela obrolan apabila dibutuhkan"
+
+#: src/gui/setup_chat.cpp:97
+msgid "Use local time"
+msgstr "Pengunaan waktu lokal"
 
 #: src/gui/setup_colors.cpp:49
+msgid "This is what the color looks like"
+msgstr "Warnanya terlihat seperti ini"
+
+#: src/gui/setup_colors.cpp:54
 msgid "Colors"
-msgstr ""
+msgstr "Warna"
 
-#: src/gui/setup_colors.cpp:70
+#: src/gui/setup_colors.cpp:75
 msgid "Type:"
-msgstr ""
+msgstr "Tipe"
 
-#: src/gui/setup_colors.cpp:81 src/gui/setup_colors.cpp:433
+#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:407
 msgid "Static"
-msgstr ""
+msgstr "Statis"
 
-#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:84
-#: src/gui/setup_colors.cpp:434
+#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
+#: src/gui/setup_colors.cpp:408
 msgid "Pulse"
-msgstr ""
+msgstr "Getar"
 
-#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:90 src/gui/setup_colors.cpp:91
+#: src/gui/setup_colors.cpp:409
 msgid "Rainbow"
-msgstr ""
+msgstr "Pelangi"
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:92 src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:409
 msgid "Spectrum"
-msgstr ""
+msgstr "Spektrum"
 
-#: src/gui/setup_colors.cpp:92
+#: src/gui/setup_colors.cpp:97 src/gui/setup_colors.cpp:319
 msgid "Delay:"
-msgstr ""
+msgstr "Tunda:"
 
-#: src/gui/setup_colors.cpp:107
+#: src/gui/setup_colors.cpp:112
 msgid "Red:"
-msgstr ""
+msgstr "Merah:"
 
-#: src/gui/setup_colors.cpp:122
+#: src/gui/setup_colors.cpp:127
 msgid "Green:"
-msgstr ""
+msgstr "Hijau:"
 
-#: src/gui/setup_colors.cpp:137
+#: src/gui/setup_colors.cpp:142
 msgid "Blue:"
-msgstr ""
+msgstr "Biru:"
+
+#: src/gui/setup_colors.cpp:314
+msgid "Alpha:"
+msgstr "Alpha:"
 
-#: src/gui/setup.cpp:51
+#: src/gui/setup.cpp:66
 msgid "Apply"
 msgstr "Terapkan"
 
-#: src/gui/setup.cpp:51
+#: src/gui/setup.cpp:69
 msgid "Reset Windows"
-msgstr ""
+msgstr "Atur ulang jendela"
+
+#: src/gui/setupitem.cpp:268 src/gui/setupitem.cpp:392
+#: src/gui/setup_players.cpp:332
+msgid "Edit"
+msgstr "Ganti"
 
-#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:78
+#: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
 msgid "Press the button to start calibration"
 msgstr "Tekan tombol untuk memulai kalibrasi"
 
-#: src/gui/setup_joystick.cpp:38 src/gui/setup_joystick.cpp:76
+#: src/gui/setup_joystick.cpp:41 src/gui/setup_joystick.cpp:77
 msgid "Calibrate"
 msgstr "Kalibrasi"
 
-#: src/gui/setup_joystick.cpp:39
+#: src/gui/setup_joystick.cpp:42
 msgid "Enable joystick"
 msgstr "Membolehkan joistik"
 
-#: src/gui/setup_joystick.cpp:41
+#: src/gui/setup_joystick.cpp:44
 msgid "Joystick"
-msgstr ""
+msgstr "Joystick"
 
-#: src/gui/setup_joystick.cpp:83
+#: src/gui/setup_joystick.cpp:84
 msgid "Stop"
 msgstr "Berhenti"
 
-#: src/gui/setup_joystick.cpp:84
+#: src/gui/setup_joystick.cpp:85
 msgid "Rotate the stick"
-msgstr "Memutar tongkat"
+msgstr "Putar stik"
 
-#: src/gui/setup_keyboard.cpp:77
+#: src/gui/setup_keyboard.cpp:80
 msgid "Keyboard"
-msgstr ""
+msgstr "Keyboard"
 
-#: src/gui/setup_keyboard.cpp:86
+#: src/gui/setup_keyboard.cpp:89
 msgid "Assign"
-msgstr ""
+msgstr "Tetapkan"
 
-#: src/gui/setup_keyboard.cpp:90
+#: src/gui/setup_keyboard.cpp:93
+msgid "Unassign"
+msgstr "Batal menetapkan"
+
+#: src/gui/setup_keyboard.cpp:97
 msgid "Default"
-msgstr ""
+msgstr "Kembalikan"
 
-#: src/gui/setup_keyboard.cpp:119
+#: src/gui/setup_keyboard.cpp:133
 msgid "Key Conflict(s) Detected."
+msgstr "Pertentangan kunci(kunci) terdeteksi."
+
+#: src/gui/setup_other.cpp:40
+msgid "Misc"
+msgstr "macam-macam"
+
+#: src/gui/setup_other.cpp:46
+msgid "Show damage inflicted to monsters"
+msgstr "Tampilkan damage yang ditimbulkan monster"
+
+#: src/gui/setup_other.cpp:49
+msgid "Enable server side attack"
 msgstr ""
 
-#: src/gui/setup_players.cpp:57
-msgid "Name"
+#: src/gui/setup_other.cpp:52
+msgid "Auto target only reachable monsters"
+msgstr "Jadikan monster yang terjangkau sebagai target otomatis"
+
+#: src/gui/setup_other.cpp:55
+msgid "Auto fix position"
+msgstr "Perbaiki posisi otomatis"
+
+#: src/gui/setup_other.cpp:58
+msgid "Highlight map portals"
+msgstr "Sorot portal peta"
+
+#: src/gui/setup_other.cpp:61
+msgid "Attack while moving"
+msgstr "Menyerang ketika berjalan"
+
+#: src/gui/setup_other.cpp:64
+msgid "Highlight floor items"
+msgstr "Sorot item yang jatuh"
+
+#: src/gui/setup_other.cpp:67
+msgid "Enable quick stats"
 msgstr ""
 
-#: src/gui/setup_players.cpp:58
-msgid "Relation"
+#: src/gui/setup_other.cpp:70
+msgid "Highlight player attack range"
+msgstr "Sorot Jangkauan menyerang pemain"
+
+#: src/gui/setup_other.cpp:73
+msgid "Show warps particles"
 msgstr ""
 
-#: src/gui/setup_players.cpp:63
-msgid "Neutral"
+#: src/gui/setup_other.cpp:76
+msgid "Highlight monster attack range"
+msgstr "Sorot Jangkauan menyerang monster"
+
+#: src/gui/setup_other.cpp:80
+msgid "Accept sell/buy requests"
+msgstr "Terima permintaan jual/beli"
+
+#: src/gui/setup_other.cpp:83
+msgid "Cycle player targets"
+msgstr "Siklus target pemain"
+
+#: src/gui/setup_other.cpp:86
+msgid "Show monster hp bar"
+msgstr "Tampilkan hp bar monster"
+
+#: src/gui/setup_other.cpp:89
+msgid "Cycle monster targets"
+msgstr "Siklus target monster"
+
+#: src/gui/setup_other.cpp:92
+msgid "Show own hp bar"
+msgstr "Tampilkan hp bar sendiri"
+
+#: src/gui/setup_other.cpp:95
+msgid "Enable bot checker"
+msgstr "Perbolehkan pengecekan bot"
+
+#: src/gui/setup_other.cpp:98
+msgid "Show job exp messages"
+msgstr "Tampilkan pesan exp job"
+
+#: src/gui/setup_other.cpp:102
+msgid "Crazy move A program"
+msgstr "Program Crazy move A"
+
+#: src/gui/setup_other.cpp:105
+msgid "Show players popups"
+msgstr "Tampilkan popup pemain"
+
+#: src/gui/setup_other.cpp:108
+msgid "Show extended minimaps"
 msgstr ""
 
-#: src/gui/setup_players.cpp:64
-msgid "Friend"
+#: src/gui/setup_other.cpp:111
+msgid "Afk message"
+msgstr "Pesan saat meninggalkan keyboard"
+
+#: src/gui/setup_other.cpp:114
+msgid "Enable attack filter"
+msgstr ""
+
+#: src/gui/setup_other.cpp:117
+msgid "Enable shop mode"
+msgstr "Perbolehkan mode Jual"
+
+#: src/gui/setup_other.cpp:120
+msgid "Enable buggy servers protection"
+msgstr ""
+
+#: src/gui/setup_other.cpp:123
+msgid "Enable debug log"
 msgstr ""
 
 #: src/gui/setup_players.cpp:65
+msgid "Relation"
+msgstr "Hubungan"
+
+#: src/gui/setup_players.cpp:70
+msgid "Neutral"
+msgstr "Netral"
+
+#: src/gui/setup_players.cpp:71
+msgid "Friend"
+msgstr "Teman"
+
+#: src/gui/setup_players.cpp:72
 msgid "Disregarded"
-msgstr ""
+msgstr "Diabaikan"
 
-#: src/gui/setup_players.cpp:66
+#: src/gui/setup_players.cpp:73
 msgid "Ignored"
-msgstr ""
+msgstr "Ditolak"
 
-#: src/gui/setup_players.cpp:208 src/gui/setup_video.cpp:132
-msgid "???"
-msgstr ""
+#: src/gui/setup_players.cpp:74
+msgid "Erased"
+msgstr "Dihapus"
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_players.cpp:247
 msgid "Allow trading"
-msgstr ""
+msgstr "Perbolehkan penukaran"
 
-#: src/gui/setup_players.cpp:228
+#: src/gui/setup_players.cpp:249
 msgid "Allow whispers"
-msgstr ""
+msgstr "Perbolehkan berbisik"
+
+#: src/gui/setup_players.cpp:252
+msgid "Old"
+msgstr "Lama"
 
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:254
 msgid "Put all whispers in tabs"
-msgstr ""
+msgstr "Masukkan semua bisikan kedalam tab"
 
-#: src/gui/setup_players.cpp:234
+#: src/gui/setup_players.cpp:257
 msgid "Show gender"
-msgstr ""
+msgstr "Perlihatkan jenis kelamin"
 
-#: src/gui/setup_players.cpp:236
+#: src/gui/setup_players.cpp:265
 msgid "Players"
-msgstr ""
+msgstr "Pemain"
 
-#: src/gui/setup_players.cpp:261
+#: src/gui/setup_players.cpp:290
 msgid "When ignoring:"
-msgstr ""
+msgstr "Ketika menolak:"
 
-#: src/gui/setup_video.cpp:113
-msgid "Tiny"
-msgstr ""
+#: src/gui/setup_players.cpp:313
+msgid "Show level"
+msgstr "Perlihatkan Level"
 
-#: src/gui/setup_video.cpp:114
-msgid "Small"
-msgstr ""
+#: src/gui/setup_players.cpp:317
+msgid "Show own name"
+msgstr "Perlihatkan nama sendiri"
+
+#: src/gui/setup_players.cpp:321
+msgid "Target dead players"
+msgstr "Target pemain yang mati"
+
+#: src/gui/setup_players.cpp:325
+msgid "Secure trades"
+msgstr "Pertukaran yang aman"
+
+#: src/gui/setup_players.cpp:329 src/gui/setup_players.cpp:503
+msgid "Unsecure chars in names"
+msgstr "Penggunaan karakter yang tidak diperbolehkan pada nama"
+
+#: src/gui/setup_theme.cpp:111
+msgid "Theme"
+msgstr "Tema"
 
-#: src/gui/setup_video.cpp:115
-msgid "Medium"
+#: src/gui/setup_theme.cpp:113
+msgid "Gui theme"
+msgstr "Tema Gui"
+
+#: src/gui/setup_theme.cpp:114
+msgid "Main Font"
+msgstr "Jenis huruf utama"
+
+#: src/gui/setup_theme.cpp:115
+msgid "Bold font"
+msgstr "Jenis huruf tebal"
+
+#: src/gui/setup_theme.cpp:116
+msgid "Particle font"
 msgstr ""
 
-#: src/gui/setup_video.cpp:116
-msgid "Large"
+#: src/gui/setup_theme.cpp:117
+msgid "Help font"
 msgstr ""
 
-#: src/gui/setup_video.cpp:142
+#: src/gui/setup_theme.cpp:118
+msgid "Secure font"
+msgstr "Jenis huruf/Karakter yang diperbolehkan"
+
+#: src/gui/setup_theme.cpp:241
+msgid "Theme Changed"
+msgstr "Tema diganti"
+
+#: src/gui/setup_theme.cpp:242 src/gui/setup_video.cpp:770
+#: src/gui/setup_video.cpp:775
+msgid "Restart your client for the change to take effect."
+msgstr "Restart client anda untuk memberikan efek."
+
+#: src/gui/setup_video.cpp:194
+msgid "Tiny (10)"
+msgstr "Sangat kecil (10)"
+
+#: src/gui/setup_video.cpp:195
+msgid "Small (11)"
+msgstr "Kecil (11)"
+
+#: src/gui/setup_video.cpp:196
+msgid "Medium (12)"
+msgstr "Sedang (12)"
+
+#: src/gui/setup_video.cpp:197
+msgid "Large (13)"
+msgstr "Besar (13)"
+
+#: src/gui/setup_video.cpp:198
+msgid "Big (14)"
+msgstr "Sangat besar (14)"
+
+#: src/gui/setup_video.cpp:199
+msgid "Huge (15)"
+msgstr "Sangat besar sekali (15)"
+
+#: src/gui/setup_video.cpp:222
+msgid "Software"
+msgstr "Perangkat lunak"
+
+#: src/gui/setup_video.cpp:223
+msgid "Fast OpenGL"
+msgstr "OpenGL cepat"
+
+#: src/gui/setup_video.cpp:224
+msgid "Safe OpenGL"
+msgstr "OpenGL aman"
+
+#: src/gui/setup_video.cpp:251
 msgid "No text"
-msgstr ""
+msgstr "tidak ada teks"
+
+#: src/gui/setup_video.cpp:253
+msgid "Text"
+msgstr "Teks"
 
-#: src/gui/setup_video.cpp:144
+#: src/gui/setup_video.cpp:255
 msgid "Bubbles, no names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:145
+#: src/gui/setup_video.cpp:257
 msgid "Bubbles with names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:157
+#: src/gui/setup_video.cpp:270
 msgid "off"
 msgstr "mati"
 
-#: src/gui/setup_video.cpp:158 src/gui/setup_video.cpp:171
+#: src/gui/setup_video.cpp:272 src/gui/setup_video.cpp:289
 msgid "low"
 msgstr "rendah"
 
-#: src/gui/setup_video.cpp:159 src/gui/setup_video.cpp:173
+#: src/gui/setup_video.cpp:274 src/gui/setup_video.cpp:293
 msgid "high"
 msgstr "tinggi"
 
-#: src/gui/setup_video.cpp:172
+#: src/gui/setup_video.cpp:291
 msgid "medium"
-msgstr ""
+msgstr "sedang"
 
-#: src/gui/setup_video.cpp:174
+#: src/gui/setup_video.cpp:295
 msgid "max"
-msgstr ""
+msgstr "maksimal"
 
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:327
 msgid "Full screen"
 msgstr "Layar penuh"
 
-#: src/gui/setup_video.cpp:197
-msgid "OpenGL"
-msgstr "OpenGL"
+#: src/gui/setup_video.cpp:328
+msgid "Hw acceleration"
+msgstr "Akselerasi perangkat keras"
 
-#: src/gui/setup_video.cpp:198
+#: src/gui/setup_video.cpp:329
 msgid "Custom cursor"
-msgstr ""
+msgstr "Modifikasi kursor"
 
-#: src/gui/setup_video.cpp:200
+#: src/gui/setup_video.cpp:331
 msgid "Visible names"
-msgstr ""
+msgstr "Nama yang tampak"
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:333
 msgid "Particle effects"
-msgstr ""
+msgstr "Efek partikel"
 
-#: src/gui/setup_video.cpp:204
-msgid "Show own name"
-msgstr ""
+#: src/gui/setup_video.cpp:335
+msgid "Log NPC dialogue"
+msgstr "Riwayat dialog NPC"
 
-#: src/gui/setup_video.cpp:205
+#: src/gui/setup_video.cpp:336
 msgid "Show pickup notification"
-msgstr ""
+msgstr "Perlihatkan notifikasi pengambilan item"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:207
+#: src/gui/setup_video.cpp:338
 msgid "in chat"
-msgstr ""
+msgstr "dalam obrolan"
 
 #. TRANSLATORS: Refers to "Show own name"
-#: src/gui/setup_video.cpp:209
+#: src/gui/setup_video.cpp:340
 msgid "as particle"
+msgstr "sebagai partikel"
+
+#: src/gui/setup_video.cpp:342
+msgid "Hide shield sprite"
+msgstr ""
+
+#: src/gui/setup_video.cpp:344
+msgid "Low traffic mode"
 msgstr ""
 
-#: src/gui/setup_video.cpp:214
-#, fuzzy
+#: src/gui/setup_video.cpp:346
+msgid "Sync player move"
+msgstr ""
+
+#: src/gui/setup_video.cpp:348
+msgid "Draw hotkeys on map"
+msgstr ""
+
+#: src/gui/setup_video.cpp:350
+msgid "Draw path"
+msgstr ""
+
+#: src/gui/setup_video.cpp:351
+msgid "Show job"
+msgstr "Perlihatkan Job"
+
+#: src/gui/setup_video.cpp:352
+msgid "Enable opacity cache"
+msgstr ""
+
+#: src/gui/setup_video.cpp:353
+msgid "Show background"
+msgstr "Perlihatkan latar belakang"
+
+#: src/gui/setup_video.cpp:358
 msgid "FPS limit:"
-msgstr "Batas FPS"
+msgstr "Batas FPS:"
 
-#: src/gui/setup_video.cpp:225
+#: src/gui/setup_video.cpp:362 src/gui/setup_video.cpp:402
+#: src/gui/setup_video.cpp:701 src/gui/setup_video.cpp:868
+msgid "Alt FPS limit: "
+msgstr "batas Alt FPS:"
+
+#: src/gui/setup_video.cpp:372
 msgid "Video"
 msgstr "Video"
 
-#: src/gui/setup_video.cpp:227
-msgid "Show monster damage"
-msgstr ""
-
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:377
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:378
 msgid "Gui opacity"
 msgstr ""
 
-#: src/gui/setup_video.cpp:235
+#: src/gui/setup_video.cpp:379
 msgid "Ambient FX"
 msgstr ""
 
-#: src/gui/setup_video.cpp:236
+#: src/gui/setup_video.cpp:380
 msgid "Particle detail"
-msgstr ""
+msgstr "Detil partikel"
 
-#: src/gui/setup_video.cpp:237
+#: src/gui/setup_video.cpp:381
 msgid "Font size"
-msgstr ""
+msgstr "Ukuran huruf"
 
-#: src/gui/setup_video.cpp:251 src/gui/setup_video.cpp:454
-#: src/gui/setup_video.cpp:568
-#, fuzzy
+#: src/gui/setup_video.cpp:400 src/gui/setup_video.cpp:403
+#: src/gui/setup_video.cpp:700 src/gui/setup_video.cpp:855
+#: src/gui/setup_video.cpp:866
 msgid "None"
-msgstr "Tidak"
+msgstr "Tidak ada"
 
-#: src/gui/setup_video.cpp:381
+#: src/gui/setup_video.cpp:583
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:387
+#: src/gui/setup_video.cpp:589
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:398
-#, fuzzy
+#: src/gui/setup_video.cpp:600
 msgid "Switching to Full Screen"
-msgstr "Mengganti ke layar penuh"
+msgstr "Mengubah ke mode Layar penuh"
 
-#: src/gui/setup_video.cpp:399
+#: src/gui/setup_video.cpp:601
 msgid "Restart needed for changes to take effect."
 msgstr "Memulai dari awal di butuhkan untuk melihat efek"
 
-#: src/gui/setup_video.cpp:411
-#, fuzzy
+#: src/gui/setup_video.cpp:613
 msgid "Changing to OpenGL"
-msgstr "Mengubah OpenGL"
+msgstr "Mengubah ke OpenGL"
 
-#: src/gui/setup_video.cpp:412
+#: src/gui/setup_video.cpp:614
 msgid "Applying change to OpenGL requires restart."
 msgstr "Mendaftar perubahan ke OpenGL membutuhkan memulai dari awal"
 
-#: src/gui/setup_video.cpp:486 src/gui/setup_video.cpp:491
-msgid "Screen Resolution Changed"
-msgstr ""
+#: src/gui/setup_video.cpp:753
+msgid "Custom resolution (example: 1024x768)"
+msgstr "Modifikasi resolusi (contoh: 1024x768)"
 
-#: src/gui/setup_video.cpp:487 src/gui/setup_video.cpp:492
-msgid "Restart your client for the change to take effect."
-msgstr ""
+#: src/gui/setup_video.cpp:754
+msgid "Enter new resolution:                "
+msgstr "Masukkan resolusi baru:"
 
-#: src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:769 src/gui/setup_video.cpp:774
+msgid "Screen Resolution Changed"
+msgstr "Resolusi layar diubah"
+
+#: src/gui/setup_video.cpp:772
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:522
+#: src/gui/setup_video.cpp:809
 msgid "Particle Effect Settings Changed."
-msgstr ""
+msgstr "Pengaturan efek partikel diubah"
 
-#: src/gui/setup_video.cpp:523
+#: src/gui/setup_video.cpp:810
 msgid "Changes will take effect on map change."
-msgstr ""
+msgstr "Perubahan akan memberikan efek saat pergantian peta."
+
+#: src/gui/shopwindow.cpp:74
+msgid "Personal Shop"
+msgstr "Toko personal"
+
+#: src/gui/shopwindow.cpp:116
+msgid "Buy items"
+msgstr "Beli barang"
+
+#: src/gui/shopwindow.cpp:117
+msgid "Sell items"
+msgstr "Jual barang"
+
+#: src/gui/shopwindow.cpp:119 src/gui/shopwindow.cpp:122
+#: src/gui/tradewindow.cpp:92
+msgid "Add"
+msgstr "Tambah"
+
+#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
+msgid "Announce"
+msgstr "Umumkan"
+
+#: src/gui/shopwindow.cpp:125
+msgid "Show links in announce"
+msgstr "Perlihatkan link di Umumkan"
 
-#: src/gui/skilldialog.cpp:197 src/gui/windowmenu.cpp:58
+#: src/gui/shopwindow.cpp:723 src/net/manaserv/tradehandler.cpp:127
+#: src/net/tmwa/tradehandler.cpp:124
+msgid "Request for Trade"
+msgstr "Meminta untuk menukar"
+
+#: src/gui/shopwindow.cpp:724
+#, c-format
+msgid "%s wants to %s %s do you accept?"
+msgstr "%s ingin %s %s apakah anda bersedia?"
+
+#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:81
 msgid "Skills"
 msgstr "Keahlian"
 
-#: src/gui/skilldialog.cpp:208
+#: src/gui/skilldialog.cpp:283
 msgid "Up"
-msgstr ""
+msgstr "Naik"
 
-#: src/gui/skilldialog.cpp:262
+#: src/gui/skilldialog.cpp:336
 #, c-format
 msgid "Skill points available: %d"
-msgstr ""
+msgstr "poin Skill yang tersedia: %d"
 
-#: src/gui/skilldialog.cpp:314
+#: src/gui/skilldialog.cpp:413
 #, c-format
 msgid "Skill Set %d"
 msgstr ""
 
-#: src/gui/skilldialog.cpp:323
-#, fuzzy, c-format
+#: src/gui/skilldialog.cpp:425
+#, c-format
 msgid "Skill %d"
-msgstr "Keahlian"
+msgstr "Skill %d"
+
+#: src/gui/skilldialog.cpp:492 src/gui/skilldialog.cpp:545
+#, c-format
+msgid "Lvl: %d"
+msgstr "Level: %d"
 
-#: src/gui/skilldialog.cpp:405
-#, fuzzy, c-format
+#: src/gui/skilldialog.cpp:537
+#, c-format
 msgid "Lvl: %d (%+d)"
-msgstr "Tingkatan: %d"
+msgstr "Level: %d (%+d)"
 
-#: src/gui/skilldialog.cpp:416
-#, fuzzy, c-format
-msgid "Lvl: %d"
-msgstr "Tingkatan: %d"
+#: src/gui/socialwindow.cpp:117 src/net/tmwa/gui/guildtab.cpp:50
+msgid "Guild"
+msgstr "Organisasi"
 
-#: src/gui/socialwindow.cpp:117
+#: src/gui/socialwindow.cpp:146
 #, c-format
 msgid "Invited user %s to guild %s."
-msgstr ""
+msgstr "Pengguna yang diajak %s ke organisasi %s."
 
-#: src/gui/socialwindow.cpp:126
+#: src/gui/socialwindow.cpp:160
 #, c-format
 msgid "Guild %s quit requested."
-msgstr ""
+msgstr "Permintaan %s keluar dari Organisasi "
 
-#: src/gui/socialwindow.cpp:136
+#: src/gui/socialwindow.cpp:187
 msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:137
+#: src/gui/socialwindow.cpp:188
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:197
 msgid "Leave Guild?"
-msgstr ""
+msgstr "Tinggalkan organisasi?"
 
-#: src/gui/socialwindow.cpp:147
-#, fuzzy, c-format
+#: src/gui/socialwindow.cpp:198
+#, c-format
 msgid "Are you sure you want to leave guild %s?"
-msgstr "Apakah anda bersungguh-sungguh ingin menghapus karakter ini?"
+msgstr "Apakah anda yakin ingin meninggalkan organisasi %s?"
+
+#: src/gui/socialwindow.cpp:215 src/net/tmwa/gui/partytab.cpp:50
+msgid "Party"
+msgstr "Kelompok"
 
-#: src/gui/socialwindow.cpp:182
+#: src/gui/socialwindow.cpp:243
 #, c-format
 msgid "Invited user %s to party."
-msgstr ""
+msgstr "Pengguna yang diajak %s ke kelompok"
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:257
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:199
+#: src/gui/socialwindow.cpp:284
 msgid "Member Invite to Party"
-msgstr ""
+msgstr "Mengundang pengguna ke kelompok"
 
-#: src/gui/socialwindow.cpp:200
+#: src/gui/socialwindow.cpp:285
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:209
+#: src/gui/socialwindow.cpp:294
 msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:210
-#, fuzzy, c-format
+#: src/gui/socialwindow.cpp:295
+#, c-format
 msgid "Are you sure you want to leave party %s?"
-msgstr "Apakah anda bersungguh-sungguh ingin menghapus karakter ini?"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:521
+msgid "Nav"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:799
+msgid "Atk"
+msgstr "Sedang meninggalkan keyboard"
 
-#: src/gui/socialwindow.cpp:239
+#: src/gui/socialwindow.cpp:840
+msgid "Priority mobs"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:872
+msgid "Attack mobs"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:907
+msgid "Ignore mobs"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:970
 msgid "Create Guild"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:240 src/gui/socialwindow.cpp:564
-#, fuzzy
+#: src/gui/socialwindow.cpp:971 src/gui/socialwindow.cpp:1387
 msgid "Create Party"
-msgstr "Buat Karakter"
+msgstr ""
 
-#: src/gui/socialwindow.cpp:279 src/gui/windowmenu.cpp:60
+#: src/gui/socialwindow.cpp:1013 src/gui/windowmenu.cpp:93
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:297
+#: src/gui/socialwindow.cpp:1034
 msgid "Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:298
-msgid "Leave"
-msgstr ""
-
-#: src/gui/socialwindow.cpp:394
+#: src/gui/socialwindow.cpp:1176
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:400
+#: src/gui/socialwindow.cpp:1186
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:413
+#: src/gui/socialwindow.cpp:1203
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:419
+#: src/gui/socialwindow.cpp:1213
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:463
+#: src/gui/socialwindow.cpp:1257
 #, c-format
 msgid "Creating guild called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:477
+#: src/gui/socialwindow.cpp:1280
 #, c-format
 msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:484
+#: src/gui/socialwindow.cpp:1294
 msgid "Guild Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:485
+#: src/gui/socialwindow.cpp:1295
 msgid "Choose your guild's name."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:497
+#: src/gui/socialwindow.cpp:1309
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:502
+#: src/gui/socialwindow.cpp:1315
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:507
+#: src/gui/socialwindow.cpp:1321
 msgid "Accept Guild Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:519
+#: src/gui/socialwindow.cpp:1336
 msgid "Received party request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:529
+#: src/gui/socialwindow.cpp:1347
 msgid "You have been invited you to join a party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:533
+#: src/gui/socialwindow.cpp:1351
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:541
+#: src/gui/socialwindow.cpp:1359
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:546
+#: src/gui/socialwindow.cpp:1364
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:554
+#: src/gui/socialwindow.cpp:1373
 msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:565
+#: src/gui/socialwindow.cpp:1388
 msgid "Cannot create party. You are already in a party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:570
+#: src/gui/socialwindow.cpp:1393
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:571
+#: src/gui/socialwindow.cpp:1394
 msgid "Choose your party's name."
 msgstr ""
 
-#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:59
+#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:88
 msgid "Specials"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:174
-#, c-format
-msgid "Specials Set %d"
+#: src/gui/statuspopup.cpp:196
+msgid "(D) default moves"
 msgstr ""
 
-#: src/gui/specialswindow.cpp:191
-#, c-format
-msgid "Special %d"
+#: src/gui/statuspopup.cpp:201
+msgid "(I) invert moves"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:206
+msgid "(c) moves with some crazy moves"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:99 src/gui/statuswindow.cpp:247
+#: src/gui/statuspopup.cpp:211
+msgid "(C) moves with crazy moves"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:216
+msgid "(d) double normal + crazy"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:221
+msgid "(?) move"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:239
+msgid "(a) custom crazy move"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:243
+msgid "(?) crazy move"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:253
+msgid "(0) default moves to target"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:258
+msgid "(1) moves to target in distance 1"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:263
+msgid "(2) moves to target in distance 2"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:268
+msgid "(3) moves to target in distance 3"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:273
+msgid "(5) moves to target in distance 5"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:278
+msgid "(7) moves to target in distance 7"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:283
+msgid "(A) moves to target in attack range"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:288
+msgid "(?) move to target"
+msgstr "(?)bergerak ke target"
+
+#: src/gui/statuspopup.cpp:296
+msgid "(D) default follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:300
+msgid "(R) relative follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:304
+msgid "(M) mirror follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:308
+msgid "(P) pet follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:312
+msgid "(?) unknown follow"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:321 src/gui/statuspopup.cpp:344
+msgid "(D) default attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:326
+msgid "(s) switch attack without shield"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:331
+msgid "(S) switch attack with shield"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:335 src/gui/statuspopup.cpp:360
+msgid "(?) attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:348
+msgid "(G) go and attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:352
+msgid "(A) go, attack, pickup"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:356
+msgid "(d) without auto attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:374
+msgid "(S) small pick up 1x1 cells"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:378
+msgid "(D) default pick up 2x1 cells"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:382
+msgid "(F) forward pick up 2x3 cells"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:386
+msgid "(3) pick up 3x3 cells"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:390
+msgid "(g) go and pick up in distance 4"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:394
+msgid "(G) go and pick up in distance 8"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:398
+msgid "(A) go and pick up in max distance"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:402
+msgid "(?) pick up"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:411
+msgid "(N) normal map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:415
+msgid "(D) debug map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:419
+msgid "(u) ultra map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:423
+msgid "(U) ultra map view 2"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:427
+msgid "(e) empty map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:431
+msgid "(b) black & white map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:435
+msgid "(?) map view"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:443
+msgid "(f) use #flar for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:448
+msgid "(c) use #chiza for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:453
+msgid "(I) use #ingrav for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:458
+msgid "(F) use #frillyar for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:463
+msgid "(U) use #upmarmu for magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:467
+msgid "(?) magic attack"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:476
+msgid "(D) default imitation"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:480
+msgid "(O) outfits imitation"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:484
+msgid "(?) imitation"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:493
+msgid "(O) on keyboard"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:496
+msgid "(A) away"
+msgstr "(A) pergi"
+
+#: src/gui/statuspopup.cpp:499 src/gui/statuspopup.cpp:519
+msgid "(?) away"
+msgstr "(?) pergi"
+
+#: src/gui/statuspopup.cpp:507
+msgid "(G) game camera mode"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:511
+msgid "(F) free camera mode"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:515
+msgid "(D) design camera mode"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:526
+msgid "Game modifiers are disabled"
+msgstr ""
+
+#: src/gui/statuspopup.cpp:531
+msgid "Game modifiers are enabled"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:133 src/gui/statuswindow.cpp:259
+#: src/gui/statuswindow.cpp:322
 #, c-format
 msgid "Level: %d"
 msgstr "Tingkatan: %d"
 
-#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:211
+#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:245
+#: src/gui/statuswindow.cpp:289
 #, c-format
 msgid "Money: %s"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:102
+#: src/gui/statuswindow.cpp:140
 msgid "HP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:107
+#: src/gui/statuswindow.cpp:147
 msgid "Exp:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:112
+#: src/gui/statuswindow.cpp:161
 msgid "MP:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:132 src/gui/statuswindow.cpp:219
+#: src/gui/statuswindow.cpp:193 src/gui/statuswindow.cpp:372
 #, c-format
 msgid "Job: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:133
+#: src/gui/statuswindow.cpp:194
 msgid "Job:"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:194
-msgid "HP"
+#: src/gui/statuswindow.cpp:248 src/gui/statuswindow.cpp:296
+#, c-format
+msgid "Character points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:200
-msgid "MP"
+#: src/gui/statuswindow.cpp:254
+#, c-format
+msgid "Level: %d (GM %d)"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:206
-msgid "Exp"
+#: src/gui/statuswindow.cpp:310
+#, c-format
+msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/statuswindow.cpp:215
-#, fuzzy
-msgid "Money"
-msgstr "Uang: %d"
+#: src/gui/statuswindow.cpp:633 src/gui/statuswindow.cpp:698
+#: src/gui/statuswindow.cpp:718 src/gui/statuswindow.cpp:734
+#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:809
+#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:851
+msgid "(D)"
+msgstr "(D)"
+
+#: src/gui/statuswindow.cpp:636 src/gui/statuswindow.cpp:759
+msgid "(I)"
+msgstr "(l)"
+
+#: src/gui/statuswindow.cpp:639 src/gui/statuswindow.cpp:756
+msgid "(c)"
+msgstr "(c)"
+
+#: src/gui/statuswindow.cpp:642
+msgid "(C)"
+msgstr "(C)"
+
+#: src/gui/statuswindow.cpp:645 src/gui/statuswindow.cpp:743
+msgid "(d)"
+msgstr "(d)"
+
+#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:662
+#: src/gui/statuswindow.cpp:691 src/gui/statuswindow.cpp:710
+#: src/gui/statuswindow.cpp:727 src/gui/statuswindow.cpp:746
+#: src/gui/statuswindow.cpp:768 src/gui/statuswindow.cpp:798
+#: src/gui/statuswindow.cpp:824 src/gui/statuswindow.cpp:838
+#: src/gui/statuswindow.cpp:854 src/gui/statuswindow.cpp:867
+msgid "(?)"
+msgstr "(?)"
+
+#: src/gui/statuswindow.cpp:659
+msgid "(a)"
+msgstr "(a)"
+
+#: src/gui/statuswindow.cpp:670
+msgid "(0)"
+msgstr "(0)"
+
+#: src/gui/statuswindow.cpp:673
+msgid "(1)"
+msgstr "(1)"
+
+#: src/gui/statuswindow.cpp:676
+msgid "(2)"
+msgstr "(2)"
+
+#: src/gui/statuswindow.cpp:679 src/gui/statuswindow.cpp:786
+msgid "(3)"
+msgstr "(3)"
+
+#: src/gui/statuswindow.cpp:682
+msgid "(5)"
+msgstr "(5)"
+
+#: src/gui/statuswindow.cpp:685
+msgid "(7)"
+msgstr "(7)"
+
+#: src/gui/statuswindow.cpp:688 src/gui/statuswindow.cpp:740
+#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:864
+msgid "(A)"
+msgstr "(A)"
+
+#: src/gui/statuswindow.cpp:701
+msgid "(R)"
+msgstr "(R)"
 
-#: src/gui/statuswindow.cpp:225
-msgid "Job"
-msgstr ""
+#: src/gui/statuswindow.cpp:704
+msgid "(M)"
+msgstr "(M)"
 
-#: src/gui/statuswindow.cpp:229
-#, fuzzy, c-format
-msgid "Character points: %d"
-msgstr "Stats Karakter OK"
+#: src/gui/statuswindow.cpp:707
+msgid "(P)"
+msgstr "(P)"
 
-#: src/gui/statuswindow.cpp:235
-#, c-format
-msgid "Correction points: %d"
-msgstr ""
+#: src/gui/statuswindow.cpp:721
+msgid "(s)"
+msgstr "(s)"
 
-#: src/gui/statuswindow.cpp:251
-#, fuzzy
-msgid "Level"
-msgstr "Tingkatan: %d"
+#: src/gui/statuswindow.cpp:724 src/gui/statuswindow.cpp:777
+msgid "(S)"
+msgstr "(S)"
 
-#: src/gui/storagewindow.cpp:58
-msgid "Storage"
+#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:792
+#: src/gui/statuswindow.cpp:845
+msgid "(G)"
+msgstr "(G)"
+
+#: src/gui/statuswindow.cpp:753
+msgid "(f)"
+msgstr "(f)"
+
+#: src/gui/statuswindow.cpp:762 src/gui/statuswindow.cpp:783
+#: src/gui/statuswindow.cpp:848
+msgid "(F)"
+msgstr "(F)"
+
+#: src/gui/statuswindow.cpp:765 src/gui/statuswindow.cpp:815
+msgid "(U)"
+msgstr "(U)"
+
+#: src/gui/statuswindow.cpp:789
+msgid "(g)"
+msgstr "(g)"
+
+#: src/gui/statuswindow.cpp:806
+msgid "(N)"
+msgstr "(N)"
+
+#: src/gui/statuswindow.cpp:812
+msgid "(u)"
+msgstr "(u)"
+
+#: src/gui/statuswindow.cpp:818
+msgid "(e)"
+msgstr "(e)"
+
+#: src/gui/statuswindow.cpp:821
+msgid "(b)"
+msgstr "(b)"
+
+#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861
+msgid "(O)"
+msgstr "(O)"
+
+#: src/gui/textcommandeditor.cpp:112
+msgid "No Target"
+msgstr "Tidak ada target"
+
+#: src/gui/textcommandeditor.cpp:113
+msgid "Allow Target"
+msgstr "Perbolehkan Target"
+
+#: src/gui/textcommandeditor.cpp:114
+msgid "Need Target"
+msgstr "Membutuhkan Target"
+
+#: src/gui/textcommandeditor.cpp:119
+msgid "General Magic"
+msgstr "Sihir dasar"
+
+#: src/gui/textcommandeditor.cpp:120
+msgid "Life Magic"
+msgstr "Sihir kehidupan"
+
+#: src/gui/textcommandeditor.cpp:121
+msgid "War Magic"
+msgstr "Sihir perang"
+
+#: src/gui/textcommandeditor.cpp:122
+msgid "Transmute Magic"
+msgstr "Sihir transmutasi"
+
+#: src/gui/textcommandeditor.cpp:123
+msgid "Nature Magic"
+msgstr "Sihir alam"
+
+#: src/gui/textcommandeditor.cpp:124
+msgid "Astral Magic"
+msgstr "Sihir Astral"
+
+#: src/gui/textcommandeditor.cpp:167
+msgid "Command Editor"
 msgstr ""
 
-#: src/gui/trade.cpp:52
+#: src/gui/textcommandeditor.cpp:184
+msgid "magic"
+msgstr "sihir"
+
+#: src/gui/textcommandeditor.cpp:188
+msgid "other"
+msgstr "lainnya"
+
+#: src/gui/textcommandeditor.cpp:193
+msgid "Symbol:"
+msgstr "Simbol:"
+
+#: src/gui/textcommandeditor.cpp:196
+msgid "Command:"
+msgstr "Perintah:"
+
+#: src/gui/textcommandeditor.cpp:199
+msgid "Mana:"
+msgstr "Mana:"
+
+#: src/gui/textcommandeditor.cpp:205
+msgid "Target Type:"
+msgstr "Tipe target:"
+
+#: src/gui/textcommandeditor.cpp:211
+msgid "Icon:"
+msgstr "Ikon:"
+
+#: src/gui/textcommandeditor.cpp:217
+msgid "Magic level:"
+msgstr "Level sihir:"
+
+#: src/gui/textcommandeditor.cpp:223
+msgid "Magic School:"
+msgstr "Sekolah sihir:"
+
+#: src/gui/textcommandeditor.cpp:229
+msgid "School level:"
+msgstr "Level sekolah:"
+
+#: src/gui/textcommandeditor.cpp:234
+msgid "Save"
+msgstr "Simpan"
+
+#: src/gui/tradewindow.cpp:60
 msgid "Propose trade"
 msgstr "Menawarkan tukar menukar"
 
-#: src/gui/trade.cpp:53
+#: src/gui/tradewindow.cpp:61
 msgid "Confirmed. Waiting..."
-msgstr ""
+msgstr "Dikonfirmasi. Menunggu..."
 
-#: src/gui/trade.cpp:54
+#: src/gui/tradewindow.cpp:62
 msgid "Agree trade"
-msgstr ""
+msgstr "Terima penukaran"
 
-#: src/gui/trade.cpp:55
+#: src/gui/tradewindow.cpp:63
 msgid "Agreed. Waiting..."
-msgstr ""
+msgstr "Terima. Menunggu..."
 
-#: src/gui/trade.cpp:58
+#: src/gui/tradewindow.cpp:66
 msgid "Trade: You"
-msgstr ""
-
-#: src/gui/trade.cpp:74 src/gui/trade.cpp:75
-msgid "Trade"
-msgstr ""
-
-#: src/gui/trade.cpp:77
-msgid "Add"
-msgstr "Tambah"
+msgstr "Tukar: Anda"
 
-#: src/gui/trade.cpp:99 src/gui/trade.cpp:135
-#, fuzzy, c-format
+#: src/gui/tradewindow.cpp:114 src/gui/tradewindow.cpp:170
+#, c-format
 msgid "You get %s"
-msgstr "Anda memberikan:"
+msgstr "Kamu mendapatkan %s"
 
-#: src/gui/trade.cpp:100
+#: src/gui/tradewindow.cpp:115
 msgid "You give:"
 msgstr "Anda memberikan:"
 
-#: src/gui/trade.cpp:104
+#: src/gui/tradewindow.cpp:119
 msgid "Change"
 msgstr "Ubah"
 
-#: src/gui/trade.cpp:275
-msgid "Failed adding item. You can not overlap one kind of item on the window."
+#: src/gui/tradewindow.cpp:336
+msgid ""
+"Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/trade.cpp:318
+#: src/gui/tradewindow.cpp:381
 msgid "You don't have enough money."
-msgstr ""
+msgstr "Anda tidak memiliki cukup uang."
 
-#: src/gui/unregisterdialog.cpp:51
+#: src/gui/unregisterdialog.cpp:54
 #, c-format
 msgid "Name: %s"
 msgstr "Nama: %s"
 
-#: src/gui/updatewindow.cpp:124
+#: src/gui/updatewindow.cpp:136
 msgid "Updating..."
-msgstr ""
+msgstr "Mengupdate..."
 
-#: src/gui/updatewindow.cpp:142
+#: src/gui/updatewindow.cpp:155
 msgid "Connecting..."
 msgstr "Menyambung..."
 
-#: src/gui/updatewindow.cpp:145
+#: src/gui/updatewindow.cpp:158
 msgid "Play"
-msgstr ""
+msgstr "Main"
 
-#: src/gui/updatewindow.cpp:405
+#: src/gui/updatewindow.cpp:547
 msgid "##1  The update process is incomplete."
 msgstr ""
 
 #. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:407
+#: src/gui/updatewindow.cpp:549
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:409
+#: src/gui/updatewindow.cpp:551
 msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:501
+#: src/gui/updatewindow.cpp:677
 msgid "Completed"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:49
+#: src/gui/userpalette.cpp:116
+msgid "Being"
+msgstr ""
+
+#: src/gui/userpalette.cpp:117
+msgid "Friend Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:118
+msgid "Disregarded Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:119
+msgid "Ignored Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:120
+msgid "Erased Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:121
+msgid "Other Players' Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:122
+msgid "Own Name"
+msgstr ""
+
+#: src/gui/userpalette.cpp:123
+msgid "GM Names"
+msgstr ""
+
+#: src/gui/userpalette.cpp:124
+msgid "NPCs"
+msgstr ""
+
+#: src/gui/userpalette.cpp:125
+msgid "Monsters"
+msgstr ""
+
+#: src/gui/userpalette.cpp:126
+msgid "Monster HP bar"
+msgstr ""
+
+#: src/gui/userpalette.cpp:128
+msgid "Monster HP bar (second color)"
+msgstr ""
+
+#: src/gui/userpalette.cpp:129
+msgid "Party Members"
+msgstr ""
+
+#: src/gui/userpalette.cpp:130
+msgid "Guild Members"
+msgstr ""
+
+#: src/gui/userpalette.cpp:131
+msgid "Particle Effects"
+msgstr ""
+
+#: src/gui/userpalette.cpp:132
+msgid "Pickup Notification"
+msgstr ""
+
+#: src/gui/userpalette.cpp:133
+msgid "Exp Notification"
+msgstr ""
+
+#: src/gui/userpalette.cpp:134
+msgid "Player HP bar"
+msgstr ""
+
+#: src/gui/userpalette.cpp:136
+msgid "Player HP bar (second color)"
+msgstr ""
+
+#: src/gui/userpalette.cpp:137
+msgid "Player Hits Monster"
+msgstr ""
+
+#: src/gui/userpalette.cpp:138
+msgid "Monster Hits Player"
+msgstr ""
+
+#: src/gui/userpalette.cpp:140
+msgid "Other Player Hits Local Player"
+msgstr ""
+
+#: src/gui/userpalette.cpp:141
+msgid "Critical Hit"
+msgstr ""
+
+#: src/gui/userpalette.cpp:143
+msgid "Local Player Hits Monster"
+msgstr ""
+
+#: src/gui/userpalette.cpp:145
+msgid "Local Player Critical Hit"
+msgstr ""
+
+#: src/gui/userpalette.cpp:147
+msgid "Local Player Miss"
+msgstr ""
+
+#: src/gui/userpalette.cpp:148
+msgid "Misses"
+msgstr ""
+
+#: src/gui/userpalette.cpp:149
+msgid "Portal Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:151
+msgid "Default collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:153
+msgid "Air collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:155
+msgid "Water collision Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:157
+msgid "Walkable Highlight"
+msgstr ""
+
+#: src/gui/userpalette.cpp:159
+msgid "Local Player Attack Range"
+msgstr ""
+
+#: src/gui/userpalette.cpp:161
+msgid "Local Player Attack Range Border"
+msgstr ""
+
+#: src/gui/userpalette.cpp:163
+msgid "Monster Attack Range"
+msgstr ""
+
+#: src/gui/userpalette.cpp:165
+msgid "Home Place"
+msgstr ""
+
+#: src/gui/userpalette.cpp:167
+msgid "Home Place Border"
+msgstr ""
+
+#: src/gui/userpalette.cpp:169
+msgid "Road Point"
+msgstr ""
+
+#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:470
+msgid "Who Is Online - Updating"
+msgstr ""
+
+#: src/gui/whoisonline.cpp:100
+msgid "Update"
+msgstr ""
+
+#: src/gui/whoisonline.cpp:293
+msgid "Who Is Online - "
+msgstr ""
+
+#: src/gui/whoisonline.cpp:484
+msgid "Who Is Online - error"
+msgstr ""
+
+#: src/gui/whoisonline.cpp:515
+msgid "Who Is Online - Update"
+msgstr ""
+
+#: src/gui/widgets/battletab.cpp:45
+msgid "Battle"
+msgstr ""
+
+#: src/gui/widgets/channeltab.cpp:52
 msgid "/users > Lists the users in the current channel"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:50
+#: src/gui/widgets/channeltab.cpp:53
 msgid "/topic > Set the topic of the current channel"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:51
+#: src/gui/widgets/channeltab.cpp:54
 msgid "/quit > Leave a channel"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:52
+#: src/gui/widgets/channeltab.cpp:55
 msgid "/op > Make a user a channel operator"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:53
+#: src/gui/widgets/channeltab.cpp:56
 msgid "/kick > Kick a user from the channel"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:63
+#: src/gui/widgets/channeltab.cpp:66
 msgid "Command: /users"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:64
+#: src/gui/widgets/channeltab.cpp:67
 msgid "This command shows the users in this channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:68
+#: src/gui/widgets/channeltab.cpp:71
 msgid "Command: /topic <message>"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:69
+#: src/gui/widgets/channeltab.cpp:72
 msgid "This command sets the topic to <message>."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:73
+#: src/gui/widgets/channeltab.cpp:76
 msgid "Command: /quit"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:74
+#: src/gui/widgets/channeltab.cpp:77
 msgid "This command leaves the current channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:75
+#: src/gui/widgets/channeltab.cpp:78
 msgid "If you're the last person in the channel, it will be deleted."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:80
+#: src/gui/widgets/channeltab.cpp:83
 msgid "Command: /op <nick>"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:81
+#: src/gui/widgets/channeltab.cpp:84
 msgid "This command makes <nick> a channel operator."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:84
+#: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
+#: src/net/tmwa/gui/guildtab.cpp:91 src/net/tmwa/gui/partytab.cpp:85
+msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
+msgstr "Jika <nama> mempunyai spasi, ditutup dengan tanda (\")."
+
+#: src/gui/widgets/channeltab.cpp:87
 msgid "Channel operators can kick and op other users from the channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:89
+#: src/gui/widgets/channeltab.cpp:92
 msgid "Command: /kick <nick>"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:90
+#: src/gui/widgets/channeltab.cpp:93
 msgid "This command makes <nick> leave the channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:119
+#: src/gui/widgets/channeltab.cpp:118
 msgid "Need a user to op!"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:126
+#: src/gui/widgets/channeltab.cpp:125
 msgid "Need a user to kick!"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:118
+#: src/gui/widgets/chattab.cpp:151
 msgid "Global announcement:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:124
+#: src/gui/widgets/chattab.cpp:157
 #, c-format
 msgid "Global announcement from %s:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:150
+#: src/gui/widgets/chattab.cpp:184
 #, c-format
 msgid "%s whispers: %s"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:51
-msgid "Cannot send empty chat!"
-msgstr ""
-
-#: src/gui/widgets/whispertab.cpp:70
+#: src/gui/widgets/whispertab.cpp:107
 msgid "/ignore > Ignore the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:71
+#: src/gui/widgets/whispertab.cpp:108
 msgid "/unignore > Stop ignoring the other player"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:72
+#: src/gui/widgets/whispertab.cpp:109
 msgid "/close > Close the whisper tab"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:82
+#: src/gui/widgets/whispertab.cpp:119
 msgid "Command: /close"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:83
+#: src/gui/widgets/whispertab.cpp:120
 msgid "This command closes the current whisper tab."
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:87
-#, fuzzy
+#: src/gui/widgets/whispertab.cpp:124
 msgid "Command: /ignore"
-msgstr "Perintah: /help"
+msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:88
+#: src/gui/widgets/whispertab.cpp:125
 msgid "This command ignores the other player regardless of current relations."
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:94
-msgid "This command stops ignoring the other player if they are being ignored."
+#: src/gui/widgets/whispertab.cpp:130
+msgid "Command: /unignore <player>"
+msgstr "perintah: /unignore <nama pemain>"
+
+#: src/gui/widgets/whispertab.cpp:131
+msgid ""
+"This command stops ignoring the other player if they are being ignored."
+msgstr ""
+
+#: src/gui/windowmenu.cpp:65
+msgid "BC"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:65
+msgid "Bot checker"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:67
+msgid "ONL"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:67
+msgid "Who is online"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:69
+msgid "KS"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:71
+msgid "Smilies"
+msgstr "Emotikon"
+
+#: src/gui/windowmenu.cpp:73
+msgid "STA"
 msgstr ""
 
-#: src/gui/windowmenu.cpp:55
+#: src/gui/windowmenu.cpp:73
 msgid "Status"
 msgstr "Status"
 
-#: src/gui/windowmenu.cpp:61
-msgid "Shortcut"
-msgstr "Tombol Singkat"
+#: src/gui/windowmenu.cpp:74
+msgid "EQU"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:76
+msgid "INV"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:81
+msgid "SKI"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:88
+msgid "SPE"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:93
+msgid "SOC"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:94
+msgid "SH"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:94
+msgid "Shortcuts"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:96
+msgid "SP"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:97
+msgid "DR"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:98
+msgid "YK"
+msgstr "YK"
 
-#: src/gui/worldselectdialog.cpp:71
+#: src/gui/windowmenu.cpp:98
+msgid "Did you know"
+msgstr "kamu tau"
+
+#: src/gui/windowmenu.cpp:100
+msgid "SET"
+msgstr ""
+
+#: src/gui/worldselectdialog.cpp:77
 msgid "Select World"
 msgstr ""
 
-#: src/gui/worldselectdialog.cpp:76
-#, fuzzy
+#: src/gui/worldselectdialog.cpp:82
 msgid "Change Login"
-msgstr "Ubah"
+msgstr ""
 
-#: src/gui/worldselectdialog.cpp:77
+#: src/gui/worldselectdialog.cpp:83
 msgid "Choose World"
 msgstr ""
 
-#: src/keyboardconfig.cpp:40
+#: src/inventory.cpp:248
+msgid "Storage"
+msgstr ""
+
+#: src/inventory.cpp:250
+msgid "Cart"
+msgstr ""
+
+#: src/keyboardconfig.cpp:43
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:41
+#: src/keyboardconfig.cpp:44
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:45
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:46
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:44 src/net/ea/generalhandler.cpp:223
-msgid "Attack"
+#: src/keyboardconfig.cpp:49
+msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:45
-msgid "Target & Attack"
+#: src/keyboardconfig.cpp:51
+msgid "Move to Target"
 msgstr ""
 
-#: src/keyboardconfig.cpp:46
-msgid "Smilie"
+#: src/keyboardconfig.cpp:53
+msgid "Change Move to Target type"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
-msgid "Talk"
+#: src/keyboardconfig.cpp:55
+msgid "Move to Home location"
+msgstr ""
+
+#: src/keyboardconfig.cpp:57
+msgid "Set home location"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:59
+msgid "Move to navigation point"
+msgstr ""
+
+#: src/keyboardconfig.cpp:61
+msgid "Smilie"
+msgstr ""
+
+#: src/keyboardconfig.cpp:63
 msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
-msgid "Target Monster"
+#: src/keyboardconfig.cpp:64
+msgid "Target Closest"
 msgstr ""
 
-#: src/keyboardconfig.cpp:50
+#: src/keyboardconfig.cpp:66
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:67
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:69
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:70
+msgid "Change Pickup Type"
+msgstr ""
+
+#: src/keyboardconfig.cpp:72
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:74
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:75
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:76
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
-msgid "Find Path to Mouse"
+#: src/keyboardconfig.cpp:78
+msgid "Change Map View Mode"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58 src/keyboardconfig.cpp:59
-#: src/keyboardconfig.cpp:60 src/keyboardconfig.cpp:61
-#: src/keyboardconfig.cpp:62 src/keyboardconfig.cpp:63
-#: src/keyboardconfig.cpp:64 src/keyboardconfig.cpp:65
-#: src/keyboardconfig.cpp:66 src/keyboardconfig.cpp:67
-#: src/keyboardconfig.cpp:68 src/keyboardconfig.cpp:69
+#: src/keyboardconfig.cpp:80
+msgid "Item Shortcuts Key"
+msgstr ""
+
+#: src/keyboardconfig.cpp:82 src/keyboardconfig.cpp:84
+#: src/keyboardconfig.cpp:86 src/keyboardconfig.cpp:88
+#: src/keyboardconfig.cpp:90 src/keyboardconfig.cpp:92
+#: src/keyboardconfig.cpp:94 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:98 src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:102 src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:106 src/keyboardconfig.cpp:108
+#: src/keyboardconfig.cpp:110 src/keyboardconfig.cpp:113
+#: src/keyboardconfig.cpp:115 src/keyboardconfig.cpp:117
+#: src/keyboardconfig.cpp:119 src/keyboardconfig.cpp:121
+#: src/keyboardconfig.cpp:357
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:122
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:124
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:126
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:128
 msgid "Equipment Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:130
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:132
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:134
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:136
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:138
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:140
 msgid "Debug Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:142
 msgid "Social Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:81
+#: src/keyboardconfig.cpp:144
 msgid "Emote Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:82
+#: src/keyboardconfig.cpp:146
 msgid "Outfits Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:83
-msgid "Wear Outfit"
+#: src/keyboardconfig.cpp:148
+msgid "Shop Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:84
-msgid "Copy Outfit"
+#: src/keyboardconfig.cpp:150
+msgid "Quick drop Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:152
+msgid "Kill Stats Window"
+msgstr "Jendela stat membunuh"
+
+#: src/keyboardconfig.cpp:154
+msgid "Commands Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:156
+msgid "Bot Checker Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86
-#: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88
-#: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90
-#: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92
-#: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94
-#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:159
+msgid "Who Is Online Window"
+msgstr ""
+
+#: src/keyboardconfig.cpp:161
+msgid "Did you know Window"
+msgstr "Apakah kamu mengetahui jendela"
+
+#: src/keyboardconfig.cpp:164
+msgid "Previous Social Tab"
+msgstr ""
+
+#: src/keyboardconfig.cpp:166
+msgid "Next Social Tab"
+msgstr ""
+
+#: src/keyboardconfig.cpp:168 src/keyboardconfig.cpp:170
+#: src/keyboardconfig.cpp:172 src/keyboardconfig.cpp:174
+#: src/keyboardconfig.cpp:176 src/keyboardconfig.cpp:178
+#: src/keyboardconfig.cpp:180 src/keyboardconfig.cpp:182
+#: src/keyboardconfig.cpp:184 src/keyboardconfig.cpp:186
+#: src/keyboardconfig.cpp:188 src/keyboardconfig.cpp:190
+#: src/keyboardconfig.cpp:193 src/keyboardconfig.cpp:195
+#: src/keyboardconfig.cpp:197 src/keyboardconfig.cpp:199
+#: src/keyboardconfig.cpp:201 src/keyboardconfig.cpp:203
+#: src/keyboardconfig.cpp:205 src/keyboardconfig.cpp:207
+#: src/keyboardconfig.cpp:209 src/keyboardconfig.cpp:211
+#: src/keyboardconfig.cpp:213 src/keyboardconfig.cpp:215
+#: src/keyboardconfig.cpp:217 src/keyboardconfig.cpp:220
+#: src/keyboardconfig.cpp:223 src/keyboardconfig.cpp:226
+#: src/keyboardconfig.cpp:228 src/keyboardconfig.cpp:230
+#: src/keyboardconfig.cpp:232 src/keyboardconfig.cpp:234
+#: src/keyboardconfig.cpp:236 src/keyboardconfig.cpp:238
+#: src/keyboardconfig.cpp:240 src/keyboardconfig.cpp:242
+#: src/keyboardconfig.cpp:244 src/keyboardconfig.cpp:247
+#: src/keyboardconfig.cpp:249 src/keyboardconfig.cpp:251
+#: src/keyboardconfig.cpp:253 src/keyboardconfig.cpp:255
+#: src/keyboardconfig.cpp:257 src/keyboardconfig.cpp:259
+#: src/keyboardconfig.cpp:352
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:261
+msgid "Wear Outfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:263
+msgid "Copy Outfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:265
+msgid "Copy equipped to Outfit"
+msgstr "Salin barang-barang yang dipakai ke Setelan"
+
+#: src/keyboardconfig.cpp:267
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:269
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:271
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:273
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:101
+#: src/keyboardconfig.cpp:275
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:277
+msgid "Previous chat line"
+msgstr "Garis obrolan sebelumnya"
+
+#: src/keyboardconfig.cpp:279
+msgid "Next chat line"
+msgstr "Garis obrolan selanjutnya"
+
+#: src/keyboardconfig.cpp:281
+msgid "Chat Auto Complete"
+msgstr ""
+
+#: src/keyboardconfig.cpp:283
+msgid "Deactivate Chat Input"
+msgstr ""
+
+#: src/keyboardconfig.cpp:285
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:104
+#: src/keyboardconfig.cpp:288
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:105
+#: src/keyboardconfig.cpp:290
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/keyboardconfig.cpp:178
+#: src/keyboardconfig.cpp:292
+msgid "Direct Up"
+msgstr ""
+
+#: src/keyboardconfig.cpp:293
+msgid "Direct Down"
+msgstr ""
+
+#: src/keyboardconfig.cpp:295
+msgid "Direct Left"
+msgstr ""
+
+#: src/keyboardconfig.cpp:296
+msgid "Direct Right"
+msgstr ""
+
+#: src/keyboardconfig.cpp:298
+msgid "Crazy moves"
+msgstr ""
+
+#: src/keyboardconfig.cpp:300
+msgid "Change Crazy Move mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:302
+msgid "Quick Drop N Items from 0 slot"
+msgstr ""
+
+#: src/keyboardconfig.cpp:304
+msgid "Quick Drop N Items"
+msgstr ""
+
+#: src/keyboardconfig.cpp:306
+msgid "Switch Quick Drop Counter"
+msgstr ""
+
+#: src/keyboardconfig.cpp:308
+msgid "Quick heal target or self"
+msgstr ""
+
+#: src/keyboardconfig.cpp:310
+msgid "Use #itenplz spell"
+msgstr ""
+
+#: src/keyboardconfig.cpp:312
+msgid "Use magic attack"
+msgstr ""
+
+#: src/keyboardconfig.cpp:314
+msgid "Switch magic attack"
+msgstr ""
+
+#: src/keyboardconfig.cpp:316
+msgid "Change move type"
+msgstr ""
+
+#: src/keyboardconfig.cpp:318
+msgid "Change Attack Weapon Type"
+msgstr ""
+
+#: src/keyboardconfig.cpp:320
+msgid "Change Attack Type"
+msgstr ""
+
+#: src/keyboardconfig.cpp:322
+msgid "Change Follow mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:324
+msgid "Change Imitation mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:327
+msgid "Disable / Enable Game modifier keys"
+msgstr ""
+
+#: src/keyboardconfig.cpp:328
+msgid "On / Off audio"
+msgstr ""
+
+#: src/keyboardconfig.cpp:330
+msgid "Enable / Disable away mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:332
+msgid "Emulate right click from keyboard"
+msgstr ""
+
+#: src/keyboardconfig.cpp:334
+msgid "Toggle camera mode"
+msgstr ""
+
+#: src/keyboardconfig.cpp:336
+msgid "Modifier key"
+msgstr "Kunci pengubah"
+
+#: src/keyboardconfig.cpp:408
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
 "strange behaviour."
 msgstr ""
 
-#: src/localplayer.cpp:913
-msgid "Unable to pick up item."
+#: src/localplayer.cpp:344
+msgid "You were killed by "
 msgstr ""
 
-#. TRANSLATORS: This sentence may be translated differently
-#. for different grammatical numbers (singular, plural, ...)
-#: src/localplayer.cpp:922
+#: src/localplayer.cpp:1379
+msgid "Tried to pick up nonexistent item."
+msgstr ""
+
+#: src/localplayer.cpp:1381
+msgid "Item is too heavy."
+msgstr "item terlalu berat"
+
+#: src/localplayer.cpp:1383
+msgid "Item is too far away."
+msgstr "barang terlalu jauh"
+
+#: src/localplayer.cpp:1385
+msgid "Inventory is full."
+msgstr ""
+
+#: src/localplayer.cpp:1387
+msgid "Stack is too big."
+msgstr ""
+
+#: src/localplayer.cpp:1390
+msgid "Item belongs to someone else."
+msgstr ""
+
+#: src/localplayer.cpp:1393
+msgid "Unknown problem picking up item."
+msgstr ""
+
+#. TRANSLATORS: %d is number,
+#. [@@%d|%s@@] - here player can see link to item
+#: src/localplayer.cpp:1417
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
-msgstr[1] ""
 
-#: src/main.cpp:43
-msgid "mana [options] [mana-file]"
+#: src/localplayer.cpp:3146
+msgid "Away"
+msgstr ""
+
+#: src/localplayer.cpp:3450
+msgid "Follow: "
+msgstr "Ikuti:"
+
+#: src/localplayer.cpp:3452 src/localplayer.cpp:3467
+msgid "Follow canceled"
+msgstr "Batal mengikuti"
+
+#: src/localplayer.cpp:3459
+msgid "Imitation: "
+msgstr "Salinan:"
+
+#: src/localplayer.cpp:3461 src/localplayer.cpp:3469
+msgid "Imitation canceled"
+msgstr "Batal meyalin"
+
+#: src/localplayer.cpp:3821
+msgid "You see "
+msgstr ""
+
+#: src/main.cpp:47
+msgid "manaplus [options] [mana-file]"
+msgstr ""
+
+#: src/main.cpp:48
+msgid "[mana-file] : The mana file is an XML file (.mana)"
+msgstr ""
+
+#: src/main.cpp:49
+msgid "              used to set custom parameters"
+msgstr ""
+
+#: src/main.cpp:50
+msgid "              to the manaplus client."
 msgstr ""
 
-#: src/main.cpp:44
+#: src/main.cpp:52
 msgid "Options:"
 msgstr ""
 
-#: src/main.cpp:45
+#: src/main.cpp:53
+msgid "  -l --log-file       : Log file to use"
+msgstr ""
+
+#: src/main.cpp:54
+msgid "  -L --chat-log-dir   : Chat log dir to use"
+msgstr ""
+
+#: src/main.cpp:55
 msgid "  -v --version        : Display the version"
 msgstr ""
 
-#: src/main.cpp:46
+#: src/main.cpp:56
 msgid "  -h --help           : Display this help"
 msgstr ""
 
-#: src/main.cpp:47
+#: src/main.cpp:57
 msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:48
+#: src/main.cpp:58
 msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:49
+#: src/main.cpp:59
 msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:50
+#: src/main.cpp:60
 msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:51
+#: src/main.cpp:61
 msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:52
+#: src/main.cpp:62
 msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:53
+#: src/main.cpp:63
 msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:54
+#: src/main.cpp:64
 msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:56
+#: src/main.cpp:66
 msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:57
+#: src/main.cpp:67
 msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:58
+#: src/main.cpp:69
 msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:59
+#: src/main.cpp:71
 msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:61
-msgid "     --no-opengl      : Disable OpenGL for this session"
+#: src/main.cpp:72
+msgid "     --safemode       : Start game in safe mode"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:63
-msgid "Kick failed!"
-msgstr ""
-
-#: src/net/ea/adminhandler.cpp:65
-msgid "Kick succeeded!"
+#: src/main.cpp:74
+msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:110
+#: src/net/ea/buysellhandler.cpp:163
 msgid "Nothing to sell."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:117
+#: src/net/ea/buysellhandler.cpp:171
 msgid "Thanks for buying."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:124
+#: src/net/ea/buysellhandler.cpp:179
 msgid "Unable to buy."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:130
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:257
+msgid "Strength"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:167
+#, c-format
+msgid "Strength %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:258
+msgid "Agility"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:180
+#, c-format
+msgid "Agility %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:261
+msgid "Dexterity"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:193
+#, c-format
+msgid "Dexterity %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:259
+msgid "Vitality"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:206
+#, c-format
+msgid "Vitality %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:260
+msgid "Intelligence"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:219
+#, c-format
+msgid "Intelligence %+.1f"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:225
+msgid "Willpower"
+msgstr ""
+
+#: src/net/manaserv/attributes.cpp:232
+#, c-format
+msgid "Willpower %+.1f"
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:315 src/net/tmwa/playerhandler.cpp:103
+msgid "You are dead."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:316 src/net/tmwa/playerhandler.cpp:104
+msgid "We regret to inform you that your character was killed in battle."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:318 src/net/tmwa/playerhandler.cpp:106
+msgid "You are not that alive anymore."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:319 src/net/tmwa/playerhandler.cpp:107
+msgid "The cold hands of the grim reaper are grabbing for your soul."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:320 src/net/tmwa/playerhandler.cpp:108
+msgid "Game Over!"
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:321 src/net/tmwa/playerhandler.cpp:110
+msgid ""
+"No, kids. Your character did not really die. It... err... went to a better "
+"place."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:323 src/net/tmwa/playerhandler.cpp:112
+msgid ""
+"Your plan of breaking your enemies weapon by bashing it with your throat "
+"failed."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:325 src/net/tmwa/playerhandler.cpp:114
+msgid "I guess this did not run too well."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:326 src/net/tmwa/playerhandler.cpp:116
+msgid "Do you want your possessions identified?"
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:327 src/net/tmwa/playerhandler.cpp:118
+msgid "Sadly, no trace of you was ever found..."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:329 src/net/tmwa/playerhandler.cpp:120
+msgid "Annihilated."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:330 src/net/tmwa/playerhandler.cpp:122
+msgid "Looks like you got your head handed to you."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:332 src/net/tmwa/playerhandler.cpp:124
+msgid ""
+"You screwed up again, dump your body down the tubes and get you another one."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:337
+msgid "Press OK to respawn."
+msgstr ""
+
+#: src/net/manaserv/beinghandler.cpp:338
+msgid "You Died"
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:145 src/net/manaserv/charhandler.cpp:219
+msgid "Not logged in."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:148
+msgid "No empty slot."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:151
+msgid "Invalid name."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:154
+msgid "Character's name already exists."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:157
+msgid "Invalid hairstyle."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:160
+msgid "Invalid hair color."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:163
+msgid "Invalid gender."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:166
+msgid "Character's stats are too high."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:169
+msgid "Character's stats are too low."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:172
+#, c-format
+msgid "At least one stat is out of the permitted range: (%u - %u)."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:178
+msgid "Invalid slot number."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
+#: src/net/manaserv/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:170
+#: src/net/manaserv/loginhandler.cpp:291 src/net/manaserv/loginhandler.cpp:328
+#: src/net/tmwa/loginhandler.cpp:102 src/net/tmwa/loginhandler.cpp:202
+msgid "Unknown error."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:210 src/net/tmwa/charserverhandler.cpp:201
+msgid "Info"
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:210
+msgid "Player deleted."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:222
+msgid "Selection out of range."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:225
+#, c-format
+msgid "Unknown error (%d)."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:261
+msgid "No gameservers are available."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:186 src/net/manaserv/chathandler.cpp:309
+#: src/net/manaserv/guildhandler.cpp:265
+#, c-format
+msgid "Topic: %s"
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:191 src/net/manaserv/chathandler.cpp:269
+msgid "Players in this channel:"
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:208
+msgid "Error joining channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:214
+msgid "Listing channels."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:226
+msgid "End of channel list."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:299
+#, c-format
+msgid "%s entered the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:304
+#, c-format
+msgid "%s left the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:320
+#, c-format
+msgid "%s has set mode %s on user %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:331
+#, c-format
+msgid "%s has kicked %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:337
+msgid "Unknown channel event."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:85 src/net/tmwa/guildhandler.cpp:107
+msgid "Guild created."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:90
+msgid "Error creating guild."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:100
+msgid "Invite sent."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:207
+msgid "Member was promoted successfully."
+msgstr ""
+
+#: src/net/manaserv/guildhandler.cpp:212
+msgid "Failed to promote member."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:93
+msgid "Wrong magic_token."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:96 src/net/manaserv/loginhandler.cpp:281
+msgid "Already logged in."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:99
+msgid "Account banned."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:124
+msgid "New password incorrect."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:127 src/net/tmwa/loginhandler.cpp:96
+msgid "Old password incorrect."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:131 src/net/manaserv/loginhandler.cpp:163
+msgid "Account not connected. Please login first."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:156
+msgid "New email address incorrect."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:159
+msgid "Old email address incorrect."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:167
+msgid "The new email address already exists."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:249
+msgid ""
+"Client registration is not allowed. Please contact server administration."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:275 src/net/manaserv/loginhandler.cpp:312
+msgid "Client version is too old."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:278
+msgid "Wrong username or password."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:284
+msgid "Account banned"
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:287
+msgid "Login attempt too soon after previous attempt."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:315
+msgid "Wrong username, password or email address."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:318
+msgid "Username already exists."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:321
+msgid "Email address already exists."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:324
+msgid "You took too long with the captcha or your response was incorrect."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:90
+msgid "Joined party."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:108
+#, c-format
+msgid "%s joined the party."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:126
+#, c-format
+msgid "%s rejected your invite."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:107
+msgid "Accepting incoming trade requests."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:109
+msgid "Ignoring incoming trade requests."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:128 src/net/tmwa/tradehandler.cpp:125
+#, c-format
+msgid "%s wants to trade with you, do you accept?"
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:146
+#, c-format
+msgid "Trading with %s"
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:160 src/net/tmwa/tradehandler.cpp:282
+msgid "Trade canceled."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:167 src/net/tmwa/tradehandler.cpp:292
+msgid "Trade completed."
+msgstr ""
+
+#: src/net/tmwa/adminhandler.cpp:70
+msgid "Kick failed!"
+msgstr ""
+
+#: src/net/tmwa/adminhandler.cpp:72
+msgid "Kick succeeded!"
+msgstr ""
+
+#: src/net/tmwa/buysellhandler.cpp:131
 msgid "Thanks for selling."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:132
+#: src/net/tmwa/buysellhandler.cpp:135
 msgid "Unable to sell."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:103
-msgid "Access denied."
+#: src/net/tmwa/buysellhandler.cpp:138
+msgid "Unable to sell while trading."
+msgstr ""
+
+#: src/net/tmwa/buysellhandler.cpp:141
+msgid "Unable to sell unsellable item."
+msgstr ""
+
+#: src/net/tmwa/charserverhandler.cpp:121
+msgid "Access denied. Most likely, there are too many players on this server."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:106
+#: src/net/tmwa/charserverhandler.cpp:125
 msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:109
-msgid "Unknown failure to select character."
+#: src/net/tmwa/charserverhandler.cpp:128
+msgid "Unknown char-server failure."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:135
+#: src/net/tmwa/charserverhandler.cpp:174
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:147 src/net/manaserv/charhandler.cpp:187
-msgid "Info"
+#: src/net/tmwa/charserverhandler.cpp:178 src/net/tmwa/loginhandler.cpp:196
+msgid "Wrong name."
+msgstr ""
+
+#: src/net/tmwa/charserverhandler.cpp:181
+msgid "Incorrect stats."
+msgstr ""
+
+#: src/net/tmwa/charserverhandler.cpp:184
+msgid "Incorrect hair."
+msgstr ""
+
+#: src/net/tmwa/charserverhandler.cpp:187
+msgid "Incorrect slot."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:147
+#: src/net/tmwa/charserverhandler.cpp:201
 msgid "Character deleted."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:152
+#: src/net/tmwa/charserverhandler.cpp:206
 msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:237 src/net/manaserv/charhandler.cpp:263
+#: src/net/tmwa/charserverhandler.cpp:383
 msgid "Strength:"
 msgstr "Kekuatan"
 
-#: src/net/ea/charserverhandler.cpp:238 src/net/manaserv/charhandler.cpp:264
+#: src/net/tmwa/charserverhandler.cpp:384
 msgid "Agility:"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:239 src/net/manaserv/charhandler.cpp:266
+#: src/net/tmwa/charserverhandler.cpp:385
 msgid "Vitality:"
 msgstr "Daya/Tenaga Hidup"
 
-#: src/net/ea/charserverhandler.cpp:240 src/net/manaserv/charhandler.cpp:267
+#: src/net/tmwa/charserverhandler.cpp:386
 msgid "Intelligence:"
 msgstr "Kecerdasan"
 
-#: src/net/ea/charserverhandler.cpp:241 src/net/manaserv/charhandler.cpp:265
+#: src/net/tmwa/charserverhandler.cpp:387
 msgid "Dexterity:"
 msgstr "Ketangkasan"
 
-#: src/net/ea/charserverhandler.cpp:242
+#: src/net/tmwa/charserverhandler.cpp:388
 msgid "Luck:"
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:80
-msgid "Whisper could not be sent, user is offline."
+#: src/net/tmwa/chathandler.cpp:106
+#, c-format
+msgid "Whisper could not be sent, %s is offline."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:84
-msgid "Whisper could not be sent, ignored by user."
+#: src/net/tmwa/chathandler.cpp:114
+#, c-format
+msgid "Whisper could not be sent, ignored by %s."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:171
+#: src/net/tmwa/chathandler.cpp:338
 msgid "MVP player."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:204 src/net/ea/chathandler.cpp:210
-#: src/net/ea/chathandler.cpp:215 src/net/ea/chathandler.cpp:220
-#: src/net/ea/chathandler.cpp:225 src/net/ea/chathandler.cpp:230
-#: src/net/ea/chathandler.cpp:235 src/net/ea/chathandler.cpp:240
+#: src/net/tmwa/chathandler.cpp:342
+msgid "MVP player: "
+msgstr ""
+
+#: src/net/tmwa/chathandler.cpp:395 src/net/tmwa/chathandler.cpp:401
+#: src/net/tmwa/chathandler.cpp:406 src/net/tmwa/chathandler.cpp:412
+#: src/net/tmwa/chathandler.cpp:417 src/net/tmwa/chathandler.cpp:423
+#: src/net/tmwa/chathandler.cpp:430 src/net/tmwa/chathandler.cpp:436
 msgid "Channels are not supported!"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:86
+#: src/net/tmwa/gamehandler.cpp:96
 #, c-format
 msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/gamehandler.cpp:100
-#, fuzzy
+#: src/net/tmwa/gamehandler.cpp:106
 msgid "Game"
-msgstr "Nama:"
+msgstr ""
 
-#: src/net/ea/gamehandler.cpp:100
+#: src/net/tmwa/gamehandler.cpp:106
 msgid "Request to quit denied!"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:102 src/net/manaserv/generalhandler.cpp:95
+#: src/net/tmwa/generalhandler.cpp:107
 #, c-format
 msgid "Strength %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:103 src/net/manaserv/generalhandler.cpp:96
+#: src/net/tmwa/generalhandler.cpp:108
 #, c-format
 msgid "Agility %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:104 src/net/manaserv/generalhandler.cpp:98
+#: src/net/tmwa/generalhandler.cpp:109
 #, c-format
 msgid "Vitality %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:105 src/net/manaserv/generalhandler.cpp:99
+#: src/net/tmwa/generalhandler.cpp:110
 #, c-format
 msgid "Intelligence %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:106 src/net/manaserv/generalhandler.cpp:97
+#: src/net/tmwa/generalhandler.cpp:111
 #, c-format
 msgid "Dexterity %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:107
+#: src/net/tmwa/generalhandler.cpp:112
 #, c-format
 msgid "Luck %+d"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:130
+#: src/net/tmwa/generalhandler.cpp:138
 msgid "Authentication failed."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:133
+#: src/net/tmwa/generalhandler.cpp:141
 msgid "No servers available."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:137
+#: src/net/tmwa/generalhandler.cpp:145
 msgid "Someone else is trying to use this account."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:140
+#: src/net/tmwa/generalhandler.cpp:148
 msgid "This account is already logged in."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:143
+#: src/net/tmwa/generalhandler.cpp:151
 msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:146
+#: src/net/tmwa/generalhandler.cpp:154
 msgid "Duplicated login."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:149
+#: src/net/tmwa/generalhandler.cpp:157
 msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:205
+#: src/net/tmwa/generalhandler.cpp:230
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:216 src/net/manaserv/generalhandler.cpp:166
-msgid "Strength"
+#: src/net/tmwa/generalhandler.cpp:262
+msgid "Luck"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:217 src/net/manaserv/generalhandler.cpp:167
-msgid "Agility"
+#: src/net/tmwa/generalhandler.cpp:265
+msgid "Defense"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:218 src/net/manaserv/generalhandler.cpp:169
-msgid "Vitality"
+#: src/net/tmwa/generalhandler.cpp:266
+msgid "M.Attack"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:219 src/net/manaserv/generalhandler.cpp:170
-msgid "Intelligence"
+#: src/net/tmwa/generalhandler.cpp:267
+msgid "M.Defense"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:220 src/net/manaserv/generalhandler.cpp:168
-msgid "Dexterity"
+#: src/net/tmwa/generalhandler.cpp:268
+msgid "% Accuracy"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:221
-msgid "Luck"
+#: src/net/tmwa/generalhandler.cpp:269
+msgid "% Evade"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:224
-#, fuzzy
-msgid "Defense"
-msgstr "Pertahanan %+d"
-
-#: src/net/ea/generalhandler.cpp:225
-#, fuzzy
-msgid "M.Attack"
-msgstr "Serangan %+d"
-
-#: src/net/ea/generalhandler.cpp:226
-#, fuzzy
-msgid "M.Defense"
-msgstr "Pertahanan %+d"
+#: src/net/tmwa/generalhandler.cpp:270
+msgid "% Critical"
+msgstr ""
 
-#: src/net/ea/generalhandler.cpp:227
-#, c-format
-msgid "% Accuracy"
+#: src/net/tmwa/generalhandler.cpp:271
+msgid "Attack Delay"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:228
-#, c-format
-msgid "% Evade"
+#: src/net/tmwa/generalhandler.cpp:273
+msgid "Walk Delay"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:229
-#, c-format
-msgid "% Critical"
+#: src/net/tmwa/generalhandler.cpp:275
+msgid "Attack Range"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
+#: src/net/tmwa/gui/guildtab.cpp:77 src/net/tmwa/gui/partytab.cpp:69
 msgid "/help > Display this help."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:62
+#: src/net/tmwa/gui/guildtab.cpp:78
 msgid "/invite > Invite a player to your guild"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:63
+#: src/net/tmwa/gui/guildtab.cpp:79
 msgid "/leave > Leave the guild you are in"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:64
+#: src/net/tmwa/gui/guildtab.cpp:80
 msgid "/kick > Kick some one from the guild you are in"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:73 src/net/ea/gui/partytab.cpp:73
+#: src/net/tmwa/gui/guildtab.cpp:89 src/net/tmwa/gui/partytab.cpp:83
 msgid "Command: /invite <nick>"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:74
+#: src/net/tmwa/gui/guildtab.cpp:90
 msgid "This command invites <nick> to the guild you're in."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:80 src/net/ea/gui/partytab.cpp:80
+#: src/net/tmwa/gui/guildtab.cpp:96 src/net/tmwa/gui/partytab.cpp:90
 msgid "Command: /leave"
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:81
+#: src/net/tmwa/gui/guildtab.cpp:97
 msgid "This command causes the player to leave the guild."
 msgstr ""
 
-#: src/net/ea/gui/guildtab.cpp:89
-msgid "Guild name is missing."
+#: src/net/tmwa/guildhandler.cpp:112 src/net/tmwa/guildhandler.cpp:117
+msgid "You are already in guild."
+msgstr "Kamu sudah berada di dalam organisasi"
+
+#: src/net/tmwa/guildhandler.cpp:122
+msgid "Emperium check failed."
+msgstr ""
+
+#: src/net/tmwa/guildhandler.cpp:127
+msgid "Unknown server response."
+msgstr ""
+
+#: src/net/tmwa/guildhandler.cpp:205
+#, c-format
+msgid "Guild name: %s"
+msgstr ""
+
+#: src/net/tmwa/guildhandler.cpp:207
+#, c-format
+msgid "Guild master: %s"
+msgstr ""
+
+#: src/net/tmwa/guildhandler.cpp:209
+#, c-format
+msgid "Guild level: %d"
+msgstr ""
+
+#: src/net/tmwa/guildhandler.cpp:211
+#, c-format
+msgid "Online members: %d"
+msgstr ""
+
+#: src/net/tmwa/guildhandler.cpp:213
+#, c-format
+msgid "Max members: %d"
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:293
+#: src/net/tmwa/guildhandler.cpp:215
+#, c-format
+msgid "Average level: %d"
+msgstr ""
+
+#: src/net/tmwa/guildhandler.cpp:217
+#, c-format
+msgid "Guild exp: %d"
+msgstr ""
+
+#: src/net/tmwa/guildhandler.cpp:219
+#, c-format
+msgid "Guild next exp: %d"
+msgstr ""
+
+#: src/net/tmwa/guildhandler.cpp:221
+#, c-format
+msgid "Guild castle: %s"
+msgstr ""
+
+#: src/net/tmwa/guildhandler.cpp:436
 msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:298
+#: src/net/tmwa/guildhandler.cpp:441
 msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:303
+#: src/net/tmwa/guildhandler.cpp:446
 msgid "User is now part of your guild."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:308
+#: src/net/tmwa/guildhandler.cpp:451
 msgid "Your guild is full."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:313
+#: src/net/tmwa/guildhandler.cpp:456
 msgid "Unknown guild invite response."
 msgstr ""
 
-#: src/net/ea/guildhandler.cpp:390
-msgid "Guild creation isn't supported yet."
+#: src/net/tmwa/guildhandler.cpp:478
+msgid "You have left the guild."
+msgstr ""
+
+#: src/net/tmwa/guildhandler.cpp:492
+#, c-format
+msgid "%s has left your guild."
+msgstr ""
+
+#: src/net/tmwa/guildhandler.cpp:524
+msgid "You was kicked from guild."
+msgstr ""
+
+#: src/net/tmwa/guildhandler.cpp:538
+#, c-format
+msgid "%s has kicked from your guild."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:60
+#: src/net/tmwa/gui/partytab.cpp:70
 msgid "/invite > Invite a player to your party"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:61
+#: src/net/tmwa/gui/partytab.cpp:71
 msgid "/leave > Leave the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:62
+#: src/net/tmwa/gui/partytab.cpp:72
 msgid "/kick > Kick some one from the party you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:63
+#: src/net/tmwa/gui/partytab.cpp:73
 msgid "/item > Show/change party item sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:64
+#: src/net/tmwa/gui/partytab.cpp:74
 msgid "/exp > Show/change party experience sharing options"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:81
+#: src/net/tmwa/gui/partytab.cpp:84
+msgid "This command invites <nick> to party with you."
+msgstr "perintah ini mengundang <nama> untuk menjadi bagian kelompok anda"
+
+#: src/net/tmwa/gui/partytab.cpp:91
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:85
+#: src/net/tmwa/gui/partytab.cpp:95
 msgid "Command: /item <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/tmwa/gui/partytab.cpp:97
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:87
+#: src/net/tmwa/gui/partytab.cpp:98
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
 "\"0\", \"no\", \"false\" to disable item sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:90
+#: src/net/tmwa/gui/partytab.cpp:101
 msgid "Command: /item"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/tmwa/gui/partytab.cpp:102
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/tmwa/gui/partytab.cpp:107
 msgid "Command: /exp <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:96
+#: src/net/tmwa/gui/partytab.cpp:108
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/tmwa/gui/partytab.cpp:110
 msgid ""
 "<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
 "sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:100
+#: src/net/tmwa/gui/partytab.cpp:113
 msgid "Command: /exp"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/tmwa/gui/partytab.cpp:114
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:132 src/net/ea/partyhandler.cpp:198
+#: src/net/tmwa/gui/partytab.cpp:148 src/net/tmwa/partyhandler.cpp:289
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:135 src/net/ea/partyhandler.cpp:204
+#: src/net/tmwa/gui/partytab.cpp:151 src/net/tmwa/partyhandler.cpp:299
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:138 src/net/ea/partyhandler.cpp:210
+#: src/net/tmwa/gui/partytab.cpp:154 src/net/tmwa/partyhandler.cpp:309
 msgid "Item sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:141
+#: src/net/tmwa/gui/partytab.cpp:157
 msgid "Item sharing unknown."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:167 src/net/ea/partyhandler.cpp:174
+#: src/net/tmwa/gui/partytab.cpp:187 src/net/tmwa/partyhandler.cpp:251
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:170 src/net/ea/partyhandler.cpp:180
+#: src/net/tmwa/gui/partytab.cpp:190 src/net/tmwa/partyhandler.cpp:261
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:173 src/net/ea/partyhandler.cpp:186
+#: src/net/tmwa/gui/partytab.cpp:193 src/net/tmwa/partyhandler.cpp:271
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:176
+#: src/net/tmwa/gui/partytab.cpp:196
 msgid "Experience sharing unknown."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:281
+#: src/net/tmwa/inventoryhandler.cpp:379
 msgid "Failed to use item."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:391
+#: src/net/tmwa/inventoryhandler.cpp:531
 msgid "Unable to equip."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:402
-msgid "Unable to unequip."
-msgstr ""
-
-#: src/net/ea/loginhandler.cpp:79
+#: src/net/tmwa/loginhandler.cpp:93
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:82 src/net/manaserv/loginhandler.cpp:121
-msgid "Old password incorrect."
-msgstr ""
-
-#: src/net/ea/loginhandler.cpp:85
+#: src/net/tmwa/loginhandler.cpp:99
 msgid "New password too short."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:88 src/net/ea/loginhandler.cpp:175
-#: src/net/manaserv/charhandler.cpp:158 src/net/manaserv/loginhandler.cpp:96
-#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
-#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
-#, fuzzy
-msgid "Unknown error."
-msgstr "Perintah tidak dikenal."
-
-#: src/net/ea/loginhandler.cpp:149
-#, fuzzy
+#: src/net/tmwa/loginhandler.cpp:164
 msgid "Unregistered ID."
-msgstr "Tidak terdaftar"
+msgstr ""
 
-#: src/net/ea/loginhandler.cpp:152
+#: src/net/tmwa/loginhandler.cpp:167
 msgid "Wrong password."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:155
+#: src/net/tmwa/loginhandler.cpp:170
 msgid "Account expired."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:158
+#: src/net/tmwa/loginhandler.cpp:173
 msgid "Rejected from server."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:161
+#: src/net/tmwa/loginhandler.cpp:176
 msgid ""
 "You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:165
+#: src/net/tmwa/loginhandler.cpp:180
+msgid "Client too old."
+msgstr "Versi yang digunakan sudah kadaluarsa."
+
+#: src/net/tmwa/loginhandler.cpp:183
 #, c-format
 msgid ""
 "You have been temporarily banned from the game until %s.\n"
 "Please contact the GM team via the forums."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:172
+#: src/net/tmwa/loginhandler.cpp:190
+msgid "Server overpopulated."
+msgstr "Server kepenuhan."
+
+#: src/net/tmwa/loginhandler.cpp:193
 msgid "This user name is already taken."
 msgstr ""
 
-#: src/net/ea/network.cpp:145
+#: src/net/tmwa/loginhandler.cpp:199
+msgid "Username permanently erased."
+msgstr "Username dihapus permanen."
+
+#: src/net/tmwa/network.cpp:152
 msgid "Empty address given to Network::connect()!"
 msgstr ""
 
-#: src/net/ea/network.cpp:345
+#: src/net/tmwa/network.cpp:356
 msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/ea/network.cpp:414
+#: src/net/tmwa/network.cpp:426
 msgid "Connection to server terminated. "
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:81
+#: src/net/tmwa/partyhandler.cpp:86
 msgid "Could not create party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:84
+#: src/net/tmwa/partyhandler.cpp:88
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:118
+#: src/net/tmwa/partyhandler.cpp:143
+#, c-format
+msgid "%s has joined your party."
+msgstr "%s telah bergabung dengan kelompok"
+
+#: src/net/tmwa/partyhandler.cpp:179
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:122
+#: src/net/tmwa/partyhandler.cpp:184
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:126
+#: src/net/tmwa/partyhandler.cpp:189
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:130
+#: src/net/tmwa/partyhandler.cpp:194
+#, c-format
+msgid "%s can't join your party because party is full."
+msgstr "%s tidak dapat bergabung dengan kelompok karena kelompok sudah penuh."
+
+#: src/net/tmwa/partyhandler.cpp:199
 #, c-format
-msgid "Unknown invite response for %s."
+msgid "QQQ Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:238
+#: src/net/tmwa/partyhandler.cpp:359
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:249
+#: src/net/tmwa/partyhandler.cpp:371
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:301
+#: src/net/tmwa/partyhandler.cpp:447
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:329
-msgid "Inviting like this isn't supported at the moment."
-msgstr ""
-
-#: src/net/ea/partyhandler.cpp:334
-msgid "You can only inivte when you are in a party!"
-msgstr ""
-
-#: src/net/ea/partyhandler.cpp:365
+#: src/net/tmwa/partyhandler.cpp:529
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:304
-msgid "You are dead."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:305
-msgid "We regret to inform you that your character was killed in battle."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:307
-msgid "You are not that alive anymore."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:308
-msgid "The cold hands of the grim reaper are grabbing for your soul."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:309
-msgid "Game Over!"
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:105
+#: src/net/tmwa/playerhandler.cpp:109
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:310
-msgid ""
-"No, kids. Your character did not really die. It... err... went to a better "
-"place."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:312
-msgid ""
-"Your plan of breaking your enemies weapon by bashing it with your throat "
-"failed."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:314
-msgid "I guess this did not run too well."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:315
-msgid "Do you want your possessions identified?"
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:316
-msgid "Sadly, no trace of you was ever found..."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:317
-msgid "Annihilated."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:318
-msgid "Looks like you got your head handed to you."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:120 src/net/manaserv/beinghandler.cpp:319
-msgid ""
-"You screwed up again, dump your body down the tubes and get you another one."
-msgstr ""
-
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/tmwa/playerhandler.cpp:127
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/tmwa/playerhandler.cpp:128
 msgid "You are no more."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/tmwa/playerhandler.cpp:129
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/tmwa/playerhandler.cpp:130
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/tmwa/playerhandler.cpp:131
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/tmwa/playerhandler.cpp:132
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/tmwa/playerhandler.cpp:133
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/tmwa/playerhandler.cpp:134
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:131
+#: src/net/tmwa/playerhandler.cpp:135
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/tmwa/playerhandler.cpp:136
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/tmwa/playerhandler.cpp:137
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:135
+#: src/net/tmwa/playerhandler.cpp:139
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:136
+#: src/net/tmwa/playerhandler.cpp:140
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:249 src/net/ea/playerhandler.cpp:310
+#: src/net/tmwa/playerhandler.cpp:342 src/net/tmwa/playerhandler.cpp:352
+#: src/net/tmwa/playerhandler.cpp:431
 msgid "Message"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:250
+#: src/net/tmwa/playerhandler.cpp:343
 msgid ""
-"You are carrying more than half your weight. You are unable to regain health."
+"You are carrying more than half your weight. You are unable to regain "
+"health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:333
+#: src/net/tmwa/playerhandler.cpp:353
+msgid "You are carrying less than half your weight. You can regain health."
+msgstr ""
+"Kamu membawa kurang dari setengah jumlah berat maksimal. Darah dapat "
+"beregenerasi."
+
+#: src/net/tmwa/playerhandler.cpp:458
 #, c-format
 msgid "You picked up %s."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:369
+#: src/net/tmwa/playerhandler.cpp:464
+#, c-format
+msgid "You spent %s."
+msgstr ""
+
+#: src/net/tmwa/playerhandler.cpp:509
 msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:532
+#: src/net/tmwa/playerhandler.cpp:629
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:147
+#: src/net/tmwa/specialhandler.cpp:158
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:150
+#: src/net/tmwa/specialhandler.cpp:161
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:153
+#: src/net/tmwa/specialhandler.cpp:164
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:156
+#: src/net/tmwa/specialhandler.cpp:167
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:159
+#: src/net/tmwa/specialhandler.cpp:170
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:162
+#: src/net/tmwa/specialhandler.cpp:173
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:171
+#: src/net/tmwa/specialhandler.cpp:186
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:174
+#: src/net/tmwa/specialhandler.cpp:190
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:177
+#: src/net/tmwa/specialhandler.cpp:193
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:180
+#: src/net/tmwa/specialhandler.cpp:196
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:183
+#: src/net/tmwa/specialhandler.cpp:199
 msgid "You cannot do that right now!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:186
+#: src/net/tmwa/specialhandler.cpp:202
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:189
+#: src/net/tmwa/specialhandler.cpp:205
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:192
+#: src/net/tmwa/specialhandler.cpp:209
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:195
+#: src/net/tmwa/specialhandler.cpp:212
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:198
+#: src/net/tmwa/specialhandler.cpp:215
 msgid "You're carrying to much to do this!"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:201
+#: src/net/tmwa/specialhandler.cpp:218
 msgid "Huh? What's that?"
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:210
+#: src/net/tmwa/specialhandler.cpp:229
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:213
+#: src/net/tmwa/specialhandler.cpp:232
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/ea/specialhandler.cpp:216
+#: src/net/tmwa/specialhandler.cpp:235
 msgid "Poison had no effect..."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:116
-msgid "Request for Trade"
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:108 src/net/manaserv/tradehandler.cpp:117
-#, c-format
-msgid "%s wants to trade with you, do you accept?"
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:124
+#: src/net/tmwa/tradehandler.cpp:148
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:128
+#: src/net/tmwa/tradehandler.cpp:152
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:132
+#: src/net/tmwa/tradehandler.cpp:156
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:137
+#: src/net/tmwa/tradehandler.cpp:164
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:144
+#: src/net/tmwa/tradehandler.cpp:174
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:153
+#: src/net/tmwa/tradehandler.cpp:187
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:202
+#: src/net/tmwa/tradehandler.cpp:250
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:207
+#: src/net/tmwa/tradehandler.cpp:255
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:211
-msgid "Failed adding item for unknown reason."
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:224 src/net/manaserv/tradehandler.cpp:149
-msgid "Trade canceled."
-msgstr ""
-
-#: src/net/ea/tradehandler.cpp:231 src/net/manaserv/tradehandler.cpp:156
-msgid "Trade completed."
-msgstr ""
-
-#: src/net/manaserv/beinghandler.cpp:324
-msgid "Press OK to respawn."
-msgstr ""
-
-#: src/net/manaserv/beinghandler.cpp:325
-#, fuzzy
-msgid "You Died"
-msgstr "Anda memberikan:"
-
-#: src/net/manaserv/charhandler.cpp:128 src/net/manaserv/charhandler.cpp:196
-msgid "Not logged in."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:131
-msgid "No empty slot."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:134
-msgid "Invalid name."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:137
-msgid "Character's name already exists."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:140
-msgid "Invalid hairstyle."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:143
-msgid "Invalid hair color."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:146
-msgid "Invalid gender."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:149
-#, fuzzy
-msgid "Character's stats are too high."
-msgstr "Stats Karakter OK"
-
-#: src/net/manaserv/charhandler.cpp:152
-#, fuzzy
-msgid "Character's stats are too low."
-msgstr "Stats Karakter OK"
-
-#: src/net/manaserv/charhandler.cpp:155
-msgid "One stat is zero."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:187
-msgid "Player deleted."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:199
-#, fuzzy
-msgid "Selection out of range."
-msgstr "Pilih jumlah item yang mau di perdagangkan"
-
-#: src/net/manaserv/charhandler.cpp:202
-#, fuzzy, c-format
-msgid "Unknown error (%d)."
-msgstr "Perintah tidak dikenal."
-
-#: src/net/manaserv/charhandler.cpp:242
-msgid "No gameservers are available."
-msgstr ""
-
-#: src/net/manaserv/charhandler.cpp:268
-msgid "Willpower:"
-msgstr "Ketekunan"
-
-#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
-#: src/net/manaserv/guildhandler.cpp:259
-#, c-format
-msgid "Topic: %s"
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
-msgid "Players in this channel:"
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:201
-msgid "Error joining channel."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:207
-msgid "Listing channels."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:219
-msgid "End of channel list."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:291
-#, c-format
-msgid "%s entered the channel."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:296
-#, c-format
-msgid "%s left the channel."
-msgstr ""
+#: src/net/tmwa/tradehandler.cpp:260
+msgid "Failed adding item. You can't trade this item."
+msgstr "Gagal menambahkan barang. Kamu tidak dapat menukar barang ini."
 
-#: src/net/manaserv/chathandler.cpp:312
-#, c-format
-msgid "%s has set mode %s on user %s."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:322
-#, c-format
-msgid "%s has kicked %s."
-msgstr ""
-
-#: src/net/manaserv/chathandler.cpp:327
-#, fuzzy
-msgid "Unknown channel event."
-msgstr "Perintah tidak dikenal."
-
-#: src/net/manaserv/generalhandler.cpp:100
-#, c-format
-msgid "Willpower %+d"
-msgstr ""
-
-#: src/net/manaserv/generalhandler.cpp:171
-#, fuzzy
-msgid "Willpower"
-msgstr "Ketekunan"
-
-#: src/net/manaserv/guildhandler.cpp:81
-msgid "Guild created."
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:86
-msgid "Error creating guild."
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:96
-msgid "Invite sent."
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:203
-msgid "Member was promoted successfully."
-msgstr ""
-
-#: src/net/manaserv/guildhandler.cpp:208
-msgid "Failed to promote member."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:87
-msgid "Wrong magic_token."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
-msgid "Already logged in."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:93 src/net/manaserv/loginhandler.cpp:272
-msgid "Server is full."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:118
-msgid "New password incorrect."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
-msgid "Account not connected. Please login first."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:149
-msgid "New email address incorrect."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:152
-msgid "Old email address incorrect."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:158
-msgid "The new email address already exists."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:239
-msgid ""
-"Client registration is not allowed. Please contact server administration."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
-msgid "Client version is too old."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:266
-msgid "Wrong username or password."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:275
-msgid "Login attempt too soon after previous attempt."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:303
-msgid "Wrong username, password or email address."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:306
-msgid "Username already exists."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:309
-msgid "Email address already exists."
-msgstr ""
-
-#: src/net/manaserv/loginhandler.cpp:312
-msgid "You took too long with the captcha or your response was incorrect."
-msgstr ""
-
-#: src/net/manaserv/partyhandler.cpp:88
-msgid "Joined party."
-msgstr ""
-
-#: src/net/manaserv/partyhandler.cpp:106
-#, c-format
-msgid "%s joined the party."
-msgstr ""
-
-#: src/net/manaserv/partyhandler.cpp:123
-#, c-format
-msgid "%s rejected your invite."
-msgstr ""
-
-#: src/net/manaserv/tradehandler.cpp:96
-msgid "Accepting incoming trade requests."
-msgstr ""
-
-#: src/net/manaserv/tradehandler.cpp:98
-msgid "Ignoring incoming trade requests."
-msgstr ""
-
-#: src/net/manaserv/tradehandler.cpp:135
-#, c-format
-msgid "Trading with %s"
-msgstr ""
-
-#: src/playerrelations.cpp:304
-msgid "Completely ignore"
+#: src/net/tmwa/tradehandler.cpp:264
+msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/playerrelations.cpp:318
+#: src/playerrelations.cpp:414
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:334
+#: src/playerrelations.cpp:434
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:371
+#: src/playerrelations.cpp:478
 msgid "Floating '...' bubble"
 msgstr ""
 
-#: src/playerrelations.cpp:374
+#: src/playerrelations.cpp:481
 msgid "Floating bubble"
 msgstr ""
 
-#: src/resources/itemdb.cpp:52
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:245
+#: src/resources/monsterdb.cpp:84
+msgid "unnamed"
+msgstr ""
+
+#: src/resources/itemdb.cpp:62
 #, c-format
 msgid "Attack %+d"
 msgstr "Serangan %+d"
 
-#: src/resources/itemdb.cpp:53
+#: src/resources/itemdb.cpp:63
 #, c-format
 msgid "Defense %+d"
 msgstr "Pertahanan %+d"
 
-#: src/resources/itemdb.cpp:54
+#: src/resources/itemdb.cpp:64
 #, c-format
 msgid "HP %+d"
 msgstr "HP %+d"
 
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:65
 #, c-format
 msgid "MP %+d"
 msgstr "MP %+d"
 
-#: src/resources/itemdb.cpp:114
+#: src/resources/itemdb.cpp:168
 msgid "Unknown item"
 msgstr ""
 
-#: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
-#: src/resources/monsterdb.cpp:67
-msgid "unnamed"
-msgstr ""
-
-#~ msgid "Description: %s"
-#~ msgstr "Deskripsi: %s"
-
-#~ msgid "Previous"
-#~ msgstr "Sebelumnya"
-
-#~ msgid "New"
-#~ msgstr "Buat baru"
-
-#~ msgid "Ok"
-#~ msgstr "Ok"
-
-#~ msgid "@@attack|Attack %s@@"
-#~ msgstr "@@attack|Serang%s@@"
-
-#~ msgid "@@cancel|Cancel@@"
-#~ msgstr "@@cancel|Batal@@"
-
-#~ msgid "@@use|Equip@@"
-#~ msgstr "@@use|Melengkapi@@"
-
-#~ msgid "@@use|Use@@"
-#~ msgstr "@@use|Gunakan@@"
-
-#~ msgid "@@drop|Drop@@"
-#~ msgstr "@@drop|Buang@@"
-
-#~ msgid "@@split|Split@@"
-#~ msgstr "@@split|Pisah@@"
-
-#~ msgid "@@pickup|Pick Up %s@@"
-#~ msgstr "@@pickup|Ambil %s@@"
 
-#~ msgid "Scroll radius"
-#~ msgstr "Radius gulungan"
diff --git a/po/it.po b/po/it.po
index 2c8750b9a..608133e79 100644
--- a/po/it.po
+++ b/po/it.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-06-25 18:01+0300\n"
+"POT-Creation-Date: 2011-07-02 00:39+0300\n"
 "PO-Revision-Date: 2011-06-20 00:31+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Italian (http://www.transifex.net/projects/p/manaplus/team/"
@@ -32,88 +32,88 @@ msgstr "Schivato"
 msgid "miss"
 msgstr "Mancato"
 
-#: src/client.cpp:817 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
+#: src/client.cpp:821 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Impostazioni"
 
-#: src/client.cpp:896
+#: src/client.cpp:900
 msgid "Connecting to server"
 msgstr "Connessione al server"
 
-#: src/client.cpp:927
+#: src/client.cpp:931
 msgid "Logging in"
 msgstr "Accesso"
 
-#: src/client.cpp:960
+#: src/client.cpp:964
 msgid "Entering game world"
 msgstr "Accesso al gioco"
 
-#: src/client.cpp:1052
+#: src/client.cpp:1056
 msgid "Requesting characters"
 msgstr "Ricerca personaggi"
 
-#: src/client.cpp:1083
+#: src/client.cpp:1087
 msgid "Connecting to the game server"
 msgstr "Connessione al server del gioco"
 
-#: src/client.cpp:1093
+#: src/client.cpp:1097
 msgid "Changing game servers"
 msgstr "Cambiamento server del gioco"
 
-#: src/client.cpp:1130 src/client.cpp:1137 src/client.cpp:1274
+#: src/client.cpp:1134 src/client.cpp:1141 src/client.cpp:1278
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:391
+#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
 #: src/gui/unregisterdialog.cpp:137 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227 src/net/tmwa/charserverhandler.cpp:190
 #: src/net/tmwa/charserverhandler.cpp:206
 msgid "Error"
 msgstr "Errore"
 
-#: src/client.cpp:1146
+#: src/client.cpp:1150
 msgid "Requesting registration details"
 msgstr "Richiesta dettagli di registrazione"
 
-#: src/client.cpp:1173
+#: src/client.cpp:1177
 msgid "Password Change"
 msgstr "Cambiamento password"
 
-#: src/client.cpp:1174
+#: src/client.cpp:1178
 msgid "Password changed successfully!"
 msgstr "Password modificata con successo!"
 
-#: src/client.cpp:1193
+#: src/client.cpp:1197
 msgid "Email Change"
 msgstr "Cambio Email"
 
-#: src/client.cpp:1194
+#: src/client.cpp:1198
 msgid "Email changed successfully!"
 msgstr "Email cambiata con successo!"
 
-#: src/client.cpp:1214
+#: src/client.cpp:1218
 msgid "Unregister Successful"
 msgstr "Annullamento registrazione effettuato con successo"
 
-#: src/client.cpp:1215
+#: src/client.cpp:1219
 msgid "Farewell, come back any time..."
 msgstr "Addio, torna quando vuoi..."
 
-#: src/client.cpp:1404 src/client.cpp:1434 src/client.cpp:1478
-#: src/client.cpp:1894
+#: src/client.cpp:1408 src/client.cpp:1438 src/client.cpp:1482
+#: src/client.cpp:1898
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s non esiste e non può essere creato! Uscita in corso."
 
-#: src/client.cpp:1608
+#: src/client.cpp:1612
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Invalido aggiornamento host: %s"
 
-#: src/client.cpp:1642 src/client.cpp:1648
+#: src/client.cpp:1646 src/client.cpp:1652
 msgid "Error creating updates directory!"
 msgstr "Errore durante la creazione della directory degli aggiornamenti"
 
-#: src/client.cpp:1669
+#: src/client.cpp:1673
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Errore: %s non esiste e non può essere creato! Ucita in corso."
@@ -415,7 +415,7 @@ msgstr "-"
 
 #: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
 #: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
-#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:284
+#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:285
 #: src/keyboardconfig.cpp:287
 msgid "Quit"
 msgstr "Esci"
@@ -489,7 +489,7 @@ msgstr ""
 msgid "Change Password"
 msgstr "Cambia la Password"
 
-#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:94
+#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:95
 #: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56
 msgid "Password:"
 msgstr "Password:"
@@ -520,7 +520,7 @@ msgstr ""
 msgid "Create Character"
 msgstr "Crea Personaggio"
 
-#: src/gui/charcreatedialog.cpp:73 src/gui/logindialog.cpp:93
+#: src/gui/charcreatedialog.cpp:73 src/gui/logindialog.cpp:94
 #: src/gui/register.cpp:75
 msgid "Name:"
 msgstr "Nome:"
@@ -619,7 +619,7 @@ msgstr ""
 msgid "Enter password:"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:288
+#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
 #: src/gui/setup_players.cpp:251 src/gui/shopwindow.cpp:120
 #: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:240
 msgid "Delete"
@@ -1132,32 +1132,32 @@ msgstr "Chiusura automatica"
 msgid "Skip"
 msgstr "Salta"
 
-#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:122
+#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:123
 msgid "Login"
 msgstr "Autenticazione"
 
-#: src/gui/logindialog.cpp:90 src/gui/serverdialog.cpp:243
+#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:243
 #: src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr "Server:"
 
-#: src/gui/logindialog.cpp:95
+#: src/gui/logindialog.cpp:96
 msgid "Custom update host"
 msgstr "Aggiornamento host"
 
-#: src/gui/logindialog.cpp:109
+#: src/gui/logindialog.cpp:110
 msgid "Remember username"
 msgstr "Ricorda username"
 
-#: src/gui/logindialog.cpp:110
+#: src/gui/logindialog.cpp:111
 msgid "Update:"
 msgstr "Aggiornamento:"
 
-#: src/gui/logindialog.cpp:120 src/gui/register.cpp:66 src/gui/register.cpp:81
+#: src/gui/logindialog.cpp:121 src/gui/register.cpp:66 src/gui/register.cpp:81
 msgid "Register"
 msgstr "Registra"
 
-#: src/gui/logindialog.cpp:121
+#: src/gui/logindialog.cpp:122
 msgid "Change Server"
 msgstr "Cambia server"
 
@@ -1606,56 +1606,61 @@ msgstr "Le password non corrispondono."
 msgid "Choose Your Server"
 msgstr "Scegli il tuo server"
 
+#: src/gui/serverdialog.cpp:239
+#, fuzzy
+msgid "Choose Your Server  *** SAFE MODE ***"
+msgstr "Scegli il tuo server"
+
 #: src/gui/serverdialog.cpp:244
 msgid "Port:"
 msgstr "Porta:"
 
-#: src/gui/serverdialog.cpp:247
+#: src/gui/serverdialog.cpp:248
 msgid "Use same ip for game sub servers"
 msgstr "Utilizzare lo stesso IP per i sub server di gioco"
 
-#: src/gui/serverdialog.cpp:261
+#: src/gui/serverdialog.cpp:262
 msgid "Server type:"
 msgstr "Tipo di server:"
 
-#: src/gui/serverdialog.cpp:285
+#: src/gui/serverdialog.cpp:286
 msgid "Load"
 msgstr "Carica"
 
-#: src/gui/serverdialog.cpp:286
+#: src/gui/serverdialog.cpp:287
 msgid "Connect"
 msgstr "Connetti"
 
-#: src/gui/serverdialog.cpp:287
+#: src/gui/serverdialog.cpp:288
 msgid "Custom Server"
 msgstr "Server personalizzati"
 
-#: src/gui/serverdialog.cpp:392
+#: src/gui/serverdialog.cpp:393
 msgid "Please type both the address and the port of a server."
 msgstr "Inserire l'indirizzo e la porta del server."
 
-#: src/gui/serverdialog.cpp:550
+#: src/gui/serverdialog.cpp:551
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Downloading server list... %2.2f%%"
 
-#: src/gui/serverdialog.cpp:555
+#: src/gui/serverdialog.cpp:556
 msgid "Waiting for server..."
 msgstr "Attesa del server..."
 
-#: src/gui/serverdialog.cpp:559
+#: src/gui/serverdialog.cpp:560
 msgid "Preparing download"
 msgstr "Preparazione download"
 
-#: src/gui/serverdialog.cpp:563
+#: src/gui/serverdialog.cpp:564
 msgid "Error retreiving server list!"
 msgstr "Errore nel ricevimento della lista sei server!"
 
-#: src/gui/serverdialog.cpp:661
+#: src/gui/serverdialog.cpp:662
 msgid "requires a newer version"
 msgstr "Richiede una versione più nuova"
 
-#: src/gui/serverdialog.cpp:663
+#: src/gui/serverdialog.cpp:664
 #, c-format
 msgid "requires v%s"
 msgstr "Richiede v%s"
@@ -3963,64 +3968,64 @@ msgstr ""
 msgid "You were killed by "
 msgstr ""
 
-#: src/localplayer.cpp:1379
+#: src/localplayer.cpp:1375
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1381
+#: src/localplayer.cpp:1377
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1383
+#: src/localplayer.cpp:1379
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1385
+#: src/localplayer.cpp:1381
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1387
+#: src/localplayer.cpp:1383
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1390
+#: src/localplayer.cpp:1386
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1393
+#: src/localplayer.cpp:1389
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1417
+#: src/localplayer.cpp:1413
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/localplayer.cpp:3146
+#: src/localplayer.cpp:3142
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3450
+#: src/localplayer.cpp:3446
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3452 src/localplayer.cpp:3467
+#: src/localplayer.cpp:3448 src/localplayer.cpp:3463
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3459
+#: src/localplayer.cpp:3455
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3461 src/localplayer.cpp:3469
+#: src/localplayer.cpp:3457 src/localplayer.cpp:3465
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3821
+#: src/localplayer.cpp:3817
 msgid "You see "
 msgstr ""
 
@@ -4710,27 +4715,30 @@ msgstr ""
 msgid "M.Defense"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:268
+#: src/net/tmwa/generalhandler.cpp:269
+#, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:269
+#: src/net/tmwa/generalhandler.cpp:271
+#, no-c-format
 msgid "% Evade"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:270
+#: src/net/tmwa/generalhandler.cpp:273
+#, no-c-format
 msgid "% Critical"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:271
+#: src/net/tmwa/generalhandler.cpp:274
 msgid "Attack Delay"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:273
+#: src/net/tmwa/generalhandler.cpp:276
 msgid "Walk Delay"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:275
+#: src/net/tmwa/generalhandler.cpp:278
 msgid "Attack Range"
 msgstr ""
 
diff --git a/po/manaplus.pot b/po/manaplus.pot
index 3cd91bc4c..0ffc7acd8 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: 2011-06-25 18:01+0300\n"
+"POT-Creation-Date: 2011-07-02 00:39+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"
@@ -30,88 +30,88 @@ msgstr ""
 msgid "miss"
 msgstr ""
 
-#: src/client.cpp:817 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
+#: src/client.cpp:821 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr ""
 
-#: src/client.cpp:896
+#: src/client.cpp:900
 msgid "Connecting to server"
 msgstr ""
 
-#: src/client.cpp:927
+#: src/client.cpp:931
 msgid "Logging in"
 msgstr ""
 
-#: src/client.cpp:960
+#: src/client.cpp:964
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1052
+#: src/client.cpp:1056
 msgid "Requesting characters"
 msgstr ""
 
-#: src/client.cpp:1083
+#: src/client.cpp:1087
 msgid "Connecting to the game server"
 msgstr ""
 
-#: src/client.cpp:1093
+#: src/client.cpp:1097
 msgid "Changing game servers"
 msgstr ""
 
-#: src/client.cpp:1130 src/client.cpp:1137 src/client.cpp:1274
+#: src/client.cpp:1134 src/client.cpp:1141 src/client.cpp:1278
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:391
+#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
 #: src/gui/unregisterdialog.cpp:137 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227 src/net/tmwa/charserverhandler.cpp:190
 #: src/net/tmwa/charserverhandler.cpp:206
 msgid "Error"
 msgstr ""
 
-#: src/client.cpp:1146
+#: src/client.cpp:1150
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1173
+#: src/client.cpp:1177
 msgid "Password Change"
 msgstr ""
 
-#: src/client.cpp:1174
+#: src/client.cpp:1178
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1193
+#: src/client.cpp:1197
 msgid "Email Change"
 msgstr ""
 
-#: src/client.cpp:1194
+#: src/client.cpp:1198
 msgid "Email changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1214
+#: src/client.cpp:1218
 msgid "Unregister Successful"
 msgstr ""
 
-#: src/client.cpp:1215
+#: src/client.cpp:1219
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1404 src/client.cpp:1434 src/client.cpp:1478
-#: src/client.cpp:1894
+#: src/client.cpp:1408 src/client.cpp:1438 src/client.cpp:1482
+#: src/client.cpp:1898
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1608
+#: src/client.cpp:1612
 #, c-format
 msgid "Invalid update host: %s"
 msgstr ""
 
-#: src/client.cpp:1642 src/client.cpp:1648
+#: src/client.cpp:1646 src/client.cpp:1652
 msgid "Error creating updates directory!"
 msgstr ""
 
-#: src/client.cpp:1669
+#: src/client.cpp:1673
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -409,7 +409,7 @@ msgstr ""
 
 #: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
 #: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
-#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:284
+#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:285
 #: src/keyboardconfig.cpp:287
 msgid "Quit"
 msgstr ""
@@ -483,7 +483,7 @@ msgstr ""
 msgid "Change Password"
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:94
+#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:95
 #: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56
 msgid "Password:"
 msgstr ""
@@ -514,7 +514,7 @@ msgstr ""
 msgid "Create Character"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:73 src/gui/logindialog.cpp:93
+#: src/gui/charcreatedialog.cpp:73 src/gui/logindialog.cpp:94
 #: src/gui/register.cpp:75
 msgid "Name:"
 msgstr ""
@@ -613,7 +613,7 @@ msgstr ""
 msgid "Enter password:"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:288
+#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
 #: src/gui/setup_players.cpp:251 src/gui/shopwindow.cpp:120
 #: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:240
 msgid "Delete"
@@ -1126,32 +1126,32 @@ msgstr ""
 msgid "Skip"
 msgstr ""
 
-#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:122
+#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:123
 msgid "Login"
 msgstr ""
 
-#: src/gui/logindialog.cpp:90 src/gui/serverdialog.cpp:243
+#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:243
 #: src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr ""
 
-#: src/gui/logindialog.cpp:95
+#: src/gui/logindialog.cpp:96
 msgid "Custom update host"
 msgstr ""
 
-#: src/gui/logindialog.cpp:109
+#: src/gui/logindialog.cpp:110
 msgid "Remember username"
 msgstr ""
 
-#: src/gui/logindialog.cpp:110
+#: src/gui/logindialog.cpp:111
 msgid "Update:"
 msgstr ""
 
-#: src/gui/logindialog.cpp:120 src/gui/register.cpp:66 src/gui/register.cpp:81
+#: src/gui/logindialog.cpp:121 src/gui/register.cpp:66 src/gui/register.cpp:81
 msgid "Register"
 msgstr ""
 
-#: src/gui/logindialog.cpp:121
+#: src/gui/logindialog.cpp:122
 msgid "Change Server"
 msgstr ""
 
@@ -1600,56 +1600,60 @@ msgstr ""
 msgid "Choose Your Server"
 msgstr ""
 
+#: src/gui/serverdialog.cpp:239
+msgid "Choose Your Server  *** SAFE MODE ***"
+msgstr ""
+
 #: src/gui/serverdialog.cpp:244
 msgid "Port:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:247
+#: src/gui/serverdialog.cpp:248
 msgid "Use same ip for game sub servers"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:261
+#: src/gui/serverdialog.cpp:262
 msgid "Server type:"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:285
+#: src/gui/serverdialog.cpp:286
 msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:286
+#: src/gui/serverdialog.cpp:287
 msgid "Connect"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:287
+#: src/gui/serverdialog.cpp:288
 msgid "Custom Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:392
+#: src/gui/serverdialog.cpp:393
 msgid "Please type both the address and the port of a server."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:550
+#: src/gui/serverdialog.cpp:551
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:555
+#: src/gui/serverdialog.cpp:556
 msgid "Waiting for server..."
 msgstr ""
 
-#: src/gui/serverdialog.cpp:559
+#: src/gui/serverdialog.cpp:560
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:563
+#: src/gui/serverdialog.cpp:564
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:661
+#: src/gui/serverdialog.cpp:662
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:663
+#: src/gui/serverdialog.cpp:664
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -3951,64 +3955,64 @@ msgstr ""
 msgid "You were killed by "
 msgstr ""
 
-#: src/localplayer.cpp:1379
+#: src/localplayer.cpp:1375
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1381
+#: src/localplayer.cpp:1377
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1383
+#: src/localplayer.cpp:1379
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1385
+#: src/localplayer.cpp:1381
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1387
+#: src/localplayer.cpp:1383
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1390
+#: src/localplayer.cpp:1386
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1393
+#: src/localplayer.cpp:1389
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1417
+#: src/localplayer.cpp:1413
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/localplayer.cpp:3146
+#: src/localplayer.cpp:3142
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3450
+#: src/localplayer.cpp:3446
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3452 src/localplayer.cpp:3467
+#: src/localplayer.cpp:3448 src/localplayer.cpp:3463
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3459
+#: src/localplayer.cpp:3455
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3461 src/localplayer.cpp:3469
+#: src/localplayer.cpp:3457 src/localplayer.cpp:3465
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3821
+#: src/localplayer.cpp:3817
 msgid "You see "
 msgstr ""
 
@@ -4691,27 +4695,30 @@ msgstr ""
 msgid "M.Defense"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:268
+#: src/net/tmwa/generalhandler.cpp:269
+#, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:269
+#: src/net/tmwa/generalhandler.cpp:271
+#, no-c-format
 msgid "% Evade"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:270
+#: src/net/tmwa/generalhandler.cpp:273
+#, no-c-format
 msgid "% Critical"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:271
+#: src/net/tmwa/generalhandler.cpp:274
 msgid "Attack Delay"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:273
+#: src/net/tmwa/generalhandler.cpp:276
 msgid "Walk Delay"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:275
+#: src/net/tmwa/generalhandler.cpp:278
 msgid "Attack Range"
 msgstr ""
 
diff --git a/po/nl.po b/po/nl.po
index 2193ab2bf..f7d0660e0 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-06-25 18:01+0300\n"
+"POT-Creation-Date: 2011-07-02 00:39+0300\n"
 "PO-Revision-Date: 2009-07-15 12:21+0000\n"
 "Last-Translator: Yentl <y.v.t@scarlet.be>\n"
 "Language-Team: Dutch\n"
@@ -32,97 +32,97 @@ msgstr ""
 msgid "miss"
 msgstr ""
 
-#: src/client.cpp:817 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
+#: src/client.cpp:821 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Configureren"
 
-#: src/client.cpp:896
+#: src/client.cpp:900
 #, fuzzy
 msgid "Connecting to server"
 msgstr "Verbinden met de map server..."
 
-#: src/client.cpp:927
+#: src/client.cpp:931
 #, fuzzy
 msgid "Logging in"
 msgstr "Inloggen"
 
-#: src/client.cpp:960
+#: src/client.cpp:964
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1052
+#: src/client.cpp:1056
 #, fuzzy
 msgid "Requesting characters"
 msgstr "Kies Personage"
 
-#: src/client.cpp:1083
+#: src/client.cpp:1087
 #, fuzzy
 msgid "Connecting to the game server"
 msgstr "Verbinden met de map server..."
 
-#: src/client.cpp:1093
+#: src/client.cpp:1097
 #, fuzzy
 msgid "Changing game servers"
 msgstr "Server"
 
-#: src/client.cpp:1130 src/client.cpp:1137 src/client.cpp:1274
+#: src/client.cpp:1134 src/client.cpp:1141 src/client.cpp:1278
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:391
+#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
 #: src/gui/unregisterdialog.cpp:137 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227 src/net/tmwa/charserverhandler.cpp:190
 #: src/net/tmwa/charserverhandler.cpp:206
 msgid "Error"
 msgstr "Fout"
 
-#: src/client.cpp:1146
+#: src/client.cpp:1150
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1173
+#: src/client.cpp:1177
 #, fuzzy
 msgid "Password Change"
 msgstr "Wachtwoord:"
 
-#: src/client.cpp:1174
+#: src/client.cpp:1178
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1193
+#: src/client.cpp:1197
 #, fuzzy
 msgid "Email Change"
 msgstr "Veranderen"
 
-#: src/client.cpp:1194
+#: src/client.cpp:1198
 #, fuzzy
 msgid "Email changed successfully!"
 msgstr "Lid is succesvol gepromoveerd."
 
-#: src/client.cpp:1214
+#: src/client.cpp:1218
 #, fuzzy
 msgid "Unregister Successful"
 msgstr "Registreren"
 
-#: src/client.cpp:1215
+#: src/client.cpp:1219
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1404 src/client.cpp:1434 src/client.cpp:1478
-#: src/client.cpp:1894
+#: src/client.cpp:1408 src/client.cpp:1438 src/client.cpp:1482
+#: src/client.cpp:1898
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1608
+#: src/client.cpp:1612
 #, fuzzy, c-format
 msgid "Invalid update host: %s"
 msgstr "Ongeldige updatahost: "
 
-#: src/client.cpp:1642 src/client.cpp:1648
+#: src/client.cpp:1646 src/client.cpp:1652
 msgid "Error creating updates directory!"
 msgstr "Fout bij het creëren van de update map!"
 
-#: src/client.cpp:1669
+#: src/client.cpp:1673
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -439,7 +439,7 @@ msgstr ""
 
 #: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
 #: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
-#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:284
+#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:285
 #: src/keyboardconfig.cpp:287
 msgid "Quit"
 msgstr "Afsluiten"
@@ -515,7 +515,7 @@ msgstr "Het nieuwe emailadres bestaat al."
 msgid "Change Password"
 msgstr "Wijzig wachtwoord"
 
-#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:94
+#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:95
 #: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56
 msgid "Password:"
 msgstr "Wachtwoord:"
@@ -547,7 +547,7 @@ msgstr ""
 msgid "Create Character"
 msgstr "Personage Aanmaken"
 
-#: src/gui/charcreatedialog.cpp:73 src/gui/logindialog.cpp:93
+#: src/gui/charcreatedialog.cpp:73 src/gui/logindialog.cpp:94
 #: src/gui/register.cpp:75
 msgid "Name:"
 msgstr "Naam:"
@@ -652,7 +652,7 @@ msgstr "Kon personage niet verwijderen."
 msgid "Enter password:"
 msgstr "Onjuist wachtwoord"
 
-#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:288
+#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
 #: src/gui/setup_players.cpp:251 src/gui/shopwindow.cpp:120
 #: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:240
 msgid "Delete"
@@ -1204,33 +1204,33 @@ msgstr "Sluiten"
 msgid "Skip"
 msgstr ""
 
-#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:122
+#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:123
 msgid "Login"
 msgstr "Inloggen"
 
-#: src/gui/logindialog.cpp:90 src/gui/serverdialog.cpp:243
+#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:243
 #: src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr "Server:"
 
-#: src/gui/logindialog.cpp:95
+#: src/gui/logindialog.cpp:96
 msgid "Custom update host"
 msgstr ""
 
-#: src/gui/logindialog.cpp:109
+#: src/gui/logindialog.cpp:110
 #, fuzzy
 msgid "Remember username"
 msgstr "Onthoud Naam"
 
-#: src/gui/logindialog.cpp:110
+#: src/gui/logindialog.cpp:111
 msgid "Update:"
 msgstr ""
 
-#: src/gui/logindialog.cpp:120 src/gui/register.cpp:66 src/gui/register.cpp:81
+#: src/gui/logindialog.cpp:121 src/gui/register.cpp:66 src/gui/register.cpp:81
 msgid "Register"
 msgstr "Aanmelden"
 
-#: src/gui/logindialog.cpp:121
+#: src/gui/logindialog.cpp:122
 #, fuzzy
 msgid "Change Server"
 msgstr "Server"
@@ -1727,60 +1727,65 @@ msgstr "Wachtwoorden komen niet overeen."
 msgid "Choose Your Server"
 msgstr "Kies jouw server"
 
+#: src/gui/serverdialog.cpp:239
+#, fuzzy
+msgid "Choose Your Server  *** SAFE MODE ***"
+msgstr "Kies jouw server"
+
 #: src/gui/serverdialog.cpp:244
 msgid "Port:"
 msgstr "Poort:"
 
-#: src/gui/serverdialog.cpp:247
+#: src/gui/serverdialog.cpp:248
 msgid "Use same ip for game sub servers"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:261
+#: src/gui/serverdialog.cpp:262
 #, fuzzy
 msgid "Server type:"
 msgstr "Server:"
 
-#: src/gui/serverdialog.cpp:285
+#: src/gui/serverdialog.cpp:286
 msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:286
+#: src/gui/serverdialog.cpp:287
 #, fuzzy
 msgid "Connect"
 msgstr "Verbinden..."
 
-#: src/gui/serverdialog.cpp:287
+#: src/gui/serverdialog.cpp:288
 #, fuzzy
 msgid "Custom Server"
 msgstr "Aangepaste cursor"
 
-#: src/gui/serverdialog.cpp:392
+#: src/gui/serverdialog.cpp:393
 msgid "Please type both the address and the port of a server."
 msgstr "Typ aub zowel het adres van de server, als de poort."
 
-#: src/gui/serverdialog.cpp:550
+#: src/gui/serverdialog.cpp:551
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:555
+#: src/gui/serverdialog.cpp:556
 #, fuzzy
 msgid "Waiting for server..."
 msgstr "Wachten op server"
 
-#: src/gui/serverdialog.cpp:559
+#: src/gui/serverdialog.cpp:560
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:563
+#: src/gui/serverdialog.cpp:564
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:661
+#: src/gui/serverdialog.cpp:662
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:663
+#: src/gui/serverdialog.cpp:664
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -4230,70 +4235,70 @@ msgstr "Los deze problemen op, of het spel kan raar gedrag vertonen."
 msgid "You were killed by "
 msgstr ""
 
-#: src/localplayer.cpp:1379
+#: src/localplayer.cpp:1375
 #, fuzzy
 msgid "Tried to pick up nonexistent item."
 msgstr "Kan het voorwerp niet oprapen."
 
-#: src/localplayer.cpp:1381
+#: src/localplayer.cpp:1377
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1383
+#: src/localplayer.cpp:1379
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1385
+#: src/localplayer.cpp:1381
 #, fuzzy
 msgid "Inventory is full."
 msgstr "Server is volzet"
 
-#: src/localplayer.cpp:1387
+#: src/localplayer.cpp:1383
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1390
+#: src/localplayer.cpp:1386
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1393
+#: src/localplayer.cpp:1389
 #, fuzzy
 msgid "Unknown problem picking up item."
 msgstr "Kan het voorwerp niet oprapen."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1417
+#: src/localplayer.cpp:1413
 #, fuzzy, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "Je raapte %s [@@%d|%s@@] op."
 msgstr[1] "Je raapte %s [@@%d|%s@@] op."
 
-#: src/localplayer.cpp:3146
+#: src/localplayer.cpp:3142
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3450
+#: src/localplayer.cpp:3446
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3452 src/localplayer.cpp:3467
+#: src/localplayer.cpp:3448 src/localplayer.cpp:3463
 #, fuzzy
 msgid "Follow canceled"
 msgstr "Handel geannuleerd."
 
-#: src/localplayer.cpp:3459
+#: src/localplayer.cpp:3455
 #, fuzzy
 msgid "Imitation: "
 msgstr "Emailadres wijzigen"
 
-#: src/localplayer.cpp:3461 src/localplayer.cpp:3469
+#: src/localplayer.cpp:3457 src/localplayer.cpp:3465
 #, fuzzy
 msgid "Imitation canceled"
 msgstr "Handel geannuleerd."
 
-#: src/localplayer.cpp:3821
+#: src/localplayer.cpp:3817
 #, fuzzy
 msgid "You see "
 msgstr "Jij krijgt %s."
@@ -5048,32 +5053,32 @@ msgstr "Magische Aanval:"
 msgid "M.Defense"
 msgstr "Magische Verdediging:"
 
-#: src/net/tmwa/generalhandler.cpp:268
-#, fuzzy
+#: src/net/tmwa/generalhandler.cpp:269
+#, fuzzy, no-c-format
 msgid "% Accuracy"
 msgstr "% Nauwkeurigheid:"
 
-#: src/net/tmwa/generalhandler.cpp:269
-#, fuzzy
+#: src/net/tmwa/generalhandler.cpp:271
+#, fuzzy, no-c-format
 msgid "% Evade"
 msgstr "% Ontwijking:"
 
-#: src/net/tmwa/generalhandler.cpp:270
-#, fuzzy
+#: src/net/tmwa/generalhandler.cpp:273
+#, fuzzy, no-c-format
 msgid "% Critical"
 msgstr "Kritieke aanval"
 
-#: src/net/tmwa/generalhandler.cpp:271
+#: src/net/tmwa/generalhandler.cpp:274
 #, fuzzy
 msgid "Attack Delay"
 msgstr "Aanval %+d"
 
-#: src/net/tmwa/generalhandler.cpp:273
+#: src/net/tmwa/generalhandler.cpp:276
 #, fuzzy
 msgid "Walk Delay"
 msgstr "Aanval %+d"
 
-#: src/net/tmwa/generalhandler.cpp:275
+#: src/net/tmwa/generalhandler.cpp:278
 #, fuzzy
 msgid "Attack Range"
 msgstr "Monster raakt Speler"
diff --git a/po/nl_BE.po b/po/nl_BE.po
index c4e7c04a7..6f956a456 100644
--- a/po/nl_BE.po
+++ b/po/nl_BE.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-06-25 18:01+0300\n"
+"POT-Creation-Date: 2011-07-02 00:39+0300\n"
 "PO-Revision-Date: 2011-06-20 00:31+0000\n"
 "Last-Translator: akaras <akaras@inbox.ru>\n"
 "Language-Team: Dutch (Belgium/Flemish) (http://www.transifex.net/projects/p/"
@@ -31,88 +31,88 @@ msgstr "ontwijkt"
 msgid "miss"
 msgstr "mist"
 
-#: src/client.cpp:817 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
+#: src/client.cpp:821 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Configureren"
 
-#: src/client.cpp:896
+#: src/client.cpp:900
 msgid "Connecting to server"
 msgstr "Verbinden met server"
 
-#: src/client.cpp:927
+#: src/client.cpp:931
 msgid "Logging in"
 msgstr "Inloggen"
 
-#: src/client.cpp:960
+#: src/client.cpp:964
 msgid "Entering game world"
 msgstr "Spelwereld binnenkomen"
 
-#: src/client.cpp:1052
+#: src/client.cpp:1056
 msgid "Requesting characters"
 msgstr "Aanvragen personage"
 
-#: src/client.cpp:1083
+#: src/client.cpp:1087
 msgid "Connecting to the game server"
 msgstr "Verbinden met de spelserver"
 
-#: src/client.cpp:1093
+#: src/client.cpp:1097
 msgid "Changing game servers"
 msgstr "Wijzigen spelservers"
 
-#: src/client.cpp:1130 src/client.cpp:1137 src/client.cpp:1274
+#: src/client.cpp:1134 src/client.cpp:1141 src/client.cpp:1278
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:391
+#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
 #: src/gui/unregisterdialog.cpp:137 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227 src/net/tmwa/charserverhandler.cpp:190
 #: src/net/tmwa/charserverhandler.cpp:206
 msgid "Error"
 msgstr "Fout"
 
-#: src/client.cpp:1146
+#: src/client.cpp:1150
 msgid "Requesting registration details"
 msgstr "Aanvragen registratie details"
 
-#: src/client.cpp:1173
+#: src/client.cpp:1177
 msgid "Password Change"
 msgstr "Paswoord Wijziging"
 
-#: src/client.cpp:1174
+#: src/client.cpp:1178
 msgid "Password changed successfully!"
 msgstr "Paswoord is gewijzigd!"
 
-#: src/client.cpp:1193
+#: src/client.cpp:1197
 msgid "Email Change"
 msgstr "Email Wijziging"
 
-#: src/client.cpp:1194
+#: src/client.cpp:1198
 msgid "Email changed successfully!"
 msgstr "Email is gewijzigd!"
 
-#: src/client.cpp:1214
+#: src/client.cpp:1218
 msgid "Unregister Successful"
 msgstr "Registratie ongedaan gemaakt!"
 
-#: src/client.cpp:1215
+#: src/client.cpp:1219
 msgid "Farewell, come back any time..."
 msgstr "Tot ziens..."
 
-#: src/client.cpp:1404 src/client.cpp:1434 src/client.cpp:1478
-#: src/client.cpp:1894
+#: src/client.cpp:1408 src/client.cpp:1438 src/client.cpp:1482
+#: src/client.cpp:1898
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s bestaat niet en kan niet gecreëerd worden! Stoppen."
 
-#: src/client.cpp:1608
+#: src/client.cpp:1612
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Ongeldige update host %s"
 
-#: src/client.cpp:1642 src/client.cpp:1648
+#: src/client.cpp:1646 src/client.cpp:1652
 msgid "Error creating updates directory!"
 msgstr "Fout bij het creëren van de update map!"
 
-#: src/client.cpp:1669
+#: src/client.cpp:1673
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Fout: %s bestaat niet en kan niet gecreëerd worden! Stoppen."
@@ -413,7 +413,7 @@ msgstr "-"
 
 #: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
 #: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
-#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:284
+#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:285
 #: src/keyboardconfig.cpp:287
 msgid "Quit"
 msgstr "Afsluiten"
@@ -487,7 +487,7 @@ msgstr "De email adres ingaven zijn niet gelijk."
 msgid "Change Password"
 msgstr "Wijzig wachtwoord"
 
-#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:94
+#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:95
 #: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56
 msgid "Password:"
 msgstr "Wachtwoord:"
@@ -518,7 +518,7 @@ msgstr "De nieuwe paswoord ingaven zijn niet gelijk."
 msgid "Create Character"
 msgstr "Personage Aanmaken"
 
-#: src/gui/charcreatedialog.cpp:73 src/gui/logindialog.cpp:93
+#: src/gui/charcreatedialog.cpp:73 src/gui/logindialog.cpp:94
 #: src/gui/register.cpp:75
 msgid "Name:"
 msgstr "Naam:"
@@ -617,7 +617,7 @@ msgstr ""
 msgid "Enter password:"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:288
+#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
 #: src/gui/setup_players.cpp:251 src/gui/shopwindow.cpp:120
 #: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:240
 msgid "Delete"
@@ -1130,32 +1130,32 @@ msgstr "Auto Sluiten"
 msgid "Skip"
 msgstr "Overslaan"
 
-#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:122
+#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:123
 msgid "Login"
 msgstr "Inloggen"
 
-#: src/gui/logindialog.cpp:90 src/gui/serverdialog.cpp:243
+#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:243
 #: src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr "Server:"
 
-#: src/gui/logindialog.cpp:95
+#: src/gui/logindialog.cpp:96
 msgid "Custom update host"
 msgstr "Manuele update server"
 
-#: src/gui/logindialog.cpp:109
+#: src/gui/logindialog.cpp:110
 msgid "Remember username"
 msgstr "Onthoud gebruikersnaam"
 
-#: src/gui/logindialog.cpp:110
+#: src/gui/logindialog.cpp:111
 msgid "Update:"
 msgstr "Update:"
 
-#: src/gui/logindialog.cpp:120 src/gui/register.cpp:66 src/gui/register.cpp:81
+#: src/gui/logindialog.cpp:121 src/gui/register.cpp:66 src/gui/register.cpp:81
 msgid "Register"
 msgstr "Aanmelden"
 
-#: src/gui/logindialog.cpp:121
+#: src/gui/logindialog.cpp:122
 msgid "Change Server"
 msgstr "Wijzig Server"
 
@@ -1604,56 +1604,61 @@ msgstr "Wachtwoorden komen niet overeen."
 msgid "Choose Your Server"
 msgstr "Kies Uw Server"
 
+#: src/gui/serverdialog.cpp:239
+#, fuzzy
+msgid "Choose Your Server  *** SAFE MODE ***"
+msgstr "Kies Uw Server"
+
 #: src/gui/serverdialog.cpp:244
 msgid "Port:"
 msgstr "Poort:"
 
-#: src/gui/serverdialog.cpp:247
+#: src/gui/serverdialog.cpp:248
 msgid "Use same ip for game sub servers"
 msgstr "Gebruik hetzelfde ip voor spel sub-servers"
 
-#: src/gui/serverdialog.cpp:261
+#: src/gui/serverdialog.cpp:262
 msgid "Server type:"
 msgstr "Server type:"
 
-#: src/gui/serverdialog.cpp:285
+#: src/gui/serverdialog.cpp:286
 msgid "Load"
 msgstr "Laden"
 
-#: src/gui/serverdialog.cpp:286
+#: src/gui/serverdialog.cpp:287
 msgid "Connect"
 msgstr "Verbinden"
 
-#: src/gui/serverdialog.cpp:287
+#: src/gui/serverdialog.cpp:288
 msgid "Custom Server"
 msgstr "Manuele Server"
 
-#: src/gui/serverdialog.cpp:392
+#: src/gui/serverdialog.cpp:393
 msgid "Please type both the address and the port of a server."
 msgstr "Typ aub zowel het adres van de server, als de poort."
 
-#: src/gui/serverdialog.cpp:550
+#: src/gui/serverdialog.cpp:551
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Downloaden van server lijst...%2.2f%%"
 
-#: src/gui/serverdialog.cpp:555
+#: src/gui/serverdialog.cpp:556
 msgid "Waiting for server..."
 msgstr "Wachten op server..."
 
-#: src/gui/serverdialog.cpp:559
+#: src/gui/serverdialog.cpp:560
 msgid "Preparing download"
 msgstr "Download voorbereiden"
 
-#: src/gui/serverdialog.cpp:563
+#: src/gui/serverdialog.cpp:564
 msgid "Error retreiving server list!"
 msgstr "Fout tijdens ophalen server lijst"
 
-#: src/gui/serverdialog.cpp:661
+#: src/gui/serverdialog.cpp:662
 msgid "requires a newer version"
 msgstr "vereist een nieuwere versie"
 
-#: src/gui/serverdialog.cpp:663
+#: src/gui/serverdialog.cpp:664
 #, c-format
 msgid "requires v%s"
 msgstr "vereist v%s"
@@ -3967,64 +3972,64 @@ msgstr ""
 msgid "You were killed by "
 msgstr ""
 
-#: src/localplayer.cpp:1379
+#: src/localplayer.cpp:1375
 msgid "Tried to pick up nonexistent item."
 msgstr "Geprobeerd een nietbestaand voorwerp op te rapen."
 
-#: src/localplayer.cpp:1381
+#: src/localplayer.cpp:1377
 msgid "Item is too heavy."
 msgstr "Voorwerp is te zwaar."
 
-#: src/localplayer.cpp:1383
+#: src/localplayer.cpp:1379
 msgid "Item is too far away."
 msgstr "Voorwerp is te ver weg."
 
-#: src/localplayer.cpp:1385
+#: src/localplayer.cpp:1381
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1387
+#: src/localplayer.cpp:1383
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1390
+#: src/localplayer.cpp:1386
 msgid "Item belongs to someone else."
 msgstr "Voorwerp behoort bij iemand anders."
 
-#: src/localplayer.cpp:1393
+#: src/localplayer.cpp:1389
 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:1417
+#: src/localplayer.cpp:1413
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] ""
 msgstr[1] ""
 
-#: src/localplayer.cpp:3146
+#: src/localplayer.cpp:3142
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3450
+#: src/localplayer.cpp:3446
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3452 src/localplayer.cpp:3467
+#: src/localplayer.cpp:3448 src/localplayer.cpp:3463
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3459
+#: src/localplayer.cpp:3455
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3461 src/localplayer.cpp:3469
+#: src/localplayer.cpp:3457 src/localplayer.cpp:3465
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3821
+#: src/localplayer.cpp:3817
 msgid "You see "
 msgstr ""
 
@@ -4714,27 +4719,30 @@ msgstr ""
 msgid "M.Defense"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:268
+#: src/net/tmwa/generalhandler.cpp:269
+#, no-c-format
 msgid "% Accuracy"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:269
+#: src/net/tmwa/generalhandler.cpp:271
+#, no-c-format
 msgid "% Evade"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:270
+#: src/net/tmwa/generalhandler.cpp:273
+#, no-c-format
 msgid "% Critical"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:271
+#: src/net/tmwa/generalhandler.cpp:274
 msgid "Attack Delay"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:273
+#: src/net/tmwa/generalhandler.cpp:276
 msgid "Walk Delay"
 msgstr ""
 
-#: src/net/tmwa/generalhandler.cpp:275
+#: src/net/tmwa/generalhandler.cpp:278
 msgid "Attack Range"
 msgstr ""
 
diff --git a/po/pl.po b/po/pl.po
index 3444044d6..a23f98caf 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: The Mana World 0.1.0\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-06-25 18:01+0300\n"
+"POT-Creation-Date: 2011-07-02 00:39+0300\n"
 "PO-Revision-Date: 2009-09-14 06:59+0000\n"
 "Last-Translator: Maciej Benke <syngress_stc@vp.pl>\n"
 "Language-Team: <pl@li.org>\n"
@@ -35,97 +35,97 @@ msgstr ""
 msgid "miss"
 msgstr ""
 
-#: src/client.cpp:817 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
+#: src/client.cpp:821 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Konfiguracja"
 
-#: src/client.cpp:896
+#: src/client.cpp:900
 #, fuzzy
 msgid "Connecting to server"
 msgstr "Łączenie z serwerem map..."
 
-#: src/client.cpp:927
+#: src/client.cpp:931
 #, fuzzy
 msgid "Logging in"
 msgstr "Użytkownik"
 
-#: src/client.cpp:960
+#: src/client.cpp:964
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1052
+#: src/client.cpp:1056
 #, fuzzy
 msgid "Requesting characters"
 msgstr "Wybierz postać"
 
-#: src/client.cpp:1083
+#: src/client.cpp:1087
 #, fuzzy
 msgid "Connecting to the game server"
 msgstr "Łączenie z serwerem map..."
 
-#: src/client.cpp:1093
+#: src/client.cpp:1097
 #, fuzzy
 msgid "Changing game servers"
 msgstr "Serwer"
 
-#: src/client.cpp:1130 src/client.cpp:1137 src/client.cpp:1274
+#: src/client.cpp:1134 src/client.cpp:1141 src/client.cpp:1278
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:391
+#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
 #: src/gui/unregisterdialog.cpp:137 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227 src/net/tmwa/charserverhandler.cpp:190
 #: src/net/tmwa/charserverhandler.cpp:206
 msgid "Error"
 msgstr "Błąd"
 
-#: src/client.cpp:1146
+#: src/client.cpp:1150
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1173
+#: src/client.cpp:1177
 #, fuzzy
 msgid "Password Change"
 msgstr "Hasło:"
 
-#: src/client.cpp:1174
+#: src/client.cpp:1178
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1193
+#: src/client.cpp:1197
 #, fuzzy
 msgid "Email Change"
 msgstr "Zmień"
 
-#: src/client.cpp:1194
+#: src/client.cpp:1198
 #, fuzzy
 msgid "Email changed successfully!"
 msgstr "Członek został pomyślnie wypromowany."
 
-#: src/client.cpp:1214
+#: src/client.cpp:1218
 #, fuzzy
 msgid "Unregister Successful"
 msgstr "Wyrejestruj"
 
-#: src/client.cpp:1215
+#: src/client.cpp:1219
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1404 src/client.cpp:1434 src/client.cpp:1478
-#: src/client.cpp:1894
+#: src/client.cpp:1408 src/client.cpp:1438 src/client.cpp:1482
+#: src/client.cpp:1898
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1608
+#: src/client.cpp:1612
 #, fuzzy, c-format
 msgid "Invalid update host: %s"
 msgstr "Nieprawidłowy host aktualizacji: "
 
-#: src/client.cpp:1642 src/client.cpp:1648
+#: src/client.cpp:1646 src/client.cpp:1652
 msgid "Error creating updates directory!"
 msgstr "Błąd podczas tworzenia katalogu aktualizacji!"
 
-#: src/client.cpp:1669
+#: src/client.cpp:1673
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -447,7 +447,7 @@ msgstr ""
 
 #: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
 #: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
-#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:284
+#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:285
 #: src/keyboardconfig.cpp:287
 msgid "Quit"
 msgstr "Wyjdź"
@@ -523,7 +523,7 @@ msgstr "Nowy Adres Email już istnieje"
 msgid "Change Password"
 msgstr "Zmień hasło"
 
-#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:94
+#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:95
 #: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56
 msgid "Password:"
 msgstr "Hasło:"
@@ -555,7 +555,7 @@ msgstr ""
 msgid "Create Character"
 msgstr "Stwórz postać"
 
-#: src/gui/charcreatedialog.cpp:73 src/gui/logindialog.cpp:93
+#: src/gui/charcreatedialog.cpp:73 src/gui/logindialog.cpp:94
 #: src/gui/register.cpp:75
 msgid "Name:"
 msgstr "Imię:"
@@ -660,7 +660,7 @@ msgstr "Usunięcie gracza nie powiodło się."
 msgid "Enter password:"
 msgstr "Nieprawidłowe hasło"
 
-#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:288
+#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
 #: src/gui/setup_players.cpp:251 src/gui/shopwindow.cpp:120
 #: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:240
 msgid "Delete"
@@ -1213,33 +1213,33 @@ msgstr "Zamknij"
 msgid "Skip"
 msgstr ""
 
-#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:122
+#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:123
 msgid "Login"
 msgstr "Użytkownik"
 
-#: src/gui/logindialog.cpp:90 src/gui/serverdialog.cpp:243
+#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:243
 #: src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr "Serwer:"
 
-#: src/gui/logindialog.cpp:95
+#: src/gui/logindialog.cpp:96
 msgid "Custom update host"
 msgstr ""
 
-#: src/gui/logindialog.cpp:109
+#: src/gui/logindialog.cpp:110
 #, fuzzy
 msgid "Remember username"
 msgstr "Zapamiętaj użytkownika"
 
-#: src/gui/logindialog.cpp:110
+#: src/gui/logindialog.cpp:111
 msgid "Update:"
 msgstr ""
 
-#: src/gui/logindialog.cpp:120 src/gui/register.cpp:66 src/gui/register.cpp:81
+#: src/gui/logindialog.cpp:121 src/gui/register.cpp:66 src/gui/register.cpp:81
 msgid "Register"
 msgstr "Rejestruj"
 
-#: src/gui/logindialog.cpp:121
+#: src/gui/logindialog.cpp:122
 #, fuzzy
 msgid "Change Server"
 msgstr "Serwer"
@@ -1739,60 +1739,65 @@ msgstr "Hasła nie zgadzają się."
 msgid "Choose Your Server"
 msgstr "Wybierz twój serwer"
 
+#: src/gui/serverdialog.cpp:239
+#, fuzzy
+msgid "Choose Your Server  *** SAFE MODE ***"
+msgstr "Wybierz twój serwer"
+
 #: src/gui/serverdialog.cpp:244
 msgid "Port:"
 msgstr "Port:"
 
-#: src/gui/serverdialog.cpp:247
+#: src/gui/serverdialog.cpp:248
 msgid "Use same ip for game sub servers"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:261
+#: src/gui/serverdialog.cpp:262
 #, fuzzy
 msgid "Server type:"
 msgstr "Serwer:"
 
-#: src/gui/serverdialog.cpp:285
+#: src/gui/serverdialog.cpp:286
 msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:286
+#: src/gui/serverdialog.cpp:287
 #, fuzzy
 msgid "Connect"
 msgstr "Łączenie..."
 
-#: src/gui/serverdialog.cpp:287
+#: src/gui/serverdialog.cpp:288
 #, fuzzy
 msgid "Custom Server"
 msgstr "Własny kursor"
 
-#: src/gui/serverdialog.cpp:392
+#: src/gui/serverdialog.cpp:393
 msgid "Please type both the address and the port of a server."
 msgstr "Proszę wpisać adres i port serwera"
 
-#: src/gui/serverdialog.cpp:550
+#: src/gui/serverdialog.cpp:551
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:555
+#: src/gui/serverdialog.cpp:556
 #, fuzzy
 msgid "Waiting for server..."
 msgstr "Oczekiwanie na serwer"
 
-#: src/gui/serverdialog.cpp:559
+#: src/gui/serverdialog.cpp:560
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:563
+#: src/gui/serverdialog.cpp:564
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:661
+#: src/gui/serverdialog.cpp:662
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:663
+#: src/gui/serverdialog.cpp:664
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -4238,70 +4243,70 @@ msgstr "Rozwiąż je, albo granie może być utrudnione."
 msgid "You were killed by "
 msgstr ""
 
-#: src/localplayer.cpp:1379
+#: src/localplayer.cpp:1375
 #, fuzzy
 msgid "Tried to pick up nonexistent item."
 msgstr "Nie można podnieść przedmiotu."
 
-#: src/localplayer.cpp:1381
+#: src/localplayer.cpp:1377
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1383
+#: src/localplayer.cpp:1379
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1385
+#: src/localplayer.cpp:1381
 #, fuzzy
 msgid "Inventory is full."
 msgstr "Serwer jest pełny"
 
-#: src/localplayer.cpp:1387
+#: src/localplayer.cpp:1383
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1390
+#: src/localplayer.cpp:1386
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1393
+#: src/localplayer.cpp:1389
 #, fuzzy
 msgid "Unknown problem picking up item."
 msgstr "Nie można podnieść przedmiotu."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1417
+#: src/localplayer.cpp:1413
 #, fuzzy, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "Podniosłeś %s [@@%d|%s@@]."
 msgstr[1] "Podniosłeś %s [@@%d|%s@@]."
 
-#: src/localplayer.cpp:3146
+#: src/localplayer.cpp:3142
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3450
+#: src/localplayer.cpp:3446
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3452 src/localplayer.cpp:3467
+#: src/localplayer.cpp:3448 src/localplayer.cpp:3463
 #, fuzzy
 msgid "Follow canceled"
 msgstr " anulował"
 
-#: src/localplayer.cpp:3459
+#: src/localplayer.cpp:3455
 #, fuzzy
 msgid "Imitation: "
 msgstr "Zmień adres Email"
 
-#: src/localplayer.cpp:3461 src/localplayer.cpp:3469
+#: src/localplayer.cpp:3457 src/localplayer.cpp:3465
 #, fuzzy
 msgid "Imitation canceled"
 msgstr " anulował"
 
-#: src/localplayer.cpp:3821
+#: src/localplayer.cpp:3817
 #, fuzzy
 msgid "You see "
 msgstr "Otrzymujesz %s"
@@ -5054,32 +5059,32 @@ msgstr "Atak M.:"
 msgid "M.Defense"
 msgstr "Obrona M.:"
 
-#: src/net/tmwa/generalhandler.cpp:268
-#, fuzzy
+#: src/net/tmwa/generalhandler.cpp:269
+#, fuzzy, no-c-format
 msgid "% Accuracy"
 msgstr "% Celność:"
 
-#: src/net/tmwa/generalhandler.cpp:269
-#, fuzzy
+#: src/net/tmwa/generalhandler.cpp:271
+#, fuzzy, no-c-format
 msgid "% Evade"
 msgstr "% Unik:"
 
-#: src/net/tmwa/generalhandler.cpp:270
-#, fuzzy
+#: src/net/tmwa/generalhandler.cpp:273
+#, fuzzy, no-c-format
 msgid "% Critical"
 msgstr "Uderzenie Krytyczne"
 
-#: src/net/tmwa/generalhandler.cpp:271
+#: src/net/tmwa/generalhandler.cpp:274
 #, fuzzy
 msgid "Attack Delay"
 msgstr "Atak %+d"
 
-#: src/net/tmwa/generalhandler.cpp:273
+#: src/net/tmwa/generalhandler.cpp:276
 #, fuzzy
 msgid "Walk Delay"
 msgstr "Atak %+d"
 
-#: src/net/tmwa/generalhandler.cpp:275
+#: src/net/tmwa/generalhandler.cpp:278
 #, fuzzy
 msgid "Attack Range"
 msgstr "Potwór uderza Gracza"
diff --git a/po/pt.po b/po/pt.po
index e64409e4e..ad1cd5bb5 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-06-25 18:01+0300\n"
+"POT-Creation-Date: 2011-07-02 00:39+0300\n"
 "PO-Revision-Date: 2011-06-22 04:18+0000\n"
 "Last-Translator: freya <freya.df@gmail.com>\n"
 "Language-Team: Portuguese (http://www.transifex.net/projects/p/manaplus/team/"
@@ -32,88 +32,88 @@ msgstr "desviou"
 msgid "miss"
 msgstr "errou"
 
-#: src/client.cpp:817 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
+#: src/client.cpp:821 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Configurar"
 
-#: src/client.cpp:896
+#: src/client.cpp:900
 msgid "Connecting to server"
 msgstr "Conectando ao servidor"
 
-#: src/client.cpp:927
+#: src/client.cpp:931
 msgid "Logging in"
 msgstr "Efetuando login"
 
-#: src/client.cpp:960
+#: src/client.cpp:964
 msgid "Entering game world"
 msgstr "Entrando no domínio do jogo"
 
-#: src/client.cpp:1052
+#: src/client.cpp:1056
 msgid "Requesting characters"
 msgstr "Requisitando personagens"
 
-#: src/client.cpp:1083
+#: src/client.cpp:1087
 msgid "Connecting to the game server"
 msgstr "Conectando ao servidor do jogo"
 
-#: src/client.cpp:1093
+#: src/client.cpp:1097
 msgid "Changing game servers"
 msgstr "Mudando servidores do jogo"
 
-#: src/client.cpp:1130 src/client.cpp:1137 src/client.cpp:1274
+#: src/client.cpp:1134 src/client.cpp:1141 src/client.cpp:1278
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:391
+#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
 #: src/gui/unregisterdialog.cpp:137 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227 src/net/tmwa/charserverhandler.cpp:190
 #: src/net/tmwa/charserverhandler.cpp:206
 msgid "Error"
 msgstr "Erro"
 
-#: src/client.cpp:1146
+#: src/client.cpp:1150
 msgid "Requesting registration details"
 msgstr "Requisitando detalhes do registro"
 
-#: src/client.cpp:1173
+#: src/client.cpp:1177
 msgid "Password Change"
 msgstr "Mudar senha"
 
-#: src/client.cpp:1174
+#: src/client.cpp:1178
 msgid "Password changed successfully!"
 msgstr "Senha modificada com sucesso!"
 
-#: src/client.cpp:1193
+#: src/client.cpp:1197
 msgid "Email Change"
 msgstr "Mudar email"
 
-#: src/client.cpp:1194
+#: src/client.cpp:1198
 msgid "Email changed successfully!"
 msgstr "Email modificado com sucesso!"
 
-#: src/client.cpp:1214
+#: src/client.cpp:1218
 msgid "Unregister Successful"
 msgstr "Registro cancelado com sucesso"
 
-#: src/client.cpp:1215
+#: src/client.cpp:1219
 msgid "Farewell, come back any time..."
 msgstr "Tchau, volte sempre..."
 
-#: src/client.cpp:1404 src/client.cpp:1434 src/client.cpp:1478
-#: src/client.cpp:1894
+#: src/client.cpp:1408 src/client.cpp:1438 src/client.cpp:1482
+#: src/client.cpp:1898
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s não existe e não pode ser criado! Saindo."
 
-#: src/client.cpp:1608
+#: src/client.cpp:1612
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Host de atualização inválido: %s"
 
-#: src/client.cpp:1642 src/client.cpp:1648
+#: src/client.cpp:1646 src/client.cpp:1652
 msgid "Error creating updates directory!"
 msgstr "Erro ao criar pasta de atualizações!"
 
-#: src/client.cpp:1669
+#: src/client.cpp:1673
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Erro: %s não existe e não pode se criado! Saindo."
@@ -414,7 +414,7 @@ msgstr "-"
 
 #: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
 #: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
-#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:284
+#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:285
 #: src/keyboardconfig.cpp:287
 msgid "Quit"
 msgstr "Sair"
@@ -488,7 +488,7 @@ msgstr "Os emails informados não são iguais."
 msgid "Change Password"
 msgstr "Alterar senha"
 
-#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:94
+#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:95
 #: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56
 msgid "Password:"
 msgstr "Senha:"
@@ -519,7 +519,7 @@ msgstr "As novas senhas não são iguais."
 msgid "Create Character"
 msgstr "Criar Personagem"
 
-#: src/gui/charcreatedialog.cpp:73 src/gui/logindialog.cpp:93
+#: src/gui/charcreatedialog.cpp:73 src/gui/logindialog.cpp:94
 #: src/gui/register.cpp:75
 msgid "Name:"
 msgstr "Nome:"
@@ -618,7 +618,7 @@ msgstr "Entre com a Senha para Deletar o usuario"
 msgid "Enter password:"
 msgstr "Entre com a senha"
 
-#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:288
+#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
 #: src/gui/setup_players.cpp:251 src/gui/shopwindow.cpp:120
 #: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:240
 msgid "Delete"
@@ -1131,32 +1131,32 @@ msgstr "Fechar"
 msgid "Skip"
 msgstr "Passar"
 
-#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:122
+#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:123
 msgid "Login"
 msgstr "Login"
 
-#: src/gui/logindialog.cpp:90 src/gui/serverdialog.cpp:243
+#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:243
 #: src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr "Servidor:"
 
-#: src/gui/logindialog.cpp:95
+#: src/gui/logindialog.cpp:96
 msgid "Custom update host"
 msgstr "Atualizações customizadas"
 
-#: src/gui/logindialog.cpp:109
+#: src/gui/logindialog.cpp:110
 msgid "Remember username"
 msgstr "Lembrar usuário"
 
-#: src/gui/logindialog.cpp:110
+#: src/gui/logindialog.cpp:111
 msgid "Update:"
 msgstr "Atualização:"
 
-#: src/gui/logindialog.cpp:120 src/gui/register.cpp:66 src/gui/register.cpp:81
+#: src/gui/logindialog.cpp:121 src/gui/register.cpp:66 src/gui/register.cpp:81
 msgid "Register"
 msgstr "Registrar"
 
-#: src/gui/logindialog.cpp:121
+#: src/gui/logindialog.cpp:122
 msgid "Change Server"
 msgstr "Trocar servidor"
 
@@ -1605,56 +1605,61 @@ msgstr "Senhas não conferem."
 msgid "Choose Your Server"
 msgstr "Escolha seu servidor"
 
+#: src/gui/serverdialog.cpp:239
+#, fuzzy
+msgid "Choose Your Server  *** SAFE MODE ***"
+msgstr "Escolha seu servidor"
+
 #: src/gui/serverdialog.cpp:244
 msgid "Port:"
 msgstr "Porta:"
 
-#: src/gui/serverdialog.cpp:247
+#: src/gui/serverdialog.cpp:248
 msgid "Use same ip for game sub servers"
 msgstr "Usar o mesmo ip para os sub servidores do jogo"
 
-#: src/gui/serverdialog.cpp:261
+#: src/gui/serverdialog.cpp:262
 msgid "Server type:"
 msgstr "Tipo de servidor:"
 
-#: src/gui/serverdialog.cpp:285
+#: src/gui/serverdialog.cpp:286
 msgid "Load"
 msgstr "Carregar"
 
-#: src/gui/serverdialog.cpp:286
+#: src/gui/serverdialog.cpp:287
 msgid "Connect"
 msgstr "Conectar"
 
-#: src/gui/serverdialog.cpp:287
+#: src/gui/serverdialog.cpp:288
 msgid "Custom Server"
 msgstr "Servidor customizado"
 
-#: src/gui/serverdialog.cpp:392
+#: src/gui/serverdialog.cpp:393
 msgid "Please type both the address and the port of a server."
 msgstr "Por favor especifique o endereço e a porta do servidor."
 
-#: src/gui/serverdialog.cpp:550
+#: src/gui/serverdialog.cpp:551
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Baixando lista de servidores...%2.2f%%"
 
-#: src/gui/serverdialog.cpp:555
+#: src/gui/serverdialog.cpp:556
 msgid "Waiting for server..."
 msgstr "Aguardando servidor..."
 
-#: src/gui/serverdialog.cpp:559
+#: src/gui/serverdialog.cpp:560
 msgid "Preparing download"
 msgstr "Preparando download"
 
-#: src/gui/serverdialog.cpp:563
+#: src/gui/serverdialog.cpp:564
 msgid "Error retreiving server list!"
 msgstr "Erro ao recuperar lista!"
 
-#: src/gui/serverdialog.cpp:661
+#: src/gui/serverdialog.cpp:662
 msgid "requires a newer version"
 msgstr "requer uma versão mais nova"
 
-#: src/gui/serverdialog.cpp:663
+#: src/gui/serverdialog.cpp:664
 #, c-format
 msgid "requires v%s"
 msgstr "requer v%s"
@@ -3966,64 +3971,64 @@ msgstr ""
 msgid "You were killed by "
 msgstr "Você foi morto por "
 
-#: src/localplayer.cpp:1379
+#: src/localplayer.cpp:1375
 msgid "Tried to pick up nonexistent item."
 msgstr "Você tentou pegar um item não existente."
 
-#: src/localplayer.cpp:1381
+#: src/localplayer.cpp:1377
 msgid "Item is too heavy."
 msgstr "Este item é muito pesado."
 
-#: src/localplayer.cpp:1383
+#: src/localplayer.cpp:1379
 msgid "Item is too far away."
 msgstr "Item está muito longe"
 
-#: src/localplayer.cpp:1385
+#: src/localplayer.cpp:1381
 msgid "Inventory is full."
 msgstr "O inventário está cheio."
 
-#: src/localplayer.cpp:1387
+#: src/localplayer.cpp:1383
 msgid "Stack is too big."
 msgstr "Esta pilha é muito grande."
 
-#: src/localplayer.cpp:1390
+#: src/localplayer.cpp:1386
 msgid "Item belongs to someone else."
 msgstr "Este item pertence a outra pessoa."
 
-#: src/localplayer.cpp:1393
+#: src/localplayer.cpp:1389
 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:1417
+#: src/localplayer.cpp:1413
 #, 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:3146
+#: src/localplayer.cpp:3142
 msgid "Away"
 msgstr "Indisponivel "
 
-#: src/localplayer.cpp:3450
+#: src/localplayer.cpp:3446
 msgid "Follow: "
 msgstr "Seguindo:"
 
-#: src/localplayer.cpp:3452 src/localplayer.cpp:3467
+#: src/localplayer.cpp:3448 src/localplayer.cpp:3463
 msgid "Follow canceled"
 msgstr "Seguir cancelado"
 
-#: src/localplayer.cpp:3459
+#: src/localplayer.cpp:3455
 msgid "Imitation: "
 msgstr "Imitando:"
 
-#: src/localplayer.cpp:3461 src/localplayer.cpp:3469
+#: src/localplayer.cpp:3457 src/localplayer.cpp:3465
 msgid "Imitation canceled"
 msgstr "Imitação cancelada"
 
-#: src/localplayer.cpp:3821
+#: src/localplayer.cpp:3817
 msgid "You see "
 msgstr "Você vê "
 
@@ -4715,27 +4720,30 @@ msgstr "Atq. Mágico"
 msgid "M.Defense"
 msgstr "Def. Mágica"
 
-#: src/net/tmwa/generalhandler.cpp:268
+#: src/net/tmwa/generalhandler.cpp:269
+#, no-c-format
 msgid "% Accuracy"
 msgstr "% Exatidão"
 
-#: src/net/tmwa/generalhandler.cpp:269
+#: src/net/tmwa/generalhandler.cpp:271
+#, no-c-format
 msgid "% Evade"
 msgstr "% Evasão"
 
-#: src/net/tmwa/generalhandler.cpp:270
+#: src/net/tmwa/generalhandler.cpp:273
+#, no-c-format
 msgid "% Critical"
 msgstr "% Críticos"
 
-#: src/net/tmwa/generalhandler.cpp:271
+#: src/net/tmwa/generalhandler.cpp:274
 msgid "Attack Delay"
 msgstr "Atraso de ataque"
 
-#: src/net/tmwa/generalhandler.cpp:273
+#: src/net/tmwa/generalhandler.cpp:276
 msgid "Walk Delay"
 msgstr "Atraso de movimento"
 
-#: src/net/tmwa/generalhandler.cpp:275
+#: src/net/tmwa/generalhandler.cpp:278
 msgid "Attack Range"
 msgstr "Atraso de alcance"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 8d4753e37..89222f8ba 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-06-25 18:01+0300\n"
+"POT-Creation-Date: 2011-07-02 00:39+0300\n"
 "PO-Revision-Date: 2011-06-22 04:16+0000\n"
 "Last-Translator: freya <freya.df@gmail.com>\n"
 "Language-Team: Portuguese (Brazilian) (http://www.transifex.net/projects/p/"
@@ -34,88 +34,88 @@ msgstr "desviou"
 msgid "miss"
 msgstr "errou"
 
-#: src/client.cpp:817 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
+#: src/client.cpp:821 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Configurar"
 
-#: src/client.cpp:896
+#: src/client.cpp:900
 msgid "Connecting to server"
 msgstr "Conectando ao servidor"
 
-#: src/client.cpp:927
+#: src/client.cpp:931
 msgid "Logging in"
 msgstr "Efetuando login"
 
-#: src/client.cpp:960
+#: src/client.cpp:964
 msgid "Entering game world"
 msgstr "Entrando no domínio do jogo"
 
-#: src/client.cpp:1052
+#: src/client.cpp:1056
 msgid "Requesting characters"
 msgstr "Requisitando personagens"
 
-#: src/client.cpp:1083
+#: src/client.cpp:1087
 msgid "Connecting to the game server"
 msgstr "Conectando ao servidor do jogo"
 
-#: src/client.cpp:1093
+#: src/client.cpp:1097
 msgid "Changing game servers"
 msgstr "Mudando servidores do jogo"
 
-#: src/client.cpp:1130 src/client.cpp:1137 src/client.cpp:1274
+#: src/client.cpp:1134 src/client.cpp:1141 src/client.cpp:1278
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:391
+#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
 #: src/gui/unregisterdialog.cpp:137 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227 src/net/tmwa/charserverhandler.cpp:190
 #: src/net/tmwa/charserverhandler.cpp:206
 msgid "Error"
 msgstr "Erro"
 
-#: src/client.cpp:1146
+#: src/client.cpp:1150
 msgid "Requesting registration details"
 msgstr "Requisitando detalhes do registro"
 
-#: src/client.cpp:1173
+#: src/client.cpp:1177
 msgid "Password Change"
 msgstr "Mudar senha"
 
-#: src/client.cpp:1174
+#: src/client.cpp:1178
 msgid "Password changed successfully!"
 msgstr "Senha modificada com sucesso!"
 
-#: src/client.cpp:1193
+#: src/client.cpp:1197
 msgid "Email Change"
 msgstr "Mudar email"
 
-#: src/client.cpp:1194
+#: src/client.cpp:1198
 msgid "Email changed successfully!"
 msgstr "Email modificado com sucesso!"
 
-#: src/client.cpp:1214
+#: src/client.cpp:1218
 msgid "Unregister Successful"
 msgstr "Registro cancelado com sucesso"
 
-#: src/client.cpp:1215
+#: src/client.cpp:1219
 msgid "Farewell, come back any time..."
 msgstr "Tchau, volte sempre..."
 
-#: src/client.cpp:1404 src/client.cpp:1434 src/client.cpp:1478
-#: src/client.cpp:1894
+#: src/client.cpp:1408 src/client.cpp:1438 src/client.cpp:1482
+#: src/client.cpp:1898
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s não existe e não pode ser criado! Saindo."
 
-#: src/client.cpp:1608
+#: src/client.cpp:1612
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Host de atualização inválido: %s"
 
-#: src/client.cpp:1642 src/client.cpp:1648
+#: src/client.cpp:1646 src/client.cpp:1652
 msgid "Error creating updates directory!"
 msgstr "Erro ao criar pasta de atualizações!"
 
-#: src/client.cpp:1669
+#: src/client.cpp:1673
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Erro: %s não existe e não pode se criado! Saindo."
@@ -416,7 +416,7 @@ msgstr "-"
 
 #: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
 #: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
-#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:284
+#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:285
 #: src/keyboardconfig.cpp:287
 msgid "Quit"
 msgstr "Sair"
@@ -490,7 +490,7 @@ msgstr "Os emails informados não são iguais."
 msgid "Change Password"
 msgstr "Alterar senha"
 
-#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:94
+#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:95
 #: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56
 msgid "Password:"
 msgstr "Senha:"
@@ -521,7 +521,7 @@ msgstr "As novas senhas não são iguais."
 msgid "Create Character"
 msgstr "Criar Personagem"
 
-#: src/gui/charcreatedialog.cpp:73 src/gui/logindialog.cpp:93
+#: src/gui/charcreatedialog.cpp:73 src/gui/logindialog.cpp:94
 #: src/gui/register.cpp:75
 msgid "Name:"
 msgstr "Nome:"
@@ -620,7 +620,7 @@ msgstr "Entre com a senha para apagar o personagem"
 msgid "Enter password:"
 msgstr "Entre com a senha:"
 
-#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:288
+#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
 #: src/gui/setup_players.cpp:251 src/gui/shopwindow.cpp:120
 #: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:240
 msgid "Delete"
@@ -1133,32 +1133,32 @@ msgstr "Fechar"
 msgid "Skip"
 msgstr "Passar"
 
-#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:122
+#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:123
 msgid "Login"
 msgstr "Login"
 
-#: src/gui/logindialog.cpp:90 src/gui/serverdialog.cpp:243
+#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:243
 #: src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr "Servidor:"
 
-#: src/gui/logindialog.cpp:95
+#: src/gui/logindialog.cpp:96
 msgid "Custom update host"
 msgstr "Atualizações customizadas"
 
-#: src/gui/logindialog.cpp:109
+#: src/gui/logindialog.cpp:110
 msgid "Remember username"
 msgstr "Lembrar usuário"
 
-#: src/gui/logindialog.cpp:110
+#: src/gui/logindialog.cpp:111
 msgid "Update:"
 msgstr "Atualização:"
 
-#: src/gui/logindialog.cpp:120 src/gui/register.cpp:66 src/gui/register.cpp:81
+#: src/gui/logindialog.cpp:121 src/gui/register.cpp:66 src/gui/register.cpp:81
 msgid "Register"
 msgstr "Registrar"
 
-#: src/gui/logindialog.cpp:121
+#: src/gui/logindialog.cpp:122
 msgid "Change Server"
 msgstr "Trocar servidor"
 
@@ -1607,56 +1607,61 @@ msgstr "Senhas não conferem."
 msgid "Choose Your Server"
 msgstr "Escolha seu servidor"
 
+#: src/gui/serverdialog.cpp:239
+#, fuzzy
+msgid "Choose Your Server  *** SAFE MODE ***"
+msgstr "Escolha seu servidor"
+
 #: src/gui/serverdialog.cpp:244
 msgid "Port:"
 msgstr "Porta:"
 
-#: src/gui/serverdialog.cpp:247
+#: src/gui/serverdialog.cpp:248
 msgid "Use same ip for game sub servers"
 msgstr "Usar o mesmo ip para os sub servidores do jogo"
 
-#: src/gui/serverdialog.cpp:261
+#: src/gui/serverdialog.cpp:262
 msgid "Server type:"
 msgstr "Tipo de servidor:"
 
-#: src/gui/serverdialog.cpp:285
+#: src/gui/serverdialog.cpp:286
 msgid "Load"
 msgstr "Carregar"
 
-#: src/gui/serverdialog.cpp:286
+#: src/gui/serverdialog.cpp:287
 msgid "Connect"
 msgstr "Conectar"
 
-#: src/gui/serverdialog.cpp:287
+#: src/gui/serverdialog.cpp:288
 msgid "Custom Server"
 msgstr "Servidor customizado"
 
-#: src/gui/serverdialog.cpp:392
+#: src/gui/serverdialog.cpp:393
 msgid "Please type both the address and the port of a server."
 msgstr "Por favor especifique o endereço e a porta do servidor."
 
-#: src/gui/serverdialog.cpp:550
+#: src/gui/serverdialog.cpp:551
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Baixando lista de servidores...%2.2f%%"
 
-#: src/gui/serverdialog.cpp:555
+#: src/gui/serverdialog.cpp:556
 msgid "Waiting for server..."
 msgstr "Aguardando servidor..."
 
-#: src/gui/serverdialog.cpp:559
+#: src/gui/serverdialog.cpp:560
 msgid "Preparing download"
 msgstr "Preparando download"
 
-#: src/gui/serverdialog.cpp:563
+#: src/gui/serverdialog.cpp:564
 msgid "Error retreiving server list!"
 msgstr "Erro ao recuperar lista!"
 
-#: src/gui/serverdialog.cpp:661
+#: src/gui/serverdialog.cpp:662
 msgid "requires a newer version"
 msgstr "requer uma versão mais nova"
 
-#: src/gui/serverdialog.cpp:663
+#: src/gui/serverdialog.cpp:664
 #, c-format
 msgid "requires v%s"
 msgstr "requer v%s"
@@ -3968,64 +3973,64 @@ msgstr ""
 msgid "You were killed by "
 msgstr "Você foi morto por "
 
-#: src/localplayer.cpp:1379
+#: src/localplayer.cpp:1375
 msgid "Tried to pick up nonexistent item."
 msgstr "Você tentou pegar um item não existente."
 
-#: src/localplayer.cpp:1381
+#: src/localplayer.cpp:1377
 msgid "Item is too heavy."
 msgstr "Este item é muito pesado."
 
-#: src/localplayer.cpp:1383
+#: src/localplayer.cpp:1379
 msgid "Item is too far away."
 msgstr "Item está muito longe"
 
-#: src/localplayer.cpp:1385
+#: src/localplayer.cpp:1381
 msgid "Inventory is full."
 msgstr "O inventário está cheio."
 
-#: src/localplayer.cpp:1387
+#: src/localplayer.cpp:1383
 msgid "Stack is too big."
 msgstr "Esta pilha é muito grande."
 
-#: src/localplayer.cpp:1390
+#: src/localplayer.cpp:1386
 msgid "Item belongs to someone else."
 msgstr "Este item pertence a outra pessoa."
 
-#: src/localplayer.cpp:1393
+#: src/localplayer.cpp:1389
 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:1417
+#: src/localplayer.cpp:1413
 #, 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:3146
+#: src/localplayer.cpp:3142
 msgid "Away"
 msgstr "Indisponivel "
 
-#: src/localplayer.cpp:3450
+#: src/localplayer.cpp:3446
 msgid "Follow: "
 msgstr "Seguindo:"
 
-#: src/localplayer.cpp:3452 src/localplayer.cpp:3467
+#: src/localplayer.cpp:3448 src/localplayer.cpp:3463
 msgid "Follow canceled"
 msgstr "Seguindo cancelado"
 
-#: src/localplayer.cpp:3459
+#: src/localplayer.cpp:3455
 msgid "Imitation: "
 msgstr "Imitando:"
 
-#: src/localplayer.cpp:3461 src/localplayer.cpp:3469
+#: src/localplayer.cpp:3457 src/localplayer.cpp:3465
 msgid "Imitation canceled"
 msgstr "Imitação cancelada"
 
-#: src/localplayer.cpp:3821
+#: src/localplayer.cpp:3817
 msgid "You see "
 msgstr "Você vê "
 
@@ -4717,27 +4722,30 @@ msgstr "Atq. Mágico"
 msgid "M.Defense"
 msgstr "Def. Mágica"
 
-#: src/net/tmwa/generalhandler.cpp:268
+#: src/net/tmwa/generalhandler.cpp:269
+#, no-c-format
 msgid "% Accuracy"
 msgstr "% Exatidão"
 
-#: src/net/tmwa/generalhandler.cpp:269
+#: src/net/tmwa/generalhandler.cpp:271
+#, no-c-format
 msgid "% Evade"
 msgstr "% Evasão"
 
-#: src/net/tmwa/generalhandler.cpp:270
+#: src/net/tmwa/generalhandler.cpp:273
+#, no-c-format
 msgid "% Critical"
 msgstr "% Críticos"
 
-#: src/net/tmwa/generalhandler.cpp:271
+#: src/net/tmwa/generalhandler.cpp:274
 msgid "Attack Delay"
 msgstr "Atraso de ataque"
 
-#: src/net/tmwa/generalhandler.cpp:273
+#: src/net/tmwa/generalhandler.cpp:276
 msgid "Walk Delay"
 msgstr "Atraso de movimento"
 
-#: src/net/tmwa/generalhandler.cpp:275
+#: src/net/tmwa/generalhandler.cpp:278
 msgid "Attack Range"
 msgstr "Atraso de alcance"
 
diff --git a/po/ru.po b/po/ru.po
index 95c6df87a..ad2ca27e6 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -2,15 +2,16 @@
 # Copyright (C) YEAR The ManaPlus Developers
 # This file is distributed under the same license as the PACKAGE package.
 #
+#   <Necromong@inbox.ru>, 2011.
 # Necromonger <Necromong@inbox.ru>, 2011.
 # Andrei Karas <akaras@inbox.ru>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-06-25 18:01+0300\n"
-"PO-Revision-Date: 2011-06-20 00:35+0000\n"
-"Last-Translator: akaras <akaras@inbox.ru>\n"
+"POT-Creation-Date: 2011-07-02 00:39+0300\n"
+"PO-Revision-Date: 2011-06-26 00:56+0000\n"
+"Last-Translator: Necromonger <Necromong@inbox.ru>\n"
 "Language-Team: Russian (http://www.transifex.net/projects/p/manaplus/team/"
 "ru/)\n"
 "Language: ru\n"
@@ -32,88 +33,88 @@ msgstr "уворот"
 msgid "miss"
 msgstr "промах"
 
-#: src/client.cpp:817 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
+#: src/client.cpp:821 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Настройка"
 
-#: src/client.cpp:896
+#: src/client.cpp:900
 msgid "Connecting to server"
 msgstr "Идет подключение к серверу..."
 
-#: src/client.cpp:927
+#: src/client.cpp:931
 msgid "Logging in"
 msgstr "Авторизация"
 
-#: src/client.cpp:960
+#: src/client.cpp:964
 msgid "Entering game world"
 msgstr "Входим в игровой мир"
 
-#: src/client.cpp:1052
+#: src/client.cpp:1056
 msgid "Requesting characters"
 msgstr "Получение списка персонажей"
 
-#: src/client.cpp:1083
+#: src/client.cpp:1087
 msgid "Connecting to the game server"
 msgstr "Подключение к игровому серверу"
 
-#: src/client.cpp:1093
+#: src/client.cpp:1097
 msgid "Changing game servers"
 msgstr "Смена игрового сервера"
 
-#: src/client.cpp:1130 src/client.cpp:1137 src/client.cpp:1274
+#: src/client.cpp:1134 src/client.cpp:1141 src/client.cpp:1278
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:391
+#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
 #: src/gui/unregisterdialog.cpp:137 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227 src/net/tmwa/charserverhandler.cpp:190
 #: src/net/tmwa/charserverhandler.cpp:206
 msgid "Error"
 msgstr "Ошибка"
 
-#: src/client.cpp:1146
+#: src/client.cpp:1150
 msgid "Requesting registration details"
 msgstr "Запрос регистрационных данных"
 
-#: src/client.cpp:1173
+#: src/client.cpp:1177
 msgid "Password Change"
 msgstr "Изменить Пароль"
 
-#: src/client.cpp:1174
+#: src/client.cpp:1178
 msgid "Password changed successfully!"
 msgstr "Пароль изменен!"
 
-#: src/client.cpp:1193
+#: src/client.cpp:1197
 msgid "Email Change"
 msgstr "Сменить Email"
 
-#: src/client.cpp:1194
+#: src/client.cpp:1198
 msgid "Email changed successfully!"
 msgstr "Email изменен!"
 
-#: src/client.cpp:1214
+#: src/client.cpp:1218
 msgid "Unregister Successful"
 msgstr "Регистрация удалена"
 
-#: src/client.cpp:1215
+#: src/client.cpp:1219
 msgid "Farewell, come back any time..."
 msgstr "Хорошо, возвращайтесь в любое время..."
 
-#: src/client.cpp:1404 src/client.cpp:1434 src/client.cpp:1478
-#: src/client.cpp:1894
+#: src/client.cpp:1408 src/client.cpp:1438 src/client.cpp:1482
+#: src/client.cpp:1898
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s не существует, и не может быть создано! Выход."
 
-#: src/client.cpp:1608
+#: src/client.cpp:1612
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "Некорректный сервер обновлений: %s"
 
-#: src/client.cpp:1642 src/client.cpp:1648
+#: src/client.cpp:1646 src/client.cpp:1652
 msgid "Error creating updates directory!"
 msgstr "Ошибка создания директории для обновлений!"
 
-#: src/client.cpp:1669
+#: src/client.cpp:1673
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "Ошибка: %s не существует, и не может быть создан! Выход."
@@ -420,7 +421,7 @@ msgstr "-"
 
 #: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
 #: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
-#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:284
+#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:285
 #: src/keyboardconfig.cpp:287
 msgid "Quit"
 msgstr "Выход"
@@ -494,7 +495,7 @@ msgstr "Адрес E-mail не совпадает"
 msgid "Change Password"
 msgstr "Изменить пароль"
 
-#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:94
+#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:95
 #: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56
 msgid "Password:"
 msgstr "Пароль:"
@@ -525,7 +526,7 @@ msgstr "Новый пароль не совпадает."
 msgid "Create Character"
 msgstr "Создать персонажа"
 
-#: src/gui/charcreatedialog.cpp:73 src/gui/logindialog.cpp:93
+#: src/gui/charcreatedialog.cpp:73 src/gui/logindialog.cpp:94
 #: src/gui/register.cpp:75
 msgid "Name:"
 msgstr "Имя:"
@@ -624,7 +625,7 @@ msgstr "Введите пароль для удаления персонажа"
 msgid "Enter password:"
 msgstr "Введите пароль:"
 
-#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:288
+#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
 #: src/gui/setup_players.cpp:251 src/gui/shopwindow.cpp:120
 #: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:240
 msgid "Delete"
@@ -1139,32 +1140,32 @@ msgstr "Авт. закрыть"
 msgid "Skip"
 msgstr "Пропустить"
 
-#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:122
+#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:123
 msgid "Login"
 msgstr "Вход"
 
-#: src/gui/logindialog.cpp:90 src/gui/serverdialog.cpp:243
+#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:243
 #: src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr "Сервер:"
 
-#: src/gui/logindialog.cpp:95
+#: src/gui/logindialog.cpp:96
 msgid "Custom update host"
 msgstr "Польз. сайт обновлений"
 
-#: src/gui/logindialog.cpp:109
+#: src/gui/logindialog.cpp:110
 msgid "Remember username"
 msgstr "Запомнить логин"
 
-#: src/gui/logindialog.cpp:110
+#: src/gui/logindialog.cpp:111
 msgid "Update:"
 msgstr "Обновления:"
 
-#: src/gui/logindialog.cpp:120 src/gui/register.cpp:66 src/gui/register.cpp:81
+#: src/gui/logindialog.cpp:121 src/gui/register.cpp:66 src/gui/register.cpp:81
 msgid "Register"
 msgstr "Регистрация"
 
-#: src/gui/logindialog.cpp:121
+#: src/gui/logindialog.cpp:122
 msgid "Change Server"
 msgstr "Сменить сервер"
 
@@ -1555,7 +1556,7 @@ msgstr "Скопировать в чат"
 #: src/gui/popupmenu.cpp:1836 src/gui/socialwindow.cpp:854
 #: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
 msgid "(default)"
-msgstr "(поумолчанию)"
+msgstr "(по умолчанию)"
 
 #: src/gui/popupmenu.cpp:1848 src/gui/popupmenu.cpp:1866
 msgid "Move up"
@@ -1613,56 +1614,61 @@ msgstr "Пароли не совпадают."
 msgid "Choose Your Server"
 msgstr "Выберите сервер"
 
+#: src/gui/serverdialog.cpp:239
+#, fuzzy
+msgid "Choose Your Server  *** SAFE MODE ***"
+msgstr "Выберите сервер"
+
 #: src/gui/serverdialog.cpp:244
 msgid "Port:"
 msgstr "Порт:"
 
-#: src/gui/serverdialog.cpp:247
+#: src/gui/serverdialog.cpp:248
 msgid "Use same ip for game sub servers"
 msgstr "Использовать одинаковый IP для игровых суб-серверов"
 
-#: src/gui/serverdialog.cpp:261
+#: src/gui/serverdialog.cpp:262
 msgid "Server type:"
 msgstr "Тип:"
 
-#: src/gui/serverdialog.cpp:285
+#: src/gui/serverdialog.cpp:286
 msgid "Load"
 msgstr "Загрузить"
 
-#: src/gui/serverdialog.cpp:286
+#: src/gui/serverdialog.cpp:287
 msgid "Connect"
 msgstr "Соединиться"
 
-#: src/gui/serverdialog.cpp:287
+#: src/gui/serverdialog.cpp:288
 msgid "Custom Server"
 msgstr "Добавить"
 
-#: src/gui/serverdialog.cpp:392
+#: src/gui/serverdialog.cpp:393
 msgid "Please type both the address and the port of a server."
 msgstr "Следует указать адрес и порт сервера."
 
-#: src/gui/serverdialog.cpp:550
+#: src/gui/serverdialog.cpp:551
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "Получение списка серверов...%2.2f%%"
 
-#: src/gui/serverdialog.cpp:555
+#: src/gui/serverdialog.cpp:556
 msgid "Waiting for server..."
 msgstr "Ожидание ответа от сервера"
 
-#: src/gui/serverdialog.cpp:559
+#: src/gui/serverdialog.cpp:560
 msgid "Preparing download"
 msgstr "Подготовка к загрузке"
 
-#: src/gui/serverdialog.cpp:563
+#: src/gui/serverdialog.cpp:564
 msgid "Error retreiving server list!"
 msgstr "Не удалось получить список серверов!"
 
-#: src/gui/serverdialog.cpp:661
+#: src/gui/serverdialog.cpp:662
 msgid "requires a newer version"
 msgstr "требуется более новая версия"
 
-#: src/gui/serverdialog.cpp:663
+#: src/gui/serverdialog.cpp:664
 #, c-format
 msgid "requires v%s"
 msgstr "требуется v%s"
@@ -1978,7 +1984,7 @@ msgstr "Сообщение для отошел"
 
 #: src/gui/setup_other.cpp:114
 msgid "Enable attack filter"
-msgstr "ключить фильтр атак"
+msgstr "Включить фильтр атак"
 
 #: src/gui/setup_other.cpp:117
 msgid "Enable shop mode"
@@ -2602,7 +2608,7 @@ msgstr "Особые"
 
 #: src/gui/statuspopup.cpp:196
 msgid "(D) default moves"
-msgstr "(D) движения поумолчанию"
+msgstr "(D) движения по умолчанию"
 
 #: src/gui/statuspopup.cpp:201
 msgid "(I) invert moves"
@@ -2634,7 +2640,7 @@ msgstr "(?) неизвестные сумасшедшие движения"
 
 #: src/gui/statuspopup.cpp:253
 msgid "(0) default moves to target"
-msgstr "(0) обычное движение к целе"
+msgstr "(0) обычное движение к цели"
 
 #: src/gui/statuspopup.cpp:258
 msgid "(1) moves to target in distance 1"
@@ -2690,7 +2696,7 @@ msgstr "(D) обычная атака"
 
 #: src/gui/statuspopup.cpp:326
 msgid "(s) switch attack without shield"
-msgstr "(s) переключение атаки без счита"
+msgstr "(s) переключение атаки без щита"
 
 #: src/gui/statuspopup.cpp:331
 msgid "(S) switch attack with shield"
@@ -3978,37 +3984,37 @@ msgstr ""
 msgid "You were killed by "
 msgstr "Вы были убиты "
 
-#: src/localplayer.cpp:1379
+#: src/localplayer.cpp:1375
 msgid "Tried to pick up nonexistent item."
 msgstr "Попытка поднять несуществующий предмет."
 
-#: src/localplayer.cpp:1381
+#: src/localplayer.cpp:1377
 msgid "Item is too heavy."
 msgstr "Предмет слишком тяжелый"
 
-#: src/localplayer.cpp:1383
+#: src/localplayer.cpp:1379
 msgid "Item is too far away."
 msgstr "Предмет слишком далеко"
 
-#: src/localplayer.cpp:1385
+#: src/localplayer.cpp:1381
 msgid "Inventory is full."
 msgstr "Инвентарь переполнен."
 
-#: src/localplayer.cpp:1387
+#: src/localplayer.cpp:1383
 msgid "Stack is too big."
 msgstr "Слишком много предметов."
 
-#: src/localplayer.cpp:1390
+#: src/localplayer.cpp:1386
 msgid "Item belongs to someone else."
 msgstr "Предмет принадлежит кому-то еще."
 
-#: src/localplayer.cpp:1393
+#: src/localplayer.cpp:1389
 msgid "Unknown problem picking up item."
 msgstr "Неизвестная проблема при поднятии предмета."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1417
+#: src/localplayer.cpp:1413
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -4016,27 +4022,27 @@ msgstr[0] "Вы подняли %d [@@%d|%s@@]."
 msgstr[1] "Вы подняли %d [@@%d|%s@@]."
 msgstr[2] "Вы подняли %d [@@%d|%s@@]."
 
-#: src/localplayer.cpp:3146
+#: src/localplayer.cpp:3142
 msgid "Away"
 msgstr "Отошел"
 
-#: src/localplayer.cpp:3450
+#: src/localplayer.cpp:3446
 msgid "Follow: "
 msgstr "Следование: "
 
-#: src/localplayer.cpp:3452 src/localplayer.cpp:3467
+#: src/localplayer.cpp:3448 src/localplayer.cpp:3463
 msgid "Follow canceled"
 msgstr "Следование отменено"
 
-#: src/localplayer.cpp:3459
+#: src/localplayer.cpp:3455
 msgid "Imitation: "
 msgstr "Имитация: "
 
-#: src/localplayer.cpp:3461 src/localplayer.cpp:3469
+#: src/localplayer.cpp:3457 src/localplayer.cpp:3465
 msgid "Imitation canceled"
 msgstr "Имитация отменена"
 
-#: src/localplayer.cpp:3821
+#: src/localplayer.cpp:3817
 msgid "You see "
 msgstr "Вы видите "
 
@@ -4729,27 +4735,30 @@ msgstr "Маг. Атака"
 msgid "M.Defense"
 msgstr "Маг.Защита"
 
-#: src/net/tmwa/generalhandler.cpp:268
+#: src/net/tmwa/generalhandler.cpp:269
+#, no-c-format
 msgid "% Accuracy"
 msgstr "% Точности"
 
-#: src/net/tmwa/generalhandler.cpp:269
+#: src/net/tmwa/generalhandler.cpp:271
+#, no-c-format
 msgid "% Evade"
 msgstr "% Уклонения"
 
-#: src/net/tmwa/generalhandler.cpp:270
+#: src/net/tmwa/generalhandler.cpp:273
+#, no-c-format
 msgid "% Critical"
 msgstr "% Критический удар"
 
-#: src/net/tmwa/generalhandler.cpp:271
+#: src/net/tmwa/generalhandler.cpp:274
 msgid "Attack Delay"
 msgstr "Задержка атаки"
 
-#: src/net/tmwa/generalhandler.cpp:273
+#: src/net/tmwa/generalhandler.cpp:276
 msgid "Walk Delay"
 msgstr "Задержка движения"
 
-#: src/net/tmwa/generalhandler.cpp:275
+#: src/net/tmwa/generalhandler.cpp:278
 msgid "Attack Range"
 msgstr "Зона атаки"
 
diff --git a/po/sv.po b/po/sv.po
index 5b243ccb7..d542679af 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-06-25 18:01+0300\n"
+"POT-Creation-Date: 2011-07-02 00:39+0300\n"
 "PO-Revision-Date: 2009-07-17 05:36+0000\n"
 "Last-Translator: Kess Vargavind <Unknown>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -32,97 +32,97 @@ msgstr ""
 msgid "miss"
 msgstr ""
 
-#: src/client.cpp:817 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
+#: src/client.cpp:821 src/gui/setup.cpp:50 src/gui/windowmenu.cpp:100
 msgid "Setup"
 msgstr "Inställningar"
 
-#: src/client.cpp:896
+#: src/client.cpp:900
 #, fuzzy
 msgid "Connecting to server"
 msgstr "Ansluter till kartservern..."
 
-#: src/client.cpp:927
+#: src/client.cpp:931
 #, fuzzy
 msgid "Logging in"
 msgstr "Användarnamn"
 
-#: src/client.cpp:960
+#: src/client.cpp:964
 msgid "Entering game world"
 msgstr ""
 
-#: src/client.cpp:1052
+#: src/client.cpp:1056
 #, fuzzy
 msgid "Requesting characters"
 msgstr "Välj karaktär"
 
-#: src/client.cpp:1083
+#: src/client.cpp:1087
 #, fuzzy
 msgid "Connecting to the game server"
 msgstr "Ansluter till kartservern..."
 
-#: src/client.cpp:1093
+#: src/client.cpp:1097
 #, fuzzy
 msgid "Changing game servers"
 msgstr "Server"
 
-#: src/client.cpp:1130 src/client.cpp:1137 src/client.cpp:1274
+#: src/client.cpp:1134 src/client.cpp:1141 src/client.cpp:1278
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:391
+#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
 #: src/gui/unregisterdialog.cpp:137 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227 src/net/tmwa/charserverhandler.cpp:190
 #: src/net/tmwa/charserverhandler.cpp:206
 msgid "Error"
 msgstr "Fel"
 
-#: src/client.cpp:1146
+#: src/client.cpp:1150
 msgid "Requesting registration details"
 msgstr ""
 
-#: src/client.cpp:1173
+#: src/client.cpp:1177
 #, fuzzy
 msgid "Password Change"
 msgstr "Lösenord:"
 
-#: src/client.cpp:1174
+#: src/client.cpp:1178
 msgid "Password changed successfully!"
 msgstr ""
 
-#: src/client.cpp:1193
+#: src/client.cpp:1197
 #, fuzzy
 msgid "Email Change"
 msgstr "Ändra"
 
-#: src/client.cpp:1194
+#: src/client.cpp:1198
 #, fuzzy
 msgid "Email changed successfully!"
 msgstr "Medlem befordrad."
 
-#: src/client.cpp:1214
+#: src/client.cpp:1218
 #, fuzzy
 msgid "Unregister Successful"
 msgstr "Avregistrera"
 
-#: src/client.cpp:1215
+#: src/client.cpp:1219
 msgid "Farewell, come back any time..."
 msgstr ""
 
-#: src/client.cpp:1404 src/client.cpp:1434 src/client.cpp:1478
-#: src/client.cpp:1894
+#: src/client.cpp:1408 src/client.cpp:1438 src/client.cpp:1482
+#: src/client.cpp:1898
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr ""
 
-#: src/client.cpp:1608
+#: src/client.cpp:1612
 #, fuzzy, c-format
 msgid "Invalid update host: %s"
 msgstr "Ogiltig uppdateringsvärd: "
 
-#: src/client.cpp:1642 src/client.cpp:1648
+#: src/client.cpp:1646 src/client.cpp:1652
 msgid "Error creating updates directory!"
 msgstr "Kunde inte skapa katalog för uppdateringar!"
 
-#: src/client.cpp:1669
+#: src/client.cpp:1673
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr ""
@@ -440,7 +440,7 @@ msgstr ""
 
 #: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
 #: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
-#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:284
+#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:285
 #: src/keyboardconfig.cpp:287
 msgid "Quit"
 msgstr "Avsluta"
@@ -516,7 +516,7 @@ msgstr "Den nya epostadressen används redan."
 msgid "Change Password"
 msgstr "Ändra lösenord"
 
-#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:94
+#: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:95
 #: src/gui/register.cpp:76 src/gui/unregisterdialog.cpp:56
 msgid "Password:"
 msgstr "Lösenord:"
@@ -548,7 +548,7 @@ msgstr ""
 msgid "Create Character"
 msgstr "Skapa karaktär"
 
-#: src/gui/charcreatedialog.cpp:73 src/gui/logindialog.cpp:93
+#: src/gui/charcreatedialog.cpp:73 src/gui/logindialog.cpp:94
 #: src/gui/register.cpp:75
 msgid "Name:"
 msgstr "Namn:"
@@ -653,7 +653,7 @@ msgstr "Kunde inte ta bort karaktär."
 msgid "Enter password:"
 msgstr "Fel lösenord"
 
-#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:288
+#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
 #: src/gui/setup_players.cpp:251 src/gui/shopwindow.cpp:120
 #: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:240
 msgid "Delete"
@@ -1205,33 +1205,33 @@ msgstr "Stäng"
 msgid "Skip"
 msgstr ""
 
-#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:122
+#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:123
 msgid "Login"
 msgstr "Användarnamn"
 
-#: src/gui/logindialog.cpp:90 src/gui/serverdialog.cpp:243
+#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:243
 #: src/gui/widgets/chattab.cpp:173
 msgid "Server:"
 msgstr "Server:"
 
-#: src/gui/logindialog.cpp:95
+#: src/gui/logindialog.cpp:96
 msgid "Custom update host"
 msgstr ""
 
-#: src/gui/logindialog.cpp:109
+#: src/gui/logindialog.cpp:110
 #, fuzzy
 msgid "Remember username"
 msgstr "Kom ihåg användarnamnet"
 
-#: src/gui/logindialog.cpp:110
+#: src/gui/logindialog.cpp:111
 msgid "Update:"
 msgstr ""
 
-#: src/gui/logindialog.cpp:120 src/gui/register.cpp:66 src/gui/register.cpp:81
+#: src/gui/logindialog.cpp:121 src/gui/register.cpp:66 src/gui/register.cpp:81
 msgid "Register"
 msgstr "Registrera"
 
-#: src/gui/logindialog.cpp:121
+#: src/gui/logindialog.cpp:122
 #, fuzzy
 msgid "Change Server"
 msgstr "Server"
@@ -1734,60 +1734,65 @@ msgstr "Lösenorden stämmer inte överens."
 msgid "Choose Your Server"
 msgstr "Välj din server"
 
+#: src/gui/serverdialog.cpp:239
+#, fuzzy
+msgid "Choose Your Server  *** SAFE MODE ***"
+msgstr "Välj din server"
+
 #: src/gui/serverdialog.cpp:244
 msgid "Port:"
 msgstr "Port:"
 
-#: src/gui/serverdialog.cpp:247
+#: src/gui/serverdialog.cpp:248
 msgid "Use same ip for game sub servers"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:261
+#: src/gui/serverdialog.cpp:262
 #, fuzzy
 msgid "Server type:"
 msgstr "Server:"
 
-#: src/gui/serverdialog.cpp:285
+#: src/gui/serverdialog.cpp:286
 msgid "Load"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:286
+#: src/gui/serverdialog.cpp:287
 #, fuzzy
 msgid "Connect"
 msgstr "Ansluter..."
 
-#: src/gui/serverdialog.cpp:287
+#: src/gui/serverdialog.cpp:288
 #, fuzzy
 msgid "Custom Server"
 msgstr "Särskild muspekare"
 
-#: src/gui/serverdialog.cpp:392
+#: src/gui/serverdialog.cpp:393
 msgid "Please type both the address and the port of a server."
 msgstr "Var vänlig skriv både adressen och porten till en server."
 
-#: src/gui/serverdialog.cpp:550
+#: src/gui/serverdialog.cpp:551
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:555
+#: src/gui/serverdialog.cpp:556
 #, fuzzy
 msgid "Waiting for server..."
 msgstr "Väntar på server"
 
-#: src/gui/serverdialog.cpp:559
+#: src/gui/serverdialog.cpp:560
 msgid "Preparing download"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:563
+#: src/gui/serverdialog.cpp:564
 msgid "Error retreiving server list!"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:661
+#: src/gui/serverdialog.cpp:662
 msgid "requires a newer version"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:663
+#: src/gui/serverdialog.cpp:664
 #, c-format
 msgid "requires v%s"
 msgstr ""
@@ -4236,70 +4241,70 @@ msgstr "Se till att använda olika tangenter, annars kan det bli konstigheter."
 msgid "You were killed by "
 msgstr ""
 
-#: src/localplayer.cpp:1379
+#: src/localplayer.cpp:1375
 #, fuzzy
 msgid "Tried to pick up nonexistent item."
 msgstr "Kunde inte plocka upp."
 
-#: src/localplayer.cpp:1381
+#: src/localplayer.cpp:1377
 msgid "Item is too heavy."
 msgstr ""
 
-#: src/localplayer.cpp:1383
+#: src/localplayer.cpp:1379
 msgid "Item is too far away."
 msgstr ""
 
-#: src/localplayer.cpp:1385
+#: src/localplayer.cpp:1381
 #, fuzzy
 msgid "Inventory is full."
 msgstr "Servern är full"
 
-#: src/localplayer.cpp:1387
+#: src/localplayer.cpp:1383
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1390
+#: src/localplayer.cpp:1386
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1393
+#: src/localplayer.cpp:1389
 #, fuzzy
 msgid "Unknown problem picking up item."
 msgstr "Kunde inte plocka upp."
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1417
+#: src/localplayer.cpp:1413
 #, fuzzy, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "Du plockade upp %s [@@%d|%s@@]."
 msgstr[1] "Du plockade upp %s [@@%d|%s@@]."
 
-#: src/localplayer.cpp:3146
+#: src/localplayer.cpp:3142
 msgid "Away"
 msgstr ""
 
-#: src/localplayer.cpp:3450
+#: src/localplayer.cpp:3446
 msgid "Follow: "
 msgstr ""
 
-#: src/localplayer.cpp:3452 src/localplayer.cpp:3467
+#: src/localplayer.cpp:3448 src/localplayer.cpp:3463
 #, fuzzy
 msgid "Follow canceled"
 msgstr " avbruten"
 
-#: src/localplayer.cpp:3459
+#: src/localplayer.cpp:3455
 #, fuzzy
 msgid "Imitation: "
 msgstr "Ändra epostadress"
 
-#: src/localplayer.cpp:3461 src/localplayer.cpp:3469
+#: src/localplayer.cpp:3457 src/localplayer.cpp:3465
 #, fuzzy
 msgid "Imitation canceled"
 msgstr " avbruten"
 
-#: src/localplayer.cpp:3821
+#: src/localplayer.cpp:3817
 #, fuzzy
 msgid "You see "
 msgstr "Du får %s."
@@ -5054,32 +5059,32 @@ msgstr "M. attack:"
 msgid "M.Defense"
 msgstr "M. försvar:"
 
-#: src/net/tmwa/generalhandler.cpp:268
-#, fuzzy
+#: src/net/tmwa/generalhandler.cpp:269
+#, fuzzy, no-c-format
 msgid "% Accuracy"
 msgstr "% Träffsäkerhet:"
 
-#: src/net/tmwa/generalhandler.cpp:269
-#, fuzzy
+#: src/net/tmwa/generalhandler.cpp:271
+#, fuzzy, no-c-format
 msgid "% Evade"
 msgstr "% Kringgå:"
 
-#: src/net/tmwa/generalhandler.cpp:270
-#, fuzzy
+#: src/net/tmwa/generalhandler.cpp:273
+#, fuzzy, no-c-format
 msgid "% Critical"
 msgstr "Kritisk träff"
 
-#: src/net/tmwa/generalhandler.cpp:271
+#: src/net/tmwa/generalhandler.cpp:274
 #, fuzzy
 msgid "Attack Delay"
 msgstr "Attack %+d"
 
-#: src/net/tmwa/generalhandler.cpp:273
+#: src/net/tmwa/generalhandler.cpp:276
 #, fuzzy
 msgid "Walk Delay"
 msgstr "Attack %+d"
 
-#: src/net/tmwa/generalhandler.cpp:275
+#: src/net/tmwa/generalhandler.cpp:278
 #, fuzzy
 msgid "Attack Range"
 msgstr "Monster slår spelare"