summaryrefslogtreecommitdiff
path: root/po
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-10-10 01:55:24 +0300
committerAndrei Karas <akaras@inbox.ru>2014-10-10 01:55:24 +0300
commitb7f800669a6171e326234a4a8f4b366588c36ae1 (patch)
tree888e2d6c71c047953ac68fdc12d275a2b52b23cb /po
parent7b95e3f8ba9b15589a1e0e0f1407febbd176e845 (diff)
downloadManaVerse-b7f800669a6171e326234a4a8f4b366588c36ae1.tar.gz
ManaVerse-b7f800669a6171e326234a4a8f4b366588c36ae1.tar.bz2
ManaVerse-b7f800669a6171e326234a4a8f4b366588c36ae1.tar.xz
ManaVerse-b7f800669a6171e326234a4a8f4b366588c36ae1.zip
Update translations.
Diffstat (limited to 'po')
-rw-r--r--po/ar.po877
-rw-r--r--po/bg.po877
-rw-r--r--po/ca.po879
-rw-r--r--po/cs.po263
-rw-r--r--po/de.po257
-rw-r--r--po/en_GB.po877
-rw-r--r--po/eo.po877
-rw-r--r--po/es.po268
-rw-r--r--po/et.po877
-rw-r--r--po/fa.po877
-rw-r--r--po/fi.po254
-rw-r--r--po/fr.po271
-rw-r--r--po/he.po877
-rw-r--r--po/hr.po877
-rw-r--r--po/hu.po877
-rw-r--r--po/id.po234
-rw-r--r--po/it.po254
-rw-r--r--po/ja.po254
-rw-r--r--po/ka.po877
-rw-r--r--po/manaplus.pot206
-rw-r--r--po/nb.po877
-rw-r--r--po/nl.po879
-rw-r--r--po/nl_BE.po250
-rw-r--r--po/pl.po260
-rw-r--r--po/pt.po260
-rw-r--r--po/pt_BR.po260
-rw-r--r--po/ru.po362
-rw-r--r--po/sk.po877
-rw-r--r--po/sq.po877
-rw-r--r--po/sv.po879
-rw-r--r--po/sv_SE.po259
-rw-r--r--po/te.po877
-rw-r--r--po/th.po877
-rw-r--r--po/tr.po244
-rw-r--r--po/vls.po877
-rw-r--r--po/zh_CN.po254
-rw-r--r--po/zh_HK.po877
-rw-r--r--po/zh_TW.po877
38 files changed, 13516 insertions, 9317 deletions
diff --git a/po/ar.po b/po/ar.po
index 065d3fcd2..89449e526 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-27 13:23+0300\n"
-"PO-Revision-Date: 2014-09-28 10:01+0000\n"
+"POT-Creation-Date: 2014-10-08 01:19+0300\n"
+"PO-Revision-Date: 2014-10-08 10:01+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Arabic (http://www.transifex.com/projects/p/manaplus/language/ar/)\n"
"MIME-Version: 1.0\n"
@@ -32,7 +32,7 @@ msgstr ""
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:131 src/client.cpp:1463 src/client.cpp:1490
+#: src/actions/actions.cpp:131 src/client.cpp:1461 src/client.cpp:1488
#: src/gamemodifiers.cpp:423 src/gui/widgets/tabs/setup_input.cpp:163
#: src/gui/widgets/tabs/setup_theme.cpp:312
#: src/gui/widgets/tabs/setup_theme.cpp:343
@@ -43,8 +43,8 @@ msgstr ""
#: src/gui/windows/changeemaildialog.cpp:170
#: src/gui/windows/changepassworddialog.cpp:160
#: src/gui/windows/charcreatedialog.cpp:373
-#: src/gui/windows/charselectdialog.cpp:255
-#: src/gui/windows/charselectdialog.cpp:291 src/gui/windows/editdialog.cpp:49
+#: src/gui/windows/charselectdialog.cpp:277
+#: src/gui/windows/charselectdialog.cpp:313 src/gui/windows/editdialog.cpp:49
#: src/gui/windows/editserverdialog.cpp:61
#: src/gui/windows/editserverdialog.cpp:208
#: src/gui/windows/itemamountwindow.cpp:158 src/gui/windows/quitdialog.cpp:70
@@ -52,7 +52,9 @@ msgstr ""
#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
#: src/net/ea/charserverhandler.cpp:143 src/net/ea/charserverhandler.cpp:162
#: src/net/ea/charserverhandler.cpp:175 src/net/ea/gamehandler.cpp:79
-#: src/net/ea/playerhandler.cpp:263 src/net/ea/playerhandler.cpp:279
+#: src/net/ea/playerhandler.cpp:424 src/net/ea/playerhandler.cpp:440
+#: src/net/eathena/charserverhandler.cpp:533
+#: src/net/eathena/charserverhandler.cpp:563
msgid "OK"
msgstr ""
@@ -176,7 +178,7 @@ msgstr ""
#. TRANSLATORS: party invite message
#. TRANSLATORS: change relation
-#: src/actions/chat.cpp:303 src/actions/commands.cpp:65
+#: src/actions/chat.cpp:303 src/actions/commands.cpp:64
msgid "Please specify a name."
msgstr ""
@@ -199,75 +201,75 @@ msgid "Message now closes chat."
msgstr ""
#. TRANSLATORS: change relation
-#: src/actions/commands.cpp:108
+#: src/actions/commands.cpp:107
#, c-format
msgid "Player already %s!"
msgstr ""
#. TRANSLATORS: change relation
-#: src/actions/commands.cpp:120
+#: src/actions/commands.cpp:119
#, c-format
msgid "Player successfully %s!"
msgstr ""
#. TRANSLATORS: change relation
-#: src/actions/commands.cpp:122
+#: src/actions/commands.cpp:121
#, c-format
msgid "Player could not be %s!"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:153
+#: src/actions/commands.cpp:152
msgid "Player wasn't ignored!"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:162
+#: src/actions/commands.cpp:161
msgid "Player no longer ignored!"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:164
+#: src/actions/commands.cpp:163
msgid "Player could not be unignored!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/actions/commands.cpp:179
+#: src/actions/commands.cpp:178
msgid "Player already erased!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/actions/commands.cpp:192
+#: src/actions/commands.cpp:191
msgid "Player no longer erased!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/actions/commands.cpp:194
+#: src/actions/commands.cpp:193
msgid "Player could not be erased!"
msgstr ""
#. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:201
+#: src/actions/commands.cpp:200
msgid "friend"
msgstr ""
#. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:208
+#: src/actions/commands.cpp:207
msgid "disregarded"
msgstr ""
#. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:215
+#: src/actions/commands.cpp:214
msgid "neutral"
msgstr ""
#. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:222
+#: src/actions/commands.cpp:221
msgid "blacklisted"
msgstr ""
#. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:229
+#: src/actions/commands.cpp:228
msgid "enemy"
msgstr ""
@@ -282,77 +284,77 @@ msgid "Accepting incoming trade requests"
msgstr ""
#. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1306
+#: src/actormanager.cpp:1310
msgid "Visible on map"
msgstr ""
#. TRANSLATORS: default race name
-#: src/being/being.cpp:389
+#: src/being/being.cpp:393
msgid "Human"
msgstr ""
-#: src/being/being.cpp:556
+#: src/being/being.cpp:560
msgid "dodge"
msgstr ""
-#: src/being/being.cpp:556
+#: src/being/being.cpp:560
msgid "miss"
msgstr ""
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1865 src/gui/windows/whoisonline.cpp:855
+#: src/being/being.cpp:1869 src/gui/windows/whoisonline.cpp:855
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1870 src/gui/windows/whoisonline.cpp:860
+#: src/being/being.cpp:1874 src/gui/windows/whoisonline.cpp:860
msgid "I"
msgstr ""
#. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:379
+#: src/being/localplayer.cpp:380
#, c-format
msgid "You were killed by %s"
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:824
+#: src/being/localplayer.cpp:825
msgid "Tried to pick up nonexistent item."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:828
+#: src/being/localplayer.cpp:829
msgid "Item is too heavy."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:832
+#: src/being/localplayer.cpp:833
msgid "Item is too far away."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:836
+#: src/being/localplayer.cpp:837
msgid "Inventory is full."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:840
+#: src/being/localplayer.cpp:841
msgid "Stack is too big."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:844
+#: src/being/localplayer.cpp:845
msgid "Item belongs to someone else."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:848
+#: src/being/localplayer.cpp:849
msgid "Unknown problem picking up item."
msgstr ""
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:872
+#: src/being/localplayer.cpp:873
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -365,43 +367,43 @@ msgstr[5] ""
#. TRANSLATORS: this is normal experience
#. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1054 src/being/localplayer.cpp:1055
-#: src/being/localplayer.cpp:1091
+#: src/being/localplayer.cpp:1055 src/being/localplayer.cpp:1056
+#: src/being/localplayer.cpp:1092
msgid "xp"
msgstr ""
#. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1059 src/being/localplayer.cpp:1065
-#: src/being/localplayer.cpp:1071
+#: src/being/localplayer.cpp:1060 src/being/localplayer.cpp:1066
+#: src/being/localplayer.cpp:1072
msgid "job"
msgstr ""
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2794
+#: src/being/localplayer.cpp:2795
#, c-format
msgid "Follow: %s"
msgstr ""
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2800 src/being/localplayer.cpp:2825
+#: src/being/localplayer.cpp:2801 src/being/localplayer.cpp:2826
msgid "Follow canceled"
msgstr ""
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2810
+#: src/being/localplayer.cpp:2811
#, c-format
msgid "Imitation: %s"
msgstr ""
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2816 src/being/localplayer.cpp:2830
+#: src/being/localplayer.cpp:2817 src/being/localplayer.cpp:2831
msgid "Imitation canceled"
msgstr ""
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3180
+#: src/being/localplayer.cpp:3181
#, c-format
msgid "You see %s"
msgstr ""
@@ -439,37 +441,37 @@ msgstr ""
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:920 src/gui/windowmenu.cpp:162
+#: src/client.cpp:918 src/gui/windowmenu.cpp:162
#: src/gui/windows/setupwindow.cpp:62
msgid "Setup"
msgstr "تثبيت"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:923 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:921 src/gui/widgets/tabs/setup_perfomance.cpp:54
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:926 src/gui/widgets/tabs/setup_video.cpp:105
+#: src/client.cpp:924 src/gui/widgets/tabs/setup_video.cpp:105
msgid "Video"
msgstr "مرئية"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:929 src/gui/widgets/tabs/setup_theme.cpp:122
+#: src/client.cpp:927 src/gui/widgets/tabs/setup_theme.cpp:122
msgid "Theme"
msgstr ""
#. TRANSLATORS: theme tab quick button
-#: src/client.cpp:932
+#: src/client.cpp:930
msgid "About"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:935 src/gui/windowmenu.cpp:74
+#: src/client.cpp:933 src/gui/windowmenu.cpp:74
#: src/gui/windows/helpwindow.cpp:53
msgid "Help"
msgstr ""
@@ -485,42 +487,42 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:939 src/client.cpp:1391 src/client.cpp:1405
+#: src/client.cpp:937 src/client.cpp:1389 src/client.cpp:1403
#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:691
#: src/gui/popups/popupmenu.cpp:923 src/gui/windows/didyouknowwindow.cpp:81
#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:74
#: src/gui/windows/npcdialog.cpp:112 src/gui/windows/questswindow.cpp:77
-#: src/gui/windows/shopwindow.cpp:84
+#: src/gui/windows/shopwindow.cpp:83
msgid "Close"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1065
+#: src/client.cpp:1063
msgid "Connecting to server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1113
+#: src/client.cpp:1111
msgid "Logging in"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1156
+#: src/client.cpp:1154
msgid "Entering game world"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1282
+#: src/client.cpp:1280
msgid "Requesting characters"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1322
+#: src/client.cpp:1320
msgid "Connecting to the game server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1334
+#: src/client.cpp:1332
msgid "Changing game servers"
msgstr ""
@@ -534,72 +536,76 @@ msgstr ""
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1389 src/client.cpp:1403 src/client.cpp:1598
+#. TRANSLATORS: info message
+#. TRANSLATORS: ok dialog button
+#: src/client.cpp:1387 src/client.cpp:1401 src/client.cpp:1596
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
#: src/gui/windows/charcreatedialog.cpp:369
-#: src/gui/windows/charselectdialog.cpp:289
+#: src/gui/windows/charselectdialog.cpp:311
#: src/gui/windows/editserverdialog.cpp:203
#: src/gui/windows/registerdialog.cpp:245
#: src/gui/windows/unregisterdialog.cpp:146
#: src/net/ea/charserverhandler.cpp:141 src/net/ea/charserverhandler.cpp:173
+#: src/net/eathena/charserverhandler.cpp:516
+#: src/net/eathena/charserverhandler.cpp:518
msgid "Error"
msgstr "خطأ"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1418
+#: src/client.cpp:1416
msgid "Requesting registration details"
msgstr ""
#. TRANSLATORS: password change message header
-#: src/client.cpp:1459
+#: src/client.cpp:1457
msgid "Password Change"
msgstr ""
#. TRANSLATORS: password change message text
-#: src/client.cpp:1461
+#: src/client.cpp:1459
msgid "Password changed successfully!"
msgstr ""
#. TRANSLATORS: email change message header
-#: src/client.cpp:1486
+#: src/client.cpp:1484
msgid "Email Change"
msgstr ""
#. TRANSLATORS: email change message text
-#: src/client.cpp:1488
+#: src/client.cpp:1486
msgid "Email changed successfully!"
msgstr ""
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1515
+#: src/client.cpp:1513
msgid "Unregister Successful"
msgstr ""
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1517
+#: src/client.cpp:1515
msgid "Farewell, come back any time..."
msgstr ""
#. TRANSLATORS: directory creation error
#: src/configmanager.cpp:53 src/dirs.cpp:260 src/dirs.cpp:275 src/dirs.cpp:320
-#: src/dirs.cpp:481 src/dirs.cpp:489
+#: src/dirs.cpp:488 src/dirs.cpp:496
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:363
+#: src/dirs.cpp:370
#, c-format
msgid "Invalid update host: %s."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:404 src/dirs.cpp:411
+#: src/dirs.cpp:411 src/dirs.cpp:418
msgid "Error creating updates directory!"
msgstr ""
-#: src/dirs.cpp:433 src/dirs.cpp:451
+#: src/dirs.cpp:440 src/dirs.cpp:458
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
@@ -617,36 +623,36 @@ msgid "dyecmd srcdyestring dstfile"
msgstr ""
#. TRANSLATORS: chat tab header
-#: src/game.cpp:236 src/gui/widgets/tabs/chattab.cpp:482
+#: src/game.cpp:234 src/gui/widgets/tabs/chattab.cpp:482
msgid "General"
msgstr ""
#. TRANSLATORS: chat tab header
#. TRANSLATORS: full button name
#. TRANSLATORS: debug window name
-#: src/game.cpp:253 src/gui/widgets/tabs/chattab.cpp:484
+#: src/game.cpp:251 src/gui/widgets/tabs/chattab.cpp:484
#: src/gui/windowmenu.cpp:149 src/gui/windows/debugwindow.cpp:42
msgid "Debug"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:541
+#: src/game.cpp:532
#, c-format
msgid "Screenshot saved as %s"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:551
+#: src/game.cpp:542
msgid "Saving screenshot failed!"
msgstr ""
#. TRANSLATORS: error message text
-#: src/game.cpp:634
+#: src/game.cpp:625
msgid "The connection to the server was lost."
msgstr ""
#. TRANSLATORS: error message header
-#: src/game.cpp:637
+#: src/game.cpp:628
msgid "Network Error"
msgstr ""
@@ -1037,6 +1043,7 @@ msgstr ""
#: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
#: src/gui/widgets/tabs/setup_other.cpp:79
#: src/gui/widgets/tabs/setup_visual.cpp:81
+#: src/gui/windows/equipmentwindow.cpp:577
msgid "default"
msgstr ""
@@ -1527,7 +1534,7 @@ msgstr ""
#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:273
#: src/gui/popups/popupmenu.cpp:767 src/gui/widgets/skillinfo.cpp:113
#: src/gui/windows/botcheckerwindow.cpp:89 src/input/pages/basic.cpp:42
-#: src/net/eathena/generalhandler.cpp:289 src/net/tmwa/generalhandler.cpp:321
+#: src/net/eathena/generalhandler.cpp:356 src/net/tmwa/generalhandler.cpp:320
msgid "Attack"
msgstr ""
@@ -1696,7 +1703,7 @@ msgstr ""
#. TRANSLATORS: pet unequip item
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:340 src/gui/windows/equipmentwindow.cpp:70
+#: src/gui/popups/popupmenu.cpp:340 src/gui/windows/equipmentwindow.cpp:72
#: src/gui/windows/inventorywindow.cpp:175 src/resources/itemtypemapdata.h:47
#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
@@ -1754,7 +1761,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:574
+#: src/gui/popups/popupmenu.cpp:574 src/gui/windows/charselectdialog.cpp:132
msgid "Rename"
msgstr ""
@@ -2266,7 +2273,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
#. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:3000 src/net/ea/playerhandler.cpp:364
+#: src/gui/popups/popupmenu.cpp:3000 src/net/ea/playerhandler.cpp:195
msgid "Revive"
msgstr ""
@@ -2290,7 +2297,7 @@ msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: settings group
#. TRANSLATORS: full button name
-#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:319
+#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:315
#: src/gui/windowmenu.cpp:158
msgid "Windows"
msgstr ""
@@ -2318,7 +2325,7 @@ msgstr ""
#. TRANSLATORS: input action name
#: src/gui/setupinputpages.cpp:57 src/gui/widgets/tabs/setup_audio.cpp:151
#: src/gui/widgets/tabs/setup_chat.cpp:179
-#: src/gui/widgets/tabs/setup_other.cpp:341
+#: src/gui/widgets/tabs/setup_other.cpp:337
#: src/gui/widgets/tabs/setup_visual.cpp:192
#: src/gui/windows/charcreatedialog.cpp:119
#: src/gui/windows/registerdialog.cpp:106 src/input/pages/gui.cpp:87
@@ -2331,212 +2338,227 @@ msgid "Gui"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:113
+#: src/gui/userpalette.cpp:116
msgid "Being"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:115
+#: src/gui/userpalette.cpp:118
msgid "Friend names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:117
+#: src/gui/userpalette.cpp:120
msgid "Disregarded names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:119
+#: src/gui/userpalette.cpp:122
msgid "Ignored names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:121
+#: src/gui/userpalette.cpp:124
msgid "Erased names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:123
+#: src/gui/userpalette.cpp:126
msgid "Other players names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:125
+#: src/gui/userpalette.cpp:128
msgid "Own name"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:127
+#: src/gui/userpalette.cpp:130
msgid "GM names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:129
+#: src/gui/userpalette.cpp:132
msgid "NPCs"
msgstr ""
#. TRANSLATORS: palette color
#. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:131 src/gui/widgets/tabs/setup_other.cpp:108
+#: src/gui/userpalette.cpp:134 src/gui/widgets/tabs/setup_other.cpp:108
msgid "Monsters"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:133
+#: src/gui/userpalette.cpp:136
msgid "Monster HP bar"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:139
msgid "Monster HP bar (second color)"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:138
+#: src/gui/userpalette.cpp:141
msgid "Party members"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:140
+#: src/gui/userpalette.cpp:143
msgid "Guild members"
msgstr ""
#. TRANSLATORS: palette color
#. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:142 src/gui/widgets/tabs/setup_visual.cpp:157
+#: src/gui/userpalette.cpp:145 src/gui/widgets/tabs/setup_visual.cpp:157
msgid "Particle effects"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:144
+#: src/gui/userpalette.cpp:147
msgid "Pickup notification"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:146
+#: src/gui/userpalette.cpp:149
msgid "Exp notification"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:148
+#: src/gui/userpalette.cpp:151
msgid "Player HP bar"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:152
+#: src/gui/userpalette.cpp:155
msgid "Player HP bar (second color)"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:154
+#: src/gui/userpalette.cpp:157
msgid "Player hits monster"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:156
+#: src/gui/userpalette.cpp:159
msgid "Monster hits player"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:160
+#: src/gui/userpalette.cpp:163
msgid "Other player hits local player"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:162
+#: src/gui/userpalette.cpp:165
msgid "Critical Hit"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:166
+#: src/gui/userpalette.cpp:169
msgid "Local player hits monster"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:169
+#: src/gui/userpalette.cpp:172
msgid "Local player critical hit"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:172
+#: src/gui/userpalette.cpp:175
msgid "Local player miss"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:174
+#: src/gui/userpalette.cpp:177
msgid "Misses"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:176
+#: src/gui/userpalette.cpp:179
msgid "Portal highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:179
+#: src/gui/userpalette.cpp:182
msgid "Default collision highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:182
+#: src/gui/userpalette.cpp:185
msgid "Air collision highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:185
+#: src/gui/userpalette.cpp:188
msgid "Water collision highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:188
+#: src/gui/userpalette.cpp:191
msgid "Special ground collision highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:191
+#: src/gui/userpalette.cpp:194
msgid "Walkable highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:194
+#: src/gui/userpalette.cpp:197
msgid "Local player attack range"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:197
+#: src/gui/userpalette.cpp:200
msgid "Local player attack range border"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:200
+#: src/gui/userpalette.cpp:203
msgid "Monster attack range"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:204
+#: src/gui/userpalette.cpp:207
msgid "Floor item amount color"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:207
+#: src/gui/userpalette.cpp:210
msgid "Home place"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:210
+#: src/gui/userpalette.cpp:213
msgid "Home place border"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:213
+#: src/gui/userpalette.cpp:216
msgid "Road point"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:216
+#: src/gui/userpalette.cpp:219
msgid "Tiles border"
msgstr ""
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:221
+msgid "Pets"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:223
+msgid "Mercenary"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:225
+msgid "Homunculus"
+msgstr ""
+
#: src/gui/widgets/characterdisplay.cpp:135
#, c-format
msgid "Level: %u"
@@ -2639,7 +2661,8 @@ msgid "Type: %s"
msgstr ""
#. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:108
+#. TRANSLATORS: unknown equipment page name
+#: src/gui/widgets/skillinfo.cpp:108 src/gui/windows/equipmentwindow.cpp:584
msgid "Unknown"
msgstr ""
@@ -2840,22 +2863,22 @@ msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:262
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:313
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:375
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:319
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:387
msgid "Target:"
msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:264
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:319
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:377
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:325
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:389
msgid "Target Id:"
msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:267
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:322
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:379
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:328
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:391
msgid "Target type:"
msgstr ""
@@ -2866,7 +2889,7 @@ msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:271
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:338
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:344
msgid "Target race:"
msgstr ""
@@ -2882,67 +2905,81 @@ msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:277
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:363
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:369
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:387
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:375
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:381
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:399
msgid "Attack delay:"
msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:279
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:350
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:389
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:356
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:401
msgid "Minimal hit:"
msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:281
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:353
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:391
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:359
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:403
msgid "Maximum hit:"
msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:283
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:356
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:393
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:362
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:405
msgid "Critical hit:"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:327
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:285
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:365
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:407
+msgid "Karma:"
+msgstr ""
+
+#. TRANSLATORS: debug window label
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:287
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:368
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:409
+msgid "Manner:"
+msgstr ""
+
+#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:333
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:381
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:339
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:393
msgid "Target Level:"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:341
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:383
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:347
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:395
msgid "Target Party:"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:345
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:385
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:351
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:397
msgid "Target Guild:"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:430
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:436
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:451
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:457
#, c-format
msgid "Ping: %s ms"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:439
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:460
#, c-format
msgid "In: %d bytes/s"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:442
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:463
#, c-format
msgid "Out: %d bytes/s"
msgstr ""
@@ -3771,137 +3808,132 @@ msgstr ""
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_other.cpp:294
-msgid "Enable auction bot support"
-msgstr ""
-
-#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:298
msgid "Enable guild bot support and disable native guild support"
msgstr ""
#. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:304
+#: src/gui/widgets/tabs/setup_other.cpp:300
msgid "Keyboard"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:307
+#: src/gui/widgets/tabs/setup_other.cpp:303
msgid "Repeat delay"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:311
+#: src/gui/widgets/tabs/setup_other.cpp:307
msgid "Repeat interval"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:315
+#: src/gui/widgets/tabs/setup_other.cpp:311
msgid "Custom repeat interval"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:323
+#: src/gui/widgets/tabs/setup_other.cpp:319
msgid "Shortcut buttons"
msgstr ""
#. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:328
+#: src/gui/widgets/tabs/setup_other.cpp:324
msgid "Proxy server"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:332
+#: src/gui/widgets/tabs/setup_other.cpp:328
msgid "Proxy type"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:336
+#: src/gui/widgets/tabs/setup_other.cpp:332
msgid "Proxy address:port"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:344
+#: src/gui/widgets/tabs/setup_other.cpp:340
msgid "Enable server side attack"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:348
+#: src/gui/widgets/tabs/setup_other.cpp:344
msgid "Hide support page link on error"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:352
+#: src/gui/widgets/tabs/setup_other.cpp:348
msgid "Enable double clicks"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:356
+#: src/gui/widgets/tabs/setup_other.cpp:352
msgid "Enable bot checker"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:360
+#: src/gui/widgets/tabs/setup_other.cpp:356
msgid "Enable buggy servers protection (do not disable)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:365
+#: src/gui/widgets/tabs/setup_other.cpp:361
msgid "Enable debug log"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:369
+#: src/gui/widgets/tabs/setup_other.cpp:365
msgid "Ignore logging packets"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:373
+#: src/gui/widgets/tabs/setup_other.cpp:369
msgid "Enable OpenGL log"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:377
+#: src/gui/widgets/tabs/setup_other.cpp:373
msgid "Enable input log"
msgstr ""
#. TRANSLATORS: settings option
#. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_other.cpp:381 src/input/pages/other.cpp:362
+#: src/gui/widgets/tabs/setup_other.cpp:377 src/input/pages/other.cpp:362
msgid "Upload log file"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:385
+#: src/gui/widgets/tabs/setup_other.cpp:381
msgid "Low traffic mode"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:389
+#: src/gui/widgets/tabs/setup_other.cpp:385
msgid "Hide shield sprite"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:394
+#: src/gui/widgets/tabs/setup_other.cpp:390
msgid "Use FBO for screenshots (only for opengl)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:400
+#: src/gui/widgets/tabs/setup_other.cpp:396
msgid "Screenshot directory"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:405
+#: src/gui/widgets/tabs/setup_other.cpp:401
msgid "Network delay between sub servers"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:409
+#: src/gui/widgets/tabs/setup_other.cpp:405
msgid "Show background"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:414
+#: src/gui/widgets/tabs/setup_other.cpp:410
msgid "Screen density override"
msgstr ""
@@ -4132,9 +4164,9 @@ msgstr ""
#. TRANSLATORS: command editor button
#. TRANSLATORS: input action name
#: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:82
-#: src/gui/windows/serverdialog.cpp:125 src/gui/windows/shopwindow.cpp:101
-#: src/gui/windows/shopwindow.cpp:108 src/gui/windows/textcommandeditor.cpp:92
+#: src/gui/windows/charselectdialog.cpp:84
+#: src/gui/windows/serverdialog.cpp:125 src/gui/windows/shopwindow.cpp:100
+#: src/gui/windows/shopwindow.cpp:107 src/gui/windows/textcommandeditor.cpp:92
#: src/input/pages/gui.cpp:111
msgid "Delete"
msgstr "حذف"
@@ -4788,7 +4820,7 @@ msgstr ""
#. TRANSLATORS: equipment window name
#. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:63
+#: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:65
#: src/gui/windows/inventorywindow.cpp:196
msgid "Equipment"
msgstr "العتاد"
@@ -4929,7 +4961,7 @@ msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: social window button
#: src/gui/windows/buydialog.cpp:260 src/gui/windows/charcreatedialog.cpp:127
-#: src/gui/windows/charselectdialog.cpp:578
+#: src/gui/windows/charselectdialog.cpp:605
#: src/gui/windows/socialwindow.cpp:86
msgid "Create"
msgstr "إنشاء"
@@ -4973,10 +5005,8 @@ msgstr ""
#. TRANSLATORS: change password window name
#. TRANSLATORS: change password dialog button
-#. TRANSLATORS: char select dialog. button.
#: src/gui/windows/changepassworddialog.cpp:51
#: src/gui/windows/changepassworddialog.cpp:57
-#: src/gui/windows/charselectdialog.cpp:73
msgid "Change Password"
msgstr ""
@@ -5130,57 +5160,68 @@ msgid "Are you sure you want to delete this character?"
msgstr "هل أنت متأكّد من حذف هذه الشخصيّة؟"
#. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:64
+#: src/gui/windows/charselectdialog.cpp:66
#, c-format
msgid "Account %s (last login time %s)"
msgstr ""
#. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:71
-msgid "Switch Login"
+#: src/gui/windows/charselectdialog.cpp:73
+msgid "Switch"
+msgstr ""
+
+#. TRANSLATORS: char select dialog. button.
+#: src/gui/windows/charselectdialog.cpp:75
+msgid "Password"
msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:78
-#: src/gui/windows/charselectdialog.cpp:573
+#: src/gui/windows/charselectdialog.cpp:80
+#: src/gui/windows/charselectdialog.cpp:595
#: src/gui/windows/updaterwindow.cpp:195
msgid "Play"
msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:80
+#: src/gui/windows/charselectdialog.cpp:82
#: src/net/ea/charserverhandler.cpp:160
+#: src/net/eathena/charserverhandler.cpp:531
+#: src/net/eathena/charserverhandler.cpp:561
msgid "Info"
msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: unregister dialog name
#. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:106
+#: src/gui/windows/charselectdialog.cpp:110
#: src/gui/windows/unregisterdialog.cpp:50
#: src/gui/windows/unregisterdialog.cpp:55
msgid "Unregister"
msgstr "إلغاء التسجيل"
#. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:118
+#: src/gui/windows/charselectdialog.cpp:122
msgid "Change Email"
msgstr ""
#. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:156
+#: src/gui/windows/charselectdialog.cpp:166
#, c-format
msgid "Account %s"
msgstr ""
-#: src/gui/windows/charselectdialog.cpp:184
+#: src/gui/windows/charselectdialog.cpp:194
msgid "Please set new pincode"
msgstr ""
+#: src/gui/windows/charselectdialog.cpp:240
+msgid "Please enter new name"
+msgstr ""
+
#. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:237
+#: src/gui/windows/charselectdialog.cpp:259
#, c-format
msgid ""
"Hp: %u/%u\n"
@@ -5190,16 +5231,16 @@ msgid ""
"Money: %s"
msgstr ""
-#: src/gui/windows/charselectdialog.cpp:289
+#: src/gui/windows/charselectdialog.cpp:311
msgid "Incorrect password"
msgstr ""
#. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:429
+#: src/gui/windows/charselectdialog.cpp:451
msgid "Enter password for deleting character"
msgstr ""
-#: src/gui/windows/charselectdialog.cpp:429
+#: src/gui/windows/charselectdialog.cpp:451
msgid "Enter password:"
msgstr ""
@@ -5615,7 +5656,7 @@ msgstr "المستوى: %d"
#. TRANSLATORS: status bar label
#: src/gui/windows/ministatuswindow.cpp:364
-#: src/gui/windows/ministatuswindow.cpp:402
+#: src/gui/windows/ministatuswindow.cpp:401
msgid "Need"
msgstr ""
@@ -5646,7 +5687,7 @@ msgstr ""
#. TRANSLATORS: shop window button
#. TRANSLATORS: trade window button
#: src/gui/windows/npcdialog.cpp:114 src/gui/windows/serverdialog.cpp:121
-#: src/gui/windows/shopwindow.cpp:99 src/gui/windows/shopwindow.cpp:106
+#: src/gui/windows/shopwindow.cpp:98 src/gui/windows/shopwindow.cpp:105
#: src/gui/windows/tradewindow.cpp:83
msgid "Add"
msgstr "إضافة"
@@ -5809,43 +5850,38 @@ msgid "Reset Windows"
msgstr "تصفير النوافذ"
#. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:80
+#: src/gui/windows/shopwindow.cpp:79
msgid "Personal Shop"
msgstr ""
#. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:95
+#: src/gui/windows/shopwindow.cpp:94
msgid "Buy items"
msgstr ""
#. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:97
+#: src/gui/windows/shopwindow.cpp:96
msgid "Sell items"
msgstr ""
#. TRANSLATORS: shop window label
#. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:110
+#: src/gui/windows/shopwindow.cpp:102 src/gui/windows/shopwindow.cpp:109
msgid "Announce"
msgstr ""
#. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:114
+#: src/gui/windows/shopwindow.cpp:113
msgid "Show links in announce"
msgstr ""
-#. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:176 src/gui/windows/shopwindow.cpp:179
-msgid "Auction"
-msgstr ""
-
#. TRANSLATORS: shop window dialog
#. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:233
+#: src/gui/windows/shopwindow.cpp:776 src/net/ea/tradehandler.cpp:233
msgid "Request for Trade"
msgstr ""
-#: src/gui/windows/shopwindow.cpp:791
+#: src/gui/windows/shopwindow.cpp:776
#, c-format
msgid "%s wants to %s %s do you accept?"
msgstr ""
@@ -6173,27 +6209,27 @@ msgstr ""
msgid "Connecting..."
msgstr "جارِ الاتّصال..."
-#: src/gui/windows/updaterwindow.cpp:398
+#: src/gui/windows/updaterwindow.cpp:407
msgid "Show all news (can be slow)"
msgstr ""
#. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:824
+#: src/gui/windows/updaterwindow.cpp:833
msgid "##1 The update process is incomplete."
msgstr ""
#. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:826
+#: src/gui/windows/updaterwindow.cpp:835
msgid "##1 It is strongly recommended that"
msgstr ""
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:828
+#: src/gui/windows/updaterwindow.cpp:837
msgid "##1 you try again later."
msgstr ""
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1005
+#: src/gui/windows/updaterwindow.cpp:1021
msgid "Completed"
msgstr ""
@@ -6240,25 +6276,25 @@ msgstr ""
#. TRANSLATORS: long key name. must be short.
#. TRANSLATORS: short key name. must be very short.
#. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:370 src/input/inputmanager.cpp:414
+#: src/input/inputmanager.cpp:371 src/input/inputmanager.cpp:415
#: src/input/keyboardconfig.cpp:104
#, c-format
msgid "key_%d"
msgstr ""
#. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:376
+#: src/input/inputmanager.cpp:377
#, c-format
msgid "JButton%d"
msgstr ""
#. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:391
msgid "unknown key"
msgstr ""
#. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:420
+#: src/input/inputmanager.cpp:421
#, c-format
msgid "JB%d"
msgstr ""
@@ -6266,7 +6302,7 @@ msgstr ""
#. TRANSLATORS: unknown short key type. must be short
#. TRANSLATORS: Unknown key short string.
#. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:434 src/input/keyboardconfig.cpp:148
+#: src/input/inputmanager.cpp:435 src/input/keyboardconfig.cpp:148
msgid "u key"
msgstr ""
@@ -7437,74 +7473,74 @@ msgid "Request to quit denied!"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:135
#, c-format
msgid "Guild name: %s"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:191
+#: src/net/ea/guildhandler.cpp:138
#, c-format
msgid "Guild master: %s"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:141
#, c-format
msgid "Guild level: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:197
+#: src/net/ea/guildhandler.cpp:144
#, c-format
msgid "Online members: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:200
+#: src/net/ea/guildhandler.cpp:147
#, c-format
msgid "Max members: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:203
+#: src/net/ea/guildhandler.cpp:150
#, c-format
msgid "Average level: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:206
+#: src/net/ea/guildhandler.cpp:153
#, c-format
msgid "Guild exp: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:209
+#: src/net/ea/guildhandler.cpp:156
#, c-format
msgid "Guild next exp: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:212
+#: src/net/ea/guildhandler.cpp:159
#, c-format
msgid "Guild castle: %s"
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:179
+#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:191
msgid "Item sharing enabled."
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:183
+#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:195
msgid "Item sharing disabled."
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:187
+#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:199
msgid "Item sharing not possible."
msgstr ""
@@ -7515,19 +7551,19 @@ msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:167
+#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:179
msgid "Experience sharing enabled."
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:171
+#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:183
msgid "Experience sharing disabled."
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:175
+#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:187
msgid "Experience sharing not possible."
msgstr ""
@@ -7632,239 +7668,355 @@ msgid "Connection to server terminated. "
msgstr ""
#. TRANSLATORS: message header
-#: src/net/ea/playerhandler.cpp:257 src/net/ea/playerhandler.cpp:273
-#: src/net/ea/playerhandler.cpp:361
+#: src/net/ea/playerhandler.cpp:192 src/net/ea/playerhandler.cpp:418
+#: src/net/ea/playerhandler.cpp:434
msgid "Message"
msgstr ""
#. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:259
+#: src/net/ea/playerhandler.cpp:420
msgid ""
"You are carrying more than half your weight. You are unable to regain "
"health."
msgstr ""
#. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:275
+#: src/net/ea/playerhandler.cpp:436
msgid "You are carrying less than half your weight. You can regain health."
msgstr ""
+#. TRANSLATORS: char rename error
+#: src/net/eathena/charserverhandler.cpp:516
+#: src/net/eathena/charserverhandler.cpp:553
+msgid "Character rename error."
+msgstr ""
+
+#: src/net/eathena/charserverhandler.cpp:531
+msgid "Character renamed."
+msgstr ""
+
+#. TRANSLATORS: char rename error
+#: src/net/eathena/charserverhandler.cpp:544
+msgid "Rename not allowed."
+msgstr ""
+
+#. TRANSLATORS: char rename error
+#: src/net/eathena/charserverhandler.cpp:548
+msgid "New name is not set."
+msgstr ""
+
+#. TRANSLATORS: char rename error
+#: src/net/eathena/charserverhandler.cpp:557
+msgid "Character not found."
+msgstr ""
+
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:125
+#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:124
#, c-format
msgid "Strength %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:127
+#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:126
#, c-format
msgid "Agility %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:129
+#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:128
#, c-format
msgid "Vitality %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:131
+#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:130
#, c-format
msgid "Intelligence %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:128 src/net/tmwa/generalhandler.cpp:133
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:132
#, c-format
msgid "Dexterity %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:135
+#: src/net/eathena/generalhandler.cpp:128 src/net/tmwa/generalhandler.cpp:134
#, c-format
msgid "Luck %s"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:152 src/net/tmwa/generalhandler.cpp:161
+#: src/net/eathena/generalhandler.cpp:159 src/net/tmwa/generalhandler.cpp:160
msgid "Authentication failed."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:155 src/net/tmwa/generalhandler.cpp:165
+#: src/net/eathena/generalhandler.cpp:162 src/net/tmwa/generalhandler.cpp:164
msgid "No servers available."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:160 src/net/tmwa/generalhandler.cpp:171
+#: src/net/eathena/generalhandler.cpp:167 src/net/tmwa/generalhandler.cpp:170
msgid "Someone else is trying to use this account."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:165 src/net/tmwa/generalhandler.cpp:177
+#: src/net/eathena/generalhandler.cpp:172 src/net/tmwa/generalhandler.cpp:176
msgid "This account is already logged in."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:169 src/net/tmwa/generalhandler.cpp:182
+#: src/net/eathena/generalhandler.cpp:176 src/net/tmwa/generalhandler.cpp:181
msgid "Speed hack detected."
msgstr ""
+#: src/net/eathena/generalhandler.cpp:179
+msgid "Server full."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:182
+msgid "Sorry, you are underaged."
+msgstr ""
+
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:172 src/net/tmwa/generalhandler.cpp:186
+#: src/net/eathena/generalhandler.cpp:185 src/net/tmwa/generalhandler.cpp:185
msgid "Duplicated login."
msgstr ""
+#: src/net/eathena/generalhandler.cpp:188
+msgid "To many connections from same ip."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:191
+msgid "Not paid for this time."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:194
+msgid "Pay suspended."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:197
+msgid "Pay changed."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:200
+msgid "Pay wrong ip."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:203
+msgid "Pay game room."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:206
+msgid "Disconnect forced by GM."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:210
+msgid "Ban japan refuse."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:213
+msgid "Remained other account."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:216
+msgid "Ip unfair."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:219
+msgid "Ip count all."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:222
+msgid "Ip count."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:226
+msgid "Memory."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:229
+msgid "Han valid."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:232
+msgid "Ip limited access."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:235
+msgid "Over characters list."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:238
+msgid "Ip blocked."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:241
+msgid "Invalid password count."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:244
+msgid "Not allowed race."
+msgstr ""
+
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:175 src/net/tmwa/generalhandler.cpp:190
+#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:189
msgid "Unknown connection error."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:280
+#: src/net/eathena/generalhandler.cpp:323 src/net/tmwa/generalhandler.cpp:279
msgid "Got disconnected from server!"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:282 src/net/tmwa/generalhandler.cpp:308
+#: src/net/eathena/generalhandler.cpp:348 src/net/tmwa/generalhandler.cpp:307
msgid "Strength"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:310
+#: src/net/eathena/generalhandler.cpp:349 src/net/tmwa/generalhandler.cpp:309
msgid "Agility"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:284 src/net/tmwa/generalhandler.cpp:312
+#: src/net/eathena/generalhandler.cpp:350 src/net/tmwa/generalhandler.cpp:311
msgid "Vitality"
msgstr ""
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:285 src/net/tmwa/generalhandler.cpp:314
+#: src/net/eathena/generalhandler.cpp:352 src/net/tmwa/generalhandler.cpp:314
msgid "Intelligence"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:286 src/net/tmwa/generalhandler.cpp:316
+#: src/net/eathena/generalhandler.cpp:353 src/net/tmwa/generalhandler.cpp:316
msgid "Dexterity"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:287 src/net/tmwa/generalhandler.cpp:318
+#: src/net/eathena/generalhandler.cpp:354 src/net/tmwa/generalhandler.cpp:318
msgid "Luck"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:290 src/net/tmwa/generalhandler.cpp:323
+#: src/net/eathena/generalhandler.cpp:357 src/net/tmwa/generalhandler.cpp:322
msgid "Defense"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:291 src/net/tmwa/generalhandler.cpp:325
+#: src/net/eathena/generalhandler.cpp:358 src/net/tmwa/generalhandler.cpp:324
msgid "M.Attack"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:292 src/net/tmwa/generalhandler.cpp:327
+#: src/net/eathena/generalhandler.cpp:359 src/net/tmwa/generalhandler.cpp:326
msgid "M.Defense"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:294 src/net/tmwa/generalhandler.cpp:330
+#: src/net/eathena/generalhandler.cpp:361 src/net/tmwa/generalhandler.cpp:329
#, no-c-format
msgid "% Accuracy"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:296 src/net/tmwa/generalhandler.cpp:333
+#: src/net/eathena/generalhandler.cpp:363 src/net/tmwa/generalhandler.cpp:332
#, no-c-format
msgid "% Evade"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:298 src/net/tmwa/generalhandler.cpp:336
+#: src/net/eathena/generalhandler.cpp:365 src/net/tmwa/generalhandler.cpp:335
#, no-c-format
msgid "% Critical"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:299 src/net/tmwa/generalhandler.cpp:338
+#: src/net/eathena/generalhandler.cpp:366 src/net/tmwa/generalhandler.cpp:337
msgid "Attack Delay"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:300 src/net/tmwa/generalhandler.cpp:340
+#: src/net/eathena/generalhandler.cpp:367 src/net/tmwa/generalhandler.cpp:339
msgid "Walk Delay"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:301 src/net/tmwa/generalhandler.cpp:342
+#: src/net/eathena/generalhandler.cpp:368 src/net/tmwa/generalhandler.cpp:341
msgid "Attack Range"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:302 src/net/tmwa/generalhandler.cpp:344
+#: src/net/eathena/generalhandler.cpp:369 src/net/tmwa/generalhandler.cpp:343
msgid "Damage per sec."
msgstr ""
-#: src/net/eathena/skillhandler.cpp:228 src/net/eathena/skillhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:370
+msgid "Karma"
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:371
+msgid "Manner"
+msgstr ""
+
+#: src/net/eathena/skillhandler.cpp:304 src/net/eathena/skillhandler.cpp:364
#, c-format
msgid "Unknown skill error: %d"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:235 src/net/tmwa/skillhandler.cpp:224
+#: src/net/eathena/skillhandler.cpp:311 src/net/tmwa/skillhandler.cpp:224
msgid "You have not yet reached a high enough lvl!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:239 src/net/tmwa/skillhandler.cpp:228
+#: src/net/eathena/skillhandler.cpp:315 src/net/tmwa/skillhandler.cpp:228
msgid "Insufficient HP!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:243 src/net/tmwa/skillhandler.cpp:232
+#: src/net/eathena/skillhandler.cpp:319 src/net/tmwa/skillhandler.cpp:232
msgid "Insufficient SP!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:247 src/net/tmwa/skillhandler.cpp:236
+#: src/net/eathena/skillhandler.cpp:323 src/net/tmwa/skillhandler.cpp:236
msgid "You have no memos!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:251 src/net/tmwa/skillhandler.cpp:240
+#: src/net/eathena/skillhandler.cpp:327 src/net/tmwa/skillhandler.cpp:240
msgid "You cannot do that right now!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:255 src/net/tmwa/skillhandler.cpp:244
+#: src/net/eathena/skillhandler.cpp:331 src/net/tmwa/skillhandler.cpp:244
msgid "Seems you need more money... ;-)"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:259 src/net/tmwa/skillhandler.cpp:248
+#: src/net/eathena/skillhandler.cpp:335 src/net/tmwa/skillhandler.cpp:248
msgid "You cannot use this skill with that kind of weapon!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:264 src/net/tmwa/skillhandler.cpp:253
+#: src/net/eathena/skillhandler.cpp:340 src/net/tmwa/skillhandler.cpp:253
msgid "You need another red gem!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:268 src/net/tmwa/skillhandler.cpp:257
+#: src/net/eathena/skillhandler.cpp:344 src/net/tmwa/skillhandler.cpp:257
msgid "You need another blue gem!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:272 src/net/tmwa/skillhandler.cpp:261
+#: src/net/eathena/skillhandler.cpp:348 src/net/tmwa/skillhandler.cpp:261
msgid "You're carrying to much to do this!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:276 src/net/tmwa/skillhandler.cpp:265
+#: src/net/eathena/skillhandler.cpp:352 src/net/tmwa/skillhandler.cpp:265
msgid "Huh? What's that?"
msgstr ""
@@ -7881,32 +8033,32 @@ msgid "%s wants to trade with you, do you accept?"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:349
+#: src/net/tmwa/charserverhandler.cpp:351
msgid "Strength:"
msgstr "القوّة:"
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:351
+#: src/net/tmwa/charserverhandler.cpp:353
msgid "Agility:"
msgstr "خفّة الحركة:"
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:353
+#: src/net/tmwa/charserverhandler.cpp:355
msgid "Vitality:"
msgstr "نشاط:"
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:355
+#: src/net/tmwa/charserverhandler.cpp:357
msgid "Intelligence:"
msgstr "ذكاء:"
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:357
+#: src/net/tmwa/charserverhandler.cpp:359
msgid "Dexterity:"
msgstr "المهارة:"
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:359
+#: src/net/tmwa/charserverhandler.cpp:361
msgid "Luck:"
msgstr ""
@@ -8217,269 +8369,306 @@ msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:143
+msgid "You cant left party on this map."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:147
+msgid "You was kicked from party."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:151
+msgid "You cant be kicked kicked from party on this map."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:155
#, c-format
msgid "%s has joined your party."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:147
+#: src/resources/notifications.h:159
#, c-format
msgid "%s is already a member of a party."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:151
+#: src/resources/notifications.h:163
#, c-format
msgid "%s refused your invitation."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:155
+#: src/resources/notifications.h:167
#, c-format
msgid "%s is now a member of your party."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:159
+#: src/resources/notifications.h:171
#, c-format
msgid "%s can't join your party because party is full."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:163
+#: src/resources/notifications.h:175
#, c-format
msgid "QQQ Unknown invite response for %s."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:191
+#: src/resources/notifications.h:203
#, c-format
msgid "%s has left your party."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:195
+#: src/resources/notifications.h:207 src/resources/notifications.h:215
+#, c-format
+msgid "%s cant be kicked from party on this map."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:211
+#, c-format
+msgid "%s has kicked from your party."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:219
#, c-format
msgid "An unknown member tried to say: %s"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:199
+#: src/resources/notifications.h:223
#, c-format
msgid "%s is not in your party!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:203
+#: src/resources/notifications.h:227
#, c-format
msgid "You picked up %s."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:207
+#: src/resources/notifications.h:231
#, c-format
msgid "You spent %s."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:211
+#: src/resources/notifications.h:235
msgid "Cannot raise skill!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:215
+#: src/resources/notifications.h:239
msgid "Equip ammunition first."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:219
+#: src/resources/notifications.h:243
#, c-format
msgid "Trading with %s isn't possible. Trade partner is too far away."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:224
+#: src/resources/notifications.h:248
#, c-format
msgid "Trading with %s isn't possible. Character doesn't exist."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:228
+#: src/resources/notifications.h:252
msgid "Trade cancelled due to an unknown reason."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:232
+#: src/resources/notifications.h:256
#, c-format
msgid "Trade with %s cancelled."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:236
+#: src/resources/notifications.h:260
#, c-format
msgid "Unhandled trade cancel packet with %s"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:240
+#: src/resources/notifications.h:264
msgid "Failed adding item. Trade partner is over weighted."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:244
+#: src/resources/notifications.h:268
msgid "Failed adding item. Trade partner has no free slot."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:248
+#: src/resources/notifications.h:272
msgid "Failed adding item. You can't trade this item."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:252
+#: src/resources/notifications.h:276
msgid "Failed adding item for unknown reason."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:256
+#: src/resources/notifications.h:280
msgid "Trade canceled."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:260
+#: src/resources/notifications.h:284
msgid "Trade completed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:264
+#: src/resources/notifications.h:288
msgid "Kick failed!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:268
+#: src/resources/notifications.h:292
msgid "Kick succeeded!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:272
+#: src/resources/notifications.h:296
#, c-format
msgid "MVP player: %s"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:276
+#: src/resources/notifications.h:300
msgid "All whispers ignored."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:280
+#: src/resources/notifications.h:304
msgid "All whispers ignore failed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:284
+#: src/resources/notifications.h:308
msgid "All whispers unignored."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:288
+#: src/resources/notifications.h:312
msgid "All whispers unignore failed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:295
+#: src/resources/notifications.h:319
msgid "pvp off, gvg off"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:299
+#: src/resources/notifications.h:323
msgid "pvp on"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:303
+#: src/resources/notifications.h:327
msgid "gvg on"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:307
+#: src/resources/notifications.h:331
msgid "pvp on, gvg on"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:311
+#: src/resources/notifications.h:335
msgid "unknown pvp"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:315
+#: src/resources/notifications.h:339
#, c-format
msgid "Char from account %s is already in your party!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:319
+#: src/resources/notifications.h:343
#, c-format
msgid "%s blocked invite!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:323
+#: src/resources/notifications.h:347
msgid "Char is not online!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:327
+#: src/resources/notifications.h:351
msgid "Pet catch failed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:331
+#: src/resources/notifications.h:355
msgid "Pet catched."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:335
+#: src/resources/notifications.h:359
#, c-format
msgid "Pet catch unkown error: %d."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:339
+#: src/resources/notifications.h:363
msgid "Your mercenary duty hour is over."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:343
+#: src/resources/notifications.h:367
msgid "Your mercenary was killed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:347
+#: src/resources/notifications.h:371
msgid "Your mercenary was fired."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:351
+#: src/resources/notifications.h:375
msgid "Your mercenary run away."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:355
+#: src/resources/notifications.h:379
msgid "Mercenary unknown state."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:359
-msgid "Your feed your homunculus."
+#: src/resources/notifications.h:383
+msgid "You feed your homunculus."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:363
+#: src/resources/notifications.h:387
#, c-format
msgid "You cant feed homunculus, because not have %s."
msgstr ""
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:391
+msgid "Card insert failed."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:395
+msgid "Card inserted."
+msgstr ""
+
#. TRANSLATORS: chat option changed message
#: src/utils/booleanoptions.h:27
#, c-format
diff --git a/po/bg.po b/po/bg.po
index a3145a49a..6487e5e26 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-27 13:23+0300\n"
-"PO-Revision-Date: 2014-09-28 10:01+0000\n"
+"POT-Creation-Date: 2014-10-08 01:19+0300\n"
+"PO-Revision-Date: 2014-10-08 10:01+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Bulgarian (http://www.transifex.com/projects/p/manaplus/language/bg/)\n"
"MIME-Version: 1.0\n"
@@ -32,7 +32,7 @@ msgstr ""
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:131 src/client.cpp:1463 src/client.cpp:1490
+#: src/actions/actions.cpp:131 src/client.cpp:1461 src/client.cpp:1488
#: src/gamemodifiers.cpp:423 src/gui/widgets/tabs/setup_input.cpp:163
#: src/gui/widgets/tabs/setup_theme.cpp:312
#: src/gui/widgets/tabs/setup_theme.cpp:343
@@ -43,8 +43,8 @@ msgstr ""
#: src/gui/windows/changeemaildialog.cpp:170
#: src/gui/windows/changepassworddialog.cpp:160
#: src/gui/windows/charcreatedialog.cpp:373
-#: src/gui/windows/charselectdialog.cpp:255
-#: src/gui/windows/charselectdialog.cpp:291 src/gui/windows/editdialog.cpp:49
+#: src/gui/windows/charselectdialog.cpp:277
+#: src/gui/windows/charselectdialog.cpp:313 src/gui/windows/editdialog.cpp:49
#: src/gui/windows/editserverdialog.cpp:61
#: src/gui/windows/editserverdialog.cpp:208
#: src/gui/windows/itemamountwindow.cpp:158 src/gui/windows/quitdialog.cpp:70
@@ -52,7 +52,9 @@ msgstr ""
#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
#: src/net/ea/charserverhandler.cpp:143 src/net/ea/charserverhandler.cpp:162
#: src/net/ea/charserverhandler.cpp:175 src/net/ea/gamehandler.cpp:79
-#: src/net/ea/playerhandler.cpp:263 src/net/ea/playerhandler.cpp:279
+#: src/net/ea/playerhandler.cpp:424 src/net/ea/playerhandler.cpp:440
+#: src/net/eathena/charserverhandler.cpp:533
+#: src/net/eathena/charserverhandler.cpp:563
msgid "OK"
msgstr ""
@@ -176,7 +178,7 @@ msgstr ""
#. TRANSLATORS: party invite message
#. TRANSLATORS: change relation
-#: src/actions/chat.cpp:303 src/actions/commands.cpp:65
+#: src/actions/chat.cpp:303 src/actions/commands.cpp:64
msgid "Please specify a name."
msgstr ""
@@ -199,75 +201,75 @@ msgid "Message now closes chat."
msgstr ""
#. TRANSLATORS: change relation
-#: src/actions/commands.cpp:108
+#: src/actions/commands.cpp:107
#, c-format
msgid "Player already %s!"
msgstr ""
#. TRANSLATORS: change relation
-#: src/actions/commands.cpp:120
+#: src/actions/commands.cpp:119
#, c-format
msgid "Player successfully %s!"
msgstr ""
#. TRANSLATORS: change relation
-#: src/actions/commands.cpp:122
+#: src/actions/commands.cpp:121
#, c-format
msgid "Player could not be %s!"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:153
+#: src/actions/commands.cpp:152
msgid "Player wasn't ignored!"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:162
+#: src/actions/commands.cpp:161
msgid "Player no longer ignored!"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:164
+#: src/actions/commands.cpp:163
msgid "Player could not be unignored!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/actions/commands.cpp:179
+#: src/actions/commands.cpp:178
msgid "Player already erased!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/actions/commands.cpp:192
+#: src/actions/commands.cpp:191
msgid "Player no longer erased!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/actions/commands.cpp:194
+#: src/actions/commands.cpp:193
msgid "Player could not be erased!"
msgstr ""
#. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:201
+#: src/actions/commands.cpp:200
msgid "friend"
msgstr ""
#. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:208
+#: src/actions/commands.cpp:207
msgid "disregarded"
msgstr ""
#. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:215
+#: src/actions/commands.cpp:214
msgid "neutral"
msgstr ""
#. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:222
+#: src/actions/commands.cpp:221
msgid "blacklisted"
msgstr ""
#. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:229
+#: src/actions/commands.cpp:228
msgid "enemy"
msgstr ""
@@ -282,77 +284,77 @@ msgid "Accepting incoming trade requests"
msgstr ""
#. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1306
+#: src/actormanager.cpp:1310
msgid "Visible on map"
msgstr ""
#. TRANSLATORS: default race name
-#: src/being/being.cpp:389
+#: src/being/being.cpp:393
msgid "Human"
msgstr ""
-#: src/being/being.cpp:556
+#: src/being/being.cpp:560
msgid "dodge"
msgstr ""
-#: src/being/being.cpp:556
+#: src/being/being.cpp:560
msgid "miss"
msgstr ""
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1865 src/gui/windows/whoisonline.cpp:855
+#: src/being/being.cpp:1869 src/gui/windows/whoisonline.cpp:855
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1870 src/gui/windows/whoisonline.cpp:860
+#: src/being/being.cpp:1874 src/gui/windows/whoisonline.cpp:860
msgid "I"
msgstr ""
#. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:379
+#: src/being/localplayer.cpp:380
#, c-format
msgid "You were killed by %s"
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:824
+#: src/being/localplayer.cpp:825
msgid "Tried to pick up nonexistent item."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:828
+#: src/being/localplayer.cpp:829
msgid "Item is too heavy."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:832
+#: src/being/localplayer.cpp:833
msgid "Item is too far away."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:836
+#: src/being/localplayer.cpp:837
msgid "Inventory is full."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:840
+#: src/being/localplayer.cpp:841
msgid "Stack is too big."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:844
+#: src/being/localplayer.cpp:845
msgid "Item belongs to someone else."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:848
+#: src/being/localplayer.cpp:849
msgid "Unknown problem picking up item."
msgstr ""
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:872
+#: src/being/localplayer.cpp:873
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -361,43 +363,43 @@ msgstr[1] ""
#. TRANSLATORS: this is normal experience
#. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1054 src/being/localplayer.cpp:1055
-#: src/being/localplayer.cpp:1091
+#: src/being/localplayer.cpp:1055 src/being/localplayer.cpp:1056
+#: src/being/localplayer.cpp:1092
msgid "xp"
msgstr ""
#. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1059 src/being/localplayer.cpp:1065
-#: src/being/localplayer.cpp:1071
+#: src/being/localplayer.cpp:1060 src/being/localplayer.cpp:1066
+#: src/being/localplayer.cpp:1072
msgid "job"
msgstr ""
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2794
+#: src/being/localplayer.cpp:2795
#, c-format
msgid "Follow: %s"
msgstr ""
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2800 src/being/localplayer.cpp:2825
+#: src/being/localplayer.cpp:2801 src/being/localplayer.cpp:2826
msgid "Follow canceled"
msgstr ""
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2810
+#: src/being/localplayer.cpp:2811
#, c-format
msgid "Imitation: %s"
msgstr ""
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2816 src/being/localplayer.cpp:2830
+#: src/being/localplayer.cpp:2817 src/being/localplayer.cpp:2831
msgid "Imitation canceled"
msgstr ""
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3180
+#: src/being/localplayer.cpp:3181
#, c-format
msgid "You see %s"
msgstr ""
@@ -435,37 +437,37 @@ msgstr ""
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:920 src/gui/windowmenu.cpp:162
+#: src/client.cpp:918 src/gui/windowmenu.cpp:162
#: src/gui/windows/setupwindow.cpp:62
msgid "Setup"
msgstr ""
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:923 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:921 src/gui/widgets/tabs/setup_perfomance.cpp:54
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:926 src/gui/widgets/tabs/setup_video.cpp:105
+#: src/client.cpp:924 src/gui/widgets/tabs/setup_video.cpp:105
msgid "Video"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:929 src/gui/widgets/tabs/setup_theme.cpp:122
+#: src/client.cpp:927 src/gui/widgets/tabs/setup_theme.cpp:122
msgid "Theme"
msgstr ""
#. TRANSLATORS: theme tab quick button
-#: src/client.cpp:932
+#: src/client.cpp:930
msgid "About"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:935 src/gui/windowmenu.cpp:74
+#: src/client.cpp:933 src/gui/windowmenu.cpp:74
#: src/gui/windows/helpwindow.cpp:53
msgid "Help"
msgstr ""
@@ -481,42 +483,42 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:939 src/client.cpp:1391 src/client.cpp:1405
+#: src/client.cpp:937 src/client.cpp:1389 src/client.cpp:1403
#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:691
#: src/gui/popups/popupmenu.cpp:923 src/gui/windows/didyouknowwindow.cpp:81
#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:74
#: src/gui/windows/npcdialog.cpp:112 src/gui/windows/questswindow.cpp:77
-#: src/gui/windows/shopwindow.cpp:84
+#: src/gui/windows/shopwindow.cpp:83
msgid "Close"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1065
+#: src/client.cpp:1063
msgid "Connecting to server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1113
+#: src/client.cpp:1111
msgid "Logging in"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1156
+#: src/client.cpp:1154
msgid "Entering game world"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1282
+#: src/client.cpp:1280
msgid "Requesting characters"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1322
+#: src/client.cpp:1320
msgid "Connecting to the game server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1334
+#: src/client.cpp:1332
msgid "Changing game servers"
msgstr ""
@@ -530,72 +532,76 @@ msgstr ""
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1389 src/client.cpp:1403 src/client.cpp:1598
+#. TRANSLATORS: info message
+#. TRANSLATORS: ok dialog button
+#: src/client.cpp:1387 src/client.cpp:1401 src/client.cpp:1596
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
#: src/gui/windows/charcreatedialog.cpp:369
-#: src/gui/windows/charselectdialog.cpp:289
+#: src/gui/windows/charselectdialog.cpp:311
#: src/gui/windows/editserverdialog.cpp:203
#: src/gui/windows/registerdialog.cpp:245
#: src/gui/windows/unregisterdialog.cpp:146
#: src/net/ea/charserverhandler.cpp:141 src/net/ea/charserverhandler.cpp:173
+#: src/net/eathena/charserverhandler.cpp:516
+#: src/net/eathena/charserverhandler.cpp:518
msgid "Error"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1418
+#: src/client.cpp:1416
msgid "Requesting registration details"
msgstr ""
#. TRANSLATORS: password change message header
-#: src/client.cpp:1459
+#: src/client.cpp:1457
msgid "Password Change"
msgstr ""
#. TRANSLATORS: password change message text
-#: src/client.cpp:1461
+#: src/client.cpp:1459
msgid "Password changed successfully!"
msgstr ""
#. TRANSLATORS: email change message header
-#: src/client.cpp:1486
+#: src/client.cpp:1484
msgid "Email Change"
msgstr ""
#. TRANSLATORS: email change message text
-#: src/client.cpp:1488
+#: src/client.cpp:1486
msgid "Email changed successfully!"
msgstr ""
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1515
+#: src/client.cpp:1513
msgid "Unregister Successful"
msgstr ""
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1517
+#: src/client.cpp:1515
msgid "Farewell, come back any time..."
msgstr ""
#. TRANSLATORS: directory creation error
#: src/configmanager.cpp:53 src/dirs.cpp:260 src/dirs.cpp:275 src/dirs.cpp:320
-#: src/dirs.cpp:481 src/dirs.cpp:489
+#: src/dirs.cpp:488 src/dirs.cpp:496
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:363
+#: src/dirs.cpp:370
#, c-format
msgid "Invalid update host: %s."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:404 src/dirs.cpp:411
+#: src/dirs.cpp:411 src/dirs.cpp:418
msgid "Error creating updates directory!"
msgstr ""
-#: src/dirs.cpp:433 src/dirs.cpp:451
+#: src/dirs.cpp:440 src/dirs.cpp:458
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
@@ -613,36 +619,36 @@ msgid "dyecmd srcdyestring dstfile"
msgstr ""
#. TRANSLATORS: chat tab header
-#: src/game.cpp:236 src/gui/widgets/tabs/chattab.cpp:482
+#: src/game.cpp:234 src/gui/widgets/tabs/chattab.cpp:482
msgid "General"
msgstr ""
#. TRANSLATORS: chat tab header
#. TRANSLATORS: full button name
#. TRANSLATORS: debug window name
-#: src/game.cpp:253 src/gui/widgets/tabs/chattab.cpp:484
+#: src/game.cpp:251 src/gui/widgets/tabs/chattab.cpp:484
#: src/gui/windowmenu.cpp:149 src/gui/windows/debugwindow.cpp:42
msgid "Debug"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:541
+#: src/game.cpp:532
#, c-format
msgid "Screenshot saved as %s"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:551
+#: src/game.cpp:542
msgid "Saving screenshot failed!"
msgstr ""
#. TRANSLATORS: error message text
-#: src/game.cpp:634
+#: src/game.cpp:625
msgid "The connection to the server was lost."
msgstr ""
#. TRANSLATORS: error message header
-#: src/game.cpp:637
+#: src/game.cpp:628
msgid "Network Error"
msgstr ""
@@ -1033,6 +1039,7 @@ msgstr ""
#: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
#: src/gui/widgets/tabs/setup_other.cpp:79
#: src/gui/widgets/tabs/setup_visual.cpp:81
+#: src/gui/windows/equipmentwindow.cpp:577
msgid "default"
msgstr ""
@@ -1523,7 +1530,7 @@ msgstr ""
#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:273
#: src/gui/popups/popupmenu.cpp:767 src/gui/widgets/skillinfo.cpp:113
#: src/gui/windows/botcheckerwindow.cpp:89 src/input/pages/basic.cpp:42
-#: src/net/eathena/generalhandler.cpp:289 src/net/tmwa/generalhandler.cpp:321
+#: src/net/eathena/generalhandler.cpp:356 src/net/tmwa/generalhandler.cpp:320
msgid "Attack"
msgstr ""
@@ -1692,7 +1699,7 @@ msgstr ""
#. TRANSLATORS: pet unequip item
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:340 src/gui/windows/equipmentwindow.cpp:70
+#: src/gui/popups/popupmenu.cpp:340 src/gui/windows/equipmentwindow.cpp:72
#: src/gui/windows/inventorywindow.cpp:175 src/resources/itemtypemapdata.h:47
#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
@@ -1750,7 +1757,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:574
+#: src/gui/popups/popupmenu.cpp:574 src/gui/windows/charselectdialog.cpp:132
msgid "Rename"
msgstr ""
@@ -2262,7 +2269,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
#. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:3000 src/net/ea/playerhandler.cpp:364
+#: src/gui/popups/popupmenu.cpp:3000 src/net/ea/playerhandler.cpp:195
msgid "Revive"
msgstr ""
@@ -2286,7 +2293,7 @@ msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: settings group
#. TRANSLATORS: full button name
-#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:319
+#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:315
#: src/gui/windowmenu.cpp:158
msgid "Windows"
msgstr ""
@@ -2314,7 +2321,7 @@ msgstr ""
#. TRANSLATORS: input action name
#: src/gui/setupinputpages.cpp:57 src/gui/widgets/tabs/setup_audio.cpp:151
#: src/gui/widgets/tabs/setup_chat.cpp:179
-#: src/gui/widgets/tabs/setup_other.cpp:341
+#: src/gui/widgets/tabs/setup_other.cpp:337
#: src/gui/widgets/tabs/setup_visual.cpp:192
#: src/gui/windows/charcreatedialog.cpp:119
#: src/gui/windows/registerdialog.cpp:106 src/input/pages/gui.cpp:87
@@ -2327,212 +2334,227 @@ msgid "Gui"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:113
+#: src/gui/userpalette.cpp:116
msgid "Being"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:115
+#: src/gui/userpalette.cpp:118
msgid "Friend names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:117
+#: src/gui/userpalette.cpp:120
msgid "Disregarded names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:119
+#: src/gui/userpalette.cpp:122
msgid "Ignored names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:121
+#: src/gui/userpalette.cpp:124
msgid "Erased names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:123
+#: src/gui/userpalette.cpp:126
msgid "Other players names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:125
+#: src/gui/userpalette.cpp:128
msgid "Own name"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:127
+#: src/gui/userpalette.cpp:130
msgid "GM names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:129
+#: src/gui/userpalette.cpp:132
msgid "NPCs"
msgstr ""
#. TRANSLATORS: palette color
#. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:131 src/gui/widgets/tabs/setup_other.cpp:108
+#: src/gui/userpalette.cpp:134 src/gui/widgets/tabs/setup_other.cpp:108
msgid "Monsters"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:133
+#: src/gui/userpalette.cpp:136
msgid "Monster HP bar"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:139
msgid "Monster HP bar (second color)"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:138
+#: src/gui/userpalette.cpp:141
msgid "Party members"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:140
+#: src/gui/userpalette.cpp:143
msgid "Guild members"
msgstr ""
#. TRANSLATORS: palette color
#. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:142 src/gui/widgets/tabs/setup_visual.cpp:157
+#: src/gui/userpalette.cpp:145 src/gui/widgets/tabs/setup_visual.cpp:157
msgid "Particle effects"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:144
+#: src/gui/userpalette.cpp:147
msgid "Pickup notification"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:146
+#: src/gui/userpalette.cpp:149
msgid "Exp notification"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:148
+#: src/gui/userpalette.cpp:151
msgid "Player HP bar"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:152
+#: src/gui/userpalette.cpp:155
msgid "Player HP bar (second color)"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:154
+#: src/gui/userpalette.cpp:157
msgid "Player hits monster"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:156
+#: src/gui/userpalette.cpp:159
msgid "Monster hits player"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:160
+#: src/gui/userpalette.cpp:163
msgid "Other player hits local player"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:162
+#: src/gui/userpalette.cpp:165
msgid "Critical Hit"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:166
+#: src/gui/userpalette.cpp:169
msgid "Local player hits monster"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:169
+#: src/gui/userpalette.cpp:172
msgid "Local player critical hit"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:172
+#: src/gui/userpalette.cpp:175
msgid "Local player miss"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:174
+#: src/gui/userpalette.cpp:177
msgid "Misses"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:176
+#: src/gui/userpalette.cpp:179
msgid "Portal highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:179
+#: src/gui/userpalette.cpp:182
msgid "Default collision highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:182
+#: src/gui/userpalette.cpp:185
msgid "Air collision highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:185
+#: src/gui/userpalette.cpp:188
msgid "Water collision highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:188
+#: src/gui/userpalette.cpp:191
msgid "Special ground collision highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:191
+#: src/gui/userpalette.cpp:194
msgid "Walkable highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:194
+#: src/gui/userpalette.cpp:197
msgid "Local player attack range"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:197
+#: src/gui/userpalette.cpp:200
msgid "Local player attack range border"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:200
+#: src/gui/userpalette.cpp:203
msgid "Monster attack range"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:204
+#: src/gui/userpalette.cpp:207
msgid "Floor item amount color"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:207
+#: src/gui/userpalette.cpp:210
msgid "Home place"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:210
+#: src/gui/userpalette.cpp:213
msgid "Home place border"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:213
+#: src/gui/userpalette.cpp:216
msgid "Road point"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:216
+#: src/gui/userpalette.cpp:219
msgid "Tiles border"
msgstr ""
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:221
+msgid "Pets"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:223
+msgid "Mercenary"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:225
+msgid "Homunculus"
+msgstr ""
+
#: src/gui/widgets/characterdisplay.cpp:135
#, c-format
msgid "Level: %u"
@@ -2635,7 +2657,8 @@ msgid "Type: %s"
msgstr ""
#. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:108
+#. TRANSLATORS: unknown equipment page name
+#: src/gui/widgets/skillinfo.cpp:108 src/gui/windows/equipmentwindow.cpp:584
msgid "Unknown"
msgstr ""
@@ -2836,22 +2859,22 @@ msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:262
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:313
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:375
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:319
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:387
msgid "Target:"
msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:264
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:319
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:377
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:325
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:389
msgid "Target Id:"
msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:267
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:322
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:379
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:328
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:391
msgid "Target type:"
msgstr ""
@@ -2862,7 +2885,7 @@ msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:271
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:338
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:344
msgid "Target race:"
msgstr ""
@@ -2878,67 +2901,81 @@ msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:277
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:363
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:369
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:387
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:375
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:381
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:399
msgid "Attack delay:"
msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:279
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:350
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:389
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:356
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:401
msgid "Minimal hit:"
msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:281
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:353
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:391
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:359
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:403
msgid "Maximum hit:"
msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:283
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:356
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:393
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:362
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:405
msgid "Critical hit:"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:327
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:285
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:365
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:407
+msgid "Karma:"
+msgstr ""
+
+#. TRANSLATORS: debug window label
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:287
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:368
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:409
+msgid "Manner:"
+msgstr ""
+
+#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:333
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:381
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:339
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:393
msgid "Target Level:"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:341
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:383
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:347
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:395
msgid "Target Party:"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:345
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:385
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:351
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:397
msgid "Target Guild:"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:430
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:436
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:451
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:457
#, c-format
msgid "Ping: %s ms"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:439
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:460
#, c-format
msgid "In: %d bytes/s"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:442
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:463
#, c-format
msgid "Out: %d bytes/s"
msgstr ""
@@ -3767,137 +3804,132 @@ msgstr ""
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_other.cpp:294
-msgid "Enable auction bot support"
-msgstr ""
-
-#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:298
msgid "Enable guild bot support and disable native guild support"
msgstr ""
#. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:304
+#: src/gui/widgets/tabs/setup_other.cpp:300
msgid "Keyboard"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:307
+#: src/gui/widgets/tabs/setup_other.cpp:303
msgid "Repeat delay"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:311
+#: src/gui/widgets/tabs/setup_other.cpp:307
msgid "Repeat interval"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:315
+#: src/gui/widgets/tabs/setup_other.cpp:311
msgid "Custom repeat interval"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:323
+#: src/gui/widgets/tabs/setup_other.cpp:319
msgid "Shortcut buttons"
msgstr ""
#. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:328
+#: src/gui/widgets/tabs/setup_other.cpp:324
msgid "Proxy server"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:332
+#: src/gui/widgets/tabs/setup_other.cpp:328
msgid "Proxy type"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:336
+#: src/gui/widgets/tabs/setup_other.cpp:332
msgid "Proxy address:port"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:344
+#: src/gui/widgets/tabs/setup_other.cpp:340
msgid "Enable server side attack"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:348
+#: src/gui/widgets/tabs/setup_other.cpp:344
msgid "Hide support page link on error"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:352
+#: src/gui/widgets/tabs/setup_other.cpp:348
msgid "Enable double clicks"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:356
+#: src/gui/widgets/tabs/setup_other.cpp:352
msgid "Enable bot checker"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:360
+#: src/gui/widgets/tabs/setup_other.cpp:356
msgid "Enable buggy servers protection (do not disable)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:365
+#: src/gui/widgets/tabs/setup_other.cpp:361
msgid "Enable debug log"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:369
+#: src/gui/widgets/tabs/setup_other.cpp:365
msgid "Ignore logging packets"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:373
+#: src/gui/widgets/tabs/setup_other.cpp:369
msgid "Enable OpenGL log"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:377
+#: src/gui/widgets/tabs/setup_other.cpp:373
msgid "Enable input log"
msgstr ""
#. TRANSLATORS: settings option
#. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_other.cpp:381 src/input/pages/other.cpp:362
+#: src/gui/widgets/tabs/setup_other.cpp:377 src/input/pages/other.cpp:362
msgid "Upload log file"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:385
+#: src/gui/widgets/tabs/setup_other.cpp:381
msgid "Low traffic mode"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:389
+#: src/gui/widgets/tabs/setup_other.cpp:385
msgid "Hide shield sprite"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:394
+#: src/gui/widgets/tabs/setup_other.cpp:390
msgid "Use FBO for screenshots (only for opengl)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:400
+#: src/gui/widgets/tabs/setup_other.cpp:396
msgid "Screenshot directory"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:405
+#: src/gui/widgets/tabs/setup_other.cpp:401
msgid "Network delay between sub servers"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:409
+#: src/gui/widgets/tabs/setup_other.cpp:405
msgid "Show background"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:414
+#: src/gui/widgets/tabs/setup_other.cpp:410
msgid "Screen density override"
msgstr ""
@@ -4128,9 +4160,9 @@ msgstr ""
#. TRANSLATORS: command editor button
#. TRANSLATORS: input action name
#: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:82
-#: src/gui/windows/serverdialog.cpp:125 src/gui/windows/shopwindow.cpp:101
-#: src/gui/windows/shopwindow.cpp:108 src/gui/windows/textcommandeditor.cpp:92
+#: src/gui/windows/charselectdialog.cpp:84
+#: src/gui/windows/serverdialog.cpp:125 src/gui/windows/shopwindow.cpp:100
+#: src/gui/windows/shopwindow.cpp:107 src/gui/windows/textcommandeditor.cpp:92
#: src/input/pages/gui.cpp:111
msgid "Delete"
msgstr ""
@@ -4784,7 +4816,7 @@ msgstr ""
#. TRANSLATORS: equipment window name
#. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:63
+#: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:65
#: src/gui/windows/inventorywindow.cpp:196
msgid "Equipment"
msgstr ""
@@ -4925,7 +4957,7 @@ msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: social window button
#: src/gui/windows/buydialog.cpp:260 src/gui/windows/charcreatedialog.cpp:127
-#: src/gui/windows/charselectdialog.cpp:578
+#: src/gui/windows/charselectdialog.cpp:605
#: src/gui/windows/socialwindow.cpp:86
msgid "Create"
msgstr ""
@@ -4969,10 +5001,8 @@ msgstr ""
#. TRANSLATORS: change password window name
#. TRANSLATORS: change password dialog button
-#. TRANSLATORS: char select dialog. button.
#: src/gui/windows/changepassworddialog.cpp:51
#: src/gui/windows/changepassworddialog.cpp:57
-#: src/gui/windows/charselectdialog.cpp:73
msgid "Change Password"
msgstr ""
@@ -5126,57 +5156,68 @@ msgid "Are you sure you want to delete this character?"
msgstr ""
#. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:64
+#: src/gui/windows/charselectdialog.cpp:66
#, c-format
msgid "Account %s (last login time %s)"
msgstr ""
#. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:71
-msgid "Switch Login"
+#: src/gui/windows/charselectdialog.cpp:73
+msgid "Switch"
+msgstr ""
+
+#. TRANSLATORS: char select dialog. button.
+#: src/gui/windows/charselectdialog.cpp:75
+msgid "Password"
msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:78
-#: src/gui/windows/charselectdialog.cpp:573
+#: src/gui/windows/charselectdialog.cpp:80
+#: src/gui/windows/charselectdialog.cpp:595
#: src/gui/windows/updaterwindow.cpp:195
msgid "Play"
msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:80
+#: src/gui/windows/charselectdialog.cpp:82
#: src/net/ea/charserverhandler.cpp:160
+#: src/net/eathena/charserverhandler.cpp:531
+#: src/net/eathena/charserverhandler.cpp:561
msgid "Info"
msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: unregister dialog name
#. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:106
+#: src/gui/windows/charselectdialog.cpp:110
#: src/gui/windows/unregisterdialog.cpp:50
#: src/gui/windows/unregisterdialog.cpp:55
msgid "Unregister"
msgstr ""
#. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:118
+#: src/gui/windows/charselectdialog.cpp:122
msgid "Change Email"
msgstr ""
#. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:156
+#: src/gui/windows/charselectdialog.cpp:166
#, c-format
msgid "Account %s"
msgstr ""
-#: src/gui/windows/charselectdialog.cpp:184
+#: src/gui/windows/charselectdialog.cpp:194
msgid "Please set new pincode"
msgstr ""
+#: src/gui/windows/charselectdialog.cpp:240
+msgid "Please enter new name"
+msgstr ""
+
#. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:237
+#: src/gui/windows/charselectdialog.cpp:259
#, c-format
msgid ""
"Hp: %u/%u\n"
@@ -5186,16 +5227,16 @@ msgid ""
"Money: %s"
msgstr ""
-#: src/gui/windows/charselectdialog.cpp:289
+#: src/gui/windows/charselectdialog.cpp:311
msgid "Incorrect password"
msgstr ""
#. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:429
+#: src/gui/windows/charselectdialog.cpp:451
msgid "Enter password for deleting character"
msgstr ""
-#: src/gui/windows/charselectdialog.cpp:429
+#: src/gui/windows/charselectdialog.cpp:451
msgid "Enter password:"
msgstr ""
@@ -5603,7 +5644,7 @@ msgstr ""
#. TRANSLATORS: status bar label
#: src/gui/windows/ministatuswindow.cpp:364
-#: src/gui/windows/ministatuswindow.cpp:402
+#: src/gui/windows/ministatuswindow.cpp:401
msgid "Need"
msgstr ""
@@ -5634,7 +5675,7 @@ msgstr ""
#. TRANSLATORS: shop window button
#. TRANSLATORS: trade window button
#: src/gui/windows/npcdialog.cpp:114 src/gui/windows/serverdialog.cpp:121
-#: src/gui/windows/shopwindow.cpp:99 src/gui/windows/shopwindow.cpp:106
+#: src/gui/windows/shopwindow.cpp:98 src/gui/windows/shopwindow.cpp:105
#: src/gui/windows/tradewindow.cpp:83
msgid "Add"
msgstr ""
@@ -5797,43 +5838,38 @@ msgid "Reset Windows"
msgstr ""
#. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:80
+#: src/gui/windows/shopwindow.cpp:79
msgid "Personal Shop"
msgstr ""
#. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:95
+#: src/gui/windows/shopwindow.cpp:94
msgid "Buy items"
msgstr ""
#. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:97
+#: src/gui/windows/shopwindow.cpp:96
msgid "Sell items"
msgstr ""
#. TRANSLATORS: shop window label
#. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:110
+#: src/gui/windows/shopwindow.cpp:102 src/gui/windows/shopwindow.cpp:109
msgid "Announce"
msgstr ""
#. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:114
+#: src/gui/windows/shopwindow.cpp:113
msgid "Show links in announce"
msgstr ""
-#. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:176 src/gui/windows/shopwindow.cpp:179
-msgid "Auction"
-msgstr ""
-
#. TRANSLATORS: shop window dialog
#. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:233
+#: src/gui/windows/shopwindow.cpp:776 src/net/ea/tradehandler.cpp:233
msgid "Request for Trade"
msgstr ""
-#: src/gui/windows/shopwindow.cpp:791
+#: src/gui/windows/shopwindow.cpp:776
#, c-format
msgid "%s wants to %s %s do you accept?"
msgstr ""
@@ -6161,27 +6197,27 @@ msgstr ""
msgid "Connecting..."
msgstr ""
-#: src/gui/windows/updaterwindow.cpp:398
+#: src/gui/windows/updaterwindow.cpp:407
msgid "Show all news (can be slow)"
msgstr ""
#. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:824
+#: src/gui/windows/updaterwindow.cpp:833
msgid "##1 The update process is incomplete."
msgstr ""
#. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:826
+#: src/gui/windows/updaterwindow.cpp:835
msgid "##1 It is strongly recommended that"
msgstr ""
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:828
+#: src/gui/windows/updaterwindow.cpp:837
msgid "##1 you try again later."
msgstr ""
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1005
+#: src/gui/windows/updaterwindow.cpp:1021
msgid "Completed"
msgstr ""
@@ -6228,25 +6264,25 @@ msgstr ""
#. TRANSLATORS: long key name. must be short.
#. TRANSLATORS: short key name. must be very short.
#. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:370 src/input/inputmanager.cpp:414
+#: src/input/inputmanager.cpp:371 src/input/inputmanager.cpp:415
#: src/input/keyboardconfig.cpp:104
#, c-format
msgid "key_%d"
msgstr ""
#. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:376
+#: src/input/inputmanager.cpp:377
#, c-format
msgid "JButton%d"
msgstr ""
#. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:391
msgid "unknown key"
msgstr ""
#. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:420
+#: src/input/inputmanager.cpp:421
#, c-format
msgid "JB%d"
msgstr ""
@@ -6254,7 +6290,7 @@ msgstr ""
#. TRANSLATORS: unknown short key type. must be short
#. TRANSLATORS: Unknown key short string.
#. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:434 src/input/keyboardconfig.cpp:148
+#: src/input/inputmanager.cpp:435 src/input/keyboardconfig.cpp:148
msgid "u key"
msgstr ""
@@ -7425,74 +7461,74 @@ msgid "Request to quit denied!"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:135
#, c-format
msgid "Guild name: %s"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:191
+#: src/net/ea/guildhandler.cpp:138
#, c-format
msgid "Guild master: %s"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:141
#, c-format
msgid "Guild level: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:197
+#: src/net/ea/guildhandler.cpp:144
#, c-format
msgid "Online members: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:200
+#: src/net/ea/guildhandler.cpp:147
#, c-format
msgid "Max members: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:203
+#: src/net/ea/guildhandler.cpp:150
#, c-format
msgid "Average level: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:206
+#: src/net/ea/guildhandler.cpp:153
#, c-format
msgid "Guild exp: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:209
+#: src/net/ea/guildhandler.cpp:156
#, c-format
msgid "Guild next exp: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:212
+#: src/net/ea/guildhandler.cpp:159
#, c-format
msgid "Guild castle: %s"
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:179
+#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:191
msgid "Item sharing enabled."
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:183
+#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:195
msgid "Item sharing disabled."
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:187
+#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:199
msgid "Item sharing not possible."
msgstr ""
@@ -7503,19 +7539,19 @@ msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:167
+#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:179
msgid "Experience sharing enabled."
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:171
+#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:183
msgid "Experience sharing disabled."
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:175
+#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:187
msgid "Experience sharing not possible."
msgstr ""
@@ -7620,239 +7656,355 @@ msgid "Connection to server terminated. "
msgstr ""
#. TRANSLATORS: message header
-#: src/net/ea/playerhandler.cpp:257 src/net/ea/playerhandler.cpp:273
-#: src/net/ea/playerhandler.cpp:361
+#: src/net/ea/playerhandler.cpp:192 src/net/ea/playerhandler.cpp:418
+#: src/net/ea/playerhandler.cpp:434
msgid "Message"
msgstr ""
#. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:259
+#: src/net/ea/playerhandler.cpp:420
msgid ""
"You are carrying more than half your weight. You are unable to regain "
"health."
msgstr ""
#. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:275
+#: src/net/ea/playerhandler.cpp:436
msgid "You are carrying less than half your weight. You can regain health."
msgstr ""
+#. TRANSLATORS: char rename error
+#: src/net/eathena/charserverhandler.cpp:516
+#: src/net/eathena/charserverhandler.cpp:553
+msgid "Character rename error."
+msgstr ""
+
+#: src/net/eathena/charserverhandler.cpp:531
+msgid "Character renamed."
+msgstr ""
+
+#. TRANSLATORS: char rename error
+#: src/net/eathena/charserverhandler.cpp:544
+msgid "Rename not allowed."
+msgstr ""
+
+#. TRANSLATORS: char rename error
+#: src/net/eathena/charserverhandler.cpp:548
+msgid "New name is not set."
+msgstr ""
+
+#. TRANSLATORS: char rename error
+#: src/net/eathena/charserverhandler.cpp:557
+msgid "Character not found."
+msgstr ""
+
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:125
+#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:124
#, c-format
msgid "Strength %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:127
+#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:126
#, c-format
msgid "Agility %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:129
+#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:128
#, c-format
msgid "Vitality %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:131
+#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:130
#, c-format
msgid "Intelligence %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:128 src/net/tmwa/generalhandler.cpp:133
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:132
#, c-format
msgid "Dexterity %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:135
+#: src/net/eathena/generalhandler.cpp:128 src/net/tmwa/generalhandler.cpp:134
#, c-format
msgid "Luck %s"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:152 src/net/tmwa/generalhandler.cpp:161
+#: src/net/eathena/generalhandler.cpp:159 src/net/tmwa/generalhandler.cpp:160
msgid "Authentication failed."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:155 src/net/tmwa/generalhandler.cpp:165
+#: src/net/eathena/generalhandler.cpp:162 src/net/tmwa/generalhandler.cpp:164
msgid "No servers available."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:160 src/net/tmwa/generalhandler.cpp:171
+#: src/net/eathena/generalhandler.cpp:167 src/net/tmwa/generalhandler.cpp:170
msgid "Someone else is trying to use this account."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:165 src/net/tmwa/generalhandler.cpp:177
+#: src/net/eathena/generalhandler.cpp:172 src/net/tmwa/generalhandler.cpp:176
msgid "This account is already logged in."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:169 src/net/tmwa/generalhandler.cpp:182
+#: src/net/eathena/generalhandler.cpp:176 src/net/tmwa/generalhandler.cpp:181
msgid "Speed hack detected."
msgstr ""
+#: src/net/eathena/generalhandler.cpp:179
+msgid "Server full."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:182
+msgid "Sorry, you are underaged."
+msgstr ""
+
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:172 src/net/tmwa/generalhandler.cpp:186
+#: src/net/eathena/generalhandler.cpp:185 src/net/tmwa/generalhandler.cpp:185
msgid "Duplicated login."
msgstr ""
+#: src/net/eathena/generalhandler.cpp:188
+msgid "To many connections from same ip."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:191
+msgid "Not paid for this time."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:194
+msgid "Pay suspended."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:197
+msgid "Pay changed."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:200
+msgid "Pay wrong ip."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:203
+msgid "Pay game room."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:206
+msgid "Disconnect forced by GM."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:210
+msgid "Ban japan refuse."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:213
+msgid "Remained other account."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:216
+msgid "Ip unfair."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:219
+msgid "Ip count all."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:222
+msgid "Ip count."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:226
+msgid "Memory."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:229
+msgid "Han valid."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:232
+msgid "Ip limited access."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:235
+msgid "Over characters list."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:238
+msgid "Ip blocked."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:241
+msgid "Invalid password count."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:244
+msgid "Not allowed race."
+msgstr ""
+
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:175 src/net/tmwa/generalhandler.cpp:190
+#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:189
msgid "Unknown connection error."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:280
+#: src/net/eathena/generalhandler.cpp:323 src/net/tmwa/generalhandler.cpp:279
msgid "Got disconnected from server!"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:282 src/net/tmwa/generalhandler.cpp:308
+#: src/net/eathena/generalhandler.cpp:348 src/net/tmwa/generalhandler.cpp:307
msgid "Strength"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:310
+#: src/net/eathena/generalhandler.cpp:349 src/net/tmwa/generalhandler.cpp:309
msgid "Agility"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:284 src/net/tmwa/generalhandler.cpp:312
+#: src/net/eathena/generalhandler.cpp:350 src/net/tmwa/generalhandler.cpp:311
msgid "Vitality"
msgstr ""
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:285 src/net/tmwa/generalhandler.cpp:314
+#: src/net/eathena/generalhandler.cpp:352 src/net/tmwa/generalhandler.cpp:314
msgid "Intelligence"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:286 src/net/tmwa/generalhandler.cpp:316
+#: src/net/eathena/generalhandler.cpp:353 src/net/tmwa/generalhandler.cpp:316
msgid "Dexterity"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:287 src/net/tmwa/generalhandler.cpp:318
+#: src/net/eathena/generalhandler.cpp:354 src/net/tmwa/generalhandler.cpp:318
msgid "Luck"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:290 src/net/tmwa/generalhandler.cpp:323
+#: src/net/eathena/generalhandler.cpp:357 src/net/tmwa/generalhandler.cpp:322
msgid "Defense"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:291 src/net/tmwa/generalhandler.cpp:325
+#: src/net/eathena/generalhandler.cpp:358 src/net/tmwa/generalhandler.cpp:324
msgid "M.Attack"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:292 src/net/tmwa/generalhandler.cpp:327
+#: src/net/eathena/generalhandler.cpp:359 src/net/tmwa/generalhandler.cpp:326
msgid "M.Defense"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:294 src/net/tmwa/generalhandler.cpp:330
+#: src/net/eathena/generalhandler.cpp:361 src/net/tmwa/generalhandler.cpp:329
#, no-c-format
msgid "% Accuracy"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:296 src/net/tmwa/generalhandler.cpp:333
+#: src/net/eathena/generalhandler.cpp:363 src/net/tmwa/generalhandler.cpp:332
#, no-c-format
msgid "% Evade"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:298 src/net/tmwa/generalhandler.cpp:336
+#: src/net/eathena/generalhandler.cpp:365 src/net/tmwa/generalhandler.cpp:335
#, no-c-format
msgid "% Critical"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:299 src/net/tmwa/generalhandler.cpp:338
+#: src/net/eathena/generalhandler.cpp:366 src/net/tmwa/generalhandler.cpp:337
msgid "Attack Delay"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:300 src/net/tmwa/generalhandler.cpp:340
+#: src/net/eathena/generalhandler.cpp:367 src/net/tmwa/generalhandler.cpp:339
msgid "Walk Delay"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:301 src/net/tmwa/generalhandler.cpp:342
+#: src/net/eathena/generalhandler.cpp:368 src/net/tmwa/generalhandler.cpp:341
msgid "Attack Range"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:302 src/net/tmwa/generalhandler.cpp:344
+#: src/net/eathena/generalhandler.cpp:369 src/net/tmwa/generalhandler.cpp:343
msgid "Damage per sec."
msgstr ""
-#: src/net/eathena/skillhandler.cpp:228 src/net/eathena/skillhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:370
+msgid "Karma"
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:371
+msgid "Manner"
+msgstr ""
+
+#: src/net/eathena/skillhandler.cpp:304 src/net/eathena/skillhandler.cpp:364
#, c-format
msgid "Unknown skill error: %d"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:235 src/net/tmwa/skillhandler.cpp:224
+#: src/net/eathena/skillhandler.cpp:311 src/net/tmwa/skillhandler.cpp:224
msgid "You have not yet reached a high enough lvl!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:239 src/net/tmwa/skillhandler.cpp:228
+#: src/net/eathena/skillhandler.cpp:315 src/net/tmwa/skillhandler.cpp:228
msgid "Insufficient HP!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:243 src/net/tmwa/skillhandler.cpp:232
+#: src/net/eathena/skillhandler.cpp:319 src/net/tmwa/skillhandler.cpp:232
msgid "Insufficient SP!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:247 src/net/tmwa/skillhandler.cpp:236
+#: src/net/eathena/skillhandler.cpp:323 src/net/tmwa/skillhandler.cpp:236
msgid "You have no memos!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:251 src/net/tmwa/skillhandler.cpp:240
+#: src/net/eathena/skillhandler.cpp:327 src/net/tmwa/skillhandler.cpp:240
msgid "You cannot do that right now!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:255 src/net/tmwa/skillhandler.cpp:244
+#: src/net/eathena/skillhandler.cpp:331 src/net/tmwa/skillhandler.cpp:244
msgid "Seems you need more money... ;-)"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:259 src/net/tmwa/skillhandler.cpp:248
+#: src/net/eathena/skillhandler.cpp:335 src/net/tmwa/skillhandler.cpp:248
msgid "You cannot use this skill with that kind of weapon!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:264 src/net/tmwa/skillhandler.cpp:253
+#: src/net/eathena/skillhandler.cpp:340 src/net/tmwa/skillhandler.cpp:253
msgid "You need another red gem!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:268 src/net/tmwa/skillhandler.cpp:257
+#: src/net/eathena/skillhandler.cpp:344 src/net/tmwa/skillhandler.cpp:257
msgid "You need another blue gem!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:272 src/net/tmwa/skillhandler.cpp:261
+#: src/net/eathena/skillhandler.cpp:348 src/net/tmwa/skillhandler.cpp:261
msgid "You're carrying to much to do this!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:276 src/net/tmwa/skillhandler.cpp:265
+#: src/net/eathena/skillhandler.cpp:352 src/net/tmwa/skillhandler.cpp:265
msgid "Huh? What's that?"
msgstr ""
@@ -7869,32 +8021,32 @@ msgid "%s wants to trade with you, do you accept?"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:349
+#: src/net/tmwa/charserverhandler.cpp:351
msgid "Strength:"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:351
+#: src/net/tmwa/charserverhandler.cpp:353
msgid "Agility:"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:353
+#: src/net/tmwa/charserverhandler.cpp:355
msgid "Vitality:"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:355
+#: src/net/tmwa/charserverhandler.cpp:357
msgid "Intelligence:"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:357
+#: src/net/tmwa/charserverhandler.cpp:359
msgid "Dexterity:"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:359
+#: src/net/tmwa/charserverhandler.cpp:361
msgid "Luck:"
msgstr ""
@@ -8205,269 +8357,306 @@ msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:143
+msgid "You cant left party on this map."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:147
+msgid "You was kicked from party."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:151
+msgid "You cant be kicked kicked from party on this map."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:155
#, c-format
msgid "%s has joined your party."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:147
+#: src/resources/notifications.h:159
#, c-format
msgid "%s is already a member of a party."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:151
+#: src/resources/notifications.h:163
#, c-format
msgid "%s refused your invitation."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:155
+#: src/resources/notifications.h:167
#, c-format
msgid "%s is now a member of your party."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:159
+#: src/resources/notifications.h:171
#, c-format
msgid "%s can't join your party because party is full."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:163
+#: src/resources/notifications.h:175
#, c-format
msgid "QQQ Unknown invite response for %s."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:191
+#: src/resources/notifications.h:203
#, c-format
msgid "%s has left your party."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:195
+#: src/resources/notifications.h:207 src/resources/notifications.h:215
+#, c-format
+msgid "%s cant be kicked from party on this map."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:211
+#, c-format
+msgid "%s has kicked from your party."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:219
#, c-format
msgid "An unknown member tried to say: %s"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:199
+#: src/resources/notifications.h:223
#, c-format
msgid "%s is not in your party!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:203
+#: src/resources/notifications.h:227
#, c-format
msgid "You picked up %s."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:207
+#: src/resources/notifications.h:231
#, c-format
msgid "You spent %s."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:211
+#: src/resources/notifications.h:235
msgid "Cannot raise skill!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:215
+#: src/resources/notifications.h:239
msgid "Equip ammunition first."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:219
+#: src/resources/notifications.h:243
#, c-format
msgid "Trading with %s isn't possible. Trade partner is too far away."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:224
+#: src/resources/notifications.h:248
#, c-format
msgid "Trading with %s isn't possible. Character doesn't exist."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:228
+#: src/resources/notifications.h:252
msgid "Trade cancelled due to an unknown reason."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:232
+#: src/resources/notifications.h:256
#, c-format
msgid "Trade with %s cancelled."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:236
+#: src/resources/notifications.h:260
#, c-format
msgid "Unhandled trade cancel packet with %s"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:240
+#: src/resources/notifications.h:264
msgid "Failed adding item. Trade partner is over weighted."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:244
+#: src/resources/notifications.h:268
msgid "Failed adding item. Trade partner has no free slot."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:248
+#: src/resources/notifications.h:272
msgid "Failed adding item. You can't trade this item."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:252
+#: src/resources/notifications.h:276
msgid "Failed adding item for unknown reason."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:256
+#: src/resources/notifications.h:280
msgid "Trade canceled."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:260
+#: src/resources/notifications.h:284
msgid "Trade completed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:264
+#: src/resources/notifications.h:288
msgid "Kick failed!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:268
+#: src/resources/notifications.h:292
msgid "Kick succeeded!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:272
+#: src/resources/notifications.h:296
#, c-format
msgid "MVP player: %s"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:276
+#: src/resources/notifications.h:300
msgid "All whispers ignored."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:280
+#: src/resources/notifications.h:304
msgid "All whispers ignore failed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:284
+#: src/resources/notifications.h:308
msgid "All whispers unignored."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:288
+#: src/resources/notifications.h:312
msgid "All whispers unignore failed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:295
+#: src/resources/notifications.h:319
msgid "pvp off, gvg off"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:299
+#: src/resources/notifications.h:323
msgid "pvp on"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:303
+#: src/resources/notifications.h:327
msgid "gvg on"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:307
+#: src/resources/notifications.h:331
msgid "pvp on, gvg on"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:311
+#: src/resources/notifications.h:335
msgid "unknown pvp"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:315
+#: src/resources/notifications.h:339
#, c-format
msgid "Char from account %s is already in your party!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:319
+#: src/resources/notifications.h:343
#, c-format
msgid "%s blocked invite!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:323
+#: src/resources/notifications.h:347
msgid "Char is not online!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:327
+#: src/resources/notifications.h:351
msgid "Pet catch failed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:331
+#: src/resources/notifications.h:355
msgid "Pet catched."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:335
+#: src/resources/notifications.h:359
#, c-format
msgid "Pet catch unkown error: %d."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:339
+#: src/resources/notifications.h:363
msgid "Your mercenary duty hour is over."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:343
+#: src/resources/notifications.h:367
msgid "Your mercenary was killed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:347
+#: src/resources/notifications.h:371
msgid "Your mercenary was fired."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:351
+#: src/resources/notifications.h:375
msgid "Your mercenary run away."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:355
+#: src/resources/notifications.h:379
msgid "Mercenary unknown state."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:359
-msgid "Your feed your homunculus."
+#: src/resources/notifications.h:383
+msgid "You feed your homunculus."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:363
+#: src/resources/notifications.h:387
#, c-format
msgid "You cant feed homunculus, because not have %s."
msgstr ""
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:391
+msgid "Card insert failed."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:395
+msgid "Card inserted."
+msgstr ""
+
#. TRANSLATORS: chat option changed message
#: src/utils/booleanoptions.h:27
#, c-format
diff --git a/po/ca.po b/po/ca.po
index fd5059ffe..13f4100f9 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-27 13:23+0300\n"
-"PO-Revision-Date: 2014-09-28 10:01+0000\n"
+"POT-Creation-Date: 2014-10-08 01:19+0300\n"
+"PO-Revision-Date: 2014-10-08 10:02+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Catalan (http://www.transifex.com/projects/p/manaplus/language/ca/)\n"
"MIME-Version: 1.0\n"
@@ -33,7 +33,7 @@ msgstr ""
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:131 src/client.cpp:1463 src/client.cpp:1490
+#: src/actions/actions.cpp:131 src/client.cpp:1461 src/client.cpp:1488
#: src/gamemodifiers.cpp:423 src/gui/widgets/tabs/setup_input.cpp:163
#: src/gui/widgets/tabs/setup_theme.cpp:312
#: src/gui/widgets/tabs/setup_theme.cpp:343
@@ -44,8 +44,8 @@ msgstr ""
#: src/gui/windows/changeemaildialog.cpp:170
#: src/gui/windows/changepassworddialog.cpp:160
#: src/gui/windows/charcreatedialog.cpp:373
-#: src/gui/windows/charselectdialog.cpp:255
-#: src/gui/windows/charselectdialog.cpp:291 src/gui/windows/editdialog.cpp:49
+#: src/gui/windows/charselectdialog.cpp:277
+#: src/gui/windows/charselectdialog.cpp:313 src/gui/windows/editdialog.cpp:49
#: src/gui/windows/editserverdialog.cpp:61
#: src/gui/windows/editserverdialog.cpp:208
#: src/gui/windows/itemamountwindow.cpp:158 src/gui/windows/quitdialog.cpp:70
@@ -53,7 +53,9 @@ msgstr ""
#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
#: src/net/ea/charserverhandler.cpp:143 src/net/ea/charserverhandler.cpp:162
#: src/net/ea/charserverhandler.cpp:175 src/net/ea/gamehandler.cpp:79
-#: src/net/ea/playerhandler.cpp:263 src/net/ea/playerhandler.cpp:279
+#: src/net/ea/playerhandler.cpp:424 src/net/ea/playerhandler.cpp:440
+#: src/net/eathena/charserverhandler.cpp:533
+#: src/net/eathena/charserverhandler.cpp:563
msgid "OK"
msgstr "OK"
@@ -177,7 +179,7 @@ msgstr "Falta el nom del gremi."
#. TRANSLATORS: party invite message
#. TRANSLATORS: change relation
-#: src/actions/chat.cpp:303 src/actions/commands.cpp:65
+#: src/actions/chat.cpp:303 src/actions/commands.cpp:64
msgid "Please specify a name."
msgstr "Si us plau especifica un nom."
@@ -200,75 +202,75 @@ msgid "Message now closes chat."
msgstr "Missatge ara tanca el xat."
#. TRANSLATORS: change relation
-#: src/actions/commands.cpp:108
+#: src/actions/commands.cpp:107
#, c-format
msgid "Player already %s!"
msgstr "El jugador ja és %s!"
#. TRANSLATORS: change relation
-#: src/actions/commands.cpp:120
+#: src/actions/commands.cpp:119
#, c-format
msgid "Player successfully %s!"
msgstr "Relació canviada amb èxit, el jugador es ara %s!"
#. TRANSLATORS: change relation
-#: src/actions/commands.cpp:122
+#: src/actions/commands.cpp:121
#, c-format
msgid "Player could not be %s!"
msgstr "El jugador no pot ser %s!"
#. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:153
+#: src/actions/commands.cpp:152
msgid "Player wasn't ignored!"
msgstr "El jugador no estava ignorat!"
#. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:162
+#: src/actions/commands.cpp:161
msgid "Player no longer ignored!"
msgstr "El jugador ja no està ignorat!"
#. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:164
+#: src/actions/commands.cpp:163
msgid "Player could not be unignored!"
msgstr "El jugador no pot ser des-ignorat!"
#. TRANSLATORS: erase command
-#: src/actions/commands.cpp:179
+#: src/actions/commands.cpp:178
msgid "Player already erased!"
msgstr "Personatge ja esborrat!"
#. TRANSLATORS: erase command
-#: src/actions/commands.cpp:192
+#: src/actions/commands.cpp:191
msgid "Player no longer erased!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/actions/commands.cpp:194
+#: src/actions/commands.cpp:193
msgid "Player could not be erased!"
msgstr "El personatge no pot ser esborrat!"
#. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:201
+#: src/actions/commands.cpp:200
msgid "friend"
msgstr "amic"
#. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:208
+#: src/actions/commands.cpp:207
msgid "disregarded"
msgstr "desatès"
#. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:215
+#: src/actions/commands.cpp:214
msgid "neutral"
msgstr "neutral"
#. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:222
+#: src/actions/commands.cpp:221
msgid "blacklisted"
msgstr ""
#. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:229
+#: src/actions/commands.cpp:228
msgid "enemy"
msgstr ""
@@ -283,77 +285,77 @@ msgid "Accepting incoming trade requests"
msgstr "Acceptant sol·licituds d'intercanvi"
#. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1306
+#: src/actormanager.cpp:1310
msgid "Visible on map"
msgstr "Visible al mapa"
#. TRANSLATORS: default race name
-#: src/being/being.cpp:389
+#: src/being/being.cpp:393
msgid "Human"
msgstr "Humà"
-#: src/being/being.cpp:556
+#: src/being/being.cpp:560
msgid "dodge"
msgstr "esquiva"
-#: src/being/being.cpp:556
+#: src/being/being.cpp:560
msgid "miss"
msgstr "falla"
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1865 src/gui/windows/whoisonline.cpp:855
+#: src/being/being.cpp:1869 src/gui/windows/whoisonline.cpp:855
msgid "A"
msgstr "A"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1870 src/gui/windows/whoisonline.cpp:860
+#: src/being/being.cpp:1874 src/gui/windows/whoisonline.cpp:860
msgid "I"
msgstr "I"
#. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:379
+#: src/being/localplayer.cpp:380
#, c-format
msgid "You were killed by %s"
msgstr "%s t'ha matat."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:824
+#: src/being/localplayer.cpp:825
msgid "Tried to pick up nonexistent item."
msgstr "Has intentat agafar un objecte inexistent."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:828
+#: src/being/localplayer.cpp:829
msgid "Item is too heavy."
msgstr "L'objecte es massa pesant."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:832
+#: src/being/localplayer.cpp:833
msgid "Item is too far away."
msgstr "L'objecte esta massa lluny."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:836
+#: src/being/localplayer.cpp:837
msgid "Inventory is full."
msgstr "L'inventari està complet."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:840
+#: src/being/localplayer.cpp:841
msgid "Stack is too big."
msgstr "La pila d'objectes es massa gran."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:844
+#: src/being/localplayer.cpp:845
msgid "Item belongs to someone else."
msgstr "L'objecte pertany a una altra persona."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:848
+#: src/being/localplayer.cpp:849
msgid "Unknown problem picking up item."
msgstr "Problema desconegut al agafar l'objecte."
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:872
+#: src/being/localplayer.cpp:873
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -362,43 +364,43 @@ msgstr[1] "Has recollit %d [@@%d|%s@@]."
#. TRANSLATORS: this is normal experience
#. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1054 src/being/localplayer.cpp:1055
-#: src/being/localplayer.cpp:1091
+#: src/being/localplayer.cpp:1055 src/being/localplayer.cpp:1056
+#: src/being/localplayer.cpp:1092
msgid "xp"
msgstr "xp"
#. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1059 src/being/localplayer.cpp:1065
-#: src/being/localplayer.cpp:1071
+#: src/being/localplayer.cpp:1060 src/being/localplayer.cpp:1066
+#: src/being/localplayer.cpp:1072
msgid "job"
msgstr "treball"
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2794
+#: src/being/localplayer.cpp:2795
#, c-format
msgid "Follow: %s"
msgstr ""
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2800 src/being/localplayer.cpp:2825
+#: src/being/localplayer.cpp:2801 src/being/localplayer.cpp:2826
msgid "Follow canceled"
msgstr ""
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2810
+#: src/being/localplayer.cpp:2811
#, c-format
msgid "Imitation: %s"
msgstr ""
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2816 src/being/localplayer.cpp:2830
+#: src/being/localplayer.cpp:2817 src/being/localplayer.cpp:2831
msgid "Imitation canceled"
msgstr ""
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3180
+#: src/being/localplayer.cpp:3181
#, c-format
msgid "You see %s"
msgstr ""
@@ -436,37 +438,37 @@ msgstr "Bombolla flotant"
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:920 src/gui/windowmenu.cpp:162
+#: src/client.cpp:918 src/gui/windowmenu.cpp:162
#: src/gui/windows/setupwindow.cpp:62
msgid "Setup"
msgstr "Configuració"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:923 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:921 src/gui/widgets/tabs/setup_perfomance.cpp:54
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:926 src/gui/widgets/tabs/setup_video.cpp:105
+#: src/client.cpp:924 src/gui/widgets/tabs/setup_video.cpp:105
msgid "Video"
msgstr "Vídeo"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:929 src/gui/widgets/tabs/setup_theme.cpp:122
+#: src/client.cpp:927 src/gui/widgets/tabs/setup_theme.cpp:122
msgid "Theme"
msgstr "Tema"
#. TRANSLATORS: theme tab quick button
-#: src/client.cpp:932
+#: src/client.cpp:930
msgid "About"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:935 src/gui/windowmenu.cpp:74
+#: src/client.cpp:933 src/gui/windowmenu.cpp:74
#: src/gui/windows/helpwindow.cpp:53
msgid "Help"
msgstr "Ajuda"
@@ -482,42 +484,42 @@ msgstr "Ajuda"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:939 src/client.cpp:1391 src/client.cpp:1405
+#: src/client.cpp:937 src/client.cpp:1389 src/client.cpp:1403
#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:691
#: src/gui/popups/popupmenu.cpp:923 src/gui/windows/didyouknowwindow.cpp:81
#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:74
#: src/gui/windows/npcdialog.cpp:112 src/gui/windows/questswindow.cpp:77
-#: src/gui/windows/shopwindow.cpp:84
+#: src/gui/windows/shopwindow.cpp:83
msgid "Close"
msgstr "Tancar"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1065
+#: src/client.cpp:1063
msgid "Connecting to server"
msgstr "Connectant al servidor"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1113
+#: src/client.cpp:1111
msgid "Logging in"
msgstr "Iniciant sessió"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1156
+#: src/client.cpp:1154
msgid "Entering game world"
msgstr "Entrant al mon de joc"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1282
+#: src/client.cpp:1280
msgid "Requesting characters"
msgstr "Sol·licitant personatges"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1322
+#: src/client.cpp:1320
msgid "Connecting to the game server"
msgstr "Connectant al servidor de joc"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1334
+#: src/client.cpp:1332
msgid "Changing game servers"
msgstr "Canviant servidors de joc"
@@ -531,72 +533,76 @@ msgstr "Canviant servidors de joc"
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1389 src/client.cpp:1403 src/client.cpp:1598
+#. TRANSLATORS: info message
+#. TRANSLATORS: ok dialog button
+#: src/client.cpp:1387 src/client.cpp:1401 src/client.cpp:1596
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
#: src/gui/windows/charcreatedialog.cpp:369
-#: src/gui/windows/charselectdialog.cpp:289
+#: src/gui/windows/charselectdialog.cpp:311
#: src/gui/windows/editserverdialog.cpp:203
#: src/gui/windows/registerdialog.cpp:245
#: src/gui/windows/unregisterdialog.cpp:146
#: src/net/ea/charserverhandler.cpp:141 src/net/ea/charserverhandler.cpp:173
+#: src/net/eathena/charserverhandler.cpp:516
+#: src/net/eathena/charserverhandler.cpp:518
msgid "Error"
msgstr "Error"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1418
+#: src/client.cpp:1416
msgid "Requesting registration details"
msgstr "Sol·licitant detalls de registre"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1459
+#: src/client.cpp:1457
msgid "Password Change"
msgstr "Canvi de contrasenya"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1461
+#: src/client.cpp:1459
msgid "Password changed successfully!"
msgstr "Contrasenya canviada amb èxit!"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1486
+#: src/client.cpp:1484
msgid "Email Change"
msgstr "Canvi de correu"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1488
+#: src/client.cpp:1486
msgid "Email changed successfully!"
msgstr "Correu canviat amb èxit!"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1515
+#: src/client.cpp:1513
msgid "Unregister Successful"
msgstr "Registre anul·lat amb èxit"
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1517
+#: src/client.cpp:1515
msgid "Farewell, come back any time..."
msgstr "Adéu, torna quan vulguis..."
#. TRANSLATORS: directory creation error
#: src/configmanager.cpp:53 src/dirs.cpp:260 src/dirs.cpp:275 src/dirs.cpp:320
-#: src/dirs.cpp:481 src/dirs.cpp:489
+#: src/dirs.cpp:488 src/dirs.cpp:496
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%s no existeix i no pot ser creat! Sortint."
#. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:363
+#: src/dirs.cpp:370
#, c-format
msgid "Invalid update host: %s."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:404 src/dirs.cpp:411
+#: src/dirs.cpp:411 src/dirs.cpp:418
msgid "Error creating updates directory!"
msgstr "Error creant el directori d'actualitzacions!"
-#: src/dirs.cpp:433 src/dirs.cpp:451
+#: src/dirs.cpp:440 src/dirs.cpp:458
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "Error: %s no existeix i no pot ser creat! Sortint."
@@ -614,36 +620,36 @@ msgid "dyecmd srcdyestring dstfile"
msgstr ""
#. TRANSLATORS: chat tab header
-#: src/game.cpp:236 src/gui/widgets/tabs/chattab.cpp:482
+#: src/game.cpp:234 src/gui/widgets/tabs/chattab.cpp:482
msgid "General"
msgstr "General"
#. TRANSLATORS: chat tab header
#. TRANSLATORS: full button name
#. TRANSLATORS: debug window name
-#: src/game.cpp:253 src/gui/widgets/tabs/chattab.cpp:484
+#: src/game.cpp:251 src/gui/widgets/tabs/chattab.cpp:484
#: src/gui/windowmenu.cpp:149 src/gui/windows/debugwindow.cpp:42
msgid "Debug"
msgstr "Depurador"
#. TRANSLATORS: save file message
-#: src/game.cpp:541
+#: src/game.cpp:532
#, c-format
msgid "Screenshot saved as %s"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:551
+#: src/game.cpp:542
msgid "Saving screenshot failed!"
msgstr "Error al guardar la captura de pantalla!"
#. TRANSLATORS: error message text
-#: src/game.cpp:634
+#: src/game.cpp:625
msgid "The connection to the server was lost."
msgstr "S'ha perdut la connexió amb el servidor."
#. TRANSLATORS: error message header
-#: src/game.cpp:637
+#: src/game.cpp:628
msgid "Network Error"
msgstr "Error de xarxa"
@@ -1034,6 +1040,7 @@ msgstr ""
#: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
#: src/gui/widgets/tabs/setup_other.cpp:79
#: src/gui/widgets/tabs/setup_visual.cpp:81
+#: src/gui/windows/equipmentwindow.cpp:577
msgid "default"
msgstr "Per defecte"
@@ -1524,7 +1531,7 @@ msgstr "Intercanvi"
#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:273
#: src/gui/popups/popupmenu.cpp:767 src/gui/widgets/skillinfo.cpp:113
#: src/gui/windows/botcheckerwindow.cpp:89 src/input/pages/basic.cpp:42
-#: src/net/eathena/generalhandler.cpp:289 src/net/tmwa/generalhandler.cpp:321
+#: src/net/eathena/generalhandler.cpp:356 src/net/tmwa/generalhandler.cpp:320
msgid "Attack"
msgstr "Atacar"
@@ -1693,7 +1700,7 @@ msgstr ""
#. TRANSLATORS: pet unequip item
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:340 src/gui/windows/equipmentwindow.cpp:70
+#: src/gui/popups/popupmenu.cpp:340 src/gui/windows/equipmentwindow.cpp:72
#: src/gui/windows/inventorywindow.cpp:175 src/resources/itemtypemapdata.h:47
#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
@@ -1751,7 +1758,7 @@ msgstr "Element del mapa"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:574
+#: src/gui/popups/popupmenu.cpp:574 src/gui/windows/charselectdialog.cpp:132
msgid "Rename"
msgstr ""
@@ -2263,7 +2270,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
#. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:3000 src/net/ea/playerhandler.cpp:364
+#: src/gui/popups/popupmenu.cpp:3000 src/net/ea/playerhandler.cpp:195
msgid "Revive"
msgstr ""
@@ -2287,7 +2294,7 @@ msgstr "Dreceres"
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: settings group
#. TRANSLATORS: full button name
-#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:319
+#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:315
#: src/gui/windowmenu.cpp:158
msgid "Windows"
msgstr ""
@@ -2315,7 +2322,7 @@ msgstr "Xat"
#. TRANSLATORS: input action name
#: src/gui/setupinputpages.cpp:57 src/gui/widgets/tabs/setup_audio.cpp:151
#: src/gui/widgets/tabs/setup_chat.cpp:179
-#: src/gui/widgets/tabs/setup_other.cpp:341
+#: src/gui/widgets/tabs/setup_other.cpp:337
#: src/gui/widgets/tabs/setup_visual.cpp:192
#: src/gui/windows/charcreatedialog.cpp:119
#: src/gui/windows/registerdialog.cpp:106 src/input/pages/gui.cpp:87
@@ -2328,212 +2335,227 @@ msgid "Gui"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:113
+#: src/gui/userpalette.cpp:116
msgid "Being"
msgstr "Ser"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:115
+#: src/gui/userpalette.cpp:118
msgid "Friend names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:117
+#: src/gui/userpalette.cpp:120
msgid "Disregarded names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:119
+#: src/gui/userpalette.cpp:122
msgid "Ignored names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:121
+#: src/gui/userpalette.cpp:124
msgid "Erased names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:123
+#: src/gui/userpalette.cpp:126
msgid "Other players names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:125
+#: src/gui/userpalette.cpp:128
msgid "Own name"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:127
+#: src/gui/userpalette.cpp:130
msgid "GM names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:129
+#: src/gui/userpalette.cpp:132
msgid "NPCs"
msgstr "NPCs"
#. TRANSLATORS: palette color
#. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:131 src/gui/widgets/tabs/setup_other.cpp:108
+#: src/gui/userpalette.cpp:134 src/gui/widgets/tabs/setup_other.cpp:108
msgid "Monsters"
msgstr "Monstres"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:133
+#: src/gui/userpalette.cpp:136
msgid "Monster HP bar"
msgstr "Barra de vida de monstres"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:139
msgid "Monster HP bar (second color)"
msgstr "Barra de vida de monstres (segon color)"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:138
+#: src/gui/userpalette.cpp:141
msgid "Party members"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:140
+#: src/gui/userpalette.cpp:143
msgid "Guild members"
msgstr ""
#. TRANSLATORS: palette color
#. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:142 src/gui/widgets/tabs/setup_visual.cpp:157
+#: src/gui/userpalette.cpp:145 src/gui/widgets/tabs/setup_visual.cpp:157
msgid "Particle effects"
msgstr "Efectes de partícules"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:144
+#: src/gui/userpalette.cpp:147
msgid "Pickup notification"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:146
+#: src/gui/userpalette.cpp:149
msgid "Exp notification"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:148
+#: src/gui/userpalette.cpp:151
msgid "Player HP bar"
msgstr "Barra de vida del Jugador"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:152
+#: src/gui/userpalette.cpp:155
msgid "Player HP bar (second color)"
msgstr "Barra de vida del Jugador (segon color)"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:154
+#: src/gui/userpalette.cpp:157
msgid "Player hits monster"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:156
+#: src/gui/userpalette.cpp:159
msgid "Monster hits player"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:160
+#: src/gui/userpalette.cpp:163
msgid "Other player hits local player"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:162
+#: src/gui/userpalette.cpp:165
msgid "Critical Hit"
msgstr "Cop Crític"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:166
+#: src/gui/userpalette.cpp:169
msgid "Local player hits monster"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:169
+#: src/gui/userpalette.cpp:172
msgid "Local player critical hit"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:172
+#: src/gui/userpalette.cpp:175
msgid "Local player miss"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:174
+#: src/gui/userpalette.cpp:177
msgid "Misses"
msgstr "Cops fallats"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:176
+#: src/gui/userpalette.cpp:179
msgid "Portal highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:179
+#: src/gui/userpalette.cpp:182
msgid "Default collision highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:182
+#: src/gui/userpalette.cpp:185
msgid "Air collision highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:185
+#: src/gui/userpalette.cpp:188
msgid "Water collision highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:188
+#: src/gui/userpalette.cpp:191
msgid "Special ground collision highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:191
+#: src/gui/userpalette.cpp:194
msgid "Walkable highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:194
+#: src/gui/userpalette.cpp:197
msgid "Local player attack range"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:197
+#: src/gui/userpalette.cpp:200
msgid "Local player attack range border"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:200
+#: src/gui/userpalette.cpp:203
msgid "Monster attack range"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:204
+#: src/gui/userpalette.cpp:207
msgid "Floor item amount color"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:207
+#: src/gui/userpalette.cpp:210
msgid "Home place"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:210
+#: src/gui/userpalette.cpp:213
msgid "Home place border"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:213
+#: src/gui/userpalette.cpp:216
msgid "Road point"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:216
+#: src/gui/userpalette.cpp:219
msgid "Tiles border"
msgstr ""
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:221
+msgid "Pets"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:223
+msgid "Mercenary"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:225
+msgid "Homunculus"
+msgstr ""
+
#: src/gui/widgets/characterdisplay.cpp:135
#, c-format
msgid "Level: %u"
@@ -2636,7 +2658,8 @@ msgid "Type: %s"
msgstr ""
#. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:108
+#. TRANSLATORS: unknown equipment page name
+#: src/gui/widgets/skillinfo.cpp:108 src/gui/windows/equipmentwindow.cpp:584
msgid "Unknown"
msgstr ""
@@ -2837,22 +2860,22 @@ msgstr "Recompte de partícules: %d"
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:262
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:313
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:375
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:319
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:387
msgid "Target:"
msgstr "Objectiu:"
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:264
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:319
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:377
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:325
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:389
msgid "Target Id:"
msgstr "Id del objectiu:"
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:267
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:322
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:379
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:328
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:391
msgid "Target type:"
msgstr ""
@@ -2863,7 +2886,7 @@ msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:271
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:338
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:344
msgid "Target race:"
msgstr ""
@@ -2879,67 +2902,81 @@ msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:277
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:363
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:369
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:387
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:375
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:381
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:399
msgid "Attack delay:"
msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:279
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:350
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:389
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:356
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:401
msgid "Minimal hit:"
msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:281
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:353
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:391
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:359
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:403
msgid "Maximum hit:"
msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:283
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:356
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:393
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:362
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:405
msgid "Critical hit:"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:327
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:285
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:365
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:407
+msgid "Karma:"
+msgstr ""
+
+#. TRANSLATORS: debug window label
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:287
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:368
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:409
+msgid "Manner:"
+msgstr ""
+
+#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:333
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:381
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:339
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:393
msgid "Target Level:"
msgstr "Nivell del objectiu:"
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:341
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:383
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:347
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:395
msgid "Target Party:"
msgstr "Grup del objectiu:"
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:345
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:385
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:351
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:397
msgid "Target Guild:"
msgstr "Gremi del objectiu:"
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:430
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:436
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:451
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:457
#, c-format
msgid "Ping: %s ms"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:439
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:460
#, c-format
msgid "In: %d bytes/s"
msgstr "Rebent: %d bytes/s"
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:442
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:463
#, c-format
msgid "Out: %d bytes/s"
msgstr "Enviant: %d bytes/s"
@@ -3768,137 +3805,132 @@ msgstr ""
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_other.cpp:294
-msgid "Enable auction bot support"
-msgstr ""
-
-#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:298
msgid "Enable guild bot support and disable native guild support"
msgstr ""
#. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:304
+#: src/gui/widgets/tabs/setup_other.cpp:300
msgid "Keyboard"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:307
+#: src/gui/widgets/tabs/setup_other.cpp:303
msgid "Repeat delay"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:311
+#: src/gui/widgets/tabs/setup_other.cpp:307
msgid "Repeat interval"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:315
+#: src/gui/widgets/tabs/setup_other.cpp:311
msgid "Custom repeat interval"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:323
+#: src/gui/widgets/tabs/setup_other.cpp:319
msgid "Shortcut buttons"
msgstr ""
#. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:328
+#: src/gui/widgets/tabs/setup_other.cpp:324
msgid "Proxy server"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:332
+#: src/gui/widgets/tabs/setup_other.cpp:328
msgid "Proxy type"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:336
+#: src/gui/widgets/tabs/setup_other.cpp:332
msgid "Proxy address:port"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:344
+#: src/gui/widgets/tabs/setup_other.cpp:340
msgid "Enable server side attack"
msgstr "Habilitar atac del cantó del servidor"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:348
+#: src/gui/widgets/tabs/setup_other.cpp:344
msgid "Hide support page link on error"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:352
+#: src/gui/widgets/tabs/setup_other.cpp:348
msgid "Enable double clicks"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:356
+#: src/gui/widgets/tabs/setup_other.cpp:352
msgid "Enable bot checker"
msgstr "Permet comprovador de bots"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:360
+#: src/gui/widgets/tabs/setup_other.cpp:356
msgid "Enable buggy servers protection (do not disable)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:365
+#: src/gui/widgets/tabs/setup_other.cpp:361
msgid "Enable debug log"
msgstr "Permet registre de depurador"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:369
+#: src/gui/widgets/tabs/setup_other.cpp:365
msgid "Ignore logging packets"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:373
+#: src/gui/widgets/tabs/setup_other.cpp:369
msgid "Enable OpenGL log"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:377
+#: src/gui/widgets/tabs/setup_other.cpp:373
msgid "Enable input log"
msgstr ""
#. TRANSLATORS: settings option
#. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_other.cpp:381 src/input/pages/other.cpp:362
+#: src/gui/widgets/tabs/setup_other.cpp:377 src/input/pages/other.cpp:362
msgid "Upload log file"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:385
+#: src/gui/widgets/tabs/setup_other.cpp:381
msgid "Low traffic mode"
msgstr "Mode de baix tràfic"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:389
+#: src/gui/widgets/tabs/setup_other.cpp:385
msgid "Hide shield sprite"
msgstr "Amaga sprite de protector"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:394
+#: src/gui/widgets/tabs/setup_other.cpp:390
msgid "Use FBO for screenshots (only for opengl)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:400
+#: src/gui/widgets/tabs/setup_other.cpp:396
msgid "Screenshot directory"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:405
+#: src/gui/widgets/tabs/setup_other.cpp:401
msgid "Network delay between sub servers"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:409
+#: src/gui/widgets/tabs/setup_other.cpp:405
msgid "Show background"
msgstr "Mostra fons"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:414
+#: src/gui/widgets/tabs/setup_other.cpp:410
msgid "Screen density override"
msgstr ""
@@ -4129,9 +4161,9 @@ msgstr "Permet xiuxiueigs"
#. TRANSLATORS: command editor button
#. TRANSLATORS: input action name
#: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:82
-#: src/gui/windows/serverdialog.cpp:125 src/gui/windows/shopwindow.cpp:101
-#: src/gui/windows/shopwindow.cpp:108 src/gui/windows/textcommandeditor.cpp:92
+#: src/gui/windows/charselectdialog.cpp:84
+#: src/gui/windows/serverdialog.cpp:125 src/gui/windows/shopwindow.cpp:100
+#: src/gui/windows/shopwindow.cpp:107 src/gui/windows/textcommandeditor.cpp:92
#: src/input/pages/gui.cpp:111
msgid "Delete"
msgstr "Esborra"
@@ -4785,7 +4817,7 @@ msgstr "EQU"
#. TRANSLATORS: equipment window name
#. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:63
+#: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:65
#: src/gui/windows/inventorywindow.cpp:196
msgid "Equipment"
msgstr "Equipament"
@@ -4926,7 +4958,7 @@ msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: social window button
#: src/gui/windows/buydialog.cpp:260 src/gui/windows/charcreatedialog.cpp:127
-#: src/gui/windows/charselectdialog.cpp:578
+#: src/gui/windows/charselectdialog.cpp:605
#: src/gui/windows/socialwindow.cpp:86
msgid "Create"
msgstr "Crear"
@@ -4970,10 +5002,8 @@ msgstr "Les direccions de correu no coincideixen."
#. TRANSLATORS: change password window name
#. TRANSLATORS: change password dialog button
-#. TRANSLATORS: char select dialog. button.
#: src/gui/windows/changepassworddialog.cpp:51
#: src/gui/windows/changepassworddialog.cpp:57
-#: src/gui/windows/charselectdialog.cpp:73
msgid "Change Password"
msgstr "Canviar contrasenya"
@@ -5127,57 +5157,68 @@ msgid "Are you sure you want to delete this character?"
msgstr "Estàs segur que bols esborrar aquest personatge?"
#. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:64
+#: src/gui/windows/charselectdialog.cpp:66
#, c-format
msgid "Account %s (last login time %s)"
msgstr ""
#. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:71
-msgid "Switch Login"
-msgstr "Canvia compta d'accés"
+#: src/gui/windows/charselectdialog.cpp:73
+msgid "Switch"
+msgstr ""
+
+#. TRANSLATORS: char select dialog. button.
+#: src/gui/windows/charselectdialog.cpp:75
+msgid "Password"
+msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:78
-#: src/gui/windows/charselectdialog.cpp:573
+#: src/gui/windows/charselectdialog.cpp:80
+#: src/gui/windows/charselectdialog.cpp:595
#: src/gui/windows/updaterwindow.cpp:195
msgid "Play"
msgstr "Juga"
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:80
+#: src/gui/windows/charselectdialog.cpp:82
#: src/net/ea/charserverhandler.cpp:160
+#: src/net/eathena/charserverhandler.cpp:531
+#: src/net/eathena/charserverhandler.cpp:561
msgid "Info"
msgstr "Informació"
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: unregister dialog name
#. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:106
+#: src/gui/windows/charselectdialog.cpp:110
#: src/gui/windows/unregisterdialog.cpp:50
#: src/gui/windows/unregisterdialog.cpp:55
msgid "Unregister"
msgstr "No registrat"
#. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:118
+#: src/gui/windows/charselectdialog.cpp:122
msgid "Change Email"
msgstr "Canvia correu"
#. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:156
+#: src/gui/windows/charselectdialog.cpp:166
#, c-format
msgid "Account %s"
msgstr ""
-#: src/gui/windows/charselectdialog.cpp:184
+#: src/gui/windows/charselectdialog.cpp:194
msgid "Please set new pincode"
msgstr ""
+#: src/gui/windows/charselectdialog.cpp:240
+msgid "Please enter new name"
+msgstr ""
+
#. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:237
+#: src/gui/windows/charselectdialog.cpp:259
#, c-format
msgid ""
"Hp: %u/%u\n"
@@ -5187,16 +5228,16 @@ msgid ""
"Money: %s"
msgstr ""
-#: src/gui/windows/charselectdialog.cpp:289
+#: src/gui/windows/charselectdialog.cpp:311
msgid "Incorrect password"
msgstr ""
#. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:429
+#: src/gui/windows/charselectdialog.cpp:451
msgid "Enter password for deleting character"
msgstr ""
-#: src/gui/windows/charselectdialog.cpp:429
+#: src/gui/windows/charselectdialog.cpp:451
msgid "Enter password:"
msgstr ""
@@ -5604,7 +5645,7 @@ msgstr "Nivell: %d"
#. TRANSLATORS: status bar label
#: src/gui/windows/ministatuswindow.cpp:364
-#: src/gui/windows/ministatuswindow.cpp:402
+#: src/gui/windows/ministatuswindow.cpp:401
msgid "Need"
msgstr "Necessites"
@@ -5635,7 +5676,7 @@ msgstr "Envia"
#. TRANSLATORS: shop window button
#. TRANSLATORS: trade window button
#: src/gui/windows/npcdialog.cpp:114 src/gui/windows/serverdialog.cpp:121
-#: src/gui/windows/shopwindow.cpp:99 src/gui/windows/shopwindow.cpp:106
+#: src/gui/windows/shopwindow.cpp:98 src/gui/windows/shopwindow.cpp:105
#: src/gui/windows/tradewindow.cpp:83
msgid "Add"
msgstr "Afegeix"
@@ -5798,43 +5839,38 @@ msgid "Reset Windows"
msgstr "Restaurar finestres"
#. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:80
+#: src/gui/windows/shopwindow.cpp:79
msgid "Personal Shop"
msgstr "Botiga personal"
#. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:95
+#: src/gui/windows/shopwindow.cpp:94
msgid "Buy items"
msgstr "Comprar objectes"
#. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:97
+#: src/gui/windows/shopwindow.cpp:96
msgid "Sell items"
msgstr "Vendre objectes"
#. TRANSLATORS: shop window label
#. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:110
+#: src/gui/windows/shopwindow.cpp:102 src/gui/windows/shopwindow.cpp:109
msgid "Announce"
msgstr "Anunciar"
#. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:114
+#: src/gui/windows/shopwindow.cpp:113
msgid "Show links in announce"
msgstr "Mostra enllaços al anunci"
-#. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:176 src/gui/windows/shopwindow.cpp:179
-msgid "Auction"
-msgstr ""
-
#. TRANSLATORS: shop window dialog
#. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:233
+#: src/gui/windows/shopwindow.cpp:776 src/net/ea/tradehandler.cpp:233
msgid "Request for Trade"
msgstr "Petició d'intercanvi"
-#: src/gui/windows/shopwindow.cpp:791
+#: src/gui/windows/shopwindow.cpp:776
#, c-format
msgid "%s wants to %s %s do you accept?"
msgstr "%s vol %s %s acceptes?"
@@ -6162,27 +6198,27 @@ msgstr "Actualitzant..."
msgid "Connecting..."
msgstr "Connectant..."
-#: src/gui/windows/updaterwindow.cpp:398
+#: src/gui/windows/updaterwindow.cpp:407
msgid "Show all news (can be slow)"
msgstr ""
#. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:824
+#: src/gui/windows/updaterwindow.cpp:833
msgid "##1 The update process is incomplete."
msgstr "##1 El procés d'actualització està incomplet."
#. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:826
+#: src/gui/windows/updaterwindow.cpp:835
msgid "##1 It is strongly recommended that"
msgstr "##1 Això es altament recomanat"
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:828
+#: src/gui/windows/updaterwindow.cpp:837
msgid "##1 you try again later."
msgstr "##1 tornes a provar més tard."
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1005
+#: src/gui/windows/updaterwindow.cpp:1021
msgid "Completed"
msgstr "Complet"
@@ -6229,25 +6265,25 @@ msgstr "Tria Món"
#. TRANSLATORS: long key name. must be short.
#. TRANSLATORS: short key name. must be very short.
#. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:370 src/input/inputmanager.cpp:414
+#: src/input/inputmanager.cpp:371 src/input/inputmanager.cpp:415
#: src/input/keyboardconfig.cpp:104
#, c-format
msgid "key_%d"
msgstr ""
#. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:376
+#: src/input/inputmanager.cpp:377
#, c-format
msgid "JButton%d"
msgstr ""
#. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:391
msgid "unknown key"
msgstr ""
#. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:420
+#: src/input/inputmanager.cpp:421
#, c-format
msgid "JB%d"
msgstr ""
@@ -6255,7 +6291,7 @@ msgstr ""
#. TRANSLATORS: unknown short key type. must be short
#. TRANSLATORS: Unknown key short string.
#. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:434 src/input/keyboardconfig.cpp:148
+#: src/input/inputmanager.cpp:435 src/input/keyboardconfig.cpp:148
msgid "u key"
msgstr ""
@@ -7426,74 +7462,74 @@ msgid "Request to quit denied!"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:135
#, c-format
msgid "Guild name: %s"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:191
+#: src/net/ea/guildhandler.cpp:138
#, c-format
msgid "Guild master: %s"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:141
#, c-format
msgid "Guild level: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:197
+#: src/net/ea/guildhandler.cpp:144
#, c-format
msgid "Online members: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:200
+#: src/net/ea/guildhandler.cpp:147
#, c-format
msgid "Max members: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:203
+#: src/net/ea/guildhandler.cpp:150
#, c-format
msgid "Average level: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:206
+#: src/net/ea/guildhandler.cpp:153
#, c-format
msgid "Guild exp: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:209
+#: src/net/ea/guildhandler.cpp:156
#, c-format
msgid "Guild next exp: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:212
+#: src/net/ea/guildhandler.cpp:159
#, c-format
msgid "Guild castle: %s"
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:179
+#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:191
msgid "Item sharing enabled."
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:183
+#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:195
msgid "Item sharing disabled."
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:187
+#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:199
msgid "Item sharing not possible."
msgstr ""
@@ -7504,19 +7540,19 @@ msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:167
+#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:179
msgid "Experience sharing enabled."
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:171
+#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:183
msgid "Experience sharing disabled."
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:175
+#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:187
msgid "Experience sharing not possible."
msgstr ""
@@ -7621,239 +7657,355 @@ msgid "Connection to server terminated. "
msgstr "Connexió interrompuda amb el servidor. "
#. TRANSLATORS: message header
-#: src/net/ea/playerhandler.cpp:257 src/net/ea/playerhandler.cpp:273
-#: src/net/ea/playerhandler.cpp:361
+#: src/net/ea/playerhandler.cpp:192 src/net/ea/playerhandler.cpp:418
+#: src/net/ea/playerhandler.cpp:434
msgid "Message"
msgstr ""
#. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:259
+#: src/net/ea/playerhandler.cpp:420
msgid ""
"You are carrying more than half your weight. You are unable to regain "
"health."
msgstr ""
#. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:275
+#: src/net/ea/playerhandler.cpp:436
msgid "You are carrying less than half your weight. You can regain health."
msgstr ""
+#. TRANSLATORS: char rename error
+#: src/net/eathena/charserverhandler.cpp:516
+#: src/net/eathena/charserverhandler.cpp:553
+msgid "Character rename error."
+msgstr ""
+
+#: src/net/eathena/charserverhandler.cpp:531
+msgid "Character renamed."
+msgstr ""
+
+#. TRANSLATORS: char rename error
+#: src/net/eathena/charserverhandler.cpp:544
+msgid "Rename not allowed."
+msgstr ""
+
+#. TRANSLATORS: char rename error
+#: src/net/eathena/charserverhandler.cpp:548
+msgid "New name is not set."
+msgstr ""
+
+#. TRANSLATORS: char rename error
+#: src/net/eathena/charserverhandler.cpp:557
+msgid "Character not found."
+msgstr ""
+
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:125
+#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:124
#, c-format
msgid "Strength %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:127
+#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:126
#, c-format
msgid "Agility %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:129
+#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:128
#, c-format
msgid "Vitality %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:131
+#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:130
#, c-format
msgid "Intelligence %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:128 src/net/tmwa/generalhandler.cpp:133
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:132
#, c-format
msgid "Dexterity %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:135
+#: src/net/eathena/generalhandler.cpp:128 src/net/tmwa/generalhandler.cpp:134
#, c-format
msgid "Luck %s"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:152 src/net/tmwa/generalhandler.cpp:161
+#: src/net/eathena/generalhandler.cpp:159 src/net/tmwa/generalhandler.cpp:160
msgid "Authentication failed."
msgstr "Autenticació fallida."
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:155 src/net/tmwa/generalhandler.cpp:165
+#: src/net/eathena/generalhandler.cpp:162 src/net/tmwa/generalhandler.cpp:164
msgid "No servers available."
msgstr "No hi ha cap servidor disponible."
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:160 src/net/tmwa/generalhandler.cpp:171
+#: src/net/eathena/generalhandler.cpp:167 src/net/tmwa/generalhandler.cpp:170
msgid "Someone else is trying to use this account."
msgstr "Algú altre està provant d'utilitzar aquest compte."
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:165 src/net/tmwa/generalhandler.cpp:177
+#: src/net/eathena/generalhandler.cpp:172 src/net/tmwa/generalhandler.cpp:176
msgid "This account is already logged in."
msgstr "Aquest compte ja està sent utilitzat."
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:169 src/net/tmwa/generalhandler.cpp:182
+#: src/net/eathena/generalhandler.cpp:176 src/net/tmwa/generalhandler.cpp:181
msgid "Speed hack detected."
msgstr "Hack de desplaçament ràpid detectat."
+#: src/net/eathena/generalhandler.cpp:179
+msgid "Server full."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:182
+msgid "Sorry, you are underaged."
+msgstr ""
+
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:172 src/net/tmwa/generalhandler.cpp:186
+#: src/net/eathena/generalhandler.cpp:185 src/net/tmwa/generalhandler.cpp:185
msgid "Duplicated login."
msgstr "Accès de sessió duplicat."
+#: src/net/eathena/generalhandler.cpp:188
+msgid "To many connections from same ip."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:191
+msgid "Not paid for this time."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:194
+msgid "Pay suspended."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:197
+msgid "Pay changed."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:200
+msgid "Pay wrong ip."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:203
+msgid "Pay game room."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:206
+msgid "Disconnect forced by GM."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:210
+msgid "Ban japan refuse."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:213
+msgid "Remained other account."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:216
+msgid "Ip unfair."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:219
+msgid "Ip count all."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:222
+msgid "Ip count."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:226
+msgid "Memory."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:229
+msgid "Han valid."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:232
+msgid "Ip limited access."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:235
+msgid "Over characters list."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:238
+msgid "Ip blocked."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:241
+msgid "Invalid password count."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:244
+msgid "Not allowed race."
+msgstr ""
+
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:175 src/net/tmwa/generalhandler.cpp:190
+#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:189
msgid "Unknown connection error."
msgstr "Error de connexió desconegut."
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:280
+#: src/net/eathena/generalhandler.cpp:323 src/net/tmwa/generalhandler.cpp:279
msgid "Got disconnected from server!"
msgstr "Has estat desconnectat del servidor!"
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:282 src/net/tmwa/generalhandler.cpp:308
+#: src/net/eathena/generalhandler.cpp:348 src/net/tmwa/generalhandler.cpp:307
msgid "Strength"
msgstr "Força"
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:310
+#: src/net/eathena/generalhandler.cpp:349 src/net/tmwa/generalhandler.cpp:309
msgid "Agility"
msgstr "Agilitat"
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:284 src/net/tmwa/generalhandler.cpp:312
+#: src/net/eathena/generalhandler.cpp:350 src/net/tmwa/generalhandler.cpp:311
msgid "Vitality"
msgstr "Vitalitat"
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:285 src/net/tmwa/generalhandler.cpp:314
+#: src/net/eathena/generalhandler.cpp:352 src/net/tmwa/generalhandler.cpp:314
msgid "Intelligence"
msgstr "Intel·ligència"
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:286 src/net/tmwa/generalhandler.cpp:316
+#: src/net/eathena/generalhandler.cpp:353 src/net/tmwa/generalhandler.cpp:316
msgid "Dexterity"
msgstr "Destresa"
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:287 src/net/tmwa/generalhandler.cpp:318
+#: src/net/eathena/generalhandler.cpp:354 src/net/tmwa/generalhandler.cpp:318
msgid "Luck"
msgstr "Sort"
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:290 src/net/tmwa/generalhandler.cpp:323
+#: src/net/eathena/generalhandler.cpp:357 src/net/tmwa/generalhandler.cpp:322
msgid "Defense"
msgstr "Defensa"
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:291 src/net/tmwa/generalhandler.cpp:325
+#: src/net/eathena/generalhandler.cpp:358 src/net/tmwa/generalhandler.cpp:324
msgid "M.Attack"
msgstr "Atac màgic"
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:292 src/net/tmwa/generalhandler.cpp:327
+#: src/net/eathena/generalhandler.cpp:359 src/net/tmwa/generalhandler.cpp:326
msgid "M.Defense"
msgstr "Defensa màgica"
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:294 src/net/tmwa/generalhandler.cpp:330
+#: src/net/eathena/generalhandler.cpp:361 src/net/tmwa/generalhandler.cpp:329
#, no-c-format
msgid "% Accuracy"
msgstr "% de Precisió"
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:296 src/net/tmwa/generalhandler.cpp:333
+#: src/net/eathena/generalhandler.cpp:363 src/net/tmwa/generalhandler.cpp:332
#, no-c-format
msgid "% Evade"
msgstr "% de Evasió"
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:298 src/net/tmwa/generalhandler.cpp:336
+#: src/net/eathena/generalhandler.cpp:365 src/net/tmwa/generalhandler.cpp:335
#, no-c-format
msgid "% Critical"
msgstr "% de Crític"
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:299 src/net/tmwa/generalhandler.cpp:338
+#: src/net/eathena/generalhandler.cpp:366 src/net/tmwa/generalhandler.cpp:337
msgid "Attack Delay"
msgstr "Retard d'atac"
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:300 src/net/tmwa/generalhandler.cpp:340
+#: src/net/eathena/generalhandler.cpp:367 src/net/tmwa/generalhandler.cpp:339
msgid "Walk Delay"
msgstr "Demora a peu"
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:301 src/net/tmwa/generalhandler.cpp:342
+#: src/net/eathena/generalhandler.cpp:368 src/net/tmwa/generalhandler.cpp:341
msgid "Attack Range"
msgstr "Distància d'atac"
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:302 src/net/tmwa/generalhandler.cpp:344
+#: src/net/eathena/generalhandler.cpp:369 src/net/tmwa/generalhandler.cpp:343
msgid "Damage per sec."
msgstr ""
-#: src/net/eathena/skillhandler.cpp:228 src/net/eathena/skillhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:370
+msgid "Karma"
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:371
+msgid "Manner"
+msgstr ""
+
+#: src/net/eathena/skillhandler.cpp:304 src/net/eathena/skillhandler.cpp:364
#, c-format
msgid "Unknown skill error: %d"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:235 src/net/tmwa/skillhandler.cpp:224
+#: src/net/eathena/skillhandler.cpp:311 src/net/tmwa/skillhandler.cpp:224
msgid "You have not yet reached a high enough lvl!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:239 src/net/tmwa/skillhandler.cpp:228
+#: src/net/eathena/skillhandler.cpp:315 src/net/tmwa/skillhandler.cpp:228
msgid "Insufficient HP!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:243 src/net/tmwa/skillhandler.cpp:232
+#: src/net/eathena/skillhandler.cpp:319 src/net/tmwa/skillhandler.cpp:232
msgid "Insufficient SP!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:247 src/net/tmwa/skillhandler.cpp:236
+#: src/net/eathena/skillhandler.cpp:323 src/net/tmwa/skillhandler.cpp:236
msgid "You have no memos!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:251 src/net/tmwa/skillhandler.cpp:240
+#: src/net/eathena/skillhandler.cpp:327 src/net/tmwa/skillhandler.cpp:240
msgid "You cannot do that right now!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:255 src/net/tmwa/skillhandler.cpp:244
+#: src/net/eathena/skillhandler.cpp:331 src/net/tmwa/skillhandler.cpp:244
msgid "Seems you need more money... ;-)"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:259 src/net/tmwa/skillhandler.cpp:248
+#: src/net/eathena/skillhandler.cpp:335 src/net/tmwa/skillhandler.cpp:248
msgid "You cannot use this skill with that kind of weapon!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:264 src/net/tmwa/skillhandler.cpp:253
+#: src/net/eathena/skillhandler.cpp:340 src/net/tmwa/skillhandler.cpp:253
msgid "You need another red gem!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:268 src/net/tmwa/skillhandler.cpp:257
+#: src/net/eathena/skillhandler.cpp:344 src/net/tmwa/skillhandler.cpp:257
msgid "You need another blue gem!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:272 src/net/tmwa/skillhandler.cpp:261
+#: src/net/eathena/skillhandler.cpp:348 src/net/tmwa/skillhandler.cpp:261
msgid "You're carrying to much to do this!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:276 src/net/tmwa/skillhandler.cpp:265
+#: src/net/eathena/skillhandler.cpp:352 src/net/tmwa/skillhandler.cpp:265
msgid "Huh? What's that?"
msgstr ""
@@ -7870,32 +8022,32 @@ msgid "%s wants to trade with you, do you accept?"
msgstr "%s bol un intercanvi amb tu, acceptes?"
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:349
+#: src/net/tmwa/charserverhandler.cpp:351
msgid "Strength:"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:351
+#: src/net/tmwa/charserverhandler.cpp:353
msgid "Agility:"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:353
+#: src/net/tmwa/charserverhandler.cpp:355
msgid "Vitality:"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:355
+#: src/net/tmwa/charserverhandler.cpp:357
msgid "Intelligence:"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:357
+#: src/net/tmwa/charserverhandler.cpp:359
msgid "Dexterity:"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:359
+#: src/net/tmwa/charserverhandler.cpp:361
msgid "Luck:"
msgstr ""
@@ -8206,269 +8358,306 @@ msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:143
+msgid "You cant left party on this map."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:147
+msgid "You was kicked from party."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:151
+msgid "You cant be kicked kicked from party on this map."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:155
#, c-format
msgid "%s has joined your party."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:147
+#: src/resources/notifications.h:159
#, c-format
msgid "%s is already a member of a party."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:151
+#: src/resources/notifications.h:163
#, c-format
msgid "%s refused your invitation."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:155
+#: src/resources/notifications.h:167
#, c-format
msgid "%s is now a member of your party."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:159
+#: src/resources/notifications.h:171
#, c-format
msgid "%s can't join your party because party is full."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:163
+#: src/resources/notifications.h:175
#, c-format
msgid "QQQ Unknown invite response for %s."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:191
+#: src/resources/notifications.h:203
#, c-format
msgid "%s has left your party."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:195
+#: src/resources/notifications.h:207 src/resources/notifications.h:215
+#, c-format
+msgid "%s cant be kicked from party on this map."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:211
+#, c-format
+msgid "%s has kicked from your party."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:219
#, c-format
msgid "An unknown member tried to say: %s"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:199
+#: src/resources/notifications.h:223
#, c-format
msgid "%s is not in your party!"
msgstr "%s no està al teu grup!"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:203
+#: src/resources/notifications.h:227
#, c-format
msgid "You picked up %s."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:207
+#: src/resources/notifications.h:231
#, c-format
msgid "You spent %s."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:211
+#: src/resources/notifications.h:235
msgid "Cannot raise skill!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:215
+#: src/resources/notifications.h:239
msgid "Equip ammunition first."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:219
+#: src/resources/notifications.h:243
#, c-format
msgid "Trading with %s isn't possible. Trade partner is too far away."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:224
+#: src/resources/notifications.h:248
#, c-format
msgid "Trading with %s isn't possible. Character doesn't exist."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:228
+#: src/resources/notifications.h:252
msgid "Trade cancelled due to an unknown reason."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:232
+#: src/resources/notifications.h:256
#, c-format
msgid "Trade with %s cancelled."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:236
+#: src/resources/notifications.h:260
#, c-format
msgid "Unhandled trade cancel packet with %s"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:240
+#: src/resources/notifications.h:264
msgid "Failed adding item. Trade partner is over weighted."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:244
+#: src/resources/notifications.h:268
msgid "Failed adding item. Trade partner has no free slot."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:248
+#: src/resources/notifications.h:272
msgid "Failed adding item. You can't trade this item."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:252
+#: src/resources/notifications.h:276
msgid "Failed adding item for unknown reason."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:256
+#: src/resources/notifications.h:280
msgid "Trade canceled."
msgstr "Intercanvi cancel·lat."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:260
+#: src/resources/notifications.h:284
msgid "Trade completed."
msgstr "Intercanvi completat."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:264
+#: src/resources/notifications.h:288
msgid "Kick failed!"
msgstr "Expulsió fallida!"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:268
+#: src/resources/notifications.h:292
msgid "Kick succeeded!"
msgstr "Expulsió completada!"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:272
+#: src/resources/notifications.h:296
#, c-format
msgid "MVP player: %s"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:276
+#: src/resources/notifications.h:300
msgid "All whispers ignored."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:280
+#: src/resources/notifications.h:304
msgid "All whispers ignore failed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:284
+#: src/resources/notifications.h:308
msgid "All whispers unignored."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:288
+#: src/resources/notifications.h:312
msgid "All whispers unignore failed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:295
+#: src/resources/notifications.h:319
msgid "pvp off, gvg off"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:299
+#: src/resources/notifications.h:323
msgid "pvp on"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:303
+#: src/resources/notifications.h:327
msgid "gvg on"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:307
+#: src/resources/notifications.h:331
msgid "pvp on, gvg on"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:311
+#: src/resources/notifications.h:335
msgid "unknown pvp"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:315
+#: src/resources/notifications.h:339
#, c-format
msgid "Char from account %s is already in your party!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:319
+#: src/resources/notifications.h:343
#, c-format
msgid "%s blocked invite!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:323
+#: src/resources/notifications.h:347
msgid "Char is not online!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:327
+#: src/resources/notifications.h:351
msgid "Pet catch failed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:331
+#: src/resources/notifications.h:355
msgid "Pet catched."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:335
+#: src/resources/notifications.h:359
#, c-format
msgid "Pet catch unkown error: %d."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:339
+#: src/resources/notifications.h:363
msgid "Your mercenary duty hour is over."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:343
+#: src/resources/notifications.h:367
msgid "Your mercenary was killed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:347
+#: src/resources/notifications.h:371
msgid "Your mercenary was fired."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:351
+#: src/resources/notifications.h:375
msgid "Your mercenary run away."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:355
+#: src/resources/notifications.h:379
msgid "Mercenary unknown state."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:359
-msgid "Your feed your homunculus."
+#: src/resources/notifications.h:383
+msgid "You feed your homunculus."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:363
+#: src/resources/notifications.h:387
#, c-format
msgid "You cant feed homunculus, because not have %s."
msgstr ""
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:391
+msgid "Card insert failed."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:395
+msgid "Card inserted."
+msgstr ""
+
#. TRANSLATORS: chat option changed message
#: src/utils/booleanoptions.h:27
#, c-format
diff --git a/po/cs.po b/po/cs.po
index 858173b6d..ea7f1b783 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -14,8 +14,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-10-08 01:19+0300\n"
-"PO-Revision-Date: 2014-09-28 10:01+0000\n"
+"POT-Creation-Date: 2014-10-10 00:16+0300\n"
+"PO-Revision-Date: 2014-10-08 10:02+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Czech (http://www.transifex.com/projects/p/manaplus/language/"
"cs/)\n"
@@ -2557,9 +2557,8 @@ msgstr ""
#. TRANSLATORS: palette color
#: src/gui/userpalette.cpp:223
-#, fuzzy
msgid "Mercenary"
-msgstr "Zaměř žoldáka"
+msgstr ""
#. TRANSLATORS: palette color
#: src/gui/userpalette.cpp:225
@@ -5186,15 +5185,13 @@ msgstr "Účet %s (poslední přihlášení %s)"
#. TRANSLATORS: char select dialog. button.
#: src/gui/windows/charselectdialog.cpp:73
-#, fuzzy
msgid "Switch"
-msgstr "Přepnout přihlášení"
+msgstr ""
#. TRANSLATORS: char select dialog. button.
#: src/gui/windows/charselectdialog.cpp:75
-#, fuzzy
msgid "Password"
-msgstr "Heslo:"
+msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: updater window button
@@ -5238,9 +5235,8 @@ msgid "Please set new pincode"
msgstr "Prosím nastavte nový pin kód"
#: src/gui/windows/charselectdialog.cpp:240
-#, fuzzy
msgid "Please enter new name"
-msgstr "Prosím nastavte nový pin kód"
+msgstr ""
#. TRANSLATORS: char select dialog. player info message.
#: src/gui/windows/charselectdialog.cpp:259
@@ -5898,7 +5894,7 @@ msgstr "Zobrazit odkazy v oznámení"
#. TRANSLATORS: shop window dialog
#. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:776 src/net/ea/tradehandler.cpp:233
+#: src/gui/windows/shopwindow.cpp:776 src/net/ea/tradehandler.cpp:192
msgid "Request for Trade"
msgstr "Požadavek k obchodování"
@@ -7553,19 +7549,19 @@ msgstr "Hrad gildy: %s"
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:191
+#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:207
msgid "Item sharing enabled."
msgstr "Sdílení předmětů povoleno."
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:195
+#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:211
msgid "Item sharing disabled."
msgstr "Sdílení předmětů zakázáno."
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:199
+#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:215
msgid "Item sharing not possible."
msgstr "Sdílení předmětů není možné."
@@ -7576,19 +7572,19 @@ msgstr "Stav sdílení předmětů neznámý."
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:179
+#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:195
msgid "Experience sharing enabled."
msgstr "Sdílení zkušeností povoleno."
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:183
+#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:199
msgid "Experience sharing disabled."
msgstr "Sdílení zkušeností zakázáno."
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:187
+#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:203
msgid "Experience sharing not possible."
msgstr "Sdílení zkušeností není možné."
@@ -7715,14 +7711,12 @@ msgstr ""
#. TRANSLATORS: char rename error
#: src/net/eathena/charserverhandler.cpp:516
#: src/net/eathena/charserverhandler.cpp:553
-#, fuzzy
msgid "Character rename error."
-msgstr "Postava odstraněna."
+msgstr ""
#: src/net/eathena/charserverhandler.cpp:531
-#, fuzzy
msgid "Character renamed."
-msgstr "Postava odstraněna."
+msgstr ""
#. TRANSLATORS: char rename error
#: src/net/eathena/charserverhandler.cpp:544
@@ -7736,9 +7730,8 @@ msgstr ""
#. TRANSLATORS: char rename error
#: src/net/eathena/charserverhandler.cpp:557
-#, fuzzy
msgid "Character not found."
-msgstr "Bodů postavy: %d"
+msgstr ""
#. TRANSLATORS: player stat
#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:124
@@ -7802,9 +7795,8 @@ msgid "Speed hack detected."
msgstr "Detekován podvod s rychlostí."
#: src/net/eathena/generalhandler.cpp:179
-#, fuzzy
msgid "Server full."
-msgstr "Server:"
+msgstr ""
#: src/net/eathena/generalhandler.cpp:182
msgid "Sorry, you are underaged."
@@ -7876,18 +7868,16 @@ msgid "Ip limited access."
msgstr ""
#: src/net/eathena/generalhandler.cpp:235
-#, fuzzy
msgid "Over characters list."
-msgstr "Postava odstraněna."
+msgstr ""
#: src/net/eathena/generalhandler.cpp:238
msgid "Ip blocked."
msgstr ""
#: src/net/eathena/generalhandler.cpp:241
-#, fuzzy
msgid "Invalid password count."
-msgstr "Půvoní heslo je nesprávné."
+msgstr ""
#: src/net/eathena/generalhandler.cpp:244
msgid "Not allowed race."
@@ -8054,13 +8044,13 @@ msgid "Huh? What's that?"
msgstr "Eh? Co to je?"
#. TRANSLATORS: trade header
-#: src/net/ea/tradehandler.cpp:100
+#: src/net/ea/tradehandler.cpp:105
#, c-format
msgid "Trade: You and %s"
msgstr "Obchod: Ty a %s"
#. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:235
+#: src/net/ea/tradehandler.cpp:194
#, c-format
msgid "%s wants to trade with you, do you accept?"
msgstr "%s s tebou chce obchodovat, souhlasíš?"
@@ -8279,429 +8269,454 @@ msgstr "Nelze koupit."
#. TRANSLATORS: notification message
#: src/resources/notifications.h:47
+#, fuzzy
+msgid "Unable to buy. You not have enought money."
+msgstr "Nemáš dost peněz."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:51
+#, fuzzy
+msgid "Unable to buy. You overweight."
+msgstr "Nelze koupit."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:55
+msgid "Unable to buy. You have too many items."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:59
msgid "Nothing to sell."
msgstr "Nemáte nic k prodeji."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:51
+#: src/resources/notifications.h:63
msgid "Thanks for selling."
msgstr "Děkuji za prodej."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:55
+#: src/resources/notifications.h:67
msgid "Unable to sell."
msgstr "Není možné prodat."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:59
+#: src/resources/notifications.h:71
msgid "Unable to sell while trading."
msgstr "Není možné prodávat když obchoduješ."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:63
+#: src/resources/notifications.h:75
msgid "Unable to sell unsellable item."
msgstr "Není možné prodat neprodatelný předmět."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:67
+#: src/resources/notifications.h:79
#, c-format
msgid "Online users: %d"
msgstr "Připojených uživatel: %d"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:71
+#: src/resources/notifications.h:83
msgid "Guild created."
msgstr "Gilda vytvořena."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:75
+#: src/resources/notifications.h:87
msgid "You are already in guild."
msgstr "Již jste členem gildy."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:79
+#: src/resources/notifications.h:91
msgid "Emperium check failed."
msgstr "Kontrola emperia selhala."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:83
+#: src/resources/notifications.h:95
msgid "Unknown server response."
msgstr "Neznámá odpověď serveru."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:87
+#: src/resources/notifications.h:99
msgid "You have left the guild."
msgstr "Opustil jsi gildu."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:91
+#: src/resources/notifications.h:103
msgid "Could not invite user to guild."
msgstr "Nebylo možné pozvat uživatele do gildy."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:95
+#: src/resources/notifications.h:107
msgid "User rejected guild invite."
msgstr "Uživatel zamítl pozvání do gildy."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:99
+#: src/resources/notifications.h:111
msgid "User is now part of your guild."
msgstr "Uživatel je nyní členem vaší gildy."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:103
+#: src/resources/notifications.h:115
msgid "Your guild is full."
msgstr "Vaše gilda je plná."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:107
+#: src/resources/notifications.h:119
msgid "Unknown guild invite response."
msgstr "Neznámá odpověď na pozvání do gildy."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:111
+#: src/resources/notifications.h:123
#, c-format
msgid "%s has left your guild."
msgstr "%s opustil vaši gildu."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:115
+#: src/resources/notifications.h:127
msgid "You were kicked from guild."
msgstr "Byl jste vykopnut z gildy."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:119
+#: src/resources/notifications.h:131
#, c-format
msgid "%s has kicked from your guild."
msgstr "%s byl vykopnut z vaší gildy."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:123
+#: src/resources/notifications.h:135
msgid "Failed to use item."
msgstr "Pokus o použití předmětu selhal."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:127
+#: src/resources/notifications.h:139
msgid "Unable to equip."
msgstr "Nelze obléct."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:131
+#: src/resources/notifications.h:143
+msgid "Unable to equip because you have wrong level."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:147
msgid "Could not create party."
msgstr "Nelze vytvořit partu."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:135
+#: src/resources/notifications.h:151
msgid "Party successfully created."
msgstr "Parta úspěšně vytvořena."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:139
+#: src/resources/notifications.h:155
msgid "You have left the party."
msgstr "Opustil jste partu."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:143
-#, fuzzy
+#: src/resources/notifications.h:159
msgid "You cant left party on this map."
-msgstr "Opustil jste partu."
+msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:147
-#, fuzzy
+#: src/resources/notifications.h:163
msgid "You was kicked from party."
-msgstr "Byl jste vykopnut z gildy."
+msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:151
-msgid "You cant be kicked kicked from party on this map."
+#: src/resources/notifications.h:167
+msgid "You cant be kicked from party on this map."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:155
+#: src/resources/notifications.h:171
#, c-format
msgid "%s has joined your party."
msgstr "%s se připojil k vaší partě."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:159
+#: src/resources/notifications.h:175
#, c-format
msgid "%s is already a member of a party."
msgstr "%s je již členem vaší party."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:163
+#: src/resources/notifications.h:179
#, c-format
msgid "%s refused your invitation."
msgstr "%s zamítl vaše pozvání."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:167
+#: src/resources/notifications.h:183
#, c-format
msgid "%s is now a member of your party."
msgstr "%s je nyní člen vaší party."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:171
+#: src/resources/notifications.h:187
#, c-format
msgid "%s can't join your party because party is full."
msgstr "%s nemůže být členem party, jelikož je parta plná."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:175
+#: src/resources/notifications.h:191
#, c-format
msgid "QQQ Unknown invite response for %s."
msgstr "QQQ Neznámá odpověď na pozvání pro %s."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:203
+#: src/resources/notifications.h:219
#, c-format
msgid "%s has left your party."
msgstr "%s opustil vaši partu."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:207 src/resources/notifications.h:215
-#, fuzzy, c-format
+#: src/resources/notifications.h:223 src/resources/notifications.h:231
+#, c-format
msgid "%s cant be kicked from party on this map."
-msgstr "%s byl vykopnut z vaší gildy."
+msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:211
-#, fuzzy, c-format
+#: src/resources/notifications.h:227
+#, c-format
msgid "%s has kicked from your party."
-msgstr "%s byl vykopnut z vaší gildy."
+msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:219
+#: src/resources/notifications.h:235
#, c-format
msgid "An unknown member tried to say: %s"
msgstr "Neznámý člen se snažil říct: %s"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:223
+#: src/resources/notifications.h:239
#, c-format
msgid "%s is not in your party!"
msgstr "%s není členem tvojí party!"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:227
+#: src/resources/notifications.h:243
#, c-format
msgid "You picked up %s."
msgstr "Sebral jste %s."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:231
+#: src/resources/notifications.h:247
#, c-format
msgid "You spent %s."
msgstr "Utratil jste %s."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:235
+#: src/resources/notifications.h:251
msgid "Cannot raise skill!"
msgstr "Nelze zlepšit tuto dovednost!"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:239
+#: src/resources/notifications.h:255
msgid "Equip ammunition first."
msgstr "Nejdříve si vem munici."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:243
+#: src/resources/notifications.h:259
#, c-format
msgid "Trading with %s isn't possible. Trade partner is too far away."
msgstr "Obchodování s %s není možné. Obchodní partner je příliš daleko."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:248
+#: src/resources/notifications.h:264
#, c-format
msgid "Trading with %s isn't possible. Character doesn't exist."
msgstr "Obchodování s %s není možné. Postava neexistuje."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:252
+#: src/resources/notifications.h:268
msgid "Trade cancelled due to an unknown reason."
msgstr "Obchod zrušen z neznámého důvodu."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:256
+#: src/resources/notifications.h:272
#, c-format
msgid "Trade with %s cancelled."
msgstr "Obchod s %s zrušen."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:260
+#: src/resources/notifications.h:276
+#, fuzzy, c-format
+msgid "Trade with %s cancelled, because player is busy"
+msgstr "Obchod s %s zrušen."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:280
#, c-format
msgid "Unhandled trade cancel packet with %s"
msgstr "Neočekávaný packet rušící obchod se %s"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:264
+#: src/resources/notifications.h:284
msgid "Failed adding item. Trade partner is over weighted."
msgstr "Přidávání předmětu selhalo. Obchodní partner nese příliš mnoho."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:268
+#: src/resources/notifications.h:288
msgid "Failed adding item. Trade partner has no free slot."
msgstr "Přidání předmětu selhalo. Obchodní partner nemá volné místo."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:272
+#: src/resources/notifications.h:292
msgid "Failed adding item. You can't trade this item."
msgstr "Přidání předmětu selhalo. Není možné obchodovat tento předmět."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:276
+#: src/resources/notifications.h:296
msgid "Failed adding item for unknown reason."
msgstr "Přidání předmětu selhalo z neznámého důvodu."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:280
+#: src/resources/notifications.h:300
msgid "Trade canceled."
msgstr "Obchod zrušen."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:284
+#: src/resources/notifications.h:304
msgid "Trade completed."
msgstr "Obchod dokončen."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:288
+#: src/resources/notifications.h:308
msgid "Kick failed!"
msgstr "Vykopnutí selhalo!"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:292
+#: src/resources/notifications.h:312
msgid "Kick succeeded!"
msgstr "Vykopnutí úspěšné!"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:296
+#: src/resources/notifications.h:316
#, c-format
msgid "MVP player: %s"
msgstr "MVP hráč: %s"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:300
+#: src/resources/notifications.h:320
msgid "All whispers ignored."
msgstr "Veškeré šeptání ignorováno."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:304
+#: src/resources/notifications.h:324
msgid "All whispers ignore failed."
msgstr "Ignorování veškerého šeptání selhalo."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:308
+#: src/resources/notifications.h:328
msgid "All whispers unignored."
msgstr "Veškeré šeptání odignorováno."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:312
+#: src/resources/notifications.h:332
msgid "All whispers unignore failed."
msgstr "Odignorování veškerého šeptání selhalo."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:319
+#: src/resources/notifications.h:339
msgid "pvp off, gvg off"
msgstr "pvp vypnuto, gvg vypnuto"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:323
+#: src/resources/notifications.h:343
msgid "pvp on"
msgstr "pvp zapnuto"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:327
+#: src/resources/notifications.h:347
msgid "gvg on"
msgstr "gvg zapnuto"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:331
+#: src/resources/notifications.h:351
msgid "pvp on, gvg on"
msgstr "pvp zapnuto, gvg zapnuto"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:335
+#: src/resources/notifications.h:355
msgid "unknown pvp"
msgstr "neznámý stav pvp"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:339
+#: src/resources/notifications.h:359
#, c-format
msgid "Char from account %s is already in your party!"
msgstr "Postava z účtu %s je již v tvojí partě!"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:343
+#: src/resources/notifications.h:363
#, c-format
msgid "%s blocked invite!"
msgstr "%s zablokoval pozvání!"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:347
+#: src/resources/notifications.h:367
msgid "Char is not online!"
msgstr "Postava není on-line!"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:351
+#: src/resources/notifications.h:371
msgid "Pet catch failed."
msgstr "Pokus o polapení mazíčka selhal."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:355
+#: src/resources/notifications.h:375
msgid "Pet catched."
msgstr "Mazlíček byl polapen."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:359
+#: src/resources/notifications.h:379
#, c-format
msgid "Pet catch unkown error: %d."
msgstr "Neznámá chyba polapení mazlíčka: %d."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:363
+#: src/resources/notifications.h:383
msgid "Your mercenary duty hour is over."
msgstr "Čas služby Tvého žoldáka vypršel."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:367
+#: src/resources/notifications.h:387
msgid "Your mercenary was killed."
msgstr "Tvůj žoldák byl zabit."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:371
+#: src/resources/notifications.h:391
msgid "Your mercenary was fired."
msgstr "Tvůj žoldák byl propuštěn."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:375
+#: src/resources/notifications.h:395
msgid "Your mercenary run away."
msgstr "Tvůj žoldák zběhl."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:379
+#: src/resources/notifications.h:399
msgid "Mercenary unknown state."
msgstr "Status žoldáka neznámý."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:383
+#: src/resources/notifications.h:403
msgid "You feed your homunculus."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:387
+#: src/resources/notifications.h:407
#, c-format
msgid "You cant feed homunculus, because not have %s."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:391
-#, fuzzy
+#: src/resources/notifications.h:411
msgid "Card insert failed."
-msgstr "Obchod selhal!"
+msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:395
+#: src/resources/notifications.h:415
msgid "Card inserted."
msgstr ""
@@ -8710,9 +8725,3 @@ msgstr ""
#, c-format
msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
msgstr "Volby k %s jsou \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-
-#~ msgid "Enable auction bot support"
-#~ msgstr "Povolit podporu aukčního robota"
-
-#~ msgid "Auction"
-#~ msgstr "Aukce"
diff --git a/po/de.po b/po/de.po
index 7f365a3c3..ef4e71bb2 100644
--- a/po/de.po
+++ b/po/de.po
@@ -29,8 +29,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-10-08 01:19+0300\n"
-"PO-Revision-Date: 2014-09-28 10:01+0000\n"
+"POT-Creation-Date: 2014-10-10 00:16+0300\n"
+"PO-Revision-Date: 2014-10-08 10:02+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: German (http://www.transifex.com/projects/p/manaplus/language/"
"de/)\n"
@@ -5198,15 +5198,13 @@ msgstr ""
#. TRANSLATORS: char select dialog. button.
#: src/gui/windows/charselectdialog.cpp:73
-#, fuzzy
msgid "Switch"
-msgstr "Login wechseln"
+msgstr ""
#. TRANSLATORS: char select dialog. button.
#: src/gui/windows/charselectdialog.cpp:75
-#, fuzzy
msgid "Password"
-msgstr "Passwort:"
+msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: updater window button
@@ -5250,9 +5248,8 @@ msgid "Please set new pincode"
msgstr ""
#: src/gui/windows/charselectdialog.cpp:240
-#, fuzzy
msgid "Please enter new name"
-msgstr "Bitte gib einen Namen an."
+msgstr ""
#. TRANSLATORS: char select dialog. player info message.
#: src/gui/windows/charselectdialog.cpp:259
@@ -5903,7 +5900,7 @@ msgstr "Zeige Links in Ankündigung"
#. TRANSLATORS: shop window dialog
#. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:776 src/net/ea/tradehandler.cpp:233
+#: src/gui/windows/shopwindow.cpp:776 src/net/ea/tradehandler.cpp:192
msgid "Request for Trade"
msgstr "Erbitte einen Handel"
@@ -7563,19 +7560,19 @@ msgstr "Gildenburg: %s"
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:191
+#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:207
msgid "Item sharing enabled."
msgstr "Item-Sharing aktiviert."
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:195
+#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:211
msgid "Item sharing disabled."
msgstr "Item-Sharing deaktiviert."
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:199
+#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:215
msgid "Item sharing not possible."
msgstr "Item-Sharing ist nicht möglich."
@@ -7586,19 +7583,19 @@ msgstr "Item-Sharing unbekannt."
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:179
+#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:195
msgid "Experience sharing enabled."
msgstr "Erfahrung teilen ist aktiviert."
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:183
+#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:199
msgid "Experience sharing disabled."
msgstr "Erfahrung teilen ist deaktiviert."
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:187
+#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:203
msgid "Experience sharing not possible."
msgstr "Erfahrung teilen nicht möglich."
@@ -7727,14 +7724,12 @@ msgstr ""
#. TRANSLATORS: char rename error
#: src/net/eathena/charserverhandler.cpp:516
#: src/net/eathena/charserverhandler.cpp:553
-#, fuzzy
msgid "Character rename error."
-msgstr "Charakter gelöscht."
+msgstr ""
#: src/net/eathena/charserverhandler.cpp:531
-#, fuzzy
msgid "Character renamed."
-msgstr "Charakter gelöscht."
+msgstr ""
#. TRANSLATORS: char rename error
#: src/net/eathena/charserverhandler.cpp:544
@@ -7748,9 +7743,8 @@ msgstr ""
#. TRANSLATORS: char rename error
#: src/net/eathena/charserverhandler.cpp:557
-#, fuzzy
msgid "Character not found."
-msgstr "Charakterpunkte: %d"
+msgstr ""
#. TRANSLATORS: player stat
#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:124
@@ -7814,9 +7808,8 @@ msgid "Speed hack detected."
msgstr "Geschwindigkeitsproblem festgestellt."
#: src/net/eathena/generalhandler.cpp:179
-#, fuzzy
msgid "Server full."
-msgstr "Server:"
+msgstr ""
#: src/net/eathena/generalhandler.cpp:182
msgid "Sorry, you are underaged."
@@ -7888,18 +7881,16 @@ msgid "Ip limited access."
msgstr ""
#: src/net/eathena/generalhandler.cpp:235
-#, fuzzy
msgid "Over characters list."
-msgstr "Charakter gelöscht."
+msgstr ""
#: src/net/eathena/generalhandler.cpp:238
msgid "Ip blocked."
msgstr ""
#: src/net/eathena/generalhandler.cpp:241
-#, fuzzy
msgid "Invalid password count."
-msgstr "Altes Passwort fehlerhaft."
+msgstr ""
#: src/net/eathena/generalhandler.cpp:244
msgid "Not allowed race."
@@ -8066,13 +8057,13 @@ msgid "Huh? What's that?"
msgstr "Huh? Was ist das?"
#. TRANSLATORS: trade header
-#: src/net/ea/tradehandler.cpp:100
+#: src/net/ea/tradehandler.cpp:105
#, c-format
msgid "Trade: You and %s"
msgstr "Handeln: Du und %s"
#. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:235
+#: src/net/ea/tradehandler.cpp:194
#, c-format
msgid "%s wants to trade with you, do you accept?"
msgstr "%s möchte mit dir handeln, stimmst du zu?"
@@ -8291,433 +8282,458 @@ msgstr "Kauf fehlgeschlagen."
#. TRANSLATORS: notification message
#: src/resources/notifications.h:47
+#, fuzzy
+msgid "Unable to buy. You not have enought money."
+msgstr "Du hast nicht genügend Geld."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:51
+#, fuzzy
+msgid "Unable to buy. You overweight."
+msgstr "Kauf fehlgeschlagen."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:55
+msgid "Unable to buy. You have too many items."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:59
msgid "Nothing to sell."
msgstr "Du hast nichts zu verkaufen."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:51
+#: src/resources/notifications.h:63
msgid "Thanks for selling."
msgstr "Vielen Dank für den Verkauf."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:55
+#: src/resources/notifications.h:67
msgid "Unable to sell."
msgstr "Verkauf fehlgeschlagen."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:59
+#: src/resources/notifications.h:71
msgid "Unable to sell while trading."
msgstr "Handel fehlgeschlagen."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:63
+#: src/resources/notifications.h:75
msgid "Unable to sell unsellable item."
msgstr "Es ist nicht möglich, einen unverkäuflichen Gegenstand zu verkaufen."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:67
+#: src/resources/notifications.h:79
#, c-format
msgid "Online users: %d"
msgstr "Benutzer Online: %d"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:71
+#: src/resources/notifications.h:83
msgid "Guild created."
msgstr "Gilde erstellt."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:75
+#: src/resources/notifications.h:87
msgid "You are already in guild."
msgstr "Du bist bereits in der Gilde."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:79
+#: src/resources/notifications.h:91
msgid "Emperium check failed."
msgstr "Erstellung der Gilde fehlgeschlagen."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:83
+#: src/resources/notifications.h:95
msgid "Unknown server response."
msgstr "Unbekannte Antwort des Servers."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:87
+#: src/resources/notifications.h:99
msgid "You have left the guild."
msgstr "Du hast die Gilde verlassen."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:91
+#: src/resources/notifications.h:103
msgid "Could not invite user to guild."
msgstr "Konnte SpielerIn nicht in die Gilde einladen."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:95
+#: src/resources/notifications.h:107
msgid "User rejected guild invite."
msgstr "Spieler hat die Gildeneinladung abgelehnt."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:99
+#: src/resources/notifications.h:111
msgid "User is now part of your guild."
msgstr "Spieler ist nun in deiner Gilde."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:103
+#: src/resources/notifications.h:115
msgid "Your guild is full."
msgstr "Deine Gilde ist voll."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:107
+#: src/resources/notifications.h:119
msgid "Unknown guild invite response."
msgstr "Unbekannte Antwort auf Gildeneinladung."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:111
+#: src/resources/notifications.h:123
#, c-format
msgid "%s has left your guild."
msgstr "%s hat Ihre Gilde verlassen."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:115
+#: src/resources/notifications.h:127
msgid "You were kicked from guild."
msgstr "Du wurdest aus der Gilde rausgeworfen."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:119
+#: src/resources/notifications.h:131
#, c-format
msgid "%s has kicked from your guild."
msgstr "%s wurde aus Ihrer Gilde geworfen."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:123
+#: src/resources/notifications.h:135
msgid "Failed to use item."
msgstr "Kann diesen Gegenstand nicht verwenden."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:127
+#: src/resources/notifications.h:139
msgid "Unable to equip."
msgstr "Kann nicht Ausrüsten."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:131
+#: src/resources/notifications.h:143
+msgid "Unable to equip because you have wrong level."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:147
msgid "Could not create party."
msgstr "Konnte Gruppe nicht erstellen."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:135
+#: src/resources/notifications.h:151
msgid "Party successfully created."
msgstr "Gruppe erfolgreich erstellt."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:139
+#: src/resources/notifications.h:155
msgid "You have left the party."
msgstr "Du hast die Gruppe verlassen."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:143
-#, fuzzy
+#: src/resources/notifications.h:159
msgid "You cant left party on this map."
-msgstr "Du hast die Gruppe verlassen."
+msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:147
-#, fuzzy
+#: src/resources/notifications.h:163
msgid "You was kicked from party."
-msgstr "Du wurdest aus der Gilde rausgeworfen."
+msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:151
-msgid "You cant be kicked kicked from party on this map."
+#: src/resources/notifications.h:167
+msgid "You cant be kicked from party on this map."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:155
+#: src/resources/notifications.h:171
#, c-format
msgid "%s has joined your party."
msgstr "%s ist deiner Gruppe beigetreten."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:159
+#: src/resources/notifications.h:175
#, c-format
msgid "%s is already a member of a party."
msgstr "%s ist bereits ein Mitglied deiner Gruppe."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:163
+#: src/resources/notifications.h:179
#, c-format
msgid "%s refused your invitation."
msgstr "%s hat die Einladung abgelehnt."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:167
+#: src/resources/notifications.h:183
#, c-format
msgid "%s is now a member of your party."
msgstr "%s ist nun ein Mitglied deiner Gruppe."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:171
+#: src/resources/notifications.h:187
#, c-format
msgid "%s can't join your party because party is full."
msgstr "%s kann deiner Gruppe nicht beitreten. Sie ist voll."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:175
+#: src/resources/notifications.h:191
#, c-format
msgid "QQQ Unknown invite response for %s."
msgstr "QQQ Unbekannte Antwort auf die Einladung für %s."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:203
+#: src/resources/notifications.h:219
#, c-format
msgid "%s has left your party."
msgstr "%s hat deine Gruppe verlassen."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:207 src/resources/notifications.h:215
-#, fuzzy, c-format
+#: src/resources/notifications.h:223 src/resources/notifications.h:231
+#, c-format
msgid "%s cant be kicked from party on this map."
-msgstr "%s wurde aus Ihrer Gilde geworfen."
+msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:211
-#, fuzzy, c-format
+#: src/resources/notifications.h:227
+#, c-format
msgid "%s has kicked from your party."
-msgstr "%s wurde aus Ihrer Gilde geworfen."
+msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:219
+#: src/resources/notifications.h:235
#, c-format
msgid "An unknown member tried to say: %s"
msgstr "Ein unbekanntes Mitglied hat versucht zu sagen: %s"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:223
+#: src/resources/notifications.h:239
#, c-format
msgid "%s is not in your party!"
msgstr "%s ist nicht in Deiner Gruppe!"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:227
+#: src/resources/notifications.h:243
#, c-format
msgid "You picked up %s."
msgstr "Du hast %s aufgehoben."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:231
+#: src/resources/notifications.h:247
#, c-format
msgid "You spent %s."
msgstr "Du bezahltest %s."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:235
+#: src/resources/notifications.h:251
msgid "Cannot raise skill!"
msgstr "Kann diese Fähigkeit nicht aufwerten!"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:239
+#: src/resources/notifications.h:255
msgid "Equip ammunition first."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:243
+#: src/resources/notifications.h:259
#, c-format
msgid "Trading with %s isn't possible. Trade partner is too far away."
msgstr "Handeln mit %s nicht möglich. Handelspartner ist zu weit entfernt."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:248
+#: src/resources/notifications.h:264
#, c-format
msgid "Trading with %s isn't possible. Character doesn't exist."
msgstr "Handeln mit %s nicht möglich. Handelspartner existiert nicht."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:252
+#: src/resources/notifications.h:268
msgid "Trade cancelled due to an unknown reason."
msgstr "Handeln abgebrochen durch eine unbekannte Ursache."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:256
+#: src/resources/notifications.h:272
#, c-format
msgid "Trade with %s cancelled."
msgstr "Handel mit %s abgebrochen."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:260
+#: src/resources/notifications.h:276
+#, fuzzy, c-format
+msgid "Trade with %s cancelled, because player is busy"
+msgstr "Handel mit %s abgebrochen."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:280
#, c-format
msgid "Unhandled trade cancel packet with %s"
msgstr "Unbehandeltes Handel-Fehlschlags-Paket mit %s"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:264
+#: src/resources/notifications.h:284
msgid "Failed adding item. Trade partner is over weighted."
msgstr "Fehlschlag: Der Handelspartner kann nichts mehr Tragen."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:268
+#: src/resources/notifications.h:288
msgid "Failed adding item. Trade partner has no free slot."
msgstr ""
"Gegenstand hinzufügen fehlgeschlagen. Handelspartner hat keinen Platz in "
"seinem Inventar."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:272
+#: src/resources/notifications.h:292
msgid "Failed adding item. You can't trade this item."
msgstr ""
"Gegenstand hinzufügen fehlgeschlagen. Sie können diesen Gegenstand nicht "
"handeln."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:276
+#: src/resources/notifications.h:296
msgid "Failed adding item for unknown reason."
msgstr "Gegenstand hinzufügen aus unbekannten Gründen fehlgeschlagen."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:280
+#: src/resources/notifications.h:300
msgid "Trade canceled."
msgstr "Handel abgebrochen."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:284
+#: src/resources/notifications.h:304
msgid "Trade completed."
msgstr "Handel abgeschlossen."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:288
+#: src/resources/notifications.h:308
msgid "Kick failed!"
msgstr "Spieler konnte nicht aus dem Kanal geworfen werden!"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:292
+#: src/resources/notifications.h:312
msgid "Kick succeeded!"
msgstr "Spieler aus dem Kanal geworfen!"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:296
+#: src/resources/notifications.h:316
#, c-format
msgid "MVP player: %s"
msgstr "MVP SpielerIn: %s"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:300
+#: src/resources/notifications.h:320
msgid "All whispers ignored."
msgstr "Jedes Flüstern ignorieren."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:304
+#: src/resources/notifications.h:324
msgid "All whispers ignore failed."
msgstr "\"Jedes Flüstern ignorieren\" hat nicht funktioniert."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:308
+#: src/resources/notifications.h:328
msgid "All whispers unignored."
msgstr "\"Kein Flüstern mehr ignorieren\"."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:312
+#: src/resources/notifications.h:332
msgid "All whispers unignore failed."
msgstr "\"Kein Flüstern mehr ignorieren\" hat nicht funktioniert."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:319
+#: src/resources/notifications.h:339
msgid "pvp off, gvg off"
msgstr "PvP aus, GvG aus"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:323
+#: src/resources/notifications.h:343
msgid "pvp on"
msgstr "PvP an"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:327
+#: src/resources/notifications.h:347
msgid "gvg on"
msgstr "GvG an"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:331
+#: src/resources/notifications.h:351
msgid "pvp on, gvg on"
msgstr "PvP an, GvG an"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:335
+#: src/resources/notifications.h:355
msgid "unknown pvp"
msgstr "unbekanntes PvP"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:339
+#: src/resources/notifications.h:359
#, c-format
msgid "Char from account %s is already in your party!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:343
+#: src/resources/notifications.h:363
#, c-format
msgid "%s blocked invite!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:347
+#: src/resources/notifications.h:367
msgid "Char is not online!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:351
+#: src/resources/notifications.h:371
msgid "Pet catch failed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:355
+#: src/resources/notifications.h:375
msgid "Pet catched."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:359
+#: src/resources/notifications.h:379
#, c-format
msgid "Pet catch unkown error: %d."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:363
+#: src/resources/notifications.h:383
msgid "Your mercenary duty hour is over."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:367
+#: src/resources/notifications.h:387
msgid "Your mercenary was killed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:371
+#: src/resources/notifications.h:391
msgid "Your mercenary was fired."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:375
+#: src/resources/notifications.h:395
msgid "Your mercenary run away."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:379
+#: src/resources/notifications.h:399
msgid "Mercenary unknown state."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:383
+#: src/resources/notifications.h:403
msgid "You feed your homunculus."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:387
+#: src/resources/notifications.h:407
#, c-format
msgid "You cant feed homunculus, because not have %s."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:391
-#, fuzzy
+#: src/resources/notifications.h:411
msgid "Card insert failed."
-msgstr "Handeln fehlgeschlagen!"
+msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:395
+#: src/resources/notifications.h:415
msgid "Card inserted."
msgstr ""
@@ -8727,6 +8743,3 @@ msgstr ""
msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
msgstr ""
"Gültige Optionen für /%s sind \"yes\",\"no\",\"true\",\"false\",\"1\",\"0\"."
-
-#~ msgid "Auction"
-#~ msgstr "Auktion"
diff --git a/po/en_GB.po b/po/en_GB.po
index 66531eb25..407430167 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-27 13:23+0300\n"
-"PO-Revision-Date: 2014-09-28 10:01+0000\n"
+"POT-Creation-Date: 2014-10-08 01:19+0300\n"
+"PO-Revision-Date: 2014-10-08 10:02+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/manaplus/language/en_GB/)\n"
"MIME-Version: 1.0\n"
@@ -33,7 +33,7 @@ msgstr ""
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:131 src/client.cpp:1463 src/client.cpp:1490
+#: src/actions/actions.cpp:131 src/client.cpp:1461 src/client.cpp:1488
#: src/gamemodifiers.cpp:423 src/gui/widgets/tabs/setup_input.cpp:163
#: src/gui/widgets/tabs/setup_theme.cpp:312
#: src/gui/widgets/tabs/setup_theme.cpp:343
@@ -44,8 +44,8 @@ msgstr ""
#: src/gui/windows/changeemaildialog.cpp:170
#: src/gui/windows/changepassworddialog.cpp:160
#: src/gui/windows/charcreatedialog.cpp:373
-#: src/gui/windows/charselectdialog.cpp:255
-#: src/gui/windows/charselectdialog.cpp:291 src/gui/windows/editdialog.cpp:49
+#: src/gui/windows/charselectdialog.cpp:277
+#: src/gui/windows/charselectdialog.cpp:313 src/gui/windows/editdialog.cpp:49
#: src/gui/windows/editserverdialog.cpp:61
#: src/gui/windows/editserverdialog.cpp:208
#: src/gui/windows/itemamountwindow.cpp:158 src/gui/windows/quitdialog.cpp:70
@@ -53,7 +53,9 @@ msgstr ""
#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
#: src/net/ea/charserverhandler.cpp:143 src/net/ea/charserverhandler.cpp:162
#: src/net/ea/charserverhandler.cpp:175 src/net/ea/gamehandler.cpp:79
-#: src/net/ea/playerhandler.cpp:263 src/net/ea/playerhandler.cpp:279
+#: src/net/ea/playerhandler.cpp:424 src/net/ea/playerhandler.cpp:440
+#: src/net/eathena/charserverhandler.cpp:533
+#: src/net/eathena/charserverhandler.cpp:563
msgid "OK"
msgstr "OK"
@@ -177,7 +179,7 @@ msgstr ""
#. TRANSLATORS: party invite message
#. TRANSLATORS: change relation
-#: src/actions/chat.cpp:303 src/actions/commands.cpp:65
+#: src/actions/chat.cpp:303 src/actions/commands.cpp:64
msgid "Please specify a name."
msgstr ""
@@ -200,75 +202,75 @@ msgid "Message now closes chat."
msgstr "Message now closes chat."
#. TRANSLATORS: change relation
-#: src/actions/commands.cpp:108
+#: src/actions/commands.cpp:107
#, c-format
msgid "Player already %s!"
msgstr ""
#. TRANSLATORS: change relation
-#: src/actions/commands.cpp:120
+#: src/actions/commands.cpp:119
#, c-format
msgid "Player successfully %s!"
msgstr ""
#. TRANSLATORS: change relation
-#: src/actions/commands.cpp:122
+#: src/actions/commands.cpp:121
#, c-format
msgid "Player could not be %s!"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:153
+#: src/actions/commands.cpp:152
msgid "Player wasn't ignored!"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:162
+#: src/actions/commands.cpp:161
msgid "Player no longer ignored!"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:164
+#: src/actions/commands.cpp:163
msgid "Player could not be unignored!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/actions/commands.cpp:179
+#: src/actions/commands.cpp:178
msgid "Player already erased!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/actions/commands.cpp:192
+#: src/actions/commands.cpp:191
msgid "Player no longer erased!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/actions/commands.cpp:194
+#: src/actions/commands.cpp:193
msgid "Player could not be erased!"
msgstr ""
#. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:201
+#: src/actions/commands.cpp:200
msgid "friend"
msgstr ""
#. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:208
+#: src/actions/commands.cpp:207
msgid "disregarded"
msgstr ""
#. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:215
+#: src/actions/commands.cpp:214
msgid "neutral"
msgstr ""
#. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:222
+#: src/actions/commands.cpp:221
msgid "blacklisted"
msgstr ""
#. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:229
+#: src/actions/commands.cpp:228
msgid "enemy"
msgstr ""
@@ -283,77 +285,77 @@ msgid "Accepting incoming trade requests"
msgstr "Accepting incoming trade requests"
#. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1306
+#: src/actormanager.cpp:1310
msgid "Visible on map"
msgstr ""
#. TRANSLATORS: default race name
-#: src/being/being.cpp:389
+#: src/being/being.cpp:393
msgid "Human"
msgstr ""
-#: src/being/being.cpp:556
+#: src/being/being.cpp:560
msgid "dodge"
msgstr "dodge"
-#: src/being/being.cpp:556
+#: src/being/being.cpp:560
msgid "miss"
msgstr "miss"
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1865 src/gui/windows/whoisonline.cpp:855
+#: src/being/being.cpp:1869 src/gui/windows/whoisonline.cpp:855
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1870 src/gui/windows/whoisonline.cpp:860
+#: src/being/being.cpp:1874 src/gui/windows/whoisonline.cpp:860
msgid "I"
msgstr ""
#. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:379
+#: src/being/localplayer.cpp:380
#, c-format
msgid "You were killed by %s"
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:824
+#: src/being/localplayer.cpp:825
msgid "Tried to pick up nonexistent item."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:828
+#: src/being/localplayer.cpp:829
msgid "Item is too heavy."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:832
+#: src/being/localplayer.cpp:833
msgid "Item is too far away."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:836
+#: src/being/localplayer.cpp:837
msgid "Inventory is full."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:840
+#: src/being/localplayer.cpp:841
msgid "Stack is too big."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:844
+#: src/being/localplayer.cpp:845
msgid "Item belongs to someone else."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:848
+#: src/being/localplayer.cpp:849
msgid "Unknown problem picking up item."
msgstr ""
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:872
+#: src/being/localplayer.cpp:873
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -362,43 +364,43 @@ msgstr[1] ""
#. TRANSLATORS: this is normal experience
#. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1054 src/being/localplayer.cpp:1055
-#: src/being/localplayer.cpp:1091
+#: src/being/localplayer.cpp:1055 src/being/localplayer.cpp:1056
+#: src/being/localplayer.cpp:1092
msgid "xp"
msgstr ""
#. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1059 src/being/localplayer.cpp:1065
-#: src/being/localplayer.cpp:1071
+#: src/being/localplayer.cpp:1060 src/being/localplayer.cpp:1066
+#: src/being/localplayer.cpp:1072
msgid "job"
msgstr ""
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2794
+#: src/being/localplayer.cpp:2795
#, c-format
msgid "Follow: %s"
msgstr ""
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2800 src/being/localplayer.cpp:2825
+#: src/being/localplayer.cpp:2801 src/being/localplayer.cpp:2826
msgid "Follow canceled"
msgstr ""
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2810
+#: src/being/localplayer.cpp:2811
#, c-format
msgid "Imitation: %s"
msgstr ""
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2816 src/being/localplayer.cpp:2830
+#: src/being/localplayer.cpp:2817 src/being/localplayer.cpp:2831
msgid "Imitation canceled"
msgstr ""
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3180
+#: src/being/localplayer.cpp:3181
#, c-format
msgid "You see %s"
msgstr ""
@@ -436,37 +438,37 @@ msgstr ""
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:920 src/gui/windowmenu.cpp:162
+#: src/client.cpp:918 src/gui/windowmenu.cpp:162
#: src/gui/windows/setupwindow.cpp:62
msgid "Setup"
msgstr "Setup"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:923 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:921 src/gui/widgets/tabs/setup_perfomance.cpp:54
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:926 src/gui/widgets/tabs/setup_video.cpp:105
+#: src/client.cpp:924 src/gui/widgets/tabs/setup_video.cpp:105
msgid "Video"
msgstr "Video"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:929 src/gui/widgets/tabs/setup_theme.cpp:122
+#: src/client.cpp:927 src/gui/widgets/tabs/setup_theme.cpp:122
msgid "Theme"
msgstr ""
#. TRANSLATORS: theme tab quick button
-#: src/client.cpp:932
+#: src/client.cpp:930
msgid "About"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:935 src/gui/windowmenu.cpp:74
+#: src/client.cpp:933 src/gui/windowmenu.cpp:74
#: src/gui/windows/helpwindow.cpp:53
msgid "Help"
msgstr "Help"
@@ -482,42 +484,42 @@ msgstr "Help"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:939 src/client.cpp:1391 src/client.cpp:1405
+#: src/client.cpp:937 src/client.cpp:1389 src/client.cpp:1403
#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:691
#: src/gui/popups/popupmenu.cpp:923 src/gui/windows/didyouknowwindow.cpp:81
#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:74
#: src/gui/windows/npcdialog.cpp:112 src/gui/windows/questswindow.cpp:77
-#: src/gui/windows/shopwindow.cpp:84
+#: src/gui/windows/shopwindow.cpp:83
msgid "Close"
msgstr "Close"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1065
+#: src/client.cpp:1063
msgid "Connecting to server"
msgstr "Connecting to server"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1113
+#: src/client.cpp:1111
msgid "Logging in"
msgstr "Logging in"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1156
+#: src/client.cpp:1154
msgid "Entering game world"
msgstr "Entering game world"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1282
+#: src/client.cpp:1280
msgid "Requesting characters"
msgstr "Requesting characters"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1322
+#: src/client.cpp:1320
msgid "Connecting to the game server"
msgstr "Connecting to the game server"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1334
+#: src/client.cpp:1332
msgid "Changing game servers"
msgstr "Changing game servers"
@@ -531,72 +533,76 @@ msgstr "Changing game servers"
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1389 src/client.cpp:1403 src/client.cpp:1598
+#. TRANSLATORS: info message
+#. TRANSLATORS: ok dialog button
+#: src/client.cpp:1387 src/client.cpp:1401 src/client.cpp:1596
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
#: src/gui/windows/charcreatedialog.cpp:369
-#: src/gui/windows/charselectdialog.cpp:289
+#: src/gui/windows/charselectdialog.cpp:311
#: src/gui/windows/editserverdialog.cpp:203
#: src/gui/windows/registerdialog.cpp:245
#: src/gui/windows/unregisterdialog.cpp:146
#: src/net/ea/charserverhandler.cpp:141 src/net/ea/charserverhandler.cpp:173
+#: src/net/eathena/charserverhandler.cpp:516
+#: src/net/eathena/charserverhandler.cpp:518
msgid "Error"
msgstr "Error"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1418
+#: src/client.cpp:1416
msgid "Requesting registration details"
msgstr "Requesting registration details"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1459
+#: src/client.cpp:1457
msgid "Password Change"
msgstr "Password Change"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1461
+#: src/client.cpp:1459
msgid "Password changed successfully!"
msgstr ""
#. TRANSLATORS: email change message header
-#: src/client.cpp:1486
+#: src/client.cpp:1484
msgid "Email Change"
msgstr ""
#. TRANSLATORS: email change message text
-#: src/client.cpp:1488
+#: src/client.cpp:1486
msgid "Email changed successfully!"
msgstr ""
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1515
+#: src/client.cpp:1513
msgid "Unregister Successful"
msgstr ""
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1517
+#: src/client.cpp:1515
msgid "Farewell, come back any time..."
msgstr ""
#. TRANSLATORS: directory creation error
#: src/configmanager.cpp:53 src/dirs.cpp:260 src/dirs.cpp:275 src/dirs.cpp:320
-#: src/dirs.cpp:481 src/dirs.cpp:489
+#: src/dirs.cpp:488 src/dirs.cpp:496
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:363
+#: src/dirs.cpp:370
#, c-format
msgid "Invalid update host: %s."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:404 src/dirs.cpp:411
+#: src/dirs.cpp:411 src/dirs.cpp:418
msgid "Error creating updates directory!"
msgstr "Error creating updates directory!"
-#: src/dirs.cpp:433 src/dirs.cpp:451
+#: src/dirs.cpp:440 src/dirs.cpp:458
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
@@ -614,36 +620,36 @@ msgid "dyecmd srcdyestring dstfile"
msgstr ""
#. TRANSLATORS: chat tab header
-#: src/game.cpp:236 src/gui/widgets/tabs/chattab.cpp:482
+#: src/game.cpp:234 src/gui/widgets/tabs/chattab.cpp:482
msgid "General"
msgstr "General"
#. TRANSLATORS: chat tab header
#. TRANSLATORS: full button name
#. TRANSLATORS: debug window name
-#: src/game.cpp:253 src/gui/widgets/tabs/chattab.cpp:484
+#: src/game.cpp:251 src/gui/widgets/tabs/chattab.cpp:484
#: src/gui/windowmenu.cpp:149 src/gui/windows/debugwindow.cpp:42
msgid "Debug"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:541
+#: src/game.cpp:532
#, c-format
msgid "Screenshot saved as %s"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:551
+#: src/game.cpp:542
msgid "Saving screenshot failed!"
msgstr "Saving screenshot failed!"
#. TRANSLATORS: error message text
-#: src/game.cpp:634
+#: src/game.cpp:625
msgid "The connection to the server was lost."
msgstr ""
#. TRANSLATORS: error message header
-#: src/game.cpp:637
+#: src/game.cpp:628
msgid "Network Error"
msgstr "Network Error"
@@ -1034,6 +1040,7 @@ msgstr ""
#: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
#: src/gui/widgets/tabs/setup_other.cpp:79
#: src/gui/widgets/tabs/setup_visual.cpp:81
+#: src/gui/windows/equipmentwindow.cpp:577
msgid "default"
msgstr ""
@@ -1524,7 +1531,7 @@ msgstr "Trade"
#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:273
#: src/gui/popups/popupmenu.cpp:767 src/gui/widgets/skillinfo.cpp:113
#: src/gui/windows/botcheckerwindow.cpp:89 src/input/pages/basic.cpp:42
-#: src/net/eathena/generalhandler.cpp:289 src/net/tmwa/generalhandler.cpp:321
+#: src/net/eathena/generalhandler.cpp:356 src/net/tmwa/generalhandler.cpp:320
msgid "Attack"
msgstr "Attack"
@@ -1693,7 +1700,7 @@ msgstr ""
#. TRANSLATORS: pet unequip item
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:340 src/gui/windows/equipmentwindow.cpp:70
+#: src/gui/popups/popupmenu.cpp:340 src/gui/windows/equipmentwindow.cpp:72
#: src/gui/windows/inventorywindow.cpp:175 src/resources/itemtypemapdata.h:47
#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
@@ -1751,7 +1758,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:574
+#: src/gui/popups/popupmenu.cpp:574 src/gui/windows/charselectdialog.cpp:132
msgid "Rename"
msgstr ""
@@ -2263,7 +2270,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
#. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:3000 src/net/ea/playerhandler.cpp:364
+#: src/gui/popups/popupmenu.cpp:3000 src/net/ea/playerhandler.cpp:195
msgid "Revive"
msgstr ""
@@ -2287,7 +2294,7 @@ msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: settings group
#. TRANSLATORS: full button name
-#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:319
+#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:315
#: src/gui/windowmenu.cpp:158
msgid "Windows"
msgstr ""
@@ -2315,7 +2322,7 @@ msgstr "Chat"
#. TRANSLATORS: input action name
#: src/gui/setupinputpages.cpp:57 src/gui/widgets/tabs/setup_audio.cpp:151
#: src/gui/widgets/tabs/setup_chat.cpp:179
-#: src/gui/widgets/tabs/setup_other.cpp:341
+#: src/gui/widgets/tabs/setup_other.cpp:337
#: src/gui/widgets/tabs/setup_visual.cpp:192
#: src/gui/windows/charcreatedialog.cpp:119
#: src/gui/windows/registerdialog.cpp:106 src/input/pages/gui.cpp:87
@@ -2328,212 +2335,227 @@ msgid "Gui"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:113
+#: src/gui/userpalette.cpp:116
msgid "Being"
msgstr "Being"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:115
+#: src/gui/userpalette.cpp:118
msgid "Friend names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:117
+#: src/gui/userpalette.cpp:120
msgid "Disregarded names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:119
+#: src/gui/userpalette.cpp:122
msgid "Ignored names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:121
+#: src/gui/userpalette.cpp:124
msgid "Erased names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:123
+#: src/gui/userpalette.cpp:126
msgid "Other players names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:125
+#: src/gui/userpalette.cpp:128
msgid "Own name"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:127
+#: src/gui/userpalette.cpp:130
msgid "GM names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:129
+#: src/gui/userpalette.cpp:132
msgid "NPCs"
msgstr "NPCs"
#. TRANSLATORS: palette color
#. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:131 src/gui/widgets/tabs/setup_other.cpp:108
+#: src/gui/userpalette.cpp:134 src/gui/widgets/tabs/setup_other.cpp:108
msgid "Monsters"
msgstr "Monsters"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:133
+#: src/gui/userpalette.cpp:136
msgid "Monster HP bar"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:139
msgid "Monster HP bar (second color)"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:138
+#: src/gui/userpalette.cpp:141
msgid "Party members"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:140
+#: src/gui/userpalette.cpp:143
msgid "Guild members"
msgstr ""
#. TRANSLATORS: palette color
#. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:142 src/gui/widgets/tabs/setup_visual.cpp:157
+#: src/gui/userpalette.cpp:145 src/gui/widgets/tabs/setup_visual.cpp:157
msgid "Particle effects"
msgstr "Particle effects"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:144
+#: src/gui/userpalette.cpp:147
msgid "Pickup notification"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:146
+#: src/gui/userpalette.cpp:149
msgid "Exp notification"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:148
+#: src/gui/userpalette.cpp:151
msgid "Player HP bar"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:152
+#: src/gui/userpalette.cpp:155
msgid "Player HP bar (second color)"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:154
+#: src/gui/userpalette.cpp:157
msgid "Player hits monster"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:156
+#: src/gui/userpalette.cpp:159
msgid "Monster hits player"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:160
+#: src/gui/userpalette.cpp:163
msgid "Other player hits local player"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:162
+#: src/gui/userpalette.cpp:165
msgid "Critical Hit"
msgstr "Critical Hit"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:166
+#: src/gui/userpalette.cpp:169
msgid "Local player hits monster"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:169
+#: src/gui/userpalette.cpp:172
msgid "Local player critical hit"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:172
+#: src/gui/userpalette.cpp:175
msgid "Local player miss"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:174
+#: src/gui/userpalette.cpp:177
msgid "Misses"
msgstr "Misses"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:176
+#: src/gui/userpalette.cpp:179
msgid "Portal highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:179
+#: src/gui/userpalette.cpp:182
msgid "Default collision highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:182
+#: src/gui/userpalette.cpp:185
msgid "Air collision highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:185
+#: src/gui/userpalette.cpp:188
msgid "Water collision highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:188
+#: src/gui/userpalette.cpp:191
msgid "Special ground collision highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:191
+#: src/gui/userpalette.cpp:194
msgid "Walkable highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:194
+#: src/gui/userpalette.cpp:197
msgid "Local player attack range"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:197
+#: src/gui/userpalette.cpp:200
msgid "Local player attack range border"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:200
+#: src/gui/userpalette.cpp:203
msgid "Monster attack range"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:204
+#: src/gui/userpalette.cpp:207
msgid "Floor item amount color"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:207
+#: src/gui/userpalette.cpp:210
msgid "Home place"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:210
+#: src/gui/userpalette.cpp:213
msgid "Home place border"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:213
+#: src/gui/userpalette.cpp:216
msgid "Road point"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:216
+#: src/gui/userpalette.cpp:219
msgid "Tiles border"
msgstr ""
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:221
+msgid "Pets"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:223
+msgid "Mercenary"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:225
+msgid "Homunculus"
+msgstr ""
+
#: src/gui/widgets/characterdisplay.cpp:135
#, c-format
msgid "Level: %u"
@@ -2636,7 +2658,8 @@ msgid "Type: %s"
msgstr ""
#. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:108
+#. TRANSLATORS: unknown equipment page name
+#: src/gui/widgets/skillinfo.cpp:108 src/gui/windows/equipmentwindow.cpp:584
msgid "Unknown"
msgstr ""
@@ -2837,22 +2860,22 @@ msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:262
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:313
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:375
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:319
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:387
msgid "Target:"
msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:264
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:319
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:377
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:325
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:389
msgid "Target Id:"
msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:267
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:322
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:379
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:328
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:391
msgid "Target type:"
msgstr ""
@@ -2863,7 +2886,7 @@ msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:271
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:338
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:344
msgid "Target race:"
msgstr ""
@@ -2879,67 +2902,81 @@ msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:277
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:363
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:369
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:387
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:375
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:381
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:399
msgid "Attack delay:"
msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:279
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:350
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:389
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:356
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:401
msgid "Minimal hit:"
msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:281
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:353
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:391
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:359
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:403
msgid "Maximum hit:"
msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:283
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:356
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:393
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:362
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:405
msgid "Critical hit:"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:327
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:285
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:365
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:407
+msgid "Karma:"
+msgstr ""
+
+#. TRANSLATORS: debug window label
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:287
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:368
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:409
+msgid "Manner:"
+msgstr ""
+
+#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:333
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:381
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:339
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:393
msgid "Target Level:"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:341
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:383
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:347
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:395
msgid "Target Party:"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:345
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:385
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:351
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:397
msgid "Target Guild:"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:430
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:436
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:451
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:457
#, c-format
msgid "Ping: %s ms"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:439
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:460
#, c-format
msgid "In: %d bytes/s"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:442
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:463
#, c-format
msgid "Out: %d bytes/s"
msgstr ""
@@ -3768,137 +3805,132 @@ msgstr ""
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_other.cpp:294
-msgid "Enable auction bot support"
-msgstr ""
-
-#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:298
msgid "Enable guild bot support and disable native guild support"
msgstr ""
#. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:304
+#: src/gui/widgets/tabs/setup_other.cpp:300
msgid "Keyboard"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:307
+#: src/gui/widgets/tabs/setup_other.cpp:303
msgid "Repeat delay"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:311
+#: src/gui/widgets/tabs/setup_other.cpp:307
msgid "Repeat interval"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:315
+#: src/gui/widgets/tabs/setup_other.cpp:311
msgid "Custom repeat interval"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:323
+#: src/gui/widgets/tabs/setup_other.cpp:319
msgid "Shortcut buttons"
msgstr ""
#. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:328
+#: src/gui/widgets/tabs/setup_other.cpp:324
msgid "Proxy server"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:332
+#: src/gui/widgets/tabs/setup_other.cpp:328
msgid "Proxy type"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:336
+#: src/gui/widgets/tabs/setup_other.cpp:332
msgid "Proxy address:port"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:344
+#: src/gui/widgets/tabs/setup_other.cpp:340
msgid "Enable server side attack"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:348
+#: src/gui/widgets/tabs/setup_other.cpp:344
msgid "Hide support page link on error"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:352
+#: src/gui/widgets/tabs/setup_other.cpp:348
msgid "Enable double clicks"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:356
+#: src/gui/widgets/tabs/setup_other.cpp:352
msgid "Enable bot checker"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:360
+#: src/gui/widgets/tabs/setup_other.cpp:356
msgid "Enable buggy servers protection (do not disable)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:365
+#: src/gui/widgets/tabs/setup_other.cpp:361
msgid "Enable debug log"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:369
+#: src/gui/widgets/tabs/setup_other.cpp:365
msgid "Ignore logging packets"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:373
+#: src/gui/widgets/tabs/setup_other.cpp:369
msgid "Enable OpenGL log"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:377
+#: src/gui/widgets/tabs/setup_other.cpp:373
msgid "Enable input log"
msgstr ""
#. TRANSLATORS: settings option
#. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_other.cpp:381 src/input/pages/other.cpp:362
+#: src/gui/widgets/tabs/setup_other.cpp:377 src/input/pages/other.cpp:362
msgid "Upload log file"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:385
+#: src/gui/widgets/tabs/setup_other.cpp:381
msgid "Low traffic mode"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:389
+#: src/gui/widgets/tabs/setup_other.cpp:385
msgid "Hide shield sprite"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:394
+#: src/gui/widgets/tabs/setup_other.cpp:390
msgid "Use FBO for screenshots (only for opengl)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:400
+#: src/gui/widgets/tabs/setup_other.cpp:396
msgid "Screenshot directory"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:405
+#: src/gui/widgets/tabs/setup_other.cpp:401
msgid "Network delay between sub servers"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:409
+#: src/gui/widgets/tabs/setup_other.cpp:405
msgid "Show background"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:414
+#: src/gui/widgets/tabs/setup_other.cpp:410
msgid "Screen density override"
msgstr ""
@@ -4129,9 +4161,9 @@ msgstr "Allow whispers"
#. TRANSLATORS: command editor button
#. TRANSLATORS: input action name
#: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:82
-#: src/gui/windows/serverdialog.cpp:125 src/gui/windows/shopwindow.cpp:101
-#: src/gui/windows/shopwindow.cpp:108 src/gui/windows/textcommandeditor.cpp:92
+#: src/gui/windows/charselectdialog.cpp:84
+#: src/gui/windows/serverdialog.cpp:125 src/gui/windows/shopwindow.cpp:100
+#: src/gui/windows/shopwindow.cpp:107 src/gui/windows/textcommandeditor.cpp:92
#: src/input/pages/gui.cpp:111
msgid "Delete"
msgstr "Delete"
@@ -4785,7 +4817,7 @@ msgstr ""
#. TRANSLATORS: equipment window name
#. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:63
+#: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:65
#: src/gui/windows/inventorywindow.cpp:196
msgid "Equipment"
msgstr "Equipment"
@@ -4926,7 +4958,7 @@ msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: social window button
#: src/gui/windows/buydialog.cpp:260 src/gui/windows/charcreatedialog.cpp:127
-#: src/gui/windows/charselectdialog.cpp:578
+#: src/gui/windows/charselectdialog.cpp:605
#: src/gui/windows/socialwindow.cpp:86
msgid "Create"
msgstr "Create"
@@ -4970,10 +5002,8 @@ msgstr ""
#. TRANSLATORS: change password window name
#. TRANSLATORS: change password dialog button
-#. TRANSLATORS: char select dialog. button.
#: src/gui/windows/changepassworddialog.cpp:51
#: src/gui/windows/changepassworddialog.cpp:57
-#: src/gui/windows/charselectdialog.cpp:73
msgid "Change Password"
msgstr "Change Password"
@@ -5127,57 +5157,68 @@ msgid "Are you sure you want to delete this character?"
msgstr "Are you sure you want to delete this character?"
#. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:64
+#: src/gui/windows/charselectdialog.cpp:66
#, c-format
msgid "Account %s (last login time %s)"
msgstr ""
#. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:71
-msgid "Switch Login"
+#: src/gui/windows/charselectdialog.cpp:73
+msgid "Switch"
+msgstr ""
+
+#. TRANSLATORS: char select dialog. button.
+#: src/gui/windows/charselectdialog.cpp:75
+msgid "Password"
msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:78
-#: src/gui/windows/charselectdialog.cpp:573
+#: src/gui/windows/charselectdialog.cpp:80
+#: src/gui/windows/charselectdialog.cpp:595
#: src/gui/windows/updaterwindow.cpp:195
msgid "Play"
msgstr "Play"
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:80
+#: src/gui/windows/charselectdialog.cpp:82
#: src/net/ea/charserverhandler.cpp:160
+#: src/net/eathena/charserverhandler.cpp:531
+#: src/net/eathena/charserverhandler.cpp:561
msgid "Info"
msgstr "Info"
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: unregister dialog name
#. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:106
+#: src/gui/windows/charselectdialog.cpp:110
#: src/gui/windows/unregisterdialog.cpp:50
#: src/gui/windows/unregisterdialog.cpp:55
msgid "Unregister"
msgstr "Unregister"
#. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:118
+#: src/gui/windows/charselectdialog.cpp:122
msgid "Change Email"
msgstr ""
#. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:156
+#: src/gui/windows/charselectdialog.cpp:166
#, c-format
msgid "Account %s"
msgstr ""
-#: src/gui/windows/charselectdialog.cpp:184
+#: src/gui/windows/charselectdialog.cpp:194
msgid "Please set new pincode"
msgstr ""
+#: src/gui/windows/charselectdialog.cpp:240
+msgid "Please enter new name"
+msgstr ""
+
#. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:237
+#: src/gui/windows/charselectdialog.cpp:259
#, c-format
msgid ""
"Hp: %u/%u\n"
@@ -5187,16 +5228,16 @@ msgid ""
"Money: %s"
msgstr ""
-#: src/gui/windows/charselectdialog.cpp:289
+#: src/gui/windows/charselectdialog.cpp:311
msgid "Incorrect password"
msgstr ""
#. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:429
+#: src/gui/windows/charselectdialog.cpp:451
msgid "Enter password for deleting character"
msgstr ""
-#: src/gui/windows/charselectdialog.cpp:429
+#: src/gui/windows/charselectdialog.cpp:451
msgid "Enter password:"
msgstr ""
@@ -5604,7 +5645,7 @@ msgstr "Level: %d"
#. TRANSLATORS: status bar label
#: src/gui/windows/ministatuswindow.cpp:364
-#: src/gui/windows/ministatuswindow.cpp:402
+#: src/gui/windows/ministatuswindow.cpp:401
msgid "Need"
msgstr ""
@@ -5635,7 +5676,7 @@ msgstr "Submit"
#. TRANSLATORS: shop window button
#. TRANSLATORS: trade window button
#: src/gui/windows/npcdialog.cpp:114 src/gui/windows/serverdialog.cpp:121
-#: src/gui/windows/shopwindow.cpp:99 src/gui/windows/shopwindow.cpp:106
+#: src/gui/windows/shopwindow.cpp:98 src/gui/windows/shopwindow.cpp:105
#: src/gui/windows/tradewindow.cpp:83
msgid "Add"
msgstr "Add"
@@ -5798,43 +5839,38 @@ msgid "Reset Windows"
msgstr "Reset Windows"
#. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:80
+#: src/gui/windows/shopwindow.cpp:79
msgid "Personal Shop"
msgstr ""
#. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:95
+#: src/gui/windows/shopwindow.cpp:94
msgid "Buy items"
msgstr ""
#. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:97
+#: src/gui/windows/shopwindow.cpp:96
msgid "Sell items"
msgstr ""
#. TRANSLATORS: shop window label
#. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:110
+#: src/gui/windows/shopwindow.cpp:102 src/gui/windows/shopwindow.cpp:109
msgid "Announce"
msgstr ""
#. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:114
+#: src/gui/windows/shopwindow.cpp:113
msgid "Show links in announce"
msgstr ""
-#. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:176 src/gui/windows/shopwindow.cpp:179
-msgid "Auction"
-msgstr ""
-
#. TRANSLATORS: shop window dialog
#. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:233
+#: src/gui/windows/shopwindow.cpp:776 src/net/ea/tradehandler.cpp:233
msgid "Request for Trade"
msgstr "Request for Trade"
-#: src/gui/windows/shopwindow.cpp:791
+#: src/gui/windows/shopwindow.cpp:776
#, c-format
msgid "%s wants to %s %s do you accept?"
msgstr ""
@@ -6162,27 +6198,27 @@ msgstr "Updating..."
msgid "Connecting..."
msgstr "Connecting..."
-#: src/gui/windows/updaterwindow.cpp:398
+#: src/gui/windows/updaterwindow.cpp:407
msgid "Show all news (can be slow)"
msgstr ""
#. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:824
+#: src/gui/windows/updaterwindow.cpp:833
msgid "##1 The update process is incomplete."
msgstr "##1 The update process is incomplete."
#. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:826
+#: src/gui/windows/updaterwindow.cpp:835
msgid "##1 It is strongly recommended that"
msgstr "##1 It is strongly recommended that"
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:828
+#: src/gui/windows/updaterwindow.cpp:837
msgid "##1 you try again later."
msgstr ""
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1005
+#: src/gui/windows/updaterwindow.cpp:1021
msgid "Completed"
msgstr "Completed"
@@ -6229,25 +6265,25 @@ msgstr ""
#. TRANSLATORS: long key name. must be short.
#. TRANSLATORS: short key name. must be very short.
#. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:370 src/input/inputmanager.cpp:414
+#: src/input/inputmanager.cpp:371 src/input/inputmanager.cpp:415
#: src/input/keyboardconfig.cpp:104
#, c-format
msgid "key_%d"
msgstr ""
#. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:376
+#: src/input/inputmanager.cpp:377
#, c-format
msgid "JButton%d"
msgstr ""
#. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:391
msgid "unknown key"
msgstr ""
#. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:420
+#: src/input/inputmanager.cpp:421
#, c-format
msgid "JB%d"
msgstr ""
@@ -6255,7 +6291,7 @@ msgstr ""
#. TRANSLATORS: unknown short key type. must be short
#. TRANSLATORS: Unknown key short string.
#. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:434 src/input/keyboardconfig.cpp:148
+#: src/input/inputmanager.cpp:435 src/input/keyboardconfig.cpp:148
msgid "u key"
msgstr ""
@@ -7426,74 +7462,74 @@ msgid "Request to quit denied!"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:135
#, c-format
msgid "Guild name: %s"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:191
+#: src/net/ea/guildhandler.cpp:138
#, c-format
msgid "Guild master: %s"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:141
#, c-format
msgid "Guild level: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:197
+#: src/net/ea/guildhandler.cpp:144
#, c-format
msgid "Online members: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:200
+#: src/net/ea/guildhandler.cpp:147
#, c-format
msgid "Max members: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:203
+#: src/net/ea/guildhandler.cpp:150
#, c-format
msgid "Average level: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:206
+#: src/net/ea/guildhandler.cpp:153
#, c-format
msgid "Guild exp: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:209
+#: src/net/ea/guildhandler.cpp:156
#, c-format
msgid "Guild next exp: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:212
+#: src/net/ea/guildhandler.cpp:159
#, c-format
msgid "Guild castle: %s"
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:179
+#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:191
msgid "Item sharing enabled."
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:183
+#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:195
msgid "Item sharing disabled."
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:187
+#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:199
msgid "Item sharing not possible."
msgstr ""
@@ -7504,19 +7540,19 @@ msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:167
+#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:179
msgid "Experience sharing enabled."
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:171
+#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:183
msgid "Experience sharing disabled."
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:175
+#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:187
msgid "Experience sharing not possible."
msgstr ""
@@ -7621,239 +7657,355 @@ msgid "Connection to server terminated. "
msgstr ""
#. TRANSLATORS: message header
-#: src/net/ea/playerhandler.cpp:257 src/net/ea/playerhandler.cpp:273
-#: src/net/ea/playerhandler.cpp:361
+#: src/net/ea/playerhandler.cpp:192 src/net/ea/playerhandler.cpp:418
+#: src/net/ea/playerhandler.cpp:434
msgid "Message"
msgstr ""
#. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:259
+#: src/net/ea/playerhandler.cpp:420
msgid ""
"You are carrying more than half your weight. You are unable to regain "
"health."
msgstr ""
#. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:275
+#: src/net/ea/playerhandler.cpp:436
msgid "You are carrying less than half your weight. You can regain health."
msgstr ""
+#. TRANSLATORS: char rename error
+#: src/net/eathena/charserverhandler.cpp:516
+#: src/net/eathena/charserverhandler.cpp:553
+msgid "Character rename error."
+msgstr ""
+
+#: src/net/eathena/charserverhandler.cpp:531
+msgid "Character renamed."
+msgstr ""
+
+#. TRANSLATORS: char rename error
+#: src/net/eathena/charserverhandler.cpp:544
+msgid "Rename not allowed."
+msgstr ""
+
+#. TRANSLATORS: char rename error
+#: src/net/eathena/charserverhandler.cpp:548
+msgid "New name is not set."
+msgstr ""
+
+#. TRANSLATORS: char rename error
+#: src/net/eathena/charserverhandler.cpp:557
+msgid "Character not found."
+msgstr ""
+
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:125
+#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:124
#, c-format
msgid "Strength %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:127
+#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:126
#, c-format
msgid "Agility %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:129
+#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:128
#, c-format
msgid "Vitality %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:131
+#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:130
#, c-format
msgid "Intelligence %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:128 src/net/tmwa/generalhandler.cpp:133
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:132
#, c-format
msgid "Dexterity %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:135
+#: src/net/eathena/generalhandler.cpp:128 src/net/tmwa/generalhandler.cpp:134
#, c-format
msgid "Luck %s"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:152 src/net/tmwa/generalhandler.cpp:161
+#: src/net/eathena/generalhandler.cpp:159 src/net/tmwa/generalhandler.cpp:160
msgid "Authentication failed."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:155 src/net/tmwa/generalhandler.cpp:165
+#: src/net/eathena/generalhandler.cpp:162 src/net/tmwa/generalhandler.cpp:164
msgid "No servers available."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:160 src/net/tmwa/generalhandler.cpp:171
+#: src/net/eathena/generalhandler.cpp:167 src/net/tmwa/generalhandler.cpp:170
msgid "Someone else is trying to use this account."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:165 src/net/tmwa/generalhandler.cpp:177
+#: src/net/eathena/generalhandler.cpp:172 src/net/tmwa/generalhandler.cpp:176
msgid "This account is already logged in."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:169 src/net/tmwa/generalhandler.cpp:182
+#: src/net/eathena/generalhandler.cpp:176 src/net/tmwa/generalhandler.cpp:181
msgid "Speed hack detected."
msgstr ""
+#: src/net/eathena/generalhandler.cpp:179
+msgid "Server full."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:182
+msgid "Sorry, you are underaged."
+msgstr ""
+
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:172 src/net/tmwa/generalhandler.cpp:186
+#: src/net/eathena/generalhandler.cpp:185 src/net/tmwa/generalhandler.cpp:185
msgid "Duplicated login."
msgstr ""
+#: src/net/eathena/generalhandler.cpp:188
+msgid "To many connections from same ip."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:191
+msgid "Not paid for this time."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:194
+msgid "Pay suspended."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:197
+msgid "Pay changed."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:200
+msgid "Pay wrong ip."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:203
+msgid "Pay game room."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:206
+msgid "Disconnect forced by GM."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:210
+msgid "Ban japan refuse."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:213
+msgid "Remained other account."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:216
+msgid "Ip unfair."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:219
+msgid "Ip count all."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:222
+msgid "Ip count."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:226
+msgid "Memory."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:229
+msgid "Han valid."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:232
+msgid "Ip limited access."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:235
+msgid "Over characters list."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:238
+msgid "Ip blocked."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:241
+msgid "Invalid password count."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:244
+msgid "Not allowed race."
+msgstr ""
+
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:175 src/net/tmwa/generalhandler.cpp:190
+#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:189
msgid "Unknown connection error."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:280
+#: src/net/eathena/generalhandler.cpp:323 src/net/tmwa/generalhandler.cpp:279
msgid "Got disconnected from server!"
msgstr "Disconnected from server!"
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:282 src/net/tmwa/generalhandler.cpp:308
+#: src/net/eathena/generalhandler.cpp:348 src/net/tmwa/generalhandler.cpp:307
msgid "Strength"
msgstr "Strength"
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:310
+#: src/net/eathena/generalhandler.cpp:349 src/net/tmwa/generalhandler.cpp:309
msgid "Agility"
msgstr "Agility"
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:284 src/net/tmwa/generalhandler.cpp:312
+#: src/net/eathena/generalhandler.cpp:350 src/net/tmwa/generalhandler.cpp:311
msgid "Vitality"
msgstr "Vitality"
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:285 src/net/tmwa/generalhandler.cpp:314
+#: src/net/eathena/generalhandler.cpp:352 src/net/tmwa/generalhandler.cpp:314
msgid "Intelligence"
msgstr "Intelligence"
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:286 src/net/tmwa/generalhandler.cpp:316
+#: src/net/eathena/generalhandler.cpp:353 src/net/tmwa/generalhandler.cpp:316
msgid "Dexterity"
msgstr "Dexterity"
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:287 src/net/tmwa/generalhandler.cpp:318
+#: src/net/eathena/generalhandler.cpp:354 src/net/tmwa/generalhandler.cpp:318
msgid "Luck"
msgstr "Luck"
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:290 src/net/tmwa/generalhandler.cpp:323
+#: src/net/eathena/generalhandler.cpp:357 src/net/tmwa/generalhandler.cpp:322
msgid "Defense"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:291 src/net/tmwa/generalhandler.cpp:325
+#: src/net/eathena/generalhandler.cpp:358 src/net/tmwa/generalhandler.cpp:324
msgid "M.Attack"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:292 src/net/tmwa/generalhandler.cpp:327
+#: src/net/eathena/generalhandler.cpp:359 src/net/tmwa/generalhandler.cpp:326
msgid "M.Defense"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:294 src/net/tmwa/generalhandler.cpp:330
+#: src/net/eathena/generalhandler.cpp:361 src/net/tmwa/generalhandler.cpp:329
#, no-c-format
msgid "% Accuracy"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:296 src/net/tmwa/generalhandler.cpp:333
+#: src/net/eathena/generalhandler.cpp:363 src/net/tmwa/generalhandler.cpp:332
#, no-c-format
msgid "% Evade"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:298 src/net/tmwa/generalhandler.cpp:336
+#: src/net/eathena/generalhandler.cpp:365 src/net/tmwa/generalhandler.cpp:335
#, no-c-format
msgid "% Critical"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:299 src/net/tmwa/generalhandler.cpp:338
+#: src/net/eathena/generalhandler.cpp:366 src/net/tmwa/generalhandler.cpp:337
msgid "Attack Delay"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:300 src/net/tmwa/generalhandler.cpp:340
+#: src/net/eathena/generalhandler.cpp:367 src/net/tmwa/generalhandler.cpp:339
msgid "Walk Delay"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:301 src/net/tmwa/generalhandler.cpp:342
+#: src/net/eathena/generalhandler.cpp:368 src/net/tmwa/generalhandler.cpp:341
msgid "Attack Range"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:302 src/net/tmwa/generalhandler.cpp:344
+#: src/net/eathena/generalhandler.cpp:369 src/net/tmwa/generalhandler.cpp:343
msgid "Damage per sec."
msgstr ""
-#: src/net/eathena/skillhandler.cpp:228 src/net/eathena/skillhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:370
+msgid "Karma"
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:371
+msgid "Manner"
+msgstr ""
+
+#: src/net/eathena/skillhandler.cpp:304 src/net/eathena/skillhandler.cpp:364
#, c-format
msgid "Unknown skill error: %d"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:235 src/net/tmwa/skillhandler.cpp:224
+#: src/net/eathena/skillhandler.cpp:311 src/net/tmwa/skillhandler.cpp:224
msgid "You have not yet reached a high enough lvl!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:239 src/net/tmwa/skillhandler.cpp:228
+#: src/net/eathena/skillhandler.cpp:315 src/net/tmwa/skillhandler.cpp:228
msgid "Insufficient HP!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:243 src/net/tmwa/skillhandler.cpp:232
+#: src/net/eathena/skillhandler.cpp:319 src/net/tmwa/skillhandler.cpp:232
msgid "Insufficient SP!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:247 src/net/tmwa/skillhandler.cpp:236
+#: src/net/eathena/skillhandler.cpp:323 src/net/tmwa/skillhandler.cpp:236
msgid "You have no memos!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:251 src/net/tmwa/skillhandler.cpp:240
+#: src/net/eathena/skillhandler.cpp:327 src/net/tmwa/skillhandler.cpp:240
msgid "You cannot do that right now!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:255 src/net/tmwa/skillhandler.cpp:244
+#: src/net/eathena/skillhandler.cpp:331 src/net/tmwa/skillhandler.cpp:244
msgid "Seems you need more money... ;-)"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:259 src/net/tmwa/skillhandler.cpp:248
+#: src/net/eathena/skillhandler.cpp:335 src/net/tmwa/skillhandler.cpp:248
msgid "You cannot use this skill with that kind of weapon!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:264 src/net/tmwa/skillhandler.cpp:253
+#: src/net/eathena/skillhandler.cpp:340 src/net/tmwa/skillhandler.cpp:253
msgid "You need another red gem!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:268 src/net/tmwa/skillhandler.cpp:257
+#: src/net/eathena/skillhandler.cpp:344 src/net/tmwa/skillhandler.cpp:257
msgid "You need another blue gem!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:272 src/net/tmwa/skillhandler.cpp:261
+#: src/net/eathena/skillhandler.cpp:348 src/net/tmwa/skillhandler.cpp:261
msgid "You're carrying to much to do this!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:276 src/net/tmwa/skillhandler.cpp:265
+#: src/net/eathena/skillhandler.cpp:352 src/net/tmwa/skillhandler.cpp:265
msgid "Huh? What's that?"
msgstr ""
@@ -7870,32 +8022,32 @@ msgid "%s wants to trade with you, do you accept?"
msgstr "%s wants to trade with you, do you accept?"
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:349
+#: src/net/tmwa/charserverhandler.cpp:351
msgid "Strength:"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:351
+#: src/net/tmwa/charserverhandler.cpp:353
msgid "Agility:"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:353
+#: src/net/tmwa/charserverhandler.cpp:355
msgid "Vitality:"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:355
+#: src/net/tmwa/charserverhandler.cpp:357
msgid "Intelligence:"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:357
+#: src/net/tmwa/charserverhandler.cpp:359
msgid "Dexterity:"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:359
+#: src/net/tmwa/charserverhandler.cpp:361
msgid "Luck:"
msgstr ""
@@ -8206,269 +8358,306 @@ msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:143
+msgid "You cant left party on this map."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:147
+msgid "You was kicked from party."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:151
+msgid "You cant be kicked kicked from party on this map."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:155
#, c-format
msgid "%s has joined your party."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:147
+#: src/resources/notifications.h:159
#, c-format
msgid "%s is already a member of a party."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:151
+#: src/resources/notifications.h:163
#, c-format
msgid "%s refused your invitation."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:155
+#: src/resources/notifications.h:167
#, c-format
msgid "%s is now a member of your party."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:159
+#: src/resources/notifications.h:171
#, c-format
msgid "%s can't join your party because party is full."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:163
+#: src/resources/notifications.h:175
#, c-format
msgid "QQQ Unknown invite response for %s."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:191
+#: src/resources/notifications.h:203
#, c-format
msgid "%s has left your party."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:195
+#: src/resources/notifications.h:207 src/resources/notifications.h:215
+#, c-format
+msgid "%s cant be kicked from party on this map."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:211
+#, c-format
+msgid "%s has kicked from your party."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:219
#, c-format
msgid "An unknown member tried to say: %s"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:199
+#: src/resources/notifications.h:223
#, c-format
msgid "%s is not in your party!"
msgstr "%s is not in your party!"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:203
+#: src/resources/notifications.h:227
#, c-format
msgid "You picked up %s."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:207
+#: src/resources/notifications.h:231
#, c-format
msgid "You spent %s."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:211
+#: src/resources/notifications.h:235
msgid "Cannot raise skill!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:215
+#: src/resources/notifications.h:239
msgid "Equip ammunition first."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:219
+#: src/resources/notifications.h:243
#, c-format
msgid "Trading with %s isn't possible. Trade partner is too far away."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:224
+#: src/resources/notifications.h:248
#, c-format
msgid "Trading with %s isn't possible. Character doesn't exist."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:228
+#: src/resources/notifications.h:252
msgid "Trade cancelled due to an unknown reason."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:232
+#: src/resources/notifications.h:256
#, c-format
msgid "Trade with %s cancelled."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:236
+#: src/resources/notifications.h:260
#, c-format
msgid "Unhandled trade cancel packet with %s"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:240
+#: src/resources/notifications.h:264
msgid "Failed adding item. Trade partner is over weighted."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:244
+#: src/resources/notifications.h:268
msgid "Failed adding item. Trade partner has no free slot."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:248
+#: src/resources/notifications.h:272
msgid "Failed adding item. You can't trade this item."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:252
+#: src/resources/notifications.h:276
msgid "Failed adding item for unknown reason."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:256
+#: src/resources/notifications.h:280
msgid "Trade canceled."
msgstr "Trade canceled."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:260
+#: src/resources/notifications.h:284
msgid "Trade completed."
msgstr "Trade completed."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:264
+#: src/resources/notifications.h:288
msgid "Kick failed!"
msgstr "Kick failed!"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:268
+#: src/resources/notifications.h:292
msgid "Kick succeeded!"
msgstr "Kick succeeded!"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:272
+#: src/resources/notifications.h:296
#, c-format
msgid "MVP player: %s"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:276
+#: src/resources/notifications.h:300
msgid "All whispers ignored."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:280
+#: src/resources/notifications.h:304
msgid "All whispers ignore failed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:284
+#: src/resources/notifications.h:308
msgid "All whispers unignored."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:288
+#: src/resources/notifications.h:312
msgid "All whispers unignore failed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:295
+#: src/resources/notifications.h:319
msgid "pvp off, gvg off"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:299
+#: src/resources/notifications.h:323
msgid "pvp on"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:303
+#: src/resources/notifications.h:327
msgid "gvg on"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:307
+#: src/resources/notifications.h:331
msgid "pvp on, gvg on"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:311
+#: src/resources/notifications.h:335
msgid "unknown pvp"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:315
+#: src/resources/notifications.h:339
#, c-format
msgid "Char from account %s is already in your party!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:319
+#: src/resources/notifications.h:343
#, c-format
msgid "%s blocked invite!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:323
+#: src/resources/notifications.h:347
msgid "Char is not online!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:327
+#: src/resources/notifications.h:351
msgid "Pet catch failed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:331
+#: src/resources/notifications.h:355
msgid "Pet catched."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:335
+#: src/resources/notifications.h:359
#, c-format
msgid "Pet catch unkown error: %d."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:339
+#: src/resources/notifications.h:363
msgid "Your mercenary duty hour is over."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:343
+#: src/resources/notifications.h:367
msgid "Your mercenary was killed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:347
+#: src/resources/notifications.h:371
msgid "Your mercenary was fired."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:351
+#: src/resources/notifications.h:375
msgid "Your mercenary run away."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:355
+#: src/resources/notifications.h:379
msgid "Mercenary unknown state."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:359
-msgid "Your feed your homunculus."
+#: src/resources/notifications.h:383
+msgid "You feed your homunculus."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:363
+#: src/resources/notifications.h:387
#, c-format
msgid "You cant feed homunculus, because not have %s."
msgstr ""
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:391
+msgid "Card insert failed."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:395
+msgid "Card inserted."
+msgstr ""
+
#. TRANSLATORS: chat option changed message
#: src/utils/booleanoptions.h:27
#, c-format
diff --git a/po/eo.po b/po/eo.po
index c6f0d667f..a738b0749 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-27 13:23+0300\n"
-"PO-Revision-Date: 2014-09-28 10:01+0000\n"
+"POT-Creation-Date: 2014-10-08 01:19+0300\n"
+"PO-Revision-Date: 2014-10-08 10:01+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/manaplus/language/eo/)\n"
"MIME-Version: 1.0\n"
@@ -33,7 +33,7 @@ msgstr ""
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:131 src/client.cpp:1463 src/client.cpp:1490
+#: src/actions/actions.cpp:131 src/client.cpp:1461 src/client.cpp:1488
#: src/gamemodifiers.cpp:423 src/gui/widgets/tabs/setup_input.cpp:163
#: src/gui/widgets/tabs/setup_theme.cpp:312
#: src/gui/widgets/tabs/setup_theme.cpp:343
@@ -44,8 +44,8 @@ msgstr ""
#: src/gui/windows/changeemaildialog.cpp:170
#: src/gui/windows/changepassworddialog.cpp:160
#: src/gui/windows/charcreatedialog.cpp:373
-#: src/gui/windows/charselectdialog.cpp:255
-#: src/gui/windows/charselectdialog.cpp:291 src/gui/windows/editdialog.cpp:49
+#: src/gui/windows/charselectdialog.cpp:277
+#: src/gui/windows/charselectdialog.cpp:313 src/gui/windows/editdialog.cpp:49
#: src/gui/windows/editserverdialog.cpp:61
#: src/gui/windows/editserverdialog.cpp:208
#: src/gui/windows/itemamountwindow.cpp:158 src/gui/windows/quitdialog.cpp:70
@@ -53,7 +53,9 @@ msgstr ""
#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
#: src/net/ea/charserverhandler.cpp:143 src/net/ea/charserverhandler.cpp:162
#: src/net/ea/charserverhandler.cpp:175 src/net/ea/gamehandler.cpp:79
-#: src/net/ea/playerhandler.cpp:263 src/net/ea/playerhandler.cpp:279
+#: src/net/ea/playerhandler.cpp:424 src/net/ea/playerhandler.cpp:440
+#: src/net/eathena/charserverhandler.cpp:533
+#: src/net/eathena/charserverhandler.cpp:563
msgid "OK"
msgstr ""
@@ -177,7 +179,7 @@ msgstr ""
#. TRANSLATORS: party invite message
#. TRANSLATORS: change relation
-#: src/actions/chat.cpp:303 src/actions/commands.cpp:65
+#: src/actions/chat.cpp:303 src/actions/commands.cpp:64
msgid "Please specify a name."
msgstr ""
@@ -200,75 +202,75 @@ msgid "Message now closes chat."
msgstr ""
#. TRANSLATORS: change relation
-#: src/actions/commands.cpp:108
+#: src/actions/commands.cpp:107
#, c-format
msgid "Player already %s!"
msgstr ""
#. TRANSLATORS: change relation
-#: src/actions/commands.cpp:120
+#: src/actions/commands.cpp:119
#, c-format
msgid "Player successfully %s!"
msgstr ""
#. TRANSLATORS: change relation
-#: src/actions/commands.cpp:122
+#: src/actions/commands.cpp:121
#, c-format
msgid "Player could not be %s!"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:153
+#: src/actions/commands.cpp:152
msgid "Player wasn't ignored!"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:162
+#: src/actions/commands.cpp:161
msgid "Player no longer ignored!"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:164
+#: src/actions/commands.cpp:163
msgid "Player could not be unignored!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/actions/commands.cpp:179
+#: src/actions/commands.cpp:178
msgid "Player already erased!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/actions/commands.cpp:192
+#: src/actions/commands.cpp:191
msgid "Player no longer erased!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/actions/commands.cpp:194
+#: src/actions/commands.cpp:193
msgid "Player could not be erased!"
msgstr ""
#. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:201
+#: src/actions/commands.cpp:200
msgid "friend"
msgstr "amiko"
#. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:208
+#: src/actions/commands.cpp:207
msgid "disregarded"
msgstr ""
#. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:215
+#: src/actions/commands.cpp:214
msgid "neutral"
msgstr ""
#. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:222
+#: src/actions/commands.cpp:221
msgid "blacklisted"
msgstr ""
#. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:229
+#: src/actions/commands.cpp:228
msgid "enemy"
msgstr "malamiko"
@@ -283,77 +285,77 @@ msgid "Accepting incoming trade requests"
msgstr ""
#. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1306
+#: src/actormanager.cpp:1310
msgid "Visible on map"
msgstr ""
#. TRANSLATORS: default race name
-#: src/being/being.cpp:389
+#: src/being/being.cpp:393
msgid "Human"
msgstr ""
-#: src/being/being.cpp:556
+#: src/being/being.cpp:560
msgid "dodge"
msgstr ""
-#: src/being/being.cpp:556
+#: src/being/being.cpp:560
msgid "miss"
msgstr ""
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1865 src/gui/windows/whoisonline.cpp:855
+#: src/being/being.cpp:1869 src/gui/windows/whoisonline.cpp:855
msgid "A"
msgstr "A"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1870 src/gui/windows/whoisonline.cpp:860
+#: src/being/being.cpp:1874 src/gui/windows/whoisonline.cpp:860
msgid "I"
msgstr "I"
#. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:379
+#: src/being/localplayer.cpp:380
#, c-format
msgid "You were killed by %s"
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:824
+#: src/being/localplayer.cpp:825
msgid "Tried to pick up nonexistent item."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:828
+#: src/being/localplayer.cpp:829
msgid "Item is too heavy."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:832
+#: src/being/localplayer.cpp:833
msgid "Item is too far away."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:836
+#: src/being/localplayer.cpp:837
msgid "Inventory is full."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:840
+#: src/being/localplayer.cpp:841
msgid "Stack is too big."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:844
+#: src/being/localplayer.cpp:845
msgid "Item belongs to someone else."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:848
+#: src/being/localplayer.cpp:849
msgid "Unknown problem picking up item."
msgstr ""
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:872
+#: src/being/localplayer.cpp:873
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -362,43 +364,43 @@ msgstr[1] ""
#. TRANSLATORS: this is normal experience
#. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1054 src/being/localplayer.cpp:1055
-#: src/being/localplayer.cpp:1091
+#: src/being/localplayer.cpp:1055 src/being/localplayer.cpp:1056
+#: src/being/localplayer.cpp:1092
msgid "xp"
msgstr ""
#. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1059 src/being/localplayer.cpp:1065
-#: src/being/localplayer.cpp:1071
+#: src/being/localplayer.cpp:1060 src/being/localplayer.cpp:1066
+#: src/being/localplayer.cpp:1072
msgid "job"
msgstr ""
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2794
+#: src/being/localplayer.cpp:2795
#, c-format
msgid "Follow: %s"
msgstr ""
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2800 src/being/localplayer.cpp:2825
+#: src/being/localplayer.cpp:2801 src/being/localplayer.cpp:2826
msgid "Follow canceled"
msgstr ""
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2810
+#: src/being/localplayer.cpp:2811
#, c-format
msgid "Imitation: %s"
msgstr ""
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2816 src/being/localplayer.cpp:2830
+#: src/being/localplayer.cpp:2817 src/being/localplayer.cpp:2831
msgid "Imitation canceled"
msgstr ""
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3180
+#: src/being/localplayer.cpp:3181
#, c-format
msgid "You see %s"
msgstr ""
@@ -436,37 +438,37 @@ msgstr ""
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:920 src/gui/windowmenu.cpp:162
+#: src/client.cpp:918 src/gui/windowmenu.cpp:162
#: src/gui/windows/setupwindow.cpp:62
msgid "Setup"
msgstr ""
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:923 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:921 src/gui/widgets/tabs/setup_perfomance.cpp:54
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:926 src/gui/widgets/tabs/setup_video.cpp:105
+#: src/client.cpp:924 src/gui/widgets/tabs/setup_video.cpp:105
msgid "Video"
msgstr "Video"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:929 src/gui/widgets/tabs/setup_theme.cpp:122
+#: src/client.cpp:927 src/gui/widgets/tabs/setup_theme.cpp:122
msgid "Theme"
msgstr ""
#. TRANSLATORS: theme tab quick button
-#: src/client.cpp:932
+#: src/client.cpp:930
msgid "About"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:935 src/gui/windowmenu.cpp:74
+#: src/client.cpp:933 src/gui/windowmenu.cpp:74
#: src/gui/windows/helpwindow.cpp:53
msgid "Help"
msgstr "Helpo"
@@ -482,42 +484,42 @@ msgstr "Helpo"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:939 src/client.cpp:1391 src/client.cpp:1405
+#: src/client.cpp:937 src/client.cpp:1389 src/client.cpp:1403
#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:691
#: src/gui/popups/popupmenu.cpp:923 src/gui/windows/didyouknowwindow.cpp:81
#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:74
#: src/gui/windows/npcdialog.cpp:112 src/gui/windows/questswindow.cpp:77
-#: src/gui/windows/shopwindow.cpp:84
+#: src/gui/windows/shopwindow.cpp:83
msgid "Close"
msgstr "Fermi"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1065
+#: src/client.cpp:1063
msgid "Connecting to server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1113
+#: src/client.cpp:1111
msgid "Logging in"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1156
+#: src/client.cpp:1154
msgid "Entering game world"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1282
+#: src/client.cpp:1280
msgid "Requesting characters"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1322
+#: src/client.cpp:1320
msgid "Connecting to the game server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1334
+#: src/client.cpp:1332
msgid "Changing game servers"
msgstr ""
@@ -531,72 +533,76 @@ msgstr ""
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1389 src/client.cpp:1403 src/client.cpp:1598
+#. TRANSLATORS: info message
+#. TRANSLATORS: ok dialog button
+#: src/client.cpp:1387 src/client.cpp:1401 src/client.cpp:1596
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
#: src/gui/windows/charcreatedialog.cpp:369
-#: src/gui/windows/charselectdialog.cpp:289
+#: src/gui/windows/charselectdialog.cpp:311
#: src/gui/windows/editserverdialog.cpp:203
#: src/gui/windows/registerdialog.cpp:245
#: src/gui/windows/unregisterdialog.cpp:146
#: src/net/ea/charserverhandler.cpp:141 src/net/ea/charserverhandler.cpp:173
+#: src/net/eathena/charserverhandler.cpp:516
+#: src/net/eathena/charserverhandler.cpp:518
msgid "Error"
msgstr "Eraro"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1418
+#: src/client.cpp:1416
msgid "Requesting registration details"
msgstr ""
#. TRANSLATORS: password change message header
-#: src/client.cpp:1459
+#: src/client.cpp:1457
msgid "Password Change"
msgstr ""
#. TRANSLATORS: password change message text
-#: src/client.cpp:1461
+#: src/client.cpp:1459
msgid "Password changed successfully!"
msgstr ""
#. TRANSLATORS: email change message header
-#: src/client.cpp:1486
+#: src/client.cpp:1484
msgid "Email Change"
msgstr ""
#. TRANSLATORS: email change message text
-#: src/client.cpp:1488
+#: src/client.cpp:1486
msgid "Email changed successfully!"
msgstr ""
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1515
+#: src/client.cpp:1513
msgid "Unregister Successful"
msgstr ""
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1517
+#: src/client.cpp:1515
msgid "Farewell, come back any time..."
msgstr ""
#. TRANSLATORS: directory creation error
#: src/configmanager.cpp:53 src/dirs.cpp:260 src/dirs.cpp:275 src/dirs.cpp:320
-#: src/dirs.cpp:481 src/dirs.cpp:489
+#: src/dirs.cpp:488 src/dirs.cpp:496
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:363
+#: src/dirs.cpp:370
#, c-format
msgid "Invalid update host: %s."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:404 src/dirs.cpp:411
+#: src/dirs.cpp:411 src/dirs.cpp:418
msgid "Error creating updates directory!"
msgstr ""
-#: src/dirs.cpp:433 src/dirs.cpp:451
+#: src/dirs.cpp:440 src/dirs.cpp:458
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
@@ -614,36 +620,36 @@ msgid "dyecmd srcdyestring dstfile"
msgstr ""
#. TRANSLATORS: chat tab header
-#: src/game.cpp:236 src/gui/widgets/tabs/chattab.cpp:482
+#: src/game.cpp:234 src/gui/widgets/tabs/chattab.cpp:482
msgid "General"
msgstr ""
#. TRANSLATORS: chat tab header
#. TRANSLATORS: full button name
#. TRANSLATORS: debug window name
-#: src/game.cpp:253 src/gui/widgets/tabs/chattab.cpp:484
+#: src/game.cpp:251 src/gui/widgets/tabs/chattab.cpp:484
#: src/gui/windowmenu.cpp:149 src/gui/windows/debugwindow.cpp:42
msgid "Debug"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:541
+#: src/game.cpp:532
#, c-format
msgid "Screenshot saved as %s"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:551
+#: src/game.cpp:542
msgid "Saving screenshot failed!"
msgstr ""
#. TRANSLATORS: error message text
-#: src/game.cpp:634
+#: src/game.cpp:625
msgid "The connection to the server was lost."
msgstr ""
#. TRANSLATORS: error message header
-#: src/game.cpp:637
+#: src/game.cpp:628
msgid "Network Error"
msgstr ""
@@ -1034,6 +1040,7 @@ msgstr ""
#: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
#: src/gui/widgets/tabs/setup_other.cpp:79
#: src/gui/widgets/tabs/setup_visual.cpp:81
+#: src/gui/windows/equipmentwindow.cpp:577
msgid "default"
msgstr ""
@@ -1524,7 +1531,7 @@ msgstr ""
#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:273
#: src/gui/popups/popupmenu.cpp:767 src/gui/widgets/skillinfo.cpp:113
#: src/gui/windows/botcheckerwindow.cpp:89 src/input/pages/basic.cpp:42
-#: src/net/eathena/generalhandler.cpp:289 src/net/tmwa/generalhandler.cpp:321
+#: src/net/eathena/generalhandler.cpp:356 src/net/tmwa/generalhandler.cpp:320
msgid "Attack"
msgstr ""
@@ -1693,7 +1700,7 @@ msgstr ""
#. TRANSLATORS: pet unequip item
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:340 src/gui/windows/equipmentwindow.cpp:70
+#: src/gui/popups/popupmenu.cpp:340 src/gui/windows/equipmentwindow.cpp:72
#: src/gui/windows/inventorywindow.cpp:175 src/resources/itemtypemapdata.h:47
#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
@@ -1751,7 +1758,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:574
+#: src/gui/popups/popupmenu.cpp:574 src/gui/windows/charselectdialog.cpp:132
msgid "Rename"
msgstr ""
@@ -2263,7 +2270,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
#. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:3000 src/net/ea/playerhandler.cpp:364
+#: src/gui/popups/popupmenu.cpp:3000 src/net/ea/playerhandler.cpp:195
msgid "Revive"
msgstr ""
@@ -2287,7 +2294,7 @@ msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: settings group
#. TRANSLATORS: full button name
-#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:319
+#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:315
#: src/gui/windowmenu.cpp:158
msgid "Windows"
msgstr "Fenestroj"
@@ -2315,7 +2322,7 @@ msgstr "Babilado"
#. TRANSLATORS: input action name
#: src/gui/setupinputpages.cpp:57 src/gui/widgets/tabs/setup_audio.cpp:151
#: src/gui/widgets/tabs/setup_chat.cpp:179
-#: src/gui/widgets/tabs/setup_other.cpp:341
+#: src/gui/widgets/tabs/setup_other.cpp:337
#: src/gui/widgets/tabs/setup_visual.cpp:192
#: src/gui/windows/charcreatedialog.cpp:119
#: src/gui/windows/registerdialog.cpp:106 src/input/pages/gui.cpp:87
@@ -2328,212 +2335,227 @@ msgid "Gui"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:113
+#: src/gui/userpalette.cpp:116
msgid "Being"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:115
+#: src/gui/userpalette.cpp:118
msgid "Friend names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:117
+#: src/gui/userpalette.cpp:120
msgid "Disregarded names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:119
+#: src/gui/userpalette.cpp:122
msgid "Ignored names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:121
+#: src/gui/userpalette.cpp:124
msgid "Erased names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:123
+#: src/gui/userpalette.cpp:126
msgid "Other players names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:125
+#: src/gui/userpalette.cpp:128
msgid "Own name"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:127
+#: src/gui/userpalette.cpp:130
msgid "GM names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:129
+#: src/gui/userpalette.cpp:132
msgid "NPCs"
msgstr "NLR-oj"
#. TRANSLATORS: palette color
#. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:131 src/gui/widgets/tabs/setup_other.cpp:108
+#: src/gui/userpalette.cpp:134 src/gui/widgets/tabs/setup_other.cpp:108
msgid "Monsters"
msgstr "Monstroj"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:133
+#: src/gui/userpalette.cpp:136
msgid "Monster HP bar"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:139
msgid "Monster HP bar (second color)"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:138
+#: src/gui/userpalette.cpp:141
msgid "Party members"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:140
+#: src/gui/userpalette.cpp:143
msgid "Guild members"
msgstr ""
#. TRANSLATORS: palette color
#. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:142 src/gui/widgets/tabs/setup_visual.cpp:157
+#: src/gui/userpalette.cpp:145 src/gui/widgets/tabs/setup_visual.cpp:157
msgid "Particle effects"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:144
+#: src/gui/userpalette.cpp:147
msgid "Pickup notification"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:146
+#: src/gui/userpalette.cpp:149
msgid "Exp notification"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:148
+#: src/gui/userpalette.cpp:151
msgid "Player HP bar"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:152
+#: src/gui/userpalette.cpp:155
msgid "Player HP bar (second color)"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:154
+#: src/gui/userpalette.cpp:157
msgid "Player hits monster"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:156
+#: src/gui/userpalette.cpp:159
msgid "Monster hits player"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:160
+#: src/gui/userpalette.cpp:163
msgid "Other player hits local player"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:162
+#: src/gui/userpalette.cpp:165
msgid "Critical Hit"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:166
+#: src/gui/userpalette.cpp:169
msgid "Local player hits monster"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:169
+#: src/gui/userpalette.cpp:172
msgid "Local player critical hit"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:172
+#: src/gui/userpalette.cpp:175
msgid "Local player miss"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:174
+#: src/gui/userpalette.cpp:177
msgid "Misses"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:176
+#: src/gui/userpalette.cpp:179
msgid "Portal highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:179
+#: src/gui/userpalette.cpp:182
msgid "Default collision highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:182
+#: src/gui/userpalette.cpp:185
msgid "Air collision highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:185
+#: src/gui/userpalette.cpp:188
msgid "Water collision highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:188
+#: src/gui/userpalette.cpp:191
msgid "Special ground collision highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:191
+#: src/gui/userpalette.cpp:194
msgid "Walkable highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:194
+#: src/gui/userpalette.cpp:197
msgid "Local player attack range"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:197
+#: src/gui/userpalette.cpp:200
msgid "Local player attack range border"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:200
+#: src/gui/userpalette.cpp:203
msgid "Monster attack range"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:204
+#: src/gui/userpalette.cpp:207
msgid "Floor item amount color"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:207
+#: src/gui/userpalette.cpp:210
msgid "Home place"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:210
+#: src/gui/userpalette.cpp:213
msgid "Home place border"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:213
+#: src/gui/userpalette.cpp:216
msgid "Road point"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:216
+#: src/gui/userpalette.cpp:219
msgid "Tiles border"
msgstr ""
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:221
+msgid "Pets"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:223
+msgid "Mercenary"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:225
+msgid "Homunculus"
+msgstr ""
+
#: src/gui/widgets/characterdisplay.cpp:135
#, c-format
msgid "Level: %u"
@@ -2636,7 +2658,8 @@ msgid "Type: %s"
msgstr ""
#. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:108
+#. TRANSLATORS: unknown equipment page name
+#: src/gui/widgets/skillinfo.cpp:108 src/gui/windows/equipmentwindow.cpp:584
msgid "Unknown"
msgstr ""
@@ -2837,22 +2860,22 @@ msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:262
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:313
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:375
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:319
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:387
msgid "Target:"
msgstr "Celo:"
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:264
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:319
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:377
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:325
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:389
msgid "Target Id:"
msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:267
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:322
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:379
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:328
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:391
msgid "Target type:"
msgstr ""
@@ -2863,7 +2886,7 @@ msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:271
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:338
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:344
msgid "Target race:"
msgstr ""
@@ -2879,67 +2902,81 @@ msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:277
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:363
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:369
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:387
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:375
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:381
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:399
msgid "Attack delay:"
msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:279
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:350
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:389
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:356
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:401
msgid "Minimal hit:"
msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:281
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:353
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:391
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:359
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:403
msgid "Maximum hit:"
msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:283
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:356
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:393
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:362
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:405
msgid "Critical hit:"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:327
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:285
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:365
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:407
+msgid "Karma:"
+msgstr ""
+
+#. TRANSLATORS: debug window label
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:287
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:368
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:409
+msgid "Manner:"
+msgstr ""
+
+#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:333
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:381
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:339
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:393
msgid "Target Level:"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:341
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:383
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:347
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:395
msgid "Target Party:"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:345
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:385
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:351
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:397
msgid "Target Guild:"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:430
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:436
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:451
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:457
#, c-format
msgid "Ping: %s ms"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:439
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:460
#, c-format
msgid "In: %d bytes/s"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:442
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:463
#, c-format
msgid "Out: %d bytes/s"
msgstr ""
@@ -3768,137 +3805,132 @@ msgstr ""
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_other.cpp:294
-msgid "Enable auction bot support"
-msgstr ""
-
-#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:298
msgid "Enable guild bot support and disable native guild support"
msgstr ""
#. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:304
+#: src/gui/widgets/tabs/setup_other.cpp:300
msgid "Keyboard"
msgstr "Klavaro"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:307
+#: src/gui/widgets/tabs/setup_other.cpp:303
msgid "Repeat delay"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:311
+#: src/gui/widgets/tabs/setup_other.cpp:307
msgid "Repeat interval"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:315
+#: src/gui/widgets/tabs/setup_other.cpp:311
msgid "Custom repeat interval"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:323
+#: src/gui/widgets/tabs/setup_other.cpp:319
msgid "Shortcut buttons"
msgstr ""
#. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:328
+#: src/gui/widgets/tabs/setup_other.cpp:324
msgid "Proxy server"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:332
+#: src/gui/widgets/tabs/setup_other.cpp:328
msgid "Proxy type"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:336
+#: src/gui/widgets/tabs/setup_other.cpp:332
msgid "Proxy address:port"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:344
+#: src/gui/widgets/tabs/setup_other.cpp:340
msgid "Enable server side attack"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:348
+#: src/gui/widgets/tabs/setup_other.cpp:344
msgid "Hide support page link on error"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:352
+#: src/gui/widgets/tabs/setup_other.cpp:348
msgid "Enable double clicks"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:356
+#: src/gui/widgets/tabs/setup_other.cpp:352
msgid "Enable bot checker"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:360
+#: src/gui/widgets/tabs/setup_other.cpp:356
msgid "Enable buggy servers protection (do not disable)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:365
+#: src/gui/widgets/tabs/setup_other.cpp:361
msgid "Enable debug log"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:369
+#: src/gui/widgets/tabs/setup_other.cpp:365
msgid "Ignore logging packets"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:373
+#: src/gui/widgets/tabs/setup_other.cpp:369
msgid "Enable OpenGL log"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:377
+#: src/gui/widgets/tabs/setup_other.cpp:373
msgid "Enable input log"
msgstr ""
#. TRANSLATORS: settings option
#. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_other.cpp:381 src/input/pages/other.cpp:362
+#: src/gui/widgets/tabs/setup_other.cpp:377 src/input/pages/other.cpp:362
msgid "Upload log file"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:385
+#: src/gui/widgets/tabs/setup_other.cpp:381
msgid "Low traffic mode"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:389
+#: src/gui/widgets/tabs/setup_other.cpp:385
msgid "Hide shield sprite"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:394
+#: src/gui/widgets/tabs/setup_other.cpp:390
msgid "Use FBO for screenshots (only for opengl)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:400
+#: src/gui/widgets/tabs/setup_other.cpp:396
msgid "Screenshot directory"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:405
+#: src/gui/widgets/tabs/setup_other.cpp:401
msgid "Network delay between sub servers"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:409
+#: src/gui/widgets/tabs/setup_other.cpp:405
msgid "Show background"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:414
+#: src/gui/widgets/tabs/setup_other.cpp:410
msgid "Screen density override"
msgstr ""
@@ -4129,9 +4161,9 @@ msgstr ""
#. TRANSLATORS: command editor button
#. TRANSLATORS: input action name
#: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:82
-#: src/gui/windows/serverdialog.cpp:125 src/gui/windows/shopwindow.cpp:101
-#: src/gui/windows/shopwindow.cpp:108 src/gui/windows/textcommandeditor.cpp:92
+#: src/gui/windows/charselectdialog.cpp:84
+#: src/gui/windows/serverdialog.cpp:125 src/gui/windows/shopwindow.cpp:100
+#: src/gui/windows/shopwindow.cpp:107 src/gui/windows/textcommandeditor.cpp:92
#: src/input/pages/gui.cpp:111
msgid "Delete"
msgstr "Forigi"
@@ -4785,7 +4817,7 @@ msgstr ""
#. TRANSLATORS: equipment window name
#. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:63
+#: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:65
#: src/gui/windows/inventorywindow.cpp:196
msgid "Equipment"
msgstr ""
@@ -4926,7 +4958,7 @@ msgstr "Kvanto:"
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: social window button
#: src/gui/windows/buydialog.cpp:260 src/gui/windows/charcreatedialog.cpp:127
-#: src/gui/windows/charselectdialog.cpp:578
+#: src/gui/windows/charselectdialog.cpp:605
#: src/gui/windows/socialwindow.cpp:86
msgid "Create"
msgstr "Krei"
@@ -4970,10 +5002,8 @@ msgstr ""
#. TRANSLATORS: change password window name
#. TRANSLATORS: change password dialog button
-#. TRANSLATORS: char select dialog. button.
#: src/gui/windows/changepassworddialog.cpp:51
#: src/gui/windows/changepassworddialog.cpp:57
-#: src/gui/windows/charselectdialog.cpp:73
msgid "Change Password"
msgstr ""
@@ -5127,57 +5157,68 @@ msgid "Are you sure you want to delete this character?"
msgstr ""
#. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:64
+#: src/gui/windows/charselectdialog.cpp:66
#, c-format
msgid "Account %s (last login time %s)"
msgstr ""
#. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:71
-msgid "Switch Login"
+#: src/gui/windows/charselectdialog.cpp:73
+msgid "Switch"
+msgstr ""
+
+#. TRANSLATORS: char select dialog. button.
+#: src/gui/windows/charselectdialog.cpp:75
+msgid "Password"
msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:78
-#: src/gui/windows/charselectdialog.cpp:573
+#: src/gui/windows/charselectdialog.cpp:80
+#: src/gui/windows/charselectdialog.cpp:595
#: src/gui/windows/updaterwindow.cpp:195
msgid "Play"
msgstr "Ludi"
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:80
+#: src/gui/windows/charselectdialog.cpp:82
#: src/net/ea/charserverhandler.cpp:160
+#: src/net/eathena/charserverhandler.cpp:531
+#: src/net/eathena/charserverhandler.cpp:561
msgid "Info"
msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: unregister dialog name
#. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:106
+#: src/gui/windows/charselectdialog.cpp:110
#: src/gui/windows/unregisterdialog.cpp:50
#: src/gui/windows/unregisterdialog.cpp:55
msgid "Unregister"
msgstr ""
#. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:118
+#: src/gui/windows/charselectdialog.cpp:122
msgid "Change Email"
msgstr ""
#. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:156
+#: src/gui/windows/charselectdialog.cpp:166
#, c-format
msgid "Account %s"
msgstr ""
-#: src/gui/windows/charselectdialog.cpp:184
+#: src/gui/windows/charselectdialog.cpp:194
msgid "Please set new pincode"
msgstr ""
+#: src/gui/windows/charselectdialog.cpp:240
+msgid "Please enter new name"
+msgstr ""
+
#. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:237
+#: src/gui/windows/charselectdialog.cpp:259
#, c-format
msgid ""
"Hp: %u/%u\n"
@@ -5187,16 +5228,16 @@ msgid ""
"Money: %s"
msgstr ""
-#: src/gui/windows/charselectdialog.cpp:289
+#: src/gui/windows/charselectdialog.cpp:311
msgid "Incorrect password"
msgstr ""
#. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:429
+#: src/gui/windows/charselectdialog.cpp:451
msgid "Enter password for deleting character"
msgstr ""
-#: src/gui/windows/charselectdialog.cpp:429
+#: src/gui/windows/charselectdialog.cpp:451
msgid "Enter password:"
msgstr ""
@@ -5604,7 +5645,7 @@ msgstr ""
#. TRANSLATORS: status bar label
#: src/gui/windows/ministatuswindow.cpp:364
-#: src/gui/windows/ministatuswindow.cpp:402
+#: src/gui/windows/ministatuswindow.cpp:401
msgid "Need"
msgstr ""
@@ -5635,7 +5676,7 @@ msgstr ""
#. TRANSLATORS: shop window button
#. TRANSLATORS: trade window button
#: src/gui/windows/npcdialog.cpp:114 src/gui/windows/serverdialog.cpp:121
-#: src/gui/windows/shopwindow.cpp:99 src/gui/windows/shopwindow.cpp:106
+#: src/gui/windows/shopwindow.cpp:98 src/gui/windows/shopwindow.cpp:105
#: src/gui/windows/tradewindow.cpp:83
msgid "Add"
msgstr "Aldoni"
@@ -5798,43 +5839,38 @@ msgid "Reset Windows"
msgstr ""
#. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:80
+#: src/gui/windows/shopwindow.cpp:79
msgid "Personal Shop"
msgstr ""
#. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:95
+#: src/gui/windows/shopwindow.cpp:94
msgid "Buy items"
msgstr ""
#. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:97
+#: src/gui/windows/shopwindow.cpp:96
msgid "Sell items"
msgstr ""
#. TRANSLATORS: shop window label
#. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:110
+#: src/gui/windows/shopwindow.cpp:102 src/gui/windows/shopwindow.cpp:109
msgid "Announce"
msgstr ""
#. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:114
+#: src/gui/windows/shopwindow.cpp:113
msgid "Show links in announce"
msgstr ""
-#. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:176 src/gui/windows/shopwindow.cpp:179
-msgid "Auction"
-msgstr ""
-
#. TRANSLATORS: shop window dialog
#. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:233
+#: src/gui/windows/shopwindow.cpp:776 src/net/ea/tradehandler.cpp:233
msgid "Request for Trade"
msgstr ""
-#: src/gui/windows/shopwindow.cpp:791
+#: src/gui/windows/shopwindow.cpp:776
#, c-format
msgid "%s wants to %s %s do you accept?"
msgstr ""
@@ -6162,27 +6198,27 @@ msgstr ""
msgid "Connecting..."
msgstr ""
-#: src/gui/windows/updaterwindow.cpp:398
+#: src/gui/windows/updaterwindow.cpp:407
msgid "Show all news (can be slow)"
msgstr ""
#. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:824
+#: src/gui/windows/updaterwindow.cpp:833
msgid "##1 The update process is incomplete."
msgstr ""
#. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:826
+#: src/gui/windows/updaterwindow.cpp:835
msgid "##1 It is strongly recommended that"
msgstr ""
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:828
+#: src/gui/windows/updaterwindow.cpp:837
msgid "##1 you try again later."
msgstr ""
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1005
+#: src/gui/windows/updaterwindow.cpp:1021
msgid "Completed"
msgstr ""
@@ -6229,25 +6265,25 @@ msgstr ""
#. TRANSLATORS: long key name. must be short.
#. TRANSLATORS: short key name. must be very short.
#. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:370 src/input/inputmanager.cpp:414
+#: src/input/inputmanager.cpp:371 src/input/inputmanager.cpp:415
#: src/input/keyboardconfig.cpp:104
#, c-format
msgid "key_%d"
msgstr ""
#. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:376
+#: src/input/inputmanager.cpp:377
#, c-format
msgid "JButton%d"
msgstr ""
#. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:391
msgid "unknown key"
msgstr ""
#. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:420
+#: src/input/inputmanager.cpp:421
#, c-format
msgid "JB%d"
msgstr ""
@@ -6255,7 +6291,7 @@ msgstr ""
#. TRANSLATORS: unknown short key type. must be short
#. TRANSLATORS: Unknown key short string.
#. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:434 src/input/keyboardconfig.cpp:148
+#: src/input/inputmanager.cpp:435 src/input/keyboardconfig.cpp:148
msgid "u key"
msgstr ""
@@ -7426,74 +7462,74 @@ msgid "Request to quit denied!"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:135
#, c-format
msgid "Guild name: %s"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:191
+#: src/net/ea/guildhandler.cpp:138
#, c-format
msgid "Guild master: %s"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:141
#, c-format
msgid "Guild level: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:197
+#: src/net/ea/guildhandler.cpp:144
#, c-format
msgid "Online members: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:200
+#: src/net/ea/guildhandler.cpp:147
#, c-format
msgid "Max members: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:203
+#: src/net/ea/guildhandler.cpp:150
#, c-format
msgid "Average level: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:206
+#: src/net/ea/guildhandler.cpp:153
#, c-format
msgid "Guild exp: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:209
+#: src/net/ea/guildhandler.cpp:156
#, c-format
msgid "Guild next exp: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:212
+#: src/net/ea/guildhandler.cpp:159
#, c-format
msgid "Guild castle: %s"
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:179
+#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:191
msgid "Item sharing enabled."
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:183
+#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:195
msgid "Item sharing disabled."
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:187
+#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:199
msgid "Item sharing not possible."
msgstr ""
@@ -7504,19 +7540,19 @@ msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:167
+#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:179
msgid "Experience sharing enabled."
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:171
+#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:183
msgid "Experience sharing disabled."
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:175
+#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:187
msgid "Experience sharing not possible."
msgstr ""
@@ -7621,239 +7657,355 @@ msgid "Connection to server terminated. "
msgstr ""
#. TRANSLATORS: message header
-#: src/net/ea/playerhandler.cpp:257 src/net/ea/playerhandler.cpp:273
-#: src/net/ea/playerhandler.cpp:361
+#: src/net/ea/playerhandler.cpp:192 src/net/ea/playerhandler.cpp:418
+#: src/net/ea/playerhandler.cpp:434
msgid "Message"
msgstr ""
#. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:259
+#: src/net/ea/playerhandler.cpp:420
msgid ""
"You are carrying more than half your weight. You are unable to regain "
"health."
msgstr ""
#. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:275
+#: src/net/ea/playerhandler.cpp:436
msgid "You are carrying less than half your weight. You can regain health."
msgstr ""
+#. TRANSLATORS: char rename error
+#: src/net/eathena/charserverhandler.cpp:516
+#: src/net/eathena/charserverhandler.cpp:553
+msgid "Character rename error."
+msgstr ""
+
+#: src/net/eathena/charserverhandler.cpp:531
+msgid "Character renamed."
+msgstr ""
+
+#. TRANSLATORS: char rename error
+#: src/net/eathena/charserverhandler.cpp:544
+msgid "Rename not allowed."
+msgstr ""
+
+#. TRANSLATORS: char rename error
+#: src/net/eathena/charserverhandler.cpp:548
+msgid "New name is not set."
+msgstr ""
+
+#. TRANSLATORS: char rename error
+#: src/net/eathena/charserverhandler.cpp:557
+msgid "Character not found."
+msgstr ""
+
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:125
+#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:124
#, c-format
msgid "Strength %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:127
+#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:126
#, c-format
msgid "Agility %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:129
+#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:128
#, c-format
msgid "Vitality %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:131
+#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:130
#, c-format
msgid "Intelligence %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:128 src/net/tmwa/generalhandler.cpp:133
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:132
#, c-format
msgid "Dexterity %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:135
+#: src/net/eathena/generalhandler.cpp:128 src/net/tmwa/generalhandler.cpp:134
#, c-format
msgid "Luck %s"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:152 src/net/tmwa/generalhandler.cpp:161
+#: src/net/eathena/generalhandler.cpp:159 src/net/tmwa/generalhandler.cpp:160
msgid "Authentication failed."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:155 src/net/tmwa/generalhandler.cpp:165
+#: src/net/eathena/generalhandler.cpp:162 src/net/tmwa/generalhandler.cpp:164
msgid "No servers available."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:160 src/net/tmwa/generalhandler.cpp:171
+#: src/net/eathena/generalhandler.cpp:167 src/net/tmwa/generalhandler.cpp:170
msgid "Someone else is trying to use this account."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:165 src/net/tmwa/generalhandler.cpp:177
+#: src/net/eathena/generalhandler.cpp:172 src/net/tmwa/generalhandler.cpp:176
msgid "This account is already logged in."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:169 src/net/tmwa/generalhandler.cpp:182
+#: src/net/eathena/generalhandler.cpp:176 src/net/tmwa/generalhandler.cpp:181
msgid "Speed hack detected."
msgstr ""
+#: src/net/eathena/generalhandler.cpp:179
+msgid "Server full."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:182
+msgid "Sorry, you are underaged."
+msgstr ""
+
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:172 src/net/tmwa/generalhandler.cpp:186
+#: src/net/eathena/generalhandler.cpp:185 src/net/tmwa/generalhandler.cpp:185
msgid "Duplicated login."
msgstr ""
+#: src/net/eathena/generalhandler.cpp:188
+msgid "To many connections from same ip."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:191
+msgid "Not paid for this time."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:194
+msgid "Pay suspended."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:197
+msgid "Pay changed."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:200
+msgid "Pay wrong ip."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:203
+msgid "Pay game room."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:206
+msgid "Disconnect forced by GM."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:210
+msgid "Ban japan refuse."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:213
+msgid "Remained other account."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:216
+msgid "Ip unfair."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:219
+msgid "Ip count all."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:222
+msgid "Ip count."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:226
+msgid "Memory."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:229
+msgid "Han valid."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:232
+msgid "Ip limited access."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:235
+msgid "Over characters list."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:238
+msgid "Ip blocked."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:241
+msgid "Invalid password count."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:244
+msgid "Not allowed race."
+msgstr ""
+
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:175 src/net/tmwa/generalhandler.cpp:190
+#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:189
msgid "Unknown connection error."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:280
+#: src/net/eathena/generalhandler.cpp:323 src/net/tmwa/generalhandler.cpp:279
msgid "Got disconnected from server!"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:282 src/net/tmwa/generalhandler.cpp:308
+#: src/net/eathena/generalhandler.cpp:348 src/net/tmwa/generalhandler.cpp:307
msgid "Strength"
msgstr "Forto"
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:310
+#: src/net/eathena/generalhandler.cpp:349 src/net/tmwa/generalhandler.cpp:309
msgid "Agility"
msgstr "Rapideco"
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:284 src/net/tmwa/generalhandler.cpp:312
+#: src/net/eathena/generalhandler.cpp:350 src/net/tmwa/generalhandler.cpp:311
msgid "Vitality"
msgstr ""
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:285 src/net/tmwa/generalhandler.cpp:314
+#: src/net/eathena/generalhandler.cpp:352 src/net/tmwa/generalhandler.cpp:314
msgid "Intelligence"
msgstr "Lerteco"
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:286 src/net/tmwa/generalhandler.cpp:316
+#: src/net/eathena/generalhandler.cpp:353 src/net/tmwa/generalhandler.cpp:316
msgid "Dexterity"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:287 src/net/tmwa/generalhandler.cpp:318
+#: src/net/eathena/generalhandler.cpp:354 src/net/tmwa/generalhandler.cpp:318
msgid "Luck"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:290 src/net/tmwa/generalhandler.cpp:323
+#: src/net/eathena/generalhandler.cpp:357 src/net/tmwa/generalhandler.cpp:322
msgid "Defense"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:291 src/net/tmwa/generalhandler.cpp:325
+#: src/net/eathena/generalhandler.cpp:358 src/net/tmwa/generalhandler.cpp:324
msgid "M.Attack"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:292 src/net/tmwa/generalhandler.cpp:327
+#: src/net/eathena/generalhandler.cpp:359 src/net/tmwa/generalhandler.cpp:326
msgid "M.Defense"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:294 src/net/tmwa/generalhandler.cpp:330
+#: src/net/eathena/generalhandler.cpp:361 src/net/tmwa/generalhandler.cpp:329
#, no-c-format
msgid "% Accuracy"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:296 src/net/tmwa/generalhandler.cpp:333
+#: src/net/eathena/generalhandler.cpp:363 src/net/tmwa/generalhandler.cpp:332
#, no-c-format
msgid "% Evade"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:298 src/net/tmwa/generalhandler.cpp:336
+#: src/net/eathena/generalhandler.cpp:365 src/net/tmwa/generalhandler.cpp:335
#, no-c-format
msgid "% Critical"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:299 src/net/tmwa/generalhandler.cpp:338
+#: src/net/eathena/generalhandler.cpp:366 src/net/tmwa/generalhandler.cpp:337
msgid "Attack Delay"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:300 src/net/tmwa/generalhandler.cpp:340
+#: src/net/eathena/generalhandler.cpp:367 src/net/tmwa/generalhandler.cpp:339
msgid "Walk Delay"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:301 src/net/tmwa/generalhandler.cpp:342
+#: src/net/eathena/generalhandler.cpp:368 src/net/tmwa/generalhandler.cpp:341
msgid "Attack Range"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:302 src/net/tmwa/generalhandler.cpp:344
+#: src/net/eathena/generalhandler.cpp:369 src/net/tmwa/generalhandler.cpp:343
msgid "Damage per sec."
msgstr ""
-#: src/net/eathena/skillhandler.cpp:228 src/net/eathena/skillhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:370
+msgid "Karma"
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:371
+msgid "Manner"
+msgstr ""
+
+#: src/net/eathena/skillhandler.cpp:304 src/net/eathena/skillhandler.cpp:364
#, c-format
msgid "Unknown skill error: %d"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:235 src/net/tmwa/skillhandler.cpp:224
+#: src/net/eathena/skillhandler.cpp:311 src/net/tmwa/skillhandler.cpp:224
msgid "You have not yet reached a high enough lvl!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:239 src/net/tmwa/skillhandler.cpp:228
+#: src/net/eathena/skillhandler.cpp:315 src/net/tmwa/skillhandler.cpp:228
msgid "Insufficient HP!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:243 src/net/tmwa/skillhandler.cpp:232
+#: src/net/eathena/skillhandler.cpp:319 src/net/tmwa/skillhandler.cpp:232
msgid "Insufficient SP!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:247 src/net/tmwa/skillhandler.cpp:236
+#: src/net/eathena/skillhandler.cpp:323 src/net/tmwa/skillhandler.cpp:236
msgid "You have no memos!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:251 src/net/tmwa/skillhandler.cpp:240
+#: src/net/eathena/skillhandler.cpp:327 src/net/tmwa/skillhandler.cpp:240
msgid "You cannot do that right now!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:255 src/net/tmwa/skillhandler.cpp:244
+#: src/net/eathena/skillhandler.cpp:331 src/net/tmwa/skillhandler.cpp:244
msgid "Seems you need more money... ;-)"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:259 src/net/tmwa/skillhandler.cpp:248
+#: src/net/eathena/skillhandler.cpp:335 src/net/tmwa/skillhandler.cpp:248
msgid "You cannot use this skill with that kind of weapon!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:264 src/net/tmwa/skillhandler.cpp:253
+#: src/net/eathena/skillhandler.cpp:340 src/net/tmwa/skillhandler.cpp:253
msgid "You need another red gem!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:268 src/net/tmwa/skillhandler.cpp:257
+#: src/net/eathena/skillhandler.cpp:344 src/net/tmwa/skillhandler.cpp:257
msgid "You need another blue gem!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:272 src/net/tmwa/skillhandler.cpp:261
+#: src/net/eathena/skillhandler.cpp:348 src/net/tmwa/skillhandler.cpp:261
msgid "You're carrying to much to do this!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:276 src/net/tmwa/skillhandler.cpp:265
+#: src/net/eathena/skillhandler.cpp:352 src/net/tmwa/skillhandler.cpp:265
msgid "Huh? What's that?"
msgstr ""
@@ -7870,32 +8022,32 @@ msgid "%s wants to trade with you, do you accept?"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:349
+#: src/net/tmwa/charserverhandler.cpp:351
msgid "Strength:"
msgstr "Forto:"
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:351
+#: src/net/tmwa/charserverhandler.cpp:353
msgid "Agility:"
msgstr "Rapideco:"
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:353
+#: src/net/tmwa/charserverhandler.cpp:355
msgid "Vitality:"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:355
+#: src/net/tmwa/charserverhandler.cpp:357
msgid "Intelligence:"
msgstr "Lerteco:"
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:357
+#: src/net/tmwa/charserverhandler.cpp:359
msgid "Dexterity:"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:359
+#: src/net/tmwa/charserverhandler.cpp:361
msgid "Luck:"
msgstr ""
@@ -8206,269 +8358,306 @@ msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:143
+msgid "You cant left party on this map."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:147
+msgid "You was kicked from party."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:151
+msgid "You cant be kicked kicked from party on this map."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:155
#, c-format
msgid "%s has joined your party."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:147
+#: src/resources/notifications.h:159
#, c-format
msgid "%s is already a member of a party."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:151
+#: src/resources/notifications.h:163
#, c-format
msgid "%s refused your invitation."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:155
+#: src/resources/notifications.h:167
#, c-format
msgid "%s is now a member of your party."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:159
+#: src/resources/notifications.h:171
#, c-format
msgid "%s can't join your party because party is full."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:163
+#: src/resources/notifications.h:175
#, c-format
msgid "QQQ Unknown invite response for %s."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:191
+#: src/resources/notifications.h:203
#, c-format
msgid "%s has left your party."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:195
+#: src/resources/notifications.h:207 src/resources/notifications.h:215
+#, c-format
+msgid "%s cant be kicked from party on this map."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:211
+#, c-format
+msgid "%s has kicked from your party."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:219
#, c-format
msgid "An unknown member tried to say: %s"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:199
+#: src/resources/notifications.h:223
#, c-format
msgid "%s is not in your party!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:203
+#: src/resources/notifications.h:227
#, c-format
msgid "You picked up %s."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:207
+#: src/resources/notifications.h:231
#, c-format
msgid "You spent %s."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:211
+#: src/resources/notifications.h:235
msgid "Cannot raise skill!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:215
+#: src/resources/notifications.h:239
msgid "Equip ammunition first."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:219
+#: src/resources/notifications.h:243
#, c-format
msgid "Trading with %s isn't possible. Trade partner is too far away."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:224
+#: src/resources/notifications.h:248
#, c-format
msgid "Trading with %s isn't possible. Character doesn't exist."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:228
+#: src/resources/notifications.h:252
msgid "Trade cancelled due to an unknown reason."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:232
+#: src/resources/notifications.h:256
#, c-format
msgid "Trade with %s cancelled."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:236
+#: src/resources/notifications.h:260
#, c-format
msgid "Unhandled trade cancel packet with %s"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:240
+#: src/resources/notifications.h:264
msgid "Failed adding item. Trade partner is over weighted."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:244
+#: src/resources/notifications.h:268
msgid "Failed adding item. Trade partner has no free slot."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:248
+#: src/resources/notifications.h:272
msgid "Failed adding item. You can't trade this item."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:252
+#: src/resources/notifications.h:276
msgid "Failed adding item for unknown reason."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:256
+#: src/resources/notifications.h:280
msgid "Trade canceled."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:260
+#: src/resources/notifications.h:284
msgid "Trade completed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:264
+#: src/resources/notifications.h:288
msgid "Kick failed!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:268
+#: src/resources/notifications.h:292
msgid "Kick succeeded!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:272
+#: src/resources/notifications.h:296
#, c-format
msgid "MVP player: %s"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:276
+#: src/resources/notifications.h:300
msgid "All whispers ignored."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:280
+#: src/resources/notifications.h:304
msgid "All whispers ignore failed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:284
+#: src/resources/notifications.h:308
msgid "All whispers unignored."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:288
+#: src/resources/notifications.h:312
msgid "All whispers unignore failed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:295
+#: src/resources/notifications.h:319
msgid "pvp off, gvg off"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:299
+#: src/resources/notifications.h:323
msgid "pvp on"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:303
+#: src/resources/notifications.h:327
msgid "gvg on"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:307
+#: src/resources/notifications.h:331
msgid "pvp on, gvg on"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:311
+#: src/resources/notifications.h:335
msgid "unknown pvp"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:315
+#: src/resources/notifications.h:339
#, c-format
msgid "Char from account %s is already in your party!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:319
+#: src/resources/notifications.h:343
#, c-format
msgid "%s blocked invite!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:323
+#: src/resources/notifications.h:347
msgid "Char is not online!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:327
+#: src/resources/notifications.h:351
msgid "Pet catch failed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:331
+#: src/resources/notifications.h:355
msgid "Pet catched."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:335
+#: src/resources/notifications.h:359
#, c-format
msgid "Pet catch unkown error: %d."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:339
+#: src/resources/notifications.h:363
msgid "Your mercenary duty hour is over."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:343
+#: src/resources/notifications.h:367
msgid "Your mercenary was killed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:347
+#: src/resources/notifications.h:371
msgid "Your mercenary was fired."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:351
+#: src/resources/notifications.h:375
msgid "Your mercenary run away."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:355
+#: src/resources/notifications.h:379
msgid "Mercenary unknown state."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:359
-msgid "Your feed your homunculus."
+#: src/resources/notifications.h:383
+msgid "You feed your homunculus."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:363
+#: src/resources/notifications.h:387
#, c-format
msgid "You cant feed homunculus, because not have %s."
msgstr ""
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:391
+msgid "Card insert failed."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:395
+msgid "Card inserted."
+msgstr ""
+
#. TRANSLATORS: chat option changed message
#: src/utils/booleanoptions.h:27
#, c-format
diff --git a/po/es.po b/po/es.po
index f58b42875..10aed7a41 100644
--- a/po/es.po
+++ b/po/es.po
@@ -19,9 +19,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-10-08 01:19+0300\n"
-"PO-Revision-Date: 2014-10-03 03:54+0000\n"
-"Last-Translator: Nelson Martell <nelson6e65-manaplus@yahoo.es>\n"
+"POT-Creation-Date: 2014-10-10 00:16+0300\n"
+"PO-Revision-Date: 2014-10-08 10:02+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/manaplus/"
"language/es/)\n"
"Language: es\n"
@@ -2561,9 +2561,8 @@ msgstr ""
#. TRANSLATORS: palette color
#: src/gui/userpalette.cpp:223
-#, fuzzy
msgid "Mercenary"
-msgstr "Apuntar a mercenario"
+msgstr ""
#. TRANSLATORS: palette color
#: src/gui/userpalette.cpp:225
@@ -5197,15 +5196,13 @@ msgstr "Cuenta %s (fecha de último inicio %s)"
#. TRANSLATORS: char select dialog. button.
#: src/gui/windows/charselectdialog.cpp:73
-#, fuzzy
msgid "Switch"
-msgstr "Volver al Login"
+msgstr ""
#. TRANSLATORS: char select dialog. button.
#: src/gui/windows/charselectdialog.cpp:75
-#, fuzzy
msgid "Password"
-msgstr "Contraseña:"
+msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: updater window button
@@ -5249,9 +5246,8 @@ msgid "Please set new pincode"
msgstr ""
#: src/gui/windows/charselectdialog.cpp:240
-#, fuzzy
msgid "Please enter new name"
-msgstr "Por favor, especifique un nombre."
+msgstr ""
#. TRANSLATORS: char select dialog. player info message.
#: src/gui/windows/charselectdialog.cpp:259
@@ -5910,7 +5906,7 @@ msgstr "Mostrar enlaces en el anuncio"
#. TRANSLATORS: shop window dialog
#. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:776 src/net/ea/tradehandler.cpp:233
+#: src/gui/windows/shopwindow.cpp:776 src/net/ea/tradehandler.cpp:192
msgid "Request for Trade"
msgstr "Propuesta de intercambio"
@@ -7567,19 +7563,19 @@ msgstr "Castillo del gremio: %s"
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:191
+#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:207
msgid "Item sharing enabled."
msgstr "Compartir artículos habilitado."
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:195
+#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:211
msgid "Item sharing disabled."
msgstr "Compartir artículos deshabilitado."
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:199
+#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:215
msgid "Item sharing not possible."
msgstr "No se puede compartir artículos."
@@ -7590,19 +7586,19 @@ msgstr "Compartir artículos desconocido."
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:179
+#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:195
msgid "Experience sharing enabled."
msgstr "Compartir experiencia habilitado."
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:183
+#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:199
msgid "Experience sharing disabled."
msgstr "Compartir experiencia deshabilitado."
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:187
+#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:203
msgid "Experience sharing not possible."
msgstr "No se puede compartir experiencia."
@@ -7733,14 +7729,12 @@ msgstr ""
#. TRANSLATORS: char rename error
#: src/net/eathena/charserverhandler.cpp:516
#: src/net/eathena/charserverhandler.cpp:553
-#, fuzzy
msgid "Character rename error."
-msgstr "Personaje borrado."
+msgstr ""
#: src/net/eathena/charserverhandler.cpp:531
-#, fuzzy
msgid "Character renamed."
-msgstr "Personaje borrado."
+msgstr ""
#. TRANSLATORS: char rename error
#: src/net/eathena/charserverhandler.cpp:544
@@ -7754,9 +7748,8 @@ msgstr ""
#. TRANSLATORS: char rename error
#: src/net/eathena/charserverhandler.cpp:557
-#, fuzzy
msgid "Character not found."
-msgstr "Puntos del personaje: %d"
+msgstr ""
#. TRANSLATORS: player stat
#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:124
@@ -7820,9 +7813,8 @@ msgid "Speed hack detected."
msgstr "Speed hack detectado."
#: src/net/eathena/generalhandler.cpp:179
-#, fuzzy
msgid "Server full."
-msgstr "Servidor:"
+msgstr ""
#: src/net/eathena/generalhandler.cpp:182
msgid "Sorry, you are underaged."
@@ -7894,18 +7886,16 @@ msgid "Ip limited access."
msgstr ""
#: src/net/eathena/generalhandler.cpp:235
-#, fuzzy
msgid "Over characters list."
-msgstr "Personaje borrado."
+msgstr ""
#: src/net/eathena/generalhandler.cpp:238
msgid "Ip blocked."
msgstr ""
#: src/net/eathena/generalhandler.cpp:241
-#, fuzzy
msgid "Invalid password count."
-msgstr "Contraseña anterior incorrecta."
+msgstr ""
#: src/net/eathena/generalhandler.cpp:244
msgid "Not allowed race."
@@ -8072,13 +8062,13 @@ msgid "Huh? What's that?"
msgstr "¿Uh? ¿Qué es eso?"
#. TRANSLATORS: trade header
-#: src/net/ea/tradehandler.cpp:100
+#: src/net/ea/tradehandler.cpp:105
#, c-format
msgid "Trade: You and %s"
msgstr "Intercambio: Tú y %s"
#. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:235
+#: src/net/ea/tradehandler.cpp:194
#, c-format
msgid "%s wants to trade with you, do you accept?"
msgstr "%s quiere realizar un intercambio contigo, ¿aceptas?"
@@ -8297,430 +8287,454 @@ msgstr "Incapaz de comprar."
#. TRANSLATORS: notification message
#: src/resources/notifications.h:47
+#, fuzzy
+msgid "Unable to buy. You not have enought money."
+msgstr "No tienes suficiente dinero."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:51
+#, fuzzy
+msgid "Unable to buy. You overweight."
+msgstr "Incapaz de comprar."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:55
+msgid "Unable to buy. You have too many items."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:59
msgid "Nothing to sell."
msgstr "Nada para vender."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:51
+#: src/resources/notifications.h:63
msgid "Thanks for selling."
msgstr "Gracias por vender."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:55
+#: src/resources/notifications.h:67
msgid "Unable to sell."
msgstr "Incapaz de vender."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:59
+#: src/resources/notifications.h:71
msgid "Unable to sell while trading."
msgstr "Incapaz de vender mientras intercambia."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:63
+#: src/resources/notifications.h:75
msgid "Unable to sell unsellable item."
msgstr "Incapaz de vender artículo invendible."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:67
+#: src/resources/notifications.h:79
#, c-format
msgid "Online users: %d"
msgstr "Jugadores conectados: %d"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:71
+#: src/resources/notifications.h:83
msgid "Guild created."
msgstr "Gremio creado."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:75
+#: src/resources/notifications.h:87
msgid "You are already in guild."
msgstr "Ya estás en el gremio."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:79
+#: src/resources/notifications.h:91
msgid "Emperium check failed."
msgstr "La verificación del Imperio ha fallado."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:83
+#: src/resources/notifications.h:95
msgid "Unknown server response."
msgstr "Respuesta del servidor desconocida."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:87
+#: src/resources/notifications.h:99
msgid "You have left the guild."
msgstr "Has dejado el gremio."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:91
+#: src/resources/notifications.h:103
msgid "Could not invite user to guild."
msgstr "No se puede invitar al usuario al gremio."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:95
+#: src/resources/notifications.h:107
msgid "User rejected guild invite."
msgstr "El jugador ha rechazado la invitación al gremio."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:99
+#: src/resources/notifications.h:111
msgid "User is now part of your guild."
msgstr "El usuario ahora es parte de tu gremio."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:103
+#: src/resources/notifications.h:115
msgid "Your guild is full."
msgstr "Tu gremio está lleno."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:107
+#: src/resources/notifications.h:119
msgid "Unknown guild invite response."
msgstr "Respuesta desconocida a invitación de gremio."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:111
+#: src/resources/notifications.h:123
#, c-format
msgid "%s has left your guild."
msgstr "%s ha dejado tu gremio."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:115
+#: src/resources/notifications.h:127
msgid "You were kicked from guild."
msgstr "Fuiste expulsado del gremio."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:119
+#: src/resources/notifications.h:131
#, c-format
msgid "%s has kicked from your guild."
msgstr "%s ha sido expulsado de tu gremio."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:123
+#: src/resources/notifications.h:135
msgid "Failed to use item."
msgstr "Fallo al usar el artículo."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:127
+#: src/resources/notifications.h:139
msgid "Unable to equip."
msgstr "Imposible equipar."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:131
+#: src/resources/notifications.h:143
+msgid "Unable to equip because you have wrong level."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:147
msgid "Could not create party."
msgstr "No es posible crear un grupo."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:135
+#: src/resources/notifications.h:151
msgid "Party successfully created."
msgstr "Grupo creado."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:139
+#: src/resources/notifications.h:155
msgid "You have left the party."
msgstr "Has dejado el grupo."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:143
-#, fuzzy
+#: src/resources/notifications.h:159
msgid "You cant left party on this map."
-msgstr "Has dejado el grupo."
+msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:147
-#, fuzzy
+#: src/resources/notifications.h:163
msgid "You was kicked from party."
-msgstr "Fuiste expulsado del gremio."
+msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:151
-msgid "You cant be kicked kicked from party on this map."
+#: src/resources/notifications.h:167
+msgid "You cant be kicked from party on this map."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:155
+#: src/resources/notifications.h:171
#, c-format
msgid "%s has joined your party."
msgstr "%s se ha unido a tu grupo."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:159
+#: src/resources/notifications.h:175
#, c-format
msgid "%s is already a member of a party."
msgstr "%s ya es miembro de un grupo."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:163
+#: src/resources/notifications.h:179
#, c-format
msgid "%s refused your invitation."
msgstr "%s ha rechazado tu invitación."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:167
+#: src/resources/notifications.h:183
#, c-format
msgid "%s is now a member of your party."
msgstr "%s ahora es un miembro de tu grupo."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:171
+#: src/resources/notifications.h:187
#, c-format
msgid "%s can't join your party because party is full."
msgstr "%s no puede unirse a tu grupo porque el grupo está lleno."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:175
+#: src/resources/notifications.h:191
#, c-format
msgid "QQQ Unknown invite response for %s."
msgstr "QQQ Respuesta desconocida a la invitación de %s."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:203
+#: src/resources/notifications.h:219
#, c-format
msgid "%s has left your party."
msgstr "%s ha dejado tu grupo."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:207 src/resources/notifications.h:215
-#, fuzzy, c-format
+#: src/resources/notifications.h:223 src/resources/notifications.h:231
+#, c-format
msgid "%s cant be kicked from party on this map."
-msgstr "%s ha sido expulsado de tu gremio."
+msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:211
-#, fuzzy, c-format
+#: src/resources/notifications.h:227
+#, c-format
msgid "%s has kicked from your party."
-msgstr "%s ha sido expulsado de tu gremio."
+msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:219
+#: src/resources/notifications.h:235
#, c-format
msgid "An unknown member tried to say: %s"
msgstr "Un miembro desconocido intentó decir: %s"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:223
+#: src/resources/notifications.h:239
#, c-format
msgid "%s is not in your party!"
msgstr "¡%s no está en tu grupo!"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:227
+#: src/resources/notifications.h:243
#, c-format
msgid "You picked up %s."
msgstr "Has recogido %s."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:231
+#: src/resources/notifications.h:247
#, c-format
msgid "You spent %s."
msgstr "Has gastado %s."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:235
+#: src/resources/notifications.h:251
msgid "Cannot raise skill!"
msgstr "¡Imposible incrementar!"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:239
+#: src/resources/notifications.h:255
msgid "Equip ammunition first."
msgstr "Primero equipe las municiones."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:243
+#: src/resources/notifications.h:259
#, c-format
msgid "Trading with %s isn't possible. Trade partner is too far away."
msgstr "El intercambio con %s no es posible. El otro personaje está muy lejos."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:248
+#: src/resources/notifications.h:264
#, c-format
msgid "Trading with %s isn't possible. Character doesn't exist."
msgstr "El intercambio con %s no es posible. El personaje no existe."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:252
+#: src/resources/notifications.h:268
msgid "Trade cancelled due to an unknown reason."
msgstr "Intercambio cancelado por una razón desconocida."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:256
+#: src/resources/notifications.h:272
#, c-format
msgid "Trade with %s cancelled."
msgstr "Intercambio con %s cancelado."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:260
+#: src/resources/notifications.h:276
+#, fuzzy, c-format
+msgid "Trade with %s cancelled, because player is busy"
+msgstr "Intercambio con %s cancelado."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:280
#, c-format
msgid "Unhandled trade cancel packet with %s"
msgstr "Cancelar paquete de intercambio sin controlar con %s"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:264
+#: src/resources/notifications.h:284
msgid "Failed adding item. Trade partner is over weighted."
msgstr "Error al añadir objeto. El otro jugador lleva mucho peso."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:268
+#: src/resources/notifications.h:288
msgid "Failed adding item. Trade partner has no free slot."
msgstr "Error al añadir objeto. El otro jugador no tiene más espacio."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:272
+#: src/resources/notifications.h:292
msgid "Failed adding item. You can't trade this item."
msgstr "Fallo al agregar artículo. No puedes intercambiar este artículo."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:276
+#: src/resources/notifications.h:296
msgid "Failed adding item for unknown reason."
msgstr "Fallo al añaadir objeto por una razón desconocida."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:280
+#: src/resources/notifications.h:300
msgid "Trade canceled."
msgstr "Intercambio cancelado."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:284
+#: src/resources/notifications.h:304
msgid "Trade completed."
msgstr "Intercambio completado."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:288
+#: src/resources/notifications.h:308
msgid "Kick failed!"
msgstr "¡Expulsión fallida!"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:292
+#: src/resources/notifications.h:312
msgid "Kick succeeded!"
msgstr "¡Expulsión exitosa!"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:296
+#: src/resources/notifications.h:316
#, c-format
msgid "MVP player: %s"
msgstr "MVP de jugador: %s"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:300
+#: src/resources/notifications.h:320
msgid "All whispers ignored."
msgstr "Todos los susurros ignorados."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:304
+#: src/resources/notifications.h:324
msgid "All whispers ignore failed."
msgstr "Ignorar todos los susurros ha fallado."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:308
+#: src/resources/notifications.h:328
msgid "All whispers unignored."
msgstr "Todos los susurros sin ignorar."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:312
+#: src/resources/notifications.h:332
msgid "All whispers unignore failed."
msgstr "Dejar de Ignorar todos los susurros ha fallado."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:319
+#: src/resources/notifications.h:339
msgid "pvp off, gvg off"
msgstr "pvp desactivado, gvg desactivado"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:323
+#: src/resources/notifications.h:343
msgid "pvp on"
msgstr "pvp activado"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:327
+#: src/resources/notifications.h:347
msgid "gvg on"
msgstr "gvg activado"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:331
+#: src/resources/notifications.h:351
msgid "pvp on, gvg on"
msgstr "pvp activado, gvg activado"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:335
+#: src/resources/notifications.h:355
msgid "unknown pvp"
msgstr "pvp desconocido"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:339
+#: src/resources/notifications.h:359
#, c-format
msgid "Char from account %s is already in your party!"
msgstr "¡Ya el personaje de la cuenta %s está en tu grupo!"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:343
+#: src/resources/notifications.h:363
#, c-format
msgid "%s blocked invite!"
msgstr "¡%s bloqueó la invitación!"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:347
+#: src/resources/notifications.h:367
msgid "Char is not online!"
msgstr "¡El personaje no está en línea!"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:351
+#: src/resources/notifications.h:371
msgid "Pet catch failed."
msgstr "Captura fallida de mascota."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:355
+#: src/resources/notifications.h:375
msgid "Pet catched."
msgstr "Mascota capturada."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:359
+#: src/resources/notifications.h:379
#, c-format
msgid "Pet catch unkown error: %d."
msgstr "Error desconocido en captura de mascota: %d."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:363
+#: src/resources/notifications.h:383
msgid "Your mercenary duty hour is over."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:367
+#: src/resources/notifications.h:387
msgid "Your mercenary was killed."
msgstr "Tu mercenario fue asesinado."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:371
+#: src/resources/notifications.h:391
msgid "Your mercenary was fired."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:375
+#: src/resources/notifications.h:395
msgid "Your mercenary run away."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:379
+#: src/resources/notifications.h:399
msgid "Mercenary unknown state."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:383
-#, fuzzy
+#: src/resources/notifications.h:403
msgid "You feed your homunculus."
-msgstr "Alimentaste a tu homúnculo."
+msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:387
+#: src/resources/notifications.h:407
#, c-format
msgid "You cant feed homunculus, because not have %s."
msgstr "No puedes alimentar al homúnculo, porque no tienes %s."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:391
-#, fuzzy
+#: src/resources/notifications.h:411
msgid "Card insert failed."
-msgstr "¡Fallo al intercambiar!"
+msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:395
+#: src/resources/notifications.h:415
msgid "Card inserted."
msgstr ""
@@ -8730,9 +8744,3 @@ msgstr ""
msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
msgstr ""
"Opciones para /%s son \"yes\" | \"no\", \"true\" | \"false\", \"1\" | \"0\"."
-
-#~ msgid "Enable auction bot support"
-#~ msgstr "Habilitar soporte para el bot 'AuctionBot'"
-
-#~ msgid "Auction"
-#~ msgstr "Subasta"
diff --git a/po/et.po b/po/et.po
index 0a8e7fb03..6bac58d9a 100644
--- a/po/et.po
+++ b/po/et.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-27 13:23+0300\n"
-"PO-Revision-Date: 2014-09-28 10:01+0000\n"
+"POT-Creation-Date: 2014-10-08 01:19+0300\n"
+"PO-Revision-Date: 2014-10-08 10:01+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Estonian (http://www.transifex.com/projects/p/manaplus/language/et/)\n"
"MIME-Version: 1.0\n"
@@ -32,7 +32,7 @@ msgstr ""
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:131 src/client.cpp:1463 src/client.cpp:1490
+#: src/actions/actions.cpp:131 src/client.cpp:1461 src/client.cpp:1488
#: src/gamemodifiers.cpp:423 src/gui/widgets/tabs/setup_input.cpp:163
#: src/gui/widgets/tabs/setup_theme.cpp:312
#: src/gui/widgets/tabs/setup_theme.cpp:343
@@ -43,8 +43,8 @@ msgstr ""
#: src/gui/windows/changeemaildialog.cpp:170
#: src/gui/windows/changepassworddialog.cpp:160
#: src/gui/windows/charcreatedialog.cpp:373
-#: src/gui/windows/charselectdialog.cpp:255
-#: src/gui/windows/charselectdialog.cpp:291 src/gui/windows/editdialog.cpp:49
+#: src/gui/windows/charselectdialog.cpp:277
+#: src/gui/windows/charselectdialog.cpp:313 src/gui/windows/editdialog.cpp:49
#: src/gui/windows/editserverdialog.cpp:61
#: src/gui/windows/editserverdialog.cpp:208
#: src/gui/windows/itemamountwindow.cpp:158 src/gui/windows/quitdialog.cpp:70
@@ -52,7 +52,9 @@ msgstr ""
#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
#: src/net/ea/charserverhandler.cpp:143 src/net/ea/charserverhandler.cpp:162
#: src/net/ea/charserverhandler.cpp:175 src/net/ea/gamehandler.cpp:79
-#: src/net/ea/playerhandler.cpp:263 src/net/ea/playerhandler.cpp:279
+#: src/net/ea/playerhandler.cpp:424 src/net/ea/playerhandler.cpp:440
+#: src/net/eathena/charserverhandler.cpp:533
+#: src/net/eathena/charserverhandler.cpp:563
msgid "OK"
msgstr ""
@@ -176,7 +178,7 @@ msgstr ""
#. TRANSLATORS: party invite message
#. TRANSLATORS: change relation
-#: src/actions/chat.cpp:303 src/actions/commands.cpp:65
+#: src/actions/chat.cpp:303 src/actions/commands.cpp:64
msgid "Please specify a name."
msgstr ""
@@ -199,75 +201,75 @@ msgid "Message now closes chat."
msgstr ""
#. TRANSLATORS: change relation
-#: src/actions/commands.cpp:108
+#: src/actions/commands.cpp:107
#, c-format
msgid "Player already %s!"
msgstr ""
#. TRANSLATORS: change relation
-#: src/actions/commands.cpp:120
+#: src/actions/commands.cpp:119
#, c-format
msgid "Player successfully %s!"
msgstr ""
#. TRANSLATORS: change relation
-#: src/actions/commands.cpp:122
+#: src/actions/commands.cpp:121
#, c-format
msgid "Player could not be %s!"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:153
+#: src/actions/commands.cpp:152
msgid "Player wasn't ignored!"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:162
+#: src/actions/commands.cpp:161
msgid "Player no longer ignored!"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:164
+#: src/actions/commands.cpp:163
msgid "Player could not be unignored!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/actions/commands.cpp:179
+#: src/actions/commands.cpp:178
msgid "Player already erased!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/actions/commands.cpp:192
+#: src/actions/commands.cpp:191
msgid "Player no longer erased!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/actions/commands.cpp:194
+#: src/actions/commands.cpp:193
msgid "Player could not be erased!"
msgstr ""
#. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:201
+#: src/actions/commands.cpp:200
msgid "friend"
msgstr ""
#. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:208
+#: src/actions/commands.cpp:207
msgid "disregarded"
msgstr ""
#. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:215
+#: src/actions/commands.cpp:214
msgid "neutral"
msgstr ""
#. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:222
+#: src/actions/commands.cpp:221
msgid "blacklisted"
msgstr ""
#. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:229
+#: src/actions/commands.cpp:228
msgid "enemy"
msgstr ""
@@ -282,77 +284,77 @@ msgid "Accepting incoming trade requests"
msgstr ""
#. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1306
+#: src/actormanager.cpp:1310
msgid "Visible on map"
msgstr ""
#. TRANSLATORS: default race name
-#: src/being/being.cpp:389
+#: src/being/being.cpp:393
msgid "Human"
msgstr ""
-#: src/being/being.cpp:556
+#: src/being/being.cpp:560
msgid "dodge"
msgstr ""
-#: src/being/being.cpp:556
+#: src/being/being.cpp:560
msgid "miss"
msgstr ""
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1865 src/gui/windows/whoisonline.cpp:855
+#: src/being/being.cpp:1869 src/gui/windows/whoisonline.cpp:855
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1870 src/gui/windows/whoisonline.cpp:860
+#: src/being/being.cpp:1874 src/gui/windows/whoisonline.cpp:860
msgid "I"
msgstr ""
#. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:379
+#: src/being/localplayer.cpp:380
#, c-format
msgid "You were killed by %s"
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:824
+#: src/being/localplayer.cpp:825
msgid "Tried to pick up nonexistent item."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:828
+#: src/being/localplayer.cpp:829
msgid "Item is too heavy."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:832
+#: src/being/localplayer.cpp:833
msgid "Item is too far away."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:836
+#: src/being/localplayer.cpp:837
msgid "Inventory is full."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:840
+#: src/being/localplayer.cpp:841
msgid "Stack is too big."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:844
+#: src/being/localplayer.cpp:845
msgid "Item belongs to someone else."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:848
+#: src/being/localplayer.cpp:849
msgid "Unknown problem picking up item."
msgstr ""
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:872
+#: src/being/localplayer.cpp:873
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -361,43 +363,43 @@ msgstr[1] ""
#. TRANSLATORS: this is normal experience
#. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1054 src/being/localplayer.cpp:1055
-#: src/being/localplayer.cpp:1091
+#: src/being/localplayer.cpp:1055 src/being/localplayer.cpp:1056
+#: src/being/localplayer.cpp:1092
msgid "xp"
msgstr ""
#. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1059 src/being/localplayer.cpp:1065
-#: src/being/localplayer.cpp:1071
+#: src/being/localplayer.cpp:1060 src/being/localplayer.cpp:1066
+#: src/being/localplayer.cpp:1072
msgid "job"
msgstr ""
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2794
+#: src/being/localplayer.cpp:2795
#, c-format
msgid "Follow: %s"
msgstr ""
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2800 src/being/localplayer.cpp:2825
+#: src/being/localplayer.cpp:2801 src/being/localplayer.cpp:2826
msgid "Follow canceled"
msgstr ""
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2810
+#: src/being/localplayer.cpp:2811
#, c-format
msgid "Imitation: %s"
msgstr ""
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2816 src/being/localplayer.cpp:2830
+#: src/being/localplayer.cpp:2817 src/being/localplayer.cpp:2831
msgid "Imitation canceled"
msgstr ""
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3180
+#: src/being/localplayer.cpp:3181
#, c-format
msgid "You see %s"
msgstr ""
@@ -435,37 +437,37 @@ msgstr ""
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:920 src/gui/windowmenu.cpp:162
+#: src/client.cpp:918 src/gui/windowmenu.cpp:162
#: src/gui/windows/setupwindow.cpp:62
msgid "Setup"
msgstr ""
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:923 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:921 src/gui/widgets/tabs/setup_perfomance.cpp:54
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:926 src/gui/widgets/tabs/setup_video.cpp:105
+#: src/client.cpp:924 src/gui/widgets/tabs/setup_video.cpp:105
msgid "Video"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:929 src/gui/widgets/tabs/setup_theme.cpp:122
+#: src/client.cpp:927 src/gui/widgets/tabs/setup_theme.cpp:122
msgid "Theme"
msgstr ""
#. TRANSLATORS: theme tab quick button
-#: src/client.cpp:932
+#: src/client.cpp:930
msgid "About"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:935 src/gui/windowmenu.cpp:74
+#: src/client.cpp:933 src/gui/windowmenu.cpp:74
#: src/gui/windows/helpwindow.cpp:53
msgid "Help"
msgstr "Abi"
@@ -481,42 +483,42 @@ msgstr "Abi"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:939 src/client.cpp:1391 src/client.cpp:1405
+#: src/client.cpp:937 src/client.cpp:1389 src/client.cpp:1403
#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:691
#: src/gui/popups/popupmenu.cpp:923 src/gui/windows/didyouknowwindow.cpp:81
#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:74
#: src/gui/windows/npcdialog.cpp:112 src/gui/windows/questswindow.cpp:77
-#: src/gui/windows/shopwindow.cpp:84
+#: src/gui/windows/shopwindow.cpp:83
msgid "Close"
msgstr "Sulge"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1065
+#: src/client.cpp:1063
msgid "Connecting to server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1113
+#: src/client.cpp:1111
msgid "Logging in"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1156
+#: src/client.cpp:1154
msgid "Entering game world"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1282
+#: src/client.cpp:1280
msgid "Requesting characters"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1322
+#: src/client.cpp:1320
msgid "Connecting to the game server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1334
+#: src/client.cpp:1332
msgid "Changing game servers"
msgstr ""
@@ -530,72 +532,76 @@ msgstr ""
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1389 src/client.cpp:1403 src/client.cpp:1598
+#. TRANSLATORS: info message
+#. TRANSLATORS: ok dialog button
+#: src/client.cpp:1387 src/client.cpp:1401 src/client.cpp:1596
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
#: src/gui/windows/charcreatedialog.cpp:369
-#: src/gui/windows/charselectdialog.cpp:289
+#: src/gui/windows/charselectdialog.cpp:311
#: src/gui/windows/editserverdialog.cpp:203
#: src/gui/windows/registerdialog.cpp:245
#: src/gui/windows/unregisterdialog.cpp:146
#: src/net/ea/charserverhandler.cpp:141 src/net/ea/charserverhandler.cpp:173
+#: src/net/eathena/charserverhandler.cpp:516
+#: src/net/eathena/charserverhandler.cpp:518
msgid "Error"
msgstr "Viga"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1418
+#: src/client.cpp:1416
msgid "Requesting registration details"
msgstr ""
#. TRANSLATORS: password change message header
-#: src/client.cpp:1459
+#: src/client.cpp:1457
msgid "Password Change"
msgstr ""
#. TRANSLATORS: password change message text
-#: src/client.cpp:1461
+#: src/client.cpp:1459
msgid "Password changed successfully!"
msgstr ""
#. TRANSLATORS: email change message header
-#: src/client.cpp:1486
+#: src/client.cpp:1484
msgid "Email Change"
msgstr ""
#. TRANSLATORS: email change message text
-#: src/client.cpp:1488
+#: src/client.cpp:1486
msgid "Email changed successfully!"
msgstr ""
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1515
+#: src/client.cpp:1513
msgid "Unregister Successful"
msgstr ""
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1517
+#: src/client.cpp:1515
msgid "Farewell, come back any time..."
msgstr ""
#. TRANSLATORS: directory creation error
#: src/configmanager.cpp:53 src/dirs.cpp:260 src/dirs.cpp:275 src/dirs.cpp:320
-#: src/dirs.cpp:481 src/dirs.cpp:489
+#: src/dirs.cpp:488 src/dirs.cpp:496
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:363
+#: src/dirs.cpp:370
#, c-format
msgid "Invalid update host: %s."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:404 src/dirs.cpp:411
+#: src/dirs.cpp:411 src/dirs.cpp:418
msgid "Error creating updates directory!"
msgstr ""
-#: src/dirs.cpp:433 src/dirs.cpp:451
+#: src/dirs.cpp:440 src/dirs.cpp:458
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
@@ -613,36 +619,36 @@ msgid "dyecmd srcdyestring dstfile"
msgstr ""
#. TRANSLATORS: chat tab header
-#: src/game.cpp:236 src/gui/widgets/tabs/chattab.cpp:482
+#: src/game.cpp:234 src/gui/widgets/tabs/chattab.cpp:482
msgid "General"
msgstr ""
#. TRANSLATORS: chat tab header
#. TRANSLATORS: full button name
#. TRANSLATORS: debug window name
-#: src/game.cpp:253 src/gui/widgets/tabs/chattab.cpp:484
+#: src/game.cpp:251 src/gui/widgets/tabs/chattab.cpp:484
#: src/gui/windowmenu.cpp:149 src/gui/windows/debugwindow.cpp:42
msgid "Debug"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:541
+#: src/game.cpp:532
#, c-format
msgid "Screenshot saved as %s"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:551
+#: src/game.cpp:542
msgid "Saving screenshot failed!"
msgstr ""
#. TRANSLATORS: error message text
-#: src/game.cpp:634
+#: src/game.cpp:625
msgid "The connection to the server was lost."
msgstr ""
#. TRANSLATORS: error message header
-#: src/game.cpp:637
+#: src/game.cpp:628
msgid "Network Error"
msgstr ""
@@ -1033,6 +1039,7 @@ msgstr ""
#: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
#: src/gui/widgets/tabs/setup_other.cpp:79
#: src/gui/widgets/tabs/setup_visual.cpp:81
+#: src/gui/windows/equipmentwindow.cpp:577
msgid "default"
msgstr ""
@@ -1523,7 +1530,7 @@ msgstr ""
#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:273
#: src/gui/popups/popupmenu.cpp:767 src/gui/widgets/skillinfo.cpp:113
#: src/gui/windows/botcheckerwindow.cpp:89 src/input/pages/basic.cpp:42
-#: src/net/eathena/generalhandler.cpp:289 src/net/tmwa/generalhandler.cpp:321
+#: src/net/eathena/generalhandler.cpp:356 src/net/tmwa/generalhandler.cpp:320
msgid "Attack"
msgstr ""
@@ -1692,7 +1699,7 @@ msgstr ""
#. TRANSLATORS: pet unequip item
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:340 src/gui/windows/equipmentwindow.cpp:70
+#: src/gui/popups/popupmenu.cpp:340 src/gui/windows/equipmentwindow.cpp:72
#: src/gui/windows/inventorywindow.cpp:175 src/resources/itemtypemapdata.h:47
#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
@@ -1750,7 +1757,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:574
+#: src/gui/popups/popupmenu.cpp:574 src/gui/windows/charselectdialog.cpp:132
msgid "Rename"
msgstr ""
@@ -2262,7 +2269,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
#. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:3000 src/net/ea/playerhandler.cpp:364
+#: src/gui/popups/popupmenu.cpp:3000 src/net/ea/playerhandler.cpp:195
msgid "Revive"
msgstr ""
@@ -2286,7 +2293,7 @@ msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: settings group
#. TRANSLATORS: full button name
-#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:319
+#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:315
#: src/gui/windowmenu.cpp:158
msgid "Windows"
msgstr ""
@@ -2314,7 +2321,7 @@ msgstr "Vestlus"
#. TRANSLATORS: input action name
#: src/gui/setupinputpages.cpp:57 src/gui/widgets/tabs/setup_audio.cpp:151
#: src/gui/widgets/tabs/setup_chat.cpp:179
-#: src/gui/widgets/tabs/setup_other.cpp:341
+#: src/gui/widgets/tabs/setup_other.cpp:337
#: src/gui/widgets/tabs/setup_visual.cpp:192
#: src/gui/windows/charcreatedialog.cpp:119
#: src/gui/windows/registerdialog.cpp:106 src/input/pages/gui.cpp:87
@@ -2327,212 +2334,227 @@ msgid "Gui"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:113
+#: src/gui/userpalette.cpp:116
msgid "Being"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:115
+#: src/gui/userpalette.cpp:118
msgid "Friend names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:117
+#: src/gui/userpalette.cpp:120
msgid "Disregarded names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:119
+#: src/gui/userpalette.cpp:122
msgid "Ignored names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:121
+#: src/gui/userpalette.cpp:124
msgid "Erased names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:123
+#: src/gui/userpalette.cpp:126
msgid "Other players names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:125
+#: src/gui/userpalette.cpp:128
msgid "Own name"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:127
+#: src/gui/userpalette.cpp:130
msgid "GM names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:129
+#: src/gui/userpalette.cpp:132
msgid "NPCs"
msgstr ""
#. TRANSLATORS: palette color
#. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:131 src/gui/widgets/tabs/setup_other.cpp:108
+#: src/gui/userpalette.cpp:134 src/gui/widgets/tabs/setup_other.cpp:108
msgid "Monsters"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:133
+#: src/gui/userpalette.cpp:136
msgid "Monster HP bar"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:139
msgid "Monster HP bar (second color)"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:138
+#: src/gui/userpalette.cpp:141
msgid "Party members"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:140
+#: src/gui/userpalette.cpp:143
msgid "Guild members"
msgstr ""
#. TRANSLATORS: palette color
#. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:142 src/gui/widgets/tabs/setup_visual.cpp:157
+#: src/gui/userpalette.cpp:145 src/gui/widgets/tabs/setup_visual.cpp:157
msgid "Particle effects"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:144
+#: src/gui/userpalette.cpp:147
msgid "Pickup notification"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:146
+#: src/gui/userpalette.cpp:149
msgid "Exp notification"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:148
+#: src/gui/userpalette.cpp:151
msgid "Player HP bar"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:152
+#: src/gui/userpalette.cpp:155
msgid "Player HP bar (second color)"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:154
+#: src/gui/userpalette.cpp:157
msgid "Player hits monster"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:156
+#: src/gui/userpalette.cpp:159
msgid "Monster hits player"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:160
+#: src/gui/userpalette.cpp:163
msgid "Other player hits local player"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:162
+#: src/gui/userpalette.cpp:165
msgid "Critical Hit"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:166
+#: src/gui/userpalette.cpp:169
msgid "Local player hits monster"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:169
+#: src/gui/userpalette.cpp:172
msgid "Local player critical hit"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:172
+#: src/gui/userpalette.cpp:175
msgid "Local player miss"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:174
+#: src/gui/userpalette.cpp:177
msgid "Misses"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:176
+#: src/gui/userpalette.cpp:179
msgid "Portal highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:179
+#: src/gui/userpalette.cpp:182
msgid "Default collision highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:182
+#: src/gui/userpalette.cpp:185
msgid "Air collision highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:185
+#: src/gui/userpalette.cpp:188
msgid "Water collision highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:188
+#: src/gui/userpalette.cpp:191
msgid "Special ground collision highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:191
+#: src/gui/userpalette.cpp:194
msgid "Walkable highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:194
+#: src/gui/userpalette.cpp:197
msgid "Local player attack range"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:197
+#: src/gui/userpalette.cpp:200
msgid "Local player attack range border"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:200
+#: src/gui/userpalette.cpp:203
msgid "Monster attack range"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:204
+#: src/gui/userpalette.cpp:207
msgid "Floor item amount color"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:207
+#: src/gui/userpalette.cpp:210
msgid "Home place"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:210
+#: src/gui/userpalette.cpp:213
msgid "Home place border"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:213
+#: src/gui/userpalette.cpp:216
msgid "Road point"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:216
+#: src/gui/userpalette.cpp:219
msgid "Tiles border"
msgstr ""
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:221
+msgid "Pets"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:223
+msgid "Mercenary"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:225
+msgid "Homunculus"
+msgstr ""
+
#: src/gui/widgets/characterdisplay.cpp:135
#, c-format
msgid "Level: %u"
@@ -2635,7 +2657,8 @@ msgid "Type: %s"
msgstr ""
#. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:108
+#. TRANSLATORS: unknown equipment page name
+#: src/gui/widgets/skillinfo.cpp:108 src/gui/windows/equipmentwindow.cpp:584
msgid "Unknown"
msgstr ""
@@ -2836,22 +2859,22 @@ msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:262
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:313
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:375
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:319
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:387
msgid "Target:"
msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:264
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:319
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:377
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:325
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:389
msgid "Target Id:"
msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:267
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:322
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:379
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:328
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:391
msgid "Target type:"
msgstr ""
@@ -2862,7 +2885,7 @@ msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:271
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:338
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:344
msgid "Target race:"
msgstr ""
@@ -2878,67 +2901,81 @@ msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:277
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:363
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:369
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:387
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:375
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:381
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:399
msgid "Attack delay:"
msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:279
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:350
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:389
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:356
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:401
msgid "Minimal hit:"
msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:281
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:353
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:391
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:359
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:403
msgid "Maximum hit:"
msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:283
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:356
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:393
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:362
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:405
msgid "Critical hit:"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:327
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:285
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:365
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:407
+msgid "Karma:"
+msgstr ""
+
+#. TRANSLATORS: debug window label
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:287
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:368
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:409
+msgid "Manner:"
+msgstr ""
+
+#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:333
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:381
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:339
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:393
msgid "Target Level:"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:341
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:383
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:347
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:395
msgid "Target Party:"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:345
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:385
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:351
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:397
msgid "Target Guild:"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:430
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:436
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:451
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:457
#, c-format
msgid "Ping: %s ms"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:439
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:460
#, c-format
msgid "In: %d bytes/s"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:442
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:463
#, c-format
msgid "Out: %d bytes/s"
msgstr ""
@@ -3767,137 +3804,132 @@ msgstr ""
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_other.cpp:294
-msgid "Enable auction bot support"
-msgstr ""
-
-#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:298
msgid "Enable guild bot support and disable native guild support"
msgstr ""
#. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:304
+#: src/gui/widgets/tabs/setup_other.cpp:300
msgid "Keyboard"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:307
+#: src/gui/widgets/tabs/setup_other.cpp:303
msgid "Repeat delay"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:311
+#: src/gui/widgets/tabs/setup_other.cpp:307
msgid "Repeat interval"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:315
+#: src/gui/widgets/tabs/setup_other.cpp:311
msgid "Custom repeat interval"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:323
+#: src/gui/widgets/tabs/setup_other.cpp:319
msgid "Shortcut buttons"
msgstr ""
#. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:328
+#: src/gui/widgets/tabs/setup_other.cpp:324
msgid "Proxy server"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:332
+#: src/gui/widgets/tabs/setup_other.cpp:328
msgid "Proxy type"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:336
+#: src/gui/widgets/tabs/setup_other.cpp:332
msgid "Proxy address:port"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:344
+#: src/gui/widgets/tabs/setup_other.cpp:340
msgid "Enable server side attack"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:348
+#: src/gui/widgets/tabs/setup_other.cpp:344
msgid "Hide support page link on error"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:352
+#: src/gui/widgets/tabs/setup_other.cpp:348
msgid "Enable double clicks"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:356
+#: src/gui/widgets/tabs/setup_other.cpp:352
msgid "Enable bot checker"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:360
+#: src/gui/widgets/tabs/setup_other.cpp:356
msgid "Enable buggy servers protection (do not disable)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:365
+#: src/gui/widgets/tabs/setup_other.cpp:361
msgid "Enable debug log"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:369
+#: src/gui/widgets/tabs/setup_other.cpp:365
msgid "Ignore logging packets"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:373
+#: src/gui/widgets/tabs/setup_other.cpp:369
msgid "Enable OpenGL log"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:377
+#: src/gui/widgets/tabs/setup_other.cpp:373
msgid "Enable input log"
msgstr ""
#. TRANSLATORS: settings option
#. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_other.cpp:381 src/input/pages/other.cpp:362
+#: src/gui/widgets/tabs/setup_other.cpp:377 src/input/pages/other.cpp:362
msgid "Upload log file"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:385
+#: src/gui/widgets/tabs/setup_other.cpp:381
msgid "Low traffic mode"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:389
+#: src/gui/widgets/tabs/setup_other.cpp:385
msgid "Hide shield sprite"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:394
+#: src/gui/widgets/tabs/setup_other.cpp:390
msgid "Use FBO for screenshots (only for opengl)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:400
+#: src/gui/widgets/tabs/setup_other.cpp:396
msgid "Screenshot directory"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:405
+#: src/gui/widgets/tabs/setup_other.cpp:401
msgid "Network delay between sub servers"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:409
+#: src/gui/widgets/tabs/setup_other.cpp:405
msgid "Show background"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:414
+#: src/gui/widgets/tabs/setup_other.cpp:410
msgid "Screen density override"
msgstr ""
@@ -4128,9 +4160,9 @@ msgstr ""
#. TRANSLATORS: command editor button
#. TRANSLATORS: input action name
#: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:82
-#: src/gui/windows/serverdialog.cpp:125 src/gui/windows/shopwindow.cpp:101
-#: src/gui/windows/shopwindow.cpp:108 src/gui/windows/textcommandeditor.cpp:92
+#: src/gui/windows/charselectdialog.cpp:84
+#: src/gui/windows/serverdialog.cpp:125 src/gui/windows/shopwindow.cpp:100
+#: src/gui/windows/shopwindow.cpp:107 src/gui/windows/textcommandeditor.cpp:92
#: src/input/pages/gui.cpp:111
msgid "Delete"
msgstr "Kustuta"
@@ -4784,7 +4816,7 @@ msgstr ""
#. TRANSLATORS: equipment window name
#. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:63
+#: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:65
#: src/gui/windows/inventorywindow.cpp:196
msgid "Equipment"
msgstr ""
@@ -4925,7 +4957,7 @@ msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: social window button
#: src/gui/windows/buydialog.cpp:260 src/gui/windows/charcreatedialog.cpp:127
-#: src/gui/windows/charselectdialog.cpp:578
+#: src/gui/windows/charselectdialog.cpp:605
#: src/gui/windows/socialwindow.cpp:86
msgid "Create"
msgstr ""
@@ -4969,10 +5001,8 @@ msgstr ""
#. TRANSLATORS: change password window name
#. TRANSLATORS: change password dialog button
-#. TRANSLATORS: char select dialog. button.
#: src/gui/windows/changepassworddialog.cpp:51
#: src/gui/windows/changepassworddialog.cpp:57
-#: src/gui/windows/charselectdialog.cpp:73
msgid "Change Password"
msgstr ""
@@ -5126,57 +5156,68 @@ msgid "Are you sure you want to delete this character?"
msgstr ""
#. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:64
+#: src/gui/windows/charselectdialog.cpp:66
#, c-format
msgid "Account %s (last login time %s)"
msgstr ""
#. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:71
-msgid "Switch Login"
+#: src/gui/windows/charselectdialog.cpp:73
+msgid "Switch"
+msgstr ""
+
+#. TRANSLATORS: char select dialog. button.
+#: src/gui/windows/charselectdialog.cpp:75
+msgid "Password"
msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:78
-#: src/gui/windows/charselectdialog.cpp:573
+#: src/gui/windows/charselectdialog.cpp:80
+#: src/gui/windows/charselectdialog.cpp:595
#: src/gui/windows/updaterwindow.cpp:195
msgid "Play"
msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:80
+#: src/gui/windows/charselectdialog.cpp:82
#: src/net/ea/charserverhandler.cpp:160
+#: src/net/eathena/charserverhandler.cpp:531
+#: src/net/eathena/charserverhandler.cpp:561
msgid "Info"
msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: unregister dialog name
#. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:106
+#: src/gui/windows/charselectdialog.cpp:110
#: src/gui/windows/unregisterdialog.cpp:50
#: src/gui/windows/unregisterdialog.cpp:55
msgid "Unregister"
msgstr ""
#. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:118
+#: src/gui/windows/charselectdialog.cpp:122
msgid "Change Email"
msgstr ""
#. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:156
+#: src/gui/windows/charselectdialog.cpp:166
#, c-format
msgid "Account %s"
msgstr ""
-#: src/gui/windows/charselectdialog.cpp:184
+#: src/gui/windows/charselectdialog.cpp:194
msgid "Please set new pincode"
msgstr ""
+#: src/gui/windows/charselectdialog.cpp:240
+msgid "Please enter new name"
+msgstr ""
+
#. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:237
+#: src/gui/windows/charselectdialog.cpp:259
#, c-format
msgid ""
"Hp: %u/%u\n"
@@ -5186,16 +5227,16 @@ msgid ""
"Money: %s"
msgstr ""
-#: src/gui/windows/charselectdialog.cpp:289
+#: src/gui/windows/charselectdialog.cpp:311
msgid "Incorrect password"
msgstr ""
#. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:429
+#: src/gui/windows/charselectdialog.cpp:451
msgid "Enter password for deleting character"
msgstr ""
-#: src/gui/windows/charselectdialog.cpp:429
+#: src/gui/windows/charselectdialog.cpp:451
msgid "Enter password:"
msgstr ""
@@ -5603,7 +5644,7 @@ msgstr ""
#. TRANSLATORS: status bar label
#: src/gui/windows/ministatuswindow.cpp:364
-#: src/gui/windows/ministatuswindow.cpp:402
+#: src/gui/windows/ministatuswindow.cpp:401
msgid "Need"
msgstr ""
@@ -5634,7 +5675,7 @@ msgstr ""
#. TRANSLATORS: shop window button
#. TRANSLATORS: trade window button
#: src/gui/windows/npcdialog.cpp:114 src/gui/windows/serverdialog.cpp:121
-#: src/gui/windows/shopwindow.cpp:99 src/gui/windows/shopwindow.cpp:106
+#: src/gui/windows/shopwindow.cpp:98 src/gui/windows/shopwindow.cpp:105
#: src/gui/windows/tradewindow.cpp:83
msgid "Add"
msgstr ""
@@ -5797,43 +5838,38 @@ msgid "Reset Windows"
msgstr ""
#. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:80
+#: src/gui/windows/shopwindow.cpp:79
msgid "Personal Shop"
msgstr ""
#. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:95
+#: src/gui/windows/shopwindow.cpp:94
msgid "Buy items"
msgstr ""
#. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:97
+#: src/gui/windows/shopwindow.cpp:96
msgid "Sell items"
msgstr ""
#. TRANSLATORS: shop window label
#. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:110
+#: src/gui/windows/shopwindow.cpp:102 src/gui/windows/shopwindow.cpp:109
msgid "Announce"
msgstr ""
#. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:114
+#: src/gui/windows/shopwindow.cpp:113
msgid "Show links in announce"
msgstr ""
-#. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:176 src/gui/windows/shopwindow.cpp:179
-msgid "Auction"
-msgstr ""
-
#. TRANSLATORS: shop window dialog
#. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:233
+#: src/gui/windows/shopwindow.cpp:776 src/net/ea/tradehandler.cpp:233
msgid "Request for Trade"
msgstr ""
-#: src/gui/windows/shopwindow.cpp:791
+#: src/gui/windows/shopwindow.cpp:776
#, c-format
msgid "%s wants to %s %s do you accept?"
msgstr ""
@@ -6161,27 +6197,27 @@ msgstr ""
msgid "Connecting..."
msgstr ""
-#: src/gui/windows/updaterwindow.cpp:398
+#: src/gui/windows/updaterwindow.cpp:407
msgid "Show all news (can be slow)"
msgstr ""
#. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:824
+#: src/gui/windows/updaterwindow.cpp:833
msgid "##1 The update process is incomplete."
msgstr ""
#. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:826
+#: src/gui/windows/updaterwindow.cpp:835
msgid "##1 It is strongly recommended that"
msgstr ""
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:828
+#: src/gui/windows/updaterwindow.cpp:837
msgid "##1 you try again later."
msgstr ""
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1005
+#: src/gui/windows/updaterwindow.cpp:1021
msgid "Completed"
msgstr ""
@@ -6228,25 +6264,25 @@ msgstr ""
#. TRANSLATORS: long key name. must be short.
#. TRANSLATORS: short key name. must be very short.
#. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:370 src/input/inputmanager.cpp:414
+#: src/input/inputmanager.cpp:371 src/input/inputmanager.cpp:415
#: src/input/keyboardconfig.cpp:104
#, c-format
msgid "key_%d"
msgstr ""
#. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:376
+#: src/input/inputmanager.cpp:377
#, c-format
msgid "JButton%d"
msgstr ""
#. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:391
msgid "unknown key"
msgstr ""
#. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:420
+#: src/input/inputmanager.cpp:421
#, c-format
msgid "JB%d"
msgstr ""
@@ -6254,7 +6290,7 @@ msgstr ""
#. TRANSLATORS: unknown short key type. must be short
#. TRANSLATORS: Unknown key short string.
#. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:434 src/input/keyboardconfig.cpp:148
+#: src/input/inputmanager.cpp:435 src/input/keyboardconfig.cpp:148
msgid "u key"
msgstr ""
@@ -7425,74 +7461,74 @@ msgid "Request to quit denied!"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:135
#, c-format
msgid "Guild name: %s"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:191
+#: src/net/ea/guildhandler.cpp:138
#, c-format
msgid "Guild master: %s"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:141
#, c-format
msgid "Guild level: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:197
+#: src/net/ea/guildhandler.cpp:144
#, c-format
msgid "Online members: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:200
+#: src/net/ea/guildhandler.cpp:147
#, c-format
msgid "Max members: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:203
+#: src/net/ea/guildhandler.cpp:150
#, c-format
msgid "Average level: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:206
+#: src/net/ea/guildhandler.cpp:153
#, c-format
msgid "Guild exp: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:209
+#: src/net/ea/guildhandler.cpp:156
#, c-format
msgid "Guild next exp: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:212
+#: src/net/ea/guildhandler.cpp:159
#, c-format
msgid "Guild castle: %s"
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:179
+#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:191
msgid "Item sharing enabled."
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:183
+#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:195
msgid "Item sharing disabled."
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:187
+#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:199
msgid "Item sharing not possible."
msgstr ""
@@ -7503,19 +7539,19 @@ msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:167
+#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:179
msgid "Experience sharing enabled."
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:171
+#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:183
msgid "Experience sharing disabled."
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:175
+#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:187
msgid "Experience sharing not possible."
msgstr ""
@@ -7620,239 +7656,355 @@ msgid "Connection to server terminated. "
msgstr ""
#. TRANSLATORS: message header
-#: src/net/ea/playerhandler.cpp:257 src/net/ea/playerhandler.cpp:273
-#: src/net/ea/playerhandler.cpp:361
+#: src/net/ea/playerhandler.cpp:192 src/net/ea/playerhandler.cpp:418
+#: src/net/ea/playerhandler.cpp:434
msgid "Message"
msgstr ""
#. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:259
+#: src/net/ea/playerhandler.cpp:420
msgid ""
"You are carrying more than half your weight. You are unable to regain "
"health."
msgstr ""
#. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:275
+#: src/net/ea/playerhandler.cpp:436
msgid "You are carrying less than half your weight. You can regain health."
msgstr ""
+#. TRANSLATORS: char rename error
+#: src/net/eathena/charserverhandler.cpp:516
+#: src/net/eathena/charserverhandler.cpp:553
+msgid "Character rename error."
+msgstr ""
+
+#: src/net/eathena/charserverhandler.cpp:531
+msgid "Character renamed."
+msgstr ""
+
+#. TRANSLATORS: char rename error
+#: src/net/eathena/charserverhandler.cpp:544
+msgid "Rename not allowed."
+msgstr ""
+
+#. TRANSLATORS: char rename error
+#: src/net/eathena/charserverhandler.cpp:548
+msgid "New name is not set."
+msgstr ""
+
+#. TRANSLATORS: char rename error
+#: src/net/eathena/charserverhandler.cpp:557
+msgid "Character not found."
+msgstr ""
+
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:125
+#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:124
#, c-format
msgid "Strength %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:127
+#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:126
#, c-format
msgid "Agility %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:129
+#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:128
#, c-format
msgid "Vitality %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:131
+#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:130
#, c-format
msgid "Intelligence %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:128 src/net/tmwa/generalhandler.cpp:133
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:132
#, c-format
msgid "Dexterity %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:135
+#: src/net/eathena/generalhandler.cpp:128 src/net/tmwa/generalhandler.cpp:134
#, c-format
msgid "Luck %s"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:152 src/net/tmwa/generalhandler.cpp:161
+#: src/net/eathena/generalhandler.cpp:159 src/net/tmwa/generalhandler.cpp:160
msgid "Authentication failed."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:155 src/net/tmwa/generalhandler.cpp:165
+#: src/net/eathena/generalhandler.cpp:162 src/net/tmwa/generalhandler.cpp:164
msgid "No servers available."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:160 src/net/tmwa/generalhandler.cpp:171
+#: src/net/eathena/generalhandler.cpp:167 src/net/tmwa/generalhandler.cpp:170
msgid "Someone else is trying to use this account."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:165 src/net/tmwa/generalhandler.cpp:177
+#: src/net/eathena/generalhandler.cpp:172 src/net/tmwa/generalhandler.cpp:176
msgid "This account is already logged in."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:169 src/net/tmwa/generalhandler.cpp:182
+#: src/net/eathena/generalhandler.cpp:176 src/net/tmwa/generalhandler.cpp:181
msgid "Speed hack detected."
msgstr ""
+#: src/net/eathena/generalhandler.cpp:179
+msgid "Server full."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:182
+msgid "Sorry, you are underaged."
+msgstr ""
+
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:172 src/net/tmwa/generalhandler.cpp:186
+#: src/net/eathena/generalhandler.cpp:185 src/net/tmwa/generalhandler.cpp:185
msgid "Duplicated login."
msgstr ""
+#: src/net/eathena/generalhandler.cpp:188
+msgid "To many connections from same ip."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:191
+msgid "Not paid for this time."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:194
+msgid "Pay suspended."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:197
+msgid "Pay changed."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:200
+msgid "Pay wrong ip."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:203
+msgid "Pay game room."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:206
+msgid "Disconnect forced by GM."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:210
+msgid "Ban japan refuse."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:213
+msgid "Remained other account."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:216
+msgid "Ip unfair."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:219
+msgid "Ip count all."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:222
+msgid "Ip count."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:226
+msgid "Memory."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:229
+msgid "Han valid."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:232
+msgid "Ip limited access."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:235
+msgid "Over characters list."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:238
+msgid "Ip blocked."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:241
+msgid "Invalid password count."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:244
+msgid "Not allowed race."
+msgstr ""
+
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:175 src/net/tmwa/generalhandler.cpp:190
+#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:189
msgid "Unknown connection error."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:280
+#: src/net/eathena/generalhandler.cpp:323 src/net/tmwa/generalhandler.cpp:279
msgid "Got disconnected from server!"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:282 src/net/tmwa/generalhandler.cpp:308
+#: src/net/eathena/generalhandler.cpp:348 src/net/tmwa/generalhandler.cpp:307
msgid "Strength"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:310
+#: src/net/eathena/generalhandler.cpp:349 src/net/tmwa/generalhandler.cpp:309
msgid "Agility"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:284 src/net/tmwa/generalhandler.cpp:312
+#: src/net/eathena/generalhandler.cpp:350 src/net/tmwa/generalhandler.cpp:311
msgid "Vitality"
msgstr ""
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:285 src/net/tmwa/generalhandler.cpp:314
+#: src/net/eathena/generalhandler.cpp:352 src/net/tmwa/generalhandler.cpp:314
msgid "Intelligence"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:286 src/net/tmwa/generalhandler.cpp:316
+#: src/net/eathena/generalhandler.cpp:353 src/net/tmwa/generalhandler.cpp:316
msgid "Dexterity"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:287 src/net/tmwa/generalhandler.cpp:318
+#: src/net/eathena/generalhandler.cpp:354 src/net/tmwa/generalhandler.cpp:318
msgid "Luck"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:290 src/net/tmwa/generalhandler.cpp:323
+#: src/net/eathena/generalhandler.cpp:357 src/net/tmwa/generalhandler.cpp:322
msgid "Defense"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:291 src/net/tmwa/generalhandler.cpp:325
+#: src/net/eathena/generalhandler.cpp:358 src/net/tmwa/generalhandler.cpp:324
msgid "M.Attack"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:292 src/net/tmwa/generalhandler.cpp:327
+#: src/net/eathena/generalhandler.cpp:359 src/net/tmwa/generalhandler.cpp:326
msgid "M.Defense"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:294 src/net/tmwa/generalhandler.cpp:330
+#: src/net/eathena/generalhandler.cpp:361 src/net/tmwa/generalhandler.cpp:329
#, no-c-format
msgid "% Accuracy"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:296 src/net/tmwa/generalhandler.cpp:333
+#: src/net/eathena/generalhandler.cpp:363 src/net/tmwa/generalhandler.cpp:332
#, no-c-format
msgid "% Evade"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:298 src/net/tmwa/generalhandler.cpp:336
+#: src/net/eathena/generalhandler.cpp:365 src/net/tmwa/generalhandler.cpp:335
#, no-c-format
msgid "% Critical"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:299 src/net/tmwa/generalhandler.cpp:338
+#: src/net/eathena/generalhandler.cpp:366 src/net/tmwa/generalhandler.cpp:337
msgid "Attack Delay"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:300 src/net/tmwa/generalhandler.cpp:340
+#: src/net/eathena/generalhandler.cpp:367 src/net/tmwa/generalhandler.cpp:339
msgid "Walk Delay"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:301 src/net/tmwa/generalhandler.cpp:342
+#: src/net/eathena/generalhandler.cpp:368 src/net/tmwa/generalhandler.cpp:341
msgid "Attack Range"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:302 src/net/tmwa/generalhandler.cpp:344
+#: src/net/eathena/generalhandler.cpp:369 src/net/tmwa/generalhandler.cpp:343
msgid "Damage per sec."
msgstr ""
-#: src/net/eathena/skillhandler.cpp:228 src/net/eathena/skillhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:370
+msgid "Karma"
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:371
+msgid "Manner"
+msgstr ""
+
+#: src/net/eathena/skillhandler.cpp:304 src/net/eathena/skillhandler.cpp:364
#, c-format
msgid "Unknown skill error: %d"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:235 src/net/tmwa/skillhandler.cpp:224
+#: src/net/eathena/skillhandler.cpp:311 src/net/tmwa/skillhandler.cpp:224
msgid "You have not yet reached a high enough lvl!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:239 src/net/tmwa/skillhandler.cpp:228
+#: src/net/eathena/skillhandler.cpp:315 src/net/tmwa/skillhandler.cpp:228
msgid "Insufficient HP!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:243 src/net/tmwa/skillhandler.cpp:232
+#: src/net/eathena/skillhandler.cpp:319 src/net/tmwa/skillhandler.cpp:232
msgid "Insufficient SP!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:247 src/net/tmwa/skillhandler.cpp:236
+#: src/net/eathena/skillhandler.cpp:323 src/net/tmwa/skillhandler.cpp:236
msgid "You have no memos!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:251 src/net/tmwa/skillhandler.cpp:240
+#: src/net/eathena/skillhandler.cpp:327 src/net/tmwa/skillhandler.cpp:240
msgid "You cannot do that right now!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:255 src/net/tmwa/skillhandler.cpp:244
+#: src/net/eathena/skillhandler.cpp:331 src/net/tmwa/skillhandler.cpp:244
msgid "Seems you need more money... ;-)"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:259 src/net/tmwa/skillhandler.cpp:248
+#: src/net/eathena/skillhandler.cpp:335 src/net/tmwa/skillhandler.cpp:248
msgid "You cannot use this skill with that kind of weapon!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:264 src/net/tmwa/skillhandler.cpp:253
+#: src/net/eathena/skillhandler.cpp:340 src/net/tmwa/skillhandler.cpp:253
msgid "You need another red gem!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:268 src/net/tmwa/skillhandler.cpp:257
+#: src/net/eathena/skillhandler.cpp:344 src/net/tmwa/skillhandler.cpp:257
msgid "You need another blue gem!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:272 src/net/tmwa/skillhandler.cpp:261
+#: src/net/eathena/skillhandler.cpp:348 src/net/tmwa/skillhandler.cpp:261
msgid "You're carrying to much to do this!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:276 src/net/tmwa/skillhandler.cpp:265
+#: src/net/eathena/skillhandler.cpp:352 src/net/tmwa/skillhandler.cpp:265
msgid "Huh? What's that?"
msgstr ""
@@ -7869,32 +8021,32 @@ msgid "%s wants to trade with you, do you accept?"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:349
+#: src/net/tmwa/charserverhandler.cpp:351
msgid "Strength:"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:351
+#: src/net/tmwa/charserverhandler.cpp:353
msgid "Agility:"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:353
+#: src/net/tmwa/charserverhandler.cpp:355
msgid "Vitality:"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:355
+#: src/net/tmwa/charserverhandler.cpp:357
msgid "Intelligence:"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:357
+#: src/net/tmwa/charserverhandler.cpp:359
msgid "Dexterity:"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:359
+#: src/net/tmwa/charserverhandler.cpp:361
msgid "Luck:"
msgstr ""
@@ -8205,269 +8357,306 @@ msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:143
+msgid "You cant left party on this map."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:147
+msgid "You was kicked from party."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:151
+msgid "You cant be kicked kicked from party on this map."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:155
#, c-format
msgid "%s has joined your party."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:147
+#: src/resources/notifications.h:159
#, c-format
msgid "%s is already a member of a party."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:151
+#: src/resources/notifications.h:163
#, c-format
msgid "%s refused your invitation."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:155
+#: src/resources/notifications.h:167
#, c-format
msgid "%s is now a member of your party."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:159
+#: src/resources/notifications.h:171
#, c-format
msgid "%s can't join your party because party is full."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:163
+#: src/resources/notifications.h:175
#, c-format
msgid "QQQ Unknown invite response for %s."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:191
+#: src/resources/notifications.h:203
#, c-format
msgid "%s has left your party."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:195
+#: src/resources/notifications.h:207 src/resources/notifications.h:215
+#, c-format
+msgid "%s cant be kicked from party on this map."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:211
+#, c-format
+msgid "%s has kicked from your party."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:219
#, c-format
msgid "An unknown member tried to say: %s"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:199
+#: src/resources/notifications.h:223
#, c-format
msgid "%s is not in your party!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:203
+#: src/resources/notifications.h:227
#, c-format
msgid "You picked up %s."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:207
+#: src/resources/notifications.h:231
#, c-format
msgid "You spent %s."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:211
+#: src/resources/notifications.h:235
msgid "Cannot raise skill!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:215
+#: src/resources/notifications.h:239
msgid "Equip ammunition first."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:219
+#: src/resources/notifications.h:243
#, c-format
msgid "Trading with %s isn't possible. Trade partner is too far away."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:224
+#: src/resources/notifications.h:248
#, c-format
msgid "Trading with %s isn't possible. Character doesn't exist."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:228
+#: src/resources/notifications.h:252
msgid "Trade cancelled due to an unknown reason."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:232
+#: src/resources/notifications.h:256
#, c-format
msgid "Trade with %s cancelled."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:236
+#: src/resources/notifications.h:260
#, c-format
msgid "Unhandled trade cancel packet with %s"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:240
+#: src/resources/notifications.h:264
msgid "Failed adding item. Trade partner is over weighted."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:244
+#: src/resources/notifications.h:268
msgid "Failed adding item. Trade partner has no free slot."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:248
+#: src/resources/notifications.h:272
msgid "Failed adding item. You can't trade this item."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:252
+#: src/resources/notifications.h:276
msgid "Failed adding item for unknown reason."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:256
+#: src/resources/notifications.h:280
msgid "Trade canceled."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:260
+#: src/resources/notifications.h:284
msgid "Trade completed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:264
+#: src/resources/notifications.h:288
msgid "Kick failed!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:268
+#: src/resources/notifications.h:292
msgid "Kick succeeded!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:272
+#: src/resources/notifications.h:296
#, c-format
msgid "MVP player: %s"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:276
+#: src/resources/notifications.h:300
msgid "All whispers ignored."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:280
+#: src/resources/notifications.h:304
msgid "All whispers ignore failed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:284
+#: src/resources/notifications.h:308
msgid "All whispers unignored."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:288
+#: src/resources/notifications.h:312
msgid "All whispers unignore failed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:295
+#: src/resources/notifications.h:319
msgid "pvp off, gvg off"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:299
+#: src/resources/notifications.h:323
msgid "pvp on"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:303
+#: src/resources/notifications.h:327
msgid "gvg on"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:307
+#: src/resources/notifications.h:331
msgid "pvp on, gvg on"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:311
+#: src/resources/notifications.h:335
msgid "unknown pvp"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:315
+#: src/resources/notifications.h:339
#, c-format
msgid "Char from account %s is already in your party!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:319
+#: src/resources/notifications.h:343
#, c-format
msgid "%s blocked invite!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:323
+#: src/resources/notifications.h:347
msgid "Char is not online!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:327
+#: src/resources/notifications.h:351
msgid "Pet catch failed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:331
+#: src/resources/notifications.h:355
msgid "Pet catched."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:335
+#: src/resources/notifications.h:359
#, c-format
msgid "Pet catch unkown error: %d."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:339
+#: src/resources/notifications.h:363
msgid "Your mercenary duty hour is over."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:343
+#: src/resources/notifications.h:367
msgid "Your mercenary was killed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:347
+#: src/resources/notifications.h:371
msgid "Your mercenary was fired."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:351
+#: src/resources/notifications.h:375
msgid "Your mercenary run away."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:355
+#: src/resources/notifications.h:379
msgid "Mercenary unknown state."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:359
-msgid "Your feed your homunculus."
+#: src/resources/notifications.h:383
+msgid "You feed your homunculus."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:363
+#: src/resources/notifications.h:387
#, c-format
msgid "You cant feed homunculus, because not have %s."
msgstr ""
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:391
+msgid "Card insert failed."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:395
+msgid "Card inserted."
+msgstr ""
+
#. TRANSLATORS: chat option changed message
#: src/utils/booleanoptions.h:27
#, c-format
diff --git a/po/fa.po b/po/fa.po
index 3c50cf3e5..c2b2ee770 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-27 13:23+0300\n"
-"PO-Revision-Date: 2014-09-28 10:01+0000\n"
+"POT-Creation-Date: 2014-10-08 01:19+0300\n"
+"PO-Revision-Date: 2014-10-08 10:01+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Persian (http://www.transifex.com/projects/p/manaplus/language/fa/)\n"
"MIME-Version: 1.0\n"
@@ -32,7 +32,7 @@ msgstr ""
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:131 src/client.cpp:1463 src/client.cpp:1490
+#: src/actions/actions.cpp:131 src/client.cpp:1461 src/client.cpp:1488
#: src/gamemodifiers.cpp:423 src/gui/widgets/tabs/setup_input.cpp:163
#: src/gui/widgets/tabs/setup_theme.cpp:312
#: src/gui/widgets/tabs/setup_theme.cpp:343
@@ -43,8 +43,8 @@ msgstr ""
#: src/gui/windows/changeemaildialog.cpp:170
#: src/gui/windows/changepassworddialog.cpp:160
#: src/gui/windows/charcreatedialog.cpp:373
-#: src/gui/windows/charselectdialog.cpp:255
-#: src/gui/windows/charselectdialog.cpp:291 src/gui/windows/editdialog.cpp:49
+#: src/gui/windows/charselectdialog.cpp:277
+#: src/gui/windows/charselectdialog.cpp:313 src/gui/windows/editdialog.cpp:49
#: src/gui/windows/editserverdialog.cpp:61
#: src/gui/windows/editserverdialog.cpp:208
#: src/gui/windows/itemamountwindow.cpp:158 src/gui/windows/quitdialog.cpp:70
@@ -52,7 +52,9 @@ msgstr ""
#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
#: src/net/ea/charserverhandler.cpp:143 src/net/ea/charserverhandler.cpp:162
#: src/net/ea/charserverhandler.cpp:175 src/net/ea/gamehandler.cpp:79
-#: src/net/ea/playerhandler.cpp:263 src/net/ea/playerhandler.cpp:279
+#: src/net/ea/playerhandler.cpp:424 src/net/ea/playerhandler.cpp:440
+#: src/net/eathena/charserverhandler.cpp:533
+#: src/net/eathena/charserverhandler.cpp:563
msgid "OK"
msgstr "تایید"
@@ -176,7 +178,7 @@ msgstr ""
#. TRANSLATORS: party invite message
#. TRANSLATORS: change relation
-#: src/actions/chat.cpp:303 src/actions/commands.cpp:65
+#: src/actions/chat.cpp:303 src/actions/commands.cpp:64
msgid "Please specify a name."
msgstr ""
@@ -199,75 +201,75 @@ msgid "Message now closes chat."
msgstr ""
#. TRANSLATORS: change relation
-#: src/actions/commands.cpp:108
+#: src/actions/commands.cpp:107
#, c-format
msgid "Player already %s!"
msgstr ""
#. TRANSLATORS: change relation
-#: src/actions/commands.cpp:120
+#: src/actions/commands.cpp:119
#, c-format
msgid "Player successfully %s!"
msgstr ""
#. TRANSLATORS: change relation
-#: src/actions/commands.cpp:122
+#: src/actions/commands.cpp:121
#, c-format
msgid "Player could not be %s!"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:153
+#: src/actions/commands.cpp:152
msgid "Player wasn't ignored!"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:162
+#: src/actions/commands.cpp:161
msgid "Player no longer ignored!"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:164
+#: src/actions/commands.cpp:163
msgid "Player could not be unignored!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/actions/commands.cpp:179
+#: src/actions/commands.cpp:178
msgid "Player already erased!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/actions/commands.cpp:192
+#: src/actions/commands.cpp:191
msgid "Player no longer erased!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/actions/commands.cpp:194
+#: src/actions/commands.cpp:193
msgid "Player could not be erased!"
msgstr ""
#. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:201
+#: src/actions/commands.cpp:200
msgid "friend"
msgstr ""
#. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:208
+#: src/actions/commands.cpp:207
msgid "disregarded"
msgstr ""
#. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:215
+#: src/actions/commands.cpp:214
msgid "neutral"
msgstr ""
#. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:222
+#: src/actions/commands.cpp:221
msgid "blacklisted"
msgstr ""
#. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:229
+#: src/actions/commands.cpp:228
msgid "enemy"
msgstr ""
@@ -282,77 +284,77 @@ msgid "Accepting incoming trade requests"
msgstr ""
#. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1306
+#: src/actormanager.cpp:1310
msgid "Visible on map"
msgstr ""
#. TRANSLATORS: default race name
-#: src/being/being.cpp:389
+#: src/being/being.cpp:393
msgid "Human"
msgstr ""
-#: src/being/being.cpp:556
+#: src/being/being.cpp:560
msgid "dodge"
msgstr ""
-#: src/being/being.cpp:556
+#: src/being/being.cpp:560
msgid "miss"
msgstr ""
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1865 src/gui/windows/whoisonline.cpp:855
+#: src/being/being.cpp:1869 src/gui/windows/whoisonline.cpp:855
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1870 src/gui/windows/whoisonline.cpp:860
+#: src/being/being.cpp:1874 src/gui/windows/whoisonline.cpp:860
msgid "I"
msgstr ""
#. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:379
+#: src/being/localplayer.cpp:380
#, c-format
msgid "You were killed by %s"
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:824
+#: src/being/localplayer.cpp:825
msgid "Tried to pick up nonexistent item."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:828
+#: src/being/localplayer.cpp:829
msgid "Item is too heavy."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:832
+#: src/being/localplayer.cpp:833
msgid "Item is too far away."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:836
+#: src/being/localplayer.cpp:837
msgid "Inventory is full."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:840
+#: src/being/localplayer.cpp:841
msgid "Stack is too big."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:844
+#: src/being/localplayer.cpp:845
msgid "Item belongs to someone else."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:848
+#: src/being/localplayer.cpp:849
msgid "Unknown problem picking up item."
msgstr ""
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:872
+#: src/being/localplayer.cpp:873
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -360,43 +362,43 @@ msgstr[0] ""
#. TRANSLATORS: this is normal experience
#. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1054 src/being/localplayer.cpp:1055
-#: src/being/localplayer.cpp:1091
+#: src/being/localplayer.cpp:1055 src/being/localplayer.cpp:1056
+#: src/being/localplayer.cpp:1092
msgid "xp"
msgstr ""
#. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1059 src/being/localplayer.cpp:1065
-#: src/being/localplayer.cpp:1071
+#: src/being/localplayer.cpp:1060 src/being/localplayer.cpp:1066
+#: src/being/localplayer.cpp:1072
msgid "job"
msgstr ""
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2794
+#: src/being/localplayer.cpp:2795
#, c-format
msgid "Follow: %s"
msgstr ""
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2800 src/being/localplayer.cpp:2825
+#: src/being/localplayer.cpp:2801 src/being/localplayer.cpp:2826
msgid "Follow canceled"
msgstr ""
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2810
+#: src/being/localplayer.cpp:2811
#, c-format
msgid "Imitation: %s"
msgstr ""
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2816 src/being/localplayer.cpp:2830
+#: src/being/localplayer.cpp:2817 src/being/localplayer.cpp:2831
msgid "Imitation canceled"
msgstr ""
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3180
+#: src/being/localplayer.cpp:3181
#, c-format
msgid "You see %s"
msgstr ""
@@ -434,37 +436,37 @@ msgstr ""
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:920 src/gui/windowmenu.cpp:162
+#: src/client.cpp:918 src/gui/windowmenu.cpp:162
#: src/gui/windows/setupwindow.cpp:62
msgid "Setup"
msgstr ""
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:923 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:921 src/gui/widgets/tabs/setup_perfomance.cpp:54
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:926 src/gui/widgets/tabs/setup_video.cpp:105
+#: src/client.cpp:924 src/gui/widgets/tabs/setup_video.cpp:105
msgid "Video"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:929 src/gui/widgets/tabs/setup_theme.cpp:122
+#: src/client.cpp:927 src/gui/widgets/tabs/setup_theme.cpp:122
msgid "Theme"
msgstr ""
#. TRANSLATORS: theme tab quick button
-#: src/client.cpp:932
+#: src/client.cpp:930
msgid "About"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:935 src/gui/windowmenu.cpp:74
+#: src/client.cpp:933 src/gui/windowmenu.cpp:74
#: src/gui/windows/helpwindow.cpp:53
msgid "Help"
msgstr ""
@@ -480,42 +482,42 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:939 src/client.cpp:1391 src/client.cpp:1405
+#: src/client.cpp:937 src/client.cpp:1389 src/client.cpp:1403
#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:691
#: src/gui/popups/popupmenu.cpp:923 src/gui/windows/didyouknowwindow.cpp:81
#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:74
#: src/gui/windows/npcdialog.cpp:112 src/gui/windows/questswindow.cpp:77
-#: src/gui/windows/shopwindow.cpp:84
+#: src/gui/windows/shopwindow.cpp:83
msgid "Close"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1065
+#: src/client.cpp:1063
msgid "Connecting to server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1113
+#: src/client.cpp:1111
msgid "Logging in"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1156
+#: src/client.cpp:1154
msgid "Entering game world"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1282
+#: src/client.cpp:1280
msgid "Requesting characters"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1322
+#: src/client.cpp:1320
msgid "Connecting to the game server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1334
+#: src/client.cpp:1332
msgid "Changing game servers"
msgstr ""
@@ -529,72 +531,76 @@ msgstr ""
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1389 src/client.cpp:1403 src/client.cpp:1598
+#. TRANSLATORS: info message
+#. TRANSLATORS: ok dialog button
+#: src/client.cpp:1387 src/client.cpp:1401 src/client.cpp:1596
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
#: src/gui/windows/charcreatedialog.cpp:369
-#: src/gui/windows/charselectdialog.cpp:289
+#: src/gui/windows/charselectdialog.cpp:311
#: src/gui/windows/editserverdialog.cpp:203
#: src/gui/windows/registerdialog.cpp:245
#: src/gui/windows/unregisterdialog.cpp:146
#: src/net/ea/charserverhandler.cpp:141 src/net/ea/charserverhandler.cpp:173
+#: src/net/eathena/charserverhandler.cpp:516
+#: src/net/eathena/charserverhandler.cpp:518
msgid "Error"
msgstr "خطا"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1418
+#: src/client.cpp:1416
msgid "Requesting registration details"
msgstr ""
#. TRANSLATORS: password change message header
-#: src/client.cpp:1459
+#: src/client.cpp:1457
msgid "Password Change"
msgstr ""
#. TRANSLATORS: password change message text
-#: src/client.cpp:1461
+#: src/client.cpp:1459
msgid "Password changed successfully!"
msgstr ""
#. TRANSLATORS: email change message header
-#: src/client.cpp:1486
+#: src/client.cpp:1484
msgid "Email Change"
msgstr ""
#. TRANSLATORS: email change message text
-#: src/client.cpp:1488
+#: src/client.cpp:1486
msgid "Email changed successfully!"
msgstr ""
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1515
+#: src/client.cpp:1513
msgid "Unregister Successful"
msgstr ""
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1517
+#: src/client.cpp:1515
msgid "Farewell, come back any time..."
msgstr ""
#. TRANSLATORS: directory creation error
#: src/configmanager.cpp:53 src/dirs.cpp:260 src/dirs.cpp:275 src/dirs.cpp:320
-#: src/dirs.cpp:481 src/dirs.cpp:489
+#: src/dirs.cpp:488 src/dirs.cpp:496
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:363
+#: src/dirs.cpp:370
#, c-format
msgid "Invalid update host: %s."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:404 src/dirs.cpp:411
+#: src/dirs.cpp:411 src/dirs.cpp:418
msgid "Error creating updates directory!"
msgstr ""
-#: src/dirs.cpp:433 src/dirs.cpp:451
+#: src/dirs.cpp:440 src/dirs.cpp:458
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
@@ -612,36 +618,36 @@ msgid "dyecmd srcdyestring dstfile"
msgstr ""
#. TRANSLATORS: chat tab header
-#: src/game.cpp:236 src/gui/widgets/tabs/chattab.cpp:482
+#: src/game.cpp:234 src/gui/widgets/tabs/chattab.cpp:482
msgid "General"
msgstr "کلی"
#. TRANSLATORS: chat tab header
#. TRANSLATORS: full button name
#. TRANSLATORS: debug window name
-#: src/game.cpp:253 src/gui/widgets/tabs/chattab.cpp:484
+#: src/game.cpp:251 src/gui/widgets/tabs/chattab.cpp:484
#: src/gui/windowmenu.cpp:149 src/gui/windows/debugwindow.cpp:42
msgid "Debug"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:541
+#: src/game.cpp:532
#, c-format
msgid "Screenshot saved as %s"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:551
+#: src/game.cpp:542
msgid "Saving screenshot failed!"
msgstr ""
#. TRANSLATORS: error message text
-#: src/game.cpp:634
+#: src/game.cpp:625
msgid "The connection to the server was lost."
msgstr ""
#. TRANSLATORS: error message header
-#: src/game.cpp:637
+#: src/game.cpp:628
msgid "Network Error"
msgstr "خطای شبکه"
@@ -1032,6 +1038,7 @@ msgstr ""
#: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
#: src/gui/widgets/tabs/setup_other.cpp:79
#: src/gui/widgets/tabs/setup_visual.cpp:81
+#: src/gui/windows/equipmentwindow.cpp:577
msgid "default"
msgstr ""
@@ -1522,7 +1529,7 @@ msgstr ""
#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:273
#: src/gui/popups/popupmenu.cpp:767 src/gui/widgets/skillinfo.cpp:113
#: src/gui/windows/botcheckerwindow.cpp:89 src/input/pages/basic.cpp:42
-#: src/net/eathena/generalhandler.cpp:289 src/net/tmwa/generalhandler.cpp:321
+#: src/net/eathena/generalhandler.cpp:356 src/net/tmwa/generalhandler.cpp:320
msgid "Attack"
msgstr ""
@@ -1691,7 +1698,7 @@ msgstr ""
#. TRANSLATORS: pet unequip item
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:340 src/gui/windows/equipmentwindow.cpp:70
+#: src/gui/popups/popupmenu.cpp:340 src/gui/windows/equipmentwindow.cpp:72
#: src/gui/windows/inventorywindow.cpp:175 src/resources/itemtypemapdata.h:47
#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
@@ -1749,7 +1756,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:574
+#: src/gui/popups/popupmenu.cpp:574 src/gui/windows/charselectdialog.cpp:132
msgid "Rename"
msgstr ""
@@ -2261,7 +2268,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
#. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:3000 src/net/ea/playerhandler.cpp:364
+#: src/gui/popups/popupmenu.cpp:3000 src/net/ea/playerhandler.cpp:195
msgid "Revive"
msgstr ""
@@ -2285,7 +2292,7 @@ msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: settings group
#. TRANSLATORS: full button name
-#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:319
+#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:315
#: src/gui/windowmenu.cpp:158
msgid "Windows"
msgstr ""
@@ -2313,7 +2320,7 @@ msgstr "چت"
#. TRANSLATORS: input action name
#: src/gui/setupinputpages.cpp:57 src/gui/widgets/tabs/setup_audio.cpp:151
#: src/gui/widgets/tabs/setup_chat.cpp:179
-#: src/gui/widgets/tabs/setup_other.cpp:341
+#: src/gui/widgets/tabs/setup_other.cpp:337
#: src/gui/widgets/tabs/setup_visual.cpp:192
#: src/gui/windows/charcreatedialog.cpp:119
#: src/gui/windows/registerdialog.cpp:106 src/input/pages/gui.cpp:87
@@ -2326,212 +2333,227 @@ msgid "Gui"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:113
+#: src/gui/userpalette.cpp:116
msgid "Being"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:115
+#: src/gui/userpalette.cpp:118
msgid "Friend names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:117
+#: src/gui/userpalette.cpp:120
msgid "Disregarded names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:119
+#: src/gui/userpalette.cpp:122
msgid "Ignored names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:121
+#: src/gui/userpalette.cpp:124
msgid "Erased names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:123
+#: src/gui/userpalette.cpp:126
msgid "Other players names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:125
+#: src/gui/userpalette.cpp:128
msgid "Own name"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:127
+#: src/gui/userpalette.cpp:130
msgid "GM names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:129
+#: src/gui/userpalette.cpp:132
msgid "NPCs"
msgstr ""
#. TRANSLATORS: palette color
#. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:131 src/gui/widgets/tabs/setup_other.cpp:108
+#: src/gui/userpalette.cpp:134 src/gui/widgets/tabs/setup_other.cpp:108
msgid "Monsters"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:133
+#: src/gui/userpalette.cpp:136
msgid "Monster HP bar"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:139
msgid "Monster HP bar (second color)"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:138
+#: src/gui/userpalette.cpp:141
msgid "Party members"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:140
+#: src/gui/userpalette.cpp:143
msgid "Guild members"
msgstr ""
#. TRANSLATORS: palette color
#. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:142 src/gui/widgets/tabs/setup_visual.cpp:157
+#: src/gui/userpalette.cpp:145 src/gui/widgets/tabs/setup_visual.cpp:157
msgid "Particle effects"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:144
+#: src/gui/userpalette.cpp:147
msgid "Pickup notification"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:146
+#: src/gui/userpalette.cpp:149
msgid "Exp notification"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:148
+#: src/gui/userpalette.cpp:151
msgid "Player HP bar"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:152
+#: src/gui/userpalette.cpp:155
msgid "Player HP bar (second color)"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:154
+#: src/gui/userpalette.cpp:157
msgid "Player hits monster"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:156
+#: src/gui/userpalette.cpp:159
msgid "Monster hits player"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:160
+#: src/gui/userpalette.cpp:163
msgid "Other player hits local player"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:162
+#: src/gui/userpalette.cpp:165
msgid "Critical Hit"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:166
+#: src/gui/userpalette.cpp:169
msgid "Local player hits monster"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:169
+#: src/gui/userpalette.cpp:172
msgid "Local player critical hit"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:172
+#: src/gui/userpalette.cpp:175
msgid "Local player miss"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:174
+#: src/gui/userpalette.cpp:177
msgid "Misses"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:176
+#: src/gui/userpalette.cpp:179
msgid "Portal highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:179
+#: src/gui/userpalette.cpp:182
msgid "Default collision highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:182
+#: src/gui/userpalette.cpp:185
msgid "Air collision highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:185
+#: src/gui/userpalette.cpp:188
msgid "Water collision highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:188
+#: src/gui/userpalette.cpp:191
msgid "Special ground collision highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:191
+#: src/gui/userpalette.cpp:194
msgid "Walkable highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:194
+#: src/gui/userpalette.cpp:197
msgid "Local player attack range"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:197
+#: src/gui/userpalette.cpp:200
msgid "Local player attack range border"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:200
+#: src/gui/userpalette.cpp:203
msgid "Monster attack range"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:204
+#: src/gui/userpalette.cpp:207
msgid "Floor item amount color"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:207
+#: src/gui/userpalette.cpp:210
msgid "Home place"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:210
+#: src/gui/userpalette.cpp:213
msgid "Home place border"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:213
+#: src/gui/userpalette.cpp:216
msgid "Road point"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:216
+#: src/gui/userpalette.cpp:219
msgid "Tiles border"
msgstr ""
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:221
+msgid "Pets"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:223
+msgid "Mercenary"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:225
+msgid "Homunculus"
+msgstr ""
+
#: src/gui/widgets/characterdisplay.cpp:135
#, c-format
msgid "Level: %u"
@@ -2634,7 +2656,8 @@ msgid "Type: %s"
msgstr ""
#. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:108
+#. TRANSLATORS: unknown equipment page name
+#: src/gui/widgets/skillinfo.cpp:108 src/gui/windows/equipmentwindow.cpp:584
msgid "Unknown"
msgstr ""
@@ -2835,22 +2858,22 @@ msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:262
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:313
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:375
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:319
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:387
msgid "Target:"
msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:264
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:319
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:377
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:325
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:389
msgid "Target Id:"
msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:267
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:322
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:379
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:328
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:391
msgid "Target type:"
msgstr ""
@@ -2861,7 +2884,7 @@ msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:271
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:338
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:344
msgid "Target race:"
msgstr ""
@@ -2877,67 +2900,81 @@ msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:277
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:363
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:369
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:387
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:375
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:381
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:399
msgid "Attack delay:"
msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:279
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:350
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:389
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:356
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:401
msgid "Minimal hit:"
msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:281
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:353
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:391
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:359
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:403
msgid "Maximum hit:"
msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:283
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:356
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:393
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:362
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:405
msgid "Critical hit:"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:327
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:285
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:365
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:407
+msgid "Karma:"
+msgstr ""
+
+#. TRANSLATORS: debug window label
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:287
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:368
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:409
+msgid "Manner:"
+msgstr ""
+
+#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:333
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:381
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:339
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:393
msgid "Target Level:"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:341
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:383
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:347
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:395
msgid "Target Party:"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:345
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:385
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:351
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:397
msgid "Target Guild:"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:430
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:436
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:451
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:457
#, c-format
msgid "Ping: %s ms"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:439
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:460
#, c-format
msgid "In: %d bytes/s"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:442
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:463
#, c-format
msgid "Out: %d bytes/s"
msgstr ""
@@ -3766,137 +3803,132 @@ msgstr ""
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_other.cpp:294
-msgid "Enable auction bot support"
-msgstr ""
-
-#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:298
msgid "Enable guild bot support and disable native guild support"
msgstr ""
#. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:304
+#: src/gui/widgets/tabs/setup_other.cpp:300
msgid "Keyboard"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:307
+#: src/gui/widgets/tabs/setup_other.cpp:303
msgid "Repeat delay"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:311
+#: src/gui/widgets/tabs/setup_other.cpp:307
msgid "Repeat interval"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:315
+#: src/gui/widgets/tabs/setup_other.cpp:311
msgid "Custom repeat interval"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:323
+#: src/gui/widgets/tabs/setup_other.cpp:319
msgid "Shortcut buttons"
msgstr ""
#. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:328
+#: src/gui/widgets/tabs/setup_other.cpp:324
msgid "Proxy server"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:332
+#: src/gui/widgets/tabs/setup_other.cpp:328
msgid "Proxy type"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:336
+#: src/gui/widgets/tabs/setup_other.cpp:332
msgid "Proxy address:port"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:344
+#: src/gui/widgets/tabs/setup_other.cpp:340
msgid "Enable server side attack"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:348
+#: src/gui/widgets/tabs/setup_other.cpp:344
msgid "Hide support page link on error"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:352
+#: src/gui/widgets/tabs/setup_other.cpp:348
msgid "Enable double clicks"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:356
+#: src/gui/widgets/tabs/setup_other.cpp:352
msgid "Enable bot checker"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:360
+#: src/gui/widgets/tabs/setup_other.cpp:356
msgid "Enable buggy servers protection (do not disable)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:365
+#: src/gui/widgets/tabs/setup_other.cpp:361
msgid "Enable debug log"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:369
+#: src/gui/widgets/tabs/setup_other.cpp:365
msgid "Ignore logging packets"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:373
+#: src/gui/widgets/tabs/setup_other.cpp:369
msgid "Enable OpenGL log"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:377
+#: src/gui/widgets/tabs/setup_other.cpp:373
msgid "Enable input log"
msgstr ""
#. TRANSLATORS: settings option
#. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_other.cpp:381 src/input/pages/other.cpp:362
+#: src/gui/widgets/tabs/setup_other.cpp:377 src/input/pages/other.cpp:362
msgid "Upload log file"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:385
+#: src/gui/widgets/tabs/setup_other.cpp:381
msgid "Low traffic mode"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:389
+#: src/gui/widgets/tabs/setup_other.cpp:385
msgid "Hide shield sprite"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:394
+#: src/gui/widgets/tabs/setup_other.cpp:390
msgid "Use FBO for screenshots (only for opengl)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:400
+#: src/gui/widgets/tabs/setup_other.cpp:396
msgid "Screenshot directory"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:405
+#: src/gui/widgets/tabs/setup_other.cpp:401
msgid "Network delay between sub servers"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:409
+#: src/gui/widgets/tabs/setup_other.cpp:405
msgid "Show background"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:414
+#: src/gui/widgets/tabs/setup_other.cpp:410
msgid "Screen density override"
msgstr ""
@@ -4127,9 +4159,9 @@ msgstr ""
#. TRANSLATORS: command editor button
#. TRANSLATORS: input action name
#: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:82
-#: src/gui/windows/serverdialog.cpp:125 src/gui/windows/shopwindow.cpp:101
-#: src/gui/windows/shopwindow.cpp:108 src/gui/windows/textcommandeditor.cpp:92
+#: src/gui/windows/charselectdialog.cpp:84
+#: src/gui/windows/serverdialog.cpp:125 src/gui/windows/shopwindow.cpp:100
+#: src/gui/windows/shopwindow.cpp:107 src/gui/windows/textcommandeditor.cpp:92
#: src/input/pages/gui.cpp:111
msgid "Delete"
msgstr "حذف"
@@ -4783,7 +4815,7 @@ msgstr ""
#. TRANSLATORS: equipment window name
#. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:63
+#: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:65
#: src/gui/windows/inventorywindow.cpp:196
msgid "Equipment"
msgstr "تجهیزات"
@@ -4924,7 +4956,7 @@ msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: social window button
#: src/gui/windows/buydialog.cpp:260 src/gui/windows/charcreatedialog.cpp:127
-#: src/gui/windows/charselectdialog.cpp:578
+#: src/gui/windows/charselectdialog.cpp:605
#: src/gui/windows/socialwindow.cpp:86
msgid "Create"
msgstr "بساز"
@@ -4968,10 +5000,8 @@ msgstr ""
#. TRANSLATORS: change password window name
#. TRANSLATORS: change password dialog button
-#. TRANSLATORS: char select dialog. button.
#: src/gui/windows/changepassworddialog.cpp:51
#: src/gui/windows/changepassworddialog.cpp:57
-#: src/gui/windows/charselectdialog.cpp:73
msgid "Change Password"
msgstr "تغییر گذرواژه"
@@ -5125,57 +5155,68 @@ msgid "Are you sure you want to delete this character?"
msgstr "آیا اطمینان دارید که خواهان حذف این شخصیت هستید؟"
#. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:64
+#: src/gui/windows/charselectdialog.cpp:66
#, c-format
msgid "Account %s (last login time %s)"
msgstr ""
#. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:71
-msgid "Switch Login"
+#: src/gui/windows/charselectdialog.cpp:73
+msgid "Switch"
+msgstr ""
+
+#. TRANSLATORS: char select dialog. button.
+#: src/gui/windows/charselectdialog.cpp:75
+msgid "Password"
msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:78
-#: src/gui/windows/charselectdialog.cpp:573
+#: src/gui/windows/charselectdialog.cpp:80
+#: src/gui/windows/charselectdialog.cpp:595
#: src/gui/windows/updaterwindow.cpp:195
msgid "Play"
msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:80
+#: src/gui/windows/charselectdialog.cpp:82
#: src/net/ea/charserverhandler.cpp:160
+#: src/net/eathena/charserverhandler.cpp:531
+#: src/net/eathena/charserverhandler.cpp:561
msgid "Info"
msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: unregister dialog name
#. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:106
+#: src/gui/windows/charselectdialog.cpp:110
#: src/gui/windows/unregisterdialog.cpp:50
#: src/gui/windows/unregisterdialog.cpp:55
msgid "Unregister"
msgstr "ثبت نام نشده"
#. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:118
+#: src/gui/windows/charselectdialog.cpp:122
msgid "Change Email"
msgstr ""
#. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:156
+#: src/gui/windows/charselectdialog.cpp:166
#, c-format
msgid "Account %s"
msgstr ""
-#: src/gui/windows/charselectdialog.cpp:184
+#: src/gui/windows/charselectdialog.cpp:194
msgid "Please set new pincode"
msgstr ""
+#: src/gui/windows/charselectdialog.cpp:240
+msgid "Please enter new name"
+msgstr ""
+
#. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:237
+#: src/gui/windows/charselectdialog.cpp:259
#, c-format
msgid ""
"Hp: %u/%u\n"
@@ -5185,16 +5226,16 @@ msgid ""
"Money: %s"
msgstr ""
-#: src/gui/windows/charselectdialog.cpp:289
+#: src/gui/windows/charselectdialog.cpp:311
msgid "Incorrect password"
msgstr ""
#. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:429
+#: src/gui/windows/charselectdialog.cpp:451
msgid "Enter password for deleting character"
msgstr ""
-#: src/gui/windows/charselectdialog.cpp:429
+#: src/gui/windows/charselectdialog.cpp:451
msgid "Enter password:"
msgstr ""
@@ -5600,7 +5641,7 @@ msgstr ""
#. TRANSLATORS: status bar label
#: src/gui/windows/ministatuswindow.cpp:364
-#: src/gui/windows/ministatuswindow.cpp:402
+#: src/gui/windows/ministatuswindow.cpp:401
msgid "Need"
msgstr ""
@@ -5631,7 +5672,7 @@ msgstr ""
#. TRANSLATORS: shop window button
#. TRANSLATORS: trade window button
#: src/gui/windows/npcdialog.cpp:114 src/gui/windows/serverdialog.cpp:121
-#: src/gui/windows/shopwindow.cpp:99 src/gui/windows/shopwindow.cpp:106
+#: src/gui/windows/shopwindow.cpp:98 src/gui/windows/shopwindow.cpp:105
#: src/gui/windows/tradewindow.cpp:83
msgid "Add"
msgstr ""
@@ -5794,43 +5835,38 @@ msgid "Reset Windows"
msgstr ""
#. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:80
+#: src/gui/windows/shopwindow.cpp:79
msgid "Personal Shop"
msgstr ""
#. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:95
+#: src/gui/windows/shopwindow.cpp:94
msgid "Buy items"
msgstr ""
#. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:97
+#: src/gui/windows/shopwindow.cpp:96
msgid "Sell items"
msgstr ""
#. TRANSLATORS: shop window label
#. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:110
+#: src/gui/windows/shopwindow.cpp:102 src/gui/windows/shopwindow.cpp:109
msgid "Announce"
msgstr ""
#. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:114
+#: src/gui/windows/shopwindow.cpp:113
msgid "Show links in announce"
msgstr ""
-#. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:176 src/gui/windows/shopwindow.cpp:179
-msgid "Auction"
-msgstr ""
-
#. TRANSLATORS: shop window dialog
#. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:233
+#: src/gui/windows/shopwindow.cpp:776 src/net/ea/tradehandler.cpp:233
msgid "Request for Trade"
msgstr ""
-#: src/gui/windows/shopwindow.cpp:791
+#: src/gui/windows/shopwindow.cpp:776
#, c-format
msgid "%s wants to %s %s do you accept?"
msgstr ""
@@ -6158,27 +6194,27 @@ msgstr ""
msgid "Connecting..."
msgstr "در حال اتصال..."
-#: src/gui/windows/updaterwindow.cpp:398
+#: src/gui/windows/updaterwindow.cpp:407
msgid "Show all news (can be slow)"
msgstr ""
#. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:824
+#: src/gui/windows/updaterwindow.cpp:833
msgid "##1 The update process is incomplete."
msgstr ""
#. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:826
+#: src/gui/windows/updaterwindow.cpp:835
msgid "##1 It is strongly recommended that"
msgstr ""
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:828
+#: src/gui/windows/updaterwindow.cpp:837
msgid "##1 you try again later."
msgstr ""
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1005
+#: src/gui/windows/updaterwindow.cpp:1021
msgid "Completed"
msgstr ""
@@ -6225,25 +6261,25 @@ msgstr ""
#. TRANSLATORS: long key name. must be short.
#. TRANSLATORS: short key name. must be very short.
#. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:370 src/input/inputmanager.cpp:414
+#: src/input/inputmanager.cpp:371 src/input/inputmanager.cpp:415
#: src/input/keyboardconfig.cpp:104
#, c-format
msgid "key_%d"
msgstr ""
#. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:376
+#: src/input/inputmanager.cpp:377
#, c-format
msgid "JButton%d"
msgstr ""
#. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:391
msgid "unknown key"
msgstr ""
#. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:420
+#: src/input/inputmanager.cpp:421
#, c-format
msgid "JB%d"
msgstr ""
@@ -6251,7 +6287,7 @@ msgstr ""
#. TRANSLATORS: unknown short key type. must be short
#. TRANSLATORS: Unknown key short string.
#. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:434 src/input/keyboardconfig.cpp:148
+#: src/input/inputmanager.cpp:435 src/input/keyboardconfig.cpp:148
msgid "u key"
msgstr ""
@@ -7422,74 +7458,74 @@ msgid "Request to quit denied!"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:135
#, c-format
msgid "Guild name: %s"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:191
+#: src/net/ea/guildhandler.cpp:138
#, c-format
msgid "Guild master: %s"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:141
#, c-format
msgid "Guild level: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:197
+#: src/net/ea/guildhandler.cpp:144
#, c-format
msgid "Online members: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:200
+#: src/net/ea/guildhandler.cpp:147
#, c-format
msgid "Max members: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:203
+#: src/net/ea/guildhandler.cpp:150
#, c-format
msgid "Average level: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:206
+#: src/net/ea/guildhandler.cpp:153
#, c-format
msgid "Guild exp: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:209
+#: src/net/ea/guildhandler.cpp:156
#, c-format
msgid "Guild next exp: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:212
+#: src/net/ea/guildhandler.cpp:159
#, c-format
msgid "Guild castle: %s"
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:179
+#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:191
msgid "Item sharing enabled."
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:183
+#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:195
msgid "Item sharing disabled."
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:187
+#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:199
msgid "Item sharing not possible."
msgstr ""
@@ -7500,19 +7536,19 @@ msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:167
+#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:179
msgid "Experience sharing enabled."
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:171
+#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:183
msgid "Experience sharing disabled."
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:175
+#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:187
msgid "Experience sharing not possible."
msgstr ""
@@ -7617,239 +7653,355 @@ msgid "Connection to server terminated. "
msgstr ""
#. TRANSLATORS: message header
-#: src/net/ea/playerhandler.cpp:257 src/net/ea/playerhandler.cpp:273
-#: src/net/ea/playerhandler.cpp:361
+#: src/net/ea/playerhandler.cpp:192 src/net/ea/playerhandler.cpp:418
+#: src/net/ea/playerhandler.cpp:434
msgid "Message"
msgstr ""
#. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:259
+#: src/net/ea/playerhandler.cpp:420
msgid ""
"You are carrying more than half your weight. You are unable to regain "
"health."
msgstr ""
#. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:275
+#: src/net/ea/playerhandler.cpp:436
msgid "You are carrying less than half your weight. You can regain health."
msgstr ""
+#. TRANSLATORS: char rename error
+#: src/net/eathena/charserverhandler.cpp:516
+#: src/net/eathena/charserverhandler.cpp:553
+msgid "Character rename error."
+msgstr ""
+
+#: src/net/eathena/charserverhandler.cpp:531
+msgid "Character renamed."
+msgstr ""
+
+#. TRANSLATORS: char rename error
+#: src/net/eathena/charserverhandler.cpp:544
+msgid "Rename not allowed."
+msgstr ""
+
+#. TRANSLATORS: char rename error
+#: src/net/eathena/charserverhandler.cpp:548
+msgid "New name is not set."
+msgstr ""
+
+#. TRANSLATORS: char rename error
+#: src/net/eathena/charserverhandler.cpp:557
+msgid "Character not found."
+msgstr ""
+
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:125
+#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:124
#, c-format
msgid "Strength %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:127
+#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:126
#, c-format
msgid "Agility %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:129
+#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:128
#, c-format
msgid "Vitality %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:131
+#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:130
#, c-format
msgid "Intelligence %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:128 src/net/tmwa/generalhandler.cpp:133
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:132
#, c-format
msgid "Dexterity %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:135
+#: src/net/eathena/generalhandler.cpp:128 src/net/tmwa/generalhandler.cpp:134
#, c-format
msgid "Luck %s"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:152 src/net/tmwa/generalhandler.cpp:161
+#: src/net/eathena/generalhandler.cpp:159 src/net/tmwa/generalhandler.cpp:160
msgid "Authentication failed."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:155 src/net/tmwa/generalhandler.cpp:165
+#: src/net/eathena/generalhandler.cpp:162 src/net/tmwa/generalhandler.cpp:164
msgid "No servers available."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:160 src/net/tmwa/generalhandler.cpp:171
+#: src/net/eathena/generalhandler.cpp:167 src/net/tmwa/generalhandler.cpp:170
msgid "Someone else is trying to use this account."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:165 src/net/tmwa/generalhandler.cpp:177
+#: src/net/eathena/generalhandler.cpp:172 src/net/tmwa/generalhandler.cpp:176
msgid "This account is already logged in."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:169 src/net/tmwa/generalhandler.cpp:182
+#: src/net/eathena/generalhandler.cpp:176 src/net/tmwa/generalhandler.cpp:181
msgid "Speed hack detected."
msgstr ""
+#: src/net/eathena/generalhandler.cpp:179
+msgid "Server full."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:182
+msgid "Sorry, you are underaged."
+msgstr ""
+
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:172 src/net/tmwa/generalhandler.cpp:186
+#: src/net/eathena/generalhandler.cpp:185 src/net/tmwa/generalhandler.cpp:185
msgid "Duplicated login."
msgstr ""
+#: src/net/eathena/generalhandler.cpp:188
+msgid "To many connections from same ip."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:191
+msgid "Not paid for this time."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:194
+msgid "Pay suspended."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:197
+msgid "Pay changed."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:200
+msgid "Pay wrong ip."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:203
+msgid "Pay game room."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:206
+msgid "Disconnect forced by GM."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:210
+msgid "Ban japan refuse."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:213
+msgid "Remained other account."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:216
+msgid "Ip unfair."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:219
+msgid "Ip count all."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:222
+msgid "Ip count."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:226
+msgid "Memory."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:229
+msgid "Han valid."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:232
+msgid "Ip limited access."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:235
+msgid "Over characters list."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:238
+msgid "Ip blocked."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:241
+msgid "Invalid password count."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:244
+msgid "Not allowed race."
+msgstr ""
+
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:175 src/net/tmwa/generalhandler.cpp:190
+#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:189
msgid "Unknown connection error."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:280
+#: src/net/eathena/generalhandler.cpp:323 src/net/tmwa/generalhandler.cpp:279
msgid "Got disconnected from server!"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:282 src/net/tmwa/generalhandler.cpp:308
+#: src/net/eathena/generalhandler.cpp:348 src/net/tmwa/generalhandler.cpp:307
msgid "Strength"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:310
+#: src/net/eathena/generalhandler.cpp:349 src/net/tmwa/generalhandler.cpp:309
msgid "Agility"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:284 src/net/tmwa/generalhandler.cpp:312
+#: src/net/eathena/generalhandler.cpp:350 src/net/tmwa/generalhandler.cpp:311
msgid "Vitality"
msgstr ""
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:285 src/net/tmwa/generalhandler.cpp:314
+#: src/net/eathena/generalhandler.cpp:352 src/net/tmwa/generalhandler.cpp:314
msgid "Intelligence"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:286 src/net/tmwa/generalhandler.cpp:316
+#: src/net/eathena/generalhandler.cpp:353 src/net/tmwa/generalhandler.cpp:316
msgid "Dexterity"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:287 src/net/tmwa/generalhandler.cpp:318
+#: src/net/eathena/generalhandler.cpp:354 src/net/tmwa/generalhandler.cpp:318
msgid "Luck"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:290 src/net/tmwa/generalhandler.cpp:323
+#: src/net/eathena/generalhandler.cpp:357 src/net/tmwa/generalhandler.cpp:322
msgid "Defense"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:291 src/net/tmwa/generalhandler.cpp:325
+#: src/net/eathena/generalhandler.cpp:358 src/net/tmwa/generalhandler.cpp:324
msgid "M.Attack"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:292 src/net/tmwa/generalhandler.cpp:327
+#: src/net/eathena/generalhandler.cpp:359 src/net/tmwa/generalhandler.cpp:326
msgid "M.Defense"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:294 src/net/tmwa/generalhandler.cpp:330
+#: src/net/eathena/generalhandler.cpp:361 src/net/tmwa/generalhandler.cpp:329
#, no-c-format
msgid "% Accuracy"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:296 src/net/tmwa/generalhandler.cpp:333
+#: src/net/eathena/generalhandler.cpp:363 src/net/tmwa/generalhandler.cpp:332
#, no-c-format
msgid "% Evade"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:298 src/net/tmwa/generalhandler.cpp:336
+#: src/net/eathena/generalhandler.cpp:365 src/net/tmwa/generalhandler.cpp:335
#, no-c-format
msgid "% Critical"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:299 src/net/tmwa/generalhandler.cpp:338
+#: src/net/eathena/generalhandler.cpp:366 src/net/tmwa/generalhandler.cpp:337
msgid "Attack Delay"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:300 src/net/tmwa/generalhandler.cpp:340
+#: src/net/eathena/generalhandler.cpp:367 src/net/tmwa/generalhandler.cpp:339
msgid "Walk Delay"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:301 src/net/tmwa/generalhandler.cpp:342
+#: src/net/eathena/generalhandler.cpp:368 src/net/tmwa/generalhandler.cpp:341
msgid "Attack Range"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:302 src/net/tmwa/generalhandler.cpp:344
+#: src/net/eathena/generalhandler.cpp:369 src/net/tmwa/generalhandler.cpp:343
msgid "Damage per sec."
msgstr ""
-#: src/net/eathena/skillhandler.cpp:228 src/net/eathena/skillhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:370
+msgid "Karma"
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:371
+msgid "Manner"
+msgstr ""
+
+#: src/net/eathena/skillhandler.cpp:304 src/net/eathena/skillhandler.cpp:364
#, c-format
msgid "Unknown skill error: %d"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:235 src/net/tmwa/skillhandler.cpp:224
+#: src/net/eathena/skillhandler.cpp:311 src/net/tmwa/skillhandler.cpp:224
msgid "You have not yet reached a high enough lvl!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:239 src/net/tmwa/skillhandler.cpp:228
+#: src/net/eathena/skillhandler.cpp:315 src/net/tmwa/skillhandler.cpp:228
msgid "Insufficient HP!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:243 src/net/tmwa/skillhandler.cpp:232
+#: src/net/eathena/skillhandler.cpp:319 src/net/tmwa/skillhandler.cpp:232
msgid "Insufficient SP!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:247 src/net/tmwa/skillhandler.cpp:236
+#: src/net/eathena/skillhandler.cpp:323 src/net/tmwa/skillhandler.cpp:236
msgid "You have no memos!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:251 src/net/tmwa/skillhandler.cpp:240
+#: src/net/eathena/skillhandler.cpp:327 src/net/tmwa/skillhandler.cpp:240
msgid "You cannot do that right now!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:255 src/net/tmwa/skillhandler.cpp:244
+#: src/net/eathena/skillhandler.cpp:331 src/net/tmwa/skillhandler.cpp:244
msgid "Seems you need more money... ;-)"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:259 src/net/tmwa/skillhandler.cpp:248
+#: src/net/eathena/skillhandler.cpp:335 src/net/tmwa/skillhandler.cpp:248
msgid "You cannot use this skill with that kind of weapon!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:264 src/net/tmwa/skillhandler.cpp:253
+#: src/net/eathena/skillhandler.cpp:340 src/net/tmwa/skillhandler.cpp:253
msgid "You need another red gem!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:268 src/net/tmwa/skillhandler.cpp:257
+#: src/net/eathena/skillhandler.cpp:344 src/net/tmwa/skillhandler.cpp:257
msgid "You need another blue gem!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:272 src/net/tmwa/skillhandler.cpp:261
+#: src/net/eathena/skillhandler.cpp:348 src/net/tmwa/skillhandler.cpp:261
msgid "You're carrying to much to do this!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:276 src/net/tmwa/skillhandler.cpp:265
+#: src/net/eathena/skillhandler.cpp:352 src/net/tmwa/skillhandler.cpp:265
msgid "Huh? What's that?"
msgstr ""
@@ -7866,32 +8018,32 @@ msgid "%s wants to trade with you, do you accept?"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:349
+#: src/net/tmwa/charserverhandler.cpp:351
msgid "Strength:"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:351
+#: src/net/tmwa/charserverhandler.cpp:353
msgid "Agility:"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:353
+#: src/net/tmwa/charserverhandler.cpp:355
msgid "Vitality:"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:355
+#: src/net/tmwa/charserverhandler.cpp:357
msgid "Intelligence:"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:357
+#: src/net/tmwa/charserverhandler.cpp:359
msgid "Dexterity:"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:359
+#: src/net/tmwa/charserverhandler.cpp:361
msgid "Luck:"
msgstr ""
@@ -8202,269 +8354,306 @@ msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:143
+msgid "You cant left party on this map."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:147
+msgid "You was kicked from party."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:151
+msgid "You cant be kicked kicked from party on this map."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:155
#, c-format
msgid "%s has joined your party."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:147
+#: src/resources/notifications.h:159
#, c-format
msgid "%s is already a member of a party."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:151
+#: src/resources/notifications.h:163
#, c-format
msgid "%s refused your invitation."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:155
+#: src/resources/notifications.h:167
#, c-format
msgid "%s is now a member of your party."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:159
+#: src/resources/notifications.h:171
#, c-format
msgid "%s can't join your party because party is full."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:163
+#: src/resources/notifications.h:175
#, c-format
msgid "QQQ Unknown invite response for %s."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:191
+#: src/resources/notifications.h:203
#, c-format
msgid "%s has left your party."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:195
+#: src/resources/notifications.h:207 src/resources/notifications.h:215
+#, c-format
+msgid "%s cant be kicked from party on this map."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:211
+#, c-format
+msgid "%s has kicked from your party."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:219
#, c-format
msgid "An unknown member tried to say: %s"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:199
+#: src/resources/notifications.h:223
#, c-format
msgid "%s is not in your party!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:203
+#: src/resources/notifications.h:227
#, c-format
msgid "You picked up %s."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:207
+#: src/resources/notifications.h:231
#, c-format
msgid "You spent %s."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:211
+#: src/resources/notifications.h:235
msgid "Cannot raise skill!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:215
+#: src/resources/notifications.h:239
msgid "Equip ammunition first."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:219
+#: src/resources/notifications.h:243
#, c-format
msgid "Trading with %s isn't possible. Trade partner is too far away."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:224
+#: src/resources/notifications.h:248
#, c-format
msgid "Trading with %s isn't possible. Character doesn't exist."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:228
+#: src/resources/notifications.h:252
msgid "Trade cancelled due to an unknown reason."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:232
+#: src/resources/notifications.h:256
#, c-format
msgid "Trade with %s cancelled."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:236
+#: src/resources/notifications.h:260
#, c-format
msgid "Unhandled trade cancel packet with %s"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:240
+#: src/resources/notifications.h:264
msgid "Failed adding item. Trade partner is over weighted."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:244
+#: src/resources/notifications.h:268
msgid "Failed adding item. Trade partner has no free slot."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:248
+#: src/resources/notifications.h:272
msgid "Failed adding item. You can't trade this item."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:252
+#: src/resources/notifications.h:276
msgid "Failed adding item for unknown reason."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:256
+#: src/resources/notifications.h:280
msgid "Trade canceled."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:260
+#: src/resources/notifications.h:284
msgid "Trade completed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:264
+#: src/resources/notifications.h:288
msgid "Kick failed!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:268
+#: src/resources/notifications.h:292
msgid "Kick succeeded!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:272
+#: src/resources/notifications.h:296
#, c-format
msgid "MVP player: %s"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:276
+#: src/resources/notifications.h:300
msgid "All whispers ignored."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:280
+#: src/resources/notifications.h:304
msgid "All whispers ignore failed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:284
+#: src/resources/notifications.h:308
msgid "All whispers unignored."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:288
+#: src/resources/notifications.h:312
msgid "All whispers unignore failed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:295
+#: src/resources/notifications.h:319
msgid "pvp off, gvg off"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:299
+#: src/resources/notifications.h:323
msgid "pvp on"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:303
+#: src/resources/notifications.h:327
msgid "gvg on"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:307
+#: src/resources/notifications.h:331
msgid "pvp on, gvg on"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:311
+#: src/resources/notifications.h:335
msgid "unknown pvp"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:315
+#: src/resources/notifications.h:339
#, c-format
msgid "Char from account %s is already in your party!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:319
+#: src/resources/notifications.h:343
#, c-format
msgid "%s blocked invite!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:323
+#: src/resources/notifications.h:347
msgid "Char is not online!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:327
+#: src/resources/notifications.h:351
msgid "Pet catch failed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:331
+#: src/resources/notifications.h:355
msgid "Pet catched."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:335
+#: src/resources/notifications.h:359
#, c-format
msgid "Pet catch unkown error: %d."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:339
+#: src/resources/notifications.h:363
msgid "Your mercenary duty hour is over."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:343
+#: src/resources/notifications.h:367
msgid "Your mercenary was killed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:347
+#: src/resources/notifications.h:371
msgid "Your mercenary was fired."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:351
+#: src/resources/notifications.h:375
msgid "Your mercenary run away."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:355
+#: src/resources/notifications.h:379
msgid "Mercenary unknown state."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:359
-msgid "Your feed your homunculus."
+#: src/resources/notifications.h:383
+msgid "You feed your homunculus."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:363
+#: src/resources/notifications.h:387
#, c-format
msgid "You cant feed homunculus, because not have %s."
msgstr ""
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:391
+msgid "Card insert failed."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:395
+msgid "Card inserted."
+msgstr ""
+
#. TRANSLATORS: chat option changed message
#: src/utils/booleanoptions.h:27
#, c-format
diff --git a/po/fi.po b/po/fi.po
index 176427ecc..d25c40a7b 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-10-08 01:19+0300\n"
-"PO-Revision-Date: 2014-09-28 10:01+0000\n"
+"POT-Creation-Date: 2014-10-10 00:16+0300\n"
+"PO-Revision-Date: 2014-10-08 10:02+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Finnish (http://www.transifex.com/projects/p/manaplus/"
"language/fi/)\n"
@@ -5170,15 +5170,13 @@ msgstr ""
#. TRANSLATORS: char select dialog. button.
#: src/gui/windows/charselectdialog.cpp:73
-#, fuzzy
msgid "Switch"
-msgstr "Vaihda sisäänkirjautumistietoja"
+msgstr ""
#. TRANSLATORS: char select dialog. button.
#: src/gui/windows/charselectdialog.cpp:75
-#, fuzzy
msgid "Password"
-msgstr "Salasana:"
+msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: updater window button
@@ -5222,9 +5220,8 @@ msgid "Please set new pincode"
msgstr ""
#: src/gui/windows/charselectdialog.cpp:240
-#, fuzzy
msgid "Please enter new name"
-msgstr "Anna nimi."
+msgstr ""
#. TRANSLATORS: char select dialog. player info message.
#: src/gui/windows/charselectdialog.cpp:259
@@ -5875,7 +5872,7 @@ msgstr "Näytä linkit ilmoituksessa"
#. TRANSLATORS: shop window dialog
#. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:776 src/net/ea/tradehandler.cpp:233
+#: src/gui/windows/shopwindow.cpp:776 src/net/ea/tradehandler.cpp:192
msgid "Request for Trade"
msgstr "Kaupantekoehdotus"
@@ -7526,19 +7523,19 @@ msgstr "Killan linna: %s"
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:191
+#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:207
msgid "Item sharing enabled."
msgstr "Saaliinjako käytössä."
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:195
+#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:211
msgid "Item sharing disabled."
msgstr "Saaliinjako poistettu käytöstä."
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:199
+#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:215
msgid "Item sharing not possible."
msgstr "Saaliinjako ei ole mahdollista."
@@ -7549,19 +7546,19 @@ msgstr "Saaliinjaon tila on tuntematon."
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:179
+#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:195
msgid "Experience sharing enabled."
msgstr "Kokemuksen jako käytössä."
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:183
+#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:199
msgid "Experience sharing disabled."
msgstr "Kokemuksen jako pois käytöstä."
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:187
+#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:203
msgid "Experience sharing not possible."
msgstr "Kokemuksen jako ei ole mahdollista."
@@ -7688,14 +7685,12 @@ msgstr "Kannat roinaa alle puolet elopainoasi, ja paranet jälleen."
#. TRANSLATORS: char rename error
#: src/net/eathena/charserverhandler.cpp:516
#: src/net/eathena/charserverhandler.cpp:553
-#, fuzzy
msgid "Character rename error."
-msgstr "Hahmo poistettu."
+msgstr ""
#: src/net/eathena/charserverhandler.cpp:531
-#, fuzzy
msgid "Character renamed."
-msgstr "Hahmo poistettu."
+msgstr ""
#. TRANSLATORS: char rename error
#: src/net/eathena/charserverhandler.cpp:544
@@ -7709,9 +7704,8 @@ msgstr ""
#. TRANSLATORS: char rename error
#: src/net/eathena/charserverhandler.cpp:557
-#, fuzzy
msgid "Character not found."
-msgstr "Hahmopisteitä: %d"
+msgstr ""
#. TRANSLATORS: player stat
#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:124
@@ -7775,9 +7769,8 @@ msgid "Speed hack detected."
msgstr "Nopeusviritelmä havaittu."
#: src/net/eathena/generalhandler.cpp:179
-#, fuzzy
msgid "Server full."
-msgstr "Palvelin:"
+msgstr ""
#: src/net/eathena/generalhandler.cpp:182
msgid "Sorry, you are underaged."
@@ -7849,18 +7842,16 @@ msgid "Ip limited access."
msgstr ""
#: src/net/eathena/generalhandler.cpp:235
-#, fuzzy
msgid "Over characters list."
-msgstr "Hahmo poistettu."
+msgstr ""
#: src/net/eathena/generalhandler.cpp:238
msgid "Ip blocked."
msgstr ""
#: src/net/eathena/generalhandler.cpp:241
-#, fuzzy
msgid "Invalid password count."
-msgstr "Vanha salsana on väärä."
+msgstr ""
#: src/net/eathena/generalhandler.cpp:244
msgid "Not allowed race."
@@ -8027,13 +8018,13 @@ msgid "Huh? What's that?"
msgstr "Siis mikä?"
#. TRANSLATORS: trade header
-#: src/net/ea/tradehandler.cpp:100
+#: src/net/ea/tradehandler.cpp:105
#, c-format
msgid "Trade: You and %s"
msgstr "Kauppa: sinä ja %s"
#. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:235
+#: src/net/ea/tradehandler.cpp:194
#, c-format
msgid "%s wants to trade with you, do you accept?"
msgstr "%s haluaa tehdä kauppaa kanssasi, katsotko tarjouksen?"
@@ -8252,430 +8243,455 @@ msgstr "Ostaminen epäonnistui."
#. TRANSLATORS: notification message
#: src/resources/notifications.h:47
+#, fuzzy
+msgid "Unable to buy. You not have enought money."
+msgstr "Sinulla ei ole tarpeeksi rahaa."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:51
+#, fuzzy
+msgid "Unable to buy. You overweight."
+msgstr "Ostaminen epäonnistui."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:55
+msgid "Unable to buy. You have too many items."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:59
msgid "Nothing to sell."
msgstr "Ei mitään myytävää."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:51
+#: src/resources/notifications.h:63
msgid "Thanks for selling."
msgstr "Kiitos kaupoista."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:55
+#: src/resources/notifications.h:67
msgid "Unable to sell."
msgstr "Myyminen epäonnistui."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:59
+#: src/resources/notifications.h:71
msgid "Unable to sell while trading."
msgstr "Kaupankäynnin aikana ei voi myydä kaupasta."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:63
+#: src/resources/notifications.h:75
msgid "Unable to sell unsellable item."
msgstr "Myyntikelvotonta tavaraa ei voi myydä."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:67
+#: src/resources/notifications.h:79
#, c-format
msgid "Online users: %d"
msgstr "Käyttäjiä palvelimella: %d"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:71
+#: src/resources/notifications.h:83
msgid "Guild created."
msgstr "Kilta luotu."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:75
+#: src/resources/notifications.h:87
msgid "You are already in guild."
msgstr "Olet jo killassa."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:79
+#: src/resources/notifications.h:91
msgid "Emperium check failed."
msgstr "Emperium-tarkistus epäonnistui."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:83
+#: src/resources/notifications.h:95
msgid "Unknown server response."
msgstr "Tuntematon palvelimen vastaus."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:87
+#: src/resources/notifications.h:99
msgid "You have left the guild."
msgstr "Olet eronnut killasta."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:91
+#: src/resources/notifications.h:103
msgid "Could not invite user to guild."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:95
+#: src/resources/notifications.h:107
msgid "User rejected guild invite."
msgstr "Käyttäjä ei ottanut kiltakutsua vastaan."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:99
+#: src/resources/notifications.h:111
msgid "User is now part of your guild."
msgstr "Käyttäjä liittyi kiltaasi."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:103
+#: src/resources/notifications.h:115
msgid "Your guild is full."
msgstr "Kiltasi on täynnä."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:107
+#: src/resources/notifications.h:119
msgid "Unknown guild invite response."
msgstr "Tuntematon vastaus kiltakutsuun."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:111
+#: src/resources/notifications.h:123
#, c-format
msgid "%s has left your guild."
msgstr "%s on eronnut killastasi."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:115
+#: src/resources/notifications.h:127
msgid "You were kicked from guild."
msgstr "Sinut potkittiin ulos killasta."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:119
+#: src/resources/notifications.h:131
#, c-format
msgid "%s has kicked from your guild."
msgstr "%s on potkittu ulos killastasi."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:123
+#: src/resources/notifications.h:135
msgid "Failed to use item."
msgstr "Tavaran käyttö ei onnistunut."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:127
+#: src/resources/notifications.h:139
msgid "Unable to equip."
msgstr "Käyttöönotto ei onnistunut."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:131
+#: src/resources/notifications.h:143
+msgid "Unable to equip because you have wrong level."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:147
msgid "Could not create party."
msgstr "Ryhmän luonti epäonnistui."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:135
+#: src/resources/notifications.h:151
msgid "Party successfully created."
msgstr "Ryhmä luotu."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:139
+#: src/resources/notifications.h:155
msgid "You have left the party."
msgstr "Erosit ryhmästä."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:143
-#, fuzzy
+#: src/resources/notifications.h:159
msgid "You cant left party on this map."
-msgstr "Erosit ryhmästä."
+msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:147
-#, fuzzy
+#: src/resources/notifications.h:163
msgid "You was kicked from party."
-msgstr "Sinut potkittiin ulos killasta."
+msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:151
-msgid "You cant be kicked kicked from party on this map."
+#: src/resources/notifications.h:167
+msgid "You cant be kicked from party on this map."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:155
+#: src/resources/notifications.h:171
#, c-format
msgid "%s has joined your party."
msgstr "%s on liittynyt ryhmääsi."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:159
+#: src/resources/notifications.h:175
#, c-format
msgid "%s is already a member of a party."
msgstr "%s kuuluu jo johonkin ryhmään."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:163
+#: src/resources/notifications.h:179
#, c-format
msgid "%s refused your invitation."
msgstr "%s ei ottanut kutsuasi vastaan."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:167
+#: src/resources/notifications.h:183
#, c-format
msgid "%s is now a member of your party."
msgstr "%s on nyt ryhmäsi jäsen."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:171
+#: src/resources/notifications.h:187
#, c-format
msgid "%s can't join your party because party is full."
msgstr "%s ei voi liittyä ryhmääsi, koska se on täynnä."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:175
+#: src/resources/notifications.h:191
#, c-format
msgid "QQQ Unknown invite response for %s."
msgstr "QQQ Tuntematon kutsuvastaus kohteella %s."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:203
+#: src/resources/notifications.h:219
#, c-format
msgid "%s has left your party."
msgstr "%s on eronnut ryhmästä."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:207 src/resources/notifications.h:215
-#, fuzzy, c-format
+#: src/resources/notifications.h:223 src/resources/notifications.h:231
+#, c-format
msgid "%s cant be kicked from party on this map."
-msgstr "%s on potkittu ulos killastasi."
+msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:211
-#, fuzzy, c-format
+#: src/resources/notifications.h:227
+#, c-format
msgid "%s has kicked from your party."
-msgstr "%s on potkittu ulos killastasi."
+msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:219
+#: src/resources/notifications.h:235
#, c-format
msgid "An unknown member tried to say: %s"
msgstr "Tuntematon jäsen yritti sanoa: %s"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:223
+#: src/resources/notifications.h:239
#, c-format
msgid "%s is not in your party!"
msgstr "%s ei ole ryhmässäsi!"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:227
+#: src/resources/notifications.h:243
#, c-format
msgid "You picked up %s."
msgstr "%s poimittu."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:231
+#: src/resources/notifications.h:247
#, c-format
msgid "You spent %s."
msgstr "Käytit %s."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:235
+#: src/resources/notifications.h:251
msgid "Cannot raise skill!"
msgstr "Taidon korottaminen epäonnistui!"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:239
+#: src/resources/notifications.h:255
msgid "Equip ammunition first."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:243
+#: src/resources/notifications.h:259
#, c-format
msgid "Trading with %s isn't possible. Trade partner is too far away."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:248
+#: src/resources/notifications.h:264
#, c-format
msgid "Trading with %s isn't possible. Character doesn't exist."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:252
+#: src/resources/notifications.h:268
msgid "Trade cancelled due to an unknown reason."
msgstr "Kaupanteko keskeytyi tuntemattomasta syystä."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:256
+#: src/resources/notifications.h:272
#, c-format
msgid "Trade with %s cancelled."
msgstr "Kaupanteko pelaajan %s kanssa peruttu."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:260
+#: src/resources/notifications.h:276
+#, fuzzy, c-format
+msgid "Trade with %s cancelled, because player is busy"
+msgstr "Kaupanteko pelaajan %s kanssa peruttu."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:280
#, c-format
msgid "Unhandled trade cancel packet with %s"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:264
+#: src/resources/notifications.h:284
msgid "Failed adding item. Trade partner is over weighted."
msgstr ""
"Tavaran lisääminen epäonnistui; kauppakumppanilla on liian painava lasti."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:268
+#: src/resources/notifications.h:288
msgid "Failed adding item. Trade partner has no free slot."
msgstr "Tavaran lisääminen epäonnistui; kauppakumppanilla ei ole tilaa sille."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:272
+#: src/resources/notifications.h:292
msgid "Failed adding item. You can't trade this item."
msgstr "Tavaran lisääminen epäonnistui. Et voi kaupitella sitä."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:276
+#: src/resources/notifications.h:296
msgid "Failed adding item for unknown reason."
msgstr "Tavaran lisääminen epäonnistui tuntemattomasta syystä."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:280
+#: src/resources/notifications.h:300
msgid "Trade canceled."
msgstr "Kaupat peruttu."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:284
+#: src/resources/notifications.h:304
msgid "Trade completed."
msgstr "Kaupat tuli."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:288
+#: src/resources/notifications.h:308
msgid "Kick failed!"
msgstr "Potkiminen epäonnistui!"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:292
+#: src/resources/notifications.h:312
msgid "Kick succeeded!"
msgstr "Potkiminen onnistui!"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:296
+#: src/resources/notifications.h:316
#, c-format
msgid "MVP player: %s"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:300
+#: src/resources/notifications.h:320
msgid "All whispers ignored."
msgstr "Kaikki kuiskaukset jätetään huomiotta."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:304
+#: src/resources/notifications.h:324
msgid "All whispers ignore failed."
msgstr "Kuiskausten huomiotta jättäminen epäonnistui."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:308
+#: src/resources/notifications.h:328
msgid "All whispers unignored."
msgstr "Kaikki kuiskaukset huomioidaan taas."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:312
+#: src/resources/notifications.h:332
msgid "All whispers unignore failed."
msgstr "Kuiskausten huomiointi epäonnistui."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:319
+#: src/resources/notifications.h:339
msgid "pvp off, gvg off"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:323
+#: src/resources/notifications.h:343
msgid "pvp on"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:327
+#: src/resources/notifications.h:347
msgid "gvg on"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:331
+#: src/resources/notifications.h:351
msgid "pvp on, gvg on"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:335
+#: src/resources/notifications.h:355
msgid "unknown pvp"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:339
+#: src/resources/notifications.h:359
#, c-format
msgid "Char from account %s is already in your party!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:343
+#: src/resources/notifications.h:363
#, c-format
msgid "%s blocked invite!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:347
+#: src/resources/notifications.h:367
msgid "Char is not online!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:351
+#: src/resources/notifications.h:371
msgid "Pet catch failed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:355
+#: src/resources/notifications.h:375
msgid "Pet catched."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:359
+#: src/resources/notifications.h:379
#, c-format
msgid "Pet catch unkown error: %d."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:363
+#: src/resources/notifications.h:383
msgid "Your mercenary duty hour is over."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:367
+#: src/resources/notifications.h:387
msgid "Your mercenary was killed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:371
+#: src/resources/notifications.h:391
msgid "Your mercenary was fired."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:375
+#: src/resources/notifications.h:395
msgid "Your mercenary run away."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:379
+#: src/resources/notifications.h:399
msgid "Mercenary unknown state."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:383
+#: src/resources/notifications.h:403
msgid "You feed your homunculus."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:387
+#: src/resources/notifications.h:407
#, c-format
msgid "You cant feed homunculus, because not have %s."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:391
-#, fuzzy
+#: src/resources/notifications.h:411
msgid "Card insert failed."
-msgstr "Kauppa epäonnistui!"
+msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:395
+#: src/resources/notifications.h:415
msgid "Card inserted."
msgstr ""
diff --git a/po/fr.po b/po/fr.po
index 6c47aedad..75bb55471 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -19,9 +19,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-10-08 01:19+0300\n"
-"PO-Revision-Date: 2014-09-28 17:24+0000\n"
-"Last-Translator: Alige <aligetmw@hotmail.fr>\n"
+"POT-Creation-Date: 2014-10-10 00:16+0300\n"
+"PO-Revision-Date: 2014-10-08 10:02+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: French (http://www.transifex.com/projects/p/manaplus/language/"
"fr/)\n"
"Language: fr\n"
@@ -2564,15 +2564,13 @@ msgstr ""
#. TRANSLATORS: palette color
#: src/gui/userpalette.cpp:223
-#, fuzzy
msgid "Mercenary"
-msgstr "Cibler le mercenaire"
+msgstr ""
#. TRANSLATORS: palette color
#: src/gui/userpalette.cpp:225
-#, fuzzy
msgid "Homunculus"
-msgstr "Virer ton homoncule"
+msgstr ""
#: src/gui/widgets/characterdisplay.cpp:135
#, c-format
@@ -5203,15 +5201,13 @@ msgstr "Compte %s (dernier ouverture le %s)"
#. TRANSLATORS: char select dialog. button.
#: src/gui/windows/charselectdialog.cpp:73
-#, fuzzy
msgid "Switch"
-msgstr "Changer de compte"
+msgstr ""
#. TRANSLATORS: char select dialog. button.
#: src/gui/windows/charselectdialog.cpp:75
-#, fuzzy
msgid "Password"
-msgstr "Mot de passe :"
+msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: updater window button
@@ -5255,9 +5251,8 @@ msgid "Please set new pincode"
msgstr "Définis le nouveau code pin"
#: src/gui/windows/charselectdialog.cpp:240
-#, fuzzy
msgid "Please enter new name"
-msgstr "Définis le nouveau code pin"
+msgstr ""
#. TRANSLATORS: char select dialog. player info message.
#: src/gui/windows/charselectdialog.cpp:259
@@ -5913,7 +5908,7 @@ msgstr "Montrer les liens dans l'annonce"
#. TRANSLATORS: shop window dialog
#. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:776 src/net/ea/tradehandler.cpp:233
+#: src/gui/windows/shopwindow.cpp:776 src/net/ea/tradehandler.cpp:192
msgid "Request for Trade"
msgstr "Demande d'échange"
@@ -7580,19 +7575,19 @@ msgstr "Château de la guilde : %s"
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:191
+#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:207
msgid "Item sharing enabled."
msgstr "Partage d'objet activé."
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:195
+#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:211
msgid "Item sharing disabled."
msgstr "Partage d'objet désactivé."
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:199
+#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:215
msgid "Item sharing not possible."
msgstr "Partage d'objet impossible."
@@ -7603,19 +7598,19 @@ msgstr "Paramètre de partage d'objets inconnu."
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:179
+#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:195
msgid "Experience sharing enabled."
msgstr "Partage d'expérience autorisé."
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:183
+#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:199
msgid "Experience sharing disabled."
msgstr "Partage d'expérience non autorisé."
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:187
+#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:203
msgid "Experience sharing not possible."
msgstr "Partage d'expérience impossible."
@@ -7747,14 +7742,12 @@ msgstr ""
#. TRANSLATORS: char rename error
#: src/net/eathena/charserverhandler.cpp:516
#: src/net/eathena/charserverhandler.cpp:553
-#, fuzzy
msgid "Character rename error."
-msgstr "Personnage supprimé."
+msgstr ""
#: src/net/eathena/charserverhandler.cpp:531
-#, fuzzy
msgid "Character renamed."
-msgstr "Personnage supprimé."
+msgstr ""
#. TRANSLATORS: char rename error
#: src/net/eathena/charserverhandler.cpp:544
@@ -7768,9 +7761,8 @@ msgstr ""
#. TRANSLATORS: char rename error
#: src/net/eathena/charserverhandler.cpp:557
-#, fuzzy
msgid "Character not found."
-msgstr "Points de caractéristiques du personnage : %d"
+msgstr ""
#. TRANSLATORS: player stat
#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:124
@@ -7834,9 +7826,8 @@ msgid "Speed hack detected."
msgstr "Speed hack détecté."
#: src/net/eathena/generalhandler.cpp:179
-#, fuzzy
msgid "Server full."
-msgstr "Serveur :"
+msgstr ""
#: src/net/eathena/generalhandler.cpp:182
msgid "Sorry, you are underaged."
@@ -7908,18 +7899,16 @@ msgid "Ip limited access."
msgstr ""
#: src/net/eathena/generalhandler.cpp:235
-#, fuzzy
msgid "Over characters list."
-msgstr "Personnage supprimé."
+msgstr ""
#: src/net/eathena/generalhandler.cpp:238
msgid "Ip blocked."
msgstr ""
#: src/net/eathena/generalhandler.cpp:241
-#, fuzzy
msgid "Invalid password count."
-msgstr "Ancien mot de passe incorrect."
+msgstr ""
#: src/net/eathena/generalhandler.cpp:244
msgid "Not allowed race."
@@ -8086,13 +8075,13 @@ msgid "Huh? What's that?"
msgstr "Hé ? Qu'est-ce donc que cela ?"
#. TRANSLATORS: trade header
-#: src/net/ea/tradehandler.cpp:100
+#: src/net/ea/tradehandler.cpp:105
#, c-format
msgid "Trade: You and %s"
msgstr "Échange : Toi et %s"
#. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:235
+#: src/net/ea/tradehandler.cpp:194
#, c-format
msgid "%s wants to trade with you, do you accept?"
msgstr "%s souhaite réaliser un échange avec vous. Acceptez-vous ?"
@@ -8311,431 +8300,455 @@ msgstr "Incapable d'acheter."
#. TRANSLATORS: notification message
#: src/resources/notifications.h:47
+#, fuzzy
+msgid "Unable to buy. You not have enought money."
+msgstr "Bous n'avez pas assez d'argent."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:51
+#, fuzzy
+msgid "Unable to buy. You overweight."
+msgstr "Incapable d'acheter."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:55
+msgid "Unable to buy. You have too many items."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:59
msgid "Nothing to sell."
msgstr "Rien à vendre."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:51
+#: src/resources/notifications.h:63
msgid "Thanks for selling."
msgstr "Merci de ta vente."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:55
+#: src/resources/notifications.h:67
msgid "Unable to sell."
msgstr "Incapable de vendre."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:59
+#: src/resources/notifications.h:71
msgid "Unable to sell while trading."
msgstr "Impossible de vendre pendant un échange en cours."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:63
+#: src/resources/notifications.h:75
msgid "Unable to sell unsellable item."
msgstr "Rendre possible la vente d'objets invendable."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:67
+#: src/resources/notifications.h:79
#, c-format
msgid "Online users: %d"
msgstr "Joueurs en ligne : %d"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:71
+#: src/resources/notifications.h:83
msgid "Guild created."
msgstr "Guilde créée."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:75
+#: src/resources/notifications.h:87
msgid "You are already in guild."
msgstr "Tu es déjà membre d'une guilde."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:79
+#: src/resources/notifications.h:91
msgid "Emperium check failed."
msgstr "Erreur dans la création de la guilde."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:83
+#: src/resources/notifications.h:95
msgid "Unknown server response."
msgstr "Réponse inconnue du serveur."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:87
+#: src/resources/notifications.h:99
msgid "You have left the guild."
msgstr "Tu as quitté la guilde."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:91
+#: src/resources/notifications.h:103
msgid "Could not invite user to guild."
msgstr "N'a pas pu inviter l'utilisateur à la guilde."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:95
+#: src/resources/notifications.h:107
msgid "User rejected guild invite."
msgstr "Le joueur a refusé l'invitation dans la guilde."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:99
+#: src/resources/notifications.h:111
msgid "User is now part of your guild."
msgstr "%s est maintenant membre de la guilde."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:103
+#: src/resources/notifications.h:115
msgid "Your guild is full."
msgstr "Ta guilde est complète."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:107
+#: src/resources/notifications.h:119
msgid "Unknown guild invite response."
msgstr "Réponse d'invitation à la guilde inconnue."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:111
+#: src/resources/notifications.h:123
#, c-format
msgid "%s has left your guild."
msgstr "%s a quitté ta guilde."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:115
+#: src/resources/notifications.h:127
msgid "You were kicked from guild."
msgstr "Vous avez été exclu de la guilde."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:119
+#: src/resources/notifications.h:131
#, c-format
msgid "%s has kicked from your guild."
msgstr "%s a éjecté quelqu'un de ta guilde."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:123
+#: src/resources/notifications.h:135
msgid "Failed to use item."
msgstr "Impossible d'utiliser l'objet."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:127
+#: src/resources/notifications.h:139
msgid "Unable to equip."
msgstr "Impossible d'équiper cet objet."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:131
+#: src/resources/notifications.h:143
+msgid "Unable to equip because you have wrong level."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:147
msgid "Could not create party."
msgstr "Le groupe n'a pu être créé."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:135
+#: src/resources/notifications.h:151
msgid "Party successfully created."
msgstr "Création du groupe réussie."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:139
+#: src/resources/notifications.h:155
msgid "You have left the party."
msgstr "Tu as quitté le groupe."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:143
-#, fuzzy
+#: src/resources/notifications.h:159
msgid "You cant left party on this map."
-msgstr "Tu as quitté le groupe."
+msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:147
-#, fuzzy
+#: src/resources/notifications.h:163
msgid "You was kicked from party."
-msgstr "Vous avez été exclu de la guilde."
+msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:151
-msgid "You cant be kicked kicked from party on this map."
+#: src/resources/notifications.h:167
+msgid "You cant be kicked from party on this map."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:155
+#: src/resources/notifications.h:171
#, c-format
msgid "%s has joined your party."
msgstr "%s a rejoint ton groupe."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:159
+#: src/resources/notifications.h:175
#, c-format
msgid "%s is already a member of a party."
msgstr "%s est déjà membre du groupe."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:163
+#: src/resources/notifications.h:179
#, c-format
msgid "%s refused your invitation."
msgstr "%s a refusé ton invitation."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:167
+#: src/resources/notifications.h:183
#, c-format
msgid "%s is now a member of your party."
msgstr "%s est maintenant membre de ton groupe."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:171
+#: src/resources/notifications.h:187
#, c-format
msgid "%s can't join your party because party is full."
msgstr "%s ne peut rejoindre ton groupe. Celui-ci est complet."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:175
+#: src/resources/notifications.h:191
#, c-format
msgid "QQQ Unknown invite response for %s."
msgstr "QQQ Erreur inconnue sur l'invitation de %s."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:203
+#: src/resources/notifications.h:219
#, c-format
msgid "%s has left your party."
msgstr "%s a quitté le groupe."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:207 src/resources/notifications.h:215
-#, fuzzy, c-format
+#: src/resources/notifications.h:223 src/resources/notifications.h:231
+#, c-format
msgid "%s cant be kicked from party on this map."
-msgstr "%s a éjecté quelqu'un de ta guilde."
+msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:211
-#, fuzzy, c-format
+#: src/resources/notifications.h:227
+#, c-format
msgid "%s has kicked from your party."
-msgstr "%s a éjecté quelqu'un de ta guilde."
+msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:219
+#: src/resources/notifications.h:235
#, c-format
msgid "An unknown member tried to say: %s"
msgstr "Un membre inconnu a essayé de dire : %s"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:223
+#: src/resources/notifications.h:239
#, c-format
msgid "%s is not in your party!"
msgstr "%s n'est pas membre de ton groupe !"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:227
+#: src/resources/notifications.h:243
#, c-format
msgid "You picked up %s."
msgstr "Vous avez ramassé %s."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:231
+#: src/resources/notifications.h:247
#, c-format
msgid "You spent %s."
msgstr "Vous avez dépensé %s."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:235
+#: src/resources/notifications.h:251
msgid "Cannot raise skill!"
msgstr "La compétence ne peut pas être augmentée !"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:239
+#: src/resources/notifications.h:255
msgid "Equip ammunition first."
msgstr "Équipes tes munitions en premier."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:243
+#: src/resources/notifications.h:259
#, c-format
msgid "Trading with %s isn't possible. Trade partner is too far away."
msgstr "Troquer ave %s n'est pas possible. Cette personne est trop loin."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:248
+#: src/resources/notifications.h:264
#, c-format
msgid "Trading with %s isn't possible. Character doesn't exist."
msgstr "Troquer ave %s n'est pas possible. Ce personnage n'existe pas."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:252
+#: src/resources/notifications.h:268
msgid "Trade cancelled due to an unknown reason."
msgstr "Échange annulé pour une raison inconnue."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:256
+#: src/resources/notifications.h:272
#, c-format
msgid "Trade with %s cancelled."
msgstr "Échange avec %s annulé."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:260
+#: src/resources/notifications.h:276
+#, fuzzy, c-format
+msgid "Trade with %s cancelled, because player is busy"
+msgstr "Échange avec %s annulé."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:280
#, c-format
msgid "Unhandled trade cancel packet with %s"
msgstr "Annulation du paquet d'échange non contrôlée avec %s"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:264
+#: src/resources/notifications.h:284
msgid "Failed adding item. Trade partner is over weighted."
msgstr "Impossible de rajouter un objet. Ton partenaire est surchargé."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:268
+#: src/resources/notifications.h:288
msgid "Failed adding item. Trade partner has no free slot."
msgstr ""
"Impossible de rajouter un objet. Ton partenaire n'a plus de place libre."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:272
+#: src/resources/notifications.h:292
msgid "Failed adding item. You can't trade this item."
msgstr "Impossible d'ajouter l'objet. Celui-ci n'est pas échangeable."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:276
+#: src/resources/notifications.h:296
msgid "Failed adding item for unknown reason."
msgstr "Impossible de rajouter un objet pour une raison inconnue."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:280
+#: src/resources/notifications.h:300
msgid "Trade canceled."
msgstr "Échange annulé."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:284
+#: src/resources/notifications.h:304
msgid "Trade completed."
msgstr "Échange finalisé."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:288
+#: src/resources/notifications.h:308
msgid "Kick failed!"
msgstr "Impossible de sortir la personne !"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:292
+#: src/resources/notifications.h:312
msgid "Kick succeeded!"
msgstr "Exclusion effectuée avec succès !"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:296
+#: src/resources/notifications.h:316
#, c-format
msgid "MVP player: %s"
msgstr "MVP joueur : %s"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:300
+#: src/resources/notifications.h:320
msgid "All whispers ignored."
msgstr "Tous les messages privés sont ignorés."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:304
+#: src/resources/notifications.h:324
msgid "All whispers ignore failed."
msgstr "La mise en silence de tout les chuchotements a échoué."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:308
+#: src/resources/notifications.h:328
msgid "All whispers unignored."
msgstr "Tous les messages privés ne sont plus ignorés."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:312
+#: src/resources/notifications.h:332
msgid "All whispers unignore failed."
msgstr "La remise en activité de tous les messages privés a échoué."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:319
+#: src/resources/notifications.h:339
msgid "pvp off, gvg off"
msgstr "pvp off, gvg off"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:323
+#: src/resources/notifications.h:343
msgid "pvp on"
msgstr "pvp on"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:327
+#: src/resources/notifications.h:347
msgid "gvg on"
msgstr "gvg on"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:331
+#: src/resources/notifications.h:351
msgid "pvp on, gvg on"
msgstr "pvp on, gvg on"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:335
+#: src/resources/notifications.h:355
msgid "unknown pvp"
msgstr "pvp inconnu"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:339
+#: src/resources/notifications.h:359
#, c-format
msgid "Char from account %s is already in your party!"
msgstr "Perso du compte %s est déjà dans ton groupe !"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:343
+#: src/resources/notifications.h:363
#, c-format
msgid "%s blocked invite!"
msgstr "%s a bloqué l'invitation !"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:347
+#: src/resources/notifications.h:367
msgid "Char is not online!"
msgstr "Perso n'est pas en ligne !"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:351
+#: src/resources/notifications.h:371
msgid "Pet catch failed."
msgstr "Echec de capture du familier."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:355
+#: src/resources/notifications.h:375
msgid "Pet catched."
msgstr "Familier capturé."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:359
+#: src/resources/notifications.h:379
#, c-format
msgid "Pet catch unkown error: %d."
msgstr "Erreur inconnue de capture du familier : %d."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:363
+#: src/resources/notifications.h:383
msgid "Your mercenary duty hour is over."
msgstr "Ton heure de devoir de mercenaire est terminée."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:367
+#: src/resources/notifications.h:387
msgid "Your mercenary was killed."
msgstr "Ton mercenaire a été tué."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:371
+#: src/resources/notifications.h:391
msgid "Your mercenary was fired."
msgstr "Ton mercenaire a été viré."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:375
+#: src/resources/notifications.h:395
msgid "Your mercenary run away."
msgstr "Ton mercenaire a fuit."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:379
+#: src/resources/notifications.h:399
msgid "Mercenary unknown state."
msgstr "Etat inconnu du mercenaire."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:383
-#, fuzzy
+#: src/resources/notifications.h:403
msgid "You feed your homunculus."
-msgstr "Tu nourris ton homoncule."
+msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:387
+#: src/resources/notifications.h:407
#, c-format
msgid "You cant feed homunculus, because not have %s."
msgstr "Tu ne peux pas nourrir ton homoncule, car tu n'as pas de %s."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:391
-#, fuzzy
+#: src/resources/notifications.h:411
msgid "Card insert failed."
-msgstr "Échec de la transaction !"
+msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:395
+#: src/resources/notifications.h:415
msgid "Card inserted."
msgstr ""
@@ -8745,9 +8758,3 @@ msgstr ""
msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
msgstr ""
"Les options de /%s sont \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-
-#~ msgid "Enable auction bot support"
-#~ msgstr "Activer support pour le Bot aux Enchères"
-
-#~ msgid "Auction"
-#~ msgstr "Enchères"
diff --git a/po/he.po b/po/he.po
index e82d07e32..85ebd0f07 100644
--- a/po/he.po
+++ b/po/he.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-27 13:23+0300\n"
-"PO-Revision-Date: 2014-09-28 10:01+0000\n"
+"POT-Creation-Date: 2014-10-08 01:19+0300\n"
+"PO-Revision-Date: 2014-10-08 10:02+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/manaplus/language/he/)\n"
"MIME-Version: 1.0\n"
@@ -32,7 +32,7 @@ msgstr ""
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:131 src/client.cpp:1463 src/client.cpp:1490
+#: src/actions/actions.cpp:131 src/client.cpp:1461 src/client.cpp:1488
#: src/gamemodifiers.cpp:423 src/gui/widgets/tabs/setup_input.cpp:163
#: src/gui/widgets/tabs/setup_theme.cpp:312
#: src/gui/widgets/tabs/setup_theme.cpp:343
@@ -43,8 +43,8 @@ msgstr ""
#: src/gui/windows/changeemaildialog.cpp:170
#: src/gui/windows/changepassworddialog.cpp:160
#: src/gui/windows/charcreatedialog.cpp:373
-#: src/gui/windows/charselectdialog.cpp:255
-#: src/gui/windows/charselectdialog.cpp:291 src/gui/windows/editdialog.cpp:49
+#: src/gui/windows/charselectdialog.cpp:277
+#: src/gui/windows/charselectdialog.cpp:313 src/gui/windows/editdialog.cpp:49
#: src/gui/windows/editserverdialog.cpp:61
#: src/gui/windows/editserverdialog.cpp:208
#: src/gui/windows/itemamountwindow.cpp:158 src/gui/windows/quitdialog.cpp:70
@@ -52,7 +52,9 @@ msgstr ""
#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
#: src/net/ea/charserverhandler.cpp:143 src/net/ea/charserverhandler.cpp:162
#: src/net/ea/charserverhandler.cpp:175 src/net/ea/gamehandler.cpp:79
-#: src/net/ea/playerhandler.cpp:263 src/net/ea/playerhandler.cpp:279
+#: src/net/ea/playerhandler.cpp:424 src/net/ea/playerhandler.cpp:440
+#: src/net/eathena/charserverhandler.cpp:533
+#: src/net/eathena/charserverhandler.cpp:563
msgid "OK"
msgstr "אישור"
@@ -176,7 +178,7 @@ msgstr ""
#. TRANSLATORS: party invite message
#. TRANSLATORS: change relation
-#: src/actions/chat.cpp:303 src/actions/commands.cpp:65
+#: src/actions/chat.cpp:303 src/actions/commands.cpp:64
msgid "Please specify a name."
msgstr ""
@@ -199,75 +201,75 @@ msgid "Message now closes chat."
msgstr "ההודעה כעת סוגרת את תיבת הטקסט."
#. TRANSLATORS: change relation
-#: src/actions/commands.cpp:108
+#: src/actions/commands.cpp:107
#, c-format
msgid "Player already %s!"
msgstr ""
#. TRANSLATORS: change relation
-#: src/actions/commands.cpp:120
+#: src/actions/commands.cpp:119
#, c-format
msgid "Player successfully %s!"
msgstr ""
#. TRANSLATORS: change relation
-#: src/actions/commands.cpp:122
+#: src/actions/commands.cpp:121
#, c-format
msgid "Player could not be %s!"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:153
+#: src/actions/commands.cpp:152
msgid "Player wasn't ignored!"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:162
+#: src/actions/commands.cpp:161
msgid "Player no longer ignored!"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:164
+#: src/actions/commands.cpp:163
msgid "Player could not be unignored!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/actions/commands.cpp:179
+#: src/actions/commands.cpp:178
msgid "Player already erased!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/actions/commands.cpp:192
+#: src/actions/commands.cpp:191
msgid "Player no longer erased!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/actions/commands.cpp:194
+#: src/actions/commands.cpp:193
msgid "Player could not be erased!"
msgstr ""
#. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:201
+#: src/actions/commands.cpp:200
msgid "friend"
msgstr ""
#. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:208
+#: src/actions/commands.cpp:207
msgid "disregarded"
msgstr ""
#. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:215
+#: src/actions/commands.cpp:214
msgid "neutral"
msgstr ""
#. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:222
+#: src/actions/commands.cpp:221
msgid "blacklisted"
msgstr ""
#. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:229
+#: src/actions/commands.cpp:228
msgid "enemy"
msgstr ""
@@ -282,77 +284,77 @@ msgid "Accepting incoming trade requests"
msgstr "מאשר הצעות סחר נכנסות"
#. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1306
+#: src/actormanager.cpp:1310
msgid "Visible on map"
msgstr ""
#. TRANSLATORS: default race name
-#: src/being/being.cpp:389
+#: src/being/being.cpp:393
msgid "Human"
msgstr ""
-#: src/being/being.cpp:556
+#: src/being/being.cpp:560
msgid "dodge"
msgstr ""
-#: src/being/being.cpp:556
+#: src/being/being.cpp:560
msgid "miss"
msgstr ""
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1865 src/gui/windows/whoisonline.cpp:855
+#: src/being/being.cpp:1869 src/gui/windows/whoisonline.cpp:855
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1870 src/gui/windows/whoisonline.cpp:860
+#: src/being/being.cpp:1874 src/gui/windows/whoisonline.cpp:860
msgid "I"
msgstr ""
#. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:379
+#: src/being/localplayer.cpp:380
#, c-format
msgid "You were killed by %s"
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:824
+#: src/being/localplayer.cpp:825
msgid "Tried to pick up nonexistent item."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:828
+#: src/being/localplayer.cpp:829
msgid "Item is too heavy."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:832
+#: src/being/localplayer.cpp:833
msgid "Item is too far away."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:836
+#: src/being/localplayer.cpp:837
msgid "Inventory is full."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:840
+#: src/being/localplayer.cpp:841
msgid "Stack is too big."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:844
+#: src/being/localplayer.cpp:845
msgid "Item belongs to someone else."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:848
+#: src/being/localplayer.cpp:849
msgid "Unknown problem picking up item."
msgstr ""
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:872
+#: src/being/localplayer.cpp:873
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -361,43 +363,43 @@ msgstr[1] ""
#. TRANSLATORS: this is normal experience
#. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1054 src/being/localplayer.cpp:1055
-#: src/being/localplayer.cpp:1091
+#: src/being/localplayer.cpp:1055 src/being/localplayer.cpp:1056
+#: src/being/localplayer.cpp:1092
msgid "xp"
msgstr ""
#. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1059 src/being/localplayer.cpp:1065
-#: src/being/localplayer.cpp:1071
+#: src/being/localplayer.cpp:1060 src/being/localplayer.cpp:1066
+#: src/being/localplayer.cpp:1072
msgid "job"
msgstr ""
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2794
+#: src/being/localplayer.cpp:2795
#, c-format
msgid "Follow: %s"
msgstr ""
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2800 src/being/localplayer.cpp:2825
+#: src/being/localplayer.cpp:2801 src/being/localplayer.cpp:2826
msgid "Follow canceled"
msgstr ""
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2810
+#: src/being/localplayer.cpp:2811
#, c-format
msgid "Imitation: %s"
msgstr ""
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2816 src/being/localplayer.cpp:2830
+#: src/being/localplayer.cpp:2817 src/being/localplayer.cpp:2831
msgid "Imitation canceled"
msgstr ""
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3180
+#: src/being/localplayer.cpp:3181
#, c-format
msgid "You see %s"
msgstr ""
@@ -435,37 +437,37 @@ msgstr ""
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:920 src/gui/windowmenu.cpp:162
+#: src/client.cpp:918 src/gui/windowmenu.cpp:162
#: src/gui/windows/setupwindow.cpp:62
msgid "Setup"
msgstr "הגדרות"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:923 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:921 src/gui/widgets/tabs/setup_perfomance.cpp:54
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:926 src/gui/widgets/tabs/setup_video.cpp:105
+#: src/client.cpp:924 src/gui/widgets/tabs/setup_video.cpp:105
msgid "Video"
msgstr "וידאו"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:929 src/gui/widgets/tabs/setup_theme.cpp:122
+#: src/client.cpp:927 src/gui/widgets/tabs/setup_theme.cpp:122
msgid "Theme"
msgstr ""
#. TRANSLATORS: theme tab quick button
-#: src/client.cpp:932
+#: src/client.cpp:930
msgid "About"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:935 src/gui/windowmenu.cpp:74
+#: src/client.cpp:933 src/gui/windowmenu.cpp:74
#: src/gui/windows/helpwindow.cpp:53
msgid "Help"
msgstr "עזרה"
@@ -481,42 +483,42 @@ msgstr "עזרה"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:939 src/client.cpp:1391 src/client.cpp:1405
+#: src/client.cpp:937 src/client.cpp:1389 src/client.cpp:1403
#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:691
#: src/gui/popups/popupmenu.cpp:923 src/gui/windows/didyouknowwindow.cpp:81
#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:74
#: src/gui/windows/npcdialog.cpp:112 src/gui/windows/questswindow.cpp:77
-#: src/gui/windows/shopwindow.cpp:84
+#: src/gui/windows/shopwindow.cpp:83
msgid "Close"
msgstr "סגור"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1065
+#: src/client.cpp:1063
msgid "Connecting to server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1113
+#: src/client.cpp:1111
msgid "Logging in"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1156
+#: src/client.cpp:1154
msgid "Entering game world"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1282
+#: src/client.cpp:1280
msgid "Requesting characters"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1322
+#: src/client.cpp:1320
msgid "Connecting to the game server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1334
+#: src/client.cpp:1332
msgid "Changing game servers"
msgstr ""
@@ -530,72 +532,76 @@ msgstr ""
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1389 src/client.cpp:1403 src/client.cpp:1598
+#. TRANSLATORS: info message
+#. TRANSLATORS: ok dialog button
+#: src/client.cpp:1387 src/client.cpp:1401 src/client.cpp:1596
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
#: src/gui/windows/charcreatedialog.cpp:369
-#: src/gui/windows/charselectdialog.cpp:289
+#: src/gui/windows/charselectdialog.cpp:311
#: src/gui/windows/editserverdialog.cpp:203
#: src/gui/windows/registerdialog.cpp:245
#: src/gui/windows/unregisterdialog.cpp:146
#: src/net/ea/charserverhandler.cpp:141 src/net/ea/charserverhandler.cpp:173
+#: src/net/eathena/charserverhandler.cpp:516
+#: src/net/eathena/charserverhandler.cpp:518
msgid "Error"
msgstr "שגיאה"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1418
+#: src/client.cpp:1416
msgid "Requesting registration details"
msgstr ""
#. TRANSLATORS: password change message header
-#: src/client.cpp:1459
+#: src/client.cpp:1457
msgid "Password Change"
msgstr ""
#. TRANSLATORS: password change message text
-#: src/client.cpp:1461
+#: src/client.cpp:1459
msgid "Password changed successfully!"
msgstr ""
#. TRANSLATORS: email change message header
-#: src/client.cpp:1486
+#: src/client.cpp:1484
msgid "Email Change"
msgstr ""
#. TRANSLATORS: email change message text
-#: src/client.cpp:1488
+#: src/client.cpp:1486
msgid "Email changed successfully!"
msgstr ""
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1515
+#: src/client.cpp:1513
msgid "Unregister Successful"
msgstr ""
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1517
+#: src/client.cpp:1515
msgid "Farewell, come back any time..."
msgstr ""
#. TRANSLATORS: directory creation error
#: src/configmanager.cpp:53 src/dirs.cpp:260 src/dirs.cpp:275 src/dirs.cpp:320
-#: src/dirs.cpp:481 src/dirs.cpp:489
+#: src/dirs.cpp:488 src/dirs.cpp:496
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:363
+#: src/dirs.cpp:370
#, c-format
msgid "Invalid update host: %s."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:404 src/dirs.cpp:411
+#: src/dirs.cpp:411 src/dirs.cpp:418
msgid "Error creating updates directory!"
msgstr "שגיאה ביצירת ספריית העדכונים!"
-#: src/dirs.cpp:433 src/dirs.cpp:451
+#: src/dirs.cpp:440 src/dirs.cpp:458
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
@@ -613,36 +619,36 @@ msgid "dyecmd srcdyestring dstfile"
msgstr ""
#. TRANSLATORS: chat tab header
-#: src/game.cpp:236 src/gui/widgets/tabs/chattab.cpp:482
+#: src/game.cpp:234 src/gui/widgets/tabs/chattab.cpp:482
msgid "General"
msgstr "כללי"
#. TRANSLATORS: chat tab header
#. TRANSLATORS: full button name
#. TRANSLATORS: debug window name
-#: src/game.cpp:253 src/gui/widgets/tabs/chattab.cpp:484
+#: src/game.cpp:251 src/gui/widgets/tabs/chattab.cpp:484
#: src/gui/windowmenu.cpp:149 src/gui/windows/debugwindow.cpp:42
msgid "Debug"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:541
+#: src/game.cpp:532
#, c-format
msgid "Screenshot saved as %s"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:551
+#: src/game.cpp:542
msgid "Saving screenshot failed!"
msgstr "שמירת תמונת־מסך נכשלה!"
#. TRANSLATORS: error message text
-#: src/game.cpp:634
+#: src/game.cpp:625
msgid "The connection to the server was lost."
msgstr ""
#. TRANSLATORS: error message header
-#: src/game.cpp:637
+#: src/game.cpp:628
msgid "Network Error"
msgstr "שגיאת רשת"
@@ -1033,6 +1039,7 @@ msgstr ""
#: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
#: src/gui/widgets/tabs/setup_other.cpp:79
#: src/gui/widgets/tabs/setup_visual.cpp:81
+#: src/gui/windows/equipmentwindow.cpp:577
msgid "default"
msgstr ""
@@ -1523,7 +1530,7 @@ msgstr "סחרר"
#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:273
#: src/gui/popups/popupmenu.cpp:767 src/gui/widgets/skillinfo.cpp:113
#: src/gui/windows/botcheckerwindow.cpp:89 src/input/pages/basic.cpp:42
-#: src/net/eathena/generalhandler.cpp:289 src/net/tmwa/generalhandler.cpp:321
+#: src/net/eathena/generalhandler.cpp:356 src/net/tmwa/generalhandler.cpp:320
msgid "Attack"
msgstr "תקוף"
@@ -1692,7 +1699,7 @@ msgstr ""
#. TRANSLATORS: pet unequip item
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:340 src/gui/windows/equipmentwindow.cpp:70
+#: src/gui/popups/popupmenu.cpp:340 src/gui/windows/equipmentwindow.cpp:72
#: src/gui/windows/inventorywindow.cpp:175 src/resources/itemtypemapdata.h:47
#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
@@ -1750,7 +1757,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:574
+#: src/gui/popups/popupmenu.cpp:574 src/gui/windows/charselectdialog.cpp:132
msgid "Rename"
msgstr ""
@@ -2262,7 +2269,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
#. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:3000 src/net/ea/playerhandler.cpp:364
+#: src/gui/popups/popupmenu.cpp:3000 src/net/ea/playerhandler.cpp:195
msgid "Revive"
msgstr ""
@@ -2286,7 +2293,7 @@ msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: settings group
#. TRANSLATORS: full button name
-#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:319
+#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:315
#: src/gui/windowmenu.cpp:158
msgid "Windows"
msgstr ""
@@ -2314,7 +2321,7 @@ msgstr "שיחה"
#. TRANSLATORS: input action name
#: src/gui/setupinputpages.cpp:57 src/gui/widgets/tabs/setup_audio.cpp:151
#: src/gui/widgets/tabs/setup_chat.cpp:179
-#: src/gui/widgets/tabs/setup_other.cpp:341
+#: src/gui/widgets/tabs/setup_other.cpp:337
#: src/gui/widgets/tabs/setup_visual.cpp:192
#: src/gui/windows/charcreatedialog.cpp:119
#: src/gui/windows/registerdialog.cpp:106 src/input/pages/gui.cpp:87
@@ -2327,212 +2334,227 @@ msgid "Gui"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:113
+#: src/gui/userpalette.cpp:116
msgid "Being"
msgstr "נהיה"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:115
+#: src/gui/userpalette.cpp:118
msgid "Friend names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:117
+#: src/gui/userpalette.cpp:120
msgid "Disregarded names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:119
+#: src/gui/userpalette.cpp:122
msgid "Ignored names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:121
+#: src/gui/userpalette.cpp:124
msgid "Erased names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:123
+#: src/gui/userpalette.cpp:126
msgid "Other players names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:125
+#: src/gui/userpalette.cpp:128
msgid "Own name"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:127
+#: src/gui/userpalette.cpp:130
msgid "GM names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:129
+#: src/gui/userpalette.cpp:132
msgid "NPCs"
msgstr "דמויות"
#. TRANSLATORS: palette color
#. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:131 src/gui/widgets/tabs/setup_other.cpp:108
+#: src/gui/userpalette.cpp:134 src/gui/widgets/tabs/setup_other.cpp:108
msgid "Monsters"
msgstr "מפלצות"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:133
+#: src/gui/userpalette.cpp:136
msgid "Monster HP bar"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:139
msgid "Monster HP bar (second color)"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:138
+#: src/gui/userpalette.cpp:141
msgid "Party members"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:140
+#: src/gui/userpalette.cpp:143
msgid "Guild members"
msgstr ""
#. TRANSLATORS: palette color
#. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:142 src/gui/widgets/tabs/setup_visual.cpp:157
+#: src/gui/userpalette.cpp:145 src/gui/widgets/tabs/setup_visual.cpp:157
msgid "Particle effects"
msgstr "אפקטים חלקיים"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:144
+#: src/gui/userpalette.cpp:147
msgid "Pickup notification"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:146
+#: src/gui/userpalette.cpp:149
msgid "Exp notification"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:148
+#: src/gui/userpalette.cpp:151
msgid "Player HP bar"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:152
+#: src/gui/userpalette.cpp:155
msgid "Player HP bar (second color)"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:154
+#: src/gui/userpalette.cpp:157
msgid "Player hits monster"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:156
+#: src/gui/userpalette.cpp:159
msgid "Monster hits player"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:160
+#: src/gui/userpalette.cpp:163
msgid "Other player hits local player"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:162
+#: src/gui/userpalette.cpp:165
msgid "Critical Hit"
msgstr "מכה קריטית"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:166
+#: src/gui/userpalette.cpp:169
msgid "Local player hits monster"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:169
+#: src/gui/userpalette.cpp:172
msgid "Local player critical hit"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:172
+#: src/gui/userpalette.cpp:175
msgid "Local player miss"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:174
+#: src/gui/userpalette.cpp:177
msgid "Misses"
msgstr "פספוס"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:176
+#: src/gui/userpalette.cpp:179
msgid "Portal highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:179
+#: src/gui/userpalette.cpp:182
msgid "Default collision highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:182
+#: src/gui/userpalette.cpp:185
msgid "Air collision highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:185
+#: src/gui/userpalette.cpp:188
msgid "Water collision highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:188
+#: src/gui/userpalette.cpp:191
msgid "Special ground collision highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:191
+#: src/gui/userpalette.cpp:194
msgid "Walkable highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:194
+#: src/gui/userpalette.cpp:197
msgid "Local player attack range"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:197
+#: src/gui/userpalette.cpp:200
msgid "Local player attack range border"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:200
+#: src/gui/userpalette.cpp:203
msgid "Monster attack range"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:204
+#: src/gui/userpalette.cpp:207
msgid "Floor item amount color"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:207
+#: src/gui/userpalette.cpp:210
msgid "Home place"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:210
+#: src/gui/userpalette.cpp:213
msgid "Home place border"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:213
+#: src/gui/userpalette.cpp:216
msgid "Road point"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:216
+#: src/gui/userpalette.cpp:219
msgid "Tiles border"
msgstr ""
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:221
+msgid "Pets"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:223
+msgid "Mercenary"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:225
+msgid "Homunculus"
+msgstr ""
+
#: src/gui/widgets/characterdisplay.cpp:135
#, c-format
msgid "Level: %u"
@@ -2635,7 +2657,8 @@ msgid "Type: %s"
msgstr ""
#. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:108
+#. TRANSLATORS: unknown equipment page name
+#: src/gui/widgets/skillinfo.cpp:108 src/gui/windows/equipmentwindow.cpp:584
msgid "Unknown"
msgstr ""
@@ -2836,22 +2859,22 @@ msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:262
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:313
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:375
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:319
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:387
msgid "Target:"
msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:264
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:319
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:377
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:325
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:389
msgid "Target Id:"
msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:267
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:322
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:379
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:328
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:391
msgid "Target type:"
msgstr ""
@@ -2862,7 +2885,7 @@ msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:271
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:338
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:344
msgid "Target race:"
msgstr ""
@@ -2878,67 +2901,81 @@ msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:277
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:363
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:369
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:387
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:375
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:381
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:399
msgid "Attack delay:"
msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:279
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:350
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:389
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:356
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:401
msgid "Minimal hit:"
msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:281
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:353
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:391
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:359
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:403
msgid "Maximum hit:"
msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:283
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:356
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:393
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:362
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:405
msgid "Critical hit:"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:327
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:285
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:365
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:407
+msgid "Karma:"
+msgstr ""
+
+#. TRANSLATORS: debug window label
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:287
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:368
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:409
+msgid "Manner:"
+msgstr ""
+
+#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:333
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:381
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:339
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:393
msgid "Target Level:"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:341
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:383
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:347
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:395
msgid "Target Party:"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:345
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:385
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:351
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:397
msgid "Target Guild:"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:430
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:436
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:451
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:457
#, c-format
msgid "Ping: %s ms"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:439
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:460
#, c-format
msgid "In: %d bytes/s"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:442
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:463
#, c-format
msgid "Out: %d bytes/s"
msgstr ""
@@ -3767,137 +3804,132 @@ msgstr ""
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_other.cpp:294
-msgid "Enable auction bot support"
-msgstr ""
-
-#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:298
msgid "Enable guild bot support and disable native guild support"
msgstr ""
#. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:304
+#: src/gui/widgets/tabs/setup_other.cpp:300
msgid "Keyboard"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:307
+#: src/gui/widgets/tabs/setup_other.cpp:303
msgid "Repeat delay"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:311
+#: src/gui/widgets/tabs/setup_other.cpp:307
msgid "Repeat interval"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:315
+#: src/gui/widgets/tabs/setup_other.cpp:311
msgid "Custom repeat interval"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:323
+#: src/gui/widgets/tabs/setup_other.cpp:319
msgid "Shortcut buttons"
msgstr ""
#. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:328
+#: src/gui/widgets/tabs/setup_other.cpp:324
msgid "Proxy server"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:332
+#: src/gui/widgets/tabs/setup_other.cpp:328
msgid "Proxy type"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:336
+#: src/gui/widgets/tabs/setup_other.cpp:332
msgid "Proxy address:port"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:344
+#: src/gui/widgets/tabs/setup_other.cpp:340
msgid "Enable server side attack"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:348
+#: src/gui/widgets/tabs/setup_other.cpp:344
msgid "Hide support page link on error"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:352
+#: src/gui/widgets/tabs/setup_other.cpp:348
msgid "Enable double clicks"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:356
+#: src/gui/widgets/tabs/setup_other.cpp:352
msgid "Enable bot checker"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:360
+#: src/gui/widgets/tabs/setup_other.cpp:356
msgid "Enable buggy servers protection (do not disable)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:365
+#: src/gui/widgets/tabs/setup_other.cpp:361
msgid "Enable debug log"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:369
+#: src/gui/widgets/tabs/setup_other.cpp:365
msgid "Ignore logging packets"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:373
+#: src/gui/widgets/tabs/setup_other.cpp:369
msgid "Enable OpenGL log"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:377
+#: src/gui/widgets/tabs/setup_other.cpp:373
msgid "Enable input log"
msgstr ""
#. TRANSLATORS: settings option
#. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_other.cpp:381 src/input/pages/other.cpp:362
+#: src/gui/widgets/tabs/setup_other.cpp:377 src/input/pages/other.cpp:362
msgid "Upload log file"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:385
+#: src/gui/widgets/tabs/setup_other.cpp:381
msgid "Low traffic mode"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:389
+#: src/gui/widgets/tabs/setup_other.cpp:385
msgid "Hide shield sprite"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:394
+#: src/gui/widgets/tabs/setup_other.cpp:390
msgid "Use FBO for screenshots (only for opengl)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:400
+#: src/gui/widgets/tabs/setup_other.cpp:396
msgid "Screenshot directory"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:405
+#: src/gui/widgets/tabs/setup_other.cpp:401
msgid "Network delay between sub servers"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:409
+#: src/gui/widgets/tabs/setup_other.cpp:405
msgid "Show background"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:414
+#: src/gui/widgets/tabs/setup_other.cpp:410
msgid "Screen density override"
msgstr ""
@@ -4128,9 +4160,9 @@ msgstr "אפשר לחישות"
#. TRANSLATORS: command editor button
#. TRANSLATORS: input action name
#: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:82
-#: src/gui/windows/serverdialog.cpp:125 src/gui/windows/shopwindow.cpp:101
-#: src/gui/windows/shopwindow.cpp:108 src/gui/windows/textcommandeditor.cpp:92
+#: src/gui/windows/charselectdialog.cpp:84
+#: src/gui/windows/serverdialog.cpp:125 src/gui/windows/shopwindow.cpp:100
+#: src/gui/windows/shopwindow.cpp:107 src/gui/windows/textcommandeditor.cpp:92
#: src/input/pages/gui.cpp:111
msgid "Delete"
msgstr "מחק"
@@ -4784,7 +4816,7 @@ msgstr ""
#. TRANSLATORS: equipment window name
#. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:63
+#: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:65
#: src/gui/windows/inventorywindow.cpp:196
msgid "Equipment"
msgstr "לבוש"
@@ -4925,7 +4957,7 @@ msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: social window button
#: src/gui/windows/buydialog.cpp:260 src/gui/windows/charcreatedialog.cpp:127
-#: src/gui/windows/charselectdialog.cpp:578
+#: src/gui/windows/charselectdialog.cpp:605
#: src/gui/windows/socialwindow.cpp:86
msgid "Create"
msgstr "צור"
@@ -4969,10 +5001,8 @@ msgstr ""
#. TRANSLATORS: change password window name
#. TRANSLATORS: change password dialog button
-#. TRANSLATORS: char select dialog. button.
#: src/gui/windows/changepassworddialog.cpp:51
#: src/gui/windows/changepassworddialog.cpp:57
-#: src/gui/windows/charselectdialog.cpp:73
msgid "Change Password"
msgstr "שנה סיסמה"
@@ -5126,57 +5156,68 @@ msgid "Are you sure you want to delete this character?"
msgstr "האם אתה בטוח כי ברצונך למחוק את השחקן?"
#. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:64
+#: src/gui/windows/charselectdialog.cpp:66
#, c-format
msgid "Account %s (last login time %s)"
msgstr ""
#. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:71
-msgid "Switch Login"
+#: src/gui/windows/charselectdialog.cpp:73
+msgid "Switch"
+msgstr ""
+
+#. TRANSLATORS: char select dialog. button.
+#: src/gui/windows/charselectdialog.cpp:75
+msgid "Password"
msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:78
-#: src/gui/windows/charselectdialog.cpp:573
+#: src/gui/windows/charselectdialog.cpp:80
+#: src/gui/windows/charselectdialog.cpp:595
#: src/gui/windows/updaterwindow.cpp:195
msgid "Play"
msgstr "שחק"
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:80
+#: src/gui/windows/charselectdialog.cpp:82
#: src/net/ea/charserverhandler.cpp:160
+#: src/net/eathena/charserverhandler.cpp:531
+#: src/net/eathena/charserverhandler.cpp:561
msgid "Info"
msgstr "מידע"
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: unregister dialog name
#. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:106
+#: src/gui/windows/charselectdialog.cpp:110
#: src/gui/windows/unregisterdialog.cpp:50
#: src/gui/windows/unregisterdialog.cpp:55
msgid "Unregister"
msgstr "בטל רישום"
#. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:118
+#: src/gui/windows/charselectdialog.cpp:122
msgid "Change Email"
msgstr ""
#. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:156
+#: src/gui/windows/charselectdialog.cpp:166
#, c-format
msgid "Account %s"
msgstr ""
-#: src/gui/windows/charselectdialog.cpp:184
+#: src/gui/windows/charselectdialog.cpp:194
msgid "Please set new pincode"
msgstr ""
+#: src/gui/windows/charselectdialog.cpp:240
+msgid "Please enter new name"
+msgstr ""
+
#. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:237
+#: src/gui/windows/charselectdialog.cpp:259
#, c-format
msgid ""
"Hp: %u/%u\n"
@@ -5186,16 +5227,16 @@ msgid ""
"Money: %s"
msgstr ""
-#: src/gui/windows/charselectdialog.cpp:289
+#: src/gui/windows/charselectdialog.cpp:311
msgid "Incorrect password"
msgstr ""
#. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:429
+#: src/gui/windows/charselectdialog.cpp:451
msgid "Enter password for deleting character"
msgstr ""
-#: src/gui/windows/charselectdialog.cpp:429
+#: src/gui/windows/charselectdialog.cpp:451
msgid "Enter password:"
msgstr ""
@@ -5603,7 +5644,7 @@ msgstr "רמה: %d"
#. TRANSLATORS: status bar label
#: src/gui/windows/ministatuswindow.cpp:364
-#: src/gui/windows/ministatuswindow.cpp:402
+#: src/gui/windows/ministatuswindow.cpp:401
msgid "Need"
msgstr ""
@@ -5634,7 +5675,7 @@ msgstr "שלח"
#. TRANSLATORS: shop window button
#. TRANSLATORS: trade window button
#: src/gui/windows/npcdialog.cpp:114 src/gui/windows/serverdialog.cpp:121
-#: src/gui/windows/shopwindow.cpp:99 src/gui/windows/shopwindow.cpp:106
+#: src/gui/windows/shopwindow.cpp:98 src/gui/windows/shopwindow.cpp:105
#: src/gui/windows/tradewindow.cpp:83
msgid "Add"
msgstr "הוסף"
@@ -5797,43 +5838,38 @@ msgid "Reset Windows"
msgstr "אתחל חלונות"
#. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:80
+#: src/gui/windows/shopwindow.cpp:79
msgid "Personal Shop"
msgstr ""
#. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:95
+#: src/gui/windows/shopwindow.cpp:94
msgid "Buy items"
msgstr ""
#. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:97
+#: src/gui/windows/shopwindow.cpp:96
msgid "Sell items"
msgstr ""
#. TRANSLATORS: shop window label
#. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:110
+#: src/gui/windows/shopwindow.cpp:102 src/gui/windows/shopwindow.cpp:109
msgid "Announce"
msgstr ""
#. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:114
+#: src/gui/windows/shopwindow.cpp:113
msgid "Show links in announce"
msgstr ""
-#. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:176 src/gui/windows/shopwindow.cpp:179
-msgid "Auction"
-msgstr ""
-
#. TRANSLATORS: shop window dialog
#. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:233
+#: src/gui/windows/shopwindow.cpp:776 src/net/ea/tradehandler.cpp:233
msgid "Request for Trade"
msgstr "בקשה למסחר"
-#: src/gui/windows/shopwindow.cpp:791
+#: src/gui/windows/shopwindow.cpp:776
#, c-format
msgid "%s wants to %s %s do you accept?"
msgstr ""
@@ -6161,27 +6197,27 @@ msgstr "מעדכן..."
msgid "Connecting..."
msgstr "מתחבר..."
-#: src/gui/windows/updaterwindow.cpp:398
+#: src/gui/windows/updaterwindow.cpp:407
msgid "Show all news (can be slow)"
msgstr ""
#. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:824
+#: src/gui/windows/updaterwindow.cpp:833
msgid "##1 The update process is incomplete."
msgstr "##1 תהליך העדכון לא תם."
#. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:826
+#: src/gui/windows/updaterwindow.cpp:835
msgid "##1 It is strongly recommended that"
msgstr "##1 מומלץ ביותר שתנסה שוב מאוחר יותר"
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:828
+#: src/gui/windows/updaterwindow.cpp:837
msgid "##1 you try again later."
msgstr ""
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1005
+#: src/gui/windows/updaterwindow.cpp:1021
msgid "Completed"
msgstr "הסתיים"
@@ -6228,25 +6264,25 @@ msgstr ""
#. TRANSLATORS: long key name. must be short.
#. TRANSLATORS: short key name. must be very short.
#. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:370 src/input/inputmanager.cpp:414
+#: src/input/inputmanager.cpp:371 src/input/inputmanager.cpp:415
#: src/input/keyboardconfig.cpp:104
#, c-format
msgid "key_%d"
msgstr ""
#. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:376
+#: src/input/inputmanager.cpp:377
#, c-format
msgid "JButton%d"
msgstr ""
#. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:391
msgid "unknown key"
msgstr ""
#. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:420
+#: src/input/inputmanager.cpp:421
#, c-format
msgid "JB%d"
msgstr ""
@@ -6254,7 +6290,7 @@ msgstr ""
#. TRANSLATORS: unknown short key type. must be short
#. TRANSLATORS: Unknown key short string.
#. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:434 src/input/keyboardconfig.cpp:148
+#: src/input/inputmanager.cpp:435 src/input/keyboardconfig.cpp:148
msgid "u key"
msgstr ""
@@ -7425,74 +7461,74 @@ msgid "Request to quit denied!"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:135
#, c-format
msgid "Guild name: %s"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:191
+#: src/net/ea/guildhandler.cpp:138
#, c-format
msgid "Guild master: %s"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:141
#, c-format
msgid "Guild level: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:197
+#: src/net/ea/guildhandler.cpp:144
#, c-format
msgid "Online members: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:200
+#: src/net/ea/guildhandler.cpp:147
#, c-format
msgid "Max members: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:203
+#: src/net/ea/guildhandler.cpp:150
#, c-format
msgid "Average level: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:206
+#: src/net/ea/guildhandler.cpp:153
#, c-format
msgid "Guild exp: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:209
+#: src/net/ea/guildhandler.cpp:156
#, c-format
msgid "Guild next exp: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:212
+#: src/net/ea/guildhandler.cpp:159
#, c-format
msgid "Guild castle: %s"
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:179
+#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:191
msgid "Item sharing enabled."
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:183
+#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:195
msgid "Item sharing disabled."
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:187
+#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:199
msgid "Item sharing not possible."
msgstr ""
@@ -7503,19 +7539,19 @@ msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:167
+#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:179
msgid "Experience sharing enabled."
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:171
+#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:183
msgid "Experience sharing disabled."
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:175
+#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:187
msgid "Experience sharing not possible."
msgstr ""
@@ -7620,239 +7656,355 @@ msgid "Connection to server terminated. "
msgstr ""
#. TRANSLATORS: message header
-#: src/net/ea/playerhandler.cpp:257 src/net/ea/playerhandler.cpp:273
-#: src/net/ea/playerhandler.cpp:361
+#: src/net/ea/playerhandler.cpp:192 src/net/ea/playerhandler.cpp:418
+#: src/net/ea/playerhandler.cpp:434
msgid "Message"
msgstr ""
#. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:259
+#: src/net/ea/playerhandler.cpp:420
msgid ""
"You are carrying more than half your weight. You are unable to regain "
"health."
msgstr ""
#. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:275
+#: src/net/ea/playerhandler.cpp:436
msgid "You are carrying less than half your weight. You can regain health."
msgstr ""
+#. TRANSLATORS: char rename error
+#: src/net/eathena/charserverhandler.cpp:516
+#: src/net/eathena/charserverhandler.cpp:553
+msgid "Character rename error."
+msgstr ""
+
+#: src/net/eathena/charserverhandler.cpp:531
+msgid "Character renamed."
+msgstr ""
+
+#. TRANSLATORS: char rename error
+#: src/net/eathena/charserverhandler.cpp:544
+msgid "Rename not allowed."
+msgstr ""
+
+#. TRANSLATORS: char rename error
+#: src/net/eathena/charserverhandler.cpp:548
+msgid "New name is not set."
+msgstr ""
+
+#. TRANSLATORS: char rename error
+#: src/net/eathena/charserverhandler.cpp:557
+msgid "Character not found."
+msgstr ""
+
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:125
+#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:124
#, c-format
msgid "Strength %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:127
+#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:126
#, c-format
msgid "Agility %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:129
+#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:128
#, c-format
msgid "Vitality %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:131
+#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:130
#, c-format
msgid "Intelligence %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:128 src/net/tmwa/generalhandler.cpp:133
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:132
#, c-format
msgid "Dexterity %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:135
+#: src/net/eathena/generalhandler.cpp:128 src/net/tmwa/generalhandler.cpp:134
#, c-format
msgid "Luck %s"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:152 src/net/tmwa/generalhandler.cpp:161
+#: src/net/eathena/generalhandler.cpp:159 src/net/tmwa/generalhandler.cpp:160
msgid "Authentication failed."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:155 src/net/tmwa/generalhandler.cpp:165
+#: src/net/eathena/generalhandler.cpp:162 src/net/tmwa/generalhandler.cpp:164
msgid "No servers available."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:160 src/net/tmwa/generalhandler.cpp:171
+#: src/net/eathena/generalhandler.cpp:167 src/net/tmwa/generalhandler.cpp:170
msgid "Someone else is trying to use this account."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:165 src/net/tmwa/generalhandler.cpp:177
+#: src/net/eathena/generalhandler.cpp:172 src/net/tmwa/generalhandler.cpp:176
msgid "This account is already logged in."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:169 src/net/tmwa/generalhandler.cpp:182
+#: src/net/eathena/generalhandler.cpp:176 src/net/tmwa/generalhandler.cpp:181
msgid "Speed hack detected."
msgstr ""
+#: src/net/eathena/generalhandler.cpp:179
+msgid "Server full."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:182
+msgid "Sorry, you are underaged."
+msgstr ""
+
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:172 src/net/tmwa/generalhandler.cpp:186
+#: src/net/eathena/generalhandler.cpp:185 src/net/tmwa/generalhandler.cpp:185
msgid "Duplicated login."
msgstr ""
+#: src/net/eathena/generalhandler.cpp:188
+msgid "To many connections from same ip."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:191
+msgid "Not paid for this time."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:194
+msgid "Pay suspended."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:197
+msgid "Pay changed."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:200
+msgid "Pay wrong ip."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:203
+msgid "Pay game room."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:206
+msgid "Disconnect forced by GM."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:210
+msgid "Ban japan refuse."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:213
+msgid "Remained other account."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:216
+msgid "Ip unfair."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:219
+msgid "Ip count all."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:222
+msgid "Ip count."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:226
+msgid "Memory."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:229
+msgid "Han valid."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:232
+msgid "Ip limited access."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:235
+msgid "Over characters list."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:238
+msgid "Ip blocked."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:241
+msgid "Invalid password count."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:244
+msgid "Not allowed race."
+msgstr ""
+
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:175 src/net/tmwa/generalhandler.cpp:190
+#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:189
msgid "Unknown connection error."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:280
+#: src/net/eathena/generalhandler.cpp:323 src/net/tmwa/generalhandler.cpp:279
msgid "Got disconnected from server!"
msgstr "נותקת מהשרת!"
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:282 src/net/tmwa/generalhandler.cpp:308
+#: src/net/eathena/generalhandler.cpp:348 src/net/tmwa/generalhandler.cpp:307
msgid "Strength"
msgstr "עוצמה"
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:310
+#: src/net/eathena/generalhandler.cpp:349 src/net/tmwa/generalhandler.cpp:309
msgid "Agility"
msgstr "זריזות"
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:284 src/net/tmwa/generalhandler.cpp:312
+#: src/net/eathena/generalhandler.cpp:350 src/net/tmwa/generalhandler.cpp:311
msgid "Vitality"
msgstr "חיוניות"
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:285 src/net/tmwa/generalhandler.cpp:314
+#: src/net/eathena/generalhandler.cpp:352 src/net/tmwa/generalhandler.cpp:314
msgid "Intelligence"
msgstr "תבונה"
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:286 src/net/tmwa/generalhandler.cpp:316
+#: src/net/eathena/generalhandler.cpp:353 src/net/tmwa/generalhandler.cpp:316
msgid "Dexterity"
msgstr "מיומנות"
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:287 src/net/tmwa/generalhandler.cpp:318
+#: src/net/eathena/generalhandler.cpp:354 src/net/tmwa/generalhandler.cpp:318
msgid "Luck"
msgstr "מזל"
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:290 src/net/tmwa/generalhandler.cpp:323
+#: src/net/eathena/generalhandler.cpp:357 src/net/tmwa/generalhandler.cpp:322
msgid "Defense"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:291 src/net/tmwa/generalhandler.cpp:325
+#: src/net/eathena/generalhandler.cpp:358 src/net/tmwa/generalhandler.cpp:324
msgid "M.Attack"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:292 src/net/tmwa/generalhandler.cpp:327
+#: src/net/eathena/generalhandler.cpp:359 src/net/tmwa/generalhandler.cpp:326
msgid "M.Defense"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:294 src/net/tmwa/generalhandler.cpp:330
+#: src/net/eathena/generalhandler.cpp:361 src/net/tmwa/generalhandler.cpp:329
#, no-c-format
msgid "% Accuracy"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:296 src/net/tmwa/generalhandler.cpp:333
+#: src/net/eathena/generalhandler.cpp:363 src/net/tmwa/generalhandler.cpp:332
#, no-c-format
msgid "% Evade"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:298 src/net/tmwa/generalhandler.cpp:336
+#: src/net/eathena/generalhandler.cpp:365 src/net/tmwa/generalhandler.cpp:335
#, no-c-format
msgid "% Critical"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:299 src/net/tmwa/generalhandler.cpp:338
+#: src/net/eathena/generalhandler.cpp:366 src/net/tmwa/generalhandler.cpp:337
msgid "Attack Delay"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:300 src/net/tmwa/generalhandler.cpp:340
+#: src/net/eathena/generalhandler.cpp:367 src/net/tmwa/generalhandler.cpp:339
msgid "Walk Delay"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:301 src/net/tmwa/generalhandler.cpp:342
+#: src/net/eathena/generalhandler.cpp:368 src/net/tmwa/generalhandler.cpp:341
msgid "Attack Range"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:302 src/net/tmwa/generalhandler.cpp:344
+#: src/net/eathena/generalhandler.cpp:369 src/net/tmwa/generalhandler.cpp:343
msgid "Damage per sec."
msgstr ""
-#: src/net/eathena/skillhandler.cpp:228 src/net/eathena/skillhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:370
+msgid "Karma"
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:371
+msgid "Manner"
+msgstr ""
+
+#: src/net/eathena/skillhandler.cpp:304 src/net/eathena/skillhandler.cpp:364
#, c-format
msgid "Unknown skill error: %d"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:235 src/net/tmwa/skillhandler.cpp:224
+#: src/net/eathena/skillhandler.cpp:311 src/net/tmwa/skillhandler.cpp:224
msgid "You have not yet reached a high enough lvl!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:239 src/net/tmwa/skillhandler.cpp:228
+#: src/net/eathena/skillhandler.cpp:315 src/net/tmwa/skillhandler.cpp:228
msgid "Insufficient HP!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:243 src/net/tmwa/skillhandler.cpp:232
+#: src/net/eathena/skillhandler.cpp:319 src/net/tmwa/skillhandler.cpp:232
msgid "Insufficient SP!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:247 src/net/tmwa/skillhandler.cpp:236
+#: src/net/eathena/skillhandler.cpp:323 src/net/tmwa/skillhandler.cpp:236
msgid "You have no memos!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:251 src/net/tmwa/skillhandler.cpp:240
+#: src/net/eathena/skillhandler.cpp:327 src/net/tmwa/skillhandler.cpp:240
msgid "You cannot do that right now!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:255 src/net/tmwa/skillhandler.cpp:244
+#: src/net/eathena/skillhandler.cpp:331 src/net/tmwa/skillhandler.cpp:244
msgid "Seems you need more money... ;-)"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:259 src/net/tmwa/skillhandler.cpp:248
+#: src/net/eathena/skillhandler.cpp:335 src/net/tmwa/skillhandler.cpp:248
msgid "You cannot use this skill with that kind of weapon!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:264 src/net/tmwa/skillhandler.cpp:253
+#: src/net/eathena/skillhandler.cpp:340 src/net/tmwa/skillhandler.cpp:253
msgid "You need another red gem!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:268 src/net/tmwa/skillhandler.cpp:257
+#: src/net/eathena/skillhandler.cpp:344 src/net/tmwa/skillhandler.cpp:257
msgid "You need another blue gem!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:272 src/net/tmwa/skillhandler.cpp:261
+#: src/net/eathena/skillhandler.cpp:348 src/net/tmwa/skillhandler.cpp:261
msgid "You're carrying to much to do this!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:276 src/net/tmwa/skillhandler.cpp:265
+#: src/net/eathena/skillhandler.cpp:352 src/net/tmwa/skillhandler.cpp:265
msgid "Huh? What's that?"
msgstr ""
@@ -7869,32 +8021,32 @@ msgid "%s wants to trade with you, do you accept?"
msgstr "%s מעוניין לסחור עימך, האם אתה מסכים?"
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:349
+#: src/net/tmwa/charserverhandler.cpp:351
msgid "Strength:"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:351
+#: src/net/tmwa/charserverhandler.cpp:353
msgid "Agility:"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:353
+#: src/net/tmwa/charserverhandler.cpp:355
msgid "Vitality:"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:355
+#: src/net/tmwa/charserverhandler.cpp:357
msgid "Intelligence:"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:357
+#: src/net/tmwa/charserverhandler.cpp:359
msgid "Dexterity:"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:359
+#: src/net/tmwa/charserverhandler.cpp:361
msgid "Luck:"
msgstr ""
@@ -8205,269 +8357,306 @@ msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:143
+msgid "You cant left party on this map."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:147
+msgid "You was kicked from party."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:151
+msgid "You cant be kicked kicked from party on this map."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:155
#, c-format
msgid "%s has joined your party."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:147
+#: src/resources/notifications.h:159
#, c-format
msgid "%s is already a member of a party."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:151
+#: src/resources/notifications.h:163
#, c-format
msgid "%s refused your invitation."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:155
+#: src/resources/notifications.h:167
#, c-format
msgid "%s is now a member of your party."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:159
+#: src/resources/notifications.h:171
#, c-format
msgid "%s can't join your party because party is full."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:163
+#: src/resources/notifications.h:175
#, c-format
msgid "QQQ Unknown invite response for %s."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:191
+#: src/resources/notifications.h:203
#, c-format
msgid "%s has left your party."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:195
+#: src/resources/notifications.h:207 src/resources/notifications.h:215
+#, c-format
+msgid "%s cant be kicked from party on this map."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:211
+#, c-format
+msgid "%s has kicked from your party."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:219
#, c-format
msgid "An unknown member tried to say: %s"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:199
+#: src/resources/notifications.h:223
#, c-format
msgid "%s is not in your party!"
msgstr "%s אינו נמצא בחבורתך!"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:203
+#: src/resources/notifications.h:227
#, c-format
msgid "You picked up %s."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:207
+#: src/resources/notifications.h:231
#, c-format
msgid "You spent %s."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:211
+#: src/resources/notifications.h:235
msgid "Cannot raise skill!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:215
+#: src/resources/notifications.h:239
msgid "Equip ammunition first."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:219
+#: src/resources/notifications.h:243
#, c-format
msgid "Trading with %s isn't possible. Trade partner is too far away."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:224
+#: src/resources/notifications.h:248
#, c-format
msgid "Trading with %s isn't possible. Character doesn't exist."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:228
+#: src/resources/notifications.h:252
msgid "Trade cancelled due to an unknown reason."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:232
+#: src/resources/notifications.h:256
#, c-format
msgid "Trade with %s cancelled."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:236
+#: src/resources/notifications.h:260
#, c-format
msgid "Unhandled trade cancel packet with %s"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:240
+#: src/resources/notifications.h:264
msgid "Failed adding item. Trade partner is over weighted."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:244
+#: src/resources/notifications.h:268
msgid "Failed adding item. Trade partner has no free slot."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:248
+#: src/resources/notifications.h:272
msgid "Failed adding item. You can't trade this item."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:252
+#: src/resources/notifications.h:276
msgid "Failed adding item for unknown reason."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:256
+#: src/resources/notifications.h:280
msgid "Trade canceled."
msgstr "המסחר בוטל."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:260
+#: src/resources/notifications.h:284
msgid "Trade completed."
msgstr "המסחר הושלם."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:264
+#: src/resources/notifications.h:288
msgid "Kick failed!"
msgstr "העפה נכשלה!"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:268
+#: src/resources/notifications.h:292
msgid "Kick succeeded!"
msgstr "העפה הצליחה!"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:272
+#: src/resources/notifications.h:296
#, c-format
msgid "MVP player: %s"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:276
+#: src/resources/notifications.h:300
msgid "All whispers ignored."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:280
+#: src/resources/notifications.h:304
msgid "All whispers ignore failed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:284
+#: src/resources/notifications.h:308
msgid "All whispers unignored."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:288
+#: src/resources/notifications.h:312
msgid "All whispers unignore failed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:295
+#: src/resources/notifications.h:319
msgid "pvp off, gvg off"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:299
+#: src/resources/notifications.h:323
msgid "pvp on"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:303
+#: src/resources/notifications.h:327
msgid "gvg on"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:307
+#: src/resources/notifications.h:331
msgid "pvp on, gvg on"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:311
+#: src/resources/notifications.h:335
msgid "unknown pvp"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:315
+#: src/resources/notifications.h:339
#, c-format
msgid "Char from account %s is already in your party!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:319
+#: src/resources/notifications.h:343
#, c-format
msgid "%s blocked invite!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:323
+#: src/resources/notifications.h:347
msgid "Char is not online!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:327
+#: src/resources/notifications.h:351
msgid "Pet catch failed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:331
+#: src/resources/notifications.h:355
msgid "Pet catched."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:335
+#: src/resources/notifications.h:359
#, c-format
msgid "Pet catch unkown error: %d."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:339
+#: src/resources/notifications.h:363
msgid "Your mercenary duty hour is over."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:343
+#: src/resources/notifications.h:367
msgid "Your mercenary was killed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:347
+#: src/resources/notifications.h:371
msgid "Your mercenary was fired."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:351
+#: src/resources/notifications.h:375
msgid "Your mercenary run away."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:355
+#: src/resources/notifications.h:379
msgid "Mercenary unknown state."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:359
-msgid "Your feed your homunculus."
+#: src/resources/notifications.h:383
+msgid "You feed your homunculus."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:363
+#: src/resources/notifications.h:387
#, c-format
msgid "You cant feed homunculus, because not have %s."
msgstr ""
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:391
+msgid "Card insert failed."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:395
+msgid "Card inserted."
+msgstr ""
+
#. TRANSLATORS: chat option changed message
#: src/utils/booleanoptions.h:27
#, c-format
diff --git a/po/hr.po b/po/hr.po
index e946fcf25..48982f53b 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-27 13:23+0300\n"
-"PO-Revision-Date: 2014-09-28 10:01+0000\n"
+"POT-Creation-Date: 2014-10-08 01:19+0300\n"
+"PO-Revision-Date: 2014-10-08 10:01+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/manaplus/language/hr/)\n"
"MIME-Version: 1.0\n"
@@ -32,7 +32,7 @@ msgstr ""
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:131 src/client.cpp:1463 src/client.cpp:1490
+#: src/actions/actions.cpp:131 src/client.cpp:1461 src/client.cpp:1488
#: src/gamemodifiers.cpp:423 src/gui/widgets/tabs/setup_input.cpp:163
#: src/gui/widgets/tabs/setup_theme.cpp:312
#: src/gui/widgets/tabs/setup_theme.cpp:343
@@ -43,8 +43,8 @@ msgstr ""
#: src/gui/windows/changeemaildialog.cpp:170
#: src/gui/windows/changepassworddialog.cpp:160
#: src/gui/windows/charcreatedialog.cpp:373
-#: src/gui/windows/charselectdialog.cpp:255
-#: src/gui/windows/charselectdialog.cpp:291 src/gui/windows/editdialog.cpp:49
+#: src/gui/windows/charselectdialog.cpp:277
+#: src/gui/windows/charselectdialog.cpp:313 src/gui/windows/editdialog.cpp:49
#: src/gui/windows/editserverdialog.cpp:61
#: src/gui/windows/editserverdialog.cpp:208
#: src/gui/windows/itemamountwindow.cpp:158 src/gui/windows/quitdialog.cpp:70
@@ -52,7 +52,9 @@ msgstr ""
#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
#: src/net/ea/charserverhandler.cpp:143 src/net/ea/charserverhandler.cpp:162
#: src/net/ea/charserverhandler.cpp:175 src/net/ea/gamehandler.cpp:79
-#: src/net/ea/playerhandler.cpp:263 src/net/ea/playerhandler.cpp:279
+#: src/net/ea/playerhandler.cpp:424 src/net/ea/playerhandler.cpp:440
+#: src/net/eathena/charserverhandler.cpp:533
+#: src/net/eathena/charserverhandler.cpp:563
msgid "OK"
msgstr "U redu"
@@ -176,7 +178,7 @@ msgstr ""
#. TRANSLATORS: party invite message
#. TRANSLATORS: change relation
-#: src/actions/chat.cpp:303 src/actions/commands.cpp:65
+#: src/actions/chat.cpp:303 src/actions/commands.cpp:64
msgid "Please specify a name."
msgstr ""
@@ -199,75 +201,75 @@ msgid "Message now closes chat."
msgstr "Poruka sada zatvara chat."
#. TRANSLATORS: change relation
-#: src/actions/commands.cpp:108
+#: src/actions/commands.cpp:107
#, c-format
msgid "Player already %s!"
msgstr ""
#. TRANSLATORS: change relation
-#: src/actions/commands.cpp:120
+#: src/actions/commands.cpp:119
#, c-format
msgid "Player successfully %s!"
msgstr ""
#. TRANSLATORS: change relation
-#: src/actions/commands.cpp:122
+#: src/actions/commands.cpp:121
#, c-format
msgid "Player could not be %s!"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:153
+#: src/actions/commands.cpp:152
msgid "Player wasn't ignored!"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:162
+#: src/actions/commands.cpp:161
msgid "Player no longer ignored!"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:164
+#: src/actions/commands.cpp:163
msgid "Player could not be unignored!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/actions/commands.cpp:179
+#: src/actions/commands.cpp:178
msgid "Player already erased!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/actions/commands.cpp:192
+#: src/actions/commands.cpp:191
msgid "Player no longer erased!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/actions/commands.cpp:194
+#: src/actions/commands.cpp:193
msgid "Player could not be erased!"
msgstr ""
#. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:201
+#: src/actions/commands.cpp:200
msgid "friend"
msgstr ""
#. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:208
+#: src/actions/commands.cpp:207
msgid "disregarded"
msgstr ""
#. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:215
+#: src/actions/commands.cpp:214
msgid "neutral"
msgstr ""
#. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:222
+#: src/actions/commands.cpp:221
msgid "blacklisted"
msgstr ""
#. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:229
+#: src/actions/commands.cpp:228
msgid "enemy"
msgstr ""
@@ -282,77 +284,77 @@ msgid "Accepting incoming trade requests"
msgstr "Prihvaćanje dolaznih zahtjeva za trgovanje"
#. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1306
+#: src/actormanager.cpp:1310
msgid "Visible on map"
msgstr ""
#. TRANSLATORS: default race name
-#: src/being/being.cpp:389
+#: src/being/being.cpp:393
msgid "Human"
msgstr ""
-#: src/being/being.cpp:556
+#: src/being/being.cpp:560
msgid "dodge"
msgstr ""
-#: src/being/being.cpp:556
+#: src/being/being.cpp:560
msgid "miss"
msgstr ""
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1865 src/gui/windows/whoisonline.cpp:855
+#: src/being/being.cpp:1869 src/gui/windows/whoisonline.cpp:855
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1870 src/gui/windows/whoisonline.cpp:860
+#: src/being/being.cpp:1874 src/gui/windows/whoisonline.cpp:860
msgid "I"
msgstr ""
#. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:379
+#: src/being/localplayer.cpp:380
#, c-format
msgid "You were killed by %s"
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:824
+#: src/being/localplayer.cpp:825
msgid "Tried to pick up nonexistent item."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:828
+#: src/being/localplayer.cpp:829
msgid "Item is too heavy."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:832
+#: src/being/localplayer.cpp:833
msgid "Item is too far away."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:836
+#: src/being/localplayer.cpp:837
msgid "Inventory is full."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:840
+#: src/being/localplayer.cpp:841
msgid "Stack is too big."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:844
+#: src/being/localplayer.cpp:845
msgid "Item belongs to someone else."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:848
+#: src/being/localplayer.cpp:849
msgid "Unknown problem picking up item."
msgstr ""
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:872
+#: src/being/localplayer.cpp:873
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -362,43 +364,43 @@ msgstr[2] ""
#. TRANSLATORS: this is normal experience
#. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1054 src/being/localplayer.cpp:1055
-#: src/being/localplayer.cpp:1091
+#: src/being/localplayer.cpp:1055 src/being/localplayer.cpp:1056
+#: src/being/localplayer.cpp:1092
msgid "xp"
msgstr ""
#. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1059 src/being/localplayer.cpp:1065
-#: src/being/localplayer.cpp:1071
+#: src/being/localplayer.cpp:1060 src/being/localplayer.cpp:1066
+#: src/being/localplayer.cpp:1072
msgid "job"
msgstr ""
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2794
+#: src/being/localplayer.cpp:2795
#, c-format
msgid "Follow: %s"
msgstr ""
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2800 src/being/localplayer.cpp:2825
+#: src/being/localplayer.cpp:2801 src/being/localplayer.cpp:2826
msgid "Follow canceled"
msgstr ""
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2810
+#: src/being/localplayer.cpp:2811
#, c-format
msgid "Imitation: %s"
msgstr ""
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2816 src/being/localplayer.cpp:2830
+#: src/being/localplayer.cpp:2817 src/being/localplayer.cpp:2831
msgid "Imitation canceled"
msgstr ""
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3180
+#: src/being/localplayer.cpp:3181
#, c-format
msgid "You see %s"
msgstr ""
@@ -436,37 +438,37 @@ msgstr ""
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:920 src/gui/windowmenu.cpp:162
+#: src/client.cpp:918 src/gui/windowmenu.cpp:162
#: src/gui/windows/setupwindow.cpp:62
msgid "Setup"
msgstr "Podešavanje"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:923 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:921 src/gui/widgets/tabs/setup_perfomance.cpp:54
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:926 src/gui/widgets/tabs/setup_video.cpp:105
+#: src/client.cpp:924 src/gui/widgets/tabs/setup_video.cpp:105
msgid "Video"
msgstr "Slika"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:929 src/gui/widgets/tabs/setup_theme.cpp:122
+#: src/client.cpp:927 src/gui/widgets/tabs/setup_theme.cpp:122
msgid "Theme"
msgstr ""
#. TRANSLATORS: theme tab quick button
-#: src/client.cpp:932
+#: src/client.cpp:930
msgid "About"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:935 src/gui/windowmenu.cpp:74
+#: src/client.cpp:933 src/gui/windowmenu.cpp:74
#: src/gui/windows/helpwindow.cpp:53
msgid "Help"
msgstr "Pomoć"
@@ -482,42 +484,42 @@ msgstr "Pomoć"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:939 src/client.cpp:1391 src/client.cpp:1405
+#: src/client.cpp:937 src/client.cpp:1389 src/client.cpp:1403
#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:691
#: src/gui/popups/popupmenu.cpp:923 src/gui/windows/didyouknowwindow.cpp:81
#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:74
#: src/gui/windows/npcdialog.cpp:112 src/gui/windows/questswindow.cpp:77
-#: src/gui/windows/shopwindow.cpp:84
+#: src/gui/windows/shopwindow.cpp:83
msgid "Close"
msgstr "Zatvori"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1065
+#: src/client.cpp:1063
msgid "Connecting to server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1113
+#: src/client.cpp:1111
msgid "Logging in"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1156
+#: src/client.cpp:1154
msgid "Entering game world"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1282
+#: src/client.cpp:1280
msgid "Requesting characters"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1322
+#: src/client.cpp:1320
msgid "Connecting to the game server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1334
+#: src/client.cpp:1332
msgid "Changing game servers"
msgstr ""
@@ -531,72 +533,76 @@ msgstr ""
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1389 src/client.cpp:1403 src/client.cpp:1598
+#. TRANSLATORS: info message
+#. TRANSLATORS: ok dialog button
+#: src/client.cpp:1387 src/client.cpp:1401 src/client.cpp:1596
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
#: src/gui/windows/charcreatedialog.cpp:369
-#: src/gui/windows/charselectdialog.cpp:289
+#: src/gui/windows/charselectdialog.cpp:311
#: src/gui/windows/editserverdialog.cpp:203
#: src/gui/windows/registerdialog.cpp:245
#: src/gui/windows/unregisterdialog.cpp:146
#: src/net/ea/charserverhandler.cpp:141 src/net/ea/charserverhandler.cpp:173
+#: src/net/eathena/charserverhandler.cpp:516
+#: src/net/eathena/charserverhandler.cpp:518
msgid "Error"
msgstr "Greška"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1418
+#: src/client.cpp:1416
msgid "Requesting registration details"
msgstr ""
#. TRANSLATORS: password change message header
-#: src/client.cpp:1459
+#: src/client.cpp:1457
msgid "Password Change"
msgstr ""
#. TRANSLATORS: password change message text
-#: src/client.cpp:1461
+#: src/client.cpp:1459
msgid "Password changed successfully!"
msgstr ""
#. TRANSLATORS: email change message header
-#: src/client.cpp:1486
+#: src/client.cpp:1484
msgid "Email Change"
msgstr ""
#. TRANSLATORS: email change message text
-#: src/client.cpp:1488
+#: src/client.cpp:1486
msgid "Email changed successfully!"
msgstr ""
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1515
+#: src/client.cpp:1513
msgid "Unregister Successful"
msgstr ""
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1517
+#: src/client.cpp:1515
msgid "Farewell, come back any time..."
msgstr ""
#. TRANSLATORS: directory creation error
#: src/configmanager.cpp:53 src/dirs.cpp:260 src/dirs.cpp:275 src/dirs.cpp:320
-#: src/dirs.cpp:481 src/dirs.cpp:489
+#: src/dirs.cpp:488 src/dirs.cpp:496
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:363
+#: src/dirs.cpp:370
#, c-format
msgid "Invalid update host: %s."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:404 src/dirs.cpp:411
+#: src/dirs.cpp:411 src/dirs.cpp:418
msgid "Error creating updates directory!"
msgstr ""
-#: src/dirs.cpp:433 src/dirs.cpp:451
+#: src/dirs.cpp:440 src/dirs.cpp:458
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
@@ -614,36 +620,36 @@ msgid "dyecmd srcdyestring dstfile"
msgstr ""
#. TRANSLATORS: chat tab header
-#: src/game.cpp:236 src/gui/widgets/tabs/chattab.cpp:482
+#: src/game.cpp:234 src/gui/widgets/tabs/chattab.cpp:482
msgid "General"
msgstr "Općenito"
#. TRANSLATORS: chat tab header
#. TRANSLATORS: full button name
#. TRANSLATORS: debug window name
-#: src/game.cpp:253 src/gui/widgets/tabs/chattab.cpp:484
+#: src/game.cpp:251 src/gui/widgets/tabs/chattab.cpp:484
#: src/gui/windowmenu.cpp:149 src/gui/windows/debugwindow.cpp:42
msgid "Debug"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:541
+#: src/game.cpp:532
#, c-format
msgid "Screenshot saved as %s"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:551
+#: src/game.cpp:542
msgid "Saving screenshot failed!"
msgstr "Spremanje screenshot-a nije uspjelo!"
#. TRANSLATORS: error message text
-#: src/game.cpp:634
+#: src/game.cpp:625
msgid "The connection to the server was lost."
msgstr ""
#. TRANSLATORS: error message header
-#: src/game.cpp:637
+#: src/game.cpp:628
msgid "Network Error"
msgstr "Mreža Greška"
@@ -1034,6 +1040,7 @@ msgstr ""
#: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
#: src/gui/widgets/tabs/setup_other.cpp:79
#: src/gui/widgets/tabs/setup_visual.cpp:81
+#: src/gui/windows/equipmentwindow.cpp:577
msgid "default"
msgstr ""
@@ -1524,7 +1531,7 @@ msgstr "Trgovanje"
#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:273
#: src/gui/popups/popupmenu.cpp:767 src/gui/widgets/skillinfo.cpp:113
#: src/gui/windows/botcheckerwindow.cpp:89 src/input/pages/basic.cpp:42
-#: src/net/eathena/generalhandler.cpp:289 src/net/tmwa/generalhandler.cpp:321
+#: src/net/eathena/generalhandler.cpp:356 src/net/tmwa/generalhandler.cpp:320
msgid "Attack"
msgstr "Napad"
@@ -1693,7 +1700,7 @@ msgstr ""
#. TRANSLATORS: pet unequip item
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:340 src/gui/windows/equipmentwindow.cpp:70
+#: src/gui/popups/popupmenu.cpp:340 src/gui/windows/equipmentwindow.cpp:72
#: src/gui/windows/inventorywindow.cpp:175 src/resources/itemtypemapdata.h:47
#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
@@ -1751,7 +1758,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:574
+#: src/gui/popups/popupmenu.cpp:574 src/gui/windows/charselectdialog.cpp:132
msgid "Rename"
msgstr ""
@@ -2263,7 +2270,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
#. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:3000 src/net/ea/playerhandler.cpp:364
+#: src/gui/popups/popupmenu.cpp:3000 src/net/ea/playerhandler.cpp:195
msgid "Revive"
msgstr ""
@@ -2287,7 +2294,7 @@ msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: settings group
#. TRANSLATORS: full button name
-#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:319
+#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:315
#: src/gui/windowmenu.cpp:158
msgid "Windows"
msgstr ""
@@ -2315,7 +2322,7 @@ msgstr "Chat"
#. TRANSLATORS: input action name
#: src/gui/setupinputpages.cpp:57 src/gui/widgets/tabs/setup_audio.cpp:151
#: src/gui/widgets/tabs/setup_chat.cpp:179
-#: src/gui/widgets/tabs/setup_other.cpp:341
+#: src/gui/widgets/tabs/setup_other.cpp:337
#: src/gui/widgets/tabs/setup_visual.cpp:192
#: src/gui/windows/charcreatedialog.cpp:119
#: src/gui/windows/registerdialog.cpp:106 src/input/pages/gui.cpp:87
@@ -2328,212 +2335,227 @@ msgid "Gui"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:113
+#: src/gui/userpalette.cpp:116
msgid "Being"
msgstr "Biće"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:115
+#: src/gui/userpalette.cpp:118
msgid "Friend names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:117
+#: src/gui/userpalette.cpp:120
msgid "Disregarded names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:119
+#: src/gui/userpalette.cpp:122
msgid "Ignored names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:121
+#: src/gui/userpalette.cpp:124
msgid "Erased names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:123
+#: src/gui/userpalette.cpp:126
msgid "Other players names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:125
+#: src/gui/userpalette.cpp:128
msgid "Own name"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:127
+#: src/gui/userpalette.cpp:130
msgid "GM names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:129
+#: src/gui/userpalette.cpp:132
msgid "NPCs"
msgstr "NPCs"
#. TRANSLATORS: palette color
#. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:131 src/gui/widgets/tabs/setup_other.cpp:108
+#: src/gui/userpalette.cpp:134 src/gui/widgets/tabs/setup_other.cpp:108
msgid "Monsters"
msgstr "Čudovišta"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:133
+#: src/gui/userpalette.cpp:136
msgid "Monster HP bar"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:139
msgid "Monster HP bar (second color)"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:138
+#: src/gui/userpalette.cpp:141
msgid "Party members"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:140
+#: src/gui/userpalette.cpp:143
msgid "Guild members"
msgstr ""
#. TRANSLATORS: palette color
#. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:142 src/gui/widgets/tabs/setup_visual.cpp:157
+#: src/gui/userpalette.cpp:145 src/gui/widgets/tabs/setup_visual.cpp:157
msgid "Particle effects"
msgstr "Efekt čestica"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:144
+#: src/gui/userpalette.cpp:147
msgid "Pickup notification"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:146
+#: src/gui/userpalette.cpp:149
msgid "Exp notification"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:148
+#: src/gui/userpalette.cpp:151
msgid "Player HP bar"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:152
+#: src/gui/userpalette.cpp:155
msgid "Player HP bar (second color)"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:154
+#: src/gui/userpalette.cpp:157
msgid "Player hits monster"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:156
+#: src/gui/userpalette.cpp:159
msgid "Monster hits player"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:160
+#: src/gui/userpalette.cpp:163
msgid "Other player hits local player"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:162
+#: src/gui/userpalette.cpp:165
msgid "Critical Hit"
msgstr "Kritični Udarac"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:166
+#: src/gui/userpalette.cpp:169
msgid "Local player hits monster"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:169
+#: src/gui/userpalette.cpp:172
msgid "Local player critical hit"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:172
+#: src/gui/userpalette.cpp:175
msgid "Local player miss"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:174
+#: src/gui/userpalette.cpp:177
msgid "Misses"
msgstr "Promašaji"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:176
+#: src/gui/userpalette.cpp:179
msgid "Portal highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:179
+#: src/gui/userpalette.cpp:182
msgid "Default collision highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:182
+#: src/gui/userpalette.cpp:185
msgid "Air collision highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:185
+#: src/gui/userpalette.cpp:188
msgid "Water collision highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:188
+#: src/gui/userpalette.cpp:191
msgid "Special ground collision highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:191
+#: src/gui/userpalette.cpp:194
msgid "Walkable highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:194
+#: src/gui/userpalette.cpp:197
msgid "Local player attack range"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:197
+#: src/gui/userpalette.cpp:200
msgid "Local player attack range border"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:200
+#: src/gui/userpalette.cpp:203
msgid "Monster attack range"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:204
+#: src/gui/userpalette.cpp:207
msgid "Floor item amount color"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:207
+#: src/gui/userpalette.cpp:210
msgid "Home place"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:210
+#: src/gui/userpalette.cpp:213
msgid "Home place border"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:213
+#: src/gui/userpalette.cpp:216
msgid "Road point"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:216
+#: src/gui/userpalette.cpp:219
msgid "Tiles border"
msgstr ""
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:221
+msgid "Pets"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:223
+msgid "Mercenary"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:225
+msgid "Homunculus"
+msgstr ""
+
#: src/gui/widgets/characterdisplay.cpp:135
#, c-format
msgid "Level: %u"
@@ -2636,7 +2658,8 @@ msgid "Type: %s"
msgstr ""
#. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:108
+#. TRANSLATORS: unknown equipment page name
+#: src/gui/widgets/skillinfo.cpp:108 src/gui/windows/equipmentwindow.cpp:584
msgid "Unknown"
msgstr ""
@@ -2837,22 +2860,22 @@ msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:262
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:313
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:375
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:319
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:387
msgid "Target:"
msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:264
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:319
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:377
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:325
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:389
msgid "Target Id:"
msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:267
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:322
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:379
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:328
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:391
msgid "Target type:"
msgstr ""
@@ -2863,7 +2886,7 @@ msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:271
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:338
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:344
msgid "Target race:"
msgstr ""
@@ -2879,67 +2902,81 @@ msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:277
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:363
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:369
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:387
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:375
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:381
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:399
msgid "Attack delay:"
msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:279
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:350
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:389
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:356
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:401
msgid "Minimal hit:"
msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:281
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:353
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:391
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:359
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:403
msgid "Maximum hit:"
msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:283
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:356
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:393
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:362
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:405
msgid "Critical hit:"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:327
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:285
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:365
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:407
+msgid "Karma:"
+msgstr ""
+
+#. TRANSLATORS: debug window label
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:287
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:368
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:409
+msgid "Manner:"
+msgstr ""
+
+#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:333
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:381
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:339
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:393
msgid "Target Level:"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:341
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:383
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:347
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:395
msgid "Target Party:"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:345
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:385
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:351
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:397
msgid "Target Guild:"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:430
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:436
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:451
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:457
#, c-format
msgid "Ping: %s ms"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:439
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:460
#, c-format
msgid "In: %d bytes/s"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:442
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:463
#, c-format
msgid "Out: %d bytes/s"
msgstr ""
@@ -3768,137 +3805,132 @@ msgstr ""
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_other.cpp:294
-msgid "Enable auction bot support"
-msgstr ""
-
-#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:298
msgid "Enable guild bot support and disable native guild support"
msgstr ""
#. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:304
+#: src/gui/widgets/tabs/setup_other.cpp:300
msgid "Keyboard"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:307
+#: src/gui/widgets/tabs/setup_other.cpp:303
msgid "Repeat delay"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:311
+#: src/gui/widgets/tabs/setup_other.cpp:307
msgid "Repeat interval"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:315
+#: src/gui/widgets/tabs/setup_other.cpp:311
msgid "Custom repeat interval"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:323
+#: src/gui/widgets/tabs/setup_other.cpp:319
msgid "Shortcut buttons"
msgstr ""
#. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:328
+#: src/gui/widgets/tabs/setup_other.cpp:324
msgid "Proxy server"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:332
+#: src/gui/widgets/tabs/setup_other.cpp:328
msgid "Proxy type"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:336
+#: src/gui/widgets/tabs/setup_other.cpp:332
msgid "Proxy address:port"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:344
+#: src/gui/widgets/tabs/setup_other.cpp:340
msgid "Enable server side attack"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:348
+#: src/gui/widgets/tabs/setup_other.cpp:344
msgid "Hide support page link on error"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:352
+#: src/gui/widgets/tabs/setup_other.cpp:348
msgid "Enable double clicks"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:356
+#: src/gui/widgets/tabs/setup_other.cpp:352
msgid "Enable bot checker"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:360
+#: src/gui/widgets/tabs/setup_other.cpp:356
msgid "Enable buggy servers protection (do not disable)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:365
+#: src/gui/widgets/tabs/setup_other.cpp:361
msgid "Enable debug log"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:369
+#: src/gui/widgets/tabs/setup_other.cpp:365
msgid "Ignore logging packets"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:373
+#: src/gui/widgets/tabs/setup_other.cpp:369
msgid "Enable OpenGL log"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:377
+#: src/gui/widgets/tabs/setup_other.cpp:373
msgid "Enable input log"
msgstr ""
#. TRANSLATORS: settings option
#. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_other.cpp:381 src/input/pages/other.cpp:362
+#: src/gui/widgets/tabs/setup_other.cpp:377 src/input/pages/other.cpp:362
msgid "Upload log file"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:385
+#: src/gui/widgets/tabs/setup_other.cpp:381
msgid "Low traffic mode"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:389
+#: src/gui/widgets/tabs/setup_other.cpp:385
msgid "Hide shield sprite"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:394
+#: src/gui/widgets/tabs/setup_other.cpp:390
msgid "Use FBO for screenshots (only for opengl)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:400
+#: src/gui/widgets/tabs/setup_other.cpp:396
msgid "Screenshot directory"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:405
+#: src/gui/widgets/tabs/setup_other.cpp:401
msgid "Network delay between sub servers"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:409
+#: src/gui/widgets/tabs/setup_other.cpp:405
msgid "Show background"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:414
+#: src/gui/widgets/tabs/setup_other.cpp:410
msgid "Screen density override"
msgstr ""
@@ -4129,9 +4161,9 @@ msgstr "Dozvoli šapate"
#. TRANSLATORS: command editor button
#. TRANSLATORS: input action name
#: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:82
-#: src/gui/windows/serverdialog.cpp:125 src/gui/windows/shopwindow.cpp:101
-#: src/gui/windows/shopwindow.cpp:108 src/gui/windows/textcommandeditor.cpp:92
+#: src/gui/windows/charselectdialog.cpp:84
+#: src/gui/windows/serverdialog.cpp:125 src/gui/windows/shopwindow.cpp:100
+#: src/gui/windows/shopwindow.cpp:107 src/gui/windows/textcommandeditor.cpp:92
#: src/input/pages/gui.cpp:111
msgid "Delete"
msgstr "Obriši"
@@ -4785,7 +4817,7 @@ msgstr ""
#. TRANSLATORS: equipment window name
#. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:63
+#: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:65
#: src/gui/windows/inventorywindow.cpp:196
msgid "Equipment"
msgstr "Oprema"
@@ -4926,7 +4958,7 @@ msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: social window button
#: src/gui/windows/buydialog.cpp:260 src/gui/windows/charcreatedialog.cpp:127
-#: src/gui/windows/charselectdialog.cpp:578
+#: src/gui/windows/charselectdialog.cpp:605
#: src/gui/windows/socialwindow.cpp:86
msgid "Create"
msgstr "Stvori"
@@ -4970,10 +5002,8 @@ msgstr ""
#. TRANSLATORS: change password window name
#. TRANSLATORS: change password dialog button
-#. TRANSLATORS: char select dialog. button.
#: src/gui/windows/changepassworddialog.cpp:51
#: src/gui/windows/changepassworddialog.cpp:57
-#: src/gui/windows/charselectdialog.cpp:73
msgid "Change Password"
msgstr "Promijeni Lozinku"
@@ -5127,57 +5157,68 @@ msgid "Are you sure you want to delete this character?"
msgstr "Da li ste sigurni da želite obrisati ovog lika?"
#. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:64
+#: src/gui/windows/charselectdialog.cpp:66
#, c-format
msgid "Account %s (last login time %s)"
msgstr ""
#. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:71
-msgid "Switch Login"
+#: src/gui/windows/charselectdialog.cpp:73
+msgid "Switch"
+msgstr ""
+
+#. TRANSLATORS: char select dialog. button.
+#: src/gui/windows/charselectdialog.cpp:75
+msgid "Password"
msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:78
-#: src/gui/windows/charselectdialog.cpp:573
+#: src/gui/windows/charselectdialog.cpp:80
+#: src/gui/windows/charselectdialog.cpp:595
#: src/gui/windows/updaterwindow.cpp:195
msgid "Play"
msgstr "Igraj"
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:80
+#: src/gui/windows/charselectdialog.cpp:82
#: src/net/ea/charserverhandler.cpp:160
+#: src/net/eathena/charserverhandler.cpp:531
+#: src/net/eathena/charserverhandler.cpp:561
msgid "Info"
msgstr "Info"
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: unregister dialog name
#. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:106
+#: src/gui/windows/charselectdialog.cpp:110
#: src/gui/windows/unregisterdialog.cpp:50
#: src/gui/windows/unregisterdialog.cpp:55
msgid "Unregister"
msgstr "Odjavi"
#. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:118
+#: src/gui/windows/charselectdialog.cpp:122
msgid "Change Email"
msgstr ""
#. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:156
+#: src/gui/windows/charselectdialog.cpp:166
#, c-format
msgid "Account %s"
msgstr ""
-#: src/gui/windows/charselectdialog.cpp:184
+#: src/gui/windows/charselectdialog.cpp:194
msgid "Please set new pincode"
msgstr ""
+#: src/gui/windows/charselectdialog.cpp:240
+msgid "Please enter new name"
+msgstr ""
+
#. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:237
+#: src/gui/windows/charselectdialog.cpp:259
#, c-format
msgid ""
"Hp: %u/%u\n"
@@ -5187,16 +5228,16 @@ msgid ""
"Money: %s"
msgstr ""
-#: src/gui/windows/charselectdialog.cpp:289
+#: src/gui/windows/charselectdialog.cpp:311
msgid "Incorrect password"
msgstr ""
#. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:429
+#: src/gui/windows/charselectdialog.cpp:451
msgid "Enter password for deleting character"
msgstr ""
-#: src/gui/windows/charselectdialog.cpp:429
+#: src/gui/windows/charselectdialog.cpp:451
msgid "Enter password:"
msgstr ""
@@ -5606,7 +5647,7 @@ msgstr "Nivo: %d"
#. TRANSLATORS: status bar label
#: src/gui/windows/ministatuswindow.cpp:364
-#: src/gui/windows/ministatuswindow.cpp:402
+#: src/gui/windows/ministatuswindow.cpp:401
msgid "Need"
msgstr ""
@@ -5637,7 +5678,7 @@ msgstr "Dostavi"
#. TRANSLATORS: shop window button
#. TRANSLATORS: trade window button
#: src/gui/windows/npcdialog.cpp:114 src/gui/windows/serverdialog.cpp:121
-#: src/gui/windows/shopwindow.cpp:99 src/gui/windows/shopwindow.cpp:106
+#: src/gui/windows/shopwindow.cpp:98 src/gui/windows/shopwindow.cpp:105
#: src/gui/windows/tradewindow.cpp:83
msgid "Add"
msgstr "Dodaj"
@@ -5800,43 +5841,38 @@ msgid "Reset Windows"
msgstr "Ponovno pokreni prozore"
#. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:80
+#: src/gui/windows/shopwindow.cpp:79
msgid "Personal Shop"
msgstr ""
#. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:95
+#: src/gui/windows/shopwindow.cpp:94
msgid "Buy items"
msgstr ""
#. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:97
+#: src/gui/windows/shopwindow.cpp:96
msgid "Sell items"
msgstr ""
#. TRANSLATORS: shop window label
#. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:110
+#: src/gui/windows/shopwindow.cpp:102 src/gui/windows/shopwindow.cpp:109
msgid "Announce"
msgstr ""
#. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:114
+#: src/gui/windows/shopwindow.cpp:113
msgid "Show links in announce"
msgstr ""
-#. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:176 src/gui/windows/shopwindow.cpp:179
-msgid "Auction"
-msgstr ""
-
#. TRANSLATORS: shop window dialog
#. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:233
+#: src/gui/windows/shopwindow.cpp:776 src/net/ea/tradehandler.cpp:233
msgid "Request for Trade"
msgstr "Zahtjev za Trgovanje"
-#: src/gui/windows/shopwindow.cpp:791
+#: src/gui/windows/shopwindow.cpp:776
#, c-format
msgid "%s wants to %s %s do you accept?"
msgstr ""
@@ -6164,27 +6200,27 @@ msgstr "Ažuriranje..."
msgid "Connecting..."
msgstr "Spajanje..."
-#: src/gui/windows/updaterwindow.cpp:398
+#: src/gui/windows/updaterwindow.cpp:407
msgid "Show all news (can be slow)"
msgstr ""
#. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:824
+#: src/gui/windows/updaterwindow.cpp:833
msgid "##1 The update process is incomplete."
msgstr "##1 Proces ažuriranja je nepotpun."
#. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:826
+#: src/gui/windows/updaterwindow.cpp:835
msgid "##1 It is strongly recommended that"
msgstr "##1 Vrlo je preporučljivo da"
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:828
+#: src/gui/windows/updaterwindow.cpp:837
msgid "##1 you try again later."
msgstr ""
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1005
+#: src/gui/windows/updaterwindow.cpp:1021
msgid "Completed"
msgstr "Dovršeno"
@@ -6231,25 +6267,25 @@ msgstr ""
#. TRANSLATORS: long key name. must be short.
#. TRANSLATORS: short key name. must be very short.
#. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:370 src/input/inputmanager.cpp:414
+#: src/input/inputmanager.cpp:371 src/input/inputmanager.cpp:415
#: src/input/keyboardconfig.cpp:104
#, c-format
msgid "key_%d"
msgstr ""
#. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:376
+#: src/input/inputmanager.cpp:377
#, c-format
msgid "JButton%d"
msgstr ""
#. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:391
msgid "unknown key"
msgstr ""
#. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:420
+#: src/input/inputmanager.cpp:421
#, c-format
msgid "JB%d"
msgstr ""
@@ -6257,7 +6293,7 @@ msgstr ""
#. TRANSLATORS: unknown short key type. must be short
#. TRANSLATORS: Unknown key short string.
#. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:434 src/input/keyboardconfig.cpp:148
+#: src/input/inputmanager.cpp:435 src/input/keyboardconfig.cpp:148
msgid "u key"
msgstr ""
@@ -7428,74 +7464,74 @@ msgid "Request to quit denied!"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:135
#, c-format
msgid "Guild name: %s"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:191
+#: src/net/ea/guildhandler.cpp:138
#, c-format
msgid "Guild master: %s"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:141
#, c-format
msgid "Guild level: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:197
+#: src/net/ea/guildhandler.cpp:144
#, c-format
msgid "Online members: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:200
+#: src/net/ea/guildhandler.cpp:147
#, c-format
msgid "Max members: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:203
+#: src/net/ea/guildhandler.cpp:150
#, c-format
msgid "Average level: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:206
+#: src/net/ea/guildhandler.cpp:153
#, c-format
msgid "Guild exp: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:209
+#: src/net/ea/guildhandler.cpp:156
#, c-format
msgid "Guild next exp: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:212
+#: src/net/ea/guildhandler.cpp:159
#, c-format
msgid "Guild castle: %s"
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:179
+#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:191
msgid "Item sharing enabled."
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:183
+#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:195
msgid "Item sharing disabled."
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:187
+#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:199
msgid "Item sharing not possible."
msgstr ""
@@ -7506,19 +7542,19 @@ msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:167
+#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:179
msgid "Experience sharing enabled."
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:171
+#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:183
msgid "Experience sharing disabled."
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:175
+#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:187
msgid "Experience sharing not possible."
msgstr ""
@@ -7623,239 +7659,355 @@ msgid "Connection to server terminated. "
msgstr ""
#. TRANSLATORS: message header
-#: src/net/ea/playerhandler.cpp:257 src/net/ea/playerhandler.cpp:273
-#: src/net/ea/playerhandler.cpp:361
+#: src/net/ea/playerhandler.cpp:192 src/net/ea/playerhandler.cpp:418
+#: src/net/ea/playerhandler.cpp:434
msgid "Message"
msgstr ""
#. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:259
+#: src/net/ea/playerhandler.cpp:420
msgid ""
"You are carrying more than half your weight. You are unable to regain "
"health."
msgstr ""
#. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:275
+#: src/net/ea/playerhandler.cpp:436
msgid "You are carrying less than half your weight. You can regain health."
msgstr ""
+#. TRANSLATORS: char rename error
+#: src/net/eathena/charserverhandler.cpp:516
+#: src/net/eathena/charserverhandler.cpp:553
+msgid "Character rename error."
+msgstr ""
+
+#: src/net/eathena/charserverhandler.cpp:531
+msgid "Character renamed."
+msgstr ""
+
+#. TRANSLATORS: char rename error
+#: src/net/eathena/charserverhandler.cpp:544
+msgid "Rename not allowed."
+msgstr ""
+
+#. TRANSLATORS: char rename error
+#: src/net/eathena/charserverhandler.cpp:548
+msgid "New name is not set."
+msgstr ""
+
+#. TRANSLATORS: char rename error
+#: src/net/eathena/charserverhandler.cpp:557
+msgid "Character not found."
+msgstr ""
+
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:125
+#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:124
#, c-format
msgid "Strength %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:127
+#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:126
#, c-format
msgid "Agility %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:129
+#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:128
#, c-format
msgid "Vitality %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:131
+#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:130
#, c-format
msgid "Intelligence %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:128 src/net/tmwa/generalhandler.cpp:133
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:132
#, c-format
msgid "Dexterity %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:135
+#: src/net/eathena/generalhandler.cpp:128 src/net/tmwa/generalhandler.cpp:134
#, c-format
msgid "Luck %s"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:152 src/net/tmwa/generalhandler.cpp:161
+#: src/net/eathena/generalhandler.cpp:159 src/net/tmwa/generalhandler.cpp:160
msgid "Authentication failed."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:155 src/net/tmwa/generalhandler.cpp:165
+#: src/net/eathena/generalhandler.cpp:162 src/net/tmwa/generalhandler.cpp:164
msgid "No servers available."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:160 src/net/tmwa/generalhandler.cpp:171
+#: src/net/eathena/generalhandler.cpp:167 src/net/tmwa/generalhandler.cpp:170
msgid "Someone else is trying to use this account."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:165 src/net/tmwa/generalhandler.cpp:177
+#: src/net/eathena/generalhandler.cpp:172 src/net/tmwa/generalhandler.cpp:176
msgid "This account is already logged in."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:169 src/net/tmwa/generalhandler.cpp:182
+#: src/net/eathena/generalhandler.cpp:176 src/net/tmwa/generalhandler.cpp:181
msgid "Speed hack detected."
msgstr ""
+#: src/net/eathena/generalhandler.cpp:179
+msgid "Server full."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:182
+msgid "Sorry, you are underaged."
+msgstr ""
+
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:172 src/net/tmwa/generalhandler.cpp:186
+#: src/net/eathena/generalhandler.cpp:185 src/net/tmwa/generalhandler.cpp:185
msgid "Duplicated login."
msgstr ""
+#: src/net/eathena/generalhandler.cpp:188
+msgid "To many connections from same ip."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:191
+msgid "Not paid for this time."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:194
+msgid "Pay suspended."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:197
+msgid "Pay changed."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:200
+msgid "Pay wrong ip."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:203
+msgid "Pay game room."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:206
+msgid "Disconnect forced by GM."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:210
+msgid "Ban japan refuse."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:213
+msgid "Remained other account."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:216
+msgid "Ip unfair."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:219
+msgid "Ip count all."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:222
+msgid "Ip count."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:226
+msgid "Memory."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:229
+msgid "Han valid."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:232
+msgid "Ip limited access."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:235
+msgid "Over characters list."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:238
+msgid "Ip blocked."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:241
+msgid "Invalid password count."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:244
+msgid "Not allowed race."
+msgstr ""
+
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:175 src/net/tmwa/generalhandler.cpp:190
+#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:189
msgid "Unknown connection error."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:280
+#: src/net/eathena/generalhandler.cpp:323 src/net/tmwa/generalhandler.cpp:279
msgid "Got disconnected from server!"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:282 src/net/tmwa/generalhandler.cpp:308
+#: src/net/eathena/generalhandler.cpp:348 src/net/tmwa/generalhandler.cpp:307
msgid "Strength"
msgstr "Snaga"
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:310
+#: src/net/eathena/generalhandler.cpp:349 src/net/tmwa/generalhandler.cpp:309
msgid "Agility"
msgstr "Okretnost"
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:284 src/net/tmwa/generalhandler.cpp:312
+#: src/net/eathena/generalhandler.cpp:350 src/net/tmwa/generalhandler.cpp:311
msgid "Vitality"
msgstr "Vitalnost"
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:285 src/net/tmwa/generalhandler.cpp:314
+#: src/net/eathena/generalhandler.cpp:352 src/net/tmwa/generalhandler.cpp:314
msgid "Intelligence"
msgstr "Inteligencija"
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:286 src/net/tmwa/generalhandler.cpp:316
+#: src/net/eathena/generalhandler.cpp:353 src/net/tmwa/generalhandler.cpp:316
msgid "Dexterity"
msgstr "Spretnost"
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:287 src/net/tmwa/generalhandler.cpp:318
+#: src/net/eathena/generalhandler.cpp:354 src/net/tmwa/generalhandler.cpp:318
msgid "Luck"
msgstr "Sreća"
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:290 src/net/tmwa/generalhandler.cpp:323
+#: src/net/eathena/generalhandler.cpp:357 src/net/tmwa/generalhandler.cpp:322
msgid "Defense"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:291 src/net/tmwa/generalhandler.cpp:325
+#: src/net/eathena/generalhandler.cpp:358 src/net/tmwa/generalhandler.cpp:324
msgid "M.Attack"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:292 src/net/tmwa/generalhandler.cpp:327
+#: src/net/eathena/generalhandler.cpp:359 src/net/tmwa/generalhandler.cpp:326
msgid "M.Defense"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:294 src/net/tmwa/generalhandler.cpp:330
+#: src/net/eathena/generalhandler.cpp:361 src/net/tmwa/generalhandler.cpp:329
#, no-c-format
msgid "% Accuracy"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:296 src/net/tmwa/generalhandler.cpp:333
+#: src/net/eathena/generalhandler.cpp:363 src/net/tmwa/generalhandler.cpp:332
#, no-c-format
msgid "% Evade"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:298 src/net/tmwa/generalhandler.cpp:336
+#: src/net/eathena/generalhandler.cpp:365 src/net/tmwa/generalhandler.cpp:335
#, no-c-format
msgid "% Critical"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:299 src/net/tmwa/generalhandler.cpp:338
+#: src/net/eathena/generalhandler.cpp:366 src/net/tmwa/generalhandler.cpp:337
msgid "Attack Delay"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:300 src/net/tmwa/generalhandler.cpp:340
+#: src/net/eathena/generalhandler.cpp:367 src/net/tmwa/generalhandler.cpp:339
msgid "Walk Delay"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:301 src/net/tmwa/generalhandler.cpp:342
+#: src/net/eathena/generalhandler.cpp:368 src/net/tmwa/generalhandler.cpp:341
msgid "Attack Range"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:302 src/net/tmwa/generalhandler.cpp:344
+#: src/net/eathena/generalhandler.cpp:369 src/net/tmwa/generalhandler.cpp:343
msgid "Damage per sec."
msgstr ""
-#: src/net/eathena/skillhandler.cpp:228 src/net/eathena/skillhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:370
+msgid "Karma"
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:371
+msgid "Manner"
+msgstr ""
+
+#: src/net/eathena/skillhandler.cpp:304 src/net/eathena/skillhandler.cpp:364
#, c-format
msgid "Unknown skill error: %d"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:235 src/net/tmwa/skillhandler.cpp:224
+#: src/net/eathena/skillhandler.cpp:311 src/net/tmwa/skillhandler.cpp:224
msgid "You have not yet reached a high enough lvl!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:239 src/net/tmwa/skillhandler.cpp:228
+#: src/net/eathena/skillhandler.cpp:315 src/net/tmwa/skillhandler.cpp:228
msgid "Insufficient HP!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:243 src/net/tmwa/skillhandler.cpp:232
+#: src/net/eathena/skillhandler.cpp:319 src/net/tmwa/skillhandler.cpp:232
msgid "Insufficient SP!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:247 src/net/tmwa/skillhandler.cpp:236
+#: src/net/eathena/skillhandler.cpp:323 src/net/tmwa/skillhandler.cpp:236
msgid "You have no memos!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:251 src/net/tmwa/skillhandler.cpp:240
+#: src/net/eathena/skillhandler.cpp:327 src/net/tmwa/skillhandler.cpp:240
msgid "You cannot do that right now!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:255 src/net/tmwa/skillhandler.cpp:244
+#: src/net/eathena/skillhandler.cpp:331 src/net/tmwa/skillhandler.cpp:244
msgid "Seems you need more money... ;-)"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:259 src/net/tmwa/skillhandler.cpp:248
+#: src/net/eathena/skillhandler.cpp:335 src/net/tmwa/skillhandler.cpp:248
msgid "You cannot use this skill with that kind of weapon!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:264 src/net/tmwa/skillhandler.cpp:253
+#: src/net/eathena/skillhandler.cpp:340 src/net/tmwa/skillhandler.cpp:253
msgid "You need another red gem!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:268 src/net/tmwa/skillhandler.cpp:257
+#: src/net/eathena/skillhandler.cpp:344 src/net/tmwa/skillhandler.cpp:257
msgid "You need another blue gem!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:272 src/net/tmwa/skillhandler.cpp:261
+#: src/net/eathena/skillhandler.cpp:348 src/net/tmwa/skillhandler.cpp:261
msgid "You're carrying to much to do this!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:276 src/net/tmwa/skillhandler.cpp:265
+#: src/net/eathena/skillhandler.cpp:352 src/net/tmwa/skillhandler.cpp:265
msgid "Huh? What's that?"
msgstr ""
@@ -7872,32 +8024,32 @@ msgid "%s wants to trade with you, do you accept?"
msgstr "%s želi trgovati s vama, prihvaćate li?"
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:349
+#: src/net/tmwa/charserverhandler.cpp:351
msgid "Strength:"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:351
+#: src/net/tmwa/charserverhandler.cpp:353
msgid "Agility:"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:353
+#: src/net/tmwa/charserverhandler.cpp:355
msgid "Vitality:"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:355
+#: src/net/tmwa/charserverhandler.cpp:357
msgid "Intelligence:"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:357
+#: src/net/tmwa/charserverhandler.cpp:359
msgid "Dexterity:"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:359
+#: src/net/tmwa/charserverhandler.cpp:361
msgid "Luck:"
msgstr ""
@@ -8208,269 +8360,306 @@ msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:143
+msgid "You cant left party on this map."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:147
+msgid "You was kicked from party."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:151
+msgid "You cant be kicked kicked from party on this map."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:155
#, c-format
msgid "%s has joined your party."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:147
+#: src/resources/notifications.h:159
#, c-format
msgid "%s is already a member of a party."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:151
+#: src/resources/notifications.h:163
#, c-format
msgid "%s refused your invitation."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:155
+#: src/resources/notifications.h:167
#, c-format
msgid "%s is now a member of your party."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:159
+#: src/resources/notifications.h:171
#, c-format
msgid "%s can't join your party because party is full."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:163
+#: src/resources/notifications.h:175
#, c-format
msgid "QQQ Unknown invite response for %s."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:191
+#: src/resources/notifications.h:203
#, c-format
msgid "%s has left your party."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:195
+#: src/resources/notifications.h:207 src/resources/notifications.h:215
+#, c-format
+msgid "%s cant be kicked from party on this map."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:211
+#, c-format
+msgid "%s has kicked from your party."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:219
#, c-format
msgid "An unknown member tried to say: %s"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:199
+#: src/resources/notifications.h:223
#, c-format
msgid "%s is not in your party!"
msgstr "%s nije u vašoj partiji!"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:203
+#: src/resources/notifications.h:227
#, c-format
msgid "You picked up %s."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:207
+#: src/resources/notifications.h:231
#, c-format
msgid "You spent %s."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:211
+#: src/resources/notifications.h:235
msgid "Cannot raise skill!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:215
+#: src/resources/notifications.h:239
msgid "Equip ammunition first."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:219
+#: src/resources/notifications.h:243
#, c-format
msgid "Trading with %s isn't possible. Trade partner is too far away."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:224
+#: src/resources/notifications.h:248
#, c-format
msgid "Trading with %s isn't possible. Character doesn't exist."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:228
+#: src/resources/notifications.h:252
msgid "Trade cancelled due to an unknown reason."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:232
+#: src/resources/notifications.h:256
#, c-format
msgid "Trade with %s cancelled."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:236
+#: src/resources/notifications.h:260
#, c-format
msgid "Unhandled trade cancel packet with %s"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:240
+#: src/resources/notifications.h:264
msgid "Failed adding item. Trade partner is over weighted."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:244
+#: src/resources/notifications.h:268
msgid "Failed adding item. Trade partner has no free slot."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:248
+#: src/resources/notifications.h:272
msgid "Failed adding item. You can't trade this item."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:252
+#: src/resources/notifications.h:276
msgid "Failed adding item for unknown reason."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:256
+#: src/resources/notifications.h:280
msgid "Trade canceled."
msgstr "Otkazano trgovanje."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:260
+#: src/resources/notifications.h:284
msgid "Trade completed."
msgstr "Trgovanje je završeno."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:264
+#: src/resources/notifications.h:288
msgid "Kick failed!"
msgstr "Šut nije uspio!"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:268
+#: src/resources/notifications.h:292
msgid "Kick succeeded!"
msgstr "Šut uspio!"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:272
+#: src/resources/notifications.h:296
#, c-format
msgid "MVP player: %s"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:276
+#: src/resources/notifications.h:300
msgid "All whispers ignored."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:280
+#: src/resources/notifications.h:304
msgid "All whispers ignore failed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:284
+#: src/resources/notifications.h:308
msgid "All whispers unignored."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:288
+#: src/resources/notifications.h:312
msgid "All whispers unignore failed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:295
+#: src/resources/notifications.h:319
msgid "pvp off, gvg off"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:299
+#: src/resources/notifications.h:323
msgid "pvp on"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:303
+#: src/resources/notifications.h:327
msgid "gvg on"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:307
+#: src/resources/notifications.h:331
msgid "pvp on, gvg on"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:311
+#: src/resources/notifications.h:335
msgid "unknown pvp"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:315
+#: src/resources/notifications.h:339
#, c-format
msgid "Char from account %s is already in your party!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:319
+#: src/resources/notifications.h:343
#, c-format
msgid "%s blocked invite!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:323
+#: src/resources/notifications.h:347
msgid "Char is not online!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:327
+#: src/resources/notifications.h:351
msgid "Pet catch failed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:331
+#: src/resources/notifications.h:355
msgid "Pet catched."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:335
+#: src/resources/notifications.h:359
#, c-format
msgid "Pet catch unkown error: %d."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:339
+#: src/resources/notifications.h:363
msgid "Your mercenary duty hour is over."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:343
+#: src/resources/notifications.h:367
msgid "Your mercenary was killed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:347
+#: src/resources/notifications.h:371
msgid "Your mercenary was fired."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:351
+#: src/resources/notifications.h:375
msgid "Your mercenary run away."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:355
+#: src/resources/notifications.h:379
msgid "Mercenary unknown state."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:359
-msgid "Your feed your homunculus."
+#: src/resources/notifications.h:383
+msgid "You feed your homunculus."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:363
+#: src/resources/notifications.h:387
#, c-format
msgid "You cant feed homunculus, because not have %s."
msgstr ""
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:391
+msgid "Card insert failed."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:395
+msgid "Card inserted."
+msgstr ""
+
#. TRANSLATORS: chat option changed message
#: src/utils/booleanoptions.h:27
#, c-format
diff --git a/po/hu.po b/po/hu.po
index ecf6b982c..1f937cd2c 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-27 13:23+0300\n"
-"PO-Revision-Date: 2014-09-28 10:01+0000\n"
+"POT-Creation-Date: 2014-10-08 01:19+0300\n"
+"PO-Revision-Date: 2014-10-08 10:01+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Hungarian (http://www.transifex.com/projects/p/manaplus/language/hu/)\n"
"MIME-Version: 1.0\n"
@@ -32,7 +32,7 @@ msgstr ""
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:131 src/client.cpp:1463 src/client.cpp:1490
+#: src/actions/actions.cpp:131 src/client.cpp:1461 src/client.cpp:1488
#: src/gamemodifiers.cpp:423 src/gui/widgets/tabs/setup_input.cpp:163
#: src/gui/widgets/tabs/setup_theme.cpp:312
#: src/gui/widgets/tabs/setup_theme.cpp:343
@@ -43,8 +43,8 @@ msgstr ""
#: src/gui/windows/changeemaildialog.cpp:170
#: src/gui/windows/changepassworddialog.cpp:160
#: src/gui/windows/charcreatedialog.cpp:373
-#: src/gui/windows/charselectdialog.cpp:255
-#: src/gui/windows/charselectdialog.cpp:291 src/gui/windows/editdialog.cpp:49
+#: src/gui/windows/charselectdialog.cpp:277
+#: src/gui/windows/charselectdialog.cpp:313 src/gui/windows/editdialog.cpp:49
#: src/gui/windows/editserverdialog.cpp:61
#: src/gui/windows/editserverdialog.cpp:208
#: src/gui/windows/itemamountwindow.cpp:158 src/gui/windows/quitdialog.cpp:70
@@ -52,7 +52,9 @@ msgstr ""
#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
#: src/net/ea/charserverhandler.cpp:143 src/net/ea/charserverhandler.cpp:162
#: src/net/ea/charserverhandler.cpp:175 src/net/ea/gamehandler.cpp:79
-#: src/net/ea/playerhandler.cpp:263 src/net/ea/playerhandler.cpp:279
+#: src/net/ea/playerhandler.cpp:424 src/net/ea/playerhandler.cpp:440
+#: src/net/eathena/charserverhandler.cpp:533
+#: src/net/eathena/charserverhandler.cpp:563
msgid "OK"
msgstr "Ok"
@@ -176,7 +178,7 @@ msgstr ""
#. TRANSLATORS: party invite message
#. TRANSLATORS: change relation
-#: src/actions/chat.cpp:303 src/actions/commands.cpp:65
+#: src/actions/chat.cpp:303 src/actions/commands.cpp:64
msgid "Please specify a name."
msgstr ""
@@ -199,75 +201,75 @@ msgid "Message now closes chat."
msgstr "Az üzenet mostantól bezárja a bevitelt."
#. TRANSLATORS: change relation
-#: src/actions/commands.cpp:108
+#: src/actions/commands.cpp:107
#, c-format
msgid "Player already %s!"
msgstr ""
#. TRANSLATORS: change relation
-#: src/actions/commands.cpp:120
+#: src/actions/commands.cpp:119
#, c-format
msgid "Player successfully %s!"
msgstr ""
#. TRANSLATORS: change relation
-#: src/actions/commands.cpp:122
+#: src/actions/commands.cpp:121
#, c-format
msgid "Player could not be %s!"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:153
+#: src/actions/commands.cpp:152
msgid "Player wasn't ignored!"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:162
+#: src/actions/commands.cpp:161
msgid "Player no longer ignored!"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:164
+#: src/actions/commands.cpp:163
msgid "Player could not be unignored!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/actions/commands.cpp:179
+#: src/actions/commands.cpp:178
msgid "Player already erased!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/actions/commands.cpp:192
+#: src/actions/commands.cpp:191
msgid "Player no longer erased!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/actions/commands.cpp:194
+#: src/actions/commands.cpp:193
msgid "Player could not be erased!"
msgstr ""
#. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:201
+#: src/actions/commands.cpp:200
msgid "friend"
msgstr ""
#. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:208
+#: src/actions/commands.cpp:207
msgid "disregarded"
msgstr ""
#. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:215
+#: src/actions/commands.cpp:214
msgid "neutral"
msgstr ""
#. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:222
+#: src/actions/commands.cpp:221
msgid "blacklisted"
msgstr ""
#. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:229
+#: src/actions/commands.cpp:228
msgid "enemy"
msgstr ""
@@ -282,77 +284,77 @@ msgid "Accepting incoming trade requests"
msgstr "Kereskedési kérelmek elfogadása"
#. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1306
+#: src/actormanager.cpp:1310
msgid "Visible on map"
msgstr ""
#. TRANSLATORS: default race name
-#: src/being/being.cpp:389
+#: src/being/being.cpp:393
msgid "Human"
msgstr ""
-#: src/being/being.cpp:556
+#: src/being/being.cpp:560
msgid "dodge"
msgstr ""
-#: src/being/being.cpp:556
+#: src/being/being.cpp:560
msgid "miss"
msgstr ""
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1865 src/gui/windows/whoisonline.cpp:855
+#: src/being/being.cpp:1869 src/gui/windows/whoisonline.cpp:855
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1870 src/gui/windows/whoisonline.cpp:860
+#: src/being/being.cpp:1874 src/gui/windows/whoisonline.cpp:860
msgid "I"
msgstr ""
#. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:379
+#: src/being/localplayer.cpp:380
#, c-format
msgid "You were killed by %s"
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:824
+#: src/being/localplayer.cpp:825
msgid "Tried to pick up nonexistent item."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:828
+#: src/being/localplayer.cpp:829
msgid "Item is too heavy."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:832
+#: src/being/localplayer.cpp:833
msgid "Item is too far away."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:836
+#: src/being/localplayer.cpp:837
msgid "Inventory is full."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:840
+#: src/being/localplayer.cpp:841
msgid "Stack is too big."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:844
+#: src/being/localplayer.cpp:845
msgid "Item belongs to someone else."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:848
+#: src/being/localplayer.cpp:849
msgid "Unknown problem picking up item."
msgstr ""
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:872
+#: src/being/localplayer.cpp:873
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -361,43 +363,43 @@ msgstr[1] ""
#. TRANSLATORS: this is normal experience
#. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1054 src/being/localplayer.cpp:1055
-#: src/being/localplayer.cpp:1091
+#: src/being/localplayer.cpp:1055 src/being/localplayer.cpp:1056
+#: src/being/localplayer.cpp:1092
msgid "xp"
msgstr ""
#. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1059 src/being/localplayer.cpp:1065
-#: src/being/localplayer.cpp:1071
+#: src/being/localplayer.cpp:1060 src/being/localplayer.cpp:1066
+#: src/being/localplayer.cpp:1072
msgid "job"
msgstr ""
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2794
+#: src/being/localplayer.cpp:2795
#, c-format
msgid "Follow: %s"
msgstr ""
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2800 src/being/localplayer.cpp:2825
+#: src/being/localplayer.cpp:2801 src/being/localplayer.cpp:2826
msgid "Follow canceled"
msgstr ""
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2810
+#: src/being/localplayer.cpp:2811
#, c-format
msgid "Imitation: %s"
msgstr ""
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2816 src/being/localplayer.cpp:2830
+#: src/being/localplayer.cpp:2817 src/being/localplayer.cpp:2831
msgid "Imitation canceled"
msgstr ""
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3180
+#: src/being/localplayer.cpp:3181
#, c-format
msgid "You see %s"
msgstr ""
@@ -435,37 +437,37 @@ msgstr ""
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:920 src/gui/windowmenu.cpp:162
+#: src/client.cpp:918 src/gui/windowmenu.cpp:162
#: src/gui/windows/setupwindow.cpp:62
msgid "Setup"
msgstr "Beállítások"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:923 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:921 src/gui/widgets/tabs/setup_perfomance.cpp:54
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:926 src/gui/widgets/tabs/setup_video.cpp:105
+#: src/client.cpp:924 src/gui/widgets/tabs/setup_video.cpp:105
msgid "Video"
msgstr "Videó"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:929 src/gui/widgets/tabs/setup_theme.cpp:122
+#: src/client.cpp:927 src/gui/widgets/tabs/setup_theme.cpp:122
msgid "Theme"
msgstr ""
#. TRANSLATORS: theme tab quick button
-#: src/client.cpp:932
+#: src/client.cpp:930
msgid "About"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:935 src/gui/windowmenu.cpp:74
+#: src/client.cpp:933 src/gui/windowmenu.cpp:74
#: src/gui/windows/helpwindow.cpp:53
msgid "Help"
msgstr "Súgó"
@@ -481,42 +483,42 @@ msgstr "Súgó"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:939 src/client.cpp:1391 src/client.cpp:1405
+#: src/client.cpp:937 src/client.cpp:1389 src/client.cpp:1403
#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:691
#: src/gui/popups/popupmenu.cpp:923 src/gui/windows/didyouknowwindow.cpp:81
#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:74
#: src/gui/windows/npcdialog.cpp:112 src/gui/windows/questswindow.cpp:77
-#: src/gui/windows/shopwindow.cpp:84
+#: src/gui/windows/shopwindow.cpp:83
msgid "Close"
msgstr "Bezár"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1065
+#: src/client.cpp:1063
msgid "Connecting to server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1113
+#: src/client.cpp:1111
msgid "Logging in"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1156
+#: src/client.cpp:1154
msgid "Entering game world"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1282
+#: src/client.cpp:1280
msgid "Requesting characters"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1322
+#: src/client.cpp:1320
msgid "Connecting to the game server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1334
+#: src/client.cpp:1332
msgid "Changing game servers"
msgstr ""
@@ -530,72 +532,76 @@ msgstr ""
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1389 src/client.cpp:1403 src/client.cpp:1598
+#. TRANSLATORS: info message
+#. TRANSLATORS: ok dialog button
+#: src/client.cpp:1387 src/client.cpp:1401 src/client.cpp:1596
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
#: src/gui/windows/charcreatedialog.cpp:369
-#: src/gui/windows/charselectdialog.cpp:289
+#: src/gui/windows/charselectdialog.cpp:311
#: src/gui/windows/editserverdialog.cpp:203
#: src/gui/windows/registerdialog.cpp:245
#: src/gui/windows/unregisterdialog.cpp:146
#: src/net/ea/charserverhandler.cpp:141 src/net/ea/charserverhandler.cpp:173
+#: src/net/eathena/charserverhandler.cpp:516
+#: src/net/eathena/charserverhandler.cpp:518
msgid "Error"
msgstr "Hiba"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1418
+#: src/client.cpp:1416
msgid "Requesting registration details"
msgstr ""
#. TRANSLATORS: password change message header
-#: src/client.cpp:1459
+#: src/client.cpp:1457
msgid "Password Change"
msgstr ""
#. TRANSLATORS: password change message text
-#: src/client.cpp:1461
+#: src/client.cpp:1459
msgid "Password changed successfully!"
msgstr ""
#. TRANSLATORS: email change message header
-#: src/client.cpp:1486
+#: src/client.cpp:1484
msgid "Email Change"
msgstr ""
#. TRANSLATORS: email change message text
-#: src/client.cpp:1488
+#: src/client.cpp:1486
msgid "Email changed successfully!"
msgstr ""
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1515
+#: src/client.cpp:1513
msgid "Unregister Successful"
msgstr ""
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1517
+#: src/client.cpp:1515
msgid "Farewell, come back any time..."
msgstr ""
#. TRANSLATORS: directory creation error
#: src/configmanager.cpp:53 src/dirs.cpp:260 src/dirs.cpp:275 src/dirs.cpp:320
-#: src/dirs.cpp:481 src/dirs.cpp:489
+#: src/dirs.cpp:488 src/dirs.cpp:496
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:363
+#: src/dirs.cpp:370
#, c-format
msgid "Invalid update host: %s."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:404 src/dirs.cpp:411
+#: src/dirs.cpp:411 src/dirs.cpp:418
msgid "Error creating updates directory!"
msgstr "Hiba a frissítési könyvtár létrehozása közben!"
-#: src/dirs.cpp:433 src/dirs.cpp:451
+#: src/dirs.cpp:440 src/dirs.cpp:458
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
@@ -613,36 +619,36 @@ msgid "dyecmd srcdyestring dstfile"
msgstr ""
#. TRANSLATORS: chat tab header
-#: src/game.cpp:236 src/gui/widgets/tabs/chattab.cpp:482
+#: src/game.cpp:234 src/gui/widgets/tabs/chattab.cpp:482
msgid "General"
msgstr "Általános"
#. TRANSLATORS: chat tab header
#. TRANSLATORS: full button name
#. TRANSLATORS: debug window name
-#: src/game.cpp:253 src/gui/widgets/tabs/chattab.cpp:484
+#: src/game.cpp:251 src/gui/widgets/tabs/chattab.cpp:484
#: src/gui/windowmenu.cpp:149 src/gui/windows/debugwindow.cpp:42
msgid "Debug"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:541
+#: src/game.cpp:532
#, c-format
msgid "Screenshot saved as %s"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:551
+#: src/game.cpp:542
msgid "Saving screenshot failed!"
msgstr "Hiba a képernyő mentése során!"
#. TRANSLATORS: error message text
-#: src/game.cpp:634
+#: src/game.cpp:625
msgid "The connection to the server was lost."
msgstr ""
#. TRANSLATORS: error message header
-#: src/game.cpp:637
+#: src/game.cpp:628
msgid "Network Error"
msgstr "Hálózati hiba"
@@ -1033,6 +1039,7 @@ msgstr ""
#: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
#: src/gui/widgets/tabs/setup_other.cpp:79
#: src/gui/widgets/tabs/setup_visual.cpp:81
+#: src/gui/windows/equipmentwindow.cpp:577
msgid "default"
msgstr ""
@@ -1523,7 +1530,7 @@ msgstr "Üzlet"
#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:273
#: src/gui/popups/popupmenu.cpp:767 src/gui/widgets/skillinfo.cpp:113
#: src/gui/windows/botcheckerwindow.cpp:89 src/input/pages/basic.cpp:42
-#: src/net/eathena/generalhandler.cpp:289 src/net/tmwa/generalhandler.cpp:321
+#: src/net/eathena/generalhandler.cpp:356 src/net/tmwa/generalhandler.cpp:320
msgid "Attack"
msgstr "Támadás"
@@ -1692,7 +1699,7 @@ msgstr ""
#. TRANSLATORS: pet unequip item
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:340 src/gui/windows/equipmentwindow.cpp:70
+#: src/gui/popups/popupmenu.cpp:340 src/gui/windows/equipmentwindow.cpp:72
#: src/gui/windows/inventorywindow.cpp:175 src/resources/itemtypemapdata.h:47
#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
@@ -1750,7 +1757,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:574
+#: src/gui/popups/popupmenu.cpp:574 src/gui/windows/charselectdialog.cpp:132
msgid "Rename"
msgstr ""
@@ -2262,7 +2269,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
#. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:3000 src/net/ea/playerhandler.cpp:364
+#: src/gui/popups/popupmenu.cpp:3000 src/net/ea/playerhandler.cpp:195
msgid "Revive"
msgstr ""
@@ -2286,7 +2293,7 @@ msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: settings group
#. TRANSLATORS: full button name
-#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:319
+#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:315
#: src/gui/windowmenu.cpp:158
msgid "Windows"
msgstr ""
@@ -2314,7 +2321,7 @@ msgstr "Chat"
#. TRANSLATORS: input action name
#: src/gui/setupinputpages.cpp:57 src/gui/widgets/tabs/setup_audio.cpp:151
#: src/gui/widgets/tabs/setup_chat.cpp:179
-#: src/gui/widgets/tabs/setup_other.cpp:341
+#: src/gui/widgets/tabs/setup_other.cpp:337
#: src/gui/widgets/tabs/setup_visual.cpp:192
#: src/gui/windows/charcreatedialog.cpp:119
#: src/gui/windows/registerdialog.cpp:106 src/input/pages/gui.cpp:87
@@ -2327,212 +2334,227 @@ msgid "Gui"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:113
+#: src/gui/userpalette.cpp:116
msgid "Being"
msgstr "Nevek"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:115
+#: src/gui/userpalette.cpp:118
msgid "Friend names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:117
+#: src/gui/userpalette.cpp:120
msgid "Disregarded names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:119
+#: src/gui/userpalette.cpp:122
msgid "Ignored names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:121
+#: src/gui/userpalette.cpp:124
msgid "Erased names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:123
+#: src/gui/userpalette.cpp:126
msgid "Other players names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:125
+#: src/gui/userpalette.cpp:128
msgid "Own name"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:127
+#: src/gui/userpalette.cpp:130
msgid "GM names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:129
+#: src/gui/userpalette.cpp:132
msgid "NPCs"
msgstr "Gépjátékos neve"
#. TRANSLATORS: palette color
#. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:131 src/gui/widgets/tabs/setup_other.cpp:108
+#: src/gui/userpalette.cpp:134 src/gui/widgets/tabs/setup_other.cpp:108
msgid "Monsters"
msgstr "Szörny neve"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:133
+#: src/gui/userpalette.cpp:136
msgid "Monster HP bar"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:139
msgid "Monster HP bar (second color)"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:138
+#: src/gui/userpalette.cpp:141
msgid "Party members"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:140
+#: src/gui/userpalette.cpp:143
msgid "Guild members"
msgstr ""
#. TRANSLATORS: palette color
#. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:142 src/gui/widgets/tabs/setup_visual.cpp:157
+#: src/gui/userpalette.cpp:145 src/gui/widgets/tabs/setup_visual.cpp:157
msgid "Particle effects"
msgstr "Játékbéli effektek"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:144
+#: src/gui/userpalette.cpp:147
msgid "Pickup notification"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:146
+#: src/gui/userpalette.cpp:149
msgid "Exp notification"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:148
+#: src/gui/userpalette.cpp:151
msgid "Player HP bar"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:152
+#: src/gui/userpalette.cpp:155
msgid "Player HP bar (second color)"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:154
+#: src/gui/userpalette.cpp:157
msgid "Player hits monster"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:156
+#: src/gui/userpalette.cpp:159
msgid "Monster hits player"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:160
+#: src/gui/userpalette.cpp:163
msgid "Other player hits local player"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:162
+#: src/gui/userpalette.cpp:165
msgid "Critical Hit"
msgstr "Kritikális ütéskor"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:166
+#: src/gui/userpalette.cpp:169
msgid "Local player hits monster"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:169
+#: src/gui/userpalette.cpp:172
msgid "Local player critical hit"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:172
+#: src/gui/userpalette.cpp:175
msgid "Local player miss"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:174
+#: src/gui/userpalette.cpp:177
msgid "Misses"
msgstr "Ha nincs találat."
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:176
+#: src/gui/userpalette.cpp:179
msgid "Portal highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:179
+#: src/gui/userpalette.cpp:182
msgid "Default collision highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:182
+#: src/gui/userpalette.cpp:185
msgid "Air collision highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:185
+#: src/gui/userpalette.cpp:188
msgid "Water collision highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:188
+#: src/gui/userpalette.cpp:191
msgid "Special ground collision highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:191
+#: src/gui/userpalette.cpp:194
msgid "Walkable highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:194
+#: src/gui/userpalette.cpp:197
msgid "Local player attack range"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:197
+#: src/gui/userpalette.cpp:200
msgid "Local player attack range border"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:200
+#: src/gui/userpalette.cpp:203
msgid "Monster attack range"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:204
+#: src/gui/userpalette.cpp:207
msgid "Floor item amount color"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:207
+#: src/gui/userpalette.cpp:210
msgid "Home place"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:210
+#: src/gui/userpalette.cpp:213
msgid "Home place border"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:213
+#: src/gui/userpalette.cpp:216
msgid "Road point"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:216
+#: src/gui/userpalette.cpp:219
msgid "Tiles border"
msgstr ""
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:221
+msgid "Pets"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:223
+msgid "Mercenary"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:225
+msgid "Homunculus"
+msgstr ""
+
#: src/gui/widgets/characterdisplay.cpp:135
#, c-format
msgid "Level: %u"
@@ -2635,7 +2657,8 @@ msgid "Type: %s"
msgstr ""
#. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:108
+#. TRANSLATORS: unknown equipment page name
+#: src/gui/widgets/skillinfo.cpp:108 src/gui/windows/equipmentwindow.cpp:584
msgid "Unknown"
msgstr ""
@@ -2836,22 +2859,22 @@ msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:262
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:313
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:375
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:319
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:387
msgid "Target:"
msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:264
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:319
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:377
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:325
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:389
msgid "Target Id:"
msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:267
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:322
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:379
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:328
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:391
msgid "Target type:"
msgstr ""
@@ -2862,7 +2885,7 @@ msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:271
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:338
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:344
msgid "Target race:"
msgstr ""
@@ -2878,67 +2901,81 @@ msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:277
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:363
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:369
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:387
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:375
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:381
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:399
msgid "Attack delay:"
msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:279
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:350
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:389
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:356
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:401
msgid "Minimal hit:"
msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:281
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:353
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:391
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:359
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:403
msgid "Maximum hit:"
msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:283
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:356
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:393
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:362
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:405
msgid "Critical hit:"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:327
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:285
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:365
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:407
+msgid "Karma:"
+msgstr ""
+
+#. TRANSLATORS: debug window label
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:287
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:368
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:409
+msgid "Manner:"
+msgstr ""
+
+#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:333
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:381
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:339
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:393
msgid "Target Level:"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:341
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:383
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:347
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:395
msgid "Target Party:"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:345
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:385
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:351
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:397
msgid "Target Guild:"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:430
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:436
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:451
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:457
#, c-format
msgid "Ping: %s ms"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:439
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:460
#, c-format
msgid "In: %d bytes/s"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:442
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:463
#, c-format
msgid "Out: %d bytes/s"
msgstr ""
@@ -3767,137 +3804,132 @@ msgstr ""
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_other.cpp:294
-msgid "Enable auction bot support"
-msgstr ""
-
-#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:298
msgid "Enable guild bot support and disable native guild support"
msgstr ""
#. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:304
+#: src/gui/widgets/tabs/setup_other.cpp:300
msgid "Keyboard"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:307
+#: src/gui/widgets/tabs/setup_other.cpp:303
msgid "Repeat delay"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:311
+#: src/gui/widgets/tabs/setup_other.cpp:307
msgid "Repeat interval"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:315
+#: src/gui/widgets/tabs/setup_other.cpp:311
msgid "Custom repeat interval"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:323
+#: src/gui/widgets/tabs/setup_other.cpp:319
msgid "Shortcut buttons"
msgstr ""
#. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:328
+#: src/gui/widgets/tabs/setup_other.cpp:324
msgid "Proxy server"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:332
+#: src/gui/widgets/tabs/setup_other.cpp:328
msgid "Proxy type"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:336
+#: src/gui/widgets/tabs/setup_other.cpp:332
msgid "Proxy address:port"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:344
+#: src/gui/widgets/tabs/setup_other.cpp:340
msgid "Enable server side attack"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:348
+#: src/gui/widgets/tabs/setup_other.cpp:344
msgid "Hide support page link on error"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:352
+#: src/gui/widgets/tabs/setup_other.cpp:348
msgid "Enable double clicks"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:356
+#: src/gui/widgets/tabs/setup_other.cpp:352
msgid "Enable bot checker"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:360
+#: src/gui/widgets/tabs/setup_other.cpp:356
msgid "Enable buggy servers protection (do not disable)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:365
+#: src/gui/widgets/tabs/setup_other.cpp:361
msgid "Enable debug log"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:369
+#: src/gui/widgets/tabs/setup_other.cpp:365
msgid "Ignore logging packets"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:373
+#: src/gui/widgets/tabs/setup_other.cpp:369
msgid "Enable OpenGL log"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:377
+#: src/gui/widgets/tabs/setup_other.cpp:373
msgid "Enable input log"
msgstr ""
#. TRANSLATORS: settings option
#. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_other.cpp:381 src/input/pages/other.cpp:362
+#: src/gui/widgets/tabs/setup_other.cpp:377 src/input/pages/other.cpp:362
msgid "Upload log file"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:385
+#: src/gui/widgets/tabs/setup_other.cpp:381
msgid "Low traffic mode"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:389
+#: src/gui/widgets/tabs/setup_other.cpp:385
msgid "Hide shield sprite"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:394
+#: src/gui/widgets/tabs/setup_other.cpp:390
msgid "Use FBO for screenshots (only for opengl)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:400
+#: src/gui/widgets/tabs/setup_other.cpp:396
msgid "Screenshot directory"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:405
+#: src/gui/widgets/tabs/setup_other.cpp:401
msgid "Network delay between sub servers"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:409
+#: src/gui/widgets/tabs/setup_other.cpp:405
msgid "Show background"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:414
+#: src/gui/widgets/tabs/setup_other.cpp:410
msgid "Screen density override"
msgstr ""
@@ -4128,9 +4160,9 @@ msgstr "Privát engedélyezése"
#. TRANSLATORS: command editor button
#. TRANSLATORS: input action name
#: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:82
-#: src/gui/windows/serverdialog.cpp:125 src/gui/windows/shopwindow.cpp:101
-#: src/gui/windows/shopwindow.cpp:108 src/gui/windows/textcommandeditor.cpp:92
+#: src/gui/windows/charselectdialog.cpp:84
+#: src/gui/windows/serverdialog.cpp:125 src/gui/windows/shopwindow.cpp:100
+#: src/gui/windows/shopwindow.cpp:107 src/gui/windows/textcommandeditor.cpp:92
#: src/input/pages/gui.cpp:111
msgid "Delete"
msgstr "Törlés"
@@ -4784,7 +4816,7 @@ msgstr ""
#. TRANSLATORS: equipment window name
#. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:63
+#: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:65
#: src/gui/windows/inventorywindow.cpp:196
msgid "Equipment"
msgstr "Felszerelés"
@@ -4925,7 +4957,7 @@ msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: social window button
#: src/gui/windows/buydialog.cpp:260 src/gui/windows/charcreatedialog.cpp:127
-#: src/gui/windows/charselectdialog.cpp:578
+#: src/gui/windows/charselectdialog.cpp:605
#: src/gui/windows/socialwindow.cpp:86
msgid "Create"
msgstr "Létrehozás"
@@ -4969,10 +5001,8 @@ msgstr ""
#. TRANSLATORS: change password window name
#. TRANSLATORS: change password dialog button
-#. TRANSLATORS: char select dialog. button.
#: src/gui/windows/changepassworddialog.cpp:51
#: src/gui/windows/changepassworddialog.cpp:57
-#: src/gui/windows/charselectdialog.cpp:73
msgid "Change Password"
msgstr "Jelszó módosítása"
@@ -5126,57 +5156,68 @@ msgid "Are you sure you want to delete this character?"
msgstr "Biztos hogy ki akarod törölni ezt a karaktert?"
#. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:64
+#: src/gui/windows/charselectdialog.cpp:66
#, c-format
msgid "Account %s (last login time %s)"
msgstr ""
#. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:71
-msgid "Switch Login"
+#: src/gui/windows/charselectdialog.cpp:73
+msgid "Switch"
+msgstr ""
+
+#. TRANSLATORS: char select dialog. button.
+#: src/gui/windows/charselectdialog.cpp:75
+msgid "Password"
msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:78
-#: src/gui/windows/charselectdialog.cpp:573
+#: src/gui/windows/charselectdialog.cpp:80
+#: src/gui/windows/charselectdialog.cpp:595
#: src/gui/windows/updaterwindow.cpp:195
msgid "Play"
msgstr "Játék"
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:80
+#: src/gui/windows/charselectdialog.cpp:82
#: src/net/ea/charserverhandler.cpp:160
+#: src/net/eathena/charserverhandler.cpp:531
+#: src/net/eathena/charserverhandler.cpp:561
msgid "Info"
msgstr "Infó"
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: unregister dialog name
#. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:106
+#: src/gui/windows/charselectdialog.cpp:110
#: src/gui/windows/unregisterdialog.cpp:50
#: src/gui/windows/unregisterdialog.cpp:55
msgid "Unregister"
msgstr "Regisztráció megszüntetése"
#. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:118
+#: src/gui/windows/charselectdialog.cpp:122
msgid "Change Email"
msgstr ""
#. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:156
+#: src/gui/windows/charselectdialog.cpp:166
#, c-format
msgid "Account %s"
msgstr ""
-#: src/gui/windows/charselectdialog.cpp:184
+#: src/gui/windows/charselectdialog.cpp:194
msgid "Please set new pincode"
msgstr ""
+#: src/gui/windows/charselectdialog.cpp:240
+msgid "Please enter new name"
+msgstr ""
+
#. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:237
+#: src/gui/windows/charselectdialog.cpp:259
#, c-format
msgid ""
"Hp: %u/%u\n"
@@ -5186,16 +5227,16 @@ msgid ""
"Money: %s"
msgstr ""
-#: src/gui/windows/charselectdialog.cpp:289
+#: src/gui/windows/charselectdialog.cpp:311
msgid "Incorrect password"
msgstr ""
#. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:429
+#: src/gui/windows/charselectdialog.cpp:451
msgid "Enter password for deleting character"
msgstr ""
-#: src/gui/windows/charselectdialog.cpp:429
+#: src/gui/windows/charselectdialog.cpp:451
msgid "Enter password:"
msgstr ""
@@ -5603,7 +5644,7 @@ msgstr "Szint: %d"
#. TRANSLATORS: status bar label
#: src/gui/windows/ministatuswindow.cpp:364
-#: src/gui/windows/ministatuswindow.cpp:402
+#: src/gui/windows/ministatuswindow.cpp:401
msgid "Need"
msgstr ""
@@ -5634,7 +5675,7 @@ msgstr "Küldés"
#. TRANSLATORS: shop window button
#. TRANSLATORS: trade window button
#: src/gui/windows/npcdialog.cpp:114 src/gui/windows/serverdialog.cpp:121
-#: src/gui/windows/shopwindow.cpp:99 src/gui/windows/shopwindow.cpp:106
+#: src/gui/windows/shopwindow.cpp:98 src/gui/windows/shopwindow.cpp:105
#: src/gui/windows/tradewindow.cpp:83
msgid "Add"
msgstr "Hozzáad"
@@ -5797,43 +5838,38 @@ msgid "Reset Windows"
msgstr "Ablakok alaphelyzetbe"
#. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:80
+#: src/gui/windows/shopwindow.cpp:79
msgid "Personal Shop"
msgstr ""
#. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:95
+#: src/gui/windows/shopwindow.cpp:94
msgid "Buy items"
msgstr ""
#. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:97
+#: src/gui/windows/shopwindow.cpp:96
msgid "Sell items"
msgstr ""
#. TRANSLATORS: shop window label
#. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:110
+#: src/gui/windows/shopwindow.cpp:102 src/gui/windows/shopwindow.cpp:109
msgid "Announce"
msgstr ""
#. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:114
+#: src/gui/windows/shopwindow.cpp:113
msgid "Show links in announce"
msgstr ""
-#. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:176 src/gui/windows/shopwindow.cpp:179
-msgid "Auction"
-msgstr ""
-
#. TRANSLATORS: shop window dialog
#. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:233
+#: src/gui/windows/shopwindow.cpp:776 src/net/ea/tradehandler.cpp:233
msgid "Request for Trade"
msgstr "Üzleti ajánlat"
-#: src/gui/windows/shopwindow.cpp:791
+#: src/gui/windows/shopwindow.cpp:776
#, c-format
msgid "%s wants to %s %s do you accept?"
msgstr ""
@@ -6161,27 +6197,27 @@ msgstr "Frissítés..."
msgid "Connecting..."
msgstr "Csatlakozás..."
-#: src/gui/windows/updaterwindow.cpp:398
+#: src/gui/windows/updaterwindow.cpp:407
msgid "Show all news (can be slow)"
msgstr ""
#. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:824
+#: src/gui/windows/updaterwindow.cpp:833
msgid "##1 The update process is incomplete."
msgstr "##1 A frissítési folyamat befejezetlen."
#. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:826
+#: src/gui/windows/updaterwindow.cpp:835
msgid "##1 It is strongly recommended that"
msgstr "##1 Erősen ajánljuk, hogy"
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:828
+#: src/gui/windows/updaterwindow.cpp:837
msgid "##1 you try again later."
msgstr ""
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1005
+#: src/gui/windows/updaterwindow.cpp:1021
msgid "Completed"
msgstr "Kész"
@@ -6228,25 +6264,25 @@ msgstr ""
#. TRANSLATORS: long key name. must be short.
#. TRANSLATORS: short key name. must be very short.
#. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:370 src/input/inputmanager.cpp:414
+#: src/input/inputmanager.cpp:371 src/input/inputmanager.cpp:415
#: src/input/keyboardconfig.cpp:104
#, c-format
msgid "key_%d"
msgstr ""
#. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:376
+#: src/input/inputmanager.cpp:377
#, c-format
msgid "JButton%d"
msgstr ""
#. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:391
msgid "unknown key"
msgstr ""
#. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:420
+#: src/input/inputmanager.cpp:421
#, c-format
msgid "JB%d"
msgstr ""
@@ -6254,7 +6290,7 @@ msgstr ""
#. TRANSLATORS: unknown short key type. must be short
#. TRANSLATORS: Unknown key short string.
#. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:434 src/input/keyboardconfig.cpp:148
+#: src/input/inputmanager.cpp:435 src/input/keyboardconfig.cpp:148
msgid "u key"
msgstr ""
@@ -7425,74 +7461,74 @@ msgid "Request to quit denied!"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:135
#, c-format
msgid "Guild name: %s"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:191
+#: src/net/ea/guildhandler.cpp:138
#, c-format
msgid "Guild master: %s"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:141
#, c-format
msgid "Guild level: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:197
+#: src/net/ea/guildhandler.cpp:144
#, c-format
msgid "Online members: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:200
+#: src/net/ea/guildhandler.cpp:147
#, c-format
msgid "Max members: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:203
+#: src/net/ea/guildhandler.cpp:150
#, c-format
msgid "Average level: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:206
+#: src/net/ea/guildhandler.cpp:153
#, c-format
msgid "Guild exp: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:209
+#: src/net/ea/guildhandler.cpp:156
#, c-format
msgid "Guild next exp: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:212
+#: src/net/ea/guildhandler.cpp:159
#, c-format
msgid "Guild castle: %s"
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:179
+#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:191
msgid "Item sharing enabled."
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:183
+#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:195
msgid "Item sharing disabled."
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:187
+#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:199
msgid "Item sharing not possible."
msgstr ""
@@ -7503,19 +7539,19 @@ msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:167
+#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:179
msgid "Experience sharing enabled."
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:171
+#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:183
msgid "Experience sharing disabled."
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:175
+#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:187
msgid "Experience sharing not possible."
msgstr ""
@@ -7620,239 +7656,355 @@ msgid "Connection to server terminated. "
msgstr ""
#. TRANSLATORS: message header
-#: src/net/ea/playerhandler.cpp:257 src/net/ea/playerhandler.cpp:273
-#: src/net/ea/playerhandler.cpp:361
+#: src/net/ea/playerhandler.cpp:192 src/net/ea/playerhandler.cpp:418
+#: src/net/ea/playerhandler.cpp:434
msgid "Message"
msgstr ""
#. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:259
+#: src/net/ea/playerhandler.cpp:420
msgid ""
"You are carrying more than half your weight. You are unable to regain "
"health."
msgstr ""
#. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:275
+#: src/net/ea/playerhandler.cpp:436
msgid "You are carrying less than half your weight. You can regain health."
msgstr ""
+#. TRANSLATORS: char rename error
+#: src/net/eathena/charserverhandler.cpp:516
+#: src/net/eathena/charserverhandler.cpp:553
+msgid "Character rename error."
+msgstr ""
+
+#: src/net/eathena/charserverhandler.cpp:531
+msgid "Character renamed."
+msgstr ""
+
+#. TRANSLATORS: char rename error
+#: src/net/eathena/charserverhandler.cpp:544
+msgid "Rename not allowed."
+msgstr ""
+
+#. TRANSLATORS: char rename error
+#: src/net/eathena/charserverhandler.cpp:548
+msgid "New name is not set."
+msgstr ""
+
+#. TRANSLATORS: char rename error
+#: src/net/eathena/charserverhandler.cpp:557
+msgid "Character not found."
+msgstr ""
+
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:125
+#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:124
#, c-format
msgid "Strength %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:127
+#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:126
#, c-format
msgid "Agility %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:129
+#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:128
#, c-format
msgid "Vitality %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:131
+#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:130
#, c-format
msgid "Intelligence %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:128 src/net/tmwa/generalhandler.cpp:133
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:132
#, c-format
msgid "Dexterity %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:135
+#: src/net/eathena/generalhandler.cpp:128 src/net/tmwa/generalhandler.cpp:134
#, c-format
msgid "Luck %s"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:152 src/net/tmwa/generalhandler.cpp:161
+#: src/net/eathena/generalhandler.cpp:159 src/net/tmwa/generalhandler.cpp:160
msgid "Authentication failed."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:155 src/net/tmwa/generalhandler.cpp:165
+#: src/net/eathena/generalhandler.cpp:162 src/net/tmwa/generalhandler.cpp:164
msgid "No servers available."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:160 src/net/tmwa/generalhandler.cpp:171
+#: src/net/eathena/generalhandler.cpp:167 src/net/tmwa/generalhandler.cpp:170
msgid "Someone else is trying to use this account."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:165 src/net/tmwa/generalhandler.cpp:177
+#: src/net/eathena/generalhandler.cpp:172 src/net/tmwa/generalhandler.cpp:176
msgid "This account is already logged in."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:169 src/net/tmwa/generalhandler.cpp:182
+#: src/net/eathena/generalhandler.cpp:176 src/net/tmwa/generalhandler.cpp:181
msgid "Speed hack detected."
msgstr ""
+#: src/net/eathena/generalhandler.cpp:179
+msgid "Server full."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:182
+msgid "Sorry, you are underaged."
+msgstr ""
+
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:172 src/net/tmwa/generalhandler.cpp:186
+#: src/net/eathena/generalhandler.cpp:185 src/net/tmwa/generalhandler.cpp:185
msgid "Duplicated login."
msgstr ""
+#: src/net/eathena/generalhandler.cpp:188
+msgid "To many connections from same ip."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:191
+msgid "Not paid for this time."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:194
+msgid "Pay suspended."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:197
+msgid "Pay changed."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:200
+msgid "Pay wrong ip."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:203
+msgid "Pay game room."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:206
+msgid "Disconnect forced by GM."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:210
+msgid "Ban japan refuse."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:213
+msgid "Remained other account."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:216
+msgid "Ip unfair."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:219
+msgid "Ip count all."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:222
+msgid "Ip count."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:226
+msgid "Memory."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:229
+msgid "Han valid."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:232
+msgid "Ip limited access."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:235
+msgid "Over characters list."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:238
+msgid "Ip blocked."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:241
+msgid "Invalid password count."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:244
+msgid "Not allowed race."
+msgstr ""
+
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:175 src/net/tmwa/generalhandler.cpp:190
+#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:189
msgid "Unknown connection error."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:280
+#: src/net/eathena/generalhandler.cpp:323 src/net/tmwa/generalhandler.cpp:279
msgid "Got disconnected from server!"
msgstr "Lekapcsolódtál a szerverről!"
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:282 src/net/tmwa/generalhandler.cpp:308
+#: src/net/eathena/generalhandler.cpp:348 src/net/tmwa/generalhandler.cpp:307
msgid "Strength"
msgstr "Erő"
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:310
+#: src/net/eathena/generalhandler.cpp:349 src/net/tmwa/generalhandler.cpp:309
msgid "Agility"
msgstr "Mozgékonyság"
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:284 src/net/tmwa/generalhandler.cpp:312
+#: src/net/eathena/generalhandler.cpp:350 src/net/tmwa/generalhandler.cpp:311
msgid "Vitality"
msgstr "Egészség"
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:285 src/net/tmwa/generalhandler.cpp:314
+#: src/net/eathena/generalhandler.cpp:352 src/net/tmwa/generalhandler.cpp:314
msgid "Intelligence"
msgstr "Intelligencia"
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:286 src/net/tmwa/generalhandler.cpp:316
+#: src/net/eathena/generalhandler.cpp:353 src/net/tmwa/generalhandler.cpp:316
msgid "Dexterity"
msgstr "Ügyesség"
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:287 src/net/tmwa/generalhandler.cpp:318
+#: src/net/eathena/generalhandler.cpp:354 src/net/tmwa/generalhandler.cpp:318
msgid "Luck"
msgstr "Szerencse"
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:290 src/net/tmwa/generalhandler.cpp:323
+#: src/net/eathena/generalhandler.cpp:357 src/net/tmwa/generalhandler.cpp:322
msgid "Defense"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:291 src/net/tmwa/generalhandler.cpp:325
+#: src/net/eathena/generalhandler.cpp:358 src/net/tmwa/generalhandler.cpp:324
msgid "M.Attack"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:292 src/net/tmwa/generalhandler.cpp:327
+#: src/net/eathena/generalhandler.cpp:359 src/net/tmwa/generalhandler.cpp:326
msgid "M.Defense"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:294 src/net/tmwa/generalhandler.cpp:330
+#: src/net/eathena/generalhandler.cpp:361 src/net/tmwa/generalhandler.cpp:329
#, no-c-format
msgid "% Accuracy"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:296 src/net/tmwa/generalhandler.cpp:333
+#: src/net/eathena/generalhandler.cpp:363 src/net/tmwa/generalhandler.cpp:332
#, no-c-format
msgid "% Evade"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:298 src/net/tmwa/generalhandler.cpp:336
+#: src/net/eathena/generalhandler.cpp:365 src/net/tmwa/generalhandler.cpp:335
#, no-c-format
msgid "% Critical"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:299 src/net/tmwa/generalhandler.cpp:338
+#: src/net/eathena/generalhandler.cpp:366 src/net/tmwa/generalhandler.cpp:337
msgid "Attack Delay"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:300 src/net/tmwa/generalhandler.cpp:340
+#: src/net/eathena/generalhandler.cpp:367 src/net/tmwa/generalhandler.cpp:339
msgid "Walk Delay"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:301 src/net/tmwa/generalhandler.cpp:342
+#: src/net/eathena/generalhandler.cpp:368 src/net/tmwa/generalhandler.cpp:341
msgid "Attack Range"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:302 src/net/tmwa/generalhandler.cpp:344
+#: src/net/eathena/generalhandler.cpp:369 src/net/tmwa/generalhandler.cpp:343
msgid "Damage per sec."
msgstr ""
-#: src/net/eathena/skillhandler.cpp:228 src/net/eathena/skillhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:370
+msgid "Karma"
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:371
+msgid "Manner"
+msgstr ""
+
+#: src/net/eathena/skillhandler.cpp:304 src/net/eathena/skillhandler.cpp:364
#, c-format
msgid "Unknown skill error: %d"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:235 src/net/tmwa/skillhandler.cpp:224
+#: src/net/eathena/skillhandler.cpp:311 src/net/tmwa/skillhandler.cpp:224
msgid "You have not yet reached a high enough lvl!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:239 src/net/tmwa/skillhandler.cpp:228
+#: src/net/eathena/skillhandler.cpp:315 src/net/tmwa/skillhandler.cpp:228
msgid "Insufficient HP!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:243 src/net/tmwa/skillhandler.cpp:232
+#: src/net/eathena/skillhandler.cpp:319 src/net/tmwa/skillhandler.cpp:232
msgid "Insufficient SP!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:247 src/net/tmwa/skillhandler.cpp:236
+#: src/net/eathena/skillhandler.cpp:323 src/net/tmwa/skillhandler.cpp:236
msgid "You have no memos!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:251 src/net/tmwa/skillhandler.cpp:240
+#: src/net/eathena/skillhandler.cpp:327 src/net/tmwa/skillhandler.cpp:240
msgid "You cannot do that right now!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:255 src/net/tmwa/skillhandler.cpp:244
+#: src/net/eathena/skillhandler.cpp:331 src/net/tmwa/skillhandler.cpp:244
msgid "Seems you need more money... ;-)"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:259 src/net/tmwa/skillhandler.cpp:248
+#: src/net/eathena/skillhandler.cpp:335 src/net/tmwa/skillhandler.cpp:248
msgid "You cannot use this skill with that kind of weapon!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:264 src/net/tmwa/skillhandler.cpp:253
+#: src/net/eathena/skillhandler.cpp:340 src/net/tmwa/skillhandler.cpp:253
msgid "You need another red gem!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:268 src/net/tmwa/skillhandler.cpp:257
+#: src/net/eathena/skillhandler.cpp:344 src/net/tmwa/skillhandler.cpp:257
msgid "You need another blue gem!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:272 src/net/tmwa/skillhandler.cpp:261
+#: src/net/eathena/skillhandler.cpp:348 src/net/tmwa/skillhandler.cpp:261
msgid "You're carrying to much to do this!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:276 src/net/tmwa/skillhandler.cpp:265
+#: src/net/eathena/skillhandler.cpp:352 src/net/tmwa/skillhandler.cpp:265
msgid "Huh? What's that?"
msgstr ""
@@ -7869,32 +8021,32 @@ msgid "%s wants to trade with you, do you accept?"
msgstr "%s üzletelni akar veled. Te akarsz vele?"
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:349
+#: src/net/tmwa/charserverhandler.cpp:351
msgid "Strength:"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:351
+#: src/net/tmwa/charserverhandler.cpp:353
msgid "Agility:"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:353
+#: src/net/tmwa/charserverhandler.cpp:355
msgid "Vitality:"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:355
+#: src/net/tmwa/charserverhandler.cpp:357
msgid "Intelligence:"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:357
+#: src/net/tmwa/charserverhandler.cpp:359
msgid "Dexterity:"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:359
+#: src/net/tmwa/charserverhandler.cpp:361
msgid "Luck:"
msgstr ""
@@ -8205,269 +8357,306 @@ msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:143
+msgid "You cant left party on this map."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:147
+msgid "You was kicked from party."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:151
+msgid "You cant be kicked kicked from party on this map."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:155
#, c-format
msgid "%s has joined your party."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:147
+#: src/resources/notifications.h:159
#, c-format
msgid "%s is already a member of a party."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:151
+#: src/resources/notifications.h:163
#, c-format
msgid "%s refused your invitation."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:155
+#: src/resources/notifications.h:167
#, c-format
msgid "%s is now a member of your party."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:159
+#: src/resources/notifications.h:171
#, c-format
msgid "%s can't join your party because party is full."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:163
+#: src/resources/notifications.h:175
#, c-format
msgid "QQQ Unknown invite response for %s."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:191
+#: src/resources/notifications.h:203
#, c-format
msgid "%s has left your party."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:195
+#: src/resources/notifications.h:207 src/resources/notifications.h:215
+#, c-format
+msgid "%s cant be kicked from party on this map."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:211
+#, c-format
+msgid "%s has kicked from your party."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:219
#, c-format
msgid "An unknown member tried to say: %s"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:199
+#: src/resources/notifications.h:223
#, c-format
msgid "%s is not in your party!"
msgstr "%s nincs a csapatodban!"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:203
+#: src/resources/notifications.h:227
#, c-format
msgid "You picked up %s."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:207
+#: src/resources/notifications.h:231
#, c-format
msgid "You spent %s."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:211
+#: src/resources/notifications.h:235
msgid "Cannot raise skill!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:215
+#: src/resources/notifications.h:239
msgid "Equip ammunition first."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:219
+#: src/resources/notifications.h:243
#, c-format
msgid "Trading with %s isn't possible. Trade partner is too far away."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:224
+#: src/resources/notifications.h:248
#, c-format
msgid "Trading with %s isn't possible. Character doesn't exist."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:228
+#: src/resources/notifications.h:252
msgid "Trade cancelled due to an unknown reason."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:232
+#: src/resources/notifications.h:256
#, c-format
msgid "Trade with %s cancelled."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:236
+#: src/resources/notifications.h:260
#, c-format
msgid "Unhandled trade cancel packet with %s"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:240
+#: src/resources/notifications.h:264
msgid "Failed adding item. Trade partner is over weighted."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:244
+#: src/resources/notifications.h:268
msgid "Failed adding item. Trade partner has no free slot."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:248
+#: src/resources/notifications.h:272
msgid "Failed adding item. You can't trade this item."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:252
+#: src/resources/notifications.h:276
msgid "Failed adding item for unknown reason."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:256
+#: src/resources/notifications.h:280
msgid "Trade canceled."
msgstr "Az üzlet megszakadt."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:260
+#: src/resources/notifications.h:284
msgid "Trade completed."
msgstr "Sikeres üzlet."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:264
+#: src/resources/notifications.h:288
msgid "Kick failed!"
msgstr "Kirúgás sikertelen!"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:268
+#: src/resources/notifications.h:292
msgid "Kick succeeded!"
msgstr "Kirúgás sikeres!"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:272
+#: src/resources/notifications.h:296
#, c-format
msgid "MVP player: %s"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:276
+#: src/resources/notifications.h:300
msgid "All whispers ignored."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:280
+#: src/resources/notifications.h:304
msgid "All whispers ignore failed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:284
+#: src/resources/notifications.h:308
msgid "All whispers unignored."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:288
+#: src/resources/notifications.h:312
msgid "All whispers unignore failed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:295
+#: src/resources/notifications.h:319
msgid "pvp off, gvg off"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:299
+#: src/resources/notifications.h:323
msgid "pvp on"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:303
+#: src/resources/notifications.h:327
msgid "gvg on"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:307
+#: src/resources/notifications.h:331
msgid "pvp on, gvg on"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:311
+#: src/resources/notifications.h:335
msgid "unknown pvp"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:315
+#: src/resources/notifications.h:339
#, c-format
msgid "Char from account %s is already in your party!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:319
+#: src/resources/notifications.h:343
#, c-format
msgid "%s blocked invite!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:323
+#: src/resources/notifications.h:347
msgid "Char is not online!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:327
+#: src/resources/notifications.h:351
msgid "Pet catch failed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:331
+#: src/resources/notifications.h:355
msgid "Pet catched."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:335
+#: src/resources/notifications.h:359
#, c-format
msgid "Pet catch unkown error: %d."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:339
+#: src/resources/notifications.h:363
msgid "Your mercenary duty hour is over."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:343
+#: src/resources/notifications.h:367
msgid "Your mercenary was killed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:347
+#: src/resources/notifications.h:371
msgid "Your mercenary was fired."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:351
+#: src/resources/notifications.h:375
msgid "Your mercenary run away."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:355
+#: src/resources/notifications.h:379
msgid "Mercenary unknown state."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:359
-msgid "Your feed your homunculus."
+#: src/resources/notifications.h:383
+msgid "You feed your homunculus."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:363
+#: src/resources/notifications.h:387
#, c-format
msgid "You cant feed homunculus, because not have %s."
msgstr ""
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:391
+msgid "Card insert failed."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:395
+msgid "Card inserted."
+msgstr ""
+
#. TRANSLATORS: chat option changed message
#: src/utils/booleanoptions.h:27
#, c-format
diff --git a/po/id.po b/po/id.po
index 40ed702a0..b2890b7d2 100644
--- a/po/id.po
+++ b/po/id.po
@@ -12,8 +12,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-10-08 01:19+0300\n"
-"PO-Revision-Date: 2014-09-28 10:01+0000\n"
+"POT-Creation-Date: 2014-10-10 00:16+0300\n"
+"PO-Revision-Date: 2014-10-08 10:02+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Indonesian (http://www.transifex.com/projects/p/manaplus/"
"language/id/)\n"
@@ -5169,15 +5169,13 @@ msgstr ""
#. TRANSLATORS: char select dialog. button.
#: src/gui/windows/charselectdialog.cpp:73
-#, fuzzy
msgid "Switch"
-msgstr "Ubah Login"
+msgstr ""
#. TRANSLATORS: char select dialog. button.
#: src/gui/windows/charselectdialog.cpp:75
-#, fuzzy
msgid "Password"
-msgstr "Kata Sandi:"
+msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: updater window button
@@ -5221,9 +5219,8 @@ msgid "Please set new pincode"
msgstr ""
#: src/gui/windows/charselectdialog.cpp:240
-#, fuzzy
msgid "Please enter new name"
-msgstr "Tetapkan sebuah nama."
+msgstr ""
#. TRANSLATORS: char select dialog. player info message.
#: src/gui/windows/charselectdialog.cpp:259
@@ -5872,7 +5869,7 @@ msgstr "Perlihatkan link di Umumkan"
#. TRANSLATORS: shop window dialog
#. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:776 src/net/ea/tradehandler.cpp:233
+#: src/gui/windows/shopwindow.cpp:776 src/net/ea/tradehandler.cpp:192
msgid "Request for Trade"
msgstr "Meminta untuk menukar"
@@ -7522,19 +7519,19 @@ msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:191
+#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:207
msgid "Item sharing enabled."
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:195
+#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:211
msgid "Item sharing disabled."
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:199
+#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:215
msgid "Item sharing not possible."
msgstr ""
@@ -7545,19 +7542,19 @@ msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:179
+#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:195
msgid "Experience sharing enabled."
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:183
+#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:199
msgid "Experience sharing disabled."
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:187
+#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:203
msgid "Experience sharing not possible."
msgstr ""
@@ -7687,9 +7684,8 @@ msgid "Character rename error."
msgstr ""
#: src/net/eathena/charserverhandler.cpp:531
-#, fuzzy
msgid "Character renamed."
-msgstr "Stats Karakter OK"
+msgstr ""
#. TRANSLATORS: char rename error
#: src/net/eathena/charserverhandler.cpp:544
@@ -7703,9 +7699,8 @@ msgstr ""
#. TRANSLATORS: char rename error
#: src/net/eathena/charserverhandler.cpp:557
-#, fuzzy
msgid "Character not found."
-msgstr "Stats Karakter OK"
+msgstr ""
#. TRANSLATORS: player stat
#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:124
@@ -7769,9 +7764,8 @@ msgid "Speed hack detected."
msgstr ""
#: src/net/eathena/generalhandler.cpp:179
-#, fuzzy
msgid "Server full."
-msgstr "Server:"
+msgstr ""
#: src/net/eathena/generalhandler.cpp:182
msgid "Sorry, you are underaged."
@@ -8019,13 +8013,13 @@ msgid "Huh? What's that?"
msgstr ""
#. TRANSLATORS: trade header
-#: src/net/ea/tradehandler.cpp:100
+#: src/net/ea/tradehandler.cpp:105
#, c-format
msgid "Trade: You and %s"
msgstr ""
#. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:235
+#: src/net/ea/tradehandler.cpp:194
#, c-format
msgid "%s wants to trade with you, do you accept?"
msgstr ""
@@ -8244,427 +8238,453 @@ msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:47
+#, fuzzy
+msgid "Unable to buy. You not have enought money."
+msgstr "Anda tidak memiliki cukup uang."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:51
+msgid "Unable to buy. You overweight."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:55
+msgid "Unable to buy. You have too many items."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:59
msgid "Nothing to sell."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:51
+#: src/resources/notifications.h:63
msgid "Thanks for selling."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:55
+#: src/resources/notifications.h:67
msgid "Unable to sell."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:59
+#: src/resources/notifications.h:71
msgid "Unable to sell while trading."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:63
+#: src/resources/notifications.h:75
msgid "Unable to sell unsellable item."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:67
+#: src/resources/notifications.h:79
#, c-format
msgid "Online users: %d"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:71
+#: src/resources/notifications.h:83
msgid "Guild created."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:75
+#: src/resources/notifications.h:87
msgid "You are already in guild."
msgstr "Kamu sudah berada di dalam organisasi."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:79
+#: src/resources/notifications.h:91
msgid "Emperium check failed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:83
+#: src/resources/notifications.h:95
msgid "Unknown server response."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:87
+#: src/resources/notifications.h:99
msgid "You have left the guild."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:91
+#: src/resources/notifications.h:103
msgid "Could not invite user to guild."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:95
+#: src/resources/notifications.h:107
msgid "User rejected guild invite."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:99
+#: src/resources/notifications.h:111
msgid "User is now part of your guild."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:103
+#: src/resources/notifications.h:115
msgid "Your guild is full."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:107
+#: src/resources/notifications.h:119
msgid "Unknown guild invite response."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:111
+#: src/resources/notifications.h:123
#, c-format
msgid "%s has left your guild."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:115
+#: src/resources/notifications.h:127
msgid "You were kicked from guild."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:119
+#: src/resources/notifications.h:131
#, c-format
msgid "%s has kicked from your guild."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:123
+#: src/resources/notifications.h:135
msgid "Failed to use item."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:127
+#: src/resources/notifications.h:139
msgid "Unable to equip."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:131
+#: src/resources/notifications.h:143
+msgid "Unable to equip because you have wrong level."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:147
msgid "Could not create party."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:135
+#: src/resources/notifications.h:151
msgid "Party successfully created."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:139
+#: src/resources/notifications.h:155
msgid "You have left the party."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:143
+#: src/resources/notifications.h:159
msgid "You cant left party on this map."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:147
-#, fuzzy
+#: src/resources/notifications.h:163
msgid "You was kicked from party."
-msgstr "Keluarkan dari kelompok"
+msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:151
-msgid "You cant be kicked kicked from party on this map."
+#: src/resources/notifications.h:167
+msgid "You cant be kicked from party on this map."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:155
+#: src/resources/notifications.h:171
#, c-format
msgid "%s has joined your party."
msgstr "%s telah bergabung dengan kelompok."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:159
+#: src/resources/notifications.h:175
#, c-format
msgid "%s is already a member of a party."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:163
+#: src/resources/notifications.h:179
#, c-format
msgid "%s refused your invitation."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:167
+#: src/resources/notifications.h:183
#, c-format
msgid "%s is now a member of your party."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:171
+#: src/resources/notifications.h:187
#, c-format
msgid "%s can't join your party because party is full."
msgstr "%s tidak dapat bergabung dengan kelompok karena kelompok sudah penuh."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:175
+#: src/resources/notifications.h:191
#, c-format
msgid "QQQ Unknown invite response for %s."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:203
+#: src/resources/notifications.h:219
#, c-format
msgid "%s has left your party."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:207 src/resources/notifications.h:215
+#: src/resources/notifications.h:223 src/resources/notifications.h:231
#, c-format
msgid "%s cant be kicked from party on this map."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:211
-#, fuzzy, c-format
+#: src/resources/notifications.h:227
+#, c-format
msgid "%s has kicked from your party."
-msgstr "%s telah bergabung dengan kelompok."
+msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:219
+#: src/resources/notifications.h:235
#, c-format
msgid "An unknown member tried to say: %s"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:223
+#: src/resources/notifications.h:239
#, c-format
msgid "%s is not in your party!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:227
+#: src/resources/notifications.h:243
#, c-format
msgid "You picked up %s."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:231
+#: src/resources/notifications.h:247
#, c-format
msgid "You spent %s."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:235
+#: src/resources/notifications.h:251
msgid "Cannot raise skill!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:239
+#: src/resources/notifications.h:255
msgid "Equip ammunition first."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:243
+#: src/resources/notifications.h:259
#, c-format
msgid "Trading with %s isn't possible. Trade partner is too far away."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:248
+#: src/resources/notifications.h:264
#, c-format
msgid "Trading with %s isn't possible. Character doesn't exist."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:252
+#: src/resources/notifications.h:268
msgid "Trade cancelled due to an unknown reason."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:256
+#: src/resources/notifications.h:272
#, c-format
msgid "Trade with %s cancelled."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:260
+#: src/resources/notifications.h:276
+#, c-format
+msgid "Trade with %s cancelled, because player is busy"
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:280
#, c-format
msgid "Unhandled trade cancel packet with %s"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:264
+#: src/resources/notifications.h:284
msgid "Failed adding item. Trade partner is over weighted."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:268
+#: src/resources/notifications.h:288
msgid "Failed adding item. Trade partner has no free slot."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:272
+#: src/resources/notifications.h:292
msgid "Failed adding item. You can't trade this item."
msgstr "Gagal menambahkan barang. Kamu tidak dapat menukar barang ini."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:276
+#: src/resources/notifications.h:296
msgid "Failed adding item for unknown reason."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:280
+#: src/resources/notifications.h:300
msgid "Trade canceled."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:284
+#: src/resources/notifications.h:304
msgid "Trade completed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:288
+#: src/resources/notifications.h:308
msgid "Kick failed!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:292
+#: src/resources/notifications.h:312
msgid "Kick succeeded!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:296
+#: src/resources/notifications.h:316
#, c-format
msgid "MVP player: %s"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:300
+#: src/resources/notifications.h:320
msgid "All whispers ignored."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:304
+#: src/resources/notifications.h:324
msgid "All whispers ignore failed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:308
+#: src/resources/notifications.h:328
msgid "All whispers unignored."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:312
+#: src/resources/notifications.h:332
msgid "All whispers unignore failed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:319
+#: src/resources/notifications.h:339
msgid "pvp off, gvg off"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:323
+#: src/resources/notifications.h:343
msgid "pvp on"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:327
+#: src/resources/notifications.h:347
msgid "gvg on"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:331
+#: src/resources/notifications.h:351
msgid "pvp on, gvg on"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:335
+#: src/resources/notifications.h:355
msgid "unknown pvp"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:339
+#: src/resources/notifications.h:359
#, c-format
msgid "Char from account %s is already in your party!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:343
+#: src/resources/notifications.h:363
#, c-format
msgid "%s blocked invite!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:347
+#: src/resources/notifications.h:367
msgid "Char is not online!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:351
+#: src/resources/notifications.h:371
msgid "Pet catch failed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:355
+#: src/resources/notifications.h:375
msgid "Pet catched."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:359
+#: src/resources/notifications.h:379
#, c-format
msgid "Pet catch unkown error: %d."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:363
+#: src/resources/notifications.h:383
msgid "Your mercenary duty hour is over."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:367
+#: src/resources/notifications.h:387
msgid "Your mercenary was killed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:371
+#: src/resources/notifications.h:391
msgid "Your mercenary was fired."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:375
+#: src/resources/notifications.h:395
msgid "Your mercenary run away."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:379
+#: src/resources/notifications.h:399
msgid "Mercenary unknown state."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:383
+#: src/resources/notifications.h:403
msgid "You feed your homunculus."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:387
+#: src/resources/notifications.h:407
#, c-format
msgid "You cant feed homunculus, because not have %s."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:391
+#: src/resources/notifications.h:411
msgid "Card insert failed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:395
+#: src/resources/notifications.h:415
msgid "Card inserted."
msgstr ""
diff --git a/po/it.po b/po/it.po
index c4df3bb27..4f893b94b 100644
--- a/po/it.po
+++ b/po/it.po
@@ -17,8 +17,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-10-08 01:19+0300\n"
-"PO-Revision-Date: 2014-09-28 10:01+0000\n"
+"POT-Creation-Date: 2014-10-10 00:16+0300\n"
+"PO-Revision-Date: 2014-10-08 10:02+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/manaplus/"
"language/it/)\n"
@@ -5183,15 +5183,13 @@ msgstr ""
#. TRANSLATORS: char select dialog. button.
#: src/gui/windows/charselectdialog.cpp:73
-#, fuzzy
msgid "Switch"
-msgstr "Cambia login"
+msgstr ""
#. TRANSLATORS: char select dialog. button.
#: src/gui/windows/charselectdialog.cpp:75
-#, fuzzy
msgid "Password"
-msgstr "Password:"
+msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: updater window button
@@ -5235,9 +5233,8 @@ msgid "Please set new pincode"
msgstr ""
#: src/gui/windows/charselectdialog.cpp:240
-#, fuzzy
msgid "Please enter new name"
-msgstr "Prego specificare un nome."
+msgstr ""
#. TRANSLATORS: char select dialog. player info message.
#: src/gui/windows/charselectdialog.cpp:259
@@ -5888,7 +5885,7 @@ msgstr "Mostra link nell'annuncio"
#. TRANSLATORS: shop window dialog
#. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:776 src/net/ea/tradehandler.cpp:233
+#: src/gui/windows/shopwindow.cpp:776 src/net/ea/tradehandler.cpp:192
msgid "Request for Trade"
msgstr "Richiesta di commercio"
@@ -7543,19 +7540,19 @@ msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:191
+#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:207
msgid "Item sharing enabled."
msgstr "Gestione in comune oggetti attivata."
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:195
+#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:211
msgid "Item sharing disabled."
msgstr "Gestione in comune oggetti disattivata."
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:199
+#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:215
msgid "Item sharing not possible."
msgstr "Gestione in comune oggetti non puo' essere attivata."
@@ -7566,19 +7563,19 @@ msgstr "Oggetti in comune sconosciuti."
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:179
+#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:195
msgid "Experience sharing enabled."
msgstr "Esperienza in comune attivata."
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:183
+#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:199
msgid "Experience sharing disabled."
msgstr "Esperienza in comune disattivata."
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:187
+#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:203
msgid "Experience sharing not possible."
msgstr "Esperienza in comune non puo' essere attivata."
@@ -7709,14 +7706,12 @@ msgstr ""
#. TRANSLATORS: char rename error
#: src/net/eathena/charserverhandler.cpp:516
#: src/net/eathena/charserverhandler.cpp:553
-#, fuzzy
msgid "Character rename error."
-msgstr "Personaggio eliminato."
+msgstr ""
#: src/net/eathena/charserverhandler.cpp:531
-#, fuzzy
msgid "Character renamed."
-msgstr "Personaggio eliminato."
+msgstr ""
#. TRANSLATORS: char rename error
#: src/net/eathena/charserverhandler.cpp:544
@@ -7730,9 +7725,8 @@ msgstr ""
#. TRANSLATORS: char rename error
#: src/net/eathena/charserverhandler.cpp:557
-#, fuzzy
msgid "Character not found."
-msgstr "Punti personaggio: %d"
+msgstr ""
#. TRANSLATORS: player stat
#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:124
@@ -7796,9 +7790,8 @@ msgid "Speed hack detected."
msgstr "Rilevato speed hack."
#: src/net/eathena/generalhandler.cpp:179
-#, fuzzy
msgid "Server full."
-msgstr "Server:"
+msgstr ""
#: src/net/eathena/generalhandler.cpp:182
msgid "Sorry, you are underaged."
@@ -7870,18 +7863,16 @@ msgid "Ip limited access."
msgstr ""
#: src/net/eathena/generalhandler.cpp:235
-#, fuzzy
msgid "Over characters list."
-msgstr "Personaggio eliminato."
+msgstr ""
#: src/net/eathena/generalhandler.cpp:238
msgid "Ip blocked."
msgstr ""
#: src/net/eathena/generalhandler.cpp:241
-#, fuzzy
msgid "Invalid password count."
-msgstr "La vecchia password è sbagliata."
+msgstr ""
#: src/net/eathena/generalhandler.cpp:244
msgid "Not allowed race."
@@ -8048,13 +8039,13 @@ msgid "Huh? What's that?"
msgstr "Huh? Cos'è?"
#. TRANSLATORS: trade header
-#: src/net/ea/tradehandler.cpp:100
+#: src/net/ea/tradehandler.cpp:105
#, c-format
msgid "Trade: You and %s"
msgstr "Scambio con %s"
#. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:235
+#: src/net/ea/tradehandler.cpp:194
#, c-format
msgid "%s wants to trade with you, do you accept?"
msgstr "%s vuole commerciare con te, accetti?"
@@ -8273,429 +8264,454 @@ msgstr "Impossibile acquistare."
#. TRANSLATORS: notification message
#: src/resources/notifications.h:47
+#, fuzzy
+msgid "Unable to buy. You not have enought money."
+msgstr "Non hai abbastanza denaro."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:51
+#, fuzzy
+msgid "Unable to buy. You overweight."
+msgstr "Impossibile acquistare."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:55
+msgid "Unable to buy. You have too many items."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:59
msgid "Nothing to sell."
msgstr "Niente da vendere."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:51
+#: src/resources/notifications.h:63
msgid "Thanks for selling."
msgstr "Grazie per la vendita."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:55
+#: src/resources/notifications.h:67
msgid "Unable to sell."
msgstr "Impossibile vendere."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:59
+#: src/resources/notifications.h:71
msgid "Unable to sell while trading."
msgstr "Impossibile vendere durante uno scambio."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:63
+#: src/resources/notifications.h:75
msgid "Unable to sell unsellable item."
msgstr "Impossibile vendere oggetti non vendibili."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:67
+#: src/resources/notifications.h:79
#, c-format
msgid "Online users: %d"
msgstr "Utenti Online: %d"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:71
+#: src/resources/notifications.h:83
msgid "Guild created."
msgstr "La gilda è stata creata."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:75
+#: src/resources/notifications.h:87
msgid "You are already in guild."
msgstr "Appartieni già ad una gilda."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:79
+#: src/resources/notifications.h:91
msgid "Emperium check failed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:83
+#: src/resources/notifications.h:95
msgid "Unknown server response."
msgstr "Risposta dal server sconosciuta."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:87
+#: src/resources/notifications.h:99
msgid "You have left the guild."
msgstr "Hai abbandonato la gilda."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:91
+#: src/resources/notifications.h:103
msgid "Could not invite user to guild."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:95
+#: src/resources/notifications.h:107
msgid "User rejected guild invite."
msgstr "L'utente ha respinto l'invito alla gilda."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:99
+#: src/resources/notifications.h:111
msgid "User is now part of your guild."
msgstr "L'utente fa ora parte della Gilda."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:103
+#: src/resources/notifications.h:115
msgid "Your guild is full."
msgstr "La gilda è piena."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:107
+#: src/resources/notifications.h:119
msgid "Unknown guild invite response."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:111
+#: src/resources/notifications.h:123
#, c-format
msgid "%s has left your guild."
msgstr "%s ha lasciato la Gilda."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:115
+#: src/resources/notifications.h:127
msgid "You were kicked from guild."
msgstr "Sei stato cacciato dalla Gilda."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:119
+#: src/resources/notifications.h:131
#, c-format
msgid "%s has kicked from your guild."
msgstr "%s e' stato espulso dalla Gilda."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:123
+#: src/resources/notifications.h:135
msgid "Failed to use item."
msgstr "L'oggetto non può essere usato."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:127
+#: src/resources/notifications.h:139
msgid "Unable to equip."
msgstr "L'oggetto non può essere equipaggiato."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:131
+#: src/resources/notifications.h:143
+msgid "Unable to equip because you have wrong level."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:147
msgid "Could not create party."
msgstr "Impossibile creare il Party."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:135
+#: src/resources/notifications.h:151
msgid "Party successfully created."
msgstr "La creazione del Party è avvenuta con successo."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:139
+#: src/resources/notifications.h:155
msgid "You have left the party."
msgstr "Hai lasciato il Party."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:143
-#, fuzzy
+#: src/resources/notifications.h:159
msgid "You cant left party on this map."
-msgstr "Hai lasciato il Party."
+msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:147
-#, fuzzy
+#: src/resources/notifications.h:163
msgid "You was kicked from party."
-msgstr "Sei stato cacciato dalla Gilda."
+msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:151
-msgid "You cant be kicked kicked from party on this map."
+#: src/resources/notifications.h:167
+msgid "You cant be kicked from party on this map."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:155
+#: src/resources/notifications.h:171
#, c-format
msgid "%s has joined your party."
msgstr "%s e' entrato nel Party."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:159
+#: src/resources/notifications.h:175
#, c-format
msgid "%s is already a member of a party."
msgstr "%s e' gia' un membro del Party."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:163
+#: src/resources/notifications.h:179
#, c-format
msgid "%s refused your invitation."
msgstr "%s ha rifiutato l'invito."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:167
+#: src/resources/notifications.h:183
#, c-format
msgid "%s is now a member of your party."
msgstr "%s e' ora un membro del Party."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:171
+#: src/resources/notifications.h:187
#, c-format
msgid "%s can't join your party because party is full."
msgstr "Il Party e' pieno. %s non puo' entrare."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:175
+#: src/resources/notifications.h:191
#, c-format
msgid "QQQ Unknown invite response for %s."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:203
+#: src/resources/notifications.h:219
#, c-format
msgid "%s has left your party."
msgstr "%s ha lasciato il Party."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:207 src/resources/notifications.h:215
-#, fuzzy, c-format
+#: src/resources/notifications.h:223 src/resources/notifications.h:231
+#, c-format
msgid "%s cant be kicked from party on this map."
-msgstr "%s e' stato espulso dalla Gilda."
+msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:211
-#, fuzzy, c-format
+#: src/resources/notifications.h:227
+#, c-format
msgid "%s has kicked from your party."
-msgstr "%s e' stato espulso dalla Gilda."
+msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:219
+#: src/resources/notifications.h:235
#, c-format
msgid "An unknown member tried to say: %s"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:223
+#: src/resources/notifications.h:239
#, c-format
msgid "%s is not in your party!"
msgstr "%s non è nel tuo party!"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:227
+#: src/resources/notifications.h:243
#, c-format
msgid "You picked up %s."
msgstr "Hai raccolto %s."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:231
+#: src/resources/notifications.h:247
#, c-format
msgid "You spent %s."
msgstr "Hai speso %s."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:235
+#: src/resources/notifications.h:251
msgid "Cannot raise skill!"
msgstr "Non puoi aumentare questa Abilità!"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:239
+#: src/resources/notifications.h:255
msgid "Equip ammunition first."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:243
+#: src/resources/notifications.h:259
#, c-format
msgid "Trading with %s isn't possible. Trade partner is too far away."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:248
+#: src/resources/notifications.h:264
#, c-format
msgid "Trading with %s isn't possible. Character doesn't exist."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:252
+#: src/resources/notifications.h:268
msgid "Trade cancelled due to an unknown reason."
msgstr "Scambio fallito per cause sconosciute."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:256
+#: src/resources/notifications.h:272
#, c-format
msgid "Trade with %s cancelled."
msgstr "Scambio con %s cancellato."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:260
+#: src/resources/notifications.h:276
+#, fuzzy, c-format
+msgid "Trade with %s cancelled, because player is busy"
+msgstr "Scambio con %s cancellato."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:280
#, c-format
msgid "Unhandled trade cancel packet with %s"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:264
+#: src/resources/notifications.h:284
msgid "Failed adding item. Trade partner is over weighted."
msgstr "Impossibile aggiungere l'oggetto. Il partner trasporta troppo peso."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:268
+#: src/resources/notifications.h:288
msgid "Failed adding item. Trade partner has no free slot."
msgstr "Impossibile aggiungere l'oggetto. Il partner non ha spazi liberi."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:272
+#: src/resources/notifications.h:292
msgid "Failed adding item. You can't trade this item."
msgstr "Impossibile aggiungere l'oggetto. Non puoi scambiare questo oggetto."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:276
+#: src/resources/notifications.h:296
msgid "Failed adding item for unknown reason."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:280
+#: src/resources/notifications.h:300
msgid "Trade canceled."
msgstr "Scambio cancellato."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:284
+#: src/resources/notifications.h:304
msgid "Trade completed."
msgstr "Scambio completato."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:288
+#: src/resources/notifications.h:308
msgid "Kick failed!"
msgstr "Espulsione fallita!"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:292
+#: src/resources/notifications.h:312
msgid "Kick succeeded!"
msgstr "Kick riuscito!"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:296
+#: src/resources/notifications.h:316
#, c-format
msgid "MVP player: %s"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:300
+#: src/resources/notifications.h:320
msgid "All whispers ignored."
msgstr "Tutti i sussurri ignorati."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:304
+#: src/resources/notifications.h:324
msgid "All whispers ignore failed."
msgstr "Impossibile ignorare i sussurri."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:308
+#: src/resources/notifications.h:328
msgid "All whispers unignored."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:312
+#: src/resources/notifications.h:332
msgid "All whispers unignore failed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:319
+#: src/resources/notifications.h:339
msgid "pvp off, gvg off"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:323
+#: src/resources/notifications.h:343
msgid "pvp on"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:327
+#: src/resources/notifications.h:347
msgid "gvg on"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:331
+#: src/resources/notifications.h:351
msgid "pvp on, gvg on"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:335
+#: src/resources/notifications.h:355
msgid "unknown pvp"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:339
+#: src/resources/notifications.h:359
#, c-format
msgid "Char from account %s is already in your party!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:343
+#: src/resources/notifications.h:363
#, c-format
msgid "%s blocked invite!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:347
+#: src/resources/notifications.h:367
msgid "Char is not online!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:351
+#: src/resources/notifications.h:371
msgid "Pet catch failed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:355
+#: src/resources/notifications.h:375
msgid "Pet catched."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:359
+#: src/resources/notifications.h:379
#, c-format
msgid "Pet catch unkown error: %d."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:363
+#: src/resources/notifications.h:383
msgid "Your mercenary duty hour is over."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:367
+#: src/resources/notifications.h:387
msgid "Your mercenary was killed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:371
+#: src/resources/notifications.h:391
msgid "Your mercenary was fired."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:375
+#: src/resources/notifications.h:395
msgid "Your mercenary run away."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:379
+#: src/resources/notifications.h:399
msgid "Mercenary unknown state."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:383
+#: src/resources/notifications.h:403
msgid "You feed your homunculus."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:387
+#: src/resources/notifications.h:407
#, c-format
msgid "You cant feed homunculus, because not have %s."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:391
-#, fuzzy
+#: src/resources/notifications.h:411
msgid "Card insert failed."
-msgstr "Scambio non riuscito!"
+msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:395
+#: src/resources/notifications.h:415
msgid "Card inserted."
msgstr ""
diff --git a/po/ja.po b/po/ja.po
index 3b76fa5c6..e14e6c3bb 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -14,8 +14,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-10-08 01:19+0300\n"
-"PO-Revision-Date: 2014-09-28 10:01+0000\n"
+"POT-Creation-Date: 2014-10-10 00:16+0300\n"
+"PO-Revision-Date: 2014-10-08 10:02+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Japanese (http://www.transifex.com/projects/p/manaplus/"
"language/ja/)\n"
@@ -5173,15 +5173,13 @@ msgstr ""
#. TRANSLATORS: char select dialog. button.
#: src/gui/windows/charselectdialog.cpp:73
-#, fuzzy
msgid "Switch"
-msgstr "別アカウントでログイン"
+msgstr ""
#. TRANSLATORS: char select dialog. button.
#: src/gui/windows/charselectdialog.cpp:75
-#, fuzzy
msgid "Password"
-msgstr "パスワード:"
+msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: updater window button
@@ -5225,9 +5223,8 @@ msgid "Please set new pincode"
msgstr ""
#: src/gui/windows/charselectdialog.cpp:240
-#, fuzzy
msgid "Please enter new name"
-msgstr "名前を入力してください."
+msgstr ""
#. TRANSLATORS: char select dialog. player info message.
#: src/gui/windows/charselectdialog.cpp:259
@@ -5876,7 +5873,7 @@ msgstr "アナウンスにリンクを表示する"
#. TRANSLATORS: shop window dialog
#. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:776 src/net/ea/tradehandler.cpp:233
+#: src/gui/windows/shopwindow.cpp:776 src/net/ea/tradehandler.cpp:192
msgid "Request for Trade"
msgstr "トレードをリクエスト"
@@ -7533,19 +7530,19 @@ msgstr "ギルド城: %s"
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:191
+#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:207
msgid "Item sharing enabled."
msgstr "アイテム共有モード有効."
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:195
+#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:211
msgid "Item sharing disabled."
msgstr "アイテム共有モード無効."
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:199
+#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:215
msgid "Item sharing not possible."
msgstr "アイテム共有モード不可能."
@@ -7556,19 +7553,19 @@ msgstr "アイテム共有モード不明."
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:179
+#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:195
msgid "Experience sharing enabled."
msgstr "Expシェアモード有効."
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:183
+#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:199
msgid "Experience sharing disabled."
msgstr "Expシェアモード無効."
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:187
+#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:203
msgid "Experience sharing not possible."
msgstr "Expシェアモード不可能."
@@ -7694,14 +7691,12 @@ msgstr "インベントリーが体重の半分以下になった為、体力は
#. TRANSLATORS: char rename error
#: src/net/eathena/charserverhandler.cpp:516
#: src/net/eathena/charserverhandler.cpp:553
-#, fuzzy
msgid "Character rename error."
-msgstr "キャラクターを削除しました."
+msgstr ""
#: src/net/eathena/charserverhandler.cpp:531
-#, fuzzy
msgid "Character renamed."
-msgstr "キャラクターを削除しました."
+msgstr ""
#. TRANSLATORS: char rename error
#: src/net/eathena/charserverhandler.cpp:544
@@ -7715,9 +7710,8 @@ msgstr ""
#. TRANSLATORS: char rename error
#: src/net/eathena/charserverhandler.cpp:557
-#, fuzzy
msgid "Character not found."
-msgstr "キャラクターポイント: %d"
+msgstr ""
#. TRANSLATORS: player stat
#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:124
@@ -7781,9 +7775,8 @@ msgid "Speed hack detected."
msgstr "スピードハックが探知されました."
#: src/net/eathena/generalhandler.cpp:179
-#, fuzzy
msgid "Server full."
-msgstr "サーバー:"
+msgstr ""
#: src/net/eathena/generalhandler.cpp:182
msgid "Sorry, you are underaged."
@@ -7855,18 +7848,16 @@ msgid "Ip limited access."
msgstr ""
#: src/net/eathena/generalhandler.cpp:235
-#, fuzzy
msgid "Over characters list."
-msgstr "キャラクターを削除しました."
+msgstr ""
#: src/net/eathena/generalhandler.cpp:238
msgid "Ip blocked."
msgstr ""
#: src/net/eathena/generalhandler.cpp:241
-#, fuzzy
msgid "Invalid password count."
-msgstr "変更前のパスワードが間違っています."
+msgstr ""
#: src/net/eathena/generalhandler.cpp:244
msgid "Not allowed race."
@@ -8033,13 +8024,13 @@ msgid "Huh? What's that?"
msgstr "うん?何それ?"
#. TRANSLATORS: trade header
-#: src/net/ea/tradehandler.cpp:100
+#: src/net/ea/tradehandler.cpp:105
#, c-format
msgid "Trade: You and %s"
msgstr "あなたと%sとのトレード"
#. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:235
+#: src/net/ea/tradehandler.cpp:194
#, c-format
msgid "%s wants to trade with you, do you accept?"
msgstr "%sはあなたにトレードを申請しています?"
@@ -8258,429 +8249,454 @@ msgstr "購買できません."
#. TRANSLATORS: notification message
#: src/resources/notifications.h:47
+#, fuzzy
+msgid "Unable to buy. You not have enought money."
+msgstr "GP不足です."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:51
+#, fuzzy
+msgid "Unable to buy. You overweight."
+msgstr "購買できません."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:55
+msgid "Unable to buy. You have too many items."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:59
msgid "Nothing to sell."
msgstr "売るアイテムがありません."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:51
+#: src/resources/notifications.h:63
msgid "Thanks for selling."
msgstr "ありがとうございました."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:55
+#: src/resources/notifications.h:67
msgid "Unable to sell."
msgstr "販売できません."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:59
+#: src/resources/notifications.h:71
msgid "Unable to sell while trading."
msgstr "トレード中は売買できません."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:63
+#: src/resources/notifications.h:75
msgid "Unable to sell unsellable item."
msgstr "トレード中は売買できません."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:67
+#: src/resources/notifications.h:79
#, c-format
msgid "Online users: %d"
msgstr "オンラインユーザー: %d"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:71
+#: src/resources/notifications.h:83
msgid "Guild created."
msgstr "ギルド作成成功."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:75
+#: src/resources/notifications.h:87
msgid "You are already in guild."
msgstr "既にギルドへ入会しています."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:79
+#: src/resources/notifications.h:91
msgid "Emperium check failed."
msgstr "認証エラー."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:83
+#: src/resources/notifications.h:95
msgid "Unknown server response."
msgstr "サーバーから不明な応答です."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:87
+#: src/resources/notifications.h:99
msgid "You have left the guild."
msgstr "ギルドから退会しました."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:91
+#: src/resources/notifications.h:103
msgid "Could not invite user to guild."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:95
+#: src/resources/notifications.h:107
msgid "User rejected guild invite."
msgstr "ユーザーはギルド招待を断りました."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:99
+#: src/resources/notifications.h:111
msgid "User is now part of your guild."
msgstr "ユーザーはギルドへ入会しました."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:103
+#: src/resources/notifications.h:115
msgid "Your guild is full."
msgstr "ギルドが定員になりました."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:107
+#: src/resources/notifications.h:119
msgid "Unknown guild invite response."
msgstr "ギルド招待に対して不明な返答."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:111
+#: src/resources/notifications.h:123
#, c-format
msgid "%s has left your guild."
msgstr "%sがギルドを退会しました."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:115
+#: src/resources/notifications.h:127
msgid "You were kicked from guild."
msgstr "ギルドから追い出されました."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:119
+#: src/resources/notifications.h:131
#, c-format
msgid "%s has kicked from your guild."
msgstr "%sがギルドから追い出しました."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:123
+#: src/resources/notifications.h:135
msgid "Failed to use item."
msgstr "アイテム使用に失敗."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:127
+#: src/resources/notifications.h:139
msgid "Unable to equip."
msgstr "装着不可能."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:131
+#: src/resources/notifications.h:143
+msgid "Unable to equip because you have wrong level."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:147
msgid "Could not create party."
msgstr "パーティ作成失敗."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:135
+#: src/resources/notifications.h:151
msgid "Party successfully created."
msgstr "パーティを作成しました."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:139
+#: src/resources/notifications.h:155
msgid "You have left the party."
msgstr "パーティから退会しました."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:143
-#, fuzzy
+#: src/resources/notifications.h:159
msgid "You cant left party on this map."
-msgstr "パーティから退会しました."
+msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:147
-#, fuzzy
+#: src/resources/notifications.h:163
msgid "You was kicked from party."
-msgstr "ギルドから追い出されました."
+msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:151
-msgid "You cant be kicked kicked from party on this map."
+#: src/resources/notifications.h:167
+msgid "You cant be kicked from party on this map."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:155
+#: src/resources/notifications.h:171
#, c-format
msgid "%s has joined your party."
msgstr "%sがパーティに参加しました."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:159
+#: src/resources/notifications.h:175
#, c-format
msgid "%s is already a member of a party."
msgstr "%sは既にパーティのメンバーです."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:163
+#: src/resources/notifications.h:179
#, c-format
msgid "%s refused your invitation."
msgstr "%sは招待を拒否しました."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:167
+#: src/resources/notifications.h:183
#, c-format
msgid "%s is now a member of your party."
msgstr "%sはパーティのメンバーになりました."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:171
+#: src/resources/notifications.h:187
#, c-format
msgid "%s can't join your party because party is full."
msgstr "パーティが満員の為%sは参加できません."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:175
+#: src/resources/notifications.h:191
#, c-format
msgid "QQQ Unknown invite response for %s."
msgstr "QQQ %sから不明な返答."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:203
+#: src/resources/notifications.h:219
#, c-format
msgid "%s has left your party."
msgstr "%sがパーティから退会しました."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:207 src/resources/notifications.h:215
-#, fuzzy, c-format
+#: src/resources/notifications.h:223 src/resources/notifications.h:231
+#, c-format
msgid "%s cant be kicked from party on this map."
-msgstr "%sがギルドから追い出しました."
+msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:211
-#, fuzzy, c-format
+#: src/resources/notifications.h:227
+#, c-format
msgid "%s has kicked from your party."
-msgstr "%sがギルドから追い出しました."
+msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:219
+#: src/resources/notifications.h:235
#, c-format
msgid "An unknown member tried to say: %s"
msgstr "不明なメンバーからの応答: %s"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:223
+#: src/resources/notifications.h:239
#, c-format
msgid "%s is not in your party!"
msgstr "%sはパーティのメンバーではありません!"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:227
+#: src/resources/notifications.h:243
#, c-format
msgid "You picked up %s."
msgstr "%sを手に入れました."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:231
+#: src/resources/notifications.h:247
#, c-format
msgid "You spent %s."
msgstr "%sを使いました."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:235
+#: src/resources/notifications.h:251
msgid "Cannot raise skill!"
msgstr "スキルはこれ以上あがりません!"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:239
+#: src/resources/notifications.h:255
msgid "Equip ammunition first."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:243
+#: src/resources/notifications.h:259
#, c-format
msgid "Trading with %s isn't possible. Trade partner is too far away."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:248
+#: src/resources/notifications.h:264
#, c-format
msgid "Trading with %s isn't possible. Character doesn't exist."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:252
+#: src/resources/notifications.h:268
msgid "Trade cancelled due to an unknown reason."
msgstr "不明な理由でトレードはキャンセルされました."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:256
+#: src/resources/notifications.h:272
#, c-format
msgid "Trade with %s cancelled."
msgstr "%sとのトレードは中止されました."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:260
+#: src/resources/notifications.h:276
+#, fuzzy, c-format
+msgid "Trade with %s cancelled, because player is busy"
+msgstr "%sとのトレードは中止されました."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:280
#, c-format
msgid "Unhandled trade cancel packet with %s"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:264
+#: src/resources/notifications.h:284
msgid "Failed adding item. Trade partner is over weighted."
msgstr "アイテム追加失敗。相手のインベントリーが重量オーバーです."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:268
+#: src/resources/notifications.h:288
msgid "Failed adding item. Trade partner has no free slot."
msgstr "アイテム追加失敗。相手のインベントリーに空スロットがありません."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:272
+#: src/resources/notifications.h:292
msgid "Failed adding item. You can't trade this item."
msgstr "アイテム追加失敗。このアイテムはトレードできません."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:276
+#: src/resources/notifications.h:296
msgid "Failed adding item for unknown reason."
msgstr "不明な理由でアイテム追加失敗."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:280
+#: src/resources/notifications.h:300
msgid "Trade canceled."
msgstr "トレード中止."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:284
+#: src/resources/notifications.h:304
msgid "Trade completed."
msgstr "トレード完了."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:288
+#: src/resources/notifications.h:308
msgid "Kick failed!"
msgstr "追い出し失敗!"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:292
+#: src/resources/notifications.h:312
msgid "Kick succeeded!"
msgstr "追い出し成功!"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:296
+#: src/resources/notifications.h:316
#, c-format
msgid "MVP player: %s"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:300
+#: src/resources/notifications.h:320
msgid "All whispers ignored."
msgstr "全てのささやきを無視しました."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:304
+#: src/resources/notifications.h:324
msgid "All whispers ignore failed."
msgstr "全てのささやきの無視に失敗しました."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:308
+#: src/resources/notifications.h:328
msgid "All whispers unignored."
msgstr "全てのささやきを無視解除しました."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:312
+#: src/resources/notifications.h:332
msgid "All whispers unignore failed."
msgstr "全てのささやきの無視解除に失敗しました."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:319
+#: src/resources/notifications.h:339
msgid "pvp off, gvg off"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:323
+#: src/resources/notifications.h:343
msgid "pvp on"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:327
+#: src/resources/notifications.h:347
msgid "gvg on"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:331
+#: src/resources/notifications.h:351
msgid "pvp on, gvg on"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:335
+#: src/resources/notifications.h:355
msgid "unknown pvp"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:339
+#: src/resources/notifications.h:359
#, c-format
msgid "Char from account %s is already in your party!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:343
+#: src/resources/notifications.h:363
#, c-format
msgid "%s blocked invite!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:347
+#: src/resources/notifications.h:367
msgid "Char is not online!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:351
+#: src/resources/notifications.h:371
msgid "Pet catch failed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:355
+#: src/resources/notifications.h:375
msgid "Pet catched."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:359
+#: src/resources/notifications.h:379
#, c-format
msgid "Pet catch unkown error: %d."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:363
+#: src/resources/notifications.h:383
msgid "Your mercenary duty hour is over."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:367
+#: src/resources/notifications.h:387
msgid "Your mercenary was killed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:371
+#: src/resources/notifications.h:391
msgid "Your mercenary was fired."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:375
+#: src/resources/notifications.h:395
msgid "Your mercenary run away."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:379
+#: src/resources/notifications.h:399
msgid "Mercenary unknown state."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:383
+#: src/resources/notifications.h:403
msgid "You feed your homunculus."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:387
+#: src/resources/notifications.h:407
#, c-format
msgid "You cant feed homunculus, because not have %s."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:391
-#, fuzzy
+#: src/resources/notifications.h:411
msgid "Card insert failed."
-msgstr "トレード失敗!"
+msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:395
+#: src/resources/notifications.h:415
msgid "Card inserted."
msgstr ""
diff --git a/po/ka.po b/po/ka.po
index edf4d271e..e940cfcf1 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-27 13:23+0300\n"
-"PO-Revision-Date: 2014-09-28 10:01+0000\n"
+"POT-Creation-Date: 2014-10-08 01:19+0300\n"
+"PO-Revision-Date: 2014-10-08 10:01+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Georgian (http://www.transifex.com/projects/p/manaplus/language/ka/)\n"
"MIME-Version: 1.0\n"
@@ -32,7 +32,7 @@ msgstr ""
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:131 src/client.cpp:1463 src/client.cpp:1490
+#: src/actions/actions.cpp:131 src/client.cpp:1461 src/client.cpp:1488
#: src/gamemodifiers.cpp:423 src/gui/widgets/tabs/setup_input.cpp:163
#: src/gui/widgets/tabs/setup_theme.cpp:312
#: src/gui/widgets/tabs/setup_theme.cpp:343
@@ -43,8 +43,8 @@ msgstr ""
#: src/gui/windows/changeemaildialog.cpp:170
#: src/gui/windows/changepassworddialog.cpp:160
#: src/gui/windows/charcreatedialog.cpp:373
-#: src/gui/windows/charselectdialog.cpp:255
-#: src/gui/windows/charselectdialog.cpp:291 src/gui/windows/editdialog.cpp:49
+#: src/gui/windows/charselectdialog.cpp:277
+#: src/gui/windows/charselectdialog.cpp:313 src/gui/windows/editdialog.cpp:49
#: src/gui/windows/editserverdialog.cpp:61
#: src/gui/windows/editserverdialog.cpp:208
#: src/gui/windows/itemamountwindow.cpp:158 src/gui/windows/quitdialog.cpp:70
@@ -52,7 +52,9 @@ msgstr ""
#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
#: src/net/ea/charserverhandler.cpp:143 src/net/ea/charserverhandler.cpp:162
#: src/net/ea/charserverhandler.cpp:175 src/net/ea/gamehandler.cpp:79
-#: src/net/ea/playerhandler.cpp:263 src/net/ea/playerhandler.cpp:279
+#: src/net/ea/playerhandler.cpp:424 src/net/ea/playerhandler.cpp:440
+#: src/net/eathena/charserverhandler.cpp:533
+#: src/net/eathena/charserverhandler.cpp:563
msgid "OK"
msgstr ""
@@ -176,7 +178,7 @@ msgstr ""
#. TRANSLATORS: party invite message
#. TRANSLATORS: change relation
-#: src/actions/chat.cpp:303 src/actions/commands.cpp:65
+#: src/actions/chat.cpp:303 src/actions/commands.cpp:64
msgid "Please specify a name."
msgstr ""
@@ -199,75 +201,75 @@ msgid "Message now closes chat."
msgstr ""
#. TRANSLATORS: change relation
-#: src/actions/commands.cpp:108
+#: src/actions/commands.cpp:107
#, c-format
msgid "Player already %s!"
msgstr ""
#. TRANSLATORS: change relation
-#: src/actions/commands.cpp:120
+#: src/actions/commands.cpp:119
#, c-format
msgid "Player successfully %s!"
msgstr ""
#. TRANSLATORS: change relation
-#: src/actions/commands.cpp:122
+#: src/actions/commands.cpp:121
#, c-format
msgid "Player could not be %s!"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:153
+#: src/actions/commands.cpp:152
msgid "Player wasn't ignored!"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:162
+#: src/actions/commands.cpp:161
msgid "Player no longer ignored!"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:164
+#: src/actions/commands.cpp:163
msgid "Player could not be unignored!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/actions/commands.cpp:179
+#: src/actions/commands.cpp:178
msgid "Player already erased!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/actions/commands.cpp:192
+#: src/actions/commands.cpp:191
msgid "Player no longer erased!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/actions/commands.cpp:194
+#: src/actions/commands.cpp:193
msgid "Player could not be erased!"
msgstr ""
#. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:201
+#: src/actions/commands.cpp:200
msgid "friend"
msgstr ""
#. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:208
+#: src/actions/commands.cpp:207
msgid "disregarded"
msgstr ""
#. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:215
+#: src/actions/commands.cpp:214
msgid "neutral"
msgstr ""
#. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:222
+#: src/actions/commands.cpp:221
msgid "blacklisted"
msgstr ""
#. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:229
+#: src/actions/commands.cpp:228
msgid "enemy"
msgstr ""
@@ -282,77 +284,77 @@ msgid "Accepting incoming trade requests"
msgstr ""
#. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1306
+#: src/actormanager.cpp:1310
msgid "Visible on map"
msgstr ""
#. TRANSLATORS: default race name
-#: src/being/being.cpp:389
+#: src/being/being.cpp:393
msgid "Human"
msgstr ""
-#: src/being/being.cpp:556
+#: src/being/being.cpp:560
msgid "dodge"
msgstr ""
-#: src/being/being.cpp:556
+#: src/being/being.cpp:560
msgid "miss"
msgstr ""
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1865 src/gui/windows/whoisonline.cpp:855
+#: src/being/being.cpp:1869 src/gui/windows/whoisonline.cpp:855
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1870 src/gui/windows/whoisonline.cpp:860
+#: src/being/being.cpp:1874 src/gui/windows/whoisonline.cpp:860
msgid "I"
msgstr ""
#. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:379
+#: src/being/localplayer.cpp:380
#, c-format
msgid "You were killed by %s"
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:824
+#: src/being/localplayer.cpp:825
msgid "Tried to pick up nonexistent item."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:828
+#: src/being/localplayer.cpp:829
msgid "Item is too heavy."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:832
+#: src/being/localplayer.cpp:833
msgid "Item is too far away."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:836
+#: src/being/localplayer.cpp:837
msgid "Inventory is full."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:840
+#: src/being/localplayer.cpp:841
msgid "Stack is too big."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:844
+#: src/being/localplayer.cpp:845
msgid "Item belongs to someone else."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:848
+#: src/being/localplayer.cpp:849
msgid "Unknown problem picking up item."
msgstr ""
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:872
+#: src/being/localplayer.cpp:873
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -360,43 +362,43 @@ msgstr[0] ""
#. TRANSLATORS: this is normal experience
#. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1054 src/being/localplayer.cpp:1055
-#: src/being/localplayer.cpp:1091
+#: src/being/localplayer.cpp:1055 src/being/localplayer.cpp:1056
+#: src/being/localplayer.cpp:1092
msgid "xp"
msgstr ""
#. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1059 src/being/localplayer.cpp:1065
-#: src/being/localplayer.cpp:1071
+#: src/being/localplayer.cpp:1060 src/being/localplayer.cpp:1066
+#: src/being/localplayer.cpp:1072
msgid "job"
msgstr ""
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2794
+#: src/being/localplayer.cpp:2795
#, c-format
msgid "Follow: %s"
msgstr ""
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2800 src/being/localplayer.cpp:2825
+#: src/being/localplayer.cpp:2801 src/being/localplayer.cpp:2826
msgid "Follow canceled"
msgstr ""
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2810
+#: src/being/localplayer.cpp:2811
#, c-format
msgid "Imitation: %s"
msgstr ""
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2816 src/being/localplayer.cpp:2830
+#: src/being/localplayer.cpp:2817 src/being/localplayer.cpp:2831
msgid "Imitation canceled"
msgstr ""
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3180
+#: src/being/localplayer.cpp:3181
#, c-format
msgid "You see %s"
msgstr ""
@@ -434,37 +436,37 @@ msgstr ""
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:920 src/gui/windowmenu.cpp:162
+#: src/client.cpp:918 src/gui/windowmenu.cpp:162
#: src/gui/windows/setupwindow.cpp:62
msgid "Setup"
msgstr ""
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:923 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:921 src/gui/widgets/tabs/setup_perfomance.cpp:54
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:926 src/gui/widgets/tabs/setup_video.cpp:105
+#: src/client.cpp:924 src/gui/widgets/tabs/setup_video.cpp:105
msgid "Video"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:929 src/gui/widgets/tabs/setup_theme.cpp:122
+#: src/client.cpp:927 src/gui/widgets/tabs/setup_theme.cpp:122
msgid "Theme"
msgstr ""
#. TRANSLATORS: theme tab quick button
-#: src/client.cpp:932
+#: src/client.cpp:930
msgid "About"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:935 src/gui/windowmenu.cpp:74
+#: src/client.cpp:933 src/gui/windowmenu.cpp:74
#: src/gui/windows/helpwindow.cpp:53
msgid "Help"
msgstr ""
@@ -480,42 +482,42 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:939 src/client.cpp:1391 src/client.cpp:1405
+#: src/client.cpp:937 src/client.cpp:1389 src/client.cpp:1403
#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:691
#: src/gui/popups/popupmenu.cpp:923 src/gui/windows/didyouknowwindow.cpp:81
#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:74
#: src/gui/windows/npcdialog.cpp:112 src/gui/windows/questswindow.cpp:77
-#: src/gui/windows/shopwindow.cpp:84
+#: src/gui/windows/shopwindow.cpp:83
msgid "Close"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1065
+#: src/client.cpp:1063
msgid "Connecting to server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1113
+#: src/client.cpp:1111
msgid "Logging in"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1156
+#: src/client.cpp:1154
msgid "Entering game world"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1282
+#: src/client.cpp:1280
msgid "Requesting characters"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1322
+#: src/client.cpp:1320
msgid "Connecting to the game server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1334
+#: src/client.cpp:1332
msgid "Changing game servers"
msgstr ""
@@ -529,72 +531,76 @@ msgstr ""
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1389 src/client.cpp:1403 src/client.cpp:1598
+#. TRANSLATORS: info message
+#. TRANSLATORS: ok dialog button
+#: src/client.cpp:1387 src/client.cpp:1401 src/client.cpp:1596
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
#: src/gui/windows/charcreatedialog.cpp:369
-#: src/gui/windows/charselectdialog.cpp:289
+#: src/gui/windows/charselectdialog.cpp:311
#: src/gui/windows/editserverdialog.cpp:203
#: src/gui/windows/registerdialog.cpp:245
#: src/gui/windows/unregisterdialog.cpp:146
#: src/net/ea/charserverhandler.cpp:141 src/net/ea/charserverhandler.cpp:173
+#: src/net/eathena/charserverhandler.cpp:516
+#: src/net/eathena/charserverhandler.cpp:518
msgid "Error"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1418
+#: src/client.cpp:1416
msgid "Requesting registration details"
msgstr ""
#. TRANSLATORS: password change message header
-#: src/client.cpp:1459
+#: src/client.cpp:1457
msgid "Password Change"
msgstr ""
#. TRANSLATORS: password change message text
-#: src/client.cpp:1461
+#: src/client.cpp:1459
msgid "Password changed successfully!"
msgstr ""
#. TRANSLATORS: email change message header
-#: src/client.cpp:1486
+#: src/client.cpp:1484
msgid "Email Change"
msgstr ""
#. TRANSLATORS: email change message text
-#: src/client.cpp:1488
+#: src/client.cpp:1486
msgid "Email changed successfully!"
msgstr ""
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1515
+#: src/client.cpp:1513
msgid "Unregister Successful"
msgstr ""
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1517
+#: src/client.cpp:1515
msgid "Farewell, come back any time..."
msgstr ""
#. TRANSLATORS: directory creation error
#: src/configmanager.cpp:53 src/dirs.cpp:260 src/dirs.cpp:275 src/dirs.cpp:320
-#: src/dirs.cpp:481 src/dirs.cpp:489
+#: src/dirs.cpp:488 src/dirs.cpp:496
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:363
+#: src/dirs.cpp:370
#, c-format
msgid "Invalid update host: %s."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:404 src/dirs.cpp:411
+#: src/dirs.cpp:411 src/dirs.cpp:418
msgid "Error creating updates directory!"
msgstr ""
-#: src/dirs.cpp:433 src/dirs.cpp:451
+#: src/dirs.cpp:440 src/dirs.cpp:458
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
@@ -612,36 +618,36 @@ msgid "dyecmd srcdyestring dstfile"
msgstr ""
#. TRANSLATORS: chat tab header
-#: src/game.cpp:236 src/gui/widgets/tabs/chattab.cpp:482
+#: src/game.cpp:234 src/gui/widgets/tabs/chattab.cpp:482
msgid "General"
msgstr ""
#. TRANSLATORS: chat tab header
#. TRANSLATORS: full button name
#. TRANSLATORS: debug window name
-#: src/game.cpp:253 src/gui/widgets/tabs/chattab.cpp:484
+#: src/game.cpp:251 src/gui/widgets/tabs/chattab.cpp:484
#: src/gui/windowmenu.cpp:149 src/gui/windows/debugwindow.cpp:42
msgid "Debug"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:541
+#: src/game.cpp:532
#, c-format
msgid "Screenshot saved as %s"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:551
+#: src/game.cpp:542
msgid "Saving screenshot failed!"
msgstr ""
#. TRANSLATORS: error message text
-#: src/game.cpp:634
+#: src/game.cpp:625
msgid "The connection to the server was lost."
msgstr ""
#. TRANSLATORS: error message header
-#: src/game.cpp:637
+#: src/game.cpp:628
msgid "Network Error"
msgstr ""
@@ -1032,6 +1038,7 @@ msgstr ""
#: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
#: src/gui/widgets/tabs/setup_other.cpp:79
#: src/gui/widgets/tabs/setup_visual.cpp:81
+#: src/gui/windows/equipmentwindow.cpp:577
msgid "default"
msgstr ""
@@ -1522,7 +1529,7 @@ msgstr ""
#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:273
#: src/gui/popups/popupmenu.cpp:767 src/gui/widgets/skillinfo.cpp:113
#: src/gui/windows/botcheckerwindow.cpp:89 src/input/pages/basic.cpp:42
-#: src/net/eathena/generalhandler.cpp:289 src/net/tmwa/generalhandler.cpp:321
+#: src/net/eathena/generalhandler.cpp:356 src/net/tmwa/generalhandler.cpp:320
msgid "Attack"
msgstr ""
@@ -1691,7 +1698,7 @@ msgstr ""
#. TRANSLATORS: pet unequip item
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:340 src/gui/windows/equipmentwindow.cpp:70
+#: src/gui/popups/popupmenu.cpp:340 src/gui/windows/equipmentwindow.cpp:72
#: src/gui/windows/inventorywindow.cpp:175 src/resources/itemtypemapdata.h:47
#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
@@ -1749,7 +1756,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:574
+#: src/gui/popups/popupmenu.cpp:574 src/gui/windows/charselectdialog.cpp:132
msgid "Rename"
msgstr ""
@@ -2261,7 +2268,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
#. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:3000 src/net/ea/playerhandler.cpp:364
+#: src/gui/popups/popupmenu.cpp:3000 src/net/ea/playerhandler.cpp:195
msgid "Revive"
msgstr ""
@@ -2285,7 +2292,7 @@ msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: settings group
#. TRANSLATORS: full button name
-#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:319
+#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:315
#: src/gui/windowmenu.cpp:158
msgid "Windows"
msgstr ""
@@ -2313,7 +2320,7 @@ msgstr ""
#. TRANSLATORS: input action name
#: src/gui/setupinputpages.cpp:57 src/gui/widgets/tabs/setup_audio.cpp:151
#: src/gui/widgets/tabs/setup_chat.cpp:179
-#: src/gui/widgets/tabs/setup_other.cpp:341
+#: src/gui/widgets/tabs/setup_other.cpp:337
#: src/gui/widgets/tabs/setup_visual.cpp:192
#: src/gui/windows/charcreatedialog.cpp:119
#: src/gui/windows/registerdialog.cpp:106 src/input/pages/gui.cpp:87
@@ -2326,212 +2333,227 @@ msgid "Gui"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:113
+#: src/gui/userpalette.cpp:116
msgid "Being"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:115
+#: src/gui/userpalette.cpp:118
msgid "Friend names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:117
+#: src/gui/userpalette.cpp:120
msgid "Disregarded names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:119
+#: src/gui/userpalette.cpp:122
msgid "Ignored names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:121
+#: src/gui/userpalette.cpp:124
msgid "Erased names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:123
+#: src/gui/userpalette.cpp:126
msgid "Other players names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:125
+#: src/gui/userpalette.cpp:128
msgid "Own name"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:127
+#: src/gui/userpalette.cpp:130
msgid "GM names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:129
+#: src/gui/userpalette.cpp:132
msgid "NPCs"
msgstr ""
#. TRANSLATORS: palette color
#. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:131 src/gui/widgets/tabs/setup_other.cpp:108
+#: src/gui/userpalette.cpp:134 src/gui/widgets/tabs/setup_other.cpp:108
msgid "Monsters"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:133
+#: src/gui/userpalette.cpp:136
msgid "Monster HP bar"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:139
msgid "Monster HP bar (second color)"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:138
+#: src/gui/userpalette.cpp:141
msgid "Party members"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:140
+#: src/gui/userpalette.cpp:143
msgid "Guild members"
msgstr ""
#. TRANSLATORS: palette color
#. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:142 src/gui/widgets/tabs/setup_visual.cpp:157
+#: src/gui/userpalette.cpp:145 src/gui/widgets/tabs/setup_visual.cpp:157
msgid "Particle effects"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:144
+#: src/gui/userpalette.cpp:147
msgid "Pickup notification"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:146
+#: src/gui/userpalette.cpp:149
msgid "Exp notification"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:148
+#: src/gui/userpalette.cpp:151
msgid "Player HP bar"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:152
+#: src/gui/userpalette.cpp:155
msgid "Player HP bar (second color)"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:154
+#: src/gui/userpalette.cpp:157
msgid "Player hits monster"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:156
+#: src/gui/userpalette.cpp:159
msgid "Monster hits player"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:160
+#: src/gui/userpalette.cpp:163
msgid "Other player hits local player"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:162
+#: src/gui/userpalette.cpp:165
msgid "Critical Hit"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:166
+#: src/gui/userpalette.cpp:169
msgid "Local player hits monster"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:169
+#: src/gui/userpalette.cpp:172
msgid "Local player critical hit"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:172
+#: src/gui/userpalette.cpp:175
msgid "Local player miss"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:174
+#: src/gui/userpalette.cpp:177
msgid "Misses"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:176
+#: src/gui/userpalette.cpp:179
msgid "Portal highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:179
+#: src/gui/userpalette.cpp:182
msgid "Default collision highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:182
+#: src/gui/userpalette.cpp:185
msgid "Air collision highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:185
+#: src/gui/userpalette.cpp:188
msgid "Water collision highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:188
+#: src/gui/userpalette.cpp:191
msgid "Special ground collision highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:191
+#: src/gui/userpalette.cpp:194
msgid "Walkable highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:194
+#: src/gui/userpalette.cpp:197
msgid "Local player attack range"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:197
+#: src/gui/userpalette.cpp:200
msgid "Local player attack range border"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:200
+#: src/gui/userpalette.cpp:203
msgid "Monster attack range"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:204
+#: src/gui/userpalette.cpp:207
msgid "Floor item amount color"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:207
+#: src/gui/userpalette.cpp:210
msgid "Home place"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:210
+#: src/gui/userpalette.cpp:213
msgid "Home place border"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:213
+#: src/gui/userpalette.cpp:216
msgid "Road point"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:216
+#: src/gui/userpalette.cpp:219
msgid "Tiles border"
msgstr ""
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:221
+msgid "Pets"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:223
+msgid "Mercenary"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:225
+msgid "Homunculus"
+msgstr ""
+
#: src/gui/widgets/characterdisplay.cpp:135
#, c-format
msgid "Level: %u"
@@ -2634,7 +2656,8 @@ msgid "Type: %s"
msgstr ""
#. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:108
+#. TRANSLATORS: unknown equipment page name
+#: src/gui/widgets/skillinfo.cpp:108 src/gui/windows/equipmentwindow.cpp:584
msgid "Unknown"
msgstr ""
@@ -2835,22 +2858,22 @@ msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:262
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:313
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:375
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:319
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:387
msgid "Target:"
msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:264
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:319
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:377
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:325
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:389
msgid "Target Id:"
msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:267
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:322
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:379
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:328
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:391
msgid "Target type:"
msgstr ""
@@ -2861,7 +2884,7 @@ msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:271
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:338
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:344
msgid "Target race:"
msgstr ""
@@ -2877,67 +2900,81 @@ msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:277
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:363
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:369
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:387
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:375
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:381
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:399
msgid "Attack delay:"
msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:279
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:350
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:389
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:356
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:401
msgid "Minimal hit:"
msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:281
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:353
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:391
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:359
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:403
msgid "Maximum hit:"
msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:283
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:356
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:393
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:362
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:405
msgid "Critical hit:"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:327
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:285
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:365
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:407
+msgid "Karma:"
+msgstr ""
+
+#. TRANSLATORS: debug window label
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:287
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:368
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:409
+msgid "Manner:"
+msgstr ""
+
+#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:333
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:381
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:339
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:393
msgid "Target Level:"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:341
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:383
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:347
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:395
msgid "Target Party:"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:345
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:385
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:351
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:397
msgid "Target Guild:"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:430
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:436
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:451
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:457
#, c-format
msgid "Ping: %s ms"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:439
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:460
#, c-format
msgid "In: %d bytes/s"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:442
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:463
#, c-format
msgid "Out: %d bytes/s"
msgstr ""
@@ -3766,137 +3803,132 @@ msgstr ""
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_other.cpp:294
-msgid "Enable auction bot support"
-msgstr ""
-
-#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:298
msgid "Enable guild bot support and disable native guild support"
msgstr ""
#. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:304
+#: src/gui/widgets/tabs/setup_other.cpp:300
msgid "Keyboard"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:307
+#: src/gui/widgets/tabs/setup_other.cpp:303
msgid "Repeat delay"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:311
+#: src/gui/widgets/tabs/setup_other.cpp:307
msgid "Repeat interval"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:315
+#: src/gui/widgets/tabs/setup_other.cpp:311
msgid "Custom repeat interval"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:323
+#: src/gui/widgets/tabs/setup_other.cpp:319
msgid "Shortcut buttons"
msgstr ""
#. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:328
+#: src/gui/widgets/tabs/setup_other.cpp:324
msgid "Proxy server"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:332
+#: src/gui/widgets/tabs/setup_other.cpp:328
msgid "Proxy type"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:336
+#: src/gui/widgets/tabs/setup_other.cpp:332
msgid "Proxy address:port"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:344
+#: src/gui/widgets/tabs/setup_other.cpp:340
msgid "Enable server side attack"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:348
+#: src/gui/widgets/tabs/setup_other.cpp:344
msgid "Hide support page link on error"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:352
+#: src/gui/widgets/tabs/setup_other.cpp:348
msgid "Enable double clicks"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:356
+#: src/gui/widgets/tabs/setup_other.cpp:352
msgid "Enable bot checker"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:360
+#: src/gui/widgets/tabs/setup_other.cpp:356
msgid "Enable buggy servers protection (do not disable)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:365
+#: src/gui/widgets/tabs/setup_other.cpp:361
msgid "Enable debug log"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:369
+#: src/gui/widgets/tabs/setup_other.cpp:365
msgid "Ignore logging packets"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:373
+#: src/gui/widgets/tabs/setup_other.cpp:369
msgid "Enable OpenGL log"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:377
+#: src/gui/widgets/tabs/setup_other.cpp:373
msgid "Enable input log"
msgstr ""
#. TRANSLATORS: settings option
#. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_other.cpp:381 src/input/pages/other.cpp:362
+#: src/gui/widgets/tabs/setup_other.cpp:377 src/input/pages/other.cpp:362
msgid "Upload log file"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:385
+#: src/gui/widgets/tabs/setup_other.cpp:381
msgid "Low traffic mode"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:389
+#: src/gui/widgets/tabs/setup_other.cpp:385
msgid "Hide shield sprite"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:394
+#: src/gui/widgets/tabs/setup_other.cpp:390
msgid "Use FBO for screenshots (only for opengl)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:400
+#: src/gui/widgets/tabs/setup_other.cpp:396
msgid "Screenshot directory"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:405
+#: src/gui/widgets/tabs/setup_other.cpp:401
msgid "Network delay between sub servers"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:409
+#: src/gui/widgets/tabs/setup_other.cpp:405
msgid "Show background"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:414
+#: src/gui/widgets/tabs/setup_other.cpp:410
msgid "Screen density override"
msgstr ""
@@ -4127,9 +4159,9 @@ msgstr ""
#. TRANSLATORS: command editor button
#. TRANSLATORS: input action name
#: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:82
-#: src/gui/windows/serverdialog.cpp:125 src/gui/windows/shopwindow.cpp:101
-#: src/gui/windows/shopwindow.cpp:108 src/gui/windows/textcommandeditor.cpp:92
+#: src/gui/windows/charselectdialog.cpp:84
+#: src/gui/windows/serverdialog.cpp:125 src/gui/windows/shopwindow.cpp:100
+#: src/gui/windows/shopwindow.cpp:107 src/gui/windows/textcommandeditor.cpp:92
#: src/input/pages/gui.cpp:111
msgid "Delete"
msgstr ""
@@ -4783,7 +4815,7 @@ msgstr ""
#. TRANSLATORS: equipment window name
#. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:63
+#: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:65
#: src/gui/windows/inventorywindow.cpp:196
msgid "Equipment"
msgstr ""
@@ -4924,7 +4956,7 @@ msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: social window button
#: src/gui/windows/buydialog.cpp:260 src/gui/windows/charcreatedialog.cpp:127
-#: src/gui/windows/charselectdialog.cpp:578
+#: src/gui/windows/charselectdialog.cpp:605
#: src/gui/windows/socialwindow.cpp:86
msgid "Create"
msgstr ""
@@ -4968,10 +5000,8 @@ msgstr ""
#. TRANSLATORS: change password window name
#. TRANSLATORS: change password dialog button
-#. TRANSLATORS: char select dialog. button.
#: src/gui/windows/changepassworddialog.cpp:51
#: src/gui/windows/changepassworddialog.cpp:57
-#: src/gui/windows/charselectdialog.cpp:73
msgid "Change Password"
msgstr ""
@@ -5125,57 +5155,68 @@ msgid "Are you sure you want to delete this character?"
msgstr ""
#. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:64
+#: src/gui/windows/charselectdialog.cpp:66
#, c-format
msgid "Account %s (last login time %s)"
msgstr ""
#. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:71
-msgid "Switch Login"
+#: src/gui/windows/charselectdialog.cpp:73
+msgid "Switch"
+msgstr ""
+
+#. TRANSLATORS: char select dialog. button.
+#: src/gui/windows/charselectdialog.cpp:75
+msgid "Password"
msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:78
-#: src/gui/windows/charselectdialog.cpp:573
+#: src/gui/windows/charselectdialog.cpp:80
+#: src/gui/windows/charselectdialog.cpp:595
#: src/gui/windows/updaterwindow.cpp:195
msgid "Play"
msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:80
+#: src/gui/windows/charselectdialog.cpp:82
#: src/net/ea/charserverhandler.cpp:160
+#: src/net/eathena/charserverhandler.cpp:531
+#: src/net/eathena/charserverhandler.cpp:561
msgid "Info"
msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: unregister dialog name
#. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:106
+#: src/gui/windows/charselectdialog.cpp:110
#: src/gui/windows/unregisterdialog.cpp:50
#: src/gui/windows/unregisterdialog.cpp:55
msgid "Unregister"
msgstr ""
#. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:118
+#: src/gui/windows/charselectdialog.cpp:122
msgid "Change Email"
msgstr ""
#. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:156
+#: src/gui/windows/charselectdialog.cpp:166
#, c-format
msgid "Account %s"
msgstr ""
-#: src/gui/windows/charselectdialog.cpp:184
+#: src/gui/windows/charselectdialog.cpp:194
msgid "Please set new pincode"
msgstr ""
+#: src/gui/windows/charselectdialog.cpp:240
+msgid "Please enter new name"
+msgstr ""
+
#. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:237
+#: src/gui/windows/charselectdialog.cpp:259
#, c-format
msgid ""
"Hp: %u/%u\n"
@@ -5185,16 +5226,16 @@ msgid ""
"Money: %s"
msgstr ""
-#: src/gui/windows/charselectdialog.cpp:289
+#: src/gui/windows/charselectdialog.cpp:311
msgid "Incorrect password"
msgstr ""
#. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:429
+#: src/gui/windows/charselectdialog.cpp:451
msgid "Enter password for deleting character"
msgstr ""
-#: src/gui/windows/charselectdialog.cpp:429
+#: src/gui/windows/charselectdialog.cpp:451
msgid "Enter password:"
msgstr ""
@@ -5600,7 +5641,7 @@ msgstr ""
#. TRANSLATORS: status bar label
#: src/gui/windows/ministatuswindow.cpp:364
-#: src/gui/windows/ministatuswindow.cpp:402
+#: src/gui/windows/ministatuswindow.cpp:401
msgid "Need"
msgstr ""
@@ -5631,7 +5672,7 @@ msgstr ""
#. TRANSLATORS: shop window button
#. TRANSLATORS: trade window button
#: src/gui/windows/npcdialog.cpp:114 src/gui/windows/serverdialog.cpp:121
-#: src/gui/windows/shopwindow.cpp:99 src/gui/windows/shopwindow.cpp:106
+#: src/gui/windows/shopwindow.cpp:98 src/gui/windows/shopwindow.cpp:105
#: src/gui/windows/tradewindow.cpp:83
msgid "Add"
msgstr ""
@@ -5794,43 +5835,38 @@ msgid "Reset Windows"
msgstr ""
#. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:80
+#: src/gui/windows/shopwindow.cpp:79
msgid "Personal Shop"
msgstr ""
#. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:95
+#: src/gui/windows/shopwindow.cpp:94
msgid "Buy items"
msgstr ""
#. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:97
+#: src/gui/windows/shopwindow.cpp:96
msgid "Sell items"
msgstr ""
#. TRANSLATORS: shop window label
#. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:110
+#: src/gui/windows/shopwindow.cpp:102 src/gui/windows/shopwindow.cpp:109
msgid "Announce"
msgstr ""
#. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:114
+#: src/gui/windows/shopwindow.cpp:113
msgid "Show links in announce"
msgstr ""
-#. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:176 src/gui/windows/shopwindow.cpp:179
-msgid "Auction"
-msgstr ""
-
#. TRANSLATORS: shop window dialog
#. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:233
+#: src/gui/windows/shopwindow.cpp:776 src/net/ea/tradehandler.cpp:233
msgid "Request for Trade"
msgstr ""
-#: src/gui/windows/shopwindow.cpp:791
+#: src/gui/windows/shopwindow.cpp:776
#, c-format
msgid "%s wants to %s %s do you accept?"
msgstr ""
@@ -6158,27 +6194,27 @@ msgstr ""
msgid "Connecting..."
msgstr ""
-#: src/gui/windows/updaterwindow.cpp:398
+#: src/gui/windows/updaterwindow.cpp:407
msgid "Show all news (can be slow)"
msgstr ""
#. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:824
+#: src/gui/windows/updaterwindow.cpp:833
msgid "##1 The update process is incomplete."
msgstr ""
#. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:826
+#: src/gui/windows/updaterwindow.cpp:835
msgid "##1 It is strongly recommended that"
msgstr ""
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:828
+#: src/gui/windows/updaterwindow.cpp:837
msgid "##1 you try again later."
msgstr ""
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1005
+#: src/gui/windows/updaterwindow.cpp:1021
msgid "Completed"
msgstr ""
@@ -6225,25 +6261,25 @@ msgstr ""
#. TRANSLATORS: long key name. must be short.
#. TRANSLATORS: short key name. must be very short.
#. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:370 src/input/inputmanager.cpp:414
+#: src/input/inputmanager.cpp:371 src/input/inputmanager.cpp:415
#: src/input/keyboardconfig.cpp:104
#, c-format
msgid "key_%d"
msgstr ""
#. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:376
+#: src/input/inputmanager.cpp:377
#, c-format
msgid "JButton%d"
msgstr ""
#. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:391
msgid "unknown key"
msgstr ""
#. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:420
+#: src/input/inputmanager.cpp:421
#, c-format
msgid "JB%d"
msgstr ""
@@ -6251,7 +6287,7 @@ msgstr ""
#. TRANSLATORS: unknown short key type. must be short
#. TRANSLATORS: Unknown key short string.
#. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:434 src/input/keyboardconfig.cpp:148
+#: src/input/inputmanager.cpp:435 src/input/keyboardconfig.cpp:148
msgid "u key"
msgstr ""
@@ -7422,74 +7458,74 @@ msgid "Request to quit denied!"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:135
#, c-format
msgid "Guild name: %s"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:191
+#: src/net/ea/guildhandler.cpp:138
#, c-format
msgid "Guild master: %s"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:141
#, c-format
msgid "Guild level: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:197
+#: src/net/ea/guildhandler.cpp:144
#, c-format
msgid "Online members: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:200
+#: src/net/ea/guildhandler.cpp:147
#, c-format
msgid "Max members: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:203
+#: src/net/ea/guildhandler.cpp:150
#, c-format
msgid "Average level: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:206
+#: src/net/ea/guildhandler.cpp:153
#, c-format
msgid "Guild exp: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:209
+#: src/net/ea/guildhandler.cpp:156
#, c-format
msgid "Guild next exp: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:212
+#: src/net/ea/guildhandler.cpp:159
#, c-format
msgid "Guild castle: %s"
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:179
+#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:191
msgid "Item sharing enabled."
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:183
+#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:195
msgid "Item sharing disabled."
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:187
+#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:199
msgid "Item sharing not possible."
msgstr ""
@@ -7500,19 +7536,19 @@ msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:167
+#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:179
msgid "Experience sharing enabled."
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:171
+#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:183
msgid "Experience sharing disabled."
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:175
+#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:187
msgid "Experience sharing not possible."
msgstr ""
@@ -7617,239 +7653,355 @@ msgid "Connection to server terminated. "
msgstr ""
#. TRANSLATORS: message header
-#: src/net/ea/playerhandler.cpp:257 src/net/ea/playerhandler.cpp:273
-#: src/net/ea/playerhandler.cpp:361
+#: src/net/ea/playerhandler.cpp:192 src/net/ea/playerhandler.cpp:418
+#: src/net/ea/playerhandler.cpp:434
msgid "Message"
msgstr ""
#. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:259
+#: src/net/ea/playerhandler.cpp:420
msgid ""
"You are carrying more than half your weight. You are unable to regain "
"health."
msgstr ""
#. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:275
+#: src/net/ea/playerhandler.cpp:436
msgid "You are carrying less than half your weight. You can regain health."
msgstr ""
+#. TRANSLATORS: char rename error
+#: src/net/eathena/charserverhandler.cpp:516
+#: src/net/eathena/charserverhandler.cpp:553
+msgid "Character rename error."
+msgstr ""
+
+#: src/net/eathena/charserverhandler.cpp:531
+msgid "Character renamed."
+msgstr ""
+
+#. TRANSLATORS: char rename error
+#: src/net/eathena/charserverhandler.cpp:544
+msgid "Rename not allowed."
+msgstr ""
+
+#. TRANSLATORS: char rename error
+#: src/net/eathena/charserverhandler.cpp:548
+msgid "New name is not set."
+msgstr ""
+
+#. TRANSLATORS: char rename error
+#: src/net/eathena/charserverhandler.cpp:557
+msgid "Character not found."
+msgstr ""
+
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:125
+#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:124
#, c-format
msgid "Strength %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:127
+#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:126
#, c-format
msgid "Agility %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:129
+#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:128
#, c-format
msgid "Vitality %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:131
+#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:130
#, c-format
msgid "Intelligence %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:128 src/net/tmwa/generalhandler.cpp:133
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:132
#, c-format
msgid "Dexterity %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:135
+#: src/net/eathena/generalhandler.cpp:128 src/net/tmwa/generalhandler.cpp:134
#, c-format
msgid "Luck %s"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:152 src/net/tmwa/generalhandler.cpp:161
+#: src/net/eathena/generalhandler.cpp:159 src/net/tmwa/generalhandler.cpp:160
msgid "Authentication failed."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:155 src/net/tmwa/generalhandler.cpp:165
+#: src/net/eathena/generalhandler.cpp:162 src/net/tmwa/generalhandler.cpp:164
msgid "No servers available."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:160 src/net/tmwa/generalhandler.cpp:171
+#: src/net/eathena/generalhandler.cpp:167 src/net/tmwa/generalhandler.cpp:170
msgid "Someone else is trying to use this account."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:165 src/net/tmwa/generalhandler.cpp:177
+#: src/net/eathena/generalhandler.cpp:172 src/net/tmwa/generalhandler.cpp:176
msgid "This account is already logged in."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:169 src/net/tmwa/generalhandler.cpp:182
+#: src/net/eathena/generalhandler.cpp:176 src/net/tmwa/generalhandler.cpp:181
msgid "Speed hack detected."
msgstr ""
+#: src/net/eathena/generalhandler.cpp:179
+msgid "Server full."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:182
+msgid "Sorry, you are underaged."
+msgstr ""
+
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:172 src/net/tmwa/generalhandler.cpp:186
+#: src/net/eathena/generalhandler.cpp:185 src/net/tmwa/generalhandler.cpp:185
msgid "Duplicated login."
msgstr ""
+#: src/net/eathena/generalhandler.cpp:188
+msgid "To many connections from same ip."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:191
+msgid "Not paid for this time."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:194
+msgid "Pay suspended."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:197
+msgid "Pay changed."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:200
+msgid "Pay wrong ip."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:203
+msgid "Pay game room."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:206
+msgid "Disconnect forced by GM."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:210
+msgid "Ban japan refuse."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:213
+msgid "Remained other account."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:216
+msgid "Ip unfair."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:219
+msgid "Ip count all."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:222
+msgid "Ip count."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:226
+msgid "Memory."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:229
+msgid "Han valid."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:232
+msgid "Ip limited access."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:235
+msgid "Over characters list."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:238
+msgid "Ip blocked."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:241
+msgid "Invalid password count."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:244
+msgid "Not allowed race."
+msgstr ""
+
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:175 src/net/tmwa/generalhandler.cpp:190
+#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:189
msgid "Unknown connection error."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:280
+#: src/net/eathena/generalhandler.cpp:323 src/net/tmwa/generalhandler.cpp:279
msgid "Got disconnected from server!"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:282 src/net/tmwa/generalhandler.cpp:308
+#: src/net/eathena/generalhandler.cpp:348 src/net/tmwa/generalhandler.cpp:307
msgid "Strength"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:310
+#: src/net/eathena/generalhandler.cpp:349 src/net/tmwa/generalhandler.cpp:309
msgid "Agility"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:284 src/net/tmwa/generalhandler.cpp:312
+#: src/net/eathena/generalhandler.cpp:350 src/net/tmwa/generalhandler.cpp:311
msgid "Vitality"
msgstr ""
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:285 src/net/tmwa/generalhandler.cpp:314
+#: src/net/eathena/generalhandler.cpp:352 src/net/tmwa/generalhandler.cpp:314
msgid "Intelligence"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:286 src/net/tmwa/generalhandler.cpp:316
+#: src/net/eathena/generalhandler.cpp:353 src/net/tmwa/generalhandler.cpp:316
msgid "Dexterity"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:287 src/net/tmwa/generalhandler.cpp:318
+#: src/net/eathena/generalhandler.cpp:354 src/net/tmwa/generalhandler.cpp:318
msgid "Luck"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:290 src/net/tmwa/generalhandler.cpp:323
+#: src/net/eathena/generalhandler.cpp:357 src/net/tmwa/generalhandler.cpp:322
msgid "Defense"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:291 src/net/tmwa/generalhandler.cpp:325
+#: src/net/eathena/generalhandler.cpp:358 src/net/tmwa/generalhandler.cpp:324
msgid "M.Attack"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:292 src/net/tmwa/generalhandler.cpp:327
+#: src/net/eathena/generalhandler.cpp:359 src/net/tmwa/generalhandler.cpp:326
msgid "M.Defense"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:294 src/net/tmwa/generalhandler.cpp:330
+#: src/net/eathena/generalhandler.cpp:361 src/net/tmwa/generalhandler.cpp:329
#, no-c-format
msgid "% Accuracy"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:296 src/net/tmwa/generalhandler.cpp:333
+#: src/net/eathena/generalhandler.cpp:363 src/net/tmwa/generalhandler.cpp:332
#, no-c-format
msgid "% Evade"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:298 src/net/tmwa/generalhandler.cpp:336
+#: src/net/eathena/generalhandler.cpp:365 src/net/tmwa/generalhandler.cpp:335
#, no-c-format
msgid "% Critical"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:299 src/net/tmwa/generalhandler.cpp:338
+#: src/net/eathena/generalhandler.cpp:366 src/net/tmwa/generalhandler.cpp:337
msgid "Attack Delay"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:300 src/net/tmwa/generalhandler.cpp:340
+#: src/net/eathena/generalhandler.cpp:367 src/net/tmwa/generalhandler.cpp:339
msgid "Walk Delay"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:301 src/net/tmwa/generalhandler.cpp:342
+#: src/net/eathena/generalhandler.cpp:368 src/net/tmwa/generalhandler.cpp:341
msgid "Attack Range"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:302 src/net/tmwa/generalhandler.cpp:344
+#: src/net/eathena/generalhandler.cpp:369 src/net/tmwa/generalhandler.cpp:343
msgid "Damage per sec."
msgstr ""
-#: src/net/eathena/skillhandler.cpp:228 src/net/eathena/skillhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:370
+msgid "Karma"
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:371
+msgid "Manner"
+msgstr ""
+
+#: src/net/eathena/skillhandler.cpp:304 src/net/eathena/skillhandler.cpp:364
#, c-format
msgid "Unknown skill error: %d"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:235 src/net/tmwa/skillhandler.cpp:224
+#: src/net/eathena/skillhandler.cpp:311 src/net/tmwa/skillhandler.cpp:224
msgid "You have not yet reached a high enough lvl!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:239 src/net/tmwa/skillhandler.cpp:228
+#: src/net/eathena/skillhandler.cpp:315 src/net/tmwa/skillhandler.cpp:228
msgid "Insufficient HP!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:243 src/net/tmwa/skillhandler.cpp:232
+#: src/net/eathena/skillhandler.cpp:319 src/net/tmwa/skillhandler.cpp:232
msgid "Insufficient SP!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:247 src/net/tmwa/skillhandler.cpp:236
+#: src/net/eathena/skillhandler.cpp:323 src/net/tmwa/skillhandler.cpp:236
msgid "You have no memos!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:251 src/net/tmwa/skillhandler.cpp:240
+#: src/net/eathena/skillhandler.cpp:327 src/net/tmwa/skillhandler.cpp:240
msgid "You cannot do that right now!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:255 src/net/tmwa/skillhandler.cpp:244
+#: src/net/eathena/skillhandler.cpp:331 src/net/tmwa/skillhandler.cpp:244
msgid "Seems you need more money... ;-)"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:259 src/net/tmwa/skillhandler.cpp:248
+#: src/net/eathena/skillhandler.cpp:335 src/net/tmwa/skillhandler.cpp:248
msgid "You cannot use this skill with that kind of weapon!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:264 src/net/tmwa/skillhandler.cpp:253
+#: src/net/eathena/skillhandler.cpp:340 src/net/tmwa/skillhandler.cpp:253
msgid "You need another red gem!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:268 src/net/tmwa/skillhandler.cpp:257
+#: src/net/eathena/skillhandler.cpp:344 src/net/tmwa/skillhandler.cpp:257
msgid "You need another blue gem!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:272 src/net/tmwa/skillhandler.cpp:261
+#: src/net/eathena/skillhandler.cpp:348 src/net/tmwa/skillhandler.cpp:261
msgid "You're carrying to much to do this!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:276 src/net/tmwa/skillhandler.cpp:265
+#: src/net/eathena/skillhandler.cpp:352 src/net/tmwa/skillhandler.cpp:265
msgid "Huh? What's that?"
msgstr ""
@@ -7866,32 +8018,32 @@ msgid "%s wants to trade with you, do you accept?"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:349
+#: src/net/tmwa/charserverhandler.cpp:351
msgid "Strength:"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:351
+#: src/net/tmwa/charserverhandler.cpp:353
msgid "Agility:"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:353
+#: src/net/tmwa/charserverhandler.cpp:355
msgid "Vitality:"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:355
+#: src/net/tmwa/charserverhandler.cpp:357
msgid "Intelligence:"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:357
+#: src/net/tmwa/charserverhandler.cpp:359
msgid "Dexterity:"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:359
+#: src/net/tmwa/charserverhandler.cpp:361
msgid "Luck:"
msgstr ""
@@ -8202,269 +8354,306 @@ msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:143
+msgid "You cant left party on this map."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:147
+msgid "You was kicked from party."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:151
+msgid "You cant be kicked kicked from party on this map."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:155
#, c-format
msgid "%s has joined your party."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:147
+#: src/resources/notifications.h:159
#, c-format
msgid "%s is already a member of a party."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:151
+#: src/resources/notifications.h:163
#, c-format
msgid "%s refused your invitation."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:155
+#: src/resources/notifications.h:167
#, c-format
msgid "%s is now a member of your party."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:159
+#: src/resources/notifications.h:171
#, c-format
msgid "%s can't join your party because party is full."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:163
+#: src/resources/notifications.h:175
#, c-format
msgid "QQQ Unknown invite response for %s."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:191
+#: src/resources/notifications.h:203
#, c-format
msgid "%s has left your party."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:195
+#: src/resources/notifications.h:207 src/resources/notifications.h:215
+#, c-format
+msgid "%s cant be kicked from party on this map."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:211
+#, c-format
+msgid "%s has kicked from your party."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:219
#, c-format
msgid "An unknown member tried to say: %s"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:199
+#: src/resources/notifications.h:223
#, c-format
msgid "%s is not in your party!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:203
+#: src/resources/notifications.h:227
#, c-format
msgid "You picked up %s."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:207
+#: src/resources/notifications.h:231
#, c-format
msgid "You spent %s."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:211
+#: src/resources/notifications.h:235
msgid "Cannot raise skill!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:215
+#: src/resources/notifications.h:239
msgid "Equip ammunition first."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:219
+#: src/resources/notifications.h:243
#, c-format
msgid "Trading with %s isn't possible. Trade partner is too far away."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:224
+#: src/resources/notifications.h:248
#, c-format
msgid "Trading with %s isn't possible. Character doesn't exist."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:228
+#: src/resources/notifications.h:252
msgid "Trade cancelled due to an unknown reason."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:232
+#: src/resources/notifications.h:256
#, c-format
msgid "Trade with %s cancelled."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:236
+#: src/resources/notifications.h:260
#, c-format
msgid "Unhandled trade cancel packet with %s"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:240
+#: src/resources/notifications.h:264
msgid "Failed adding item. Trade partner is over weighted."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:244
+#: src/resources/notifications.h:268
msgid "Failed adding item. Trade partner has no free slot."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:248
+#: src/resources/notifications.h:272
msgid "Failed adding item. You can't trade this item."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:252
+#: src/resources/notifications.h:276
msgid "Failed adding item for unknown reason."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:256
+#: src/resources/notifications.h:280
msgid "Trade canceled."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:260
+#: src/resources/notifications.h:284
msgid "Trade completed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:264
+#: src/resources/notifications.h:288
msgid "Kick failed!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:268
+#: src/resources/notifications.h:292
msgid "Kick succeeded!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:272
+#: src/resources/notifications.h:296
#, c-format
msgid "MVP player: %s"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:276
+#: src/resources/notifications.h:300
msgid "All whispers ignored."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:280
+#: src/resources/notifications.h:304
msgid "All whispers ignore failed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:284
+#: src/resources/notifications.h:308
msgid "All whispers unignored."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:288
+#: src/resources/notifications.h:312
msgid "All whispers unignore failed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:295
+#: src/resources/notifications.h:319
msgid "pvp off, gvg off"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:299
+#: src/resources/notifications.h:323
msgid "pvp on"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:303
+#: src/resources/notifications.h:327
msgid "gvg on"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:307
+#: src/resources/notifications.h:331
msgid "pvp on, gvg on"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:311
+#: src/resources/notifications.h:335
msgid "unknown pvp"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:315
+#: src/resources/notifications.h:339
#, c-format
msgid "Char from account %s is already in your party!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:319
+#: src/resources/notifications.h:343
#, c-format
msgid "%s blocked invite!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:323
+#: src/resources/notifications.h:347
msgid "Char is not online!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:327
+#: src/resources/notifications.h:351
msgid "Pet catch failed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:331
+#: src/resources/notifications.h:355
msgid "Pet catched."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:335
+#: src/resources/notifications.h:359
#, c-format
msgid "Pet catch unkown error: %d."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:339
+#: src/resources/notifications.h:363
msgid "Your mercenary duty hour is over."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:343
+#: src/resources/notifications.h:367
msgid "Your mercenary was killed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:347
+#: src/resources/notifications.h:371
msgid "Your mercenary was fired."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:351
+#: src/resources/notifications.h:375
msgid "Your mercenary run away."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:355
+#: src/resources/notifications.h:379
msgid "Mercenary unknown state."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:359
-msgid "Your feed your homunculus."
+#: src/resources/notifications.h:383
+msgid "You feed your homunculus."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:363
+#: src/resources/notifications.h:387
#, c-format
msgid "You cant feed homunculus, because not have %s."
msgstr ""
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:391
+msgid "Card insert failed."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:395
+msgid "Card inserted."
+msgstr ""
+
#. TRANSLATORS: chat option changed message
#: src/utils/booleanoptions.h:27
#, c-format
diff --git a/po/manaplus.pot b/po/manaplus.pot
index f494f8754..09e13be65 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: 2014-10-08 01:19+0300\n"
+"POT-Creation-Date: 2014-10-10 00:16+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"
@@ -5865,7 +5865,7 @@ msgstr ""
#. TRANSLATORS: shop window dialog
#. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:776 src/net/ea/tradehandler.cpp:233
+#: src/gui/windows/shopwindow.cpp:776 src/net/ea/tradehandler.cpp:192
msgid "Request for Trade"
msgstr ""
@@ -7515,19 +7515,19 @@ msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:191
+#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:207
msgid "Item sharing enabled."
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:195
+#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:211
msgid "Item sharing disabled."
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:199
+#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:215
msgid "Item sharing not possible."
msgstr ""
@@ -7538,19 +7538,19 @@ msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:179
+#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:195
msgid "Experience sharing enabled."
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:183
+#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:199
msgid "Experience sharing disabled."
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:187
+#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:203
msgid "Experience sharing not possible."
msgstr ""
@@ -8007,13 +8007,13 @@ msgid "Huh? What's that?"
msgstr ""
#. TRANSLATORS: trade header
-#: src/net/ea/tradehandler.cpp:100
+#: src/net/ea/tradehandler.cpp:105
#, c-format
msgid "Trade: You and %s"
msgstr ""
#. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:235
+#: src/net/ea/tradehandler.cpp:194
#, c-format
msgid "%s wants to trade with you, do you accept?"
msgstr ""
@@ -8232,426 +8232,452 @@ msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:47
-msgid "Nothing to sell."
+msgid "Unable to buy. You not have enought money."
msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:51
-msgid "Thanks for selling."
+msgid "Unable to buy. You overweight."
msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:55
-msgid "Unable to sell."
+msgid "Unable to buy. You have too many items."
msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:59
-msgid "Unable to sell while trading."
+msgid "Nothing to sell."
msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:63
-msgid "Unable to sell unsellable item."
+msgid "Thanks for selling."
msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:67
+msgid "Unable to sell."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:71
+msgid "Unable to sell while trading."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:75
+msgid "Unable to sell unsellable item."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:79
#, c-format
msgid "Online users: %d"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:71
+#: src/resources/notifications.h:83
msgid "Guild created."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:75
+#: src/resources/notifications.h:87
msgid "You are already in guild."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:79
+#: src/resources/notifications.h:91
msgid "Emperium check failed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:83
+#: src/resources/notifications.h:95
msgid "Unknown server response."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:87
+#: src/resources/notifications.h:99
msgid "You have left the guild."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:91
+#: src/resources/notifications.h:103
msgid "Could not invite user to guild."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:95
+#: src/resources/notifications.h:107
msgid "User rejected guild invite."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:99
+#: src/resources/notifications.h:111
msgid "User is now part of your guild."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:103
+#: src/resources/notifications.h:115
msgid "Your guild is full."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:107
+#: src/resources/notifications.h:119
msgid "Unknown guild invite response."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:111
+#: src/resources/notifications.h:123
#, c-format
msgid "%s has left your guild."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:115
+#: src/resources/notifications.h:127
msgid "You were kicked from guild."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:119
+#: src/resources/notifications.h:131
#, c-format
msgid "%s has kicked from your guild."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:123
+#: src/resources/notifications.h:135
msgid "Failed to use item."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:127
+#: src/resources/notifications.h:139
msgid "Unable to equip."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:131
+#: src/resources/notifications.h:143
+msgid "Unable to equip because you have wrong level."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:147
msgid "Could not create party."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:135
+#: src/resources/notifications.h:151
msgid "Party successfully created."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:139
+#: src/resources/notifications.h:155
msgid "You have left the party."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:143
+#: src/resources/notifications.h:159
msgid "You cant left party on this map."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:147
+#: src/resources/notifications.h:163
msgid "You was kicked from party."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:151
-msgid "You cant be kicked kicked from party on this map."
+#: src/resources/notifications.h:167
+msgid "You cant be kicked from party on this map."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:155
+#: src/resources/notifications.h:171
#, c-format
msgid "%s has joined your party."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:159
+#: src/resources/notifications.h:175
#, c-format
msgid "%s is already a member of a party."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:163
+#: src/resources/notifications.h:179
#, c-format
msgid "%s refused your invitation."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:167
+#: src/resources/notifications.h:183
#, c-format
msgid "%s is now a member of your party."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:171
+#: src/resources/notifications.h:187
#, c-format
msgid "%s can't join your party because party is full."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:175
+#: src/resources/notifications.h:191
#, c-format
msgid "QQQ Unknown invite response for %s."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:203
+#: src/resources/notifications.h:219
#, c-format
msgid "%s has left your party."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:207 src/resources/notifications.h:215
+#: src/resources/notifications.h:223 src/resources/notifications.h:231
#, c-format
msgid "%s cant be kicked from party on this map."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:211
+#: src/resources/notifications.h:227
#, c-format
msgid "%s has kicked from your party."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:219
+#: src/resources/notifications.h:235
#, c-format
msgid "An unknown member tried to say: %s"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:223
+#: src/resources/notifications.h:239
#, c-format
msgid "%s is not in your party!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:227
+#: src/resources/notifications.h:243
#, c-format
msgid "You picked up %s."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:231
+#: src/resources/notifications.h:247
#, c-format
msgid "You spent %s."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:235
+#: src/resources/notifications.h:251
msgid "Cannot raise skill!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:239
+#: src/resources/notifications.h:255
msgid "Equip ammunition first."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:243
+#: src/resources/notifications.h:259
#, c-format
msgid "Trading with %s isn't possible. Trade partner is too far away."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:248
+#: src/resources/notifications.h:264
#, c-format
msgid "Trading with %s isn't possible. Character doesn't exist."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:252
+#: src/resources/notifications.h:268
msgid "Trade cancelled due to an unknown reason."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:256
+#: src/resources/notifications.h:272
#, c-format
msgid "Trade with %s cancelled."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:260
+#: src/resources/notifications.h:276
+#, c-format
+msgid "Trade with %s cancelled, because player is busy"
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:280
#, c-format
msgid "Unhandled trade cancel packet with %s"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:264
+#: src/resources/notifications.h:284
msgid "Failed adding item. Trade partner is over weighted."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:268
+#: src/resources/notifications.h:288
msgid "Failed adding item. Trade partner has no free slot."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:272
+#: src/resources/notifications.h:292
msgid "Failed adding item. You can't trade this item."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:276
+#: src/resources/notifications.h:296
msgid "Failed adding item for unknown reason."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:280
+#: src/resources/notifications.h:300
msgid "Trade canceled."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:284
+#: src/resources/notifications.h:304
msgid "Trade completed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:288
+#: src/resources/notifications.h:308
msgid "Kick failed!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:292
+#: src/resources/notifications.h:312
msgid "Kick succeeded!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:296
+#: src/resources/notifications.h:316
#, c-format
msgid "MVP player: %s"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:300
+#: src/resources/notifications.h:320
msgid "All whispers ignored."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:304
+#: src/resources/notifications.h:324
msgid "All whispers ignore failed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:308
+#: src/resources/notifications.h:328
msgid "All whispers unignored."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:312
+#: src/resources/notifications.h:332
msgid "All whispers unignore failed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:319
+#: src/resources/notifications.h:339
msgid "pvp off, gvg off"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:323
+#: src/resources/notifications.h:343
msgid "pvp on"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:327
+#: src/resources/notifications.h:347
msgid "gvg on"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:331
+#: src/resources/notifications.h:351
msgid "pvp on, gvg on"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:335
+#: src/resources/notifications.h:355
msgid "unknown pvp"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:339
+#: src/resources/notifications.h:359
#, c-format
msgid "Char from account %s is already in your party!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:343
+#: src/resources/notifications.h:363
#, c-format
msgid "%s blocked invite!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:347
+#: src/resources/notifications.h:367
msgid "Char is not online!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:351
+#: src/resources/notifications.h:371
msgid "Pet catch failed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:355
+#: src/resources/notifications.h:375
msgid "Pet catched."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:359
+#: src/resources/notifications.h:379
#, c-format
msgid "Pet catch unkown error: %d."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:363
+#: src/resources/notifications.h:383
msgid "Your mercenary duty hour is over."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:367
+#: src/resources/notifications.h:387
msgid "Your mercenary was killed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:371
+#: src/resources/notifications.h:391
msgid "Your mercenary was fired."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:375
+#: src/resources/notifications.h:395
msgid "Your mercenary run away."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:379
+#: src/resources/notifications.h:399
msgid "Mercenary unknown state."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:383
+#: src/resources/notifications.h:403
msgid "You feed your homunculus."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:387
+#: src/resources/notifications.h:407
#, c-format
msgid "You cant feed homunculus, because not have %s."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:391
+#: src/resources/notifications.h:411
msgid "Card insert failed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:395
+#: src/resources/notifications.h:415
msgid "Card inserted."
msgstr ""
diff --git a/po/nb.po b/po/nb.po
index 0571505db..851ad6ee1 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-27 13:23+0300\n"
-"PO-Revision-Date: 2014-09-28 10:01+0000\n"
+"POT-Creation-Date: 2014-10-08 01:19+0300\n"
+"PO-Revision-Date: 2014-10-08 10:01+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/manaplus/language/nb/)\n"
"MIME-Version: 1.0\n"
@@ -32,7 +32,7 @@ msgstr ""
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:131 src/client.cpp:1463 src/client.cpp:1490
+#: src/actions/actions.cpp:131 src/client.cpp:1461 src/client.cpp:1488
#: src/gamemodifiers.cpp:423 src/gui/widgets/tabs/setup_input.cpp:163
#: src/gui/widgets/tabs/setup_theme.cpp:312
#: src/gui/widgets/tabs/setup_theme.cpp:343
@@ -43,8 +43,8 @@ msgstr ""
#: src/gui/windows/changeemaildialog.cpp:170
#: src/gui/windows/changepassworddialog.cpp:160
#: src/gui/windows/charcreatedialog.cpp:373
-#: src/gui/windows/charselectdialog.cpp:255
-#: src/gui/windows/charselectdialog.cpp:291 src/gui/windows/editdialog.cpp:49
+#: src/gui/windows/charselectdialog.cpp:277
+#: src/gui/windows/charselectdialog.cpp:313 src/gui/windows/editdialog.cpp:49
#: src/gui/windows/editserverdialog.cpp:61
#: src/gui/windows/editserverdialog.cpp:208
#: src/gui/windows/itemamountwindow.cpp:158 src/gui/windows/quitdialog.cpp:70
@@ -52,7 +52,9 @@ msgstr ""
#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
#: src/net/ea/charserverhandler.cpp:143 src/net/ea/charserverhandler.cpp:162
#: src/net/ea/charserverhandler.cpp:175 src/net/ea/gamehandler.cpp:79
-#: src/net/ea/playerhandler.cpp:263 src/net/ea/playerhandler.cpp:279
+#: src/net/ea/playerhandler.cpp:424 src/net/ea/playerhandler.cpp:440
+#: src/net/eathena/charserverhandler.cpp:533
+#: src/net/eathena/charserverhandler.cpp:563
msgid "OK"
msgstr "OK"
@@ -176,7 +178,7 @@ msgstr ""
#. TRANSLATORS: party invite message
#. TRANSLATORS: change relation
-#: src/actions/chat.cpp:303 src/actions/commands.cpp:65
+#: src/actions/chat.cpp:303 src/actions/commands.cpp:64
msgid "Please specify a name."
msgstr ""
@@ -199,75 +201,75 @@ msgid "Message now closes chat."
msgstr ""
#. TRANSLATORS: change relation
-#: src/actions/commands.cpp:108
+#: src/actions/commands.cpp:107
#, c-format
msgid "Player already %s!"
msgstr ""
#. TRANSLATORS: change relation
-#: src/actions/commands.cpp:120
+#: src/actions/commands.cpp:119
#, c-format
msgid "Player successfully %s!"
msgstr ""
#. TRANSLATORS: change relation
-#: src/actions/commands.cpp:122
+#: src/actions/commands.cpp:121
#, c-format
msgid "Player could not be %s!"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:153
+#: src/actions/commands.cpp:152
msgid "Player wasn't ignored!"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:162
+#: src/actions/commands.cpp:161
msgid "Player no longer ignored!"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:164
+#: src/actions/commands.cpp:163
msgid "Player could not be unignored!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/actions/commands.cpp:179
+#: src/actions/commands.cpp:178
msgid "Player already erased!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/actions/commands.cpp:192
+#: src/actions/commands.cpp:191
msgid "Player no longer erased!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/actions/commands.cpp:194
+#: src/actions/commands.cpp:193
msgid "Player could not be erased!"
msgstr ""
#. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:201
+#: src/actions/commands.cpp:200
msgid "friend"
msgstr ""
#. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:208
+#: src/actions/commands.cpp:207
msgid "disregarded"
msgstr ""
#. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:215
+#: src/actions/commands.cpp:214
msgid "neutral"
msgstr ""
#. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:222
+#: src/actions/commands.cpp:221
msgid "blacklisted"
msgstr ""
#. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:229
+#: src/actions/commands.cpp:228
msgid "enemy"
msgstr ""
@@ -282,77 +284,77 @@ msgid "Accepting incoming trade requests"
msgstr ""
#. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1306
+#: src/actormanager.cpp:1310
msgid "Visible on map"
msgstr ""
#. TRANSLATORS: default race name
-#: src/being/being.cpp:389
+#: src/being/being.cpp:393
msgid "Human"
msgstr ""
-#: src/being/being.cpp:556
+#: src/being/being.cpp:560
msgid "dodge"
msgstr ""
-#: src/being/being.cpp:556
+#: src/being/being.cpp:560
msgid "miss"
msgstr ""
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1865 src/gui/windows/whoisonline.cpp:855
+#: src/being/being.cpp:1869 src/gui/windows/whoisonline.cpp:855
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1870 src/gui/windows/whoisonline.cpp:860
+#: src/being/being.cpp:1874 src/gui/windows/whoisonline.cpp:860
msgid "I"
msgstr ""
#. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:379
+#: src/being/localplayer.cpp:380
#, c-format
msgid "You were killed by %s"
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:824
+#: src/being/localplayer.cpp:825
msgid "Tried to pick up nonexistent item."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:828
+#: src/being/localplayer.cpp:829
msgid "Item is too heavy."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:832
+#: src/being/localplayer.cpp:833
msgid "Item is too far away."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:836
+#: src/being/localplayer.cpp:837
msgid "Inventory is full."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:840
+#: src/being/localplayer.cpp:841
msgid "Stack is too big."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:844
+#: src/being/localplayer.cpp:845
msgid "Item belongs to someone else."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:848
+#: src/being/localplayer.cpp:849
msgid "Unknown problem picking up item."
msgstr ""
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:872
+#: src/being/localplayer.cpp:873
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -361,43 +363,43 @@ msgstr[1] ""
#. TRANSLATORS: this is normal experience
#. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1054 src/being/localplayer.cpp:1055
-#: src/being/localplayer.cpp:1091
+#: src/being/localplayer.cpp:1055 src/being/localplayer.cpp:1056
+#: src/being/localplayer.cpp:1092
msgid "xp"
msgstr ""
#. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1059 src/being/localplayer.cpp:1065
-#: src/being/localplayer.cpp:1071
+#: src/being/localplayer.cpp:1060 src/being/localplayer.cpp:1066
+#: src/being/localplayer.cpp:1072
msgid "job"
msgstr ""
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2794
+#: src/being/localplayer.cpp:2795
#, c-format
msgid "Follow: %s"
msgstr ""
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2800 src/being/localplayer.cpp:2825
+#: src/being/localplayer.cpp:2801 src/being/localplayer.cpp:2826
msgid "Follow canceled"
msgstr ""
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2810
+#: src/being/localplayer.cpp:2811
#, c-format
msgid "Imitation: %s"
msgstr ""
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2816 src/being/localplayer.cpp:2830
+#: src/being/localplayer.cpp:2817 src/being/localplayer.cpp:2831
msgid "Imitation canceled"
msgstr ""
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3180
+#: src/being/localplayer.cpp:3181
#, c-format
msgid "You see %s"
msgstr ""
@@ -435,37 +437,37 @@ msgstr ""
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:920 src/gui/windowmenu.cpp:162
+#: src/client.cpp:918 src/gui/windowmenu.cpp:162
#: src/gui/windows/setupwindow.cpp:62
msgid "Setup"
msgstr ""
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:923 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:921 src/gui/widgets/tabs/setup_perfomance.cpp:54
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:926 src/gui/widgets/tabs/setup_video.cpp:105
+#: src/client.cpp:924 src/gui/widgets/tabs/setup_video.cpp:105
msgid "Video"
msgstr "Video"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:929 src/gui/widgets/tabs/setup_theme.cpp:122
+#: src/client.cpp:927 src/gui/widgets/tabs/setup_theme.cpp:122
msgid "Theme"
msgstr ""
#. TRANSLATORS: theme tab quick button
-#: src/client.cpp:932
+#: src/client.cpp:930
msgid "About"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:935 src/gui/windowmenu.cpp:74
+#: src/client.cpp:933 src/gui/windowmenu.cpp:74
#: src/gui/windows/helpwindow.cpp:53
msgid "Help"
msgstr "Hjelp"
@@ -481,42 +483,42 @@ msgstr "Hjelp"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:939 src/client.cpp:1391 src/client.cpp:1405
+#: src/client.cpp:937 src/client.cpp:1389 src/client.cpp:1403
#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:691
#: src/gui/popups/popupmenu.cpp:923 src/gui/windows/didyouknowwindow.cpp:81
#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:74
#: src/gui/windows/npcdialog.cpp:112 src/gui/windows/questswindow.cpp:77
-#: src/gui/windows/shopwindow.cpp:84
+#: src/gui/windows/shopwindow.cpp:83
msgid "Close"
msgstr "Lukk"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1065
+#: src/client.cpp:1063
msgid "Connecting to server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1113
+#: src/client.cpp:1111
msgid "Logging in"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1156
+#: src/client.cpp:1154
msgid "Entering game world"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1282
+#: src/client.cpp:1280
msgid "Requesting characters"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1322
+#: src/client.cpp:1320
msgid "Connecting to the game server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1334
+#: src/client.cpp:1332
msgid "Changing game servers"
msgstr ""
@@ -530,72 +532,76 @@ msgstr ""
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1389 src/client.cpp:1403 src/client.cpp:1598
+#. TRANSLATORS: info message
+#. TRANSLATORS: ok dialog button
+#: src/client.cpp:1387 src/client.cpp:1401 src/client.cpp:1596
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
#: src/gui/windows/charcreatedialog.cpp:369
-#: src/gui/windows/charselectdialog.cpp:289
+#: src/gui/windows/charselectdialog.cpp:311
#: src/gui/windows/editserverdialog.cpp:203
#: src/gui/windows/registerdialog.cpp:245
#: src/gui/windows/unregisterdialog.cpp:146
#: src/net/ea/charserverhandler.cpp:141 src/net/ea/charserverhandler.cpp:173
+#: src/net/eathena/charserverhandler.cpp:516
+#: src/net/eathena/charserverhandler.cpp:518
msgid "Error"
msgstr "Feil"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1418
+#: src/client.cpp:1416
msgid "Requesting registration details"
msgstr ""
#. TRANSLATORS: password change message header
-#: src/client.cpp:1459
+#: src/client.cpp:1457
msgid "Password Change"
msgstr ""
#. TRANSLATORS: password change message text
-#: src/client.cpp:1461
+#: src/client.cpp:1459
msgid "Password changed successfully!"
msgstr ""
#. TRANSLATORS: email change message header
-#: src/client.cpp:1486
+#: src/client.cpp:1484
msgid "Email Change"
msgstr ""
#. TRANSLATORS: email change message text
-#: src/client.cpp:1488
+#: src/client.cpp:1486
msgid "Email changed successfully!"
msgstr ""
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1515
+#: src/client.cpp:1513
msgid "Unregister Successful"
msgstr ""
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1517
+#: src/client.cpp:1515
msgid "Farewell, come back any time..."
msgstr ""
#. TRANSLATORS: directory creation error
#: src/configmanager.cpp:53 src/dirs.cpp:260 src/dirs.cpp:275 src/dirs.cpp:320
-#: src/dirs.cpp:481 src/dirs.cpp:489
+#: src/dirs.cpp:488 src/dirs.cpp:496
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:363
+#: src/dirs.cpp:370
#, c-format
msgid "Invalid update host: %s."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:404 src/dirs.cpp:411
+#: src/dirs.cpp:411 src/dirs.cpp:418
msgid "Error creating updates directory!"
msgstr ""
-#: src/dirs.cpp:433 src/dirs.cpp:451
+#: src/dirs.cpp:440 src/dirs.cpp:458
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
@@ -613,36 +619,36 @@ msgid "dyecmd srcdyestring dstfile"
msgstr ""
#. TRANSLATORS: chat tab header
-#: src/game.cpp:236 src/gui/widgets/tabs/chattab.cpp:482
+#: src/game.cpp:234 src/gui/widgets/tabs/chattab.cpp:482
msgid "General"
msgstr "Generelt"
#. TRANSLATORS: chat tab header
#. TRANSLATORS: full button name
#. TRANSLATORS: debug window name
-#: src/game.cpp:253 src/gui/widgets/tabs/chattab.cpp:484
+#: src/game.cpp:251 src/gui/widgets/tabs/chattab.cpp:484
#: src/gui/windowmenu.cpp:149 src/gui/windows/debugwindow.cpp:42
msgid "Debug"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:541
+#: src/game.cpp:532
#, c-format
msgid "Screenshot saved as %s"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:551
+#: src/game.cpp:542
msgid "Saving screenshot failed!"
msgstr "Lagring av skjermbilde feilet!"
#. TRANSLATORS: error message text
-#: src/game.cpp:634
+#: src/game.cpp:625
msgid "The connection to the server was lost."
msgstr ""
#. TRANSLATORS: error message header
-#: src/game.cpp:637
+#: src/game.cpp:628
msgid "Network Error"
msgstr "Nettverksfeil"
@@ -1033,6 +1039,7 @@ msgstr ""
#: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
#: src/gui/widgets/tabs/setup_other.cpp:79
#: src/gui/widgets/tabs/setup_visual.cpp:81
+#: src/gui/windows/equipmentwindow.cpp:577
msgid "default"
msgstr ""
@@ -1523,7 +1530,7 @@ msgstr ""
#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:273
#: src/gui/popups/popupmenu.cpp:767 src/gui/widgets/skillinfo.cpp:113
#: src/gui/windows/botcheckerwindow.cpp:89 src/input/pages/basic.cpp:42
-#: src/net/eathena/generalhandler.cpp:289 src/net/tmwa/generalhandler.cpp:321
+#: src/net/eathena/generalhandler.cpp:356 src/net/tmwa/generalhandler.cpp:320
msgid "Attack"
msgstr ""
@@ -1692,7 +1699,7 @@ msgstr ""
#. TRANSLATORS: pet unequip item
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:340 src/gui/windows/equipmentwindow.cpp:70
+#: src/gui/popups/popupmenu.cpp:340 src/gui/windows/equipmentwindow.cpp:72
#: src/gui/windows/inventorywindow.cpp:175 src/resources/itemtypemapdata.h:47
#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
@@ -1750,7 +1757,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:574
+#: src/gui/popups/popupmenu.cpp:574 src/gui/windows/charselectdialog.cpp:132
msgid "Rename"
msgstr ""
@@ -2262,7 +2269,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
#. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:3000 src/net/ea/playerhandler.cpp:364
+#: src/gui/popups/popupmenu.cpp:3000 src/net/ea/playerhandler.cpp:195
msgid "Revive"
msgstr ""
@@ -2286,7 +2293,7 @@ msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: settings group
#. TRANSLATORS: full button name
-#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:319
+#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:315
#: src/gui/windowmenu.cpp:158
msgid "Windows"
msgstr ""
@@ -2314,7 +2321,7 @@ msgstr ""
#. TRANSLATORS: input action name
#: src/gui/setupinputpages.cpp:57 src/gui/widgets/tabs/setup_audio.cpp:151
#: src/gui/widgets/tabs/setup_chat.cpp:179
-#: src/gui/widgets/tabs/setup_other.cpp:341
+#: src/gui/widgets/tabs/setup_other.cpp:337
#: src/gui/widgets/tabs/setup_visual.cpp:192
#: src/gui/windows/charcreatedialog.cpp:119
#: src/gui/windows/registerdialog.cpp:106 src/input/pages/gui.cpp:87
@@ -2327,212 +2334,227 @@ msgid "Gui"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:113
+#: src/gui/userpalette.cpp:116
msgid "Being"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:115
+#: src/gui/userpalette.cpp:118
msgid "Friend names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:117
+#: src/gui/userpalette.cpp:120
msgid "Disregarded names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:119
+#: src/gui/userpalette.cpp:122
msgid "Ignored names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:121
+#: src/gui/userpalette.cpp:124
msgid "Erased names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:123
+#: src/gui/userpalette.cpp:126
msgid "Other players names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:125
+#: src/gui/userpalette.cpp:128
msgid "Own name"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:127
+#: src/gui/userpalette.cpp:130
msgid "GM names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:129
+#: src/gui/userpalette.cpp:132
msgid "NPCs"
msgstr "NPCer"
#. TRANSLATORS: palette color
#. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:131 src/gui/widgets/tabs/setup_other.cpp:108
+#: src/gui/userpalette.cpp:134 src/gui/widgets/tabs/setup_other.cpp:108
msgid "Monsters"
msgstr "Monstre"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:133
+#: src/gui/userpalette.cpp:136
msgid "Monster HP bar"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:139
msgid "Monster HP bar (second color)"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:138
+#: src/gui/userpalette.cpp:141
msgid "Party members"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:140
+#: src/gui/userpalette.cpp:143
msgid "Guild members"
msgstr ""
#. TRANSLATORS: palette color
#. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:142 src/gui/widgets/tabs/setup_visual.cpp:157
+#: src/gui/userpalette.cpp:145 src/gui/widgets/tabs/setup_visual.cpp:157
msgid "Particle effects"
msgstr "Partikkeleffekter"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:144
+#: src/gui/userpalette.cpp:147
msgid "Pickup notification"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:146
+#: src/gui/userpalette.cpp:149
msgid "Exp notification"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:148
+#: src/gui/userpalette.cpp:151
msgid "Player HP bar"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:152
+#: src/gui/userpalette.cpp:155
msgid "Player HP bar (second color)"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:154
+#: src/gui/userpalette.cpp:157
msgid "Player hits monster"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:156
+#: src/gui/userpalette.cpp:159
msgid "Monster hits player"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:160
+#: src/gui/userpalette.cpp:163
msgid "Other player hits local player"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:162
+#: src/gui/userpalette.cpp:165
msgid "Critical Hit"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:166
+#: src/gui/userpalette.cpp:169
msgid "Local player hits monster"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:169
+#: src/gui/userpalette.cpp:172
msgid "Local player critical hit"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:172
+#: src/gui/userpalette.cpp:175
msgid "Local player miss"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:174
+#: src/gui/userpalette.cpp:177
msgid "Misses"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:176
+#: src/gui/userpalette.cpp:179
msgid "Portal highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:179
+#: src/gui/userpalette.cpp:182
msgid "Default collision highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:182
+#: src/gui/userpalette.cpp:185
msgid "Air collision highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:185
+#: src/gui/userpalette.cpp:188
msgid "Water collision highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:188
+#: src/gui/userpalette.cpp:191
msgid "Special ground collision highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:191
+#: src/gui/userpalette.cpp:194
msgid "Walkable highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:194
+#: src/gui/userpalette.cpp:197
msgid "Local player attack range"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:197
+#: src/gui/userpalette.cpp:200
msgid "Local player attack range border"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:200
+#: src/gui/userpalette.cpp:203
msgid "Monster attack range"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:204
+#: src/gui/userpalette.cpp:207
msgid "Floor item amount color"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:207
+#: src/gui/userpalette.cpp:210
msgid "Home place"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:210
+#: src/gui/userpalette.cpp:213
msgid "Home place border"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:213
+#: src/gui/userpalette.cpp:216
msgid "Road point"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:216
+#: src/gui/userpalette.cpp:219
msgid "Tiles border"
msgstr ""
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:221
+msgid "Pets"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:223
+msgid "Mercenary"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:225
+msgid "Homunculus"
+msgstr ""
+
#: src/gui/widgets/characterdisplay.cpp:135
#, c-format
msgid "Level: %u"
@@ -2635,7 +2657,8 @@ msgid "Type: %s"
msgstr ""
#. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:108
+#. TRANSLATORS: unknown equipment page name
+#: src/gui/widgets/skillinfo.cpp:108 src/gui/windows/equipmentwindow.cpp:584
msgid "Unknown"
msgstr ""
@@ -2836,22 +2859,22 @@ msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:262
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:313
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:375
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:319
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:387
msgid "Target:"
msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:264
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:319
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:377
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:325
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:389
msgid "Target Id:"
msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:267
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:322
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:379
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:328
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:391
msgid "Target type:"
msgstr ""
@@ -2862,7 +2885,7 @@ msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:271
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:338
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:344
msgid "Target race:"
msgstr ""
@@ -2878,67 +2901,81 @@ msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:277
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:363
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:369
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:387
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:375
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:381
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:399
msgid "Attack delay:"
msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:279
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:350
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:389
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:356
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:401
msgid "Minimal hit:"
msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:281
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:353
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:391
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:359
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:403
msgid "Maximum hit:"
msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:283
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:356
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:393
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:362
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:405
msgid "Critical hit:"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:327
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:285
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:365
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:407
+msgid "Karma:"
+msgstr ""
+
+#. TRANSLATORS: debug window label
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:287
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:368
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:409
+msgid "Manner:"
+msgstr ""
+
+#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:333
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:381
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:339
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:393
msgid "Target Level:"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:341
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:383
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:347
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:395
msgid "Target Party:"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:345
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:385
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:351
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:397
msgid "Target Guild:"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:430
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:436
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:451
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:457
#, c-format
msgid "Ping: %s ms"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:439
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:460
#, c-format
msgid "In: %d bytes/s"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:442
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:463
#, c-format
msgid "Out: %d bytes/s"
msgstr ""
@@ -3767,137 +3804,132 @@ msgstr ""
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_other.cpp:294
-msgid "Enable auction bot support"
-msgstr ""
-
-#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:298
msgid "Enable guild bot support and disable native guild support"
msgstr ""
#. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:304
+#: src/gui/widgets/tabs/setup_other.cpp:300
msgid "Keyboard"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:307
+#: src/gui/widgets/tabs/setup_other.cpp:303
msgid "Repeat delay"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:311
+#: src/gui/widgets/tabs/setup_other.cpp:307
msgid "Repeat interval"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:315
+#: src/gui/widgets/tabs/setup_other.cpp:311
msgid "Custom repeat interval"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:323
+#: src/gui/widgets/tabs/setup_other.cpp:319
msgid "Shortcut buttons"
msgstr ""
#. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:328
+#: src/gui/widgets/tabs/setup_other.cpp:324
msgid "Proxy server"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:332
+#: src/gui/widgets/tabs/setup_other.cpp:328
msgid "Proxy type"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:336
+#: src/gui/widgets/tabs/setup_other.cpp:332
msgid "Proxy address:port"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:344
+#: src/gui/widgets/tabs/setup_other.cpp:340
msgid "Enable server side attack"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:348
+#: src/gui/widgets/tabs/setup_other.cpp:344
msgid "Hide support page link on error"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:352
+#: src/gui/widgets/tabs/setup_other.cpp:348
msgid "Enable double clicks"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:356
+#: src/gui/widgets/tabs/setup_other.cpp:352
msgid "Enable bot checker"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:360
+#: src/gui/widgets/tabs/setup_other.cpp:356
msgid "Enable buggy servers protection (do not disable)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:365
+#: src/gui/widgets/tabs/setup_other.cpp:361
msgid "Enable debug log"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:369
+#: src/gui/widgets/tabs/setup_other.cpp:365
msgid "Ignore logging packets"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:373
+#: src/gui/widgets/tabs/setup_other.cpp:369
msgid "Enable OpenGL log"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:377
+#: src/gui/widgets/tabs/setup_other.cpp:373
msgid "Enable input log"
msgstr ""
#. TRANSLATORS: settings option
#. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_other.cpp:381 src/input/pages/other.cpp:362
+#: src/gui/widgets/tabs/setup_other.cpp:377 src/input/pages/other.cpp:362
msgid "Upload log file"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:385
+#: src/gui/widgets/tabs/setup_other.cpp:381
msgid "Low traffic mode"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:389
+#: src/gui/widgets/tabs/setup_other.cpp:385
msgid "Hide shield sprite"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:394
+#: src/gui/widgets/tabs/setup_other.cpp:390
msgid "Use FBO for screenshots (only for opengl)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:400
+#: src/gui/widgets/tabs/setup_other.cpp:396
msgid "Screenshot directory"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:405
+#: src/gui/widgets/tabs/setup_other.cpp:401
msgid "Network delay between sub servers"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:409
+#: src/gui/widgets/tabs/setup_other.cpp:405
msgid "Show background"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:414
+#: src/gui/widgets/tabs/setup_other.cpp:410
msgid "Screen density override"
msgstr ""
@@ -4128,9 +4160,9 @@ msgstr ""
#. TRANSLATORS: command editor button
#. TRANSLATORS: input action name
#: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:82
-#: src/gui/windows/serverdialog.cpp:125 src/gui/windows/shopwindow.cpp:101
-#: src/gui/windows/shopwindow.cpp:108 src/gui/windows/textcommandeditor.cpp:92
+#: src/gui/windows/charselectdialog.cpp:84
+#: src/gui/windows/serverdialog.cpp:125 src/gui/windows/shopwindow.cpp:100
+#: src/gui/windows/shopwindow.cpp:107 src/gui/windows/textcommandeditor.cpp:92
#: src/input/pages/gui.cpp:111
msgid "Delete"
msgstr "Slett"
@@ -4784,7 +4816,7 @@ msgstr ""
#. TRANSLATORS: equipment window name
#. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:63
+#: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:65
#: src/gui/windows/inventorywindow.cpp:196
msgid "Equipment"
msgstr "Utstyr"
@@ -4925,7 +4957,7 @@ msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: social window button
#: src/gui/windows/buydialog.cpp:260 src/gui/windows/charcreatedialog.cpp:127
-#: src/gui/windows/charselectdialog.cpp:578
+#: src/gui/windows/charselectdialog.cpp:605
#: src/gui/windows/socialwindow.cpp:86
msgid "Create"
msgstr "Lag"
@@ -4969,10 +5001,8 @@ msgstr ""
#. TRANSLATORS: change password window name
#. TRANSLATORS: change password dialog button
-#. TRANSLATORS: char select dialog. button.
#: src/gui/windows/changepassworddialog.cpp:51
#: src/gui/windows/changepassworddialog.cpp:57
-#: src/gui/windows/charselectdialog.cpp:73
msgid "Change Password"
msgstr "Endre passord"
@@ -5126,57 +5156,68 @@ msgid "Are you sure you want to delete this character?"
msgstr "Er du sikker på at du vil slette denne karakteren?"
#. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:64
+#: src/gui/windows/charselectdialog.cpp:66
#, c-format
msgid "Account %s (last login time %s)"
msgstr ""
#. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:71
-msgid "Switch Login"
+#: src/gui/windows/charselectdialog.cpp:73
+msgid "Switch"
+msgstr ""
+
+#. TRANSLATORS: char select dialog. button.
+#: src/gui/windows/charselectdialog.cpp:75
+msgid "Password"
msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:78
-#: src/gui/windows/charselectdialog.cpp:573
+#: src/gui/windows/charselectdialog.cpp:80
+#: src/gui/windows/charselectdialog.cpp:595
#: src/gui/windows/updaterwindow.cpp:195
msgid "Play"
msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:80
+#: src/gui/windows/charselectdialog.cpp:82
#: src/net/ea/charserverhandler.cpp:160
+#: src/net/eathena/charserverhandler.cpp:531
+#: src/net/eathena/charserverhandler.cpp:561
msgid "Info"
msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: unregister dialog name
#. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:106
+#: src/gui/windows/charselectdialog.cpp:110
#: src/gui/windows/unregisterdialog.cpp:50
#: src/gui/windows/unregisterdialog.cpp:55
msgid "Unregister"
msgstr "Avregistrer"
#. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:118
+#: src/gui/windows/charselectdialog.cpp:122
msgid "Change Email"
msgstr ""
#. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:156
+#: src/gui/windows/charselectdialog.cpp:166
#, c-format
msgid "Account %s"
msgstr ""
-#: src/gui/windows/charselectdialog.cpp:184
+#: src/gui/windows/charselectdialog.cpp:194
msgid "Please set new pincode"
msgstr ""
+#: src/gui/windows/charselectdialog.cpp:240
+msgid "Please enter new name"
+msgstr ""
+
#. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:237
+#: src/gui/windows/charselectdialog.cpp:259
#, c-format
msgid ""
"Hp: %u/%u\n"
@@ -5186,16 +5227,16 @@ msgid ""
"Money: %s"
msgstr ""
-#: src/gui/windows/charselectdialog.cpp:289
+#: src/gui/windows/charselectdialog.cpp:311
msgid "Incorrect password"
msgstr ""
#. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:429
+#: src/gui/windows/charselectdialog.cpp:451
msgid "Enter password for deleting character"
msgstr ""
-#: src/gui/windows/charselectdialog.cpp:429
+#: src/gui/windows/charselectdialog.cpp:451
msgid "Enter password:"
msgstr ""
@@ -5603,7 +5644,7 @@ msgstr "Nivå: %d"
#. TRANSLATORS: status bar label
#: src/gui/windows/ministatuswindow.cpp:364
-#: src/gui/windows/ministatuswindow.cpp:402
+#: src/gui/windows/ministatuswindow.cpp:401
msgid "Need"
msgstr ""
@@ -5634,7 +5675,7 @@ msgstr "Bekreft"
#. TRANSLATORS: shop window button
#. TRANSLATORS: trade window button
#: src/gui/windows/npcdialog.cpp:114 src/gui/windows/serverdialog.cpp:121
-#: src/gui/windows/shopwindow.cpp:99 src/gui/windows/shopwindow.cpp:106
+#: src/gui/windows/shopwindow.cpp:98 src/gui/windows/shopwindow.cpp:105
#: src/gui/windows/tradewindow.cpp:83
msgid "Add"
msgstr ""
@@ -5797,43 +5838,38 @@ msgid "Reset Windows"
msgstr ""
#. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:80
+#: src/gui/windows/shopwindow.cpp:79
msgid "Personal Shop"
msgstr ""
#. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:95
+#: src/gui/windows/shopwindow.cpp:94
msgid "Buy items"
msgstr ""
#. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:97
+#: src/gui/windows/shopwindow.cpp:96
msgid "Sell items"
msgstr ""
#. TRANSLATORS: shop window label
#. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:110
+#: src/gui/windows/shopwindow.cpp:102 src/gui/windows/shopwindow.cpp:109
msgid "Announce"
msgstr ""
#. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:114
+#: src/gui/windows/shopwindow.cpp:113
msgid "Show links in announce"
msgstr ""
-#. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:176 src/gui/windows/shopwindow.cpp:179
-msgid "Auction"
-msgstr ""
-
#. TRANSLATORS: shop window dialog
#. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:233
+#: src/gui/windows/shopwindow.cpp:776 src/net/ea/tradehandler.cpp:233
msgid "Request for Trade"
msgstr ""
-#: src/gui/windows/shopwindow.cpp:791
+#: src/gui/windows/shopwindow.cpp:776
#, c-format
msgid "%s wants to %s %s do you accept?"
msgstr ""
@@ -6161,27 +6197,27 @@ msgstr ""
msgid "Connecting..."
msgstr "Kobler til..."
-#: src/gui/windows/updaterwindow.cpp:398
+#: src/gui/windows/updaterwindow.cpp:407
msgid "Show all news (can be slow)"
msgstr ""
#. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:824
+#: src/gui/windows/updaterwindow.cpp:833
msgid "##1 The update process is incomplete."
msgstr ""
#. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:826
+#: src/gui/windows/updaterwindow.cpp:835
msgid "##1 It is strongly recommended that"
msgstr ""
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:828
+#: src/gui/windows/updaterwindow.cpp:837
msgid "##1 you try again later."
msgstr ""
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1005
+#: src/gui/windows/updaterwindow.cpp:1021
msgid "Completed"
msgstr ""
@@ -6228,25 +6264,25 @@ msgstr ""
#. TRANSLATORS: long key name. must be short.
#. TRANSLATORS: short key name. must be very short.
#. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:370 src/input/inputmanager.cpp:414
+#: src/input/inputmanager.cpp:371 src/input/inputmanager.cpp:415
#: src/input/keyboardconfig.cpp:104
#, c-format
msgid "key_%d"
msgstr ""
#. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:376
+#: src/input/inputmanager.cpp:377
#, c-format
msgid "JButton%d"
msgstr ""
#. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:391
msgid "unknown key"
msgstr ""
#. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:420
+#: src/input/inputmanager.cpp:421
#, c-format
msgid "JB%d"
msgstr ""
@@ -6254,7 +6290,7 @@ msgstr ""
#. TRANSLATORS: unknown short key type. must be short
#. TRANSLATORS: Unknown key short string.
#. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:434 src/input/keyboardconfig.cpp:148
+#: src/input/inputmanager.cpp:435 src/input/keyboardconfig.cpp:148
msgid "u key"
msgstr ""
@@ -7425,74 +7461,74 @@ msgid "Request to quit denied!"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:135
#, c-format
msgid "Guild name: %s"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:191
+#: src/net/ea/guildhandler.cpp:138
#, c-format
msgid "Guild master: %s"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:141
#, c-format
msgid "Guild level: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:197
+#: src/net/ea/guildhandler.cpp:144
#, c-format
msgid "Online members: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:200
+#: src/net/ea/guildhandler.cpp:147
#, c-format
msgid "Max members: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:203
+#: src/net/ea/guildhandler.cpp:150
#, c-format
msgid "Average level: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:206
+#: src/net/ea/guildhandler.cpp:153
#, c-format
msgid "Guild exp: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:209
+#: src/net/ea/guildhandler.cpp:156
#, c-format
msgid "Guild next exp: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:212
+#: src/net/ea/guildhandler.cpp:159
#, c-format
msgid "Guild castle: %s"
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:179
+#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:191
msgid "Item sharing enabled."
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:183
+#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:195
msgid "Item sharing disabled."
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:187
+#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:199
msgid "Item sharing not possible."
msgstr ""
@@ -7503,19 +7539,19 @@ msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:167
+#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:179
msgid "Experience sharing enabled."
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:171
+#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:183
msgid "Experience sharing disabled."
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:175
+#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:187
msgid "Experience sharing not possible."
msgstr ""
@@ -7620,239 +7656,355 @@ msgid "Connection to server terminated. "
msgstr ""
#. TRANSLATORS: message header
-#: src/net/ea/playerhandler.cpp:257 src/net/ea/playerhandler.cpp:273
-#: src/net/ea/playerhandler.cpp:361
+#: src/net/ea/playerhandler.cpp:192 src/net/ea/playerhandler.cpp:418
+#: src/net/ea/playerhandler.cpp:434
msgid "Message"
msgstr ""
#. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:259
+#: src/net/ea/playerhandler.cpp:420
msgid ""
"You are carrying more than half your weight. You are unable to regain "
"health."
msgstr ""
#. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:275
+#: src/net/ea/playerhandler.cpp:436
msgid "You are carrying less than half your weight. You can regain health."
msgstr ""
+#. TRANSLATORS: char rename error
+#: src/net/eathena/charserverhandler.cpp:516
+#: src/net/eathena/charserverhandler.cpp:553
+msgid "Character rename error."
+msgstr ""
+
+#: src/net/eathena/charserverhandler.cpp:531
+msgid "Character renamed."
+msgstr ""
+
+#. TRANSLATORS: char rename error
+#: src/net/eathena/charserverhandler.cpp:544
+msgid "Rename not allowed."
+msgstr ""
+
+#. TRANSLATORS: char rename error
+#: src/net/eathena/charserverhandler.cpp:548
+msgid "New name is not set."
+msgstr ""
+
+#. TRANSLATORS: char rename error
+#: src/net/eathena/charserverhandler.cpp:557
+msgid "Character not found."
+msgstr ""
+
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:125
+#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:124
#, c-format
msgid "Strength %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:127
+#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:126
#, c-format
msgid "Agility %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:129
+#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:128
#, c-format
msgid "Vitality %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:131
+#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:130
#, c-format
msgid "Intelligence %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:128 src/net/tmwa/generalhandler.cpp:133
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:132
#, c-format
msgid "Dexterity %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:135
+#: src/net/eathena/generalhandler.cpp:128 src/net/tmwa/generalhandler.cpp:134
#, c-format
msgid "Luck %s"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:152 src/net/tmwa/generalhandler.cpp:161
+#: src/net/eathena/generalhandler.cpp:159 src/net/tmwa/generalhandler.cpp:160
msgid "Authentication failed."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:155 src/net/tmwa/generalhandler.cpp:165
+#: src/net/eathena/generalhandler.cpp:162 src/net/tmwa/generalhandler.cpp:164
msgid "No servers available."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:160 src/net/tmwa/generalhandler.cpp:171
+#: src/net/eathena/generalhandler.cpp:167 src/net/tmwa/generalhandler.cpp:170
msgid "Someone else is trying to use this account."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:165 src/net/tmwa/generalhandler.cpp:177
+#: src/net/eathena/generalhandler.cpp:172 src/net/tmwa/generalhandler.cpp:176
msgid "This account is already logged in."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:169 src/net/tmwa/generalhandler.cpp:182
+#: src/net/eathena/generalhandler.cpp:176 src/net/tmwa/generalhandler.cpp:181
msgid "Speed hack detected."
msgstr ""
+#: src/net/eathena/generalhandler.cpp:179
+msgid "Server full."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:182
+msgid "Sorry, you are underaged."
+msgstr ""
+
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:172 src/net/tmwa/generalhandler.cpp:186
+#: src/net/eathena/generalhandler.cpp:185 src/net/tmwa/generalhandler.cpp:185
msgid "Duplicated login."
msgstr ""
+#: src/net/eathena/generalhandler.cpp:188
+msgid "To many connections from same ip."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:191
+msgid "Not paid for this time."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:194
+msgid "Pay suspended."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:197
+msgid "Pay changed."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:200
+msgid "Pay wrong ip."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:203
+msgid "Pay game room."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:206
+msgid "Disconnect forced by GM."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:210
+msgid "Ban japan refuse."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:213
+msgid "Remained other account."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:216
+msgid "Ip unfair."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:219
+msgid "Ip count all."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:222
+msgid "Ip count."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:226
+msgid "Memory."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:229
+msgid "Han valid."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:232
+msgid "Ip limited access."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:235
+msgid "Over characters list."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:238
+msgid "Ip blocked."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:241
+msgid "Invalid password count."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:244
+msgid "Not allowed race."
+msgstr ""
+
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:175 src/net/tmwa/generalhandler.cpp:190
+#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:189
msgid "Unknown connection error."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:280
+#: src/net/eathena/generalhandler.cpp:323 src/net/tmwa/generalhandler.cpp:279
msgid "Got disconnected from server!"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:282 src/net/tmwa/generalhandler.cpp:308
+#: src/net/eathena/generalhandler.cpp:348 src/net/tmwa/generalhandler.cpp:307
msgid "Strength"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:310
+#: src/net/eathena/generalhandler.cpp:349 src/net/tmwa/generalhandler.cpp:309
msgid "Agility"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:284 src/net/tmwa/generalhandler.cpp:312
+#: src/net/eathena/generalhandler.cpp:350 src/net/tmwa/generalhandler.cpp:311
msgid "Vitality"
msgstr ""
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:285 src/net/tmwa/generalhandler.cpp:314
+#: src/net/eathena/generalhandler.cpp:352 src/net/tmwa/generalhandler.cpp:314
msgid "Intelligence"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:286 src/net/tmwa/generalhandler.cpp:316
+#: src/net/eathena/generalhandler.cpp:353 src/net/tmwa/generalhandler.cpp:316
msgid "Dexterity"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:287 src/net/tmwa/generalhandler.cpp:318
+#: src/net/eathena/generalhandler.cpp:354 src/net/tmwa/generalhandler.cpp:318
msgid "Luck"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:290 src/net/tmwa/generalhandler.cpp:323
+#: src/net/eathena/generalhandler.cpp:357 src/net/tmwa/generalhandler.cpp:322
msgid "Defense"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:291 src/net/tmwa/generalhandler.cpp:325
+#: src/net/eathena/generalhandler.cpp:358 src/net/tmwa/generalhandler.cpp:324
msgid "M.Attack"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:292 src/net/tmwa/generalhandler.cpp:327
+#: src/net/eathena/generalhandler.cpp:359 src/net/tmwa/generalhandler.cpp:326
msgid "M.Defense"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:294 src/net/tmwa/generalhandler.cpp:330
+#: src/net/eathena/generalhandler.cpp:361 src/net/tmwa/generalhandler.cpp:329
#, no-c-format
msgid "% Accuracy"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:296 src/net/tmwa/generalhandler.cpp:333
+#: src/net/eathena/generalhandler.cpp:363 src/net/tmwa/generalhandler.cpp:332
#, no-c-format
msgid "% Evade"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:298 src/net/tmwa/generalhandler.cpp:336
+#: src/net/eathena/generalhandler.cpp:365 src/net/tmwa/generalhandler.cpp:335
#, no-c-format
msgid "% Critical"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:299 src/net/tmwa/generalhandler.cpp:338
+#: src/net/eathena/generalhandler.cpp:366 src/net/tmwa/generalhandler.cpp:337
msgid "Attack Delay"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:300 src/net/tmwa/generalhandler.cpp:340
+#: src/net/eathena/generalhandler.cpp:367 src/net/tmwa/generalhandler.cpp:339
msgid "Walk Delay"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:301 src/net/tmwa/generalhandler.cpp:342
+#: src/net/eathena/generalhandler.cpp:368 src/net/tmwa/generalhandler.cpp:341
msgid "Attack Range"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:302 src/net/tmwa/generalhandler.cpp:344
+#: src/net/eathena/generalhandler.cpp:369 src/net/tmwa/generalhandler.cpp:343
msgid "Damage per sec."
msgstr ""
-#: src/net/eathena/skillhandler.cpp:228 src/net/eathena/skillhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:370
+msgid "Karma"
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:371
+msgid "Manner"
+msgstr ""
+
+#: src/net/eathena/skillhandler.cpp:304 src/net/eathena/skillhandler.cpp:364
#, c-format
msgid "Unknown skill error: %d"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:235 src/net/tmwa/skillhandler.cpp:224
+#: src/net/eathena/skillhandler.cpp:311 src/net/tmwa/skillhandler.cpp:224
msgid "You have not yet reached a high enough lvl!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:239 src/net/tmwa/skillhandler.cpp:228
+#: src/net/eathena/skillhandler.cpp:315 src/net/tmwa/skillhandler.cpp:228
msgid "Insufficient HP!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:243 src/net/tmwa/skillhandler.cpp:232
+#: src/net/eathena/skillhandler.cpp:319 src/net/tmwa/skillhandler.cpp:232
msgid "Insufficient SP!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:247 src/net/tmwa/skillhandler.cpp:236
+#: src/net/eathena/skillhandler.cpp:323 src/net/tmwa/skillhandler.cpp:236
msgid "You have no memos!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:251 src/net/tmwa/skillhandler.cpp:240
+#: src/net/eathena/skillhandler.cpp:327 src/net/tmwa/skillhandler.cpp:240
msgid "You cannot do that right now!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:255 src/net/tmwa/skillhandler.cpp:244
+#: src/net/eathena/skillhandler.cpp:331 src/net/tmwa/skillhandler.cpp:244
msgid "Seems you need more money... ;-)"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:259 src/net/tmwa/skillhandler.cpp:248
+#: src/net/eathena/skillhandler.cpp:335 src/net/tmwa/skillhandler.cpp:248
msgid "You cannot use this skill with that kind of weapon!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:264 src/net/tmwa/skillhandler.cpp:253
+#: src/net/eathena/skillhandler.cpp:340 src/net/tmwa/skillhandler.cpp:253
msgid "You need another red gem!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:268 src/net/tmwa/skillhandler.cpp:257
+#: src/net/eathena/skillhandler.cpp:344 src/net/tmwa/skillhandler.cpp:257
msgid "You need another blue gem!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:272 src/net/tmwa/skillhandler.cpp:261
+#: src/net/eathena/skillhandler.cpp:348 src/net/tmwa/skillhandler.cpp:261
msgid "You're carrying to much to do this!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:276 src/net/tmwa/skillhandler.cpp:265
+#: src/net/eathena/skillhandler.cpp:352 src/net/tmwa/skillhandler.cpp:265
msgid "Huh? What's that?"
msgstr ""
@@ -7869,32 +8021,32 @@ msgid "%s wants to trade with you, do you accept?"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:349
+#: src/net/tmwa/charserverhandler.cpp:351
msgid "Strength:"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:351
+#: src/net/tmwa/charserverhandler.cpp:353
msgid "Agility:"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:353
+#: src/net/tmwa/charserverhandler.cpp:355
msgid "Vitality:"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:355
+#: src/net/tmwa/charserverhandler.cpp:357
msgid "Intelligence:"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:357
+#: src/net/tmwa/charserverhandler.cpp:359
msgid "Dexterity:"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:359
+#: src/net/tmwa/charserverhandler.cpp:361
msgid "Luck:"
msgstr ""
@@ -8205,269 +8357,306 @@ msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:143
+msgid "You cant left party on this map."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:147
+msgid "You was kicked from party."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:151
+msgid "You cant be kicked kicked from party on this map."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:155
#, c-format
msgid "%s has joined your party."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:147
+#: src/resources/notifications.h:159
#, c-format
msgid "%s is already a member of a party."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:151
+#: src/resources/notifications.h:163
#, c-format
msgid "%s refused your invitation."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:155
+#: src/resources/notifications.h:167
#, c-format
msgid "%s is now a member of your party."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:159
+#: src/resources/notifications.h:171
#, c-format
msgid "%s can't join your party because party is full."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:163
+#: src/resources/notifications.h:175
#, c-format
msgid "QQQ Unknown invite response for %s."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:191
+#: src/resources/notifications.h:203
#, c-format
msgid "%s has left your party."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:195
+#: src/resources/notifications.h:207 src/resources/notifications.h:215
+#, c-format
+msgid "%s cant be kicked from party on this map."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:211
+#, c-format
+msgid "%s has kicked from your party."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:219
#, c-format
msgid "An unknown member tried to say: %s"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:199
+#: src/resources/notifications.h:223
#, c-format
msgid "%s is not in your party!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:203
+#: src/resources/notifications.h:227
#, c-format
msgid "You picked up %s."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:207
+#: src/resources/notifications.h:231
#, c-format
msgid "You spent %s."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:211
+#: src/resources/notifications.h:235
msgid "Cannot raise skill!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:215
+#: src/resources/notifications.h:239
msgid "Equip ammunition first."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:219
+#: src/resources/notifications.h:243
#, c-format
msgid "Trading with %s isn't possible. Trade partner is too far away."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:224
+#: src/resources/notifications.h:248
#, c-format
msgid "Trading with %s isn't possible. Character doesn't exist."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:228
+#: src/resources/notifications.h:252
msgid "Trade cancelled due to an unknown reason."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:232
+#: src/resources/notifications.h:256
#, c-format
msgid "Trade with %s cancelled."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:236
+#: src/resources/notifications.h:260
#, c-format
msgid "Unhandled trade cancel packet with %s"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:240
+#: src/resources/notifications.h:264
msgid "Failed adding item. Trade partner is over weighted."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:244
+#: src/resources/notifications.h:268
msgid "Failed adding item. Trade partner has no free slot."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:248
+#: src/resources/notifications.h:272
msgid "Failed adding item. You can't trade this item."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:252
+#: src/resources/notifications.h:276
msgid "Failed adding item for unknown reason."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:256
+#: src/resources/notifications.h:280
msgid "Trade canceled."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:260
+#: src/resources/notifications.h:284
msgid "Trade completed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:264
+#: src/resources/notifications.h:288
msgid "Kick failed!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:268
+#: src/resources/notifications.h:292
msgid "Kick succeeded!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:272
+#: src/resources/notifications.h:296
#, c-format
msgid "MVP player: %s"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:276
+#: src/resources/notifications.h:300
msgid "All whispers ignored."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:280
+#: src/resources/notifications.h:304
msgid "All whispers ignore failed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:284
+#: src/resources/notifications.h:308
msgid "All whispers unignored."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:288
+#: src/resources/notifications.h:312
msgid "All whispers unignore failed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:295
+#: src/resources/notifications.h:319
msgid "pvp off, gvg off"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:299
+#: src/resources/notifications.h:323
msgid "pvp on"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:303
+#: src/resources/notifications.h:327
msgid "gvg on"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:307
+#: src/resources/notifications.h:331
msgid "pvp on, gvg on"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:311
+#: src/resources/notifications.h:335
msgid "unknown pvp"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:315
+#: src/resources/notifications.h:339
#, c-format
msgid "Char from account %s is already in your party!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:319
+#: src/resources/notifications.h:343
#, c-format
msgid "%s blocked invite!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:323
+#: src/resources/notifications.h:347
msgid "Char is not online!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:327
+#: src/resources/notifications.h:351
msgid "Pet catch failed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:331
+#: src/resources/notifications.h:355
msgid "Pet catched."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:335
+#: src/resources/notifications.h:359
#, c-format
msgid "Pet catch unkown error: %d."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:339
+#: src/resources/notifications.h:363
msgid "Your mercenary duty hour is over."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:343
+#: src/resources/notifications.h:367
msgid "Your mercenary was killed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:347
+#: src/resources/notifications.h:371
msgid "Your mercenary was fired."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:351
+#: src/resources/notifications.h:375
msgid "Your mercenary run away."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:355
+#: src/resources/notifications.h:379
msgid "Mercenary unknown state."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:359
-msgid "Your feed your homunculus."
+#: src/resources/notifications.h:383
+msgid "You feed your homunculus."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:363
+#: src/resources/notifications.h:387
#, c-format
msgid "You cant feed homunculus, because not have %s."
msgstr ""
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:391
+msgid "Card insert failed."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:395
+msgid "Card inserted."
+msgstr ""
+
#. TRANSLATORS: chat option changed message
#: src/utils/booleanoptions.h:27
#, c-format
diff --git a/po/nl.po b/po/nl.po
index f24ff4c0c..93ef8be14 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-27 13:23+0300\n"
-"PO-Revision-Date: 2014-09-28 10:01+0000\n"
+"POT-Creation-Date: 2014-10-08 01:19+0300\n"
+"PO-Revision-Date: 2014-10-08 10:02+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Dutch (Belgium) (http://www.transifex.com/projects/p/manaplus/language/nl_BE/)\n"
"MIME-Version: 1.0\n"
@@ -35,7 +35,7 @@ msgstr ""
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:131 src/client.cpp:1463 src/client.cpp:1490
+#: src/actions/actions.cpp:131 src/client.cpp:1461 src/client.cpp:1488
#: src/gamemodifiers.cpp:423 src/gui/widgets/tabs/setup_input.cpp:163
#: src/gui/widgets/tabs/setup_theme.cpp:312
#: src/gui/widgets/tabs/setup_theme.cpp:343
@@ -46,8 +46,8 @@ msgstr ""
#: src/gui/windows/changeemaildialog.cpp:170
#: src/gui/windows/changepassworddialog.cpp:160
#: src/gui/windows/charcreatedialog.cpp:373
-#: src/gui/windows/charselectdialog.cpp:255
-#: src/gui/windows/charselectdialog.cpp:291 src/gui/windows/editdialog.cpp:49
+#: src/gui/windows/charselectdialog.cpp:277
+#: src/gui/windows/charselectdialog.cpp:313 src/gui/windows/editdialog.cpp:49
#: src/gui/windows/editserverdialog.cpp:61
#: src/gui/windows/editserverdialog.cpp:208
#: src/gui/windows/itemamountwindow.cpp:158 src/gui/windows/quitdialog.cpp:70
@@ -55,7 +55,9 @@ msgstr ""
#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
#: src/net/ea/charserverhandler.cpp:143 src/net/ea/charserverhandler.cpp:162
#: src/net/ea/charserverhandler.cpp:175 src/net/ea/gamehandler.cpp:79
-#: src/net/ea/playerhandler.cpp:263 src/net/ea/playerhandler.cpp:279
+#: src/net/ea/playerhandler.cpp:424 src/net/ea/playerhandler.cpp:440
+#: src/net/eathena/charserverhandler.cpp:533
+#: src/net/eathena/charserverhandler.cpp:563
msgid "OK"
msgstr "OK"
@@ -179,7 +181,7 @@ msgstr "Guild-naam ontbreekt."
#. TRANSLATORS: party invite message
#. TRANSLATORS: change relation
-#: src/actions/chat.cpp:303 src/actions/commands.cpp:65
+#: src/actions/chat.cpp:303 src/actions/commands.cpp:64
msgid "Please specify a name."
msgstr "Gelieve een naam te specifiëren."
@@ -202,75 +204,75 @@ msgid "Message now closes chat."
msgstr "Bericht sluit nu chat."
#. TRANSLATORS: change relation
-#: src/actions/commands.cpp:108
+#: src/actions/commands.cpp:107
#, c-format
msgid "Player already %s!"
msgstr "Speler reeds %s!"
#. TRANSLATORS: change relation
-#: src/actions/commands.cpp:120
+#: src/actions/commands.cpp:119
#, c-format
msgid "Player successfully %s!"
msgstr "Speler succesvol %s!"
#. TRANSLATORS: change relation
-#: src/actions/commands.cpp:122
+#: src/actions/commands.cpp:121
#, c-format
msgid "Player could not be %s!"
msgstr "Speler kan niet %s zijn!"
#. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:153
+#: src/actions/commands.cpp:152
msgid "Player wasn't ignored!"
msgstr "Speler is niet genegeerd!"
#. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:162
+#: src/actions/commands.cpp:161
msgid "Player no longer ignored!"
msgstr "Speler niet langer genegeerd!"
#. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:164
+#: src/actions/commands.cpp:163
msgid "Player could not be unignored!"
msgstr "Speler kan niet worden genegeerd!"
#. TRANSLATORS: erase command
-#: src/actions/commands.cpp:179
+#: src/actions/commands.cpp:178
msgid "Player already erased!"
msgstr "Speler reeds verwijderd!"
#. TRANSLATORS: erase command
-#: src/actions/commands.cpp:192
+#: src/actions/commands.cpp:191
msgid "Player no longer erased!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/actions/commands.cpp:194
+#: src/actions/commands.cpp:193
msgid "Player could not be erased!"
msgstr "Speler kan niet worden verwijderd!"
#. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:201
+#: src/actions/commands.cpp:200
msgid "friend"
msgstr "vriend"
#. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:208
+#: src/actions/commands.cpp:207
msgid "disregarded"
msgstr "genegeerd"
#. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:215
+#: src/actions/commands.cpp:214
msgid "neutral"
msgstr "neutraal"
#. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:222
+#: src/actions/commands.cpp:221
msgid "blacklisted"
msgstr ""
#. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:229
+#: src/actions/commands.cpp:228
msgid "enemy"
msgstr "vijand"
@@ -285,77 +287,77 @@ msgid "Accepting incoming trade requests"
msgstr "Inkomende handelsaanvragen accepteren"
#. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1306
+#: src/actormanager.cpp:1310
msgid "Visible on map"
msgstr "Zichtbaar op de map"
#. TRANSLATORS: default race name
-#: src/being/being.cpp:389
+#: src/being/being.cpp:393
msgid "Human"
msgstr ""
-#: src/being/being.cpp:556
+#: src/being/being.cpp:560
msgid "dodge"
msgstr "ontwijkt"
-#: src/being/being.cpp:556
+#: src/being/being.cpp:560
msgid "miss"
msgstr "mist"
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1865 src/gui/windows/whoisonline.cpp:855
+#: src/being/being.cpp:1869 src/gui/windows/whoisonline.cpp:855
msgid "A"
msgstr "A"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1870 src/gui/windows/whoisonline.cpp:860
+#: src/being/being.cpp:1874 src/gui/windows/whoisonline.cpp:860
msgid "I"
msgstr "I"
#. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:379
+#: src/being/localplayer.cpp:380
#, c-format
msgid "You were killed by %s"
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:824
+#: src/being/localplayer.cpp:825
msgid "Tried to pick up nonexistent item."
msgstr "Geprobeerd een nietbestaand voorwerp op te rapen."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:828
+#: src/being/localplayer.cpp:829
msgid "Item is too heavy."
msgstr "Voorwerp is te zwaar."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:832
+#: src/being/localplayer.cpp:833
msgid "Item is too far away."
msgstr "Voorwerp is te ver weg."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:836
+#: src/being/localplayer.cpp:837
msgid "Inventory is full."
msgstr "Inventaris is vol."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:840
+#: src/being/localplayer.cpp:841
msgid "Stack is too big."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:844
+#: src/being/localplayer.cpp:845
msgid "Item belongs to someone else."
msgstr "Voorwerp behoort bij iemand anders."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:848
+#: src/being/localplayer.cpp:849
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/being/localplayer.cpp:872
+#: src/being/localplayer.cpp:873
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -364,43 +366,43 @@ msgstr[1] "U raapte op %d [@@%d|%s@@]."
#. TRANSLATORS: this is normal experience
#. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1054 src/being/localplayer.cpp:1055
-#: src/being/localplayer.cpp:1091
+#: src/being/localplayer.cpp:1055 src/being/localplayer.cpp:1056
+#: src/being/localplayer.cpp:1092
msgid "xp"
msgstr ""
#. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1059 src/being/localplayer.cpp:1065
-#: src/being/localplayer.cpp:1071
+#: src/being/localplayer.cpp:1060 src/being/localplayer.cpp:1066
+#: src/being/localplayer.cpp:1072
msgid "job"
msgstr ""
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2794
+#: src/being/localplayer.cpp:2795
#, c-format
msgid "Follow: %s"
msgstr ""
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2800 src/being/localplayer.cpp:2825
+#: src/being/localplayer.cpp:2801 src/being/localplayer.cpp:2826
msgid "Follow canceled"
msgstr "Volgen onderbroken"
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2810
+#: src/being/localplayer.cpp:2811
#, c-format
msgid "Imitation: %s"
msgstr ""
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2816 src/being/localplayer.cpp:2830
+#: src/being/localplayer.cpp:2817 src/being/localplayer.cpp:2831
msgid "Imitation canceled"
msgstr "Imitatie onderbroken"
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3180
+#: src/being/localplayer.cpp:3181
#, c-format
msgid "You see %s"
msgstr ""
@@ -438,37 +440,37 @@ msgstr "Zwevende bel"
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:920 src/gui/windowmenu.cpp:162
+#: src/client.cpp:918 src/gui/windowmenu.cpp:162
#: src/gui/windows/setupwindow.cpp:62
msgid "Setup"
msgstr "Configureren"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:923 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:921 src/gui/widgets/tabs/setup_perfomance.cpp:54
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:926 src/gui/widgets/tabs/setup_video.cpp:105
+#: src/client.cpp:924 src/gui/widgets/tabs/setup_video.cpp:105
msgid "Video"
msgstr "Video"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:929 src/gui/widgets/tabs/setup_theme.cpp:122
+#: src/client.cpp:927 src/gui/widgets/tabs/setup_theme.cpp:122
msgid "Theme"
msgstr "Thema"
#. TRANSLATORS: theme tab quick button
-#: src/client.cpp:932
+#: src/client.cpp:930
msgid "About"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:935 src/gui/windowmenu.cpp:74
+#: src/client.cpp:933 src/gui/windowmenu.cpp:74
#: src/gui/windows/helpwindow.cpp:53
msgid "Help"
msgstr "Help"
@@ -484,42 +486,42 @@ msgstr "Help"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:939 src/client.cpp:1391 src/client.cpp:1405
+#: src/client.cpp:937 src/client.cpp:1389 src/client.cpp:1403
#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:691
#: src/gui/popups/popupmenu.cpp:923 src/gui/windows/didyouknowwindow.cpp:81
#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:74
#: src/gui/windows/npcdialog.cpp:112 src/gui/windows/questswindow.cpp:77
-#: src/gui/windows/shopwindow.cpp:84
+#: src/gui/windows/shopwindow.cpp:83
msgid "Close"
msgstr "Sluiten"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1065
+#: src/client.cpp:1063
msgid "Connecting to server"
msgstr "Verbinden met server"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1113
+#: src/client.cpp:1111
msgid "Logging in"
msgstr "Inloggen"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1156
+#: src/client.cpp:1154
msgid "Entering game world"
msgstr "Spelwereld binnenkomen"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1282
+#: src/client.cpp:1280
msgid "Requesting characters"
msgstr "Aanvragen personage"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1322
+#: src/client.cpp:1320
msgid "Connecting to the game server"
msgstr "Verbinden met de spelserver"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1334
+#: src/client.cpp:1332
msgid "Changing game servers"
msgstr "Wijzigen spelservers"
@@ -533,72 +535,76 @@ msgstr "Wijzigen spelservers"
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1389 src/client.cpp:1403 src/client.cpp:1598
+#. TRANSLATORS: info message
+#. TRANSLATORS: ok dialog button
+#: src/client.cpp:1387 src/client.cpp:1401 src/client.cpp:1596
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
#: src/gui/windows/charcreatedialog.cpp:369
-#: src/gui/windows/charselectdialog.cpp:289
+#: src/gui/windows/charselectdialog.cpp:311
#: src/gui/windows/editserverdialog.cpp:203
#: src/gui/windows/registerdialog.cpp:245
#: src/gui/windows/unregisterdialog.cpp:146
#: src/net/ea/charserverhandler.cpp:141 src/net/ea/charserverhandler.cpp:173
+#: src/net/eathena/charserverhandler.cpp:516
+#: src/net/eathena/charserverhandler.cpp:518
msgid "Error"
msgstr "Fout"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1418
+#: src/client.cpp:1416
msgid "Requesting registration details"
msgstr "Aanvragen registratie details"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1459
+#: src/client.cpp:1457
msgid "Password Change"
msgstr "Paswoord Wijziging"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1461
+#: src/client.cpp:1459
msgid "Password changed successfully!"
msgstr "Paswoord is gewijzigd!"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1486
+#: src/client.cpp:1484
msgid "Email Change"
msgstr "Email Wijziging"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1488
+#: src/client.cpp:1486
msgid "Email changed successfully!"
msgstr "Email is gewijzigd!"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1515
+#: src/client.cpp:1513
msgid "Unregister Successful"
msgstr "Registratie ongedaan gemaakt!"
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1517
+#: src/client.cpp:1515
msgid "Farewell, come back any time..."
msgstr "Tot ziens..."
#. TRANSLATORS: directory creation error
#: src/configmanager.cpp:53 src/dirs.cpp:260 src/dirs.cpp:275 src/dirs.cpp:320
-#: src/dirs.cpp:481 src/dirs.cpp:489
+#: src/dirs.cpp:488 src/dirs.cpp:496
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%s bestaat niet en kan niet gecreëerd worden! Stoppen."
#. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:363
+#: src/dirs.cpp:370
#, c-format
msgid "Invalid update host: %s."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:404 src/dirs.cpp:411
+#: src/dirs.cpp:411 src/dirs.cpp:418
msgid "Error creating updates directory!"
msgstr "Fout bij het creëren van de update map!"
-#: src/dirs.cpp:433 src/dirs.cpp:451
+#: src/dirs.cpp:440 src/dirs.cpp:458
#, 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."
@@ -616,36 +622,36 @@ msgid "dyecmd srcdyestring dstfile"
msgstr ""
#. TRANSLATORS: chat tab header
-#: src/game.cpp:236 src/gui/widgets/tabs/chattab.cpp:482
+#: src/game.cpp:234 src/gui/widgets/tabs/chattab.cpp:482
msgid "General"
msgstr "Algemeen"
#. TRANSLATORS: chat tab header
#. TRANSLATORS: full button name
#. TRANSLATORS: debug window name
-#: src/game.cpp:253 src/gui/widgets/tabs/chattab.cpp:484
+#: src/game.cpp:251 src/gui/widgets/tabs/chattab.cpp:484
#: src/gui/windowmenu.cpp:149 src/gui/windows/debugwindow.cpp:42
msgid "Debug"
msgstr "Debug"
#. TRANSLATORS: save file message
-#: src/game.cpp:541
+#: src/game.cpp:532
#, c-format
msgid "Screenshot saved as %s"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:551
+#: src/game.cpp:542
msgid "Saving screenshot failed!"
msgstr "Opslaan van screenshot mislukt!"
#. TRANSLATORS: error message text
-#: src/game.cpp:634
+#: src/game.cpp:625
msgid "The connection to the server was lost."
msgstr "De verbinding met de server is verbroken."
#. TRANSLATORS: error message header
-#: src/game.cpp:637
+#: src/game.cpp:628
msgid "Network Error"
msgstr "Netwerkfout"
@@ -1036,6 +1042,7 @@ msgstr ""
#: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
#: src/gui/widgets/tabs/setup_other.cpp:79
#: src/gui/widgets/tabs/setup_visual.cpp:81
+#: src/gui/windows/equipmentwindow.cpp:577
msgid "default"
msgstr "standaard"
@@ -1526,7 +1533,7 @@ msgstr "Handel"
#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:273
#: src/gui/popups/popupmenu.cpp:767 src/gui/widgets/skillinfo.cpp:113
#: src/gui/windows/botcheckerwindow.cpp:89 src/input/pages/basic.cpp:42
-#: src/net/eathena/generalhandler.cpp:289 src/net/tmwa/generalhandler.cpp:321
+#: src/net/eathena/generalhandler.cpp:356 src/net/tmwa/generalhandler.cpp:320
msgid "Attack"
msgstr "Aanvallen"
@@ -1695,7 +1702,7 @@ msgstr ""
#. TRANSLATORS: pet unequip item
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:340 src/gui/windows/equipmentwindow.cpp:70
+#: src/gui/popups/popupmenu.cpp:340 src/gui/windows/equipmentwindow.cpp:72
#: src/gui/windows/inventorywindow.cpp:175 src/resources/itemtypemapdata.h:47
#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
@@ -1753,7 +1760,7 @@ msgstr "Plaats voorwerp op de kaart"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:574
+#: src/gui/popups/popupmenu.cpp:574 src/gui/windows/charselectdialog.cpp:132
msgid "Rename"
msgstr "Hernoem"
@@ -2265,7 +2272,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
#. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:3000 src/net/ea/playerhandler.cpp:364
+#: src/gui/popups/popupmenu.cpp:3000 src/net/ea/playerhandler.cpp:195
msgid "Revive"
msgstr ""
@@ -2289,7 +2296,7 @@ msgstr "Snelkoppeling"
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: settings group
#. TRANSLATORS: full button name
-#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:319
+#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:315
#: src/gui/windowmenu.cpp:158
msgid "Windows"
msgstr ""
@@ -2317,7 +2324,7 @@ msgstr "Chat"
#. TRANSLATORS: input action name
#: src/gui/setupinputpages.cpp:57 src/gui/widgets/tabs/setup_audio.cpp:151
#: src/gui/widgets/tabs/setup_chat.cpp:179
-#: src/gui/widgets/tabs/setup_other.cpp:341
+#: src/gui/widgets/tabs/setup_other.cpp:337
#: src/gui/widgets/tabs/setup_visual.cpp:192
#: src/gui/windows/charcreatedialog.cpp:119
#: src/gui/windows/registerdialog.cpp:106 src/input/pages/gui.cpp:87
@@ -2330,212 +2337,227 @@ msgid "Gui"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:113
+#: src/gui/userpalette.cpp:116
msgid "Being"
msgstr "Wezen"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:115
+#: src/gui/userpalette.cpp:118
msgid "Friend names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:117
+#: src/gui/userpalette.cpp:120
msgid "Disregarded names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:119
+#: src/gui/userpalette.cpp:122
msgid "Ignored names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:121
+#: src/gui/userpalette.cpp:124
msgid "Erased names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:123
+#: src/gui/userpalette.cpp:126
msgid "Other players names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:125
+#: src/gui/userpalette.cpp:128
msgid "Own name"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:127
+#: src/gui/userpalette.cpp:130
msgid "GM names"
msgstr "GM namen"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:129
+#: src/gui/userpalette.cpp:132
msgid "NPCs"
msgstr "NPCs"
#. TRANSLATORS: palette color
#. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:131 src/gui/widgets/tabs/setup_other.cpp:108
+#: src/gui/userpalette.cpp:134 src/gui/widgets/tabs/setup_other.cpp:108
msgid "Monsters"
msgstr "Monsters"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:133
+#: src/gui/userpalette.cpp:136
msgid "Monster HP bar"
msgstr "Monster Levenspuntenbalk"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:139
msgid "Monster HP bar (second color)"
msgstr "Monster Levenspuntenbalk(tweede kleur)"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:138
+#: src/gui/userpalette.cpp:141
msgid "Party members"
msgstr "Groep leden"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:140
+#: src/gui/userpalette.cpp:143
msgid "Guild members"
msgstr "Guild leden"
#. TRANSLATORS: palette color
#. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:142 src/gui/widgets/tabs/setup_visual.cpp:157
+#: src/gui/userpalette.cpp:145 src/gui/widgets/tabs/setup_visual.cpp:157
msgid "Particle effects"
msgstr "Deeltjes effecten"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:144
+#: src/gui/userpalette.cpp:147
msgid "Pickup notification"
msgstr "Notificatie bij opnemen"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:146
+#: src/gui/userpalette.cpp:149
msgid "Exp notification"
msgstr "Ervaring notificatie"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:148
+#: src/gui/userpalette.cpp:151
msgid "Player HP bar"
msgstr "Speler Levenspuntenbalk"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:152
+#: src/gui/userpalette.cpp:155
msgid "Player HP bar (second color)"
msgstr "Speler Levenspuntenbalk"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:154
+#: src/gui/userpalette.cpp:157
msgid "Player hits monster"
msgstr "Speler raakt monster"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:156
+#: src/gui/userpalette.cpp:159
msgid "Monster hits player"
msgstr "Monster raakt speler"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:160
+#: src/gui/userpalette.cpp:163
msgid "Other player hits local player"
msgstr "Andere speler raakt lokale speler"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:162
+#: src/gui/userpalette.cpp:165
msgid "Critical Hit"
msgstr "Kritieke aanval"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:166
+#: src/gui/userpalette.cpp:169
msgid "Local player hits monster"
msgstr "Lokale speler raakt monster"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:169
+#: src/gui/userpalette.cpp:172
msgid "Local player critical hit"
msgstr "Lokale speler kritieke slag"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:172
+#: src/gui/userpalette.cpp:175
msgid "Local player miss"
msgstr "Lokale speler mis"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:174
+#: src/gui/userpalette.cpp:177
msgid "Misses"
msgstr "Missers"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:176
+#: src/gui/userpalette.cpp:179
msgid "Portal highlight"
msgstr "Poortmarkering"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:179
+#: src/gui/userpalette.cpp:182
msgid "Default collision highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:182
+#: src/gui/userpalette.cpp:185
msgid "Air collision highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:185
+#: src/gui/userpalette.cpp:188
msgid "Water collision highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:188
+#: src/gui/userpalette.cpp:191
msgid "Special ground collision highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:191
+#: src/gui/userpalette.cpp:194
msgid "Walkable highlight"
msgstr "Bewandelbare markering"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:194
+#: src/gui/userpalette.cpp:197
msgid "Local player attack range"
msgstr "Aanvalsbereik van speler"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:197
+#: src/gui/userpalette.cpp:200
msgid "Local player attack range border"
msgstr "Aanvalsbereikrand van speler"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:200
+#: src/gui/userpalette.cpp:203
msgid "Monster attack range"
msgstr "Aanvalsbereik van monster"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:204
+#: src/gui/userpalette.cpp:207
msgid "Floor item amount color"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:207
+#: src/gui/userpalette.cpp:210
msgid "Home place"
msgstr "Thuisplaats"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:210
+#: src/gui/userpalette.cpp:213
msgid "Home place border"
msgstr "Thuisplaatsgrens"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:213
+#: src/gui/userpalette.cpp:216
msgid "Road point"
msgstr "Wegpunt"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:216
+#: src/gui/userpalette.cpp:219
msgid "Tiles border"
msgstr ""
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:221
+msgid "Pets"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:223
+msgid "Mercenary"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:225
+msgid "Homunculus"
+msgstr ""
+
#: src/gui/widgets/characterdisplay.cpp:135
#, c-format
msgid "Level: %u"
@@ -2638,7 +2660,8 @@ msgid "Type: %s"
msgstr ""
#. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:108
+#. TRANSLATORS: unknown equipment page name
+#: src/gui/widgets/skillinfo.cpp:108 src/gui/windows/equipmentwindow.cpp:584
msgid "Unknown"
msgstr ""
@@ -2839,22 +2862,22 @@ msgstr "Deeltjes-aantal: %d"
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:262
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:313
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:375
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:319
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:387
msgid "Target:"
msgstr "Doel:"
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:264
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:319
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:377
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:325
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:389
msgid "Target Id:"
msgstr "Doel identificatie:"
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:267
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:322
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:379
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:328
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:391
msgid "Target type:"
msgstr ""
@@ -2865,7 +2888,7 @@ msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:271
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:338
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:344
msgid "Target race:"
msgstr ""
@@ -2881,67 +2904,81 @@ msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:277
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:363
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:369
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:387
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:375
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:381
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:399
msgid "Attack delay:"
msgstr "Aanvalsvertraging:"
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:279
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:350
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:389
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:356
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:401
msgid "Minimal hit:"
msgstr "Normale slag:"
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:281
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:353
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:391
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:359
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:403
msgid "Maximum hit:"
msgstr "Maximum slag:"
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:283
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:356
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:393
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:362
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:405
msgid "Critical hit:"
msgstr "Critieke slag:"
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:327
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:285
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:365
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:407
+msgid "Karma:"
+msgstr ""
+
+#. TRANSLATORS: debug window label
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:287
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:368
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:409
+msgid "Manner:"
+msgstr ""
+
+#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:333
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:381
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:339
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:393
msgid "Target Level:"
msgstr "Doel niveau:"
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:341
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:383
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:347
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:395
msgid "Target Party:"
msgstr "Doel Party:"
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:345
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:385
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:351
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:397
msgid "Target Guild:"
msgstr "Doel Gilde:"
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:430
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:436
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:451
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:457
#, c-format
msgid "Ping: %s ms"
msgstr "Ping: %s ms"
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:439
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:460
#, c-format
msgid "In: %d bytes/s"
msgstr "Invoer: %d bytes/sec"
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:442
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:463
#, c-format
msgid "Out: %d bytes/s"
msgstr "Uitvoer: %d bytes/sec"
@@ -3770,137 +3807,132 @@ msgstr ""
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_other.cpp:294
-msgid "Enable auction bot support"
-msgstr ""
-
-#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:298
msgid "Enable guild bot support and disable native guild support"
msgstr ""
#. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:304
+#: src/gui/widgets/tabs/setup_other.cpp:300
msgid "Keyboard"
msgstr "Toetsenbord"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:307
+#: src/gui/widgets/tabs/setup_other.cpp:303
msgid "Repeat delay"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:311
+#: src/gui/widgets/tabs/setup_other.cpp:307
msgid "Repeat interval"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:315
+#: src/gui/widgets/tabs/setup_other.cpp:311
msgid "Custom repeat interval"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:323
+#: src/gui/widgets/tabs/setup_other.cpp:319
msgid "Shortcut buttons"
msgstr ""
#. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:328
+#: src/gui/widgets/tabs/setup_other.cpp:324
msgid "Proxy server"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:332
+#: src/gui/widgets/tabs/setup_other.cpp:328
msgid "Proxy type"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:336
+#: src/gui/widgets/tabs/setup_other.cpp:332
msgid "Proxy address:port"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:344
+#: src/gui/widgets/tabs/setup_other.cpp:340
msgid "Enable server side attack"
msgstr "Aanval gecontroleerd door server aanzetten"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:348
+#: src/gui/widgets/tabs/setup_other.cpp:344
msgid "Hide support page link on error"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:352
+#: src/gui/widgets/tabs/setup_other.cpp:348
msgid "Enable double clicks"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:356
+#: src/gui/widgets/tabs/setup_other.cpp:352
msgid "Enable bot checker"
msgstr "Bot controle aanzetten"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:360
+#: src/gui/widgets/tabs/setup_other.cpp:356
msgid "Enable buggy servers protection (do not disable)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:365
+#: src/gui/widgets/tabs/setup_other.cpp:361
msgid "Enable debug log"
msgstr "Zet debug log aan"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:369
+#: src/gui/widgets/tabs/setup_other.cpp:365
msgid "Ignore logging packets"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:373
+#: src/gui/widgets/tabs/setup_other.cpp:369
msgid "Enable OpenGL log"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:377
+#: src/gui/widgets/tabs/setup_other.cpp:373
msgid "Enable input log"
msgstr ""
#. TRANSLATORS: settings option
#. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_other.cpp:381 src/input/pages/other.cpp:362
+#: src/gui/widgets/tabs/setup_other.cpp:377 src/input/pages/other.cpp:362
msgid "Upload log file"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:385
+#: src/gui/widgets/tabs/setup_other.cpp:381
msgid "Low traffic mode"
msgstr "Laag verkeer modus"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:389
+#: src/gui/widgets/tabs/setup_other.cpp:385
msgid "Hide shield sprite"
msgstr "Verberg het schild"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:394
+#: src/gui/widgets/tabs/setup_other.cpp:390
msgid "Use FBO for screenshots (only for opengl)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:400
+#: src/gui/widgets/tabs/setup_other.cpp:396
msgid "Screenshot directory"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:405
+#: src/gui/widgets/tabs/setup_other.cpp:401
msgid "Network delay between sub servers"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:409
+#: src/gui/widgets/tabs/setup_other.cpp:405
msgid "Show background"
msgstr "Toon achtergrond"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:414
+#: src/gui/widgets/tabs/setup_other.cpp:410
msgid "Screen density override"
msgstr ""
@@ -4131,9 +4163,9 @@ msgstr "Fluisteren toestaan"
#. TRANSLATORS: command editor button
#. TRANSLATORS: input action name
#: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:82
-#: src/gui/windows/serverdialog.cpp:125 src/gui/windows/shopwindow.cpp:101
-#: src/gui/windows/shopwindow.cpp:108 src/gui/windows/textcommandeditor.cpp:92
+#: src/gui/windows/charselectdialog.cpp:84
+#: src/gui/windows/serverdialog.cpp:125 src/gui/windows/shopwindow.cpp:100
+#: src/gui/windows/shopwindow.cpp:107 src/gui/windows/textcommandeditor.cpp:92
#: src/input/pages/gui.cpp:111
msgid "Delete"
msgstr "Verwijderen"
@@ -4787,7 +4819,7 @@ msgstr "UITR"
#. TRANSLATORS: equipment window name
#. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:63
+#: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:65
#: src/gui/windows/inventorywindow.cpp:196
msgid "Equipment"
msgstr "Uitrusting"
@@ -4928,7 +4960,7 @@ msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: social window button
#: src/gui/windows/buydialog.cpp:260 src/gui/windows/charcreatedialog.cpp:127
-#: src/gui/windows/charselectdialog.cpp:578
+#: src/gui/windows/charselectdialog.cpp:605
#: src/gui/windows/socialwindow.cpp:86
msgid "Create"
msgstr "Aanmaken"
@@ -4972,10 +5004,8 @@ msgstr "De email adres ingaven zijn niet gelijk."
#. TRANSLATORS: change password window name
#. TRANSLATORS: change password dialog button
-#. TRANSLATORS: char select dialog. button.
#: src/gui/windows/changepassworddialog.cpp:51
#: src/gui/windows/changepassworddialog.cpp:57
-#: src/gui/windows/charselectdialog.cpp:73
msgid "Change Password"
msgstr "Wijzig wachtwoord"
@@ -5129,57 +5159,68 @@ msgid "Are you sure you want to delete this character?"
msgstr "Weet je zeker dat je deze personage wilt verwijderen?"
#. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:64
+#: src/gui/windows/charselectdialog.cpp:66
#, c-format
msgid "Account %s (last login time %s)"
msgstr ""
#. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:71
-msgid "Switch Login"
-msgstr "Verwissel Login"
+#: src/gui/windows/charselectdialog.cpp:73
+msgid "Switch"
+msgstr ""
+
+#. TRANSLATORS: char select dialog. button.
+#: src/gui/windows/charselectdialog.cpp:75
+msgid "Password"
+msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:78
-#: src/gui/windows/charselectdialog.cpp:573
+#: src/gui/windows/charselectdialog.cpp:80
+#: src/gui/windows/charselectdialog.cpp:595
#: src/gui/windows/updaterwindow.cpp:195
msgid "Play"
msgstr "Spelen"
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:80
+#: src/gui/windows/charselectdialog.cpp:82
#: src/net/ea/charserverhandler.cpp:160
+#: src/net/eathena/charserverhandler.cpp:531
+#: src/net/eathena/charserverhandler.cpp:561
msgid "Info"
msgstr "Info"
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: unregister dialog name
#. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:106
+#: src/gui/windows/charselectdialog.cpp:110
#: src/gui/windows/unregisterdialog.cpp:50
#: src/gui/windows/unregisterdialog.cpp:55
msgid "Unregister"
msgstr "Registreren"
#. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:118
+#: src/gui/windows/charselectdialog.cpp:122
msgid "Change Email"
msgstr "Wijzig Email"
#. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:156
+#: src/gui/windows/charselectdialog.cpp:166
#, c-format
msgid "Account %s"
msgstr ""
-#: src/gui/windows/charselectdialog.cpp:184
+#: src/gui/windows/charselectdialog.cpp:194
msgid "Please set new pincode"
msgstr ""
+#: src/gui/windows/charselectdialog.cpp:240
+msgid "Please enter new name"
+msgstr ""
+
#. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:237
+#: src/gui/windows/charselectdialog.cpp:259
#, c-format
msgid ""
"Hp: %u/%u\n"
@@ -5189,16 +5230,16 @@ msgid ""
"Money: %s"
msgstr ""
-#: src/gui/windows/charselectdialog.cpp:289
+#: src/gui/windows/charselectdialog.cpp:311
msgid "Incorrect password"
msgstr "Ongeldig paswoord"
#. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:429
+#: src/gui/windows/charselectdialog.cpp:451
msgid "Enter password for deleting character"
msgstr "Geef uw wachtwoord om uw personage te verwijderen"
-#: src/gui/windows/charselectdialog.cpp:429
+#: src/gui/windows/charselectdialog.cpp:451
msgid "Enter password:"
msgstr "Geef wachtwoord:"
@@ -5606,7 +5647,7 @@ msgstr "Level: %d"
#. TRANSLATORS: status bar label
#: src/gui/windows/ministatuswindow.cpp:364
-#: src/gui/windows/ministatuswindow.cpp:402
+#: src/gui/windows/ministatuswindow.cpp:401
msgid "Need"
msgstr "Nood"
@@ -5637,7 +5678,7 @@ msgstr "Indienen"
#. TRANSLATORS: shop window button
#. TRANSLATORS: trade window button
#: src/gui/windows/npcdialog.cpp:114 src/gui/windows/serverdialog.cpp:121
-#: src/gui/windows/shopwindow.cpp:99 src/gui/windows/shopwindow.cpp:106
+#: src/gui/windows/shopwindow.cpp:98 src/gui/windows/shopwindow.cpp:105
#: src/gui/windows/tradewindow.cpp:83
msgid "Add"
msgstr "Toevoegen"
@@ -5800,43 +5841,38 @@ msgid "Reset Windows"
msgstr "Vensters in beginstand"
#. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:80
+#: src/gui/windows/shopwindow.cpp:79
msgid "Personal Shop"
msgstr "Persoonlijke winkel"
#. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:95
+#: src/gui/windows/shopwindow.cpp:94
msgid "Buy items"
msgstr "Koop voorwerpen"
#. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:97
+#: src/gui/windows/shopwindow.cpp:96
msgid "Sell items"
msgstr "Verkoop voorwerpen"
#. TRANSLATORS: shop window label
#. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:110
+#: src/gui/windows/shopwindow.cpp:102 src/gui/windows/shopwindow.cpp:109
msgid "Announce"
msgstr "Aankondigingen"
#. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:114
+#: src/gui/windows/shopwindow.cpp:113
msgid "Show links in announce"
msgstr "Toon links in aankondigingen"
-#. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:176 src/gui/windows/shopwindow.cpp:179
-msgid "Auction"
-msgstr ""
-
#. TRANSLATORS: shop window dialog
#. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:233
+#: src/gui/windows/shopwindow.cpp:776 src/net/ea/tradehandler.cpp:233
msgid "Request for Trade"
msgstr "Handel aanvragen"
-#: src/gui/windows/shopwindow.cpp:791
+#: src/gui/windows/shopwindow.cpp:776
#, c-format
msgid "%s wants to %s %s do you accept?"
msgstr "%s wilt %s %s ga je akkoord?"
@@ -6164,27 +6200,27 @@ msgstr "Actualiseren..."
msgid "Connecting..."
msgstr "Verbinden..."
-#: src/gui/windows/updaterwindow.cpp:398
+#: src/gui/windows/updaterwindow.cpp:407
msgid "Show all news (can be slow)"
msgstr ""
#. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:824
+#: src/gui/windows/updaterwindow.cpp:833
msgid "##1 The update process is incomplete."
msgstr "##1 Het updateproces is onvolledig."
#. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:826
+#: src/gui/windows/updaterwindow.cpp:835
msgid "##1 It is strongly recommended that"
msgstr "##1 Het is ten sterkste aanbevolen dat"
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:828
+#: src/gui/windows/updaterwindow.cpp:837
msgid "##1 you try again later."
msgstr "##1 probeer later opnieuw."
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1005
+#: src/gui/windows/updaterwindow.cpp:1021
msgid "Completed"
msgstr "Voltooid"
@@ -6231,25 +6267,25 @@ msgstr "Kies Wereld"
#. TRANSLATORS: long key name. must be short.
#. TRANSLATORS: short key name. must be very short.
#. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:370 src/input/inputmanager.cpp:414
+#: src/input/inputmanager.cpp:371 src/input/inputmanager.cpp:415
#: src/input/keyboardconfig.cpp:104
#, c-format
msgid "key_%d"
msgstr ""
#. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:376
+#: src/input/inputmanager.cpp:377
#, c-format
msgid "JButton%d"
msgstr ""
#. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:391
msgid "unknown key"
msgstr ""
#. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:420
+#: src/input/inputmanager.cpp:421
#, c-format
msgid "JB%d"
msgstr ""
@@ -6257,7 +6293,7 @@ msgstr ""
#. TRANSLATORS: unknown short key type. must be short
#. TRANSLATORS: Unknown key short string.
#. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:434 src/input/keyboardconfig.cpp:148
+#: src/input/inputmanager.cpp:435 src/input/keyboardconfig.cpp:148
msgid "u key"
msgstr "u key"
@@ -7428,74 +7464,74 @@ msgid "Request to quit denied!"
msgstr "Aanvraag op de stoppen is geweigerd!"
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:135
#, c-format
msgid "Guild name: %s"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:191
+#: src/net/ea/guildhandler.cpp:138
#, c-format
msgid "Guild master: %s"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:141
#, c-format
msgid "Guild level: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:197
+#: src/net/ea/guildhandler.cpp:144
#, c-format
msgid "Online members: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:200
+#: src/net/ea/guildhandler.cpp:147
#, c-format
msgid "Max members: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:203
+#: src/net/ea/guildhandler.cpp:150
#, c-format
msgid "Average level: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:206
+#: src/net/ea/guildhandler.cpp:153
#, c-format
msgid "Guild exp: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:209
+#: src/net/ea/guildhandler.cpp:156
#, c-format
msgid "Guild next exp: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:212
+#: src/net/ea/guildhandler.cpp:159
#, c-format
msgid "Guild castle: %s"
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:179
+#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:191
msgid "Item sharing enabled."
msgstr "Voorwerpdeling ingeschakeld."
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:183
+#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:195
msgid "Item sharing disabled."
msgstr "Voorwerpdeling uitgeschakeld."
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:187
+#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:199
msgid "Item sharing not possible."
msgstr "Voorwerpdeling is niet mogelijk."
@@ -7506,19 +7542,19 @@ msgstr "Voorwerpdeling onbekend."
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:167
+#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:179
msgid "Experience sharing enabled."
msgstr "Ervaringsdeling ingeschakeld."
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:171
+#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:183
msgid "Experience sharing disabled."
msgstr "Ervaringsdeling uitgeschakeld."
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:175
+#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:187
msgid "Experience sharing not possible."
msgstr "Ervaringsdeling is niet mogelijk."
@@ -7623,239 +7659,355 @@ msgid "Connection to server terminated. "
msgstr "Verbinding met server beëindigd. "
#. TRANSLATORS: message header
-#: src/net/ea/playerhandler.cpp:257 src/net/ea/playerhandler.cpp:273
-#: src/net/ea/playerhandler.cpp:361
+#: src/net/ea/playerhandler.cpp:192 src/net/ea/playerhandler.cpp:418
+#: src/net/ea/playerhandler.cpp:434
msgid "Message"
msgstr "Bericht"
#. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:259
+#: src/net/ea/playerhandler.cpp:420
msgid ""
"You are carrying more than half your weight. You are unable to regain "
"health."
msgstr "Je draagt meer dan de helft van jouw eigen gewicht. Je kan geen leven herstellen."
#. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:275
+#: src/net/ea/playerhandler.cpp:436
msgid "You are carrying less than half your weight. You can regain health."
msgstr ""
+#. TRANSLATORS: char rename error
+#: src/net/eathena/charserverhandler.cpp:516
+#: src/net/eathena/charserverhandler.cpp:553
+msgid "Character rename error."
+msgstr ""
+
+#: src/net/eathena/charserverhandler.cpp:531
+msgid "Character renamed."
+msgstr ""
+
+#. TRANSLATORS: char rename error
+#: src/net/eathena/charserverhandler.cpp:544
+msgid "Rename not allowed."
+msgstr ""
+
+#. TRANSLATORS: char rename error
+#: src/net/eathena/charserverhandler.cpp:548
+msgid "New name is not set."
+msgstr ""
+
+#. TRANSLATORS: char rename error
+#: src/net/eathena/charserverhandler.cpp:557
+msgid "Character not found."
+msgstr ""
+
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:125
+#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:124
#, c-format
msgid "Strength %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:127
+#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:126
#, c-format
msgid "Agility %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:129
+#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:128
#, c-format
msgid "Vitality %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:131
+#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:130
#, c-format
msgid "Intelligence %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:128 src/net/tmwa/generalhandler.cpp:133
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:132
#, c-format
msgid "Dexterity %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:135
+#: src/net/eathena/generalhandler.cpp:128 src/net/tmwa/generalhandler.cpp:134
#, c-format
msgid "Luck %s"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:152 src/net/tmwa/generalhandler.cpp:161
+#: src/net/eathena/generalhandler.cpp:159 src/net/tmwa/generalhandler.cpp:160
msgid "Authentication failed."
msgstr "Authenticatie gefaald."
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:155 src/net/tmwa/generalhandler.cpp:165
+#: src/net/eathena/generalhandler.cpp:162 src/net/tmwa/generalhandler.cpp:164
msgid "No servers available."
msgstr "Geen servers beschikbaar."
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:160 src/net/tmwa/generalhandler.cpp:171
+#: src/net/eathena/generalhandler.cpp:167 src/net/tmwa/generalhandler.cpp:170
msgid "Someone else is trying to use this account."
msgstr "Iemand anders is aan het proberen deze account te gebruiken."
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:165 src/net/tmwa/generalhandler.cpp:177
+#: src/net/eathena/generalhandler.cpp:172 src/net/tmwa/generalhandler.cpp:176
msgid "This account is already logged in."
msgstr "Deze account is al ingelogd."
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:169 src/net/tmwa/generalhandler.cpp:182
+#: src/net/eathena/generalhandler.cpp:176 src/net/tmwa/generalhandler.cpp:181
msgid "Speed hack detected."
msgstr "Snelheidshack gedetecteerd."
+#: src/net/eathena/generalhandler.cpp:179
+msgid "Server full."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:182
+msgid "Sorry, you are underaged."
+msgstr ""
+
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:172 src/net/tmwa/generalhandler.cpp:186
+#: src/net/eathena/generalhandler.cpp:185 src/net/tmwa/generalhandler.cpp:185
msgid "Duplicated login."
msgstr "Verdubbelde login."
+#: src/net/eathena/generalhandler.cpp:188
+msgid "To many connections from same ip."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:191
+msgid "Not paid for this time."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:194
+msgid "Pay suspended."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:197
+msgid "Pay changed."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:200
+msgid "Pay wrong ip."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:203
+msgid "Pay game room."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:206
+msgid "Disconnect forced by GM."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:210
+msgid "Ban japan refuse."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:213
+msgid "Remained other account."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:216
+msgid "Ip unfair."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:219
+msgid "Ip count all."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:222
+msgid "Ip count."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:226
+msgid "Memory."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:229
+msgid "Han valid."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:232
+msgid "Ip limited access."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:235
+msgid "Over characters list."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:238
+msgid "Ip blocked."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:241
+msgid "Invalid password count."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:244
+msgid "Not allowed race."
+msgstr ""
+
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:175 src/net/tmwa/generalhandler.cpp:190
+#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:189
msgid "Unknown connection error."
msgstr "Onbekende connectiefout."
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:280
+#: src/net/eathena/generalhandler.cpp:323 src/net/tmwa/generalhandler.cpp:279
msgid "Got disconnected from server!"
msgstr "De verbinding met de server werd verbroken!"
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:282 src/net/tmwa/generalhandler.cpp:308
+#: src/net/eathena/generalhandler.cpp:348 src/net/tmwa/generalhandler.cpp:307
msgid "Strength"
msgstr "Kracht"
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:310
+#: src/net/eathena/generalhandler.cpp:349 src/net/tmwa/generalhandler.cpp:309
msgid "Agility"
msgstr "Behendigheid"
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:284 src/net/tmwa/generalhandler.cpp:312
+#: src/net/eathena/generalhandler.cpp:350 src/net/tmwa/generalhandler.cpp:311
msgid "Vitality"
msgstr "Vitaliteit"
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:285 src/net/tmwa/generalhandler.cpp:314
+#: src/net/eathena/generalhandler.cpp:352 src/net/tmwa/generalhandler.cpp:314
msgid "Intelligence"
msgstr "Intelligentie"
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:286 src/net/tmwa/generalhandler.cpp:316
+#: src/net/eathena/generalhandler.cpp:353 src/net/tmwa/generalhandler.cpp:316
msgid "Dexterity"
msgstr "Handigheid"
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:287 src/net/tmwa/generalhandler.cpp:318
+#: src/net/eathena/generalhandler.cpp:354 src/net/tmwa/generalhandler.cpp:318
msgid "Luck"
msgstr "Geluk"
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:290 src/net/tmwa/generalhandler.cpp:323
+#: src/net/eathena/generalhandler.cpp:357 src/net/tmwa/generalhandler.cpp:322
msgid "Defense"
msgstr "Verdediging"
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:291 src/net/tmwa/generalhandler.cpp:325
+#: src/net/eathena/generalhandler.cpp:358 src/net/tmwa/generalhandler.cpp:324
msgid "M.Attack"
msgstr "M.Aanval"
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:292 src/net/tmwa/generalhandler.cpp:327
+#: src/net/eathena/generalhandler.cpp:359 src/net/tmwa/generalhandler.cpp:326
msgid "M.Defense"
msgstr "M.Verdediging"
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:294 src/net/tmwa/generalhandler.cpp:330
+#: src/net/eathena/generalhandler.cpp:361 src/net/tmwa/generalhandler.cpp:329
#, no-c-format
msgid "% Accuracy"
msgstr "% Nauwkeurigheid"
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:296 src/net/tmwa/generalhandler.cpp:333
+#: src/net/eathena/generalhandler.cpp:363 src/net/tmwa/generalhandler.cpp:332
#, no-c-format
msgid "% Evade"
msgstr "% Ontwijking"
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:298 src/net/tmwa/generalhandler.cpp:336
+#: src/net/eathena/generalhandler.cpp:365 src/net/tmwa/generalhandler.cpp:335
#, no-c-format
msgid "% Critical"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:299 src/net/tmwa/generalhandler.cpp:338
+#: src/net/eathena/generalhandler.cpp:366 src/net/tmwa/generalhandler.cpp:337
msgid "Attack Delay"
msgstr "Aanvalsvertraging"
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:300 src/net/tmwa/generalhandler.cpp:340
+#: src/net/eathena/generalhandler.cpp:367 src/net/tmwa/generalhandler.cpp:339
msgid "Walk Delay"
msgstr "Wandelvertraging"
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:301 src/net/tmwa/generalhandler.cpp:342
+#: src/net/eathena/generalhandler.cpp:368 src/net/tmwa/generalhandler.cpp:341
msgid "Attack Range"
msgstr "Aanvalsbereik"
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:302 src/net/tmwa/generalhandler.cpp:344
+#: src/net/eathena/generalhandler.cpp:369 src/net/tmwa/generalhandler.cpp:343
msgid "Damage per sec."
msgstr ""
-#: src/net/eathena/skillhandler.cpp:228 src/net/eathena/skillhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:370
+msgid "Karma"
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:371
+msgid "Manner"
+msgstr ""
+
+#: src/net/eathena/skillhandler.cpp:304 src/net/eathena/skillhandler.cpp:364
#, c-format
msgid "Unknown skill error: %d"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:235 src/net/tmwa/skillhandler.cpp:224
+#: src/net/eathena/skillhandler.cpp:311 src/net/tmwa/skillhandler.cpp:224
msgid "You have not yet reached a high enough lvl!"
msgstr "Je hebt nog geen hoog genoeg level bereikt!"
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:239 src/net/tmwa/skillhandler.cpp:228
+#: src/net/eathena/skillhandler.cpp:315 src/net/tmwa/skillhandler.cpp:228
msgid "Insufficient HP!"
msgstr "Onvoldoende leven!"
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:243 src/net/tmwa/skillhandler.cpp:232
+#: src/net/eathena/skillhandler.cpp:319 src/net/tmwa/skillhandler.cpp:232
msgid "Insufficient SP!"
msgstr "Onvoldoende Vaardigheidspunten!"
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:247 src/net/tmwa/skillhandler.cpp:236
+#: src/net/eathena/skillhandler.cpp:323 src/net/tmwa/skillhandler.cpp:236
msgid "You have no memos!"
msgstr "Je hebt geen memo's!"
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:251 src/net/tmwa/skillhandler.cpp:240
+#: src/net/eathena/skillhandler.cpp:327 src/net/tmwa/skillhandler.cpp:240
msgid "You cannot do that right now!"
msgstr "Je kan dat nu niet doen!"
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:255 src/net/tmwa/skillhandler.cpp:244
+#: src/net/eathena/skillhandler.cpp:331 src/net/tmwa/skillhandler.cpp:244
msgid "Seems you need more money... ;-)"
msgstr "Het lijkt erop dat je meer geld nodig hebt... ;-)"
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:259 src/net/tmwa/skillhandler.cpp:248
+#: src/net/eathena/skillhandler.cpp:335 src/net/tmwa/skillhandler.cpp:248
msgid "You cannot use this skill with that kind of weapon!"
msgstr "Je kan die vaardigheid niet gebruiken met dit type wapen!"
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:264 src/net/tmwa/skillhandler.cpp:253
+#: src/net/eathena/skillhandler.cpp:340 src/net/tmwa/skillhandler.cpp:253
msgid "You need another red gem!"
msgstr "Je hebt een andere rode edelsteen nodig!"
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:268 src/net/tmwa/skillhandler.cpp:257
+#: src/net/eathena/skillhandler.cpp:344 src/net/tmwa/skillhandler.cpp:257
msgid "You need another blue gem!"
msgstr "Je hebt een andere blauwe edelsteen nodig!"
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:272 src/net/tmwa/skillhandler.cpp:261
+#: src/net/eathena/skillhandler.cpp:348 src/net/tmwa/skillhandler.cpp:261
msgid "You're carrying to much to do this!"
msgstr "Je draagt teveel bij je om dit te doen!"
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:276 src/net/tmwa/skillhandler.cpp:265
+#: src/net/eathena/skillhandler.cpp:352 src/net/tmwa/skillhandler.cpp:265
msgid "Huh? What's that?"
msgstr "Huh? Wat is dat?"
@@ -7872,32 +8024,32 @@ msgid "%s wants to trade with you, do you accept?"
msgstr "%s wil met jou handelen, aanvaard je dit?"
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:349
+#: src/net/tmwa/charserverhandler.cpp:351
msgid "Strength:"
msgstr "Sterkte:"
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:351
+#: src/net/tmwa/charserverhandler.cpp:353
msgid "Agility:"
msgstr "Agiliteit:"
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:353
+#: src/net/tmwa/charserverhandler.cpp:355
msgid "Vitality:"
msgstr "Vitaliteit:"
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:355
+#: src/net/tmwa/charserverhandler.cpp:357
msgid "Intelligence:"
msgstr "Intelligentie:"
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:357
+#: src/net/tmwa/charserverhandler.cpp:359
msgid "Dexterity:"
msgstr "Dexteriteit:"
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:359
+#: src/net/tmwa/charserverhandler.cpp:361
msgid "Luck:"
msgstr "Geluk:"
@@ -8208,269 +8360,306 @@ msgstr "Je hebt de groep verlaten."
#. TRANSLATORS: notification message
#: src/resources/notifications.h:143
+msgid "You cant left party on this map."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:147
+msgid "You was kicked from party."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:151
+msgid "You cant be kicked kicked from party on this map."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:155
#, c-format
msgid "%s has joined your party."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:147
+#: src/resources/notifications.h:159
#, c-format
msgid "%s is already a member of a party."
msgstr "%s is al een lid van een groep."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:151
+#: src/resources/notifications.h:163
#, c-format
msgid "%s refused your invitation."
msgstr "%s wees jouw uitnodiging af."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:155
+#: src/resources/notifications.h:167
#, c-format
msgid "%s is now a member of your party."
msgstr "%s is nu een lid van jouw groep."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:159
+#: src/resources/notifications.h:171
#, c-format
msgid "%s can't join your party because party is full."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:163
+#: src/resources/notifications.h:175
#, c-format
msgid "QQQ Unknown invite response for %s."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:191
+#: src/resources/notifications.h:203
#, c-format
msgid "%s has left your party."
msgstr "%s heeft jouw groep verlaten."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:195
+#: src/resources/notifications.h:207 src/resources/notifications.h:215
+#, c-format
+msgid "%s cant be kicked from party on this map."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:211
+#, c-format
+msgid "%s has kicked from your party."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:219
#, c-format
msgid "An unknown member tried to say: %s"
msgstr "Een onbekend lid probeerde te zeggen: %s"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:199
+#: src/resources/notifications.h:223
#, c-format
msgid "%s is not in your party!"
msgstr "%s is niet in jouw groep!"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:203
+#: src/resources/notifications.h:227
#, c-format
msgid "You picked up %s."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:207
+#: src/resources/notifications.h:231
#, c-format
msgid "You spent %s."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:211
+#: src/resources/notifications.h:235
msgid "Cannot raise skill!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:215
+#: src/resources/notifications.h:239
msgid "Equip ammunition first."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:219
+#: src/resources/notifications.h:243
#, c-format
msgid "Trading with %s isn't possible. Trade partner is too far away."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:224
+#: src/resources/notifications.h:248
#, c-format
msgid "Trading with %s isn't possible. Character doesn't exist."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:228
+#: src/resources/notifications.h:252
msgid "Trade cancelled due to an unknown reason."
msgstr "Handel onderbroken vanwege een onbekende reden."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:232
+#: src/resources/notifications.h:256
#, c-format
msgid "Trade with %s cancelled."
msgstr "Handel met %s geannuleerd."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:236
+#: src/resources/notifications.h:260
#, c-format
msgid "Unhandled trade cancel packet with %s"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:240
+#: src/resources/notifications.h:264
msgid "Failed adding item. Trade partner is over weighted."
msgstr "Kan voorwerp niet toevoegen. Handelspartner is al te zwaar beladen."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:244
+#: src/resources/notifications.h:268
msgid "Failed adding item. Trade partner has no free slot."
msgstr "Kan voorwerp niet toevoegen. Handelspartner heeft geen vrij slot."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:248
+#: src/resources/notifications.h:272
msgid "Failed adding item. You can't trade this item."
msgstr "Gefaald om voorwerp toe te voegen. U kan dit voorwerp niet verhandelen."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:252
+#: src/resources/notifications.h:276
msgid "Failed adding item for unknown reason."
msgstr "Kan voorwerp niet toevoegen voor een onbekende reden."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:256
+#: src/resources/notifications.h:280
msgid "Trade canceled."
msgstr "Handel geannuleerd."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:260
+#: src/resources/notifications.h:284
msgid "Trade completed."
msgstr "Handel voltooid."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:264
+#: src/resources/notifications.h:288
msgid "Kick failed!"
msgstr "Kick gefaald!"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:268
+#: src/resources/notifications.h:292
msgid "Kick succeeded!"
msgstr "Kick succesvol!"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:272
+#: src/resources/notifications.h:296
#, c-format
msgid "MVP player: %s"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:276
+#: src/resources/notifications.h:300
msgid "All whispers ignored."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:280
+#: src/resources/notifications.h:304
msgid "All whispers ignore failed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:284
+#: src/resources/notifications.h:308
msgid "All whispers unignored."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:288
+#: src/resources/notifications.h:312
msgid "All whispers unignore failed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:295
+#: src/resources/notifications.h:319
msgid "pvp off, gvg off"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:299
+#: src/resources/notifications.h:323
msgid "pvp on"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:303
+#: src/resources/notifications.h:327
msgid "gvg on"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:307
+#: src/resources/notifications.h:331
msgid "pvp on, gvg on"
msgstr "pvp aan, gvg aan"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:311
+#: src/resources/notifications.h:335
msgid "unknown pvp"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:315
+#: src/resources/notifications.h:339
#, c-format
msgid "Char from account %s is already in your party!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:319
+#: src/resources/notifications.h:343
#, c-format
msgid "%s blocked invite!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:323
+#: src/resources/notifications.h:347
msgid "Char is not online!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:327
+#: src/resources/notifications.h:351
msgid "Pet catch failed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:331
+#: src/resources/notifications.h:355
msgid "Pet catched."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:335
+#: src/resources/notifications.h:359
#, c-format
msgid "Pet catch unkown error: %d."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:339
+#: src/resources/notifications.h:363
msgid "Your mercenary duty hour is over."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:343
+#: src/resources/notifications.h:367
msgid "Your mercenary was killed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:347
+#: src/resources/notifications.h:371
msgid "Your mercenary was fired."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:351
+#: src/resources/notifications.h:375
msgid "Your mercenary run away."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:355
+#: src/resources/notifications.h:379
msgid "Mercenary unknown state."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:359
-msgid "Your feed your homunculus."
+#: src/resources/notifications.h:383
+msgid "You feed your homunculus."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:363
+#: src/resources/notifications.h:387
#, c-format
msgid "You cant feed homunculus, because not have %s."
msgstr ""
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:391
+msgid "Card insert failed."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:395
+msgid "Card inserted."
+msgstr ""
+
#. TRANSLATORS: chat option changed message
#: src/utils/booleanoptions.h:27
#, c-format
diff --git a/po/nl_BE.po b/po/nl_BE.po
index 65a78ded8..44a68010e 100644
--- a/po/nl_BE.po
+++ b/po/nl_BE.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-10-08 01:19+0300\n"
-"PO-Revision-Date: 2014-09-28 10:01+0000\n"
+"POT-Creation-Date: 2014-10-10 00:16+0300\n"
+"PO-Revision-Date: 2014-10-08 10:02+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Dutch (Belgium) (http://www.transifex.com/projects/p/manaplus/"
"language/nl_BE/)\n"
@@ -5175,15 +5175,13 @@ msgstr ""
#. TRANSLATORS: char select dialog. button.
#: src/gui/windows/charselectdialog.cpp:73
-#, fuzzy
msgid "Switch"
-msgstr "Verwissel Login"
+msgstr ""
#. TRANSLATORS: char select dialog. button.
#: src/gui/windows/charselectdialog.cpp:75
-#, fuzzy
msgid "Password"
-msgstr "Wachtwoord:"
+msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: updater window button
@@ -5227,9 +5225,8 @@ msgid "Please set new pincode"
msgstr ""
#: src/gui/windows/charselectdialog.cpp:240
-#, fuzzy
msgid "Please enter new name"
-msgstr "Gelieve een naam te specifiëren."
+msgstr ""
#. TRANSLATORS: char select dialog. player info message.
#: src/gui/windows/charselectdialog.cpp:259
@@ -5880,7 +5877,7 @@ msgstr "Toon links in aankondigingen"
#. TRANSLATORS: shop window dialog
#. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:776 src/net/ea/tradehandler.cpp:233
+#: src/gui/windows/shopwindow.cpp:776 src/net/ea/tradehandler.cpp:192
msgid "Request for Trade"
msgstr "Handel aanvragen"
@@ -7534,19 +7531,19 @@ msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:191
+#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:207
msgid "Item sharing enabled."
msgstr "Voorwerpdeling ingeschakeld."
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:195
+#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:211
msgid "Item sharing disabled."
msgstr "Voorwerpdeling uitgeschakeld."
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:199
+#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:215
msgid "Item sharing not possible."
msgstr "Voorwerpdeling is niet mogelijk."
@@ -7557,19 +7554,19 @@ msgstr "Voorwerpdeling onbekend."
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:179
+#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:195
msgid "Experience sharing enabled."
msgstr "Ervaringsdeling ingeschakeld."
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:183
+#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:199
msgid "Experience sharing disabled."
msgstr "Ervaringsdeling uitgeschakeld."
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:187
+#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:203
msgid "Experience sharing not possible."
msgstr "Ervaringsdeling is niet mogelijk."
@@ -7697,14 +7694,12 @@ msgstr ""
#. TRANSLATORS: char rename error
#: src/net/eathena/charserverhandler.cpp:516
#: src/net/eathena/charserverhandler.cpp:553
-#, fuzzy
msgid "Character rename error."
-msgstr "Personage verwijderd."
+msgstr ""
#: src/net/eathena/charserverhandler.cpp:531
-#, fuzzy
msgid "Character renamed."
-msgstr "Personage verwijderd."
+msgstr ""
#. TRANSLATORS: char rename error
#: src/net/eathena/charserverhandler.cpp:544
@@ -7718,9 +7713,8 @@ msgstr ""
#. TRANSLATORS: char rename error
#: src/net/eathena/charserverhandler.cpp:557
-#, fuzzy
msgid "Character not found."
-msgstr "Personagepunten: %d"
+msgstr ""
#. TRANSLATORS: player stat
#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:124
@@ -7784,9 +7778,8 @@ msgid "Speed hack detected."
msgstr "Snelheidshack gedetecteerd."
#: src/net/eathena/generalhandler.cpp:179
-#, fuzzy
msgid "Server full."
-msgstr "Server:"
+msgstr ""
#: src/net/eathena/generalhandler.cpp:182
msgid "Sorry, you are underaged."
@@ -7858,18 +7851,16 @@ msgid "Ip limited access."
msgstr ""
#: src/net/eathena/generalhandler.cpp:235
-#, fuzzy
msgid "Over characters list."
-msgstr "Personage verwijderd."
+msgstr ""
#: src/net/eathena/generalhandler.cpp:238
msgid "Ip blocked."
msgstr ""
#: src/net/eathena/generalhandler.cpp:241
-#, fuzzy
msgid "Invalid password count."
-msgstr "Oud wachtwoord is ongeldig."
+msgstr ""
#: src/net/eathena/generalhandler.cpp:244
msgid "Not allowed race."
@@ -8036,13 +8027,13 @@ msgid "Huh? What's that?"
msgstr "Huh? Wat is dat?"
#. TRANSLATORS: trade header
-#: src/net/ea/tradehandler.cpp:100
+#: src/net/ea/tradehandler.cpp:105
#, c-format
msgid "Trade: You and %s"
msgstr "Handelen: Jij en %s"
#. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:235
+#: src/net/ea/tradehandler.cpp:194
#, c-format
msgid "%s wants to trade with you, do you accept?"
msgstr "%s wil met jou handelen, aanvaard je dit?"
@@ -8261,430 +8252,455 @@ msgstr "Kan niets kopen."
#. TRANSLATORS: notification message
#: src/resources/notifications.h:47
+#, fuzzy
+msgid "Unable to buy. You not have enought money."
+msgstr "Je hebt niet genoeg geld."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:51
+#, fuzzy
+msgid "Unable to buy. You overweight."
+msgstr "Kan niets kopen."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:55
+msgid "Unable to buy. You have too many items."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:59
msgid "Nothing to sell."
msgstr "Niets te verkopen."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:51
+#: src/resources/notifications.h:63
msgid "Thanks for selling."
msgstr "Bedankt voor het verkopen."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:55
+#: src/resources/notifications.h:67
msgid "Unable to sell."
msgstr "Kan niets verkopen."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:59
+#: src/resources/notifications.h:71
msgid "Unable to sell while trading."
msgstr "Kan niets verkopen terwijl je aan het handelen bent."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:63
+#: src/resources/notifications.h:75
msgid "Unable to sell unsellable item."
msgstr "Niet mogelijk om onverkoopbaar voorwerp te verkopen."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:67
+#: src/resources/notifications.h:79
#, c-format
msgid "Online users: %d"
msgstr "Online gebruikers: %d"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:71
+#: src/resources/notifications.h:83
msgid "Guild created."
msgstr "Guild aangemaakt."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:75
+#: src/resources/notifications.h:87
msgid "You are already in guild."
msgstr "U bent al in deze guild."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:79
+#: src/resources/notifications.h:91
msgid "Emperium check failed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:83
+#: src/resources/notifications.h:95
msgid "Unknown server response."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:87
+#: src/resources/notifications.h:99
msgid "You have left the guild."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:91
+#: src/resources/notifications.h:103
msgid "Could not invite user to guild."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:95
+#: src/resources/notifications.h:107
msgid "User rejected guild invite."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:99
+#: src/resources/notifications.h:111
msgid "User is now part of your guild."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:103
+#: src/resources/notifications.h:115
msgid "Your guild is full."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:107
+#: src/resources/notifications.h:119
msgid "Unknown guild invite response."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:111
+#: src/resources/notifications.h:123
#, c-format
msgid "%s has left your guild."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:115
+#: src/resources/notifications.h:127
msgid "You were kicked from guild."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:119
+#: src/resources/notifications.h:131
#, c-format
msgid "%s has kicked from your guild."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:123
+#: src/resources/notifications.h:135
msgid "Failed to use item."
msgstr "Kan voorwerp niet gebruiken."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:127
+#: src/resources/notifications.h:139
msgid "Unable to equip."
msgstr "Kan dit niet uitrusten."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:131
+#: src/resources/notifications.h:143
+msgid "Unable to equip because you have wrong level."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:147
msgid "Could not create party."
msgstr "Kan geen groep aanmaken."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:135
+#: src/resources/notifications.h:151
msgid "Party successfully created."
msgstr "Groep succesvol aangemaakt."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:139
+#: src/resources/notifications.h:155
msgid "You have left the party."
msgstr "Je hebt de groep verlaten."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:143
-#, fuzzy
+#: src/resources/notifications.h:159
msgid "You cant left party on this map."
-msgstr "Je hebt de groep verlaten."
+msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:147
-#, fuzzy
+#: src/resources/notifications.h:163
msgid "You was kicked from party."
-msgstr "Uit de groep gooien"
+msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:151
-msgid "You cant be kicked kicked from party on this map."
+#: src/resources/notifications.h:167
+msgid "You cant be kicked from party on this map."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:155
+#: src/resources/notifications.h:171
#, c-format
msgid "%s has joined your party."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:159
+#: src/resources/notifications.h:175
#, c-format
msgid "%s is already a member of a party."
msgstr "%s is al een lid van een groep."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:163
+#: src/resources/notifications.h:179
#, c-format
msgid "%s refused your invitation."
msgstr "%s wees jouw uitnodiging af."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:167
+#: src/resources/notifications.h:183
#, c-format
msgid "%s is now a member of your party."
msgstr "%s is nu een lid van jouw groep."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:171
+#: src/resources/notifications.h:187
#, c-format
msgid "%s can't join your party because party is full."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:175
+#: src/resources/notifications.h:191
#, c-format
msgid "QQQ Unknown invite response for %s."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:203
+#: src/resources/notifications.h:219
#, c-format
msgid "%s has left your party."
msgstr "%s heeft jouw groep verlaten."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:207 src/resources/notifications.h:215
+#: src/resources/notifications.h:223 src/resources/notifications.h:231
#, c-format
msgid "%s cant be kicked from party on this map."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:211
-#, fuzzy, c-format
+#: src/resources/notifications.h:227
+#, c-format
msgid "%s has kicked from your party."
-msgstr "%s heeft jouw groep verlaten."
+msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:219
+#: src/resources/notifications.h:235
#, c-format
msgid "An unknown member tried to say: %s"
msgstr "Een onbekend lid probeerde te zeggen: %s"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:223
+#: src/resources/notifications.h:239
#, c-format
msgid "%s is not in your party!"
msgstr "%s is niet in jouw groep!"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:227
+#: src/resources/notifications.h:243
#, c-format
msgid "You picked up %s."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:231
+#: src/resources/notifications.h:247
#, c-format
msgid "You spent %s."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:235
+#: src/resources/notifications.h:251
msgid "Cannot raise skill!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:239
+#: src/resources/notifications.h:255
msgid "Equip ammunition first."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:243
+#: src/resources/notifications.h:259
#, c-format
msgid "Trading with %s isn't possible. Trade partner is too far away."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:248
+#: src/resources/notifications.h:264
#, c-format
msgid "Trading with %s isn't possible. Character doesn't exist."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:252
+#: src/resources/notifications.h:268
msgid "Trade cancelled due to an unknown reason."
msgstr "Handel onderbroken vanwege een onbekende reden."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:256
+#: src/resources/notifications.h:272
#, c-format
msgid "Trade with %s cancelled."
msgstr "Handel met %s geannuleerd."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:260
+#: src/resources/notifications.h:276
+#, fuzzy, c-format
+msgid "Trade with %s cancelled, because player is busy"
+msgstr "Handel met %s geannuleerd."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:280
#, c-format
msgid "Unhandled trade cancel packet with %s"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:264
+#: src/resources/notifications.h:284
msgid "Failed adding item. Trade partner is over weighted."
msgstr "Kan voorwerp niet toevoegen. Handelspartner is al te zwaar beladen."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:268
+#: src/resources/notifications.h:288
msgid "Failed adding item. Trade partner has no free slot."
msgstr "Kan voorwerp niet toevoegen. Handelspartner heeft geen vrij slot."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:272
+#: src/resources/notifications.h:292
msgid "Failed adding item. You can't trade this item."
msgstr ""
"Gefaald om voorwerp toe te voegen. U kan dit voorwerp niet verhandelen."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:276
+#: src/resources/notifications.h:296
msgid "Failed adding item for unknown reason."
msgstr "Kan voorwerp niet toevoegen voor een onbekende reden."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:280
+#: src/resources/notifications.h:300
msgid "Trade canceled."
msgstr "Handel geannuleerd."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:284
+#: src/resources/notifications.h:304
msgid "Trade completed."
msgstr "Handel voltooid."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:288
+#: src/resources/notifications.h:308
msgid "Kick failed!"
msgstr "Kick gefaald!"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:292
+#: src/resources/notifications.h:312
msgid "Kick succeeded!"
msgstr "Kick succesvol!"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:296
+#: src/resources/notifications.h:316
#, c-format
msgid "MVP player: %s"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:300
+#: src/resources/notifications.h:320
msgid "All whispers ignored."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:304
+#: src/resources/notifications.h:324
msgid "All whispers ignore failed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:308
+#: src/resources/notifications.h:328
msgid "All whispers unignored."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:312
+#: src/resources/notifications.h:332
msgid "All whispers unignore failed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:319
+#: src/resources/notifications.h:339
msgid "pvp off, gvg off"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:323
+#: src/resources/notifications.h:343
msgid "pvp on"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:327
+#: src/resources/notifications.h:347
msgid "gvg on"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:331
+#: src/resources/notifications.h:351
msgid "pvp on, gvg on"
msgstr "pvp aan, gvg aan"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:335
+#: src/resources/notifications.h:355
msgid "unknown pvp"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:339
+#: src/resources/notifications.h:359
#, c-format
msgid "Char from account %s is already in your party!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:343
+#: src/resources/notifications.h:363
#, c-format
msgid "%s blocked invite!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:347
+#: src/resources/notifications.h:367
msgid "Char is not online!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:351
+#: src/resources/notifications.h:371
msgid "Pet catch failed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:355
+#: src/resources/notifications.h:375
msgid "Pet catched."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:359
+#: src/resources/notifications.h:379
#, c-format
msgid "Pet catch unkown error: %d."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:363
+#: src/resources/notifications.h:383
msgid "Your mercenary duty hour is over."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:367
+#: src/resources/notifications.h:387
msgid "Your mercenary was killed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:371
+#: src/resources/notifications.h:391
msgid "Your mercenary was fired."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:375
+#: src/resources/notifications.h:395
msgid "Your mercenary run away."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:379
+#: src/resources/notifications.h:399
msgid "Mercenary unknown state."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:383
+#: src/resources/notifications.h:403
msgid "You feed your homunculus."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:387
+#: src/resources/notifications.h:407
#, c-format
msgid "You cant feed homunculus, because not have %s."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:391
-#, fuzzy
+#: src/resources/notifications.h:411
msgid "Card insert failed."
-msgstr "Handel mislukte!"
+msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:395
+#: src/resources/notifications.h:415
msgid "Card inserted."
msgstr ""
diff --git a/po/pl.po b/po/pl.po
index 5dc016ff5..7f5731b87 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -14,8 +14,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-10-08 01:19+0300\n"
-"PO-Revision-Date: 2014-09-28 10:01+0000\n"
+"POT-Creation-Date: 2014-10-10 00:16+0300\n"
+"PO-Revision-Date: 2014-10-08 10:02+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Polish (http://www.transifex.com/projects/p/manaplus/language/"
"pl/)\n"
@@ -5182,15 +5182,13 @@ msgstr "Konto %s (czas poprzedniego zalogowania %s)"
#. TRANSLATORS: char select dialog. button.
#: src/gui/windows/charselectdialog.cpp:73
-#, fuzzy
msgid "Switch"
-msgstr "Przeloguj się"
+msgstr ""
#. TRANSLATORS: char select dialog. button.
#: src/gui/windows/charselectdialog.cpp:75
-#, fuzzy
msgid "Password"
-msgstr "Hasło:"
+msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: updater window button
@@ -5234,9 +5232,8 @@ msgid "Please set new pincode"
msgstr ""
#: src/gui/windows/charselectdialog.cpp:240
-#, fuzzy
msgid "Please enter new name"
-msgstr "Proszę wpisać prawidłową nazwę."
+msgstr ""
#. TRANSLATORS: char select dialog. player info message.
#: src/gui/windows/charselectdialog.cpp:259
@@ -5894,7 +5891,7 @@ msgstr "Pokazuj linki w ogłoszeniach"
#. TRANSLATORS: shop window dialog
#. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:776 src/net/ea/tradehandler.cpp:233
+#: src/gui/windows/shopwindow.cpp:776 src/net/ea/tradehandler.cpp:192
msgid "Request for Trade"
msgstr "Prośba o handel"
@@ -7546,19 +7543,19 @@ msgstr "Zamek gildii: %s"
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:191
+#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:207
msgid "Item sharing enabled."
msgstr "Włączono dzielenie się przedmiotami."
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:195
+#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:211
msgid "Item sharing disabled."
msgstr "Wyłączono dzielenie się przedmiotami."
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:199
+#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:215
msgid "Item sharing not possible."
msgstr "Nie można włączyć dzielenia się przedmiotami."
@@ -7569,19 +7566,19 @@ msgstr "Stan dzielenia się przedmiotami nieznany."
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:179
+#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:195
msgid "Experience sharing enabled."
msgstr "Podział doświadczenia włączony."
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:183
+#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:199
msgid "Experience sharing disabled."
msgstr "Podział doświadczenia wyłączony."
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:187
+#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:203
msgid "Experience sharing not possible."
msgstr ""
"Podział doświadczenia nie jest możliwy- prawdopodobnie maksymalna róznica "
@@ -7712,14 +7709,12 @@ msgstr ""
#. TRANSLATORS: char rename error
#: src/net/eathena/charserverhandler.cpp:516
#: src/net/eathena/charserverhandler.cpp:553
-#, fuzzy
msgid "Character rename error."
-msgstr "Postać skasowana."
+msgstr ""
#: src/net/eathena/charserverhandler.cpp:531
-#, fuzzy
msgid "Character renamed."
-msgstr "Postać skasowana."
+msgstr ""
#. TRANSLATORS: char rename error
#: src/net/eathena/charserverhandler.cpp:544
@@ -7733,9 +7728,8 @@ msgstr ""
#. TRANSLATORS: char rename error
#: src/net/eathena/charserverhandler.cpp:557
-#, fuzzy
msgid "Character not found."
-msgstr "Punkty postaci: %d"
+msgstr ""
#. TRANSLATORS: player stat
#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:124
@@ -7799,9 +7793,8 @@ msgid "Speed hack detected."
msgstr "Wykryto speed hack."
#: src/net/eathena/generalhandler.cpp:179
-#, fuzzy
msgid "Server full."
-msgstr "Serwer:"
+msgstr ""
#: src/net/eathena/generalhandler.cpp:182
msgid "Sorry, you are underaged."
@@ -7873,18 +7866,16 @@ msgid "Ip limited access."
msgstr ""
#: src/net/eathena/generalhandler.cpp:235
-#, fuzzy
msgid "Over characters list."
-msgstr "Postać skasowana."
+msgstr ""
#: src/net/eathena/generalhandler.cpp:238
msgid "Ip blocked."
msgstr ""
#: src/net/eathena/generalhandler.cpp:241
-#, fuzzy
msgid "Invalid password count."
-msgstr "Stare hasło nieprawidłowe."
+msgstr ""
#: src/net/eathena/generalhandler.cpp:244
msgid "Not allowed race."
@@ -8051,13 +8042,13 @@ msgid "Huh? What's that?"
msgstr "Eee? A to to co?"
#. TRANSLATORS: trade header
-#: src/net/ea/tradehandler.cpp:100
+#: src/net/ea/tradehandler.cpp:105
#, c-format
msgid "Trade: You and %s"
msgstr "Handel: Ty i %s"
#. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:235
+#: src/net/ea/tradehandler.cpp:194
#, c-format
msgid "%s wants to trade with you, do you accept?"
msgstr "%s chce handlować z Tobą, zgadzasz się?"
@@ -8276,234 +8267,254 @@ msgstr "Nie można kupić."
#. TRANSLATORS: notification message
#: src/resources/notifications.h:47
+#, fuzzy
+msgid "Unable to buy. You not have enought money."
+msgstr "Nie masz wystarczającej ilości pieniędzy."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:51
+#, fuzzy
+msgid "Unable to buy. You overweight."
+msgstr "Nie można kupić."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:55
+msgid "Unable to buy. You have too many items."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:59
msgid "Nothing to sell."
msgstr "Nie masz niczego do sprzedania."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:51
+#: src/resources/notifications.h:63
msgid "Thanks for selling."
msgstr "Dziękuję za sprzedaż."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:55
+#: src/resources/notifications.h:67
msgid "Unable to sell."
msgstr "Nie można sprzedać."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:59
+#: src/resources/notifications.h:71
msgid "Unable to sell while trading."
msgstr "Nie można sprzedawać podczas handlowania."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:63
+#: src/resources/notifications.h:75
msgid "Unable to sell unsellable item."
msgstr "Nie można sprzedać- niesprzedawalny przedmiot."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:67
+#: src/resources/notifications.h:79
#, c-format
msgid "Online users: %d"
msgstr "Gracze online: %d"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:71
+#: src/resources/notifications.h:83
msgid "Guild created."
msgstr "Gildia została utworzona."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:75
+#: src/resources/notifications.h:87
msgid "You are already in guild."
msgstr "Już jesteś w gildii."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:79
+#: src/resources/notifications.h:91
msgid "Emperium check failed."
msgstr "Na tym serwerze nie można utworzyć gildii."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:83
+#: src/resources/notifications.h:95
msgid "Unknown server response."
msgstr "Nieznana odpowiedź serwera."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:87
+#: src/resources/notifications.h:99
msgid "You have left the guild."
msgstr "Opuściłeś/aś gildię."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:91
+#: src/resources/notifications.h:103
msgid "Could not invite user to guild."
msgstr "Nie można zaprosić gracza do gildii."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:95
+#: src/resources/notifications.h:107
msgid "User rejected guild invite."
msgstr "Gracz odrzucił zaproszenie do gildii."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:99
+#: src/resources/notifications.h:111
msgid "User is now part of your guild."
msgstr "Gracz należy teraz do Twojej gildii."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:103
+#: src/resources/notifications.h:115
msgid "Your guild is full."
msgstr "Twoja gildia jest pełna."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:107
+#: src/resources/notifications.h:119
msgid "Unknown guild invite response."
msgstr "Nieznana odpowiedź na zaproszenie do gildii."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:111
+#: src/resources/notifications.h:123
#, c-format
msgid "%s has left your guild."
msgstr "%s opuścił/a Twoją gildię."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:115
+#: src/resources/notifications.h:127
msgid "You were kicked from guild."
msgstr "Zostałeś/aś wykopany/a z gildii."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:119
+#: src/resources/notifications.h:131
#, c-format
msgid "%s has kicked from your guild."
msgstr "%s wyrzucił/a Cię z gildii."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:123
+#: src/resources/notifications.h:135
msgid "Failed to use item."
msgstr "Nie można użyć przedmiotu."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:127
+#: src/resources/notifications.h:139
msgid "Unable to equip."
msgstr "Nie można założyć."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:131
+#: src/resources/notifications.h:143
+msgid "Unable to equip because you have wrong level."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:147
msgid "Could not create party."
msgstr "Nie udało się utworzyć grupy."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:135
+#: src/resources/notifications.h:151
msgid "Party successfully created."
msgstr "Grupa utworzona z powodzeniem."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:139
+#: src/resources/notifications.h:155
msgid "You have left the party."
msgstr "Opuściłeś/aś grupę."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:143
-#, fuzzy
+#: src/resources/notifications.h:159
msgid "You cant left party on this map."
-msgstr "Opuściłeś/aś grupę."
+msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:147
-#, fuzzy
+#: src/resources/notifications.h:163
msgid "You was kicked from party."
-msgstr "Zostałeś/aś wykopany/a z gildii."
+msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:151
-msgid "You cant be kicked kicked from party on this map."
+#: src/resources/notifications.h:167
+msgid "You cant be kicked from party on this map."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:155
+#: src/resources/notifications.h:171
#, c-format
msgid "%s has joined your party."
msgstr "%s przyłączył/a się do Twojej drużyny."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:159
+#: src/resources/notifications.h:175
#, c-format
msgid "%s is already a member of a party."
msgstr "%s już należy do grupy."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:163
+#: src/resources/notifications.h:179
#, c-format
msgid "%s refused your invitation."
msgstr "%s odrzucił/a Twoje zaproszenie."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:167
+#: src/resources/notifications.h:183
#, c-format
msgid "%s is now a member of your party."
msgstr "%s został/a przyłączony/a do grupy."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:171
+#: src/resources/notifications.h:187
#, c-format
msgid "%s can't join your party because party is full."
msgstr "%s nie może się przyłączyć, ponieważ grupa jest już pełna."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:175
+#: src/resources/notifications.h:191
#, c-format
msgid "QQQ Unknown invite response for %s."
msgstr "QQQ Nieznana odpowiedź na zaproszenie od %s."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:203
+#: src/resources/notifications.h:219
#, c-format
msgid "%s has left your party."
msgstr "%s opuścił/a Twoją grupę."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:207 src/resources/notifications.h:215
-#, fuzzy, c-format
+#: src/resources/notifications.h:223 src/resources/notifications.h:231
+#, c-format
msgid "%s cant be kicked from party on this map."
-msgstr "%s wyrzucił/a Cię z gildii."
+msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:211
-#, fuzzy, c-format
+#: src/resources/notifications.h:227
+#, c-format
msgid "%s has kicked from your party."
-msgstr "%s wyrzucił/a Cię z gildii."
+msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:219
+#: src/resources/notifications.h:235
#, c-format
msgid "An unknown member tried to say: %s"
msgstr "Nieznany członek grupy chciał powiedzieć: %s"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:223
+#: src/resources/notifications.h:239
#, c-format
msgid "%s is not in your party!"
msgstr "%s nie jest w twojej grupie!"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:227
+#: src/resources/notifications.h:243
#, c-format
msgid "You picked up %s."
msgstr "Podniosłeś/aś %s."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:231
+#: src/resources/notifications.h:247
#, c-format
msgid "You spent %s."
msgstr "Wydałeś/aś %s."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:235
+#: src/resources/notifications.h:251
msgid "Cannot raise skill!"
msgstr "Nie można podnieść poziomu umiejętności!"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:239
+#: src/resources/notifications.h:255
msgid "Equip ammunition first."
msgstr "Dodaj amunicję do ekwipunku."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:243
+#: src/resources/notifications.h:259
#, c-format
msgid "Trading with %s isn't possible. Trade partner is too far away."
msgstr ""
@@ -8511,198 +8522,203 @@ msgstr ""
"daleko."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:248
+#: src/resources/notifications.h:264
#, c-format
msgid "Trading with %s isn't possible. Character doesn't exist."
msgstr "Handel z %s jest niemożliwy. Postać nie istnieje."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:252
+#: src/resources/notifications.h:268
msgid "Trade cancelled due to an unknown reason."
msgstr "Handel anulowany z nieznanych powodów."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:256
+#: src/resources/notifications.h:272
#, c-format
msgid "Trade with %s cancelled."
msgstr "Handel z %s anulowany."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:260
+#: src/resources/notifications.h:276
+#, fuzzy, c-format
+msgid "Trade with %s cancelled, because player is busy"
+msgstr "Handel z %s anulowany."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:280
#, c-format
msgid "Unhandled trade cancel packet with %s"
msgstr "Nieobsługiwany pakiet anulowania handlu z %s."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:264
+#: src/resources/notifications.h:284
msgid "Failed adding item. Trade partner is over weighted."
msgstr "Nie można dodać przedmiotu. Osoba z którą handlujesz jest przeciążona."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:268
+#: src/resources/notifications.h:288
msgid "Failed adding item. Trade partner has no free slot."
msgstr ""
"Nie można dodać przedmiotu. Osoba z którą handlujesz nie ma wolnych miejsc w "
"inwentarzu."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:272
+#: src/resources/notifications.h:292
msgid "Failed adding item. You can't trade this item."
msgstr "Nie można dodać przedmiotu. Tym przedmiotem nie można handlować."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:276
+#: src/resources/notifications.h:296
msgid "Failed adding item for unknown reason."
msgstr "Nie można dodać przedmiotu z niewiadomych przyczyn."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:280
+#: src/resources/notifications.h:300
msgid "Trade canceled."
msgstr "Handel anulowany."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:284
+#: src/resources/notifications.h:304
msgid "Trade completed."
msgstr "Handel zakończony."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:288
+#: src/resources/notifications.h:308
msgid "Kick failed!"
msgstr "Wykopanie nie powiodło się!"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:292
+#: src/resources/notifications.h:312
msgid "Kick succeeded!"
msgstr "Wykopanie powiodło się!"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:296
+#: src/resources/notifications.h:316
#, c-format
msgid "MVP player: %s"
msgstr "Gracz MVP: %s"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:300
+#: src/resources/notifications.h:320
msgid "All whispers ignored."
msgstr "Wszystkie szepty ignorowane."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:304
+#: src/resources/notifications.h:324
msgid "All whispers ignore failed."
msgstr "Nie udało się ignorować wszystkich szeptów."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:308
+#: src/resources/notifications.h:328
msgid "All whispers unignored."
msgstr "Wszystkie szepty odignorowane."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:312
+#: src/resources/notifications.h:332
msgid "All whispers unignore failed."
msgstr "Nie udało się odignorować wszystkich szeptów."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:319
+#: src/resources/notifications.h:339
msgid "pvp off, gvg off"
msgstr "pvp wyłączone, gvg wyłączone"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:323
+#: src/resources/notifications.h:343
msgid "pvp on"
msgstr "pvp włączone"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:327
+#: src/resources/notifications.h:347
msgid "gvg on"
msgstr "gvg włączone"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:331
+#: src/resources/notifications.h:351
msgid "pvp on, gvg on"
msgstr "pvp włączone, gvg włączone"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:335
+#: src/resources/notifications.h:355
msgid "unknown pvp"
msgstr "nieznane pvp"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:339
+#: src/resources/notifications.h:359
#, c-format
msgid "Char from account %s is already in your party!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:343
+#: src/resources/notifications.h:363
#, c-format
msgid "%s blocked invite!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:347
+#: src/resources/notifications.h:367
msgid "Char is not online!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:351
+#: src/resources/notifications.h:371
msgid "Pet catch failed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:355
+#: src/resources/notifications.h:375
msgid "Pet catched."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:359
+#: src/resources/notifications.h:379
#, c-format
msgid "Pet catch unkown error: %d."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:363
+#: src/resources/notifications.h:383
msgid "Your mercenary duty hour is over."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:367
+#: src/resources/notifications.h:387
msgid "Your mercenary was killed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:371
+#: src/resources/notifications.h:391
msgid "Your mercenary was fired."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:375
+#: src/resources/notifications.h:395
msgid "Your mercenary run away."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:379
+#: src/resources/notifications.h:399
msgid "Mercenary unknown state."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:383
+#: src/resources/notifications.h:403
msgid "You feed your homunculus."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:387
+#: src/resources/notifications.h:407
#, c-format
msgid "You cant feed homunculus, because not have %s."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:391
-#, fuzzy
+#: src/resources/notifications.h:411
msgid "Card insert failed."
-msgstr "Handel zakończony niepowodzeniem!"
+msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:395
+#: src/resources/notifications.h:415
msgid "Card inserted."
msgstr ""
@@ -8711,9 +8727,3 @@ msgstr ""
#, c-format
msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
msgstr "Opcjami dla /%s są \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-
-#~ msgid "Enable auction bot support"
-#~ msgstr "Włącz integrację z AuctionBotem"
-
-#~ msgid "Auction"
-#~ msgstr "Aukcja"
diff --git a/po/pt.po b/po/pt.po
index fc810b1f6..d95cf720f 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-10-08 01:19+0300\n"
-"PO-Revision-Date: 2014-09-28 10:01+0000\n"
+"POT-Creation-Date: 2014-10-10 00:16+0300\n"
+"PO-Revision-Date: 2014-10-08 10:02+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Portuguese (http://www.transifex.com/projects/p/manaplus/"
"language/pt/)\n"
@@ -5175,15 +5175,13 @@ msgstr "Conta %s (Logado pela última vez em %s)"
#. TRANSLATORS: char select dialog. button.
#: src/gui/windows/charselectdialog.cpp:73
-#, fuzzy
msgid "Switch"
-msgstr "Trocar Login"
+msgstr ""
#. TRANSLATORS: char select dialog. button.
#: src/gui/windows/charselectdialog.cpp:75
-#, fuzzy
msgid "Password"
-msgstr "Senha:"
+msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: updater window button
@@ -5227,9 +5225,8 @@ msgid "Please set new pincode"
msgstr ""
#: src/gui/windows/charselectdialog.cpp:240
-#, fuzzy
msgid "Please enter new name"
-msgstr "Por favor, especifique um nome."
+msgstr ""
#. TRANSLATORS: char select dialog. player info message.
#: src/gui/windows/charselectdialog.cpp:259
@@ -5885,7 +5882,7 @@ msgstr "Mostrar links em anúncio"
#. TRANSLATORS: shop window dialog
#. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:776 src/net/ea/tradehandler.cpp:233
+#: src/gui/windows/shopwindow.cpp:776 src/net/ea/tradehandler.cpp:192
msgid "Request for Trade"
msgstr "Proposta de negociação"
@@ -7541,19 +7538,19 @@ msgstr "Castelo Guilda : %s"
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:191
+#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:207
msgid "Item sharing enabled."
msgstr "Compartilhamento de itens habilitado."
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:195
+#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:211
msgid "Item sharing disabled."
msgstr "Compartilhamento de itens desabilitado."
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:199
+#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:215
msgid "Item sharing not possible."
msgstr "Não é possível compartilhar itens."
@@ -7564,19 +7561,19 @@ msgstr "Compartilhamento de itens desconhecido."
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:179
+#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:195
msgid "Experience sharing enabled."
msgstr "Compartilhamento de experiência habilitado."
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:183
+#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:199
msgid "Experience sharing disabled."
msgstr "Compartilhamento de experiência desabilitado."
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:187
+#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:203
msgid "Experience sharing not possible."
msgstr "Não é possível compartilhar experiência."
@@ -7708,14 +7705,12 @@ msgstr ""
#. TRANSLATORS: char rename error
#: src/net/eathena/charserverhandler.cpp:516
#: src/net/eathena/charserverhandler.cpp:553
-#, fuzzy
msgid "Character rename error."
-msgstr "Personagem deletado."
+msgstr ""
#: src/net/eathena/charserverhandler.cpp:531
-#, fuzzy
msgid "Character renamed."
-msgstr "Personagem deletado."
+msgstr ""
#. TRANSLATORS: char rename error
#: src/net/eathena/charserverhandler.cpp:544
@@ -7729,9 +7724,8 @@ msgstr ""
#. TRANSLATORS: char rename error
#: src/net/eathena/charserverhandler.cpp:557
-#, fuzzy
msgid "Character not found."
-msgstr "Pontos do personagem: %d"
+msgstr ""
#. TRANSLATORS: player stat
#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:124
@@ -7795,9 +7789,8 @@ msgid "Speed hack detected."
msgstr "Hack de velocidade detectado."
#: src/net/eathena/generalhandler.cpp:179
-#, fuzzy
msgid "Server full."
-msgstr "Servidor:"
+msgstr ""
#: src/net/eathena/generalhandler.cpp:182
msgid "Sorry, you are underaged."
@@ -7869,18 +7862,16 @@ msgid "Ip limited access."
msgstr ""
#: src/net/eathena/generalhandler.cpp:235
-#, fuzzy
msgid "Over characters list."
-msgstr "Personagem deletado."
+msgstr ""
#: src/net/eathena/generalhandler.cpp:238
msgid "Ip blocked."
msgstr ""
#: src/net/eathena/generalhandler.cpp:241
-#, fuzzy
msgid "Invalid password count."
-msgstr "Senha antiga incorreta."
+msgstr ""
#: src/net/eathena/generalhandler.cpp:244
msgid "Not allowed race."
@@ -8047,13 +8038,13 @@ msgid "Huh? What's that?"
msgstr "Hã? O que é isso?"
#. TRANSLATORS: trade header
-#: src/net/ea/tradehandler.cpp:100
+#: src/net/ea/tradehandler.cpp:105
#, c-format
msgid "Trade: You and %s"
msgstr "Negociação: Você e %s"
#. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:235
+#: src/net/ea/tradehandler.cpp:194
#, c-format
msgid "%s wants to trade with you, do you accept?"
msgstr "%s quer negociar com você, você aceita?"
@@ -8272,430 +8263,455 @@ msgstr "Impossível comprar."
#. TRANSLATORS: notification message
#: src/resources/notifications.h:47
+#, fuzzy
+msgid "Unable to buy. You not have enought money."
+msgstr "Você não tem dinheiro suficiente."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:51
+#, fuzzy
+msgid "Unable to buy. You overweight."
+msgstr "Impossível comprar."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:55
+msgid "Unable to buy. You have too many items."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:59
msgid "Nothing to sell."
msgstr "Nada para vender."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:51
+#: src/resources/notifications.h:63
msgid "Thanks for selling."
msgstr "Obrigado pela venda."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:55
+#: src/resources/notifications.h:67
msgid "Unable to sell."
msgstr "Impossibilitado de vender."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:59
+#: src/resources/notifications.h:71
msgid "Unable to sell while trading."
msgstr "Não se pode vender durante uma negociação."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:63
+#: src/resources/notifications.h:75
msgid "Unable to sell unsellable item."
msgstr "Não se pode vender este item."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:67
+#: src/resources/notifications.h:79
#, c-format
msgid "Online users: %d"
msgstr "Jogadores online: %d"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:71
+#: src/resources/notifications.h:83
msgid "Guild created."
msgstr "Guilda criada."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:75
+#: src/resources/notifications.h:87
msgid "You are already in guild."
msgstr "Você já está em uma guilda."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:79
+#: src/resources/notifications.h:91
msgid "Emperium check failed."
msgstr "Falha ao checar Emperium."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:83
+#: src/resources/notifications.h:95
msgid "Unknown server response."
msgstr "Resposta do servidor desconhecida."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:87
+#: src/resources/notifications.h:99
msgid "You have left the guild."
msgstr "Você saiu da Guilda."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:91
+#: src/resources/notifications.h:103
msgid "Could not invite user to guild."
msgstr "Não foi possível convidar jogador para a guilda."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:95
+#: src/resources/notifications.h:107
msgid "User rejected guild invite."
msgstr "O jogador rejeitou o convite."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:99
+#: src/resources/notifications.h:111
msgid "User is now part of your guild."
msgstr "Usuário agora é um membro da sua guilda."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:103
+#: src/resources/notifications.h:115
msgid "Your guild is full."
msgstr "Sua guilda está cheia."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:107
+#: src/resources/notifications.h:119
msgid "Unknown guild invite response."
msgstr "Resposta desconhecida de convite para guilda."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:111
+#: src/resources/notifications.h:123
#, c-format
msgid "%s has left your guild."
msgstr "%s saiu de sua Guilda."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:115
+#: src/resources/notifications.h:127
msgid "You were kicked from guild."
msgstr "Você foi expulso da guilda."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:119
+#: src/resources/notifications.h:131
#, c-format
msgid "%s has kicked from your guild."
msgstr "%s foi expulso(a) da Guilda."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:123
+#: src/resources/notifications.h:135
msgid "Failed to use item."
msgstr "Falha ao usar item."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:127
+#: src/resources/notifications.h:139
msgid "Unable to equip."
msgstr "Impossível equipar."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:131
+#: src/resources/notifications.h:143
+msgid "Unable to equip because you have wrong level."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:147
msgid "Could not create party."
msgstr "Não foi possível criar o grupo."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:135
+#: src/resources/notifications.h:151
msgid "Party successfully created."
msgstr "Grupo criado."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:139
+#: src/resources/notifications.h:155
msgid "You have left the party."
msgstr "Você saiu do grupo."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:143
-#, fuzzy
+#: src/resources/notifications.h:159
msgid "You cant left party on this map."
-msgstr "Você saiu do grupo."
+msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:147
-#, fuzzy
+#: src/resources/notifications.h:163
msgid "You was kicked from party."
-msgstr "Você foi expulso da guilda."
+msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:151
-msgid "You cant be kicked kicked from party on this map."
+#: src/resources/notifications.h:167
+msgid "You cant be kicked from party on this map."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:155
+#: src/resources/notifications.h:171
#, c-format
msgid "%s has joined your party."
msgstr "%s se junto ao grupo."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:159
+#: src/resources/notifications.h:175
#, c-format
msgid "%s is already a member of a party."
msgstr "%s já é membro de um grupo."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:163
+#: src/resources/notifications.h:179
#, c-format
msgid "%s refused your invitation."
msgstr "%s recusou seu convite."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:167
+#: src/resources/notifications.h:183
#, c-format
msgid "%s is now a member of your party."
msgstr "%s agora é um membro do seu grupo."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:171
+#: src/resources/notifications.h:187
#, c-format
msgid "%s can't join your party because party is full."
msgstr "%s não pode se juntar ao gupo cheio."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:175
+#: src/resources/notifications.h:191
#, c-format
msgid "QQQ Unknown invite response for %s."
msgstr "QQQ resposta de convite desconhecida por %s."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:203
+#: src/resources/notifications.h:219
#, c-format
msgid "%s has left your party."
msgstr "%s saiu do seu grupo."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:207 src/resources/notifications.h:215
-#, fuzzy, c-format
+#: src/resources/notifications.h:223 src/resources/notifications.h:231
+#, c-format
msgid "%s cant be kicked from party on this map."
-msgstr "%s foi expulso(a) da Guilda."
+msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:211
-#, fuzzy, c-format
+#: src/resources/notifications.h:227
+#, c-format
msgid "%s has kicked from your party."
-msgstr "%s foi expulso(a) da Guilda."
+msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:219
+#: src/resources/notifications.h:235
#, c-format
msgid "An unknown member tried to say: %s"
msgstr "Um membro desconhecido tentou dizer: %s"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:223
+#: src/resources/notifications.h:239
#, c-format
msgid "%s is not in your party!"
msgstr "%s não está em seu grupo!"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:227
+#: src/resources/notifications.h:243
#, c-format
msgid "You picked up %s."
msgstr "Você pegou %s."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:231
+#: src/resources/notifications.h:247
#, c-format
msgid "You spent %s."
msgstr "Você gastou %s."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:235
+#: src/resources/notifications.h:251
msgid "Cannot raise skill!"
msgstr "Impossível aumentar o atributo!"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:239
+#: src/resources/notifications.h:255
msgid "Equip ammunition first."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:243
+#: src/resources/notifications.h:259
#, c-format
msgid "Trading with %s isn't possible. Trade partner is too far away."
msgstr ""
"Negociação com %s é impossível. O parceiro de negócios está muito longe."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:248
+#: src/resources/notifications.h:264
#, c-format
msgid "Trading with %s isn't possible. Character doesn't exist."
msgstr "Negociação com %s é impossível. O personagem não existe."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:252
+#: src/resources/notifications.h:268
msgid "Trade cancelled due to an unknown reason."
msgstr "Negociação cancelada devido a uma razão desconhecida."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:256
+#: src/resources/notifications.h:272
#, c-format
msgid "Trade with %s cancelled."
msgstr "Negociação com %s cancelada."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:260
+#: src/resources/notifications.h:276
+#, fuzzy, c-format
+msgid "Trade with %s cancelled, because player is busy"
+msgstr "Negociação com %s cancelada."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:280
#, c-format
msgid "Unhandled trade cancel packet with %s"
msgstr "Troca injusta pacote cancelado com %s"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:264
+#: src/resources/notifications.h:284
msgid "Failed adding item. Trade partner is over weighted."
msgstr "Erro ao adicionar item. Parceiro de negócios carregando muito peso."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:268
+#: src/resources/notifications.h:288
msgid "Failed adding item. Trade partner has no free slot."
msgstr "Erro ao adicionar item. Parceiro de negócios não tem slots livres."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:272
+#: src/resources/notifications.h:292
msgid "Failed adding item. You can't trade this item."
msgstr "Falha ao adicionar item. Você não pode trocar este item."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:276
+#: src/resources/notifications.h:296
msgid "Failed adding item for unknown reason."
msgstr "Erro ao adicionar item devido a um motivo desconhecido."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:280
+#: src/resources/notifications.h:300
msgid "Trade canceled."
msgstr "Negociação cancelada."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:284
+#: src/resources/notifications.h:304
msgid "Trade completed."
msgstr "Negociação realizada."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:288
+#: src/resources/notifications.h:308
msgid "Kick failed!"
msgstr "Erro na expulsão!"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:292
+#: src/resources/notifications.h:312
msgid "Kick succeeded!"
msgstr "Expulsão bem sucedida!"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:296
+#: src/resources/notifications.h:316
#, c-format
msgid "MVP player: %s"
msgstr "Jogador VIP: %s"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:300
+#: src/resources/notifications.h:320
msgid "All whispers ignored."
msgstr "Todos sussurros ignorados."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:304
+#: src/resources/notifications.h:324
msgid "All whispers ignore failed."
msgstr "Todos sussurros ignorados falharam."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:308
+#: src/resources/notifications.h:328
msgid "All whispers unignored."
msgstr "Todos sussurros não-ignorados."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:312
+#: src/resources/notifications.h:332
msgid "All whispers unignore failed."
msgstr "Todos sussurros não-ignorados falharam."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:319
+#: src/resources/notifications.h:339
msgid "pvp off, gvg off"
msgstr "pvp off, gvg off"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:323
+#: src/resources/notifications.h:343
msgid "pvp on"
msgstr "pvp on"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:327
+#: src/resources/notifications.h:347
msgid "gvg on"
msgstr "gvg on"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:331
+#: src/resources/notifications.h:351
msgid "pvp on, gvg on"
msgstr "pvp on, gvg on"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:335
+#: src/resources/notifications.h:355
msgid "unknown pvp"
msgstr "pvp desconhecido"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:339
+#: src/resources/notifications.h:359
#, c-format
msgid "Char from account %s is already in your party!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:343
+#: src/resources/notifications.h:363
#, c-format
msgid "%s blocked invite!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:347
+#: src/resources/notifications.h:367
msgid "Char is not online!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:351
+#: src/resources/notifications.h:371
msgid "Pet catch failed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:355
+#: src/resources/notifications.h:375
msgid "Pet catched."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:359
+#: src/resources/notifications.h:379
#, c-format
msgid "Pet catch unkown error: %d."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:363
+#: src/resources/notifications.h:383
msgid "Your mercenary duty hour is over."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:367
+#: src/resources/notifications.h:387
msgid "Your mercenary was killed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:371
+#: src/resources/notifications.h:391
msgid "Your mercenary was fired."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:375
+#: src/resources/notifications.h:395
msgid "Your mercenary run away."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:379
+#: src/resources/notifications.h:399
msgid "Mercenary unknown state."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:383
+#: src/resources/notifications.h:403
msgid "You feed your homunculus."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:387
+#: src/resources/notifications.h:407
#, c-format
msgid "You cant feed homunculus, because not have %s."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:391
-#, fuzzy
+#: src/resources/notifications.h:411
msgid "Card insert failed."
-msgstr "Falha na negociação!"
+msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:395
+#: src/resources/notifications.h:415
msgid "Card inserted."
msgstr ""
@@ -8705,9 +8721,3 @@ msgstr ""
msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
msgstr ""
"Opções para /%s são \"yes\" e \"no\", \"true\" e \"false\", \"1\" e \"0\"."
-
-#~ msgid "Enable auction bot support"
-#~ msgstr "Habilitar suporte ao AuctionBot"
-
-#~ msgid "Auction"
-#~ msgstr "Leilão"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 06790f89f..2881b5752 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -21,8 +21,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-10-08 01:19+0300\n"
-"PO-Revision-Date: 2014-09-28 10:01+0000\n"
+"POT-Creation-Date: 2014-10-10 00:16+0300\n"
+"PO-Revision-Date: 2014-10-08 10:02+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/"
"manaplus/language/pt_BR/)\n"
@@ -5189,15 +5189,13 @@ msgstr "Conta %s (Último acesso em %s)"
#. TRANSLATORS: char select dialog. button.
#: src/gui/windows/charselectdialog.cpp:73
-#, fuzzy
msgid "Switch"
-msgstr "Trocar Login"
+msgstr ""
#. TRANSLATORS: char select dialog. button.
#: src/gui/windows/charselectdialog.cpp:75
-#, fuzzy
msgid "Password"
-msgstr "Senha:"
+msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: updater window button
@@ -5241,9 +5239,8 @@ msgid "Please set new pincode"
msgstr "Por favor insira novo pincode"
#: src/gui/windows/charselectdialog.cpp:240
-#, fuzzy
msgid "Please enter new name"
-msgstr "Por favor insira novo pincode"
+msgstr ""
#. TRANSLATORS: char select dialog. player info message.
#: src/gui/windows/charselectdialog.cpp:259
@@ -5899,7 +5896,7 @@ msgstr "Mostrar links em anúncio"
#. TRANSLATORS: shop window dialog
#. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:776 src/net/ea/tradehandler.cpp:233
+#: src/gui/windows/shopwindow.cpp:776 src/net/ea/tradehandler.cpp:192
msgid "Request for Trade"
msgstr "Proposta de negociação"
@@ -7555,19 +7552,19 @@ msgstr "Castelo Guilda : %s"
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:191
+#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:207
msgid "Item sharing enabled."
msgstr "Compartilhamento de itens habilitado."
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:195
+#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:211
msgid "Item sharing disabled."
msgstr "Compartilhamento de itens desabilitado."
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:199
+#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:215
msgid "Item sharing not possible."
msgstr "Não é possível compartilhar itens."
@@ -7578,19 +7575,19 @@ msgstr "Compartilhamento de itens desconhecido."
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:179
+#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:195
msgid "Experience sharing enabled."
msgstr "Compartilhamento de experiência habilitado."
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:183
+#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:199
msgid "Experience sharing disabled."
msgstr "Compartilhamento de experiência desabilitado."
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:187
+#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:203
msgid "Experience sharing not possible."
msgstr "Não é possível compartilhar experiência."
@@ -7722,14 +7719,12 @@ msgstr ""
#. TRANSLATORS: char rename error
#: src/net/eathena/charserverhandler.cpp:516
#: src/net/eathena/charserverhandler.cpp:553
-#, fuzzy
msgid "Character rename error."
-msgstr "Personagem deletado."
+msgstr ""
#: src/net/eathena/charserverhandler.cpp:531
-#, fuzzy
msgid "Character renamed."
-msgstr "Personagem deletado."
+msgstr ""
#. TRANSLATORS: char rename error
#: src/net/eathena/charserverhandler.cpp:544
@@ -7743,9 +7738,8 @@ msgstr ""
#. TRANSLATORS: char rename error
#: src/net/eathena/charserverhandler.cpp:557
-#, fuzzy
msgid "Character not found."
-msgstr "Pontos do personagem: %d"
+msgstr ""
#. TRANSLATORS: player stat
#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:124
@@ -7809,9 +7803,8 @@ msgid "Speed hack detected."
msgstr "Hack de velocidade detectado."
#: src/net/eathena/generalhandler.cpp:179
-#, fuzzy
msgid "Server full."
-msgstr "Servidor:"
+msgstr ""
#: src/net/eathena/generalhandler.cpp:182
msgid "Sorry, you are underaged."
@@ -7883,18 +7876,16 @@ msgid "Ip limited access."
msgstr ""
#: src/net/eathena/generalhandler.cpp:235
-#, fuzzy
msgid "Over characters list."
-msgstr "Personagem deletado."
+msgstr ""
#: src/net/eathena/generalhandler.cpp:238
msgid "Ip blocked."
msgstr ""
#: src/net/eathena/generalhandler.cpp:241
-#, fuzzy
msgid "Invalid password count."
-msgstr "Senha antiga incorreta."
+msgstr ""
#: src/net/eathena/generalhandler.cpp:244
msgid "Not allowed race."
@@ -8061,13 +8052,13 @@ msgid "Huh? What's that?"
msgstr "Hã? O que é isso?"
#. TRANSLATORS: trade header
-#: src/net/ea/tradehandler.cpp:100
+#: src/net/ea/tradehandler.cpp:105
#, c-format
msgid "Trade: You and %s"
msgstr "Negociação: Você e %s"
#. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:235
+#: src/net/ea/tradehandler.cpp:194
#, c-format
msgid "%s wants to trade with you, do you accept?"
msgstr "%s quer negociar com você, você aceita?"
@@ -8286,430 +8277,455 @@ msgstr "Impossível comprar."
#. TRANSLATORS: notification message
#: src/resources/notifications.h:47
+#, fuzzy
+msgid "Unable to buy. You not have enought money."
+msgstr "Você não tem dinheiro suficiente."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:51
+#, fuzzy
+msgid "Unable to buy. You overweight."
+msgstr "Impossível comprar."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:55
+msgid "Unable to buy. You have too many items."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:59
msgid "Nothing to sell."
msgstr "Nada para vender."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:51
+#: src/resources/notifications.h:63
msgid "Thanks for selling."
msgstr "Obrigado pela venda."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:55
+#: src/resources/notifications.h:67
msgid "Unable to sell."
msgstr "Impossibilitado de vender."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:59
+#: src/resources/notifications.h:71
msgid "Unable to sell while trading."
msgstr "Não se pode vender durante uma negociação."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:63
+#: src/resources/notifications.h:75
msgid "Unable to sell unsellable item."
msgstr "Não se pode vender este item."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:67
+#: src/resources/notifications.h:79
#, c-format
msgid "Online users: %d"
msgstr "Jogadores online: %d"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:71
+#: src/resources/notifications.h:83
msgid "Guild created."
msgstr "Guilda criada."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:75
+#: src/resources/notifications.h:87
msgid "You are already in guild."
msgstr "Você já está em uma Guilda."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:79
+#: src/resources/notifications.h:91
msgid "Emperium check failed."
msgstr "Falha ao checar Emperium."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:83
+#: src/resources/notifications.h:95
msgid "Unknown server response."
msgstr "Resposta do servidor desconhecida."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:87
+#: src/resources/notifications.h:99
msgid "You have left the guild."
msgstr "Você saiu da Guilda."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:91
+#: src/resources/notifications.h:103
msgid "Could not invite user to guild."
msgstr "Não foi possível convidar jogador(a) para a guilda."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:95
+#: src/resources/notifications.h:107
msgid "User rejected guild invite."
msgstr "O jogador rejeitou o convite."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:99
+#: src/resources/notifications.h:111
msgid "User is now part of your guild."
msgstr "Usuário agora é um membro da sua guilda."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:103
+#: src/resources/notifications.h:115
msgid "Your guild is full."
msgstr "Sua guilda está cheia."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:107
+#: src/resources/notifications.h:119
msgid "Unknown guild invite response."
msgstr "Resposta desconhecida de convite para guilda."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:111
+#: src/resources/notifications.h:123
#, c-format
msgid "%s has left your guild."
msgstr "%s saiu de sua Guilda."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:115
+#: src/resources/notifications.h:127
msgid "You were kicked from guild."
msgstr "Você foi expulso da guilda."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:119
+#: src/resources/notifications.h:131
#, c-format
msgid "%s has kicked from your guild."
msgstr "%s foi expulso(a) da Guilda."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:123
+#: src/resources/notifications.h:135
msgid "Failed to use item."
msgstr "Falha ao usar item."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:127
+#: src/resources/notifications.h:139
msgid "Unable to equip."
msgstr "Impossível equipar."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:131
+#: src/resources/notifications.h:143
+msgid "Unable to equip because you have wrong level."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:147
msgid "Could not create party."
msgstr "Não foi possível criar o grupo."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:135
+#: src/resources/notifications.h:151
msgid "Party successfully created."
msgstr "Grupo criado."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:139
+#: src/resources/notifications.h:155
msgid "You have left the party."
msgstr "Você saiu do grupo."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:143
-#, fuzzy
+#: src/resources/notifications.h:159
msgid "You cant left party on this map."
-msgstr "Você saiu do grupo."
+msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:147
-#, fuzzy
+#: src/resources/notifications.h:163
msgid "You was kicked from party."
-msgstr "Você foi expulso da guilda."
+msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:151
-msgid "You cant be kicked kicked from party on this map."
+#: src/resources/notifications.h:167
+msgid "You cant be kicked from party on this map."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:155
+#: src/resources/notifications.h:171
#, c-format
msgid "%s has joined your party."
msgstr "%s se juntou ao grupo."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:159
+#: src/resources/notifications.h:175
#, c-format
msgid "%s is already a member of a party."
msgstr "%s já é membro de um grupo."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:163
+#: src/resources/notifications.h:179
#, c-format
msgid "%s refused your invitation."
msgstr "%s recusou seu convite."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:167
+#: src/resources/notifications.h:183
#, c-format
msgid "%s is now a member of your party."
msgstr "%s agora é um membro do seu grupo."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:171
+#: src/resources/notifications.h:187
#, c-format
msgid "%s can't join your party because party is full."
msgstr "%s não pode se juntar ao grupo cheio."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:175
+#: src/resources/notifications.h:191
#, c-format
msgid "QQQ Unknown invite response for %s."
msgstr "QQQ resposta de convite desconhecida por %s."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:203
+#: src/resources/notifications.h:219
#, c-format
msgid "%s has left your party."
msgstr "%s saiu do seu grupo."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:207 src/resources/notifications.h:215
-#, fuzzy, c-format
+#: src/resources/notifications.h:223 src/resources/notifications.h:231
+#, c-format
msgid "%s cant be kicked from party on this map."
-msgstr "%s foi expulso(a) da Guilda."
+msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:211
-#, fuzzy, c-format
+#: src/resources/notifications.h:227
+#, c-format
msgid "%s has kicked from your party."
-msgstr "%s foi expulso(a) da Guilda."
+msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:219
+#: src/resources/notifications.h:235
#, c-format
msgid "An unknown member tried to say: %s"
msgstr "Um membro desconhecido tentou dizer: %s"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:223
+#: src/resources/notifications.h:239
#, c-format
msgid "%s is not in your party!"
msgstr "%s não está em seu grupo!"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:227
+#: src/resources/notifications.h:243
#, c-format
msgid "You picked up %s."
msgstr "Você pegou %s."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:231
+#: src/resources/notifications.h:247
#, c-format
msgid "You spent %s."
msgstr "Você gastou %s."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:235
+#: src/resources/notifications.h:251
msgid "Cannot raise skill!"
msgstr "Impossível aumentar o atributo!"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:239
+#: src/resources/notifications.h:255
msgid "Equip ammunition first."
msgstr "Equipe a munição primeiro."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:243
+#: src/resources/notifications.h:259
#, c-format
msgid "Trading with %s isn't possible. Trade partner is too far away."
msgstr ""
"Negociação com %s não é possível. O parceiro de negócios está muito longe."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:248
+#: src/resources/notifications.h:264
#, c-format
msgid "Trading with %s isn't possible. Character doesn't exist."
msgstr "Negociação com %s não é possível. O personagem não existe."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:252
+#: src/resources/notifications.h:268
msgid "Trade cancelled due to an unknown reason."
msgstr "Negociação cancelada devido a uma razão desconhecida."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:256
+#: src/resources/notifications.h:272
#, c-format
msgid "Trade with %s cancelled."
msgstr "Negociação com %s cancelada."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:260
+#: src/resources/notifications.h:276
+#, fuzzy, c-format
+msgid "Trade with %s cancelled, because player is busy"
+msgstr "Negociação com %s cancelada."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:280
#, c-format
msgid "Unhandled trade cancel packet with %s"
msgstr "Pacote de cancelamento não conhecido na negociação com %s"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:264
+#: src/resources/notifications.h:284
msgid "Failed adding item. Trade partner is over weighted."
msgstr "Erro ao adicionar item. Parceiro de negócios carregando muito peso."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:268
+#: src/resources/notifications.h:288
msgid "Failed adding item. Trade partner has no free slot."
msgstr "Erro ao adicionar item. Parceiro de negócios não tem slots livres."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:272
+#: src/resources/notifications.h:292
msgid "Failed adding item. You can't trade this item."
msgstr "Falha ao adicionar item. Você não pode trocar este item."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:276
+#: src/resources/notifications.h:296
msgid "Failed adding item for unknown reason."
msgstr "Erro ao adicionar item devido a um motivo desconhecido."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:280
+#: src/resources/notifications.h:300
msgid "Trade canceled."
msgstr "Negociação cancelada."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:284
+#: src/resources/notifications.h:304
msgid "Trade completed."
msgstr "Negociação realizada."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:288
+#: src/resources/notifications.h:308
msgid "Kick failed!"
msgstr "Erro na expulsão!"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:292
+#: src/resources/notifications.h:312
msgid "Kick succeeded!"
msgstr "Expulsão bem sucedida!"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:296
+#: src/resources/notifications.h:316
#, c-format
msgid "MVP player: %s"
msgstr "Jogador VIP: %s"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:300
+#: src/resources/notifications.h:320
msgid "All whispers ignored."
msgstr "Todos sussurros ignorados."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:304
+#: src/resources/notifications.h:324
msgid "All whispers ignore failed."
msgstr "Todos sussurros ignorados falharam."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:308
+#: src/resources/notifications.h:328
msgid "All whispers unignored."
msgstr "Todos sussurros não-ignorados."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:312
+#: src/resources/notifications.h:332
msgid "All whispers unignore failed."
msgstr "Todos sussurros não-ignorados falharam."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:319
+#: src/resources/notifications.h:339
msgid "pvp off, gvg off"
msgstr "pvp desligado, gvg desligado"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:323
+#: src/resources/notifications.h:343
msgid "pvp on"
msgstr "pvp ligado"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:327
+#: src/resources/notifications.h:347
msgid "gvg on"
msgstr "gvg ligado"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:331
+#: src/resources/notifications.h:351
msgid "pvp on, gvg on"
msgstr "pvp ligado, gvg ligado"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:335
+#: src/resources/notifications.h:355
msgid "unknown pvp"
msgstr "pvp desconhecido"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:339
+#: src/resources/notifications.h:359
#, c-format
msgid "Char from account %s is already in your party!"
msgstr "Char da conta %s já está no seu grupo!"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:343
+#: src/resources/notifications.h:363
#, c-format
msgid "%s blocked invite!"
msgstr "%s bloqueou o convite!"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:347
+#: src/resources/notifications.h:367
msgid "Char is not online!"
msgstr "Char não está online!"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:351
+#: src/resources/notifications.h:371
msgid "Pet catch failed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:355
+#: src/resources/notifications.h:375
msgid "Pet catched."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:359
+#: src/resources/notifications.h:379
#, c-format
msgid "Pet catch unkown error: %d."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:363
+#: src/resources/notifications.h:383
msgid "Your mercenary duty hour is over."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:367
+#: src/resources/notifications.h:387
msgid "Your mercenary was killed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:371
+#: src/resources/notifications.h:391
msgid "Your mercenary was fired."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:375
+#: src/resources/notifications.h:395
msgid "Your mercenary run away."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:379
+#: src/resources/notifications.h:399
msgid "Mercenary unknown state."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:383
+#: src/resources/notifications.h:403
msgid "You feed your homunculus."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:387
+#: src/resources/notifications.h:407
#, c-format
msgid "You cant feed homunculus, because not have %s."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:391
-#, fuzzy
+#: src/resources/notifications.h:411
msgid "Card insert failed."
-msgstr "Falha na negociação!"
+msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:395
+#: src/resources/notifications.h:415
msgid "Card inserted."
msgstr ""
@@ -8719,9 +8735,3 @@ msgstr ""
msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
msgstr ""
"Opções para /%s são \"yes\" e \"no\", \"true\" e \"false\", \"1\" e \"0\"."
-
-#~ msgid "Enable auction bot support"
-#~ msgstr "Ativar suporte ao auction bot"
-
-#~ msgid "Auction"
-#~ msgstr "Leilão"
diff --git a/po/ru.po b/po/ru.po
index 8bb3a41a4..374cc581c 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -16,9 +16,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-10-08 01:19+0300\n"
-"PO-Revision-Date: 2014-10-02 12:22+0000\n"
-"Last-Translator: Alexsl <alexlsh@mail.ru>\n"
+"POT-Creation-Date: 2014-10-10 00:16+0300\n"
+"PO-Revision-Date: 2014-10-09 21:14+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Russian (http://www.transifex.com/projects/p/manaplus/"
"language/ru/)\n"
"Language: ru\n"
@@ -1680,13 +1680,13 @@ msgstr "Добавить в список игнорирования"
#. TRANSLATORS: Mercenary move to master
#: src/gui/popups/popupmenu.cpp:309 src/gui/popups/popupmenu.cpp:320
msgid "Move to master"
-msgstr ""
+msgstr "Перейти к владельцу"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: fire mercenary
#: src/gui/popups/popupmenu.cpp:313
msgid "Fire"
-msgstr ""
+msgstr "Уволить"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: feed homunculus
@@ -2556,17 +2556,17 @@ msgstr "Бордюр тайлов"
#. TRANSLATORS: palette color
#: src/gui/userpalette.cpp:221
msgid "Pets"
-msgstr ""
+msgstr "Питомцы"
#. TRANSLATORS: palette color
#: src/gui/userpalette.cpp:223
msgid "Mercenary"
-msgstr ""
+msgstr "Наемник"
#. TRANSLATORS: palette color
#: src/gui/userpalette.cpp:225
msgid "Homunculus"
-msgstr ""
+msgstr "Гомункул"
#: src/gui/widgets/characterdisplay.cpp:135
#, c-format
@@ -2678,12 +2678,12 @@ msgstr "Неизвестный"
#. TRANSLATORS: Skill type
#: src/gui/widgets/skillinfo.cpp:118
msgid "Ground"
-msgstr ""
+msgstr "Земля"
#. TRANSLATORS: Skill type
#: src/gui/widgets/skillinfo.cpp:123
msgid "Self"
-msgstr ""
+msgstr "Сам"
#. TRANSLATORS: Skill type
#: src/gui/widgets/skillinfo.cpp:128
@@ -2698,17 +2698,17 @@ msgstr "Поддержка"
#. TRANSLATORS: Skill type
#: src/gui/widgets/skillinfo.cpp:138
msgid "Target trap"
-msgstr ""
+msgstr "Ловушка"
#. TRANSLATORS: Skill type
#: src/gui/widgets/skillinfo.cpp:142
msgid "Unknown:"
-msgstr ""
+msgstr "Неизвестно:"
#: src/gui/widgets/skillinfo.cpp:148
#, c-format
msgid " / Mana: -%d"
-msgstr ""
+msgstr " / Мана: -%d"
#: src/gui/widgets/skillinfo.cpp:154
#, c-format
@@ -2946,14 +2946,14 @@ msgstr "Критический удар:"
#: src/gui/widgets/tabs/debugwindowtabs.cpp:365
#: src/gui/widgets/tabs/debugwindowtabs.cpp:407
msgid "Karma:"
-msgstr ""
+msgstr "Карма:"
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:287
#: src/gui/widgets/tabs/debugwindowtabs.cpp:368
#: src/gui/widgets/tabs/debugwindowtabs.cpp:409
msgid "Manner:"
-msgstr ""
+msgstr "Манеры:"
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:333
@@ -3895,7 +3895,7 @@ msgstr "Включить отлад. лог"
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_other.cpp:365
msgid "Ignore logging packets"
-msgstr ""
+msgstr "Исключить из логгирования пакеты"
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_other.cpp:369
@@ -5190,15 +5190,13 @@ msgstr "Аккаунт %s (последний вход %s)"
#. TRANSLATORS: char select dialog. button.
#: src/gui/windows/charselectdialog.cpp:73
-#, fuzzy
msgid "Switch"
-msgstr "Сменить героя"
+msgstr "Сменить"
#. TRANSLATORS: char select dialog. button.
#: src/gui/windows/charselectdialog.cpp:75
-#, fuzzy
msgid "Password"
-msgstr "Пароль:"
+msgstr "Пароль"
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: updater window button
@@ -5242,9 +5240,8 @@ msgid "Please set new pincode"
msgstr "Пожалуйста, установите новый пин код"
#: src/gui/windows/charselectdialog.cpp:240
-#, fuzzy
msgid "Please enter new name"
-msgstr "Пожалуйста, установите новый пин код"
+msgstr "Пожалуйста, введите новое имя"
#. TRANSLATORS: char select dialog. player info message.
#: src/gui/windows/charselectdialog.cpp:259
@@ -5902,7 +5899,7 @@ msgstr "Показывать ссылки"
#. TRANSLATORS: shop window dialog
#. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:776 src/net/ea/tradehandler.cpp:233
+#: src/gui/windows/shopwindow.cpp:776 src/net/ea/tradehandler.cpp:192
msgid "Request for Trade"
msgstr "Запрос на Торговлю"
@@ -5937,7 +5934,7 @@ msgstr "Умение %d"
#: src/gui/windows/skilldialog.cpp:450
#, c-format
msgid "Failed skill: %s"
-msgstr ""
+msgstr "Неудача умения: %s"
#. TRANSLATORS: here P is title for visible players tab in social window
#: src/gui/windows/socialwindow.cpp:77
@@ -6405,7 +6402,7 @@ msgstr "Выбор игрока"
#. TRANSLATORS: input action name
#: src/input/pages/basic.cpp:132
msgid "Target mercenary"
-msgstr ""
+msgstr "Выделение наемника"
#. TRANSLATORS: input action name
#: src/input/pages/basic.cpp:138
@@ -6485,7 +6482,7 @@ msgstr "Вернуться в безопасный видео режим"
#. TRANSLATORS: input action name
#: src/input/pages/basic.cpp:234
msgid "Fire your homunculus"
-msgstr ""
+msgstr "Уволить гомункула"
#. TRANSLATORS: input action name
#: src/input/pages/chat.cpp:33
@@ -7037,7 +7034,7 @@ msgstr "Выгрузить конфиг сервера"
#. TRANSLATORS: input action name
#: src/input/pages/other.cpp:368
msgid "Fire your mercenary"
-msgstr ""
+msgstr "Уволить наемника"
#. TRANSLATORS: input action name
#: src/input/pages/outfits.cpp:37
@@ -7558,19 +7555,19 @@ msgstr "Замки: %s"
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:191
+#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:207
msgid "Item sharing enabled."
msgstr "Обмен предметами включен."
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:195
+#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:211
msgid "Item sharing disabled."
msgstr "Обмен предметами выключен."
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:199
+#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:215
msgid "Item sharing not possible."
msgstr "Обмен предметами невозможен."
@@ -7581,19 +7578,19 @@ msgstr "Статус обмена предметами неизвестен."
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:179
+#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:195
msgid "Experience sharing enabled."
msgstr "Обмен опытом включен."
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:183
+#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:199
msgid "Experience sharing disabled."
msgstr "Обмен опытом выключен."
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:187
+#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:203
msgid "Experience sharing not possible."
msgstr "Обмен опытом невозможен."
@@ -7722,30 +7719,27 @@ msgstr ""
#. TRANSLATORS: char rename error
#: src/net/eathena/charserverhandler.cpp:516
#: src/net/eathena/charserverhandler.cpp:553
-#, fuzzy
msgid "Character rename error."
-msgstr "Персонаж удален."
+msgstr "Ошибка изменения имени персонажа."
#: src/net/eathena/charserverhandler.cpp:531
-#, fuzzy
msgid "Character renamed."
-msgstr "Персонаж удален."
+msgstr "Персонаж переименован."
#. TRANSLATORS: char rename error
#: src/net/eathena/charserverhandler.cpp:544
msgid "Rename not allowed."
-msgstr ""
+msgstr "Изменение имени запрещено."
#. TRANSLATORS: char rename error
#: src/net/eathena/charserverhandler.cpp:548
msgid "New name is not set."
-msgstr ""
+msgstr "Новое имя не указано."
#. TRANSLATORS: char rename error
#: src/net/eathena/charserverhandler.cpp:557
-#, fuzzy
msgid "Character not found."
-msgstr "Очки персонажа: %d"
+msgstr "Персонаж не найден."
#. TRANSLATORS: player stat
#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:124
@@ -7809,13 +7803,12 @@ msgid "Speed hack detected."
msgstr "Обнаружен взлом скорости."
#: src/net/eathena/generalhandler.cpp:179
-#, fuzzy
msgid "Server full."
-msgstr "Сервер:"
+msgstr "Сервер переполнен."
#: src/net/eathena/generalhandler.cpp:182
msgid "Sorry, you are underaged."
-msgstr ""
+msgstr "К сожалению вы несовершеннолетний."
#. TRANSLATORS: error message
#: src/net/eathena/generalhandler.cpp:185 src/net/tmwa/generalhandler.cpp:185
@@ -7824,81 +7817,79 @@ msgstr "Двойная попытка подключения."
#: src/net/eathena/generalhandler.cpp:188
msgid "To many connections from same ip."
-msgstr ""
+msgstr "Слишком много соединений с одного адреса."
#: src/net/eathena/generalhandler.cpp:191
msgid "Not paid for this time."
-msgstr ""
+msgstr "Не оплачено."
#: src/net/eathena/generalhandler.cpp:194
msgid "Pay suspended."
-msgstr ""
+msgstr "Оплата приостановлена."
#: src/net/eathena/generalhandler.cpp:197
msgid "Pay changed."
-msgstr ""
+msgstr "Оплата изменена."
#: src/net/eathena/generalhandler.cpp:200
msgid "Pay wrong ip."
-msgstr ""
+msgstr "Оплачен другой адрес."
#: src/net/eathena/generalhandler.cpp:203
msgid "Pay game room."
-msgstr ""
+msgstr "Оплатите за комнату."
#: src/net/eathena/generalhandler.cpp:206
msgid "Disconnect forced by GM."
-msgstr ""
+msgstr "ГМ отключил вас от сервера."
#: src/net/eathena/generalhandler.cpp:210
msgid "Ban japan refuse."
-msgstr ""
+msgstr "Японский бан."
#: src/net/eathena/generalhandler.cpp:213
msgid "Remained other account."
-msgstr ""
+msgstr "Остались другие аккаунты."
#: src/net/eathena/generalhandler.cpp:216
msgid "Ip unfair."
-msgstr ""
+msgstr "Неправильный адрес."
#: src/net/eathena/generalhandler.cpp:219
msgid "Ip count all."
-msgstr ""
+msgstr "Превышение колчиства соединений с одного адреса."
#: src/net/eathena/generalhandler.cpp:222
msgid "Ip count."
-msgstr ""
+msgstr "Превышение колчиства соединений с одного адреса."
#: src/net/eathena/generalhandler.cpp:226
msgid "Memory."
-msgstr ""
+msgstr "Память."
#: src/net/eathena/generalhandler.cpp:229
msgid "Han valid."
-msgstr ""
+msgstr "Корректный han."
#: src/net/eathena/generalhandler.cpp:232
msgid "Ip limited access."
-msgstr ""
+msgstr "Ограничение по ip адресу."
#: src/net/eathena/generalhandler.cpp:235
-#, fuzzy
msgid "Over characters list."
-msgstr "Персонаж удален."
+msgstr "Слишком много персонажей."
#: src/net/eathena/generalhandler.cpp:238
msgid "Ip blocked."
-msgstr ""
+msgstr "Адрес заблокирован."
#: src/net/eathena/generalhandler.cpp:241
-#, fuzzy
msgid "Invalid password count."
-msgstr "Старый пароль указан неверно."
+msgstr "Некорректное число символов в пароле."
#: src/net/eathena/generalhandler.cpp:244
msgid "Not allowed race."
-msgstr ""
+msgstr "Некорректная расса."
#. TRANSLATORS: error message
#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:189
@@ -7994,16 +7985,16 @@ msgstr "Урон в сек."
#: src/net/eathena/generalhandler.cpp:370
msgid "Karma"
-msgstr ""
+msgstr "Карма"
#: src/net/eathena/generalhandler.cpp:371
msgid "Manner"
-msgstr ""
+msgstr "Манеры"
#: src/net/eathena/skillhandler.cpp:304 src/net/eathena/skillhandler.cpp:364
#, c-format
msgid "Unknown skill error: %d"
-msgstr ""
+msgstr "Неисвестная ошибка умений: %d"
#. TRANSLATORS: error message
#: src/net/eathena/skillhandler.cpp:311 src/net/tmwa/skillhandler.cpp:224
@@ -8061,13 +8052,13 @@ msgid "Huh? What's that?"
msgstr "А? Что это?"
#. TRANSLATORS: trade header
-#: src/net/ea/tradehandler.cpp:100
+#: src/net/ea/tradehandler.cpp:105
#, c-format
msgid "Trade: You and %s"
msgstr "Торговля: Вы и %s"
#. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:235
+#: src/net/ea/tradehandler.cpp:194
#, c-format
msgid "%s wants to trade with you, do you accept?"
msgstr "%s хочет торговать с Вами, Вы принимаете предложение?"
@@ -8286,432 +8277,457 @@ msgstr "Нельзя купить."
#. TRANSLATORS: notification message
#: src/resources/notifications.h:47
+#, fuzzy
+msgid "Unable to buy. You not have enought money."
+msgstr "У вас недостаточно денег."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:51
+#, fuzzy
+msgid "Unable to buy. You overweight."
+msgstr "Нельзя купить."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:55
+msgid "Unable to buy. You have too many items."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:59
msgid "Nothing to sell."
msgstr "Нечего продавать."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:51
+#: src/resources/notifications.h:63
msgid "Thanks for selling."
msgstr "Спасибо за продажу."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:55
+#: src/resources/notifications.h:67
msgid "Unable to sell."
msgstr "Нельзя продать."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:59
+#: src/resources/notifications.h:71
msgid "Unable to sell while trading."
msgstr "Невозможно продавать в режиме обмена."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:63
+#: src/resources/notifications.h:75
msgid "Unable to sell unsellable item."
msgstr "Невозможно продать непродаваемый предмет."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:67
+#: src/resources/notifications.h:79
#, c-format
msgid "Online users: %d"
msgstr "Пользователей онлайн: %d"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:71
+#: src/resources/notifications.h:83
msgid "Guild created."
msgstr "Гильдия создана."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:75
+#: src/resources/notifications.h:87
msgid "You are already in guild."
msgstr "Вы и так в гильдии."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:79
+#: src/resources/notifications.h:91
msgid "Emperium check failed."
msgstr "Имперская проверка провалена."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:83
+#: src/resources/notifications.h:95
msgid "Unknown server response."
msgstr "Неизвестный ответ сервера."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:87
+#: src/resources/notifications.h:99
msgid "You have left the guild."
msgstr "Вы покинули гильдию."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:91
+#: src/resources/notifications.h:103
msgid "Could not invite user to guild."
msgstr "Не удалось пригласить пользователя в гильдию."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:95
+#: src/resources/notifications.h:107
msgid "User rejected guild invite."
msgstr "Пользователь отклонил приглашение."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:99
+#: src/resources/notifications.h:111
msgid "User is now part of your guild."
msgstr "Пользователь теперь в Вашей гильдии."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:103
+#: src/resources/notifications.h:115
msgid "Your guild is full."
msgstr "Ваша гильдия полна."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:107
+#: src/resources/notifications.h:119
msgid "Unknown guild invite response."
msgstr "Неизвестный ответ на приглашение в гильдию."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:111
+#: src/resources/notifications.h:123
#, c-format
msgid "%s has left your guild."
msgstr "%s покинул Вашу гильдию."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:115
+#: src/resources/notifications.h:127
msgid "You were kicked from guild."
msgstr "Вас выгнали из гильдии."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:119
+#: src/resources/notifications.h:131
#, c-format
msgid "%s has kicked from your guild."
msgstr "%s был вышвырнут из Вашей гильдии."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:123
+#: src/resources/notifications.h:135
msgid "Failed to use item."
msgstr "Не удалось использовать предмет."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:127
+#: src/resources/notifications.h:139
msgid "Unable to equip."
msgstr "Нельзя экипировать."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:131
+#: src/resources/notifications.h:143
+msgid "Unable to equip because you have wrong level."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:147
msgid "Could not create party."
msgstr "Не удалось создать группу."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:135
+#: src/resources/notifications.h:151
msgid "Party successfully created."
msgstr "Группа успешно создана."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:139
+#: src/resources/notifications.h:155
msgid "You have left the party."
msgstr "Вы покинули группу."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:143
-#, fuzzy
+#: src/resources/notifications.h:159
msgid "You cant left party on this map."
-msgstr "Вы покинули группу."
+msgstr "Вы не можете покинуть группу на этой карте."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:147
-#, fuzzy
+#: src/resources/notifications.h:163
msgid "You was kicked from party."
-msgstr "Вас выгнали из гильдии."
+msgstr "Вас выкинули из группы."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:151
-msgid "You cant be kicked kicked from party on this map."
-msgstr ""
+#: src/resources/notifications.h:167
+#, fuzzy
+msgid "You cant be kicked from party on this map."
+msgstr "%s не может быть удален из группы на этой карте."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:155
+#: src/resources/notifications.h:171
#, c-format
msgid "%s has joined your party."
msgstr "%s присоединился к группе."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:159
+#: src/resources/notifications.h:175
#, c-format
msgid "%s is already a member of a party."
msgstr "%s уже в Вашей группе."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:163
+#: src/resources/notifications.h:179
#, c-format
msgid "%s refused your invitation."
msgstr "%s отверг Ваше приглашение."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:167
+#: src/resources/notifications.h:183
#, c-format
msgid "%s is now a member of your party."
msgstr "%s теперь в Вашей группе."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:171
+#: src/resources/notifications.h:187
#, c-format
msgid "%s can't join your party because party is full."
msgstr "%s не может присоединиться к Вашей группе, т.к. группа переполнена."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:175
+#: src/resources/notifications.h:191
#, c-format
msgid "QQQ Unknown invite response for %s."
msgstr "QQQ Неизвестный ответ на приглашение для %s."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:203
+#: src/resources/notifications.h:219
#, c-format
msgid "%s has left your party."
msgstr "%s покинул Вашу группу."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:207 src/resources/notifications.h:215
-#, fuzzy, c-format
+#: src/resources/notifications.h:223 src/resources/notifications.h:231
+#, c-format
msgid "%s cant be kicked from party on this map."
-msgstr "%s был вышвырнут из Вашей гильдии."
+msgstr "%s не может быть удален из группы на этой карте."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:211
-#, fuzzy, c-format
+#: src/resources/notifications.h:227
+#, c-format
msgid "%s has kicked from your party."
-msgstr "%s был вышвырнут из Вашей гильдии."
+msgstr "%s был удален из группы."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:219
+#: src/resources/notifications.h:235
#, c-format
msgid "An unknown member tried to say: %s"
msgstr "Неизвестный участник попытался сказать: %s"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:223
+#: src/resources/notifications.h:239
#, c-format
msgid "%s is not in your party!"
msgstr "%s не в группе!"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:227
+#: src/resources/notifications.h:243
#, c-format
msgid "You picked up %s."
msgstr "Вы получили %s."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:231
+#: src/resources/notifications.h:247
#, c-format
msgid "You spent %s."
msgstr "Вы потратили %s."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:235
+#: src/resources/notifications.h:251
msgid "Cannot raise skill!"
msgstr "Не удалось увеличить навык!"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:239
+#: src/resources/notifications.h:255
msgid "Equip ammunition first."
msgstr "Для начала экипируйтесь стрелами/патронами."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:243
+#: src/resources/notifications.h:259
#, c-format
msgid "Trading with %s isn't possible. Trade partner is too far away."
msgstr "Торговля с %s невозможна. Партнер по торговле слишком далеко."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:248
+#: src/resources/notifications.h:264
#, c-format
msgid "Trading with %s isn't possible. Character doesn't exist."
msgstr "Торговля с %s невозможна. Такой персонаж не существует."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:252
+#: src/resources/notifications.h:268
msgid "Trade cancelled due to an unknown reason."
msgstr "Торговля отменена по неизвестной причине."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:256
+#: src/resources/notifications.h:272
#, c-format
msgid "Trade with %s cancelled."
msgstr "Торговля с %s отменена."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:260
+#: src/resources/notifications.h:276
+#, fuzzy, c-format
+msgid "Trade with %s cancelled, because player is busy"
+msgstr "Торговля с %s отменена."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:280
#, c-format
msgid "Unhandled trade cancel packet with %s"
msgstr "Неизвестный пакет при торговле с %s"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:264
+#: src/resources/notifications.h:284
msgid "Failed adding item. Trade partner is over weighted."
msgstr "Не удалось добавить предмет. Партнер по торговле перегружен."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:268
+#: src/resources/notifications.h:288
msgid "Failed adding item. Trade partner has no free slot."
msgstr "Не удалось добавить предмет. У партнера по торговле кончилось место."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:272
+#: src/resources/notifications.h:292
msgid "Failed adding item. You can't trade this item."
msgstr "Ошибка добавления предмета. Вы не можете торговать этим предметом."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:276
+#: src/resources/notifications.h:296
msgid "Failed adding item for unknown reason."
msgstr "Не удалось добавить предмет по неизвестной причине."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:280
+#: src/resources/notifications.h:300
msgid "Trade canceled."
msgstr "Торговля отменена."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:284
+#: src/resources/notifications.h:304
msgid "Trade completed."
msgstr "Торговля завершена."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:288
+#: src/resources/notifications.h:308
msgid "Kick failed!"
msgstr "Не удалось вышвырнуть!"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:292
+#: src/resources/notifications.h:312
msgid "Kick succeeded!"
msgstr "Игрок вышвырнут!"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:296
+#: src/resources/notifications.h:316
#, c-format
msgid "MVP player: %s"
msgstr "MVP игрок: %s"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:300
+#: src/resources/notifications.h:320
msgid "All whispers ignored."
msgstr "Включено игнорирование всех приватных сообщений."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:304
+#: src/resources/notifications.h:324
msgid "All whispers ignore failed."
msgstr "Не удалось игнорирование всех приватных сообщение."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:308
+#: src/resources/notifications.h:328
msgid "All whispers unignored."
msgstr "Убрано игнорирование всех приватных сообщений."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:312
+#: src/resources/notifications.h:332
msgid "All whispers unignore failed."
msgstr "Не удалось убрать игнорирование всех приватных сообщение."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:319
+#: src/resources/notifications.h:339
msgid "pvp off, gvg off"
msgstr "PVP выкл, GVG выкл"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:323
+#: src/resources/notifications.h:343
msgid "pvp on"
msgstr "PVP вкл"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:327
+#: src/resources/notifications.h:347
msgid "gvg on"
msgstr "GVG вкл"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:331
+#: src/resources/notifications.h:351
msgid "pvp on, gvg on"
msgstr "PVP вкл, GVG выкл"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:335
+#: src/resources/notifications.h:355
msgid "unknown pvp"
msgstr "неизвестный статус PVP"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:339
+#: src/resources/notifications.h:359
#, c-format
msgid "Char from account %s is already in your party!"
msgstr "Персонаж с аккаунта %s уже в вашей группе!"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:343
+#: src/resources/notifications.h:363
#, c-format
msgid "%s blocked invite!"
msgstr "%s заблокировал приглашение!"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:347
+#: src/resources/notifications.h:367
msgid "Char is not online!"
msgstr "Игрок не онлайн!"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:351
+#: src/resources/notifications.h:371
msgid "Pet catch failed."
msgstr "Попытка поймать не удалась."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:355
+#: src/resources/notifications.h:375
msgid "Pet catched."
msgstr "Питомец пойман."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:359
+#: src/resources/notifications.h:379
#, c-format
msgid "Pet catch unkown error: %d."
-msgstr ""
+msgstr "Неизвестная ошибка при ловле питомца: %d."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:363
+#: src/resources/notifications.h:383
msgid "Your mercenary duty hour is over."
-msgstr ""
+msgstr "Время работы вашего наемника истекло."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:367
+#: src/resources/notifications.h:387
msgid "Your mercenary was killed."
-msgstr ""
+msgstr "Ваш наемник был убит."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:371
+#: src/resources/notifications.h:391
msgid "Your mercenary was fired."
-msgstr ""
+msgstr "Ваш наемник был уволен."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:375
+#: src/resources/notifications.h:395
msgid "Your mercenary run away."
-msgstr ""
+msgstr "Ваш намник бежал."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:379
+#: src/resources/notifications.h:399
msgid "Mercenary unknown state."
-msgstr ""
+msgstr "Неизвестное состояние наемника."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:383
-#, fuzzy
+#: src/resources/notifications.h:403
msgid "You feed your homunculus."
-msgstr "Вы накормили гомункула"
+msgstr "Вы покормили гомункула."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:387
+#: src/resources/notifications.h:407
#, c-format
msgid "You cant feed homunculus, because not have %s."
msgstr "Вы не можете накормить гомункула, потому что нет %s."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:391
-#, fuzzy
+#: src/resources/notifications.h:411
msgid "Card insert failed."
-msgstr "Не удалось начать торговлю!"
+msgstr "Ошибка вставки карточки."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:395
+#: src/resources/notifications.h:415
msgid "Card inserted."
-msgstr ""
+msgstr "Карточка вставлена."
#. TRANSLATORS: chat option changed message
#: src/utils/booleanoptions.h:27
@@ -8720,9 +8736,3 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
msgstr ""
"/%s может принимать значение \"yes\", \"no\", \"true\", \"false\", \"1\" или "
"\"0\"."
-
-#~ msgid "Enable auction bot support"
-#~ msgstr "Включить поддержку бота AuctionBot"
-
-#~ msgid "Auction"
-#~ msgstr "Аукцион"
diff --git a/po/sk.po b/po/sk.po
index 529a3586c..416b6df7d 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-27 13:23+0300\n"
-"PO-Revision-Date: 2014-09-28 10:01+0000\n"
+"POT-Creation-Date: 2014-10-08 01:19+0300\n"
+"PO-Revision-Date: 2014-10-08 10:01+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Slovak (http://www.transifex.com/projects/p/manaplus/language/sk/)\n"
"MIME-Version: 1.0\n"
@@ -32,7 +32,7 @@ msgstr ""
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:131 src/client.cpp:1463 src/client.cpp:1490
+#: src/actions/actions.cpp:131 src/client.cpp:1461 src/client.cpp:1488
#: src/gamemodifiers.cpp:423 src/gui/widgets/tabs/setup_input.cpp:163
#: src/gui/widgets/tabs/setup_theme.cpp:312
#: src/gui/widgets/tabs/setup_theme.cpp:343
@@ -43,8 +43,8 @@ msgstr ""
#: src/gui/windows/changeemaildialog.cpp:170
#: src/gui/windows/changepassworddialog.cpp:160
#: src/gui/windows/charcreatedialog.cpp:373
-#: src/gui/windows/charselectdialog.cpp:255
-#: src/gui/windows/charselectdialog.cpp:291 src/gui/windows/editdialog.cpp:49
+#: src/gui/windows/charselectdialog.cpp:277
+#: src/gui/windows/charselectdialog.cpp:313 src/gui/windows/editdialog.cpp:49
#: src/gui/windows/editserverdialog.cpp:61
#: src/gui/windows/editserverdialog.cpp:208
#: src/gui/windows/itemamountwindow.cpp:158 src/gui/windows/quitdialog.cpp:70
@@ -52,7 +52,9 @@ msgstr ""
#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
#: src/net/ea/charserverhandler.cpp:143 src/net/ea/charserverhandler.cpp:162
#: src/net/ea/charserverhandler.cpp:175 src/net/ea/gamehandler.cpp:79
-#: src/net/ea/playerhandler.cpp:263 src/net/ea/playerhandler.cpp:279
+#: src/net/ea/playerhandler.cpp:424 src/net/ea/playerhandler.cpp:440
+#: src/net/eathena/charserverhandler.cpp:533
+#: src/net/eathena/charserverhandler.cpp:563
msgid "OK"
msgstr "Potvrdiť"
@@ -176,7 +178,7 @@ msgstr ""
#. TRANSLATORS: party invite message
#. TRANSLATORS: change relation
-#: src/actions/chat.cpp:303 src/actions/commands.cpp:65
+#: src/actions/chat.cpp:303 src/actions/commands.cpp:64
msgid "Please specify a name."
msgstr ""
@@ -199,75 +201,75 @@ msgid "Message now closes chat."
msgstr ""
#. TRANSLATORS: change relation
-#: src/actions/commands.cpp:108
+#: src/actions/commands.cpp:107
#, c-format
msgid "Player already %s!"
msgstr ""
#. TRANSLATORS: change relation
-#: src/actions/commands.cpp:120
+#: src/actions/commands.cpp:119
#, c-format
msgid "Player successfully %s!"
msgstr ""
#. TRANSLATORS: change relation
-#: src/actions/commands.cpp:122
+#: src/actions/commands.cpp:121
#, c-format
msgid "Player could not be %s!"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:153
+#: src/actions/commands.cpp:152
msgid "Player wasn't ignored!"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:162
+#: src/actions/commands.cpp:161
msgid "Player no longer ignored!"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:164
+#: src/actions/commands.cpp:163
msgid "Player could not be unignored!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/actions/commands.cpp:179
+#: src/actions/commands.cpp:178
msgid "Player already erased!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/actions/commands.cpp:192
+#: src/actions/commands.cpp:191
msgid "Player no longer erased!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/actions/commands.cpp:194
+#: src/actions/commands.cpp:193
msgid "Player could not be erased!"
msgstr ""
#. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:201
+#: src/actions/commands.cpp:200
msgid "friend"
msgstr ""
#. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:208
+#: src/actions/commands.cpp:207
msgid "disregarded"
msgstr ""
#. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:215
+#: src/actions/commands.cpp:214
msgid "neutral"
msgstr ""
#. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:222
+#: src/actions/commands.cpp:221
msgid "blacklisted"
msgstr ""
#. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:229
+#: src/actions/commands.cpp:228
msgid "enemy"
msgstr ""
@@ -282,77 +284,77 @@ msgid "Accepting incoming trade requests"
msgstr ""
#. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1306
+#: src/actormanager.cpp:1310
msgid "Visible on map"
msgstr ""
#. TRANSLATORS: default race name
-#: src/being/being.cpp:389
+#: src/being/being.cpp:393
msgid "Human"
msgstr ""
-#: src/being/being.cpp:556
+#: src/being/being.cpp:560
msgid "dodge"
msgstr ""
-#: src/being/being.cpp:556
+#: src/being/being.cpp:560
msgid "miss"
msgstr ""
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1865 src/gui/windows/whoisonline.cpp:855
+#: src/being/being.cpp:1869 src/gui/windows/whoisonline.cpp:855
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1870 src/gui/windows/whoisonline.cpp:860
+#: src/being/being.cpp:1874 src/gui/windows/whoisonline.cpp:860
msgid "I"
msgstr ""
#. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:379
+#: src/being/localplayer.cpp:380
#, c-format
msgid "You were killed by %s"
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:824
+#: src/being/localplayer.cpp:825
msgid "Tried to pick up nonexistent item."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:828
+#: src/being/localplayer.cpp:829
msgid "Item is too heavy."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:832
+#: src/being/localplayer.cpp:833
msgid "Item is too far away."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:836
+#: src/being/localplayer.cpp:837
msgid "Inventory is full."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:840
+#: src/being/localplayer.cpp:841
msgid "Stack is too big."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:844
+#: src/being/localplayer.cpp:845
msgid "Item belongs to someone else."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:848
+#: src/being/localplayer.cpp:849
msgid "Unknown problem picking up item."
msgstr ""
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:872
+#: src/being/localplayer.cpp:873
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -362,43 +364,43 @@ msgstr[2] ""
#. TRANSLATORS: this is normal experience
#. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1054 src/being/localplayer.cpp:1055
-#: src/being/localplayer.cpp:1091
+#: src/being/localplayer.cpp:1055 src/being/localplayer.cpp:1056
+#: src/being/localplayer.cpp:1092
msgid "xp"
msgstr ""
#. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1059 src/being/localplayer.cpp:1065
-#: src/being/localplayer.cpp:1071
+#: src/being/localplayer.cpp:1060 src/being/localplayer.cpp:1066
+#: src/being/localplayer.cpp:1072
msgid "job"
msgstr ""
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2794
+#: src/being/localplayer.cpp:2795
#, c-format
msgid "Follow: %s"
msgstr ""
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2800 src/being/localplayer.cpp:2825
+#: src/being/localplayer.cpp:2801 src/being/localplayer.cpp:2826
msgid "Follow canceled"
msgstr ""
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2810
+#: src/being/localplayer.cpp:2811
#, c-format
msgid "Imitation: %s"
msgstr ""
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2816 src/being/localplayer.cpp:2830
+#: src/being/localplayer.cpp:2817 src/being/localplayer.cpp:2831
msgid "Imitation canceled"
msgstr ""
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3180
+#: src/being/localplayer.cpp:3181
#, c-format
msgid "You see %s"
msgstr ""
@@ -436,37 +438,37 @@ msgstr ""
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:920 src/gui/windowmenu.cpp:162
+#: src/client.cpp:918 src/gui/windowmenu.cpp:162
#: src/gui/windows/setupwindow.cpp:62
msgid "Setup"
msgstr "Nastavenie"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:923 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:921 src/gui/widgets/tabs/setup_perfomance.cpp:54
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:926 src/gui/widgets/tabs/setup_video.cpp:105
+#: src/client.cpp:924 src/gui/widgets/tabs/setup_video.cpp:105
msgid "Video"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:929 src/gui/widgets/tabs/setup_theme.cpp:122
+#: src/client.cpp:927 src/gui/widgets/tabs/setup_theme.cpp:122
msgid "Theme"
msgstr ""
#. TRANSLATORS: theme tab quick button
-#: src/client.cpp:932
+#: src/client.cpp:930
msgid "About"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:935 src/gui/windowmenu.cpp:74
+#: src/client.cpp:933 src/gui/windowmenu.cpp:74
#: src/gui/windows/helpwindow.cpp:53
msgid "Help"
msgstr "Nápoveda"
@@ -482,42 +484,42 @@ msgstr "Nápoveda"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:939 src/client.cpp:1391 src/client.cpp:1405
+#: src/client.cpp:937 src/client.cpp:1389 src/client.cpp:1403
#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:691
#: src/gui/popups/popupmenu.cpp:923 src/gui/windows/didyouknowwindow.cpp:81
#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:74
#: src/gui/windows/npcdialog.cpp:112 src/gui/windows/questswindow.cpp:77
-#: src/gui/windows/shopwindow.cpp:84
+#: src/gui/windows/shopwindow.cpp:83
msgid "Close"
msgstr "Zatvoriť"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1065
+#: src/client.cpp:1063
msgid "Connecting to server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1113
+#: src/client.cpp:1111
msgid "Logging in"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1156
+#: src/client.cpp:1154
msgid "Entering game world"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1282
+#: src/client.cpp:1280
msgid "Requesting characters"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1322
+#: src/client.cpp:1320
msgid "Connecting to the game server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1334
+#: src/client.cpp:1332
msgid "Changing game servers"
msgstr ""
@@ -531,72 +533,76 @@ msgstr ""
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1389 src/client.cpp:1403 src/client.cpp:1598
+#. TRANSLATORS: info message
+#. TRANSLATORS: ok dialog button
+#: src/client.cpp:1387 src/client.cpp:1401 src/client.cpp:1596
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
#: src/gui/windows/charcreatedialog.cpp:369
-#: src/gui/windows/charselectdialog.cpp:289
+#: src/gui/windows/charselectdialog.cpp:311
#: src/gui/windows/editserverdialog.cpp:203
#: src/gui/windows/registerdialog.cpp:245
#: src/gui/windows/unregisterdialog.cpp:146
#: src/net/ea/charserverhandler.cpp:141 src/net/ea/charserverhandler.cpp:173
+#: src/net/eathena/charserverhandler.cpp:516
+#: src/net/eathena/charserverhandler.cpp:518
msgid "Error"
msgstr "Chyba"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1418
+#: src/client.cpp:1416
msgid "Requesting registration details"
msgstr ""
#. TRANSLATORS: password change message header
-#: src/client.cpp:1459
+#: src/client.cpp:1457
msgid "Password Change"
msgstr ""
#. TRANSLATORS: password change message text
-#: src/client.cpp:1461
+#: src/client.cpp:1459
msgid "Password changed successfully!"
msgstr ""
#. TRANSLATORS: email change message header
-#: src/client.cpp:1486
+#: src/client.cpp:1484
msgid "Email Change"
msgstr ""
#. TRANSLATORS: email change message text
-#: src/client.cpp:1488
+#: src/client.cpp:1486
msgid "Email changed successfully!"
msgstr ""
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1515
+#: src/client.cpp:1513
msgid "Unregister Successful"
msgstr ""
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1517
+#: src/client.cpp:1515
msgid "Farewell, come back any time..."
msgstr ""
#. TRANSLATORS: directory creation error
#: src/configmanager.cpp:53 src/dirs.cpp:260 src/dirs.cpp:275 src/dirs.cpp:320
-#: src/dirs.cpp:481 src/dirs.cpp:489
+#: src/dirs.cpp:488 src/dirs.cpp:496
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:363
+#: src/dirs.cpp:370
#, c-format
msgid "Invalid update host: %s."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:404 src/dirs.cpp:411
+#: src/dirs.cpp:411 src/dirs.cpp:418
msgid "Error creating updates directory!"
msgstr ""
-#: src/dirs.cpp:433 src/dirs.cpp:451
+#: src/dirs.cpp:440 src/dirs.cpp:458
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
@@ -614,36 +620,36 @@ msgid "dyecmd srcdyestring dstfile"
msgstr ""
#. TRANSLATORS: chat tab header
-#: src/game.cpp:236 src/gui/widgets/tabs/chattab.cpp:482
+#: src/game.cpp:234 src/gui/widgets/tabs/chattab.cpp:482
msgid "General"
msgstr ""
#. TRANSLATORS: chat tab header
#. TRANSLATORS: full button name
#. TRANSLATORS: debug window name
-#: src/game.cpp:253 src/gui/widgets/tabs/chattab.cpp:484
+#: src/game.cpp:251 src/gui/widgets/tabs/chattab.cpp:484
#: src/gui/windowmenu.cpp:149 src/gui/windows/debugwindow.cpp:42
msgid "Debug"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:541
+#: src/game.cpp:532
#, c-format
msgid "Screenshot saved as %s"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:551
+#: src/game.cpp:542
msgid "Saving screenshot failed!"
msgstr ""
#. TRANSLATORS: error message text
-#: src/game.cpp:634
+#: src/game.cpp:625
msgid "The connection to the server was lost."
msgstr ""
#. TRANSLATORS: error message header
-#: src/game.cpp:637
+#: src/game.cpp:628
msgid "Network Error"
msgstr ""
@@ -1034,6 +1040,7 @@ msgstr ""
#: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
#: src/gui/widgets/tabs/setup_other.cpp:79
#: src/gui/widgets/tabs/setup_visual.cpp:81
+#: src/gui/windows/equipmentwindow.cpp:577
msgid "default"
msgstr ""
@@ -1524,7 +1531,7 @@ msgstr ""
#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:273
#: src/gui/popups/popupmenu.cpp:767 src/gui/widgets/skillinfo.cpp:113
#: src/gui/windows/botcheckerwindow.cpp:89 src/input/pages/basic.cpp:42
-#: src/net/eathena/generalhandler.cpp:289 src/net/tmwa/generalhandler.cpp:321
+#: src/net/eathena/generalhandler.cpp:356 src/net/tmwa/generalhandler.cpp:320
msgid "Attack"
msgstr ""
@@ -1693,7 +1700,7 @@ msgstr ""
#. TRANSLATORS: pet unequip item
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:340 src/gui/windows/equipmentwindow.cpp:70
+#: src/gui/popups/popupmenu.cpp:340 src/gui/windows/equipmentwindow.cpp:72
#: src/gui/windows/inventorywindow.cpp:175 src/resources/itemtypemapdata.h:47
#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
@@ -1751,7 +1758,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:574
+#: src/gui/popups/popupmenu.cpp:574 src/gui/windows/charselectdialog.cpp:132
msgid "Rename"
msgstr ""
@@ -2263,7 +2270,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
#. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:3000 src/net/ea/playerhandler.cpp:364
+#: src/gui/popups/popupmenu.cpp:3000 src/net/ea/playerhandler.cpp:195
msgid "Revive"
msgstr ""
@@ -2287,7 +2294,7 @@ msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: settings group
#. TRANSLATORS: full button name
-#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:319
+#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:315
#: src/gui/windowmenu.cpp:158
msgid "Windows"
msgstr ""
@@ -2315,7 +2322,7 @@ msgstr ""
#. TRANSLATORS: input action name
#: src/gui/setupinputpages.cpp:57 src/gui/widgets/tabs/setup_audio.cpp:151
#: src/gui/widgets/tabs/setup_chat.cpp:179
-#: src/gui/widgets/tabs/setup_other.cpp:341
+#: src/gui/widgets/tabs/setup_other.cpp:337
#: src/gui/widgets/tabs/setup_visual.cpp:192
#: src/gui/windows/charcreatedialog.cpp:119
#: src/gui/windows/registerdialog.cpp:106 src/input/pages/gui.cpp:87
@@ -2328,212 +2335,227 @@ msgid "Gui"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:113
+#: src/gui/userpalette.cpp:116
msgid "Being"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:115
+#: src/gui/userpalette.cpp:118
msgid "Friend names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:117
+#: src/gui/userpalette.cpp:120
msgid "Disregarded names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:119
+#: src/gui/userpalette.cpp:122
msgid "Ignored names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:121
+#: src/gui/userpalette.cpp:124
msgid "Erased names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:123
+#: src/gui/userpalette.cpp:126
msgid "Other players names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:125
+#: src/gui/userpalette.cpp:128
msgid "Own name"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:127
+#: src/gui/userpalette.cpp:130
msgid "GM names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:129
+#: src/gui/userpalette.cpp:132
msgid "NPCs"
msgstr ""
#. TRANSLATORS: palette color
#. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:131 src/gui/widgets/tabs/setup_other.cpp:108
+#: src/gui/userpalette.cpp:134 src/gui/widgets/tabs/setup_other.cpp:108
msgid "Monsters"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:133
+#: src/gui/userpalette.cpp:136
msgid "Monster HP bar"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:139
msgid "Monster HP bar (second color)"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:138
+#: src/gui/userpalette.cpp:141
msgid "Party members"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:140
+#: src/gui/userpalette.cpp:143
msgid "Guild members"
msgstr ""
#. TRANSLATORS: palette color
#. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:142 src/gui/widgets/tabs/setup_visual.cpp:157
+#: src/gui/userpalette.cpp:145 src/gui/widgets/tabs/setup_visual.cpp:157
msgid "Particle effects"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:144
+#: src/gui/userpalette.cpp:147
msgid "Pickup notification"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:146
+#: src/gui/userpalette.cpp:149
msgid "Exp notification"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:148
+#: src/gui/userpalette.cpp:151
msgid "Player HP bar"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:152
+#: src/gui/userpalette.cpp:155
msgid "Player HP bar (second color)"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:154
+#: src/gui/userpalette.cpp:157
msgid "Player hits monster"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:156
+#: src/gui/userpalette.cpp:159
msgid "Monster hits player"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:160
+#: src/gui/userpalette.cpp:163
msgid "Other player hits local player"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:162
+#: src/gui/userpalette.cpp:165
msgid "Critical Hit"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:166
+#: src/gui/userpalette.cpp:169
msgid "Local player hits monster"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:169
+#: src/gui/userpalette.cpp:172
msgid "Local player critical hit"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:172
+#: src/gui/userpalette.cpp:175
msgid "Local player miss"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:174
+#: src/gui/userpalette.cpp:177
msgid "Misses"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:176
+#: src/gui/userpalette.cpp:179
msgid "Portal highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:179
+#: src/gui/userpalette.cpp:182
msgid "Default collision highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:182
+#: src/gui/userpalette.cpp:185
msgid "Air collision highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:185
+#: src/gui/userpalette.cpp:188
msgid "Water collision highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:188
+#: src/gui/userpalette.cpp:191
msgid "Special ground collision highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:191
+#: src/gui/userpalette.cpp:194
msgid "Walkable highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:194
+#: src/gui/userpalette.cpp:197
msgid "Local player attack range"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:197
+#: src/gui/userpalette.cpp:200
msgid "Local player attack range border"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:200
+#: src/gui/userpalette.cpp:203
msgid "Monster attack range"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:204
+#: src/gui/userpalette.cpp:207
msgid "Floor item amount color"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:207
+#: src/gui/userpalette.cpp:210
msgid "Home place"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:210
+#: src/gui/userpalette.cpp:213
msgid "Home place border"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:213
+#: src/gui/userpalette.cpp:216
msgid "Road point"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:216
+#: src/gui/userpalette.cpp:219
msgid "Tiles border"
msgstr ""
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:221
+msgid "Pets"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:223
+msgid "Mercenary"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:225
+msgid "Homunculus"
+msgstr ""
+
#: src/gui/widgets/characterdisplay.cpp:135
#, c-format
msgid "Level: %u"
@@ -2636,7 +2658,8 @@ msgid "Type: %s"
msgstr ""
#. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:108
+#. TRANSLATORS: unknown equipment page name
+#: src/gui/widgets/skillinfo.cpp:108 src/gui/windows/equipmentwindow.cpp:584
msgid "Unknown"
msgstr ""
@@ -2837,22 +2860,22 @@ msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:262
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:313
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:375
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:319
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:387
msgid "Target:"
msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:264
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:319
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:377
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:325
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:389
msgid "Target Id:"
msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:267
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:322
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:379
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:328
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:391
msgid "Target type:"
msgstr ""
@@ -2863,7 +2886,7 @@ msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:271
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:338
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:344
msgid "Target race:"
msgstr ""
@@ -2879,67 +2902,81 @@ msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:277
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:363
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:369
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:387
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:375
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:381
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:399
msgid "Attack delay:"
msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:279
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:350
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:389
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:356
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:401
msgid "Minimal hit:"
msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:281
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:353
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:391
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:359
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:403
msgid "Maximum hit:"
msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:283
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:356
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:393
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:362
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:405
msgid "Critical hit:"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:327
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:285
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:365
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:407
+msgid "Karma:"
+msgstr ""
+
+#. TRANSLATORS: debug window label
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:287
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:368
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:409
+msgid "Manner:"
+msgstr ""
+
+#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:333
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:381
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:339
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:393
msgid "Target Level:"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:341
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:383
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:347
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:395
msgid "Target Party:"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:345
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:385
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:351
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:397
msgid "Target Guild:"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:430
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:436
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:451
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:457
#, c-format
msgid "Ping: %s ms"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:439
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:460
#, c-format
msgid "In: %d bytes/s"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:442
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:463
#, c-format
msgid "Out: %d bytes/s"
msgstr ""
@@ -3768,137 +3805,132 @@ msgstr ""
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_other.cpp:294
-msgid "Enable auction bot support"
-msgstr ""
-
-#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:298
msgid "Enable guild bot support and disable native guild support"
msgstr ""
#. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:304
+#: src/gui/widgets/tabs/setup_other.cpp:300
msgid "Keyboard"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:307
+#: src/gui/widgets/tabs/setup_other.cpp:303
msgid "Repeat delay"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:311
+#: src/gui/widgets/tabs/setup_other.cpp:307
msgid "Repeat interval"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:315
+#: src/gui/widgets/tabs/setup_other.cpp:311
msgid "Custom repeat interval"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:323
+#: src/gui/widgets/tabs/setup_other.cpp:319
msgid "Shortcut buttons"
msgstr ""
#. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:328
+#: src/gui/widgets/tabs/setup_other.cpp:324
msgid "Proxy server"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:332
+#: src/gui/widgets/tabs/setup_other.cpp:328
msgid "Proxy type"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:336
+#: src/gui/widgets/tabs/setup_other.cpp:332
msgid "Proxy address:port"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:344
+#: src/gui/widgets/tabs/setup_other.cpp:340
msgid "Enable server side attack"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:348
+#: src/gui/widgets/tabs/setup_other.cpp:344
msgid "Hide support page link on error"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:352
+#: src/gui/widgets/tabs/setup_other.cpp:348
msgid "Enable double clicks"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:356
+#: src/gui/widgets/tabs/setup_other.cpp:352
msgid "Enable bot checker"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:360
+#: src/gui/widgets/tabs/setup_other.cpp:356
msgid "Enable buggy servers protection (do not disable)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:365
+#: src/gui/widgets/tabs/setup_other.cpp:361
msgid "Enable debug log"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:369
+#: src/gui/widgets/tabs/setup_other.cpp:365
msgid "Ignore logging packets"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:373
+#: src/gui/widgets/tabs/setup_other.cpp:369
msgid "Enable OpenGL log"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:377
+#: src/gui/widgets/tabs/setup_other.cpp:373
msgid "Enable input log"
msgstr ""
#. TRANSLATORS: settings option
#. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_other.cpp:381 src/input/pages/other.cpp:362
+#: src/gui/widgets/tabs/setup_other.cpp:377 src/input/pages/other.cpp:362
msgid "Upload log file"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:385
+#: src/gui/widgets/tabs/setup_other.cpp:381
msgid "Low traffic mode"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:389
+#: src/gui/widgets/tabs/setup_other.cpp:385
msgid "Hide shield sprite"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:394
+#: src/gui/widgets/tabs/setup_other.cpp:390
msgid "Use FBO for screenshots (only for opengl)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:400
+#: src/gui/widgets/tabs/setup_other.cpp:396
msgid "Screenshot directory"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:405
+#: src/gui/widgets/tabs/setup_other.cpp:401
msgid "Network delay between sub servers"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:409
+#: src/gui/widgets/tabs/setup_other.cpp:405
msgid "Show background"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:414
+#: src/gui/widgets/tabs/setup_other.cpp:410
msgid "Screen density override"
msgstr ""
@@ -4129,9 +4161,9 @@ msgstr ""
#. TRANSLATORS: command editor button
#. TRANSLATORS: input action name
#: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:82
-#: src/gui/windows/serverdialog.cpp:125 src/gui/windows/shopwindow.cpp:101
-#: src/gui/windows/shopwindow.cpp:108 src/gui/windows/textcommandeditor.cpp:92
+#: src/gui/windows/charselectdialog.cpp:84
+#: src/gui/windows/serverdialog.cpp:125 src/gui/windows/shopwindow.cpp:100
+#: src/gui/windows/shopwindow.cpp:107 src/gui/windows/textcommandeditor.cpp:92
#: src/input/pages/gui.cpp:111
msgid "Delete"
msgstr "Vymazať"
@@ -4785,7 +4817,7 @@ msgstr ""
#. TRANSLATORS: equipment window name
#. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:63
+#: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:65
#: src/gui/windows/inventorywindow.cpp:196
msgid "Equipment"
msgstr "Vybavenie"
@@ -4926,7 +4958,7 @@ msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: social window button
#: src/gui/windows/buydialog.cpp:260 src/gui/windows/charcreatedialog.cpp:127
-#: src/gui/windows/charselectdialog.cpp:578
+#: src/gui/windows/charselectdialog.cpp:605
#: src/gui/windows/socialwindow.cpp:86
msgid "Create"
msgstr "Vytvoriť"
@@ -4970,10 +5002,8 @@ msgstr ""
#. TRANSLATORS: change password window name
#. TRANSLATORS: change password dialog button
-#. TRANSLATORS: char select dialog. button.
#: src/gui/windows/changepassworddialog.cpp:51
#: src/gui/windows/changepassworddialog.cpp:57
-#: src/gui/windows/charselectdialog.cpp:73
msgid "Change Password"
msgstr "Zmeniť heslo"
@@ -5127,57 +5157,68 @@ msgid "Are you sure you want to delete this character?"
msgstr "Naozaj chcete odstrániť túto postavu?"
#. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:64
+#: src/gui/windows/charselectdialog.cpp:66
#, c-format
msgid "Account %s (last login time %s)"
msgstr ""
#. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:71
-msgid "Switch Login"
+#: src/gui/windows/charselectdialog.cpp:73
+msgid "Switch"
+msgstr ""
+
+#. TRANSLATORS: char select dialog. button.
+#: src/gui/windows/charselectdialog.cpp:75
+msgid "Password"
msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:78
-#: src/gui/windows/charselectdialog.cpp:573
+#: src/gui/windows/charselectdialog.cpp:80
+#: src/gui/windows/charselectdialog.cpp:595
#: src/gui/windows/updaterwindow.cpp:195
msgid "Play"
msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:80
+#: src/gui/windows/charselectdialog.cpp:82
#: src/net/ea/charserverhandler.cpp:160
+#: src/net/eathena/charserverhandler.cpp:531
+#: src/net/eathena/charserverhandler.cpp:561
msgid "Info"
msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: unregister dialog name
#. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:106
+#: src/gui/windows/charselectdialog.cpp:110
#: src/gui/windows/unregisterdialog.cpp:50
#: src/gui/windows/unregisterdialog.cpp:55
msgid "Unregister"
msgstr "Zrušiť registráciu"
#. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:118
+#: src/gui/windows/charselectdialog.cpp:122
msgid "Change Email"
msgstr ""
#. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:156
+#: src/gui/windows/charselectdialog.cpp:166
#, c-format
msgid "Account %s"
msgstr ""
-#: src/gui/windows/charselectdialog.cpp:184
+#: src/gui/windows/charselectdialog.cpp:194
msgid "Please set new pincode"
msgstr ""
+#: src/gui/windows/charselectdialog.cpp:240
+msgid "Please enter new name"
+msgstr ""
+
#. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:237
+#: src/gui/windows/charselectdialog.cpp:259
#, c-format
msgid ""
"Hp: %u/%u\n"
@@ -5187,16 +5228,16 @@ msgid ""
"Money: %s"
msgstr ""
-#: src/gui/windows/charselectdialog.cpp:289
+#: src/gui/windows/charselectdialog.cpp:311
msgid "Incorrect password"
msgstr ""
#. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:429
+#: src/gui/windows/charselectdialog.cpp:451
msgid "Enter password for deleting character"
msgstr ""
-#: src/gui/windows/charselectdialog.cpp:429
+#: src/gui/windows/charselectdialog.cpp:451
msgid "Enter password:"
msgstr ""
@@ -5606,7 +5647,7 @@ msgstr "Level: %d"
#. TRANSLATORS: status bar label
#: src/gui/windows/ministatuswindow.cpp:364
-#: src/gui/windows/ministatuswindow.cpp:402
+#: src/gui/windows/ministatuswindow.cpp:401
msgid "Need"
msgstr ""
@@ -5637,7 +5678,7 @@ msgstr ""
#. TRANSLATORS: shop window button
#. TRANSLATORS: trade window button
#: src/gui/windows/npcdialog.cpp:114 src/gui/windows/serverdialog.cpp:121
-#: src/gui/windows/shopwindow.cpp:99 src/gui/windows/shopwindow.cpp:106
+#: src/gui/windows/shopwindow.cpp:98 src/gui/windows/shopwindow.cpp:105
#: src/gui/windows/tradewindow.cpp:83
msgid "Add"
msgstr ""
@@ -5800,43 +5841,38 @@ msgid "Reset Windows"
msgstr ""
#. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:80
+#: src/gui/windows/shopwindow.cpp:79
msgid "Personal Shop"
msgstr ""
#. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:95
+#: src/gui/windows/shopwindow.cpp:94
msgid "Buy items"
msgstr ""
#. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:97
+#: src/gui/windows/shopwindow.cpp:96
msgid "Sell items"
msgstr ""
#. TRANSLATORS: shop window label
#. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:110
+#: src/gui/windows/shopwindow.cpp:102 src/gui/windows/shopwindow.cpp:109
msgid "Announce"
msgstr ""
#. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:114
+#: src/gui/windows/shopwindow.cpp:113
msgid "Show links in announce"
msgstr ""
-#. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:176 src/gui/windows/shopwindow.cpp:179
-msgid "Auction"
-msgstr ""
-
#. TRANSLATORS: shop window dialog
#. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:233
+#: src/gui/windows/shopwindow.cpp:776 src/net/ea/tradehandler.cpp:233
msgid "Request for Trade"
msgstr ""
-#: src/gui/windows/shopwindow.cpp:791
+#: src/gui/windows/shopwindow.cpp:776
#, c-format
msgid "%s wants to %s %s do you accept?"
msgstr ""
@@ -6164,27 +6200,27 @@ msgstr ""
msgid "Connecting..."
msgstr "Pripájam sa..."
-#: src/gui/windows/updaterwindow.cpp:398
+#: src/gui/windows/updaterwindow.cpp:407
msgid "Show all news (can be slow)"
msgstr ""
#. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:824
+#: src/gui/windows/updaterwindow.cpp:833
msgid "##1 The update process is incomplete."
msgstr ""
#. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:826
+#: src/gui/windows/updaterwindow.cpp:835
msgid "##1 It is strongly recommended that"
msgstr ""
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:828
+#: src/gui/windows/updaterwindow.cpp:837
msgid "##1 you try again later."
msgstr ""
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1005
+#: src/gui/windows/updaterwindow.cpp:1021
msgid "Completed"
msgstr ""
@@ -6231,25 +6267,25 @@ msgstr ""
#. TRANSLATORS: long key name. must be short.
#. TRANSLATORS: short key name. must be very short.
#. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:370 src/input/inputmanager.cpp:414
+#: src/input/inputmanager.cpp:371 src/input/inputmanager.cpp:415
#: src/input/keyboardconfig.cpp:104
#, c-format
msgid "key_%d"
msgstr ""
#. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:376
+#: src/input/inputmanager.cpp:377
#, c-format
msgid "JButton%d"
msgstr ""
#. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:391
msgid "unknown key"
msgstr ""
#. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:420
+#: src/input/inputmanager.cpp:421
#, c-format
msgid "JB%d"
msgstr ""
@@ -6257,7 +6293,7 @@ msgstr ""
#. TRANSLATORS: unknown short key type. must be short
#. TRANSLATORS: Unknown key short string.
#. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:434 src/input/keyboardconfig.cpp:148
+#: src/input/inputmanager.cpp:435 src/input/keyboardconfig.cpp:148
msgid "u key"
msgstr ""
@@ -7428,74 +7464,74 @@ msgid "Request to quit denied!"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:135
#, c-format
msgid "Guild name: %s"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:191
+#: src/net/ea/guildhandler.cpp:138
#, c-format
msgid "Guild master: %s"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:141
#, c-format
msgid "Guild level: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:197
+#: src/net/ea/guildhandler.cpp:144
#, c-format
msgid "Online members: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:200
+#: src/net/ea/guildhandler.cpp:147
#, c-format
msgid "Max members: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:203
+#: src/net/ea/guildhandler.cpp:150
#, c-format
msgid "Average level: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:206
+#: src/net/ea/guildhandler.cpp:153
#, c-format
msgid "Guild exp: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:209
+#: src/net/ea/guildhandler.cpp:156
#, c-format
msgid "Guild next exp: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:212
+#: src/net/ea/guildhandler.cpp:159
#, c-format
msgid "Guild castle: %s"
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:179
+#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:191
msgid "Item sharing enabled."
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:183
+#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:195
msgid "Item sharing disabled."
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:187
+#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:199
msgid "Item sharing not possible."
msgstr ""
@@ -7506,19 +7542,19 @@ msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:167
+#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:179
msgid "Experience sharing enabled."
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:171
+#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:183
msgid "Experience sharing disabled."
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:175
+#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:187
msgid "Experience sharing not possible."
msgstr ""
@@ -7623,239 +7659,355 @@ msgid "Connection to server terminated. "
msgstr ""
#. TRANSLATORS: message header
-#: src/net/ea/playerhandler.cpp:257 src/net/ea/playerhandler.cpp:273
-#: src/net/ea/playerhandler.cpp:361
+#: src/net/ea/playerhandler.cpp:192 src/net/ea/playerhandler.cpp:418
+#: src/net/ea/playerhandler.cpp:434
msgid "Message"
msgstr ""
#. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:259
+#: src/net/ea/playerhandler.cpp:420
msgid ""
"You are carrying more than half your weight. You are unable to regain "
"health."
msgstr ""
#. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:275
+#: src/net/ea/playerhandler.cpp:436
msgid "You are carrying less than half your weight. You can regain health."
msgstr ""
+#. TRANSLATORS: char rename error
+#: src/net/eathena/charserverhandler.cpp:516
+#: src/net/eathena/charserverhandler.cpp:553
+msgid "Character rename error."
+msgstr ""
+
+#: src/net/eathena/charserverhandler.cpp:531
+msgid "Character renamed."
+msgstr ""
+
+#. TRANSLATORS: char rename error
+#: src/net/eathena/charserverhandler.cpp:544
+msgid "Rename not allowed."
+msgstr ""
+
+#. TRANSLATORS: char rename error
+#: src/net/eathena/charserverhandler.cpp:548
+msgid "New name is not set."
+msgstr ""
+
+#. TRANSLATORS: char rename error
+#: src/net/eathena/charserverhandler.cpp:557
+msgid "Character not found."
+msgstr ""
+
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:125
+#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:124
#, c-format
msgid "Strength %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:127
+#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:126
#, c-format
msgid "Agility %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:129
+#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:128
#, c-format
msgid "Vitality %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:131
+#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:130
#, c-format
msgid "Intelligence %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:128 src/net/tmwa/generalhandler.cpp:133
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:132
#, c-format
msgid "Dexterity %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:135
+#: src/net/eathena/generalhandler.cpp:128 src/net/tmwa/generalhandler.cpp:134
#, c-format
msgid "Luck %s"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:152 src/net/tmwa/generalhandler.cpp:161
+#: src/net/eathena/generalhandler.cpp:159 src/net/tmwa/generalhandler.cpp:160
msgid "Authentication failed."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:155 src/net/tmwa/generalhandler.cpp:165
+#: src/net/eathena/generalhandler.cpp:162 src/net/tmwa/generalhandler.cpp:164
msgid "No servers available."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:160 src/net/tmwa/generalhandler.cpp:171
+#: src/net/eathena/generalhandler.cpp:167 src/net/tmwa/generalhandler.cpp:170
msgid "Someone else is trying to use this account."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:165 src/net/tmwa/generalhandler.cpp:177
+#: src/net/eathena/generalhandler.cpp:172 src/net/tmwa/generalhandler.cpp:176
msgid "This account is already logged in."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:169 src/net/tmwa/generalhandler.cpp:182
+#: src/net/eathena/generalhandler.cpp:176 src/net/tmwa/generalhandler.cpp:181
msgid "Speed hack detected."
msgstr ""
+#: src/net/eathena/generalhandler.cpp:179
+msgid "Server full."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:182
+msgid "Sorry, you are underaged."
+msgstr ""
+
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:172 src/net/tmwa/generalhandler.cpp:186
+#: src/net/eathena/generalhandler.cpp:185 src/net/tmwa/generalhandler.cpp:185
msgid "Duplicated login."
msgstr ""
+#: src/net/eathena/generalhandler.cpp:188
+msgid "To many connections from same ip."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:191
+msgid "Not paid for this time."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:194
+msgid "Pay suspended."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:197
+msgid "Pay changed."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:200
+msgid "Pay wrong ip."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:203
+msgid "Pay game room."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:206
+msgid "Disconnect forced by GM."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:210
+msgid "Ban japan refuse."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:213
+msgid "Remained other account."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:216
+msgid "Ip unfair."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:219
+msgid "Ip count all."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:222
+msgid "Ip count."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:226
+msgid "Memory."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:229
+msgid "Han valid."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:232
+msgid "Ip limited access."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:235
+msgid "Over characters list."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:238
+msgid "Ip blocked."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:241
+msgid "Invalid password count."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:244
+msgid "Not allowed race."
+msgstr ""
+
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:175 src/net/tmwa/generalhandler.cpp:190
+#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:189
msgid "Unknown connection error."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:280
+#: src/net/eathena/generalhandler.cpp:323 src/net/tmwa/generalhandler.cpp:279
msgid "Got disconnected from server!"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:282 src/net/tmwa/generalhandler.cpp:308
+#: src/net/eathena/generalhandler.cpp:348 src/net/tmwa/generalhandler.cpp:307
msgid "Strength"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:310
+#: src/net/eathena/generalhandler.cpp:349 src/net/tmwa/generalhandler.cpp:309
msgid "Agility"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:284 src/net/tmwa/generalhandler.cpp:312
+#: src/net/eathena/generalhandler.cpp:350 src/net/tmwa/generalhandler.cpp:311
msgid "Vitality"
msgstr ""
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:285 src/net/tmwa/generalhandler.cpp:314
+#: src/net/eathena/generalhandler.cpp:352 src/net/tmwa/generalhandler.cpp:314
msgid "Intelligence"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:286 src/net/tmwa/generalhandler.cpp:316
+#: src/net/eathena/generalhandler.cpp:353 src/net/tmwa/generalhandler.cpp:316
msgid "Dexterity"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:287 src/net/tmwa/generalhandler.cpp:318
+#: src/net/eathena/generalhandler.cpp:354 src/net/tmwa/generalhandler.cpp:318
msgid "Luck"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:290 src/net/tmwa/generalhandler.cpp:323
+#: src/net/eathena/generalhandler.cpp:357 src/net/tmwa/generalhandler.cpp:322
msgid "Defense"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:291 src/net/tmwa/generalhandler.cpp:325
+#: src/net/eathena/generalhandler.cpp:358 src/net/tmwa/generalhandler.cpp:324
msgid "M.Attack"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:292 src/net/tmwa/generalhandler.cpp:327
+#: src/net/eathena/generalhandler.cpp:359 src/net/tmwa/generalhandler.cpp:326
msgid "M.Defense"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:294 src/net/tmwa/generalhandler.cpp:330
+#: src/net/eathena/generalhandler.cpp:361 src/net/tmwa/generalhandler.cpp:329
#, no-c-format
msgid "% Accuracy"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:296 src/net/tmwa/generalhandler.cpp:333
+#: src/net/eathena/generalhandler.cpp:363 src/net/tmwa/generalhandler.cpp:332
#, no-c-format
msgid "% Evade"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:298 src/net/tmwa/generalhandler.cpp:336
+#: src/net/eathena/generalhandler.cpp:365 src/net/tmwa/generalhandler.cpp:335
#, no-c-format
msgid "% Critical"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:299 src/net/tmwa/generalhandler.cpp:338
+#: src/net/eathena/generalhandler.cpp:366 src/net/tmwa/generalhandler.cpp:337
msgid "Attack Delay"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:300 src/net/tmwa/generalhandler.cpp:340
+#: src/net/eathena/generalhandler.cpp:367 src/net/tmwa/generalhandler.cpp:339
msgid "Walk Delay"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:301 src/net/tmwa/generalhandler.cpp:342
+#: src/net/eathena/generalhandler.cpp:368 src/net/tmwa/generalhandler.cpp:341
msgid "Attack Range"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:302 src/net/tmwa/generalhandler.cpp:344
+#: src/net/eathena/generalhandler.cpp:369 src/net/tmwa/generalhandler.cpp:343
msgid "Damage per sec."
msgstr ""
-#: src/net/eathena/skillhandler.cpp:228 src/net/eathena/skillhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:370
+msgid "Karma"
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:371
+msgid "Manner"
+msgstr ""
+
+#: src/net/eathena/skillhandler.cpp:304 src/net/eathena/skillhandler.cpp:364
#, c-format
msgid "Unknown skill error: %d"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:235 src/net/tmwa/skillhandler.cpp:224
+#: src/net/eathena/skillhandler.cpp:311 src/net/tmwa/skillhandler.cpp:224
msgid "You have not yet reached a high enough lvl!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:239 src/net/tmwa/skillhandler.cpp:228
+#: src/net/eathena/skillhandler.cpp:315 src/net/tmwa/skillhandler.cpp:228
msgid "Insufficient HP!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:243 src/net/tmwa/skillhandler.cpp:232
+#: src/net/eathena/skillhandler.cpp:319 src/net/tmwa/skillhandler.cpp:232
msgid "Insufficient SP!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:247 src/net/tmwa/skillhandler.cpp:236
+#: src/net/eathena/skillhandler.cpp:323 src/net/tmwa/skillhandler.cpp:236
msgid "You have no memos!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:251 src/net/tmwa/skillhandler.cpp:240
+#: src/net/eathena/skillhandler.cpp:327 src/net/tmwa/skillhandler.cpp:240
msgid "You cannot do that right now!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:255 src/net/tmwa/skillhandler.cpp:244
+#: src/net/eathena/skillhandler.cpp:331 src/net/tmwa/skillhandler.cpp:244
msgid "Seems you need more money... ;-)"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:259 src/net/tmwa/skillhandler.cpp:248
+#: src/net/eathena/skillhandler.cpp:335 src/net/tmwa/skillhandler.cpp:248
msgid "You cannot use this skill with that kind of weapon!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:264 src/net/tmwa/skillhandler.cpp:253
+#: src/net/eathena/skillhandler.cpp:340 src/net/tmwa/skillhandler.cpp:253
msgid "You need another red gem!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:268 src/net/tmwa/skillhandler.cpp:257
+#: src/net/eathena/skillhandler.cpp:344 src/net/tmwa/skillhandler.cpp:257
msgid "You need another blue gem!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:272 src/net/tmwa/skillhandler.cpp:261
+#: src/net/eathena/skillhandler.cpp:348 src/net/tmwa/skillhandler.cpp:261
msgid "You're carrying to much to do this!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:276 src/net/tmwa/skillhandler.cpp:265
+#: src/net/eathena/skillhandler.cpp:352 src/net/tmwa/skillhandler.cpp:265
msgid "Huh? What's that?"
msgstr ""
@@ -7872,32 +8024,32 @@ msgid "%s wants to trade with you, do you accept?"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:349
+#: src/net/tmwa/charserverhandler.cpp:351
msgid "Strength:"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:351
+#: src/net/tmwa/charserverhandler.cpp:353
msgid "Agility:"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:353
+#: src/net/tmwa/charserverhandler.cpp:355
msgid "Vitality:"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:355
+#: src/net/tmwa/charserverhandler.cpp:357
msgid "Intelligence:"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:357
+#: src/net/tmwa/charserverhandler.cpp:359
msgid "Dexterity:"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:359
+#: src/net/tmwa/charserverhandler.cpp:361
msgid "Luck:"
msgstr ""
@@ -8208,269 +8360,306 @@ msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:143
+msgid "You cant left party on this map."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:147
+msgid "You was kicked from party."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:151
+msgid "You cant be kicked kicked from party on this map."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:155
#, c-format
msgid "%s has joined your party."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:147
+#: src/resources/notifications.h:159
#, c-format
msgid "%s is already a member of a party."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:151
+#: src/resources/notifications.h:163
#, c-format
msgid "%s refused your invitation."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:155
+#: src/resources/notifications.h:167
#, c-format
msgid "%s is now a member of your party."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:159
+#: src/resources/notifications.h:171
#, c-format
msgid "%s can't join your party because party is full."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:163
+#: src/resources/notifications.h:175
#, c-format
msgid "QQQ Unknown invite response for %s."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:191
+#: src/resources/notifications.h:203
#, c-format
msgid "%s has left your party."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:195
+#: src/resources/notifications.h:207 src/resources/notifications.h:215
+#, c-format
+msgid "%s cant be kicked from party on this map."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:211
+#, c-format
+msgid "%s has kicked from your party."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:219
#, c-format
msgid "An unknown member tried to say: %s"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:199
+#: src/resources/notifications.h:223
#, c-format
msgid "%s is not in your party!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:203
+#: src/resources/notifications.h:227
#, c-format
msgid "You picked up %s."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:207
+#: src/resources/notifications.h:231
#, c-format
msgid "You spent %s."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:211
+#: src/resources/notifications.h:235
msgid "Cannot raise skill!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:215
+#: src/resources/notifications.h:239
msgid "Equip ammunition first."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:219
+#: src/resources/notifications.h:243
#, c-format
msgid "Trading with %s isn't possible. Trade partner is too far away."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:224
+#: src/resources/notifications.h:248
#, c-format
msgid "Trading with %s isn't possible. Character doesn't exist."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:228
+#: src/resources/notifications.h:252
msgid "Trade cancelled due to an unknown reason."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:232
+#: src/resources/notifications.h:256
#, c-format
msgid "Trade with %s cancelled."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:236
+#: src/resources/notifications.h:260
#, c-format
msgid "Unhandled trade cancel packet with %s"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:240
+#: src/resources/notifications.h:264
msgid "Failed adding item. Trade partner is over weighted."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:244
+#: src/resources/notifications.h:268
msgid "Failed adding item. Trade partner has no free slot."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:248
+#: src/resources/notifications.h:272
msgid "Failed adding item. You can't trade this item."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:252
+#: src/resources/notifications.h:276
msgid "Failed adding item for unknown reason."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:256
+#: src/resources/notifications.h:280
msgid "Trade canceled."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:260
+#: src/resources/notifications.h:284
msgid "Trade completed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:264
+#: src/resources/notifications.h:288
msgid "Kick failed!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:268
+#: src/resources/notifications.h:292
msgid "Kick succeeded!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:272
+#: src/resources/notifications.h:296
#, c-format
msgid "MVP player: %s"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:276
+#: src/resources/notifications.h:300
msgid "All whispers ignored."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:280
+#: src/resources/notifications.h:304
msgid "All whispers ignore failed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:284
+#: src/resources/notifications.h:308
msgid "All whispers unignored."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:288
+#: src/resources/notifications.h:312
msgid "All whispers unignore failed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:295
+#: src/resources/notifications.h:319
msgid "pvp off, gvg off"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:299
+#: src/resources/notifications.h:323
msgid "pvp on"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:303
+#: src/resources/notifications.h:327
msgid "gvg on"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:307
+#: src/resources/notifications.h:331
msgid "pvp on, gvg on"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:311
+#: src/resources/notifications.h:335
msgid "unknown pvp"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:315
+#: src/resources/notifications.h:339
#, c-format
msgid "Char from account %s is already in your party!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:319
+#: src/resources/notifications.h:343
#, c-format
msgid "%s blocked invite!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:323
+#: src/resources/notifications.h:347
msgid "Char is not online!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:327
+#: src/resources/notifications.h:351
msgid "Pet catch failed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:331
+#: src/resources/notifications.h:355
msgid "Pet catched."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:335
+#: src/resources/notifications.h:359
#, c-format
msgid "Pet catch unkown error: %d."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:339
+#: src/resources/notifications.h:363
msgid "Your mercenary duty hour is over."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:343
+#: src/resources/notifications.h:367
msgid "Your mercenary was killed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:347
+#: src/resources/notifications.h:371
msgid "Your mercenary was fired."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:351
+#: src/resources/notifications.h:375
msgid "Your mercenary run away."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:355
+#: src/resources/notifications.h:379
msgid "Mercenary unknown state."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:359
-msgid "Your feed your homunculus."
+#: src/resources/notifications.h:383
+msgid "You feed your homunculus."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:363
+#: src/resources/notifications.h:387
#, c-format
msgid "You cant feed homunculus, because not have %s."
msgstr ""
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:391
+msgid "Card insert failed."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:395
+msgid "Card inserted."
+msgstr ""
+
#. TRANSLATORS: chat option changed message
#: src/utils/booleanoptions.h:27
#, c-format
diff --git a/po/sq.po b/po/sq.po
index 67f390fb6..bacaaa30d 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-27 13:23+0300\n"
-"PO-Revision-Date: 2014-09-28 10:01+0000\n"
+"POT-Creation-Date: 2014-10-08 01:19+0300\n"
+"PO-Revision-Date: 2014-10-08 10:01+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/manaplus/language/sq/)\n"
"MIME-Version: 1.0\n"
@@ -32,7 +32,7 @@ msgstr ""
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:131 src/client.cpp:1463 src/client.cpp:1490
+#: src/actions/actions.cpp:131 src/client.cpp:1461 src/client.cpp:1488
#: src/gamemodifiers.cpp:423 src/gui/widgets/tabs/setup_input.cpp:163
#: src/gui/widgets/tabs/setup_theme.cpp:312
#: src/gui/widgets/tabs/setup_theme.cpp:343
@@ -43,8 +43,8 @@ msgstr ""
#: src/gui/windows/changeemaildialog.cpp:170
#: src/gui/windows/changepassworddialog.cpp:160
#: src/gui/windows/charcreatedialog.cpp:373
-#: src/gui/windows/charselectdialog.cpp:255
-#: src/gui/windows/charselectdialog.cpp:291 src/gui/windows/editdialog.cpp:49
+#: src/gui/windows/charselectdialog.cpp:277
+#: src/gui/windows/charselectdialog.cpp:313 src/gui/windows/editdialog.cpp:49
#: src/gui/windows/editserverdialog.cpp:61
#: src/gui/windows/editserverdialog.cpp:208
#: src/gui/windows/itemamountwindow.cpp:158 src/gui/windows/quitdialog.cpp:70
@@ -52,7 +52,9 @@ msgstr ""
#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
#: src/net/ea/charserverhandler.cpp:143 src/net/ea/charserverhandler.cpp:162
#: src/net/ea/charserverhandler.cpp:175 src/net/ea/gamehandler.cpp:79
-#: src/net/ea/playerhandler.cpp:263 src/net/ea/playerhandler.cpp:279
+#: src/net/ea/playerhandler.cpp:424 src/net/ea/playerhandler.cpp:440
+#: src/net/eathena/charserverhandler.cpp:533
+#: src/net/eathena/charserverhandler.cpp:563
msgid "OK"
msgstr ""
@@ -176,7 +178,7 @@ msgstr ""
#. TRANSLATORS: party invite message
#. TRANSLATORS: change relation
-#: src/actions/chat.cpp:303 src/actions/commands.cpp:65
+#: src/actions/chat.cpp:303 src/actions/commands.cpp:64
msgid "Please specify a name."
msgstr ""
@@ -199,75 +201,75 @@ msgid "Message now closes chat."
msgstr ""
#. TRANSLATORS: change relation
-#: src/actions/commands.cpp:108
+#: src/actions/commands.cpp:107
#, c-format
msgid "Player already %s!"
msgstr ""
#. TRANSLATORS: change relation
-#: src/actions/commands.cpp:120
+#: src/actions/commands.cpp:119
#, c-format
msgid "Player successfully %s!"
msgstr ""
#. TRANSLATORS: change relation
-#: src/actions/commands.cpp:122
+#: src/actions/commands.cpp:121
#, c-format
msgid "Player could not be %s!"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:153
+#: src/actions/commands.cpp:152
msgid "Player wasn't ignored!"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:162
+#: src/actions/commands.cpp:161
msgid "Player no longer ignored!"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:164
+#: src/actions/commands.cpp:163
msgid "Player could not be unignored!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/actions/commands.cpp:179
+#: src/actions/commands.cpp:178
msgid "Player already erased!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/actions/commands.cpp:192
+#: src/actions/commands.cpp:191
msgid "Player no longer erased!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/actions/commands.cpp:194
+#: src/actions/commands.cpp:193
msgid "Player could not be erased!"
msgstr ""
#. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:201
+#: src/actions/commands.cpp:200
msgid "friend"
msgstr ""
#. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:208
+#: src/actions/commands.cpp:207
msgid "disregarded"
msgstr ""
#. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:215
+#: src/actions/commands.cpp:214
msgid "neutral"
msgstr ""
#. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:222
+#: src/actions/commands.cpp:221
msgid "blacklisted"
msgstr ""
#. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:229
+#: src/actions/commands.cpp:228
msgid "enemy"
msgstr ""
@@ -282,77 +284,77 @@ msgid "Accepting incoming trade requests"
msgstr ""
#. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1306
+#: src/actormanager.cpp:1310
msgid "Visible on map"
msgstr ""
#. TRANSLATORS: default race name
-#: src/being/being.cpp:389
+#: src/being/being.cpp:393
msgid "Human"
msgstr ""
-#: src/being/being.cpp:556
+#: src/being/being.cpp:560
msgid "dodge"
msgstr ""
-#: src/being/being.cpp:556
+#: src/being/being.cpp:560
msgid "miss"
msgstr ""
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1865 src/gui/windows/whoisonline.cpp:855
+#: src/being/being.cpp:1869 src/gui/windows/whoisonline.cpp:855
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1870 src/gui/windows/whoisonline.cpp:860
+#: src/being/being.cpp:1874 src/gui/windows/whoisonline.cpp:860
msgid "I"
msgstr ""
#. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:379
+#: src/being/localplayer.cpp:380
#, c-format
msgid "You were killed by %s"
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:824
+#: src/being/localplayer.cpp:825
msgid "Tried to pick up nonexistent item."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:828
+#: src/being/localplayer.cpp:829
msgid "Item is too heavy."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:832
+#: src/being/localplayer.cpp:833
msgid "Item is too far away."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:836
+#: src/being/localplayer.cpp:837
msgid "Inventory is full."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:840
+#: src/being/localplayer.cpp:841
msgid "Stack is too big."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:844
+#: src/being/localplayer.cpp:845
msgid "Item belongs to someone else."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:848
+#: src/being/localplayer.cpp:849
msgid "Unknown problem picking up item."
msgstr ""
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:872
+#: src/being/localplayer.cpp:873
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -361,43 +363,43 @@ msgstr[1] ""
#. TRANSLATORS: this is normal experience
#. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1054 src/being/localplayer.cpp:1055
-#: src/being/localplayer.cpp:1091
+#: src/being/localplayer.cpp:1055 src/being/localplayer.cpp:1056
+#: src/being/localplayer.cpp:1092
msgid "xp"
msgstr ""
#. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1059 src/being/localplayer.cpp:1065
-#: src/being/localplayer.cpp:1071
+#: src/being/localplayer.cpp:1060 src/being/localplayer.cpp:1066
+#: src/being/localplayer.cpp:1072
msgid "job"
msgstr ""
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2794
+#: src/being/localplayer.cpp:2795
#, c-format
msgid "Follow: %s"
msgstr ""
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2800 src/being/localplayer.cpp:2825
+#: src/being/localplayer.cpp:2801 src/being/localplayer.cpp:2826
msgid "Follow canceled"
msgstr ""
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2810
+#: src/being/localplayer.cpp:2811
#, c-format
msgid "Imitation: %s"
msgstr ""
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2816 src/being/localplayer.cpp:2830
+#: src/being/localplayer.cpp:2817 src/being/localplayer.cpp:2831
msgid "Imitation canceled"
msgstr ""
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3180
+#: src/being/localplayer.cpp:3181
#, c-format
msgid "You see %s"
msgstr ""
@@ -435,37 +437,37 @@ msgstr ""
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:920 src/gui/windowmenu.cpp:162
+#: src/client.cpp:918 src/gui/windowmenu.cpp:162
#: src/gui/windows/setupwindow.cpp:62
msgid "Setup"
msgstr ""
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:923 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:921 src/gui/widgets/tabs/setup_perfomance.cpp:54
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:926 src/gui/widgets/tabs/setup_video.cpp:105
+#: src/client.cpp:924 src/gui/widgets/tabs/setup_video.cpp:105
msgid "Video"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:929 src/gui/widgets/tabs/setup_theme.cpp:122
+#: src/client.cpp:927 src/gui/widgets/tabs/setup_theme.cpp:122
msgid "Theme"
msgstr ""
#. TRANSLATORS: theme tab quick button
-#: src/client.cpp:932
+#: src/client.cpp:930
msgid "About"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:935 src/gui/windowmenu.cpp:74
+#: src/client.cpp:933 src/gui/windowmenu.cpp:74
#: src/gui/windows/helpwindow.cpp:53
msgid "Help"
msgstr ""
@@ -481,42 +483,42 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:939 src/client.cpp:1391 src/client.cpp:1405
+#: src/client.cpp:937 src/client.cpp:1389 src/client.cpp:1403
#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:691
#: src/gui/popups/popupmenu.cpp:923 src/gui/windows/didyouknowwindow.cpp:81
#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:74
#: src/gui/windows/npcdialog.cpp:112 src/gui/windows/questswindow.cpp:77
-#: src/gui/windows/shopwindow.cpp:84
+#: src/gui/windows/shopwindow.cpp:83
msgid "Close"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1065
+#: src/client.cpp:1063
msgid "Connecting to server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1113
+#: src/client.cpp:1111
msgid "Logging in"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1156
+#: src/client.cpp:1154
msgid "Entering game world"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1282
+#: src/client.cpp:1280
msgid "Requesting characters"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1322
+#: src/client.cpp:1320
msgid "Connecting to the game server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1334
+#: src/client.cpp:1332
msgid "Changing game servers"
msgstr ""
@@ -530,72 +532,76 @@ msgstr ""
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1389 src/client.cpp:1403 src/client.cpp:1598
+#. TRANSLATORS: info message
+#. TRANSLATORS: ok dialog button
+#: src/client.cpp:1387 src/client.cpp:1401 src/client.cpp:1596
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
#: src/gui/windows/charcreatedialog.cpp:369
-#: src/gui/windows/charselectdialog.cpp:289
+#: src/gui/windows/charselectdialog.cpp:311
#: src/gui/windows/editserverdialog.cpp:203
#: src/gui/windows/registerdialog.cpp:245
#: src/gui/windows/unregisterdialog.cpp:146
#: src/net/ea/charserverhandler.cpp:141 src/net/ea/charserverhandler.cpp:173
+#: src/net/eathena/charserverhandler.cpp:516
+#: src/net/eathena/charserverhandler.cpp:518
msgid "Error"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1418
+#: src/client.cpp:1416
msgid "Requesting registration details"
msgstr ""
#. TRANSLATORS: password change message header
-#: src/client.cpp:1459
+#: src/client.cpp:1457
msgid "Password Change"
msgstr ""
#. TRANSLATORS: password change message text
-#: src/client.cpp:1461
+#: src/client.cpp:1459
msgid "Password changed successfully!"
msgstr ""
#. TRANSLATORS: email change message header
-#: src/client.cpp:1486
+#: src/client.cpp:1484
msgid "Email Change"
msgstr ""
#. TRANSLATORS: email change message text
-#: src/client.cpp:1488
+#: src/client.cpp:1486
msgid "Email changed successfully!"
msgstr ""
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1515
+#: src/client.cpp:1513
msgid "Unregister Successful"
msgstr ""
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1517
+#: src/client.cpp:1515
msgid "Farewell, come back any time..."
msgstr ""
#. TRANSLATORS: directory creation error
#: src/configmanager.cpp:53 src/dirs.cpp:260 src/dirs.cpp:275 src/dirs.cpp:320
-#: src/dirs.cpp:481 src/dirs.cpp:489
+#: src/dirs.cpp:488 src/dirs.cpp:496
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:363
+#: src/dirs.cpp:370
#, c-format
msgid "Invalid update host: %s."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:404 src/dirs.cpp:411
+#: src/dirs.cpp:411 src/dirs.cpp:418
msgid "Error creating updates directory!"
msgstr ""
-#: src/dirs.cpp:433 src/dirs.cpp:451
+#: src/dirs.cpp:440 src/dirs.cpp:458
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
@@ -613,36 +619,36 @@ msgid "dyecmd srcdyestring dstfile"
msgstr ""
#. TRANSLATORS: chat tab header
-#: src/game.cpp:236 src/gui/widgets/tabs/chattab.cpp:482
+#: src/game.cpp:234 src/gui/widgets/tabs/chattab.cpp:482
msgid "General"
msgstr ""
#. TRANSLATORS: chat tab header
#. TRANSLATORS: full button name
#. TRANSLATORS: debug window name
-#: src/game.cpp:253 src/gui/widgets/tabs/chattab.cpp:484
+#: src/game.cpp:251 src/gui/widgets/tabs/chattab.cpp:484
#: src/gui/windowmenu.cpp:149 src/gui/windows/debugwindow.cpp:42
msgid "Debug"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:541
+#: src/game.cpp:532
#, c-format
msgid "Screenshot saved as %s"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:551
+#: src/game.cpp:542
msgid "Saving screenshot failed!"
msgstr ""
#. TRANSLATORS: error message text
-#: src/game.cpp:634
+#: src/game.cpp:625
msgid "The connection to the server was lost."
msgstr ""
#. TRANSLATORS: error message header
-#: src/game.cpp:637
+#: src/game.cpp:628
msgid "Network Error"
msgstr ""
@@ -1033,6 +1039,7 @@ msgstr ""
#: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
#: src/gui/widgets/tabs/setup_other.cpp:79
#: src/gui/widgets/tabs/setup_visual.cpp:81
+#: src/gui/windows/equipmentwindow.cpp:577
msgid "default"
msgstr ""
@@ -1523,7 +1530,7 @@ msgstr ""
#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:273
#: src/gui/popups/popupmenu.cpp:767 src/gui/widgets/skillinfo.cpp:113
#: src/gui/windows/botcheckerwindow.cpp:89 src/input/pages/basic.cpp:42
-#: src/net/eathena/generalhandler.cpp:289 src/net/tmwa/generalhandler.cpp:321
+#: src/net/eathena/generalhandler.cpp:356 src/net/tmwa/generalhandler.cpp:320
msgid "Attack"
msgstr ""
@@ -1692,7 +1699,7 @@ msgstr ""
#. TRANSLATORS: pet unequip item
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:340 src/gui/windows/equipmentwindow.cpp:70
+#: src/gui/popups/popupmenu.cpp:340 src/gui/windows/equipmentwindow.cpp:72
#: src/gui/windows/inventorywindow.cpp:175 src/resources/itemtypemapdata.h:47
#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
@@ -1750,7 +1757,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:574
+#: src/gui/popups/popupmenu.cpp:574 src/gui/windows/charselectdialog.cpp:132
msgid "Rename"
msgstr ""
@@ -2262,7 +2269,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
#. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:3000 src/net/ea/playerhandler.cpp:364
+#: src/gui/popups/popupmenu.cpp:3000 src/net/ea/playerhandler.cpp:195
msgid "Revive"
msgstr ""
@@ -2286,7 +2293,7 @@ msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: settings group
#. TRANSLATORS: full button name
-#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:319
+#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:315
#: src/gui/windowmenu.cpp:158
msgid "Windows"
msgstr ""
@@ -2314,7 +2321,7 @@ msgstr ""
#. TRANSLATORS: input action name
#: src/gui/setupinputpages.cpp:57 src/gui/widgets/tabs/setup_audio.cpp:151
#: src/gui/widgets/tabs/setup_chat.cpp:179
-#: src/gui/widgets/tabs/setup_other.cpp:341
+#: src/gui/widgets/tabs/setup_other.cpp:337
#: src/gui/widgets/tabs/setup_visual.cpp:192
#: src/gui/windows/charcreatedialog.cpp:119
#: src/gui/windows/registerdialog.cpp:106 src/input/pages/gui.cpp:87
@@ -2327,212 +2334,227 @@ msgid "Gui"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:113
+#: src/gui/userpalette.cpp:116
msgid "Being"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:115
+#: src/gui/userpalette.cpp:118
msgid "Friend names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:117
+#: src/gui/userpalette.cpp:120
msgid "Disregarded names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:119
+#: src/gui/userpalette.cpp:122
msgid "Ignored names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:121
+#: src/gui/userpalette.cpp:124
msgid "Erased names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:123
+#: src/gui/userpalette.cpp:126
msgid "Other players names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:125
+#: src/gui/userpalette.cpp:128
msgid "Own name"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:127
+#: src/gui/userpalette.cpp:130
msgid "GM names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:129
+#: src/gui/userpalette.cpp:132
msgid "NPCs"
msgstr ""
#. TRANSLATORS: palette color
#. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:131 src/gui/widgets/tabs/setup_other.cpp:108
+#: src/gui/userpalette.cpp:134 src/gui/widgets/tabs/setup_other.cpp:108
msgid "Monsters"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:133
+#: src/gui/userpalette.cpp:136
msgid "Monster HP bar"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:139
msgid "Monster HP bar (second color)"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:138
+#: src/gui/userpalette.cpp:141
msgid "Party members"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:140
+#: src/gui/userpalette.cpp:143
msgid "Guild members"
msgstr ""
#. TRANSLATORS: palette color
#. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:142 src/gui/widgets/tabs/setup_visual.cpp:157
+#: src/gui/userpalette.cpp:145 src/gui/widgets/tabs/setup_visual.cpp:157
msgid "Particle effects"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:144
+#: src/gui/userpalette.cpp:147
msgid "Pickup notification"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:146
+#: src/gui/userpalette.cpp:149
msgid "Exp notification"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:148
+#: src/gui/userpalette.cpp:151
msgid "Player HP bar"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:152
+#: src/gui/userpalette.cpp:155
msgid "Player HP bar (second color)"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:154
+#: src/gui/userpalette.cpp:157
msgid "Player hits monster"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:156
+#: src/gui/userpalette.cpp:159
msgid "Monster hits player"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:160
+#: src/gui/userpalette.cpp:163
msgid "Other player hits local player"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:162
+#: src/gui/userpalette.cpp:165
msgid "Critical Hit"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:166
+#: src/gui/userpalette.cpp:169
msgid "Local player hits monster"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:169
+#: src/gui/userpalette.cpp:172
msgid "Local player critical hit"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:172
+#: src/gui/userpalette.cpp:175
msgid "Local player miss"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:174
+#: src/gui/userpalette.cpp:177
msgid "Misses"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:176
+#: src/gui/userpalette.cpp:179
msgid "Portal highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:179
+#: src/gui/userpalette.cpp:182
msgid "Default collision highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:182
+#: src/gui/userpalette.cpp:185
msgid "Air collision highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:185
+#: src/gui/userpalette.cpp:188
msgid "Water collision highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:188
+#: src/gui/userpalette.cpp:191
msgid "Special ground collision highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:191
+#: src/gui/userpalette.cpp:194
msgid "Walkable highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:194
+#: src/gui/userpalette.cpp:197
msgid "Local player attack range"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:197
+#: src/gui/userpalette.cpp:200
msgid "Local player attack range border"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:200
+#: src/gui/userpalette.cpp:203
msgid "Monster attack range"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:204
+#: src/gui/userpalette.cpp:207
msgid "Floor item amount color"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:207
+#: src/gui/userpalette.cpp:210
msgid "Home place"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:210
+#: src/gui/userpalette.cpp:213
msgid "Home place border"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:213
+#: src/gui/userpalette.cpp:216
msgid "Road point"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:216
+#: src/gui/userpalette.cpp:219
msgid "Tiles border"
msgstr ""
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:221
+msgid "Pets"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:223
+msgid "Mercenary"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:225
+msgid "Homunculus"
+msgstr ""
+
#: src/gui/widgets/characterdisplay.cpp:135
#, c-format
msgid "Level: %u"
@@ -2635,7 +2657,8 @@ msgid "Type: %s"
msgstr ""
#. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:108
+#. TRANSLATORS: unknown equipment page name
+#: src/gui/widgets/skillinfo.cpp:108 src/gui/windows/equipmentwindow.cpp:584
msgid "Unknown"
msgstr ""
@@ -2836,22 +2859,22 @@ msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:262
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:313
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:375
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:319
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:387
msgid "Target:"
msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:264
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:319
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:377
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:325
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:389
msgid "Target Id:"
msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:267
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:322
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:379
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:328
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:391
msgid "Target type:"
msgstr ""
@@ -2862,7 +2885,7 @@ msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:271
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:338
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:344
msgid "Target race:"
msgstr ""
@@ -2878,67 +2901,81 @@ msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:277
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:363
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:369
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:387
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:375
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:381
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:399
msgid "Attack delay:"
msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:279
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:350
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:389
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:356
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:401
msgid "Minimal hit:"
msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:281
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:353
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:391
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:359
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:403
msgid "Maximum hit:"
msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:283
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:356
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:393
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:362
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:405
msgid "Critical hit:"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:327
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:285
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:365
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:407
+msgid "Karma:"
+msgstr ""
+
+#. TRANSLATORS: debug window label
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:287
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:368
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:409
+msgid "Manner:"
+msgstr ""
+
+#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:333
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:381
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:339
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:393
msgid "Target Level:"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:341
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:383
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:347
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:395
msgid "Target Party:"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:345
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:385
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:351
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:397
msgid "Target Guild:"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:430
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:436
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:451
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:457
#, c-format
msgid "Ping: %s ms"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:439
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:460
#, c-format
msgid "In: %d bytes/s"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:442
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:463
#, c-format
msgid "Out: %d bytes/s"
msgstr ""
@@ -3767,137 +3804,132 @@ msgstr ""
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_other.cpp:294
-msgid "Enable auction bot support"
-msgstr ""
-
-#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:298
msgid "Enable guild bot support and disable native guild support"
msgstr ""
#. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:304
+#: src/gui/widgets/tabs/setup_other.cpp:300
msgid "Keyboard"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:307
+#: src/gui/widgets/tabs/setup_other.cpp:303
msgid "Repeat delay"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:311
+#: src/gui/widgets/tabs/setup_other.cpp:307
msgid "Repeat interval"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:315
+#: src/gui/widgets/tabs/setup_other.cpp:311
msgid "Custom repeat interval"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:323
+#: src/gui/widgets/tabs/setup_other.cpp:319
msgid "Shortcut buttons"
msgstr ""
#. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:328
+#: src/gui/widgets/tabs/setup_other.cpp:324
msgid "Proxy server"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:332
+#: src/gui/widgets/tabs/setup_other.cpp:328
msgid "Proxy type"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:336
+#: src/gui/widgets/tabs/setup_other.cpp:332
msgid "Proxy address:port"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:344
+#: src/gui/widgets/tabs/setup_other.cpp:340
msgid "Enable server side attack"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:348
+#: src/gui/widgets/tabs/setup_other.cpp:344
msgid "Hide support page link on error"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:352
+#: src/gui/widgets/tabs/setup_other.cpp:348
msgid "Enable double clicks"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:356
+#: src/gui/widgets/tabs/setup_other.cpp:352
msgid "Enable bot checker"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:360
+#: src/gui/widgets/tabs/setup_other.cpp:356
msgid "Enable buggy servers protection (do not disable)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:365
+#: src/gui/widgets/tabs/setup_other.cpp:361
msgid "Enable debug log"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:369
+#: src/gui/widgets/tabs/setup_other.cpp:365
msgid "Ignore logging packets"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:373
+#: src/gui/widgets/tabs/setup_other.cpp:369
msgid "Enable OpenGL log"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:377
+#: src/gui/widgets/tabs/setup_other.cpp:373
msgid "Enable input log"
msgstr ""
#. TRANSLATORS: settings option
#. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_other.cpp:381 src/input/pages/other.cpp:362
+#: src/gui/widgets/tabs/setup_other.cpp:377 src/input/pages/other.cpp:362
msgid "Upload log file"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:385
+#: src/gui/widgets/tabs/setup_other.cpp:381
msgid "Low traffic mode"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:389
+#: src/gui/widgets/tabs/setup_other.cpp:385
msgid "Hide shield sprite"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:394
+#: src/gui/widgets/tabs/setup_other.cpp:390
msgid "Use FBO for screenshots (only for opengl)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:400
+#: src/gui/widgets/tabs/setup_other.cpp:396
msgid "Screenshot directory"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:405
+#: src/gui/widgets/tabs/setup_other.cpp:401
msgid "Network delay between sub servers"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:409
+#: src/gui/widgets/tabs/setup_other.cpp:405
msgid "Show background"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:414
+#: src/gui/widgets/tabs/setup_other.cpp:410
msgid "Screen density override"
msgstr ""
@@ -4128,9 +4160,9 @@ msgstr ""
#. TRANSLATORS: command editor button
#. TRANSLATORS: input action name
#: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:82
-#: src/gui/windows/serverdialog.cpp:125 src/gui/windows/shopwindow.cpp:101
-#: src/gui/windows/shopwindow.cpp:108 src/gui/windows/textcommandeditor.cpp:92
+#: src/gui/windows/charselectdialog.cpp:84
+#: src/gui/windows/serverdialog.cpp:125 src/gui/windows/shopwindow.cpp:100
+#: src/gui/windows/shopwindow.cpp:107 src/gui/windows/textcommandeditor.cpp:92
#: src/input/pages/gui.cpp:111
msgid "Delete"
msgstr ""
@@ -4784,7 +4816,7 @@ msgstr ""
#. TRANSLATORS: equipment window name
#. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:63
+#: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:65
#: src/gui/windows/inventorywindow.cpp:196
msgid "Equipment"
msgstr ""
@@ -4925,7 +4957,7 @@ msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: social window button
#: src/gui/windows/buydialog.cpp:260 src/gui/windows/charcreatedialog.cpp:127
-#: src/gui/windows/charselectdialog.cpp:578
+#: src/gui/windows/charselectdialog.cpp:605
#: src/gui/windows/socialwindow.cpp:86
msgid "Create"
msgstr ""
@@ -4969,10 +5001,8 @@ msgstr ""
#. TRANSLATORS: change password window name
#. TRANSLATORS: change password dialog button
-#. TRANSLATORS: char select dialog. button.
#: src/gui/windows/changepassworddialog.cpp:51
#: src/gui/windows/changepassworddialog.cpp:57
-#: src/gui/windows/charselectdialog.cpp:73
msgid "Change Password"
msgstr ""
@@ -5126,57 +5156,68 @@ msgid "Are you sure you want to delete this character?"
msgstr ""
#. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:64
+#: src/gui/windows/charselectdialog.cpp:66
#, c-format
msgid "Account %s (last login time %s)"
msgstr ""
#. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:71
-msgid "Switch Login"
+#: src/gui/windows/charselectdialog.cpp:73
+msgid "Switch"
+msgstr ""
+
+#. TRANSLATORS: char select dialog. button.
+#: src/gui/windows/charselectdialog.cpp:75
+msgid "Password"
msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:78
-#: src/gui/windows/charselectdialog.cpp:573
+#: src/gui/windows/charselectdialog.cpp:80
+#: src/gui/windows/charselectdialog.cpp:595
#: src/gui/windows/updaterwindow.cpp:195
msgid "Play"
msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:80
+#: src/gui/windows/charselectdialog.cpp:82
#: src/net/ea/charserverhandler.cpp:160
+#: src/net/eathena/charserverhandler.cpp:531
+#: src/net/eathena/charserverhandler.cpp:561
msgid "Info"
msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: unregister dialog name
#. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:106
+#: src/gui/windows/charselectdialog.cpp:110
#: src/gui/windows/unregisterdialog.cpp:50
#: src/gui/windows/unregisterdialog.cpp:55
msgid "Unregister"
msgstr ""
#. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:118
+#: src/gui/windows/charselectdialog.cpp:122
msgid "Change Email"
msgstr ""
#. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:156
+#: src/gui/windows/charselectdialog.cpp:166
#, c-format
msgid "Account %s"
msgstr ""
-#: src/gui/windows/charselectdialog.cpp:184
+#: src/gui/windows/charselectdialog.cpp:194
msgid "Please set new pincode"
msgstr ""
+#: src/gui/windows/charselectdialog.cpp:240
+msgid "Please enter new name"
+msgstr ""
+
#. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:237
+#: src/gui/windows/charselectdialog.cpp:259
#, c-format
msgid ""
"Hp: %u/%u\n"
@@ -5186,16 +5227,16 @@ msgid ""
"Money: %s"
msgstr ""
-#: src/gui/windows/charselectdialog.cpp:289
+#: src/gui/windows/charselectdialog.cpp:311
msgid "Incorrect password"
msgstr ""
#. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:429
+#: src/gui/windows/charselectdialog.cpp:451
msgid "Enter password for deleting character"
msgstr ""
-#: src/gui/windows/charselectdialog.cpp:429
+#: src/gui/windows/charselectdialog.cpp:451
msgid "Enter password:"
msgstr ""
@@ -5603,7 +5644,7 @@ msgstr ""
#. TRANSLATORS: status bar label
#: src/gui/windows/ministatuswindow.cpp:364
-#: src/gui/windows/ministatuswindow.cpp:402
+#: src/gui/windows/ministatuswindow.cpp:401
msgid "Need"
msgstr ""
@@ -5634,7 +5675,7 @@ msgstr ""
#. TRANSLATORS: shop window button
#. TRANSLATORS: trade window button
#: src/gui/windows/npcdialog.cpp:114 src/gui/windows/serverdialog.cpp:121
-#: src/gui/windows/shopwindow.cpp:99 src/gui/windows/shopwindow.cpp:106
+#: src/gui/windows/shopwindow.cpp:98 src/gui/windows/shopwindow.cpp:105
#: src/gui/windows/tradewindow.cpp:83
msgid "Add"
msgstr ""
@@ -5797,43 +5838,38 @@ msgid "Reset Windows"
msgstr ""
#. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:80
+#: src/gui/windows/shopwindow.cpp:79
msgid "Personal Shop"
msgstr ""
#. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:95
+#: src/gui/windows/shopwindow.cpp:94
msgid "Buy items"
msgstr ""
#. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:97
+#: src/gui/windows/shopwindow.cpp:96
msgid "Sell items"
msgstr ""
#. TRANSLATORS: shop window label
#. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:110
+#: src/gui/windows/shopwindow.cpp:102 src/gui/windows/shopwindow.cpp:109
msgid "Announce"
msgstr ""
#. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:114
+#: src/gui/windows/shopwindow.cpp:113
msgid "Show links in announce"
msgstr ""
-#. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:176 src/gui/windows/shopwindow.cpp:179
-msgid "Auction"
-msgstr ""
-
#. TRANSLATORS: shop window dialog
#. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:233
+#: src/gui/windows/shopwindow.cpp:776 src/net/ea/tradehandler.cpp:233
msgid "Request for Trade"
msgstr ""
-#: src/gui/windows/shopwindow.cpp:791
+#: src/gui/windows/shopwindow.cpp:776
#, c-format
msgid "%s wants to %s %s do you accept?"
msgstr ""
@@ -6161,27 +6197,27 @@ msgstr ""
msgid "Connecting..."
msgstr ""
-#: src/gui/windows/updaterwindow.cpp:398
+#: src/gui/windows/updaterwindow.cpp:407
msgid "Show all news (can be slow)"
msgstr ""
#. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:824
+#: src/gui/windows/updaterwindow.cpp:833
msgid "##1 The update process is incomplete."
msgstr ""
#. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:826
+#: src/gui/windows/updaterwindow.cpp:835
msgid "##1 It is strongly recommended that"
msgstr ""
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:828
+#: src/gui/windows/updaterwindow.cpp:837
msgid "##1 you try again later."
msgstr ""
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1005
+#: src/gui/windows/updaterwindow.cpp:1021
msgid "Completed"
msgstr ""
@@ -6228,25 +6264,25 @@ msgstr ""
#. TRANSLATORS: long key name. must be short.
#. TRANSLATORS: short key name. must be very short.
#. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:370 src/input/inputmanager.cpp:414
+#: src/input/inputmanager.cpp:371 src/input/inputmanager.cpp:415
#: src/input/keyboardconfig.cpp:104
#, c-format
msgid "key_%d"
msgstr ""
#. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:376
+#: src/input/inputmanager.cpp:377
#, c-format
msgid "JButton%d"
msgstr ""
#. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:391
msgid "unknown key"
msgstr ""
#. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:420
+#: src/input/inputmanager.cpp:421
#, c-format
msgid "JB%d"
msgstr ""
@@ -6254,7 +6290,7 @@ msgstr ""
#. TRANSLATORS: unknown short key type. must be short
#. TRANSLATORS: Unknown key short string.
#. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:434 src/input/keyboardconfig.cpp:148
+#: src/input/inputmanager.cpp:435 src/input/keyboardconfig.cpp:148
msgid "u key"
msgstr ""
@@ -7425,74 +7461,74 @@ msgid "Request to quit denied!"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:135
#, c-format
msgid "Guild name: %s"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:191
+#: src/net/ea/guildhandler.cpp:138
#, c-format
msgid "Guild master: %s"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:141
#, c-format
msgid "Guild level: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:197
+#: src/net/ea/guildhandler.cpp:144
#, c-format
msgid "Online members: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:200
+#: src/net/ea/guildhandler.cpp:147
#, c-format
msgid "Max members: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:203
+#: src/net/ea/guildhandler.cpp:150
#, c-format
msgid "Average level: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:206
+#: src/net/ea/guildhandler.cpp:153
#, c-format
msgid "Guild exp: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:209
+#: src/net/ea/guildhandler.cpp:156
#, c-format
msgid "Guild next exp: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:212
+#: src/net/ea/guildhandler.cpp:159
#, c-format
msgid "Guild castle: %s"
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:179
+#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:191
msgid "Item sharing enabled."
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:183
+#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:195
msgid "Item sharing disabled."
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:187
+#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:199
msgid "Item sharing not possible."
msgstr ""
@@ -7503,19 +7539,19 @@ msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:167
+#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:179
msgid "Experience sharing enabled."
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:171
+#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:183
msgid "Experience sharing disabled."
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:175
+#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:187
msgid "Experience sharing not possible."
msgstr ""
@@ -7620,239 +7656,355 @@ msgid "Connection to server terminated. "
msgstr ""
#. TRANSLATORS: message header
-#: src/net/ea/playerhandler.cpp:257 src/net/ea/playerhandler.cpp:273
-#: src/net/ea/playerhandler.cpp:361
+#: src/net/ea/playerhandler.cpp:192 src/net/ea/playerhandler.cpp:418
+#: src/net/ea/playerhandler.cpp:434
msgid "Message"
msgstr ""
#. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:259
+#: src/net/ea/playerhandler.cpp:420
msgid ""
"You are carrying more than half your weight. You are unable to regain "
"health."
msgstr ""
#. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:275
+#: src/net/ea/playerhandler.cpp:436
msgid "You are carrying less than half your weight. You can regain health."
msgstr ""
+#. TRANSLATORS: char rename error
+#: src/net/eathena/charserverhandler.cpp:516
+#: src/net/eathena/charserverhandler.cpp:553
+msgid "Character rename error."
+msgstr ""
+
+#: src/net/eathena/charserverhandler.cpp:531
+msgid "Character renamed."
+msgstr ""
+
+#. TRANSLATORS: char rename error
+#: src/net/eathena/charserverhandler.cpp:544
+msgid "Rename not allowed."
+msgstr ""
+
+#. TRANSLATORS: char rename error
+#: src/net/eathena/charserverhandler.cpp:548
+msgid "New name is not set."
+msgstr ""
+
+#. TRANSLATORS: char rename error
+#: src/net/eathena/charserverhandler.cpp:557
+msgid "Character not found."
+msgstr ""
+
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:125
+#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:124
#, c-format
msgid "Strength %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:127
+#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:126
#, c-format
msgid "Agility %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:129
+#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:128
#, c-format
msgid "Vitality %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:131
+#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:130
#, c-format
msgid "Intelligence %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:128 src/net/tmwa/generalhandler.cpp:133
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:132
#, c-format
msgid "Dexterity %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:135
+#: src/net/eathena/generalhandler.cpp:128 src/net/tmwa/generalhandler.cpp:134
#, c-format
msgid "Luck %s"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:152 src/net/tmwa/generalhandler.cpp:161
+#: src/net/eathena/generalhandler.cpp:159 src/net/tmwa/generalhandler.cpp:160
msgid "Authentication failed."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:155 src/net/tmwa/generalhandler.cpp:165
+#: src/net/eathena/generalhandler.cpp:162 src/net/tmwa/generalhandler.cpp:164
msgid "No servers available."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:160 src/net/tmwa/generalhandler.cpp:171
+#: src/net/eathena/generalhandler.cpp:167 src/net/tmwa/generalhandler.cpp:170
msgid "Someone else is trying to use this account."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:165 src/net/tmwa/generalhandler.cpp:177
+#: src/net/eathena/generalhandler.cpp:172 src/net/tmwa/generalhandler.cpp:176
msgid "This account is already logged in."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:169 src/net/tmwa/generalhandler.cpp:182
+#: src/net/eathena/generalhandler.cpp:176 src/net/tmwa/generalhandler.cpp:181
msgid "Speed hack detected."
msgstr ""
+#: src/net/eathena/generalhandler.cpp:179
+msgid "Server full."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:182
+msgid "Sorry, you are underaged."
+msgstr ""
+
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:172 src/net/tmwa/generalhandler.cpp:186
+#: src/net/eathena/generalhandler.cpp:185 src/net/tmwa/generalhandler.cpp:185
msgid "Duplicated login."
msgstr ""
+#: src/net/eathena/generalhandler.cpp:188
+msgid "To many connections from same ip."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:191
+msgid "Not paid for this time."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:194
+msgid "Pay suspended."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:197
+msgid "Pay changed."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:200
+msgid "Pay wrong ip."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:203
+msgid "Pay game room."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:206
+msgid "Disconnect forced by GM."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:210
+msgid "Ban japan refuse."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:213
+msgid "Remained other account."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:216
+msgid "Ip unfair."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:219
+msgid "Ip count all."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:222
+msgid "Ip count."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:226
+msgid "Memory."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:229
+msgid "Han valid."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:232
+msgid "Ip limited access."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:235
+msgid "Over characters list."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:238
+msgid "Ip blocked."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:241
+msgid "Invalid password count."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:244
+msgid "Not allowed race."
+msgstr ""
+
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:175 src/net/tmwa/generalhandler.cpp:190
+#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:189
msgid "Unknown connection error."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:280
+#: src/net/eathena/generalhandler.cpp:323 src/net/tmwa/generalhandler.cpp:279
msgid "Got disconnected from server!"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:282 src/net/tmwa/generalhandler.cpp:308
+#: src/net/eathena/generalhandler.cpp:348 src/net/tmwa/generalhandler.cpp:307
msgid "Strength"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:310
+#: src/net/eathena/generalhandler.cpp:349 src/net/tmwa/generalhandler.cpp:309
msgid "Agility"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:284 src/net/tmwa/generalhandler.cpp:312
+#: src/net/eathena/generalhandler.cpp:350 src/net/tmwa/generalhandler.cpp:311
msgid "Vitality"
msgstr ""
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:285 src/net/tmwa/generalhandler.cpp:314
+#: src/net/eathena/generalhandler.cpp:352 src/net/tmwa/generalhandler.cpp:314
msgid "Intelligence"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:286 src/net/tmwa/generalhandler.cpp:316
+#: src/net/eathena/generalhandler.cpp:353 src/net/tmwa/generalhandler.cpp:316
msgid "Dexterity"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:287 src/net/tmwa/generalhandler.cpp:318
+#: src/net/eathena/generalhandler.cpp:354 src/net/tmwa/generalhandler.cpp:318
msgid "Luck"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:290 src/net/tmwa/generalhandler.cpp:323
+#: src/net/eathena/generalhandler.cpp:357 src/net/tmwa/generalhandler.cpp:322
msgid "Defense"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:291 src/net/tmwa/generalhandler.cpp:325
+#: src/net/eathena/generalhandler.cpp:358 src/net/tmwa/generalhandler.cpp:324
msgid "M.Attack"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:292 src/net/tmwa/generalhandler.cpp:327
+#: src/net/eathena/generalhandler.cpp:359 src/net/tmwa/generalhandler.cpp:326
msgid "M.Defense"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:294 src/net/tmwa/generalhandler.cpp:330
+#: src/net/eathena/generalhandler.cpp:361 src/net/tmwa/generalhandler.cpp:329
#, no-c-format
msgid "% Accuracy"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:296 src/net/tmwa/generalhandler.cpp:333
+#: src/net/eathena/generalhandler.cpp:363 src/net/tmwa/generalhandler.cpp:332
#, no-c-format
msgid "% Evade"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:298 src/net/tmwa/generalhandler.cpp:336
+#: src/net/eathena/generalhandler.cpp:365 src/net/tmwa/generalhandler.cpp:335
#, no-c-format
msgid "% Critical"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:299 src/net/tmwa/generalhandler.cpp:338
+#: src/net/eathena/generalhandler.cpp:366 src/net/tmwa/generalhandler.cpp:337
msgid "Attack Delay"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:300 src/net/tmwa/generalhandler.cpp:340
+#: src/net/eathena/generalhandler.cpp:367 src/net/tmwa/generalhandler.cpp:339
msgid "Walk Delay"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:301 src/net/tmwa/generalhandler.cpp:342
+#: src/net/eathena/generalhandler.cpp:368 src/net/tmwa/generalhandler.cpp:341
msgid "Attack Range"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:302 src/net/tmwa/generalhandler.cpp:344
+#: src/net/eathena/generalhandler.cpp:369 src/net/tmwa/generalhandler.cpp:343
msgid "Damage per sec."
msgstr ""
-#: src/net/eathena/skillhandler.cpp:228 src/net/eathena/skillhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:370
+msgid "Karma"
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:371
+msgid "Manner"
+msgstr ""
+
+#: src/net/eathena/skillhandler.cpp:304 src/net/eathena/skillhandler.cpp:364
#, c-format
msgid "Unknown skill error: %d"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:235 src/net/tmwa/skillhandler.cpp:224
+#: src/net/eathena/skillhandler.cpp:311 src/net/tmwa/skillhandler.cpp:224
msgid "You have not yet reached a high enough lvl!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:239 src/net/tmwa/skillhandler.cpp:228
+#: src/net/eathena/skillhandler.cpp:315 src/net/tmwa/skillhandler.cpp:228
msgid "Insufficient HP!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:243 src/net/tmwa/skillhandler.cpp:232
+#: src/net/eathena/skillhandler.cpp:319 src/net/tmwa/skillhandler.cpp:232
msgid "Insufficient SP!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:247 src/net/tmwa/skillhandler.cpp:236
+#: src/net/eathena/skillhandler.cpp:323 src/net/tmwa/skillhandler.cpp:236
msgid "You have no memos!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:251 src/net/tmwa/skillhandler.cpp:240
+#: src/net/eathena/skillhandler.cpp:327 src/net/tmwa/skillhandler.cpp:240
msgid "You cannot do that right now!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:255 src/net/tmwa/skillhandler.cpp:244
+#: src/net/eathena/skillhandler.cpp:331 src/net/tmwa/skillhandler.cpp:244
msgid "Seems you need more money... ;-)"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:259 src/net/tmwa/skillhandler.cpp:248
+#: src/net/eathena/skillhandler.cpp:335 src/net/tmwa/skillhandler.cpp:248
msgid "You cannot use this skill with that kind of weapon!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:264 src/net/tmwa/skillhandler.cpp:253
+#: src/net/eathena/skillhandler.cpp:340 src/net/tmwa/skillhandler.cpp:253
msgid "You need another red gem!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:268 src/net/tmwa/skillhandler.cpp:257
+#: src/net/eathena/skillhandler.cpp:344 src/net/tmwa/skillhandler.cpp:257
msgid "You need another blue gem!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:272 src/net/tmwa/skillhandler.cpp:261
+#: src/net/eathena/skillhandler.cpp:348 src/net/tmwa/skillhandler.cpp:261
msgid "You're carrying to much to do this!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:276 src/net/tmwa/skillhandler.cpp:265
+#: src/net/eathena/skillhandler.cpp:352 src/net/tmwa/skillhandler.cpp:265
msgid "Huh? What's that?"
msgstr ""
@@ -7869,32 +8021,32 @@ msgid "%s wants to trade with you, do you accept?"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:349
+#: src/net/tmwa/charserverhandler.cpp:351
msgid "Strength:"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:351
+#: src/net/tmwa/charserverhandler.cpp:353
msgid "Agility:"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:353
+#: src/net/tmwa/charserverhandler.cpp:355
msgid "Vitality:"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:355
+#: src/net/tmwa/charserverhandler.cpp:357
msgid "Intelligence:"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:357
+#: src/net/tmwa/charserverhandler.cpp:359
msgid "Dexterity:"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:359
+#: src/net/tmwa/charserverhandler.cpp:361
msgid "Luck:"
msgstr ""
@@ -8205,269 +8357,306 @@ msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:143
+msgid "You cant left party on this map."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:147
+msgid "You was kicked from party."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:151
+msgid "You cant be kicked kicked from party on this map."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:155
#, c-format
msgid "%s has joined your party."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:147
+#: src/resources/notifications.h:159
#, c-format
msgid "%s is already a member of a party."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:151
+#: src/resources/notifications.h:163
#, c-format
msgid "%s refused your invitation."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:155
+#: src/resources/notifications.h:167
#, c-format
msgid "%s is now a member of your party."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:159
+#: src/resources/notifications.h:171
#, c-format
msgid "%s can't join your party because party is full."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:163
+#: src/resources/notifications.h:175
#, c-format
msgid "QQQ Unknown invite response for %s."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:191
+#: src/resources/notifications.h:203
#, c-format
msgid "%s has left your party."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:195
+#: src/resources/notifications.h:207 src/resources/notifications.h:215
+#, c-format
+msgid "%s cant be kicked from party on this map."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:211
+#, c-format
+msgid "%s has kicked from your party."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:219
#, c-format
msgid "An unknown member tried to say: %s"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:199
+#: src/resources/notifications.h:223
#, c-format
msgid "%s is not in your party!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:203
+#: src/resources/notifications.h:227
#, c-format
msgid "You picked up %s."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:207
+#: src/resources/notifications.h:231
#, c-format
msgid "You spent %s."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:211
+#: src/resources/notifications.h:235
msgid "Cannot raise skill!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:215
+#: src/resources/notifications.h:239
msgid "Equip ammunition first."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:219
+#: src/resources/notifications.h:243
#, c-format
msgid "Trading with %s isn't possible. Trade partner is too far away."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:224
+#: src/resources/notifications.h:248
#, c-format
msgid "Trading with %s isn't possible. Character doesn't exist."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:228
+#: src/resources/notifications.h:252
msgid "Trade cancelled due to an unknown reason."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:232
+#: src/resources/notifications.h:256
#, c-format
msgid "Trade with %s cancelled."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:236
+#: src/resources/notifications.h:260
#, c-format
msgid "Unhandled trade cancel packet with %s"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:240
+#: src/resources/notifications.h:264
msgid "Failed adding item. Trade partner is over weighted."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:244
+#: src/resources/notifications.h:268
msgid "Failed adding item. Trade partner has no free slot."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:248
+#: src/resources/notifications.h:272
msgid "Failed adding item. You can't trade this item."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:252
+#: src/resources/notifications.h:276
msgid "Failed adding item for unknown reason."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:256
+#: src/resources/notifications.h:280
msgid "Trade canceled."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:260
+#: src/resources/notifications.h:284
msgid "Trade completed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:264
+#: src/resources/notifications.h:288
msgid "Kick failed!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:268
+#: src/resources/notifications.h:292
msgid "Kick succeeded!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:272
+#: src/resources/notifications.h:296
#, c-format
msgid "MVP player: %s"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:276
+#: src/resources/notifications.h:300
msgid "All whispers ignored."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:280
+#: src/resources/notifications.h:304
msgid "All whispers ignore failed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:284
+#: src/resources/notifications.h:308
msgid "All whispers unignored."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:288
+#: src/resources/notifications.h:312
msgid "All whispers unignore failed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:295
+#: src/resources/notifications.h:319
msgid "pvp off, gvg off"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:299
+#: src/resources/notifications.h:323
msgid "pvp on"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:303
+#: src/resources/notifications.h:327
msgid "gvg on"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:307
+#: src/resources/notifications.h:331
msgid "pvp on, gvg on"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:311
+#: src/resources/notifications.h:335
msgid "unknown pvp"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:315
+#: src/resources/notifications.h:339
#, c-format
msgid "Char from account %s is already in your party!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:319
+#: src/resources/notifications.h:343
#, c-format
msgid "%s blocked invite!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:323
+#: src/resources/notifications.h:347
msgid "Char is not online!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:327
+#: src/resources/notifications.h:351
msgid "Pet catch failed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:331
+#: src/resources/notifications.h:355
msgid "Pet catched."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:335
+#: src/resources/notifications.h:359
#, c-format
msgid "Pet catch unkown error: %d."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:339
+#: src/resources/notifications.h:363
msgid "Your mercenary duty hour is over."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:343
+#: src/resources/notifications.h:367
msgid "Your mercenary was killed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:347
+#: src/resources/notifications.h:371
msgid "Your mercenary was fired."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:351
+#: src/resources/notifications.h:375
msgid "Your mercenary run away."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:355
+#: src/resources/notifications.h:379
msgid "Mercenary unknown state."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:359
-msgid "Your feed your homunculus."
+#: src/resources/notifications.h:383
+msgid "You feed your homunculus."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:363
+#: src/resources/notifications.h:387
#, c-format
msgid "You cant feed homunculus, because not have %s."
msgstr ""
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:391
+msgid "Card insert failed."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:395
+msgid "Card inserted."
+msgstr ""
+
#. TRANSLATORS: chat option changed message
#: src/utils/booleanoptions.h:27
#, c-format
diff --git a/po/sv.po b/po/sv.po
index 972b0cc76..0e08d83e0 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-27 13:23+0300\n"
-"PO-Revision-Date: 2014-09-28 10:01+0000\n"
+"POT-Creation-Date: 2014-10-08 01:19+0300\n"
+"PO-Revision-Date: 2014-10-08 10:02+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Swedish (Sweden) (http://www.transifex.com/projects/p/manaplus/language/sv_SE/)\n"
"MIME-Version: 1.0\n"
@@ -32,7 +32,7 @@ msgstr ""
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:131 src/client.cpp:1463 src/client.cpp:1490
+#: src/actions/actions.cpp:131 src/client.cpp:1461 src/client.cpp:1488
#: src/gamemodifiers.cpp:423 src/gui/widgets/tabs/setup_input.cpp:163
#: src/gui/widgets/tabs/setup_theme.cpp:312
#: src/gui/widgets/tabs/setup_theme.cpp:343
@@ -43,8 +43,8 @@ msgstr ""
#: src/gui/windows/changeemaildialog.cpp:170
#: src/gui/windows/changepassworddialog.cpp:160
#: src/gui/windows/charcreatedialog.cpp:373
-#: src/gui/windows/charselectdialog.cpp:255
-#: src/gui/windows/charselectdialog.cpp:291 src/gui/windows/editdialog.cpp:49
+#: src/gui/windows/charselectdialog.cpp:277
+#: src/gui/windows/charselectdialog.cpp:313 src/gui/windows/editdialog.cpp:49
#: src/gui/windows/editserverdialog.cpp:61
#: src/gui/windows/editserverdialog.cpp:208
#: src/gui/windows/itemamountwindow.cpp:158 src/gui/windows/quitdialog.cpp:70
@@ -52,7 +52,9 @@ msgstr ""
#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
#: src/net/ea/charserverhandler.cpp:143 src/net/ea/charserverhandler.cpp:162
#: src/net/ea/charserverhandler.cpp:175 src/net/ea/gamehandler.cpp:79
-#: src/net/ea/playerhandler.cpp:263 src/net/ea/playerhandler.cpp:279
+#: src/net/ea/playerhandler.cpp:424 src/net/ea/playerhandler.cpp:440
+#: src/net/eathena/charserverhandler.cpp:533
+#: src/net/eathena/charserverhandler.cpp:563
msgid "OK"
msgstr "OK"
@@ -176,7 +178,7 @@ msgstr "Guild-namn saknas."
#. TRANSLATORS: party invite message
#. TRANSLATORS: change relation
-#: src/actions/chat.cpp:303 src/actions/commands.cpp:65
+#: src/actions/chat.cpp:303 src/actions/commands.cpp:64
msgid "Please specify a name."
msgstr "Var vänlig specificera ett namn."
@@ -199,75 +201,75 @@ msgid "Message now closes chat."
msgstr "Meddelande nu, stänger chat."
#. TRANSLATORS: change relation
-#: src/actions/commands.cpp:108
+#: src/actions/commands.cpp:107
#, c-format
msgid "Player already %s!"
msgstr "Spelare är redan %s!"
#. TRANSLATORS: change relation
-#: src/actions/commands.cpp:120
+#: src/actions/commands.cpp:119
#, c-format
msgid "Player successfully %s!"
msgstr "Spelare %s lyckades!"
#. TRANSLATORS: change relation
-#: src/actions/commands.cpp:122
+#: src/actions/commands.cpp:121
#, c-format
msgid "Player could not be %s!"
msgstr "Spelare kunde inte bli %s!"
#. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:153
+#: src/actions/commands.cpp:152
msgid "Player wasn't ignored!"
msgstr "Spelaren ignorerades inte!"
#. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:162
+#: src/actions/commands.cpp:161
msgid "Player no longer ignored!"
msgstr "Spelaren är inte längre ignorerad!"
#. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:164
+#: src/actions/commands.cpp:163
msgid "Player could not be unignored!"
msgstr "Spelaren kunde inte bli oignorerad!"
#. TRANSLATORS: erase command
-#: src/actions/commands.cpp:179
+#: src/actions/commands.cpp:178
msgid "Player already erased!"
msgstr "Spelare är redan borttagen!"
#. TRANSLATORS: erase command
-#: src/actions/commands.cpp:192
+#: src/actions/commands.cpp:191
msgid "Player no longer erased!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/actions/commands.cpp:194
+#: src/actions/commands.cpp:193
msgid "Player could not be erased!"
msgstr "Spelaren kunde inte tas bort!"
#. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:201
+#: src/actions/commands.cpp:200
msgid "friend"
msgstr "vän"
#. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:208
+#: src/actions/commands.cpp:207
msgid "disregarded"
msgstr "ignorera"
#. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:215
+#: src/actions/commands.cpp:214
msgid "neutral"
msgstr "neutral"
#. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:222
+#: src/actions/commands.cpp:221
msgid "blacklisted"
msgstr "blacklistad"
#. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:229
+#: src/actions/commands.cpp:228
msgid "enemy"
msgstr "enemy"
@@ -282,77 +284,77 @@ msgid "Accepting incoming trade requests"
msgstr "Acceptera inkommande bytes-förfrågningar"
#. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1306
+#: src/actormanager.cpp:1310
msgid "Visible on map"
msgstr "Synlig på karta"
#. TRANSLATORS: default race name
-#: src/being/being.cpp:389
+#: src/being/being.cpp:393
msgid "Human"
msgstr "Människa"
-#: src/being/being.cpp:556
+#: src/being/being.cpp:560
msgid "dodge"
msgstr "undvika"
-#: src/being/being.cpp:556
+#: src/being/being.cpp:560
msgid "miss"
msgstr "missa"
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1865 src/gui/windows/whoisonline.cpp:855
+#: src/being/being.cpp:1869 src/gui/windows/whoisonline.cpp:855
msgid "A"
msgstr "A"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1870 src/gui/windows/whoisonline.cpp:860
+#: src/being/being.cpp:1874 src/gui/windows/whoisonline.cpp:860
msgid "I"
msgstr "I"
#. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:379
+#: src/being/localplayer.cpp:380
#, c-format
msgid "You were killed by %s"
msgstr "Du blev dödad av herr %s"
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:824
+#: src/being/localplayer.cpp:825
msgid "Tried to pick up nonexistent item."
msgstr "Försökte plocka upp icke existerande item."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:828
+#: src/being/localplayer.cpp:829
msgid "Item is too heavy."
msgstr "Item är för tung."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:832
+#: src/being/localplayer.cpp:833
msgid "Item is too far away."
msgstr "Item:en är för långt bort."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:836
+#: src/being/localplayer.cpp:837
msgid "Inventory is full."
msgstr "Inventory är fullt."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:840
+#: src/being/localplayer.cpp:841
msgid "Stack is too big."
msgstr "Stack är för stor."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:844
+#: src/being/localplayer.cpp:845
msgid "Item belongs to someone else."
msgstr "Item:et tillhör någon annan."
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:848
+#: src/being/localplayer.cpp:849
msgid "Unknown problem picking up item."
msgstr "Okänt fel vid upplockning av item."
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:872
+#: src/being/localplayer.cpp:873
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -361,43 +363,43 @@ msgstr[1] "You picked up %d [@@%d|%s@@]."
#. TRANSLATORS: this is normal experience
#. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1054 src/being/localplayer.cpp:1055
-#: src/being/localplayer.cpp:1091
+#: src/being/localplayer.cpp:1055 src/being/localplayer.cpp:1056
+#: src/being/localplayer.cpp:1092
msgid "xp"
msgstr "xp"
#. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1059 src/being/localplayer.cpp:1065
-#: src/being/localplayer.cpp:1071
+#: src/being/localplayer.cpp:1060 src/being/localplayer.cpp:1066
+#: src/being/localplayer.cpp:1072
msgid "job"
msgstr "jobb"
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2794
+#: src/being/localplayer.cpp:2795
#, c-format
msgid "Follow: %s"
msgstr "Follow: %s"
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2800 src/being/localplayer.cpp:2825
+#: src/being/localplayer.cpp:2801 src/being/localplayer.cpp:2826
msgid "Follow canceled"
msgstr "Follow avbruten"
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2810
+#: src/being/localplayer.cpp:2811
#, c-format
msgid "Imitation: %s"
msgstr "Imitation: %s"
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2816 src/being/localplayer.cpp:2830
+#: src/being/localplayer.cpp:2817 src/being/localplayer.cpp:2831
msgid "Imitation canceled"
msgstr "Imitation avbruten"
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3180
+#: src/being/localplayer.cpp:3181
#, c-format
msgid "You see %s"
msgstr "Du ser %s"
@@ -435,37 +437,37 @@ msgstr "Floating bubble"
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:920 src/gui/windowmenu.cpp:162
+#: src/client.cpp:918 src/gui/windowmenu.cpp:162
#: src/gui/windows/setupwindow.cpp:62
msgid "Setup"
msgstr "Inställningar"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:923 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:921 src/gui/widgets/tabs/setup_perfomance.cpp:54
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:926 src/gui/widgets/tabs/setup_video.cpp:105
+#: src/client.cpp:924 src/gui/widgets/tabs/setup_video.cpp:105
msgid "Video"
msgstr "Video"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:929 src/gui/widgets/tabs/setup_theme.cpp:122
+#: src/client.cpp:927 src/gui/widgets/tabs/setup_theme.cpp:122
msgid "Theme"
msgstr "Tema"
#. TRANSLATORS: theme tab quick button
-#: src/client.cpp:932
+#: src/client.cpp:930
msgid "About"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:935 src/gui/windowmenu.cpp:74
+#: src/client.cpp:933 src/gui/windowmenu.cpp:74
#: src/gui/windows/helpwindow.cpp:53
msgid "Help"
msgstr "Hjälp"
@@ -481,42 +483,42 @@ msgstr "Hjälp"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:939 src/client.cpp:1391 src/client.cpp:1405
+#: src/client.cpp:937 src/client.cpp:1389 src/client.cpp:1403
#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:691
#: src/gui/popups/popupmenu.cpp:923 src/gui/windows/didyouknowwindow.cpp:81
#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:74
#: src/gui/windows/npcdialog.cpp:112 src/gui/windows/questswindow.cpp:77
-#: src/gui/windows/shopwindow.cpp:84
+#: src/gui/windows/shopwindow.cpp:83
msgid "Close"
msgstr "Stäng"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1065
+#: src/client.cpp:1063
msgid "Connecting to server"
msgstr "Ansluter till server"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1113
+#: src/client.cpp:1111
msgid "Logging in"
msgstr "Loggar in"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1156
+#: src/client.cpp:1154
msgid "Entering game world"
msgstr "Går in i spelvärld"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1282
+#: src/client.cpp:1280
msgid "Requesting characters"
msgstr "Begär karaktärer"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1322
+#: src/client.cpp:1320
msgid "Connecting to the game server"
msgstr "Ansluter till spelservern"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1334
+#: src/client.cpp:1332
msgid "Changing game servers"
msgstr "Ändrar spelserver"
@@ -530,72 +532,76 @@ msgstr "Ändrar spelserver"
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1389 src/client.cpp:1403 src/client.cpp:1598
+#. TRANSLATORS: info message
+#. TRANSLATORS: ok dialog button
+#: src/client.cpp:1387 src/client.cpp:1401 src/client.cpp:1596
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
#: src/gui/windows/charcreatedialog.cpp:369
-#: src/gui/windows/charselectdialog.cpp:289
+#: src/gui/windows/charselectdialog.cpp:311
#: src/gui/windows/editserverdialog.cpp:203
#: src/gui/windows/registerdialog.cpp:245
#: src/gui/windows/unregisterdialog.cpp:146
#: src/net/ea/charserverhandler.cpp:141 src/net/ea/charserverhandler.cpp:173
+#: src/net/eathena/charserverhandler.cpp:516
+#: src/net/eathena/charserverhandler.cpp:518
msgid "Error"
msgstr "Error"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1418
+#: src/client.cpp:1416
msgid "Requesting registration details"
msgstr "Begär registreringsuppgifter"
#. TRANSLATORS: password change message header
-#: src/client.cpp:1459
+#: src/client.cpp:1457
msgid "Password Change"
msgstr "Lösenordsändring"
#. TRANSLATORS: password change message text
-#: src/client.cpp:1461
+#: src/client.cpp:1459
msgid "Password changed successfully!"
msgstr "Lösenordsändring har lyckats!"
#. TRANSLATORS: email change message header
-#: src/client.cpp:1486
+#: src/client.cpp:1484
msgid "Email Change"
msgstr "Byte av E-post"
#. TRANSLATORS: email change message text
-#: src/client.cpp:1488
+#: src/client.cpp:1486
msgid "Email changed successfully!"
msgstr "E-posten har ändrats!"
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1515
+#: src/client.cpp:1513
msgid "Unregister Successful"
msgstr "Avregistrering lyckad"
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1517
+#: src/client.cpp:1515
msgid "Farewell, come back any time..."
msgstr "Farväl, kom gärna tillbaka snart igen..."
#. TRANSLATORS: directory creation error
#: src/configmanager.cpp:53 src/dirs.cpp:260 src/dirs.cpp:275 src/dirs.cpp:320
-#: src/dirs.cpp:481 src/dirs.cpp:489
+#: src/dirs.cpp:488 src/dirs.cpp:496
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%s existerar inte och kan inte bli skapat! Avslutar."
#. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:363
+#: src/dirs.cpp:370
#, c-format
msgid "Invalid update host: %s."
msgstr "Felaktig uppdaterings-host: %s."
#. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:404 src/dirs.cpp:411
+#: src/dirs.cpp:411 src/dirs.cpp:418
msgid "Error creating updates directory!"
msgstr "Error uppstod då uppdateringskatalog skulle skapas!"
-#: src/dirs.cpp:433 src/dirs.cpp:451
+#: src/dirs.cpp:440 src/dirs.cpp:458
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "Error: %s existerar inte och kan inte bli skapat! Avslutar."
@@ -613,36 +619,36 @@ msgid "dyecmd srcdyestring dstfile"
msgstr ""
#. TRANSLATORS: chat tab header
-#: src/game.cpp:236 src/gui/widgets/tabs/chattab.cpp:482
+#: src/game.cpp:234 src/gui/widgets/tabs/chattab.cpp:482
msgid "General"
msgstr "General"
#. TRANSLATORS: chat tab header
#. TRANSLATORS: full button name
#. TRANSLATORS: debug window name
-#: src/game.cpp:253 src/gui/widgets/tabs/chattab.cpp:484
+#: src/game.cpp:251 src/gui/widgets/tabs/chattab.cpp:484
#: src/gui/windowmenu.cpp:149 src/gui/windows/debugwindow.cpp:42
msgid "Debug"
msgstr "Debug"
#. TRANSLATORS: save file message
-#: src/game.cpp:541
+#: src/game.cpp:532
#, c-format
msgid "Screenshot saved as %s"
msgstr "Skärmdump sparades som %s"
#. TRANSLATORS: save file message
-#: src/game.cpp:551
+#: src/game.cpp:542
msgid "Saving screenshot failed!"
msgstr "Spara skärmdump misslyckades!"
#. TRANSLATORS: error message text
-#: src/game.cpp:634
+#: src/game.cpp:625
msgid "The connection to the server was lost."
msgstr "Anslutningen till servern förlorades."
#. TRANSLATORS: error message header
-#: src/game.cpp:637
+#: src/game.cpp:628
msgid "Network Error"
msgstr "Nätverksfel"
@@ -1033,6 +1039,7 @@ msgstr "Vill du öppna support-sidan?"
#: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
#: src/gui/widgets/tabs/setup_other.cpp:79
#: src/gui/widgets/tabs/setup_visual.cpp:81
+#: src/gui/windows/equipmentwindow.cpp:577
msgid "default"
msgstr "standard"
@@ -1523,7 +1530,7 @@ msgstr "Trade"
#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:273
#: src/gui/popups/popupmenu.cpp:767 src/gui/widgets/skillinfo.cpp:113
#: src/gui/windows/botcheckerwindow.cpp:89 src/input/pages/basic.cpp:42
-#: src/net/eathena/generalhandler.cpp:289 src/net/tmwa/generalhandler.cpp:321
+#: src/net/eathena/generalhandler.cpp:356 src/net/tmwa/generalhandler.cpp:320
msgid "Attack"
msgstr "Attackera"
@@ -1692,7 +1699,7 @@ msgstr ""
#. TRANSLATORS: pet unequip item
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:340 src/gui/windows/equipmentwindow.cpp:70
+#: src/gui/popups/popupmenu.cpp:340 src/gui/windows/equipmentwindow.cpp:72
#: src/gui/windows/inventorywindow.cpp:175 src/resources/itemtypemapdata.h:47
#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
@@ -1750,7 +1757,7 @@ msgstr "Kartobjekt"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:574
+#: src/gui/popups/popupmenu.cpp:574 src/gui/windows/charselectdialog.cpp:132
msgid "Rename"
msgstr "Ändra namn"
@@ -2262,7 +2269,7 @@ msgstr "Återkalla"
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
#. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:3000 src/net/ea/playerhandler.cpp:364
+#: src/gui/popups/popupmenu.cpp:3000 src/net/ea/playerhandler.cpp:195
msgid "Revive"
msgstr "Återuppliva"
@@ -2286,7 +2293,7 @@ msgstr "Genvägar"
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: settings group
#. TRANSLATORS: full button name
-#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:319
+#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:315
#: src/gui/windowmenu.cpp:158
msgid "Windows"
msgstr "Fönster"
@@ -2314,7 +2321,7 @@ msgstr "Chat"
#. TRANSLATORS: input action name
#: src/gui/setupinputpages.cpp:57 src/gui/widgets/tabs/setup_audio.cpp:151
#: src/gui/widgets/tabs/setup_chat.cpp:179
-#: src/gui/widgets/tabs/setup_other.cpp:341
+#: src/gui/widgets/tabs/setup_other.cpp:337
#: src/gui/widgets/tabs/setup_visual.cpp:192
#: src/gui/windows/charcreatedialog.cpp:119
#: src/gui/windows/registerdialog.cpp:106 src/input/pages/gui.cpp:87
@@ -2327,212 +2334,227 @@ msgid "Gui"
msgstr "Gui"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:113
+#: src/gui/userpalette.cpp:116
msgid "Being"
msgstr "Varelse"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:115
+#: src/gui/userpalette.cpp:118
msgid "Friend names"
msgstr "Väns namn"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:117
+#: src/gui/userpalette.cpp:120
msgid "Disregarded names"
msgstr "Ignorerade namn"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:119
+#: src/gui/userpalette.cpp:122
msgid "Ignored names"
msgstr "Ignorerade namn"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:121
+#: src/gui/userpalette.cpp:124
msgid "Erased names"
msgstr "Borttagna namn"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:123
+#: src/gui/userpalette.cpp:126
msgid "Other players names"
msgstr "Andra spelares namn"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:125
+#: src/gui/userpalette.cpp:128
msgid "Own name"
msgstr "Eget namn"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:127
+#: src/gui/userpalette.cpp:130
msgid "GM names"
msgstr "GM-namn"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:129
+#: src/gui/userpalette.cpp:132
msgid "NPCs"
msgstr "NPCs"
#. TRANSLATORS: palette color
#. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:131 src/gui/widgets/tabs/setup_other.cpp:108
+#: src/gui/userpalette.cpp:134 src/gui/widgets/tabs/setup_other.cpp:108
msgid "Monsters"
msgstr "Monster"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:133
+#: src/gui/userpalette.cpp:136
msgid "Monster HP bar"
msgstr "Monster HP bar"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:139
msgid "Monster HP bar (second color)"
msgstr "Monster HP bar (färg två)"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:138
+#: src/gui/userpalette.cpp:141
msgid "Party members"
msgstr "Party-medlemmar"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:140
+#: src/gui/userpalette.cpp:143
msgid "Guild members"
msgstr "Guild-medlemmar"
#. TRANSLATORS: palette color
#. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:142 src/gui/widgets/tabs/setup_visual.cpp:157
+#: src/gui/userpalette.cpp:145 src/gui/widgets/tabs/setup_visual.cpp:157
msgid "Particle effects"
msgstr "Partickeleffekter"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:144
+#: src/gui/userpalette.cpp:147
msgid "Pickup notification"
msgstr "Pickup-notifikation"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:146
+#: src/gui/userpalette.cpp:149
msgid "Exp notification"
msgstr "Exp-notifikation"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:148
+#: src/gui/userpalette.cpp:151
msgid "Player HP bar"
msgstr "Spelare HP bar"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:152
+#: src/gui/userpalette.cpp:155
msgid "Player HP bar (second color)"
msgstr "Spelare HP bar (färg två)"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:154
+#: src/gui/userpalette.cpp:157
msgid "Player hits monster"
msgstr "Spelare träffar monster"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:156
+#: src/gui/userpalette.cpp:159
msgid "Monster hits player"
msgstr "Monster träffar spelare"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:160
+#: src/gui/userpalette.cpp:163
msgid "Other player hits local player"
msgstr "Annan spelare träffar lokal spelare"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:162
+#: src/gui/userpalette.cpp:165
msgid "Critical Hit"
msgstr "Critical Hit"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:166
+#: src/gui/userpalette.cpp:169
msgid "Local player hits monster"
msgstr "Lokal spelares träffar monster"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:169
+#: src/gui/userpalette.cpp:172
msgid "Local player critical hit"
msgstr "Lokal spelares critical hit"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:172
+#: src/gui/userpalette.cpp:175
msgid "Local player miss"
msgstr "Lokal spelares miss"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:174
+#: src/gui/userpalette.cpp:177
msgid "Misses"
msgstr "Missar"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:176
+#: src/gui/userpalette.cpp:179
msgid "Portal highlight"
msgstr "Portal-highlightning"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:179
+#: src/gui/userpalette.cpp:182
msgid "Default collision highlight"
msgstr "Standard kollisions-highlightning"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:182
+#: src/gui/userpalette.cpp:185
msgid "Air collision highlight"
msgstr "Luftkollision-highlightning"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:185
+#: src/gui/userpalette.cpp:188
msgid "Water collision highlight"
msgstr "Luftkollisions-highlightning"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:188
+#: src/gui/userpalette.cpp:191
msgid "Special ground collision highlight"
msgstr "Speciell mark-kollisions-highlightning"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:191
+#: src/gui/userpalette.cpp:194
msgid "Walkable highlight"
msgstr "Gång-highlightning"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:194
+#: src/gui/userpalette.cpp:197
msgid "Local player attack range"
msgstr "Lokal spelares attack-range"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:197
+#: src/gui/userpalette.cpp:200
msgid "Local player attack range border"
msgstr "Lokal spelares kant för attack-range"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:200
+#: src/gui/userpalette.cpp:203
msgid "Monster attack range"
msgstr "Monster attack-range"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:204
+#: src/gui/userpalette.cpp:207
msgid "Floor item amount color"
msgstr "Antalsfärg för Golv-item"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:207
+#: src/gui/userpalette.cpp:210
msgid "Home place"
msgstr "Hemplats"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:210
+#: src/gui/userpalette.cpp:213
msgid "Home place border"
msgstr "Hemplatskant"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:213
+#: src/gui/userpalette.cpp:216
msgid "Road point"
msgstr "Väg-märke"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:216
+#: src/gui/userpalette.cpp:219
msgid "Tiles border"
msgstr ""
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:221
+msgid "Pets"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:223
+msgid "Mercenary"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:225
+msgid "Homunculus"
+msgstr ""
+
#: src/gui/widgets/characterdisplay.cpp:135
#, c-format
msgid "Level: %u"
@@ -2635,7 +2657,8 @@ msgid "Type: %s"
msgstr ""
#. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:108
+#. TRANSLATORS: unknown equipment page name
+#: src/gui/widgets/skillinfo.cpp:108 src/gui/windows/equipmentwindow.cpp:584
msgid "Unknown"
msgstr ""
@@ -2836,22 +2859,22 @@ msgstr "Partikelantal: %d"
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:262
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:313
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:375
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:319
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:387
msgid "Target:"
msgstr "Target:"
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:264
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:319
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:377
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:325
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:389
msgid "Target Id:"
msgstr "Target Id:"
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:267
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:322
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:379
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:328
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:391
msgid "Target type:"
msgstr "Target-typ:"
@@ -2862,7 +2885,7 @@ msgstr "Target level:"
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:271
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:338
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:344
msgid "Target race:"
msgstr "Target race:"
@@ -2878,67 +2901,81 @@ msgstr "Target guild:"
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:277
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:363
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:369
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:387
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:375
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:381
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:399
msgid "Attack delay:"
msgstr "Attack-fördröjning:"
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:279
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:350
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:389
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:356
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:401
msgid "Minimal hit:"
msgstr "Minimal träff:"
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:281
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:353
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:391
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:359
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:403
msgid "Maximum hit:"
msgstr "Maximal träff:"
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:283
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:356
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:393
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:362
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:405
msgid "Critical hit:"
msgstr "Critical hit:"
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:327
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:285
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:365
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:407
+msgid "Karma:"
+msgstr ""
+
+#. TRANSLATORS: debug window label
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:287
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:368
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:409
+msgid "Manner:"
+msgstr ""
+
+#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:333
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:381
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:339
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:393
msgid "Target Level:"
msgstr "Target Level:"
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:341
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:383
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:347
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:395
msgid "Target Party:"
msgstr "Target Party:"
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:345
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:385
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:351
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:397
msgid "Target Guild:"
msgstr "Target Guild:"
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:430
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:436
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:451
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:457
#, c-format
msgid "Ping: %s ms"
msgstr "Ping: %s ms"
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:439
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:460
#, c-format
msgid "In: %d bytes/s"
msgstr "In: %d bytes/s"
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:442
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:463
#, c-format
msgid "Out: %d bytes/s"
msgstr "Ut: %d bytes/s"
@@ -3767,137 +3804,132 @@ msgstr "Bots support"
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_other.cpp:294
-msgid "Enable auction bot support"
-msgstr "Aktivera support för auktions-bot"
-
-#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:298
msgid "Enable guild bot support and disable native guild support"
msgstr "Aktivera support för guild-bot och avaktivera grund-supporten för guild"
#. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:304
+#: src/gui/widgets/tabs/setup_other.cpp:300
msgid "Keyboard"
msgstr "Tangentbord"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:307
+#: src/gui/widgets/tabs/setup_other.cpp:303
msgid "Repeat delay"
msgstr "Upprepningsfördröjning"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:311
+#: src/gui/widgets/tabs/setup_other.cpp:307
msgid "Repeat interval"
msgstr "Upprepningsintervall"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:315
+#: src/gui/widgets/tabs/setup_other.cpp:311
msgid "Custom repeat interval"
msgstr "Anpassat upprepningsintervall"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:323
+#: src/gui/widgets/tabs/setup_other.cpp:319
msgid "Shortcut buttons"
msgstr "Genvägsknappar"
#. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:328
+#: src/gui/widgets/tabs/setup_other.cpp:324
msgid "Proxy server"
msgstr "Proxy-server"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:332
+#: src/gui/widgets/tabs/setup_other.cpp:328
msgid "Proxy type"
msgstr "Proxy-typ"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:336
+#: src/gui/widgets/tabs/setup_other.cpp:332
msgid "Proxy address:port"
msgstr "Proxy-adress:port"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:344
+#: src/gui/widgets/tabs/setup_other.cpp:340
msgid "Enable server side attack"
msgstr "Aktivera serversideattack"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:348
+#: src/gui/widgets/tabs/setup_other.cpp:344
msgid "Hide support page link on error"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:352
+#: src/gui/widgets/tabs/setup_other.cpp:348
msgid "Enable double clicks"
msgstr "Aktivera dubbleklick"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:356
+#: src/gui/widgets/tabs/setup_other.cpp:352
msgid "Enable bot checker"
msgstr "Aktivera bot checker"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:360
+#: src/gui/widgets/tabs/setup_other.cpp:356
msgid "Enable buggy servers protection (do not disable)"
msgstr "Aktivera buggig-server-skydd (ändra inte denna är du snäll)"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:365
+#: src/gui/widgets/tabs/setup_other.cpp:361
msgid "Enable debug log"
msgstr "Aktivera debug-logg"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:369
+#: src/gui/widgets/tabs/setup_other.cpp:365
msgid "Ignore logging packets"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:373
+#: src/gui/widgets/tabs/setup_other.cpp:369
msgid "Enable OpenGL log"
msgstr "Aktivera OpenGL-logg"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:377
+#: src/gui/widgets/tabs/setup_other.cpp:373
msgid "Enable input log"
msgstr "Aktivera inputs-logg"
#. TRANSLATORS: settings option
#. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_other.cpp:381 src/input/pages/other.cpp:362
+#: src/gui/widgets/tabs/setup_other.cpp:377 src/input/pages/other.cpp:362
msgid "Upload log file"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:385
+#: src/gui/widgets/tabs/setup_other.cpp:381
msgid "Low traffic mode"
msgstr "Lågtrafik-mode"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:389
+#: src/gui/widgets/tabs/setup_other.cpp:385
msgid "Hide shield sprite"
msgstr "Dölj sköld"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:394
+#: src/gui/widgets/tabs/setup_other.cpp:390
msgid "Use FBO for screenshots (only for opengl)"
msgstr "Använd FBO för skärmdumpar (bara för openGL)"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:400
+#: src/gui/widgets/tabs/setup_other.cpp:396
msgid "Screenshot directory"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:405
+#: src/gui/widgets/tabs/setup_other.cpp:401
msgid "Network delay between sub servers"
msgstr "Nätverksfördröjning mellan underservrar"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:409
+#: src/gui/widgets/tabs/setup_other.cpp:405
msgid "Show background"
msgstr "Visa bakgrund"
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:414
+#: src/gui/widgets/tabs/setup_other.cpp:410
msgid "Screen density override"
msgstr "Skärmdensitet överskrids"
@@ -4128,9 +4160,9 @@ msgstr "Tillåt viskningar"
#. TRANSLATORS: command editor button
#. TRANSLATORS: input action name
#: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:82
-#: src/gui/windows/serverdialog.cpp:125 src/gui/windows/shopwindow.cpp:101
-#: src/gui/windows/shopwindow.cpp:108 src/gui/windows/textcommandeditor.cpp:92
+#: src/gui/windows/charselectdialog.cpp:84
+#: src/gui/windows/serverdialog.cpp:125 src/gui/windows/shopwindow.cpp:100
+#: src/gui/windows/shopwindow.cpp:107 src/gui/windows/textcommandeditor.cpp:92
#: src/input/pages/gui.cpp:111
msgid "Delete"
msgstr "Radera"
@@ -4784,7 +4816,7 @@ msgstr "EQU"
#. TRANSLATORS: equipment window name
#. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:63
+#: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:65
#: src/gui/windows/inventorywindow.cpp:196
msgid "Equipment"
msgstr "Equipment"
@@ -4925,7 +4957,7 @@ msgstr "Antal:"
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: social window button
#: src/gui/windows/buydialog.cpp:260 src/gui/windows/charcreatedialog.cpp:127
-#: src/gui/windows/charselectdialog.cpp:578
+#: src/gui/windows/charselectdialog.cpp:605
#: src/gui/windows/socialwindow.cpp:86
msgid "Create"
msgstr "Skapa"
@@ -4969,10 +5001,8 @@ msgstr "E-postadressen matchar inte."
#. TRANSLATORS: change password window name
#. TRANSLATORS: change password dialog button
-#. TRANSLATORS: char select dialog. button.
#: src/gui/windows/changepassworddialog.cpp:51
#: src/gui/windows/changepassworddialog.cpp:57
-#: src/gui/windows/charselectdialog.cpp:73
msgid "Change Password"
msgstr "Ändra Lösenord"
@@ -5126,57 +5156,68 @@ msgid "Are you sure you want to delete this character?"
msgstr "Är du säker på att du vill radera denna karaktär?"
#. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:64
+#: src/gui/windows/charselectdialog.cpp:66
#, c-format
msgid "Account %s (last login time %s)"
msgstr "Konto %s (senaste inloggning var %s)"
#. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:71
-msgid "Switch Login"
-msgstr "Ändra inloggad"
+#: src/gui/windows/charselectdialog.cpp:73
+msgid "Switch"
+msgstr ""
+
+#. TRANSLATORS: char select dialog. button.
+#: src/gui/windows/charselectdialog.cpp:75
+msgid "Password"
+msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:78
-#: src/gui/windows/charselectdialog.cpp:573
+#: src/gui/windows/charselectdialog.cpp:80
+#: src/gui/windows/charselectdialog.cpp:595
#: src/gui/windows/updaterwindow.cpp:195
msgid "Play"
msgstr "Spela"
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:80
+#: src/gui/windows/charselectdialog.cpp:82
#: src/net/ea/charserverhandler.cpp:160
+#: src/net/eathena/charserverhandler.cpp:531
+#: src/net/eathena/charserverhandler.cpp:561
msgid "Info"
msgstr "Info"
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: unregister dialog name
#. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:106
+#: src/gui/windows/charselectdialog.cpp:110
#: src/gui/windows/unregisterdialog.cpp:50
#: src/gui/windows/unregisterdialog.cpp:55
msgid "Unregister"
msgstr "Avregistrera"
#. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:118
+#: src/gui/windows/charselectdialog.cpp:122
msgid "Change Email"
msgstr "Ändra lösenord"
#. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:156
+#: src/gui/windows/charselectdialog.cpp:166
#, c-format
msgid "Account %s"
msgstr "Konto %s"
-#: src/gui/windows/charselectdialog.cpp:184
+#: src/gui/windows/charselectdialog.cpp:194
msgid "Please set new pincode"
msgstr ""
+#: src/gui/windows/charselectdialog.cpp:240
+msgid "Please enter new name"
+msgstr ""
+
#. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:237
+#: src/gui/windows/charselectdialog.cpp:259
#, c-format
msgid ""
"Hp: %u/%u\n"
@@ -5186,16 +5227,16 @@ msgid ""
"Money: %s"
msgstr "Hp: %u/%u⏎\nMp: %u/%u⏎\nLevel: %u⏎\nExperience: %u⏎\nMoney: %s"
-#: src/gui/windows/charselectdialog.cpp:289
+#: src/gui/windows/charselectdialog.cpp:311
msgid "Incorrect password"
msgstr "Felaktigt lösenord"
#. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:429
+#: src/gui/windows/charselectdialog.cpp:451
msgid "Enter password for deleting character"
msgstr "Skriv in lösenordet för att radera karaktär"
-#: src/gui/windows/charselectdialog.cpp:429
+#: src/gui/windows/charselectdialog.cpp:451
msgid "Enter password:"
msgstr "Skriv lösenord:"
@@ -5603,7 +5644,7 @@ msgstr "Level: %d"
#. TRANSLATORS: status bar label
#: src/gui/windows/ministatuswindow.cpp:364
-#: src/gui/windows/ministatuswindow.cpp:402
+#: src/gui/windows/ministatuswindow.cpp:401
msgid "Need"
msgstr "Behöver"
@@ -5634,7 +5675,7 @@ msgstr "Submit"
#. TRANSLATORS: shop window button
#. TRANSLATORS: trade window button
#: src/gui/windows/npcdialog.cpp:114 src/gui/windows/serverdialog.cpp:121
-#: src/gui/windows/shopwindow.cpp:99 src/gui/windows/shopwindow.cpp:106
+#: src/gui/windows/shopwindow.cpp:98 src/gui/windows/shopwindow.cpp:105
#: src/gui/windows/tradewindow.cpp:83
msgid "Add"
msgstr "Lägg till"
@@ -5797,43 +5838,38 @@ msgid "Reset Windows"
msgstr "Återställ fönster"
#. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:80
+#: src/gui/windows/shopwindow.cpp:79
msgid "Personal Shop"
msgstr "Personlig Shop"
#. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:95
+#: src/gui/windows/shopwindow.cpp:94
msgid "Buy items"
msgstr "Köp items"
#. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:97
+#: src/gui/windows/shopwindow.cpp:96
msgid "Sell items"
msgstr "Sälj items"
#. TRANSLATORS: shop window label
#. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:110
+#: src/gui/windows/shopwindow.cpp:102 src/gui/windows/shopwindow.cpp:109
msgid "Announce"
msgstr "Annonsera"
#. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:114
+#: src/gui/windows/shopwindow.cpp:113
msgid "Show links in announce"
msgstr "Visa länkar i annonseringen"
-#. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:176 src/gui/windows/shopwindow.cpp:179
-msgid "Auction"
-msgstr "Auktion"
-
#. TRANSLATORS: shop window dialog
#. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:233
+#: src/gui/windows/shopwindow.cpp:776 src/net/ea/tradehandler.cpp:233
msgid "Request for Trade"
msgstr "Efterfråga Trade"
-#: src/gui/windows/shopwindow.cpp:791
+#: src/gui/windows/shopwindow.cpp:776
#, c-format
msgid "%s wants to %s %s do you accept?"
msgstr "%s vill %s %s, accepterar du?"
@@ -6161,27 +6197,27 @@ msgstr "Uppdaterar..."
msgid "Connecting..."
msgstr "Ansluter..."
-#: src/gui/windows/updaterwindow.cpp:398
+#: src/gui/windows/updaterwindow.cpp:407
msgid "Show all news (can be slow)"
msgstr ""
#. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:824
+#: src/gui/windows/updaterwindow.cpp:833
msgid "##1 The update process is incomplete."
msgstr "##1 Uppdateringsprocessen är inte fullständig."
#. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:826
+#: src/gui/windows/updaterwindow.cpp:835
msgid "##1 It is strongly recommended that"
msgstr "##1 Det är starkt rekommenderat att"
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:828
+#: src/gui/windows/updaterwindow.cpp:837
msgid "##1 you try again later."
msgstr "##1 du försöker senare igen."
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1005
+#: src/gui/windows/updaterwindow.cpp:1021
msgid "Completed"
msgstr "Färdig"
@@ -6228,25 +6264,25 @@ msgstr "Välj värld"
#. TRANSLATORS: long key name. must be short.
#. TRANSLATORS: short key name. must be very short.
#. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:370 src/input/inputmanager.cpp:414
+#: src/input/inputmanager.cpp:371 src/input/inputmanager.cpp:415
#: src/input/keyboardconfig.cpp:104
#, c-format
msgid "key_%d"
msgstr "key_%d"
#. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:376
+#: src/input/inputmanager.cpp:377
#, c-format
msgid "JButton%d"
msgstr "JButton%d"
#. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:391
msgid "unknown key"
msgstr "okänd eller borttappad tangent"
#. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:420
+#: src/input/inputmanager.cpp:421
#, c-format
msgid "JB%d"
msgstr "JB%d"
@@ -6254,7 +6290,7 @@ msgstr "JB%d"
#. TRANSLATORS: unknown short key type. must be short
#. TRANSLATORS: Unknown key short string.
#. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:434 src/input/keyboardconfig.cpp:148
+#: src/input/inputmanager.cpp:435 src/input/keyboardconfig.cpp:148
msgid "u key"
msgstr "u-tangenten"
@@ -7425,74 +7461,74 @@ msgid "Request to quit denied!"
msgstr "Efterfrågning att avsluta nekad!"
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:135
#, c-format
msgid "Guild name: %s"
msgstr "Guild-namn: %s"
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:191
+#: src/net/ea/guildhandler.cpp:138
#, c-format
msgid "Guild master: %s"
msgstr "Guild master: %s"
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:141
#, c-format
msgid "Guild level: %d"
msgstr "Guild level: %d"
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:197
+#: src/net/ea/guildhandler.cpp:144
#, c-format
msgid "Online members: %d"
msgstr "Medlemmar online: %d"
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:200
+#: src/net/ea/guildhandler.cpp:147
#, c-format
msgid "Max members: %d"
msgstr "Maximalt antal medlemmar: %d"
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:203
+#: src/net/ea/guildhandler.cpp:150
#, c-format
msgid "Average level: %d"
msgstr "Medel-level: %d"
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:206
+#: src/net/ea/guildhandler.cpp:153
#, c-format
msgid "Guild exp: %d"
msgstr "Guild exp: %d"
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:209
+#: src/net/ea/guildhandler.cpp:156
#, c-format
msgid "Guild next exp: %d"
msgstr "Guild nästa exp: %d"
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:212
+#: src/net/ea/guildhandler.cpp:159
#, c-format
msgid "Guild castle: %s"
msgstr "Guild slott: %s"
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:179
+#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:191
msgid "Item sharing enabled."
msgstr "Item-delning aktiverad."
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:183
+#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:195
msgid "Item sharing disabled."
msgstr "Item-delning avaktiverad."
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:187
+#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:199
msgid "Item sharing not possible."
msgstr "Item-delning är inte möjlig."
@@ -7503,19 +7539,19 @@ msgstr "Item-delning okänd."
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:167
+#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:179
msgid "Experience sharing enabled."
msgstr "Exp-delning är aktiverad."
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:171
+#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:183
msgid "Experience sharing disabled."
msgstr "Exp-delning avaktiverad."
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:175
+#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:187
msgid "Experience sharing not possible."
msgstr "Exp-delning är inte möjlig."
@@ -7620,239 +7656,355 @@ msgid "Connection to server terminated. "
msgstr "Anslutningen till servern avslutad. "
#. TRANSLATORS: message header
-#: src/net/ea/playerhandler.cpp:257 src/net/ea/playerhandler.cpp:273
-#: src/net/ea/playerhandler.cpp:361
+#: src/net/ea/playerhandler.cpp:192 src/net/ea/playerhandler.cpp:418
+#: src/net/ea/playerhandler.cpp:434
msgid "Message"
msgstr "Meddelande"
#. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:259
+#: src/net/ea/playerhandler.cpp:420
msgid ""
"You are carrying more than half your weight. You are unable to regain "
"health."
msgstr "Du bär på mer än halva din vikt. Du kan inte återfå health."
#. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:275
+#: src/net/ea/playerhandler.cpp:436
msgid "You are carrying less than half your weight. You can regain health."
msgstr "Du bär på mindre än hälften av din vikt. Du kan återfå health."
+#. TRANSLATORS: char rename error
+#: src/net/eathena/charserverhandler.cpp:516
+#: src/net/eathena/charserverhandler.cpp:553
+msgid "Character rename error."
+msgstr ""
+
+#: src/net/eathena/charserverhandler.cpp:531
+msgid "Character renamed."
+msgstr ""
+
+#. TRANSLATORS: char rename error
+#: src/net/eathena/charserverhandler.cpp:544
+msgid "Rename not allowed."
+msgstr ""
+
+#. TRANSLATORS: char rename error
+#: src/net/eathena/charserverhandler.cpp:548
+msgid "New name is not set."
+msgstr ""
+
+#. TRANSLATORS: char rename error
+#: src/net/eathena/charserverhandler.cpp:557
+msgid "Character not found."
+msgstr ""
+
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:125
+#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:124
#, c-format
msgid "Strength %s"
msgstr "Strength %s"
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:127
+#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:126
#, c-format
msgid "Agility %s"
msgstr "Agility %s"
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:129
+#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:128
#, c-format
msgid "Vitality %s"
msgstr "Vitality %s"
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:131
+#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:130
#, c-format
msgid "Intelligence %s"
msgstr "Intelligence %s"
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:128 src/net/tmwa/generalhandler.cpp:133
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:132
#, c-format
msgid "Dexterity %s"
msgstr "Dexterity %s"
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:135
+#: src/net/eathena/generalhandler.cpp:128 src/net/tmwa/generalhandler.cpp:134
#, c-format
msgid "Luck %s"
msgstr "Luck %s"
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:152 src/net/tmwa/generalhandler.cpp:161
+#: src/net/eathena/generalhandler.cpp:159 src/net/tmwa/generalhandler.cpp:160
msgid "Authentication failed."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:155 src/net/tmwa/generalhandler.cpp:165
+#: src/net/eathena/generalhandler.cpp:162 src/net/tmwa/generalhandler.cpp:164
msgid "No servers available."
msgstr "Inga servrar tillgängliga."
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:160 src/net/tmwa/generalhandler.cpp:171
+#: src/net/eathena/generalhandler.cpp:167 src/net/tmwa/generalhandler.cpp:170
msgid "Someone else is trying to use this account."
msgstr "Någon annan försöker använda detta konto."
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:165 src/net/tmwa/generalhandler.cpp:177
+#: src/net/eathena/generalhandler.cpp:172 src/net/tmwa/generalhandler.cpp:176
msgid "This account is already logged in."
msgstr "Detta konto är redan inloggat."
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:169 src/net/tmwa/generalhandler.cpp:182
+#: src/net/eathena/generalhandler.cpp:176 src/net/tmwa/generalhandler.cpp:181
msgid "Speed hack detected."
msgstr "Speed hack upptäckt."
+#: src/net/eathena/generalhandler.cpp:179
+msgid "Server full."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:182
+msgid "Sorry, you are underaged."
+msgstr ""
+
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:172 src/net/tmwa/generalhandler.cpp:186
+#: src/net/eathena/generalhandler.cpp:185 src/net/tmwa/generalhandler.cpp:185
msgid "Duplicated login."
msgstr "Duplicerad Inloggning."
+#: src/net/eathena/generalhandler.cpp:188
+msgid "To many connections from same ip."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:191
+msgid "Not paid for this time."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:194
+msgid "Pay suspended."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:197
+msgid "Pay changed."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:200
+msgid "Pay wrong ip."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:203
+msgid "Pay game room."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:206
+msgid "Disconnect forced by GM."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:210
+msgid "Ban japan refuse."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:213
+msgid "Remained other account."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:216
+msgid "Ip unfair."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:219
+msgid "Ip count all."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:222
+msgid "Ip count."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:226
+msgid "Memory."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:229
+msgid "Han valid."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:232
+msgid "Ip limited access."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:235
+msgid "Over characters list."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:238
+msgid "Ip blocked."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:241
+msgid "Invalid password count."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:244
+msgid "Not allowed race."
+msgstr ""
+
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:175 src/net/tmwa/generalhandler.cpp:190
+#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:189
msgid "Unknown connection error."
msgstr "Okänt anslutningsfel."
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:280
+#: src/net/eathena/generalhandler.cpp:323 src/net/tmwa/generalhandler.cpp:279
msgid "Got disconnected from server!"
msgstr "Du blev frånkopplad från servern!"
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:282 src/net/tmwa/generalhandler.cpp:308
+#: src/net/eathena/generalhandler.cpp:348 src/net/tmwa/generalhandler.cpp:307
msgid "Strength"
msgstr "Strength"
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:310
+#: src/net/eathena/generalhandler.cpp:349 src/net/tmwa/generalhandler.cpp:309
msgid "Agility"
msgstr "Agility"
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:284 src/net/tmwa/generalhandler.cpp:312
+#: src/net/eathena/generalhandler.cpp:350 src/net/tmwa/generalhandler.cpp:311
msgid "Vitality"
msgstr "Vitality"
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:285 src/net/tmwa/generalhandler.cpp:314
+#: src/net/eathena/generalhandler.cpp:352 src/net/tmwa/generalhandler.cpp:314
msgid "Intelligence"
msgstr "Intelligence"
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:286 src/net/tmwa/generalhandler.cpp:316
+#: src/net/eathena/generalhandler.cpp:353 src/net/tmwa/generalhandler.cpp:316
msgid "Dexterity"
msgstr "Dexterity"
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:287 src/net/tmwa/generalhandler.cpp:318
+#: src/net/eathena/generalhandler.cpp:354 src/net/tmwa/generalhandler.cpp:318
msgid "Luck"
msgstr "Luck"
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:290 src/net/tmwa/generalhandler.cpp:323
+#: src/net/eathena/generalhandler.cpp:357 src/net/tmwa/generalhandler.cpp:322
msgid "Defense"
msgstr "Defense"
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:291 src/net/tmwa/generalhandler.cpp:325
+#: src/net/eathena/generalhandler.cpp:358 src/net/tmwa/generalhandler.cpp:324
msgid "M.Attack"
msgstr "M.Attack"
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:292 src/net/tmwa/generalhandler.cpp:327
+#: src/net/eathena/generalhandler.cpp:359 src/net/tmwa/generalhandler.cpp:326
msgid "M.Defense"
msgstr "M.Defense"
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:294 src/net/tmwa/generalhandler.cpp:330
+#: src/net/eathena/generalhandler.cpp:361 src/net/tmwa/generalhandler.cpp:329
#, no-c-format
msgid "% Accuracy"
msgstr "% Accuracy"
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:296 src/net/tmwa/generalhandler.cpp:333
+#: src/net/eathena/generalhandler.cpp:363 src/net/tmwa/generalhandler.cpp:332
#, no-c-format
msgid "% Evade"
msgstr "% Evade"
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:298 src/net/tmwa/generalhandler.cpp:336
+#: src/net/eathena/generalhandler.cpp:365 src/net/tmwa/generalhandler.cpp:335
#, no-c-format
msgid "% Critical"
msgstr "% Critical Hit"
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:299 src/net/tmwa/generalhandler.cpp:338
+#: src/net/eathena/generalhandler.cpp:366 src/net/tmwa/generalhandler.cpp:337
msgid "Attack Delay"
msgstr "Attack Delay"
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:300 src/net/tmwa/generalhandler.cpp:340
+#: src/net/eathena/generalhandler.cpp:367 src/net/tmwa/generalhandler.cpp:339
msgid "Walk Delay"
msgstr "Walk Delay"
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:301 src/net/tmwa/generalhandler.cpp:342
+#: src/net/eathena/generalhandler.cpp:368 src/net/tmwa/generalhandler.cpp:341
msgid "Attack Range"
msgstr "Attack Range"
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:302 src/net/tmwa/generalhandler.cpp:344
+#: src/net/eathena/generalhandler.cpp:369 src/net/tmwa/generalhandler.cpp:343
msgid "Damage per sec."
msgstr "Damage per sec."
-#: src/net/eathena/skillhandler.cpp:228 src/net/eathena/skillhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:370
+msgid "Karma"
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:371
+msgid "Manner"
+msgstr ""
+
+#: src/net/eathena/skillhandler.cpp:304 src/net/eathena/skillhandler.cpp:364
#, c-format
msgid "Unknown skill error: %d"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:235 src/net/tmwa/skillhandler.cpp:224
+#: src/net/eathena/skillhandler.cpp:311 src/net/tmwa/skillhandler.cpp:224
msgid "You have not yet reached a high enough lvl!"
msgstr "Du har ännu inte nått required lvl!"
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:239 src/net/tmwa/skillhandler.cpp:228
+#: src/net/eathena/skillhandler.cpp:315 src/net/tmwa/skillhandler.cpp:228
msgid "Insufficient HP!"
msgstr "Otillräckligt HP!"
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:243 src/net/tmwa/skillhandler.cpp:232
+#: src/net/eathena/skillhandler.cpp:319 src/net/tmwa/skillhandler.cpp:232
msgid "Insufficient SP!"
msgstr "Otillräckligt SP!"
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:247 src/net/tmwa/skillhandler.cpp:236
+#: src/net/eathena/skillhandler.cpp:323 src/net/tmwa/skillhandler.cpp:236
msgid "You have no memos!"
msgstr "Du har inga memos!"
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:251 src/net/tmwa/skillhandler.cpp:240
+#: src/net/eathena/skillhandler.cpp:327 src/net/tmwa/skillhandler.cpp:240
msgid "You cannot do that right now!"
msgstr "Du kan inte göra det just nu!"
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:255 src/net/tmwa/skillhandler.cpp:244
+#: src/net/eathena/skillhandler.cpp:331 src/net/tmwa/skillhandler.cpp:244
msgid "Seems you need more money... ;-)"
msgstr "Verkar som att du behöver mer money... ;-)"
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:259 src/net/tmwa/skillhandler.cpp:248
+#: src/net/eathena/skillhandler.cpp:335 src/net/tmwa/skillhandler.cpp:248
msgid "You cannot use this skill with that kind of weapon!"
msgstr "Du kan inte använda denna skill med det vapnet!"
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:264 src/net/tmwa/skillhandler.cpp:253
+#: src/net/eathena/skillhandler.cpp:340 src/net/tmwa/skillhandler.cpp:253
msgid "You need another red gem!"
msgstr "Du behöver en till röd gem!"
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:268 src/net/tmwa/skillhandler.cpp:257
+#: src/net/eathena/skillhandler.cpp:344 src/net/tmwa/skillhandler.cpp:257
msgid "You need another blue gem!"
msgstr "Du behöver en till blå gem!"
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:272 src/net/tmwa/skillhandler.cpp:261
+#: src/net/eathena/skillhandler.cpp:348 src/net/tmwa/skillhandler.cpp:261
msgid "You're carrying to much to do this!"
msgstr "Du bär för mycket för att kunna göra detta!"
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:276 src/net/tmwa/skillhandler.cpp:265
+#: src/net/eathena/skillhandler.cpp:352 src/net/tmwa/skillhandler.cpp:265
msgid "Huh? What's that?"
msgstr "Huh? Vad är det?"
@@ -7869,32 +8021,32 @@ msgid "%s wants to trade with you, do you accept?"
msgstr "%s vill trade:a med dig, accepterar du?"
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:349
+#: src/net/tmwa/charserverhandler.cpp:351
msgid "Strength:"
msgstr "Strength:"
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:351
+#: src/net/tmwa/charserverhandler.cpp:353
msgid "Agility:"
msgstr "Agility:"
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:353
+#: src/net/tmwa/charserverhandler.cpp:355
msgid "Vitality:"
msgstr "Vitality:"
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:355
+#: src/net/tmwa/charserverhandler.cpp:357
msgid "Intelligence:"
msgstr "Intelligence:"
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:357
+#: src/net/tmwa/charserverhandler.cpp:359
msgid "Dexterity:"
msgstr "Dexterity:"
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:359
+#: src/net/tmwa/charserverhandler.cpp:361
msgid "Luck:"
msgstr "Luck:"
@@ -8205,269 +8357,306 @@ msgstr "Du har lämnat partyt."
#. TRANSLATORS: notification message
#: src/resources/notifications.h:143
+msgid "You cant left party on this map."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:147
+msgid "You was kicked from party."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:151
+msgid "You cant be kicked kicked from party on this map."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:155
#, c-format
msgid "%s has joined your party."
msgstr "%s har joinat ditt party."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:147
+#: src/resources/notifications.h:159
#, c-format
msgid "%s is already a member of a party."
msgstr "%s är redan med i ett party."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:151
+#: src/resources/notifications.h:163
#, c-format
msgid "%s refused your invitation."
msgstr "%s avslog din inbjudan."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:155
+#: src/resources/notifications.h:167
#, c-format
msgid "%s is now a member of your party."
msgstr "%s är nu med i ditt party."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:159
+#: src/resources/notifications.h:171
#, c-format
msgid "%s can't join your party because party is full."
msgstr "%s kan inte joina ditt party eftersom partyt är fullt."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:163
+#: src/resources/notifications.h:175
#, c-format
msgid "QQQ Unknown invite response for %s."
msgstr "QQQ Okänd inbjudnings-respons för %s."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:191
+#: src/resources/notifications.h:203
#, c-format
msgid "%s has left your party."
msgstr "%s har lämnat partyt."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:195
+#: src/resources/notifications.h:207 src/resources/notifications.h:215
+#, c-format
+msgid "%s cant be kicked from party on this map."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:211
+#, c-format
+msgid "%s has kicked from your party."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:219
#, c-format
msgid "An unknown member tried to say: %s"
msgstr "En okänd medlem försökte säga: %s"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:199
+#: src/resources/notifications.h:223
#, c-format
msgid "%s is not in your party!"
msgstr "%s är inte i ditt party!"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:203
+#: src/resources/notifications.h:227
#, c-format
msgid "You picked up %s."
msgstr "Du plockade upp %s."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:207
+#: src/resources/notifications.h:231
#, c-format
msgid "You spent %s."
msgstr "Du spänderade %s."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:211
+#: src/resources/notifications.h:235
msgid "Cannot raise skill!"
msgstr "Kan inte höja skillen!"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:215
+#: src/resources/notifications.h:239
msgid "Equip ammunition first."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:219
+#: src/resources/notifications.h:243
#, c-format
msgid "Trading with %s isn't possible. Trade partner is too far away."
msgstr "Trading med %s är inte möjligt. Trade-partnern är för långt bort."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:224
+#: src/resources/notifications.h:248
#, c-format
msgid "Trading with %s isn't possible. Character doesn't exist."
msgstr "Trading med %s är inte möjligt. Karaktären existerar inte."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:228
+#: src/resources/notifications.h:252
msgid "Trade cancelled due to an unknown reason."
msgstr "Trade avbruten av en okänd anledning."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:232
+#: src/resources/notifications.h:256
#, c-format
msgid "Trade with %s cancelled."
msgstr "Trade med %s avbruten."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:236
+#: src/resources/notifications.h:260
#, c-format
msgid "Unhandled trade cancel packet with %s"
msgstr "Ohanterat avbrytspaket för trade med %s"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:240
+#: src/resources/notifications.h:264
msgid "Failed adding item. Trade partner is over weighted."
msgstr "Misslyckades lägga till item. Trade-partnern är överviktig."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:244
+#: src/resources/notifications.h:268
msgid "Failed adding item. Trade partner has no free slot."
msgstr "Misslyckades lägga till item. Trade-partnern har ingen ledig slot."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:248
+#: src/resources/notifications.h:272
msgid "Failed adding item. You can't trade this item."
msgstr "Misslyckades lägga till item. Du kan inte tradea denna item."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:252
+#: src/resources/notifications.h:276
msgid "Failed adding item for unknown reason."
msgstr "Misslyckades lägga till item. Orsak okänd."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:256
+#: src/resources/notifications.h:280
msgid "Trade canceled."
msgstr "Trade avbruten."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:260
+#: src/resources/notifications.h:284
msgid "Trade completed."
msgstr "Trade färdig."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:264
+#: src/resources/notifications.h:288
msgid "Kick failed!"
msgstr "Kick misslyckad!"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:268
+#: src/resources/notifications.h:292
msgid "Kick succeeded!"
msgstr "Kick lyckad!"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:272
+#: src/resources/notifications.h:296
#, c-format
msgid "MVP player: %s"
msgstr "MVP-spelare: %s"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:276
+#: src/resources/notifications.h:300
msgid "All whispers ignored."
msgstr "Alla viskningar ignoreras."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:280
+#: src/resources/notifications.h:304
msgid "All whispers ignore failed."
msgstr "Allt ignorerande av viskningar misslyckades."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:284
+#: src/resources/notifications.h:308
msgid "All whispers unignored."
msgstr "Alla viskningar är välkomna."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:288
+#: src/resources/notifications.h:312
msgid "All whispers unignore failed."
msgstr "Välkomnandet av alla viskningar misslyckades."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:295
+#: src/resources/notifications.h:319
msgid "pvp off, gvg off"
msgstr "pvp av, gvg av"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:299
+#: src/resources/notifications.h:323
msgid "pvp on"
msgstr "pvp på"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:303
+#: src/resources/notifications.h:327
msgid "gvg on"
msgstr "gvg på"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:307
+#: src/resources/notifications.h:331
msgid "pvp on, gvg on"
msgstr "pvp på, gvg på"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:311
+#: src/resources/notifications.h:335
msgid "unknown pvp"
msgstr "okänd pvp"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:315
+#: src/resources/notifications.h:339
#, c-format
msgid "Char from account %s is already in your party!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:319
+#: src/resources/notifications.h:343
#, c-format
msgid "%s blocked invite!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:323
+#: src/resources/notifications.h:347
msgid "Char is not online!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:327
+#: src/resources/notifications.h:351
msgid "Pet catch failed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:331
+#: src/resources/notifications.h:355
msgid "Pet catched."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:335
+#: src/resources/notifications.h:359
#, c-format
msgid "Pet catch unkown error: %d."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:339
+#: src/resources/notifications.h:363
msgid "Your mercenary duty hour is over."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:343
+#: src/resources/notifications.h:367
msgid "Your mercenary was killed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:347
+#: src/resources/notifications.h:371
msgid "Your mercenary was fired."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:351
+#: src/resources/notifications.h:375
msgid "Your mercenary run away."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:355
+#: src/resources/notifications.h:379
msgid "Mercenary unknown state."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:359
-msgid "Your feed your homunculus."
+#: src/resources/notifications.h:383
+msgid "You feed your homunculus."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:363
+#: src/resources/notifications.h:387
#, c-format
msgid "You cant feed homunculus, because not have %s."
msgstr ""
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:391
+msgid "Card insert failed."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:395
+msgid "Card inserted."
+msgstr ""
+
#. TRANSLATORS: chat option changed message
#: src/utils/booleanoptions.h:27
#, c-format
diff --git a/po/sv_SE.po b/po/sv_SE.po
index f18d2c400..90780d536 100644
--- a/po/sv_SE.po
+++ b/po/sv_SE.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-10-08 01:19+0300\n"
-"PO-Revision-Date: 2014-09-28 10:01+0000\n"
+"POT-Creation-Date: 2014-10-10 00:16+0300\n"
+"PO-Revision-Date: 2014-10-08 10:02+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Swedish (Sweden) (http://www.transifex.com/projects/p/"
"manaplus/language/sv_SE/)\n"
@@ -5173,15 +5173,13 @@ msgstr "Konto %s (senaste inloggning var %s)"
#. TRANSLATORS: char select dialog. button.
#: src/gui/windows/charselectdialog.cpp:73
-#, fuzzy
msgid "Switch"
-msgstr "Ändra inloggad"
+msgstr ""
#. TRANSLATORS: char select dialog. button.
#: src/gui/windows/charselectdialog.cpp:75
-#, fuzzy
msgid "Password"
-msgstr "Lösenord:"
+msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: updater window button
@@ -5225,9 +5223,8 @@ msgid "Please set new pincode"
msgstr ""
#: src/gui/windows/charselectdialog.cpp:240
-#, fuzzy
msgid "Please enter new name"
-msgstr "Var vänlig specificera ett namn."
+msgstr ""
#. TRANSLATORS: char select dialog. player info message.
#: src/gui/windows/charselectdialog.cpp:259
@@ -5885,7 +5882,7 @@ msgstr "Visa länkar i annonseringen"
#. TRANSLATORS: shop window dialog
#. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:776 src/net/ea/tradehandler.cpp:233
+#: src/gui/windows/shopwindow.cpp:776 src/net/ea/tradehandler.cpp:192
msgid "Request for Trade"
msgstr "Efterfråga Trade"
@@ -7542,19 +7539,19 @@ msgstr "Guild slott: %s"
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:191
+#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:207
msgid "Item sharing enabled."
msgstr "Item-delning aktiverad."
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:195
+#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:211
msgid "Item sharing disabled."
msgstr "Item-delning avaktiverad."
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:199
+#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:215
msgid "Item sharing not possible."
msgstr "Item-delning är inte möjlig."
@@ -7565,19 +7562,19 @@ msgstr "Item-delning okänd."
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:179
+#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:195
msgid "Experience sharing enabled."
msgstr "Exp-delning är aktiverad."
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:183
+#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:199
msgid "Experience sharing disabled."
msgstr "Exp-delning avaktiverad."
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:187
+#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:203
msgid "Experience sharing not possible."
msgstr "Exp-delning är inte möjlig."
@@ -7704,14 +7701,12 @@ msgstr "Du bär på mindre än hälften av din vikt. Du kan återfå health."
#. TRANSLATORS: char rename error
#: src/net/eathena/charserverhandler.cpp:516
#: src/net/eathena/charserverhandler.cpp:553
-#, fuzzy
msgid "Character rename error."
-msgstr "Karaktär raderad."
+msgstr ""
#: src/net/eathena/charserverhandler.cpp:531
-#, fuzzy
msgid "Character renamed."
-msgstr "Karaktär raderad."
+msgstr ""
#. TRANSLATORS: char rename error
#: src/net/eathena/charserverhandler.cpp:544
@@ -7725,9 +7720,8 @@ msgstr ""
#. TRANSLATORS: char rename error
#: src/net/eathena/charserverhandler.cpp:557
-#, fuzzy
msgid "Character not found."
-msgstr "Karaktär-points: %d"
+msgstr ""
#. TRANSLATORS: player stat
#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:124
@@ -7791,9 +7785,8 @@ msgid "Speed hack detected."
msgstr "Speed hack upptäckt."
#: src/net/eathena/generalhandler.cpp:179
-#, fuzzy
msgid "Server full."
-msgstr "Server:"
+msgstr ""
#: src/net/eathena/generalhandler.cpp:182
msgid "Sorry, you are underaged."
@@ -7865,18 +7858,16 @@ msgid "Ip limited access."
msgstr ""
#: src/net/eathena/generalhandler.cpp:235
-#, fuzzy
msgid "Over characters list."
-msgstr "Karaktär raderad."
+msgstr ""
#: src/net/eathena/generalhandler.cpp:238
msgid "Ip blocked."
msgstr ""
#: src/net/eathena/generalhandler.cpp:241
-#, fuzzy
msgid "Invalid password count."
-msgstr "Gamla lösenordet är felaktigt."
+msgstr ""
#: src/net/eathena/generalhandler.cpp:244
msgid "Not allowed race."
@@ -8043,13 +8034,13 @@ msgid "Huh? What's that?"
msgstr "Huh? Vad är det?"
#. TRANSLATORS: trade header
-#: src/net/ea/tradehandler.cpp:100
+#: src/net/ea/tradehandler.cpp:105
#, c-format
msgid "Trade: You and %s"
msgstr "Trade: Du och %s"
#. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:235
+#: src/net/ea/tradehandler.cpp:194
#, c-format
msgid "%s wants to trade with you, do you accept?"
msgstr "%s vill trade:a med dig, accepterar du?"
@@ -8268,429 +8259,453 @@ msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:47
+#, fuzzy
+msgid "Unable to buy. You not have enought money."
+msgstr "Du har inte tillräckligt med pengar."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:51
+msgid "Unable to buy. You overweight."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:55
+msgid "Unable to buy. You have too many items."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:59
msgid "Nothing to sell."
msgstr "Inget att sälja."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:51
+#: src/resources/notifications.h:63
msgid "Thanks for selling."
msgstr "Tack för köpet."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:55
+#: src/resources/notifications.h:67
msgid "Unable to sell."
msgstr "Går inte att sälja."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:59
+#: src/resources/notifications.h:71
msgid "Unable to sell while trading."
msgstr "Det går inte sälja under trading."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:63
+#: src/resources/notifications.h:75
msgid "Unable to sell unsellable item."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:67
+#: src/resources/notifications.h:79
#, c-format
msgid "Online users: %d"
msgstr "Användare online: %d"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:71
+#: src/resources/notifications.h:83
msgid "Guild created."
msgstr "Guild skapad."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:75
+#: src/resources/notifications.h:87
msgid "You are already in guild."
msgstr "Du är redan i en guild."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:79
+#: src/resources/notifications.h:91
msgid "Emperium check failed."
msgstr "Emperium check misslyckades."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:83
+#: src/resources/notifications.h:95
msgid "Unknown server response."
msgstr "Okänd server-respons."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:87
+#: src/resources/notifications.h:99
msgid "You have left the guild."
msgstr "Du har lämnat guilden."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:91
+#: src/resources/notifications.h:103
msgid "Could not invite user to guild."
msgstr "Kunde inte bjuda in användare till guilden."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:95
+#: src/resources/notifications.h:107
msgid "User rejected guild invite."
msgstr "Användaren avvisade guild-förfrågan."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:99
+#: src/resources/notifications.h:111
msgid "User is now part of your guild."
msgstr "Användaren tillhör nu din guild."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:103
+#: src/resources/notifications.h:115
msgid "Your guild is full."
msgstr "Din guild är full."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:107
+#: src/resources/notifications.h:119
msgid "Unknown guild invite response."
msgstr "Okänd respons för guild-förfrågan."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:111
+#: src/resources/notifications.h:123
#, c-format
msgid "%s has left your guild."
msgstr "%s har lämnat din guild."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:115
+#: src/resources/notifications.h:127
msgid "You were kicked from guild."
msgstr "Du blev visst kickad från guilden."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:119
+#: src/resources/notifications.h:131
#, c-format
msgid "%s has kicked from your guild."
msgstr "%s har blivit kickad ur guilden."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:123
+#: src/resources/notifications.h:135
msgid "Failed to use item."
msgstr "Misslyckades att använda item."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:127
+#: src/resources/notifications.h:139
msgid "Unable to equip."
msgstr "Går inte att equipa."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:131
+#: src/resources/notifications.h:143
+msgid "Unable to equip because you have wrong level."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:147
msgid "Could not create party."
msgstr "Kunde inte skapa party."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:135
+#: src/resources/notifications.h:151
msgid "Party successfully created."
msgstr "Partyt skapades utan problem."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:139
+#: src/resources/notifications.h:155
msgid "You have left the party."
msgstr "Du har lämnat partyt."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:143
-#, fuzzy
+#: src/resources/notifications.h:159
msgid "You cant left party on this map."
-msgstr "Du har lämnat partyt."
+msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:147
-#, fuzzy
+#: src/resources/notifications.h:163
msgid "You was kicked from party."
-msgstr "Du blev visst kickad från guilden."
+msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:151
-msgid "You cant be kicked kicked from party on this map."
+#: src/resources/notifications.h:167
+msgid "You cant be kicked from party on this map."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:155
+#: src/resources/notifications.h:171
#, c-format
msgid "%s has joined your party."
msgstr "%s har joinat ditt party."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:159
+#: src/resources/notifications.h:175
#, c-format
msgid "%s is already a member of a party."
msgstr "%s är redan med i ett party."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:163
+#: src/resources/notifications.h:179
#, c-format
msgid "%s refused your invitation."
msgstr "%s avslog din inbjudan."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:167
+#: src/resources/notifications.h:183
#, c-format
msgid "%s is now a member of your party."
msgstr "%s är nu med i ditt party."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:171
+#: src/resources/notifications.h:187
#, c-format
msgid "%s can't join your party because party is full."
msgstr "%s kan inte joina ditt party eftersom partyt är fullt."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:175
+#: src/resources/notifications.h:191
#, c-format
msgid "QQQ Unknown invite response for %s."
msgstr "QQQ Okänd inbjudnings-respons för %s."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:203
+#: src/resources/notifications.h:219
#, c-format
msgid "%s has left your party."
msgstr "%s har lämnat partyt."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:207 src/resources/notifications.h:215
-#, fuzzy, c-format
+#: src/resources/notifications.h:223 src/resources/notifications.h:231
+#, c-format
msgid "%s cant be kicked from party on this map."
-msgstr "%s har blivit kickad ur guilden."
+msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:211
-#, fuzzy, c-format
+#: src/resources/notifications.h:227
+#, c-format
msgid "%s has kicked from your party."
-msgstr "%s har blivit kickad ur guilden."
+msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:219
+#: src/resources/notifications.h:235
#, c-format
msgid "An unknown member tried to say: %s"
msgstr "En okänd medlem försökte säga: %s"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:223
+#: src/resources/notifications.h:239
#, c-format
msgid "%s is not in your party!"
msgstr "%s är inte i ditt party!"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:227
+#: src/resources/notifications.h:243
#, c-format
msgid "You picked up %s."
msgstr "Du plockade upp %s."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:231
+#: src/resources/notifications.h:247
#, c-format
msgid "You spent %s."
msgstr "Du spänderade %s."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:235
+#: src/resources/notifications.h:251
msgid "Cannot raise skill!"
msgstr "Kan inte höja skillen!"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:239
+#: src/resources/notifications.h:255
msgid "Equip ammunition first."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:243
+#: src/resources/notifications.h:259
#, c-format
msgid "Trading with %s isn't possible. Trade partner is too far away."
msgstr "Trading med %s är inte möjligt. Trade-partnern är för långt bort."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:248
+#: src/resources/notifications.h:264
#, c-format
msgid "Trading with %s isn't possible. Character doesn't exist."
msgstr "Trading med %s är inte möjligt. Karaktären existerar inte."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:252
+#: src/resources/notifications.h:268
msgid "Trade cancelled due to an unknown reason."
msgstr "Trade avbruten av en okänd anledning."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:256
+#: src/resources/notifications.h:272
#, c-format
msgid "Trade with %s cancelled."
msgstr "Trade med %s avbruten."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:260
+#: src/resources/notifications.h:276
+#, fuzzy, c-format
+msgid "Trade with %s cancelled, because player is busy"
+msgstr "Trade med %s avbruten."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:280
#, c-format
msgid "Unhandled trade cancel packet with %s"
msgstr "Ohanterat avbrytspaket för trade med %s"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:264
+#: src/resources/notifications.h:284
msgid "Failed adding item. Trade partner is over weighted."
msgstr "Misslyckades lägga till item. Trade-partnern är överviktig."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:268
+#: src/resources/notifications.h:288
msgid "Failed adding item. Trade partner has no free slot."
msgstr "Misslyckades lägga till item. Trade-partnern har ingen ledig slot."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:272
+#: src/resources/notifications.h:292
msgid "Failed adding item. You can't trade this item."
msgstr "Misslyckades lägga till item. Du kan inte tradea denna item."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:276
+#: src/resources/notifications.h:296
msgid "Failed adding item for unknown reason."
msgstr "Misslyckades lägga till item. Orsak okänd."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:280
+#: src/resources/notifications.h:300
msgid "Trade canceled."
msgstr "Trade avbruten."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:284
+#: src/resources/notifications.h:304
msgid "Trade completed."
msgstr "Trade färdig."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:288
+#: src/resources/notifications.h:308
msgid "Kick failed!"
msgstr "Kick misslyckad!"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:292
+#: src/resources/notifications.h:312
msgid "Kick succeeded!"
msgstr "Kick lyckad!"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:296
+#: src/resources/notifications.h:316
#, c-format
msgid "MVP player: %s"
msgstr "MVP-spelare: %s"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:300
+#: src/resources/notifications.h:320
msgid "All whispers ignored."
msgstr "Alla viskningar ignoreras."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:304
+#: src/resources/notifications.h:324
msgid "All whispers ignore failed."
msgstr "Allt ignorerande av viskningar misslyckades."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:308
+#: src/resources/notifications.h:328
msgid "All whispers unignored."
msgstr "Alla viskningar är välkomna."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:312
+#: src/resources/notifications.h:332
msgid "All whispers unignore failed."
msgstr "Välkomnandet av alla viskningar misslyckades."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:319
+#: src/resources/notifications.h:339
msgid "pvp off, gvg off"
msgstr "pvp av, gvg av"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:323
+#: src/resources/notifications.h:343
msgid "pvp on"
msgstr "pvp på"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:327
+#: src/resources/notifications.h:347
msgid "gvg on"
msgstr "gvg på"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:331
+#: src/resources/notifications.h:351
msgid "pvp on, gvg on"
msgstr "pvp på, gvg på"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:335
+#: src/resources/notifications.h:355
msgid "unknown pvp"
msgstr "okänd pvp"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:339
+#: src/resources/notifications.h:359
#, c-format
msgid "Char from account %s is already in your party!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:343
+#: src/resources/notifications.h:363
#, c-format
msgid "%s blocked invite!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:347
+#: src/resources/notifications.h:367
msgid "Char is not online!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:351
+#: src/resources/notifications.h:371
msgid "Pet catch failed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:355
+#: src/resources/notifications.h:375
msgid "Pet catched."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:359
+#: src/resources/notifications.h:379
#, c-format
msgid "Pet catch unkown error: %d."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:363
+#: src/resources/notifications.h:383
msgid "Your mercenary duty hour is over."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:367
+#: src/resources/notifications.h:387
msgid "Your mercenary was killed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:371
+#: src/resources/notifications.h:391
msgid "Your mercenary was fired."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:375
+#: src/resources/notifications.h:395
msgid "Your mercenary run away."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:379
+#: src/resources/notifications.h:399
msgid "Mercenary unknown state."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:383
+#: src/resources/notifications.h:403
msgid "You feed your homunculus."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:387
+#: src/resources/notifications.h:407
#, c-format
msgid "You cant feed homunculus, because not have %s."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:391
-#, fuzzy
+#: src/resources/notifications.h:411
msgid "Card insert failed."
-msgstr "Trade misslyckades!"
+msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:395
+#: src/resources/notifications.h:415
msgid "Card inserted."
msgstr ""
@@ -8701,9 +8716,3 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
msgstr ""
"Valmöjligheter till /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", "
"\"0\"."
-
-#~ msgid "Enable auction bot support"
-#~ msgstr "Aktivera support för auktions-bot"
-
-#~ msgid "Auction"
-#~ msgstr "Auktion"
diff --git a/po/te.po b/po/te.po
index 93ced5138..421309b9b 100644
--- a/po/te.po
+++ b/po/te.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-27 13:23+0300\n"
-"PO-Revision-Date: 2014-09-28 10:01+0000\n"
+"POT-Creation-Date: 2014-10-08 01:19+0300\n"
+"PO-Revision-Date: 2014-10-08 10:01+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/manaplus/language/te/)\n"
"MIME-Version: 1.0\n"
@@ -32,7 +32,7 @@ msgstr ""
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:131 src/client.cpp:1463 src/client.cpp:1490
+#: src/actions/actions.cpp:131 src/client.cpp:1461 src/client.cpp:1488
#: src/gamemodifiers.cpp:423 src/gui/widgets/tabs/setup_input.cpp:163
#: src/gui/widgets/tabs/setup_theme.cpp:312
#: src/gui/widgets/tabs/setup_theme.cpp:343
@@ -43,8 +43,8 @@ msgstr ""
#: src/gui/windows/changeemaildialog.cpp:170
#: src/gui/windows/changepassworddialog.cpp:160
#: src/gui/windows/charcreatedialog.cpp:373
-#: src/gui/windows/charselectdialog.cpp:255
-#: src/gui/windows/charselectdialog.cpp:291 src/gui/windows/editdialog.cpp:49
+#: src/gui/windows/charselectdialog.cpp:277
+#: src/gui/windows/charselectdialog.cpp:313 src/gui/windows/editdialog.cpp:49
#: src/gui/windows/editserverdialog.cpp:61
#: src/gui/windows/editserverdialog.cpp:208
#: src/gui/windows/itemamountwindow.cpp:158 src/gui/windows/quitdialog.cpp:70
@@ -52,7 +52,9 @@ msgstr ""
#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
#: src/net/ea/charserverhandler.cpp:143 src/net/ea/charserverhandler.cpp:162
#: src/net/ea/charserverhandler.cpp:175 src/net/ea/gamehandler.cpp:79
-#: src/net/ea/playerhandler.cpp:263 src/net/ea/playerhandler.cpp:279
+#: src/net/ea/playerhandler.cpp:424 src/net/ea/playerhandler.cpp:440
+#: src/net/eathena/charserverhandler.cpp:533
+#: src/net/eathena/charserverhandler.cpp:563
msgid "OK"
msgstr "సరే"
@@ -176,7 +178,7 @@ msgstr ""
#. TRANSLATORS: party invite message
#. TRANSLATORS: change relation
-#: src/actions/chat.cpp:303 src/actions/commands.cpp:65
+#: src/actions/chat.cpp:303 src/actions/commands.cpp:64
msgid "Please specify a name."
msgstr ""
@@ -199,75 +201,75 @@ msgid "Message now closes chat."
msgstr ""
#. TRANSLATORS: change relation
-#: src/actions/commands.cpp:108
+#: src/actions/commands.cpp:107
#, c-format
msgid "Player already %s!"
msgstr ""
#. TRANSLATORS: change relation
-#: src/actions/commands.cpp:120
+#: src/actions/commands.cpp:119
#, c-format
msgid "Player successfully %s!"
msgstr ""
#. TRANSLATORS: change relation
-#: src/actions/commands.cpp:122
+#: src/actions/commands.cpp:121
#, c-format
msgid "Player could not be %s!"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:153
+#: src/actions/commands.cpp:152
msgid "Player wasn't ignored!"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:162
+#: src/actions/commands.cpp:161
msgid "Player no longer ignored!"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:164
+#: src/actions/commands.cpp:163
msgid "Player could not be unignored!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/actions/commands.cpp:179
+#: src/actions/commands.cpp:178
msgid "Player already erased!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/actions/commands.cpp:192
+#: src/actions/commands.cpp:191
msgid "Player no longer erased!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/actions/commands.cpp:194
+#: src/actions/commands.cpp:193
msgid "Player could not be erased!"
msgstr ""
#. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:201
+#: src/actions/commands.cpp:200
msgid "friend"
msgstr ""
#. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:208
+#: src/actions/commands.cpp:207
msgid "disregarded"
msgstr ""
#. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:215
+#: src/actions/commands.cpp:214
msgid "neutral"
msgstr ""
#. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:222
+#: src/actions/commands.cpp:221
msgid "blacklisted"
msgstr ""
#. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:229
+#: src/actions/commands.cpp:228
msgid "enemy"
msgstr ""
@@ -282,77 +284,77 @@ msgid "Accepting incoming trade requests"
msgstr ""
#. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1306
+#: src/actormanager.cpp:1310
msgid "Visible on map"
msgstr ""
#. TRANSLATORS: default race name
-#: src/being/being.cpp:389
+#: src/being/being.cpp:393
msgid "Human"
msgstr ""
-#: src/being/being.cpp:556
+#: src/being/being.cpp:560
msgid "dodge"
msgstr ""
-#: src/being/being.cpp:556
+#: src/being/being.cpp:560
msgid "miss"
msgstr ""
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1865 src/gui/windows/whoisonline.cpp:855
+#: src/being/being.cpp:1869 src/gui/windows/whoisonline.cpp:855
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1870 src/gui/windows/whoisonline.cpp:860
+#: src/being/being.cpp:1874 src/gui/windows/whoisonline.cpp:860
msgid "I"
msgstr ""
#. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:379
+#: src/being/localplayer.cpp:380
#, c-format
msgid "You were killed by %s"
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:824
+#: src/being/localplayer.cpp:825
msgid "Tried to pick up nonexistent item."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:828
+#: src/being/localplayer.cpp:829
msgid "Item is too heavy."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:832
+#: src/being/localplayer.cpp:833
msgid "Item is too far away."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:836
+#: src/being/localplayer.cpp:837
msgid "Inventory is full."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:840
+#: src/being/localplayer.cpp:841
msgid "Stack is too big."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:844
+#: src/being/localplayer.cpp:845
msgid "Item belongs to someone else."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:848
+#: src/being/localplayer.cpp:849
msgid "Unknown problem picking up item."
msgstr ""
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:872
+#: src/being/localplayer.cpp:873
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -361,43 +363,43 @@ msgstr[1] ""
#. TRANSLATORS: this is normal experience
#. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1054 src/being/localplayer.cpp:1055
-#: src/being/localplayer.cpp:1091
+#: src/being/localplayer.cpp:1055 src/being/localplayer.cpp:1056
+#: src/being/localplayer.cpp:1092
msgid "xp"
msgstr ""
#. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1059 src/being/localplayer.cpp:1065
-#: src/being/localplayer.cpp:1071
+#: src/being/localplayer.cpp:1060 src/being/localplayer.cpp:1066
+#: src/being/localplayer.cpp:1072
msgid "job"
msgstr ""
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2794
+#: src/being/localplayer.cpp:2795
#, c-format
msgid "Follow: %s"
msgstr ""
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2800 src/being/localplayer.cpp:2825
+#: src/being/localplayer.cpp:2801 src/being/localplayer.cpp:2826
msgid "Follow canceled"
msgstr ""
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2810
+#: src/being/localplayer.cpp:2811
#, c-format
msgid "Imitation: %s"
msgstr ""
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2816 src/being/localplayer.cpp:2830
+#: src/being/localplayer.cpp:2817 src/being/localplayer.cpp:2831
msgid "Imitation canceled"
msgstr ""
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3180
+#: src/being/localplayer.cpp:3181
#, c-format
msgid "You see %s"
msgstr ""
@@ -435,37 +437,37 @@ msgstr ""
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:920 src/gui/windowmenu.cpp:162
+#: src/client.cpp:918 src/gui/windowmenu.cpp:162
#: src/gui/windows/setupwindow.cpp:62
msgid "Setup"
msgstr ""
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:923 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:921 src/gui/widgets/tabs/setup_perfomance.cpp:54
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:926 src/gui/widgets/tabs/setup_video.cpp:105
+#: src/client.cpp:924 src/gui/widgets/tabs/setup_video.cpp:105
msgid "Video"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:929 src/gui/widgets/tabs/setup_theme.cpp:122
+#: src/client.cpp:927 src/gui/widgets/tabs/setup_theme.cpp:122
msgid "Theme"
msgstr ""
#. TRANSLATORS: theme tab quick button
-#: src/client.cpp:932
+#: src/client.cpp:930
msgid "About"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:935 src/gui/windowmenu.cpp:74
+#: src/client.cpp:933 src/gui/windowmenu.cpp:74
#: src/gui/windows/helpwindow.cpp:53
msgid "Help"
msgstr "సహాయం"
@@ -481,42 +483,42 @@ msgstr "సహాయం"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:939 src/client.cpp:1391 src/client.cpp:1405
+#: src/client.cpp:937 src/client.cpp:1389 src/client.cpp:1403
#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:691
#: src/gui/popups/popupmenu.cpp:923 src/gui/windows/didyouknowwindow.cpp:81
#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:74
#: src/gui/windows/npcdialog.cpp:112 src/gui/windows/questswindow.cpp:77
-#: src/gui/windows/shopwindow.cpp:84
+#: src/gui/windows/shopwindow.cpp:83
msgid "Close"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1065
+#: src/client.cpp:1063
msgid "Connecting to server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1113
+#: src/client.cpp:1111
msgid "Logging in"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1156
+#: src/client.cpp:1154
msgid "Entering game world"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1282
+#: src/client.cpp:1280
msgid "Requesting characters"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1322
+#: src/client.cpp:1320
msgid "Connecting to the game server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1334
+#: src/client.cpp:1332
msgid "Changing game servers"
msgstr ""
@@ -530,72 +532,76 @@ msgstr ""
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1389 src/client.cpp:1403 src/client.cpp:1598
+#. TRANSLATORS: info message
+#. TRANSLATORS: ok dialog button
+#: src/client.cpp:1387 src/client.cpp:1401 src/client.cpp:1596
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
#: src/gui/windows/charcreatedialog.cpp:369
-#: src/gui/windows/charselectdialog.cpp:289
+#: src/gui/windows/charselectdialog.cpp:311
#: src/gui/windows/editserverdialog.cpp:203
#: src/gui/windows/registerdialog.cpp:245
#: src/gui/windows/unregisterdialog.cpp:146
#: src/net/ea/charserverhandler.cpp:141 src/net/ea/charserverhandler.cpp:173
+#: src/net/eathena/charserverhandler.cpp:516
+#: src/net/eathena/charserverhandler.cpp:518
msgid "Error"
msgstr "పొరపాటు"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1418
+#: src/client.cpp:1416
msgid "Requesting registration details"
msgstr ""
#. TRANSLATORS: password change message header
-#: src/client.cpp:1459
+#: src/client.cpp:1457
msgid "Password Change"
msgstr ""
#. TRANSLATORS: password change message text
-#: src/client.cpp:1461
+#: src/client.cpp:1459
msgid "Password changed successfully!"
msgstr ""
#. TRANSLATORS: email change message header
-#: src/client.cpp:1486
+#: src/client.cpp:1484
msgid "Email Change"
msgstr ""
#. TRANSLATORS: email change message text
-#: src/client.cpp:1488
+#: src/client.cpp:1486
msgid "Email changed successfully!"
msgstr ""
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1515
+#: src/client.cpp:1513
msgid "Unregister Successful"
msgstr ""
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1517
+#: src/client.cpp:1515
msgid "Farewell, come back any time..."
msgstr ""
#. TRANSLATORS: directory creation error
#: src/configmanager.cpp:53 src/dirs.cpp:260 src/dirs.cpp:275 src/dirs.cpp:320
-#: src/dirs.cpp:481 src/dirs.cpp:489
+#: src/dirs.cpp:488 src/dirs.cpp:496
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:363
+#: src/dirs.cpp:370
#, c-format
msgid "Invalid update host: %s."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:404 src/dirs.cpp:411
+#: src/dirs.cpp:411 src/dirs.cpp:418
msgid "Error creating updates directory!"
msgstr ""
-#: src/dirs.cpp:433 src/dirs.cpp:451
+#: src/dirs.cpp:440 src/dirs.cpp:458
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
@@ -613,36 +619,36 @@ msgid "dyecmd srcdyestring dstfile"
msgstr ""
#. TRANSLATORS: chat tab header
-#: src/game.cpp:236 src/gui/widgets/tabs/chattab.cpp:482
+#: src/game.cpp:234 src/gui/widgets/tabs/chattab.cpp:482
msgid "General"
msgstr "సాధారణ"
#. TRANSLATORS: chat tab header
#. TRANSLATORS: full button name
#. TRANSLATORS: debug window name
-#: src/game.cpp:253 src/gui/widgets/tabs/chattab.cpp:484
+#: src/game.cpp:251 src/gui/widgets/tabs/chattab.cpp:484
#: src/gui/windowmenu.cpp:149 src/gui/windows/debugwindow.cpp:42
msgid "Debug"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:541
+#: src/game.cpp:532
#, c-format
msgid "Screenshot saved as %s"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:551
+#: src/game.cpp:542
msgid "Saving screenshot failed!"
msgstr ""
#. TRANSLATORS: error message text
-#: src/game.cpp:634
+#: src/game.cpp:625
msgid "The connection to the server was lost."
msgstr ""
#. TRANSLATORS: error message header
-#: src/game.cpp:637
+#: src/game.cpp:628
msgid "Network Error"
msgstr ""
@@ -1033,6 +1039,7 @@ msgstr ""
#: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
#: src/gui/widgets/tabs/setup_other.cpp:79
#: src/gui/widgets/tabs/setup_visual.cpp:81
+#: src/gui/windows/equipmentwindow.cpp:577
msgid "default"
msgstr ""
@@ -1523,7 +1530,7 @@ msgstr ""
#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:273
#: src/gui/popups/popupmenu.cpp:767 src/gui/widgets/skillinfo.cpp:113
#: src/gui/windows/botcheckerwindow.cpp:89 src/input/pages/basic.cpp:42
-#: src/net/eathena/generalhandler.cpp:289 src/net/tmwa/generalhandler.cpp:321
+#: src/net/eathena/generalhandler.cpp:356 src/net/tmwa/generalhandler.cpp:320
msgid "Attack"
msgstr ""
@@ -1692,7 +1699,7 @@ msgstr ""
#. TRANSLATORS: pet unequip item
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:340 src/gui/windows/equipmentwindow.cpp:70
+#: src/gui/popups/popupmenu.cpp:340 src/gui/windows/equipmentwindow.cpp:72
#: src/gui/windows/inventorywindow.cpp:175 src/resources/itemtypemapdata.h:47
#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
@@ -1750,7 +1757,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:574
+#: src/gui/popups/popupmenu.cpp:574 src/gui/windows/charselectdialog.cpp:132
msgid "Rename"
msgstr ""
@@ -2262,7 +2269,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
#. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:3000 src/net/ea/playerhandler.cpp:364
+#: src/gui/popups/popupmenu.cpp:3000 src/net/ea/playerhandler.cpp:195
msgid "Revive"
msgstr ""
@@ -2286,7 +2293,7 @@ msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: settings group
#. TRANSLATORS: full button name
-#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:319
+#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:315
#: src/gui/windowmenu.cpp:158
msgid "Windows"
msgstr ""
@@ -2314,7 +2321,7 @@ msgstr ""
#. TRANSLATORS: input action name
#: src/gui/setupinputpages.cpp:57 src/gui/widgets/tabs/setup_audio.cpp:151
#: src/gui/widgets/tabs/setup_chat.cpp:179
-#: src/gui/widgets/tabs/setup_other.cpp:341
+#: src/gui/widgets/tabs/setup_other.cpp:337
#: src/gui/widgets/tabs/setup_visual.cpp:192
#: src/gui/windows/charcreatedialog.cpp:119
#: src/gui/windows/registerdialog.cpp:106 src/input/pages/gui.cpp:87
@@ -2327,212 +2334,227 @@ msgid "Gui"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:113
+#: src/gui/userpalette.cpp:116
msgid "Being"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:115
+#: src/gui/userpalette.cpp:118
msgid "Friend names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:117
+#: src/gui/userpalette.cpp:120
msgid "Disregarded names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:119
+#: src/gui/userpalette.cpp:122
msgid "Ignored names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:121
+#: src/gui/userpalette.cpp:124
msgid "Erased names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:123
+#: src/gui/userpalette.cpp:126
msgid "Other players names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:125
+#: src/gui/userpalette.cpp:128
msgid "Own name"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:127
+#: src/gui/userpalette.cpp:130
msgid "GM names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:129
+#: src/gui/userpalette.cpp:132
msgid "NPCs"
msgstr ""
#. TRANSLATORS: palette color
#. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:131 src/gui/widgets/tabs/setup_other.cpp:108
+#: src/gui/userpalette.cpp:134 src/gui/widgets/tabs/setup_other.cpp:108
msgid "Monsters"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:133
+#: src/gui/userpalette.cpp:136
msgid "Monster HP bar"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:139
msgid "Monster HP bar (second color)"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:138
+#: src/gui/userpalette.cpp:141
msgid "Party members"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:140
+#: src/gui/userpalette.cpp:143
msgid "Guild members"
msgstr ""
#. TRANSLATORS: palette color
#. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:142 src/gui/widgets/tabs/setup_visual.cpp:157
+#: src/gui/userpalette.cpp:145 src/gui/widgets/tabs/setup_visual.cpp:157
msgid "Particle effects"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:144
+#: src/gui/userpalette.cpp:147
msgid "Pickup notification"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:146
+#: src/gui/userpalette.cpp:149
msgid "Exp notification"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:148
+#: src/gui/userpalette.cpp:151
msgid "Player HP bar"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:152
+#: src/gui/userpalette.cpp:155
msgid "Player HP bar (second color)"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:154
+#: src/gui/userpalette.cpp:157
msgid "Player hits monster"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:156
+#: src/gui/userpalette.cpp:159
msgid "Monster hits player"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:160
+#: src/gui/userpalette.cpp:163
msgid "Other player hits local player"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:162
+#: src/gui/userpalette.cpp:165
msgid "Critical Hit"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:166
+#: src/gui/userpalette.cpp:169
msgid "Local player hits monster"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:169
+#: src/gui/userpalette.cpp:172
msgid "Local player critical hit"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:172
+#: src/gui/userpalette.cpp:175
msgid "Local player miss"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:174
+#: src/gui/userpalette.cpp:177
msgid "Misses"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:176
+#: src/gui/userpalette.cpp:179
msgid "Portal highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:179
+#: src/gui/userpalette.cpp:182
msgid "Default collision highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:182
+#: src/gui/userpalette.cpp:185
msgid "Air collision highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:185
+#: src/gui/userpalette.cpp:188
msgid "Water collision highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:188
+#: src/gui/userpalette.cpp:191
msgid "Special ground collision highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:191
+#: src/gui/userpalette.cpp:194
msgid "Walkable highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:194
+#: src/gui/userpalette.cpp:197
msgid "Local player attack range"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:197
+#: src/gui/userpalette.cpp:200
msgid "Local player attack range border"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:200
+#: src/gui/userpalette.cpp:203
msgid "Monster attack range"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:204
+#: src/gui/userpalette.cpp:207
msgid "Floor item amount color"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:207
+#: src/gui/userpalette.cpp:210
msgid "Home place"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:210
+#: src/gui/userpalette.cpp:213
msgid "Home place border"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:213
+#: src/gui/userpalette.cpp:216
msgid "Road point"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:216
+#: src/gui/userpalette.cpp:219
msgid "Tiles border"
msgstr ""
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:221
+msgid "Pets"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:223
+msgid "Mercenary"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:225
+msgid "Homunculus"
+msgstr ""
+
#: src/gui/widgets/characterdisplay.cpp:135
#, c-format
msgid "Level: %u"
@@ -2635,7 +2657,8 @@ msgid "Type: %s"
msgstr ""
#. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:108
+#. TRANSLATORS: unknown equipment page name
+#: src/gui/widgets/skillinfo.cpp:108 src/gui/windows/equipmentwindow.cpp:584
msgid "Unknown"
msgstr ""
@@ -2836,22 +2859,22 @@ msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:262
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:313
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:375
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:319
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:387
msgid "Target:"
msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:264
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:319
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:377
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:325
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:389
msgid "Target Id:"
msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:267
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:322
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:379
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:328
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:391
msgid "Target type:"
msgstr ""
@@ -2862,7 +2885,7 @@ msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:271
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:338
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:344
msgid "Target race:"
msgstr ""
@@ -2878,67 +2901,81 @@ msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:277
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:363
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:369
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:387
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:375
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:381
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:399
msgid "Attack delay:"
msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:279
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:350
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:389
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:356
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:401
msgid "Minimal hit:"
msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:281
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:353
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:391
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:359
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:403
msgid "Maximum hit:"
msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:283
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:356
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:393
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:362
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:405
msgid "Critical hit:"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:327
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:285
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:365
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:407
+msgid "Karma:"
+msgstr ""
+
+#. TRANSLATORS: debug window label
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:287
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:368
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:409
+msgid "Manner:"
+msgstr ""
+
+#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:333
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:381
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:339
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:393
msgid "Target Level:"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:341
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:383
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:347
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:395
msgid "Target Party:"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:345
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:385
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:351
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:397
msgid "Target Guild:"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:430
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:436
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:451
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:457
#, c-format
msgid "Ping: %s ms"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:439
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:460
#, c-format
msgid "In: %d bytes/s"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:442
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:463
#, c-format
msgid "Out: %d bytes/s"
msgstr ""
@@ -3767,137 +3804,132 @@ msgstr ""
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_other.cpp:294
-msgid "Enable auction bot support"
-msgstr ""
-
-#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:298
msgid "Enable guild bot support and disable native guild support"
msgstr ""
#. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:304
+#: src/gui/widgets/tabs/setup_other.cpp:300
msgid "Keyboard"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:307
+#: src/gui/widgets/tabs/setup_other.cpp:303
msgid "Repeat delay"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:311
+#: src/gui/widgets/tabs/setup_other.cpp:307
msgid "Repeat interval"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:315
+#: src/gui/widgets/tabs/setup_other.cpp:311
msgid "Custom repeat interval"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:323
+#: src/gui/widgets/tabs/setup_other.cpp:319
msgid "Shortcut buttons"
msgstr ""
#. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:328
+#: src/gui/widgets/tabs/setup_other.cpp:324
msgid "Proxy server"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:332
+#: src/gui/widgets/tabs/setup_other.cpp:328
msgid "Proxy type"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:336
+#: src/gui/widgets/tabs/setup_other.cpp:332
msgid "Proxy address:port"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:344
+#: src/gui/widgets/tabs/setup_other.cpp:340
msgid "Enable server side attack"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:348
+#: src/gui/widgets/tabs/setup_other.cpp:344
msgid "Hide support page link on error"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:352
+#: src/gui/widgets/tabs/setup_other.cpp:348
msgid "Enable double clicks"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:356
+#: src/gui/widgets/tabs/setup_other.cpp:352
msgid "Enable bot checker"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:360
+#: src/gui/widgets/tabs/setup_other.cpp:356
msgid "Enable buggy servers protection (do not disable)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:365
+#: src/gui/widgets/tabs/setup_other.cpp:361
msgid "Enable debug log"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:369
+#: src/gui/widgets/tabs/setup_other.cpp:365
msgid "Ignore logging packets"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:373
+#: src/gui/widgets/tabs/setup_other.cpp:369
msgid "Enable OpenGL log"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:377
+#: src/gui/widgets/tabs/setup_other.cpp:373
msgid "Enable input log"
msgstr ""
#. TRANSLATORS: settings option
#. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_other.cpp:381 src/input/pages/other.cpp:362
+#: src/gui/widgets/tabs/setup_other.cpp:377 src/input/pages/other.cpp:362
msgid "Upload log file"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:385
+#: src/gui/widgets/tabs/setup_other.cpp:381
msgid "Low traffic mode"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:389
+#: src/gui/widgets/tabs/setup_other.cpp:385
msgid "Hide shield sprite"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:394
+#: src/gui/widgets/tabs/setup_other.cpp:390
msgid "Use FBO for screenshots (only for opengl)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:400
+#: src/gui/widgets/tabs/setup_other.cpp:396
msgid "Screenshot directory"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:405
+#: src/gui/widgets/tabs/setup_other.cpp:401
msgid "Network delay between sub servers"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:409
+#: src/gui/widgets/tabs/setup_other.cpp:405
msgid "Show background"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:414
+#: src/gui/widgets/tabs/setup_other.cpp:410
msgid "Screen density override"
msgstr ""
@@ -4128,9 +4160,9 @@ msgstr ""
#. TRANSLATORS: command editor button
#. TRANSLATORS: input action name
#: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:82
-#: src/gui/windows/serverdialog.cpp:125 src/gui/windows/shopwindow.cpp:101
-#: src/gui/windows/shopwindow.cpp:108 src/gui/windows/textcommandeditor.cpp:92
+#: src/gui/windows/charselectdialog.cpp:84
+#: src/gui/windows/serverdialog.cpp:125 src/gui/windows/shopwindow.cpp:100
+#: src/gui/windows/shopwindow.cpp:107 src/gui/windows/textcommandeditor.cpp:92
#: src/input/pages/gui.cpp:111
msgid "Delete"
msgstr "తొలగించు"
@@ -4784,7 +4816,7 @@ msgstr ""
#. TRANSLATORS: equipment window name
#. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:63
+#: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:65
#: src/gui/windows/inventorywindow.cpp:196
msgid "Equipment"
msgstr ""
@@ -4925,7 +4957,7 @@ msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: social window button
#: src/gui/windows/buydialog.cpp:260 src/gui/windows/charcreatedialog.cpp:127
-#: src/gui/windows/charselectdialog.cpp:578
+#: src/gui/windows/charselectdialog.cpp:605
#: src/gui/windows/socialwindow.cpp:86
msgid "Create"
msgstr "సృష్టించు"
@@ -4969,10 +5001,8 @@ msgstr ""
#. TRANSLATORS: change password window name
#. TRANSLATORS: change password dialog button
-#. TRANSLATORS: char select dialog. button.
#: src/gui/windows/changepassworddialog.cpp:51
#: src/gui/windows/changepassworddialog.cpp:57
-#: src/gui/windows/charselectdialog.cpp:73
msgid "Change Password"
msgstr "సంకేతపదాన్ని మార్చు"
@@ -5126,57 +5156,68 @@ msgid "Are you sure you want to delete this character?"
msgstr ""
#. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:64
+#: src/gui/windows/charselectdialog.cpp:66
#, c-format
msgid "Account %s (last login time %s)"
msgstr ""
#. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:71
-msgid "Switch Login"
+#: src/gui/windows/charselectdialog.cpp:73
+msgid "Switch"
+msgstr ""
+
+#. TRANSLATORS: char select dialog. button.
+#: src/gui/windows/charselectdialog.cpp:75
+msgid "Password"
msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:78
-#: src/gui/windows/charselectdialog.cpp:573
+#: src/gui/windows/charselectdialog.cpp:80
+#: src/gui/windows/charselectdialog.cpp:595
#: src/gui/windows/updaterwindow.cpp:195
msgid "Play"
msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:80
+#: src/gui/windows/charselectdialog.cpp:82
#: src/net/ea/charserverhandler.cpp:160
+#: src/net/eathena/charserverhandler.cpp:531
+#: src/net/eathena/charserverhandler.cpp:561
msgid "Info"
msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: unregister dialog name
#. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:106
+#: src/gui/windows/charselectdialog.cpp:110
#: src/gui/windows/unregisterdialog.cpp:50
#: src/gui/windows/unregisterdialog.cpp:55
msgid "Unregister"
msgstr ""
#. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:118
+#: src/gui/windows/charselectdialog.cpp:122
msgid "Change Email"
msgstr ""
#. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:156
+#: src/gui/windows/charselectdialog.cpp:166
#, c-format
msgid "Account %s"
msgstr ""
-#: src/gui/windows/charselectdialog.cpp:184
+#: src/gui/windows/charselectdialog.cpp:194
msgid "Please set new pincode"
msgstr ""
+#: src/gui/windows/charselectdialog.cpp:240
+msgid "Please enter new name"
+msgstr ""
+
#. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:237
+#: src/gui/windows/charselectdialog.cpp:259
#, c-format
msgid ""
"Hp: %u/%u\n"
@@ -5186,16 +5227,16 @@ msgid ""
"Money: %s"
msgstr ""
-#: src/gui/windows/charselectdialog.cpp:289
+#: src/gui/windows/charselectdialog.cpp:311
msgid "Incorrect password"
msgstr ""
#. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:429
+#: src/gui/windows/charselectdialog.cpp:451
msgid "Enter password for deleting character"
msgstr ""
-#: src/gui/windows/charselectdialog.cpp:429
+#: src/gui/windows/charselectdialog.cpp:451
msgid "Enter password:"
msgstr ""
@@ -5603,7 +5644,7 @@ msgstr "స్థాయి: %d"
#. TRANSLATORS: status bar label
#: src/gui/windows/ministatuswindow.cpp:364
-#: src/gui/windows/ministatuswindow.cpp:402
+#: src/gui/windows/ministatuswindow.cpp:401
msgid "Need"
msgstr ""
@@ -5634,7 +5675,7 @@ msgstr ""
#. TRANSLATORS: shop window button
#. TRANSLATORS: trade window button
#: src/gui/windows/npcdialog.cpp:114 src/gui/windows/serverdialog.cpp:121
-#: src/gui/windows/shopwindow.cpp:99 src/gui/windows/shopwindow.cpp:106
+#: src/gui/windows/shopwindow.cpp:98 src/gui/windows/shopwindow.cpp:105
#: src/gui/windows/tradewindow.cpp:83
msgid "Add"
msgstr ""
@@ -5797,43 +5838,38 @@ msgid "Reset Windows"
msgstr ""
#. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:80
+#: src/gui/windows/shopwindow.cpp:79
msgid "Personal Shop"
msgstr ""
#. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:95
+#: src/gui/windows/shopwindow.cpp:94
msgid "Buy items"
msgstr ""
#. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:97
+#: src/gui/windows/shopwindow.cpp:96
msgid "Sell items"
msgstr ""
#. TRANSLATORS: shop window label
#. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:110
+#: src/gui/windows/shopwindow.cpp:102 src/gui/windows/shopwindow.cpp:109
msgid "Announce"
msgstr ""
#. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:114
+#: src/gui/windows/shopwindow.cpp:113
msgid "Show links in announce"
msgstr ""
-#. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:176 src/gui/windows/shopwindow.cpp:179
-msgid "Auction"
-msgstr ""
-
#. TRANSLATORS: shop window dialog
#. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:233
+#: src/gui/windows/shopwindow.cpp:776 src/net/ea/tradehandler.cpp:233
msgid "Request for Trade"
msgstr ""
-#: src/gui/windows/shopwindow.cpp:791
+#: src/gui/windows/shopwindow.cpp:776
#, c-format
msgid "%s wants to %s %s do you accept?"
msgstr ""
@@ -6161,27 +6197,27 @@ msgstr ""
msgid "Connecting..."
msgstr ""
-#: src/gui/windows/updaterwindow.cpp:398
+#: src/gui/windows/updaterwindow.cpp:407
msgid "Show all news (can be slow)"
msgstr ""
#. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:824
+#: src/gui/windows/updaterwindow.cpp:833
msgid "##1 The update process is incomplete."
msgstr ""
#. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:826
+#: src/gui/windows/updaterwindow.cpp:835
msgid "##1 It is strongly recommended that"
msgstr ""
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:828
+#: src/gui/windows/updaterwindow.cpp:837
msgid "##1 you try again later."
msgstr ""
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1005
+#: src/gui/windows/updaterwindow.cpp:1021
msgid "Completed"
msgstr ""
@@ -6228,25 +6264,25 @@ msgstr ""
#. TRANSLATORS: long key name. must be short.
#. TRANSLATORS: short key name. must be very short.
#. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:370 src/input/inputmanager.cpp:414
+#: src/input/inputmanager.cpp:371 src/input/inputmanager.cpp:415
#: src/input/keyboardconfig.cpp:104
#, c-format
msgid "key_%d"
msgstr ""
#. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:376
+#: src/input/inputmanager.cpp:377
#, c-format
msgid "JButton%d"
msgstr ""
#. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:391
msgid "unknown key"
msgstr ""
#. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:420
+#: src/input/inputmanager.cpp:421
#, c-format
msgid "JB%d"
msgstr ""
@@ -6254,7 +6290,7 @@ msgstr ""
#. TRANSLATORS: unknown short key type. must be short
#. TRANSLATORS: Unknown key short string.
#. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:434 src/input/keyboardconfig.cpp:148
+#: src/input/inputmanager.cpp:435 src/input/keyboardconfig.cpp:148
msgid "u key"
msgstr ""
@@ -7425,74 +7461,74 @@ msgid "Request to quit denied!"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:135
#, c-format
msgid "Guild name: %s"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:191
+#: src/net/ea/guildhandler.cpp:138
#, c-format
msgid "Guild master: %s"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:141
#, c-format
msgid "Guild level: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:197
+#: src/net/ea/guildhandler.cpp:144
#, c-format
msgid "Online members: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:200
+#: src/net/ea/guildhandler.cpp:147
#, c-format
msgid "Max members: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:203
+#: src/net/ea/guildhandler.cpp:150
#, c-format
msgid "Average level: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:206
+#: src/net/ea/guildhandler.cpp:153
#, c-format
msgid "Guild exp: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:209
+#: src/net/ea/guildhandler.cpp:156
#, c-format
msgid "Guild next exp: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:212
+#: src/net/ea/guildhandler.cpp:159
#, c-format
msgid "Guild castle: %s"
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:179
+#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:191
msgid "Item sharing enabled."
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:183
+#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:195
msgid "Item sharing disabled."
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:187
+#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:199
msgid "Item sharing not possible."
msgstr ""
@@ -7503,19 +7539,19 @@ msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:167
+#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:179
msgid "Experience sharing enabled."
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:171
+#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:183
msgid "Experience sharing disabled."
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:175
+#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:187
msgid "Experience sharing not possible."
msgstr ""
@@ -7620,239 +7656,355 @@ msgid "Connection to server terminated. "
msgstr ""
#. TRANSLATORS: message header
-#: src/net/ea/playerhandler.cpp:257 src/net/ea/playerhandler.cpp:273
-#: src/net/ea/playerhandler.cpp:361
+#: src/net/ea/playerhandler.cpp:192 src/net/ea/playerhandler.cpp:418
+#: src/net/ea/playerhandler.cpp:434
msgid "Message"
msgstr ""
#. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:259
+#: src/net/ea/playerhandler.cpp:420
msgid ""
"You are carrying more than half your weight. You are unable to regain "
"health."
msgstr ""
#. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:275
+#: src/net/ea/playerhandler.cpp:436
msgid "You are carrying less than half your weight. You can regain health."
msgstr ""
+#. TRANSLATORS: char rename error
+#: src/net/eathena/charserverhandler.cpp:516
+#: src/net/eathena/charserverhandler.cpp:553
+msgid "Character rename error."
+msgstr ""
+
+#: src/net/eathena/charserverhandler.cpp:531
+msgid "Character renamed."
+msgstr ""
+
+#. TRANSLATORS: char rename error
+#: src/net/eathena/charserverhandler.cpp:544
+msgid "Rename not allowed."
+msgstr ""
+
+#. TRANSLATORS: char rename error
+#: src/net/eathena/charserverhandler.cpp:548
+msgid "New name is not set."
+msgstr ""
+
+#. TRANSLATORS: char rename error
+#: src/net/eathena/charserverhandler.cpp:557
+msgid "Character not found."
+msgstr ""
+
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:125
+#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:124
#, c-format
msgid "Strength %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:127
+#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:126
#, c-format
msgid "Agility %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:129
+#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:128
#, c-format
msgid "Vitality %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:131
+#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:130
#, c-format
msgid "Intelligence %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:128 src/net/tmwa/generalhandler.cpp:133
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:132
#, c-format
msgid "Dexterity %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:135
+#: src/net/eathena/generalhandler.cpp:128 src/net/tmwa/generalhandler.cpp:134
#, c-format
msgid "Luck %s"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:152 src/net/tmwa/generalhandler.cpp:161
+#: src/net/eathena/generalhandler.cpp:159 src/net/tmwa/generalhandler.cpp:160
msgid "Authentication failed."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:155 src/net/tmwa/generalhandler.cpp:165
+#: src/net/eathena/generalhandler.cpp:162 src/net/tmwa/generalhandler.cpp:164
msgid "No servers available."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:160 src/net/tmwa/generalhandler.cpp:171
+#: src/net/eathena/generalhandler.cpp:167 src/net/tmwa/generalhandler.cpp:170
msgid "Someone else is trying to use this account."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:165 src/net/tmwa/generalhandler.cpp:177
+#: src/net/eathena/generalhandler.cpp:172 src/net/tmwa/generalhandler.cpp:176
msgid "This account is already logged in."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:169 src/net/tmwa/generalhandler.cpp:182
+#: src/net/eathena/generalhandler.cpp:176 src/net/tmwa/generalhandler.cpp:181
msgid "Speed hack detected."
msgstr ""
+#: src/net/eathena/generalhandler.cpp:179
+msgid "Server full."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:182
+msgid "Sorry, you are underaged."
+msgstr ""
+
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:172 src/net/tmwa/generalhandler.cpp:186
+#: src/net/eathena/generalhandler.cpp:185 src/net/tmwa/generalhandler.cpp:185
msgid "Duplicated login."
msgstr ""
+#: src/net/eathena/generalhandler.cpp:188
+msgid "To many connections from same ip."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:191
+msgid "Not paid for this time."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:194
+msgid "Pay suspended."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:197
+msgid "Pay changed."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:200
+msgid "Pay wrong ip."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:203
+msgid "Pay game room."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:206
+msgid "Disconnect forced by GM."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:210
+msgid "Ban japan refuse."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:213
+msgid "Remained other account."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:216
+msgid "Ip unfair."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:219
+msgid "Ip count all."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:222
+msgid "Ip count."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:226
+msgid "Memory."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:229
+msgid "Han valid."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:232
+msgid "Ip limited access."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:235
+msgid "Over characters list."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:238
+msgid "Ip blocked."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:241
+msgid "Invalid password count."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:244
+msgid "Not allowed race."
+msgstr ""
+
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:175 src/net/tmwa/generalhandler.cpp:190
+#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:189
msgid "Unknown connection error."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:280
+#: src/net/eathena/generalhandler.cpp:323 src/net/tmwa/generalhandler.cpp:279
msgid "Got disconnected from server!"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:282 src/net/tmwa/generalhandler.cpp:308
+#: src/net/eathena/generalhandler.cpp:348 src/net/tmwa/generalhandler.cpp:307
msgid "Strength"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:310
+#: src/net/eathena/generalhandler.cpp:349 src/net/tmwa/generalhandler.cpp:309
msgid "Agility"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:284 src/net/tmwa/generalhandler.cpp:312
+#: src/net/eathena/generalhandler.cpp:350 src/net/tmwa/generalhandler.cpp:311
msgid "Vitality"
msgstr ""
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:285 src/net/tmwa/generalhandler.cpp:314
+#: src/net/eathena/generalhandler.cpp:352 src/net/tmwa/generalhandler.cpp:314
msgid "Intelligence"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:286 src/net/tmwa/generalhandler.cpp:316
+#: src/net/eathena/generalhandler.cpp:353 src/net/tmwa/generalhandler.cpp:316
msgid "Dexterity"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:287 src/net/tmwa/generalhandler.cpp:318
+#: src/net/eathena/generalhandler.cpp:354 src/net/tmwa/generalhandler.cpp:318
msgid "Luck"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:290 src/net/tmwa/generalhandler.cpp:323
+#: src/net/eathena/generalhandler.cpp:357 src/net/tmwa/generalhandler.cpp:322
msgid "Defense"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:291 src/net/tmwa/generalhandler.cpp:325
+#: src/net/eathena/generalhandler.cpp:358 src/net/tmwa/generalhandler.cpp:324
msgid "M.Attack"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:292 src/net/tmwa/generalhandler.cpp:327
+#: src/net/eathena/generalhandler.cpp:359 src/net/tmwa/generalhandler.cpp:326
msgid "M.Defense"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:294 src/net/tmwa/generalhandler.cpp:330
+#: src/net/eathena/generalhandler.cpp:361 src/net/tmwa/generalhandler.cpp:329
#, no-c-format
msgid "% Accuracy"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:296 src/net/tmwa/generalhandler.cpp:333
+#: src/net/eathena/generalhandler.cpp:363 src/net/tmwa/generalhandler.cpp:332
#, no-c-format
msgid "% Evade"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:298 src/net/tmwa/generalhandler.cpp:336
+#: src/net/eathena/generalhandler.cpp:365 src/net/tmwa/generalhandler.cpp:335
#, no-c-format
msgid "% Critical"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:299 src/net/tmwa/generalhandler.cpp:338
+#: src/net/eathena/generalhandler.cpp:366 src/net/tmwa/generalhandler.cpp:337
msgid "Attack Delay"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:300 src/net/tmwa/generalhandler.cpp:340
+#: src/net/eathena/generalhandler.cpp:367 src/net/tmwa/generalhandler.cpp:339
msgid "Walk Delay"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:301 src/net/tmwa/generalhandler.cpp:342
+#: src/net/eathena/generalhandler.cpp:368 src/net/tmwa/generalhandler.cpp:341
msgid "Attack Range"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:302 src/net/tmwa/generalhandler.cpp:344
+#: src/net/eathena/generalhandler.cpp:369 src/net/tmwa/generalhandler.cpp:343
msgid "Damage per sec."
msgstr ""
-#: src/net/eathena/skillhandler.cpp:228 src/net/eathena/skillhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:370
+msgid "Karma"
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:371
+msgid "Manner"
+msgstr ""
+
+#: src/net/eathena/skillhandler.cpp:304 src/net/eathena/skillhandler.cpp:364
#, c-format
msgid "Unknown skill error: %d"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:235 src/net/tmwa/skillhandler.cpp:224
+#: src/net/eathena/skillhandler.cpp:311 src/net/tmwa/skillhandler.cpp:224
msgid "You have not yet reached a high enough lvl!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:239 src/net/tmwa/skillhandler.cpp:228
+#: src/net/eathena/skillhandler.cpp:315 src/net/tmwa/skillhandler.cpp:228
msgid "Insufficient HP!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:243 src/net/tmwa/skillhandler.cpp:232
+#: src/net/eathena/skillhandler.cpp:319 src/net/tmwa/skillhandler.cpp:232
msgid "Insufficient SP!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:247 src/net/tmwa/skillhandler.cpp:236
+#: src/net/eathena/skillhandler.cpp:323 src/net/tmwa/skillhandler.cpp:236
msgid "You have no memos!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:251 src/net/tmwa/skillhandler.cpp:240
+#: src/net/eathena/skillhandler.cpp:327 src/net/tmwa/skillhandler.cpp:240
msgid "You cannot do that right now!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:255 src/net/tmwa/skillhandler.cpp:244
+#: src/net/eathena/skillhandler.cpp:331 src/net/tmwa/skillhandler.cpp:244
msgid "Seems you need more money... ;-)"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:259 src/net/tmwa/skillhandler.cpp:248
+#: src/net/eathena/skillhandler.cpp:335 src/net/tmwa/skillhandler.cpp:248
msgid "You cannot use this skill with that kind of weapon!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:264 src/net/tmwa/skillhandler.cpp:253
+#: src/net/eathena/skillhandler.cpp:340 src/net/tmwa/skillhandler.cpp:253
msgid "You need another red gem!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:268 src/net/tmwa/skillhandler.cpp:257
+#: src/net/eathena/skillhandler.cpp:344 src/net/tmwa/skillhandler.cpp:257
msgid "You need another blue gem!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:272 src/net/tmwa/skillhandler.cpp:261
+#: src/net/eathena/skillhandler.cpp:348 src/net/tmwa/skillhandler.cpp:261
msgid "You're carrying to much to do this!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:276 src/net/tmwa/skillhandler.cpp:265
+#: src/net/eathena/skillhandler.cpp:352 src/net/tmwa/skillhandler.cpp:265
msgid "Huh? What's that?"
msgstr ""
@@ -7869,32 +8021,32 @@ msgid "%s wants to trade with you, do you accept?"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:349
+#: src/net/tmwa/charserverhandler.cpp:351
msgid "Strength:"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:351
+#: src/net/tmwa/charserverhandler.cpp:353
msgid "Agility:"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:353
+#: src/net/tmwa/charserverhandler.cpp:355
msgid "Vitality:"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:355
+#: src/net/tmwa/charserverhandler.cpp:357
msgid "Intelligence:"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:357
+#: src/net/tmwa/charserverhandler.cpp:359
msgid "Dexterity:"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:359
+#: src/net/tmwa/charserverhandler.cpp:361
msgid "Luck:"
msgstr ""
@@ -8205,269 +8357,306 @@ msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:143
+msgid "You cant left party on this map."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:147
+msgid "You was kicked from party."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:151
+msgid "You cant be kicked kicked from party on this map."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:155
#, c-format
msgid "%s has joined your party."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:147
+#: src/resources/notifications.h:159
#, c-format
msgid "%s is already a member of a party."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:151
+#: src/resources/notifications.h:163
#, c-format
msgid "%s refused your invitation."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:155
+#: src/resources/notifications.h:167
#, c-format
msgid "%s is now a member of your party."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:159
+#: src/resources/notifications.h:171
#, c-format
msgid "%s can't join your party because party is full."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:163
+#: src/resources/notifications.h:175
#, c-format
msgid "QQQ Unknown invite response for %s."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:191
+#: src/resources/notifications.h:203
#, c-format
msgid "%s has left your party."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:195
+#: src/resources/notifications.h:207 src/resources/notifications.h:215
+#, c-format
+msgid "%s cant be kicked from party on this map."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:211
+#, c-format
+msgid "%s has kicked from your party."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:219
#, c-format
msgid "An unknown member tried to say: %s"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:199
+#: src/resources/notifications.h:223
#, c-format
msgid "%s is not in your party!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:203
+#: src/resources/notifications.h:227
#, c-format
msgid "You picked up %s."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:207
+#: src/resources/notifications.h:231
#, c-format
msgid "You spent %s."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:211
+#: src/resources/notifications.h:235
msgid "Cannot raise skill!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:215
+#: src/resources/notifications.h:239
msgid "Equip ammunition first."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:219
+#: src/resources/notifications.h:243
#, c-format
msgid "Trading with %s isn't possible. Trade partner is too far away."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:224
+#: src/resources/notifications.h:248
#, c-format
msgid "Trading with %s isn't possible. Character doesn't exist."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:228
+#: src/resources/notifications.h:252
msgid "Trade cancelled due to an unknown reason."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:232
+#: src/resources/notifications.h:256
#, c-format
msgid "Trade with %s cancelled."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:236
+#: src/resources/notifications.h:260
#, c-format
msgid "Unhandled trade cancel packet with %s"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:240
+#: src/resources/notifications.h:264
msgid "Failed adding item. Trade partner is over weighted."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:244
+#: src/resources/notifications.h:268
msgid "Failed adding item. Trade partner has no free slot."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:248
+#: src/resources/notifications.h:272
msgid "Failed adding item. You can't trade this item."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:252
+#: src/resources/notifications.h:276
msgid "Failed adding item for unknown reason."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:256
+#: src/resources/notifications.h:280
msgid "Trade canceled."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:260
+#: src/resources/notifications.h:284
msgid "Trade completed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:264
+#: src/resources/notifications.h:288
msgid "Kick failed!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:268
+#: src/resources/notifications.h:292
msgid "Kick succeeded!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:272
+#: src/resources/notifications.h:296
#, c-format
msgid "MVP player: %s"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:276
+#: src/resources/notifications.h:300
msgid "All whispers ignored."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:280
+#: src/resources/notifications.h:304
msgid "All whispers ignore failed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:284
+#: src/resources/notifications.h:308
msgid "All whispers unignored."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:288
+#: src/resources/notifications.h:312
msgid "All whispers unignore failed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:295
+#: src/resources/notifications.h:319
msgid "pvp off, gvg off"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:299
+#: src/resources/notifications.h:323
msgid "pvp on"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:303
+#: src/resources/notifications.h:327
msgid "gvg on"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:307
+#: src/resources/notifications.h:331
msgid "pvp on, gvg on"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:311
+#: src/resources/notifications.h:335
msgid "unknown pvp"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:315
+#: src/resources/notifications.h:339
#, c-format
msgid "Char from account %s is already in your party!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:319
+#: src/resources/notifications.h:343
#, c-format
msgid "%s blocked invite!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:323
+#: src/resources/notifications.h:347
msgid "Char is not online!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:327
+#: src/resources/notifications.h:351
msgid "Pet catch failed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:331
+#: src/resources/notifications.h:355
msgid "Pet catched."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:335
+#: src/resources/notifications.h:359
#, c-format
msgid "Pet catch unkown error: %d."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:339
+#: src/resources/notifications.h:363
msgid "Your mercenary duty hour is over."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:343
+#: src/resources/notifications.h:367
msgid "Your mercenary was killed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:347
+#: src/resources/notifications.h:371
msgid "Your mercenary was fired."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:351
+#: src/resources/notifications.h:375
msgid "Your mercenary run away."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:355
+#: src/resources/notifications.h:379
msgid "Mercenary unknown state."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:359
-msgid "Your feed your homunculus."
+#: src/resources/notifications.h:383
+msgid "You feed your homunculus."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:363
+#: src/resources/notifications.h:387
#, c-format
msgid "You cant feed homunculus, because not have %s."
msgstr ""
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:391
+msgid "Card insert failed."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:395
+msgid "Card inserted."
+msgstr ""
+
#. TRANSLATORS: chat option changed message
#: src/utils/booleanoptions.h:27
#, c-format
diff --git a/po/th.po b/po/th.po
index 2b8c14e16..831738cd9 100644
--- a/po/th.po
+++ b/po/th.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-27 13:23+0300\n"
-"PO-Revision-Date: 2014-09-28 10:01+0000\n"
+"POT-Creation-Date: 2014-10-08 01:19+0300\n"
+"PO-Revision-Date: 2014-10-08 10:01+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Thai (http://www.transifex.com/projects/p/manaplus/language/th/)\n"
"MIME-Version: 1.0\n"
@@ -32,7 +32,7 @@ msgstr ""
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:131 src/client.cpp:1463 src/client.cpp:1490
+#: src/actions/actions.cpp:131 src/client.cpp:1461 src/client.cpp:1488
#: src/gamemodifiers.cpp:423 src/gui/widgets/tabs/setup_input.cpp:163
#: src/gui/widgets/tabs/setup_theme.cpp:312
#: src/gui/widgets/tabs/setup_theme.cpp:343
@@ -43,8 +43,8 @@ msgstr ""
#: src/gui/windows/changeemaildialog.cpp:170
#: src/gui/windows/changepassworddialog.cpp:160
#: src/gui/windows/charcreatedialog.cpp:373
-#: src/gui/windows/charselectdialog.cpp:255
-#: src/gui/windows/charselectdialog.cpp:291 src/gui/windows/editdialog.cpp:49
+#: src/gui/windows/charselectdialog.cpp:277
+#: src/gui/windows/charselectdialog.cpp:313 src/gui/windows/editdialog.cpp:49
#: src/gui/windows/editserverdialog.cpp:61
#: src/gui/windows/editserverdialog.cpp:208
#: src/gui/windows/itemamountwindow.cpp:158 src/gui/windows/quitdialog.cpp:70
@@ -52,7 +52,9 @@ msgstr ""
#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
#: src/net/ea/charserverhandler.cpp:143 src/net/ea/charserverhandler.cpp:162
#: src/net/ea/charserverhandler.cpp:175 src/net/ea/gamehandler.cpp:79
-#: src/net/ea/playerhandler.cpp:263 src/net/ea/playerhandler.cpp:279
+#: src/net/ea/playerhandler.cpp:424 src/net/ea/playerhandler.cpp:440
+#: src/net/eathena/charserverhandler.cpp:533
+#: src/net/eathena/charserverhandler.cpp:563
msgid "OK"
msgstr ""
@@ -176,7 +178,7 @@ msgstr ""
#. TRANSLATORS: party invite message
#. TRANSLATORS: change relation
-#: src/actions/chat.cpp:303 src/actions/commands.cpp:65
+#: src/actions/chat.cpp:303 src/actions/commands.cpp:64
msgid "Please specify a name."
msgstr ""
@@ -199,75 +201,75 @@ msgid "Message now closes chat."
msgstr ""
#. TRANSLATORS: change relation
-#: src/actions/commands.cpp:108
+#: src/actions/commands.cpp:107
#, c-format
msgid "Player already %s!"
msgstr ""
#. TRANSLATORS: change relation
-#: src/actions/commands.cpp:120
+#: src/actions/commands.cpp:119
#, c-format
msgid "Player successfully %s!"
msgstr ""
#. TRANSLATORS: change relation
-#: src/actions/commands.cpp:122
+#: src/actions/commands.cpp:121
#, c-format
msgid "Player could not be %s!"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:153
+#: src/actions/commands.cpp:152
msgid "Player wasn't ignored!"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:162
+#: src/actions/commands.cpp:161
msgid "Player no longer ignored!"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:164
+#: src/actions/commands.cpp:163
msgid "Player could not be unignored!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/actions/commands.cpp:179
+#: src/actions/commands.cpp:178
msgid "Player already erased!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/actions/commands.cpp:192
+#: src/actions/commands.cpp:191
msgid "Player no longer erased!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/actions/commands.cpp:194
+#: src/actions/commands.cpp:193
msgid "Player could not be erased!"
msgstr ""
#. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:201
+#: src/actions/commands.cpp:200
msgid "friend"
msgstr ""
#. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:208
+#: src/actions/commands.cpp:207
msgid "disregarded"
msgstr ""
#. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:215
+#: src/actions/commands.cpp:214
msgid "neutral"
msgstr ""
#. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:222
+#: src/actions/commands.cpp:221
msgid "blacklisted"
msgstr ""
#. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:229
+#: src/actions/commands.cpp:228
msgid "enemy"
msgstr ""
@@ -282,77 +284,77 @@ msgid "Accepting incoming trade requests"
msgstr ""
#. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1306
+#: src/actormanager.cpp:1310
msgid "Visible on map"
msgstr ""
#. TRANSLATORS: default race name
-#: src/being/being.cpp:389
+#: src/being/being.cpp:393
msgid "Human"
msgstr ""
-#: src/being/being.cpp:556
+#: src/being/being.cpp:560
msgid "dodge"
msgstr ""
-#: src/being/being.cpp:556
+#: src/being/being.cpp:560
msgid "miss"
msgstr ""
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1865 src/gui/windows/whoisonline.cpp:855
+#: src/being/being.cpp:1869 src/gui/windows/whoisonline.cpp:855
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1870 src/gui/windows/whoisonline.cpp:860
+#: src/being/being.cpp:1874 src/gui/windows/whoisonline.cpp:860
msgid "I"
msgstr ""
#. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:379
+#: src/being/localplayer.cpp:380
#, c-format
msgid "You were killed by %s"
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:824
+#: src/being/localplayer.cpp:825
msgid "Tried to pick up nonexistent item."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:828
+#: src/being/localplayer.cpp:829
msgid "Item is too heavy."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:832
+#: src/being/localplayer.cpp:833
msgid "Item is too far away."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:836
+#: src/being/localplayer.cpp:837
msgid "Inventory is full."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:840
+#: src/being/localplayer.cpp:841
msgid "Stack is too big."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:844
+#: src/being/localplayer.cpp:845
msgid "Item belongs to someone else."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:848
+#: src/being/localplayer.cpp:849
msgid "Unknown problem picking up item."
msgstr ""
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:872
+#: src/being/localplayer.cpp:873
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -360,43 +362,43 @@ msgstr[0] ""
#. TRANSLATORS: this is normal experience
#. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1054 src/being/localplayer.cpp:1055
-#: src/being/localplayer.cpp:1091
+#: src/being/localplayer.cpp:1055 src/being/localplayer.cpp:1056
+#: src/being/localplayer.cpp:1092
msgid "xp"
msgstr ""
#. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1059 src/being/localplayer.cpp:1065
-#: src/being/localplayer.cpp:1071
+#: src/being/localplayer.cpp:1060 src/being/localplayer.cpp:1066
+#: src/being/localplayer.cpp:1072
msgid "job"
msgstr ""
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2794
+#: src/being/localplayer.cpp:2795
#, c-format
msgid "Follow: %s"
msgstr ""
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2800 src/being/localplayer.cpp:2825
+#: src/being/localplayer.cpp:2801 src/being/localplayer.cpp:2826
msgid "Follow canceled"
msgstr ""
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2810
+#: src/being/localplayer.cpp:2811
#, c-format
msgid "Imitation: %s"
msgstr ""
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2816 src/being/localplayer.cpp:2830
+#: src/being/localplayer.cpp:2817 src/being/localplayer.cpp:2831
msgid "Imitation canceled"
msgstr ""
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3180
+#: src/being/localplayer.cpp:3181
#, c-format
msgid "You see %s"
msgstr ""
@@ -434,37 +436,37 @@ msgstr ""
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:920 src/gui/windowmenu.cpp:162
+#: src/client.cpp:918 src/gui/windowmenu.cpp:162
#: src/gui/windows/setupwindow.cpp:62
msgid "Setup"
msgstr "ตั้งค่า"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:923 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:921 src/gui/widgets/tabs/setup_perfomance.cpp:54
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:926 src/gui/widgets/tabs/setup_video.cpp:105
+#: src/client.cpp:924 src/gui/widgets/tabs/setup_video.cpp:105
msgid "Video"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:929 src/gui/widgets/tabs/setup_theme.cpp:122
+#: src/client.cpp:927 src/gui/widgets/tabs/setup_theme.cpp:122
msgid "Theme"
msgstr ""
#. TRANSLATORS: theme tab quick button
-#: src/client.cpp:932
+#: src/client.cpp:930
msgid "About"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:935 src/gui/windowmenu.cpp:74
+#: src/client.cpp:933 src/gui/windowmenu.cpp:74
#: src/gui/windows/helpwindow.cpp:53
msgid "Help"
msgstr ""
@@ -480,42 +482,42 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:939 src/client.cpp:1391 src/client.cpp:1405
+#: src/client.cpp:937 src/client.cpp:1389 src/client.cpp:1403
#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:691
#: src/gui/popups/popupmenu.cpp:923 src/gui/windows/didyouknowwindow.cpp:81
#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:74
#: src/gui/windows/npcdialog.cpp:112 src/gui/windows/questswindow.cpp:77
-#: src/gui/windows/shopwindow.cpp:84
+#: src/gui/windows/shopwindow.cpp:83
msgid "Close"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1065
+#: src/client.cpp:1063
msgid "Connecting to server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1113
+#: src/client.cpp:1111
msgid "Logging in"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1156
+#: src/client.cpp:1154
msgid "Entering game world"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1282
+#: src/client.cpp:1280
msgid "Requesting characters"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1322
+#: src/client.cpp:1320
msgid "Connecting to the game server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1334
+#: src/client.cpp:1332
msgid "Changing game servers"
msgstr ""
@@ -529,72 +531,76 @@ msgstr ""
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1389 src/client.cpp:1403 src/client.cpp:1598
+#. TRANSLATORS: info message
+#. TRANSLATORS: ok dialog button
+#: src/client.cpp:1387 src/client.cpp:1401 src/client.cpp:1596
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
#: src/gui/windows/charcreatedialog.cpp:369
-#: src/gui/windows/charselectdialog.cpp:289
+#: src/gui/windows/charselectdialog.cpp:311
#: src/gui/windows/editserverdialog.cpp:203
#: src/gui/windows/registerdialog.cpp:245
#: src/gui/windows/unregisterdialog.cpp:146
#: src/net/ea/charserverhandler.cpp:141 src/net/ea/charserverhandler.cpp:173
+#: src/net/eathena/charserverhandler.cpp:516
+#: src/net/eathena/charserverhandler.cpp:518
msgid "Error"
msgstr "ผิดพลาด"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1418
+#: src/client.cpp:1416
msgid "Requesting registration details"
msgstr ""
#. TRANSLATORS: password change message header
-#: src/client.cpp:1459
+#: src/client.cpp:1457
msgid "Password Change"
msgstr ""
#. TRANSLATORS: password change message text
-#: src/client.cpp:1461
+#: src/client.cpp:1459
msgid "Password changed successfully!"
msgstr ""
#. TRANSLATORS: email change message header
-#: src/client.cpp:1486
+#: src/client.cpp:1484
msgid "Email Change"
msgstr ""
#. TRANSLATORS: email change message text
-#: src/client.cpp:1488
+#: src/client.cpp:1486
msgid "Email changed successfully!"
msgstr ""
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1515
+#: src/client.cpp:1513
msgid "Unregister Successful"
msgstr ""
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1517
+#: src/client.cpp:1515
msgid "Farewell, come back any time..."
msgstr ""
#. TRANSLATORS: directory creation error
#: src/configmanager.cpp:53 src/dirs.cpp:260 src/dirs.cpp:275 src/dirs.cpp:320
-#: src/dirs.cpp:481 src/dirs.cpp:489
+#: src/dirs.cpp:488 src/dirs.cpp:496
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:363
+#: src/dirs.cpp:370
#, c-format
msgid "Invalid update host: %s."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:404 src/dirs.cpp:411
+#: src/dirs.cpp:411 src/dirs.cpp:418
msgid "Error creating updates directory!"
msgstr ""
-#: src/dirs.cpp:433 src/dirs.cpp:451
+#: src/dirs.cpp:440 src/dirs.cpp:458
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
@@ -612,36 +618,36 @@ msgid "dyecmd srcdyestring dstfile"
msgstr ""
#. TRANSLATORS: chat tab header
-#: src/game.cpp:236 src/gui/widgets/tabs/chattab.cpp:482
+#: src/game.cpp:234 src/gui/widgets/tabs/chattab.cpp:482
msgid "General"
msgstr ""
#. TRANSLATORS: chat tab header
#. TRANSLATORS: full button name
#. TRANSLATORS: debug window name
-#: src/game.cpp:253 src/gui/widgets/tabs/chattab.cpp:484
+#: src/game.cpp:251 src/gui/widgets/tabs/chattab.cpp:484
#: src/gui/windowmenu.cpp:149 src/gui/windows/debugwindow.cpp:42
msgid "Debug"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:541
+#: src/game.cpp:532
#, c-format
msgid "Screenshot saved as %s"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:551
+#: src/game.cpp:542
msgid "Saving screenshot failed!"
msgstr ""
#. TRANSLATORS: error message text
-#: src/game.cpp:634
+#: src/game.cpp:625
msgid "The connection to the server was lost."
msgstr ""
#. TRANSLATORS: error message header
-#: src/game.cpp:637
+#: src/game.cpp:628
msgid "Network Error"
msgstr ""
@@ -1032,6 +1038,7 @@ msgstr ""
#: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
#: src/gui/widgets/tabs/setup_other.cpp:79
#: src/gui/widgets/tabs/setup_visual.cpp:81
+#: src/gui/windows/equipmentwindow.cpp:577
msgid "default"
msgstr ""
@@ -1522,7 +1529,7 @@ msgstr ""
#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:273
#: src/gui/popups/popupmenu.cpp:767 src/gui/widgets/skillinfo.cpp:113
#: src/gui/windows/botcheckerwindow.cpp:89 src/input/pages/basic.cpp:42
-#: src/net/eathena/generalhandler.cpp:289 src/net/tmwa/generalhandler.cpp:321
+#: src/net/eathena/generalhandler.cpp:356 src/net/tmwa/generalhandler.cpp:320
msgid "Attack"
msgstr ""
@@ -1691,7 +1698,7 @@ msgstr ""
#. TRANSLATORS: pet unequip item
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:340 src/gui/windows/equipmentwindow.cpp:70
+#: src/gui/popups/popupmenu.cpp:340 src/gui/windows/equipmentwindow.cpp:72
#: src/gui/windows/inventorywindow.cpp:175 src/resources/itemtypemapdata.h:47
#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
@@ -1749,7 +1756,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:574
+#: src/gui/popups/popupmenu.cpp:574 src/gui/windows/charselectdialog.cpp:132
msgid "Rename"
msgstr ""
@@ -2261,7 +2268,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
#. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:3000 src/net/ea/playerhandler.cpp:364
+#: src/gui/popups/popupmenu.cpp:3000 src/net/ea/playerhandler.cpp:195
msgid "Revive"
msgstr ""
@@ -2285,7 +2292,7 @@ msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: settings group
#. TRANSLATORS: full button name
-#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:319
+#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:315
#: src/gui/windowmenu.cpp:158
msgid "Windows"
msgstr ""
@@ -2313,7 +2320,7 @@ msgstr ""
#. TRANSLATORS: input action name
#: src/gui/setupinputpages.cpp:57 src/gui/widgets/tabs/setup_audio.cpp:151
#: src/gui/widgets/tabs/setup_chat.cpp:179
-#: src/gui/widgets/tabs/setup_other.cpp:341
+#: src/gui/widgets/tabs/setup_other.cpp:337
#: src/gui/widgets/tabs/setup_visual.cpp:192
#: src/gui/windows/charcreatedialog.cpp:119
#: src/gui/windows/registerdialog.cpp:106 src/input/pages/gui.cpp:87
@@ -2326,212 +2333,227 @@ msgid "Gui"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:113
+#: src/gui/userpalette.cpp:116
msgid "Being"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:115
+#: src/gui/userpalette.cpp:118
msgid "Friend names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:117
+#: src/gui/userpalette.cpp:120
msgid "Disregarded names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:119
+#: src/gui/userpalette.cpp:122
msgid "Ignored names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:121
+#: src/gui/userpalette.cpp:124
msgid "Erased names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:123
+#: src/gui/userpalette.cpp:126
msgid "Other players names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:125
+#: src/gui/userpalette.cpp:128
msgid "Own name"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:127
+#: src/gui/userpalette.cpp:130
msgid "GM names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:129
+#: src/gui/userpalette.cpp:132
msgid "NPCs"
msgstr ""
#. TRANSLATORS: palette color
#. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:131 src/gui/widgets/tabs/setup_other.cpp:108
+#: src/gui/userpalette.cpp:134 src/gui/widgets/tabs/setup_other.cpp:108
msgid "Monsters"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:133
+#: src/gui/userpalette.cpp:136
msgid "Monster HP bar"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:139
msgid "Monster HP bar (second color)"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:138
+#: src/gui/userpalette.cpp:141
msgid "Party members"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:140
+#: src/gui/userpalette.cpp:143
msgid "Guild members"
msgstr ""
#. TRANSLATORS: palette color
#. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:142 src/gui/widgets/tabs/setup_visual.cpp:157
+#: src/gui/userpalette.cpp:145 src/gui/widgets/tabs/setup_visual.cpp:157
msgid "Particle effects"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:144
+#: src/gui/userpalette.cpp:147
msgid "Pickup notification"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:146
+#: src/gui/userpalette.cpp:149
msgid "Exp notification"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:148
+#: src/gui/userpalette.cpp:151
msgid "Player HP bar"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:152
+#: src/gui/userpalette.cpp:155
msgid "Player HP bar (second color)"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:154
+#: src/gui/userpalette.cpp:157
msgid "Player hits monster"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:156
+#: src/gui/userpalette.cpp:159
msgid "Monster hits player"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:160
+#: src/gui/userpalette.cpp:163
msgid "Other player hits local player"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:162
+#: src/gui/userpalette.cpp:165
msgid "Critical Hit"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:166
+#: src/gui/userpalette.cpp:169
msgid "Local player hits monster"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:169
+#: src/gui/userpalette.cpp:172
msgid "Local player critical hit"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:172
+#: src/gui/userpalette.cpp:175
msgid "Local player miss"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:174
+#: src/gui/userpalette.cpp:177
msgid "Misses"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:176
+#: src/gui/userpalette.cpp:179
msgid "Portal highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:179
+#: src/gui/userpalette.cpp:182
msgid "Default collision highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:182
+#: src/gui/userpalette.cpp:185
msgid "Air collision highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:185
+#: src/gui/userpalette.cpp:188
msgid "Water collision highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:188
+#: src/gui/userpalette.cpp:191
msgid "Special ground collision highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:191
+#: src/gui/userpalette.cpp:194
msgid "Walkable highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:194
+#: src/gui/userpalette.cpp:197
msgid "Local player attack range"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:197
+#: src/gui/userpalette.cpp:200
msgid "Local player attack range border"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:200
+#: src/gui/userpalette.cpp:203
msgid "Monster attack range"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:204
+#: src/gui/userpalette.cpp:207
msgid "Floor item amount color"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:207
+#: src/gui/userpalette.cpp:210
msgid "Home place"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:210
+#: src/gui/userpalette.cpp:213
msgid "Home place border"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:213
+#: src/gui/userpalette.cpp:216
msgid "Road point"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:216
+#: src/gui/userpalette.cpp:219
msgid "Tiles border"
msgstr ""
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:221
+msgid "Pets"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:223
+msgid "Mercenary"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:225
+msgid "Homunculus"
+msgstr ""
+
#: src/gui/widgets/characterdisplay.cpp:135
#, c-format
msgid "Level: %u"
@@ -2634,7 +2656,8 @@ msgid "Type: %s"
msgstr ""
#. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:108
+#. TRANSLATORS: unknown equipment page name
+#: src/gui/widgets/skillinfo.cpp:108 src/gui/windows/equipmentwindow.cpp:584
msgid "Unknown"
msgstr ""
@@ -2835,22 +2858,22 @@ msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:262
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:313
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:375
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:319
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:387
msgid "Target:"
msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:264
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:319
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:377
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:325
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:389
msgid "Target Id:"
msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:267
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:322
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:379
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:328
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:391
msgid "Target type:"
msgstr ""
@@ -2861,7 +2884,7 @@ msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:271
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:338
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:344
msgid "Target race:"
msgstr ""
@@ -2877,67 +2900,81 @@ msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:277
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:363
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:369
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:387
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:375
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:381
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:399
msgid "Attack delay:"
msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:279
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:350
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:389
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:356
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:401
msgid "Minimal hit:"
msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:281
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:353
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:391
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:359
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:403
msgid "Maximum hit:"
msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:283
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:356
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:393
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:362
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:405
msgid "Critical hit:"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:327
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:285
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:365
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:407
+msgid "Karma:"
+msgstr ""
+
+#. TRANSLATORS: debug window label
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:287
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:368
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:409
+msgid "Manner:"
+msgstr ""
+
+#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:333
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:381
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:339
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:393
msgid "Target Level:"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:341
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:383
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:347
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:395
msgid "Target Party:"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:345
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:385
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:351
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:397
msgid "Target Guild:"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:430
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:436
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:451
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:457
#, c-format
msgid "Ping: %s ms"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:439
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:460
#, c-format
msgid "In: %d bytes/s"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:442
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:463
#, c-format
msgid "Out: %d bytes/s"
msgstr ""
@@ -3766,137 +3803,132 @@ msgstr ""
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_other.cpp:294
-msgid "Enable auction bot support"
-msgstr ""
-
-#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:298
msgid "Enable guild bot support and disable native guild support"
msgstr ""
#. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:304
+#: src/gui/widgets/tabs/setup_other.cpp:300
msgid "Keyboard"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:307
+#: src/gui/widgets/tabs/setup_other.cpp:303
msgid "Repeat delay"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:311
+#: src/gui/widgets/tabs/setup_other.cpp:307
msgid "Repeat interval"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:315
+#: src/gui/widgets/tabs/setup_other.cpp:311
msgid "Custom repeat interval"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:323
+#: src/gui/widgets/tabs/setup_other.cpp:319
msgid "Shortcut buttons"
msgstr ""
#. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:328
+#: src/gui/widgets/tabs/setup_other.cpp:324
msgid "Proxy server"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:332
+#: src/gui/widgets/tabs/setup_other.cpp:328
msgid "Proxy type"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:336
+#: src/gui/widgets/tabs/setup_other.cpp:332
msgid "Proxy address:port"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:344
+#: src/gui/widgets/tabs/setup_other.cpp:340
msgid "Enable server side attack"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:348
+#: src/gui/widgets/tabs/setup_other.cpp:344
msgid "Hide support page link on error"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:352
+#: src/gui/widgets/tabs/setup_other.cpp:348
msgid "Enable double clicks"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:356
+#: src/gui/widgets/tabs/setup_other.cpp:352
msgid "Enable bot checker"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:360
+#: src/gui/widgets/tabs/setup_other.cpp:356
msgid "Enable buggy servers protection (do not disable)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:365
+#: src/gui/widgets/tabs/setup_other.cpp:361
msgid "Enable debug log"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:369
+#: src/gui/widgets/tabs/setup_other.cpp:365
msgid "Ignore logging packets"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:373
+#: src/gui/widgets/tabs/setup_other.cpp:369
msgid "Enable OpenGL log"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:377
+#: src/gui/widgets/tabs/setup_other.cpp:373
msgid "Enable input log"
msgstr ""
#. TRANSLATORS: settings option
#. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_other.cpp:381 src/input/pages/other.cpp:362
+#: src/gui/widgets/tabs/setup_other.cpp:377 src/input/pages/other.cpp:362
msgid "Upload log file"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:385
+#: src/gui/widgets/tabs/setup_other.cpp:381
msgid "Low traffic mode"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:389
+#: src/gui/widgets/tabs/setup_other.cpp:385
msgid "Hide shield sprite"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:394
+#: src/gui/widgets/tabs/setup_other.cpp:390
msgid "Use FBO for screenshots (only for opengl)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:400
+#: src/gui/widgets/tabs/setup_other.cpp:396
msgid "Screenshot directory"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:405
+#: src/gui/widgets/tabs/setup_other.cpp:401
msgid "Network delay between sub servers"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:409
+#: src/gui/widgets/tabs/setup_other.cpp:405
msgid "Show background"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:414
+#: src/gui/widgets/tabs/setup_other.cpp:410
msgid "Screen density override"
msgstr ""
@@ -4127,9 +4159,9 @@ msgstr ""
#. TRANSLATORS: command editor button
#. TRANSLATORS: input action name
#: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:82
-#: src/gui/windows/serverdialog.cpp:125 src/gui/windows/shopwindow.cpp:101
-#: src/gui/windows/shopwindow.cpp:108 src/gui/windows/textcommandeditor.cpp:92
+#: src/gui/windows/charselectdialog.cpp:84
+#: src/gui/windows/serverdialog.cpp:125 src/gui/windows/shopwindow.cpp:100
+#: src/gui/windows/shopwindow.cpp:107 src/gui/windows/textcommandeditor.cpp:92
#: src/input/pages/gui.cpp:111
msgid "Delete"
msgstr "ลบทิ้ง"
@@ -4783,7 +4815,7 @@ msgstr ""
#. TRANSLATORS: equipment window name
#. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:63
+#: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:65
#: src/gui/windows/inventorywindow.cpp:196
msgid "Equipment"
msgstr ""
@@ -4924,7 +4956,7 @@ msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: social window button
#: src/gui/windows/buydialog.cpp:260 src/gui/windows/charcreatedialog.cpp:127
-#: src/gui/windows/charselectdialog.cpp:578
+#: src/gui/windows/charselectdialog.cpp:605
#: src/gui/windows/socialwindow.cpp:86
msgid "Create"
msgstr "สร้าง"
@@ -4968,10 +5000,8 @@ msgstr ""
#. TRANSLATORS: change password window name
#. TRANSLATORS: change password dialog button
-#. TRANSLATORS: char select dialog. button.
#: src/gui/windows/changepassworddialog.cpp:51
#: src/gui/windows/changepassworddialog.cpp:57
-#: src/gui/windows/charselectdialog.cpp:73
msgid "Change Password"
msgstr "เปลี่ยนรหัสผ่าน"
@@ -5125,57 +5155,68 @@ msgid "Are you sure you want to delete this character?"
msgstr "คุณแน่ใจแล้วหรือที่จะลบตัวละครนี้?"
#. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:64
+#: src/gui/windows/charselectdialog.cpp:66
#, c-format
msgid "Account %s (last login time %s)"
msgstr ""
#. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:71
-msgid "Switch Login"
+#: src/gui/windows/charselectdialog.cpp:73
+msgid "Switch"
+msgstr ""
+
+#. TRANSLATORS: char select dialog. button.
+#: src/gui/windows/charselectdialog.cpp:75
+msgid "Password"
msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:78
-#: src/gui/windows/charselectdialog.cpp:573
+#: src/gui/windows/charselectdialog.cpp:80
+#: src/gui/windows/charselectdialog.cpp:595
#: src/gui/windows/updaterwindow.cpp:195
msgid "Play"
msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:80
+#: src/gui/windows/charselectdialog.cpp:82
#: src/net/ea/charserverhandler.cpp:160
+#: src/net/eathena/charserverhandler.cpp:531
+#: src/net/eathena/charserverhandler.cpp:561
msgid "Info"
msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: unregister dialog name
#. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:106
+#: src/gui/windows/charselectdialog.cpp:110
#: src/gui/windows/unregisterdialog.cpp:50
#: src/gui/windows/unregisterdialog.cpp:55
msgid "Unregister"
msgstr ""
#. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:118
+#: src/gui/windows/charselectdialog.cpp:122
msgid "Change Email"
msgstr ""
#. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:156
+#: src/gui/windows/charselectdialog.cpp:166
#, c-format
msgid "Account %s"
msgstr ""
-#: src/gui/windows/charselectdialog.cpp:184
+#: src/gui/windows/charselectdialog.cpp:194
msgid "Please set new pincode"
msgstr ""
+#: src/gui/windows/charselectdialog.cpp:240
+msgid "Please enter new name"
+msgstr ""
+
#. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:237
+#: src/gui/windows/charselectdialog.cpp:259
#, c-format
msgid ""
"Hp: %u/%u\n"
@@ -5185,16 +5226,16 @@ msgid ""
"Money: %s"
msgstr ""
-#: src/gui/windows/charselectdialog.cpp:289
+#: src/gui/windows/charselectdialog.cpp:311
msgid "Incorrect password"
msgstr ""
#. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:429
+#: src/gui/windows/charselectdialog.cpp:451
msgid "Enter password for deleting character"
msgstr ""
-#: src/gui/windows/charselectdialog.cpp:429
+#: src/gui/windows/charselectdialog.cpp:451
msgid "Enter password:"
msgstr ""
@@ -5600,7 +5641,7 @@ msgstr "เลเวล: %d"
#. TRANSLATORS: status bar label
#: src/gui/windows/ministatuswindow.cpp:364
-#: src/gui/windows/ministatuswindow.cpp:402
+#: src/gui/windows/ministatuswindow.cpp:401
msgid "Need"
msgstr ""
@@ -5631,7 +5672,7 @@ msgstr ""
#. TRANSLATORS: shop window button
#. TRANSLATORS: trade window button
#: src/gui/windows/npcdialog.cpp:114 src/gui/windows/serverdialog.cpp:121
-#: src/gui/windows/shopwindow.cpp:99 src/gui/windows/shopwindow.cpp:106
+#: src/gui/windows/shopwindow.cpp:98 src/gui/windows/shopwindow.cpp:105
#: src/gui/windows/tradewindow.cpp:83
msgid "Add"
msgstr ""
@@ -5794,43 +5835,38 @@ msgid "Reset Windows"
msgstr ""
#. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:80
+#: src/gui/windows/shopwindow.cpp:79
msgid "Personal Shop"
msgstr ""
#. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:95
+#: src/gui/windows/shopwindow.cpp:94
msgid "Buy items"
msgstr ""
#. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:97
+#: src/gui/windows/shopwindow.cpp:96
msgid "Sell items"
msgstr ""
#. TRANSLATORS: shop window label
#. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:110
+#: src/gui/windows/shopwindow.cpp:102 src/gui/windows/shopwindow.cpp:109
msgid "Announce"
msgstr ""
#. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:114
+#: src/gui/windows/shopwindow.cpp:113
msgid "Show links in announce"
msgstr ""
-#. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:176 src/gui/windows/shopwindow.cpp:179
-msgid "Auction"
-msgstr ""
-
#. TRANSLATORS: shop window dialog
#. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:233
+#: src/gui/windows/shopwindow.cpp:776 src/net/ea/tradehandler.cpp:233
msgid "Request for Trade"
msgstr ""
-#: src/gui/windows/shopwindow.cpp:791
+#: src/gui/windows/shopwindow.cpp:776
#, c-format
msgid "%s wants to %s %s do you accept?"
msgstr ""
@@ -6158,27 +6194,27 @@ msgstr ""
msgid "Connecting..."
msgstr "กำลังเชื่อมต่อ..."
-#: src/gui/windows/updaterwindow.cpp:398
+#: src/gui/windows/updaterwindow.cpp:407
msgid "Show all news (can be slow)"
msgstr ""
#. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:824
+#: src/gui/windows/updaterwindow.cpp:833
msgid "##1 The update process is incomplete."
msgstr ""
#. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:826
+#: src/gui/windows/updaterwindow.cpp:835
msgid "##1 It is strongly recommended that"
msgstr ""
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:828
+#: src/gui/windows/updaterwindow.cpp:837
msgid "##1 you try again later."
msgstr ""
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1005
+#: src/gui/windows/updaterwindow.cpp:1021
msgid "Completed"
msgstr ""
@@ -6225,25 +6261,25 @@ msgstr ""
#. TRANSLATORS: long key name. must be short.
#. TRANSLATORS: short key name. must be very short.
#. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:370 src/input/inputmanager.cpp:414
+#: src/input/inputmanager.cpp:371 src/input/inputmanager.cpp:415
#: src/input/keyboardconfig.cpp:104
#, c-format
msgid "key_%d"
msgstr ""
#. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:376
+#: src/input/inputmanager.cpp:377
#, c-format
msgid "JButton%d"
msgstr ""
#. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:391
msgid "unknown key"
msgstr ""
#. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:420
+#: src/input/inputmanager.cpp:421
#, c-format
msgid "JB%d"
msgstr ""
@@ -6251,7 +6287,7 @@ msgstr ""
#. TRANSLATORS: unknown short key type. must be short
#. TRANSLATORS: Unknown key short string.
#. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:434 src/input/keyboardconfig.cpp:148
+#: src/input/inputmanager.cpp:435 src/input/keyboardconfig.cpp:148
msgid "u key"
msgstr ""
@@ -7422,74 +7458,74 @@ msgid "Request to quit denied!"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:135
#, c-format
msgid "Guild name: %s"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:191
+#: src/net/ea/guildhandler.cpp:138
#, c-format
msgid "Guild master: %s"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:141
#, c-format
msgid "Guild level: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:197
+#: src/net/ea/guildhandler.cpp:144
#, c-format
msgid "Online members: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:200
+#: src/net/ea/guildhandler.cpp:147
#, c-format
msgid "Max members: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:203
+#: src/net/ea/guildhandler.cpp:150
#, c-format
msgid "Average level: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:206
+#: src/net/ea/guildhandler.cpp:153
#, c-format
msgid "Guild exp: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:209
+#: src/net/ea/guildhandler.cpp:156
#, c-format
msgid "Guild next exp: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:212
+#: src/net/ea/guildhandler.cpp:159
#, c-format
msgid "Guild castle: %s"
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:179
+#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:191
msgid "Item sharing enabled."
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:183
+#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:195
msgid "Item sharing disabled."
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:187
+#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:199
msgid "Item sharing not possible."
msgstr ""
@@ -7500,19 +7536,19 @@ msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:167
+#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:179
msgid "Experience sharing enabled."
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:171
+#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:183
msgid "Experience sharing disabled."
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:175
+#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:187
msgid "Experience sharing not possible."
msgstr ""
@@ -7617,239 +7653,355 @@ msgid "Connection to server terminated. "
msgstr ""
#. TRANSLATORS: message header
-#: src/net/ea/playerhandler.cpp:257 src/net/ea/playerhandler.cpp:273
-#: src/net/ea/playerhandler.cpp:361
+#: src/net/ea/playerhandler.cpp:192 src/net/ea/playerhandler.cpp:418
+#: src/net/ea/playerhandler.cpp:434
msgid "Message"
msgstr ""
#. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:259
+#: src/net/ea/playerhandler.cpp:420
msgid ""
"You are carrying more than half your weight. You are unable to regain "
"health."
msgstr ""
#. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:275
+#: src/net/ea/playerhandler.cpp:436
msgid "You are carrying less than half your weight. You can regain health."
msgstr ""
+#. TRANSLATORS: char rename error
+#: src/net/eathena/charserverhandler.cpp:516
+#: src/net/eathena/charserverhandler.cpp:553
+msgid "Character rename error."
+msgstr ""
+
+#: src/net/eathena/charserverhandler.cpp:531
+msgid "Character renamed."
+msgstr ""
+
+#. TRANSLATORS: char rename error
+#: src/net/eathena/charserverhandler.cpp:544
+msgid "Rename not allowed."
+msgstr ""
+
+#. TRANSLATORS: char rename error
+#: src/net/eathena/charserverhandler.cpp:548
+msgid "New name is not set."
+msgstr ""
+
+#. TRANSLATORS: char rename error
+#: src/net/eathena/charserverhandler.cpp:557
+msgid "Character not found."
+msgstr ""
+
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:125
+#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:124
#, c-format
msgid "Strength %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:127
+#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:126
#, c-format
msgid "Agility %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:129
+#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:128
#, c-format
msgid "Vitality %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:131
+#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:130
#, c-format
msgid "Intelligence %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:128 src/net/tmwa/generalhandler.cpp:133
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:132
#, c-format
msgid "Dexterity %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:135
+#: src/net/eathena/generalhandler.cpp:128 src/net/tmwa/generalhandler.cpp:134
#, c-format
msgid "Luck %s"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:152 src/net/tmwa/generalhandler.cpp:161
+#: src/net/eathena/generalhandler.cpp:159 src/net/tmwa/generalhandler.cpp:160
msgid "Authentication failed."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:155 src/net/tmwa/generalhandler.cpp:165
+#: src/net/eathena/generalhandler.cpp:162 src/net/tmwa/generalhandler.cpp:164
msgid "No servers available."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:160 src/net/tmwa/generalhandler.cpp:171
+#: src/net/eathena/generalhandler.cpp:167 src/net/tmwa/generalhandler.cpp:170
msgid "Someone else is trying to use this account."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:165 src/net/tmwa/generalhandler.cpp:177
+#: src/net/eathena/generalhandler.cpp:172 src/net/tmwa/generalhandler.cpp:176
msgid "This account is already logged in."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:169 src/net/tmwa/generalhandler.cpp:182
+#: src/net/eathena/generalhandler.cpp:176 src/net/tmwa/generalhandler.cpp:181
msgid "Speed hack detected."
msgstr ""
+#: src/net/eathena/generalhandler.cpp:179
+msgid "Server full."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:182
+msgid "Sorry, you are underaged."
+msgstr ""
+
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:172 src/net/tmwa/generalhandler.cpp:186
+#: src/net/eathena/generalhandler.cpp:185 src/net/tmwa/generalhandler.cpp:185
msgid "Duplicated login."
msgstr ""
+#: src/net/eathena/generalhandler.cpp:188
+msgid "To many connections from same ip."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:191
+msgid "Not paid for this time."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:194
+msgid "Pay suspended."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:197
+msgid "Pay changed."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:200
+msgid "Pay wrong ip."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:203
+msgid "Pay game room."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:206
+msgid "Disconnect forced by GM."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:210
+msgid "Ban japan refuse."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:213
+msgid "Remained other account."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:216
+msgid "Ip unfair."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:219
+msgid "Ip count all."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:222
+msgid "Ip count."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:226
+msgid "Memory."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:229
+msgid "Han valid."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:232
+msgid "Ip limited access."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:235
+msgid "Over characters list."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:238
+msgid "Ip blocked."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:241
+msgid "Invalid password count."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:244
+msgid "Not allowed race."
+msgstr ""
+
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:175 src/net/tmwa/generalhandler.cpp:190
+#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:189
msgid "Unknown connection error."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:280
+#: src/net/eathena/generalhandler.cpp:323 src/net/tmwa/generalhandler.cpp:279
msgid "Got disconnected from server!"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:282 src/net/tmwa/generalhandler.cpp:308
+#: src/net/eathena/generalhandler.cpp:348 src/net/tmwa/generalhandler.cpp:307
msgid "Strength"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:310
+#: src/net/eathena/generalhandler.cpp:349 src/net/tmwa/generalhandler.cpp:309
msgid "Agility"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:284 src/net/tmwa/generalhandler.cpp:312
+#: src/net/eathena/generalhandler.cpp:350 src/net/tmwa/generalhandler.cpp:311
msgid "Vitality"
msgstr ""
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:285 src/net/tmwa/generalhandler.cpp:314
+#: src/net/eathena/generalhandler.cpp:352 src/net/tmwa/generalhandler.cpp:314
msgid "Intelligence"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:286 src/net/tmwa/generalhandler.cpp:316
+#: src/net/eathena/generalhandler.cpp:353 src/net/tmwa/generalhandler.cpp:316
msgid "Dexterity"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:287 src/net/tmwa/generalhandler.cpp:318
+#: src/net/eathena/generalhandler.cpp:354 src/net/tmwa/generalhandler.cpp:318
msgid "Luck"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:290 src/net/tmwa/generalhandler.cpp:323
+#: src/net/eathena/generalhandler.cpp:357 src/net/tmwa/generalhandler.cpp:322
msgid "Defense"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:291 src/net/tmwa/generalhandler.cpp:325
+#: src/net/eathena/generalhandler.cpp:358 src/net/tmwa/generalhandler.cpp:324
msgid "M.Attack"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:292 src/net/tmwa/generalhandler.cpp:327
+#: src/net/eathena/generalhandler.cpp:359 src/net/tmwa/generalhandler.cpp:326
msgid "M.Defense"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:294 src/net/tmwa/generalhandler.cpp:330
+#: src/net/eathena/generalhandler.cpp:361 src/net/tmwa/generalhandler.cpp:329
#, no-c-format
msgid "% Accuracy"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:296 src/net/tmwa/generalhandler.cpp:333
+#: src/net/eathena/generalhandler.cpp:363 src/net/tmwa/generalhandler.cpp:332
#, no-c-format
msgid "% Evade"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:298 src/net/tmwa/generalhandler.cpp:336
+#: src/net/eathena/generalhandler.cpp:365 src/net/tmwa/generalhandler.cpp:335
#, no-c-format
msgid "% Critical"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:299 src/net/tmwa/generalhandler.cpp:338
+#: src/net/eathena/generalhandler.cpp:366 src/net/tmwa/generalhandler.cpp:337
msgid "Attack Delay"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:300 src/net/tmwa/generalhandler.cpp:340
+#: src/net/eathena/generalhandler.cpp:367 src/net/tmwa/generalhandler.cpp:339
msgid "Walk Delay"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:301 src/net/tmwa/generalhandler.cpp:342
+#: src/net/eathena/generalhandler.cpp:368 src/net/tmwa/generalhandler.cpp:341
msgid "Attack Range"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:302 src/net/tmwa/generalhandler.cpp:344
+#: src/net/eathena/generalhandler.cpp:369 src/net/tmwa/generalhandler.cpp:343
msgid "Damage per sec."
msgstr ""
-#: src/net/eathena/skillhandler.cpp:228 src/net/eathena/skillhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:370
+msgid "Karma"
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:371
+msgid "Manner"
+msgstr ""
+
+#: src/net/eathena/skillhandler.cpp:304 src/net/eathena/skillhandler.cpp:364
#, c-format
msgid "Unknown skill error: %d"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:235 src/net/tmwa/skillhandler.cpp:224
+#: src/net/eathena/skillhandler.cpp:311 src/net/tmwa/skillhandler.cpp:224
msgid "You have not yet reached a high enough lvl!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:239 src/net/tmwa/skillhandler.cpp:228
+#: src/net/eathena/skillhandler.cpp:315 src/net/tmwa/skillhandler.cpp:228
msgid "Insufficient HP!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:243 src/net/tmwa/skillhandler.cpp:232
+#: src/net/eathena/skillhandler.cpp:319 src/net/tmwa/skillhandler.cpp:232
msgid "Insufficient SP!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:247 src/net/tmwa/skillhandler.cpp:236
+#: src/net/eathena/skillhandler.cpp:323 src/net/tmwa/skillhandler.cpp:236
msgid "You have no memos!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:251 src/net/tmwa/skillhandler.cpp:240
+#: src/net/eathena/skillhandler.cpp:327 src/net/tmwa/skillhandler.cpp:240
msgid "You cannot do that right now!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:255 src/net/tmwa/skillhandler.cpp:244
+#: src/net/eathena/skillhandler.cpp:331 src/net/tmwa/skillhandler.cpp:244
msgid "Seems you need more money... ;-)"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:259 src/net/tmwa/skillhandler.cpp:248
+#: src/net/eathena/skillhandler.cpp:335 src/net/tmwa/skillhandler.cpp:248
msgid "You cannot use this skill with that kind of weapon!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:264 src/net/tmwa/skillhandler.cpp:253
+#: src/net/eathena/skillhandler.cpp:340 src/net/tmwa/skillhandler.cpp:253
msgid "You need another red gem!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:268 src/net/tmwa/skillhandler.cpp:257
+#: src/net/eathena/skillhandler.cpp:344 src/net/tmwa/skillhandler.cpp:257
msgid "You need another blue gem!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:272 src/net/tmwa/skillhandler.cpp:261
+#: src/net/eathena/skillhandler.cpp:348 src/net/tmwa/skillhandler.cpp:261
msgid "You're carrying to much to do this!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:276 src/net/tmwa/skillhandler.cpp:265
+#: src/net/eathena/skillhandler.cpp:352 src/net/tmwa/skillhandler.cpp:265
msgid "Huh? What's that?"
msgstr ""
@@ -7866,32 +8018,32 @@ msgid "%s wants to trade with you, do you accept?"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:349
+#: src/net/tmwa/charserverhandler.cpp:351
msgid "Strength:"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:351
+#: src/net/tmwa/charserverhandler.cpp:353
msgid "Agility:"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:353
+#: src/net/tmwa/charserverhandler.cpp:355
msgid "Vitality:"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:355
+#: src/net/tmwa/charserverhandler.cpp:357
msgid "Intelligence:"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:357
+#: src/net/tmwa/charserverhandler.cpp:359
msgid "Dexterity:"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:359
+#: src/net/tmwa/charserverhandler.cpp:361
msgid "Luck:"
msgstr ""
@@ -8202,269 +8354,306 @@ msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:143
+msgid "You cant left party on this map."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:147
+msgid "You was kicked from party."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:151
+msgid "You cant be kicked kicked from party on this map."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:155
#, c-format
msgid "%s has joined your party."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:147
+#: src/resources/notifications.h:159
#, c-format
msgid "%s is already a member of a party."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:151
+#: src/resources/notifications.h:163
#, c-format
msgid "%s refused your invitation."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:155
+#: src/resources/notifications.h:167
#, c-format
msgid "%s is now a member of your party."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:159
+#: src/resources/notifications.h:171
#, c-format
msgid "%s can't join your party because party is full."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:163
+#: src/resources/notifications.h:175
#, c-format
msgid "QQQ Unknown invite response for %s."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:191
+#: src/resources/notifications.h:203
#, c-format
msgid "%s has left your party."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:195
+#: src/resources/notifications.h:207 src/resources/notifications.h:215
+#, c-format
+msgid "%s cant be kicked from party on this map."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:211
+#, c-format
+msgid "%s has kicked from your party."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:219
#, c-format
msgid "An unknown member tried to say: %s"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:199
+#: src/resources/notifications.h:223
#, c-format
msgid "%s is not in your party!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:203
+#: src/resources/notifications.h:227
#, c-format
msgid "You picked up %s."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:207
+#: src/resources/notifications.h:231
#, c-format
msgid "You spent %s."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:211
+#: src/resources/notifications.h:235
msgid "Cannot raise skill!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:215
+#: src/resources/notifications.h:239
msgid "Equip ammunition first."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:219
+#: src/resources/notifications.h:243
#, c-format
msgid "Trading with %s isn't possible. Trade partner is too far away."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:224
+#: src/resources/notifications.h:248
#, c-format
msgid "Trading with %s isn't possible. Character doesn't exist."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:228
+#: src/resources/notifications.h:252
msgid "Trade cancelled due to an unknown reason."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:232
+#: src/resources/notifications.h:256
#, c-format
msgid "Trade with %s cancelled."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:236
+#: src/resources/notifications.h:260
#, c-format
msgid "Unhandled trade cancel packet with %s"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:240
+#: src/resources/notifications.h:264
msgid "Failed adding item. Trade partner is over weighted."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:244
+#: src/resources/notifications.h:268
msgid "Failed adding item. Trade partner has no free slot."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:248
+#: src/resources/notifications.h:272
msgid "Failed adding item. You can't trade this item."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:252
+#: src/resources/notifications.h:276
msgid "Failed adding item for unknown reason."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:256
+#: src/resources/notifications.h:280
msgid "Trade canceled."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:260
+#: src/resources/notifications.h:284
msgid "Trade completed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:264
+#: src/resources/notifications.h:288
msgid "Kick failed!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:268
+#: src/resources/notifications.h:292
msgid "Kick succeeded!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:272
+#: src/resources/notifications.h:296
#, c-format
msgid "MVP player: %s"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:276
+#: src/resources/notifications.h:300
msgid "All whispers ignored."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:280
+#: src/resources/notifications.h:304
msgid "All whispers ignore failed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:284
+#: src/resources/notifications.h:308
msgid "All whispers unignored."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:288
+#: src/resources/notifications.h:312
msgid "All whispers unignore failed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:295
+#: src/resources/notifications.h:319
msgid "pvp off, gvg off"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:299
+#: src/resources/notifications.h:323
msgid "pvp on"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:303
+#: src/resources/notifications.h:327
msgid "gvg on"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:307
+#: src/resources/notifications.h:331
msgid "pvp on, gvg on"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:311
+#: src/resources/notifications.h:335
msgid "unknown pvp"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:315
+#: src/resources/notifications.h:339
#, c-format
msgid "Char from account %s is already in your party!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:319
+#: src/resources/notifications.h:343
#, c-format
msgid "%s blocked invite!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:323
+#: src/resources/notifications.h:347
msgid "Char is not online!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:327
+#: src/resources/notifications.h:351
msgid "Pet catch failed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:331
+#: src/resources/notifications.h:355
msgid "Pet catched."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:335
+#: src/resources/notifications.h:359
#, c-format
msgid "Pet catch unkown error: %d."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:339
+#: src/resources/notifications.h:363
msgid "Your mercenary duty hour is over."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:343
+#: src/resources/notifications.h:367
msgid "Your mercenary was killed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:347
+#: src/resources/notifications.h:371
msgid "Your mercenary was fired."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:351
+#: src/resources/notifications.h:375
msgid "Your mercenary run away."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:355
+#: src/resources/notifications.h:379
msgid "Mercenary unknown state."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:359
-msgid "Your feed your homunculus."
+#: src/resources/notifications.h:383
+msgid "You feed your homunculus."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:363
+#: src/resources/notifications.h:387
#, c-format
msgid "You cant feed homunculus, because not have %s."
msgstr ""
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:391
+msgid "Card insert failed."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:395
+msgid "Card inserted."
+msgstr ""
+
#. TRANSLATORS: chat option changed message
#: src/utils/booleanoptions.h:27
#, c-format
diff --git a/po/tr.po b/po/tr.po
index 93a6c51dc..4de5e1700 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-10-08 01:19+0300\n"
-"PO-Revision-Date: 2014-09-28 10:01+0000\n"
+"POT-Creation-Date: 2014-10-10 00:16+0300\n"
+"PO-Revision-Date: 2014-10-08 10:02+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Turkish (http://www.transifex.com/projects/p/manaplus/"
"language/tr/)\n"
@@ -5171,15 +5171,13 @@ msgstr ""
#. TRANSLATORS: char select dialog. button.
#: src/gui/windows/charselectdialog.cpp:73
-#, fuzzy
msgid "Switch"
-msgstr "Hesap Değiştir"
+msgstr ""
#. TRANSLATORS: char select dialog. button.
#: src/gui/windows/charselectdialog.cpp:75
-#, fuzzy
msgid "Password"
-msgstr "Şifre:"
+msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: updater window button
@@ -5223,9 +5221,8 @@ msgid "Please set new pincode"
msgstr ""
#: src/gui/windows/charselectdialog.cpp:240
-#, fuzzy
msgid "Please enter new name"
-msgstr "Lütfen bir isim belirtin."
+msgstr ""
#. TRANSLATORS: char select dialog. player info message.
#: src/gui/windows/charselectdialog.cpp:259
@@ -5876,7 +5873,7 @@ msgstr "Duyuruda linkleri göster"
#. TRANSLATORS: shop window dialog
#. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:776 src/net/ea/tradehandler.cpp:233
+#: src/gui/windows/shopwindow.cpp:776 src/net/ea/tradehandler.cpp:192
msgid "Request for Trade"
msgstr "Takas isteği yolla"
@@ -7528,19 +7525,19 @@ msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:191
+#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:207
msgid "Item sharing enabled."
msgstr "Nesne paylaşımı etkinleştirildi."
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:195
+#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:211
msgid "Item sharing disabled."
msgstr "Nesne paylaşımı devre dışı bırakıldı."
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:199
+#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:215
msgid "Item sharing not possible."
msgstr "Nesne paylaşımı mümkün değil."
@@ -7551,19 +7548,19 @@ msgstr "Nesne paylaşımı bilinmiyor."
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:179
+#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:195
msgid "Experience sharing enabled."
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:183
+#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:199
msgid "Experience sharing disabled."
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:187
+#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:203
msgid "Experience sharing not possible."
msgstr ""
@@ -7691,9 +7688,8 @@ msgid "Character rename error."
msgstr ""
#: src/net/eathena/charserverhandler.cpp:531
-#, fuzzy
msgid "Character renamed."
-msgstr "Karakter Puanları: %d"
+msgstr ""
#. TRANSLATORS: char rename error
#: src/net/eathena/charserverhandler.cpp:544
@@ -7707,9 +7703,8 @@ msgstr ""
#. TRANSLATORS: char rename error
#: src/net/eathena/charserverhandler.cpp:557
-#, fuzzy
msgid "Character not found."
-msgstr "Karakter Puanları: %d"
+msgstr ""
#. TRANSLATORS: player stat
#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:124
@@ -7773,9 +7768,8 @@ msgid "Speed hack detected."
msgstr ""
#: src/net/eathena/generalhandler.cpp:179
-#, fuzzy
msgid "Server full."
-msgstr "Sunucu:"
+msgstr ""
#: src/net/eathena/generalhandler.cpp:182
msgid "Sorry, you are underaged."
@@ -7855,9 +7849,8 @@ msgid "Ip blocked."
msgstr ""
#: src/net/eathena/generalhandler.cpp:241
-#, fuzzy
msgid "Invalid password count."
-msgstr "Eski şifre hatalı."
+msgstr ""
#: src/net/eathena/generalhandler.cpp:244
msgid "Not allowed race."
@@ -8024,13 +8017,13 @@ msgid "Huh? What's that?"
msgstr ""
#. TRANSLATORS: trade header
-#: src/net/ea/tradehandler.cpp:100
+#: src/net/ea/tradehandler.cpp:105
#, c-format
msgid "Trade: You and %s"
msgstr "Takas: Sen ve %s"
#. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:235
+#: src/net/ea/tradehandler.cpp:194
#, c-format
msgid "%s wants to trade with you, do you accept?"
msgstr "%s sana takas isteği yolladı, kabul ediyor musun?"
@@ -8249,429 +8242,454 @@ msgstr "Satın alınamadı."
#. TRANSLATORS: notification message
#: src/resources/notifications.h:47
+#, fuzzy
+msgid "Unable to buy. You not have enought money."
+msgstr "Yeterli paran yok."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:51
+#, fuzzy
+msgid "Unable to buy. You overweight."
+msgstr "Satın alınamadı."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:55
+msgid "Unable to buy. You have too many items."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:59
msgid "Nothing to sell."
msgstr "Satılacak hiç bir şey yok."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:51
+#: src/resources/notifications.h:63
msgid "Thanks for selling."
msgstr "Sattığınız için teşekkürler."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:55
+#: src/resources/notifications.h:67
msgid "Unable to sell."
msgstr "Satılamadı."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:59
+#: src/resources/notifications.h:71
msgid "Unable to sell while trading."
msgstr "Takas sırasında satış yapılamaz."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:63
+#: src/resources/notifications.h:75
msgid "Unable to sell unsellable item."
msgstr "Satılamaz nesnenin satışı yapılamadı."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:67
+#: src/resources/notifications.h:79
#, c-format
msgid "Online users: %d"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:71
+#: src/resources/notifications.h:83
msgid "Guild created."
msgstr "Lonca yaratıldı."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:75
+#: src/resources/notifications.h:87
msgid "You are already in guild."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:79
+#: src/resources/notifications.h:91
msgid "Emperium check failed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:83
+#: src/resources/notifications.h:95
msgid "Unknown server response."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:87
+#: src/resources/notifications.h:99
msgid "You have left the guild."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:91
+#: src/resources/notifications.h:103
msgid "Could not invite user to guild."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:95
+#: src/resources/notifications.h:107
msgid "User rejected guild invite."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:99
+#: src/resources/notifications.h:111
msgid "User is now part of your guild."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:103
+#: src/resources/notifications.h:115
msgid "Your guild is full."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:107
+#: src/resources/notifications.h:119
msgid "Unknown guild invite response."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:111
+#: src/resources/notifications.h:123
#, c-format
msgid "%s has left your guild."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:115
+#: src/resources/notifications.h:127
msgid "You were kicked from guild."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:119
+#: src/resources/notifications.h:131
#, c-format
msgid "%s has kicked from your guild."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:123
+#: src/resources/notifications.h:135
msgid "Failed to use item."
msgstr "Nesne kullanımı başarısız oldu."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:127
+#: src/resources/notifications.h:139
msgid "Unable to equip."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:131
+#: src/resources/notifications.h:143
+msgid "Unable to equip because you have wrong level."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:147
msgid "Could not create party."
msgstr "Grup kurulamadı."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:135
+#: src/resources/notifications.h:151
msgid "Party successfully created."
msgstr "Grup başarıyla kuruldu."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:139
+#: src/resources/notifications.h:155
msgid "You have left the party."
msgstr "Gruptan ayrıldın."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:143
-#, fuzzy
+#: src/resources/notifications.h:159
msgid "You cant left party on this map."
-msgstr "Gruptan ayrıldın."
+msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:147
-#, fuzzy
+#: src/resources/notifications.h:163
msgid "You was kicked from party."
-msgstr "Gruptan at"
+msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:151
-msgid "You cant be kicked kicked from party on this map."
+#: src/resources/notifications.h:167
+msgid "You cant be kicked from party on this map."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:155
+#: src/resources/notifications.h:171
#, c-format
msgid "%s has joined your party."
msgstr "%s grubuna katıldı."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:159
+#: src/resources/notifications.h:175
#, c-format
msgid "%s is already a member of a party."
msgstr "%s zaten grubuna dahil."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:163
+#: src/resources/notifications.h:179
#, c-format
msgid "%s refused your invitation."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:167
+#: src/resources/notifications.h:183
#, c-format
msgid "%s is now a member of your party."
msgstr "%s artık grubuna dahil."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:171
+#: src/resources/notifications.h:187
#, c-format
msgid "%s can't join your party because party is full."
msgstr "Grubun dolu olduğu için %s gruba katılamadı."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:175
+#: src/resources/notifications.h:191
#, c-format
msgid "QQQ Unknown invite response for %s."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:203
+#: src/resources/notifications.h:219
#, c-format
msgid "%s has left your party."
msgstr "%s grubundan ayrıldı."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:207 src/resources/notifications.h:215
+#: src/resources/notifications.h:223 src/resources/notifications.h:231
#, c-format
msgid "%s cant be kicked from party on this map."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:211
-#, fuzzy, c-format
+#: src/resources/notifications.h:227
+#, c-format
msgid "%s has kicked from your party."
-msgstr "%s grubuna katıldı."
+msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:219
+#: src/resources/notifications.h:235
#, c-format
msgid "An unknown member tried to say: %s"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:223
+#: src/resources/notifications.h:239
#, c-format
msgid "%s is not in your party!"
msgstr "%s grubunda değil!"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:227
+#: src/resources/notifications.h:243
#, c-format
msgid "You picked up %s."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:231
+#: src/resources/notifications.h:247
#, c-format
msgid "You spent %s."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:235
+#: src/resources/notifications.h:251
msgid "Cannot raise skill!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:239
+#: src/resources/notifications.h:255
msgid "Equip ammunition first."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:243
+#: src/resources/notifications.h:259
#, c-format
msgid "Trading with %s isn't possible. Trade partner is too far away."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:248
+#: src/resources/notifications.h:264
#, c-format
msgid "Trading with %s isn't possible. Character doesn't exist."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:252
+#: src/resources/notifications.h:268
msgid "Trade cancelled due to an unknown reason."
msgstr "Takas bilinemeyen bir sebepten ötürü iptal edildi."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:256
+#: src/resources/notifications.h:272
#, c-format
msgid "Trade with %s cancelled."
msgstr "%s ile takas iptal edildi."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:260
+#: src/resources/notifications.h:276
+#, fuzzy, c-format
+msgid "Trade with %s cancelled, because player is busy"
+msgstr "%s ile takas iptal edildi."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:280
#, c-format
msgid "Unhandled trade cancel packet with %s"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:264
+#: src/resources/notifications.h:284
msgid "Failed adding item. Trade partner is over weighted."
msgstr "Nesne eklenemedi. Takas ortağı fazla yük taşıyor."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:268
+#: src/resources/notifications.h:288
msgid "Failed adding item. Trade partner has no free slot."
msgstr "Nesne eklenemedi. Takas ortağı boş yere sahip değil."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:272
+#: src/resources/notifications.h:292
msgid "Failed adding item. You can't trade this item."
msgstr "Nesne eklenemedi. Bu nesneyi takas edemezsin."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:276
+#: src/resources/notifications.h:296
msgid "Failed adding item for unknown reason."
msgstr "Nesnenin eklenmesi bilinmeyen bir sebepten başarısız oldu."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:280
+#: src/resources/notifications.h:300
msgid "Trade canceled."
msgstr "Takas iptal edildi."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:284
+#: src/resources/notifications.h:304
msgid "Trade completed."
msgstr "Takas tamamlandı."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:288
+#: src/resources/notifications.h:308
msgid "Kick failed!"
msgstr "Atma işlemi başarısız oldu!"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:292
+#: src/resources/notifications.h:312
msgid "Kick succeeded!"
msgstr "Atma işlemi başarılı!"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:296
+#: src/resources/notifications.h:316
#, c-format
msgid "MVP player: %s"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:300
+#: src/resources/notifications.h:320
msgid "All whispers ignored."
msgstr "Bütün fısıltılar görmezden gelindi."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:304
+#: src/resources/notifications.h:324
msgid "All whispers ignore failed."
msgstr "Bütün fısıltıları görmezden gelme başırısız oldu."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:308
+#: src/resources/notifications.h:328
msgid "All whispers unignored."
msgstr "Bütün fısıltıların görmezden gelinmesi durduruldu."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:312
+#: src/resources/notifications.h:332
msgid "All whispers unignore failed."
msgstr "Bütün fısıltıların görmezden gelinmesinin durdurulması başarısız oldu."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:319
+#: src/resources/notifications.h:339
msgid "pvp off, gvg off"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:323
+#: src/resources/notifications.h:343
msgid "pvp on"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:327
+#: src/resources/notifications.h:347
msgid "gvg on"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:331
+#: src/resources/notifications.h:351
msgid "pvp on, gvg on"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:335
+#: src/resources/notifications.h:355
msgid "unknown pvp"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:339
+#: src/resources/notifications.h:359
#, c-format
msgid "Char from account %s is already in your party!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:343
+#: src/resources/notifications.h:363
#, c-format
msgid "%s blocked invite!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:347
+#: src/resources/notifications.h:367
msgid "Char is not online!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:351
+#: src/resources/notifications.h:371
msgid "Pet catch failed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:355
+#: src/resources/notifications.h:375
msgid "Pet catched."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:359
+#: src/resources/notifications.h:379
#, c-format
msgid "Pet catch unkown error: %d."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:363
+#: src/resources/notifications.h:383
msgid "Your mercenary duty hour is over."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:367
+#: src/resources/notifications.h:387
msgid "Your mercenary was killed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:371
+#: src/resources/notifications.h:391
msgid "Your mercenary was fired."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:375
+#: src/resources/notifications.h:395
msgid "Your mercenary run away."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:379
+#: src/resources/notifications.h:399
msgid "Mercenary unknown state."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:383
+#: src/resources/notifications.h:403
msgid "You feed your homunculus."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:387
+#: src/resources/notifications.h:407
#, c-format
msgid "You cant feed homunculus, because not have %s."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:391
-#, fuzzy
+#: src/resources/notifications.h:411
msgid "Card insert failed."
-msgstr "Takas başarılı olamadı!"
+msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:395
+#: src/resources/notifications.h:415
msgid "Card inserted."
msgstr ""
diff --git a/po/vls.po b/po/vls.po
index d254f43ca..8da2a5a74 100644
--- a/po/vls.po
+++ b/po/vls.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-27 13:23+0300\n"
-"PO-Revision-Date: 2014-09-28 10:01+0000\n"
+"POT-Creation-Date: 2014-10-08 01:19+0300\n"
+"PO-Revision-Date: 2014-10-08 10:01+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Vlaams (http://www.transifex.com/projects/p/manaplus/language/vls/)\n"
"MIME-Version: 1.0\n"
@@ -31,7 +31,7 @@ msgstr ""
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:131 src/client.cpp:1463 src/client.cpp:1490
+#: src/actions/actions.cpp:131 src/client.cpp:1461 src/client.cpp:1488
#: src/gamemodifiers.cpp:423 src/gui/widgets/tabs/setup_input.cpp:163
#: src/gui/widgets/tabs/setup_theme.cpp:312
#: src/gui/widgets/tabs/setup_theme.cpp:343
@@ -42,8 +42,8 @@ msgstr ""
#: src/gui/windows/changeemaildialog.cpp:170
#: src/gui/windows/changepassworddialog.cpp:160
#: src/gui/windows/charcreatedialog.cpp:373
-#: src/gui/windows/charselectdialog.cpp:255
-#: src/gui/windows/charselectdialog.cpp:291 src/gui/windows/editdialog.cpp:49
+#: src/gui/windows/charselectdialog.cpp:277
+#: src/gui/windows/charselectdialog.cpp:313 src/gui/windows/editdialog.cpp:49
#: src/gui/windows/editserverdialog.cpp:61
#: src/gui/windows/editserverdialog.cpp:208
#: src/gui/windows/itemamountwindow.cpp:158 src/gui/windows/quitdialog.cpp:70
@@ -51,7 +51,9 @@ msgstr ""
#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
#: src/net/ea/charserverhandler.cpp:143 src/net/ea/charserverhandler.cpp:162
#: src/net/ea/charserverhandler.cpp:175 src/net/ea/gamehandler.cpp:79
-#: src/net/ea/playerhandler.cpp:263 src/net/ea/playerhandler.cpp:279
+#: src/net/ea/playerhandler.cpp:424 src/net/ea/playerhandler.cpp:440
+#: src/net/eathena/charserverhandler.cpp:533
+#: src/net/eathena/charserverhandler.cpp:563
msgid "OK"
msgstr ""
@@ -175,7 +177,7 @@ msgstr ""
#. TRANSLATORS: party invite message
#. TRANSLATORS: change relation
-#: src/actions/chat.cpp:303 src/actions/commands.cpp:65
+#: src/actions/chat.cpp:303 src/actions/commands.cpp:64
msgid "Please specify a name."
msgstr ""
@@ -198,75 +200,75 @@ msgid "Message now closes chat."
msgstr ""
#. TRANSLATORS: change relation
-#: src/actions/commands.cpp:108
+#: src/actions/commands.cpp:107
#, c-format
msgid "Player already %s!"
msgstr ""
#. TRANSLATORS: change relation
-#: src/actions/commands.cpp:120
+#: src/actions/commands.cpp:119
#, c-format
msgid "Player successfully %s!"
msgstr ""
#. TRANSLATORS: change relation
-#: src/actions/commands.cpp:122
+#: src/actions/commands.cpp:121
#, c-format
msgid "Player could not be %s!"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:153
+#: src/actions/commands.cpp:152
msgid "Player wasn't ignored!"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:162
+#: src/actions/commands.cpp:161
msgid "Player no longer ignored!"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:164
+#: src/actions/commands.cpp:163
msgid "Player could not be unignored!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/actions/commands.cpp:179
+#: src/actions/commands.cpp:178
msgid "Player already erased!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/actions/commands.cpp:192
+#: src/actions/commands.cpp:191
msgid "Player no longer erased!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/actions/commands.cpp:194
+#: src/actions/commands.cpp:193
msgid "Player could not be erased!"
msgstr ""
#. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:201
+#: src/actions/commands.cpp:200
msgid "friend"
msgstr ""
#. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:208
+#: src/actions/commands.cpp:207
msgid "disregarded"
msgstr ""
#. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:215
+#: src/actions/commands.cpp:214
msgid "neutral"
msgstr ""
#. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:222
+#: src/actions/commands.cpp:221
msgid "blacklisted"
msgstr ""
#. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:229
+#: src/actions/commands.cpp:228
msgid "enemy"
msgstr ""
@@ -281,77 +283,77 @@ msgid "Accepting incoming trade requests"
msgstr ""
#. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1306
+#: src/actormanager.cpp:1310
msgid "Visible on map"
msgstr ""
#. TRANSLATORS: default race name
-#: src/being/being.cpp:389
+#: src/being/being.cpp:393
msgid "Human"
msgstr ""
-#: src/being/being.cpp:556
+#: src/being/being.cpp:560
msgid "dodge"
msgstr ""
-#: src/being/being.cpp:556
+#: src/being/being.cpp:560
msgid "miss"
msgstr ""
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1865 src/gui/windows/whoisonline.cpp:855
+#: src/being/being.cpp:1869 src/gui/windows/whoisonline.cpp:855
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1870 src/gui/windows/whoisonline.cpp:860
+#: src/being/being.cpp:1874 src/gui/windows/whoisonline.cpp:860
msgid "I"
msgstr ""
#. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:379
+#: src/being/localplayer.cpp:380
#, c-format
msgid "You were killed by %s"
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:824
+#: src/being/localplayer.cpp:825
msgid "Tried to pick up nonexistent item."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:828
+#: src/being/localplayer.cpp:829
msgid "Item is too heavy."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:832
+#: src/being/localplayer.cpp:833
msgid "Item is too far away."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:836
+#: src/being/localplayer.cpp:837
msgid "Inventory is full."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:840
+#: src/being/localplayer.cpp:841
msgid "Stack is too big."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:844
+#: src/being/localplayer.cpp:845
msgid "Item belongs to someone else."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:848
+#: src/being/localplayer.cpp:849
msgid "Unknown problem picking up item."
msgstr ""
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:872
+#: src/being/localplayer.cpp:873
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -360,43 +362,43 @@ msgstr[1] ""
#. TRANSLATORS: this is normal experience
#. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1054 src/being/localplayer.cpp:1055
-#: src/being/localplayer.cpp:1091
+#: src/being/localplayer.cpp:1055 src/being/localplayer.cpp:1056
+#: src/being/localplayer.cpp:1092
msgid "xp"
msgstr ""
#. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1059 src/being/localplayer.cpp:1065
-#: src/being/localplayer.cpp:1071
+#: src/being/localplayer.cpp:1060 src/being/localplayer.cpp:1066
+#: src/being/localplayer.cpp:1072
msgid "job"
msgstr ""
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2794
+#: src/being/localplayer.cpp:2795
#, c-format
msgid "Follow: %s"
msgstr ""
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2800 src/being/localplayer.cpp:2825
+#: src/being/localplayer.cpp:2801 src/being/localplayer.cpp:2826
msgid "Follow canceled"
msgstr ""
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2810
+#: src/being/localplayer.cpp:2811
#, c-format
msgid "Imitation: %s"
msgstr ""
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2816 src/being/localplayer.cpp:2830
+#: src/being/localplayer.cpp:2817 src/being/localplayer.cpp:2831
msgid "Imitation canceled"
msgstr ""
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3180
+#: src/being/localplayer.cpp:3181
#, c-format
msgid "You see %s"
msgstr ""
@@ -434,37 +436,37 @@ msgstr ""
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:920 src/gui/windowmenu.cpp:162
+#: src/client.cpp:918 src/gui/windowmenu.cpp:162
#: src/gui/windows/setupwindow.cpp:62
msgid "Setup"
msgstr ""
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:923 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:921 src/gui/widgets/tabs/setup_perfomance.cpp:54
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:926 src/gui/widgets/tabs/setup_video.cpp:105
+#: src/client.cpp:924 src/gui/widgets/tabs/setup_video.cpp:105
msgid "Video"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:929 src/gui/widgets/tabs/setup_theme.cpp:122
+#: src/client.cpp:927 src/gui/widgets/tabs/setup_theme.cpp:122
msgid "Theme"
msgstr ""
#. TRANSLATORS: theme tab quick button
-#: src/client.cpp:932
+#: src/client.cpp:930
msgid "About"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:935 src/gui/windowmenu.cpp:74
+#: src/client.cpp:933 src/gui/windowmenu.cpp:74
#: src/gui/windows/helpwindow.cpp:53
msgid "Help"
msgstr ""
@@ -480,42 +482,42 @@ msgstr ""
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:939 src/client.cpp:1391 src/client.cpp:1405
+#: src/client.cpp:937 src/client.cpp:1389 src/client.cpp:1403
#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:691
#: src/gui/popups/popupmenu.cpp:923 src/gui/windows/didyouknowwindow.cpp:81
#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:74
#: src/gui/windows/npcdialog.cpp:112 src/gui/windows/questswindow.cpp:77
-#: src/gui/windows/shopwindow.cpp:84
+#: src/gui/windows/shopwindow.cpp:83
msgid "Close"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1065
+#: src/client.cpp:1063
msgid "Connecting to server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1113
+#: src/client.cpp:1111
msgid "Logging in"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1156
+#: src/client.cpp:1154
msgid "Entering game world"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1282
+#: src/client.cpp:1280
msgid "Requesting characters"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1322
+#: src/client.cpp:1320
msgid "Connecting to the game server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1334
+#: src/client.cpp:1332
msgid "Changing game servers"
msgstr ""
@@ -529,72 +531,76 @@ msgstr ""
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1389 src/client.cpp:1403 src/client.cpp:1598
+#. TRANSLATORS: info message
+#. TRANSLATORS: ok dialog button
+#: src/client.cpp:1387 src/client.cpp:1401 src/client.cpp:1596
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
#: src/gui/windows/charcreatedialog.cpp:369
-#: src/gui/windows/charselectdialog.cpp:289
+#: src/gui/windows/charselectdialog.cpp:311
#: src/gui/windows/editserverdialog.cpp:203
#: src/gui/windows/registerdialog.cpp:245
#: src/gui/windows/unregisterdialog.cpp:146
#: src/net/ea/charserverhandler.cpp:141 src/net/ea/charserverhandler.cpp:173
+#: src/net/eathena/charserverhandler.cpp:516
+#: src/net/eathena/charserverhandler.cpp:518
msgid "Error"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1418
+#: src/client.cpp:1416
msgid "Requesting registration details"
msgstr ""
#. TRANSLATORS: password change message header
-#: src/client.cpp:1459
+#: src/client.cpp:1457
msgid "Password Change"
msgstr ""
#. TRANSLATORS: password change message text
-#: src/client.cpp:1461
+#: src/client.cpp:1459
msgid "Password changed successfully!"
msgstr ""
#. TRANSLATORS: email change message header
-#: src/client.cpp:1486
+#: src/client.cpp:1484
msgid "Email Change"
msgstr ""
#. TRANSLATORS: email change message text
-#: src/client.cpp:1488
+#: src/client.cpp:1486
msgid "Email changed successfully!"
msgstr ""
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1515
+#: src/client.cpp:1513
msgid "Unregister Successful"
msgstr ""
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1517
+#: src/client.cpp:1515
msgid "Farewell, come back any time..."
msgstr ""
#. TRANSLATORS: directory creation error
#: src/configmanager.cpp:53 src/dirs.cpp:260 src/dirs.cpp:275 src/dirs.cpp:320
-#: src/dirs.cpp:481 src/dirs.cpp:489
+#: src/dirs.cpp:488 src/dirs.cpp:496
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:363
+#: src/dirs.cpp:370
#, c-format
msgid "Invalid update host: %s."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:404 src/dirs.cpp:411
+#: src/dirs.cpp:411 src/dirs.cpp:418
msgid "Error creating updates directory!"
msgstr ""
-#: src/dirs.cpp:433 src/dirs.cpp:451
+#: src/dirs.cpp:440 src/dirs.cpp:458
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
@@ -612,36 +618,36 @@ msgid "dyecmd srcdyestring dstfile"
msgstr ""
#. TRANSLATORS: chat tab header
-#: src/game.cpp:236 src/gui/widgets/tabs/chattab.cpp:482
+#: src/game.cpp:234 src/gui/widgets/tabs/chattab.cpp:482
msgid "General"
msgstr ""
#. TRANSLATORS: chat tab header
#. TRANSLATORS: full button name
#. TRANSLATORS: debug window name
-#: src/game.cpp:253 src/gui/widgets/tabs/chattab.cpp:484
+#: src/game.cpp:251 src/gui/widgets/tabs/chattab.cpp:484
#: src/gui/windowmenu.cpp:149 src/gui/windows/debugwindow.cpp:42
msgid "Debug"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:541
+#: src/game.cpp:532
#, c-format
msgid "Screenshot saved as %s"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:551
+#: src/game.cpp:542
msgid "Saving screenshot failed!"
msgstr ""
#. TRANSLATORS: error message text
-#: src/game.cpp:634
+#: src/game.cpp:625
msgid "The connection to the server was lost."
msgstr ""
#. TRANSLATORS: error message header
-#: src/game.cpp:637
+#: src/game.cpp:628
msgid "Network Error"
msgstr ""
@@ -1032,6 +1038,7 @@ msgstr ""
#: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
#: src/gui/widgets/tabs/setup_other.cpp:79
#: src/gui/widgets/tabs/setup_visual.cpp:81
+#: src/gui/windows/equipmentwindow.cpp:577
msgid "default"
msgstr ""
@@ -1522,7 +1529,7 @@ msgstr ""
#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:273
#: src/gui/popups/popupmenu.cpp:767 src/gui/widgets/skillinfo.cpp:113
#: src/gui/windows/botcheckerwindow.cpp:89 src/input/pages/basic.cpp:42
-#: src/net/eathena/generalhandler.cpp:289 src/net/tmwa/generalhandler.cpp:321
+#: src/net/eathena/generalhandler.cpp:356 src/net/tmwa/generalhandler.cpp:320
msgid "Attack"
msgstr ""
@@ -1691,7 +1698,7 @@ msgstr ""
#. TRANSLATORS: pet unequip item
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:340 src/gui/windows/equipmentwindow.cpp:70
+#: src/gui/popups/popupmenu.cpp:340 src/gui/windows/equipmentwindow.cpp:72
#: src/gui/windows/inventorywindow.cpp:175 src/resources/itemtypemapdata.h:47
#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
@@ -1749,7 +1756,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:574
+#: src/gui/popups/popupmenu.cpp:574 src/gui/windows/charselectdialog.cpp:132
msgid "Rename"
msgstr ""
@@ -2261,7 +2268,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
#. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:3000 src/net/ea/playerhandler.cpp:364
+#: src/gui/popups/popupmenu.cpp:3000 src/net/ea/playerhandler.cpp:195
msgid "Revive"
msgstr ""
@@ -2285,7 +2292,7 @@ msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: settings group
#. TRANSLATORS: full button name
-#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:319
+#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:315
#: src/gui/windowmenu.cpp:158
msgid "Windows"
msgstr ""
@@ -2313,7 +2320,7 @@ msgstr ""
#. TRANSLATORS: input action name
#: src/gui/setupinputpages.cpp:57 src/gui/widgets/tabs/setup_audio.cpp:151
#: src/gui/widgets/tabs/setup_chat.cpp:179
-#: src/gui/widgets/tabs/setup_other.cpp:341
+#: src/gui/widgets/tabs/setup_other.cpp:337
#: src/gui/widgets/tabs/setup_visual.cpp:192
#: src/gui/windows/charcreatedialog.cpp:119
#: src/gui/windows/registerdialog.cpp:106 src/input/pages/gui.cpp:87
@@ -2326,212 +2333,227 @@ msgid "Gui"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:113
+#: src/gui/userpalette.cpp:116
msgid "Being"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:115
+#: src/gui/userpalette.cpp:118
msgid "Friend names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:117
+#: src/gui/userpalette.cpp:120
msgid "Disregarded names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:119
+#: src/gui/userpalette.cpp:122
msgid "Ignored names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:121
+#: src/gui/userpalette.cpp:124
msgid "Erased names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:123
+#: src/gui/userpalette.cpp:126
msgid "Other players names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:125
+#: src/gui/userpalette.cpp:128
msgid "Own name"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:127
+#: src/gui/userpalette.cpp:130
msgid "GM names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:129
+#: src/gui/userpalette.cpp:132
msgid "NPCs"
msgstr ""
#. TRANSLATORS: palette color
#. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:131 src/gui/widgets/tabs/setup_other.cpp:108
+#: src/gui/userpalette.cpp:134 src/gui/widgets/tabs/setup_other.cpp:108
msgid "Monsters"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:133
+#: src/gui/userpalette.cpp:136
msgid "Monster HP bar"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:139
msgid "Monster HP bar (second color)"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:138
+#: src/gui/userpalette.cpp:141
msgid "Party members"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:140
+#: src/gui/userpalette.cpp:143
msgid "Guild members"
msgstr ""
#. TRANSLATORS: palette color
#. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:142 src/gui/widgets/tabs/setup_visual.cpp:157
+#: src/gui/userpalette.cpp:145 src/gui/widgets/tabs/setup_visual.cpp:157
msgid "Particle effects"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:144
+#: src/gui/userpalette.cpp:147
msgid "Pickup notification"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:146
+#: src/gui/userpalette.cpp:149
msgid "Exp notification"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:148
+#: src/gui/userpalette.cpp:151
msgid "Player HP bar"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:152
+#: src/gui/userpalette.cpp:155
msgid "Player HP bar (second color)"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:154
+#: src/gui/userpalette.cpp:157
msgid "Player hits monster"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:156
+#: src/gui/userpalette.cpp:159
msgid "Monster hits player"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:160
+#: src/gui/userpalette.cpp:163
msgid "Other player hits local player"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:162
+#: src/gui/userpalette.cpp:165
msgid "Critical Hit"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:166
+#: src/gui/userpalette.cpp:169
msgid "Local player hits monster"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:169
+#: src/gui/userpalette.cpp:172
msgid "Local player critical hit"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:172
+#: src/gui/userpalette.cpp:175
msgid "Local player miss"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:174
+#: src/gui/userpalette.cpp:177
msgid "Misses"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:176
+#: src/gui/userpalette.cpp:179
msgid "Portal highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:179
+#: src/gui/userpalette.cpp:182
msgid "Default collision highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:182
+#: src/gui/userpalette.cpp:185
msgid "Air collision highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:185
+#: src/gui/userpalette.cpp:188
msgid "Water collision highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:188
+#: src/gui/userpalette.cpp:191
msgid "Special ground collision highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:191
+#: src/gui/userpalette.cpp:194
msgid "Walkable highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:194
+#: src/gui/userpalette.cpp:197
msgid "Local player attack range"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:197
+#: src/gui/userpalette.cpp:200
msgid "Local player attack range border"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:200
+#: src/gui/userpalette.cpp:203
msgid "Monster attack range"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:204
+#: src/gui/userpalette.cpp:207
msgid "Floor item amount color"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:207
+#: src/gui/userpalette.cpp:210
msgid "Home place"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:210
+#: src/gui/userpalette.cpp:213
msgid "Home place border"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:213
+#: src/gui/userpalette.cpp:216
msgid "Road point"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:216
+#: src/gui/userpalette.cpp:219
msgid "Tiles border"
msgstr ""
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:221
+msgid "Pets"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:223
+msgid "Mercenary"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:225
+msgid "Homunculus"
+msgstr ""
+
#: src/gui/widgets/characterdisplay.cpp:135
#, c-format
msgid "Level: %u"
@@ -2634,7 +2656,8 @@ msgid "Type: %s"
msgstr ""
#. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:108
+#. TRANSLATORS: unknown equipment page name
+#: src/gui/widgets/skillinfo.cpp:108 src/gui/windows/equipmentwindow.cpp:584
msgid "Unknown"
msgstr ""
@@ -2835,22 +2858,22 @@ msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:262
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:313
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:375
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:319
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:387
msgid "Target:"
msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:264
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:319
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:377
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:325
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:389
msgid "Target Id:"
msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:267
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:322
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:379
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:328
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:391
msgid "Target type:"
msgstr ""
@@ -2861,7 +2884,7 @@ msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:271
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:338
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:344
msgid "Target race:"
msgstr ""
@@ -2877,67 +2900,81 @@ msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:277
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:363
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:369
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:387
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:375
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:381
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:399
msgid "Attack delay:"
msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:279
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:350
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:389
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:356
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:401
msgid "Minimal hit:"
msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:281
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:353
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:391
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:359
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:403
msgid "Maximum hit:"
msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:283
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:356
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:393
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:362
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:405
msgid "Critical hit:"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:327
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:285
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:365
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:407
+msgid "Karma:"
+msgstr ""
+
+#. TRANSLATORS: debug window label
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:287
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:368
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:409
+msgid "Manner:"
+msgstr ""
+
+#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:333
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:381
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:339
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:393
msgid "Target Level:"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:341
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:383
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:347
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:395
msgid "Target Party:"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:345
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:385
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:351
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:397
msgid "Target Guild:"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:430
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:436
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:451
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:457
#, c-format
msgid "Ping: %s ms"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:439
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:460
#, c-format
msgid "In: %d bytes/s"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:442
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:463
#, c-format
msgid "Out: %d bytes/s"
msgstr ""
@@ -3766,137 +3803,132 @@ msgstr ""
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_other.cpp:294
-msgid "Enable auction bot support"
-msgstr ""
-
-#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:298
msgid "Enable guild bot support and disable native guild support"
msgstr ""
#. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:304
+#: src/gui/widgets/tabs/setup_other.cpp:300
msgid "Keyboard"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:307
+#: src/gui/widgets/tabs/setup_other.cpp:303
msgid "Repeat delay"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:311
+#: src/gui/widgets/tabs/setup_other.cpp:307
msgid "Repeat interval"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:315
+#: src/gui/widgets/tabs/setup_other.cpp:311
msgid "Custom repeat interval"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:323
+#: src/gui/widgets/tabs/setup_other.cpp:319
msgid "Shortcut buttons"
msgstr ""
#. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:328
+#: src/gui/widgets/tabs/setup_other.cpp:324
msgid "Proxy server"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:332
+#: src/gui/widgets/tabs/setup_other.cpp:328
msgid "Proxy type"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:336
+#: src/gui/widgets/tabs/setup_other.cpp:332
msgid "Proxy address:port"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:344
+#: src/gui/widgets/tabs/setup_other.cpp:340
msgid "Enable server side attack"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:348
+#: src/gui/widgets/tabs/setup_other.cpp:344
msgid "Hide support page link on error"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:352
+#: src/gui/widgets/tabs/setup_other.cpp:348
msgid "Enable double clicks"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:356
+#: src/gui/widgets/tabs/setup_other.cpp:352
msgid "Enable bot checker"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:360
+#: src/gui/widgets/tabs/setup_other.cpp:356
msgid "Enable buggy servers protection (do not disable)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:365
+#: src/gui/widgets/tabs/setup_other.cpp:361
msgid "Enable debug log"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:369
+#: src/gui/widgets/tabs/setup_other.cpp:365
msgid "Ignore logging packets"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:373
+#: src/gui/widgets/tabs/setup_other.cpp:369
msgid "Enable OpenGL log"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:377
+#: src/gui/widgets/tabs/setup_other.cpp:373
msgid "Enable input log"
msgstr ""
#. TRANSLATORS: settings option
#. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_other.cpp:381 src/input/pages/other.cpp:362
+#: src/gui/widgets/tabs/setup_other.cpp:377 src/input/pages/other.cpp:362
msgid "Upload log file"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:385
+#: src/gui/widgets/tabs/setup_other.cpp:381
msgid "Low traffic mode"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:389
+#: src/gui/widgets/tabs/setup_other.cpp:385
msgid "Hide shield sprite"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:394
+#: src/gui/widgets/tabs/setup_other.cpp:390
msgid "Use FBO for screenshots (only for opengl)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:400
+#: src/gui/widgets/tabs/setup_other.cpp:396
msgid "Screenshot directory"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:405
+#: src/gui/widgets/tabs/setup_other.cpp:401
msgid "Network delay between sub servers"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:409
+#: src/gui/widgets/tabs/setup_other.cpp:405
msgid "Show background"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:414
+#: src/gui/widgets/tabs/setup_other.cpp:410
msgid "Screen density override"
msgstr ""
@@ -4127,9 +4159,9 @@ msgstr ""
#. TRANSLATORS: command editor button
#. TRANSLATORS: input action name
#: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:82
-#: src/gui/windows/serverdialog.cpp:125 src/gui/windows/shopwindow.cpp:101
-#: src/gui/windows/shopwindow.cpp:108 src/gui/windows/textcommandeditor.cpp:92
+#: src/gui/windows/charselectdialog.cpp:84
+#: src/gui/windows/serverdialog.cpp:125 src/gui/windows/shopwindow.cpp:100
+#: src/gui/windows/shopwindow.cpp:107 src/gui/windows/textcommandeditor.cpp:92
#: src/input/pages/gui.cpp:111
msgid "Delete"
msgstr ""
@@ -4783,7 +4815,7 @@ msgstr ""
#. TRANSLATORS: equipment window name
#. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:63
+#: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:65
#: src/gui/windows/inventorywindow.cpp:196
msgid "Equipment"
msgstr ""
@@ -4924,7 +4956,7 @@ msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: social window button
#: src/gui/windows/buydialog.cpp:260 src/gui/windows/charcreatedialog.cpp:127
-#: src/gui/windows/charselectdialog.cpp:578
+#: src/gui/windows/charselectdialog.cpp:605
#: src/gui/windows/socialwindow.cpp:86
msgid "Create"
msgstr ""
@@ -4968,10 +5000,8 @@ msgstr ""
#. TRANSLATORS: change password window name
#. TRANSLATORS: change password dialog button
-#. TRANSLATORS: char select dialog. button.
#: src/gui/windows/changepassworddialog.cpp:51
#: src/gui/windows/changepassworddialog.cpp:57
-#: src/gui/windows/charselectdialog.cpp:73
msgid "Change Password"
msgstr ""
@@ -5125,57 +5155,68 @@ msgid "Are you sure you want to delete this character?"
msgstr ""
#. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:64
+#: src/gui/windows/charselectdialog.cpp:66
#, c-format
msgid "Account %s (last login time %s)"
msgstr ""
#. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:71
-msgid "Switch Login"
+#: src/gui/windows/charselectdialog.cpp:73
+msgid "Switch"
+msgstr ""
+
+#. TRANSLATORS: char select dialog. button.
+#: src/gui/windows/charselectdialog.cpp:75
+msgid "Password"
msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:78
-#: src/gui/windows/charselectdialog.cpp:573
+#: src/gui/windows/charselectdialog.cpp:80
+#: src/gui/windows/charselectdialog.cpp:595
#: src/gui/windows/updaterwindow.cpp:195
msgid "Play"
msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:80
+#: src/gui/windows/charselectdialog.cpp:82
#: src/net/ea/charserverhandler.cpp:160
+#: src/net/eathena/charserverhandler.cpp:531
+#: src/net/eathena/charserverhandler.cpp:561
msgid "Info"
msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: unregister dialog name
#. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:106
+#: src/gui/windows/charselectdialog.cpp:110
#: src/gui/windows/unregisterdialog.cpp:50
#: src/gui/windows/unregisterdialog.cpp:55
msgid "Unregister"
msgstr ""
#. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:118
+#: src/gui/windows/charselectdialog.cpp:122
msgid "Change Email"
msgstr ""
#. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:156
+#: src/gui/windows/charselectdialog.cpp:166
#, c-format
msgid "Account %s"
msgstr ""
-#: src/gui/windows/charselectdialog.cpp:184
+#: src/gui/windows/charselectdialog.cpp:194
msgid "Please set new pincode"
msgstr ""
+#: src/gui/windows/charselectdialog.cpp:240
+msgid "Please enter new name"
+msgstr ""
+
#. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:237
+#: src/gui/windows/charselectdialog.cpp:259
#, c-format
msgid ""
"Hp: %u/%u\n"
@@ -5185,16 +5226,16 @@ msgid ""
"Money: %s"
msgstr ""
-#: src/gui/windows/charselectdialog.cpp:289
+#: src/gui/windows/charselectdialog.cpp:311
msgid "Incorrect password"
msgstr ""
#. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:429
+#: src/gui/windows/charselectdialog.cpp:451
msgid "Enter password for deleting character"
msgstr ""
-#: src/gui/windows/charselectdialog.cpp:429
+#: src/gui/windows/charselectdialog.cpp:451
msgid "Enter password:"
msgstr ""
@@ -5602,7 +5643,7 @@ msgstr ""
#. TRANSLATORS: status bar label
#: src/gui/windows/ministatuswindow.cpp:364
-#: src/gui/windows/ministatuswindow.cpp:402
+#: src/gui/windows/ministatuswindow.cpp:401
msgid "Need"
msgstr ""
@@ -5633,7 +5674,7 @@ msgstr ""
#. TRANSLATORS: shop window button
#. TRANSLATORS: trade window button
#: src/gui/windows/npcdialog.cpp:114 src/gui/windows/serverdialog.cpp:121
-#: src/gui/windows/shopwindow.cpp:99 src/gui/windows/shopwindow.cpp:106
+#: src/gui/windows/shopwindow.cpp:98 src/gui/windows/shopwindow.cpp:105
#: src/gui/windows/tradewindow.cpp:83
msgid "Add"
msgstr ""
@@ -5796,43 +5837,38 @@ msgid "Reset Windows"
msgstr ""
#. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:80
+#: src/gui/windows/shopwindow.cpp:79
msgid "Personal Shop"
msgstr ""
#. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:95
+#: src/gui/windows/shopwindow.cpp:94
msgid "Buy items"
msgstr ""
#. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:97
+#: src/gui/windows/shopwindow.cpp:96
msgid "Sell items"
msgstr ""
#. TRANSLATORS: shop window label
#. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:110
+#: src/gui/windows/shopwindow.cpp:102 src/gui/windows/shopwindow.cpp:109
msgid "Announce"
msgstr ""
#. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:114
+#: src/gui/windows/shopwindow.cpp:113
msgid "Show links in announce"
msgstr ""
-#. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:176 src/gui/windows/shopwindow.cpp:179
-msgid "Auction"
-msgstr ""
-
#. TRANSLATORS: shop window dialog
#. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:233
+#: src/gui/windows/shopwindow.cpp:776 src/net/ea/tradehandler.cpp:233
msgid "Request for Trade"
msgstr ""
-#: src/gui/windows/shopwindow.cpp:791
+#: src/gui/windows/shopwindow.cpp:776
#, c-format
msgid "%s wants to %s %s do you accept?"
msgstr ""
@@ -6160,27 +6196,27 @@ msgstr ""
msgid "Connecting..."
msgstr ""
-#: src/gui/windows/updaterwindow.cpp:398
+#: src/gui/windows/updaterwindow.cpp:407
msgid "Show all news (can be slow)"
msgstr ""
#. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:824
+#: src/gui/windows/updaterwindow.cpp:833
msgid "##1 The update process is incomplete."
msgstr ""
#. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:826
+#: src/gui/windows/updaterwindow.cpp:835
msgid "##1 It is strongly recommended that"
msgstr ""
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:828
+#: src/gui/windows/updaterwindow.cpp:837
msgid "##1 you try again later."
msgstr ""
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1005
+#: src/gui/windows/updaterwindow.cpp:1021
msgid "Completed"
msgstr ""
@@ -6227,25 +6263,25 @@ msgstr ""
#. TRANSLATORS: long key name. must be short.
#. TRANSLATORS: short key name. must be very short.
#. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:370 src/input/inputmanager.cpp:414
+#: src/input/inputmanager.cpp:371 src/input/inputmanager.cpp:415
#: src/input/keyboardconfig.cpp:104
#, c-format
msgid "key_%d"
msgstr ""
#. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:376
+#: src/input/inputmanager.cpp:377
#, c-format
msgid "JButton%d"
msgstr ""
#. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:391
msgid "unknown key"
msgstr ""
#. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:420
+#: src/input/inputmanager.cpp:421
#, c-format
msgid "JB%d"
msgstr ""
@@ -6253,7 +6289,7 @@ msgstr ""
#. TRANSLATORS: unknown short key type. must be short
#. TRANSLATORS: Unknown key short string.
#. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:434 src/input/keyboardconfig.cpp:148
+#: src/input/inputmanager.cpp:435 src/input/keyboardconfig.cpp:148
msgid "u key"
msgstr ""
@@ -7424,74 +7460,74 @@ msgid "Request to quit denied!"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:135
#, c-format
msgid "Guild name: %s"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:191
+#: src/net/ea/guildhandler.cpp:138
#, c-format
msgid "Guild master: %s"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:141
#, c-format
msgid "Guild level: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:197
+#: src/net/ea/guildhandler.cpp:144
#, c-format
msgid "Online members: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:200
+#: src/net/ea/guildhandler.cpp:147
#, c-format
msgid "Max members: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:203
+#: src/net/ea/guildhandler.cpp:150
#, c-format
msgid "Average level: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:206
+#: src/net/ea/guildhandler.cpp:153
#, c-format
msgid "Guild exp: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:209
+#: src/net/ea/guildhandler.cpp:156
#, c-format
msgid "Guild next exp: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:212
+#: src/net/ea/guildhandler.cpp:159
#, c-format
msgid "Guild castle: %s"
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:179
+#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:191
msgid "Item sharing enabled."
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:183
+#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:195
msgid "Item sharing disabled."
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:187
+#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:199
msgid "Item sharing not possible."
msgstr ""
@@ -7502,19 +7538,19 @@ msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:167
+#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:179
msgid "Experience sharing enabled."
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:171
+#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:183
msgid "Experience sharing disabled."
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:175
+#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:187
msgid "Experience sharing not possible."
msgstr ""
@@ -7619,239 +7655,355 @@ msgid "Connection to server terminated. "
msgstr ""
#. TRANSLATORS: message header
-#: src/net/ea/playerhandler.cpp:257 src/net/ea/playerhandler.cpp:273
-#: src/net/ea/playerhandler.cpp:361
+#: src/net/ea/playerhandler.cpp:192 src/net/ea/playerhandler.cpp:418
+#: src/net/ea/playerhandler.cpp:434
msgid "Message"
msgstr ""
#. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:259
+#: src/net/ea/playerhandler.cpp:420
msgid ""
"You are carrying more than half your weight. You are unable to regain "
"health."
msgstr ""
#. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:275
+#: src/net/ea/playerhandler.cpp:436
msgid "You are carrying less than half your weight. You can regain health."
msgstr ""
+#. TRANSLATORS: char rename error
+#: src/net/eathena/charserverhandler.cpp:516
+#: src/net/eathena/charserverhandler.cpp:553
+msgid "Character rename error."
+msgstr ""
+
+#: src/net/eathena/charserverhandler.cpp:531
+msgid "Character renamed."
+msgstr ""
+
+#. TRANSLATORS: char rename error
+#: src/net/eathena/charserverhandler.cpp:544
+msgid "Rename not allowed."
+msgstr ""
+
+#. TRANSLATORS: char rename error
+#: src/net/eathena/charserverhandler.cpp:548
+msgid "New name is not set."
+msgstr ""
+
+#. TRANSLATORS: char rename error
+#: src/net/eathena/charserverhandler.cpp:557
+msgid "Character not found."
+msgstr ""
+
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:125
+#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:124
#, c-format
msgid "Strength %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:127
+#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:126
#, c-format
msgid "Agility %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:129
+#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:128
#, c-format
msgid "Vitality %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:131
+#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:130
#, c-format
msgid "Intelligence %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:128 src/net/tmwa/generalhandler.cpp:133
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:132
#, c-format
msgid "Dexterity %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:135
+#: src/net/eathena/generalhandler.cpp:128 src/net/tmwa/generalhandler.cpp:134
#, c-format
msgid "Luck %s"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:152 src/net/tmwa/generalhandler.cpp:161
+#: src/net/eathena/generalhandler.cpp:159 src/net/tmwa/generalhandler.cpp:160
msgid "Authentication failed."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:155 src/net/tmwa/generalhandler.cpp:165
+#: src/net/eathena/generalhandler.cpp:162 src/net/tmwa/generalhandler.cpp:164
msgid "No servers available."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:160 src/net/tmwa/generalhandler.cpp:171
+#: src/net/eathena/generalhandler.cpp:167 src/net/tmwa/generalhandler.cpp:170
msgid "Someone else is trying to use this account."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:165 src/net/tmwa/generalhandler.cpp:177
+#: src/net/eathena/generalhandler.cpp:172 src/net/tmwa/generalhandler.cpp:176
msgid "This account is already logged in."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:169 src/net/tmwa/generalhandler.cpp:182
+#: src/net/eathena/generalhandler.cpp:176 src/net/tmwa/generalhandler.cpp:181
msgid "Speed hack detected."
msgstr ""
+#: src/net/eathena/generalhandler.cpp:179
+msgid "Server full."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:182
+msgid "Sorry, you are underaged."
+msgstr ""
+
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:172 src/net/tmwa/generalhandler.cpp:186
+#: src/net/eathena/generalhandler.cpp:185 src/net/tmwa/generalhandler.cpp:185
msgid "Duplicated login."
msgstr ""
+#: src/net/eathena/generalhandler.cpp:188
+msgid "To many connections from same ip."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:191
+msgid "Not paid for this time."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:194
+msgid "Pay suspended."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:197
+msgid "Pay changed."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:200
+msgid "Pay wrong ip."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:203
+msgid "Pay game room."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:206
+msgid "Disconnect forced by GM."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:210
+msgid "Ban japan refuse."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:213
+msgid "Remained other account."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:216
+msgid "Ip unfair."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:219
+msgid "Ip count all."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:222
+msgid "Ip count."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:226
+msgid "Memory."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:229
+msgid "Han valid."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:232
+msgid "Ip limited access."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:235
+msgid "Over characters list."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:238
+msgid "Ip blocked."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:241
+msgid "Invalid password count."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:244
+msgid "Not allowed race."
+msgstr ""
+
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:175 src/net/tmwa/generalhandler.cpp:190
+#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:189
msgid "Unknown connection error."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:280
+#: src/net/eathena/generalhandler.cpp:323 src/net/tmwa/generalhandler.cpp:279
msgid "Got disconnected from server!"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:282 src/net/tmwa/generalhandler.cpp:308
+#: src/net/eathena/generalhandler.cpp:348 src/net/tmwa/generalhandler.cpp:307
msgid "Strength"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:310
+#: src/net/eathena/generalhandler.cpp:349 src/net/tmwa/generalhandler.cpp:309
msgid "Agility"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:284 src/net/tmwa/generalhandler.cpp:312
+#: src/net/eathena/generalhandler.cpp:350 src/net/tmwa/generalhandler.cpp:311
msgid "Vitality"
msgstr ""
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:285 src/net/tmwa/generalhandler.cpp:314
+#: src/net/eathena/generalhandler.cpp:352 src/net/tmwa/generalhandler.cpp:314
msgid "Intelligence"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:286 src/net/tmwa/generalhandler.cpp:316
+#: src/net/eathena/generalhandler.cpp:353 src/net/tmwa/generalhandler.cpp:316
msgid "Dexterity"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:287 src/net/tmwa/generalhandler.cpp:318
+#: src/net/eathena/generalhandler.cpp:354 src/net/tmwa/generalhandler.cpp:318
msgid "Luck"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:290 src/net/tmwa/generalhandler.cpp:323
+#: src/net/eathena/generalhandler.cpp:357 src/net/tmwa/generalhandler.cpp:322
msgid "Defense"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:291 src/net/tmwa/generalhandler.cpp:325
+#: src/net/eathena/generalhandler.cpp:358 src/net/tmwa/generalhandler.cpp:324
msgid "M.Attack"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:292 src/net/tmwa/generalhandler.cpp:327
+#: src/net/eathena/generalhandler.cpp:359 src/net/tmwa/generalhandler.cpp:326
msgid "M.Defense"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:294 src/net/tmwa/generalhandler.cpp:330
+#: src/net/eathena/generalhandler.cpp:361 src/net/tmwa/generalhandler.cpp:329
#, no-c-format
msgid "% Accuracy"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:296 src/net/tmwa/generalhandler.cpp:333
+#: src/net/eathena/generalhandler.cpp:363 src/net/tmwa/generalhandler.cpp:332
#, no-c-format
msgid "% Evade"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:298 src/net/tmwa/generalhandler.cpp:336
+#: src/net/eathena/generalhandler.cpp:365 src/net/tmwa/generalhandler.cpp:335
#, no-c-format
msgid "% Critical"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:299 src/net/tmwa/generalhandler.cpp:338
+#: src/net/eathena/generalhandler.cpp:366 src/net/tmwa/generalhandler.cpp:337
msgid "Attack Delay"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:300 src/net/tmwa/generalhandler.cpp:340
+#: src/net/eathena/generalhandler.cpp:367 src/net/tmwa/generalhandler.cpp:339
msgid "Walk Delay"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:301 src/net/tmwa/generalhandler.cpp:342
+#: src/net/eathena/generalhandler.cpp:368 src/net/tmwa/generalhandler.cpp:341
msgid "Attack Range"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:302 src/net/tmwa/generalhandler.cpp:344
+#: src/net/eathena/generalhandler.cpp:369 src/net/tmwa/generalhandler.cpp:343
msgid "Damage per sec."
msgstr ""
-#: src/net/eathena/skillhandler.cpp:228 src/net/eathena/skillhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:370
+msgid "Karma"
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:371
+msgid "Manner"
+msgstr ""
+
+#: src/net/eathena/skillhandler.cpp:304 src/net/eathena/skillhandler.cpp:364
#, c-format
msgid "Unknown skill error: %d"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:235 src/net/tmwa/skillhandler.cpp:224
+#: src/net/eathena/skillhandler.cpp:311 src/net/tmwa/skillhandler.cpp:224
msgid "You have not yet reached a high enough lvl!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:239 src/net/tmwa/skillhandler.cpp:228
+#: src/net/eathena/skillhandler.cpp:315 src/net/tmwa/skillhandler.cpp:228
msgid "Insufficient HP!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:243 src/net/tmwa/skillhandler.cpp:232
+#: src/net/eathena/skillhandler.cpp:319 src/net/tmwa/skillhandler.cpp:232
msgid "Insufficient SP!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:247 src/net/tmwa/skillhandler.cpp:236
+#: src/net/eathena/skillhandler.cpp:323 src/net/tmwa/skillhandler.cpp:236
msgid "You have no memos!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:251 src/net/tmwa/skillhandler.cpp:240
+#: src/net/eathena/skillhandler.cpp:327 src/net/tmwa/skillhandler.cpp:240
msgid "You cannot do that right now!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:255 src/net/tmwa/skillhandler.cpp:244
+#: src/net/eathena/skillhandler.cpp:331 src/net/tmwa/skillhandler.cpp:244
msgid "Seems you need more money... ;-)"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:259 src/net/tmwa/skillhandler.cpp:248
+#: src/net/eathena/skillhandler.cpp:335 src/net/tmwa/skillhandler.cpp:248
msgid "You cannot use this skill with that kind of weapon!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:264 src/net/tmwa/skillhandler.cpp:253
+#: src/net/eathena/skillhandler.cpp:340 src/net/tmwa/skillhandler.cpp:253
msgid "You need another red gem!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:268 src/net/tmwa/skillhandler.cpp:257
+#: src/net/eathena/skillhandler.cpp:344 src/net/tmwa/skillhandler.cpp:257
msgid "You need another blue gem!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:272 src/net/tmwa/skillhandler.cpp:261
+#: src/net/eathena/skillhandler.cpp:348 src/net/tmwa/skillhandler.cpp:261
msgid "You're carrying to much to do this!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:276 src/net/tmwa/skillhandler.cpp:265
+#: src/net/eathena/skillhandler.cpp:352 src/net/tmwa/skillhandler.cpp:265
msgid "Huh? What's that?"
msgstr ""
@@ -7868,32 +8020,32 @@ msgid "%s wants to trade with you, do you accept?"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:349
+#: src/net/tmwa/charserverhandler.cpp:351
msgid "Strength:"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:351
+#: src/net/tmwa/charserverhandler.cpp:353
msgid "Agility:"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:353
+#: src/net/tmwa/charserverhandler.cpp:355
msgid "Vitality:"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:355
+#: src/net/tmwa/charserverhandler.cpp:357
msgid "Intelligence:"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:357
+#: src/net/tmwa/charserverhandler.cpp:359
msgid "Dexterity:"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:359
+#: src/net/tmwa/charserverhandler.cpp:361
msgid "Luck:"
msgstr ""
@@ -8204,269 +8356,306 @@ msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:143
+msgid "You cant left party on this map."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:147
+msgid "You was kicked from party."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:151
+msgid "You cant be kicked kicked from party on this map."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:155
#, c-format
msgid "%s has joined your party."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:147
+#: src/resources/notifications.h:159
#, c-format
msgid "%s is already a member of a party."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:151
+#: src/resources/notifications.h:163
#, c-format
msgid "%s refused your invitation."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:155
+#: src/resources/notifications.h:167
#, c-format
msgid "%s is now a member of your party."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:159
+#: src/resources/notifications.h:171
#, c-format
msgid "%s can't join your party because party is full."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:163
+#: src/resources/notifications.h:175
#, c-format
msgid "QQQ Unknown invite response for %s."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:191
+#: src/resources/notifications.h:203
#, c-format
msgid "%s has left your party."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:195
+#: src/resources/notifications.h:207 src/resources/notifications.h:215
+#, c-format
+msgid "%s cant be kicked from party on this map."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:211
+#, c-format
+msgid "%s has kicked from your party."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:219
#, c-format
msgid "An unknown member tried to say: %s"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:199
+#: src/resources/notifications.h:223
#, c-format
msgid "%s is not in your party!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:203
+#: src/resources/notifications.h:227
#, c-format
msgid "You picked up %s."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:207
+#: src/resources/notifications.h:231
#, c-format
msgid "You spent %s."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:211
+#: src/resources/notifications.h:235
msgid "Cannot raise skill!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:215
+#: src/resources/notifications.h:239
msgid "Equip ammunition first."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:219
+#: src/resources/notifications.h:243
#, c-format
msgid "Trading with %s isn't possible. Trade partner is too far away."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:224
+#: src/resources/notifications.h:248
#, c-format
msgid "Trading with %s isn't possible. Character doesn't exist."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:228
+#: src/resources/notifications.h:252
msgid "Trade cancelled due to an unknown reason."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:232
+#: src/resources/notifications.h:256
#, c-format
msgid "Trade with %s cancelled."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:236
+#: src/resources/notifications.h:260
#, c-format
msgid "Unhandled trade cancel packet with %s"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:240
+#: src/resources/notifications.h:264
msgid "Failed adding item. Trade partner is over weighted."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:244
+#: src/resources/notifications.h:268
msgid "Failed adding item. Trade partner has no free slot."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:248
+#: src/resources/notifications.h:272
msgid "Failed adding item. You can't trade this item."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:252
+#: src/resources/notifications.h:276
msgid "Failed adding item for unknown reason."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:256
+#: src/resources/notifications.h:280
msgid "Trade canceled."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:260
+#: src/resources/notifications.h:284
msgid "Trade completed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:264
+#: src/resources/notifications.h:288
msgid "Kick failed!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:268
+#: src/resources/notifications.h:292
msgid "Kick succeeded!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:272
+#: src/resources/notifications.h:296
#, c-format
msgid "MVP player: %s"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:276
+#: src/resources/notifications.h:300
msgid "All whispers ignored."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:280
+#: src/resources/notifications.h:304
msgid "All whispers ignore failed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:284
+#: src/resources/notifications.h:308
msgid "All whispers unignored."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:288
+#: src/resources/notifications.h:312
msgid "All whispers unignore failed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:295
+#: src/resources/notifications.h:319
msgid "pvp off, gvg off"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:299
+#: src/resources/notifications.h:323
msgid "pvp on"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:303
+#: src/resources/notifications.h:327
msgid "gvg on"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:307
+#: src/resources/notifications.h:331
msgid "pvp on, gvg on"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:311
+#: src/resources/notifications.h:335
msgid "unknown pvp"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:315
+#: src/resources/notifications.h:339
#, c-format
msgid "Char from account %s is already in your party!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:319
+#: src/resources/notifications.h:343
#, c-format
msgid "%s blocked invite!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:323
+#: src/resources/notifications.h:347
msgid "Char is not online!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:327
+#: src/resources/notifications.h:351
msgid "Pet catch failed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:331
+#: src/resources/notifications.h:355
msgid "Pet catched."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:335
+#: src/resources/notifications.h:359
#, c-format
msgid "Pet catch unkown error: %d."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:339
+#: src/resources/notifications.h:363
msgid "Your mercenary duty hour is over."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:343
+#: src/resources/notifications.h:367
msgid "Your mercenary was killed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:347
+#: src/resources/notifications.h:371
msgid "Your mercenary was fired."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:351
+#: src/resources/notifications.h:375
msgid "Your mercenary run away."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:355
+#: src/resources/notifications.h:379
msgid "Mercenary unknown state."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:359
-msgid "Your feed your homunculus."
+#: src/resources/notifications.h:383
+msgid "You feed your homunculus."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:363
+#: src/resources/notifications.h:387
#, c-format
msgid "You cant feed homunculus, because not have %s."
msgstr ""
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:391
+msgid "Card insert failed."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:395
+msgid "Card inserted."
+msgstr ""
+
#. TRANSLATORS: chat option changed message
#: src/utils/booleanoptions.h:27
#, c-format
diff --git a/po/zh_CN.po b/po/zh_CN.po
index df9349a5f..2ee0f2061 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -15,8 +15,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-10-08 01:19+0300\n"
-"PO-Revision-Date: 2014-09-28 10:01+0000\n"
+"POT-Creation-Date: 2014-10-10 00:16+0300\n"
+"PO-Revision-Date: 2014-10-08 10:02+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/manaplus/"
"language/zh_CN/)\n"
@@ -5170,15 +5170,13 @@ msgstr ""
#. TRANSLATORS: char select dialog. button.
#: src/gui/windows/charselectdialog.cpp:73
-#, fuzzy
msgid "Switch"
-msgstr "登录"
+msgstr ""
#. TRANSLATORS: char select dialog. button.
#: src/gui/windows/charselectdialog.cpp:75
-#, fuzzy
msgid "Password"
-msgstr "密码:"
+msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: updater window button
@@ -5222,9 +5220,8 @@ msgid "Please set new pincode"
msgstr ""
#: src/gui/windows/charselectdialog.cpp:240
-#, fuzzy
msgid "Please enter new name"
-msgstr "请指定一个名称."
+msgstr ""
#. TRANSLATORS: char select dialog. player info message.
#: src/gui/windows/charselectdialog.cpp:259
@@ -5873,7 +5870,7 @@ msgstr "显示在公布的联系"
#. TRANSLATORS: shop window dialog
#. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:776 src/net/ea/tradehandler.cpp:233
+#: src/gui/windows/shopwindow.cpp:776 src/net/ea/tradehandler.cpp:192
msgid "Request for Trade"
msgstr "请求交易"
@@ -7523,19 +7520,19 @@ msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:191
+#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:207
msgid "Item sharing enabled."
msgstr "物品共享开启."
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:195
+#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:211
msgid "Item sharing disabled."
msgstr "物品共享关闭."
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:199
+#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:215
msgid "Item sharing not possible."
msgstr "物品共享不可能."
@@ -7546,19 +7543,19 @@ msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:179
+#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:195
msgid "Experience sharing enabled."
msgstr "经验共享开启."
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:183
+#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:199
msgid "Experience sharing disabled."
msgstr "经验共享关闭."
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:187
+#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:203
msgid "Experience sharing not possible."
msgstr "经验共享不可能."
@@ -7684,14 +7681,12 @@ msgstr ""
#. TRANSLATORS: char rename error
#: src/net/eathena/charserverhandler.cpp:516
#: src/net/eathena/charserverhandler.cpp:553
-#, fuzzy
msgid "Character rename error."
-msgstr "角色已删除."
+msgstr ""
#: src/net/eathena/charserverhandler.cpp:531
-#, fuzzy
msgid "Character renamed."
-msgstr "角色已删除."
+msgstr ""
#. TRANSLATORS: char rename error
#: src/net/eathena/charserverhandler.cpp:544
@@ -7705,9 +7700,8 @@ msgstr ""
#. TRANSLATORS: char rename error
#: src/net/eathena/charserverhandler.cpp:557
-#, fuzzy
msgid "Character not found."
-msgstr "角色可用点: %d"
+msgstr ""
#. TRANSLATORS: player stat
#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:124
@@ -7771,9 +7765,8 @@ msgid "Speed hack detected."
msgstr "检测速度劈."
#: src/net/eathena/generalhandler.cpp:179
-#, fuzzy
msgid "Server full."
-msgstr "服务器:"
+msgstr ""
#: src/net/eathena/generalhandler.cpp:182
msgid "Sorry, you are underaged."
@@ -7845,18 +7838,16 @@ msgid "Ip limited access."
msgstr ""
#: src/net/eathena/generalhandler.cpp:235
-#, fuzzy
msgid "Over characters list."
-msgstr "角色已删除."
+msgstr ""
#: src/net/eathena/generalhandler.cpp:238
msgid "Ip blocked."
msgstr ""
#: src/net/eathena/generalhandler.cpp:241
-#, fuzzy
msgid "Invalid password count."
-msgstr "旧密码不正确."
+msgstr ""
#: src/net/eathena/generalhandler.cpp:244
msgid "Not allowed race."
@@ -8023,13 +8014,13 @@ msgid "Huh? What's that?"
msgstr "啊?那是什么?"
#. TRANSLATORS: trade header
-#: src/net/ea/tradehandler.cpp:100
+#: src/net/ea/tradehandler.cpp:105
#, c-format
msgid "Trade: You and %s"
msgstr "交易:您和%s"
#. TRANSLATORS: trade message
-#: src/net/ea/tradehandler.cpp:235
+#: src/net/ea/tradehandler.cpp:194
#, c-format
msgid "%s wants to trade with you, do you accept?"
msgstr "%s想和您进行交易,是否接受?"
@@ -8248,429 +8239,454 @@ msgstr "无法购买."
#. TRANSLATORS: notification message
#: src/resources/notifications.h:47
+#, fuzzy
+msgid "Unable to buy. You not have enought money."
+msgstr "你没有足够的钱币."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:51
+#, fuzzy
+msgid "Unable to buy. You overweight."
+msgstr "无法购买."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:55
+msgid "Unable to buy. You have too many items."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:59
msgid "Nothing to sell."
msgstr "无物可供出售."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:51
+#: src/resources/notifications.h:63
msgid "Thanks for selling."
msgstr "感谢您的出售."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:55
+#: src/resources/notifications.h:67
msgid "Unable to sell."
msgstr "无法出售."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:59
+#: src/resources/notifications.h:71
msgid "Unable to sell while trading."
msgstr "不能出售,交易."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:63
+#: src/resources/notifications.h:75
msgid "Unable to sell unsellable item."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:67
+#: src/resources/notifications.h:79
#, c-format
msgid "Online users: %d"
msgstr "在线用户数:%d"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:71
+#: src/resources/notifications.h:83
msgid "Guild created."
msgstr "帮会已创建."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:75
+#: src/resources/notifications.h:87
msgid "You are already in guild."
msgstr "您已经在公会."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:79
+#: src/resources/notifications.h:91
msgid "Emperium check failed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:83
+#: src/resources/notifications.h:95
msgid "Unknown server response."
msgstr "未知的服务器的响应."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:87
+#: src/resources/notifications.h:99
msgid "You have left the guild."
msgstr "你已经离开工会."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:91
+#: src/resources/notifications.h:103
msgid "Could not invite user to guild."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:95
+#: src/resources/notifications.h:107
msgid "User rejected guild invite."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:99
+#: src/resources/notifications.h:111
msgid "User is now part of your guild."
msgstr "用户现在是你们的工会成员了."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:103
+#: src/resources/notifications.h:115
msgid "Your guild is full."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:107
+#: src/resources/notifications.h:119
msgid "Unknown guild invite response."
msgstr "未知工会邀请响应."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:111
+#: src/resources/notifications.h:123
#, c-format
msgid "%s has left your guild."
msgstr "%s已经离开工会."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:115
+#: src/resources/notifications.h:127
msgid "You were kicked from guild."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:119
+#: src/resources/notifications.h:131
#, c-format
msgid "%s has kicked from your guild."
msgstr "%s已经被工会开除."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:123
+#: src/resources/notifications.h:135
msgid "Failed to use item."
msgstr "使用物品失败."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:127
+#: src/resources/notifications.h:139
msgid "Unable to equip."
msgstr "无法装备."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:131
+#: src/resources/notifications.h:143
+msgid "Unable to equip because you have wrong level."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:147
msgid "Could not create party."
msgstr "无法创建帮会."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:135
+#: src/resources/notifications.h:151
msgid "Party successfully created."
msgstr "帮会创建成功."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:139
+#: src/resources/notifications.h:155
msgid "You have left the party."
msgstr "你以退出帮会."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:143
-#, fuzzy
+#: src/resources/notifications.h:159
msgid "You cant left party on this map."
-msgstr "你以退出帮会."
+msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:147
-#, fuzzy
+#: src/resources/notifications.h:163
msgid "You was kicked from party."
-msgstr "踢从党"
+msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:151
-msgid "You cant be kicked kicked from party on this map."
+#: src/resources/notifications.h:167
+msgid "You cant be kicked from party on this map."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:155
+#: src/resources/notifications.h:171
#, c-format
msgid "%s has joined your party."
msgstr "%s已经加入你的党."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:159
+#: src/resources/notifications.h:175
#, c-format
msgid "%s is already a member of a party."
msgstr "%s已经是你的帮会成员了."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:163
+#: src/resources/notifications.h:179
#, c-format
msgid "%s refused your invitation."
msgstr "%s拒绝了您的邀请."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:167
+#: src/resources/notifications.h:183
#, c-format
msgid "%s is now a member of your party."
msgstr "%s现在是你帮会中的成员了."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:171
+#: src/resources/notifications.h:187
#, c-format
msgid "%s can't join your party because party is full."
msgstr "%s不能加入团队,因为团队成员已满."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:175
+#: src/resources/notifications.h:191
#, c-format
msgid "QQQ Unknown invite response for %s."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:203
+#: src/resources/notifications.h:219
#, c-format
msgid "%s has left your party."
msgstr "%s已经离开你的帮会."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:207 src/resources/notifications.h:215
-#, fuzzy, c-format
+#: src/resources/notifications.h:223 src/resources/notifications.h:231
+#, c-format
msgid "%s cant be kicked from party on this map."
-msgstr "%s已经被工会开除."
+msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:211
-#, fuzzy, c-format
+#: src/resources/notifications.h:227
+#, c-format
msgid "%s has kicked from your party."
-msgstr "%s已经被工会开除."
+msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:219
+#: src/resources/notifications.h:235
#, c-format
msgid "An unknown member tried to say: %s"
msgstr "一未知成员尝试说:%s"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:223
+#: src/resources/notifications.h:239
#, c-format
msgid "%s is not in your party!"
msgstr "%s不在你的帮会中!"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:227
+#: src/resources/notifications.h:243
#, c-format
msgid "You picked up %s."
msgstr "你捡起了%s."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:231
+#: src/resources/notifications.h:247
#, c-format
msgid "You spent %s."
msgstr "你花费 %s."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:235
+#: src/resources/notifications.h:251
msgid "Cannot raise skill!"
msgstr "不能提升技能!"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:239
+#: src/resources/notifications.h:255
msgid "Equip ammunition first."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:243
+#: src/resources/notifications.h:259
#, c-format
msgid "Trading with %s isn't possible. Trade partner is too far away."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:248
+#: src/resources/notifications.h:264
#, c-format
msgid "Trading with %s isn't possible. Character doesn't exist."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:252
+#: src/resources/notifications.h:268
msgid "Trade cancelled due to an unknown reason."
msgstr "交易取消因不明原因."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:256
+#: src/resources/notifications.h:272
#, c-format
msgid "Trade with %s cancelled."
msgstr "与%s的交易被取消."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:260
+#: src/resources/notifications.h:276
+#, fuzzy, c-format
+msgid "Trade with %s cancelled, because player is busy"
+msgstr "与%s的交易被取消."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:280
#, c-format
msgid "Unhandled trade cancel packet with %s"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:264
+#: src/resources/notifications.h:284
msgid "Failed adding item. Trade partner is over weighted."
msgstr "添加项目失败。交易伙伴已经负重太多."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:268
+#: src/resources/notifications.h:288
msgid "Failed adding item. Trade partner has no free slot."
msgstr "添加项目失败。交易伙伴无空闲槽存放物品."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:272
+#: src/resources/notifications.h:292
msgid "Failed adding item. You can't trade this item."
msgstr "添加物品失败。您不能交易这项物品."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:276
+#: src/resources/notifications.h:296
msgid "Failed adding item for unknown reason."
msgstr "添加项目失败,原因未知."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:280
+#: src/resources/notifications.h:300
msgid "Trade canceled."
msgstr "交易取消."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:284
+#: src/resources/notifications.h:304
msgid "Trade completed."
msgstr "交易完成."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:288
+#: src/resources/notifications.h:308
msgid "Kick failed!"
msgstr "踢出失败!"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:292
+#: src/resources/notifications.h:312
msgid "Kick succeeded!"
msgstr "成功踢出!"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:296
+#: src/resources/notifications.h:316
#, c-format
msgid "MVP player: %s"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:300
+#: src/resources/notifications.h:320
msgid "All whispers ignored."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:304
+#: src/resources/notifications.h:324
msgid "All whispers ignore failed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:308
+#: src/resources/notifications.h:328
msgid "All whispers unignored."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:312
+#: src/resources/notifications.h:332
msgid "All whispers unignore failed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:319
+#: src/resources/notifications.h:339
msgid "pvp off, gvg off"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:323
+#: src/resources/notifications.h:343
msgid "pvp on"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:327
+#: src/resources/notifications.h:347
msgid "gvg on"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:331
+#: src/resources/notifications.h:351
msgid "pvp on, gvg on"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:335
+#: src/resources/notifications.h:355
msgid "unknown pvp"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:339
+#: src/resources/notifications.h:359
#, c-format
msgid "Char from account %s is already in your party!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:343
+#: src/resources/notifications.h:363
#, c-format
msgid "%s blocked invite!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:347
+#: src/resources/notifications.h:367
msgid "Char is not online!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:351
+#: src/resources/notifications.h:371
msgid "Pet catch failed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:355
+#: src/resources/notifications.h:375
msgid "Pet catched."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:359
+#: src/resources/notifications.h:379
#, c-format
msgid "Pet catch unkown error: %d."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:363
+#: src/resources/notifications.h:383
msgid "Your mercenary duty hour is over."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:367
+#: src/resources/notifications.h:387
msgid "Your mercenary was killed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:371
+#: src/resources/notifications.h:391
msgid "Your mercenary was fired."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:375
+#: src/resources/notifications.h:395
msgid "Your mercenary run away."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:379
+#: src/resources/notifications.h:399
msgid "Mercenary unknown state."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:383
+#: src/resources/notifications.h:403
msgid "You feed your homunculus."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:387
+#: src/resources/notifications.h:407
#, c-format
msgid "You cant feed homunculus, because not have %s."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:391
-#, fuzzy
+#: src/resources/notifications.h:411
msgid "Card insert failed."
-msgstr "交易失败!"
+msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:395
+#: src/resources/notifications.h:415
msgid "Card inserted."
msgstr ""
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 4bda1cc1a..c12a4057e 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-27 13:23+0300\n"
-"PO-Revision-Date: 2014-09-28 10:01+0000\n"
+"POT-Creation-Date: 2014-10-08 01:19+0300\n"
+"PO-Revision-Date: 2014-10-08 10:01+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/manaplus/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
@@ -32,7 +32,7 @@ msgstr ""
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:131 src/client.cpp:1463 src/client.cpp:1490
+#: src/actions/actions.cpp:131 src/client.cpp:1461 src/client.cpp:1488
#: src/gamemodifiers.cpp:423 src/gui/widgets/tabs/setup_input.cpp:163
#: src/gui/widgets/tabs/setup_theme.cpp:312
#: src/gui/widgets/tabs/setup_theme.cpp:343
@@ -43,8 +43,8 @@ msgstr ""
#: src/gui/windows/changeemaildialog.cpp:170
#: src/gui/windows/changepassworddialog.cpp:160
#: src/gui/windows/charcreatedialog.cpp:373
-#: src/gui/windows/charselectdialog.cpp:255
-#: src/gui/windows/charselectdialog.cpp:291 src/gui/windows/editdialog.cpp:49
+#: src/gui/windows/charselectdialog.cpp:277
+#: src/gui/windows/charselectdialog.cpp:313 src/gui/windows/editdialog.cpp:49
#: src/gui/windows/editserverdialog.cpp:61
#: src/gui/windows/editserverdialog.cpp:208
#: src/gui/windows/itemamountwindow.cpp:158 src/gui/windows/quitdialog.cpp:70
@@ -52,7 +52,9 @@ msgstr ""
#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
#: src/net/ea/charserverhandler.cpp:143 src/net/ea/charserverhandler.cpp:162
#: src/net/ea/charserverhandler.cpp:175 src/net/ea/gamehandler.cpp:79
-#: src/net/ea/playerhandler.cpp:263 src/net/ea/playerhandler.cpp:279
+#: src/net/ea/playerhandler.cpp:424 src/net/ea/playerhandler.cpp:440
+#: src/net/eathena/charserverhandler.cpp:533
+#: src/net/eathena/charserverhandler.cpp:563
msgid "OK"
msgstr "確定"
@@ -176,7 +178,7 @@ msgstr ""
#. TRANSLATORS: party invite message
#. TRANSLATORS: change relation
-#: src/actions/chat.cpp:303 src/actions/commands.cpp:65
+#: src/actions/chat.cpp:303 src/actions/commands.cpp:64
msgid "Please specify a name."
msgstr ""
@@ -199,75 +201,75 @@ msgid "Message now closes chat."
msgstr ""
#. TRANSLATORS: change relation
-#: src/actions/commands.cpp:108
+#: src/actions/commands.cpp:107
#, c-format
msgid "Player already %s!"
msgstr ""
#. TRANSLATORS: change relation
-#: src/actions/commands.cpp:120
+#: src/actions/commands.cpp:119
#, c-format
msgid "Player successfully %s!"
msgstr ""
#. TRANSLATORS: change relation
-#: src/actions/commands.cpp:122
+#: src/actions/commands.cpp:121
#, c-format
msgid "Player could not be %s!"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:153
+#: src/actions/commands.cpp:152
msgid "Player wasn't ignored!"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:162
+#: src/actions/commands.cpp:161
msgid "Player no longer ignored!"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:164
+#: src/actions/commands.cpp:163
msgid "Player could not be unignored!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/actions/commands.cpp:179
+#: src/actions/commands.cpp:178
msgid "Player already erased!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/actions/commands.cpp:192
+#: src/actions/commands.cpp:191
msgid "Player no longer erased!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/actions/commands.cpp:194
+#: src/actions/commands.cpp:193
msgid "Player could not be erased!"
msgstr ""
#. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:201
+#: src/actions/commands.cpp:200
msgid "friend"
msgstr ""
#. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:208
+#: src/actions/commands.cpp:207
msgid "disregarded"
msgstr ""
#. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:215
+#: src/actions/commands.cpp:214
msgid "neutral"
msgstr ""
#. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:222
+#: src/actions/commands.cpp:221
msgid "blacklisted"
msgstr ""
#. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:229
+#: src/actions/commands.cpp:228
msgid "enemy"
msgstr ""
@@ -282,77 +284,77 @@ msgid "Accepting incoming trade requests"
msgstr ""
#. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1306
+#: src/actormanager.cpp:1310
msgid "Visible on map"
msgstr ""
#. TRANSLATORS: default race name
-#: src/being/being.cpp:389
+#: src/being/being.cpp:393
msgid "Human"
msgstr ""
-#: src/being/being.cpp:556
+#: src/being/being.cpp:560
msgid "dodge"
msgstr ""
-#: src/being/being.cpp:556
+#: src/being/being.cpp:560
msgid "miss"
msgstr ""
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1865 src/gui/windows/whoisonline.cpp:855
+#: src/being/being.cpp:1869 src/gui/windows/whoisonline.cpp:855
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1870 src/gui/windows/whoisonline.cpp:860
+#: src/being/being.cpp:1874 src/gui/windows/whoisonline.cpp:860
msgid "I"
msgstr ""
#. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:379
+#: src/being/localplayer.cpp:380
#, c-format
msgid "You were killed by %s"
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:824
+#: src/being/localplayer.cpp:825
msgid "Tried to pick up nonexistent item."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:828
+#: src/being/localplayer.cpp:829
msgid "Item is too heavy."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:832
+#: src/being/localplayer.cpp:833
msgid "Item is too far away."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:836
+#: src/being/localplayer.cpp:837
msgid "Inventory is full."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:840
+#: src/being/localplayer.cpp:841
msgid "Stack is too big."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:844
+#: src/being/localplayer.cpp:845
msgid "Item belongs to someone else."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:848
+#: src/being/localplayer.cpp:849
msgid "Unknown problem picking up item."
msgstr ""
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:872
+#: src/being/localplayer.cpp:873
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -360,43 +362,43 @@ msgstr[0] ""
#. TRANSLATORS: this is normal experience
#. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1054 src/being/localplayer.cpp:1055
-#: src/being/localplayer.cpp:1091
+#: src/being/localplayer.cpp:1055 src/being/localplayer.cpp:1056
+#: src/being/localplayer.cpp:1092
msgid "xp"
msgstr ""
#. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1059 src/being/localplayer.cpp:1065
-#: src/being/localplayer.cpp:1071
+#: src/being/localplayer.cpp:1060 src/being/localplayer.cpp:1066
+#: src/being/localplayer.cpp:1072
msgid "job"
msgstr ""
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2794
+#: src/being/localplayer.cpp:2795
#, c-format
msgid "Follow: %s"
msgstr ""
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2800 src/being/localplayer.cpp:2825
+#: src/being/localplayer.cpp:2801 src/being/localplayer.cpp:2826
msgid "Follow canceled"
msgstr ""
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2810
+#: src/being/localplayer.cpp:2811
#, c-format
msgid "Imitation: %s"
msgstr ""
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2816 src/being/localplayer.cpp:2830
+#: src/being/localplayer.cpp:2817 src/being/localplayer.cpp:2831
msgid "Imitation canceled"
msgstr ""
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3180
+#: src/being/localplayer.cpp:3181
#, c-format
msgid "You see %s"
msgstr ""
@@ -434,37 +436,37 @@ msgstr ""
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:920 src/gui/windowmenu.cpp:162
+#: src/client.cpp:918 src/gui/windowmenu.cpp:162
#: src/gui/windows/setupwindow.cpp:62
msgid "Setup"
msgstr "設定"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:923 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:921 src/gui/widgets/tabs/setup_perfomance.cpp:54
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:926 src/gui/widgets/tabs/setup_video.cpp:105
+#: src/client.cpp:924 src/gui/widgets/tabs/setup_video.cpp:105
msgid "Video"
msgstr "顯示"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:929 src/gui/widgets/tabs/setup_theme.cpp:122
+#: src/client.cpp:927 src/gui/widgets/tabs/setup_theme.cpp:122
msgid "Theme"
msgstr ""
#. TRANSLATORS: theme tab quick button
-#: src/client.cpp:932
+#: src/client.cpp:930
msgid "About"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:935 src/gui/windowmenu.cpp:74
+#: src/client.cpp:933 src/gui/windowmenu.cpp:74
#: src/gui/windows/helpwindow.cpp:53
msgid "Help"
msgstr "說明"
@@ -480,42 +482,42 @@ msgstr "說明"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:939 src/client.cpp:1391 src/client.cpp:1405
+#: src/client.cpp:937 src/client.cpp:1389 src/client.cpp:1403
#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:691
#: src/gui/popups/popupmenu.cpp:923 src/gui/windows/didyouknowwindow.cpp:81
#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:74
#: src/gui/windows/npcdialog.cpp:112 src/gui/windows/questswindow.cpp:77
-#: src/gui/windows/shopwindow.cpp:84
+#: src/gui/windows/shopwindow.cpp:83
msgid "Close"
msgstr "關閉"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1065
+#: src/client.cpp:1063
msgid "Connecting to server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1113
+#: src/client.cpp:1111
msgid "Logging in"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1156
+#: src/client.cpp:1154
msgid "Entering game world"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1282
+#: src/client.cpp:1280
msgid "Requesting characters"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1322
+#: src/client.cpp:1320
msgid "Connecting to the game server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1334
+#: src/client.cpp:1332
msgid "Changing game servers"
msgstr ""
@@ -529,72 +531,76 @@ msgstr ""
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1389 src/client.cpp:1403 src/client.cpp:1598
+#. TRANSLATORS: info message
+#. TRANSLATORS: ok dialog button
+#: src/client.cpp:1387 src/client.cpp:1401 src/client.cpp:1596
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
#: src/gui/windows/charcreatedialog.cpp:369
-#: src/gui/windows/charselectdialog.cpp:289
+#: src/gui/windows/charselectdialog.cpp:311
#: src/gui/windows/editserverdialog.cpp:203
#: src/gui/windows/registerdialog.cpp:245
#: src/gui/windows/unregisterdialog.cpp:146
#: src/net/ea/charserverhandler.cpp:141 src/net/ea/charserverhandler.cpp:173
+#: src/net/eathena/charserverhandler.cpp:516
+#: src/net/eathena/charserverhandler.cpp:518
msgid "Error"
msgstr "錯誤"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1418
+#: src/client.cpp:1416
msgid "Requesting registration details"
msgstr ""
#. TRANSLATORS: password change message header
-#: src/client.cpp:1459
+#: src/client.cpp:1457
msgid "Password Change"
msgstr ""
#. TRANSLATORS: password change message text
-#: src/client.cpp:1461
+#: src/client.cpp:1459
msgid "Password changed successfully!"
msgstr ""
#. TRANSLATORS: email change message header
-#: src/client.cpp:1486
+#: src/client.cpp:1484
msgid "Email Change"
msgstr ""
#. TRANSLATORS: email change message text
-#: src/client.cpp:1488
+#: src/client.cpp:1486
msgid "Email changed successfully!"
msgstr ""
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1515
+#: src/client.cpp:1513
msgid "Unregister Successful"
msgstr ""
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1517
+#: src/client.cpp:1515
msgid "Farewell, come back any time..."
msgstr ""
#. TRANSLATORS: directory creation error
#: src/configmanager.cpp:53 src/dirs.cpp:260 src/dirs.cpp:275 src/dirs.cpp:320
-#: src/dirs.cpp:481 src/dirs.cpp:489
+#: src/dirs.cpp:488 src/dirs.cpp:496
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:363
+#: src/dirs.cpp:370
#, c-format
msgid "Invalid update host: %s."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:404 src/dirs.cpp:411
+#: src/dirs.cpp:411 src/dirs.cpp:418
msgid "Error creating updates directory!"
msgstr ""
-#: src/dirs.cpp:433 src/dirs.cpp:451
+#: src/dirs.cpp:440 src/dirs.cpp:458
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
@@ -612,36 +618,36 @@ msgid "dyecmd srcdyestring dstfile"
msgstr ""
#. TRANSLATORS: chat tab header
-#: src/game.cpp:236 src/gui/widgets/tabs/chattab.cpp:482
+#: src/game.cpp:234 src/gui/widgets/tabs/chattab.cpp:482
msgid "General"
msgstr ""
#. TRANSLATORS: chat tab header
#. TRANSLATORS: full button name
#. TRANSLATORS: debug window name
-#: src/game.cpp:253 src/gui/widgets/tabs/chattab.cpp:484
+#: src/game.cpp:251 src/gui/widgets/tabs/chattab.cpp:484
#: src/gui/windowmenu.cpp:149 src/gui/windows/debugwindow.cpp:42
msgid "Debug"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:541
+#: src/game.cpp:532
#, c-format
msgid "Screenshot saved as %s"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:551
+#: src/game.cpp:542
msgid "Saving screenshot failed!"
msgstr ""
#. TRANSLATORS: error message text
-#: src/game.cpp:634
+#: src/game.cpp:625
msgid "The connection to the server was lost."
msgstr ""
#. TRANSLATORS: error message header
-#: src/game.cpp:637
+#: src/game.cpp:628
msgid "Network Error"
msgstr ""
@@ -1032,6 +1038,7 @@ msgstr ""
#: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
#: src/gui/widgets/tabs/setup_other.cpp:79
#: src/gui/widgets/tabs/setup_visual.cpp:81
+#: src/gui/windows/equipmentwindow.cpp:577
msgid "default"
msgstr ""
@@ -1522,7 +1529,7 @@ msgstr "交易"
#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:273
#: src/gui/popups/popupmenu.cpp:767 src/gui/widgets/skillinfo.cpp:113
#: src/gui/windows/botcheckerwindow.cpp:89 src/input/pages/basic.cpp:42
-#: src/net/eathena/generalhandler.cpp:289 src/net/tmwa/generalhandler.cpp:321
+#: src/net/eathena/generalhandler.cpp:356 src/net/tmwa/generalhandler.cpp:320
msgid "Attack"
msgstr ""
@@ -1691,7 +1698,7 @@ msgstr ""
#. TRANSLATORS: pet unequip item
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:340 src/gui/windows/equipmentwindow.cpp:70
+#: src/gui/popups/popupmenu.cpp:340 src/gui/windows/equipmentwindow.cpp:72
#: src/gui/windows/inventorywindow.cpp:175 src/resources/itemtypemapdata.h:47
#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
@@ -1749,7 +1756,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:574
+#: src/gui/popups/popupmenu.cpp:574 src/gui/windows/charselectdialog.cpp:132
msgid "Rename"
msgstr ""
@@ -2261,7 +2268,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
#. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:3000 src/net/ea/playerhandler.cpp:364
+#: src/gui/popups/popupmenu.cpp:3000 src/net/ea/playerhandler.cpp:195
msgid "Revive"
msgstr ""
@@ -2285,7 +2292,7 @@ msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: settings group
#. TRANSLATORS: full button name
-#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:319
+#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:315
#: src/gui/windowmenu.cpp:158
msgid "Windows"
msgstr ""
@@ -2313,7 +2320,7 @@ msgstr ""
#. TRANSLATORS: input action name
#: src/gui/setupinputpages.cpp:57 src/gui/widgets/tabs/setup_audio.cpp:151
#: src/gui/widgets/tabs/setup_chat.cpp:179
-#: src/gui/widgets/tabs/setup_other.cpp:341
+#: src/gui/widgets/tabs/setup_other.cpp:337
#: src/gui/widgets/tabs/setup_visual.cpp:192
#: src/gui/windows/charcreatedialog.cpp:119
#: src/gui/windows/registerdialog.cpp:106 src/input/pages/gui.cpp:87
@@ -2326,212 +2333,227 @@ msgid "Gui"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:113
+#: src/gui/userpalette.cpp:116
msgid "Being"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:115
+#: src/gui/userpalette.cpp:118
msgid "Friend names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:117
+#: src/gui/userpalette.cpp:120
msgid "Disregarded names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:119
+#: src/gui/userpalette.cpp:122
msgid "Ignored names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:121
+#: src/gui/userpalette.cpp:124
msgid "Erased names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:123
+#: src/gui/userpalette.cpp:126
msgid "Other players names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:125
+#: src/gui/userpalette.cpp:128
msgid "Own name"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:127
+#: src/gui/userpalette.cpp:130
msgid "GM names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:129
+#: src/gui/userpalette.cpp:132
msgid "NPCs"
msgstr ""
#. TRANSLATORS: palette color
#. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:131 src/gui/widgets/tabs/setup_other.cpp:108
+#: src/gui/userpalette.cpp:134 src/gui/widgets/tabs/setup_other.cpp:108
msgid "Monsters"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:133
+#: src/gui/userpalette.cpp:136
msgid "Monster HP bar"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:139
msgid "Monster HP bar (second color)"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:138
+#: src/gui/userpalette.cpp:141
msgid "Party members"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:140
+#: src/gui/userpalette.cpp:143
msgid "Guild members"
msgstr ""
#. TRANSLATORS: palette color
#. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:142 src/gui/widgets/tabs/setup_visual.cpp:157
+#: src/gui/userpalette.cpp:145 src/gui/widgets/tabs/setup_visual.cpp:157
msgid "Particle effects"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:144
+#: src/gui/userpalette.cpp:147
msgid "Pickup notification"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:146
+#: src/gui/userpalette.cpp:149
msgid "Exp notification"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:148
+#: src/gui/userpalette.cpp:151
msgid "Player HP bar"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:152
+#: src/gui/userpalette.cpp:155
msgid "Player HP bar (second color)"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:154
+#: src/gui/userpalette.cpp:157
msgid "Player hits monster"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:156
+#: src/gui/userpalette.cpp:159
msgid "Monster hits player"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:160
+#: src/gui/userpalette.cpp:163
msgid "Other player hits local player"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:162
+#: src/gui/userpalette.cpp:165
msgid "Critical Hit"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:166
+#: src/gui/userpalette.cpp:169
msgid "Local player hits monster"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:169
+#: src/gui/userpalette.cpp:172
msgid "Local player critical hit"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:172
+#: src/gui/userpalette.cpp:175
msgid "Local player miss"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:174
+#: src/gui/userpalette.cpp:177
msgid "Misses"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:176
+#: src/gui/userpalette.cpp:179
msgid "Portal highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:179
+#: src/gui/userpalette.cpp:182
msgid "Default collision highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:182
+#: src/gui/userpalette.cpp:185
msgid "Air collision highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:185
+#: src/gui/userpalette.cpp:188
msgid "Water collision highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:188
+#: src/gui/userpalette.cpp:191
msgid "Special ground collision highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:191
+#: src/gui/userpalette.cpp:194
msgid "Walkable highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:194
+#: src/gui/userpalette.cpp:197
msgid "Local player attack range"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:197
+#: src/gui/userpalette.cpp:200
msgid "Local player attack range border"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:200
+#: src/gui/userpalette.cpp:203
msgid "Monster attack range"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:204
+#: src/gui/userpalette.cpp:207
msgid "Floor item amount color"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:207
+#: src/gui/userpalette.cpp:210
msgid "Home place"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:210
+#: src/gui/userpalette.cpp:213
msgid "Home place border"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:213
+#: src/gui/userpalette.cpp:216
msgid "Road point"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:216
+#: src/gui/userpalette.cpp:219
msgid "Tiles border"
msgstr ""
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:221
+msgid "Pets"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:223
+msgid "Mercenary"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:225
+msgid "Homunculus"
+msgstr ""
+
#: src/gui/widgets/characterdisplay.cpp:135
#, c-format
msgid "Level: %u"
@@ -2634,7 +2656,8 @@ msgid "Type: %s"
msgstr ""
#. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:108
+#. TRANSLATORS: unknown equipment page name
+#: src/gui/widgets/skillinfo.cpp:108 src/gui/windows/equipmentwindow.cpp:584
msgid "Unknown"
msgstr ""
@@ -2835,22 +2858,22 @@ msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:262
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:313
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:375
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:319
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:387
msgid "Target:"
msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:264
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:319
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:377
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:325
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:389
msgid "Target Id:"
msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:267
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:322
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:379
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:328
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:391
msgid "Target type:"
msgstr ""
@@ -2861,7 +2884,7 @@ msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:271
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:338
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:344
msgid "Target race:"
msgstr ""
@@ -2877,67 +2900,81 @@ msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:277
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:363
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:369
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:387
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:375
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:381
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:399
msgid "Attack delay:"
msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:279
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:350
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:389
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:356
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:401
msgid "Minimal hit:"
msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:281
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:353
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:391
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:359
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:403
msgid "Maximum hit:"
msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:283
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:356
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:393
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:362
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:405
msgid "Critical hit:"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:327
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:285
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:365
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:407
+msgid "Karma:"
+msgstr ""
+
+#. TRANSLATORS: debug window label
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:287
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:368
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:409
+msgid "Manner:"
+msgstr ""
+
+#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:333
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:381
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:339
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:393
msgid "Target Level:"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:341
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:383
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:347
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:395
msgid "Target Party:"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:345
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:385
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:351
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:397
msgid "Target Guild:"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:430
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:436
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:451
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:457
#, c-format
msgid "Ping: %s ms"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:439
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:460
#, c-format
msgid "In: %d bytes/s"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:442
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:463
#, c-format
msgid "Out: %d bytes/s"
msgstr ""
@@ -3766,137 +3803,132 @@ msgstr ""
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_other.cpp:294
-msgid "Enable auction bot support"
-msgstr ""
-
-#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:298
msgid "Enable guild bot support and disable native guild support"
msgstr ""
#. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:304
+#: src/gui/widgets/tabs/setup_other.cpp:300
msgid "Keyboard"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:307
+#: src/gui/widgets/tabs/setup_other.cpp:303
msgid "Repeat delay"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:311
+#: src/gui/widgets/tabs/setup_other.cpp:307
msgid "Repeat interval"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:315
+#: src/gui/widgets/tabs/setup_other.cpp:311
msgid "Custom repeat interval"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:323
+#: src/gui/widgets/tabs/setup_other.cpp:319
msgid "Shortcut buttons"
msgstr ""
#. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:328
+#: src/gui/widgets/tabs/setup_other.cpp:324
msgid "Proxy server"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:332
+#: src/gui/widgets/tabs/setup_other.cpp:328
msgid "Proxy type"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:336
+#: src/gui/widgets/tabs/setup_other.cpp:332
msgid "Proxy address:port"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:344
+#: src/gui/widgets/tabs/setup_other.cpp:340
msgid "Enable server side attack"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:348
+#: src/gui/widgets/tabs/setup_other.cpp:344
msgid "Hide support page link on error"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:352
+#: src/gui/widgets/tabs/setup_other.cpp:348
msgid "Enable double clicks"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:356
+#: src/gui/widgets/tabs/setup_other.cpp:352
msgid "Enable bot checker"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:360
+#: src/gui/widgets/tabs/setup_other.cpp:356
msgid "Enable buggy servers protection (do not disable)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:365
+#: src/gui/widgets/tabs/setup_other.cpp:361
msgid "Enable debug log"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:369
+#: src/gui/widgets/tabs/setup_other.cpp:365
msgid "Ignore logging packets"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:373
+#: src/gui/widgets/tabs/setup_other.cpp:369
msgid "Enable OpenGL log"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:377
+#: src/gui/widgets/tabs/setup_other.cpp:373
msgid "Enable input log"
msgstr ""
#. TRANSLATORS: settings option
#. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_other.cpp:381 src/input/pages/other.cpp:362
+#: src/gui/widgets/tabs/setup_other.cpp:377 src/input/pages/other.cpp:362
msgid "Upload log file"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:385
+#: src/gui/widgets/tabs/setup_other.cpp:381
msgid "Low traffic mode"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:389
+#: src/gui/widgets/tabs/setup_other.cpp:385
msgid "Hide shield sprite"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:394
+#: src/gui/widgets/tabs/setup_other.cpp:390
msgid "Use FBO for screenshots (only for opengl)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:400
+#: src/gui/widgets/tabs/setup_other.cpp:396
msgid "Screenshot directory"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:405
+#: src/gui/widgets/tabs/setup_other.cpp:401
msgid "Network delay between sub servers"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:409
+#: src/gui/widgets/tabs/setup_other.cpp:405
msgid "Show background"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:414
+#: src/gui/widgets/tabs/setup_other.cpp:410
msgid "Screen density override"
msgstr ""
@@ -4127,9 +4159,9 @@ msgstr "允許密語"
#. TRANSLATORS: command editor button
#. TRANSLATORS: input action name
#: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:82
-#: src/gui/windows/serverdialog.cpp:125 src/gui/windows/shopwindow.cpp:101
-#: src/gui/windows/shopwindow.cpp:108 src/gui/windows/textcommandeditor.cpp:92
+#: src/gui/windows/charselectdialog.cpp:84
+#: src/gui/windows/serverdialog.cpp:125 src/gui/windows/shopwindow.cpp:100
+#: src/gui/windows/shopwindow.cpp:107 src/gui/windows/textcommandeditor.cpp:92
#: src/input/pages/gui.cpp:111
msgid "Delete"
msgstr "刪除"
@@ -4783,7 +4815,7 @@ msgstr ""
#. TRANSLATORS: equipment window name
#. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:63
+#: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:65
#: src/gui/windows/inventorywindow.cpp:196
msgid "Equipment"
msgstr "裝備"
@@ -4924,7 +4956,7 @@ msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: social window button
#: src/gui/windows/buydialog.cpp:260 src/gui/windows/charcreatedialog.cpp:127
-#: src/gui/windows/charselectdialog.cpp:578
+#: src/gui/windows/charselectdialog.cpp:605
#: src/gui/windows/socialwindow.cpp:86
msgid "Create"
msgstr "創造"
@@ -4968,10 +5000,8 @@ msgstr ""
#. TRANSLATORS: change password window name
#. TRANSLATORS: change password dialog button
-#. TRANSLATORS: char select dialog. button.
#: src/gui/windows/changepassworddialog.cpp:51
#: src/gui/windows/changepassworddialog.cpp:57
-#: src/gui/windows/charselectdialog.cpp:73
msgid "Change Password"
msgstr ""
@@ -5125,57 +5155,68 @@ msgid "Are you sure you want to delete this character?"
msgstr "你確定想刪除這個角色?"
#. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:64
+#: src/gui/windows/charselectdialog.cpp:66
#, c-format
msgid "Account %s (last login time %s)"
msgstr ""
#. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:71
-msgid "Switch Login"
+#: src/gui/windows/charselectdialog.cpp:73
+msgid "Switch"
+msgstr ""
+
+#. TRANSLATORS: char select dialog. button.
+#: src/gui/windows/charselectdialog.cpp:75
+msgid "Password"
msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:78
-#: src/gui/windows/charselectdialog.cpp:573
+#: src/gui/windows/charselectdialog.cpp:80
+#: src/gui/windows/charselectdialog.cpp:595
#: src/gui/windows/updaterwindow.cpp:195
msgid "Play"
msgstr "開始"
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:80
+#: src/gui/windows/charselectdialog.cpp:82
#: src/net/ea/charserverhandler.cpp:160
+#: src/net/eathena/charserverhandler.cpp:531
+#: src/net/eathena/charserverhandler.cpp:561
msgid "Info"
msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: unregister dialog name
#. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:106
+#: src/gui/windows/charselectdialog.cpp:110
#: src/gui/windows/unregisterdialog.cpp:50
#: src/gui/windows/unregisterdialog.cpp:55
msgid "Unregister"
msgstr "註冊"
#. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:118
+#: src/gui/windows/charselectdialog.cpp:122
msgid "Change Email"
msgstr ""
#. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:156
+#: src/gui/windows/charselectdialog.cpp:166
#, c-format
msgid "Account %s"
msgstr ""
-#: src/gui/windows/charselectdialog.cpp:184
+#: src/gui/windows/charselectdialog.cpp:194
msgid "Please set new pincode"
msgstr ""
+#: src/gui/windows/charselectdialog.cpp:240
+msgid "Please enter new name"
+msgstr ""
+
#. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:237
+#: src/gui/windows/charselectdialog.cpp:259
#, c-format
msgid ""
"Hp: %u/%u\n"
@@ -5185,16 +5226,16 @@ msgid ""
"Money: %s"
msgstr ""
-#: src/gui/windows/charselectdialog.cpp:289
+#: src/gui/windows/charselectdialog.cpp:311
msgid "Incorrect password"
msgstr ""
#. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:429
+#: src/gui/windows/charselectdialog.cpp:451
msgid "Enter password for deleting character"
msgstr ""
-#: src/gui/windows/charselectdialog.cpp:429
+#: src/gui/windows/charselectdialog.cpp:451
msgid "Enter password:"
msgstr ""
@@ -5600,7 +5641,7 @@ msgstr "等級:%d"
#. TRANSLATORS: status bar label
#: src/gui/windows/ministatuswindow.cpp:364
-#: src/gui/windows/ministatuswindow.cpp:402
+#: src/gui/windows/ministatuswindow.cpp:401
msgid "Need"
msgstr ""
@@ -5631,7 +5672,7 @@ msgstr ""
#. TRANSLATORS: shop window button
#. TRANSLATORS: trade window button
#: src/gui/windows/npcdialog.cpp:114 src/gui/windows/serverdialog.cpp:121
-#: src/gui/windows/shopwindow.cpp:99 src/gui/windows/shopwindow.cpp:106
+#: src/gui/windows/shopwindow.cpp:98 src/gui/windows/shopwindow.cpp:105
#: src/gui/windows/tradewindow.cpp:83
msgid "Add"
msgstr "增加"
@@ -5794,43 +5835,38 @@ msgid "Reset Windows"
msgstr "重置視窗"
#. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:80
+#: src/gui/windows/shopwindow.cpp:79
msgid "Personal Shop"
msgstr ""
#. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:95
+#: src/gui/windows/shopwindow.cpp:94
msgid "Buy items"
msgstr ""
#. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:97
+#: src/gui/windows/shopwindow.cpp:96
msgid "Sell items"
msgstr ""
#. TRANSLATORS: shop window label
#. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:110
+#: src/gui/windows/shopwindow.cpp:102 src/gui/windows/shopwindow.cpp:109
msgid "Announce"
msgstr ""
#. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:114
+#: src/gui/windows/shopwindow.cpp:113
msgid "Show links in announce"
msgstr ""
-#. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:176 src/gui/windows/shopwindow.cpp:179
-msgid "Auction"
-msgstr ""
-
#. TRANSLATORS: shop window dialog
#. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:233
+#: src/gui/windows/shopwindow.cpp:776 src/net/ea/tradehandler.cpp:233
msgid "Request for Trade"
msgstr ""
-#: src/gui/windows/shopwindow.cpp:791
+#: src/gui/windows/shopwindow.cpp:776
#, c-format
msgid "%s wants to %s %s do you accept?"
msgstr ""
@@ -6158,27 +6194,27 @@ msgstr "更新中..."
msgid "Connecting..."
msgstr "連線中..."
-#: src/gui/windows/updaterwindow.cpp:398
+#: src/gui/windows/updaterwindow.cpp:407
msgid "Show all news (can be slow)"
msgstr ""
#. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:824
+#: src/gui/windows/updaterwindow.cpp:833
msgid "##1 The update process is incomplete."
msgstr ""
#. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:826
+#: src/gui/windows/updaterwindow.cpp:835
msgid "##1 It is strongly recommended that"
msgstr ""
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:828
+#: src/gui/windows/updaterwindow.cpp:837
msgid "##1 you try again later."
msgstr ""
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1005
+#: src/gui/windows/updaterwindow.cpp:1021
msgid "Completed"
msgstr "已完成"
@@ -6225,25 +6261,25 @@ msgstr ""
#. TRANSLATORS: long key name. must be short.
#. TRANSLATORS: short key name. must be very short.
#. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:370 src/input/inputmanager.cpp:414
+#: src/input/inputmanager.cpp:371 src/input/inputmanager.cpp:415
#: src/input/keyboardconfig.cpp:104
#, c-format
msgid "key_%d"
msgstr ""
#. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:376
+#: src/input/inputmanager.cpp:377
#, c-format
msgid "JButton%d"
msgstr ""
#. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:391
msgid "unknown key"
msgstr ""
#. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:420
+#: src/input/inputmanager.cpp:421
#, c-format
msgid "JB%d"
msgstr ""
@@ -6251,7 +6287,7 @@ msgstr ""
#. TRANSLATORS: unknown short key type. must be short
#. TRANSLATORS: Unknown key short string.
#. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:434 src/input/keyboardconfig.cpp:148
+#: src/input/inputmanager.cpp:435 src/input/keyboardconfig.cpp:148
msgid "u key"
msgstr ""
@@ -7422,74 +7458,74 @@ msgid "Request to quit denied!"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:135
#, c-format
msgid "Guild name: %s"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:191
+#: src/net/ea/guildhandler.cpp:138
#, c-format
msgid "Guild master: %s"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:141
#, c-format
msgid "Guild level: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:197
+#: src/net/ea/guildhandler.cpp:144
#, c-format
msgid "Online members: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:200
+#: src/net/ea/guildhandler.cpp:147
#, c-format
msgid "Max members: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:203
+#: src/net/ea/guildhandler.cpp:150
#, c-format
msgid "Average level: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:206
+#: src/net/ea/guildhandler.cpp:153
#, c-format
msgid "Guild exp: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:209
+#: src/net/ea/guildhandler.cpp:156
#, c-format
msgid "Guild next exp: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:212
+#: src/net/ea/guildhandler.cpp:159
#, c-format
msgid "Guild castle: %s"
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:179
+#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:191
msgid "Item sharing enabled."
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:183
+#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:195
msgid "Item sharing disabled."
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:187
+#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:199
msgid "Item sharing not possible."
msgstr ""
@@ -7500,19 +7536,19 @@ msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:167
+#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:179
msgid "Experience sharing enabled."
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:171
+#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:183
msgid "Experience sharing disabled."
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:175
+#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:187
msgid "Experience sharing not possible."
msgstr ""
@@ -7617,239 +7653,355 @@ msgid "Connection to server terminated. "
msgstr ""
#. TRANSLATORS: message header
-#: src/net/ea/playerhandler.cpp:257 src/net/ea/playerhandler.cpp:273
-#: src/net/ea/playerhandler.cpp:361
+#: src/net/ea/playerhandler.cpp:192 src/net/ea/playerhandler.cpp:418
+#: src/net/ea/playerhandler.cpp:434
msgid "Message"
msgstr ""
#. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:259
+#: src/net/ea/playerhandler.cpp:420
msgid ""
"You are carrying more than half your weight. You are unable to regain "
"health."
msgstr ""
#. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:275
+#: src/net/ea/playerhandler.cpp:436
msgid "You are carrying less than half your weight. You can regain health."
msgstr ""
+#. TRANSLATORS: char rename error
+#: src/net/eathena/charserverhandler.cpp:516
+#: src/net/eathena/charserverhandler.cpp:553
+msgid "Character rename error."
+msgstr ""
+
+#: src/net/eathena/charserverhandler.cpp:531
+msgid "Character renamed."
+msgstr ""
+
+#. TRANSLATORS: char rename error
+#: src/net/eathena/charserverhandler.cpp:544
+msgid "Rename not allowed."
+msgstr ""
+
+#. TRANSLATORS: char rename error
+#: src/net/eathena/charserverhandler.cpp:548
+msgid "New name is not set."
+msgstr ""
+
+#. TRANSLATORS: char rename error
+#: src/net/eathena/charserverhandler.cpp:557
+msgid "Character not found."
+msgstr ""
+
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:125
+#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:124
#, c-format
msgid "Strength %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:127
+#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:126
#, c-format
msgid "Agility %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:129
+#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:128
#, c-format
msgid "Vitality %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:131
+#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:130
#, c-format
msgid "Intelligence %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:128 src/net/tmwa/generalhandler.cpp:133
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:132
#, c-format
msgid "Dexterity %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:135
+#: src/net/eathena/generalhandler.cpp:128 src/net/tmwa/generalhandler.cpp:134
#, c-format
msgid "Luck %s"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:152 src/net/tmwa/generalhandler.cpp:161
+#: src/net/eathena/generalhandler.cpp:159 src/net/tmwa/generalhandler.cpp:160
msgid "Authentication failed."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:155 src/net/tmwa/generalhandler.cpp:165
+#: src/net/eathena/generalhandler.cpp:162 src/net/tmwa/generalhandler.cpp:164
msgid "No servers available."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:160 src/net/tmwa/generalhandler.cpp:171
+#: src/net/eathena/generalhandler.cpp:167 src/net/tmwa/generalhandler.cpp:170
msgid "Someone else is trying to use this account."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:165 src/net/tmwa/generalhandler.cpp:177
+#: src/net/eathena/generalhandler.cpp:172 src/net/tmwa/generalhandler.cpp:176
msgid "This account is already logged in."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:169 src/net/tmwa/generalhandler.cpp:182
+#: src/net/eathena/generalhandler.cpp:176 src/net/tmwa/generalhandler.cpp:181
msgid "Speed hack detected."
msgstr ""
+#: src/net/eathena/generalhandler.cpp:179
+msgid "Server full."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:182
+msgid "Sorry, you are underaged."
+msgstr ""
+
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:172 src/net/tmwa/generalhandler.cpp:186
+#: src/net/eathena/generalhandler.cpp:185 src/net/tmwa/generalhandler.cpp:185
msgid "Duplicated login."
msgstr ""
+#: src/net/eathena/generalhandler.cpp:188
+msgid "To many connections from same ip."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:191
+msgid "Not paid for this time."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:194
+msgid "Pay suspended."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:197
+msgid "Pay changed."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:200
+msgid "Pay wrong ip."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:203
+msgid "Pay game room."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:206
+msgid "Disconnect forced by GM."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:210
+msgid "Ban japan refuse."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:213
+msgid "Remained other account."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:216
+msgid "Ip unfair."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:219
+msgid "Ip count all."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:222
+msgid "Ip count."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:226
+msgid "Memory."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:229
+msgid "Han valid."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:232
+msgid "Ip limited access."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:235
+msgid "Over characters list."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:238
+msgid "Ip blocked."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:241
+msgid "Invalid password count."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:244
+msgid "Not allowed race."
+msgstr ""
+
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:175 src/net/tmwa/generalhandler.cpp:190
+#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:189
msgid "Unknown connection error."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:280
+#: src/net/eathena/generalhandler.cpp:323 src/net/tmwa/generalhandler.cpp:279
msgid "Got disconnected from server!"
msgstr "和伺服器失去連線!"
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:282 src/net/tmwa/generalhandler.cpp:308
+#: src/net/eathena/generalhandler.cpp:348 src/net/tmwa/generalhandler.cpp:307
msgid "Strength"
msgstr "力量"
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:310
+#: src/net/eathena/generalhandler.cpp:349 src/net/tmwa/generalhandler.cpp:309
msgid "Agility"
msgstr "敏捷"
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:284 src/net/tmwa/generalhandler.cpp:312
+#: src/net/eathena/generalhandler.cpp:350 src/net/tmwa/generalhandler.cpp:311
msgid "Vitality"
msgstr "體力"
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:285 src/net/tmwa/generalhandler.cpp:314
+#: src/net/eathena/generalhandler.cpp:352 src/net/tmwa/generalhandler.cpp:314
msgid "Intelligence"
msgstr "智力"
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:286 src/net/tmwa/generalhandler.cpp:316
+#: src/net/eathena/generalhandler.cpp:353 src/net/tmwa/generalhandler.cpp:316
msgid "Dexterity"
msgstr "閃躲"
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:287 src/net/tmwa/generalhandler.cpp:318
+#: src/net/eathena/generalhandler.cpp:354 src/net/tmwa/generalhandler.cpp:318
msgid "Luck"
msgstr "幸運"
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:290 src/net/tmwa/generalhandler.cpp:323
+#: src/net/eathena/generalhandler.cpp:357 src/net/tmwa/generalhandler.cpp:322
msgid "Defense"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:291 src/net/tmwa/generalhandler.cpp:325
+#: src/net/eathena/generalhandler.cpp:358 src/net/tmwa/generalhandler.cpp:324
msgid "M.Attack"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:292 src/net/tmwa/generalhandler.cpp:327
+#: src/net/eathena/generalhandler.cpp:359 src/net/tmwa/generalhandler.cpp:326
msgid "M.Defense"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:294 src/net/tmwa/generalhandler.cpp:330
+#: src/net/eathena/generalhandler.cpp:361 src/net/tmwa/generalhandler.cpp:329
#, no-c-format
msgid "% Accuracy"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:296 src/net/tmwa/generalhandler.cpp:333
+#: src/net/eathena/generalhandler.cpp:363 src/net/tmwa/generalhandler.cpp:332
#, no-c-format
msgid "% Evade"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:298 src/net/tmwa/generalhandler.cpp:336
+#: src/net/eathena/generalhandler.cpp:365 src/net/tmwa/generalhandler.cpp:335
#, no-c-format
msgid "% Critical"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:299 src/net/tmwa/generalhandler.cpp:338
+#: src/net/eathena/generalhandler.cpp:366 src/net/tmwa/generalhandler.cpp:337
msgid "Attack Delay"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:300 src/net/tmwa/generalhandler.cpp:340
+#: src/net/eathena/generalhandler.cpp:367 src/net/tmwa/generalhandler.cpp:339
msgid "Walk Delay"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:301 src/net/tmwa/generalhandler.cpp:342
+#: src/net/eathena/generalhandler.cpp:368 src/net/tmwa/generalhandler.cpp:341
msgid "Attack Range"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:302 src/net/tmwa/generalhandler.cpp:344
+#: src/net/eathena/generalhandler.cpp:369 src/net/tmwa/generalhandler.cpp:343
msgid "Damage per sec."
msgstr ""
-#: src/net/eathena/skillhandler.cpp:228 src/net/eathena/skillhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:370
+msgid "Karma"
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:371
+msgid "Manner"
+msgstr ""
+
+#: src/net/eathena/skillhandler.cpp:304 src/net/eathena/skillhandler.cpp:364
#, c-format
msgid "Unknown skill error: %d"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:235 src/net/tmwa/skillhandler.cpp:224
+#: src/net/eathena/skillhandler.cpp:311 src/net/tmwa/skillhandler.cpp:224
msgid "You have not yet reached a high enough lvl!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:239 src/net/tmwa/skillhandler.cpp:228
+#: src/net/eathena/skillhandler.cpp:315 src/net/tmwa/skillhandler.cpp:228
msgid "Insufficient HP!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:243 src/net/tmwa/skillhandler.cpp:232
+#: src/net/eathena/skillhandler.cpp:319 src/net/tmwa/skillhandler.cpp:232
msgid "Insufficient SP!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:247 src/net/tmwa/skillhandler.cpp:236
+#: src/net/eathena/skillhandler.cpp:323 src/net/tmwa/skillhandler.cpp:236
msgid "You have no memos!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:251 src/net/tmwa/skillhandler.cpp:240
+#: src/net/eathena/skillhandler.cpp:327 src/net/tmwa/skillhandler.cpp:240
msgid "You cannot do that right now!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:255 src/net/tmwa/skillhandler.cpp:244
+#: src/net/eathena/skillhandler.cpp:331 src/net/tmwa/skillhandler.cpp:244
msgid "Seems you need more money... ;-)"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:259 src/net/tmwa/skillhandler.cpp:248
+#: src/net/eathena/skillhandler.cpp:335 src/net/tmwa/skillhandler.cpp:248
msgid "You cannot use this skill with that kind of weapon!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:264 src/net/tmwa/skillhandler.cpp:253
+#: src/net/eathena/skillhandler.cpp:340 src/net/tmwa/skillhandler.cpp:253
msgid "You need another red gem!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:268 src/net/tmwa/skillhandler.cpp:257
+#: src/net/eathena/skillhandler.cpp:344 src/net/tmwa/skillhandler.cpp:257
msgid "You need another blue gem!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:272 src/net/tmwa/skillhandler.cpp:261
+#: src/net/eathena/skillhandler.cpp:348 src/net/tmwa/skillhandler.cpp:261
msgid "You're carrying to much to do this!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:276 src/net/tmwa/skillhandler.cpp:265
+#: src/net/eathena/skillhandler.cpp:352 src/net/tmwa/skillhandler.cpp:265
msgid "Huh? What's that?"
msgstr ""
@@ -7866,32 +8018,32 @@ msgid "%s wants to trade with you, do you accept?"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:349
+#: src/net/tmwa/charserverhandler.cpp:351
msgid "Strength:"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:351
+#: src/net/tmwa/charserverhandler.cpp:353
msgid "Agility:"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:353
+#: src/net/tmwa/charserverhandler.cpp:355
msgid "Vitality:"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:355
+#: src/net/tmwa/charserverhandler.cpp:357
msgid "Intelligence:"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:357
+#: src/net/tmwa/charserverhandler.cpp:359
msgid "Dexterity:"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:359
+#: src/net/tmwa/charserverhandler.cpp:361
msgid "Luck:"
msgstr ""
@@ -8202,269 +8354,306 @@ msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:143
+msgid "You cant left party on this map."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:147
+msgid "You was kicked from party."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:151
+msgid "You cant be kicked kicked from party on this map."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:155
#, c-format
msgid "%s has joined your party."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:147
+#: src/resources/notifications.h:159
#, c-format
msgid "%s is already a member of a party."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:151
+#: src/resources/notifications.h:163
#, c-format
msgid "%s refused your invitation."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:155
+#: src/resources/notifications.h:167
#, c-format
msgid "%s is now a member of your party."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:159
+#: src/resources/notifications.h:171
#, c-format
msgid "%s can't join your party because party is full."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:163
+#: src/resources/notifications.h:175
#, c-format
msgid "QQQ Unknown invite response for %s."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:191
+#: src/resources/notifications.h:203
#, c-format
msgid "%s has left your party."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:195
+#: src/resources/notifications.h:207 src/resources/notifications.h:215
+#, c-format
+msgid "%s cant be kicked from party on this map."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:211
+#, c-format
+msgid "%s has kicked from your party."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:219
#, c-format
msgid "An unknown member tried to say: %s"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:199
+#: src/resources/notifications.h:223
#, c-format
msgid "%s is not in your party!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:203
+#: src/resources/notifications.h:227
#, c-format
msgid "You picked up %s."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:207
+#: src/resources/notifications.h:231
#, c-format
msgid "You spent %s."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:211
+#: src/resources/notifications.h:235
msgid "Cannot raise skill!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:215
+#: src/resources/notifications.h:239
msgid "Equip ammunition first."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:219
+#: src/resources/notifications.h:243
#, c-format
msgid "Trading with %s isn't possible. Trade partner is too far away."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:224
+#: src/resources/notifications.h:248
#, c-format
msgid "Trading with %s isn't possible. Character doesn't exist."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:228
+#: src/resources/notifications.h:252
msgid "Trade cancelled due to an unknown reason."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:232
+#: src/resources/notifications.h:256
#, c-format
msgid "Trade with %s cancelled."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:236
+#: src/resources/notifications.h:260
#, c-format
msgid "Unhandled trade cancel packet with %s"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:240
+#: src/resources/notifications.h:264
msgid "Failed adding item. Trade partner is over weighted."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:244
+#: src/resources/notifications.h:268
msgid "Failed adding item. Trade partner has no free slot."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:248
+#: src/resources/notifications.h:272
msgid "Failed adding item. You can't trade this item."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:252
+#: src/resources/notifications.h:276
msgid "Failed adding item for unknown reason."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:256
+#: src/resources/notifications.h:280
msgid "Trade canceled."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:260
+#: src/resources/notifications.h:284
msgid "Trade completed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:264
+#: src/resources/notifications.h:288
msgid "Kick failed!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:268
+#: src/resources/notifications.h:292
msgid "Kick succeeded!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:272
+#: src/resources/notifications.h:296
#, c-format
msgid "MVP player: %s"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:276
+#: src/resources/notifications.h:300
msgid "All whispers ignored."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:280
+#: src/resources/notifications.h:304
msgid "All whispers ignore failed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:284
+#: src/resources/notifications.h:308
msgid "All whispers unignored."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:288
+#: src/resources/notifications.h:312
msgid "All whispers unignore failed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:295
+#: src/resources/notifications.h:319
msgid "pvp off, gvg off"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:299
+#: src/resources/notifications.h:323
msgid "pvp on"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:303
+#: src/resources/notifications.h:327
msgid "gvg on"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:307
+#: src/resources/notifications.h:331
msgid "pvp on, gvg on"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:311
+#: src/resources/notifications.h:335
msgid "unknown pvp"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:315
+#: src/resources/notifications.h:339
#, c-format
msgid "Char from account %s is already in your party!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:319
+#: src/resources/notifications.h:343
#, c-format
msgid "%s blocked invite!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:323
+#: src/resources/notifications.h:347
msgid "Char is not online!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:327
+#: src/resources/notifications.h:351
msgid "Pet catch failed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:331
+#: src/resources/notifications.h:355
msgid "Pet catched."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:335
+#: src/resources/notifications.h:359
#, c-format
msgid "Pet catch unkown error: %d."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:339
+#: src/resources/notifications.h:363
msgid "Your mercenary duty hour is over."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:343
+#: src/resources/notifications.h:367
msgid "Your mercenary was killed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:347
+#: src/resources/notifications.h:371
msgid "Your mercenary was fired."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:351
+#: src/resources/notifications.h:375
msgid "Your mercenary run away."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:355
+#: src/resources/notifications.h:379
msgid "Mercenary unknown state."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:359
-msgid "Your feed your homunculus."
+#: src/resources/notifications.h:383
+msgid "You feed your homunculus."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:363
+#: src/resources/notifications.h:387
#, c-format
msgid "You cant feed homunculus, because not have %s."
msgstr ""
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:391
+msgid "Card insert failed."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:395
+msgid "Card inserted."
+msgstr ""
+
#. TRANSLATORS: chat option changed message
#: src/utils/booleanoptions.h:27
#, c-format
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 3fbbdd0c8..7c446e968 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-27 13:23+0300\n"
-"PO-Revision-Date: 2014-09-28 10:01+0000\n"
+"POT-Creation-Date: 2014-10-08 01:19+0300\n"
+"PO-Revision-Date: 2014-10-08 10:02+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/manaplus/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
@@ -32,7 +32,7 @@ msgstr ""
#. TRANSLATORS: ok dialog button
#. TRANSLATORS: text dialog button
#. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:131 src/client.cpp:1463 src/client.cpp:1490
+#: src/actions/actions.cpp:131 src/client.cpp:1461 src/client.cpp:1488
#: src/gamemodifiers.cpp:423 src/gui/widgets/tabs/setup_input.cpp:163
#: src/gui/widgets/tabs/setup_theme.cpp:312
#: src/gui/widgets/tabs/setup_theme.cpp:343
@@ -43,8 +43,8 @@ msgstr ""
#: src/gui/windows/changeemaildialog.cpp:170
#: src/gui/windows/changepassworddialog.cpp:160
#: src/gui/windows/charcreatedialog.cpp:373
-#: src/gui/windows/charselectdialog.cpp:255
-#: src/gui/windows/charselectdialog.cpp:291 src/gui/windows/editdialog.cpp:49
+#: src/gui/windows/charselectdialog.cpp:277
+#: src/gui/windows/charselectdialog.cpp:313 src/gui/windows/editdialog.cpp:49
#: src/gui/windows/editserverdialog.cpp:61
#: src/gui/windows/editserverdialog.cpp:208
#: src/gui/windows/itemamountwindow.cpp:158 src/gui/windows/quitdialog.cpp:70
@@ -52,7 +52,9 @@ msgstr ""
#: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
#: src/net/ea/charserverhandler.cpp:143 src/net/ea/charserverhandler.cpp:162
#: src/net/ea/charserverhandler.cpp:175 src/net/ea/gamehandler.cpp:79
-#: src/net/ea/playerhandler.cpp:263 src/net/ea/playerhandler.cpp:279
+#: src/net/ea/playerhandler.cpp:424 src/net/ea/playerhandler.cpp:440
+#: src/net/eathena/charserverhandler.cpp:533
+#: src/net/eathena/charserverhandler.cpp:563
msgid "OK"
msgstr "確定"
@@ -176,7 +178,7 @@ msgstr ""
#. TRANSLATORS: party invite message
#. TRANSLATORS: change relation
-#: src/actions/chat.cpp:303 src/actions/commands.cpp:65
+#: src/actions/chat.cpp:303 src/actions/commands.cpp:64
msgid "Please specify a name."
msgstr ""
@@ -199,75 +201,75 @@ msgid "Message now closes chat."
msgstr "切換聊天."
#. TRANSLATORS: change relation
-#: src/actions/commands.cpp:108
+#: src/actions/commands.cpp:107
#, c-format
msgid "Player already %s!"
msgstr ""
#. TRANSLATORS: change relation
-#: src/actions/commands.cpp:120
+#: src/actions/commands.cpp:119
#, c-format
msgid "Player successfully %s!"
msgstr ""
#. TRANSLATORS: change relation
-#: src/actions/commands.cpp:122
+#: src/actions/commands.cpp:121
#, c-format
msgid "Player could not be %s!"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:153
+#: src/actions/commands.cpp:152
msgid "Player wasn't ignored!"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:162
+#: src/actions/commands.cpp:161
msgid "Player no longer ignored!"
msgstr ""
#. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:164
+#: src/actions/commands.cpp:163
msgid "Player could not be unignored!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/actions/commands.cpp:179
+#: src/actions/commands.cpp:178
msgid "Player already erased!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/actions/commands.cpp:192
+#: src/actions/commands.cpp:191
msgid "Player no longer erased!"
msgstr ""
#. TRANSLATORS: erase command
-#: src/actions/commands.cpp:194
+#: src/actions/commands.cpp:193
msgid "Player could not be erased!"
msgstr ""
#. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:201
+#: src/actions/commands.cpp:200
msgid "friend"
msgstr ""
#. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:208
+#: src/actions/commands.cpp:207
msgid "disregarded"
msgstr ""
#. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:215
+#: src/actions/commands.cpp:214
msgid "neutral"
msgstr ""
#. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:222
+#: src/actions/commands.cpp:221
msgid "blacklisted"
msgstr ""
#. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:229
+#: src/actions/commands.cpp:228
msgid "enemy"
msgstr ""
@@ -282,77 +284,77 @@ msgid "Accepting incoming trade requests"
msgstr "接受收到的交易要求"
#. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1306
+#: src/actormanager.cpp:1310
msgid "Visible on map"
msgstr ""
#. TRANSLATORS: default race name
-#: src/being/being.cpp:389
+#: src/being/being.cpp:393
msgid "Human"
msgstr ""
-#: src/being/being.cpp:556
+#: src/being/being.cpp:560
msgid "dodge"
msgstr ""
-#: src/being/being.cpp:556
+#: src/being/being.cpp:560
msgid "miss"
msgstr ""
#. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1865 src/gui/windows/whoisonline.cpp:855
+#: src/being/being.cpp:1869 src/gui/windows/whoisonline.cpp:855
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1870 src/gui/windows/whoisonline.cpp:860
+#: src/being/being.cpp:1874 src/gui/windows/whoisonline.cpp:860
msgid "I"
msgstr ""
#. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:379
+#: src/being/localplayer.cpp:380
#, c-format
msgid "You were killed by %s"
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:824
+#: src/being/localplayer.cpp:825
msgid "Tried to pick up nonexistent item."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:828
+#: src/being/localplayer.cpp:829
msgid "Item is too heavy."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:832
+#: src/being/localplayer.cpp:833
msgid "Item is too far away."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:836
+#: src/being/localplayer.cpp:837
msgid "Inventory is full."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:840
+#: src/being/localplayer.cpp:841
msgid "Stack is too big."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:844
+#: src/being/localplayer.cpp:845
msgid "Item belongs to someone else."
msgstr ""
#. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:848
+#: src/being/localplayer.cpp:849
msgid "Unknown problem picking up item."
msgstr ""
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:872
+#: src/being/localplayer.cpp:873
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -360,43 +362,43 @@ msgstr[0] ""
#. TRANSLATORS: this is normal experience
#. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1054 src/being/localplayer.cpp:1055
-#: src/being/localplayer.cpp:1091
+#: src/being/localplayer.cpp:1055 src/being/localplayer.cpp:1056
+#: src/being/localplayer.cpp:1092
msgid "xp"
msgstr ""
#. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1059 src/being/localplayer.cpp:1065
-#: src/being/localplayer.cpp:1071
+#: src/being/localplayer.cpp:1060 src/being/localplayer.cpp:1066
+#: src/being/localplayer.cpp:1072
msgid "job"
msgstr ""
#. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2794
+#: src/being/localplayer.cpp:2795
#, c-format
msgid "Follow: %s"
msgstr ""
#. TRANSLATORS: follow command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2800 src/being/localplayer.cpp:2825
+#: src/being/localplayer.cpp:2801 src/being/localplayer.cpp:2826
msgid "Follow canceled"
msgstr ""
#. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2810
+#: src/being/localplayer.cpp:2811
#, c-format
msgid "Imitation: %s"
msgstr ""
#. TRANSLATORS: imitate command message
#. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2816 src/being/localplayer.cpp:2830
+#: src/being/localplayer.cpp:2817 src/being/localplayer.cpp:2831
msgid "Imitation canceled"
msgstr ""
#. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3180
+#: src/being/localplayer.cpp:3181
#, c-format
msgid "You see %s"
msgstr ""
@@ -434,37 +436,37 @@ msgstr ""
#. TRANSLATORS: setup tab quick button
#. TRANSLATORS: full button name
#. TRANSLATORS: setup window name
-#: src/client.cpp:920 src/gui/windowmenu.cpp:162
+#: src/client.cpp:918 src/gui/windowmenu.cpp:162
#: src/gui/windows/setupwindow.cpp:62
msgid "Setup"
msgstr "設定"
#. TRANSLATORS: perfoamance tab quick button
#. TRANSLATORS: settings tab name
-#: src/client.cpp:923 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:921 src/gui/widgets/tabs/setup_perfomance.cpp:54
msgid "Performance"
msgstr ""
#. TRANSLATORS: video tab quick button
#. TRANSLATORS: video settings tab name
-#: src/client.cpp:926 src/gui/widgets/tabs/setup_video.cpp:105
+#: src/client.cpp:924 src/gui/widgets/tabs/setup_video.cpp:105
msgid "Video"
msgstr "顯示"
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: theme settings tab name
-#: src/client.cpp:929 src/gui/widgets/tabs/setup_theme.cpp:122
+#: src/client.cpp:927 src/gui/widgets/tabs/setup_theme.cpp:122
msgid "Theme"
msgstr ""
#. TRANSLATORS: theme tab quick button
-#: src/client.cpp:932
+#: src/client.cpp:930
msgid "About"
msgstr ""
#. TRANSLATORS: theme tab quick button
#. TRANSLATORS: help window name
-#: src/client.cpp:935 src/gui/windowmenu.cpp:74
+#: src/client.cpp:933 src/gui/windowmenu.cpp:74
#: src/gui/windows/helpwindow.cpp:53
msgid "Help"
msgstr "說明"
@@ -480,42 +482,42 @@ msgstr "說明"
#. TRANSLATORS: npc dialog button
#. TRANSLATORS: quests window button
#. TRANSLATORS: shop window button
-#: src/client.cpp:939 src/client.cpp:1391 src/client.cpp:1405
+#: src/client.cpp:937 src/client.cpp:1389 src/client.cpp:1403
#: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:691
#: src/gui/popups/popupmenu.cpp:923 src/gui/windows/didyouknowwindow.cpp:81
#: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:74
#: src/gui/windows/npcdialog.cpp:112 src/gui/windows/questswindow.cpp:77
-#: src/gui/windows/shopwindow.cpp:84
+#: src/gui/windows/shopwindow.cpp:83
msgid "Close"
msgstr "關閉"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1065
+#: src/client.cpp:1063
msgid "Connecting to server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1113
+#: src/client.cpp:1111
msgid "Logging in"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1156
+#: src/client.cpp:1154
msgid "Entering game world"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1282
+#: src/client.cpp:1280
msgid "Requesting characters"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1322
+#: src/client.cpp:1320
msgid "Connecting to the game server"
msgstr ""
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1334
+#: src/client.cpp:1332
msgid "Changing game servers"
msgstr ""
@@ -529,72 +531,76 @@ msgstr ""
#. TRANSLATORS: unregister dialog. error message.
#. TRANSLATORS: error message header
#. TRANSLATORS: error message
-#: src/client.cpp:1389 src/client.cpp:1403 src/client.cpp:1598
+#. TRANSLATORS: info message
+#. TRANSLATORS: ok dialog button
+#: src/client.cpp:1387 src/client.cpp:1401 src/client.cpp:1596
#: src/gui/windows/changeemaildialog.cpp:167
#: src/gui/windows/changepassworddialog.cpp:157
#: src/gui/windows/charcreatedialog.cpp:369
-#: src/gui/windows/charselectdialog.cpp:289
+#: src/gui/windows/charselectdialog.cpp:311
#: src/gui/windows/editserverdialog.cpp:203
#: src/gui/windows/registerdialog.cpp:245
#: src/gui/windows/unregisterdialog.cpp:146
#: src/net/ea/charserverhandler.cpp:141 src/net/ea/charserverhandler.cpp:173
+#: src/net/eathena/charserverhandler.cpp:516
+#: src/net/eathena/charserverhandler.cpp:518
msgid "Error"
msgstr "錯誤"
#. TRANSLATORS: connection dialog header
-#: src/client.cpp:1418
+#: src/client.cpp:1416
msgid "Requesting registration details"
msgstr ""
#. TRANSLATORS: password change message header
-#: src/client.cpp:1459
+#: src/client.cpp:1457
msgid "Password Change"
msgstr ""
#. TRANSLATORS: password change message text
-#: src/client.cpp:1461
+#: src/client.cpp:1459
msgid "Password changed successfully!"
msgstr ""
#. TRANSLATORS: email change message header
-#: src/client.cpp:1486
+#: src/client.cpp:1484
msgid "Email Change"
msgstr ""
#. TRANSLATORS: email change message text
-#: src/client.cpp:1488
+#: src/client.cpp:1486
msgid "Email changed successfully!"
msgstr ""
#. TRANSLATORS: unregister message header
-#: src/client.cpp:1515
+#: src/client.cpp:1513
msgid "Unregister Successful"
msgstr ""
#. TRANSLATORS: unregister message text
-#: src/client.cpp:1517
+#: src/client.cpp:1515
msgid "Farewell, come back any time..."
msgstr ""
#. TRANSLATORS: directory creation error
#: src/configmanager.cpp:53 src/dirs.cpp:260 src/dirs.cpp:275 src/dirs.cpp:320
-#: src/dirs.cpp:481 src/dirs.cpp:489
+#: src/dirs.cpp:488 src/dirs.cpp:496
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:363
+#: src/dirs.cpp:370
#, c-format
msgid "Invalid update host: %s."
msgstr ""
#. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:404 src/dirs.cpp:411
+#: src/dirs.cpp:411 src/dirs.cpp:418
msgid "Error creating updates directory!"
msgstr "建立更新目錄失敗!"
-#: src/dirs.cpp:433 src/dirs.cpp:451
+#: src/dirs.cpp:440 src/dirs.cpp:458
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
@@ -612,36 +618,36 @@ msgid "dyecmd srcdyestring dstfile"
msgstr ""
#. TRANSLATORS: chat tab header
-#: src/game.cpp:236 src/gui/widgets/tabs/chattab.cpp:482
+#: src/game.cpp:234 src/gui/widgets/tabs/chattab.cpp:482
msgid "General"
msgstr "一般"
#. TRANSLATORS: chat tab header
#. TRANSLATORS: full button name
#. TRANSLATORS: debug window name
-#: src/game.cpp:253 src/gui/widgets/tabs/chattab.cpp:484
+#: src/game.cpp:251 src/gui/widgets/tabs/chattab.cpp:484
#: src/gui/windowmenu.cpp:149 src/gui/windows/debugwindow.cpp:42
msgid "Debug"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:541
+#: src/game.cpp:532
#, c-format
msgid "Screenshot saved as %s"
msgstr ""
#. TRANSLATORS: save file message
-#: src/game.cpp:551
+#: src/game.cpp:542
msgid "Saving screenshot failed!"
msgstr "儲存抓圖失敗!"
#. TRANSLATORS: error message text
-#: src/game.cpp:634
+#: src/game.cpp:625
msgid "The connection to the server was lost."
msgstr ""
#. TRANSLATORS: error message header
-#: src/game.cpp:637
+#: src/game.cpp:628
msgid "Network Error"
msgstr "網路錯誤"
@@ -1032,6 +1038,7 @@ msgstr ""
#: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
#: src/gui/widgets/tabs/setup_other.cpp:79
#: src/gui/widgets/tabs/setup_visual.cpp:81
+#: src/gui/windows/equipmentwindow.cpp:577
msgid "default"
msgstr ""
@@ -1522,7 +1529,7 @@ msgstr "交易"
#: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:273
#: src/gui/popups/popupmenu.cpp:767 src/gui/widgets/skillinfo.cpp:113
#: src/gui/windows/botcheckerwindow.cpp:89 src/input/pages/basic.cpp:42
-#: src/net/eathena/generalhandler.cpp:289 src/net/tmwa/generalhandler.cpp:321
+#: src/net/eathena/generalhandler.cpp:356 src/net/tmwa/generalhandler.cpp:320
msgid "Attack"
msgstr "攻擊"
@@ -1691,7 +1698,7 @@ msgstr ""
#. TRANSLATORS: pet unequip item
#. TRANSLATORS: equipment window button
#. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:340 src/gui/windows/equipmentwindow.cpp:70
+#: src/gui/popups/popupmenu.cpp:340 src/gui/windows/equipmentwindow.cpp:72
#: src/gui/windows/inventorywindow.cpp:175 src/resources/itemtypemapdata.h:47
#: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
#: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
@@ -1749,7 +1756,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:574
+#: src/gui/popups/popupmenu.cpp:574 src/gui/windows/charselectdialog.cpp:132
msgid "Rename"
msgstr ""
@@ -2261,7 +2268,7 @@ msgstr ""
#. TRANSLATORS: popup menu item
#. TRANSLATORS: revive player
#. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:3000 src/net/ea/playerhandler.cpp:364
+#: src/gui/popups/popupmenu.cpp:3000 src/net/ea/playerhandler.cpp:195
msgid "Revive"
msgstr ""
@@ -2285,7 +2292,7 @@ msgstr ""
#. TRANSLATORS: input tab sub tab name
#. TRANSLATORS: settings group
#. TRANSLATORS: full button name
-#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:319
+#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:315
#: src/gui/windowmenu.cpp:158
msgid "Windows"
msgstr ""
@@ -2313,7 +2320,7 @@ msgstr "聊天"
#. TRANSLATORS: input action name
#: src/gui/setupinputpages.cpp:57 src/gui/widgets/tabs/setup_audio.cpp:151
#: src/gui/widgets/tabs/setup_chat.cpp:179
-#: src/gui/widgets/tabs/setup_other.cpp:341
+#: src/gui/widgets/tabs/setup_other.cpp:337
#: src/gui/widgets/tabs/setup_visual.cpp:192
#: src/gui/windows/charcreatedialog.cpp:119
#: src/gui/windows/registerdialog.cpp:106 src/input/pages/gui.cpp:87
@@ -2326,212 +2333,227 @@ msgid "Gui"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:113
+#: src/gui/userpalette.cpp:116
msgid "Being"
msgstr "物件"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:115
+#: src/gui/userpalette.cpp:118
msgid "Friend names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:117
+#: src/gui/userpalette.cpp:120
msgid "Disregarded names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:119
+#: src/gui/userpalette.cpp:122
msgid "Ignored names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:121
+#: src/gui/userpalette.cpp:124
msgid "Erased names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:123
+#: src/gui/userpalette.cpp:126
msgid "Other players names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:125
+#: src/gui/userpalette.cpp:128
msgid "Own name"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:127
+#: src/gui/userpalette.cpp:130
msgid "GM names"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:129
+#: src/gui/userpalette.cpp:132
msgid "NPCs"
msgstr "電腦"
#. TRANSLATORS: palette color
#. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:131 src/gui/widgets/tabs/setup_other.cpp:108
+#: src/gui/userpalette.cpp:134 src/gui/widgets/tabs/setup_other.cpp:108
msgid "Monsters"
msgstr "怪物"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:133
+#: src/gui/userpalette.cpp:136
msgid "Monster HP bar"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:139
msgid "Monster HP bar (second color)"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:138
+#: src/gui/userpalette.cpp:141
msgid "Party members"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:140
+#: src/gui/userpalette.cpp:143
msgid "Guild members"
msgstr ""
#. TRANSLATORS: palette color
#. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:142 src/gui/widgets/tabs/setup_visual.cpp:157
+#: src/gui/userpalette.cpp:145 src/gui/widgets/tabs/setup_visual.cpp:157
msgid "Particle effects"
msgstr "粒子效果"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:144
+#: src/gui/userpalette.cpp:147
msgid "Pickup notification"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:146
+#: src/gui/userpalette.cpp:149
msgid "Exp notification"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:148
+#: src/gui/userpalette.cpp:151
msgid "Player HP bar"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:152
+#: src/gui/userpalette.cpp:155
msgid "Player HP bar (second color)"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:154
+#: src/gui/userpalette.cpp:157
msgid "Player hits monster"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:156
+#: src/gui/userpalette.cpp:159
msgid "Monster hits player"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:160
+#: src/gui/userpalette.cpp:163
msgid "Other player hits local player"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:162
+#: src/gui/userpalette.cpp:165
msgid "Critical Hit"
msgstr "致命一擊"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:166
+#: src/gui/userpalette.cpp:169
msgid "Local player hits monster"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:169
+#: src/gui/userpalette.cpp:172
msgid "Local player critical hit"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:172
+#: src/gui/userpalette.cpp:175
msgid "Local player miss"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:174
+#: src/gui/userpalette.cpp:177
msgid "Misses"
msgstr "失誤"
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:176
+#: src/gui/userpalette.cpp:179
msgid "Portal highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:179
+#: src/gui/userpalette.cpp:182
msgid "Default collision highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:182
+#: src/gui/userpalette.cpp:185
msgid "Air collision highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:185
+#: src/gui/userpalette.cpp:188
msgid "Water collision highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:188
+#: src/gui/userpalette.cpp:191
msgid "Special ground collision highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:191
+#: src/gui/userpalette.cpp:194
msgid "Walkable highlight"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:194
+#: src/gui/userpalette.cpp:197
msgid "Local player attack range"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:197
+#: src/gui/userpalette.cpp:200
msgid "Local player attack range border"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:200
+#: src/gui/userpalette.cpp:203
msgid "Monster attack range"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:204
+#: src/gui/userpalette.cpp:207
msgid "Floor item amount color"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:207
+#: src/gui/userpalette.cpp:210
msgid "Home place"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:210
+#: src/gui/userpalette.cpp:213
msgid "Home place border"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:213
+#: src/gui/userpalette.cpp:216
msgid "Road point"
msgstr ""
#. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:216
+#: src/gui/userpalette.cpp:219
msgid "Tiles border"
msgstr ""
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:221
+msgid "Pets"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:223
+msgid "Mercenary"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:225
+msgid "Homunculus"
+msgstr ""
+
#: src/gui/widgets/characterdisplay.cpp:135
#, c-format
msgid "Level: %u"
@@ -2634,7 +2656,8 @@ msgid "Type: %s"
msgstr ""
#. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:108
+#. TRANSLATORS: unknown equipment page name
+#: src/gui/widgets/skillinfo.cpp:108 src/gui/windows/equipmentwindow.cpp:584
msgid "Unknown"
msgstr ""
@@ -2835,22 +2858,22 @@ msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:262
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:313
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:375
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:319
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:387
msgid "Target:"
msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:264
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:319
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:377
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:325
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:389
msgid "Target Id:"
msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:267
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:322
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:379
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:328
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:391
msgid "Target type:"
msgstr ""
@@ -2861,7 +2884,7 @@ msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:271
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:338
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:344
msgid "Target race:"
msgstr ""
@@ -2877,67 +2900,81 @@ msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:277
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:363
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:369
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:387
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:375
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:381
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:399
msgid "Attack delay:"
msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:279
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:350
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:389
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:356
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:401
msgid "Minimal hit:"
msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:281
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:353
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:391
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:359
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:403
msgid "Maximum hit:"
msgstr ""
#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:283
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:356
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:393
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:362
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:405
msgid "Critical hit:"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:327
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:285
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:365
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:407
+msgid "Karma:"
+msgstr ""
+
+#. TRANSLATORS: debug window label
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:287
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:368
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:409
+msgid "Manner:"
+msgstr ""
+
+#. TRANSLATORS: debug window label
#: src/gui/widgets/tabs/debugwindowtabs.cpp:333
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:381
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:339
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:393
msgid "Target Level:"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:341
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:383
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:347
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:395
msgid "Target Party:"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:345
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:385
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:351
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:397
msgid "Target Guild:"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:430
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:436
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:451
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:457
#, c-format
msgid "Ping: %s ms"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:439
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:460
#, c-format
msgid "In: %d bytes/s"
msgstr ""
#. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:442
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:463
#, c-format
msgid "Out: %d bytes/s"
msgstr ""
@@ -3766,137 +3803,132 @@ msgstr ""
#. TRANSLATORS: settings option
#: src/gui/widgets/tabs/setup_other.cpp:294
-msgid "Enable auction bot support"
-msgstr ""
-
-#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:298
msgid "Enable guild bot support and disable native guild support"
msgstr ""
#. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:304
+#: src/gui/widgets/tabs/setup_other.cpp:300
msgid "Keyboard"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:307
+#: src/gui/widgets/tabs/setup_other.cpp:303
msgid "Repeat delay"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:311
+#: src/gui/widgets/tabs/setup_other.cpp:307
msgid "Repeat interval"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:315
+#: src/gui/widgets/tabs/setup_other.cpp:311
msgid "Custom repeat interval"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:323
+#: src/gui/widgets/tabs/setup_other.cpp:319
msgid "Shortcut buttons"
msgstr ""
#. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:328
+#: src/gui/widgets/tabs/setup_other.cpp:324
msgid "Proxy server"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:332
+#: src/gui/widgets/tabs/setup_other.cpp:328
msgid "Proxy type"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:336
+#: src/gui/widgets/tabs/setup_other.cpp:332
msgid "Proxy address:port"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:344
+#: src/gui/widgets/tabs/setup_other.cpp:340
msgid "Enable server side attack"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:348
+#: src/gui/widgets/tabs/setup_other.cpp:344
msgid "Hide support page link on error"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:352
+#: src/gui/widgets/tabs/setup_other.cpp:348
msgid "Enable double clicks"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:356
+#: src/gui/widgets/tabs/setup_other.cpp:352
msgid "Enable bot checker"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:360
+#: src/gui/widgets/tabs/setup_other.cpp:356
msgid "Enable buggy servers protection (do not disable)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:365
+#: src/gui/widgets/tabs/setup_other.cpp:361
msgid "Enable debug log"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:369
+#: src/gui/widgets/tabs/setup_other.cpp:365
msgid "Ignore logging packets"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:373
+#: src/gui/widgets/tabs/setup_other.cpp:369
msgid "Enable OpenGL log"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:377
+#: src/gui/widgets/tabs/setup_other.cpp:373
msgid "Enable input log"
msgstr ""
#. TRANSLATORS: settings option
#. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_other.cpp:381 src/input/pages/other.cpp:362
+#: src/gui/widgets/tabs/setup_other.cpp:377 src/input/pages/other.cpp:362
msgid "Upload log file"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:385
+#: src/gui/widgets/tabs/setup_other.cpp:381
msgid "Low traffic mode"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:389
+#: src/gui/widgets/tabs/setup_other.cpp:385
msgid "Hide shield sprite"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:394
+#: src/gui/widgets/tabs/setup_other.cpp:390
msgid "Use FBO for screenshots (only for opengl)"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:400
+#: src/gui/widgets/tabs/setup_other.cpp:396
msgid "Screenshot directory"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:405
+#: src/gui/widgets/tabs/setup_other.cpp:401
msgid "Network delay between sub servers"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:409
+#: src/gui/widgets/tabs/setup_other.cpp:405
msgid "Show background"
msgstr ""
#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:414
+#: src/gui/widgets/tabs/setup_other.cpp:410
msgid "Screen density override"
msgstr ""
@@ -4127,9 +4159,9 @@ msgstr "允許密語"
#. TRANSLATORS: command editor button
#. TRANSLATORS: input action name
#: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:82
-#: src/gui/windows/serverdialog.cpp:125 src/gui/windows/shopwindow.cpp:101
-#: src/gui/windows/shopwindow.cpp:108 src/gui/windows/textcommandeditor.cpp:92
+#: src/gui/windows/charselectdialog.cpp:84
+#: src/gui/windows/serverdialog.cpp:125 src/gui/windows/shopwindow.cpp:100
+#: src/gui/windows/shopwindow.cpp:107 src/gui/windows/textcommandeditor.cpp:92
#: src/input/pages/gui.cpp:111
msgid "Delete"
msgstr "刪除"
@@ -4783,7 +4815,7 @@ msgstr ""
#. TRANSLATORS: equipment window name
#. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:63
+#: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:65
#: src/gui/windows/inventorywindow.cpp:196
msgid "Equipment"
msgstr "裝備"
@@ -4924,7 +4956,7 @@ msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: social window button
#: src/gui/windows/buydialog.cpp:260 src/gui/windows/charcreatedialog.cpp:127
-#: src/gui/windows/charselectdialog.cpp:578
+#: src/gui/windows/charselectdialog.cpp:605
#: src/gui/windows/socialwindow.cpp:86
msgid "Create"
msgstr "創造"
@@ -4968,10 +5000,8 @@ msgstr ""
#. TRANSLATORS: change password window name
#. TRANSLATORS: change password dialog button
-#. TRANSLATORS: char select dialog. button.
#: src/gui/windows/changepassworddialog.cpp:51
#: src/gui/windows/changepassworddialog.cpp:57
-#: src/gui/windows/charselectdialog.cpp:73
msgid "Change Password"
msgstr "變更密碼"
@@ -5125,57 +5155,68 @@ msgid "Are you sure you want to delete this character?"
msgstr "你確定想刪除這個角色?"
#. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:64
+#: src/gui/windows/charselectdialog.cpp:66
#, c-format
msgid "Account %s (last login time %s)"
msgstr ""
#. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:71
-msgid "Switch Login"
+#: src/gui/windows/charselectdialog.cpp:73
+msgid "Switch"
+msgstr ""
+
+#. TRANSLATORS: char select dialog. button.
+#: src/gui/windows/charselectdialog.cpp:75
+msgid "Password"
msgstr ""
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:78
-#: src/gui/windows/charselectdialog.cpp:573
+#: src/gui/windows/charselectdialog.cpp:80
+#: src/gui/windows/charselectdialog.cpp:595
#: src/gui/windows/updaterwindow.cpp:195
msgid "Play"
msgstr "開始"
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:80
+#: src/gui/windows/charselectdialog.cpp:82
#: src/net/ea/charserverhandler.cpp:160
+#: src/net/eathena/charserverhandler.cpp:531
+#: src/net/eathena/charserverhandler.cpp:561
msgid "Info"
msgstr "資訊"
#. TRANSLATORS: char select dialog. button.
#. TRANSLATORS: unregister dialog name
#. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:106
+#: src/gui/windows/charselectdialog.cpp:110
#: src/gui/windows/unregisterdialog.cpp:50
#: src/gui/windows/unregisterdialog.cpp:55
msgid "Unregister"
msgstr "取消註冊"
#. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:118
+#: src/gui/windows/charselectdialog.cpp:122
msgid "Change Email"
msgstr ""
#. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:156
+#: src/gui/windows/charselectdialog.cpp:166
#, c-format
msgid "Account %s"
msgstr ""
-#: src/gui/windows/charselectdialog.cpp:184
+#: src/gui/windows/charselectdialog.cpp:194
msgid "Please set new pincode"
msgstr ""
+#: src/gui/windows/charselectdialog.cpp:240
+msgid "Please enter new name"
+msgstr ""
+
#. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:237
+#: src/gui/windows/charselectdialog.cpp:259
#, c-format
msgid ""
"Hp: %u/%u\n"
@@ -5185,16 +5226,16 @@ msgid ""
"Money: %s"
msgstr ""
-#: src/gui/windows/charselectdialog.cpp:289
+#: src/gui/windows/charselectdialog.cpp:311
msgid "Incorrect password"
msgstr ""
#. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:429
+#: src/gui/windows/charselectdialog.cpp:451
msgid "Enter password for deleting character"
msgstr ""
-#: src/gui/windows/charselectdialog.cpp:429
+#: src/gui/windows/charselectdialog.cpp:451
msgid "Enter password:"
msgstr ""
@@ -5600,7 +5641,7 @@ msgstr "等級:%d"
#. TRANSLATORS: status bar label
#: src/gui/windows/ministatuswindow.cpp:364
-#: src/gui/windows/ministatuswindow.cpp:402
+#: src/gui/windows/ministatuswindow.cpp:401
msgid "Need"
msgstr ""
@@ -5631,7 +5672,7 @@ msgstr "確認"
#. TRANSLATORS: shop window button
#. TRANSLATORS: trade window button
#: src/gui/windows/npcdialog.cpp:114 src/gui/windows/serverdialog.cpp:121
-#: src/gui/windows/shopwindow.cpp:99 src/gui/windows/shopwindow.cpp:106
+#: src/gui/windows/shopwindow.cpp:98 src/gui/windows/shopwindow.cpp:105
#: src/gui/windows/tradewindow.cpp:83
msgid "Add"
msgstr "增加"
@@ -5794,43 +5835,38 @@ msgid "Reset Windows"
msgstr "重置視窗"
#. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:80
+#: src/gui/windows/shopwindow.cpp:79
msgid "Personal Shop"
msgstr ""
#. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:95
+#: src/gui/windows/shopwindow.cpp:94
msgid "Buy items"
msgstr ""
#. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:97
+#: src/gui/windows/shopwindow.cpp:96
msgid "Sell items"
msgstr ""
#. TRANSLATORS: shop window label
#. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:110
+#: src/gui/windows/shopwindow.cpp:102 src/gui/windows/shopwindow.cpp:109
msgid "Announce"
msgstr ""
#. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:114
+#: src/gui/windows/shopwindow.cpp:113
msgid "Show links in announce"
msgstr ""
-#. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:176 src/gui/windows/shopwindow.cpp:179
-msgid "Auction"
-msgstr ""
-
#. TRANSLATORS: shop window dialog
#. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:233
+#: src/gui/windows/shopwindow.cpp:776 src/net/ea/tradehandler.cpp:233
msgid "Request for Trade"
msgstr "要求交易"
-#: src/gui/windows/shopwindow.cpp:791
+#: src/gui/windows/shopwindow.cpp:776
#, c-format
msgid "%s wants to %s %s do you accept?"
msgstr ""
@@ -6158,27 +6194,27 @@ msgstr "更新中..."
msgid "Connecting..."
msgstr "連線中..."
-#: src/gui/windows/updaterwindow.cpp:398
+#: src/gui/windows/updaterwindow.cpp:407
msgid "Show all news (can be slow)"
msgstr ""
#. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:824
+#: src/gui/windows/updaterwindow.cpp:833
msgid "##1 The update process is incomplete."
msgstr "##1 更新的程序不完整."
#. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:826
+#: src/gui/windows/updaterwindow.cpp:835
msgid "##1 It is strongly recommended that"
msgstr "##1 強烈建議"
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:828
+#: src/gui/windows/updaterwindow.cpp:837
msgid "##1 you try again later."
msgstr ""
#. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1005
+#: src/gui/windows/updaterwindow.cpp:1021
msgid "Completed"
msgstr "已完成"
@@ -6225,25 +6261,25 @@ msgstr ""
#. TRANSLATORS: long key name. must be short.
#. TRANSLATORS: short key name. must be very short.
#. TRANSLATORS: long key name, should be short
-#: src/input/inputmanager.cpp:370 src/input/inputmanager.cpp:414
+#: src/input/inputmanager.cpp:371 src/input/inputmanager.cpp:415
#: src/input/keyboardconfig.cpp:104
#, c-format
msgid "key_%d"
msgstr ""
#. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:376
+#: src/input/inputmanager.cpp:377
#, c-format
msgid "JButton%d"
msgstr ""
#. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:391
msgid "unknown key"
msgstr ""
#. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:420
+#: src/input/inputmanager.cpp:421
#, c-format
msgid "JB%d"
msgstr ""
@@ -6251,7 +6287,7 @@ msgstr ""
#. TRANSLATORS: unknown short key type. must be short
#. TRANSLATORS: Unknown key short string.
#. TRANSLATORS: This string must be maximum 5 chars
-#: src/input/inputmanager.cpp:434 src/input/keyboardconfig.cpp:148
+#: src/input/inputmanager.cpp:435 src/input/keyboardconfig.cpp:148
msgid "u key"
msgstr ""
@@ -7422,74 +7458,74 @@ msgid "Request to quit denied!"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:135
#, c-format
msgid "Guild name: %s"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:191
+#: src/net/ea/guildhandler.cpp:138
#, c-format
msgid "Guild master: %s"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:141
#, c-format
msgid "Guild level: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:197
+#: src/net/ea/guildhandler.cpp:144
#, c-format
msgid "Online members: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:200
+#: src/net/ea/guildhandler.cpp:147
#, c-format
msgid "Max members: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:203
+#: src/net/ea/guildhandler.cpp:150
#, c-format
msgid "Average level: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:206
+#: src/net/ea/guildhandler.cpp:153
#, c-format
msgid "Guild exp: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:209
+#: src/net/ea/guildhandler.cpp:156
#, c-format
msgid "Guild next exp: %d"
msgstr ""
#. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:212
+#: src/net/ea/guildhandler.cpp:159
#, c-format
msgid "Guild castle: %s"
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:179
+#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:191
msgid "Item sharing enabled."
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:183
+#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:195
msgid "Item sharing disabled."
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:187
+#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:199
msgid "Item sharing not possible."
msgstr ""
@@ -7500,19 +7536,19 @@ msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:167
+#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:179
msgid "Experience sharing enabled."
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:171
+#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:183
msgid "Experience sharing disabled."
msgstr ""
#. TRANSLATORS: chat message
#. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:175
+#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:187
msgid "Experience sharing not possible."
msgstr ""
@@ -7617,239 +7653,355 @@ msgid "Connection to server terminated. "
msgstr ""
#. TRANSLATORS: message header
-#: src/net/ea/playerhandler.cpp:257 src/net/ea/playerhandler.cpp:273
-#: src/net/ea/playerhandler.cpp:361
+#: src/net/ea/playerhandler.cpp:192 src/net/ea/playerhandler.cpp:418
+#: src/net/ea/playerhandler.cpp:434
msgid "Message"
msgstr ""
#. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:259
+#: src/net/ea/playerhandler.cpp:420
msgid ""
"You are carrying more than half your weight. You are unable to regain "
"health."
msgstr ""
#. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:275
+#: src/net/ea/playerhandler.cpp:436
msgid "You are carrying less than half your weight. You can regain health."
msgstr ""
+#. TRANSLATORS: char rename error
+#: src/net/eathena/charserverhandler.cpp:516
+#: src/net/eathena/charserverhandler.cpp:553
+msgid "Character rename error."
+msgstr ""
+
+#: src/net/eathena/charserverhandler.cpp:531
+msgid "Character renamed."
+msgstr ""
+
+#. TRANSLATORS: char rename error
+#: src/net/eathena/charserverhandler.cpp:544
+msgid "Rename not allowed."
+msgstr ""
+
+#. TRANSLATORS: char rename error
+#: src/net/eathena/charserverhandler.cpp:548
+msgid "New name is not set."
+msgstr ""
+
+#. TRANSLATORS: char rename error
+#: src/net/eathena/charserverhandler.cpp:557
+msgid "Character not found."
+msgstr ""
+
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:125
+#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:124
#, c-format
msgid "Strength %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:127
+#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:126
#, c-format
msgid "Agility %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:129
+#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:128
#, c-format
msgid "Vitality %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:131
+#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:130
#, c-format
msgid "Intelligence %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:128 src/net/tmwa/generalhandler.cpp:133
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:132
#, c-format
msgid "Dexterity %s"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:135
+#: src/net/eathena/generalhandler.cpp:128 src/net/tmwa/generalhandler.cpp:134
#, c-format
msgid "Luck %s"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:152 src/net/tmwa/generalhandler.cpp:161
+#: src/net/eathena/generalhandler.cpp:159 src/net/tmwa/generalhandler.cpp:160
msgid "Authentication failed."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:155 src/net/tmwa/generalhandler.cpp:165
+#: src/net/eathena/generalhandler.cpp:162 src/net/tmwa/generalhandler.cpp:164
msgid "No servers available."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:160 src/net/tmwa/generalhandler.cpp:171
+#: src/net/eathena/generalhandler.cpp:167 src/net/tmwa/generalhandler.cpp:170
msgid "Someone else is trying to use this account."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:165 src/net/tmwa/generalhandler.cpp:177
+#: src/net/eathena/generalhandler.cpp:172 src/net/tmwa/generalhandler.cpp:176
msgid "This account is already logged in."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:169 src/net/tmwa/generalhandler.cpp:182
+#: src/net/eathena/generalhandler.cpp:176 src/net/tmwa/generalhandler.cpp:181
msgid "Speed hack detected."
msgstr ""
+#: src/net/eathena/generalhandler.cpp:179
+msgid "Server full."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:182
+msgid "Sorry, you are underaged."
+msgstr ""
+
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:172 src/net/tmwa/generalhandler.cpp:186
+#: src/net/eathena/generalhandler.cpp:185 src/net/tmwa/generalhandler.cpp:185
msgid "Duplicated login."
msgstr ""
+#: src/net/eathena/generalhandler.cpp:188
+msgid "To many connections from same ip."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:191
+msgid "Not paid for this time."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:194
+msgid "Pay suspended."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:197
+msgid "Pay changed."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:200
+msgid "Pay wrong ip."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:203
+msgid "Pay game room."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:206
+msgid "Disconnect forced by GM."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:210
+msgid "Ban japan refuse."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:213
+msgid "Remained other account."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:216
+msgid "Ip unfair."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:219
+msgid "Ip count all."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:222
+msgid "Ip count."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:226
+msgid "Memory."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:229
+msgid "Han valid."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:232
+msgid "Ip limited access."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:235
+msgid "Over characters list."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:238
+msgid "Ip blocked."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:241
+msgid "Invalid password count."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:244
+msgid "Not allowed race."
+msgstr ""
+
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:175 src/net/tmwa/generalhandler.cpp:190
+#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:189
msgid "Unknown connection error."
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:280
+#: src/net/eathena/generalhandler.cpp:323 src/net/tmwa/generalhandler.cpp:279
msgid "Got disconnected from server!"
msgstr "和伺服器失去連線!"
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:282 src/net/tmwa/generalhandler.cpp:308
+#: src/net/eathena/generalhandler.cpp:348 src/net/tmwa/generalhandler.cpp:307
msgid "Strength"
msgstr "力量"
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:310
+#: src/net/eathena/generalhandler.cpp:349 src/net/tmwa/generalhandler.cpp:309
msgid "Agility"
msgstr "敏捷"
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:284 src/net/tmwa/generalhandler.cpp:312
+#: src/net/eathena/generalhandler.cpp:350 src/net/tmwa/generalhandler.cpp:311
msgid "Vitality"
msgstr "體力"
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:285 src/net/tmwa/generalhandler.cpp:314
+#: src/net/eathena/generalhandler.cpp:352 src/net/tmwa/generalhandler.cpp:314
msgid "Intelligence"
msgstr "智力"
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:286 src/net/tmwa/generalhandler.cpp:316
+#: src/net/eathena/generalhandler.cpp:353 src/net/tmwa/generalhandler.cpp:316
msgid "Dexterity"
msgstr "閃躲"
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:287 src/net/tmwa/generalhandler.cpp:318
+#: src/net/eathena/generalhandler.cpp:354 src/net/tmwa/generalhandler.cpp:318
msgid "Luck"
msgstr "幸運"
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:290 src/net/tmwa/generalhandler.cpp:323
+#: src/net/eathena/generalhandler.cpp:357 src/net/tmwa/generalhandler.cpp:322
msgid "Defense"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:291 src/net/tmwa/generalhandler.cpp:325
+#: src/net/eathena/generalhandler.cpp:358 src/net/tmwa/generalhandler.cpp:324
msgid "M.Attack"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:292 src/net/tmwa/generalhandler.cpp:327
+#: src/net/eathena/generalhandler.cpp:359 src/net/tmwa/generalhandler.cpp:326
msgid "M.Defense"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:294 src/net/tmwa/generalhandler.cpp:330
+#: src/net/eathena/generalhandler.cpp:361 src/net/tmwa/generalhandler.cpp:329
#, no-c-format
msgid "% Accuracy"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:296 src/net/tmwa/generalhandler.cpp:333
+#: src/net/eathena/generalhandler.cpp:363 src/net/tmwa/generalhandler.cpp:332
#, no-c-format
msgid "% Evade"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:298 src/net/tmwa/generalhandler.cpp:336
+#: src/net/eathena/generalhandler.cpp:365 src/net/tmwa/generalhandler.cpp:335
#, no-c-format
msgid "% Critical"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:299 src/net/tmwa/generalhandler.cpp:338
+#: src/net/eathena/generalhandler.cpp:366 src/net/tmwa/generalhandler.cpp:337
msgid "Attack Delay"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:300 src/net/tmwa/generalhandler.cpp:340
+#: src/net/eathena/generalhandler.cpp:367 src/net/tmwa/generalhandler.cpp:339
msgid "Walk Delay"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:301 src/net/tmwa/generalhandler.cpp:342
+#: src/net/eathena/generalhandler.cpp:368 src/net/tmwa/generalhandler.cpp:341
msgid "Attack Range"
msgstr ""
#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:302 src/net/tmwa/generalhandler.cpp:344
+#: src/net/eathena/generalhandler.cpp:369 src/net/tmwa/generalhandler.cpp:343
msgid "Damage per sec."
msgstr ""
-#: src/net/eathena/skillhandler.cpp:228 src/net/eathena/skillhandler.cpp:288
+#: src/net/eathena/generalhandler.cpp:370
+msgid "Karma"
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:371
+msgid "Manner"
+msgstr ""
+
+#: src/net/eathena/skillhandler.cpp:304 src/net/eathena/skillhandler.cpp:364
#, c-format
msgid "Unknown skill error: %d"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:235 src/net/tmwa/skillhandler.cpp:224
+#: src/net/eathena/skillhandler.cpp:311 src/net/tmwa/skillhandler.cpp:224
msgid "You have not yet reached a high enough lvl!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:239 src/net/tmwa/skillhandler.cpp:228
+#: src/net/eathena/skillhandler.cpp:315 src/net/tmwa/skillhandler.cpp:228
msgid "Insufficient HP!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:243 src/net/tmwa/skillhandler.cpp:232
+#: src/net/eathena/skillhandler.cpp:319 src/net/tmwa/skillhandler.cpp:232
msgid "Insufficient SP!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:247 src/net/tmwa/skillhandler.cpp:236
+#: src/net/eathena/skillhandler.cpp:323 src/net/tmwa/skillhandler.cpp:236
msgid "You have no memos!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:251 src/net/tmwa/skillhandler.cpp:240
+#: src/net/eathena/skillhandler.cpp:327 src/net/tmwa/skillhandler.cpp:240
msgid "You cannot do that right now!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:255 src/net/tmwa/skillhandler.cpp:244
+#: src/net/eathena/skillhandler.cpp:331 src/net/tmwa/skillhandler.cpp:244
msgid "Seems you need more money... ;-)"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:259 src/net/tmwa/skillhandler.cpp:248
+#: src/net/eathena/skillhandler.cpp:335 src/net/tmwa/skillhandler.cpp:248
msgid "You cannot use this skill with that kind of weapon!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:264 src/net/tmwa/skillhandler.cpp:253
+#: src/net/eathena/skillhandler.cpp:340 src/net/tmwa/skillhandler.cpp:253
msgid "You need another red gem!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:268 src/net/tmwa/skillhandler.cpp:257
+#: src/net/eathena/skillhandler.cpp:344 src/net/tmwa/skillhandler.cpp:257
msgid "You need another blue gem!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:272 src/net/tmwa/skillhandler.cpp:261
+#: src/net/eathena/skillhandler.cpp:348 src/net/tmwa/skillhandler.cpp:261
msgid "You're carrying to much to do this!"
msgstr ""
#. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:276 src/net/tmwa/skillhandler.cpp:265
+#: src/net/eathena/skillhandler.cpp:352 src/net/tmwa/skillhandler.cpp:265
msgid "Huh? What's that?"
msgstr ""
@@ -7866,32 +8018,32 @@ msgid "%s wants to trade with you, do you accept?"
msgstr "%s 請求交易, 是否接受?"
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:349
+#: src/net/tmwa/charserverhandler.cpp:351
msgid "Strength:"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:351
+#: src/net/tmwa/charserverhandler.cpp:353
msgid "Agility:"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:353
+#: src/net/tmwa/charserverhandler.cpp:355
msgid "Vitality:"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:355
+#: src/net/tmwa/charserverhandler.cpp:357
msgid "Intelligence:"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:357
+#: src/net/tmwa/charserverhandler.cpp:359
msgid "Dexterity:"
msgstr ""
#. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:359
+#: src/net/tmwa/charserverhandler.cpp:361
msgid "Luck:"
msgstr ""
@@ -8202,269 +8354,306 @@ msgstr ""
#. TRANSLATORS: notification message
#: src/resources/notifications.h:143
+msgid "You cant left party on this map."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:147
+msgid "You was kicked from party."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:151
+msgid "You cant be kicked kicked from party on this map."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:155
#, c-format
msgid "%s has joined your party."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:147
+#: src/resources/notifications.h:159
#, c-format
msgid "%s is already a member of a party."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:151
+#: src/resources/notifications.h:163
#, c-format
msgid "%s refused your invitation."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:155
+#: src/resources/notifications.h:167
#, c-format
msgid "%s is now a member of your party."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:159
+#: src/resources/notifications.h:171
#, c-format
msgid "%s can't join your party because party is full."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:163
+#: src/resources/notifications.h:175
#, c-format
msgid "QQQ Unknown invite response for %s."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:191
+#: src/resources/notifications.h:203
#, c-format
msgid "%s has left your party."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:195
+#: src/resources/notifications.h:207 src/resources/notifications.h:215
+#, c-format
+msgid "%s cant be kicked from party on this map."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:211
+#, c-format
+msgid "%s has kicked from your party."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:219
#, c-format
msgid "An unknown member tried to say: %s"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:199
+#: src/resources/notifications.h:223
#, c-format
msgid "%s is not in your party!"
msgstr "%s 不在您的隊伍中!"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:203
+#: src/resources/notifications.h:227
#, c-format
msgid "You picked up %s."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:207
+#: src/resources/notifications.h:231
#, c-format
msgid "You spent %s."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:211
+#: src/resources/notifications.h:235
msgid "Cannot raise skill!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:215
+#: src/resources/notifications.h:239
msgid "Equip ammunition first."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:219
+#: src/resources/notifications.h:243
#, c-format
msgid "Trading with %s isn't possible. Trade partner is too far away."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:224
+#: src/resources/notifications.h:248
#, c-format
msgid "Trading with %s isn't possible. Character doesn't exist."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:228
+#: src/resources/notifications.h:252
msgid "Trade cancelled due to an unknown reason."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:232
+#: src/resources/notifications.h:256
#, c-format
msgid "Trade with %s cancelled."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:236
+#: src/resources/notifications.h:260
#, c-format
msgid "Unhandled trade cancel packet with %s"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:240
+#: src/resources/notifications.h:264
msgid "Failed adding item. Trade partner is over weighted."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:244
+#: src/resources/notifications.h:268
msgid "Failed adding item. Trade partner has no free slot."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:248
+#: src/resources/notifications.h:272
msgid "Failed adding item. You can't trade this item."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:252
+#: src/resources/notifications.h:276
msgid "Failed adding item for unknown reason."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:256
+#: src/resources/notifications.h:280
msgid "Trade canceled."
msgstr "交易已取消."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:260
+#: src/resources/notifications.h:284
msgid "Trade completed."
msgstr "交易已完成."
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:264
+#: src/resources/notifications.h:288
msgid "Kick failed!"
msgstr "踢人失敗!"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:268
+#: src/resources/notifications.h:292
msgid "Kick succeeded!"
msgstr "踢人成功!"
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:272
+#: src/resources/notifications.h:296
#, c-format
msgid "MVP player: %s"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:276
+#: src/resources/notifications.h:300
msgid "All whispers ignored."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:280
+#: src/resources/notifications.h:304
msgid "All whispers ignore failed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:284
+#: src/resources/notifications.h:308
msgid "All whispers unignored."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:288
+#: src/resources/notifications.h:312
msgid "All whispers unignore failed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:295
+#: src/resources/notifications.h:319
msgid "pvp off, gvg off"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:299
+#: src/resources/notifications.h:323
msgid "pvp on"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:303
+#: src/resources/notifications.h:327
msgid "gvg on"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:307
+#: src/resources/notifications.h:331
msgid "pvp on, gvg on"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:311
+#: src/resources/notifications.h:335
msgid "unknown pvp"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:315
+#: src/resources/notifications.h:339
#, c-format
msgid "Char from account %s is already in your party!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:319
+#: src/resources/notifications.h:343
#, c-format
msgid "%s blocked invite!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:323
+#: src/resources/notifications.h:347
msgid "Char is not online!"
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:327
+#: src/resources/notifications.h:351
msgid "Pet catch failed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:331
+#: src/resources/notifications.h:355
msgid "Pet catched."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:335
+#: src/resources/notifications.h:359
#, c-format
msgid "Pet catch unkown error: %d."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:339
+#: src/resources/notifications.h:363
msgid "Your mercenary duty hour is over."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:343
+#: src/resources/notifications.h:367
msgid "Your mercenary was killed."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:347
+#: src/resources/notifications.h:371
msgid "Your mercenary was fired."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:351
+#: src/resources/notifications.h:375
msgid "Your mercenary run away."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:355
+#: src/resources/notifications.h:379
msgid "Mercenary unknown state."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:359
-msgid "Your feed your homunculus."
+#: src/resources/notifications.h:383
+msgid "You feed your homunculus."
msgstr ""
#. TRANSLATORS: notification message
-#: src/resources/notifications.h:363
+#: src/resources/notifications.h:387
#, c-format
msgid "You cant feed homunculus, because not have %s."
msgstr ""
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:391
+msgid "Card insert failed."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:395
+msgid "Card inserted."
+msgstr ""
+
#. TRANSLATORS: chat option changed message
#: src/utils/booleanoptions.h:27
#, c-format