summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-09-04 20:05:48 +0300
committerAndrei Karas <akaras@inbox.ru>2011-09-04 20:05:48 +0300
commit62ec17f6e489ec50f17219444468aeb8969dc961 (patch)
tree350d7edb5c26c282a4e1906544536d68831228ac
parent71d924d7dcdac067f02a317e9353ee067dbd0bde (diff)
parentfd484fc70fca32ff9065b91c175089b65aa3fd26 (diff)
downloadmv-62ec17f6e489ec50f17219444468aeb8969dc961.tar.gz
mv-62ec17f6e489ec50f17219444468aeb8969dc961.tar.bz2
mv-62ec17f6e489ec50f17219444468aeb8969dc961.tar.xz
mv-62ec17f6e489ec50f17219444468aeb8969dc961.zip
Merge branch 'master' into strippedstripped1.1.9.4
Conflicts: data/fonts/mplus-1p-bold.ttf data/fonts/mplus-1p-regular.ttf src/guichan/basiccontainer.cpp src/guichan/include/guichan/basiccontainer.hpp src/guichan/widgets/window.cpp
-rw-r--r--ChangeLog20
-rw-r--r--README2
-rw-r--r--README.txt2
-rwxr-xr-xconfigure.ac2
-rw-r--r--data/graphics/gui/colors.xml15
-rw-r--r--data/graphics/sprites/manaplus_emote.xml2
-rw-r--r--data/graphics/sprites/manaplus_emotes.xml1
-rw-r--r--data/graphics/sprites/manaplus_emotions.pngbin33162 -> 34648 bytes
-rw-r--r--data/themes/blackwood/colors.xml15
-rw-r--r--data/themes/enchilado/colors.xml17
-rw-r--r--data/themes/mana/colors.xml15
-rw-r--r--data/themes/pink/colors.xml15
-rw-r--r--data/themes/redandblack/colors.xml15
-rw-r--r--data/themes/wood/colors.xml15
-rw-r--r--manaplus.cbp6
-rwxr-xr-xpackwin2
-rw-r--r--po/CMakeLists.txt46
-rw-r--r--po/POTFILES.in2
-rw-r--r--po/de.po1997
-rw-r--r--po/es.po1484
-rw-r--r--po/fi.po1445
-rw-r--r--po/fr.po1447
-rw-r--r--po/hr.po1441
-rw-r--r--po/hu.po1441
-rw-r--r--po/id.po1447
-rw-r--r--po/it.po1612
-rw-r--r--po/ja.po1443
-rw-r--r--po/manaplus.pot1441
-rw-r--r--po/nl_BE.po1449
-rw-r--r--po/pt.po1447
-rw-r--r--po/pt_BR.po1447
-rw-r--r--po/ru.po1445
-rw-r--r--po/zh_CN.po1445
-rw-r--r--src/CMakeLists.txt6
-rw-r--r--src/Makefile.am6
-rw-r--r--src/actorsprite.cpp4
-rw-r--r--src/animatedsprite.cpp4
-rw-r--r--src/auctionmanager.cpp89
-rw-r--r--src/auctionmanager.h58
-rw-r--r--src/being.cpp41
-rw-r--r--src/client.cpp24
-rw-r--r--src/client.h2
-rw-r--r--src/commandhandler.cpp12
-rw-r--r--src/compoundsprite.cpp4
-rw-r--r--src/defaults.cpp1
-rw-r--r--src/game.cpp39
-rw-r--r--src/graphics.cpp2
-rw-r--r--src/gui/botcheckerwindow.cpp2
-rw-r--r--src/gui/buydialog.cpp1
-rw-r--r--src/gui/charcreatedialog.cpp3
-rw-r--r--src/gui/charselectdialog.cpp5
-rw-r--r--src/gui/chatwindow.cpp30
-rw-r--r--src/gui/chatwindow.h5
-rw-r--r--src/gui/debugwindow.cpp2
-rw-r--r--src/gui/didyouknowwindow.cpp2
-rw-r--r--src/gui/equipmentwindow.cpp14
-rw-r--r--src/gui/equipmentwindow.h2
-rw-r--r--src/gui/helpwindow.cpp2
-rw-r--r--src/gui/inventorywindow.cpp1
-rw-r--r--src/gui/itemamountwindow.cpp2
-rw-r--r--src/gui/itempopup.cpp3
-rw-r--r--src/gui/killstats.cpp1
-rw-r--r--src/gui/minimap.cpp49
-rw-r--r--src/gui/npcdialog.cpp1
-rw-r--r--src/gui/outfitwindow.cpp10
-rw-r--r--src/gui/outfitwindow.h2
-rw-r--r--src/gui/popupmenu.cpp90
-rw-r--r--src/gui/quitdialog.cpp15
-rw-r--r--src/gui/selldialog.cpp1
-rw-r--r--src/gui/serverdialog.cpp24
-rw-r--r--src/gui/setup.cpp1
-rw-r--r--src/gui/setup_chat.cpp8
-rw-r--r--src/gui/setup_other.cpp9
-rw-r--r--src/gui/setup_players.cpp3
-rw-r--r--src/gui/shopwindow.cpp25
-rw-r--r--src/gui/shopwindow.h2
-rw-r--r--src/gui/skilldialog.cpp13
-rw-r--r--src/gui/socialwindow.cpp175
-rw-r--r--src/gui/specialswindow.cpp1
-rw-r--r--src/gui/spellpopup.cpp5
-rw-r--r--src/gui/statuspopup.cpp29
-rw-r--r--src/gui/statuswindow.cpp7
-rw-r--r--src/gui/textcommandeditor.cpp2
-rw-r--r--src/gui/textpopup.cpp10
-rw-r--r--src/gui/theme.cpp16
-rw-r--r--src/gui/theme.h14
-rw-r--r--src/gui/tradewindow.cpp1
-rw-r--r--src/gui/updaterwindow.cpp76
-rw-r--r--src/gui/updaterwindow.h13
-rw-r--r--src/gui/viewport.cpp48
-rw-r--r--src/gui/viewport.h1
-rw-r--r--src/gui/whoisonline.cpp1
-rw-r--r--src/gui/widgets/avatarlistbox.cpp13
-rw-r--r--src/gui/widgets/avatarlistbox.h1
-rw-r--r--src/gui/widgets/browserbox.cpp37
-rw-r--r--src/gui/widgets/browserbox.h34
-rw-r--r--src/gui/widgets/button.cpp9
-rw-r--r--src/gui/widgets/button.h2
-rw-r--r--src/gui/widgets/chattab.cpp4
-rw-r--r--src/gui/widgets/checkbox.cpp4
-rw-r--r--src/gui/widgets/container.cpp2
-rw-r--r--src/gui/widgets/container.h4
-rw-r--r--src/gui/widgets/desktop.cpp11
-rw-r--r--src/gui/widgets/desktop.h2
-rw-r--r--src/gui/widgets/dropdown.cpp22
-rw-r--r--src/gui/widgets/dropdown.h3
-rw-r--r--src/gui/widgets/dropshortcutcontainer.cpp14
-rw-r--r--src/gui/widgets/dropshortcutcontainer.h2
-rw-r--r--src/gui/widgets/emoteshortcutcontainer.cpp14
-rw-r--r--src/gui/widgets/guildchattab.cpp128
-rw-r--r--src/gui/widgets/guildchattab.h52
-rw-r--r--src/gui/widgets/guitable.cpp16
-rw-r--r--src/gui/widgets/guitable.h3
-rw-r--r--src/gui/widgets/itemcontainer.cpp9
-rw-r--r--src/gui/widgets/itemcontainer.h2
-rw-r--r--src/gui/widgets/itemshortcutcontainer.cpp14
-rw-r--r--src/gui/widgets/itemshortcutcontainer.h3
-rw-r--r--src/gui/widgets/label.cpp1
-rw-r--r--src/gui/widgets/layout.cpp7
-rw-r--r--src/gui/widgets/listbox.cpp8
-rw-r--r--src/gui/widgets/listbox.h1
-rw-r--r--src/gui/widgets/radiobutton.cpp1
-rw-r--r--src/gui/widgets/scrollarea.cpp14
-rw-r--r--src/gui/widgets/scrollarea.h3
-rw-r--r--src/gui/widgets/shoplistbox.cpp40
-rw-r--r--src/gui/widgets/shoplistbox.h6
-rw-r--r--src/gui/widgets/spellshortcutcontainer.cpp4
-rw-r--r--src/gui/widgets/tab.cpp8
-rw-r--r--src/gui/widgets/tab.h2
-rw-r--r--src/gui/widgets/textfield.cpp4
-rw-r--r--src/gui/widgets/window.cpp73
-rw-r--r--src/gui/widgets/window.h15
-rw-r--r--src/guild.cpp21
-rw-r--r--src/guild.h9
-rw-r--r--src/guildmanager.cpp477
-rw-r--r--src/guildmanager.h94
-rw-r--r--src/joystick.cpp5
-rw-r--r--src/localplayer.cpp2
-rw-r--r--src/main.h4
-rw-r--r--src/map.cpp5
-rw-r--r--src/net/ea/beinghandler.cpp4
-rw-r--r--src/net/ea/chathandler.cpp7
-rw-r--r--src/net/ea/guildhandler.cpp1
-rw-r--r--src/net/ea/partyhandler.cpp4
-rw-r--r--src/net/ea/playerhandler.cpp14
-rw-r--r--src/net/ea/playerhandler.h2
-rw-r--r--src/net/manaserv/adminhandler.cpp3
-rw-r--r--src/net/manaserv/adminhandler.h1
-rw-r--r--src/net/manaserv/messagehandler.cpp2
-rw-r--r--src/net/manaserv/playerhandler.cpp5
-rw-r--r--src/net/manaserv/playerhandler.h1
-rw-r--r--src/net/playerhandler.h2
-rw-r--r--src/net/tmwa/beinghandler.cpp5
-rw-r--r--src/net/tmwa/generalhandler.cpp5
-rw-r--r--src/particlecontainer.cpp2
-rw-r--r--src/party.h6
-rw-r--r--src/playerinfo.cpp20
-rw-r--r--src/playerinfo.h7
-rw-r--r--src/resources/imageloader.cpp4
-rw-r--r--src/resources/itemdb.cpp116
-rw-r--r--src/resources/iteminfo.cpp19
-rw-r--r--src/resources/mapreader.cpp6
-rw-r--r--src/resources/resource.cpp2
-rw-r--r--src/utils/stringutils.cpp79
-rw-r--r--src/utils/stringutils.h15
-rwxr-xr-xtests/maketest.sh148
166 files changed, 13959 insertions, 11372 deletions
diff --git a/ChangeLog b/ChangeLog
index b0ad8f4bb..292dbe556 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2011-09-04 New release 1.1.9.4
+ManaPlus:
+fix: compilation with different flags.
+fix: possible fix with incorrect camera position.
+fix: replace sprite issues.
+fix: some crashes.
+add: hightlight words list in chat.
+add: many colors for themes.
+add: alien emote (DerLoisl).
+add: basic auction bot integration.
+add: guild bot integration.
+add: impore guild members list sorting.
+add: auto download content fixes.
+add: show guild members on minimap.
+add: always show party members in minimap if on same map.
+add: lock windows position (at top right window corner).
+add: update mplus fonts.
+add: attribute damage per second.
+add: option to disable self heal with mouse.
+
2011-08-21 New release 1.1.8.21
ManaPlus:
fix: moving near npc.
diff --git a/README b/README
index 3f2cb5244..e02d9f4b4 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
THE MANA PLUS CLIENT
===============
- Version: 1.1.8.21 Date: 2011-08-21
+ Version: 1.1.9.4 Date: 2011-09-04
Development team:
- See AUTHORS file for a list
diff --git a/README.txt b/README.txt
index b9ad19133..47e9ffa4e 100644
--- a/README.txt
+++ b/README.txt
@@ -1,7 +1,7 @@
THE MANA PLUS CLIENT
===============
- Version: 1.1.8.21 Date: 2011-08-21
+ Version: 1.1.9.4 Date: 2011-09-04
Development team:
- See AUTHORS file for a list
diff --git a/configure.ac b/configure.ac
index 72db9ed34..03d5cfd9e 100755
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ(2.59)
-AC_INIT([ManaPlus], [1.1.8.21], [akaras@inbox.ru], [manaplus])
+AC_INIT([ManaPlus], [1.1.9.4], [akaras@inbox.ru], [manaplus])
AM_INIT_AUTOMAKE([1.9])
AC_CONFIG_HEADERS([config.h:config.h.in])
AC_LANG_CPLUSPLUS
diff --git a/data/graphics/gui/colors.xml b/data/graphics/gui/colors.xml
index df42dcdfd..4203b482c 100644
--- a/data/graphics/gui/colors.xml
+++ b/data/graphics/gui/colors.xml
@@ -2,6 +2,7 @@
<color id="TEXT" color="#000000" />
<color id="SHADOW" color="#000000" />
<color id="OUTLINE" color="#000000" />
+ <color id="BORDER" color="#000000" />
<color id="PROGRESS_BAR" color="#ffffff" />
<color id="BUTTON" color="#000000" />
<color id="BUTTON_DISABLED" color="#333333" />
@@ -11,11 +12,15 @@
<color id="GUILD_CHAT_TAB" color="#f48055" />
<color id="GUILD_SOCIAL_TAB" color="#f48055" />
<color id="BACKGROUND" color="#ffffff" />
+ <color id="BACKGROUND_GRAY" color="#404040" />
+ <color id="SCROLLBAR_GRAY" color="#000000" />
+ <color id="DROPDOWN_SHADOW" color="#c0c0c0" />
<color id="HIGHLIGHT" color="#ebc873" />
<color id="TAB_FLASH" color="#ff0000" effect="pulse" />
<color id="TAB_PLAYER_FLASH" color="#00ff00" effect="pulse" />
<color id="SHOP_WARNING" color="#910000" />
<color id="ITEM_EQUIPPED" color="#000091" />
+ <color id="ITEM_NOT_EQUIPPED" color="#000000" />
<color id="CHAT" color="#000000" />
<color id="GM" color="#ff0000" />
<color id="PLAYER" color="#003000" />
@@ -44,6 +49,16 @@
<color id="WARNING" color="#FF0000" />
<color id="PLAYER_ADVANCED" color="#005000" />
+ <color id="RED" color="#ff0000" />
+ <color id="GREEN" color="#009000" />
+ <color id="BLUE" color="#0000ff" />
+ <color id="ORANGE" color="#e0980e" />
+ <color id="YELLOW" color="#f1dc27" />
+ <color id="PINK" color="#ff00d8" />
+ <color id="PURPLE" color="#8415e2" />
+ <color id="GRAY" color="#919191" />
+ <color id="BROWN" color="#8e4c17" />
+
<progressbar id="DEFAULT" color="#969696" />
<progressbar id="HP" color="#ff0000,e28000,c38948,0f6a20" />
<progressbar id="MP" color="#1a66e6" />
diff --git a/data/graphics/sprites/manaplus_emote.xml b/data/graphics/sprites/manaplus_emote.xml
index 55f5cc91f..8f27c4f83 100644
--- a/data/graphics/sprites/manaplus_emote.xml
+++ b/data/graphics/sprites/manaplus_emote.xml
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<sprite variants="24" variant_offset="1">
+<sprite variants="25" variant_offset="1">
<imageset name="base" src="graphics/sprites/manaplus_emotions.png" width="30" height="32" />
<action name="stand" imageset="base">
diff --git a/data/graphics/sprites/manaplus_emotes.xml b/data/graphics/sprites/manaplus_emotes.xml
index 9263c2d49..38628dc30 100644
--- a/data/graphics/sprites/manaplus_emotes.xml
+++ b/data/graphics/sprites/manaplus_emotes.xml
@@ -23,4 +23,5 @@
<emote id="121"><sprite name="Epic" variant="21">manaplus_emote.xml</sprite></emote>
<emote id="122"><sprite name="Bad geek" variant="22">manaplus_emote.xml</sprite></emote>
<emote id="123"><sprite name="Mimi" variant="23">manaplus_emote.xml</sprite></emote>
+ <emote id="124"><sprite name="Alien" variant="24">manaplus_emote.xml</sprite></emote>
</emotes>
diff --git a/data/graphics/sprites/manaplus_emotions.png b/data/graphics/sprites/manaplus_emotions.png
index a3c29e164..c6f49ff29 100644
--- a/data/graphics/sprites/manaplus_emotions.png
+++ b/data/graphics/sprites/manaplus_emotions.png
Binary files differ
diff --git a/data/themes/blackwood/colors.xml b/data/themes/blackwood/colors.xml
index 51eba63fe..523d164c7 100644
--- a/data/themes/blackwood/colors.xml
+++ b/data/themes/blackwood/colors.xml
@@ -2,6 +2,7 @@
<color id="TEXT" color="#7a7972" />
<color id="SHADOW" color="#000000" />
<color id="OUTLINE" color="#000000" />
+ <color id="BORDER" color="#000000" />
<color id="PROGRESS_BAR" color="#ffffff" />
<color id="BUTTON" color="#000000" />
<color id="BUTTON_DISABLED" color="#333333" />
@@ -11,11 +12,15 @@
<color id="GUILD_CHAT_TAB" color="#ff00d8" />
<color id="GUILD_SOCIAL_TAB" color="#ff00d8" />
<color id="BACKGROUND" color="#ffffff" />
+ <color id="BACKGROUND_GRAY" color="#404040" />
+ <color id="SCROLLBAR_GRAY" color="#000000" />
+ <color id="DROPDOWN_SHADOW" color="#c0c0c0" />
<color id="HIGHLIGHT" color="#361c00" />
<color id="TAB_FLASH" color="#000000" effect="pulse" />
<color id="TAB_PLAYER_FLASH" color="#00ff00" effect="pulse" />
<color id="SHOP_WARNING" color="#910000" />
<color id="ITEM_EQUIPPED" color="#000091" />
+ <color id="ITEM_NOT_EQUIPPED" color="#000000" />
<color id="CHAT" color="#744c04" />
<color id="GM" color="#ff0000" />
<color id="PLAYER" color="#00ff00" />
@@ -43,6 +48,16 @@
<color id="WARNING" color="#FF0000" />
<color id="PLAYER_ADVANCED" color="#005000" />
+ <color id="RED" color="#ff0000" />
+ <color id="GREEN" color="#009000" />
+ <color id="BLUE" color="#0000ff" />
+ <color id="ORANGE" color="#e0980e" />
+ <color id="YELLOW" color="#f1dc27" />
+ <color id="PINK" color="#ff00d8" />
+ <color id="PURPLE" color="#8415e2" />
+ <color id="GRAY" color="#919191" />
+ <color id="BROWN" color="#8e4c17" />
+
<progressbar id="DEFAULT" color="#969696" />
<progressbar id="HP" color="#ff0000,e28000,c38948,0f6a20" />
<progressbar id="MP" color="#1a66e6" />
diff --git a/data/themes/enchilado/colors.xml b/data/themes/enchilado/colors.xml
index e7ab17da2..0c19f5a47 100644
--- a/data/themes/enchilado/colors.xml
+++ b/data/themes/enchilado/colors.xml
@@ -2,6 +2,7 @@
<color id="TEXT" color="#000000" />
<color id="SHADOW" color="#000000" />
<color id="OUTLINE" color="#000000" />
+ <color id="BORDER" color="#000000" />
<color id="PROGRESS_BAR" color="#ffffff" />
<color id="BUTTON" color="#000000" />
<color id="BUTTON_DISABLED" color="#333333" />
@@ -11,16 +12,20 @@
<color id="GUILD_CHAT_TAB" color="#f48055" />
<color id="GUILD_SOCIAL_TAB" color="#f48055" />
<color id="BACKGROUND" color="#ffffff" />
+ <color id="BACKGROUND_GRAY" color="#404040" />
+ <color id="SCROLLBAR_GRAY" color="#000000" />
+ <color id="DROPDOWN_SHADOW" color="#c0c0c0" />
<color id="HIGHLIGHT" color="#ebc873" />
<color id="TAB_FLASH" color="#ff0000" effect="pulse" />
<color id="TAB_PLAYER_FLASH" color="#00ff00" effect="pulse" />
<color id="SHOP_WARNING" color="#910000" />
<color id="ITEM_EQUIPPED" color="#000091" />
+ <color id="ITEM_NOT_EQUIPPED" color="#000000" />
<color id="CHAT" color="#000000" />
<color id="GM" color="#ff0000" />
<color id="PLAYER" color="#009000" />
<color id="WHISPER" color="#0000ff" />
- <color id="WHISPER_OFFLINE" color="#000050" />
+ <color id="WHISPER_OFFLINE" color="#000050" />
<color id="IS" color="#705000" />
<color id="SERVER" color="#8415e2" />
<color id="LOGGER" color="#919191" />
@@ -44,6 +49,16 @@
<color id="WARNING" color="#FF0000" />
<color id="PLAYER_ADVANCED" color="#005000" />
+ <color id="RED" color="#ff0000" />
+ <color id="GREEN" color="#009000" />
+ <color id="BLUE" color="#0000ff" />
+ <color id="ORANGE" color="#e0980e" />
+ <color id="YELLOW" color="#f1dc27" />
+ <color id="PINK" color="#ff00d8" />
+ <color id="PURPLE" color="#8415e2" />
+ <color id="GRAY" color="#919191" />
+ <color id="BROWN" color="#8e4c17" />
+
<progressbar id="DEFAULT" color="#969696" />
<progressbar id="HP" color="#ff0000,e28000,c38948,0f6a20" />
<progressbar id="MP" color="#1a66e6" />
diff --git a/data/themes/mana/colors.xml b/data/themes/mana/colors.xml
index 557ba34d5..45937e268 100644
--- a/data/themes/mana/colors.xml
+++ b/data/themes/mana/colors.xml
@@ -2,6 +2,7 @@
<color id="TEXT" color="#000000" />
<color id="SHADOW" color="#000000" />
<color id="OUTLINE" color="#000000" />
+ <color id="BORDER" color="#000000" />
<color id="PROGRESS_BAR" color="#ffffff" />
<color id="BUTTON" color="#000000" />
<color id="BUTTON_DISABLED" color="#333333" />
@@ -11,11 +12,15 @@
<color id="GUILD_CHAT_TAB" color="#ff00d8" />
<color id="GUILD_SOCIAL_TAB" color="#ff00d8" />
<color id="BACKGROUND" color="#ffffff" />
+ <color id="BACKGROUND_GRAY" color="#404040" />
+ <color id="SCROLLBAR_GRAY" color="#000000" />
+ <color id="DROPDOWN_SHADOW" color="#c0c0c0" />
<color id="HIGHLIGHT" color="#c0c0c0" />
<color id="TAB_FLASH" color="#ff0000" effect="pulse" />
<color id="TAB_PLAYER_FLASH" color="#00ff00" effect="pulse" />
<color id="SHOP_WARNING" color="#910000" />
<color id="ITEM_EQUIPPED" color="#000091" />
+ <color id="ITEM_NOT_EQUIPPED" color="#000000" />
<color id="CHAT" color="#000000" />
<color id="GM" color="#ff0000" />
<color id="PLAYER" color="#003000" />
@@ -44,6 +49,16 @@
<color id="WARNING" color="#FF0000" />
<color id="PLAYER_ADVANCED" color="#005000" />
+ <color id="RED" color="#ff0000" />
+ <color id="GREEN" color="#009000" />
+ <color id="BLUE" color="#0000ff" />
+ <color id="ORANGE" color="#e0980e" />
+ <color id="YELLOW" color="#f1dc27" />
+ <color id="PINK" color="#ff00d8" />
+ <color id="PURPLE" color="#8415e2" />
+ <color id="GRAY" color="#919191" />
+ <color id="BROWN" color="#8e4c17" />
+
<progressbar id="DEFAULT" color="#969696" />
<progressbar id="HP" color="#ff0000,e28000,c38948,0f6a20" />
<progressbar id="MP" color="#1a66e6" />
diff --git a/data/themes/pink/colors.xml b/data/themes/pink/colors.xml
index b49be8015..f2b20567e 100644
--- a/data/themes/pink/colors.xml
+++ b/data/themes/pink/colors.xml
@@ -2,6 +2,7 @@
<color id="TEXT" color="#FF00FF" />
<color id="SHADOW" color="#000000" />
<color id="OUTLINE" color="#000000" />
+ <color id="BORDER" color="#000000" />
<color id="PROGRESS_BAR" color="#ffffff" />
<color id="BUTTON" color="#FF00FF" />
<color id="BUTTON_DISABLED" color="#FF00FF" />
@@ -11,11 +12,15 @@
<color id="GUILD_CHAT_TAB" color="#f48055" />
<color id="GUILD_SOCIAL_TAB" color="#f48055" />
<color id="BACKGROUND" color="#ffffff" />
+ <color id="BACKGROUND_GRAY" color="#404040" />
+ <color id="SCROLLBAR_GRAY" color="#000000" />
+ <color id="DROPDOWN_SHADOW" color="#c0c0c0" />
<color id="HIGHLIGHT" color="#FFFEFF" />
<color id="TAB_FLASH" color="#ff0000" effect="pulse" />
<color id="TAB_PLAYER_FLASH" color="#00ff00" effect="pulse" />
<color id="SHOP_WARNING" color="#910000" />
<color id="ITEM_EQUIPPED" color="#000091" />
+ <color id="ITEM_NOT_EQUIPPED" color="#000000" />
<color id="CHAT" color="#FF00FF" />
<color id="GM" color="#ff0000" />
<color id="PLAYER" color="#009000" />
@@ -44,6 +49,16 @@
<color id="WARNING" color="#FF0000" />
<color id="PLAYER_ADVANCED" color="#005000" />
+ <color id="RED" color="#ff0000" />
+ <color id="GREEN" color="#009000" />
+ <color id="BLUE" color="#0000ff" />
+ <color id="ORANGE" color="#e0980e" />
+ <color id="YELLOW" color="#f1dc27" />
+ <color id="PINK" color="#ff00d8" />
+ <color id="PURPLE" color="#8415e2" />
+ <color id="GRAY" color="#919191" />
+ <color id="BROWN" color="#8e4c17" />
+
<progressbar id="DEFAULT" color="#969696" />
<progressbar id="HP" color="#ff0000,e28000,c38948,0f6a20" />
<progressbar id="MP" color="#1a66e6" />
diff --git a/data/themes/redandblack/colors.xml b/data/themes/redandblack/colors.xml
index 50384ce3a..d5e6a7f7b 100644
--- a/data/themes/redandblack/colors.xml
+++ b/data/themes/redandblack/colors.xml
@@ -2,6 +2,7 @@
<color id="TEXT" color="#000000" />
<color id="SHADOW" color="#000000" />
<color id="OUTLINE" color="#000000" />
+ <color id="BORDER" color="#000000" />
<color id="PROGRESS_BAR" color="#ffffff" />
<color id="BUTTON" color="#000000" />
<color id="BUTTON_DISABLED" color="#333333" />
@@ -11,11 +12,15 @@
<color id="GUILD_CHAT_TAB" color="#ff00d8" />
<color id="GUILD_SOCIAL_TAB" color="#ff00d8" />
<color id="BACKGROUND" color="#ffffff" />
+ <color id="BACKGROUND_GRAY" color="#404040" />
+ <color id="SCROLLBAR_GRAY" color="#000000" />
+ <color id="DROPDOWN_SHADOW" color="#c0c0c0" />
<color id="HIGHLIGHT" color="#c0c0c0" />
<color id="TAB_FLASH" color="#ff0000" effect="pulse" />
<color id="TAB_PLAYER_FLASH" color="#00ff00" effect="pulse" />
<color id="SHOP_WARNING" color="#910000" />
<color id="ITEM_EQUIPPED" color="#000091" />
+ <color id="ITEM_NOT_EQUIPPED" color="#000000" />
<color id="CHAT" color="#000000" />
<color id="GM" color="#ff0000" />
<color id="PLAYER" color="#1fa052" />
@@ -44,6 +49,16 @@
<color id="WARNING" color="#0000FF" />
<color id="PLAYER_ADVANCED" color="#005000" />
+ <color id="RED" color="#ff0000" />
+ <color id="GREEN" color="#009000" />
+ <color id="BLUE" color="#0000ff" />
+ <color id="ORANGE" color="#e0980e" />
+ <color id="YELLOW" color="#f1dc27" />
+ <color id="PINK" color="#ff00d8" />
+ <color id="PURPLE" color="#8415e2" />
+ <color id="GRAY" color="#919191" />
+ <color id="BROWN" color="#8e4c17" />
+
<progressbar id="DEFAULT" color="#969696" />
<progressbar id="HP" color="#ff0000,e28000,c38948,0f6a20" />
<progressbar id="MP" color="#1a66e6" />
diff --git a/data/themes/wood/colors.xml b/data/themes/wood/colors.xml
index 13d942d62..606b45301 100644
--- a/data/themes/wood/colors.xml
+++ b/data/themes/wood/colors.xml
@@ -2,6 +2,7 @@
<color id="TEXT" color="#000000" />
<color id="SHADOW" color="#000000" />
<color id="OUTLINE" color="#000000" />
+ <color id="BORDER" color="#000000" />
<color id="PROGRESS_BAR" color="#ffffff" />
<color id="BUTTON" color="#000000" />
<color id="BUTTON_DISABLED" color="#cccccc" />
@@ -11,11 +12,15 @@
<color id="GUILD_CHAT_TAB" color="#f48055" />
<color id="GUILD_SOCIAL_TAB" color="#f48055" />
<color id="BACKGROUND" color="#ffffff" />
+ <color id="BACKGROUND_GRAY" color="#404040" />
+ <color id="SCROLLBAR_GRAY" color="#000000" />
+ <color id="DROPDOWN_SHADOW" color="#c0c0c0" />
<color id="HIGHLIGHT" color="#ebc873" />
<color id="TAB_FLASH" color="#ff0000" effect="pulse" />
<color id="TAB_PLAYER_FLASH" color="#00ff00" effect="pulse" />
<color id="SHOP_WARNING" color="#910000" />
<color id="ITEM_EQUIPPED" color="#000091" />
+ <color id="ITEM_NOT_EQUIPPED" color="#000000" />
<color id="CHAT" color="#000000" />
<color id="GM" color="#ff0000" />
<color id="PLAYER" color="#003000" />
@@ -44,6 +49,16 @@
<color id="WARNING" color="#FF0000" />
<color id="PLAYER_ADVANCED" color="#005000" />
+ <color id="RED" color="#ff0000" />
+ <color id="GREEN" color="#009000" />
+ <color id="BLUE" color="#0000ff" />
+ <color id="ORANGE" color="#e0980e" />
+ <color id="YELLOW" color="#f1dc27" />
+ <color id="PINK" color="#ff00d8" />
+ <color id="PURPLE" color="#8415e2" />
+ <color id="GRAY" color="#919191" />
+ <color id="BROWN" color="#8e4c17" />
+
<progressbar id="DEFAULT" color="#969696" />
<progressbar id="HP" color="#ff0000,e28000,c38948,0f6a20" />
<progressbar id="MP" color="#1a66e6" />
diff --git a/manaplus.cbp b/manaplus.cbp
index 8ed18dbed..1f7308935 100644
--- a/manaplus.cbp
+++ b/manaplus.cbp
@@ -109,6 +109,8 @@
<Unit filename="src\animatedsprite.h" />
<Unit filename="src\animationparticle.cpp" />
<Unit filename="src\animationparticle.h" />
+ <Unit filename="src\auctionmanager.cpp" />
+ <Unit filename="src\auctionmanager.h" />
<Unit filename="src\avatar.cpp" />
<Unit filename="src\avatar.h" />
<Unit filename="src\being.cpp" />
@@ -310,6 +312,8 @@
<Unit filename="src\gui\widgets\emoteshortcutcontainer.h" />
<Unit filename="src\gui\widgets\flowcontainer.cpp" />
<Unit filename="src\gui\widgets\flowcontainer.h" />
+ <Unit filename="src\gui\widgets\guildchattab.cpp" />
+ <Unit filename="src\gui\widgets\guildchattab.h" />
<Unit filename="src\gui\widgets\horizontcontainer.cpp" />
<Unit filename="src\gui\widgets\horizontcontainer.h" />
<Unit filename="src\gui\widgets\icon.cpp" />
@@ -394,6 +398,8 @@
<Unit filename="src\guichanfwd.h" />
<Unit filename="src\guild.cpp" />
<Unit filename="src\guild.h" />
+ <Unit filename="src\guildmanager.cpp" />
+ <Unit filename="src\guildmanager.h" />
<Unit filename="src\imageparticle.cpp" />
<Unit filename="src\imageparticle.h" />
<Unit filename="src\imagesprite.cpp" />
diff --git a/packwin b/packwin
index 7d630dc98..5593a4af6 100755
--- a/packwin
+++ b/packwin
@@ -5,7 +5,7 @@ dir=`pwd`
cd packaging/windows
./make-translations.sh
makensis -DDLLDIR=$dir/../mana_win/libs/dll/ \
- -DPRODUCT_VERSION="1.1.8.21" \
+ -DPRODUCT_VERSION="1.1.9.4" \
-DEXESUFFIX=/src \
-DUPX=true \
setup.nsi
diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt
index de35788eb..068757ac1 100644
--- a/po/CMakeLists.txt
+++ b/po/CMakeLists.txt
@@ -33,10 +33,50 @@ MACRO(MANAPLUS_GETTEXT_CREATE_TRANSLATIONS _potFile _firstPoFileArg)
INSTALL(FILES ${_gmoFile} DESTINATION share/locale/${_lang}/LC_MESSAGES RENAME ${_potBasename}.mo)
SET(_gmoFiles ${_gmoFiles} ${_gmoFile})
- ENDFOREACH (_currentPoFile )
+ ENDFOREACH (_currentPoFile)
ADD_CUSTOM_TARGET(translations ${_addToAll} DEPENDS ${_gmoFiles})
-ENDMACRO(MANAPLUS_GETTEXT_CREATE_TRANSLATIONS )
+ENDMACRO()
+
+MACRO(MANAPLUS_GETTEXT_UPDATE_PO _potFile _languages)
+ GET_FILENAME_COMPONENT(_absPotFile ${_potFile} ABSOLUTE)
+
+ ADD_CUSTOM_TARGET(
+ update-pot
+ COMMAND xgettext --files-from=translatable-files --directory=. --output=${_potFile} -d manaplus --keyword=_ --keyword=N_
+ )
+
+ ADD_CUSTOM_TARGET(
+ update-translatable-files
+ COMMAND grep '_\(' -Irl ../src | sort > translatable-files
+ )
+
+ FOREACH(_lang ${_languages})
+ GET_FILENAME_COMPONENT(_absFile "${_lang}.po" ABSOLUTE)
+ SET(_currentPoFile ${CMAKE_CURRENT_BINARY_DIR}/${_lang}.po)
+ ADD_CUSTOM_TARGET(
+ "update-translation-${_lang}"
+ COMMAND ${GETTEXT_MSGMERGE_EXECUTABLE} --quiet --update --backup=none -s ${_absFile} ${_absPotFile}
+ )
+ ADD_DEPENDENCIES("update-translation-${_lang}" update-pot)
+ ADD_DEPENDENCIES(update-po "update-translation-${_lang}")
+ ADD_DEPENDENCIES(update-pot update-translatable-files)
+ ENDFOREACH()
+ENDMACRO()
+
+
+SET(languages)
+SET(POFILES)
+FILE(STRINGS LINGUAS _languages)
+FOREACH(_lang ${_languages})
+ STRING(REGEX REPLACE "#.*" "" _lang "${_lang}")
+ IF(NOT ${_lang} STREQUAL "")
+ SET(languages ${languages} ${_lang})
+ SET(POFILES ${POFILES} "${_lang}.po")
+ ENDIF()
+ENDFOREACH()
+
+ADD_CUSTOM_TARGET(update-po)
-FILE(GLOB POFILES *.po)
MANAPLUS_GETTEXT_CREATE_TRANSLATIONS(manaplus.pot ALL ${POFILES})
+MANAPLUS_GETTEXT_UPDATE_PO(manaplus.pot "${languages}")
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 311ca756d..2ebb99798 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -24,6 +24,7 @@ src/gui/inventorywindow.cpp
src/gui/itemamountwindow.cpp
src/gui/itempopup.cpp
src/gui/killstats.cpp
+src/guildmanager.cpp
src/gui/logindialog.cpp
src/gui/minimap.cpp
src/gui/ministatuswindow.cpp
@@ -66,6 +67,7 @@ src/gui/whoisonline.cpp
src/gui/widgets/battletab.cpp
src/gui/widgets/channeltab.cpp
src/gui/widgets/chattab.cpp
+src/gui/widgets/guildchattab.cpp
src/gui/widgets/setupitem.cpp
src/gui/widgets/tradetab.cpp
src/gui/widgets/whispertab.cpp
diff --git a/po/de.po b/po/de.po
index 7eb2d412b..02a19572a 100644
--- a/po/de.po
+++ b/po/de.po
@@ -2,15 +2,17 @@
# Copyright (C) YEAR The ManaPlus Developers
# This file is distributed under the same license as the PACKAGE package.
#
-# <Necromong@inbox.ru>, 2011.
+# <der.loisl@gmx.de>, 2011.
+# <clos3rlook@gmail.com>, 2011.
# <jack@krass.com>, 2011.
+# <Necromong@inbox.ru>, 2011.
# Andrei Karas <akaras@inbox.ru>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-20 17:42+0300\n"
-"PO-Revision-Date: 2011-08-09 22:16+0000\n"
+"POT-Creation-Date: 2011-09-02 18:27+0300\n"
+"PO-Revision-Date: 2011-09-02 15:29+0000\n"
"Last-Translator: akaras <akaras@inbox.ru>\n"
"Language-Team: German (http://www.transifex.net/projects/p/manaplus/team/"
"de/)\n"
@@ -24,274 +26,274 @@ msgstr ""
msgid "Visible on map"
msgstr ""
-#: src/being.cpp:542
+#: src/being.cpp:549
msgid "dodge"
msgstr "ausweichen"
-#: src/being.cpp:542
+#: src/being.cpp:549
msgid "miss"
msgstr "verfehlt"
#. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1514
+#: src/being.cpp:1529
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1519
+#: src/being.cpp:1534
msgid "I"
msgstr ""
-#: src/client.cpp:826 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:831 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
msgid "Setup"
msgstr "Einstellungen"
-#: src/client.cpp:909
+#: src/client.cpp:914
msgid "Connecting to server"
-msgstr ""
+msgstr "Verbinde zum Server"
-#: src/client.cpp:940
+#: src/client.cpp:945
msgid "Logging in"
-msgstr ""
+msgstr "Anmelden"
-#: src/client.cpp:973
+#: src/client.cpp:978
msgid "Entering game world"
msgstr "Betrete die Spielwelt"
-#: src/client.cpp:1073
+#: src/client.cpp:1078
msgid "Requesting characters"
-msgstr ""
+msgstr "Spielfiguren werden angefragt"
-#: src/client.cpp:1104
+#: src/client.cpp:1109
msgid "Connecting to the game server"
-msgstr ""
+msgstr "Verbinde zum Charakterserver"
-#: src/client.cpp:1114
+#: src/client.cpp:1119
msgid "Changing game servers"
-msgstr ""
+msgstr "Charakterserver wechseln"
-#: src/client.cpp:1151 src/client.cpp:1158 src/client.cpp:1293
+#: src/client.cpp:1156 src/client.cpp:1163 src/client.cpp:1298
#: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
-#: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:395
+#: src/gui/charcreatedialog.cpp:221 src/gui/charselectdialog.cpp:253
+#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
#: src/net/manaserv/charhandler.cpp:227
msgid "Error"
msgstr "Fehler"
-#: src/client.cpp:1167
+#: src/client.cpp:1172
msgid "Requesting registration details"
-msgstr "Fordere Registrierungsdetails an"
+msgstr "Anfrage der Registrierungsdetails"
-#: src/client.cpp:1194
+#: src/client.cpp:1199
msgid "Password Change"
-msgstr "Passwort ändern:"
+msgstr "Passwort ändern"
-#: src/client.cpp:1195
+#: src/client.cpp:1200
msgid "Password changed successfully!"
msgstr "Passwort erfolgreich geändert!"
-#: src/client.cpp:1214
+#: src/client.cpp:1219
msgid "Email Change"
msgstr "E-Mail ändern"
-#: src/client.cpp:1215
+#: src/client.cpp:1220
msgid "Email changed successfully!"
msgstr "E-Mail erfolgreich geändert!"
-#: src/client.cpp:1235
+#: src/client.cpp:1240
msgid "Unregister Successful"
msgstr "erfolgreich abgemeldet."
-#: src/client.cpp:1236
+#: src/client.cpp:1241
msgid "Farewell, come back any time..."
msgstr "Leb wohl und komme jeder Zeit wieder..."
-#: src/client.cpp:1423 src/client.cpp:1453 src/client.cpp:1497
-#: src/client.cpp:1922 src/client.cpp:1929
+#: src/client.cpp:1428 src/client.cpp:1458 src/client.cpp:1502
+#: src/client.cpp:1927 src/client.cpp:1934
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%s existiert nicht und kann nicht erstellt werden! Beende."
-#: src/client.cpp:1628
+#: src/client.cpp:1633
#, c-format
msgid "Invalid update host: %s"
-msgstr "Unbekannter Update-Rechner: %s"
+msgstr "Ungültiger Updateserver: %s"
-#: src/client.cpp:1662 src/client.cpp:1668
+#: src/client.cpp:1667 src/client.cpp:1673
msgid "Error creating updates directory!"
msgstr "Fehler beim Erstellen des Verzeichnisses für Updates!"
-#: src/client.cpp:1689
+#: src/client.cpp:1694
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
-"Fehler: %s existiert nicht und kann nicht erzeugt werden! Verlassend..."
+"Fehler: %s existiert nicht und kann nicht erstellt werden! Verlassend..."
-#: src/commandhandler.cpp:301
+#: src/commandhandler.cpp:303
msgid "Unknown command."
msgstr "Unbekannter Befehl."
-#: src/commandhandler.cpp:401
+#: src/commandhandler.cpp:403
msgid "Cannot send empty whispers!"
msgstr "Kann keine leeren Nachrichten versenden!"
-#: src/commandhandler.cpp:415
+#: src/commandhandler.cpp:417
#, c-format
msgid ""
"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
"you."
msgstr ""
-"Kann keinen tab für Spieler \"%s\" erstellen! Entweder existiert bereits "
-"einer, oder der Spieler bist du."
+"Kann keinen tab für Spieler \"%s\" erstellen! Entweder existiert er bereits, "
+"oder du bist es selbst."
-#: src/commandhandler.cpp:435
+#: src/commandhandler.cpp:437
#, c-format
msgid "Requesting to join channel %s."
-msgstr "Erbitte Erlaubnis, Kanal %s betreten zu dürfen."
+msgstr "Anfrage den Kanal %s betreten zu dürfen."
-#: src/commandhandler.cpp:451 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:453 src/net/ea/gui/partytab.cpp:125
msgid "Party name is missing."
msgstr "Name der Party fehlt."
-#: src/commandhandler.cpp:462
+#: src/commandhandler.cpp:464
msgid "Guild name is missing."
-msgstr ""
+msgstr "Name der Gilde fehlt."
-#: src/commandhandler.cpp:475 src/commandhandler.cpp:582
-#: src/commandhandler.cpp:623 src/commandhandler.cpp:653
+#: src/commandhandler.cpp:477 src/commandhandler.cpp:589
+#: src/commandhandler.cpp:630 src/commandhandler.cpp:660
msgid "Please specify a name."
msgstr "Bitte gib einen Namen an."
-#: src/commandhandler.cpp:516
+#: src/commandhandler.cpp:523
msgid "Return toggles chat."
-msgstr "Enter-Taste schließt Chatzeile."
+msgstr "Enter-Taste steuert den Chat (zeigen/verstecken)"
-#: src/commandhandler.cpp:516
+#: src/commandhandler.cpp:523
msgid "Message closes chat."
-msgstr "Nachricht schließt Chatzeile."
+msgstr "Nachricht schließt den Chat."
-#: src/commandhandler.cpp:527
+#: src/commandhandler.cpp:534
msgid "Return now toggles chat."
-msgstr "Jetzt schließt Enter die Chatzeile."
+msgstr "Enter aktiviert jetzt den Chat."
-#: src/commandhandler.cpp:533
+#: src/commandhandler.cpp:540
msgid "Message now closes chat."
-msgstr "Jetzt schließt jede Nachricht die Chatzeile."
+msgstr "Nachricht schließt jetzt den Chat."
-#: src/commandhandler.cpp:561
+#: src/commandhandler.cpp:568
msgid "friend"
msgstr "Freund"
-#: src/commandhandler.cpp:566
+#: src/commandhandler.cpp:573
msgid "disregarded"
-msgstr ""
+msgstr "unbeachtet"
-#: src/commandhandler.cpp:571
+#: src/commandhandler.cpp:578
msgid "neutral"
-msgstr ""
+msgstr "neutral"
-#: src/commandhandler.cpp:590
+#: src/commandhandler.cpp:597
#, c-format
msgid "Player already %s!"
-msgstr ""
+msgstr "Spieler ist bereits %s!"
-#: src/commandhandler.cpp:604
+#: src/commandhandler.cpp:611
#, c-format
msgid "Player successfully %s!"
-msgstr ""
+msgstr "Spieler erfolgreich %s!"
-#: src/commandhandler.cpp:612
+#: src/commandhandler.cpp:619
#, c-format
msgid "Player could not be %s!"
-msgstr ""
+msgstr "Spieler konnte nicht %s werden!"
-#: src/commandhandler.cpp:634
+#: src/commandhandler.cpp:641
msgid "Player wasn't ignored!"
msgstr "Spieler wurde nicht ignoriert!"
-#: src/commandhandler.cpp:641
+#: src/commandhandler.cpp:648
msgid "Player no longer ignored!"
msgstr "Spieler wird nicht länger ignoriert!"
-#: src/commandhandler.cpp:643
+#: src/commandhandler.cpp:650
msgid "Player could not be unignored!"
-msgstr ""
+msgstr "Ignorieren des Spielers konnte nicht rückgängig gemacht werden!"
-#: src/commandhandler.cpp:660
+#: src/commandhandler.cpp:667
msgid "Player already erased!"
-msgstr ""
+msgstr "Spieler ist bereits gelöscht!"
-#: src/commandhandler.cpp:671
+#: src/commandhandler.cpp:678
msgid "Player successfully erased!"
-msgstr ""
+msgstr "Spieler erfolgreich gelöscht!"
-#: src/commandhandler.cpp:673
+#: src/commandhandler.cpp:680
msgid "Player could not be erased!"
msgstr "Spieler konnte nicht gelöscht werden!"
-#: src/commandhandler.cpp:972 src/commandhandler.cpp:1018
+#: src/commandhandler.cpp:980 src/commandhandler.cpp:1026
#, c-format
msgid "Client uptime: %s"
msgstr ""
-#: src/commandhandler.cpp:982
+#: src/commandhandler.cpp:990
#, c-format
msgid "%d week"
msgid_plural "%d weeks"
msgstr[0] ""
msgstr[1] ""
-#: src/commandhandler.cpp:991
+#: src/commandhandler.cpp:999
#, c-format
msgid "%d day"
msgid_plural "%d days"
msgstr[0] ""
msgstr[1] ""
-#: src/commandhandler.cpp:999
+#: src/commandhandler.cpp:1007
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] ""
msgstr[1] ""
-#: src/commandhandler.cpp:1007
+#: src/commandhandler.cpp:1015
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] ""
msgstr[1] ""
-#: src/commandhandler.cpp:1015
+#: src/commandhandler.cpp:1023
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
msgstr[0] ""
msgstr[1] ""
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1102
msgid "font cache size"
msgstr ""
-#: src/commandhandler.cpp:1106
+#: src/commandhandler.cpp:1114
msgid "Cache size:"
msgstr ""
-#: src/commandhandler.cpp:1110
+#: src/commandhandler.cpp:1118
msgid "Created:"
msgstr ""
-#: src/commandhandler.cpp:1112
+#: src/commandhandler.cpp:1120
msgid "Deleted:"
msgstr ""
-#: src/commandhandler.cpp:1159 src/commandhandler.cpp:1166
+#: src/commandhandler.cpp:1167 src/commandhandler.cpp:1174
msgid "Resource images:"
msgstr ""
-#: src/commandhandler.cpp:1161 src/commandhandler.cpp:1168
+#: src/commandhandler.cpp:1169 src/commandhandler.cpp:1176
msgid "Resource orphaned images:"
msgstr ""
@@ -301,43 +303,43 @@ 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\"."
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:411
+#: src/game.cpp:252 src/gui/widgets/chattab.cpp:409
msgid "General"
msgstr "Allgemein"
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:413
+#: src/game.cpp:256 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:411
msgid "Debug"
msgstr "Debug"
-#: src/game.cpp:488
+#: src/game.cpp:511
msgid "Screenshot saved as "
-msgstr ""
+msgstr "Bildschirmfoto gespeichert unter"
-#: src/game.cpp:496
+#: src/game.cpp:519
msgid "Saving screenshot failed!"
msgstr "Bildschirmfoto konnte nicht gespeichert werden!"
-#: src/game.cpp:536
+#: src/game.cpp:559
msgid "The connection to the server was lost."
-msgstr ""
+msgstr "Die Verbindung zum Server wurde getrennt."
-#: src/game.cpp:548
+#: src/game.cpp:571
msgid "Network Error"
msgstr "Netzwerkfehler"
-#: src/game.cpp:1213
+#: src/game.cpp:1236
msgid "Ignoring incoming trade requests"
msgstr "Ignoriere eingehende Handelsanfragen"
-#: src/game.cpp:1220
+#: src/game.cpp:1243
msgid "Accepting incoming trade requests"
msgstr "Akzeptiere eingehende Handelsanfragen"
-#: src/game.cpp:1606
+#: src/game.cpp:1629
msgid "Could Not Load Map"
-msgstr ""
+msgstr "Karte konnte nicht geladen werden."
-#: src/game.cpp:1607
+#: src/game.cpp:1630
#, c-format
msgid "Error while loading %s"
msgstr "Fehler beim Laden von %s"
@@ -345,17 +347,17 @@ msgstr "Fehler beim Laden von %s"
#: src/gui/beingpopup.cpp:124
#, c-format
msgid "Party: %s"
-msgstr ""
+msgstr "Party: %s"
#: src/gui/beingpopup.cpp:138
#, c-format
msgid "Guild: %s"
-msgstr ""
+msgstr "Gilde: %s"
#: src/gui/beingpopup.cpp:151
#, c-format
msgid "Pvp rank: %d"
-msgstr ""
+msgstr "Pvp Rang: %d"
#: src/gui/beingpopup.cpp:162
#, c-format
@@ -364,105 +366,105 @@ msgstr ""
#: src/gui/botcheckerwindow.cpp:266
msgid "Bot Checker"
-msgstr ""
+msgstr "Bot-Prüfer"
-#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
+#: src/gui/botcheckerwindow.cpp:295 src/gui/setup_relations.cpp:64
msgid "Name"
msgstr "Name"
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:134
-#: src/gui/popupmenu.cpp:292 src/gui/popupmenu.cpp:617
-#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
+#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:133
+#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:646
+#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:265
msgid "Attack"
msgstr "Angriff"
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:279
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:297
#: src/keyboardconfig.cpp:62
msgid "Talk"
msgstr "Sprechen"
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:245
-#: src/gui/popupmenu.cpp:284 src/gui/popupmenu.cpp:674
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:263
+#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:703
msgid "Move"
-msgstr ""
+msgstr "Bewegen"
-#: src/gui/botcheckerwindow.cpp:300
+#: src/gui/botcheckerwindow.cpp:299
msgid "Result"
-msgstr ""
+msgstr "Resultat"
-#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123
+#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:124
msgid "Reset"
msgstr "Zurücksetzten"
-#: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:260
-#: src/gui/popupmenu.cpp:281 src/gui/popupmenu.cpp:688
+#: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:98
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:278
+#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:717
msgid "Buy"
msgstr "Kaufen"
-#: src/gui/buydialog.cpp:88 src/gui/buydialog.cpp:302
-#: src/gui/selldialog.cpp:87 src/gui/selldialog.cpp:324
+#: src/gui/buydialog.cpp:89 src/gui/buydialog.cpp:303
+#: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
#, c-format
msgid "Price: %s / Total: %s"
msgstr "Preis: %s / Gesamt: %s"
#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
#. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:93 src/gui/itemamountwindow.cpp:207
-#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:113
-#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:974
+#: src/gui/buydialog.cpp:94 src/gui/itemamountwindow.cpp:207
+#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:973
msgid "+"
msgstr "+"
#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
#. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:96 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:986
+#: src/gui/buydialog.cpp:97 src/gui/itemamountwindow.cpp:206
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:985
msgid "-"
msgstr "-"
-#: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
-#: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
-#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:288
+#: src/gui/buydialog.cpp:99 src/gui/quitdialog.cpp:47
+#: src/gui/quitdialog.cpp:49 src/gui/quitdialog.cpp:50
+#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:294
#: src/keyboardconfig.cpp:290
msgid "Quit"
msgstr "Beenden"
-#: src/gui/buydialog.cpp:99 src/gui/selldialog.cpp:94
-#: src/gui/statuswindow.cpp:503 src/gui/statuswindow.cpp:552
-#: src/gui/statuswindow.cpp:973 src/gui/statuswindow.cpp:1004
+#: src/gui/buydialog.cpp:100 src/gui/selldialog.cpp:95
+#: src/gui/statuswindow.cpp:504 src/gui/statuswindow.cpp:553
+#: src/gui/statuswindow.cpp:972 src/gui/statuswindow.cpp:1003
msgid "Max"
msgstr "Max"
#: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:133
+#: src/gui/inventorywindow.cpp:147 src/gui/setup_other.cpp:133
msgid "Shop"
-msgstr "Geschäft"
+msgstr "Laden"
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:262
-#: src/gui/popupmenu.cpp:282 src/gui/popupmenu.cpp:690
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:280
+#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:719
#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
-#: src/gui/selldialog.cpp:92
+#: src/gui/selldialog.cpp:93
msgid "Sell"
msgstr "Verkaufen"
#: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
-#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
+#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:96
#: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:336
-#: src/gui/popupmenu.cpp:357 src/gui/popupmenu.cpp:460
-#: src/gui/popupmenu.cpp:487 src/gui/popupmenu.cpp:511
-#: src/gui/popupmenu.cpp:525 src/gui/popupmenu.cpp:544
-#: src/gui/popupmenu.cpp:750 src/gui/popupmenu.cpp:774
-#: src/gui/popupmenu.cpp:1684 src/gui/popupmenu.cpp:1712
-#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1811
-#: src/gui/popupmenu.cpp:1846 src/gui/popupmenu.cpp:1886
-#: src/gui/popupmenu.cpp:1953 src/gui/popupmenu.cpp:1973
-#: src/gui/quitdialog.cpp:59 src/gui/register.cpp:82 src/gui/setup.cpp:71
-#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:354
+#: src/gui/popupmenu.cpp:375 src/gui/popupmenu.cpp:489
+#: src/gui/popupmenu.cpp:516 src/gui/popupmenu.cpp:540
+#: src/gui/popupmenu.cpp:554 src/gui/popupmenu.cpp:573
+#: src/gui/popupmenu.cpp:790 src/gui/popupmenu.cpp:814
+#: src/gui/popupmenu.cpp:1734 src/gui/popupmenu.cpp:1762
+#: src/gui/popupmenu.cpp:1818 src/gui/popupmenu.cpp:1861
+#: src/gui/popupmenu.cpp:1896 src/gui/popupmenu.cpp:1936
+#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2023
+#: src/gui/quitdialog.cpp:54 src/gui/register.cpp:82 src/gui/setup.cpp:72
+#: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:238
#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updaterwindow.cpp:157
+#: src/gui/updaterwindow.cpp:161
msgid "Cancel"
msgstr "Abbrechen"
@@ -491,10 +493,10 @@ msgstr "Die neue E-Mailadresse muss kürzer als %d Zeichen sein."
#: src/gui/changeemaildialog.cpp:146
msgid "The email address entries mismatch."
-msgstr "Die neuen E-Mailadresse stimmen nicht überein."
+msgstr "Die eingetragenen E-Mailadressen stimmen nicht überein."
#: src/gui/changepassworddialog.cpp:50 src/gui/changepassworddialog.cpp:59
-#: src/gui/charselectdialog.cpp:140
+#: src/gui/charselectdialog.cpp:139
msgid "Change Password"
msgstr "Passwort ändern"
@@ -523,127 +525,127 @@ msgstr "Das neue Passwort muss kürzer als %d Zeichen sein."
#: src/gui/changepassworddialog.cpp:134
msgid "The new password entries mismatch."
-msgstr "Die neues Passwörter stimmen nicht überein."
+msgstr "Die Passwörter stimmen nicht überein."
#: src/gui/charcreatedialog.cpp:58
msgid "Create Character"
msgstr "Charakter erstellen"
-#: src/gui/charcreatedialog.cpp:73 src/gui/logindialog.cpp:94
+#: src/gui/charcreatedialog.cpp:76 src/gui/logindialog.cpp:94
#: src/gui/register.cpp:75
msgid "Name:"
msgstr "Name :"
#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
#. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:76 src/gui/charcreatedialog.cpp:81
-#: src/gui/charcreatedialog.cpp:87 src/gui/outfitwindow.cpp:81
+#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:84
+#: src/gui/charcreatedialog.cpp:90 src/gui/outfitwindow.cpp:85
msgid ">"
msgstr ">"
#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
#. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:82
-#: src/gui/charcreatedialog.cpp:88 src/gui/outfitwindow.cpp:80
+#: src/gui/charcreatedialog.cpp:82 src/gui/charcreatedialog.cpp:85
+#: src/gui/charcreatedialog.cpp:91 src/gui/outfitwindow.cpp:84
msgid "<"
msgstr "<"
-#: src/gui/charcreatedialog.cpp:80
+#: src/gui/charcreatedialog.cpp:83
msgid "Hair color:"
msgstr "Haarfarbe:"
-#: src/gui/charcreatedialog.cpp:83
+#: src/gui/charcreatedialog.cpp:86
msgid "Hair style:"
msgstr "Frisur:"
-#: src/gui/charcreatedialog.cpp:89
+#: src/gui/charcreatedialog.cpp:92
msgid "Race:"
msgstr ""
-#: src/gui/charcreatedialog.cpp:92 src/gui/charselectdialog.cpp:479
-#: src/gui/socialwindow.cpp:1033
+#: src/gui/charcreatedialog.cpp:95 src/gui/charselectdialog.cpp:478
+#: src/gui/socialwindow.cpp:1139
msgid "Create"
msgstr "Erstellen"
-#: src/gui/charcreatedialog.cpp:94 src/gui/register.cpp:98
+#: src/gui/charcreatedialog.cpp:97 src/gui/register.cpp:98
msgid "Male"
msgstr "Männlich"
-#: src/gui/charcreatedialog.cpp:95 src/gui/register.cpp:99
+#: src/gui/charcreatedialog.cpp:98 src/gui/register.cpp:99
msgid "Female"
msgstr "Weiblich"
-#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:300
+#: src/gui/charcreatedialog.cpp:116 src/gui/charcreatedialog.cpp:303
#, c-format
msgid "Please distribute %d points"
msgstr "Bitte verteile %d Punkte"
-#: src/gui/charcreatedialog.cpp:219
+#: src/gui/charcreatedialog.cpp:222
msgid "Your name needs to be at least 4 characters."
msgstr "Dein Name muss aus mindestens 4 Zeichen bestehen."
-#: src/gui/charcreatedialog.cpp:291
+#: src/gui/charcreatedialog.cpp:294
msgid "Character stats OK"
msgstr "Spielfigurattribute OK"
-#: src/gui/charcreatedialog.cpp:305
+#: src/gui/charcreatedialog.cpp:308
#, c-format
msgid "Please remove %d points"
msgstr "Bitte entferne %d Punkte"
-#: src/gui/charselectdialog.cpp:77
+#: src/gui/charselectdialog.cpp:76
msgid "Confirm Character Delete"
-msgstr "Bestätige Charakter-Löschung"
+msgstr "Bestätige Löschung des Charakters."
-#: src/gui/charselectdialog.cpp:78
+#: src/gui/charselectdialog.cpp:77
msgid "Are you sure you want to delete this character?"
msgstr "Bist du sicher, dass du diesen Charakter löschen möchtest?"
-#: src/gui/charselectdialog.cpp:126
+#: src/gui/charselectdialog.cpp:125
msgid "Account and Character Management"
msgstr "Account- und Charakterverwaltung"
-#: src/gui/charselectdialog.cpp:139
+#: src/gui/charselectdialog.cpp:138
msgid "Switch Login"
msgstr "Login wechseln"
-#: src/gui/charselectdialog.cpp:153 src/gui/unregisterdialog.cpp:50
+#: src/gui/charselectdialog.cpp:152 src/gui/unregisterdialog.cpp:50
#: src/gui/unregisterdialog.cpp:58
msgid "Unregister"
msgstr "Abmelden"
-#: src/gui/charselectdialog.cpp:162
+#: src/gui/charselectdialog.cpp:161
msgid "Change Email"
msgstr "E-Mailadresse ändern"
-#: src/gui/charselectdialog.cpp:254
+#: src/gui/charselectdialog.cpp:253
msgid "Incorrect password"
msgstr ""
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:286
msgid "Enter password for deleting character"
msgstr ""
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:286
msgid "Enter password:"
msgstr ""
-#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:292
-#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
-#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
+#: src/gui/charselectdialog.cpp:408 src/gui/serverdialog.cpp:298
+#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:122
+#: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:241
msgid "Delete"
msgstr "Löschen"
-#: src/gui/charselectdialog.cpp:467
+#: src/gui/charselectdialog.cpp:466
msgid "Choose"
msgstr "Wähle"
-#: src/gui/charselectdialog.cpp:470
+#: src/gui/charselectdialog.cpp:469
#, c-format
msgid "Level %d"
-msgstr "Stufe: %d"
+msgstr "Level: %d"
-#: src/gui/charselectdialog.cpp:481 src/gui/charselectdialog.cpp:482
+#: src/gui/charselectdialog.cpp:480 src/gui/charselectdialog.cpp:481
msgid "(empty)"
msgstr "(leer)"
@@ -653,55 +655,55 @@ msgstr "Standard"
#: src/gui/chatwindow.cpp:113
msgid "black"
-msgstr ""
+msgstr "schwarz"
#: src/gui/chatwindow.cpp:114
msgid "red"
-msgstr ""
+msgstr "rot"
#: src/gui/chatwindow.cpp:115
msgid "green"
-msgstr ""
+msgstr "grün"
#: src/gui/chatwindow.cpp:116
msgid "blue"
-msgstr ""
+msgstr "blau"
#: src/gui/chatwindow.cpp:117
msgid "gold"
-msgstr ""
+msgstr "gold"
#: src/gui/chatwindow.cpp:118
msgid "yellow"
-msgstr ""
+msgstr "gelb"
#: src/gui/chatwindow.cpp:119
msgid "pink"
-msgstr ""
+msgstr "rosa"
#: src/gui/chatwindow.cpp:120
msgid "purple"
-msgstr ""
+msgstr "lila"
#: src/gui/chatwindow.cpp:121
msgid "grey"
-msgstr ""
+msgstr "grau"
#: src/gui/chatwindow.cpp:122
msgid "brown"
-msgstr ""
+msgstr "braun"
#: src/gui/chatwindow.cpp:123
msgid "rainbow 1"
-msgstr ""
+msgstr "Regenbogen 1"
#: src/gui/chatwindow.cpp:124
msgid "rainbow 2"
-msgstr ""
+msgstr "Regenbogen 2"
#: src/gui/chatwindow.cpp:125
msgid "rainbow 3"
-msgstr ""
+msgstr "Regenbogen 3"
#: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
#: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
@@ -715,12 +717,12 @@ msgstr "???"
msgid "Chat"
msgstr "Chat"
-#: src/gui/chatwindow.cpp:606
+#: src/gui/chatwindow.cpp:609
#, c-format
msgid "Present: %s; %d players are present."
msgstr "Anwesend: %s ;%d Spieler sind anwesend."
-#: src/gui/chatwindow.cpp:993
+#: src/gui/chatwindow.cpp:996
#, c-format
msgid "Whispering to %s: %s"
msgstr "Flüsternd zu %s: %s"
@@ -733,145 +735,145 @@ msgstr "Ja"
msgid "No"
msgstr "Nein"
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:150
-#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:384
-#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:632
-#: src/gui/popupmenu.cpp:640
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:149
+#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:402
+#: src/gui/popupmenu.cpp:408 src/gui/popupmenu.cpp:661
+#: src/gui/popupmenu.cpp:669
msgid "Ignore"
-msgstr ""
+msgstr "ignorieren"
-#: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
+#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:97
#: src/gui/setup_other.cpp:64
msgid "Map"
msgstr "Karte"
-#: src/gui/debugwindow.cpp:71
+#: src/gui/debugwindow.cpp:73
msgid "Target"
msgstr ""
-#: src/gui/debugwindow.cpp:72
+#: src/gui/debugwindow.cpp:74
msgid "Net"
msgstr ""
-#: src/gui/debugwindow.cpp:145 src/gui/debugwindow.cpp:220
-#: src/gui/debugwindow.cpp:249
+#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
+#: src/gui/debugwindow.cpp:251
msgid "Music:"
-msgstr ""
+msgstr "Musik:"
-#: src/gui/debugwindow.cpp:146 src/gui/debugwindow.cpp:224
-#: src/gui/debugwindow.cpp:251
+#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:226
+#: src/gui/debugwindow.cpp:253
msgid "Map:"
-msgstr ""
+msgstr "Karte:"
-#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
-#: src/gui/debugwindow.cpp:250
+#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:224
+#: src/gui/debugwindow.cpp:252
msgid "Minimap:"
-msgstr ""
+msgstr "Minikarte:"
-#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:218
-#: src/gui/debugwindow.cpp:247
+#: src/gui/debugwindow.cpp:150 src/gui/debugwindow.cpp:220
+#: src/gui/debugwindow.cpp:249
msgid "Cursor:"
-msgstr ""
+msgstr "Zeiger:"
-#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:201
-#: src/gui/debugwindow.cpp:206
+#: src/gui/debugwindow.cpp:151 src/gui/debugwindow.cpp:203
+#: src/gui/debugwindow.cpp:208
msgid "Player Position:"
-msgstr ""
+msgstr "Spieler-Position:"
-#: src/gui/debugwindow.cpp:152
+#: src/gui/debugwindow.cpp:154
msgid "Particle count:"
msgstr ""
-#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:235
-#: src/gui/debugwindow.cpp:254
+#: src/gui/debugwindow.cpp:156 src/gui/debugwindow.cpp:237
+#: src/gui/debugwindow.cpp:256
msgid "Map actors count:"
msgstr ""
-#: src/gui/debugwindow.cpp:162 src/gui/debugwindow.cpp:173
+#: src/gui/debugwindow.cpp:164 src/gui/debugwindow.cpp:175
#, c-format
msgid "%d FPS (Software)"
-msgstr ""
+msgstr "%d FPS (Software)"
-#: src/gui/debugwindow.cpp:166
+#: src/gui/debugwindow.cpp:168
#, c-format
msgid "%d FPS (fast OpenGL)"
-msgstr ""
+msgstr "%d FPS (schnelles OpenGL)"
-#: src/gui/debugwindow.cpp:169
+#: src/gui/debugwindow.cpp:171
#, c-format
msgid "%d FPS (old OpenGL)"
-msgstr ""
+msgstr "%d FPS (altes OpenGL)"
-#: src/gui/debugwindow.cpp:176
+#: src/gui/debugwindow.cpp:178
#, c-format
msgid "%d FPS"
msgstr "%d FPS"
-#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:240
+#: src/gui/debugwindow.cpp:190 src/gui/debugwindow.cpp:242
msgid "Textures count:"
msgstr ""
-#: src/gui/debugwindow.cpp:231
+#: src/gui/debugwindow.cpp:233
#, c-format
msgid "Particle count: %d"
msgstr "Partikelzählung: %d"
-#: src/gui/debugwindow.cpp:268 src/gui/debugwindow.cpp:299
-#: src/gui/debugwindow.cpp:343
+#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:301
+#: src/gui/debugwindow.cpp:345
msgid "Target:"
-msgstr ""
+msgstr "Ziel:"
-#: src/gui/debugwindow.cpp:269 src/gui/debugwindow.cpp:304
-#: src/gui/debugwindow.cpp:344
+#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:306
+#: src/gui/debugwindow.cpp:346
msgid "Target Id:"
-msgstr ""
+msgstr "Ziel ID:"
-#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:308
-#: src/gui/debugwindow.cpp:313 src/gui/debugwindow.cpp:345
+#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:310
+#: src/gui/debugwindow.cpp:315 src/gui/debugwindow.cpp:347
msgid "Target Level:"
-msgstr ""
+msgstr "Ziel level:"
-#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:316
-#: src/gui/debugwindow.cpp:346
+#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:318
+#: src/gui/debugwindow.cpp:348
msgid "Target Party:"
-msgstr ""
+msgstr "Ziel Party:"
-#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:319
-#: src/gui/debugwindow.cpp:347
+#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:321
+#: src/gui/debugwindow.cpp:349
msgid "Target Guild:"
-msgstr ""
+msgstr "Ziel Gilde:"
-#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:333
-#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:348
+#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:335
+#: src/gui/debugwindow.cpp:340 src/gui/debugwindow.cpp:350
msgid "Attack delay:"
msgstr ""
-#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:323
-#: src/gui/debugwindow.cpp:349
+#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:325
+#: src/gui/debugwindow.cpp:351
msgid "Minimal hit:"
msgstr ""
-#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:325
-#: src/gui/debugwindow.cpp:350
+#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:327
+#: src/gui/debugwindow.cpp:352
msgid "Maximum hit:"
msgstr ""
-#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:327
-#: src/gui/debugwindow.cpp:351
+#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:329
+#: src/gui/debugwindow.cpp:353
msgid "Critical hit:"
msgstr ""
-#: src/gui/debugwindow.cpp:385 src/gui/debugwindow.cpp:390
+#: src/gui/debugwindow.cpp:387 src/gui/debugwindow.cpp:392
#, c-format
msgid "Ping: %s ms"
msgstr ""
-#: src/gui/debugwindow.cpp:393
+#: src/gui/debugwindow.cpp:395
#, c-format
msgid "In: %d bytes/s"
msgstr ""
-#: src/gui/debugwindow.cpp:395
+#: src/gui/debugwindow.cpp:397
#, c-format
msgid "Out: %d bytes/s"
msgstr ""
@@ -880,26 +882,26 @@ msgstr ""
msgid "Did You Know?"
msgstr ""
-#: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
-#: src/gui/inventorywindow.cpp:175 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:559 src/gui/shopwindow.cpp:111
+#: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
+#: src/gui/inventorywindow.cpp:176 src/gui/npcdialog.cpp:53
+#: src/gui/popupmenu.cpp:588 src/gui/shopwindow.cpp:113
msgid "Close"
msgstr "Schließen"
-#: src/gui/didyouknowwindow.cpp:62
+#: src/gui/didyouknowwindow.cpp:64
msgid "< Previous"
-msgstr ""
+msgstr "< Zurück"
-#: src/gui/didyouknowwindow.cpp:63
+#: src/gui/didyouknowwindow.cpp:65
msgid "Next >"
-msgstr ""
+msgstr "Vor >"
-#: src/gui/didyouknowwindow.cpp:64
+#: src/gui/didyouknowwindow.cpp:66
msgid "Auto open this window"
msgstr ""
#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:58 src/gui/textdialog.cpp:50
+#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:53 src/gui/textdialog.cpp:50
msgid "OK"
msgstr "Ok"
@@ -907,10 +909,10 @@ msgstr "Ok"
msgid "Equipment"
msgstr "Ausrüstung"
-#: src/gui/equipmentwindow.cpp:93 src/gui/inventorywindow.cpp:130
-#: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
-#: src/gui/popupmenu.cpp:1643 src/gui/popupmenu.cpp:1738
-#: src/gui/popupmenu.cpp:1783
+#: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:131
+#: src/gui/inventorywindow.cpp:512 src/gui/inventorywindow.cpp:521
+#: src/gui/popupmenu.cpp:1693 src/gui/popupmenu.cpp:1788
+#: src/gui/popupmenu.cpp:1833
msgid "Unequip"
msgstr "Ablegen"
@@ -923,75 +925,75 @@ msgstr "Hilfe"
msgid "Inventory"
msgstr "Inventar"
-#: src/gui/inventorywindow.cpp:104
+#: src/gui/inventorywindow.cpp:105
msgid "Slots:"
msgstr "Plätze:"
-#: src/gui/inventorywindow.cpp:115
+#: src/gui/inventorywindow.cpp:116
msgid "Filter:"
-msgstr ""
+msgstr "Filter:"
-#: src/gui/inventorywindow.cpp:116
+#: src/gui/inventorywindow.cpp:117
msgid "Sort:"
-msgstr ""
+msgstr "Sortieren:"
-#: src/gui/inventorywindow.cpp:122
+#: src/gui/inventorywindow.cpp:123
msgid "na"
msgstr ""
-#: src/gui/inventorywindow.cpp:123
+#: src/gui/inventorywindow.cpp:124
msgid "az"
msgstr ""
-#: src/gui/inventorywindow.cpp:124
+#: src/gui/inventorywindow.cpp:125
msgid "id"
msgstr ""
-#: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:513
-#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1645
-#: src/gui/popupmenu.cpp:1740 src/gui/popupmenu.cpp:1785
+#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
+#: src/gui/inventorywindow.cpp:523 src/gui/popupmenu.cpp:1695
+#: src/gui/popupmenu.cpp:1790 src/gui/popupmenu.cpp:1835
msgid "Equip"
msgstr "Ausrüsten"
-#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
-#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1648
-#: src/gui/popupmenu.cpp:1707 src/gui/popupmenu.cpp:1744
-#: src/gui/popupmenu.cpp:1788
+#: src/gui/inventorywindow.cpp:130 src/gui/inventorywindow.cpp:515
+#: src/gui/inventorywindow.cpp:519 src/gui/popupmenu.cpp:1698
+#: src/gui/popupmenu.cpp:1757 src/gui/popupmenu.cpp:1794
+#: src/gui/popupmenu.cpp:1838
msgid "Use"
msgstr "Benutzen"
-#: src/gui/inventorywindow.cpp:143 src/gui/inventorywindow.cpp:619
-#: src/gui/popupmenu.cpp:1652 src/gui/popupmenu.cpp:1749
-#: src/gui/popupmenu.cpp:1792
+#: src/gui/inventorywindow.cpp:144 src/gui/inventorywindow.cpp:620
+#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1799
+#: src/gui/popupmenu.cpp:1842
msgid "Drop..."
msgstr "Wegwerfen"
-#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1661
-#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1801
+#: src/gui/inventorywindow.cpp:145 src/gui/popupmenu.cpp:1711
+#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1851
msgid "Split"
msgstr "Aufteilen"
-#: src/gui/inventorywindow.cpp:145 src/gui/outfitwindow.cpp:59
-#: src/gui/popupmenu.cpp:520
+#: src/gui/inventorywindow.cpp:146 src/gui/outfitwindow.cpp:60
+#: src/gui/popupmenu.cpp:549
msgid "Outfits"
msgstr "Ausrüstung"
-#: src/gui/inventorywindow.cpp:148
+#: src/gui/inventorywindow.cpp:149
msgid "Weight:"
msgstr "Gewicht:"
-#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
-#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
-#: src/gui/popupmenu.cpp:1804 src/gui/setup.cpp:72
+#: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:611
+#: src/gui/popupmenu.cpp:1674 src/gui/popupmenu.cpp:1811
+#: src/gui/popupmenu.cpp:1854 src/gui/setup.cpp:73
msgid "Store"
-msgstr "Einlagern"
+msgstr "Aufbewahren"
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1668
+#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1718
msgid "Retrieve"
msgstr "Abholen"
-#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1657
-#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1797
+#: src/gui/inventorywindow.cpp:622 src/gui/popupmenu.cpp:1707
+#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1847
#: src/gui/windowmenu.cpp:97
msgid "Drop"
msgstr "Wegwerfen"
@@ -1002,7 +1004,7 @@ msgstr "Alle"
#: src/gui/itemamountwindow.cpp:261
msgid "Select amount of items to trade."
-msgstr "Wähle aus, wie viele Gegenstände Du tauschen möchtest."
+msgstr "Wähle aus, wie viele Gegenstände Du handeln möchtest."
#: src/gui/itemamountwindow.cpp:264
msgid "Select amount of items to drop."
@@ -1010,33 +1012,33 @@ msgstr "Wähle aus, wie viele Gegenstände Du wegwerfen möchtest."
#: src/gui/itemamountwindow.cpp:267
msgid "Select amount of items to store."
-msgstr "Wähle aus, wie viele Gegenstände du einlagern möchtest."
+msgstr "Wähle aus, wie viele Gegenstände du aufbewahren möchtest."
#: src/gui/itemamountwindow.cpp:270
msgid "Select amount of items to retrieve."
-msgstr "Wähle aus, wie viele Gegenstände du wieder haben möchtest."
+msgstr "Wähle aus, wie viele Gegenstände du abholen möchtest."
#: src/gui/itemamountwindow.cpp:273
msgid "Select amount of items to split."
-msgstr "Wähle aus, wie viel Gegenstände Du aufteilen möchtest."
+msgstr "Wähle Anzahl der Gegenstände die Du aufteilen möchtest."
#: src/gui/itemamountwindow.cpp:276
msgid "Add to buy shop."
-msgstr ""
+msgstr "Füge zu Einkaufsladen hinzu."
#: src/gui/itemamountwindow.cpp:279
msgid "Add to sell shop."
-msgstr ""
+msgstr "Füge zu Verkaufsladen hinzu."
#: src/gui/itemamountwindow.cpp:282
msgid "Unknown."
-msgstr ""
+msgstr "Unbekannt."
-#: src/gui/itempopup.cpp:176 src/gui/itempopup.cpp:182
+#: src/gui/itempopup.cpp:177 src/gui/itempopup.cpp:183
msgid ", "
-msgstr ""
+msgstr ","
-#: src/gui/itempopup.cpp:192
+#: src/gui/itempopup.cpp:193
#, c-format
msgid "Weight: %s"
msgstr "Gewicht: %s"
@@ -1045,114 +1047,118 @@ msgstr "Gewicht: %s"
msgid "Kill stats"
msgstr ""
-#: src/gui/killstats.cpp:64
+#: src/gui/killstats.cpp:65
msgid "Reset stats"
-msgstr ""
+msgstr "Statistik zurücksetzen"
-#: src/gui/killstats.cpp:65
+#: src/gui/killstats.cpp:66
msgid "Reset timer"
-msgstr ""
+msgstr "Timer zurücksetzen"
-#: src/gui/killstats.cpp:69 src/gui/killstats.cpp:205
+#: src/gui/killstats.cpp:70 src/gui/killstats.cpp:206
#, c-format
msgid "Level: %d at %f%%"
msgstr ""
-#: src/gui/killstats.cpp:73 src/gui/killstats.cpp:210
+#: src/gui/killstats.cpp:74 src/gui/killstats.cpp:211
#, c-format
msgid "Exp: %d/%d Left: %d"
msgstr ""
-#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:216
-#: src/gui/killstats.cpp:225
+#: src/gui/killstats.cpp:77 src/gui/killstats.cpp:217
+#: src/gui/killstats.cpp:226
#, c-format
msgid "1%% = %d exp, avg mob for 1%%: %s"
msgstr ""
-#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:142
-#: src/gui/killstats.cpp:234
+#: src/gui/killstats.cpp:80 src/gui/killstats.cpp:143
+#: src/gui/killstats.cpp:235
#, c-format
msgid "Kills: %s, total exp: %s"
msgstr ""
-#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
-#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:230
+#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145
+#: src/gui/killstats.cpp:221 src/gui/killstats.cpp:231
#, c-format
msgid "Avg Exp: %s, No. of avg mob to next level: %s"
msgstr ""
-#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:162
-#: src/gui/killstats.cpp:237
+#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:163
+#: src/gui/killstats.cpp:238
#, c-format
msgid "Kills/Min: %s, Exp/Min: %s"
msgstr ""
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:89 src/gui/killstats.cpp:94
-#: src/gui/killstats.cpp:289 src/gui/killstats.cpp:305
-#: src/gui/killstats.cpp:323
+#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:90 src/gui/killstats.cpp:95
+#: src/gui/killstats.cpp:290 src/gui/killstats.cpp:306
+#: src/gui/killstats.cpp:324
#, c-format
msgid "Exp speed per %d min: %s"
msgid_plural "Exp speed per %d min: %s"
msgstr[0] ""
msgstr[1] ""
-#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
+#: src/gui/killstats.cpp:88 src/gui/killstats.cpp:93 src/gui/killstats.cpp:98
#, c-format
msgid "Time for next level per %d min: %s"
msgid_plural "Time for next level per %d min: %s"
msgstr[0] ""
msgstr[1] ""
-#: src/gui/killstats.cpp:100 src/gui/killstats.cpp:241
+#: src/gui/killstats.cpp:101 src/gui/killstats.cpp:242
msgid "Last kill exp:"
msgstr ""
-#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:355
-#: src/gui/killstats.cpp:361 src/gui/killstats.cpp:367
-#: src/gui/killstats.cpp:372
+#: src/gui/killstats.cpp:103 src/gui/killstats.cpp:356
+#: src/gui/killstats.cpp:362 src/gui/killstats.cpp:368
+#: src/gui/killstats.cpp:373
msgid "Time before jacko spawn:"
msgstr ""
-#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:301
-#: src/gui/killstats.cpp:311 src/gui/killstats.cpp:318
-#: src/gui/killstats.cpp:330 src/gui/killstats.cpp:337
+#: src/gui/killstats.cpp:295 src/gui/killstats.cpp:302
+#: src/gui/killstats.cpp:312 src/gui/killstats.cpp:319
+#: src/gui/killstats.cpp:331 src/gui/killstats.cpp:338
#, c-format
msgid " Time for next level: %s"
msgstr ""
-#: src/gui/killstats.cpp:361
+#: src/gui/killstats.cpp:362
#, c-format
msgid "%s %d?"
msgstr ""
-#: src/gui/killstats.cpp:367
+#: src/gui/killstats.cpp:368
msgid "jacko spawning"
msgstr ""
+#: src/guildmanager.cpp:464 src/net/ea/guildhandler.cpp:439
+msgid "You have left the guild."
+msgstr "Du hast die Guilde verlassen."
+
#: src/gui/logindialog.cpp:59
msgid "Normal"
-msgstr ""
+msgstr "Normal"
#: src/gui/logindialog.cpp:60
msgid "Auto Close"
-msgstr ""
+msgstr "automatisch schließen"
#: src/gui/logindialog.cpp:61
msgid "Skip"
-msgstr ""
+msgstr "überspringen"
#: src/gui/logindialog.cpp:86 src/gui/logindialog.cpp:123
msgid "Login"
msgstr "Anmelden"
-#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:246
+#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:252
#: src/gui/widgets/chattab.cpp:173
msgid "Server:"
msgstr "Server:"
#: src/gui/logindialog.cpp:96
msgid "Custom update host"
-msgstr ""
+msgstr "Updateserver verwalten"
#: src/gui/logindialog.cpp:110
msgid "Remember username"
@@ -1160,7 +1166,7 @@ msgstr "Benutzername merken"
#: src/gui/logindialog.cpp:111
msgid "Update:"
-msgstr ""
+msgstr "Update:"
#: src/gui/logindialog.cpp:121 src/gui/register.cpp:66 src/gui/register.cpp:81
msgid "Register"
@@ -1212,7 +1218,7 @@ msgstr "Muss"
#: src/gui/npcdialog.cpp:51
msgid "Waiting for server"
-msgstr "Warte auf den Server"
+msgstr "Warte auf Server"
#: src/gui/npcdialog.cpp:52
msgid "Next"
@@ -1227,11 +1233,11 @@ msgstr "Absenden"
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:561
+#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:590
msgid "Clear"
-msgstr ""
+msgstr "Frei"
-#: src/gui/npcdialog.cpp:222
+#: src/gui/npcdialog.cpp:223
msgid "> Next"
msgstr ""
@@ -1247,346 +1253,346 @@ msgstr "Senden"
msgid "Failed to send as sender or letter invalid."
msgstr "Es misslang den Brief zu senden oder er war ungültig."
-#: src/gui/outfitwindow.cpp:82 src/gui/outfitwindow.cpp:886
+#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:890
#, c-format
msgid "Outfit: %d"
msgstr "Ausrüstung: %d"
-#: src/gui/outfitwindow.cpp:84 src/gui/outfitwindow.cpp:888
+#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:892
#, c-format
msgid "Key: %s"
-msgstr ""
+msgstr "Taste: %s"
-#: src/gui/outfitwindow.cpp:87
+#: src/gui/outfitwindow.cpp:91
msgid "Unequip first"
-msgstr "erstes ausziehen"
+msgstr "Zuerst ausziehen"
-#: src/gui/outfitwindow.cpp:90
+#: src/gui/outfitwindow.cpp:94
msgid "Away outfit"
-msgstr ""
+msgstr "Abwesend-Outfit"
-#: src/gui/popupmenu.cpp:133 src/gui/popupmenu.cpp:616
+#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:645
#: src/gui/widgets/tradetab.cpp:44
msgid "Trade"
msgstr "Handeln"
-#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:375
+#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:393
msgid "Whisper"
-msgstr ""
+msgstr "Flüstern"
-#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:621
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:650
msgid "Heal"
-msgstr ""
+msgstr "Heilen"
-#: src/gui/popupmenu.cpp:146 src/gui/popupmenu.cpp:381
-#: src/gui/popupmenu.cpp:628
+#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:399
+#: src/gui/popupmenu.cpp:657
msgid "Be friend"
-msgstr ""
+msgstr "Befreunden"
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:383
-#: src/gui/popupmenu.cpp:389 src/gui/popupmenu.cpp:408
-#: src/gui/popupmenu.cpp:630 src/gui/popupmenu.cpp:638
-#: src/gui/popupmenu.cpp:662
+#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:156
+#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:401
+#: src/gui/popupmenu.cpp:407 src/gui/popupmenu.cpp:426
+#: src/gui/popupmenu.cpp:659 src/gui/popupmenu.cpp:667
+#: src/gui/popupmenu.cpp:691
msgid "Disregard"
msgstr ""
-#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:161
-#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:177
-#: src/gui/popupmenu.cpp:385 src/gui/popupmenu.cpp:391
-#: src/gui/popupmenu.cpp:398 src/gui/popupmenu.cpp:403
-#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
-#: src/gui/popupmenu.cpp:649 src/gui/popupmenu.cpp:655
+#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:160
+#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:176
+#: src/gui/popupmenu.cpp:403 src/gui/popupmenu.cpp:409
+#: src/gui/popupmenu.cpp:416 src/gui/popupmenu.cpp:421
+#: src/gui/popupmenu.cpp:662 src/gui/popupmenu.cpp:670
+#: src/gui/popupmenu.cpp:678 src/gui/popupmenu.cpp:684
msgid "Erase"
msgstr ""
-#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:175
-#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:395
-#: src/gui/popupmenu.cpp:402 src/gui/popupmenu.cpp:407
-#: src/gui/popupmenu.cpp:646 src/gui/popupmenu.cpp:654
-#: src/gui/popupmenu.cpp:660
+#: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:174
+#: src/gui/popupmenu.cpp:181 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:425
+#: src/gui/popupmenu.cpp:675 src/gui/popupmenu.cpp:683
+#: src/gui/popupmenu.cpp:689
msgid "Unignore"
msgstr ""
-#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:186
-#: src/gui/popupmenu.cpp:397 src/gui/popupmenu.cpp:410
-#: src/gui/popupmenu.cpp:648 src/gui/popupmenu.cpp:664
+#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:185
+#: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:428
+#: src/gui/popupmenu.cpp:677 src/gui/popupmenu.cpp:693
#: src/playerrelations.cpp:400
msgid "Completely ignore"
msgstr "@@ignore|Ignoriere %s komplett@@"
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:418
-#: src/gui/popupmenu.cpp:672
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:436
+#: src/gui/popupmenu.cpp:701
msgid "Follow"
-msgstr ""
+msgstr "Folgen"
-#: src/gui/popupmenu.cpp:196 src/gui/popupmenu.cpp:419
-#: src/gui/popupmenu.cpp:673
+#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:437
+#: src/gui/popupmenu.cpp:702
msgid "Imitation"
msgstr ""
-#: src/gui/popupmenu.cpp:206 src/gui/popupmenu.cpp:710
+#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:739
msgid "Invite to party"
msgstr ""
-#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:428
-#: src/gui/popupmenu.cpp:715
+#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:744
msgid "Kick from party"
msgstr ""
-#: src/gui/popupmenu.cpp:226 src/gui/popupmenu.cpp:439
-#: src/gui/popupmenu.cpp:729
+#: src/gui/popupmenu.cpp:225 src/gui/popupmenu.cpp:237
+#: src/gui/popupmenu.cpp:460 src/gui/popupmenu.cpp:761
msgid "Kick from guild"
msgstr ""
-#: src/gui/popupmenu.cpp:228 src/gui/popupmenu.cpp:441
-#: src/gui/popupmenu.cpp:731
+#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:242
+#: src/gui/popupmenu.cpp:465 src/gui/popupmenu.cpp:766
msgid "Change pos in guild"
msgstr ""
-#: src/gui/popupmenu.cpp:234 src/gui/popupmenu.cpp:446
-#: src/gui/popupmenu.cpp:737
+#: src/gui/popupmenu.cpp:251 src/gui/popupmenu.cpp:474
+#: src/gui/popupmenu.cpp:776
msgid "Invite to guild"
msgstr ""
-#: src/gui/popupmenu.cpp:242
+#: src/gui/popupmenu.cpp:260
msgid "Kick player"
msgstr ""
-#: src/gui/popupmenu.cpp:244
+#: src/gui/popupmenu.cpp:262
msgid "Nuke"
msgstr ""
-#: src/gui/popupmenu.cpp:247 src/gui/popupmenu.cpp:675
+#: src/gui/popupmenu.cpp:265 src/gui/popupmenu.cpp:704
msgid "Show Items"
msgstr ""
-#: src/gui/popupmenu.cpp:248 src/gui/popupmenu.cpp:676
-#: src/gui/popupmenu.cpp:1970
+#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:705
+#: src/gui/popupmenu.cpp:2020
msgid "Undress"
msgstr ""
-#: src/gui/popupmenu.cpp:250 src/gui/popupmenu.cpp:286
-#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:678
-#: src/gui/popupmenu.cpp:746
+#: src/gui/popupmenu.cpp:268 src/gui/popupmenu.cpp:304
+#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:707
+#: src/gui/popupmenu.cpp:786
msgid "Add comment"
-msgstr ""
+msgstr "Kommentar hinzufügen"
-#: src/gui/popupmenu.cpp:268 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:695
+#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:482
+#: src/gui/popupmenu.cpp:724
msgid "Buy (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:454
-#: src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:483
+#: src/gui/popupmenu.cpp:726
msgid "Sell (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:298
+#: src/gui/popupmenu.cpp:316
msgid "Kick"
msgstr ""
-#: src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:327
msgid "Remove from attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:315
+#: src/gui/popupmenu.cpp:333
msgid "Add to priority attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:317
+#: src/gui/popupmenu.cpp:335
msgid "Add to attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:320
+#: src/gui/popupmenu.cpp:338
msgid "Add to ignore list"
msgstr ""
-#: src/gui/popupmenu.cpp:333 src/gui/popupmenu.cpp:457
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:486
msgid "Add name to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:483
+#: src/gui/popupmenu.cpp:512
msgid "Pick up"
-msgstr ""
+msgstr "Aufheben"
-#: src/gui/popupmenu.cpp:484 src/gui/popupmenu.cpp:1682
-#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1805
+#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:1732
+#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1855
msgid "Add to chat"
msgstr "Zu Chat hinzufügen"
-#: src/gui/popupmenu.cpp:501
+#: src/gui/popupmenu.cpp:530
msgid "Map Item"
msgstr ""
-#: src/gui/popupmenu.cpp:502
+#: src/gui/popupmenu.cpp:531
msgid "Rename"
-msgstr ""
+msgstr "Umbenennen"
-#: src/gui/popupmenu.cpp:503 src/gui/popupmenu.cpp:1923
-#: src/gui/popupmenu.cpp:1941 src/gui/popupmenu.cpp:1946
+#: src/gui/popupmenu.cpp:532 src/gui/popupmenu.cpp:1973
+#: src/gui/popupmenu.cpp:1991 src/gui/popupmenu.cpp:1996
msgid "Remove"
-msgstr ""
+msgstr "Entfernen"
-#: src/gui/popupmenu.cpp:508
+#: src/gui/popupmenu.cpp:537
msgid "Warp"
msgstr ""
-#: src/gui/popupmenu.cpp:522
+#: src/gui/popupmenu.cpp:551
msgid "Load old outfits"
msgstr ""
-#: src/gui/popupmenu.cpp:538 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:567 src/gui/windowmenu.cpp:96
msgid "Spells"
-msgstr ""
+msgstr "Zaubersprüche"
-#: src/gui/popupmenu.cpp:540
+#: src/gui/popupmenu.cpp:569
msgid "Load old spells"
msgstr ""
-#: src/gui/popupmenu.cpp:541
+#: src/gui/popupmenu.cpp:570
msgid "Edit spell"
msgstr ""
-#: src/gui/popupmenu.cpp:567
+#: src/gui/popupmenu.cpp:596
msgid "Disable highlight"
-msgstr ""
+msgstr "Hervorhebung abschalten"
-#: src/gui/popupmenu.cpp:572
+#: src/gui/popupmenu.cpp:601
msgid "Enable highlight"
-msgstr ""
+msgstr "Hervorhebung einschalten"
-#: src/gui/popupmenu.cpp:577
-msgid "Dont remove name"
+#: src/gui/popupmenu.cpp:606
+msgid "Don't remove name"
msgstr ""
-#: src/gui/popupmenu.cpp:582
+#: src/gui/popupmenu.cpp:611
msgid "Remove name"
msgstr ""
-#: src/gui/popupmenu.cpp:587
+#: src/gui/popupmenu.cpp:616
msgid "Enable away"
msgstr ""
-#: src/gui/popupmenu.cpp:592
+#: src/gui/popupmenu.cpp:621
msgid "Disable away"
msgstr ""
-#: src/gui/popupmenu.cpp:598 src/gui/socialwindow.cpp:1035
+#: src/gui/popupmenu.cpp:627 src/gui/socialwindow.cpp:1141
msgid "Leave"
-msgstr ""
+msgstr "Verlassen"
-#: src/gui/popupmenu.cpp:758
+#: src/gui/popupmenu.cpp:798
msgid "Change guild position"
-msgstr ""
+msgstr "Position der Gilde ändern"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1189
+#: src/gui/popupmenu.cpp:1234
msgid "Rename map sign "
-msgstr ""
+msgstr "Kartenzeichen umbenennen"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1191
+#: src/gui/popupmenu.cpp:1236
msgid "Name: "
-msgstr ""
+msgstr "Name:"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1241
+#: src/gui/popupmenu.cpp:1286
msgid "Player comment "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1243
+#: src/gui/popupmenu.cpp:1288
msgid "Comment: "
msgstr ""
-#: src/gui/popupmenu.cpp:1607
+#: src/gui/popupmenu.cpp:1657
msgid "Add to trade"
msgstr ""
-#: src/gui/popupmenu.cpp:1613
+#: src/gui/popupmenu.cpp:1663
msgid "Add to trade 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1616
+#: src/gui/popupmenu.cpp:1666
msgid "Add to trade half"
msgstr ""
-#: src/gui/popupmenu.cpp:1618
+#: src/gui/popupmenu.cpp:1668
msgid "Add to trade all"
msgstr ""
-#: src/gui/popupmenu.cpp:1630
+#: src/gui/popupmenu.cpp:1680
msgid "Store 10"
-msgstr ""
+msgstr "10 aufbewahren"
-#: src/gui/popupmenu.cpp:1633
+#: src/gui/popupmenu.cpp:1683
msgid "Store half"
-msgstr ""
+msgstr "Die Hälfte aufbewahren"
-#: src/gui/popupmenu.cpp:1635
+#: src/gui/popupmenu.cpp:1685
msgid "Store all"
-msgstr ""
+msgstr "Alles aufbewahren"
-#: src/gui/popupmenu.cpp:1653 src/gui/popupmenu.cpp:1750
-#: src/gui/popupmenu.cpp:1793
+#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1800
+#: src/gui/popupmenu.cpp:1843
msgid "Drop all"
msgstr ""
-#: src/gui/popupmenu.cpp:1674
+#: src/gui/popupmenu.cpp:1724
msgid "Retrieve 10"
-msgstr ""
+msgstr "10 abholen"
-#: src/gui/popupmenu.cpp:1677
+#: src/gui/popupmenu.cpp:1727
msgid "Retrieve half"
-msgstr ""
+msgstr "Die Hälfte abholen"
-#: src/gui/popupmenu.cpp:1679
+#: src/gui/popupmenu.cpp:1729
msgid "Retrieve all"
-msgstr ""
+msgstr "Alles abholen"
-#: src/gui/popupmenu.cpp:1710 src/gui/popupmenu.cpp:1766
+#: src/gui/popupmenu.cpp:1760 src/gui/popupmenu.cpp:1816
msgid "Load old item shortcuts"
msgstr ""
-#: src/gui/popupmenu.cpp:1809
+#: src/gui/popupmenu.cpp:1859
msgid "Load old drop shortcuts"
msgstr ""
-#: src/gui/popupmenu.cpp:1835 src/gui/popupmenu.cpp:1870
+#: src/gui/popupmenu.cpp:1885 src/gui/popupmenu.cpp:1920
msgid "Hide"
msgstr ""
-#: src/gui/popupmenu.cpp:1841 src/gui/popupmenu.cpp:1876
+#: src/gui/popupmenu.cpp:1891 src/gui/popupmenu.cpp:1926
msgid "Show"
msgstr ""
-#: src/gui/popupmenu.cpp:1883
+#: src/gui/popupmenu.cpp:1933
msgid "Reset yellow bar"
msgstr ""
-#: src/gui/popupmenu.cpp:1885 src/gui/statuswindow.cpp:240
+#: src/gui/popupmenu.cpp:1935 src/gui/statuswindow.cpp:241
msgid "Copy to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:1903 src/gui/socialwindow.cpp:854
-#: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
+#: src/gui/popupmenu.cpp:1953 src/gui/socialwindow.cpp:958
+#: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028
msgid "(default)"
msgstr ""
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1933
+#: src/gui/popupmenu.cpp:1965 src/gui/popupmenu.cpp:1983
msgid "Move up"
msgstr ""
-#: src/gui/popupmenu.cpp:1920 src/gui/popupmenu.cpp:1938
+#: src/gui/popupmenu.cpp:1970 src/gui/popupmenu.cpp:1988
msgid "Move down"
msgstr ""
-#: src/gui/quitdialog.cpp:56
+#: src/gui/quitdialog.cpp:51
msgid "Switch server"
msgstr "Server wechseln"
-#: src/gui/quitdialog.cpp:57
+#: src/gui/quitdialog.cpp:52
msgid "Switch character"
msgstr "Spielfigur wechseln"
@@ -1596,7 +1602,7 @@ msgstr "Bestätigen:"
#: src/gui/register.cpp:108
msgid "Email:"
-msgstr "eMail:"
+msgstr "E-Mail:"
#: src/gui/register.cpp:176
#, c-format
@@ -1622,87 +1628,87 @@ msgstr "Das Passwort muss kürzer als %d Zeichen sein."
msgid "Passwords do not match."
msgstr "Passwörter stimmen nicht überein."
-#: src/gui/serverdialog.cpp:231
+#: src/gui/serverdialog.cpp:237
msgid "Choose Your Server"
msgstr "Wähle deinen Server"
-#: src/gui/serverdialog.cpp:242
+#: src/gui/serverdialog.cpp:248
msgid "Choose Your Server *** SAFE MODE ***"
msgstr ""
-#: src/gui/serverdialog.cpp:247
+#: src/gui/serverdialog.cpp:253
msgid "Port:"
msgstr "Port:"
-#: src/gui/serverdialog.cpp:251
+#: src/gui/serverdialog.cpp:257
msgid "Use same ip for game sub servers"
msgstr ""
-#: src/gui/serverdialog.cpp:265
+#: src/gui/serverdialog.cpp:271
msgid "Server type:"
-msgstr ""
+msgstr "Server Typ:"
-#: src/gui/serverdialog.cpp:289
+#: src/gui/serverdialog.cpp:295
msgid "Load"
-msgstr ""
+msgstr "Laden"
-#: src/gui/serverdialog.cpp:290
+#: src/gui/serverdialog.cpp:296
msgid "Connect"
msgstr "Verbinde..."
-#: src/gui/serverdialog.cpp:291
+#: src/gui/serverdialog.cpp:297
msgid "Custom Server"
-msgstr ""
+msgstr "Server verwalten"
-#: src/gui/serverdialog.cpp:396
+#: src/gui/serverdialog.cpp:402
msgid "Please type both the address and the port of a server."
msgstr "Bitte die Adresse und den Port eines Servers eingeben"
-#: src/gui/serverdialog.cpp:554
+#: src/gui/serverdialog.cpp:560
#, c-format
msgid "Downloading server list...%2.2f%%"
msgstr "Lade Serverliste herunter...%2.2f%%"
-#: src/gui/serverdialog.cpp:559
+#: src/gui/serverdialog.cpp:565
msgid "Waiting for server..."
msgstr "Warte auf den Server"
-#: src/gui/serverdialog.cpp:563
+#: src/gui/serverdialog.cpp:569
msgid "Preparing download"
msgstr "Download wird vorbereitet"
-#: src/gui/serverdialog.cpp:567
+#: src/gui/serverdialog.cpp:573
msgid "Error retreiving server list!"
-msgstr ""
+msgstr "Fehler beim Empfangen der Serverliste!"
-#: src/gui/serverdialog.cpp:672
+#: src/gui/serverdialog.cpp:678
msgid "requires a newer version"
msgstr "benötigt eine neuere Version"
-#: src/gui/serverdialog.cpp:674
+#: src/gui/serverdialog.cpp:680
#, c-format
msgid "requires v%s"
msgstr "benötigt v%s"
#: src/gui/setup_audio.cpp:50
msgid "Enable Audio"
-msgstr ""
+msgstr "Audio einschalten"
#: src/gui/setup_audio.cpp:51
msgid "Enable game sfx"
-msgstr ""
+msgstr "Spieltöne einschalten"
#: src/gui/setup_audio.cpp:52
msgid "Enable gui sfx"
-msgstr ""
+msgstr "Nachrichtentöne einschalten"
#: src/gui/setup_audio.cpp:53
msgid "Enable music"
-msgstr ""
+msgstr "Musik einschalten"
#: src/gui/setup_audio.cpp:54
msgid "Enable mumble voice chat"
-msgstr ""
+msgstr "\"mumble voice chat\" einschalten"
#: src/gui/setup_audio.cpp:56
msgid "Download music"
@@ -1722,7 +1728,7 @@ msgstr "Lautstärke der Musik"
#: src/gui/setup_audio.cpp:120
msgid "Notice"
-msgstr ""
+msgstr "Bemerkung"
#: src/gui/setup_audio.cpp:120
msgid "You may have to restart your client if you want to download new music"
@@ -1740,11 +1746,11 @@ msgstr "Farben"
#: src/gui/setup_chat.cpp:57
msgid "Remove colors from received chat messages"
-msgstr ""
+msgstr "Farben bei eingehenden Nachrichten abschalten"
#: src/gui/setup_chat.cpp:60
msgid "Show chat colors list"
-msgstr ""
+msgstr "Zeige Chatfarben-Liste"
#: src/gui/setup_chat.cpp:64
msgid "Commands"
@@ -1752,7 +1758,7 @@ msgstr ""
#: src/gui/setup_chat.cpp:66
msgid "Allow magic and GM commands in all chat tabs"
-msgstr ""
+msgstr "Lasse magische und GM-Nachrichten in allen Chat Tabs zu"
#: src/gui/setup_chat.cpp:70
msgid "Limits"
@@ -1760,11 +1766,11 @@ msgstr ""
#: src/gui/setup_chat.cpp:72
msgid "Limit max chars in chat line"
-msgstr ""
+msgstr "Limitiere max Zeichen in Chatzeile"
#: src/gui/setup_chat.cpp:75
msgid "Limit max lines in chat"
-msgstr ""
+msgstr "Limitiere max Zeilen im Chat"
#: src/gui/setup_chat.cpp:79
msgid "Logs"
@@ -1772,19 +1778,19 @@ msgstr ""
#: src/gui/setup_chat.cpp:81
msgid "Enable chat Log"
-msgstr ""
+msgstr "Aufzeichnen des Chats einschalten"
#: src/gui/setup_chat.cpp:84
msgid "Show chat history"
-msgstr ""
+msgstr "Zeige Chat-Historie"
#: src/gui/setup_chat.cpp:88
msgid "Messages"
-msgstr ""
+msgstr "Nachrichten"
#: src/gui/setup_chat.cpp:90
msgid "Hide shop messages"
-msgstr ""
+msgstr "Verstecke Laden-Mitteilungen"
#: src/gui/setup_chat.cpp:94
msgid "Tabs"
@@ -1796,23 +1802,23 @@ msgstr "Alle privaten Nachrichten in Tabs öffnen"
#: src/gui/setup_chat.cpp:99
msgid "Log magic messages in debug tab"
-msgstr ""
+msgstr "Aufzeichnen der magischen Nachrichten im \"Debug Tab\""
#: src/gui/setup_chat.cpp:102
msgid "Show server messages in debug tab"
-msgstr ""
+msgstr "Zeige Servermitteilungen im \"Debug Tab\""
#: src/gui/setup_chat.cpp:105
msgid "Enable trade tab"
-msgstr ""
+msgstr "Handel-Tab einschalten"
#: src/gui/setup_chat.cpp:108
msgid "Enable battle tab"
-msgstr ""
+msgstr "Kampf-Tab einschalten"
#: src/gui/setup_chat.cpp:111
msgid "Show battle events"
-msgstr ""
+msgstr "Zeige Kampf-Ereignisse"
#: src/gui/setup_chat.cpp:114
msgid "Resize chat tabs if need"
@@ -1820,15 +1826,23 @@ msgstr ""
#: src/gui/setup_chat.cpp:118
msgid "Time"
-msgstr ""
+msgstr "Zeit"
#: src/gui/setup_chat.cpp:120
msgid "Use local time"
msgstr ""
+#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:157
+msgid "Other"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:125
+msgid "Highlight words (separated by comma)"
+msgstr ""
+
#: src/gui/setup_colors.cpp:49
msgid "This is what the color looks like"
-msgstr "So wird die Farbe aussehen"
+msgstr "So sieht die Farbe aus"
#: src/gui/setup_colors.cpp:75
msgid "Type:"
@@ -1871,13 +1885,13 @@ msgstr "Blau: "
#: src/gui/setup_colors.cpp:314
msgid "Alpha:"
-msgstr ""
+msgstr "Alpha:"
-#: src/gui/setup.cpp:70
+#: src/gui/setup.cpp:71
msgid "Apply"
msgstr "Anwenden"
-#: src/gui/setup.cpp:73
+#: src/gui/setup.cpp:74
msgid "Reset Windows"
msgstr "Fenster zurücksetzen"
@@ -1915,7 +1929,7 @@ msgstr "Zuordnen"
#: src/gui/setup_keyboard.cpp:93
msgid "Unassign"
-msgstr ""
+msgstr "Zurücksetzen"
#: src/gui/setup_keyboard.cpp:97
msgid "Default"
@@ -1923,11 +1937,11 @@ msgstr "Standard"
#: src/gui/setup_keyboard.cpp:133
msgid "Key Conflict(s) Detected."
-msgstr ""
+msgstr "Wiedersprüchliche Tasteneinstellung(en) entdeckt"
#: src/gui/setup_other.cpp:39
msgid "Misc"
-msgstr ""
+msgstr "Sonstiges"
#: src/gui/setup_other.cpp:45 src/gui/userpalette.cpp:125
msgid "Monsters"
@@ -1935,23 +1949,23 @@ msgstr "Monster"
#: src/gui/setup_other.cpp:47
msgid "Show damage inflicted to monsters"
-msgstr ""
+msgstr "Zeige zugefügten Schaden bei Monstern"
#: src/gui/setup_other.cpp:50
msgid "Auto target only reachable monsters"
-msgstr ""
+msgstr "Nur erreichbare Monster automatisch anvisieren"
#: src/gui/setup_other.cpp:53
msgid "Highlight monster attack range"
-msgstr ""
+msgstr "Angriffsbereich vom Monstern anzeigen"
#: src/gui/setup_other.cpp:57
msgid "Show monster hp bar"
-msgstr ""
+msgstr "HP-Balken von Monster anzeigen"
#: src/gui/setup_other.cpp:60
msgid "Cycle monster targets"
-msgstr ""
+msgstr "Angriffsziele der Monster einkreisen"
#: src/gui/setup_other.cpp:66
msgid "Show warps particles"
@@ -1959,15 +1973,15 @@ msgstr ""
#: src/gui/setup_other.cpp:69
msgid "Highlight map portals"
-msgstr ""
+msgstr "Karten Ein- und Ausgänge hervorheben"
#: src/gui/setup_other.cpp:72
msgid "Highlight floor items"
-msgstr ""
+msgstr "Gegenstände auf dem Boden hervorheben"
#: src/gui/setup_other.cpp:75
msgid "Highlight player attack range"
-msgstr ""
+msgstr "Angriffsbereich des Spielers hervorheben"
#: src/gui/setup_other.cpp:78
msgid "Show extended minimaps"
@@ -1975,11 +1989,11 @@ msgstr ""
#: src/gui/setup_other.cpp:81
msgid "Draw path"
-msgstr ""
+msgstr "Zeige Pfad"
#: src/gui/setup_other.cpp:84
msgid "Draw hotkeys on map"
-msgstr ""
+msgstr "Zeige Hotekeys auf der Karte"
#: src/gui/setup_other.cpp:88
msgid "Moving"
@@ -1987,27 +2001,27 @@ msgstr ""
#: src/gui/setup_other.cpp:90
msgid "Auto fix position"
-msgstr ""
+msgstr "Automatischen Berichtigen der Position"
#: src/gui/setup_other.cpp:93
msgid "Attack while moving"
-msgstr ""
+msgstr "Während des Bewegens angreifen"
#: src/gui/setup_other.cpp:96
msgid "Sync player move"
-msgstr ""
+msgstr "Synchronisiere Bewegungen des Spielers"
#: src/gui/setup_other.cpp:99
msgid "Crazy move A program"
-msgstr ""
+msgstr "Verrückte Bewegungen A-Programm"
#: src/gui/setup_other.cpp:103
msgid "Player"
-msgstr ""
+msgstr "Spieler"
#: src/gui/setup_other.cpp:105
msgid "Show own hp bar"
-msgstr ""
+msgstr "Eigenen HP-Balken anzeigen"
#: src/gui/setup_other.cpp:108
msgid "Enable quick stats"
@@ -2015,11 +2029,11 @@ msgstr ""
#: src/gui/setup_other.cpp:111
msgid "Cycle player targets"
-msgstr ""
+msgstr "Angriffsziele des Spielers einkreisen"
#: src/gui/setup_other.cpp:114
msgid "Show job exp messages"
-msgstr ""
+msgstr "Zeige \"job exp\"-Nachrichten"
#: src/gui/setup_other.cpp:117
msgid "Show players popups"
@@ -2031,7 +2045,7 @@ msgstr ""
#: src/gui/setup_other.cpp:123
msgid "Show job"
-msgstr ""
+msgstr "Zeige Job"
#: src/gui/setup_other.cpp:126
msgid "Enable attack filter"
@@ -2043,47 +2057,55 @@ msgstr ""
#: src/gui/setup_other.cpp:135
msgid "Accept sell/buy requests"
-msgstr ""
+msgstr "Verkauf- und Kaufanfragen akzeptieren"
#: src/gui/setup_other.cpp:138
msgid "Enable shop mode"
-msgstr ""
+msgstr "Laden-Modus einschalten"
#: src/gui/setup_other.cpp:144
msgid "Log NPC dialogue"
-msgstr "Protokoliere NPC Gespräche"
+msgstr "Protokolliere NPC Dialoge"
#: src/gui/setup_other.cpp:148
-msgid "Other"
+msgid "Bots support"
msgstr ""
#: src/gui/setup_other.cpp:150
-msgid "Enable server side attack"
+msgid "Enable auction bot support"
msgstr ""
#: src/gui/setup_other.cpp:153
-msgid "Enable bot checker"
+msgid "Enable guild bot support and disable native guild support"
+msgstr ""
+
+#: src/gui/setup_other.cpp:159
+msgid "Enable server side attack"
msgstr ""
-#: src/gui/setup_other.cpp:156
+#: src/gui/setup_other.cpp:162
+msgid "Enable bot checker"
+msgstr "Botprüfer einschalten"
+
+#: src/gui/setup_other.cpp:165
msgid "Enable buggy servers protection"
msgstr ""
-#: src/gui/setup_other.cpp:159
+#: src/gui/setup_other.cpp:168
msgid "Enable debug log"
-msgstr ""
+msgstr "Debug-Protokoll benutzen"
-#: src/gui/setup_other.cpp:162
+#: src/gui/setup_other.cpp:171
msgid "Low traffic mode"
msgstr ""
-#: src/gui/setup_other.cpp:165
+#: src/gui/setup_other.cpp:174
msgid "Hide shield sprite"
msgstr ""
-#: src/gui/setup_other.cpp:168
+#: src/gui/setup_other.cpp:177
msgid "Show background"
-msgstr ""
+msgstr "Zeige Hintergrund"
#: src/gui/setup_perfomance.cpp:48
msgid "Perfomance"
@@ -2143,19 +2165,19 @@ msgstr "Spieler"
#: src/gui/setup_players.cpp:54
msgid "Show gender"
-msgstr ""
+msgstr "Geschlecht anzeigen"
#: src/gui/setup_players.cpp:57
msgid "Show level"
-msgstr ""
+msgstr "Level anzeigen"
#: src/gui/setup_players.cpp:60
msgid "Show own name"
-msgstr ""
+msgstr "Eigenen Namen anzeigen"
#: src/gui/setup_players.cpp:63
msgid "Target dead players"
-msgstr ""
+msgstr "Anvisieren toter Spieler"
#: src/gui/setup_players.cpp:66
msgid "Visible names"
@@ -2175,6 +2197,10 @@ msgstr ""
#: src/gui/setup_players.cpp:78
msgid "Show ip addresses on screenshots"
+msgstr "IP auf Screenshots anzeigen."
+
+#: src/gui/setup_players.cpp:81
+msgid "Allow self heal with mouse click"
msgstr ""
#: src/gui/setup_relations.cpp:65
@@ -2199,7 +2225,7 @@ msgstr "Ignoriert"
#: src/gui/setup_relations.cpp:74
msgid "Erased"
-msgstr ""
+msgstr "Gelöscht"
#: src/gui/setup_relations.cpp:239
msgid "Allow trading"
@@ -2211,7 +2237,7 @@ msgstr "Flüstern erlauben"
#: src/gui/setup_relations.cpp:244
msgid "Old"
-msgstr ""
+msgstr "Alt"
#: src/gui/setup_relations.cpp:246
msgid "Relations"
@@ -2223,47 +2249,47 @@ msgstr "Wenn ignorierend:"
#: src/gui/setup_theme.cpp:107
msgid "Tiny (10)"
-msgstr ""
+msgstr "Winzig"
#: src/gui/setup_theme.cpp:108
msgid "Small (11)"
-msgstr ""
+msgstr "Klein"
#: src/gui/setup_theme.cpp:109
msgid "Medium (12)"
-msgstr ""
+msgstr "Mittel"
#: src/gui/setup_theme.cpp:110
msgid "Large (13)"
-msgstr ""
+msgstr "Groß"
#: src/gui/setup_theme.cpp:111
msgid "Big (14)"
-msgstr ""
+msgstr "Sehr groß"
#: src/gui/setup_theme.cpp:112
msgid "Huge (15)"
-msgstr ""
+msgstr "Riesig"
#: src/gui/setup_theme.cpp:143
msgid "Theme"
-msgstr ""
+msgstr "Theme"
#: src/gui/setup_theme.cpp:145
msgid "Gui theme"
-msgstr ""
+msgstr "GUI Theme"
#: src/gui/setup_theme.cpp:146
msgid "Main Font"
-msgstr ""
+msgstr "Hauptschriftart"
#: src/gui/setup_theme.cpp:147
msgid "Bold font"
-msgstr ""
+msgstr "Dicke Schrift"
#: src/gui/setup_theme.cpp:148
msgid "Particle font"
-msgstr ""
+msgstr "Schrift von Spieleraktionen"
#: src/gui/setup_theme.cpp:149
msgid "Help font"
@@ -2283,7 +2309,7 @@ msgstr "Schriftgröße"
#: src/gui/setup_theme.cpp:299
msgid "Theme Changed"
-msgstr ""
+msgstr "Theme geändert"
#: src/gui/setup_theme.cpp:300 src/gui/setup_video.cpp:619
#: src/gui/setup_video.cpp:624
@@ -2292,15 +2318,15 @@ msgstr "Starte das Spiel neu um die Änderungen zu übernehmen."
#: src/gui/setup_video.cpp:194
msgid "Software"
-msgstr ""
+msgstr "Software"
#: src/gui/setup_video.cpp:195
msgid "Fast OpenGL"
-msgstr ""
+msgstr "Schnelles OpenGL"
#: src/gui/setup_video.cpp:196
msgid "Safe OpenGL"
-msgstr ""
+msgstr "Sicheres OpenGL"
#: src/gui/setup_video.cpp:223
msgid "No text"
@@ -2366,12 +2392,12 @@ msgstr "als Partikeleffekt"
#: src/gui/setup_video.cpp:302
msgid "FPS limit:"
-msgstr ""
+msgstr "FPS Limit:"
#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709
msgid "Alt FPS limit: "
-msgstr ""
+msgstr "Alt FPS Limit:"
#: src/gui/setup_video.cpp:315
msgid "Video"
@@ -2391,27 +2417,31 @@ msgstr "Hintergrundeffekte"
#: src/gui/setup_video.cpp:324
msgid "Particle detail"
-msgstr ""
+msgstr "Partikeldetail"
#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
#: src/gui/setup_video.cpp:707
msgid "None"
-msgstr ""
+msgstr "Kein(e)"
#: src/gui/setup_video.cpp:484
msgid ""
"Failed to switch to windowed mode and restoration of old mode also failed!"
msgstr ""
+"Das Wechseln in den Fenstermodus sowie das Wiederherstellen der vorherigen "
+"Auflösung schlug fehl."
#: src/gui/setup_video.cpp:490
msgid ""
"Failed to switch to fullscreen mode and restoration of old mode also failed!"
msgstr ""
+"Das Wechseln in den Vollbildmodus sowie das Wiederherstellen der vorherigen "
+"Auflösung schlug fehl."
#: src/gui/setup_video.cpp:501
msgid "Switching to Full Screen"
-msgstr ""
+msgstr "Wechsle zum Vollbildmodus"
#: src/gui/setup_video.cpp:502
msgid "Restart needed for changes to take effect."
@@ -2429,15 +2459,15 @@ msgstr ""
#: src/gui/setup_video.cpp:602
msgid "Custom resolution (example: 1024x768)"
-msgstr ""
+msgstr "Benutzerdefinierte Auflösung (zum Beispiel: 1024x768)"
#: src/gui/setup_video.cpp:603
msgid "Enter new resolution: "
-msgstr ""
+msgstr "Neue Auflösung eingeben:"
#: src/gui/setup_video.cpp:618 src/gui/setup_video.cpp:623
msgid "Screen Resolution Changed"
-msgstr ""
+msgstr "Bildschirmauflösung wurde geändert"
#: src/gui/setup_video.cpp:621
msgid "Some windows may be moved to fit the lowered resolution."
@@ -2453,718 +2483,723 @@ msgstr ""
msgid "Changes will take effect on map change."
msgstr "Änderung werden beim nächsten Kartenwechsel übernommen."
-#: src/gui/shopwindow.cpp:74
+#: src/gui/shopwindow.cpp:75
msgid "Personal Shop"
-msgstr ""
+msgstr "Persönlicher Laden"
-#: src/gui/shopwindow.cpp:116
+#: src/gui/shopwindow.cpp:118
msgid "Buy items"
-msgstr ""
+msgstr "Kaufe Dinge"
-#: src/gui/shopwindow.cpp:117
+#: src/gui/shopwindow.cpp:119
msgid "Sell items"
-msgstr ""
+msgstr "Verkaufe Dinge"
-#: src/gui/shopwindow.cpp:119 src/gui/shopwindow.cpp:122
-#: src/gui/tradewindow.cpp:88
+#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
+#: src/gui/tradewindow.cpp:89
msgid "Add"
msgstr "Hinzufügen"
-#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
+#: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
msgid "Announce"
-msgstr ""
+msgstr "Teile mit"
-#: src/gui/shopwindow.cpp:125
+#: src/gui/shopwindow.cpp:127
msgid "Show links in announce"
msgstr ""
-#: src/gui/shopwindow.cpp:723 src/net/ea/tradehandler.cpp:106
+#: src/gui/shopwindow.cpp:148 src/gui/shopwindow.cpp:149
+msgid "Auction"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:748 src/net/ea/tradehandler.cpp:106
#: src/net/manaserv/tradehandler.cpp:127
msgid "Request for Trade"
msgstr "Erbitte einen Handel"
-#: src/gui/shopwindow.cpp:724
+#: src/gui/shopwindow.cpp:749
#, c-format
msgid "%s wants to %s %s do you accept?"
-msgstr ""
+msgstr "%s möchte %s %s akzeptierst du?"
-#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:81
+#: src/gui/skilldialog.cpp:276 src/gui/windowmenu.cpp:81
msgid "Skills"
-msgstr "Fertigkeiten"
+msgstr "Fähigkeiten"
-#: src/gui/skilldialog.cpp:283
+#: src/gui/skilldialog.cpp:288
msgid "Up"
msgstr "Erhöhen"
-#: src/gui/skilldialog.cpp:336
+#: src/gui/skilldialog.cpp:341
#, c-format
msgid "Skill points available: %d"
-msgstr ""
+msgstr "Fähigkeitspunkte verfügbar: %d"
-#: src/gui/skilldialog.cpp:413
+#: src/gui/skilldialog.cpp:418
#, c-format
msgid "Skill Set %d"
msgstr ""
-#: src/gui/skilldialog.cpp:425
+#: src/gui/skilldialog.cpp:430
#, c-format
msgid "Skill %d"
msgstr ""
-#: src/gui/skilldialog.cpp:492 src/gui/skilldialog.cpp:545
+#: src/gui/skilldialog.cpp:497 src/gui/skilldialog.cpp:550
#, c-format
msgid "Lvl: %d"
-msgstr ""
+msgstr "Lvl: %d"
-#: src/gui/skilldialog.cpp:537
+#: src/gui/skilldialog.cpp:542
#, c-format
msgid "Lvl: %d (%+d)"
msgstr ""
-#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
+#: src/gui/socialwindow.cpp:118 src/gui/socialwindow.cpp:216
+#: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52
msgid "Guild"
msgstr "Gilde"
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:147
#, c-format
msgid "Invited user %s to guild %s."
-msgstr ""
+msgstr "%s in die Gilde %s einladen."
-#: src/gui/socialwindow.cpp:160
+#: src/gui/socialwindow.cpp:161
#, c-format
msgid "Guild %s quit requested."
msgstr ""
-#: src/gui/socialwindow.cpp:187
+#: src/gui/socialwindow.cpp:188
msgid "Member Invite to Guild"
msgstr ""
-#: src/gui/socialwindow.cpp:188
+#: src/gui/socialwindow.cpp:189
#, c-format
msgid "Who would you like to invite to guild %s?"
-msgstr ""
+msgstr "Wenn willst du in die Gilde %s einladen?"
-#: src/gui/socialwindow.cpp:197
+#: src/gui/socialwindow.cpp:198
msgid "Leave Guild?"
-msgstr ""
+msgstr "Guilde verlassen?"
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:199
#, c-format
msgid "Are you sure you want to leave guild %s?"
-msgstr ""
+msgstr "Bist du sicher, dass du die Gilde %s verlassen willst?"
-#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:319 src/net/ea/gui/partytab.cpp:50
msgid "Party"
msgstr "Party"
-#: src/gui/socialwindow.cpp:243
+#: src/gui/socialwindow.cpp:347
#, c-format
msgid "Invited user %s to party."
-msgstr ""
+msgstr "%s zur Party einladen."
-#: src/gui/socialwindow.cpp:257
+#: src/gui/socialwindow.cpp:361
#, c-format
msgid "Party %s quit requested."
msgstr "Partie %s Auflösung beauftragt."
-#: src/gui/socialwindow.cpp:284
+#: src/gui/socialwindow.cpp:388
msgid "Member Invite to Party"
msgstr ""
-#: src/gui/socialwindow.cpp:285
+#: src/gui/socialwindow.cpp:389
#, c-format
msgid "Who would you like to invite to party %s?"
-msgstr ""
+msgstr "Wenn willst du zur Party %s einladen?"
-#: src/gui/socialwindow.cpp:294
+#: src/gui/socialwindow.cpp:398
msgid "Leave Party?"
msgstr "Partie verlassen?"
-#: src/gui/socialwindow.cpp:295
+#: src/gui/socialwindow.cpp:399
#, c-format
msgid "Are you sure you want to leave party %s?"
-msgstr ""
+msgstr "Bist du sicher, dass du die Party %s verlassen willst?"
-#: src/gui/socialwindow.cpp:521
+#: src/gui/socialwindow.cpp:625
msgid "Nav"
msgstr ""
-#: src/gui/socialwindow.cpp:799
+#: src/gui/socialwindow.cpp:903
msgid "Atk"
msgstr ""
-#: src/gui/socialwindow.cpp:840
+#: src/gui/socialwindow.cpp:944
msgid "Priority mobs"
msgstr ""
-#: src/gui/socialwindow.cpp:872
+#: src/gui/socialwindow.cpp:976
msgid "Attack mobs"
msgstr ""
-#: src/gui/socialwindow.cpp:907
+#: src/gui/socialwindow.cpp:1011
msgid "Ignore mobs"
msgstr ""
-#: src/gui/socialwindow.cpp:970
+#: src/gui/socialwindow.cpp:1074
msgid "Create Guild"
msgstr "Gilde erstellen"
-#: src/gui/socialwindow.cpp:971 src/gui/socialwindow.cpp:1387
+#: src/gui/socialwindow.cpp:1075 src/gui/socialwindow.cpp:1503
msgid "Create Party"
-msgstr ""
+msgstr "Party erstellen"
-#: src/gui/socialwindow.cpp:1013 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1117 src/gui/windowmenu.cpp:93
msgid "Social"
-msgstr ""
+msgstr "Sozial"
-#: src/gui/socialwindow.cpp:1034
+#: src/gui/socialwindow.cpp:1140
msgid "Invite"
-msgstr ""
+msgstr "Einladen"
-#: src/gui/socialwindow.cpp:1176
+#: src/gui/socialwindow.cpp:1286
#, c-format
msgid "Accepted party invite from %s."
-msgstr ""
+msgstr "Partyeinladung von %s angenommen."
-#: src/gui/socialwindow.cpp:1186
+#: src/gui/socialwindow.cpp:1296
#, c-format
msgid "Rejected party invite from %s."
-msgstr ""
+msgstr "Partyeinladung von %s abgelehnt."
-#: src/gui/socialwindow.cpp:1203
+#: src/gui/socialwindow.cpp:1313
#, c-format
msgid "Accepted guild invite from %s."
-msgstr ""
+msgstr "Guildeneinladung von %s angenommen."
-#: src/gui/socialwindow.cpp:1213
+#: src/gui/socialwindow.cpp:1326
#, c-format
msgid "Rejected guild invite from %s."
-msgstr ""
+msgstr "Guildeneinladung von %s abgelehnt."
-#: src/gui/socialwindow.cpp:1257
+#: src/gui/socialwindow.cpp:1373
#, c-format
msgid "Creating guild called %s."
msgstr "Erstelle der Gilde %s."
-#: src/gui/socialwindow.cpp:1280
+#: src/gui/socialwindow.cpp:1396
#, c-format
msgid "Creating party called %s."
-msgstr ""
+msgstr "Erstelle die Party \"%s\""
-#: src/gui/socialwindow.cpp:1294
+#: src/gui/socialwindow.cpp:1410
msgid "Guild Name"
msgstr "Gildenname"
-#: src/gui/socialwindow.cpp:1295
+#: src/gui/socialwindow.cpp:1411
msgid "Choose your guild's name."
msgstr "Wähle den Namen deiner Gilde"
-#: src/gui/socialwindow.cpp:1309
+#: src/gui/socialwindow.cpp:1425
msgid "Received guild request, but one already exists."
msgstr ""
-#: src/gui/socialwindow.cpp:1315
+#: src/gui/socialwindow.cpp:1431
#, c-format
msgid "%s has invited you to join the guild %s."
msgstr "%s hat dich eingeladen, seiner Gilde %s beizutreten."
-#: src/gui/socialwindow.cpp:1321
+#: src/gui/socialwindow.cpp:1437
msgid "Accept Guild Invite"
msgstr "Nehme Gildeneinladung an"
-#: src/gui/socialwindow.cpp:1336
+#: src/gui/socialwindow.cpp:1452
msgid "Received party request, but one already exists."
msgstr "Anfrage für eine Party erhalten, aber du bist bereits in einer Party."
-#: src/gui/socialwindow.cpp:1347
+#: src/gui/socialwindow.cpp:1463
msgid "You have been invited you to join a party."
-msgstr ""
+msgstr "Du wurdest zu einer Party eingeladen."
-#: src/gui/socialwindow.cpp:1351
+#: src/gui/socialwindow.cpp:1467
#, c-format
msgid "You have been invited to join the %s party."
-msgstr ""
+msgstr "Du wurdest zu der Party %s eingeladen."
-#: src/gui/socialwindow.cpp:1359
+#: src/gui/socialwindow.cpp:1475
#, c-format
msgid "%s has invited you to join their party."
msgstr "%s hat dich in seine Party eingeladen."
-#: src/gui/socialwindow.cpp:1364
+#: src/gui/socialwindow.cpp:1480
#, c-format
msgid "%s has invited you to join the %s party."
msgstr "%s hat dich eingeladen, an der Party %s teilzunehmen."
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1489
msgid "Accept Party Invite"
msgstr "Nehme Partyeinladung an"
-#: src/gui/socialwindow.cpp:1388
+#: src/gui/socialwindow.cpp:1504
msgid "Cannot create party. You are already in a party"
msgstr "Konnte keine Partie erstellen. Du bist schon in einer Partie."
-#: src/gui/socialwindow.cpp:1393
+#: src/gui/socialwindow.cpp:1509
msgid "Party Name"
-msgstr ""
+msgstr "Partyname"
-#: src/gui/socialwindow.cpp:1394
+#: src/gui/socialwindow.cpp:1510
msgid "Choose your party's name."
-msgstr ""
+msgstr "Name deiner Party wählen."
#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:88
msgid "Specials"
msgstr "Special"
-#: src/gui/statuspopup.cpp:197
+#: src/gui/statuspopup.cpp:198
msgid "(D) default moves"
msgstr ""
-#: src/gui/statuspopup.cpp:202
+#: src/gui/statuspopup.cpp:203
msgid "(I) invert moves"
msgstr ""
-#: src/gui/statuspopup.cpp:207
+#: src/gui/statuspopup.cpp:208
msgid "(c) moves with some crazy moves"
msgstr ""
-#: src/gui/statuspopup.cpp:212
+#: src/gui/statuspopup.cpp:213
msgid "(C) moves with crazy moves"
msgstr ""
-#: src/gui/statuspopup.cpp:217
+#: src/gui/statuspopup.cpp:218
msgid "(d) double normal + crazy"
msgstr ""
-#: src/gui/statuspopup.cpp:222
+#: src/gui/statuspopup.cpp:223
msgid "(?) move"
msgstr ""
-#: src/gui/statuspopup.cpp:240
+#: src/gui/statuspopup.cpp:241
msgid "(a) custom crazy move"
msgstr ""
-#: src/gui/statuspopup.cpp:244
+#: src/gui/statuspopup.cpp:245
msgid "(?) crazy move"
msgstr ""
-#: src/gui/statuspopup.cpp:254
+#: src/gui/statuspopup.cpp:255
msgid "(0) default moves to target"
msgstr ""
-#: src/gui/statuspopup.cpp:259
+#: src/gui/statuspopup.cpp:260
msgid "(1) moves to target in distance 1"
msgstr ""
-#: src/gui/statuspopup.cpp:264
+#: src/gui/statuspopup.cpp:265
msgid "(2) moves to target in distance 2"
msgstr ""
-#: src/gui/statuspopup.cpp:269
+#: src/gui/statuspopup.cpp:270
msgid "(3) moves to target in distance 3"
msgstr ""
-#: src/gui/statuspopup.cpp:274
+#: src/gui/statuspopup.cpp:275
msgid "(5) moves to target in distance 5"
msgstr ""
-#: src/gui/statuspopup.cpp:279
+#: src/gui/statuspopup.cpp:280
msgid "(7) moves to target in distance 7"
msgstr ""
-#: src/gui/statuspopup.cpp:284
+#: src/gui/statuspopup.cpp:285
msgid "(A) moves to target in attack range"
msgstr ""
-#: src/gui/statuspopup.cpp:289
+#: src/gui/statuspopup.cpp:290
msgid "(?) move to target"
msgstr ""
-#: src/gui/statuspopup.cpp:297
+#: src/gui/statuspopup.cpp:298
msgid "(D) default follow"
msgstr ""
-#: src/gui/statuspopup.cpp:301
+#: src/gui/statuspopup.cpp:302
msgid "(R) relative follow"
msgstr ""
-#: src/gui/statuspopup.cpp:305
+#: src/gui/statuspopup.cpp:306
msgid "(M) mirror follow"
msgstr ""
-#: src/gui/statuspopup.cpp:309
+#: src/gui/statuspopup.cpp:310
msgid "(P) pet follow"
msgstr ""
-#: src/gui/statuspopup.cpp:313
+#: src/gui/statuspopup.cpp:314
msgid "(?) unknown follow"
msgstr ""
-#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
+#: src/gui/statuspopup.cpp:323 src/gui/statuspopup.cpp:346
msgid "(D) default attack"
msgstr ""
-#: src/gui/statuspopup.cpp:327
+#: src/gui/statuspopup.cpp:328
msgid "(s) switch attack without shield"
msgstr ""
-#: src/gui/statuspopup.cpp:332
+#: src/gui/statuspopup.cpp:333
msgid "(S) switch attack with shield"
msgstr ""
-#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
+#: src/gui/statuspopup.cpp:337 src/gui/statuspopup.cpp:362
msgid "(?) attack"
msgstr ""
-#: src/gui/statuspopup.cpp:349
+#: src/gui/statuspopup.cpp:350
msgid "(G) go and attack"
msgstr ""
-#: src/gui/statuspopup.cpp:353
+#: src/gui/statuspopup.cpp:354
msgid "(A) go, attack, pickup"
msgstr ""
-#: src/gui/statuspopup.cpp:357
+#: src/gui/statuspopup.cpp:358
msgid "(d) without auto attack"
msgstr ""
-#: src/gui/statuspopup.cpp:375
+#: src/gui/statuspopup.cpp:376
msgid "(S) small pick up 1x1 cells"
msgstr ""
-#: src/gui/statuspopup.cpp:379
+#: src/gui/statuspopup.cpp:380
msgid "(D) default pick up 2x1 cells"
msgstr ""
-#: src/gui/statuspopup.cpp:383
+#: src/gui/statuspopup.cpp:384
msgid "(F) forward pick up 2x3 cells"
msgstr ""
-#: src/gui/statuspopup.cpp:387
+#: src/gui/statuspopup.cpp:388
msgid "(3) pick up 3x3 cells"
msgstr ""
-#: src/gui/statuspopup.cpp:391
+#: src/gui/statuspopup.cpp:392
msgid "(g) go and pick up in distance 4"
msgstr ""
-#: src/gui/statuspopup.cpp:395
+#: src/gui/statuspopup.cpp:396
msgid "(G) go and pick up in distance 8"
msgstr ""
-#: src/gui/statuspopup.cpp:399
+#: src/gui/statuspopup.cpp:400
msgid "(A) go and pick up in max distance"
msgstr ""
-#: src/gui/statuspopup.cpp:403
+#: src/gui/statuspopup.cpp:404
msgid "(?) pick up"
msgstr ""
-#: src/gui/statuspopup.cpp:412
+#: src/gui/statuspopup.cpp:413
msgid "(N) normal map view"
msgstr ""
-#: src/gui/statuspopup.cpp:416
+#: src/gui/statuspopup.cpp:417
msgid "(D) debug map view"
msgstr ""
-#: src/gui/statuspopup.cpp:420
+#: src/gui/statuspopup.cpp:421
msgid "(u) ultra map view"
msgstr ""
-#: src/gui/statuspopup.cpp:424
+#: src/gui/statuspopup.cpp:425
msgid "(U) ultra map view 2"
msgstr ""
-#: src/gui/statuspopup.cpp:428
+#: src/gui/statuspopup.cpp:429
msgid "(e) empty map view"
msgstr ""
-#: src/gui/statuspopup.cpp:432
+#: src/gui/statuspopup.cpp:433
msgid "(b) black & white map view"
msgstr ""
-#: src/gui/statuspopup.cpp:436
+#: src/gui/statuspopup.cpp:437
msgid "(?) map view"
msgstr ""
-#: src/gui/statuspopup.cpp:444
+#: src/gui/statuspopup.cpp:445
msgid "(f) use #flar for magic attack"
msgstr ""
-#: src/gui/statuspopup.cpp:449
+#: src/gui/statuspopup.cpp:450
msgid "(c) use #chiza for magic attack"
msgstr ""
-#: src/gui/statuspopup.cpp:454
+#: src/gui/statuspopup.cpp:455
msgid "(I) use #ingrav for magic attack"
msgstr ""
-#: src/gui/statuspopup.cpp:459
+#: src/gui/statuspopup.cpp:460
msgid "(F) use #frillyar for magic attack"
msgstr ""
-#: src/gui/statuspopup.cpp:464
+#: src/gui/statuspopup.cpp:465
msgid "(U) use #upmarmu for magic attack"
msgstr ""
-#: src/gui/statuspopup.cpp:468
+#: src/gui/statuspopup.cpp:469
msgid "(?) magic attack"
msgstr ""
-#: src/gui/statuspopup.cpp:477
+#: src/gui/statuspopup.cpp:478
msgid "(D) default imitation"
msgstr ""
-#: src/gui/statuspopup.cpp:481
+#: src/gui/statuspopup.cpp:482
msgid "(O) outfits imitation"
msgstr ""
-#: src/gui/statuspopup.cpp:485
+#: src/gui/statuspopup.cpp:486
msgid "(?) imitation"
msgstr ""
-#: src/gui/statuspopup.cpp:494
+#: src/gui/statuspopup.cpp:495
msgid "(O) on keyboard"
msgstr ""
-#: src/gui/statuspopup.cpp:497
+#: src/gui/statuspopup.cpp:498
msgid "(A) away"
msgstr ""
-#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
+#: src/gui/statuspopup.cpp:501 src/gui/statuspopup.cpp:521
msgid "(?) away"
msgstr ""
-#: src/gui/statuspopup.cpp:508
+#: src/gui/statuspopup.cpp:509
msgid "(G) game camera mode"
msgstr ""
-#: src/gui/statuspopup.cpp:512
+#: src/gui/statuspopup.cpp:513
msgid "(F) free camera mode"
msgstr ""
-#: src/gui/statuspopup.cpp:516
+#: src/gui/statuspopup.cpp:517
msgid "(D) design camera mode"
msgstr ""
-#: src/gui/statuspopup.cpp:527
+#: src/gui/statuspopup.cpp:528
msgid "Game modifiers are disabled"
msgstr ""
-#: src/gui/statuspopup.cpp:532
+#: src/gui/statuspopup.cpp:533
msgid "Game modifiers are enabled"
msgstr ""
-#: src/gui/statuswindow.cpp:142 src/gui/statuswindow.cpp:272
-#: src/gui/statuswindow.cpp:335
+#: src/gui/statuswindow.cpp:143 src/gui/statuswindow.cpp:273
+#: src/gui/statuswindow.cpp:336
#, c-format
msgid "Level: %d"
msgstr "Stufe: %d"
-#: src/gui/statuswindow.cpp:143 src/gui/statuswindow.cpp:258
-#: src/gui/statuswindow.cpp:302
+#: src/gui/statuswindow.cpp:144 src/gui/statuswindow.cpp:259
+#: src/gui/statuswindow.cpp:303
#, c-format
msgid "Money: %s"
msgstr "Geld: %s"
-#: src/gui/statuswindow.cpp:149
+#: src/gui/statuswindow.cpp:150
msgid "HP:"
msgstr "HP:"
-#: src/gui/statuswindow.cpp:156
+#: src/gui/statuswindow.cpp:157
msgid "Exp:"
msgstr "Exp:"
-#: src/gui/statuswindow.cpp:170
+#: src/gui/statuswindow.cpp:171
msgid "MP:"
msgstr "MP:"
-#: src/gui/statuswindow.cpp:202 src/gui/statuswindow.cpp:385
+#: src/gui/statuswindow.cpp:203 src/gui/statuswindow.cpp:386
#, c-format
msgid "Job: %d"
msgstr "Job: %d"
-#: src/gui/statuswindow.cpp:203
+#: src/gui/statuswindow.cpp:204
msgid "Job:"
msgstr "Job:"
-#: src/gui/statuswindow.cpp:261 src/gui/statuswindow.cpp:309
+#: src/gui/statuswindow.cpp:262 src/gui/statuswindow.cpp:310
#, c-format
msgid "Character points: %d"
msgstr ""
-#: src/gui/statuswindow.cpp:267
+#: src/gui/statuswindow.cpp:268
#, c-format
msgid "Level: %d (GM %d)"
-msgstr ""
+msgstr "Level: %d (GM %d)"
-#: src/gui/statuswindow.cpp:323
+#: src/gui/statuswindow.cpp:324
#, c-format
msgid "Correction points: %d"
msgstr ""
-#: src/gui/statuswindow.cpp:646 src/gui/statuswindow.cpp:711
-#: src/gui/statuswindow.cpp:731 src/gui/statuswindow.cpp:747
-#: src/gui/statuswindow.cpp:793 src/gui/statuswindow.cpp:822
-#: src/gui/statuswindow.cpp:845 src/gui/statuswindow.cpp:864
+#: src/gui/statuswindow.cpp:647 src/gui/statuswindow.cpp:712
+#: src/gui/statuswindow.cpp:732 src/gui/statuswindow.cpp:748
+#: src/gui/statuswindow.cpp:794 src/gui/statuswindow.cpp:823
+#: src/gui/statuswindow.cpp:846 src/gui/statuswindow.cpp:865
msgid "(D)"
msgstr ""
-#: src/gui/statuswindow.cpp:649 src/gui/statuswindow.cpp:772
+#: src/gui/statuswindow.cpp:650 src/gui/statuswindow.cpp:773
msgid "(I)"
msgstr ""
-#: src/gui/statuswindow.cpp:652 src/gui/statuswindow.cpp:769
+#: src/gui/statuswindow.cpp:653 src/gui/statuswindow.cpp:770
msgid "(c)"
msgstr ""
-#: src/gui/statuswindow.cpp:655
+#: src/gui/statuswindow.cpp:656
msgid "(C)"
msgstr ""
-#: src/gui/statuswindow.cpp:658 src/gui/statuswindow.cpp:756
+#: src/gui/statuswindow.cpp:659 src/gui/statuswindow.cpp:757
msgid "(d)"
msgstr ""
-#: src/gui/statuswindow.cpp:661 src/gui/statuswindow.cpp:675
-#: src/gui/statuswindow.cpp:704 src/gui/statuswindow.cpp:723
-#: src/gui/statuswindow.cpp:740 src/gui/statuswindow.cpp:759
-#: src/gui/statuswindow.cpp:781 src/gui/statuswindow.cpp:811
-#: src/gui/statuswindow.cpp:837 src/gui/statuswindow.cpp:851
-#: src/gui/statuswindow.cpp:867 src/gui/statuswindow.cpp:880
+#: src/gui/statuswindow.cpp:662 src/gui/statuswindow.cpp:676
+#: src/gui/statuswindow.cpp:705 src/gui/statuswindow.cpp:724
+#: src/gui/statuswindow.cpp:741 src/gui/statuswindow.cpp:760
+#: src/gui/statuswindow.cpp:782 src/gui/statuswindow.cpp:812
+#: src/gui/statuswindow.cpp:838 src/gui/statuswindow.cpp:852
+#: src/gui/statuswindow.cpp:868 src/gui/statuswindow.cpp:881
msgid "(?)"
msgstr ""
-#: src/gui/statuswindow.cpp:672
+#: src/gui/statuswindow.cpp:673
msgid "(a)"
msgstr ""
-#: src/gui/statuswindow.cpp:683
+#: src/gui/statuswindow.cpp:684
msgid "(0)"
msgstr ""
-#: src/gui/statuswindow.cpp:686
+#: src/gui/statuswindow.cpp:687
msgid "(1)"
msgstr ""
-#: src/gui/statuswindow.cpp:689
+#: src/gui/statuswindow.cpp:690
msgid "(2)"
msgstr ""
-#: src/gui/statuswindow.cpp:692 src/gui/statuswindow.cpp:799
+#: src/gui/statuswindow.cpp:693 src/gui/statuswindow.cpp:800
msgid "(3)"
msgstr ""
-#: src/gui/statuswindow.cpp:695
+#: src/gui/statuswindow.cpp:696
msgid "(5)"
msgstr ""
-#: src/gui/statuswindow.cpp:698
+#: src/gui/statuswindow.cpp:699
msgid "(7)"
msgstr ""
-#: src/gui/statuswindow.cpp:701 src/gui/statuswindow.cpp:753
-#: src/gui/statuswindow.cpp:808 src/gui/statuswindow.cpp:877
+#: src/gui/statuswindow.cpp:702 src/gui/statuswindow.cpp:754
+#: src/gui/statuswindow.cpp:809 src/gui/statuswindow.cpp:878
msgid "(A)"
msgstr ""
-#: src/gui/statuswindow.cpp:714
+#: src/gui/statuswindow.cpp:715
msgid "(R)"
msgstr ""
-#: src/gui/statuswindow.cpp:717
+#: src/gui/statuswindow.cpp:718
msgid "(M)"
msgstr ""
-#: src/gui/statuswindow.cpp:720
+#: src/gui/statuswindow.cpp:721
msgid "(P)"
msgstr ""
-#: src/gui/statuswindow.cpp:734
+#: src/gui/statuswindow.cpp:735
msgid "(s)"
msgstr ""
-#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:790
+#: src/gui/statuswindow.cpp:738 src/gui/statuswindow.cpp:791
msgid "(S)"
msgstr ""
-#: src/gui/statuswindow.cpp:750 src/gui/statuswindow.cpp:805
-#: src/gui/statuswindow.cpp:858
+#: src/gui/statuswindow.cpp:751 src/gui/statuswindow.cpp:806
+#: src/gui/statuswindow.cpp:859
msgid "(G)"
msgstr ""
-#: src/gui/statuswindow.cpp:766
+#: src/gui/statuswindow.cpp:767
msgid "(f)"
msgstr ""
-#: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:796
-#: src/gui/statuswindow.cpp:861
+#: src/gui/statuswindow.cpp:776 src/gui/statuswindow.cpp:797
+#: src/gui/statuswindow.cpp:862
msgid "(F)"
msgstr ""
-#: src/gui/statuswindow.cpp:778 src/gui/statuswindow.cpp:828
+#: src/gui/statuswindow.cpp:779 src/gui/statuswindow.cpp:829
msgid "(U)"
msgstr ""
-#: src/gui/statuswindow.cpp:802
+#: src/gui/statuswindow.cpp:803
msgid "(g)"
msgstr ""
-#: src/gui/statuswindow.cpp:819
+#: src/gui/statuswindow.cpp:820
msgid "(N)"
msgstr ""
-#: src/gui/statuswindow.cpp:825
+#: src/gui/statuswindow.cpp:826
msgid "(u)"
msgstr ""
-#: src/gui/statuswindow.cpp:831
+#: src/gui/statuswindow.cpp:832
msgid "(e)"
msgstr ""
-#: src/gui/statuswindow.cpp:834
+#: src/gui/statuswindow.cpp:835
msgid "(b)"
msgstr ""
-#: src/gui/statuswindow.cpp:848 src/gui/statuswindow.cpp:874
+#: src/gui/statuswindow.cpp:849 src/gui/statuswindow.cpp:875
msgid "(O)"
msgstr ""
#: src/gui/textcommandeditor.cpp:113
msgid "No Target"
-msgstr ""
+msgstr "Kein Ziel"
#: src/gui/textcommandeditor.cpp:114
msgid "Allow Target"
-msgstr ""
+msgstr "Ziel erlauben"
#: src/gui/textcommandeditor.cpp:115
msgid "Need Target"
-msgstr ""
+msgstr "Brauche Ziel"
#: src/gui/textcommandeditor.cpp:120
msgid "General Magic"
-msgstr ""
+msgstr "Generelle Magie"
#: src/gui/textcommandeditor.cpp:121
msgid "Life Magic"
-msgstr ""
+msgstr "Lebensmagie"
#: src/gui/textcommandeditor.cpp:122
msgid "War Magic"
-msgstr ""
+msgstr "Kriegsmagie"
#: src/gui/textcommandeditor.cpp:123
msgid "Transmute Magic"
-msgstr ""
+msgstr "Verwandlungsmagie"
#: src/gui/textcommandeditor.cpp:124
msgid "Nature Magic"
-msgstr ""
+msgstr "Naturmagie"
#: src/gui/textcommandeditor.cpp:125
msgid "Astral Magic"
-msgstr ""
+msgstr "Astralmagie"
#: src/gui/textcommandeditor.cpp:168
msgid "Command Editor"
@@ -3172,7 +3207,7 @@ msgstr ""
#: src/gui/textcommandeditor.cpp:185
msgid "magic"
-msgstr ""
+msgstr "magisch"
#: src/gui/textcommandeditor.cpp:189
msgid "other"
@@ -3180,15 +3215,15 @@ msgstr "andere"
#: src/gui/textcommandeditor.cpp:194
msgid "Symbol:"
-msgstr ""
+msgstr "Symbol:"
#: src/gui/textcommandeditor.cpp:197
msgid "Command:"
-msgstr ""
+msgstr "Befehl:"
#: src/gui/textcommandeditor.cpp:200
msgid "Mana:"
-msgstr ""
+msgstr "Mana:"
#: src/gui/textcommandeditor.cpp:206
msgid "Target Type:"
@@ -3196,15 +3231,15 @@ msgstr ""
#: src/gui/textcommandeditor.cpp:212
msgid "Icon:"
-msgstr ""
+msgstr "Icon:"
#: src/gui/textcommandeditor.cpp:218
msgid "Magic level:"
-msgstr ""
+msgstr "Magielevel:"
#: src/gui/textcommandeditor.cpp:224
msgid "Magic School:"
-msgstr ""
+msgstr "Magieschule:"
#: src/gui/textcommandeditor.cpp:230
msgid "School level:"
@@ -3212,7 +3247,7 @@ msgstr ""
#: src/gui/textcommandeditor.cpp:235
msgid "Save"
-msgstr ""
+msgstr "Speichern"
#: src/gui/tradewindow.cpp:60
msgid "Propose trade"
@@ -3234,24 +3269,24 @@ msgstr "Zugestimmt. Warten..."
msgid "Trade: You"
msgstr "Handel: Du"
-#: src/gui/tradewindow.cpp:110 src/gui/tradewindow.cpp:166
+#: src/gui/tradewindow.cpp:111 src/gui/tradewindow.cpp:167
#, c-format
msgid "You get %s"
msgstr ""
-#: src/gui/tradewindow.cpp:111
+#: src/gui/tradewindow.cpp:112
msgid "You give:"
msgstr "Du gibst:"
-#: src/gui/tradewindow.cpp:115
+#: src/gui/tradewindow.cpp:116
msgid "Change"
msgstr "Ändern"
-#: src/gui/tradewindow.cpp:374
+#: src/gui/tradewindow.cpp:375
msgid "You don't have enough money."
msgstr "Du hast nicht genügend Geld."
-#: src/gui/tradewindow.cpp:453
+#: src/gui/tradewindow.cpp:454
msgid "Failed adding item. You can not overlap one kind of item on the window."
msgstr ""
"Gegenstand konnte nicht hinzugefügt werden. Du kannst keinen weiteren dieser "
@@ -3262,33 +3297,33 @@ msgstr ""
msgid "Name: %s"
msgstr "Name : %s"
-#: src/gui/updaterwindow.cpp:136
+#: src/gui/updaterwindow.cpp:138
msgid "Updating..."
msgstr "Aktualisiere..."
-#: src/gui/updaterwindow.cpp:155
+#: src/gui/updaterwindow.cpp:159
msgid "Connecting..."
msgstr "Verbinde..."
-#: src/gui/updaterwindow.cpp:158
+#: src/gui/updaterwindow.cpp:162
msgid "Play"
msgstr "Los!"
-#: src/gui/updaterwindow.cpp:556
+#: src/gui/updaterwindow.cpp:564
msgid "##1 The update process is incomplete."
msgstr "##1 Update wurde nicht erfolgreich abgeschlossen."
#. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:558
+#: src/gui/updaterwindow.cpp:566
msgid "##1 It is strongly recommended that"
msgstr "##1 Es wird dringend empfohlen,"
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:560
+#: src/gui/updaterwindow.cpp:568
msgid "##1 you try again later."
msgstr ""
-#: src/gui/updaterwindow.cpp:686
+#: src/gui/updaterwindow.cpp:744
msgid "Completed"
msgstr "Fertig"
@@ -3440,23 +3475,23 @@ msgstr ""
msgid "Road Point"
msgstr ""
-#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:471
+#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:472
msgid "Who Is Online - Updating"
msgstr ""
-#: src/gui/whoisonline.cpp:101
+#: src/gui/whoisonline.cpp:102
msgid "Update"
msgstr ""
-#: src/gui/whoisonline.cpp:294
+#: src/gui/whoisonline.cpp:295
msgid "Who Is Online - "
msgstr ""
-#: src/gui/whoisonline.cpp:485
+#: src/gui/whoisonline.cpp:486
msgid "Who Is Online - error"
msgstr ""
-#: src/gui/whoisonline.cpp:516
+#: src/gui/whoisonline.cpp:517
msgid "Who Is Online - Update"
msgstr ""
@@ -3521,7 +3556,8 @@ msgid "This command makes <nick> a channel operator."
msgstr "Dieser Befehl macht Spieler <Name> zu einem Moderator des Kanals"
#: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
-#: src/net/ea/gui/guildtab.cpp:69 src/net/ea/gui/partytab.cpp:85
+#: src/gui/widgets/guildchattab.cpp:61 src/net/ea/gui/guildtab.cpp:69
+#: src/net/ea/gui/partytab.cpp:85
msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
msgstr ""
"Wenn im Namen <Name> Leerzeichen vorkommen, setze ihn in Anführungszeichen "
@@ -3563,9 +3599,44 @@ msgstr "Globale Ansage von %s:"
msgid "%s whispers: %s"
msgstr ""
+#: src/gui/widgets/guildchattab.cpp:59 src/net/ea/gui/guildtab.cpp:67
+#: src/net/ea/gui/partytab.cpp:83
+msgid "Command: /invite <nick>"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:60 src/net/ea/gui/guildtab.cpp:68
+msgid "This command invites <nick> to the guild you're in."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:66 src/net/ea/gui/guildtab.cpp:74
+#: src/net/ea/gui/partytab.cpp:90
+msgid "Command: /leave"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:67 src/net/ea/gui/guildtab.cpp:75
+msgid "This command causes the player to leave the guild."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:109 src/net/ea/gui/guildtab.cpp:135
+#: src/net/ea/gui/partytab.cpp:69
+msgid "/help > Display this help."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:110 src/net/ea/gui/guildtab.cpp:136
+msgid "/invite > Invite a player to your guild"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:111 src/net/ea/gui/guildtab.cpp:137
+msgid "/leave > Leave the guild you are in"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:112 src/net/ea/gui/guildtab.cpp:138
+msgid "/kick > Kick some one from the guild you are in"
+msgstr ""
+
#: src/gui/widgets/setupitem.cpp:271 src/gui/widgets/setupitem.cpp:394
msgid "Edit"
-msgstr ""
+msgstr "Ändern"
#: src/gui/widgets/whispertab.cpp:107
msgid "/ignore > Ignore the other player"
@@ -3625,11 +3696,11 @@ msgstr ""
#: src/gui/windowmenu.cpp:71
msgid "Smilies"
-msgstr ""
+msgstr "Similies"
#: src/gui/windowmenu.cpp:73
msgid "STA"
-msgstr ""
+msgstr "STA"
#: src/gui/windowmenu.cpp:73
msgid "Status"
@@ -3637,23 +3708,23 @@ msgstr "Status"
#: src/gui/windowmenu.cpp:74
msgid "EQU"
-msgstr ""
+msgstr "EQU"
#: src/gui/windowmenu.cpp:76
msgid "INV"
-msgstr ""
+msgstr "INV"
#: src/gui/windowmenu.cpp:81
msgid "SKI"
-msgstr ""
+msgstr "FÄH"
#: src/gui/windowmenu.cpp:88
msgid "SPE"
-msgstr ""
+msgstr "SPE"
#: src/gui/windowmenu.cpp:93
msgid "SOC"
-msgstr ""
+msgstr "SOZ"
#: src/gui/windowmenu.cpp:94
msgid "SH"
@@ -3685,11 +3756,11 @@ msgstr ""
#: src/gui/worldselectdialog.cpp:77
msgid "Select World"
-msgstr ""
+msgstr "Welt wählen"
#: src/gui/worldselectdialog.cpp:82
msgid "Change Login"
-msgstr ""
+msgstr "Login ändern"
#: src/gui/worldselectdialog.cpp:83
msgid "Choose World"
@@ -4092,70 +4163,70 @@ msgid ""
"strange behaviour."
msgstr ""
-#: src/localplayer.cpp:372
+#: src/localplayer.cpp:370
msgid "You were killed by "
msgstr ""
-#: src/localplayer.cpp:1403
+#: src/localplayer.cpp:1401
msgid "Tried to pick up nonexistent item."
msgstr ""
-#: src/localplayer.cpp:1405
+#: src/localplayer.cpp:1403
msgid "Item is too heavy."
msgstr ""
-#: src/localplayer.cpp:1407
+#: src/localplayer.cpp:1405
msgid "Item is too far away."
msgstr ""
-#: src/localplayer.cpp:1409
+#: src/localplayer.cpp:1407
msgid "Inventory is full."
msgstr ""
-#: src/localplayer.cpp:1411
+#: src/localplayer.cpp:1409
msgid "Stack is too big."
msgstr ""
-#: src/localplayer.cpp:1414
+#: src/localplayer.cpp:1412
msgid "Item belongs to someone else."
msgstr ""
-#: src/localplayer.cpp:1417
+#: src/localplayer.cpp:1415
msgid "Unknown problem picking up item."
msgstr ""
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1441
+#: src/localplayer.cpp:1439
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
msgstr[0] ""
msgstr[1] ""
-#: src/localplayer.cpp:3175
+#: src/localplayer.cpp:3173
msgid "Away"
msgstr "Abwesend"
-#: src/localplayer.cpp:3476
+#: src/localplayer.cpp:3474
msgid "Follow: "
-msgstr ""
+msgstr "Folgen:"
-#: src/localplayer.cpp:3478 src/localplayer.cpp:3493
+#: src/localplayer.cpp:3476 src/localplayer.cpp:3491
msgid "Follow canceled"
msgstr ""
-#: src/localplayer.cpp:3485
+#: src/localplayer.cpp:3483
msgid "Imitation: "
msgstr ""
-#: src/localplayer.cpp:3487 src/localplayer.cpp:3495
+#: src/localplayer.cpp:3485 src/localplayer.cpp:3493
msgid "Imitation canceled"
msgstr ""
-#: src/localplayer.cpp:3847
+#: src/localplayer.cpp:3845
msgid "You see "
-msgstr ""
+msgstr "Du siehst"
#: src/main.cpp:47
msgid "manaplus [options] [mana-file]"
@@ -4263,27 +4334,27 @@ msgstr "Kauf fehlgeschlagen."
#: src/net/ea/charserverhandler.cpp:63
msgid "Strength:"
-msgstr ""
+msgstr "Stärke:"
#: src/net/ea/charserverhandler.cpp:64
msgid "Agility:"
-msgstr ""
+msgstr "Beweglichkeit:"
#: src/net/ea/charserverhandler.cpp:65
msgid "Vitality:"
-msgstr ""
+msgstr "Gesundheit:"
#: src/net/ea/charserverhandler.cpp:66
msgid "Intelligence:"
-msgstr ""
+msgstr "Intelligenz:"
#: src/net/ea/charserverhandler.cpp:67
msgid "Dexterity:"
-msgstr ""
+msgstr "Geschicklichkeit:"
#: src/net/ea/charserverhandler.cpp:68
msgid "Luck:"
-msgstr ""
+msgstr "Glück:"
#: src/net/ea/charserverhandler.cpp:102
msgid "Access denied. Most likely, there are too many players on this server."
@@ -4303,7 +4374,7 @@ msgstr ""
#: src/net/ea/charserverhandler.cpp:142 src/net/ea/loginhandler.cpp:237
msgid "Wrong name."
-msgstr ""
+msgstr "Falscher Name."
#: src/net/ea/charserverhandler.cpp:145
msgid "Incorrect stats."
@@ -4329,28 +4400,28 @@ msgstr ""
msgid "Failed to delete character."
msgstr ""
-#: src/net/ea/chathandler.cpp:60 src/net/ea/chathandler.cpp:66
-#: src/net/ea/chathandler.cpp:71 src/net/ea/chathandler.cpp:77
-#: src/net/ea/chathandler.cpp:82 src/net/ea/chathandler.cpp:88
-#: src/net/ea/chathandler.cpp:95 src/net/ea/chathandler.cpp:101
+#: src/net/ea/chathandler.cpp:61 src/net/ea/chathandler.cpp:67
+#: src/net/ea/chathandler.cpp:72 src/net/ea/chathandler.cpp:78
+#: src/net/ea/chathandler.cpp:83 src/net/ea/chathandler.cpp:89
+#: src/net/ea/chathandler.cpp:96 src/net/ea/chathandler.cpp:102
msgid "Channels are not supported!"
msgstr ""
-#: src/net/ea/chathandler.cpp:128
+#: src/net/ea/chathandler.cpp:129
#, c-format
msgid "Whisper could not be sent, %s is offline."
msgstr ""
-#: src/net/ea/chathandler.cpp:136
+#: src/net/ea/chathandler.cpp:137
#, c-format
msgid "Whisper could not be sent, ignored by %s."
msgstr ""
-#: src/net/ea/chathandler.cpp:348
+#: src/net/ea/chathandler.cpp:355
msgid "MVP player."
msgstr ""
-#: src/net/ea/chathandler.cpp:352
+#: src/net/ea/chathandler.cpp:359
msgid "MVP player: "
msgstr ""
@@ -4361,44 +4432,12 @@ msgstr ""
#: src/net/ea/gamehandler.cpp:98
msgid "Game"
-msgstr ""
+msgstr "Spiel"
#: src/net/ea/gamehandler.cpp:98
msgid "Request to quit denied!"
msgstr ""
-#: src/net/ea/gui/guildtab.cpp:67 src/net/ea/gui/partytab.cpp:83
-msgid "Command: /invite <nick>"
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:68
-msgid "This command invites <nick> to the guild you're in."
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:74 src/net/ea/gui/partytab.cpp:90
-msgid "Command: /leave"
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:75
-msgid "This command causes the player to leave the guild."
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:135 src/net/ea/gui/partytab.cpp:69
-msgid "/help > Display this help."
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:136
-msgid "/invite > Invite a player to your guild"
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:137
-msgid "/leave > Leave the guild you are in"
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:138
-msgid "/kick > Kick some one from the guild you are in"
-msgstr ""
-
#: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
msgid "Guild created."
msgstr "Gilde erstellt."
@@ -4415,85 +4454,81 @@ msgstr ""
msgid "Unknown server response."
msgstr ""
-#: src/net/ea/guildhandler.cpp:180
+#: src/net/ea/guildhandler.cpp:181
#, c-format
msgid "Guild name: %s"
msgstr ""
-#: src/net/ea/guildhandler.cpp:182
+#: src/net/ea/guildhandler.cpp:183
#, c-format
msgid "Guild master: %s"
msgstr ""
-#: src/net/ea/guildhandler.cpp:184
+#: src/net/ea/guildhandler.cpp:185
#, c-format
msgid "Guild level: %d"
msgstr ""
-#: src/net/ea/guildhandler.cpp:186
+#: src/net/ea/guildhandler.cpp:187
#, c-format
msgid "Online members: %d"
msgstr ""
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:189
#, c-format
msgid "Max members: %d"
msgstr ""
-#: src/net/ea/guildhandler.cpp:190
+#: src/net/ea/guildhandler.cpp:191
#, c-format
msgid "Average level: %d"
msgstr ""
-#: src/net/ea/guildhandler.cpp:192
+#: src/net/ea/guildhandler.cpp:193
#, c-format
msgid "Guild exp: %d"
msgstr ""
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:195
#, c-format
msgid "Guild next exp: %d"
msgstr ""
-#: src/net/ea/guildhandler.cpp:196
+#: src/net/ea/guildhandler.cpp:197
#, c-format
msgid "Guild castle: %s"
msgstr ""
-#: src/net/ea/guildhandler.cpp:402
+#: src/net/ea/guildhandler.cpp:403
msgid "Could not inivte user to guild."
msgstr ""
-#: src/net/ea/guildhandler.cpp:406
+#: src/net/ea/guildhandler.cpp:407
msgid "User rejected guild invite."
msgstr ""
-#: src/net/ea/guildhandler.cpp:410
+#: src/net/ea/guildhandler.cpp:411
msgid "User is now part of your guild."
msgstr ""
-#: src/net/ea/guildhandler.cpp:414
+#: src/net/ea/guildhandler.cpp:415
msgid "Your guild is full."
-msgstr ""
+msgstr "Deine Guilde ist voll."
-#: src/net/ea/guildhandler.cpp:418
+#: src/net/ea/guildhandler.cpp:419
msgid "Unknown guild invite response."
msgstr ""
-#: src/net/ea/guildhandler.cpp:438
-msgid "You have left the guild."
-msgstr ""
-
-#: src/net/ea/guildhandler.cpp:452
+#: src/net/ea/guildhandler.cpp:453
#, c-format
msgid "%s has left your guild."
msgstr ""
-#: src/net/ea/guildhandler.cpp:483
+#: src/net/ea/guildhandler.cpp:484
msgid "You was kicked from guild."
msgstr ""
-#: src/net/ea/guildhandler.cpp:496
+#: src/net/ea/guildhandler.cpp:497
#, c-format
msgid "%s has kicked from your guild."
msgstr ""
@@ -4612,7 +4647,7 @@ msgstr ""
#: src/net/ea/loginhandler.cpp:131
msgid "Account was not found. Please re-login."
-msgstr ""
+msgstr "Account nicht gefunden. Bitte noch einmal anmelden."
#: src/net/ea/loginhandler.cpp:134 src/net/manaserv/loginhandler.cpp:127
msgid "Old password incorrect."
@@ -4620,7 +4655,7 @@ msgstr "Altes Passwort fehlerhaft"
#: src/net/ea/loginhandler.cpp:137
msgid "New password too short."
-msgstr ""
+msgstr "Das neue Passwort ist zu kurz."
#: src/net/ea/loginhandler.cpp:140 src/net/ea/loginhandler.cpp:243
#: src/net/manaserv/charhandler.cpp:181 src/net/manaserv/loginhandler.cpp:102
@@ -4631,15 +4666,15 @@ msgstr "Unbekannter Fehler"
#: src/net/ea/loginhandler.cpp:205
msgid "Unregistered ID."
-msgstr ""
+msgstr "Unbekannte ID"
#: src/net/ea/loginhandler.cpp:208
msgid "Wrong password."
-msgstr ""
+msgstr "Falsches Passwort."
#: src/net/ea/loginhandler.cpp:211
msgid "Account expired."
-msgstr ""
+msgstr "Account abgelaufen."
#: src/net/ea/loginhandler.cpp:214
msgid "Rejected from server."
@@ -4715,12 +4750,12 @@ msgstr ""
msgid "You have left the party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:368
+#: src/net/ea/partyhandler.cpp:369
#, c-format
msgid "%s has left your party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:444
+#: src/net/ea/partyhandler.cpp:448
#, c-format
msgid "An unknown member tried to say: %s"
msgstr ""
@@ -4811,7 +4846,7 @@ msgstr ""
#: src/net/ea/playerhandler.cpp:123
msgid "You're a stiff."
-msgstr ""
+msgstr "Du bist eine Leiche."
#: src/net/ea/playerhandler.cpp:124
msgid "Bereft of life, you rest in peace."
@@ -4848,9 +4883,9 @@ msgid "You're pining for the fjords."
msgstr ""
#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
-#: src/net/ea/playerhandler.cpp:425
+#: src/net/ea/playerhandler.cpp:428
msgid "Message"
-msgstr ""
+msgstr "Nachricht"
#: src/net/ea/playerhandler.cpp:337
msgid ""
@@ -4861,21 +4896,21 @@ msgstr ""
msgid "You are carrying less than half your weight. You can regain health."
msgstr ""
-#: src/net/ea/playerhandler.cpp:451
+#: src/net/ea/playerhandler.cpp:454
#, c-format
msgid "You picked up %s."
msgstr ""
-#: src/net/ea/playerhandler.cpp:457
+#: src/net/ea/playerhandler.cpp:460
#, c-format
msgid "You spent %s."
msgstr ""
-#: src/net/ea/playerhandler.cpp:501
+#: src/net/ea/playerhandler.cpp:506
msgid "Cannot raise skill!"
msgstr ""
-#: src/net/ea/playerhandler.cpp:618
+#: src/net/ea/playerhandler.cpp:624
msgid "Equip arrows first."
msgstr ""
@@ -4897,7 +4932,7 @@ msgstr ""
#: src/net/ea/specialhandler.cpp:161
msgid "Could not join party!"
-msgstr ""
+msgstr "Konnte Party nicht beitreten!"
#: src/net/ea/specialhandler.cpp:164
msgid "Cannot shout!"
@@ -5014,7 +5049,7 @@ msgstr "Handel abgebrochen."
msgid "Trade completed."
msgstr "Handel abgeschlossen."
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:258
msgid "Strength"
msgstr "Stärke"
@@ -5023,7 +5058,7 @@ msgstr "Stärke"
msgid "Strength %+.1f"
msgstr ""
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:259
msgid "Agility"
msgstr "Beweglichkeit"
@@ -5032,7 +5067,7 @@ msgstr "Beweglichkeit"
msgid "Agility %+.1f"
msgstr ""
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:262
msgid "Dexterity"
msgstr "Ausdauer"
@@ -5041,7 +5076,7 @@ msgstr "Ausdauer"
msgid "Dexterity %+.1f"
msgstr ""
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:260
msgid "Vitality"
msgstr "Gesundheit"
@@ -5050,7 +5085,7 @@ msgstr "Gesundheit"
msgid "Vitality %+.1f"
msgstr ""
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:261
msgid "Intelligence"
msgstr "Intelligenz"
@@ -5210,7 +5245,7 @@ msgstr "Bereits angemeldet"
#: src/net/manaserv/loginhandler.cpp:99
msgid "Account banned."
-msgstr ""
+msgstr "Account gesperrt."
#: src/net/manaserv/loginhandler.cpp:124
msgid "New password incorrect."
@@ -5249,7 +5284,7 @@ msgstr "Benutzername oder Passwort falsch"
#: src/net/manaserv/loginhandler.cpp:284
msgid "Account banned"
-msgstr ""
+msgstr "Account gesperrt."
#: src/net/manaserv/loginhandler.cpp:287
msgid "Login attempt too soon after previous attempt."
@@ -5323,111 +5358,115 @@ msgstr ""
msgid "Unable to sell unsellable item."
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:109
+#: src/net/tmwa/generalhandler.cpp:108
#, c-format
msgid "Strength %+d"
msgstr "Stärke %+d"
-#: src/net/tmwa/generalhandler.cpp:110
+#: src/net/tmwa/generalhandler.cpp:109
#, c-format
msgid "Agility %+d"
msgstr "Beweglichkeit %+d"
-#: src/net/tmwa/generalhandler.cpp:111
+#: src/net/tmwa/generalhandler.cpp:110
#, c-format
msgid "Vitality %+d"
msgstr "Gesundheit %+d"
-#: src/net/tmwa/generalhandler.cpp:112
+#: src/net/tmwa/generalhandler.cpp:111
#, c-format
msgid "Intelligence %+d"
msgstr "Intelligenz %+d"
-#: src/net/tmwa/generalhandler.cpp:113
+#: src/net/tmwa/generalhandler.cpp:112
#, c-format
msgid "Dexterity %+d"
msgstr "Ausdauer %+d"
-#: src/net/tmwa/generalhandler.cpp:114
+#: src/net/tmwa/generalhandler.cpp:113
#, c-format
msgid "Luck %+d"
msgstr "Glück %+d"
-#: src/net/tmwa/generalhandler.cpp:140
+#: src/net/tmwa/generalhandler.cpp:139
msgid "Authentication failed."
msgstr "Authentifizierung verweigert"
-#: src/net/tmwa/generalhandler.cpp:143
+#: src/net/tmwa/generalhandler.cpp:142
msgid "No servers available."
msgstr "Keine Server verfügbar"
-#: src/net/tmwa/generalhandler.cpp:147
+#: src/net/tmwa/generalhandler.cpp:146
msgid "Someone else is trying to use this account."
msgstr "Jemand anderes versucht diesen Account zu benutzen"
-#: src/net/tmwa/generalhandler.cpp:150
+#: src/net/tmwa/generalhandler.cpp:149
msgid "This account is already logged in."
msgstr "Dieser Account ist bereits angemeldet"
-#: src/net/tmwa/generalhandler.cpp:153
+#: src/net/tmwa/generalhandler.cpp:152
msgid "Speed hack detected."
msgstr "Geschwindigkeitsproblem festgestellt"
-#: src/net/tmwa/generalhandler.cpp:156
+#: src/net/tmwa/generalhandler.cpp:155
msgid "Duplicated login."
msgstr "Mehrfache Anmeldung"
-#: src/net/tmwa/generalhandler.cpp:159
+#: src/net/tmwa/generalhandler.cpp:158
msgid "Unknown connection error."
msgstr "Unbekannter Verbindungsfehler"
-#: src/net/tmwa/generalhandler.cpp:232
+#: src/net/tmwa/generalhandler.cpp:231
msgid "Got disconnected from server!"
msgstr "Verbindung zum Server unterbrochen!"
-#: src/net/tmwa/generalhandler.cpp:264
+#: src/net/tmwa/generalhandler.cpp:263
msgid "Luck"
msgstr "Glück"
-#: src/net/tmwa/generalhandler.cpp:267
+#: src/net/tmwa/generalhandler.cpp:266
msgid "Defense"
msgstr "Verteidigung:"
-#: src/net/tmwa/generalhandler.cpp:268
+#: src/net/tmwa/generalhandler.cpp:267
msgid "M.Attack"
msgstr "M.Angriff:"
-#: src/net/tmwa/generalhandler.cpp:269
+#: src/net/tmwa/generalhandler.cpp:268
msgid "M.Defense"
msgstr "M.Verteidigung:"
-#: src/net/tmwa/generalhandler.cpp:271
+#: src/net/tmwa/generalhandler.cpp:270
#, no-c-format
msgid "% Accuracy"
msgstr "% Accuracy"
-#: src/net/tmwa/generalhandler.cpp:273
+#: src/net/tmwa/generalhandler.cpp:272
#, no-c-format
msgid "% Evade"
msgstr "% Evade"
-#: src/net/tmwa/generalhandler.cpp:275
+#: src/net/tmwa/generalhandler.cpp:274
#, no-c-format
msgid "% Critical"
msgstr "% Critical"
-#: src/net/tmwa/generalhandler.cpp:276
+#: src/net/tmwa/generalhandler.cpp:275
msgid "Attack Delay"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:278
+#: src/net/tmwa/generalhandler.cpp:277
msgid "Walk Delay"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:280
+#: src/net/tmwa/generalhandler.cpp:279
msgid "Attack Range"
msgstr ""
+#: src/net/tmwa/generalhandler.cpp:281
+msgid "Damage per sec."
+msgstr ""
+
#: src/net/tmwa/network.cpp:152
msgid "Empty address given to Network::connect()!"
msgstr "Empty address given to Network::connect()!"
@@ -5461,31 +5500,31 @@ msgstr "Schwebende '...' Blase"
msgid "Floating bubble"
msgstr "Schwebende Blase"
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:248
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:246
#: src/resources/monsterdb.cpp:84
msgid "unnamed"
msgstr "unbenannt"
-#: src/resources/itemdb.cpp:65
+#: src/resources/itemdb.cpp:63
#, c-format
msgid "Attack %+d"
msgstr "Angriff %+d"
-#: src/resources/itemdb.cpp:66
+#: src/resources/itemdb.cpp:64
#, c-format
msgid "Defense %+d"
msgstr "Verteidigung %+d"
-#: src/resources/itemdb.cpp:67
+#: src/resources/itemdb.cpp:65
#, c-format
msgid "HP %+d"
msgstr "HP %+d"
-#: src/resources/itemdb.cpp:68
+#: src/resources/itemdb.cpp:66
#, c-format
msgid "MP %+d"
msgstr "MP %+d"
-#: src/resources/itemdb.cpp:171
+#: src/resources/itemdb.cpp:169
msgid "Unknown item"
msgstr "Unbekannter Gegenstand"
diff --git a/po/es.po b/po/es.po
index e367da940..ea3abab4d 100644
--- a/po/es.po
+++ b/po/es.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-20 17:42+0300\n"
-"PO-Revision-Date: 2011-08-17 18:06+0000\n"
+"POT-Creation-Date: 2011-09-02 18:27+0300\n"
+"PO-Revision-Date: 2011-09-02 22:15+0000\n"
"Last-Translator: nelson6e65 <nelson6e65-manaplus@yahoo.es>\n"
"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/"
"manaplus/team/es/)\n"
@@ -26,119 +26,119 @@ msgstr ""
msgid "Visible on map"
msgstr "Visible sobre el mapa"
-#: src/being.cpp:542
+#: src/being.cpp:549
msgid "dodge"
msgstr "evade"
-#: src/being.cpp:542
+#: src/being.cpp:549
msgid "miss"
msgstr "falla"
#. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1514
+#: src/being.cpp:1529
msgid "A"
msgstr "A"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1519
+#: src/being.cpp:1534
msgid "I"
msgstr "I"
-#: src/client.cpp:826 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:831 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
msgid "Setup"
msgstr "Configuración"
-#: src/client.cpp:909
+#: src/client.cpp:914
msgid "Connecting to server"
msgstr "Conectando al servidor"
-#: src/client.cpp:940
+#: src/client.cpp:945
msgid "Logging in"
msgstr "Accediendo a la cuenta"
-#: src/client.cpp:973
+#: src/client.cpp:978
msgid "Entering game world"
msgstr "Entrando al mundo del juego"
-#: src/client.cpp:1073
+#: src/client.cpp:1078
msgid "Requesting characters"
msgstr "Cargando personajes"
-#: src/client.cpp:1104
+#: src/client.cpp:1109
msgid "Connecting to the game server"
msgstr "Conectando al servidor del juego"
-#: src/client.cpp:1114
+#: src/client.cpp:1119
msgid "Changing game servers"
msgstr "Cambiando servidores del juego"
-#: src/client.cpp:1151 src/client.cpp:1158 src/client.cpp:1293
+#: src/client.cpp:1156 src/client.cpp:1163 src/client.cpp:1298
#: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
-#: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:395
+#: src/gui/charcreatedialog.cpp:221 src/gui/charselectdialog.cpp:253
+#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
#: src/net/manaserv/charhandler.cpp:227
msgid "Error"
msgstr "Error"
-#: src/client.cpp:1167
+#: src/client.cpp:1172
msgid "Requesting registration details"
msgstr "Solicitando detalles de registro"
-#: src/client.cpp:1194
+#: src/client.cpp:1199
msgid "Password Change"
msgstr "Cambio de contraseña"
-#: src/client.cpp:1195
+#: src/client.cpp:1200
msgid "Password changed successfully!"
msgstr "¡Contraseña cambiada exitosamente!"
-#: src/client.cpp:1214
+#: src/client.cpp:1219
msgid "Email Change"
msgstr "Cambio de Email"
-#: src/client.cpp:1215
+#: src/client.cpp:1220
msgid "Email changed successfully!"
msgstr "¡Email modificado exitosamente!"
-#: src/client.cpp:1235
+#: src/client.cpp:1240
msgid "Unregister Successful"
msgstr "Registro cancelado"
-#: src/client.cpp:1236
+#: src/client.cpp:1241
msgid "Farewell, come back any time..."
msgstr "Adiós, vuelve cuando quieras..."
-#: src/client.cpp:1423 src/client.cpp:1453 src/client.cpp:1497
-#: src/client.cpp:1922 src/client.cpp:1929
+#: src/client.cpp:1428 src/client.cpp:1458 src/client.cpp:1502
+#: src/client.cpp:1927 src/client.cpp:1934
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "¡%s no existe y no puede ser creado! Saliendo."
-#: src/client.cpp:1628
+#: src/client.cpp:1633
#, c-format
msgid "Invalid update host: %s"
msgstr "Servidor de actualización inválido: %s"
-#: src/client.cpp:1662 src/client.cpp:1668
+#: src/client.cpp:1667 src/client.cpp:1673
msgid "Error creating updates directory!"
msgstr "¡Error al crear la carpeta de actualizaciones!"
-#: src/client.cpp:1689
+#: src/client.cpp:1694
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "Error: ¡%s no existe y no puede ser creado! Saliendo."
-#: src/commandhandler.cpp:301
+#: src/commandhandler.cpp:303
msgid "Unknown command."
msgstr "Comando desconocido."
-#: src/commandhandler.cpp:401
+#: src/commandhandler.cpp:403
msgid "Cannot send empty whispers!"
msgstr "¡No puedes enviar susurros vacíos!"
-#: src/commandhandler.cpp:415
+#: src/commandhandler.cpp:417
#, c-format
msgid ""
"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -147,152 +147,152 @@ msgstr ""
"¡No se puede crear una pestaña de susurro para el nick \"%s\"! O bien ya "
"existe, o eres tú."
-#: src/commandhandler.cpp:435
+#: src/commandhandler.cpp:437
#, c-format
msgid "Requesting to join channel %s."
msgstr "Solicitando la entrada del canal %s."
-#: src/commandhandler.cpp:451 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:453 src/net/ea/gui/partytab.cpp:125
msgid "Party name is missing."
msgstr "Falta el nombre del grupo."
-#: src/commandhandler.cpp:462
+#: src/commandhandler.cpp:464
msgid "Guild name is missing."
msgstr "Falta el nombre del gremio."
-#: src/commandhandler.cpp:475 src/commandhandler.cpp:582
-#: src/commandhandler.cpp:623 src/commandhandler.cpp:653
+#: src/commandhandler.cpp:477 src/commandhandler.cpp:589
+#: src/commandhandler.cpp:630 src/commandhandler.cpp:660
msgid "Please specify a name."
msgstr "Por favor, especifique un nombre."
-#: src/commandhandler.cpp:516
+#: src/commandhandler.cpp:523
msgid "Return toggles chat."
msgstr "Volver a alternar el chat."
-#: src/commandhandler.cpp:516
+#: src/commandhandler.cpp:523
msgid "Message closes chat."
msgstr "Mensaje cierra la charla."
-#: src/commandhandler.cpp:527
+#: src/commandhandler.cpp:534
msgid "Return now toggles chat."
msgstr "Volver ahora a cambiar de chat."
-#: src/commandhandler.cpp:533
+#: src/commandhandler.cpp:540
msgid "Message now closes chat."
msgstr "Mensaje ahora cierra el chat."
-#: src/commandhandler.cpp:561
+#: src/commandhandler.cpp:568
msgid "friend"
msgstr "amigo"
-#: src/commandhandler.cpp:566
+#: src/commandhandler.cpp:573
msgid "disregarded"
msgstr "desatendido"
-#: src/commandhandler.cpp:571
+#: src/commandhandler.cpp:578
msgid "neutral"
msgstr "neutral"
-#: src/commandhandler.cpp:590
+#: src/commandhandler.cpp:597
#, c-format
msgid "Player already %s!"
msgstr "¡Jugador ya es %s!"
-#: src/commandhandler.cpp:604
+#: src/commandhandler.cpp:611
#, c-format
msgid "Player successfully %s!"
msgstr "¡Jugador %s exitosamente!"
-#: src/commandhandler.cpp:612
+#: src/commandhandler.cpp:619
#, c-format
msgid "Player could not be %s!"
msgstr "¡Jugador no pudo ser %s!"
-#: src/commandhandler.cpp:634
+#: src/commandhandler.cpp:641
msgid "Player wasn't ignored!"
msgstr "El jugador no estaba ignorado!"
-#: src/commandhandler.cpp:641
+#: src/commandhandler.cpp:648
msgid "Player no longer ignored!"
msgstr "¡El jugador ya no es ignorado!"
-#: src/commandhandler.cpp:643
+#: src/commandhandler.cpp:650
msgid "Player could not be unignored!"
msgstr "¡Al jugador no se le puede dejar de ignorar!"
-#: src/commandhandler.cpp:660
+#: src/commandhandler.cpp:667
msgid "Player already erased!"
msgstr "¡Jugador ya borrado!"
-#: src/commandhandler.cpp:671
+#: src/commandhandler.cpp:678
msgid "Player successfully erased!"
msgstr "¡Jugador borrado con éxito!"
-#: src/commandhandler.cpp:673
+#: src/commandhandler.cpp:680
msgid "Player could not be erased!"
msgstr "¡Jugador no pudo ser borrado!"
-#: src/commandhandler.cpp:972 src/commandhandler.cpp:1018
+#: src/commandhandler.cpp:980 src/commandhandler.cpp:1026
#, c-format
msgid "Client uptime: %s"
msgstr "Tiempo de actividad del cliente: %s"
-#: src/commandhandler.cpp:982
+#: src/commandhandler.cpp:990
#, c-format
msgid "%d week"
msgid_plural "%d weeks"
msgstr[0] "%d semana"
msgstr[1] "%d semanas"
-#: src/commandhandler.cpp:991
+#: src/commandhandler.cpp:999
#, c-format
msgid "%d day"
msgid_plural "%d days"
msgstr[0] "%d día"
msgstr[1] "%d días"
-#: src/commandhandler.cpp:999
+#: src/commandhandler.cpp:1007
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] "%d hora"
msgstr[1] "%d horas"
-#: src/commandhandler.cpp:1007
+#: src/commandhandler.cpp:1015
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] "%d minuto"
msgstr[1] "%d minutos"
-#: src/commandhandler.cpp:1015
+#: src/commandhandler.cpp:1023
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
msgstr[0] "%d segundo"
msgstr[1] "%d segundos"
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1102
msgid "font cache size"
msgstr "tamaño de caché de fuente"
-#: src/commandhandler.cpp:1106
+#: src/commandhandler.cpp:1114
msgid "Cache size:"
msgstr "Tám. caché:"
-#: src/commandhandler.cpp:1110
+#: src/commandhandler.cpp:1118
msgid "Created:"
msgstr "Creado:"
-#: src/commandhandler.cpp:1112
+#: src/commandhandler.cpp:1120
msgid "Deleted:"
msgstr "Borrado:"
-#: src/commandhandler.cpp:1159 src/commandhandler.cpp:1166
+#: src/commandhandler.cpp:1167 src/commandhandler.cpp:1174
msgid "Resource images:"
msgstr "Imágenes de recurso:"
-#: src/commandhandler.cpp:1161 src/commandhandler.cpp:1168
+#: src/commandhandler.cpp:1169 src/commandhandler.cpp:1176
msgid "Resource orphaned images:"
msgstr "Imágenes de recurso huérfano:"
@@ -302,43 +302,43 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
msgstr ""
"Opciones para /%s son \"yes\" | \"no\", \"true\" | \"false\", \"1\" | \"0\"."
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:411
+#: src/game.cpp:252 src/gui/widgets/chattab.cpp:409
msgid "General"
msgstr "General"
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:413
+#: src/game.cpp:256 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:411
msgid "Debug"
msgstr "Depurador"
-#: src/game.cpp:488
+#: src/game.cpp:511
msgid "Screenshot saved as "
msgstr "Captura de pantalla guardada como "
-#: src/game.cpp:496
+#: src/game.cpp:519
msgid "Saving screenshot failed!"
msgstr "¡El guardado de la captura de pantalla ha fallado!"
-#: src/game.cpp:536
+#: src/game.cpp:559
msgid "The connection to the server was lost."
-msgstr "Se ha perdido la conexión con elservidor."
+msgstr "Se ha perdido la conexión con el servidor."
-#: src/game.cpp:548
+#: src/game.cpp:571
msgid "Network Error"
msgstr "Error de Red"
-#: src/game.cpp:1213
+#: src/game.cpp:1236
msgid "Ignoring incoming trade requests"
msgstr "Ignorando las peticiones de intercambio"
-#: src/game.cpp:1220
+#: src/game.cpp:1243
msgid "Accepting incoming trade requests"
msgstr "Aceptando las peticiones de intercambio"
-#: src/game.cpp:1606
+#: src/game.cpp:1629
msgid "Could Not Load Map"
msgstr "No se pudo cargar el mapa"
-#: src/game.cpp:1607
+#: src/game.cpp:1630
#, c-format
msgid "Error while loading %s"
msgstr "Error mientras cargaba %s"
@@ -367,103 +367,103 @@ msgstr "Comentario: %s"
msgid "Bot Checker"
msgstr "Bot Checker"
-#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
+#: src/gui/botcheckerwindow.cpp:295 src/gui/setup_relations.cpp:64
msgid "Name"
msgstr "Nombre"
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:134
-#: src/gui/popupmenu.cpp:292 src/gui/popupmenu.cpp:617
-#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
+#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:133
+#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:646
+#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:265
msgid "Attack"
msgstr "Atacar"
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:279
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:297
#: src/keyboardconfig.cpp:62
msgid "Talk"
msgstr "Hablar"
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:245
-#: src/gui/popupmenu.cpp:284 src/gui/popupmenu.cpp:674
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:263
+#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:703
msgid "Move"
msgstr "Mover"
-#: src/gui/botcheckerwindow.cpp:300
+#: src/gui/botcheckerwindow.cpp:299
msgid "Result"
msgstr "Resultado"
-#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123
+#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:124
msgid "Reset"
msgstr "Restablecer"
-#: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:260
-#: src/gui/popupmenu.cpp:281 src/gui/popupmenu.cpp:688
+#: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:98
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:278
+#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:717
msgid "Buy"
msgstr "Comprar"
-#: src/gui/buydialog.cpp:88 src/gui/buydialog.cpp:302
-#: src/gui/selldialog.cpp:87 src/gui/selldialog.cpp:324
+#: src/gui/buydialog.cpp:89 src/gui/buydialog.cpp:303
+#: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
#, c-format
msgid "Price: %s / Total: %s"
msgstr "Precio: %s / Total: %s"
#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
#. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:93 src/gui/itemamountwindow.cpp:207
-#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:113
-#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:974
+#: src/gui/buydialog.cpp:94 src/gui/itemamountwindow.cpp:207
+#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:973
msgid "+"
msgstr "+"
#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
#. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:96 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:986
+#: src/gui/buydialog.cpp:97 src/gui/itemamountwindow.cpp:206
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:985
msgid "-"
msgstr "-"
-#: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
-#: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
-#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:288
+#: src/gui/buydialog.cpp:99 src/gui/quitdialog.cpp:47
+#: src/gui/quitdialog.cpp:49 src/gui/quitdialog.cpp:50
+#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:294
#: src/keyboardconfig.cpp:290
msgid "Quit"
msgstr "Salir"
-#: src/gui/buydialog.cpp:99 src/gui/selldialog.cpp:94
-#: src/gui/statuswindow.cpp:503 src/gui/statuswindow.cpp:552
-#: src/gui/statuswindow.cpp:973 src/gui/statuswindow.cpp:1004
+#: src/gui/buydialog.cpp:100 src/gui/selldialog.cpp:95
+#: src/gui/statuswindow.cpp:504 src/gui/statuswindow.cpp:553
+#: src/gui/statuswindow.cpp:972 src/gui/statuswindow.cpp:1003
msgid "Max"
msgstr "Máximo"
#: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:133
+#: src/gui/inventorywindow.cpp:147 src/gui/setup_other.cpp:133
msgid "Shop"
msgstr "Tienda"
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:262
-#: src/gui/popupmenu.cpp:282 src/gui/popupmenu.cpp:690
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:280
+#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:719
#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
-#: src/gui/selldialog.cpp:92
+#: src/gui/selldialog.cpp:93
msgid "Sell"
msgstr "Vender"
#: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
-#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
+#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:96
#: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:336
-#: src/gui/popupmenu.cpp:357 src/gui/popupmenu.cpp:460
-#: src/gui/popupmenu.cpp:487 src/gui/popupmenu.cpp:511
-#: src/gui/popupmenu.cpp:525 src/gui/popupmenu.cpp:544
-#: src/gui/popupmenu.cpp:750 src/gui/popupmenu.cpp:774
-#: src/gui/popupmenu.cpp:1684 src/gui/popupmenu.cpp:1712
-#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1811
-#: src/gui/popupmenu.cpp:1846 src/gui/popupmenu.cpp:1886
-#: src/gui/popupmenu.cpp:1953 src/gui/popupmenu.cpp:1973
-#: src/gui/quitdialog.cpp:59 src/gui/register.cpp:82 src/gui/setup.cpp:71
-#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:354
+#: src/gui/popupmenu.cpp:375 src/gui/popupmenu.cpp:489
+#: src/gui/popupmenu.cpp:516 src/gui/popupmenu.cpp:540
+#: src/gui/popupmenu.cpp:554 src/gui/popupmenu.cpp:573
+#: src/gui/popupmenu.cpp:790 src/gui/popupmenu.cpp:814
+#: src/gui/popupmenu.cpp:1734 src/gui/popupmenu.cpp:1762
+#: src/gui/popupmenu.cpp:1818 src/gui/popupmenu.cpp:1861
+#: src/gui/popupmenu.cpp:1896 src/gui/popupmenu.cpp:1936
+#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2023
+#: src/gui/quitdialog.cpp:54 src/gui/register.cpp:82 src/gui/setup.cpp:72
+#: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:238
#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updaterwindow.cpp:157
+#: src/gui/updaterwindow.cpp:161
msgid "Cancel"
msgstr "Cancelar"
@@ -495,7 +495,7 @@ msgid "The email address entries mismatch."
msgstr "Los e-mail son distintos."
#: src/gui/changepassworddialog.cpp:50 src/gui/changepassworddialog.cpp:59
-#: src/gui/charselectdialog.cpp:140
+#: src/gui/charselectdialog.cpp:139
msgid "Change Password"
msgstr "Cambiar contraseña"
@@ -530,127 +530,127 @@ msgstr "Las nuevas contraseñas no concuerdan."
msgid "Create Character"
msgstr "Crear Personaje"
-#: src/gui/charcreatedialog.cpp:73 src/gui/logindialog.cpp:94
+#: src/gui/charcreatedialog.cpp:76 src/gui/logindialog.cpp:94
#: src/gui/register.cpp:75
msgid "Name:"
msgstr "Nombre:"
#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
#. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:76 src/gui/charcreatedialog.cpp:81
-#: src/gui/charcreatedialog.cpp:87 src/gui/outfitwindow.cpp:81
+#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:84
+#: src/gui/charcreatedialog.cpp:90 src/gui/outfitwindow.cpp:85
msgid ">"
msgstr ">"
#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
#. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:82
-#: src/gui/charcreatedialog.cpp:88 src/gui/outfitwindow.cpp:80
+#: src/gui/charcreatedialog.cpp:82 src/gui/charcreatedialog.cpp:85
+#: src/gui/charcreatedialog.cpp:91 src/gui/outfitwindow.cpp:84
msgid "<"
msgstr "<"
-#: src/gui/charcreatedialog.cpp:80
+#: src/gui/charcreatedialog.cpp:83
msgid "Hair color:"
msgstr "Color:"
-#: src/gui/charcreatedialog.cpp:83
+#: src/gui/charcreatedialog.cpp:86
msgid "Hair style:"
msgstr "Peinado:"
-#: src/gui/charcreatedialog.cpp:89
+#: src/gui/charcreatedialog.cpp:92
msgid "Race:"
msgstr "Race:"
-#: src/gui/charcreatedialog.cpp:92 src/gui/charselectdialog.cpp:479
-#: src/gui/socialwindow.cpp:1033
+#: src/gui/charcreatedialog.cpp:95 src/gui/charselectdialog.cpp:478
+#: src/gui/socialwindow.cpp:1139
msgid "Create"
msgstr "Crear"
-#: src/gui/charcreatedialog.cpp:94 src/gui/register.cpp:98
+#: src/gui/charcreatedialog.cpp:97 src/gui/register.cpp:98
msgid "Male"
msgstr "Hombre"
-#: src/gui/charcreatedialog.cpp:95 src/gui/register.cpp:99
+#: src/gui/charcreatedialog.cpp:98 src/gui/register.cpp:99
msgid "Female"
msgstr "Mujer"
-#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:300
+#: src/gui/charcreatedialog.cpp:116 src/gui/charcreatedialog.cpp:303
#, c-format
msgid "Please distribute %d points"
msgstr "Por favor distribuya %d puntos"
-#: src/gui/charcreatedialog.cpp:219
+#: src/gui/charcreatedialog.cpp:222
msgid "Your name needs to be at least 4 characters."
msgstr "Su nombre debe de tener como mínimo 4 caracteres."
-#: src/gui/charcreatedialog.cpp:291
+#: src/gui/charcreatedialog.cpp:294
msgid "Character stats OK"
msgstr "Atributos del personaje OK"
-#: src/gui/charcreatedialog.cpp:305
+#: src/gui/charcreatedialog.cpp:308
#, c-format
msgid "Please remove %d points"
-msgstr "Por favor extraiga %d puntos de estado"
+msgstr "Por favor borre %d puntos"
-#: src/gui/charselectdialog.cpp:77
+#: src/gui/charselectdialog.cpp:76
msgid "Confirm Character Delete"
-msgstr "Confirmar la supresión del personaje"
+msgstr "Confirmar la eliminación del personaje"
-#: src/gui/charselectdialog.cpp:78
+#: src/gui/charselectdialog.cpp:77
msgid "Are you sure you want to delete this character?"
msgstr "¿Estás seguro de que deseas borrar este personaje?"
-#: src/gui/charselectdialog.cpp:126
+#: src/gui/charselectdialog.cpp:125
msgid "Account and Character Management"
-msgstr "Configuración de la cuenta y los personajes"
+msgstr "Administración de la Cuenta y los Personajes"
-#: src/gui/charselectdialog.cpp:139
+#: src/gui/charselectdialog.cpp:138
msgid "Switch Login"
msgstr "Volver al Login"
-#: src/gui/charselectdialog.cpp:153 src/gui/unregisterdialog.cpp:50
+#: src/gui/charselectdialog.cpp:152 src/gui/unregisterdialog.cpp:50
#: src/gui/unregisterdialog.cpp:58
msgid "Unregister"
msgstr "Cancelar Registro"
-#: src/gui/charselectdialog.cpp:162
+#: src/gui/charselectdialog.cpp:161
msgid "Change Email"
msgstr "Cambiar e-mail"
-#: src/gui/charselectdialog.cpp:254
+#: src/gui/charselectdialog.cpp:253
msgid "Incorrect password"
msgstr "Contraseña incorrecta"
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:286
msgid "Enter password for deleting character"
msgstr "Ingrese la contraseña para borrar el personaje"
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:286
msgid "Enter password:"
msgstr "Ingrese contraseña:"
-#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:292
-#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
-#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
+#: src/gui/charselectdialog.cpp:408 src/gui/serverdialog.cpp:298
+#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:122
+#: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:241
msgid "Delete"
msgstr "Borrar"
-#: src/gui/charselectdialog.cpp:467
+#: src/gui/charselectdialog.cpp:466
msgid "Choose"
msgstr "Seleccionar"
-#: src/gui/charselectdialog.cpp:470
+#: src/gui/charselectdialog.cpp:469
#, c-format
msgid "Level %d"
msgstr "Nivel: %d"
-#: src/gui/charselectdialog.cpp:481 src/gui/charselectdialog.cpp:482
+#: src/gui/charselectdialog.cpp:480 src/gui/charselectdialog.cpp:481
msgid "(empty)"
msgstr "(vacío)"
#: src/gui/chatwindow.cpp:112
msgid "default"
-msgstr "Por defecto"
+msgstr "predeterminado"
#: src/gui/chatwindow.cpp:113
msgid "black"
@@ -716,15 +716,15 @@ msgstr "???"
msgid "Chat"
msgstr "Chat"
-#: src/gui/chatwindow.cpp:606
+#: src/gui/chatwindow.cpp:609
#, c-format
msgid "Present: %s; %d players are present."
msgstr "Presentes: %s; %d jugadores estan presentes."
-#: src/gui/chatwindow.cpp:993
+#: src/gui/chatwindow.cpp:996
#, c-format
msgid "Whispering to %s: %s"
-msgstr "Enviando mensaje privado para %s: %s"
+msgstr "Susurrando a %s: %s"
#: src/gui/confirmdialog.cpp:47
msgid "Yes"
@@ -734,145 +734,145 @@ msgstr "Sí"
msgid "No"
msgstr "No"
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:150
-#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:384
-#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:632
-#: src/gui/popupmenu.cpp:640
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:149
+#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:402
+#: src/gui/popupmenu.cpp:408 src/gui/popupmenu.cpp:661
+#: src/gui/popupmenu.cpp:669
msgid "Ignore"
msgstr "Ignorar"
-#: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
+#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:97
#: src/gui/setup_other.cpp:64
msgid "Map"
msgstr "Mapa"
-#: src/gui/debugwindow.cpp:71
+#: src/gui/debugwindow.cpp:73
msgid "Target"
msgstr "Objetivo"
-#: src/gui/debugwindow.cpp:72
+#: src/gui/debugwindow.cpp:74
msgid "Net"
msgstr "Red"
-#: src/gui/debugwindow.cpp:145 src/gui/debugwindow.cpp:220
-#: src/gui/debugwindow.cpp:249
+#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
+#: src/gui/debugwindow.cpp:251
msgid "Music:"
msgstr "Música:"
-#: src/gui/debugwindow.cpp:146 src/gui/debugwindow.cpp:224
-#: src/gui/debugwindow.cpp:251
+#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:226
+#: src/gui/debugwindow.cpp:253
msgid "Map:"
msgstr "Mapa:"
-#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
-#: src/gui/debugwindow.cpp:250
+#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:224
+#: src/gui/debugwindow.cpp:252
msgid "Minimap:"
msgstr "Minimapa:"
-#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:218
-#: src/gui/debugwindow.cpp:247
+#: src/gui/debugwindow.cpp:150 src/gui/debugwindow.cpp:220
+#: src/gui/debugwindow.cpp:249
msgid "Cursor:"
msgstr "Cursor:"
-#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:201
-#: src/gui/debugwindow.cpp:206
+#: src/gui/debugwindow.cpp:151 src/gui/debugwindow.cpp:203
+#: src/gui/debugwindow.cpp:208
msgid "Player Position:"
msgstr "Posición del jugador:"
-#: src/gui/debugwindow.cpp:152
+#: src/gui/debugwindow.cpp:154
msgid "Particle count:"
msgstr "Recuento de partículas:"
-#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:235
-#: src/gui/debugwindow.cpp:254
+#: src/gui/debugwindow.cpp:156 src/gui/debugwindow.cpp:237
+#: src/gui/debugwindow.cpp:256
msgid "Map actors count:"
msgstr "Numero de agentes en el mapa:"
-#: src/gui/debugwindow.cpp:162 src/gui/debugwindow.cpp:173
+#: src/gui/debugwindow.cpp:164 src/gui/debugwindow.cpp:175
#, c-format
msgid "%d FPS (Software)"
msgstr "%d FPS (Software)"
-#: src/gui/debugwindow.cpp:166
+#: src/gui/debugwindow.cpp:168
#, c-format
msgid "%d FPS (fast OpenGL)"
msgstr "%d FPS (OpenGL rápido)"
-#: src/gui/debugwindow.cpp:169
+#: src/gui/debugwindow.cpp:171
#, c-format
msgid "%d FPS (old OpenGL)"
-msgstr "%d FPS (Antiguo OpenGL)"
+msgstr "%d FPS (OpenGL antiguo)"
-#: src/gui/debugwindow.cpp:176
+#: src/gui/debugwindow.cpp:178
#, c-format
msgid "%d FPS"
msgstr "%d FPS"
-#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:240
+#: src/gui/debugwindow.cpp:190 src/gui/debugwindow.cpp:242
msgid "Textures count:"
msgstr "Contador de Texturas:"
-#: src/gui/debugwindow.cpp:231
+#: src/gui/debugwindow.cpp:233
#, c-format
msgid "Particle count: %d"
msgstr "Recuento de partículas: %d"
-#: src/gui/debugwindow.cpp:268 src/gui/debugwindow.cpp:299
-#: src/gui/debugwindow.cpp:343
+#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:301
+#: src/gui/debugwindow.cpp:345
msgid "Target:"
msgstr "Objetivo:"
-#: src/gui/debugwindow.cpp:269 src/gui/debugwindow.cpp:304
-#: src/gui/debugwindow.cpp:344
+#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:306
+#: src/gui/debugwindow.cpp:346
msgid "Target Id:"
msgstr "Seccionar ID:"
-#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:308
-#: src/gui/debugwindow.cpp:313 src/gui/debugwindow.cpp:345
+#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:310
+#: src/gui/debugwindow.cpp:315 src/gui/debugwindow.cpp:347
msgid "Target Level:"
msgstr "Diana de nivel:"
-#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:316
-#: src/gui/debugwindow.cpp:346
+#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:318
+#: src/gui/debugwindow.cpp:348
msgid "Target Party:"
msgstr "Grupo de destino:"
-#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:319
-#: src/gui/debugwindow.cpp:347
+#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:321
+#: src/gui/debugwindow.cpp:349
msgid "Target Guild:"
msgstr "Diana de Guild:"
-#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:333
-#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:348
+#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:335
+#: src/gui/debugwindow.cpp:340 src/gui/debugwindow.cpp:350
msgid "Attack delay:"
msgstr "Retraso de ataque:"
-#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:323
-#: src/gui/debugwindow.cpp:349
+#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:325
+#: src/gui/debugwindow.cpp:351
msgid "Minimal hit:"
msgstr "Golpe mínimo:"
-#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:325
-#: src/gui/debugwindow.cpp:350
+#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:327
+#: src/gui/debugwindow.cpp:352
msgid "Maximum hit:"
msgstr "Golpe máximo:"
-#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:327
-#: src/gui/debugwindow.cpp:351
+#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:329
+#: src/gui/debugwindow.cpp:353
msgid "Critical hit:"
msgstr "Golpe crítico:"
-#: src/gui/debugwindow.cpp:385 src/gui/debugwindow.cpp:390
+#: src/gui/debugwindow.cpp:387 src/gui/debugwindow.cpp:392
#, c-format
msgid "Ping: %s ms"
msgstr "Ping: %s ms"
-#: src/gui/debugwindow.cpp:393
+#: src/gui/debugwindow.cpp:395
#, c-format
msgid "In: %d bytes/s"
msgstr "In: %d bytes/s"
-#: src/gui/debugwindow.cpp:395
+#: src/gui/debugwindow.cpp:397
#, c-format
msgid "Out: %d bytes/s"
msgstr "Out: %d bytes/s"
@@ -881,26 +881,26 @@ msgstr "Out: %d bytes/s"
msgid "Did You Know?"
msgstr "¿Sabías que...?"
-#: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
-#: src/gui/inventorywindow.cpp:175 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:559 src/gui/shopwindow.cpp:111
+#: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
+#: src/gui/inventorywindow.cpp:176 src/gui/npcdialog.cpp:53
+#: src/gui/popupmenu.cpp:588 src/gui/shopwindow.cpp:113
msgid "Close"
msgstr "Cerrar"
-#: src/gui/didyouknowwindow.cpp:62
+#: src/gui/didyouknowwindow.cpp:64
msgid "< Previous"
msgstr "< Previo"
-#: src/gui/didyouknowwindow.cpp:63
+#: src/gui/didyouknowwindow.cpp:65
msgid "Next >"
msgstr "Siguiente >"
-#: src/gui/didyouknowwindow.cpp:64
+#: src/gui/didyouknowwindow.cpp:66
msgid "Auto open this window"
msgstr "Abrir automáticamente esta ventana"
#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:58 src/gui/textdialog.cpp:50
+#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:53 src/gui/textdialog.cpp:50
msgid "OK"
msgstr "OK"
@@ -908,10 +908,10 @@ msgstr "OK"
msgid "Equipment"
msgstr "Equipamiento"
-#: src/gui/equipmentwindow.cpp:93 src/gui/inventorywindow.cpp:130
-#: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
-#: src/gui/popupmenu.cpp:1643 src/gui/popupmenu.cpp:1738
-#: src/gui/popupmenu.cpp:1783
+#: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:131
+#: src/gui/inventorywindow.cpp:512 src/gui/inventorywindow.cpp:521
+#: src/gui/popupmenu.cpp:1693 src/gui/popupmenu.cpp:1788
+#: src/gui/popupmenu.cpp:1833
msgid "Unequip"
msgstr "Quitárselo"
@@ -924,75 +924,75 @@ msgstr "Ayuda"
msgid "Inventory"
msgstr "Inventario"
-#: src/gui/inventorywindow.cpp:104
+#: src/gui/inventorywindow.cpp:105
msgid "Slots:"
msgstr "Espacios:"
-#: src/gui/inventorywindow.cpp:115
+#: src/gui/inventorywindow.cpp:116
msgid "Filter:"
msgstr "Filtro:"
-#: src/gui/inventorywindow.cpp:116
+#: src/gui/inventorywindow.cpp:117
msgid "Sort:"
msgstr "Ordenar:"
-#: src/gui/inventorywindow.cpp:122
+#: src/gui/inventorywindow.cpp:123
msgid "na"
msgstr "na"
-#: src/gui/inventorywindow.cpp:123
+#: src/gui/inventorywindow.cpp:124
msgid "az"
msgstr "az"
-#: src/gui/inventorywindow.cpp:124
+#: src/gui/inventorywindow.cpp:125
msgid "id"
msgstr "id"
-#: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:513
-#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1645
-#: src/gui/popupmenu.cpp:1740 src/gui/popupmenu.cpp:1785
+#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
+#: src/gui/inventorywindow.cpp:523 src/gui/popupmenu.cpp:1695
+#: src/gui/popupmenu.cpp:1790 src/gui/popupmenu.cpp:1835
msgid "Equip"
msgstr "Equipar"
-#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
-#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1648
-#: src/gui/popupmenu.cpp:1707 src/gui/popupmenu.cpp:1744
-#: src/gui/popupmenu.cpp:1788
+#: src/gui/inventorywindow.cpp:130 src/gui/inventorywindow.cpp:515
+#: src/gui/inventorywindow.cpp:519 src/gui/popupmenu.cpp:1698
+#: src/gui/popupmenu.cpp:1757 src/gui/popupmenu.cpp:1794
+#: src/gui/popupmenu.cpp:1838
msgid "Use"
msgstr "Usar"
-#: src/gui/inventorywindow.cpp:143 src/gui/inventorywindow.cpp:619
-#: src/gui/popupmenu.cpp:1652 src/gui/popupmenu.cpp:1749
-#: src/gui/popupmenu.cpp:1792
+#: src/gui/inventorywindow.cpp:144 src/gui/inventorywindow.cpp:620
+#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1799
+#: src/gui/popupmenu.cpp:1842
msgid "Drop..."
msgstr "Tirar..."
-#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1661
-#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1801
+#: src/gui/inventorywindow.cpp:145 src/gui/popupmenu.cpp:1711
+#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1851
msgid "Split"
msgstr "Dividir"
-#: src/gui/inventorywindow.cpp:145 src/gui/outfitwindow.cpp:59
-#: src/gui/popupmenu.cpp:520
+#: src/gui/inventorywindow.cpp:146 src/gui/outfitwindow.cpp:60
+#: src/gui/popupmenu.cpp:549
msgid "Outfits"
msgstr "Conjuntos"
-#: src/gui/inventorywindow.cpp:148
+#: src/gui/inventorywindow.cpp:149
msgid "Weight:"
msgstr "Peso:"
-#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
-#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
-#: src/gui/popupmenu.cpp:1804 src/gui/setup.cpp:72
+#: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:611
+#: src/gui/popupmenu.cpp:1674 src/gui/popupmenu.cpp:1811
+#: src/gui/popupmenu.cpp:1854 src/gui/setup.cpp:73
msgid "Store"
msgstr "Almacenar"
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1668
+#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1718
msgid "Retrieve"
msgstr "Recuperar"
-#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1657
-#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1797
+#: src/gui/inventorywindow.cpp:622 src/gui/popupmenu.cpp:1707
+#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1847
#: src/gui/windowmenu.cpp:97
msgid "Drop"
msgstr "Tirar"
@@ -1033,11 +1033,11 @@ msgstr "Agregar a las ventas de la tienda."
msgid "Unknown."
msgstr "Desconocido."
-#: src/gui/itempopup.cpp:176 src/gui/itempopup.cpp:182
+#: src/gui/itempopup.cpp:177 src/gui/itempopup.cpp:183
msgid ", "
msgstr ", "
-#: src/gui/itempopup.cpp:192
+#: src/gui/itempopup.cpp:193
#, c-format
msgid "Weight: %s"
msgstr "Peso: %s"
@@ -1046,90 +1046,94 @@ msgstr "Peso: %s"
msgid "Kill stats"
msgstr "Estadísticas"
-#: src/gui/killstats.cpp:64
+#: src/gui/killstats.cpp:65
msgid "Reset stats"
msgstr "Restablecer estadísticas"
-#: src/gui/killstats.cpp:65
+#: src/gui/killstats.cpp:66
msgid "Reset timer"
msgstr "Restablecer cronometrador"
-#: src/gui/killstats.cpp:69 src/gui/killstats.cpp:205
+#: src/gui/killstats.cpp:70 src/gui/killstats.cpp:206
#, c-format
msgid "Level: %d at %f%%"
msgstr "Nivel: %d de %f%%"
-#: src/gui/killstats.cpp:73 src/gui/killstats.cpp:210
+#: src/gui/killstats.cpp:74 src/gui/killstats.cpp:211
#, c-format
msgid "Exp: %d/%d Left: %d"
msgstr "Exp: %d/%d Queda: %d"
-#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:216
-#: src/gui/killstats.cpp:225
+#: src/gui/killstats.cpp:77 src/gui/killstats.cpp:217
+#: src/gui/killstats.cpp:226
#, c-format
msgid "1%% = %d exp, avg mob for 1%%: %s"
msgstr "1%% = %d exp, prom. pandilla para 1%%: %s"
-#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:142
-#: src/gui/killstats.cpp:234
+#: src/gui/killstats.cpp:80 src/gui/killstats.cpp:143
+#: src/gui/killstats.cpp:235
#, c-format
msgid "Kills: %s, total exp: %s"
msgstr "Muertes: %s, exp. total: %s"
-#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
-#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:230
+#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145
+#: src/gui/killstats.cpp:221 src/gui/killstats.cpp:231
#, c-format
msgid "Avg Exp: %s, No. of avg mob to next level: %s"
msgstr "Prom. Exp: %s, Prom. de pandilla para siguiente nivel: %s"
-#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:162
-#: src/gui/killstats.cpp:237
+#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:163
+#: src/gui/killstats.cpp:238
#, c-format
msgid "Kills/Min: %s, Exp/Min: %s"
msgstr "Matanza/Mín: %s, Exp/Mín: %s"
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:89 src/gui/killstats.cpp:94
-#: src/gui/killstats.cpp:289 src/gui/killstats.cpp:305
-#: src/gui/killstats.cpp:323
+#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:90 src/gui/killstats.cpp:95
+#: src/gui/killstats.cpp:290 src/gui/killstats.cpp:306
+#: src/gui/killstats.cpp:324
#, c-format
msgid "Exp speed per %d min: %s"
msgid_plural "Exp speed per %d min: %s"
msgstr[0] "Rapidez de experiencia por %d minuto: %s"
msgstr[1] "Rapidez de experiencia por %d minutos: %s"
-#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
+#: src/gui/killstats.cpp:88 src/gui/killstats.cpp:93 src/gui/killstats.cpp:98
#, c-format
msgid "Time for next level per %d min: %s"
msgid_plural "Time for next level per %d min: %s"
msgstr[0] "Tiempo para el siguiente nivel por %d minuto: %s"
msgstr[1] "Tiempo para el siguiente nivel por %d minutos: %s"
-#: src/gui/killstats.cpp:100 src/gui/killstats.cpp:241
+#: src/gui/killstats.cpp:101 src/gui/killstats.cpp:242
msgid "Last kill exp:"
msgstr "Exp de último monstruo eliminado:"
-#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:355
-#: src/gui/killstats.cpp:361 src/gui/killstats.cpp:367
-#: src/gui/killstats.cpp:372
+#: src/gui/killstats.cpp:103 src/gui/killstats.cpp:356
+#: src/gui/killstats.cpp:362 src/gui/killstats.cpp:368
+#: src/gui/killstats.cpp:373
msgid "Time before jacko spawn:"
msgstr "Tiempo antes de que jacko desove:"
-#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:301
-#: src/gui/killstats.cpp:311 src/gui/killstats.cpp:318
-#: src/gui/killstats.cpp:330 src/gui/killstats.cpp:337
+#: src/gui/killstats.cpp:295 src/gui/killstats.cpp:302
+#: src/gui/killstats.cpp:312 src/gui/killstats.cpp:319
+#: src/gui/killstats.cpp:331 src/gui/killstats.cpp:338
#, c-format
msgid " Time for next level: %s"
msgstr " Tiempo para el siguiente nivel: %s"
-#: src/gui/killstats.cpp:361
+#: src/gui/killstats.cpp:362
#, c-format
msgid "%s %d?"
msgstr "¿%s %d?"
-#: src/gui/killstats.cpp:367
+#: src/gui/killstats.cpp:368
msgid "jacko spawning"
msgstr "desove de jacko"
+#: src/guildmanager.cpp:464 src/net/ea/guildhandler.cpp:439
+msgid "You have left the guild."
+msgstr "Has dejado el gremio."
+
#: src/gui/logindialog.cpp:59
msgid "Normal"
msgstr "Normal"
@@ -1146,7 +1150,7 @@ msgstr "Saltar"
msgid "Login"
msgstr "Login"
-#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:246
+#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:252
#: src/gui/widgets/chattab.cpp:173
msgid "Server:"
msgstr "Servidor:"
@@ -1228,11 +1232,11 @@ msgstr "Enviar"
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:561
+#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:590
msgid "Clear"
msgstr "Limpiar"
-#: src/gui/npcdialog.cpp:222
+#: src/gui/npcdialog.cpp:223
msgid "> Next"
msgstr "> Siguiente"
@@ -1248,346 +1252,346 @@ msgstr "Enviar"
msgid "Failed to send as sender or letter invalid."
msgstr "Fallo al enviar o mensaje inválido."
-#: src/gui/outfitwindow.cpp:82 src/gui/outfitwindow.cpp:886
+#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:890
#, c-format
msgid "Outfit: %d"
msgstr "Conjuntos: %d"
-#: src/gui/outfitwindow.cpp:84 src/gui/outfitwindow.cpp:888
+#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:892
#, c-format
msgid "Key: %s"
msgstr "Tecla: %s"
-#: src/gui/outfitwindow.cpp:87
+#: src/gui/outfitwindow.cpp:91
msgid "Unequip first"
msgstr "Quitárselo antes"
-#: src/gui/outfitwindow.cpp:90
+#: src/gui/outfitwindow.cpp:94
msgid "Away outfit"
-msgstr "Fuera conjunto"
+msgstr "Conjunto para modo AFK"
-#: src/gui/popupmenu.cpp:133 src/gui/popupmenu.cpp:616
+#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:645
#: src/gui/widgets/tradetab.cpp:44
msgid "Trade"
msgstr "Intercambio"
-#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:375
+#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:393
msgid "Whisper"
msgstr "Susurrar"
-#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:621
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:650
msgid "Heal"
msgstr "Sanar"
-#: src/gui/popupmenu.cpp:146 src/gui/popupmenu.cpp:381
-#: src/gui/popupmenu.cpp:628
+#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:399
+#: src/gui/popupmenu.cpp:657
msgid "Be friend"
msgstr "Ser amigo"
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:383
-#: src/gui/popupmenu.cpp:389 src/gui/popupmenu.cpp:408
-#: src/gui/popupmenu.cpp:630 src/gui/popupmenu.cpp:638
-#: src/gui/popupmenu.cpp:662
+#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:156
+#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:401
+#: src/gui/popupmenu.cpp:407 src/gui/popupmenu.cpp:426
+#: src/gui/popupmenu.cpp:659 src/gui/popupmenu.cpp:667
+#: src/gui/popupmenu.cpp:691
msgid "Disregard"
msgstr "Desatender"
-#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:161
-#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:177
-#: src/gui/popupmenu.cpp:385 src/gui/popupmenu.cpp:391
-#: src/gui/popupmenu.cpp:398 src/gui/popupmenu.cpp:403
-#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
-#: src/gui/popupmenu.cpp:649 src/gui/popupmenu.cpp:655
+#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:160
+#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:176
+#: src/gui/popupmenu.cpp:403 src/gui/popupmenu.cpp:409
+#: src/gui/popupmenu.cpp:416 src/gui/popupmenu.cpp:421
+#: src/gui/popupmenu.cpp:662 src/gui/popupmenu.cpp:670
+#: src/gui/popupmenu.cpp:678 src/gui/popupmenu.cpp:684
msgid "Erase"
msgstr "Borrar"
-#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:175
-#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:395
-#: src/gui/popupmenu.cpp:402 src/gui/popupmenu.cpp:407
-#: src/gui/popupmenu.cpp:646 src/gui/popupmenu.cpp:654
-#: src/gui/popupmenu.cpp:660
+#: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:174
+#: src/gui/popupmenu.cpp:181 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:425
+#: src/gui/popupmenu.cpp:675 src/gui/popupmenu.cpp:683
+#: src/gui/popupmenu.cpp:689
msgid "Unignore"
msgstr "Des-ignorar"
-#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:186
-#: src/gui/popupmenu.cpp:397 src/gui/popupmenu.cpp:410
-#: src/gui/popupmenu.cpp:648 src/gui/popupmenu.cpp:664
+#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:185
+#: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:428
+#: src/gui/popupmenu.cpp:677 src/gui/popupmenu.cpp:693
#: src/playerrelations.cpp:400
msgid "Completely ignore"
msgstr "Ignorar completamente"
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:418
-#: src/gui/popupmenu.cpp:672
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:436
+#: src/gui/popupmenu.cpp:701
msgid "Follow"
msgstr "Seguir"
-#: src/gui/popupmenu.cpp:196 src/gui/popupmenu.cpp:419
-#: src/gui/popupmenu.cpp:673
+#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:437
+#: src/gui/popupmenu.cpp:702
msgid "Imitation"
msgstr "Imitación"
-#: src/gui/popupmenu.cpp:206 src/gui/popupmenu.cpp:710
+#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:739
msgid "Invite to party"
msgstr "Invitar a grupo"
-#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:428
-#: src/gui/popupmenu.cpp:715
+#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:744
msgid "Kick from party"
msgstr "Sacar del grupo"
-#: src/gui/popupmenu.cpp:226 src/gui/popupmenu.cpp:439
-#: src/gui/popupmenu.cpp:729
+#: src/gui/popupmenu.cpp:225 src/gui/popupmenu.cpp:237
+#: src/gui/popupmenu.cpp:460 src/gui/popupmenu.cpp:761
msgid "Kick from guild"
msgstr "Sacar del gremio"
-#: src/gui/popupmenu.cpp:228 src/gui/popupmenu.cpp:441
-#: src/gui/popupmenu.cpp:731
+#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:242
+#: src/gui/popupmenu.cpp:465 src/gui/popupmenu.cpp:766
msgid "Change pos in guild"
msgstr "Cambiar posición en el gremio"
-#: src/gui/popupmenu.cpp:234 src/gui/popupmenu.cpp:446
-#: src/gui/popupmenu.cpp:737
+#: src/gui/popupmenu.cpp:251 src/gui/popupmenu.cpp:474
+#: src/gui/popupmenu.cpp:776
msgid "Invite to guild"
msgstr "Invitar al gremio"
-#: src/gui/popupmenu.cpp:242
+#: src/gui/popupmenu.cpp:260
msgid "Kick player"
msgstr "Sacar jugador"
-#: src/gui/popupmenu.cpp:244
+#: src/gui/popupmenu.cpp:262
msgid "Nuke"
msgstr "Eliminar"
-#: src/gui/popupmenu.cpp:247 src/gui/popupmenu.cpp:675
+#: src/gui/popupmenu.cpp:265 src/gui/popupmenu.cpp:704
msgid "Show Items"
msgstr "Mostrar artículos"
-#: src/gui/popupmenu.cpp:248 src/gui/popupmenu.cpp:676
-#: src/gui/popupmenu.cpp:1970
+#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:705
+#: src/gui/popupmenu.cpp:2020
msgid "Undress"
msgstr "Desvestir"
-#: src/gui/popupmenu.cpp:250 src/gui/popupmenu.cpp:286
-#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:678
-#: src/gui/popupmenu.cpp:746
+#: src/gui/popupmenu.cpp:268 src/gui/popupmenu.cpp:304
+#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:707
+#: src/gui/popupmenu.cpp:786
msgid "Add comment"
msgstr "Agregar comentario"
-#: src/gui/popupmenu.cpp:268 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:695
+#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:482
+#: src/gui/popupmenu.cpp:724
msgid "Buy (?)"
msgstr "Comprar (?)"
-#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:454
-#: src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:483
+#: src/gui/popupmenu.cpp:726
msgid "Sell (?)"
msgstr "Vender (?)"
-#: src/gui/popupmenu.cpp:298
+#: src/gui/popupmenu.cpp:316
msgid "Kick"
msgstr "Sacar"
-#: src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:327
msgid "Remove from attack list"
msgstr "Remover de la lista de ataque"
-#: src/gui/popupmenu.cpp:315
+#: src/gui/popupmenu.cpp:333
msgid "Add to priority attack list"
msgstr "Añadir a la lista de ataque prioritaria"
-#: src/gui/popupmenu.cpp:317
+#: src/gui/popupmenu.cpp:335
msgid "Add to attack list"
msgstr "Agregar a la lista de ataque"
-#: src/gui/popupmenu.cpp:320
+#: src/gui/popupmenu.cpp:338
msgid "Add to ignore list"
msgstr "Agregar a la lista de ignorados"
-#: src/gui/popupmenu.cpp:333 src/gui/popupmenu.cpp:457
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:486
msgid "Add name to chat"
msgstr "Agregar nombre al chat"
-#: src/gui/popupmenu.cpp:483
+#: src/gui/popupmenu.cpp:512
msgid "Pick up"
msgstr "Recoger"
-#: src/gui/popupmenu.cpp:484 src/gui/popupmenu.cpp:1682
-#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1805
+#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:1732
+#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1855
msgid "Add to chat"
msgstr "Añadir al chat"
-#: src/gui/popupmenu.cpp:501
+#: src/gui/popupmenu.cpp:530
msgid "Map Item"
msgstr "Mapa Objeto"
-#: src/gui/popupmenu.cpp:502
+#: src/gui/popupmenu.cpp:531
msgid "Rename"
msgstr "Renombrar"
-#: src/gui/popupmenu.cpp:503 src/gui/popupmenu.cpp:1923
-#: src/gui/popupmenu.cpp:1941 src/gui/popupmenu.cpp:1946
+#: src/gui/popupmenu.cpp:532 src/gui/popupmenu.cpp:1973
+#: src/gui/popupmenu.cpp:1991 src/gui/popupmenu.cpp:1996
msgid "Remove"
msgstr "Quitar"
-#: src/gui/popupmenu.cpp:508
+#: src/gui/popupmenu.cpp:537
msgid "Warp"
msgstr "Deformar"
-#: src/gui/popupmenu.cpp:522
+#: src/gui/popupmenu.cpp:551
msgid "Load old outfits"
msgstr "Cargar conjuntos antiguos"
-#: src/gui/popupmenu.cpp:538 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:567 src/gui/windowmenu.cpp:96
msgid "Spells"
msgstr "Hechizos"
-#: src/gui/popupmenu.cpp:540
+#: src/gui/popupmenu.cpp:569
msgid "Load old spells"
msgstr "Cargar hechizos antiguos"
-#: src/gui/popupmenu.cpp:541
+#: src/gui/popupmenu.cpp:570
msgid "Edit spell"
msgstr "Editar hechizo"
-#: src/gui/popupmenu.cpp:567
+#: src/gui/popupmenu.cpp:596
msgid "Disable highlight"
msgstr "Deshabilitar resaltado"
-#: src/gui/popupmenu.cpp:572
+#: src/gui/popupmenu.cpp:601
msgid "Enable highlight"
msgstr "Habilitar resaltado"
-#: src/gui/popupmenu.cpp:577
-msgid "Dont remove name"
+#: src/gui/popupmenu.cpp:606
+msgid "Don't remove name"
msgstr "No remover nombre"
-#: src/gui/popupmenu.cpp:582
+#: src/gui/popupmenu.cpp:611
msgid "Remove name"
msgstr "Remover nombre"
-#: src/gui/popupmenu.cpp:587
+#: src/gui/popupmenu.cpp:616
msgid "Enable away"
msgstr "Habilitar ausencia"
-#: src/gui/popupmenu.cpp:592
+#: src/gui/popupmenu.cpp:621
msgid "Disable away"
msgstr "Deshabilitar ausencia"
-#: src/gui/popupmenu.cpp:598 src/gui/socialwindow.cpp:1035
+#: src/gui/popupmenu.cpp:627 src/gui/socialwindow.cpp:1141
msgid "Leave"
msgstr "Dejar"
-#: src/gui/popupmenu.cpp:758
+#: src/gui/popupmenu.cpp:798
msgid "Change guild position"
msgstr "Cambiar posición del gremio"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1189
+#: src/gui/popupmenu.cpp:1234
msgid "Rename map sign "
msgstr "Renombrar señal del mapa"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1191
+#: src/gui/popupmenu.cpp:1236
msgid "Name: "
msgstr "Nombre:"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1241
+#: src/gui/popupmenu.cpp:1286
msgid "Player comment "
msgstr "Comentario del jugador "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1243
+#: src/gui/popupmenu.cpp:1288
msgid "Comment: "
msgstr "Comentario: "
-#: src/gui/popupmenu.cpp:1607
+#: src/gui/popupmenu.cpp:1657
msgid "Add to trade"
msgstr "Agredar al intercambio"
-#: src/gui/popupmenu.cpp:1613
+#: src/gui/popupmenu.cpp:1663
msgid "Add to trade 10"
msgstr "Agregar 10 al intercambio"
-#: src/gui/popupmenu.cpp:1616
+#: src/gui/popupmenu.cpp:1666
msgid "Add to trade half"
msgstr "Agregar la mitad al intercambio"
-#: src/gui/popupmenu.cpp:1618
+#: src/gui/popupmenu.cpp:1668
msgid "Add to trade all"
msgstr "Agregar todo al intercambio"
-#: src/gui/popupmenu.cpp:1630
+#: src/gui/popupmenu.cpp:1680
msgid "Store 10"
msgstr "Almacenar 10"
-#: src/gui/popupmenu.cpp:1633
+#: src/gui/popupmenu.cpp:1683
msgid "Store half"
msgstr "Almacenar la mitad"
-#: src/gui/popupmenu.cpp:1635
+#: src/gui/popupmenu.cpp:1685
msgid "Store all"
msgstr "Almacenar todo"
-#: src/gui/popupmenu.cpp:1653 src/gui/popupmenu.cpp:1750
-#: src/gui/popupmenu.cpp:1793
+#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1800
+#: src/gui/popupmenu.cpp:1843
msgid "Drop all"
msgstr "Tirar todo"
-#: src/gui/popupmenu.cpp:1674
+#: src/gui/popupmenu.cpp:1724
msgid "Retrieve 10"
msgstr "Recuperar 10"
-#: src/gui/popupmenu.cpp:1677
+#: src/gui/popupmenu.cpp:1727
msgid "Retrieve half"
msgstr "Recuperar la mitad"
-#: src/gui/popupmenu.cpp:1679
+#: src/gui/popupmenu.cpp:1729
msgid "Retrieve all"
msgstr "Recuperar todo"
-#: src/gui/popupmenu.cpp:1710 src/gui/popupmenu.cpp:1766
+#: src/gui/popupmenu.cpp:1760 src/gui/popupmenu.cpp:1816
msgid "Load old item shortcuts"
msgstr "Cargar atajos antiguos de artículos"
-#: src/gui/popupmenu.cpp:1809
+#: src/gui/popupmenu.cpp:1859
msgid "Load old drop shortcuts"
msgstr "Cargar atajos antiguos de soltar (drop)"
-#: src/gui/popupmenu.cpp:1835 src/gui/popupmenu.cpp:1870
+#: src/gui/popupmenu.cpp:1885 src/gui/popupmenu.cpp:1920
msgid "Hide"
msgstr "Ocultar"
-#: src/gui/popupmenu.cpp:1841 src/gui/popupmenu.cpp:1876
+#: src/gui/popupmenu.cpp:1891 src/gui/popupmenu.cpp:1926
msgid "Show"
msgstr "Mostrar"
-#: src/gui/popupmenu.cpp:1883
+#: src/gui/popupmenu.cpp:1933
msgid "Reset yellow bar"
msgstr "Restablecer barra amarilla"
-#: src/gui/popupmenu.cpp:1885 src/gui/statuswindow.cpp:240
+#: src/gui/popupmenu.cpp:1935 src/gui/statuswindow.cpp:241
msgid "Copy to chat"
msgstr "Copiar al chat"
-#: src/gui/popupmenu.cpp:1903 src/gui/socialwindow.cpp:854
-#: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
+#: src/gui/popupmenu.cpp:1953 src/gui/socialwindow.cpp:958
+#: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028
msgid "(default)"
msgstr "(predeterminado)"
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1933
+#: src/gui/popupmenu.cpp:1965 src/gui/popupmenu.cpp:1983
msgid "Move up"
msgstr "Subir"
-#: src/gui/popupmenu.cpp:1920 src/gui/popupmenu.cpp:1938
+#: src/gui/popupmenu.cpp:1970 src/gui/popupmenu.cpp:1988
msgid "Move down"
msgstr "Bajar"
-#: src/gui/quitdialog.cpp:56
+#: src/gui/quitdialog.cpp:51
msgid "Switch server"
msgstr "Cambiar de servidor"
-#: src/gui/quitdialog.cpp:57
+#: src/gui/quitdialog.cpp:52
msgid "Switch character"
msgstr "Cambiar de personaje"
@@ -1623,64 +1627,64 @@ msgstr "La contraseña debe tener como mínimo %d caracteres."
msgid "Passwords do not match."
msgstr "Las contraseñas no coinciden."
-#: src/gui/serverdialog.cpp:231
+#: src/gui/serverdialog.cpp:237
msgid "Choose Your Server"
msgstr "Escoja tu servidor"
-#: src/gui/serverdialog.cpp:242
+#: src/gui/serverdialog.cpp:248
msgid "Choose Your Server *** SAFE MODE ***"
msgstr "Elige tu servidor *** MODO SEGURO ***"
-#: src/gui/serverdialog.cpp:247
+#: src/gui/serverdialog.cpp:253
msgid "Port:"
msgstr "Puerto:"
-#: src/gui/serverdialog.cpp:251
+#: src/gui/serverdialog.cpp:257
msgid "Use same ip for game sub servers"
msgstr "Usar el mismo ip para los subservidores del juego"
-#: src/gui/serverdialog.cpp:265
+#: src/gui/serverdialog.cpp:271
msgid "Server type:"
msgstr "Tipo de servidor:"
-#: src/gui/serverdialog.cpp:289
+#: src/gui/serverdialog.cpp:295
msgid "Load"
msgstr "Cargar"
-#: src/gui/serverdialog.cpp:290
+#: src/gui/serverdialog.cpp:296
msgid "Connect"
msgstr "Conectar"
-#: src/gui/serverdialog.cpp:291
+#: src/gui/serverdialog.cpp:297
msgid "Custom Server"
msgstr "Servidor propio"
-#: src/gui/serverdialog.cpp:396
+#: src/gui/serverdialog.cpp:402
msgid "Please type both the address and the port of a server."
msgstr "Por favor especifique el nombre y el puerto del servidor."
-#: src/gui/serverdialog.cpp:554
+#: src/gui/serverdialog.cpp:560
#, c-format
msgid "Downloading server list...%2.2f%%"
msgstr "Bajando la lista de servidores...%2.2f%%"
-#: src/gui/serverdialog.cpp:559
+#: src/gui/serverdialog.cpp:565
msgid "Waiting for server..."
msgstr "Esperando al servidor..."
-#: src/gui/serverdialog.cpp:563
+#: src/gui/serverdialog.cpp:569
msgid "Preparing download"
msgstr "Preparando la descarga"
-#: src/gui/serverdialog.cpp:567
+#: src/gui/serverdialog.cpp:573
msgid "Error retreiving server list!"
msgstr "Error al recuperar la lista de servers!"
-#: src/gui/serverdialog.cpp:672
+#: src/gui/serverdialog.cpp:678
msgid "requires a newer version"
msgstr "requiere una version mas nueva"
-#: src/gui/serverdialog.cpp:674
+#: src/gui/serverdialog.cpp:680
#, c-format
msgid "requires v%s"
msgstr "requiere v%s"
@@ -1827,6 +1831,14 @@ msgstr "Tiempo"
msgid "Use local time"
msgstr "Usar hora local"
+#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:157
+msgid "Other"
+msgstr "Otro"
+
+#: src/gui/setup_chat.cpp:125
+msgid "Highlight words (separated by comma)"
+msgstr "Resaltar palabras (separadas por coma)"
+
#: src/gui/setup_colors.cpp:49
msgid "This is what the color looks like"
msgstr "Así es como se verá el color"
@@ -1874,11 +1886,11 @@ msgstr "Azul:"
msgid "Alpha:"
msgstr "Alpha:"
-#: src/gui/setup.cpp:70
+#: src/gui/setup.cpp:71
msgid "Apply"
msgstr "Aplicar"
-#: src/gui/setup.cpp:73
+#: src/gui/setup.cpp:74
msgid "Reset Windows"
msgstr "Restaurar Ventanas"
@@ -2055,34 +2067,42 @@ msgid "Log NPC dialogue"
msgstr "Registro de diálogo de NPC"
#: src/gui/setup_other.cpp:148
-msgid "Other"
-msgstr "Otro"
+msgid "Bots support"
+msgstr "Soporte de bots"
#: src/gui/setup_other.cpp:150
+msgid "Enable auction bot support"
+msgstr "Habilitar soporte para auction bot"
+
+#: src/gui/setup_other.cpp:153
+msgid "Enable guild bot support and disable native guild support"
+msgstr "Habilitar soporte de bot clan y deshabilitar soporte de clan nativo"
+
+#: src/gui/setup_other.cpp:159
msgid "Enable server side attack"
msgstr "Habilitar los ataques colaterales de servidor"
-#: src/gui/setup_other.cpp:153
+#: src/gui/setup_other.cpp:162
msgid "Enable bot checker"
msgstr "Habilitar el control de robot"
-#: src/gui/setup_other.cpp:156
+#: src/gui/setup_other.cpp:165
msgid "Enable buggy servers protection"
msgstr "Habilitar la proteción contra servidores defectuosos"
-#: src/gui/setup_other.cpp:159
+#: src/gui/setup_other.cpp:168
msgid "Enable debug log"
msgstr "Habilitar registro de depuración"
-#: src/gui/setup_other.cpp:162
+#: src/gui/setup_other.cpp:171
msgid "Low traffic mode"
msgstr "Modo de bajo tráfico"
-#: src/gui/setup_other.cpp:165
+#: src/gui/setup_other.cpp:174
msgid "Hide shield sprite"
msgstr "Ocultar los objetos escudos"
-#: src/gui/setup_other.cpp:168
+#: src/gui/setup_other.cpp:177
msgid "Show background"
msgstr "Mostrar fondo"
@@ -2178,6 +2198,10 @@ msgstr "Mostrar estados"
msgid "Show ip addresses on screenshots"
msgstr "Mostrar dirección IP en la captura de pantalla"
+#: src/gui/setup_players.cpp:81
+msgid "Allow self heal with mouse click"
+msgstr "Permitir curarse a sí mismo con clic del ratón"
+
#: src/gui/setup_relations.cpp:65
msgid "Relation"
msgstr "Relación"
@@ -2367,12 +2391,12 @@ msgstr "como partícula"
#: src/gui/setup_video.cpp:302
msgid "FPS limit:"
-msgstr "Limite FPS:"
+msgstr "Límite FPS:"
#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709
msgid "Alt FPS limit: "
-msgstr "Limites alternativas FPS: "
+msgstr "Límite FPS alternativo: "
#: src/gui/setup_video.cpp:315
msgid "Video"
@@ -2453,261 +2477,266 @@ msgstr "Configuración del efecto de las partículas cambiado."
msgid "Changes will take effect on map change."
msgstr "Los cambios tendran efecto cuando se cambie de mapa."
-#: src/gui/shopwindow.cpp:74
+#: src/gui/shopwindow.cpp:75
msgid "Personal Shop"
msgstr "Tienda personal"
-#: src/gui/shopwindow.cpp:116
+#: src/gui/shopwindow.cpp:118
msgid "Buy items"
msgstr "Comprar artículos"
-#: src/gui/shopwindow.cpp:117
+#: src/gui/shopwindow.cpp:119
msgid "Sell items"
msgstr "Vender artículos"
-#: src/gui/shopwindow.cpp:119 src/gui/shopwindow.cpp:122
-#: src/gui/tradewindow.cpp:88
+#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
+#: src/gui/tradewindow.cpp:89
msgid "Add"
msgstr "Anadir"
-#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
+#: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
msgid "Announce"
msgstr "Anunciar"
-#: src/gui/shopwindow.cpp:125
+#: src/gui/shopwindow.cpp:127
msgid "Show links in announce"
msgstr "Mostrar enlaces en anuncio"
-#: src/gui/shopwindow.cpp:723 src/net/ea/tradehandler.cpp:106
+#: src/gui/shopwindow.cpp:148 src/gui/shopwindow.cpp:149
+msgid "Auction"
+msgstr "Subasta"
+
+#: src/gui/shopwindow.cpp:748 src/net/ea/tradehandler.cpp:106
#: src/net/manaserv/tradehandler.cpp:127
msgid "Request for Trade"
msgstr "Propuesta de intercambio"
-#: src/gui/shopwindow.cpp:724
+#: src/gui/shopwindow.cpp:749
#, c-format
msgid "%s wants to %s %s do you accept?"
msgstr "%s quiere %s %s ¿aceptas?"
-#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:81
+#: src/gui/skilldialog.cpp:276 src/gui/windowmenu.cpp:81
msgid "Skills"
msgstr "Habilidades"
-#: src/gui/skilldialog.cpp:283
+#: src/gui/skilldialog.cpp:288
msgid "Up"
msgstr "Incrementar"
-#: src/gui/skilldialog.cpp:336
+#: src/gui/skilldialog.cpp:341
#, c-format
msgid "Skill points available: %d"
msgstr "Puntos de habilidades: %d"
-#: src/gui/skilldialog.cpp:413
+#: src/gui/skilldialog.cpp:418
#, c-format
msgid "Skill Set %d"
msgstr "Habilidades %d"
-#: src/gui/skilldialog.cpp:425
+#: src/gui/skilldialog.cpp:430
#, c-format
msgid "Skill %d"
msgstr "Habilidad %d"
-#: src/gui/skilldialog.cpp:492 src/gui/skilldialog.cpp:545
+#: src/gui/skilldialog.cpp:497 src/gui/skilldialog.cpp:550
#, c-format
msgid "Lvl: %d"
msgstr "Nivel: %d"
-#: src/gui/skilldialog.cpp:537
+#: src/gui/skilldialog.cpp:542
#, c-format
msgid "Lvl: %d (%+d)"
msgstr "Nivel: %d (%+d)"
-#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
+#: src/gui/socialwindow.cpp:118 src/gui/socialwindow.cpp:216
+#: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52
msgid "Guild"
msgstr "Clan"
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:147
#, c-format
msgid "Invited user %s to guild %s."
msgstr "Invita al jugador %s para su clan %s."
-#: src/gui/socialwindow.cpp:160
+#: src/gui/socialwindow.cpp:161
#, c-format
msgid "Guild %s quit requested."
msgstr "Clan %s pidiendo salir."
-#: src/gui/socialwindow.cpp:187
+#: src/gui/socialwindow.cpp:188
msgid "Member Invite to Guild"
msgstr "Miembro invitado al clan."
-#: src/gui/socialwindow.cpp:188
+#: src/gui/socialwindow.cpp:189
#, c-format
msgid "Who would you like to invite to guild %s?"
msgstr "A quién te gustaría invitar al clan %s?"
-#: src/gui/socialwindow.cpp:197
+#: src/gui/socialwindow.cpp:198
msgid "Leave Guild?"
msgstr "Salir del clan?"
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:199
#, c-format
msgid "Are you sure you want to leave guild %s?"
msgstr "Estás seguro de dejar el clan %s?"
-#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:319 src/net/ea/gui/partytab.cpp:50
msgid "Party"
msgstr "Grupo"
-#: src/gui/socialwindow.cpp:243
+#: src/gui/socialwindow.cpp:347
#, c-format
msgid "Invited user %s to party."
msgstr "Jugador %s invitado al grupo."
-#: src/gui/socialwindow.cpp:257
+#: src/gui/socialwindow.cpp:361
#, c-format
msgid "Party %s quit requested."
msgstr "Grupo %s requisitado."
-#: src/gui/socialwindow.cpp:284
+#: src/gui/socialwindow.cpp:388
msgid "Member Invite to Party"
msgstr "Invitación de un miembro al grupo"
-#: src/gui/socialwindow.cpp:285
+#: src/gui/socialwindow.cpp:389
#, c-format
msgid "Who would you like to invite to party %s?"
msgstr "¿A quién te gustaría invitar al grupo %s?"
-#: src/gui/socialwindow.cpp:294
+#: src/gui/socialwindow.cpp:398
msgid "Leave Party?"
msgstr "¿Dejar grupo?"
-#: src/gui/socialwindow.cpp:295
+#: src/gui/socialwindow.cpp:399
#, c-format
msgid "Are you sure you want to leave party %s?"
msgstr "¿Estás seguro de que quieres dejar el grupo %s?"
-#: src/gui/socialwindow.cpp:521
+#: src/gui/socialwindow.cpp:625
msgid "Nav"
msgstr "Navegación"
-#: src/gui/socialwindow.cpp:799
+#: src/gui/socialwindow.cpp:903
msgid "Atk"
msgstr "Ataque"
-#: src/gui/socialwindow.cpp:840
+#: src/gui/socialwindow.cpp:944
msgid "Priority mobs"
msgstr "Pandillas prioritarias"
-#: src/gui/socialwindow.cpp:872
+#: src/gui/socialwindow.cpp:976
msgid "Attack mobs"
msgstr "Ataques de las pandillas"
-#: src/gui/socialwindow.cpp:907
+#: src/gui/socialwindow.cpp:1011
msgid "Ignore mobs"
msgstr "Ignorar pandillas"
-#: src/gui/socialwindow.cpp:970
+#: src/gui/socialwindow.cpp:1074
msgid "Create Guild"
msgstr "Crear clan"
-#: src/gui/socialwindow.cpp:971 src/gui/socialwindow.cpp:1387
+#: src/gui/socialwindow.cpp:1075 src/gui/socialwindow.cpp:1503
msgid "Create Party"
msgstr "Crear grupo"
-#: src/gui/socialwindow.cpp:1013 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1117 src/gui/windowmenu.cpp:93
msgid "Social"
msgstr "Social"
-#: src/gui/socialwindow.cpp:1034
+#: src/gui/socialwindow.cpp:1140
msgid "Invite"
msgstr "Invitar"
-#: src/gui/socialwindow.cpp:1176
+#: src/gui/socialwindow.cpp:1286
#, c-format
msgid "Accepted party invite from %s."
msgstr "Aceptada la invitación de %s."
-#: src/gui/socialwindow.cpp:1186
+#: src/gui/socialwindow.cpp:1296
#, c-format
msgid "Rejected party invite from %s."
msgstr "Cancelada la invitación de %s."
-#: src/gui/socialwindow.cpp:1203
+#: src/gui/socialwindow.cpp:1313
#, c-format
msgid "Accepted guild invite from %s."
msgstr "Aceptada la invitación a la guild de %s."
-#: src/gui/socialwindow.cpp:1213
+#: src/gui/socialwindow.cpp:1326
#, c-format
msgid "Rejected guild invite from %s."
msgstr "Cancelada la invitación a la guild de %s."
-#: src/gui/socialwindow.cpp:1257
+#: src/gui/socialwindow.cpp:1373
#, c-format
msgid "Creating guild called %s."
msgstr "Creando clan llamado %s."
-#: src/gui/socialwindow.cpp:1280
+#: src/gui/socialwindow.cpp:1396
#, c-format
msgid "Creating party called %s."
msgstr "Creando grupo llamado %s."
-#: src/gui/socialwindow.cpp:1294
+#: src/gui/socialwindow.cpp:1410
msgid "Guild Name"
msgstr "Nombre del clan"
-#: src/gui/socialwindow.cpp:1295
+#: src/gui/socialwindow.cpp:1411
msgid "Choose your guild's name."
msgstr "Escoja el nombre de su clan."
-#: src/gui/socialwindow.cpp:1309
+#: src/gui/socialwindow.cpp:1425
msgid "Received guild request, but one already exists."
msgstr "Recibida petición de creación del clan, pero ya existe."
-#: src/gui/socialwindow.cpp:1315
+#: src/gui/socialwindow.cpp:1431
#, c-format
msgid "%s has invited you to join the guild %s."
msgstr "%s te ha invitado al clan %s."
-#: src/gui/socialwindow.cpp:1321
+#: src/gui/socialwindow.cpp:1437
msgid "Accept Guild Invite"
msgstr "Aceptar invitación al clan"
-#: src/gui/socialwindow.cpp:1336
+#: src/gui/socialwindow.cpp:1452
msgid "Received party request, but one already exists."
msgstr "Recibida petición de creación del grupo, pero ya existe."
-#: src/gui/socialwindow.cpp:1347
+#: src/gui/socialwindow.cpp:1463
msgid "You have been invited you to join a party."
msgstr "Fuiste invitado a un grupo."
-#: src/gui/socialwindow.cpp:1351
+#: src/gui/socialwindow.cpp:1467
#, c-format
msgid "You have been invited to join the %s party."
msgstr "Has sido invitado para unirte al grupo %s."
-#: src/gui/socialwindow.cpp:1359
+#: src/gui/socialwindow.cpp:1475
#, c-format
msgid "%s has invited you to join their party."
msgstr "%s te ha invitado a unirte a su grupo."
-#: src/gui/socialwindow.cpp:1364
+#: src/gui/socialwindow.cpp:1480
#, c-format
msgid "%s has invited you to join the %s party."
msgstr "%s te ha invitado para unirte al grupo %s."
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1489
msgid "Accept Party Invite"
msgstr "Aceptar invitación al grupo"
-#: src/gui/socialwindow.cpp:1388
+#: src/gui/socialwindow.cpp:1504
msgid "Cannot create party. You are already in a party"
msgstr "No se pudo crear un grupo. Ya estás en uno."
-#: src/gui/socialwindow.cpp:1393
+#: src/gui/socialwindow.cpp:1509
msgid "Party Name"
msgstr "Nombre del grupo"
-#: src/gui/socialwindow.cpp:1394
+#: src/gui/socialwindow.cpp:1510
msgid "Choose your party's name."
msgstr "Escoja el nombre del grupo."
@@ -2715,418 +2744,418 @@ msgstr "Escoja el nombre del grupo."
msgid "Specials"
msgstr "Especiales"
-#: src/gui/statuspopup.cpp:197
+#: src/gui/statuspopup.cpp:198
msgid "(D) default moves"
msgstr "(D) moverse predeterminado"
-#: src/gui/statuspopup.cpp:202
+#: src/gui/statuspopup.cpp:203
msgid "(I) invert moves"
msgstr "(I) moverse invertido"
-#: src/gui/statuspopup.cpp:207
+#: src/gui/statuspopup.cpp:208
msgid "(c) moves with some crazy moves"
msgstr "(c) moverse con algunos movimientos locos"
-#: src/gui/statuspopup.cpp:212
+#: src/gui/statuspopup.cpp:213
msgid "(C) moves with crazy moves"
msgstr "(C) moverse con movimientos locos"
-#: src/gui/statuspopup.cpp:217
+#: src/gui/statuspopup.cpp:218
msgid "(d) double normal + crazy"
msgstr "(d) doble normal + loco"
-#: src/gui/statuspopup.cpp:222
+#: src/gui/statuspopup.cpp:223
msgid "(?) move"
msgstr "(?) maniobra"
-#: src/gui/statuspopup.cpp:240
+#: src/gui/statuspopup.cpp:241
msgid "(a) custom crazy move"
msgstr "(a) maniobra alocada personalizada"
-#: src/gui/statuspopup.cpp:244
+#: src/gui/statuspopup.cpp:245
msgid "(?) crazy move"
msgstr "(?) maniobra loca"
-#: src/gui/statuspopup.cpp:254
+#: src/gui/statuspopup.cpp:255
msgid "(0) default moves to target"
msgstr "(0) moverse por defecto hacia el objetivo"
-#: src/gui/statuspopup.cpp:259
+#: src/gui/statuspopup.cpp:260
msgid "(1) moves to target in distance 1"
msgstr "(1) moverse al objetivo en distancia 1"
-#: src/gui/statuspopup.cpp:264
+#: src/gui/statuspopup.cpp:265
msgid "(2) moves to target in distance 2"
msgstr "(2) moverse al objetivo en distancia 2"
-#: src/gui/statuspopup.cpp:269
+#: src/gui/statuspopup.cpp:270
msgid "(3) moves to target in distance 3"
msgstr "(3) moverse al objetivo en distancia 3"
-#: src/gui/statuspopup.cpp:274
+#: src/gui/statuspopup.cpp:275
msgid "(5) moves to target in distance 5"
msgstr "(5) moverse al objetivo en distancia 5"
-#: src/gui/statuspopup.cpp:279
+#: src/gui/statuspopup.cpp:280
msgid "(7) moves to target in distance 7"
msgstr "(7) moverse al objetivo en distancia 7"
-#: src/gui/statuspopup.cpp:284
+#: src/gui/statuspopup.cpp:285
msgid "(A) moves to target in attack range"
msgstr "(A) desplazarse al objetivo en el rango de ataque"
-#: src/gui/statuspopup.cpp:289
+#: src/gui/statuspopup.cpp:290
msgid "(?) move to target"
msgstr "(?) mover al objetivo"
-#: src/gui/statuspopup.cpp:297
+#: src/gui/statuspopup.cpp:298
msgid "(D) default follow"
msgstr "(D) seguimiento predeterminado"
-#: src/gui/statuspopup.cpp:301
+#: src/gui/statuspopup.cpp:302
msgid "(R) relative follow"
msgstr "(R) seguimiento relativo"
-#: src/gui/statuspopup.cpp:305
+#: src/gui/statuspopup.cpp:306
msgid "(M) mirror follow"
msgstr "(M) seguimiento tipo espejo"
-#: src/gui/statuspopup.cpp:309
+#: src/gui/statuspopup.cpp:310
msgid "(P) pet follow"
msgstr "(P) seguimiento como mascota"
-#: src/gui/statuspopup.cpp:313
+#: src/gui/statuspopup.cpp:314
msgid "(?) unknown follow"
msgstr "(?) seguimiento desconoicido"
-#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
+#: src/gui/statuspopup.cpp:323 src/gui/statuspopup.cpp:346
msgid "(D) default attack"
msgstr "(D) ataque predeterminado"
-#: src/gui/statuspopup.cpp:327
+#: src/gui/statuspopup.cpp:328
msgid "(s) switch attack without shield"
msgstr "(s) intercambiar ataque sin escudo"
-#: src/gui/statuspopup.cpp:332
+#: src/gui/statuspopup.cpp:333
msgid "(S) switch attack with shield"
msgstr "(S) intercambiar ataque con escudo"
-#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
+#: src/gui/statuspopup.cpp:337 src/gui/statuspopup.cpp:362
msgid "(?) attack"
msgstr "(?) atacar"
-#: src/gui/statuspopup.cpp:349
+#: src/gui/statuspopup.cpp:350
msgid "(G) go and attack"
msgstr "(G) ir y atacar"
-#: src/gui/statuspopup.cpp:353
+#: src/gui/statuspopup.cpp:354
msgid "(A) go, attack, pickup"
msgstr "(A) ir, atacar, recoger"
-#: src/gui/statuspopup.cpp:357
+#: src/gui/statuspopup.cpp:358
msgid "(d) without auto attack"
msgstr "(d) sin atacar automáticamente"
-#: src/gui/statuspopup.cpp:375
+#: src/gui/statuspopup.cpp:376
msgid "(S) small pick up 1x1 cells"
msgstr "(S) recoger a 1x1 celdas (pequeño)"
-#: src/gui/statuspopup.cpp:379
+#: src/gui/statuspopup.cpp:380
msgid "(D) default pick up 2x1 cells"
msgstr "(D) recoger a 2x1 celdas (predeterminado)"
-#: src/gui/statuspopup.cpp:383
+#: src/gui/statuspopup.cpp:384
msgid "(F) forward pick up 2x3 cells"
msgstr "(F) recoger interesadamente a 2x3 celda"
-#: src/gui/statuspopup.cpp:387
+#: src/gui/statuspopup.cpp:388
msgid "(3) pick up 3x3 cells"
msgstr "(3) recoger a 3x3 celdas"
-#: src/gui/statuspopup.cpp:391
+#: src/gui/statuspopup.cpp:392
msgid "(g) go and pick up in distance 4"
msgstr "(g) ir y recoger en distancia 4"
-#: src/gui/statuspopup.cpp:395
+#: src/gui/statuspopup.cpp:396
msgid "(G) go and pick up in distance 8"
msgstr "(G) ir y recoger en distancia 8"
-#: src/gui/statuspopup.cpp:399
+#: src/gui/statuspopup.cpp:400
msgid "(A) go and pick up in max distance"
msgstr "(A) ir y recoger a máxima distancia"
-#: src/gui/statuspopup.cpp:403
+#: src/gui/statuspopup.cpp:404
msgid "(?) pick up"
msgstr "(?) recoger"
-#: src/gui/statuspopup.cpp:412
+#: src/gui/statuspopup.cpp:413
msgid "(N) normal map view"
msgstr "(N) vista normal del mapa"
-#: src/gui/statuspopup.cpp:416
+#: src/gui/statuspopup.cpp:417
msgid "(D) debug map view"
msgstr "(D) vista depurar del mapa"
-#: src/gui/statuspopup.cpp:420
+#: src/gui/statuspopup.cpp:421
msgid "(u) ultra map view"
msgstr "(u) ultra vista del mapa"
-#: src/gui/statuspopup.cpp:424
+#: src/gui/statuspopup.cpp:425
msgid "(U) ultra map view 2"
msgstr "(U) ultra vista del mapa 2"
-#: src/gui/statuspopup.cpp:428
+#: src/gui/statuspopup.cpp:429
msgid "(e) empty map view"
msgstr "(e) vista vacía del mapa"
-#: src/gui/statuspopup.cpp:432
+#: src/gui/statuspopup.cpp:433
msgid "(b) black & white map view"
msgstr "(b) vista del mapa en blanco y negro"
-#: src/gui/statuspopup.cpp:436
+#: src/gui/statuspopup.cpp:437
msgid "(?) map view"
msgstr "(?) vista del mapa"
-#: src/gui/statuspopup.cpp:444
+#: src/gui/statuspopup.cpp:445
msgid "(f) use #flar for magic attack"
msgstr "(f) usar #flar para ataque mágico"
-#: src/gui/statuspopup.cpp:449
+#: src/gui/statuspopup.cpp:450
msgid "(c) use #chiza for magic attack"
msgstr "(c) usar #chiza para ataque mágico"
-#: src/gui/statuspopup.cpp:454
+#: src/gui/statuspopup.cpp:455
msgid "(I) use #ingrav for magic attack"
msgstr "(I) usar #ingrav para ataque mágico"
-#: src/gui/statuspopup.cpp:459
+#: src/gui/statuspopup.cpp:460
msgid "(F) use #frillyar for magic attack"
msgstr "(F) usar #frillyar para ataque mágico"
-#: src/gui/statuspopup.cpp:464
+#: src/gui/statuspopup.cpp:465
msgid "(U) use #upmarmu for magic attack"
msgstr "(U) usar #upmarmu para ataque mágico"
-#: src/gui/statuspopup.cpp:468
+#: src/gui/statuspopup.cpp:469
msgid "(?) magic attack"
msgstr "(?) ataque mágico"
-#: src/gui/statuspopup.cpp:477
+#: src/gui/statuspopup.cpp:478
msgid "(D) default imitation"
msgstr "(D) imitación predeterminada"
-#: src/gui/statuspopup.cpp:481
+#: src/gui/statuspopup.cpp:482
msgid "(O) outfits imitation"
msgstr "(O) imitación de conjuntos"
-#: src/gui/statuspopup.cpp:485
+#: src/gui/statuspopup.cpp:486
msgid "(?) imitation"
msgstr "(?) imitación"
-#: src/gui/statuspopup.cpp:494
+#: src/gui/statuspopup.cpp:495
msgid "(O) on keyboard"
msgstr "(O) en el teclado"
-#: src/gui/statuspopup.cpp:497
+#: src/gui/statuspopup.cpp:498
msgid "(A) away"
msgstr "(A) lejos del teclado"
-#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
+#: src/gui/statuspopup.cpp:501 src/gui/statuspopup.cpp:521
msgid "(?) away"
msgstr "(?) afuera"
-#: src/gui/statuspopup.cpp:508
+#: src/gui/statuspopup.cpp:509
msgid "(G) game camera mode"
msgstr "(G) modo de cámara de juego"
-#: src/gui/statuspopup.cpp:512
+#: src/gui/statuspopup.cpp:513
msgid "(F) free camera mode"
msgstr "(F) modo de cámara libre"
-#: src/gui/statuspopup.cpp:516
+#: src/gui/statuspopup.cpp:517
msgid "(D) design camera mode"
msgstr "(D) Definir el modo operativo de la cámara"
-#: src/gui/statuspopup.cpp:527
+#: src/gui/statuspopup.cpp:528
msgid "Game modifiers are disabled"
msgstr "Modificadores del juego están deshabilitados"
-#: src/gui/statuspopup.cpp:532
+#: src/gui/statuspopup.cpp:533
msgid "Game modifiers are enabled"
msgstr "Modificadores del juego están habilitados"
-#: src/gui/statuswindow.cpp:142 src/gui/statuswindow.cpp:272
-#: src/gui/statuswindow.cpp:335
+#: src/gui/statuswindow.cpp:143 src/gui/statuswindow.cpp:273
+#: src/gui/statuswindow.cpp:336
#, c-format
msgid "Level: %d"
msgstr "Nivel: %d"
-#: src/gui/statuswindow.cpp:143 src/gui/statuswindow.cpp:258
-#: src/gui/statuswindow.cpp:302
+#: src/gui/statuswindow.cpp:144 src/gui/statuswindow.cpp:259
+#: src/gui/statuswindow.cpp:303
#, c-format
msgid "Money: %s"
msgstr "Dinero: %s"
-#: src/gui/statuswindow.cpp:149
+#: src/gui/statuswindow.cpp:150
msgid "HP:"
msgstr "PV:"
-#: src/gui/statuswindow.cpp:156
+#: src/gui/statuswindow.cpp:157
msgid "Exp:"
msgstr "Exp:"
-#: src/gui/statuswindow.cpp:170
+#: src/gui/statuswindow.cpp:171
msgid "MP:"
msgstr "PM:"
-#: src/gui/statuswindow.cpp:202 src/gui/statuswindow.cpp:385
+#: src/gui/statuswindow.cpp:203 src/gui/statuswindow.cpp:386
#, c-format
msgid "Job: %d"
msgstr "Trabajo: %d"
-#: src/gui/statuswindow.cpp:203
+#: src/gui/statuswindow.cpp:204
msgid "Job:"
msgstr "Trabajo:"
-#: src/gui/statuswindow.cpp:261 src/gui/statuswindow.cpp:309
+#: src/gui/statuswindow.cpp:262 src/gui/statuswindow.cpp:310
#, c-format
msgid "Character points: %d"
msgstr "Puntos del personaje: %d"
-#: src/gui/statuswindow.cpp:267
+#: src/gui/statuswindow.cpp:268
#, c-format
msgid "Level: %d (GM %d)"
msgstr "Nivel: %d (GM %d)"
-#: src/gui/statuswindow.cpp:323
+#: src/gui/statuswindow.cpp:324
#, c-format
msgid "Correction points: %d"
msgstr "Puntos de corrección: %d"
-#: src/gui/statuswindow.cpp:646 src/gui/statuswindow.cpp:711
-#: src/gui/statuswindow.cpp:731 src/gui/statuswindow.cpp:747
-#: src/gui/statuswindow.cpp:793 src/gui/statuswindow.cpp:822
-#: src/gui/statuswindow.cpp:845 src/gui/statuswindow.cpp:864
+#: src/gui/statuswindow.cpp:647 src/gui/statuswindow.cpp:712
+#: src/gui/statuswindow.cpp:732 src/gui/statuswindow.cpp:748
+#: src/gui/statuswindow.cpp:794 src/gui/statuswindow.cpp:823
+#: src/gui/statuswindow.cpp:846 src/gui/statuswindow.cpp:865
msgid "(D)"
msgstr "(D)"
-#: src/gui/statuswindow.cpp:649 src/gui/statuswindow.cpp:772
+#: src/gui/statuswindow.cpp:650 src/gui/statuswindow.cpp:773
msgid "(I)"
msgstr "(I)"
-#: src/gui/statuswindow.cpp:652 src/gui/statuswindow.cpp:769
+#: src/gui/statuswindow.cpp:653 src/gui/statuswindow.cpp:770
msgid "(c)"
msgstr "(c)"
-#: src/gui/statuswindow.cpp:655
+#: src/gui/statuswindow.cpp:656
msgid "(C)"
msgstr "(C)"
-#: src/gui/statuswindow.cpp:658 src/gui/statuswindow.cpp:756
+#: src/gui/statuswindow.cpp:659 src/gui/statuswindow.cpp:757
msgid "(d)"
msgstr "(d)"
-#: src/gui/statuswindow.cpp:661 src/gui/statuswindow.cpp:675
-#: src/gui/statuswindow.cpp:704 src/gui/statuswindow.cpp:723
-#: src/gui/statuswindow.cpp:740 src/gui/statuswindow.cpp:759
-#: src/gui/statuswindow.cpp:781 src/gui/statuswindow.cpp:811
-#: src/gui/statuswindow.cpp:837 src/gui/statuswindow.cpp:851
-#: src/gui/statuswindow.cpp:867 src/gui/statuswindow.cpp:880
+#: src/gui/statuswindow.cpp:662 src/gui/statuswindow.cpp:676
+#: src/gui/statuswindow.cpp:705 src/gui/statuswindow.cpp:724
+#: src/gui/statuswindow.cpp:741 src/gui/statuswindow.cpp:760
+#: src/gui/statuswindow.cpp:782 src/gui/statuswindow.cpp:812
+#: src/gui/statuswindow.cpp:838 src/gui/statuswindow.cpp:852
+#: src/gui/statuswindow.cpp:868 src/gui/statuswindow.cpp:881
msgid "(?)"
msgstr "(?)"
-#: src/gui/statuswindow.cpp:672
+#: src/gui/statuswindow.cpp:673
msgid "(a)"
msgstr "(a)"
-#: src/gui/statuswindow.cpp:683
+#: src/gui/statuswindow.cpp:684
msgid "(0)"
msgstr "(0)"
-#: src/gui/statuswindow.cpp:686
+#: src/gui/statuswindow.cpp:687
msgid "(1)"
msgstr "(1)"
-#: src/gui/statuswindow.cpp:689
+#: src/gui/statuswindow.cpp:690
msgid "(2)"
msgstr "(2)"
-#: src/gui/statuswindow.cpp:692 src/gui/statuswindow.cpp:799
+#: src/gui/statuswindow.cpp:693 src/gui/statuswindow.cpp:800
msgid "(3)"
msgstr "(3)"
-#: src/gui/statuswindow.cpp:695
+#: src/gui/statuswindow.cpp:696
msgid "(5)"
msgstr "(5)"
-#: src/gui/statuswindow.cpp:698
+#: src/gui/statuswindow.cpp:699
msgid "(7)"
msgstr "(7)"
-#: src/gui/statuswindow.cpp:701 src/gui/statuswindow.cpp:753
-#: src/gui/statuswindow.cpp:808 src/gui/statuswindow.cpp:877
+#: src/gui/statuswindow.cpp:702 src/gui/statuswindow.cpp:754
+#: src/gui/statuswindow.cpp:809 src/gui/statuswindow.cpp:878
msgid "(A)"
msgstr "(A)"
-#: src/gui/statuswindow.cpp:714
+#: src/gui/statuswindow.cpp:715
msgid "(R)"
msgstr "(R)"
-#: src/gui/statuswindow.cpp:717
+#: src/gui/statuswindow.cpp:718
msgid "(M)"
msgstr "(M)"
-#: src/gui/statuswindow.cpp:720
+#: src/gui/statuswindow.cpp:721
msgid "(P)"
msgstr "(P)"
-#: src/gui/statuswindow.cpp:734
+#: src/gui/statuswindow.cpp:735
msgid "(s)"
msgstr "(s)"
-#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:790
+#: src/gui/statuswindow.cpp:738 src/gui/statuswindow.cpp:791
msgid "(S)"
msgstr "(S)"
-#: src/gui/statuswindow.cpp:750 src/gui/statuswindow.cpp:805
-#: src/gui/statuswindow.cpp:858
+#: src/gui/statuswindow.cpp:751 src/gui/statuswindow.cpp:806
+#: src/gui/statuswindow.cpp:859
msgid "(G)"
msgstr "(G)"
-#: src/gui/statuswindow.cpp:766
+#: src/gui/statuswindow.cpp:767
msgid "(f)"
msgstr "(f)"
-#: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:796
-#: src/gui/statuswindow.cpp:861
+#: src/gui/statuswindow.cpp:776 src/gui/statuswindow.cpp:797
+#: src/gui/statuswindow.cpp:862
msgid "(F)"
msgstr "(F)"
-#: src/gui/statuswindow.cpp:778 src/gui/statuswindow.cpp:828
+#: src/gui/statuswindow.cpp:779 src/gui/statuswindow.cpp:829
msgid "(U)"
msgstr "(U)"
-#: src/gui/statuswindow.cpp:802
+#: src/gui/statuswindow.cpp:803
msgid "(g)"
msgstr "(g)"
-#: src/gui/statuswindow.cpp:819
+#: src/gui/statuswindow.cpp:820
msgid "(N)"
msgstr "(N)"
-#: src/gui/statuswindow.cpp:825
+#: src/gui/statuswindow.cpp:826
msgid "(u)"
msgstr "(u)"
-#: src/gui/statuswindow.cpp:831
+#: src/gui/statuswindow.cpp:832
msgid "(e)"
msgstr "(e)"
-#: src/gui/statuswindow.cpp:834
+#: src/gui/statuswindow.cpp:835
msgid "(b)"
msgstr "(b)"
-#: src/gui/statuswindow.cpp:848 src/gui/statuswindow.cpp:874
+#: src/gui/statuswindow.cpp:849 src/gui/statuswindow.cpp:875
msgid "(O)"
msgstr "(O)"
@@ -3234,24 +3263,24 @@ msgstr "Aceptado. Esperando..."
msgid "Trade: You"
msgstr "Intercambio: Tú"
-#: src/gui/tradewindow.cpp:110 src/gui/tradewindow.cpp:166
+#: src/gui/tradewindow.cpp:111 src/gui/tradewindow.cpp:167
#, c-format
msgid "You get %s"
msgstr "Tú recibes %s"
-#: src/gui/tradewindow.cpp:111
+#: src/gui/tradewindow.cpp:112
msgid "You give:"
msgstr "Tú das:"
-#: src/gui/tradewindow.cpp:115
+#: src/gui/tradewindow.cpp:116
msgid "Change"
msgstr "Cambiar"
-#: src/gui/tradewindow.cpp:374
+#: src/gui/tradewindow.cpp:375
msgid "You don't have enough money."
msgstr "No tienes dinero suficiente."
-#: src/gui/tradewindow.cpp:453
+#: src/gui/tradewindow.cpp:454
msgid "Failed adding item. You can not overlap one kind of item on the window."
msgstr ""
"Fallo al añadir objeto. No puedes añadir más de un mismo tipo de objeto en "
@@ -3262,33 +3291,33 @@ msgstr ""
msgid "Name: %s"
msgstr "Nombre: %s"
-#: src/gui/updaterwindow.cpp:136
+#: src/gui/updaterwindow.cpp:138
msgid "Updating..."
msgstr "Actualizando..."
-#: src/gui/updaterwindow.cpp:155
+#: src/gui/updaterwindow.cpp:159
msgid "Connecting..."
msgstr "Conectando..."
-#: src/gui/updaterwindow.cpp:158
+#: src/gui/updaterwindow.cpp:162
msgid "Play"
msgstr "Jugar"
-#: src/gui/updaterwindow.cpp:556
+#: src/gui/updaterwindow.cpp:564
msgid "##1 The update process is incomplete."
msgstr "##1 El proceso de actualización esta incompleto."
#. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:558
+#: src/gui/updaterwindow.cpp:566
msgid "##1 It is strongly recommended that"
msgstr "##1 Es altamente recomendado que"
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:560
+#: src/gui/updaterwindow.cpp:568
msgid "##1 you try again later."
msgstr "##1 lo intentes de nuevo más tarde."
-#: src/gui/updaterwindow.cpp:686
+#: src/gui/updaterwindow.cpp:744
msgid "Completed"
msgstr "Completado"
@@ -3440,23 +3469,23 @@ msgstr "Limites de Lugar de Inicio"
msgid "Road Point"
msgstr "Mostrar camino"
-#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:471
+#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:472
msgid "Who Is Online - Updating"
msgstr "Quién está conectado - Actualizando"
-#: src/gui/whoisonline.cpp:101
+#: src/gui/whoisonline.cpp:102
msgid "Update"
msgstr "Actualizar"
-#: src/gui/whoisonline.cpp:294
+#: src/gui/whoisonline.cpp:295
msgid "Who Is Online - "
msgstr "Quienes están conectados - "
-#: src/gui/whoisonline.cpp:485
+#: src/gui/whoisonline.cpp:486
msgid "Who Is Online - error"
msgstr "Quienes están conectados - error"
-#: src/gui/whoisonline.cpp:516
+#: src/gui/whoisonline.cpp:517
msgid "Who Is Online - Update"
msgstr "Quienes están conectados - Actualizar"
@@ -3521,7 +3550,8 @@ msgid "This command makes <nick> a channel operator."
msgstr "Hacer al jugador <nick> operador del canal."
#: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
-#: src/net/ea/gui/guildtab.cpp:69 src/net/ea/gui/partytab.cpp:85
+#: src/gui/widgets/guildchattab.cpp:61 src/net/ea/gui/guildtab.cpp:69
+#: src/net/ea/gui/partytab.cpp:85
msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
msgstr "Si el <nick> tiene espacios, enciérralo entre comillas dobles (\")."
@@ -3561,6 +3591,41 @@ msgstr "Anuncio global de %s:"
msgid "%s whispers: %s"
msgstr "%s envía mensaje privado: %s"
+#: src/gui/widgets/guildchattab.cpp:59 src/net/ea/gui/guildtab.cpp:67
+#: src/net/ea/gui/partytab.cpp:83
+msgid "Command: /invite <nick>"
+msgstr "Comando: /invite <nick>"
+
+#: src/gui/widgets/guildchattab.cpp:60 src/net/ea/gui/guildtab.cpp:68
+msgid "This command invites <nick> to the guild you're in."
+msgstr "Este comando invita a <nick> para el clan en el que estás ."
+
+#: src/gui/widgets/guildchattab.cpp:66 src/net/ea/gui/guildtab.cpp:74
+#: src/net/ea/gui/partytab.cpp:90
+msgid "Command: /leave"
+msgstr "Comando: /leave"
+
+#: src/gui/widgets/guildchattab.cpp:67 src/net/ea/gui/guildtab.cpp:75
+msgid "This command causes the player to leave the guild."
+msgstr "Este comando hace que dejes el clan."
+
+#: src/gui/widgets/guildchattab.cpp:109 src/net/ea/gui/guildtab.cpp:135
+#: src/net/ea/gui/partytab.cpp:69
+msgid "/help > Display this help."
+msgstr "/help > Para la ayuda."
+
+#: src/gui/widgets/guildchattab.cpp:110 src/net/ea/gui/guildtab.cpp:136
+msgid "/invite > Invite a player to your guild"
+msgstr "/invite > Invita un jugador a tu clan"
+
+#: src/gui/widgets/guildchattab.cpp:111 src/net/ea/gui/guildtab.cpp:137
+msgid "/leave > Leave the guild you are in"
+msgstr "/leave > Deja el clan en la que estas"
+
+#: src/gui/widgets/guildchattab.cpp:112 src/net/ea/gui/guildtab.cpp:138
+msgid "/kick > Kick some one from the guild you are in"
+msgstr "/kick > Expulsa a alguien del clan en el que estás."
+
#: src/gui/widgets/setupitem.cpp:271 src/gui/widgets/setupitem.cpp:394
msgid "Edit"
msgstr "Editar"
@@ -4071,7 +4136,7 @@ msgstr "Encender / Apagar audio"
#: src/keyboardconfig.cpp:333
msgid "Enable / Disable away mode"
-msgstr "Habilitar / Deshabilitar la ausencia"
+msgstr "Habilitar / Deshabilitar modo AFK"
#: src/keyboardconfig.cpp:335
msgid "Emulate right click from keyboard"
@@ -4094,68 +4159,68 @@ msgstr ""
"Conflito con las teclas \"%s\" e \"%s\" . Resuelva el conflicto, o el juego "
"puede presentar un comportamiento raro."
-#: src/localplayer.cpp:372
+#: src/localplayer.cpp:370
msgid "You were killed by "
msgstr "Fuiste eliminado por "
-#: src/localplayer.cpp:1403
+#: src/localplayer.cpp:1401
msgid "Tried to pick up nonexistent item."
msgstr "Intentaste recoger un objeto inexistante."
-#: src/localplayer.cpp:1405
+#: src/localplayer.cpp:1403
msgid "Item is too heavy."
msgstr "El artículo es muy pesado."
-#: src/localplayer.cpp:1407
+#: src/localplayer.cpp:1405
msgid "Item is too far away."
msgstr "El artículo está muy lejos."
-#: src/localplayer.cpp:1409
+#: src/localplayer.cpp:1407
msgid "Inventory is full."
msgstr "El inventario está lleno."
-#: src/localplayer.cpp:1411
+#: src/localplayer.cpp:1409
msgid "Stack is too big."
msgstr "El agrupamiento es demasiado grande."
-#: src/localplayer.cpp:1414
+#: src/localplayer.cpp:1412
msgid "Item belongs to someone else."
msgstr "El artículo pertenece a alguien más."
-#: src/localplayer.cpp:1417
+#: src/localplayer.cpp:1415
msgid "Unknown problem picking up item."
msgstr "Problema desconocido al intentar recoger el artículo."
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1441
+#: src/localplayer.cpp:1439
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
msgstr[0] "Usted cogió un/a %d [@@%d|%s@@]."
msgstr[1] "Usted Cogió %d [@@%d|%s@@]."
-#: src/localplayer.cpp:3175
+#: src/localplayer.cpp:3173
msgid "Away"
msgstr "Fuera del Teclado"
-#: src/localplayer.cpp:3476
+#: src/localplayer.cpp:3474
msgid "Follow: "
msgstr "Seguir: "
-#: src/localplayer.cpp:3478 src/localplayer.cpp:3493
+#: src/localplayer.cpp:3476 src/localplayer.cpp:3491
msgid "Follow canceled"
msgstr "Seguir cancelado"
-#: src/localplayer.cpp:3485
+#: src/localplayer.cpp:3483
msgid "Imitation: "
msgstr "Imitacion: "
-#: src/localplayer.cpp:3487 src/localplayer.cpp:3495
+#: src/localplayer.cpp:3485 src/localplayer.cpp:3493
msgid "Imitation canceled"
-msgstr "Imitar cancelado"
+msgstr "Imitación cancelada"
-#: src/localplayer.cpp:3847
+#: src/localplayer.cpp:3845
msgid "You see "
msgstr "Ves "
@@ -4325,34 +4390,34 @@ msgstr "Información"
#: src/net/ea/charserverhandler.cpp:166
msgid "Character deleted."
-msgstr "Personaje Borrado."
+msgstr "Personaje borrado."
#: src/net/ea/charserverhandler.cpp:172
msgid "Failed to delete character."
msgstr "Fallo al borrar el personaje."
-#: src/net/ea/chathandler.cpp:60 src/net/ea/chathandler.cpp:66
-#: src/net/ea/chathandler.cpp:71 src/net/ea/chathandler.cpp:77
-#: src/net/ea/chathandler.cpp:82 src/net/ea/chathandler.cpp:88
-#: src/net/ea/chathandler.cpp:95 src/net/ea/chathandler.cpp:101
+#: src/net/ea/chathandler.cpp:61 src/net/ea/chathandler.cpp:67
+#: src/net/ea/chathandler.cpp:72 src/net/ea/chathandler.cpp:78
+#: src/net/ea/chathandler.cpp:83 src/net/ea/chathandler.cpp:89
+#: src/net/ea/chathandler.cpp:96 src/net/ea/chathandler.cpp:102
msgid "Channels are not supported!"
msgstr "Canales no son soportados!"
-#: src/net/ea/chathandler.cpp:128
+#: src/net/ea/chathandler.cpp:129
#, c-format
msgid "Whisper could not be sent, %s is offline."
msgstr "No pudo ser enviado el Susurro, ya que %s está desconectado."
-#: src/net/ea/chathandler.cpp:136
+#: src/net/ea/chathandler.cpp:137
#, c-format
msgid "Whisper could not be sent, ignored by %s."
msgstr "No pudo ser enviado el Susurro, ya que es ignorado por %s."
-#: src/net/ea/chathandler.cpp:348
+#: src/net/ea/chathandler.cpp:355
msgid "MVP player."
msgstr "Jugador VIP."
-#: src/net/ea/chathandler.cpp:352
+#: src/net/ea/chathandler.cpp:359
msgid "MVP player: "
msgstr "Jugador MVP: "
@@ -4369,38 +4434,6 @@ msgstr "Juego"
msgid "Request to quit denied!"
msgstr "Petición de salida denegada!"
-#: src/net/ea/gui/guildtab.cpp:67 src/net/ea/gui/partytab.cpp:83
-msgid "Command: /invite <nick>"
-msgstr "Comando: /invite <nick>"
-
-#: src/net/ea/gui/guildtab.cpp:68
-msgid "This command invites <nick> to the guild you're in."
-msgstr "Este comando invita a <nick> para el clan en el que estás ."
-
-#: src/net/ea/gui/guildtab.cpp:74 src/net/ea/gui/partytab.cpp:90
-msgid "Command: /leave"
-msgstr "Comando: /leave"
-
-#: src/net/ea/gui/guildtab.cpp:75
-msgid "This command causes the player to leave the guild."
-msgstr "Este comando hace que dejes el clan."
-
-#: src/net/ea/gui/guildtab.cpp:135 src/net/ea/gui/partytab.cpp:69
-msgid "/help > Display this help."
-msgstr "/help > Para la ayuda."
-
-#: src/net/ea/gui/guildtab.cpp:136
-msgid "/invite > Invite a player to your guild"
-msgstr "/invite > Invita un jugador a tu clan"
-
-#: src/net/ea/gui/guildtab.cpp:137
-msgid "/leave > Leave the guild you are in"
-msgstr "/leave > Deja el clan en la que estas"
-
-#: src/net/ea/gui/guildtab.cpp:138
-msgid "/kick > Kick some one from the guild you are in"
-msgstr "/kick > Expulsa a alguien del clan en el que estás."
-
#: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
msgid "Guild created."
msgstr "Clan creado."
@@ -4417,85 +4450,81 @@ msgstr "La verificación de la guild no se effectuó."
msgid "Unknown server response."
msgstr "Respuesta del servidor desconocida."
-#: src/net/ea/guildhandler.cpp:180
+#: src/net/ea/guildhandler.cpp:181
#, c-format
msgid "Guild name: %s"
msgstr "Nombre del gremio: %s"
-#: src/net/ea/guildhandler.cpp:182
+#: src/net/ea/guildhandler.cpp:183
#, c-format
msgid "Guild master: %s"
msgstr "Maestro del gremio: %s"
-#: src/net/ea/guildhandler.cpp:184
+#: src/net/ea/guildhandler.cpp:185
#, c-format
msgid "Guild level: %d"
msgstr "Nivel en gremio: %d"
-#: src/net/ea/guildhandler.cpp:186
+#: src/net/ea/guildhandler.cpp:187
#, c-format
msgid "Online members: %d"
msgstr "Miembros conectados: %d"
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:189
#, c-format
msgid "Max members: %d"
msgstr "Máx. Miembros: %d"
-#: src/net/ea/guildhandler.cpp:190
+#: src/net/ea/guildhandler.cpp:191
#, c-format
msgid "Average level: %d"
msgstr "Nivel promedio: %d"
-#: src/net/ea/guildhandler.cpp:192
+#: src/net/ea/guildhandler.cpp:193
#, c-format
msgid "Guild exp: %d"
msgstr "Experiencia del gremio: %d"
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:195
#, c-format
msgid "Guild next exp: %d"
msgstr "Experiencia siguiente del gremio: %d"
-#: src/net/ea/guildhandler.cpp:196
+#: src/net/ea/guildhandler.cpp:197
#, c-format
msgid "Guild castle: %s"
msgstr "Castillo del gremio: %s"
-#: src/net/ea/guildhandler.cpp:402
+#: src/net/ea/guildhandler.cpp:403
msgid "Could not inivte user to guild."
msgstr "No se puede invitar jugadores al clan."
-#: src/net/ea/guildhandler.cpp:406
+#: src/net/ea/guildhandler.cpp:407
msgid "User rejected guild invite."
msgstr "El jugador cancel la invitacion a tu guild."
-#: src/net/ea/guildhandler.cpp:410
+#: src/net/ea/guildhandler.cpp:411
msgid "User is now part of your guild."
msgstr "El usuario es ahora de tu clan."
-#: src/net/ea/guildhandler.cpp:414
+#: src/net/ea/guildhandler.cpp:415
msgid "Your guild is full."
msgstr "Tu clan está lleno."
-#: src/net/ea/guildhandler.cpp:418
+#: src/net/ea/guildhandler.cpp:419
msgid "Unknown guild invite response."
msgstr "Invitación desconocida a una guild."
-#: src/net/ea/guildhandler.cpp:438
-msgid "You have left the guild."
-msgstr "Has dejado el gremio."
-
-#: src/net/ea/guildhandler.cpp:452
+#: src/net/ea/guildhandler.cpp:453
#, c-format
msgid "%s has left your guild."
msgstr "%s ha dejado tu gremio."
-#: src/net/ea/guildhandler.cpp:483
+#: src/net/ea/guildhandler.cpp:484
msgid "You was kicked from guild."
msgstr "Usted fue expulsado del gremio."
-#: src/net/ea/guildhandler.cpp:496
+#: src/net/ea/guildhandler.cpp:497
#, c-format
msgid "%s has kicked from your guild."
msgstr "%s saco alguien de tu gremio."
@@ -4731,12 +4760,12 @@ msgstr "QQQ respuesta desconocida a la invitacion de %s."
msgid "You have left the party."
msgstr "Has dejado el grupo."
-#: src/net/ea/partyhandler.cpp:368
+#: src/net/ea/partyhandler.cpp:369
#, c-format
msgid "%s has left your party."
msgstr "%s dejó tu grupo."
-#: src/net/ea/partyhandler.cpp:444
+#: src/net/ea/partyhandler.cpp:448
#, c-format
msgid "An unknown member tried to say: %s"
msgstr "Un miembro desconocido intentó decir: %s"
@@ -4770,8 +4799,8 @@ msgid ""
"No, kids. Your character did not really die. It... err... went to a better "
"place."
msgstr ""
-"No, niños. Tu jugador no murió realmente. Solo... eeeh... fue a un lugar "
-"mejor ."
+"No, niños. Tu jugador no murió realmente. Sólo... eeeh... fue a un lugar "
+"mejor."
#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:323
msgid ""
@@ -4863,7 +4892,7 @@ msgid "You're pining for the fjords."
msgstr "Estas avanzando... hacia el barranco."
#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
-#: src/net/ea/playerhandler.cpp:425
+#: src/net/ea/playerhandler.cpp:428
msgid "Message"
msgstr "Mensaje"
@@ -4877,21 +4906,21 @@ msgid "You are carrying less than half your weight. You can regain health."
msgstr ""
"Estás cargando menos de la mitad de tu peso. Ahora puedes recobrar la salud."
-#: src/net/ea/playerhandler.cpp:451
+#: src/net/ea/playerhandler.cpp:454
#, c-format
msgid "You picked up %s."
msgstr "Has cogido %s."
-#: src/net/ea/playerhandler.cpp:457
+#: src/net/ea/playerhandler.cpp:460
#, c-format
msgid "You spent %s."
msgstr "Has gastado %s."
-#: src/net/ea/playerhandler.cpp:501
+#: src/net/ea/playerhandler.cpp:506
msgid "Cannot raise skill!"
msgstr "¡Imposible incrementar!"
-#: src/net/ea/playerhandler.cpp:618
+#: src/net/ea/playerhandler.cpp:624
msgid "Equip arrows first."
msgstr "Equipar las flechas primero."
@@ -4982,11 +5011,12 @@ msgstr "%s quiere comerciar contigo, aceptas?"
#: src/net/ea/tradehandler.cpp:130
msgid "Trading isn't possible. Trade partner is too far away."
-msgstr "Intercambio es imposible. El otro personaje está muy alejado."
+msgstr ""
+"No es posible realizar el Intercambio. El otro personaje está muy alejado."
#: src/net/ea/tradehandler.cpp:134
msgid "Trading isn't possible. Character doesn't exist."
-msgstr "Intercambio imposible. El personaje no existe."
+msgstr "El intercambio no es posible. El personaje no existe."
#: src/net/ea/tradehandler.cpp:138
msgid "Trade cancelled due to an unknown reason."
@@ -5012,7 +5042,7 @@ msgstr "Error al añadir objeto. El otro jugador lleva mucho peso."
#: src/net/ea/tradehandler.cpp:236
msgid "Failed adding item. Trade partner has no free slot."
-msgstr "Error al anadir objeto. El otro jugador no tiene más espacio."
+msgstr "Error al añadir objeto. El otro jugador no tiene más espacio."
#: src/net/ea/tradehandler.cpp:241
msgid "Failed adding item. You can't trade this item."
@@ -5030,7 +5060,7 @@ msgstr "Intercambio Cancelado."
msgid "Trade completed."
msgstr "Intercambio Realizado."
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:258
msgid "Strength"
msgstr "Fuerza"
@@ -5039,7 +5069,7 @@ msgstr "Fuerza"
msgid "Strength %+.1f"
msgstr "Fuerza %+.1f"
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:259
msgid "Agility"
msgstr "Agilidad"
@@ -5048,7 +5078,7 @@ msgstr "Agilidad"
msgid "Agility %+.1f"
msgstr "Agilidad %+.1f"
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:262
msgid "Dexterity"
msgstr "Destreza"
@@ -5057,7 +5087,7 @@ msgstr "Destreza"
msgid "Dexterity %+.1f"
msgstr "Destreza %+.1f"
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:260
msgid "Vitality"
msgstr "Vitalidad"
@@ -5066,7 +5096,7 @@ msgstr "Vitalidad"
msgid "Vitality %+.1f"
msgstr "Vitalidad %+.1f"
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:261
msgid "Intelligence"
msgstr "Inteligencia"
@@ -5106,7 +5136,7 @@ msgstr "Nombre no válido."
#: src/net/manaserv/charhandler.cpp:154
msgid "Character's name already exists."
-msgstr "Nombre del jugador ya existe."
+msgstr "Nombre del personaje ya existe."
#: src/net/manaserv/charhandler.cpp:157
msgid "Invalid hairstyle."
@@ -5340,111 +5370,115 @@ msgstr "Incapaz de vender mientras intercambia."
msgid "Unable to sell unsellable item."
msgstr "Incapaz de vender artículo invendible."
-#: src/net/tmwa/generalhandler.cpp:109
+#: src/net/tmwa/generalhandler.cpp:108
#, c-format
msgid "Strength %+d"
msgstr "Fuerza %+d"
-#: src/net/tmwa/generalhandler.cpp:110
+#: src/net/tmwa/generalhandler.cpp:109
#, c-format
msgid "Agility %+d"
msgstr "Agilidad %+d"
-#: src/net/tmwa/generalhandler.cpp:111
+#: src/net/tmwa/generalhandler.cpp:110
#, c-format
msgid "Vitality %+d"
msgstr "Vitalidad %+d"
-#: src/net/tmwa/generalhandler.cpp:112
+#: src/net/tmwa/generalhandler.cpp:111
#, c-format
msgid "Intelligence %+d"
msgstr "Inteligencia %+d"
-#: src/net/tmwa/generalhandler.cpp:113
+#: src/net/tmwa/generalhandler.cpp:112
#, c-format
msgid "Dexterity %+d"
msgstr "Destreza %+d"
-#: src/net/tmwa/generalhandler.cpp:114
+#: src/net/tmwa/generalhandler.cpp:113
#, c-format
msgid "Luck %+d"
msgstr "Suerte %+d"
-#: src/net/tmwa/generalhandler.cpp:140
+#: src/net/tmwa/generalhandler.cpp:139
msgid "Authentication failed."
msgstr "Fallo en la autentificación."
-#: src/net/tmwa/generalhandler.cpp:143
+#: src/net/tmwa/generalhandler.cpp:142
msgid "No servers available."
msgstr "Servidores indiponibles."
-#: src/net/tmwa/generalhandler.cpp:147
+#: src/net/tmwa/generalhandler.cpp:146
msgid "Someone else is trying to use this account."
msgstr "Alguien está intentando usar tu cuenta."
-#: src/net/tmwa/generalhandler.cpp:150
+#: src/net/tmwa/generalhandler.cpp:149
msgid "This account is already logged in."
msgstr "Ya hay alguien conectado con esta cuenta."
-#: src/net/tmwa/generalhandler.cpp:153
+#: src/net/tmwa/generalhandler.cpp:152
msgid "Speed hack detected."
msgstr "Hack de velocidad detectado."
-#: src/net/tmwa/generalhandler.cpp:156
+#: src/net/tmwa/generalhandler.cpp:155
msgid "Duplicated login."
msgstr "Login duplicado."
-#: src/net/tmwa/generalhandler.cpp:159
+#: src/net/tmwa/generalhandler.cpp:158
msgid "Unknown connection error."
msgstr "Error de conexión desconocido."
-#: src/net/tmwa/generalhandler.cpp:232
+#: src/net/tmwa/generalhandler.cpp:231
msgid "Got disconnected from server!"
msgstr "¡Desconectado del servidor!"
-#: src/net/tmwa/generalhandler.cpp:264
+#: src/net/tmwa/generalhandler.cpp:263
msgid "Luck"
msgstr "Suerte"
-#: src/net/tmwa/generalhandler.cpp:267
+#: src/net/tmwa/generalhandler.cpp:266
msgid "Defense"
msgstr "Defensa"
-#: src/net/tmwa/generalhandler.cpp:268
+#: src/net/tmwa/generalhandler.cpp:267
msgid "M.Attack"
msgstr "Ataque M."
-#: src/net/tmwa/generalhandler.cpp:269
+#: src/net/tmwa/generalhandler.cpp:268
msgid "M.Defense"
msgstr "Defensa M."
-#: src/net/tmwa/generalhandler.cpp:271
+#: src/net/tmwa/generalhandler.cpp:270
#, no-c-format
msgid "% Accuracy"
msgstr "% Precisión"
-#: src/net/tmwa/generalhandler.cpp:273
+#: src/net/tmwa/generalhandler.cpp:272
#, no-c-format
msgid "% Evade"
msgstr "% Evasión"
-#: src/net/tmwa/generalhandler.cpp:275
+#: src/net/tmwa/generalhandler.cpp:274
#, no-c-format
msgid "% Critical"
msgstr "% Crítico"
-#: src/net/tmwa/generalhandler.cpp:276
+#: src/net/tmwa/generalhandler.cpp:275
msgid "Attack Delay"
msgstr "Retardo de Ataque"
-#: src/net/tmwa/generalhandler.cpp:278
+#: src/net/tmwa/generalhandler.cpp:277
msgid "Walk Delay"
msgstr "Retardo de Marcha"
-#: src/net/tmwa/generalhandler.cpp:280
+#: src/net/tmwa/generalhandler.cpp:279
msgid "Attack Range"
msgstr "Alcance de Ataque"
+#: src/net/tmwa/generalhandler.cpp:281
+msgid "Damage per sec."
+msgstr "Daño por segundo."
+
#: src/net/tmwa/network.cpp:152
msgid "Empty address given to Network::connect()!"
msgstr "Adress vacía enviada a Network::connect()!"
@@ -5478,31 +5512,31 @@ msgstr "Burbuja '...' flotante"
msgid "Floating bubble"
msgstr "Burbuja Flotante"
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:248
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:246
#: src/resources/monsterdb.cpp:84
msgid "unnamed"
msgstr "anónimo"
-#: src/resources/itemdb.cpp:65
+#: src/resources/itemdb.cpp:63
#, c-format
msgid "Attack %+d"
msgstr "Ataque %+d"
-#: src/resources/itemdb.cpp:66
+#: src/resources/itemdb.cpp:64
#, c-format
msgid "Defense %+d"
msgstr "Defensa %+d"
-#: src/resources/itemdb.cpp:67
+#: src/resources/itemdb.cpp:65
#, c-format
msgid "HP %+d"
msgstr "PV %+d"
-#: src/resources/itemdb.cpp:68
+#: src/resources/itemdb.cpp:66
#, c-format
msgid "MP %+d"
msgstr "PM %+d"
-#: src/resources/itemdb.cpp:171
+#: src/resources/itemdb.cpp:169
msgid "Unknown item"
msgstr "Objeto desconocido"
diff --git a/po/fi.po b/po/fi.po
index fd66fa93a..c7586f8c4 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-20 17:42+0300\n"
-"PO-Revision-Date: 2011-08-16 16:09+0000\n"
+"POT-Creation-Date: 2011-09-02 18:27+0300\n"
+"PO-Revision-Date: 2011-09-02 15:29+0000\n"
"Last-Translator: akaras <akaras@inbox.ru>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: fi\n"
@@ -22,119 +22,119 @@ msgstr ""
msgid "Visible on map"
msgstr "Näkyvillä kartalla"
-#: src/being.cpp:542
+#: src/being.cpp:549
msgid "dodge"
msgstr "väistö"
-#: src/being.cpp:542
+#: src/being.cpp:549
msgid "miss"
msgstr "huti"
#. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1514
+#: src/being.cpp:1529
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1519
+#: src/being.cpp:1534
msgid "I"
msgstr ""
-#: src/client.cpp:826 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:831 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
msgid "Setup"
msgstr "Asetukset"
-#: src/client.cpp:909
+#: src/client.cpp:914
msgid "Connecting to server"
msgstr "Yhdistän palvelimeen"
-#: src/client.cpp:940
+#: src/client.cpp:945
msgid "Logging in"
msgstr "Kirjaudun sisään"
-#: src/client.cpp:973
+#: src/client.cpp:978
msgid "Entering game world"
msgstr "Siirryn pelimaailmaan"
-#: src/client.cpp:1073
+#: src/client.cpp:1078
msgid "Requesting characters"
msgstr "Pyydän hahmoja"
-#: src/client.cpp:1104
+#: src/client.cpp:1109
msgid "Connecting to the game server"
msgstr "Yhdistän pelipalvelimeen"
-#: src/client.cpp:1114
+#: src/client.cpp:1119
msgid "Changing game servers"
msgstr "Vaihdan pelipalvelinta"
-#: src/client.cpp:1151 src/client.cpp:1158 src/client.cpp:1293
+#: src/client.cpp:1156 src/client.cpp:1163 src/client.cpp:1298
#: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
-#: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:395
+#: src/gui/charcreatedialog.cpp:221 src/gui/charselectdialog.cpp:253
+#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
#: src/net/manaserv/charhandler.cpp:227
msgid "Error"
msgstr "Virhe"
-#: src/client.cpp:1167
+#: src/client.cpp:1172
msgid "Requesting registration details"
msgstr "Pyydän rekisteröitymisen yksityiskohtia"
-#: src/client.cpp:1194
+#: src/client.cpp:1199
msgid "Password Change"
msgstr "Salasanan vaihto"
-#: src/client.cpp:1195
+#: src/client.cpp:1200
msgid "Password changed successfully!"
msgstr "Salasana vaihdettu onnistuneesti!"
-#: src/client.cpp:1214
+#: src/client.cpp:1219
msgid "Email Change"
msgstr "Sähköpostin vaihto"
-#: src/client.cpp:1215
+#: src/client.cpp:1220
msgid "Email changed successfully!"
msgstr "Sähköpostiosoite vaihdettu onnistuneesti!"
-#: src/client.cpp:1235
+#: src/client.cpp:1240
msgid "Unregister Successful"
msgstr "Tietojen poisto onnistui"
-#: src/client.cpp:1236
+#: src/client.cpp:1241
msgid "Farewell, come back any time..."
msgstr "Näkemisiin, tule pian takaisin..."
-#: src/client.cpp:1423 src/client.cpp:1453 src/client.cpp:1497
-#: src/client.cpp:1922 src/client.cpp:1929
+#: src/client.cpp:1428 src/client.cpp:1458 src/client.cpp:1502
+#: src/client.cpp:1927 src/client.cpp:1934
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%s ei ole olemassa eikä sitä voi luoda! Poistun."
-#: src/client.cpp:1628
+#: src/client.cpp:1633
#, c-format
msgid "Invalid update host: %s"
msgstr "Epäkelpo päivitysosoite: %s"
-#: src/client.cpp:1662 src/client.cpp:1668
+#: src/client.cpp:1667 src/client.cpp:1673
msgid "Error creating updates directory!"
msgstr "Päivityshakemistoa luodessa tapahtui virhe!"
-#: src/client.cpp:1689
+#: src/client.cpp:1694
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "Virhe: %s ei ole olemassa eikä sitä voi luoda! Poistun."
-#: src/commandhandler.cpp:301
+#: src/commandhandler.cpp:303
msgid "Unknown command."
msgstr "Tuntematon komento."
-#: src/commandhandler.cpp:401
+#: src/commandhandler.cpp:403
msgid "Cannot send empty whispers!"
msgstr "Et voi lähettää tyhjiä kuiskauksia!"
-#: src/commandhandler.cpp:415
+#: src/commandhandler.cpp:417
#, c-format
msgid ""
"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -143,152 +143,152 @@ msgstr ""
"Kuiskausvälilehden luonti nimelle \"%s\" epäonnistui! Se on joko jo auki tai "
"käytit omaa nimeäsi."
-#: src/commandhandler.cpp:435
+#: src/commandhandler.cpp:437
#, c-format
msgid "Requesting to join channel %s."
msgstr "Pyyntö liittyä kanavalle %s lähetetty."
-#: src/commandhandler.cpp:451 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:453 src/net/ea/gui/partytab.cpp:125
msgid "Party name is missing."
msgstr "Ryhmän nimi puuttuu."
-#: src/commandhandler.cpp:462
+#: src/commandhandler.cpp:464
msgid "Guild name is missing."
msgstr "Killan nimi puuttuu."
-#: src/commandhandler.cpp:475 src/commandhandler.cpp:582
-#: src/commandhandler.cpp:623 src/commandhandler.cpp:653
+#: src/commandhandler.cpp:477 src/commandhandler.cpp:589
+#: src/commandhandler.cpp:630 src/commandhandler.cpp:660
msgid "Please specify a name."
msgstr "Anna nimi."
-#: src/commandhandler.cpp:516
+#: src/commandhandler.cpp:523
msgid "Return toggles chat."
msgstr "Rivinvaihto aktivoi ja sulkee keskustelun."
-#: src/commandhandler.cpp:516
+#: src/commandhandler.cpp:523
msgid "Message closes chat."
msgstr "Viesti sulkee keskustelun."
-#: src/commandhandler.cpp:527
+#: src/commandhandler.cpp:534
msgid "Return now toggles chat."
msgstr "Nyt rivinvaihto aktivoi ja sulkee keskustelun."
-#: src/commandhandler.cpp:533
+#: src/commandhandler.cpp:540
msgid "Message now closes chat."
msgstr "Nyt viesti sulkee keskustelun."
-#: src/commandhandler.cpp:561
+#: src/commandhandler.cpp:568
msgid "friend"
msgstr "ystävä"
-#: src/commandhandler.cpp:566
+#: src/commandhandler.cpp:573
msgid "disregarded"
msgstr "vaimennettu"
-#: src/commandhandler.cpp:571
+#: src/commandhandler.cpp:578
msgid "neutral"
msgstr "neutraali"
-#: src/commandhandler.cpp:590
+#: src/commandhandler.cpp:597
#, c-format
msgid "Player already %s!"
msgstr "Pelaaja on jo %s!"
-#: src/commandhandler.cpp:604
+#: src/commandhandler.cpp:611
#, c-format
msgid "Player successfully %s!"
msgstr "Pelaaja on nyt %s."
-#: src/commandhandler.cpp:612
+#: src/commandhandler.cpp:619
#, c-format
msgid "Player could not be %s!"
msgstr "Toiminto epäonnistui, pelaaja ei ole vielä %s!"
-#: src/commandhandler.cpp:634
+#: src/commandhandler.cpp:641
msgid "Player wasn't ignored!"
msgstr "Pelaajaa ei ollut jätetty huomiotta!"
-#: src/commandhandler.cpp:641
+#: src/commandhandler.cpp:648
msgid "Player no longer ignored!"
msgstr "Pelaaja huomioidaan taas."
-#: src/commandhandler.cpp:643
+#: src/commandhandler.cpp:650
msgid "Player could not be unignored!"
msgstr "Pelaajan uudelleenhuomiointi epäonnistui."
-#: src/commandhandler.cpp:660
+#: src/commandhandler.cpp:667
msgid "Player already erased!"
msgstr "Pelaaja on jo pyyhitty!"
-#: src/commandhandler.cpp:671
+#: src/commandhandler.cpp:678
msgid "Player successfully erased!"
msgstr "Pelaaja pyyhitty."
-#: src/commandhandler.cpp:673
+#: src/commandhandler.cpp:680
msgid "Player could not be erased!"
msgstr "Toiminto epäonnistui, pelaajaa ei ole vielä pyyhitty."
-#: src/commandhandler.cpp:972 src/commandhandler.cpp:1018
+#: src/commandhandler.cpp:980 src/commandhandler.cpp:1026
#, c-format
msgid "Client uptime: %s"
msgstr "Ohjelma ollut käynnissä: %s"
-#: src/commandhandler.cpp:982
+#: src/commandhandler.cpp:990
#, c-format
msgid "%d week"
msgid_plural "%d weeks"
msgstr[0] "%d viikon"
msgstr[1] "%d viikkoa"
-#: src/commandhandler.cpp:991
+#: src/commandhandler.cpp:999
#, c-format
msgid "%d day"
msgid_plural "%d days"
msgstr[0] "%d päivän"
msgstr[1] "%d päivää"
-#: src/commandhandler.cpp:999
+#: src/commandhandler.cpp:1007
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] "%d tunnin"
msgstr[1] "%d tuntia"
-#: src/commandhandler.cpp:1007
+#: src/commandhandler.cpp:1015
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] "%d minuutin"
msgstr[1] "%d minuuttia"
-#: src/commandhandler.cpp:1015
+#: src/commandhandler.cpp:1023
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
msgstr[0] "%d sekunnin"
msgstr[1] "%d sekuntia"
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1102
msgid "font cache size"
msgstr "kirjasinvälimuistin koko"
-#: src/commandhandler.cpp:1106
+#: src/commandhandler.cpp:1114
msgid "Cache size:"
msgstr "Välimuistin koko:"
-#: src/commandhandler.cpp:1110
+#: src/commandhandler.cpp:1118
msgid "Created:"
msgstr "Luotu:"
-#: src/commandhandler.cpp:1112
+#: src/commandhandler.cpp:1120
msgid "Deleted:"
msgstr "Poistettu:"
-#: src/commandhandler.cpp:1159 src/commandhandler.cpp:1166
+#: src/commandhandler.cpp:1167 src/commandhandler.cpp:1174
msgid "Resource images:"
msgstr "Resurssikuvat:"
-#: src/commandhandler.cpp:1161 src/commandhandler.cpp:1168
+#: src/commandhandler.cpp:1169 src/commandhandler.cpp:1176
msgid "Resource orphaned images:"
msgstr "Orvot resurssikuvat:"
@@ -299,43 +299,43 @@ msgstr ""
"Vaihtoehdot komennolle /%s ovat \"yes\" (kyllä), \"no\" (ei) tai vastaavasti "
"\"true\", \"false\", \"1\" tai \"0\"."
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:411
+#: src/game.cpp:252 src/gui/widgets/chattab.cpp:409
msgid "General"
msgstr "Yleiset"
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:413
+#: src/game.cpp:256 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:411
msgid "Debug"
msgstr "Debug"
-#: src/game.cpp:488
+#: src/game.cpp:511
msgid "Screenshot saved as "
msgstr "Ruutukaappaus tallennettu nimellä "
-#: src/game.cpp:496
+#: src/game.cpp:519
msgid "Saving screenshot failed!"
msgstr "Ruutukaappauksen tallentaminen epäonnistui!"
-#: src/game.cpp:536
+#: src/game.cpp:559
msgid "The connection to the server was lost."
msgstr "Yhteys palvelimeen katkesi."
-#: src/game.cpp:548
+#: src/game.cpp:571
msgid "Network Error"
msgstr "Verkkovirhe"
-#: src/game.cpp:1213
+#: src/game.cpp:1236
msgid "Ignoring incoming trade requests"
msgstr "Et huomioi kaupankäyntipyyntöjä"
-#: src/game.cpp:1220
+#: src/game.cpp:1243
msgid "Accepting incoming trade requests"
msgstr "Hyväksyt kaupankäyntipyynnöt"
-#: src/game.cpp:1606
+#: src/game.cpp:1629
msgid "Could Not Load Map"
msgstr "Kartan lataaminen epäonnistui"
-#: src/game.cpp:1607
+#: src/game.cpp:1630
#, c-format
msgid "Error while loading %s"
msgstr "Kohdetta %s ladattaessa tapahtui virhe."
@@ -364,103 +364,103 @@ msgstr ""
msgid "Bot Checker"
msgstr "Bottitutka"
-#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
+#: src/gui/botcheckerwindow.cpp:295 src/gui/setup_relations.cpp:64
msgid "Name"
msgstr "Nimi"
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:134
-#: src/gui/popupmenu.cpp:292 src/gui/popupmenu.cpp:617
-#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
+#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:133
+#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:646
+#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:265
msgid "Attack"
msgstr "Hyökkää"
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:279
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:297
#: src/keyboardconfig.cpp:62
msgid "Talk"
msgstr "Keskustele"
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:245
-#: src/gui/popupmenu.cpp:284 src/gui/popupmenu.cpp:674
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:263
+#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:703
msgid "Move"
msgstr "Liiku"
-#: src/gui/botcheckerwindow.cpp:300
+#: src/gui/botcheckerwindow.cpp:299
msgid "Result"
msgstr "Tulos"
-#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123
+#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:124
msgid "Reset"
msgstr "Nollaa"
-#: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:260
-#: src/gui/popupmenu.cpp:281 src/gui/popupmenu.cpp:688
+#: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:98
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:278
+#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:717
msgid "Buy"
msgstr "Osta"
-#: src/gui/buydialog.cpp:88 src/gui/buydialog.cpp:302
-#: src/gui/selldialog.cpp:87 src/gui/selldialog.cpp:324
+#: src/gui/buydialog.cpp:89 src/gui/buydialog.cpp:303
+#: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
#, c-format
msgid "Price: %s / Total: %s"
msgstr "Hinta: %s / Kaikkiaan: %s"
#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
#. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:93 src/gui/itemamountwindow.cpp:207
-#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:113
-#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:974
+#: src/gui/buydialog.cpp:94 src/gui/itemamountwindow.cpp:207
+#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:973
msgid "+"
msgstr "+"
#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
#. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:96 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:986
+#: src/gui/buydialog.cpp:97 src/gui/itemamountwindow.cpp:206
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:985
msgid "-"
msgstr "-"
-#: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
-#: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
-#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:288
+#: src/gui/buydialog.cpp:99 src/gui/quitdialog.cpp:47
+#: src/gui/quitdialog.cpp:49 src/gui/quitdialog.cpp:50
+#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:294
#: src/keyboardconfig.cpp:290
msgid "Quit"
msgstr "Sulje"
-#: src/gui/buydialog.cpp:99 src/gui/selldialog.cpp:94
-#: src/gui/statuswindow.cpp:503 src/gui/statuswindow.cpp:552
-#: src/gui/statuswindow.cpp:973 src/gui/statuswindow.cpp:1004
+#: src/gui/buydialog.cpp:100 src/gui/selldialog.cpp:95
+#: src/gui/statuswindow.cpp:504 src/gui/statuswindow.cpp:553
+#: src/gui/statuswindow.cpp:972 src/gui/statuswindow.cpp:1003
msgid "Max"
msgstr "Max"
#: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:133
+#: src/gui/inventorywindow.cpp:147 src/gui/setup_other.cpp:133
msgid "Shop"
msgstr "Kauppa"
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:262
-#: src/gui/popupmenu.cpp:282 src/gui/popupmenu.cpp:690
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:280
+#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:719
#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
-#: src/gui/selldialog.cpp:92
+#: src/gui/selldialog.cpp:93
msgid "Sell"
msgstr "Myy"
#: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
-#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
+#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:96
#: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:336
-#: src/gui/popupmenu.cpp:357 src/gui/popupmenu.cpp:460
-#: src/gui/popupmenu.cpp:487 src/gui/popupmenu.cpp:511
-#: src/gui/popupmenu.cpp:525 src/gui/popupmenu.cpp:544
-#: src/gui/popupmenu.cpp:750 src/gui/popupmenu.cpp:774
-#: src/gui/popupmenu.cpp:1684 src/gui/popupmenu.cpp:1712
-#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1811
-#: src/gui/popupmenu.cpp:1846 src/gui/popupmenu.cpp:1886
-#: src/gui/popupmenu.cpp:1953 src/gui/popupmenu.cpp:1973
-#: src/gui/quitdialog.cpp:59 src/gui/register.cpp:82 src/gui/setup.cpp:71
-#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:354
+#: src/gui/popupmenu.cpp:375 src/gui/popupmenu.cpp:489
+#: src/gui/popupmenu.cpp:516 src/gui/popupmenu.cpp:540
+#: src/gui/popupmenu.cpp:554 src/gui/popupmenu.cpp:573
+#: src/gui/popupmenu.cpp:790 src/gui/popupmenu.cpp:814
+#: src/gui/popupmenu.cpp:1734 src/gui/popupmenu.cpp:1762
+#: src/gui/popupmenu.cpp:1818 src/gui/popupmenu.cpp:1861
+#: src/gui/popupmenu.cpp:1896 src/gui/popupmenu.cpp:1936
+#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2023
+#: src/gui/quitdialog.cpp:54 src/gui/register.cpp:82 src/gui/setup.cpp:72
+#: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:238
#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updaterwindow.cpp:157
+#: src/gui/updaterwindow.cpp:161
msgid "Cancel"
msgstr "Peru"
@@ -492,7 +492,7 @@ msgid "The email address entries mismatch."
msgstr "Annetut sähköpostiosoitteet eivät täsmää."
#: src/gui/changepassworddialog.cpp:50 src/gui/changepassworddialog.cpp:59
-#: src/gui/charselectdialog.cpp:140
+#: src/gui/charselectdialog.cpp:139
msgid "Change Password"
msgstr "Vaihda salasana"
@@ -527,121 +527,121 @@ msgstr "Uuden salasanan kopiot eivät täsmää."
msgid "Create Character"
msgstr "Luo hahmo"
-#: src/gui/charcreatedialog.cpp:73 src/gui/logindialog.cpp:94
+#: src/gui/charcreatedialog.cpp:76 src/gui/logindialog.cpp:94
#: src/gui/register.cpp:75
msgid "Name:"
msgstr "Nimi:"
#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
#. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:76 src/gui/charcreatedialog.cpp:81
-#: src/gui/charcreatedialog.cpp:87 src/gui/outfitwindow.cpp:81
+#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:84
+#: src/gui/charcreatedialog.cpp:90 src/gui/outfitwindow.cpp:85
msgid ">"
msgstr ">"
#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
#. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:82
-#: src/gui/charcreatedialog.cpp:88 src/gui/outfitwindow.cpp:80
+#: src/gui/charcreatedialog.cpp:82 src/gui/charcreatedialog.cpp:85
+#: src/gui/charcreatedialog.cpp:91 src/gui/outfitwindow.cpp:84
msgid "<"
msgstr "<"
-#: src/gui/charcreatedialog.cpp:80
+#: src/gui/charcreatedialog.cpp:83
msgid "Hair color:"
msgstr "Hiusten väri:"
-#: src/gui/charcreatedialog.cpp:83
+#: src/gui/charcreatedialog.cpp:86
msgid "Hair style:"
msgstr "Hiustyyli:"
-#: src/gui/charcreatedialog.cpp:89
+#: src/gui/charcreatedialog.cpp:92
msgid "Race:"
msgstr "Rotu: "
-#: src/gui/charcreatedialog.cpp:92 src/gui/charselectdialog.cpp:479
-#: src/gui/socialwindow.cpp:1033
+#: src/gui/charcreatedialog.cpp:95 src/gui/charselectdialog.cpp:478
+#: src/gui/socialwindow.cpp:1139
msgid "Create"
msgstr "Luo"
-#: src/gui/charcreatedialog.cpp:94 src/gui/register.cpp:98
+#: src/gui/charcreatedialog.cpp:97 src/gui/register.cpp:98
msgid "Male"
msgstr "Miespuolinen"
-#: src/gui/charcreatedialog.cpp:95 src/gui/register.cpp:99
+#: src/gui/charcreatedialog.cpp:98 src/gui/register.cpp:99
msgid "Female"
msgstr "Naispuolinen"
-#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:300
+#: src/gui/charcreatedialog.cpp:116 src/gui/charcreatedialog.cpp:303
#, c-format
msgid "Please distribute %d points"
msgstr "Jaa %d pistettä"
-#: src/gui/charcreatedialog.cpp:219
+#: src/gui/charcreatedialog.cpp:222
msgid "Your name needs to be at least 4 characters."
msgstr "Nimessäsi täytyy olla ainakin 4 merkkiä."
-#: src/gui/charcreatedialog.cpp:291
+#: src/gui/charcreatedialog.cpp:294
msgid "Character stats OK"
msgstr "Hahmon pistejako OK"
-#: src/gui/charcreatedialog.cpp:305
+#: src/gui/charcreatedialog.cpp:308
#, c-format
msgid "Please remove %d points"
msgstr "%d pistettä liikaa, ole hyvä ja poista ylimäärä"
-#: src/gui/charselectdialog.cpp:77
+#: src/gui/charselectdialog.cpp:76
msgid "Confirm Character Delete"
msgstr "Vahvista hahmon poisto"
-#: src/gui/charselectdialog.cpp:78
+#: src/gui/charselectdialog.cpp:77
msgid "Are you sure you want to delete this character?"
msgstr "Oletko varma, että haluat poistaa tämän hahmon?"
-#: src/gui/charselectdialog.cpp:126
+#: src/gui/charselectdialog.cpp:125
msgid "Account and Character Management"
msgstr "Tilin ja hahmojen hallinta"
-#: src/gui/charselectdialog.cpp:139
+#: src/gui/charselectdialog.cpp:138
msgid "Switch Login"
msgstr "Vaihda sisäänkirjautumistietoja"
-#: src/gui/charselectdialog.cpp:153 src/gui/unregisterdialog.cpp:50
+#: src/gui/charselectdialog.cpp:152 src/gui/unregisterdialog.cpp:50
#: src/gui/unregisterdialog.cpp:58
msgid "Unregister"
msgstr "Poista palvelimelta"
-#: src/gui/charselectdialog.cpp:162
+#: src/gui/charselectdialog.cpp:161
msgid "Change Email"
msgstr "Vaihda sähköpostiosoite"
-#: src/gui/charselectdialog.cpp:254
+#: src/gui/charselectdialog.cpp:253
msgid "Incorrect password"
msgstr "Väärä salasana"
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:286
msgid "Enter password for deleting character"
msgstr "Anna salasana hahmon poistamiseksi"
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:286
msgid "Enter password:"
msgstr "Salasana:"
-#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:292
-#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
-#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
+#: src/gui/charselectdialog.cpp:408 src/gui/serverdialog.cpp:298
+#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:122
+#: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:241
msgid "Delete"
msgstr "Poista"
-#: src/gui/charselectdialog.cpp:467
+#: src/gui/charselectdialog.cpp:466
msgid "Choose"
msgstr "Valitse"
-#: src/gui/charselectdialog.cpp:470
+#: src/gui/charselectdialog.cpp:469
#, c-format
msgid "Level %d"
msgstr "Taso %d"
-#: src/gui/charselectdialog.cpp:481 src/gui/charselectdialog.cpp:482
+#: src/gui/charselectdialog.cpp:480 src/gui/charselectdialog.cpp:481
msgid "(empty)"
msgstr "(tyhjä)"
@@ -713,12 +713,12 @@ msgstr "???"
msgid "Chat"
msgstr "Keskustelu"
-#: src/gui/chatwindow.cpp:606
+#: src/gui/chatwindow.cpp:609
#, c-format
msgid "Present: %s; %d players are present."
msgstr "Läsnä: %s; %d pelaajaa paikalla."
-#: src/gui/chatwindow.cpp:993
+#: src/gui/chatwindow.cpp:996
#, c-format
msgid "Whispering to %s: %s"
msgstr "Kuiskaat pelaajalle %s: %s"
@@ -731,145 +731,145 @@ msgstr "Kyllä"
msgid "No"
msgstr "Ei"
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:150
-#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:384
-#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:632
-#: src/gui/popupmenu.cpp:640
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:149
+#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:402
+#: src/gui/popupmenu.cpp:408 src/gui/popupmenu.cpp:661
+#: src/gui/popupmenu.cpp:669
msgid "Ignore"
msgstr "Ohita"
-#: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
+#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:97
#: src/gui/setup_other.cpp:64
msgid "Map"
msgstr "Kartta"
-#: src/gui/debugwindow.cpp:71
+#: src/gui/debugwindow.cpp:73
msgid "Target"
msgstr "Kohde"
-#: src/gui/debugwindow.cpp:72
+#: src/gui/debugwindow.cpp:74
msgid "Net"
msgstr "Verkko"
-#: src/gui/debugwindow.cpp:145 src/gui/debugwindow.cpp:220
-#: src/gui/debugwindow.cpp:249
+#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
+#: src/gui/debugwindow.cpp:251
msgid "Music:"
msgstr "Musiikki:"
-#: src/gui/debugwindow.cpp:146 src/gui/debugwindow.cpp:224
-#: src/gui/debugwindow.cpp:251
+#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:226
+#: src/gui/debugwindow.cpp:253
msgid "Map:"
msgstr "Kartta:"
-#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
-#: src/gui/debugwindow.cpp:250
+#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:224
+#: src/gui/debugwindow.cpp:252
msgid "Minimap:"
msgstr "Minikartta:"
-#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:218
-#: src/gui/debugwindow.cpp:247
+#: src/gui/debugwindow.cpp:150 src/gui/debugwindow.cpp:220
+#: src/gui/debugwindow.cpp:249
msgid "Cursor:"
msgstr "Osoitin:"
-#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:201
-#: src/gui/debugwindow.cpp:206
+#: src/gui/debugwindow.cpp:151 src/gui/debugwindow.cpp:203
+#: src/gui/debugwindow.cpp:208
msgid "Player Position:"
msgstr "Pelaajan sijainti:"
-#: src/gui/debugwindow.cpp:152
+#: src/gui/debugwindow.cpp:154
msgid "Particle count:"
msgstr "Hiukkasten määrä:"
-#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:235
-#: src/gui/debugwindow.cpp:254
+#: src/gui/debugwindow.cpp:156 src/gui/debugwindow.cpp:237
+#: src/gui/debugwindow.cpp:256
msgid "Map actors count:"
msgstr "Toimijoita kartalla:"
-#: src/gui/debugwindow.cpp:162 src/gui/debugwindow.cpp:173
+#: src/gui/debugwindow.cpp:164 src/gui/debugwindow.cpp:175
#, c-format
msgid "%d FPS (Software)"
msgstr "%d FPS (ei kiihdytystä)"
-#: src/gui/debugwindow.cpp:166
+#: src/gui/debugwindow.cpp:168
#, c-format
msgid "%d FPS (fast OpenGL)"
msgstr "%d FPS (nopea OpenGL)"
-#: src/gui/debugwindow.cpp:169
+#: src/gui/debugwindow.cpp:171
#, c-format
msgid "%d FPS (old OpenGL)"
msgstr "%d FPS (vanha OpenGL)"
-#: src/gui/debugwindow.cpp:176
+#: src/gui/debugwindow.cpp:178
#, c-format
msgid "%d FPS"
msgstr "%d FPS"
-#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:240
+#: src/gui/debugwindow.cpp:190 src/gui/debugwindow.cpp:242
msgid "Textures count:"
msgstr "Tekstuurien määrä:"
-#: src/gui/debugwindow.cpp:231
+#: src/gui/debugwindow.cpp:233
#, c-format
msgid "Particle count: %d"
msgstr "Hiukkasluku: %d"
-#: src/gui/debugwindow.cpp:268 src/gui/debugwindow.cpp:299
-#: src/gui/debugwindow.cpp:343
+#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:301
+#: src/gui/debugwindow.cpp:345
msgid "Target:"
msgstr "Kohde:"
-#: src/gui/debugwindow.cpp:269 src/gui/debugwindow.cpp:304
-#: src/gui/debugwindow.cpp:344
+#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:306
+#: src/gui/debugwindow.cpp:346
msgid "Target Id:"
msgstr "Kohteen tunniste:"
-#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:308
-#: src/gui/debugwindow.cpp:313 src/gui/debugwindow.cpp:345
+#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:310
+#: src/gui/debugwindow.cpp:315 src/gui/debugwindow.cpp:347
msgid "Target Level:"
msgstr "Kohteen taso:"
-#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:316
-#: src/gui/debugwindow.cpp:346
+#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:318
+#: src/gui/debugwindow.cpp:348
msgid "Target Party:"
msgstr "Kohteen ryhmä:"
-#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:319
-#: src/gui/debugwindow.cpp:347
+#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:321
+#: src/gui/debugwindow.cpp:349
msgid "Target Guild:"
msgstr "Kohteen kilta:"
-#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:333
-#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:348
+#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:335
+#: src/gui/debugwindow.cpp:340 src/gui/debugwindow.cpp:350
msgid "Attack delay:"
msgstr "Hyökkäysviive:"
-#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:323
-#: src/gui/debugwindow.cpp:349
+#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:325
+#: src/gui/debugwindow.cpp:351
msgid "Minimal hit:"
msgstr "Minimivahinko:"
-#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:325
-#: src/gui/debugwindow.cpp:350
+#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:327
+#: src/gui/debugwindow.cpp:352
msgid "Maximum hit:"
msgstr "Maksimivahinko:"
-#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:327
-#: src/gui/debugwindow.cpp:351
+#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:329
+#: src/gui/debugwindow.cpp:353
msgid "Critical hit:"
msgstr "Kriittinen osuma:"
-#: src/gui/debugwindow.cpp:385 src/gui/debugwindow.cpp:390
+#: src/gui/debugwindow.cpp:387 src/gui/debugwindow.cpp:392
#, c-format
msgid "Ping: %s ms"
msgstr ""
-#: src/gui/debugwindow.cpp:393
+#: src/gui/debugwindow.cpp:395
#, c-format
msgid "In: %d bytes/s"
msgstr "Sisään: %d tavua/s"
-#: src/gui/debugwindow.cpp:395
+#: src/gui/debugwindow.cpp:397
#, c-format
msgid "Out: %d bytes/s"
msgstr "Ulos: %d tavua/s"
@@ -878,26 +878,26 @@ msgstr "Ulos: %d tavua/s"
msgid "Did You Know?"
msgstr ""
-#: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
-#: src/gui/inventorywindow.cpp:175 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:559 src/gui/shopwindow.cpp:111
+#: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
+#: src/gui/inventorywindow.cpp:176 src/gui/npcdialog.cpp:53
+#: src/gui/popupmenu.cpp:588 src/gui/shopwindow.cpp:113
msgid "Close"
msgstr "Sulje"
-#: src/gui/didyouknowwindow.cpp:62
+#: src/gui/didyouknowwindow.cpp:64
msgid "< Previous"
msgstr ""
-#: src/gui/didyouknowwindow.cpp:63
+#: src/gui/didyouknowwindow.cpp:65
msgid "Next >"
msgstr ""
-#: src/gui/didyouknowwindow.cpp:64
+#: src/gui/didyouknowwindow.cpp:66
msgid "Auto open this window"
msgstr ""
#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:58 src/gui/textdialog.cpp:50
+#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:53 src/gui/textdialog.cpp:50
msgid "OK"
msgstr "Ok"
@@ -905,10 +905,10 @@ msgstr "Ok"
msgid "Equipment"
msgstr "Varusteet"
-#: src/gui/equipmentwindow.cpp:93 src/gui/inventorywindow.cpp:130
-#: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
-#: src/gui/popupmenu.cpp:1643 src/gui/popupmenu.cpp:1738
-#: src/gui/popupmenu.cpp:1783
+#: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:131
+#: src/gui/inventorywindow.cpp:512 src/gui/inventorywindow.cpp:521
+#: src/gui/popupmenu.cpp:1693 src/gui/popupmenu.cpp:1788
+#: src/gui/popupmenu.cpp:1833
msgid "Unequip"
msgstr "Poista varuste käytöstä"
@@ -921,75 +921,75 @@ msgstr "Apua"
msgid "Inventory"
msgstr "Tavarat"
-#: src/gui/inventorywindow.cpp:104
+#: src/gui/inventorywindow.cpp:105
msgid "Slots:"
msgstr "Paikkoja:"
-#: src/gui/inventorywindow.cpp:115
+#: src/gui/inventorywindow.cpp:116
msgid "Filter:"
msgstr "Suodin:"
-#: src/gui/inventorywindow.cpp:116
+#: src/gui/inventorywindow.cpp:117
msgid "Sort:"
msgstr "Järj.:"
-#: src/gui/inventorywindow.cpp:122
+#: src/gui/inventorywindow.cpp:123
msgid "na"
msgstr "-"
-#: src/gui/inventorywindow.cpp:123
+#: src/gui/inventorywindow.cpp:124
msgid "az"
msgstr "A"
-#: src/gui/inventorywindow.cpp:124
+#: src/gui/inventorywindow.cpp:125
msgid "id"
msgstr "#"
-#: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:513
-#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1645
-#: src/gui/popupmenu.cpp:1740 src/gui/popupmenu.cpp:1785
+#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
+#: src/gui/inventorywindow.cpp:523 src/gui/popupmenu.cpp:1695
+#: src/gui/popupmenu.cpp:1790 src/gui/popupmenu.cpp:1835
msgid "Equip"
msgstr "Ota käyttöön"
-#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
-#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1648
-#: src/gui/popupmenu.cpp:1707 src/gui/popupmenu.cpp:1744
-#: src/gui/popupmenu.cpp:1788
+#: src/gui/inventorywindow.cpp:130 src/gui/inventorywindow.cpp:515
+#: src/gui/inventorywindow.cpp:519 src/gui/popupmenu.cpp:1698
+#: src/gui/popupmenu.cpp:1757 src/gui/popupmenu.cpp:1794
+#: src/gui/popupmenu.cpp:1838
msgid "Use"
msgstr "Käytä"
-#: src/gui/inventorywindow.cpp:143 src/gui/inventorywindow.cpp:619
-#: src/gui/popupmenu.cpp:1652 src/gui/popupmenu.cpp:1749
-#: src/gui/popupmenu.cpp:1792
+#: src/gui/inventorywindow.cpp:144 src/gui/inventorywindow.cpp:620
+#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1799
+#: src/gui/popupmenu.cpp:1842
msgid "Drop..."
msgstr "Pudota..."
-#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1661
-#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1801
+#: src/gui/inventorywindow.cpp:145 src/gui/popupmenu.cpp:1711
+#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1851
msgid "Split"
msgstr "Jaa"
-#: src/gui/inventorywindow.cpp:145 src/gui/outfitwindow.cpp:59
-#: src/gui/popupmenu.cpp:520
+#: src/gui/inventorywindow.cpp:146 src/gui/outfitwindow.cpp:60
+#: src/gui/popupmenu.cpp:549
msgid "Outfits"
msgstr "Asukokonaisuudet"
-#: src/gui/inventorywindow.cpp:148
+#: src/gui/inventorywindow.cpp:149
msgid "Weight:"
msgstr "Paino:"
-#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
-#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
-#: src/gui/popupmenu.cpp:1804 src/gui/setup.cpp:72
+#: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:611
+#: src/gui/popupmenu.cpp:1674 src/gui/popupmenu.cpp:1811
+#: src/gui/popupmenu.cpp:1854 src/gui/setup.cpp:73
msgid "Store"
msgstr "Varastoi"
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1668
+#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1718
msgid "Retrieve"
msgstr "Ota"
-#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1657
-#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1797
+#: src/gui/inventorywindow.cpp:622 src/gui/popupmenu.cpp:1707
+#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1847
#: src/gui/windowmenu.cpp:97
msgid "Drop"
msgstr "Pudota"
@@ -1030,11 +1030,11 @@ msgstr "Lisää myyntikauppaan."
msgid "Unknown."
msgstr "Tuntematon."
-#: src/gui/itempopup.cpp:176 src/gui/itempopup.cpp:182
+#: src/gui/itempopup.cpp:177 src/gui/itempopup.cpp:183
msgid ", "
msgstr ", "
-#: src/gui/itempopup.cpp:192
+#: src/gui/itempopup.cpp:193
#, c-format
msgid "Weight: %s"
msgstr "Paino: %s"
@@ -1043,90 +1043,94 @@ msgstr "Paino: %s"
msgid "Kill stats"
msgstr "Tappotilastot"
-#: src/gui/killstats.cpp:64
+#: src/gui/killstats.cpp:65
msgid "Reset stats"
msgstr "Nollaa tiedot"
-#: src/gui/killstats.cpp:65
+#: src/gui/killstats.cpp:66
msgid "Reset timer"
msgstr "Nollaa ajastin"
-#: src/gui/killstats.cpp:69 src/gui/killstats.cpp:205
+#: src/gui/killstats.cpp:70 src/gui/killstats.cpp:206
#, c-format
msgid "Level: %d at %f%%"
msgstr ""
-#: src/gui/killstats.cpp:73 src/gui/killstats.cpp:210
+#: src/gui/killstats.cpp:74 src/gui/killstats.cpp:211
#, c-format
msgid "Exp: %d/%d Left: %d"
msgstr ""
-#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:216
-#: src/gui/killstats.cpp:225
+#: src/gui/killstats.cpp:77 src/gui/killstats.cpp:217
+#: src/gui/killstats.cpp:226
#, c-format
msgid "1%% = %d exp, avg mob for 1%%: %s"
msgstr ""
-#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:142
-#: src/gui/killstats.cpp:234
+#: src/gui/killstats.cpp:80 src/gui/killstats.cpp:143
+#: src/gui/killstats.cpp:235
#, c-format
msgid "Kills: %s, total exp: %s"
msgstr ""
-#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
-#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:230
+#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145
+#: src/gui/killstats.cpp:221 src/gui/killstats.cpp:231
#, c-format
msgid "Avg Exp: %s, No. of avg mob to next level: %s"
msgstr ""
-#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:162
-#: src/gui/killstats.cpp:237
+#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:163
+#: src/gui/killstats.cpp:238
#, c-format
msgid "Kills/Min: %s, Exp/Min: %s"
msgstr ""
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:89 src/gui/killstats.cpp:94
-#: src/gui/killstats.cpp:289 src/gui/killstats.cpp:305
-#: src/gui/killstats.cpp:323
+#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:90 src/gui/killstats.cpp:95
+#: src/gui/killstats.cpp:290 src/gui/killstats.cpp:306
+#: src/gui/killstats.cpp:324
#, c-format
msgid "Exp speed per %d min: %s"
msgid_plural "Exp speed per %d min: %s"
msgstr[0] ""
msgstr[1] ""
-#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
+#: src/gui/killstats.cpp:88 src/gui/killstats.cpp:93 src/gui/killstats.cpp:98
#, c-format
msgid "Time for next level per %d min: %s"
msgid_plural "Time for next level per %d min: %s"
msgstr[0] ""
msgstr[1] ""
-#: src/gui/killstats.cpp:100 src/gui/killstats.cpp:241
+#: src/gui/killstats.cpp:101 src/gui/killstats.cpp:242
msgid "Last kill exp:"
msgstr ""
-#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:355
-#: src/gui/killstats.cpp:361 src/gui/killstats.cpp:367
-#: src/gui/killstats.cpp:372
+#: src/gui/killstats.cpp:103 src/gui/killstats.cpp:356
+#: src/gui/killstats.cpp:362 src/gui/killstats.cpp:368
+#: src/gui/killstats.cpp:373
msgid "Time before jacko spawn:"
msgstr ""
-#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:301
-#: src/gui/killstats.cpp:311 src/gui/killstats.cpp:318
-#: src/gui/killstats.cpp:330 src/gui/killstats.cpp:337
+#: src/gui/killstats.cpp:295 src/gui/killstats.cpp:302
+#: src/gui/killstats.cpp:312 src/gui/killstats.cpp:319
+#: src/gui/killstats.cpp:331 src/gui/killstats.cpp:338
#, c-format
msgid " Time for next level: %s"
msgstr ""
-#: src/gui/killstats.cpp:361
+#: src/gui/killstats.cpp:362
#, c-format
msgid "%s %d?"
msgstr ""
-#: src/gui/killstats.cpp:367
+#: src/gui/killstats.cpp:368
msgid "jacko spawning"
msgstr ""
+#: src/guildmanager.cpp:464 src/net/ea/guildhandler.cpp:439
+msgid "You have left the guild."
+msgstr "Olet eronnut killasta."
+
#: src/gui/logindialog.cpp:59
msgid "Normal"
msgstr "Oletus"
@@ -1143,7 +1147,7 @@ msgstr "Ohita"
msgid "Login"
msgstr "Kirjaudu sisään"
-#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:246
+#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:252
#: src/gui/widgets/chattab.cpp:173
msgid "Server:"
msgstr "Palvelin:"
@@ -1225,11 +1229,11 @@ msgstr "Lähetä"
msgid "NPC"
msgstr "Ei-pelaajahahmo (NPC)"
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:561
+#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:590
msgid "Clear"
msgstr "Tyhjennä"
-#: src/gui/npcdialog.cpp:222
+#: src/gui/npcdialog.cpp:223
msgid "> Next"
msgstr "> Seuraava"
@@ -1245,346 +1249,346 @@ msgstr "Lähetä"
msgid "Failed to send as sender or letter invalid."
msgstr "Lähettäminen epäonnistui: vastaanottaja tai kirje ei kelpaa."
-#: src/gui/outfitwindow.cpp:82 src/gui/outfitwindow.cpp:886
+#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:890
#, c-format
msgid "Outfit: %d"
msgstr "Asu: %d"
-#: src/gui/outfitwindow.cpp:84 src/gui/outfitwindow.cpp:888
+#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:892
#, c-format
msgid "Key: %s"
msgstr "Näppäin: %s"
-#: src/gui/outfitwindow.cpp:87
+#: src/gui/outfitwindow.cpp:91
msgid "Unequip first"
msgstr "Riisu ensin"
-#: src/gui/outfitwindow.cpp:90
+#: src/gui/outfitwindow.cpp:94
msgid "Away outfit"
msgstr "Poissaoloasu"
-#: src/gui/popupmenu.cpp:133 src/gui/popupmenu.cpp:616
+#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:645
#: src/gui/widgets/tradetab.cpp:44
msgid "Trade"
msgstr "Tee kaupat"
-#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:375
+#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:393
msgid "Whisper"
msgstr "Kuiskaa"
-#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:621
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:650
msgid "Heal"
msgstr "Paranna"
-#: src/gui/popupmenu.cpp:146 src/gui/popupmenu.cpp:381
-#: src/gui/popupmenu.cpp:628
+#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:399
+#: src/gui/popupmenu.cpp:657
msgid "Be friend"
msgstr "Ystävysty"
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:383
-#: src/gui/popupmenu.cpp:389 src/gui/popupmenu.cpp:408
-#: src/gui/popupmenu.cpp:630 src/gui/popupmenu.cpp:638
-#: src/gui/popupmenu.cpp:662
+#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:156
+#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:401
+#: src/gui/popupmenu.cpp:407 src/gui/popupmenu.cpp:426
+#: src/gui/popupmenu.cpp:659 src/gui/popupmenu.cpp:667
+#: src/gui/popupmenu.cpp:691
msgid "Disregard"
msgstr "Vaimenna"
-#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:161
-#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:177
-#: src/gui/popupmenu.cpp:385 src/gui/popupmenu.cpp:391
-#: src/gui/popupmenu.cpp:398 src/gui/popupmenu.cpp:403
-#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
-#: src/gui/popupmenu.cpp:649 src/gui/popupmenu.cpp:655
+#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:160
+#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:176
+#: src/gui/popupmenu.cpp:403 src/gui/popupmenu.cpp:409
+#: src/gui/popupmenu.cpp:416 src/gui/popupmenu.cpp:421
+#: src/gui/popupmenu.cpp:662 src/gui/popupmenu.cpp:670
+#: src/gui/popupmenu.cpp:678 src/gui/popupmenu.cpp:684
msgid "Erase"
msgstr "Pyyhi"
-#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:175
-#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:395
-#: src/gui/popupmenu.cpp:402 src/gui/popupmenu.cpp:407
-#: src/gui/popupmenu.cpp:646 src/gui/popupmenu.cpp:654
-#: src/gui/popupmenu.cpp:660
+#: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:174
+#: src/gui/popupmenu.cpp:181 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:425
+#: src/gui/popupmenu.cpp:675 src/gui/popupmenu.cpp:683
+#: src/gui/popupmenu.cpp:689
msgid "Unignore"
msgstr "Huomioi jälleen"
-#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:186
-#: src/gui/popupmenu.cpp:397 src/gui/popupmenu.cpp:410
-#: src/gui/popupmenu.cpp:648 src/gui/popupmenu.cpp:664
+#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:185
+#: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:428
+#: src/gui/popupmenu.cpp:677 src/gui/popupmenu.cpp:693
#: src/playerrelations.cpp:400
msgid "Completely ignore"
msgstr "Jätä täysin huomiotta"
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:418
-#: src/gui/popupmenu.cpp:672
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:436
+#: src/gui/popupmenu.cpp:701
msgid "Follow"
msgstr "Seuraa"
-#: src/gui/popupmenu.cpp:196 src/gui/popupmenu.cpp:419
-#: src/gui/popupmenu.cpp:673
+#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:437
+#: src/gui/popupmenu.cpp:702
msgid "Imitation"
msgstr "Matki"
-#: src/gui/popupmenu.cpp:206 src/gui/popupmenu.cpp:710
+#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:739
msgid "Invite to party"
msgstr "Kutsu ryhmään"
-#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:428
-#: src/gui/popupmenu.cpp:715
+#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:744
msgid "Kick from party"
msgstr "Potki ryhmästä"
-#: src/gui/popupmenu.cpp:226 src/gui/popupmenu.cpp:439
-#: src/gui/popupmenu.cpp:729
+#: src/gui/popupmenu.cpp:225 src/gui/popupmenu.cpp:237
+#: src/gui/popupmenu.cpp:460 src/gui/popupmenu.cpp:761
msgid "Kick from guild"
msgstr "Potki killasta"
-#: src/gui/popupmenu.cpp:228 src/gui/popupmenu.cpp:441
-#: src/gui/popupmenu.cpp:731
+#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:242
+#: src/gui/popupmenu.cpp:465 src/gui/popupmenu.cpp:766
msgid "Change pos in guild"
msgstr "Muuta kilta-asemaa"
-#: src/gui/popupmenu.cpp:234 src/gui/popupmenu.cpp:446
-#: src/gui/popupmenu.cpp:737
+#: src/gui/popupmenu.cpp:251 src/gui/popupmenu.cpp:474
+#: src/gui/popupmenu.cpp:776
msgid "Invite to guild"
msgstr "Kutsu kiltaan"
-#: src/gui/popupmenu.cpp:242
+#: src/gui/popupmenu.cpp:260
msgid "Kick player"
msgstr "Potki pelaaja"
-#: src/gui/popupmenu.cpp:244
+#: src/gui/popupmenu.cpp:262
msgid "Nuke"
msgstr "Pommita"
-#: src/gui/popupmenu.cpp:247 src/gui/popupmenu.cpp:675
+#: src/gui/popupmenu.cpp:265 src/gui/popupmenu.cpp:704
msgid "Show Items"
msgstr "Näytä tavarat"
-#: src/gui/popupmenu.cpp:248 src/gui/popupmenu.cpp:676
-#: src/gui/popupmenu.cpp:1970
+#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:705
+#: src/gui/popupmenu.cpp:2020
msgid "Undress"
msgstr "Riisu"
-#: src/gui/popupmenu.cpp:250 src/gui/popupmenu.cpp:286
-#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:678
-#: src/gui/popupmenu.cpp:746
+#: src/gui/popupmenu.cpp:268 src/gui/popupmenu.cpp:304
+#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:707
+#: src/gui/popupmenu.cpp:786
msgid "Add comment"
msgstr ""
-#: src/gui/popupmenu.cpp:268 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:695
+#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:482
+#: src/gui/popupmenu.cpp:724
msgid "Buy (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:454
-#: src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:483
+#: src/gui/popupmenu.cpp:726
msgid "Sell (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:298
+#: src/gui/popupmenu.cpp:316
msgid "Kick"
msgstr "Potki"
-#: src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:327
msgid "Remove from attack list"
msgstr "Poista hyökkäyslistasta"
-#: src/gui/popupmenu.cpp:315
+#: src/gui/popupmenu.cpp:333
msgid "Add to priority attack list"
msgstr "Lisää prioriteettihyökkäyslistalle"
-#: src/gui/popupmenu.cpp:317
+#: src/gui/popupmenu.cpp:335
msgid "Add to attack list"
msgstr "Lisää hyökkäyslistaan"
-#: src/gui/popupmenu.cpp:320
+#: src/gui/popupmenu.cpp:338
msgid "Add to ignore list"
msgstr "Lisää ohitettavien listaan"
-#: src/gui/popupmenu.cpp:333 src/gui/popupmenu.cpp:457
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:486
msgid "Add name to chat"
msgstr "Lisää nimi keskusteluun"
-#: src/gui/popupmenu.cpp:483
+#: src/gui/popupmenu.cpp:512
msgid "Pick up"
msgstr "Nosta"
-#: src/gui/popupmenu.cpp:484 src/gui/popupmenu.cpp:1682
-#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1805
+#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:1732
+#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1855
msgid "Add to chat"
msgstr "Lisää keskusteluun"
-#: src/gui/popupmenu.cpp:501
+#: src/gui/popupmenu.cpp:530
msgid "Map Item"
msgstr "Karttaolio"
-#: src/gui/popupmenu.cpp:502
+#: src/gui/popupmenu.cpp:531
msgid "Rename"
msgstr "Nimeä uudelleen"
-#: src/gui/popupmenu.cpp:503 src/gui/popupmenu.cpp:1923
-#: src/gui/popupmenu.cpp:1941 src/gui/popupmenu.cpp:1946
+#: src/gui/popupmenu.cpp:532 src/gui/popupmenu.cpp:1973
+#: src/gui/popupmenu.cpp:1991 src/gui/popupmenu.cpp:1996
msgid "Remove"
msgstr "Poista"
-#: src/gui/popupmenu.cpp:508
+#: src/gui/popupmenu.cpp:537
msgid "Warp"
msgstr ""
-#: src/gui/popupmenu.cpp:522
+#: src/gui/popupmenu.cpp:551
msgid "Load old outfits"
msgstr "Lataa vanhat asut"
-#: src/gui/popupmenu.cpp:538 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:567 src/gui/windowmenu.cpp:96
msgid "Spells"
msgstr "Loitsut"
-#: src/gui/popupmenu.cpp:540
+#: src/gui/popupmenu.cpp:569
msgid "Load old spells"
msgstr "Lataa vanhat loitsut"
-#: src/gui/popupmenu.cpp:541
+#: src/gui/popupmenu.cpp:570
msgid "Edit spell"
msgstr "Muokkaa loitsua"
-#: src/gui/popupmenu.cpp:567
+#: src/gui/popupmenu.cpp:596
msgid "Disable highlight"
msgstr "Estä korostus"
-#: src/gui/popupmenu.cpp:572
+#: src/gui/popupmenu.cpp:601
msgid "Enable highlight"
msgstr "Salli korostus"
-#: src/gui/popupmenu.cpp:577
-msgid "Dont remove name"
-msgstr "Älä poista nimeä"
+#: src/gui/popupmenu.cpp:606
+msgid "Don't remove name"
+msgstr ""
-#: src/gui/popupmenu.cpp:582
+#: src/gui/popupmenu.cpp:611
msgid "Remove name"
msgstr "Poista nimi"
-#: src/gui/popupmenu.cpp:587
+#: src/gui/popupmenu.cpp:616
msgid "Enable away"
msgstr "Ota poissaolo käyttöön"
-#: src/gui/popupmenu.cpp:592
+#: src/gui/popupmenu.cpp:621
msgid "Disable away"
msgstr "Poista poissaolo käytöstä"
-#: src/gui/popupmenu.cpp:598 src/gui/socialwindow.cpp:1035
+#: src/gui/popupmenu.cpp:627 src/gui/socialwindow.cpp:1141
msgid "Leave"
msgstr "Eroa"
-#: src/gui/popupmenu.cpp:758
+#: src/gui/popupmenu.cpp:798
msgid "Change guild position"
msgstr "Muuta asemaa killassa"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1189
+#: src/gui/popupmenu.cpp:1234
msgid "Rename map sign "
msgstr "Muuta merkin nimeä "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1191
+#: src/gui/popupmenu.cpp:1236
msgid "Name: "
msgstr "Nimi: "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1241
+#: src/gui/popupmenu.cpp:1286
msgid "Player comment "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1243
+#: src/gui/popupmenu.cpp:1288
msgid "Comment: "
msgstr ""
-#: src/gui/popupmenu.cpp:1607
+#: src/gui/popupmenu.cpp:1657
msgid "Add to trade"
msgstr "Lisää kauppaan"
-#: src/gui/popupmenu.cpp:1613
+#: src/gui/popupmenu.cpp:1663
msgid "Add to trade 10"
msgstr "Lisää 10 kauppaan"
-#: src/gui/popupmenu.cpp:1616
+#: src/gui/popupmenu.cpp:1666
msgid "Add to trade half"
msgstr "Lisää puolet kauppaan"
-#: src/gui/popupmenu.cpp:1618
+#: src/gui/popupmenu.cpp:1668
msgid "Add to trade all"
msgstr "Lisää kaikki kauppaan"
-#: src/gui/popupmenu.cpp:1630
+#: src/gui/popupmenu.cpp:1680
msgid "Store 10"
msgstr "Varastoi 10"
-#: src/gui/popupmenu.cpp:1633
+#: src/gui/popupmenu.cpp:1683
msgid "Store half"
msgstr "Varastoi puolet"
-#: src/gui/popupmenu.cpp:1635
+#: src/gui/popupmenu.cpp:1685
msgid "Store all"
msgstr "Varastoi kaikki"
-#: src/gui/popupmenu.cpp:1653 src/gui/popupmenu.cpp:1750
-#: src/gui/popupmenu.cpp:1793
+#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1800
+#: src/gui/popupmenu.cpp:1843
msgid "Drop all"
msgstr ""
-#: src/gui/popupmenu.cpp:1674
+#: src/gui/popupmenu.cpp:1724
msgid "Retrieve 10"
msgstr "Ota 10"
-#: src/gui/popupmenu.cpp:1677
+#: src/gui/popupmenu.cpp:1727
msgid "Retrieve half"
msgstr "Ota puolet"
-#: src/gui/popupmenu.cpp:1679
+#: src/gui/popupmenu.cpp:1729
msgid "Retrieve all"
msgstr "Ota kaikki"
-#: src/gui/popupmenu.cpp:1710 src/gui/popupmenu.cpp:1766
+#: src/gui/popupmenu.cpp:1760 src/gui/popupmenu.cpp:1816
msgid "Load old item shortcuts"
msgstr "Lataa vanhat tavarapikavalinnat"
-#: src/gui/popupmenu.cpp:1809
+#: src/gui/popupmenu.cpp:1859
msgid "Load old drop shortcuts"
msgstr "Lataa vanhat pudotuspikavalinnat"
-#: src/gui/popupmenu.cpp:1835 src/gui/popupmenu.cpp:1870
+#: src/gui/popupmenu.cpp:1885 src/gui/popupmenu.cpp:1920
msgid "Hide"
msgstr "Piilota"
-#: src/gui/popupmenu.cpp:1841 src/gui/popupmenu.cpp:1876
+#: src/gui/popupmenu.cpp:1891 src/gui/popupmenu.cpp:1926
msgid "Show"
msgstr "Näytä"
-#: src/gui/popupmenu.cpp:1883
+#: src/gui/popupmenu.cpp:1933
msgid "Reset yellow bar"
msgstr "Palauta oletusmuokkaimet (keltainen palkki)"
-#: src/gui/popupmenu.cpp:1885 src/gui/statuswindow.cpp:240
+#: src/gui/popupmenu.cpp:1935 src/gui/statuswindow.cpp:241
msgid "Copy to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:1903 src/gui/socialwindow.cpp:854
-#: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
+#: src/gui/popupmenu.cpp:1953 src/gui/socialwindow.cpp:958
+#: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028
msgid "(default)"
msgstr "(oletus)"
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1933
+#: src/gui/popupmenu.cpp:1965 src/gui/popupmenu.cpp:1983
msgid "Move up"
msgstr "Siirrä ylös"
-#: src/gui/popupmenu.cpp:1920 src/gui/popupmenu.cpp:1938
+#: src/gui/popupmenu.cpp:1970 src/gui/popupmenu.cpp:1988
msgid "Move down"
msgstr "Siirrä alas"
-#: src/gui/quitdialog.cpp:56
+#: src/gui/quitdialog.cpp:51
msgid "Switch server"
msgstr "Vaihda palvelinta"
-#: src/gui/quitdialog.cpp:57
+#: src/gui/quitdialog.cpp:52
msgid "Switch character"
msgstr "Vaihda hahmoa"
@@ -1620,64 +1624,64 @@ msgstr "Salasanan tulee olla alle %d merkkiä pitkä."
msgid "Passwords do not match."
msgstr "Salasanat eivät täsmää."
-#: src/gui/serverdialog.cpp:231
+#: src/gui/serverdialog.cpp:237
msgid "Choose Your Server"
msgstr "Valitse palvelimesi"
-#: src/gui/serverdialog.cpp:242
+#: src/gui/serverdialog.cpp:248
msgid "Choose Your Server *** SAFE MODE ***"
msgstr ""
-#: src/gui/serverdialog.cpp:247
+#: src/gui/serverdialog.cpp:253
msgid "Port:"
msgstr "Portti:"
-#: src/gui/serverdialog.cpp:251
+#: src/gui/serverdialog.cpp:257
msgid "Use same ip for game sub servers"
msgstr "Käytä samaa IP-osoitetta alipalvelimille"
-#: src/gui/serverdialog.cpp:265
+#: src/gui/serverdialog.cpp:271
msgid "Server type:"
msgstr "Palvelintyyppi:"
-#: src/gui/serverdialog.cpp:289
+#: src/gui/serverdialog.cpp:295
msgid "Load"
msgstr "Lataa"
-#: src/gui/serverdialog.cpp:290
+#: src/gui/serverdialog.cpp:296
msgid "Connect"
msgstr "Yhdistä"
-#: src/gui/serverdialog.cpp:291
+#: src/gui/serverdialog.cpp:297
msgid "Custom Server"
msgstr "Muu palvelin"
-#: src/gui/serverdialog.cpp:396
+#: src/gui/serverdialog.cpp:402
msgid "Please type both the address and the port of a server."
msgstr "Kirjoita kenttiin sekä palvelimen osoite että portti"
-#: src/gui/serverdialog.cpp:554
+#: src/gui/serverdialog.cpp:560
#, c-format
msgid "Downloading server list...%2.2f%%"
msgstr "Lataan palvelinluettelon...%2.2f%%"
-#: src/gui/serverdialog.cpp:559
+#: src/gui/serverdialog.cpp:565
msgid "Waiting for server..."
msgstr "Odotan palvelinta..."
-#: src/gui/serverdialog.cpp:563
+#: src/gui/serverdialog.cpp:569
msgid "Preparing download"
msgstr "Valmistelen latausta"
-#: src/gui/serverdialog.cpp:567
+#: src/gui/serverdialog.cpp:573
msgid "Error retreiving server list!"
msgstr "Palvelinluettelon hakeminen epäonnistui!"
-#: src/gui/serverdialog.cpp:672
+#: src/gui/serverdialog.cpp:678
msgid "requires a newer version"
msgstr "vaatii uudemman version"
-#: src/gui/serverdialog.cpp:674
+#: src/gui/serverdialog.cpp:680
#, c-format
msgid "requires v%s"
msgstr "vaatii version %s"
@@ -1824,6 +1828,14 @@ msgstr ""
msgid "Use local time"
msgstr ""
+#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:157
+msgid "Other"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:125
+msgid "Highlight words (separated by comma)"
+msgstr ""
+
#: src/gui/setup_colors.cpp:49
msgid "This is what the color looks like"
msgstr "Väri näyttää tältä"
@@ -1871,11 +1883,11 @@ msgstr "Sininen:"
msgid "Alpha:"
msgstr "Alfa:"
-#: src/gui/setup.cpp:70
+#: src/gui/setup.cpp:71
msgid "Apply"
msgstr "Hyväksy"
-#: src/gui/setup.cpp:73
+#: src/gui/setup.cpp:74
msgid "Reset Windows"
msgstr "Palauta ikkunoiden oletusasetukset"
@@ -2052,34 +2064,42 @@ msgid "Log NPC dialogue"
msgstr "Kirjaa keskustelut ei-pelaajahahmojen kanssa lokiin"
#: src/gui/setup_other.cpp:148
-msgid "Other"
+msgid "Bots support"
msgstr ""
#: src/gui/setup_other.cpp:150
+msgid "Enable auction bot support"
+msgstr ""
+
+#: src/gui/setup_other.cpp:153
+msgid "Enable guild bot support and disable native guild support"
+msgstr ""
+
+#: src/gui/setup_other.cpp:159
msgid "Enable server side attack"
msgstr "Ota käyttöön palvelinpuolen hyökkäys"
-#: src/gui/setup_other.cpp:153
+#: src/gui/setup_other.cpp:162
msgid "Enable bot checker"
msgstr "Ota bottitutka käyttöön"
-#: src/gui/setup_other.cpp:156
+#: src/gui/setup_other.cpp:165
msgid "Enable buggy servers protection"
msgstr "Ota käyttöön suoja bugisten palvelinten varalta"
-#: src/gui/setup_other.cpp:159
+#: src/gui/setup_other.cpp:168
msgid "Enable debug log"
msgstr "Ota käyttöön debug-loki"
-#: src/gui/setup_other.cpp:162
+#: src/gui/setup_other.cpp:171
msgid "Low traffic mode"
msgstr "Matalan liikenteen tila"
-#: src/gui/setup_other.cpp:165
+#: src/gui/setup_other.cpp:174
msgid "Hide shield sprite"
msgstr "Piilota kilpihahmo"
-#: src/gui/setup_other.cpp:168
+#: src/gui/setup_other.cpp:177
msgid "Show background"
msgstr "Näytä tausta"
@@ -2175,6 +2195,10 @@ msgstr ""
msgid "Show ip addresses on screenshots"
msgstr ""
+#: src/gui/setup_players.cpp:81
+msgid "Allow self heal with mouse click"
+msgstr ""
+
#: src/gui/setup_relations.cpp:65
msgid "Relation"
msgstr "Relaatio"
@@ -2448,261 +2472,266 @@ msgstr "Hiukkastehosteiden asetuksia on muutettu."
msgid "Changes will take effect on map change."
msgstr "Muutokset astuvat voimaan kartan vaihtuessa."
-#: src/gui/shopwindow.cpp:74
+#: src/gui/shopwindow.cpp:75
msgid "Personal Shop"
msgstr "Oma kauppa"
-#: src/gui/shopwindow.cpp:116
+#: src/gui/shopwindow.cpp:118
msgid "Buy items"
msgstr "Osta tavaroita"
-#: src/gui/shopwindow.cpp:117
+#: src/gui/shopwindow.cpp:119
msgid "Sell items"
msgstr "Myy tavaroita"
-#: src/gui/shopwindow.cpp:119 src/gui/shopwindow.cpp:122
-#: src/gui/tradewindow.cpp:88
+#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
+#: src/gui/tradewindow.cpp:89
msgid "Add"
msgstr "Lisää"
-#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
+#: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
msgid "Announce"
msgstr "Ilmoita"
-#: src/gui/shopwindow.cpp:125
+#: src/gui/shopwindow.cpp:127
msgid "Show links in announce"
msgstr "Näytä linkit ilmoituksessa"
-#: src/gui/shopwindow.cpp:723 src/net/ea/tradehandler.cpp:106
+#: src/gui/shopwindow.cpp:148 src/gui/shopwindow.cpp:149
+msgid "Auction"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:748 src/net/ea/tradehandler.cpp:106
#: src/net/manaserv/tradehandler.cpp:127
msgid "Request for Trade"
msgstr "Kaupantekoehdotus"
-#: src/gui/shopwindow.cpp:724
+#: src/gui/shopwindow.cpp:749
#, c-format
msgid "%s wants to %s %s do you accept?"
msgstr "%s haluaa %s %s - hyväksytkö?"
-#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:81
+#: src/gui/skilldialog.cpp:276 src/gui/windowmenu.cpp:81
msgid "Skills"
msgstr "Taidot"
-#: src/gui/skilldialog.cpp:283
+#: src/gui/skilldialog.cpp:288
msgid "Up"
msgstr "Ylös"
-#: src/gui/skilldialog.cpp:336
+#: src/gui/skilldialog.cpp:341
#, c-format
msgid "Skill points available: %d"
msgstr "%d taitopistettä käyttämättä"
-#: src/gui/skilldialog.cpp:413
+#: src/gui/skilldialog.cpp:418
#, c-format
msgid "Skill Set %d"
msgstr "Taitojoukko %d"
-#: src/gui/skilldialog.cpp:425
+#: src/gui/skilldialog.cpp:430
#, c-format
msgid "Skill %d"
msgstr "Taito %d"
-#: src/gui/skilldialog.cpp:492 src/gui/skilldialog.cpp:545
+#: src/gui/skilldialog.cpp:497 src/gui/skilldialog.cpp:550
#, c-format
msgid "Lvl: %d"
msgstr "Taso: %d"
-#: src/gui/skilldialog.cpp:537
+#: src/gui/skilldialog.cpp:542
#, c-format
msgid "Lvl: %d (%+d)"
msgstr "Taso: %d (%+d)"
-#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
+#: src/gui/socialwindow.cpp:118 src/gui/socialwindow.cpp:216
+#: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52
msgid "Guild"
msgstr "Kilta"
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:147
#, c-format
msgid "Invited user %s to guild %s."
msgstr "Kutsuit käyttäjän %s kiltaan %s."
-#: src/gui/socialwindow.cpp:160
+#: src/gui/socialwindow.cpp:161
#, c-format
msgid "Guild %s quit requested."
msgstr "Killasta %s eroa pyydetty."
-#: src/gui/socialwindow.cpp:187
+#: src/gui/socialwindow.cpp:188
msgid "Member Invite to Guild"
msgstr "Jäsenen kutsuminen kiltaan"
-#: src/gui/socialwindow.cpp:188
+#: src/gui/socialwindow.cpp:189
#, c-format
msgid "Who would you like to invite to guild %s?"
msgstr "Kenet haluaisit kutsua kiltaan %s?"
-#: src/gui/socialwindow.cpp:197
+#: src/gui/socialwindow.cpp:198
msgid "Leave Guild?"
msgstr "Eroa killasta?"
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:199
#, c-format
msgid "Are you sure you want to leave guild %s?"
msgstr "Haluatko varmasti erota killasta %s?"
-#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:319 src/net/ea/gui/partytab.cpp:50
msgid "Party"
msgstr "Ryhmä"
-#: src/gui/socialwindow.cpp:243
+#: src/gui/socialwindow.cpp:347
#, c-format
msgid "Invited user %s to party."
msgstr "Käyttäjä %s kutsuttu ryhmään."
-#: src/gui/socialwindow.cpp:257
+#: src/gui/socialwindow.cpp:361
#, c-format
msgid "Party %s quit requested."
msgstr "Ryhmästä %s eroamista pyydetty."
-#: src/gui/socialwindow.cpp:284
+#: src/gui/socialwindow.cpp:388
msgid "Member Invite to Party"
msgstr "Jäsenen kutsuminen ryhmään"
-#: src/gui/socialwindow.cpp:285
+#: src/gui/socialwindow.cpp:389
#, c-format
msgid "Who would you like to invite to party %s?"
msgstr "Kenet haluaisit kutsua ryhmään %s?"
-#: src/gui/socialwindow.cpp:294
+#: src/gui/socialwindow.cpp:398
msgid "Leave Party?"
msgstr "Eroa ryhmästä?"
-#: src/gui/socialwindow.cpp:295
+#: src/gui/socialwindow.cpp:399
#, c-format
msgid "Are you sure you want to leave party %s?"
msgstr "Haluatko varmasti erota ryhmästä %s?"
-#: src/gui/socialwindow.cpp:521
+#: src/gui/socialwindow.cpp:625
msgid "Nav"
msgstr "Nav"
-#: src/gui/socialwindow.cpp:799
+#: src/gui/socialwindow.cpp:903
msgid "Atk"
msgstr "Hyö"
-#: src/gui/socialwindow.cpp:840
+#: src/gui/socialwindow.cpp:944
msgid "Priority mobs"
msgstr "Priorisoidut kohteet"
-#: src/gui/socialwindow.cpp:872
+#: src/gui/socialwindow.cpp:976
msgid "Attack mobs"
msgstr "Hyökkäyskohteet"
-#: src/gui/socialwindow.cpp:907
+#: src/gui/socialwindow.cpp:1011
msgid "Ignore mobs"
msgstr "Ohitettavat kohteet"
-#: src/gui/socialwindow.cpp:970
+#: src/gui/socialwindow.cpp:1074
msgid "Create Guild"
msgstr "Luo kilta"
-#: src/gui/socialwindow.cpp:971 src/gui/socialwindow.cpp:1387
+#: src/gui/socialwindow.cpp:1075 src/gui/socialwindow.cpp:1503
msgid "Create Party"
msgstr "Luo ryhmä"
-#: src/gui/socialwindow.cpp:1013 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1117 src/gui/windowmenu.cpp:93
msgid "Social"
msgstr "Suhteet"
-#: src/gui/socialwindow.cpp:1034
+#: src/gui/socialwindow.cpp:1140
msgid "Invite"
msgstr "Kutsu"
-#: src/gui/socialwindow.cpp:1176
+#: src/gui/socialwindow.cpp:1286
#, c-format
msgid "Accepted party invite from %s."
msgstr "Otit vastaan ryhmäkutsun pelaajalta %s."
-#: src/gui/socialwindow.cpp:1186
+#: src/gui/socialwindow.cpp:1296
#, c-format
msgid "Rejected party invite from %s."
msgstr "Kieltäydyit pelaajan %s ryhmäkutsusta."
-#: src/gui/socialwindow.cpp:1203
+#: src/gui/socialwindow.cpp:1313
#, c-format
msgid "Accepted guild invite from %s."
msgstr "Otit vastaan kiltakutsun pelaajalta %s."
-#: src/gui/socialwindow.cpp:1213
+#: src/gui/socialwindow.cpp:1326
#, c-format
msgid "Rejected guild invite from %s."
msgstr "Kieltäydyit pelaajan %s kiltakutsusta."
-#: src/gui/socialwindow.cpp:1257
+#: src/gui/socialwindow.cpp:1373
#, c-format
msgid "Creating guild called %s."
msgstr "Luon killan %s."
-#: src/gui/socialwindow.cpp:1280
+#: src/gui/socialwindow.cpp:1396
#, c-format
msgid "Creating party called %s."
msgstr "Luon ryhmän %s."
-#: src/gui/socialwindow.cpp:1294
+#: src/gui/socialwindow.cpp:1410
msgid "Guild Name"
msgstr "Killan nimi"
-#: src/gui/socialwindow.cpp:1295
+#: src/gui/socialwindow.cpp:1411
msgid "Choose your guild's name."
msgstr "Valitse killallesi nimi."
-#: src/gui/socialwindow.cpp:1309
+#: src/gui/socialwindow.cpp:1425
msgid "Received guild request, but one already exists."
msgstr "Vastaanotin kiltapyynnön, mutta sellainen on jo olemassa."
-#: src/gui/socialwindow.cpp:1315
+#: src/gui/socialwindow.cpp:1431
#, c-format
msgid "%s has invited you to join the guild %s."
msgstr "%s on kutsunut sinut liittymään kiltaan %s."
-#: src/gui/socialwindow.cpp:1321
+#: src/gui/socialwindow.cpp:1437
msgid "Accept Guild Invite"
msgstr "Ota kiltakutsu vastaan"
-#: src/gui/socialwindow.cpp:1336
+#: src/gui/socialwindow.cpp:1452
msgid "Received party request, but one already exists."
msgstr "Sain ryhmäpyynnön, mutta sellainen on jo olemassa."
-#: src/gui/socialwindow.cpp:1347
+#: src/gui/socialwindow.cpp:1463
msgid "You have been invited you to join a party."
msgstr "Sinut on kutsuttu liittymään ryhmään."
-#: src/gui/socialwindow.cpp:1351
+#: src/gui/socialwindow.cpp:1467
#, c-format
msgid "You have been invited to join the %s party."
msgstr "Sinut on kutsuttu liittymään ryhmään %s."
-#: src/gui/socialwindow.cpp:1359
+#: src/gui/socialwindow.cpp:1475
#, c-format
msgid "%s has invited you to join their party."
msgstr "%s on kutsunut sinut liittymään ryhmäänsä."
-#: src/gui/socialwindow.cpp:1364
+#: src/gui/socialwindow.cpp:1480
#, c-format
msgid "%s has invited you to join the %s party."
msgstr "%s on kutsunut sinut liittymään ryhmäänsä %s."
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1489
msgid "Accept Party Invite"
msgstr "Ota ryhmäkutsu vastaan"
-#: src/gui/socialwindow.cpp:1388
+#: src/gui/socialwindow.cpp:1504
msgid "Cannot create party. You are already in a party"
msgstr "Ryhmän luominen epäonnistui, olet jo ryhmän jäsen."
-#: src/gui/socialwindow.cpp:1393
+#: src/gui/socialwindow.cpp:1509
msgid "Party Name"
msgstr "Ryhmän nimi"
-#: src/gui/socialwindow.cpp:1394
+#: src/gui/socialwindow.cpp:1510
msgid "Choose your party's name."
msgstr "Anna ryhmällesi nimi."
@@ -2710,418 +2739,418 @@ msgstr "Anna ryhmällesi nimi."
msgid "Specials"
msgstr "Erikoisuudet"
-#: src/gui/statuspopup.cpp:197
+#: src/gui/statuspopup.cpp:198
msgid "(D) default moves"
msgstr "(D) oletusliikkeet"
-#: src/gui/statuspopup.cpp:202
+#: src/gui/statuspopup.cpp:203
msgid "(I) invert moves"
msgstr "(I) käännetyt liikkeet"
-#: src/gui/statuspopup.cpp:207
+#: src/gui/statuspopup.cpp:208
msgid "(c) moves with some crazy moves"
msgstr "(c) liikkuu osin villiliikkein"
-#: src/gui/statuspopup.cpp:212
+#: src/gui/statuspopup.cpp:213
msgid "(C) moves with crazy moves"
msgstr "(C) liikkuu villiliikkein"
-#: src/gui/statuspopup.cpp:217
+#: src/gui/statuspopup.cpp:218
msgid "(d) double normal + crazy"
msgstr "(d) tuplaa tavallinen + villi"
-#: src/gui/statuspopup.cpp:222
+#: src/gui/statuspopup.cpp:223
msgid "(?) move"
msgstr "(?) liiku"
-#: src/gui/statuspopup.cpp:240
+#: src/gui/statuspopup.cpp:241
msgid "(a) custom crazy move"
msgstr "(a) oma villiliike"
-#: src/gui/statuspopup.cpp:244
+#: src/gui/statuspopup.cpp:245
msgid "(?) crazy move"
msgstr "(?) villiliike"
-#: src/gui/statuspopup.cpp:254
+#: src/gui/statuspopup.cpp:255
msgid "(0) default moves to target"
msgstr "(0) oletussiirtymä kohteen luo"
-#: src/gui/statuspopup.cpp:259
+#: src/gui/statuspopup.cpp:260
msgid "(1) moves to target in distance 1"
msgstr "(1) siirry kohteen luo etäisyydellä 1"
-#: src/gui/statuspopup.cpp:264
+#: src/gui/statuspopup.cpp:265
msgid "(2) moves to target in distance 2"
msgstr "(2) siirry kohteen luo etäisyydellä 2"
-#: src/gui/statuspopup.cpp:269
+#: src/gui/statuspopup.cpp:270
msgid "(3) moves to target in distance 3"
msgstr "(3) siirry kohteen luo etäisyydellä 3"
-#: src/gui/statuspopup.cpp:274
+#: src/gui/statuspopup.cpp:275
msgid "(5) moves to target in distance 5"
msgstr "(5) siirry kohteen luo etäisyydellä 5"
-#: src/gui/statuspopup.cpp:279
+#: src/gui/statuspopup.cpp:280
msgid "(7) moves to target in distance 7"
msgstr "(7) siirry kohteen luo etäisyydellä 7"
-#: src/gui/statuspopup.cpp:284
+#: src/gui/statuspopup.cpp:285
msgid "(A) moves to target in attack range"
msgstr "(A) siirry kohteen luo hyökkäyskantamalla"
-#: src/gui/statuspopup.cpp:289
+#: src/gui/statuspopup.cpp:290
msgid "(?) move to target"
msgstr "(?) siirry kohteen luo"
-#: src/gui/statuspopup.cpp:297
+#: src/gui/statuspopup.cpp:298
msgid "(D) default follow"
msgstr "(D) oletusseuraaminen"
-#: src/gui/statuspopup.cpp:301
+#: src/gui/statuspopup.cpp:302
msgid "(R) relative follow"
msgstr "(R) suhteellinen seuraaminen"
-#: src/gui/statuspopup.cpp:305
+#: src/gui/statuspopup.cpp:306
msgid "(M) mirror follow"
msgstr "(M) peilikuvaseuraaminen"
-#: src/gui/statuspopup.cpp:309
+#: src/gui/statuspopup.cpp:310
msgid "(P) pet follow"
msgstr "(P) lemmikkiseuraaminen"
-#: src/gui/statuspopup.cpp:313
+#: src/gui/statuspopup.cpp:314
msgid "(?) unknown follow"
msgstr "(?) tuntematon seuraaminen"
-#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
+#: src/gui/statuspopup.cpp:323 src/gui/statuspopup.cpp:346
msgid "(D) default attack"
msgstr "(D) oletushyökkäys"
-#: src/gui/statuspopup.cpp:327
+#: src/gui/statuspopup.cpp:328
msgid "(s) switch attack without shield"
msgstr "(s) vaihda hyökkäystä, ei kilpeä"
-#: src/gui/statuspopup.cpp:332
+#: src/gui/statuspopup.cpp:333
msgid "(S) switch attack with shield"
msgstr "(S) vaihda hyökkäystä, kilpi mukana"
-#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
+#: src/gui/statuspopup.cpp:337 src/gui/statuspopup.cpp:362
msgid "(?) attack"
msgstr "(?) hyökkäys"
-#: src/gui/statuspopup.cpp:349
+#: src/gui/statuspopup.cpp:350
msgid "(G) go and attack"
msgstr "(G) mene ja hyökkää"
-#: src/gui/statuspopup.cpp:353
+#: src/gui/statuspopup.cpp:354
msgid "(A) go, attack, pickup"
msgstr "(A) mene, hyökkää, nosta"
-#: src/gui/statuspopup.cpp:357
+#: src/gui/statuspopup.cpp:358
msgid "(d) without auto attack"
msgstr "(d) ei automaattista hyökkäystä"
-#: src/gui/statuspopup.cpp:375
+#: src/gui/statuspopup.cpp:376
msgid "(S) small pick up 1x1 cells"
msgstr "(S) pieni nosto 1x1 ruutua"
-#: src/gui/statuspopup.cpp:379
+#: src/gui/statuspopup.cpp:380
msgid "(D) default pick up 2x1 cells"
msgstr "(D) oletusnosto 2x1 ruutua"
-#: src/gui/statuspopup.cpp:383
+#: src/gui/statuspopup.cpp:384
msgid "(F) forward pick up 2x3 cells"
msgstr "(F) nosto edestä 2x3 ruutua"
-#: src/gui/statuspopup.cpp:387
+#: src/gui/statuspopup.cpp:388
msgid "(3) pick up 3x3 cells"
msgstr "(3) nosto 3x3 ruutua"
-#: src/gui/statuspopup.cpp:391
+#: src/gui/statuspopup.cpp:392
msgid "(g) go and pick up in distance 4"
msgstr "(g) mene ja nosta etäisyydellä 4"
-#: src/gui/statuspopup.cpp:395
+#: src/gui/statuspopup.cpp:396
msgid "(G) go and pick up in distance 8"
msgstr "(G) mene ja nosta etäisyydellä 8"
-#: src/gui/statuspopup.cpp:399
+#: src/gui/statuspopup.cpp:400
msgid "(A) go and pick up in max distance"
msgstr "(A) mene ja nosta maksimietäisyydellä"
-#: src/gui/statuspopup.cpp:403
+#: src/gui/statuspopup.cpp:404
msgid "(?) pick up"
msgstr "(?) nosta"
-#: src/gui/statuspopup.cpp:412
+#: src/gui/statuspopup.cpp:413
msgid "(N) normal map view"
msgstr "(N) normaali karttanäkymä"
-#: src/gui/statuspopup.cpp:416
+#: src/gui/statuspopup.cpp:417
msgid "(D) debug map view"
msgstr "(D) debug-karttanäkymä"
-#: src/gui/statuspopup.cpp:420
+#: src/gui/statuspopup.cpp:421
msgid "(u) ultra map view"
msgstr "(u) ultra-karttanäkymä"
-#: src/gui/statuspopup.cpp:424
+#: src/gui/statuspopup.cpp:425
msgid "(U) ultra map view 2"
msgstr "(U) ultra-karttanäkymä 2"
-#: src/gui/statuspopup.cpp:428
+#: src/gui/statuspopup.cpp:429
msgid "(e) empty map view"
msgstr "(e) tyhjä karttanäkymä"
-#: src/gui/statuspopup.cpp:432
+#: src/gui/statuspopup.cpp:433
msgid "(b) black & white map view"
msgstr "(b) mustavalkoinen karttanäkymä"
-#: src/gui/statuspopup.cpp:436
+#: src/gui/statuspopup.cpp:437
msgid "(?) map view"
msgstr "(?) karttanäkymä"
-#: src/gui/statuspopup.cpp:444
+#: src/gui/statuspopup.cpp:445
msgid "(f) use #flar for magic attack"
msgstr "(f) #flar taikahyökkäyksenä"
-#: src/gui/statuspopup.cpp:449
+#: src/gui/statuspopup.cpp:450
msgid "(c) use #chiza for magic attack"
msgstr "(c) #chiza taikahyökkäyksenä"
-#: src/gui/statuspopup.cpp:454
+#: src/gui/statuspopup.cpp:455
msgid "(I) use #ingrav for magic attack"
msgstr "(I) #ingrav taikahyökkäyksenä"
-#: src/gui/statuspopup.cpp:459
+#: src/gui/statuspopup.cpp:460
msgid "(F) use #frillyar for magic attack"
msgstr "(F) #frillyar taikahyökkäyksenä"
-#: src/gui/statuspopup.cpp:464
+#: src/gui/statuspopup.cpp:465
msgid "(U) use #upmarmu for magic attack"
msgstr "(U) #upmarmu taikahyökkäyksenä"
-#: src/gui/statuspopup.cpp:468
+#: src/gui/statuspopup.cpp:469
msgid "(?) magic attack"
msgstr "(?) taikahyökkäys"
-#: src/gui/statuspopup.cpp:477
+#: src/gui/statuspopup.cpp:478
msgid "(D) default imitation"
msgstr "(D) oletusmatkinta"
-#: src/gui/statuspopup.cpp:481
+#: src/gui/statuspopup.cpp:482
msgid "(O) outfits imitation"
msgstr "(O) asun matkinta"
-#: src/gui/statuspopup.cpp:485
+#: src/gui/statuspopup.cpp:486
msgid "(?) imitation"
msgstr "(?) matkinta"
-#: src/gui/statuspopup.cpp:494
+#: src/gui/statuspopup.cpp:495
msgid "(O) on keyboard"
msgstr "(O) paikalla"
-#: src/gui/statuspopup.cpp:497
+#: src/gui/statuspopup.cpp:498
msgid "(A) away"
msgstr "(A) poissa"
-#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
+#: src/gui/statuspopup.cpp:501 src/gui/statuspopup.cpp:521
msgid "(?) away"
msgstr "(?) poissaolo"
-#: src/gui/statuspopup.cpp:508
+#: src/gui/statuspopup.cpp:509
msgid "(G) game camera mode"
msgstr "(G) pelin kameratila"
-#: src/gui/statuspopup.cpp:512
+#: src/gui/statuspopup.cpp:513
msgid "(F) free camera mode"
msgstr "(F) vapaa kamera"
-#: src/gui/statuspopup.cpp:516
+#: src/gui/statuspopup.cpp:517
msgid "(D) design camera mode"
msgstr "(D) suunnittelukamera"
-#: src/gui/statuspopup.cpp:527
+#: src/gui/statuspopup.cpp:528
msgid "Game modifiers are disabled"
msgstr "Pelimuokkaimet poissa käytöstä"
-#: src/gui/statuspopup.cpp:532
+#: src/gui/statuspopup.cpp:533
msgid "Game modifiers are enabled"
msgstr "Pelimuokkaimet käytössä"
-#: src/gui/statuswindow.cpp:142 src/gui/statuswindow.cpp:272
-#: src/gui/statuswindow.cpp:335
+#: src/gui/statuswindow.cpp:143 src/gui/statuswindow.cpp:273
+#: src/gui/statuswindow.cpp:336
#, c-format
msgid "Level: %d"
msgstr "Taso: %d"
-#: src/gui/statuswindow.cpp:143 src/gui/statuswindow.cpp:258
-#: src/gui/statuswindow.cpp:302
+#: src/gui/statuswindow.cpp:144 src/gui/statuswindow.cpp:259
+#: src/gui/statuswindow.cpp:303
#, c-format
msgid "Money: %s"
msgstr "Rahat: %s"
-#: src/gui/statuswindow.cpp:149
+#: src/gui/statuswindow.cpp:150
msgid "HP:"
msgstr "VP:"
-#: src/gui/statuswindow.cpp:156
+#: src/gui/statuswindow.cpp:157
msgid "Exp:"
msgstr "Kok:"
-#: src/gui/statuswindow.cpp:170
+#: src/gui/statuswindow.cpp:171
msgid "MP:"
msgstr "MP:"
-#: src/gui/statuswindow.cpp:202 src/gui/statuswindow.cpp:385
+#: src/gui/statuswindow.cpp:203 src/gui/statuswindow.cpp:386
#, c-format
msgid "Job: %d"
msgstr "Työ: %d"
-#: src/gui/statuswindow.cpp:203
+#: src/gui/statuswindow.cpp:204
msgid "Job:"
msgstr "Työ:"
-#: src/gui/statuswindow.cpp:261 src/gui/statuswindow.cpp:309
+#: src/gui/statuswindow.cpp:262 src/gui/statuswindow.cpp:310
#, c-format
msgid "Character points: %d"
msgstr "Hahmopisteitä: %d"
-#: src/gui/statuswindow.cpp:267
+#: src/gui/statuswindow.cpp:268
#, c-format
msgid "Level: %d (GM %d)"
msgstr "Taso: %d (GM %d)"
-#: src/gui/statuswindow.cpp:323
+#: src/gui/statuswindow.cpp:324
#, c-format
msgid "Correction points: %d"
msgstr "Korjauspisteitä: %d"
-#: src/gui/statuswindow.cpp:646 src/gui/statuswindow.cpp:711
-#: src/gui/statuswindow.cpp:731 src/gui/statuswindow.cpp:747
-#: src/gui/statuswindow.cpp:793 src/gui/statuswindow.cpp:822
-#: src/gui/statuswindow.cpp:845 src/gui/statuswindow.cpp:864
+#: src/gui/statuswindow.cpp:647 src/gui/statuswindow.cpp:712
+#: src/gui/statuswindow.cpp:732 src/gui/statuswindow.cpp:748
+#: src/gui/statuswindow.cpp:794 src/gui/statuswindow.cpp:823
+#: src/gui/statuswindow.cpp:846 src/gui/statuswindow.cpp:865
msgid "(D)"
msgstr "(D)"
-#: src/gui/statuswindow.cpp:649 src/gui/statuswindow.cpp:772
+#: src/gui/statuswindow.cpp:650 src/gui/statuswindow.cpp:773
msgid "(I)"
msgstr "(I)"
-#: src/gui/statuswindow.cpp:652 src/gui/statuswindow.cpp:769
+#: src/gui/statuswindow.cpp:653 src/gui/statuswindow.cpp:770
msgid "(c)"
msgstr "(c)"
-#: src/gui/statuswindow.cpp:655
+#: src/gui/statuswindow.cpp:656
msgid "(C)"
msgstr "(C)"
-#: src/gui/statuswindow.cpp:658 src/gui/statuswindow.cpp:756
+#: src/gui/statuswindow.cpp:659 src/gui/statuswindow.cpp:757
msgid "(d)"
msgstr "(d)"
-#: src/gui/statuswindow.cpp:661 src/gui/statuswindow.cpp:675
-#: src/gui/statuswindow.cpp:704 src/gui/statuswindow.cpp:723
-#: src/gui/statuswindow.cpp:740 src/gui/statuswindow.cpp:759
-#: src/gui/statuswindow.cpp:781 src/gui/statuswindow.cpp:811
-#: src/gui/statuswindow.cpp:837 src/gui/statuswindow.cpp:851
-#: src/gui/statuswindow.cpp:867 src/gui/statuswindow.cpp:880
+#: src/gui/statuswindow.cpp:662 src/gui/statuswindow.cpp:676
+#: src/gui/statuswindow.cpp:705 src/gui/statuswindow.cpp:724
+#: src/gui/statuswindow.cpp:741 src/gui/statuswindow.cpp:760
+#: src/gui/statuswindow.cpp:782 src/gui/statuswindow.cpp:812
+#: src/gui/statuswindow.cpp:838 src/gui/statuswindow.cpp:852
+#: src/gui/statuswindow.cpp:868 src/gui/statuswindow.cpp:881
msgid "(?)"
msgstr "(?)"
-#: src/gui/statuswindow.cpp:672
+#: src/gui/statuswindow.cpp:673
msgid "(a)"
msgstr "(a)"
-#: src/gui/statuswindow.cpp:683
+#: src/gui/statuswindow.cpp:684
msgid "(0)"
msgstr "(0)"
-#: src/gui/statuswindow.cpp:686
+#: src/gui/statuswindow.cpp:687
msgid "(1)"
msgstr "(1)"
-#: src/gui/statuswindow.cpp:689
+#: src/gui/statuswindow.cpp:690
msgid "(2)"
msgstr "(2)"
-#: src/gui/statuswindow.cpp:692 src/gui/statuswindow.cpp:799
+#: src/gui/statuswindow.cpp:693 src/gui/statuswindow.cpp:800
msgid "(3)"
msgstr "(3)"
-#: src/gui/statuswindow.cpp:695
+#: src/gui/statuswindow.cpp:696
msgid "(5)"
msgstr "(5)"
-#: src/gui/statuswindow.cpp:698
+#: src/gui/statuswindow.cpp:699
msgid "(7)"
msgstr "(7)"
-#: src/gui/statuswindow.cpp:701 src/gui/statuswindow.cpp:753
-#: src/gui/statuswindow.cpp:808 src/gui/statuswindow.cpp:877
+#: src/gui/statuswindow.cpp:702 src/gui/statuswindow.cpp:754
+#: src/gui/statuswindow.cpp:809 src/gui/statuswindow.cpp:878
msgid "(A)"
msgstr "(A)"
-#: src/gui/statuswindow.cpp:714
+#: src/gui/statuswindow.cpp:715
msgid "(R)"
msgstr "(R)"
-#: src/gui/statuswindow.cpp:717
+#: src/gui/statuswindow.cpp:718
msgid "(M)"
msgstr "(M)"
-#: src/gui/statuswindow.cpp:720
+#: src/gui/statuswindow.cpp:721
msgid "(P)"
msgstr "(P)"
-#: src/gui/statuswindow.cpp:734
+#: src/gui/statuswindow.cpp:735
msgid "(s)"
msgstr "(s)"
-#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:790
+#: src/gui/statuswindow.cpp:738 src/gui/statuswindow.cpp:791
msgid "(S)"
msgstr "(S)"
-#: src/gui/statuswindow.cpp:750 src/gui/statuswindow.cpp:805
-#: src/gui/statuswindow.cpp:858
+#: src/gui/statuswindow.cpp:751 src/gui/statuswindow.cpp:806
+#: src/gui/statuswindow.cpp:859
msgid "(G)"
msgstr "(G)"
-#: src/gui/statuswindow.cpp:766
+#: src/gui/statuswindow.cpp:767
msgid "(f)"
msgstr "(f)"
-#: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:796
-#: src/gui/statuswindow.cpp:861
+#: src/gui/statuswindow.cpp:776 src/gui/statuswindow.cpp:797
+#: src/gui/statuswindow.cpp:862
msgid "(F)"
msgstr "(F)"
-#: src/gui/statuswindow.cpp:778 src/gui/statuswindow.cpp:828
+#: src/gui/statuswindow.cpp:779 src/gui/statuswindow.cpp:829
msgid "(U)"
msgstr "(U)"
-#: src/gui/statuswindow.cpp:802
+#: src/gui/statuswindow.cpp:803
msgid "(g)"
msgstr "(g)"
-#: src/gui/statuswindow.cpp:819
+#: src/gui/statuswindow.cpp:820
msgid "(N)"
msgstr "(N)"
-#: src/gui/statuswindow.cpp:825
+#: src/gui/statuswindow.cpp:826
msgid "(u)"
msgstr "(u)"
-#: src/gui/statuswindow.cpp:831
+#: src/gui/statuswindow.cpp:832
msgid "(e)"
msgstr "(e)"
-#: src/gui/statuswindow.cpp:834
+#: src/gui/statuswindow.cpp:835
msgid "(b)"
msgstr "(b)"
-#: src/gui/statuswindow.cpp:848 src/gui/statuswindow.cpp:874
+#: src/gui/statuswindow.cpp:849 src/gui/statuswindow.cpp:875
msgid "(O)"
msgstr "(O)"
@@ -3229,24 +3258,24 @@ msgstr "Hyväksytty. Odotetaan..."
msgid "Trade: You"
msgstr "Kauppa: Sinä"
-#: src/gui/tradewindow.cpp:110 src/gui/tradewindow.cpp:166
+#: src/gui/tradewindow.cpp:111 src/gui/tradewindow.cpp:167
#, c-format
msgid "You get %s"
msgstr "Saat %s"
-#: src/gui/tradewindow.cpp:111
+#: src/gui/tradewindow.cpp:112
msgid "You give:"
msgstr "Annat:"
-#: src/gui/tradewindow.cpp:115
+#: src/gui/tradewindow.cpp:116
msgid "Change"
msgstr "Muuta"
-#: src/gui/tradewindow.cpp:374
+#: src/gui/tradewindow.cpp:375
msgid "You don't have enough money."
msgstr "Sinulla ei ole tarpeeksi rahaa."
-#: src/gui/tradewindow.cpp:453
+#: src/gui/tradewindow.cpp:454
msgid "Failed adding item. You can not overlap one kind of item on the window."
msgstr "Tavaran lisääminen epäonnistui, limittämisongelma."
@@ -3255,33 +3284,33 @@ msgstr "Tavaran lisääminen epäonnistui, limittämisongelma."
msgid "Name: %s"
msgstr "Nimi: %s"
-#: src/gui/updaterwindow.cpp:136
+#: src/gui/updaterwindow.cpp:138
msgid "Updating..."
msgstr "Päivitetään..."
-#: src/gui/updaterwindow.cpp:155
+#: src/gui/updaterwindow.cpp:159
msgid "Connecting..."
msgstr "Yhdistetään..."
-#: src/gui/updaterwindow.cpp:158
+#: src/gui/updaterwindow.cpp:162
msgid "Play"
msgstr "Pelaa"
-#: src/gui/updaterwindow.cpp:556
+#: src/gui/updaterwindow.cpp:564
msgid "##1 The update process is incomplete."
msgstr "##1 Päivitysprosessi keskeytyi"
#. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:558
+#: src/gui/updaterwindow.cpp:566
msgid "##1 It is strongly recommended that"
msgstr "##1 Suosittelemme vahvasti että"
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:560
+#: src/gui/updaterwindow.cpp:568
msgid "##1 you try again later."
msgstr "##1 yrität myöhemmin uudelleen"
-#: src/gui/updaterwindow.cpp:686
+#: src/gui/updaterwindow.cpp:744
msgid "Completed"
msgstr "Valmis"
@@ -3433,23 +3462,23 @@ msgstr "Kotipaikan raja"
msgid "Road Point"
msgstr "Väyläpiste"
-#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:471
+#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:472
msgid "Who Is Online - Updating"
msgstr "Kuka on linjoila - päivitän"
-#: src/gui/whoisonline.cpp:101
+#: src/gui/whoisonline.cpp:102
msgid "Update"
msgstr "Päivitä"
-#: src/gui/whoisonline.cpp:294
+#: src/gui/whoisonline.cpp:295
msgid "Who Is Online - "
msgstr "Kuka on linjoilla - "
-#: src/gui/whoisonline.cpp:485
+#: src/gui/whoisonline.cpp:486
msgid "Who Is Online - error"
msgstr "Kuka on linjoilla - virhe"
-#: src/gui/whoisonline.cpp:516
+#: src/gui/whoisonline.cpp:517
msgid "Who Is Online - Update"
msgstr "Kuka on linjoilla - päivitä"
@@ -3514,7 +3543,8 @@ msgid "This command makes <nick> a channel operator."
msgstr "Tämä komento tekee annetunnimisestä käyttäjästä kanavaoperaattorin."
#: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
-#: src/net/ea/gui/guildtab.cpp:69 src/net/ea/gui/partytab.cpp:85
+#: src/gui/widgets/guildchattab.cpp:61 src/net/ea/gui/guildtab.cpp:69
+#: src/net/ea/gui/partytab.cpp:85
msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
msgstr "Jos nimessä on välilyöntejä, laita sen ympärille lainausmerkit (\")."
@@ -3554,6 +3584,41 @@ msgstr "%s ilmoittaa kaikille:"
msgid "%s whispers: %s"
msgstr "%s kuiskaa: %s"
+#: src/gui/widgets/guildchattab.cpp:59 src/net/ea/gui/guildtab.cpp:67
+#: src/net/ea/gui/partytab.cpp:83
+msgid "Command: /invite <nick>"
+msgstr "Komento: /invite <nimi>"
+
+#: src/gui/widgets/guildchattab.cpp:60 src/net/ea/gui/guildtab.cpp:68
+msgid "This command invites <nick> to the guild you're in."
+msgstr "Tämä komento kutsuu annetun pelaajan nykyiseen kiltaasi."
+
+#: src/gui/widgets/guildchattab.cpp:66 src/net/ea/gui/guildtab.cpp:74
+#: src/net/ea/gui/partytab.cpp:90
+msgid "Command: /leave"
+msgstr "Komento: /leave"
+
+#: src/gui/widgets/guildchattab.cpp:67 src/net/ea/gui/guildtab.cpp:75
+msgid "This command causes the player to leave the guild."
+msgstr "Tämä komento saa sinut eroamaan killasta."
+
+#: src/gui/widgets/guildchattab.cpp:109 src/net/ea/gui/guildtab.cpp:135
+#: src/net/ea/gui/partytab.cpp:69
+msgid "/help > Display this help."
+msgstr "/help > Näytä tämä ohje."
+
+#: src/gui/widgets/guildchattab.cpp:110 src/net/ea/gui/guildtab.cpp:136
+msgid "/invite > Invite a player to your guild"
+msgstr "/invite > Kutsu pelaaja kiltaasi"
+
+#: src/gui/widgets/guildchattab.cpp:111 src/net/ea/gui/guildtab.cpp:137
+msgid "/leave > Leave the guild you are in"
+msgstr "/leave > Eroa nykyisestä killastasi"
+
+#: src/gui/widgets/guildchattab.cpp:112 src/net/ea/gui/guildtab.cpp:138
+msgid "/kick > Kick some one from the guild you are in"
+msgstr "/kick > Poista käyttäjä killastasi"
+
#: src/gui/widgets/setupitem.cpp:271 src/gui/widgets/setupitem.cpp:394
msgid "Edit"
msgstr "Muokkaa"
@@ -4088,68 +4153,68 @@ msgstr ""
"Päällekkäiset näppäinoikotiet \"%s\" ja \"%s\" voivat aiheuttaa outouksia; "
"ole hyvä ja poista päällekkäisyydet. "
-#: src/localplayer.cpp:372
+#: src/localplayer.cpp:370
msgid "You were killed by "
msgstr "Sinut otti hengiltä "
-#: src/localplayer.cpp:1403
+#: src/localplayer.cpp:1401
msgid "Tried to pick up nonexistent item."
msgstr "Yritit nostaa olemattoman tavaran."
-#: src/localplayer.cpp:1405
+#: src/localplayer.cpp:1403
msgid "Item is too heavy."
msgstr "Tavara on liian painava."
-#: src/localplayer.cpp:1407
+#: src/localplayer.cpp:1405
msgid "Item is too far away."
msgstr "Tavara on liian kaukana."
-#: src/localplayer.cpp:1409
+#: src/localplayer.cpp:1407
msgid "Inventory is full."
msgstr "Sinulla on liikaa tavaraa ennestään."
-#: src/localplayer.cpp:1411
+#: src/localplayer.cpp:1409
msgid "Stack is too big."
msgstr "Kasa on liian suuri."
-#: src/localplayer.cpp:1414
+#: src/localplayer.cpp:1412
msgid "Item belongs to someone else."
msgstr "Tavara kuuluu jollekulle muulle."
-#: src/localplayer.cpp:1417
+#: src/localplayer.cpp:1415
msgid "Unknown problem picking up item."
msgstr "Tuntematon ongelma esti tavaran nostamisen."
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1441
+#: src/localplayer.cpp:1439
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
msgstr[0] "[@@%2$d|%3$s@@] (%1$d kpl) otettu."
msgstr[1] "[@@%2$d|%3$s@@] (%1$d kpl) otettu."
-#: src/localplayer.cpp:3175
+#: src/localplayer.cpp:3173
msgid "Away"
msgstr "Poissa"
-#: src/localplayer.cpp:3476
+#: src/localplayer.cpp:3474
msgid "Follow: "
msgstr "Seuraa: "
-#: src/localplayer.cpp:3478 src/localplayer.cpp:3493
+#: src/localplayer.cpp:3476 src/localplayer.cpp:3491
msgid "Follow canceled"
msgstr "Seuraaminen keskeytetty"
-#: src/localplayer.cpp:3485
+#: src/localplayer.cpp:3483
msgid "Imitation: "
msgstr "Matki: "
-#: src/localplayer.cpp:3487 src/localplayer.cpp:3495
+#: src/localplayer.cpp:3485 src/localplayer.cpp:3493
msgid "Imitation canceled"
msgstr "Matkiminen keskeytetty"
-#: src/localplayer.cpp:3847
+#: src/localplayer.cpp:3845
msgid "You see "
msgstr "Näet "
@@ -4326,28 +4391,28 @@ msgstr "Hahmo poistettu."
msgid "Failed to delete character."
msgstr "Hahmon poisto epäonnistui."
-#: src/net/ea/chathandler.cpp:60 src/net/ea/chathandler.cpp:66
-#: src/net/ea/chathandler.cpp:71 src/net/ea/chathandler.cpp:77
-#: src/net/ea/chathandler.cpp:82 src/net/ea/chathandler.cpp:88
-#: src/net/ea/chathandler.cpp:95 src/net/ea/chathandler.cpp:101
+#: src/net/ea/chathandler.cpp:61 src/net/ea/chathandler.cpp:67
+#: src/net/ea/chathandler.cpp:72 src/net/ea/chathandler.cpp:78
+#: src/net/ea/chathandler.cpp:83 src/net/ea/chathandler.cpp:89
+#: src/net/ea/chathandler.cpp:96 src/net/ea/chathandler.cpp:102
msgid "Channels are not supported!"
msgstr "Kanavia ei tueta!"
-#: src/net/ea/chathandler.cpp:128
+#: src/net/ea/chathandler.cpp:129
#, c-format
msgid "Whisper could not be sent, %s is offline."
msgstr "Kuiskausta ei voitu lähettää, %s ei ole kirjautuneena sisään."
-#: src/net/ea/chathandler.cpp:136
+#: src/net/ea/chathandler.cpp:137
#, c-format
msgid "Whisper could not be sent, ignored by %s."
msgstr "Kuiskausta ei voitu lähettää, %s ei huomioinut sitä."
-#: src/net/ea/chathandler.cpp:348
+#: src/net/ea/chathandler.cpp:355
msgid "MVP player."
msgstr "MVP-pelaaja."
-#: src/net/ea/chathandler.cpp:352
+#: src/net/ea/chathandler.cpp:359
msgid "MVP player: "
msgstr "MVP-pelaaja: "
@@ -4364,38 +4429,6 @@ msgstr "Peli"
msgid "Request to quit denied!"
msgstr "Lopetuspyyntö evätty!"
-#: src/net/ea/gui/guildtab.cpp:67 src/net/ea/gui/partytab.cpp:83
-msgid "Command: /invite <nick>"
-msgstr "Komento: /invite <nimi>"
-
-#: src/net/ea/gui/guildtab.cpp:68
-msgid "This command invites <nick> to the guild you're in."
-msgstr "Tämä komento kutsuu annetun pelaajan nykyiseen kiltaasi."
-
-#: src/net/ea/gui/guildtab.cpp:74 src/net/ea/gui/partytab.cpp:90
-msgid "Command: /leave"
-msgstr "Komento: /leave"
-
-#: src/net/ea/gui/guildtab.cpp:75
-msgid "This command causes the player to leave the guild."
-msgstr "Tämä komento saa sinut eroamaan killasta."
-
-#: src/net/ea/gui/guildtab.cpp:135 src/net/ea/gui/partytab.cpp:69
-msgid "/help > Display this help."
-msgstr "/help > Näytä tämä ohje."
-
-#: src/net/ea/gui/guildtab.cpp:136
-msgid "/invite > Invite a player to your guild"
-msgstr "/invite > Kutsu pelaaja kiltaasi"
-
-#: src/net/ea/gui/guildtab.cpp:137
-msgid "/leave > Leave the guild you are in"
-msgstr "/leave > Eroa nykyisestä killastasi"
-
-#: src/net/ea/gui/guildtab.cpp:138
-msgid "/kick > Kick some one from the guild you are in"
-msgstr "/kick > Poista käyttäjä killastasi"
-
#: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
msgid "Guild created."
msgstr "Kilta luotu."
@@ -4412,85 +4445,81 @@ msgstr "Emperium-tarkistus epäonnistui."
msgid "Unknown server response."
msgstr "Tuntematon palvelimen vastaus."
-#: src/net/ea/guildhandler.cpp:180
+#: src/net/ea/guildhandler.cpp:181
#, c-format
msgid "Guild name: %s"
msgstr "Killan nimi: %s"
-#: src/net/ea/guildhandler.cpp:182
+#: src/net/ea/guildhandler.cpp:183
#, c-format
msgid "Guild master: %s"
msgstr "Kiltamestari: %s"
-#: src/net/ea/guildhandler.cpp:184
+#: src/net/ea/guildhandler.cpp:185
#, c-format
msgid "Guild level: %d"
msgstr "Kiltataso: %d"
-#: src/net/ea/guildhandler.cpp:186
+#: src/net/ea/guildhandler.cpp:187
#, c-format
msgid "Online members: %d"
msgstr "Jäseniä linjoilla: %d"
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:189
#, c-format
msgid "Max members: %d"
msgstr "Jäsenmaksimi: %d"
-#: src/net/ea/guildhandler.cpp:190
+#: src/net/ea/guildhandler.cpp:191
#, c-format
msgid "Average level: %d"
msgstr "Keskim. taso: %d"
-#: src/net/ea/guildhandler.cpp:192
+#: src/net/ea/guildhandler.cpp:193
#, c-format
msgid "Guild exp: %d"
msgstr "Kiltakokemusta: %d kkp"
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:195
#, c-format
msgid "Guild next exp: %d"
msgstr "Seuraavaan tasoon: %d kkp"
-#: src/net/ea/guildhandler.cpp:196
+#: src/net/ea/guildhandler.cpp:197
#, c-format
msgid "Guild castle: %s"
msgstr "Killan linna: %s"
-#: src/net/ea/guildhandler.cpp:402
+#: src/net/ea/guildhandler.cpp:403
msgid "Could not inivte user to guild."
msgstr "Pelaajan kutsuminen kiltaan epäonnistui."
-#: src/net/ea/guildhandler.cpp:406
+#: src/net/ea/guildhandler.cpp:407
msgid "User rejected guild invite."
msgstr "Käyttäjä ei ottanut kiltakutsua vastaan."
-#: src/net/ea/guildhandler.cpp:410
+#: src/net/ea/guildhandler.cpp:411
msgid "User is now part of your guild."
msgstr "Käyttäjä liittyi kiltaasi."
-#: src/net/ea/guildhandler.cpp:414
+#: src/net/ea/guildhandler.cpp:415
msgid "Your guild is full."
msgstr "Kiltasi on täynnä."
-#: src/net/ea/guildhandler.cpp:418
+#: src/net/ea/guildhandler.cpp:419
msgid "Unknown guild invite response."
msgstr "Tuntematon vastaus kiltakutsuun."
-#: src/net/ea/guildhandler.cpp:438
-msgid "You have left the guild."
-msgstr "Olet eronnut killasta."
-
-#: src/net/ea/guildhandler.cpp:452
+#: src/net/ea/guildhandler.cpp:453
#, c-format
msgid "%s has left your guild."
msgstr "%s on eronnut killastasi."
-#: src/net/ea/guildhandler.cpp:483
+#: src/net/ea/guildhandler.cpp:484
msgid "You was kicked from guild."
msgstr "Sinut on potkittu killasta."
-#: src/net/ea/guildhandler.cpp:496
+#: src/net/ea/guildhandler.cpp:497
#, c-format
msgid "%s has kicked from your guild."
msgstr "%s on potkittu ulos killastasi."
@@ -4720,12 +4749,12 @@ msgstr "QQQ Tuntematon kutsuvastaus kohteella %s."
msgid "You have left the party."
msgstr "Erosit ryhmästä."
-#: src/net/ea/partyhandler.cpp:368
+#: src/net/ea/partyhandler.cpp:369
#, c-format
msgid "%s has left your party."
msgstr "%s on eronnut ryhmästä."
-#: src/net/ea/partyhandler.cpp:444
+#: src/net/ea/partyhandler.cpp:448
#, c-format
msgid "An unknown member tried to say: %s"
msgstr "Tuntematon jäsen yritti sanoa: %s"
@@ -4852,7 +4881,7 @@ msgid "You're pining for the fjords."
msgstr "Kaipaat kotivuonoille."
#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
-#: src/net/ea/playerhandler.cpp:425
+#: src/net/ea/playerhandler.cpp:428
msgid "Message"
msgstr "Viesti"
@@ -4865,21 +4894,21 @@ msgstr "Kannat roinaa yli puolen elopainoasi. Rasitus estää sinua paranemasta.
msgid "You are carrying less than half your weight. You can regain health."
msgstr "Kannat roinaa alle puolet elopainoasi, ja paranet jälleen."
-#: src/net/ea/playerhandler.cpp:451
+#: src/net/ea/playerhandler.cpp:454
#, c-format
msgid "You picked up %s."
msgstr "%s nostettu."
-#: src/net/ea/playerhandler.cpp:457
+#: src/net/ea/playerhandler.cpp:460
#, c-format
msgid "You spent %s."
msgstr "Käytit %s."
-#: src/net/ea/playerhandler.cpp:501
+#: src/net/ea/playerhandler.cpp:506
msgid "Cannot raise skill!"
msgstr "Taidon korottaminen epäonnistui!"
-#: src/net/ea/playerhandler.cpp:618
+#: src/net/ea/playerhandler.cpp:624
msgid "Equip arrows first."
msgstr "Varusta ensin nuolia."
@@ -5019,7 +5048,7 @@ msgstr "Kaupat peruttu."
msgid "Trade completed."
msgstr "Kaupat tuli."
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:258
msgid "Strength"
msgstr "Voima"
@@ -5028,7 +5057,7 @@ msgstr "Voima"
msgid "Strength %+.1f"
msgstr "Voima %+.1f"
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:259
msgid "Agility"
msgstr "Ketteryys"
@@ -5037,7 +5066,7 @@ msgstr "Ketteryys"
msgid "Agility %+.1f"
msgstr "Ketteryys %+.1f"
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:262
msgid "Dexterity"
msgstr "Näppäryys"
@@ -5046,7 +5075,7 @@ msgstr "Näppäryys"
msgid "Dexterity %+.1f"
msgstr "Näppäryys %+.1f"
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:260
msgid "Vitality"
msgstr "Elinvoima"
@@ -5055,7 +5084,7 @@ msgstr "Elinvoima"
msgid "Vitality %+.1f"
msgstr "Elinvoima %+.1f"
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:261
msgid "Intelligence"
msgstr "Älykkyys"
@@ -5329,111 +5358,115 @@ msgstr "Kaupankäynnin aikana ei voi myydä kaupasta."
msgid "Unable to sell unsellable item."
msgstr "Myyntikelvotonta tavaraa ei voi myydä."
-#: src/net/tmwa/generalhandler.cpp:109
+#: src/net/tmwa/generalhandler.cpp:108
#, c-format
msgid "Strength %+d"
msgstr "Voima %+d"
-#: src/net/tmwa/generalhandler.cpp:110
+#: src/net/tmwa/generalhandler.cpp:109
#, c-format
msgid "Agility %+d"
msgstr "Ketteryys %+d"
-#: src/net/tmwa/generalhandler.cpp:111
+#: src/net/tmwa/generalhandler.cpp:110
#, c-format
msgid "Vitality %+d"
msgstr "Elinvoima %+d"
-#: src/net/tmwa/generalhandler.cpp:112
+#: src/net/tmwa/generalhandler.cpp:111
#, c-format
msgid "Intelligence %+d"
msgstr "Älykkyys %+d"
-#: src/net/tmwa/generalhandler.cpp:113
+#: src/net/tmwa/generalhandler.cpp:112
#, c-format
msgid "Dexterity %+d"
msgstr "Näppäryys %+d"
-#: src/net/tmwa/generalhandler.cpp:114
+#: src/net/tmwa/generalhandler.cpp:113
#, c-format
msgid "Luck %+d"
msgstr "Tuuri %+d"
-#: src/net/tmwa/generalhandler.cpp:140
+#: src/net/tmwa/generalhandler.cpp:139
msgid "Authentication failed."
msgstr "Tunnistus epäonnistui."
-#: src/net/tmwa/generalhandler.cpp:143
+#: src/net/tmwa/generalhandler.cpp:142
msgid "No servers available."
msgstr "Palvelimia ei saatavilla."
-#: src/net/tmwa/generalhandler.cpp:147
+#: src/net/tmwa/generalhandler.cpp:146
msgid "Someone else is trying to use this account."
msgstr "Joku muu yrittää käyttää tätä tunnusta."
-#: src/net/tmwa/generalhandler.cpp:150
+#: src/net/tmwa/generalhandler.cpp:149
msgid "This account is already logged in."
msgstr "Tällä tunnuksella on jo kirjauduttu."
-#: src/net/tmwa/generalhandler.cpp:153
+#: src/net/tmwa/generalhandler.cpp:152
msgid "Speed hack detected."
msgstr "Nopeusviritelmä havaittu."
-#: src/net/tmwa/generalhandler.cpp:156
+#: src/net/tmwa/generalhandler.cpp:155
msgid "Duplicated login."
msgstr "Kaksinkertainen sisäänkirjautuminen."
-#: src/net/tmwa/generalhandler.cpp:159
+#: src/net/tmwa/generalhandler.cpp:158
msgid "Unknown connection error."
msgstr "Tuntematon yhteysongelma."
-#: src/net/tmwa/generalhandler.cpp:232
+#: src/net/tmwa/generalhandler.cpp:231
msgid "Got disconnected from server!"
msgstr "Yhteys palvelimeen katkesi!"
-#: src/net/tmwa/generalhandler.cpp:264
+#: src/net/tmwa/generalhandler.cpp:263
msgid "Luck"
msgstr "Tuuri"
-#: src/net/tmwa/generalhandler.cpp:267
+#: src/net/tmwa/generalhandler.cpp:266
msgid "Defense"
msgstr "Puolustus"
-#: src/net/tmwa/generalhandler.cpp:268
+#: src/net/tmwa/generalhandler.cpp:267
msgid "M.Attack"
msgstr "T.-hyökkäys"
-#: src/net/tmwa/generalhandler.cpp:269
+#: src/net/tmwa/generalhandler.cpp:268
msgid "M.Defense"
msgstr "T.-puolustus"
-#: src/net/tmwa/generalhandler.cpp:271
+#: src/net/tmwa/generalhandler.cpp:270
#, no-c-format
msgid "% Accuracy"
msgstr "% Tarkkuus"
-#: src/net/tmwa/generalhandler.cpp:273
+#: src/net/tmwa/generalhandler.cpp:272
#, no-c-format
msgid "% Evade"
msgstr "% Välttö"
-#: src/net/tmwa/generalhandler.cpp:275
+#: src/net/tmwa/generalhandler.cpp:274
#, no-c-format
msgid "% Critical"
msgstr "% Täysosuma"
-#: src/net/tmwa/generalhandler.cpp:276
+#: src/net/tmwa/generalhandler.cpp:275
msgid "Attack Delay"
msgstr "Hyökkäysviive"
-#: src/net/tmwa/generalhandler.cpp:278
+#: src/net/tmwa/generalhandler.cpp:277
msgid "Walk Delay"
msgstr "Kävelyviive"
-#: src/net/tmwa/generalhandler.cpp:280
+#: src/net/tmwa/generalhandler.cpp:279
msgid "Attack Range"
msgstr "Hyökkäyskantama"
+#: src/net/tmwa/generalhandler.cpp:281
+msgid "Damage per sec."
+msgstr ""
+
#: src/net/tmwa/network.cpp:152
msgid "Empty address given to Network::connect()!"
msgstr "Tyhjä osoite Network::connect()-pyynnössä!"
@@ -5467,31 +5500,31 @@ msgstr "Leijuva '...' -puhekupla"
msgid "Floating bubble"
msgstr "Leijuva puhekupla"
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:248
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:246
#: src/resources/monsterdb.cpp:84
msgid "unnamed"
msgstr "nimetön"
-#: src/resources/itemdb.cpp:65
+#: src/resources/itemdb.cpp:63
#, c-format
msgid "Attack %+d"
msgstr "Hyökkäys %+d"
-#: src/resources/itemdb.cpp:66
+#: src/resources/itemdb.cpp:64
#, c-format
msgid "Defense %+d"
msgstr "Puolustus %+d"
-#: src/resources/itemdb.cpp:67
+#: src/resources/itemdb.cpp:65
#, c-format
msgid "HP %+d"
msgstr "VP %+d"
-#: src/resources/itemdb.cpp:68
+#: src/resources/itemdb.cpp:66
#, c-format
msgid "MP %+d"
msgstr "MP %+d"
-#: src/resources/itemdb.cpp:171
+#: src/resources/itemdb.cpp:169
msgid "Unknown item"
msgstr "Tuntematon tavara"
diff --git a/po/fr.po b/po/fr.po
index 4727011b8..3145f92d9 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-20 17:42+0300\n"
-"PO-Revision-Date: 2011-08-16 16:09+0000\n"
+"POT-Creation-Date: 2011-09-02 18:27+0300\n"
+"PO-Revision-Date: 2011-09-02 15:29+0000\n"
"Last-Translator: akaras <akaras@inbox.ru>\n"
"Language-Team: French (http://www.transifex.net/projects/p/manaplus/team/"
"fr/)\n"
@@ -25,120 +25,120 @@ msgstr ""
msgid "Visible on map"
msgstr "Visible sur la carte"
-#: src/being.cpp:542
+#: src/being.cpp:549
msgid "dodge"
msgstr "esquivé"
-#: src/being.cpp:542
+#: src/being.cpp:549
msgid "miss"
msgstr "raté"
#. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1514
+#: src/being.cpp:1529
msgid "A"
msgstr "A"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1519
+#: src/being.cpp:1534
msgid "I"
msgstr "I"
-#: src/client.cpp:826 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:831 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
msgid "Setup"
msgstr "Configuration"
-#: src/client.cpp:909
+#: src/client.cpp:914
msgid "Connecting to server"
msgstr "Connexion au serveur"
-#: src/client.cpp:940
+#: src/client.cpp:945
msgid "Logging in"
msgstr "Connexion"
-#: src/client.cpp:973
+#: src/client.cpp:978
msgid "Entering game world"
msgstr "Vous entrez dans un nouveau monde"
-#: src/client.cpp:1073
+#: src/client.cpp:1078
msgid "Requesting characters"
msgstr "Téléchargement des personnages"
-#: src/client.cpp:1104
+#: src/client.cpp:1109
msgid "Connecting to the game server"
msgstr "Connexion au serveur de jeu"
-#: src/client.cpp:1114
+#: src/client.cpp:1119
msgid "Changing game servers"
msgstr "Changement de serveur de jeu"
-#: src/client.cpp:1151 src/client.cpp:1158 src/client.cpp:1293
+#: src/client.cpp:1156 src/client.cpp:1163 src/client.cpp:1298
#: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
-#: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:395
+#: src/gui/charcreatedialog.cpp:221 src/gui/charselectdialog.cpp:253
+#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
#: src/net/manaserv/charhandler.cpp:227
msgid "Error"
msgstr "Erreur"
-#: src/client.cpp:1167
+#: src/client.cpp:1172
msgid "Requesting registration details"
msgstr "Demande des paramètres d'inscription"
-#: src/client.cpp:1194
+#: src/client.cpp:1199
msgid "Password Change"
msgstr "Changement de mot de passe"
-#: src/client.cpp:1195
+#: src/client.cpp:1200
msgid "Password changed successfully!"
msgstr "Le mot de passe a été changé avec succès !"
-#: src/client.cpp:1214
+#: src/client.cpp:1219
msgid "Email Change"
msgstr "Changer d'e-mail"
-#: src/client.cpp:1215
+#: src/client.cpp:1220
msgid "Email changed successfully!"
msgstr "L'adresse e-mail a été changée avec succès !"
-#: src/client.cpp:1235
+#: src/client.cpp:1240
msgid "Unregister Successful"
msgstr "Désinscription réussie"
-#: src/client.cpp:1236
+#: src/client.cpp:1241
msgid "Farewell, come back any time..."
msgstr "A bientôt, revenez quand vous voudrez..."
-#: src/client.cpp:1423 src/client.cpp:1453 src/client.cpp:1497
-#: src/client.cpp:1922 src/client.cpp:1929
+#: src/client.cpp:1428 src/client.cpp:1458 src/client.cpp:1502
+#: src/client.cpp:1927 src/client.cpp:1934
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%s n'existe pas et ne peut pas être créé ! Fermeture du programme."
-#: src/client.cpp:1628
+#: src/client.cpp:1633
#, c-format
msgid "Invalid update host: %s"
msgstr "Site de mise à jour invalide : %s"
-#: src/client.cpp:1662 src/client.cpp:1668
+#: src/client.cpp:1667 src/client.cpp:1673
msgid "Error creating updates directory!"
msgstr "Impossible de créer le dossier de mise à jour !"
-#: src/client.cpp:1689
+#: src/client.cpp:1694
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
"Erreur : %s n'existe pas et ne peut pas être créé ! Fermeture du programme."
-#: src/commandhandler.cpp:301
+#: src/commandhandler.cpp:303
msgid "Unknown command."
msgstr "Commande inconnue."
-#: src/commandhandler.cpp:401
+#: src/commandhandler.cpp:403
msgid "Cannot send empty whispers!"
msgstr "Vous ne pouvez pas envoyer de messages vides."
-#: src/commandhandler.cpp:415
+#: src/commandhandler.cpp:417
#, c-format
msgid ""
"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -147,153 +147,153 @@ msgstr ""
"Vous ne pouvez créer une nouvelle fenêtre de message privé avec le nom \"%s"
"\". Soit elle existe déjà, soit il s'agit de vous même."
-#: src/commandhandler.cpp:435
+#: src/commandhandler.cpp:437
#, c-format
msgid "Requesting to join channel %s."
msgstr "Demande de rejoindre le canal %s."
-#: src/commandhandler.cpp:451 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:453 src/net/ea/gui/partytab.cpp:125
msgid "Party name is missing."
msgstr "Le nom du groupe est manquant."
-#: src/commandhandler.cpp:462
+#: src/commandhandler.cpp:464
msgid "Guild name is missing."
msgstr "Le nom de la guilde est manquant."
-#: src/commandhandler.cpp:475 src/commandhandler.cpp:582
-#: src/commandhandler.cpp:623 src/commandhandler.cpp:653
+#: src/commandhandler.cpp:477 src/commandhandler.cpp:589
+#: src/commandhandler.cpp:630 src/commandhandler.cpp:660
msgid "Please specify a name."
msgstr "Veuillez indiquer un nom."
-#: src/commandhandler.cpp:516
+#: src/commandhandler.cpp:523
msgid "Return toggles chat."
msgstr "La touche <entrée> ferme la ligne d'entrée du chat."
-#: src/commandhandler.cpp:516
+#: src/commandhandler.cpp:523
msgid "Message closes chat."
msgstr "Le message ferme la conversation."
-#: src/commandhandler.cpp:527
+#: src/commandhandler.cpp:534
msgid "Return now toggles chat."
msgstr ""
"La touche <entrée> ferme maintenant la ligne d'entrée de la conversation."
-#: src/commandhandler.cpp:533
+#: src/commandhandler.cpp:540
msgid "Message now closes chat."
msgstr "Le message ferme maintenant la conversation."
-#: src/commandhandler.cpp:561
+#: src/commandhandler.cpp:568
msgid "friend"
msgstr "ami"
-#: src/commandhandler.cpp:566
+#: src/commandhandler.cpp:573
msgid "disregarded"
msgstr "écarté"
-#: src/commandhandler.cpp:571
+#: src/commandhandler.cpp:578
msgid "neutral"
msgstr "neutre"
-#: src/commandhandler.cpp:590
+#: src/commandhandler.cpp:597
#, c-format
msgid "Player already %s!"
msgstr "Joueur déjà %s !"
-#: src/commandhandler.cpp:604
+#: src/commandhandler.cpp:611
#, c-format
msgid "Player successfully %s!"
msgstr "Joueur %s avec succès!"
-#: src/commandhandler.cpp:612
+#: src/commandhandler.cpp:619
#, c-format
msgid "Player could not be %s!"
msgstr "Le joueur n'a pas pu %s !"
-#: src/commandhandler.cpp:634
+#: src/commandhandler.cpp:641
msgid "Player wasn't ignored!"
msgstr "Le joueur n'était pas ignoré !"
-#: src/commandhandler.cpp:641
+#: src/commandhandler.cpp:648
msgid "Player no longer ignored!"
msgstr "Le joueur n'est plus ignoré !"
-#: src/commandhandler.cpp:643
+#: src/commandhandler.cpp:650
msgid "Player could not be unignored!"
msgstr "Vous n'avez pas pu enlever le statut ignoré de ce joueur !"
-#: src/commandhandler.cpp:660
+#: src/commandhandler.cpp:667
msgid "Player already erased!"
msgstr "Joueur déjà effacé !"
-#: src/commandhandler.cpp:671
+#: src/commandhandler.cpp:678
msgid "Player successfully erased!"
msgstr "Joueur éliminé avec succès !"
-#: src/commandhandler.cpp:673
+#: src/commandhandler.cpp:680
msgid "Player could not be erased!"
msgstr "le joueur n'a pas pu être effacé !"
-#: src/commandhandler.cpp:972 src/commandhandler.cpp:1018
+#: src/commandhandler.cpp:980 src/commandhandler.cpp:1026
#, c-format
msgid "Client uptime: %s"
msgstr "Heure de lancement du client : %s"
-#: src/commandhandler.cpp:982
+#: src/commandhandler.cpp:990
#, c-format
msgid "%d week"
msgid_plural "%d weeks"
msgstr[0] "%d semaine"
msgstr[1] "%d semaines"
-#: src/commandhandler.cpp:991
+#: src/commandhandler.cpp:999
#, c-format
msgid "%d day"
msgid_plural "%d days"
msgstr[0] "%d jour"
msgstr[1] "%d jours"
-#: src/commandhandler.cpp:999
+#: src/commandhandler.cpp:1007
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] "%d heure"
msgstr[1] "%d heures"
-#: src/commandhandler.cpp:1007
+#: src/commandhandler.cpp:1015
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] "%d minute"
msgstr[1] "%d minutes"
-#: src/commandhandler.cpp:1015
+#: src/commandhandler.cpp:1023
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
msgstr[0] "%d secondes"
msgstr[1] "%d secondes"
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1102
msgid "font cache size"
msgstr "Taille du cache de polices"
-#: src/commandhandler.cpp:1106
+#: src/commandhandler.cpp:1114
msgid "Cache size:"
msgstr "Dimension du cache :"
-#: src/commandhandler.cpp:1110
+#: src/commandhandler.cpp:1118
msgid "Created:"
msgstr "Créé : "
-#: src/commandhandler.cpp:1112
+#: src/commandhandler.cpp:1120
msgid "Deleted:"
msgstr "Effacé :"
-#: src/commandhandler.cpp:1159 src/commandhandler.cpp:1166
+#: src/commandhandler.cpp:1167 src/commandhandler.cpp:1174
msgid "Resource images:"
msgstr "Images des ressources :"
-#: src/commandhandler.cpp:1161 src/commandhandler.cpp:1168
+#: src/commandhandler.cpp:1169 src/commandhandler.cpp:1176
msgid "Resource orphaned images:"
msgstr "Images des ressources non affectées :"
@@ -303,44 +303,44 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
msgstr ""
"Les options de /%s sont \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:411
+#: src/game.cpp:252 src/gui/widgets/chattab.cpp:409
msgid "General"
msgstr "Général"
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:413
+#: src/game.cpp:256 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:411
msgid "Debug"
msgstr "Informations"
-#: src/game.cpp:488
+#: src/game.cpp:511
msgid "Screenshot saved as "
msgstr "Capture d'écran sauvegardée sous"
-#: src/game.cpp:496
+#: src/game.cpp:519
msgid "Saving screenshot failed!"
msgstr "La sauvegarde de la capture d'écran a échoué !"
-#: src/game.cpp:536
+#: src/game.cpp:559
msgid "The connection to the server was lost."
msgstr ""
"La connexion au serveur a été coupée, le programme va maintenant se fermer."
-#: src/game.cpp:548
+#: src/game.cpp:571
msgid "Network Error"
msgstr "Erreur Réseau"
-#: src/game.cpp:1213
+#: src/game.cpp:1236
msgid "Ignoring incoming trade requests"
msgstr "Ignorer les requêtes d'échanges entrantes"
-#: src/game.cpp:1220
+#: src/game.cpp:1243
msgid "Accepting incoming trade requests"
msgstr "Accepter les requêtes d'échanges entrantes"
-#: src/game.cpp:1606
+#: src/game.cpp:1629
msgid "Could Not Load Map"
msgstr "La carte n'a pu être chargée"
-#: src/game.cpp:1607
+#: src/game.cpp:1630
#, c-format
msgid "Error while loading %s"
msgstr "Erreur durant le chargement %s"
@@ -369,103 +369,103 @@ msgstr "Commentaire : %s"
msgid "Bot Checker"
msgstr "Testeur de Robot"
-#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
+#: src/gui/botcheckerwindow.cpp:295 src/gui/setup_relations.cpp:64
msgid "Name"
msgstr "Nom"
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:134
-#: src/gui/popupmenu.cpp:292 src/gui/popupmenu.cpp:617
-#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
+#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:133
+#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:646
+#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:265
msgid "Attack"
msgstr "Attaquer"
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:279
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:297
#: src/keyboardconfig.cpp:62
msgid "Talk"
msgstr "Parler"
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:245
-#: src/gui/popupmenu.cpp:284 src/gui/popupmenu.cpp:674
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:263
+#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:703
msgid "Move"
msgstr "Déplacement"
-#: src/gui/botcheckerwindow.cpp:300
+#: src/gui/botcheckerwindow.cpp:299
msgid "Result"
msgstr "Résultat"
-#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123
+#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:124
msgid "Reset"
msgstr "Réinitialiser"
-#: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:260
-#: src/gui/popupmenu.cpp:281 src/gui/popupmenu.cpp:688
+#: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:98
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:278
+#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:717
msgid "Buy"
msgstr "Acheter"
-#: src/gui/buydialog.cpp:88 src/gui/buydialog.cpp:302
-#: src/gui/selldialog.cpp:87 src/gui/selldialog.cpp:324
+#: src/gui/buydialog.cpp:89 src/gui/buydialog.cpp:303
+#: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
#, c-format
msgid "Price: %s / Total: %s"
msgstr "Prix : %s / Total : %s"
#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
#. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:93 src/gui/itemamountwindow.cpp:207
-#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:113
-#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:974
+#: src/gui/buydialog.cpp:94 src/gui/itemamountwindow.cpp:207
+#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:973
msgid "+"
msgstr "+"
#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
#. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:96 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:986
+#: src/gui/buydialog.cpp:97 src/gui/itemamountwindow.cpp:206
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:985
msgid "-"
msgstr "-"
-#: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
-#: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
-#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:288
+#: src/gui/buydialog.cpp:99 src/gui/quitdialog.cpp:47
+#: src/gui/quitdialog.cpp:49 src/gui/quitdialog.cpp:50
+#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:294
#: src/keyboardconfig.cpp:290
msgid "Quit"
msgstr "Quitter"
-#: src/gui/buydialog.cpp:99 src/gui/selldialog.cpp:94
-#: src/gui/statuswindow.cpp:503 src/gui/statuswindow.cpp:552
-#: src/gui/statuswindow.cpp:973 src/gui/statuswindow.cpp:1004
+#: src/gui/buydialog.cpp:100 src/gui/selldialog.cpp:95
+#: src/gui/statuswindow.cpp:504 src/gui/statuswindow.cpp:553
+#: src/gui/statuswindow.cpp:972 src/gui/statuswindow.cpp:1003
msgid "Max"
msgstr "Max."
#: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:133
+#: src/gui/inventorywindow.cpp:147 src/gui/setup_other.cpp:133
msgid "Shop"
msgstr "Boutique"
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:262
-#: src/gui/popupmenu.cpp:282 src/gui/popupmenu.cpp:690
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:280
+#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:719
#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
-#: src/gui/selldialog.cpp:92
+#: src/gui/selldialog.cpp:93
msgid "Sell"
msgstr "Vendre"
#: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
-#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
+#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:96
#: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:336
-#: src/gui/popupmenu.cpp:357 src/gui/popupmenu.cpp:460
-#: src/gui/popupmenu.cpp:487 src/gui/popupmenu.cpp:511
-#: src/gui/popupmenu.cpp:525 src/gui/popupmenu.cpp:544
-#: src/gui/popupmenu.cpp:750 src/gui/popupmenu.cpp:774
-#: src/gui/popupmenu.cpp:1684 src/gui/popupmenu.cpp:1712
-#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1811
-#: src/gui/popupmenu.cpp:1846 src/gui/popupmenu.cpp:1886
-#: src/gui/popupmenu.cpp:1953 src/gui/popupmenu.cpp:1973
-#: src/gui/quitdialog.cpp:59 src/gui/register.cpp:82 src/gui/setup.cpp:71
-#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:354
+#: src/gui/popupmenu.cpp:375 src/gui/popupmenu.cpp:489
+#: src/gui/popupmenu.cpp:516 src/gui/popupmenu.cpp:540
+#: src/gui/popupmenu.cpp:554 src/gui/popupmenu.cpp:573
+#: src/gui/popupmenu.cpp:790 src/gui/popupmenu.cpp:814
+#: src/gui/popupmenu.cpp:1734 src/gui/popupmenu.cpp:1762
+#: src/gui/popupmenu.cpp:1818 src/gui/popupmenu.cpp:1861
+#: src/gui/popupmenu.cpp:1896 src/gui/popupmenu.cpp:1936
+#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2023
+#: src/gui/quitdialog.cpp:54 src/gui/register.cpp:82 src/gui/setup.cpp:72
+#: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:238
#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updaterwindow.cpp:157
+#: src/gui/updaterwindow.cpp:161
msgid "Cancel"
msgstr "Annuler"
@@ -497,7 +497,7 @@ msgid "The email address entries mismatch."
msgstr "Les deux adresses e-mail ne correspondent pas."
#: src/gui/changepassworddialog.cpp:50 src/gui/changepassworddialog.cpp:59
-#: src/gui/charselectdialog.cpp:140
+#: src/gui/charselectdialog.cpp:139
msgid "Change Password"
msgstr "Changer le mot de passe"
@@ -532,121 +532,121 @@ msgstr "Les nouveaux mots de passe ne correspondent pas."
msgid "Create Character"
msgstr "Créer le personnage"
-#: src/gui/charcreatedialog.cpp:73 src/gui/logindialog.cpp:94
+#: src/gui/charcreatedialog.cpp:76 src/gui/logindialog.cpp:94
#: src/gui/register.cpp:75
msgid "Name:"
msgstr "Nom :"
#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
#. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:76 src/gui/charcreatedialog.cpp:81
-#: src/gui/charcreatedialog.cpp:87 src/gui/outfitwindow.cpp:81
+#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:84
+#: src/gui/charcreatedialog.cpp:90 src/gui/outfitwindow.cpp:85
msgid ">"
msgstr ">"
#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
#. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:82
-#: src/gui/charcreatedialog.cpp:88 src/gui/outfitwindow.cpp:80
+#: src/gui/charcreatedialog.cpp:82 src/gui/charcreatedialog.cpp:85
+#: src/gui/charcreatedialog.cpp:91 src/gui/outfitwindow.cpp:84
msgid "<"
msgstr "<"
-#: src/gui/charcreatedialog.cpp:80
+#: src/gui/charcreatedialog.cpp:83
msgid "Hair color:"
msgstr "Couleur :"
-#: src/gui/charcreatedialog.cpp:83
+#: src/gui/charcreatedialog.cpp:86
msgid "Hair style:"
msgstr "Coupe :"
-#: src/gui/charcreatedialog.cpp:89
+#: src/gui/charcreatedialog.cpp:92
msgid "Race:"
msgstr "Race:"
-#: src/gui/charcreatedialog.cpp:92 src/gui/charselectdialog.cpp:479
-#: src/gui/socialwindow.cpp:1033
+#: src/gui/charcreatedialog.cpp:95 src/gui/charselectdialog.cpp:478
+#: src/gui/socialwindow.cpp:1139
msgid "Create"
msgstr "Créer"
-#: src/gui/charcreatedialog.cpp:94 src/gui/register.cpp:98
+#: src/gui/charcreatedialog.cpp:97 src/gui/register.cpp:98
msgid "Male"
msgstr "Masculin"
-#: src/gui/charcreatedialog.cpp:95 src/gui/register.cpp:99
+#: src/gui/charcreatedialog.cpp:98 src/gui/register.cpp:99
msgid "Female"
msgstr "Féminin"
-#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:300
+#: src/gui/charcreatedialog.cpp:116 src/gui/charcreatedialog.cpp:303
#, c-format
msgid "Please distribute %d points"
msgstr "Veuillez distribuer %d points"
-#: src/gui/charcreatedialog.cpp:219
+#: src/gui/charcreatedialog.cpp:222
msgid "Your name needs to be at least 4 characters."
msgstr "Votre nom doit comporter un minimum de 4 caractères."
-#: src/gui/charcreatedialog.cpp:291
+#: src/gui/charcreatedialog.cpp:294
msgid "Character stats OK"
msgstr "Caractéristiques du personnage Ok"
-#: src/gui/charcreatedialog.cpp:305
+#: src/gui/charcreatedialog.cpp:308
#, c-format
msgid "Please remove %d points"
msgstr "Veuillez retirer %d points"
-#: src/gui/charselectdialog.cpp:77
+#: src/gui/charselectdialog.cpp:76
msgid "Confirm Character Delete"
msgstr "Confirmer la suppression du personnage"
-#: src/gui/charselectdialog.cpp:78
+#: src/gui/charselectdialog.cpp:77
msgid "Are you sure you want to delete this character?"
msgstr "Êtes-vous certain de vouloir supprimer ce personnage ?"
-#: src/gui/charselectdialog.cpp:126
+#: src/gui/charselectdialog.cpp:125
msgid "Account and Character Management"
msgstr "Gestion du compte et du personnage"
-#: src/gui/charselectdialog.cpp:139
+#: src/gui/charselectdialog.cpp:138
msgid "Switch Login"
msgstr "Changer de compte"
-#: src/gui/charselectdialog.cpp:153 src/gui/unregisterdialog.cpp:50
+#: src/gui/charselectdialog.cpp:152 src/gui/unregisterdialog.cpp:50
#: src/gui/unregisterdialog.cpp:58
msgid "Unregister"
msgstr "Se désinscrire"
-#: src/gui/charselectdialog.cpp:162
+#: src/gui/charselectdialog.cpp:161
msgid "Change Email"
msgstr "Modifier l'adresse e-mail"
-#: src/gui/charselectdialog.cpp:254
+#: src/gui/charselectdialog.cpp:253
msgid "Incorrect password"
msgstr "Mot de passe incorrect"
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:286
msgid "Enter password for deleting character"
msgstr "Entrer le mot de passe pour effacer le personnage"
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:286
msgid "Enter password:"
msgstr "Entrer le mot de passe :"
-#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:292
-#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
-#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
+#: src/gui/charselectdialog.cpp:408 src/gui/serverdialog.cpp:298
+#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:122
+#: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:241
msgid "Delete"
msgstr "Supprimer"
-#: src/gui/charselectdialog.cpp:467
+#: src/gui/charselectdialog.cpp:466
msgid "Choose"
msgstr "Choisir"
-#: src/gui/charselectdialog.cpp:470
+#: src/gui/charselectdialog.cpp:469
#, c-format
msgid "Level %d"
msgstr "Niveau %d"
-#: src/gui/charselectdialog.cpp:481 src/gui/charselectdialog.cpp:482
+#: src/gui/charselectdialog.cpp:480 src/gui/charselectdialog.cpp:481
msgid "(empty)"
msgstr "(vide)"
@@ -718,12 +718,12 @@ msgstr "???"
msgid "Chat"
msgstr "Conversation"
-#: src/gui/chatwindow.cpp:606
+#: src/gui/chatwindow.cpp:609
#, c-format
msgid "Present: %s; %d players are present."
msgstr "Présents : %s ; %d joueurs sont présents."
-#: src/gui/chatwindow.cpp:993
+#: src/gui/chatwindow.cpp:996
#, c-format
msgid "Whispering to %s: %s"
msgstr "Message envoyé à %s : %s"
@@ -736,145 +736,145 @@ msgstr "Oui"
msgid "No"
msgstr "Non"
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:150
-#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:384
-#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:632
-#: src/gui/popupmenu.cpp:640
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:149
+#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:402
+#: src/gui/popupmenu.cpp:408 src/gui/popupmenu.cpp:661
+#: src/gui/popupmenu.cpp:669
msgid "Ignore"
msgstr "Ignorer"
-#: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
+#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:97
#: src/gui/setup_other.cpp:64
msgid "Map"
msgstr "Carte"
-#: src/gui/debugwindow.cpp:71
+#: src/gui/debugwindow.cpp:73
msgid "Target"
msgstr "Cible"
-#: src/gui/debugwindow.cpp:72
+#: src/gui/debugwindow.cpp:74
msgid "Net"
msgstr "Réseau"
-#: src/gui/debugwindow.cpp:145 src/gui/debugwindow.cpp:220
-#: src/gui/debugwindow.cpp:249
+#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
+#: src/gui/debugwindow.cpp:251
msgid "Music:"
msgstr "Musique :"
-#: src/gui/debugwindow.cpp:146 src/gui/debugwindow.cpp:224
-#: src/gui/debugwindow.cpp:251
+#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:226
+#: src/gui/debugwindow.cpp:253
msgid "Map:"
msgstr "Carte :"
-#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
-#: src/gui/debugwindow.cpp:250
+#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:224
+#: src/gui/debugwindow.cpp:252
msgid "Minimap:"
msgstr "Mini carte :"
-#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:218
-#: src/gui/debugwindow.cpp:247
+#: src/gui/debugwindow.cpp:150 src/gui/debugwindow.cpp:220
+#: src/gui/debugwindow.cpp:249
msgid "Cursor:"
msgstr "Curseur :"
-#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:201
-#: src/gui/debugwindow.cpp:206
+#: src/gui/debugwindow.cpp:151 src/gui/debugwindow.cpp:203
+#: src/gui/debugwindow.cpp:208
msgid "Player Position:"
msgstr "Position du joueur :"
-#: src/gui/debugwindow.cpp:152
+#: src/gui/debugwindow.cpp:154
msgid "Particle count:"
msgstr "Comptage de particules :"
-#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:235
-#: src/gui/debugwindow.cpp:254
+#: src/gui/debugwindow.cpp:156 src/gui/debugwindow.cpp:237
+#: src/gui/debugwindow.cpp:256
msgid "Map actors count:"
msgstr "Nombre d'acteurs sur la carte :"
-#: src/gui/debugwindow.cpp:162 src/gui/debugwindow.cpp:173
+#: src/gui/debugwindow.cpp:164 src/gui/debugwindow.cpp:175
#, c-format
msgid "%d FPS (Software)"
msgstr "%d FPS (Logiciel)"
-#: src/gui/debugwindow.cpp:166
+#: src/gui/debugwindow.cpp:168
#, c-format
msgid "%d FPS (fast OpenGL)"
msgstr "%d FPS (OpenGl rapide)"
-#: src/gui/debugwindow.cpp:169
+#: src/gui/debugwindow.cpp:171
#, c-format
msgid "%d FPS (old OpenGL)"
msgstr "%d FPS (ancien OpenGL)"
-#: src/gui/debugwindow.cpp:176
+#: src/gui/debugwindow.cpp:178
#, c-format
msgid "%d FPS"
msgstr "%d FPS"
-#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:240
+#: src/gui/debugwindow.cpp:190 src/gui/debugwindow.cpp:242
msgid "Textures count:"
msgstr "Comptage des trames :"
-#: src/gui/debugwindow.cpp:231
+#: src/gui/debugwindow.cpp:233
#, c-format
msgid "Particle count: %d"
msgstr "Effets de particules : %d"
-#: src/gui/debugwindow.cpp:268 src/gui/debugwindow.cpp:299
-#: src/gui/debugwindow.cpp:343
+#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:301
+#: src/gui/debugwindow.cpp:345
msgid "Target:"
msgstr "Cible :"
-#: src/gui/debugwindow.cpp:269 src/gui/debugwindow.cpp:304
-#: src/gui/debugwindow.cpp:344
+#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:306
+#: src/gui/debugwindow.cpp:346
msgid "Target Id:"
msgstr "Id de la Cible :"
-#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:308
-#: src/gui/debugwindow.cpp:313 src/gui/debugwindow.cpp:345
+#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:310
+#: src/gui/debugwindow.cpp:315 src/gui/debugwindow.cpp:347
msgid "Target Level:"
msgstr "Cibler un niveau :"
-#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:316
-#: src/gui/debugwindow.cpp:346
+#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:318
+#: src/gui/debugwindow.cpp:348
msgid "Target Party:"
msgstr "Cibler un groupe :"
-#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:319
-#: src/gui/debugwindow.cpp:347
+#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:321
+#: src/gui/debugwindow.cpp:349
msgid "Target Guild:"
msgstr "Cibler une guilde :"
-#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:333
-#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:348
+#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:335
+#: src/gui/debugwindow.cpp:340 src/gui/debugwindow.cpp:350
msgid "Attack delay:"
msgstr "Délai d'attaque :"
-#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:323
-#: src/gui/debugwindow.cpp:349
+#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:325
+#: src/gui/debugwindow.cpp:351
msgid "Minimal hit:"
msgstr "Coup Mini :"
-#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:325
-#: src/gui/debugwindow.cpp:350
+#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:327
+#: src/gui/debugwindow.cpp:352
msgid "Maximum hit:"
msgstr "Coup Max :"
-#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:327
-#: src/gui/debugwindow.cpp:351
+#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:329
+#: src/gui/debugwindow.cpp:353
msgid "Critical hit:"
msgstr "Coup Critique :"
-#: src/gui/debugwindow.cpp:385 src/gui/debugwindow.cpp:390
+#: src/gui/debugwindow.cpp:387 src/gui/debugwindow.cpp:392
#, c-format
msgid "Ping: %s ms"
msgstr "Ping: %s ms"
-#: src/gui/debugwindow.cpp:393
+#: src/gui/debugwindow.cpp:395
#, c-format
msgid "In: %d bytes/s"
msgstr "Entrée : %d bytes/s"
-#: src/gui/debugwindow.cpp:395
+#: src/gui/debugwindow.cpp:397
#, c-format
msgid "Out: %d bytes/s"
msgstr "Sortie : %d bytes/s"
@@ -883,26 +883,26 @@ msgstr "Sortie : %d bytes/s"
msgid "Did You Know?"
msgstr "Le saviez-vous ?"
-#: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
-#: src/gui/inventorywindow.cpp:175 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:559 src/gui/shopwindow.cpp:111
+#: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
+#: src/gui/inventorywindow.cpp:176 src/gui/npcdialog.cpp:53
+#: src/gui/popupmenu.cpp:588 src/gui/shopwindow.cpp:113
msgid "Close"
msgstr "Fermer"
-#: src/gui/didyouknowwindow.cpp:62
+#: src/gui/didyouknowwindow.cpp:64
msgid "< Previous"
msgstr "< Précédent"
-#: src/gui/didyouknowwindow.cpp:63
+#: src/gui/didyouknowwindow.cpp:65
msgid "Next >"
msgstr "Suivant >"
-#: src/gui/didyouknowwindow.cpp:64
+#: src/gui/didyouknowwindow.cpp:66
msgid "Auto open this window"
msgstr "Ouverture automatique de cette fenêtre"
#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:58 src/gui/textdialog.cpp:50
+#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:53 src/gui/textdialog.cpp:50
msgid "OK"
msgstr "Ok"
@@ -910,10 +910,10 @@ msgstr "Ok"
msgid "Equipment"
msgstr "Équipement"
-#: src/gui/equipmentwindow.cpp:93 src/gui/inventorywindow.cpp:130
-#: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
-#: src/gui/popupmenu.cpp:1643 src/gui/popupmenu.cpp:1738
-#: src/gui/popupmenu.cpp:1783
+#: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:131
+#: src/gui/inventorywindow.cpp:512 src/gui/inventorywindow.cpp:521
+#: src/gui/popupmenu.cpp:1693 src/gui/popupmenu.cpp:1788
+#: src/gui/popupmenu.cpp:1833
msgid "Unequip"
msgstr "Retirer"
@@ -926,75 +926,75 @@ msgstr "Aide"
msgid "Inventory"
msgstr "Inventaire"
-#: src/gui/inventorywindow.cpp:104
+#: src/gui/inventorywindow.cpp:105
msgid "Slots:"
msgstr "Emplacements :"
-#: src/gui/inventorywindow.cpp:115
+#: src/gui/inventorywindow.cpp:116
msgid "Filter:"
msgstr "Filtre :"
-#: src/gui/inventorywindow.cpp:116
+#: src/gui/inventorywindow.cpp:117
msgid "Sort:"
msgstr "Tri :"
-#: src/gui/inventorywindow.cpp:122
+#: src/gui/inventorywindow.cpp:123
msgid "na"
msgstr "sans"
-#: src/gui/inventorywindow.cpp:123
+#: src/gui/inventorywindow.cpp:124
msgid "az"
msgstr "a-z"
-#: src/gui/inventorywindow.cpp:124
+#: src/gui/inventorywindow.cpp:125
msgid "id"
msgstr "id"
-#: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:513
-#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1645
-#: src/gui/popupmenu.cpp:1740 src/gui/popupmenu.cpp:1785
+#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
+#: src/gui/inventorywindow.cpp:523 src/gui/popupmenu.cpp:1695
+#: src/gui/popupmenu.cpp:1790 src/gui/popupmenu.cpp:1835
msgid "Equip"
msgstr "Équiper"
-#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
-#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1648
-#: src/gui/popupmenu.cpp:1707 src/gui/popupmenu.cpp:1744
-#: src/gui/popupmenu.cpp:1788
+#: src/gui/inventorywindow.cpp:130 src/gui/inventorywindow.cpp:515
+#: src/gui/inventorywindow.cpp:519 src/gui/popupmenu.cpp:1698
+#: src/gui/popupmenu.cpp:1757 src/gui/popupmenu.cpp:1794
+#: src/gui/popupmenu.cpp:1838
msgid "Use"
msgstr "Utiliser"
-#: src/gui/inventorywindow.cpp:143 src/gui/inventorywindow.cpp:619
-#: src/gui/popupmenu.cpp:1652 src/gui/popupmenu.cpp:1749
-#: src/gui/popupmenu.cpp:1792
+#: src/gui/inventorywindow.cpp:144 src/gui/inventorywindow.cpp:620
+#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1799
+#: src/gui/popupmenu.cpp:1842
msgid "Drop..."
msgstr "Jeter..."
-#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1661
-#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1801
+#: src/gui/inventorywindow.cpp:145 src/gui/popupmenu.cpp:1711
+#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1851
msgid "Split"
msgstr "Partager"
-#: src/gui/inventorywindow.cpp:145 src/gui/outfitwindow.cpp:59
-#: src/gui/popupmenu.cpp:520
+#: src/gui/inventorywindow.cpp:146 src/gui/outfitwindow.cpp:60
+#: src/gui/popupmenu.cpp:549
msgid "Outfits"
msgstr "Tenues"
-#: src/gui/inventorywindow.cpp:148
+#: src/gui/inventorywindow.cpp:149
msgid "Weight:"
msgstr "Poids :"
-#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
-#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
-#: src/gui/popupmenu.cpp:1804 src/gui/setup.cpp:72
+#: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:611
+#: src/gui/popupmenu.cpp:1674 src/gui/popupmenu.cpp:1811
+#: src/gui/popupmenu.cpp:1854 src/gui/setup.cpp:73
msgid "Store"
msgstr "Entreposer"
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1668
+#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1718
msgid "Retrieve"
msgstr "Récupérer"
-#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1657
-#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1797
+#: src/gui/inventorywindow.cpp:622 src/gui/popupmenu.cpp:1707
+#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1847
#: src/gui/windowmenu.cpp:97
msgid "Drop"
msgstr "Jeter"
@@ -1035,11 +1035,11 @@ msgstr "Ajouter à la boutique de ventes."
msgid "Unknown."
msgstr "Inconnu."
-#: src/gui/itempopup.cpp:176 src/gui/itempopup.cpp:182
+#: src/gui/itempopup.cpp:177 src/gui/itempopup.cpp:183
msgid ", "
msgstr ","
-#: src/gui/itempopup.cpp:192
+#: src/gui/itempopup.cpp:193
#, c-format
msgid "Weight: %s"
msgstr "Poids : %s"
@@ -1048,90 +1048,94 @@ msgstr "Poids : %s"
msgid "Kill stats"
msgstr "Statistiques"
-#: src/gui/killstats.cpp:64
+#: src/gui/killstats.cpp:65
msgid "Reset stats"
msgstr "RaZ stats"
-#: src/gui/killstats.cpp:65
+#: src/gui/killstats.cpp:66
msgid "Reset timer"
msgstr "RaZ temps"
-#: src/gui/killstats.cpp:69 src/gui/killstats.cpp:205
+#: src/gui/killstats.cpp:70 src/gui/killstats.cpp:206
#, c-format
msgid "Level: %d at %f%%"
msgstr "Niveau : %d à %f%%"
-#: src/gui/killstats.cpp:73 src/gui/killstats.cpp:210
+#: src/gui/killstats.cpp:74 src/gui/killstats.cpp:211
#, c-format
msgid "Exp: %d/%d Left: %d"
msgstr "Exp : %d/%d Reste : %d"
-#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:216
-#: src/gui/killstats.cpp:225
+#: src/gui/killstats.cpp:77 src/gui/killstats.cpp:217
+#: src/gui/killstats.cpp:226
#, c-format
msgid "1%% = %d exp, avg mob for 1%%: %s"
msgstr "1%% = %d Moyenne des monstres tués 1%% : %s"
-#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:142
-#: src/gui/killstats.cpp:234
+#: src/gui/killstats.cpp:80 src/gui/killstats.cpp:143
+#: src/gui/killstats.cpp:235
#, c-format
msgid "Kills: %s, total exp: %s"
msgstr "Nbre Tués : %s, total exp : %s"
-#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
-#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:230
+#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145
+#: src/gui/killstats.cpp:221 src/gui/killstats.cpp:231
#, c-format
msgid "Avg Exp: %s, No. of avg mob to next level: %s"
msgstr "Moyenne Exp: %s, Nombre de monstres pour le prochain niveau : %s"
-#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:162
-#: src/gui/killstats.cpp:237
+#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:163
+#: src/gui/killstats.cpp:238
#, c-format
msgid "Kills/Min: %s, Exp/Min: %s"
msgstr "Tués/Min : %s, Exp/Min : %s"
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:89 src/gui/killstats.cpp:94
-#: src/gui/killstats.cpp:289 src/gui/killstats.cpp:305
-#: src/gui/killstats.cpp:323
+#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:90 src/gui/killstats.cpp:95
+#: src/gui/killstats.cpp:290 src/gui/killstats.cpp:306
+#: src/gui/killstats.cpp:324
#, c-format
msgid "Exp speed per %d min: %s"
msgid_plural "Exp speed per %d min: %s"
msgstr[0] "Rapidité exp pour %d min : %s"
msgstr[1] "Rapidité exp pour %d min : %s"
-#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
+#: src/gui/killstats.cpp:88 src/gui/killstats.cpp:93 src/gui/killstats.cpp:98
#, c-format
msgid "Time for next level per %d min: %s"
msgid_plural "Time for next level per %d min: %s"
msgstr[0] "Temps pour le prochain niveau %d min : %s"
msgstr[1] "Temps pour le prochain niveau %d min : %s"
-#: src/gui/killstats.cpp:100 src/gui/killstats.cpp:241
+#: src/gui/killstats.cpp:101 src/gui/killstats.cpp:242
msgid "Last kill exp:"
msgstr "Exp du dernier tué :"
-#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:355
-#: src/gui/killstats.cpp:361 src/gui/killstats.cpp:367
-#: src/gui/killstats.cpp:372
+#: src/gui/killstats.cpp:103 src/gui/killstats.cpp:356
+#: src/gui/killstats.cpp:362 src/gui/killstats.cpp:368
+#: src/gui/killstats.cpp:373
msgid "Time before jacko spawn:"
msgstr "Temps avant l'arrivée de Jack0 :"
-#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:301
-#: src/gui/killstats.cpp:311 src/gui/killstats.cpp:318
-#: src/gui/killstats.cpp:330 src/gui/killstats.cpp:337
+#: src/gui/killstats.cpp:295 src/gui/killstats.cpp:302
+#: src/gui/killstats.cpp:312 src/gui/killstats.cpp:319
+#: src/gui/killstats.cpp:331 src/gui/killstats.cpp:338
#, c-format
msgid " Time for next level: %s"
msgstr " Temps pour le prochain niveau : %s"
-#: src/gui/killstats.cpp:361
+#: src/gui/killstats.cpp:362
#, c-format
msgid "%s %d?"
msgstr "%s %d?"
-#: src/gui/killstats.cpp:367
+#: src/gui/killstats.cpp:368
msgid "jacko spawning"
msgstr "Arrivée de Jack0"
+#: src/guildmanager.cpp:464 src/net/ea/guildhandler.cpp:439
+msgid "You have left the guild."
+msgstr "vous avez quitté la guilde."
+
#: src/gui/logindialog.cpp:59
msgid "Normal"
msgstr "Normal"
@@ -1148,7 +1152,7 @@ msgstr "Sauter"
msgid "Login"
msgstr "Compte"
-#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:246
+#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:252
#: src/gui/widgets/chattab.cpp:173
msgid "Server:"
msgstr "Serveur :"
@@ -1230,11 +1234,11 @@ msgstr "Soumettre"
msgid "NPC"
msgstr "PNJ"
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:561
+#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:590
msgid "Clear"
msgstr "Effacer"
-#: src/gui/npcdialog.cpp:222
+#: src/gui/npcdialog.cpp:223
msgid "> Next"
msgstr ">suivant"
@@ -1250,346 +1254,346 @@ msgstr "Envoyer"
msgid "Failed to send as sender or letter invalid."
msgstr "Échec de l'envoi comme émetteur ou caractère invalide."
-#: src/gui/outfitwindow.cpp:82 src/gui/outfitwindow.cpp:886
+#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:890
#, c-format
msgid "Outfit: %d"
msgstr "Tenue : %d"
-#: src/gui/outfitwindow.cpp:84 src/gui/outfitwindow.cpp:888
+#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:892
#, c-format
msgid "Key: %s"
msgstr "Touche : %s"
-#: src/gui/outfitwindow.cpp:87
+#: src/gui/outfitwindow.cpp:91
msgid "Unequip first"
msgstr "Retirer d'abord l'équipement"
-#: src/gui/outfitwindow.cpp:90
+#: src/gui/outfitwindow.cpp:94
msgid "Away outfit"
msgstr "Équipement en absence"
-#: src/gui/popupmenu.cpp:133 src/gui/popupmenu.cpp:616
+#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:645
#: src/gui/widgets/tradetab.cpp:44
msgid "Trade"
msgstr "Échange"
-#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:375
+#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:393
msgid "Whisper"
msgstr "Message"
-#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:621
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:650
msgid "Heal"
msgstr "Soigner"
-#: src/gui/popupmenu.cpp:146 src/gui/popupmenu.cpp:381
-#: src/gui/popupmenu.cpp:628
+#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:399
+#: src/gui/popupmenu.cpp:657
msgid "Be friend"
msgstr "Être ami"
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:383
-#: src/gui/popupmenu.cpp:389 src/gui/popupmenu.cpp:408
-#: src/gui/popupmenu.cpp:630 src/gui/popupmenu.cpp:638
-#: src/gui/popupmenu.cpp:662
+#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:156
+#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:401
+#: src/gui/popupmenu.cpp:407 src/gui/popupmenu.cpp:426
+#: src/gui/popupmenu.cpp:659 src/gui/popupmenu.cpp:667
+#: src/gui/popupmenu.cpp:691
msgid "Disregard"
msgstr "Éviter"
-#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:161
-#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:177
-#: src/gui/popupmenu.cpp:385 src/gui/popupmenu.cpp:391
-#: src/gui/popupmenu.cpp:398 src/gui/popupmenu.cpp:403
-#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
-#: src/gui/popupmenu.cpp:649 src/gui/popupmenu.cpp:655
+#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:160
+#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:176
+#: src/gui/popupmenu.cpp:403 src/gui/popupmenu.cpp:409
+#: src/gui/popupmenu.cpp:416 src/gui/popupmenu.cpp:421
+#: src/gui/popupmenu.cpp:662 src/gui/popupmenu.cpp:670
+#: src/gui/popupmenu.cpp:678 src/gui/popupmenu.cpp:684
msgid "Erase"
msgstr "Éliminer"
-#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:175
-#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:395
-#: src/gui/popupmenu.cpp:402 src/gui/popupmenu.cpp:407
-#: src/gui/popupmenu.cpp:646 src/gui/popupmenu.cpp:654
-#: src/gui/popupmenu.cpp:660
+#: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:174
+#: src/gui/popupmenu.cpp:181 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:425
+#: src/gui/popupmenu.cpp:675 src/gui/popupmenu.cpp:683
+#: src/gui/popupmenu.cpp:689
msgid "Unignore"
msgstr "Ne plus ignorer"
-#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:186
-#: src/gui/popupmenu.cpp:397 src/gui/popupmenu.cpp:410
-#: src/gui/popupmenu.cpp:648 src/gui/popupmenu.cpp:664
+#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:185
+#: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:428
+#: src/gui/popupmenu.cpp:677 src/gui/popupmenu.cpp:693
#: src/playerrelations.cpp:400
msgid "Completely ignore"
msgstr "Ignorer complètement"
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:418
-#: src/gui/popupmenu.cpp:672
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:436
+#: src/gui/popupmenu.cpp:701
msgid "Follow"
msgstr "Suivre"
-#: src/gui/popupmenu.cpp:196 src/gui/popupmenu.cpp:419
-#: src/gui/popupmenu.cpp:673
+#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:437
+#: src/gui/popupmenu.cpp:702
msgid "Imitation"
msgstr "Imiter"
-#: src/gui/popupmenu.cpp:206 src/gui/popupmenu.cpp:710
+#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:739
msgid "Invite to party"
msgstr "Inviter dans le groupe"
-#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:428
-#: src/gui/popupmenu.cpp:715
+#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:744
msgid "Kick from party"
msgstr "Sortir du groupe"
-#: src/gui/popupmenu.cpp:226 src/gui/popupmenu.cpp:439
-#: src/gui/popupmenu.cpp:729
+#: src/gui/popupmenu.cpp:225 src/gui/popupmenu.cpp:237
+#: src/gui/popupmenu.cpp:460 src/gui/popupmenu.cpp:761
msgid "Kick from guild"
msgstr "Sortir de la guilde"
-#: src/gui/popupmenu.cpp:228 src/gui/popupmenu.cpp:441
-#: src/gui/popupmenu.cpp:731
+#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:242
+#: src/gui/popupmenu.cpp:465 src/gui/popupmenu.cpp:766
msgid "Change pos in guild"
msgstr "Changer la position dans la guilde"
-#: src/gui/popupmenu.cpp:234 src/gui/popupmenu.cpp:446
-#: src/gui/popupmenu.cpp:737
+#: src/gui/popupmenu.cpp:251 src/gui/popupmenu.cpp:474
+#: src/gui/popupmenu.cpp:776
msgid "Invite to guild"
msgstr "Inviter dans la guilde"
-#: src/gui/popupmenu.cpp:242
+#: src/gui/popupmenu.cpp:260
msgid "Kick player"
msgstr "Sortir le joueur"
-#: src/gui/popupmenu.cpp:244
+#: src/gui/popupmenu.cpp:262
msgid "Nuke"
msgstr "Annihiler"
-#: src/gui/popupmenu.cpp:247 src/gui/popupmenu.cpp:675
+#: src/gui/popupmenu.cpp:265 src/gui/popupmenu.cpp:704
msgid "Show Items"
msgstr "Montrer les objets"
-#: src/gui/popupmenu.cpp:248 src/gui/popupmenu.cpp:676
-#: src/gui/popupmenu.cpp:1970
+#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:705
+#: src/gui/popupmenu.cpp:2020
msgid "Undress"
msgstr "Déshabiller"
-#: src/gui/popupmenu.cpp:250 src/gui/popupmenu.cpp:286
-#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:678
-#: src/gui/popupmenu.cpp:746
+#: src/gui/popupmenu.cpp:268 src/gui/popupmenu.cpp:304
+#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:707
+#: src/gui/popupmenu.cpp:786
msgid "Add comment"
msgstr "Ajouter commentaire"
-#: src/gui/popupmenu.cpp:268 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:695
+#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:482
+#: src/gui/popupmenu.cpp:724
msgid "Buy (?)"
msgstr "Acheter (?)"
-#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:454
-#: src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:483
+#: src/gui/popupmenu.cpp:726
msgid "Sell (?)"
msgstr "Vendre (?)"
-#: src/gui/popupmenu.cpp:298
+#: src/gui/popupmenu.cpp:316
msgid "Kick"
msgstr "Virer"
-#: src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:327
msgid "Remove from attack list"
msgstr "Enlever de la liste d'attaque"
-#: src/gui/popupmenu.cpp:315
+#: src/gui/popupmenu.cpp:333
msgid "Add to priority attack list"
msgstr "Ajouter à la liste de priorités d'attaque"
-#: src/gui/popupmenu.cpp:317
+#: src/gui/popupmenu.cpp:335
msgid "Add to attack list"
msgstr "Ajouter à la liste d'attaque"
-#: src/gui/popupmenu.cpp:320
+#: src/gui/popupmenu.cpp:338
msgid "Add to ignore list"
msgstr "Ajouter à la liste d'ignorés"
-#: src/gui/popupmenu.cpp:333 src/gui/popupmenu.cpp:457
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:486
msgid "Add name to chat"
msgstr "Ajouter le nom dans la boite de dialogue"
-#: src/gui/popupmenu.cpp:483
+#: src/gui/popupmenu.cpp:512
msgid "Pick up"
msgstr "Ramasser"
-#: src/gui/popupmenu.cpp:484 src/gui/popupmenu.cpp:1682
-#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1805
+#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:1732
+#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1855
msgid "Add to chat"
msgstr "Ajouter à la conversation"
-#: src/gui/popupmenu.cpp:501
+#: src/gui/popupmenu.cpp:530
msgid "Map Item"
msgstr "Objet de carte"
-#: src/gui/popupmenu.cpp:502
+#: src/gui/popupmenu.cpp:531
msgid "Rename"
msgstr "Renommer"
-#: src/gui/popupmenu.cpp:503 src/gui/popupmenu.cpp:1923
-#: src/gui/popupmenu.cpp:1941 src/gui/popupmenu.cpp:1946
+#: src/gui/popupmenu.cpp:532 src/gui/popupmenu.cpp:1973
+#: src/gui/popupmenu.cpp:1991 src/gui/popupmenu.cpp:1996
msgid "Remove"
msgstr "Enlever"
-#: src/gui/popupmenu.cpp:508
+#: src/gui/popupmenu.cpp:537
msgid "Warp"
msgstr ""
-#: src/gui/popupmenu.cpp:522
+#: src/gui/popupmenu.cpp:551
msgid "Load old outfits"
msgstr "Charger les anciennes tenues"
-#: src/gui/popupmenu.cpp:538 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:567 src/gui/windowmenu.cpp:96
msgid "Spells"
msgstr "Sortilèges"
-#: src/gui/popupmenu.cpp:540
+#: src/gui/popupmenu.cpp:569
msgid "Load old spells"
msgstr "Charger les anciens sorts"
-#: src/gui/popupmenu.cpp:541
+#: src/gui/popupmenu.cpp:570
msgid "Edit spell"
msgstr "Éditer le sortilège"
-#: src/gui/popupmenu.cpp:567
+#: src/gui/popupmenu.cpp:596
msgid "Disable highlight"
msgstr "Désactiver la surbrillance"
-#: src/gui/popupmenu.cpp:572
+#: src/gui/popupmenu.cpp:601
msgid "Enable highlight"
msgstr "Activer la surbrillance"
-#: src/gui/popupmenu.cpp:577
-msgid "Dont remove name"
-msgstr "N'enlève pas le nom"
+#: src/gui/popupmenu.cpp:606
+msgid "Don't remove name"
+msgstr ""
-#: src/gui/popupmenu.cpp:582
+#: src/gui/popupmenu.cpp:611
msgid "Remove name"
msgstr "Enlève le nom"
-#: src/gui/popupmenu.cpp:587
+#: src/gui/popupmenu.cpp:616
msgid "Enable away"
msgstr "Active la fonction Absence"
-#: src/gui/popupmenu.cpp:592
+#: src/gui/popupmenu.cpp:621
msgid "Disable away"
msgstr "Désactive la fonction Absence"
-#: src/gui/popupmenu.cpp:598 src/gui/socialwindow.cpp:1035
+#: src/gui/popupmenu.cpp:627 src/gui/socialwindow.cpp:1141
msgid "Leave"
msgstr "Quitter"
-#: src/gui/popupmenu.cpp:758
+#: src/gui/popupmenu.cpp:798
msgid "Change guild position"
msgstr "Changer la position de la Guilde"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1189
+#: src/gui/popupmenu.cpp:1234
msgid "Rename map sign "
msgstr "Renommer le panneau de carte"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1191
+#: src/gui/popupmenu.cpp:1236
msgid "Name: "
msgstr "Nom : "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1241
+#: src/gui/popupmenu.cpp:1286
msgid "Player comment "
msgstr "Le joueur commente "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1243
+#: src/gui/popupmenu.cpp:1288
msgid "Comment: "
msgstr "Commentaire : "
-#: src/gui/popupmenu.cpp:1607
+#: src/gui/popupmenu.cpp:1657
msgid "Add to trade"
msgstr "Ajouter à la transaction"
-#: src/gui/popupmenu.cpp:1613
+#: src/gui/popupmenu.cpp:1663
msgid "Add to trade 10"
msgstr "Ajouter 10 dans l'échange"
-#: src/gui/popupmenu.cpp:1616
+#: src/gui/popupmenu.cpp:1666
msgid "Add to trade half"
msgstr "Ajouter la moitié dans l'échange"
-#: src/gui/popupmenu.cpp:1618
+#: src/gui/popupmenu.cpp:1668
msgid "Add to trade all"
msgstr "Ajouter tout dans l'échange"
-#: src/gui/popupmenu.cpp:1630
+#: src/gui/popupmenu.cpp:1680
msgid "Store 10"
msgstr "Entreposer 10"
-#: src/gui/popupmenu.cpp:1633
+#: src/gui/popupmenu.cpp:1683
msgid "Store half"
msgstr "Entreposer la moitié"
-#: src/gui/popupmenu.cpp:1635
+#: src/gui/popupmenu.cpp:1685
msgid "Store all"
msgstr "Entreposer tout"
-#: src/gui/popupmenu.cpp:1653 src/gui/popupmenu.cpp:1750
-#: src/gui/popupmenu.cpp:1793
+#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1800
+#: src/gui/popupmenu.cpp:1843
msgid "Drop all"
msgstr "Jeter tout"
-#: src/gui/popupmenu.cpp:1674
+#: src/gui/popupmenu.cpp:1724
msgid "Retrieve 10"
msgstr "Reprendre 10"
-#: src/gui/popupmenu.cpp:1677
+#: src/gui/popupmenu.cpp:1727
msgid "Retrieve half"
msgstr "Reprendre la moitié"
-#: src/gui/popupmenu.cpp:1679
+#: src/gui/popupmenu.cpp:1729
msgid "Retrieve all"
msgstr "Reprendre tout"
-#: src/gui/popupmenu.cpp:1710 src/gui/popupmenu.cpp:1766
+#: src/gui/popupmenu.cpp:1760 src/gui/popupmenu.cpp:1816
msgid "Load old item shortcuts"
msgstr "Charger les anciens raccourcis d'objets"
-#: src/gui/popupmenu.cpp:1809
+#: src/gui/popupmenu.cpp:1859
msgid "Load old drop shortcuts"
msgstr "Charger les anciens raccourcis de jets d'objets"
-#: src/gui/popupmenu.cpp:1835 src/gui/popupmenu.cpp:1870
+#: src/gui/popupmenu.cpp:1885 src/gui/popupmenu.cpp:1920
msgid "Hide"
msgstr "Cacher"
-#: src/gui/popupmenu.cpp:1841 src/gui/popupmenu.cpp:1876
+#: src/gui/popupmenu.cpp:1891 src/gui/popupmenu.cpp:1926
msgid "Show"
msgstr "Montrer"
-#: src/gui/popupmenu.cpp:1883
+#: src/gui/popupmenu.cpp:1933
msgid "Reset yellow bar"
msgstr "Remise aux valeurs de défaut de la barre jaune"
-#: src/gui/popupmenu.cpp:1885 src/gui/statuswindow.cpp:240
+#: src/gui/popupmenu.cpp:1935 src/gui/statuswindow.cpp:241
msgid "Copy to chat"
msgstr "Copier dans la conversation"
-#: src/gui/popupmenu.cpp:1903 src/gui/socialwindow.cpp:854
-#: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
+#: src/gui/popupmenu.cpp:1953 src/gui/socialwindow.cpp:958
+#: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028
msgid "(default)"
msgstr "(défaut)"
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1933
+#: src/gui/popupmenu.cpp:1965 src/gui/popupmenu.cpp:1983
msgid "Move up"
msgstr "Aller vers le haut"
-#: src/gui/popupmenu.cpp:1920 src/gui/popupmenu.cpp:1938
+#: src/gui/popupmenu.cpp:1970 src/gui/popupmenu.cpp:1988
msgid "Move down"
msgstr "Aller vers le bas"
-#: src/gui/quitdialog.cpp:56
+#: src/gui/quitdialog.cpp:51
msgid "Switch server"
msgstr "Changer de serveur"
-#: src/gui/quitdialog.cpp:57
+#: src/gui/quitdialog.cpp:52
msgid "Switch character"
msgstr "Changer de personnage"
@@ -1625,64 +1629,64 @@ msgstr "Le mot de passe doit faire moins de %d caractères."
msgid "Passwords do not match."
msgstr "Les deux mots de passe sont différents"
-#: src/gui/serverdialog.cpp:231
+#: src/gui/serverdialog.cpp:237
msgid "Choose Your Server"
msgstr "Choisissez le serveur"
-#: src/gui/serverdialog.cpp:242
+#: src/gui/serverdialog.cpp:248
msgid "Choose Your Server *** SAFE MODE ***"
msgstr "Choisissez votre serveur *** Mode Sûr ***"
-#: src/gui/serverdialog.cpp:247
+#: src/gui/serverdialog.cpp:253
msgid "Port:"
msgstr "Port :"
-#: src/gui/serverdialog.cpp:251
+#: src/gui/serverdialog.cpp:257
msgid "Use same ip for game sub servers"
msgstr "Utiliser la même ip pour les sous-serveurs de jeu"
-#: src/gui/serverdialog.cpp:265
+#: src/gui/serverdialog.cpp:271
msgid "Server type:"
msgstr "Type de Serveur :"
-#: src/gui/serverdialog.cpp:289
+#: src/gui/serverdialog.cpp:295
msgid "Load"
msgstr "Charger"
-#: src/gui/serverdialog.cpp:290
+#: src/gui/serverdialog.cpp:296
msgid "Connect"
msgstr "Connexion..."
-#: src/gui/serverdialog.cpp:291
+#: src/gui/serverdialog.cpp:297
msgid "Custom Server"
msgstr "Serveur personnalisé"
-#: src/gui/serverdialog.cpp:396
+#: src/gui/serverdialog.cpp:402
msgid "Please type both the address and the port of a server."
msgstr "Veuillez entrer l'adresse et le port du serveur."
-#: src/gui/serverdialog.cpp:554
+#: src/gui/serverdialog.cpp:560
#, c-format
msgid "Downloading server list...%2.2f%%"
msgstr "Téléchargement de la liste des serveurs...%2.2f%%"
-#: src/gui/serverdialog.cpp:559
+#: src/gui/serverdialog.cpp:565
msgid "Waiting for server..."
msgstr "En attente du serveur..."
-#: src/gui/serverdialog.cpp:563
+#: src/gui/serverdialog.cpp:569
msgid "Preparing download"
msgstr "Préparation du téléchargement"
-#: src/gui/serverdialog.cpp:567
+#: src/gui/serverdialog.cpp:573
msgid "Error retreiving server list!"
msgstr "Erreur lors du téléchargement de la liste de serveur !"
-#: src/gui/serverdialog.cpp:672
+#: src/gui/serverdialog.cpp:678
msgid "requires a newer version"
msgstr "requiert une nouvelle version"
-#: src/gui/serverdialog.cpp:674
+#: src/gui/serverdialog.cpp:680
#, c-format
msgid "requires v%s"
msgstr "requiert la v%s"
@@ -1828,6 +1832,14 @@ msgstr "Temps"
msgid "Use local time"
msgstr "Utiliser l’horaire local"
+#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:157
+msgid "Other"
+msgstr "Autre"
+
+#: src/gui/setup_chat.cpp:125
+msgid "Highlight words (separated by comma)"
+msgstr ""
+
#: src/gui/setup_colors.cpp:49
msgid "This is what the color looks like"
msgstr "Voilà à quoi ressemble cette couleur"
@@ -1875,11 +1887,11 @@ msgstr "Bleu : "
msgid "Alpha:"
msgstr "Opacité : "
-#: src/gui/setup.cpp:70
+#: src/gui/setup.cpp:71
msgid "Apply"
msgstr "Appliquer"
-#: src/gui/setup.cpp:73
+#: src/gui/setup.cpp:74
msgid "Reset Windows"
msgstr "Rétablir les fenêtres"
@@ -2056,34 +2068,42 @@ msgid "Log NPC dialogue"
msgstr "Enregistrer les conversations des PNJ"
#: src/gui/setup_other.cpp:148
-msgid "Other"
-msgstr "Autre"
+msgid "Bots support"
+msgstr ""
#: src/gui/setup_other.cpp:150
+msgid "Enable auction bot support"
+msgstr ""
+
+#: src/gui/setup_other.cpp:153
+msgid "Enable guild bot support and disable native guild support"
+msgstr ""
+
+#: src/gui/setup_other.cpp:159
msgid "Enable server side attack"
msgstr "Activer l'attaque de la part du serveur"
-#: src/gui/setup_other.cpp:153
+#: src/gui/setup_other.cpp:162
msgid "Enable bot checker"
msgstr "Activer le testeur de robots"
-#: src/gui/setup_other.cpp:156
+#: src/gui/setup_other.cpp:165
msgid "Enable buggy servers protection"
msgstr "Activer la protection contre les serveurs instables"
-#: src/gui/setup_other.cpp:159
+#: src/gui/setup_other.cpp:168
msgid "Enable debug log"
msgstr "Activer l'enregistrement des informations"
-#: src/gui/setup_other.cpp:162
+#: src/gui/setup_other.cpp:171
msgid "Low traffic mode"
msgstr "Mode traffic faible"
-#: src/gui/setup_other.cpp:165
+#: src/gui/setup_other.cpp:174
msgid "Hide shield sprite"
msgstr "Cacher le bouclier"
-#: src/gui/setup_other.cpp:168
+#: src/gui/setup_other.cpp:177
msgid "Show background"
msgstr "Montrer le fond"
@@ -2179,6 +2199,10 @@ msgstr "Montrer les Status"
msgid "Show ip addresses on screenshots"
msgstr ""
+#: src/gui/setup_players.cpp:81
+msgid "Allow self heal with mouse click"
+msgstr ""
+
#: src/gui/setup_relations.cpp:65
msgid "Relation"
msgstr "Relation"
@@ -2459,265 +2483,270 @@ msgstr "Paramètres d'effet de particules modifiés."
msgid "Changes will take effect on map change."
msgstr "Les changements seront appliqués au changement de carte."
-#: src/gui/shopwindow.cpp:74
+#: src/gui/shopwindow.cpp:75
msgid "Personal Shop"
msgstr "Boutique personnelle"
-#: src/gui/shopwindow.cpp:116
+#: src/gui/shopwindow.cpp:118
msgid "Buy items"
msgstr "Acheter des objets"
-#: src/gui/shopwindow.cpp:117
+#: src/gui/shopwindow.cpp:119
msgid "Sell items"
msgstr "Vendre des objets"
-#: src/gui/shopwindow.cpp:119 src/gui/shopwindow.cpp:122
-#: src/gui/tradewindow.cpp:88
+#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
+#: src/gui/tradewindow.cpp:89
msgid "Add"
msgstr "Ajouter"
-#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
+#: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
msgid "Announce"
msgstr "Annoncer"
-#: src/gui/shopwindow.cpp:125
+#: src/gui/shopwindow.cpp:127
msgid "Show links in announce"
msgstr "Montrer les liens dans l'annonce"
-#: src/gui/shopwindow.cpp:723 src/net/ea/tradehandler.cpp:106
+#: src/gui/shopwindow.cpp:148 src/gui/shopwindow.cpp:149
+msgid "Auction"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:748 src/net/ea/tradehandler.cpp:106
#: src/net/manaserv/tradehandler.cpp:127
msgid "Request for Trade"
msgstr "Demande d'échange"
-#: src/gui/shopwindow.cpp:724
+#: src/gui/shopwindow.cpp:749
#, c-format
msgid "%s wants to %s %s do you accept?"
msgstr "%s souhaite %s %s Acceptez-vous ?"
-#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:81
+#: src/gui/skilldialog.cpp:276 src/gui/windowmenu.cpp:81
msgid "Skills"
msgstr "Compétences"
-#: src/gui/skilldialog.cpp:283
+#: src/gui/skilldialog.cpp:288
msgid "Up"
msgstr "Augmenter"
-#: src/gui/skilldialog.cpp:336
+#: src/gui/skilldialog.cpp:341
#, c-format
msgid "Skill points available: %d"
msgstr "Points de compétences : %d"
-#: src/gui/skilldialog.cpp:413
+#: src/gui/skilldialog.cpp:418
#, c-format
msgid "Skill Set %d"
msgstr "Compétence choisie : %d"
-#: src/gui/skilldialog.cpp:425
+#: src/gui/skilldialog.cpp:430
#, c-format
msgid "Skill %d"
msgstr "Compétence %d"
-#: src/gui/skilldialog.cpp:492 src/gui/skilldialog.cpp:545
+#: src/gui/skilldialog.cpp:497 src/gui/skilldialog.cpp:550
#, c-format
msgid "Lvl: %d"
msgstr "Niveau : %d"
-#: src/gui/skilldialog.cpp:537
+#: src/gui/skilldialog.cpp:542
#, c-format
msgid "Lvl: %d (%+d)"
msgstr "Niveau : %d (%+d)"
-#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
+#: src/gui/socialwindow.cpp:118 src/gui/socialwindow.cpp:216
+#: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52
msgid "Guild"
msgstr "Guilde"
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:147
#, c-format
msgid "Invited user %s to guild %s."
msgstr "Le joueur %s a été invité dans la guilde %s."
-#: src/gui/socialwindow.cpp:160
+#: src/gui/socialwindow.cpp:161
#, c-format
msgid "Guild %s quit requested."
msgstr "Demande pour quitter la guilde %s effectuée."
-#: src/gui/socialwindow.cpp:187
+#: src/gui/socialwindow.cpp:188
msgid "Member Invite to Guild"
msgstr "Inviter le membre de la guilde"
-#: src/gui/socialwindow.cpp:188
+#: src/gui/socialwindow.cpp:189
#, c-format
msgid "Who would you like to invite to guild %s?"
msgstr "Qui voudriez-vous inviter dans la guilde %s ?"
-#: src/gui/socialwindow.cpp:197
+#: src/gui/socialwindow.cpp:198
msgid "Leave Guild?"
msgstr "Quitter la guilde ?"
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:199
#, c-format
msgid "Are you sure you want to leave guild %s?"
msgstr "Êtes-vous sûr de vouloir quitter la guilde %s ?"
-#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:319 src/net/ea/gui/partytab.cpp:50
msgid "Party"
msgstr "Groupe"
-#: src/gui/socialwindow.cpp:243
+#: src/gui/socialwindow.cpp:347
#, c-format
msgid "Invited user %s to party."
msgstr "/party > Inviter l'utilisateur %s dans le groupe."
-#: src/gui/socialwindow.cpp:257
+#: src/gui/socialwindow.cpp:361
#, c-format
msgid "Party %s quit requested."
msgstr "Vous avez demandé à quitter le groupe %s."
-#: src/gui/socialwindow.cpp:284
+#: src/gui/socialwindow.cpp:388
msgid "Member Invite to Party"
msgstr "Inviter un joueur dans le groupe"
-#: src/gui/socialwindow.cpp:285
+#: src/gui/socialwindow.cpp:389
#, c-format
msgid "Who would you like to invite to party %s?"
msgstr "Qui voudriez vous inviter dans le groupe %s ?"
-#: src/gui/socialwindow.cpp:294
+#: src/gui/socialwindow.cpp:398
msgid "Leave Party?"
msgstr "Quitter le groupe ?"
-#: src/gui/socialwindow.cpp:295
+#: src/gui/socialwindow.cpp:399
#, c-format
msgid "Are you sure you want to leave party %s?"
msgstr "Êtes-vous sûr de vouloir quitter le groupe %s ?"
-#: src/gui/socialwindow.cpp:521
+#: src/gui/socialwindow.cpp:625
msgid "Nav"
msgstr "Nav"
-#: src/gui/socialwindow.cpp:799
+#: src/gui/socialwindow.cpp:903
msgid "Atk"
msgstr "Atq"
-#: src/gui/socialwindow.cpp:840
+#: src/gui/socialwindow.cpp:944
msgid "Priority mobs"
msgstr "Monstres prioritaires"
-#: src/gui/socialwindow.cpp:872
+#: src/gui/socialwindow.cpp:976
msgid "Attack mobs"
msgstr "Attaquer les monstres"
-#: src/gui/socialwindow.cpp:907
+#: src/gui/socialwindow.cpp:1011
msgid "Ignore mobs"
msgstr "Ignorer les monstres"
-#: src/gui/socialwindow.cpp:970
+#: src/gui/socialwindow.cpp:1074
msgid "Create Guild"
msgstr "Créer une Guilde"
-#: src/gui/socialwindow.cpp:971 src/gui/socialwindow.cpp:1387
+#: src/gui/socialwindow.cpp:1075 src/gui/socialwindow.cpp:1503
msgid "Create Party"
msgstr "Créer un groupe"
-#: src/gui/socialwindow.cpp:1013 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1117 src/gui/windowmenu.cpp:93
msgid "Social"
msgstr "Social"
-#: src/gui/socialwindow.cpp:1034
+#: src/gui/socialwindow.cpp:1140
msgid "Invite"
msgstr "Inviter"
-#: src/gui/socialwindow.cpp:1176
+#: src/gui/socialwindow.cpp:1286
#, c-format
msgid "Accepted party invite from %s."
msgstr "Invitation dans le groupe acceptée de la part de %s."
-#: src/gui/socialwindow.cpp:1186
+#: src/gui/socialwindow.cpp:1296
#, c-format
msgid "Rejected party invite from %s."
msgstr "Invitation dans le groupe de la part de %s refusée."
-#: src/gui/socialwindow.cpp:1203
+#: src/gui/socialwindow.cpp:1313
#, c-format
msgid "Accepted guild invite from %s."
msgstr "Invitation dans la guilde acceptée de la part de %s."
-#: src/gui/socialwindow.cpp:1213
+#: src/gui/socialwindow.cpp:1326
#, c-format
msgid "Rejected guild invite from %s."
msgstr "Invitation dans la guilde de la part de %s refusée."
-#: src/gui/socialwindow.cpp:1257
+#: src/gui/socialwindow.cpp:1373
#, c-format
msgid "Creating guild called %s."
msgstr "La guilde %s a été créée."
-#: src/gui/socialwindow.cpp:1280
+#: src/gui/socialwindow.cpp:1396
#, c-format
msgid "Creating party called %s."
msgstr "Le groupe %s a été créé."
-#: src/gui/socialwindow.cpp:1294
+#: src/gui/socialwindow.cpp:1410
msgid "Guild Name"
msgstr "Nom de la guilde"
-#: src/gui/socialwindow.cpp:1295
+#: src/gui/socialwindow.cpp:1411
msgid "Choose your guild's name."
msgstr "Choisissez le nom de la guilde."
-#: src/gui/socialwindow.cpp:1309
+#: src/gui/socialwindow.cpp:1425
msgid "Received guild request, but one already exists."
msgstr ""
"Vous avez reçu une invitation pour rejoindre une guilde, mais vous êtes déjà "
"dans une."
-#: src/gui/socialwindow.cpp:1315
+#: src/gui/socialwindow.cpp:1431
#, c-format
msgid "%s has invited you to join the guild %s."
msgstr "%s vous a invité à rejoindre la guilde %s."
-#: src/gui/socialwindow.cpp:1321
+#: src/gui/socialwindow.cpp:1437
msgid "Accept Guild Invite"
msgstr "Accepter l'invitation dans cette guilde"
-#: src/gui/socialwindow.cpp:1336
+#: src/gui/socialwindow.cpp:1452
msgid "Received party request, but one already exists."
msgstr ""
"Vous avez reçu une invitation pour rejoindre un groupe, mais vous êtes déjà "
"dans un groupe."
-#: src/gui/socialwindow.cpp:1347
+#: src/gui/socialwindow.cpp:1463
msgid "You have been invited you to join a party."
msgstr "Vous avez été invité à rejoindre un groupe."
-#: src/gui/socialwindow.cpp:1351
+#: src/gui/socialwindow.cpp:1467
#, c-format
msgid "You have been invited to join the %s party."
msgstr "Vous avez été invité à rejoindre le groupe %s."
-#: src/gui/socialwindow.cpp:1359
+#: src/gui/socialwindow.cpp:1475
#, c-format
msgid "%s has invited you to join their party."
msgstr "%s vous a invité à rejoindre son groupe."
-#: src/gui/socialwindow.cpp:1364
+#: src/gui/socialwindow.cpp:1480
#, c-format
msgid "%s has invited you to join the %s party."
msgstr "%s vous a invité à rejoindre le groupe %s."
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1489
msgid "Accept Party Invite"
msgstr "Accepter l'invitation pour ce groupe"
-#: src/gui/socialwindow.cpp:1388
+#: src/gui/socialwindow.cpp:1504
msgid "Cannot create party. You are already in a party"
msgstr "Ne peut pas créer un groupe. Vous faites déjà partie d'un groupe."
-#: src/gui/socialwindow.cpp:1393
+#: src/gui/socialwindow.cpp:1509
msgid "Party Name"
msgstr "Nom du groupe"
-#: src/gui/socialwindow.cpp:1394
+#: src/gui/socialwindow.cpp:1510
msgid "Choose your party's name."
msgstr "Choisissez le nom du groupe."
@@ -2725,418 +2754,418 @@ msgstr "Choisissez le nom du groupe."
msgid "Specials"
msgstr "Cpt. spéciales"
-#: src/gui/statuspopup.cpp:197
+#: src/gui/statuspopup.cpp:198
msgid "(D) default moves"
msgstr "(D) Mouvements par défaut"
-#: src/gui/statuspopup.cpp:202
+#: src/gui/statuspopup.cpp:203
msgid "(I) invert moves"
msgstr "(I) Mouvements inversés"
-#: src/gui/statuspopup.cpp:207
+#: src/gui/statuspopup.cpp:208
msgid "(c) moves with some crazy moves"
msgstr "(c) Mouvements un peu fous"
-#: src/gui/statuspopup.cpp:212
+#: src/gui/statuspopup.cpp:213
msgid "(C) moves with crazy moves"
msgstr "(C) Mouvement complètement fous"
-#: src/gui/statuspopup.cpp:217
+#: src/gui/statuspopup.cpp:218
msgid "(d) double normal + crazy"
msgstr "(d) double normal et fou"
-#: src/gui/statuspopup.cpp:222
+#: src/gui/statuspopup.cpp:223
msgid "(?) move"
msgstr "(?) Mouvements"
-#: src/gui/statuspopup.cpp:240
+#: src/gui/statuspopup.cpp:241
msgid "(a) custom crazy move"
msgstr "(a) Mouvements fous personnalisés"
-#: src/gui/statuspopup.cpp:244
+#: src/gui/statuspopup.cpp:245
msgid "(?) crazy move"
msgstr "(?) Mouvements fous"
-#: src/gui/statuspopup.cpp:254
+#: src/gui/statuspopup.cpp:255
msgid "(0) default moves to target"
msgstr "(0) Aller à la cible distante par défaut"
-#: src/gui/statuspopup.cpp:259
+#: src/gui/statuspopup.cpp:260
msgid "(1) moves to target in distance 1"
msgstr "(1) Aller à la cible en distante de 1"
-#: src/gui/statuspopup.cpp:264
+#: src/gui/statuspopup.cpp:265
msgid "(2) moves to target in distance 2"
msgstr "(2) Aller vers la cible jusqu'à 2 de distance"
-#: src/gui/statuspopup.cpp:269
+#: src/gui/statuspopup.cpp:270
msgid "(3) moves to target in distance 3"
msgstr "(3) Aller à la cible en distante de 3"
-#: src/gui/statuspopup.cpp:274
+#: src/gui/statuspopup.cpp:275
msgid "(5) moves to target in distance 5"
msgstr "(5) Aller à la cible en distante de 5"
-#: src/gui/statuspopup.cpp:279
+#: src/gui/statuspopup.cpp:280
msgid "(7) moves to target in distance 7"
msgstr "(7) Aller à la cible en distante de 7"
-#: src/gui/statuspopup.cpp:284
+#: src/gui/statuspopup.cpp:285
msgid "(A) moves to target in attack range"
msgstr "(A) Aller à la cible dans le champ d'attaque"
-#: src/gui/statuspopup.cpp:289
+#: src/gui/statuspopup.cpp:290
msgid "(?) move to target"
msgstr "(?) Aller à la cible"
-#: src/gui/statuspopup.cpp:297
+#: src/gui/statuspopup.cpp:298
msgid "(D) default follow"
msgstr "(D) Suivre : défaut"
-#: src/gui/statuspopup.cpp:301
+#: src/gui/statuspopup.cpp:302
msgid "(R) relative follow"
msgstr "(R) Suivre: mouvement relatif"
-#: src/gui/statuspopup.cpp:305
+#: src/gui/statuspopup.cpp:306
msgid "(M) mirror follow"
msgstr "(M) Suivre effet miroir"
-#: src/gui/statuspopup.cpp:309
+#: src/gui/statuspopup.cpp:310
msgid "(P) pet follow"
msgstr "(P) Suivre comme un toutou"
-#: src/gui/statuspopup.cpp:313
+#: src/gui/statuspopup.cpp:314
msgid "(?) unknown follow"
msgstr "(?) Suivre : mode inconnu"
-#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
+#: src/gui/statuspopup.cpp:323 src/gui/statuspopup.cpp:346
msgid "(D) default attack"
msgstr "(D) Attaque : défaut"
-#: src/gui/statuspopup.cpp:327
+#: src/gui/statuspopup.cpp:328
msgid "(s) switch attack without shield"
msgstr "(s) Attaquer sans protection"
-#: src/gui/statuspopup.cpp:332
+#: src/gui/statuspopup.cpp:333
msgid "(S) switch attack with shield"
msgstr "(S) Attaquer avec protection"
-#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
+#: src/gui/statuspopup.cpp:337 src/gui/statuspopup.cpp:362
msgid "(?) attack"
msgstr "(?) Attaque"
-#: src/gui/statuspopup.cpp:349
+#: src/gui/statuspopup.cpp:350
msgid "(G) go and attack"
msgstr "(G) Se déplacer et attaquer"
-#: src/gui/statuspopup.cpp:353
+#: src/gui/statuspopup.cpp:354
msgid "(A) go, attack, pickup"
msgstr "(A) Se déplacer, attaquer et ramasser"
-#: src/gui/statuspopup.cpp:357
+#: src/gui/statuspopup.cpp:358
msgid "(d) without auto attack"
msgstr "(d) Sans attaque automatique"
-#: src/gui/statuspopup.cpp:375
+#: src/gui/statuspopup.cpp:376
msgid "(S) small pick up 1x1 cells"
msgstr "(S) Ramassage sur 1x1 case"
-#: src/gui/statuspopup.cpp:379
+#: src/gui/statuspopup.cpp:380
msgid "(D) default pick up 2x1 cells"
msgstr "(D) Ramassage par défaut sur 2x1 cases"
-#: src/gui/statuspopup.cpp:383
+#: src/gui/statuspopup.cpp:384
msgid "(F) forward pick up 2x3 cells"
msgstr "(F) Ramassage avant sur 2x3 cases"
-#: src/gui/statuspopup.cpp:387
+#: src/gui/statuspopup.cpp:388
msgid "(3) pick up 3x3 cells"
msgstr "(3) Ramassage sur 3x3 cases"
-#: src/gui/statuspopup.cpp:391
+#: src/gui/statuspopup.cpp:392
msgid "(g) go and pick up in distance 4"
msgstr "(g) Aller et ramasser jusqu'à 4 de distance"
-#: src/gui/statuspopup.cpp:395
+#: src/gui/statuspopup.cpp:396
msgid "(G) go and pick up in distance 8"
msgstr "(G) Aller et ramasser jusqu'à 8 de distance"
-#: src/gui/statuspopup.cpp:399
+#: src/gui/statuspopup.cpp:400
msgid "(A) go and pick up in max distance"
msgstr "(A) Aller et ramasser jusqu'à la distance max"
-#: src/gui/statuspopup.cpp:403
+#: src/gui/statuspopup.cpp:404
msgid "(?) pick up"
msgstr "(?) Ramassage"
-#: src/gui/statuspopup.cpp:412
+#: src/gui/statuspopup.cpp:413
msgid "(N) normal map view"
msgstr "(N) Vue normale du jeu"
-#: src/gui/statuspopup.cpp:416
+#: src/gui/statuspopup.cpp:417
msgid "(D) debug map view"
msgstr "(D) Vue du jeu mode déverminage"
-#: src/gui/statuspopup.cpp:420
+#: src/gui/statuspopup.cpp:421
msgid "(u) ultra map view"
msgstr "(u) Vue du jeu mode Ultra 1"
-#: src/gui/statuspopup.cpp:424
+#: src/gui/statuspopup.cpp:425
msgid "(U) ultra map view 2"
msgstr "(u) Vue du jeu mode Ultra 2"
-#: src/gui/statuspopup.cpp:428
+#: src/gui/statuspopup.cpp:429
msgid "(e) empty map view"
msgstr "(e) Vue de la carte vide"
-#: src/gui/statuspopup.cpp:432
+#: src/gui/statuspopup.cpp:433
msgid "(b) black & white map view"
msgstr "(b) Vue de la carte en N&B"
-#: src/gui/statuspopup.cpp:436
+#: src/gui/statuspopup.cpp:437
msgid "(?) map view"
msgstr "(?) Carte"
-#: src/gui/statuspopup.cpp:444
+#: src/gui/statuspopup.cpp:445
msgid "(f) use #flar for magic attack"
msgstr "(f) Utiliser #flar comme sort d'attaque"
-#: src/gui/statuspopup.cpp:449
+#: src/gui/statuspopup.cpp:450
msgid "(c) use #chiza for magic attack"
msgstr "(c) Utiliser #chiza comme sort d'attaque"
-#: src/gui/statuspopup.cpp:454
+#: src/gui/statuspopup.cpp:455
msgid "(I) use #ingrav for magic attack"
msgstr "(I) Utiliser #ingrav comme sort d'attaque"
-#: src/gui/statuspopup.cpp:459
+#: src/gui/statuspopup.cpp:460
msgid "(F) use #frillyar for magic attack"
msgstr "(F) Utiliser #frillyar comme sort d'attaque"
-#: src/gui/statuspopup.cpp:464
+#: src/gui/statuspopup.cpp:465
msgid "(U) use #upmarmu for magic attack"
msgstr "(U) Utiliser #upmarmu comme sort d'attaque"
-#: src/gui/statuspopup.cpp:468
+#: src/gui/statuspopup.cpp:469
msgid "(?) magic attack"
msgstr "(?) Sorts d'attaque"
-#: src/gui/statuspopup.cpp:477
+#: src/gui/statuspopup.cpp:478
msgid "(D) default imitation"
msgstr "(D) Imitation par défaut"
-#: src/gui/statuspopup.cpp:481
+#: src/gui/statuspopup.cpp:482
msgid "(O) outfits imitation"
msgstr "(O) Imiter les équipements"
-#: src/gui/statuspopup.cpp:485
+#: src/gui/statuspopup.cpp:486
msgid "(?) imitation"
msgstr "(?) Imitation"
-#: src/gui/statuspopup.cpp:494
+#: src/gui/statuspopup.cpp:495
msgid "(O) on keyboard"
msgstr "(O) Présent sur le jeu"
-#: src/gui/statuspopup.cpp:497
+#: src/gui/statuspopup.cpp:498
msgid "(A) away"
msgstr "(A) Absent"
-#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
+#: src/gui/statuspopup.cpp:501 src/gui/statuspopup.cpp:521
msgid "(?) away"
msgstr "(?) Absent"
-#: src/gui/statuspopup.cpp:508
+#: src/gui/statuspopup.cpp:509
msgid "(G) game camera mode"
msgstr "(G) Mode camera du jeu"
-#: src/gui/statuspopup.cpp:512
+#: src/gui/statuspopup.cpp:513
msgid "(F) free camera mode"
msgstr "(F) Mode camera libre"
-#: src/gui/statuspopup.cpp:516
+#: src/gui/statuspopup.cpp:517
msgid "(D) design camera mode"
msgstr "(D) Définir le mode camera"
-#: src/gui/statuspopup.cpp:527
+#: src/gui/statuspopup.cpp:528
msgid "Game modifiers are disabled"
msgstr "Modificateurs de mode de jeu désactivés"
-#: src/gui/statuspopup.cpp:532
+#: src/gui/statuspopup.cpp:533
msgid "Game modifiers are enabled"
msgstr "Modificateurs de mode de jeu activés"
-#: src/gui/statuswindow.cpp:142 src/gui/statuswindow.cpp:272
-#: src/gui/statuswindow.cpp:335
+#: src/gui/statuswindow.cpp:143 src/gui/statuswindow.cpp:273
+#: src/gui/statuswindow.cpp:336
#, c-format
msgid "Level: %d"
msgstr "Niveau : %d"
-#: src/gui/statuswindow.cpp:143 src/gui/statuswindow.cpp:258
-#: src/gui/statuswindow.cpp:302
+#: src/gui/statuswindow.cpp:144 src/gui/statuswindow.cpp:259
+#: src/gui/statuswindow.cpp:303
#, c-format
msgid "Money: %s"
msgstr "Argent : %s"
-#: src/gui/statuswindow.cpp:149
+#: src/gui/statuswindow.cpp:150
msgid "HP:"
msgstr "Vie :"
-#: src/gui/statuswindow.cpp:156
+#: src/gui/statuswindow.cpp:157
msgid "Exp:"
msgstr "Exp :"
-#: src/gui/statuswindow.cpp:170
+#: src/gui/statuswindow.cpp:171
msgid "MP:"
msgstr "PM :"
-#: src/gui/statuswindow.cpp:202 src/gui/statuswindow.cpp:385
+#: src/gui/statuswindow.cpp:203 src/gui/statuswindow.cpp:386
#, c-format
msgid "Job: %d"
msgstr "Métier : %d"
-#: src/gui/statuswindow.cpp:203
+#: src/gui/statuswindow.cpp:204
msgid "Job:"
msgstr "Compétences :"
-#: src/gui/statuswindow.cpp:261 src/gui/statuswindow.cpp:309
+#: src/gui/statuswindow.cpp:262 src/gui/statuswindow.cpp:310
#, c-format
msgid "Character points: %d"
msgstr "Points de caractéristiques du personnage : %d"
-#: src/gui/statuswindow.cpp:267
+#: src/gui/statuswindow.cpp:268
#, c-format
msgid "Level: %d (GM %d)"
msgstr "Niveau : %d (GM %d)"
-#: src/gui/statuswindow.cpp:323
+#: src/gui/statuswindow.cpp:324
#, c-format
msgid "Correction points: %d"
msgstr "Points de correction : %d"
-#: src/gui/statuswindow.cpp:646 src/gui/statuswindow.cpp:711
-#: src/gui/statuswindow.cpp:731 src/gui/statuswindow.cpp:747
-#: src/gui/statuswindow.cpp:793 src/gui/statuswindow.cpp:822
-#: src/gui/statuswindow.cpp:845 src/gui/statuswindow.cpp:864
+#: src/gui/statuswindow.cpp:647 src/gui/statuswindow.cpp:712
+#: src/gui/statuswindow.cpp:732 src/gui/statuswindow.cpp:748
+#: src/gui/statuswindow.cpp:794 src/gui/statuswindow.cpp:823
+#: src/gui/statuswindow.cpp:846 src/gui/statuswindow.cpp:865
msgid "(D)"
msgstr "(D)"
-#: src/gui/statuswindow.cpp:649 src/gui/statuswindow.cpp:772
+#: src/gui/statuswindow.cpp:650 src/gui/statuswindow.cpp:773
msgid "(I)"
msgstr "(I)"
-#: src/gui/statuswindow.cpp:652 src/gui/statuswindow.cpp:769
+#: src/gui/statuswindow.cpp:653 src/gui/statuswindow.cpp:770
msgid "(c)"
msgstr "(c)"
-#: src/gui/statuswindow.cpp:655
+#: src/gui/statuswindow.cpp:656
msgid "(C)"
msgstr "(C)"
-#: src/gui/statuswindow.cpp:658 src/gui/statuswindow.cpp:756
+#: src/gui/statuswindow.cpp:659 src/gui/statuswindow.cpp:757
msgid "(d)"
msgstr "(d)"
-#: src/gui/statuswindow.cpp:661 src/gui/statuswindow.cpp:675
-#: src/gui/statuswindow.cpp:704 src/gui/statuswindow.cpp:723
-#: src/gui/statuswindow.cpp:740 src/gui/statuswindow.cpp:759
-#: src/gui/statuswindow.cpp:781 src/gui/statuswindow.cpp:811
-#: src/gui/statuswindow.cpp:837 src/gui/statuswindow.cpp:851
-#: src/gui/statuswindow.cpp:867 src/gui/statuswindow.cpp:880
+#: src/gui/statuswindow.cpp:662 src/gui/statuswindow.cpp:676
+#: src/gui/statuswindow.cpp:705 src/gui/statuswindow.cpp:724
+#: src/gui/statuswindow.cpp:741 src/gui/statuswindow.cpp:760
+#: src/gui/statuswindow.cpp:782 src/gui/statuswindow.cpp:812
+#: src/gui/statuswindow.cpp:838 src/gui/statuswindow.cpp:852
+#: src/gui/statuswindow.cpp:868 src/gui/statuswindow.cpp:881
msgid "(?)"
msgstr "(?)"
-#: src/gui/statuswindow.cpp:672
+#: src/gui/statuswindow.cpp:673
msgid "(a)"
msgstr "(a)"
-#: src/gui/statuswindow.cpp:683
+#: src/gui/statuswindow.cpp:684
msgid "(0)"
msgstr "(0)"
-#: src/gui/statuswindow.cpp:686
+#: src/gui/statuswindow.cpp:687
msgid "(1)"
msgstr "(1)"
-#: src/gui/statuswindow.cpp:689
+#: src/gui/statuswindow.cpp:690
msgid "(2)"
msgstr "(2)"
-#: src/gui/statuswindow.cpp:692 src/gui/statuswindow.cpp:799
+#: src/gui/statuswindow.cpp:693 src/gui/statuswindow.cpp:800
msgid "(3)"
msgstr "(3)"
-#: src/gui/statuswindow.cpp:695
+#: src/gui/statuswindow.cpp:696
msgid "(5)"
msgstr "(5)"
-#: src/gui/statuswindow.cpp:698
+#: src/gui/statuswindow.cpp:699
msgid "(7)"
msgstr "(7)"
-#: src/gui/statuswindow.cpp:701 src/gui/statuswindow.cpp:753
-#: src/gui/statuswindow.cpp:808 src/gui/statuswindow.cpp:877
+#: src/gui/statuswindow.cpp:702 src/gui/statuswindow.cpp:754
+#: src/gui/statuswindow.cpp:809 src/gui/statuswindow.cpp:878
msgid "(A)"
msgstr "(A)"
-#: src/gui/statuswindow.cpp:714
+#: src/gui/statuswindow.cpp:715
msgid "(R)"
msgstr "(R)"
-#: src/gui/statuswindow.cpp:717
+#: src/gui/statuswindow.cpp:718
msgid "(M)"
msgstr "(M)"
-#: src/gui/statuswindow.cpp:720
+#: src/gui/statuswindow.cpp:721
msgid "(P)"
msgstr "(P)"
-#: src/gui/statuswindow.cpp:734
+#: src/gui/statuswindow.cpp:735
msgid "(s)"
msgstr "(s)"
-#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:790
+#: src/gui/statuswindow.cpp:738 src/gui/statuswindow.cpp:791
msgid "(S)"
msgstr "(S)"
-#: src/gui/statuswindow.cpp:750 src/gui/statuswindow.cpp:805
-#: src/gui/statuswindow.cpp:858
+#: src/gui/statuswindow.cpp:751 src/gui/statuswindow.cpp:806
+#: src/gui/statuswindow.cpp:859
msgid "(G)"
msgstr "(G)"
-#: src/gui/statuswindow.cpp:766
+#: src/gui/statuswindow.cpp:767
msgid "(f)"
msgstr "(f)"
-#: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:796
-#: src/gui/statuswindow.cpp:861
+#: src/gui/statuswindow.cpp:776 src/gui/statuswindow.cpp:797
+#: src/gui/statuswindow.cpp:862
msgid "(F)"
msgstr "(F)"
-#: src/gui/statuswindow.cpp:778 src/gui/statuswindow.cpp:828
+#: src/gui/statuswindow.cpp:779 src/gui/statuswindow.cpp:829
msgid "(U)"
msgstr "(U)"
-#: src/gui/statuswindow.cpp:802
+#: src/gui/statuswindow.cpp:803
msgid "(g)"
msgstr "(g)"
-#: src/gui/statuswindow.cpp:819
+#: src/gui/statuswindow.cpp:820
msgid "(N)"
msgstr "(N)"
-#: src/gui/statuswindow.cpp:825
+#: src/gui/statuswindow.cpp:826
msgid "(u)"
msgstr "(u)"
-#: src/gui/statuswindow.cpp:831
+#: src/gui/statuswindow.cpp:832
msgid "(e)"
msgstr "(e)"
-#: src/gui/statuswindow.cpp:834
+#: src/gui/statuswindow.cpp:835
msgid "(b)"
msgstr "(b)"
-#: src/gui/statuswindow.cpp:848 src/gui/statuswindow.cpp:874
+#: src/gui/statuswindow.cpp:849 src/gui/statuswindow.cpp:875
msgid "(O)"
msgstr "(O)"
@@ -3244,24 +3273,24 @@ msgstr "Accepté. En attente..."
msgid "Trade: You"
msgstr "Échange : Vous"
-#: src/gui/tradewindow.cpp:110 src/gui/tradewindow.cpp:166
+#: src/gui/tradewindow.cpp:111 src/gui/tradewindow.cpp:167
#, c-format
msgid "You get %s"
msgstr "Vous recevez %s"
-#: src/gui/tradewindow.cpp:111
+#: src/gui/tradewindow.cpp:112
msgid "You give:"
msgstr "Vous donnez :"
-#: src/gui/tradewindow.cpp:115
+#: src/gui/tradewindow.cpp:116
msgid "Change"
msgstr "Changer"
-#: src/gui/tradewindow.cpp:374
+#: src/gui/tradewindow.cpp:375
msgid "You don't have enough money."
msgstr "Vous n'avez pas assez d'argent."
-#: src/gui/tradewindow.cpp:453
+#: src/gui/tradewindow.cpp:454
msgid "Failed adding item. You can not overlap one kind of item on the window."
msgstr ""
"L'objet ne peux être ajouté. Vous ne pouvez ajouter deux fois le même objet "
@@ -3272,33 +3301,33 @@ msgstr ""
msgid "Name: %s"
msgstr "Nom : %s"
-#: src/gui/updaterwindow.cpp:136
+#: src/gui/updaterwindow.cpp:138
msgid "Updating..."
msgstr "Mise à jour en cours..."
-#: src/gui/updaterwindow.cpp:155
+#: src/gui/updaterwindow.cpp:159
msgid "Connecting..."
msgstr "Connexion..."
-#: src/gui/updaterwindow.cpp:158
+#: src/gui/updaterwindow.cpp:162
msgid "Play"
msgstr "Jouer"
-#: src/gui/updaterwindow.cpp:556
+#: src/gui/updaterwindow.cpp:564
msgid "##1 The update process is incomplete."
msgstr "##1 Le processus de mise à jour n'est pas achevé"
#. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:558
+#: src/gui/updaterwindow.cpp:566
msgid "##1 It is strongly recommended that"
msgstr "##1 Il est fortement recommandé que"
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:560
+#: src/gui/updaterwindow.cpp:568
msgid "##1 you try again later."
msgstr "##1 Essayez à nouveau plus tard"
-#: src/gui/updaterwindow.cpp:686
+#: src/gui/updaterwindow.cpp:744
msgid "Completed"
msgstr "Terminé"
@@ -3450,23 +3479,23 @@ msgstr "Limites de votre position"
msgid "Road Point"
msgstr "Étape"
-#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:471
+#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:472
msgid "Who Is Online - Updating"
msgstr "Qui est en ligne - Mise à jour"
-#: src/gui/whoisonline.cpp:101
+#: src/gui/whoisonline.cpp:102
msgid "Update"
msgstr "Mise à jour"
-#: src/gui/whoisonline.cpp:294
+#: src/gui/whoisonline.cpp:295
msgid "Who Is Online - "
msgstr "Qui est en ligne - "
-#: src/gui/whoisonline.cpp:485
+#: src/gui/whoisonline.cpp:486
msgid "Who Is Online - error"
msgstr "Qui est en ligne - Erreur"
-#: src/gui/whoisonline.cpp:516
+#: src/gui/whoisonline.cpp:517
msgid "Who Is Online - Update"
msgstr "Qui est en ligne - Mise à jour"
@@ -3533,7 +3562,8 @@ msgstr ""
"Cette commande donne les droit d'opérateur du salon à <nom du personnage>"
#: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
-#: src/net/ea/gui/guildtab.cpp:69 src/net/ea/gui/partytab.cpp:85
+#: src/gui/widgets/guildchattab.cpp:61 src/net/ea/gui/guildtab.cpp:69
+#: src/net/ea/gui/partytab.cpp:85
msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
msgstr ""
"Si le <nom du personnage> contient des espaces, entourez le de guillemets "
@@ -3575,6 +3605,41 @@ msgstr "Annonce globale de %s :"
msgid "%s whispers: %s"
msgstr "Message de %s : %s"
+#: src/gui/widgets/guildchattab.cpp:59 src/net/ea/gui/guildtab.cpp:67
+#: src/net/ea/gui/partytab.cpp:83
+msgid "Command: /invite <nick>"
+msgstr "Commande : /invite <nom du personnage>"
+
+#: src/gui/widgets/guildchattab.cpp:60 src/net/ea/gui/guildtab.cpp:68
+msgid "This command invites <nick> to the guild you're in."
+msgstr "Cette commande invite <nom du personnage> à rejoindre votre groupe."
+
+#: src/gui/widgets/guildchattab.cpp:66 src/net/ea/gui/guildtab.cpp:74
+#: src/net/ea/gui/partytab.cpp:90
+msgid "Command: /leave"
+msgstr "Commande : /leave"
+
+#: src/gui/widgets/guildchattab.cpp:67 src/net/ea/gui/guildtab.cpp:75
+msgid "This command causes the player to leave the guild."
+msgstr "Cette commande vous fait quitter la guilde actuelle."
+
+#: src/gui/widgets/guildchattab.cpp:109 src/net/ea/gui/guildtab.cpp:135
+#: src/net/ea/gui/partytab.cpp:69
+msgid "/help > Display this help."
+msgstr "/help > Affiche cette aide."
+
+#: src/gui/widgets/guildchattab.cpp:110 src/net/ea/gui/guildtab.cpp:136
+msgid "/invite > Invite a player to your guild"
+msgstr "/invite > Invite un joueur à rejoindre votre guilde"
+
+#: src/gui/widgets/guildchattab.cpp:111 src/net/ea/gui/guildtab.cpp:137
+msgid "/leave > Leave the guild you are in"
+msgstr "/leave > Quitter la guilde courante"
+
+#: src/gui/widgets/guildchattab.cpp:112 src/net/ea/gui/guildtab.cpp:138
+msgid "/kick > Kick some one from the guild you are in"
+msgstr "/kick > Éjecter quelqu'un du groupe dont vous faites partie"
+
#: src/gui/widgets/setupitem.cpp:271 src/gui/widgets/setupitem.cpp:394
msgid "Edit"
msgstr "Éditer"
@@ -4108,68 +4173,68 @@ msgstr ""
"Conflit entre les touches \"%s\" and \"%s\". Changez au moins l'une des "
"touches ou attendez vous à un possible comportement étrange du jeu."
-#: src/localplayer.cpp:372
+#: src/localplayer.cpp:370
msgid "You were killed by "
msgstr "Vous avez été tué par "
-#: src/localplayer.cpp:1403
+#: src/localplayer.cpp:1401
msgid "Tried to pick up nonexistent item."
msgstr "Vous avez essayé de prendre un item qui n'existe pas."
-#: src/localplayer.cpp:1405
+#: src/localplayer.cpp:1403
msgid "Item is too heavy."
msgstr "L'objet est trop lourd."
-#: src/localplayer.cpp:1407
+#: src/localplayer.cpp:1405
msgid "Item is too far away."
msgstr "L'objet est trop éloigné"
-#: src/localplayer.cpp:1409
+#: src/localplayer.cpp:1407
msgid "Inventory is full."
msgstr "L'inventaire est plein"
-#: src/localplayer.cpp:1411
+#: src/localplayer.cpp:1409
msgid "Stack is too big."
msgstr "La pile est trop grande"
-#: src/localplayer.cpp:1414
+#: src/localplayer.cpp:1412
msgid "Item belongs to someone else."
msgstr "L'objet appartient a quelqu'un d'autre"
-#: src/localplayer.cpp:1417
+#: src/localplayer.cpp:1415
msgid "Unknown problem picking up item."
msgstr "Problème inconnu pour ramasser l'objet."
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1441
+#: src/localplayer.cpp:1439
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
msgstr[0] "Vous avez ramassé %d [@@%d|%s@@]."
msgstr[1] "Vous avez ramassé %d [@@%d|%s@@]."
-#: src/localplayer.cpp:3175
+#: src/localplayer.cpp:3173
msgid "Away"
msgstr "Inactif"
-#: src/localplayer.cpp:3476
+#: src/localplayer.cpp:3474
msgid "Follow: "
msgstr "Suivre : "
-#: src/localplayer.cpp:3478 src/localplayer.cpp:3493
+#: src/localplayer.cpp:3476 src/localplayer.cpp:3491
msgid "Follow canceled"
msgstr "Suivi annulé"
-#: src/localplayer.cpp:3485
+#: src/localplayer.cpp:3483
msgid "Imitation: "
msgstr "Imitation: "
-#: src/localplayer.cpp:3487 src/localplayer.cpp:3495
+#: src/localplayer.cpp:3485 src/localplayer.cpp:3493
msgid "Imitation canceled"
msgstr "Imitation annulée"
-#: src/localplayer.cpp:3847
+#: src/localplayer.cpp:3845
msgid "You see "
msgstr "Vous voyez "
@@ -4354,28 +4419,28 @@ msgstr "Personnage supprimé."
msgid "Failed to delete character."
msgstr "La suppression du personnage n'a pu s'effectuer."
-#: src/net/ea/chathandler.cpp:60 src/net/ea/chathandler.cpp:66
-#: src/net/ea/chathandler.cpp:71 src/net/ea/chathandler.cpp:77
-#: src/net/ea/chathandler.cpp:82 src/net/ea/chathandler.cpp:88
-#: src/net/ea/chathandler.cpp:95 src/net/ea/chathandler.cpp:101
+#: src/net/ea/chathandler.cpp:61 src/net/ea/chathandler.cpp:67
+#: src/net/ea/chathandler.cpp:72 src/net/ea/chathandler.cpp:78
+#: src/net/ea/chathandler.cpp:83 src/net/ea/chathandler.cpp:89
+#: src/net/ea/chathandler.cpp:96 src/net/ea/chathandler.cpp:102
msgid "Channels are not supported!"
msgstr "Les salons ne sont pas gérés !"
-#: src/net/ea/chathandler.cpp:128
+#: src/net/ea/chathandler.cpp:129
#, c-format
msgid "Whisper could not be sent, %s is offline."
msgstr "Le message n'a pu être envoyé, %s n'est pas en ligne."
-#: src/net/ea/chathandler.cpp:136
+#: src/net/ea/chathandler.cpp:137
#, c-format
msgid "Whisper could not be sent, ignored by %s."
msgstr "Le message privé n'a pu être envoyé, vous êtes ignoré par %s."
-#: src/net/ea/chathandler.cpp:348
+#: src/net/ea/chathandler.cpp:355
msgid "MVP player."
msgstr "Joueur MVP"
-#: src/net/ea/chathandler.cpp:352
+#: src/net/ea/chathandler.cpp:359
msgid "MVP player: "
msgstr "MVP joueur :"
@@ -4392,38 +4457,6 @@ msgstr "Jeu"
msgid "Request to quit denied!"
msgstr "Requête de départ refusée !"
-#: src/net/ea/gui/guildtab.cpp:67 src/net/ea/gui/partytab.cpp:83
-msgid "Command: /invite <nick>"
-msgstr "Commande : /invite <nom du personnage>"
-
-#: src/net/ea/gui/guildtab.cpp:68
-msgid "This command invites <nick> to the guild you're in."
-msgstr "Cette commande invite <nom du personnage> à rejoindre votre groupe."
-
-#: src/net/ea/gui/guildtab.cpp:74 src/net/ea/gui/partytab.cpp:90
-msgid "Command: /leave"
-msgstr "Commande : /leave"
-
-#: src/net/ea/gui/guildtab.cpp:75
-msgid "This command causes the player to leave the guild."
-msgstr "Cette commande vous fait quitter la guilde actuelle."
-
-#: src/net/ea/gui/guildtab.cpp:135 src/net/ea/gui/partytab.cpp:69
-msgid "/help > Display this help."
-msgstr "/help > Affiche cette aide."
-
-#: src/net/ea/gui/guildtab.cpp:136
-msgid "/invite > Invite a player to your guild"
-msgstr "/invite > Invite un joueur à rejoindre votre guilde"
-
-#: src/net/ea/gui/guildtab.cpp:137
-msgid "/leave > Leave the guild you are in"
-msgstr "/leave > Quitter la guilde courante"
-
-#: src/net/ea/gui/guildtab.cpp:138
-msgid "/kick > Kick some one from the guild you are in"
-msgstr "/kick > Éjecter quelqu'un du groupe dont vous faites partie"
-
#: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
msgid "Guild created."
msgstr "Guilde créée."
@@ -4440,85 +4473,81 @@ msgstr "Erreur dans la création de la guilde."
msgid "Unknown server response."
msgstr "Réponse inconnue du serveur."
-#: src/net/ea/guildhandler.cpp:180
+#: src/net/ea/guildhandler.cpp:181
#, c-format
msgid "Guild name: %s"
msgstr "Nom de la guilde : %s"
-#: src/net/ea/guildhandler.cpp:182
+#: src/net/ea/guildhandler.cpp:183
#, c-format
msgid "Guild master: %s"
msgstr "Maître de la guilde : %s"
-#: src/net/ea/guildhandler.cpp:184
+#: src/net/ea/guildhandler.cpp:185
#, c-format
msgid "Guild level: %d"
msgstr "Niveau de la guilde : %d"
-#: src/net/ea/guildhandler.cpp:186
+#: src/net/ea/guildhandler.cpp:187
#, c-format
msgid "Online members: %d"
msgstr "Membres en ligne : %d"
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:189
#, c-format
msgid "Max members: %d"
msgstr "Membres maximums : %d"
-#: src/net/ea/guildhandler.cpp:190
+#: src/net/ea/guildhandler.cpp:191
#, c-format
msgid "Average level: %d"
msgstr "Niveau moyen : %d"
-#: src/net/ea/guildhandler.cpp:192
+#: src/net/ea/guildhandler.cpp:193
#, c-format
msgid "Guild exp: %d"
msgstr "Expérience Groupe : %d"
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:195
#, c-format
msgid "Guild next exp: %d"
msgstr "Expérience suivante pour la guilde : %d"
-#: src/net/ea/guildhandler.cpp:196
+#: src/net/ea/guildhandler.cpp:197
#, c-format
msgid "Guild castle: %s"
msgstr "Château de la guilde : %s"
-#: src/net/ea/guildhandler.cpp:402
+#: src/net/ea/guildhandler.cpp:403
msgid "Could not inivte user to guild."
msgstr "N'a pas pu inviter le joueur dans la guilde. "
-#: src/net/ea/guildhandler.cpp:406
+#: src/net/ea/guildhandler.cpp:407
msgid "User rejected guild invite."
msgstr "Le joueur a refusé l'invitation dans la guilde."
-#: src/net/ea/guildhandler.cpp:410
+#: src/net/ea/guildhandler.cpp:411
msgid "User is now part of your guild."
msgstr "%s est maintenant membre de la guilde."
-#: src/net/ea/guildhandler.cpp:414
+#: src/net/ea/guildhandler.cpp:415
msgid "Your guild is full."
msgstr "Votre guilde est complète."
-#: src/net/ea/guildhandler.cpp:418
+#: src/net/ea/guildhandler.cpp:419
msgid "Unknown guild invite response."
msgstr "Réponse d'invitation à la guilde inconnue."
-#: src/net/ea/guildhandler.cpp:438
-msgid "You have left the guild."
-msgstr "vous avez quitté la guilde."
-
-#: src/net/ea/guildhandler.cpp:452
+#: src/net/ea/guildhandler.cpp:453
#, c-format
msgid "%s has left your guild."
msgstr "%s a quitté votre guilde."
-#: src/net/ea/guildhandler.cpp:483
+#: src/net/ea/guildhandler.cpp:484
msgid "You was kicked from guild."
msgstr "Vous avez été renvoyé de la guilde."
-#: src/net/ea/guildhandler.cpp:496
+#: src/net/ea/guildhandler.cpp:497
#, c-format
msgid "%s has kicked from your guild."
msgstr "%s a sorti quelqu'un de votre guilde."
@@ -4753,12 +4782,12 @@ msgstr "QQQ Erreur inconnue sur l'invitation de %s."
msgid "You have left the party."
msgstr "Vous avez quitté le groupe."
-#: src/net/ea/partyhandler.cpp:368
+#: src/net/ea/partyhandler.cpp:369
#, c-format
msgid "%s has left your party."
msgstr "%s a quitté le groupe."
-#: src/net/ea/partyhandler.cpp:444
+#: src/net/ea/partyhandler.cpp:448
#, c-format
msgid "An unknown member tried to say: %s"
msgstr "Un membre inconnu a essayé de dire : %s"
@@ -4891,7 +4920,7 @@ msgid "You're pining for the fjords."
msgstr "Tu reposes au fond de l'eau."
#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
-#: src/net/ea/playerhandler.cpp:425
+#: src/net/ea/playerhandler.cpp:428
msgid "Message"
msgstr "Message"
@@ -4908,21 +4937,21 @@ msgstr ""
"Vous portez moins que la moitié de votre poids. Vous pouvez récupérer votre "
"santé."
-#: src/net/ea/playerhandler.cpp:451
+#: src/net/ea/playerhandler.cpp:454
#, c-format
msgid "You picked up %s."
msgstr "Vous avez ramassé %s."
-#: src/net/ea/playerhandler.cpp:457
+#: src/net/ea/playerhandler.cpp:460
#, c-format
msgid "You spent %s."
msgstr "Vous avez dépensé %s."
-#: src/net/ea/playerhandler.cpp:501
+#: src/net/ea/playerhandler.cpp:506
msgid "Cannot raise skill!"
msgstr "Ne peut pas augmenter la capacité !"
-#: src/net/ea/playerhandler.cpp:618
+#: src/net/ea/playerhandler.cpp:624
msgid "Equip arrows first."
msgstr "Équiper d'abord les flèches!"
@@ -5065,7 +5094,7 @@ msgstr "Échange annulé."
msgid "Trade completed."
msgstr "Échange finalisé."
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:258
msgid "Strength"
msgstr "Force"
@@ -5074,7 +5103,7 @@ msgstr "Force"
msgid "Strength %+.1f"
msgstr "Force %+.1f"
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:259
msgid "Agility"
msgstr "Agilité"
@@ -5083,7 +5112,7 @@ msgstr "Agilité"
msgid "Agility %+.1f"
msgstr "Agilité %+.1f"
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:262
msgid "Dexterity"
msgstr "Dextérité"
@@ -5092,7 +5121,7 @@ msgstr "Dextérité"
msgid "Dexterity %+.1f"
msgstr "Dextérité %+.1f"
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:260
msgid "Vitality"
msgstr "Vitalité"
@@ -5101,7 +5130,7 @@ msgstr "Vitalité"
msgid "Vitality %+.1f"
msgstr "Vitalité %+.1f"
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:261
msgid "Intelligence"
msgstr "Intelligence"
@@ -5379,111 +5408,115 @@ msgstr "Impossible de vendre pendant un échange en cours"
msgid "Unable to sell unsellable item."
msgstr "Rendre possible la vente d'objets invendable."
-#: src/net/tmwa/generalhandler.cpp:109
+#: src/net/tmwa/generalhandler.cpp:108
#, c-format
msgid "Strength %+d"
msgstr "Force %+d"
-#: src/net/tmwa/generalhandler.cpp:110
+#: src/net/tmwa/generalhandler.cpp:109
#, c-format
msgid "Agility %+d"
msgstr "Agilité %+d"
-#: src/net/tmwa/generalhandler.cpp:111
+#: src/net/tmwa/generalhandler.cpp:110
#, c-format
msgid "Vitality %+d"
msgstr "Vitalité %+d"
-#: src/net/tmwa/generalhandler.cpp:112
+#: src/net/tmwa/generalhandler.cpp:111
#, c-format
msgid "Intelligence %+d"
msgstr "Intelligence %+d"
-#: src/net/tmwa/generalhandler.cpp:113
+#: src/net/tmwa/generalhandler.cpp:112
#, c-format
msgid "Dexterity %+d"
msgstr "Dextérité %+d"
-#: src/net/tmwa/generalhandler.cpp:114
+#: src/net/tmwa/generalhandler.cpp:113
#, c-format
msgid "Luck %+d"
msgstr "Volonté %+d"
-#: src/net/tmwa/generalhandler.cpp:140
+#: src/net/tmwa/generalhandler.cpp:139
msgid "Authentication failed."
msgstr "Échec de l'authentification."
-#: src/net/tmwa/generalhandler.cpp:143
+#: src/net/tmwa/generalhandler.cpp:142
msgid "No servers available."
msgstr "Aucun serveur n'est disponible."
-#: src/net/tmwa/generalhandler.cpp:147
+#: src/net/tmwa/generalhandler.cpp:146
msgid "Someone else is trying to use this account."
msgstr "Quelqu'un d'autre essaie d'utiliser ce compte."
-#: src/net/tmwa/generalhandler.cpp:150
+#: src/net/tmwa/generalhandler.cpp:149
msgid "This account is already logged in."
msgstr "Ce compte est déjà connecté."
-#: src/net/tmwa/generalhandler.cpp:153
+#: src/net/tmwa/generalhandler.cpp:152
msgid "Speed hack detected."
msgstr "Speed hack détecté."
-#: src/net/tmwa/generalhandler.cpp:156
+#: src/net/tmwa/generalhandler.cpp:155
msgid "Duplicated login."
msgstr "Authentification déjà effectuée."
-#: src/net/tmwa/generalhandler.cpp:159
+#: src/net/tmwa/generalhandler.cpp:158
msgid "Unknown connection error."
msgstr "Erreur de connexion inconnue."
-#: src/net/tmwa/generalhandler.cpp:232
+#: src/net/tmwa/generalhandler.cpp:231
msgid "Got disconnected from server!"
msgstr "Vous avez été déconnecté du serveur !"
-#: src/net/tmwa/generalhandler.cpp:264
+#: src/net/tmwa/generalhandler.cpp:263
msgid "Luck"
msgstr "Chance"
-#: src/net/tmwa/generalhandler.cpp:267
+#: src/net/tmwa/generalhandler.cpp:266
msgid "Defense"
msgstr "Défense"
-#: src/net/tmwa/generalhandler.cpp:268
+#: src/net/tmwa/generalhandler.cpp:267
msgid "M.Attack"
msgstr "Attaque M."
-#: src/net/tmwa/generalhandler.cpp:269
+#: src/net/tmwa/generalhandler.cpp:268
msgid "M.Defense"
msgstr "Défense M."
-#: src/net/tmwa/generalhandler.cpp:271
+#: src/net/tmwa/generalhandler.cpp:270
#, no-c-format
msgid "% Accuracy"
msgstr "% Précision"
-#: src/net/tmwa/generalhandler.cpp:273
+#: src/net/tmwa/generalhandler.cpp:272
#, no-c-format
msgid "% Evade"
msgstr "% Esquive"
-#: src/net/tmwa/generalhandler.cpp:275
+#: src/net/tmwa/generalhandler.cpp:274
#, no-c-format
msgid "% Critical"
msgstr "% Coup critique"
-#: src/net/tmwa/generalhandler.cpp:276
+#: src/net/tmwa/generalhandler.cpp:275
msgid "Attack Delay"
msgstr "Temps de l'attaque"
-#: src/net/tmwa/generalhandler.cpp:278
+#: src/net/tmwa/generalhandler.cpp:277
msgid "Walk Delay"
msgstr "Temps de déplacement"
-#: src/net/tmwa/generalhandler.cpp:280
+#: src/net/tmwa/generalhandler.cpp:279
msgid "Attack Range"
msgstr "Portée de l'attaque"
+#: src/net/tmwa/generalhandler.cpp:281
+msgid "Damage per sec."
+msgstr ""
+
#: src/net/tmwa/network.cpp:152
msgid "Empty address given to Network::connect()!"
msgstr "Une adresse vide a été donnée à la commande Network::connect() !"
@@ -5517,31 +5550,31 @@ msgstr "Bulle flottante '...'"
msgid "Floating bubble"
msgstr "Bulle flottante"
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:248
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:246
#: src/resources/monsterdb.cpp:84
msgid "unnamed"
msgstr "anonyme"
-#: src/resources/itemdb.cpp:65
+#: src/resources/itemdb.cpp:63
#, c-format
msgid "Attack %+d"
msgstr "Attaque %+d"
-#: src/resources/itemdb.cpp:66
+#: src/resources/itemdb.cpp:64
#, c-format
msgid "Defense %+d"
msgstr "Défense %+d"
-#: src/resources/itemdb.cpp:67
+#: src/resources/itemdb.cpp:65
#, c-format
msgid "HP %+d"
msgstr "PV %+d"
-#: src/resources/itemdb.cpp:68
+#: src/resources/itemdb.cpp:66
#, c-format
msgid "MP %+d"
msgstr "PM %+d"
-#: src/resources/itemdb.cpp:171
+#: src/resources/itemdb.cpp:169
msgid "Unknown item"
msgstr "Objet inconnu"
diff --git a/po/hr.po b/po/hr.po
index e52a56bdc..bce0b9017 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-20 17:42+0300\n"
+"POT-Creation-Date: 2011-09-02 18:27+0300\n"
"PO-Revision-Date: 2011-08-09 22:16+0000\n"
"Last-Translator: akaras <akaras@inbox.ru>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -22,119 +22,119 @@ msgstr ""
msgid "Visible on map"
msgstr ""
-#: src/being.cpp:542
+#: src/being.cpp:549
msgid "dodge"
msgstr ""
-#: src/being.cpp:542
+#: src/being.cpp:549
msgid "miss"
msgstr ""
#. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1514
+#: src/being.cpp:1529
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1519
+#: src/being.cpp:1534
msgid "I"
msgstr ""
-#: src/client.cpp:826 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:831 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
msgid "Setup"
msgstr "Podešavanje"
-#: src/client.cpp:909
+#: src/client.cpp:914
msgid "Connecting to server"
msgstr ""
-#: src/client.cpp:940
+#: src/client.cpp:945
msgid "Logging in"
msgstr ""
-#: src/client.cpp:973
+#: src/client.cpp:978
msgid "Entering game world"
msgstr ""
-#: src/client.cpp:1073
+#: src/client.cpp:1078
msgid "Requesting characters"
msgstr ""
-#: src/client.cpp:1104
+#: src/client.cpp:1109
msgid "Connecting to the game server"
msgstr ""
-#: src/client.cpp:1114
+#: src/client.cpp:1119
msgid "Changing game servers"
msgstr ""
-#: src/client.cpp:1151 src/client.cpp:1158 src/client.cpp:1293
+#: src/client.cpp:1156 src/client.cpp:1163 src/client.cpp:1298
#: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
-#: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:395
+#: src/gui/charcreatedialog.cpp:221 src/gui/charselectdialog.cpp:253
+#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
#: src/net/manaserv/charhandler.cpp:227
msgid "Error"
msgstr "Greška"
-#: src/client.cpp:1167
+#: src/client.cpp:1172
msgid "Requesting registration details"
msgstr ""
-#: src/client.cpp:1194
+#: src/client.cpp:1199
msgid "Password Change"
msgstr ""
-#: src/client.cpp:1195
+#: src/client.cpp:1200
msgid "Password changed successfully!"
msgstr ""
-#: src/client.cpp:1214
+#: src/client.cpp:1219
msgid "Email Change"
msgstr ""
-#: src/client.cpp:1215
+#: src/client.cpp:1220
msgid "Email changed successfully!"
msgstr ""
-#: src/client.cpp:1235
+#: src/client.cpp:1240
msgid "Unregister Successful"
msgstr ""
-#: src/client.cpp:1236
+#: src/client.cpp:1241
msgid "Farewell, come back any time..."
msgstr ""
-#: src/client.cpp:1423 src/client.cpp:1453 src/client.cpp:1497
-#: src/client.cpp:1922 src/client.cpp:1929
+#: src/client.cpp:1428 src/client.cpp:1458 src/client.cpp:1502
+#: src/client.cpp:1927 src/client.cpp:1934
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
-#: src/client.cpp:1628
+#: src/client.cpp:1633
#, c-format
msgid "Invalid update host: %s"
msgstr ""
-#: src/client.cpp:1662 src/client.cpp:1668
+#: src/client.cpp:1667 src/client.cpp:1673
msgid "Error creating updates directory!"
msgstr ""
-#: src/client.cpp:1689
+#: src/client.cpp:1694
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
-#: src/commandhandler.cpp:301
+#: src/commandhandler.cpp:303
msgid "Unknown command."
msgstr "Nepoznata naredba."
-#: src/commandhandler.cpp:401
+#: src/commandhandler.cpp:403
msgid "Cannot send empty whispers!"
msgstr "Ne mogu poslati prazan šapate!"
-#: src/commandhandler.cpp:415
+#: src/commandhandler.cpp:417
#, c-format
msgid ""
"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -143,97 +143,97 @@ msgstr ""
"Ne mogu stvoriti šapat karticu za nadimak \"%s\"! To već postoji ili ste to "
"vi."
-#: src/commandhandler.cpp:435
+#: src/commandhandler.cpp:437
#, c-format
msgid "Requesting to join channel %s."
msgstr "Zahtjev za pridruživanje kanalu %s."
-#: src/commandhandler.cpp:451 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:453 src/net/ea/gui/partytab.cpp:125
msgid "Party name is missing."
msgstr "Ime partije nedostaje."
-#: src/commandhandler.cpp:462
+#: src/commandhandler.cpp:464
msgid "Guild name is missing."
msgstr ""
-#: src/commandhandler.cpp:475 src/commandhandler.cpp:582
-#: src/commandhandler.cpp:623 src/commandhandler.cpp:653
+#: src/commandhandler.cpp:477 src/commandhandler.cpp:589
+#: src/commandhandler.cpp:630 src/commandhandler.cpp:660
msgid "Please specify a name."
msgstr ""
-#: src/commandhandler.cpp:516
+#: src/commandhandler.cpp:523
msgid "Return toggles chat."
msgstr ""
-#: src/commandhandler.cpp:516
+#: src/commandhandler.cpp:523
msgid "Message closes chat."
msgstr "Poruka zatvara chat."
-#: src/commandhandler.cpp:527
+#: src/commandhandler.cpp:534
msgid "Return now toggles chat."
msgstr ""
-#: src/commandhandler.cpp:533
+#: src/commandhandler.cpp:540
msgid "Message now closes chat."
msgstr "Poruka sada zatvara chat."
-#: src/commandhandler.cpp:561
+#: src/commandhandler.cpp:568
msgid "friend"
msgstr ""
-#: src/commandhandler.cpp:566
+#: src/commandhandler.cpp:573
msgid "disregarded"
msgstr ""
-#: src/commandhandler.cpp:571
+#: src/commandhandler.cpp:578
msgid "neutral"
msgstr ""
-#: src/commandhandler.cpp:590
+#: src/commandhandler.cpp:597
#, c-format
msgid "Player already %s!"
msgstr ""
-#: src/commandhandler.cpp:604
+#: src/commandhandler.cpp:611
#, c-format
msgid "Player successfully %s!"
msgstr ""
-#: src/commandhandler.cpp:612
+#: src/commandhandler.cpp:619
#, c-format
msgid "Player could not be %s!"
msgstr ""
-#: src/commandhandler.cpp:634
+#: src/commandhandler.cpp:641
msgid "Player wasn't ignored!"
msgstr ""
-#: src/commandhandler.cpp:641
+#: src/commandhandler.cpp:648
msgid "Player no longer ignored!"
msgstr ""
-#: src/commandhandler.cpp:643
+#: src/commandhandler.cpp:650
msgid "Player could not be unignored!"
msgstr ""
-#: src/commandhandler.cpp:660
+#: src/commandhandler.cpp:667
msgid "Player already erased!"
msgstr ""
-#: src/commandhandler.cpp:671
+#: src/commandhandler.cpp:678
msgid "Player successfully erased!"
msgstr ""
-#: src/commandhandler.cpp:673
+#: src/commandhandler.cpp:680
msgid "Player could not be erased!"
msgstr ""
-#: src/commandhandler.cpp:972 src/commandhandler.cpp:1018
+#: src/commandhandler.cpp:980 src/commandhandler.cpp:1026
#, c-format
msgid "Client uptime: %s"
msgstr ""
-#: src/commandhandler.cpp:982
+#: src/commandhandler.cpp:990
#, c-format
msgid "%d week"
msgid_plural "%d weeks"
@@ -241,7 +241,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: src/commandhandler.cpp:991
+#: src/commandhandler.cpp:999
#, c-format
msgid "%d day"
msgid_plural "%d days"
@@ -249,7 +249,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: src/commandhandler.cpp:999
+#: src/commandhandler.cpp:1007
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
@@ -257,7 +257,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: src/commandhandler.cpp:1007
+#: src/commandhandler.cpp:1015
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
@@ -265,7 +265,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: src/commandhandler.cpp:1015
+#: src/commandhandler.cpp:1023
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
@@ -273,27 +273,27 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1102
msgid "font cache size"
msgstr ""
-#: src/commandhandler.cpp:1106
+#: src/commandhandler.cpp:1114
msgid "Cache size:"
msgstr ""
-#: src/commandhandler.cpp:1110
+#: src/commandhandler.cpp:1118
msgid "Created:"
msgstr ""
-#: src/commandhandler.cpp:1112
+#: src/commandhandler.cpp:1120
msgid "Deleted:"
msgstr ""
-#: src/commandhandler.cpp:1159 src/commandhandler.cpp:1166
+#: src/commandhandler.cpp:1167 src/commandhandler.cpp:1174
msgid "Resource images:"
msgstr ""
-#: src/commandhandler.cpp:1161 src/commandhandler.cpp:1168
+#: src/commandhandler.cpp:1169 src/commandhandler.cpp:1176
msgid "Resource orphaned images:"
msgstr ""
@@ -302,43 +302,43 @@ msgstr ""
msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
msgstr "Opcije za /%s su \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:411
+#: src/game.cpp:252 src/gui/widgets/chattab.cpp:409
msgid "General"
msgstr "Općenito"
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:413
+#: src/game.cpp:256 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:411
msgid "Debug"
msgstr ""
-#: src/game.cpp:488
+#: src/game.cpp:511
msgid "Screenshot saved as "
msgstr ""
-#: src/game.cpp:496
+#: src/game.cpp:519
msgid "Saving screenshot failed!"
msgstr "Spremanje screenshot-a nije uspjelo!"
-#: src/game.cpp:536
+#: src/game.cpp:559
msgid "The connection to the server was lost."
msgstr ""
-#: src/game.cpp:548
+#: src/game.cpp:571
msgid "Network Error"
msgstr "Mreža Greška"
-#: src/game.cpp:1213
+#: src/game.cpp:1236
msgid "Ignoring incoming trade requests"
msgstr "Ignoriranje dolaznih zahtjeva za trgovanje"
-#: src/game.cpp:1220
+#: src/game.cpp:1243
msgid "Accepting incoming trade requests"
msgstr "Prihvaćanje dolaznih zahtjeva za trgovanje"
-#: src/game.cpp:1606
+#: src/game.cpp:1629
msgid "Could Not Load Map"
msgstr ""
-#: src/game.cpp:1607
+#: src/game.cpp:1630
#, c-format
msgid "Error while loading %s"
msgstr "Greška prilikom učitavanja %s"
@@ -367,103 +367,103 @@ msgstr ""
msgid "Bot Checker"
msgstr ""
-#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
+#: src/gui/botcheckerwindow.cpp:295 src/gui/setup_relations.cpp:64
msgid "Name"
msgstr "Ime"
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:134
-#: src/gui/popupmenu.cpp:292 src/gui/popupmenu.cpp:617
-#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
+#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:133
+#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:646
+#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:265
msgid "Attack"
msgstr "Napad"
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:279
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:297
#: src/keyboardconfig.cpp:62
msgid "Talk"
msgstr "Govori"
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:245
-#: src/gui/popupmenu.cpp:284 src/gui/popupmenu.cpp:674
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:263
+#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:703
msgid "Move"
msgstr ""
-#: src/gui/botcheckerwindow.cpp:300
+#: src/gui/botcheckerwindow.cpp:299
msgid "Result"
msgstr ""
-#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123
+#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:124
msgid "Reset"
msgstr "Poništi"
-#: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:260
-#: src/gui/popupmenu.cpp:281 src/gui/popupmenu.cpp:688
+#: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:98
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:278
+#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:717
msgid "Buy"
msgstr "Kupi"
-#: src/gui/buydialog.cpp:88 src/gui/buydialog.cpp:302
-#: src/gui/selldialog.cpp:87 src/gui/selldialog.cpp:324
+#: src/gui/buydialog.cpp:89 src/gui/buydialog.cpp:303
+#: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
#, c-format
msgid "Price: %s / Total: %s"
msgstr "Cijena: %s / Ukupno: %s"
#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
#. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:93 src/gui/itemamountwindow.cpp:207
-#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:113
-#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:974
+#: src/gui/buydialog.cpp:94 src/gui/itemamountwindow.cpp:207
+#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:973
msgid "+"
msgstr ""
#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
#. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:96 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:986
+#: src/gui/buydialog.cpp:97 src/gui/itemamountwindow.cpp:206
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:985
msgid "-"
msgstr ""
-#: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
-#: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
-#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:288
+#: src/gui/buydialog.cpp:99 src/gui/quitdialog.cpp:47
+#: src/gui/quitdialog.cpp:49 src/gui/quitdialog.cpp:50
+#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:294
#: src/keyboardconfig.cpp:290
msgid "Quit"
msgstr "Izlaz"
-#: src/gui/buydialog.cpp:99 src/gui/selldialog.cpp:94
-#: src/gui/statuswindow.cpp:503 src/gui/statuswindow.cpp:552
-#: src/gui/statuswindow.cpp:973 src/gui/statuswindow.cpp:1004
+#: src/gui/buydialog.cpp:100 src/gui/selldialog.cpp:95
+#: src/gui/statuswindow.cpp:504 src/gui/statuswindow.cpp:553
+#: src/gui/statuswindow.cpp:972 src/gui/statuswindow.cpp:1003
msgid "Max"
msgstr "Max"
#: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:133
+#: src/gui/inventorywindow.cpp:147 src/gui/setup_other.cpp:133
msgid "Shop"
msgstr "Trgovina"
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:262
-#: src/gui/popupmenu.cpp:282 src/gui/popupmenu.cpp:690
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:280
+#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:719
#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
-#: src/gui/selldialog.cpp:92
+#: src/gui/selldialog.cpp:93
msgid "Sell"
msgstr "Prodaj"
#: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
-#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
+#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:96
#: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:336
-#: src/gui/popupmenu.cpp:357 src/gui/popupmenu.cpp:460
-#: src/gui/popupmenu.cpp:487 src/gui/popupmenu.cpp:511
-#: src/gui/popupmenu.cpp:525 src/gui/popupmenu.cpp:544
-#: src/gui/popupmenu.cpp:750 src/gui/popupmenu.cpp:774
-#: src/gui/popupmenu.cpp:1684 src/gui/popupmenu.cpp:1712
-#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1811
-#: src/gui/popupmenu.cpp:1846 src/gui/popupmenu.cpp:1886
-#: src/gui/popupmenu.cpp:1953 src/gui/popupmenu.cpp:1973
-#: src/gui/quitdialog.cpp:59 src/gui/register.cpp:82 src/gui/setup.cpp:71
-#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:354
+#: src/gui/popupmenu.cpp:375 src/gui/popupmenu.cpp:489
+#: src/gui/popupmenu.cpp:516 src/gui/popupmenu.cpp:540
+#: src/gui/popupmenu.cpp:554 src/gui/popupmenu.cpp:573
+#: src/gui/popupmenu.cpp:790 src/gui/popupmenu.cpp:814
+#: src/gui/popupmenu.cpp:1734 src/gui/popupmenu.cpp:1762
+#: src/gui/popupmenu.cpp:1818 src/gui/popupmenu.cpp:1861
+#: src/gui/popupmenu.cpp:1896 src/gui/popupmenu.cpp:1936
+#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2023
+#: src/gui/quitdialog.cpp:54 src/gui/register.cpp:82 src/gui/setup.cpp:72
+#: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:238
#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updaterwindow.cpp:157
+#: src/gui/updaterwindow.cpp:161
msgid "Cancel"
msgstr "Poništi"
@@ -495,7 +495,7 @@ msgid "The email address entries mismatch."
msgstr ""
#: src/gui/changepassworddialog.cpp:50 src/gui/changepassworddialog.cpp:59
-#: src/gui/charselectdialog.cpp:140
+#: src/gui/charselectdialog.cpp:139
msgid "Change Password"
msgstr "Promijeni Lozinku"
@@ -530,121 +530,121 @@ msgstr ""
msgid "Create Character"
msgstr "Stvori Lika"
-#: src/gui/charcreatedialog.cpp:73 src/gui/logindialog.cpp:94
+#: src/gui/charcreatedialog.cpp:76 src/gui/logindialog.cpp:94
#: src/gui/register.cpp:75
msgid "Name:"
msgstr "Ime:"
#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
#. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:76 src/gui/charcreatedialog.cpp:81
-#: src/gui/charcreatedialog.cpp:87 src/gui/outfitwindow.cpp:81
+#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:84
+#: src/gui/charcreatedialog.cpp:90 src/gui/outfitwindow.cpp:85
msgid ">"
msgstr ""
#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
#. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:82
-#: src/gui/charcreatedialog.cpp:88 src/gui/outfitwindow.cpp:80
+#: src/gui/charcreatedialog.cpp:82 src/gui/charcreatedialog.cpp:85
+#: src/gui/charcreatedialog.cpp:91 src/gui/outfitwindow.cpp:84
msgid "<"
msgstr ""
-#: src/gui/charcreatedialog.cpp:80
+#: src/gui/charcreatedialog.cpp:83
msgid "Hair color:"
msgstr ""
-#: src/gui/charcreatedialog.cpp:83
+#: src/gui/charcreatedialog.cpp:86
msgid "Hair style:"
msgstr ""
-#: src/gui/charcreatedialog.cpp:89
+#: src/gui/charcreatedialog.cpp:92
msgid "Race:"
msgstr ""
-#: src/gui/charcreatedialog.cpp:92 src/gui/charselectdialog.cpp:479
-#: src/gui/socialwindow.cpp:1033
+#: src/gui/charcreatedialog.cpp:95 src/gui/charselectdialog.cpp:478
+#: src/gui/socialwindow.cpp:1139
msgid "Create"
msgstr "Stvori"
-#: src/gui/charcreatedialog.cpp:94 src/gui/register.cpp:98
+#: src/gui/charcreatedialog.cpp:97 src/gui/register.cpp:98
msgid "Male"
msgstr "Muško"
-#: src/gui/charcreatedialog.cpp:95 src/gui/register.cpp:99
+#: src/gui/charcreatedialog.cpp:98 src/gui/register.cpp:99
msgid "Female"
msgstr "Žensko"
-#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:300
+#: src/gui/charcreatedialog.cpp:116 src/gui/charcreatedialog.cpp:303
#, c-format
msgid "Please distribute %d points"
msgstr "Molimo, rasporedi %d bodova"
-#: src/gui/charcreatedialog.cpp:219
+#: src/gui/charcreatedialog.cpp:222
msgid "Your name needs to be at least 4 characters."
msgstr "Ime mora imati barem 4 znaka."
-#: src/gui/charcreatedialog.cpp:291
+#: src/gui/charcreatedialog.cpp:294
msgid "Character stats OK"
msgstr "Podaci lika su u redu"
-#: src/gui/charcreatedialog.cpp:305
+#: src/gui/charcreatedialog.cpp:308
#, c-format
msgid "Please remove %d points"
msgstr "Molimo, oduzmi %d bodova"
-#: src/gui/charselectdialog.cpp:77
+#: src/gui/charselectdialog.cpp:76
msgid "Confirm Character Delete"
msgstr "Potvrdi Brisanje Lika"
-#: src/gui/charselectdialog.cpp:78
+#: src/gui/charselectdialog.cpp:77
msgid "Are you sure you want to delete this character?"
msgstr "Da li ste sigurni da želite obrisati ovog lika?"
-#: src/gui/charselectdialog.cpp:126
+#: src/gui/charselectdialog.cpp:125
msgid "Account and Character Management"
msgstr "Upravljanje Računom i Likovima"
-#: src/gui/charselectdialog.cpp:139
+#: src/gui/charselectdialog.cpp:138
msgid "Switch Login"
msgstr ""
-#: src/gui/charselectdialog.cpp:153 src/gui/unregisterdialog.cpp:50
+#: src/gui/charselectdialog.cpp:152 src/gui/unregisterdialog.cpp:50
#: src/gui/unregisterdialog.cpp:58
msgid "Unregister"
msgstr "Odjavi"
-#: src/gui/charselectdialog.cpp:162
+#: src/gui/charselectdialog.cpp:161
msgid "Change Email"
msgstr ""
-#: src/gui/charselectdialog.cpp:254
+#: src/gui/charselectdialog.cpp:253
msgid "Incorrect password"
msgstr ""
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:286
msgid "Enter password for deleting character"
msgstr ""
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:286
msgid "Enter password:"
msgstr ""
-#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:292
-#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
-#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
+#: src/gui/charselectdialog.cpp:408 src/gui/serverdialog.cpp:298
+#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:122
+#: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:241
msgid "Delete"
msgstr "Obriši"
-#: src/gui/charselectdialog.cpp:467
+#: src/gui/charselectdialog.cpp:466
msgid "Choose"
msgstr ""
-#: src/gui/charselectdialog.cpp:470
+#: src/gui/charselectdialog.cpp:469
#, c-format
msgid "Level %d"
msgstr ""
-#: src/gui/charselectdialog.cpp:481 src/gui/charselectdialog.cpp:482
+#: src/gui/charselectdialog.cpp:480 src/gui/charselectdialog.cpp:481
msgid "(empty)"
msgstr ""
@@ -716,12 +716,12 @@ msgstr "???"
msgid "Chat"
msgstr "Chat"
-#: src/gui/chatwindow.cpp:606
+#: src/gui/chatwindow.cpp:609
#, c-format
msgid "Present: %s; %d players are present."
msgstr ""
-#: src/gui/chatwindow.cpp:993
+#: src/gui/chatwindow.cpp:996
#, c-format
msgid "Whispering to %s: %s"
msgstr "Šaptaj prema %s: %s"
@@ -734,145 +734,145 @@ msgstr "Da"
msgid "No"
msgstr "Ne"
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:150
-#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:384
-#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:632
-#: src/gui/popupmenu.cpp:640
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:149
+#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:402
+#: src/gui/popupmenu.cpp:408 src/gui/popupmenu.cpp:661
+#: src/gui/popupmenu.cpp:669
msgid "Ignore"
msgstr ""
-#: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
+#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:97
#: src/gui/setup_other.cpp:64
msgid "Map"
msgstr "Karta"
-#: src/gui/debugwindow.cpp:71
+#: src/gui/debugwindow.cpp:73
msgid "Target"
msgstr ""
-#: src/gui/debugwindow.cpp:72
+#: src/gui/debugwindow.cpp:74
msgid "Net"
msgstr ""
-#: src/gui/debugwindow.cpp:145 src/gui/debugwindow.cpp:220
-#: src/gui/debugwindow.cpp:249
+#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
+#: src/gui/debugwindow.cpp:251
msgid "Music:"
msgstr ""
-#: src/gui/debugwindow.cpp:146 src/gui/debugwindow.cpp:224
-#: src/gui/debugwindow.cpp:251
+#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:226
+#: src/gui/debugwindow.cpp:253
msgid "Map:"
msgstr ""
-#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
-#: src/gui/debugwindow.cpp:250
+#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:224
+#: src/gui/debugwindow.cpp:252
msgid "Minimap:"
msgstr ""
-#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:218
-#: src/gui/debugwindow.cpp:247
+#: src/gui/debugwindow.cpp:150 src/gui/debugwindow.cpp:220
+#: src/gui/debugwindow.cpp:249
msgid "Cursor:"
msgstr ""
-#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:201
-#: src/gui/debugwindow.cpp:206
+#: src/gui/debugwindow.cpp:151 src/gui/debugwindow.cpp:203
+#: src/gui/debugwindow.cpp:208
msgid "Player Position:"
msgstr ""
-#: src/gui/debugwindow.cpp:152
+#: src/gui/debugwindow.cpp:154
msgid "Particle count:"
msgstr ""
-#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:235
-#: src/gui/debugwindow.cpp:254
+#: src/gui/debugwindow.cpp:156 src/gui/debugwindow.cpp:237
+#: src/gui/debugwindow.cpp:256
msgid "Map actors count:"
msgstr ""
-#: src/gui/debugwindow.cpp:162 src/gui/debugwindow.cpp:173
+#: src/gui/debugwindow.cpp:164 src/gui/debugwindow.cpp:175
#, c-format
msgid "%d FPS (Software)"
msgstr ""
-#: src/gui/debugwindow.cpp:166
+#: src/gui/debugwindow.cpp:168
#, c-format
msgid "%d FPS (fast OpenGL)"
msgstr ""
-#: src/gui/debugwindow.cpp:169
+#: src/gui/debugwindow.cpp:171
#, c-format
msgid "%d FPS (old OpenGL)"
msgstr ""
-#: src/gui/debugwindow.cpp:176
+#: src/gui/debugwindow.cpp:178
#, c-format
msgid "%d FPS"
msgstr ""
-#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:240
+#: src/gui/debugwindow.cpp:190 src/gui/debugwindow.cpp:242
msgid "Textures count:"
msgstr ""
-#: src/gui/debugwindow.cpp:231
+#: src/gui/debugwindow.cpp:233
#, c-format
msgid "Particle count: %d"
msgstr ""
-#: src/gui/debugwindow.cpp:268 src/gui/debugwindow.cpp:299
-#: src/gui/debugwindow.cpp:343
+#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:301
+#: src/gui/debugwindow.cpp:345
msgid "Target:"
msgstr ""
-#: src/gui/debugwindow.cpp:269 src/gui/debugwindow.cpp:304
-#: src/gui/debugwindow.cpp:344
+#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:306
+#: src/gui/debugwindow.cpp:346
msgid "Target Id:"
msgstr ""
-#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:308
-#: src/gui/debugwindow.cpp:313 src/gui/debugwindow.cpp:345
+#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:310
+#: src/gui/debugwindow.cpp:315 src/gui/debugwindow.cpp:347
msgid "Target Level:"
msgstr ""
-#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:316
-#: src/gui/debugwindow.cpp:346
+#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:318
+#: src/gui/debugwindow.cpp:348
msgid "Target Party:"
msgstr ""
-#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:319
-#: src/gui/debugwindow.cpp:347
+#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:321
+#: src/gui/debugwindow.cpp:349
msgid "Target Guild:"
msgstr ""
-#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:333
-#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:348
+#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:335
+#: src/gui/debugwindow.cpp:340 src/gui/debugwindow.cpp:350
msgid "Attack delay:"
msgstr ""
-#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:323
-#: src/gui/debugwindow.cpp:349
+#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:325
+#: src/gui/debugwindow.cpp:351
msgid "Minimal hit:"
msgstr ""
-#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:325
-#: src/gui/debugwindow.cpp:350
+#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:327
+#: src/gui/debugwindow.cpp:352
msgid "Maximum hit:"
msgstr ""
-#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:327
-#: src/gui/debugwindow.cpp:351
+#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:329
+#: src/gui/debugwindow.cpp:353
msgid "Critical hit:"
msgstr ""
-#: src/gui/debugwindow.cpp:385 src/gui/debugwindow.cpp:390
+#: src/gui/debugwindow.cpp:387 src/gui/debugwindow.cpp:392
#, c-format
msgid "Ping: %s ms"
msgstr ""
-#: src/gui/debugwindow.cpp:393
+#: src/gui/debugwindow.cpp:395
#, c-format
msgid "In: %d bytes/s"
msgstr ""
-#: src/gui/debugwindow.cpp:395
+#: src/gui/debugwindow.cpp:397
#, c-format
msgid "Out: %d bytes/s"
msgstr ""
@@ -881,26 +881,26 @@ msgstr ""
msgid "Did You Know?"
msgstr ""
-#: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
-#: src/gui/inventorywindow.cpp:175 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:559 src/gui/shopwindow.cpp:111
+#: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
+#: src/gui/inventorywindow.cpp:176 src/gui/npcdialog.cpp:53
+#: src/gui/popupmenu.cpp:588 src/gui/shopwindow.cpp:113
msgid "Close"
msgstr "Zatvori"
-#: src/gui/didyouknowwindow.cpp:62
+#: src/gui/didyouknowwindow.cpp:64
msgid "< Previous"
msgstr ""
-#: src/gui/didyouknowwindow.cpp:63
+#: src/gui/didyouknowwindow.cpp:65
msgid "Next >"
msgstr ""
-#: src/gui/didyouknowwindow.cpp:64
+#: src/gui/didyouknowwindow.cpp:66
msgid "Auto open this window"
msgstr ""
#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:58 src/gui/textdialog.cpp:50
+#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:53 src/gui/textdialog.cpp:50
msgid "OK"
msgstr "U redu"
@@ -908,10 +908,10 @@ msgstr "U redu"
msgid "Equipment"
msgstr "Oprema"
-#: src/gui/equipmentwindow.cpp:93 src/gui/inventorywindow.cpp:130
-#: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
-#: src/gui/popupmenu.cpp:1643 src/gui/popupmenu.cpp:1738
-#: src/gui/popupmenu.cpp:1783
+#: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:131
+#: src/gui/inventorywindow.cpp:512 src/gui/inventorywindow.cpp:521
+#: src/gui/popupmenu.cpp:1693 src/gui/popupmenu.cpp:1788
+#: src/gui/popupmenu.cpp:1833
msgid "Unequip"
msgstr "Skini opremu"
@@ -924,75 +924,75 @@ msgstr "Pomoć"
msgid "Inventory"
msgstr "Zalihe"
-#: src/gui/inventorywindow.cpp:104
+#: src/gui/inventorywindow.cpp:105
msgid "Slots:"
msgstr "Mjesta:"
-#: src/gui/inventorywindow.cpp:115
+#: src/gui/inventorywindow.cpp:116
msgid "Filter:"
msgstr ""
-#: src/gui/inventorywindow.cpp:116
+#: src/gui/inventorywindow.cpp:117
msgid "Sort:"
msgstr ""
-#: src/gui/inventorywindow.cpp:122
+#: src/gui/inventorywindow.cpp:123
msgid "na"
msgstr ""
-#: src/gui/inventorywindow.cpp:123
+#: src/gui/inventorywindow.cpp:124
msgid "az"
msgstr ""
-#: src/gui/inventorywindow.cpp:124
+#: src/gui/inventorywindow.cpp:125
msgid "id"
msgstr ""
-#: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:513
-#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1645
-#: src/gui/popupmenu.cpp:1740 src/gui/popupmenu.cpp:1785
+#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
+#: src/gui/inventorywindow.cpp:523 src/gui/popupmenu.cpp:1695
+#: src/gui/popupmenu.cpp:1790 src/gui/popupmenu.cpp:1835
msgid "Equip"
msgstr "Opremi"
-#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
-#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1648
-#: src/gui/popupmenu.cpp:1707 src/gui/popupmenu.cpp:1744
-#: src/gui/popupmenu.cpp:1788
+#: src/gui/inventorywindow.cpp:130 src/gui/inventorywindow.cpp:515
+#: src/gui/inventorywindow.cpp:519 src/gui/popupmenu.cpp:1698
+#: src/gui/popupmenu.cpp:1757 src/gui/popupmenu.cpp:1794
+#: src/gui/popupmenu.cpp:1838
msgid "Use"
msgstr "Upotrijebi"
-#: src/gui/inventorywindow.cpp:143 src/gui/inventorywindow.cpp:619
-#: src/gui/popupmenu.cpp:1652 src/gui/popupmenu.cpp:1749
-#: src/gui/popupmenu.cpp:1792
+#: src/gui/inventorywindow.cpp:144 src/gui/inventorywindow.cpp:620
+#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1799
+#: src/gui/popupmenu.cpp:1842
msgid "Drop..."
msgstr ""
-#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1661
-#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1801
+#: src/gui/inventorywindow.cpp:145 src/gui/popupmenu.cpp:1711
+#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1851
msgid "Split"
msgstr "Razdvoji"
-#: src/gui/inventorywindow.cpp:145 src/gui/outfitwindow.cpp:59
-#: src/gui/popupmenu.cpp:520
+#: src/gui/inventorywindow.cpp:146 src/gui/outfitwindow.cpp:60
+#: src/gui/popupmenu.cpp:549
msgid "Outfits"
msgstr ""
-#: src/gui/inventorywindow.cpp:148
+#: src/gui/inventorywindow.cpp:149
msgid "Weight:"
msgstr "Težina:"
-#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
-#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
-#: src/gui/popupmenu.cpp:1804 src/gui/setup.cpp:72
+#: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:611
+#: src/gui/popupmenu.cpp:1674 src/gui/popupmenu.cpp:1811
+#: src/gui/popupmenu.cpp:1854 src/gui/setup.cpp:73
msgid "Store"
msgstr "Pohrani"
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1668
+#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1718
msgid "Retrieve"
msgstr "Preuzmi"
-#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1657
-#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1797
+#: src/gui/inventorywindow.cpp:622 src/gui/popupmenu.cpp:1707
+#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1847
#: src/gui/windowmenu.cpp:97
msgid "Drop"
msgstr "Ispusti"
@@ -1033,11 +1033,11 @@ msgstr ""
msgid "Unknown."
msgstr ""
-#: src/gui/itempopup.cpp:176 src/gui/itempopup.cpp:182
+#: src/gui/itempopup.cpp:177 src/gui/itempopup.cpp:183
msgid ", "
msgstr ""
-#: src/gui/itempopup.cpp:192
+#: src/gui/itempopup.cpp:193
#, c-format
msgid "Weight: %s"
msgstr ""
@@ -1046,51 +1046,51 @@ msgstr ""
msgid "Kill stats"
msgstr ""
-#: src/gui/killstats.cpp:64
+#: src/gui/killstats.cpp:65
msgid "Reset stats"
msgstr ""
-#: src/gui/killstats.cpp:65
+#: src/gui/killstats.cpp:66
msgid "Reset timer"
msgstr ""
-#: src/gui/killstats.cpp:69 src/gui/killstats.cpp:205
+#: src/gui/killstats.cpp:70 src/gui/killstats.cpp:206
#, c-format
msgid "Level: %d at %f%%"
msgstr ""
-#: src/gui/killstats.cpp:73 src/gui/killstats.cpp:210
+#: src/gui/killstats.cpp:74 src/gui/killstats.cpp:211
#, c-format
msgid "Exp: %d/%d Left: %d"
msgstr ""
-#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:216
-#: src/gui/killstats.cpp:225
+#: src/gui/killstats.cpp:77 src/gui/killstats.cpp:217
+#: src/gui/killstats.cpp:226
#, c-format
msgid "1%% = %d exp, avg mob for 1%%: %s"
msgstr ""
-#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:142
-#: src/gui/killstats.cpp:234
+#: src/gui/killstats.cpp:80 src/gui/killstats.cpp:143
+#: src/gui/killstats.cpp:235
#, c-format
msgid "Kills: %s, total exp: %s"
msgstr ""
-#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
-#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:230
+#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145
+#: src/gui/killstats.cpp:221 src/gui/killstats.cpp:231
#, c-format
msgid "Avg Exp: %s, No. of avg mob to next level: %s"
msgstr ""
-#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:162
-#: src/gui/killstats.cpp:237
+#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:163
+#: src/gui/killstats.cpp:238
#, c-format
msgid "Kills/Min: %s, Exp/Min: %s"
msgstr ""
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:89 src/gui/killstats.cpp:94
-#: src/gui/killstats.cpp:289 src/gui/killstats.cpp:305
-#: src/gui/killstats.cpp:323
+#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:90 src/gui/killstats.cpp:95
+#: src/gui/killstats.cpp:290 src/gui/killstats.cpp:306
+#: src/gui/killstats.cpp:324
#, c-format
msgid "Exp speed per %d min: %s"
msgid_plural "Exp speed per %d min: %s"
@@ -1098,7 +1098,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
+#: src/gui/killstats.cpp:88 src/gui/killstats.cpp:93 src/gui/killstats.cpp:98
#, c-format
msgid "Time for next level per %d min: %s"
msgid_plural "Time for next level per %d min: %s"
@@ -1106,32 +1106,36 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: src/gui/killstats.cpp:100 src/gui/killstats.cpp:241
+#: src/gui/killstats.cpp:101 src/gui/killstats.cpp:242
msgid "Last kill exp:"
msgstr ""
-#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:355
-#: src/gui/killstats.cpp:361 src/gui/killstats.cpp:367
-#: src/gui/killstats.cpp:372
+#: src/gui/killstats.cpp:103 src/gui/killstats.cpp:356
+#: src/gui/killstats.cpp:362 src/gui/killstats.cpp:368
+#: src/gui/killstats.cpp:373
msgid "Time before jacko spawn:"
msgstr ""
-#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:301
-#: src/gui/killstats.cpp:311 src/gui/killstats.cpp:318
-#: src/gui/killstats.cpp:330 src/gui/killstats.cpp:337
+#: src/gui/killstats.cpp:295 src/gui/killstats.cpp:302
+#: src/gui/killstats.cpp:312 src/gui/killstats.cpp:319
+#: src/gui/killstats.cpp:331 src/gui/killstats.cpp:338
#, c-format
msgid " Time for next level: %s"
msgstr ""
-#: src/gui/killstats.cpp:361
+#: src/gui/killstats.cpp:362
#, c-format
msgid "%s %d?"
msgstr ""
-#: src/gui/killstats.cpp:367
+#: src/gui/killstats.cpp:368
msgid "jacko spawning"
msgstr ""
+#: src/guildmanager.cpp:464 src/net/ea/guildhandler.cpp:439
+msgid "You have left the guild."
+msgstr ""
+
#: src/gui/logindialog.cpp:59
msgid "Normal"
msgstr ""
@@ -1148,7 +1152,7 @@ msgstr ""
msgid "Login"
msgstr "Korisničko ime"
-#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:246
+#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:252
#: src/gui/widgets/chattab.cpp:173
msgid "Server:"
msgstr "Poslužitelj:"
@@ -1230,11 +1234,11 @@ msgstr "Dostavi"
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:561
+#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:590
msgid "Clear"
msgstr ""
-#: src/gui/npcdialog.cpp:222
+#: src/gui/npcdialog.cpp:223
msgid "> Next"
msgstr ""
@@ -1250,346 +1254,346 @@ msgstr "Pošalji"
msgid "Failed to send as sender or letter invalid."
msgstr "Neuspjelo slanje kao pošiljatelj ili nevažeće pismo."
-#: src/gui/outfitwindow.cpp:82 src/gui/outfitwindow.cpp:886
+#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:890
#, c-format
msgid "Outfit: %d"
msgstr ""
-#: src/gui/outfitwindow.cpp:84 src/gui/outfitwindow.cpp:888
+#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:892
#, c-format
msgid "Key: %s"
msgstr ""
-#: src/gui/outfitwindow.cpp:87
+#: src/gui/outfitwindow.cpp:91
msgid "Unequip first"
msgstr ""
-#: src/gui/outfitwindow.cpp:90
+#: src/gui/outfitwindow.cpp:94
msgid "Away outfit"
msgstr ""
-#: src/gui/popupmenu.cpp:133 src/gui/popupmenu.cpp:616
+#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:645
#: src/gui/widgets/tradetab.cpp:44
msgid "Trade"
msgstr "Trgovanje"
-#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:375
+#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:393
msgid "Whisper"
msgstr ""
-#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:621
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:650
msgid "Heal"
msgstr ""
-#: src/gui/popupmenu.cpp:146 src/gui/popupmenu.cpp:381
-#: src/gui/popupmenu.cpp:628
+#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:399
+#: src/gui/popupmenu.cpp:657
msgid "Be friend"
msgstr ""
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:383
-#: src/gui/popupmenu.cpp:389 src/gui/popupmenu.cpp:408
-#: src/gui/popupmenu.cpp:630 src/gui/popupmenu.cpp:638
-#: src/gui/popupmenu.cpp:662
+#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:156
+#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:401
+#: src/gui/popupmenu.cpp:407 src/gui/popupmenu.cpp:426
+#: src/gui/popupmenu.cpp:659 src/gui/popupmenu.cpp:667
+#: src/gui/popupmenu.cpp:691
msgid "Disregard"
msgstr ""
-#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:161
-#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:177
-#: src/gui/popupmenu.cpp:385 src/gui/popupmenu.cpp:391
-#: src/gui/popupmenu.cpp:398 src/gui/popupmenu.cpp:403
-#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
-#: src/gui/popupmenu.cpp:649 src/gui/popupmenu.cpp:655
+#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:160
+#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:176
+#: src/gui/popupmenu.cpp:403 src/gui/popupmenu.cpp:409
+#: src/gui/popupmenu.cpp:416 src/gui/popupmenu.cpp:421
+#: src/gui/popupmenu.cpp:662 src/gui/popupmenu.cpp:670
+#: src/gui/popupmenu.cpp:678 src/gui/popupmenu.cpp:684
msgid "Erase"
msgstr ""
-#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:175
-#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:395
-#: src/gui/popupmenu.cpp:402 src/gui/popupmenu.cpp:407
-#: src/gui/popupmenu.cpp:646 src/gui/popupmenu.cpp:654
-#: src/gui/popupmenu.cpp:660
+#: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:174
+#: src/gui/popupmenu.cpp:181 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:425
+#: src/gui/popupmenu.cpp:675 src/gui/popupmenu.cpp:683
+#: src/gui/popupmenu.cpp:689
msgid "Unignore"
msgstr ""
-#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:186
-#: src/gui/popupmenu.cpp:397 src/gui/popupmenu.cpp:410
-#: src/gui/popupmenu.cpp:648 src/gui/popupmenu.cpp:664
+#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:185
+#: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:428
+#: src/gui/popupmenu.cpp:677 src/gui/popupmenu.cpp:693
#: src/playerrelations.cpp:400
msgid "Completely ignore"
msgstr ""
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:418
-#: src/gui/popupmenu.cpp:672
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:436
+#: src/gui/popupmenu.cpp:701
msgid "Follow"
msgstr ""
-#: src/gui/popupmenu.cpp:196 src/gui/popupmenu.cpp:419
-#: src/gui/popupmenu.cpp:673
+#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:437
+#: src/gui/popupmenu.cpp:702
msgid "Imitation"
msgstr ""
-#: src/gui/popupmenu.cpp:206 src/gui/popupmenu.cpp:710
+#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:739
msgid "Invite to party"
msgstr ""
-#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:428
-#: src/gui/popupmenu.cpp:715
+#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:744
msgid "Kick from party"
msgstr ""
-#: src/gui/popupmenu.cpp:226 src/gui/popupmenu.cpp:439
-#: src/gui/popupmenu.cpp:729
+#: src/gui/popupmenu.cpp:225 src/gui/popupmenu.cpp:237
+#: src/gui/popupmenu.cpp:460 src/gui/popupmenu.cpp:761
msgid "Kick from guild"
msgstr ""
-#: src/gui/popupmenu.cpp:228 src/gui/popupmenu.cpp:441
-#: src/gui/popupmenu.cpp:731
+#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:242
+#: src/gui/popupmenu.cpp:465 src/gui/popupmenu.cpp:766
msgid "Change pos in guild"
msgstr ""
-#: src/gui/popupmenu.cpp:234 src/gui/popupmenu.cpp:446
-#: src/gui/popupmenu.cpp:737
+#: src/gui/popupmenu.cpp:251 src/gui/popupmenu.cpp:474
+#: src/gui/popupmenu.cpp:776
msgid "Invite to guild"
msgstr ""
-#: src/gui/popupmenu.cpp:242
+#: src/gui/popupmenu.cpp:260
msgid "Kick player"
msgstr ""
-#: src/gui/popupmenu.cpp:244
+#: src/gui/popupmenu.cpp:262
msgid "Nuke"
msgstr ""
-#: src/gui/popupmenu.cpp:247 src/gui/popupmenu.cpp:675
+#: src/gui/popupmenu.cpp:265 src/gui/popupmenu.cpp:704
msgid "Show Items"
msgstr ""
-#: src/gui/popupmenu.cpp:248 src/gui/popupmenu.cpp:676
-#: src/gui/popupmenu.cpp:1970
+#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:705
+#: src/gui/popupmenu.cpp:2020
msgid "Undress"
msgstr ""
-#: src/gui/popupmenu.cpp:250 src/gui/popupmenu.cpp:286
-#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:678
-#: src/gui/popupmenu.cpp:746
+#: src/gui/popupmenu.cpp:268 src/gui/popupmenu.cpp:304
+#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:707
+#: src/gui/popupmenu.cpp:786
msgid "Add comment"
msgstr ""
-#: src/gui/popupmenu.cpp:268 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:695
+#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:482
+#: src/gui/popupmenu.cpp:724
msgid "Buy (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:454
-#: src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:483
+#: src/gui/popupmenu.cpp:726
msgid "Sell (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:298
+#: src/gui/popupmenu.cpp:316
msgid "Kick"
msgstr ""
-#: src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:327
msgid "Remove from attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:315
+#: src/gui/popupmenu.cpp:333
msgid "Add to priority attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:317
+#: src/gui/popupmenu.cpp:335
msgid "Add to attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:320
+#: src/gui/popupmenu.cpp:338
msgid "Add to ignore list"
msgstr ""
-#: src/gui/popupmenu.cpp:333 src/gui/popupmenu.cpp:457
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:486
msgid "Add name to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:483
+#: src/gui/popupmenu.cpp:512
msgid "Pick up"
msgstr ""
-#: src/gui/popupmenu.cpp:484 src/gui/popupmenu.cpp:1682
-#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1805
+#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:1732
+#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1855
msgid "Add to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:501
+#: src/gui/popupmenu.cpp:530
msgid "Map Item"
msgstr ""
-#: src/gui/popupmenu.cpp:502
+#: src/gui/popupmenu.cpp:531
msgid "Rename"
msgstr ""
-#: src/gui/popupmenu.cpp:503 src/gui/popupmenu.cpp:1923
-#: src/gui/popupmenu.cpp:1941 src/gui/popupmenu.cpp:1946
+#: src/gui/popupmenu.cpp:532 src/gui/popupmenu.cpp:1973
+#: src/gui/popupmenu.cpp:1991 src/gui/popupmenu.cpp:1996
msgid "Remove"
msgstr ""
-#: src/gui/popupmenu.cpp:508
+#: src/gui/popupmenu.cpp:537
msgid "Warp"
msgstr ""
-#: src/gui/popupmenu.cpp:522
+#: src/gui/popupmenu.cpp:551
msgid "Load old outfits"
msgstr ""
-#: src/gui/popupmenu.cpp:538 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:567 src/gui/windowmenu.cpp:96
msgid "Spells"
msgstr ""
-#: src/gui/popupmenu.cpp:540
+#: src/gui/popupmenu.cpp:569
msgid "Load old spells"
msgstr ""
-#: src/gui/popupmenu.cpp:541
+#: src/gui/popupmenu.cpp:570
msgid "Edit spell"
msgstr ""
-#: src/gui/popupmenu.cpp:567
+#: src/gui/popupmenu.cpp:596
msgid "Disable highlight"
msgstr ""
-#: src/gui/popupmenu.cpp:572
+#: src/gui/popupmenu.cpp:601
msgid "Enable highlight"
msgstr ""
-#: src/gui/popupmenu.cpp:577
-msgid "Dont remove name"
+#: src/gui/popupmenu.cpp:606
+msgid "Don't remove name"
msgstr ""
-#: src/gui/popupmenu.cpp:582
+#: src/gui/popupmenu.cpp:611
msgid "Remove name"
msgstr ""
-#: src/gui/popupmenu.cpp:587
+#: src/gui/popupmenu.cpp:616
msgid "Enable away"
msgstr ""
-#: src/gui/popupmenu.cpp:592
+#: src/gui/popupmenu.cpp:621
msgid "Disable away"
msgstr ""
-#: src/gui/popupmenu.cpp:598 src/gui/socialwindow.cpp:1035
+#: src/gui/popupmenu.cpp:627 src/gui/socialwindow.cpp:1141
msgid "Leave"
msgstr ""
-#: src/gui/popupmenu.cpp:758
+#: src/gui/popupmenu.cpp:798
msgid "Change guild position"
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1189
+#: src/gui/popupmenu.cpp:1234
msgid "Rename map sign "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1191
+#: src/gui/popupmenu.cpp:1236
msgid "Name: "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1241
+#: src/gui/popupmenu.cpp:1286
msgid "Player comment "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1243
+#: src/gui/popupmenu.cpp:1288
msgid "Comment: "
msgstr ""
-#: src/gui/popupmenu.cpp:1607
+#: src/gui/popupmenu.cpp:1657
msgid "Add to trade"
msgstr ""
-#: src/gui/popupmenu.cpp:1613
+#: src/gui/popupmenu.cpp:1663
msgid "Add to trade 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1616
+#: src/gui/popupmenu.cpp:1666
msgid "Add to trade half"
msgstr ""
-#: src/gui/popupmenu.cpp:1618
+#: src/gui/popupmenu.cpp:1668
msgid "Add to trade all"
msgstr ""
-#: src/gui/popupmenu.cpp:1630
+#: src/gui/popupmenu.cpp:1680
msgid "Store 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1633
+#: src/gui/popupmenu.cpp:1683
msgid "Store half"
msgstr ""
-#: src/gui/popupmenu.cpp:1635
+#: src/gui/popupmenu.cpp:1685
msgid "Store all"
msgstr ""
-#: src/gui/popupmenu.cpp:1653 src/gui/popupmenu.cpp:1750
-#: src/gui/popupmenu.cpp:1793
+#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1800
+#: src/gui/popupmenu.cpp:1843
msgid "Drop all"
msgstr ""
-#: src/gui/popupmenu.cpp:1674
+#: src/gui/popupmenu.cpp:1724
msgid "Retrieve 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1677
+#: src/gui/popupmenu.cpp:1727
msgid "Retrieve half"
msgstr ""
-#: src/gui/popupmenu.cpp:1679
+#: src/gui/popupmenu.cpp:1729
msgid "Retrieve all"
msgstr ""
-#: src/gui/popupmenu.cpp:1710 src/gui/popupmenu.cpp:1766
+#: src/gui/popupmenu.cpp:1760 src/gui/popupmenu.cpp:1816
msgid "Load old item shortcuts"
msgstr ""
-#: src/gui/popupmenu.cpp:1809
+#: src/gui/popupmenu.cpp:1859
msgid "Load old drop shortcuts"
msgstr ""
-#: src/gui/popupmenu.cpp:1835 src/gui/popupmenu.cpp:1870
+#: src/gui/popupmenu.cpp:1885 src/gui/popupmenu.cpp:1920
msgid "Hide"
msgstr ""
-#: src/gui/popupmenu.cpp:1841 src/gui/popupmenu.cpp:1876
+#: src/gui/popupmenu.cpp:1891 src/gui/popupmenu.cpp:1926
msgid "Show"
msgstr ""
-#: src/gui/popupmenu.cpp:1883
+#: src/gui/popupmenu.cpp:1933
msgid "Reset yellow bar"
msgstr ""
-#: src/gui/popupmenu.cpp:1885 src/gui/statuswindow.cpp:240
+#: src/gui/popupmenu.cpp:1935 src/gui/statuswindow.cpp:241
msgid "Copy to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:1903 src/gui/socialwindow.cpp:854
-#: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
+#: src/gui/popupmenu.cpp:1953 src/gui/socialwindow.cpp:958
+#: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028
msgid "(default)"
msgstr ""
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1933
+#: src/gui/popupmenu.cpp:1965 src/gui/popupmenu.cpp:1983
msgid "Move up"
msgstr ""
-#: src/gui/popupmenu.cpp:1920 src/gui/popupmenu.cpp:1938
+#: src/gui/popupmenu.cpp:1970 src/gui/popupmenu.cpp:1988
msgid "Move down"
msgstr ""
-#: src/gui/quitdialog.cpp:56
+#: src/gui/quitdialog.cpp:51
msgid "Switch server"
msgstr "Promijeni poslužitelj"
-#: src/gui/quitdialog.cpp:57
+#: src/gui/quitdialog.cpp:52
msgid "Switch character"
msgstr "Promijeni lika"
@@ -1625,64 +1629,64 @@ msgstr "Lozinka mora biti kraća od %d znakova."
msgid "Passwords do not match."
msgstr "Lozinke se ne podudaraju."
-#: src/gui/serverdialog.cpp:231
+#: src/gui/serverdialog.cpp:237
msgid "Choose Your Server"
msgstr ""
-#: src/gui/serverdialog.cpp:242
+#: src/gui/serverdialog.cpp:248
msgid "Choose Your Server *** SAFE MODE ***"
msgstr ""
-#: src/gui/serverdialog.cpp:247
+#: src/gui/serverdialog.cpp:253
msgid "Port:"
msgstr "Port:"
-#: src/gui/serverdialog.cpp:251
+#: src/gui/serverdialog.cpp:257
msgid "Use same ip for game sub servers"
msgstr ""
-#: src/gui/serverdialog.cpp:265
+#: src/gui/serverdialog.cpp:271
msgid "Server type:"
msgstr ""
-#: src/gui/serverdialog.cpp:289
+#: src/gui/serverdialog.cpp:295
msgid "Load"
msgstr ""
-#: src/gui/serverdialog.cpp:290
+#: src/gui/serverdialog.cpp:296
msgid "Connect"
msgstr ""
-#: src/gui/serverdialog.cpp:291
+#: src/gui/serverdialog.cpp:297
msgid "Custom Server"
msgstr ""
-#: src/gui/serverdialog.cpp:396
+#: src/gui/serverdialog.cpp:402
msgid "Please type both the address and the port of a server."
msgstr "Molimo upišite adresu poslužitelja i port poslužitelja."
-#: src/gui/serverdialog.cpp:554
+#: src/gui/serverdialog.cpp:560
#, c-format
msgid "Downloading server list...%2.2f%%"
msgstr ""
-#: src/gui/serverdialog.cpp:559
+#: src/gui/serverdialog.cpp:565
msgid "Waiting for server..."
msgstr ""
-#: src/gui/serverdialog.cpp:563
+#: src/gui/serverdialog.cpp:569
msgid "Preparing download"
msgstr ""
-#: src/gui/serverdialog.cpp:567
+#: src/gui/serverdialog.cpp:573
msgid "Error retreiving server list!"
msgstr ""
-#: src/gui/serverdialog.cpp:672
+#: src/gui/serverdialog.cpp:678
msgid "requires a newer version"
msgstr ""
-#: src/gui/serverdialog.cpp:674
+#: src/gui/serverdialog.cpp:680
#, c-format
msgid "requires v%s"
msgstr ""
@@ -1827,6 +1831,14 @@ msgstr ""
msgid "Use local time"
msgstr ""
+#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:157
+msgid "Other"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:125
+msgid "Highlight words (separated by comma)"
+msgstr ""
+
#: src/gui/setup_colors.cpp:49
msgid "This is what the color looks like"
msgstr "Ovako izgleda boja"
@@ -1874,11 +1886,11 @@ msgstr ""
msgid "Alpha:"
msgstr ""
-#: src/gui/setup.cpp:70
+#: src/gui/setup.cpp:71
msgid "Apply"
msgstr "Primjeni"
-#: src/gui/setup.cpp:73
+#: src/gui/setup.cpp:74
msgid "Reset Windows"
msgstr "Ponovno pokreni prozore"
@@ -2055,34 +2067,42 @@ msgid "Log NPC dialogue"
msgstr ""
#: src/gui/setup_other.cpp:148
-msgid "Other"
+msgid "Bots support"
msgstr ""
#: src/gui/setup_other.cpp:150
-msgid "Enable server side attack"
+msgid "Enable auction bot support"
msgstr ""
#: src/gui/setup_other.cpp:153
+msgid "Enable guild bot support and disable native guild support"
+msgstr ""
+
+#: src/gui/setup_other.cpp:159
+msgid "Enable server side attack"
+msgstr ""
+
+#: src/gui/setup_other.cpp:162
msgid "Enable bot checker"
msgstr ""
-#: src/gui/setup_other.cpp:156
+#: src/gui/setup_other.cpp:165
msgid "Enable buggy servers protection"
msgstr ""
-#: src/gui/setup_other.cpp:159
+#: src/gui/setup_other.cpp:168
msgid "Enable debug log"
msgstr ""
-#: src/gui/setup_other.cpp:162
+#: src/gui/setup_other.cpp:171
msgid "Low traffic mode"
msgstr ""
-#: src/gui/setup_other.cpp:165
+#: src/gui/setup_other.cpp:174
msgid "Hide shield sprite"
msgstr ""
-#: src/gui/setup_other.cpp:168
+#: src/gui/setup_other.cpp:177
msgid "Show background"
msgstr ""
@@ -2178,6 +2198,10 @@ msgstr ""
msgid "Show ip addresses on screenshots"
msgstr ""
+#: src/gui/setup_players.cpp:81
+msgid "Allow self heal with mouse click"
+msgstr ""
+
#: src/gui/setup_relations.cpp:65
msgid "Relation"
msgstr "Odnos"
@@ -2450,261 +2474,266 @@ msgstr ""
msgid "Changes will take effect on map change."
msgstr "Promjene će stupiti na snagu na promjeni karte."
-#: src/gui/shopwindow.cpp:74
+#: src/gui/shopwindow.cpp:75
msgid "Personal Shop"
msgstr ""
-#: src/gui/shopwindow.cpp:116
+#: src/gui/shopwindow.cpp:118
msgid "Buy items"
msgstr ""
-#: src/gui/shopwindow.cpp:117
+#: src/gui/shopwindow.cpp:119
msgid "Sell items"
msgstr ""
-#: src/gui/shopwindow.cpp:119 src/gui/shopwindow.cpp:122
-#: src/gui/tradewindow.cpp:88
+#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
+#: src/gui/tradewindow.cpp:89
msgid "Add"
msgstr "Dodaj"
-#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
+#: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
msgid "Announce"
msgstr ""
-#: src/gui/shopwindow.cpp:125
+#: src/gui/shopwindow.cpp:127
msgid "Show links in announce"
msgstr ""
-#: src/gui/shopwindow.cpp:723 src/net/ea/tradehandler.cpp:106
+#: src/gui/shopwindow.cpp:148 src/gui/shopwindow.cpp:149
+msgid "Auction"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:748 src/net/ea/tradehandler.cpp:106
#: src/net/manaserv/tradehandler.cpp:127
msgid "Request for Trade"
msgstr "Zahtjev za Trgovanje"
-#: src/gui/shopwindow.cpp:724
+#: src/gui/shopwindow.cpp:749
#, c-format
msgid "%s wants to %s %s do you accept?"
msgstr ""
-#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:81
+#: src/gui/skilldialog.cpp:276 src/gui/windowmenu.cpp:81
msgid "Skills"
msgstr "Vještine"
-#: src/gui/skilldialog.cpp:283
+#: src/gui/skilldialog.cpp:288
msgid "Up"
msgstr "Gore"
-#: src/gui/skilldialog.cpp:336
+#: src/gui/skilldialog.cpp:341
#, c-format
msgid "Skill points available: %d"
msgstr ""
-#: src/gui/skilldialog.cpp:413
+#: src/gui/skilldialog.cpp:418
#, c-format
msgid "Skill Set %d"
msgstr ""
-#: src/gui/skilldialog.cpp:425
+#: src/gui/skilldialog.cpp:430
#, c-format
msgid "Skill %d"
msgstr ""
-#: src/gui/skilldialog.cpp:492 src/gui/skilldialog.cpp:545
+#: src/gui/skilldialog.cpp:497 src/gui/skilldialog.cpp:550
#, c-format
msgid "Lvl: %d"
msgstr ""
-#: src/gui/skilldialog.cpp:537
+#: src/gui/skilldialog.cpp:542
#, c-format
msgid "Lvl: %d (%+d)"
msgstr ""
-#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
+#: src/gui/socialwindow.cpp:118 src/gui/socialwindow.cpp:216
+#: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52
msgid "Guild"
msgstr "Ceh"
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:147
#, c-format
msgid "Invited user %s to guild %s."
msgstr ""
-#: src/gui/socialwindow.cpp:160
+#: src/gui/socialwindow.cpp:161
#, c-format
msgid "Guild %s quit requested."
msgstr ""
-#: src/gui/socialwindow.cpp:187
+#: src/gui/socialwindow.cpp:188
msgid "Member Invite to Guild"
msgstr ""
-#: src/gui/socialwindow.cpp:188
+#: src/gui/socialwindow.cpp:189
#, c-format
msgid "Who would you like to invite to guild %s?"
msgstr ""
-#: src/gui/socialwindow.cpp:197
+#: src/gui/socialwindow.cpp:198
msgid "Leave Guild?"
msgstr ""
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:199
#, c-format
msgid "Are you sure you want to leave guild %s?"
msgstr ""
-#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:319 src/net/ea/gui/partytab.cpp:50
msgid "Party"
msgstr "Partija"
-#: src/gui/socialwindow.cpp:243
+#: src/gui/socialwindow.cpp:347
#, c-format
msgid "Invited user %s to party."
msgstr ""
-#: src/gui/socialwindow.cpp:257
+#: src/gui/socialwindow.cpp:361
#, c-format
msgid "Party %s quit requested."
msgstr ""
-#: src/gui/socialwindow.cpp:284
+#: src/gui/socialwindow.cpp:388
msgid "Member Invite to Party"
msgstr ""
-#: src/gui/socialwindow.cpp:285
+#: src/gui/socialwindow.cpp:389
#, c-format
msgid "Who would you like to invite to party %s?"
msgstr ""
-#: src/gui/socialwindow.cpp:294
+#: src/gui/socialwindow.cpp:398
msgid "Leave Party?"
msgstr ""
-#: src/gui/socialwindow.cpp:295
+#: src/gui/socialwindow.cpp:399
#, c-format
msgid "Are you sure you want to leave party %s?"
msgstr ""
-#: src/gui/socialwindow.cpp:521
+#: src/gui/socialwindow.cpp:625
msgid "Nav"
msgstr ""
-#: src/gui/socialwindow.cpp:799
+#: src/gui/socialwindow.cpp:903
msgid "Atk"
msgstr ""
-#: src/gui/socialwindow.cpp:840
+#: src/gui/socialwindow.cpp:944
msgid "Priority mobs"
msgstr ""
-#: src/gui/socialwindow.cpp:872
+#: src/gui/socialwindow.cpp:976
msgid "Attack mobs"
msgstr ""
-#: src/gui/socialwindow.cpp:907
+#: src/gui/socialwindow.cpp:1011
msgid "Ignore mobs"
msgstr ""
-#: src/gui/socialwindow.cpp:970
+#: src/gui/socialwindow.cpp:1074
msgid "Create Guild"
msgstr "Formiraj Ceh"
-#: src/gui/socialwindow.cpp:971 src/gui/socialwindow.cpp:1387
+#: src/gui/socialwindow.cpp:1075 src/gui/socialwindow.cpp:1503
msgid "Create Party"
msgstr ""
-#: src/gui/socialwindow.cpp:1013 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1117 src/gui/windowmenu.cpp:93
msgid "Social"
msgstr ""
-#: src/gui/socialwindow.cpp:1034
+#: src/gui/socialwindow.cpp:1140
msgid "Invite"
msgstr ""
-#: src/gui/socialwindow.cpp:1176
+#: src/gui/socialwindow.cpp:1286
#, c-format
msgid "Accepted party invite from %s."
msgstr ""
-#: src/gui/socialwindow.cpp:1186
+#: src/gui/socialwindow.cpp:1296
#, c-format
msgid "Rejected party invite from %s."
msgstr ""
-#: src/gui/socialwindow.cpp:1203
+#: src/gui/socialwindow.cpp:1313
#, c-format
msgid "Accepted guild invite from %s."
msgstr ""
-#: src/gui/socialwindow.cpp:1213
+#: src/gui/socialwindow.cpp:1326
#, c-format
msgid "Rejected guild invite from %s."
msgstr ""
-#: src/gui/socialwindow.cpp:1257
+#: src/gui/socialwindow.cpp:1373
#, c-format
msgid "Creating guild called %s."
msgstr ""
-#: src/gui/socialwindow.cpp:1280
+#: src/gui/socialwindow.cpp:1396
#, c-format
msgid "Creating party called %s."
msgstr ""
-#: src/gui/socialwindow.cpp:1294
+#: src/gui/socialwindow.cpp:1410
msgid "Guild Name"
msgstr ""
-#: src/gui/socialwindow.cpp:1295
+#: src/gui/socialwindow.cpp:1411
msgid "Choose your guild's name."
msgstr ""
-#: src/gui/socialwindow.cpp:1309
+#: src/gui/socialwindow.cpp:1425
msgid "Received guild request, but one already exists."
msgstr ""
-#: src/gui/socialwindow.cpp:1315
+#: src/gui/socialwindow.cpp:1431
#, c-format
msgid "%s has invited you to join the guild %s."
msgstr ""
-#: src/gui/socialwindow.cpp:1321
+#: src/gui/socialwindow.cpp:1437
msgid "Accept Guild Invite"
msgstr ""
-#: src/gui/socialwindow.cpp:1336
+#: src/gui/socialwindow.cpp:1452
msgid "Received party request, but one already exists."
msgstr "Primljen zahtjev za partiju, ali ona već postoji."
-#: src/gui/socialwindow.cpp:1347
+#: src/gui/socialwindow.cpp:1463
msgid "You have been invited you to join a party."
msgstr ""
-#: src/gui/socialwindow.cpp:1351
+#: src/gui/socialwindow.cpp:1467
#, c-format
msgid "You have been invited to join the %s party."
msgstr ""
-#: src/gui/socialwindow.cpp:1359
+#: src/gui/socialwindow.cpp:1475
#, c-format
msgid "%s has invited you to join their party."
msgstr "%s vas je pozvao/la da se pridružite njihovoj partiji."
-#: src/gui/socialwindow.cpp:1364
+#: src/gui/socialwindow.cpp:1480
#, c-format
msgid "%s has invited you to join the %s party."
msgstr "%s vas je pozvao/la da se pridružite %s partiji."
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1489
msgid "Accept Party Invite"
msgstr "Prihvati Pozivnicu za Partiju"
-#: src/gui/socialwindow.cpp:1388
+#: src/gui/socialwindow.cpp:1504
msgid "Cannot create party. You are already in a party"
msgstr ""
-#: src/gui/socialwindow.cpp:1393
+#: src/gui/socialwindow.cpp:1509
msgid "Party Name"
msgstr ""
-#: src/gui/socialwindow.cpp:1394
+#: src/gui/socialwindow.cpp:1510
msgid "Choose your party's name."
msgstr ""
@@ -2712,418 +2741,418 @@ msgstr ""
msgid "Specials"
msgstr ""
-#: src/gui/statuspopup.cpp:197
+#: src/gui/statuspopup.cpp:198
msgid "(D) default moves"
msgstr ""
-#: src/gui/statuspopup.cpp:202
+#: src/gui/statuspopup.cpp:203
msgid "(I) invert moves"
msgstr ""
-#: src/gui/statuspopup.cpp:207
+#: src/gui/statuspopup.cpp:208
msgid "(c) moves with some crazy moves"
msgstr ""
-#: src/gui/statuspopup.cpp:212
+#: src/gui/statuspopup.cpp:213
msgid "(C) moves with crazy moves"
msgstr ""
-#: src/gui/statuspopup.cpp:217
+#: src/gui/statuspopup.cpp:218
msgid "(d) double normal + crazy"
msgstr ""
-#: src/gui/statuspopup.cpp:222
+#: src/gui/statuspopup.cpp:223
msgid "(?) move"
msgstr ""
-#: src/gui/statuspopup.cpp:240
+#: src/gui/statuspopup.cpp:241
msgid "(a) custom crazy move"
msgstr ""
-#: src/gui/statuspopup.cpp:244
+#: src/gui/statuspopup.cpp:245
msgid "(?) crazy move"
msgstr ""
-#: src/gui/statuspopup.cpp:254
+#: src/gui/statuspopup.cpp:255
msgid "(0) default moves to target"
msgstr ""
-#: src/gui/statuspopup.cpp:259
+#: src/gui/statuspopup.cpp:260
msgid "(1) moves to target in distance 1"
msgstr ""
-#: src/gui/statuspopup.cpp:264
+#: src/gui/statuspopup.cpp:265
msgid "(2) moves to target in distance 2"
msgstr ""
-#: src/gui/statuspopup.cpp:269
+#: src/gui/statuspopup.cpp:270
msgid "(3) moves to target in distance 3"
msgstr ""
-#: src/gui/statuspopup.cpp:274
+#: src/gui/statuspopup.cpp:275
msgid "(5) moves to target in distance 5"
msgstr ""
-#: src/gui/statuspopup.cpp:279
+#: src/gui/statuspopup.cpp:280
msgid "(7) moves to target in distance 7"
msgstr ""
-#: src/gui/statuspopup.cpp:284
+#: src/gui/statuspopup.cpp:285
msgid "(A) moves to target in attack range"
msgstr ""
-#: src/gui/statuspopup.cpp:289
+#: src/gui/statuspopup.cpp:290
msgid "(?) move to target"
msgstr ""
-#: src/gui/statuspopup.cpp:297
+#: src/gui/statuspopup.cpp:298
msgid "(D) default follow"
msgstr ""
-#: src/gui/statuspopup.cpp:301
+#: src/gui/statuspopup.cpp:302
msgid "(R) relative follow"
msgstr ""
-#: src/gui/statuspopup.cpp:305
+#: src/gui/statuspopup.cpp:306
msgid "(M) mirror follow"
msgstr ""
-#: src/gui/statuspopup.cpp:309
+#: src/gui/statuspopup.cpp:310
msgid "(P) pet follow"
msgstr ""
-#: src/gui/statuspopup.cpp:313
+#: src/gui/statuspopup.cpp:314
msgid "(?) unknown follow"
msgstr ""
-#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
+#: src/gui/statuspopup.cpp:323 src/gui/statuspopup.cpp:346
msgid "(D) default attack"
msgstr ""
-#: src/gui/statuspopup.cpp:327
+#: src/gui/statuspopup.cpp:328
msgid "(s) switch attack without shield"
msgstr ""
-#: src/gui/statuspopup.cpp:332
+#: src/gui/statuspopup.cpp:333
msgid "(S) switch attack with shield"
msgstr ""
-#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
+#: src/gui/statuspopup.cpp:337 src/gui/statuspopup.cpp:362
msgid "(?) attack"
msgstr ""
-#: src/gui/statuspopup.cpp:349
+#: src/gui/statuspopup.cpp:350
msgid "(G) go and attack"
msgstr ""
-#: src/gui/statuspopup.cpp:353
+#: src/gui/statuspopup.cpp:354
msgid "(A) go, attack, pickup"
msgstr ""
-#: src/gui/statuspopup.cpp:357
+#: src/gui/statuspopup.cpp:358
msgid "(d) without auto attack"
msgstr ""
-#: src/gui/statuspopup.cpp:375
+#: src/gui/statuspopup.cpp:376
msgid "(S) small pick up 1x1 cells"
msgstr ""
-#: src/gui/statuspopup.cpp:379
+#: src/gui/statuspopup.cpp:380
msgid "(D) default pick up 2x1 cells"
msgstr ""
-#: src/gui/statuspopup.cpp:383
+#: src/gui/statuspopup.cpp:384
msgid "(F) forward pick up 2x3 cells"
msgstr ""
-#: src/gui/statuspopup.cpp:387
+#: src/gui/statuspopup.cpp:388
msgid "(3) pick up 3x3 cells"
msgstr ""
-#: src/gui/statuspopup.cpp:391
+#: src/gui/statuspopup.cpp:392
msgid "(g) go and pick up in distance 4"
msgstr ""
-#: src/gui/statuspopup.cpp:395
+#: src/gui/statuspopup.cpp:396
msgid "(G) go and pick up in distance 8"
msgstr ""
-#: src/gui/statuspopup.cpp:399
+#: src/gui/statuspopup.cpp:400
msgid "(A) go and pick up in max distance"
msgstr ""
-#: src/gui/statuspopup.cpp:403
+#: src/gui/statuspopup.cpp:404
msgid "(?) pick up"
msgstr ""
-#: src/gui/statuspopup.cpp:412
+#: src/gui/statuspopup.cpp:413
msgid "(N) normal map view"
msgstr ""
-#: src/gui/statuspopup.cpp:416
+#: src/gui/statuspopup.cpp:417
msgid "(D) debug map view"
msgstr ""
-#: src/gui/statuspopup.cpp:420
+#: src/gui/statuspopup.cpp:421
msgid "(u) ultra map view"
msgstr ""
-#: src/gui/statuspopup.cpp:424
+#: src/gui/statuspopup.cpp:425
msgid "(U) ultra map view 2"
msgstr ""
-#: src/gui/statuspopup.cpp:428
+#: src/gui/statuspopup.cpp:429
msgid "(e) empty map view"
msgstr ""
-#: src/gui/statuspopup.cpp:432
+#: src/gui/statuspopup.cpp:433
msgid "(b) black & white map view"
msgstr ""
-#: src/gui/statuspopup.cpp:436
+#: src/gui/statuspopup.cpp:437
msgid "(?) map view"
msgstr ""
-#: src/gui/statuspopup.cpp:444
+#: src/gui/statuspopup.cpp:445
msgid "(f) use #flar for magic attack"
msgstr ""
-#: src/gui/statuspopup.cpp:449
+#: src/gui/statuspopup.cpp:450
msgid "(c) use #chiza for magic attack"
msgstr ""
-#: src/gui/statuspopup.cpp:454
+#: src/gui/statuspopup.cpp:455
msgid "(I) use #ingrav for magic attack"
msgstr ""
-#: src/gui/statuspopup.cpp:459
+#: src/gui/statuspopup.cpp:460
msgid "(F) use #frillyar for magic attack"
msgstr ""
-#: src/gui/statuspopup.cpp:464
+#: src/gui/statuspopup.cpp:465
msgid "(U) use #upmarmu for magic attack"
msgstr ""
-#: src/gui/statuspopup.cpp:468
+#: src/gui/statuspopup.cpp:469
msgid "(?) magic attack"
msgstr ""
-#: src/gui/statuspopup.cpp:477
+#: src/gui/statuspopup.cpp:478
msgid "(D) default imitation"
msgstr ""
-#: src/gui/statuspopup.cpp:481
+#: src/gui/statuspopup.cpp:482
msgid "(O) outfits imitation"
msgstr ""
-#: src/gui/statuspopup.cpp:485
+#: src/gui/statuspopup.cpp:486
msgid "(?) imitation"
msgstr ""
-#: src/gui/statuspopup.cpp:494
+#: src/gui/statuspopup.cpp:495
msgid "(O) on keyboard"
msgstr ""
-#: src/gui/statuspopup.cpp:497
+#: src/gui/statuspopup.cpp:498
msgid "(A) away"
msgstr ""
-#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
+#: src/gui/statuspopup.cpp:501 src/gui/statuspopup.cpp:521
msgid "(?) away"
msgstr ""
-#: src/gui/statuspopup.cpp:508
+#: src/gui/statuspopup.cpp:509
msgid "(G) game camera mode"
msgstr ""
-#: src/gui/statuspopup.cpp:512
+#: src/gui/statuspopup.cpp:513
msgid "(F) free camera mode"
msgstr ""
-#: src/gui/statuspopup.cpp:516
+#: src/gui/statuspopup.cpp:517
msgid "(D) design camera mode"
msgstr ""
-#: src/gui/statuspopup.cpp:527
+#: src/gui/statuspopup.cpp:528
msgid "Game modifiers are disabled"
msgstr ""
-#: src/gui/statuspopup.cpp:532
+#: src/gui/statuspopup.cpp:533
msgid "Game modifiers are enabled"
msgstr ""
-#: src/gui/statuswindow.cpp:142 src/gui/statuswindow.cpp:272
-#: src/gui/statuswindow.cpp:335
+#: src/gui/statuswindow.cpp:143 src/gui/statuswindow.cpp:273
+#: src/gui/statuswindow.cpp:336
#, c-format
msgid "Level: %d"
msgstr "Nivo: %d"
-#: src/gui/statuswindow.cpp:143 src/gui/statuswindow.cpp:258
-#: src/gui/statuswindow.cpp:302
+#: src/gui/statuswindow.cpp:144 src/gui/statuswindow.cpp:259
+#: src/gui/statuswindow.cpp:303
#, c-format
msgid "Money: %s"
msgstr "Novac: %s"
-#: src/gui/statuswindow.cpp:149
+#: src/gui/statuswindow.cpp:150
msgid "HP:"
msgstr "HP:"
-#: src/gui/statuswindow.cpp:156
+#: src/gui/statuswindow.cpp:157
msgid "Exp:"
msgstr "Exp:"
-#: src/gui/statuswindow.cpp:170
+#: src/gui/statuswindow.cpp:171
msgid "MP:"
msgstr "MP:"
-#: src/gui/statuswindow.cpp:202 src/gui/statuswindow.cpp:385
+#: src/gui/statuswindow.cpp:203 src/gui/statuswindow.cpp:386
#, c-format
msgid "Job: %d"
msgstr "Zadatak: %d"
-#: src/gui/statuswindow.cpp:203
+#: src/gui/statuswindow.cpp:204
msgid "Job:"
msgstr "Zadatak:"
-#: src/gui/statuswindow.cpp:261 src/gui/statuswindow.cpp:309
+#: src/gui/statuswindow.cpp:262 src/gui/statuswindow.cpp:310
#, c-format
msgid "Character points: %d"
msgstr ""
-#: src/gui/statuswindow.cpp:267
+#: src/gui/statuswindow.cpp:268
#, c-format
msgid "Level: %d (GM %d)"
msgstr ""
-#: src/gui/statuswindow.cpp:323
+#: src/gui/statuswindow.cpp:324
#, c-format
msgid "Correction points: %d"
msgstr ""
-#: src/gui/statuswindow.cpp:646 src/gui/statuswindow.cpp:711
-#: src/gui/statuswindow.cpp:731 src/gui/statuswindow.cpp:747
-#: src/gui/statuswindow.cpp:793 src/gui/statuswindow.cpp:822
-#: src/gui/statuswindow.cpp:845 src/gui/statuswindow.cpp:864
+#: src/gui/statuswindow.cpp:647 src/gui/statuswindow.cpp:712
+#: src/gui/statuswindow.cpp:732 src/gui/statuswindow.cpp:748
+#: src/gui/statuswindow.cpp:794 src/gui/statuswindow.cpp:823
+#: src/gui/statuswindow.cpp:846 src/gui/statuswindow.cpp:865
msgid "(D)"
msgstr ""
-#: src/gui/statuswindow.cpp:649 src/gui/statuswindow.cpp:772
+#: src/gui/statuswindow.cpp:650 src/gui/statuswindow.cpp:773
msgid "(I)"
msgstr ""
-#: src/gui/statuswindow.cpp:652 src/gui/statuswindow.cpp:769
+#: src/gui/statuswindow.cpp:653 src/gui/statuswindow.cpp:770
msgid "(c)"
msgstr ""
-#: src/gui/statuswindow.cpp:655
+#: src/gui/statuswindow.cpp:656
msgid "(C)"
msgstr ""
-#: src/gui/statuswindow.cpp:658 src/gui/statuswindow.cpp:756
+#: src/gui/statuswindow.cpp:659 src/gui/statuswindow.cpp:757
msgid "(d)"
msgstr ""
-#: src/gui/statuswindow.cpp:661 src/gui/statuswindow.cpp:675
-#: src/gui/statuswindow.cpp:704 src/gui/statuswindow.cpp:723
-#: src/gui/statuswindow.cpp:740 src/gui/statuswindow.cpp:759
-#: src/gui/statuswindow.cpp:781 src/gui/statuswindow.cpp:811
-#: src/gui/statuswindow.cpp:837 src/gui/statuswindow.cpp:851
-#: src/gui/statuswindow.cpp:867 src/gui/statuswindow.cpp:880
+#: src/gui/statuswindow.cpp:662 src/gui/statuswindow.cpp:676
+#: src/gui/statuswindow.cpp:705 src/gui/statuswindow.cpp:724
+#: src/gui/statuswindow.cpp:741 src/gui/statuswindow.cpp:760
+#: src/gui/statuswindow.cpp:782 src/gui/statuswindow.cpp:812
+#: src/gui/statuswindow.cpp:838 src/gui/statuswindow.cpp:852
+#: src/gui/statuswindow.cpp:868 src/gui/statuswindow.cpp:881
msgid "(?)"
msgstr ""
-#: src/gui/statuswindow.cpp:672
+#: src/gui/statuswindow.cpp:673
msgid "(a)"
msgstr ""
-#: src/gui/statuswindow.cpp:683
+#: src/gui/statuswindow.cpp:684
msgid "(0)"
msgstr ""
-#: src/gui/statuswindow.cpp:686
+#: src/gui/statuswindow.cpp:687
msgid "(1)"
msgstr ""
-#: src/gui/statuswindow.cpp:689
+#: src/gui/statuswindow.cpp:690
msgid "(2)"
msgstr ""
-#: src/gui/statuswindow.cpp:692 src/gui/statuswindow.cpp:799
+#: src/gui/statuswindow.cpp:693 src/gui/statuswindow.cpp:800
msgid "(3)"
msgstr ""
-#: src/gui/statuswindow.cpp:695
+#: src/gui/statuswindow.cpp:696
msgid "(5)"
msgstr ""
-#: src/gui/statuswindow.cpp:698
+#: src/gui/statuswindow.cpp:699
msgid "(7)"
msgstr ""
-#: src/gui/statuswindow.cpp:701 src/gui/statuswindow.cpp:753
-#: src/gui/statuswindow.cpp:808 src/gui/statuswindow.cpp:877
+#: src/gui/statuswindow.cpp:702 src/gui/statuswindow.cpp:754
+#: src/gui/statuswindow.cpp:809 src/gui/statuswindow.cpp:878
msgid "(A)"
msgstr ""
-#: src/gui/statuswindow.cpp:714
+#: src/gui/statuswindow.cpp:715
msgid "(R)"
msgstr ""
-#: src/gui/statuswindow.cpp:717
+#: src/gui/statuswindow.cpp:718
msgid "(M)"
msgstr ""
-#: src/gui/statuswindow.cpp:720
+#: src/gui/statuswindow.cpp:721
msgid "(P)"
msgstr ""
-#: src/gui/statuswindow.cpp:734
+#: src/gui/statuswindow.cpp:735
msgid "(s)"
msgstr ""
-#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:790
+#: src/gui/statuswindow.cpp:738 src/gui/statuswindow.cpp:791
msgid "(S)"
msgstr ""
-#: src/gui/statuswindow.cpp:750 src/gui/statuswindow.cpp:805
-#: src/gui/statuswindow.cpp:858
+#: src/gui/statuswindow.cpp:751 src/gui/statuswindow.cpp:806
+#: src/gui/statuswindow.cpp:859
msgid "(G)"
msgstr ""
-#: src/gui/statuswindow.cpp:766
+#: src/gui/statuswindow.cpp:767
msgid "(f)"
msgstr ""
-#: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:796
-#: src/gui/statuswindow.cpp:861
+#: src/gui/statuswindow.cpp:776 src/gui/statuswindow.cpp:797
+#: src/gui/statuswindow.cpp:862
msgid "(F)"
msgstr ""
-#: src/gui/statuswindow.cpp:778 src/gui/statuswindow.cpp:828
+#: src/gui/statuswindow.cpp:779 src/gui/statuswindow.cpp:829
msgid "(U)"
msgstr ""
-#: src/gui/statuswindow.cpp:802
+#: src/gui/statuswindow.cpp:803
msgid "(g)"
msgstr ""
-#: src/gui/statuswindow.cpp:819
+#: src/gui/statuswindow.cpp:820
msgid "(N)"
msgstr ""
-#: src/gui/statuswindow.cpp:825
+#: src/gui/statuswindow.cpp:826
msgid "(u)"
msgstr ""
-#: src/gui/statuswindow.cpp:831
+#: src/gui/statuswindow.cpp:832
msgid "(e)"
msgstr ""
-#: src/gui/statuswindow.cpp:834
+#: src/gui/statuswindow.cpp:835
msgid "(b)"
msgstr ""
-#: src/gui/statuswindow.cpp:848 src/gui/statuswindow.cpp:874
+#: src/gui/statuswindow.cpp:849 src/gui/statuswindow.cpp:875
msgid "(O)"
msgstr ""
@@ -3231,24 +3260,24 @@ msgstr "Dogovoreno. Čekanje..."
msgid "Trade: You"
msgstr "Trgovanje: Vi"
-#: src/gui/tradewindow.cpp:110 src/gui/tradewindow.cpp:166
+#: src/gui/tradewindow.cpp:111 src/gui/tradewindow.cpp:167
#, c-format
msgid "You get %s"
msgstr ""
-#: src/gui/tradewindow.cpp:111
+#: src/gui/tradewindow.cpp:112
msgid "You give:"
msgstr "Daješ:"
-#: src/gui/tradewindow.cpp:115
+#: src/gui/tradewindow.cpp:116
msgid "Change"
msgstr "Izmijeni"
-#: src/gui/tradewindow.cpp:374
+#: src/gui/tradewindow.cpp:375
msgid "You don't have enough money."
msgstr "Nemate dovoljno novca."
-#: src/gui/tradewindow.cpp:453
+#: src/gui/tradewindow.cpp:454
msgid "Failed adding item. You can not overlap one kind of item on the window."
msgstr ""
@@ -3257,33 +3286,33 @@ msgstr ""
msgid "Name: %s"
msgstr "Ime: %s"
-#: src/gui/updaterwindow.cpp:136
+#: src/gui/updaterwindow.cpp:138
msgid "Updating..."
msgstr "Ažuriranje"
-#: src/gui/updaterwindow.cpp:155
+#: src/gui/updaterwindow.cpp:159
msgid "Connecting..."
msgstr "Spajanje..."
-#: src/gui/updaterwindow.cpp:158
+#: src/gui/updaterwindow.cpp:162
msgid "Play"
msgstr "Igraj"
-#: src/gui/updaterwindow.cpp:556
+#: src/gui/updaterwindow.cpp:564
msgid "##1 The update process is incomplete."
msgstr "##1 Proces ažuriranja je nepotpun."
#. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:558
+#: src/gui/updaterwindow.cpp:566
msgid "##1 It is strongly recommended that"
msgstr "##1 Vrlo je preporučljivo da"
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:560
+#: src/gui/updaterwindow.cpp:568
msgid "##1 you try again later."
msgstr ""
-#: src/gui/updaterwindow.cpp:686
+#: src/gui/updaterwindow.cpp:744
msgid "Completed"
msgstr "Dovršeno"
@@ -3435,23 +3464,23 @@ msgstr ""
msgid "Road Point"
msgstr ""
-#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:471
+#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:472
msgid "Who Is Online - Updating"
msgstr ""
-#: src/gui/whoisonline.cpp:101
+#: src/gui/whoisonline.cpp:102
msgid "Update"
msgstr ""
-#: src/gui/whoisonline.cpp:294
+#: src/gui/whoisonline.cpp:295
msgid "Who Is Online - "
msgstr ""
-#: src/gui/whoisonline.cpp:485
+#: src/gui/whoisonline.cpp:486
msgid "Who Is Online - error"
msgstr ""
-#: src/gui/whoisonline.cpp:516
+#: src/gui/whoisonline.cpp:517
msgid "Who Is Online - Update"
msgstr ""
@@ -3516,7 +3545,8 @@ msgid "This command makes <nick> a channel operator."
msgstr "Ova naredba čini <nadimak> operatorom kanala."
#: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
-#: src/net/ea/gui/guildtab.cpp:69 src/net/ea/gui/partytab.cpp:85
+#: src/gui/widgets/guildchattab.cpp:61 src/net/ea/gui/guildtab.cpp:69
+#: src/net/ea/gui/partytab.cpp:85
msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
msgstr ""
"Ako <nick> ima razmake u sebi, zatvoriti ga u dvostrukim navodnicima (\")."
@@ -3555,6 +3585,41 @@ msgstr "Javna obavijest od %s:"
msgid "%s whispers: %s"
msgstr ""
+#: src/gui/widgets/guildchattab.cpp:59 src/net/ea/gui/guildtab.cpp:67
+#: src/net/ea/gui/partytab.cpp:83
+msgid "Command: /invite <nick>"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:60 src/net/ea/gui/guildtab.cpp:68
+msgid "This command invites <nick> to the guild you're in."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:66 src/net/ea/gui/guildtab.cpp:74
+#: src/net/ea/gui/partytab.cpp:90
+msgid "Command: /leave"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:67 src/net/ea/gui/guildtab.cpp:75
+msgid "This command causes the player to leave the guild."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:109 src/net/ea/gui/guildtab.cpp:135
+#: src/net/ea/gui/partytab.cpp:69
+msgid "/help > Display this help."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:110 src/net/ea/gui/guildtab.cpp:136
+msgid "/invite > Invite a player to your guild"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:111 src/net/ea/gui/guildtab.cpp:137
+msgid "/leave > Leave the guild you are in"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:112 src/net/ea/gui/guildtab.cpp:138
+msgid "/kick > Kick some one from the guild you are in"
+msgstr ""
+
#: src/gui/widgets/setupitem.cpp:271 src/gui/widgets/setupitem.cpp:394
msgid "Edit"
msgstr ""
@@ -4084,41 +4149,41 @@ msgid ""
"strange behaviour."
msgstr ""
-#: src/localplayer.cpp:372
+#: src/localplayer.cpp:370
msgid "You were killed by "
msgstr ""
-#: src/localplayer.cpp:1403
+#: src/localplayer.cpp:1401
msgid "Tried to pick up nonexistent item."
msgstr ""
-#: src/localplayer.cpp:1405
+#: src/localplayer.cpp:1403
msgid "Item is too heavy."
msgstr ""
-#: src/localplayer.cpp:1407
+#: src/localplayer.cpp:1405
msgid "Item is too far away."
msgstr ""
-#: src/localplayer.cpp:1409
+#: src/localplayer.cpp:1407
msgid "Inventory is full."
msgstr ""
-#: src/localplayer.cpp:1411
+#: src/localplayer.cpp:1409
msgid "Stack is too big."
msgstr ""
-#: src/localplayer.cpp:1414
+#: src/localplayer.cpp:1412
msgid "Item belongs to someone else."
msgstr ""
-#: src/localplayer.cpp:1417
+#: src/localplayer.cpp:1415
msgid "Unknown problem picking up item."
msgstr ""
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1441
+#: src/localplayer.cpp:1439
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -4126,27 +4191,27 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: src/localplayer.cpp:3175
+#: src/localplayer.cpp:3173
msgid "Away"
msgstr ""
-#: src/localplayer.cpp:3476
+#: src/localplayer.cpp:3474
msgid "Follow: "
msgstr ""
-#: src/localplayer.cpp:3478 src/localplayer.cpp:3493
+#: src/localplayer.cpp:3476 src/localplayer.cpp:3491
msgid "Follow canceled"
msgstr ""
-#: src/localplayer.cpp:3485
+#: src/localplayer.cpp:3483
msgid "Imitation: "
msgstr ""
-#: src/localplayer.cpp:3487 src/localplayer.cpp:3495
+#: src/localplayer.cpp:3485 src/localplayer.cpp:3493
msgid "Imitation canceled"
msgstr ""
-#: src/localplayer.cpp:3847
+#: src/localplayer.cpp:3845
msgid "You see "
msgstr ""
@@ -4322,28 +4387,28 @@ msgstr ""
msgid "Failed to delete character."
msgstr ""
-#: src/net/ea/chathandler.cpp:60 src/net/ea/chathandler.cpp:66
-#: src/net/ea/chathandler.cpp:71 src/net/ea/chathandler.cpp:77
-#: src/net/ea/chathandler.cpp:82 src/net/ea/chathandler.cpp:88
-#: src/net/ea/chathandler.cpp:95 src/net/ea/chathandler.cpp:101
+#: src/net/ea/chathandler.cpp:61 src/net/ea/chathandler.cpp:67
+#: src/net/ea/chathandler.cpp:72 src/net/ea/chathandler.cpp:78
+#: src/net/ea/chathandler.cpp:83 src/net/ea/chathandler.cpp:89
+#: src/net/ea/chathandler.cpp:96 src/net/ea/chathandler.cpp:102
msgid "Channels are not supported!"
msgstr ""
-#: src/net/ea/chathandler.cpp:128
+#: src/net/ea/chathandler.cpp:129
#, c-format
msgid "Whisper could not be sent, %s is offline."
msgstr ""
-#: src/net/ea/chathandler.cpp:136
+#: src/net/ea/chathandler.cpp:137
#, c-format
msgid "Whisper could not be sent, ignored by %s."
msgstr ""
-#: src/net/ea/chathandler.cpp:348
+#: src/net/ea/chathandler.cpp:355
msgid "MVP player."
msgstr ""
-#: src/net/ea/chathandler.cpp:352
+#: src/net/ea/chathandler.cpp:359
msgid "MVP player: "
msgstr ""
@@ -4360,38 +4425,6 @@ msgstr ""
msgid "Request to quit denied!"
msgstr ""
-#: src/net/ea/gui/guildtab.cpp:67 src/net/ea/gui/partytab.cpp:83
-msgid "Command: /invite <nick>"
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:68
-msgid "This command invites <nick> to the guild you're in."
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:74 src/net/ea/gui/partytab.cpp:90
-msgid "Command: /leave"
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:75
-msgid "This command causes the player to leave the guild."
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:135 src/net/ea/gui/partytab.cpp:69
-msgid "/help > Display this help."
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:136
-msgid "/invite > Invite a player to your guild"
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:137
-msgid "/leave > Leave the guild you are in"
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:138
-msgid "/kick > Kick some one from the guild you are in"
-msgstr ""
-
#: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
msgid "Guild created."
msgstr "Ceh, ustanovljen."
@@ -4408,85 +4441,81 @@ msgstr ""
msgid "Unknown server response."
msgstr ""
-#: src/net/ea/guildhandler.cpp:180
+#: src/net/ea/guildhandler.cpp:181
#, c-format
msgid "Guild name: %s"
msgstr ""
-#: src/net/ea/guildhandler.cpp:182
+#: src/net/ea/guildhandler.cpp:183
#, c-format
msgid "Guild master: %s"
msgstr ""
-#: src/net/ea/guildhandler.cpp:184
+#: src/net/ea/guildhandler.cpp:185
#, c-format
msgid "Guild level: %d"
msgstr ""
-#: src/net/ea/guildhandler.cpp:186
+#: src/net/ea/guildhandler.cpp:187
#, c-format
msgid "Online members: %d"
msgstr ""
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:189
#, c-format
msgid "Max members: %d"
msgstr ""
-#: src/net/ea/guildhandler.cpp:190
+#: src/net/ea/guildhandler.cpp:191
#, c-format
msgid "Average level: %d"
msgstr ""
-#: src/net/ea/guildhandler.cpp:192
+#: src/net/ea/guildhandler.cpp:193
#, c-format
msgid "Guild exp: %d"
msgstr ""
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:195
#, c-format
msgid "Guild next exp: %d"
msgstr ""
-#: src/net/ea/guildhandler.cpp:196
+#: src/net/ea/guildhandler.cpp:197
#, c-format
msgid "Guild castle: %s"
msgstr ""
-#: src/net/ea/guildhandler.cpp:402
+#: src/net/ea/guildhandler.cpp:403
msgid "Could not inivte user to guild."
msgstr ""
-#: src/net/ea/guildhandler.cpp:406
+#: src/net/ea/guildhandler.cpp:407
msgid "User rejected guild invite."
msgstr ""
-#: src/net/ea/guildhandler.cpp:410
+#: src/net/ea/guildhandler.cpp:411
msgid "User is now part of your guild."
msgstr ""
-#: src/net/ea/guildhandler.cpp:414
+#: src/net/ea/guildhandler.cpp:415
msgid "Your guild is full."
msgstr ""
-#: src/net/ea/guildhandler.cpp:418
+#: src/net/ea/guildhandler.cpp:419
msgid "Unknown guild invite response."
msgstr ""
-#: src/net/ea/guildhandler.cpp:438
-msgid "You have left the guild."
-msgstr ""
-
-#: src/net/ea/guildhandler.cpp:452
+#: src/net/ea/guildhandler.cpp:453
#, c-format
msgid "%s has left your guild."
msgstr ""
-#: src/net/ea/guildhandler.cpp:483
+#: src/net/ea/guildhandler.cpp:484
msgid "You was kicked from guild."
msgstr ""
-#: src/net/ea/guildhandler.cpp:496
+#: src/net/ea/guildhandler.cpp:497
#, c-format
msgid "%s has kicked from your guild."
msgstr ""
@@ -4708,12 +4737,12 @@ msgstr ""
msgid "You have left the party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:368
+#: src/net/ea/partyhandler.cpp:369
#, c-format
msgid "%s has left your party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:444
+#: src/net/ea/partyhandler.cpp:448
#, c-format
msgid "An unknown member tried to say: %s"
msgstr ""
@@ -4836,7 +4865,7 @@ msgid "You're pining for the fjords."
msgstr ""
#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
-#: src/net/ea/playerhandler.cpp:425
+#: src/net/ea/playerhandler.cpp:428
msgid "Message"
msgstr ""
@@ -4849,21 +4878,21 @@ msgstr ""
msgid "You are carrying less than half your weight. You can regain health."
msgstr ""
-#: src/net/ea/playerhandler.cpp:451
+#: src/net/ea/playerhandler.cpp:454
#, c-format
msgid "You picked up %s."
msgstr ""
-#: src/net/ea/playerhandler.cpp:457
+#: src/net/ea/playerhandler.cpp:460
#, c-format
msgid "You spent %s."
msgstr ""
-#: src/net/ea/playerhandler.cpp:501
+#: src/net/ea/playerhandler.cpp:506
msgid "Cannot raise skill!"
msgstr ""
-#: src/net/ea/playerhandler.cpp:618
+#: src/net/ea/playerhandler.cpp:624
msgid "Equip arrows first."
msgstr ""
@@ -5002,7 +5031,7 @@ msgstr "Otkazano trgovanje."
msgid "Trade completed."
msgstr "Trgovanje je završeno."
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:258
msgid "Strength"
msgstr "Snaga"
@@ -5011,7 +5040,7 @@ msgstr "Snaga"
msgid "Strength %+.1f"
msgstr ""
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:259
msgid "Agility"
msgstr "Okretnost"
@@ -5020,7 +5049,7 @@ msgstr "Okretnost"
msgid "Agility %+.1f"
msgstr ""
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:262
msgid "Dexterity"
msgstr "Spretnost"
@@ -5029,7 +5058,7 @@ msgstr "Spretnost"
msgid "Dexterity %+.1f"
msgstr ""
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:260
msgid "Vitality"
msgstr "Vitalnost"
@@ -5038,7 +5067,7 @@ msgstr "Vitalnost"
msgid "Vitality %+.1f"
msgstr ""
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:261
msgid "Intelligence"
msgstr "Inteligencija"
@@ -5308,111 +5337,115 @@ msgstr ""
msgid "Unable to sell unsellable item."
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:109
+#: src/net/tmwa/generalhandler.cpp:108
#, c-format
msgid "Strength %+d"
msgstr "Snaga %+d"
-#: src/net/tmwa/generalhandler.cpp:110
+#: src/net/tmwa/generalhandler.cpp:109
#, c-format
msgid "Agility %+d"
msgstr "Okretnost %+d"
-#: src/net/tmwa/generalhandler.cpp:111
+#: src/net/tmwa/generalhandler.cpp:110
#, c-format
msgid "Vitality %+d"
msgstr "Vitalnost %+d"
-#: src/net/tmwa/generalhandler.cpp:112
+#: src/net/tmwa/generalhandler.cpp:111
#, c-format
msgid "Intelligence %+d"
msgstr "Inteligencija %+d"
-#: src/net/tmwa/generalhandler.cpp:113
+#: src/net/tmwa/generalhandler.cpp:112
#, c-format
msgid "Dexterity %+d"
msgstr "Spretnost %+d"
-#: src/net/tmwa/generalhandler.cpp:114
+#: src/net/tmwa/generalhandler.cpp:113
#, c-format
msgid "Luck %+d"
msgstr "Sreća %+d"
-#: src/net/tmwa/generalhandler.cpp:140
+#: src/net/tmwa/generalhandler.cpp:139
msgid "Authentication failed."
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:143
+#: src/net/tmwa/generalhandler.cpp:142
msgid "No servers available."
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:147
+#: src/net/tmwa/generalhandler.cpp:146
msgid "Someone else is trying to use this account."
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:150
+#: src/net/tmwa/generalhandler.cpp:149
msgid "This account is already logged in."
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:153
+#: src/net/tmwa/generalhandler.cpp:152
msgid "Speed hack detected."
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:156
+#: src/net/tmwa/generalhandler.cpp:155
msgid "Duplicated login."
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:159
+#: src/net/tmwa/generalhandler.cpp:158
msgid "Unknown connection error."
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:232
+#: src/net/tmwa/generalhandler.cpp:231
msgid "Got disconnected from server!"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:264
+#: src/net/tmwa/generalhandler.cpp:263
msgid "Luck"
msgstr "Sreća"
-#: src/net/tmwa/generalhandler.cpp:267
+#: src/net/tmwa/generalhandler.cpp:266
msgid "Defense"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:268
+#: src/net/tmwa/generalhandler.cpp:267
msgid "M.Attack"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:269
+#: src/net/tmwa/generalhandler.cpp:268
msgid "M.Defense"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:271
+#: src/net/tmwa/generalhandler.cpp:270
#, no-c-format
msgid "% Accuracy"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:273
+#: src/net/tmwa/generalhandler.cpp:272
#, no-c-format
msgid "% Evade"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:275
+#: src/net/tmwa/generalhandler.cpp:274
#, no-c-format
msgid "% Critical"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:276
+#: src/net/tmwa/generalhandler.cpp:275
msgid "Attack Delay"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:278
+#: src/net/tmwa/generalhandler.cpp:277
msgid "Walk Delay"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:280
+#: src/net/tmwa/generalhandler.cpp:279
msgid "Attack Range"
msgstr ""
+#: src/net/tmwa/generalhandler.cpp:281
+msgid "Damage per sec."
+msgstr ""
+
#: src/net/tmwa/network.cpp:152
msgid "Empty address given to Network::connect()!"
msgstr ""
@@ -5446,31 +5479,31 @@ msgstr ""
msgid "Floating bubble"
msgstr ""
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:248
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:246
#: src/resources/monsterdb.cpp:84
msgid "unnamed"
msgstr "neimenovano"
-#: src/resources/itemdb.cpp:65
+#: src/resources/itemdb.cpp:63
#, c-format
msgid "Attack %+d"
msgstr "Napad %+d"
-#: src/resources/itemdb.cpp:66
+#: src/resources/itemdb.cpp:64
#, c-format
msgid "Defense %+d"
msgstr "Obrana %+d"
-#: src/resources/itemdb.cpp:67
+#: src/resources/itemdb.cpp:65
#, c-format
msgid "HP %+d"
msgstr "Zdravlje %+d"
-#: src/resources/itemdb.cpp:68
+#: src/resources/itemdb.cpp:66
#, c-format
msgid "MP %+d"
msgstr "Mana %+d"
-#: src/resources/itemdb.cpp:171
+#: src/resources/itemdb.cpp:169
msgid "Unknown item"
msgstr "Nepoznati predmet"
diff --git a/po/hu.po b/po/hu.po
index 489ebc42c..fbd9c2691 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-20 17:42+0300\n"
+"POT-Creation-Date: 2011-09-02 18:27+0300\n"
"PO-Revision-Date: 2011-08-09 22:16+0000\n"
"Last-Translator: akaras <akaras@inbox.ru>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -21,119 +21,119 @@ msgstr ""
msgid "Visible on map"
msgstr ""
-#: src/being.cpp:542
+#: src/being.cpp:549
msgid "dodge"
msgstr ""
-#: src/being.cpp:542
+#: src/being.cpp:549
msgid "miss"
msgstr ""
#. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1514
+#: src/being.cpp:1529
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1519
+#: src/being.cpp:1534
msgid "I"
msgstr ""
-#: src/client.cpp:826 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:831 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
msgid "Setup"
msgstr "Beállítások"
-#: src/client.cpp:909
+#: src/client.cpp:914
msgid "Connecting to server"
msgstr ""
-#: src/client.cpp:940
+#: src/client.cpp:945
msgid "Logging in"
msgstr ""
-#: src/client.cpp:973
+#: src/client.cpp:978
msgid "Entering game world"
msgstr ""
-#: src/client.cpp:1073
+#: src/client.cpp:1078
msgid "Requesting characters"
msgstr ""
-#: src/client.cpp:1104
+#: src/client.cpp:1109
msgid "Connecting to the game server"
msgstr ""
-#: src/client.cpp:1114
+#: src/client.cpp:1119
msgid "Changing game servers"
msgstr ""
-#: src/client.cpp:1151 src/client.cpp:1158 src/client.cpp:1293
+#: src/client.cpp:1156 src/client.cpp:1163 src/client.cpp:1298
#: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
-#: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:395
+#: src/gui/charcreatedialog.cpp:221 src/gui/charselectdialog.cpp:253
+#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
#: src/net/manaserv/charhandler.cpp:227
msgid "Error"
msgstr "Hiba"
-#: src/client.cpp:1167
+#: src/client.cpp:1172
msgid "Requesting registration details"
msgstr ""
-#: src/client.cpp:1194
+#: src/client.cpp:1199
msgid "Password Change"
msgstr ""
-#: src/client.cpp:1195
+#: src/client.cpp:1200
msgid "Password changed successfully!"
msgstr ""
-#: src/client.cpp:1214
+#: src/client.cpp:1219
msgid "Email Change"
msgstr ""
-#: src/client.cpp:1215
+#: src/client.cpp:1220
msgid "Email changed successfully!"
msgstr ""
-#: src/client.cpp:1235
+#: src/client.cpp:1240
msgid "Unregister Successful"
msgstr ""
-#: src/client.cpp:1236
+#: src/client.cpp:1241
msgid "Farewell, come back any time..."
msgstr ""
-#: src/client.cpp:1423 src/client.cpp:1453 src/client.cpp:1497
-#: src/client.cpp:1922 src/client.cpp:1929
+#: src/client.cpp:1428 src/client.cpp:1458 src/client.cpp:1502
+#: src/client.cpp:1927 src/client.cpp:1934
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
-#: src/client.cpp:1628
+#: src/client.cpp:1633
#, c-format
msgid "Invalid update host: %s"
msgstr ""
-#: src/client.cpp:1662 src/client.cpp:1668
+#: src/client.cpp:1667 src/client.cpp:1673
msgid "Error creating updates directory!"
msgstr "Hiba a frissítési könyvtár létrehozása közben!"
-#: src/client.cpp:1689
+#: src/client.cpp:1694
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
-#: src/commandhandler.cpp:301
+#: src/commandhandler.cpp:303
msgid "Unknown command."
msgstr "Ismeretlen parancs."
-#: src/commandhandler.cpp:401
+#: src/commandhandler.cpp:403
msgid "Cannot send empty whispers!"
msgstr "Nem küldhetsz üres üzenetet!"
-#: src/commandhandler.cpp:415
+#: src/commandhandler.cpp:417
#, c-format
msgid ""
"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -141,152 +141,152 @@ msgid ""
msgstr ""
"Nem tudsz fület létrehozni \"%s\" számára! Létre van hozva, vagy te vagy az."
-#: src/commandhandler.cpp:435
+#: src/commandhandler.cpp:437
#, c-format
msgid "Requesting to join channel %s."
msgstr "Kapcsolódási kérelem a %s nevű csatornába."
-#: src/commandhandler.cpp:451 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:453 src/net/ea/gui/partytab.cpp:125
msgid "Party name is missing."
msgstr "A csapatnév hiányzik."
-#: src/commandhandler.cpp:462
+#: src/commandhandler.cpp:464
msgid "Guild name is missing."
msgstr ""
-#: src/commandhandler.cpp:475 src/commandhandler.cpp:582
-#: src/commandhandler.cpp:623 src/commandhandler.cpp:653
+#: src/commandhandler.cpp:477 src/commandhandler.cpp:589
+#: src/commandhandler.cpp:630 src/commandhandler.cpp:660
msgid "Please specify a name."
msgstr ""
-#: src/commandhandler.cpp:516
+#: src/commandhandler.cpp:523
msgid "Return toggles chat."
msgstr "Az enter megnyitja a bevitelt."
-#: src/commandhandler.cpp:516
+#: src/commandhandler.cpp:523
msgid "Message closes chat."
msgstr "Az üzenet bezárja a bevitelt."
-#: src/commandhandler.cpp:527
+#: src/commandhandler.cpp:534
msgid "Return now toggles chat."
msgstr "Az enter mostantól megnyitja a bevitelt."
-#: src/commandhandler.cpp:533
+#: src/commandhandler.cpp:540
msgid "Message now closes chat."
msgstr "Az üzenet mostantól bezárja a bevitelt."
-#: src/commandhandler.cpp:561
+#: src/commandhandler.cpp:568
msgid "friend"
msgstr ""
-#: src/commandhandler.cpp:566
+#: src/commandhandler.cpp:573
msgid "disregarded"
msgstr ""
-#: src/commandhandler.cpp:571
+#: src/commandhandler.cpp:578
msgid "neutral"
msgstr ""
-#: src/commandhandler.cpp:590
+#: src/commandhandler.cpp:597
#, c-format
msgid "Player already %s!"
msgstr ""
-#: src/commandhandler.cpp:604
+#: src/commandhandler.cpp:611
#, c-format
msgid "Player successfully %s!"
msgstr ""
-#: src/commandhandler.cpp:612
+#: src/commandhandler.cpp:619
#, c-format
msgid "Player could not be %s!"
msgstr ""
-#: src/commandhandler.cpp:634
+#: src/commandhandler.cpp:641
msgid "Player wasn't ignored!"
msgstr ""
-#: src/commandhandler.cpp:641
+#: src/commandhandler.cpp:648
msgid "Player no longer ignored!"
msgstr ""
-#: src/commandhandler.cpp:643
+#: src/commandhandler.cpp:650
msgid "Player could not be unignored!"
msgstr ""
-#: src/commandhandler.cpp:660
+#: src/commandhandler.cpp:667
msgid "Player already erased!"
msgstr ""
-#: src/commandhandler.cpp:671
+#: src/commandhandler.cpp:678
msgid "Player successfully erased!"
msgstr ""
-#: src/commandhandler.cpp:673
+#: src/commandhandler.cpp:680
msgid "Player could not be erased!"
msgstr ""
-#: src/commandhandler.cpp:972 src/commandhandler.cpp:1018
+#: src/commandhandler.cpp:980 src/commandhandler.cpp:1026
#, c-format
msgid "Client uptime: %s"
msgstr ""
-#: src/commandhandler.cpp:982
+#: src/commandhandler.cpp:990
#, c-format
msgid "%d week"
msgid_plural "%d weeks"
msgstr[0] ""
msgstr[1] ""
-#: src/commandhandler.cpp:991
+#: src/commandhandler.cpp:999
#, c-format
msgid "%d day"
msgid_plural "%d days"
msgstr[0] ""
msgstr[1] ""
-#: src/commandhandler.cpp:999
+#: src/commandhandler.cpp:1007
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] ""
msgstr[1] ""
-#: src/commandhandler.cpp:1007
+#: src/commandhandler.cpp:1015
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] ""
msgstr[1] ""
-#: src/commandhandler.cpp:1015
+#: src/commandhandler.cpp:1023
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
msgstr[0] ""
msgstr[1] ""
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1102
msgid "font cache size"
msgstr ""
-#: src/commandhandler.cpp:1106
+#: src/commandhandler.cpp:1114
msgid "Cache size:"
msgstr ""
-#: src/commandhandler.cpp:1110
+#: src/commandhandler.cpp:1118
msgid "Created:"
msgstr ""
-#: src/commandhandler.cpp:1112
+#: src/commandhandler.cpp:1120
msgid "Deleted:"
msgstr ""
-#: src/commandhandler.cpp:1159 src/commandhandler.cpp:1166
+#: src/commandhandler.cpp:1167 src/commandhandler.cpp:1174
msgid "Resource images:"
msgstr ""
-#: src/commandhandler.cpp:1161 src/commandhandler.cpp:1168
+#: src/commandhandler.cpp:1169 src/commandhandler.cpp:1176
msgid "Resource orphaned images:"
msgstr ""
@@ -297,43 +297,43 @@ msgstr ""
"Lehetőségek a /%s parancshoz: \"yes\", \"no\", \"true\", \"false\", \"1\", "
"\"0\"."
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:411
+#: src/game.cpp:252 src/gui/widgets/chattab.cpp:409
msgid "General"
msgstr "Általános"
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:413
+#: src/game.cpp:256 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:411
msgid "Debug"
msgstr ""
-#: src/game.cpp:488
+#: src/game.cpp:511
msgid "Screenshot saved as "
msgstr ""
-#: src/game.cpp:496
+#: src/game.cpp:519
msgid "Saving screenshot failed!"
msgstr "Hiba a képernyő mentése során!"
-#: src/game.cpp:536
+#: src/game.cpp:559
msgid "The connection to the server was lost."
msgstr ""
-#: src/game.cpp:548
+#: src/game.cpp:571
msgid "Network Error"
msgstr "Hálózati hiba"
-#: src/game.cpp:1213
+#: src/game.cpp:1236
msgid "Ignoring incoming trade requests"
msgstr "Kereskedési kérelmek elutasítása"
-#: src/game.cpp:1220
+#: src/game.cpp:1243
msgid "Accepting incoming trade requests"
msgstr "Kereskedési kérelmek elfogadása"
-#: src/game.cpp:1606
+#: src/game.cpp:1629
msgid "Could Not Load Map"
msgstr ""
-#: src/game.cpp:1607
+#: src/game.cpp:1630
#, c-format
msgid "Error while loading %s"
msgstr "Hiba %s betöltése közben"
@@ -362,103 +362,103 @@ msgstr ""
msgid "Bot Checker"
msgstr ""
-#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
+#: src/gui/botcheckerwindow.cpp:295 src/gui/setup_relations.cpp:64
msgid "Name"
msgstr "Név"
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:134
-#: src/gui/popupmenu.cpp:292 src/gui/popupmenu.cpp:617
-#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
+#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:133
+#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:646
+#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:265
msgid "Attack"
msgstr "Támadás"
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:279
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:297
#: src/keyboardconfig.cpp:62
msgid "Talk"
msgstr "Csevegés"
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:245
-#: src/gui/popupmenu.cpp:284 src/gui/popupmenu.cpp:674
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:263
+#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:703
msgid "Move"
msgstr ""
-#: src/gui/botcheckerwindow.cpp:300
+#: src/gui/botcheckerwindow.cpp:299
msgid "Result"
msgstr ""
-#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123
+#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:124
msgid "Reset"
msgstr "Alaphelyzet"
-#: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:260
-#: src/gui/popupmenu.cpp:281 src/gui/popupmenu.cpp:688
+#: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:98
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:278
+#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:717
msgid "Buy"
msgstr "Vétel"
-#: src/gui/buydialog.cpp:88 src/gui/buydialog.cpp:302
-#: src/gui/selldialog.cpp:87 src/gui/selldialog.cpp:324
+#: src/gui/buydialog.cpp:89 src/gui/buydialog.cpp:303
+#: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
#, c-format
msgid "Price: %s / Total: %s"
msgstr "Ár: %s / Teljes: %s"
#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
#. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:93 src/gui/itemamountwindow.cpp:207
-#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:113
-#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:974
+#: src/gui/buydialog.cpp:94 src/gui/itemamountwindow.cpp:207
+#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:973
msgid "+"
msgstr ""
#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
#. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:96 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:986
+#: src/gui/buydialog.cpp:97 src/gui/itemamountwindow.cpp:206
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:985
msgid "-"
msgstr ""
-#: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
-#: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
-#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:288
+#: src/gui/buydialog.cpp:99 src/gui/quitdialog.cpp:47
+#: src/gui/quitdialog.cpp:49 src/gui/quitdialog.cpp:50
+#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:294
#: src/keyboardconfig.cpp:290
msgid "Quit"
msgstr "Kilépés"
-#: src/gui/buydialog.cpp:99 src/gui/selldialog.cpp:94
-#: src/gui/statuswindow.cpp:503 src/gui/statuswindow.cpp:552
-#: src/gui/statuswindow.cpp:973 src/gui/statuswindow.cpp:1004
+#: src/gui/buydialog.cpp:100 src/gui/selldialog.cpp:95
+#: src/gui/statuswindow.cpp:504 src/gui/statuswindow.cpp:553
+#: src/gui/statuswindow.cpp:972 src/gui/statuswindow.cpp:1003
msgid "Max"
msgstr "Max."
#: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:133
+#: src/gui/inventorywindow.cpp:147 src/gui/setup_other.cpp:133
msgid "Shop"
msgstr "Üzlet"
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:262
-#: src/gui/popupmenu.cpp:282 src/gui/popupmenu.cpp:690
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:280
+#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:719
#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
-#: src/gui/selldialog.cpp:92
+#: src/gui/selldialog.cpp:93
msgid "Sell"
msgstr "Eladás"
#: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
-#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
+#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:96
#: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:336
-#: src/gui/popupmenu.cpp:357 src/gui/popupmenu.cpp:460
-#: src/gui/popupmenu.cpp:487 src/gui/popupmenu.cpp:511
-#: src/gui/popupmenu.cpp:525 src/gui/popupmenu.cpp:544
-#: src/gui/popupmenu.cpp:750 src/gui/popupmenu.cpp:774
-#: src/gui/popupmenu.cpp:1684 src/gui/popupmenu.cpp:1712
-#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1811
-#: src/gui/popupmenu.cpp:1846 src/gui/popupmenu.cpp:1886
-#: src/gui/popupmenu.cpp:1953 src/gui/popupmenu.cpp:1973
-#: src/gui/quitdialog.cpp:59 src/gui/register.cpp:82 src/gui/setup.cpp:71
-#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:354
+#: src/gui/popupmenu.cpp:375 src/gui/popupmenu.cpp:489
+#: src/gui/popupmenu.cpp:516 src/gui/popupmenu.cpp:540
+#: src/gui/popupmenu.cpp:554 src/gui/popupmenu.cpp:573
+#: src/gui/popupmenu.cpp:790 src/gui/popupmenu.cpp:814
+#: src/gui/popupmenu.cpp:1734 src/gui/popupmenu.cpp:1762
+#: src/gui/popupmenu.cpp:1818 src/gui/popupmenu.cpp:1861
+#: src/gui/popupmenu.cpp:1896 src/gui/popupmenu.cpp:1936
+#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2023
+#: src/gui/quitdialog.cpp:54 src/gui/register.cpp:82 src/gui/setup.cpp:72
+#: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:238
#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updaterwindow.cpp:157
+#: src/gui/updaterwindow.cpp:161
msgid "Cancel"
msgstr "Mégse"
@@ -490,7 +490,7 @@ msgid "The email address entries mismatch."
msgstr ""
#: src/gui/changepassworddialog.cpp:50 src/gui/changepassworddialog.cpp:59
-#: src/gui/charselectdialog.cpp:140
+#: src/gui/charselectdialog.cpp:139
msgid "Change Password"
msgstr "Jelszó módosítása"
@@ -525,121 +525,121 @@ msgstr ""
msgid "Create Character"
msgstr "Karakter létrehozása"
-#: src/gui/charcreatedialog.cpp:73 src/gui/logindialog.cpp:94
+#: src/gui/charcreatedialog.cpp:76 src/gui/logindialog.cpp:94
#: src/gui/register.cpp:75
msgid "Name:"
msgstr "Név:"
#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
#. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:76 src/gui/charcreatedialog.cpp:81
-#: src/gui/charcreatedialog.cpp:87 src/gui/outfitwindow.cpp:81
+#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:84
+#: src/gui/charcreatedialog.cpp:90 src/gui/outfitwindow.cpp:85
msgid ">"
msgstr ""
#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
#. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:82
-#: src/gui/charcreatedialog.cpp:88 src/gui/outfitwindow.cpp:80
+#: src/gui/charcreatedialog.cpp:82 src/gui/charcreatedialog.cpp:85
+#: src/gui/charcreatedialog.cpp:91 src/gui/outfitwindow.cpp:84
msgid "<"
msgstr ""
-#: src/gui/charcreatedialog.cpp:80
+#: src/gui/charcreatedialog.cpp:83
msgid "Hair color:"
msgstr ""
-#: src/gui/charcreatedialog.cpp:83
+#: src/gui/charcreatedialog.cpp:86
msgid "Hair style:"
msgstr ""
-#: src/gui/charcreatedialog.cpp:89
+#: src/gui/charcreatedialog.cpp:92
msgid "Race:"
msgstr ""
-#: src/gui/charcreatedialog.cpp:92 src/gui/charselectdialog.cpp:479
-#: src/gui/socialwindow.cpp:1033
+#: src/gui/charcreatedialog.cpp:95 src/gui/charselectdialog.cpp:478
+#: src/gui/socialwindow.cpp:1139
msgid "Create"
msgstr "Létrehozás"
-#: src/gui/charcreatedialog.cpp:94 src/gui/register.cpp:98
+#: src/gui/charcreatedialog.cpp:97 src/gui/register.cpp:98
msgid "Male"
msgstr "Férfi"
-#: src/gui/charcreatedialog.cpp:95 src/gui/register.cpp:99
+#: src/gui/charcreatedialog.cpp:98 src/gui/register.cpp:99
msgid "Female"
msgstr "Nő"
-#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:300
+#: src/gui/charcreatedialog.cpp:116 src/gui/charcreatedialog.cpp:303
#, c-format
msgid "Please distribute %d points"
msgstr "Kérlek oszd el a pontjaidat (%d van még)"
-#: src/gui/charcreatedialog.cpp:219
+#: src/gui/charcreatedialog.cpp:222
msgid "Your name needs to be at least 4 characters."
msgstr "A nevednek minimum 4 karakternek kell lennie."
-#: src/gui/charcreatedialog.cpp:291
+#: src/gui/charcreatedialog.cpp:294
msgid "Character stats OK"
msgstr "Karakter statok rendben"
-#: src/gui/charcreatedialog.cpp:305
+#: src/gui/charcreatedialog.cpp:308
#, c-format
msgid "Please remove %d points"
msgstr "Kérlek távolíts el %d pontot"
-#: src/gui/charselectdialog.cpp:77
+#: src/gui/charselectdialog.cpp:76
msgid "Confirm Character Delete"
msgstr "Karakter törlésének megerősítése"
-#: src/gui/charselectdialog.cpp:78
+#: src/gui/charselectdialog.cpp:77
msgid "Are you sure you want to delete this character?"
msgstr "Biztos hogy ki akarod törölni ezt a karaktert?"
-#: src/gui/charselectdialog.cpp:126
+#: src/gui/charselectdialog.cpp:125
msgid "Account and Character Management"
msgstr "Fiók és Karakter Menedzsment"
-#: src/gui/charselectdialog.cpp:139
+#: src/gui/charselectdialog.cpp:138
msgid "Switch Login"
msgstr ""
-#: src/gui/charselectdialog.cpp:153 src/gui/unregisterdialog.cpp:50
+#: src/gui/charselectdialog.cpp:152 src/gui/unregisterdialog.cpp:50
#: src/gui/unregisterdialog.cpp:58
msgid "Unregister"
msgstr "Regisztráció megszüntetése"
-#: src/gui/charselectdialog.cpp:162
+#: src/gui/charselectdialog.cpp:161
msgid "Change Email"
msgstr ""
-#: src/gui/charselectdialog.cpp:254
+#: src/gui/charselectdialog.cpp:253
msgid "Incorrect password"
msgstr ""
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:286
msgid "Enter password for deleting character"
msgstr ""
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:286
msgid "Enter password:"
msgstr ""
-#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:292
-#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
-#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
+#: src/gui/charselectdialog.cpp:408 src/gui/serverdialog.cpp:298
+#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:122
+#: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:241
msgid "Delete"
msgstr "Törlés"
-#: src/gui/charselectdialog.cpp:467
+#: src/gui/charselectdialog.cpp:466
msgid "Choose"
msgstr ""
-#: src/gui/charselectdialog.cpp:470
+#: src/gui/charselectdialog.cpp:469
#, c-format
msgid "Level %d"
msgstr ""
-#: src/gui/charselectdialog.cpp:481 src/gui/charselectdialog.cpp:482
+#: src/gui/charselectdialog.cpp:480 src/gui/charselectdialog.cpp:481
msgid "(empty)"
msgstr ""
@@ -711,12 +711,12 @@ msgstr "???"
msgid "Chat"
msgstr "Chat"
-#: src/gui/chatwindow.cpp:606
+#: src/gui/chatwindow.cpp:609
#, c-format
msgid "Present: %s; %d players are present."
msgstr ""
-#: src/gui/chatwindow.cpp:993
+#: src/gui/chatwindow.cpp:996
#, c-format
msgid "Whispering to %s: %s"
msgstr "Üzenet %s számára: %s"
@@ -729,145 +729,145 @@ msgstr "Igen"
msgid "No"
msgstr "Nem"
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:150
-#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:384
-#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:632
-#: src/gui/popupmenu.cpp:640
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:149
+#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:402
+#: src/gui/popupmenu.cpp:408 src/gui/popupmenu.cpp:661
+#: src/gui/popupmenu.cpp:669
msgid "Ignore"
msgstr ""
-#: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
+#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:97
#: src/gui/setup_other.cpp:64
msgid "Map"
msgstr "Térkép"
-#: src/gui/debugwindow.cpp:71
+#: src/gui/debugwindow.cpp:73
msgid "Target"
msgstr ""
-#: src/gui/debugwindow.cpp:72
+#: src/gui/debugwindow.cpp:74
msgid "Net"
msgstr ""
-#: src/gui/debugwindow.cpp:145 src/gui/debugwindow.cpp:220
-#: src/gui/debugwindow.cpp:249
+#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
+#: src/gui/debugwindow.cpp:251
msgid "Music:"
msgstr ""
-#: src/gui/debugwindow.cpp:146 src/gui/debugwindow.cpp:224
-#: src/gui/debugwindow.cpp:251
+#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:226
+#: src/gui/debugwindow.cpp:253
msgid "Map:"
msgstr ""
-#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
-#: src/gui/debugwindow.cpp:250
+#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:224
+#: src/gui/debugwindow.cpp:252
msgid "Minimap:"
msgstr ""
-#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:218
-#: src/gui/debugwindow.cpp:247
+#: src/gui/debugwindow.cpp:150 src/gui/debugwindow.cpp:220
+#: src/gui/debugwindow.cpp:249
msgid "Cursor:"
msgstr ""
-#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:201
-#: src/gui/debugwindow.cpp:206
+#: src/gui/debugwindow.cpp:151 src/gui/debugwindow.cpp:203
+#: src/gui/debugwindow.cpp:208
msgid "Player Position:"
msgstr ""
-#: src/gui/debugwindow.cpp:152
+#: src/gui/debugwindow.cpp:154
msgid "Particle count:"
msgstr ""
-#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:235
-#: src/gui/debugwindow.cpp:254
+#: src/gui/debugwindow.cpp:156 src/gui/debugwindow.cpp:237
+#: src/gui/debugwindow.cpp:256
msgid "Map actors count:"
msgstr ""
-#: src/gui/debugwindow.cpp:162 src/gui/debugwindow.cpp:173
+#: src/gui/debugwindow.cpp:164 src/gui/debugwindow.cpp:175
#, c-format
msgid "%d FPS (Software)"
msgstr ""
-#: src/gui/debugwindow.cpp:166
+#: src/gui/debugwindow.cpp:168
#, c-format
msgid "%d FPS (fast OpenGL)"
msgstr ""
-#: src/gui/debugwindow.cpp:169
+#: src/gui/debugwindow.cpp:171
#, c-format
msgid "%d FPS (old OpenGL)"
msgstr ""
-#: src/gui/debugwindow.cpp:176
+#: src/gui/debugwindow.cpp:178
#, c-format
msgid "%d FPS"
msgstr ""
-#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:240
+#: src/gui/debugwindow.cpp:190 src/gui/debugwindow.cpp:242
msgid "Textures count:"
msgstr ""
-#: src/gui/debugwindow.cpp:231
+#: src/gui/debugwindow.cpp:233
#, c-format
msgid "Particle count: %d"
msgstr ""
-#: src/gui/debugwindow.cpp:268 src/gui/debugwindow.cpp:299
-#: src/gui/debugwindow.cpp:343
+#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:301
+#: src/gui/debugwindow.cpp:345
msgid "Target:"
msgstr ""
-#: src/gui/debugwindow.cpp:269 src/gui/debugwindow.cpp:304
-#: src/gui/debugwindow.cpp:344
+#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:306
+#: src/gui/debugwindow.cpp:346
msgid "Target Id:"
msgstr ""
-#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:308
-#: src/gui/debugwindow.cpp:313 src/gui/debugwindow.cpp:345
+#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:310
+#: src/gui/debugwindow.cpp:315 src/gui/debugwindow.cpp:347
msgid "Target Level:"
msgstr ""
-#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:316
-#: src/gui/debugwindow.cpp:346
+#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:318
+#: src/gui/debugwindow.cpp:348
msgid "Target Party:"
msgstr ""
-#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:319
-#: src/gui/debugwindow.cpp:347
+#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:321
+#: src/gui/debugwindow.cpp:349
msgid "Target Guild:"
msgstr ""
-#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:333
-#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:348
+#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:335
+#: src/gui/debugwindow.cpp:340 src/gui/debugwindow.cpp:350
msgid "Attack delay:"
msgstr ""
-#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:323
-#: src/gui/debugwindow.cpp:349
+#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:325
+#: src/gui/debugwindow.cpp:351
msgid "Minimal hit:"
msgstr ""
-#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:325
-#: src/gui/debugwindow.cpp:350
+#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:327
+#: src/gui/debugwindow.cpp:352
msgid "Maximum hit:"
msgstr ""
-#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:327
-#: src/gui/debugwindow.cpp:351
+#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:329
+#: src/gui/debugwindow.cpp:353
msgid "Critical hit:"
msgstr ""
-#: src/gui/debugwindow.cpp:385 src/gui/debugwindow.cpp:390
+#: src/gui/debugwindow.cpp:387 src/gui/debugwindow.cpp:392
#, c-format
msgid "Ping: %s ms"
msgstr ""
-#: src/gui/debugwindow.cpp:393
+#: src/gui/debugwindow.cpp:395
#, c-format
msgid "In: %d bytes/s"
msgstr ""
-#: src/gui/debugwindow.cpp:395
+#: src/gui/debugwindow.cpp:397
#, c-format
msgid "Out: %d bytes/s"
msgstr ""
@@ -876,26 +876,26 @@ msgstr ""
msgid "Did You Know?"
msgstr ""
-#: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
-#: src/gui/inventorywindow.cpp:175 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:559 src/gui/shopwindow.cpp:111
+#: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
+#: src/gui/inventorywindow.cpp:176 src/gui/npcdialog.cpp:53
+#: src/gui/popupmenu.cpp:588 src/gui/shopwindow.cpp:113
msgid "Close"
msgstr "Bezár"
-#: src/gui/didyouknowwindow.cpp:62
+#: src/gui/didyouknowwindow.cpp:64
msgid "< Previous"
msgstr ""
-#: src/gui/didyouknowwindow.cpp:63
+#: src/gui/didyouknowwindow.cpp:65
msgid "Next >"
msgstr ""
-#: src/gui/didyouknowwindow.cpp:64
+#: src/gui/didyouknowwindow.cpp:66
msgid "Auto open this window"
msgstr ""
#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:58 src/gui/textdialog.cpp:50
+#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:53 src/gui/textdialog.cpp:50
msgid "OK"
msgstr "Ok"
@@ -903,10 +903,10 @@ msgstr "Ok"
msgid "Equipment"
msgstr "Felszerelés"
-#: src/gui/equipmentwindow.cpp:93 src/gui/inventorywindow.cpp:130
-#: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
-#: src/gui/popupmenu.cpp:1643 src/gui/popupmenu.cpp:1738
-#: src/gui/popupmenu.cpp:1783
+#: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:131
+#: src/gui/inventorywindow.cpp:512 src/gui/inventorywindow.cpp:521
+#: src/gui/popupmenu.cpp:1693 src/gui/popupmenu.cpp:1788
+#: src/gui/popupmenu.cpp:1833
msgid "Unequip"
msgstr "Nem használ"
@@ -919,75 +919,75 @@ msgstr "Súgó"
msgid "Inventory"
msgstr "Táska"
-#: src/gui/inventorywindow.cpp:104
+#: src/gui/inventorywindow.cpp:105
msgid "Slots:"
msgstr "Hely:"
-#: src/gui/inventorywindow.cpp:115
+#: src/gui/inventorywindow.cpp:116
msgid "Filter:"
msgstr ""
-#: src/gui/inventorywindow.cpp:116
+#: src/gui/inventorywindow.cpp:117
msgid "Sort:"
msgstr ""
-#: src/gui/inventorywindow.cpp:122
+#: src/gui/inventorywindow.cpp:123
msgid "na"
msgstr ""
-#: src/gui/inventorywindow.cpp:123
+#: src/gui/inventorywindow.cpp:124
msgid "az"
msgstr ""
-#: src/gui/inventorywindow.cpp:124
+#: src/gui/inventorywindow.cpp:125
msgid "id"
msgstr ""
-#: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:513
-#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1645
-#: src/gui/popupmenu.cpp:1740 src/gui/popupmenu.cpp:1785
+#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
+#: src/gui/inventorywindow.cpp:523 src/gui/popupmenu.cpp:1695
+#: src/gui/popupmenu.cpp:1790 src/gui/popupmenu.cpp:1835
msgid "Equip"
msgstr "Használ"
-#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
-#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1648
-#: src/gui/popupmenu.cpp:1707 src/gui/popupmenu.cpp:1744
-#: src/gui/popupmenu.cpp:1788
+#: src/gui/inventorywindow.cpp:130 src/gui/inventorywindow.cpp:515
+#: src/gui/inventorywindow.cpp:519 src/gui/popupmenu.cpp:1698
+#: src/gui/popupmenu.cpp:1757 src/gui/popupmenu.cpp:1794
+#: src/gui/popupmenu.cpp:1838
msgid "Use"
msgstr "Bevet"
-#: src/gui/inventorywindow.cpp:143 src/gui/inventorywindow.cpp:619
-#: src/gui/popupmenu.cpp:1652 src/gui/popupmenu.cpp:1749
-#: src/gui/popupmenu.cpp:1792
+#: src/gui/inventorywindow.cpp:144 src/gui/inventorywindow.cpp:620
+#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1799
+#: src/gui/popupmenu.cpp:1842
msgid "Drop..."
msgstr ""
-#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1661
-#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1801
+#: src/gui/inventorywindow.cpp:145 src/gui/popupmenu.cpp:1711
+#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1851
msgid "Split"
msgstr "Felosztás"
-#: src/gui/inventorywindow.cpp:145 src/gui/outfitwindow.cpp:59
-#: src/gui/popupmenu.cpp:520
+#: src/gui/inventorywindow.cpp:146 src/gui/outfitwindow.cpp:60
+#: src/gui/popupmenu.cpp:549
msgid "Outfits"
msgstr ""
-#: src/gui/inventorywindow.cpp:148
+#: src/gui/inventorywindow.cpp:149
msgid "Weight:"
msgstr "Súly:"
-#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
-#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
-#: src/gui/popupmenu.cpp:1804 src/gui/setup.cpp:72
+#: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:611
+#: src/gui/popupmenu.cpp:1674 src/gui/popupmenu.cpp:1811
+#: src/gui/popupmenu.cpp:1854 src/gui/setup.cpp:73
msgid "Store"
msgstr "Raktároz"
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1668
+#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1718
msgid "Retrieve"
msgstr "Magához vesz"
-#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1657
-#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1797
+#: src/gui/inventorywindow.cpp:622 src/gui/popupmenu.cpp:1707
+#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1847
#: src/gui/windowmenu.cpp:97
msgid "Drop"
msgstr "Eldob"
@@ -1028,11 +1028,11 @@ msgstr ""
msgid "Unknown."
msgstr ""
-#: src/gui/itempopup.cpp:176 src/gui/itempopup.cpp:182
+#: src/gui/itempopup.cpp:177 src/gui/itempopup.cpp:183
msgid ", "
msgstr ""
-#: src/gui/itempopup.cpp:192
+#: src/gui/itempopup.cpp:193
#, c-format
msgid "Weight: %s"
msgstr ""
@@ -1041,90 +1041,94 @@ msgstr ""
msgid "Kill stats"
msgstr ""
-#: src/gui/killstats.cpp:64
+#: src/gui/killstats.cpp:65
msgid "Reset stats"
msgstr ""
-#: src/gui/killstats.cpp:65
+#: src/gui/killstats.cpp:66
msgid "Reset timer"
msgstr ""
-#: src/gui/killstats.cpp:69 src/gui/killstats.cpp:205
+#: src/gui/killstats.cpp:70 src/gui/killstats.cpp:206
#, c-format
msgid "Level: %d at %f%%"
msgstr ""
-#: src/gui/killstats.cpp:73 src/gui/killstats.cpp:210
+#: src/gui/killstats.cpp:74 src/gui/killstats.cpp:211
#, c-format
msgid "Exp: %d/%d Left: %d"
msgstr ""
-#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:216
-#: src/gui/killstats.cpp:225
+#: src/gui/killstats.cpp:77 src/gui/killstats.cpp:217
+#: src/gui/killstats.cpp:226
#, c-format
msgid "1%% = %d exp, avg mob for 1%%: %s"
msgstr ""
-#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:142
-#: src/gui/killstats.cpp:234
+#: src/gui/killstats.cpp:80 src/gui/killstats.cpp:143
+#: src/gui/killstats.cpp:235
#, c-format
msgid "Kills: %s, total exp: %s"
msgstr ""
-#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
-#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:230
+#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145
+#: src/gui/killstats.cpp:221 src/gui/killstats.cpp:231
#, c-format
msgid "Avg Exp: %s, No. of avg mob to next level: %s"
msgstr ""
-#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:162
-#: src/gui/killstats.cpp:237
+#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:163
+#: src/gui/killstats.cpp:238
#, c-format
msgid "Kills/Min: %s, Exp/Min: %s"
msgstr ""
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:89 src/gui/killstats.cpp:94
-#: src/gui/killstats.cpp:289 src/gui/killstats.cpp:305
-#: src/gui/killstats.cpp:323
+#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:90 src/gui/killstats.cpp:95
+#: src/gui/killstats.cpp:290 src/gui/killstats.cpp:306
+#: src/gui/killstats.cpp:324
#, c-format
msgid "Exp speed per %d min: %s"
msgid_plural "Exp speed per %d min: %s"
msgstr[0] ""
msgstr[1] ""
-#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
+#: src/gui/killstats.cpp:88 src/gui/killstats.cpp:93 src/gui/killstats.cpp:98
#, c-format
msgid "Time for next level per %d min: %s"
msgid_plural "Time for next level per %d min: %s"
msgstr[0] ""
msgstr[1] ""
-#: src/gui/killstats.cpp:100 src/gui/killstats.cpp:241
+#: src/gui/killstats.cpp:101 src/gui/killstats.cpp:242
msgid "Last kill exp:"
msgstr ""
-#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:355
-#: src/gui/killstats.cpp:361 src/gui/killstats.cpp:367
-#: src/gui/killstats.cpp:372
+#: src/gui/killstats.cpp:103 src/gui/killstats.cpp:356
+#: src/gui/killstats.cpp:362 src/gui/killstats.cpp:368
+#: src/gui/killstats.cpp:373
msgid "Time before jacko spawn:"
msgstr ""
-#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:301
-#: src/gui/killstats.cpp:311 src/gui/killstats.cpp:318
-#: src/gui/killstats.cpp:330 src/gui/killstats.cpp:337
+#: src/gui/killstats.cpp:295 src/gui/killstats.cpp:302
+#: src/gui/killstats.cpp:312 src/gui/killstats.cpp:319
+#: src/gui/killstats.cpp:331 src/gui/killstats.cpp:338
#, c-format
msgid " Time for next level: %s"
msgstr ""
-#: src/gui/killstats.cpp:361
+#: src/gui/killstats.cpp:362
#, c-format
msgid "%s %d?"
msgstr ""
-#: src/gui/killstats.cpp:367
+#: src/gui/killstats.cpp:368
msgid "jacko spawning"
msgstr ""
+#: src/guildmanager.cpp:464 src/net/ea/guildhandler.cpp:439
+msgid "You have left the guild."
+msgstr ""
+
#: src/gui/logindialog.cpp:59
msgid "Normal"
msgstr ""
@@ -1141,7 +1145,7 @@ msgstr ""
msgid "Login"
msgstr "Belépés"
-#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:246
+#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:252
#: src/gui/widgets/chattab.cpp:173
msgid "Server:"
msgstr "Szerver:"
@@ -1223,11 +1227,11 @@ msgstr "Küldés"
msgid "NPC"
msgstr "Gépjátékos"
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:561
+#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:590
msgid "Clear"
msgstr ""
-#: src/gui/npcdialog.cpp:222
+#: src/gui/npcdialog.cpp:223
msgid "> Next"
msgstr ""
@@ -1243,346 +1247,346 @@ msgstr "Küldés"
msgid "Failed to send as sender or letter invalid."
msgstr "A levél elküldése sikertelen. A feladó, vagy a címzett nem található."
-#: src/gui/outfitwindow.cpp:82 src/gui/outfitwindow.cpp:886
+#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:890
#, c-format
msgid "Outfit: %d"
msgstr ""
-#: src/gui/outfitwindow.cpp:84 src/gui/outfitwindow.cpp:888
+#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:892
#, c-format
msgid "Key: %s"
msgstr ""
-#: src/gui/outfitwindow.cpp:87
+#: src/gui/outfitwindow.cpp:91
msgid "Unequip first"
msgstr ""
-#: src/gui/outfitwindow.cpp:90
+#: src/gui/outfitwindow.cpp:94
msgid "Away outfit"
msgstr ""
-#: src/gui/popupmenu.cpp:133 src/gui/popupmenu.cpp:616
+#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:645
#: src/gui/widgets/tradetab.cpp:44
msgid "Trade"
msgstr "Üzlet"
-#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:375
+#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:393
msgid "Whisper"
msgstr ""
-#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:621
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:650
msgid "Heal"
msgstr ""
-#: src/gui/popupmenu.cpp:146 src/gui/popupmenu.cpp:381
-#: src/gui/popupmenu.cpp:628
+#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:399
+#: src/gui/popupmenu.cpp:657
msgid "Be friend"
msgstr ""
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:383
-#: src/gui/popupmenu.cpp:389 src/gui/popupmenu.cpp:408
-#: src/gui/popupmenu.cpp:630 src/gui/popupmenu.cpp:638
-#: src/gui/popupmenu.cpp:662
+#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:156
+#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:401
+#: src/gui/popupmenu.cpp:407 src/gui/popupmenu.cpp:426
+#: src/gui/popupmenu.cpp:659 src/gui/popupmenu.cpp:667
+#: src/gui/popupmenu.cpp:691
msgid "Disregard"
msgstr ""
-#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:161
-#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:177
-#: src/gui/popupmenu.cpp:385 src/gui/popupmenu.cpp:391
-#: src/gui/popupmenu.cpp:398 src/gui/popupmenu.cpp:403
-#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
-#: src/gui/popupmenu.cpp:649 src/gui/popupmenu.cpp:655
+#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:160
+#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:176
+#: src/gui/popupmenu.cpp:403 src/gui/popupmenu.cpp:409
+#: src/gui/popupmenu.cpp:416 src/gui/popupmenu.cpp:421
+#: src/gui/popupmenu.cpp:662 src/gui/popupmenu.cpp:670
+#: src/gui/popupmenu.cpp:678 src/gui/popupmenu.cpp:684
msgid "Erase"
msgstr ""
-#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:175
-#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:395
-#: src/gui/popupmenu.cpp:402 src/gui/popupmenu.cpp:407
-#: src/gui/popupmenu.cpp:646 src/gui/popupmenu.cpp:654
-#: src/gui/popupmenu.cpp:660
+#: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:174
+#: src/gui/popupmenu.cpp:181 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:425
+#: src/gui/popupmenu.cpp:675 src/gui/popupmenu.cpp:683
+#: src/gui/popupmenu.cpp:689
msgid "Unignore"
msgstr ""
-#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:186
-#: src/gui/popupmenu.cpp:397 src/gui/popupmenu.cpp:410
-#: src/gui/popupmenu.cpp:648 src/gui/popupmenu.cpp:664
+#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:185
+#: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:428
+#: src/gui/popupmenu.cpp:677 src/gui/popupmenu.cpp:693
#: src/playerrelations.cpp:400
msgid "Completely ignore"
msgstr ""
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:418
-#: src/gui/popupmenu.cpp:672
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:436
+#: src/gui/popupmenu.cpp:701
msgid "Follow"
msgstr ""
-#: src/gui/popupmenu.cpp:196 src/gui/popupmenu.cpp:419
-#: src/gui/popupmenu.cpp:673
+#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:437
+#: src/gui/popupmenu.cpp:702
msgid "Imitation"
msgstr ""
-#: src/gui/popupmenu.cpp:206 src/gui/popupmenu.cpp:710
+#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:739
msgid "Invite to party"
msgstr ""
-#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:428
-#: src/gui/popupmenu.cpp:715
+#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:744
msgid "Kick from party"
msgstr ""
-#: src/gui/popupmenu.cpp:226 src/gui/popupmenu.cpp:439
-#: src/gui/popupmenu.cpp:729
+#: src/gui/popupmenu.cpp:225 src/gui/popupmenu.cpp:237
+#: src/gui/popupmenu.cpp:460 src/gui/popupmenu.cpp:761
msgid "Kick from guild"
msgstr ""
-#: src/gui/popupmenu.cpp:228 src/gui/popupmenu.cpp:441
-#: src/gui/popupmenu.cpp:731
+#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:242
+#: src/gui/popupmenu.cpp:465 src/gui/popupmenu.cpp:766
msgid "Change pos in guild"
msgstr ""
-#: src/gui/popupmenu.cpp:234 src/gui/popupmenu.cpp:446
-#: src/gui/popupmenu.cpp:737
+#: src/gui/popupmenu.cpp:251 src/gui/popupmenu.cpp:474
+#: src/gui/popupmenu.cpp:776
msgid "Invite to guild"
msgstr ""
-#: src/gui/popupmenu.cpp:242
+#: src/gui/popupmenu.cpp:260
msgid "Kick player"
msgstr ""
-#: src/gui/popupmenu.cpp:244
+#: src/gui/popupmenu.cpp:262
msgid "Nuke"
msgstr ""
-#: src/gui/popupmenu.cpp:247 src/gui/popupmenu.cpp:675
+#: src/gui/popupmenu.cpp:265 src/gui/popupmenu.cpp:704
msgid "Show Items"
msgstr ""
-#: src/gui/popupmenu.cpp:248 src/gui/popupmenu.cpp:676
-#: src/gui/popupmenu.cpp:1970
+#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:705
+#: src/gui/popupmenu.cpp:2020
msgid "Undress"
msgstr ""
-#: src/gui/popupmenu.cpp:250 src/gui/popupmenu.cpp:286
-#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:678
-#: src/gui/popupmenu.cpp:746
+#: src/gui/popupmenu.cpp:268 src/gui/popupmenu.cpp:304
+#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:707
+#: src/gui/popupmenu.cpp:786
msgid "Add comment"
msgstr ""
-#: src/gui/popupmenu.cpp:268 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:695
+#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:482
+#: src/gui/popupmenu.cpp:724
msgid "Buy (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:454
-#: src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:483
+#: src/gui/popupmenu.cpp:726
msgid "Sell (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:298
+#: src/gui/popupmenu.cpp:316
msgid "Kick"
msgstr ""
-#: src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:327
msgid "Remove from attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:315
+#: src/gui/popupmenu.cpp:333
msgid "Add to priority attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:317
+#: src/gui/popupmenu.cpp:335
msgid "Add to attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:320
+#: src/gui/popupmenu.cpp:338
msgid "Add to ignore list"
msgstr ""
-#: src/gui/popupmenu.cpp:333 src/gui/popupmenu.cpp:457
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:486
msgid "Add name to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:483
+#: src/gui/popupmenu.cpp:512
msgid "Pick up"
msgstr ""
-#: src/gui/popupmenu.cpp:484 src/gui/popupmenu.cpp:1682
-#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1805
+#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:1732
+#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1855
msgid "Add to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:501
+#: src/gui/popupmenu.cpp:530
msgid "Map Item"
msgstr ""
-#: src/gui/popupmenu.cpp:502
+#: src/gui/popupmenu.cpp:531
msgid "Rename"
msgstr ""
-#: src/gui/popupmenu.cpp:503 src/gui/popupmenu.cpp:1923
-#: src/gui/popupmenu.cpp:1941 src/gui/popupmenu.cpp:1946
+#: src/gui/popupmenu.cpp:532 src/gui/popupmenu.cpp:1973
+#: src/gui/popupmenu.cpp:1991 src/gui/popupmenu.cpp:1996
msgid "Remove"
msgstr ""
-#: src/gui/popupmenu.cpp:508
+#: src/gui/popupmenu.cpp:537
msgid "Warp"
msgstr ""
-#: src/gui/popupmenu.cpp:522
+#: src/gui/popupmenu.cpp:551
msgid "Load old outfits"
msgstr ""
-#: src/gui/popupmenu.cpp:538 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:567 src/gui/windowmenu.cpp:96
msgid "Spells"
msgstr ""
-#: src/gui/popupmenu.cpp:540
+#: src/gui/popupmenu.cpp:569
msgid "Load old spells"
msgstr ""
-#: src/gui/popupmenu.cpp:541
+#: src/gui/popupmenu.cpp:570
msgid "Edit spell"
msgstr ""
-#: src/gui/popupmenu.cpp:567
+#: src/gui/popupmenu.cpp:596
msgid "Disable highlight"
msgstr ""
-#: src/gui/popupmenu.cpp:572
+#: src/gui/popupmenu.cpp:601
msgid "Enable highlight"
msgstr ""
-#: src/gui/popupmenu.cpp:577
-msgid "Dont remove name"
+#: src/gui/popupmenu.cpp:606
+msgid "Don't remove name"
msgstr ""
-#: src/gui/popupmenu.cpp:582
+#: src/gui/popupmenu.cpp:611
msgid "Remove name"
msgstr ""
-#: src/gui/popupmenu.cpp:587
+#: src/gui/popupmenu.cpp:616
msgid "Enable away"
msgstr ""
-#: src/gui/popupmenu.cpp:592
+#: src/gui/popupmenu.cpp:621
msgid "Disable away"
msgstr ""
-#: src/gui/popupmenu.cpp:598 src/gui/socialwindow.cpp:1035
+#: src/gui/popupmenu.cpp:627 src/gui/socialwindow.cpp:1141
msgid "Leave"
msgstr ""
-#: src/gui/popupmenu.cpp:758
+#: src/gui/popupmenu.cpp:798
msgid "Change guild position"
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1189
+#: src/gui/popupmenu.cpp:1234
msgid "Rename map sign "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1191
+#: src/gui/popupmenu.cpp:1236
msgid "Name: "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1241
+#: src/gui/popupmenu.cpp:1286
msgid "Player comment "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1243
+#: src/gui/popupmenu.cpp:1288
msgid "Comment: "
msgstr ""
-#: src/gui/popupmenu.cpp:1607
+#: src/gui/popupmenu.cpp:1657
msgid "Add to trade"
msgstr ""
-#: src/gui/popupmenu.cpp:1613
+#: src/gui/popupmenu.cpp:1663
msgid "Add to trade 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1616
+#: src/gui/popupmenu.cpp:1666
msgid "Add to trade half"
msgstr ""
-#: src/gui/popupmenu.cpp:1618
+#: src/gui/popupmenu.cpp:1668
msgid "Add to trade all"
msgstr ""
-#: src/gui/popupmenu.cpp:1630
+#: src/gui/popupmenu.cpp:1680
msgid "Store 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1633
+#: src/gui/popupmenu.cpp:1683
msgid "Store half"
msgstr ""
-#: src/gui/popupmenu.cpp:1635
+#: src/gui/popupmenu.cpp:1685
msgid "Store all"
msgstr ""
-#: src/gui/popupmenu.cpp:1653 src/gui/popupmenu.cpp:1750
-#: src/gui/popupmenu.cpp:1793
+#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1800
+#: src/gui/popupmenu.cpp:1843
msgid "Drop all"
msgstr ""
-#: src/gui/popupmenu.cpp:1674
+#: src/gui/popupmenu.cpp:1724
msgid "Retrieve 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1677
+#: src/gui/popupmenu.cpp:1727
msgid "Retrieve half"
msgstr ""
-#: src/gui/popupmenu.cpp:1679
+#: src/gui/popupmenu.cpp:1729
msgid "Retrieve all"
msgstr ""
-#: src/gui/popupmenu.cpp:1710 src/gui/popupmenu.cpp:1766
+#: src/gui/popupmenu.cpp:1760 src/gui/popupmenu.cpp:1816
msgid "Load old item shortcuts"
msgstr ""
-#: src/gui/popupmenu.cpp:1809
+#: src/gui/popupmenu.cpp:1859
msgid "Load old drop shortcuts"
msgstr ""
-#: src/gui/popupmenu.cpp:1835 src/gui/popupmenu.cpp:1870
+#: src/gui/popupmenu.cpp:1885 src/gui/popupmenu.cpp:1920
msgid "Hide"
msgstr ""
-#: src/gui/popupmenu.cpp:1841 src/gui/popupmenu.cpp:1876
+#: src/gui/popupmenu.cpp:1891 src/gui/popupmenu.cpp:1926
msgid "Show"
msgstr ""
-#: src/gui/popupmenu.cpp:1883
+#: src/gui/popupmenu.cpp:1933
msgid "Reset yellow bar"
msgstr ""
-#: src/gui/popupmenu.cpp:1885 src/gui/statuswindow.cpp:240
+#: src/gui/popupmenu.cpp:1935 src/gui/statuswindow.cpp:241
msgid "Copy to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:1903 src/gui/socialwindow.cpp:854
-#: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
+#: src/gui/popupmenu.cpp:1953 src/gui/socialwindow.cpp:958
+#: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028
msgid "(default)"
msgstr ""
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1933
+#: src/gui/popupmenu.cpp:1965 src/gui/popupmenu.cpp:1983
msgid "Move up"
msgstr ""
-#: src/gui/popupmenu.cpp:1920 src/gui/popupmenu.cpp:1938
+#: src/gui/popupmenu.cpp:1970 src/gui/popupmenu.cpp:1988
msgid "Move down"
msgstr ""
-#: src/gui/quitdialog.cpp:56
+#: src/gui/quitdialog.cpp:51
msgid "Switch server"
msgstr "Szerver változtatása"
-#: src/gui/quitdialog.cpp:57
+#: src/gui/quitdialog.cpp:52
msgid "Switch character"
msgstr "Karakter változtatása"
@@ -1618,64 +1622,64 @@ msgstr "A jelszónak legfeljebb %d karakter hosszúnak kell lennie."
msgid "Passwords do not match."
msgstr "A jelszavak nem egyeznek."
-#: src/gui/serverdialog.cpp:231
+#: src/gui/serverdialog.cpp:237
msgid "Choose Your Server"
msgstr ""
-#: src/gui/serverdialog.cpp:242
+#: src/gui/serverdialog.cpp:248
msgid "Choose Your Server *** SAFE MODE ***"
msgstr ""
-#: src/gui/serverdialog.cpp:247
+#: src/gui/serverdialog.cpp:253
msgid "Port:"
msgstr "Port:"
-#: src/gui/serverdialog.cpp:251
+#: src/gui/serverdialog.cpp:257
msgid "Use same ip for game sub servers"
msgstr ""
-#: src/gui/serverdialog.cpp:265
+#: src/gui/serverdialog.cpp:271
msgid "Server type:"
msgstr ""
-#: src/gui/serverdialog.cpp:289
+#: src/gui/serverdialog.cpp:295
msgid "Load"
msgstr ""
-#: src/gui/serverdialog.cpp:290
+#: src/gui/serverdialog.cpp:296
msgid "Connect"
msgstr ""
-#: src/gui/serverdialog.cpp:291
+#: src/gui/serverdialog.cpp:297
msgid "Custom Server"
msgstr ""
-#: src/gui/serverdialog.cpp:396
+#: src/gui/serverdialog.cpp:402
msgid "Please type both the address and the port of a server."
msgstr "Kérlek írd be a szerver címét és portját egyaránt."
-#: src/gui/serverdialog.cpp:554
+#: src/gui/serverdialog.cpp:560
#, c-format
msgid "Downloading server list...%2.2f%%"
msgstr ""
-#: src/gui/serverdialog.cpp:559
+#: src/gui/serverdialog.cpp:565
msgid "Waiting for server..."
msgstr ""
-#: src/gui/serverdialog.cpp:563
+#: src/gui/serverdialog.cpp:569
msgid "Preparing download"
msgstr ""
-#: src/gui/serverdialog.cpp:567
+#: src/gui/serverdialog.cpp:573
msgid "Error retreiving server list!"
msgstr ""
-#: src/gui/serverdialog.cpp:672
+#: src/gui/serverdialog.cpp:678
msgid "requires a newer version"
msgstr ""
-#: src/gui/serverdialog.cpp:674
+#: src/gui/serverdialog.cpp:680
#, c-format
msgid "requires v%s"
msgstr ""
@@ -1820,6 +1824,14 @@ msgstr ""
msgid "Use local time"
msgstr ""
+#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:157
+msgid "Other"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:125
+msgid "Highlight words (separated by comma)"
+msgstr ""
+
#: src/gui/setup_colors.cpp:49
msgid "This is what the color looks like"
msgstr "Így fog kinézni a felirat."
@@ -1867,11 +1879,11 @@ msgstr ""
msgid "Alpha:"
msgstr ""
-#: src/gui/setup.cpp:70
+#: src/gui/setup.cpp:71
msgid "Apply"
msgstr "Alkalmaz"
-#: src/gui/setup.cpp:73
+#: src/gui/setup.cpp:74
msgid "Reset Windows"
msgstr "Ablakok alaphelyzetbe"
@@ -2048,34 +2060,42 @@ msgid "Log NPC dialogue"
msgstr ""
#: src/gui/setup_other.cpp:148
-msgid "Other"
+msgid "Bots support"
msgstr ""
#: src/gui/setup_other.cpp:150
-msgid "Enable server side attack"
+msgid "Enable auction bot support"
msgstr ""
#: src/gui/setup_other.cpp:153
+msgid "Enable guild bot support and disable native guild support"
+msgstr ""
+
+#: src/gui/setup_other.cpp:159
+msgid "Enable server side attack"
+msgstr ""
+
+#: src/gui/setup_other.cpp:162
msgid "Enable bot checker"
msgstr ""
-#: src/gui/setup_other.cpp:156
+#: src/gui/setup_other.cpp:165
msgid "Enable buggy servers protection"
msgstr ""
-#: src/gui/setup_other.cpp:159
+#: src/gui/setup_other.cpp:168
msgid "Enable debug log"
msgstr ""
-#: src/gui/setup_other.cpp:162
+#: src/gui/setup_other.cpp:171
msgid "Low traffic mode"
msgstr ""
-#: src/gui/setup_other.cpp:165
+#: src/gui/setup_other.cpp:174
msgid "Hide shield sprite"
msgstr ""
-#: src/gui/setup_other.cpp:168
+#: src/gui/setup_other.cpp:177
msgid "Show background"
msgstr ""
@@ -2171,6 +2191,10 @@ msgstr ""
msgid "Show ip addresses on screenshots"
msgstr ""
+#: src/gui/setup_players.cpp:81
+msgid "Allow self heal with mouse click"
+msgstr ""
+
#: src/gui/setup_relations.cpp:65
msgid "Relation"
msgstr "Kapcsolat"
@@ -2443,261 +2467,266 @@ msgstr ""
msgid "Changes will take effect on map change."
msgstr "A változások érvénybe lépéséhez töltsön be egy új térképet."
-#: src/gui/shopwindow.cpp:74
+#: src/gui/shopwindow.cpp:75
msgid "Personal Shop"
msgstr ""
-#: src/gui/shopwindow.cpp:116
+#: src/gui/shopwindow.cpp:118
msgid "Buy items"
msgstr ""
-#: src/gui/shopwindow.cpp:117
+#: src/gui/shopwindow.cpp:119
msgid "Sell items"
msgstr ""
-#: src/gui/shopwindow.cpp:119 src/gui/shopwindow.cpp:122
-#: src/gui/tradewindow.cpp:88
+#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
+#: src/gui/tradewindow.cpp:89
msgid "Add"
msgstr "Hozzáad"
-#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
+#: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
msgid "Announce"
msgstr ""
-#: src/gui/shopwindow.cpp:125
+#: src/gui/shopwindow.cpp:127
msgid "Show links in announce"
msgstr ""
-#: src/gui/shopwindow.cpp:723 src/net/ea/tradehandler.cpp:106
+#: src/gui/shopwindow.cpp:148 src/gui/shopwindow.cpp:149
+msgid "Auction"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:748 src/net/ea/tradehandler.cpp:106
#: src/net/manaserv/tradehandler.cpp:127
msgid "Request for Trade"
msgstr "Üzleti ajánlat"
-#: src/gui/shopwindow.cpp:724
+#: src/gui/shopwindow.cpp:749
#, c-format
msgid "%s wants to %s %s do you accept?"
msgstr ""
-#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:81
+#: src/gui/skilldialog.cpp:276 src/gui/windowmenu.cpp:81
msgid "Skills"
msgstr "Képességek"
-#: src/gui/skilldialog.cpp:283
+#: src/gui/skilldialog.cpp:288
msgid "Up"
msgstr "Fejleszt"
-#: src/gui/skilldialog.cpp:336
+#: src/gui/skilldialog.cpp:341
#, c-format
msgid "Skill points available: %d"
msgstr ""
-#: src/gui/skilldialog.cpp:413
+#: src/gui/skilldialog.cpp:418
#, c-format
msgid "Skill Set %d"
msgstr ""
-#: src/gui/skilldialog.cpp:425
+#: src/gui/skilldialog.cpp:430
#, c-format
msgid "Skill %d"
msgstr ""
-#: src/gui/skilldialog.cpp:492 src/gui/skilldialog.cpp:545
+#: src/gui/skilldialog.cpp:497 src/gui/skilldialog.cpp:550
#, c-format
msgid "Lvl: %d"
msgstr ""
-#: src/gui/skilldialog.cpp:537
+#: src/gui/skilldialog.cpp:542
#, c-format
msgid "Lvl: %d (%+d)"
msgstr ""
-#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
+#: src/gui/socialwindow.cpp:118 src/gui/socialwindow.cpp:216
+#: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52
msgid "Guild"
msgstr "Klán"
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:147
#, c-format
msgid "Invited user %s to guild %s."
msgstr ""
-#: src/gui/socialwindow.cpp:160
+#: src/gui/socialwindow.cpp:161
#, c-format
msgid "Guild %s quit requested."
msgstr ""
-#: src/gui/socialwindow.cpp:187
+#: src/gui/socialwindow.cpp:188
msgid "Member Invite to Guild"
msgstr ""
-#: src/gui/socialwindow.cpp:188
+#: src/gui/socialwindow.cpp:189
#, c-format
msgid "Who would you like to invite to guild %s?"
msgstr ""
-#: src/gui/socialwindow.cpp:197
+#: src/gui/socialwindow.cpp:198
msgid "Leave Guild?"
msgstr ""
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:199
#, c-format
msgid "Are you sure you want to leave guild %s?"
msgstr ""
-#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:319 src/net/ea/gui/partytab.cpp:50
msgid "Party"
msgstr "Csapat"
-#: src/gui/socialwindow.cpp:243
+#: src/gui/socialwindow.cpp:347
#, c-format
msgid "Invited user %s to party."
msgstr ""
-#: src/gui/socialwindow.cpp:257
+#: src/gui/socialwindow.cpp:361
#, c-format
msgid "Party %s quit requested."
msgstr ""
-#: src/gui/socialwindow.cpp:284
+#: src/gui/socialwindow.cpp:388
msgid "Member Invite to Party"
msgstr ""
-#: src/gui/socialwindow.cpp:285
+#: src/gui/socialwindow.cpp:389
#, c-format
msgid "Who would you like to invite to party %s?"
msgstr ""
-#: src/gui/socialwindow.cpp:294
+#: src/gui/socialwindow.cpp:398
msgid "Leave Party?"
msgstr ""
-#: src/gui/socialwindow.cpp:295
+#: src/gui/socialwindow.cpp:399
#, c-format
msgid "Are you sure you want to leave party %s?"
msgstr ""
-#: src/gui/socialwindow.cpp:521
+#: src/gui/socialwindow.cpp:625
msgid "Nav"
msgstr ""
-#: src/gui/socialwindow.cpp:799
+#: src/gui/socialwindow.cpp:903
msgid "Atk"
msgstr ""
-#: src/gui/socialwindow.cpp:840
+#: src/gui/socialwindow.cpp:944
msgid "Priority mobs"
msgstr ""
-#: src/gui/socialwindow.cpp:872
+#: src/gui/socialwindow.cpp:976
msgid "Attack mobs"
msgstr ""
-#: src/gui/socialwindow.cpp:907
+#: src/gui/socialwindow.cpp:1011
msgid "Ignore mobs"
msgstr ""
-#: src/gui/socialwindow.cpp:970
+#: src/gui/socialwindow.cpp:1074
msgid "Create Guild"
msgstr "Klán létrehozása"
-#: src/gui/socialwindow.cpp:971 src/gui/socialwindow.cpp:1387
+#: src/gui/socialwindow.cpp:1075 src/gui/socialwindow.cpp:1503
msgid "Create Party"
msgstr ""
-#: src/gui/socialwindow.cpp:1013 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1117 src/gui/windowmenu.cpp:93
msgid "Social"
msgstr ""
-#: src/gui/socialwindow.cpp:1034
+#: src/gui/socialwindow.cpp:1140
msgid "Invite"
msgstr ""
-#: src/gui/socialwindow.cpp:1176
+#: src/gui/socialwindow.cpp:1286
#, c-format
msgid "Accepted party invite from %s."
msgstr ""
-#: src/gui/socialwindow.cpp:1186
+#: src/gui/socialwindow.cpp:1296
#, c-format
msgid "Rejected party invite from %s."
msgstr ""
-#: src/gui/socialwindow.cpp:1203
+#: src/gui/socialwindow.cpp:1313
#, c-format
msgid "Accepted guild invite from %s."
msgstr ""
-#: src/gui/socialwindow.cpp:1213
+#: src/gui/socialwindow.cpp:1326
#, c-format
msgid "Rejected guild invite from %s."
msgstr ""
-#: src/gui/socialwindow.cpp:1257
+#: src/gui/socialwindow.cpp:1373
#, c-format
msgid "Creating guild called %s."
msgstr ""
-#: src/gui/socialwindow.cpp:1280
+#: src/gui/socialwindow.cpp:1396
#, c-format
msgid "Creating party called %s."
msgstr ""
-#: src/gui/socialwindow.cpp:1294
+#: src/gui/socialwindow.cpp:1410
msgid "Guild Name"
msgstr ""
-#: src/gui/socialwindow.cpp:1295
+#: src/gui/socialwindow.cpp:1411
msgid "Choose your guild's name."
msgstr ""
-#: src/gui/socialwindow.cpp:1309
+#: src/gui/socialwindow.cpp:1425
msgid "Received guild request, but one already exists."
msgstr ""
-#: src/gui/socialwindow.cpp:1315
+#: src/gui/socialwindow.cpp:1431
#, c-format
msgid "%s has invited you to join the guild %s."
msgstr ""
-#: src/gui/socialwindow.cpp:1321
+#: src/gui/socialwindow.cpp:1437
msgid "Accept Guild Invite"
msgstr ""
-#: src/gui/socialwindow.cpp:1336
+#: src/gui/socialwindow.cpp:1452
msgid "Received party request, but one already exists."
msgstr "Csapatba hívtak, de neked van csapatod."
-#: src/gui/socialwindow.cpp:1347
+#: src/gui/socialwindow.cpp:1463
msgid "You have been invited you to join a party."
msgstr ""
-#: src/gui/socialwindow.cpp:1351
+#: src/gui/socialwindow.cpp:1467
#, c-format
msgid "You have been invited to join the %s party."
msgstr ""
-#: src/gui/socialwindow.cpp:1359
+#: src/gui/socialwindow.cpp:1475
#, c-format
msgid "%s has invited you to join their party."
msgstr "%s a csapatába hívott."
-#: src/gui/socialwindow.cpp:1364
+#: src/gui/socialwindow.cpp:1480
#, c-format
msgid "%s has invited you to join the %s party."
msgstr "%s behívott %s csapatába."
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1489
msgid "Accept Party Invite"
msgstr "Ajánlat elfogadása"
-#: src/gui/socialwindow.cpp:1388
+#: src/gui/socialwindow.cpp:1504
msgid "Cannot create party. You are already in a party"
msgstr ""
-#: src/gui/socialwindow.cpp:1393
+#: src/gui/socialwindow.cpp:1509
msgid "Party Name"
msgstr ""
-#: src/gui/socialwindow.cpp:1394
+#: src/gui/socialwindow.cpp:1510
msgid "Choose your party's name."
msgstr ""
@@ -2705,418 +2734,418 @@ msgstr ""
msgid "Specials"
msgstr ""
-#: src/gui/statuspopup.cpp:197
+#: src/gui/statuspopup.cpp:198
msgid "(D) default moves"
msgstr ""
-#: src/gui/statuspopup.cpp:202
+#: src/gui/statuspopup.cpp:203
msgid "(I) invert moves"
msgstr ""
-#: src/gui/statuspopup.cpp:207
+#: src/gui/statuspopup.cpp:208
msgid "(c) moves with some crazy moves"
msgstr ""
-#: src/gui/statuspopup.cpp:212
+#: src/gui/statuspopup.cpp:213
msgid "(C) moves with crazy moves"
msgstr ""
-#: src/gui/statuspopup.cpp:217
+#: src/gui/statuspopup.cpp:218
msgid "(d) double normal + crazy"
msgstr ""
-#: src/gui/statuspopup.cpp:222
+#: src/gui/statuspopup.cpp:223
msgid "(?) move"
msgstr ""
-#: src/gui/statuspopup.cpp:240
+#: src/gui/statuspopup.cpp:241
msgid "(a) custom crazy move"
msgstr ""
-#: src/gui/statuspopup.cpp:244
+#: src/gui/statuspopup.cpp:245
msgid "(?) crazy move"
msgstr ""
-#: src/gui/statuspopup.cpp:254
+#: src/gui/statuspopup.cpp:255
msgid "(0) default moves to target"
msgstr ""
-#: src/gui/statuspopup.cpp:259
+#: src/gui/statuspopup.cpp:260
msgid "(1) moves to target in distance 1"
msgstr ""
-#: src/gui/statuspopup.cpp:264
+#: src/gui/statuspopup.cpp:265
msgid "(2) moves to target in distance 2"
msgstr ""
-#: src/gui/statuspopup.cpp:269
+#: src/gui/statuspopup.cpp:270
msgid "(3) moves to target in distance 3"
msgstr ""
-#: src/gui/statuspopup.cpp:274
+#: src/gui/statuspopup.cpp:275
msgid "(5) moves to target in distance 5"
msgstr ""
-#: src/gui/statuspopup.cpp:279
+#: src/gui/statuspopup.cpp:280
msgid "(7) moves to target in distance 7"
msgstr ""
-#: src/gui/statuspopup.cpp:284
+#: src/gui/statuspopup.cpp:285
msgid "(A) moves to target in attack range"
msgstr ""
-#: src/gui/statuspopup.cpp:289
+#: src/gui/statuspopup.cpp:290
msgid "(?) move to target"
msgstr ""
-#: src/gui/statuspopup.cpp:297
+#: src/gui/statuspopup.cpp:298
msgid "(D) default follow"
msgstr ""
-#: src/gui/statuspopup.cpp:301
+#: src/gui/statuspopup.cpp:302
msgid "(R) relative follow"
msgstr ""
-#: src/gui/statuspopup.cpp:305
+#: src/gui/statuspopup.cpp:306
msgid "(M) mirror follow"
msgstr ""
-#: src/gui/statuspopup.cpp:309
+#: src/gui/statuspopup.cpp:310
msgid "(P) pet follow"
msgstr ""
-#: src/gui/statuspopup.cpp:313
+#: src/gui/statuspopup.cpp:314
msgid "(?) unknown follow"
msgstr ""
-#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
+#: src/gui/statuspopup.cpp:323 src/gui/statuspopup.cpp:346
msgid "(D) default attack"
msgstr ""
-#: src/gui/statuspopup.cpp:327
+#: src/gui/statuspopup.cpp:328
msgid "(s) switch attack without shield"
msgstr ""
-#: src/gui/statuspopup.cpp:332
+#: src/gui/statuspopup.cpp:333
msgid "(S) switch attack with shield"
msgstr ""
-#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
+#: src/gui/statuspopup.cpp:337 src/gui/statuspopup.cpp:362
msgid "(?) attack"
msgstr ""
-#: src/gui/statuspopup.cpp:349
+#: src/gui/statuspopup.cpp:350
msgid "(G) go and attack"
msgstr ""
-#: src/gui/statuspopup.cpp:353
+#: src/gui/statuspopup.cpp:354
msgid "(A) go, attack, pickup"
msgstr ""
-#: src/gui/statuspopup.cpp:357
+#: src/gui/statuspopup.cpp:358
msgid "(d) without auto attack"
msgstr ""
-#: src/gui/statuspopup.cpp:375
+#: src/gui/statuspopup.cpp:376
msgid "(S) small pick up 1x1 cells"
msgstr ""
-#: src/gui/statuspopup.cpp:379
+#: src/gui/statuspopup.cpp:380
msgid "(D) default pick up 2x1 cells"
msgstr ""
-#: src/gui/statuspopup.cpp:383
+#: src/gui/statuspopup.cpp:384
msgid "(F) forward pick up 2x3 cells"
msgstr ""
-#: src/gui/statuspopup.cpp:387
+#: src/gui/statuspopup.cpp:388
msgid "(3) pick up 3x3 cells"
msgstr ""
-#: src/gui/statuspopup.cpp:391
+#: src/gui/statuspopup.cpp:392
msgid "(g) go and pick up in distance 4"
msgstr ""
-#: src/gui/statuspopup.cpp:395
+#: src/gui/statuspopup.cpp:396
msgid "(G) go and pick up in distance 8"
msgstr ""
-#: src/gui/statuspopup.cpp:399
+#: src/gui/statuspopup.cpp:400
msgid "(A) go and pick up in max distance"
msgstr ""
-#: src/gui/statuspopup.cpp:403
+#: src/gui/statuspopup.cpp:404
msgid "(?) pick up"
msgstr ""
-#: src/gui/statuspopup.cpp:412
+#: src/gui/statuspopup.cpp:413
msgid "(N) normal map view"
msgstr ""
-#: src/gui/statuspopup.cpp:416
+#: src/gui/statuspopup.cpp:417
msgid "(D) debug map view"
msgstr ""
-#: src/gui/statuspopup.cpp:420
+#: src/gui/statuspopup.cpp:421
msgid "(u) ultra map view"
msgstr ""
-#: src/gui/statuspopup.cpp:424
+#: src/gui/statuspopup.cpp:425
msgid "(U) ultra map view 2"
msgstr ""
-#: src/gui/statuspopup.cpp:428
+#: src/gui/statuspopup.cpp:429
msgid "(e) empty map view"
msgstr ""
-#: src/gui/statuspopup.cpp:432
+#: src/gui/statuspopup.cpp:433
msgid "(b) black & white map view"
msgstr ""
-#: src/gui/statuspopup.cpp:436
+#: src/gui/statuspopup.cpp:437
msgid "(?) map view"
msgstr ""
-#: src/gui/statuspopup.cpp:444
+#: src/gui/statuspopup.cpp:445
msgid "(f) use #flar for magic attack"
msgstr ""
-#: src/gui/statuspopup.cpp:449
+#: src/gui/statuspopup.cpp:450
msgid "(c) use #chiza for magic attack"
msgstr ""
-#: src/gui/statuspopup.cpp:454
+#: src/gui/statuspopup.cpp:455
msgid "(I) use #ingrav for magic attack"
msgstr ""
-#: src/gui/statuspopup.cpp:459
+#: src/gui/statuspopup.cpp:460
msgid "(F) use #frillyar for magic attack"
msgstr ""
-#: src/gui/statuspopup.cpp:464
+#: src/gui/statuspopup.cpp:465
msgid "(U) use #upmarmu for magic attack"
msgstr ""
-#: src/gui/statuspopup.cpp:468
+#: src/gui/statuspopup.cpp:469
msgid "(?) magic attack"
msgstr ""
-#: src/gui/statuspopup.cpp:477
+#: src/gui/statuspopup.cpp:478
msgid "(D) default imitation"
msgstr ""
-#: src/gui/statuspopup.cpp:481
+#: src/gui/statuspopup.cpp:482
msgid "(O) outfits imitation"
msgstr ""
-#: src/gui/statuspopup.cpp:485
+#: src/gui/statuspopup.cpp:486
msgid "(?) imitation"
msgstr ""
-#: src/gui/statuspopup.cpp:494
+#: src/gui/statuspopup.cpp:495
msgid "(O) on keyboard"
msgstr ""
-#: src/gui/statuspopup.cpp:497
+#: src/gui/statuspopup.cpp:498
msgid "(A) away"
msgstr ""
-#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
+#: src/gui/statuspopup.cpp:501 src/gui/statuspopup.cpp:521
msgid "(?) away"
msgstr ""
-#: src/gui/statuspopup.cpp:508
+#: src/gui/statuspopup.cpp:509
msgid "(G) game camera mode"
msgstr ""
-#: src/gui/statuspopup.cpp:512
+#: src/gui/statuspopup.cpp:513
msgid "(F) free camera mode"
msgstr ""
-#: src/gui/statuspopup.cpp:516
+#: src/gui/statuspopup.cpp:517
msgid "(D) design camera mode"
msgstr ""
-#: src/gui/statuspopup.cpp:527
+#: src/gui/statuspopup.cpp:528
msgid "Game modifiers are disabled"
msgstr ""
-#: src/gui/statuspopup.cpp:532
+#: src/gui/statuspopup.cpp:533
msgid "Game modifiers are enabled"
msgstr ""
-#: src/gui/statuswindow.cpp:142 src/gui/statuswindow.cpp:272
-#: src/gui/statuswindow.cpp:335
+#: src/gui/statuswindow.cpp:143 src/gui/statuswindow.cpp:273
+#: src/gui/statuswindow.cpp:336
#, c-format
msgid "Level: %d"
msgstr "Szint: %d"
-#: src/gui/statuswindow.cpp:143 src/gui/statuswindow.cpp:258
-#: src/gui/statuswindow.cpp:302
+#: src/gui/statuswindow.cpp:144 src/gui/statuswindow.cpp:259
+#: src/gui/statuswindow.cpp:303
#, c-format
msgid "Money: %s"
msgstr "Pénz: %s"
-#: src/gui/statuswindow.cpp:149
+#: src/gui/statuswindow.cpp:150
msgid "HP:"
msgstr "Élet:"
-#: src/gui/statuswindow.cpp:156
+#: src/gui/statuswindow.cpp:157
msgid "Exp:"
msgstr "TP:"
-#: src/gui/statuswindow.cpp:170
+#: src/gui/statuswindow.cpp:171
msgid "MP:"
msgstr "Varázserő:"
-#: src/gui/statuswindow.cpp:202 src/gui/statuswindow.cpp:385
+#: src/gui/statuswindow.cpp:203 src/gui/statuswindow.cpp:386
#, c-format
msgid "Job: %d"
msgstr "Munka: %d"
-#: src/gui/statuswindow.cpp:203
+#: src/gui/statuswindow.cpp:204
msgid "Job:"
msgstr "Munka:"
-#: src/gui/statuswindow.cpp:261 src/gui/statuswindow.cpp:309
+#: src/gui/statuswindow.cpp:262 src/gui/statuswindow.cpp:310
#, c-format
msgid "Character points: %d"
msgstr ""
-#: src/gui/statuswindow.cpp:267
+#: src/gui/statuswindow.cpp:268
#, c-format
msgid "Level: %d (GM %d)"
msgstr ""
-#: src/gui/statuswindow.cpp:323
+#: src/gui/statuswindow.cpp:324
#, c-format
msgid "Correction points: %d"
msgstr ""
-#: src/gui/statuswindow.cpp:646 src/gui/statuswindow.cpp:711
-#: src/gui/statuswindow.cpp:731 src/gui/statuswindow.cpp:747
-#: src/gui/statuswindow.cpp:793 src/gui/statuswindow.cpp:822
-#: src/gui/statuswindow.cpp:845 src/gui/statuswindow.cpp:864
+#: src/gui/statuswindow.cpp:647 src/gui/statuswindow.cpp:712
+#: src/gui/statuswindow.cpp:732 src/gui/statuswindow.cpp:748
+#: src/gui/statuswindow.cpp:794 src/gui/statuswindow.cpp:823
+#: src/gui/statuswindow.cpp:846 src/gui/statuswindow.cpp:865
msgid "(D)"
msgstr ""
-#: src/gui/statuswindow.cpp:649 src/gui/statuswindow.cpp:772
+#: src/gui/statuswindow.cpp:650 src/gui/statuswindow.cpp:773
msgid "(I)"
msgstr ""
-#: src/gui/statuswindow.cpp:652 src/gui/statuswindow.cpp:769
+#: src/gui/statuswindow.cpp:653 src/gui/statuswindow.cpp:770
msgid "(c)"
msgstr ""
-#: src/gui/statuswindow.cpp:655
+#: src/gui/statuswindow.cpp:656
msgid "(C)"
msgstr ""
-#: src/gui/statuswindow.cpp:658 src/gui/statuswindow.cpp:756
+#: src/gui/statuswindow.cpp:659 src/gui/statuswindow.cpp:757
msgid "(d)"
msgstr ""
-#: src/gui/statuswindow.cpp:661 src/gui/statuswindow.cpp:675
-#: src/gui/statuswindow.cpp:704 src/gui/statuswindow.cpp:723
-#: src/gui/statuswindow.cpp:740 src/gui/statuswindow.cpp:759
-#: src/gui/statuswindow.cpp:781 src/gui/statuswindow.cpp:811
-#: src/gui/statuswindow.cpp:837 src/gui/statuswindow.cpp:851
-#: src/gui/statuswindow.cpp:867 src/gui/statuswindow.cpp:880
+#: src/gui/statuswindow.cpp:662 src/gui/statuswindow.cpp:676
+#: src/gui/statuswindow.cpp:705 src/gui/statuswindow.cpp:724
+#: src/gui/statuswindow.cpp:741 src/gui/statuswindow.cpp:760
+#: src/gui/statuswindow.cpp:782 src/gui/statuswindow.cpp:812
+#: src/gui/statuswindow.cpp:838 src/gui/statuswindow.cpp:852
+#: src/gui/statuswindow.cpp:868 src/gui/statuswindow.cpp:881
msgid "(?)"
msgstr ""
-#: src/gui/statuswindow.cpp:672
+#: src/gui/statuswindow.cpp:673
msgid "(a)"
msgstr ""
-#: src/gui/statuswindow.cpp:683
+#: src/gui/statuswindow.cpp:684
msgid "(0)"
msgstr ""
-#: src/gui/statuswindow.cpp:686
+#: src/gui/statuswindow.cpp:687
msgid "(1)"
msgstr ""
-#: src/gui/statuswindow.cpp:689
+#: src/gui/statuswindow.cpp:690
msgid "(2)"
msgstr ""
-#: src/gui/statuswindow.cpp:692 src/gui/statuswindow.cpp:799
+#: src/gui/statuswindow.cpp:693 src/gui/statuswindow.cpp:800
msgid "(3)"
msgstr ""
-#: src/gui/statuswindow.cpp:695
+#: src/gui/statuswindow.cpp:696
msgid "(5)"
msgstr ""
-#: src/gui/statuswindow.cpp:698
+#: src/gui/statuswindow.cpp:699
msgid "(7)"
msgstr ""
-#: src/gui/statuswindow.cpp:701 src/gui/statuswindow.cpp:753
-#: src/gui/statuswindow.cpp:808 src/gui/statuswindow.cpp:877
+#: src/gui/statuswindow.cpp:702 src/gui/statuswindow.cpp:754
+#: src/gui/statuswindow.cpp:809 src/gui/statuswindow.cpp:878
msgid "(A)"
msgstr ""
-#: src/gui/statuswindow.cpp:714
+#: src/gui/statuswindow.cpp:715
msgid "(R)"
msgstr ""
-#: src/gui/statuswindow.cpp:717
+#: src/gui/statuswindow.cpp:718
msgid "(M)"
msgstr ""
-#: src/gui/statuswindow.cpp:720
+#: src/gui/statuswindow.cpp:721
msgid "(P)"
msgstr ""
-#: src/gui/statuswindow.cpp:734
+#: src/gui/statuswindow.cpp:735
msgid "(s)"
msgstr ""
-#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:790
+#: src/gui/statuswindow.cpp:738 src/gui/statuswindow.cpp:791
msgid "(S)"
msgstr ""
-#: src/gui/statuswindow.cpp:750 src/gui/statuswindow.cpp:805
-#: src/gui/statuswindow.cpp:858
+#: src/gui/statuswindow.cpp:751 src/gui/statuswindow.cpp:806
+#: src/gui/statuswindow.cpp:859
msgid "(G)"
msgstr ""
-#: src/gui/statuswindow.cpp:766
+#: src/gui/statuswindow.cpp:767
msgid "(f)"
msgstr ""
-#: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:796
-#: src/gui/statuswindow.cpp:861
+#: src/gui/statuswindow.cpp:776 src/gui/statuswindow.cpp:797
+#: src/gui/statuswindow.cpp:862
msgid "(F)"
msgstr ""
-#: src/gui/statuswindow.cpp:778 src/gui/statuswindow.cpp:828
+#: src/gui/statuswindow.cpp:779 src/gui/statuswindow.cpp:829
msgid "(U)"
msgstr ""
-#: src/gui/statuswindow.cpp:802
+#: src/gui/statuswindow.cpp:803
msgid "(g)"
msgstr ""
-#: src/gui/statuswindow.cpp:819
+#: src/gui/statuswindow.cpp:820
msgid "(N)"
msgstr ""
-#: src/gui/statuswindow.cpp:825
+#: src/gui/statuswindow.cpp:826
msgid "(u)"
msgstr ""
-#: src/gui/statuswindow.cpp:831
+#: src/gui/statuswindow.cpp:832
msgid "(e)"
msgstr ""
-#: src/gui/statuswindow.cpp:834
+#: src/gui/statuswindow.cpp:835
msgid "(b)"
msgstr ""
-#: src/gui/statuswindow.cpp:848 src/gui/statuswindow.cpp:874
+#: src/gui/statuswindow.cpp:849 src/gui/statuswindow.cpp:875
msgid "(O)"
msgstr ""
@@ -3224,24 +3253,24 @@ msgstr "Elfogadva. Vár..."
msgid "Trade: You"
msgstr "Üzlet: Te"
-#: src/gui/tradewindow.cpp:110 src/gui/tradewindow.cpp:166
+#: src/gui/tradewindow.cpp:111 src/gui/tradewindow.cpp:167
#, c-format
msgid "You get %s"
msgstr ""
-#: src/gui/tradewindow.cpp:111
+#: src/gui/tradewindow.cpp:112
msgid "You give:"
msgstr "Adott tárgyak:"
-#: src/gui/tradewindow.cpp:115
+#: src/gui/tradewindow.cpp:116
msgid "Change"
msgstr "Változtatás"
-#: src/gui/tradewindow.cpp:374
+#: src/gui/tradewindow.cpp:375
msgid "You don't have enough money."
msgstr "Nincs elég pénzed."
-#: src/gui/tradewindow.cpp:453
+#: src/gui/tradewindow.cpp:454
msgid "Failed adding item. You can not overlap one kind of item on the window."
msgstr ""
"Hiba a tárgy hozzáadásakor. Nem tudod rárakni az egyik tárgyat a másikra."
@@ -3251,33 +3280,33 @@ msgstr ""
msgid "Name: %s"
msgstr "Név: %s"
-#: src/gui/updaterwindow.cpp:136
+#: src/gui/updaterwindow.cpp:138
msgid "Updating..."
msgstr "Frissítés…"
-#: src/gui/updaterwindow.cpp:155
+#: src/gui/updaterwindow.cpp:159
msgid "Connecting..."
msgstr "Csatlakozás…"
-#: src/gui/updaterwindow.cpp:158
+#: src/gui/updaterwindow.cpp:162
msgid "Play"
msgstr "Játék"
-#: src/gui/updaterwindow.cpp:556
+#: src/gui/updaterwindow.cpp:564
msgid "##1 The update process is incomplete."
msgstr "##1 A frissítési folyamat befejezetlen"
#. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:558
+#: src/gui/updaterwindow.cpp:566
msgid "##1 It is strongly recommended that"
msgstr "##1 Erősen ajánljuk, hogy"
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:560
+#: src/gui/updaterwindow.cpp:568
msgid "##1 you try again later."
msgstr ""
-#: src/gui/updaterwindow.cpp:686
+#: src/gui/updaterwindow.cpp:744
msgid "Completed"
msgstr "Kész"
@@ -3429,23 +3458,23 @@ msgstr ""
msgid "Road Point"
msgstr ""
-#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:471
+#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:472
msgid "Who Is Online - Updating"
msgstr ""
-#: src/gui/whoisonline.cpp:101
+#: src/gui/whoisonline.cpp:102
msgid "Update"
msgstr ""
-#: src/gui/whoisonline.cpp:294
+#: src/gui/whoisonline.cpp:295
msgid "Who Is Online - "
msgstr ""
-#: src/gui/whoisonline.cpp:485
+#: src/gui/whoisonline.cpp:486
msgid "Who Is Online - error"
msgstr ""
-#: src/gui/whoisonline.cpp:516
+#: src/gui/whoisonline.cpp:517
msgid "Who Is Online - Update"
msgstr ""
@@ -3511,7 +3540,8 @@ msgstr ""
"Ez a parancs a <név> alatt megadott személyt csatorna operátorrá teszi."
#: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
-#: src/net/ea/gui/guildtab.cpp:69 src/net/ea/gui/partytab.cpp:85
+#: src/gui/widgets/guildchattab.cpp:61 src/net/ea/gui/guildtab.cpp:69
+#: src/net/ea/gui/partytab.cpp:85
msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
msgstr ""
"Ha a <név> alatt megadott név szóközt tartalmaz idézőjelbe kell tenni. (\")."
@@ -3550,6 +3580,41 @@ msgstr "Globális bejelentés (%s) :"
msgid "%s whispers: %s"
msgstr ""
+#: src/gui/widgets/guildchattab.cpp:59 src/net/ea/gui/guildtab.cpp:67
+#: src/net/ea/gui/partytab.cpp:83
+msgid "Command: /invite <nick>"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:60 src/net/ea/gui/guildtab.cpp:68
+msgid "This command invites <nick> to the guild you're in."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:66 src/net/ea/gui/guildtab.cpp:74
+#: src/net/ea/gui/partytab.cpp:90
+msgid "Command: /leave"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:67 src/net/ea/gui/guildtab.cpp:75
+msgid "This command causes the player to leave the guild."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:109 src/net/ea/gui/guildtab.cpp:135
+#: src/net/ea/gui/partytab.cpp:69
+msgid "/help > Display this help."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:110 src/net/ea/gui/guildtab.cpp:136
+msgid "/invite > Invite a player to your guild"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:111 src/net/ea/gui/guildtab.cpp:137
+msgid "/leave > Leave the guild you are in"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:112 src/net/ea/gui/guildtab.cpp:138
+msgid "/kick > Kick some one from the guild you are in"
+msgstr ""
+
#: src/gui/widgets/setupitem.cpp:271 src/gui/widgets/setupitem.cpp:394
msgid "Edit"
msgstr ""
@@ -4079,68 +4144,68 @@ msgid ""
"strange behaviour."
msgstr ""
-#: src/localplayer.cpp:372
+#: src/localplayer.cpp:370
msgid "You were killed by "
msgstr ""
-#: src/localplayer.cpp:1403
+#: src/localplayer.cpp:1401
msgid "Tried to pick up nonexistent item."
msgstr ""
-#: src/localplayer.cpp:1405
+#: src/localplayer.cpp:1403
msgid "Item is too heavy."
msgstr ""
-#: src/localplayer.cpp:1407
+#: src/localplayer.cpp:1405
msgid "Item is too far away."
msgstr ""
-#: src/localplayer.cpp:1409
+#: src/localplayer.cpp:1407
msgid "Inventory is full."
msgstr ""
-#: src/localplayer.cpp:1411
+#: src/localplayer.cpp:1409
msgid "Stack is too big."
msgstr ""
-#: src/localplayer.cpp:1414
+#: src/localplayer.cpp:1412
msgid "Item belongs to someone else."
msgstr ""
-#: src/localplayer.cpp:1417
+#: src/localplayer.cpp:1415
msgid "Unknown problem picking up item."
msgstr ""
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1441
+#: src/localplayer.cpp:1439
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
msgstr[0] ""
msgstr[1] ""
-#: src/localplayer.cpp:3175
+#: src/localplayer.cpp:3173
msgid "Away"
msgstr ""
-#: src/localplayer.cpp:3476
+#: src/localplayer.cpp:3474
msgid "Follow: "
msgstr ""
-#: src/localplayer.cpp:3478 src/localplayer.cpp:3493
+#: src/localplayer.cpp:3476 src/localplayer.cpp:3491
msgid "Follow canceled"
msgstr ""
-#: src/localplayer.cpp:3485
+#: src/localplayer.cpp:3483
msgid "Imitation: "
msgstr ""
-#: src/localplayer.cpp:3487 src/localplayer.cpp:3495
+#: src/localplayer.cpp:3485 src/localplayer.cpp:3493
msgid "Imitation canceled"
msgstr ""
-#: src/localplayer.cpp:3847
+#: src/localplayer.cpp:3845
msgid "You see "
msgstr ""
@@ -4316,28 +4381,28 @@ msgstr ""
msgid "Failed to delete character."
msgstr ""
-#: src/net/ea/chathandler.cpp:60 src/net/ea/chathandler.cpp:66
-#: src/net/ea/chathandler.cpp:71 src/net/ea/chathandler.cpp:77
-#: src/net/ea/chathandler.cpp:82 src/net/ea/chathandler.cpp:88
-#: src/net/ea/chathandler.cpp:95 src/net/ea/chathandler.cpp:101
+#: src/net/ea/chathandler.cpp:61 src/net/ea/chathandler.cpp:67
+#: src/net/ea/chathandler.cpp:72 src/net/ea/chathandler.cpp:78
+#: src/net/ea/chathandler.cpp:83 src/net/ea/chathandler.cpp:89
+#: src/net/ea/chathandler.cpp:96 src/net/ea/chathandler.cpp:102
msgid "Channels are not supported!"
msgstr ""
-#: src/net/ea/chathandler.cpp:128
+#: src/net/ea/chathandler.cpp:129
#, c-format
msgid "Whisper could not be sent, %s is offline."
msgstr ""
-#: src/net/ea/chathandler.cpp:136
+#: src/net/ea/chathandler.cpp:137
#, c-format
msgid "Whisper could not be sent, ignored by %s."
msgstr ""
-#: src/net/ea/chathandler.cpp:348
+#: src/net/ea/chathandler.cpp:355
msgid "MVP player."
msgstr ""
-#: src/net/ea/chathandler.cpp:352
+#: src/net/ea/chathandler.cpp:359
msgid "MVP player: "
msgstr ""
@@ -4354,38 +4419,6 @@ msgstr ""
msgid "Request to quit denied!"
msgstr ""
-#: src/net/ea/gui/guildtab.cpp:67 src/net/ea/gui/partytab.cpp:83
-msgid "Command: /invite <nick>"
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:68
-msgid "This command invites <nick> to the guild you're in."
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:74 src/net/ea/gui/partytab.cpp:90
-msgid "Command: /leave"
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:75
-msgid "This command causes the player to leave the guild."
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:135 src/net/ea/gui/partytab.cpp:69
-msgid "/help > Display this help."
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:136
-msgid "/invite > Invite a player to your guild"
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:137
-msgid "/leave > Leave the guild you are in"
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:138
-msgid "/kick > Kick some one from the guild you are in"
-msgstr ""
-
#: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
msgid "Guild created."
msgstr "Klán létrehozva."
@@ -4402,85 +4435,81 @@ msgstr ""
msgid "Unknown server response."
msgstr ""
-#: src/net/ea/guildhandler.cpp:180
+#: src/net/ea/guildhandler.cpp:181
#, c-format
msgid "Guild name: %s"
msgstr ""
-#: src/net/ea/guildhandler.cpp:182
+#: src/net/ea/guildhandler.cpp:183
#, c-format
msgid "Guild master: %s"
msgstr ""
-#: src/net/ea/guildhandler.cpp:184
+#: src/net/ea/guildhandler.cpp:185
#, c-format
msgid "Guild level: %d"
msgstr ""
-#: src/net/ea/guildhandler.cpp:186
+#: src/net/ea/guildhandler.cpp:187
#, c-format
msgid "Online members: %d"
msgstr ""
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:189
#, c-format
msgid "Max members: %d"
msgstr ""
-#: src/net/ea/guildhandler.cpp:190
+#: src/net/ea/guildhandler.cpp:191
#, c-format
msgid "Average level: %d"
msgstr ""
-#: src/net/ea/guildhandler.cpp:192
+#: src/net/ea/guildhandler.cpp:193
#, c-format
msgid "Guild exp: %d"
msgstr ""
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:195
#, c-format
msgid "Guild next exp: %d"
msgstr ""
-#: src/net/ea/guildhandler.cpp:196
+#: src/net/ea/guildhandler.cpp:197
#, c-format
msgid "Guild castle: %s"
msgstr ""
-#: src/net/ea/guildhandler.cpp:402
+#: src/net/ea/guildhandler.cpp:403
msgid "Could not inivte user to guild."
msgstr ""
-#: src/net/ea/guildhandler.cpp:406
+#: src/net/ea/guildhandler.cpp:407
msgid "User rejected guild invite."
msgstr ""
-#: src/net/ea/guildhandler.cpp:410
+#: src/net/ea/guildhandler.cpp:411
msgid "User is now part of your guild."
msgstr ""
-#: src/net/ea/guildhandler.cpp:414
+#: src/net/ea/guildhandler.cpp:415
msgid "Your guild is full."
msgstr ""
-#: src/net/ea/guildhandler.cpp:418
+#: src/net/ea/guildhandler.cpp:419
msgid "Unknown guild invite response."
msgstr ""
-#: src/net/ea/guildhandler.cpp:438
-msgid "You have left the guild."
-msgstr ""
-
-#: src/net/ea/guildhandler.cpp:452
+#: src/net/ea/guildhandler.cpp:453
#, c-format
msgid "%s has left your guild."
msgstr ""
-#: src/net/ea/guildhandler.cpp:483
+#: src/net/ea/guildhandler.cpp:484
msgid "You was kicked from guild."
msgstr ""
-#: src/net/ea/guildhandler.cpp:496
+#: src/net/ea/guildhandler.cpp:497
#, c-format
msgid "%s has kicked from your guild."
msgstr ""
@@ -4702,12 +4731,12 @@ msgstr ""
msgid "You have left the party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:368
+#: src/net/ea/partyhandler.cpp:369
#, c-format
msgid "%s has left your party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:444
+#: src/net/ea/partyhandler.cpp:448
#, c-format
msgid "An unknown member tried to say: %s"
msgstr ""
@@ -4832,7 +4861,7 @@ msgid "You're pining for the fjords."
msgstr ""
#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
-#: src/net/ea/playerhandler.cpp:425
+#: src/net/ea/playerhandler.cpp:428
msgid "Message"
msgstr ""
@@ -4845,21 +4874,21 @@ msgstr ""
msgid "You are carrying less than half your weight. You can regain health."
msgstr ""
-#: src/net/ea/playerhandler.cpp:451
+#: src/net/ea/playerhandler.cpp:454
#, c-format
msgid "You picked up %s."
msgstr ""
-#: src/net/ea/playerhandler.cpp:457
+#: src/net/ea/playerhandler.cpp:460
#, c-format
msgid "You spent %s."
msgstr ""
-#: src/net/ea/playerhandler.cpp:501
+#: src/net/ea/playerhandler.cpp:506
msgid "Cannot raise skill!"
msgstr ""
-#: src/net/ea/playerhandler.cpp:618
+#: src/net/ea/playerhandler.cpp:624
msgid "Equip arrows first."
msgstr ""
@@ -4998,7 +5027,7 @@ msgstr "Az üzlet megszakadt."
msgid "Trade completed."
msgstr "Sikeres üzlet."
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:258
msgid "Strength"
msgstr "Erő"
@@ -5007,7 +5036,7 @@ msgstr "Erő"
msgid "Strength %+.1f"
msgstr ""
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:259
msgid "Agility"
msgstr "Mozgékonyság"
@@ -5016,7 +5045,7 @@ msgstr "Mozgékonyság"
msgid "Agility %+.1f"
msgstr ""
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:262
msgid "Dexterity"
msgstr "Ügyesség"
@@ -5025,7 +5054,7 @@ msgstr "Ügyesség"
msgid "Dexterity %+.1f"
msgstr ""
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:260
msgid "Vitality"
msgstr "Egészség"
@@ -5034,7 +5063,7 @@ msgstr "Egészség"
msgid "Vitality %+.1f"
msgstr ""
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:261
msgid "Intelligence"
msgstr "Intelligencia"
@@ -5304,111 +5333,115 @@ msgstr ""
msgid "Unable to sell unsellable item."
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:109
+#: src/net/tmwa/generalhandler.cpp:108
#, c-format
msgid "Strength %+d"
msgstr "Erő %+d"
-#: src/net/tmwa/generalhandler.cpp:110
+#: src/net/tmwa/generalhandler.cpp:109
#, c-format
msgid "Agility %+d"
msgstr "Mozgékonyság %+d"
-#: src/net/tmwa/generalhandler.cpp:111
+#: src/net/tmwa/generalhandler.cpp:110
#, c-format
msgid "Vitality %+d"
msgstr "Egészség %+d"
-#: src/net/tmwa/generalhandler.cpp:112
+#: src/net/tmwa/generalhandler.cpp:111
#, c-format
msgid "Intelligence %+d"
msgstr "Intelligencia %+d"
-#: src/net/tmwa/generalhandler.cpp:113
+#: src/net/tmwa/generalhandler.cpp:112
#, c-format
msgid "Dexterity %+d"
msgstr "Ügyesség %+d"
-#: src/net/tmwa/generalhandler.cpp:114
+#: src/net/tmwa/generalhandler.cpp:113
#, c-format
msgid "Luck %+d"
msgstr "Szerencse %+d"
-#: src/net/tmwa/generalhandler.cpp:140
+#: src/net/tmwa/generalhandler.cpp:139
msgid "Authentication failed."
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:143
+#: src/net/tmwa/generalhandler.cpp:142
msgid "No servers available."
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:147
+#: src/net/tmwa/generalhandler.cpp:146
msgid "Someone else is trying to use this account."
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:150
+#: src/net/tmwa/generalhandler.cpp:149
msgid "This account is already logged in."
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:153
+#: src/net/tmwa/generalhandler.cpp:152
msgid "Speed hack detected."
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:156
+#: src/net/tmwa/generalhandler.cpp:155
msgid "Duplicated login."
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:159
+#: src/net/tmwa/generalhandler.cpp:158
msgid "Unknown connection error."
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:232
+#: src/net/tmwa/generalhandler.cpp:231
msgid "Got disconnected from server!"
msgstr "Lekapcsolódtál a szerverről!"
-#: src/net/tmwa/generalhandler.cpp:264
+#: src/net/tmwa/generalhandler.cpp:263
msgid "Luck"
msgstr "Szerencse"
-#: src/net/tmwa/generalhandler.cpp:267
+#: src/net/tmwa/generalhandler.cpp:266
msgid "Defense"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:268
+#: src/net/tmwa/generalhandler.cpp:267
msgid "M.Attack"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:269
+#: src/net/tmwa/generalhandler.cpp:268
msgid "M.Defense"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:271
+#: src/net/tmwa/generalhandler.cpp:270
#, no-c-format
msgid "% Accuracy"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:273
+#: src/net/tmwa/generalhandler.cpp:272
#, no-c-format
msgid "% Evade"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:275
+#: src/net/tmwa/generalhandler.cpp:274
#, no-c-format
msgid "% Critical"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:276
+#: src/net/tmwa/generalhandler.cpp:275
msgid "Attack Delay"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:278
+#: src/net/tmwa/generalhandler.cpp:277
msgid "Walk Delay"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:280
+#: src/net/tmwa/generalhandler.cpp:279
msgid "Attack Range"
msgstr ""
+#: src/net/tmwa/generalhandler.cpp:281
+msgid "Damage per sec."
+msgstr ""
+
#: src/net/tmwa/network.cpp:152
msgid "Empty address given to Network::connect()!"
msgstr ""
@@ -5442,31 +5475,31 @@ msgstr ""
msgid "Floating bubble"
msgstr ""
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:248
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:246
#: src/resources/monsterdb.cpp:84
msgid "unnamed"
msgstr "Névtelen"
-#: src/resources/itemdb.cpp:65
+#: src/resources/itemdb.cpp:63
#, c-format
msgid "Attack %+d"
msgstr "Támadás %+d"
-#: src/resources/itemdb.cpp:66
+#: src/resources/itemdb.cpp:64
#, c-format
msgid "Defense %+d"
msgstr "Védelem %+d"
-#: src/resources/itemdb.cpp:67
+#: src/resources/itemdb.cpp:65
#, c-format
msgid "HP %+d"
msgstr "Élet: %+d"
-#: src/resources/itemdb.cpp:68
+#: src/resources/itemdb.cpp:66
#, c-format
msgid "MP %+d"
msgstr "Varázserő %+d"
-#: src/resources/itemdb.cpp:171
+#: src/resources/itemdb.cpp:169
msgid "Unknown item"
msgstr "Ismeretlen tárgy"
diff --git a/po/id.po b/po/id.po
index 24a18204f..fec9e367a 100644
--- a/po/id.po
+++ b/po/id.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-20 17:42+0300\n"
-"PO-Revision-Date: 2011-08-16 16:09+0000\n"
+"POT-Creation-Date: 2011-09-02 18:27+0300\n"
+"PO-Revision-Date: 2011-09-02 15:29+0000\n"
"Last-Translator: akaras <akaras@inbox.ru>\n"
"Language-Team: Indonesian (http://www.transifex.net/projects/p/manaplus/team/"
"id/)\n"
@@ -24,119 +24,119 @@ msgstr ""
msgid "Visible on map"
msgstr "Terlihat di peta"
-#: src/being.cpp:542
+#: src/being.cpp:549
msgid "dodge"
msgstr "Menghindar"
-#: src/being.cpp:542
+#: src/being.cpp:549
msgid "miss"
msgstr "Luput"
#. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1514
+#: src/being.cpp:1529
msgid "A"
msgstr "A"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1519
+#: src/being.cpp:1534
msgid "I"
msgstr "l"
-#: src/client.cpp:826 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:831 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
msgid "Setup"
msgstr "Pengaturan"
-#: src/client.cpp:909
+#: src/client.cpp:914
msgid "Connecting to server"
msgstr "Terhubung dengan server"
-#: src/client.cpp:940
+#: src/client.cpp:945
msgid "Logging in"
msgstr "Masuk"
-#: src/client.cpp:973
+#: src/client.cpp:978
msgid "Entering game world"
msgstr "Memasuki arena permainan"
-#: src/client.cpp:1073
+#: src/client.cpp:1078
msgid "Requesting characters"
msgstr "Pemilihan karakter"
-#: src/client.cpp:1104
+#: src/client.cpp:1109
msgid "Connecting to the game server"
msgstr "terhubung dengan server"
-#: src/client.cpp:1114
+#: src/client.cpp:1119
msgid "Changing game servers"
msgstr "Pergantian server"
-#: src/client.cpp:1151 src/client.cpp:1158 src/client.cpp:1293
+#: src/client.cpp:1156 src/client.cpp:1163 src/client.cpp:1298
#: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
-#: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:395
+#: src/gui/charcreatedialog.cpp:221 src/gui/charselectdialog.cpp:253
+#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
#: src/net/manaserv/charhandler.cpp:227
msgid "Error"
msgstr "Kesalahan"
-#: src/client.cpp:1167
+#: src/client.cpp:1172
msgid "Requesting registration details"
msgstr "Meminta detail registrasi"
-#: src/client.cpp:1194
+#: src/client.cpp:1199
msgid "Password Change"
msgstr "Ubah sandi"
-#: src/client.cpp:1195
+#: src/client.cpp:1200
msgid "Password changed successfully!"
msgstr "Perubahan sandi berhasil"
-#: src/client.cpp:1214
+#: src/client.cpp:1219
msgid "Email Change"
msgstr "Perubahan email"
-#: src/client.cpp:1215
+#: src/client.cpp:1220
msgid "Email changed successfully!"
msgstr "Perubahan email berhasil"
-#: src/client.cpp:1235
+#: src/client.cpp:1240
msgid "Unregister Successful"
msgstr "Telah tidak terdaftar"
-#: src/client.cpp:1236
+#: src/client.cpp:1241
msgid "Farewell, come back any time..."
msgstr "Selamat tinggal, datang kembali setiap saat"
-#: src/client.cpp:1423 src/client.cpp:1453 src/client.cpp:1497
-#: src/client.cpp:1922 src/client.cpp:1929
+#: src/client.cpp:1428 src/client.cpp:1458 src/client.cpp:1502
+#: src/client.cpp:1927 src/client.cpp:1934
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%s tidak ada dan tidak dapat dibuat!keluar."
-#: src/client.cpp:1628
+#: src/client.cpp:1633
#, c-format
msgid "Invalid update host: %s"
msgstr "Gagal mengupdate host: %s"
-#: src/client.cpp:1662 src/client.cpp:1668
+#: src/client.cpp:1667 src/client.cpp:1673
msgid "Error creating updates directory!"
msgstr "Gagal membuat direktori update!"
-#: src/client.cpp:1689
+#: src/client.cpp:1694
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "kesalahan %s tidak ada dan tidak dapat dibuat!keluar."
-#: src/commandhandler.cpp:301
+#: src/commandhandler.cpp:303
msgid "Unknown command."
msgstr "Perintah tidak dikenal."
-#: src/commandhandler.cpp:401
+#: src/commandhandler.cpp:403
msgid "Cannot send empty whispers!"
msgstr "Tidak dapat mengirimkan pesan tanpa nama"
-#: src/commandhandler.cpp:415
+#: src/commandhandler.cpp:417
#, c-format
msgid ""
"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -145,147 +145,147 @@ msgstr ""
"Tidak dapat membuat kolom whisper baru untuk nama \"%s\"! nama telah ada, "
"atau nama anda sendiri"
-#: src/commandhandler.cpp:435
+#: src/commandhandler.cpp:437
#, c-format
msgid "Requesting to join channel %s."
msgstr "Meminta untuk masuk ke channel %s."
-#: src/commandhandler.cpp:451 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:453 src/net/ea/gui/partytab.cpp:125
msgid "Party name is missing."
msgstr "Nama kelompok tidak dapat di temukan"
-#: src/commandhandler.cpp:462
+#: src/commandhandler.cpp:464
msgid "Guild name is missing."
msgstr "Nama organisasi tidak ditemukan."
-#: src/commandhandler.cpp:475 src/commandhandler.cpp:582
-#: src/commandhandler.cpp:623 src/commandhandler.cpp:653
+#: src/commandhandler.cpp:477 src/commandhandler.cpp:589
+#: src/commandhandler.cpp:630 src/commandhandler.cpp:660
msgid "Please specify a name."
msgstr "Tetapkan sebuah nama"
-#: src/commandhandler.cpp:516
+#: src/commandhandler.cpp:523
msgid "Return toggles chat."
msgstr "Kembalikan pengalihan obrolan"
-#: src/commandhandler.cpp:516
+#: src/commandhandler.cpp:523
msgid "Message closes chat."
msgstr "Tutup pesan obrolan"
-#: src/commandhandler.cpp:527
+#: src/commandhandler.cpp:534
msgid "Return now toggles chat."
msgstr "Kembalikan sekarang pengalihan obrolan"
-#: src/commandhandler.cpp:533
+#: src/commandhandler.cpp:540
msgid "Message now closes chat."
msgstr "Pesan menutup obrolan"
-#: src/commandhandler.cpp:561
+#: src/commandhandler.cpp:568
msgid "friend"
msgstr "Teman"
-#: src/commandhandler.cpp:566
+#: src/commandhandler.cpp:573
msgid "disregarded"
msgstr "Diabaikan"
-#: src/commandhandler.cpp:571
+#: src/commandhandler.cpp:578
msgid "neutral"
msgstr "netral"
-#: src/commandhandler.cpp:590
+#: src/commandhandler.cpp:597
#, c-format
msgid "Player already %s!"
msgstr "Pemain telah %s!"
-#: src/commandhandler.cpp:604
+#: src/commandhandler.cpp:611
#, c-format
msgid "Player successfully %s!"
msgstr "Pemain telah berhasil %s!"
-#: src/commandhandler.cpp:612
+#: src/commandhandler.cpp:619
#, c-format
msgid "Player could not be %s!"
msgstr "Pemain tidak bisa %s!"
-#: src/commandhandler.cpp:634
+#: src/commandhandler.cpp:641
msgid "Player wasn't ignored!"
msgstr "Pemain tidak diabaikan!"
-#: src/commandhandler.cpp:641
+#: src/commandhandler.cpp:648
msgid "Player no longer ignored!"
msgstr "Pemain tidak lagi diabaikan!"
-#: src/commandhandler.cpp:643
+#: src/commandhandler.cpp:650
msgid "Player could not be unignored!"
msgstr "Pemain tidak dapat diabaikan"
-#: src/commandhandler.cpp:660
+#: src/commandhandler.cpp:667
msgid "Player already erased!"
msgstr "Pemain telah terhapus"
-#: src/commandhandler.cpp:671
+#: src/commandhandler.cpp:678
msgid "Player successfully erased!"
msgstr "Pemain telah berhasil dihapus"
-#: src/commandhandler.cpp:673
+#: src/commandhandler.cpp:680
msgid "Player could not be erased!"
msgstr "Pemain tidak dapat dihapus"
-#: src/commandhandler.cpp:972 src/commandhandler.cpp:1018
+#: src/commandhandler.cpp:980 src/commandhandler.cpp:1026
#, c-format
msgid "Client uptime: %s"
msgstr ""
-#: src/commandhandler.cpp:982
+#: src/commandhandler.cpp:990
#, c-format
msgid "%d week"
msgid_plural "%d weeks"
msgstr[0] ""
-#: src/commandhandler.cpp:991
+#: src/commandhandler.cpp:999
#, c-format
msgid "%d day"
msgid_plural "%d days"
msgstr[0] ""
-#: src/commandhandler.cpp:999
+#: src/commandhandler.cpp:1007
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] ""
-#: src/commandhandler.cpp:1007
+#: src/commandhandler.cpp:1015
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] ""
-#: src/commandhandler.cpp:1015
+#: src/commandhandler.cpp:1023
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
msgstr[0] ""
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1102
msgid "font cache size"
msgstr "Ukuran jenis huruf cache"
-#: src/commandhandler.cpp:1106
+#: src/commandhandler.cpp:1114
msgid "Cache size:"
msgstr "Ukuran Cache:"
-#: src/commandhandler.cpp:1110
+#: src/commandhandler.cpp:1118
msgid "Created:"
msgstr "Buat"
-#: src/commandhandler.cpp:1112
+#: src/commandhandler.cpp:1120
msgid "Deleted:"
msgstr "Hapus"
-#: src/commandhandler.cpp:1159 src/commandhandler.cpp:1166
+#: src/commandhandler.cpp:1167 src/commandhandler.cpp:1174
msgid "Resource images:"
msgstr "Sumber gambar"
-#: src/commandhandler.cpp:1161 src/commandhandler.cpp:1168
+#: src/commandhandler.cpp:1169 src/commandhandler.cpp:1176
msgid "Resource orphaned images:"
msgstr ""
@@ -295,43 +295,43 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
msgstr ""
"Pilihan untuk /%s adalah \"ya\", \"tidak\", \"benar\",\"salah\", \"1\",\"0\"."
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:411
+#: src/game.cpp:252 src/gui/widgets/chattab.cpp:409
msgid "General"
msgstr "Umum"
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:413
+#: src/game.cpp:256 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:411
msgid "Debug"
msgstr "Debug"
-#: src/game.cpp:488
+#: src/game.cpp:511
msgid "Screenshot saved as "
msgstr "Screenshot disimpan sebagai"
-#: src/game.cpp:496
+#: src/game.cpp:519
msgid "Saving screenshot failed!"
msgstr "Gagal menyimpan screenshot!"
-#: src/game.cpp:536
+#: src/game.cpp:559
msgid "The connection to the server was lost."
msgstr "Koneksi ke server terputus"
-#: src/game.cpp:548
+#: src/game.cpp:571
msgid "Network Error"
msgstr "Kesalahan jaringan"
-#: src/game.cpp:1213
+#: src/game.cpp:1236
msgid "Ignoring incoming trade requests"
msgstr "Abaikan permohonan transaksi"
-#: src/game.cpp:1220
+#: src/game.cpp:1243
msgid "Accepting incoming trade requests"
msgstr "Terima permohonan transaksi"
-#: src/game.cpp:1606
+#: src/game.cpp:1629
msgid "Could Not Load Map"
msgstr "Tidak dapat menampilkan peta"
-#: src/game.cpp:1607
+#: src/game.cpp:1630
#, c-format
msgid "Error while loading %s"
msgstr "Error ketika menunggu %s"
@@ -360,103 +360,103 @@ msgstr "Komentar: %s"
msgid "Bot Checker"
msgstr "Pengecek Bot"
-#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
+#: src/gui/botcheckerwindow.cpp:295 src/gui/setup_relations.cpp:64
msgid "Name"
msgstr "Nama"
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:134
-#: src/gui/popupmenu.cpp:292 src/gui/popupmenu.cpp:617
-#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
+#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:133
+#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:646
+#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:265
msgid "Attack"
msgstr "Pukul"
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:279
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:297
#: src/keyboardconfig.cpp:62
msgid "Talk"
msgstr "Berbicara"
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:245
-#: src/gui/popupmenu.cpp:284 src/gui/popupmenu.cpp:674
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:263
+#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:703
msgid "Move"
msgstr "Jalan"
-#: src/gui/botcheckerwindow.cpp:300
+#: src/gui/botcheckerwindow.cpp:299
msgid "Result"
msgstr "Hasil"
-#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123
+#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:124
msgid "Reset"
msgstr "Reset"
-#: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:260
-#: src/gui/popupmenu.cpp:281 src/gui/popupmenu.cpp:688
+#: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:98
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:278
+#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:717
msgid "Buy"
msgstr "Beli"
-#: src/gui/buydialog.cpp:88 src/gui/buydialog.cpp:302
-#: src/gui/selldialog.cpp:87 src/gui/selldialog.cpp:324
+#: src/gui/buydialog.cpp:89 src/gui/buydialog.cpp:303
+#: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
#, c-format
msgid "Price: %s / Total: %s"
msgstr "Harga: %s/ Total: %s"
#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
#. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:93 src/gui/itemamountwindow.cpp:207
-#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:113
-#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:974
+#: src/gui/buydialog.cpp:94 src/gui/itemamountwindow.cpp:207
+#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:973
msgid "+"
msgstr "+"
#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
#. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:96 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:986
+#: src/gui/buydialog.cpp:97 src/gui/itemamountwindow.cpp:206
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:985
msgid "-"
msgstr "-"
-#: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
-#: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
-#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:288
+#: src/gui/buydialog.cpp:99 src/gui/quitdialog.cpp:47
+#: src/gui/quitdialog.cpp:49 src/gui/quitdialog.cpp:50
+#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:294
#: src/keyboardconfig.cpp:290
msgid "Quit"
msgstr "Keluar"
-#: src/gui/buydialog.cpp:99 src/gui/selldialog.cpp:94
-#: src/gui/statuswindow.cpp:503 src/gui/statuswindow.cpp:552
-#: src/gui/statuswindow.cpp:973 src/gui/statuswindow.cpp:1004
+#: src/gui/buydialog.cpp:100 src/gui/selldialog.cpp:95
+#: src/gui/statuswindow.cpp:504 src/gui/statuswindow.cpp:553
+#: src/gui/statuswindow.cpp:972 src/gui/statuswindow.cpp:1003
msgid "Max"
msgstr "Max"
#: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:133
+#: src/gui/inventorywindow.cpp:147 src/gui/setup_other.cpp:133
msgid "Shop"
msgstr "Toko"
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:262
-#: src/gui/popupmenu.cpp:282 src/gui/popupmenu.cpp:690
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:280
+#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:719
#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
-#: src/gui/selldialog.cpp:92
+#: src/gui/selldialog.cpp:93
msgid "Sell"
msgstr "Jual"
#: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
-#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
+#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:96
#: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:336
-#: src/gui/popupmenu.cpp:357 src/gui/popupmenu.cpp:460
-#: src/gui/popupmenu.cpp:487 src/gui/popupmenu.cpp:511
-#: src/gui/popupmenu.cpp:525 src/gui/popupmenu.cpp:544
-#: src/gui/popupmenu.cpp:750 src/gui/popupmenu.cpp:774
-#: src/gui/popupmenu.cpp:1684 src/gui/popupmenu.cpp:1712
-#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1811
-#: src/gui/popupmenu.cpp:1846 src/gui/popupmenu.cpp:1886
-#: src/gui/popupmenu.cpp:1953 src/gui/popupmenu.cpp:1973
-#: src/gui/quitdialog.cpp:59 src/gui/register.cpp:82 src/gui/setup.cpp:71
-#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:354
+#: src/gui/popupmenu.cpp:375 src/gui/popupmenu.cpp:489
+#: src/gui/popupmenu.cpp:516 src/gui/popupmenu.cpp:540
+#: src/gui/popupmenu.cpp:554 src/gui/popupmenu.cpp:573
+#: src/gui/popupmenu.cpp:790 src/gui/popupmenu.cpp:814
+#: src/gui/popupmenu.cpp:1734 src/gui/popupmenu.cpp:1762
+#: src/gui/popupmenu.cpp:1818 src/gui/popupmenu.cpp:1861
+#: src/gui/popupmenu.cpp:1896 src/gui/popupmenu.cpp:1936
+#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2023
+#: src/gui/quitdialog.cpp:54 src/gui/register.cpp:82 src/gui/setup.cpp:72
+#: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:238
#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updaterwindow.cpp:157
+#: src/gui/updaterwindow.cpp:161
msgid "Cancel"
msgstr "Batal"
@@ -488,7 +488,7 @@ msgid "The email address entries mismatch."
msgstr "Pengisian alamat email tidak cocok"
#: src/gui/changepassworddialog.cpp:50 src/gui/changepassworddialog.cpp:59
-#: src/gui/charselectdialog.cpp:140
+#: src/gui/charselectdialog.cpp:139
msgid "Change Password"
msgstr "Ganti sandi"
@@ -523,121 +523,121 @@ msgstr "Password baru yang dimasukkan tidak cocok."
msgid "Create Character"
msgstr "Buat Karakter"
-#: src/gui/charcreatedialog.cpp:73 src/gui/logindialog.cpp:94
+#: src/gui/charcreatedialog.cpp:76 src/gui/logindialog.cpp:94
#: src/gui/register.cpp:75
msgid "Name:"
msgstr "Nama:"
#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
#. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:76 src/gui/charcreatedialog.cpp:81
-#: src/gui/charcreatedialog.cpp:87 src/gui/outfitwindow.cpp:81
+#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:84
+#: src/gui/charcreatedialog.cpp:90 src/gui/outfitwindow.cpp:85
msgid ">"
msgstr ">"
#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
#. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:82
-#: src/gui/charcreatedialog.cpp:88 src/gui/outfitwindow.cpp:80
+#: src/gui/charcreatedialog.cpp:82 src/gui/charcreatedialog.cpp:85
+#: src/gui/charcreatedialog.cpp:91 src/gui/outfitwindow.cpp:84
msgid "<"
msgstr "<"
-#: src/gui/charcreatedialog.cpp:80
+#: src/gui/charcreatedialog.cpp:83
msgid "Hair color:"
msgstr "Warna rambut"
-#: src/gui/charcreatedialog.cpp:83
+#: src/gui/charcreatedialog.cpp:86
msgid "Hair style:"
msgstr "Gaya rambut"
-#: src/gui/charcreatedialog.cpp:89
+#: src/gui/charcreatedialog.cpp:92
msgid "Race:"
msgstr "Ras:"
-#: src/gui/charcreatedialog.cpp:92 src/gui/charselectdialog.cpp:479
-#: src/gui/socialwindow.cpp:1033
+#: src/gui/charcreatedialog.cpp:95 src/gui/charselectdialog.cpp:478
+#: src/gui/socialwindow.cpp:1139
msgid "Create"
msgstr "Buat"
-#: src/gui/charcreatedialog.cpp:94 src/gui/register.cpp:98
+#: src/gui/charcreatedialog.cpp:97 src/gui/register.cpp:98
msgid "Male"
msgstr "Laki-laki"
-#: src/gui/charcreatedialog.cpp:95 src/gui/register.cpp:99
+#: src/gui/charcreatedialog.cpp:98 src/gui/register.cpp:99
msgid "Female"
msgstr "Perempuan"
-#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:300
+#: src/gui/charcreatedialog.cpp:116 src/gui/charcreatedialog.cpp:303
#, c-format
msgid "Please distribute %d points"
msgstr "Tolong distribusikan %d point"
-#: src/gui/charcreatedialog.cpp:219
+#: src/gui/charcreatedialog.cpp:222
msgid "Your name needs to be at least 4 characters."
msgstr "Nama anda paling sedikit harus mengandung 4 karakter"
-#: src/gui/charcreatedialog.cpp:291
+#: src/gui/charcreatedialog.cpp:294
msgid "Character stats OK"
msgstr "Stats Karakter OK"
-#: src/gui/charcreatedialog.cpp:305
+#: src/gui/charcreatedialog.cpp:308
#, c-format
msgid "Please remove %d points"
msgstr "Tolong hilangkan %d poin"
-#: src/gui/charselectdialog.cpp:77
+#: src/gui/charselectdialog.cpp:76
msgid "Confirm Character Delete"
msgstr "Konfirmasi penghapusan karakter"
-#: src/gui/charselectdialog.cpp:78
+#: src/gui/charselectdialog.cpp:77
msgid "Are you sure you want to delete this character?"
msgstr "Apakah anda bersungguh-sungguh ingin menghapus karakter ini?"
-#: src/gui/charselectdialog.cpp:126
+#: src/gui/charselectdialog.cpp:125
msgid "Account and Character Management"
msgstr "Manajemen Akun dan Karakter"
-#: src/gui/charselectdialog.cpp:139
+#: src/gui/charselectdialog.cpp:138
msgid "Switch Login"
msgstr "Ubah Login"
-#: src/gui/charselectdialog.cpp:153 src/gui/unregisterdialog.cpp:50
+#: src/gui/charselectdialog.cpp:152 src/gui/unregisterdialog.cpp:50
#: src/gui/unregisterdialog.cpp:58
msgid "Unregister"
msgstr "Tidak jadi mendaftar"
-#: src/gui/charselectdialog.cpp:162
+#: src/gui/charselectdialog.cpp:161
msgid "Change Email"
msgstr "Ganti email"
-#: src/gui/charselectdialog.cpp:254
+#: src/gui/charselectdialog.cpp:253
msgid "Incorrect password"
msgstr "Sandi tidak benar"
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:286
msgid "Enter password for deleting character"
msgstr "Masukan Sandi untuk menghapus karakter"
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:286
msgid "Enter password:"
msgstr "Masukkan sandi"
-#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:292
-#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
-#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
+#: src/gui/charselectdialog.cpp:408 src/gui/serverdialog.cpp:298
+#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:122
+#: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:241
msgid "Delete"
msgstr "Hapus"
-#: src/gui/charselectdialog.cpp:467
+#: src/gui/charselectdialog.cpp:466
msgid "Choose"
msgstr "Pilih"
-#: src/gui/charselectdialog.cpp:470
+#: src/gui/charselectdialog.cpp:469
#, c-format
msgid "Level %d"
msgstr "Level %d"
-#: src/gui/charselectdialog.cpp:481 src/gui/charselectdialog.cpp:482
+#: src/gui/charselectdialog.cpp:480 src/gui/charselectdialog.cpp:481
msgid "(empty)"
msgstr "(kosong)"
@@ -709,12 +709,12 @@ msgstr "???"
msgid "Chat"
msgstr "Obrolan"
-#: src/gui/chatwindow.cpp:606
+#: src/gui/chatwindow.cpp:609
#, c-format
msgid "Present: %s; %d players are present."
msgstr "Kehadiran: %s; %d pemain yang hadir."
-#: src/gui/chatwindow.cpp:993
+#: src/gui/chatwindow.cpp:996
#, c-format
msgid "Whispering to %s: %s"
msgstr "Berbisik ke %s: %s"
@@ -727,145 +727,145 @@ msgstr "Ya"
msgid "No"
msgstr "Tidak"
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:150
-#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:384
-#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:632
-#: src/gui/popupmenu.cpp:640
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:149
+#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:402
+#: src/gui/popupmenu.cpp:408 src/gui/popupmenu.cpp:661
+#: src/gui/popupmenu.cpp:669
msgid "Ignore"
msgstr "Abaikan"
-#: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
+#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:97
#: src/gui/setup_other.cpp:64
msgid "Map"
msgstr "Peta"
-#: src/gui/debugwindow.cpp:71
+#: src/gui/debugwindow.cpp:73
msgid "Target"
msgstr "Target"
-#: src/gui/debugwindow.cpp:72
+#: src/gui/debugwindow.cpp:74
msgid "Net"
msgstr "Jaring"
-#: src/gui/debugwindow.cpp:145 src/gui/debugwindow.cpp:220
-#: src/gui/debugwindow.cpp:249
+#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
+#: src/gui/debugwindow.cpp:251
msgid "Music:"
msgstr "Musik"
-#: src/gui/debugwindow.cpp:146 src/gui/debugwindow.cpp:224
-#: src/gui/debugwindow.cpp:251
+#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:226
+#: src/gui/debugwindow.cpp:253
msgid "Map:"
msgstr "Peta"
-#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
-#: src/gui/debugwindow.cpp:250
+#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:224
+#: src/gui/debugwindow.cpp:252
msgid "Minimap:"
msgstr "Peta mini"
-#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:218
-#: src/gui/debugwindow.cpp:247
+#: src/gui/debugwindow.cpp:150 src/gui/debugwindow.cpp:220
+#: src/gui/debugwindow.cpp:249
msgid "Cursor:"
msgstr "Kursor"
-#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:201
-#: src/gui/debugwindow.cpp:206
+#: src/gui/debugwindow.cpp:151 src/gui/debugwindow.cpp:203
+#: src/gui/debugwindow.cpp:208
msgid "Player Position:"
msgstr "Posisi Pemain"
-#: src/gui/debugwindow.cpp:152
+#: src/gui/debugwindow.cpp:154
msgid "Particle count:"
msgstr "Hitung partikel:"
-#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:235
-#: src/gui/debugwindow.cpp:254
+#: src/gui/debugwindow.cpp:156 src/gui/debugwindow.cpp:237
+#: src/gui/debugwindow.cpp:256
msgid "Map actors count:"
msgstr "Hitung pemain di peta:"
-#: src/gui/debugwindow.cpp:162 src/gui/debugwindow.cpp:173
+#: src/gui/debugwindow.cpp:164 src/gui/debugwindow.cpp:175
#, c-format
msgid "%d FPS (Software)"
msgstr "%d FPS (Perangkat lunak)"
-#: src/gui/debugwindow.cpp:166
+#: src/gui/debugwindow.cpp:168
#, c-format
msgid "%d FPS (fast OpenGL)"
msgstr "%d FPS (fast OpenGL)"
-#: src/gui/debugwindow.cpp:169
+#: src/gui/debugwindow.cpp:171
#, c-format
msgid "%d FPS (old OpenGL)"
msgstr "%d FPS (old OpenGL)"
-#: src/gui/debugwindow.cpp:176
+#: src/gui/debugwindow.cpp:178
#, c-format
msgid "%d FPS"
msgstr "%d FPS"
-#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:240
+#: src/gui/debugwindow.cpp:190 src/gui/debugwindow.cpp:242
msgid "Textures count:"
msgstr "Penghitungan tekstur:"
-#: src/gui/debugwindow.cpp:231
+#: src/gui/debugwindow.cpp:233
#, c-format
msgid "Particle count: %d"
msgstr "Hitung partikel: %d"
-#: src/gui/debugwindow.cpp:268 src/gui/debugwindow.cpp:299
-#: src/gui/debugwindow.cpp:343
+#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:301
+#: src/gui/debugwindow.cpp:345
msgid "Target:"
msgstr "Target"
-#: src/gui/debugwindow.cpp:269 src/gui/debugwindow.cpp:304
-#: src/gui/debugwindow.cpp:344
+#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:306
+#: src/gui/debugwindow.cpp:346
msgid "Target Id:"
msgstr "Id target:"
-#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:308
-#: src/gui/debugwindow.cpp:313 src/gui/debugwindow.cpp:345
+#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:310
+#: src/gui/debugwindow.cpp:315 src/gui/debugwindow.cpp:347
msgid "Target Level:"
msgstr "Target Level"
-#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:316
-#: src/gui/debugwindow.cpp:346
+#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:318
+#: src/gui/debugwindow.cpp:348
msgid "Target Party:"
msgstr "Target Kelompok:"
-#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:319
-#: src/gui/debugwindow.cpp:347
+#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:321
+#: src/gui/debugwindow.cpp:349
msgid "Target Guild:"
msgstr "Target Organisasi:"
-#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:333
-#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:348
+#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:335
+#: src/gui/debugwindow.cpp:340 src/gui/debugwindow.cpp:350
msgid "Attack delay:"
msgstr "Kecepatan menyerang:"
-#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:323
-#: src/gui/debugwindow.cpp:349
+#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:325
+#: src/gui/debugwindow.cpp:351
msgid "Minimal hit:"
msgstr "Pukulan minimal:"
-#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:325
-#: src/gui/debugwindow.cpp:350
+#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:327
+#: src/gui/debugwindow.cpp:352
msgid "Maximum hit:"
msgstr "Pukulan maksimal:"
-#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:327
-#: src/gui/debugwindow.cpp:351
+#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:329
+#: src/gui/debugwindow.cpp:353
msgid "Critical hit:"
msgstr "Pukulan kritis:"
-#: src/gui/debugwindow.cpp:385 src/gui/debugwindow.cpp:390
+#: src/gui/debugwindow.cpp:387 src/gui/debugwindow.cpp:392
#, c-format
msgid "Ping: %s ms"
msgstr "Ping: %s ms"
-#: src/gui/debugwindow.cpp:393
+#: src/gui/debugwindow.cpp:395
#, c-format
msgid "In: %d bytes/s"
msgstr "Masuk: %d bytes/det"
-#: src/gui/debugwindow.cpp:395
+#: src/gui/debugwindow.cpp:397
#, c-format
msgid "Out: %d bytes/s"
msgstr "Keluar: %d bytes/det"
@@ -874,26 +874,26 @@ msgstr "Keluar: %d bytes/det"
msgid "Did You Know?"
msgstr "Apakah kamu tahu?"
-#: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
-#: src/gui/inventorywindow.cpp:175 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:559 src/gui/shopwindow.cpp:111
+#: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
+#: src/gui/inventorywindow.cpp:176 src/gui/npcdialog.cpp:53
+#: src/gui/popupmenu.cpp:588 src/gui/shopwindow.cpp:113
msgid "Close"
msgstr "Tutup"
-#: src/gui/didyouknowwindow.cpp:62
+#: src/gui/didyouknowwindow.cpp:64
msgid "< Previous"
msgstr "Sebelumnya"
-#: src/gui/didyouknowwindow.cpp:63
+#: src/gui/didyouknowwindow.cpp:65
msgid "Next >"
msgstr "Selanjutnya"
-#: src/gui/didyouknowwindow.cpp:64
+#: src/gui/didyouknowwindow.cpp:66
msgid "Auto open this window"
msgstr "Buka jendela otomatis"
#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:58 src/gui/textdialog.cpp:50
+#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:53 src/gui/textdialog.cpp:50
msgid "OK"
msgstr "OK"
@@ -901,10 +901,10 @@ msgstr "OK"
msgid "Equipment"
msgstr "Perlengkapan"
-#: src/gui/equipmentwindow.cpp:93 src/gui/inventorywindow.cpp:130
-#: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
-#: src/gui/popupmenu.cpp:1643 src/gui/popupmenu.cpp:1738
-#: src/gui/popupmenu.cpp:1783
+#: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:131
+#: src/gui/inventorywindow.cpp:512 src/gui/inventorywindow.cpp:521
+#: src/gui/popupmenu.cpp:1693 src/gui/popupmenu.cpp:1788
+#: src/gui/popupmenu.cpp:1833
msgid "Unequip"
msgstr "Lepaskan"
@@ -917,75 +917,75 @@ msgstr "Bantuan"
msgid "Inventory"
msgstr "Perbekalan"
-#: src/gui/inventorywindow.cpp:104
+#: src/gui/inventorywindow.cpp:105
msgid "Slots:"
msgstr "Slot"
-#: src/gui/inventorywindow.cpp:115
+#: src/gui/inventorywindow.cpp:116
msgid "Filter:"
msgstr "Penyaring:"
-#: src/gui/inventorywindow.cpp:116
+#: src/gui/inventorywindow.cpp:117
msgid "Sort:"
msgstr "Susun"
-#: src/gui/inventorywindow.cpp:122
+#: src/gui/inventorywindow.cpp:123
msgid "na"
msgstr "t/a"
-#: src/gui/inventorywindow.cpp:123
+#: src/gui/inventorywindow.cpp:124
msgid "az"
msgstr "az"
-#: src/gui/inventorywindow.cpp:124
+#: src/gui/inventorywindow.cpp:125
msgid "id"
msgstr "id"
-#: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:513
-#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1645
-#: src/gui/popupmenu.cpp:1740 src/gui/popupmenu.cpp:1785
+#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
+#: src/gui/inventorywindow.cpp:523 src/gui/popupmenu.cpp:1695
+#: src/gui/popupmenu.cpp:1790 src/gui/popupmenu.cpp:1835
msgid "Equip"
msgstr "Pakai"
-#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
-#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1648
-#: src/gui/popupmenu.cpp:1707 src/gui/popupmenu.cpp:1744
-#: src/gui/popupmenu.cpp:1788
+#: src/gui/inventorywindow.cpp:130 src/gui/inventorywindow.cpp:515
+#: src/gui/inventorywindow.cpp:519 src/gui/popupmenu.cpp:1698
+#: src/gui/popupmenu.cpp:1757 src/gui/popupmenu.cpp:1794
+#: src/gui/popupmenu.cpp:1838
msgid "Use"
msgstr "Gunakan"
-#: src/gui/inventorywindow.cpp:143 src/gui/inventorywindow.cpp:619
-#: src/gui/popupmenu.cpp:1652 src/gui/popupmenu.cpp:1749
-#: src/gui/popupmenu.cpp:1792
+#: src/gui/inventorywindow.cpp:144 src/gui/inventorywindow.cpp:620
+#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1799
+#: src/gui/popupmenu.cpp:1842
msgid "Drop..."
msgstr "Buang..."
-#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1661
-#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1801
+#: src/gui/inventorywindow.cpp:145 src/gui/popupmenu.cpp:1711
+#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1851
msgid "Split"
msgstr "Pecah"
-#: src/gui/inventorywindow.cpp:145 src/gui/outfitwindow.cpp:59
-#: src/gui/popupmenu.cpp:520
+#: src/gui/inventorywindow.cpp:146 src/gui/outfitwindow.cpp:60
+#: src/gui/popupmenu.cpp:549
msgid "Outfits"
msgstr "Setelan"
-#: src/gui/inventorywindow.cpp:148
+#: src/gui/inventorywindow.cpp:149
msgid "Weight:"
msgstr "Berat"
-#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
-#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
-#: src/gui/popupmenu.cpp:1804 src/gui/setup.cpp:72
+#: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:611
+#: src/gui/popupmenu.cpp:1674 src/gui/popupmenu.cpp:1811
+#: src/gui/popupmenu.cpp:1854 src/gui/setup.cpp:73
msgid "Store"
msgstr "Simpan"
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1668
+#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1718
msgid "Retrieve"
msgstr "Kembalikan"
-#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1657
-#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1797
+#: src/gui/inventorywindow.cpp:622 src/gui/popupmenu.cpp:1707
+#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1847
#: src/gui/windowmenu.cpp:97
msgid "Drop"
msgstr "Buang"
@@ -1026,11 +1026,11 @@ msgstr "Tambahkan ke daftar jual"
msgid "Unknown."
msgstr "Tidak diketahui"
-#: src/gui/itempopup.cpp:176 src/gui/itempopup.cpp:182
+#: src/gui/itempopup.cpp:177 src/gui/itempopup.cpp:183
msgid ", "
msgstr ","
-#: src/gui/itempopup.cpp:192
+#: src/gui/itempopup.cpp:193
#, c-format
msgid "Weight: %s"
msgstr "Berat: %s"
@@ -1039,88 +1039,92 @@ msgstr "Berat: %s"
msgid "Kill stats"
msgstr "Stat membunuh"
-#: src/gui/killstats.cpp:64
+#: src/gui/killstats.cpp:65
msgid "Reset stats"
msgstr "Atur ulang stats"
-#: src/gui/killstats.cpp:65
+#: src/gui/killstats.cpp:66
msgid "Reset timer"
msgstr "Atur ulang penghitung waktu"
-#: src/gui/killstats.cpp:69 src/gui/killstats.cpp:205
+#: src/gui/killstats.cpp:70 src/gui/killstats.cpp:206
#, c-format
msgid "Level: %d at %f%%"
msgstr "Level: %d pada %f%%"
-#: src/gui/killstats.cpp:73 src/gui/killstats.cpp:210
+#: src/gui/killstats.cpp:74 src/gui/killstats.cpp:211
#, c-format
msgid "Exp: %d/%d Left: %d"
msgstr "Exp: %d%d Tersisa:%d"
-#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:216
-#: src/gui/killstats.cpp:225
+#: src/gui/killstats.cpp:77 src/gui/killstats.cpp:217
+#: src/gui/killstats.cpp:226
#, c-format
msgid "1%% = %d exp, avg mob for 1%%: %s"
msgstr "%%= %d exp, rata-rata mob untuk 1%%: %s"
-#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:142
-#: src/gui/killstats.cpp:234
+#: src/gui/killstats.cpp:80 src/gui/killstats.cpp:143
+#: src/gui/killstats.cpp:235
#, c-format
msgid "Kills: %s, total exp: %s"
msgstr "Membunuh: %s, exp total: %s"
-#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
-#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:230
+#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145
+#: src/gui/killstats.cpp:221 src/gui/killstats.cpp:231
#, c-format
msgid "Avg Exp: %s, No. of avg mob to next level: %s"
msgstr "Rata-rata: %s, No. dari rata-rata mob ke level selanjutnya: %s"
-#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:162
-#: src/gui/killstats.cpp:237
+#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:163
+#: src/gui/killstats.cpp:238
#, c-format
msgid "Kills/Min: %s, Exp/Min: %s"
msgstr "Membunuh/menit: %s, Exp/menit: %s"
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:89 src/gui/killstats.cpp:94
-#: src/gui/killstats.cpp:289 src/gui/killstats.cpp:305
-#: src/gui/killstats.cpp:323
+#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:90 src/gui/killstats.cpp:95
+#: src/gui/killstats.cpp:290 src/gui/killstats.cpp:306
+#: src/gui/killstats.cpp:324
#, c-format
msgid "Exp speed per %d min: %s"
msgid_plural "Exp speed per %d min: %s"
msgstr[0] "Kecepatan Exp per %d menit: %s"
-#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
+#: src/gui/killstats.cpp:88 src/gui/killstats.cpp:93 src/gui/killstats.cpp:98
#, c-format
msgid "Time for next level per %d min: %s"
msgid_plural "Time for next level per %d min: %s"
msgstr[0] "Waktu sebelum naik ke level selanjutnya %d menit: %s"
-#: src/gui/killstats.cpp:100 src/gui/killstats.cpp:241
+#: src/gui/killstats.cpp:101 src/gui/killstats.cpp:242
msgid "Last kill exp:"
msgstr "Exp terakhir"
-#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:355
-#: src/gui/killstats.cpp:361 src/gui/killstats.cpp:367
-#: src/gui/killstats.cpp:372
+#: src/gui/killstats.cpp:103 src/gui/killstats.cpp:356
+#: src/gui/killstats.cpp:362 src/gui/killstats.cpp:368
+#: src/gui/killstats.cpp:373
msgid "Time before jacko spawn:"
msgstr "waktu sebelum Jacko kembali"
-#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:301
-#: src/gui/killstats.cpp:311 src/gui/killstats.cpp:318
-#: src/gui/killstats.cpp:330 src/gui/killstats.cpp:337
+#: src/gui/killstats.cpp:295 src/gui/killstats.cpp:302
+#: src/gui/killstats.cpp:312 src/gui/killstats.cpp:319
+#: src/gui/killstats.cpp:331 src/gui/killstats.cpp:338
#, c-format
msgid " Time for next level: %s"
msgstr "waktu untuk ke level selanjutnya: %s"
-#: src/gui/killstats.cpp:361
+#: src/gui/killstats.cpp:362
#, c-format
msgid "%s %d?"
msgstr "%s %d?"
-#: src/gui/killstats.cpp:367
+#: src/gui/killstats.cpp:368
msgid "jacko spawning"
msgstr "Jacko bertelur"
+#: src/guildmanager.cpp:464 src/net/ea/guildhandler.cpp:439
+msgid "You have left the guild."
+msgstr ""
+
#: src/gui/logindialog.cpp:59
msgid "Normal"
msgstr "Normal"
@@ -1137,7 +1141,7 @@ msgstr "lanjutkan"
msgid "Login"
msgstr "Login"
-#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:246
+#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:252
#: src/gui/widgets/chattab.cpp:173
msgid "Server:"
msgstr "Server:"
@@ -1219,11 +1223,11 @@ msgstr "Masukan"
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:561
+#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:590
msgid "Clear"
msgstr "Hapus"
-#: src/gui/npcdialog.cpp:222
+#: src/gui/npcdialog.cpp:223
msgid "> Next"
msgstr ""
@@ -1239,346 +1243,346 @@ msgstr "Kirim"
msgid "Failed to send as sender or letter invalid."
msgstr "Gagal untuk mengirim sebagai pengirim atau surat tidak valid."
-#: src/gui/outfitwindow.cpp:82 src/gui/outfitwindow.cpp:886
+#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:890
#, c-format
msgid "Outfit: %d"
msgstr "Setelan: %d"
-#: src/gui/outfitwindow.cpp:84 src/gui/outfitwindow.cpp:888
+#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:892
#, c-format
msgid "Key: %s"
msgstr "Kunci: %s"
-#: src/gui/outfitwindow.cpp:87
+#: src/gui/outfitwindow.cpp:91
msgid "Unequip first"
msgstr "Copot lebih dahulu"
-#: src/gui/outfitwindow.cpp:90
+#: src/gui/outfitwindow.cpp:94
msgid "Away outfit"
msgstr "Setelan saat bepergian"
-#: src/gui/popupmenu.cpp:133 src/gui/popupmenu.cpp:616
+#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:645
#: src/gui/widgets/tradetab.cpp:44
msgid "Trade"
msgstr "Tukar"
-#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:375
+#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:393
msgid "Whisper"
msgstr "Berbisik"
-#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:621
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:650
msgid "Heal"
msgstr "Menyembuhkan"
-#: src/gui/popupmenu.cpp:146 src/gui/popupmenu.cpp:381
-#: src/gui/popupmenu.cpp:628
+#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:399
+#: src/gui/popupmenu.cpp:657
msgid "Be friend"
msgstr "Jadikan teman"
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:383
-#: src/gui/popupmenu.cpp:389 src/gui/popupmenu.cpp:408
-#: src/gui/popupmenu.cpp:630 src/gui/popupmenu.cpp:638
-#: src/gui/popupmenu.cpp:662
+#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:156
+#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:401
+#: src/gui/popupmenu.cpp:407 src/gui/popupmenu.cpp:426
+#: src/gui/popupmenu.cpp:659 src/gui/popupmenu.cpp:667
+#: src/gui/popupmenu.cpp:691
msgid "Disregard"
msgstr ""
-#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:161
-#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:177
-#: src/gui/popupmenu.cpp:385 src/gui/popupmenu.cpp:391
-#: src/gui/popupmenu.cpp:398 src/gui/popupmenu.cpp:403
-#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
-#: src/gui/popupmenu.cpp:649 src/gui/popupmenu.cpp:655
+#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:160
+#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:176
+#: src/gui/popupmenu.cpp:403 src/gui/popupmenu.cpp:409
+#: src/gui/popupmenu.cpp:416 src/gui/popupmenu.cpp:421
+#: src/gui/popupmenu.cpp:662 src/gui/popupmenu.cpp:670
+#: src/gui/popupmenu.cpp:678 src/gui/popupmenu.cpp:684
msgid "Erase"
msgstr "Hapus"
-#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:175
-#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:395
-#: src/gui/popupmenu.cpp:402 src/gui/popupmenu.cpp:407
-#: src/gui/popupmenu.cpp:646 src/gui/popupmenu.cpp:654
-#: src/gui/popupmenu.cpp:660
+#: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:174
+#: src/gui/popupmenu.cpp:181 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:425
+#: src/gui/popupmenu.cpp:675 src/gui/popupmenu.cpp:683
+#: src/gui/popupmenu.cpp:689
msgid "Unignore"
msgstr "Batalkan pengabaian"
-#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:186
-#: src/gui/popupmenu.cpp:397 src/gui/popupmenu.cpp:410
-#: src/gui/popupmenu.cpp:648 src/gui/popupmenu.cpp:664
+#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:185
+#: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:428
+#: src/gui/popupmenu.cpp:677 src/gui/popupmenu.cpp:693
#: src/playerrelations.cpp:400
msgid "Completely ignore"
msgstr ""
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:418
-#: src/gui/popupmenu.cpp:672
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:436
+#: src/gui/popupmenu.cpp:701
msgid "Follow"
msgstr "Mengikuti"
-#: src/gui/popupmenu.cpp:196 src/gui/popupmenu.cpp:419
-#: src/gui/popupmenu.cpp:673
+#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:437
+#: src/gui/popupmenu.cpp:702
msgid "Imitation"
msgstr "Tirukan"
-#: src/gui/popupmenu.cpp:206 src/gui/popupmenu.cpp:710
+#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:739
msgid "Invite to party"
msgstr "Undang ke kelompok"
-#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:428
-#: src/gui/popupmenu.cpp:715
+#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:744
msgid "Kick from party"
msgstr "Keluarkan dari kelompok"
-#: src/gui/popupmenu.cpp:226 src/gui/popupmenu.cpp:439
-#: src/gui/popupmenu.cpp:729
+#: src/gui/popupmenu.cpp:225 src/gui/popupmenu.cpp:237
+#: src/gui/popupmenu.cpp:460 src/gui/popupmenu.cpp:761
msgid "Kick from guild"
msgstr "Keluarkan dari organisasi"
-#: src/gui/popupmenu.cpp:228 src/gui/popupmenu.cpp:441
-#: src/gui/popupmenu.cpp:731
+#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:242
+#: src/gui/popupmenu.cpp:465 src/gui/popupmenu.cpp:766
msgid "Change pos in guild"
msgstr "Ubah posisi di organisasi"
-#: src/gui/popupmenu.cpp:234 src/gui/popupmenu.cpp:446
-#: src/gui/popupmenu.cpp:737
+#: src/gui/popupmenu.cpp:251 src/gui/popupmenu.cpp:474
+#: src/gui/popupmenu.cpp:776
msgid "Invite to guild"
msgstr "Undang ke organisasi"
-#: src/gui/popupmenu.cpp:242
+#: src/gui/popupmenu.cpp:260
msgid "Kick player"
msgstr "keluarkan pemain"
-#: src/gui/popupmenu.cpp:244
+#: src/gui/popupmenu.cpp:262
msgid "Nuke"
msgstr "Sembunyikan"
-#: src/gui/popupmenu.cpp:247 src/gui/popupmenu.cpp:675
+#: src/gui/popupmenu.cpp:265 src/gui/popupmenu.cpp:704
msgid "Show Items"
msgstr "Perlihatkan item"
-#: src/gui/popupmenu.cpp:248 src/gui/popupmenu.cpp:676
-#: src/gui/popupmenu.cpp:1970
+#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:705
+#: src/gui/popupmenu.cpp:2020
msgid "Undress"
msgstr "Tanggalkan pakaian"
-#: src/gui/popupmenu.cpp:250 src/gui/popupmenu.cpp:286
-#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:678
-#: src/gui/popupmenu.cpp:746
+#: src/gui/popupmenu.cpp:268 src/gui/popupmenu.cpp:304
+#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:707
+#: src/gui/popupmenu.cpp:786
msgid "Add comment"
msgstr "Penambahan komentar"
-#: src/gui/popupmenu.cpp:268 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:695
+#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:482
+#: src/gui/popupmenu.cpp:724
msgid "Buy (?)"
msgstr "Beli(?)"
-#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:454
-#: src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:483
+#: src/gui/popupmenu.cpp:726
msgid "Sell (?)"
msgstr "Jual(?)"
-#: src/gui/popupmenu.cpp:298
+#: src/gui/popupmenu.cpp:316
msgid "Kick"
msgstr "keluarkan"
-#: src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:327
msgid "Remove from attack list"
msgstr "Hapus dari daftar menyerang"
-#: src/gui/popupmenu.cpp:315
+#: src/gui/popupmenu.cpp:333
msgid "Add to priority attack list"
msgstr "Tambahkan prioritas daftar menyerang"
-#: src/gui/popupmenu.cpp:317
+#: src/gui/popupmenu.cpp:335
msgid "Add to attack list"
msgstr "Tambahkan ke daftar menyerang"
-#: src/gui/popupmenu.cpp:320
+#: src/gui/popupmenu.cpp:338
msgid "Add to ignore list"
msgstr "Tambahkan ke daftar Abaikan"
-#: src/gui/popupmenu.cpp:333 src/gui/popupmenu.cpp:457
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:486
msgid "Add name to chat"
msgstr "Tambahkan nama ke Obrolan"
-#: src/gui/popupmenu.cpp:483
+#: src/gui/popupmenu.cpp:512
msgid "Pick up"
msgstr "Ambil"
-#: src/gui/popupmenu.cpp:484 src/gui/popupmenu.cpp:1682
-#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1805
+#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:1732
+#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1855
msgid "Add to chat"
msgstr "Ambil ke obrolan"
-#: src/gui/popupmenu.cpp:501
+#: src/gui/popupmenu.cpp:530
msgid "Map Item"
msgstr "Daftar barang"
-#: src/gui/popupmenu.cpp:502
+#: src/gui/popupmenu.cpp:531
msgid "Rename"
msgstr "Ganti nama"
-#: src/gui/popupmenu.cpp:503 src/gui/popupmenu.cpp:1923
-#: src/gui/popupmenu.cpp:1941 src/gui/popupmenu.cpp:1946
+#: src/gui/popupmenu.cpp:532 src/gui/popupmenu.cpp:1973
+#: src/gui/popupmenu.cpp:1991 src/gui/popupmenu.cpp:1996
msgid "Remove"
msgstr "Hapus"
-#: src/gui/popupmenu.cpp:508
+#: src/gui/popupmenu.cpp:537
msgid "Warp"
msgstr ""
-#: src/gui/popupmenu.cpp:522
+#: src/gui/popupmenu.cpp:551
msgid "Load old outfits"
msgstr "Memuat setelan lama"
-#: src/gui/popupmenu.cpp:538 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:567 src/gui/windowmenu.cpp:96
msgid "Spells"
msgstr "Mantra"
-#: src/gui/popupmenu.cpp:540
+#: src/gui/popupmenu.cpp:569
msgid "Load old spells"
msgstr "Memuat mantra lama"
-#: src/gui/popupmenu.cpp:541
+#: src/gui/popupmenu.cpp:570
msgid "Edit spell"
msgstr "Edit mantra"
-#: src/gui/popupmenu.cpp:567
+#: src/gui/popupmenu.cpp:596
msgid "Disable highlight"
msgstr "Nonaktifkan sorotan"
-#: src/gui/popupmenu.cpp:572
+#: src/gui/popupmenu.cpp:601
msgid "Enable highlight"
msgstr "Aktifkan sorotan"
-#: src/gui/popupmenu.cpp:577
-msgid "Dont remove name"
-msgstr "Nama jangan di hapus"
+#: src/gui/popupmenu.cpp:606
+msgid "Don't remove name"
+msgstr ""
-#: src/gui/popupmenu.cpp:582
+#: src/gui/popupmenu.cpp:611
msgid "Remove name"
msgstr "hapus nama"
-#: src/gui/popupmenu.cpp:587
+#: src/gui/popupmenu.cpp:616
msgid "Enable away"
msgstr ""
-#: src/gui/popupmenu.cpp:592
+#: src/gui/popupmenu.cpp:621
msgid "Disable away"
msgstr ""
-#: src/gui/popupmenu.cpp:598 src/gui/socialwindow.cpp:1035
+#: src/gui/popupmenu.cpp:627 src/gui/socialwindow.cpp:1141
msgid "Leave"
msgstr ""
-#: src/gui/popupmenu.cpp:758
+#: src/gui/popupmenu.cpp:798
msgid "Change guild position"
msgstr "Ubah posisi Organisasi"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1189
+#: src/gui/popupmenu.cpp:1234
msgid "Rename map sign "
msgstr "Ubah nama tanda peta"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1191
+#: src/gui/popupmenu.cpp:1236
msgid "Name: "
msgstr "Nama:"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1241
+#: src/gui/popupmenu.cpp:1286
msgid "Player comment "
msgstr "Komentar pemain"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1243
+#: src/gui/popupmenu.cpp:1288
msgid "Comment: "
msgstr "komentar"
-#: src/gui/popupmenu.cpp:1607
+#: src/gui/popupmenu.cpp:1657
msgid "Add to trade"
msgstr ""
-#: src/gui/popupmenu.cpp:1613
+#: src/gui/popupmenu.cpp:1663
msgid "Add to trade 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1616
+#: src/gui/popupmenu.cpp:1666
msgid "Add to trade half"
msgstr ""
-#: src/gui/popupmenu.cpp:1618
+#: src/gui/popupmenu.cpp:1668
msgid "Add to trade all"
msgstr "Tambahkan semua ke Penukaran"
-#: src/gui/popupmenu.cpp:1630
+#: src/gui/popupmenu.cpp:1680
msgid "Store 10"
msgstr "Masukkan 10"
-#: src/gui/popupmenu.cpp:1633
+#: src/gui/popupmenu.cpp:1683
msgid "Store half"
msgstr "Masukkan setengah"
-#: src/gui/popupmenu.cpp:1635
+#: src/gui/popupmenu.cpp:1685
msgid "Store all"
msgstr "Masukkan semua"
-#: src/gui/popupmenu.cpp:1653 src/gui/popupmenu.cpp:1750
-#: src/gui/popupmenu.cpp:1793
+#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1800
+#: src/gui/popupmenu.cpp:1843
msgid "Drop all"
msgstr "Buang semuanya"
-#: src/gui/popupmenu.cpp:1674
+#: src/gui/popupmenu.cpp:1724
msgid "Retrieve 10"
msgstr "Ambil 10"
-#: src/gui/popupmenu.cpp:1677
+#: src/gui/popupmenu.cpp:1727
msgid "Retrieve half"
msgstr "Ambil setengah"
-#: src/gui/popupmenu.cpp:1679
+#: src/gui/popupmenu.cpp:1729
msgid "Retrieve all"
msgstr "Ambil semua"
-#: src/gui/popupmenu.cpp:1710 src/gui/popupmenu.cpp:1766
+#: src/gui/popupmenu.cpp:1760 src/gui/popupmenu.cpp:1816
msgid "Load old item shortcuts"
msgstr "Muat jalan pintas iItem lama"
-#: src/gui/popupmenu.cpp:1809
+#: src/gui/popupmenu.cpp:1859
msgid "Load old drop shortcuts"
msgstr "Muat jalan pintas Buang yang lama"
-#: src/gui/popupmenu.cpp:1835 src/gui/popupmenu.cpp:1870
+#: src/gui/popupmenu.cpp:1885 src/gui/popupmenu.cpp:1920
msgid "Hide"
msgstr "Sembunyikan"
-#: src/gui/popupmenu.cpp:1841 src/gui/popupmenu.cpp:1876
+#: src/gui/popupmenu.cpp:1891 src/gui/popupmenu.cpp:1926
msgid "Show"
msgstr "Tampilkan"
-#: src/gui/popupmenu.cpp:1883
+#: src/gui/popupmenu.cpp:1933
msgid "Reset yellow bar"
msgstr "Atur ulang bar kuning"
-#: src/gui/popupmenu.cpp:1885 src/gui/statuswindow.cpp:240
+#: src/gui/popupmenu.cpp:1935 src/gui/statuswindow.cpp:241
msgid "Copy to chat"
msgstr "Pindahkan ke chat"
-#: src/gui/popupmenu.cpp:1903 src/gui/socialwindow.cpp:854
-#: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
+#: src/gui/popupmenu.cpp:1953 src/gui/socialwindow.cpp:958
+#: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028
msgid "(default)"
msgstr "(kembalikan)"
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1933
+#: src/gui/popupmenu.cpp:1965 src/gui/popupmenu.cpp:1983
msgid "Move up"
msgstr "Bergerak keatas"
-#: src/gui/popupmenu.cpp:1920 src/gui/popupmenu.cpp:1938
+#: src/gui/popupmenu.cpp:1970 src/gui/popupmenu.cpp:1988
msgid "Move down"
msgstr "Bergerak kebawah"
-#: src/gui/quitdialog.cpp:56
+#: src/gui/quitdialog.cpp:51
msgid "Switch server"
msgstr "Ganti Server"
-#: src/gui/quitdialog.cpp:57
+#: src/gui/quitdialog.cpp:52
msgid "Switch character"
msgstr "Ganti Karakter"
@@ -1614,64 +1618,64 @@ msgstr "Panjang kata sandi tidak boleh kurang dari %d karakter."
msgid "Passwords do not match."
msgstr "Kata sandi cocok."
-#: src/gui/serverdialog.cpp:231
+#: src/gui/serverdialog.cpp:237
msgid "Choose Your Server"
msgstr "Pilih Server Anda"
-#: src/gui/serverdialog.cpp:242
+#: src/gui/serverdialog.cpp:248
msgid "Choose Your Server *** SAFE MODE ***"
msgstr "Pilih Servermu *** SAFE MODE ***"
-#: src/gui/serverdialog.cpp:247
+#: src/gui/serverdialog.cpp:253
msgid "Port:"
msgstr "Port:"
-#: src/gui/serverdialog.cpp:251
+#: src/gui/serverdialog.cpp:257
msgid "Use same ip for game sub servers"
msgstr "Gunakan ip yang sama untuk sub server game"
-#: src/gui/serverdialog.cpp:265
+#: src/gui/serverdialog.cpp:271
msgid "Server type:"
msgstr "Tipe server:"
-#: src/gui/serverdialog.cpp:289
+#: src/gui/serverdialog.cpp:295
msgid "Load"
msgstr "Memuat"
-#: src/gui/serverdialog.cpp:290
+#: src/gui/serverdialog.cpp:296
msgid "Connect"
msgstr "Menyambung"
-#: src/gui/serverdialog.cpp:291
+#: src/gui/serverdialog.cpp:297
msgid "Custom Server"
msgstr "Modifikasi server"
-#: src/gui/serverdialog.cpp:396
+#: src/gui/serverdialog.cpp:402
msgid "Please type both the address and the port of a server."
msgstr "Tolong tulis address dan port dari server"
-#: src/gui/serverdialog.cpp:554
+#: src/gui/serverdialog.cpp:560
#, c-format
msgid "Downloading server list...%2.2f%%"
msgstr "Mengunduh daftar server... %2.2f%%"
-#: src/gui/serverdialog.cpp:559
+#: src/gui/serverdialog.cpp:565
msgid "Waiting for server..."
msgstr "Menyambung ke server..."
-#: src/gui/serverdialog.cpp:563
+#: src/gui/serverdialog.cpp:569
msgid "Preparing download"
msgstr "Menyiapkan pengunduhan"
-#: src/gui/serverdialog.cpp:567
+#: src/gui/serverdialog.cpp:573
msgid "Error retreiving server list!"
msgstr "Gagal mengunduh data server!"
-#: src/gui/serverdialog.cpp:672
+#: src/gui/serverdialog.cpp:678
msgid "requires a newer version"
msgstr "Membutuhkan versi terbaru"
-#: src/gui/serverdialog.cpp:674
+#: src/gui/serverdialog.cpp:680
#, c-format
msgid "requires v%s"
msgstr "Membutuhkan v%s"
@@ -1816,6 +1820,14 @@ msgstr "Waktu"
msgid "Use local time"
msgstr "Pengunaan waktu lokal"
+#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:157
+msgid "Other"
+msgstr "Lainnya"
+
+#: src/gui/setup_chat.cpp:125
+msgid "Highlight words (separated by comma)"
+msgstr ""
+
#: src/gui/setup_colors.cpp:49
msgid "This is what the color looks like"
msgstr "Warnanya terlihat seperti ini"
@@ -1863,11 +1875,11 @@ msgstr "Biru:"
msgid "Alpha:"
msgstr "Alpha:"
-#: src/gui/setup.cpp:70
+#: src/gui/setup.cpp:71
msgid "Apply"
msgstr "Terapkan"
-#: src/gui/setup.cpp:73
+#: src/gui/setup.cpp:74
msgid "Reset Windows"
msgstr "Atur ulang jendela"
@@ -2044,34 +2056,42 @@ msgid "Log NPC dialogue"
msgstr "Riwayat dialog NPC"
#: src/gui/setup_other.cpp:148
-msgid "Other"
-msgstr "Lainnya"
+msgid "Bots support"
+msgstr ""
#: src/gui/setup_other.cpp:150
-msgid "Enable server side attack"
+msgid "Enable auction bot support"
msgstr ""
#: src/gui/setup_other.cpp:153
+msgid "Enable guild bot support and disable native guild support"
+msgstr ""
+
+#: src/gui/setup_other.cpp:159
+msgid "Enable server side attack"
+msgstr ""
+
+#: src/gui/setup_other.cpp:162
msgid "Enable bot checker"
msgstr "Perbolehkan pengecekan bot"
-#: src/gui/setup_other.cpp:156
+#: src/gui/setup_other.cpp:165
msgid "Enable buggy servers protection"
msgstr ""
-#: src/gui/setup_other.cpp:159
+#: src/gui/setup_other.cpp:168
msgid "Enable debug log"
msgstr ""
-#: src/gui/setup_other.cpp:162
+#: src/gui/setup_other.cpp:171
msgid "Low traffic mode"
msgstr ""
-#: src/gui/setup_other.cpp:165
+#: src/gui/setup_other.cpp:174
msgid "Hide shield sprite"
msgstr ""
-#: src/gui/setup_other.cpp:168
+#: src/gui/setup_other.cpp:177
msgid "Show background"
msgstr "Perlihatkan latar belakang"
@@ -2167,6 +2187,10 @@ msgstr "Perlihatkan status"
msgid "Show ip addresses on screenshots"
msgstr ""
+#: src/gui/setup_players.cpp:81
+msgid "Allow self heal with mouse click"
+msgstr ""
+
#: src/gui/setup_relations.cpp:65
msgid "Relation"
msgstr "Hubungan"
@@ -2439,261 +2463,266 @@ msgstr "Pengaturan efek partikel diubah"
msgid "Changes will take effect on map change."
msgstr "Perubahan akan memberikan efek saat pergantian peta."
-#: src/gui/shopwindow.cpp:74
+#: src/gui/shopwindow.cpp:75
msgid "Personal Shop"
msgstr "Toko personal"
-#: src/gui/shopwindow.cpp:116
+#: src/gui/shopwindow.cpp:118
msgid "Buy items"
msgstr "Beli barang"
-#: src/gui/shopwindow.cpp:117
+#: src/gui/shopwindow.cpp:119
msgid "Sell items"
msgstr "Jual barang"
-#: src/gui/shopwindow.cpp:119 src/gui/shopwindow.cpp:122
-#: src/gui/tradewindow.cpp:88
+#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
+#: src/gui/tradewindow.cpp:89
msgid "Add"
msgstr "Tambah"
-#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
+#: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
msgid "Announce"
msgstr "Umumkan"
-#: src/gui/shopwindow.cpp:125
+#: src/gui/shopwindow.cpp:127
msgid "Show links in announce"
msgstr "Perlihatkan link di Umumkan"
-#: src/gui/shopwindow.cpp:723 src/net/ea/tradehandler.cpp:106
+#: src/gui/shopwindow.cpp:148 src/gui/shopwindow.cpp:149
+msgid "Auction"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:748 src/net/ea/tradehandler.cpp:106
#: src/net/manaserv/tradehandler.cpp:127
msgid "Request for Trade"
msgstr "Meminta untuk menukar"
-#: src/gui/shopwindow.cpp:724
+#: src/gui/shopwindow.cpp:749
#, c-format
msgid "%s wants to %s %s do you accept?"
msgstr "%s ingin %s %s apakah anda bersedia?"
-#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:81
+#: src/gui/skilldialog.cpp:276 src/gui/windowmenu.cpp:81
msgid "Skills"
msgstr "Keahlian"
-#: src/gui/skilldialog.cpp:283
+#: src/gui/skilldialog.cpp:288
msgid "Up"
msgstr "Naik"
-#: src/gui/skilldialog.cpp:336
+#: src/gui/skilldialog.cpp:341
#, c-format
msgid "Skill points available: %d"
msgstr "poin Skill yang tersedia: %d"
-#: src/gui/skilldialog.cpp:413
+#: src/gui/skilldialog.cpp:418
#, c-format
msgid "Skill Set %d"
msgstr ""
-#: src/gui/skilldialog.cpp:425
+#: src/gui/skilldialog.cpp:430
#, c-format
msgid "Skill %d"
msgstr "Skill %d"
-#: src/gui/skilldialog.cpp:492 src/gui/skilldialog.cpp:545
+#: src/gui/skilldialog.cpp:497 src/gui/skilldialog.cpp:550
#, c-format
msgid "Lvl: %d"
msgstr "Level: %d"
-#: src/gui/skilldialog.cpp:537
+#: src/gui/skilldialog.cpp:542
#, c-format
msgid "Lvl: %d (%+d)"
msgstr "Level: %d (%+d)"
-#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
+#: src/gui/socialwindow.cpp:118 src/gui/socialwindow.cpp:216
+#: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52
msgid "Guild"
msgstr "Organisasi"
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:147
#, c-format
msgid "Invited user %s to guild %s."
msgstr "Pengguna yang diajak %s ke organisasi %s."
-#: src/gui/socialwindow.cpp:160
+#: src/gui/socialwindow.cpp:161
#, c-format
msgid "Guild %s quit requested."
msgstr "Permintaan %s keluar dari Organisasi "
-#: src/gui/socialwindow.cpp:187
+#: src/gui/socialwindow.cpp:188
msgid "Member Invite to Guild"
msgstr ""
-#: src/gui/socialwindow.cpp:188
+#: src/gui/socialwindow.cpp:189
#, c-format
msgid "Who would you like to invite to guild %s?"
msgstr ""
-#: src/gui/socialwindow.cpp:197
+#: src/gui/socialwindow.cpp:198
msgid "Leave Guild?"
msgstr "Tinggalkan organisasi?"
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:199
#, c-format
msgid "Are you sure you want to leave guild %s?"
msgstr "Apakah anda yakin ingin meninggalkan organisasi %s?"
-#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:319 src/net/ea/gui/partytab.cpp:50
msgid "Party"
msgstr "Kelompok"
-#: src/gui/socialwindow.cpp:243
+#: src/gui/socialwindow.cpp:347
#, c-format
msgid "Invited user %s to party."
msgstr "Pengguna yang diajak %s ke kelompok"
-#: src/gui/socialwindow.cpp:257
+#: src/gui/socialwindow.cpp:361
#, c-format
msgid "Party %s quit requested."
msgstr ""
-#: src/gui/socialwindow.cpp:284
+#: src/gui/socialwindow.cpp:388
msgid "Member Invite to Party"
msgstr "Mengundang pengguna ke kelompok"
-#: src/gui/socialwindow.cpp:285
+#: src/gui/socialwindow.cpp:389
#, c-format
msgid "Who would you like to invite to party %s?"
msgstr ""
-#: src/gui/socialwindow.cpp:294
+#: src/gui/socialwindow.cpp:398
msgid "Leave Party?"
msgstr ""
-#: src/gui/socialwindow.cpp:295
+#: src/gui/socialwindow.cpp:399
#, c-format
msgid "Are you sure you want to leave party %s?"
msgstr ""
-#: src/gui/socialwindow.cpp:521
+#: src/gui/socialwindow.cpp:625
msgid "Nav"
msgstr ""
-#: src/gui/socialwindow.cpp:799
+#: src/gui/socialwindow.cpp:903
msgid "Atk"
msgstr "Sedang meninggalkan keyboard"
-#: src/gui/socialwindow.cpp:840
+#: src/gui/socialwindow.cpp:944
msgid "Priority mobs"
msgstr "mob prioritas"
-#: src/gui/socialwindow.cpp:872
+#: src/gui/socialwindow.cpp:976
msgid "Attack mobs"
msgstr "serang mob"
-#: src/gui/socialwindow.cpp:907
+#: src/gui/socialwindow.cpp:1011
msgid "Ignore mobs"
msgstr "Abaikan mobs"
-#: src/gui/socialwindow.cpp:970
+#: src/gui/socialwindow.cpp:1074
msgid "Create Guild"
msgstr ""
-#: src/gui/socialwindow.cpp:971 src/gui/socialwindow.cpp:1387
+#: src/gui/socialwindow.cpp:1075 src/gui/socialwindow.cpp:1503
msgid "Create Party"
msgstr ""
-#: src/gui/socialwindow.cpp:1013 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1117 src/gui/windowmenu.cpp:93
msgid "Social"
msgstr ""
-#: src/gui/socialwindow.cpp:1034
+#: src/gui/socialwindow.cpp:1140
msgid "Invite"
msgstr ""
-#: src/gui/socialwindow.cpp:1176
+#: src/gui/socialwindow.cpp:1286
#, c-format
msgid "Accepted party invite from %s."
msgstr ""
-#: src/gui/socialwindow.cpp:1186
+#: src/gui/socialwindow.cpp:1296
#, c-format
msgid "Rejected party invite from %s."
msgstr ""
-#: src/gui/socialwindow.cpp:1203
+#: src/gui/socialwindow.cpp:1313
#, c-format
msgid "Accepted guild invite from %s."
msgstr ""
-#: src/gui/socialwindow.cpp:1213
+#: src/gui/socialwindow.cpp:1326
#, c-format
msgid "Rejected guild invite from %s."
msgstr ""
-#: src/gui/socialwindow.cpp:1257
+#: src/gui/socialwindow.cpp:1373
#, c-format
msgid "Creating guild called %s."
msgstr ""
-#: src/gui/socialwindow.cpp:1280
+#: src/gui/socialwindow.cpp:1396
#, c-format
msgid "Creating party called %s."
msgstr ""
-#: src/gui/socialwindow.cpp:1294
+#: src/gui/socialwindow.cpp:1410
msgid "Guild Name"
msgstr ""
-#: src/gui/socialwindow.cpp:1295
+#: src/gui/socialwindow.cpp:1411
msgid "Choose your guild's name."
msgstr ""
-#: src/gui/socialwindow.cpp:1309
+#: src/gui/socialwindow.cpp:1425
msgid "Received guild request, but one already exists."
msgstr ""
-#: src/gui/socialwindow.cpp:1315
+#: src/gui/socialwindow.cpp:1431
#, c-format
msgid "%s has invited you to join the guild %s."
msgstr ""
-#: src/gui/socialwindow.cpp:1321
+#: src/gui/socialwindow.cpp:1437
msgid "Accept Guild Invite"
msgstr ""
-#: src/gui/socialwindow.cpp:1336
+#: src/gui/socialwindow.cpp:1452
msgid "Received party request, but one already exists."
msgstr ""
-#: src/gui/socialwindow.cpp:1347
+#: src/gui/socialwindow.cpp:1463
msgid "You have been invited you to join a party."
msgstr ""
-#: src/gui/socialwindow.cpp:1351
+#: src/gui/socialwindow.cpp:1467
#, c-format
msgid "You have been invited to join the %s party."
msgstr ""
-#: src/gui/socialwindow.cpp:1359
+#: src/gui/socialwindow.cpp:1475
#, c-format
msgid "%s has invited you to join their party."
msgstr ""
-#: src/gui/socialwindow.cpp:1364
+#: src/gui/socialwindow.cpp:1480
#, c-format
msgid "%s has invited you to join the %s party."
msgstr ""
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1489
msgid "Accept Party Invite"
msgstr ""
-#: src/gui/socialwindow.cpp:1388
+#: src/gui/socialwindow.cpp:1504
msgid "Cannot create party. You are already in a party"
msgstr ""
-#: src/gui/socialwindow.cpp:1393
+#: src/gui/socialwindow.cpp:1509
msgid "Party Name"
msgstr ""
-#: src/gui/socialwindow.cpp:1394
+#: src/gui/socialwindow.cpp:1510
msgid "Choose your party's name."
msgstr ""
@@ -2701,418 +2730,418 @@ msgstr ""
msgid "Specials"
msgstr ""
-#: src/gui/statuspopup.cpp:197
+#: src/gui/statuspopup.cpp:198
msgid "(D) default moves"
msgstr "(D) jalan normal"
-#: src/gui/statuspopup.cpp:202
+#: src/gui/statuspopup.cpp:203
msgid "(I) invert moves"
msgstr ""
-#: src/gui/statuspopup.cpp:207
+#: src/gui/statuspopup.cpp:208
msgid "(c) moves with some crazy moves"
msgstr ""
-#: src/gui/statuspopup.cpp:212
+#: src/gui/statuspopup.cpp:213
msgid "(C) moves with crazy moves"
msgstr ""
-#: src/gui/statuspopup.cpp:217
+#: src/gui/statuspopup.cpp:218
msgid "(d) double normal + crazy"
msgstr "(d) normal ganda + mode gila"
-#: src/gui/statuspopup.cpp:222
+#: src/gui/statuspopup.cpp:223
msgid "(?) move"
msgstr "(?) jalan"
-#: src/gui/statuspopup.cpp:240
+#: src/gui/statuspopup.cpp:241
msgid "(a) custom crazy move"
msgstr ""
-#: src/gui/statuspopup.cpp:244
+#: src/gui/statuspopup.cpp:245
msgid "(?) crazy move"
msgstr ""
-#: src/gui/statuspopup.cpp:254
+#: src/gui/statuspopup.cpp:255
msgid "(0) default moves to target"
msgstr ""
-#: src/gui/statuspopup.cpp:259
+#: src/gui/statuspopup.cpp:260
msgid "(1) moves to target in distance 1"
msgstr ""
-#: src/gui/statuspopup.cpp:264
+#: src/gui/statuspopup.cpp:265
msgid "(2) moves to target in distance 2"
msgstr "(2) jalan ke target di jarak 2"
-#: src/gui/statuspopup.cpp:269
+#: src/gui/statuspopup.cpp:270
msgid "(3) moves to target in distance 3"
msgstr ""
-#: src/gui/statuspopup.cpp:274
+#: src/gui/statuspopup.cpp:275
msgid "(5) moves to target in distance 5"
msgstr ""
-#: src/gui/statuspopup.cpp:279
+#: src/gui/statuspopup.cpp:280
msgid "(7) moves to target in distance 7"
msgstr ""
-#: src/gui/statuspopup.cpp:284
+#: src/gui/statuspopup.cpp:285
msgid "(A) moves to target in attack range"
msgstr ""
-#: src/gui/statuspopup.cpp:289
+#: src/gui/statuspopup.cpp:290
msgid "(?) move to target"
msgstr "(?)bergerak ke target"
-#: src/gui/statuspopup.cpp:297
+#: src/gui/statuspopup.cpp:298
msgid "(D) default follow"
msgstr ""
-#: src/gui/statuspopup.cpp:301
+#: src/gui/statuspopup.cpp:302
msgid "(R) relative follow"
msgstr ""
-#: src/gui/statuspopup.cpp:305
+#: src/gui/statuspopup.cpp:306
msgid "(M) mirror follow"
msgstr ""
-#: src/gui/statuspopup.cpp:309
+#: src/gui/statuspopup.cpp:310
msgid "(P) pet follow"
msgstr ""
-#: src/gui/statuspopup.cpp:313
+#: src/gui/statuspopup.cpp:314
msgid "(?) unknown follow"
msgstr ""
-#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
+#: src/gui/statuspopup.cpp:323 src/gui/statuspopup.cpp:346
msgid "(D) default attack"
msgstr "(D) pukulan normal"
-#: src/gui/statuspopup.cpp:327
+#: src/gui/statuspopup.cpp:328
msgid "(s) switch attack without shield"
msgstr "(s) ganti pukulan tanpa pelindung"
-#: src/gui/statuspopup.cpp:332
+#: src/gui/statuspopup.cpp:333
msgid "(S) switch attack with shield"
msgstr "(S) pukulan dengan pelindung"
-#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
+#: src/gui/statuspopup.cpp:337 src/gui/statuspopup.cpp:362
msgid "(?) attack"
msgstr "(?)serangan"
-#: src/gui/statuspopup.cpp:349
+#: src/gui/statuspopup.cpp:350
msgid "(G) go and attack"
msgstr "(G) jalan dan serang"
-#: src/gui/statuspopup.cpp:353
+#: src/gui/statuspopup.cpp:354
msgid "(A) go, attack, pickup"
msgstr "(A) jalan, serang, ambil"
-#: src/gui/statuspopup.cpp:357
+#: src/gui/statuspopup.cpp:358
msgid "(d) without auto attack"
msgstr "(d) tanpa penyerangan otomatis"
-#: src/gui/statuspopup.cpp:375
+#: src/gui/statuspopup.cpp:376
msgid "(S) small pick up 1x1 cells"
msgstr ""
-#: src/gui/statuspopup.cpp:379
+#: src/gui/statuspopup.cpp:380
msgid "(D) default pick up 2x1 cells"
msgstr ""
-#: src/gui/statuspopup.cpp:383
+#: src/gui/statuspopup.cpp:384
msgid "(F) forward pick up 2x3 cells"
msgstr ""
-#: src/gui/statuspopup.cpp:387
+#: src/gui/statuspopup.cpp:388
msgid "(3) pick up 3x3 cells"
msgstr ""
-#: src/gui/statuspopup.cpp:391
+#: src/gui/statuspopup.cpp:392
msgid "(g) go and pick up in distance 4"
msgstr ""
-#: src/gui/statuspopup.cpp:395
+#: src/gui/statuspopup.cpp:396
msgid "(G) go and pick up in distance 8"
msgstr ""
-#: src/gui/statuspopup.cpp:399
+#: src/gui/statuspopup.cpp:400
msgid "(A) go and pick up in max distance"
msgstr ""
-#: src/gui/statuspopup.cpp:403
+#: src/gui/statuspopup.cpp:404
msgid "(?) pick up"
msgstr "(?)mengambil"
-#: src/gui/statuspopup.cpp:412
+#: src/gui/statuspopup.cpp:413
msgid "(N) normal map view"
msgstr "(N) penampilan peta normal"
-#: src/gui/statuspopup.cpp:416
+#: src/gui/statuspopup.cpp:417
msgid "(D) debug map view"
msgstr ""
-#: src/gui/statuspopup.cpp:420
+#: src/gui/statuspopup.cpp:421
msgid "(u) ultra map view"
msgstr ""
-#: src/gui/statuspopup.cpp:424
+#: src/gui/statuspopup.cpp:425
msgid "(U) ultra map view 2"
msgstr ""
-#: src/gui/statuspopup.cpp:428
+#: src/gui/statuspopup.cpp:429
msgid "(e) empty map view"
msgstr "(e) penampilan peta kosong"
-#: src/gui/statuspopup.cpp:432
+#: src/gui/statuspopup.cpp:433
msgid "(b) black & white map view"
msgstr "(b)penampilan peta hitam & putih"
-#: src/gui/statuspopup.cpp:436
+#: src/gui/statuspopup.cpp:437
msgid "(?) map view"
msgstr ""
-#: src/gui/statuspopup.cpp:444
+#: src/gui/statuspopup.cpp:445
msgid "(f) use #flar for magic attack"
msgstr "(f) gunakan #flar untuk serangan magic"
-#: src/gui/statuspopup.cpp:449
+#: src/gui/statuspopup.cpp:450
msgid "(c) use #chiza for magic attack"
msgstr "(c) gunakan #chiza untuk serangan magic"
-#: src/gui/statuspopup.cpp:454
+#: src/gui/statuspopup.cpp:455
msgid "(I) use #ingrav for magic attack"
msgstr "(l) gunakan #ingrav untuk serangan magic"
-#: src/gui/statuspopup.cpp:459
+#: src/gui/statuspopup.cpp:460
msgid "(F) use #frillyar for magic attack"
msgstr "(F) gunakan #frillyar untuk serangan magic"
-#: src/gui/statuspopup.cpp:464
+#: src/gui/statuspopup.cpp:465
msgid "(U) use #upmarmu for magic attack"
msgstr "(U) gunakan #upmarmu untuk serangan magic"
-#: src/gui/statuspopup.cpp:468
+#: src/gui/statuspopup.cpp:469
msgid "(?) magic attack"
msgstr "(?) serangan magic"
-#: src/gui/statuspopup.cpp:477
+#: src/gui/statuspopup.cpp:478
msgid "(D) default imitation"
msgstr ""
-#: src/gui/statuspopup.cpp:481
+#: src/gui/statuspopup.cpp:482
msgid "(O) outfits imitation"
msgstr ""
-#: src/gui/statuspopup.cpp:485
+#: src/gui/statuspopup.cpp:486
msgid "(?) imitation"
msgstr ""
-#: src/gui/statuspopup.cpp:494
+#: src/gui/statuspopup.cpp:495
msgid "(O) on keyboard"
msgstr "(O) pada keyboard"
-#: src/gui/statuspopup.cpp:497
+#: src/gui/statuspopup.cpp:498
msgid "(A) away"
msgstr "(A) pergi"
-#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
+#: src/gui/statuspopup.cpp:501 src/gui/statuspopup.cpp:521
msgid "(?) away"
msgstr "(?) pergi"
-#: src/gui/statuspopup.cpp:508
+#: src/gui/statuspopup.cpp:509
msgid "(G) game camera mode"
msgstr ""
-#: src/gui/statuspopup.cpp:512
+#: src/gui/statuspopup.cpp:513
msgid "(F) free camera mode"
msgstr ""
-#: src/gui/statuspopup.cpp:516
+#: src/gui/statuspopup.cpp:517
msgid "(D) design camera mode"
msgstr ""
-#: src/gui/statuspopup.cpp:527
+#: src/gui/statuspopup.cpp:528
msgid "Game modifiers are disabled"
msgstr "Perombakan game tidak diperbolehkan"
-#: src/gui/statuspopup.cpp:532
+#: src/gui/statuspopup.cpp:533
msgid "Game modifiers are enabled"
msgstr "Perombakan game diperbolehkan"
-#: src/gui/statuswindow.cpp:142 src/gui/statuswindow.cpp:272
-#: src/gui/statuswindow.cpp:335
+#: src/gui/statuswindow.cpp:143 src/gui/statuswindow.cpp:273
+#: src/gui/statuswindow.cpp:336
#, c-format
msgid "Level: %d"
msgstr "Tingkatan: %d"
-#: src/gui/statuswindow.cpp:143 src/gui/statuswindow.cpp:258
-#: src/gui/statuswindow.cpp:302
+#: src/gui/statuswindow.cpp:144 src/gui/statuswindow.cpp:259
+#: src/gui/statuswindow.cpp:303
#, c-format
msgid "Money: %s"
msgstr ""
-#: src/gui/statuswindow.cpp:149
+#: src/gui/statuswindow.cpp:150
msgid "HP:"
msgstr ""
-#: src/gui/statuswindow.cpp:156
+#: src/gui/statuswindow.cpp:157
msgid "Exp:"
msgstr ""
-#: src/gui/statuswindow.cpp:170
+#: src/gui/statuswindow.cpp:171
msgid "MP:"
msgstr ""
-#: src/gui/statuswindow.cpp:202 src/gui/statuswindow.cpp:385
+#: src/gui/statuswindow.cpp:203 src/gui/statuswindow.cpp:386
#, c-format
msgid "Job: %d"
msgstr ""
-#: src/gui/statuswindow.cpp:203
+#: src/gui/statuswindow.cpp:204
msgid "Job:"
msgstr ""
-#: src/gui/statuswindow.cpp:261 src/gui/statuswindow.cpp:309
+#: src/gui/statuswindow.cpp:262 src/gui/statuswindow.cpp:310
#, c-format
msgid "Character points: %d"
msgstr ""
-#: src/gui/statuswindow.cpp:267
+#: src/gui/statuswindow.cpp:268
#, c-format
msgid "Level: %d (GM %d)"
msgstr ""
-#: src/gui/statuswindow.cpp:323
+#: src/gui/statuswindow.cpp:324
#, c-format
msgid "Correction points: %d"
msgstr ""
-#: src/gui/statuswindow.cpp:646 src/gui/statuswindow.cpp:711
-#: src/gui/statuswindow.cpp:731 src/gui/statuswindow.cpp:747
-#: src/gui/statuswindow.cpp:793 src/gui/statuswindow.cpp:822
-#: src/gui/statuswindow.cpp:845 src/gui/statuswindow.cpp:864
+#: src/gui/statuswindow.cpp:647 src/gui/statuswindow.cpp:712
+#: src/gui/statuswindow.cpp:732 src/gui/statuswindow.cpp:748
+#: src/gui/statuswindow.cpp:794 src/gui/statuswindow.cpp:823
+#: src/gui/statuswindow.cpp:846 src/gui/statuswindow.cpp:865
msgid "(D)"
msgstr "(D)"
-#: src/gui/statuswindow.cpp:649 src/gui/statuswindow.cpp:772
+#: src/gui/statuswindow.cpp:650 src/gui/statuswindow.cpp:773
msgid "(I)"
msgstr "(l)"
-#: src/gui/statuswindow.cpp:652 src/gui/statuswindow.cpp:769
+#: src/gui/statuswindow.cpp:653 src/gui/statuswindow.cpp:770
msgid "(c)"
msgstr "(c)"
-#: src/gui/statuswindow.cpp:655
+#: src/gui/statuswindow.cpp:656
msgid "(C)"
msgstr "(C)"
-#: src/gui/statuswindow.cpp:658 src/gui/statuswindow.cpp:756
+#: src/gui/statuswindow.cpp:659 src/gui/statuswindow.cpp:757
msgid "(d)"
msgstr "(d)"
-#: src/gui/statuswindow.cpp:661 src/gui/statuswindow.cpp:675
-#: src/gui/statuswindow.cpp:704 src/gui/statuswindow.cpp:723
-#: src/gui/statuswindow.cpp:740 src/gui/statuswindow.cpp:759
-#: src/gui/statuswindow.cpp:781 src/gui/statuswindow.cpp:811
-#: src/gui/statuswindow.cpp:837 src/gui/statuswindow.cpp:851
-#: src/gui/statuswindow.cpp:867 src/gui/statuswindow.cpp:880
+#: src/gui/statuswindow.cpp:662 src/gui/statuswindow.cpp:676
+#: src/gui/statuswindow.cpp:705 src/gui/statuswindow.cpp:724
+#: src/gui/statuswindow.cpp:741 src/gui/statuswindow.cpp:760
+#: src/gui/statuswindow.cpp:782 src/gui/statuswindow.cpp:812
+#: src/gui/statuswindow.cpp:838 src/gui/statuswindow.cpp:852
+#: src/gui/statuswindow.cpp:868 src/gui/statuswindow.cpp:881
msgid "(?)"
msgstr "(?)"
-#: src/gui/statuswindow.cpp:672
+#: src/gui/statuswindow.cpp:673
msgid "(a)"
msgstr "(a)"
-#: src/gui/statuswindow.cpp:683
+#: src/gui/statuswindow.cpp:684
msgid "(0)"
msgstr "(0)"
-#: src/gui/statuswindow.cpp:686
+#: src/gui/statuswindow.cpp:687
msgid "(1)"
msgstr "(1)"
-#: src/gui/statuswindow.cpp:689
+#: src/gui/statuswindow.cpp:690
msgid "(2)"
msgstr "(2)"
-#: src/gui/statuswindow.cpp:692 src/gui/statuswindow.cpp:799
+#: src/gui/statuswindow.cpp:693 src/gui/statuswindow.cpp:800
msgid "(3)"
msgstr "(3)"
-#: src/gui/statuswindow.cpp:695
+#: src/gui/statuswindow.cpp:696
msgid "(5)"
msgstr "(5)"
-#: src/gui/statuswindow.cpp:698
+#: src/gui/statuswindow.cpp:699
msgid "(7)"
msgstr "(7)"
-#: src/gui/statuswindow.cpp:701 src/gui/statuswindow.cpp:753
-#: src/gui/statuswindow.cpp:808 src/gui/statuswindow.cpp:877
+#: src/gui/statuswindow.cpp:702 src/gui/statuswindow.cpp:754
+#: src/gui/statuswindow.cpp:809 src/gui/statuswindow.cpp:878
msgid "(A)"
msgstr "(A)"
-#: src/gui/statuswindow.cpp:714
+#: src/gui/statuswindow.cpp:715
msgid "(R)"
msgstr "(R)"
-#: src/gui/statuswindow.cpp:717
+#: src/gui/statuswindow.cpp:718
msgid "(M)"
msgstr "(M)"
-#: src/gui/statuswindow.cpp:720
+#: src/gui/statuswindow.cpp:721
msgid "(P)"
msgstr "(P)"
-#: src/gui/statuswindow.cpp:734
+#: src/gui/statuswindow.cpp:735
msgid "(s)"
msgstr "(s)"
-#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:790
+#: src/gui/statuswindow.cpp:738 src/gui/statuswindow.cpp:791
msgid "(S)"
msgstr "(S)"
-#: src/gui/statuswindow.cpp:750 src/gui/statuswindow.cpp:805
-#: src/gui/statuswindow.cpp:858
+#: src/gui/statuswindow.cpp:751 src/gui/statuswindow.cpp:806
+#: src/gui/statuswindow.cpp:859
msgid "(G)"
msgstr "(G)"
-#: src/gui/statuswindow.cpp:766
+#: src/gui/statuswindow.cpp:767
msgid "(f)"
msgstr "(f)"
-#: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:796
-#: src/gui/statuswindow.cpp:861
+#: src/gui/statuswindow.cpp:776 src/gui/statuswindow.cpp:797
+#: src/gui/statuswindow.cpp:862
msgid "(F)"
msgstr "(F)"
-#: src/gui/statuswindow.cpp:778 src/gui/statuswindow.cpp:828
+#: src/gui/statuswindow.cpp:779 src/gui/statuswindow.cpp:829
msgid "(U)"
msgstr "(U)"
-#: src/gui/statuswindow.cpp:802
+#: src/gui/statuswindow.cpp:803
msgid "(g)"
msgstr "(g)"
-#: src/gui/statuswindow.cpp:819
+#: src/gui/statuswindow.cpp:820
msgid "(N)"
msgstr "(N)"
-#: src/gui/statuswindow.cpp:825
+#: src/gui/statuswindow.cpp:826
msgid "(u)"
msgstr "(u)"
-#: src/gui/statuswindow.cpp:831
+#: src/gui/statuswindow.cpp:832
msgid "(e)"
msgstr "(e)"
-#: src/gui/statuswindow.cpp:834
+#: src/gui/statuswindow.cpp:835
msgid "(b)"
msgstr "(b)"
-#: src/gui/statuswindow.cpp:848 src/gui/statuswindow.cpp:874
+#: src/gui/statuswindow.cpp:849 src/gui/statuswindow.cpp:875
msgid "(O)"
msgstr "(O)"
@@ -3220,24 +3249,24 @@ msgstr "Terima. Menunggu..."
msgid "Trade: You"
msgstr "Tukar: Anda"
-#: src/gui/tradewindow.cpp:110 src/gui/tradewindow.cpp:166
+#: src/gui/tradewindow.cpp:111 src/gui/tradewindow.cpp:167
#, c-format
msgid "You get %s"
msgstr "Kamu mendapatkan %s"
-#: src/gui/tradewindow.cpp:111
+#: src/gui/tradewindow.cpp:112
msgid "You give:"
msgstr "Anda memberikan:"
-#: src/gui/tradewindow.cpp:115
+#: src/gui/tradewindow.cpp:116
msgid "Change"
msgstr "Ubah"
-#: src/gui/tradewindow.cpp:374
+#: src/gui/tradewindow.cpp:375
msgid "You don't have enough money."
msgstr "Anda tidak memiliki cukup uang."
-#: src/gui/tradewindow.cpp:453
+#: src/gui/tradewindow.cpp:454
msgid "Failed adding item. You can not overlap one kind of item on the window."
msgstr ""
@@ -3246,33 +3275,33 @@ msgstr ""
msgid "Name: %s"
msgstr "Nama: %s"
-#: src/gui/updaterwindow.cpp:136
+#: src/gui/updaterwindow.cpp:138
msgid "Updating..."
msgstr "Mengupdate..."
-#: src/gui/updaterwindow.cpp:155
+#: src/gui/updaterwindow.cpp:159
msgid "Connecting..."
msgstr "Menyambung..."
-#: src/gui/updaterwindow.cpp:158
+#: src/gui/updaterwindow.cpp:162
msgid "Play"
msgstr "Main"
-#: src/gui/updaterwindow.cpp:556
+#: src/gui/updaterwindow.cpp:564
msgid "##1 The update process is incomplete."
msgstr ""
#. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:558
+#: src/gui/updaterwindow.cpp:566
msgid "##1 It is strongly recommended that"
msgstr ""
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:560
+#: src/gui/updaterwindow.cpp:568
msgid "##1 you try again later."
msgstr ""
-#: src/gui/updaterwindow.cpp:686
+#: src/gui/updaterwindow.cpp:744
msgid "Completed"
msgstr ""
@@ -3424,23 +3453,23 @@ msgstr ""
msgid "Road Point"
msgstr ""
-#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:471
+#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:472
msgid "Who Is Online - Updating"
msgstr ""
-#: src/gui/whoisonline.cpp:101
+#: src/gui/whoisonline.cpp:102
msgid "Update"
msgstr ""
-#: src/gui/whoisonline.cpp:294
+#: src/gui/whoisonline.cpp:295
msgid "Who Is Online - "
msgstr ""
-#: src/gui/whoisonline.cpp:485
+#: src/gui/whoisonline.cpp:486
msgid "Who Is Online - error"
msgstr ""
-#: src/gui/whoisonline.cpp:516
+#: src/gui/whoisonline.cpp:517
msgid "Who Is Online - Update"
msgstr ""
@@ -3505,7 +3534,8 @@ msgid "This command makes <nick> a channel operator."
msgstr ""
#: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
-#: src/net/ea/gui/guildtab.cpp:69 src/net/ea/gui/partytab.cpp:85
+#: src/gui/widgets/guildchattab.cpp:61 src/net/ea/gui/guildtab.cpp:69
+#: src/net/ea/gui/partytab.cpp:85
msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
msgstr "Jika <nama> mempunyai spasi, ditutup dengan tanda (\")."
@@ -3543,6 +3573,41 @@ msgstr ""
msgid "%s whispers: %s"
msgstr ""
+#: src/gui/widgets/guildchattab.cpp:59 src/net/ea/gui/guildtab.cpp:67
+#: src/net/ea/gui/partytab.cpp:83
+msgid "Command: /invite <nick>"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:60 src/net/ea/gui/guildtab.cpp:68
+msgid "This command invites <nick> to the guild you're in."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:66 src/net/ea/gui/guildtab.cpp:74
+#: src/net/ea/gui/partytab.cpp:90
+msgid "Command: /leave"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:67 src/net/ea/gui/guildtab.cpp:75
+msgid "This command causes the player to leave the guild."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:109 src/net/ea/gui/guildtab.cpp:135
+#: src/net/ea/gui/partytab.cpp:69
+msgid "/help > Display this help."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:110 src/net/ea/gui/guildtab.cpp:136
+msgid "/invite > Invite a player to your guild"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:111 src/net/ea/gui/guildtab.cpp:137
+msgid "/leave > Leave the guild you are in"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:112 src/net/ea/gui/guildtab.cpp:138
+msgid "/kick > Kick some one from the guild you are in"
+msgstr ""
+
#: src/gui/widgets/setupitem.cpp:271 src/gui/widgets/setupitem.cpp:394
msgid "Edit"
msgstr "Ganti"
@@ -4072,67 +4137,67 @@ msgid ""
"strange behaviour."
msgstr ""
-#: src/localplayer.cpp:372
+#: src/localplayer.cpp:370
msgid "You were killed by "
msgstr ""
-#: src/localplayer.cpp:1403
+#: src/localplayer.cpp:1401
msgid "Tried to pick up nonexistent item."
msgstr "Mencoba mengambil item yang tidak lagi ada"
-#: src/localplayer.cpp:1405
+#: src/localplayer.cpp:1403
msgid "Item is too heavy."
msgstr "item terlalu berat"
-#: src/localplayer.cpp:1407
+#: src/localplayer.cpp:1405
msgid "Item is too far away."
msgstr "barang terlalu jauh"
-#: src/localplayer.cpp:1409
+#: src/localplayer.cpp:1407
msgid "Inventory is full."
msgstr "Perbekalan sudah penuh"
-#: src/localplayer.cpp:1411
+#: src/localplayer.cpp:1409
msgid "Stack is too big."
msgstr ""
-#: src/localplayer.cpp:1414
+#: src/localplayer.cpp:1412
msgid "Item belongs to someone else."
msgstr "Barang milik orang lain."
-#: src/localplayer.cpp:1417
+#: src/localplayer.cpp:1415
msgid "Unknown problem picking up item."
msgstr ""
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1441
+#: src/localplayer.cpp:1439
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
msgstr[0] ""
-#: src/localplayer.cpp:3175
+#: src/localplayer.cpp:3173
msgid "Away"
msgstr ""
-#: src/localplayer.cpp:3476
+#: src/localplayer.cpp:3474
msgid "Follow: "
msgstr "Ikuti:"
-#: src/localplayer.cpp:3478 src/localplayer.cpp:3493
+#: src/localplayer.cpp:3476 src/localplayer.cpp:3491
msgid "Follow canceled"
msgstr "Batal mengikuti"
-#: src/localplayer.cpp:3485
+#: src/localplayer.cpp:3483
msgid "Imitation: "
msgstr "Tirukan:"
-#: src/localplayer.cpp:3487 src/localplayer.cpp:3495
+#: src/localplayer.cpp:3485 src/localplayer.cpp:3493
msgid "Imitation canceled"
msgstr "Batal menirukan"
-#: src/localplayer.cpp:3847
+#: src/localplayer.cpp:3845
msgid "You see "
msgstr ""
@@ -4308,28 +4373,28 @@ msgstr ""
msgid "Failed to delete character."
msgstr ""
-#: src/net/ea/chathandler.cpp:60 src/net/ea/chathandler.cpp:66
-#: src/net/ea/chathandler.cpp:71 src/net/ea/chathandler.cpp:77
-#: src/net/ea/chathandler.cpp:82 src/net/ea/chathandler.cpp:88
-#: src/net/ea/chathandler.cpp:95 src/net/ea/chathandler.cpp:101
+#: src/net/ea/chathandler.cpp:61 src/net/ea/chathandler.cpp:67
+#: src/net/ea/chathandler.cpp:72 src/net/ea/chathandler.cpp:78
+#: src/net/ea/chathandler.cpp:83 src/net/ea/chathandler.cpp:89
+#: src/net/ea/chathandler.cpp:96 src/net/ea/chathandler.cpp:102
msgid "Channels are not supported!"
msgstr ""
-#: src/net/ea/chathandler.cpp:128
+#: src/net/ea/chathandler.cpp:129
#, c-format
msgid "Whisper could not be sent, %s is offline."
msgstr ""
-#: src/net/ea/chathandler.cpp:136
+#: src/net/ea/chathandler.cpp:137
#, c-format
msgid "Whisper could not be sent, ignored by %s."
msgstr ""
-#: src/net/ea/chathandler.cpp:348
+#: src/net/ea/chathandler.cpp:355
msgid "MVP player."
msgstr ""
-#: src/net/ea/chathandler.cpp:352
+#: src/net/ea/chathandler.cpp:359
msgid "MVP player: "
msgstr ""
@@ -4346,38 +4411,6 @@ msgstr ""
msgid "Request to quit denied!"
msgstr ""
-#: src/net/ea/gui/guildtab.cpp:67 src/net/ea/gui/partytab.cpp:83
-msgid "Command: /invite <nick>"
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:68
-msgid "This command invites <nick> to the guild you're in."
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:74 src/net/ea/gui/partytab.cpp:90
-msgid "Command: /leave"
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:75
-msgid "This command causes the player to leave the guild."
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:135 src/net/ea/gui/partytab.cpp:69
-msgid "/help > Display this help."
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:136
-msgid "/invite > Invite a player to your guild"
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:137
-msgid "/leave > Leave the guild you are in"
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:138
-msgid "/kick > Kick some one from the guild you are in"
-msgstr ""
-
#: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
msgid "Guild created."
msgstr ""
@@ -4394,85 +4427,81 @@ msgstr ""
msgid "Unknown server response."
msgstr ""
-#: src/net/ea/guildhandler.cpp:180
+#: src/net/ea/guildhandler.cpp:181
#, c-format
msgid "Guild name: %s"
msgstr ""
-#: src/net/ea/guildhandler.cpp:182
+#: src/net/ea/guildhandler.cpp:183
#, c-format
msgid "Guild master: %s"
msgstr ""
-#: src/net/ea/guildhandler.cpp:184
+#: src/net/ea/guildhandler.cpp:185
#, c-format
msgid "Guild level: %d"
msgstr ""
-#: src/net/ea/guildhandler.cpp:186
+#: src/net/ea/guildhandler.cpp:187
#, c-format
msgid "Online members: %d"
msgstr ""
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:189
#, c-format
msgid "Max members: %d"
msgstr ""
-#: src/net/ea/guildhandler.cpp:190
+#: src/net/ea/guildhandler.cpp:191
#, c-format
msgid "Average level: %d"
msgstr ""
-#: src/net/ea/guildhandler.cpp:192
+#: src/net/ea/guildhandler.cpp:193
#, c-format
msgid "Guild exp: %d"
msgstr ""
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:195
#, c-format
msgid "Guild next exp: %d"
msgstr ""
-#: src/net/ea/guildhandler.cpp:196
+#: src/net/ea/guildhandler.cpp:197
#, c-format
msgid "Guild castle: %s"
msgstr ""
-#: src/net/ea/guildhandler.cpp:402
+#: src/net/ea/guildhandler.cpp:403
msgid "Could not inivte user to guild."
msgstr ""
-#: src/net/ea/guildhandler.cpp:406
+#: src/net/ea/guildhandler.cpp:407
msgid "User rejected guild invite."
msgstr ""
-#: src/net/ea/guildhandler.cpp:410
+#: src/net/ea/guildhandler.cpp:411
msgid "User is now part of your guild."
msgstr ""
-#: src/net/ea/guildhandler.cpp:414
+#: src/net/ea/guildhandler.cpp:415
msgid "Your guild is full."
msgstr ""
-#: src/net/ea/guildhandler.cpp:418
+#: src/net/ea/guildhandler.cpp:419
msgid "Unknown guild invite response."
msgstr ""
-#: src/net/ea/guildhandler.cpp:438
-msgid "You have left the guild."
-msgstr ""
-
-#: src/net/ea/guildhandler.cpp:452
+#: src/net/ea/guildhandler.cpp:453
#, c-format
msgid "%s has left your guild."
msgstr ""
-#: src/net/ea/guildhandler.cpp:483
+#: src/net/ea/guildhandler.cpp:484
msgid "You was kicked from guild."
msgstr ""
-#: src/net/ea/guildhandler.cpp:496
+#: src/net/ea/guildhandler.cpp:497
#, c-format
msgid "%s has kicked from your guild."
msgstr ""
@@ -4694,12 +4723,12 @@ msgstr ""
msgid "You have left the party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:368
+#: src/net/ea/partyhandler.cpp:369
#, c-format
msgid "%s has left your party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:444
+#: src/net/ea/partyhandler.cpp:448
#, c-format
msgid "An unknown member tried to say: %s"
msgstr ""
@@ -4820,7 +4849,7 @@ msgid "You're pining for the fjords."
msgstr ""
#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
-#: src/net/ea/playerhandler.cpp:425
+#: src/net/ea/playerhandler.cpp:428
msgid "Message"
msgstr ""
@@ -4835,21 +4864,21 @@ msgstr ""
"Kamu membawa kurang dari setengah jumlah berat maksimal. Darah dapat "
"beregenerasi."
-#: src/net/ea/playerhandler.cpp:451
+#: src/net/ea/playerhandler.cpp:454
#, c-format
msgid "You picked up %s."
msgstr ""
-#: src/net/ea/playerhandler.cpp:457
+#: src/net/ea/playerhandler.cpp:460
#, c-format
msgid "You spent %s."
msgstr ""
-#: src/net/ea/playerhandler.cpp:501
+#: src/net/ea/playerhandler.cpp:506
msgid "Cannot raise skill!"
msgstr ""
-#: src/net/ea/playerhandler.cpp:618
+#: src/net/ea/playerhandler.cpp:624
msgid "Equip arrows first."
msgstr ""
@@ -4988,7 +5017,7 @@ msgstr ""
msgid "Trade completed."
msgstr ""
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:258
msgid "Strength"
msgstr ""
@@ -4997,7 +5026,7 @@ msgstr ""
msgid "Strength %+.1f"
msgstr ""
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:259
msgid "Agility"
msgstr ""
@@ -5006,7 +5035,7 @@ msgstr ""
msgid "Agility %+.1f"
msgstr ""
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:262
msgid "Dexterity"
msgstr ""
@@ -5015,7 +5044,7 @@ msgstr ""
msgid "Dexterity %+.1f"
msgstr ""
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:260
msgid "Vitality"
msgstr ""
@@ -5024,7 +5053,7 @@ msgstr ""
msgid "Vitality %+.1f"
msgstr ""
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:261
msgid "Intelligence"
msgstr ""
@@ -5294,111 +5323,115 @@ msgstr ""
msgid "Unable to sell unsellable item."
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:109
+#: src/net/tmwa/generalhandler.cpp:108
#, c-format
msgid "Strength %+d"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:110
+#: src/net/tmwa/generalhandler.cpp:109
#, c-format
msgid "Agility %+d"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:111
+#: src/net/tmwa/generalhandler.cpp:110
#, c-format
msgid "Vitality %+d"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:112
+#: src/net/tmwa/generalhandler.cpp:111
#, c-format
msgid "Intelligence %+d"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:113
+#: src/net/tmwa/generalhandler.cpp:112
#, c-format
msgid "Dexterity %+d"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:114
+#: src/net/tmwa/generalhandler.cpp:113
#, c-format
msgid "Luck %+d"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:140
+#: src/net/tmwa/generalhandler.cpp:139
msgid "Authentication failed."
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:143
+#: src/net/tmwa/generalhandler.cpp:142
msgid "No servers available."
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:147
+#: src/net/tmwa/generalhandler.cpp:146
msgid "Someone else is trying to use this account."
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:150
+#: src/net/tmwa/generalhandler.cpp:149
msgid "This account is already logged in."
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:153
+#: src/net/tmwa/generalhandler.cpp:152
msgid "Speed hack detected."
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:156
+#: src/net/tmwa/generalhandler.cpp:155
msgid "Duplicated login."
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:159
+#: src/net/tmwa/generalhandler.cpp:158
msgid "Unknown connection error."
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:232
+#: src/net/tmwa/generalhandler.cpp:231
msgid "Got disconnected from server!"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:264
+#: src/net/tmwa/generalhandler.cpp:263
msgid "Luck"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:267
+#: src/net/tmwa/generalhandler.cpp:266
msgid "Defense"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:268
+#: src/net/tmwa/generalhandler.cpp:267
msgid "M.Attack"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:269
+#: src/net/tmwa/generalhandler.cpp:268
msgid "M.Defense"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:271
+#: src/net/tmwa/generalhandler.cpp:270
#, no-c-format
msgid "% Accuracy"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:273
+#: src/net/tmwa/generalhandler.cpp:272
#, no-c-format
msgid "% Evade"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:275
+#: src/net/tmwa/generalhandler.cpp:274
#, no-c-format
msgid "% Critical"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:276
+#: src/net/tmwa/generalhandler.cpp:275
msgid "Attack Delay"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:278
+#: src/net/tmwa/generalhandler.cpp:277
msgid "Walk Delay"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:280
+#: src/net/tmwa/generalhandler.cpp:279
msgid "Attack Range"
msgstr ""
+#: src/net/tmwa/generalhandler.cpp:281
+msgid "Damage per sec."
+msgstr ""
+
#: src/net/tmwa/network.cpp:152
msgid "Empty address given to Network::connect()!"
msgstr ""
@@ -5432,31 +5465,31 @@ msgstr ""
msgid "Floating bubble"
msgstr ""
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:248
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:246
#: src/resources/monsterdb.cpp:84
msgid "unnamed"
msgstr ""
-#: src/resources/itemdb.cpp:65
+#: src/resources/itemdb.cpp:63
#, c-format
msgid "Attack %+d"
msgstr "Serangan %+d"
-#: src/resources/itemdb.cpp:66
+#: src/resources/itemdb.cpp:64
#, c-format
msgid "Defense %+d"
msgstr "Pertahanan %+d"
-#: src/resources/itemdb.cpp:67
+#: src/resources/itemdb.cpp:65
#, c-format
msgid "HP %+d"
msgstr "HP %+d"
-#: src/resources/itemdb.cpp:68
+#: src/resources/itemdb.cpp:66
#, c-format
msgid "MP %+d"
msgstr "MP %+d"
-#: src/resources/itemdb.cpp:171
+#: src/resources/itemdb.cpp:169
msgid "Unknown item"
msgstr ""
diff --git a/po/it.po b/po/it.po
index 69167b2ec..5d837f2c4 100644
--- a/po/it.po
+++ b/po/it.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-10 01:11+0300\n"
-"PO-Revision-Date: 2011-08-09 22:16+0000\n"
+"POT-Creation-Date: 2011-09-02 18:27+0300\n"
+"PO-Revision-Date: 2011-09-02 15:29+0000\n"
"Last-Translator: akaras <akaras@inbox.ru>\n"
"Language-Team: Italian (http://www.transifex.net/projects/p/manaplus/team/it/)\n"
"MIME-Version: 1.0\n"
@@ -23,119 +23,119 @@ msgstr ""
msgid "Visible on map"
msgstr ""
-#: src/being.cpp:542
+#: src/being.cpp:549
msgid "dodge"
msgstr "Schivato"
-#: src/being.cpp:542
+#: src/being.cpp:549
msgid "miss"
msgstr "Mancato"
#. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1514
+#: src/being.cpp:1529
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1519
+#: src/being.cpp:1534
msgid "I"
msgstr ""
-#: src/client.cpp:825 src/gui/setup.cpp:53 src/gui/windowmenu.cpp:100
+#: src/client.cpp:831 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
msgid "Setup"
msgstr "Impostazioni"
-#: src/client.cpp:908
+#: src/client.cpp:914
msgid "Connecting to server"
msgstr "Connessione al server"
-#: src/client.cpp:939
+#: src/client.cpp:945
msgid "Logging in"
msgstr "Accesso"
-#: src/client.cpp:972
+#: src/client.cpp:978
msgid "Entering game world"
msgstr "Accesso al gioco"
-#: src/client.cpp:1072
+#: src/client.cpp:1078
msgid "Requesting characters"
msgstr "Ricerca personaggi"
-#: src/client.cpp:1103
+#: src/client.cpp:1109
msgid "Connecting to the game server"
msgstr "Connessione al server del gioco"
-#: src/client.cpp:1113
+#: src/client.cpp:1119
msgid "Changing game servers"
msgstr "Cambiamento server del gioco"
-#: src/client.cpp:1150 src/client.cpp:1157 src/client.cpp:1294
+#: src/client.cpp:1156 src/client.cpp:1163 src/client.cpp:1298
#: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
-#: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:392
+#: src/gui/charcreatedialog.cpp:221 src/gui/charselectdialog.cpp:253
+#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
#: src/net/manaserv/charhandler.cpp:227
msgid "Error"
msgstr "Errore"
-#: src/client.cpp:1166
+#: src/client.cpp:1172
msgid "Requesting registration details"
msgstr "Richiesta dettagli di registrazione"
-#: src/client.cpp:1193
+#: src/client.cpp:1199
msgid "Password Change"
msgstr "Cambiamento password"
-#: src/client.cpp:1194
+#: src/client.cpp:1200
msgid "Password changed successfully!"
msgstr "Password modificata con successo!"
-#: src/client.cpp:1213
+#: src/client.cpp:1219
msgid "Email Change"
msgstr "Cambio Email"
-#: src/client.cpp:1214
+#: src/client.cpp:1220
msgid "Email changed successfully!"
msgstr "Email cambiata con successo!"
-#: src/client.cpp:1234
+#: src/client.cpp:1240
msgid "Unregister Successful"
msgstr "Annullamento registrazione effettuato con successo"
-#: src/client.cpp:1235
+#: src/client.cpp:1241
msgid "Farewell, come back any time..."
msgstr "Addio, torna quando vuoi..."
-#: src/client.cpp:1424 src/client.cpp:1454 src/client.cpp:1498
-#: src/client.cpp:1919
+#: src/client.cpp:1428 src/client.cpp:1458 src/client.cpp:1502
+#: src/client.cpp:1927 src/client.cpp:1934
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%s non esiste e non può essere creato! Uscita in corso."
-#: src/client.cpp:1629
+#: src/client.cpp:1633
#, c-format
msgid "Invalid update host: %s"
msgstr "Invalido aggiornamento host: %s"
-#: src/client.cpp:1663 src/client.cpp:1669
+#: src/client.cpp:1667 src/client.cpp:1673
msgid "Error creating updates directory!"
msgstr "Errore durante la creazione della directory degli aggiornamenti"
-#: src/client.cpp:1690
+#: src/client.cpp:1694
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "Errore: %s non esiste e non può essere creato! Ucita in corso."
-#: src/commandhandler.cpp:301
+#: src/commandhandler.cpp:303
msgid "Unknown command."
msgstr "Comando sconosciuto."
-#: src/commandhandler.cpp:401
+#: src/commandhandler.cpp:403
msgid "Cannot send empty whispers!"
msgstr "Impossibile inviare un sussurro vuoto!"
-#: src/commandhandler.cpp:409
+#: src/commandhandler.cpp:417
#, c-format
msgid ""
"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is"
@@ -144,152 +144,152 @@ msgstr ""
"Impossibile creare una scheda per sussurrare a \"%s\"! Esiste già, oppure "
"sei tu."
-#: src/commandhandler.cpp:429
+#: src/commandhandler.cpp:437
#, c-format
msgid "Requesting to join channel %s."
msgstr "Richiesta per accedere al canale %s."
-#: src/commandhandler.cpp:445 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:453 src/net/ea/gui/partytab.cpp:125
msgid "Party name is missing."
msgstr "Manca il nome del party."
-#: src/commandhandler.cpp:456
+#: src/commandhandler.cpp:464
msgid "Guild name is missing."
msgstr "Manca il nome della gilda."
-#: src/commandhandler.cpp:469 src/commandhandler.cpp:576
-#: src/commandhandler.cpp:617 src/commandhandler.cpp:647
+#: src/commandhandler.cpp:477 src/commandhandler.cpp:589
+#: src/commandhandler.cpp:630 src/commandhandler.cpp:660
msgid "Please specify a name."
msgstr "Prego specificare un nome."
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:523
msgid "Return toggles chat."
msgstr "Invio attiva/disattiva la conversazione."
-#: src/commandhandler.cpp:510
+#: src/commandhandler.cpp:523
msgid "Message closes chat."
msgstr "I messaggi chiudono la conversazione."
-#: src/commandhandler.cpp:521
+#: src/commandhandler.cpp:534
msgid "Return now toggles chat."
msgstr "\"Invio\" adesso attiva/disattiva la conversazione."
-#: src/commandhandler.cpp:527
+#: src/commandhandler.cpp:540
msgid "Message now closes chat."
msgstr "I messaggi adesso chiudono la conversazione."
-#: src/commandhandler.cpp:555
+#: src/commandhandler.cpp:568
msgid "friend"
msgstr "Amico"
-#: src/commandhandler.cpp:560
+#: src/commandhandler.cpp:573
msgid "disregarded"
msgstr "Disprezzato"
-#: src/commandhandler.cpp:565
+#: src/commandhandler.cpp:578
msgid "neutral"
msgstr "Neutro"
-#: src/commandhandler.cpp:584
+#: src/commandhandler.cpp:597
#, c-format
msgid "Player already %s!"
msgstr "Giocatore già %s!"
-#: src/commandhandler.cpp:598
+#: src/commandhandler.cpp:611
#, c-format
msgid "Player successfully %s!"
msgstr "Giocatore %s con successo!"
-#: src/commandhandler.cpp:606
+#: src/commandhandler.cpp:619
#, c-format
msgid "Player could not be %s!"
msgstr "Player non può essere %s!"
-#: src/commandhandler.cpp:628
+#: src/commandhandler.cpp:641
msgid "Player wasn't ignored!"
msgstr "Il giocatore non era ignorato!"
-#: src/commandhandler.cpp:635
+#: src/commandhandler.cpp:648
msgid "Player no longer ignored!"
msgstr "Giocatore non più ignorato!"
-#: src/commandhandler.cpp:637
+#: src/commandhandler.cpp:650
msgid "Player could not be unignored!"
msgstr "Impossibile annullare l'ignoro!"
-#: src/commandhandler.cpp:654
+#: src/commandhandler.cpp:667
msgid "Player already erased!"
msgstr "Il giocatore è già cancellato!"
-#: src/commandhandler.cpp:665
+#: src/commandhandler.cpp:678
msgid "Player successfully erased!"
msgstr "Giocatore cancellato dal tuo schermo con successo!"
-#: src/commandhandler.cpp:667
+#: src/commandhandler.cpp:680
msgid "Player could not be erased!"
msgstr "Il giocatore non può essere cancellato!"
-#: src/commandhandler.cpp:960 src/commandhandler.cpp:1006
+#: src/commandhandler.cpp:980 src/commandhandler.cpp:1026
#, c-format
msgid "Client uptime: %s"
msgstr ""
-#: src/commandhandler.cpp:970
+#: src/commandhandler.cpp:990
#, c-format
msgid "%d week"
msgid_plural "%d weeks"
msgstr[0] ""
msgstr[1] ""
-#: src/commandhandler.cpp:979
+#: src/commandhandler.cpp:999
#, c-format
msgid "%d day"
msgid_plural "%d days"
msgstr[0] ""
msgstr[1] ""
-#: src/commandhandler.cpp:987
+#: src/commandhandler.cpp:1007
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] ""
msgstr[1] ""
-#: src/commandhandler.cpp:995
+#: src/commandhandler.cpp:1015
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] ""
msgstr[1] ""
-#: src/commandhandler.cpp:1003
+#: src/commandhandler.cpp:1023
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
msgstr[0] ""
msgstr[1] ""
-#: src/commandhandler.cpp:1082
+#: src/commandhandler.cpp:1102
msgid "font cache size"
msgstr ""
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1114
msgid "Cache size:"
msgstr ""
-#: src/commandhandler.cpp:1098
+#: src/commandhandler.cpp:1118
msgid "Created:"
msgstr ""
-#: src/commandhandler.cpp:1100
+#: src/commandhandler.cpp:1120
msgid "Deleted:"
msgstr ""
-#: src/commandhandler.cpp:1147 src/commandhandler.cpp:1154
+#: src/commandhandler.cpp:1167 src/commandhandler.cpp:1174
msgid "Resource images:"
msgstr ""
-#: src/commandhandler.cpp:1149 src/commandhandler.cpp:1156
+#: src/commandhandler.cpp:1169 src/commandhandler.cpp:1176
msgid "Resource orphaned images:"
msgstr ""
@@ -300,63 +300,63 @@ msgstr ""
"Le opzioni per /%s sono \"yes\" (sì), \"no\", \"true\" (vero), \"false\" "
"(falso), \"1\", \"0\"."
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:410
+#: src/game.cpp:252 src/gui/widgets/chattab.cpp:409
msgid "General"
msgstr "Generale"
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:412
+#: src/game.cpp:256 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:411
msgid "Debug"
msgstr "Debug"
-#: src/game.cpp:475
+#: src/game.cpp:511
msgid "Screenshot saved as "
msgstr "Screenshot salvato come"
-#: src/game.cpp:483
+#: src/game.cpp:519
msgid "Saving screenshot failed!"
msgstr "Salvataggio della schermata fallito!"
-#: src/game.cpp:523
+#: src/game.cpp:559
msgid "The connection to the server was lost."
msgstr "La connessione al server è stata persa."
-#: src/game.cpp:537
+#: src/game.cpp:571
msgid "Network Error"
msgstr "Errore di rete"
-#: src/game.cpp:1184
+#: src/game.cpp:1236
msgid "Ignoring incoming trade requests"
msgstr "Le richieste di scambio in arrivo saranno ignorate"
-#: src/game.cpp:1191
+#: src/game.cpp:1243
msgid "Accepting incoming trade requests"
msgstr "Le richieste di scambio in arrivo saranno accettate"
-#: src/game.cpp:1576
+#: src/game.cpp:1629
msgid "Could Not Load Map"
msgstr "Impossibile caricare la mappa."
-#: src/game.cpp:1577
+#: src/game.cpp:1630
#, c-format
msgid "Error while loading %s"
msgstr "Errore durante il caricamento di %s"
-#: src/gui/beingpopup.cpp:118
+#: src/gui/beingpopup.cpp:124
#, c-format
msgid "Party: %s"
msgstr "Party: %s"
-#: src/gui/beingpopup.cpp:132
+#: src/gui/beingpopup.cpp:138
#, c-format
msgid "Guild: %s"
msgstr "Gilda: %s"
-#: src/gui/beingpopup.cpp:145
+#: src/gui/beingpopup.cpp:151
#, c-format
msgid "Pvp rank: %d"
msgstr "Rango PvP: %d"
-#: src/gui/beingpopup.cpp:156
+#: src/gui/beingpopup.cpp:162
#, c-format
msgid "Comment: %s"
msgstr ""
@@ -365,103 +365,103 @@ msgstr ""
msgid "Bot Checker"
msgstr "Bot Checker"
-#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
+#: src/gui/botcheckerwindow.cpp:295 src/gui/setup_relations.cpp:64
msgid "Name"
msgstr "Nome"
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:130
-#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:604
-#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
+#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:133
+#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:646
+#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:265
msgid "Attack"
msgstr "Attacco"
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:275
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:297
#: src/keyboardconfig.cpp:62
msgid "Talk"
msgstr "Parla"
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:241
-#: src/gui/popupmenu.cpp:280 src/gui/popupmenu.cpp:661
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:263
+#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:703
msgid "Move"
msgstr "Movimento"
-#: src/gui/botcheckerwindow.cpp:300
+#: src/gui/botcheckerwindow.cpp:299
msgid "Result"
msgstr "Risultato"
-#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123
+#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:124
msgid "Reset"
msgstr "Reimposta"
-#: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:256
-#: src/gui/popupmenu.cpp:277 src/gui/popupmenu.cpp:675
+#: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:98
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:278
+#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:717
msgid "Buy"
msgstr "Compra"
-#: src/gui/buydialog.cpp:88 src/gui/buydialog.cpp:302
-#: src/gui/selldialog.cpp:87 src/gui/selldialog.cpp:324
+#: src/gui/buydialog.cpp:89 src/gui/buydialog.cpp:303
+#: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
#, c-format
msgid "Price: %s / Total: %s"
msgstr "Prezzo: %s / Totale: %s"
#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
#. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:93 src/gui/itemamountwindow.cpp:207
-#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:113
-#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:940
+#: src/gui/buydialog.cpp:94 src/gui/itemamountwindow.cpp:207
+#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:973
msgid "+"
msgstr "+"
#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
#. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:96 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:952
+#: src/gui/buydialog.cpp:97 src/gui/itemamountwindow.cpp:206
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:985
msgid "-"
msgstr "-"
-#: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
-#: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
-#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:285
+#: src/gui/buydialog.cpp:99 src/gui/quitdialog.cpp:47
+#: src/gui/quitdialog.cpp:49 src/gui/quitdialog.cpp:50
+#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:294
#: src/keyboardconfig.cpp:290
msgid "Quit"
msgstr "Esci"
-#: src/gui/buydialog.cpp:99 src/gui/selldialog.cpp:94
-#: src/gui/statuswindow.cpp:490 src/gui/statuswindow.cpp:539
-#: src/gui/statuswindow.cpp:939 src/gui/statuswindow.cpp:970
+#: src/gui/buydialog.cpp:100 src/gui/selldialog.cpp:95
+#: src/gui/statuswindow.cpp:504 src/gui/statuswindow.cpp:553
+#: src/gui/statuswindow.cpp:972 src/gui/statuswindow.cpp:1003
msgid "Max"
msgstr "Massimo"
#: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:134
+#: src/gui/inventorywindow.cpp:147 src/gui/setup_other.cpp:133
msgid "Shop"
msgstr "Negozio"
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:258
-#: src/gui/popupmenu.cpp:278 src/gui/popupmenu.cpp:677
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:280
+#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:719
#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
-#: src/gui/selldialog.cpp:92
+#: src/gui/selldialog.cpp:93
msgid "Sell"
msgstr "Vendi"
#: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
-#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
+#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:96
#: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:330
-#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:480 src/gui/popupmenu.cpp:499
-#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:532
-#: src/gui/popupmenu.cpp:736 src/gui/popupmenu.cpp:760
-#: src/gui/popupmenu.cpp:1647 src/gui/popupmenu.cpp:1675
-#: src/gui/popupmenu.cpp:1731 src/gui/popupmenu.cpp:1774
-#: src/gui/popupmenu.cpp:1809 src/gui/popupmenu.cpp:1849
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1935
-#: src/gui/quitdialog.cpp:60 src/gui/register.cpp:82 src/gui/setup.cpp:70
-#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:354
+#: src/gui/popupmenu.cpp:375 src/gui/popupmenu.cpp:489
+#: src/gui/popupmenu.cpp:516 src/gui/popupmenu.cpp:540
+#: src/gui/popupmenu.cpp:554 src/gui/popupmenu.cpp:573
+#: src/gui/popupmenu.cpp:790 src/gui/popupmenu.cpp:814
+#: src/gui/popupmenu.cpp:1734 src/gui/popupmenu.cpp:1762
+#: src/gui/popupmenu.cpp:1818 src/gui/popupmenu.cpp:1861
+#: src/gui/popupmenu.cpp:1896 src/gui/popupmenu.cpp:1936
+#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2023
+#: src/gui/quitdialog.cpp:54 src/gui/register.cpp:82 src/gui/setup.cpp:72
+#: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:238
#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updatewindow.cpp:157
+#: src/gui/updaterwindow.cpp:161
msgid "Cancel"
msgstr "Annulla"
@@ -493,7 +493,7 @@ msgid "The email address entries mismatch."
msgstr ""
#: src/gui/changepassworddialog.cpp:50 src/gui/changepassworddialog.cpp:59
-#: src/gui/charselectdialog.cpp:140
+#: src/gui/charselectdialog.cpp:139
msgid "Change Password"
msgstr "Cambia la Password"
@@ -528,121 +528,121 @@ msgstr ""
msgid "Create Character"
msgstr "Crea Personaggio"
-#: src/gui/charcreatedialog.cpp:73 src/gui/logindialog.cpp:94
+#: src/gui/charcreatedialog.cpp:76 src/gui/logindialog.cpp:94
#: src/gui/register.cpp:75
msgid "Name:"
msgstr "Nome:"
#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
#. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:76 src/gui/charcreatedialog.cpp:81
-#: src/gui/charcreatedialog.cpp:87 src/gui/outfitwindow.cpp:81
+#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:84
+#: src/gui/charcreatedialog.cpp:90 src/gui/outfitwindow.cpp:85
msgid ">"
msgstr ">"
#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
#. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:82
-#: src/gui/charcreatedialog.cpp:88 src/gui/outfitwindow.cpp:80
+#: src/gui/charcreatedialog.cpp:82 src/gui/charcreatedialog.cpp:85
+#: src/gui/charcreatedialog.cpp:91 src/gui/outfitwindow.cpp:84
msgid "<"
msgstr "<"
-#: src/gui/charcreatedialog.cpp:80
+#: src/gui/charcreatedialog.cpp:83
msgid "Hair color:"
msgstr "Colore dei capelli:"
-#: src/gui/charcreatedialog.cpp:83
+#: src/gui/charcreatedialog.cpp:86
msgid "Hair style:"
msgstr "Taglio di capelli:"
-#: src/gui/charcreatedialog.cpp:89
+#: src/gui/charcreatedialog.cpp:92
msgid "Race:"
msgstr ""
-#: src/gui/charcreatedialog.cpp:92 src/gui/charselectdialog.cpp:479
-#: src/gui/socialwindow.cpp:1033
+#: src/gui/charcreatedialog.cpp:95 src/gui/charselectdialog.cpp:478
+#: src/gui/socialwindow.cpp:1139
msgid "Create"
msgstr "Crea"
-#: src/gui/charcreatedialog.cpp:94 src/gui/register.cpp:98
+#: src/gui/charcreatedialog.cpp:97 src/gui/register.cpp:98
msgid "Male"
msgstr "Maschio"
-#: src/gui/charcreatedialog.cpp:95 src/gui/register.cpp:99
+#: src/gui/charcreatedialog.cpp:98 src/gui/register.cpp:99
msgid "Female"
msgstr "Femmina"
-#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:300
+#: src/gui/charcreatedialog.cpp:116 src/gui/charcreatedialog.cpp:303
#, c-format
msgid "Please distribute %d points"
msgstr "Distribuire %d punti"
-#: src/gui/charcreatedialog.cpp:219
+#: src/gui/charcreatedialog.cpp:222
msgid "Your name needs to be at least 4 characters."
msgstr "Il tuo nome deve contenere almeno 4 caratteri."
-#: src/gui/charcreatedialog.cpp:291
+#: src/gui/charcreatedialog.cpp:294
msgid "Character stats OK"
msgstr "Statistiche personaggio OK"
-#: src/gui/charcreatedialog.cpp:305
+#: src/gui/charcreatedialog.cpp:308
#, c-format
msgid "Please remove %d points"
msgstr "Rimuovere %d punti"
-#: src/gui/charselectdialog.cpp:77
+#: src/gui/charselectdialog.cpp:76
msgid "Confirm Character Delete"
msgstr "Conferma la cancellazione del personaggio"
-#: src/gui/charselectdialog.cpp:78
+#: src/gui/charselectdialog.cpp:77
msgid "Are you sure you want to delete this character?"
msgstr "Sei sicuro di voler cancellare questo personaggio?"
-#: src/gui/charselectdialog.cpp:126
+#: src/gui/charselectdialog.cpp:125
msgid "Account and Character Management"
msgstr "Gestione dell'account e del personaggio"
-#: src/gui/charselectdialog.cpp:139
+#: src/gui/charselectdialog.cpp:138
msgid "Switch Login"
msgstr "Cambia login"
-#: src/gui/charselectdialog.cpp:153 src/gui/unregisterdialog.cpp:50
+#: src/gui/charselectdialog.cpp:152 src/gui/unregisterdialog.cpp:50
#: src/gui/unregisterdialog.cpp:58
msgid "Unregister"
msgstr "Cancella registrazione"
-#: src/gui/charselectdialog.cpp:162
+#: src/gui/charselectdialog.cpp:161
msgid "Change Email"
msgstr "Cambia email"
-#: src/gui/charselectdialog.cpp:254
+#: src/gui/charselectdialog.cpp:253
msgid "Incorrect password"
msgstr ""
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:286
msgid "Enter password for deleting character"
msgstr ""
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:286
msgid "Enter password:"
msgstr ""
-#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:289
-#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
-#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
+#: src/gui/charselectdialog.cpp:408 src/gui/serverdialog.cpp:298
+#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:122
+#: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:241
msgid "Delete"
msgstr "Elimina"
-#: src/gui/charselectdialog.cpp:467
+#: src/gui/charselectdialog.cpp:466
msgid "Choose"
msgstr "Scegli"
-#: src/gui/charselectdialog.cpp:470
+#: src/gui/charselectdialog.cpp:469
#, c-format
msgid "Level %d"
msgstr "Livello %d"
-#: src/gui/charselectdialog.cpp:481 src/gui/charselectdialog.cpp:482
+#: src/gui/charselectdialog.cpp:480 src/gui/charselectdialog.cpp:481
msgid "(empty)"
msgstr "(vuoto)"
@@ -704,7 +704,7 @@ msgstr "Arcobaleno 3"
#: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
#: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
-#: src/gui/setup_theme.cpp:72 src/gui/setup_theme.cpp:126
+#: src/gui/setup_theme.cpp:73 src/gui/setup_theme.cpp:127
#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
msgid "???"
@@ -714,12 +714,12 @@ msgstr "???"
msgid "Chat"
msgstr "Chat"
-#: src/gui/chatwindow.cpp:605
+#: src/gui/chatwindow.cpp:609
#, c-format
msgid "Present: %s; %d players are present."
msgstr "Presente: %s; %d giocatori sono presenti."
-#: src/gui/chatwindow.cpp:988
+#: src/gui/chatwindow.cpp:996
#, c-format
msgid "Whispering to %s: %s"
msgstr "Sussurra a %s: %s"
@@ -732,145 +732,145 @@ msgstr "Sì"
msgid "No"
msgstr "No"
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:146
-#: src/gui/popupmenu.cpp:155 src/gui/popupmenu.cpp:377
-#: src/gui/popupmenu.cpp:383 src/gui/popupmenu.cpp:619
-#: src/gui/popupmenu.cpp:627
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:149
+#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:402
+#: src/gui/popupmenu.cpp:408 src/gui/popupmenu.cpp:661
+#: src/gui/popupmenu.cpp:669
msgid "Ignore"
msgstr "Ignora"
-#: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
-#: src/gui/setup_other.cpp:65
+#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:97
+#: src/gui/setup_other.cpp:64
msgid "Map"
msgstr "Mappa"
-#: src/gui/debugwindow.cpp:71
+#: src/gui/debugwindow.cpp:73
msgid "Target"
msgstr ""
-#: src/gui/debugwindow.cpp:72
+#: src/gui/debugwindow.cpp:74
msgid "Net"
msgstr ""
-#: src/gui/debugwindow.cpp:145 src/gui/debugwindow.cpp:220
-#: src/gui/debugwindow.cpp:249
+#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
+#: src/gui/debugwindow.cpp:251
msgid "Music:"
msgstr "Musica:"
-#: src/gui/debugwindow.cpp:146 src/gui/debugwindow.cpp:224
-#: src/gui/debugwindow.cpp:251
+#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:226
+#: src/gui/debugwindow.cpp:253
msgid "Map:"
msgstr "Mappa:"
-#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
-#: src/gui/debugwindow.cpp:250
+#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:224
+#: src/gui/debugwindow.cpp:252
msgid "Minimap:"
msgstr "Mini mappa:"
-#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:218
-#: src/gui/debugwindow.cpp:247
+#: src/gui/debugwindow.cpp:150 src/gui/debugwindow.cpp:220
+#: src/gui/debugwindow.cpp:249
msgid "Cursor:"
msgstr "Cursore:"
-#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:201
-#: src/gui/debugwindow.cpp:206
+#: src/gui/debugwindow.cpp:151 src/gui/debugwindow.cpp:203
+#: src/gui/debugwindow.cpp:208
msgid "Player Position:"
msgstr "Posizione giocatore:"
-#: src/gui/debugwindow.cpp:152
+#: src/gui/debugwindow.cpp:154
msgid "Particle count:"
msgstr ""
-#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:235
-#: src/gui/debugwindow.cpp:254
+#: src/gui/debugwindow.cpp:156 src/gui/debugwindow.cpp:237
+#: src/gui/debugwindow.cpp:256
msgid "Map actors count:"
msgstr ""
-#: src/gui/debugwindow.cpp:162 src/gui/debugwindow.cpp:173
+#: src/gui/debugwindow.cpp:164 src/gui/debugwindow.cpp:175
#, c-format
msgid "%d FPS (Software)"
msgstr "%d FPS (Software)"
-#: src/gui/debugwindow.cpp:166
+#: src/gui/debugwindow.cpp:168
#, c-format
msgid "%d FPS (fast OpenGL)"
msgstr "%d FPS (OpenGL veloce)"
-#: src/gui/debugwindow.cpp:169
+#: src/gui/debugwindow.cpp:171
#, c-format
msgid "%d FPS (old OpenGL)"
msgstr "%d FPS (OpenGL vecchio)"
-#: src/gui/debugwindow.cpp:176
+#: src/gui/debugwindow.cpp:178
#, c-format
msgid "%d FPS"
msgstr "%d FPS"
-#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:240
+#: src/gui/debugwindow.cpp:190 src/gui/debugwindow.cpp:242
msgid "Textures count:"
msgstr ""
-#: src/gui/debugwindow.cpp:231
+#: src/gui/debugwindow.cpp:233
#, c-format
msgid "Particle count: %d"
msgstr ""
-#: src/gui/debugwindow.cpp:268 src/gui/debugwindow.cpp:299
-#: src/gui/debugwindow.cpp:343
+#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:301
+#: src/gui/debugwindow.cpp:345
msgid "Target:"
msgstr "Target:"
-#: src/gui/debugwindow.cpp:269 src/gui/debugwindow.cpp:304
-#: src/gui/debugwindow.cpp:344
+#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:306
+#: src/gui/debugwindow.cpp:346
msgid "Target Id:"
msgstr "Target ID:"
-#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:308
-#: src/gui/debugwindow.cpp:313 src/gui/debugwindow.cpp:345
+#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:310
+#: src/gui/debugwindow.cpp:315 src/gui/debugwindow.cpp:347
msgid "Target Level:"
msgstr "Livello Target"
-#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:316
-#: src/gui/debugwindow.cpp:346
+#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:318
+#: src/gui/debugwindow.cpp:348
msgid "Target Party:"
msgstr "Party del Target:"
-#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:319
-#: src/gui/debugwindow.cpp:347
+#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:321
+#: src/gui/debugwindow.cpp:349
msgid "Target Guild:"
msgstr "Gilda del Target"
-#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:333
-#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:348
+#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:335
+#: src/gui/debugwindow.cpp:340 src/gui/debugwindow.cpp:350
msgid "Attack delay:"
msgstr ""
-#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:323
-#: src/gui/debugwindow.cpp:349
+#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:325
+#: src/gui/debugwindow.cpp:351
msgid "Minimal hit:"
msgstr ""
-#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:325
-#: src/gui/debugwindow.cpp:350
+#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:327
+#: src/gui/debugwindow.cpp:352
msgid "Maximum hit:"
msgstr ""
-#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:327
-#: src/gui/debugwindow.cpp:351
+#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:329
+#: src/gui/debugwindow.cpp:353
msgid "Critical hit:"
msgstr ""
-#: src/gui/debugwindow.cpp:385 src/gui/debugwindow.cpp:390
+#: src/gui/debugwindow.cpp:387 src/gui/debugwindow.cpp:392
#, c-format
msgid "Ping: %s ms"
msgstr ""
-#: src/gui/debugwindow.cpp:393
+#: src/gui/debugwindow.cpp:395
#, c-format
msgid "In: %d bytes/s"
msgstr "In: %d bytes/s"
-#: src/gui/debugwindow.cpp:395
+#: src/gui/debugwindow.cpp:397
#, c-format
msgid "Out: %d bytes/s"
msgstr "Out: %d bytes/s"
@@ -879,37 +879,37 @@ msgstr "Out: %d bytes/s"
msgid "Did You Know?"
msgstr ""
-#: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
-#: src/gui/inventorywindow.cpp:175 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:547 src/gui/shopwindow.cpp:111
+#: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
+#: src/gui/inventorywindow.cpp:176 src/gui/npcdialog.cpp:53
+#: src/gui/popupmenu.cpp:588 src/gui/shopwindow.cpp:113
msgid "Close"
msgstr "Chiudi"
-#: src/gui/didyouknowwindow.cpp:62
+#: src/gui/didyouknowwindow.cpp:64
msgid "< Previous"
msgstr ""
-#: src/gui/didyouknowwindow.cpp:63
+#: src/gui/didyouknowwindow.cpp:65
msgid "Next >"
msgstr ""
-#: src/gui/didyouknowwindow.cpp:64
+#: src/gui/didyouknowwindow.cpp:66
msgid "Auto open this window"
msgstr ""
#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:59 src/gui/textdialog.cpp:50
+#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:53 src/gui/textdialog.cpp:50
msgid "OK"
msgstr "OK"
-#: src/gui/equipmentwindow.cpp:78 src/gui/windowmenu.cpp:74
+#: src/gui/equipmentwindow.cpp:61 src/gui/windowmenu.cpp:74
msgid "Equipment"
msgstr "Equipaggiamento"
-#: src/gui/equipmentwindow.cpp:103 src/gui/inventorywindow.cpp:130
-#: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
-#: src/gui/popupmenu.cpp:1606 src/gui/popupmenu.cpp:1701
-#: src/gui/popupmenu.cpp:1746
+#: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:131
+#: src/gui/inventorywindow.cpp:512 src/gui/inventorywindow.cpp:521
+#: src/gui/popupmenu.cpp:1693 src/gui/popupmenu.cpp:1788
+#: src/gui/popupmenu.cpp:1833
msgid "Unequip"
msgstr "Togli"
@@ -918,79 +918,79 @@ msgid "Help"
msgstr "Aiuto"
#: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76
-#: src/inventory.cpp:246
+#: src/inventory.cpp:249
msgid "Inventory"
msgstr "Inventario"
-#: src/gui/inventorywindow.cpp:104
+#: src/gui/inventorywindow.cpp:105
msgid "Slots:"
msgstr "Slot:"
-#: src/gui/inventorywindow.cpp:115
+#: src/gui/inventorywindow.cpp:116
msgid "Filter:"
msgstr "Filtro:"
-#: src/gui/inventorywindow.cpp:116
+#: src/gui/inventorywindow.cpp:117
msgid "Sort:"
msgstr "Ordina per:"
-#: src/gui/inventorywindow.cpp:122
+#: src/gui/inventorywindow.cpp:123
msgid "na"
msgstr "na"
-#: src/gui/inventorywindow.cpp:123
+#: src/gui/inventorywindow.cpp:124
msgid "az"
msgstr "az"
-#: src/gui/inventorywindow.cpp:124
+#: src/gui/inventorywindow.cpp:125
msgid "id"
msgstr "id"
-#: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:513
-#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1608
-#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1748
+#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
+#: src/gui/inventorywindow.cpp:523 src/gui/popupmenu.cpp:1695
+#: src/gui/popupmenu.cpp:1790 src/gui/popupmenu.cpp:1835
msgid "Equip"
msgstr "Equipaggia"
-#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
-#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1611
-#: src/gui/popupmenu.cpp:1670 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1751
+#: src/gui/inventorywindow.cpp:130 src/gui/inventorywindow.cpp:515
+#: src/gui/inventorywindow.cpp:519 src/gui/popupmenu.cpp:1698
+#: src/gui/popupmenu.cpp:1757 src/gui/popupmenu.cpp:1794
+#: src/gui/popupmenu.cpp:1838
msgid "Use"
msgstr "Usa"
-#: src/gui/inventorywindow.cpp:143 src/gui/inventorywindow.cpp:619
-#: src/gui/popupmenu.cpp:1615 src/gui/popupmenu.cpp:1712
-#: src/gui/popupmenu.cpp:1755
+#: src/gui/inventorywindow.cpp:144 src/gui/inventorywindow.cpp:620
+#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1799
+#: src/gui/popupmenu.cpp:1842
msgid "Drop..."
msgstr "Lascia..."
-#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1624
-#: src/gui/popupmenu.cpp:1721 src/gui/popupmenu.cpp:1764
+#: src/gui/inventorywindow.cpp:145 src/gui/popupmenu.cpp:1711
+#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1851
msgid "Split"
msgstr "Dividi"
-#: src/gui/inventorywindow.cpp:145 src/gui/outfitwindow.cpp:59
-#: src/gui/popupmenu.cpp:508
+#: src/gui/inventorywindow.cpp:146 src/gui/outfitwindow.cpp:60
+#: src/gui/popupmenu.cpp:549
msgid "Outfits"
msgstr "Attrezzatura"
-#: src/gui/inventorywindow.cpp:148
+#: src/gui/inventorywindow.cpp:149
msgid "Weight:"
msgstr "Peso:"
-#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
-#: src/gui/popupmenu.cpp:1587 src/gui/popupmenu.cpp:1724
-#: src/gui/popupmenu.cpp:1767 src/gui/setup.cpp:71
+#: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:611
+#: src/gui/popupmenu.cpp:1674 src/gui/popupmenu.cpp:1811
+#: src/gui/popupmenu.cpp:1854 src/gui/setup.cpp:73
msgid "Store"
msgstr "Magazzino"
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1631
+#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1718
msgid "Retrieve"
msgstr "Recupera"
-#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1620
-#: src/gui/popupmenu.cpp:1717 src/gui/popupmenu.cpp:1760
+#: src/gui/inventorywindow.cpp:622 src/gui/popupmenu.cpp:1707
+#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1847
#: src/gui/windowmenu.cpp:97
msgid "Drop"
msgstr "Lascia"
@@ -1031,11 +1031,11 @@ msgstr "Aggiungi allo shop di vendita."
msgid "Unknown."
msgstr "Sconosciuto"
-#: src/gui/itempopup.cpp:176 src/gui/itempopup.cpp:182
+#: src/gui/itempopup.cpp:177 src/gui/itempopup.cpp:183
msgid ", "
msgstr ","
-#: src/gui/itempopup.cpp:192
+#: src/gui/itempopup.cpp:193
#, c-format
msgid "Weight: %s"
msgstr "Peso: %s"
@@ -1044,90 +1044,94 @@ msgstr "Peso: %s"
msgid "Kill stats"
msgstr "Statistiche uccisioni"
-#: src/gui/killstats.cpp:64
+#: src/gui/killstats.cpp:65
msgid "Reset stats"
msgstr "Reset statistiche"
-#: src/gui/killstats.cpp:65
+#: src/gui/killstats.cpp:66
msgid "Reset timer"
msgstr "Reset timer"
-#: src/gui/killstats.cpp:69 src/gui/killstats.cpp:205
+#: src/gui/killstats.cpp:70 src/gui/killstats.cpp:206
#, c-format
msgid "Level: %d at %f%%"
msgstr ""
-#: src/gui/killstats.cpp:73 src/gui/killstats.cpp:210
+#: src/gui/killstats.cpp:74 src/gui/killstats.cpp:211
#, c-format
msgid "Exp: %d/%d Left: %d"
msgstr ""
-#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:216
-#: src/gui/killstats.cpp:225
+#: src/gui/killstats.cpp:77 src/gui/killstats.cpp:217
+#: src/gui/killstats.cpp:226
#, c-format
msgid "1%% = %d exp, avg mob for 1%%: %s"
msgstr ""
-#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:142
-#: src/gui/killstats.cpp:234
+#: src/gui/killstats.cpp:80 src/gui/killstats.cpp:143
+#: src/gui/killstats.cpp:235
#, c-format
msgid "Kills: %s, total exp: %s"
msgstr ""
-#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
-#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:230
+#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145
+#: src/gui/killstats.cpp:221 src/gui/killstats.cpp:231
#, c-format
msgid "Avg Exp: %s, No. of avg mob to next level: %s"
msgstr ""
-#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:162
-#: src/gui/killstats.cpp:237
+#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:163
+#: src/gui/killstats.cpp:238
#, c-format
msgid "Kills/Min: %s, Exp/Min: %s"
msgstr ""
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:89 src/gui/killstats.cpp:94
-#: src/gui/killstats.cpp:289 src/gui/killstats.cpp:305
-#: src/gui/killstats.cpp:323
+#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:90 src/gui/killstats.cpp:95
+#: src/gui/killstats.cpp:290 src/gui/killstats.cpp:306
+#: src/gui/killstats.cpp:324
#, c-format
msgid "Exp speed per %d min: %s"
msgid_plural "Exp speed per %d min: %s"
msgstr[0] ""
msgstr[1] ""
-#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
+#: src/gui/killstats.cpp:88 src/gui/killstats.cpp:93 src/gui/killstats.cpp:98
#, c-format
msgid "Time for next level per %d min: %s"
msgid_plural "Time for next level per %d min: %s"
msgstr[0] ""
msgstr[1] ""
-#: src/gui/killstats.cpp:100 src/gui/killstats.cpp:241
+#: src/gui/killstats.cpp:101 src/gui/killstats.cpp:242
msgid "Last kill exp:"
msgstr ""
-#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:355
-#: src/gui/killstats.cpp:361 src/gui/killstats.cpp:367
-#: src/gui/killstats.cpp:372
+#: src/gui/killstats.cpp:103 src/gui/killstats.cpp:356
+#: src/gui/killstats.cpp:362 src/gui/killstats.cpp:368
+#: src/gui/killstats.cpp:373
msgid "Time before jacko spawn:"
msgstr ""
-#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:301
-#: src/gui/killstats.cpp:311 src/gui/killstats.cpp:318
-#: src/gui/killstats.cpp:330 src/gui/killstats.cpp:337
+#: src/gui/killstats.cpp:295 src/gui/killstats.cpp:302
+#: src/gui/killstats.cpp:312 src/gui/killstats.cpp:319
+#: src/gui/killstats.cpp:331 src/gui/killstats.cpp:338
#, c-format
msgid " Time for next level: %s"
msgstr ""
-#: src/gui/killstats.cpp:361
+#: src/gui/killstats.cpp:362
#, c-format
msgid "%s %d?"
msgstr ""
-#: src/gui/killstats.cpp:367
+#: src/gui/killstats.cpp:368
msgid "jacko spawning"
msgstr ""
+#: src/guildmanager.cpp:464 src/net/ea/guildhandler.cpp:439
+msgid "You have left the guild."
+msgstr ""
+
#: src/gui/logindialog.cpp:59
msgid "Normal"
msgstr "Normale"
@@ -1144,7 +1148,7 @@ msgstr "Salta"
msgid "Login"
msgstr "Autenticazione"
-#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:243
+#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:252
#: src/gui/widgets/chattab.cpp:173
msgid "Server:"
msgstr "Server:"
@@ -1169,43 +1173,43 @@ msgstr "Registra"
msgid "Change Server"
msgstr "Cambia server"
-#: src/gui/ministatus.cpp:59
+#: src/gui/ministatuswindow.cpp:59
msgid "health bar"
msgstr ""
-#: src/gui/ministatus.cpp:65
+#: src/gui/ministatuswindow.cpp:65
msgid "mana bar"
msgstr ""
-#: src/gui/ministatus.cpp:77
+#: src/gui/ministatuswindow.cpp:77
msgid "experience bar"
msgstr ""
-#: src/gui/ministatus.cpp:83
+#: src/gui/ministatuswindow.cpp:83
msgid "job bar"
msgstr ""
-#: src/gui/ministatus.cpp:92
+#: src/gui/ministatuswindow.cpp:92
msgid "weight bar"
msgstr ""
-#: src/gui/ministatus.cpp:95
+#: src/gui/ministatuswindow.cpp:95
msgid "inventory slots bar"
msgstr ""
-#: src/gui/ministatus.cpp:98
+#: src/gui/ministatuswindow.cpp:98
msgid "money bar"
msgstr ""
-#: src/gui/ministatus.cpp:101
+#: src/gui/ministatuswindow.cpp:101
msgid "arrows bar"
msgstr ""
-#: src/gui/ministatus.cpp:104
+#: src/gui/ministatuswindow.cpp:104
msgid "status bar"
msgstr ""
-#: src/gui/ministatus.cpp:296 src/gui/ministatus.cpp:336
+#: src/gui/ministatuswindow.cpp:296 src/gui/ministatuswindow.cpp:336
msgid "Need"
msgstr "Bisogno"
@@ -1222,15 +1226,15 @@ msgid "Submit"
msgstr "Invia"
#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:143
+#: src/gui/setup_other.cpp:142
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:549
+#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:590
msgid "Clear"
msgstr "Cancella"
-#: src/gui/npcdialog.cpp:222
+#: src/gui/npcdialog.cpp:223
msgid "> Next"
msgstr ""
@@ -1246,345 +1250,346 @@ msgstr "Invia"
msgid "Failed to send as sender or letter invalid."
msgstr "La lettera non è valida oppure non è stato possibile inviarla."
-#: src/gui/outfitwindow.cpp:82 src/gui/outfitwindow.cpp:886
+#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:890
#, c-format
msgid "Outfit: %d"
msgstr "Outfit: %d"
-#: src/gui/outfitwindow.cpp:84 src/gui/outfitwindow.cpp:888
+#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:892
#, c-format
msgid "Key: %s"
msgstr "Chiave: %s"
-#: src/gui/outfitwindow.cpp:87
+#: src/gui/outfitwindow.cpp:91
msgid "Unequip first"
msgstr "Rimuovi prima"
-#: src/gui/outfitwindow.cpp:90
+#: src/gui/outfitwindow.cpp:94
msgid "Away outfit"
msgstr "Away outfit"
-#: src/gui/popupmenu.cpp:129 src/gui/popupmenu.cpp:603
+#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:645
#: src/gui/widgets/tradetab.cpp:44
msgid "Trade"
msgstr "Commercia"
-#: src/gui/popupmenu.cpp:131 src/gui/popupmenu.cpp:368
+#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:393
msgid "Whisper"
msgstr ""
-#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:608
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:650
msgid "Heal"
msgstr ""
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:374
-#: src/gui/popupmenu.cpp:615
+#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:399
+#: src/gui/popupmenu.cpp:657
msgid "Be friend"
msgstr ""
-#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:153
-#: src/gui/popupmenu.cpp:180 src/gui/popupmenu.cpp:376
-#: src/gui/popupmenu.cpp:382 src/gui/popupmenu.cpp:401
-#: src/gui/popupmenu.cpp:617 src/gui/popupmenu.cpp:625
-#: src/gui/popupmenu.cpp:649
+#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:156
+#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:401
+#: src/gui/popupmenu.cpp:407 src/gui/popupmenu.cpp:426
+#: src/gui/popupmenu.cpp:659 src/gui/popupmenu.cpp:667
+#: src/gui/popupmenu.cpp:691
msgid "Disregard"
msgstr ""
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:173
-#: src/gui/popupmenu.cpp:378 src/gui/popupmenu.cpp:384
-#: src/gui/popupmenu.cpp:391 src/gui/popupmenu.cpp:396
-#: src/gui/popupmenu.cpp:620 src/gui/popupmenu.cpp:628
-#: src/gui/popupmenu.cpp:636 src/gui/popupmenu.cpp:642
+#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:160
+#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:176
+#: src/gui/popupmenu.cpp:403 src/gui/popupmenu.cpp:409
+#: src/gui/popupmenu.cpp:416 src/gui/popupmenu.cpp:421
+#: src/gui/popupmenu.cpp:662 src/gui/popupmenu.cpp:670
+#: src/gui/popupmenu.cpp:678 src/gui/popupmenu.cpp:684
msgid "Erase"
msgstr ""
-#: src/gui/popupmenu.cpp:162 src/gui/popupmenu.cpp:171
-#: src/gui/popupmenu.cpp:178 src/gui/popupmenu.cpp:388
-#: src/gui/popupmenu.cpp:395 src/gui/popupmenu.cpp:400
-#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
-#: src/gui/popupmenu.cpp:647
+#: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:174
+#: src/gui/popupmenu.cpp:181 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:425
+#: src/gui/popupmenu.cpp:675 src/gui/popupmenu.cpp:683
+#: src/gui/popupmenu.cpp:689
msgid "Unignore"
msgstr ""
-#: src/gui/popupmenu.cpp:164 src/gui/popupmenu.cpp:182
-#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:403
-#: src/gui/popupmenu.cpp:635 src/gui/popupmenu.cpp:651
+#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:185
+#: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:428
+#: src/gui/popupmenu.cpp:677 src/gui/popupmenu.cpp:693
#: src/playerrelations.cpp:400
msgid "Completely ignore"
msgstr ""
-#: src/gui/popupmenu.cpp:190 src/gui/popupmenu.cpp:411
-#: src/gui/popupmenu.cpp:659
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:436
+#: src/gui/popupmenu.cpp:701
msgid "Follow"
msgstr ""
-#: src/gui/popupmenu.cpp:192 src/gui/popupmenu.cpp:412
-#: src/gui/popupmenu.cpp:660
+#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:437
+#: src/gui/popupmenu.cpp:702
msgid "Imitation"
msgstr ""
-#: src/gui/popupmenu.cpp:202 src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:739
msgid "Invite to party"
msgstr ""
-#: src/gui/popupmenu.cpp:207 src/gui/popupmenu.cpp:421
-#: src/gui/popupmenu.cpp:702
+#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:744
msgid "Kick from party"
msgstr ""
-#: src/gui/popupmenu.cpp:222 src/gui/popupmenu.cpp:432
-#: src/gui/popupmenu.cpp:716
+#: src/gui/popupmenu.cpp:225 src/gui/popupmenu.cpp:237
+#: src/gui/popupmenu.cpp:460 src/gui/popupmenu.cpp:761
msgid "Kick from guild"
msgstr ""
-#: src/gui/popupmenu.cpp:224 src/gui/popupmenu.cpp:434
-#: src/gui/popupmenu.cpp:718
+#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:242
+#: src/gui/popupmenu.cpp:465 src/gui/popupmenu.cpp:766
msgid "Change pos in guild"
msgstr ""
-#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:439
-#: src/gui/popupmenu.cpp:724
+#: src/gui/popupmenu.cpp:251 src/gui/popupmenu.cpp:474
+#: src/gui/popupmenu.cpp:776
msgid "Invite to guild"
msgstr ""
-#: src/gui/popupmenu.cpp:238
+#: src/gui/popupmenu.cpp:260
msgid "Kick player"
msgstr ""
-#: src/gui/popupmenu.cpp:240
+#: src/gui/popupmenu.cpp:262
msgid "Nuke"
msgstr ""
-#: src/gui/popupmenu.cpp:243 src/gui/popupmenu.cpp:662
+#: src/gui/popupmenu.cpp:265 src/gui/popupmenu.cpp:704
msgid "Show Items"
msgstr ""
-#: src/gui/popupmenu.cpp:244 src/gui/popupmenu.cpp:663
-#: src/gui/popupmenu.cpp:1932
+#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:705
+#: src/gui/popupmenu.cpp:2020
msgid "Undress"
msgstr ""
-#: src/gui/popupmenu.cpp:246 src/gui/popupmenu.cpp:413
-#: src/gui/popupmenu.cpp:665 src/gui/popupmenu.cpp:732
+#: src/gui/popupmenu.cpp:268 src/gui/popupmenu.cpp:304
+#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:707
+#: src/gui/popupmenu.cpp:786
msgid "Add comment"
msgstr ""
-#: src/gui/popupmenu.cpp:264 src/gui/popupmenu.cpp:446
-#: src/gui/popupmenu.cpp:682
+#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:482
+#: src/gui/popupmenu.cpp:724
msgid "Buy (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:447
-#: src/gui/popupmenu.cpp:684
+#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:483
+#: src/gui/popupmenu.cpp:726
msgid "Sell (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:292
+#: src/gui/popupmenu.cpp:316
msgid "Kick"
msgstr ""
-#: src/gui/popupmenu.cpp:303
+#: src/gui/popupmenu.cpp:327
msgid "Remove from attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:333
msgid "Add to priority attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:311
+#: src/gui/popupmenu.cpp:335
msgid "Add to attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:314
+#: src/gui/popupmenu.cpp:338
msgid "Add to ignore list"
msgstr ""
-#: src/gui/popupmenu.cpp:327 src/gui/popupmenu.cpp:450
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:486
msgid "Add name to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:476
+#: src/gui/popupmenu.cpp:512
msgid "Pick up"
msgstr ""
-#: src/gui/popupmenu.cpp:477 src/gui/popupmenu.cpp:1645
-#: src/gui/popupmenu.cpp:1725 src/gui/popupmenu.cpp:1768
+#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:1732
+#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1855
msgid "Add to chat"
msgstr "Aggiungi alla chat"
-#: src/gui/popupmenu.cpp:494
+#: src/gui/popupmenu.cpp:530
msgid "Map Item"
msgstr "Oggetto mappa"
-#: src/gui/popupmenu.cpp:495
+#: src/gui/popupmenu.cpp:531
msgid "Rename"
msgstr ""
-#: src/gui/popupmenu.cpp:496 src/gui/popupmenu.cpp:1885
-#: src/gui/popupmenu.cpp:1903 src/gui/popupmenu.cpp:1908
+#: src/gui/popupmenu.cpp:532 src/gui/popupmenu.cpp:1973
+#: src/gui/popupmenu.cpp:1991 src/gui/popupmenu.cpp:1996
msgid "Remove"
msgstr ""
-#: src/gui/popupmenu.cpp:510
+#: src/gui/popupmenu.cpp:537
+msgid "Warp"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:551
msgid "Load old outfits"
msgstr ""
-#: src/gui/popupmenu.cpp:526 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:567 src/gui/windowmenu.cpp:96
msgid "Spells"
msgstr "Spells"
-#: src/gui/popupmenu.cpp:528
+#: src/gui/popupmenu.cpp:569
msgid "Load old spells"
msgstr ""
-#: src/gui/popupmenu.cpp:529
+#: src/gui/popupmenu.cpp:570
msgid "Edit spell"
msgstr ""
-#: src/gui/popupmenu.cpp:555
+#: src/gui/popupmenu.cpp:596
msgid "Disable highlight"
msgstr "Disabilita highlight"
-#: src/gui/popupmenu.cpp:560
+#: src/gui/popupmenu.cpp:601
msgid "Enable highlight"
msgstr "Abilita highlight"
-#: src/gui/popupmenu.cpp:565
-msgid "Dont remove name"
+#: src/gui/popupmenu.cpp:606
+msgid "Don't remove name"
msgstr ""
-#: src/gui/popupmenu.cpp:570
+#: src/gui/popupmenu.cpp:611
msgid "Remove name"
msgstr ""
-#: src/gui/popupmenu.cpp:575
+#: src/gui/popupmenu.cpp:616
msgid "Enable away"
msgstr ""
-#: src/gui/popupmenu.cpp:580
+#: src/gui/popupmenu.cpp:621
msgid "Disable away"
msgstr ""
-#: src/gui/popupmenu.cpp:586 src/gui/socialwindow.cpp:1035
+#: src/gui/popupmenu.cpp:627 src/gui/socialwindow.cpp:1141
msgid "Leave"
msgstr ""
-#: src/gui/popupmenu.cpp:744
+#: src/gui/popupmenu.cpp:798
msgid "Change guild position"
msgstr "Cambia posizione nella gilda"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1166
+#: src/gui/popupmenu.cpp:1234
msgid "Rename map sign "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1168
+#: src/gui/popupmenu.cpp:1236
msgid "Name: "
msgstr "Nome:"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1218
+#: src/gui/popupmenu.cpp:1286
msgid "Player comment "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1220
+#: src/gui/popupmenu.cpp:1288
msgid "Comment: "
msgstr ""
-#: src/gui/popupmenu.cpp:1570
+#: src/gui/popupmenu.cpp:1657
msgid "Add to trade"
msgstr ""
-#: src/gui/popupmenu.cpp:1576
+#: src/gui/popupmenu.cpp:1663
msgid "Add to trade 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1579
+#: src/gui/popupmenu.cpp:1666
msgid "Add to trade half"
msgstr ""
-#: src/gui/popupmenu.cpp:1581
+#: src/gui/popupmenu.cpp:1668
msgid "Add to trade all"
msgstr ""
-#: src/gui/popupmenu.cpp:1593
+#: src/gui/popupmenu.cpp:1680
msgid "Store 10"
msgstr "Salva 10"
-#: src/gui/popupmenu.cpp:1596
+#: src/gui/popupmenu.cpp:1683
msgid "Store half"
msgstr "Salva metà"
-#: src/gui/popupmenu.cpp:1598
+#: src/gui/popupmenu.cpp:1685
msgid "Store all"
msgstr "Salva tutto"
-#: src/gui/popupmenu.cpp:1616 src/gui/popupmenu.cpp:1713
-#: src/gui/popupmenu.cpp:1756
+#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1800
+#: src/gui/popupmenu.cpp:1843
msgid "Drop all"
msgstr ""
-#: src/gui/popupmenu.cpp:1637
+#: src/gui/popupmenu.cpp:1724
msgid "Retrieve 10"
msgstr "Ritira 10"
-#: src/gui/popupmenu.cpp:1640
+#: src/gui/popupmenu.cpp:1727
msgid "Retrieve half"
msgstr "Ritira metà"
-#: src/gui/popupmenu.cpp:1642
+#: src/gui/popupmenu.cpp:1729
msgid "Retrieve all"
msgstr "Ritira tutto"
-#: src/gui/popupmenu.cpp:1673 src/gui/popupmenu.cpp:1729
+#: src/gui/popupmenu.cpp:1760 src/gui/popupmenu.cpp:1816
msgid "Load old item shortcuts"
msgstr "Carica vecchie scorciatoie oggetti"
-#: src/gui/popupmenu.cpp:1772
+#: src/gui/popupmenu.cpp:1859
msgid "Load old drop shortcuts"
msgstr "Carica vecchie scorciatoie drop"
-#: src/gui/popupmenu.cpp:1798 src/gui/popupmenu.cpp:1833
+#: src/gui/popupmenu.cpp:1885 src/gui/popupmenu.cpp:1920
msgid "Hide"
msgstr ""
-#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1839
+#: src/gui/popupmenu.cpp:1891 src/gui/popupmenu.cpp:1926
msgid "Show"
msgstr ""
-#: src/gui/popupmenu.cpp:1846
+#: src/gui/popupmenu.cpp:1933
msgid "Reset yellow bar"
msgstr ""
-#: src/gui/popupmenu.cpp:1848
+#: src/gui/popupmenu.cpp:1935 src/gui/statuswindow.cpp:241
msgid "Copy to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:1865 src/gui/socialwindow.cpp:854
-#: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
+#: src/gui/popupmenu.cpp:1953 src/gui/socialwindow.cpp:958
+#: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028
msgid "(default)"
msgstr ""
-#: src/gui/popupmenu.cpp:1877 src/gui/popupmenu.cpp:1895
+#: src/gui/popupmenu.cpp:1965 src/gui/popupmenu.cpp:1983
msgid "Move up"
msgstr ""
-#: src/gui/popupmenu.cpp:1882 src/gui/popupmenu.cpp:1900
+#: src/gui/popupmenu.cpp:1970 src/gui/popupmenu.cpp:1988
msgid "Move down"
msgstr ""
-#: src/gui/quitdialog.cpp:56
-msgid "Save state"
-msgstr "Salva stato"
-
-#: src/gui/quitdialog.cpp:57
+#: src/gui/quitdialog.cpp:51
msgid "Switch server"
msgstr "Cambia server"
-#: src/gui/quitdialog.cpp:58
+#: src/gui/quitdialog.cpp:52
msgid "Switch character"
msgstr "Cambia personaggio"
@@ -1620,64 +1625,64 @@ msgstr "La password deve contenere meno di %d caratteri."
msgid "Passwords do not match."
msgstr "Le password non corrispondono."
-#: src/gui/serverdialog.cpp:228
+#: src/gui/serverdialog.cpp:237
msgid "Choose Your Server"
msgstr "Scegli il tuo server"
-#: src/gui/serverdialog.cpp:239
+#: src/gui/serverdialog.cpp:248
msgid "Choose Your Server *** SAFE MODE ***"
msgstr ""
-#: src/gui/serverdialog.cpp:244
+#: src/gui/serverdialog.cpp:253
msgid "Port:"
msgstr "Porta:"
-#: src/gui/serverdialog.cpp:248
+#: src/gui/serverdialog.cpp:257
msgid "Use same ip for game sub servers"
msgstr "Utilizzare lo stesso IP per i sub server di gioco"
-#: src/gui/serverdialog.cpp:262
+#: src/gui/serverdialog.cpp:271
msgid "Server type:"
msgstr "Tipo di server:"
-#: src/gui/serverdialog.cpp:286
+#: src/gui/serverdialog.cpp:295
msgid "Load"
msgstr "Carica"
-#: src/gui/serverdialog.cpp:287
+#: src/gui/serverdialog.cpp:296
msgid "Connect"
msgstr "Connetti"
-#: src/gui/serverdialog.cpp:288
+#: src/gui/serverdialog.cpp:297
msgid "Custom Server"
msgstr "Server personalizzati"
-#: src/gui/serverdialog.cpp:393
+#: src/gui/serverdialog.cpp:402
msgid "Please type both the address and the port of a server."
msgstr "Inserire l'indirizzo e la porta del server."
-#: src/gui/serverdialog.cpp:551
+#: src/gui/serverdialog.cpp:560
#, c-format
msgid "Downloading server list...%2.2f%%"
msgstr "Downloading server list... %2.2f%%"
-#: src/gui/serverdialog.cpp:556
+#: src/gui/serverdialog.cpp:565
msgid "Waiting for server..."
msgstr "Attesa del server..."
-#: src/gui/serverdialog.cpp:560
+#: src/gui/serverdialog.cpp:569
msgid "Preparing download"
msgstr "Preparazione download"
-#: src/gui/serverdialog.cpp:564
+#: src/gui/serverdialog.cpp:573
msgid "Error retreiving server list!"
msgstr "Errore nel ricevimento della lista sei server!"
-#: src/gui/serverdialog.cpp:662
+#: src/gui/serverdialog.cpp:678
msgid "requires a newer version"
msgstr "Richiede una versione più nuova"
-#: src/gui/serverdialog.cpp:664
+#: src/gui/serverdialog.cpp:680
#, c-format
msgid "requires v%s"
msgstr "Richiede v%s"
@@ -1824,6 +1829,14 @@ msgstr ""
msgid "Use local time"
msgstr ""
+#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:157
+msgid "Other"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:125
+msgid "Highlight words (separated by comma)"
+msgstr ""
+
#: src/gui/setup_colors.cpp:49
msgid "This is what the color looks like"
msgstr "Come appaiono i colori"
@@ -1871,18 +1884,14 @@ msgstr ""
msgid "Alpha:"
msgstr ""
-#: src/gui/setup.cpp:69
+#: src/gui/setup.cpp:71
msgid "Apply"
msgstr "Applica"
-#: src/gui/setup.cpp:72
+#: src/gui/setup.cpp:74
msgid "Reset Windows"
msgstr "Resetta finestre"
-#: src/gui/setupitem.cpp:270 src/gui/setupitem.cpp:394
-msgid "Edit"
-msgstr ""
-
#: src/gui/setup_joystick.cpp:40 src/gui/setup_joystick.cpp:79
msgid "Press the button to start calibration"
msgstr "Premi il pulsante per cominciare la calibrazione"
@@ -1927,163 +1936,171 @@ msgstr "Predefinito"
msgid "Key Conflict(s) Detected."
msgstr "Sono stati rilevati conflitti nei tasti."
-#: src/gui/setup_other.cpp:40
+#: src/gui/setup_other.cpp:39
msgid "Misc"
msgstr ""
-#: src/gui/setup_other.cpp:46 src/gui/userpalette.cpp:125
+#: src/gui/setup_other.cpp:45 src/gui/userpalette.cpp:125
msgid "Monsters"
msgstr "Mostri"
-#: src/gui/setup_other.cpp:48
+#: src/gui/setup_other.cpp:47
msgid "Show damage inflicted to monsters"
msgstr ""
-#: src/gui/setup_other.cpp:51
+#: src/gui/setup_other.cpp:50
msgid "Auto target only reachable monsters"
msgstr ""
-#: src/gui/setup_other.cpp:54
+#: src/gui/setup_other.cpp:53
msgid "Highlight monster attack range"
msgstr ""
-#: src/gui/setup_other.cpp:58
+#: src/gui/setup_other.cpp:57
msgid "Show monster hp bar"
msgstr ""
-#: src/gui/setup_other.cpp:61
+#: src/gui/setup_other.cpp:60
msgid "Cycle monster targets"
msgstr ""
-#: src/gui/setup_other.cpp:67
+#: src/gui/setup_other.cpp:66
msgid "Show warps particles"
msgstr ""
-#: src/gui/setup_other.cpp:70
+#: src/gui/setup_other.cpp:69
msgid "Highlight map portals"
msgstr ""
-#: src/gui/setup_other.cpp:73
+#: src/gui/setup_other.cpp:72
msgid "Highlight floor items"
msgstr ""
-#: src/gui/setup_other.cpp:76
+#: src/gui/setup_other.cpp:75
msgid "Highlight player attack range"
msgstr ""
-#: src/gui/setup_other.cpp:79
+#: src/gui/setup_other.cpp:78
msgid "Show extended minimaps"
msgstr ""
-#: src/gui/setup_other.cpp:82
+#: src/gui/setup_other.cpp:81
msgid "Draw path"
msgstr ""
-#: src/gui/setup_other.cpp:85
+#: src/gui/setup_other.cpp:84
msgid "Draw hotkeys on map"
msgstr ""
-#: src/gui/setup_other.cpp:89
+#: src/gui/setup_other.cpp:88
msgid "Moving"
msgstr ""
-#: src/gui/setup_other.cpp:91
+#: src/gui/setup_other.cpp:90
msgid "Auto fix position"
msgstr ""
-#: src/gui/setup_other.cpp:94
+#: src/gui/setup_other.cpp:93
msgid "Attack while moving"
msgstr ""
-#: src/gui/setup_other.cpp:97
+#: src/gui/setup_other.cpp:96
msgid "Sync player move"
msgstr ""
-#: src/gui/setup_other.cpp:100
+#: src/gui/setup_other.cpp:99
msgid "Crazy move A program"
msgstr ""
-#: src/gui/setup_other.cpp:104
+#: src/gui/setup_other.cpp:103
msgid "Player"
msgstr ""
-#: src/gui/setup_other.cpp:106
+#: src/gui/setup_other.cpp:105
msgid "Show own hp bar"
msgstr ""
-#: src/gui/setup_other.cpp:109
+#: src/gui/setup_other.cpp:108
msgid "Enable quick stats"
msgstr ""
-#: src/gui/setup_other.cpp:112
+#: src/gui/setup_other.cpp:111
msgid "Cycle player targets"
msgstr ""
-#: src/gui/setup_other.cpp:115
+#: src/gui/setup_other.cpp:114
msgid "Show job exp messages"
msgstr ""
-#: src/gui/setup_other.cpp:118
+#: src/gui/setup_other.cpp:117
msgid "Show players popups"
msgstr ""
-#: src/gui/setup_other.cpp:121
+#: src/gui/setup_other.cpp:120
msgid "Afk message"
msgstr ""
-#: src/gui/setup_other.cpp:124
+#: src/gui/setup_other.cpp:123
msgid "Show job"
msgstr ""
-#: src/gui/setup_other.cpp:127
+#: src/gui/setup_other.cpp:126
msgid "Enable attack filter"
msgstr ""
-#: src/gui/setup_other.cpp:130
+#: src/gui/setup_other.cpp:129
msgid "Enable advert protocol"
msgstr ""
-#: src/gui/setup_other.cpp:136
+#: src/gui/setup_other.cpp:135
msgid "Accept sell/buy requests"
msgstr ""
-#: src/gui/setup_other.cpp:139
+#: src/gui/setup_other.cpp:138
msgid "Enable shop mode"
msgstr ""
-#: src/gui/setup_other.cpp:145
+#: src/gui/setup_other.cpp:144
msgid "Log NPC dialogue"
msgstr ""
-#: src/gui/setup_other.cpp:149
-msgid "Other"
+#: src/gui/setup_other.cpp:148
+msgid "Bots support"
+msgstr ""
+
+#: src/gui/setup_other.cpp:150
+msgid "Enable auction bot support"
+msgstr ""
+
+#: src/gui/setup_other.cpp:153
+msgid "Enable guild bot support and disable native guild support"
msgstr ""
-#: src/gui/setup_other.cpp:151
+#: src/gui/setup_other.cpp:159
msgid "Enable server side attack"
msgstr ""
-#: src/gui/setup_other.cpp:154
+#: src/gui/setup_other.cpp:162
msgid "Enable bot checker"
msgstr ""
-#: src/gui/setup_other.cpp:157
+#: src/gui/setup_other.cpp:165
msgid "Enable buggy servers protection"
msgstr ""
-#: src/gui/setup_other.cpp:160
+#: src/gui/setup_other.cpp:168
msgid "Enable debug log"
msgstr ""
-#: src/gui/setup_other.cpp:163
+#: src/gui/setup_other.cpp:171
msgid "Low traffic mode"
msgstr ""
-#: src/gui/setup_other.cpp:166
+#: src/gui/setup_other.cpp:174
msgid "Hide shield sprite"
msgstr ""
-#: src/gui/setup_other.cpp:169
+#: src/gui/setup_other.cpp:177
msgid "Show background"
msgstr ""
@@ -2175,6 +2192,14 @@ msgstr ""
msgid "Show statuses"
msgstr ""
+#: src/gui/setup_players.cpp:78
+msgid "Show ip addresses on screenshots"
+msgstr ""
+
+#: src/gui/setup_players.cpp:81
+msgid "Allow self heal with mouse click"
+msgstr ""
+
#: src/gui/setup_relations.cpp:65
msgid "Relation"
msgstr "Relazione"
@@ -2219,67 +2244,71 @@ msgstr ""
msgid "When ignoring:"
msgstr "Quando si ignora:"
-#: src/gui/setup_theme.cpp:106
+#: src/gui/setup_theme.cpp:107
msgid "Tiny (10)"
msgstr ""
-#: src/gui/setup_theme.cpp:107
+#: src/gui/setup_theme.cpp:108
msgid "Small (11)"
msgstr ""
-#: src/gui/setup_theme.cpp:108
+#: src/gui/setup_theme.cpp:109
msgid "Medium (12)"
msgstr ""
-#: src/gui/setup_theme.cpp:109
+#: src/gui/setup_theme.cpp:110
msgid "Large (13)"
msgstr ""
-#: src/gui/setup_theme.cpp:110
+#: src/gui/setup_theme.cpp:111
msgid "Big (14)"
msgstr ""
-#: src/gui/setup_theme.cpp:111
+#: src/gui/setup_theme.cpp:112
msgid "Huge (15)"
msgstr ""
-#: src/gui/setup_theme.cpp:141
+#: src/gui/setup_theme.cpp:143
msgid "Theme"
msgstr ""
-#: src/gui/setup_theme.cpp:143
+#: src/gui/setup_theme.cpp:145
msgid "Gui theme"
msgstr ""
-#: src/gui/setup_theme.cpp:144
+#: src/gui/setup_theme.cpp:146
msgid "Main Font"
msgstr ""
-#: src/gui/setup_theme.cpp:145
+#: src/gui/setup_theme.cpp:147
msgid "Bold font"
msgstr ""
-#: src/gui/setup_theme.cpp:146
+#: src/gui/setup_theme.cpp:148
msgid "Particle font"
msgstr ""
-#: src/gui/setup_theme.cpp:147
+#: src/gui/setup_theme.cpp:149
msgid "Help font"
msgstr ""
-#: src/gui/setup_theme.cpp:148
+#: src/gui/setup_theme.cpp:150
msgid "Secure font"
msgstr ""
-#: src/gui/setup_theme.cpp:176
+#: src/gui/setup_theme.cpp:151
+msgid "Japanese font"
+msgstr ""
+
+#: src/gui/setup_theme.cpp:183
msgid "Font size"
msgstr "Dimensione caratteri"
-#: src/gui/setup_theme.cpp:282
+#: src/gui/setup_theme.cpp:299
msgid "Theme Changed"
msgstr ""
-#: src/gui/setup_theme.cpp:283 src/gui/setup_video.cpp:619
+#: src/gui/setup_theme.cpp:300 src/gui/setup_video.cpp:619
#: src/gui/setup_video.cpp:624
msgid "Restart your client for the change to take effect."
msgstr "Per applicare le modifiche, è necessario riavviare il client."
@@ -2443,261 +2472,266 @@ msgstr ""
msgid "Changes will take effect on map change."
msgstr "I cambi saranno effettuati al cambio della mappa."
-#: src/gui/shopwindow.cpp:74
+#: src/gui/shopwindow.cpp:75
msgid "Personal Shop"
msgstr ""
-#: src/gui/shopwindow.cpp:116
+#: src/gui/shopwindow.cpp:118
msgid "Buy items"
msgstr ""
-#: src/gui/shopwindow.cpp:117
+#: src/gui/shopwindow.cpp:119
msgid "Sell items"
msgstr ""
-#: src/gui/shopwindow.cpp:119 src/gui/shopwindow.cpp:122
-#: src/gui/tradewindow.cpp:88
+#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
+#: src/gui/tradewindow.cpp:89
msgid "Add"
msgstr "Aggiungi"
-#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
+#: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
msgid "Announce"
msgstr ""
-#: src/gui/shopwindow.cpp:125
+#: src/gui/shopwindow.cpp:127
msgid "Show links in announce"
msgstr ""
-#: src/gui/shopwindow.cpp:723 src/net/ea/tradehandler.cpp:106
+#: src/gui/shopwindow.cpp:148 src/gui/shopwindow.cpp:149
+msgid "Auction"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:748 src/net/ea/tradehandler.cpp:106
#: src/net/manaserv/tradehandler.cpp:127
msgid "Request for Trade"
msgstr "Richiesta di commercio"
-#: src/gui/shopwindow.cpp:724
+#: src/gui/shopwindow.cpp:749
#, c-format
msgid "%s wants to %s %s do you accept?"
msgstr ""
-#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:81
+#: src/gui/skilldialog.cpp:276 src/gui/windowmenu.cpp:81
msgid "Skills"
msgstr "Abilità"
-#: src/gui/skilldialog.cpp:283
+#: src/gui/skilldialog.cpp:288
msgid "Up"
msgstr "Su"
-#: src/gui/skilldialog.cpp:336
+#: src/gui/skilldialog.cpp:341
#, c-format
msgid "Skill points available: %d"
msgstr ""
-#: src/gui/skilldialog.cpp:413
+#: src/gui/skilldialog.cpp:418
#, c-format
msgid "Skill Set %d"
msgstr ""
-#: src/gui/skilldialog.cpp:425
+#: src/gui/skilldialog.cpp:430
#, c-format
msgid "Skill %d"
msgstr ""
-#: src/gui/skilldialog.cpp:492 src/gui/skilldialog.cpp:545
+#: src/gui/skilldialog.cpp:497 src/gui/skilldialog.cpp:550
#, c-format
msgid "Lvl: %d"
msgstr ""
-#: src/gui/skilldialog.cpp:537
+#: src/gui/skilldialog.cpp:542
#, c-format
msgid "Lvl: %d (%+d)"
msgstr ""
-#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
+#: src/gui/socialwindow.cpp:118 src/gui/socialwindow.cpp:216
+#: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52
msgid "Guild"
msgstr "Gilda"
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:147
#, c-format
msgid "Invited user %s to guild %s."
msgstr ""
-#: src/gui/socialwindow.cpp:160
+#: src/gui/socialwindow.cpp:161
#, c-format
msgid "Guild %s quit requested."
msgstr ""
-#: src/gui/socialwindow.cpp:187
+#: src/gui/socialwindow.cpp:188
msgid "Member Invite to Guild"
msgstr ""
-#: src/gui/socialwindow.cpp:188
+#: src/gui/socialwindow.cpp:189
#, c-format
msgid "Who would you like to invite to guild %s?"
msgstr ""
-#: src/gui/socialwindow.cpp:197
+#: src/gui/socialwindow.cpp:198
msgid "Leave Guild?"
msgstr ""
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:199
#, c-format
msgid "Are you sure you want to leave guild %s?"
msgstr ""
-#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:319 src/net/ea/gui/partytab.cpp:50
msgid "Party"
msgstr "Party"
-#: src/gui/socialwindow.cpp:243
+#: src/gui/socialwindow.cpp:347
#, c-format
msgid "Invited user %s to party."
msgstr ""
-#: src/gui/socialwindow.cpp:257
+#: src/gui/socialwindow.cpp:361
#, c-format
msgid "Party %s quit requested."
msgstr ""
-#: src/gui/socialwindow.cpp:284
+#: src/gui/socialwindow.cpp:388
msgid "Member Invite to Party"
msgstr ""
-#: src/gui/socialwindow.cpp:285
+#: src/gui/socialwindow.cpp:389
#, c-format
msgid "Who would you like to invite to party %s?"
msgstr ""
-#: src/gui/socialwindow.cpp:294
+#: src/gui/socialwindow.cpp:398
msgid "Leave Party?"
msgstr ""
-#: src/gui/socialwindow.cpp:295
+#: src/gui/socialwindow.cpp:399
#, c-format
msgid "Are you sure you want to leave party %s?"
msgstr ""
-#: src/gui/socialwindow.cpp:521
+#: src/gui/socialwindow.cpp:625
msgid "Nav"
msgstr ""
-#: src/gui/socialwindow.cpp:799
+#: src/gui/socialwindow.cpp:903
msgid "Atk"
msgstr ""
-#: src/gui/socialwindow.cpp:840
+#: src/gui/socialwindow.cpp:944
msgid "Priority mobs"
msgstr ""
-#: src/gui/socialwindow.cpp:872
+#: src/gui/socialwindow.cpp:976
msgid "Attack mobs"
msgstr ""
-#: src/gui/socialwindow.cpp:907
+#: src/gui/socialwindow.cpp:1011
msgid "Ignore mobs"
msgstr ""
-#: src/gui/socialwindow.cpp:970
+#: src/gui/socialwindow.cpp:1074
msgid "Create Guild"
msgstr "Crea una Gilda"
-#: src/gui/socialwindow.cpp:971 src/gui/socialwindow.cpp:1387
+#: src/gui/socialwindow.cpp:1075 src/gui/socialwindow.cpp:1503
msgid "Create Party"
msgstr ""
-#: src/gui/socialwindow.cpp:1013 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1117 src/gui/windowmenu.cpp:93
msgid "Social"
msgstr ""
-#: src/gui/socialwindow.cpp:1034
+#: src/gui/socialwindow.cpp:1140
msgid "Invite"
msgstr ""
-#: src/gui/socialwindow.cpp:1176
+#: src/gui/socialwindow.cpp:1286
#, c-format
msgid "Accepted party invite from %s."
msgstr ""
-#: src/gui/socialwindow.cpp:1186
+#: src/gui/socialwindow.cpp:1296
#, c-format
msgid "Rejected party invite from %s."
msgstr ""
-#: src/gui/socialwindow.cpp:1203
+#: src/gui/socialwindow.cpp:1313
#, c-format
msgid "Accepted guild invite from %s."
msgstr ""
-#: src/gui/socialwindow.cpp:1213
+#: src/gui/socialwindow.cpp:1326
#, c-format
msgid "Rejected guild invite from %s."
msgstr ""
-#: src/gui/socialwindow.cpp:1257
+#: src/gui/socialwindow.cpp:1373
#, c-format
msgid "Creating guild called %s."
msgstr ""
-#: src/gui/socialwindow.cpp:1280
+#: src/gui/socialwindow.cpp:1396
#, c-format
msgid "Creating party called %s."
msgstr ""
-#: src/gui/socialwindow.cpp:1294
+#: src/gui/socialwindow.cpp:1410
msgid "Guild Name"
msgstr ""
-#: src/gui/socialwindow.cpp:1295
+#: src/gui/socialwindow.cpp:1411
msgid "Choose your guild's name."
msgstr ""
-#: src/gui/socialwindow.cpp:1309
+#: src/gui/socialwindow.cpp:1425
msgid "Received guild request, but one already exists."
msgstr ""
-#: src/gui/socialwindow.cpp:1315
+#: src/gui/socialwindow.cpp:1431
#, c-format
msgid "%s has invited you to join the guild %s."
msgstr ""
-#: src/gui/socialwindow.cpp:1321
+#: src/gui/socialwindow.cpp:1437
msgid "Accept Guild Invite"
msgstr ""
-#: src/gui/socialwindow.cpp:1336
+#: src/gui/socialwindow.cpp:1452
msgid "Received party request, but one already exists."
msgstr "Ricevuta richiesta di party, ma ne esiste già una."
-#: src/gui/socialwindow.cpp:1347
+#: src/gui/socialwindow.cpp:1463
msgid "You have been invited you to join a party."
msgstr ""
-#: src/gui/socialwindow.cpp:1351
+#: src/gui/socialwindow.cpp:1467
#, c-format
msgid "You have been invited to join the %s party."
msgstr ""
-#: src/gui/socialwindow.cpp:1359
+#: src/gui/socialwindow.cpp:1475
#, c-format
msgid "%s has invited you to join their party."
msgstr "%s ti ha invitato ad unirti al suo party."
-#: src/gui/socialwindow.cpp:1364
+#: src/gui/socialwindow.cpp:1480
#, c-format
msgid "%s has invited you to join the %s party."
msgstr "%s ti ha invitato ad unirti al party %s."
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1489
msgid "Accept Party Invite"
msgstr "Accetta invito nel party"
-#: src/gui/socialwindow.cpp:1388
+#: src/gui/socialwindow.cpp:1504
msgid "Cannot create party. You are already in a party"
msgstr ""
-#: src/gui/socialwindow.cpp:1393
+#: src/gui/socialwindow.cpp:1509
msgid "Party Name"
msgstr ""
-#: src/gui/socialwindow.cpp:1394
+#: src/gui/socialwindow.cpp:1510
msgid "Choose your party's name."
msgstr ""
@@ -2705,418 +2739,418 @@ msgstr ""
msgid "Specials"
msgstr ""
-#: src/gui/statuspopup.cpp:197
+#: src/gui/statuspopup.cpp:198
msgid "(D) default moves"
msgstr ""
-#: src/gui/statuspopup.cpp:202
+#: src/gui/statuspopup.cpp:203
msgid "(I) invert moves"
msgstr ""
-#: src/gui/statuspopup.cpp:207
+#: src/gui/statuspopup.cpp:208
msgid "(c) moves with some crazy moves"
msgstr ""
-#: src/gui/statuspopup.cpp:212
+#: src/gui/statuspopup.cpp:213
msgid "(C) moves with crazy moves"
msgstr ""
-#: src/gui/statuspopup.cpp:217
+#: src/gui/statuspopup.cpp:218
msgid "(d) double normal + crazy"
msgstr ""
-#: src/gui/statuspopup.cpp:222
+#: src/gui/statuspopup.cpp:223
msgid "(?) move"
msgstr ""
-#: src/gui/statuspopup.cpp:240
+#: src/gui/statuspopup.cpp:241
msgid "(a) custom crazy move"
msgstr ""
-#: src/gui/statuspopup.cpp:244
+#: src/gui/statuspopup.cpp:245
msgid "(?) crazy move"
msgstr ""
-#: src/gui/statuspopup.cpp:254
+#: src/gui/statuspopup.cpp:255
msgid "(0) default moves to target"
msgstr ""
-#: src/gui/statuspopup.cpp:259
+#: src/gui/statuspopup.cpp:260
msgid "(1) moves to target in distance 1"
msgstr ""
-#: src/gui/statuspopup.cpp:264
+#: src/gui/statuspopup.cpp:265
msgid "(2) moves to target in distance 2"
msgstr ""
-#: src/gui/statuspopup.cpp:269
+#: src/gui/statuspopup.cpp:270
msgid "(3) moves to target in distance 3"
msgstr ""
-#: src/gui/statuspopup.cpp:274
+#: src/gui/statuspopup.cpp:275
msgid "(5) moves to target in distance 5"
msgstr ""
-#: src/gui/statuspopup.cpp:279
+#: src/gui/statuspopup.cpp:280
msgid "(7) moves to target in distance 7"
msgstr ""
-#: src/gui/statuspopup.cpp:284
+#: src/gui/statuspopup.cpp:285
msgid "(A) moves to target in attack range"
msgstr ""
-#: src/gui/statuspopup.cpp:289
+#: src/gui/statuspopup.cpp:290
msgid "(?) move to target"
msgstr ""
-#: src/gui/statuspopup.cpp:297
+#: src/gui/statuspopup.cpp:298
msgid "(D) default follow"
msgstr ""
-#: src/gui/statuspopup.cpp:301
+#: src/gui/statuspopup.cpp:302
msgid "(R) relative follow"
msgstr ""
-#: src/gui/statuspopup.cpp:305
+#: src/gui/statuspopup.cpp:306
msgid "(M) mirror follow"
msgstr ""
-#: src/gui/statuspopup.cpp:309
+#: src/gui/statuspopup.cpp:310
msgid "(P) pet follow"
msgstr ""
-#: src/gui/statuspopup.cpp:313
+#: src/gui/statuspopup.cpp:314
msgid "(?) unknown follow"
msgstr ""
-#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
+#: src/gui/statuspopup.cpp:323 src/gui/statuspopup.cpp:346
msgid "(D) default attack"
msgstr ""
-#: src/gui/statuspopup.cpp:327
+#: src/gui/statuspopup.cpp:328
msgid "(s) switch attack without shield"
msgstr ""
-#: src/gui/statuspopup.cpp:332
+#: src/gui/statuspopup.cpp:333
msgid "(S) switch attack with shield"
msgstr ""
-#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
+#: src/gui/statuspopup.cpp:337 src/gui/statuspopup.cpp:362
msgid "(?) attack"
msgstr ""
-#: src/gui/statuspopup.cpp:349
+#: src/gui/statuspopup.cpp:350
msgid "(G) go and attack"
msgstr ""
-#: src/gui/statuspopup.cpp:353
+#: src/gui/statuspopup.cpp:354
msgid "(A) go, attack, pickup"
msgstr ""
-#: src/gui/statuspopup.cpp:357
+#: src/gui/statuspopup.cpp:358
msgid "(d) without auto attack"
msgstr ""
-#: src/gui/statuspopup.cpp:375
+#: src/gui/statuspopup.cpp:376
msgid "(S) small pick up 1x1 cells"
msgstr ""
-#: src/gui/statuspopup.cpp:379
+#: src/gui/statuspopup.cpp:380
msgid "(D) default pick up 2x1 cells"
msgstr ""
-#: src/gui/statuspopup.cpp:383
+#: src/gui/statuspopup.cpp:384
msgid "(F) forward pick up 2x3 cells"
msgstr ""
-#: src/gui/statuspopup.cpp:387
+#: src/gui/statuspopup.cpp:388
msgid "(3) pick up 3x3 cells"
msgstr ""
-#: src/gui/statuspopup.cpp:391
+#: src/gui/statuspopup.cpp:392
msgid "(g) go and pick up in distance 4"
msgstr ""
-#: src/gui/statuspopup.cpp:395
+#: src/gui/statuspopup.cpp:396
msgid "(G) go and pick up in distance 8"
msgstr ""
-#: src/gui/statuspopup.cpp:399
+#: src/gui/statuspopup.cpp:400
msgid "(A) go and pick up in max distance"
msgstr ""
-#: src/gui/statuspopup.cpp:403
+#: src/gui/statuspopup.cpp:404
msgid "(?) pick up"
msgstr ""
-#: src/gui/statuspopup.cpp:412
+#: src/gui/statuspopup.cpp:413
msgid "(N) normal map view"
msgstr ""
-#: src/gui/statuspopup.cpp:416
+#: src/gui/statuspopup.cpp:417
msgid "(D) debug map view"
msgstr ""
-#: src/gui/statuspopup.cpp:420
+#: src/gui/statuspopup.cpp:421
msgid "(u) ultra map view"
msgstr ""
-#: src/gui/statuspopup.cpp:424
+#: src/gui/statuspopup.cpp:425
msgid "(U) ultra map view 2"
msgstr ""
-#: src/gui/statuspopup.cpp:428
+#: src/gui/statuspopup.cpp:429
msgid "(e) empty map view"
msgstr ""
-#: src/gui/statuspopup.cpp:432
+#: src/gui/statuspopup.cpp:433
msgid "(b) black & white map view"
msgstr ""
-#: src/gui/statuspopup.cpp:436
+#: src/gui/statuspopup.cpp:437
msgid "(?) map view"
msgstr ""
-#: src/gui/statuspopup.cpp:444
+#: src/gui/statuspopup.cpp:445
msgid "(f) use #flar for magic attack"
msgstr ""
-#: src/gui/statuspopup.cpp:449
+#: src/gui/statuspopup.cpp:450
msgid "(c) use #chiza for magic attack"
msgstr ""
-#: src/gui/statuspopup.cpp:454
+#: src/gui/statuspopup.cpp:455
msgid "(I) use #ingrav for magic attack"
msgstr ""
-#: src/gui/statuspopup.cpp:459
+#: src/gui/statuspopup.cpp:460
msgid "(F) use #frillyar for magic attack"
msgstr ""
-#: src/gui/statuspopup.cpp:464
+#: src/gui/statuspopup.cpp:465
msgid "(U) use #upmarmu for magic attack"
msgstr ""
-#: src/gui/statuspopup.cpp:468
+#: src/gui/statuspopup.cpp:469
msgid "(?) magic attack"
msgstr ""
-#: src/gui/statuspopup.cpp:477
+#: src/gui/statuspopup.cpp:478
msgid "(D) default imitation"
msgstr ""
-#: src/gui/statuspopup.cpp:481
+#: src/gui/statuspopup.cpp:482
msgid "(O) outfits imitation"
msgstr ""
-#: src/gui/statuspopup.cpp:485
+#: src/gui/statuspopup.cpp:486
msgid "(?) imitation"
msgstr ""
-#: src/gui/statuspopup.cpp:494
+#: src/gui/statuspopup.cpp:495
msgid "(O) on keyboard"
msgstr ""
-#: src/gui/statuspopup.cpp:497
+#: src/gui/statuspopup.cpp:498
msgid "(A) away"
msgstr ""
-#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
+#: src/gui/statuspopup.cpp:501 src/gui/statuspopup.cpp:521
msgid "(?) away"
msgstr ""
-#: src/gui/statuspopup.cpp:508
+#: src/gui/statuspopup.cpp:509
msgid "(G) game camera mode"
msgstr ""
-#: src/gui/statuspopup.cpp:512
+#: src/gui/statuspopup.cpp:513
msgid "(F) free camera mode"
msgstr ""
-#: src/gui/statuspopup.cpp:516
+#: src/gui/statuspopup.cpp:517
msgid "(D) design camera mode"
msgstr ""
-#: src/gui/statuspopup.cpp:527
+#: src/gui/statuspopup.cpp:528
msgid "Game modifiers are disabled"
msgstr ""
-#: src/gui/statuspopup.cpp:532
+#: src/gui/statuspopup.cpp:533
msgid "Game modifiers are enabled"
msgstr ""
-#: src/gui/statuswindow.cpp:133 src/gui/statuswindow.cpp:259
-#: src/gui/statuswindow.cpp:322
+#: src/gui/statuswindow.cpp:143 src/gui/statuswindow.cpp:273
+#: src/gui/statuswindow.cpp:336
#, c-format
msgid "Level: %d"
msgstr "Livello: %d"
-#: src/gui/statuswindow.cpp:134 src/gui/statuswindow.cpp:245
-#: src/gui/statuswindow.cpp:289
+#: src/gui/statuswindow.cpp:144 src/gui/statuswindow.cpp:259
+#: src/gui/statuswindow.cpp:303
#, c-format
msgid "Money: %s"
msgstr "Soldi: %s"
-#: src/gui/statuswindow.cpp:140
+#: src/gui/statuswindow.cpp:150
msgid "HP:"
msgstr "HP:"
-#: src/gui/statuswindow.cpp:147
+#: src/gui/statuswindow.cpp:157
msgid "Exp:"
msgstr "Esperienza:"
-#: src/gui/statuswindow.cpp:161
+#: src/gui/statuswindow.cpp:171
msgid "MP:"
msgstr "MP:"
-#: src/gui/statuswindow.cpp:193 src/gui/statuswindow.cpp:372
+#: src/gui/statuswindow.cpp:203 src/gui/statuswindow.cpp:386
#, c-format
msgid "Job: %d"
msgstr "Lavoro: %d"
-#: src/gui/statuswindow.cpp:194
+#: src/gui/statuswindow.cpp:204
msgid "Job:"
msgstr "Lavoro:"
-#: src/gui/statuswindow.cpp:248 src/gui/statuswindow.cpp:296
+#: src/gui/statuswindow.cpp:262 src/gui/statuswindow.cpp:310
#, c-format
msgid "Character points: %d"
msgstr ""
-#: src/gui/statuswindow.cpp:254
+#: src/gui/statuswindow.cpp:268
#, c-format
msgid "Level: %d (GM %d)"
msgstr ""
-#: src/gui/statuswindow.cpp:310
+#: src/gui/statuswindow.cpp:324
#, c-format
msgid "Correction points: %d"
msgstr ""
-#: src/gui/statuswindow.cpp:633 src/gui/statuswindow.cpp:698
-#: src/gui/statuswindow.cpp:718 src/gui/statuswindow.cpp:734
-#: src/gui/statuswindow.cpp:780 src/gui/statuswindow.cpp:809
-#: src/gui/statuswindow.cpp:832 src/gui/statuswindow.cpp:851
+#: src/gui/statuswindow.cpp:647 src/gui/statuswindow.cpp:712
+#: src/gui/statuswindow.cpp:732 src/gui/statuswindow.cpp:748
+#: src/gui/statuswindow.cpp:794 src/gui/statuswindow.cpp:823
+#: src/gui/statuswindow.cpp:846 src/gui/statuswindow.cpp:865
msgid "(D)"
msgstr ""
-#: src/gui/statuswindow.cpp:636 src/gui/statuswindow.cpp:759
+#: src/gui/statuswindow.cpp:650 src/gui/statuswindow.cpp:773
msgid "(I)"
msgstr ""
-#: src/gui/statuswindow.cpp:639 src/gui/statuswindow.cpp:756
+#: src/gui/statuswindow.cpp:653 src/gui/statuswindow.cpp:770
msgid "(c)"
msgstr ""
-#: src/gui/statuswindow.cpp:642
+#: src/gui/statuswindow.cpp:656
msgid "(C)"
msgstr ""
-#: src/gui/statuswindow.cpp:645 src/gui/statuswindow.cpp:743
+#: src/gui/statuswindow.cpp:659 src/gui/statuswindow.cpp:757
msgid "(d)"
msgstr ""
-#: src/gui/statuswindow.cpp:648 src/gui/statuswindow.cpp:662
-#: src/gui/statuswindow.cpp:691 src/gui/statuswindow.cpp:710
-#: src/gui/statuswindow.cpp:727 src/gui/statuswindow.cpp:746
-#: src/gui/statuswindow.cpp:768 src/gui/statuswindow.cpp:798
-#: src/gui/statuswindow.cpp:824 src/gui/statuswindow.cpp:838
-#: src/gui/statuswindow.cpp:854 src/gui/statuswindow.cpp:867
+#: src/gui/statuswindow.cpp:662 src/gui/statuswindow.cpp:676
+#: src/gui/statuswindow.cpp:705 src/gui/statuswindow.cpp:724
+#: src/gui/statuswindow.cpp:741 src/gui/statuswindow.cpp:760
+#: src/gui/statuswindow.cpp:782 src/gui/statuswindow.cpp:812
+#: src/gui/statuswindow.cpp:838 src/gui/statuswindow.cpp:852
+#: src/gui/statuswindow.cpp:868 src/gui/statuswindow.cpp:881
msgid "(?)"
msgstr ""
-#: src/gui/statuswindow.cpp:659
+#: src/gui/statuswindow.cpp:673
msgid "(a)"
msgstr ""
-#: src/gui/statuswindow.cpp:670
+#: src/gui/statuswindow.cpp:684
msgid "(0)"
msgstr ""
-#: src/gui/statuswindow.cpp:673
+#: src/gui/statuswindow.cpp:687
msgid "(1)"
msgstr ""
-#: src/gui/statuswindow.cpp:676
+#: src/gui/statuswindow.cpp:690
msgid "(2)"
msgstr ""
-#: src/gui/statuswindow.cpp:679 src/gui/statuswindow.cpp:786
+#: src/gui/statuswindow.cpp:693 src/gui/statuswindow.cpp:800
msgid "(3)"
msgstr ""
-#: src/gui/statuswindow.cpp:682
+#: src/gui/statuswindow.cpp:696
msgid "(5)"
msgstr ""
-#: src/gui/statuswindow.cpp:685
+#: src/gui/statuswindow.cpp:699
msgid "(7)"
msgstr ""
-#: src/gui/statuswindow.cpp:688 src/gui/statuswindow.cpp:740
-#: src/gui/statuswindow.cpp:795 src/gui/statuswindow.cpp:864
+#: src/gui/statuswindow.cpp:702 src/gui/statuswindow.cpp:754
+#: src/gui/statuswindow.cpp:809 src/gui/statuswindow.cpp:878
msgid "(A)"
msgstr ""
-#: src/gui/statuswindow.cpp:701
+#: src/gui/statuswindow.cpp:715
msgid "(R)"
msgstr ""
-#: src/gui/statuswindow.cpp:704
+#: src/gui/statuswindow.cpp:718
msgid "(M)"
msgstr ""
-#: src/gui/statuswindow.cpp:707
+#: src/gui/statuswindow.cpp:721
msgid "(P)"
msgstr ""
-#: src/gui/statuswindow.cpp:721
+#: src/gui/statuswindow.cpp:735
msgid "(s)"
msgstr ""
-#: src/gui/statuswindow.cpp:724 src/gui/statuswindow.cpp:777
+#: src/gui/statuswindow.cpp:738 src/gui/statuswindow.cpp:791
msgid "(S)"
msgstr ""
-#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:792
-#: src/gui/statuswindow.cpp:845
+#: src/gui/statuswindow.cpp:751 src/gui/statuswindow.cpp:806
+#: src/gui/statuswindow.cpp:859
msgid "(G)"
msgstr ""
-#: src/gui/statuswindow.cpp:753
+#: src/gui/statuswindow.cpp:767
msgid "(f)"
msgstr ""
-#: src/gui/statuswindow.cpp:762 src/gui/statuswindow.cpp:783
-#: src/gui/statuswindow.cpp:848
+#: src/gui/statuswindow.cpp:776 src/gui/statuswindow.cpp:797
+#: src/gui/statuswindow.cpp:862
msgid "(F)"
msgstr ""
-#: src/gui/statuswindow.cpp:765 src/gui/statuswindow.cpp:815
+#: src/gui/statuswindow.cpp:779 src/gui/statuswindow.cpp:829
msgid "(U)"
msgstr ""
-#: src/gui/statuswindow.cpp:789
+#: src/gui/statuswindow.cpp:803
msgid "(g)"
msgstr ""
-#: src/gui/statuswindow.cpp:806
+#: src/gui/statuswindow.cpp:820
msgid "(N)"
msgstr ""
-#: src/gui/statuswindow.cpp:812
+#: src/gui/statuswindow.cpp:826
msgid "(u)"
msgstr ""
-#: src/gui/statuswindow.cpp:818
+#: src/gui/statuswindow.cpp:832
msgid "(e)"
msgstr ""
-#: src/gui/statuswindow.cpp:821
+#: src/gui/statuswindow.cpp:835
msgid "(b)"
msgstr ""
-#: src/gui/statuswindow.cpp:835 src/gui/statuswindow.cpp:861
+#: src/gui/statuswindow.cpp:849 src/gui/statuswindow.cpp:875
msgid "(O)"
msgstr ""
@@ -3224,62 +3258,62 @@ msgstr "Accettato. In attesa..."
msgid "Trade: You"
msgstr "Commercia: Tu"
-#: src/gui/tradewindow.cpp:110 src/gui/tradewindow.cpp:166
+#: src/gui/tradewindow.cpp:111 src/gui/tradewindow.cpp:167
#, c-format
msgid "You get %s"
msgstr ""
-#: src/gui/tradewindow.cpp:111
+#: src/gui/tradewindow.cpp:112
msgid "You give:"
msgstr "Dai:"
-#: src/gui/tradewindow.cpp:115
+#: src/gui/tradewindow.cpp:116
msgid "Change"
msgstr "Cambia"
-#: src/gui/tradewindow.cpp:332
+#: src/gui/tradewindow.cpp:375
+msgid "You don't have enough money."
+msgstr "Non hai abbastanza denaro."
+
+#: src/gui/tradewindow.cpp:454
msgid ""
"Failed adding item. You can not overlap one kind of item on the window."
msgstr ""
"Aggiunta dell'oggetto fallita. Non puoi sovrapporre un tipo di oggetto sulla"
" finestra."
-#: src/gui/tradewindow.cpp:377
-msgid "You don't have enough money."
-msgstr "Non hai abbastanza denaro."
-
#: src/gui/unregisterdialog.cpp:54
#, c-format
msgid "Name: %s"
msgstr "Nome: %s"
-#: src/gui/updatewindow.cpp:136
+#: src/gui/updaterwindow.cpp:138
msgid "Updating..."
msgstr "Aggiornamento..."
-#: src/gui/updatewindow.cpp:155
+#: src/gui/updaterwindow.cpp:159
msgid "Connecting..."
msgstr "Connessione..."
-#: src/gui/updatewindow.cpp:158
+#: src/gui/updaterwindow.cpp:162
msgid "Play"
msgstr "Gioca"
-#: src/gui/updatewindow.cpp:556
+#: src/gui/updaterwindow.cpp:564
msgid "##1 The update process is incomplete."
msgstr "##1 L'aggiornamento è stato completato."
#. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updatewindow.cpp:558
+#: src/gui/updaterwindow.cpp:566
msgid "##1 It is strongly recommended that"
msgstr "##1 È fortemente raccomandato"
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updatewindow.cpp:560
+#: src/gui/updaterwindow.cpp:568
msgid "##1 you try again later."
msgstr ""
-#: src/gui/updatewindow.cpp:686
+#: src/gui/updaterwindow.cpp:744
msgid "Completed"
msgstr "Completato"
@@ -3431,23 +3465,23 @@ msgstr ""
msgid "Road Point"
msgstr ""
-#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:471
+#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:472
msgid "Who Is Online - Updating"
msgstr ""
-#: src/gui/whoisonline.cpp:101
+#: src/gui/whoisonline.cpp:102
msgid "Update"
msgstr ""
-#: src/gui/whoisonline.cpp:294
+#: src/gui/whoisonline.cpp:295
msgid "Who Is Online - "
msgstr ""
-#: src/gui/whoisonline.cpp:485
+#: src/gui/whoisonline.cpp:486
msgid "Who Is Online - error"
msgstr ""
-#: src/gui/whoisonline.cpp:516
+#: src/gui/whoisonline.cpp:517
msgid "Who Is Online - Update"
msgstr ""
@@ -3512,7 +3546,8 @@ msgid "This command makes <nick> a channel operator."
msgstr "Questo comando rende <nick> un operatore del canale"
#: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
-#: src/net/ea/gui/guildtab.cpp:69 src/net/ea/gui/partytab.cpp:85
+#: src/gui/widgets/guildchattab.cpp:61 src/net/ea/gui/guildtab.cpp:69
+#: src/net/ea/gui/partytab.cpp:85
msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
msgstr "Se il <nick> contiene spazi, racchiuderlo tra virgolette (\")."
@@ -3552,6 +3587,45 @@ msgstr "Annuncio generale da %s:"
msgid "%s whispers: %s"
msgstr ""
+#: src/gui/widgets/guildchattab.cpp:59 src/net/ea/gui/guildtab.cpp:67
+#: src/net/ea/gui/partytab.cpp:83
+msgid "Command: /invite <nick>"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:60 src/net/ea/gui/guildtab.cpp:68
+msgid "This command invites <nick> to the guild you're in."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:66 src/net/ea/gui/guildtab.cpp:74
+#: src/net/ea/gui/partytab.cpp:90
+msgid "Command: /leave"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:67 src/net/ea/gui/guildtab.cpp:75
+msgid "This command causes the player to leave the guild."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:109 src/net/ea/gui/guildtab.cpp:135
+#: src/net/ea/gui/partytab.cpp:69
+msgid "/help > Display this help."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:110 src/net/ea/gui/guildtab.cpp:136
+msgid "/invite > Invite a player to your guild"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:111 src/net/ea/gui/guildtab.cpp:137
+msgid "/leave > Leave the guild you are in"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:112 src/net/ea/gui/guildtab.cpp:138
+msgid "/kick > Kick some one from the guild you are in"
+msgstr ""
+
+#: src/gui/widgets/setupitem.cpp:271 src/gui/widgets/setupitem.cpp:394
+msgid "Edit"
+msgstr ""
+
#: src/gui/widgets/whispertab.cpp:107
msgid "/ignore > Ignore the other player"
msgstr ""
@@ -3681,11 +3755,11 @@ msgstr ""
msgid "Choose World"
msgstr ""
-#: src/inventory.cpp:248
+#: src/inventory.cpp:251
msgid "Storage"
msgstr ""
-#: src/inventory.cpp:250
+#: src/inventory.cpp:253
msgid "Cart"
msgstr ""
@@ -4078,68 +4152,68 @@ msgid ""
"strange behaviour."
msgstr ""
-#: src/localplayer.cpp:371
+#: src/localplayer.cpp:370
msgid "You were killed by "
msgstr ""
-#: src/localplayer.cpp:1402
+#: src/localplayer.cpp:1401
msgid "Tried to pick up nonexistent item."
msgstr ""
-#: src/localplayer.cpp:1404
+#: src/localplayer.cpp:1403
msgid "Item is too heavy."
msgstr ""
-#: src/localplayer.cpp:1406
+#: src/localplayer.cpp:1405
msgid "Item is too far away."
msgstr ""
-#: src/localplayer.cpp:1408
+#: src/localplayer.cpp:1407
msgid "Inventory is full."
msgstr ""
-#: src/localplayer.cpp:1410
+#: src/localplayer.cpp:1409
msgid "Stack is too big."
msgstr ""
-#: src/localplayer.cpp:1413
+#: src/localplayer.cpp:1412
msgid "Item belongs to someone else."
msgstr ""
-#: src/localplayer.cpp:1416
+#: src/localplayer.cpp:1415
msgid "Unknown problem picking up item."
msgstr ""
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1440
+#: src/localplayer.cpp:1439
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
msgstr[0] ""
msgstr[1] ""
-#: src/localplayer.cpp:3174
+#: src/localplayer.cpp:3173
msgid "Away"
msgstr ""
-#: src/localplayer.cpp:3478
+#: src/localplayer.cpp:3474
msgid "Follow: "
msgstr ""
-#: src/localplayer.cpp:3480 src/localplayer.cpp:3495
+#: src/localplayer.cpp:3476 src/localplayer.cpp:3491
msgid "Follow canceled"
msgstr ""
-#: src/localplayer.cpp:3487
+#: src/localplayer.cpp:3483
msgid "Imitation: "
msgstr ""
-#: src/localplayer.cpp:3489 src/localplayer.cpp:3497
+#: src/localplayer.cpp:3485 src/localplayer.cpp:3493
msgid "Imitation canceled"
msgstr ""
-#: src/localplayer.cpp:3849
+#: src/localplayer.cpp:3845
msgid "You see "
msgstr ""
@@ -4315,28 +4389,28 @@ msgstr ""
msgid "Failed to delete character."
msgstr ""
-#: src/net/ea/chathandler.cpp:60 src/net/ea/chathandler.cpp:66
-#: src/net/ea/chathandler.cpp:71 src/net/ea/chathandler.cpp:77
-#: src/net/ea/chathandler.cpp:82 src/net/ea/chathandler.cpp:88
-#: src/net/ea/chathandler.cpp:95 src/net/ea/chathandler.cpp:101
+#: src/net/ea/chathandler.cpp:61 src/net/ea/chathandler.cpp:67
+#: src/net/ea/chathandler.cpp:72 src/net/ea/chathandler.cpp:78
+#: src/net/ea/chathandler.cpp:83 src/net/ea/chathandler.cpp:89
+#: src/net/ea/chathandler.cpp:96 src/net/ea/chathandler.cpp:102
msgid "Channels are not supported!"
msgstr ""
-#: src/net/ea/chathandler.cpp:128
+#: src/net/ea/chathandler.cpp:129
#, c-format
msgid "Whisper could not be sent, %s is offline."
msgstr ""
-#: src/net/ea/chathandler.cpp:136
+#: src/net/ea/chathandler.cpp:137
#, c-format
msgid "Whisper could not be sent, ignored by %s."
msgstr ""
-#: src/net/ea/chathandler.cpp:348
+#: src/net/ea/chathandler.cpp:355
msgid "MVP player."
msgstr ""
-#: src/net/ea/chathandler.cpp:352
+#: src/net/ea/chathandler.cpp:359
msgid "MVP player: "
msgstr ""
@@ -4353,38 +4427,6 @@ msgstr ""
msgid "Request to quit denied!"
msgstr ""
-#: src/net/ea/gui/guildtab.cpp:67 src/net/ea/gui/partytab.cpp:83
-msgid "Command: /invite <nick>"
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:68
-msgid "This command invites <nick> to the guild you're in."
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:74 src/net/ea/gui/partytab.cpp:90
-msgid "Command: /leave"
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:75
-msgid "This command causes the player to leave the guild."
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:135 src/net/ea/gui/partytab.cpp:69
-msgid "/help > Display this help."
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:136
-msgid "/invite > Invite a player to your guild"
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:137
-msgid "/leave > Leave the guild you are in"
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:138
-msgid "/kick > Kick some one from the guild you are in"
-msgstr ""
-
#: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
msgid "Guild created."
msgstr "La gilda è stata creata."
@@ -4401,85 +4443,81 @@ msgstr ""
msgid "Unknown server response."
msgstr ""
-#: src/net/ea/guildhandler.cpp:180
+#: src/net/ea/guildhandler.cpp:181
#, c-format
msgid "Guild name: %s"
msgstr ""
-#: src/net/ea/guildhandler.cpp:182
+#: src/net/ea/guildhandler.cpp:183
#, c-format
msgid "Guild master: %s"
msgstr ""
-#: src/net/ea/guildhandler.cpp:184
+#: src/net/ea/guildhandler.cpp:185
#, c-format
msgid "Guild level: %d"
msgstr ""
-#: src/net/ea/guildhandler.cpp:186
+#: src/net/ea/guildhandler.cpp:187
#, c-format
msgid "Online members: %d"
msgstr ""
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:189
#, c-format
msgid "Max members: %d"
msgstr ""
-#: src/net/ea/guildhandler.cpp:190
+#: src/net/ea/guildhandler.cpp:191
#, c-format
msgid "Average level: %d"
msgstr ""
-#: src/net/ea/guildhandler.cpp:192
+#: src/net/ea/guildhandler.cpp:193
#, c-format
msgid "Guild exp: %d"
msgstr ""
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:195
#, c-format
msgid "Guild next exp: %d"
msgstr ""
-#: src/net/ea/guildhandler.cpp:196
+#: src/net/ea/guildhandler.cpp:197
#, c-format
msgid "Guild castle: %s"
msgstr ""
-#: src/net/ea/guildhandler.cpp:402
+#: src/net/ea/guildhandler.cpp:403
msgid "Could not inivte user to guild."
msgstr ""
-#: src/net/ea/guildhandler.cpp:406
+#: src/net/ea/guildhandler.cpp:407
msgid "User rejected guild invite."
msgstr ""
-#: src/net/ea/guildhandler.cpp:410
+#: src/net/ea/guildhandler.cpp:411
msgid "User is now part of your guild."
msgstr ""
-#: src/net/ea/guildhandler.cpp:414
+#: src/net/ea/guildhandler.cpp:415
msgid "Your guild is full."
msgstr ""
-#: src/net/ea/guildhandler.cpp:418
+#: src/net/ea/guildhandler.cpp:419
msgid "Unknown guild invite response."
msgstr ""
-#: src/net/ea/guildhandler.cpp:438
-msgid "You have left the guild."
-msgstr ""
-
-#: src/net/ea/guildhandler.cpp:452
+#: src/net/ea/guildhandler.cpp:453
#, c-format
msgid "%s has left your guild."
msgstr ""
-#: src/net/ea/guildhandler.cpp:483
+#: src/net/ea/guildhandler.cpp:484
msgid "You was kicked from guild."
msgstr ""
-#: src/net/ea/guildhandler.cpp:496
+#: src/net/ea/guildhandler.cpp:497
#, c-format
msgid "%s has kicked from your guild."
msgstr ""
@@ -4701,12 +4739,12 @@ msgstr ""
msgid "You have left the party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:368
+#: src/net/ea/partyhandler.cpp:369
#, c-format
msgid "%s has left your party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:444
+#: src/net/ea/partyhandler.cpp:448
#, c-format
msgid "An unknown member tried to say: %s"
msgstr ""
@@ -4832,7 +4870,7 @@ msgid "You're pining for the fjords."
msgstr ""
#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
-#: src/net/ea/playerhandler.cpp:425
+#: src/net/ea/playerhandler.cpp:428
msgid "Message"
msgstr ""
@@ -4846,21 +4884,21 @@ msgstr ""
msgid "You are carrying less than half your weight. You can regain health."
msgstr ""
-#: src/net/ea/playerhandler.cpp:451
+#: src/net/ea/playerhandler.cpp:454
#, c-format
msgid "You picked up %s."
msgstr ""
-#: src/net/ea/playerhandler.cpp:457
+#: src/net/ea/playerhandler.cpp:460
#, c-format
msgid "You spent %s."
msgstr ""
-#: src/net/ea/playerhandler.cpp:501
+#: src/net/ea/playerhandler.cpp:506
msgid "Cannot raise skill!"
msgstr ""
-#: src/net/ea/playerhandler.cpp:618
+#: src/net/ea/playerhandler.cpp:624
msgid "Equip arrows first."
msgstr ""
@@ -4999,7 +5037,7 @@ msgstr "Scambio cancellato."
msgid "Trade completed."
msgstr "Scambio completato."
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:258
msgid "Strength"
msgstr "Forza"
@@ -5008,7 +5046,7 @@ msgstr "Forza"
msgid "Strength %+.1f"
msgstr ""
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:259
msgid "Agility"
msgstr "Agilità"
@@ -5017,7 +5055,7 @@ msgstr "Agilità"
msgid "Agility %+.1f"
msgstr ""
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:262
msgid "Dexterity"
msgstr "Destrezza"
@@ -5026,7 +5064,7 @@ msgstr "Destrezza"
msgid "Dexterity %+.1f"
msgstr ""
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:260
msgid "Vitality"
msgstr "Vitalità"
@@ -5035,7 +5073,7 @@ msgstr "Vitalità"
msgid "Vitality %+.1f"
msgstr ""
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:261
msgid "Intelligence"
msgstr "Intelligenza"
@@ -5305,111 +5343,115 @@ msgstr ""
msgid "Unable to sell unsellable item."
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:109
+#: src/net/tmwa/generalhandler.cpp:108
#, c-format
msgid "Strength %+d"
msgstr "Forza %+d"
-#: src/net/tmwa/generalhandler.cpp:110
+#: src/net/tmwa/generalhandler.cpp:109
#, c-format
msgid "Agility %+d"
msgstr "Agilità %+d"
-#: src/net/tmwa/generalhandler.cpp:111
+#: src/net/tmwa/generalhandler.cpp:110
#, c-format
msgid "Vitality %+d"
msgstr "Vitalità %+d"
-#: src/net/tmwa/generalhandler.cpp:112
+#: src/net/tmwa/generalhandler.cpp:111
#, c-format
msgid "Intelligence %+d"
msgstr "Intelligenza %+d"
-#: src/net/tmwa/generalhandler.cpp:113
+#: src/net/tmwa/generalhandler.cpp:112
#, c-format
msgid "Dexterity %+d"
msgstr "Destrezza %+d"
-#: src/net/tmwa/generalhandler.cpp:114
+#: src/net/tmwa/generalhandler.cpp:113
#, c-format
msgid "Luck %+d"
msgstr "Fortuna %+d"
-#: src/net/tmwa/generalhandler.cpp:140
+#: src/net/tmwa/generalhandler.cpp:139
msgid "Authentication failed."
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:143
+#: src/net/tmwa/generalhandler.cpp:142
msgid "No servers available."
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:147
+#: src/net/tmwa/generalhandler.cpp:146
msgid "Someone else is trying to use this account."
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:150
+#: src/net/tmwa/generalhandler.cpp:149
msgid "This account is already logged in."
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:153
+#: src/net/tmwa/generalhandler.cpp:152
msgid "Speed hack detected."
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:156
+#: src/net/tmwa/generalhandler.cpp:155
msgid "Duplicated login."
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:159
+#: src/net/tmwa/generalhandler.cpp:158
msgid "Unknown connection error."
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:232
+#: src/net/tmwa/generalhandler.cpp:231
msgid "Got disconnected from server!"
msgstr "Disconnesso dal server!"
-#: src/net/tmwa/generalhandler.cpp:264
+#: src/net/tmwa/generalhandler.cpp:263
msgid "Luck"
msgstr "Fortuna"
-#: src/net/tmwa/generalhandler.cpp:267
+#: src/net/tmwa/generalhandler.cpp:266
msgid "Defense"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:268
+#: src/net/tmwa/generalhandler.cpp:267
msgid "M.Attack"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:269
+#: src/net/tmwa/generalhandler.cpp:268
msgid "M.Defense"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:271
+#: src/net/tmwa/generalhandler.cpp:270
#, no-c-format
msgid "% Accuracy"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:273
+#: src/net/tmwa/generalhandler.cpp:272
#, no-c-format
msgid "% Evade"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:275
+#: src/net/tmwa/generalhandler.cpp:274
#, no-c-format
msgid "% Critical"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:276
+#: src/net/tmwa/generalhandler.cpp:275
msgid "Attack Delay"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:278
+#: src/net/tmwa/generalhandler.cpp:277
msgid "Walk Delay"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:280
+#: src/net/tmwa/generalhandler.cpp:279
msgid "Attack Range"
msgstr ""
+#: src/net/tmwa/generalhandler.cpp:281
+msgid "Damage per sec."
+msgstr ""
+
#: src/net/tmwa/network.cpp:152
msgid "Empty address given to Network::connect()!"
msgstr ""
@@ -5443,32 +5485,32 @@ msgstr ""
msgid "Floating bubble"
msgstr ""
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:248
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:246
#: src/resources/monsterdb.cpp:84
msgid "unnamed"
msgstr ""
-#: src/resources/itemdb.cpp:65
+#: src/resources/itemdb.cpp:63
#, c-format
msgid "Attack %+d"
msgstr "Attacco %+d"
-#: src/resources/itemdb.cpp:66
+#: src/resources/itemdb.cpp:64
#, c-format
msgid "Defense %+d"
msgstr "Difesa %+d"
-#: src/resources/itemdb.cpp:67
+#: src/resources/itemdb.cpp:65
#, c-format
msgid "HP %+d"
msgstr "PF %+d"
-#: src/resources/itemdb.cpp:68
+#: src/resources/itemdb.cpp:66
#, c-format
msgid "MP %+d"
msgstr "PM %+d"
-#: src/resources/itemdb.cpp:171
+#: src/resources/itemdb.cpp:169
msgid "Unknown item"
msgstr "Oggetto sconosciuto"
diff --git a/po/ja.po b/po/ja.po
index 4832693a3..7b964a5ec 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-20 17:42+0300\n"
-"PO-Revision-Date: 2011-08-16 16:09+0000\n"
+"POT-Creation-Date: 2011-09-02 18:27+0300\n"
+"PO-Revision-Date: 2011-09-02 15:29+0000\n"
"Last-Translator: akaras <akaras@inbox.ru>\n"
"Language-Team: Japanese (http://www.transifex.net/projects/p/manaplus/team/"
"ja/)\n"
@@ -25,119 +25,119 @@ msgstr ""
msgid "Visible on map"
msgstr ""
-#: src/being.cpp:542
+#: src/being.cpp:549
msgid "dodge"
msgstr "ドッジ"
-#: src/being.cpp:542
+#: src/being.cpp:549
msgid "miss"
msgstr "ミス"
#. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1514
+#: src/being.cpp:1529
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1519
+#: src/being.cpp:1534
msgid "I"
msgstr ""
-#: src/client.cpp:826 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:831 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
msgid "Setup"
msgstr "設定"
-#: src/client.cpp:909
+#: src/client.cpp:914
msgid "Connecting to server"
msgstr "サーバー通信中…"
-#: src/client.cpp:940
+#: src/client.cpp:945
msgid "Logging in"
msgstr "ログイン中…"
-#: src/client.cpp:973
+#: src/client.cpp:978
msgid "Entering game world"
msgstr "ゲームの世界に入る中"
-#: src/client.cpp:1073
+#: src/client.cpp:1078
msgid "Requesting characters"
msgstr "服:%d"
-#: src/client.cpp:1104
+#: src/client.cpp:1109
msgid "Connecting to the game server"
msgstr "ゲームサーバー通信中…"
-#: src/client.cpp:1114
+#: src/client.cpp:1119
msgid "Changing game servers"
msgstr "サーバーを入り替え中…"
-#: src/client.cpp:1151 src/client.cpp:1158 src/client.cpp:1293
+#: src/client.cpp:1156 src/client.cpp:1163 src/client.cpp:1298
#: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
-#: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:395
+#: src/gui/charcreatedialog.cpp:221 src/gui/charselectdialog.cpp:253
+#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
#: src/net/manaserv/charhandler.cpp:227
msgid "Error"
msgstr "エラー"
-#: src/client.cpp:1167
+#: src/client.cpp:1172
msgid "Requesting registration details"
msgstr "登録細目を要請中"
-#: src/client.cpp:1194
+#: src/client.cpp:1199
msgid "Password Change"
msgstr "パスワード変更"
-#: src/client.cpp:1195
+#: src/client.cpp:1200
msgid "Password changed successfully!"
msgstr "パスワード変更成功!"
-#: src/client.cpp:1214
+#: src/client.cpp:1219
msgid "Email Change"
msgstr "メール変更"
-#: src/client.cpp:1215
+#: src/client.cpp:1220
msgid "Email changed successfully!"
msgstr "メール変更成功!"
-#: src/client.cpp:1235
+#: src/client.cpp:1240
msgid "Unregister Successful"
msgstr "登録解除成功"
-#: src/client.cpp:1236
+#: src/client.cpp:1241
msgid "Farewell, come back any time..."
msgstr "さよなら、いつでも戻ってね..."
-#: src/client.cpp:1423 src/client.cpp:1453 src/client.cpp:1497
-#: src/client.cpp:1922 src/client.cpp:1929
+#: src/client.cpp:1428 src/client.cpp:1458 src/client.cpp:1502
+#: src/client.cpp:1927 src/client.cpp:1934
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%s は存在しないので作成することが不可能!終了中…"
-#: src/client.cpp:1628
+#: src/client.cpp:1633
#, c-format
msgid "Invalid update host: %s"
msgstr "無効なアップデートホスト: %s"
-#: src/client.cpp:1662 src/client.cpp:1668
+#: src/client.cpp:1667 src/client.cpp:1673
msgid "Error creating updates directory!"
msgstr "更新フォルダの作成エラー"
-#: src/client.cpp:1689
+#: src/client.cpp:1694
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "エラー: %s は存在しないので作成することが不可能!終了中…"
-#: src/commandhandler.cpp:301
+#: src/commandhandler.cpp:303
msgid "Unknown command."
msgstr "不明なコマンド"
-#: src/commandhandler.cpp:401
+#: src/commandhandler.cpp:403
msgid "Cannot send empty whispers!"
msgstr "空のメッセージを送信することはできません!"
-#: src/commandhandler.cpp:415
+#: src/commandhandler.cpp:417
#, c-format
msgid ""
"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -146,147 +146,147 @@ msgstr ""
"%sと言うメッセージタブの作成ができません!それはもう既に存在しているか、自分"
"です。"
-#: src/commandhandler.cpp:435
+#: src/commandhandler.cpp:437
#, c-format
msgid "Requesting to join channel %s."
msgstr "%sというチャンネルへの参加を要求しています。"
-#: src/commandhandler.cpp:451 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:453 src/net/ea/gui/partytab.cpp:125
msgid "Party name is missing."
msgstr "パーティ名がない。"
-#: src/commandhandler.cpp:462
+#: src/commandhandler.cpp:464
msgid "Guild name is missing."
msgstr "ギルド名がない。"
-#: src/commandhandler.cpp:475 src/commandhandler.cpp:582
-#: src/commandhandler.cpp:623 src/commandhandler.cpp:653
+#: src/commandhandler.cpp:477 src/commandhandler.cpp:589
+#: src/commandhandler.cpp:630 src/commandhandler.cpp:660
msgid "Please specify a name."
msgstr "名前を教えてください。"
-#: src/commandhandler.cpp:516
+#: src/commandhandler.cpp:523
msgid "Return toggles chat."
msgstr "リターンはチャットを留めておきます。"
-#: src/commandhandler.cpp:516
+#: src/commandhandler.cpp:523
msgid "Message closes chat."
msgstr "メッセージはチャットを閉じます。"
-#: src/commandhandler.cpp:527
+#: src/commandhandler.cpp:534
msgid "Return now toggles chat."
msgstr "リターンはこれからチャットを留めておきます。"
-#: src/commandhandler.cpp:533
+#: src/commandhandler.cpp:540
msgid "Message now closes chat."
msgstr "メッセージはこれからチャットを閉じます。"
-#: src/commandhandler.cpp:561
+#: src/commandhandler.cpp:568
msgid "friend"
msgstr "友達"
-#: src/commandhandler.cpp:566
+#: src/commandhandler.cpp:573
msgid "disregarded"
msgstr "無視"
-#: src/commandhandler.cpp:571
+#: src/commandhandler.cpp:578
msgid "neutral"
msgstr "中性"
-#: src/commandhandler.cpp:590
+#: src/commandhandler.cpp:597
#, c-format
msgid "Player already %s!"
msgstr "プレイヤーはもう%s!"
-#: src/commandhandler.cpp:604
+#: src/commandhandler.cpp:611
#, c-format
msgid "Player successfully %s!"
msgstr "プレイヤーは%s成功!"
-#: src/commandhandler.cpp:612
+#: src/commandhandler.cpp:619
#, c-format
msgid "Player could not be %s!"
msgstr "選手は%sを居られなかった "
-#: src/commandhandler.cpp:634
+#: src/commandhandler.cpp:641
msgid "Player wasn't ignored!"
msgstr "プレイヤーは無視されなかった!"
-#: src/commandhandler.cpp:641
+#: src/commandhandler.cpp:648
msgid "Player no longer ignored!"
msgstr "プレイヤーはもう無視していない!"
-#: src/commandhandler.cpp:643
+#: src/commandhandler.cpp:650
msgid "Player could not be unignored!"
msgstr "Playerはunignoredことができなかった!"
-#: src/commandhandler.cpp:660
+#: src/commandhandler.cpp:667
msgid "Player already erased!"
msgstr "プレイヤーはもう消している!"
-#: src/commandhandler.cpp:671
+#: src/commandhandler.cpp:678
msgid "Player successfully erased!"
msgstr "プレーアが首尾よくに消去!"
-#: src/commandhandler.cpp:673
+#: src/commandhandler.cpp:680
msgid "Player could not be erased!"
msgstr ""
-#: src/commandhandler.cpp:972 src/commandhandler.cpp:1018
+#: src/commandhandler.cpp:980 src/commandhandler.cpp:1026
#, c-format
msgid "Client uptime: %s"
msgstr "クライアントの稼働時間:%s"
-#: src/commandhandler.cpp:982
+#: src/commandhandler.cpp:990
#, c-format
msgid "%d week"
msgid_plural "%d weeks"
msgstr[0] ""
-#: src/commandhandler.cpp:991
+#: src/commandhandler.cpp:999
#, c-format
msgid "%d day"
msgid_plural "%d days"
msgstr[0] ""
-#: src/commandhandler.cpp:999
+#: src/commandhandler.cpp:1007
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] ""
-#: src/commandhandler.cpp:1007
+#: src/commandhandler.cpp:1015
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] ""
-#: src/commandhandler.cpp:1015
+#: src/commandhandler.cpp:1023
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
msgstr[0] ""
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1102
msgid "font cache size"
msgstr ""
-#: src/commandhandler.cpp:1106
+#: src/commandhandler.cpp:1114
msgid "Cache size:"
msgstr ""
-#: src/commandhandler.cpp:1110
+#: src/commandhandler.cpp:1118
msgid "Created:"
msgstr ""
-#: src/commandhandler.cpp:1112
+#: src/commandhandler.cpp:1120
msgid "Deleted:"
msgstr ""
-#: src/commandhandler.cpp:1159 src/commandhandler.cpp:1166
+#: src/commandhandler.cpp:1167 src/commandhandler.cpp:1174
msgid "Resource images:"
msgstr ""
-#: src/commandhandler.cpp:1161 src/commandhandler.cpp:1168
+#: src/commandhandler.cpp:1169 src/commandhandler.cpp:1176
msgid "Resource orphaned images:"
msgstr ""
@@ -297,43 +297,43 @@ msgstr ""
"/%sへの可能なオプションは:\"yes\", \"no\", \"true\", \"false\", \"1\", "
"\"0\"。"
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:411
+#: src/game.cpp:252 src/gui/widgets/chattab.cpp:409
msgid "General"
msgstr "一般"
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:413
+#: src/game.cpp:256 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:411
msgid "Debug"
msgstr "デバッグ"
-#: src/game.cpp:488
+#: src/game.cpp:511
msgid "Screenshot saved as "
msgstr ""
-#: src/game.cpp:496
+#: src/game.cpp:519
msgid "Saving screenshot failed!"
msgstr "スクリーンショットを保存することに失敗しました!"
-#: src/game.cpp:536
+#: src/game.cpp:559
msgid "The connection to the server was lost."
msgstr ""
-#: src/game.cpp:548
+#: src/game.cpp:571
msgid "Network Error"
msgstr "ネットワークエラー"
-#: src/game.cpp:1213
+#: src/game.cpp:1236
msgid "Ignoring incoming trade requests"
msgstr "他人からのトレードリクエストを無視します。"
-#: src/game.cpp:1220
+#: src/game.cpp:1243
msgid "Accepting incoming trade requests"
msgstr "他人からのトレードリクエストを受け入れます。"
-#: src/game.cpp:1606
+#: src/game.cpp:1629
msgid "Could Not Load Map"
msgstr "マップをロードできませんでした"
-#: src/game.cpp:1607
+#: src/game.cpp:1630
#, c-format
msgid "Error while loading %s"
msgstr "%sをロードしている間にエラーが起きました。"
@@ -362,103 +362,103 @@ msgstr ""
msgid "Bot Checker"
msgstr "ボット"
-#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
+#: src/gui/botcheckerwindow.cpp:295 src/gui/setup_relations.cpp:64
msgid "Name"
msgstr "名前"
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:134
-#: src/gui/popupmenu.cpp:292 src/gui/popupmenu.cpp:617
-#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
+#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:133
+#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:646
+#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:265
msgid "Attack"
msgstr "攻撃"
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:279
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:297
#: src/keyboardconfig.cpp:62
msgid "Talk"
msgstr "話す"
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:245
-#: src/gui/popupmenu.cpp:284 src/gui/popupmenu.cpp:674
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:263
+#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:703
msgid "Move"
msgstr "動く"
-#: src/gui/botcheckerwindow.cpp:300
+#: src/gui/botcheckerwindow.cpp:299
msgid "Result"
msgstr "結果"
-#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123
+#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:124
msgid "Reset"
msgstr "リセット"
-#: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:260
-#: src/gui/popupmenu.cpp:281 src/gui/popupmenu.cpp:688
+#: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:98
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:278
+#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:717
msgid "Buy"
msgstr "買う"
-#: src/gui/buydialog.cpp:88 src/gui/buydialog.cpp:302
-#: src/gui/selldialog.cpp:87 src/gui/selldialog.cpp:324
+#: src/gui/buydialog.cpp:89 src/gui/buydialog.cpp:303
+#: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
#, c-format
msgid "Price: %s / Total: %s"
msgstr "価格:%s /合計:%s"
#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
#. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:93 src/gui/itemamountwindow.cpp:207
-#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:113
-#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:974
+#: src/gui/buydialog.cpp:94 src/gui/itemamountwindow.cpp:207
+#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:973
msgid "+"
msgstr "+"
#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
#. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:96 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:986
+#: src/gui/buydialog.cpp:97 src/gui/itemamountwindow.cpp:206
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:985
msgid "-"
msgstr "-"
-#: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
-#: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
-#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:288
+#: src/gui/buydialog.cpp:99 src/gui/quitdialog.cpp:47
+#: src/gui/quitdialog.cpp:49 src/gui/quitdialog.cpp:50
+#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:294
#: src/keyboardconfig.cpp:290
msgid "Quit"
msgstr "終了"
-#: src/gui/buydialog.cpp:99 src/gui/selldialog.cpp:94
-#: src/gui/statuswindow.cpp:503 src/gui/statuswindow.cpp:552
-#: src/gui/statuswindow.cpp:973 src/gui/statuswindow.cpp:1004
+#: src/gui/buydialog.cpp:100 src/gui/selldialog.cpp:95
+#: src/gui/statuswindow.cpp:504 src/gui/statuswindow.cpp:553
+#: src/gui/statuswindow.cpp:972 src/gui/statuswindow.cpp:1003
msgid "Max"
msgstr "最大"
#: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:133
+#: src/gui/inventorywindow.cpp:147 src/gui/setup_other.cpp:133
msgid "Shop"
msgstr "店"
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:262
-#: src/gui/popupmenu.cpp:282 src/gui/popupmenu.cpp:690
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:280
+#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:719
#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
-#: src/gui/selldialog.cpp:92
+#: src/gui/selldialog.cpp:93
msgid "Sell"
msgstr "売る"
#: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
-#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
+#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:96
#: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:336
-#: src/gui/popupmenu.cpp:357 src/gui/popupmenu.cpp:460
-#: src/gui/popupmenu.cpp:487 src/gui/popupmenu.cpp:511
-#: src/gui/popupmenu.cpp:525 src/gui/popupmenu.cpp:544
-#: src/gui/popupmenu.cpp:750 src/gui/popupmenu.cpp:774
-#: src/gui/popupmenu.cpp:1684 src/gui/popupmenu.cpp:1712
-#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1811
-#: src/gui/popupmenu.cpp:1846 src/gui/popupmenu.cpp:1886
-#: src/gui/popupmenu.cpp:1953 src/gui/popupmenu.cpp:1973
-#: src/gui/quitdialog.cpp:59 src/gui/register.cpp:82 src/gui/setup.cpp:71
-#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:354
+#: src/gui/popupmenu.cpp:375 src/gui/popupmenu.cpp:489
+#: src/gui/popupmenu.cpp:516 src/gui/popupmenu.cpp:540
+#: src/gui/popupmenu.cpp:554 src/gui/popupmenu.cpp:573
+#: src/gui/popupmenu.cpp:790 src/gui/popupmenu.cpp:814
+#: src/gui/popupmenu.cpp:1734 src/gui/popupmenu.cpp:1762
+#: src/gui/popupmenu.cpp:1818 src/gui/popupmenu.cpp:1861
+#: src/gui/popupmenu.cpp:1896 src/gui/popupmenu.cpp:1936
+#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2023
+#: src/gui/quitdialog.cpp:54 src/gui/register.cpp:82 src/gui/setup.cpp:72
+#: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:238
#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updaterwindow.cpp:157
+#: src/gui/updaterwindow.cpp:161
msgid "Cancel"
msgstr "キャンセル"
@@ -490,7 +490,7 @@ msgid "The email address entries mismatch."
msgstr ""
#: src/gui/changepassworddialog.cpp:50 src/gui/changepassworddialog.cpp:59
-#: src/gui/charselectdialog.cpp:140
+#: src/gui/charselectdialog.cpp:139
msgid "Change Password"
msgstr "パスワードの変更"
@@ -525,121 +525,121 @@ msgstr ""
msgid "Create Character"
msgstr "キャラクターを作成"
-#: src/gui/charcreatedialog.cpp:73 src/gui/logindialog.cpp:94
+#: src/gui/charcreatedialog.cpp:76 src/gui/logindialog.cpp:94
#: src/gui/register.cpp:75
msgid "Name:"
msgstr "名前:"
#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
#. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:76 src/gui/charcreatedialog.cpp:81
-#: src/gui/charcreatedialog.cpp:87 src/gui/outfitwindow.cpp:81
+#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:84
+#: src/gui/charcreatedialog.cpp:90 src/gui/outfitwindow.cpp:85
msgid ">"
msgstr ">"
#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
#. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:82
-#: src/gui/charcreatedialog.cpp:88 src/gui/outfitwindow.cpp:80
+#: src/gui/charcreatedialog.cpp:82 src/gui/charcreatedialog.cpp:85
+#: src/gui/charcreatedialog.cpp:91 src/gui/outfitwindow.cpp:84
msgid "<"
msgstr "<"
-#: src/gui/charcreatedialog.cpp:80
+#: src/gui/charcreatedialog.cpp:83
msgid "Hair color:"
msgstr "髪色:"
-#: src/gui/charcreatedialog.cpp:83
+#: src/gui/charcreatedialog.cpp:86
msgid "Hair style:"
msgstr "髪スタイル"
-#: src/gui/charcreatedialog.cpp:89
+#: src/gui/charcreatedialog.cpp:92
msgid "Race:"
msgstr "人種:"
-#: src/gui/charcreatedialog.cpp:92 src/gui/charselectdialog.cpp:479
-#: src/gui/socialwindow.cpp:1033
+#: src/gui/charcreatedialog.cpp:95 src/gui/charselectdialog.cpp:478
+#: src/gui/socialwindow.cpp:1139
msgid "Create"
msgstr "作成"
-#: src/gui/charcreatedialog.cpp:94 src/gui/register.cpp:98
+#: src/gui/charcreatedialog.cpp:97 src/gui/register.cpp:98
msgid "Male"
msgstr "男性"
-#: src/gui/charcreatedialog.cpp:95 src/gui/register.cpp:99
+#: src/gui/charcreatedialog.cpp:98 src/gui/register.cpp:99
msgid "Female"
msgstr "女性"
-#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:300
+#: src/gui/charcreatedialog.cpp:116 src/gui/charcreatedialog.cpp:303
#, c-format
msgid "Please distribute %d points"
msgstr "%d ポイントを振り分けてください"
-#: src/gui/charcreatedialog.cpp:219
+#: src/gui/charcreatedialog.cpp:222
msgid "Your name needs to be at least 4 characters."
msgstr "名前には4文字以上必要です。"
-#: src/gui/charcreatedialog.cpp:291
+#: src/gui/charcreatedialog.cpp:294
msgid "Character stats OK"
msgstr "キャラクターの能力ポイント配分量は問題ありません。"
-#: src/gui/charcreatedialog.cpp:305
+#: src/gui/charcreatedialog.cpp:308
#, c-format
msgid "Please remove %d points"
msgstr "%dポイントを取り除いてください。"
-#: src/gui/charselectdialog.cpp:77
+#: src/gui/charselectdialog.cpp:76
msgid "Confirm Character Delete"
msgstr "キャラクターの削除してもよいか確認してください"
-#: src/gui/charselectdialog.cpp:78
+#: src/gui/charselectdialog.cpp:77
msgid "Are you sure you want to delete this character?"
msgstr "このキャラクターを消してもよろしいでしょうか?"
-#: src/gui/charselectdialog.cpp:126
+#: src/gui/charselectdialog.cpp:125
msgid "Account and Character Management"
msgstr "アカウントとキャラクター管理"
-#: src/gui/charselectdialog.cpp:139
+#: src/gui/charselectdialog.cpp:138
msgid "Switch Login"
msgstr "ログインをスイッチする"
-#: src/gui/charselectdialog.cpp:153 src/gui/unregisterdialog.cpp:50
+#: src/gui/charselectdialog.cpp:152 src/gui/unregisterdialog.cpp:50
#: src/gui/unregisterdialog.cpp:58
msgid "Unregister"
msgstr "登録解除"
-#: src/gui/charselectdialog.cpp:162
+#: src/gui/charselectdialog.cpp:161
msgid "Change Email"
msgstr "メールアドレスを変える"
-#: src/gui/charselectdialog.cpp:254
+#: src/gui/charselectdialog.cpp:253
msgid "Incorrect password"
msgstr ""
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:286
msgid "Enter password for deleting character"
msgstr ""
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:286
msgid "Enter password:"
msgstr ""
-#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:292
-#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
-#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
+#: src/gui/charselectdialog.cpp:408 src/gui/serverdialog.cpp:298
+#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:122
+#: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:241
msgid "Delete"
msgstr "削除"
-#: src/gui/charselectdialog.cpp:467
+#: src/gui/charselectdialog.cpp:466
msgid "Choose"
msgstr "選ぶ"
-#: src/gui/charselectdialog.cpp:470
+#: src/gui/charselectdialog.cpp:469
#, c-format
msgid "Level %d"
msgstr "レベル%d"
-#: src/gui/charselectdialog.cpp:481 src/gui/charselectdialog.cpp:482
+#: src/gui/charselectdialog.cpp:480 src/gui/charselectdialog.cpp:481
msgid "(empty)"
msgstr "(空っぽ)"
@@ -711,12 +711,12 @@ msgstr "???"
msgid "Chat"
msgstr "チャット"
-#: src/gui/chatwindow.cpp:606
+#: src/gui/chatwindow.cpp:609
#, c-format
msgid "Present: %s; %d players are present."
msgstr ""
-#: src/gui/chatwindow.cpp:993
+#: src/gui/chatwindow.cpp:996
#, c-format
msgid "Whispering to %s: %s"
msgstr "%sに送信中: %s"
@@ -729,145 +729,145 @@ msgstr "はい"
msgid "No"
msgstr "いいえ"
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:150
-#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:384
-#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:632
-#: src/gui/popupmenu.cpp:640
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:149
+#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:402
+#: src/gui/popupmenu.cpp:408 src/gui/popupmenu.cpp:661
+#: src/gui/popupmenu.cpp:669
msgid "Ignore"
msgstr "無視"
-#: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
+#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:97
#: src/gui/setup_other.cpp:64
msgid "Map"
msgstr "地図"
-#: src/gui/debugwindow.cpp:71
+#: src/gui/debugwindow.cpp:73
msgid "Target"
msgstr ""
-#: src/gui/debugwindow.cpp:72
+#: src/gui/debugwindow.cpp:74
msgid "Net"
msgstr ""
-#: src/gui/debugwindow.cpp:145 src/gui/debugwindow.cpp:220
-#: src/gui/debugwindow.cpp:249
+#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
+#: src/gui/debugwindow.cpp:251
msgid "Music:"
msgstr "音楽:"
-#: src/gui/debugwindow.cpp:146 src/gui/debugwindow.cpp:224
-#: src/gui/debugwindow.cpp:251
+#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:226
+#: src/gui/debugwindow.cpp:253
msgid "Map:"
msgstr "マップ:"
-#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
-#: src/gui/debugwindow.cpp:250
+#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:224
+#: src/gui/debugwindow.cpp:252
msgid "Minimap:"
msgstr "ミニマップ:"
-#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:218
-#: src/gui/debugwindow.cpp:247
+#: src/gui/debugwindow.cpp:150 src/gui/debugwindow.cpp:220
+#: src/gui/debugwindow.cpp:249
msgid "Cursor:"
msgstr "カーソル:"
-#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:201
-#: src/gui/debugwindow.cpp:206
+#: src/gui/debugwindow.cpp:151 src/gui/debugwindow.cpp:203
+#: src/gui/debugwindow.cpp:208
msgid "Player Position:"
msgstr "プレイヤーポジション:"
-#: src/gui/debugwindow.cpp:152
+#: src/gui/debugwindow.cpp:154
msgid "Particle count:"
msgstr ""
-#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:235
-#: src/gui/debugwindow.cpp:254
+#: src/gui/debugwindow.cpp:156 src/gui/debugwindow.cpp:237
+#: src/gui/debugwindow.cpp:256
msgid "Map actors count:"
msgstr "数量のマプの行為者:"
-#: src/gui/debugwindow.cpp:162 src/gui/debugwindow.cpp:173
+#: src/gui/debugwindow.cpp:164 src/gui/debugwindow.cpp:175
#, c-format
msgid "%d FPS (Software)"
msgstr "%d FPS (ソフトウェア)"
-#: src/gui/debugwindow.cpp:166
+#: src/gui/debugwindow.cpp:168
#, c-format
msgid "%d FPS (fast OpenGL)"
msgstr "%d FPS (速い OpenGL)"
-#: src/gui/debugwindow.cpp:169
+#: src/gui/debugwindow.cpp:171
#, c-format
msgid "%d FPS (old OpenGL)"
msgstr "%d FPS (古い OpenGL)"
-#: src/gui/debugwindow.cpp:176
+#: src/gui/debugwindow.cpp:178
#, c-format
msgid "%d FPS"
msgstr "%d FPS"
-#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:240
+#: src/gui/debugwindow.cpp:190 src/gui/debugwindow.cpp:242
msgid "Textures count:"
msgstr ""
-#: src/gui/debugwindow.cpp:231
+#: src/gui/debugwindow.cpp:233
#, c-format
msgid "Particle count: %d"
msgstr "粒子数: %d"
-#: src/gui/debugwindow.cpp:268 src/gui/debugwindow.cpp:299
-#: src/gui/debugwindow.cpp:343
+#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:301
+#: src/gui/debugwindow.cpp:345
msgid "Target:"
msgstr "ターゲット:"
-#: src/gui/debugwindow.cpp:269 src/gui/debugwindow.cpp:304
-#: src/gui/debugwindow.cpp:344
+#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:306
+#: src/gui/debugwindow.cpp:346
msgid "Target Id:"
msgstr "ターゲットID:"
-#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:308
-#: src/gui/debugwindow.cpp:313 src/gui/debugwindow.cpp:345
+#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:310
+#: src/gui/debugwindow.cpp:315 src/gui/debugwindow.cpp:347
msgid "Target Level:"
msgstr "ターゲットレベル:"
-#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:316
-#: src/gui/debugwindow.cpp:346
+#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:318
+#: src/gui/debugwindow.cpp:348
msgid "Target Party:"
msgstr "ターゲットパーティ:"
-#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:319
-#: src/gui/debugwindow.cpp:347
+#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:321
+#: src/gui/debugwindow.cpp:349
msgid "Target Guild:"
msgstr "ターゲットギルド:"
-#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:333
-#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:348
+#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:335
+#: src/gui/debugwindow.cpp:340 src/gui/debugwindow.cpp:350
msgid "Attack delay:"
msgstr ""
-#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:323
-#: src/gui/debugwindow.cpp:349
+#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:325
+#: src/gui/debugwindow.cpp:351
msgid "Minimal hit:"
msgstr ""
-#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:325
-#: src/gui/debugwindow.cpp:350
+#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:327
+#: src/gui/debugwindow.cpp:352
msgid "Maximum hit:"
msgstr ""
-#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:327
-#: src/gui/debugwindow.cpp:351
+#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:329
+#: src/gui/debugwindow.cpp:353
msgid "Critical hit:"
msgstr ""
-#: src/gui/debugwindow.cpp:385 src/gui/debugwindow.cpp:390
+#: src/gui/debugwindow.cpp:387 src/gui/debugwindow.cpp:392
#, c-format
msgid "Ping: %s ms"
msgstr ""
-#: src/gui/debugwindow.cpp:393
+#: src/gui/debugwindow.cpp:395
#, c-format
msgid "In: %d bytes/s"
msgstr "入力: %d バイト/秒"
-#: src/gui/debugwindow.cpp:395
+#: src/gui/debugwindow.cpp:397
#, c-format
msgid "Out: %d bytes/s"
msgstr "出力: %d バイト/秒"
@@ -876,26 +876,26 @@ msgstr "出力: %d バイト/秒"
msgid "Did You Know?"
msgstr ""
-#: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
-#: src/gui/inventorywindow.cpp:175 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:559 src/gui/shopwindow.cpp:111
+#: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
+#: src/gui/inventorywindow.cpp:176 src/gui/npcdialog.cpp:53
+#: src/gui/popupmenu.cpp:588 src/gui/shopwindow.cpp:113
msgid "Close"
msgstr "閉じる"
-#: src/gui/didyouknowwindow.cpp:62
+#: src/gui/didyouknowwindow.cpp:64
msgid "< Previous"
msgstr ""
-#: src/gui/didyouknowwindow.cpp:63
+#: src/gui/didyouknowwindow.cpp:65
msgid "Next >"
msgstr ""
-#: src/gui/didyouknowwindow.cpp:64
+#: src/gui/didyouknowwindow.cpp:66
msgid "Auto open this window"
msgstr ""
#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:58 src/gui/textdialog.cpp:50
+#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:53 src/gui/textdialog.cpp:50
msgid "OK"
msgstr "OK"
@@ -903,10 +903,10 @@ msgstr "OK"
msgid "Equipment"
msgstr "装備"
-#: src/gui/equipmentwindow.cpp:93 src/gui/inventorywindow.cpp:130
-#: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
-#: src/gui/popupmenu.cpp:1643 src/gui/popupmenu.cpp:1738
-#: src/gui/popupmenu.cpp:1783
+#: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:131
+#: src/gui/inventorywindow.cpp:512 src/gui/inventorywindow.cpp:521
+#: src/gui/popupmenu.cpp:1693 src/gui/popupmenu.cpp:1788
+#: src/gui/popupmenu.cpp:1833
msgid "Unequip"
msgstr "外す"
@@ -919,75 +919,75 @@ msgstr "ヘルプ"
msgid "Inventory"
msgstr "アイテム"
-#: src/gui/inventorywindow.cpp:104
+#: src/gui/inventorywindow.cpp:105
msgid "Slots:"
msgstr "スロット"
-#: src/gui/inventorywindow.cpp:115
+#: src/gui/inventorywindow.cpp:116
msgid "Filter:"
msgstr "フィルタ:"
-#: src/gui/inventorywindow.cpp:116
+#: src/gui/inventorywindow.cpp:117
msgid "Sort:"
msgstr "類:"
-#: src/gui/inventorywindow.cpp:122
+#: src/gui/inventorywindow.cpp:123
msgid "na"
msgstr "不足"
-#: src/gui/inventorywindow.cpp:123
+#: src/gui/inventorywindow.cpp:124
msgid "az"
msgstr "字母"
-#: src/gui/inventorywindow.cpp:124
+#: src/gui/inventorywindow.cpp:125
msgid "id"
msgstr "id"
-#: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:513
-#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1645
-#: src/gui/popupmenu.cpp:1740 src/gui/popupmenu.cpp:1785
+#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
+#: src/gui/inventorywindow.cpp:523 src/gui/popupmenu.cpp:1695
+#: src/gui/popupmenu.cpp:1790 src/gui/popupmenu.cpp:1835
msgid "Equip"
msgstr "装備する"
-#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
-#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1648
-#: src/gui/popupmenu.cpp:1707 src/gui/popupmenu.cpp:1744
-#: src/gui/popupmenu.cpp:1788
+#: src/gui/inventorywindow.cpp:130 src/gui/inventorywindow.cpp:515
+#: src/gui/inventorywindow.cpp:519 src/gui/popupmenu.cpp:1698
+#: src/gui/popupmenu.cpp:1757 src/gui/popupmenu.cpp:1794
+#: src/gui/popupmenu.cpp:1838
msgid "Use"
msgstr "使う"
-#: src/gui/inventorywindow.cpp:143 src/gui/inventorywindow.cpp:619
-#: src/gui/popupmenu.cpp:1652 src/gui/popupmenu.cpp:1749
-#: src/gui/popupmenu.cpp:1792
+#: src/gui/inventorywindow.cpp:144 src/gui/inventorywindow.cpp:620
+#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1799
+#: src/gui/popupmenu.cpp:1842
msgid "Drop..."
msgstr "落とす..."
-#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1661
-#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1801
+#: src/gui/inventorywindow.cpp:145 src/gui/popupmenu.cpp:1711
+#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1851
msgid "Split"
msgstr "分割する"
-#: src/gui/inventorywindow.cpp:145 src/gui/outfitwindow.cpp:59
-#: src/gui/popupmenu.cpp:520
+#: src/gui/inventorywindow.cpp:146 src/gui/outfitwindow.cpp:60
+#: src/gui/popupmenu.cpp:549
msgid "Outfits"
msgstr "服"
-#: src/gui/inventorywindow.cpp:148
+#: src/gui/inventorywindow.cpp:149
msgid "Weight:"
msgstr "重量"
-#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
-#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
-#: src/gui/popupmenu.cpp:1804 src/gui/setup.cpp:72
+#: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:611
+#: src/gui/popupmenu.cpp:1674 src/gui/popupmenu.cpp:1811
+#: src/gui/popupmenu.cpp:1854 src/gui/setup.cpp:73
msgid "Store"
msgstr "保存"
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1668
+#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1718
msgid "Retrieve"
msgstr "取り戻す"
-#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1657
-#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1797
+#: src/gui/inventorywindow.cpp:622 src/gui/popupmenu.cpp:1707
+#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1847
#: src/gui/windowmenu.cpp:97
msgid "Drop"
msgstr "落とす"
@@ -1028,11 +1028,11 @@ msgstr ""
msgid "Unknown."
msgstr "不明."
-#: src/gui/itempopup.cpp:176 src/gui/itempopup.cpp:182
+#: src/gui/itempopup.cpp:177 src/gui/itempopup.cpp:183
msgid ", "
msgstr "、 "
-#: src/gui/itempopup.cpp:192
+#: src/gui/itempopup.cpp:193
#, c-format
msgid "Weight: %s"
msgstr "重力:%s"
@@ -1041,88 +1041,92 @@ msgstr "重力:%s"
msgid "Kill stats"
msgstr "殺人統計ウィンドウ"
-#: src/gui/killstats.cpp:64
+#: src/gui/killstats.cpp:65
msgid "Reset stats"
msgstr "統計をれセット"
-#: src/gui/killstats.cpp:65
+#: src/gui/killstats.cpp:66
msgid "Reset timer"
msgstr "タイマーをれセット"
-#: src/gui/killstats.cpp:69 src/gui/killstats.cpp:205
+#: src/gui/killstats.cpp:70 src/gui/killstats.cpp:206
#, c-format
msgid "Level: %d at %f%%"
msgstr ""
-#: src/gui/killstats.cpp:73 src/gui/killstats.cpp:210
+#: src/gui/killstats.cpp:74 src/gui/killstats.cpp:211
#, c-format
msgid "Exp: %d/%d Left: %d"
msgstr ""
-#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:216
-#: src/gui/killstats.cpp:225
+#: src/gui/killstats.cpp:77 src/gui/killstats.cpp:217
+#: src/gui/killstats.cpp:226
#, c-format
msgid "1%% = %d exp, avg mob for 1%%: %s"
msgstr ""
-#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:142
-#: src/gui/killstats.cpp:234
+#: src/gui/killstats.cpp:80 src/gui/killstats.cpp:143
+#: src/gui/killstats.cpp:235
#, c-format
msgid "Kills: %s, total exp: %s"
msgstr ""
-#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
-#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:230
+#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145
+#: src/gui/killstats.cpp:221 src/gui/killstats.cpp:231
#, c-format
msgid "Avg Exp: %s, No. of avg mob to next level: %s"
msgstr ""
-#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:162
-#: src/gui/killstats.cpp:237
+#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:163
+#: src/gui/killstats.cpp:238
#, c-format
msgid "Kills/Min: %s, Exp/Min: %s"
msgstr ""
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:89 src/gui/killstats.cpp:94
-#: src/gui/killstats.cpp:289 src/gui/killstats.cpp:305
-#: src/gui/killstats.cpp:323
+#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:90 src/gui/killstats.cpp:95
+#: src/gui/killstats.cpp:290 src/gui/killstats.cpp:306
+#: src/gui/killstats.cpp:324
#, c-format
msgid "Exp speed per %d min: %s"
msgid_plural "Exp speed per %d min: %s"
msgstr[0] ""
-#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
+#: src/gui/killstats.cpp:88 src/gui/killstats.cpp:93 src/gui/killstats.cpp:98
#, c-format
msgid "Time for next level per %d min: %s"
msgid_plural "Time for next level per %d min: %s"
msgstr[0] ""
-#: src/gui/killstats.cpp:100 src/gui/killstats.cpp:241
+#: src/gui/killstats.cpp:101 src/gui/killstats.cpp:242
msgid "Last kill exp:"
msgstr ""
-#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:355
-#: src/gui/killstats.cpp:361 src/gui/killstats.cpp:367
-#: src/gui/killstats.cpp:372
+#: src/gui/killstats.cpp:103 src/gui/killstats.cpp:356
+#: src/gui/killstats.cpp:362 src/gui/killstats.cpp:368
+#: src/gui/killstats.cpp:373
msgid "Time before jacko spawn:"
msgstr ""
-#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:301
-#: src/gui/killstats.cpp:311 src/gui/killstats.cpp:318
-#: src/gui/killstats.cpp:330 src/gui/killstats.cpp:337
+#: src/gui/killstats.cpp:295 src/gui/killstats.cpp:302
+#: src/gui/killstats.cpp:312 src/gui/killstats.cpp:319
+#: src/gui/killstats.cpp:331 src/gui/killstats.cpp:338
#, c-format
msgid " Time for next level: %s"
msgstr ""
-#: src/gui/killstats.cpp:361
+#: src/gui/killstats.cpp:362
#, c-format
msgid "%s %d?"
msgstr ""
-#: src/gui/killstats.cpp:367
+#: src/gui/killstats.cpp:368
msgid "jacko spawning"
msgstr ""
+#: src/guildmanager.cpp:464 src/net/ea/guildhandler.cpp:439
+msgid "You have left the guild."
+msgstr ""
+
#: src/gui/logindialog.cpp:59
msgid "Normal"
msgstr "普通"
@@ -1139,7 +1143,7 @@ msgstr "スキップ"
msgid "Login"
msgstr "ログイン"
-#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:246
+#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:252
#: src/gui/widgets/chattab.cpp:173
msgid "Server:"
msgstr "サーバ:"
@@ -1221,11 +1225,11 @@ msgstr "決定"
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:561
+#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:590
msgid "Clear"
msgstr "クリア"
-#: src/gui/npcdialog.cpp:222
+#: src/gui/npcdialog.cpp:223
msgid "> Next"
msgstr "> 次の"
@@ -1241,346 +1245,346 @@ msgstr "送信する"
msgid "Failed to send as sender or letter invalid."
msgstr "文字か差出人が無効なので送信に失敗しました。"
-#: src/gui/outfitwindow.cpp:82 src/gui/outfitwindow.cpp:886
+#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:890
#, c-format
msgid "Outfit: %d"
msgstr "服: %d"
-#: src/gui/outfitwindow.cpp:84 src/gui/outfitwindow.cpp:888
+#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:892
#, c-format
msgid "Key: %s"
msgstr "鍵:%s"
-#: src/gui/outfitwindow.cpp:87
+#: src/gui/outfitwindow.cpp:91
msgid "Unequip first"
msgstr "外す第一"
-#: src/gui/outfitwindow.cpp:90
+#: src/gui/outfitwindow.cpp:94
msgid "Away outfit"
msgstr "装備一式不在で"
-#: src/gui/popupmenu.cpp:133 src/gui/popupmenu.cpp:616
+#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:645
#: src/gui/widgets/tradetab.cpp:44
msgid "Trade"
msgstr "交換"
-#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:375
+#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:393
msgid "Whisper"
msgstr ""
-#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:621
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:650
msgid "Heal"
msgstr ""
-#: src/gui/popupmenu.cpp:146 src/gui/popupmenu.cpp:381
-#: src/gui/popupmenu.cpp:628
+#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:399
+#: src/gui/popupmenu.cpp:657
msgid "Be friend"
msgstr ""
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:383
-#: src/gui/popupmenu.cpp:389 src/gui/popupmenu.cpp:408
-#: src/gui/popupmenu.cpp:630 src/gui/popupmenu.cpp:638
-#: src/gui/popupmenu.cpp:662
+#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:156
+#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:401
+#: src/gui/popupmenu.cpp:407 src/gui/popupmenu.cpp:426
+#: src/gui/popupmenu.cpp:659 src/gui/popupmenu.cpp:667
+#: src/gui/popupmenu.cpp:691
msgid "Disregard"
msgstr ""
-#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:161
-#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:177
-#: src/gui/popupmenu.cpp:385 src/gui/popupmenu.cpp:391
-#: src/gui/popupmenu.cpp:398 src/gui/popupmenu.cpp:403
-#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
-#: src/gui/popupmenu.cpp:649 src/gui/popupmenu.cpp:655
+#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:160
+#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:176
+#: src/gui/popupmenu.cpp:403 src/gui/popupmenu.cpp:409
+#: src/gui/popupmenu.cpp:416 src/gui/popupmenu.cpp:421
+#: src/gui/popupmenu.cpp:662 src/gui/popupmenu.cpp:670
+#: src/gui/popupmenu.cpp:678 src/gui/popupmenu.cpp:684
msgid "Erase"
msgstr ""
-#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:175
-#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:395
-#: src/gui/popupmenu.cpp:402 src/gui/popupmenu.cpp:407
-#: src/gui/popupmenu.cpp:646 src/gui/popupmenu.cpp:654
-#: src/gui/popupmenu.cpp:660
+#: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:174
+#: src/gui/popupmenu.cpp:181 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:425
+#: src/gui/popupmenu.cpp:675 src/gui/popupmenu.cpp:683
+#: src/gui/popupmenu.cpp:689
msgid "Unignore"
msgstr ""
-#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:186
-#: src/gui/popupmenu.cpp:397 src/gui/popupmenu.cpp:410
-#: src/gui/popupmenu.cpp:648 src/gui/popupmenu.cpp:664
+#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:185
+#: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:428
+#: src/gui/popupmenu.cpp:677 src/gui/popupmenu.cpp:693
#: src/playerrelations.cpp:400
msgid "Completely ignore"
msgstr "完全無視"
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:418
-#: src/gui/popupmenu.cpp:672
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:436
+#: src/gui/popupmenu.cpp:701
msgid "Follow"
msgstr ""
-#: src/gui/popupmenu.cpp:196 src/gui/popupmenu.cpp:419
-#: src/gui/popupmenu.cpp:673
+#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:437
+#: src/gui/popupmenu.cpp:702
msgid "Imitation"
msgstr ""
-#: src/gui/popupmenu.cpp:206 src/gui/popupmenu.cpp:710
+#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:739
msgid "Invite to party"
msgstr ""
-#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:428
-#: src/gui/popupmenu.cpp:715
+#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:744
msgid "Kick from party"
msgstr ""
-#: src/gui/popupmenu.cpp:226 src/gui/popupmenu.cpp:439
-#: src/gui/popupmenu.cpp:729
+#: src/gui/popupmenu.cpp:225 src/gui/popupmenu.cpp:237
+#: src/gui/popupmenu.cpp:460 src/gui/popupmenu.cpp:761
msgid "Kick from guild"
msgstr ""
-#: src/gui/popupmenu.cpp:228 src/gui/popupmenu.cpp:441
-#: src/gui/popupmenu.cpp:731
+#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:242
+#: src/gui/popupmenu.cpp:465 src/gui/popupmenu.cpp:766
msgid "Change pos in guild"
msgstr ""
-#: src/gui/popupmenu.cpp:234 src/gui/popupmenu.cpp:446
-#: src/gui/popupmenu.cpp:737
+#: src/gui/popupmenu.cpp:251 src/gui/popupmenu.cpp:474
+#: src/gui/popupmenu.cpp:776
msgid "Invite to guild"
msgstr ""
-#: src/gui/popupmenu.cpp:242
+#: src/gui/popupmenu.cpp:260
msgid "Kick player"
msgstr ""
-#: src/gui/popupmenu.cpp:244
+#: src/gui/popupmenu.cpp:262
msgid "Nuke"
msgstr ""
-#: src/gui/popupmenu.cpp:247 src/gui/popupmenu.cpp:675
+#: src/gui/popupmenu.cpp:265 src/gui/popupmenu.cpp:704
msgid "Show Items"
msgstr ""
-#: src/gui/popupmenu.cpp:248 src/gui/popupmenu.cpp:676
-#: src/gui/popupmenu.cpp:1970
+#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:705
+#: src/gui/popupmenu.cpp:2020
msgid "Undress"
msgstr ""
-#: src/gui/popupmenu.cpp:250 src/gui/popupmenu.cpp:286
-#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:678
-#: src/gui/popupmenu.cpp:746
+#: src/gui/popupmenu.cpp:268 src/gui/popupmenu.cpp:304
+#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:707
+#: src/gui/popupmenu.cpp:786
msgid "Add comment"
msgstr ""
-#: src/gui/popupmenu.cpp:268 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:695
+#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:482
+#: src/gui/popupmenu.cpp:724
msgid "Buy (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:454
-#: src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:483
+#: src/gui/popupmenu.cpp:726
msgid "Sell (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:298
+#: src/gui/popupmenu.cpp:316
msgid "Kick"
msgstr ""
-#: src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:327
msgid "Remove from attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:315
+#: src/gui/popupmenu.cpp:333
msgid "Add to priority attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:317
+#: src/gui/popupmenu.cpp:335
msgid "Add to attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:320
+#: src/gui/popupmenu.cpp:338
msgid "Add to ignore list"
msgstr ""
-#: src/gui/popupmenu.cpp:333 src/gui/popupmenu.cpp:457
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:486
msgid "Add name to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:483
+#: src/gui/popupmenu.cpp:512
msgid "Pick up"
msgstr ""
-#: src/gui/popupmenu.cpp:484 src/gui/popupmenu.cpp:1682
-#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1805
+#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:1732
+#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1855
msgid "Add to chat"
msgstr "チャットに追加"
-#: src/gui/popupmenu.cpp:501
+#: src/gui/popupmenu.cpp:530
msgid "Map Item"
msgstr "マップアイテム"
-#: src/gui/popupmenu.cpp:502
+#: src/gui/popupmenu.cpp:531
msgid "Rename"
msgstr ""
-#: src/gui/popupmenu.cpp:503 src/gui/popupmenu.cpp:1923
-#: src/gui/popupmenu.cpp:1941 src/gui/popupmenu.cpp:1946
+#: src/gui/popupmenu.cpp:532 src/gui/popupmenu.cpp:1973
+#: src/gui/popupmenu.cpp:1991 src/gui/popupmenu.cpp:1996
msgid "Remove"
msgstr "取り去る"
-#: src/gui/popupmenu.cpp:508
+#: src/gui/popupmenu.cpp:537
msgid "Warp"
msgstr ""
-#: src/gui/popupmenu.cpp:522
+#: src/gui/popupmenu.cpp:551
msgid "Load old outfits"
msgstr ""
-#: src/gui/popupmenu.cpp:538 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:567 src/gui/windowmenu.cpp:96
msgid "Spells"
msgstr "呪文"
-#: src/gui/popupmenu.cpp:540
+#: src/gui/popupmenu.cpp:569
msgid "Load old spells"
msgstr ""
-#: src/gui/popupmenu.cpp:541
+#: src/gui/popupmenu.cpp:570
msgid "Edit spell"
msgstr ""
-#: src/gui/popupmenu.cpp:567
+#: src/gui/popupmenu.cpp:596
msgid "Disable highlight"
msgstr "強調表示を無効"
-#: src/gui/popupmenu.cpp:572
+#: src/gui/popupmenu.cpp:601
msgid "Enable highlight"
msgstr "強調表示を有効"
-#: src/gui/popupmenu.cpp:577
-msgid "Dont remove name"
+#: src/gui/popupmenu.cpp:606
+msgid "Don't remove name"
msgstr ""
-#: src/gui/popupmenu.cpp:582
+#: src/gui/popupmenu.cpp:611
msgid "Remove name"
msgstr ""
-#: src/gui/popupmenu.cpp:587
+#: src/gui/popupmenu.cpp:616
msgid "Enable away"
msgstr ""
-#: src/gui/popupmenu.cpp:592
+#: src/gui/popupmenu.cpp:621
msgid "Disable away"
msgstr ""
-#: src/gui/popupmenu.cpp:598 src/gui/socialwindow.cpp:1035
+#: src/gui/popupmenu.cpp:627 src/gui/socialwindow.cpp:1141
msgid "Leave"
msgstr "でる"
-#: src/gui/popupmenu.cpp:758
+#: src/gui/popupmenu.cpp:798
msgid "Change guild position"
msgstr "ギルドポジションを変更"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1189
+#: src/gui/popupmenu.cpp:1234
msgid "Rename map sign "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1191
+#: src/gui/popupmenu.cpp:1236
msgid "Name: "
msgstr " 名前: "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1241
+#: src/gui/popupmenu.cpp:1286
msgid "Player comment "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1243
+#: src/gui/popupmenu.cpp:1288
msgid "Comment: "
msgstr ""
-#: src/gui/popupmenu.cpp:1607
+#: src/gui/popupmenu.cpp:1657
msgid "Add to trade"
msgstr "に貿易を足す"
-#: src/gui/popupmenu.cpp:1613
+#: src/gui/popupmenu.cpp:1663
msgid "Add to trade 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1616
+#: src/gui/popupmenu.cpp:1666
msgid "Add to trade half"
msgstr ""
-#: src/gui/popupmenu.cpp:1618
+#: src/gui/popupmenu.cpp:1668
msgid "Add to trade all"
msgstr ""
-#: src/gui/popupmenu.cpp:1630
+#: src/gui/popupmenu.cpp:1680
msgid "Store 10"
msgstr "10保存"
-#: src/gui/popupmenu.cpp:1633
+#: src/gui/popupmenu.cpp:1683
msgid "Store half"
msgstr "半分保存"
-#: src/gui/popupmenu.cpp:1635
+#: src/gui/popupmenu.cpp:1685
msgid "Store all"
msgstr "全部保存"
-#: src/gui/popupmenu.cpp:1653 src/gui/popupmenu.cpp:1750
-#: src/gui/popupmenu.cpp:1793
+#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1800
+#: src/gui/popupmenu.cpp:1843
msgid "Drop all"
msgstr ""
-#: src/gui/popupmenu.cpp:1674
+#: src/gui/popupmenu.cpp:1724
msgid "Retrieve 10"
msgstr "10取る"
-#: src/gui/popupmenu.cpp:1677
+#: src/gui/popupmenu.cpp:1727
msgid "Retrieve half"
msgstr "半分取る"
-#: src/gui/popupmenu.cpp:1679
+#: src/gui/popupmenu.cpp:1729
msgid "Retrieve all"
msgstr "全部取る"
-#: src/gui/popupmenu.cpp:1710 src/gui/popupmenu.cpp:1766
+#: src/gui/popupmenu.cpp:1760 src/gui/popupmenu.cpp:1816
msgid "Load old item shortcuts"
msgstr ""
-#: src/gui/popupmenu.cpp:1809
+#: src/gui/popupmenu.cpp:1859
msgid "Load old drop shortcuts"
msgstr ""
-#: src/gui/popupmenu.cpp:1835 src/gui/popupmenu.cpp:1870
+#: src/gui/popupmenu.cpp:1885 src/gui/popupmenu.cpp:1920
msgid "Hide"
msgstr " 隠す"
-#: src/gui/popupmenu.cpp:1841 src/gui/popupmenu.cpp:1876
+#: src/gui/popupmenu.cpp:1891 src/gui/popupmenu.cpp:1926
msgid "Show"
msgstr "見せる"
-#: src/gui/popupmenu.cpp:1883
+#: src/gui/popupmenu.cpp:1933
msgid "Reset yellow bar"
msgstr ""
-#: src/gui/popupmenu.cpp:1885 src/gui/statuswindow.cpp:240
+#: src/gui/popupmenu.cpp:1935 src/gui/statuswindow.cpp:241
msgid "Copy to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:1903 src/gui/socialwindow.cpp:854
-#: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
+#: src/gui/popupmenu.cpp:1953 src/gui/socialwindow.cpp:958
+#: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028
msgid "(default)"
msgstr "(デフォルト)"
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1933
+#: src/gui/popupmenu.cpp:1965 src/gui/popupmenu.cpp:1983
msgid "Move up"
msgstr ""
-#: src/gui/popupmenu.cpp:1920 src/gui/popupmenu.cpp:1938
+#: src/gui/popupmenu.cpp:1970 src/gui/popupmenu.cpp:1988
msgid "Move down"
msgstr ""
-#: src/gui/quitdialog.cpp:56
+#: src/gui/quitdialog.cpp:51
msgid "Switch server"
msgstr "サーバーを切り替える"
-#: src/gui/quitdialog.cpp:57
+#: src/gui/quitdialog.cpp:52
msgid "Switch character"
msgstr "キャラクターを切り替える"
@@ -1616,64 +1620,64 @@ msgstr "パスワードは%d文字より短くなくてはいけません。"
msgid "Passwords do not match."
msgstr "パスワードが一致していません。"
-#: src/gui/serverdialog.cpp:231
+#: src/gui/serverdialog.cpp:237
msgid "Choose Your Server"
msgstr "サーバを選ぶ"
-#: src/gui/serverdialog.cpp:242
+#: src/gui/serverdialog.cpp:248
msgid "Choose Your Server *** SAFE MODE ***"
msgstr ""
-#: src/gui/serverdialog.cpp:247
+#: src/gui/serverdialog.cpp:253
msgid "Port:"
msgstr "ポート:"
-#: src/gui/serverdialog.cpp:251
+#: src/gui/serverdialog.cpp:257
msgid "Use same ip for game sub servers"
msgstr ""
-#: src/gui/serverdialog.cpp:265
+#: src/gui/serverdialog.cpp:271
msgid "Server type:"
msgstr "サーバー形"
-#: src/gui/serverdialog.cpp:289
+#: src/gui/serverdialog.cpp:295
msgid "Load"
msgstr "ロード"
-#: src/gui/serverdialog.cpp:290
+#: src/gui/serverdialog.cpp:296
msgid "Connect"
msgstr "通信"
-#: src/gui/serverdialog.cpp:291
+#: src/gui/serverdialog.cpp:297
msgid "Custom Server"
msgstr "カスタムサーバー"
-#: src/gui/serverdialog.cpp:396
+#: src/gui/serverdialog.cpp:402
msgid "Please type both the address and the port of a server."
msgstr "サーバのアドレスとポート番号を両方入力してください。"
-#: src/gui/serverdialog.cpp:554
+#: src/gui/serverdialog.cpp:560
#, c-format
msgid "Downloading server list...%2.2f%%"
msgstr ""
-#: src/gui/serverdialog.cpp:559
+#: src/gui/serverdialog.cpp:565
msgid "Waiting for server..."
msgstr "サーバーを待っている..."
-#: src/gui/serverdialog.cpp:563
+#: src/gui/serverdialog.cpp:569
msgid "Preparing download"
msgstr "ダウンロード準備中..."
-#: src/gui/serverdialog.cpp:567
+#: src/gui/serverdialog.cpp:573
msgid "Error retreiving server list!"
msgstr ""
-#: src/gui/serverdialog.cpp:672
+#: src/gui/serverdialog.cpp:678
msgid "requires a newer version"
msgstr ""
-#: src/gui/serverdialog.cpp:674
+#: src/gui/serverdialog.cpp:680
#, c-format
msgid "requires v%s"
msgstr "要る v%s"
@@ -1820,6 +1824,14 @@ msgstr ""
msgid "Use local time"
msgstr ""
+#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:157
+msgid "Other"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:125
+msgid "Highlight words (separated by comma)"
+msgstr ""
+
#: src/gui/setup_colors.cpp:49
msgid "This is what the color looks like"
msgstr "これがその色がどのように見えるかです。"
@@ -1867,11 +1879,11 @@ msgstr "青"
msgid "Alpha:"
msgstr "アルファ:"
-#: src/gui/setup.cpp:70
+#: src/gui/setup.cpp:71
msgid "Apply"
msgstr "適用"
-#: src/gui/setup.cpp:73
+#: src/gui/setup.cpp:74
msgid "Reset Windows"
msgstr "ウィンドウをリセットする"
@@ -2048,34 +2060,42 @@ msgid "Log NPC dialogue"
msgstr ""
#: src/gui/setup_other.cpp:148
-msgid "Other"
+msgid "Bots support"
msgstr ""
#: src/gui/setup_other.cpp:150
-msgid "Enable server side attack"
+msgid "Enable auction bot support"
msgstr ""
#: src/gui/setup_other.cpp:153
+msgid "Enable guild bot support and disable native guild support"
+msgstr ""
+
+#: src/gui/setup_other.cpp:159
+msgid "Enable server side attack"
+msgstr ""
+
+#: src/gui/setup_other.cpp:162
msgid "Enable bot checker"
msgstr ""
-#: src/gui/setup_other.cpp:156
+#: src/gui/setup_other.cpp:165
msgid "Enable buggy servers protection"
msgstr ""
-#: src/gui/setup_other.cpp:159
+#: src/gui/setup_other.cpp:168
msgid "Enable debug log"
msgstr "デバッグループを有効にする"
-#: src/gui/setup_other.cpp:162
+#: src/gui/setup_other.cpp:171
msgid "Low traffic mode"
msgstr ""
-#: src/gui/setup_other.cpp:165
+#: src/gui/setup_other.cpp:174
msgid "Hide shield sprite"
msgstr ""
-#: src/gui/setup_other.cpp:168
+#: src/gui/setup_other.cpp:177
msgid "Show background"
msgstr "背景を表示する"
@@ -2171,6 +2191,10 @@ msgstr ""
msgid "Show ip addresses on screenshots"
msgstr ""
+#: src/gui/setup_players.cpp:81
+msgid "Allow self heal with mouse click"
+msgstr ""
+
#: src/gui/setup_relations.cpp:65
msgid "Relation"
msgstr "関係"
@@ -2443,261 +2467,266 @@ msgstr ""
msgid "Changes will take effect on map change."
msgstr "変化はマップがかわったときから影響します。"
-#: src/gui/shopwindow.cpp:74
+#: src/gui/shopwindow.cpp:75
msgid "Personal Shop"
msgstr "パーサナルショップ"
-#: src/gui/shopwindow.cpp:116
+#: src/gui/shopwindow.cpp:118
msgid "Buy items"
msgstr "商品を買う"
-#: src/gui/shopwindow.cpp:117
+#: src/gui/shopwindow.cpp:119
msgid "Sell items"
msgstr "商品を売る"
-#: src/gui/shopwindow.cpp:119 src/gui/shopwindow.cpp:122
-#: src/gui/tradewindow.cpp:88
+#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
+#: src/gui/tradewindow.cpp:89
msgid "Add"
msgstr "追加"
-#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
+#: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
msgid "Announce"
msgstr "発表する"
-#: src/gui/shopwindow.cpp:125
+#: src/gui/shopwindow.cpp:127
msgid "Show links in announce"
msgstr ""
-#: src/gui/shopwindow.cpp:723 src/net/ea/tradehandler.cpp:106
+#: src/gui/shopwindow.cpp:148 src/gui/shopwindow.cpp:149
+msgid "Auction"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:748 src/net/ea/tradehandler.cpp:106
#: src/net/manaserv/tradehandler.cpp:127
msgid "Request for Trade"
msgstr "取引要求"
-#: src/gui/shopwindow.cpp:724
+#: src/gui/shopwindow.cpp:749
#, c-format
msgid "%s wants to %s %s do you accept?"
msgstr ""
-#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:81
+#: src/gui/skilldialog.cpp:276 src/gui/windowmenu.cpp:81
msgid "Skills"
msgstr "スキル"
-#: src/gui/skilldialog.cpp:283
+#: src/gui/skilldialog.cpp:288
msgid "Up"
msgstr "上げる"
-#: src/gui/skilldialog.cpp:336
+#: src/gui/skilldialog.cpp:341
#, c-format
msgid "Skill points available: %d"
msgstr "スキルポイント: %d"
-#: src/gui/skilldialog.cpp:413
+#: src/gui/skilldialog.cpp:418
#, c-format
msgid "Skill Set %d"
msgstr "スキルセット %d"
-#: src/gui/skilldialog.cpp:425
+#: src/gui/skilldialog.cpp:430
#, c-format
msgid "Skill %d"
msgstr "スキル %d"
-#: src/gui/skilldialog.cpp:492 src/gui/skilldialog.cpp:545
+#: src/gui/skilldialog.cpp:497 src/gui/skilldialog.cpp:550
#, c-format
msgid "Lvl: %d"
msgstr "Lvl: %d"
-#: src/gui/skilldialog.cpp:537
+#: src/gui/skilldialog.cpp:542
#, c-format
msgid "Lvl: %d (%+d)"
msgstr "Lvl:%d (%+d)"
-#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
+#: src/gui/socialwindow.cpp:118 src/gui/socialwindow.cpp:216
+#: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52
msgid "Guild"
msgstr "ギルド"
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:147
#, c-format
msgid "Invited user %s to guild %s."
msgstr ""
-#: src/gui/socialwindow.cpp:160
+#: src/gui/socialwindow.cpp:161
#, c-format
msgid "Guild %s quit requested."
msgstr ""
-#: src/gui/socialwindow.cpp:187
+#: src/gui/socialwindow.cpp:188
msgid "Member Invite to Guild"
msgstr ""
-#: src/gui/socialwindow.cpp:188
+#: src/gui/socialwindow.cpp:189
#, c-format
msgid "Who would you like to invite to guild %s?"
msgstr ""
-#: src/gui/socialwindow.cpp:197
+#: src/gui/socialwindow.cpp:198
msgid "Leave Guild?"
msgstr "ギルドを残す?"
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:199
#, c-format
msgid "Are you sure you want to leave guild %s?"
msgstr ""
-#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:319 src/net/ea/gui/partytab.cpp:50
msgid "Party"
msgstr "パーティー"
-#: src/gui/socialwindow.cpp:243
+#: src/gui/socialwindow.cpp:347
#, c-format
msgid "Invited user %s to party."
msgstr ""
-#: src/gui/socialwindow.cpp:257
+#: src/gui/socialwindow.cpp:361
#, c-format
msgid "Party %s quit requested."
msgstr ""
-#: src/gui/socialwindow.cpp:284
+#: src/gui/socialwindow.cpp:388
msgid "Member Invite to Party"
msgstr ""
-#: src/gui/socialwindow.cpp:285
+#: src/gui/socialwindow.cpp:389
#, c-format
msgid "Who would you like to invite to party %s?"
msgstr ""
-#: src/gui/socialwindow.cpp:294
+#: src/gui/socialwindow.cpp:398
msgid "Leave Party?"
msgstr "パーティーを残す?"
-#: src/gui/socialwindow.cpp:295
+#: src/gui/socialwindow.cpp:399
#, c-format
msgid "Are you sure you want to leave party %s?"
msgstr ""
-#: src/gui/socialwindow.cpp:521
+#: src/gui/socialwindow.cpp:625
msgid "Nav"
msgstr "航法"
-#: src/gui/socialwindow.cpp:799
+#: src/gui/socialwindow.cpp:903
msgid "Atk"
msgstr ""
-#: src/gui/socialwindow.cpp:840
+#: src/gui/socialwindow.cpp:944
msgid "Priority mobs"
msgstr ""
-#: src/gui/socialwindow.cpp:872
+#: src/gui/socialwindow.cpp:976
msgid "Attack mobs"
msgstr ""
-#: src/gui/socialwindow.cpp:907
+#: src/gui/socialwindow.cpp:1011
msgid "Ignore mobs"
msgstr ""
-#: src/gui/socialwindow.cpp:970
+#: src/gui/socialwindow.cpp:1074
msgid "Create Guild"
msgstr "ギルドを作成する"
-#: src/gui/socialwindow.cpp:971 src/gui/socialwindow.cpp:1387
+#: src/gui/socialwindow.cpp:1075 src/gui/socialwindow.cpp:1503
msgid "Create Party"
msgstr "パーティを作る"
-#: src/gui/socialwindow.cpp:1013 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1117 src/gui/windowmenu.cpp:93
msgid "Social"
msgstr "ソシアル"
-#: src/gui/socialwindow.cpp:1034
+#: src/gui/socialwindow.cpp:1140
msgid "Invite"
msgstr "招待"
-#: src/gui/socialwindow.cpp:1176
+#: src/gui/socialwindow.cpp:1286
#, c-format
msgid "Accepted party invite from %s."
msgstr ""
-#: src/gui/socialwindow.cpp:1186
+#: src/gui/socialwindow.cpp:1296
#, c-format
msgid "Rejected party invite from %s."
msgstr ""
-#: src/gui/socialwindow.cpp:1203
+#: src/gui/socialwindow.cpp:1313
#, c-format
msgid "Accepted guild invite from %s."
msgstr ""
-#: src/gui/socialwindow.cpp:1213
+#: src/gui/socialwindow.cpp:1326
#, c-format
msgid "Rejected guild invite from %s."
msgstr ""
-#: src/gui/socialwindow.cpp:1257
+#: src/gui/socialwindow.cpp:1373
#, c-format
msgid "Creating guild called %s."
msgstr ""
-#: src/gui/socialwindow.cpp:1280
+#: src/gui/socialwindow.cpp:1396
#, c-format
msgid "Creating party called %s."
msgstr ""
-#: src/gui/socialwindow.cpp:1294
+#: src/gui/socialwindow.cpp:1410
msgid "Guild Name"
msgstr "ギルド名"
-#: src/gui/socialwindow.cpp:1295
+#: src/gui/socialwindow.cpp:1411
msgid "Choose your guild's name."
msgstr "サーバーを選んでください。"
-#: src/gui/socialwindow.cpp:1309
+#: src/gui/socialwindow.cpp:1425
msgid "Received guild request, but one already exists."
msgstr ""
-#: src/gui/socialwindow.cpp:1315
+#: src/gui/socialwindow.cpp:1431
#, c-format
msgid "%s has invited you to join the guild %s."
msgstr ""
-#: src/gui/socialwindow.cpp:1321
+#: src/gui/socialwindow.cpp:1437
msgid "Accept Guild Invite"
msgstr "ギルド招待を受け入れ"
-#: src/gui/socialwindow.cpp:1336
+#: src/gui/socialwindow.cpp:1452
msgid "Received party request, but one already exists."
msgstr "パーティへの招待を受け取りましたが、もう既に存在しています。"
-#: src/gui/socialwindow.cpp:1347
+#: src/gui/socialwindow.cpp:1463
msgid "You have been invited you to join a party."
msgstr ""
-#: src/gui/socialwindow.cpp:1351
+#: src/gui/socialwindow.cpp:1467
#, c-format
msgid "You have been invited to join the %s party."
msgstr ""
-#: src/gui/socialwindow.cpp:1359
+#: src/gui/socialwindow.cpp:1475
#, c-format
msgid "%s has invited you to join their party."
msgstr "%sはあなたをパーティに招待しました。"
-#: src/gui/socialwindow.cpp:1364
+#: src/gui/socialwindow.cpp:1480
#, c-format
msgid "%s has invited you to join the %s party."
msgstr "%sはあなたを%sというパーティに招待しました。"
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1489
msgid "Accept Party Invite"
msgstr "パーティ招待を受け入れます。"
-#: src/gui/socialwindow.cpp:1388
+#: src/gui/socialwindow.cpp:1504
msgid "Cannot create party. You are already in a party"
msgstr "パーティーを作成することはできません。もうパーティーに入っています。"
-#: src/gui/socialwindow.cpp:1393
+#: src/gui/socialwindow.cpp:1509
msgid "Party Name"
msgstr "パーティ名"
-#: src/gui/socialwindow.cpp:1394
+#: src/gui/socialwindow.cpp:1510
msgid "Choose your party's name."
msgstr "パーティ名を選んでください"
@@ -2705,418 +2734,418 @@ msgstr "パーティ名を選んでください"
msgid "Specials"
msgstr "スペシアール"
-#: src/gui/statuspopup.cpp:197
+#: src/gui/statuspopup.cpp:198
msgid "(D) default moves"
msgstr ""
-#: src/gui/statuspopup.cpp:202
+#: src/gui/statuspopup.cpp:203
msgid "(I) invert moves"
msgstr ""
-#: src/gui/statuspopup.cpp:207
+#: src/gui/statuspopup.cpp:208
msgid "(c) moves with some crazy moves"
msgstr ""
-#: src/gui/statuspopup.cpp:212
+#: src/gui/statuspopup.cpp:213
msgid "(C) moves with crazy moves"
msgstr ""
-#: src/gui/statuspopup.cpp:217
+#: src/gui/statuspopup.cpp:218
msgid "(d) double normal + crazy"
msgstr ""
-#: src/gui/statuspopup.cpp:222
+#: src/gui/statuspopup.cpp:223
msgid "(?) move"
msgstr "(?) 動く"
-#: src/gui/statuspopup.cpp:240
+#: src/gui/statuspopup.cpp:241
msgid "(a) custom crazy move"
msgstr ""
-#: src/gui/statuspopup.cpp:244
+#: src/gui/statuspopup.cpp:245
msgid "(?) crazy move"
msgstr ""
-#: src/gui/statuspopup.cpp:254
+#: src/gui/statuspopup.cpp:255
msgid "(0) default moves to target"
msgstr ""
-#: src/gui/statuspopup.cpp:259
+#: src/gui/statuspopup.cpp:260
msgid "(1) moves to target in distance 1"
msgstr ""
-#: src/gui/statuspopup.cpp:264
+#: src/gui/statuspopup.cpp:265
msgid "(2) moves to target in distance 2"
msgstr ""
-#: src/gui/statuspopup.cpp:269
+#: src/gui/statuspopup.cpp:270
msgid "(3) moves to target in distance 3"
msgstr ""
-#: src/gui/statuspopup.cpp:274
+#: src/gui/statuspopup.cpp:275
msgid "(5) moves to target in distance 5"
msgstr ""
-#: src/gui/statuspopup.cpp:279
+#: src/gui/statuspopup.cpp:280
msgid "(7) moves to target in distance 7"
msgstr ""
-#: src/gui/statuspopup.cpp:284
+#: src/gui/statuspopup.cpp:285
msgid "(A) moves to target in attack range"
msgstr ""
-#: src/gui/statuspopup.cpp:289
+#: src/gui/statuspopup.cpp:290
msgid "(?) move to target"
msgstr ""
-#: src/gui/statuspopup.cpp:297
+#: src/gui/statuspopup.cpp:298
msgid "(D) default follow"
msgstr ""
-#: src/gui/statuspopup.cpp:301
+#: src/gui/statuspopup.cpp:302
msgid "(R) relative follow"
msgstr ""
-#: src/gui/statuspopup.cpp:305
+#: src/gui/statuspopup.cpp:306
msgid "(M) mirror follow"
msgstr ""
-#: src/gui/statuspopup.cpp:309
+#: src/gui/statuspopup.cpp:310
msgid "(P) pet follow"
msgstr ""
-#: src/gui/statuspopup.cpp:313
+#: src/gui/statuspopup.cpp:314
msgid "(?) unknown follow"
msgstr ""
-#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
+#: src/gui/statuspopup.cpp:323 src/gui/statuspopup.cpp:346
msgid "(D) default attack"
msgstr ""
-#: src/gui/statuspopup.cpp:327
+#: src/gui/statuspopup.cpp:328
msgid "(s) switch attack without shield"
msgstr ""
-#: src/gui/statuspopup.cpp:332
+#: src/gui/statuspopup.cpp:333
msgid "(S) switch attack with shield"
msgstr ""
-#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
+#: src/gui/statuspopup.cpp:337 src/gui/statuspopup.cpp:362
msgid "(?) attack"
msgstr "(?) 襲う"
-#: src/gui/statuspopup.cpp:349
+#: src/gui/statuspopup.cpp:350
msgid "(G) go and attack"
msgstr ""
-#: src/gui/statuspopup.cpp:353
+#: src/gui/statuspopup.cpp:354
msgid "(A) go, attack, pickup"
msgstr ""
-#: src/gui/statuspopup.cpp:357
+#: src/gui/statuspopup.cpp:358
msgid "(d) without auto attack"
msgstr ""
-#: src/gui/statuspopup.cpp:375
+#: src/gui/statuspopup.cpp:376
msgid "(S) small pick up 1x1 cells"
msgstr ""
-#: src/gui/statuspopup.cpp:379
+#: src/gui/statuspopup.cpp:380
msgid "(D) default pick up 2x1 cells"
msgstr ""
-#: src/gui/statuspopup.cpp:383
+#: src/gui/statuspopup.cpp:384
msgid "(F) forward pick up 2x3 cells"
msgstr ""
-#: src/gui/statuspopup.cpp:387
+#: src/gui/statuspopup.cpp:388
msgid "(3) pick up 3x3 cells"
msgstr ""
-#: src/gui/statuspopup.cpp:391
+#: src/gui/statuspopup.cpp:392
msgid "(g) go and pick up in distance 4"
msgstr ""
-#: src/gui/statuspopup.cpp:395
+#: src/gui/statuspopup.cpp:396
msgid "(G) go and pick up in distance 8"
msgstr ""
-#: src/gui/statuspopup.cpp:399
+#: src/gui/statuspopup.cpp:400
msgid "(A) go and pick up in max distance"
msgstr ""
-#: src/gui/statuspopup.cpp:403
+#: src/gui/statuspopup.cpp:404
msgid "(?) pick up"
msgstr "(?) 拾い上げる"
-#: src/gui/statuspopup.cpp:412
+#: src/gui/statuspopup.cpp:413
msgid "(N) normal map view"
msgstr ""
-#: src/gui/statuspopup.cpp:416
+#: src/gui/statuspopup.cpp:417
msgid "(D) debug map view"
msgstr ""
-#: src/gui/statuspopup.cpp:420
+#: src/gui/statuspopup.cpp:421
msgid "(u) ultra map view"
msgstr ""
-#: src/gui/statuspopup.cpp:424
+#: src/gui/statuspopup.cpp:425
msgid "(U) ultra map view 2"
msgstr ""
-#: src/gui/statuspopup.cpp:428
+#: src/gui/statuspopup.cpp:429
msgid "(e) empty map view"
msgstr ""
-#: src/gui/statuspopup.cpp:432
+#: src/gui/statuspopup.cpp:433
msgid "(b) black & white map view"
msgstr ""
-#: src/gui/statuspopup.cpp:436
+#: src/gui/statuspopup.cpp:437
msgid "(?) map view"
msgstr ""
-#: src/gui/statuspopup.cpp:444
+#: src/gui/statuspopup.cpp:445
msgid "(f) use #flar for magic attack"
msgstr ""
-#: src/gui/statuspopup.cpp:449
+#: src/gui/statuspopup.cpp:450
msgid "(c) use #chiza for magic attack"
msgstr ""
-#: src/gui/statuspopup.cpp:454
+#: src/gui/statuspopup.cpp:455
msgid "(I) use #ingrav for magic attack"
msgstr ""
-#: src/gui/statuspopup.cpp:459
+#: src/gui/statuspopup.cpp:460
msgid "(F) use #frillyar for magic attack"
msgstr ""
-#: src/gui/statuspopup.cpp:464
+#: src/gui/statuspopup.cpp:465
msgid "(U) use #upmarmu for magic attack"
msgstr ""
-#: src/gui/statuspopup.cpp:468
+#: src/gui/statuspopup.cpp:469
msgid "(?) magic attack"
msgstr ""
-#: src/gui/statuspopup.cpp:477
+#: src/gui/statuspopup.cpp:478
msgid "(D) default imitation"
msgstr ""
-#: src/gui/statuspopup.cpp:481
+#: src/gui/statuspopup.cpp:482
msgid "(O) outfits imitation"
msgstr ""
-#: src/gui/statuspopup.cpp:485
+#: src/gui/statuspopup.cpp:486
msgid "(?) imitation"
msgstr "(?) "
-#: src/gui/statuspopup.cpp:494
+#: src/gui/statuspopup.cpp:495
msgid "(O) on keyboard"
msgstr ""
-#: src/gui/statuspopup.cpp:497
+#: src/gui/statuspopup.cpp:498
msgid "(A) away"
msgstr "(A) "
-#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
+#: src/gui/statuspopup.cpp:501 src/gui/statuspopup.cpp:521
msgid "(?) away"
msgstr "(?) 不在で"
-#: src/gui/statuspopup.cpp:508
+#: src/gui/statuspopup.cpp:509
msgid "(G) game camera mode"
msgstr ""
-#: src/gui/statuspopup.cpp:512
+#: src/gui/statuspopup.cpp:513
msgid "(F) free camera mode"
msgstr ""
-#: src/gui/statuspopup.cpp:516
+#: src/gui/statuspopup.cpp:517
msgid "(D) design camera mode"
msgstr ""
-#: src/gui/statuspopup.cpp:527
+#: src/gui/statuspopup.cpp:528
msgid "Game modifiers are disabled"
msgstr ""
-#: src/gui/statuspopup.cpp:532
+#: src/gui/statuspopup.cpp:533
msgid "Game modifiers are enabled"
msgstr ""
-#: src/gui/statuswindow.cpp:142 src/gui/statuswindow.cpp:272
-#: src/gui/statuswindow.cpp:335
+#: src/gui/statuswindow.cpp:143 src/gui/statuswindow.cpp:273
+#: src/gui/statuswindow.cpp:336
#, c-format
msgid "Level: %d"
msgstr "レベル: %d"
-#: src/gui/statuswindow.cpp:143 src/gui/statuswindow.cpp:258
-#: src/gui/statuswindow.cpp:302
+#: src/gui/statuswindow.cpp:144 src/gui/statuswindow.cpp:259
+#: src/gui/statuswindow.cpp:303
#, c-format
msgid "Money: %s"
msgstr "GP:%s"
-#: src/gui/statuswindow.cpp:149
+#: src/gui/statuswindow.cpp:150
msgid "HP:"
msgstr "HP:"
-#: src/gui/statuswindow.cpp:156
+#: src/gui/statuswindow.cpp:157
msgid "Exp:"
msgstr "経験値:"
-#: src/gui/statuswindow.cpp:170
+#: src/gui/statuswindow.cpp:171
msgid "MP:"
msgstr "MP:"
-#: src/gui/statuswindow.cpp:202 src/gui/statuswindow.cpp:385
+#: src/gui/statuswindow.cpp:203 src/gui/statuswindow.cpp:386
#, c-format
msgid "Job: %d"
msgstr "ジョブ: %d"
-#: src/gui/statuswindow.cpp:203
+#: src/gui/statuswindow.cpp:204
msgid "Job:"
msgstr "ジョブポイント:"
-#: src/gui/statuswindow.cpp:261 src/gui/statuswindow.cpp:309
+#: src/gui/statuswindow.cpp:262 src/gui/statuswindow.cpp:310
#, c-format
msgid "Character points: %d"
msgstr "キャラクターポイント: %d"
-#: src/gui/statuswindow.cpp:267
+#: src/gui/statuswindow.cpp:268
#, c-format
msgid "Level: %d (GM %d)"
msgstr "レベル: %d (GM %d)"
-#: src/gui/statuswindow.cpp:323
+#: src/gui/statuswindow.cpp:324
#, c-format
msgid "Correction points: %d"
msgstr "修正点: %d"
-#: src/gui/statuswindow.cpp:646 src/gui/statuswindow.cpp:711
-#: src/gui/statuswindow.cpp:731 src/gui/statuswindow.cpp:747
-#: src/gui/statuswindow.cpp:793 src/gui/statuswindow.cpp:822
-#: src/gui/statuswindow.cpp:845 src/gui/statuswindow.cpp:864
+#: src/gui/statuswindow.cpp:647 src/gui/statuswindow.cpp:712
+#: src/gui/statuswindow.cpp:732 src/gui/statuswindow.cpp:748
+#: src/gui/statuswindow.cpp:794 src/gui/statuswindow.cpp:823
+#: src/gui/statuswindow.cpp:846 src/gui/statuswindow.cpp:865
msgid "(D)"
msgstr "(D)"
-#: src/gui/statuswindow.cpp:649 src/gui/statuswindow.cpp:772
+#: src/gui/statuswindow.cpp:650 src/gui/statuswindow.cpp:773
msgid "(I)"
msgstr "(I)"
-#: src/gui/statuswindow.cpp:652 src/gui/statuswindow.cpp:769
+#: src/gui/statuswindow.cpp:653 src/gui/statuswindow.cpp:770
msgid "(c)"
msgstr "(c)"
-#: src/gui/statuswindow.cpp:655
+#: src/gui/statuswindow.cpp:656
msgid "(C)"
msgstr "(C)"
-#: src/gui/statuswindow.cpp:658 src/gui/statuswindow.cpp:756
+#: src/gui/statuswindow.cpp:659 src/gui/statuswindow.cpp:757
msgid "(d)"
msgstr "(d)"
-#: src/gui/statuswindow.cpp:661 src/gui/statuswindow.cpp:675
-#: src/gui/statuswindow.cpp:704 src/gui/statuswindow.cpp:723
-#: src/gui/statuswindow.cpp:740 src/gui/statuswindow.cpp:759
-#: src/gui/statuswindow.cpp:781 src/gui/statuswindow.cpp:811
-#: src/gui/statuswindow.cpp:837 src/gui/statuswindow.cpp:851
-#: src/gui/statuswindow.cpp:867 src/gui/statuswindow.cpp:880
+#: src/gui/statuswindow.cpp:662 src/gui/statuswindow.cpp:676
+#: src/gui/statuswindow.cpp:705 src/gui/statuswindow.cpp:724
+#: src/gui/statuswindow.cpp:741 src/gui/statuswindow.cpp:760
+#: src/gui/statuswindow.cpp:782 src/gui/statuswindow.cpp:812
+#: src/gui/statuswindow.cpp:838 src/gui/statuswindow.cpp:852
+#: src/gui/statuswindow.cpp:868 src/gui/statuswindow.cpp:881
msgid "(?)"
msgstr "(?)"
-#: src/gui/statuswindow.cpp:672
+#: src/gui/statuswindow.cpp:673
msgid "(a)"
msgstr "(a)"
-#: src/gui/statuswindow.cpp:683
+#: src/gui/statuswindow.cpp:684
msgid "(0)"
msgstr "(0)"
-#: src/gui/statuswindow.cpp:686
+#: src/gui/statuswindow.cpp:687
msgid "(1)"
msgstr "(1)"
-#: src/gui/statuswindow.cpp:689
+#: src/gui/statuswindow.cpp:690
msgid "(2)"
msgstr "(2)"
-#: src/gui/statuswindow.cpp:692 src/gui/statuswindow.cpp:799
+#: src/gui/statuswindow.cpp:693 src/gui/statuswindow.cpp:800
msgid "(3)"
msgstr "(3)"
-#: src/gui/statuswindow.cpp:695
+#: src/gui/statuswindow.cpp:696
msgid "(5)"
msgstr "(5)"
-#: src/gui/statuswindow.cpp:698
+#: src/gui/statuswindow.cpp:699
msgid "(7)"
msgstr "(7)"
-#: src/gui/statuswindow.cpp:701 src/gui/statuswindow.cpp:753
-#: src/gui/statuswindow.cpp:808 src/gui/statuswindow.cpp:877
+#: src/gui/statuswindow.cpp:702 src/gui/statuswindow.cpp:754
+#: src/gui/statuswindow.cpp:809 src/gui/statuswindow.cpp:878
msgid "(A)"
msgstr "(A)"
-#: src/gui/statuswindow.cpp:714
+#: src/gui/statuswindow.cpp:715
msgid "(R)"
msgstr "(R)"
-#: src/gui/statuswindow.cpp:717
+#: src/gui/statuswindow.cpp:718
msgid "(M)"
msgstr "(M)"
-#: src/gui/statuswindow.cpp:720
+#: src/gui/statuswindow.cpp:721
msgid "(P)"
msgstr "(P)"
-#: src/gui/statuswindow.cpp:734
+#: src/gui/statuswindow.cpp:735
msgid "(s)"
msgstr "(s)"
-#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:790
+#: src/gui/statuswindow.cpp:738 src/gui/statuswindow.cpp:791
msgid "(S)"
msgstr "(S)"
-#: src/gui/statuswindow.cpp:750 src/gui/statuswindow.cpp:805
-#: src/gui/statuswindow.cpp:858
+#: src/gui/statuswindow.cpp:751 src/gui/statuswindow.cpp:806
+#: src/gui/statuswindow.cpp:859
msgid "(G)"
msgstr "(G)"
-#: src/gui/statuswindow.cpp:766
+#: src/gui/statuswindow.cpp:767
msgid "(f)"
msgstr "(f)"
-#: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:796
-#: src/gui/statuswindow.cpp:861
+#: src/gui/statuswindow.cpp:776 src/gui/statuswindow.cpp:797
+#: src/gui/statuswindow.cpp:862
msgid "(F)"
msgstr "(F)"
-#: src/gui/statuswindow.cpp:778 src/gui/statuswindow.cpp:828
+#: src/gui/statuswindow.cpp:779 src/gui/statuswindow.cpp:829
msgid "(U)"
msgstr "(U)"
-#: src/gui/statuswindow.cpp:802
+#: src/gui/statuswindow.cpp:803
msgid "(g)"
msgstr "(g)"
-#: src/gui/statuswindow.cpp:819
+#: src/gui/statuswindow.cpp:820
msgid "(N)"
msgstr "(N)"
-#: src/gui/statuswindow.cpp:825
+#: src/gui/statuswindow.cpp:826
msgid "(u)"
msgstr "(u)"
-#: src/gui/statuswindow.cpp:831
+#: src/gui/statuswindow.cpp:832
msgid "(e)"
msgstr "(e)"
-#: src/gui/statuswindow.cpp:834
+#: src/gui/statuswindow.cpp:835
msgid "(b)"
msgstr "(b)"
-#: src/gui/statuswindow.cpp:848 src/gui/statuswindow.cpp:874
+#: src/gui/statuswindow.cpp:849 src/gui/statuswindow.cpp:875
msgid "(O)"
msgstr "(O)"
@@ -3224,24 +3253,24 @@ msgstr "了承しました。待っています…。"
msgid "Trade: You"
msgstr "交換:あなたと"
-#: src/gui/tradewindow.cpp:110 src/gui/tradewindow.cpp:166
+#: src/gui/tradewindow.cpp:111 src/gui/tradewindow.cpp:167
#, c-format
msgid "You get %s"
msgstr "%sを手に入れた"
-#: src/gui/tradewindow.cpp:111
+#: src/gui/tradewindow.cpp:112
msgid "You give:"
msgstr "あげる物:"
-#: src/gui/tradewindow.cpp:115
+#: src/gui/tradewindow.cpp:116
msgid "Change"
msgstr "変更"
-#: src/gui/tradewindow.cpp:374
+#: src/gui/tradewindow.cpp:375
msgid "You don't have enough money."
msgstr "現金不足です。"
-#: src/gui/tradewindow.cpp:453
+#: src/gui/tradewindow.cpp:454
msgid "Failed adding item. You can not overlap one kind of item on the window."
msgstr ""
"アイテムを追加することに失敗しました。アイテム一種類を一つのウインドウ上で重"
@@ -3252,33 +3281,33 @@ msgstr ""
msgid "Name: %s"
msgstr "名前: %s"
-#: src/gui/updaterwindow.cpp:136
+#: src/gui/updaterwindow.cpp:138
msgid "Updating..."
msgstr "更新しています..."
-#: src/gui/updaterwindow.cpp:155
+#: src/gui/updaterwindow.cpp:159
msgid "Connecting..."
msgstr "接続しています..."
-#: src/gui/updaterwindow.cpp:158
+#: src/gui/updaterwindow.cpp:162
msgid "Play"
msgstr "プレイ"
-#: src/gui/updaterwindow.cpp:556
+#: src/gui/updaterwindow.cpp:564
msgid "##1 The update process is incomplete."
msgstr "##1 アップデートは完了していません。"
#. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:558
+#: src/gui/updaterwindow.cpp:566
msgid "##1 It is strongly recommended that"
msgstr "##1 とても推奨されます。"
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:560
+#: src/gui/updaterwindow.cpp:568
msgid "##1 you try again later."
msgstr ""
-#: src/gui/updaterwindow.cpp:686
+#: src/gui/updaterwindow.cpp:744
msgid "Completed"
msgstr "完了"
@@ -3430,23 +3459,23 @@ msgstr ""
msgid "Road Point"
msgstr "ロードのポイント"
-#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:471
+#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:472
msgid "Who Is Online - Updating"
msgstr ""
-#: src/gui/whoisonline.cpp:101
+#: src/gui/whoisonline.cpp:102
msgid "Update"
msgstr "アップデート"
-#: src/gui/whoisonline.cpp:294
+#: src/gui/whoisonline.cpp:295
msgid "Who Is Online - "
msgstr ""
-#: src/gui/whoisonline.cpp:485
+#: src/gui/whoisonline.cpp:486
msgid "Who Is Online - error"
msgstr ""
-#: src/gui/whoisonline.cpp:516
+#: src/gui/whoisonline.cpp:517
msgid "Who Is Online - Update"
msgstr ""
@@ -3511,7 +3540,8 @@ msgid "This command makes <nick> a channel operator."
msgstr "このコマンドでは、入力したユーザーをチャンネルのオペレータとなる"
#: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
-#: src/net/ea/gui/guildtab.cpp:69 src/net/ea/gui/partytab.cpp:85
+#: src/gui/widgets/guildchattab.cpp:61 src/net/ea/gui/guildtab.cpp:69
+#: src/net/ea/gui/partytab.cpp:85
msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
msgstr ""
"入力するニックネームにスペースが入っている場合、ダブルコーテーション(\"\")で"
@@ -3553,6 +3583,41 @@ msgstr "%sからのアナウンス:"
msgid "%s whispers: %s"
msgstr "%s ささやく: %s"
+#: src/gui/widgets/guildchattab.cpp:59 src/net/ea/gui/guildtab.cpp:67
+#: src/net/ea/gui/partytab.cpp:83
+msgid "Command: /invite <nick>"
+msgstr "コマンド: /invite <プレイヤー名>"
+
+#: src/gui/widgets/guildchattab.cpp:60 src/net/ea/gui/guildtab.cpp:68
+msgid "This command invites <nick> to the guild you're in."
+msgstr "このコマンドでは、入力したプレイヤーを自分のギルドに招待します。"
+
+#: src/gui/widgets/guildchattab.cpp:66 src/net/ea/gui/guildtab.cpp:74
+#: src/net/ea/gui/partytab.cpp:90
+msgid "Command: /leave"
+msgstr "コマンド: /leave"
+
+#: src/gui/widgets/guildchattab.cpp:67 src/net/ea/gui/guildtab.cpp:75
+msgid "This command causes the player to leave the guild."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:109 src/net/ea/gui/guildtab.cpp:135
+#: src/net/ea/gui/partytab.cpp:69
+msgid "/help > Display this help."
+msgstr "/helpでこのヘルプを表示する。"
+
+#: src/gui/widgets/guildchattab.cpp:110 src/net/ea/gui/guildtab.cpp:136
+msgid "/invite > Invite a player to your guild"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:111 src/net/ea/gui/guildtab.cpp:137
+msgid "/leave > Leave the guild you are in"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:112 src/net/ea/gui/guildtab.cpp:138
+msgid "/kick > Kick some one from the guild you are in"
+msgstr ""
+
#: src/gui/widgets/setupitem.cpp:271 src/gui/widgets/setupitem.cpp:394
msgid "Edit"
msgstr "エディット"
@@ -4083,67 +4148,67 @@ msgid ""
"strange behaviour."
msgstr ""
-#: src/localplayer.cpp:372
+#: src/localplayer.cpp:370
msgid "You were killed by "
msgstr ""
-#: src/localplayer.cpp:1403
+#: src/localplayer.cpp:1401
msgid "Tried to pick up nonexistent item."
msgstr ""
-#: src/localplayer.cpp:1405
+#: src/localplayer.cpp:1403
msgid "Item is too heavy."
msgstr ""
-#: src/localplayer.cpp:1407
+#: src/localplayer.cpp:1405
msgid "Item is too far away."
msgstr ""
-#: src/localplayer.cpp:1409
+#: src/localplayer.cpp:1407
msgid "Inventory is full."
msgstr ""
-#: src/localplayer.cpp:1411
+#: src/localplayer.cpp:1409
msgid "Stack is too big."
msgstr ""
-#: src/localplayer.cpp:1414
+#: src/localplayer.cpp:1412
msgid "Item belongs to someone else."
msgstr ""
-#: src/localplayer.cpp:1417
+#: src/localplayer.cpp:1415
msgid "Unknown problem picking up item."
msgstr ""
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1441
+#: src/localplayer.cpp:1439
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
msgstr[0] ""
-#: src/localplayer.cpp:3175
+#: src/localplayer.cpp:3173
msgid "Away"
msgstr "去って"
-#: src/localplayer.cpp:3476
+#: src/localplayer.cpp:3474
msgid "Follow: "
msgstr "従う: "
-#: src/localplayer.cpp:3478 src/localplayer.cpp:3493
+#: src/localplayer.cpp:3476 src/localplayer.cpp:3491
msgid "Follow canceled"
msgstr ""
-#: src/localplayer.cpp:3485
+#: src/localplayer.cpp:3483
msgid "Imitation: "
msgstr "擬い: "
-#: src/localplayer.cpp:3487 src/localplayer.cpp:3495
+#: src/localplayer.cpp:3485 src/localplayer.cpp:3493
msgid "Imitation canceled"
msgstr ""
-#: src/localplayer.cpp:3847
+#: src/localplayer.cpp:3845
msgid "You see "
msgstr "あなた"
@@ -4319,28 +4384,28 @@ msgstr "キャラクターを削除した。"
msgid "Failed to delete character."
msgstr "キャラ削除失敗"
-#: src/net/ea/chathandler.cpp:60 src/net/ea/chathandler.cpp:66
-#: src/net/ea/chathandler.cpp:71 src/net/ea/chathandler.cpp:77
-#: src/net/ea/chathandler.cpp:82 src/net/ea/chathandler.cpp:88
-#: src/net/ea/chathandler.cpp:95 src/net/ea/chathandler.cpp:101
+#: src/net/ea/chathandler.cpp:61 src/net/ea/chathandler.cpp:67
+#: src/net/ea/chathandler.cpp:72 src/net/ea/chathandler.cpp:78
+#: src/net/ea/chathandler.cpp:83 src/net/ea/chathandler.cpp:89
+#: src/net/ea/chathandler.cpp:96 src/net/ea/chathandler.cpp:102
msgid "Channels are not supported!"
msgstr "チャンネルはサポートされていない。"
-#: src/net/ea/chathandler.cpp:128
+#: src/net/ea/chathandler.cpp:129
#, c-format
msgid "Whisper could not be sent, %s is offline."
msgstr ""
-#: src/net/ea/chathandler.cpp:136
+#: src/net/ea/chathandler.cpp:137
#, c-format
msgid "Whisper could not be sent, ignored by %s."
msgstr ""
-#: src/net/ea/chathandler.cpp:348
+#: src/net/ea/chathandler.cpp:355
msgid "MVP player."
msgstr "プレイヤー MVP"
-#: src/net/ea/chathandler.cpp:352
+#: src/net/ea/chathandler.cpp:359
msgid "MVP player: "
msgstr "プレイヤー MVP "
@@ -4357,38 +4422,6 @@ msgstr "ゲーム"
msgid "Request to quit denied!"
msgstr ""
-#: src/net/ea/gui/guildtab.cpp:67 src/net/ea/gui/partytab.cpp:83
-msgid "Command: /invite <nick>"
-msgstr "コマンド: /invite <プレイヤー名>"
-
-#: src/net/ea/gui/guildtab.cpp:68
-msgid "This command invites <nick> to the guild you're in."
-msgstr "このコマンドでは、入力したプレイヤーを自分のギルドに招待します。"
-
-#: src/net/ea/gui/guildtab.cpp:74 src/net/ea/gui/partytab.cpp:90
-msgid "Command: /leave"
-msgstr "コマンド: /leave"
-
-#: src/net/ea/gui/guildtab.cpp:75
-msgid "This command causes the player to leave the guild."
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:135 src/net/ea/gui/partytab.cpp:69
-msgid "/help > Display this help."
-msgstr "/helpでこのヘルプを表示する。"
-
-#: src/net/ea/gui/guildtab.cpp:136
-msgid "/invite > Invite a player to your guild"
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:137
-msgid "/leave > Leave the guild you are in"
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:138
-msgid "/kick > Kick some one from the guild you are in"
-msgstr ""
-
#: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
msgid "Guild created."
msgstr "ギルド作成成功"
@@ -4405,85 +4438,81 @@ msgstr ""
msgid "Unknown server response."
msgstr "不明なサーバーの応答。"
-#: src/net/ea/guildhandler.cpp:180
+#: src/net/ea/guildhandler.cpp:181
#, c-format
msgid "Guild name: %s"
msgstr "ギルド名:%s"
-#: src/net/ea/guildhandler.cpp:182
+#: src/net/ea/guildhandler.cpp:183
#, c-format
msgid "Guild master: %s"
msgstr "ギルドマスタ: %s"
-#: src/net/ea/guildhandler.cpp:184
+#: src/net/ea/guildhandler.cpp:185
#, c-format
msgid "Guild level: %d"
msgstr "ギルドレベル:%d"
-#: src/net/ea/guildhandler.cpp:186
+#: src/net/ea/guildhandler.cpp:187
#, c-format
msgid "Online members: %d"
msgstr "オンラインウザー: %d"
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:189
#, c-format
msgid "Max members: %d"
msgstr "最大のメンバー: %d"
-#: src/net/ea/guildhandler.cpp:190
+#: src/net/ea/guildhandler.cpp:191
#, c-format
msgid "Average level: %d"
msgstr "平均レベル: %d"
-#: src/net/ea/guildhandler.cpp:192
+#: src/net/ea/guildhandler.cpp:193
#, c-format
msgid "Guild exp: %d"
msgstr "ギルド経験:%d"
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:195
#, c-format
msgid "Guild next exp: %d"
msgstr ""
-#: src/net/ea/guildhandler.cpp:196
+#: src/net/ea/guildhandler.cpp:197
#, c-format
msgid "Guild castle: %s"
msgstr "ギルド城:%s"
-#: src/net/ea/guildhandler.cpp:402
+#: src/net/ea/guildhandler.cpp:403
msgid "Could not inivte user to guild."
msgstr ""
-#: src/net/ea/guildhandler.cpp:406
+#: src/net/ea/guildhandler.cpp:407
msgid "User rejected guild invite."
msgstr ""
-#: src/net/ea/guildhandler.cpp:410
+#: src/net/ea/guildhandler.cpp:411
msgid "User is now part of your guild."
msgstr ""
-#: src/net/ea/guildhandler.cpp:414
+#: src/net/ea/guildhandler.cpp:415
msgid "Your guild is full."
msgstr ""
-#: src/net/ea/guildhandler.cpp:418
+#: src/net/ea/guildhandler.cpp:419
msgid "Unknown guild invite response."
msgstr ""
-#: src/net/ea/guildhandler.cpp:438
-msgid "You have left the guild."
-msgstr ""
-
-#: src/net/ea/guildhandler.cpp:452
+#: src/net/ea/guildhandler.cpp:453
#, c-format
msgid "%s has left your guild."
msgstr ""
-#: src/net/ea/guildhandler.cpp:483
+#: src/net/ea/guildhandler.cpp:484
msgid "You was kicked from guild."
msgstr ""
-#: src/net/ea/guildhandler.cpp:496
+#: src/net/ea/guildhandler.cpp:497
#, c-format
msgid "%s has kicked from your guild."
msgstr ""
@@ -4711,12 +4740,12 @@ msgstr ""
msgid "You have left the party."
msgstr "パーティから離れた。"
-#: src/net/ea/partyhandler.cpp:368
+#: src/net/ea/partyhandler.cpp:369
#, c-format
msgid "%s has left your party."
msgstr "%sがパーティから離れた。"
-#: src/net/ea/partyhandler.cpp:444
+#: src/net/ea/partyhandler.cpp:448
#, c-format
msgid "An unknown member tried to say: %s"
msgstr "不明なメンバーが言おうとした事: %s"
@@ -4841,7 +4870,7 @@ msgid "You're pining for the fjords."
msgstr "お前の魂は北極まで飛ばれた。"
#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
-#: src/net/ea/playerhandler.cpp:425
+#: src/net/ea/playerhandler.cpp:428
msgid "Message"
msgstr "メッセージ"
@@ -4854,21 +4883,21 @@ msgstr "持っているアイテムは体重より半分以上なので、体力
msgid "You are carrying less than half your weight. You can regain health."
msgstr ""
-#: src/net/ea/playerhandler.cpp:451
+#: src/net/ea/playerhandler.cpp:454
#, c-format
msgid "You picked up %s."
msgstr ""
-#: src/net/ea/playerhandler.cpp:457
+#: src/net/ea/playerhandler.cpp:460
#, c-format
msgid "You spent %s."
msgstr "あなたは %s を費やし"
-#: src/net/ea/playerhandler.cpp:501
+#: src/net/ea/playerhandler.cpp:506
msgid "Cannot raise skill!"
msgstr "スキルはもう上がらない!"
-#: src/net/ea/playerhandler.cpp:618
+#: src/net/ea/playerhandler.cpp:624
msgid "Equip arrows first."
msgstr "矢を先に装備してください。"
@@ -5007,7 +5036,7 @@ msgstr "取引中止"
msgid "Trade completed."
msgstr "取引完了"
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:258
msgid "Strength"
msgstr "強さ"
@@ -5016,7 +5045,7 @@ msgstr "強さ"
msgid "Strength %+.1f"
msgstr "強度 (str) %+.1f"
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:259
msgid "Agility"
msgstr "素早さ"
@@ -5025,7 +5054,7 @@ msgstr "素早さ"
msgid "Agility %+.1f"
msgstr "機敏さ (agi) %+.1f"
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:262
msgid "Dexterity"
msgstr "器用さ"
@@ -5034,7 +5063,7 @@ msgstr "器用さ"
msgid "Dexterity %+.1f"
msgstr "器用さ (dex) %+.1f"
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:260
msgid "Vitality"
msgstr "活力"
@@ -5043,7 +5072,7 @@ msgstr "活力"
msgid "Vitality %+.1f"
msgstr "活気 (vit) %+.1f"
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:261
msgid "Intelligence"
msgstr "知能"
@@ -5313,111 +5342,115 @@ msgstr ""
msgid "Unable to sell unsellable item."
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:109
+#: src/net/tmwa/generalhandler.cpp:108
#, c-format
msgid "Strength %+d"
msgstr "強さ %+d"
-#: src/net/tmwa/generalhandler.cpp:110
+#: src/net/tmwa/generalhandler.cpp:109
#, c-format
msgid "Agility %+d"
msgstr "俊敏さ%+d"
-#: src/net/tmwa/generalhandler.cpp:111
+#: src/net/tmwa/generalhandler.cpp:110
#, c-format
msgid "Vitality %+d"
msgstr "活力 %+d"
-#: src/net/tmwa/generalhandler.cpp:112
+#: src/net/tmwa/generalhandler.cpp:111
#, c-format
msgid "Intelligence %+d"
msgstr "知能 %+d"
-#: src/net/tmwa/generalhandler.cpp:113
+#: src/net/tmwa/generalhandler.cpp:112
#, c-format
msgid "Dexterity %+d"
msgstr "正確さ %+d"
-#: src/net/tmwa/generalhandler.cpp:114
+#: src/net/tmwa/generalhandler.cpp:113
#, c-format
msgid "Luck %+d"
msgstr "運 %+d"
-#: src/net/tmwa/generalhandler.cpp:140
+#: src/net/tmwa/generalhandler.cpp:139
msgid "Authentication failed."
msgstr "認証に失敗しました。"
-#: src/net/tmwa/generalhandler.cpp:143
+#: src/net/tmwa/generalhandler.cpp:142
msgid "No servers available."
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:147
+#: src/net/tmwa/generalhandler.cpp:146
msgid "Someone else is trying to use this account."
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:150
+#: src/net/tmwa/generalhandler.cpp:149
msgid "This account is already logged in."
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:153
+#: src/net/tmwa/generalhandler.cpp:152
msgid "Speed hack detected."
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:156
+#: src/net/tmwa/generalhandler.cpp:155
msgid "Duplicated login."
msgstr "重複しログイン。"
-#: src/net/tmwa/generalhandler.cpp:159
+#: src/net/tmwa/generalhandler.cpp:158
msgid "Unknown connection error."
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:232
+#: src/net/tmwa/generalhandler.cpp:231
msgid "Got disconnected from server!"
msgstr "サーバーから切断された。"
-#: src/net/tmwa/generalhandler.cpp:264
+#: src/net/tmwa/generalhandler.cpp:263
msgid "Luck"
msgstr "運"
-#: src/net/tmwa/generalhandler.cpp:267
+#: src/net/tmwa/generalhandler.cpp:266
msgid "Defense"
msgstr "防御"
-#: src/net/tmwa/generalhandler.cpp:268
+#: src/net/tmwa/generalhandler.cpp:267
msgid "M.Attack"
msgstr "特攻撃"
-#: src/net/tmwa/generalhandler.cpp:269
+#: src/net/tmwa/generalhandler.cpp:268
msgid "M.Defense"
msgstr "特防御"
-#: src/net/tmwa/generalhandler.cpp:271
+#: src/net/tmwa/generalhandler.cpp:270
#, no-c-format
msgid "% Accuracy"
msgstr "% 精度"
-#: src/net/tmwa/generalhandler.cpp:273
+#: src/net/tmwa/generalhandler.cpp:272
#, no-c-format
msgid "% Evade"
msgstr "% 回避"
-#: src/net/tmwa/generalhandler.cpp:275
+#: src/net/tmwa/generalhandler.cpp:274
#, no-c-format
msgid "% Critical"
msgstr "% 危機"
-#: src/net/tmwa/generalhandler.cpp:276
+#: src/net/tmwa/generalhandler.cpp:275
msgid "Attack Delay"
msgstr "攻撃遅延"
-#: src/net/tmwa/generalhandler.cpp:278
+#: src/net/tmwa/generalhandler.cpp:277
msgid "Walk Delay"
msgstr " 徒歩遅延"
-#: src/net/tmwa/generalhandler.cpp:280
+#: src/net/tmwa/generalhandler.cpp:279
msgid "Attack Range"
msgstr "攻撃距離"
+#: src/net/tmwa/generalhandler.cpp:281
+msgid "Damage per sec."
+msgstr ""
+
#: src/net/tmwa/network.cpp:152
msgid "Empty address given to Network::connect()!"
msgstr ""
@@ -5451,31 +5484,31 @@ msgstr "フローティング'...'バブル"
msgid "Floating bubble"
msgstr "フローティングバブル"
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:248
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:246
#: src/resources/monsterdb.cpp:84
msgid "unnamed"
msgstr "名前なし"
-#: src/resources/itemdb.cpp:65
+#: src/resources/itemdb.cpp:63
#, c-format
msgid "Attack %+d"
msgstr "攻撃 %+d"
-#: src/resources/itemdb.cpp:66
+#: src/resources/itemdb.cpp:64
#, c-format
msgid "Defense %+d"
msgstr "防御 %+d"
-#: src/resources/itemdb.cpp:67
+#: src/resources/itemdb.cpp:65
#, c-format
msgid "HP %+d"
msgstr "HP %+d"
-#: src/resources/itemdb.cpp:68
+#: src/resources/itemdb.cpp:66
#, c-format
msgid "MP %+d"
msgstr "MP %+d"
-#: src/resources/itemdb.cpp:171
+#: src/resources/itemdb.cpp:169
msgid "Unknown item"
msgstr "不明なアイテム"
diff --git a/po/manaplus.pot b/po/manaplus.pot
index a4346b7d8..5a4a251a7 100644
--- a/po/manaplus.pot
+++ b/po/manaplus.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-20 17:42+0300\n"
+"POT-Creation-Date: 2011-09-02 18:27+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"
@@ -22,271 +22,271 @@ msgstr ""
msgid "Visible on map"
msgstr ""
-#: src/being.cpp:542
+#: src/being.cpp:549
msgid "dodge"
msgstr ""
-#: src/being.cpp:542
+#: src/being.cpp:549
msgid "miss"
msgstr ""
#. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1514
+#: src/being.cpp:1529
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1519
+#: src/being.cpp:1534
msgid "I"
msgstr ""
-#: src/client.cpp:826 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:831 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
msgid "Setup"
msgstr ""
-#: src/client.cpp:909
+#: src/client.cpp:914
msgid "Connecting to server"
msgstr ""
-#: src/client.cpp:940
+#: src/client.cpp:945
msgid "Logging in"
msgstr ""
-#: src/client.cpp:973
+#: src/client.cpp:978
msgid "Entering game world"
msgstr ""
-#: src/client.cpp:1073
+#: src/client.cpp:1078
msgid "Requesting characters"
msgstr ""
-#: src/client.cpp:1104
+#: src/client.cpp:1109
msgid "Connecting to the game server"
msgstr ""
-#: src/client.cpp:1114
+#: src/client.cpp:1119
msgid "Changing game servers"
msgstr ""
-#: src/client.cpp:1151 src/client.cpp:1158 src/client.cpp:1293
+#: src/client.cpp:1156 src/client.cpp:1163 src/client.cpp:1298
#: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
-#: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:395
+#: src/gui/charcreatedialog.cpp:221 src/gui/charselectdialog.cpp:253
+#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
#: src/net/manaserv/charhandler.cpp:227
msgid "Error"
msgstr ""
-#: src/client.cpp:1167
+#: src/client.cpp:1172
msgid "Requesting registration details"
msgstr ""
-#: src/client.cpp:1194
+#: src/client.cpp:1199
msgid "Password Change"
msgstr ""
-#: src/client.cpp:1195
+#: src/client.cpp:1200
msgid "Password changed successfully!"
msgstr ""
-#: src/client.cpp:1214
+#: src/client.cpp:1219
msgid "Email Change"
msgstr ""
-#: src/client.cpp:1215
+#: src/client.cpp:1220
msgid "Email changed successfully!"
msgstr ""
-#: src/client.cpp:1235
+#: src/client.cpp:1240
msgid "Unregister Successful"
msgstr ""
-#: src/client.cpp:1236
+#: src/client.cpp:1241
msgid "Farewell, come back any time..."
msgstr ""
-#: src/client.cpp:1423 src/client.cpp:1453 src/client.cpp:1497
-#: src/client.cpp:1922 src/client.cpp:1929
+#: src/client.cpp:1428 src/client.cpp:1458 src/client.cpp:1502
+#: src/client.cpp:1927 src/client.cpp:1934
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
-#: src/client.cpp:1628
+#: src/client.cpp:1633
#, c-format
msgid "Invalid update host: %s"
msgstr ""
-#: src/client.cpp:1662 src/client.cpp:1668
+#: src/client.cpp:1667 src/client.cpp:1673
msgid "Error creating updates directory!"
msgstr ""
-#: src/client.cpp:1689
+#: src/client.cpp:1694
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
-#: src/commandhandler.cpp:301
+#: src/commandhandler.cpp:303
msgid "Unknown command."
msgstr ""
-#: src/commandhandler.cpp:401
+#: src/commandhandler.cpp:403
msgid "Cannot send empty whispers!"
msgstr ""
-#: src/commandhandler.cpp:415
+#: src/commandhandler.cpp:417
#, c-format
msgid ""
"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
"you."
msgstr ""
-#: src/commandhandler.cpp:435
+#: src/commandhandler.cpp:437
#, c-format
msgid "Requesting to join channel %s."
msgstr ""
-#: src/commandhandler.cpp:451 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:453 src/net/ea/gui/partytab.cpp:125
msgid "Party name is missing."
msgstr ""
-#: src/commandhandler.cpp:462
+#: src/commandhandler.cpp:464
msgid "Guild name is missing."
msgstr ""
-#: src/commandhandler.cpp:475 src/commandhandler.cpp:582
-#: src/commandhandler.cpp:623 src/commandhandler.cpp:653
+#: src/commandhandler.cpp:477 src/commandhandler.cpp:589
+#: src/commandhandler.cpp:630 src/commandhandler.cpp:660
msgid "Please specify a name."
msgstr ""
-#: src/commandhandler.cpp:516
+#: src/commandhandler.cpp:523
msgid "Return toggles chat."
msgstr ""
-#: src/commandhandler.cpp:516
+#: src/commandhandler.cpp:523
msgid "Message closes chat."
msgstr ""
-#: src/commandhandler.cpp:527
+#: src/commandhandler.cpp:534
msgid "Return now toggles chat."
msgstr ""
-#: src/commandhandler.cpp:533
+#: src/commandhandler.cpp:540
msgid "Message now closes chat."
msgstr ""
-#: src/commandhandler.cpp:561
+#: src/commandhandler.cpp:568
msgid "friend"
msgstr ""
-#: src/commandhandler.cpp:566
+#: src/commandhandler.cpp:573
msgid "disregarded"
msgstr ""
-#: src/commandhandler.cpp:571
+#: src/commandhandler.cpp:578
msgid "neutral"
msgstr ""
-#: src/commandhandler.cpp:590
+#: src/commandhandler.cpp:597
#, c-format
msgid "Player already %s!"
msgstr ""
-#: src/commandhandler.cpp:604
+#: src/commandhandler.cpp:611
#, c-format
msgid "Player successfully %s!"
msgstr ""
-#: src/commandhandler.cpp:612
+#: src/commandhandler.cpp:619
#, c-format
msgid "Player could not be %s!"
msgstr ""
-#: src/commandhandler.cpp:634
+#: src/commandhandler.cpp:641
msgid "Player wasn't ignored!"
msgstr ""
-#: src/commandhandler.cpp:641
+#: src/commandhandler.cpp:648
msgid "Player no longer ignored!"
msgstr ""
-#: src/commandhandler.cpp:643
+#: src/commandhandler.cpp:650
msgid "Player could not be unignored!"
msgstr ""
-#: src/commandhandler.cpp:660
+#: src/commandhandler.cpp:667
msgid "Player already erased!"
msgstr ""
-#: src/commandhandler.cpp:671
+#: src/commandhandler.cpp:678
msgid "Player successfully erased!"
msgstr ""
-#: src/commandhandler.cpp:673
+#: src/commandhandler.cpp:680
msgid "Player could not be erased!"
msgstr ""
-#: src/commandhandler.cpp:972 src/commandhandler.cpp:1018
+#: src/commandhandler.cpp:980 src/commandhandler.cpp:1026
#, c-format
msgid "Client uptime: %s"
msgstr ""
-#: src/commandhandler.cpp:982
+#: src/commandhandler.cpp:990
#, c-format
msgid "%d week"
msgid_plural "%d weeks"
msgstr[0] ""
msgstr[1] ""
-#: src/commandhandler.cpp:991
+#: src/commandhandler.cpp:999
#, c-format
msgid "%d day"
msgid_plural "%d days"
msgstr[0] ""
msgstr[1] ""
-#: src/commandhandler.cpp:999
+#: src/commandhandler.cpp:1007
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] ""
msgstr[1] ""
-#: src/commandhandler.cpp:1007
+#: src/commandhandler.cpp:1015
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] ""
msgstr[1] ""
-#: src/commandhandler.cpp:1015
+#: src/commandhandler.cpp:1023
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
msgstr[0] ""
msgstr[1] ""
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1102
msgid "font cache size"
msgstr ""
-#: src/commandhandler.cpp:1106
+#: src/commandhandler.cpp:1114
msgid "Cache size:"
msgstr ""
-#: src/commandhandler.cpp:1110
+#: src/commandhandler.cpp:1118
msgid "Created:"
msgstr ""
-#: src/commandhandler.cpp:1112
+#: src/commandhandler.cpp:1120
msgid "Deleted:"
msgstr ""
-#: src/commandhandler.cpp:1159 src/commandhandler.cpp:1166
+#: src/commandhandler.cpp:1167 src/commandhandler.cpp:1174
msgid "Resource images:"
msgstr ""
-#: src/commandhandler.cpp:1161 src/commandhandler.cpp:1168
+#: src/commandhandler.cpp:1169 src/commandhandler.cpp:1176
msgid "Resource orphaned images:"
msgstr ""
@@ -295,43 +295,43 @@ msgstr ""
msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
msgstr ""
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:411
+#: src/game.cpp:252 src/gui/widgets/chattab.cpp:409
msgid "General"
msgstr ""
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:413
+#: src/game.cpp:256 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:411
msgid "Debug"
msgstr ""
-#: src/game.cpp:488
+#: src/game.cpp:511
msgid "Screenshot saved as "
msgstr ""
-#: src/game.cpp:496
+#: src/game.cpp:519
msgid "Saving screenshot failed!"
msgstr ""
-#: src/game.cpp:536
+#: src/game.cpp:559
msgid "The connection to the server was lost."
msgstr ""
-#: src/game.cpp:548
+#: src/game.cpp:571
msgid "Network Error"
msgstr ""
-#: src/game.cpp:1213
+#: src/game.cpp:1236
msgid "Ignoring incoming trade requests"
msgstr ""
-#: src/game.cpp:1220
+#: src/game.cpp:1243
msgid "Accepting incoming trade requests"
msgstr ""
-#: src/game.cpp:1606
+#: src/game.cpp:1629
msgid "Could Not Load Map"
msgstr ""
-#: src/game.cpp:1607
+#: src/game.cpp:1630
#, c-format
msgid "Error while loading %s"
msgstr ""
@@ -360,103 +360,103 @@ msgstr ""
msgid "Bot Checker"
msgstr ""
-#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
+#: src/gui/botcheckerwindow.cpp:295 src/gui/setup_relations.cpp:64
msgid "Name"
msgstr ""
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:134
-#: src/gui/popupmenu.cpp:292 src/gui/popupmenu.cpp:617
-#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
+#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:133
+#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:646
+#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:265
msgid "Attack"
msgstr ""
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:279
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:297
#: src/keyboardconfig.cpp:62
msgid "Talk"
msgstr ""
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:245
-#: src/gui/popupmenu.cpp:284 src/gui/popupmenu.cpp:674
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:263
+#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:703
msgid "Move"
msgstr ""
-#: src/gui/botcheckerwindow.cpp:300
+#: src/gui/botcheckerwindow.cpp:299
msgid "Result"
msgstr ""
-#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123
+#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:124
msgid "Reset"
msgstr ""
-#: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:260
-#: src/gui/popupmenu.cpp:281 src/gui/popupmenu.cpp:688
+#: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:98
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:278
+#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:717
msgid "Buy"
msgstr ""
-#: src/gui/buydialog.cpp:88 src/gui/buydialog.cpp:302
-#: src/gui/selldialog.cpp:87 src/gui/selldialog.cpp:324
+#: src/gui/buydialog.cpp:89 src/gui/buydialog.cpp:303
+#: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
#, c-format
msgid "Price: %s / Total: %s"
msgstr ""
#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
#. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:93 src/gui/itemamountwindow.cpp:207
-#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:113
-#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:974
+#: src/gui/buydialog.cpp:94 src/gui/itemamountwindow.cpp:207
+#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:973
msgid "+"
msgstr ""
#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
#. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:96 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:986
+#: src/gui/buydialog.cpp:97 src/gui/itemamountwindow.cpp:206
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:985
msgid "-"
msgstr ""
-#: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
-#: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
-#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:288
+#: src/gui/buydialog.cpp:99 src/gui/quitdialog.cpp:47
+#: src/gui/quitdialog.cpp:49 src/gui/quitdialog.cpp:50
+#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:294
#: src/keyboardconfig.cpp:290
msgid "Quit"
msgstr ""
-#: src/gui/buydialog.cpp:99 src/gui/selldialog.cpp:94
-#: src/gui/statuswindow.cpp:503 src/gui/statuswindow.cpp:552
-#: src/gui/statuswindow.cpp:973 src/gui/statuswindow.cpp:1004
+#: src/gui/buydialog.cpp:100 src/gui/selldialog.cpp:95
+#: src/gui/statuswindow.cpp:504 src/gui/statuswindow.cpp:553
+#: src/gui/statuswindow.cpp:972 src/gui/statuswindow.cpp:1003
msgid "Max"
msgstr ""
#: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:133
+#: src/gui/inventorywindow.cpp:147 src/gui/setup_other.cpp:133
msgid "Shop"
msgstr ""
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:262
-#: src/gui/popupmenu.cpp:282 src/gui/popupmenu.cpp:690
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:280
+#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:719
#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
-#: src/gui/selldialog.cpp:92
+#: src/gui/selldialog.cpp:93
msgid "Sell"
msgstr ""
#: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
-#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
+#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:96
#: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:336
-#: src/gui/popupmenu.cpp:357 src/gui/popupmenu.cpp:460
-#: src/gui/popupmenu.cpp:487 src/gui/popupmenu.cpp:511
-#: src/gui/popupmenu.cpp:525 src/gui/popupmenu.cpp:544
-#: src/gui/popupmenu.cpp:750 src/gui/popupmenu.cpp:774
-#: src/gui/popupmenu.cpp:1684 src/gui/popupmenu.cpp:1712
-#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1811
-#: src/gui/popupmenu.cpp:1846 src/gui/popupmenu.cpp:1886
-#: src/gui/popupmenu.cpp:1953 src/gui/popupmenu.cpp:1973
-#: src/gui/quitdialog.cpp:59 src/gui/register.cpp:82 src/gui/setup.cpp:71
-#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:354
+#: src/gui/popupmenu.cpp:375 src/gui/popupmenu.cpp:489
+#: src/gui/popupmenu.cpp:516 src/gui/popupmenu.cpp:540
+#: src/gui/popupmenu.cpp:554 src/gui/popupmenu.cpp:573
+#: src/gui/popupmenu.cpp:790 src/gui/popupmenu.cpp:814
+#: src/gui/popupmenu.cpp:1734 src/gui/popupmenu.cpp:1762
+#: src/gui/popupmenu.cpp:1818 src/gui/popupmenu.cpp:1861
+#: src/gui/popupmenu.cpp:1896 src/gui/popupmenu.cpp:1936
+#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2023
+#: src/gui/quitdialog.cpp:54 src/gui/register.cpp:82 src/gui/setup.cpp:72
+#: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:238
#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updaterwindow.cpp:157
+#: src/gui/updaterwindow.cpp:161
msgid "Cancel"
msgstr ""
@@ -488,7 +488,7 @@ msgid "The email address entries mismatch."
msgstr ""
#: src/gui/changepassworddialog.cpp:50 src/gui/changepassworddialog.cpp:59
-#: src/gui/charselectdialog.cpp:140
+#: src/gui/charselectdialog.cpp:139
msgid "Change Password"
msgstr ""
@@ -523,121 +523,121 @@ msgstr ""
msgid "Create Character"
msgstr ""
-#: src/gui/charcreatedialog.cpp:73 src/gui/logindialog.cpp:94
+#: src/gui/charcreatedialog.cpp:76 src/gui/logindialog.cpp:94
#: src/gui/register.cpp:75
msgid "Name:"
msgstr ""
#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
#. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:76 src/gui/charcreatedialog.cpp:81
-#: src/gui/charcreatedialog.cpp:87 src/gui/outfitwindow.cpp:81
+#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:84
+#: src/gui/charcreatedialog.cpp:90 src/gui/outfitwindow.cpp:85
msgid ">"
msgstr ""
#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
#. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:82
-#: src/gui/charcreatedialog.cpp:88 src/gui/outfitwindow.cpp:80
+#: src/gui/charcreatedialog.cpp:82 src/gui/charcreatedialog.cpp:85
+#: src/gui/charcreatedialog.cpp:91 src/gui/outfitwindow.cpp:84
msgid "<"
msgstr ""
-#: src/gui/charcreatedialog.cpp:80
+#: src/gui/charcreatedialog.cpp:83
msgid "Hair color:"
msgstr ""
-#: src/gui/charcreatedialog.cpp:83
+#: src/gui/charcreatedialog.cpp:86
msgid "Hair style:"
msgstr ""
-#: src/gui/charcreatedialog.cpp:89
+#: src/gui/charcreatedialog.cpp:92
msgid "Race:"
msgstr ""
-#: src/gui/charcreatedialog.cpp:92 src/gui/charselectdialog.cpp:479
-#: src/gui/socialwindow.cpp:1033
+#: src/gui/charcreatedialog.cpp:95 src/gui/charselectdialog.cpp:478
+#: src/gui/socialwindow.cpp:1139
msgid "Create"
msgstr ""
-#: src/gui/charcreatedialog.cpp:94 src/gui/register.cpp:98
+#: src/gui/charcreatedialog.cpp:97 src/gui/register.cpp:98
msgid "Male"
msgstr ""
-#: src/gui/charcreatedialog.cpp:95 src/gui/register.cpp:99
+#: src/gui/charcreatedialog.cpp:98 src/gui/register.cpp:99
msgid "Female"
msgstr ""
-#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:300
+#: src/gui/charcreatedialog.cpp:116 src/gui/charcreatedialog.cpp:303
#, c-format
msgid "Please distribute %d points"
msgstr ""
-#: src/gui/charcreatedialog.cpp:219
+#: src/gui/charcreatedialog.cpp:222
msgid "Your name needs to be at least 4 characters."
msgstr ""
-#: src/gui/charcreatedialog.cpp:291
+#: src/gui/charcreatedialog.cpp:294
msgid "Character stats OK"
msgstr ""
-#: src/gui/charcreatedialog.cpp:305
+#: src/gui/charcreatedialog.cpp:308
#, c-format
msgid "Please remove %d points"
msgstr ""
-#: src/gui/charselectdialog.cpp:77
+#: src/gui/charselectdialog.cpp:76
msgid "Confirm Character Delete"
msgstr ""
-#: src/gui/charselectdialog.cpp:78
+#: src/gui/charselectdialog.cpp:77
msgid "Are you sure you want to delete this character?"
msgstr ""
-#: src/gui/charselectdialog.cpp:126
+#: src/gui/charselectdialog.cpp:125
msgid "Account and Character Management"
msgstr ""
-#: src/gui/charselectdialog.cpp:139
+#: src/gui/charselectdialog.cpp:138
msgid "Switch Login"
msgstr ""
-#: src/gui/charselectdialog.cpp:153 src/gui/unregisterdialog.cpp:50
+#: src/gui/charselectdialog.cpp:152 src/gui/unregisterdialog.cpp:50
#: src/gui/unregisterdialog.cpp:58
msgid "Unregister"
msgstr ""
-#: src/gui/charselectdialog.cpp:162
+#: src/gui/charselectdialog.cpp:161
msgid "Change Email"
msgstr ""
-#: src/gui/charselectdialog.cpp:254
+#: src/gui/charselectdialog.cpp:253
msgid "Incorrect password"
msgstr ""
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:286
msgid "Enter password for deleting character"
msgstr ""
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:286
msgid "Enter password:"
msgstr ""
-#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:292
-#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
-#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
+#: src/gui/charselectdialog.cpp:408 src/gui/serverdialog.cpp:298
+#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:122
+#: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:241
msgid "Delete"
msgstr ""
-#: src/gui/charselectdialog.cpp:467
+#: src/gui/charselectdialog.cpp:466
msgid "Choose"
msgstr ""
-#: src/gui/charselectdialog.cpp:470
+#: src/gui/charselectdialog.cpp:469
#, c-format
msgid "Level %d"
msgstr ""
-#: src/gui/charselectdialog.cpp:481 src/gui/charselectdialog.cpp:482
+#: src/gui/charselectdialog.cpp:480 src/gui/charselectdialog.cpp:481
msgid "(empty)"
msgstr ""
@@ -709,12 +709,12 @@ msgstr ""
msgid "Chat"
msgstr ""
-#: src/gui/chatwindow.cpp:606
+#: src/gui/chatwindow.cpp:609
#, c-format
msgid "Present: %s; %d players are present."
msgstr ""
-#: src/gui/chatwindow.cpp:993
+#: src/gui/chatwindow.cpp:996
#, c-format
msgid "Whispering to %s: %s"
msgstr ""
@@ -727,145 +727,145 @@ msgstr ""
msgid "No"
msgstr ""
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:150
-#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:384
-#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:632
-#: src/gui/popupmenu.cpp:640
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:149
+#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:402
+#: src/gui/popupmenu.cpp:408 src/gui/popupmenu.cpp:661
+#: src/gui/popupmenu.cpp:669
msgid "Ignore"
msgstr ""
-#: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
+#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:97
#: src/gui/setup_other.cpp:64
msgid "Map"
msgstr ""
-#: src/gui/debugwindow.cpp:71
+#: src/gui/debugwindow.cpp:73
msgid "Target"
msgstr ""
-#: src/gui/debugwindow.cpp:72
+#: src/gui/debugwindow.cpp:74
msgid "Net"
msgstr ""
-#: src/gui/debugwindow.cpp:145 src/gui/debugwindow.cpp:220
-#: src/gui/debugwindow.cpp:249
+#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
+#: src/gui/debugwindow.cpp:251
msgid "Music:"
msgstr ""
-#: src/gui/debugwindow.cpp:146 src/gui/debugwindow.cpp:224
-#: src/gui/debugwindow.cpp:251
+#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:226
+#: src/gui/debugwindow.cpp:253
msgid "Map:"
msgstr ""
-#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
-#: src/gui/debugwindow.cpp:250
+#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:224
+#: src/gui/debugwindow.cpp:252
msgid "Minimap:"
msgstr ""
-#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:218
-#: src/gui/debugwindow.cpp:247
+#: src/gui/debugwindow.cpp:150 src/gui/debugwindow.cpp:220
+#: src/gui/debugwindow.cpp:249
msgid "Cursor:"
msgstr ""
-#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:201
-#: src/gui/debugwindow.cpp:206
+#: src/gui/debugwindow.cpp:151 src/gui/debugwindow.cpp:203
+#: src/gui/debugwindow.cpp:208
msgid "Player Position:"
msgstr ""
-#: src/gui/debugwindow.cpp:152
+#: src/gui/debugwindow.cpp:154
msgid "Particle count:"
msgstr ""
-#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:235
-#: src/gui/debugwindow.cpp:254
+#: src/gui/debugwindow.cpp:156 src/gui/debugwindow.cpp:237
+#: src/gui/debugwindow.cpp:256
msgid "Map actors count:"
msgstr ""
-#: src/gui/debugwindow.cpp:162 src/gui/debugwindow.cpp:173
+#: src/gui/debugwindow.cpp:164 src/gui/debugwindow.cpp:175
#, c-format
msgid "%d FPS (Software)"
msgstr ""
-#: src/gui/debugwindow.cpp:166
+#: src/gui/debugwindow.cpp:168
#, c-format
msgid "%d FPS (fast OpenGL)"
msgstr ""
-#: src/gui/debugwindow.cpp:169
+#: src/gui/debugwindow.cpp:171
#, c-format
msgid "%d FPS (old OpenGL)"
msgstr ""
-#: src/gui/debugwindow.cpp:176
+#: src/gui/debugwindow.cpp:178
#, c-format
msgid "%d FPS"
msgstr ""
-#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:240
+#: src/gui/debugwindow.cpp:190 src/gui/debugwindow.cpp:242
msgid "Textures count:"
msgstr ""
-#: src/gui/debugwindow.cpp:231
+#: src/gui/debugwindow.cpp:233
#, c-format
msgid "Particle count: %d"
msgstr ""
-#: src/gui/debugwindow.cpp:268 src/gui/debugwindow.cpp:299
-#: src/gui/debugwindow.cpp:343
+#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:301
+#: src/gui/debugwindow.cpp:345
msgid "Target:"
msgstr ""
-#: src/gui/debugwindow.cpp:269 src/gui/debugwindow.cpp:304
-#: src/gui/debugwindow.cpp:344
+#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:306
+#: src/gui/debugwindow.cpp:346
msgid "Target Id:"
msgstr ""
-#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:308
-#: src/gui/debugwindow.cpp:313 src/gui/debugwindow.cpp:345
+#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:310
+#: src/gui/debugwindow.cpp:315 src/gui/debugwindow.cpp:347
msgid "Target Level:"
msgstr ""
-#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:316
-#: src/gui/debugwindow.cpp:346
+#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:318
+#: src/gui/debugwindow.cpp:348
msgid "Target Party:"
msgstr ""
-#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:319
-#: src/gui/debugwindow.cpp:347
+#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:321
+#: src/gui/debugwindow.cpp:349
msgid "Target Guild:"
msgstr ""
-#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:333
-#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:348
+#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:335
+#: src/gui/debugwindow.cpp:340 src/gui/debugwindow.cpp:350
msgid "Attack delay:"
msgstr ""
-#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:323
-#: src/gui/debugwindow.cpp:349
+#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:325
+#: src/gui/debugwindow.cpp:351
msgid "Minimal hit:"
msgstr ""
-#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:325
-#: src/gui/debugwindow.cpp:350
+#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:327
+#: src/gui/debugwindow.cpp:352
msgid "Maximum hit:"
msgstr ""
-#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:327
-#: src/gui/debugwindow.cpp:351
+#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:329
+#: src/gui/debugwindow.cpp:353
msgid "Critical hit:"
msgstr ""
-#: src/gui/debugwindow.cpp:385 src/gui/debugwindow.cpp:390
+#: src/gui/debugwindow.cpp:387 src/gui/debugwindow.cpp:392
#, c-format
msgid "Ping: %s ms"
msgstr ""
-#: src/gui/debugwindow.cpp:393
+#: src/gui/debugwindow.cpp:395
#, c-format
msgid "In: %d bytes/s"
msgstr ""
-#: src/gui/debugwindow.cpp:395
+#: src/gui/debugwindow.cpp:397
#, c-format
msgid "Out: %d bytes/s"
msgstr ""
@@ -874,26 +874,26 @@ msgstr ""
msgid "Did You Know?"
msgstr ""
-#: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
-#: src/gui/inventorywindow.cpp:175 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:559 src/gui/shopwindow.cpp:111
+#: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
+#: src/gui/inventorywindow.cpp:176 src/gui/npcdialog.cpp:53
+#: src/gui/popupmenu.cpp:588 src/gui/shopwindow.cpp:113
msgid "Close"
msgstr ""
-#: src/gui/didyouknowwindow.cpp:62
+#: src/gui/didyouknowwindow.cpp:64
msgid "< Previous"
msgstr ""
-#: src/gui/didyouknowwindow.cpp:63
+#: src/gui/didyouknowwindow.cpp:65
msgid "Next >"
msgstr ""
-#: src/gui/didyouknowwindow.cpp:64
+#: src/gui/didyouknowwindow.cpp:66
msgid "Auto open this window"
msgstr ""
#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:58 src/gui/textdialog.cpp:50
+#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:53 src/gui/textdialog.cpp:50
msgid "OK"
msgstr ""
@@ -901,10 +901,10 @@ msgstr ""
msgid "Equipment"
msgstr ""
-#: src/gui/equipmentwindow.cpp:93 src/gui/inventorywindow.cpp:130
-#: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
-#: src/gui/popupmenu.cpp:1643 src/gui/popupmenu.cpp:1738
-#: src/gui/popupmenu.cpp:1783
+#: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:131
+#: src/gui/inventorywindow.cpp:512 src/gui/inventorywindow.cpp:521
+#: src/gui/popupmenu.cpp:1693 src/gui/popupmenu.cpp:1788
+#: src/gui/popupmenu.cpp:1833
msgid "Unequip"
msgstr ""
@@ -917,75 +917,75 @@ msgstr ""
msgid "Inventory"
msgstr ""
-#: src/gui/inventorywindow.cpp:104
+#: src/gui/inventorywindow.cpp:105
msgid "Slots:"
msgstr ""
-#: src/gui/inventorywindow.cpp:115
+#: src/gui/inventorywindow.cpp:116
msgid "Filter:"
msgstr ""
-#: src/gui/inventorywindow.cpp:116
+#: src/gui/inventorywindow.cpp:117
msgid "Sort:"
msgstr ""
-#: src/gui/inventorywindow.cpp:122
+#: src/gui/inventorywindow.cpp:123
msgid "na"
msgstr ""
-#: src/gui/inventorywindow.cpp:123
+#: src/gui/inventorywindow.cpp:124
msgid "az"
msgstr ""
-#: src/gui/inventorywindow.cpp:124
+#: src/gui/inventorywindow.cpp:125
msgid "id"
msgstr ""
-#: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:513
-#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1645
-#: src/gui/popupmenu.cpp:1740 src/gui/popupmenu.cpp:1785
+#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
+#: src/gui/inventorywindow.cpp:523 src/gui/popupmenu.cpp:1695
+#: src/gui/popupmenu.cpp:1790 src/gui/popupmenu.cpp:1835
msgid "Equip"
msgstr ""
-#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
-#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1648
-#: src/gui/popupmenu.cpp:1707 src/gui/popupmenu.cpp:1744
-#: src/gui/popupmenu.cpp:1788
+#: src/gui/inventorywindow.cpp:130 src/gui/inventorywindow.cpp:515
+#: src/gui/inventorywindow.cpp:519 src/gui/popupmenu.cpp:1698
+#: src/gui/popupmenu.cpp:1757 src/gui/popupmenu.cpp:1794
+#: src/gui/popupmenu.cpp:1838
msgid "Use"
msgstr ""
-#: src/gui/inventorywindow.cpp:143 src/gui/inventorywindow.cpp:619
-#: src/gui/popupmenu.cpp:1652 src/gui/popupmenu.cpp:1749
-#: src/gui/popupmenu.cpp:1792
+#: src/gui/inventorywindow.cpp:144 src/gui/inventorywindow.cpp:620
+#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1799
+#: src/gui/popupmenu.cpp:1842
msgid "Drop..."
msgstr ""
-#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1661
-#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1801
+#: src/gui/inventorywindow.cpp:145 src/gui/popupmenu.cpp:1711
+#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1851
msgid "Split"
msgstr ""
-#: src/gui/inventorywindow.cpp:145 src/gui/outfitwindow.cpp:59
-#: src/gui/popupmenu.cpp:520
+#: src/gui/inventorywindow.cpp:146 src/gui/outfitwindow.cpp:60
+#: src/gui/popupmenu.cpp:549
msgid "Outfits"
msgstr ""
-#: src/gui/inventorywindow.cpp:148
+#: src/gui/inventorywindow.cpp:149
msgid "Weight:"
msgstr ""
-#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
-#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
-#: src/gui/popupmenu.cpp:1804 src/gui/setup.cpp:72
+#: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:611
+#: src/gui/popupmenu.cpp:1674 src/gui/popupmenu.cpp:1811
+#: src/gui/popupmenu.cpp:1854 src/gui/setup.cpp:73
msgid "Store"
msgstr ""
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1668
+#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1718
msgid "Retrieve"
msgstr ""
-#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1657
-#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1797
+#: src/gui/inventorywindow.cpp:622 src/gui/popupmenu.cpp:1707
+#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1847
#: src/gui/windowmenu.cpp:97
msgid "Drop"
msgstr ""
@@ -1026,11 +1026,11 @@ msgstr ""
msgid "Unknown."
msgstr ""
-#: src/gui/itempopup.cpp:176 src/gui/itempopup.cpp:182
+#: src/gui/itempopup.cpp:177 src/gui/itempopup.cpp:183
msgid ", "
msgstr ""
-#: src/gui/itempopup.cpp:192
+#: src/gui/itempopup.cpp:193
#, c-format
msgid "Weight: %s"
msgstr ""
@@ -1039,90 +1039,94 @@ msgstr ""
msgid "Kill stats"
msgstr ""
-#: src/gui/killstats.cpp:64
+#: src/gui/killstats.cpp:65
msgid "Reset stats"
msgstr ""
-#: src/gui/killstats.cpp:65
+#: src/gui/killstats.cpp:66
msgid "Reset timer"
msgstr ""
-#: src/gui/killstats.cpp:69 src/gui/killstats.cpp:205
+#: src/gui/killstats.cpp:70 src/gui/killstats.cpp:206
#, c-format
msgid "Level: %d at %f%%"
msgstr ""
-#: src/gui/killstats.cpp:73 src/gui/killstats.cpp:210
+#: src/gui/killstats.cpp:74 src/gui/killstats.cpp:211
#, c-format
msgid "Exp: %d/%d Left: %d"
msgstr ""
-#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:216
-#: src/gui/killstats.cpp:225
+#: src/gui/killstats.cpp:77 src/gui/killstats.cpp:217
+#: src/gui/killstats.cpp:226
#, c-format
msgid "1%% = %d exp, avg mob for 1%%: %s"
msgstr ""
-#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:142
-#: src/gui/killstats.cpp:234
+#: src/gui/killstats.cpp:80 src/gui/killstats.cpp:143
+#: src/gui/killstats.cpp:235
#, c-format
msgid "Kills: %s, total exp: %s"
msgstr ""
-#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
-#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:230
+#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145
+#: src/gui/killstats.cpp:221 src/gui/killstats.cpp:231
#, c-format
msgid "Avg Exp: %s, No. of avg mob to next level: %s"
msgstr ""
-#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:162
-#: src/gui/killstats.cpp:237
+#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:163
+#: src/gui/killstats.cpp:238
#, c-format
msgid "Kills/Min: %s, Exp/Min: %s"
msgstr ""
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:89 src/gui/killstats.cpp:94
-#: src/gui/killstats.cpp:289 src/gui/killstats.cpp:305
-#: src/gui/killstats.cpp:323
+#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:90 src/gui/killstats.cpp:95
+#: src/gui/killstats.cpp:290 src/gui/killstats.cpp:306
+#: src/gui/killstats.cpp:324
#, c-format
msgid "Exp speed per %d min: %s"
msgid_plural "Exp speed per %d min: %s"
msgstr[0] ""
msgstr[1] ""
-#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
+#: src/gui/killstats.cpp:88 src/gui/killstats.cpp:93 src/gui/killstats.cpp:98
#, c-format
msgid "Time for next level per %d min: %s"
msgid_plural "Time for next level per %d min: %s"
msgstr[0] ""
msgstr[1] ""
-#: src/gui/killstats.cpp:100 src/gui/killstats.cpp:241
+#: src/gui/killstats.cpp:101 src/gui/killstats.cpp:242
msgid "Last kill exp:"
msgstr ""
-#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:355
-#: src/gui/killstats.cpp:361 src/gui/killstats.cpp:367
-#: src/gui/killstats.cpp:372
+#: src/gui/killstats.cpp:103 src/gui/killstats.cpp:356
+#: src/gui/killstats.cpp:362 src/gui/killstats.cpp:368
+#: src/gui/killstats.cpp:373
msgid "Time before jacko spawn:"
msgstr ""
-#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:301
-#: src/gui/killstats.cpp:311 src/gui/killstats.cpp:318
-#: src/gui/killstats.cpp:330 src/gui/killstats.cpp:337
+#: src/gui/killstats.cpp:295 src/gui/killstats.cpp:302
+#: src/gui/killstats.cpp:312 src/gui/killstats.cpp:319
+#: src/gui/killstats.cpp:331 src/gui/killstats.cpp:338
#, c-format
msgid " Time for next level: %s"
msgstr ""
-#: src/gui/killstats.cpp:361
+#: src/gui/killstats.cpp:362
#, c-format
msgid "%s %d?"
msgstr ""
-#: src/gui/killstats.cpp:367
+#: src/gui/killstats.cpp:368
msgid "jacko spawning"
msgstr ""
+#: src/guildmanager.cpp:464 src/net/ea/guildhandler.cpp:439
+msgid "You have left the guild."
+msgstr ""
+
#: src/gui/logindialog.cpp:59
msgid "Normal"
msgstr ""
@@ -1139,7 +1143,7 @@ msgstr ""
msgid "Login"
msgstr ""
-#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:246
+#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:252
#: src/gui/widgets/chattab.cpp:173
msgid "Server:"
msgstr ""
@@ -1221,11 +1225,11 @@ msgstr ""
msgid "NPC"
msgstr ""
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:561
+#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:590
msgid "Clear"
msgstr ""
-#: src/gui/npcdialog.cpp:222
+#: src/gui/npcdialog.cpp:223
msgid "> Next"
msgstr ""
@@ -1241,346 +1245,346 @@ msgstr ""
msgid "Failed to send as sender or letter invalid."
msgstr ""
-#: src/gui/outfitwindow.cpp:82 src/gui/outfitwindow.cpp:886
+#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:890
#, c-format
msgid "Outfit: %d"
msgstr ""
-#: src/gui/outfitwindow.cpp:84 src/gui/outfitwindow.cpp:888
+#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:892
#, c-format
msgid "Key: %s"
msgstr ""
-#: src/gui/outfitwindow.cpp:87
+#: src/gui/outfitwindow.cpp:91
msgid "Unequip first"
msgstr ""
-#: src/gui/outfitwindow.cpp:90
+#: src/gui/outfitwindow.cpp:94
msgid "Away outfit"
msgstr ""
-#: src/gui/popupmenu.cpp:133 src/gui/popupmenu.cpp:616
+#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:645
#: src/gui/widgets/tradetab.cpp:44
msgid "Trade"
msgstr ""
-#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:375
+#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:393
msgid "Whisper"
msgstr ""
-#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:621
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:650
msgid "Heal"
msgstr ""
-#: src/gui/popupmenu.cpp:146 src/gui/popupmenu.cpp:381
-#: src/gui/popupmenu.cpp:628
+#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:399
+#: src/gui/popupmenu.cpp:657
msgid "Be friend"
msgstr ""
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:383
-#: src/gui/popupmenu.cpp:389 src/gui/popupmenu.cpp:408
-#: src/gui/popupmenu.cpp:630 src/gui/popupmenu.cpp:638
-#: src/gui/popupmenu.cpp:662
+#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:156
+#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:401
+#: src/gui/popupmenu.cpp:407 src/gui/popupmenu.cpp:426
+#: src/gui/popupmenu.cpp:659 src/gui/popupmenu.cpp:667
+#: src/gui/popupmenu.cpp:691
msgid "Disregard"
msgstr ""
-#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:161
-#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:177
-#: src/gui/popupmenu.cpp:385 src/gui/popupmenu.cpp:391
-#: src/gui/popupmenu.cpp:398 src/gui/popupmenu.cpp:403
-#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
-#: src/gui/popupmenu.cpp:649 src/gui/popupmenu.cpp:655
+#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:160
+#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:176
+#: src/gui/popupmenu.cpp:403 src/gui/popupmenu.cpp:409
+#: src/gui/popupmenu.cpp:416 src/gui/popupmenu.cpp:421
+#: src/gui/popupmenu.cpp:662 src/gui/popupmenu.cpp:670
+#: src/gui/popupmenu.cpp:678 src/gui/popupmenu.cpp:684
msgid "Erase"
msgstr ""
-#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:175
-#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:395
-#: src/gui/popupmenu.cpp:402 src/gui/popupmenu.cpp:407
-#: src/gui/popupmenu.cpp:646 src/gui/popupmenu.cpp:654
-#: src/gui/popupmenu.cpp:660
+#: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:174
+#: src/gui/popupmenu.cpp:181 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:425
+#: src/gui/popupmenu.cpp:675 src/gui/popupmenu.cpp:683
+#: src/gui/popupmenu.cpp:689
msgid "Unignore"
msgstr ""
-#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:186
-#: src/gui/popupmenu.cpp:397 src/gui/popupmenu.cpp:410
-#: src/gui/popupmenu.cpp:648 src/gui/popupmenu.cpp:664
+#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:185
+#: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:428
+#: src/gui/popupmenu.cpp:677 src/gui/popupmenu.cpp:693
#: src/playerrelations.cpp:400
msgid "Completely ignore"
msgstr ""
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:418
-#: src/gui/popupmenu.cpp:672
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:436
+#: src/gui/popupmenu.cpp:701
msgid "Follow"
msgstr ""
-#: src/gui/popupmenu.cpp:196 src/gui/popupmenu.cpp:419
-#: src/gui/popupmenu.cpp:673
+#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:437
+#: src/gui/popupmenu.cpp:702
msgid "Imitation"
msgstr ""
-#: src/gui/popupmenu.cpp:206 src/gui/popupmenu.cpp:710
+#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:739
msgid "Invite to party"
msgstr ""
-#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:428
-#: src/gui/popupmenu.cpp:715
+#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:744
msgid "Kick from party"
msgstr ""
-#: src/gui/popupmenu.cpp:226 src/gui/popupmenu.cpp:439
-#: src/gui/popupmenu.cpp:729
+#: src/gui/popupmenu.cpp:225 src/gui/popupmenu.cpp:237
+#: src/gui/popupmenu.cpp:460 src/gui/popupmenu.cpp:761
msgid "Kick from guild"
msgstr ""
-#: src/gui/popupmenu.cpp:228 src/gui/popupmenu.cpp:441
-#: src/gui/popupmenu.cpp:731
+#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:242
+#: src/gui/popupmenu.cpp:465 src/gui/popupmenu.cpp:766
msgid "Change pos in guild"
msgstr ""
-#: src/gui/popupmenu.cpp:234 src/gui/popupmenu.cpp:446
-#: src/gui/popupmenu.cpp:737
+#: src/gui/popupmenu.cpp:251 src/gui/popupmenu.cpp:474
+#: src/gui/popupmenu.cpp:776
msgid "Invite to guild"
msgstr ""
-#: src/gui/popupmenu.cpp:242
+#: src/gui/popupmenu.cpp:260
msgid "Kick player"
msgstr ""
-#: src/gui/popupmenu.cpp:244
+#: src/gui/popupmenu.cpp:262
msgid "Nuke"
msgstr ""
-#: src/gui/popupmenu.cpp:247 src/gui/popupmenu.cpp:675
+#: src/gui/popupmenu.cpp:265 src/gui/popupmenu.cpp:704
msgid "Show Items"
msgstr ""
-#: src/gui/popupmenu.cpp:248 src/gui/popupmenu.cpp:676
-#: src/gui/popupmenu.cpp:1970
+#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:705
+#: src/gui/popupmenu.cpp:2020
msgid "Undress"
msgstr ""
-#: src/gui/popupmenu.cpp:250 src/gui/popupmenu.cpp:286
-#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:678
-#: src/gui/popupmenu.cpp:746
+#: src/gui/popupmenu.cpp:268 src/gui/popupmenu.cpp:304
+#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:707
+#: src/gui/popupmenu.cpp:786
msgid "Add comment"
msgstr ""
-#: src/gui/popupmenu.cpp:268 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:695
+#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:482
+#: src/gui/popupmenu.cpp:724
msgid "Buy (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:454
-#: src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:483
+#: src/gui/popupmenu.cpp:726
msgid "Sell (?)"
msgstr ""
-#: src/gui/popupmenu.cpp:298
+#: src/gui/popupmenu.cpp:316
msgid "Kick"
msgstr ""
-#: src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:327
msgid "Remove from attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:315
+#: src/gui/popupmenu.cpp:333
msgid "Add to priority attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:317
+#: src/gui/popupmenu.cpp:335
msgid "Add to attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:320
+#: src/gui/popupmenu.cpp:338
msgid "Add to ignore list"
msgstr ""
-#: src/gui/popupmenu.cpp:333 src/gui/popupmenu.cpp:457
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:486
msgid "Add name to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:483
+#: src/gui/popupmenu.cpp:512
msgid "Pick up"
msgstr ""
-#: src/gui/popupmenu.cpp:484 src/gui/popupmenu.cpp:1682
-#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1805
+#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:1732
+#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1855
msgid "Add to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:501
+#: src/gui/popupmenu.cpp:530
msgid "Map Item"
msgstr ""
-#: src/gui/popupmenu.cpp:502
+#: src/gui/popupmenu.cpp:531
msgid "Rename"
msgstr ""
-#: src/gui/popupmenu.cpp:503 src/gui/popupmenu.cpp:1923
-#: src/gui/popupmenu.cpp:1941 src/gui/popupmenu.cpp:1946
+#: src/gui/popupmenu.cpp:532 src/gui/popupmenu.cpp:1973
+#: src/gui/popupmenu.cpp:1991 src/gui/popupmenu.cpp:1996
msgid "Remove"
msgstr ""
-#: src/gui/popupmenu.cpp:508
+#: src/gui/popupmenu.cpp:537
msgid "Warp"
msgstr ""
-#: src/gui/popupmenu.cpp:522
+#: src/gui/popupmenu.cpp:551
msgid "Load old outfits"
msgstr ""
-#: src/gui/popupmenu.cpp:538 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:567 src/gui/windowmenu.cpp:96
msgid "Spells"
msgstr ""
-#: src/gui/popupmenu.cpp:540
+#: src/gui/popupmenu.cpp:569
msgid "Load old spells"
msgstr ""
-#: src/gui/popupmenu.cpp:541
+#: src/gui/popupmenu.cpp:570
msgid "Edit spell"
msgstr ""
-#: src/gui/popupmenu.cpp:567
+#: src/gui/popupmenu.cpp:596
msgid "Disable highlight"
msgstr ""
-#: src/gui/popupmenu.cpp:572
+#: src/gui/popupmenu.cpp:601
msgid "Enable highlight"
msgstr ""
-#: src/gui/popupmenu.cpp:577
-msgid "Dont remove name"
+#: src/gui/popupmenu.cpp:606
+msgid "Don't remove name"
msgstr ""
-#: src/gui/popupmenu.cpp:582
+#: src/gui/popupmenu.cpp:611
msgid "Remove name"
msgstr ""
-#: src/gui/popupmenu.cpp:587
+#: src/gui/popupmenu.cpp:616
msgid "Enable away"
msgstr ""
-#: src/gui/popupmenu.cpp:592
+#: src/gui/popupmenu.cpp:621
msgid "Disable away"
msgstr ""
-#: src/gui/popupmenu.cpp:598 src/gui/socialwindow.cpp:1035
+#: src/gui/popupmenu.cpp:627 src/gui/socialwindow.cpp:1141
msgid "Leave"
msgstr ""
-#: src/gui/popupmenu.cpp:758
+#: src/gui/popupmenu.cpp:798
msgid "Change guild position"
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1189
+#: src/gui/popupmenu.cpp:1234
msgid "Rename map sign "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1191
+#: src/gui/popupmenu.cpp:1236
msgid "Name: "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1241
+#: src/gui/popupmenu.cpp:1286
msgid "Player comment "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1243
+#: src/gui/popupmenu.cpp:1288
msgid "Comment: "
msgstr ""
-#: src/gui/popupmenu.cpp:1607
+#: src/gui/popupmenu.cpp:1657
msgid "Add to trade"
msgstr ""
-#: src/gui/popupmenu.cpp:1613
+#: src/gui/popupmenu.cpp:1663
msgid "Add to trade 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1616
+#: src/gui/popupmenu.cpp:1666
msgid "Add to trade half"
msgstr ""
-#: src/gui/popupmenu.cpp:1618
+#: src/gui/popupmenu.cpp:1668
msgid "Add to trade all"
msgstr ""
-#: src/gui/popupmenu.cpp:1630
+#: src/gui/popupmenu.cpp:1680
msgid "Store 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1633
+#: src/gui/popupmenu.cpp:1683
msgid "Store half"
msgstr ""
-#: src/gui/popupmenu.cpp:1635
+#: src/gui/popupmenu.cpp:1685
msgid "Store all"
msgstr ""
-#: src/gui/popupmenu.cpp:1653 src/gui/popupmenu.cpp:1750
-#: src/gui/popupmenu.cpp:1793
+#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1800
+#: src/gui/popupmenu.cpp:1843
msgid "Drop all"
msgstr ""
-#: src/gui/popupmenu.cpp:1674
+#: src/gui/popupmenu.cpp:1724
msgid "Retrieve 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1677
+#: src/gui/popupmenu.cpp:1727
msgid "Retrieve half"
msgstr ""
-#: src/gui/popupmenu.cpp:1679
+#: src/gui/popupmenu.cpp:1729
msgid "Retrieve all"
msgstr ""
-#: src/gui/popupmenu.cpp:1710 src/gui/popupmenu.cpp:1766
+#: src/gui/popupmenu.cpp:1760 src/gui/popupmenu.cpp:1816
msgid "Load old item shortcuts"
msgstr ""
-#: src/gui/popupmenu.cpp:1809
+#: src/gui/popupmenu.cpp:1859
msgid "Load old drop shortcuts"
msgstr ""
-#: src/gui/popupmenu.cpp:1835 src/gui/popupmenu.cpp:1870
+#: src/gui/popupmenu.cpp:1885 src/gui/popupmenu.cpp:1920
msgid "Hide"
msgstr ""
-#: src/gui/popupmenu.cpp:1841 src/gui/popupmenu.cpp:1876
+#: src/gui/popupmenu.cpp:1891 src/gui/popupmenu.cpp:1926
msgid "Show"
msgstr ""
-#: src/gui/popupmenu.cpp:1883
+#: src/gui/popupmenu.cpp:1933
msgid "Reset yellow bar"
msgstr ""
-#: src/gui/popupmenu.cpp:1885 src/gui/statuswindow.cpp:240
+#: src/gui/popupmenu.cpp:1935 src/gui/statuswindow.cpp:241
msgid "Copy to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:1903 src/gui/socialwindow.cpp:854
-#: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
+#: src/gui/popupmenu.cpp:1953 src/gui/socialwindow.cpp:958
+#: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028
msgid "(default)"
msgstr ""
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1933
+#: src/gui/popupmenu.cpp:1965 src/gui/popupmenu.cpp:1983
msgid "Move up"
msgstr ""
-#: src/gui/popupmenu.cpp:1920 src/gui/popupmenu.cpp:1938
+#: src/gui/popupmenu.cpp:1970 src/gui/popupmenu.cpp:1988
msgid "Move down"
msgstr ""
-#: src/gui/quitdialog.cpp:56
+#: src/gui/quitdialog.cpp:51
msgid "Switch server"
msgstr ""
-#: src/gui/quitdialog.cpp:57
+#: src/gui/quitdialog.cpp:52
msgid "Switch character"
msgstr ""
@@ -1616,64 +1620,64 @@ msgstr ""
msgid "Passwords do not match."
msgstr ""
-#: src/gui/serverdialog.cpp:231
+#: src/gui/serverdialog.cpp:237
msgid "Choose Your Server"
msgstr ""
-#: src/gui/serverdialog.cpp:242
+#: src/gui/serverdialog.cpp:248
msgid "Choose Your Server *** SAFE MODE ***"
msgstr ""
-#: src/gui/serverdialog.cpp:247
+#: src/gui/serverdialog.cpp:253
msgid "Port:"
msgstr ""
-#: src/gui/serverdialog.cpp:251
+#: src/gui/serverdialog.cpp:257
msgid "Use same ip for game sub servers"
msgstr ""
-#: src/gui/serverdialog.cpp:265
+#: src/gui/serverdialog.cpp:271
msgid "Server type:"
msgstr ""
-#: src/gui/serverdialog.cpp:289
+#: src/gui/serverdialog.cpp:295
msgid "Load"
msgstr ""
-#: src/gui/serverdialog.cpp:290
+#: src/gui/serverdialog.cpp:296
msgid "Connect"
msgstr ""
-#: src/gui/serverdialog.cpp:291
+#: src/gui/serverdialog.cpp:297
msgid "Custom Server"
msgstr ""
-#: src/gui/serverdialog.cpp:396
+#: src/gui/serverdialog.cpp:402
msgid "Please type both the address and the port of a server."
msgstr ""
-#: src/gui/serverdialog.cpp:554
+#: src/gui/serverdialog.cpp:560
#, c-format
msgid "Downloading server list...%2.2f%%"
msgstr ""
-#: src/gui/serverdialog.cpp:559
+#: src/gui/serverdialog.cpp:565
msgid "Waiting for server..."
msgstr ""
-#: src/gui/serverdialog.cpp:563
+#: src/gui/serverdialog.cpp:569
msgid "Preparing download"
msgstr ""
-#: src/gui/serverdialog.cpp:567
+#: src/gui/serverdialog.cpp:573
msgid "Error retreiving server list!"
msgstr ""
-#: src/gui/serverdialog.cpp:672
+#: src/gui/serverdialog.cpp:678
msgid "requires a newer version"
msgstr ""
-#: src/gui/serverdialog.cpp:674
+#: src/gui/serverdialog.cpp:680
#, c-format
msgid "requires v%s"
msgstr ""
@@ -1818,6 +1822,14 @@ msgstr ""
msgid "Use local time"
msgstr ""
+#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:157
+msgid "Other"
+msgstr ""
+
+#: src/gui/setup_chat.cpp:125
+msgid "Highlight words (separated by comma)"
+msgstr ""
+
#: src/gui/setup_colors.cpp:49
msgid "This is what the color looks like"
msgstr ""
@@ -1865,11 +1877,11 @@ msgstr ""
msgid "Alpha:"
msgstr ""
-#: src/gui/setup.cpp:70
+#: src/gui/setup.cpp:71
msgid "Apply"
msgstr ""
-#: src/gui/setup.cpp:73
+#: src/gui/setup.cpp:74
msgid "Reset Windows"
msgstr ""
@@ -2046,34 +2058,42 @@ msgid "Log NPC dialogue"
msgstr ""
#: src/gui/setup_other.cpp:148
-msgid "Other"
+msgid "Bots support"
msgstr ""
#: src/gui/setup_other.cpp:150
-msgid "Enable server side attack"
+msgid "Enable auction bot support"
msgstr ""
#: src/gui/setup_other.cpp:153
+msgid "Enable guild bot support and disable native guild support"
+msgstr ""
+
+#: src/gui/setup_other.cpp:159
+msgid "Enable server side attack"
+msgstr ""
+
+#: src/gui/setup_other.cpp:162
msgid "Enable bot checker"
msgstr ""
-#: src/gui/setup_other.cpp:156
+#: src/gui/setup_other.cpp:165
msgid "Enable buggy servers protection"
msgstr ""
-#: src/gui/setup_other.cpp:159
+#: src/gui/setup_other.cpp:168
msgid "Enable debug log"
msgstr ""
-#: src/gui/setup_other.cpp:162
+#: src/gui/setup_other.cpp:171
msgid "Low traffic mode"
msgstr ""
-#: src/gui/setup_other.cpp:165
+#: src/gui/setup_other.cpp:174
msgid "Hide shield sprite"
msgstr ""
-#: src/gui/setup_other.cpp:168
+#: src/gui/setup_other.cpp:177
msgid "Show background"
msgstr ""
@@ -2169,6 +2189,10 @@ msgstr ""
msgid "Show ip addresses on screenshots"
msgstr ""
+#: src/gui/setup_players.cpp:81
+msgid "Allow self heal with mouse click"
+msgstr ""
+
#: src/gui/setup_relations.cpp:65
msgid "Relation"
msgstr ""
@@ -2441,261 +2465,266 @@ msgstr ""
msgid "Changes will take effect on map change."
msgstr ""
-#: src/gui/shopwindow.cpp:74
+#: src/gui/shopwindow.cpp:75
msgid "Personal Shop"
msgstr ""
-#: src/gui/shopwindow.cpp:116
+#: src/gui/shopwindow.cpp:118
msgid "Buy items"
msgstr ""
-#: src/gui/shopwindow.cpp:117
+#: src/gui/shopwindow.cpp:119
msgid "Sell items"
msgstr ""
-#: src/gui/shopwindow.cpp:119 src/gui/shopwindow.cpp:122
-#: src/gui/tradewindow.cpp:88
+#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
+#: src/gui/tradewindow.cpp:89
msgid "Add"
msgstr ""
-#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
+#: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
msgid "Announce"
msgstr ""
-#: src/gui/shopwindow.cpp:125
+#: src/gui/shopwindow.cpp:127
msgid "Show links in announce"
msgstr ""
-#: src/gui/shopwindow.cpp:723 src/net/ea/tradehandler.cpp:106
+#: src/gui/shopwindow.cpp:148 src/gui/shopwindow.cpp:149
+msgid "Auction"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:748 src/net/ea/tradehandler.cpp:106
#: src/net/manaserv/tradehandler.cpp:127
msgid "Request for Trade"
msgstr ""
-#: src/gui/shopwindow.cpp:724
+#: src/gui/shopwindow.cpp:749
#, c-format
msgid "%s wants to %s %s do you accept?"
msgstr ""
-#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:81
+#: src/gui/skilldialog.cpp:276 src/gui/windowmenu.cpp:81
msgid "Skills"
msgstr ""
-#: src/gui/skilldialog.cpp:283
+#: src/gui/skilldialog.cpp:288
msgid "Up"
msgstr ""
-#: src/gui/skilldialog.cpp:336
+#: src/gui/skilldialog.cpp:341
#, c-format
msgid "Skill points available: %d"
msgstr ""
-#: src/gui/skilldialog.cpp:413
+#: src/gui/skilldialog.cpp:418
#, c-format
msgid "Skill Set %d"
msgstr ""
-#: src/gui/skilldialog.cpp:425
+#: src/gui/skilldialog.cpp:430
#, c-format
msgid "Skill %d"
msgstr ""
-#: src/gui/skilldialog.cpp:492 src/gui/skilldialog.cpp:545
+#: src/gui/skilldialog.cpp:497 src/gui/skilldialog.cpp:550
#, c-format
msgid "Lvl: %d"
msgstr ""
-#: src/gui/skilldialog.cpp:537
+#: src/gui/skilldialog.cpp:542
#, c-format
msgid "Lvl: %d (%+d)"
msgstr ""
-#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
+#: src/gui/socialwindow.cpp:118 src/gui/socialwindow.cpp:216
+#: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52
msgid "Guild"
msgstr ""
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:147
#, c-format
msgid "Invited user %s to guild %s."
msgstr ""
-#: src/gui/socialwindow.cpp:160
+#: src/gui/socialwindow.cpp:161
#, c-format
msgid "Guild %s quit requested."
msgstr ""
-#: src/gui/socialwindow.cpp:187
+#: src/gui/socialwindow.cpp:188
msgid "Member Invite to Guild"
msgstr ""
-#: src/gui/socialwindow.cpp:188
+#: src/gui/socialwindow.cpp:189
#, c-format
msgid "Who would you like to invite to guild %s?"
msgstr ""
-#: src/gui/socialwindow.cpp:197
+#: src/gui/socialwindow.cpp:198
msgid "Leave Guild?"
msgstr ""
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:199
#, c-format
msgid "Are you sure you want to leave guild %s?"
msgstr ""
-#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:319 src/net/ea/gui/partytab.cpp:50
msgid "Party"
msgstr ""
-#: src/gui/socialwindow.cpp:243
+#: src/gui/socialwindow.cpp:347
#, c-format
msgid "Invited user %s to party."
msgstr ""
-#: src/gui/socialwindow.cpp:257
+#: src/gui/socialwindow.cpp:361
#, c-format
msgid "Party %s quit requested."
msgstr ""
-#: src/gui/socialwindow.cpp:284
+#: src/gui/socialwindow.cpp:388
msgid "Member Invite to Party"
msgstr ""
-#: src/gui/socialwindow.cpp:285
+#: src/gui/socialwindow.cpp:389
#, c-format
msgid "Who would you like to invite to party %s?"
msgstr ""
-#: src/gui/socialwindow.cpp:294
+#: src/gui/socialwindow.cpp:398
msgid "Leave Party?"
msgstr ""
-#: src/gui/socialwindow.cpp:295
+#: src/gui/socialwindow.cpp:399
#, c-format
msgid "Are you sure you want to leave party %s?"
msgstr ""
-#: src/gui/socialwindow.cpp:521
+#: src/gui/socialwindow.cpp:625
msgid "Nav"
msgstr ""
-#: src/gui/socialwindow.cpp:799
+#: src/gui/socialwindow.cpp:903
msgid "Atk"
msgstr ""
-#: src/gui/socialwindow.cpp:840
+#: src/gui/socialwindow.cpp:944
msgid "Priority mobs"
msgstr ""
-#: src/gui/socialwindow.cpp:872
+#: src/gui/socialwindow.cpp:976
msgid "Attack mobs"
msgstr ""
-#: src/gui/socialwindow.cpp:907
+#: src/gui/socialwindow.cpp:1011
msgid "Ignore mobs"
msgstr ""
-#: src/gui/socialwindow.cpp:970
+#: src/gui/socialwindow.cpp:1074
msgid "Create Guild"
msgstr ""
-#: src/gui/socialwindow.cpp:971 src/gui/socialwindow.cpp:1387
+#: src/gui/socialwindow.cpp:1075 src/gui/socialwindow.cpp:1503
msgid "Create Party"
msgstr ""
-#: src/gui/socialwindow.cpp:1013 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1117 src/gui/windowmenu.cpp:93
msgid "Social"
msgstr ""
-#: src/gui/socialwindow.cpp:1034
+#: src/gui/socialwindow.cpp:1140
msgid "Invite"
msgstr ""
-#: src/gui/socialwindow.cpp:1176
+#: src/gui/socialwindow.cpp:1286
#, c-format
msgid "Accepted party invite from %s."
msgstr ""
-#: src/gui/socialwindow.cpp:1186
+#: src/gui/socialwindow.cpp:1296
#, c-format
msgid "Rejected party invite from %s."
msgstr ""
-#: src/gui/socialwindow.cpp:1203
+#: src/gui/socialwindow.cpp:1313
#, c-format
msgid "Accepted guild invite from %s."
msgstr ""
-#: src/gui/socialwindow.cpp:1213
+#: src/gui/socialwindow.cpp:1326
#, c-format
msgid "Rejected guild invite from %s."
msgstr ""
-#: src/gui/socialwindow.cpp:1257
+#: src/gui/socialwindow.cpp:1373
#, c-format
msgid "Creating guild called %s."
msgstr ""
-#: src/gui/socialwindow.cpp:1280
+#: src/gui/socialwindow.cpp:1396
#, c-format
msgid "Creating party called %s."
msgstr ""
-#: src/gui/socialwindow.cpp:1294
+#: src/gui/socialwindow.cpp:1410
msgid "Guild Name"
msgstr ""
-#: src/gui/socialwindow.cpp:1295
+#: src/gui/socialwindow.cpp:1411
msgid "Choose your guild's name."
msgstr ""
-#: src/gui/socialwindow.cpp:1309
+#: src/gui/socialwindow.cpp:1425
msgid "Received guild request, but one already exists."
msgstr ""
-#: src/gui/socialwindow.cpp:1315
+#: src/gui/socialwindow.cpp:1431
#, c-format
msgid "%s has invited you to join the guild %s."
msgstr ""
-#: src/gui/socialwindow.cpp:1321
+#: src/gui/socialwindow.cpp:1437
msgid "Accept Guild Invite"
msgstr ""
-#: src/gui/socialwindow.cpp:1336
+#: src/gui/socialwindow.cpp:1452
msgid "Received party request, but one already exists."
msgstr ""
-#: src/gui/socialwindow.cpp:1347
+#: src/gui/socialwindow.cpp:1463
msgid "You have been invited you to join a party."
msgstr ""
-#: src/gui/socialwindow.cpp:1351
+#: src/gui/socialwindow.cpp:1467
#, c-format
msgid "You have been invited to join the %s party."
msgstr ""
-#: src/gui/socialwindow.cpp:1359
+#: src/gui/socialwindow.cpp:1475
#, c-format
msgid "%s has invited you to join their party."
msgstr ""
-#: src/gui/socialwindow.cpp:1364
+#: src/gui/socialwindow.cpp:1480
#, c-format
msgid "%s has invited you to join the %s party."
msgstr ""
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1489
msgid "Accept Party Invite"
msgstr ""
-#: src/gui/socialwindow.cpp:1388
+#: src/gui/socialwindow.cpp:1504
msgid "Cannot create party. You are already in a party"
msgstr ""
-#: src/gui/socialwindow.cpp:1393
+#: src/gui/socialwindow.cpp:1509
msgid "Party Name"
msgstr ""
-#: src/gui/socialwindow.cpp:1394
+#: src/gui/socialwindow.cpp:1510
msgid "Choose your party's name."
msgstr ""
@@ -2703,418 +2732,418 @@ msgstr ""
msgid "Specials"
msgstr ""
-#: src/gui/statuspopup.cpp:197
+#: src/gui/statuspopup.cpp:198
msgid "(D) default moves"
msgstr ""
-#: src/gui/statuspopup.cpp:202
+#: src/gui/statuspopup.cpp:203
msgid "(I) invert moves"
msgstr ""
-#: src/gui/statuspopup.cpp:207
+#: src/gui/statuspopup.cpp:208
msgid "(c) moves with some crazy moves"
msgstr ""
-#: src/gui/statuspopup.cpp:212
+#: src/gui/statuspopup.cpp:213
msgid "(C) moves with crazy moves"
msgstr ""
-#: src/gui/statuspopup.cpp:217
+#: src/gui/statuspopup.cpp:218
msgid "(d) double normal + crazy"
msgstr ""
-#: src/gui/statuspopup.cpp:222
+#: src/gui/statuspopup.cpp:223
msgid "(?) move"
msgstr ""
-#: src/gui/statuspopup.cpp:240
+#: src/gui/statuspopup.cpp:241
msgid "(a) custom crazy move"
msgstr ""
-#: src/gui/statuspopup.cpp:244
+#: src/gui/statuspopup.cpp:245
msgid "(?) crazy move"
msgstr ""
-#: src/gui/statuspopup.cpp:254
+#: src/gui/statuspopup.cpp:255
msgid "(0) default moves to target"
msgstr ""
-#: src/gui/statuspopup.cpp:259
+#: src/gui/statuspopup.cpp:260
msgid "(1) moves to target in distance 1"
msgstr ""
-#: src/gui/statuspopup.cpp:264
+#: src/gui/statuspopup.cpp:265
msgid "(2) moves to target in distance 2"
msgstr ""
-#: src/gui/statuspopup.cpp:269
+#: src/gui/statuspopup.cpp:270
msgid "(3) moves to target in distance 3"
msgstr ""
-#: src/gui/statuspopup.cpp:274
+#: src/gui/statuspopup.cpp:275
msgid "(5) moves to target in distance 5"
msgstr ""
-#: src/gui/statuspopup.cpp:279
+#: src/gui/statuspopup.cpp:280
msgid "(7) moves to target in distance 7"
msgstr ""
-#: src/gui/statuspopup.cpp:284
+#: src/gui/statuspopup.cpp:285
msgid "(A) moves to target in attack range"
msgstr ""
-#: src/gui/statuspopup.cpp:289
+#: src/gui/statuspopup.cpp:290
msgid "(?) move to target"
msgstr ""
-#: src/gui/statuspopup.cpp:297
+#: src/gui/statuspopup.cpp:298
msgid "(D) default follow"
msgstr ""
-#: src/gui/statuspopup.cpp:301
+#: src/gui/statuspopup.cpp:302
msgid "(R) relative follow"
msgstr ""
-#: src/gui/statuspopup.cpp:305
+#: src/gui/statuspopup.cpp:306
msgid "(M) mirror follow"
msgstr ""
-#: src/gui/statuspopup.cpp:309
+#: src/gui/statuspopup.cpp:310
msgid "(P) pet follow"
msgstr ""
-#: src/gui/statuspopup.cpp:313
+#: src/gui/statuspopup.cpp:314
msgid "(?) unknown follow"
msgstr ""
-#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
+#: src/gui/statuspopup.cpp:323 src/gui/statuspopup.cpp:346
msgid "(D) default attack"
msgstr ""
-#: src/gui/statuspopup.cpp:327
+#: src/gui/statuspopup.cpp:328
msgid "(s) switch attack without shield"
msgstr ""
-#: src/gui/statuspopup.cpp:332
+#: src/gui/statuspopup.cpp:333
msgid "(S) switch attack with shield"
msgstr ""
-#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
+#: src/gui/statuspopup.cpp:337 src/gui/statuspopup.cpp:362
msgid "(?) attack"
msgstr ""
-#: src/gui/statuspopup.cpp:349
+#: src/gui/statuspopup.cpp:350
msgid "(G) go and attack"
msgstr ""
-#: src/gui/statuspopup.cpp:353
+#: src/gui/statuspopup.cpp:354
msgid "(A) go, attack, pickup"
msgstr ""
-#: src/gui/statuspopup.cpp:357
+#: src/gui/statuspopup.cpp:358
msgid "(d) without auto attack"
msgstr ""
-#: src/gui/statuspopup.cpp:375
+#: src/gui/statuspopup.cpp:376
msgid "(S) small pick up 1x1 cells"
msgstr ""
-#: src/gui/statuspopup.cpp:379
+#: src/gui/statuspopup.cpp:380
msgid "(D) default pick up 2x1 cells"
msgstr ""
-#: src/gui/statuspopup.cpp:383
+#: src/gui/statuspopup.cpp:384
msgid "(F) forward pick up 2x3 cells"
msgstr ""
-#: src/gui/statuspopup.cpp:387
+#: src/gui/statuspopup.cpp:388
msgid "(3) pick up 3x3 cells"
msgstr ""
-#: src/gui/statuspopup.cpp:391
+#: src/gui/statuspopup.cpp:392
msgid "(g) go and pick up in distance 4"
msgstr ""
-#: src/gui/statuspopup.cpp:395
+#: src/gui/statuspopup.cpp:396
msgid "(G) go and pick up in distance 8"
msgstr ""
-#: src/gui/statuspopup.cpp:399
+#: src/gui/statuspopup.cpp:400
msgid "(A) go and pick up in max distance"
msgstr ""
-#: src/gui/statuspopup.cpp:403
+#: src/gui/statuspopup.cpp:404
msgid "(?) pick up"
msgstr ""
-#: src/gui/statuspopup.cpp:412
+#: src/gui/statuspopup.cpp:413
msgid "(N) normal map view"
msgstr ""
-#: src/gui/statuspopup.cpp:416
+#: src/gui/statuspopup.cpp:417
msgid "(D) debug map view"
msgstr ""
-#: src/gui/statuspopup.cpp:420
+#: src/gui/statuspopup.cpp:421
msgid "(u) ultra map view"
msgstr ""
-#: src/gui/statuspopup.cpp:424
+#: src/gui/statuspopup.cpp:425
msgid "(U) ultra map view 2"
msgstr ""
-#: src/gui/statuspopup.cpp:428
+#: src/gui/statuspopup.cpp:429
msgid "(e) empty map view"
msgstr ""
-#: src/gui/statuspopup.cpp:432
+#: src/gui/statuspopup.cpp:433
msgid "(b) black & white map view"
msgstr ""
-#: src/gui/statuspopup.cpp:436
+#: src/gui/statuspopup.cpp:437
msgid "(?) map view"
msgstr ""
-#: src/gui/statuspopup.cpp:444
+#: src/gui/statuspopup.cpp:445
msgid "(f) use #flar for magic attack"
msgstr ""
-#: src/gui/statuspopup.cpp:449
+#: src/gui/statuspopup.cpp:450
msgid "(c) use #chiza for magic attack"
msgstr ""
-#: src/gui/statuspopup.cpp:454
+#: src/gui/statuspopup.cpp:455
msgid "(I) use #ingrav for magic attack"
msgstr ""
-#: src/gui/statuspopup.cpp:459
+#: src/gui/statuspopup.cpp:460
msgid "(F) use #frillyar for magic attack"
msgstr ""
-#: src/gui/statuspopup.cpp:464
+#: src/gui/statuspopup.cpp:465
msgid "(U) use #upmarmu for magic attack"
msgstr ""
-#: src/gui/statuspopup.cpp:468
+#: src/gui/statuspopup.cpp:469
msgid "(?) magic attack"
msgstr ""
-#: src/gui/statuspopup.cpp:477
+#: src/gui/statuspopup.cpp:478
msgid "(D) default imitation"
msgstr ""
-#: src/gui/statuspopup.cpp:481
+#: src/gui/statuspopup.cpp:482
msgid "(O) outfits imitation"
msgstr ""
-#: src/gui/statuspopup.cpp:485
+#: src/gui/statuspopup.cpp:486
msgid "(?) imitation"
msgstr ""
-#: src/gui/statuspopup.cpp:494
+#: src/gui/statuspopup.cpp:495
msgid "(O) on keyboard"
msgstr ""
-#: src/gui/statuspopup.cpp:497
+#: src/gui/statuspopup.cpp:498
msgid "(A) away"
msgstr ""
-#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
+#: src/gui/statuspopup.cpp:501 src/gui/statuspopup.cpp:521
msgid "(?) away"
msgstr ""
-#: src/gui/statuspopup.cpp:508
+#: src/gui/statuspopup.cpp:509
msgid "(G) game camera mode"
msgstr ""
-#: src/gui/statuspopup.cpp:512
+#: src/gui/statuspopup.cpp:513
msgid "(F) free camera mode"
msgstr ""
-#: src/gui/statuspopup.cpp:516
+#: src/gui/statuspopup.cpp:517
msgid "(D) design camera mode"
msgstr ""
-#: src/gui/statuspopup.cpp:527
+#: src/gui/statuspopup.cpp:528
msgid "Game modifiers are disabled"
msgstr ""
-#: src/gui/statuspopup.cpp:532
+#: src/gui/statuspopup.cpp:533
msgid "Game modifiers are enabled"
msgstr ""
-#: src/gui/statuswindow.cpp:142 src/gui/statuswindow.cpp:272
-#: src/gui/statuswindow.cpp:335
+#: src/gui/statuswindow.cpp:143 src/gui/statuswindow.cpp:273
+#: src/gui/statuswindow.cpp:336
#, c-format
msgid "Level: %d"
msgstr ""
-#: src/gui/statuswindow.cpp:143 src/gui/statuswindow.cpp:258
-#: src/gui/statuswindow.cpp:302
+#: src/gui/statuswindow.cpp:144 src/gui/statuswindow.cpp:259
+#: src/gui/statuswindow.cpp:303
#, c-format
msgid "Money: %s"
msgstr ""
-#: src/gui/statuswindow.cpp:149
+#: src/gui/statuswindow.cpp:150
msgid "HP:"
msgstr ""
-#: src/gui/statuswindow.cpp:156
+#: src/gui/statuswindow.cpp:157
msgid "Exp:"
msgstr ""
-#: src/gui/statuswindow.cpp:170
+#: src/gui/statuswindow.cpp:171
msgid "MP:"
msgstr ""
-#: src/gui/statuswindow.cpp:202 src/gui/statuswindow.cpp:385
+#: src/gui/statuswindow.cpp:203 src/gui/statuswindow.cpp:386
#, c-format
msgid "Job: %d"
msgstr ""
-#: src/gui/statuswindow.cpp:203
+#: src/gui/statuswindow.cpp:204
msgid "Job:"
msgstr ""
-#: src/gui/statuswindow.cpp:261 src/gui/statuswindow.cpp:309
+#: src/gui/statuswindow.cpp:262 src/gui/statuswindow.cpp:310
#, c-format
msgid "Character points: %d"
msgstr ""
-#: src/gui/statuswindow.cpp:267
+#: src/gui/statuswindow.cpp:268
#, c-format
msgid "Level: %d (GM %d)"
msgstr ""
-#: src/gui/statuswindow.cpp:323
+#: src/gui/statuswindow.cpp:324
#, c-format
msgid "Correction points: %d"
msgstr ""
-#: src/gui/statuswindow.cpp:646 src/gui/statuswindow.cpp:711
-#: src/gui/statuswindow.cpp:731 src/gui/statuswindow.cpp:747
-#: src/gui/statuswindow.cpp:793 src/gui/statuswindow.cpp:822
-#: src/gui/statuswindow.cpp:845 src/gui/statuswindow.cpp:864
+#: src/gui/statuswindow.cpp:647 src/gui/statuswindow.cpp:712
+#: src/gui/statuswindow.cpp:732 src/gui/statuswindow.cpp:748
+#: src/gui/statuswindow.cpp:794 src/gui/statuswindow.cpp:823
+#: src/gui/statuswindow.cpp:846 src/gui/statuswindow.cpp:865
msgid "(D)"
msgstr ""
-#: src/gui/statuswindow.cpp:649 src/gui/statuswindow.cpp:772
+#: src/gui/statuswindow.cpp:650 src/gui/statuswindow.cpp:773
msgid "(I)"
msgstr ""
-#: src/gui/statuswindow.cpp:652 src/gui/statuswindow.cpp:769
+#: src/gui/statuswindow.cpp:653 src/gui/statuswindow.cpp:770
msgid "(c)"
msgstr ""
-#: src/gui/statuswindow.cpp:655
+#: src/gui/statuswindow.cpp:656
msgid "(C)"
msgstr ""
-#: src/gui/statuswindow.cpp:658 src/gui/statuswindow.cpp:756
+#: src/gui/statuswindow.cpp:659 src/gui/statuswindow.cpp:757
msgid "(d)"
msgstr ""
-#: src/gui/statuswindow.cpp:661 src/gui/statuswindow.cpp:675
-#: src/gui/statuswindow.cpp:704 src/gui/statuswindow.cpp:723
-#: src/gui/statuswindow.cpp:740 src/gui/statuswindow.cpp:759
-#: src/gui/statuswindow.cpp:781 src/gui/statuswindow.cpp:811
-#: src/gui/statuswindow.cpp:837 src/gui/statuswindow.cpp:851
-#: src/gui/statuswindow.cpp:867 src/gui/statuswindow.cpp:880
+#: src/gui/statuswindow.cpp:662 src/gui/statuswindow.cpp:676
+#: src/gui/statuswindow.cpp:705 src/gui/statuswindow.cpp:724
+#: src/gui/statuswindow.cpp:741 src/gui/statuswindow.cpp:760
+#: src/gui/statuswindow.cpp:782 src/gui/statuswindow.cpp:812
+#: src/gui/statuswindow.cpp:838 src/gui/statuswindow.cpp:852
+#: src/gui/statuswindow.cpp:868 src/gui/statuswindow.cpp:881
msgid "(?)"
msgstr ""
-#: src/gui/statuswindow.cpp:672
+#: src/gui/statuswindow.cpp:673
msgid "(a)"
msgstr ""
-#: src/gui/statuswindow.cpp:683
+#: src/gui/statuswindow.cpp:684
msgid "(0)"
msgstr ""
-#: src/gui/statuswindow.cpp:686
+#: src/gui/statuswindow.cpp:687
msgid "(1)"
msgstr ""
-#: src/gui/statuswindow.cpp:689
+#: src/gui/statuswindow.cpp:690
msgid "(2)"
msgstr ""
-#: src/gui/statuswindow.cpp:692 src/gui/statuswindow.cpp:799
+#: src/gui/statuswindow.cpp:693 src/gui/statuswindow.cpp:800
msgid "(3)"
msgstr ""
-#: src/gui/statuswindow.cpp:695
+#: src/gui/statuswindow.cpp:696
msgid "(5)"
msgstr ""
-#: src/gui/statuswindow.cpp:698
+#: src/gui/statuswindow.cpp:699
msgid "(7)"
msgstr ""
-#: src/gui/statuswindow.cpp:701 src/gui/statuswindow.cpp:753
-#: src/gui/statuswindow.cpp:808 src/gui/statuswindow.cpp:877
+#: src/gui/statuswindow.cpp:702 src/gui/statuswindow.cpp:754
+#: src/gui/statuswindow.cpp:809 src/gui/statuswindow.cpp:878
msgid "(A)"
msgstr ""
-#: src/gui/statuswindow.cpp:714
+#: src/gui/statuswindow.cpp:715
msgid "(R)"
msgstr ""
-#: src/gui/statuswindow.cpp:717
+#: src/gui/statuswindow.cpp:718
msgid "(M)"
msgstr ""
-#: src/gui/statuswindow.cpp:720
+#: src/gui/statuswindow.cpp:721
msgid "(P)"
msgstr ""
-#: src/gui/statuswindow.cpp:734
+#: src/gui/statuswindow.cpp:735
msgid "(s)"
msgstr ""
-#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:790
+#: src/gui/statuswindow.cpp:738 src/gui/statuswindow.cpp:791
msgid "(S)"
msgstr ""
-#: src/gui/statuswindow.cpp:750 src/gui/statuswindow.cpp:805
-#: src/gui/statuswindow.cpp:858
+#: src/gui/statuswindow.cpp:751 src/gui/statuswindow.cpp:806
+#: src/gui/statuswindow.cpp:859
msgid "(G)"
msgstr ""
-#: src/gui/statuswindow.cpp:766
+#: src/gui/statuswindow.cpp:767
msgid "(f)"
msgstr ""
-#: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:796
-#: src/gui/statuswindow.cpp:861
+#: src/gui/statuswindow.cpp:776 src/gui/statuswindow.cpp:797
+#: src/gui/statuswindow.cpp:862
msgid "(F)"
msgstr ""
-#: src/gui/statuswindow.cpp:778 src/gui/statuswindow.cpp:828
+#: src/gui/statuswindow.cpp:779 src/gui/statuswindow.cpp:829
msgid "(U)"
msgstr ""
-#: src/gui/statuswindow.cpp:802
+#: src/gui/statuswindow.cpp:803
msgid "(g)"
msgstr ""
-#: src/gui/statuswindow.cpp:819
+#: src/gui/statuswindow.cpp:820
msgid "(N)"
msgstr ""
-#: src/gui/statuswindow.cpp:825
+#: src/gui/statuswindow.cpp:826
msgid "(u)"
msgstr ""
-#: src/gui/statuswindow.cpp:831
+#: src/gui/statuswindow.cpp:832
msgid "(e)"
msgstr ""
-#: src/gui/statuswindow.cpp:834
+#: src/gui/statuswindow.cpp:835
msgid "(b)"
msgstr ""
-#: src/gui/statuswindow.cpp:848 src/gui/statuswindow.cpp:874
+#: src/gui/statuswindow.cpp:849 src/gui/statuswindow.cpp:875
msgid "(O)"
msgstr ""
@@ -3222,24 +3251,24 @@ msgstr ""
msgid "Trade: You"
msgstr ""
-#: src/gui/tradewindow.cpp:110 src/gui/tradewindow.cpp:166
+#: src/gui/tradewindow.cpp:111 src/gui/tradewindow.cpp:167
#, c-format
msgid "You get %s"
msgstr ""
-#: src/gui/tradewindow.cpp:111
+#: src/gui/tradewindow.cpp:112
msgid "You give:"
msgstr ""
-#: src/gui/tradewindow.cpp:115
+#: src/gui/tradewindow.cpp:116
msgid "Change"
msgstr ""
-#: src/gui/tradewindow.cpp:374
+#: src/gui/tradewindow.cpp:375
msgid "You don't have enough money."
msgstr ""
-#: src/gui/tradewindow.cpp:453
+#: src/gui/tradewindow.cpp:454
msgid "Failed adding item. You can not overlap one kind of item on the window."
msgstr ""
@@ -3248,33 +3277,33 @@ msgstr ""
msgid "Name: %s"
msgstr ""
-#: src/gui/updaterwindow.cpp:136
+#: src/gui/updaterwindow.cpp:138
msgid "Updating..."
msgstr ""
-#: src/gui/updaterwindow.cpp:155
+#: src/gui/updaterwindow.cpp:159
msgid "Connecting..."
msgstr ""
-#: src/gui/updaterwindow.cpp:158
+#: src/gui/updaterwindow.cpp:162
msgid "Play"
msgstr ""
-#: src/gui/updaterwindow.cpp:556
+#: src/gui/updaterwindow.cpp:564
msgid "##1 The update process is incomplete."
msgstr ""
#. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:558
+#: src/gui/updaterwindow.cpp:566
msgid "##1 It is strongly recommended that"
msgstr ""
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:560
+#: src/gui/updaterwindow.cpp:568
msgid "##1 you try again later."
msgstr ""
-#: src/gui/updaterwindow.cpp:686
+#: src/gui/updaterwindow.cpp:744
msgid "Completed"
msgstr ""
@@ -3426,23 +3455,23 @@ msgstr ""
msgid "Road Point"
msgstr ""
-#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:471
+#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:472
msgid "Who Is Online - Updating"
msgstr ""
-#: src/gui/whoisonline.cpp:101
+#: src/gui/whoisonline.cpp:102
msgid "Update"
msgstr ""
-#: src/gui/whoisonline.cpp:294
+#: src/gui/whoisonline.cpp:295
msgid "Who Is Online - "
msgstr ""
-#: src/gui/whoisonline.cpp:485
+#: src/gui/whoisonline.cpp:486
msgid "Who Is Online - error"
msgstr ""
-#: src/gui/whoisonline.cpp:516
+#: src/gui/whoisonline.cpp:517
msgid "Who Is Online - Update"
msgstr ""
@@ -3507,7 +3536,8 @@ msgid "This command makes <nick> a channel operator."
msgstr ""
#: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
-#: src/net/ea/gui/guildtab.cpp:69 src/net/ea/gui/partytab.cpp:85
+#: src/gui/widgets/guildchattab.cpp:61 src/net/ea/gui/guildtab.cpp:69
+#: src/net/ea/gui/partytab.cpp:85
msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
msgstr ""
@@ -3545,6 +3575,41 @@ msgstr ""
msgid "%s whispers: %s"
msgstr ""
+#: src/gui/widgets/guildchattab.cpp:59 src/net/ea/gui/guildtab.cpp:67
+#: src/net/ea/gui/partytab.cpp:83
+msgid "Command: /invite <nick>"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:60 src/net/ea/gui/guildtab.cpp:68
+msgid "This command invites <nick> to the guild you're in."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:66 src/net/ea/gui/guildtab.cpp:74
+#: src/net/ea/gui/partytab.cpp:90
+msgid "Command: /leave"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:67 src/net/ea/gui/guildtab.cpp:75
+msgid "This command causes the player to leave the guild."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:109 src/net/ea/gui/guildtab.cpp:135
+#: src/net/ea/gui/partytab.cpp:69
+msgid "/help > Display this help."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:110 src/net/ea/gui/guildtab.cpp:136
+msgid "/invite > Invite a player to your guild"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:111 src/net/ea/gui/guildtab.cpp:137
+msgid "/leave > Leave the guild you are in"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:112 src/net/ea/gui/guildtab.cpp:138
+msgid "/kick > Kick some one from the guild you are in"
+msgstr ""
+
#: src/gui/widgets/setupitem.cpp:271 src/gui/widgets/setupitem.cpp:394
msgid "Edit"
msgstr ""
@@ -4074,68 +4139,68 @@ msgid ""
"strange behaviour."
msgstr ""
-#: src/localplayer.cpp:372
+#: src/localplayer.cpp:370
msgid "You were killed by "
msgstr ""
-#: src/localplayer.cpp:1403
+#: src/localplayer.cpp:1401
msgid "Tried to pick up nonexistent item."
msgstr ""
-#: src/localplayer.cpp:1405
+#: src/localplayer.cpp:1403
msgid "Item is too heavy."
msgstr ""
-#: src/localplayer.cpp:1407
+#: src/localplayer.cpp:1405
msgid "Item is too far away."
msgstr ""
-#: src/localplayer.cpp:1409
+#: src/localplayer.cpp:1407
msgid "Inventory is full."
msgstr ""
-#: src/localplayer.cpp:1411
+#: src/localplayer.cpp:1409
msgid "Stack is too big."
msgstr ""
-#: src/localplayer.cpp:1414
+#: src/localplayer.cpp:1412
msgid "Item belongs to someone else."
msgstr ""
-#: src/localplayer.cpp:1417
+#: src/localplayer.cpp:1415
msgid "Unknown problem picking up item."
msgstr ""
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1441
+#: src/localplayer.cpp:1439
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
msgstr[0] ""
msgstr[1] ""
-#: src/localplayer.cpp:3175
+#: src/localplayer.cpp:3173
msgid "Away"
msgstr ""
-#: src/localplayer.cpp:3476
+#: src/localplayer.cpp:3474
msgid "Follow: "
msgstr ""
-#: src/localplayer.cpp:3478 src/localplayer.cpp:3493
+#: src/localplayer.cpp:3476 src/localplayer.cpp:3491
msgid "Follow canceled"
msgstr ""
-#: src/localplayer.cpp:3485
+#: src/localplayer.cpp:3483
msgid "Imitation: "
msgstr ""
-#: src/localplayer.cpp:3487 src/localplayer.cpp:3495
+#: src/localplayer.cpp:3485 src/localplayer.cpp:3493
msgid "Imitation canceled"
msgstr ""
-#: src/localplayer.cpp:3847
+#: src/localplayer.cpp:3845
msgid "You see "
msgstr ""
@@ -4311,28 +4376,28 @@ msgstr ""
msgid "Failed to delete character."
msgstr ""
-#: src/net/ea/chathandler.cpp:60 src/net/ea/chathandler.cpp:66
-#: src/net/ea/chathandler.cpp:71 src/net/ea/chathandler.cpp:77
-#: src/net/ea/chathandler.cpp:82 src/net/ea/chathandler.cpp:88
-#: src/net/ea/chathandler.cpp:95 src/net/ea/chathandler.cpp:101
+#: src/net/ea/chathandler.cpp:61 src/net/ea/chathandler.cpp:67
+#: src/net/ea/chathandler.cpp:72 src/net/ea/chathandler.cpp:78
+#: src/net/ea/chathandler.cpp:83 src/net/ea/chathandler.cpp:89
+#: src/net/ea/chathandler.cpp:96 src/net/ea/chathandler.cpp:102
msgid "Channels are not supported!"
msgstr ""
-#: src/net/ea/chathandler.cpp:128
+#: src/net/ea/chathandler.cpp:129
#, c-format
msgid "Whisper could not be sent, %s is offline."
msgstr ""
-#: src/net/ea/chathandler.cpp:136
+#: src/net/ea/chathandler.cpp:137
#, c-format
msgid "Whisper could not be sent, ignored by %s."
msgstr ""
-#: src/net/ea/chathandler.cpp:348
+#: src/net/ea/chathandler.cpp:355
msgid "MVP player."
msgstr ""
-#: src/net/ea/chathandler.cpp:352
+#: src/net/ea/chathandler.cpp:359
msgid "MVP player: "
msgstr ""
@@ -4349,38 +4414,6 @@ msgstr ""
msgid "Request to quit denied!"
msgstr ""
-#: src/net/ea/gui/guildtab.cpp:67 src/net/ea/gui/partytab.cpp:83
-msgid "Command: /invite <nick>"
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:68
-msgid "This command invites <nick> to the guild you're in."
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:74 src/net/ea/gui/partytab.cpp:90
-msgid "Command: /leave"
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:75
-msgid "This command causes the player to leave the guild."
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:135 src/net/ea/gui/partytab.cpp:69
-msgid "/help > Display this help."
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:136
-msgid "/invite > Invite a player to your guild"
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:137
-msgid "/leave > Leave the guild you are in"
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:138
-msgid "/kick > Kick some one from the guild you are in"
-msgstr ""
-
#: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
msgid "Guild created."
msgstr ""
@@ -4397,85 +4430,81 @@ msgstr ""
msgid "Unknown server response."
msgstr ""
-#: src/net/ea/guildhandler.cpp:180
+#: src/net/ea/guildhandler.cpp:181
#, c-format
msgid "Guild name: %s"
msgstr ""
-#: src/net/ea/guildhandler.cpp:182
+#: src/net/ea/guildhandler.cpp:183
#, c-format
msgid "Guild master: %s"
msgstr ""
-#: src/net/ea/guildhandler.cpp:184
+#: src/net/ea/guildhandler.cpp:185
#, c-format
msgid "Guild level: %d"
msgstr ""
-#: src/net/ea/guildhandler.cpp:186
+#: src/net/ea/guildhandler.cpp:187
#, c-format
msgid "Online members: %d"
msgstr ""
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:189
#, c-format
msgid "Max members: %d"
msgstr ""
-#: src/net/ea/guildhandler.cpp:190
+#: src/net/ea/guildhandler.cpp:191
#, c-format
msgid "Average level: %d"
msgstr ""
-#: src/net/ea/guildhandler.cpp:192
+#: src/net/ea/guildhandler.cpp:193
#, c-format
msgid "Guild exp: %d"
msgstr ""
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:195
#, c-format
msgid "Guild next exp: %d"
msgstr ""
-#: src/net/ea/guildhandler.cpp:196
+#: src/net/ea/guildhandler.cpp:197
#, c-format
msgid "Guild castle: %s"
msgstr ""
-#: src/net/ea/guildhandler.cpp:402
+#: src/net/ea/guildhandler.cpp:403
msgid "Could not inivte user to guild."
msgstr ""
-#: src/net/ea/guildhandler.cpp:406
+#: src/net/ea/guildhandler.cpp:407
msgid "User rejected guild invite."
msgstr ""
-#: src/net/ea/guildhandler.cpp:410
+#: src/net/ea/guildhandler.cpp:411
msgid "User is now part of your guild."
msgstr ""
-#: src/net/ea/guildhandler.cpp:414
+#: src/net/ea/guildhandler.cpp:415
msgid "Your guild is full."
msgstr ""
-#: src/net/ea/guildhandler.cpp:418
+#: src/net/ea/guildhandler.cpp:419
msgid "Unknown guild invite response."
msgstr ""
-#: src/net/ea/guildhandler.cpp:438
-msgid "You have left the guild."
-msgstr ""
-
-#: src/net/ea/guildhandler.cpp:452
+#: src/net/ea/guildhandler.cpp:453
#, c-format
msgid "%s has left your guild."
msgstr ""
-#: src/net/ea/guildhandler.cpp:483
+#: src/net/ea/guildhandler.cpp:484
msgid "You was kicked from guild."
msgstr ""
-#: src/net/ea/guildhandler.cpp:496
+#: src/net/ea/guildhandler.cpp:497
#, c-format
msgid "%s has kicked from your guild."
msgstr ""
@@ -4697,12 +4726,12 @@ msgstr ""
msgid "You have left the party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:368
+#: src/net/ea/partyhandler.cpp:369
#, c-format
msgid "%s has left your party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:444
+#: src/net/ea/partyhandler.cpp:448
#, c-format
msgid "An unknown member tried to say: %s"
msgstr ""
@@ -4823,7 +4852,7 @@ msgid "You're pining for the fjords."
msgstr ""
#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
-#: src/net/ea/playerhandler.cpp:425
+#: src/net/ea/playerhandler.cpp:428
msgid "Message"
msgstr ""
@@ -4836,21 +4865,21 @@ msgstr ""
msgid "You are carrying less than half your weight. You can regain health."
msgstr ""
-#: src/net/ea/playerhandler.cpp:451
+#: src/net/ea/playerhandler.cpp:454
#, c-format
msgid "You picked up %s."
msgstr ""
-#: src/net/ea/playerhandler.cpp:457
+#: src/net/ea/playerhandler.cpp:460
#, c-format
msgid "You spent %s."
msgstr ""
-#: src/net/ea/playerhandler.cpp:501
+#: src/net/ea/playerhandler.cpp:506
msgid "Cannot raise skill!"
msgstr ""
-#: src/net/ea/playerhandler.cpp:618
+#: src/net/ea/playerhandler.cpp:624
msgid "Equip arrows first."
msgstr ""
@@ -4989,7 +5018,7 @@ msgstr ""
msgid "Trade completed."
msgstr ""
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:258
msgid "Strength"
msgstr ""
@@ -4998,7 +5027,7 @@ msgstr ""
msgid "Strength %+.1f"
msgstr ""
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:259
msgid "Agility"
msgstr ""
@@ -5007,7 +5036,7 @@ msgstr ""
msgid "Agility %+.1f"
msgstr ""
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:262
msgid "Dexterity"
msgstr ""
@@ -5016,7 +5045,7 @@ msgstr ""
msgid "Dexterity %+.1f"
msgstr ""
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:260
msgid "Vitality"
msgstr ""
@@ -5025,7 +5054,7 @@ msgstr ""
msgid "Vitality %+.1f"
msgstr ""
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:261
msgid "Intelligence"
msgstr ""
@@ -5295,111 +5324,115 @@ msgstr ""
msgid "Unable to sell unsellable item."
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:109
+#: src/net/tmwa/generalhandler.cpp:108
#, c-format
msgid "Strength %+d"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:110
+#: src/net/tmwa/generalhandler.cpp:109
#, c-format
msgid "Agility %+d"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:111
+#: src/net/tmwa/generalhandler.cpp:110
#, c-format
msgid "Vitality %+d"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:112
+#: src/net/tmwa/generalhandler.cpp:111
#, c-format
msgid "Intelligence %+d"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:113
+#: src/net/tmwa/generalhandler.cpp:112
#, c-format
msgid "Dexterity %+d"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:114
+#: src/net/tmwa/generalhandler.cpp:113
#, c-format
msgid "Luck %+d"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:140
+#: src/net/tmwa/generalhandler.cpp:139
msgid "Authentication failed."
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:143
+#: src/net/tmwa/generalhandler.cpp:142
msgid "No servers available."
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:147
+#: src/net/tmwa/generalhandler.cpp:146
msgid "Someone else is trying to use this account."
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:150
+#: src/net/tmwa/generalhandler.cpp:149
msgid "This account is already logged in."
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:153
+#: src/net/tmwa/generalhandler.cpp:152
msgid "Speed hack detected."
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:156
+#: src/net/tmwa/generalhandler.cpp:155
msgid "Duplicated login."
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:159
+#: src/net/tmwa/generalhandler.cpp:158
msgid "Unknown connection error."
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:232
+#: src/net/tmwa/generalhandler.cpp:231
msgid "Got disconnected from server!"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:264
+#: src/net/tmwa/generalhandler.cpp:263
msgid "Luck"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:267
+#: src/net/tmwa/generalhandler.cpp:266
msgid "Defense"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:268
+#: src/net/tmwa/generalhandler.cpp:267
msgid "M.Attack"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:269
+#: src/net/tmwa/generalhandler.cpp:268
msgid "M.Defense"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:271
+#: src/net/tmwa/generalhandler.cpp:270
#, no-c-format
msgid "% Accuracy"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:273
+#: src/net/tmwa/generalhandler.cpp:272
#, no-c-format
msgid "% Evade"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:275
+#: src/net/tmwa/generalhandler.cpp:274
#, no-c-format
msgid "% Critical"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:276
+#: src/net/tmwa/generalhandler.cpp:275
msgid "Attack Delay"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:278
+#: src/net/tmwa/generalhandler.cpp:277
msgid "Walk Delay"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:280
+#: src/net/tmwa/generalhandler.cpp:279
msgid "Attack Range"
msgstr ""
+#: src/net/tmwa/generalhandler.cpp:281
+msgid "Damage per sec."
+msgstr ""
+
#: src/net/tmwa/network.cpp:152
msgid "Empty address given to Network::connect()!"
msgstr ""
@@ -5433,31 +5466,31 @@ msgstr ""
msgid "Floating bubble"
msgstr ""
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:248
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:246
#: src/resources/monsterdb.cpp:84
msgid "unnamed"
msgstr ""
-#: src/resources/itemdb.cpp:65
+#: src/resources/itemdb.cpp:63
#, c-format
msgid "Attack %+d"
msgstr ""
-#: src/resources/itemdb.cpp:66
+#: src/resources/itemdb.cpp:64
#, c-format
msgid "Defense %+d"
msgstr ""
-#: src/resources/itemdb.cpp:67
+#: src/resources/itemdb.cpp:65
#, c-format
msgid "HP %+d"
msgstr ""
-#: src/resources/itemdb.cpp:68
+#: src/resources/itemdb.cpp:66
#, c-format
msgid "MP %+d"
msgstr ""
-#: src/resources/itemdb.cpp:171
+#: src/resources/itemdb.cpp:169
msgid "Unknown item"
msgstr ""
diff --git a/po/nl_BE.po b/po/nl_BE.po
index 15fa66fb7..128e50c2a 100644
--- a/po/nl_BE.po
+++ b/po/nl_BE.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-20 17:42+0300\n"
-"PO-Revision-Date: 2011-08-17 21:39+0000\n"
-"Last-Translator: AL13N <maarten.vanraes@gmail.com>\n"
+"POT-Creation-Date: 2011-09-02 18:27+0300\n"
+"PO-Revision-Date: 2011-09-02 15:29+0000\n"
+"Last-Translator: akaras <akaras@inbox.ru>\n"
"Language-Team: Dutch (Belgium/Flemish) (http://www.transifex.net/projects/p/"
"manaplus/team/nl_BE/)\n"
"Language: nl_BE\n"
@@ -23,119 +23,119 @@ msgstr ""
msgid "Visible on map"
msgstr "Zichtbaar op de map"
-#: src/being.cpp:542
+#: src/being.cpp:549
msgid "dodge"
msgstr "ontwijkt"
-#: src/being.cpp:542
+#: src/being.cpp:549
msgid "miss"
msgstr "mist"
#. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1514
+#: src/being.cpp:1529
msgid "A"
msgstr "A"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1519
+#: src/being.cpp:1534
msgid "I"
msgstr "I"
-#: src/client.cpp:826 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:831 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
msgid "Setup"
msgstr "Configureren"
-#: src/client.cpp:909
+#: src/client.cpp:914
msgid "Connecting to server"
msgstr "Verbinden met server"
-#: src/client.cpp:940
+#: src/client.cpp:945
msgid "Logging in"
msgstr "Inloggen"
-#: src/client.cpp:973
+#: src/client.cpp:978
msgid "Entering game world"
msgstr "Spelwereld binnenkomen"
-#: src/client.cpp:1073
+#: src/client.cpp:1078
msgid "Requesting characters"
msgstr "Aanvragen personage"
-#: src/client.cpp:1104
+#: src/client.cpp:1109
msgid "Connecting to the game server"
msgstr "Verbinden met de spelserver"
-#: src/client.cpp:1114
+#: src/client.cpp:1119
msgid "Changing game servers"
msgstr "Wijzigen spelservers"
-#: src/client.cpp:1151 src/client.cpp:1158 src/client.cpp:1293
+#: src/client.cpp:1156 src/client.cpp:1163 src/client.cpp:1298
#: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
-#: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:395
+#: src/gui/charcreatedialog.cpp:221 src/gui/charselectdialog.cpp:253
+#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
#: src/net/manaserv/charhandler.cpp:227
msgid "Error"
msgstr "Fout"
-#: src/client.cpp:1167
+#: src/client.cpp:1172
msgid "Requesting registration details"
msgstr "Aanvragen registratie details"
-#: src/client.cpp:1194
+#: src/client.cpp:1199
msgid "Password Change"
msgstr "Paswoord Wijziging"
-#: src/client.cpp:1195
+#: src/client.cpp:1200
msgid "Password changed successfully!"
msgstr "Paswoord is gewijzigd!"
-#: src/client.cpp:1214
+#: src/client.cpp:1219
msgid "Email Change"
msgstr "Email Wijziging"
-#: src/client.cpp:1215
+#: src/client.cpp:1220
msgid "Email changed successfully!"
msgstr "Email is gewijzigd!"
-#: src/client.cpp:1235
+#: src/client.cpp:1240
msgid "Unregister Successful"
msgstr "Registratie ongedaan gemaakt!"
-#: src/client.cpp:1236
+#: src/client.cpp:1241
msgid "Farewell, come back any time..."
msgstr "Tot ziens..."
-#: src/client.cpp:1423 src/client.cpp:1453 src/client.cpp:1497
-#: src/client.cpp:1922 src/client.cpp:1929
+#: src/client.cpp:1428 src/client.cpp:1458 src/client.cpp:1502
+#: src/client.cpp:1927 src/client.cpp:1934
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%s bestaat niet en kan niet gecreëerd worden! Stoppen."
-#: src/client.cpp:1628
+#: src/client.cpp:1633
#, c-format
msgid "Invalid update host: %s"
msgstr "Ongeldige update host %s"
-#: src/client.cpp:1662 src/client.cpp:1668
+#: src/client.cpp:1667 src/client.cpp:1673
msgid "Error creating updates directory!"
msgstr "Fout bij het creëren van de update map!"
-#: src/client.cpp:1689
+#: src/client.cpp:1694
#, 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."
-#: src/commandhandler.cpp:301
+#: src/commandhandler.cpp:303
msgid "Unknown command."
msgstr "Onbekend commando."
-#: src/commandhandler.cpp:401
+#: src/commandhandler.cpp:403
msgid "Cannot send empty whispers!"
msgstr "Kan geen lege berichten sturen!"
-#: src/commandhandler.cpp:415
+#: src/commandhandler.cpp:417
#, c-format
msgid ""
"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -144,152 +144,152 @@ msgstr ""
"Je kan geen fluister-tab aanmaken voor \"%s\"! Het kan zijn dat hij reeds "
"bestaat, of het is jezelf."
-#: src/commandhandler.cpp:435
+#: src/commandhandler.cpp:437
#, c-format
msgid "Requesting to join channel %s."
msgstr "Aanvragen om bij kanaal %s toegevoegd te worden."
-#: src/commandhandler.cpp:451 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:453 src/net/ea/gui/partytab.cpp:125
msgid "Party name is missing."
msgstr "Groepsnaam ontbreekt."
-#: src/commandhandler.cpp:462
+#: src/commandhandler.cpp:464
msgid "Guild name is missing."
msgstr "Guild-naam ontbreekt."
-#: src/commandhandler.cpp:475 src/commandhandler.cpp:582
-#: src/commandhandler.cpp:623 src/commandhandler.cpp:653
+#: src/commandhandler.cpp:477 src/commandhandler.cpp:589
+#: src/commandhandler.cpp:630 src/commandhandler.cpp:660
msgid "Please specify a name."
msgstr "Gelieve een naam te specifiëren"
-#: src/commandhandler.cpp:516
+#: src/commandhandler.cpp:523
msgid "Return toggles chat."
msgstr "Ga terug naar chat"
-#: src/commandhandler.cpp:516
+#: src/commandhandler.cpp:523
msgid "Message closes chat."
msgstr "Bericht sluit chat."
-#: src/commandhandler.cpp:527
+#: src/commandhandler.cpp:534
msgid "Return now toggles chat."
msgstr "Ga nu terug naar chat."
-#: src/commandhandler.cpp:533
+#: src/commandhandler.cpp:540
msgid "Message now closes chat."
msgstr "Bericht sluit nu chat."
-#: src/commandhandler.cpp:561
+#: src/commandhandler.cpp:568
msgid "friend"
msgstr "vriend"
-#: src/commandhandler.cpp:566
+#: src/commandhandler.cpp:573
msgid "disregarded"
msgstr "genegeerd"
-#: src/commandhandler.cpp:571
+#: src/commandhandler.cpp:578
msgid "neutral"
msgstr "neutraal"
-#: src/commandhandler.cpp:590
+#: src/commandhandler.cpp:597
#, c-format
msgid "Player already %s!"
msgstr "Speler reeds %s!"
-#: src/commandhandler.cpp:604
+#: src/commandhandler.cpp:611
#, c-format
msgid "Player successfully %s!"
msgstr "Speler succesvol %s!"
-#: src/commandhandler.cpp:612
+#: src/commandhandler.cpp:619
#, c-format
msgid "Player could not be %s!"
msgstr "Speler kan niet %s zijn!"
-#: src/commandhandler.cpp:634
+#: src/commandhandler.cpp:641
msgid "Player wasn't ignored!"
msgstr "Speler is niet genegeerd!"
-#: src/commandhandler.cpp:641
+#: src/commandhandler.cpp:648
msgid "Player no longer ignored!"
msgstr "Speler niet langer genegeerd!"
-#: src/commandhandler.cpp:643
+#: src/commandhandler.cpp:650
msgid "Player could not be unignored!"
msgstr "Speler kan niet worden genegeerd!"
-#: src/commandhandler.cpp:660
+#: src/commandhandler.cpp:667
msgid "Player already erased!"
msgstr "Speler reeds verwijderd!"
-#: src/commandhandler.cpp:671
+#: src/commandhandler.cpp:678
msgid "Player successfully erased!"
msgstr "Speler succesvol verwijderd!"
-#: src/commandhandler.cpp:673
+#: src/commandhandler.cpp:680
msgid "Player could not be erased!"
msgstr "Speler kan niet worden verwijderd!"
-#: src/commandhandler.cpp:972 src/commandhandler.cpp:1018
+#: src/commandhandler.cpp:980 src/commandhandler.cpp:1026
#, c-format
msgid "Client uptime: %s"
msgstr "Client uptime: %s"
-#: src/commandhandler.cpp:982
+#: src/commandhandler.cpp:990
#, c-format
msgid "%d week"
msgid_plural "%d weeks"
msgstr[0] "%d week"
msgstr[1] "%d weken"
-#: src/commandhandler.cpp:991
+#: src/commandhandler.cpp:999
#, c-format
msgid "%d day"
msgid_plural "%d days"
msgstr[0] "%d dag"
msgstr[1] "%d dagen"
-#: src/commandhandler.cpp:999
+#: src/commandhandler.cpp:1007
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] "%d uur"
msgstr[1] "%d uren"
-#: src/commandhandler.cpp:1007
+#: src/commandhandler.cpp:1015
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] "%d minuut"
msgstr[1] "%d minuten"
-#: src/commandhandler.cpp:1015
+#: src/commandhandler.cpp:1023
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
msgstr[0] "%d seconde"
msgstr[1] "%d seconden"
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1102
msgid "font cache size"
msgstr ""
-#: src/commandhandler.cpp:1106
+#: src/commandhandler.cpp:1114
msgid "Cache size:"
msgstr ""
-#: src/commandhandler.cpp:1110
+#: src/commandhandler.cpp:1118
msgid "Created:"
msgstr "Aangemaakt:"
-#: src/commandhandler.cpp:1112
+#: src/commandhandler.cpp:1120
msgid "Deleted:"
msgstr "Verwijdered:"
-#: src/commandhandler.cpp:1159 src/commandhandler.cpp:1166
+#: src/commandhandler.cpp:1167 src/commandhandler.cpp:1174
msgid "Resource images:"
msgstr ""
-#: src/commandhandler.cpp:1161 src/commandhandler.cpp:1168
+#: src/commandhandler.cpp:1169 src/commandhandler.cpp:1176
msgid "Resource orphaned images:"
msgstr ""
@@ -299,43 +299,43 @@ msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
msgstr ""
"Opties voor /%s zijn \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:411
+#: src/game.cpp:252 src/gui/widgets/chattab.cpp:409
msgid "General"
msgstr "Algemeen"
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:413
+#: src/game.cpp:256 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:411
msgid "Debug"
msgstr "Debug"
-#: src/game.cpp:488
+#: src/game.cpp:511
msgid "Screenshot saved as "
msgstr "Scherafdruk opgeslagen als:"
-#: src/game.cpp:496
+#: src/game.cpp:519
msgid "Saving screenshot failed!"
msgstr "Opslaan van screenshot mislukt!"
-#: src/game.cpp:536
+#: src/game.cpp:559
msgid "The connection to the server was lost."
msgstr "De verbinding met de server is verbroken."
-#: src/game.cpp:548
+#: src/game.cpp:571
msgid "Network Error"
msgstr "Netwerkfout"
-#: src/game.cpp:1213
+#: src/game.cpp:1236
msgid "Ignoring incoming trade requests"
msgstr "Inkomende handelsaanvragen negeren"
-#: src/game.cpp:1220
+#: src/game.cpp:1243
msgid "Accepting incoming trade requests"
msgstr "Inkomende handelsaanvragen accepteren"
-#: src/game.cpp:1606
+#: src/game.cpp:1629
msgid "Could Not Load Map"
msgstr "Kon Map Niet Laden"
-#: src/game.cpp:1607
+#: src/game.cpp:1630
#, c-format
msgid "Error while loading %s"
msgstr "Fout bij het laden van %s"
@@ -364,103 +364,103 @@ msgstr ""
msgid "Bot Checker"
msgstr "Bot Controleerder"
-#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
+#: src/gui/botcheckerwindow.cpp:295 src/gui/setup_relations.cpp:64
msgid "Name"
msgstr "Naam"
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:134
-#: src/gui/popupmenu.cpp:292 src/gui/popupmenu.cpp:617
-#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
+#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:133
+#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:646
+#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:265
msgid "Attack"
msgstr "Aanvallen"
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:279
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:297
#: src/keyboardconfig.cpp:62
msgid "Talk"
msgstr "Spreken"
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:245
-#: src/gui/popupmenu.cpp:284 src/gui/popupmenu.cpp:674
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:263
+#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:703
msgid "Move"
msgstr "Beweeg"
-#: src/gui/botcheckerwindow.cpp:300
+#: src/gui/botcheckerwindow.cpp:299
msgid "Result"
msgstr "Resultaat"
-#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123
+#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:124
msgid "Reset"
msgstr "Reset"
-#: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:260
-#: src/gui/popupmenu.cpp:281 src/gui/popupmenu.cpp:688
+#: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:98
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:278
+#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:717
msgid "Buy"
msgstr "Kopen"
-#: src/gui/buydialog.cpp:88 src/gui/buydialog.cpp:302
-#: src/gui/selldialog.cpp:87 src/gui/selldialog.cpp:324
+#: src/gui/buydialog.cpp:89 src/gui/buydialog.cpp:303
+#: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
#, c-format
msgid "Price: %s / Total: %s"
msgstr "Prijs: %s / Totaal: %s"
#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
#. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:93 src/gui/itemamountwindow.cpp:207
-#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:113
-#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:974
+#: src/gui/buydialog.cpp:94 src/gui/itemamountwindow.cpp:207
+#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:973
msgid "+"
msgstr "+"
#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
#. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:96 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:986
+#: src/gui/buydialog.cpp:97 src/gui/itemamountwindow.cpp:206
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:985
msgid "-"
msgstr "-"
-#: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
-#: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
-#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:288
+#: src/gui/buydialog.cpp:99 src/gui/quitdialog.cpp:47
+#: src/gui/quitdialog.cpp:49 src/gui/quitdialog.cpp:50
+#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:294
#: src/keyboardconfig.cpp:290
msgid "Quit"
msgstr "Afsluiten"
-#: src/gui/buydialog.cpp:99 src/gui/selldialog.cpp:94
-#: src/gui/statuswindow.cpp:503 src/gui/statuswindow.cpp:552
-#: src/gui/statuswindow.cpp:973 src/gui/statuswindow.cpp:1004
+#: src/gui/buydialog.cpp:100 src/gui/selldialog.cpp:95
+#: src/gui/statuswindow.cpp:504 src/gui/statuswindow.cpp:553
+#: src/gui/statuswindow.cpp:972 src/gui/statuswindow.cpp:1003
msgid "Max"
msgstr "Maximum"
#: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:133
+#: src/gui/inventorywindow.cpp:147 src/gui/setup_other.cpp:133
msgid "Shop"
msgstr "Winkel"
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:262
-#: src/gui/popupmenu.cpp:282 src/gui/popupmenu.cpp:690
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:280
+#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:719
#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
-#: src/gui/selldialog.cpp:92
+#: src/gui/selldialog.cpp:93
msgid "Sell"
msgstr "Verkopen"
#: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
-#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
+#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:96
#: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:336
-#: src/gui/popupmenu.cpp:357 src/gui/popupmenu.cpp:460
-#: src/gui/popupmenu.cpp:487 src/gui/popupmenu.cpp:511
-#: src/gui/popupmenu.cpp:525 src/gui/popupmenu.cpp:544
-#: src/gui/popupmenu.cpp:750 src/gui/popupmenu.cpp:774
-#: src/gui/popupmenu.cpp:1684 src/gui/popupmenu.cpp:1712
-#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1811
-#: src/gui/popupmenu.cpp:1846 src/gui/popupmenu.cpp:1886
-#: src/gui/popupmenu.cpp:1953 src/gui/popupmenu.cpp:1973
-#: src/gui/quitdialog.cpp:59 src/gui/register.cpp:82 src/gui/setup.cpp:71
-#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:354
+#: src/gui/popupmenu.cpp:375 src/gui/popupmenu.cpp:489
+#: src/gui/popupmenu.cpp:516 src/gui/popupmenu.cpp:540
+#: src/gui/popupmenu.cpp:554 src/gui/popupmenu.cpp:573
+#: src/gui/popupmenu.cpp:790 src/gui/popupmenu.cpp:814
+#: src/gui/popupmenu.cpp:1734 src/gui/popupmenu.cpp:1762
+#: src/gui/popupmenu.cpp:1818 src/gui/popupmenu.cpp:1861
+#: src/gui/popupmenu.cpp:1896 src/gui/popupmenu.cpp:1936
+#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2023
+#: src/gui/quitdialog.cpp:54 src/gui/register.cpp:82 src/gui/setup.cpp:72
+#: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:238
#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updaterwindow.cpp:157
+#: src/gui/updaterwindow.cpp:161
msgid "Cancel"
msgstr "Annuleren"
@@ -492,7 +492,7 @@ msgid "The email address entries mismatch."
msgstr "De email adres ingaven zijn niet gelijk."
#: src/gui/changepassworddialog.cpp:50 src/gui/changepassworddialog.cpp:59
-#: src/gui/charselectdialog.cpp:140
+#: src/gui/charselectdialog.cpp:139
msgid "Change Password"
msgstr "Wijzig wachtwoord"
@@ -527,121 +527,121 @@ msgstr "De nieuwe paswoord ingaven zijn niet gelijk."
msgid "Create Character"
msgstr "Personage Aanmaken"
-#: src/gui/charcreatedialog.cpp:73 src/gui/logindialog.cpp:94
+#: src/gui/charcreatedialog.cpp:76 src/gui/logindialog.cpp:94
#: src/gui/register.cpp:75
msgid "Name:"
msgstr "Naam:"
#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
#. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:76 src/gui/charcreatedialog.cpp:81
-#: src/gui/charcreatedialog.cpp:87 src/gui/outfitwindow.cpp:81
+#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:84
+#: src/gui/charcreatedialog.cpp:90 src/gui/outfitwindow.cpp:85
msgid ">"
msgstr ">"
#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
#. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:82
-#: src/gui/charcreatedialog.cpp:88 src/gui/outfitwindow.cpp:80
+#: src/gui/charcreatedialog.cpp:82 src/gui/charcreatedialog.cpp:85
+#: src/gui/charcreatedialog.cpp:91 src/gui/outfitwindow.cpp:84
msgid "<"
msgstr "<"
-#: src/gui/charcreatedialog.cpp:80
+#: src/gui/charcreatedialog.cpp:83
msgid "Hair color:"
msgstr "Haarkleur:"
-#: src/gui/charcreatedialog.cpp:83
+#: src/gui/charcreatedialog.cpp:86
msgid "Hair style:"
msgstr "Haarstijl:"
-#: src/gui/charcreatedialog.cpp:89
+#: src/gui/charcreatedialog.cpp:92
msgid "Race:"
msgstr "Ras:"
-#: src/gui/charcreatedialog.cpp:92 src/gui/charselectdialog.cpp:479
-#: src/gui/socialwindow.cpp:1033
+#: src/gui/charcreatedialog.cpp:95 src/gui/charselectdialog.cpp:478
+#: src/gui/socialwindow.cpp:1139
msgid "Create"
msgstr "Aanmaken"
-#: src/gui/charcreatedialog.cpp:94 src/gui/register.cpp:98
+#: src/gui/charcreatedialog.cpp:97 src/gui/register.cpp:98
msgid "Male"
msgstr "Mannelijk"
-#: src/gui/charcreatedialog.cpp:95 src/gui/register.cpp:99
+#: src/gui/charcreatedialog.cpp:98 src/gui/register.cpp:99
msgid "Female"
msgstr "Vrouwelijk"
-#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:300
+#: src/gui/charcreatedialog.cpp:116 src/gui/charcreatedialog.cpp:303
#, c-format
msgid "Please distribute %d points"
msgstr "Nog %d punten te verdelen"
-#: src/gui/charcreatedialog.cpp:219
+#: src/gui/charcreatedialog.cpp:222
msgid "Your name needs to be at least 4 characters."
msgstr "Je naam moet uit tenminste 4 tekens bestaan"
-#: src/gui/charcreatedialog.cpp:291
+#: src/gui/charcreatedialog.cpp:294
msgid "Character stats OK"
msgstr "Attributen van personage OK"
-#: src/gui/charcreatedialog.cpp:305
+#: src/gui/charcreatedialog.cpp:308
#, c-format
msgid "Please remove %d points"
msgstr "Verwijder alstublieft %d punten"
-#: src/gui/charselectdialog.cpp:77
+#: src/gui/charselectdialog.cpp:76
msgid "Confirm Character Delete"
msgstr "Bevestig het verwijderen van het personage"
-#: src/gui/charselectdialog.cpp:78
+#: src/gui/charselectdialog.cpp:77
msgid "Are you sure you want to delete this character?"
msgstr "Weet je zeker dat je deze personage wilt verwijderen?"
-#: src/gui/charselectdialog.cpp:126
+#: src/gui/charselectdialog.cpp:125
msgid "Account and Character Management"
msgstr "Account en personage beheer"
-#: src/gui/charselectdialog.cpp:139
+#: src/gui/charselectdialog.cpp:138
msgid "Switch Login"
msgstr "Verwissel Login"
-#: src/gui/charselectdialog.cpp:153 src/gui/unregisterdialog.cpp:50
+#: src/gui/charselectdialog.cpp:152 src/gui/unregisterdialog.cpp:50
#: src/gui/unregisterdialog.cpp:58
msgid "Unregister"
msgstr "Registreren"
-#: src/gui/charselectdialog.cpp:162
+#: src/gui/charselectdialog.cpp:161
msgid "Change Email"
msgstr "Wijzig Email"
-#: src/gui/charselectdialog.cpp:254
+#: src/gui/charselectdialog.cpp:253
msgid "Incorrect password"
msgstr "Ongeldig paswoord"
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:286
msgid "Enter password for deleting character"
msgstr "Geef uw wachtwoord om uw personage te verwijderen"
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:286
msgid "Enter password:"
msgstr "Geef wachtwoord:"
-#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:292
-#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
-#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
+#: src/gui/charselectdialog.cpp:408 src/gui/serverdialog.cpp:298
+#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:122
+#: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:241
msgid "Delete"
msgstr "Verwijderen"
-#: src/gui/charselectdialog.cpp:467
+#: src/gui/charselectdialog.cpp:466
msgid "Choose"
msgstr "Kies"
-#: src/gui/charselectdialog.cpp:470
+#: src/gui/charselectdialog.cpp:469
#, c-format
msgid "Level %d"
msgstr "Niveau %d"
-#: src/gui/charselectdialog.cpp:481 src/gui/charselectdialog.cpp:482
+#: src/gui/charselectdialog.cpp:480 src/gui/charselectdialog.cpp:481
msgid "(empty)"
msgstr "(leeg)"
@@ -713,12 +713,12 @@ msgstr "???"
msgid "Chat"
msgstr "Chat"
-#: src/gui/chatwindow.cpp:606
+#: src/gui/chatwindow.cpp:609
#, c-format
msgid "Present: %s; %d players are present."
msgstr "Aanwezig: %s; %d speler zijn aanwezig."
-#: src/gui/chatwindow.cpp:993
+#: src/gui/chatwindow.cpp:996
#, c-format
msgid "Whispering to %s: %s"
msgstr "Fluisteren naar %s: %s"
@@ -731,145 +731,145 @@ msgstr "Ja"
msgid "No"
msgstr "Nee"
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:150
-#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:384
-#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:632
-#: src/gui/popupmenu.cpp:640
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:149
+#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:402
+#: src/gui/popupmenu.cpp:408 src/gui/popupmenu.cpp:661
+#: src/gui/popupmenu.cpp:669
msgid "Ignore"
msgstr "Negeer"
-#: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
+#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:97
#: src/gui/setup_other.cpp:64
msgid "Map"
msgstr "Map"
-#: src/gui/debugwindow.cpp:71
+#: src/gui/debugwindow.cpp:73
msgid "Target"
msgstr "Doel"
-#: src/gui/debugwindow.cpp:72
+#: src/gui/debugwindow.cpp:74
msgid "Net"
msgstr "Net"
-#: src/gui/debugwindow.cpp:145 src/gui/debugwindow.cpp:220
-#: src/gui/debugwindow.cpp:249
+#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
+#: src/gui/debugwindow.cpp:251
msgid "Music:"
msgstr "Muziek:"
-#: src/gui/debugwindow.cpp:146 src/gui/debugwindow.cpp:224
-#: src/gui/debugwindow.cpp:251
+#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:226
+#: src/gui/debugwindow.cpp:253
msgid "Map:"
msgstr "Kaart:"
-#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
-#: src/gui/debugwindow.cpp:250
+#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:224
+#: src/gui/debugwindow.cpp:252
msgid "Minimap:"
msgstr "Minikaart:"
-#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:218
-#: src/gui/debugwindow.cpp:247
+#: src/gui/debugwindow.cpp:150 src/gui/debugwindow.cpp:220
+#: src/gui/debugwindow.cpp:249
msgid "Cursor:"
msgstr "Muispunt:"
-#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:201
-#: src/gui/debugwindow.cpp:206
+#: src/gui/debugwindow.cpp:151 src/gui/debugwindow.cpp:203
+#: src/gui/debugwindow.cpp:208
msgid "Player Position:"
msgstr "Speler positie:"
-#: src/gui/debugwindow.cpp:152
+#: src/gui/debugwindow.cpp:154
msgid "Particle count:"
msgstr ""
-#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:235
-#: src/gui/debugwindow.cpp:254
+#: src/gui/debugwindow.cpp:156 src/gui/debugwindow.cpp:237
+#: src/gui/debugwindow.cpp:256
msgid "Map actors count:"
msgstr "Aantal kaart-acteurs"
-#: src/gui/debugwindow.cpp:162 src/gui/debugwindow.cpp:173
+#: src/gui/debugwindow.cpp:164 src/gui/debugwindow.cpp:175
#, c-format
msgid "%d FPS (Software)"
msgstr "%d beelden/sec (Software)"
-#: src/gui/debugwindow.cpp:166
+#: src/gui/debugwindow.cpp:168
#, c-format
msgid "%d FPS (fast OpenGL)"
msgstr "%d beelden/sec (Snelle OpenGL)"
-#: src/gui/debugwindow.cpp:169
+#: src/gui/debugwindow.cpp:171
#, c-format
msgid "%d FPS (old OpenGL)"
msgstr "%d beelden/sec (Oude openGL)"
-#: src/gui/debugwindow.cpp:176
+#: src/gui/debugwindow.cpp:178
#, c-format
msgid "%d FPS"
msgstr "%d beelden/sec"
-#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:240
+#: src/gui/debugwindow.cpp:190 src/gui/debugwindow.cpp:242
msgid "Textures count:"
msgstr ""
-#: src/gui/debugwindow.cpp:231
+#: src/gui/debugwindow.cpp:233
#, c-format
msgid "Particle count: %d"
msgstr "Deeltjes-aantal: %d"
-#: src/gui/debugwindow.cpp:268 src/gui/debugwindow.cpp:299
-#: src/gui/debugwindow.cpp:343
+#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:301
+#: src/gui/debugwindow.cpp:345
msgid "Target:"
msgstr "Doel:"
-#: src/gui/debugwindow.cpp:269 src/gui/debugwindow.cpp:304
-#: src/gui/debugwindow.cpp:344
+#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:306
+#: src/gui/debugwindow.cpp:346
msgid "Target Id:"
msgstr "Doel identificatie:"
-#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:308
-#: src/gui/debugwindow.cpp:313 src/gui/debugwindow.cpp:345
+#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:310
+#: src/gui/debugwindow.cpp:315 src/gui/debugwindow.cpp:347
msgid "Target Level:"
msgstr "Doel niveau:"
-#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:316
-#: src/gui/debugwindow.cpp:346
+#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:318
+#: src/gui/debugwindow.cpp:348
msgid "Target Party:"
msgstr "Doel Party:"
-#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:319
-#: src/gui/debugwindow.cpp:347
+#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:321
+#: src/gui/debugwindow.cpp:349
msgid "Target Guild:"
msgstr "Doel Gilde:"
-#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:333
-#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:348
+#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:335
+#: src/gui/debugwindow.cpp:340 src/gui/debugwindow.cpp:350
msgid "Attack delay:"
msgstr "Aanvalsvertraging:"
-#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:323
-#: src/gui/debugwindow.cpp:349
+#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:325
+#: src/gui/debugwindow.cpp:351
msgid "Minimal hit:"
msgstr ""
-#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:325
-#: src/gui/debugwindow.cpp:350
+#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:327
+#: src/gui/debugwindow.cpp:352
msgid "Maximum hit:"
msgstr ""
-#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:327
-#: src/gui/debugwindow.cpp:351
+#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:329
+#: src/gui/debugwindow.cpp:353
msgid "Critical hit:"
msgstr ""
-#: src/gui/debugwindow.cpp:385 src/gui/debugwindow.cpp:390
+#: src/gui/debugwindow.cpp:387 src/gui/debugwindow.cpp:392
#, c-format
msgid "Ping: %s ms"
msgstr ""
-#: src/gui/debugwindow.cpp:393
+#: src/gui/debugwindow.cpp:395
#, c-format
msgid "In: %d bytes/s"
msgstr "Invoer: %d bytes/sec"
-#: src/gui/debugwindow.cpp:395
+#: src/gui/debugwindow.cpp:397
#, c-format
msgid "Out: %d bytes/s"
msgstr "Uitvoer: %d bytes/sec"
@@ -878,26 +878,26 @@ msgstr "Uitvoer: %d bytes/sec"
msgid "Did You Know?"
msgstr "Weet u?"
-#: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
-#: src/gui/inventorywindow.cpp:175 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:559 src/gui/shopwindow.cpp:111
+#: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
+#: src/gui/inventorywindow.cpp:176 src/gui/npcdialog.cpp:53
+#: src/gui/popupmenu.cpp:588 src/gui/shopwindow.cpp:113
msgid "Close"
msgstr "Sluiten"
-#: src/gui/didyouknowwindow.cpp:62
+#: src/gui/didyouknowwindow.cpp:64
msgid "< Previous"
msgstr "< Vorig"
-#: src/gui/didyouknowwindow.cpp:63
+#: src/gui/didyouknowwindow.cpp:65
msgid "Next >"
msgstr "Volgend >"
-#: src/gui/didyouknowwindow.cpp:64
+#: src/gui/didyouknowwindow.cpp:66
msgid "Auto open this window"
msgstr ""
#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:58 src/gui/textdialog.cpp:50
+#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:53 src/gui/textdialog.cpp:50
msgid "OK"
msgstr "OK"
@@ -905,10 +905,10 @@ msgstr "OK"
msgid "Equipment"
msgstr "Uitrusting"
-#: src/gui/equipmentwindow.cpp:93 src/gui/inventorywindow.cpp:130
-#: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
-#: src/gui/popupmenu.cpp:1643 src/gui/popupmenu.cpp:1738
-#: src/gui/popupmenu.cpp:1783
+#: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:131
+#: src/gui/inventorywindow.cpp:512 src/gui/inventorywindow.cpp:521
+#: src/gui/popupmenu.cpp:1693 src/gui/popupmenu.cpp:1788
+#: src/gui/popupmenu.cpp:1833
msgid "Unequip"
msgstr "Afdoen"
@@ -921,75 +921,75 @@ msgstr "Help"
msgid "Inventory"
msgstr "Inventaris"
-#: src/gui/inventorywindow.cpp:104
+#: src/gui/inventorywindow.cpp:105
msgid "Slots:"
msgstr "Sloten:"
-#: src/gui/inventorywindow.cpp:115
+#: src/gui/inventorywindow.cpp:116
msgid "Filter:"
msgstr "Filter:"
-#: src/gui/inventorywindow.cpp:116
+#: src/gui/inventorywindow.cpp:117
msgid "Sort:"
msgstr "Sorteer:"
-#: src/gui/inventorywindow.cpp:122
+#: src/gui/inventorywindow.cpp:123
msgid "na"
msgstr "na"
-#: src/gui/inventorywindow.cpp:123
+#: src/gui/inventorywindow.cpp:124
msgid "az"
msgstr "az"
-#: src/gui/inventorywindow.cpp:124
+#: src/gui/inventorywindow.cpp:125
msgid "id"
msgstr "id"
-#: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:513
-#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1645
-#: src/gui/popupmenu.cpp:1740 src/gui/popupmenu.cpp:1785
+#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
+#: src/gui/inventorywindow.cpp:523 src/gui/popupmenu.cpp:1695
+#: src/gui/popupmenu.cpp:1790 src/gui/popupmenu.cpp:1835
msgid "Equip"
msgstr "Uitrusten"
-#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
-#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1648
-#: src/gui/popupmenu.cpp:1707 src/gui/popupmenu.cpp:1744
-#: src/gui/popupmenu.cpp:1788
+#: src/gui/inventorywindow.cpp:130 src/gui/inventorywindow.cpp:515
+#: src/gui/inventorywindow.cpp:519 src/gui/popupmenu.cpp:1698
+#: src/gui/popupmenu.cpp:1757 src/gui/popupmenu.cpp:1794
+#: src/gui/popupmenu.cpp:1838
msgid "Use"
msgstr "Gebruiken"
-#: src/gui/inventorywindow.cpp:143 src/gui/inventorywindow.cpp:619
-#: src/gui/popupmenu.cpp:1652 src/gui/popupmenu.cpp:1749
-#: src/gui/popupmenu.cpp:1792
+#: src/gui/inventorywindow.cpp:144 src/gui/inventorywindow.cpp:620
+#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1799
+#: src/gui/popupmenu.cpp:1842
msgid "Drop..."
msgstr "Neerleggen..."
-#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1661
-#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1801
+#: src/gui/inventorywindow.cpp:145 src/gui/popupmenu.cpp:1711
+#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1851
msgid "Split"
msgstr "Splitsen"
-#: src/gui/inventorywindow.cpp:145 src/gui/outfitwindow.cpp:59
-#: src/gui/popupmenu.cpp:520
+#: src/gui/inventorywindow.cpp:146 src/gui/outfitwindow.cpp:60
+#: src/gui/popupmenu.cpp:549
msgid "Outfits"
msgstr "Kleren"
-#: src/gui/inventorywindow.cpp:148
+#: src/gui/inventorywindow.cpp:149
msgid "Weight:"
msgstr "Gewicht:"
-#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
-#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
-#: src/gui/popupmenu.cpp:1804 src/gui/setup.cpp:72
+#: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:611
+#: src/gui/popupmenu.cpp:1674 src/gui/popupmenu.cpp:1811
+#: src/gui/popupmenu.cpp:1854 src/gui/setup.cpp:73
msgid "Store"
msgstr "Opslaan"
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1668
+#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1718
msgid "Retrieve"
msgstr "Afhalen"
-#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1657
-#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1797
+#: src/gui/inventorywindow.cpp:622 src/gui/popupmenu.cpp:1707
+#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1847
#: src/gui/windowmenu.cpp:97
msgid "Drop"
msgstr "Neerleggen"
@@ -1030,11 +1030,11 @@ msgstr "Toevoegen om te verkopen"
msgid "Unknown."
msgstr "Onbekend."
-#: src/gui/itempopup.cpp:176 src/gui/itempopup.cpp:182
+#: src/gui/itempopup.cpp:177 src/gui/itempopup.cpp:183
msgid ", "
msgstr ", "
-#: src/gui/itempopup.cpp:192
+#: src/gui/itempopup.cpp:193
#, c-format
msgid "Weight: %s"
msgstr "Gewicht: %s"
@@ -1043,90 +1043,94 @@ msgstr "Gewicht: %s"
msgid "Kill stats"
msgstr "Doden statistieken"
-#: src/gui/killstats.cpp:64
+#: src/gui/killstats.cpp:65
msgid "Reset stats"
msgstr "Herzet statistieken"
-#: src/gui/killstats.cpp:65
+#: src/gui/killstats.cpp:66
msgid "Reset timer"
msgstr "Herzet timer"
-#: src/gui/killstats.cpp:69 src/gui/killstats.cpp:205
+#: src/gui/killstats.cpp:70 src/gui/killstats.cpp:206
#, c-format
msgid "Level: %d at %f%%"
msgstr ""
-#: src/gui/killstats.cpp:73 src/gui/killstats.cpp:210
+#: src/gui/killstats.cpp:74 src/gui/killstats.cpp:211
#, c-format
msgid "Exp: %d/%d Left: %d"
msgstr ""
-#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:216
-#: src/gui/killstats.cpp:225
+#: src/gui/killstats.cpp:77 src/gui/killstats.cpp:217
+#: src/gui/killstats.cpp:226
#, c-format
msgid "1%% = %d exp, avg mob for 1%%: %s"
msgstr ""
-#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:142
-#: src/gui/killstats.cpp:234
+#: src/gui/killstats.cpp:80 src/gui/killstats.cpp:143
+#: src/gui/killstats.cpp:235
#, c-format
msgid "Kills: %s, total exp: %s"
msgstr ""
-#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
-#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:230
+#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145
+#: src/gui/killstats.cpp:221 src/gui/killstats.cpp:231
#, c-format
msgid "Avg Exp: %s, No. of avg mob to next level: %s"
msgstr ""
-#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:162
-#: src/gui/killstats.cpp:237
+#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:163
+#: src/gui/killstats.cpp:238
#, c-format
msgid "Kills/Min: %s, Exp/Min: %s"
msgstr ""
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:89 src/gui/killstats.cpp:94
-#: src/gui/killstats.cpp:289 src/gui/killstats.cpp:305
-#: src/gui/killstats.cpp:323
+#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:90 src/gui/killstats.cpp:95
+#: src/gui/killstats.cpp:290 src/gui/killstats.cpp:306
+#: src/gui/killstats.cpp:324
#, c-format
msgid "Exp speed per %d min: %s"
msgid_plural "Exp speed per %d min: %s"
msgstr[0] ""
msgstr[1] ""
-#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
+#: src/gui/killstats.cpp:88 src/gui/killstats.cpp:93 src/gui/killstats.cpp:98
#, c-format
msgid "Time for next level per %d min: %s"
msgid_plural "Time for next level per %d min: %s"
msgstr[0] ""
msgstr[1] ""
-#: src/gui/killstats.cpp:100 src/gui/killstats.cpp:241
+#: src/gui/killstats.cpp:101 src/gui/killstats.cpp:242
msgid "Last kill exp:"
msgstr ""
-#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:355
-#: src/gui/killstats.cpp:361 src/gui/killstats.cpp:367
-#: src/gui/killstats.cpp:372
+#: src/gui/killstats.cpp:103 src/gui/killstats.cpp:356
+#: src/gui/killstats.cpp:362 src/gui/killstats.cpp:368
+#: src/gui/killstats.cpp:373
msgid "Time before jacko spawn:"
msgstr ""
-#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:301
-#: src/gui/killstats.cpp:311 src/gui/killstats.cpp:318
-#: src/gui/killstats.cpp:330 src/gui/killstats.cpp:337
+#: src/gui/killstats.cpp:295 src/gui/killstats.cpp:302
+#: src/gui/killstats.cpp:312 src/gui/killstats.cpp:319
+#: src/gui/killstats.cpp:331 src/gui/killstats.cpp:338
#, c-format
msgid " Time for next level: %s"
msgstr " Tijd tot volgend niveau: %s"
-#: src/gui/killstats.cpp:361
+#: src/gui/killstats.cpp:362
#, c-format
msgid "%s %d?"
msgstr ""
-#: src/gui/killstats.cpp:367
+#: src/gui/killstats.cpp:368
msgid "jacko spawning"
msgstr ""
+#: src/guildmanager.cpp:464 src/net/ea/guildhandler.cpp:439
+msgid "You have left the guild."
+msgstr ""
+
#: src/gui/logindialog.cpp:59
msgid "Normal"
msgstr "Normaal"
@@ -1143,7 +1147,7 @@ msgstr "Overslaan"
msgid "Login"
msgstr "Inloggen"
-#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:246
+#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:252
#: src/gui/widgets/chattab.cpp:173
msgid "Server:"
msgstr "Server:"
@@ -1225,11 +1229,11 @@ msgstr "Indienen"
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:561
+#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:590
msgid "Clear"
msgstr "Wissen"
-#: src/gui/npcdialog.cpp:222
+#: src/gui/npcdialog.cpp:223
msgid "> Next"
msgstr "> Volgende"
@@ -1245,346 +1249,346 @@ msgstr "Verzenden"
msgid "Failed to send as sender or letter invalid."
msgstr "Kon niet zenden als zender, of de brief is ongeldig."
-#: src/gui/outfitwindow.cpp:82 src/gui/outfitwindow.cpp:886
+#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:890
#, c-format
msgid "Outfit: %d"
msgstr "Kleren: %d"
-#: src/gui/outfitwindow.cpp:84 src/gui/outfitwindow.cpp:888
+#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:892
#, c-format
msgid "Key: %s"
msgstr "Sleutel: %s"
-#: src/gui/outfitwindow.cpp:87
+#: src/gui/outfitwindow.cpp:91
msgid "Unequip first"
msgstr "Verwijder uitrusting eerst"
-#: src/gui/outfitwindow.cpp:90
+#: src/gui/outfitwindow.cpp:94
msgid "Away outfit"
msgstr "Kleren om weg te gaan"
-#: src/gui/popupmenu.cpp:133 src/gui/popupmenu.cpp:616
+#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:645
#: src/gui/widgets/tradetab.cpp:44
msgid "Trade"
msgstr "Handel"
-#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:375
+#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:393
msgid "Whisper"
msgstr ""
-#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:621
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:650
msgid "Heal"
msgstr ""
-#: src/gui/popupmenu.cpp:146 src/gui/popupmenu.cpp:381
-#: src/gui/popupmenu.cpp:628
+#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:399
+#: src/gui/popupmenu.cpp:657
msgid "Be friend"
msgstr "Word vriend"
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:383
-#: src/gui/popupmenu.cpp:389 src/gui/popupmenu.cpp:408
-#: src/gui/popupmenu.cpp:630 src/gui/popupmenu.cpp:638
-#: src/gui/popupmenu.cpp:662
+#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:156
+#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:401
+#: src/gui/popupmenu.cpp:407 src/gui/popupmenu.cpp:426
+#: src/gui/popupmenu.cpp:659 src/gui/popupmenu.cpp:667
+#: src/gui/popupmenu.cpp:691
msgid "Disregard"
msgstr "Geen rekening mee houden"
-#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:161
-#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:177
-#: src/gui/popupmenu.cpp:385 src/gui/popupmenu.cpp:391
-#: src/gui/popupmenu.cpp:398 src/gui/popupmenu.cpp:403
-#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
-#: src/gui/popupmenu.cpp:649 src/gui/popupmenu.cpp:655
+#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:160
+#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:176
+#: src/gui/popupmenu.cpp:403 src/gui/popupmenu.cpp:409
+#: src/gui/popupmenu.cpp:416 src/gui/popupmenu.cpp:421
+#: src/gui/popupmenu.cpp:662 src/gui/popupmenu.cpp:670
+#: src/gui/popupmenu.cpp:678 src/gui/popupmenu.cpp:684
msgid "Erase"
msgstr "Wis"
-#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:175
-#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:395
-#: src/gui/popupmenu.cpp:402 src/gui/popupmenu.cpp:407
-#: src/gui/popupmenu.cpp:646 src/gui/popupmenu.cpp:654
-#: src/gui/popupmenu.cpp:660
+#: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:174
+#: src/gui/popupmenu.cpp:181 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:425
+#: src/gui/popupmenu.cpp:675 src/gui/popupmenu.cpp:683
+#: src/gui/popupmenu.cpp:689
msgid "Unignore"
msgstr ""
-#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:186
-#: src/gui/popupmenu.cpp:397 src/gui/popupmenu.cpp:410
-#: src/gui/popupmenu.cpp:648 src/gui/popupmenu.cpp:664
+#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:185
+#: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:428
+#: src/gui/popupmenu.cpp:677 src/gui/popupmenu.cpp:693
#: src/playerrelations.cpp:400
msgid "Completely ignore"
msgstr "Volledig genegeerd"
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:418
-#: src/gui/popupmenu.cpp:672
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:436
+#: src/gui/popupmenu.cpp:701
msgid "Follow"
msgstr "Volg"
-#: src/gui/popupmenu.cpp:196 src/gui/popupmenu.cpp:419
-#: src/gui/popupmenu.cpp:673
+#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:437
+#: src/gui/popupmenu.cpp:702
msgid "Imitation"
msgstr "Imiteer"
-#: src/gui/popupmenu.cpp:206 src/gui/popupmenu.cpp:710
+#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:739
msgid "Invite to party"
msgstr ""
-#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:428
-#: src/gui/popupmenu.cpp:715
+#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:744
msgid "Kick from party"
msgstr ""
-#: src/gui/popupmenu.cpp:226 src/gui/popupmenu.cpp:439
-#: src/gui/popupmenu.cpp:729
+#: src/gui/popupmenu.cpp:225 src/gui/popupmenu.cpp:237
+#: src/gui/popupmenu.cpp:460 src/gui/popupmenu.cpp:761
msgid "Kick from guild"
msgstr ""
-#: src/gui/popupmenu.cpp:228 src/gui/popupmenu.cpp:441
-#: src/gui/popupmenu.cpp:731
+#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:242
+#: src/gui/popupmenu.cpp:465 src/gui/popupmenu.cpp:766
msgid "Change pos in guild"
msgstr ""
-#: src/gui/popupmenu.cpp:234 src/gui/popupmenu.cpp:446
-#: src/gui/popupmenu.cpp:737
+#: src/gui/popupmenu.cpp:251 src/gui/popupmenu.cpp:474
+#: src/gui/popupmenu.cpp:776
msgid "Invite to guild"
msgstr ""
-#: src/gui/popupmenu.cpp:242
+#: src/gui/popupmenu.cpp:260
msgid "Kick player"
msgstr "Schop speler"
-#: src/gui/popupmenu.cpp:244
+#: src/gui/popupmenu.cpp:262
msgid "Nuke"
msgstr ""
-#: src/gui/popupmenu.cpp:247 src/gui/popupmenu.cpp:675
+#: src/gui/popupmenu.cpp:265 src/gui/popupmenu.cpp:704
msgid "Show Items"
msgstr "Toon Voorwerpen"
-#: src/gui/popupmenu.cpp:248 src/gui/popupmenu.cpp:676
-#: src/gui/popupmenu.cpp:1970
+#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:705
+#: src/gui/popupmenu.cpp:2020
msgid "Undress"
msgstr "ontkleed"
-#: src/gui/popupmenu.cpp:250 src/gui/popupmenu.cpp:286
-#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:678
-#: src/gui/popupmenu.cpp:746
+#: src/gui/popupmenu.cpp:268 src/gui/popupmenu.cpp:304
+#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:707
+#: src/gui/popupmenu.cpp:786
msgid "Add comment"
msgstr ""
-#: src/gui/popupmenu.cpp:268 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:695
+#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:482
+#: src/gui/popupmenu.cpp:724
msgid "Buy (?)"
msgstr "Koop (?)"
-#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:454
-#: src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:483
+#: src/gui/popupmenu.cpp:726
msgid "Sell (?)"
msgstr "Verkoop (?)"
-#: src/gui/popupmenu.cpp:298
+#: src/gui/popupmenu.cpp:316
msgid "Kick"
msgstr "Schop"
-#: src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:327
msgid "Remove from attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:315
+#: src/gui/popupmenu.cpp:333
msgid "Add to priority attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:317
+#: src/gui/popupmenu.cpp:335
msgid "Add to attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:320
+#: src/gui/popupmenu.cpp:338
msgid "Add to ignore list"
msgstr ""
-#: src/gui/popupmenu.cpp:333 src/gui/popupmenu.cpp:457
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:486
msgid "Add name to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:483
+#: src/gui/popupmenu.cpp:512
msgid "Pick up"
msgstr "Raap op"
-#: src/gui/popupmenu.cpp:484 src/gui/popupmenu.cpp:1682
-#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1805
+#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:1732
+#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1855
msgid "Add to chat"
msgstr "Aan chat toevoegen"
-#: src/gui/popupmenu.cpp:501
+#: src/gui/popupmenu.cpp:530
msgid "Map Item"
msgstr "Plaats voorwerp op de kaart"
-#: src/gui/popupmenu.cpp:502
+#: src/gui/popupmenu.cpp:531
msgid "Rename"
msgstr "Hernoem"
-#: src/gui/popupmenu.cpp:503 src/gui/popupmenu.cpp:1923
-#: src/gui/popupmenu.cpp:1941 src/gui/popupmenu.cpp:1946
+#: src/gui/popupmenu.cpp:532 src/gui/popupmenu.cpp:1973
+#: src/gui/popupmenu.cpp:1991 src/gui/popupmenu.cpp:1996
msgid "Remove"
msgstr "Verwijder"
-#: src/gui/popupmenu.cpp:508
+#: src/gui/popupmenu.cpp:537
msgid "Warp"
msgstr ""
-#: src/gui/popupmenu.cpp:522
+#: src/gui/popupmenu.cpp:551
msgid "Load old outfits"
msgstr "Inladen oude kleren"
-#: src/gui/popupmenu.cpp:538 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:567 src/gui/windowmenu.cpp:96
msgid "Spells"
msgstr "Spreuken"
-#: src/gui/popupmenu.cpp:540
+#: src/gui/popupmenu.cpp:569
msgid "Load old spells"
msgstr "Laad oude spreuken"
-#: src/gui/popupmenu.cpp:541
+#: src/gui/popupmenu.cpp:570
msgid "Edit spell"
msgstr "Wijzig spreuk"
-#: src/gui/popupmenu.cpp:567
+#: src/gui/popupmenu.cpp:596
msgid "Disable highlight"
msgstr "Markering afzetten"
-#: src/gui/popupmenu.cpp:572
+#: src/gui/popupmenu.cpp:601
msgid "Enable highlight"
msgstr "Markering aanzetten"
-#: src/gui/popupmenu.cpp:577
-msgid "Dont remove name"
-msgstr "De naam niet verwijderen"
+#: src/gui/popupmenu.cpp:606
+msgid "Don't remove name"
+msgstr ""
-#: src/gui/popupmenu.cpp:582
+#: src/gui/popupmenu.cpp:611
msgid "Remove name"
msgstr "Verwijder naam"
-#: src/gui/popupmenu.cpp:587
+#: src/gui/popupmenu.cpp:616
msgid "Enable away"
msgstr "away aanzetten"
-#: src/gui/popupmenu.cpp:592
+#: src/gui/popupmenu.cpp:621
msgid "Disable away"
msgstr "away afzetten"
-#: src/gui/popupmenu.cpp:598 src/gui/socialwindow.cpp:1035
+#: src/gui/popupmenu.cpp:627 src/gui/socialwindow.cpp:1141
msgid "Leave"
msgstr "Verlaat"
-#: src/gui/popupmenu.cpp:758
+#: src/gui/popupmenu.cpp:798
msgid "Change guild position"
msgstr "Wijzig uw guild positie"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1189
+#: src/gui/popupmenu.cpp:1234
msgid "Rename map sign "
msgstr "Kaart bordje hernoemen "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1191
+#: src/gui/popupmenu.cpp:1236
msgid "Name: "
msgstr "Naam: "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1241
+#: src/gui/popupmenu.cpp:1286
msgid "Player comment "
msgstr ""
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1243
+#: src/gui/popupmenu.cpp:1288
msgid "Comment: "
msgstr ""
-#: src/gui/popupmenu.cpp:1607
+#: src/gui/popupmenu.cpp:1657
msgid "Add to trade"
msgstr ""
-#: src/gui/popupmenu.cpp:1613
+#: src/gui/popupmenu.cpp:1663
msgid "Add to trade 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1616
+#: src/gui/popupmenu.cpp:1666
msgid "Add to trade half"
msgstr ""
-#: src/gui/popupmenu.cpp:1618
+#: src/gui/popupmenu.cpp:1668
msgid "Add to trade all"
msgstr ""
-#: src/gui/popupmenu.cpp:1630
+#: src/gui/popupmenu.cpp:1680
msgid "Store 10"
msgstr "Plaats 10"
-#: src/gui/popupmenu.cpp:1633
+#: src/gui/popupmenu.cpp:1683
msgid "Store half"
msgstr "Plaats de helft"
-#: src/gui/popupmenu.cpp:1635
+#: src/gui/popupmenu.cpp:1685
msgid "Store all"
msgstr "Plaats alles"
-#: src/gui/popupmenu.cpp:1653 src/gui/popupmenu.cpp:1750
-#: src/gui/popupmenu.cpp:1793
+#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1800
+#: src/gui/popupmenu.cpp:1843
msgid "Drop all"
msgstr "Laat alles vallen"
-#: src/gui/popupmenu.cpp:1674
+#: src/gui/popupmenu.cpp:1724
msgid "Retrieve 10"
msgstr "Haal 10 op"
-#: src/gui/popupmenu.cpp:1677
+#: src/gui/popupmenu.cpp:1727
msgid "Retrieve half"
msgstr "Haal de helft op"
-#: src/gui/popupmenu.cpp:1679
+#: src/gui/popupmenu.cpp:1729
msgid "Retrieve all"
msgstr "Haal alles op"
-#: src/gui/popupmenu.cpp:1710 src/gui/popupmenu.cpp:1766
+#: src/gui/popupmenu.cpp:1760 src/gui/popupmenu.cpp:1816
msgid "Load old item shortcuts"
msgstr "Laden van oude voorwerpsnelkoppelingen"
-#: src/gui/popupmenu.cpp:1809
+#: src/gui/popupmenu.cpp:1859
msgid "Load old drop shortcuts"
msgstr "Laden van oude neerleggingsnelkoppeling"
-#: src/gui/popupmenu.cpp:1835 src/gui/popupmenu.cpp:1870
+#: src/gui/popupmenu.cpp:1885 src/gui/popupmenu.cpp:1920
msgid "Hide"
msgstr "Verberg"
-#: src/gui/popupmenu.cpp:1841 src/gui/popupmenu.cpp:1876
+#: src/gui/popupmenu.cpp:1891 src/gui/popupmenu.cpp:1926
msgid "Show"
msgstr "Toon"
-#: src/gui/popupmenu.cpp:1883
+#: src/gui/popupmenu.cpp:1933
msgid "Reset yellow bar"
msgstr ""
-#: src/gui/popupmenu.cpp:1885 src/gui/statuswindow.cpp:240
+#: src/gui/popupmenu.cpp:1935 src/gui/statuswindow.cpp:241
msgid "Copy to chat"
msgstr "Kopieer naar chat"
-#: src/gui/popupmenu.cpp:1903 src/gui/socialwindow.cpp:854
-#: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
+#: src/gui/popupmenu.cpp:1953 src/gui/socialwindow.cpp:958
+#: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028
msgid "(default)"
msgstr "(standaard)"
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1933
+#: src/gui/popupmenu.cpp:1965 src/gui/popupmenu.cpp:1983
msgid "Move up"
msgstr "Beweeg naar boven"
-#: src/gui/popupmenu.cpp:1920 src/gui/popupmenu.cpp:1938
+#: src/gui/popupmenu.cpp:1970 src/gui/popupmenu.cpp:1988
msgid "Move down"
msgstr "Beweeg naar beneden"
-#: src/gui/quitdialog.cpp:56
+#: src/gui/quitdialog.cpp:51
msgid "Switch server"
msgstr "Van server wisselen"
-#: src/gui/quitdialog.cpp:57
+#: src/gui/quitdialog.cpp:52
msgid "Switch character"
msgstr "Van personage wisselen"
@@ -1620,64 +1624,64 @@ msgstr "Het wachtwoord moet uit minder dan %d tekens bestaan."
msgid "Passwords do not match."
msgstr "Wachtwoorden komen niet overeen."
-#: src/gui/serverdialog.cpp:231
+#: src/gui/serverdialog.cpp:237
msgid "Choose Your Server"
msgstr "Kies Uw Server"
-#: src/gui/serverdialog.cpp:242
+#: src/gui/serverdialog.cpp:248
msgid "Choose Your Server *** SAFE MODE ***"
msgstr "Kies Uw Server *** VEILIGE MODUS ***"
-#: src/gui/serverdialog.cpp:247
+#: src/gui/serverdialog.cpp:253
msgid "Port:"
msgstr "Poort:"
-#: src/gui/serverdialog.cpp:251
+#: src/gui/serverdialog.cpp:257
msgid "Use same ip for game sub servers"
msgstr "Gebruik hetzelfde ip voor spel sub-servers"
-#: src/gui/serverdialog.cpp:265
+#: src/gui/serverdialog.cpp:271
msgid "Server type:"
msgstr "Server type:"
-#: src/gui/serverdialog.cpp:289
+#: src/gui/serverdialog.cpp:295
msgid "Load"
msgstr "Laden"
-#: src/gui/serverdialog.cpp:290
+#: src/gui/serverdialog.cpp:296
msgid "Connect"
msgstr "Verbinden"
-#: src/gui/serverdialog.cpp:291
+#: src/gui/serverdialog.cpp:297
msgid "Custom Server"
msgstr "Manuele Server"
-#: src/gui/serverdialog.cpp:396
+#: src/gui/serverdialog.cpp:402
msgid "Please type both the address and the port of a server."
msgstr "Typ aub zowel het adres van de server, als de poort."
-#: src/gui/serverdialog.cpp:554
+#: src/gui/serverdialog.cpp:560
#, c-format
msgid "Downloading server list...%2.2f%%"
msgstr "Downloaden van server lijst...%2.2f%%"
-#: src/gui/serverdialog.cpp:559
+#: src/gui/serverdialog.cpp:565
msgid "Waiting for server..."
msgstr "Wachten op server..."
-#: src/gui/serverdialog.cpp:563
+#: src/gui/serverdialog.cpp:569
msgid "Preparing download"
msgstr "Download voorbereiden"
-#: src/gui/serverdialog.cpp:567
+#: src/gui/serverdialog.cpp:573
msgid "Error retreiving server list!"
msgstr "Fout tijdens ophalen server lijst"
-#: src/gui/serverdialog.cpp:672
+#: src/gui/serverdialog.cpp:678
msgid "requires a newer version"
msgstr "vereist een nieuwere versie"
-#: src/gui/serverdialog.cpp:674
+#: src/gui/serverdialog.cpp:680
#, c-format
msgid "requires v%s"
msgstr "vereist v%s"
@@ -1824,6 +1828,14 @@ msgstr "Tijd"
msgid "Use local time"
msgstr "Gebruik lokale tijd"
+#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:157
+msgid "Other"
+msgstr "Andere"
+
+#: src/gui/setup_chat.cpp:125
+msgid "Highlight words (separated by comma)"
+msgstr ""
+
#: src/gui/setup_colors.cpp:49
msgid "This is what the color looks like"
msgstr "Dit is hoe de kleur eruit ziet"
@@ -1871,11 +1883,11 @@ msgstr "Blauw:"
msgid "Alpha:"
msgstr "Alfa:"
-#: src/gui/setup.cpp:70
+#: src/gui/setup.cpp:71
msgid "Apply"
msgstr "Toepassen"
-#: src/gui/setup.cpp:73
+#: src/gui/setup.cpp:74
msgid "Reset Windows"
msgstr "Vensters in beginstand"
@@ -2052,34 +2064,42 @@ msgid "Log NPC dialogue"
msgstr ""
#: src/gui/setup_other.cpp:148
-msgid "Other"
-msgstr "Andere"
+msgid "Bots support"
+msgstr ""
#: src/gui/setup_other.cpp:150
-msgid "Enable server side attack"
+msgid "Enable auction bot support"
msgstr ""
#: src/gui/setup_other.cpp:153
+msgid "Enable guild bot support and disable native guild support"
+msgstr ""
+
+#: src/gui/setup_other.cpp:159
+msgid "Enable server side attack"
+msgstr ""
+
+#: src/gui/setup_other.cpp:162
msgid "Enable bot checker"
msgstr ""
-#: src/gui/setup_other.cpp:156
+#: src/gui/setup_other.cpp:165
msgid "Enable buggy servers protection"
msgstr ""
-#: src/gui/setup_other.cpp:159
+#: src/gui/setup_other.cpp:168
msgid "Enable debug log"
msgstr "Zet debug log aan"
-#: src/gui/setup_other.cpp:162
+#: src/gui/setup_other.cpp:171
msgid "Low traffic mode"
msgstr ""
-#: src/gui/setup_other.cpp:165
+#: src/gui/setup_other.cpp:174
msgid "Hide shield sprite"
msgstr ""
-#: src/gui/setup_other.cpp:168
+#: src/gui/setup_other.cpp:177
msgid "Show background"
msgstr "Toon achtergrond"
@@ -2175,6 +2195,10 @@ msgstr ""
msgid "Show ip addresses on screenshots"
msgstr ""
+#: src/gui/setup_players.cpp:81
+msgid "Allow self heal with mouse click"
+msgstr ""
+
#: src/gui/setup_relations.cpp:65
msgid "Relation"
msgstr "Relatie"
@@ -2453,261 +2477,266 @@ msgstr ""
msgid "Changes will take effect on map change."
msgstr "Wijzigingen treden in werking bij het wisselen van map."
-#: src/gui/shopwindow.cpp:74
+#: src/gui/shopwindow.cpp:75
msgid "Personal Shop"
msgstr "Persoonlijke winkel"
-#: src/gui/shopwindow.cpp:116
+#: src/gui/shopwindow.cpp:118
msgid "Buy items"
msgstr "Koop voorwerpen"
-#: src/gui/shopwindow.cpp:117
+#: src/gui/shopwindow.cpp:119
msgid "Sell items"
msgstr "Verkoop voorwerpen"
-#: src/gui/shopwindow.cpp:119 src/gui/shopwindow.cpp:122
-#: src/gui/tradewindow.cpp:88
+#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
+#: src/gui/tradewindow.cpp:89
msgid "Add"
msgstr "Toevoegen"
-#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
+#: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
msgid "Announce"
msgstr "Aankondigingen"
-#: src/gui/shopwindow.cpp:125
+#: src/gui/shopwindow.cpp:127
msgid "Show links in announce"
msgstr "Toon links in aankondigingen"
-#: src/gui/shopwindow.cpp:723 src/net/ea/tradehandler.cpp:106
+#: src/gui/shopwindow.cpp:148 src/gui/shopwindow.cpp:149
+msgid "Auction"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:748 src/net/ea/tradehandler.cpp:106
#: src/net/manaserv/tradehandler.cpp:127
msgid "Request for Trade"
msgstr "Handel aanvragen"
-#: src/gui/shopwindow.cpp:724
+#: src/gui/shopwindow.cpp:749
#, c-format
msgid "%s wants to %s %s do you accept?"
msgstr "%s wilt %s %s ga je akkoord?"
-#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:81
+#: src/gui/skilldialog.cpp:276 src/gui/windowmenu.cpp:81
msgid "Skills"
msgstr "Vaardigheden"
-#: src/gui/skilldialog.cpp:283
+#: src/gui/skilldialog.cpp:288
msgid "Up"
msgstr "Omhoog"
-#: src/gui/skilldialog.cpp:336
+#: src/gui/skilldialog.cpp:341
#, c-format
msgid "Skill points available: %d"
msgstr ""
-#: src/gui/skilldialog.cpp:413
+#: src/gui/skilldialog.cpp:418
#, c-format
msgid "Skill Set %d"
msgstr ""
-#: src/gui/skilldialog.cpp:425
+#: src/gui/skilldialog.cpp:430
#, c-format
msgid "Skill %d"
msgstr ""
-#: src/gui/skilldialog.cpp:492 src/gui/skilldialog.cpp:545
+#: src/gui/skilldialog.cpp:497 src/gui/skilldialog.cpp:550
#, c-format
msgid "Lvl: %d"
msgstr "Niv: %d"
-#: src/gui/skilldialog.cpp:537
+#: src/gui/skilldialog.cpp:542
#, c-format
msgid "Lvl: %d (%+d)"
msgstr "Niv: %d (%+d)"
-#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
+#: src/gui/socialwindow.cpp:118 src/gui/socialwindow.cpp:216
+#: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52
msgid "Guild"
msgstr "Guild"
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:147
#, c-format
msgid "Invited user %s to guild %s."
msgstr "gebruiker %s uitgenodigd in guild %s."
-#: src/gui/socialwindow.cpp:160
+#: src/gui/socialwindow.cpp:161
#, c-format
msgid "Guild %s quit requested."
msgstr "Guild %s verlating aangevraagd."
-#: src/gui/socialwindow.cpp:187
+#: src/gui/socialwindow.cpp:188
msgid "Member Invite to Guild"
msgstr ""
-#: src/gui/socialwindow.cpp:188
+#: src/gui/socialwindow.cpp:189
#, c-format
msgid "Who would you like to invite to guild %s?"
msgstr "Wie zou u willen uitnodigen in guild %s?"
-#: src/gui/socialwindow.cpp:197
+#: src/gui/socialwindow.cpp:198
msgid "Leave Guild?"
msgstr "Verlaten Guild?"
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:199
#, c-format
msgid "Are you sure you want to leave guild %s?"
msgstr "Bent u zeker dat u guild %s wilt verlaten?"
-#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:319 src/net/ea/gui/partytab.cpp:50
msgid "Party"
msgstr "Groep"
-#: src/gui/socialwindow.cpp:243
+#: src/gui/socialwindow.cpp:347
#, c-format
msgid "Invited user %s to party."
msgstr "Gebruiker %s uitgenodigd in groep."
-#: src/gui/socialwindow.cpp:257
+#: src/gui/socialwindow.cpp:361
#, c-format
msgid "Party %s quit requested."
msgstr ""
-#: src/gui/socialwindow.cpp:284
+#: src/gui/socialwindow.cpp:388
msgid "Member Invite to Party"
msgstr ""
-#: src/gui/socialwindow.cpp:285
+#: src/gui/socialwindow.cpp:389
#, c-format
msgid "Who would you like to invite to party %s?"
msgstr "Wie zou u willen uitnodigen in group %s?"
-#: src/gui/socialwindow.cpp:294
+#: src/gui/socialwindow.cpp:398
msgid "Leave Party?"
msgstr "Verlaten Groep?"
-#: src/gui/socialwindow.cpp:295
+#: src/gui/socialwindow.cpp:399
#, c-format
msgid "Are you sure you want to leave party %s?"
msgstr "Bent u zeker dat u groep %s wilt verlaten?"
-#: src/gui/socialwindow.cpp:521
+#: src/gui/socialwindow.cpp:625
msgid "Nav"
msgstr "Nav"
-#: src/gui/socialwindow.cpp:799
+#: src/gui/socialwindow.cpp:903
msgid "Atk"
msgstr "Aanv"
-#: src/gui/socialwindow.cpp:840
+#: src/gui/socialwindow.cpp:944
msgid "Priority mobs"
msgstr ""
-#: src/gui/socialwindow.cpp:872
+#: src/gui/socialwindow.cpp:976
msgid "Attack mobs"
msgstr ""
-#: src/gui/socialwindow.cpp:907
+#: src/gui/socialwindow.cpp:1011
msgid "Ignore mobs"
msgstr ""
-#: src/gui/socialwindow.cpp:970
+#: src/gui/socialwindow.cpp:1074
msgid "Create Guild"
msgstr "Guild aanmaken"
-#: src/gui/socialwindow.cpp:971 src/gui/socialwindow.cpp:1387
+#: src/gui/socialwindow.cpp:1075 src/gui/socialwindow.cpp:1503
msgid "Create Party"
msgstr "Groep aanmaken"
-#: src/gui/socialwindow.cpp:1013 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1117 src/gui/windowmenu.cpp:93
msgid "Social"
msgstr "Sociaal"
-#: src/gui/socialwindow.cpp:1034
+#: src/gui/socialwindow.cpp:1140
msgid "Invite"
msgstr "Nodig uit"
-#: src/gui/socialwindow.cpp:1176
+#: src/gui/socialwindow.cpp:1286
#, c-format
msgid "Accepted party invite from %s."
msgstr "Uitnodiging voor groep %s aanvaard."
-#: src/gui/socialwindow.cpp:1186
+#: src/gui/socialwindow.cpp:1296
#, c-format
msgid "Rejected party invite from %s."
msgstr "Uitnodiging voor groep %s geweigerd."
-#: src/gui/socialwindow.cpp:1203
+#: src/gui/socialwindow.cpp:1313
#, c-format
msgid "Accepted guild invite from %s."
msgstr "Uitnodiging voor guild %s aanvaard."
-#: src/gui/socialwindow.cpp:1213
+#: src/gui/socialwindow.cpp:1326
#, c-format
msgid "Rejected guild invite from %s."
msgstr "Uitnodiging voor guild %s geweigerd."
-#: src/gui/socialwindow.cpp:1257
+#: src/gui/socialwindow.cpp:1373
#, c-format
msgid "Creating guild called %s."
msgstr "Maken van guild %s."
-#: src/gui/socialwindow.cpp:1280
+#: src/gui/socialwindow.cpp:1396
#, c-format
msgid "Creating party called %s."
msgstr "Maken van groep %s."
-#: src/gui/socialwindow.cpp:1294
+#: src/gui/socialwindow.cpp:1410
msgid "Guild Name"
msgstr "Guild Naam"
-#: src/gui/socialwindow.cpp:1295
+#: src/gui/socialwindow.cpp:1411
msgid "Choose your guild's name."
msgstr "Kies uw guild naam"
-#: src/gui/socialwindow.cpp:1309
+#: src/gui/socialwindow.cpp:1425
msgid "Received guild request, but one already exists."
msgstr "Uitnodiging tot guild ontvangen, maar er is er al één."
-#: src/gui/socialwindow.cpp:1315
+#: src/gui/socialwindow.cpp:1431
#, c-format
msgid "%s has invited you to join the guild %s."
msgstr ""
-#: src/gui/socialwindow.cpp:1321
+#: src/gui/socialwindow.cpp:1437
msgid "Accept Guild Invite"
msgstr "Guild Uitnodiging Aanvaarden"
-#: src/gui/socialwindow.cpp:1336
+#: src/gui/socialwindow.cpp:1452
msgid "Received party request, but one already exists."
msgstr "Uitnodiging tot groep ontvangen, maar er is er al één."
-#: src/gui/socialwindow.cpp:1347
+#: src/gui/socialwindow.cpp:1463
msgid "You have been invited you to join a party."
msgstr "U bent uitgenodigd om je bij een groep te voegen."
-#: src/gui/socialwindow.cpp:1351
+#: src/gui/socialwindow.cpp:1467
#, c-format
msgid "You have been invited to join the %s party."
msgstr "U bent uitgenodigd om je bij groep %s te voegen."
-#: src/gui/socialwindow.cpp:1359
+#: src/gui/socialwindow.cpp:1475
#, c-format
msgid "%s has invited you to join their party."
msgstr "%s heeft je uitgenodigd om je bij hun groep te voegen."
-#: src/gui/socialwindow.cpp:1364
+#: src/gui/socialwindow.cpp:1480
#, c-format
msgid "%s has invited you to join the %s party."
msgstr "%s heeft je uitgenodigd om je bij groep %s te voegen."
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1489
msgid "Accept Party Invite"
msgstr "Groepsuitnodiging aanvaarden"
-#: src/gui/socialwindow.cpp:1388
+#: src/gui/socialwindow.cpp:1504
msgid "Cannot create party. You are already in a party"
msgstr "Kan groep niet aanmaken. Je bent al in een groep."
-#: src/gui/socialwindow.cpp:1393
+#: src/gui/socialwindow.cpp:1509
msgid "Party Name"
msgstr "Groep Naam"
-#: src/gui/socialwindow.cpp:1394
+#: src/gui/socialwindow.cpp:1510
msgid "Choose your party's name."
msgstr "Kies uw groepsnaam."
@@ -2715,418 +2744,418 @@ msgstr "Kies uw groepsnaam."
msgid "Specials"
msgstr ""
-#: src/gui/statuspopup.cpp:197
+#: src/gui/statuspopup.cpp:198
msgid "(D) default moves"
msgstr "(D) standaard bewegingen"
-#: src/gui/statuspopup.cpp:202
+#: src/gui/statuspopup.cpp:203
msgid "(I) invert moves"
msgstr "(I) geïnverteerde bewegingen"
-#: src/gui/statuspopup.cpp:207
+#: src/gui/statuspopup.cpp:208
msgid "(c) moves with some crazy moves"
msgstr "(c) bewegingen met enkele vreemde bewegingen"
-#: src/gui/statuspopup.cpp:212
+#: src/gui/statuspopup.cpp:213
msgid "(C) moves with crazy moves"
msgstr "(C) bewegingen met vreemde bewegingen"
-#: src/gui/statuspopup.cpp:217
+#: src/gui/statuspopup.cpp:218
msgid "(d) double normal + crazy"
msgstr "(d) dubbel normaal + raar"
-#: src/gui/statuspopup.cpp:222
+#: src/gui/statuspopup.cpp:223
msgid "(?) move"
msgstr "(?) beweeg"
-#: src/gui/statuspopup.cpp:240
+#: src/gui/statuspopup.cpp:241
msgid "(a) custom crazy move"
msgstr "(a) manuele vreemde beweging"
-#: src/gui/statuspopup.cpp:244
+#: src/gui/statuspopup.cpp:245
msgid "(?) crazy move"
msgstr "(?) vreemde beweging"
-#: src/gui/statuspopup.cpp:254
+#: src/gui/statuspopup.cpp:255
msgid "(0) default moves to target"
msgstr "(0) standaard bewegingen tot aan doel"
-#: src/gui/statuspopup.cpp:259
+#: src/gui/statuspopup.cpp:260
msgid "(1) moves to target in distance 1"
msgstr "(1) bewegen tot aan doel in bereik 1"
-#: src/gui/statuspopup.cpp:264
+#: src/gui/statuspopup.cpp:265
msgid "(2) moves to target in distance 2"
msgstr "(2) bewegen tot aan doel in bereik 2"
-#: src/gui/statuspopup.cpp:269
+#: src/gui/statuspopup.cpp:270
msgid "(3) moves to target in distance 3"
msgstr "(3) bewegen tot aan doel in bereik 3"
-#: src/gui/statuspopup.cpp:274
+#: src/gui/statuspopup.cpp:275
msgid "(5) moves to target in distance 5"
msgstr "(5) bewegen tot aan doel in bereik 5"
-#: src/gui/statuspopup.cpp:279
+#: src/gui/statuspopup.cpp:280
msgid "(7) moves to target in distance 7"
msgstr "(7) bewegen tot aan doel in bereik 7"
-#: src/gui/statuspopup.cpp:284
+#: src/gui/statuspopup.cpp:285
msgid "(A) moves to target in attack range"
msgstr "(A) beweeg tot aan doel in aanvalsbereik"
-#: src/gui/statuspopup.cpp:289
+#: src/gui/statuspopup.cpp:290
msgid "(?) move to target"
msgstr "(?) beweeg tot aan doel"
-#: src/gui/statuspopup.cpp:297
+#: src/gui/statuspopup.cpp:298
msgid "(D) default follow"
msgstr "(D) standaard volgen"
-#: src/gui/statuspopup.cpp:301
+#: src/gui/statuspopup.cpp:302
msgid "(R) relative follow"
msgstr "(R) relatief volgen"
-#: src/gui/statuspopup.cpp:305
+#: src/gui/statuspopup.cpp:306
msgid "(M) mirror follow"
msgstr "(M) gespiegeld volgen"
-#: src/gui/statuspopup.cpp:309
+#: src/gui/statuspopup.cpp:310
msgid "(P) pet follow"
msgstr "(P) huisdier volgen"
-#: src/gui/statuspopup.cpp:313
+#: src/gui/statuspopup.cpp:314
msgid "(?) unknown follow"
msgstr "(?) onbekend volgen"
-#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
+#: src/gui/statuspopup.cpp:323 src/gui/statuspopup.cpp:346
msgid "(D) default attack"
msgstr "(D) standaard aanval"
-#: src/gui/statuspopup.cpp:327
+#: src/gui/statuspopup.cpp:328
msgid "(s) switch attack without shield"
msgstr "(s) wissel aanval zonder schild"
-#: src/gui/statuspopup.cpp:332
+#: src/gui/statuspopup.cpp:333
msgid "(S) switch attack with shield"
msgstr "(S) wissel aanval met schild"
-#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
+#: src/gui/statuspopup.cpp:337 src/gui/statuspopup.cpp:362
msgid "(?) attack"
msgstr "(?) aanval"
-#: src/gui/statuspopup.cpp:349
+#: src/gui/statuspopup.cpp:350
msgid "(G) go and attack"
msgstr "(G) ga en val aan"
-#: src/gui/statuspopup.cpp:353
+#: src/gui/statuspopup.cpp:354
msgid "(A) go, attack, pickup"
msgstr "(A) ga, val aan, raap op"
-#: src/gui/statuspopup.cpp:357
+#: src/gui/statuspopup.cpp:358
msgid "(d) without auto attack"
msgstr "(d) zonder auto aanval"
-#: src/gui/statuspopup.cpp:375
+#: src/gui/statuspopup.cpp:376
msgid "(S) small pick up 1x1 cells"
msgstr "(S) klein raap op 1x1 velden"
-#: src/gui/statuspopup.cpp:379
+#: src/gui/statuspopup.cpp:380
msgid "(D) default pick up 2x1 cells"
msgstr "(D) standaard raap op 2x1 velden"
-#: src/gui/statuspopup.cpp:383
+#: src/gui/statuspopup.cpp:384
msgid "(F) forward pick up 2x3 cells"
msgstr "(F) vooruit raap op 2x3 velden"
-#: src/gui/statuspopup.cpp:387
+#: src/gui/statuspopup.cpp:388
msgid "(3) pick up 3x3 cells"
msgstr "(3) raap op 3x3 velden"
-#: src/gui/statuspopup.cpp:391
+#: src/gui/statuspopup.cpp:392
msgid "(g) go and pick up in distance 4"
msgstr "(g) go en raap op met bereik 4"
-#: src/gui/statuspopup.cpp:395
+#: src/gui/statuspopup.cpp:396
msgid "(G) go and pick up in distance 8"
msgstr "(G) ga en raap op met bereik 8"
-#: src/gui/statuspopup.cpp:399
+#: src/gui/statuspopup.cpp:400
msgid "(A) go and pick up in max distance"
msgstr "(A) ga en raap op zonder bereiklimiet"
-#: src/gui/statuspopup.cpp:403
+#: src/gui/statuspopup.cpp:404
msgid "(?) pick up"
msgstr "(?) raap op"
-#: src/gui/statuspopup.cpp:412
+#: src/gui/statuspopup.cpp:413
msgid "(N) normal map view"
msgstr "(N) normale map tonen"
-#: src/gui/statuspopup.cpp:416
+#: src/gui/statuspopup.cpp:417
msgid "(D) debug map view"
msgstr "(D) debug map tonen"
-#: src/gui/statuspopup.cpp:420
+#: src/gui/statuspopup.cpp:421
msgid "(u) ultra map view"
msgstr "(u) ultra map tonen"
-#: src/gui/statuspopup.cpp:424
+#: src/gui/statuspopup.cpp:425
msgid "(U) ultra map view 2"
msgstr "(U) ultra map tonen 2"
-#: src/gui/statuspopup.cpp:428
+#: src/gui/statuspopup.cpp:429
msgid "(e) empty map view"
msgstr "(e) lege map tonen"
-#: src/gui/statuspopup.cpp:432
+#: src/gui/statuspopup.cpp:433
msgid "(b) black & white map view"
msgstr "(b) zwart & witte map tonen"
-#: src/gui/statuspopup.cpp:436
+#: src/gui/statuspopup.cpp:437
msgid "(?) map view"
msgstr "(?) map tonen"
-#: src/gui/statuspopup.cpp:444
+#: src/gui/statuspopup.cpp:445
msgid "(f) use #flar for magic attack"
msgstr "(f) gebruik #flar voor magie aanval"
-#: src/gui/statuspopup.cpp:449
+#: src/gui/statuspopup.cpp:450
msgid "(c) use #chiza for magic attack"
msgstr "(c) gebruik #chiza voor magie aanval"
-#: src/gui/statuspopup.cpp:454
+#: src/gui/statuspopup.cpp:455
msgid "(I) use #ingrav for magic attack"
msgstr "(I) gebruik #ingrav voor magie aanval"
-#: src/gui/statuspopup.cpp:459
+#: src/gui/statuspopup.cpp:460
msgid "(F) use #frillyar for magic attack"
msgstr "(F) gebruik #frillyar voor magie aanval"
-#: src/gui/statuspopup.cpp:464
+#: src/gui/statuspopup.cpp:465
msgid "(U) use #upmarmu for magic attack"
msgstr "(U) gebruik #upmarmu voor magie aanval"
-#: src/gui/statuspopup.cpp:468
+#: src/gui/statuspopup.cpp:469
msgid "(?) magic attack"
msgstr "(?) magie aanval"
-#: src/gui/statuspopup.cpp:477
+#: src/gui/statuspopup.cpp:478
msgid "(D) default imitation"
msgstr "(D) standaard imitatie"
-#: src/gui/statuspopup.cpp:481
+#: src/gui/statuspopup.cpp:482
msgid "(O) outfits imitation"
msgstr "(O) kleren imitatie"
-#: src/gui/statuspopup.cpp:485
+#: src/gui/statuspopup.cpp:486
msgid "(?) imitation"
msgstr "(?) imitatie"
-#: src/gui/statuspopup.cpp:494
+#: src/gui/statuspopup.cpp:495
msgid "(O) on keyboard"
msgstr "(O) op toetsenbord"
-#: src/gui/statuspopup.cpp:497
+#: src/gui/statuspopup.cpp:498
msgid "(A) away"
msgstr "(A) weg"
-#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
+#: src/gui/statuspopup.cpp:501 src/gui/statuspopup.cpp:521
msgid "(?) away"
msgstr "(?) weg"
-#: src/gui/statuspopup.cpp:508
+#: src/gui/statuspopup.cpp:509
msgid "(G) game camera mode"
msgstr "(G) spel camera modus"
-#: src/gui/statuspopup.cpp:512
+#: src/gui/statuspopup.cpp:513
msgid "(F) free camera mode"
msgstr "(F) vrije camera modus"
-#: src/gui/statuspopup.cpp:516
+#: src/gui/statuspopup.cpp:517
msgid "(D) design camera mode"
msgstr "(D) design camera modus"
-#: src/gui/statuspopup.cpp:527
+#: src/gui/statuspopup.cpp:528
msgid "Game modifiers are disabled"
msgstr ""
-#: src/gui/statuspopup.cpp:532
+#: src/gui/statuspopup.cpp:533
msgid "Game modifiers are enabled"
msgstr ""
-#: src/gui/statuswindow.cpp:142 src/gui/statuswindow.cpp:272
-#: src/gui/statuswindow.cpp:335
+#: src/gui/statuswindow.cpp:143 src/gui/statuswindow.cpp:273
+#: src/gui/statuswindow.cpp:336
#, c-format
msgid "Level: %d"
msgstr "Level: %d"
-#: src/gui/statuswindow.cpp:143 src/gui/statuswindow.cpp:258
-#: src/gui/statuswindow.cpp:302
+#: src/gui/statuswindow.cpp:144 src/gui/statuswindow.cpp:259
+#: src/gui/statuswindow.cpp:303
#, c-format
msgid "Money: %s"
msgstr "Geld: %s"
-#: src/gui/statuswindow.cpp:149
+#: src/gui/statuswindow.cpp:150
msgid "HP:"
msgstr "Leven:"
-#: src/gui/statuswindow.cpp:156
+#: src/gui/statuswindow.cpp:157
msgid "Exp:"
msgstr "Ervaring:"
-#: src/gui/statuswindow.cpp:170
+#: src/gui/statuswindow.cpp:171
msgid "MP:"
msgstr "Magie:"
-#: src/gui/statuswindow.cpp:202 src/gui/statuswindow.cpp:385
+#: src/gui/statuswindow.cpp:203 src/gui/statuswindow.cpp:386
#, c-format
msgid "Job: %d"
msgstr "Job: %d"
-#: src/gui/statuswindow.cpp:203
+#: src/gui/statuswindow.cpp:204
msgid "Job:"
msgstr "Job:"
-#: src/gui/statuswindow.cpp:261 src/gui/statuswindow.cpp:309
+#: src/gui/statuswindow.cpp:262 src/gui/statuswindow.cpp:310
#, c-format
msgid "Character points: %d"
msgstr ""
-#: src/gui/statuswindow.cpp:267
+#: src/gui/statuswindow.cpp:268
#, c-format
msgid "Level: %d (GM %d)"
msgstr "Niveau: %d (GM %d)"
-#: src/gui/statuswindow.cpp:323
+#: src/gui/statuswindow.cpp:324
#, c-format
msgid "Correction points: %d"
msgstr ""
-#: src/gui/statuswindow.cpp:646 src/gui/statuswindow.cpp:711
-#: src/gui/statuswindow.cpp:731 src/gui/statuswindow.cpp:747
-#: src/gui/statuswindow.cpp:793 src/gui/statuswindow.cpp:822
-#: src/gui/statuswindow.cpp:845 src/gui/statuswindow.cpp:864
+#: src/gui/statuswindow.cpp:647 src/gui/statuswindow.cpp:712
+#: src/gui/statuswindow.cpp:732 src/gui/statuswindow.cpp:748
+#: src/gui/statuswindow.cpp:794 src/gui/statuswindow.cpp:823
+#: src/gui/statuswindow.cpp:846 src/gui/statuswindow.cpp:865
msgid "(D)"
msgstr "(D)"
-#: src/gui/statuswindow.cpp:649 src/gui/statuswindow.cpp:772
+#: src/gui/statuswindow.cpp:650 src/gui/statuswindow.cpp:773
msgid "(I)"
msgstr "(I)"
-#: src/gui/statuswindow.cpp:652 src/gui/statuswindow.cpp:769
+#: src/gui/statuswindow.cpp:653 src/gui/statuswindow.cpp:770
msgid "(c)"
msgstr "(c)"
-#: src/gui/statuswindow.cpp:655
+#: src/gui/statuswindow.cpp:656
msgid "(C)"
msgstr "(C)"
-#: src/gui/statuswindow.cpp:658 src/gui/statuswindow.cpp:756
+#: src/gui/statuswindow.cpp:659 src/gui/statuswindow.cpp:757
msgid "(d)"
msgstr "(d)"
-#: src/gui/statuswindow.cpp:661 src/gui/statuswindow.cpp:675
-#: src/gui/statuswindow.cpp:704 src/gui/statuswindow.cpp:723
-#: src/gui/statuswindow.cpp:740 src/gui/statuswindow.cpp:759
-#: src/gui/statuswindow.cpp:781 src/gui/statuswindow.cpp:811
-#: src/gui/statuswindow.cpp:837 src/gui/statuswindow.cpp:851
-#: src/gui/statuswindow.cpp:867 src/gui/statuswindow.cpp:880
+#: src/gui/statuswindow.cpp:662 src/gui/statuswindow.cpp:676
+#: src/gui/statuswindow.cpp:705 src/gui/statuswindow.cpp:724
+#: src/gui/statuswindow.cpp:741 src/gui/statuswindow.cpp:760
+#: src/gui/statuswindow.cpp:782 src/gui/statuswindow.cpp:812
+#: src/gui/statuswindow.cpp:838 src/gui/statuswindow.cpp:852
+#: src/gui/statuswindow.cpp:868 src/gui/statuswindow.cpp:881
msgid "(?)"
msgstr "(?)"
-#: src/gui/statuswindow.cpp:672
+#: src/gui/statuswindow.cpp:673
msgid "(a)"
msgstr "(a)"
-#: src/gui/statuswindow.cpp:683
+#: src/gui/statuswindow.cpp:684
msgid "(0)"
msgstr "(0)"
-#: src/gui/statuswindow.cpp:686
+#: src/gui/statuswindow.cpp:687
msgid "(1)"
msgstr "(1)"
-#: src/gui/statuswindow.cpp:689
+#: src/gui/statuswindow.cpp:690
msgid "(2)"
msgstr "(2)"
-#: src/gui/statuswindow.cpp:692 src/gui/statuswindow.cpp:799
+#: src/gui/statuswindow.cpp:693 src/gui/statuswindow.cpp:800
msgid "(3)"
msgstr "(3)"
-#: src/gui/statuswindow.cpp:695
+#: src/gui/statuswindow.cpp:696
msgid "(5)"
msgstr "(5)"
-#: src/gui/statuswindow.cpp:698
+#: src/gui/statuswindow.cpp:699
msgid "(7)"
msgstr "(7)"
-#: src/gui/statuswindow.cpp:701 src/gui/statuswindow.cpp:753
-#: src/gui/statuswindow.cpp:808 src/gui/statuswindow.cpp:877
+#: src/gui/statuswindow.cpp:702 src/gui/statuswindow.cpp:754
+#: src/gui/statuswindow.cpp:809 src/gui/statuswindow.cpp:878
msgid "(A)"
msgstr "(A)"
-#: src/gui/statuswindow.cpp:714
+#: src/gui/statuswindow.cpp:715
msgid "(R)"
msgstr "(R)"
-#: src/gui/statuswindow.cpp:717
+#: src/gui/statuswindow.cpp:718
msgid "(M)"
msgstr "(M)"
-#: src/gui/statuswindow.cpp:720
+#: src/gui/statuswindow.cpp:721
msgid "(P)"
msgstr "(P)"
-#: src/gui/statuswindow.cpp:734
+#: src/gui/statuswindow.cpp:735
msgid "(s)"
msgstr "(s)"
-#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:790
+#: src/gui/statuswindow.cpp:738 src/gui/statuswindow.cpp:791
msgid "(S)"
msgstr "(S)"
-#: src/gui/statuswindow.cpp:750 src/gui/statuswindow.cpp:805
-#: src/gui/statuswindow.cpp:858
+#: src/gui/statuswindow.cpp:751 src/gui/statuswindow.cpp:806
+#: src/gui/statuswindow.cpp:859
msgid "(G)"
msgstr "(G)"
-#: src/gui/statuswindow.cpp:766
+#: src/gui/statuswindow.cpp:767
msgid "(f)"
msgstr "(f)"
-#: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:796
-#: src/gui/statuswindow.cpp:861
+#: src/gui/statuswindow.cpp:776 src/gui/statuswindow.cpp:797
+#: src/gui/statuswindow.cpp:862
msgid "(F)"
msgstr "(F)"
-#: src/gui/statuswindow.cpp:778 src/gui/statuswindow.cpp:828
+#: src/gui/statuswindow.cpp:779 src/gui/statuswindow.cpp:829
msgid "(U)"
msgstr "(U)"
-#: src/gui/statuswindow.cpp:802
+#: src/gui/statuswindow.cpp:803
msgid "(g)"
msgstr "(g)"
-#: src/gui/statuswindow.cpp:819
+#: src/gui/statuswindow.cpp:820
msgid "(N)"
msgstr "(N)"
-#: src/gui/statuswindow.cpp:825
+#: src/gui/statuswindow.cpp:826
msgid "(u)"
msgstr "(u)"
-#: src/gui/statuswindow.cpp:831
+#: src/gui/statuswindow.cpp:832
msgid "(e)"
msgstr "(e)"
-#: src/gui/statuswindow.cpp:834
+#: src/gui/statuswindow.cpp:835
msgid "(b)"
msgstr "(b)"
-#: src/gui/statuswindow.cpp:848 src/gui/statuswindow.cpp:874
+#: src/gui/statuswindow.cpp:849 src/gui/statuswindow.cpp:875
msgid "(O)"
msgstr "(O)"
@@ -3234,24 +3263,24 @@ msgstr "Goedgekeurd. Wachten..."
msgid "Trade: You"
msgstr "Handel: Jij"
-#: src/gui/tradewindow.cpp:110 src/gui/tradewindow.cpp:166
+#: src/gui/tradewindow.cpp:111 src/gui/tradewindow.cpp:167
#, c-format
msgid "You get %s"
msgstr "U krijgt %s"
-#: src/gui/tradewindow.cpp:111
+#: src/gui/tradewindow.cpp:112
msgid "You give:"
msgstr "Je geeft:"
-#: src/gui/tradewindow.cpp:115
+#: src/gui/tradewindow.cpp:116
msgid "Change"
msgstr "Veranderen"
-#: src/gui/tradewindow.cpp:374
+#: src/gui/tradewindow.cpp:375
msgid "You don't have enough money."
msgstr "Je hebt niet genoeg geld."
-#: src/gui/tradewindow.cpp:453
+#: src/gui/tradewindow.cpp:454
msgid "Failed adding item. You can not overlap one kind of item on the window."
msgstr ""
"Kan dat voorwerp niet toevoegen. Je kan één type voorwerp niet overlappen in "
@@ -3262,33 +3291,33 @@ msgstr ""
msgid "Name: %s"
msgstr "Naam: %s"
-#: src/gui/updaterwindow.cpp:136
+#: src/gui/updaterwindow.cpp:138
msgid "Updating..."
msgstr "Actualiseren..."
-#: src/gui/updaterwindow.cpp:155
+#: src/gui/updaterwindow.cpp:159
msgid "Connecting..."
msgstr "Verbinden..."
-#: src/gui/updaterwindow.cpp:158
+#: src/gui/updaterwindow.cpp:162
msgid "Play"
msgstr "Spelen"
-#: src/gui/updaterwindow.cpp:556
+#: src/gui/updaterwindow.cpp:564
msgid "##1 The update process is incomplete."
msgstr "##1 Het updateproces is onvolledig."
#. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:558
+#: src/gui/updaterwindow.cpp:566
msgid "##1 It is strongly recommended that"
msgstr "##1 Het is ten sterkste aanbevolen dat"
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:560
+#: src/gui/updaterwindow.cpp:568
msgid "##1 you try again later."
msgstr "##1 probeer later opnieuw."
-#: src/gui/updaterwindow.cpp:686
+#: src/gui/updaterwindow.cpp:744
msgid "Completed"
msgstr "Voltooid"
@@ -3440,23 +3469,23 @@ msgstr ""
msgid "Road Point"
msgstr ""
-#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:471
+#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:472
msgid "Who Is Online - Updating"
msgstr "Wie Is Online - Bijwerken"
-#: src/gui/whoisonline.cpp:101
+#: src/gui/whoisonline.cpp:102
msgid "Update"
msgstr "Bijwerken"
-#: src/gui/whoisonline.cpp:294
+#: src/gui/whoisonline.cpp:295
msgid "Who Is Online - "
msgstr "Wie Is Online - "
-#: src/gui/whoisonline.cpp:485
+#: src/gui/whoisonline.cpp:486
msgid "Who Is Online - error"
msgstr "Wie Is Online - fout"
-#: src/gui/whoisonline.cpp:516
+#: src/gui/whoisonline.cpp:517
msgid "Who Is Online - Update"
msgstr "Wie Is Online - Bijgewerkt"
@@ -3523,7 +3552,8 @@ msgid "This command makes <nick> a channel operator."
msgstr "Dit commando maakt van <nick> een kanaalbeheerder."
#: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
-#: src/net/ea/gui/guildtab.cpp:69 src/net/ea/gui/partytab.cpp:85
+#: src/gui/widgets/guildchattab.cpp:61 src/net/ea/gui/guildtab.cpp:69
+#: src/net/ea/gui/partytab.cpp:85
msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
msgstr ""
"Als de <nick> spaties bevat, omsluit het dan met dubbele aanhalingstekens "
@@ -3565,6 +3595,41 @@ msgstr "Globale aankondiging van %s:"
msgid "%s whispers: %s"
msgstr "%s fluistert: %s"
+#: src/gui/widgets/guildchattab.cpp:59 src/net/ea/gui/guildtab.cpp:67
+#: src/net/ea/gui/partytab.cpp:83
+msgid "Command: /invite <nick>"
+msgstr "Commando: /invite <nick>"
+
+#: src/gui/widgets/guildchattab.cpp:60 src/net/ea/gui/guildtab.cpp:68
+msgid "This command invites <nick> to the guild you're in."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:66 src/net/ea/gui/guildtab.cpp:74
+#: src/net/ea/gui/partytab.cpp:90
+msgid "Command: /leave"
+msgstr "Commando: /leave"
+
+#: src/gui/widgets/guildchattab.cpp:67 src/net/ea/gui/guildtab.cpp:75
+msgid "This command causes the player to leave the guild."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:109 src/net/ea/gui/guildtab.cpp:135
+#: src/net/ea/gui/partytab.cpp:69
+msgid "/help > Display this help."
+msgstr "/help > Geeft deze help weer."
+
+#: src/gui/widgets/guildchattab.cpp:110 src/net/ea/gui/guildtab.cpp:136
+msgid "/invite > Invite a player to your guild"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:111 src/net/ea/gui/guildtab.cpp:137
+msgid "/leave > Leave the guild you are in"
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:112 src/net/ea/gui/guildtab.cpp:138
+msgid "/kick > Kick some one from the guild you are in"
+msgstr ""
+
#: src/gui/widgets/setupitem.cpp:271 src/gui/widgets/setupitem.cpp:394
msgid "Edit"
msgstr "Wijzig"
@@ -4097,68 +4162,68 @@ msgid ""
"strange behaviour."
msgstr ""
-#: src/localplayer.cpp:372
+#: src/localplayer.cpp:370
msgid "You were killed by "
msgstr "U bent gedoodt door "
-#: src/localplayer.cpp:1403
+#: src/localplayer.cpp:1401
msgid "Tried to pick up nonexistent item."
msgstr "Geprobeerd een nietbestaand voorwerp op te rapen."
-#: src/localplayer.cpp:1405
+#: src/localplayer.cpp:1403
msgid "Item is too heavy."
msgstr "Voorwerp is te zwaar."
-#: src/localplayer.cpp:1407
+#: src/localplayer.cpp:1405
msgid "Item is too far away."
msgstr "Voorwerp is te ver weg."
-#: src/localplayer.cpp:1409
+#: src/localplayer.cpp:1407
msgid "Inventory is full."
msgstr ""
-#: src/localplayer.cpp:1411
+#: src/localplayer.cpp:1409
msgid "Stack is too big."
msgstr ""
-#: src/localplayer.cpp:1414
+#: src/localplayer.cpp:1412
msgid "Item belongs to someone else."
msgstr "Voorwerp behoort bij iemand anders."
-#: src/localplayer.cpp:1417
+#: src/localplayer.cpp:1415
msgid "Unknown problem picking up item."
msgstr "Onbekend probleem bij het oprapen van voorwerp."
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1441
+#: src/localplayer.cpp:1439
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
msgstr[0] "U raapte op %d [@@%d|%s@@]."
msgstr[1] "U raapte op %d [@@%d|%s@@]."
-#: src/localplayer.cpp:3175
+#: src/localplayer.cpp:3173
msgid "Away"
msgstr "Weg"
-#: src/localplayer.cpp:3476
+#: src/localplayer.cpp:3474
msgid "Follow: "
msgstr "Volg: "
-#: src/localplayer.cpp:3478 src/localplayer.cpp:3493
+#: src/localplayer.cpp:3476 src/localplayer.cpp:3491
msgid "Follow canceled"
msgstr "Volgen onderbroken"
-#: src/localplayer.cpp:3485
+#: src/localplayer.cpp:3483
msgid "Imitation: "
msgstr "Imitatie: "
-#: src/localplayer.cpp:3487 src/localplayer.cpp:3495
+#: src/localplayer.cpp:3485 src/localplayer.cpp:3493
msgid "Imitation canceled"
msgstr "Imitatie onderbroken"
-#: src/localplayer.cpp:3847
+#: src/localplayer.cpp:3845
msgid "You see "
msgstr ""
@@ -4336,28 +4401,28 @@ msgstr "Personage verwijderd."
msgid "Failed to delete character."
msgstr "Kon personage niet verwijderen."
-#: src/net/ea/chathandler.cpp:60 src/net/ea/chathandler.cpp:66
-#: src/net/ea/chathandler.cpp:71 src/net/ea/chathandler.cpp:77
-#: src/net/ea/chathandler.cpp:82 src/net/ea/chathandler.cpp:88
-#: src/net/ea/chathandler.cpp:95 src/net/ea/chathandler.cpp:101
+#: src/net/ea/chathandler.cpp:61 src/net/ea/chathandler.cpp:67
+#: src/net/ea/chathandler.cpp:72 src/net/ea/chathandler.cpp:78
+#: src/net/ea/chathandler.cpp:83 src/net/ea/chathandler.cpp:89
+#: src/net/ea/chathandler.cpp:96 src/net/ea/chathandler.cpp:102
msgid "Channels are not supported!"
msgstr "Kanalen worden niet ondersteund!"
-#: src/net/ea/chathandler.cpp:128
+#: src/net/ea/chathandler.cpp:129
#, c-format
msgid "Whisper could not be sent, %s is offline."
msgstr ""
-#: src/net/ea/chathandler.cpp:136
+#: src/net/ea/chathandler.cpp:137
#, c-format
msgid "Whisper could not be sent, ignored by %s."
msgstr ""
-#: src/net/ea/chathandler.cpp:348
+#: src/net/ea/chathandler.cpp:355
msgid "MVP player."
msgstr ""
-#: src/net/ea/chathandler.cpp:352
+#: src/net/ea/chathandler.cpp:359
msgid "MVP player: "
msgstr ""
@@ -4374,38 +4439,6 @@ msgstr "Spel"
msgid "Request to quit denied!"
msgstr "Aanvraag op de stoppen is geweigerd!"
-#: src/net/ea/gui/guildtab.cpp:67 src/net/ea/gui/partytab.cpp:83
-msgid "Command: /invite <nick>"
-msgstr "Commando: /invite <nick>"
-
-#: src/net/ea/gui/guildtab.cpp:68
-msgid "This command invites <nick> to the guild you're in."
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:74 src/net/ea/gui/partytab.cpp:90
-msgid "Command: /leave"
-msgstr "Commando: /leave"
-
-#: src/net/ea/gui/guildtab.cpp:75
-msgid "This command causes the player to leave the guild."
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:135 src/net/ea/gui/partytab.cpp:69
-msgid "/help > Display this help."
-msgstr "/help > Geeft deze help weer."
-
-#: src/net/ea/gui/guildtab.cpp:136
-msgid "/invite > Invite a player to your guild"
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:137
-msgid "/leave > Leave the guild you are in"
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:138
-msgid "/kick > Kick some one from the guild you are in"
-msgstr ""
-
#: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
msgid "Guild created."
msgstr "Guild aangemaakt."
@@ -4422,85 +4455,81 @@ msgstr ""
msgid "Unknown server response."
msgstr ""
-#: src/net/ea/guildhandler.cpp:180
+#: src/net/ea/guildhandler.cpp:181
#, c-format
msgid "Guild name: %s"
msgstr ""
-#: src/net/ea/guildhandler.cpp:182
+#: src/net/ea/guildhandler.cpp:183
#, c-format
msgid "Guild master: %s"
msgstr ""
-#: src/net/ea/guildhandler.cpp:184
+#: src/net/ea/guildhandler.cpp:185
#, c-format
msgid "Guild level: %d"
msgstr ""
-#: src/net/ea/guildhandler.cpp:186
+#: src/net/ea/guildhandler.cpp:187
#, c-format
msgid "Online members: %d"
msgstr ""
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:189
#, c-format
msgid "Max members: %d"
msgstr ""
-#: src/net/ea/guildhandler.cpp:190
+#: src/net/ea/guildhandler.cpp:191
#, c-format
msgid "Average level: %d"
msgstr ""
-#: src/net/ea/guildhandler.cpp:192
+#: src/net/ea/guildhandler.cpp:193
#, c-format
msgid "Guild exp: %d"
msgstr ""
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:195
#, c-format
msgid "Guild next exp: %d"
msgstr ""
-#: src/net/ea/guildhandler.cpp:196
+#: src/net/ea/guildhandler.cpp:197
#, c-format
msgid "Guild castle: %s"
msgstr ""
-#: src/net/ea/guildhandler.cpp:402
+#: src/net/ea/guildhandler.cpp:403
msgid "Could not inivte user to guild."
msgstr ""
-#: src/net/ea/guildhandler.cpp:406
+#: src/net/ea/guildhandler.cpp:407
msgid "User rejected guild invite."
msgstr ""
-#: src/net/ea/guildhandler.cpp:410
+#: src/net/ea/guildhandler.cpp:411
msgid "User is now part of your guild."
msgstr ""
-#: src/net/ea/guildhandler.cpp:414
+#: src/net/ea/guildhandler.cpp:415
msgid "Your guild is full."
msgstr ""
-#: src/net/ea/guildhandler.cpp:418
+#: src/net/ea/guildhandler.cpp:419
msgid "Unknown guild invite response."
msgstr ""
-#: src/net/ea/guildhandler.cpp:438
-msgid "You have left the guild."
-msgstr ""
-
-#: src/net/ea/guildhandler.cpp:452
+#: src/net/ea/guildhandler.cpp:453
#, c-format
msgid "%s has left your guild."
msgstr ""
-#: src/net/ea/guildhandler.cpp:483
+#: src/net/ea/guildhandler.cpp:484
msgid "You was kicked from guild."
msgstr ""
-#: src/net/ea/guildhandler.cpp:496
+#: src/net/ea/guildhandler.cpp:497
#, c-format
msgid "%s has kicked from your guild."
msgstr ""
@@ -4732,12 +4761,12 @@ msgstr ""
msgid "You have left the party."
msgstr "Je hebt de groep verlaten."
-#: src/net/ea/partyhandler.cpp:368
+#: src/net/ea/partyhandler.cpp:369
#, c-format
msgid "%s has left your party."
msgstr "%s heeft jouw groep verlaten."
-#: src/net/ea/partyhandler.cpp:444
+#: src/net/ea/partyhandler.cpp:448
#, c-format
msgid "An unknown member tried to say: %s"
msgstr "Een onbekend lid probeerde te zeggen: %s"
@@ -4865,7 +4894,7 @@ msgid "You're pining for the fjords."
msgstr ""
#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
-#: src/net/ea/playerhandler.cpp:425
+#: src/net/ea/playerhandler.cpp:428
msgid "Message"
msgstr "Bericht"
@@ -4880,21 +4909,21 @@ msgstr ""
msgid "You are carrying less than half your weight. You can regain health."
msgstr ""
-#: src/net/ea/playerhandler.cpp:451
+#: src/net/ea/playerhandler.cpp:454
#, c-format
msgid "You picked up %s."
msgstr ""
-#: src/net/ea/playerhandler.cpp:457
+#: src/net/ea/playerhandler.cpp:460
#, c-format
msgid "You spent %s."
msgstr ""
-#: src/net/ea/playerhandler.cpp:501
+#: src/net/ea/playerhandler.cpp:506
msgid "Cannot raise skill!"
msgstr ""
-#: src/net/ea/playerhandler.cpp:618
+#: src/net/ea/playerhandler.cpp:624
msgid "Equip arrows first."
msgstr ""
@@ -5034,7 +5063,7 @@ msgstr "Handel geannuleerd."
msgid "Trade completed."
msgstr "Handel voltooid."
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:258
msgid "Strength"
msgstr "Kracht"
@@ -5043,7 +5072,7 @@ msgstr "Kracht"
msgid "Strength %+.1f"
msgstr "Kracht %+.1f"
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:259
msgid "Agility"
msgstr "Behendigheid"
@@ -5052,7 +5081,7 @@ msgstr "Behendigheid"
msgid "Agility %+.1f"
msgstr "Behendigheid %+.1f"
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:262
msgid "Dexterity"
msgstr "Handigheid"
@@ -5061,7 +5090,7 @@ msgstr "Handigheid"
msgid "Dexterity %+.1f"
msgstr "Handigheid %+.1f"
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:260
msgid "Vitality"
msgstr "Vitaliteit"
@@ -5070,7 +5099,7 @@ msgstr "Vitaliteit"
msgid "Vitality %+.1f"
msgstr "Vitality %+.1f"
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:261
msgid "Intelligence"
msgstr "Intelligentie"
@@ -5341,111 +5370,115 @@ msgstr "Kan niets verkopen terwijl je aan het handelen bent."
msgid "Unable to sell unsellable item."
msgstr "Niet mogelijk om onverkoopbaar voorwerp te verkopen"
-#: src/net/tmwa/generalhandler.cpp:109
+#: src/net/tmwa/generalhandler.cpp:108
#, c-format
msgid "Strength %+d"
msgstr "Kracht %+d"
-#: src/net/tmwa/generalhandler.cpp:110
+#: src/net/tmwa/generalhandler.cpp:109
#, c-format
msgid "Agility %+d"
msgstr "Behandigheid %+d"
-#: src/net/tmwa/generalhandler.cpp:111
+#: src/net/tmwa/generalhandler.cpp:110
#, c-format
msgid "Vitality %+d"
msgstr "Vitaliteit %+d"
-#: src/net/tmwa/generalhandler.cpp:112
+#: src/net/tmwa/generalhandler.cpp:111
#, c-format
msgid "Intelligence %+d"
msgstr "Intelligentie %+d"
-#: src/net/tmwa/generalhandler.cpp:113
+#: src/net/tmwa/generalhandler.cpp:112
#, c-format
msgid "Dexterity %+d"
msgstr "Vaardigheid %+d"
-#: src/net/tmwa/generalhandler.cpp:114
+#: src/net/tmwa/generalhandler.cpp:113
#, c-format
msgid "Luck %+d"
msgstr "Geluk %+d"
-#: src/net/tmwa/generalhandler.cpp:140
+#: src/net/tmwa/generalhandler.cpp:139
msgid "Authentication failed."
msgstr "Authenticatie gefaald."
-#: src/net/tmwa/generalhandler.cpp:143
+#: src/net/tmwa/generalhandler.cpp:142
msgid "No servers available."
msgstr "Geen servers beschikbaar."
-#: src/net/tmwa/generalhandler.cpp:147
+#: src/net/tmwa/generalhandler.cpp:146
msgid "Someone else is trying to use this account."
msgstr "Iemand anders is aan het proberen deze account te gebruiken."
-#: src/net/tmwa/generalhandler.cpp:150
+#: src/net/tmwa/generalhandler.cpp:149
msgid "This account is already logged in."
msgstr "Deze account is al ingelogd."
-#: src/net/tmwa/generalhandler.cpp:153
+#: src/net/tmwa/generalhandler.cpp:152
msgid "Speed hack detected."
msgstr "Snelheidshack gedetecteerd."
-#: src/net/tmwa/generalhandler.cpp:156
+#: src/net/tmwa/generalhandler.cpp:155
msgid "Duplicated login."
msgstr "Verdubbelde login."
-#: src/net/tmwa/generalhandler.cpp:159
+#: src/net/tmwa/generalhandler.cpp:158
msgid "Unknown connection error."
msgstr "Onbekende connectiefout."
-#: src/net/tmwa/generalhandler.cpp:232
+#: src/net/tmwa/generalhandler.cpp:231
msgid "Got disconnected from server!"
msgstr "De verbinding met de server werd verbroken!"
-#: src/net/tmwa/generalhandler.cpp:264
+#: src/net/tmwa/generalhandler.cpp:263
msgid "Luck"
msgstr "Geluk"
-#: src/net/tmwa/generalhandler.cpp:267
+#: src/net/tmwa/generalhandler.cpp:266
msgid "Defense"
msgstr "Verdediging"
-#: src/net/tmwa/generalhandler.cpp:268
+#: src/net/tmwa/generalhandler.cpp:267
msgid "M.Attack"
msgstr "M.Aanval"
-#: src/net/tmwa/generalhandler.cpp:269
+#: src/net/tmwa/generalhandler.cpp:268
msgid "M.Defense"
msgstr "M.Verdediging"
-#: src/net/tmwa/generalhandler.cpp:271
+#: src/net/tmwa/generalhandler.cpp:270
#, no-c-format
msgid "% Accuracy"
msgstr "% Nauwkeurigheid"
-#: src/net/tmwa/generalhandler.cpp:273
+#: src/net/tmwa/generalhandler.cpp:272
#, no-c-format
msgid "% Evade"
msgstr "% Ontwijking"
-#: src/net/tmwa/generalhandler.cpp:275
+#: src/net/tmwa/generalhandler.cpp:274
#, no-c-format
msgid "% Critical"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:276
+#: src/net/tmwa/generalhandler.cpp:275
msgid "Attack Delay"
msgstr "Aanvalsvertraging"
-#: src/net/tmwa/generalhandler.cpp:278
+#: src/net/tmwa/generalhandler.cpp:277
msgid "Walk Delay"
msgstr "Wandelvertraging"
-#: src/net/tmwa/generalhandler.cpp:280
+#: src/net/tmwa/generalhandler.cpp:279
msgid "Attack Range"
msgstr "Aanvalsbereik"
+#: src/net/tmwa/generalhandler.cpp:281
+msgid "Damage per sec."
+msgstr ""
+
#: src/net/tmwa/network.cpp:152
msgid "Empty address given to Network::connect()!"
msgstr "Leeg adres gegeven aan Network::connect()!"
@@ -5479,31 +5512,31 @@ msgstr "Zwevende '...' bel"
msgid "Floating bubble"
msgstr "Zwevende bel"
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:248
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:246
#: src/resources/monsterdb.cpp:84
msgid "unnamed"
msgstr "naamloos"
-#: src/resources/itemdb.cpp:65
+#: src/resources/itemdb.cpp:63
#, c-format
msgid "Attack %+d"
msgstr "Aanval %+d"
-#: src/resources/itemdb.cpp:66
+#: src/resources/itemdb.cpp:64
#, c-format
msgid "Defense %+d"
msgstr "Verdediging %+d"
-#: src/resources/itemdb.cpp:67
+#: src/resources/itemdb.cpp:65
#, c-format
msgid "HP %+d"
msgstr "Leven %+d"
-#: src/resources/itemdb.cpp:68
+#: src/resources/itemdb.cpp:66
#, c-format
msgid "MP %+d"
msgstr "Magie %+d"
-#: src/resources/itemdb.cpp:171
+#: src/resources/itemdb.cpp:169
msgid "Unknown item"
msgstr "Onbekend voorwerp"
diff --git a/po/pt.po b/po/pt.po
index 513dc8b00..57b505c92 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-20 17:42+0300\n"
-"PO-Revision-Date: 2011-08-18 15:20+0000\n"
+"POT-Creation-Date: 2011-09-02 18:27+0300\n"
+"PO-Revision-Date: 2011-09-02 18:59+0000\n"
"Last-Translator: freya <freya.df@gmail.com>\n"
"Language-Team: Portuguese (http://www.transifex.net/projects/p/manaplus/team/"
"pt/)\n"
@@ -24,119 +24,119 @@ msgstr ""
msgid "Visible on map"
msgstr "Visivel no mapa"
-#: src/being.cpp:542
+#: src/being.cpp:549
msgid "dodge"
msgstr "desviou"
-#: src/being.cpp:542
+#: src/being.cpp:549
msgid "miss"
msgstr "errou"
#. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1514
+#: src/being.cpp:1529
msgid "A"
msgstr "A"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1519
+#: src/being.cpp:1534
msgid "I"
msgstr "l"
-#: src/client.cpp:826 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:831 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
msgid "Setup"
msgstr "Configurar"
-#: src/client.cpp:909
+#: src/client.cpp:914
msgid "Connecting to server"
msgstr "Conectando ao servidor"
-#: src/client.cpp:940
+#: src/client.cpp:945
msgid "Logging in"
msgstr "Efetuando login"
-#: src/client.cpp:973
+#: src/client.cpp:978
msgid "Entering game world"
msgstr "Entrando no domínio do jogo"
-#: src/client.cpp:1073
+#: src/client.cpp:1078
msgid "Requesting characters"
msgstr "Requisitando personagens"
-#: src/client.cpp:1104
+#: src/client.cpp:1109
msgid "Connecting to the game server"
msgstr "Conectando ao servidor do jogo"
-#: src/client.cpp:1114
+#: src/client.cpp:1119
msgid "Changing game servers"
msgstr "Mudando servidores do jogo"
-#: src/client.cpp:1151 src/client.cpp:1158 src/client.cpp:1293
+#: src/client.cpp:1156 src/client.cpp:1163 src/client.cpp:1298
#: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
-#: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:395
+#: src/gui/charcreatedialog.cpp:221 src/gui/charselectdialog.cpp:253
+#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
#: src/net/manaserv/charhandler.cpp:227
msgid "Error"
msgstr "Erro"
-#: src/client.cpp:1167
+#: src/client.cpp:1172
msgid "Requesting registration details"
msgstr "Requisitando detalhes do registro"
-#: src/client.cpp:1194
+#: src/client.cpp:1199
msgid "Password Change"
msgstr "Mudar senha"
-#: src/client.cpp:1195
+#: src/client.cpp:1200
msgid "Password changed successfully!"
msgstr "Senha modificada com sucesso!"
-#: src/client.cpp:1214
+#: src/client.cpp:1219
msgid "Email Change"
msgstr "Mudar email"
-#: src/client.cpp:1215
+#: src/client.cpp:1220
msgid "Email changed successfully!"
msgstr "Email modificado com sucesso!"
-#: src/client.cpp:1235
+#: src/client.cpp:1240
msgid "Unregister Successful"
msgstr "Registro cancelado com sucesso"
-#: src/client.cpp:1236
+#: src/client.cpp:1241
msgid "Farewell, come back any time..."
msgstr "Tchau, volte sempre..."
-#: src/client.cpp:1423 src/client.cpp:1453 src/client.cpp:1497
-#: src/client.cpp:1922 src/client.cpp:1929
+#: src/client.cpp:1428 src/client.cpp:1458 src/client.cpp:1502
+#: src/client.cpp:1927 src/client.cpp:1934
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%s não existe e não pode ser criado! Saindo."
-#: src/client.cpp:1628
+#: src/client.cpp:1633
#, c-format
msgid "Invalid update host: %s"
msgstr "Host de atualização inválido: %s"
-#: src/client.cpp:1662 src/client.cpp:1668
+#: src/client.cpp:1667 src/client.cpp:1673
msgid "Error creating updates directory!"
msgstr "Erro ao criar pasta de atualizações!"
-#: src/client.cpp:1689
+#: src/client.cpp:1694
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "Erro: %s não existe e não pode se criado! Saindo."
-#: src/commandhandler.cpp:301
+#: src/commandhandler.cpp:303
msgid "Unknown command."
msgstr "Comando desconhecido."
-#: src/commandhandler.cpp:401
+#: src/commandhandler.cpp:403
msgid "Cannot send empty whispers!"
msgstr "Não é possível enviar mensagens privadas vazias!"
-#: src/commandhandler.cpp:415
+#: src/commandhandler.cpp:417
#, c-format
msgid ""
"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -145,152 +145,152 @@ msgstr ""
"Não é possível criar uma aba de mensagem privada para o nick \"%s\"! Ou ela "
"já existe ou é você mesmo."
-#: src/commandhandler.cpp:435
+#: src/commandhandler.cpp:437
#, c-format
msgid "Requesting to join channel %s."
msgstr "Solicitando entrada no canal %s."
-#: src/commandhandler.cpp:451 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:453 src/net/ea/gui/partytab.cpp:125
msgid "Party name is missing."
msgstr "Falta o nome do grupo."
-#: src/commandhandler.cpp:462
+#: src/commandhandler.cpp:464
msgid "Guild name is missing."
msgstr "Falta o nome da guilda."
-#: src/commandhandler.cpp:475 src/commandhandler.cpp:582
-#: src/commandhandler.cpp:623 src/commandhandler.cpp:653
+#: src/commandhandler.cpp:477 src/commandhandler.cpp:589
+#: src/commandhandler.cpp:630 src/commandhandler.cpp:660
msgid "Please specify a name."
msgstr "Por favor, especifique um nome."
-#: src/commandhandler.cpp:516
+#: src/commandhandler.cpp:523
msgid "Return toggles chat."
msgstr "Enter alterna para o chat."
-#: src/commandhandler.cpp:516
+#: src/commandhandler.cpp:523
msgid "Message closes chat."
msgstr "A mensagem fecha o chat."
-#: src/commandhandler.cpp:527
+#: src/commandhandler.cpp:534
msgid "Return now toggles chat."
msgstr "Agora Enter alterna para o chat."
-#: src/commandhandler.cpp:533
+#: src/commandhandler.cpp:540
msgid "Message now closes chat."
msgstr "Agora a mensagem fecha o chat."
-#: src/commandhandler.cpp:561
+#: src/commandhandler.cpp:568
msgid "friend"
msgstr "amigo"
-#: src/commandhandler.cpp:566
+#: src/commandhandler.cpp:573
msgid "disregarded"
msgstr "ignorado"
-#: src/commandhandler.cpp:571
+#: src/commandhandler.cpp:578
msgid "neutral"
msgstr "neutro"
-#: src/commandhandler.cpp:590
+#: src/commandhandler.cpp:597
#, c-format
msgid "Player already %s!"
msgstr "Jogador já %s!"
-#: src/commandhandler.cpp:604
+#: src/commandhandler.cpp:611
#, c-format
msgid "Player successfully %s!"
msgstr "Jogador %s com sucesso!"
-#: src/commandhandler.cpp:612
+#: src/commandhandler.cpp:619
#, c-format
msgid "Player could not be %s!"
msgstr "Jogador não pode ser %s!"
-#: src/commandhandler.cpp:634
+#: src/commandhandler.cpp:641
msgid "Player wasn't ignored!"
msgstr "O jogador não estava ignorado!"
-#: src/commandhandler.cpp:641
+#: src/commandhandler.cpp:648
msgid "Player no longer ignored!"
msgstr "O jogador não está mais ignorado!"
-#: src/commandhandler.cpp:643
+#: src/commandhandler.cpp:650
msgid "Player could not be unignored!"
msgstr "Não foi possível deixar de ignorar o jogador!"
-#: src/commandhandler.cpp:660
+#: src/commandhandler.cpp:667
msgid "Player already erased!"
msgstr "Jogador já apagado!"
-#: src/commandhandler.cpp:671
+#: src/commandhandler.cpp:678
msgid "Player successfully erased!"
msgstr "Jogador apagado com sucesso!"
-#: src/commandhandler.cpp:673
+#: src/commandhandler.cpp:680
msgid "Player could not be erased!"
msgstr "Jogador não pode ser apagado!"
-#: src/commandhandler.cpp:972 src/commandhandler.cpp:1018
+#: src/commandhandler.cpp:980 src/commandhandler.cpp:1026
#, c-format
msgid "Client uptime: %s"
msgstr "Uptime do cliente: %s"
-#: src/commandhandler.cpp:982
+#: src/commandhandler.cpp:990
#, c-format
msgid "%d week"
msgid_plural "%d weeks"
msgstr[0] "%d semana"
msgstr[1] "%d semanas"
-#: src/commandhandler.cpp:991
+#: src/commandhandler.cpp:999
#, c-format
msgid "%d day"
msgid_plural "%d days"
msgstr[0] "%d dia"
msgstr[1] "%d dias"
-#: src/commandhandler.cpp:999
+#: src/commandhandler.cpp:1007
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] "%d hora"
msgstr[1] "%d horas"
-#: src/commandhandler.cpp:1007
+#: src/commandhandler.cpp:1015
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] "%d minuto"
msgstr[1] "%d minutos"
-#: src/commandhandler.cpp:1015
+#: src/commandhandler.cpp:1023
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
msgstr[0] "%d segundo"
msgstr[1] "%d segundos"
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1102
msgid "font cache size"
msgstr "Tamanho do cache de fonte"
-#: src/commandhandler.cpp:1106
+#: src/commandhandler.cpp:1114
msgid "Cache size:"
msgstr "Tamanho de Cache:"
-#: src/commandhandler.cpp:1110
+#: src/commandhandler.cpp:1118
msgid "Created:"
msgstr "Criado:"
-#: src/commandhandler.cpp:1112
+#: src/commandhandler.cpp:1120
msgid "Deleted:"
msgstr "Deletado:"
-#: src/commandhandler.cpp:1159 src/commandhandler.cpp:1166
+#: src/commandhandler.cpp:1167 src/commandhandler.cpp:1174
msgid "Resource images:"
msgstr "Recursos de imagens:"
-#: src/commandhandler.cpp:1161 src/commandhandler.cpp:1168
+#: src/commandhandler.cpp:1169 src/commandhandler.cpp:1176
msgid "Resource orphaned images:"
msgstr "Recursos de imagens orfãos:"
@@ -300,43 +300,43 @@ 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\"."
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:411
+#: src/game.cpp:252 src/gui/widgets/chattab.cpp:409
msgid "General"
msgstr "Geral"
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:413
+#: src/game.cpp:256 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:411
msgid "Debug"
msgstr "Depurador"
-#: src/game.cpp:488
+#: src/game.cpp:511
msgid "Screenshot saved as "
msgstr "Screenshot salva como "
-#: src/game.cpp:496
+#: src/game.cpp:519
msgid "Saving screenshot failed!"
msgstr "Falha ao salvar screenshot!"
-#: src/game.cpp:536
+#: src/game.cpp:559
msgid "The connection to the server was lost."
msgstr "A conexão com o servidor caiu."
-#: src/game.cpp:548
+#: src/game.cpp:571
msgid "Network Error"
msgstr "Erro de conexão"
-#: src/game.cpp:1213
+#: src/game.cpp:1236
msgid "Ignoring incoming trade requests"
msgstr "Ignorando propostas de negócios"
-#: src/game.cpp:1220
+#: src/game.cpp:1243
msgid "Accepting incoming trade requests"
msgstr "Aceitando propostas de negócios"
-#: src/game.cpp:1606
+#: src/game.cpp:1629
msgid "Could Not Load Map"
msgstr "Não foi possível carregar o mapa"
-#: src/game.cpp:1607
+#: src/game.cpp:1630
#, c-format
msgid "Error while loading %s"
msgstr "Erro ao carregar %s"
@@ -365,103 +365,103 @@ msgstr "Comentário: %s"
msgid "Bot Checker"
msgstr "Analizador de bot"
-#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
+#: src/gui/botcheckerwindow.cpp:295 src/gui/setup_relations.cpp:64
msgid "Name"
msgstr "Nome"
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:134
-#: src/gui/popupmenu.cpp:292 src/gui/popupmenu.cpp:617
-#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
+#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:133
+#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:646
+#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:265
msgid "Attack"
msgstr "Atacar"
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:279
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:297
#: src/keyboardconfig.cpp:62
msgid "Talk"
msgstr "Falar"
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:245
-#: src/gui/popupmenu.cpp:284 src/gui/popupmenu.cpp:674
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:263
+#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:703
msgid "Move"
msgstr "Mover"
-#: src/gui/botcheckerwindow.cpp:300
+#: src/gui/botcheckerwindow.cpp:299
msgid "Result"
msgstr "Resultado"
-#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123
+#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:124
msgid "Reset"
msgstr "Resetar"
-#: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:260
-#: src/gui/popupmenu.cpp:281 src/gui/popupmenu.cpp:688
+#: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:98
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:278
+#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:717
msgid "Buy"
msgstr "Comprar"
-#: src/gui/buydialog.cpp:88 src/gui/buydialog.cpp:302
-#: src/gui/selldialog.cpp:87 src/gui/selldialog.cpp:324
+#: src/gui/buydialog.cpp:89 src/gui/buydialog.cpp:303
+#: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
#, c-format
msgid "Price: %s / Total: %s"
msgstr "Preço: %s / Total: %s"
#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
#. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:93 src/gui/itemamountwindow.cpp:207
-#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:113
-#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:974
+#: src/gui/buydialog.cpp:94 src/gui/itemamountwindow.cpp:207
+#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:973
msgid "+"
msgstr "+"
#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
#. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:96 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:986
+#: src/gui/buydialog.cpp:97 src/gui/itemamountwindow.cpp:206
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:985
msgid "-"
msgstr "-"
-#: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
-#: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
-#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:288
+#: src/gui/buydialog.cpp:99 src/gui/quitdialog.cpp:47
+#: src/gui/quitdialog.cpp:49 src/gui/quitdialog.cpp:50
+#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:294
#: src/keyboardconfig.cpp:290
msgid "Quit"
msgstr "Sair"
-#: src/gui/buydialog.cpp:99 src/gui/selldialog.cpp:94
-#: src/gui/statuswindow.cpp:503 src/gui/statuswindow.cpp:552
-#: src/gui/statuswindow.cpp:973 src/gui/statuswindow.cpp:1004
+#: src/gui/buydialog.cpp:100 src/gui/selldialog.cpp:95
+#: src/gui/statuswindow.cpp:504 src/gui/statuswindow.cpp:553
+#: src/gui/statuswindow.cpp:972 src/gui/statuswindow.cpp:1003
msgid "Max"
msgstr "Máximo"
#: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:133
+#: src/gui/inventorywindow.cpp:147 src/gui/setup_other.cpp:133
msgid "Shop"
msgstr "Loja"
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:262
-#: src/gui/popupmenu.cpp:282 src/gui/popupmenu.cpp:690
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:280
+#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:719
#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
-#: src/gui/selldialog.cpp:92
+#: src/gui/selldialog.cpp:93
msgid "Sell"
msgstr "Vender"
#: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
-#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
+#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:96
#: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:336
-#: src/gui/popupmenu.cpp:357 src/gui/popupmenu.cpp:460
-#: src/gui/popupmenu.cpp:487 src/gui/popupmenu.cpp:511
-#: src/gui/popupmenu.cpp:525 src/gui/popupmenu.cpp:544
-#: src/gui/popupmenu.cpp:750 src/gui/popupmenu.cpp:774
-#: src/gui/popupmenu.cpp:1684 src/gui/popupmenu.cpp:1712
-#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1811
-#: src/gui/popupmenu.cpp:1846 src/gui/popupmenu.cpp:1886
-#: src/gui/popupmenu.cpp:1953 src/gui/popupmenu.cpp:1973
-#: src/gui/quitdialog.cpp:59 src/gui/register.cpp:82 src/gui/setup.cpp:71
-#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:354
+#: src/gui/popupmenu.cpp:375 src/gui/popupmenu.cpp:489
+#: src/gui/popupmenu.cpp:516 src/gui/popupmenu.cpp:540
+#: src/gui/popupmenu.cpp:554 src/gui/popupmenu.cpp:573
+#: src/gui/popupmenu.cpp:790 src/gui/popupmenu.cpp:814
+#: src/gui/popupmenu.cpp:1734 src/gui/popupmenu.cpp:1762
+#: src/gui/popupmenu.cpp:1818 src/gui/popupmenu.cpp:1861
+#: src/gui/popupmenu.cpp:1896 src/gui/popupmenu.cpp:1936
+#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2023
+#: src/gui/quitdialog.cpp:54 src/gui/register.cpp:82 src/gui/setup.cpp:72
+#: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:238
#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updaterwindow.cpp:157
+#: src/gui/updaterwindow.cpp:161
msgid "Cancel"
msgstr "Cancelar"
@@ -493,7 +493,7 @@ msgid "The email address entries mismatch."
msgstr "Os emails informados não são iguais."
#: src/gui/changepassworddialog.cpp:50 src/gui/changepassworddialog.cpp:59
-#: src/gui/charselectdialog.cpp:140
+#: src/gui/charselectdialog.cpp:139
msgid "Change Password"
msgstr "Alterar senha"
@@ -528,121 +528,121 @@ msgstr "As novas senhas não são iguais."
msgid "Create Character"
msgstr "Criar Personagem"
-#: src/gui/charcreatedialog.cpp:73 src/gui/logindialog.cpp:94
+#: src/gui/charcreatedialog.cpp:76 src/gui/logindialog.cpp:94
#: src/gui/register.cpp:75
msgid "Name:"
msgstr "Nome:"
#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
#. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:76 src/gui/charcreatedialog.cpp:81
-#: src/gui/charcreatedialog.cpp:87 src/gui/outfitwindow.cpp:81
+#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:84
+#: src/gui/charcreatedialog.cpp:90 src/gui/outfitwindow.cpp:85
msgid ">"
msgstr ">"
#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
#. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:82
-#: src/gui/charcreatedialog.cpp:88 src/gui/outfitwindow.cpp:80
+#: src/gui/charcreatedialog.cpp:82 src/gui/charcreatedialog.cpp:85
+#: src/gui/charcreatedialog.cpp:91 src/gui/outfitwindow.cpp:84
msgid "<"
msgstr "<"
-#: src/gui/charcreatedialog.cpp:80
+#: src/gui/charcreatedialog.cpp:83
msgid "Hair color:"
msgstr "Cor do Cabelo:"
-#: src/gui/charcreatedialog.cpp:83
+#: src/gui/charcreatedialog.cpp:86
msgid "Hair style:"
msgstr "Estilo do Cabelo:"
-#: src/gui/charcreatedialog.cpp:89
+#: src/gui/charcreatedialog.cpp:92
msgid "Race:"
msgstr "Corrida:"
-#: src/gui/charcreatedialog.cpp:92 src/gui/charselectdialog.cpp:479
-#: src/gui/socialwindow.cpp:1033
+#: src/gui/charcreatedialog.cpp:95 src/gui/charselectdialog.cpp:478
+#: src/gui/socialwindow.cpp:1139
msgid "Create"
msgstr "Criar"
-#: src/gui/charcreatedialog.cpp:94 src/gui/register.cpp:98
+#: src/gui/charcreatedialog.cpp:97 src/gui/register.cpp:98
msgid "Male"
msgstr "Homem"
-#: src/gui/charcreatedialog.cpp:95 src/gui/register.cpp:99
+#: src/gui/charcreatedialog.cpp:98 src/gui/register.cpp:99
msgid "Female"
msgstr "Mulher"
-#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:300
+#: src/gui/charcreatedialog.cpp:116 src/gui/charcreatedialog.cpp:303
#, c-format
msgid "Please distribute %d points"
msgstr "Por favor distribua %d pontos"
-#: src/gui/charcreatedialog.cpp:219
+#: src/gui/charcreatedialog.cpp:222
msgid "Your name needs to be at least 4 characters."
msgstr "Seu nome deve ter pelo menos 4 caracteres."
-#: src/gui/charcreatedialog.cpp:291
+#: src/gui/charcreatedialog.cpp:294
msgid "Character stats OK"
msgstr "Atributos do personagem OK"
-#: src/gui/charcreatedialog.cpp:305
+#: src/gui/charcreatedialog.cpp:308
#, c-format
msgid "Please remove %d points"
msgstr "Por favor remova %d pontos"
-#: src/gui/charselectdialog.cpp:77
+#: src/gui/charselectdialog.cpp:76
msgid "Confirm Character Delete"
msgstr "Confimar exclusão do personagem"
-#: src/gui/charselectdialog.cpp:78
+#: src/gui/charselectdialog.cpp:77
msgid "Are you sure you want to delete this character?"
msgstr "Tem certeza que deseja excluir este personagem?"
-#: src/gui/charselectdialog.cpp:126
+#: src/gui/charselectdialog.cpp:125
msgid "Account and Character Management"
msgstr "Gerenciamento de Conta e Personagem"
-#: src/gui/charselectdialog.cpp:139
+#: src/gui/charselectdialog.cpp:138
msgid "Switch Login"
msgstr "Trocar Login"
-#: src/gui/charselectdialog.cpp:153 src/gui/unregisterdialog.cpp:50
+#: src/gui/charselectdialog.cpp:152 src/gui/unregisterdialog.cpp:50
#: src/gui/unregisterdialog.cpp:58
msgid "Unregister"
msgstr "Cancelar Registro"
-#: src/gui/charselectdialog.cpp:162
+#: src/gui/charselectdialog.cpp:161
msgid "Change Email"
msgstr "Alterar email"
-#: src/gui/charselectdialog.cpp:254
+#: src/gui/charselectdialog.cpp:253
msgid "Incorrect password"
msgstr "Senha Incorreta"
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:286
msgid "Enter password for deleting character"
msgstr "Entre com a Senha para Deletar o usuario"
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:286
msgid "Enter password:"
msgstr "Entre com a senha"
-#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:292
-#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
-#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
+#: src/gui/charselectdialog.cpp:408 src/gui/serverdialog.cpp:298
+#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:122
+#: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:241
msgid "Delete"
msgstr "Excluir"
-#: src/gui/charselectdialog.cpp:467
+#: src/gui/charselectdialog.cpp:466
msgid "Choose"
msgstr "Escolher"
-#: src/gui/charselectdialog.cpp:470
+#: src/gui/charselectdialog.cpp:469
#, c-format
msgid "Level %d"
msgstr "Nível %d"
-#: src/gui/charselectdialog.cpp:481 src/gui/charselectdialog.cpp:482
+#: src/gui/charselectdialog.cpp:480 src/gui/charselectdialog.cpp:481
msgid "(empty)"
msgstr "(vazio)"
@@ -714,12 +714,12 @@ msgstr "???"
msgid "Chat"
msgstr "Chat"
-#: src/gui/chatwindow.cpp:606
+#: src/gui/chatwindow.cpp:609
#, c-format
msgid "Present: %s; %d players are present."
msgstr "Presentes: %s; %d jogadores estão presentes."
-#: src/gui/chatwindow.cpp:993
+#: src/gui/chatwindow.cpp:996
#, c-format
msgid "Whispering to %s: %s"
msgstr "Enviando MP para %s: %s"
@@ -732,145 +732,145 @@ msgstr "Sim"
msgid "No"
msgstr "Não"
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:150
-#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:384
-#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:632
-#: src/gui/popupmenu.cpp:640
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:149
+#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:402
+#: src/gui/popupmenu.cpp:408 src/gui/popupmenu.cpp:661
+#: src/gui/popupmenu.cpp:669
msgid "Ignore"
msgstr "Ignora"
-#: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
+#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:97
#: src/gui/setup_other.cpp:64
msgid "Map"
msgstr "Mapa"
-#: src/gui/debugwindow.cpp:71
+#: src/gui/debugwindow.cpp:73
msgid "Target"
msgstr "Alvo"
-#: src/gui/debugwindow.cpp:72
+#: src/gui/debugwindow.cpp:74
msgid "Net"
msgstr "Teia"
-#: src/gui/debugwindow.cpp:145 src/gui/debugwindow.cpp:220
-#: src/gui/debugwindow.cpp:249
+#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
+#: src/gui/debugwindow.cpp:251
msgid "Music:"
msgstr "Música:"
-#: src/gui/debugwindow.cpp:146 src/gui/debugwindow.cpp:224
-#: src/gui/debugwindow.cpp:251
+#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:226
+#: src/gui/debugwindow.cpp:253
msgid "Map:"
msgstr "Mapa:"
-#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
-#: src/gui/debugwindow.cpp:250
+#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:224
+#: src/gui/debugwindow.cpp:252
msgid "Minimap:"
msgstr "Minimapa:"
-#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:218
-#: src/gui/debugwindow.cpp:247
+#: src/gui/debugwindow.cpp:150 src/gui/debugwindow.cpp:220
+#: src/gui/debugwindow.cpp:249
msgid "Cursor:"
msgstr "Cursor:"
-#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:201
-#: src/gui/debugwindow.cpp:206
+#: src/gui/debugwindow.cpp:151 src/gui/debugwindow.cpp:203
+#: src/gui/debugwindow.cpp:208
msgid "Player Position:"
msgstr "Sua posição:"
-#: src/gui/debugwindow.cpp:152
+#: src/gui/debugwindow.cpp:154
msgid "Particle count:"
msgstr "Contador de Particulas:"
-#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:235
-#: src/gui/debugwindow.cpp:254
+#: src/gui/debugwindow.cpp:156 src/gui/debugwindow.cpp:237
+#: src/gui/debugwindow.cpp:256
msgid "Map actors count:"
msgstr "Jogadores no mapa:"
-#: src/gui/debugwindow.cpp:162 src/gui/debugwindow.cpp:173
+#: src/gui/debugwindow.cpp:164 src/gui/debugwindow.cpp:175
#, c-format
msgid "%d FPS (Software)"
msgstr "%d FPS (software)"
-#: src/gui/debugwindow.cpp:166
+#: src/gui/debugwindow.cpp:168
#, c-format
msgid "%d FPS (fast OpenGL)"
msgstr "%d FPS (rápido OpenGL)"
-#: src/gui/debugwindow.cpp:169
+#: src/gui/debugwindow.cpp:171
#, c-format
msgid "%d FPS (old OpenGL)"
msgstr "%d FPS (velho OpenGL)"
-#: src/gui/debugwindow.cpp:176
+#: src/gui/debugwindow.cpp:178
#, c-format
msgid "%d FPS"
msgstr "%d FPS"
-#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:240
+#: src/gui/debugwindow.cpp:190 src/gui/debugwindow.cpp:242
msgid "Textures count:"
msgstr "Contador de Texturas:"
-#: src/gui/debugwindow.cpp:231
+#: src/gui/debugwindow.cpp:233
#, c-format
msgid "Particle count: %d"
msgstr "Contagem de partículas: %d"
-#: src/gui/debugwindow.cpp:268 src/gui/debugwindow.cpp:299
-#: src/gui/debugwindow.cpp:343
+#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:301
+#: src/gui/debugwindow.cpp:345
msgid "Target:"
msgstr "Alvo:"
-#: src/gui/debugwindow.cpp:269 src/gui/debugwindow.cpp:304
-#: src/gui/debugwindow.cpp:344
+#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:306
+#: src/gui/debugwindow.cpp:346
msgid "Target Id:"
msgstr "ID do alvo:"
-#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:308
-#: src/gui/debugwindow.cpp:313 src/gui/debugwindow.cpp:345
+#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:310
+#: src/gui/debugwindow.cpp:315 src/gui/debugwindow.cpp:347
msgid "Target Level:"
msgstr "Nível do alvo:"
-#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:316
-#: src/gui/debugwindow.cpp:346
+#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:318
+#: src/gui/debugwindow.cpp:348
msgid "Target Party:"
msgstr "Grupo do alvo:"
-#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:319
-#: src/gui/debugwindow.cpp:347
+#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:321
+#: src/gui/debugwindow.cpp:349
msgid "Target Guild:"
msgstr "Guilda do alvo:"
-#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:333
-#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:348
+#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:335
+#: src/gui/debugwindow.cpp:340 src/gui/debugwindow.cpp:350
msgid "Attack delay:"
msgstr "Atraso de Ataque:"
-#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:323
-#: src/gui/debugwindow.cpp:349
+#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:325
+#: src/gui/debugwindow.cpp:351
msgid "Minimal hit:"
msgstr "Dano Minimo:"
-#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:325
-#: src/gui/debugwindow.cpp:350
+#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:327
+#: src/gui/debugwindow.cpp:352
msgid "Maximum hit:"
msgstr "Dano Máximo:"
-#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:327
-#: src/gui/debugwindow.cpp:351
+#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:329
+#: src/gui/debugwindow.cpp:353
msgid "Critical hit:"
msgstr "Dano Crítico:"
-#: src/gui/debugwindow.cpp:385 src/gui/debugwindow.cpp:390
+#: src/gui/debugwindow.cpp:387 src/gui/debugwindow.cpp:392
#, c-format
msgid "Ping: %s ms"
msgstr "Ping: %s ms"
-#: src/gui/debugwindow.cpp:393
+#: src/gui/debugwindow.cpp:395
#, c-format
msgid "In: %d bytes/s"
msgstr "Entrada: %d bytes/s"
-#: src/gui/debugwindow.cpp:395
+#: src/gui/debugwindow.cpp:397
#, c-format
msgid "Out: %d bytes/s"
msgstr "Saída: %d bytes/s"
@@ -879,26 +879,26 @@ msgstr "Saída: %d bytes/s"
msgid "Did You Know?"
msgstr "Você sabia?"
-#: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
-#: src/gui/inventorywindow.cpp:175 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:559 src/gui/shopwindow.cpp:111
+#: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
+#: src/gui/inventorywindow.cpp:176 src/gui/npcdialog.cpp:53
+#: src/gui/popupmenu.cpp:588 src/gui/shopwindow.cpp:113
msgid "Close"
msgstr "Fechar"
-#: src/gui/didyouknowwindow.cpp:62
+#: src/gui/didyouknowwindow.cpp:64
msgid "< Previous"
msgstr "< Anterior"
-#: src/gui/didyouknowwindow.cpp:63
+#: src/gui/didyouknowwindow.cpp:65
msgid "Next >"
msgstr "Próximo >"
-#: src/gui/didyouknowwindow.cpp:64
+#: src/gui/didyouknowwindow.cpp:66
msgid "Auto open this window"
msgstr "Abrir automaticamente esta janela"
#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:58 src/gui/textdialog.cpp:50
+#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:53 src/gui/textdialog.cpp:50
msgid "OK"
msgstr "OK"
@@ -906,10 +906,10 @@ msgstr "OK"
msgid "Equipment"
msgstr "Equipamento"
-#: src/gui/equipmentwindow.cpp:93 src/gui/inventorywindow.cpp:130
-#: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
-#: src/gui/popupmenu.cpp:1643 src/gui/popupmenu.cpp:1738
-#: src/gui/popupmenu.cpp:1783
+#: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:131
+#: src/gui/inventorywindow.cpp:512 src/gui/inventorywindow.cpp:521
+#: src/gui/popupmenu.cpp:1693 src/gui/popupmenu.cpp:1788
+#: src/gui/popupmenu.cpp:1833
msgid "Unequip"
msgstr "Desequipar"
@@ -922,75 +922,75 @@ msgstr "Ajuda"
msgid "Inventory"
msgstr "Inventário"
-#: src/gui/inventorywindow.cpp:104
+#: src/gui/inventorywindow.cpp:105
msgid "Slots:"
msgstr "Slots:"
-#: src/gui/inventorywindow.cpp:115
+#: src/gui/inventorywindow.cpp:116
msgid "Filter:"
msgstr "Filtro:"
-#: src/gui/inventorywindow.cpp:116
+#: src/gui/inventorywindow.cpp:117
msgid "Sort:"
msgstr "Classificar"
-#: src/gui/inventorywindow.cpp:122
+#: src/gui/inventorywindow.cpp:123
msgid "na"
msgstr "na"
-#: src/gui/inventorywindow.cpp:123
+#: src/gui/inventorywindow.cpp:124
msgid "az"
msgstr "az"
-#: src/gui/inventorywindow.cpp:124
+#: src/gui/inventorywindow.cpp:125
msgid "id"
msgstr "id"
-#: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:513
-#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1645
-#: src/gui/popupmenu.cpp:1740 src/gui/popupmenu.cpp:1785
+#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
+#: src/gui/inventorywindow.cpp:523 src/gui/popupmenu.cpp:1695
+#: src/gui/popupmenu.cpp:1790 src/gui/popupmenu.cpp:1835
msgid "Equip"
msgstr "Equipar"
-#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
-#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1648
-#: src/gui/popupmenu.cpp:1707 src/gui/popupmenu.cpp:1744
-#: src/gui/popupmenu.cpp:1788
+#: src/gui/inventorywindow.cpp:130 src/gui/inventorywindow.cpp:515
+#: src/gui/inventorywindow.cpp:519 src/gui/popupmenu.cpp:1698
+#: src/gui/popupmenu.cpp:1757 src/gui/popupmenu.cpp:1794
+#: src/gui/popupmenu.cpp:1838
msgid "Use"
msgstr "Usar"
-#: src/gui/inventorywindow.cpp:143 src/gui/inventorywindow.cpp:619
-#: src/gui/popupmenu.cpp:1652 src/gui/popupmenu.cpp:1749
-#: src/gui/popupmenu.cpp:1792
+#: src/gui/inventorywindow.cpp:144 src/gui/inventorywindow.cpp:620
+#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1799
+#: src/gui/popupmenu.cpp:1842
msgid "Drop..."
msgstr "Descartar..."
-#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1661
-#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1801
+#: src/gui/inventorywindow.cpp:145 src/gui/popupmenu.cpp:1711
+#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1851
msgid "Split"
msgstr "Dividir"
-#: src/gui/inventorywindow.cpp:145 src/gui/outfitwindow.cpp:59
-#: src/gui/popupmenu.cpp:520
+#: src/gui/inventorywindow.cpp:146 src/gui/outfitwindow.cpp:60
+#: src/gui/popupmenu.cpp:549
msgid "Outfits"
msgstr "Roupas"
-#: src/gui/inventorywindow.cpp:148
+#: src/gui/inventorywindow.cpp:149
msgid "Weight:"
msgstr "Peso:"
-#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
-#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
-#: src/gui/popupmenu.cpp:1804 src/gui/setup.cpp:72
+#: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:611
+#: src/gui/popupmenu.cpp:1674 src/gui/popupmenu.cpp:1811
+#: src/gui/popupmenu.cpp:1854 src/gui/setup.cpp:73
msgid "Store"
msgstr "Armazenar"
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1668
+#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1718
msgid "Retrieve"
msgstr "Retirar"
-#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1657
-#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1797
+#: src/gui/inventorywindow.cpp:622 src/gui/popupmenu.cpp:1707
+#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1847
#: src/gui/windowmenu.cpp:97
msgid "Drop"
msgstr "Descartar"
@@ -1031,11 +1031,11 @@ msgstr "Adicionar na loja de venda"
msgid "Unknown."
msgstr "Desconhecido"
-#: src/gui/itempopup.cpp:176 src/gui/itempopup.cpp:182
+#: src/gui/itempopup.cpp:177 src/gui/itempopup.cpp:183
msgid ", "
msgstr ", "
-#: src/gui/itempopup.cpp:192
+#: src/gui/itempopup.cpp:193
#, c-format
msgid "Weight: %s"
msgstr "Peso: %s"
@@ -1044,90 +1044,94 @@ msgstr "Peso: %s"
msgid "Kill stats"
msgstr "Estatísticas"
-#: src/gui/killstats.cpp:64
+#: src/gui/killstats.cpp:65
msgid "Reset stats"
msgstr "Resetar Status"
-#: src/gui/killstats.cpp:65
+#: src/gui/killstats.cpp:66
msgid "Reset timer"
msgstr "Resetar tempo"
-#: src/gui/killstats.cpp:69 src/gui/killstats.cpp:205
+#: src/gui/killstats.cpp:70 src/gui/killstats.cpp:206
#, c-format
msgid "Level: %d at %f%%"
msgstr "Nível: %d em %f%%"
-#: src/gui/killstats.cpp:73 src/gui/killstats.cpp:210
+#: src/gui/killstats.cpp:74 src/gui/killstats.cpp:211
#, c-format
msgid "Exp: %d/%d Left: %d"
msgstr "Exp: %d%d faltando: %d"
-#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:216
-#: src/gui/killstats.cpp:225
+#: src/gui/killstats.cpp:77 src/gui/killstats.cpp:217
+#: src/gui/killstats.cpp:226
#, c-format
msgid "1%% = %d exp, avg mob for 1%%: %s"
msgstr "1%% = %d exp, avg mob para 1%%: %s"
-#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:142
-#: src/gui/killstats.cpp:234
+#: src/gui/killstats.cpp:80 src/gui/killstats.cpp:143
+#: src/gui/killstats.cpp:235
#, c-format
msgid "Kills: %s, total exp: %s"
msgstr "Mortes: %s, total exp: %s"
-#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
-#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:230
+#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145
+#: src/gui/killstats.cpp:221 src/gui/killstats.cpp:231
#, c-format
msgid "Avg Exp: %s, No. of avg mob to next level: %s"
msgstr "Avg Exp: %s, No de avg mob para o próximo nível: %s"
-#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:162
-#: src/gui/killstats.cpp:237
+#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:163
+#: src/gui/killstats.cpp:238
#, c-format
msgid "Kills/Min: %s, Exp/Min: %s"
msgstr "Mortes/Min: %s Exp/Min: %s"
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:89 src/gui/killstats.cpp:94
-#: src/gui/killstats.cpp:289 src/gui/killstats.cpp:305
-#: src/gui/killstats.cpp:323
+#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:90 src/gui/killstats.cpp:95
+#: src/gui/killstats.cpp:290 src/gui/killstats.cpp:306
+#: src/gui/killstats.cpp:324
#, c-format
msgid "Exp speed per %d min: %s"
msgid_plural "Exp speed per %d min: %s"
msgstr[0] "Velocidade de exp por %d min: %s"
msgstr[1] "Velocidade de exp por %d mins: %s"
-#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
+#: src/gui/killstats.cpp:88 src/gui/killstats.cpp:93 src/gui/killstats.cpp:98
#, c-format
msgid "Time for next level per %d min: %s"
msgid_plural "Time for next level per %d min: %s"
msgstr[0] "Tempo para próximo nível por %d min: %s"
msgstr[1] "Tempo para próximo nível por %d mins: %s"
-#: src/gui/killstats.cpp:100 src/gui/killstats.cpp:241
+#: src/gui/killstats.cpp:101 src/gui/killstats.cpp:242
msgid "Last kill exp:"
msgstr "Exp de última morte:"
-#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:355
-#: src/gui/killstats.cpp:361 src/gui/killstats.cpp:367
-#: src/gui/killstats.cpp:372
+#: src/gui/killstats.cpp:103 src/gui/killstats.cpp:356
+#: src/gui/killstats.cpp:362 src/gui/killstats.cpp:368
+#: src/gui/killstats.cpp:373
msgid "Time before jacko spawn:"
msgstr "Tempo para próximo JackO:"
-#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:301
-#: src/gui/killstats.cpp:311 src/gui/killstats.cpp:318
-#: src/gui/killstats.cpp:330 src/gui/killstats.cpp:337
+#: src/gui/killstats.cpp:295 src/gui/killstats.cpp:302
+#: src/gui/killstats.cpp:312 src/gui/killstats.cpp:319
+#: src/gui/killstats.cpp:331 src/gui/killstats.cpp:338
#, c-format
msgid " Time for next level: %s"
msgstr "Tempo para próximo nível: %s"
-#: src/gui/killstats.cpp:361
+#: src/gui/killstats.cpp:362
#, c-format
msgid "%s %d?"
msgstr "%s %d?"
-#: src/gui/killstats.cpp:367
+#: src/gui/killstats.cpp:368
msgid "jacko spawning"
msgstr "JackOvai aparecer"
+#: src/guildmanager.cpp:464 src/net/ea/guildhandler.cpp:439
+msgid "You have left the guild."
+msgstr "Você saiu da Guilda."
+
#: src/gui/logindialog.cpp:59
msgid "Normal"
msgstr "Normal"
@@ -1144,7 +1148,7 @@ msgstr "Passar"
msgid "Login"
msgstr "Login"
-#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:246
+#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:252
#: src/gui/widgets/chattab.cpp:173
msgid "Server:"
msgstr "Servidor:"
@@ -1226,11 +1230,11 @@ msgstr "Enviar"
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:561
+#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:590
msgid "Clear"
msgstr "Limpar"
-#: src/gui/npcdialog.cpp:222
+#: src/gui/npcdialog.cpp:223
msgid "> Next"
msgstr "> Próximo"
@@ -1246,346 +1250,346 @@ msgstr "Enviar"
msgid "Failed to send as sender or letter invalid."
msgstr "Falha ao enviar como remetente ou a carta é inválida."
-#: src/gui/outfitwindow.cpp:82 src/gui/outfitwindow.cpp:886
+#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:890
#, c-format
msgid "Outfit: %d"
msgstr "Roupas: %d"
-#: src/gui/outfitwindow.cpp:84 src/gui/outfitwindow.cpp:888
+#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:892
#, c-format
msgid "Key: %s"
msgstr "Tecla: %s"
-#: src/gui/outfitwindow.cpp:87
+#: src/gui/outfitwindow.cpp:91
msgid "Unequip first"
msgstr "Desequipar antes"
-#: src/gui/outfitwindow.cpp:90
+#: src/gui/outfitwindow.cpp:94
msgid "Away outfit"
msgstr "Roupas de ocupado"
-#: src/gui/popupmenu.cpp:133 src/gui/popupmenu.cpp:616
+#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:645
#: src/gui/widgets/tradetab.cpp:44
msgid "Trade"
msgstr "Negócios"
-#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:375
+#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:393
msgid "Whisper"
msgstr "Sussuro"
-#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:621
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:650
msgid "Heal"
msgstr "Curar:"
-#: src/gui/popupmenu.cpp:146 src/gui/popupmenu.cpp:381
-#: src/gui/popupmenu.cpp:628
+#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:399
+#: src/gui/popupmenu.cpp:657
msgid "Be friend"
msgstr "Ser Amigo"
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:383
-#: src/gui/popupmenu.cpp:389 src/gui/popupmenu.cpp:408
-#: src/gui/popupmenu.cpp:630 src/gui/popupmenu.cpp:638
-#: src/gui/popupmenu.cpp:662
+#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:156
+#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:401
+#: src/gui/popupmenu.cpp:407 src/gui/popupmenu.cpp:426
+#: src/gui/popupmenu.cpp:659 src/gui/popupmenu.cpp:667
+#: src/gui/popupmenu.cpp:691
msgid "Disregard"
msgstr "Ser inimigo"
-#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:161
-#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:177
-#: src/gui/popupmenu.cpp:385 src/gui/popupmenu.cpp:391
-#: src/gui/popupmenu.cpp:398 src/gui/popupmenu.cpp:403
-#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
-#: src/gui/popupmenu.cpp:649 src/gui/popupmenu.cpp:655
+#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:160
+#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:176
+#: src/gui/popupmenu.cpp:403 src/gui/popupmenu.cpp:409
+#: src/gui/popupmenu.cpp:416 src/gui/popupmenu.cpp:421
+#: src/gui/popupmenu.cpp:662 src/gui/popupmenu.cpp:670
+#: src/gui/popupmenu.cpp:678 src/gui/popupmenu.cpp:684
msgid "Erase"
msgstr "Apagar"
-#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:175
-#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:395
-#: src/gui/popupmenu.cpp:402 src/gui/popupmenu.cpp:407
-#: src/gui/popupmenu.cpp:646 src/gui/popupmenu.cpp:654
-#: src/gui/popupmenu.cpp:660
+#: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:174
+#: src/gui/popupmenu.cpp:181 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:425
+#: src/gui/popupmenu.cpp:675 src/gui/popupmenu.cpp:683
+#: src/gui/popupmenu.cpp:689
msgid "Unignore"
msgstr "Não ignorar"
-#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:186
-#: src/gui/popupmenu.cpp:397 src/gui/popupmenu.cpp:410
-#: src/gui/popupmenu.cpp:648 src/gui/popupmenu.cpp:664
+#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:185
+#: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:428
+#: src/gui/popupmenu.cpp:677 src/gui/popupmenu.cpp:693
#: src/playerrelations.cpp:400
msgid "Completely ignore"
msgstr "Ignorar completamente"
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:418
-#: src/gui/popupmenu.cpp:672
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:436
+#: src/gui/popupmenu.cpp:701
msgid "Follow"
msgstr "Seguir"
-#: src/gui/popupmenu.cpp:196 src/gui/popupmenu.cpp:419
-#: src/gui/popupmenu.cpp:673
+#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:437
+#: src/gui/popupmenu.cpp:702
msgid "Imitation"
msgstr "Imitar"
-#: src/gui/popupmenu.cpp:206 src/gui/popupmenu.cpp:710
+#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:739
msgid "Invite to party"
msgstr "Convidar para grupo"
-#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:428
-#: src/gui/popupmenu.cpp:715
+#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:744
msgid "Kick from party"
msgstr "Chutar do grupo"
-#: src/gui/popupmenu.cpp:226 src/gui/popupmenu.cpp:439
-#: src/gui/popupmenu.cpp:729
+#: src/gui/popupmenu.cpp:225 src/gui/popupmenu.cpp:237
+#: src/gui/popupmenu.cpp:460 src/gui/popupmenu.cpp:761
msgid "Kick from guild"
msgstr "Chutar da Guilda"
-#: src/gui/popupmenu.cpp:228 src/gui/popupmenu.cpp:441
-#: src/gui/popupmenu.cpp:731
+#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:242
+#: src/gui/popupmenu.cpp:465 src/gui/popupmenu.cpp:766
msgid "Change pos in guild"
msgstr "Mudar posição da Guilda"
-#: src/gui/popupmenu.cpp:234 src/gui/popupmenu.cpp:446
-#: src/gui/popupmenu.cpp:737
+#: src/gui/popupmenu.cpp:251 src/gui/popupmenu.cpp:474
+#: src/gui/popupmenu.cpp:776
msgid "Invite to guild"
msgstr "Convidar para Guilda"
-#: src/gui/popupmenu.cpp:242
+#: src/gui/popupmenu.cpp:260
msgid "Kick player"
msgstr "Chutar Jogador"
-#: src/gui/popupmenu.cpp:244
+#: src/gui/popupmenu.cpp:262
msgid "Nuke"
msgstr "Deixar pelado"
-#: src/gui/popupmenu.cpp:247 src/gui/popupmenu.cpp:675
+#: src/gui/popupmenu.cpp:265 src/gui/popupmenu.cpp:704
msgid "Show Items"
msgstr "Mostar itens:"
-#: src/gui/popupmenu.cpp:248 src/gui/popupmenu.cpp:676
-#: src/gui/popupmenu.cpp:1970
+#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:705
+#: src/gui/popupmenu.cpp:2020
msgid "Undress"
msgstr "Deixar sem Roupas"
-#: src/gui/popupmenu.cpp:250 src/gui/popupmenu.cpp:286
-#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:678
-#: src/gui/popupmenu.cpp:746
+#: src/gui/popupmenu.cpp:268 src/gui/popupmenu.cpp:304
+#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:707
+#: src/gui/popupmenu.cpp:786
msgid "Add comment"
msgstr "Adicionar comentário"
-#: src/gui/popupmenu.cpp:268 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:695
+#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:482
+#: src/gui/popupmenu.cpp:724
msgid "Buy (?)"
msgstr "Comprar (?)"
-#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:454
-#: src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:483
+#: src/gui/popupmenu.cpp:726
msgid "Sell (?)"
msgstr "Vender (?)"
-#: src/gui/popupmenu.cpp:298
+#: src/gui/popupmenu.cpp:316
msgid "Kick"
msgstr "Chutar"
-#: src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:327
msgid "Remove from attack list"
msgstr "Remover da Lista de Ataques"
-#: src/gui/popupmenu.cpp:315
+#: src/gui/popupmenu.cpp:333
msgid "Add to priority attack list"
msgstr "Adicionar a prioridade na lista de ataques"
-#: src/gui/popupmenu.cpp:317
+#: src/gui/popupmenu.cpp:335
msgid "Add to attack list"
msgstr "Adicionar a lista de ataques"
-#: src/gui/popupmenu.cpp:320
+#: src/gui/popupmenu.cpp:338
msgid "Add to ignore list"
msgstr "Adicionar a lista de ignorados"
-#: src/gui/popupmenu.cpp:333 src/gui/popupmenu.cpp:457
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:486
msgid "Add name to chat"
msgstr "Adicionar nome ao chat"
-#: src/gui/popupmenu.cpp:483
+#: src/gui/popupmenu.cpp:512
msgid "Pick up"
msgstr "Pegar"
-#: src/gui/popupmenu.cpp:484 src/gui/popupmenu.cpp:1682
-#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1805
+#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:1732
+#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1855
msgid "Add to chat"
msgstr "Nome no chat"
-#: src/gui/popupmenu.cpp:501
+#: src/gui/popupmenu.cpp:530
msgid "Map Item"
msgstr "Mapa Item"
-#: src/gui/popupmenu.cpp:502
+#: src/gui/popupmenu.cpp:531
msgid "Rename"
msgstr "Renomear"
-#: src/gui/popupmenu.cpp:503 src/gui/popupmenu.cpp:1923
-#: src/gui/popupmenu.cpp:1941 src/gui/popupmenu.cpp:1946
+#: src/gui/popupmenu.cpp:532 src/gui/popupmenu.cpp:1973
+#: src/gui/popupmenu.cpp:1991 src/gui/popupmenu.cpp:1996
msgid "Remove"
msgstr "A Remover"
-#: src/gui/popupmenu.cpp:508
+#: src/gui/popupmenu.cpp:537
msgid "Warp"
msgstr "Urdidura"
-#: src/gui/popupmenu.cpp:522
+#: src/gui/popupmenu.cpp:551
msgid "Load old outfits"
msgstr "Carregar Antigas Roupas"
-#: src/gui/popupmenu.cpp:538 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:567 src/gui/windowmenu.cpp:96
msgid "Spells"
msgstr "Feitiços"
-#: src/gui/popupmenu.cpp:540
+#: src/gui/popupmenu.cpp:569
msgid "Load old spells"
msgstr "Carregar Antigos Feitiços"
-#: src/gui/popupmenu.cpp:541
+#: src/gui/popupmenu.cpp:570
msgid "Edit spell"
msgstr "Editar Feitiços"
-#: src/gui/popupmenu.cpp:567
+#: src/gui/popupmenu.cpp:596
msgid "Disable highlight"
msgstr "Desabilitar destaque"
-#: src/gui/popupmenu.cpp:572
+#: src/gui/popupmenu.cpp:601
msgid "Enable highlight"
msgstr "Habilitar destaque"
-#: src/gui/popupmenu.cpp:577
-msgid "Dont remove name"
-msgstr "Não remover nome"
+#: src/gui/popupmenu.cpp:606
+msgid "Don't remove name"
+msgstr "Não remova o nome"
-#: src/gui/popupmenu.cpp:582
+#: src/gui/popupmenu.cpp:611
msgid "Remove name"
msgstr "Remover nome"
-#: src/gui/popupmenu.cpp:587
+#: src/gui/popupmenu.cpp:616
msgid "Enable away"
msgstr "Habilitar longe do teclado"
-#: src/gui/popupmenu.cpp:592
+#: src/gui/popupmenu.cpp:621
msgid "Disable away"
msgstr "Desabilitar longe do teclado"
-#: src/gui/popupmenu.cpp:598 src/gui/socialwindow.cpp:1035
+#: src/gui/popupmenu.cpp:627 src/gui/socialwindow.cpp:1141
msgid "Leave"
msgstr "Sair"
-#: src/gui/popupmenu.cpp:758
+#: src/gui/popupmenu.cpp:798
msgid "Change guild position"
msgstr "Mudar a posição da guilda"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1189
+#: src/gui/popupmenu.cpp:1234
msgid "Rename map sign "
msgstr "Renomear mapa "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1191
+#: src/gui/popupmenu.cpp:1236
msgid "Name: "
msgstr "Nome: "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1241
+#: src/gui/popupmenu.cpp:1286
msgid "Player comment "
msgstr "Comentário do jogador"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1243
+#: src/gui/popupmenu.cpp:1288
msgid "Comment: "
msgstr "Comentário:"
-#: src/gui/popupmenu.cpp:1607
+#: src/gui/popupmenu.cpp:1657
msgid "Add to trade"
msgstr "Add. na negociação"
-#: src/gui/popupmenu.cpp:1613
+#: src/gui/popupmenu.cpp:1663
msgid "Add to trade 10"
msgstr "Add. 10 na negociação"
-#: src/gui/popupmenu.cpp:1616
+#: src/gui/popupmenu.cpp:1666
msgid "Add to trade half"
msgstr "Add. metade na negociação"
-#: src/gui/popupmenu.cpp:1618
+#: src/gui/popupmenu.cpp:1668
msgid "Add to trade all"
msgstr "Add. todos na negociação"
-#: src/gui/popupmenu.cpp:1630
+#: src/gui/popupmenu.cpp:1680
msgid "Store 10"
msgstr "Guardar 10"
-#: src/gui/popupmenu.cpp:1633
+#: src/gui/popupmenu.cpp:1683
msgid "Store half"
msgstr "Guardar metade"
-#: src/gui/popupmenu.cpp:1635
+#: src/gui/popupmenu.cpp:1685
msgid "Store all"
msgstr "Guardar tudo"
-#: src/gui/popupmenu.cpp:1653 src/gui/popupmenu.cpp:1750
-#: src/gui/popupmenu.cpp:1793
+#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1800
+#: src/gui/popupmenu.cpp:1843
msgid "Drop all"
msgstr "Descartar tudo"
-#: src/gui/popupmenu.cpp:1674
+#: src/gui/popupmenu.cpp:1724
msgid "Retrieve 10"
msgstr "Retirar 10"
-#: src/gui/popupmenu.cpp:1677
+#: src/gui/popupmenu.cpp:1727
msgid "Retrieve half"
msgstr "Retirar metade"
-#: src/gui/popupmenu.cpp:1679
+#: src/gui/popupmenu.cpp:1729
msgid "Retrieve all"
msgstr "Retirar tudo"
-#: src/gui/popupmenu.cpp:1710 src/gui/popupmenu.cpp:1766
+#: src/gui/popupmenu.cpp:1760 src/gui/popupmenu.cpp:1816
msgid "Load old item shortcuts"
msgstr "Carregar antigos atalhos de item"
-#: src/gui/popupmenu.cpp:1809
+#: src/gui/popupmenu.cpp:1859
msgid "Load old drop shortcuts"
msgstr "Carregar antigos atalhos de descarte"
-#: src/gui/popupmenu.cpp:1835 src/gui/popupmenu.cpp:1870
+#: src/gui/popupmenu.cpp:1885 src/gui/popupmenu.cpp:1920
msgid "Hide"
msgstr "Ocultar"
-#: src/gui/popupmenu.cpp:1841 src/gui/popupmenu.cpp:1876
+#: src/gui/popupmenu.cpp:1891 src/gui/popupmenu.cpp:1926
msgid "Show"
msgstr "Mostrar"
-#: src/gui/popupmenu.cpp:1883
+#: src/gui/popupmenu.cpp:1933
msgid "Reset yellow bar"
msgstr "Resetar barra amarela"
-#: src/gui/popupmenu.cpp:1885 src/gui/statuswindow.cpp:240
+#: src/gui/popupmenu.cpp:1935 src/gui/statuswindow.cpp:241
msgid "Copy to chat"
msgstr "Copiar para o chat"
-#: src/gui/popupmenu.cpp:1903 src/gui/socialwindow.cpp:854
-#: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
+#: src/gui/popupmenu.cpp:1953 src/gui/socialwindow.cpp:958
+#: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028
msgid "(default)"
msgstr "(padrão)"
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1933
+#: src/gui/popupmenu.cpp:1965 src/gui/popupmenu.cpp:1983
msgid "Move up"
msgstr "Mover a cima"
-#: src/gui/popupmenu.cpp:1920 src/gui/popupmenu.cpp:1938
+#: src/gui/popupmenu.cpp:1970 src/gui/popupmenu.cpp:1988
msgid "Move down"
msgstr "Mover a baixo"
-#: src/gui/quitdialog.cpp:56
+#: src/gui/quitdialog.cpp:51
msgid "Switch server"
msgstr "Trocar servidor"
-#: src/gui/quitdialog.cpp:57
+#: src/gui/quitdialog.cpp:52
msgid "Switch character"
msgstr "Trocar de Personagem"
@@ -1621,64 +1625,64 @@ msgstr "A senha deve ser menor que %d caracteres."
msgid "Passwords do not match."
msgstr "Senhas não conferem."
-#: src/gui/serverdialog.cpp:231
+#: src/gui/serverdialog.cpp:237
msgid "Choose Your Server"
msgstr "Escolha seu servidor"
-#: src/gui/serverdialog.cpp:242
+#: src/gui/serverdialog.cpp:248
msgid "Choose Your Server *** SAFE MODE ***"
msgstr "Escolha seu servidor *** MODO SEGURO ***"
-#: src/gui/serverdialog.cpp:247
+#: src/gui/serverdialog.cpp:253
msgid "Port:"
msgstr "Porta:"
-#: src/gui/serverdialog.cpp:251
+#: src/gui/serverdialog.cpp:257
msgid "Use same ip for game sub servers"
msgstr "Usar o mesmo ip para os sub servidores do jogo"
-#: src/gui/serverdialog.cpp:265
+#: src/gui/serverdialog.cpp:271
msgid "Server type:"
msgstr "Tipo de servidor:"
-#: src/gui/serverdialog.cpp:289
+#: src/gui/serverdialog.cpp:295
msgid "Load"
msgstr "Carregar"
-#: src/gui/serverdialog.cpp:290
+#: src/gui/serverdialog.cpp:296
msgid "Connect"
msgstr "Conectar"
-#: src/gui/serverdialog.cpp:291
+#: src/gui/serverdialog.cpp:297
msgid "Custom Server"
msgstr "Servidor customizado"
-#: src/gui/serverdialog.cpp:396
+#: src/gui/serverdialog.cpp:402
msgid "Please type both the address and the port of a server."
msgstr "Por favor especifique o endereço e a porta do servidor."
-#: src/gui/serverdialog.cpp:554
+#: src/gui/serverdialog.cpp:560
#, c-format
msgid "Downloading server list...%2.2f%%"
msgstr "Baixando lista de servidores...%2.2f%%"
-#: src/gui/serverdialog.cpp:559
+#: src/gui/serverdialog.cpp:565
msgid "Waiting for server..."
msgstr "Aguardando servidor..."
-#: src/gui/serverdialog.cpp:563
+#: src/gui/serverdialog.cpp:569
msgid "Preparing download"
msgstr "Preparando download"
-#: src/gui/serverdialog.cpp:567
+#: src/gui/serverdialog.cpp:573
msgid "Error retreiving server list!"
msgstr "Erro ao recuperar lista!"
-#: src/gui/serverdialog.cpp:672
+#: src/gui/serverdialog.cpp:678
msgid "requires a newer version"
msgstr "requer uma versão mais nova"
-#: src/gui/serverdialog.cpp:674
+#: src/gui/serverdialog.cpp:680
#, c-format
msgid "requires v%s"
msgstr "requer v%s"
@@ -1824,6 +1828,14 @@ msgstr "Tempo"
msgid "Use local time"
msgstr "Usar hora local"
+#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:157
+msgid "Other"
+msgstr "Outro"
+
+#: src/gui/setup_chat.cpp:125
+msgid "Highlight words (separated by comma)"
+msgstr "Palavras Destacadas (separadas por vírgulas)"
+
#: src/gui/setup_colors.cpp:49
msgid "This is what the color looks like"
msgstr "A cor vai ficar assim"
@@ -1871,11 +1883,11 @@ msgstr "Azul:"
msgid "Alpha:"
msgstr "Alpha:"
-#: src/gui/setup.cpp:70
+#: src/gui/setup.cpp:71
msgid "Apply"
msgstr "Aplicar"
-#: src/gui/setup.cpp:73
+#: src/gui/setup.cpp:74
msgid "Reset Windows"
msgstr "Restaurar janelas"
@@ -2052,34 +2064,42 @@ msgid "Log NPC dialogue"
msgstr "Salvar diálogos com NPC"
#: src/gui/setup_other.cpp:148
-msgid "Other"
-msgstr "Outro"
+msgid "Bots support"
+msgstr "Suporte de bots"
#: src/gui/setup_other.cpp:150
+msgid "Enable auction bot support"
+msgstr "Habilitar suporte há bot de leilão"
+
+#: src/gui/setup_other.cpp:153
+msgid "Enable guild bot support and disable native guild support"
+msgstr "Ativar o suporte a bot guilda e desabilitar o suporte nativo guilda"
+
+#: src/gui/setup_other.cpp:159
msgid "Enable server side attack"
msgstr "Habilitar ataque do lado do servidor"
-#: src/gui/setup_other.cpp:153
+#: src/gui/setup_other.cpp:162
msgid "Enable bot checker"
msgstr "Habilitar Analisador de bot"
-#: src/gui/setup_other.cpp:156
+#: src/gui/setup_other.cpp:165
msgid "Enable buggy servers protection"
msgstr "Habilitar proteção contra servidores com bugs"
-#: src/gui/setup_other.cpp:159
+#: src/gui/setup_other.cpp:168
msgid "Enable debug log"
msgstr "Habilitar Depurador"
-#: src/gui/setup_other.cpp:162
+#: src/gui/setup_other.cpp:171
msgid "Low traffic mode"
msgstr "Modo de baixo tráfego"
-#: src/gui/setup_other.cpp:165
+#: src/gui/setup_other.cpp:174
msgid "Hide shield sprite"
msgstr "Ocultar sprite de escudo"
-#: src/gui/setup_other.cpp:168
+#: src/gui/setup_other.cpp:177
msgid "Show background"
msgstr "Mostrar imagem de fundo"
@@ -2175,6 +2195,10 @@ msgstr "Ver status"
msgid "Show ip addresses on screenshots"
msgstr "Mostrar endereço de ip nas capturas de tela"
+#: src/gui/setup_players.cpp:81
+msgid "Allow self heal with mouse click"
+msgstr "Permitir curar-se com o clique do mouse "
+
#: src/gui/setup_relations.cpp:65
msgid "Relation"
msgstr "Relação"
@@ -2451,261 +2475,266 @@ msgstr "Configurações de efeito de partícula modificadas."
msgid "Changes will take effect on map change."
msgstr "As mudanças terão efeito ao mudar de mapa."
-#: src/gui/shopwindow.cpp:74
+#: src/gui/shopwindow.cpp:75
msgid "Personal Shop"
msgstr "Loja pessoal"
-#: src/gui/shopwindow.cpp:116
+#: src/gui/shopwindow.cpp:118
msgid "Buy items"
msgstr "Comprar itens"
-#: src/gui/shopwindow.cpp:117
+#: src/gui/shopwindow.cpp:119
msgid "Sell items"
msgstr "Vender itens"
-#: src/gui/shopwindow.cpp:119 src/gui/shopwindow.cpp:122
-#: src/gui/tradewindow.cpp:88
+#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
+#: src/gui/tradewindow.cpp:89
msgid "Add"
msgstr "Adicionar"
-#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
+#: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
msgid "Announce"
msgstr "Anúncio"
-#: src/gui/shopwindow.cpp:125
+#: src/gui/shopwindow.cpp:127
msgid "Show links in announce"
msgstr "Mostrar links em anúncio"
-#: src/gui/shopwindow.cpp:723 src/net/ea/tradehandler.cpp:106
+#: src/gui/shopwindow.cpp:148 src/gui/shopwindow.cpp:149
+msgid "Auction"
+msgstr "Leilão"
+
+#: src/gui/shopwindow.cpp:748 src/net/ea/tradehandler.cpp:106
#: src/net/manaserv/tradehandler.cpp:127
msgid "Request for Trade"
msgstr "Proposta de negociação"
-#: src/gui/shopwindow.cpp:724
+#: src/gui/shopwindow.cpp:749
#, c-format
msgid "%s wants to %s %s do you accept?"
msgstr "%s quer %s %s você aceita?"
-#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:81
+#: src/gui/skilldialog.cpp:276 src/gui/windowmenu.cpp:81
msgid "Skills"
msgstr "Habilidades"
-#: src/gui/skilldialog.cpp:283
+#: src/gui/skilldialog.cpp:288
msgid "Up"
msgstr "+"
-#: src/gui/skilldialog.cpp:336
+#: src/gui/skilldialog.cpp:341
#, c-format
msgid "Skill points available: %d"
msgstr "Pontos de habilidade disponíveis: %d"
-#: src/gui/skilldialog.cpp:413
+#: src/gui/skilldialog.cpp:418
#, c-format
msgid "Skill Set %d"
msgstr "Habilidade %d"
-#: src/gui/skilldialog.cpp:425
+#: src/gui/skilldialog.cpp:430
#, c-format
msgid "Skill %d"
msgstr "Habilidade %d"
-#: src/gui/skilldialog.cpp:492 src/gui/skilldialog.cpp:545
+#: src/gui/skilldialog.cpp:497 src/gui/skilldialog.cpp:550
#, c-format
msgid "Lvl: %d"
msgstr "Nível: %d"
-#: src/gui/skilldialog.cpp:537
+#: src/gui/skilldialog.cpp:542
#, c-format
msgid "Lvl: %d (%+d)"
msgstr "Nível: %d (%+d)"
-#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
+#: src/gui/socialwindow.cpp:118 src/gui/socialwindow.cpp:216
+#: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52
msgid "Guild"
msgstr "Guilda"
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:147
#, c-format
msgid "Invited user %s to guild %s."
msgstr "Convidou o jogador %s para a guilda %s."
-#: src/gui/socialwindow.cpp:160
+#: src/gui/socialwindow.cpp:161
#, c-format
msgid "Guild %s quit requested."
msgstr "Saída da Guilda %s requisitada."
-#: src/gui/socialwindow.cpp:187
+#: src/gui/socialwindow.cpp:188
msgid "Member Invite to Guild"
msgstr "Convite de membros para a Guilda."
-#: src/gui/socialwindow.cpp:188
+#: src/gui/socialwindow.cpp:189
#, c-format
msgid "Who would you like to invite to guild %s?"
msgstr "Quem você gostaria de convidar para a guilda %s?"
-#: src/gui/socialwindow.cpp:197
+#: src/gui/socialwindow.cpp:198
msgid "Leave Guild?"
msgstr "Sair da guilda?"
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:199
#, c-format
msgid "Are you sure you want to leave guild %s?"
msgstr "Tem certeza que deseja sair da guilda %s?"
-#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:319 src/net/ea/gui/partytab.cpp:50
msgid "Party"
msgstr "Grupo"
-#: src/gui/socialwindow.cpp:243
+#: src/gui/socialwindow.cpp:347
#, c-format
msgid "Invited user %s to party."
msgstr "Convidou usuário %s para o grupo."
-#: src/gui/socialwindow.cpp:257
+#: src/gui/socialwindow.cpp:361
#, c-format
msgid "Party %s quit requested."
msgstr "Saída do grupo %s requisitada."
-#: src/gui/socialwindow.cpp:284
+#: src/gui/socialwindow.cpp:388
msgid "Member Invite to Party"
msgstr "Convite de membros para o grupo"
-#: src/gui/socialwindow.cpp:285
+#: src/gui/socialwindow.cpp:389
#, c-format
msgid "Who would you like to invite to party %s?"
msgstr "Quem você gostaria de convidar para o grupo %s?"
-#: src/gui/socialwindow.cpp:294
+#: src/gui/socialwindow.cpp:398
msgid "Leave Party?"
msgstr "Sair do grupo?"
-#: src/gui/socialwindow.cpp:295
+#: src/gui/socialwindow.cpp:399
#, c-format
msgid "Are you sure you want to leave party %s?"
msgstr "Tem certeza que deseja sair do grupo %s?"
-#: src/gui/socialwindow.cpp:521
+#: src/gui/socialwindow.cpp:625
msgid "Nav"
msgstr "Nav"
-#: src/gui/socialwindow.cpp:799
+#: src/gui/socialwindow.cpp:903
msgid "Atk"
msgstr "Atq"
-#: src/gui/socialwindow.cpp:840
+#: src/gui/socialwindow.cpp:944
msgid "Priority mobs"
msgstr "Mobs Prioritarios"
-#: src/gui/socialwindow.cpp:872
+#: src/gui/socialwindow.cpp:976
msgid "Attack mobs"
msgstr "Atacar Mobs"
-#: src/gui/socialwindow.cpp:907
+#: src/gui/socialwindow.cpp:1011
msgid "Ignore mobs"
msgstr "Ignorar mobss"
-#: src/gui/socialwindow.cpp:970
+#: src/gui/socialwindow.cpp:1074
msgid "Create Guild"
msgstr "Criar guilda"
-#: src/gui/socialwindow.cpp:971 src/gui/socialwindow.cpp:1387
+#: src/gui/socialwindow.cpp:1075 src/gui/socialwindow.cpp:1503
msgid "Create Party"
msgstr "Criar grupo"
-#: src/gui/socialwindow.cpp:1013 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1117 src/gui/windowmenu.cpp:93
msgid "Social"
msgstr "Social"
-#: src/gui/socialwindow.cpp:1034
+#: src/gui/socialwindow.cpp:1140
msgid "Invite"
msgstr "Convidar"
-#: src/gui/socialwindow.cpp:1176
+#: src/gui/socialwindow.cpp:1286
#, c-format
msgid "Accepted party invite from %s."
msgstr "Aceitou convite para o grupo de %s."
-#: src/gui/socialwindow.cpp:1186
+#: src/gui/socialwindow.cpp:1296
#, c-format
msgid "Rejected party invite from %s."
msgstr "Rejeitou convite para o grupo de %s."
-#: src/gui/socialwindow.cpp:1203
+#: src/gui/socialwindow.cpp:1313
#, c-format
msgid "Accepted guild invite from %s."
msgstr "Aceitou convite para a guilda de %s."
-#: src/gui/socialwindow.cpp:1213
+#: src/gui/socialwindow.cpp:1326
#, c-format
msgid "Rejected guild invite from %s."
msgstr "Rejeitou convite para a guilda de %s."
-#: src/gui/socialwindow.cpp:1257
+#: src/gui/socialwindow.cpp:1373
#, c-format
msgid "Creating guild called %s."
msgstr "Criando guilda chamada %s."
-#: src/gui/socialwindow.cpp:1280
+#: src/gui/socialwindow.cpp:1396
#, c-format
msgid "Creating party called %s."
msgstr "Criando grupo chamado %s."
-#: src/gui/socialwindow.cpp:1294
+#: src/gui/socialwindow.cpp:1410
msgid "Guild Name"
msgstr "Nome da guilda"
-#: src/gui/socialwindow.cpp:1295
+#: src/gui/socialwindow.cpp:1411
msgid "Choose your guild's name."
msgstr "Escolha o nome da sua guilda."
-#: src/gui/socialwindow.cpp:1309
+#: src/gui/socialwindow.cpp:1425
msgid "Received guild request, but one already exists."
msgstr "Requisição de guilda recebida, mas já existe uma."
-#: src/gui/socialwindow.cpp:1315
+#: src/gui/socialwindow.cpp:1431
#, c-format
msgid "%s has invited you to join the guild %s."
msgstr "%s te convidou para entrar na guilda %s."
-#: src/gui/socialwindow.cpp:1321
+#: src/gui/socialwindow.cpp:1437
msgid "Accept Guild Invite"
msgstr "Aceitar convite para a guilda"
-#: src/gui/socialwindow.cpp:1336
+#: src/gui/socialwindow.cpp:1452
msgid "Received party request, but one already exists."
msgstr "Requisição de grupo recebida, mas já existe um."
-#: src/gui/socialwindow.cpp:1347
+#: src/gui/socialwindow.cpp:1463
msgid "You have been invited you to join a party."
msgstr "Você foi convidado para entrar em um grupo."
-#: src/gui/socialwindow.cpp:1351
+#: src/gui/socialwindow.cpp:1467
#, c-format
msgid "You have been invited to join the %s party."
msgstr "Você foi convidado para entrar no grupo %s."
-#: src/gui/socialwindow.cpp:1359
+#: src/gui/socialwindow.cpp:1475
#, c-format
msgid "%s has invited you to join their party."
msgstr "%s te convidou para entrar em seu grupo."
-#: src/gui/socialwindow.cpp:1364
+#: src/gui/socialwindow.cpp:1480
#, c-format
msgid "%s has invited you to join the %s party."
msgstr "%s te convidou para entrar no grupo %s."
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1489
msgid "Accept Party Invite"
msgstr "Aceitar convite para o grupo"
-#: src/gui/socialwindow.cpp:1388
+#: src/gui/socialwindow.cpp:1504
msgid "Cannot create party. You are already in a party"
msgstr "Não foi possível criar o grupo. Você já faz parte de um."
-#: src/gui/socialwindow.cpp:1393
+#: src/gui/socialwindow.cpp:1509
msgid "Party Name"
msgstr "Nome do grupo"
-#: src/gui/socialwindow.cpp:1394
+#: src/gui/socialwindow.cpp:1510
msgid "Choose your party's name."
msgstr "Escolha o nome do seu grupo."
@@ -2713,418 +2742,418 @@ msgstr "Escolha o nome do seu grupo."
msgid "Specials"
msgstr "Especiais"
-#: src/gui/statuspopup.cpp:197
+#: src/gui/statuspopup.cpp:198
msgid "(D) default moves"
msgstr "(D) movimentos padrão"
-#: src/gui/statuspopup.cpp:202
+#: src/gui/statuspopup.cpp:203
msgid "(I) invert moves"
msgstr "(l) inserir movimentos"
-#: src/gui/statuspopup.cpp:207
+#: src/gui/statuspopup.cpp:208
msgid "(c) moves with some crazy moves"
msgstr "(c) Alguns movimentos loucos"
-#: src/gui/statuspopup.cpp:212
+#: src/gui/statuspopup.cpp:213
msgid "(C) moves with crazy moves"
msgstr "(C) Movimentos loucos"
-#: src/gui/statuspopup.cpp:217
+#: src/gui/statuspopup.cpp:218
msgid "(d) double normal + crazy"
msgstr "(d) dobro normal + louco"
-#: src/gui/statuspopup.cpp:222
+#: src/gui/statuspopup.cpp:223
msgid "(?) move"
msgstr "(?) mover"
-#: src/gui/statuspopup.cpp:240
+#: src/gui/statuspopup.cpp:241
msgid "(a) custom crazy move"
msgstr "(a) movimentos loucos customizados"
-#: src/gui/statuspopup.cpp:244
+#: src/gui/statuspopup.cpp:245
msgid "(?) crazy move"
msgstr "(?) movimentos loucos"
-#: src/gui/statuspopup.cpp:254
+#: src/gui/statuspopup.cpp:255
msgid "(0) default moves to target"
msgstr "(0) Mover ao alvo padrão"
-#: src/gui/statuspopup.cpp:259
+#: src/gui/statuspopup.cpp:260
msgid "(1) moves to target in distance 1"
msgstr "(1) Mover ao alvo com distância 1"
-#: src/gui/statuspopup.cpp:264
+#: src/gui/statuspopup.cpp:265
msgid "(2) moves to target in distance 2"
msgstr "(2) mover ao alvo em distância 2"
-#: src/gui/statuspopup.cpp:269
+#: src/gui/statuspopup.cpp:270
msgid "(3) moves to target in distance 3"
msgstr "(3) Mover ao alvo com distância 3"
-#: src/gui/statuspopup.cpp:274
+#: src/gui/statuspopup.cpp:275
msgid "(5) moves to target in distance 5"
msgstr "(5) Mover ao alvo com distância 5"
-#: src/gui/statuspopup.cpp:279
+#: src/gui/statuspopup.cpp:280
msgid "(7) moves to target in distance 7"
msgstr "(7) Mover ao alvo com distância 7"
-#: src/gui/statuspopup.cpp:284
+#: src/gui/statuspopup.cpp:285
msgid "(A) moves to target in attack range"
msgstr "(A) Mover ao alvo com a distância de ataque"
-#: src/gui/statuspopup.cpp:289
+#: src/gui/statuspopup.cpp:290
msgid "(?) move to target"
msgstr "(?) Mover ao alvo"
-#: src/gui/statuspopup.cpp:297
+#: src/gui/statuspopup.cpp:298
msgid "(D) default follow"
msgstr "(D) Seguir em modo padrão"
-#: src/gui/statuspopup.cpp:301
+#: src/gui/statuspopup.cpp:302
msgid "(R) relative follow"
msgstr "(R) Seguir em modo relativo"
-#: src/gui/statuspopup.cpp:305
+#: src/gui/statuspopup.cpp:306
msgid "(M) mirror follow"
msgstr "(M) Seguir em modo espelhado"
-#: src/gui/statuspopup.cpp:309
+#: src/gui/statuspopup.cpp:310
msgid "(P) pet follow"
msgstr "(P) Seguir em modo animal de extimação"
-#: src/gui/statuspopup.cpp:313
+#: src/gui/statuspopup.cpp:314
msgid "(?) unknown follow"
msgstr "(?) Seguir em modo desconhecido"
-#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
+#: src/gui/statuspopup.cpp:323 src/gui/statuspopup.cpp:346
msgid "(D) default attack"
msgstr "(D) Ataque padrão"
-#: src/gui/statuspopup.cpp:327
+#: src/gui/statuspopup.cpp:328
msgid "(s) switch attack without shield"
msgstr "(s) Trocar ataque sem escudo"
-#: src/gui/statuspopup.cpp:332
+#: src/gui/statuspopup.cpp:333
msgid "(S) switch attack with shield"
msgstr "(S) Trocar ataque com escudo"
-#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
+#: src/gui/statuspopup.cpp:337 src/gui/statuspopup.cpp:362
msgid "(?) attack"
msgstr "(?) Ataque"
-#: src/gui/statuspopup.cpp:349
+#: src/gui/statuspopup.cpp:350
msgid "(G) go and attack"
msgstr "(G) Ir e atacar"
-#: src/gui/statuspopup.cpp:353
+#: src/gui/statuspopup.cpp:354
msgid "(A) go, attack, pickup"
msgstr "(A) Ir, atacar, pegar"
-#: src/gui/statuspopup.cpp:357
+#: src/gui/statuspopup.cpp:358
msgid "(d) without auto attack"
msgstr "(d) sem auto ataque"
-#: src/gui/statuspopup.cpp:375
+#: src/gui/statuspopup.cpp:376
msgid "(S) small pick up 1x1 cells"
msgstr "(S) Pequeno pegar 1x1 celulas"
-#: src/gui/statuspopup.cpp:379
+#: src/gui/statuspopup.cpp:380
msgid "(D) default pick up 2x1 cells"
msgstr "(D) Pegar padrão 2x1 células"
-#: src/gui/statuspopup.cpp:383
+#: src/gui/statuspopup.cpp:384
msgid "(F) forward pick up 2x3 cells"
msgstr "(F) Pegar em frente 2x3 células"
-#: src/gui/statuspopup.cpp:387
+#: src/gui/statuspopup.cpp:388
msgid "(3) pick up 3x3 cells"
msgstr "(3) Pegar 3x3 células"
-#: src/gui/statuspopup.cpp:391
+#: src/gui/statuspopup.cpp:392
msgid "(g) go and pick up in distance 4"
msgstr "(g) Ir e pegar em distância 4"
-#: src/gui/statuspopup.cpp:395
+#: src/gui/statuspopup.cpp:396
msgid "(G) go and pick up in distance 8"
msgstr "(G) Ir e pegar em distância 8"
-#: src/gui/statuspopup.cpp:399
+#: src/gui/statuspopup.cpp:400
msgid "(A) go and pick up in max distance"
msgstr "(A) Ir e pegar em distância mâxima"
-#: src/gui/statuspopup.cpp:403
+#: src/gui/statuspopup.cpp:404
msgid "(?) pick up"
msgstr "(?) Pegar item"
-#: src/gui/statuspopup.cpp:412
+#: src/gui/statuspopup.cpp:413
msgid "(N) normal map view"
msgstr "(N) Visualizardor de mapa normal"
-#: src/gui/statuspopup.cpp:416
+#: src/gui/statuspopup.cpp:417
msgid "(D) debug map view"
msgstr "(D) Visualizador de mapa depurador"
-#: src/gui/statuspopup.cpp:420
+#: src/gui/statuspopup.cpp:421
msgid "(u) ultra map view"
msgstr "(u) Visualizador de mapa ultra"
-#: src/gui/statuspopup.cpp:424
+#: src/gui/statuspopup.cpp:425
msgid "(U) ultra map view 2"
msgstr "(U) Visualizador de mapa ultra 2"
-#: src/gui/statuspopup.cpp:428
+#: src/gui/statuspopup.cpp:429
msgid "(e) empty map view"
msgstr "(e) Visualizador de mapa vazio"
-#: src/gui/statuspopup.cpp:432
+#: src/gui/statuspopup.cpp:433
msgid "(b) black & white map view"
msgstr "(b) Visualizador de mapa preto e branco"
-#: src/gui/statuspopup.cpp:436
+#: src/gui/statuspopup.cpp:437
msgid "(?) map view"
msgstr "(?) Visualizador de mapa"
-#: src/gui/statuspopup.cpp:444
+#: src/gui/statuspopup.cpp:445
msgid "(f) use #flar for magic attack"
msgstr "(f) Usar #flar para feitiço de ataque"
-#: src/gui/statuspopup.cpp:449
+#: src/gui/statuspopup.cpp:450
msgid "(c) use #chiza for magic attack"
msgstr "(c) Usar #chiza para feitiço de ataque"
-#: src/gui/statuspopup.cpp:454
+#: src/gui/statuspopup.cpp:455
msgid "(I) use #ingrav for magic attack"
msgstr "(I) Usar #ingrav para feitiço de ataque"
-#: src/gui/statuspopup.cpp:459
+#: src/gui/statuspopup.cpp:460
msgid "(F) use #frillyar for magic attack"
msgstr "(F) Usar #frillyar para feitiço de ataque"
-#: src/gui/statuspopup.cpp:464
+#: src/gui/statuspopup.cpp:465
msgid "(U) use #upmarmu for magic attack"
msgstr "(U) Usar #upmarmu para feitiço de ataque"
-#: src/gui/statuspopup.cpp:468
+#: src/gui/statuspopup.cpp:469
msgid "(?) magic attack"
msgstr "(?) Feitiço de ataque"
-#: src/gui/statuspopup.cpp:477
+#: src/gui/statuspopup.cpp:478
msgid "(D) default imitation"
msgstr "(D) Mímica padrão"
-#: src/gui/statuspopup.cpp:481
+#: src/gui/statuspopup.cpp:482
msgid "(O) outfits imitation"
msgstr "(O) Mímica de roupas"
-#: src/gui/statuspopup.cpp:485
+#: src/gui/statuspopup.cpp:486
msgid "(?) imitation"
msgstr "(?) Mímica"
-#: src/gui/statuspopup.cpp:494
+#: src/gui/statuspopup.cpp:495
msgid "(O) on keyboard"
msgstr "(O) No teclado"
-#: src/gui/statuspopup.cpp:497
+#: src/gui/statuspopup.cpp:498
msgid "(A) away"
msgstr "(A) Ausente"
-#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
+#: src/gui/statuspopup.cpp:501 src/gui/statuspopup.cpp:521
msgid "(?) away"
msgstr "(?) Ausente"
-#: src/gui/statuspopup.cpp:508
+#: src/gui/statuspopup.cpp:509
msgid "(G) game camera mode"
msgstr "(G) Modo de jogo câmera"
-#: src/gui/statuspopup.cpp:512
+#: src/gui/statuspopup.cpp:513
msgid "(F) free camera mode"
msgstr "(F) Modo de jogo câmera livre"
-#: src/gui/statuspopup.cpp:516
+#: src/gui/statuspopup.cpp:517
msgid "(D) design camera mode"
msgstr "(D) Modo de jogo câmera design"
-#: src/gui/statuspopup.cpp:527
+#: src/gui/statuspopup.cpp:528
msgid "Game modifiers are disabled"
msgstr "Modificadores de jogo desativados"
-#: src/gui/statuspopup.cpp:532
+#: src/gui/statuspopup.cpp:533
msgid "Game modifiers are enabled"
msgstr "Modificadores de jogo ativados"
-#: src/gui/statuswindow.cpp:142 src/gui/statuswindow.cpp:272
-#: src/gui/statuswindow.cpp:335
+#: src/gui/statuswindow.cpp:143 src/gui/statuswindow.cpp:273
+#: src/gui/statuswindow.cpp:336
#, c-format
msgid "Level: %d"
msgstr "Nível: %d"
-#: src/gui/statuswindow.cpp:143 src/gui/statuswindow.cpp:258
-#: src/gui/statuswindow.cpp:302
+#: src/gui/statuswindow.cpp:144 src/gui/statuswindow.cpp:259
+#: src/gui/statuswindow.cpp:303
#, c-format
msgid "Money: %s"
msgstr "Dinheiro: %s"
-#: src/gui/statuswindow.cpp:149
+#: src/gui/statuswindow.cpp:150
msgid "HP:"
msgstr "HP:"
-#: src/gui/statuswindow.cpp:156
+#: src/gui/statuswindow.cpp:157
msgid "Exp:"
msgstr "Exp:"
-#: src/gui/statuswindow.cpp:170
+#: src/gui/statuswindow.cpp:171
msgid "MP:"
msgstr "MP:"
-#: src/gui/statuswindow.cpp:202 src/gui/statuswindow.cpp:385
+#: src/gui/statuswindow.cpp:203 src/gui/statuswindow.cpp:386
#, c-format
msgid "Job: %d"
msgstr "Job: %d"
-#: src/gui/statuswindow.cpp:203
+#: src/gui/statuswindow.cpp:204
msgid "Job:"
msgstr "Job:"
-#: src/gui/statuswindow.cpp:261 src/gui/statuswindow.cpp:309
+#: src/gui/statuswindow.cpp:262 src/gui/statuswindow.cpp:310
#, c-format
msgid "Character points: %d"
msgstr "Pontos do personagem: %d"
-#: src/gui/statuswindow.cpp:267
+#: src/gui/statuswindow.cpp:268
#, c-format
msgid "Level: %d (GM %d)"
msgstr "Nível: %d (GM %d)"
-#: src/gui/statuswindow.cpp:323
+#: src/gui/statuswindow.cpp:324
#, c-format
msgid "Correction points: %d"
msgstr "Pontos de correção: %d"
-#: src/gui/statuswindow.cpp:646 src/gui/statuswindow.cpp:711
-#: src/gui/statuswindow.cpp:731 src/gui/statuswindow.cpp:747
-#: src/gui/statuswindow.cpp:793 src/gui/statuswindow.cpp:822
-#: src/gui/statuswindow.cpp:845 src/gui/statuswindow.cpp:864
+#: src/gui/statuswindow.cpp:647 src/gui/statuswindow.cpp:712
+#: src/gui/statuswindow.cpp:732 src/gui/statuswindow.cpp:748
+#: src/gui/statuswindow.cpp:794 src/gui/statuswindow.cpp:823
+#: src/gui/statuswindow.cpp:846 src/gui/statuswindow.cpp:865
msgid "(D)"
msgstr "(D)"
-#: src/gui/statuswindow.cpp:649 src/gui/statuswindow.cpp:772
+#: src/gui/statuswindow.cpp:650 src/gui/statuswindow.cpp:773
msgid "(I)"
msgstr "(I)"
-#: src/gui/statuswindow.cpp:652 src/gui/statuswindow.cpp:769
+#: src/gui/statuswindow.cpp:653 src/gui/statuswindow.cpp:770
msgid "(c)"
msgstr "(c)"
-#: src/gui/statuswindow.cpp:655
+#: src/gui/statuswindow.cpp:656
msgid "(C)"
msgstr "(C)"
-#: src/gui/statuswindow.cpp:658 src/gui/statuswindow.cpp:756
+#: src/gui/statuswindow.cpp:659 src/gui/statuswindow.cpp:757
msgid "(d)"
msgstr "(d)"
-#: src/gui/statuswindow.cpp:661 src/gui/statuswindow.cpp:675
-#: src/gui/statuswindow.cpp:704 src/gui/statuswindow.cpp:723
-#: src/gui/statuswindow.cpp:740 src/gui/statuswindow.cpp:759
-#: src/gui/statuswindow.cpp:781 src/gui/statuswindow.cpp:811
-#: src/gui/statuswindow.cpp:837 src/gui/statuswindow.cpp:851
-#: src/gui/statuswindow.cpp:867 src/gui/statuswindow.cpp:880
+#: src/gui/statuswindow.cpp:662 src/gui/statuswindow.cpp:676
+#: src/gui/statuswindow.cpp:705 src/gui/statuswindow.cpp:724
+#: src/gui/statuswindow.cpp:741 src/gui/statuswindow.cpp:760
+#: src/gui/statuswindow.cpp:782 src/gui/statuswindow.cpp:812
+#: src/gui/statuswindow.cpp:838 src/gui/statuswindow.cpp:852
+#: src/gui/statuswindow.cpp:868 src/gui/statuswindow.cpp:881
msgid "(?)"
msgstr "(?)"
-#: src/gui/statuswindow.cpp:672
+#: src/gui/statuswindow.cpp:673
msgid "(a)"
msgstr "(a)"
-#: src/gui/statuswindow.cpp:683
+#: src/gui/statuswindow.cpp:684
msgid "(0)"
msgstr "(0)"
-#: src/gui/statuswindow.cpp:686
+#: src/gui/statuswindow.cpp:687
msgid "(1)"
msgstr "(1)"
-#: src/gui/statuswindow.cpp:689
+#: src/gui/statuswindow.cpp:690
msgid "(2)"
msgstr "(2)"
-#: src/gui/statuswindow.cpp:692 src/gui/statuswindow.cpp:799
+#: src/gui/statuswindow.cpp:693 src/gui/statuswindow.cpp:800
msgid "(3)"
msgstr "(3)"
-#: src/gui/statuswindow.cpp:695
+#: src/gui/statuswindow.cpp:696
msgid "(5)"
msgstr "(4)"
-#: src/gui/statuswindow.cpp:698
+#: src/gui/statuswindow.cpp:699
msgid "(7)"
msgstr "(7)"
-#: src/gui/statuswindow.cpp:701 src/gui/statuswindow.cpp:753
-#: src/gui/statuswindow.cpp:808 src/gui/statuswindow.cpp:877
+#: src/gui/statuswindow.cpp:702 src/gui/statuswindow.cpp:754
+#: src/gui/statuswindow.cpp:809 src/gui/statuswindow.cpp:878
msgid "(A)"
msgstr "(A)"
-#: src/gui/statuswindow.cpp:714
+#: src/gui/statuswindow.cpp:715
msgid "(R)"
msgstr "(R)"
-#: src/gui/statuswindow.cpp:717
+#: src/gui/statuswindow.cpp:718
msgid "(M)"
msgstr "(M)"
-#: src/gui/statuswindow.cpp:720
+#: src/gui/statuswindow.cpp:721
msgid "(P)"
msgstr "(P)"
-#: src/gui/statuswindow.cpp:734
+#: src/gui/statuswindow.cpp:735
msgid "(s)"
msgstr "(s)"
-#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:790
+#: src/gui/statuswindow.cpp:738 src/gui/statuswindow.cpp:791
msgid "(S)"
msgstr "(S)"
-#: src/gui/statuswindow.cpp:750 src/gui/statuswindow.cpp:805
-#: src/gui/statuswindow.cpp:858
+#: src/gui/statuswindow.cpp:751 src/gui/statuswindow.cpp:806
+#: src/gui/statuswindow.cpp:859
msgid "(G)"
msgstr "(G)"
-#: src/gui/statuswindow.cpp:766
+#: src/gui/statuswindow.cpp:767
msgid "(f)"
msgstr "(f)"
-#: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:796
-#: src/gui/statuswindow.cpp:861
+#: src/gui/statuswindow.cpp:776 src/gui/statuswindow.cpp:797
+#: src/gui/statuswindow.cpp:862
msgid "(F)"
msgstr "(F)"
-#: src/gui/statuswindow.cpp:778 src/gui/statuswindow.cpp:828
+#: src/gui/statuswindow.cpp:779 src/gui/statuswindow.cpp:829
msgid "(U)"
msgstr "(U)"
-#: src/gui/statuswindow.cpp:802
+#: src/gui/statuswindow.cpp:803
msgid "(g)"
msgstr "(g)"
-#: src/gui/statuswindow.cpp:819
+#: src/gui/statuswindow.cpp:820
msgid "(N)"
msgstr "(N)"
-#: src/gui/statuswindow.cpp:825
+#: src/gui/statuswindow.cpp:826
msgid "(u)"
msgstr "(u)"
-#: src/gui/statuswindow.cpp:831
+#: src/gui/statuswindow.cpp:832
msgid "(e)"
msgstr "(e)"
-#: src/gui/statuswindow.cpp:834
+#: src/gui/statuswindow.cpp:835
msgid "(b)"
msgstr "(b)"
-#: src/gui/statuswindow.cpp:848 src/gui/statuswindow.cpp:874
+#: src/gui/statuswindow.cpp:849 src/gui/statuswindow.cpp:875
msgid "(O)"
msgstr "(O)"
@@ -3232,24 +3261,24 @@ msgstr "Aceitou. Aguarde..."
msgid "Trade: You"
msgstr "Negócio: você"
-#: src/gui/tradewindow.cpp:110 src/gui/tradewindow.cpp:166
+#: src/gui/tradewindow.cpp:111 src/gui/tradewindow.cpp:167
#, c-format
msgid "You get %s"
msgstr "Você pegou %s"
-#: src/gui/tradewindow.cpp:111
+#: src/gui/tradewindow.cpp:112
msgid "You give:"
msgstr "Você dá:"
-#: src/gui/tradewindow.cpp:115
+#: src/gui/tradewindow.cpp:116
msgid "Change"
msgstr "Mudar"
-#: src/gui/tradewindow.cpp:374
+#: src/gui/tradewindow.cpp:375
msgid "You don't have enough money."
msgstr "Você não tem dinheiro suficiente."
-#: src/gui/tradewindow.cpp:453
+#: src/gui/tradewindow.cpp:454
msgid "Failed adding item. You can not overlap one kind of item on the window."
msgstr ""
"Falha ao adicionar item. Você não pode duplicar este tipo de item na janela."
@@ -3259,33 +3288,33 @@ msgstr ""
msgid "Name: %s"
msgstr "Nome: %s"
-#: src/gui/updaterwindow.cpp:136
+#: src/gui/updaterwindow.cpp:138
msgid "Updating..."
msgstr "Atualizando..."
-#: src/gui/updaterwindow.cpp:155
+#: src/gui/updaterwindow.cpp:159
msgid "Connecting..."
msgstr "Conectando..."
-#: src/gui/updaterwindow.cpp:158
+#: src/gui/updaterwindow.cpp:162
msgid "Play"
msgstr "Jogar"
-#: src/gui/updaterwindow.cpp:556
+#: src/gui/updaterwindow.cpp:564
msgid "##1 The update process is incomplete."
msgstr "##1 O processo de update está incompleto."
#. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:558
+#: src/gui/updaterwindow.cpp:566
msgid "##1 It is strongly recommended that"
msgstr "##1 É altamente recomendado que"
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:560
+#: src/gui/updaterwindow.cpp:568
msgid "##1 you try again later."
msgstr "##1 tente novamente mais tarde."
-#: src/gui/updaterwindow.cpp:686
+#: src/gui/updaterwindow.cpp:744
msgid "Completed"
msgstr "Concluído"
@@ -3437,23 +3466,23 @@ msgstr "Borda do Lugar Inicial"
msgid "Road Point"
msgstr "Ponto de estrada"
-#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:471
+#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:472
msgid "Who Is Online - Updating"
msgstr "Quem está online - Atualizando"
-#: src/gui/whoisonline.cpp:101
+#: src/gui/whoisonline.cpp:102
msgid "Update"
msgstr "Atualizar"
-#: src/gui/whoisonline.cpp:294
+#: src/gui/whoisonline.cpp:295
msgid "Who Is Online - "
msgstr "Quem está online - "
-#: src/gui/whoisonline.cpp:485
+#: src/gui/whoisonline.cpp:486
msgid "Who Is Online - error"
msgstr "Quem está online - Erro"
-#: src/gui/whoisonline.cpp:516
+#: src/gui/whoisonline.cpp:517
msgid "Who Is Online - Update"
msgstr "Quem está online - Atualizado"
@@ -3518,7 +3547,8 @@ msgid "This command makes <nick> a channel operator."
msgstr "Tornar <nick> operador do canal."
#: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
-#: src/net/ea/gui/guildtab.cpp:69 src/net/ea/gui/partytab.cpp:85
+#: src/gui/widgets/guildchattab.cpp:61 src/net/ea/gui/guildtab.cpp:69
+#: src/net/ea/gui/partytab.cpp:85
msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
msgstr "Se <nick> possuir espaços, coloque entre aspas (\")."
@@ -3557,6 +3587,41 @@ msgstr "Anúncio geral de %s:"
msgid "%s whispers: %s"
msgstr "%s envia mensagem privada: %s"
+#: src/gui/widgets/guildchattab.cpp:59 src/net/ea/gui/guildtab.cpp:67
+#: src/net/ea/gui/partytab.cpp:83
+msgid "Command: /invite <nick>"
+msgstr "Comando: /invite <nick>"
+
+#: src/gui/widgets/guildchattab.cpp:60 src/net/ea/gui/guildtab.cpp:68
+msgid "This command invites <nick> to the guild you're in."
+msgstr "Este comando convida <nick> para a guilda em que você está."
+
+#: src/gui/widgets/guildchattab.cpp:66 src/net/ea/gui/guildtab.cpp:74
+#: src/net/ea/gui/partytab.cpp:90
+msgid "Command: /leave"
+msgstr "Comando: /leave"
+
+#: src/gui/widgets/guildchattab.cpp:67 src/net/ea/gui/guildtab.cpp:75
+msgid "This command causes the player to leave the guild."
+msgstr "Este comando faz com que o jogador saia da guilda."
+
+#: src/gui/widgets/guildchattab.cpp:109 src/net/ea/gui/guildtab.cpp:135
+#: src/net/ea/gui/partytab.cpp:69
+msgid "/help > Display this help."
+msgstr "/help > Exibe esta ajuda."
+
+#: src/gui/widgets/guildchattab.cpp:110 src/net/ea/gui/guildtab.cpp:136
+msgid "/invite > Invite a player to your guild"
+msgstr "/invite > Convida um jogador para a sua guilda"
+
+#: src/gui/widgets/guildchattab.cpp:111 src/net/ea/gui/guildtab.cpp:137
+msgid "/leave > Leave the guild you are in"
+msgstr "/leave > Sai da guilda em que você está"
+
+#: src/gui/widgets/guildchattab.cpp:112 src/net/ea/gui/guildtab.cpp:138
+msgid "/kick > Kick some one from the guild you are in"
+msgstr "/kick > Expulsa alguém da guilda em que você está"
+
#: src/gui/widgets/setupitem.cpp:271 src/gui/widgets/setupitem.cpp:394
msgid "Edit"
msgstr "Editar"
@@ -4089,68 +4154,68 @@ msgstr ""
"Conflito com as teclas \"%s\" e \"%s\" . Resolva o conflito para não "
"comprometer a jogabilidade."
-#: src/localplayer.cpp:372
+#: src/localplayer.cpp:370
msgid "You were killed by "
msgstr "Você foi morto por "
-#: src/localplayer.cpp:1403
+#: src/localplayer.cpp:1401
msgid "Tried to pick up nonexistent item."
msgstr "Você tentou pegar um item não existente."
-#: src/localplayer.cpp:1405
+#: src/localplayer.cpp:1403
msgid "Item is too heavy."
msgstr "Este item é muito pesado."
-#: src/localplayer.cpp:1407
+#: src/localplayer.cpp:1405
msgid "Item is too far away."
msgstr "Item está muito longe"
-#: src/localplayer.cpp:1409
+#: src/localplayer.cpp:1407
msgid "Inventory is full."
msgstr "O inventário está cheio."
-#: src/localplayer.cpp:1411
+#: src/localplayer.cpp:1409
msgid "Stack is too big."
msgstr "Esta pilha é muito grande."
-#: src/localplayer.cpp:1414
+#: src/localplayer.cpp:1412
msgid "Item belongs to someone else."
msgstr "Este item pertence a outra pessoa."
-#: src/localplayer.cpp:1417
+#: src/localplayer.cpp:1415
msgid "Unknown problem picking up item."
msgstr "Problema desconhecido ao tentar pegar item."
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1441
+#: src/localplayer.cpp:1439
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
msgstr[0] "Você pegou %d [@@%d|%s@@]."
msgstr[1] "Você pegou %d [@@%d|%s@@]."
-#: src/localplayer.cpp:3175
+#: src/localplayer.cpp:3173
msgid "Away"
msgstr "Indisponivel "
-#: src/localplayer.cpp:3476
+#: src/localplayer.cpp:3474
msgid "Follow: "
msgstr "Seguindo:"
-#: src/localplayer.cpp:3478 src/localplayer.cpp:3493
+#: src/localplayer.cpp:3476 src/localplayer.cpp:3491
msgid "Follow canceled"
msgstr "Seguir cancelado"
-#: src/localplayer.cpp:3485
+#: src/localplayer.cpp:3483
msgid "Imitation: "
msgstr "Imitando:"
-#: src/localplayer.cpp:3487 src/localplayer.cpp:3495
+#: src/localplayer.cpp:3485 src/localplayer.cpp:3493
msgid "Imitation canceled"
msgstr "Imitação cancelada"
-#: src/localplayer.cpp:3847
+#: src/localplayer.cpp:3845
msgid "You see "
msgstr "Você vê "
@@ -4330,28 +4395,28 @@ msgstr "Personagem deletado."
msgid "Failed to delete character."
msgstr "Falha ao deletar personagem."
-#: src/net/ea/chathandler.cpp:60 src/net/ea/chathandler.cpp:66
-#: src/net/ea/chathandler.cpp:71 src/net/ea/chathandler.cpp:77
-#: src/net/ea/chathandler.cpp:82 src/net/ea/chathandler.cpp:88
-#: src/net/ea/chathandler.cpp:95 src/net/ea/chathandler.cpp:101
+#: src/net/ea/chathandler.cpp:61 src/net/ea/chathandler.cpp:67
+#: src/net/ea/chathandler.cpp:72 src/net/ea/chathandler.cpp:78
+#: src/net/ea/chathandler.cpp:83 src/net/ea/chathandler.cpp:89
+#: src/net/ea/chathandler.cpp:96 src/net/ea/chathandler.cpp:102
msgid "Channels are not supported!"
msgstr "Não há suporte para canais!"
-#: src/net/ea/chathandler.cpp:128
+#: src/net/ea/chathandler.cpp:129
#, c-format
msgid "Whisper could not be sent, %s is offline."
msgstr "Mensagem privada não pode ser enviada, %s está offline."
-#: src/net/ea/chathandler.cpp:136
+#: src/net/ea/chathandler.cpp:137
#, c-format
msgid "Whisper could not be sent, ignored by %s."
msgstr "Mensagem privada não pode ser enviada, ignorado por %s."
-#: src/net/ea/chathandler.cpp:348
+#: src/net/ea/chathandler.cpp:355
msgid "MVP player."
msgstr "Jogador VIP."
-#: src/net/ea/chathandler.cpp:352
+#: src/net/ea/chathandler.cpp:359
msgid "MVP player: "
msgstr "Jogador VIP: "
@@ -4368,38 +4433,6 @@ msgstr "Jogo"
msgid "Request to quit denied!"
msgstr "Requisição de saída negada!"
-#: src/net/ea/gui/guildtab.cpp:67 src/net/ea/gui/partytab.cpp:83
-msgid "Command: /invite <nick>"
-msgstr "Comando: /invite <nick>"
-
-#: src/net/ea/gui/guildtab.cpp:68
-msgid "This command invites <nick> to the guild you're in."
-msgstr "Este comando convida <nick> para a guilda em que você está."
-
-#: src/net/ea/gui/guildtab.cpp:74 src/net/ea/gui/partytab.cpp:90
-msgid "Command: /leave"
-msgstr "Comando: /leave"
-
-#: src/net/ea/gui/guildtab.cpp:75
-msgid "This command causes the player to leave the guild."
-msgstr "Este comando faz com que o jogador saia da guilda."
-
-#: src/net/ea/gui/guildtab.cpp:135 src/net/ea/gui/partytab.cpp:69
-msgid "/help > Display this help."
-msgstr "/help > Exibe esta ajuda."
-
-#: src/net/ea/gui/guildtab.cpp:136
-msgid "/invite > Invite a player to your guild"
-msgstr "/invite > Convida um jogador para a sua guilda"
-
-#: src/net/ea/gui/guildtab.cpp:137
-msgid "/leave > Leave the guild you are in"
-msgstr "/leave > Sai da guilda em que você está"
-
-#: src/net/ea/gui/guildtab.cpp:138
-msgid "/kick > Kick some one from the guild you are in"
-msgstr "/kick > Expulsa alguém da guilda em que você está"
-
#: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
msgid "Guild created."
msgstr "Guilda criada."
@@ -4416,85 +4449,81 @@ msgstr "Falha ao checar Emperium"
msgid "Unknown server response."
msgstr "Resposta do servidor desconhecida."
-#: src/net/ea/guildhandler.cpp:180
+#: src/net/ea/guildhandler.cpp:181
#, c-format
msgid "Guild name: %s"
msgstr "Nome Guilda: %s"
-#: src/net/ea/guildhandler.cpp:182
+#: src/net/ea/guildhandler.cpp:183
#, c-format
msgid "Guild master: %s"
msgstr "Mestre da guilda: %s"
-#: src/net/ea/guildhandler.cpp:184
+#: src/net/ea/guildhandler.cpp:185
#, c-format
msgid "Guild level: %d"
msgstr "Nível Guilda: %d"
-#: src/net/ea/guildhandler.cpp:186
+#: src/net/ea/guildhandler.cpp:187
#, c-format
msgid "Online members: %d"
msgstr "Membros Online: %d"
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:189
#, c-format
msgid "Max members: %d"
msgstr "Max Membros: %d"
-#: src/net/ea/guildhandler.cpp:190
+#: src/net/ea/guildhandler.cpp:191
#, c-format
msgid "Average level: %d"
msgstr "Nível médio: %d"
-#: src/net/ea/guildhandler.cpp:192
+#: src/net/ea/guildhandler.cpp:193
#, c-format
msgid "Guild exp: %d"
msgstr "Guilda exp: %d"
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:195
#, c-format
msgid "Guild next exp: %d"
msgstr "Guilda prox. exp: %d"
-#: src/net/ea/guildhandler.cpp:196
+#: src/net/ea/guildhandler.cpp:197
#, c-format
msgid "Guild castle: %s"
msgstr "Castelo Guilda : %s"
-#: src/net/ea/guildhandler.cpp:402
+#: src/net/ea/guildhandler.cpp:403
msgid "Could not inivte user to guild."
msgstr "Não foi possível convidar jogador para a guilda."
-#: src/net/ea/guildhandler.cpp:406
+#: src/net/ea/guildhandler.cpp:407
msgid "User rejected guild invite."
msgstr "O jogador rejeitou o convite."
-#: src/net/ea/guildhandler.cpp:410
+#: src/net/ea/guildhandler.cpp:411
msgid "User is now part of your guild."
msgstr "Usuário agora é um membro da sua guilda."
-#: src/net/ea/guildhandler.cpp:414
+#: src/net/ea/guildhandler.cpp:415
msgid "Your guild is full."
msgstr "Sua guilda está cheia."
-#: src/net/ea/guildhandler.cpp:418
+#: src/net/ea/guildhandler.cpp:419
msgid "Unknown guild invite response."
msgstr "Resposta desconhecida de convite para guilda."
-#: src/net/ea/guildhandler.cpp:438
-msgid "You have left the guild."
-msgstr "Você saiu da Guilda."
-
-#: src/net/ea/guildhandler.cpp:452
+#: src/net/ea/guildhandler.cpp:453
#, c-format
msgid "%s has left your guild."
msgstr "%s saiu de sua Guilda."
-#: src/net/ea/guildhandler.cpp:483
+#: src/net/ea/guildhandler.cpp:484
msgid "You was kicked from guild."
msgstr "Você foi expulso da Guilda."
-#: src/net/ea/guildhandler.cpp:496
+#: src/net/ea/guildhandler.cpp:497
#, c-format
msgid "%s has kicked from your guild."
msgstr "%s foi expulso da Guilda."
@@ -4727,12 +4756,12 @@ msgstr "QQQ resposta de convite desconhecida por %s."
msgid "You have left the party."
msgstr "Você saiu do grupo."
-#: src/net/ea/partyhandler.cpp:368
+#: src/net/ea/partyhandler.cpp:369
#, c-format
msgid "%s has left your party."
msgstr "%s saiu do seu grupo."
-#: src/net/ea/partyhandler.cpp:444
+#: src/net/ea/partyhandler.cpp:448
#, c-format
msgid "An unknown member tried to say: %s"
msgstr "Um membro desconhecido tentou dizer: %s"
@@ -4858,7 +4887,7 @@ msgid "You're pining for the fjords."
msgstr "Você foi desta para melhor."
#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
-#: src/net/ea/playerhandler.cpp:425
+#: src/net/ea/playerhandler.cpp:428
msgid "Message"
msgstr "Mensagem"
@@ -4875,21 +4904,21 @@ msgstr ""
"Você está carregando menos da metade de seu peso. Você vai recuperar-se "
"novamente."
-#: src/net/ea/playerhandler.cpp:451
+#: src/net/ea/playerhandler.cpp:454
#, c-format
msgid "You picked up %s."
msgstr "Você pegou %s."
-#: src/net/ea/playerhandler.cpp:457
+#: src/net/ea/playerhandler.cpp:460
#, c-format
msgid "You spent %s."
msgstr "Você gastou %s"
-#: src/net/ea/playerhandler.cpp:501
+#: src/net/ea/playerhandler.cpp:506
msgid "Cannot raise skill!"
msgstr "Impossível aumentar o atributo!"
-#: src/net/ea/playerhandler.cpp:618
+#: src/net/ea/playerhandler.cpp:624
msgid "Equip arrows first."
msgstr "Equipe as flechas primeiro."
@@ -5028,7 +5057,7 @@ msgstr "Negociação cancelada."
msgid "Trade completed."
msgstr "Negociação realizada."
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:258
msgid "Strength"
msgstr "Força"
@@ -5037,7 +5066,7 @@ msgstr "Força"
msgid "Strength %+.1f"
msgstr "Força %+.1f"
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:259
msgid "Agility"
msgstr "Agilidade"
@@ -5046,7 +5075,7 @@ msgstr "Agilidade"
msgid "Agility %+.1f"
msgstr "Agilidade %+.1f"
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:262
msgid "Dexterity"
msgstr "Destreza"
@@ -5055,7 +5084,7 @@ msgstr "Destreza"
msgid "Dexterity %+.1f"
msgstr "Destreza %+.1f"
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:260
msgid "Vitality"
msgstr "Vitalidade"
@@ -5064,7 +5093,7 @@ msgstr "Vitalidade"
msgid "Vitality %+.1f"
msgstr "Vitalidade %+.1f"
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:261
msgid "Intelligence"
msgstr "Inteligência"
@@ -5336,111 +5365,115 @@ msgstr "Não se pode vender durante uma negociação."
msgid "Unable to sell unsellable item."
msgstr "Não se pode vender este item."
-#: src/net/tmwa/generalhandler.cpp:109
+#: src/net/tmwa/generalhandler.cpp:108
#, c-format
msgid "Strength %+d"
msgstr "Força %+d"
-#: src/net/tmwa/generalhandler.cpp:110
+#: src/net/tmwa/generalhandler.cpp:109
#, c-format
msgid "Agility %+d"
msgstr "Agilidade %+d"
-#: src/net/tmwa/generalhandler.cpp:111
+#: src/net/tmwa/generalhandler.cpp:110
#, c-format
msgid "Vitality %+d"
msgstr "Vitalidade %+d"
-#: src/net/tmwa/generalhandler.cpp:112
+#: src/net/tmwa/generalhandler.cpp:111
#, c-format
msgid "Intelligence %+d"
msgstr "Inteligência %+d"
-#: src/net/tmwa/generalhandler.cpp:113
+#: src/net/tmwa/generalhandler.cpp:112
#, c-format
msgid "Dexterity %+d"
msgstr "Destreza %+d"
-#: src/net/tmwa/generalhandler.cpp:114
+#: src/net/tmwa/generalhandler.cpp:113
#, c-format
msgid "Luck %+d"
msgstr "Sorte %+d"
-#: src/net/tmwa/generalhandler.cpp:140
+#: src/net/tmwa/generalhandler.cpp:139
msgid "Authentication failed."
msgstr "Falha de autenticação."
-#: src/net/tmwa/generalhandler.cpp:143
+#: src/net/tmwa/generalhandler.cpp:142
msgid "No servers available."
msgstr "Servidores indisponíveis."
-#: src/net/tmwa/generalhandler.cpp:147
+#: src/net/tmwa/generalhandler.cpp:146
msgid "Someone else is trying to use this account."
msgstr "Outra pessoa está tentando utilizar esta conta."
-#: src/net/tmwa/generalhandler.cpp:150
+#: src/net/tmwa/generalhandler.cpp:149
msgid "This account is already logged in."
msgstr "Existe alguém conectado a esta conta."
-#: src/net/tmwa/generalhandler.cpp:153
+#: src/net/tmwa/generalhandler.cpp:152
msgid "Speed hack detected."
msgstr "Hack de velocidade detectado."
-#: src/net/tmwa/generalhandler.cpp:156
+#: src/net/tmwa/generalhandler.cpp:155
msgid "Duplicated login."
msgstr "Login duplicado."
-#: src/net/tmwa/generalhandler.cpp:159
+#: src/net/tmwa/generalhandler.cpp:158
msgid "Unknown connection error."
msgstr "Erro de conexão desconhecido."
-#: src/net/tmwa/generalhandler.cpp:232
+#: src/net/tmwa/generalhandler.cpp:231
msgid "Got disconnected from server!"
msgstr "Você foi desconectado do servidor!"
-#: src/net/tmwa/generalhandler.cpp:264
+#: src/net/tmwa/generalhandler.cpp:263
msgid "Luck"
msgstr "Sorte"
-#: src/net/tmwa/generalhandler.cpp:267
+#: src/net/tmwa/generalhandler.cpp:266
msgid "Defense"
msgstr "Defesa"
-#: src/net/tmwa/generalhandler.cpp:268
+#: src/net/tmwa/generalhandler.cpp:267
msgid "M.Attack"
msgstr "Atq. Mágico"
-#: src/net/tmwa/generalhandler.cpp:269
+#: src/net/tmwa/generalhandler.cpp:268
msgid "M.Defense"
msgstr "Def. Mágica"
-#: src/net/tmwa/generalhandler.cpp:271
+#: src/net/tmwa/generalhandler.cpp:270
#, no-c-format
msgid "% Accuracy"
msgstr "% Exatidão"
-#: src/net/tmwa/generalhandler.cpp:273
+#: src/net/tmwa/generalhandler.cpp:272
#, no-c-format
msgid "% Evade"
msgstr "% Evasão"
-#: src/net/tmwa/generalhandler.cpp:275
+#: src/net/tmwa/generalhandler.cpp:274
#, no-c-format
msgid "% Critical"
msgstr "% Críticos"
-#: src/net/tmwa/generalhandler.cpp:276
+#: src/net/tmwa/generalhandler.cpp:275
msgid "Attack Delay"
msgstr "Atraso de ataque"
-#: src/net/tmwa/generalhandler.cpp:278
+#: src/net/tmwa/generalhandler.cpp:277
msgid "Walk Delay"
msgstr "Atraso de movimento"
-#: src/net/tmwa/generalhandler.cpp:280
+#: src/net/tmwa/generalhandler.cpp:279
msgid "Attack Range"
msgstr "Atraso de alcance"
+#: src/net/tmwa/generalhandler.cpp:281
+msgid "Damage per sec."
+msgstr "Dano por seg."
+
#: src/net/tmwa/network.cpp:152
msgid "Empty address given to Network::connect()!"
msgstr "Endereço vazio enviado para Network::connect()!"
@@ -5474,31 +5507,31 @@ msgstr "Bolha '...' flutuante"
msgid "Floating bubble"
msgstr "Bolha Flutuante"
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:248
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:246
#: src/resources/monsterdb.cpp:84
msgid "unnamed"
msgstr "sem nome"
-#: src/resources/itemdb.cpp:65
+#: src/resources/itemdb.cpp:63
#, c-format
msgid "Attack %+d"
msgstr "Ataque %+d"
-#: src/resources/itemdb.cpp:66
+#: src/resources/itemdb.cpp:64
#, c-format
msgid "Defense %+d"
msgstr "Defesa %+d"
-#: src/resources/itemdb.cpp:67
+#: src/resources/itemdb.cpp:65
#, c-format
msgid "HP %+d"
msgstr "HP %+d"
-#: src/resources/itemdb.cpp:68
+#: src/resources/itemdb.cpp:66
#, c-format
msgid "MP %+d"
msgstr "MP %+d"
-#: src/resources/itemdb.cpp:171
+#: src/resources/itemdb.cpp:169
msgid "Unknown item"
msgstr "Item desconhecido"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index f7a2bf6a1..b27a872a4 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-20 17:42+0300\n"
-"PO-Revision-Date: 2011-08-18 15:20+0000\n"
+"POT-Creation-Date: 2011-09-02 18:27+0300\n"
+"PO-Revision-Date: 2011-09-02 19:00+0000\n"
"Last-Translator: freya <freya.df@gmail.com>\n"
"Language-Team: Portuguese (Brazilian) (http://www.transifex.net/projects/p/"
"manaplus/team/pt_BR/)\n"
@@ -26,119 +26,119 @@ msgstr ""
msgid "Visible on map"
msgstr "Mapa visivel "
-#: src/being.cpp:542
+#: src/being.cpp:549
msgid "dodge"
msgstr "desviou"
-#: src/being.cpp:542
+#: src/being.cpp:549
msgid "miss"
msgstr "errou"
#. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1514
+#: src/being.cpp:1529
msgid "A"
msgstr "A"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1519
+#: src/being.cpp:1534
msgid "I"
msgstr "I"
-#: src/client.cpp:826 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:831 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
msgid "Setup"
msgstr "Configurar"
-#: src/client.cpp:909
+#: src/client.cpp:914
msgid "Connecting to server"
msgstr "Conectando ao servidor"
-#: src/client.cpp:940
+#: src/client.cpp:945
msgid "Logging in"
msgstr "Efetuando login"
-#: src/client.cpp:973
+#: src/client.cpp:978
msgid "Entering game world"
msgstr "Entrando no domínio do jogo"
-#: src/client.cpp:1073
+#: src/client.cpp:1078
msgid "Requesting characters"
msgstr "Requisitando personagens"
-#: src/client.cpp:1104
+#: src/client.cpp:1109
msgid "Connecting to the game server"
msgstr "Conectando ao servidor do jogo"
-#: src/client.cpp:1114
+#: src/client.cpp:1119
msgid "Changing game servers"
msgstr "Mudando servidores do jogo"
-#: src/client.cpp:1151 src/client.cpp:1158 src/client.cpp:1293
+#: src/client.cpp:1156 src/client.cpp:1163 src/client.cpp:1298
#: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
-#: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:395
+#: src/gui/charcreatedialog.cpp:221 src/gui/charselectdialog.cpp:253
+#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
#: src/net/manaserv/charhandler.cpp:227
msgid "Error"
msgstr "Erro"
-#: src/client.cpp:1167
+#: src/client.cpp:1172
msgid "Requesting registration details"
msgstr "Requisitando detalhes do registro"
-#: src/client.cpp:1194
+#: src/client.cpp:1199
msgid "Password Change"
msgstr "Mudar senha"
-#: src/client.cpp:1195
+#: src/client.cpp:1200
msgid "Password changed successfully!"
msgstr "Senha modificada com sucesso!"
-#: src/client.cpp:1214
+#: src/client.cpp:1219
msgid "Email Change"
msgstr "Mudar email"
-#: src/client.cpp:1215
+#: src/client.cpp:1220
msgid "Email changed successfully!"
msgstr "Email modificado com sucesso!"
-#: src/client.cpp:1235
+#: src/client.cpp:1240
msgid "Unregister Successful"
msgstr "Registro cancelado com sucesso"
-#: src/client.cpp:1236
+#: src/client.cpp:1241
msgid "Farewell, come back any time..."
msgstr "Tchau, volte sempre..."
-#: src/client.cpp:1423 src/client.cpp:1453 src/client.cpp:1497
-#: src/client.cpp:1922 src/client.cpp:1929
+#: src/client.cpp:1428 src/client.cpp:1458 src/client.cpp:1502
+#: src/client.cpp:1927 src/client.cpp:1934
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%s não existe e não pode ser criado! Saindo."
-#: src/client.cpp:1628
+#: src/client.cpp:1633
#, c-format
msgid "Invalid update host: %s"
msgstr "Host de atualização inválido: %s"
-#: src/client.cpp:1662 src/client.cpp:1668
+#: src/client.cpp:1667 src/client.cpp:1673
msgid "Error creating updates directory!"
msgstr "Erro ao criar pasta de atualizações!"
-#: src/client.cpp:1689
+#: src/client.cpp:1694
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "Erro: %s não existe e não pode se criado! Saindo."
-#: src/commandhandler.cpp:301
+#: src/commandhandler.cpp:303
msgid "Unknown command."
msgstr "Comando desconhecido."
-#: src/commandhandler.cpp:401
+#: src/commandhandler.cpp:403
msgid "Cannot send empty whispers!"
msgstr "Não é possível enviar mensagens privadas vazias!"
-#: src/commandhandler.cpp:415
+#: src/commandhandler.cpp:417
#, c-format
msgid ""
"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -147,152 +147,152 @@ msgstr ""
"Não é possível criar uma aba de mensagem privada para o nick \"%s\"! Ou ela "
"já existe ou é você mesmo."
-#: src/commandhandler.cpp:435
+#: src/commandhandler.cpp:437
#, c-format
msgid "Requesting to join channel %s."
msgstr "Solicitando entrada no canal %s."
-#: src/commandhandler.cpp:451 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:453 src/net/ea/gui/partytab.cpp:125
msgid "Party name is missing."
msgstr "Falta o nome do grupo."
-#: src/commandhandler.cpp:462
+#: src/commandhandler.cpp:464
msgid "Guild name is missing."
msgstr "Falta o nome da guilda."
-#: src/commandhandler.cpp:475 src/commandhandler.cpp:582
-#: src/commandhandler.cpp:623 src/commandhandler.cpp:653
+#: src/commandhandler.cpp:477 src/commandhandler.cpp:589
+#: src/commandhandler.cpp:630 src/commandhandler.cpp:660
msgid "Please specify a name."
msgstr "Por favor, especifique um nome."
-#: src/commandhandler.cpp:516
+#: src/commandhandler.cpp:523
msgid "Return toggles chat."
msgstr "Enter alterna para o chat."
-#: src/commandhandler.cpp:516
+#: src/commandhandler.cpp:523
msgid "Message closes chat."
msgstr "A mensagem fecha o chat."
-#: src/commandhandler.cpp:527
+#: src/commandhandler.cpp:534
msgid "Return now toggles chat."
msgstr "Agora Enter alterna para o chat."
-#: src/commandhandler.cpp:533
+#: src/commandhandler.cpp:540
msgid "Message now closes chat."
msgstr "Agora a mensagem fecha o chat."
-#: src/commandhandler.cpp:561
+#: src/commandhandler.cpp:568
msgid "friend"
msgstr "amigo"
-#: src/commandhandler.cpp:566
+#: src/commandhandler.cpp:573
msgid "disregarded"
msgstr "ignorado"
-#: src/commandhandler.cpp:571
+#: src/commandhandler.cpp:578
msgid "neutral"
msgstr "neutro"
-#: src/commandhandler.cpp:590
+#: src/commandhandler.cpp:597
#, c-format
msgid "Player already %s!"
msgstr "Jogador já %s!"
-#: src/commandhandler.cpp:604
+#: src/commandhandler.cpp:611
#, c-format
msgid "Player successfully %s!"
msgstr "Jogador %s com sucesso!"
-#: src/commandhandler.cpp:612
+#: src/commandhandler.cpp:619
#, c-format
msgid "Player could not be %s!"
msgstr "Jogador não pode ser %s!"
-#: src/commandhandler.cpp:634
+#: src/commandhandler.cpp:641
msgid "Player wasn't ignored!"
msgstr "O jogador não estava ignorado!"
-#: src/commandhandler.cpp:641
+#: src/commandhandler.cpp:648
msgid "Player no longer ignored!"
msgstr "O jogador não está mais ignorado!"
-#: src/commandhandler.cpp:643
+#: src/commandhandler.cpp:650
msgid "Player could not be unignored!"
msgstr "Não foi possível deixar de ignorar o jogador!"
-#: src/commandhandler.cpp:660
+#: src/commandhandler.cpp:667
msgid "Player already erased!"
msgstr "Jogador já apagado!"
-#: src/commandhandler.cpp:671
+#: src/commandhandler.cpp:678
msgid "Player successfully erased!"
msgstr "Jogador apagado com sucesso!"
-#: src/commandhandler.cpp:673
+#: src/commandhandler.cpp:680
msgid "Player could not be erased!"
msgstr "Jogador não pode ser apagado!"
-#: src/commandhandler.cpp:972 src/commandhandler.cpp:1018
+#: src/commandhandler.cpp:980 src/commandhandler.cpp:1026
#, c-format
msgid "Client uptime: %s"
msgstr "Uptime do cliente: %s"
-#: src/commandhandler.cpp:982
+#: src/commandhandler.cpp:990
#, c-format
msgid "%d week"
msgid_plural "%d weeks"
msgstr[0] "%d semana"
msgstr[1] "%d semanas"
-#: src/commandhandler.cpp:991
+#: src/commandhandler.cpp:999
#, c-format
msgid "%d day"
msgid_plural "%d days"
msgstr[0] "%d dia"
msgstr[1] "%d dias"
-#: src/commandhandler.cpp:999
+#: src/commandhandler.cpp:1007
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] "%d hora"
msgstr[1] "%d horas"
-#: src/commandhandler.cpp:1007
+#: src/commandhandler.cpp:1015
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] "%d minuto"
msgstr[1] "%d minutos"
-#: src/commandhandler.cpp:1015
+#: src/commandhandler.cpp:1023
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
msgstr[0] "%d segundo"
msgstr[1] "%d segundos"
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1102
msgid "font cache size"
msgstr "Tamanho de fonte Cache"
-#: src/commandhandler.cpp:1106
+#: src/commandhandler.cpp:1114
msgid "Cache size:"
msgstr "Tamanho de cache:"
-#: src/commandhandler.cpp:1110
+#: src/commandhandler.cpp:1118
msgid "Created:"
msgstr "Criado:"
-#: src/commandhandler.cpp:1112
+#: src/commandhandler.cpp:1120
msgid "Deleted:"
msgstr "Deletado:"
-#: src/commandhandler.cpp:1159 src/commandhandler.cpp:1166
+#: src/commandhandler.cpp:1167 src/commandhandler.cpp:1174
msgid "Resource images:"
msgstr "Recursos de imagem:"
-#: src/commandhandler.cpp:1161 src/commandhandler.cpp:1168
+#: src/commandhandler.cpp:1169 src/commandhandler.cpp:1176
msgid "Resource orphaned images:"
msgstr "Recurso de imagem orfão:"
@@ -302,43 +302,43 @@ 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\"."
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:411
+#: src/game.cpp:252 src/gui/widgets/chattab.cpp:409
msgid "General"
msgstr "Geral"
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:413
+#: src/game.cpp:256 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:411
msgid "Debug"
msgstr "Depurador"
-#: src/game.cpp:488
+#: src/game.cpp:511
msgid "Screenshot saved as "
msgstr "Screenshot salva como "
-#: src/game.cpp:496
+#: src/game.cpp:519
msgid "Saving screenshot failed!"
msgstr "Falha ao salvar screenshot!"
-#: src/game.cpp:536
+#: src/game.cpp:559
msgid "The connection to the server was lost."
msgstr "A conexão com o servidor caiu."
-#: src/game.cpp:548
+#: src/game.cpp:571
msgid "Network Error"
msgstr "Erro de conexão"
-#: src/game.cpp:1213
+#: src/game.cpp:1236
msgid "Ignoring incoming trade requests"
msgstr "Ignorando propostas de negócios"
-#: src/game.cpp:1220
+#: src/game.cpp:1243
msgid "Accepting incoming trade requests"
msgstr "Aceitando propostas de negócios"
-#: src/game.cpp:1606
+#: src/game.cpp:1629
msgid "Could Not Load Map"
msgstr "Não foi possível carregar o mapa"
-#: src/game.cpp:1607
+#: src/game.cpp:1630
#, c-format
msgid "Error while loading %s"
msgstr "Erro ao carregar %s"
@@ -367,103 +367,103 @@ msgstr "Comentário: %s"
msgid "Bot Checker"
msgstr "Analizador de bot"
-#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
+#: src/gui/botcheckerwindow.cpp:295 src/gui/setup_relations.cpp:64
msgid "Name"
msgstr "Nome"
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:134
-#: src/gui/popupmenu.cpp:292 src/gui/popupmenu.cpp:617
-#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
+#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:133
+#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:646
+#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:265
msgid "Attack"
msgstr "Atacar"
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:279
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:297
#: src/keyboardconfig.cpp:62
msgid "Talk"
msgstr "Falar"
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:245
-#: src/gui/popupmenu.cpp:284 src/gui/popupmenu.cpp:674
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:263
+#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:703
msgid "Move"
msgstr "Mover"
-#: src/gui/botcheckerwindow.cpp:300
+#: src/gui/botcheckerwindow.cpp:299
msgid "Result"
msgstr "Resultado"
-#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123
+#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:124
msgid "Reset"
msgstr "Resetar"
-#: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:260
-#: src/gui/popupmenu.cpp:281 src/gui/popupmenu.cpp:688
+#: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:98
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:278
+#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:717
msgid "Buy"
msgstr "Comprar"
-#: src/gui/buydialog.cpp:88 src/gui/buydialog.cpp:302
-#: src/gui/selldialog.cpp:87 src/gui/selldialog.cpp:324
+#: src/gui/buydialog.cpp:89 src/gui/buydialog.cpp:303
+#: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
#, c-format
msgid "Price: %s / Total: %s"
msgstr "Preço: %s / Total: %s"
#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
#. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:93 src/gui/itemamountwindow.cpp:207
-#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:113
-#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:974
+#: src/gui/buydialog.cpp:94 src/gui/itemamountwindow.cpp:207
+#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:973
msgid "+"
msgstr "+"
#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
#. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:96 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:986
+#: src/gui/buydialog.cpp:97 src/gui/itemamountwindow.cpp:206
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:985
msgid "-"
msgstr "-"
-#: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
-#: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
-#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:288
+#: src/gui/buydialog.cpp:99 src/gui/quitdialog.cpp:47
+#: src/gui/quitdialog.cpp:49 src/gui/quitdialog.cpp:50
+#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:294
#: src/keyboardconfig.cpp:290
msgid "Quit"
msgstr "Sair"
-#: src/gui/buydialog.cpp:99 src/gui/selldialog.cpp:94
-#: src/gui/statuswindow.cpp:503 src/gui/statuswindow.cpp:552
-#: src/gui/statuswindow.cpp:973 src/gui/statuswindow.cpp:1004
+#: src/gui/buydialog.cpp:100 src/gui/selldialog.cpp:95
+#: src/gui/statuswindow.cpp:504 src/gui/statuswindow.cpp:553
+#: src/gui/statuswindow.cpp:972 src/gui/statuswindow.cpp:1003
msgid "Max"
msgstr "Máximo"
#: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:133
+#: src/gui/inventorywindow.cpp:147 src/gui/setup_other.cpp:133
msgid "Shop"
msgstr "Loja"
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:262
-#: src/gui/popupmenu.cpp:282 src/gui/popupmenu.cpp:690
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:280
+#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:719
#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
-#: src/gui/selldialog.cpp:92
+#: src/gui/selldialog.cpp:93
msgid "Sell"
msgstr "Vender"
#: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
-#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
+#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:96
#: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:336
-#: src/gui/popupmenu.cpp:357 src/gui/popupmenu.cpp:460
-#: src/gui/popupmenu.cpp:487 src/gui/popupmenu.cpp:511
-#: src/gui/popupmenu.cpp:525 src/gui/popupmenu.cpp:544
-#: src/gui/popupmenu.cpp:750 src/gui/popupmenu.cpp:774
-#: src/gui/popupmenu.cpp:1684 src/gui/popupmenu.cpp:1712
-#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1811
-#: src/gui/popupmenu.cpp:1846 src/gui/popupmenu.cpp:1886
-#: src/gui/popupmenu.cpp:1953 src/gui/popupmenu.cpp:1973
-#: src/gui/quitdialog.cpp:59 src/gui/register.cpp:82 src/gui/setup.cpp:71
-#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:354
+#: src/gui/popupmenu.cpp:375 src/gui/popupmenu.cpp:489
+#: src/gui/popupmenu.cpp:516 src/gui/popupmenu.cpp:540
+#: src/gui/popupmenu.cpp:554 src/gui/popupmenu.cpp:573
+#: src/gui/popupmenu.cpp:790 src/gui/popupmenu.cpp:814
+#: src/gui/popupmenu.cpp:1734 src/gui/popupmenu.cpp:1762
+#: src/gui/popupmenu.cpp:1818 src/gui/popupmenu.cpp:1861
+#: src/gui/popupmenu.cpp:1896 src/gui/popupmenu.cpp:1936
+#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2023
+#: src/gui/quitdialog.cpp:54 src/gui/register.cpp:82 src/gui/setup.cpp:72
+#: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:238
#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updaterwindow.cpp:157
+#: src/gui/updaterwindow.cpp:161
msgid "Cancel"
msgstr "Cancelar"
@@ -495,7 +495,7 @@ msgid "The email address entries mismatch."
msgstr "Os emails informados não são iguais."
#: src/gui/changepassworddialog.cpp:50 src/gui/changepassworddialog.cpp:59
-#: src/gui/charselectdialog.cpp:140
+#: src/gui/charselectdialog.cpp:139
msgid "Change Password"
msgstr "Alterar senha"
@@ -530,121 +530,121 @@ msgstr "As novas senhas não são iguais."
msgid "Create Character"
msgstr "Criar Personagem"
-#: src/gui/charcreatedialog.cpp:73 src/gui/logindialog.cpp:94
+#: src/gui/charcreatedialog.cpp:76 src/gui/logindialog.cpp:94
#: src/gui/register.cpp:75
msgid "Name:"
msgstr "Nome:"
#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
#. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:76 src/gui/charcreatedialog.cpp:81
-#: src/gui/charcreatedialog.cpp:87 src/gui/outfitwindow.cpp:81
+#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:84
+#: src/gui/charcreatedialog.cpp:90 src/gui/outfitwindow.cpp:85
msgid ">"
msgstr ">"
#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
#. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:82
-#: src/gui/charcreatedialog.cpp:88 src/gui/outfitwindow.cpp:80
+#: src/gui/charcreatedialog.cpp:82 src/gui/charcreatedialog.cpp:85
+#: src/gui/charcreatedialog.cpp:91 src/gui/outfitwindow.cpp:84
msgid "<"
msgstr "<"
-#: src/gui/charcreatedialog.cpp:80
+#: src/gui/charcreatedialog.cpp:83
msgid "Hair color:"
msgstr "Cor do Cabelo:"
-#: src/gui/charcreatedialog.cpp:83
+#: src/gui/charcreatedialog.cpp:86
msgid "Hair style:"
msgstr "Estilo do Cabelo:"
-#: src/gui/charcreatedialog.cpp:89
+#: src/gui/charcreatedialog.cpp:92
msgid "Race:"
msgstr "Corrida:"
-#: src/gui/charcreatedialog.cpp:92 src/gui/charselectdialog.cpp:479
-#: src/gui/socialwindow.cpp:1033
+#: src/gui/charcreatedialog.cpp:95 src/gui/charselectdialog.cpp:478
+#: src/gui/socialwindow.cpp:1139
msgid "Create"
msgstr "Criar"
-#: src/gui/charcreatedialog.cpp:94 src/gui/register.cpp:98
+#: src/gui/charcreatedialog.cpp:97 src/gui/register.cpp:98
msgid "Male"
msgstr "Homem"
-#: src/gui/charcreatedialog.cpp:95 src/gui/register.cpp:99
+#: src/gui/charcreatedialog.cpp:98 src/gui/register.cpp:99
msgid "Female"
msgstr "Mulher"
-#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:300
+#: src/gui/charcreatedialog.cpp:116 src/gui/charcreatedialog.cpp:303
#, c-format
msgid "Please distribute %d points"
msgstr "Por favor distribua %d pontos"
-#: src/gui/charcreatedialog.cpp:219
+#: src/gui/charcreatedialog.cpp:222
msgid "Your name needs to be at least 4 characters."
msgstr "Seu nome deve ter pelo menos 4 caracteres."
-#: src/gui/charcreatedialog.cpp:291
+#: src/gui/charcreatedialog.cpp:294
msgid "Character stats OK"
msgstr "Atributos do personagem OK"
-#: src/gui/charcreatedialog.cpp:305
+#: src/gui/charcreatedialog.cpp:308
#, c-format
msgid "Please remove %d points"
msgstr "Por favor remova %d pontos"
-#: src/gui/charselectdialog.cpp:77
+#: src/gui/charselectdialog.cpp:76
msgid "Confirm Character Delete"
msgstr "Confimar exclusão do personagem"
-#: src/gui/charselectdialog.cpp:78
+#: src/gui/charselectdialog.cpp:77
msgid "Are you sure you want to delete this character?"
msgstr "Tem certeza que deseja excluir este personagem?"
-#: src/gui/charselectdialog.cpp:126
+#: src/gui/charselectdialog.cpp:125
msgid "Account and Character Management"
msgstr "Gerenciamento de Conta e Personagem"
-#: src/gui/charselectdialog.cpp:139
+#: src/gui/charselectdialog.cpp:138
msgid "Switch Login"
msgstr "Trocar Login"
-#: src/gui/charselectdialog.cpp:153 src/gui/unregisterdialog.cpp:50
+#: src/gui/charselectdialog.cpp:152 src/gui/unregisterdialog.cpp:50
#: src/gui/unregisterdialog.cpp:58
msgid "Unregister"
msgstr "Cancelar Registro"
-#: src/gui/charselectdialog.cpp:162
+#: src/gui/charselectdialog.cpp:161
msgid "Change Email"
msgstr "Alterar email"
-#: src/gui/charselectdialog.cpp:254
+#: src/gui/charselectdialog.cpp:253
msgid "Incorrect password"
msgstr "Senha incorreta"
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:286
msgid "Enter password for deleting character"
msgstr "Entre com a senha para apagar o personagem"
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:286
msgid "Enter password:"
msgstr "Entre com a senha:"
-#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:292
-#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
-#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
+#: src/gui/charselectdialog.cpp:408 src/gui/serverdialog.cpp:298
+#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:122
+#: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:241
msgid "Delete"
msgstr "Excluir"
-#: src/gui/charselectdialog.cpp:467
+#: src/gui/charselectdialog.cpp:466
msgid "Choose"
msgstr "Escolher"
-#: src/gui/charselectdialog.cpp:470
+#: src/gui/charselectdialog.cpp:469
#, c-format
msgid "Level %d"
msgstr "Nível %d"
-#: src/gui/charselectdialog.cpp:481 src/gui/charselectdialog.cpp:482
+#: src/gui/charselectdialog.cpp:480 src/gui/charselectdialog.cpp:481
msgid "(empty)"
msgstr "(vazio)"
@@ -716,12 +716,12 @@ msgstr "???"
msgid "Chat"
msgstr "Chat"
-#: src/gui/chatwindow.cpp:606
+#: src/gui/chatwindow.cpp:609
#, c-format
msgid "Present: %s; %d players are present."
msgstr "Presentes: %s; %d jogadores estão presentes."
-#: src/gui/chatwindow.cpp:993
+#: src/gui/chatwindow.cpp:996
#, c-format
msgid "Whispering to %s: %s"
msgstr "Enviando MP para %s: %s"
@@ -734,145 +734,145 @@ msgstr "Sim"
msgid "No"
msgstr "Não"
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:150
-#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:384
-#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:632
-#: src/gui/popupmenu.cpp:640
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:149
+#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:402
+#: src/gui/popupmenu.cpp:408 src/gui/popupmenu.cpp:661
+#: src/gui/popupmenu.cpp:669
msgid "Ignore"
msgstr "Ignora"
-#: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
+#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:97
#: src/gui/setup_other.cpp:64
msgid "Map"
msgstr "Mapa"
-#: src/gui/debugwindow.cpp:71
+#: src/gui/debugwindow.cpp:73
msgid "Target"
msgstr "Alvo"
-#: src/gui/debugwindow.cpp:72
+#: src/gui/debugwindow.cpp:74
msgid "Net"
msgstr "Rede"
-#: src/gui/debugwindow.cpp:145 src/gui/debugwindow.cpp:220
-#: src/gui/debugwindow.cpp:249
+#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
+#: src/gui/debugwindow.cpp:251
msgid "Music:"
msgstr "Música:"
-#: src/gui/debugwindow.cpp:146 src/gui/debugwindow.cpp:224
-#: src/gui/debugwindow.cpp:251
+#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:226
+#: src/gui/debugwindow.cpp:253
msgid "Map:"
msgstr "Mapa:"
-#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
-#: src/gui/debugwindow.cpp:250
+#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:224
+#: src/gui/debugwindow.cpp:252
msgid "Minimap:"
msgstr "Minimapa:"
-#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:218
-#: src/gui/debugwindow.cpp:247
+#: src/gui/debugwindow.cpp:150 src/gui/debugwindow.cpp:220
+#: src/gui/debugwindow.cpp:249
msgid "Cursor:"
msgstr "Cursor:"
-#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:201
-#: src/gui/debugwindow.cpp:206
+#: src/gui/debugwindow.cpp:151 src/gui/debugwindow.cpp:203
+#: src/gui/debugwindow.cpp:208
msgid "Player Position:"
msgstr "Sua posição:"
-#: src/gui/debugwindow.cpp:152
+#: src/gui/debugwindow.cpp:154
msgid "Particle count:"
msgstr "Contador de particulas:"
-#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:235
-#: src/gui/debugwindow.cpp:254
+#: src/gui/debugwindow.cpp:156 src/gui/debugwindow.cpp:237
+#: src/gui/debugwindow.cpp:256
msgid "Map actors count:"
msgstr "Jogadores no mapa:"
-#: src/gui/debugwindow.cpp:162 src/gui/debugwindow.cpp:173
+#: src/gui/debugwindow.cpp:164 src/gui/debugwindow.cpp:175
#, c-format
msgid "%d FPS (Software)"
msgstr "%d FPS (software)"
-#: src/gui/debugwindow.cpp:166
+#: src/gui/debugwindow.cpp:168
#, c-format
msgid "%d FPS (fast OpenGL)"
msgstr "%d FPS (rápido OpenGL)"
-#: src/gui/debugwindow.cpp:169
+#: src/gui/debugwindow.cpp:171
#, c-format
msgid "%d FPS (old OpenGL)"
msgstr "%d FPS (velho OpenGL)"
-#: src/gui/debugwindow.cpp:176
+#: src/gui/debugwindow.cpp:178
#, c-format
msgid "%d FPS"
msgstr "%d FPS"
-#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:240
+#: src/gui/debugwindow.cpp:190 src/gui/debugwindow.cpp:242
msgid "Textures count:"
msgstr "Contador de texturas:"
-#: src/gui/debugwindow.cpp:231
+#: src/gui/debugwindow.cpp:233
#, c-format
msgid "Particle count: %d"
msgstr "Contagem de partículas: %d"
-#: src/gui/debugwindow.cpp:268 src/gui/debugwindow.cpp:299
-#: src/gui/debugwindow.cpp:343
+#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:301
+#: src/gui/debugwindow.cpp:345
msgid "Target:"
msgstr "Alvo:"
-#: src/gui/debugwindow.cpp:269 src/gui/debugwindow.cpp:304
-#: src/gui/debugwindow.cpp:344
+#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:306
+#: src/gui/debugwindow.cpp:346
msgid "Target Id:"
msgstr "ID do alvo:"
-#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:308
-#: src/gui/debugwindow.cpp:313 src/gui/debugwindow.cpp:345
+#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:310
+#: src/gui/debugwindow.cpp:315 src/gui/debugwindow.cpp:347
msgid "Target Level:"
msgstr "Nível do alvo:"
-#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:316
-#: src/gui/debugwindow.cpp:346
+#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:318
+#: src/gui/debugwindow.cpp:348
msgid "Target Party:"
msgstr "Grupo do alvo:"
-#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:319
-#: src/gui/debugwindow.cpp:347
+#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:321
+#: src/gui/debugwindow.cpp:349
msgid "Target Guild:"
msgstr "Guilda do alvo:"
-#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:333
-#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:348
+#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:335
+#: src/gui/debugwindow.cpp:340 src/gui/debugwindow.cpp:350
msgid "Attack delay:"
msgstr "Atarso de ataque:"
-#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:323
-#: src/gui/debugwindow.cpp:349
+#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:325
+#: src/gui/debugwindow.cpp:351
msgid "Minimal hit:"
msgstr "Hit minimo:"
-#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:325
-#: src/gui/debugwindow.cpp:350
+#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:327
+#: src/gui/debugwindow.cpp:352
msgid "Maximum hit:"
msgstr "Hit máximo:"
-#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:327
-#: src/gui/debugwindow.cpp:351
+#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:329
+#: src/gui/debugwindow.cpp:353
msgid "Critical hit:"
msgstr "Hit crítico:"
-#: src/gui/debugwindow.cpp:385 src/gui/debugwindow.cpp:390
+#: src/gui/debugwindow.cpp:387 src/gui/debugwindow.cpp:392
#, c-format
msgid "Ping: %s ms"
msgstr "Ping: %s ms"
-#: src/gui/debugwindow.cpp:393
+#: src/gui/debugwindow.cpp:395
#, c-format
msgid "In: %d bytes/s"
msgstr "Entrada: %d bytes/s"
-#: src/gui/debugwindow.cpp:395
+#: src/gui/debugwindow.cpp:397
#, c-format
msgid "Out: %d bytes/s"
msgstr "Saída: %d bytes/s"
@@ -881,26 +881,26 @@ msgstr "Saída: %d bytes/s"
msgid "Did You Know?"
msgstr "Você Sabia?"
-#: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
-#: src/gui/inventorywindow.cpp:175 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:559 src/gui/shopwindow.cpp:111
+#: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
+#: src/gui/inventorywindow.cpp:176 src/gui/npcdialog.cpp:53
+#: src/gui/popupmenu.cpp:588 src/gui/shopwindow.cpp:113
msgid "Close"
msgstr "Fechar"
-#: src/gui/didyouknowwindow.cpp:62
+#: src/gui/didyouknowwindow.cpp:64
msgid "< Previous"
msgstr "< Anterior"
-#: src/gui/didyouknowwindow.cpp:63
+#: src/gui/didyouknowwindow.cpp:65
msgid "Next >"
msgstr "Próximo >"
-#: src/gui/didyouknowwindow.cpp:64
+#: src/gui/didyouknowwindow.cpp:66
msgid "Auto open this window"
msgstr "Auto abrir esta janela"
#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:58 src/gui/textdialog.cpp:50
+#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:53 src/gui/textdialog.cpp:50
msgid "OK"
msgstr "OK"
@@ -908,10 +908,10 @@ msgstr "OK"
msgid "Equipment"
msgstr "Equipamento"
-#: src/gui/equipmentwindow.cpp:93 src/gui/inventorywindow.cpp:130
-#: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
-#: src/gui/popupmenu.cpp:1643 src/gui/popupmenu.cpp:1738
-#: src/gui/popupmenu.cpp:1783
+#: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:131
+#: src/gui/inventorywindow.cpp:512 src/gui/inventorywindow.cpp:521
+#: src/gui/popupmenu.cpp:1693 src/gui/popupmenu.cpp:1788
+#: src/gui/popupmenu.cpp:1833
msgid "Unequip"
msgstr "Desequipar"
@@ -924,75 +924,75 @@ msgstr "Ajuda"
msgid "Inventory"
msgstr "Inventário"
-#: src/gui/inventorywindow.cpp:104
+#: src/gui/inventorywindow.cpp:105
msgid "Slots:"
msgstr "Slots:"
-#: src/gui/inventorywindow.cpp:115
+#: src/gui/inventorywindow.cpp:116
msgid "Filter:"
msgstr "Filtro:"
-#: src/gui/inventorywindow.cpp:116
+#: src/gui/inventorywindow.cpp:117
msgid "Sort:"
msgstr "Classificar"
-#: src/gui/inventorywindow.cpp:122
+#: src/gui/inventorywindow.cpp:123
msgid "na"
msgstr "na"
-#: src/gui/inventorywindow.cpp:123
+#: src/gui/inventorywindow.cpp:124
msgid "az"
msgstr "az"
-#: src/gui/inventorywindow.cpp:124
+#: src/gui/inventorywindow.cpp:125
msgid "id"
msgstr "id"
-#: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:513
-#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1645
-#: src/gui/popupmenu.cpp:1740 src/gui/popupmenu.cpp:1785
+#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
+#: src/gui/inventorywindow.cpp:523 src/gui/popupmenu.cpp:1695
+#: src/gui/popupmenu.cpp:1790 src/gui/popupmenu.cpp:1835
msgid "Equip"
msgstr "Equipar"
-#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
-#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1648
-#: src/gui/popupmenu.cpp:1707 src/gui/popupmenu.cpp:1744
-#: src/gui/popupmenu.cpp:1788
+#: src/gui/inventorywindow.cpp:130 src/gui/inventorywindow.cpp:515
+#: src/gui/inventorywindow.cpp:519 src/gui/popupmenu.cpp:1698
+#: src/gui/popupmenu.cpp:1757 src/gui/popupmenu.cpp:1794
+#: src/gui/popupmenu.cpp:1838
msgid "Use"
msgstr "Usar"
-#: src/gui/inventorywindow.cpp:143 src/gui/inventorywindow.cpp:619
-#: src/gui/popupmenu.cpp:1652 src/gui/popupmenu.cpp:1749
-#: src/gui/popupmenu.cpp:1792
+#: src/gui/inventorywindow.cpp:144 src/gui/inventorywindow.cpp:620
+#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1799
+#: src/gui/popupmenu.cpp:1842
msgid "Drop..."
msgstr "Descartar..."
-#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1661
-#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1801
+#: src/gui/inventorywindow.cpp:145 src/gui/popupmenu.cpp:1711
+#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1851
msgid "Split"
msgstr "Dividir"
-#: src/gui/inventorywindow.cpp:145 src/gui/outfitwindow.cpp:59
-#: src/gui/popupmenu.cpp:520
+#: src/gui/inventorywindow.cpp:146 src/gui/outfitwindow.cpp:60
+#: src/gui/popupmenu.cpp:549
msgid "Outfits"
msgstr "Roupas"
-#: src/gui/inventorywindow.cpp:148
+#: src/gui/inventorywindow.cpp:149
msgid "Weight:"
msgstr "Peso:"
-#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
-#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
-#: src/gui/popupmenu.cpp:1804 src/gui/setup.cpp:72
+#: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:611
+#: src/gui/popupmenu.cpp:1674 src/gui/popupmenu.cpp:1811
+#: src/gui/popupmenu.cpp:1854 src/gui/setup.cpp:73
msgid "Store"
msgstr "Armazenar"
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1668
+#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1718
msgid "Retrieve"
msgstr "Retirar"
-#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1657
-#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1797
+#: src/gui/inventorywindow.cpp:622 src/gui/popupmenu.cpp:1707
+#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1847
#: src/gui/windowmenu.cpp:97
msgid "Drop"
msgstr "Descartar"
@@ -1033,11 +1033,11 @@ msgstr "Adicionar na loja de venda"
msgid "Unknown."
msgstr "Desconhecido"
-#: src/gui/itempopup.cpp:176 src/gui/itempopup.cpp:182
+#: src/gui/itempopup.cpp:177 src/gui/itempopup.cpp:183
msgid ", "
msgstr ", "
-#: src/gui/itempopup.cpp:192
+#: src/gui/itempopup.cpp:193
#, c-format
msgid "Weight: %s"
msgstr "Peso: %s"
@@ -1046,90 +1046,94 @@ msgstr "Peso: %s"
msgid "Kill stats"
msgstr "Estatísticas"
-#: src/gui/killstats.cpp:64
+#: src/gui/killstats.cpp:65
msgid "Reset stats"
msgstr "Resetar Status"
-#: src/gui/killstats.cpp:65
+#: src/gui/killstats.cpp:66
msgid "Reset timer"
msgstr "Resetar tempo"
-#: src/gui/killstats.cpp:69 src/gui/killstats.cpp:205
+#: src/gui/killstats.cpp:70 src/gui/killstats.cpp:206
#, c-format
msgid "Level: %d at %f%%"
msgstr "Nível: %d em %f%%"
-#: src/gui/killstats.cpp:73 src/gui/killstats.cpp:210
+#: src/gui/killstats.cpp:74 src/gui/killstats.cpp:211
#, c-format
msgid "Exp: %d/%d Left: %d"
msgstr "Exp: %d%d Falta: %d"
-#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:216
-#: src/gui/killstats.cpp:225
+#: src/gui/killstats.cpp:77 src/gui/killstats.cpp:217
+#: src/gui/killstats.cpp:226
#, c-format
msgid "1%% = %d exp, avg mob for 1%%: %s"
msgstr "1%% = %d ex, avg mob por 1%%: %s"
-#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:142
-#: src/gui/killstats.cpp:234
+#: src/gui/killstats.cpp:80 src/gui/killstats.cpp:143
+#: src/gui/killstats.cpp:235
#, c-format
msgid "Kills: %s, total exp: %s"
msgstr "Mortes: %s Total exp: %s"
-#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
-#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:230
+#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145
+#: src/gui/killstats.cpp:221 src/gui/killstats.cpp:231
#, c-format
msgid "Avg Exp: %s, No. of avg mob to next level: %s"
msgstr "Avg Exp: %s No. de avg mob para próximo nível: %s"
-#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:162
-#: src/gui/killstats.cpp:237
+#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:163
+#: src/gui/killstats.cpp:238
#, c-format
msgid "Kills/Min: %s, Exp/Min: %s"
msgstr "Mortes/Min: %s Exp/Min: %s"
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:89 src/gui/killstats.cpp:94
-#: src/gui/killstats.cpp:289 src/gui/killstats.cpp:305
-#: src/gui/killstats.cpp:323
+#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:90 src/gui/killstats.cpp:95
+#: src/gui/killstats.cpp:290 src/gui/killstats.cpp:306
+#: src/gui/killstats.cpp:324
#, c-format
msgid "Exp speed per %d min: %s"
msgid_plural "Exp speed per %d min: %s"
msgstr[0] "Velocidade de exp por %d min: %s"
msgstr[1] "Velocidade de exp por %d mins: %s"
-#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
+#: src/gui/killstats.cpp:88 src/gui/killstats.cpp:93 src/gui/killstats.cpp:98
#, c-format
msgid "Time for next level per %d min: %s"
msgid_plural "Time for next level per %d min: %s"
msgstr[0] "Tempo para o próximo nível %d min: %s "
msgstr[1] "Tempo para o próximo nível %d mins: %s "
-#: src/gui/killstats.cpp:100 src/gui/killstats.cpp:241
+#: src/gui/killstats.cpp:101 src/gui/killstats.cpp:242
msgid "Last kill exp:"
msgstr "Ultim exp por morte:"
-#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:355
-#: src/gui/killstats.cpp:361 src/gui/killstats.cpp:367
-#: src/gui/killstats.cpp:372
+#: src/gui/killstats.cpp:103 src/gui/killstats.cpp:356
+#: src/gui/killstats.cpp:362 src/gui/killstats.cpp:368
+#: src/gui/killstats.cpp:373
msgid "Time before jacko spawn:"
msgstr "Tempo para próxima aparição do JackO:"
-#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:301
-#: src/gui/killstats.cpp:311 src/gui/killstats.cpp:318
-#: src/gui/killstats.cpp:330 src/gui/killstats.cpp:337
+#: src/gui/killstats.cpp:295 src/gui/killstats.cpp:302
+#: src/gui/killstats.cpp:312 src/gui/killstats.cpp:319
+#: src/gui/killstats.cpp:331 src/gui/killstats.cpp:338
#, c-format
msgid " Time for next level: %s"
msgstr "Tempo para próximo nível: %s"
-#: src/gui/killstats.cpp:361
+#: src/gui/killstats.cpp:362
#, c-format
msgid "%s %d?"
msgstr "%s %d?"
-#: src/gui/killstats.cpp:367
+#: src/gui/killstats.cpp:368
msgid "jacko spawning"
msgstr "Aparição do JackO"
+#: src/guildmanager.cpp:464 src/net/ea/guildhandler.cpp:439
+msgid "You have left the guild."
+msgstr "Você saiu da Guilda."
+
#: src/gui/logindialog.cpp:59
msgid "Normal"
msgstr "Normal"
@@ -1146,7 +1150,7 @@ msgstr "Passar"
msgid "Login"
msgstr "Login"
-#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:246
+#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:252
#: src/gui/widgets/chattab.cpp:173
msgid "Server:"
msgstr "Servidor:"
@@ -1228,11 +1232,11 @@ msgstr "Enviar"
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:561
+#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:590
msgid "Clear"
msgstr "Limpar"
-#: src/gui/npcdialog.cpp:222
+#: src/gui/npcdialog.cpp:223
msgid "> Next"
msgstr "> Próximo"
@@ -1248,346 +1252,346 @@ msgstr "Enviar"
msgid "Failed to send as sender or letter invalid."
msgstr "Falha ao enviar como remetente ou a carta é inválida."
-#: src/gui/outfitwindow.cpp:82 src/gui/outfitwindow.cpp:886
+#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:890
#, c-format
msgid "Outfit: %d"
msgstr "Roupas: %d"
-#: src/gui/outfitwindow.cpp:84 src/gui/outfitwindow.cpp:888
+#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:892
#, c-format
msgid "Key: %s"
msgstr "Tecla: %s"
-#: src/gui/outfitwindow.cpp:87
+#: src/gui/outfitwindow.cpp:91
msgid "Unequip first"
msgstr "Desequipar antes"
-#: src/gui/outfitwindow.cpp:90
+#: src/gui/outfitwindow.cpp:94
msgid "Away outfit"
msgstr "Roupas de ocupado"
-#: src/gui/popupmenu.cpp:133 src/gui/popupmenu.cpp:616
+#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:645
#: src/gui/widgets/tradetab.cpp:44
msgid "Trade"
msgstr "Negócios"
-#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:375
+#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:393
msgid "Whisper"
msgstr "Mensagem Privada:"
-#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:621
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:650
msgid "Heal"
msgstr "Cura"
-#: src/gui/popupmenu.cpp:146 src/gui/popupmenu.cpp:381
-#: src/gui/popupmenu.cpp:628
+#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:399
+#: src/gui/popupmenu.cpp:657
msgid "Be friend"
msgstr "Ser amigo"
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:383
-#: src/gui/popupmenu.cpp:389 src/gui/popupmenu.cpp:408
-#: src/gui/popupmenu.cpp:630 src/gui/popupmenu.cpp:638
-#: src/gui/popupmenu.cpp:662
+#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:156
+#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:401
+#: src/gui/popupmenu.cpp:407 src/gui/popupmenu.cpp:426
+#: src/gui/popupmenu.cpp:659 src/gui/popupmenu.cpp:667
+#: src/gui/popupmenu.cpp:691
msgid "Disregard"
msgstr "Ser inimigo"
-#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:161
-#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:177
-#: src/gui/popupmenu.cpp:385 src/gui/popupmenu.cpp:391
-#: src/gui/popupmenu.cpp:398 src/gui/popupmenu.cpp:403
-#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
-#: src/gui/popupmenu.cpp:649 src/gui/popupmenu.cpp:655
+#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:160
+#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:176
+#: src/gui/popupmenu.cpp:403 src/gui/popupmenu.cpp:409
+#: src/gui/popupmenu.cpp:416 src/gui/popupmenu.cpp:421
+#: src/gui/popupmenu.cpp:662 src/gui/popupmenu.cpp:670
+#: src/gui/popupmenu.cpp:678 src/gui/popupmenu.cpp:684
msgid "Erase"
msgstr "Apagar"
-#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:175
-#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:395
-#: src/gui/popupmenu.cpp:402 src/gui/popupmenu.cpp:407
-#: src/gui/popupmenu.cpp:646 src/gui/popupmenu.cpp:654
-#: src/gui/popupmenu.cpp:660
+#: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:174
+#: src/gui/popupmenu.cpp:181 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:425
+#: src/gui/popupmenu.cpp:675 src/gui/popupmenu.cpp:683
+#: src/gui/popupmenu.cpp:689
msgid "Unignore"
msgstr "Não ignorar"
-#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:186
-#: src/gui/popupmenu.cpp:397 src/gui/popupmenu.cpp:410
-#: src/gui/popupmenu.cpp:648 src/gui/popupmenu.cpp:664
+#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:185
+#: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:428
+#: src/gui/popupmenu.cpp:677 src/gui/popupmenu.cpp:693
#: src/playerrelations.cpp:400
msgid "Completely ignore"
msgstr "Ignorar completamente"
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:418
-#: src/gui/popupmenu.cpp:672
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:436
+#: src/gui/popupmenu.cpp:701
msgid "Follow"
msgstr "Seguir"
-#: src/gui/popupmenu.cpp:196 src/gui/popupmenu.cpp:419
-#: src/gui/popupmenu.cpp:673
+#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:437
+#: src/gui/popupmenu.cpp:702
msgid "Imitation"
msgstr "Imitar"
-#: src/gui/popupmenu.cpp:206 src/gui/popupmenu.cpp:710
+#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:739
msgid "Invite to party"
msgstr "Convidar para grupo"
-#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:428
-#: src/gui/popupmenu.cpp:715
+#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:744
msgid "Kick from party"
msgstr "Expulsar do grupo"
-#: src/gui/popupmenu.cpp:226 src/gui/popupmenu.cpp:439
-#: src/gui/popupmenu.cpp:729
+#: src/gui/popupmenu.cpp:225 src/gui/popupmenu.cpp:237
+#: src/gui/popupmenu.cpp:460 src/gui/popupmenu.cpp:761
msgid "Kick from guild"
msgstr "Expulsar da guilda"
-#: src/gui/popupmenu.cpp:228 src/gui/popupmenu.cpp:441
-#: src/gui/popupmenu.cpp:731
+#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:242
+#: src/gui/popupmenu.cpp:465 src/gui/popupmenu.cpp:766
msgid "Change pos in guild"
msgstr "Mudar pos na Guilda"
-#: src/gui/popupmenu.cpp:234 src/gui/popupmenu.cpp:446
-#: src/gui/popupmenu.cpp:737
+#: src/gui/popupmenu.cpp:251 src/gui/popupmenu.cpp:474
+#: src/gui/popupmenu.cpp:776
msgid "Invite to guild"
msgstr "Convidar pra Guilda"
-#: src/gui/popupmenu.cpp:242
+#: src/gui/popupmenu.cpp:260
msgid "Kick player"
msgstr "Chutar Jogador"
-#: src/gui/popupmenu.cpp:244
+#: src/gui/popupmenu.cpp:262
msgid "Nuke"
msgstr "Nu"
-#: src/gui/popupmenu.cpp:247 src/gui/popupmenu.cpp:675
+#: src/gui/popupmenu.cpp:265 src/gui/popupmenu.cpp:704
msgid "Show Items"
msgstr "Mostrar itens:"
-#: src/gui/popupmenu.cpp:248 src/gui/popupmenu.cpp:676
-#: src/gui/popupmenu.cpp:1970
+#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:705
+#: src/gui/popupmenu.cpp:2020
msgid "Undress"
msgstr "Despir"
-#: src/gui/popupmenu.cpp:250 src/gui/popupmenu.cpp:286
-#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:678
-#: src/gui/popupmenu.cpp:746
+#: src/gui/popupmenu.cpp:268 src/gui/popupmenu.cpp:304
+#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:707
+#: src/gui/popupmenu.cpp:786
msgid "Add comment"
msgstr "Add comentário"
-#: src/gui/popupmenu.cpp:268 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:695
+#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:482
+#: src/gui/popupmenu.cpp:724
msgid "Buy (?)"
msgstr "Comprar (?)"
-#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:454
-#: src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:483
+#: src/gui/popupmenu.cpp:726
msgid "Sell (?)"
msgstr "vender (?)"
-#: src/gui/popupmenu.cpp:298
+#: src/gui/popupmenu.cpp:316
msgid "Kick"
msgstr "Chutar"
-#: src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:327
msgid "Remove from attack list"
msgstr "Remover da lista de ataque"
-#: src/gui/popupmenu.cpp:315
+#: src/gui/popupmenu.cpp:333
msgid "Add to priority attack list"
msgstr "Adicionar na prioridade da lista de ataques"
-#: src/gui/popupmenu.cpp:317
+#: src/gui/popupmenu.cpp:335
msgid "Add to attack list"
msgstr "Adicionar a lista de ataques"
-#: src/gui/popupmenu.cpp:320
+#: src/gui/popupmenu.cpp:338
msgid "Add to ignore list"
msgstr "Adicionar a lista de ignorados"
-#: src/gui/popupmenu.cpp:333 src/gui/popupmenu.cpp:457
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:486
msgid "Add name to chat"
msgstr "Adicionar nome ao chat"
-#: src/gui/popupmenu.cpp:483
+#: src/gui/popupmenu.cpp:512
msgid "Pick up"
msgstr "Pegar"
-#: src/gui/popupmenu.cpp:484 src/gui/popupmenu.cpp:1682
-#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1805
+#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:1732
+#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1855
msgid "Add to chat"
msgstr "Nome no chat"
-#: src/gui/popupmenu.cpp:501
+#: src/gui/popupmenu.cpp:530
msgid "Map Item"
msgstr "Mapa Item"
-#: src/gui/popupmenu.cpp:502
+#: src/gui/popupmenu.cpp:531
msgid "Rename"
msgstr "Renomear"
-#: src/gui/popupmenu.cpp:503 src/gui/popupmenu.cpp:1923
-#: src/gui/popupmenu.cpp:1941 src/gui/popupmenu.cpp:1946
+#: src/gui/popupmenu.cpp:532 src/gui/popupmenu.cpp:1973
+#: src/gui/popupmenu.cpp:1991 src/gui/popupmenu.cpp:1996
msgid "Remove"
msgstr "Remover"
-#: src/gui/popupmenu.cpp:508
+#: src/gui/popupmenu.cpp:537
msgid "Warp"
msgstr "Urdidura"
-#: src/gui/popupmenu.cpp:522
+#: src/gui/popupmenu.cpp:551
msgid "Load old outfits"
msgstr "Carregar velhas roupas"
-#: src/gui/popupmenu.cpp:538 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:567 src/gui/windowmenu.cpp:96
msgid "Spells"
msgstr "Feitiços"
-#: src/gui/popupmenu.cpp:540
+#: src/gui/popupmenu.cpp:569
msgid "Load old spells"
msgstr "Carregar velhos feitiços"
-#: src/gui/popupmenu.cpp:541
+#: src/gui/popupmenu.cpp:570
msgid "Edit spell"
msgstr "Editar feitiços"
-#: src/gui/popupmenu.cpp:567
+#: src/gui/popupmenu.cpp:596
msgid "Disable highlight"
msgstr "Desabilitar destaque"
-#: src/gui/popupmenu.cpp:572
+#: src/gui/popupmenu.cpp:601
msgid "Enable highlight"
msgstr "Habilitar destaque"
-#: src/gui/popupmenu.cpp:577
-msgid "Dont remove name"
-msgstr "Não remover o nome"
+#: src/gui/popupmenu.cpp:606
+msgid "Don't remove name"
+msgstr "Não retire o nome"
-#: src/gui/popupmenu.cpp:582
+#: src/gui/popupmenu.cpp:611
msgid "Remove name"
msgstr "Remover o nome"
-#: src/gui/popupmenu.cpp:587
+#: src/gui/popupmenu.cpp:616
msgid "Enable away"
msgstr "Habilitar modo indisponível"
-#: src/gui/popupmenu.cpp:592
+#: src/gui/popupmenu.cpp:621
msgid "Disable away"
msgstr "Desabilitar modo indisponível"
-#: src/gui/popupmenu.cpp:598 src/gui/socialwindow.cpp:1035
+#: src/gui/popupmenu.cpp:627 src/gui/socialwindow.cpp:1141
msgid "Leave"
msgstr "Sair"
-#: src/gui/popupmenu.cpp:758
+#: src/gui/popupmenu.cpp:798
msgid "Change guild position"
msgstr "Mudar a posição da guilda"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1189
+#: src/gui/popupmenu.cpp:1234
msgid "Rename map sign "
msgstr "Renomear mapa "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1191
+#: src/gui/popupmenu.cpp:1236
msgid "Name: "
msgstr "Nome: "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1241
+#: src/gui/popupmenu.cpp:1286
msgid "Player comment "
msgstr "Comentário do jogador"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1243
+#: src/gui/popupmenu.cpp:1288
msgid "Comment: "
msgstr "Comentário:"
-#: src/gui/popupmenu.cpp:1607
+#: src/gui/popupmenu.cpp:1657
msgid "Add to trade"
msgstr "Add. na negociação"
-#: src/gui/popupmenu.cpp:1613
+#: src/gui/popupmenu.cpp:1663
msgid "Add to trade 10"
msgstr "Add. 10 na negociação"
-#: src/gui/popupmenu.cpp:1616
+#: src/gui/popupmenu.cpp:1666
msgid "Add to trade half"
msgstr "Add. metade na negociação"
-#: src/gui/popupmenu.cpp:1618
+#: src/gui/popupmenu.cpp:1668
msgid "Add to trade all"
msgstr "Add. todos na negociação"
-#: src/gui/popupmenu.cpp:1630
+#: src/gui/popupmenu.cpp:1680
msgid "Store 10"
msgstr "Guardar 10"
-#: src/gui/popupmenu.cpp:1633
+#: src/gui/popupmenu.cpp:1683
msgid "Store half"
msgstr "Guardar metade"
-#: src/gui/popupmenu.cpp:1635
+#: src/gui/popupmenu.cpp:1685
msgid "Store all"
msgstr "Guardar tudo"
-#: src/gui/popupmenu.cpp:1653 src/gui/popupmenu.cpp:1750
-#: src/gui/popupmenu.cpp:1793
+#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1800
+#: src/gui/popupmenu.cpp:1843
msgid "Drop all"
msgstr "Descartar tudo"
-#: src/gui/popupmenu.cpp:1674
+#: src/gui/popupmenu.cpp:1724
msgid "Retrieve 10"
msgstr "Retirar 10"
-#: src/gui/popupmenu.cpp:1677
+#: src/gui/popupmenu.cpp:1727
msgid "Retrieve half"
msgstr "Retirar metade"
-#: src/gui/popupmenu.cpp:1679
+#: src/gui/popupmenu.cpp:1729
msgid "Retrieve all"
msgstr "Retirar tudo"
-#: src/gui/popupmenu.cpp:1710 src/gui/popupmenu.cpp:1766
+#: src/gui/popupmenu.cpp:1760 src/gui/popupmenu.cpp:1816
msgid "Load old item shortcuts"
msgstr "Carregar antigos atalhos de item"
-#: src/gui/popupmenu.cpp:1809
+#: src/gui/popupmenu.cpp:1859
msgid "Load old drop shortcuts"
msgstr "Carregar antigos atalhos de descarte"
-#: src/gui/popupmenu.cpp:1835 src/gui/popupmenu.cpp:1870
+#: src/gui/popupmenu.cpp:1885 src/gui/popupmenu.cpp:1920
msgid "Hide"
msgstr "Ocultar"
-#: src/gui/popupmenu.cpp:1841 src/gui/popupmenu.cpp:1876
+#: src/gui/popupmenu.cpp:1891 src/gui/popupmenu.cpp:1926
msgid "Show"
msgstr "Mostrar"
-#: src/gui/popupmenu.cpp:1883
+#: src/gui/popupmenu.cpp:1933
msgid "Reset yellow bar"
msgstr "Zerar barra amarela"
-#: src/gui/popupmenu.cpp:1885 src/gui/statuswindow.cpp:240
+#: src/gui/popupmenu.cpp:1935 src/gui/statuswindow.cpp:241
msgid "Copy to chat"
msgstr "Copiar para chat"
-#: src/gui/popupmenu.cpp:1903 src/gui/socialwindow.cpp:854
-#: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
+#: src/gui/popupmenu.cpp:1953 src/gui/socialwindow.cpp:958
+#: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028
msgid "(default)"
msgstr "(padrão)"
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1933
+#: src/gui/popupmenu.cpp:1965 src/gui/popupmenu.cpp:1983
msgid "Move up"
msgstr "Mover para cima"
-#: src/gui/popupmenu.cpp:1920 src/gui/popupmenu.cpp:1938
+#: src/gui/popupmenu.cpp:1970 src/gui/popupmenu.cpp:1988
msgid "Move down"
msgstr "Mover para baixo"
-#: src/gui/quitdialog.cpp:56
+#: src/gui/quitdialog.cpp:51
msgid "Switch server"
msgstr "Trocar servidor"
-#: src/gui/quitdialog.cpp:57
+#: src/gui/quitdialog.cpp:52
msgid "Switch character"
msgstr "Trocar de Personagem"
@@ -1623,64 +1627,64 @@ msgstr "A senha deve ser menor que %d caracteres."
msgid "Passwords do not match."
msgstr "Senhas não conferem."
-#: src/gui/serverdialog.cpp:231
+#: src/gui/serverdialog.cpp:237
msgid "Choose Your Server"
msgstr "Escolha seu servidor"
-#: src/gui/serverdialog.cpp:242
+#: src/gui/serverdialog.cpp:248
msgid "Choose Your Server *** SAFE MODE ***"
msgstr "Escolha seu servidor *** MODO SEGURO ***"
-#: src/gui/serverdialog.cpp:247
+#: src/gui/serverdialog.cpp:253
msgid "Port:"
msgstr "Porta:"
-#: src/gui/serverdialog.cpp:251
+#: src/gui/serverdialog.cpp:257
msgid "Use same ip for game sub servers"
msgstr "Usar o mesmo ip para os sub servidores do jogo"
-#: src/gui/serverdialog.cpp:265
+#: src/gui/serverdialog.cpp:271
msgid "Server type:"
msgstr "Tipo de servidor:"
-#: src/gui/serverdialog.cpp:289
+#: src/gui/serverdialog.cpp:295
msgid "Load"
msgstr "Carregar"
-#: src/gui/serverdialog.cpp:290
+#: src/gui/serverdialog.cpp:296
msgid "Connect"
msgstr "Conectar"
-#: src/gui/serverdialog.cpp:291
+#: src/gui/serverdialog.cpp:297
msgid "Custom Server"
msgstr "Servidor customizado"
-#: src/gui/serverdialog.cpp:396
+#: src/gui/serverdialog.cpp:402
msgid "Please type both the address and the port of a server."
msgstr "Por favor especifique o endereço e a porta do servidor."
-#: src/gui/serverdialog.cpp:554
+#: src/gui/serverdialog.cpp:560
#, c-format
msgid "Downloading server list...%2.2f%%"
msgstr "Baixando lista de servidores...%2.2f%%"
-#: src/gui/serverdialog.cpp:559
+#: src/gui/serverdialog.cpp:565
msgid "Waiting for server..."
msgstr "Aguardando servidor..."
-#: src/gui/serverdialog.cpp:563
+#: src/gui/serverdialog.cpp:569
msgid "Preparing download"
msgstr "Preparando download"
-#: src/gui/serverdialog.cpp:567
+#: src/gui/serverdialog.cpp:573
msgid "Error retreiving server list!"
msgstr "Erro ao recuperar lista!"
-#: src/gui/serverdialog.cpp:672
+#: src/gui/serverdialog.cpp:678
msgid "requires a newer version"
msgstr "requer uma versão mais nova"
-#: src/gui/serverdialog.cpp:674
+#: src/gui/serverdialog.cpp:680
#, c-format
msgid "requires v%s"
msgstr "requer v%s"
@@ -1826,6 +1830,14 @@ msgstr "Tempo"
msgid "Use local time"
msgstr "Usar tempo local"
+#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:157
+msgid "Other"
+msgstr "Outro"
+
+#: src/gui/setup_chat.cpp:125
+msgid "Highlight words (separated by comma)"
+msgstr "Palavras destacadas (separadas em vírgulas)"
+
#: src/gui/setup_colors.cpp:49
msgid "This is what the color looks like"
msgstr "A cor vai ficar assim"
@@ -1873,11 +1885,11 @@ msgstr "Azul:"
msgid "Alpha:"
msgstr "Alpha:"
-#: src/gui/setup.cpp:70
+#: src/gui/setup.cpp:71
msgid "Apply"
msgstr "Aplicar"
-#: src/gui/setup.cpp:73
+#: src/gui/setup.cpp:74
msgid "Reset Windows"
msgstr "Restaurar janelas"
@@ -2054,34 +2066,42 @@ msgid "Log NPC dialogue"
msgstr "Salvar diálogos com NPC"
#: src/gui/setup_other.cpp:148
-msgid "Other"
-msgstr "Outro"
+msgid "Bots support"
+msgstr "Suporte de bots"
#: src/gui/setup_other.cpp:150
+msgid "Enable auction bot support"
+msgstr "Habilitar suporte ao bot de leilão"
+
+#: src/gui/setup_other.cpp:153
+msgid "Enable guild bot support and disable native guild support"
+msgstr "Ativar o suporte a bot guilda e desabilitar o suporte nativo guilda"
+
+#: src/gui/setup_other.cpp:159
msgid "Enable server side attack"
msgstr "Habilitar ataque do lado do servidor"
-#: src/gui/setup_other.cpp:153
+#: src/gui/setup_other.cpp:162
msgid "Enable bot checker"
msgstr "Habilitar Analisador de bot"
-#: src/gui/setup_other.cpp:156
+#: src/gui/setup_other.cpp:165
msgid "Enable buggy servers protection"
msgstr "Habilitar proteção contra servidores com bugs"
-#: src/gui/setup_other.cpp:159
+#: src/gui/setup_other.cpp:168
msgid "Enable debug log"
msgstr "Habilitar Depurador"
-#: src/gui/setup_other.cpp:162
+#: src/gui/setup_other.cpp:171
msgid "Low traffic mode"
msgstr "Modo de baixo tráfego"
-#: src/gui/setup_other.cpp:165
+#: src/gui/setup_other.cpp:174
msgid "Hide shield sprite"
msgstr "Ocultar sprite de escudo"
-#: src/gui/setup_other.cpp:168
+#: src/gui/setup_other.cpp:177
msgid "Show background"
msgstr "Mostrar imagem de fundo"
@@ -2177,6 +2197,10 @@ msgstr "Mostrar status"
msgid "Show ip addresses on screenshots"
msgstr "Mostrar endereço de ip nas capturas de tela"
+#: src/gui/setup_players.cpp:81
+msgid "Allow self heal with mouse click"
+msgstr "Permitir se curar com o clique do mouse"
+
#: src/gui/setup_relations.cpp:65
msgid "Relation"
msgstr "Relação"
@@ -2453,261 +2477,266 @@ msgstr "Configurações de efeito de partícula modificadas."
msgid "Changes will take effect on map change."
msgstr "As mudanças terão efeito ao mudar de mapa."
-#: src/gui/shopwindow.cpp:74
+#: src/gui/shopwindow.cpp:75
msgid "Personal Shop"
msgstr "Loja pessoal"
-#: src/gui/shopwindow.cpp:116
+#: src/gui/shopwindow.cpp:118
msgid "Buy items"
msgstr "Comprar itens"
-#: src/gui/shopwindow.cpp:117
+#: src/gui/shopwindow.cpp:119
msgid "Sell items"
msgstr "Vender itens"
-#: src/gui/shopwindow.cpp:119 src/gui/shopwindow.cpp:122
-#: src/gui/tradewindow.cpp:88
+#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
+#: src/gui/tradewindow.cpp:89
msgid "Add"
msgstr "Adicionar"
-#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
+#: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
msgid "Announce"
msgstr "Anúncio"
-#: src/gui/shopwindow.cpp:125
+#: src/gui/shopwindow.cpp:127
msgid "Show links in announce"
msgstr "Mostrar links em anúncio"
-#: src/gui/shopwindow.cpp:723 src/net/ea/tradehandler.cpp:106
+#: src/gui/shopwindow.cpp:148 src/gui/shopwindow.cpp:149
+msgid "Auction"
+msgstr "Leilão"
+
+#: src/gui/shopwindow.cpp:748 src/net/ea/tradehandler.cpp:106
#: src/net/manaserv/tradehandler.cpp:127
msgid "Request for Trade"
msgstr "Proposta de negociação"
-#: src/gui/shopwindow.cpp:724
+#: src/gui/shopwindow.cpp:749
#, c-format
msgid "%s wants to %s %s do you accept?"
msgstr "%s quer %s %s você aceita?"
-#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:81
+#: src/gui/skilldialog.cpp:276 src/gui/windowmenu.cpp:81
msgid "Skills"
msgstr "Habilidades"
-#: src/gui/skilldialog.cpp:283
+#: src/gui/skilldialog.cpp:288
msgid "Up"
msgstr "+"
-#: src/gui/skilldialog.cpp:336
+#: src/gui/skilldialog.cpp:341
#, c-format
msgid "Skill points available: %d"
msgstr "Pontos de habilidade disponíveis: %d"
-#: src/gui/skilldialog.cpp:413
+#: src/gui/skilldialog.cpp:418
#, c-format
msgid "Skill Set %d"
msgstr "Habilidade %d"
-#: src/gui/skilldialog.cpp:425
+#: src/gui/skilldialog.cpp:430
#, c-format
msgid "Skill %d"
msgstr "Habilidade %d"
-#: src/gui/skilldialog.cpp:492 src/gui/skilldialog.cpp:545
+#: src/gui/skilldialog.cpp:497 src/gui/skilldialog.cpp:550
#, c-format
msgid "Lvl: %d"
msgstr "Nível: %d"
-#: src/gui/skilldialog.cpp:537
+#: src/gui/skilldialog.cpp:542
#, c-format
msgid "Lvl: %d (%+d)"
msgstr "Nível: %d (%+d)"
-#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
+#: src/gui/socialwindow.cpp:118 src/gui/socialwindow.cpp:216
+#: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52
msgid "Guild"
msgstr "Guilda"
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:147
#, c-format
msgid "Invited user %s to guild %s."
msgstr "Convidou o jogador %s para a guilda %s."
-#: src/gui/socialwindow.cpp:160
+#: src/gui/socialwindow.cpp:161
#, c-format
msgid "Guild %s quit requested."
msgstr "Saída da Guilda %s requisitada."
-#: src/gui/socialwindow.cpp:187
+#: src/gui/socialwindow.cpp:188
msgid "Member Invite to Guild"
msgstr "Convite de membros para a Guilda."
-#: src/gui/socialwindow.cpp:188
+#: src/gui/socialwindow.cpp:189
#, c-format
msgid "Who would you like to invite to guild %s?"
msgstr "Quem você gostaria de convidar para a guilda %s?"
-#: src/gui/socialwindow.cpp:197
+#: src/gui/socialwindow.cpp:198
msgid "Leave Guild?"
msgstr "Sair da guilda?"
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:199
#, c-format
msgid "Are you sure you want to leave guild %s?"
msgstr "Tem certeza que deseja sair da guilda %s?"
-#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:319 src/net/ea/gui/partytab.cpp:50
msgid "Party"
msgstr "Grupo"
-#: src/gui/socialwindow.cpp:243
+#: src/gui/socialwindow.cpp:347
#, c-format
msgid "Invited user %s to party."
msgstr "Convidou usuário %s para o grupo."
-#: src/gui/socialwindow.cpp:257
+#: src/gui/socialwindow.cpp:361
#, c-format
msgid "Party %s quit requested."
msgstr "Saída do grupo %s requisitada."
-#: src/gui/socialwindow.cpp:284
+#: src/gui/socialwindow.cpp:388
msgid "Member Invite to Party"
msgstr "Convite de membros para o grupo"
-#: src/gui/socialwindow.cpp:285
+#: src/gui/socialwindow.cpp:389
#, c-format
msgid "Who would you like to invite to party %s?"
msgstr "Quem você gostaria de convidar para o grupo %s?"
-#: src/gui/socialwindow.cpp:294
+#: src/gui/socialwindow.cpp:398
msgid "Leave Party?"
msgstr "Sair do grupo?"
-#: src/gui/socialwindow.cpp:295
+#: src/gui/socialwindow.cpp:399
#, c-format
msgid "Are you sure you want to leave party %s?"
msgstr "Tem certeza que deseja sair do grupo %s?"
-#: src/gui/socialwindow.cpp:521
+#: src/gui/socialwindow.cpp:625
msgid "Nav"
msgstr "Nav"
-#: src/gui/socialwindow.cpp:799
+#: src/gui/socialwindow.cpp:903
msgid "Atk"
msgstr "Ataque"
-#: src/gui/socialwindow.cpp:840
+#: src/gui/socialwindow.cpp:944
msgid "Priority mobs"
msgstr "Mobs prioritarios "
-#: src/gui/socialwindow.cpp:872
+#: src/gui/socialwindow.cpp:976
msgid "Attack mobs"
msgstr "Atacar mobs"
-#: src/gui/socialwindow.cpp:907
+#: src/gui/socialwindow.cpp:1011
msgid "Ignore mobs"
msgstr "Ignorar mobs"
-#: src/gui/socialwindow.cpp:970
+#: src/gui/socialwindow.cpp:1074
msgid "Create Guild"
msgstr "Criar guilda"
-#: src/gui/socialwindow.cpp:971 src/gui/socialwindow.cpp:1387
+#: src/gui/socialwindow.cpp:1075 src/gui/socialwindow.cpp:1503
msgid "Create Party"
msgstr "Criar grupo"
-#: src/gui/socialwindow.cpp:1013 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1117 src/gui/windowmenu.cpp:93
msgid "Social"
msgstr "Social"
-#: src/gui/socialwindow.cpp:1034
+#: src/gui/socialwindow.cpp:1140
msgid "Invite"
msgstr "Convidar"
-#: src/gui/socialwindow.cpp:1176
+#: src/gui/socialwindow.cpp:1286
#, c-format
msgid "Accepted party invite from %s."
msgstr "Aceitou convite para o grupo de %s."
-#: src/gui/socialwindow.cpp:1186
+#: src/gui/socialwindow.cpp:1296
#, c-format
msgid "Rejected party invite from %s."
msgstr "Rejeitou convite para o grupo de %s."
-#: src/gui/socialwindow.cpp:1203
+#: src/gui/socialwindow.cpp:1313
#, c-format
msgid "Accepted guild invite from %s."
msgstr "Aceitou convite para a guilda de %s."
-#: src/gui/socialwindow.cpp:1213
+#: src/gui/socialwindow.cpp:1326
#, c-format
msgid "Rejected guild invite from %s."
msgstr "Rejeitou convite para a guilda de %s."
-#: src/gui/socialwindow.cpp:1257
+#: src/gui/socialwindow.cpp:1373
#, c-format
msgid "Creating guild called %s."
msgstr "Criando guilda chamada %s."
-#: src/gui/socialwindow.cpp:1280
+#: src/gui/socialwindow.cpp:1396
#, c-format
msgid "Creating party called %s."
msgstr "Criando grupo chamado %s."
-#: src/gui/socialwindow.cpp:1294
+#: src/gui/socialwindow.cpp:1410
msgid "Guild Name"
msgstr "Nome da guilda"
-#: src/gui/socialwindow.cpp:1295
+#: src/gui/socialwindow.cpp:1411
msgid "Choose your guild's name."
msgstr "Escolha o nome da sua guilda."
-#: src/gui/socialwindow.cpp:1309
+#: src/gui/socialwindow.cpp:1425
msgid "Received guild request, but one already exists."
msgstr "Requisição de guilda recebida, mas já existe uma."
-#: src/gui/socialwindow.cpp:1315
+#: src/gui/socialwindow.cpp:1431
#, c-format
msgid "%s has invited you to join the guild %s."
msgstr "%s te convidou para entrar na guilda %s."
-#: src/gui/socialwindow.cpp:1321
+#: src/gui/socialwindow.cpp:1437
msgid "Accept Guild Invite"
msgstr "Aceitar convite para a guilda"
-#: src/gui/socialwindow.cpp:1336
+#: src/gui/socialwindow.cpp:1452
msgid "Received party request, but one already exists."
msgstr "Requisição de grupo recebida, mas já existe um."
-#: src/gui/socialwindow.cpp:1347
+#: src/gui/socialwindow.cpp:1463
msgid "You have been invited you to join a party."
msgstr "Você foi convidado para entrar em um grupo."
-#: src/gui/socialwindow.cpp:1351
+#: src/gui/socialwindow.cpp:1467
#, c-format
msgid "You have been invited to join the %s party."
msgstr "Você foi convidado para entrar no grupo %s."
-#: src/gui/socialwindow.cpp:1359
+#: src/gui/socialwindow.cpp:1475
#, c-format
msgid "%s has invited you to join their party."
msgstr "%s te convidou para entrar em seu grupo."
-#: src/gui/socialwindow.cpp:1364
+#: src/gui/socialwindow.cpp:1480
#, c-format
msgid "%s has invited you to join the %s party."
msgstr "%s te convidou para entrar no grupo %s."
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1489
msgid "Accept Party Invite"
msgstr "Aceitar convite para o grupo"
-#: src/gui/socialwindow.cpp:1388
+#: src/gui/socialwindow.cpp:1504
msgid "Cannot create party. You are already in a party"
msgstr "Não foi possível criar o grupo. Você já faz parte de um."
-#: src/gui/socialwindow.cpp:1393
+#: src/gui/socialwindow.cpp:1509
msgid "Party Name"
msgstr "Nome do grupo"
-#: src/gui/socialwindow.cpp:1394
+#: src/gui/socialwindow.cpp:1510
msgid "Choose your party's name."
msgstr "Escolha o nome do seu grupo."
@@ -2715,418 +2744,418 @@ msgstr "Escolha o nome do seu grupo."
msgid "Specials"
msgstr "Especiais"
-#: src/gui/statuspopup.cpp:197
+#: src/gui/statuspopup.cpp:198
msgid "(D) default moves"
msgstr "(D) movimentos padrão"
-#: src/gui/statuspopup.cpp:202
+#: src/gui/statuspopup.cpp:203
msgid "(I) invert moves"
msgstr "(l) inserir movimentos"
-#: src/gui/statuspopup.cpp:207
+#: src/gui/statuspopup.cpp:208
msgid "(c) moves with some crazy moves"
msgstr "(c) Alguns movimentos loucos"
-#: src/gui/statuspopup.cpp:212
+#: src/gui/statuspopup.cpp:213
msgid "(C) moves with crazy moves"
msgstr "(C) Movimentos loucos"
-#: src/gui/statuspopup.cpp:217
+#: src/gui/statuspopup.cpp:218
msgid "(d) double normal + crazy"
msgstr "(d) dobro normal + louco"
-#: src/gui/statuspopup.cpp:222
+#: src/gui/statuspopup.cpp:223
msgid "(?) move"
msgstr "(?) mover"
-#: src/gui/statuspopup.cpp:240
+#: src/gui/statuspopup.cpp:241
msgid "(a) custom crazy move"
msgstr "(a) movimentos loucos customizados"
-#: src/gui/statuspopup.cpp:244
+#: src/gui/statuspopup.cpp:245
msgid "(?) crazy move"
msgstr "(?) Movimentos loucos"
-#: src/gui/statuspopup.cpp:254
+#: src/gui/statuspopup.cpp:255
msgid "(0) default moves to target"
msgstr "(0) Mover ao alvo padrão"
-#: src/gui/statuspopup.cpp:259
+#: src/gui/statuspopup.cpp:260
msgid "(1) moves to target in distance 1"
msgstr "(1) Mover ao alvo com distância 1"
-#: src/gui/statuspopup.cpp:264
+#: src/gui/statuspopup.cpp:265
msgid "(2) moves to target in distance 2"
msgstr "(2) mover ao alvo em distância 2"
-#: src/gui/statuspopup.cpp:269
+#: src/gui/statuspopup.cpp:270
msgid "(3) moves to target in distance 3"
msgstr "(3) Mover ao alvo com distância 3"
-#: src/gui/statuspopup.cpp:274
+#: src/gui/statuspopup.cpp:275
msgid "(5) moves to target in distance 5"
msgstr "(5) Mover ao alvo com distância 5"
-#: src/gui/statuspopup.cpp:279
+#: src/gui/statuspopup.cpp:280
msgid "(7) moves to target in distance 7"
msgstr "(7) Mover ao alvo com distância 7"
-#: src/gui/statuspopup.cpp:284
+#: src/gui/statuspopup.cpp:285
msgid "(A) moves to target in attack range"
msgstr "(A) Mover ao alvo com a distância de ataque"
-#: src/gui/statuspopup.cpp:289
+#: src/gui/statuspopup.cpp:290
msgid "(?) move to target"
msgstr "(?) Mover ao alvo"
-#: src/gui/statuspopup.cpp:297
+#: src/gui/statuspopup.cpp:298
msgid "(D) default follow"
msgstr "(D) Seguir em modo padrão"
-#: src/gui/statuspopup.cpp:301
+#: src/gui/statuspopup.cpp:302
msgid "(R) relative follow"
msgstr "(R) Seguir em modo relativo"
-#: src/gui/statuspopup.cpp:305
+#: src/gui/statuspopup.cpp:306
msgid "(M) mirror follow"
msgstr "(M) Seguir em modo espelhado"
-#: src/gui/statuspopup.cpp:309
+#: src/gui/statuspopup.cpp:310
msgid "(P) pet follow"
msgstr "(P) Seguir em modo animal de extimação"
-#: src/gui/statuspopup.cpp:313
+#: src/gui/statuspopup.cpp:314
msgid "(?) unknown follow"
msgstr "(?) Seguir em modo desconhecido"
-#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
+#: src/gui/statuspopup.cpp:323 src/gui/statuspopup.cpp:346
msgid "(D) default attack"
msgstr "(D) Ataque padrão"
-#: src/gui/statuspopup.cpp:327
+#: src/gui/statuspopup.cpp:328
msgid "(s) switch attack without shield"
msgstr "(s) Trocar ataque sem escudo"
-#: src/gui/statuspopup.cpp:332
+#: src/gui/statuspopup.cpp:333
msgid "(S) switch attack with shield"
msgstr "(S) Trocar ataque com escudo"
-#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
+#: src/gui/statuspopup.cpp:337 src/gui/statuspopup.cpp:362
msgid "(?) attack"
msgstr "(?) Ataque"
-#: src/gui/statuspopup.cpp:349
+#: src/gui/statuspopup.cpp:350
msgid "(G) go and attack"
msgstr "(G) Ir e atacar"
-#: src/gui/statuspopup.cpp:353
+#: src/gui/statuspopup.cpp:354
msgid "(A) go, attack, pickup"
msgstr "(A) Ir, atacar, pegar"
-#: src/gui/statuspopup.cpp:357
+#: src/gui/statuspopup.cpp:358
msgid "(d) without auto attack"
msgstr "(d) sem auto ataque"
-#: src/gui/statuspopup.cpp:375
+#: src/gui/statuspopup.cpp:376
msgid "(S) small pick up 1x1 cells"
msgstr "(S) Pequeno pegar 1x1 celulas"
-#: src/gui/statuspopup.cpp:379
+#: src/gui/statuspopup.cpp:380
msgid "(D) default pick up 2x1 cells"
msgstr "(D) Pegar padrão 2x1 células"
-#: src/gui/statuspopup.cpp:383
+#: src/gui/statuspopup.cpp:384
msgid "(F) forward pick up 2x3 cells"
msgstr "(F) Pegar em frente 2x3 células"
-#: src/gui/statuspopup.cpp:387
+#: src/gui/statuspopup.cpp:388
msgid "(3) pick up 3x3 cells"
msgstr "(3) Pegar 3x3 células"
-#: src/gui/statuspopup.cpp:391
+#: src/gui/statuspopup.cpp:392
msgid "(g) go and pick up in distance 4"
msgstr "(g) Ir e pegar em distância 4"
-#: src/gui/statuspopup.cpp:395
+#: src/gui/statuspopup.cpp:396
msgid "(G) go and pick up in distance 8"
msgstr "(G) Ir e pegar em distância 8"
-#: src/gui/statuspopup.cpp:399
+#: src/gui/statuspopup.cpp:400
msgid "(A) go and pick up in max distance"
msgstr "(A) Ir e pegar em distância mâxima"
-#: src/gui/statuspopup.cpp:403
+#: src/gui/statuspopup.cpp:404
msgid "(?) pick up"
msgstr "(?) Pegar item"
-#: src/gui/statuspopup.cpp:412
+#: src/gui/statuspopup.cpp:413
msgid "(N) normal map view"
msgstr "(N) Visualizardor de mapa normal"
-#: src/gui/statuspopup.cpp:416
+#: src/gui/statuspopup.cpp:417
msgid "(D) debug map view"
msgstr "(D) Visualizador de mapa depurador"
-#: src/gui/statuspopup.cpp:420
+#: src/gui/statuspopup.cpp:421
msgid "(u) ultra map view"
msgstr "(u) Visualizador de mapa ultra"
-#: src/gui/statuspopup.cpp:424
+#: src/gui/statuspopup.cpp:425
msgid "(U) ultra map view 2"
msgstr "(U) Visualizador de mapa ultra 2"
-#: src/gui/statuspopup.cpp:428
+#: src/gui/statuspopup.cpp:429
msgid "(e) empty map view"
msgstr "(e) Visualizador de mapa vazio"
-#: src/gui/statuspopup.cpp:432
+#: src/gui/statuspopup.cpp:433
msgid "(b) black & white map view"
msgstr "(b) Visualizador de mapa preto e branco"
-#: src/gui/statuspopup.cpp:436
+#: src/gui/statuspopup.cpp:437
msgid "(?) map view"
msgstr "(?) Visualizador de mapa"
-#: src/gui/statuspopup.cpp:444
+#: src/gui/statuspopup.cpp:445
msgid "(f) use #flar for magic attack"
msgstr "(f) Usar #flar para feitiço de ataque"
-#: src/gui/statuspopup.cpp:449
+#: src/gui/statuspopup.cpp:450
msgid "(c) use #chiza for magic attack"
msgstr "(c) Usar #chiza para feitiço de ataque"
-#: src/gui/statuspopup.cpp:454
+#: src/gui/statuspopup.cpp:455
msgid "(I) use #ingrav for magic attack"
msgstr "(I) Usar #ingrav para feitiço de ataque"
-#: src/gui/statuspopup.cpp:459
+#: src/gui/statuspopup.cpp:460
msgid "(F) use #frillyar for magic attack"
msgstr "(F) Usar #frillyar para feitiço de ataque"
-#: src/gui/statuspopup.cpp:464
+#: src/gui/statuspopup.cpp:465
msgid "(U) use #upmarmu for magic attack"
msgstr "(U) Usar #upmarmu para feitiço de ataque"
-#: src/gui/statuspopup.cpp:468
+#: src/gui/statuspopup.cpp:469
msgid "(?) magic attack"
msgstr "(?) Feitiço de ataque"
-#: src/gui/statuspopup.cpp:477
+#: src/gui/statuspopup.cpp:478
msgid "(D) default imitation"
msgstr "(D) Mímica padrão"
-#: src/gui/statuspopup.cpp:481
+#: src/gui/statuspopup.cpp:482
msgid "(O) outfits imitation"
msgstr "(O) Mímica de roupas"
-#: src/gui/statuspopup.cpp:485
+#: src/gui/statuspopup.cpp:486
msgid "(?) imitation"
msgstr "(?) Mímica"
-#: src/gui/statuspopup.cpp:494
+#: src/gui/statuspopup.cpp:495
msgid "(O) on keyboard"
msgstr "(O) No teclado"
-#: src/gui/statuspopup.cpp:497
+#: src/gui/statuspopup.cpp:498
msgid "(A) away"
msgstr "(A) Ausente"
-#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
+#: src/gui/statuspopup.cpp:501 src/gui/statuspopup.cpp:521
msgid "(?) away"
msgstr "(?) Ausente"
-#: src/gui/statuspopup.cpp:508
+#: src/gui/statuspopup.cpp:509
msgid "(G) game camera mode"
msgstr "(G) Modo de jogo câmera"
-#: src/gui/statuspopup.cpp:512
+#: src/gui/statuspopup.cpp:513
msgid "(F) free camera mode"
msgstr "(F) Modo de jogo câmera livre"
-#: src/gui/statuspopup.cpp:516
+#: src/gui/statuspopup.cpp:517
msgid "(D) design camera mode"
msgstr "(D) Modo de jogo câmera design"
-#: src/gui/statuspopup.cpp:527
+#: src/gui/statuspopup.cpp:528
msgid "Game modifiers are disabled"
msgstr "Modificadores de jogo desativados"
-#: src/gui/statuspopup.cpp:532
+#: src/gui/statuspopup.cpp:533
msgid "Game modifiers are enabled"
msgstr "Modificadores de jogo desativados"
-#: src/gui/statuswindow.cpp:142 src/gui/statuswindow.cpp:272
-#: src/gui/statuswindow.cpp:335
+#: src/gui/statuswindow.cpp:143 src/gui/statuswindow.cpp:273
+#: src/gui/statuswindow.cpp:336
#, c-format
msgid "Level: %d"
msgstr "Nível: %d"
-#: src/gui/statuswindow.cpp:143 src/gui/statuswindow.cpp:258
-#: src/gui/statuswindow.cpp:302
+#: src/gui/statuswindow.cpp:144 src/gui/statuswindow.cpp:259
+#: src/gui/statuswindow.cpp:303
#, c-format
msgid "Money: %s"
msgstr "Dinheiro: %s"
-#: src/gui/statuswindow.cpp:149
+#: src/gui/statuswindow.cpp:150
msgid "HP:"
msgstr "HP:"
-#: src/gui/statuswindow.cpp:156
+#: src/gui/statuswindow.cpp:157
msgid "Exp:"
msgstr "Exp:"
-#: src/gui/statuswindow.cpp:170
+#: src/gui/statuswindow.cpp:171
msgid "MP:"
msgstr "MP:"
-#: src/gui/statuswindow.cpp:202 src/gui/statuswindow.cpp:385
+#: src/gui/statuswindow.cpp:203 src/gui/statuswindow.cpp:386
#, c-format
msgid "Job: %d"
msgstr "Job: %d"
-#: src/gui/statuswindow.cpp:203
+#: src/gui/statuswindow.cpp:204
msgid "Job:"
msgstr "Job:"
-#: src/gui/statuswindow.cpp:261 src/gui/statuswindow.cpp:309
+#: src/gui/statuswindow.cpp:262 src/gui/statuswindow.cpp:310
#, c-format
msgid "Character points: %d"
msgstr "Pontos do personagem: %d"
-#: src/gui/statuswindow.cpp:267
+#: src/gui/statuswindow.cpp:268
#, c-format
msgid "Level: %d (GM %d)"
msgstr "Nível: %d (GM %d)"
-#: src/gui/statuswindow.cpp:323
+#: src/gui/statuswindow.cpp:324
#, c-format
msgid "Correction points: %d"
msgstr "Pontos de correção: %d"
-#: src/gui/statuswindow.cpp:646 src/gui/statuswindow.cpp:711
-#: src/gui/statuswindow.cpp:731 src/gui/statuswindow.cpp:747
-#: src/gui/statuswindow.cpp:793 src/gui/statuswindow.cpp:822
-#: src/gui/statuswindow.cpp:845 src/gui/statuswindow.cpp:864
+#: src/gui/statuswindow.cpp:647 src/gui/statuswindow.cpp:712
+#: src/gui/statuswindow.cpp:732 src/gui/statuswindow.cpp:748
+#: src/gui/statuswindow.cpp:794 src/gui/statuswindow.cpp:823
+#: src/gui/statuswindow.cpp:846 src/gui/statuswindow.cpp:865
msgid "(D)"
msgstr "(D)"
-#: src/gui/statuswindow.cpp:649 src/gui/statuswindow.cpp:772
+#: src/gui/statuswindow.cpp:650 src/gui/statuswindow.cpp:773
msgid "(I)"
msgstr "(l)"
-#: src/gui/statuswindow.cpp:652 src/gui/statuswindow.cpp:769
+#: src/gui/statuswindow.cpp:653 src/gui/statuswindow.cpp:770
msgid "(c)"
msgstr "(c)"
-#: src/gui/statuswindow.cpp:655
+#: src/gui/statuswindow.cpp:656
msgid "(C)"
msgstr "(C)"
-#: src/gui/statuswindow.cpp:658 src/gui/statuswindow.cpp:756
+#: src/gui/statuswindow.cpp:659 src/gui/statuswindow.cpp:757
msgid "(d)"
msgstr "(d)"
-#: src/gui/statuswindow.cpp:661 src/gui/statuswindow.cpp:675
-#: src/gui/statuswindow.cpp:704 src/gui/statuswindow.cpp:723
-#: src/gui/statuswindow.cpp:740 src/gui/statuswindow.cpp:759
-#: src/gui/statuswindow.cpp:781 src/gui/statuswindow.cpp:811
-#: src/gui/statuswindow.cpp:837 src/gui/statuswindow.cpp:851
-#: src/gui/statuswindow.cpp:867 src/gui/statuswindow.cpp:880
+#: src/gui/statuswindow.cpp:662 src/gui/statuswindow.cpp:676
+#: src/gui/statuswindow.cpp:705 src/gui/statuswindow.cpp:724
+#: src/gui/statuswindow.cpp:741 src/gui/statuswindow.cpp:760
+#: src/gui/statuswindow.cpp:782 src/gui/statuswindow.cpp:812
+#: src/gui/statuswindow.cpp:838 src/gui/statuswindow.cpp:852
+#: src/gui/statuswindow.cpp:868 src/gui/statuswindow.cpp:881
msgid "(?)"
msgstr "(?)"
-#: src/gui/statuswindow.cpp:672
+#: src/gui/statuswindow.cpp:673
msgid "(a)"
msgstr "(a)"
-#: src/gui/statuswindow.cpp:683
+#: src/gui/statuswindow.cpp:684
msgid "(0)"
msgstr "(0)"
-#: src/gui/statuswindow.cpp:686
+#: src/gui/statuswindow.cpp:687
msgid "(1)"
msgstr "(1)"
-#: src/gui/statuswindow.cpp:689
+#: src/gui/statuswindow.cpp:690
msgid "(2)"
msgstr "(2)"
-#: src/gui/statuswindow.cpp:692 src/gui/statuswindow.cpp:799
+#: src/gui/statuswindow.cpp:693 src/gui/statuswindow.cpp:800
msgid "(3)"
msgstr "(3)"
-#: src/gui/statuswindow.cpp:695
+#: src/gui/statuswindow.cpp:696
msgid "(5)"
msgstr "(5)"
-#: src/gui/statuswindow.cpp:698
+#: src/gui/statuswindow.cpp:699
msgid "(7)"
msgstr "(7)"
-#: src/gui/statuswindow.cpp:701 src/gui/statuswindow.cpp:753
-#: src/gui/statuswindow.cpp:808 src/gui/statuswindow.cpp:877
+#: src/gui/statuswindow.cpp:702 src/gui/statuswindow.cpp:754
+#: src/gui/statuswindow.cpp:809 src/gui/statuswindow.cpp:878
msgid "(A)"
msgstr "(A)"
-#: src/gui/statuswindow.cpp:714
+#: src/gui/statuswindow.cpp:715
msgid "(R)"
msgstr "(R)"
-#: src/gui/statuswindow.cpp:717
+#: src/gui/statuswindow.cpp:718
msgid "(M)"
msgstr "(M)"
-#: src/gui/statuswindow.cpp:720
+#: src/gui/statuswindow.cpp:721
msgid "(P)"
msgstr "(P)"
-#: src/gui/statuswindow.cpp:734
+#: src/gui/statuswindow.cpp:735
msgid "(s)"
msgstr "(s)"
-#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:790
+#: src/gui/statuswindow.cpp:738 src/gui/statuswindow.cpp:791
msgid "(S)"
msgstr "(S)"
-#: src/gui/statuswindow.cpp:750 src/gui/statuswindow.cpp:805
-#: src/gui/statuswindow.cpp:858
+#: src/gui/statuswindow.cpp:751 src/gui/statuswindow.cpp:806
+#: src/gui/statuswindow.cpp:859
msgid "(G)"
msgstr "(G)"
-#: src/gui/statuswindow.cpp:766
+#: src/gui/statuswindow.cpp:767
msgid "(f)"
msgstr "(f)"
-#: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:796
-#: src/gui/statuswindow.cpp:861
+#: src/gui/statuswindow.cpp:776 src/gui/statuswindow.cpp:797
+#: src/gui/statuswindow.cpp:862
msgid "(F)"
msgstr "(F)"
-#: src/gui/statuswindow.cpp:778 src/gui/statuswindow.cpp:828
+#: src/gui/statuswindow.cpp:779 src/gui/statuswindow.cpp:829
msgid "(U)"
msgstr "(U)"
-#: src/gui/statuswindow.cpp:802
+#: src/gui/statuswindow.cpp:803
msgid "(g)"
msgstr "(g)"
-#: src/gui/statuswindow.cpp:819
+#: src/gui/statuswindow.cpp:820
msgid "(N)"
msgstr "(N)"
-#: src/gui/statuswindow.cpp:825
+#: src/gui/statuswindow.cpp:826
msgid "(u)"
msgstr "(u)"
-#: src/gui/statuswindow.cpp:831
+#: src/gui/statuswindow.cpp:832
msgid "(e)"
msgstr "(e)"
-#: src/gui/statuswindow.cpp:834
+#: src/gui/statuswindow.cpp:835
msgid "(b)"
msgstr "(b)"
-#: src/gui/statuswindow.cpp:848 src/gui/statuswindow.cpp:874
+#: src/gui/statuswindow.cpp:849 src/gui/statuswindow.cpp:875
msgid "(O)"
msgstr "(O)"
@@ -3234,24 +3263,24 @@ msgstr "Aceitou. Aguarde..."
msgid "Trade: You"
msgstr "Negócio: você"
-#: src/gui/tradewindow.cpp:110 src/gui/tradewindow.cpp:166
+#: src/gui/tradewindow.cpp:111 src/gui/tradewindow.cpp:167
#, c-format
msgid "You get %s"
msgstr "Você pegou %s"
-#: src/gui/tradewindow.cpp:111
+#: src/gui/tradewindow.cpp:112
msgid "You give:"
msgstr "Você dá:"
-#: src/gui/tradewindow.cpp:115
+#: src/gui/tradewindow.cpp:116
msgid "Change"
msgstr "Mudar"
-#: src/gui/tradewindow.cpp:374
+#: src/gui/tradewindow.cpp:375
msgid "You don't have enough money."
msgstr "Você não tem dinheiro suficiente."
-#: src/gui/tradewindow.cpp:453
+#: src/gui/tradewindow.cpp:454
msgid "Failed adding item. You can not overlap one kind of item on the window."
msgstr ""
"Falha ao adicionar item. Você não pode duplicar este tipo de item na janela."
@@ -3261,33 +3290,33 @@ msgstr ""
msgid "Name: %s"
msgstr "Nome: %s"
-#: src/gui/updaterwindow.cpp:136
+#: src/gui/updaterwindow.cpp:138
msgid "Updating..."
msgstr "Atualizando..."
-#: src/gui/updaterwindow.cpp:155
+#: src/gui/updaterwindow.cpp:159
msgid "Connecting..."
msgstr "Conectando..."
-#: src/gui/updaterwindow.cpp:158
+#: src/gui/updaterwindow.cpp:162
msgid "Play"
msgstr "Jogar"
-#: src/gui/updaterwindow.cpp:556
+#: src/gui/updaterwindow.cpp:564
msgid "##1 The update process is incomplete."
msgstr "##1 O processo de update está incompleto."
#. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:558
+#: src/gui/updaterwindow.cpp:566
msgid "##1 It is strongly recommended that"
msgstr "##1 É altamente recomendado que"
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:560
+#: src/gui/updaterwindow.cpp:568
msgid "##1 you try again later."
msgstr "##1 tente novamente mais tarde."
-#: src/gui/updaterwindow.cpp:686
+#: src/gui/updaterwindow.cpp:744
msgid "Completed"
msgstr "Concluído"
@@ -3439,23 +3468,23 @@ msgstr "Borda do Lugar Inicial"
msgid "Road Point"
msgstr "Ponto de estrada"
-#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:471
+#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:472
msgid "Who Is Online - Updating"
msgstr "Quem está online - Atualizando"
-#: src/gui/whoisonline.cpp:101
+#: src/gui/whoisonline.cpp:102
msgid "Update"
msgstr "Atualizar"
-#: src/gui/whoisonline.cpp:294
+#: src/gui/whoisonline.cpp:295
msgid "Who Is Online - "
msgstr "Quem está online - "
-#: src/gui/whoisonline.cpp:485
+#: src/gui/whoisonline.cpp:486
msgid "Who Is Online - error"
msgstr "Quem está online - Erro"
-#: src/gui/whoisonline.cpp:516
+#: src/gui/whoisonline.cpp:517
msgid "Who Is Online - Update"
msgstr "Quem está online - Atualizado"
@@ -3520,7 +3549,8 @@ msgid "This command makes <nick> a channel operator."
msgstr "Tornar <nick> operador do canal."
#: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
-#: src/net/ea/gui/guildtab.cpp:69 src/net/ea/gui/partytab.cpp:85
+#: src/gui/widgets/guildchattab.cpp:61 src/net/ea/gui/guildtab.cpp:69
+#: src/net/ea/gui/partytab.cpp:85
msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
msgstr "Se <nick> possuir espaços, coloque entre aspas (\")."
@@ -3559,6 +3589,41 @@ msgstr "Anúncio geral de %s:"
msgid "%s whispers: %s"
msgstr "%s envia mensagem privada: %s"
+#: src/gui/widgets/guildchattab.cpp:59 src/net/ea/gui/guildtab.cpp:67
+#: src/net/ea/gui/partytab.cpp:83
+msgid "Command: /invite <nick>"
+msgstr "Comando: /invite <nick>"
+
+#: src/gui/widgets/guildchattab.cpp:60 src/net/ea/gui/guildtab.cpp:68
+msgid "This command invites <nick> to the guild you're in."
+msgstr "Este comando convida <nick> para a guilda em que você está."
+
+#: src/gui/widgets/guildchattab.cpp:66 src/net/ea/gui/guildtab.cpp:74
+#: src/net/ea/gui/partytab.cpp:90
+msgid "Command: /leave"
+msgstr "Comando: /leave"
+
+#: src/gui/widgets/guildchattab.cpp:67 src/net/ea/gui/guildtab.cpp:75
+msgid "This command causes the player to leave the guild."
+msgstr "Este comando faz com que o jogador saia da guilda."
+
+#: src/gui/widgets/guildchattab.cpp:109 src/net/ea/gui/guildtab.cpp:135
+#: src/net/ea/gui/partytab.cpp:69
+msgid "/help > Display this help."
+msgstr "/help > Exibe esta ajuda."
+
+#: src/gui/widgets/guildchattab.cpp:110 src/net/ea/gui/guildtab.cpp:136
+msgid "/invite > Invite a player to your guild"
+msgstr "/invite > Convida um jogador para a sua guilda"
+
+#: src/gui/widgets/guildchattab.cpp:111 src/net/ea/gui/guildtab.cpp:137
+msgid "/leave > Leave the guild you are in"
+msgstr "/leave > Sai da guilda em que você está"
+
+#: src/gui/widgets/guildchattab.cpp:112 src/net/ea/gui/guildtab.cpp:138
+msgid "/kick > Kick some one from the guild you are in"
+msgstr "/kick > Expulsa alguém da guilda em que você está"
+
#: src/gui/widgets/setupitem.cpp:271 src/gui/widgets/setupitem.cpp:394
msgid "Edit"
msgstr "Editar"
@@ -4091,68 +4156,68 @@ msgstr ""
"Conflito com as teclas \"%s\" e \"%s\" . Resolva o conflito para não "
"comprometer a jogabilidade."
-#: src/localplayer.cpp:372
+#: src/localplayer.cpp:370
msgid "You were killed by "
msgstr "Você foi morto por "
-#: src/localplayer.cpp:1403
+#: src/localplayer.cpp:1401
msgid "Tried to pick up nonexistent item."
msgstr "Você tentou pegar um item não existente."
-#: src/localplayer.cpp:1405
+#: src/localplayer.cpp:1403
msgid "Item is too heavy."
msgstr "Este item é muito pesado."
-#: src/localplayer.cpp:1407
+#: src/localplayer.cpp:1405
msgid "Item is too far away."
msgstr "Item está muito longe"
-#: src/localplayer.cpp:1409
+#: src/localplayer.cpp:1407
msgid "Inventory is full."
msgstr "O inventário está cheio."
-#: src/localplayer.cpp:1411
+#: src/localplayer.cpp:1409
msgid "Stack is too big."
msgstr "Esta pilha é muito grande."
-#: src/localplayer.cpp:1414
+#: src/localplayer.cpp:1412
msgid "Item belongs to someone else."
msgstr "Este item pertence a outra pessoa."
-#: src/localplayer.cpp:1417
+#: src/localplayer.cpp:1415
msgid "Unknown problem picking up item."
msgstr "Problema desconhecido ao tentar pegar item."
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1441
+#: src/localplayer.cpp:1439
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
msgstr[0] "Você pegou %d [@@%d|%s@@]."
msgstr[1] "Você pegou %d [@@%d|%s@@]."
-#: src/localplayer.cpp:3175
+#: src/localplayer.cpp:3173
msgid "Away"
msgstr "Indisponivel "
-#: src/localplayer.cpp:3476
+#: src/localplayer.cpp:3474
msgid "Follow: "
msgstr "Seguindo:"
-#: src/localplayer.cpp:3478 src/localplayer.cpp:3493
+#: src/localplayer.cpp:3476 src/localplayer.cpp:3491
msgid "Follow canceled"
msgstr "Seguindo cancelado"
-#: src/localplayer.cpp:3485
+#: src/localplayer.cpp:3483
msgid "Imitation: "
msgstr "Imitando:"
-#: src/localplayer.cpp:3487 src/localplayer.cpp:3495
+#: src/localplayer.cpp:3485 src/localplayer.cpp:3493
msgid "Imitation canceled"
msgstr "Imitação cancelada"
-#: src/localplayer.cpp:3847
+#: src/localplayer.cpp:3845
msgid "You see "
msgstr "Você vê "
@@ -4332,28 +4397,28 @@ msgstr "Personagem deletado."
msgid "Failed to delete character."
msgstr "Falha ao deletar personagem."
-#: src/net/ea/chathandler.cpp:60 src/net/ea/chathandler.cpp:66
-#: src/net/ea/chathandler.cpp:71 src/net/ea/chathandler.cpp:77
-#: src/net/ea/chathandler.cpp:82 src/net/ea/chathandler.cpp:88
-#: src/net/ea/chathandler.cpp:95 src/net/ea/chathandler.cpp:101
+#: src/net/ea/chathandler.cpp:61 src/net/ea/chathandler.cpp:67
+#: src/net/ea/chathandler.cpp:72 src/net/ea/chathandler.cpp:78
+#: src/net/ea/chathandler.cpp:83 src/net/ea/chathandler.cpp:89
+#: src/net/ea/chathandler.cpp:96 src/net/ea/chathandler.cpp:102
msgid "Channels are not supported!"
msgstr "Não há suporte para canais!"
-#: src/net/ea/chathandler.cpp:128
+#: src/net/ea/chathandler.cpp:129
#, c-format
msgid "Whisper could not be sent, %s is offline."
msgstr "Mensagem privada não pode ser enviada, %s está offline."
-#: src/net/ea/chathandler.cpp:136
+#: src/net/ea/chathandler.cpp:137
#, c-format
msgid "Whisper could not be sent, ignored by %s."
msgstr "Mensagem privada não pode ser enviada, ignorado por %s."
-#: src/net/ea/chathandler.cpp:348
+#: src/net/ea/chathandler.cpp:355
msgid "MVP player."
msgstr "Jogador VIP."
-#: src/net/ea/chathandler.cpp:352
+#: src/net/ea/chathandler.cpp:359
msgid "MVP player: "
msgstr "Jogador VIP: "
@@ -4370,38 +4435,6 @@ msgstr "Jogo"
msgid "Request to quit denied!"
msgstr "Requisição de saída negada!"
-#: src/net/ea/gui/guildtab.cpp:67 src/net/ea/gui/partytab.cpp:83
-msgid "Command: /invite <nick>"
-msgstr "Comando: /invite <nick>"
-
-#: src/net/ea/gui/guildtab.cpp:68
-msgid "This command invites <nick> to the guild you're in."
-msgstr "Este comando convida <nick> para a guilda em que você está."
-
-#: src/net/ea/gui/guildtab.cpp:74 src/net/ea/gui/partytab.cpp:90
-msgid "Command: /leave"
-msgstr "Comando: /leave"
-
-#: src/net/ea/gui/guildtab.cpp:75
-msgid "This command causes the player to leave the guild."
-msgstr "Este comando faz com que o jogador saia da guilda."
-
-#: src/net/ea/gui/guildtab.cpp:135 src/net/ea/gui/partytab.cpp:69
-msgid "/help > Display this help."
-msgstr "/help > Exibe esta ajuda."
-
-#: src/net/ea/gui/guildtab.cpp:136
-msgid "/invite > Invite a player to your guild"
-msgstr "/invite > Convida um jogador para a sua guilda"
-
-#: src/net/ea/gui/guildtab.cpp:137
-msgid "/leave > Leave the guild you are in"
-msgstr "/leave > Sai da guilda em que você está"
-
-#: src/net/ea/gui/guildtab.cpp:138
-msgid "/kick > Kick some one from the guild you are in"
-msgstr "/kick > Expulsa alguém da guilda em que você está"
-
#: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
msgid "Guild created."
msgstr "Guilda criada."
@@ -4418,85 +4451,81 @@ msgstr "Falha ao checar Emperium"
msgid "Unknown server response."
msgstr "Resposta do servidor desconhecida."
-#: src/net/ea/guildhandler.cpp:180
+#: src/net/ea/guildhandler.cpp:181
#, c-format
msgid "Guild name: %s"
msgstr "Nome Guilda: %s"
-#: src/net/ea/guildhandler.cpp:182
+#: src/net/ea/guildhandler.cpp:183
#, c-format
msgid "Guild master: %s"
msgstr "Mestre da guilda: %s"
-#: src/net/ea/guildhandler.cpp:184
+#: src/net/ea/guildhandler.cpp:185
#, c-format
msgid "Guild level: %d"
msgstr "Nível Guilda: %d"
-#: src/net/ea/guildhandler.cpp:186
+#: src/net/ea/guildhandler.cpp:187
#, c-format
msgid "Online members: %d"
msgstr "Membros Online: %d"
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:189
#, c-format
msgid "Max members: %d"
msgstr "Max Membros: %d"
-#: src/net/ea/guildhandler.cpp:190
+#: src/net/ea/guildhandler.cpp:191
#, c-format
msgid "Average level: %d"
msgstr "Nível médio: %d"
-#: src/net/ea/guildhandler.cpp:192
+#: src/net/ea/guildhandler.cpp:193
#, c-format
msgid "Guild exp: %d"
msgstr "Guilda exp: %d"
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:195
#, c-format
msgid "Guild next exp: %d"
msgstr "Guilda prox. exp: %d"
-#: src/net/ea/guildhandler.cpp:196
+#: src/net/ea/guildhandler.cpp:197
#, c-format
msgid "Guild castle: %s"
msgstr "Castelo Guilda : %s"
-#: src/net/ea/guildhandler.cpp:402
+#: src/net/ea/guildhandler.cpp:403
msgid "Could not inivte user to guild."
msgstr "Não foi possível convidar jogador para a guilda."
-#: src/net/ea/guildhandler.cpp:406
+#: src/net/ea/guildhandler.cpp:407
msgid "User rejected guild invite."
msgstr "O jogador rejeitou o convite."
-#: src/net/ea/guildhandler.cpp:410
+#: src/net/ea/guildhandler.cpp:411
msgid "User is now part of your guild."
msgstr "Usuário agora é um membro da sua guilda."
-#: src/net/ea/guildhandler.cpp:414
+#: src/net/ea/guildhandler.cpp:415
msgid "Your guild is full."
msgstr "Sua guilda está cheia."
-#: src/net/ea/guildhandler.cpp:418
+#: src/net/ea/guildhandler.cpp:419
msgid "Unknown guild invite response."
msgstr "Resposta desconhecida de convite para guilda."
-#: src/net/ea/guildhandler.cpp:438
-msgid "You have left the guild."
-msgstr "Você saiu da Guilda."
-
-#: src/net/ea/guildhandler.cpp:452
+#: src/net/ea/guildhandler.cpp:453
#, c-format
msgid "%s has left your guild."
msgstr "%s saiu de sua Guilda."
-#: src/net/ea/guildhandler.cpp:483
+#: src/net/ea/guildhandler.cpp:484
msgid "You was kicked from guild."
msgstr "Você foi expulso da Guilda."
-#: src/net/ea/guildhandler.cpp:496
+#: src/net/ea/guildhandler.cpp:497
#, c-format
msgid "%s has kicked from your guild."
msgstr "%s foi expulso da Guilda."
@@ -4729,12 +4758,12 @@ msgstr "QQQ resposta de convite desconhecida por %s."
msgid "You have left the party."
msgstr "Você saiu do grupo."
-#: src/net/ea/partyhandler.cpp:368
+#: src/net/ea/partyhandler.cpp:369
#, c-format
msgid "%s has left your party."
msgstr "%s saiu do seu grupo."
-#: src/net/ea/partyhandler.cpp:444
+#: src/net/ea/partyhandler.cpp:448
#, c-format
msgid "An unknown member tried to say: %s"
msgstr "Um membro desconhecido tentou dizer: %s"
@@ -4860,7 +4889,7 @@ msgid "You're pining for the fjords."
msgstr "Você foi desta para melhor."
#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
-#: src/net/ea/playerhandler.cpp:425
+#: src/net/ea/playerhandler.cpp:428
msgid "Message"
msgstr "Mensagem"
@@ -4877,21 +4906,21 @@ msgstr ""
"Você está carregando menos ou metade de seu peso. Você pode recuperar-se "
"novamente."
-#: src/net/ea/playerhandler.cpp:451
+#: src/net/ea/playerhandler.cpp:454
#, c-format
msgid "You picked up %s."
msgstr "Você pegou %s."
-#: src/net/ea/playerhandler.cpp:457
+#: src/net/ea/playerhandler.cpp:460
#, c-format
msgid "You spent %s."
msgstr "Você gastou %s"
-#: src/net/ea/playerhandler.cpp:501
+#: src/net/ea/playerhandler.cpp:506
msgid "Cannot raise skill!"
msgstr "Impossível aumentar o atributo!"
-#: src/net/ea/playerhandler.cpp:618
+#: src/net/ea/playerhandler.cpp:624
msgid "Equip arrows first."
msgstr "Equipe as flechas primeiro."
@@ -5030,7 +5059,7 @@ msgstr "Negociação cancelada."
msgid "Trade completed."
msgstr "Negociação realizada."
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:258
msgid "Strength"
msgstr "Força"
@@ -5039,7 +5068,7 @@ msgstr "Força"
msgid "Strength %+.1f"
msgstr "Força %+.1f"
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:259
msgid "Agility"
msgstr "Agilidade"
@@ -5048,7 +5077,7 @@ msgstr "Agilidade"
msgid "Agility %+.1f"
msgstr "Agilidade %+.1f"
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:262
msgid "Dexterity"
msgstr "Destreza"
@@ -5057,7 +5086,7 @@ msgstr "Destreza"
msgid "Dexterity %+.1f"
msgstr "Destreza %+.1f"
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:260
msgid "Vitality"
msgstr "Vitalidade"
@@ -5066,7 +5095,7 @@ msgstr "Vitalidade"
msgid "Vitality %+.1f"
msgstr "Vitalidade %+.1f"
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:261
msgid "Intelligence"
msgstr "Inteligência"
@@ -5338,111 +5367,115 @@ msgstr "Não se pode vender durante uma negociação."
msgid "Unable to sell unsellable item."
msgstr "Não se pode vender este item."
-#: src/net/tmwa/generalhandler.cpp:109
+#: src/net/tmwa/generalhandler.cpp:108
#, c-format
msgid "Strength %+d"
msgstr "Força %+d"
-#: src/net/tmwa/generalhandler.cpp:110
+#: src/net/tmwa/generalhandler.cpp:109
#, c-format
msgid "Agility %+d"
msgstr "Agilidade %+d"
-#: src/net/tmwa/generalhandler.cpp:111
+#: src/net/tmwa/generalhandler.cpp:110
#, c-format
msgid "Vitality %+d"
msgstr "Vitalidade %+d"
-#: src/net/tmwa/generalhandler.cpp:112
+#: src/net/tmwa/generalhandler.cpp:111
#, c-format
msgid "Intelligence %+d"
msgstr "Inteligência %+d"
-#: src/net/tmwa/generalhandler.cpp:113
+#: src/net/tmwa/generalhandler.cpp:112
#, c-format
msgid "Dexterity %+d"
msgstr "Destreza %+d"
-#: src/net/tmwa/generalhandler.cpp:114
+#: src/net/tmwa/generalhandler.cpp:113
#, c-format
msgid "Luck %+d"
msgstr "Sorte %+d"
-#: src/net/tmwa/generalhandler.cpp:140
+#: src/net/tmwa/generalhandler.cpp:139
msgid "Authentication failed."
msgstr "Falha de autenticação."
-#: src/net/tmwa/generalhandler.cpp:143
+#: src/net/tmwa/generalhandler.cpp:142
msgid "No servers available."
msgstr "Servidores indisponíveis."
-#: src/net/tmwa/generalhandler.cpp:147
+#: src/net/tmwa/generalhandler.cpp:146
msgid "Someone else is trying to use this account."
msgstr "Outra pessoa está tentando utilizar esta conta."
-#: src/net/tmwa/generalhandler.cpp:150
+#: src/net/tmwa/generalhandler.cpp:149
msgid "This account is already logged in."
msgstr "Existe alguém conectado a esta conta."
-#: src/net/tmwa/generalhandler.cpp:153
+#: src/net/tmwa/generalhandler.cpp:152
msgid "Speed hack detected."
msgstr "Hack de velocidade detectado."
-#: src/net/tmwa/generalhandler.cpp:156
+#: src/net/tmwa/generalhandler.cpp:155
msgid "Duplicated login."
msgstr "Login duplicado."
-#: src/net/tmwa/generalhandler.cpp:159
+#: src/net/tmwa/generalhandler.cpp:158
msgid "Unknown connection error."
msgstr "Erro de conexão desconhecido."
-#: src/net/tmwa/generalhandler.cpp:232
+#: src/net/tmwa/generalhandler.cpp:231
msgid "Got disconnected from server!"
msgstr "Você foi desconectado do servidor!"
-#: src/net/tmwa/generalhandler.cpp:264
+#: src/net/tmwa/generalhandler.cpp:263
msgid "Luck"
msgstr "Sorte"
-#: src/net/tmwa/generalhandler.cpp:267
+#: src/net/tmwa/generalhandler.cpp:266
msgid "Defense"
msgstr "Defesa"
-#: src/net/tmwa/generalhandler.cpp:268
+#: src/net/tmwa/generalhandler.cpp:267
msgid "M.Attack"
msgstr "Atq. Mágico"
-#: src/net/tmwa/generalhandler.cpp:269
+#: src/net/tmwa/generalhandler.cpp:268
msgid "M.Defense"
msgstr "Def. Mágica"
-#: src/net/tmwa/generalhandler.cpp:271
+#: src/net/tmwa/generalhandler.cpp:270
#, no-c-format
msgid "% Accuracy"
msgstr "% Exatidão"
-#: src/net/tmwa/generalhandler.cpp:273
+#: src/net/tmwa/generalhandler.cpp:272
#, no-c-format
msgid "% Evade"
msgstr "% Evasão"
-#: src/net/tmwa/generalhandler.cpp:275
+#: src/net/tmwa/generalhandler.cpp:274
#, no-c-format
msgid "% Critical"
msgstr "% Críticos"
-#: src/net/tmwa/generalhandler.cpp:276
+#: src/net/tmwa/generalhandler.cpp:275
msgid "Attack Delay"
msgstr "Atraso de ataque"
-#: src/net/tmwa/generalhandler.cpp:278
+#: src/net/tmwa/generalhandler.cpp:277
msgid "Walk Delay"
msgstr "Atraso de movimento"
-#: src/net/tmwa/generalhandler.cpp:280
+#: src/net/tmwa/generalhandler.cpp:279
msgid "Attack Range"
msgstr "Atraso de alcance"
+#: src/net/tmwa/generalhandler.cpp:281
+msgid "Damage per sec."
+msgstr "Dano por seg."
+
#: src/net/tmwa/network.cpp:152
msgid "Empty address given to Network::connect()!"
msgstr "Endereço vazio enviado para Network::connect()!"
@@ -5476,31 +5509,31 @@ msgstr "Bolha '...' flutuante"
msgid "Floating bubble"
msgstr "Bolha Flutuante"
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:248
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:246
#: src/resources/monsterdb.cpp:84
msgid "unnamed"
msgstr "sem nome"
-#: src/resources/itemdb.cpp:65
+#: src/resources/itemdb.cpp:63
#, c-format
msgid "Attack %+d"
msgstr "Ataque %+d"
-#: src/resources/itemdb.cpp:66
+#: src/resources/itemdb.cpp:64
#, c-format
msgid "Defense %+d"
msgstr "Defesa %+d"
-#: src/resources/itemdb.cpp:67
+#: src/resources/itemdb.cpp:65
#, c-format
msgid "HP %+d"
msgstr "HP %+d"
-#: src/resources/itemdb.cpp:68
+#: src/resources/itemdb.cpp:66
#, c-format
msgid "MP %+d"
msgstr "MP %+d"
-#: src/resources/itemdb.cpp:171
+#: src/resources/itemdb.cpp:169
msgid "Unknown item"
msgstr "Item desconhecido"
diff --git a/po/ru.po b/po/ru.po
index 4011f51f9..6e2d28545 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-20 17:42+0300\n"
-"PO-Revision-Date: 2011-08-16 16:10+0000\n"
+"POT-Creation-Date: 2011-09-02 18:27+0300\n"
+"PO-Revision-Date: 2011-09-02 15:34+0000\n"
"Last-Translator: akaras <akaras@inbox.ru>\n"
"Language-Team: Russian (http://www.transifex.net/projects/p/manaplus/team/"
"ru/)\n"
@@ -26,119 +26,119 @@ msgstr ""
msgid "Visible on map"
msgstr "Видимые на карте"
-#: src/being.cpp:542
+#: src/being.cpp:549
msgid "dodge"
msgstr "уворот"
-#: src/being.cpp:542
+#: src/being.cpp:549
msgid "miss"
msgstr "промах"
#. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1514
+#: src/being.cpp:1529
msgid "A"
msgstr "О"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1519
+#: src/being.cpp:1534
msgid "I"
msgstr "Б"
-#: src/client.cpp:826 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:831 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
msgid "Setup"
msgstr "Настройка"
-#: src/client.cpp:909
+#: src/client.cpp:914
msgid "Connecting to server"
msgstr "Идет подключение к серверу..."
-#: src/client.cpp:940
+#: src/client.cpp:945
msgid "Logging in"
msgstr "Авторизация"
-#: src/client.cpp:973
+#: src/client.cpp:978
msgid "Entering game world"
msgstr "Входим в игровой мир"
-#: src/client.cpp:1073
+#: src/client.cpp:1078
msgid "Requesting characters"
msgstr "Получение списка персонажей"
-#: src/client.cpp:1104
+#: src/client.cpp:1109
msgid "Connecting to the game server"
msgstr "Подключение к игровому серверу"
-#: src/client.cpp:1114
+#: src/client.cpp:1119
msgid "Changing game servers"
msgstr "Смена игрового сервера"
-#: src/client.cpp:1151 src/client.cpp:1158 src/client.cpp:1293
+#: src/client.cpp:1156 src/client.cpp:1163 src/client.cpp:1298
#: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
-#: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:395
+#: src/gui/charcreatedialog.cpp:221 src/gui/charselectdialog.cpp:253
+#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
#: src/net/manaserv/charhandler.cpp:227
msgid "Error"
msgstr "Ошибка"
-#: src/client.cpp:1167
+#: src/client.cpp:1172
msgid "Requesting registration details"
msgstr "Запрос регистрационных данных"
-#: src/client.cpp:1194
+#: src/client.cpp:1199
msgid "Password Change"
msgstr "Изменить Пароль"
-#: src/client.cpp:1195
+#: src/client.cpp:1200
msgid "Password changed successfully!"
msgstr "Пароль изменен!"
-#: src/client.cpp:1214
+#: src/client.cpp:1219
msgid "Email Change"
msgstr "Сменить Email"
-#: src/client.cpp:1215
+#: src/client.cpp:1220
msgid "Email changed successfully!"
msgstr "Email изменен!"
-#: src/client.cpp:1235
+#: src/client.cpp:1240
msgid "Unregister Successful"
msgstr "Регистрация удалена"
-#: src/client.cpp:1236
+#: src/client.cpp:1241
msgid "Farewell, come back any time..."
msgstr "Хорошо, возвращайтесь в любое время..."
-#: src/client.cpp:1423 src/client.cpp:1453 src/client.cpp:1497
-#: src/client.cpp:1922 src/client.cpp:1929
+#: src/client.cpp:1428 src/client.cpp:1458 src/client.cpp:1502
+#: src/client.cpp:1927 src/client.cpp:1934
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%s не существует, и не может быть создано! Выход."
-#: src/client.cpp:1628
+#: src/client.cpp:1633
#, c-format
msgid "Invalid update host: %s"
msgstr "Некорректный сервер обновлений: %s"
-#: src/client.cpp:1662 src/client.cpp:1668
+#: src/client.cpp:1667 src/client.cpp:1673
msgid "Error creating updates directory!"
msgstr "Ошибка создания директории для обновлений!"
-#: src/client.cpp:1689
+#: src/client.cpp:1694
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "Ошибка: %s не существует, и не может быть создан! Выход."
-#: src/commandhandler.cpp:301
+#: src/commandhandler.cpp:303
msgid "Unknown command."
msgstr "Неизвестная команда."
-#: src/commandhandler.cpp:401
+#: src/commandhandler.cpp:403
msgid "Cannot send empty whispers!"
msgstr "Нельзя отправлять пустые сообщения!"
-#: src/commandhandler.cpp:415
+#: src/commandhandler.cpp:417
#, c-format
msgid ""
"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
@@ -147,97 +147,97 @@ msgstr ""
"Невозможно создать вкладку для личного общения с игроком \"%s\"! Или вкладка "
"уже создана, или этот игрок Вы сами."
-#: src/commandhandler.cpp:435
+#: src/commandhandler.cpp:437
#, c-format
msgid "Requesting to join channel %s."
msgstr "Запрос на присоединение к каналу %s."
-#: src/commandhandler.cpp:451 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:453 src/net/ea/gui/partytab.cpp:125
msgid "Party name is missing."
msgstr "Не указано название группы"
-#: src/commandhandler.cpp:462
+#: src/commandhandler.cpp:464
msgid "Guild name is missing."
msgstr "Не задано имя гильдии."
-#: src/commandhandler.cpp:475 src/commandhandler.cpp:582
-#: src/commandhandler.cpp:623 src/commandhandler.cpp:653
+#: src/commandhandler.cpp:477 src/commandhandler.cpp:589
+#: src/commandhandler.cpp:630 src/commandhandler.cpp:660
msgid "Please specify a name."
msgstr "Пожалуйста, укажите имя"
-#: src/commandhandler.cpp:516
+#: src/commandhandler.cpp:523
msgid "Return toggles chat."
msgstr "Enter переключает Вас на окно чата."
-#: src/commandhandler.cpp:516
+#: src/commandhandler.cpp:523
msgid "Message closes chat."
msgstr "Сообщение закрывает чат."
-#: src/commandhandler.cpp:527
+#: src/commandhandler.cpp:534
msgid "Return now toggles chat."
msgstr "Теперь Return переключает чат."
-#: src/commandhandler.cpp:533
+#: src/commandhandler.cpp:540
msgid "Message now closes chat."
msgstr "Теперь сообщение закрывает чат."
-#: src/commandhandler.cpp:561
+#: src/commandhandler.cpp:568
msgid "friend"
msgstr "друг"
-#: src/commandhandler.cpp:566
+#: src/commandhandler.cpp:573
msgid "disregarded"
msgstr "пренебрегаемый"
-#: src/commandhandler.cpp:571
+#: src/commandhandler.cpp:578
msgid "neutral"
msgstr "нейтральный"
-#: src/commandhandler.cpp:590
+#: src/commandhandler.cpp:597
#, c-format
msgid "Player already %s!"
msgstr "Игрок уже %s!"
-#: src/commandhandler.cpp:604
+#: src/commandhandler.cpp:611
#, c-format
msgid "Player successfully %s!"
msgstr "Игрок удачно %s!"
-#: src/commandhandler.cpp:612
+#: src/commandhandler.cpp:619
#, c-format
msgid "Player could not be %s!"
msgstr "Игрок не может быть %s!"
-#: src/commandhandler.cpp:634
+#: src/commandhandler.cpp:641
msgid "Player wasn't ignored!"
msgstr "Игрок не был игнорируемым!"
-#: src/commandhandler.cpp:641
+#: src/commandhandler.cpp:648
msgid "Player no longer ignored!"
msgstr "Игрок больше не игнорируется!"
-#: src/commandhandler.cpp:643
+#: src/commandhandler.cpp:650
msgid "Player could not be unignored!"
msgstr "Игрок не может быть удален из списка игнорирования!"
-#: src/commandhandler.cpp:660
+#: src/commandhandler.cpp:667
msgid "Player already erased!"
msgstr "Игрок и так уже удален!"
-#: src/commandhandler.cpp:671
+#: src/commandhandler.cpp:678
msgid "Player successfully erased!"
msgstr "Игрок удален!"
-#: src/commandhandler.cpp:673
+#: src/commandhandler.cpp:680
msgid "Player could not be erased!"
msgstr "Игрок не может быть удален!"
-#: src/commandhandler.cpp:972 src/commandhandler.cpp:1018
+#: src/commandhandler.cpp:980 src/commandhandler.cpp:1026
#, c-format
msgid "Client uptime: %s"
msgstr "Время работы клиента: %s"
-#: src/commandhandler.cpp:982
+#: src/commandhandler.cpp:990
#, c-format
msgid "%d week"
msgid_plural "%d weeks"
@@ -245,7 +245,7 @@ msgstr[0] "%d неделя"
msgstr[1] "%d недели"
msgstr[2] "%d недель"
-#: src/commandhandler.cpp:991
+#: src/commandhandler.cpp:999
#, c-format
msgid "%d day"
msgid_plural "%d days"
@@ -253,7 +253,7 @@ msgstr[0] "%d день"
msgstr[1] "%d дня"
msgstr[2] "%d дней"
-#: src/commandhandler.cpp:999
+#: src/commandhandler.cpp:1007
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
@@ -261,7 +261,7 @@ msgstr[0] "%d час"
msgstr[1] "%d часа"
msgstr[2] "%d часов"
-#: src/commandhandler.cpp:1007
+#: src/commandhandler.cpp:1015
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
@@ -269,7 +269,7 @@ msgstr[0] "%d минута"
msgstr[1] "%d минуты"
msgstr[2] "%d минут"
-#: src/commandhandler.cpp:1015
+#: src/commandhandler.cpp:1023
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
@@ -277,27 +277,27 @@ msgstr[0] "%d секунда"
msgstr[1] "%d секунды"
msgstr[2] "%d секунд"
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1102
msgid "font cache size"
msgstr "размер кеша шрифта"
-#: src/commandhandler.cpp:1106
+#: src/commandhandler.cpp:1114
msgid "Cache size:"
msgstr "Размер кеша:"
-#: src/commandhandler.cpp:1110
+#: src/commandhandler.cpp:1118
msgid "Created:"
msgstr "Создано:"
-#: src/commandhandler.cpp:1112
+#: src/commandhandler.cpp:1120
msgid "Deleted:"
msgstr "Удалено:"
-#: src/commandhandler.cpp:1159 src/commandhandler.cpp:1166
+#: src/commandhandler.cpp:1167 src/commandhandler.cpp:1174
msgid "Resource images:"
msgstr "Изображений:"
-#: src/commandhandler.cpp:1161 src/commandhandler.cpp:1168
+#: src/commandhandler.cpp:1169 src/commandhandler.cpp:1176
msgid "Resource orphaned images:"
msgstr "Удаленных изображений:"
@@ -308,43 +308,43 @@ msgstr ""
"/%s может принимать значение \"yes\", \"no\", \"true\", \"false\", \"1\" или "
"\"0\"."
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:411
+#: src/game.cpp:252 src/gui/widgets/chattab.cpp:409
msgid "General"
msgstr "Общие"
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:413
+#: src/game.cpp:256 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:411
msgid "Debug"
msgstr "Отладка"
-#: src/game.cpp:488
+#: src/game.cpp:511
msgid "Screenshot saved as "
msgstr "Снимок экрана сохранен как "
-#: src/game.cpp:496
+#: src/game.cpp:519
msgid "Saving screenshot failed!"
msgstr "Ошибка при сохранении снимка экрана!"
-#: src/game.cpp:536
+#: src/game.cpp:559
msgid "The connection to the server was lost."
msgstr "Соединение с сервером потеряно."
-#: src/game.cpp:548
+#: src/game.cpp:571
msgid "Network Error"
msgstr "Ошибка сети"
-#: src/game.cpp:1213
+#: src/game.cpp:1236
msgid "Ignoring incoming trade requests"
msgstr "Игнорировать предложения о торговле"
-#: src/game.cpp:1220
+#: src/game.cpp:1243
msgid "Accepting incoming trade requests"
msgstr "Принимать предложения о торговле"
-#: src/game.cpp:1606
+#: src/game.cpp:1629
msgid "Could Not Load Map"
msgstr "Не удалось загрузить карту"
-#: src/game.cpp:1607
+#: src/game.cpp:1630
#, c-format
msgid "Error while loading %s"
msgstr "Ошибка во время загрузки %s"
@@ -373,103 +373,103 @@ msgstr "Комментарий: %s"
msgid "Bot Checker"
msgstr "Окно детектора ботов"
-#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
+#: src/gui/botcheckerwindow.cpp:295 src/gui/setup_relations.cpp:64
msgid "Name"
msgstr "Имя"
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:134
-#: src/gui/popupmenu.cpp:292 src/gui/popupmenu.cpp:617
-#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
+#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:133
+#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:646
+#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:265
msgid "Attack"
msgstr "Атака"
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:279
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:297
#: src/keyboardconfig.cpp:62
msgid "Talk"
msgstr "Разговор"
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:245
-#: src/gui/popupmenu.cpp:284 src/gui/popupmenu.cpp:674
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:263
+#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:703
msgid "Move"
msgstr "Движение"
-#: src/gui/botcheckerwindow.cpp:300
+#: src/gui/botcheckerwindow.cpp:299
msgid "Result"
msgstr "Результат"
-#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123
+#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:124
msgid "Reset"
msgstr "Сбросить"
-#: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:260
-#: src/gui/popupmenu.cpp:281 src/gui/popupmenu.cpp:688
+#: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:98
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:278
+#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:717
msgid "Buy"
msgstr "Купить"
-#: src/gui/buydialog.cpp:88 src/gui/buydialog.cpp:302
-#: src/gui/selldialog.cpp:87 src/gui/selldialog.cpp:324
+#: src/gui/buydialog.cpp:89 src/gui/buydialog.cpp:303
+#: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
#, c-format
msgid "Price: %s / Total: %s"
msgstr "Цена: %s / Всего: %s"
#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
#. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:93 src/gui/itemamountwindow.cpp:207
-#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:113
-#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:974
+#: src/gui/buydialog.cpp:94 src/gui/itemamountwindow.cpp:207
+#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:973
msgid "+"
msgstr "+"
#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
#. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:96 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:986
+#: src/gui/buydialog.cpp:97 src/gui/itemamountwindow.cpp:206
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:985
msgid "-"
msgstr "-"
-#: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
-#: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
-#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:288
+#: src/gui/buydialog.cpp:99 src/gui/quitdialog.cpp:47
+#: src/gui/quitdialog.cpp:49 src/gui/quitdialog.cpp:50
+#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:294
#: src/keyboardconfig.cpp:290
msgid "Quit"
msgstr "Выход"
-#: src/gui/buydialog.cpp:99 src/gui/selldialog.cpp:94
-#: src/gui/statuswindow.cpp:503 src/gui/statuswindow.cpp:552
-#: src/gui/statuswindow.cpp:973 src/gui/statuswindow.cpp:1004
+#: src/gui/buydialog.cpp:100 src/gui/selldialog.cpp:95
+#: src/gui/statuswindow.cpp:504 src/gui/statuswindow.cpp:553
+#: src/gui/statuswindow.cpp:972 src/gui/statuswindow.cpp:1003
msgid "Max"
msgstr "Макс"
#: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:133
+#: src/gui/inventorywindow.cpp:147 src/gui/setup_other.cpp:133
msgid "Shop"
msgstr "Магазин"
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:262
-#: src/gui/popupmenu.cpp:282 src/gui/popupmenu.cpp:690
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:280
+#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:719
#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
-#: src/gui/selldialog.cpp:92
+#: src/gui/selldialog.cpp:93
msgid "Sell"
msgstr "Продать"
#: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
-#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
+#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:96
#: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:336
-#: src/gui/popupmenu.cpp:357 src/gui/popupmenu.cpp:460
-#: src/gui/popupmenu.cpp:487 src/gui/popupmenu.cpp:511
-#: src/gui/popupmenu.cpp:525 src/gui/popupmenu.cpp:544
-#: src/gui/popupmenu.cpp:750 src/gui/popupmenu.cpp:774
-#: src/gui/popupmenu.cpp:1684 src/gui/popupmenu.cpp:1712
-#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1811
-#: src/gui/popupmenu.cpp:1846 src/gui/popupmenu.cpp:1886
-#: src/gui/popupmenu.cpp:1953 src/gui/popupmenu.cpp:1973
-#: src/gui/quitdialog.cpp:59 src/gui/register.cpp:82 src/gui/setup.cpp:71
-#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:354
+#: src/gui/popupmenu.cpp:375 src/gui/popupmenu.cpp:489
+#: src/gui/popupmenu.cpp:516 src/gui/popupmenu.cpp:540
+#: src/gui/popupmenu.cpp:554 src/gui/popupmenu.cpp:573
+#: src/gui/popupmenu.cpp:790 src/gui/popupmenu.cpp:814
+#: src/gui/popupmenu.cpp:1734 src/gui/popupmenu.cpp:1762
+#: src/gui/popupmenu.cpp:1818 src/gui/popupmenu.cpp:1861
+#: src/gui/popupmenu.cpp:1896 src/gui/popupmenu.cpp:1936
+#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2023
+#: src/gui/quitdialog.cpp:54 src/gui/register.cpp:82 src/gui/setup.cpp:72
+#: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:238
#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updaterwindow.cpp:157
+#: src/gui/updaterwindow.cpp:161
msgid "Cancel"
msgstr "Отмена"
@@ -501,7 +501,7 @@ msgid "The email address entries mismatch."
msgstr "Адрес E-mail не совпадает"
#: src/gui/changepassworddialog.cpp:50 src/gui/changepassworddialog.cpp:59
-#: src/gui/charselectdialog.cpp:140
+#: src/gui/charselectdialog.cpp:139
msgid "Change Password"
msgstr "Изменить пароль"
@@ -536,121 +536,121 @@ msgstr "Новый пароль не совпадает."
msgid "Create Character"
msgstr "Создать персонажа"
-#: src/gui/charcreatedialog.cpp:73 src/gui/logindialog.cpp:94
+#: src/gui/charcreatedialog.cpp:76 src/gui/logindialog.cpp:94
#: src/gui/register.cpp:75
msgid "Name:"
msgstr "Имя:"
#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
#. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:76 src/gui/charcreatedialog.cpp:81
-#: src/gui/charcreatedialog.cpp:87 src/gui/outfitwindow.cpp:81
+#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:84
+#: src/gui/charcreatedialog.cpp:90 src/gui/outfitwindow.cpp:85
msgid ">"
msgstr ">"
#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
#. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:82
-#: src/gui/charcreatedialog.cpp:88 src/gui/outfitwindow.cpp:80
+#: src/gui/charcreatedialog.cpp:82 src/gui/charcreatedialog.cpp:85
+#: src/gui/charcreatedialog.cpp:91 src/gui/outfitwindow.cpp:84
msgid "<"
msgstr "<"
-#: src/gui/charcreatedialog.cpp:80
+#: src/gui/charcreatedialog.cpp:83
msgid "Hair color:"
msgstr "Цвет волос:"
-#: src/gui/charcreatedialog.cpp:83
+#: src/gui/charcreatedialog.cpp:86
msgid "Hair style:"
msgstr "Стрижка:"
-#: src/gui/charcreatedialog.cpp:89
+#: src/gui/charcreatedialog.cpp:92
msgid "Race:"
msgstr "Раса:"
-#: src/gui/charcreatedialog.cpp:92 src/gui/charselectdialog.cpp:479
-#: src/gui/socialwindow.cpp:1033
+#: src/gui/charcreatedialog.cpp:95 src/gui/charselectdialog.cpp:478
+#: src/gui/socialwindow.cpp:1139
msgid "Create"
msgstr "Создать"
-#: src/gui/charcreatedialog.cpp:94 src/gui/register.cpp:98
+#: src/gui/charcreatedialog.cpp:97 src/gui/register.cpp:98
msgid "Male"
msgstr "Мужчина"
-#: src/gui/charcreatedialog.cpp:95 src/gui/register.cpp:99
+#: src/gui/charcreatedialog.cpp:98 src/gui/register.cpp:99
msgid "Female"
msgstr "Женщина"
-#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:300
+#: src/gui/charcreatedialog.cpp:116 src/gui/charcreatedialog.cpp:303
#, c-format
msgid "Please distribute %d points"
msgstr "Распределите очки (%d)"
-#: src/gui/charcreatedialog.cpp:219
+#: src/gui/charcreatedialog.cpp:222
msgid "Your name needs to be at least 4 characters."
msgstr "Имя должно содержать не менее четырех символов."
-#: src/gui/charcreatedialog.cpp:291
+#: src/gui/charcreatedialog.cpp:294
msgid "Character stats OK"
msgstr "Данные персонажа в порядке"
-#: src/gui/charcreatedialog.cpp:305
+#: src/gui/charcreatedialog.cpp:308
#, c-format
msgid "Please remove %d points"
msgstr "Снимите очки (%d)"
-#: src/gui/charselectdialog.cpp:77
+#: src/gui/charselectdialog.cpp:76
msgid "Confirm Character Delete"
msgstr "Подтвердите удаление героя"
-#: src/gui/charselectdialog.cpp:78
+#: src/gui/charselectdialog.cpp:77
msgid "Are you sure you want to delete this character?"
msgstr "Вы уверены, что хотите удалить этого персонажа?"
-#: src/gui/charselectdialog.cpp:126
+#: src/gui/charselectdialog.cpp:125
msgid "Account and Character Management"
msgstr "Управление учётной записью"
-#: src/gui/charselectdialog.cpp:139
+#: src/gui/charselectdialog.cpp:138
msgid "Switch Login"
msgstr "Сменить героя"
-#: src/gui/charselectdialog.cpp:153 src/gui/unregisterdialog.cpp:50
+#: src/gui/charselectdialog.cpp:152 src/gui/unregisterdialog.cpp:50
#: src/gui/unregisterdialog.cpp:58
msgid "Unregister"
msgstr "Удалить регистрацию"
-#: src/gui/charselectdialog.cpp:162
+#: src/gui/charselectdialog.cpp:161
msgid "Change Email"
msgstr "Сменить адрес E-mail"
-#: src/gui/charselectdialog.cpp:254
+#: src/gui/charselectdialog.cpp:253
msgid "Incorrect password"
msgstr "Нправильный пароль"
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:286
msgid "Enter password for deleting character"
msgstr "Введите пароль для удаления персонажа"
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:286
msgid "Enter password:"
msgstr "Введите пароль:"
-#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:292
-#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
-#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
+#: src/gui/charselectdialog.cpp:408 src/gui/serverdialog.cpp:298
+#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:122
+#: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:241
msgid "Delete"
msgstr "Удалить"
-#: src/gui/charselectdialog.cpp:467
+#: src/gui/charselectdialog.cpp:466
msgid "Choose"
msgstr "Выбрать"
-#: src/gui/charselectdialog.cpp:470
+#: src/gui/charselectdialog.cpp:469
#, c-format
msgid "Level %d"
msgstr "Уровень: %d"
-#: src/gui/charselectdialog.cpp:481 src/gui/charselectdialog.cpp:482
+#: src/gui/charselectdialog.cpp:480 src/gui/charselectdialog.cpp:481
msgid "(empty)"
msgstr "(пусто)"
@@ -722,12 +722,12 @@ msgstr "???"
msgid "Chat"
msgstr "Чат"
-#: src/gui/chatwindow.cpp:606
+#: src/gui/chatwindow.cpp:609
#, c-format
msgid "Present: %s; %d players are present."
msgstr "Присутствуют: %s; Всего %d игроков."
-#: src/gui/chatwindow.cpp:993
+#: src/gui/chatwindow.cpp:996
#, c-format
msgid "Whispering to %s: %s"
msgstr "Вы прошептали %s: %s"
@@ -740,145 +740,145 @@ msgstr "Да"
msgid "No"
msgstr "Нет"
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:150
-#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:384
-#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:632
-#: src/gui/popupmenu.cpp:640
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:149
+#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:402
+#: src/gui/popupmenu.cpp:408 src/gui/popupmenu.cpp:661
+#: src/gui/popupmenu.cpp:669
msgid "Ignore"
msgstr "Игнорировать"
-#: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
+#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:97
#: src/gui/setup_other.cpp:64
msgid "Map"
msgstr "Карта"
-#: src/gui/debugwindow.cpp:71
+#: src/gui/debugwindow.cpp:73
msgid "Target"
msgstr "Цель"
-#: src/gui/debugwindow.cpp:72
+#: src/gui/debugwindow.cpp:74
msgid "Net"
msgstr "Сеть"
-#: src/gui/debugwindow.cpp:145 src/gui/debugwindow.cpp:220
-#: src/gui/debugwindow.cpp:249
+#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
+#: src/gui/debugwindow.cpp:251
msgid "Music:"
msgstr "Музыка:"
-#: src/gui/debugwindow.cpp:146 src/gui/debugwindow.cpp:224
-#: src/gui/debugwindow.cpp:251
+#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:226
+#: src/gui/debugwindow.cpp:253
msgid "Map:"
msgstr "Карта:"
-#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
-#: src/gui/debugwindow.cpp:250
+#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:224
+#: src/gui/debugwindow.cpp:252
msgid "Minimap:"
msgstr "МиниКарта:"
-#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:218
-#: src/gui/debugwindow.cpp:247
+#: src/gui/debugwindow.cpp:150 src/gui/debugwindow.cpp:220
+#: src/gui/debugwindow.cpp:249
msgid "Cursor:"
msgstr "Курсор:"
-#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:201
-#: src/gui/debugwindow.cpp:206
+#: src/gui/debugwindow.cpp:151 src/gui/debugwindow.cpp:203
+#: src/gui/debugwindow.cpp:208
msgid "Player Position:"
msgstr "Позиция игрока:"
-#: src/gui/debugwindow.cpp:152
+#: src/gui/debugwindow.cpp:154
msgid "Particle count:"
msgstr "Количество эффектов:"
-#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:235
-#: src/gui/debugwindow.cpp:254
+#: src/gui/debugwindow.cpp:156 src/gui/debugwindow.cpp:237
+#: src/gui/debugwindow.cpp:256
msgid "Map actors count:"
msgstr "Кол-во. объектов:"
-#: src/gui/debugwindow.cpp:162 src/gui/debugwindow.cpp:173
+#: src/gui/debugwindow.cpp:164 src/gui/debugwindow.cpp:175
#, c-format
msgid "%d FPS (Software)"
msgstr "%d FPS (Программно)"
-#: src/gui/debugwindow.cpp:166
+#: src/gui/debugwindow.cpp:168
#, c-format
msgid "%d FPS (fast OpenGL)"
msgstr "%d FPS (быстрый OpenGL)"
-#: src/gui/debugwindow.cpp:169
+#: src/gui/debugwindow.cpp:171
#, c-format
msgid "%d FPS (old OpenGL)"
msgstr "%d FPS (старый OpenGL)"
-#: src/gui/debugwindow.cpp:176
+#: src/gui/debugwindow.cpp:178
#, c-format
msgid "%d FPS"
msgstr "%d FPS"
-#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:240
+#: src/gui/debugwindow.cpp:190 src/gui/debugwindow.cpp:242
msgid "Textures count:"
msgstr "Количество текстур:"
-#: src/gui/debugwindow.cpp:231
+#: src/gui/debugwindow.cpp:233
#, c-format
msgid "Particle count: %d"
msgstr "Количество частиц: %d"
-#: src/gui/debugwindow.cpp:268 src/gui/debugwindow.cpp:299
-#: src/gui/debugwindow.cpp:343
+#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:301
+#: src/gui/debugwindow.cpp:345
msgid "Target:"
msgstr "Цель:"
-#: src/gui/debugwindow.cpp:269 src/gui/debugwindow.cpp:304
-#: src/gui/debugwindow.cpp:344
+#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:306
+#: src/gui/debugwindow.cpp:346
msgid "Target Id:"
msgstr "Id цели:"
-#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:308
-#: src/gui/debugwindow.cpp:313 src/gui/debugwindow.cpp:345
+#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:310
+#: src/gui/debugwindow.cpp:315 src/gui/debugwindow.cpp:347
msgid "Target Level:"
msgstr "Уровень цели:"
-#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:316
-#: src/gui/debugwindow.cpp:346
+#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:318
+#: src/gui/debugwindow.cpp:348
msgid "Target Party:"
msgstr "Группа цели:"
-#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:319
-#: src/gui/debugwindow.cpp:347
+#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:321
+#: src/gui/debugwindow.cpp:349
msgid "Target Guild:"
msgstr "Гильдия цели:"
-#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:333
-#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:348
+#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:335
+#: src/gui/debugwindow.cpp:340 src/gui/debugwindow.cpp:350
msgid "Attack delay:"
msgstr "Задержка атаки:"
-#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:323
-#: src/gui/debugwindow.cpp:349
+#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:325
+#: src/gui/debugwindow.cpp:351
msgid "Minimal hit:"
msgstr "Минимальный удар:"
-#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:325
-#: src/gui/debugwindow.cpp:350
+#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:327
+#: src/gui/debugwindow.cpp:352
msgid "Maximum hit:"
msgstr "Максимальный удар:"
-#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:327
-#: src/gui/debugwindow.cpp:351
+#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:329
+#: src/gui/debugwindow.cpp:353
msgid "Critical hit:"
msgstr "Критический удар:"
-#: src/gui/debugwindow.cpp:385 src/gui/debugwindow.cpp:390
+#: src/gui/debugwindow.cpp:387 src/gui/debugwindow.cpp:392
#, c-format
msgid "Ping: %s ms"
msgstr "Пинг: %s мс."
-#: src/gui/debugwindow.cpp:393
+#: src/gui/debugwindow.cpp:395
#, c-format
msgid "In: %d bytes/s"
msgstr "Вх.: %d байт/сек."
-#: src/gui/debugwindow.cpp:395
+#: src/gui/debugwindow.cpp:397
#, c-format
msgid "Out: %d bytes/s"
msgstr "Исх.: %d байт/сек."
@@ -887,26 +887,26 @@ msgstr "Исх.: %d байт/сек."
msgid "Did You Know?"
msgstr "Вы знаете?"
-#: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
-#: src/gui/inventorywindow.cpp:175 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:559 src/gui/shopwindow.cpp:111
+#: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
+#: src/gui/inventorywindow.cpp:176 src/gui/npcdialog.cpp:53
+#: src/gui/popupmenu.cpp:588 src/gui/shopwindow.cpp:113
msgid "Close"
msgstr "Закрыть"
-#: src/gui/didyouknowwindow.cpp:62
+#: src/gui/didyouknowwindow.cpp:64
msgid "< Previous"
msgstr "< Предыдущий"
-#: src/gui/didyouknowwindow.cpp:63
+#: src/gui/didyouknowwindow.cpp:65
msgid "Next >"
msgstr "Следующий >"
-#: src/gui/didyouknowwindow.cpp:64
+#: src/gui/didyouknowwindow.cpp:66
msgid "Auto open this window"
msgstr "Автоматически открывать это окно"
#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:58 src/gui/textdialog.cpp:50
+#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:53 src/gui/textdialog.cpp:50
msgid "OK"
msgstr "ОК"
@@ -914,10 +914,10 @@ msgstr "ОК"
msgid "Equipment"
msgstr "Снаряжение"
-#: src/gui/equipmentwindow.cpp:93 src/gui/inventorywindow.cpp:130
-#: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
-#: src/gui/popupmenu.cpp:1643 src/gui/popupmenu.cpp:1738
-#: src/gui/popupmenu.cpp:1783
+#: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:131
+#: src/gui/inventorywindow.cpp:512 src/gui/inventorywindow.cpp:521
+#: src/gui/popupmenu.cpp:1693 src/gui/popupmenu.cpp:1788
+#: src/gui/popupmenu.cpp:1833
msgid "Unequip"
msgstr "Снять"
@@ -930,75 +930,75 @@ msgstr "Помощь"
msgid "Inventory"
msgstr "Инвентарь"
-#: src/gui/inventorywindow.cpp:104
+#: src/gui/inventorywindow.cpp:105
msgid "Slots:"
msgstr "Вместимость:"
-#: src/gui/inventorywindow.cpp:115
+#: src/gui/inventorywindow.cpp:116
msgid "Filter:"
msgstr "Фильтр:"
-#: src/gui/inventorywindow.cpp:116
+#: src/gui/inventorywindow.cpp:117
msgid "Sort:"
msgstr "Сорт.:"
-#: src/gui/inventorywindow.cpp:122
+#: src/gui/inventorywindow.cpp:123
msgid "na"
msgstr "нет"
-#: src/gui/inventorywindow.cpp:123
+#: src/gui/inventorywindow.cpp:124
msgid "az"
msgstr "ая"
-#: src/gui/inventorywindow.cpp:124
+#: src/gui/inventorywindow.cpp:125
msgid "id"
msgstr "ид"
-#: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:513
-#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1645
-#: src/gui/popupmenu.cpp:1740 src/gui/popupmenu.cpp:1785
+#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
+#: src/gui/inventorywindow.cpp:523 src/gui/popupmenu.cpp:1695
+#: src/gui/popupmenu.cpp:1790 src/gui/popupmenu.cpp:1835
msgid "Equip"
msgstr "Надеть"
-#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
-#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1648
-#: src/gui/popupmenu.cpp:1707 src/gui/popupmenu.cpp:1744
-#: src/gui/popupmenu.cpp:1788
+#: src/gui/inventorywindow.cpp:130 src/gui/inventorywindow.cpp:515
+#: src/gui/inventorywindow.cpp:519 src/gui/popupmenu.cpp:1698
+#: src/gui/popupmenu.cpp:1757 src/gui/popupmenu.cpp:1794
+#: src/gui/popupmenu.cpp:1838
msgid "Use"
msgstr "Использовать"
-#: src/gui/inventorywindow.cpp:143 src/gui/inventorywindow.cpp:619
-#: src/gui/popupmenu.cpp:1652 src/gui/popupmenu.cpp:1749
-#: src/gui/popupmenu.cpp:1792
+#: src/gui/inventorywindow.cpp:144 src/gui/inventorywindow.cpp:620
+#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1799
+#: src/gui/popupmenu.cpp:1842
msgid "Drop..."
msgstr "Бросить"
-#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1661
-#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1801
+#: src/gui/inventorywindow.cpp:145 src/gui/popupmenu.cpp:1711
+#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1851
msgid "Split"
msgstr "Разделить"
-#: src/gui/inventorywindow.cpp:145 src/gui/outfitwindow.cpp:59
-#: src/gui/popupmenu.cpp:520
+#: src/gui/inventorywindow.cpp:146 src/gui/outfitwindow.cpp:60
+#: src/gui/popupmenu.cpp:549
msgid "Outfits"
msgstr "Наряды"
-#: src/gui/inventorywindow.cpp:148
+#: src/gui/inventorywindow.cpp:149
msgid "Weight:"
msgstr "Вес:"
-#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
-#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
-#: src/gui/popupmenu.cpp:1804 src/gui/setup.cpp:72
+#: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:611
+#: src/gui/popupmenu.cpp:1674 src/gui/popupmenu.cpp:1811
+#: src/gui/popupmenu.cpp:1854 src/gui/setup.cpp:73
msgid "Store"
msgstr "Сохранить"
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1668
+#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1718
msgid "Retrieve"
msgstr "Получить"
-#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1657
-#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1797
+#: src/gui/inventorywindow.cpp:622 src/gui/popupmenu.cpp:1707
+#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1847
#: src/gui/windowmenu.cpp:97
msgid "Drop"
msgstr "Бросить"
@@ -1039,11 +1039,11 @@ msgstr "Добавить в список продажи."
msgid "Unknown."
msgstr "Неизвестно."
-#: src/gui/itempopup.cpp:176 src/gui/itempopup.cpp:182
+#: src/gui/itempopup.cpp:177 src/gui/itempopup.cpp:183
msgid ", "
msgstr ","
-#: src/gui/itempopup.cpp:192
+#: src/gui/itempopup.cpp:193
#, c-format
msgid "Weight: %s"
msgstr "Вес: %s"
@@ -1052,51 +1052,51 @@ msgstr "Вес: %s"
msgid "Kill stats"
msgstr "Окно статистики атак"
-#: src/gui/killstats.cpp:64
+#: src/gui/killstats.cpp:65
msgid "Reset stats"
msgstr "Сбросить стат."
-#: src/gui/killstats.cpp:65
+#: src/gui/killstats.cpp:66
msgid "Reset timer"
msgstr "Сбросить таймер"
-#: src/gui/killstats.cpp:69 src/gui/killstats.cpp:205
+#: src/gui/killstats.cpp:70 src/gui/killstats.cpp:206
#, c-format
msgid "Level: %d at %f%%"
msgstr "Уровень: %d на %f%%"
-#: src/gui/killstats.cpp:73 src/gui/killstats.cpp:210
+#: src/gui/killstats.cpp:74 src/gui/killstats.cpp:211
#, c-format
msgid "Exp: %d/%d Left: %d"
msgstr "Опыт: %d/%d Осталось: %d"
-#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:216
-#: src/gui/killstats.cpp:225
+#: src/gui/killstats.cpp:77 src/gui/killstats.cpp:217
+#: src/gui/killstats.cpp:226
#, c-format
msgid "1%% = %d exp, avg mob for 1%%: %s"
msgstr "1%% = %d опыта, среднее кол-во мобов для 1%%: %s"
-#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:142
-#: src/gui/killstats.cpp:234
+#: src/gui/killstats.cpp:80 src/gui/killstats.cpp:143
+#: src/gui/killstats.cpp:235
#, c-format
msgid "Kills: %s, total exp: %s"
msgstr "Убийств: %s, опыта: %s"
-#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
-#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:230
+#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145
+#: src/gui/killstats.cpp:221 src/gui/killstats.cpp:231
#, c-format
msgid "Avg Exp: %s, No. of avg mob to next level: %s"
msgstr "Средний опыт: %s, среднее кол-во мобов до след. уровня: %s"
-#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:162
-#: src/gui/killstats.cpp:237
+#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:163
+#: src/gui/killstats.cpp:238
#, c-format
msgid "Kills/Min: %s, Exp/Min: %s"
msgstr "Убийств в минуту: %s, Опыта в минуту: %s"
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:89 src/gui/killstats.cpp:94
-#: src/gui/killstats.cpp:289 src/gui/killstats.cpp:305
-#: src/gui/killstats.cpp:323
+#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:90 src/gui/killstats.cpp:95
+#: src/gui/killstats.cpp:290 src/gui/killstats.cpp:306
+#: src/gui/killstats.cpp:324
#, c-format
msgid "Exp speed per %d min: %s"
msgid_plural "Exp speed per %d min: %s"
@@ -1104,7 +1104,7 @@ msgstr[0] "Опыт за %d мин.: %s"
msgstr[1] "Опыт за %d мин.: %s"
msgstr[2] "Опыт за %d мин.: %s"
-#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
+#: src/gui/killstats.cpp:88 src/gui/killstats.cpp:93 src/gui/killstats.cpp:98
#, c-format
msgid "Time for next level per %d min: %s"
msgid_plural "Time for next level per %d min: %s"
@@ -1112,32 +1112,36 @@ msgstr[0] "Время до следующего уровня в мин. %d: %s"
msgstr[1] "Время до следующего уровня в мин. %d: %s"
msgstr[2] "Время до следующего уровня в мин. %d: %s"
-#: src/gui/killstats.cpp:100 src/gui/killstats.cpp:241
+#: src/gui/killstats.cpp:101 src/gui/killstats.cpp:242
msgid "Last kill exp:"
msgstr "Опыт за последнее убийство:"
-#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:355
-#: src/gui/killstats.cpp:361 src/gui/killstats.cpp:367
-#: src/gui/killstats.cpp:372
+#: src/gui/killstats.cpp:103 src/gui/killstats.cpp:356
+#: src/gui/killstats.cpp:362 src/gui/killstats.cpp:368
+#: src/gui/killstats.cpp:373
msgid "Time before jacko spawn:"
msgstr "Время до появления jacko:"
-#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:301
-#: src/gui/killstats.cpp:311 src/gui/killstats.cpp:318
-#: src/gui/killstats.cpp:330 src/gui/killstats.cpp:337
+#: src/gui/killstats.cpp:295 src/gui/killstats.cpp:302
+#: src/gui/killstats.cpp:312 src/gui/killstats.cpp:319
+#: src/gui/killstats.cpp:331 src/gui/killstats.cpp:338
#, c-format
msgid " Time for next level: %s"
msgstr " Время до следующего уровня: %s"
-#: src/gui/killstats.cpp:361
+#: src/gui/killstats.cpp:362
#, c-format
msgid "%s %d?"
msgstr "%s %d?"
-#: src/gui/killstats.cpp:367
+#: src/gui/killstats.cpp:368
msgid "jacko spawning"
msgstr "jacko появляется"
+#: src/guildmanager.cpp:464 src/net/ea/guildhandler.cpp:439
+msgid "You have left the guild."
+msgstr "Вы покинули гильдию."
+
#: src/gui/logindialog.cpp:59
msgid "Normal"
msgstr "Нормально"
@@ -1154,7 +1158,7 @@ msgstr "Пропустить"
msgid "Login"
msgstr "Вход"
-#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:246
+#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:252
#: src/gui/widgets/chattab.cpp:173
msgid "Server:"
msgstr "Сервер:"
@@ -1236,11 +1240,11 @@ msgstr "Применить"
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:561
+#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:590
msgid "Clear"
msgstr "Очистить"
-#: src/gui/npcdialog.cpp:222
+#: src/gui/npcdialog.cpp:223
msgid "> Next"
msgstr "> Далее"
@@ -1256,346 +1260,346 @@ msgstr "Отправить"
msgid "Failed to send as sender or letter invalid."
msgstr "Невозможно послать ибо отправитель либо сообщение неверны."
-#: src/gui/outfitwindow.cpp:82 src/gui/outfitwindow.cpp:886
+#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:890
#, c-format
msgid "Outfit: %d"
msgstr "Наряд: %d"
-#: src/gui/outfitwindow.cpp:84 src/gui/outfitwindow.cpp:888
+#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:892
#, c-format
msgid "Key: %s"
msgstr "Клавиша: %s"
-#: src/gui/outfitwindow.cpp:87
+#: src/gui/outfitwindow.cpp:91
msgid "Unequip first"
msgstr "Сначала снять"
-#: src/gui/outfitwindow.cpp:90
+#: src/gui/outfitwindow.cpp:94
msgid "Away outfit"
msgstr "наряд отсутствия"
-#: src/gui/popupmenu.cpp:133 src/gui/popupmenu.cpp:616
+#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:645
#: src/gui/widgets/tradetab.cpp:44
msgid "Trade"
msgstr "Торговать"
-#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:375
+#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:393
msgid "Whisper"
msgstr "Приват"
-#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:621
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:650
msgid "Heal"
msgstr "Лечить"
-#: src/gui/popupmenu.cpp:146 src/gui/popupmenu.cpp:381
-#: src/gui/popupmenu.cpp:628
+#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:399
+#: src/gui/popupmenu.cpp:657
msgid "Be friend"
msgstr "Подружиться"
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:383
-#: src/gui/popupmenu.cpp:389 src/gui/popupmenu.cpp:408
-#: src/gui/popupmenu.cpp:630 src/gui/popupmenu.cpp:638
-#: src/gui/popupmenu.cpp:662
+#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:156
+#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:401
+#: src/gui/popupmenu.cpp:407 src/gui/popupmenu.cpp:426
+#: src/gui/popupmenu.cpp:659 src/gui/popupmenu.cpp:667
+#: src/gui/popupmenu.cpp:691
msgid "Disregard"
msgstr "Пренебречь"
-#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:161
-#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:177
-#: src/gui/popupmenu.cpp:385 src/gui/popupmenu.cpp:391
-#: src/gui/popupmenu.cpp:398 src/gui/popupmenu.cpp:403
-#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
-#: src/gui/popupmenu.cpp:649 src/gui/popupmenu.cpp:655
+#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:160
+#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:176
+#: src/gui/popupmenu.cpp:403 src/gui/popupmenu.cpp:409
+#: src/gui/popupmenu.cpp:416 src/gui/popupmenu.cpp:421
+#: src/gui/popupmenu.cpp:662 src/gui/popupmenu.cpp:670
+#: src/gui/popupmenu.cpp:678 src/gui/popupmenu.cpp:684
msgid "Erase"
msgstr "Стереть"
-#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:175
-#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:395
-#: src/gui/popupmenu.cpp:402 src/gui/popupmenu.cpp:407
-#: src/gui/popupmenu.cpp:646 src/gui/popupmenu.cpp:654
-#: src/gui/popupmenu.cpp:660
+#: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:174
+#: src/gui/popupmenu.cpp:181 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:425
+#: src/gui/popupmenu.cpp:675 src/gui/popupmenu.cpp:683
+#: src/gui/popupmenu.cpp:689
msgid "Unignore"
msgstr "Не игнорировать"
-#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:186
-#: src/gui/popupmenu.cpp:397 src/gui/popupmenu.cpp:410
-#: src/gui/popupmenu.cpp:648 src/gui/popupmenu.cpp:664
+#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:185
+#: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:428
+#: src/gui/popupmenu.cpp:677 src/gui/popupmenu.cpp:693
#: src/playerrelations.cpp:400
msgid "Completely ignore"
msgstr "@@ignore|Полностью игнорировать@@"
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:418
-#: src/gui/popupmenu.cpp:672
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:436
+#: src/gui/popupmenu.cpp:701
msgid "Follow"
msgstr "Следовать"
-#: src/gui/popupmenu.cpp:196 src/gui/popupmenu.cpp:419
-#: src/gui/popupmenu.cpp:673
+#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:437
+#: src/gui/popupmenu.cpp:702
msgid "Imitation"
msgstr "Имитировать"
-#: src/gui/popupmenu.cpp:206 src/gui/popupmenu.cpp:710
+#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:739
msgid "Invite to party"
msgstr "Пригласить в группу"
-#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:428
-#: src/gui/popupmenu.cpp:715
+#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:744
msgid "Kick from party"
msgstr "Выкинуть из группы"
-#: src/gui/popupmenu.cpp:226 src/gui/popupmenu.cpp:439
-#: src/gui/popupmenu.cpp:729
+#: src/gui/popupmenu.cpp:225 src/gui/popupmenu.cpp:237
+#: src/gui/popupmenu.cpp:460 src/gui/popupmenu.cpp:761
msgid "Kick from guild"
msgstr "Выкинуть из гильдии"
-#: src/gui/popupmenu.cpp:228 src/gui/popupmenu.cpp:441
-#: src/gui/popupmenu.cpp:731
+#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:242
+#: src/gui/popupmenu.cpp:465 src/gui/popupmenu.cpp:766
msgid "Change pos in guild"
msgstr "Сменить позицию в гильдии"
-#: src/gui/popupmenu.cpp:234 src/gui/popupmenu.cpp:446
-#: src/gui/popupmenu.cpp:737
+#: src/gui/popupmenu.cpp:251 src/gui/popupmenu.cpp:474
+#: src/gui/popupmenu.cpp:776
msgid "Invite to guild"
msgstr "Пригласить в гильдию"
-#: src/gui/popupmenu.cpp:242
+#: src/gui/popupmenu.cpp:260
msgid "Kick player"
msgstr "Кикнуть игрока"
-#: src/gui/popupmenu.cpp:244
+#: src/gui/popupmenu.cpp:262
msgid "Nuke"
msgstr "Уничтожить"
-#: src/gui/popupmenu.cpp:247 src/gui/popupmenu.cpp:675
+#: src/gui/popupmenu.cpp:265 src/gui/popupmenu.cpp:704
msgid "Show Items"
msgstr "Показать предметы"
-#: src/gui/popupmenu.cpp:248 src/gui/popupmenu.cpp:676
-#: src/gui/popupmenu.cpp:1970
+#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:705
+#: src/gui/popupmenu.cpp:2020
msgid "Undress"
msgstr "Раздеть"
-#: src/gui/popupmenu.cpp:250 src/gui/popupmenu.cpp:286
-#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:678
-#: src/gui/popupmenu.cpp:746
+#: src/gui/popupmenu.cpp:268 src/gui/popupmenu.cpp:304
+#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:707
+#: src/gui/popupmenu.cpp:786
msgid "Add comment"
msgstr "Добавить коментарий"
-#: src/gui/popupmenu.cpp:268 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:695
+#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:482
+#: src/gui/popupmenu.cpp:724
msgid "Buy (?)"
msgstr "Купить (?)"
-#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:454
-#: src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:483
+#: src/gui/popupmenu.cpp:726
msgid "Sell (?)"
msgstr "Продать (?)"
-#: src/gui/popupmenu.cpp:298
+#: src/gui/popupmenu.cpp:316
msgid "Kick"
msgstr "Кикнуть"
-#: src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:327
msgid "Remove from attack list"
msgstr "Удалить из списка атаки"
-#: src/gui/popupmenu.cpp:315
+#: src/gui/popupmenu.cpp:333
msgid "Add to priority attack list"
msgstr "Добавить в приоритетный список"
-#: src/gui/popupmenu.cpp:317
+#: src/gui/popupmenu.cpp:335
msgid "Add to attack list"
msgstr "Добавить в список атаки"
-#: src/gui/popupmenu.cpp:320
+#: src/gui/popupmenu.cpp:338
msgid "Add to ignore list"
msgstr "Добавить в список игнорирования"
-#: src/gui/popupmenu.cpp:333 src/gui/popupmenu.cpp:457
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:486
msgid "Add name to chat"
msgstr "Добавить имя в чат"
-#: src/gui/popupmenu.cpp:483
+#: src/gui/popupmenu.cpp:512
msgid "Pick up"
msgstr "Поднять"
-#: src/gui/popupmenu.cpp:484 src/gui/popupmenu.cpp:1682
-#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1805
+#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:1732
+#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1855
msgid "Add to chat"
msgstr "Добавить в чат"
-#: src/gui/popupmenu.cpp:501
+#: src/gui/popupmenu.cpp:530
msgid "Map Item"
msgstr "Элмент карты"
-#: src/gui/popupmenu.cpp:502
+#: src/gui/popupmenu.cpp:531
msgid "Rename"
msgstr "Переименовать"
-#: src/gui/popupmenu.cpp:503 src/gui/popupmenu.cpp:1923
-#: src/gui/popupmenu.cpp:1941 src/gui/popupmenu.cpp:1946
+#: src/gui/popupmenu.cpp:532 src/gui/popupmenu.cpp:1973
+#: src/gui/popupmenu.cpp:1991 src/gui/popupmenu.cpp:1996
msgid "Remove"
msgstr "Удалить"
-#: src/gui/popupmenu.cpp:508
+#: src/gui/popupmenu.cpp:537
msgid "Warp"
msgstr "Прыгнуть"
-#: src/gui/popupmenu.cpp:522
+#: src/gui/popupmenu.cpp:551
msgid "Load old outfits"
msgstr "Загрузить старые наряды"
-#: src/gui/popupmenu.cpp:538 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:567 src/gui/windowmenu.cpp:96
msgid "Spells"
msgstr "Заклинания"
-#: src/gui/popupmenu.cpp:540
+#: src/gui/popupmenu.cpp:569
msgid "Load old spells"
msgstr "Загрузить старые заклинания"
-#: src/gui/popupmenu.cpp:541
+#: src/gui/popupmenu.cpp:570
msgid "Edit spell"
msgstr "Изменить заклинание"
-#: src/gui/popupmenu.cpp:567
+#: src/gui/popupmenu.cpp:596
msgid "Disable highlight"
msgstr "Отключить уведомление"
-#: src/gui/popupmenu.cpp:572
+#: src/gui/popupmenu.cpp:601
msgid "Enable highlight"
msgstr "Включить уведомление"
-#: src/gui/popupmenu.cpp:577
-msgid "Dont remove name"
+#: src/gui/popupmenu.cpp:606
+msgid "Don't remove name"
msgstr "Не скрывать имя"
-#: src/gui/popupmenu.cpp:582
+#: src/gui/popupmenu.cpp:611
msgid "Remove name"
msgstr "Скрывать имя"
-#: src/gui/popupmenu.cpp:587
+#: src/gui/popupmenu.cpp:616
msgid "Enable away"
msgstr "Рарешить режим отошел"
-#: src/gui/popupmenu.cpp:592
+#: src/gui/popupmenu.cpp:621
msgid "Disable away"
msgstr "Запретить режим отошел"
-#: src/gui/popupmenu.cpp:598 src/gui/socialwindow.cpp:1035
+#: src/gui/popupmenu.cpp:627 src/gui/socialwindow.cpp:1141
msgid "Leave"
msgstr "Покинуть"
-#: src/gui/popupmenu.cpp:758
+#: src/gui/popupmenu.cpp:798
msgid "Change guild position"
msgstr "Сменить позицию в гильдии"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1189
+#: src/gui/popupmenu.cpp:1234
msgid "Rename map sign "
msgstr "Переименовать знак на карте"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1191
+#: src/gui/popupmenu.cpp:1236
msgid "Name: "
msgstr "Имя: "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1241
+#: src/gui/popupmenu.cpp:1286
msgid "Player comment "
msgstr "Комментарий "
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1243
+#: src/gui/popupmenu.cpp:1288
msgid "Comment: "
msgstr "Комментарий: "
-#: src/gui/popupmenu.cpp:1607
+#: src/gui/popupmenu.cpp:1657
msgid "Add to trade"
msgstr "Добавить к сделке"
-#: src/gui/popupmenu.cpp:1613
+#: src/gui/popupmenu.cpp:1663
msgid "Add to trade 10"
msgstr "Добавить к сделке 10"
-#: src/gui/popupmenu.cpp:1616
+#: src/gui/popupmenu.cpp:1666
msgid "Add to trade half"
msgstr "Добавить к сделке половину"
-#: src/gui/popupmenu.cpp:1618
+#: src/gui/popupmenu.cpp:1668
msgid "Add to trade all"
msgstr "Добавить к торговле все"
-#: src/gui/popupmenu.cpp:1630
+#: src/gui/popupmenu.cpp:1680
msgid "Store 10"
msgstr "Сохранить 10"
-#: src/gui/popupmenu.cpp:1633
+#: src/gui/popupmenu.cpp:1683
msgid "Store half"
msgstr "Сохранить половину"
-#: src/gui/popupmenu.cpp:1635
+#: src/gui/popupmenu.cpp:1685
msgid "Store all"
msgstr "Сохранить все"
-#: src/gui/popupmenu.cpp:1653 src/gui/popupmenu.cpp:1750
-#: src/gui/popupmenu.cpp:1793
+#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1800
+#: src/gui/popupmenu.cpp:1843
msgid "Drop all"
msgstr "Бросить все"
-#: src/gui/popupmenu.cpp:1674
+#: src/gui/popupmenu.cpp:1724
msgid "Retrieve 10"
msgstr "Получить 10"
-#: src/gui/popupmenu.cpp:1677
+#: src/gui/popupmenu.cpp:1727
msgid "Retrieve half"
msgstr "Получить половину"
-#: src/gui/popupmenu.cpp:1679
+#: src/gui/popupmenu.cpp:1729
msgid "Retrieve all"
msgstr "Получить все"
-#: src/gui/popupmenu.cpp:1710 src/gui/popupmenu.cpp:1766
+#: src/gui/popupmenu.cpp:1760 src/gui/popupmenu.cpp:1816
msgid "Load old item shortcuts"
msgstr "Загрузить старые горячие клавиши предметов"
-#: src/gui/popupmenu.cpp:1809
+#: src/gui/popupmenu.cpp:1859
msgid "Load old drop shortcuts"
msgstr "Загрузить старые данные"
-#: src/gui/popupmenu.cpp:1835 src/gui/popupmenu.cpp:1870
+#: src/gui/popupmenu.cpp:1885 src/gui/popupmenu.cpp:1920
msgid "Hide"
msgstr "Спрятать"
-#: src/gui/popupmenu.cpp:1841 src/gui/popupmenu.cpp:1876
+#: src/gui/popupmenu.cpp:1891 src/gui/popupmenu.cpp:1926
msgid "Show"
msgstr "Показать"
-#: src/gui/popupmenu.cpp:1883
+#: src/gui/popupmenu.cpp:1933
msgid "Reset yellow bar"
msgstr "сбросить настройки"
-#: src/gui/popupmenu.cpp:1885 src/gui/statuswindow.cpp:240
+#: src/gui/popupmenu.cpp:1935 src/gui/statuswindow.cpp:241
msgid "Copy to chat"
msgstr "Скопировать в чат"
-#: src/gui/popupmenu.cpp:1903 src/gui/socialwindow.cpp:854
-#: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
+#: src/gui/popupmenu.cpp:1953 src/gui/socialwindow.cpp:958
+#: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028
msgid "(default)"
msgstr "(по умолчанию)"
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1933
+#: src/gui/popupmenu.cpp:1965 src/gui/popupmenu.cpp:1983
msgid "Move up"
msgstr "Передвинуть выше"
-#: src/gui/popupmenu.cpp:1920 src/gui/popupmenu.cpp:1938
+#: src/gui/popupmenu.cpp:1970 src/gui/popupmenu.cpp:1988
msgid "Move down"
msgstr "Передвинуть ниже"
-#: src/gui/quitdialog.cpp:56
+#: src/gui/quitdialog.cpp:51
msgid "Switch server"
msgstr "Сменить сервер"
-#: src/gui/quitdialog.cpp:57
+#: src/gui/quitdialog.cpp:52
msgid "Switch character"
msgstr "Сменить персонажа"
@@ -1631,64 +1635,64 @@ msgstr "Пароль не должен содержать более %d симв
msgid "Passwords do not match."
msgstr "Пароли не совпадают."
-#: src/gui/serverdialog.cpp:231
+#: src/gui/serverdialog.cpp:237
msgid "Choose Your Server"
msgstr "Выберите сервер"
-#: src/gui/serverdialog.cpp:242
+#: src/gui/serverdialog.cpp:248
msgid "Choose Your Server *** SAFE MODE ***"
msgstr "Выбор сервера *** БЕЗОПАСНЫЙ РЕЖИМ ***"
-#: src/gui/serverdialog.cpp:247
+#: src/gui/serverdialog.cpp:253
msgid "Port:"
msgstr "Порт:"
-#: src/gui/serverdialog.cpp:251
+#: src/gui/serverdialog.cpp:257
msgid "Use same ip for game sub servers"
msgstr "Использовать одинаковый IP для игровых суб-серверов"
-#: src/gui/serverdialog.cpp:265
+#: src/gui/serverdialog.cpp:271
msgid "Server type:"
msgstr "Тип:"
-#: src/gui/serverdialog.cpp:289
+#: src/gui/serverdialog.cpp:295
msgid "Load"
msgstr "Загрузить"
-#: src/gui/serverdialog.cpp:290
+#: src/gui/serverdialog.cpp:296
msgid "Connect"
msgstr "Соединиться"
-#: src/gui/serverdialog.cpp:291
+#: src/gui/serverdialog.cpp:297
msgid "Custom Server"
msgstr "Добавить"
-#: src/gui/serverdialog.cpp:396
+#: src/gui/serverdialog.cpp:402
msgid "Please type both the address and the port of a server."
msgstr "Следует указать адрес и порт сервера."
-#: src/gui/serverdialog.cpp:554
+#: src/gui/serverdialog.cpp:560
#, c-format
msgid "Downloading server list...%2.2f%%"
msgstr "Получение списка серверов...%2.2f%%"
-#: src/gui/serverdialog.cpp:559
+#: src/gui/serverdialog.cpp:565
msgid "Waiting for server..."
msgstr "Ожидание ответа от сервера"
-#: src/gui/serverdialog.cpp:563
+#: src/gui/serverdialog.cpp:569
msgid "Preparing download"
msgstr "Подготовка к загрузке"
-#: src/gui/serverdialog.cpp:567
+#: src/gui/serverdialog.cpp:573
msgid "Error retreiving server list!"
msgstr "Не удалось получить список серверов!"
-#: src/gui/serverdialog.cpp:672
+#: src/gui/serverdialog.cpp:678
msgid "requires a newer version"
msgstr "требуется более новая версия"
-#: src/gui/serverdialog.cpp:674
+#: src/gui/serverdialog.cpp:680
#, c-format
msgid "requires v%s"
msgstr "требуется v%s"
@@ -1834,6 +1838,14 @@ msgstr "Время"
msgid "Use local time"
msgstr "Использовать местное время"
+#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:157
+msgid "Other"
+msgstr "Другое"
+
+#: src/gui/setup_chat.cpp:125
+msgid "Highlight words (separated by comma)"
+msgstr "Подсвечиваемые слова (разделенные запятыми)"
+
#: src/gui/setup_colors.cpp:49
msgid "This is what the color looks like"
msgstr "Вот, как выглядит сей цвет"
@@ -1881,11 +1893,11 @@ msgstr "Синий:"
msgid "Alpha:"
msgstr "Прозрачность:"
-#: src/gui/setup.cpp:70
+#: src/gui/setup.cpp:71
msgid "Apply"
msgstr "Применить"
-#: src/gui/setup.cpp:73
+#: src/gui/setup.cpp:74
msgid "Reset Windows"
msgstr "Сбросить расположение окон"
@@ -2062,34 +2074,42 @@ msgid "Log NPC dialogue"
msgstr "Сохранять текст NPC"
#: src/gui/setup_other.cpp:148
-msgid "Other"
-msgstr "Другое"
+msgid "Bots support"
+msgstr "Поддержка ботов"
#: src/gui/setup_other.cpp:150
+msgid "Enable auction bot support"
+msgstr "Включить поддержку бота аукционов"
+
+#: src/gui/setup_other.cpp:153
+msgid "Enable guild bot support and disable native guild support"
+msgstr "Включить поддержку гильд-бота"
+
+#: src/gui/setup_other.cpp:159
msgid "Enable server side attack"
msgstr "Включить серверную атаку"
-#: src/gui/setup_other.cpp:153
+#: src/gui/setup_other.cpp:162
msgid "Enable bot checker"
msgstr "Включить детектор ботов"
-#: src/gui/setup_other.cpp:156
+#: src/gui/setup_other.cpp:165
msgid "Enable buggy servers protection"
msgstr "Включить защиту от сбойных серверов"
-#: src/gui/setup_other.cpp:159
+#: src/gui/setup_other.cpp:168
msgid "Enable debug log"
msgstr "Включить отлад. лог"
-#: src/gui/setup_other.cpp:162
+#: src/gui/setup_other.cpp:171
msgid "Low traffic mode"
msgstr "Режим кеширования игроков"
-#: src/gui/setup_other.cpp:165
+#: src/gui/setup_other.cpp:174
msgid "Hide shield sprite"
msgstr "Спрятать картинку счита"
-#: src/gui/setup_other.cpp:168
+#: src/gui/setup_other.cpp:177
msgid "Show background"
msgstr "Показать фон"
@@ -2190,6 +2210,10 @@ msgstr "Показывать статусы"
msgid "Show ip addresses on screenshots"
msgstr "Показывать ip адреса на снимках экрана"
+#: src/gui/setup_players.cpp:81
+msgid "Allow self heal with mouse click"
+msgstr "Включить самолечение по клику мыши"
+
#: src/gui/setup_relations.cpp:65
msgid "Relation"
msgstr "Отношение"
@@ -2468,261 +2492,266 @@ msgstr "Настройки эффектов частиц изменены."
msgid "Changes will take effect on map change."
msgstr "Изменения вступят в силу после загрузки новой карты."
-#: src/gui/shopwindow.cpp:74
+#: src/gui/shopwindow.cpp:75
msgid "Personal Shop"
msgstr "Свой магазин"
-#: src/gui/shopwindow.cpp:116
+#: src/gui/shopwindow.cpp:118
msgid "Buy items"
msgstr "Купить"
-#: src/gui/shopwindow.cpp:117
+#: src/gui/shopwindow.cpp:119
msgid "Sell items"
msgstr "Продать"
-#: src/gui/shopwindow.cpp:119 src/gui/shopwindow.cpp:122
-#: src/gui/tradewindow.cpp:88
+#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
+#: src/gui/tradewindow.cpp:89
msgid "Add"
msgstr "Добавить"
-#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
+#: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
msgid "Announce"
msgstr "Анонс"
-#: src/gui/shopwindow.cpp:125
+#: src/gui/shopwindow.cpp:127
msgid "Show links in announce"
msgstr "Показывать ссылки"
-#: src/gui/shopwindow.cpp:723 src/net/ea/tradehandler.cpp:106
+#: src/gui/shopwindow.cpp:148 src/gui/shopwindow.cpp:149
+msgid "Auction"
+msgstr "Аукцион"
+
+#: src/gui/shopwindow.cpp:748 src/net/ea/tradehandler.cpp:106
#: src/net/manaserv/tradehandler.cpp:127
msgid "Request for Trade"
msgstr "Запрос на Торговлю"
-#: src/gui/shopwindow.cpp:724
+#: src/gui/shopwindow.cpp:749
#, c-format
msgid "%s wants to %s %s do you accept?"
msgstr "%s хочет %s %s, вы принимаете предложение?"
-#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:81
+#: src/gui/skilldialog.cpp:276 src/gui/windowmenu.cpp:81
msgid "Skills"
msgstr "Умения"
-#: src/gui/skilldialog.cpp:283
+#: src/gui/skilldialog.cpp:288
msgid "Up"
msgstr "Верх"
-#: src/gui/skilldialog.cpp:336
+#: src/gui/skilldialog.cpp:341
#, c-format
msgid "Skill points available: %d"
msgstr "Очков навыков осталось: %d"
-#: src/gui/skilldialog.cpp:413
+#: src/gui/skilldialog.cpp:418
#, c-format
msgid "Skill Set %d"
msgstr "Умение %d"
-#: src/gui/skilldialog.cpp:425
+#: src/gui/skilldialog.cpp:430
#, c-format
msgid "Skill %d"
msgstr "Умение %d"
-#: src/gui/skilldialog.cpp:492 src/gui/skilldialog.cpp:545
+#: src/gui/skilldialog.cpp:497 src/gui/skilldialog.cpp:550
#, c-format
msgid "Lvl: %d"
msgstr "Уровень: %d"
-#: src/gui/skilldialog.cpp:537
+#: src/gui/skilldialog.cpp:542
#, c-format
msgid "Lvl: %d (%+d)"
msgstr "Уровень: %d (%+d)"
-#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
+#: src/gui/socialwindow.cpp:118 src/gui/socialwindow.cpp:216
+#: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52
msgid "Guild"
msgstr "Гильдия"
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:147
#, c-format
msgid "Invited user %s to guild %s."
msgstr "Пользователь %s приглашен в гильдию %s."
-#: src/gui/socialwindow.cpp:160
+#: src/gui/socialwindow.cpp:161
#, c-format
msgid "Guild %s quit requested."
msgstr "Выход из гильдии %s запрошен."
-#: src/gui/socialwindow.cpp:187
+#: src/gui/socialwindow.cpp:188
msgid "Member Invite to Guild"
msgstr "Приглашение игрока в Гильдию"
-#: src/gui/socialwindow.cpp:188
+#: src/gui/socialwindow.cpp:189
#, c-format
msgid "Who would you like to invite to guild %s?"
msgstr "Кого вы хотите пригласить в гильдию %s?"
-#: src/gui/socialwindow.cpp:197
+#: src/gui/socialwindow.cpp:198
msgid "Leave Guild?"
msgstr "Покинуть Гильдию?"
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:199
#, c-format
msgid "Are you sure you want to leave guild %s?"
msgstr "Вы действительно хотите выйти из гильдии %s?"
-#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:319 src/net/ea/gui/partytab.cpp:50
msgid "Party"
msgstr "Группа"
-#: src/gui/socialwindow.cpp:243
+#: src/gui/socialwindow.cpp:347
#, c-format
msgid "Invited user %s to party."
msgstr "Пригласить пользователя %s в группу."
-#: src/gui/socialwindow.cpp:257
+#: src/gui/socialwindow.cpp:361
#, c-format
msgid "Party %s quit requested."
msgstr "Запрошен выход из группы %s."
-#: src/gui/socialwindow.cpp:284
+#: src/gui/socialwindow.cpp:388
msgid "Member Invite to Party"
msgstr "Пригласить пользователя в группу"
-#: src/gui/socialwindow.cpp:285
+#: src/gui/socialwindow.cpp:389
#, c-format
msgid "Who would you like to invite to party %s?"
msgstr "Кого вы хотите пригласить в группу %s?"
-#: src/gui/socialwindow.cpp:294
+#: src/gui/socialwindow.cpp:398
msgid "Leave Party?"
msgstr "Покинуть группу?"
-#: src/gui/socialwindow.cpp:295
+#: src/gui/socialwindow.cpp:399
#, c-format
msgid "Are you sure you want to leave party %s?"
msgstr "Вы действительно хотите покинуть группу %s?"
-#: src/gui/socialwindow.cpp:521
+#: src/gui/socialwindow.cpp:625
msgid "Nav"
msgstr "Нав"
-#: src/gui/socialwindow.cpp:799
+#: src/gui/socialwindow.cpp:903
msgid "Atk"
msgstr "Атк"
-#: src/gui/socialwindow.cpp:840
+#: src/gui/socialwindow.cpp:944
msgid "Priority mobs"
msgstr "Приоритетные монстры"
-#: src/gui/socialwindow.cpp:872
+#: src/gui/socialwindow.cpp:976
msgid "Attack mobs"
msgstr "Атакуемые монстры"
-#: src/gui/socialwindow.cpp:907
+#: src/gui/socialwindow.cpp:1011
msgid "Ignore mobs"
msgstr "Игнорируемые монстры"
-#: src/gui/socialwindow.cpp:970
+#: src/gui/socialwindow.cpp:1074
msgid "Create Guild"
msgstr "Создать Гильдию"
-#: src/gui/socialwindow.cpp:971 src/gui/socialwindow.cpp:1387
+#: src/gui/socialwindow.cpp:1075 src/gui/socialwindow.cpp:1503
msgid "Create Party"
msgstr "Создать группу"
-#: src/gui/socialwindow.cpp:1013 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1117 src/gui/windowmenu.cpp:93
msgid "Social"
msgstr "Общество"
-#: src/gui/socialwindow.cpp:1034
+#: src/gui/socialwindow.cpp:1140
msgid "Invite"
msgstr "Пригласить"
-#: src/gui/socialwindow.cpp:1176
+#: src/gui/socialwindow.cpp:1286
#, c-format
msgid "Accepted party invite from %s."
msgstr "Принято приглашение в группу от %s."
-#: src/gui/socialwindow.cpp:1186
+#: src/gui/socialwindow.cpp:1296
#, c-format
msgid "Rejected party invite from %s."
msgstr "Отклонено приглашение в группу от %s."
-#: src/gui/socialwindow.cpp:1203
+#: src/gui/socialwindow.cpp:1313
#, c-format
msgid "Accepted guild invite from %s."
msgstr "Принято приглашение в гильдию от %s."
-#: src/gui/socialwindow.cpp:1213
+#: src/gui/socialwindow.cpp:1326
#, c-format
msgid "Rejected guild invite from %s."
msgstr "Отклонено приглашение в гильдию от %s."
-#: src/gui/socialwindow.cpp:1257
+#: src/gui/socialwindow.cpp:1373
#, c-format
msgid "Creating guild called %s."
msgstr "Создание гильдии с именем %s."
-#: src/gui/socialwindow.cpp:1280
+#: src/gui/socialwindow.cpp:1396
#, c-format
msgid "Creating party called %s."
msgstr "Создание группы с именем %s."
-#: src/gui/socialwindow.cpp:1294
+#: src/gui/socialwindow.cpp:1410
msgid "Guild Name"
msgstr "Имя гильдии"
-#: src/gui/socialwindow.cpp:1295
+#: src/gui/socialwindow.cpp:1411
msgid "Choose your guild's name."
msgstr "Выберите имя для гильдии."
-#: src/gui/socialwindow.cpp:1309
+#: src/gui/socialwindow.cpp:1425
msgid "Received guild request, but one already exists."
msgstr "Получено приглашение в гильдию, но оно не первое."
-#: src/gui/socialwindow.cpp:1315
+#: src/gui/socialwindow.cpp:1431
#, c-format
msgid "%s has invited you to join the guild %s."
msgstr "%s приглашает присоединиться к гильдии %s."
-#: src/gui/socialwindow.cpp:1321
+#: src/gui/socialwindow.cpp:1437
msgid "Accept Guild Invite"
msgstr "Принять приглашение в гильдию"
-#: src/gui/socialwindow.cpp:1336
+#: src/gui/socialwindow.cpp:1452
msgid "Received party request, but one already exists."
msgstr "Получено приглашение в группу, но оно не порвое."
-#: src/gui/socialwindow.cpp:1347
+#: src/gui/socialwindow.cpp:1463
msgid "You have been invited you to join a party."
msgstr "Вас приглашают в группу."
-#: src/gui/socialwindow.cpp:1351
+#: src/gui/socialwindow.cpp:1467
#, c-format
msgid "You have been invited to join the %s party."
msgstr "Вас приглашают присоединиться к группе %s."
-#: src/gui/socialwindow.cpp:1359
+#: src/gui/socialwindow.cpp:1475
#, c-format
msgid "%s has invited you to join their party."
msgstr "%s приглашает Вас к себе в группу."
-#: src/gui/socialwindow.cpp:1364
+#: src/gui/socialwindow.cpp:1480
#, c-format
msgid "%s has invited you to join the %s party."
msgstr "%s приглашает присоединиться к %s группе."
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1489
msgid "Accept Party Invite"
msgstr "Принять приглашение в группу"
-#: src/gui/socialwindow.cpp:1388
+#: src/gui/socialwindow.cpp:1504
msgid "Cannot create party. You are already in a party"
msgstr "Не удалось создать группу. Вы уже состоите в другой."
-#: src/gui/socialwindow.cpp:1393
+#: src/gui/socialwindow.cpp:1509
msgid "Party Name"
msgstr "Имя группы"
-#: src/gui/socialwindow.cpp:1394
+#: src/gui/socialwindow.cpp:1510
msgid "Choose your party's name."
msgstr "Выберите имя будущей группы."
@@ -2730,418 +2759,418 @@ msgstr "Выберите имя будущей группы."
msgid "Specials"
msgstr "Особые"
-#: src/gui/statuspopup.cpp:197
+#: src/gui/statuspopup.cpp:198
msgid "(D) default moves"
msgstr "(D) движения по умолчанию"
-#: src/gui/statuspopup.cpp:202
+#: src/gui/statuspopup.cpp:203
msgid "(I) invert moves"
msgstr "(I) обратное движение"
-#: src/gui/statuspopup.cpp:207
+#: src/gui/statuspopup.cpp:208
msgid "(c) moves with some crazy moves"
msgstr "(c) обычное движение иногда с сумашедшими движениями"
-#: src/gui/statuspopup.cpp:212
+#: src/gui/statuspopup.cpp:213
msgid "(C) moves with crazy moves"
msgstr "(C) движение с сумашедшими движениями"
-#: src/gui/statuspopup.cpp:217
+#: src/gui/statuspopup.cpp:218
msgid "(d) double normal + crazy"
msgstr "(d) нормальные и сумашедшие движения"
-#: src/gui/statuspopup.cpp:222
+#: src/gui/statuspopup.cpp:223
msgid "(?) move"
msgstr "(?) неизвестное движение"
-#: src/gui/statuspopup.cpp:240
+#: src/gui/statuspopup.cpp:241
msgid "(a) custom crazy move"
msgstr "(a) пользовательские сумашедшие движения"
-#: src/gui/statuspopup.cpp:244
+#: src/gui/statuspopup.cpp:245
msgid "(?) crazy move"
msgstr "(?) неизвестные сумасшедшие движения"
-#: src/gui/statuspopup.cpp:254
+#: src/gui/statuspopup.cpp:255
msgid "(0) default moves to target"
msgstr "(0) обычное движение к цели"
-#: src/gui/statuspopup.cpp:259
+#: src/gui/statuspopup.cpp:260
msgid "(1) moves to target in distance 1"
msgstr "(1) движение к цели на расстояние 1"
-#: src/gui/statuspopup.cpp:264
+#: src/gui/statuspopup.cpp:265
msgid "(2) moves to target in distance 2"
msgstr "(2) движение к цели на расстояние 2"
-#: src/gui/statuspopup.cpp:269
+#: src/gui/statuspopup.cpp:270
msgid "(3) moves to target in distance 3"
msgstr "(3) движение к цели на расстояние 3"
-#: src/gui/statuspopup.cpp:274
+#: src/gui/statuspopup.cpp:275
msgid "(5) moves to target in distance 5"
msgstr "(5) движение к цели на расстояние 5"
-#: src/gui/statuspopup.cpp:279
+#: src/gui/statuspopup.cpp:280
msgid "(7) moves to target in distance 7"
msgstr "(7) движение к цели на расстояние 7"
-#: src/gui/statuspopup.cpp:284
+#: src/gui/statuspopup.cpp:285
msgid "(A) moves to target in attack range"
msgstr "(A) движение к цели на расстояние атаки"
-#: src/gui/statuspopup.cpp:289
+#: src/gui/statuspopup.cpp:290
msgid "(?) move to target"
msgstr "(?) неизвестное движение к цели"
-#: src/gui/statuspopup.cpp:297
+#: src/gui/statuspopup.cpp:298
msgid "(D) default follow"
msgstr "(D) следование по умолчанию"
-#: src/gui/statuspopup.cpp:301
+#: src/gui/statuspopup.cpp:302
msgid "(R) relative follow"
msgstr "(R) относительное следование"
-#: src/gui/statuspopup.cpp:305
+#: src/gui/statuspopup.cpp:306
msgid "(M) mirror follow"
msgstr "(M) зеркальное следование"
-#: src/gui/statuspopup.cpp:309
+#: src/gui/statuspopup.cpp:310
msgid "(P) pet follow"
msgstr "(P) следование как животное"
-#: src/gui/statuspopup.cpp:313
+#: src/gui/statuspopup.cpp:314
msgid "(?) unknown follow"
msgstr "(?) неизвестное следование"
-#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
+#: src/gui/statuspopup.cpp:323 src/gui/statuspopup.cpp:346
msgid "(D) default attack"
msgstr "(D) обычная атака"
-#: src/gui/statuspopup.cpp:327
+#: src/gui/statuspopup.cpp:328
msgid "(s) switch attack without shield"
msgstr "(s) переключение атаки без щита"
-#: src/gui/statuspopup.cpp:332
+#: src/gui/statuspopup.cpp:333
msgid "(S) switch attack with shield"
msgstr "(S) переключение атаки со щитом"
-#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
+#: src/gui/statuspopup.cpp:337 src/gui/statuspopup.cpp:362
msgid "(?) attack"
msgstr "(?) неизвестная атака"
-#: src/gui/statuspopup.cpp:349
+#: src/gui/statuspopup.cpp:350
msgid "(G) go and attack"
msgstr "(G) идти и атаковать"
-#: src/gui/statuspopup.cpp:353
+#: src/gui/statuspopup.cpp:354
msgid "(A) go, attack, pickup"
msgstr "(A) идти, атаковать, собирать"
-#: src/gui/statuspopup.cpp:357
+#: src/gui/statuspopup.cpp:358
msgid "(d) without auto attack"
msgstr "(d) без автоатаки"
-#: src/gui/statuspopup.cpp:375
+#: src/gui/statuspopup.cpp:376
msgid "(S) small pick up 1x1 cells"
msgstr "(S) поднятие в области 1x1"
-#: src/gui/statuspopup.cpp:379
+#: src/gui/statuspopup.cpp:380
msgid "(D) default pick up 2x1 cells"
msgstr "(D) поднятие из области 2x1"
-#: src/gui/statuspopup.cpp:383
+#: src/gui/statuspopup.cpp:384
msgid "(F) forward pick up 2x3 cells"
msgstr "(F) поднятие из области спереди 2x3"
-#: src/gui/statuspopup.cpp:387
+#: src/gui/statuspopup.cpp:388
msgid "(3) pick up 3x3 cells"
msgstr "(3) поднятие из области 3x3"
-#: src/gui/statuspopup.cpp:391
+#: src/gui/statuspopup.cpp:392
msgid "(g) go and pick up in distance 4"
msgstr "(g) движение и поднятие на расстоянии 4"
-#: src/gui/statuspopup.cpp:395
+#: src/gui/statuspopup.cpp:396
msgid "(G) go and pick up in distance 8"
msgstr "(g) движение и поднятие на расстоянии 8"
-#: src/gui/statuspopup.cpp:399
+#: src/gui/statuspopup.cpp:400
msgid "(A) go and pick up in max distance"
msgstr "(A) движение и поднятие на максимальном расстоянии"
-#: src/gui/statuspopup.cpp:403
+#: src/gui/statuspopup.cpp:404
msgid "(?) pick up"
msgstr "(?) неизвестный режим поднятия"
-#: src/gui/statuspopup.cpp:412
+#: src/gui/statuspopup.cpp:413
msgid "(N) normal map view"
msgstr "(N) обычный режим карты"
-#: src/gui/statuspopup.cpp:416
+#: src/gui/statuspopup.cpp:417
msgid "(D) debug map view"
msgstr "(D) отладочный режим карты"
-#: src/gui/statuspopup.cpp:420
+#: src/gui/statuspopup.cpp:421
msgid "(u) ultra map view"
msgstr "(u) специальный режим карты"
-#: src/gui/statuspopup.cpp:424
+#: src/gui/statuspopup.cpp:425
msgid "(U) ultra map view 2"
msgstr "(U) специальный режим карты 2"
-#: src/gui/statuspopup.cpp:428
+#: src/gui/statuspopup.cpp:429
msgid "(e) empty map view"
msgstr "(e) режим пустой карты"
-#: src/gui/statuspopup.cpp:432
+#: src/gui/statuspopup.cpp:433
msgid "(b) black & white map view"
msgstr "(b) черно-белый режим карты"
-#: src/gui/statuspopup.cpp:436
+#: src/gui/statuspopup.cpp:437
msgid "(?) map view"
msgstr "(?) неизвестный режим карты"
-#: src/gui/statuspopup.cpp:444
+#: src/gui/statuspopup.cpp:445
msgid "(f) use #flar for magic attack"
msgstr "(f) использовать #flar для атаки"
-#: src/gui/statuspopup.cpp:449
+#: src/gui/statuspopup.cpp:450
msgid "(c) use #chiza for magic attack"
msgstr "(c) использовать #chiza для атаки"
-#: src/gui/statuspopup.cpp:454
+#: src/gui/statuspopup.cpp:455
msgid "(I) use #ingrav for magic attack"
msgstr "(I) использовать #ingrav для атаки"
-#: src/gui/statuspopup.cpp:459
+#: src/gui/statuspopup.cpp:460
msgid "(F) use #frillyar for magic attack"
msgstr "(F) использовать #frillyar для атаки"
-#: src/gui/statuspopup.cpp:464
+#: src/gui/statuspopup.cpp:465
msgid "(U) use #upmarmu for magic attack"
msgstr "(U) использовать #upmarmu для атаки"
-#: src/gui/statuspopup.cpp:468
+#: src/gui/statuspopup.cpp:469
msgid "(?) magic attack"
msgstr "(?) неизвестная магическая атака"
-#: src/gui/statuspopup.cpp:477
+#: src/gui/statuspopup.cpp:478
msgid "(D) default imitation"
msgstr "(D) имитация по умолчанию"
-#: src/gui/statuspopup.cpp:481
+#: src/gui/statuspopup.cpp:482
msgid "(O) outfits imitation"
msgstr "(O) имитация нарядов"
-#: src/gui/statuspopup.cpp:485
+#: src/gui/statuspopup.cpp:486
msgid "(?) imitation"
msgstr "(?) неизвестная имитация"
-#: src/gui/statuspopup.cpp:494
+#: src/gui/statuspopup.cpp:495
msgid "(O) on keyboard"
msgstr "(O) возле компьютера"
-#: src/gui/statuspopup.cpp:497
+#: src/gui/statuspopup.cpp:498
msgid "(A) away"
msgstr "(A) отошел"
-#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
+#: src/gui/statuspopup.cpp:501 src/gui/statuspopup.cpp:521
msgid "(?) away"
msgstr "(?) неизвестный режим отошел"
-#: src/gui/statuspopup.cpp:508
+#: src/gui/statuspopup.cpp:509
msgid "(G) game camera mode"
msgstr "(G) игровая камера"
-#: src/gui/statuspopup.cpp:512
+#: src/gui/statuspopup.cpp:513
msgid "(F) free camera mode"
msgstr "(F) свободная камера"
-#: src/gui/statuspopup.cpp:516
+#: src/gui/statuspopup.cpp:517
msgid "(D) design camera mode"
msgstr "(D) камера в режиме разработки"
-#: src/gui/statuspopup.cpp:527
+#: src/gui/statuspopup.cpp:528
msgid "Game modifiers are disabled"
msgstr "Игровые модификаторы выключены"
-#: src/gui/statuspopup.cpp:532
+#: src/gui/statuspopup.cpp:533
msgid "Game modifiers are enabled"
msgstr "Игровые модификаторы включены"
-#: src/gui/statuswindow.cpp:142 src/gui/statuswindow.cpp:272
-#: src/gui/statuswindow.cpp:335
+#: src/gui/statuswindow.cpp:143 src/gui/statuswindow.cpp:273
+#: src/gui/statuswindow.cpp:336
#, c-format
msgid "Level: %d"
msgstr "Уровень: %d"
-#: src/gui/statuswindow.cpp:143 src/gui/statuswindow.cpp:258
-#: src/gui/statuswindow.cpp:302
+#: src/gui/statuswindow.cpp:144 src/gui/statuswindow.cpp:259
+#: src/gui/statuswindow.cpp:303
#, c-format
msgid "Money: %s"
msgstr "Деньги: %s"
-#: src/gui/statuswindow.cpp:149
+#: src/gui/statuswindow.cpp:150
msgid "HP:"
msgstr "ОЖ:"
-#: src/gui/statuswindow.cpp:156
+#: src/gui/statuswindow.cpp:157
msgid "Exp:"
msgstr "Exp:"
-#: src/gui/statuswindow.cpp:170
+#: src/gui/statuswindow.cpp:171
msgid "MP:"
msgstr "Мана:"
-#: src/gui/statuswindow.cpp:202 src/gui/statuswindow.cpp:385
+#: src/gui/statuswindow.cpp:203 src/gui/statuswindow.cpp:386
#, c-format
msgid "Job: %d"
msgstr "Профессия: %d"
-#: src/gui/statuswindow.cpp:203
+#: src/gui/statuswindow.cpp:204
msgid "Job:"
msgstr "Профессия:"
-#: src/gui/statuswindow.cpp:261 src/gui/statuswindow.cpp:309
+#: src/gui/statuswindow.cpp:262 src/gui/statuswindow.cpp:310
#, c-format
msgid "Character points: %d"
msgstr "Очки персонажа: %d"
-#: src/gui/statuswindow.cpp:267
+#: src/gui/statuswindow.cpp:268
#, c-format
msgid "Level: %d (GM %d)"
msgstr "Уровень: %d (GM %d)"
-#: src/gui/statuswindow.cpp:323
+#: src/gui/statuswindow.cpp:324
#, c-format
msgid "Correction points: %d"
msgstr "Очков навыков: %d"
-#: src/gui/statuswindow.cpp:646 src/gui/statuswindow.cpp:711
-#: src/gui/statuswindow.cpp:731 src/gui/statuswindow.cpp:747
-#: src/gui/statuswindow.cpp:793 src/gui/statuswindow.cpp:822
-#: src/gui/statuswindow.cpp:845 src/gui/statuswindow.cpp:864
+#: src/gui/statuswindow.cpp:647 src/gui/statuswindow.cpp:712
+#: src/gui/statuswindow.cpp:732 src/gui/statuswindow.cpp:748
+#: src/gui/statuswindow.cpp:794 src/gui/statuswindow.cpp:823
+#: src/gui/statuswindow.cpp:846 src/gui/statuswindow.cpp:865
msgid "(D)"
msgstr "(D)"
-#: src/gui/statuswindow.cpp:649 src/gui/statuswindow.cpp:772
+#: src/gui/statuswindow.cpp:650 src/gui/statuswindow.cpp:773
msgid "(I)"
msgstr "(I)"
-#: src/gui/statuswindow.cpp:652 src/gui/statuswindow.cpp:769
+#: src/gui/statuswindow.cpp:653 src/gui/statuswindow.cpp:770
msgid "(c)"
msgstr "(c)"
-#: src/gui/statuswindow.cpp:655
+#: src/gui/statuswindow.cpp:656
msgid "(C)"
msgstr "(C)"
-#: src/gui/statuswindow.cpp:658 src/gui/statuswindow.cpp:756
+#: src/gui/statuswindow.cpp:659 src/gui/statuswindow.cpp:757
msgid "(d)"
msgstr "(d)"
-#: src/gui/statuswindow.cpp:661 src/gui/statuswindow.cpp:675
-#: src/gui/statuswindow.cpp:704 src/gui/statuswindow.cpp:723
-#: src/gui/statuswindow.cpp:740 src/gui/statuswindow.cpp:759
-#: src/gui/statuswindow.cpp:781 src/gui/statuswindow.cpp:811
-#: src/gui/statuswindow.cpp:837 src/gui/statuswindow.cpp:851
-#: src/gui/statuswindow.cpp:867 src/gui/statuswindow.cpp:880
+#: src/gui/statuswindow.cpp:662 src/gui/statuswindow.cpp:676
+#: src/gui/statuswindow.cpp:705 src/gui/statuswindow.cpp:724
+#: src/gui/statuswindow.cpp:741 src/gui/statuswindow.cpp:760
+#: src/gui/statuswindow.cpp:782 src/gui/statuswindow.cpp:812
+#: src/gui/statuswindow.cpp:838 src/gui/statuswindow.cpp:852
+#: src/gui/statuswindow.cpp:868 src/gui/statuswindow.cpp:881
msgid "(?)"
msgstr "(?)"
-#: src/gui/statuswindow.cpp:672
+#: src/gui/statuswindow.cpp:673
msgid "(a)"
msgstr "(a)"
-#: src/gui/statuswindow.cpp:683
+#: src/gui/statuswindow.cpp:684
msgid "(0)"
msgstr "(0)"
-#: src/gui/statuswindow.cpp:686
+#: src/gui/statuswindow.cpp:687
msgid "(1)"
msgstr "(1)"
-#: src/gui/statuswindow.cpp:689
+#: src/gui/statuswindow.cpp:690
msgid "(2)"
msgstr "(2)"
-#: src/gui/statuswindow.cpp:692 src/gui/statuswindow.cpp:799
+#: src/gui/statuswindow.cpp:693 src/gui/statuswindow.cpp:800
msgid "(3)"
msgstr "(3)"
-#: src/gui/statuswindow.cpp:695
+#: src/gui/statuswindow.cpp:696
msgid "(5)"
msgstr "(5)"
-#: src/gui/statuswindow.cpp:698
+#: src/gui/statuswindow.cpp:699
msgid "(7)"
msgstr "(7)"
-#: src/gui/statuswindow.cpp:701 src/gui/statuswindow.cpp:753
-#: src/gui/statuswindow.cpp:808 src/gui/statuswindow.cpp:877
+#: src/gui/statuswindow.cpp:702 src/gui/statuswindow.cpp:754
+#: src/gui/statuswindow.cpp:809 src/gui/statuswindow.cpp:878
msgid "(A)"
msgstr "(A)"
-#: src/gui/statuswindow.cpp:714
+#: src/gui/statuswindow.cpp:715
msgid "(R)"
msgstr "(R)"
-#: src/gui/statuswindow.cpp:717
+#: src/gui/statuswindow.cpp:718
msgid "(M)"
msgstr "(M)"
-#: src/gui/statuswindow.cpp:720
+#: src/gui/statuswindow.cpp:721
msgid "(P)"
msgstr "(P)"
-#: src/gui/statuswindow.cpp:734
+#: src/gui/statuswindow.cpp:735
msgid "(s)"
msgstr "(s)"
-#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:790
+#: src/gui/statuswindow.cpp:738 src/gui/statuswindow.cpp:791
msgid "(S)"
msgstr "(S)"
-#: src/gui/statuswindow.cpp:750 src/gui/statuswindow.cpp:805
-#: src/gui/statuswindow.cpp:858
+#: src/gui/statuswindow.cpp:751 src/gui/statuswindow.cpp:806
+#: src/gui/statuswindow.cpp:859
msgid "(G)"
msgstr "(G)"
-#: src/gui/statuswindow.cpp:766
+#: src/gui/statuswindow.cpp:767
msgid "(f)"
msgstr "(f)"
-#: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:796
-#: src/gui/statuswindow.cpp:861
+#: src/gui/statuswindow.cpp:776 src/gui/statuswindow.cpp:797
+#: src/gui/statuswindow.cpp:862
msgid "(F)"
msgstr "(F)"
-#: src/gui/statuswindow.cpp:778 src/gui/statuswindow.cpp:828
+#: src/gui/statuswindow.cpp:779 src/gui/statuswindow.cpp:829
msgid "(U)"
msgstr "(U)"
-#: src/gui/statuswindow.cpp:802
+#: src/gui/statuswindow.cpp:803
msgid "(g)"
msgstr "(g)"
-#: src/gui/statuswindow.cpp:819
+#: src/gui/statuswindow.cpp:820
msgid "(N)"
msgstr "(N)"
-#: src/gui/statuswindow.cpp:825
+#: src/gui/statuswindow.cpp:826
msgid "(u)"
msgstr "(u)"
-#: src/gui/statuswindow.cpp:831
+#: src/gui/statuswindow.cpp:832
msgid "(e)"
msgstr "(e)"
-#: src/gui/statuswindow.cpp:834
+#: src/gui/statuswindow.cpp:835
msgid "(b)"
msgstr "(b)"
-#: src/gui/statuswindow.cpp:848 src/gui/statuswindow.cpp:874
+#: src/gui/statuswindow.cpp:849 src/gui/statuswindow.cpp:875
msgid "(O)"
msgstr "(O)"
@@ -3249,24 +3278,24 @@ msgstr "Подтверждено. Ждем-с..."
msgid "Trade: You"
msgstr "Торговля: Вы"
-#: src/gui/tradewindow.cpp:110 src/gui/tradewindow.cpp:166
+#: src/gui/tradewindow.cpp:111 src/gui/tradewindow.cpp:167
#, c-format
msgid "You get %s"
msgstr "Вы получаете %s."
-#: src/gui/tradewindow.cpp:111
+#: src/gui/tradewindow.cpp:112
msgid "You give:"
msgstr "Вы отдаете:"
-#: src/gui/tradewindow.cpp:115
+#: src/gui/tradewindow.cpp:116
msgid "Change"
msgstr "Сменить"
-#: src/gui/tradewindow.cpp:374
+#: src/gui/tradewindow.cpp:375
msgid "You don't have enough money."
msgstr "У вас недостаточно денег"
-#: src/gui/tradewindow.cpp:453
+#: src/gui/tradewindow.cpp:454
msgid "Failed adding item. You can not overlap one kind of item on the window."
msgstr ""
"Отказано в добавлении предмета. Вы не можете добавить какой-либо вид "
@@ -3277,33 +3306,33 @@ msgstr ""
msgid "Name: %s"
msgstr "Имя: %s"
-#: src/gui/updaterwindow.cpp:136
+#: src/gui/updaterwindow.cpp:138
msgid "Updating..."
msgstr "Обновление..."
-#: src/gui/updaterwindow.cpp:155
+#: src/gui/updaterwindow.cpp:159
msgid "Connecting..."
msgstr "Соединение..."
-#: src/gui/updaterwindow.cpp:158
+#: src/gui/updaterwindow.cpp:162
msgid "Play"
msgstr "Играть"
-#: src/gui/updaterwindow.cpp:556
+#: src/gui/updaterwindow.cpp:564
msgid "##1 The update process is incomplete."
msgstr "##1 Процесс обновления не завершен!"
#. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:558
+#: src/gui/updaterwindow.cpp:566
msgid "##1 It is strongly recommended that"
msgstr "##1 Настоятельно рекомендуется"
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:560
+#: src/gui/updaterwindow.cpp:568
msgid "##1 you try again later."
msgstr "##1 попытаться еще раз немного погодя."
-#: src/gui/updaterwindow.cpp:686
+#: src/gui/updaterwindow.cpp:744
msgid "Completed"
msgstr "Завершено"
@@ -3455,23 +3484,23 @@ msgstr "Бордюр домашней позиции"
msgid "Road Point"
msgstr "Точка дороги"
-#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:471
+#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:472
msgid "Who Is Online - Updating"
msgstr "Кто онлайн - обновление"
-#: src/gui/whoisonline.cpp:101
+#: src/gui/whoisonline.cpp:102
msgid "Update"
msgstr "Обновить"
-#: src/gui/whoisonline.cpp:294
+#: src/gui/whoisonline.cpp:295
msgid "Who Is Online - "
msgstr "Кто онлайн - "
-#: src/gui/whoisonline.cpp:485
+#: src/gui/whoisonline.cpp:486
msgid "Who Is Online - error"
msgstr "Кто онлайн - ошибка"
-#: src/gui/whoisonline.cpp:516
+#: src/gui/whoisonline.cpp:517
msgid "Who Is Online - Update"
msgstr "Кто онлайн - обновление"
@@ -3536,7 +3565,8 @@ msgid "This command makes <nick> a channel operator."
msgstr "Эта Команда делает <пользователь> оператором канала."
#: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
-#: src/net/ea/gui/guildtab.cpp:69 src/net/ea/gui/partytab.cpp:85
+#: src/gui/widgets/guildchattab.cpp:61 src/net/ea/gui/guildtab.cpp:69
+#: src/net/ea/gui/partytab.cpp:85
msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
msgstr "Если ник содержит пробелы, заключите его в кавычки (\")."
@@ -3575,6 +3605,41 @@ msgstr "Глобальное объявление от %s:"
msgid "%s whispers: %s"
msgstr "%s шепчет: %s"
+#: src/gui/widgets/guildchattab.cpp:59 src/net/ea/gui/guildtab.cpp:67
+#: src/net/ea/gui/partytab.cpp:83
+msgid "Command: /invite <nick>"
+msgstr "Команда: /invite <игрок>"
+
+#: src/gui/widgets/guildchattab.cpp:60 src/net/ea/gui/guildtab.cpp:68
+msgid "This command invites <nick> to the guild you're in."
+msgstr "Эта команда приглашает <имя персонажа> к Вам в группу."
+
+#: src/gui/widgets/guildchattab.cpp:66 src/net/ea/gui/guildtab.cpp:74
+#: src/net/ea/gui/partytab.cpp:90
+msgid "Command: /leave"
+msgstr "Команда: /leave"
+
+#: src/gui/widgets/guildchattab.cpp:67 src/net/ea/gui/guildtab.cpp:75
+msgid "This command causes the player to leave the guild."
+msgstr "Эта команда заставляет игрока покинуть гильдию."
+
+#: src/gui/widgets/guildchattab.cpp:109 src/net/ea/gui/guildtab.cpp:135
+#: src/net/ea/gui/partytab.cpp:69
+msgid "/help > Display this help."
+msgstr "/help > Показать эту справку"
+
+#: src/gui/widgets/guildchattab.cpp:110 src/net/ea/gui/guildtab.cpp:136
+msgid "/invite > Invite a player to your guild"
+msgstr "/invite > Пригласить игрока в Вашу гильдию"
+
+#: src/gui/widgets/guildchattab.cpp:111 src/net/ea/gui/guildtab.cpp:137
+msgid "/leave > Leave the guild you are in"
+msgstr "/leave > Покинуть текущую гильдию"
+
+#: src/gui/widgets/guildchattab.cpp:112 src/net/ea/gui/guildtab.cpp:138
+msgid "/kick > Kick some one from the guild you are in"
+msgstr "/kick > Вышвырнуть кого-либо из Вашей текущей группы"
+
#: src/gui/widgets/setupitem.cpp:271 src/gui/widgets/setupitem.cpp:394
msgid "Edit"
msgstr "Изменить"
@@ -4108,41 +4173,41 @@ msgstr ""
"Конфликт клавиш \"%s\" и \"%s\".Исправьте их, или игра может себя странно "
"вести."
-#: src/localplayer.cpp:372
+#: src/localplayer.cpp:370
msgid "You were killed by "
msgstr "Вы были убиты "
-#: src/localplayer.cpp:1403
+#: src/localplayer.cpp:1401
msgid "Tried to pick up nonexistent item."
msgstr "Попытка поднять несуществующий предмет."
-#: src/localplayer.cpp:1405
+#: src/localplayer.cpp:1403
msgid "Item is too heavy."
msgstr "Предмет слишком тяжелый."
-#: src/localplayer.cpp:1407
+#: src/localplayer.cpp:1405
msgid "Item is too far away."
msgstr "Предмет слишком далеко"
-#: src/localplayer.cpp:1409
+#: src/localplayer.cpp:1407
msgid "Inventory is full."
msgstr "Инвентарь переполнен."
-#: src/localplayer.cpp:1411
+#: src/localplayer.cpp:1409
msgid "Stack is too big."
msgstr "Слишком много предметов."
-#: src/localplayer.cpp:1414
+#: src/localplayer.cpp:1412
msgid "Item belongs to someone else."
msgstr "Предмет принадлежит кому-то еще."
-#: src/localplayer.cpp:1417
+#: src/localplayer.cpp:1415
msgid "Unknown problem picking up item."
msgstr "Неизвестная проблема при поднятии предмета."
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1441
+#: src/localplayer.cpp:1439
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -4150,27 +4215,27 @@ msgstr[0] "Вы подняли %d [@@%d|%s@@]."
msgstr[1] "Вы подняли %d [@@%d|%s@@]."
msgstr[2] "Вы подняли %d [@@%d|%s@@]."
-#: src/localplayer.cpp:3175
+#: src/localplayer.cpp:3173
msgid "Away"
msgstr "Отошел"
-#: src/localplayer.cpp:3476
+#: src/localplayer.cpp:3474
msgid "Follow: "
msgstr "Следование: "
-#: src/localplayer.cpp:3478 src/localplayer.cpp:3493
+#: src/localplayer.cpp:3476 src/localplayer.cpp:3491
msgid "Follow canceled"
msgstr "Следование отменено"
-#: src/localplayer.cpp:3485
+#: src/localplayer.cpp:3483
msgid "Imitation: "
msgstr "Имитация: "
-#: src/localplayer.cpp:3487 src/localplayer.cpp:3495
+#: src/localplayer.cpp:3485 src/localplayer.cpp:3493
msgid "Imitation canceled"
msgstr "Имитация отменена"
-#: src/localplayer.cpp:3847
+#: src/localplayer.cpp:3845
msgid "You see "
msgstr "Вы видите "
@@ -4348,28 +4413,28 @@ msgstr "Персонаж удален"
msgid "Failed to delete character."
msgstr "Невозможно удалить персонажа."
-#: src/net/ea/chathandler.cpp:60 src/net/ea/chathandler.cpp:66
-#: src/net/ea/chathandler.cpp:71 src/net/ea/chathandler.cpp:77
-#: src/net/ea/chathandler.cpp:82 src/net/ea/chathandler.cpp:88
-#: src/net/ea/chathandler.cpp:95 src/net/ea/chathandler.cpp:101
+#: src/net/ea/chathandler.cpp:61 src/net/ea/chathandler.cpp:67
+#: src/net/ea/chathandler.cpp:72 src/net/ea/chathandler.cpp:78
+#: src/net/ea/chathandler.cpp:83 src/net/ea/chathandler.cpp:89
+#: src/net/ea/chathandler.cpp:96 src/net/ea/chathandler.cpp:102
msgid "Channels are not supported!"
msgstr "Каналы не поддерживаются!"
-#: src/net/ea/chathandler.cpp:128
+#: src/net/ea/chathandler.cpp:129
#, c-format
msgid "Whisper could not be sent, %s is offline."
msgstr "Сообщение не может быть отправлено, %s оффлайн."
-#: src/net/ea/chathandler.cpp:136
+#: src/net/ea/chathandler.cpp:137
#, c-format
msgid "Whisper could not be sent, ignored by %s."
msgstr "Приватное сообщение не может быть послано: %s игнорирует его."
-#: src/net/ea/chathandler.cpp:348
+#: src/net/ea/chathandler.cpp:355
msgid "MVP player."
msgstr "Игрок MVP."
-#: src/net/ea/chathandler.cpp:352
+#: src/net/ea/chathandler.cpp:359
msgid "MVP player: "
msgstr "Игрок MVP: "
@@ -4386,38 +4451,6 @@ msgstr "Игра"
msgid "Request to quit denied!"
msgstr "Запрос на выход отклонен!"
-#: src/net/ea/gui/guildtab.cpp:67 src/net/ea/gui/partytab.cpp:83
-msgid "Command: /invite <nick>"
-msgstr "Команда: /invite <игрок>"
-
-#: src/net/ea/gui/guildtab.cpp:68
-msgid "This command invites <nick> to the guild you're in."
-msgstr "Эта команда приглашает <имя персонажа> к Вам в группу."
-
-#: src/net/ea/gui/guildtab.cpp:74 src/net/ea/gui/partytab.cpp:90
-msgid "Command: /leave"
-msgstr "Команда: /leave"
-
-#: src/net/ea/gui/guildtab.cpp:75
-msgid "This command causes the player to leave the guild."
-msgstr "Эта команда заставляет игрока покинуть гильдию."
-
-#: src/net/ea/gui/guildtab.cpp:135 src/net/ea/gui/partytab.cpp:69
-msgid "/help > Display this help."
-msgstr "/help > Показать эту справку"
-
-#: src/net/ea/gui/guildtab.cpp:136
-msgid "/invite > Invite a player to your guild"
-msgstr "/invite > Пригласить игрока в Вашу гильдию"
-
-#: src/net/ea/gui/guildtab.cpp:137
-msgid "/leave > Leave the guild you are in"
-msgstr "/leave > Покинуть текущую гильдию"
-
-#: src/net/ea/gui/guildtab.cpp:138
-msgid "/kick > Kick some one from the guild you are in"
-msgstr "/kick > Вышвырнуть кого-либо из Вашей текущей группы"
-
#: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
msgid "Guild created."
msgstr "Гильдия создана."
@@ -4434,85 +4467,81 @@ msgstr "Имперская проверка провалена"
msgid "Unknown server response."
msgstr "Неизвестный ответ сервера."
-#: src/net/ea/guildhandler.cpp:180
+#: src/net/ea/guildhandler.cpp:181
#, c-format
msgid "Guild name: %s"
msgstr "Имя гильдии: %s"
-#: src/net/ea/guildhandler.cpp:182
+#: src/net/ea/guildhandler.cpp:183
#, c-format
msgid "Guild master: %s"
msgstr "Мастер гильдии: %s"
-#: src/net/ea/guildhandler.cpp:184
+#: src/net/ea/guildhandler.cpp:185
#, c-format
msgid "Guild level: %d"
msgstr "Уровень гильдии: %d"
-#: src/net/ea/guildhandler.cpp:186
+#: src/net/ea/guildhandler.cpp:187
#, c-format
msgid "Online members: %d"
msgstr "Пользователей онлайн: %d"
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:189
#, c-format
msgid "Max members: %d"
msgstr "Макс. членов: %d"
-#: src/net/ea/guildhandler.cpp:190
+#: src/net/ea/guildhandler.cpp:191
#, c-format
msgid "Average level: %d"
msgstr "Средний уровень: %d"
-#: src/net/ea/guildhandler.cpp:192
+#: src/net/ea/guildhandler.cpp:193
#, c-format
msgid "Guild exp: %d"
msgstr "Опыт гильдии: %d"
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:195
#, c-format
msgid "Guild next exp: %d"
msgstr "Нужно опыта до следующего уровня: %d"
-#: src/net/ea/guildhandler.cpp:196
+#: src/net/ea/guildhandler.cpp:197
#, c-format
msgid "Guild castle: %s"
msgstr "Замки: %s"
-#: src/net/ea/guildhandler.cpp:402
+#: src/net/ea/guildhandler.cpp:403
msgid "Could not inivte user to guild."
msgstr "Не удалось пригласить пользователя в гиьдию."
-#: src/net/ea/guildhandler.cpp:406
+#: src/net/ea/guildhandler.cpp:407
msgid "User rejected guild invite."
msgstr "Пользователь отклонил приглашение."
-#: src/net/ea/guildhandler.cpp:410
+#: src/net/ea/guildhandler.cpp:411
msgid "User is now part of your guild."
msgstr "Пользователь теперь в Вашей гильдии."
-#: src/net/ea/guildhandler.cpp:414
+#: src/net/ea/guildhandler.cpp:415
msgid "Your guild is full."
msgstr "Ваша гильдия полна."
-#: src/net/ea/guildhandler.cpp:418
+#: src/net/ea/guildhandler.cpp:419
msgid "Unknown guild invite response."
msgstr "Неизвестный ответ на приглашение в гильдию."
-#: src/net/ea/guildhandler.cpp:438
-msgid "You have left the guild."
-msgstr "Вы покинули гильдию."
-
-#: src/net/ea/guildhandler.cpp:452
+#: src/net/ea/guildhandler.cpp:453
#, c-format
msgid "%s has left your guild."
msgstr "%s покинул Вашу гильдию."
-#: src/net/ea/guildhandler.cpp:483
+#: src/net/ea/guildhandler.cpp:484
msgid "You was kicked from guild."
msgstr "Вы были кикнуты из гильдии."
-#: src/net/ea/guildhandler.cpp:496
+#: src/net/ea/guildhandler.cpp:497
#, c-format
msgid "%s has kicked from your guild."
msgstr "%s был вышвырнут из Вашей гильдии."
@@ -4740,12 +4769,12 @@ msgstr "QQQ Неизвестный ответ на приглашение для
msgid "You have left the party."
msgstr "Вы покинули группу."
-#: src/net/ea/partyhandler.cpp:368
+#: src/net/ea/partyhandler.cpp:369
#, c-format
msgid "%s has left your party."
msgstr "%s покинул Вашу группу."
-#: src/net/ea/partyhandler.cpp:444
+#: src/net/ea/partyhandler.cpp:448
#, c-format
msgid "An unknown member tried to say: %s"
msgstr "Неизвестный участник попытался сказать: %s"
@@ -4870,7 +4899,7 @@ msgid "You're pining for the fjords."
msgstr "Вас пришпиливают к фьордам."
#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
-#: src/net/ea/playerhandler.cpp:425
+#: src/net/ea/playerhandler.cpp:428
msgid "Message"
msgstr "Сообщение"
@@ -4887,21 +4916,21 @@ msgstr ""
"Вес предметов составляет менее половины допустимого. Теперь Вы можете "
"восстанавливаться."
-#: src/net/ea/playerhandler.cpp:451
+#: src/net/ea/playerhandler.cpp:454
#, c-format
msgid "You picked up %s."
msgstr "Вы получили %s."
-#: src/net/ea/playerhandler.cpp:457
+#: src/net/ea/playerhandler.cpp:460
#, c-format
msgid "You spent %s."
msgstr "Вы потратили %s."
-#: src/net/ea/playerhandler.cpp:501
+#: src/net/ea/playerhandler.cpp:506
msgid "Cannot raise skill!"
msgstr "Не удалось увеличить навык!"
-#: src/net/ea/playerhandler.cpp:618
+#: src/net/ea/playerhandler.cpp:624
msgid "Equip arrows first."
msgstr "Для начала экипируйтесь стрелами!"
@@ -5040,7 +5069,7 @@ msgstr "Торговля отменена."
msgid "Trade completed."
msgstr "Торговля завершена."
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:258
msgid "Strength"
msgstr "Сила (str)"
@@ -5049,7 +5078,7 @@ msgstr "Сила (str)"
msgid "Strength %+.1f"
msgstr "Сила (str) %+.1f"
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:259
msgid "Agility"
msgstr "Выносливость (agi)"
@@ -5058,7 +5087,7 @@ msgstr "Выносливость (agi)"
msgid "Agility %+.1f"
msgstr "Выносливость (agi) %+.1f"
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:262
msgid "Dexterity"
msgstr "Ловкость (dex)"
@@ -5067,7 +5096,7 @@ msgstr "Ловкость (dex)"
msgid "Dexterity %+.1f"
msgstr "Ловкость (dex) %+.1f"
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:260
msgid "Vitality"
msgstr "Живучесть (vit)"
@@ -5076,7 +5105,7 @@ msgstr "Живучесть (vit)"
msgid "Vitality %+.1f"
msgstr "Живучесть (vit) %+.1f"
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:261
msgid "Intelligence"
msgstr "Интеллект (int)"
@@ -5352,111 +5381,115 @@ msgstr "Невозможно продавать в режиме обмена."
msgid "Unable to sell unsellable item."
msgstr "Невозможно продать непродаваемый предмет."
-#: src/net/tmwa/generalhandler.cpp:109
+#: src/net/tmwa/generalhandler.cpp:108
#, c-format
msgid "Strength %+d"
msgstr "Сила (str) %+d"
-#: src/net/tmwa/generalhandler.cpp:110
+#: src/net/tmwa/generalhandler.cpp:109
#, c-format
msgid "Agility %+d"
msgstr "Выносливость (agi) %+d"
-#: src/net/tmwa/generalhandler.cpp:111
+#: src/net/tmwa/generalhandler.cpp:110
#, c-format
msgid "Vitality %+d"
msgstr "Живучесть (vit) %+d"
-#: src/net/tmwa/generalhandler.cpp:112
+#: src/net/tmwa/generalhandler.cpp:111
#, c-format
msgid "Intelligence %+d"
msgstr "Интеллект (int) %+d"
-#: src/net/tmwa/generalhandler.cpp:113
+#: src/net/tmwa/generalhandler.cpp:112
#, c-format
msgid "Dexterity %+d"
msgstr "Ловкость (dex) %+d"
-#: src/net/tmwa/generalhandler.cpp:114
+#: src/net/tmwa/generalhandler.cpp:113
#, c-format
msgid "Luck %+d"
msgstr "Удача (luk) %+d"
-#: src/net/tmwa/generalhandler.cpp:140
+#: src/net/tmwa/generalhandler.cpp:139
msgid "Authentication failed."
msgstr "Ошибка авторизации."
-#: src/net/tmwa/generalhandler.cpp:143
+#: src/net/tmwa/generalhandler.cpp:142
msgid "No servers available."
msgstr "Нет доступных серверов."
-#: src/net/tmwa/generalhandler.cpp:147
+#: src/net/tmwa/generalhandler.cpp:146
msgid "Someone else is trying to use this account."
msgstr "Кто-то еще пытается воспользоваться данным аккаунтом."
-#: src/net/tmwa/generalhandler.cpp:150
+#: src/net/tmwa/generalhandler.cpp:149
msgid "This account is already logged in."
msgstr "Этот аккаунт уже в сети."
-#: src/net/tmwa/generalhandler.cpp:153
+#: src/net/tmwa/generalhandler.cpp:152
msgid "Speed hack detected."
msgstr "Обнаружен взлом скорости."
-#: src/net/tmwa/generalhandler.cpp:156
+#: src/net/tmwa/generalhandler.cpp:155
msgid "Duplicated login."
msgstr "Двойная попытка подключения."
-#: src/net/tmwa/generalhandler.cpp:159
+#: src/net/tmwa/generalhandler.cpp:158
msgid "Unknown connection error."
msgstr "Неизвестная ошибка подключения."
-#: src/net/tmwa/generalhandler.cpp:232
+#: src/net/tmwa/generalhandler.cpp:231
msgid "Got disconnected from server!"
msgstr "Отключено от сервера!"
-#: src/net/tmwa/generalhandler.cpp:264
+#: src/net/tmwa/generalhandler.cpp:263
msgid "Luck"
msgstr "Удача (luk)"
-#: src/net/tmwa/generalhandler.cpp:267
+#: src/net/tmwa/generalhandler.cpp:266
msgid "Defense"
msgstr "Защита"
-#: src/net/tmwa/generalhandler.cpp:268
+#: src/net/tmwa/generalhandler.cpp:267
msgid "M.Attack"
msgstr "Маг. Атака"
-#: src/net/tmwa/generalhandler.cpp:269
+#: src/net/tmwa/generalhandler.cpp:268
msgid "M.Defense"
msgstr "Маг.Защита"
-#: src/net/tmwa/generalhandler.cpp:271
+#: src/net/tmwa/generalhandler.cpp:270
#, no-c-format
msgid "% Accuracy"
msgstr "% Точности"
-#: src/net/tmwa/generalhandler.cpp:273
+#: src/net/tmwa/generalhandler.cpp:272
#, no-c-format
msgid "% Evade"
msgstr "% Уклонения"
-#: src/net/tmwa/generalhandler.cpp:275
+#: src/net/tmwa/generalhandler.cpp:274
#, no-c-format
msgid "% Critical"
msgstr "% Критический удар"
-#: src/net/tmwa/generalhandler.cpp:276
+#: src/net/tmwa/generalhandler.cpp:275
msgid "Attack Delay"
msgstr "Задержка атаки"
-#: src/net/tmwa/generalhandler.cpp:278
+#: src/net/tmwa/generalhandler.cpp:277
msgid "Walk Delay"
msgstr "Задержка движения"
-#: src/net/tmwa/generalhandler.cpp:280
+#: src/net/tmwa/generalhandler.cpp:279
msgid "Attack Range"
msgstr "Зона атаки"
+#: src/net/tmwa/generalhandler.cpp:281
+msgid "Damage per sec."
+msgstr "Урон в сек."
+
#: src/net/tmwa/network.cpp:152
msgid "Empty address given to Network::connect()!"
msgstr "Пустой адрес был передан методу Network::connect()!"
@@ -5490,31 +5523,31 @@ msgstr "Плавающий '...' пузырек"
msgid "Floating bubble"
msgstr "Плавающий пузырек"
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:248
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:246
#: src/resources/monsterdb.cpp:84
msgid "unnamed"
msgstr "безымянный"
-#: src/resources/itemdb.cpp:65
+#: src/resources/itemdb.cpp:63
#, c-format
msgid "Attack %+d"
msgstr "Атака %+d"
-#: src/resources/itemdb.cpp:66
+#: src/resources/itemdb.cpp:64
#, c-format
msgid "Defense %+d"
msgstr "Защита %+d"
-#: src/resources/itemdb.cpp:67
+#: src/resources/itemdb.cpp:65
#, c-format
msgid "HP %+d"
msgstr "HP %+d"
-#: src/resources/itemdb.cpp:68
+#: src/resources/itemdb.cpp:66
#, c-format
msgid "MP %+d"
msgstr "Мана %+d"
-#: src/resources/itemdb.cpp:171
+#: src/resources/itemdb.cpp:169
msgid "Unknown item"
msgstr "Неизвестный предмет"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 779f21790..0ade28fe2 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-08-20 17:42+0300\n"
-"PO-Revision-Date: 2011-08-16 16:09+0000\n"
+"POT-Creation-Date: 2011-09-02 18:27+0300\n"
+"PO-Revision-Date: 2011-09-02 15:29+0000\n"
"Last-Translator: akaras <akaras@inbox.ru>\n"
"Language-Team: Chinese (China) (http://www.transifex.net/projects/p/manaplus/"
"team/zh_CN/)\n"
@@ -23,266 +23,266 @@ msgstr ""
msgid "Visible on map"
msgstr "在地图上可见"
-#: src/being.cpp:542
+#: src/being.cpp:549
msgid "dodge"
msgstr "躲闪"
-#: src/being.cpp:542
+#: src/being.cpp:549
msgid "miss"
msgstr "小姐"
#. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1514
+#: src/being.cpp:1529
msgid "A"
msgstr "A"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1519
+#: src/being.cpp:1534
msgid "I"
msgstr "I"
-#: src/client.cpp:826 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:831 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
msgid "Setup"
msgstr "设置"
-#: src/client.cpp:909
+#: src/client.cpp:914
msgid "Connecting to server"
msgstr "连接到服务器"
-#: src/client.cpp:940
+#: src/client.cpp:945
msgid "Logging in"
msgstr "登录"
-#: src/client.cpp:973
+#: src/client.cpp:978
msgid "Entering game world"
msgstr "进入游戏世界"
-#: src/client.cpp:1073
+#: src/client.cpp:1078
msgid "Requesting characters"
msgstr "请求字符"
-#: src/client.cpp:1104
+#: src/client.cpp:1109
msgid "Connecting to the game server"
msgstr "连接到游戏服务器"
-#: src/client.cpp:1114
+#: src/client.cpp:1119
msgid "Changing game servers"
msgstr "更改游戏服务器"
-#: src/client.cpp:1151 src/client.cpp:1158 src/client.cpp:1293
+#: src/client.cpp:1156 src/client.cpp:1163 src/client.cpp:1298
#: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
-#: src/gui/charcreatedialog.cpp:218 src/gui/charselectdialog.cpp:254
-#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:395
+#: src/gui/charcreatedialog.cpp:221 src/gui/charselectdialog.cpp:253
+#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
#: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:154
#: src/net/ea/charserverhandler.cpp:172 src/net/manaserv/charhandler.cpp:184
#: src/net/manaserv/charhandler.cpp:227
msgid "Error"
msgstr "错误"
-#: src/client.cpp:1167
+#: src/client.cpp:1172
msgid "Requesting registration details"
msgstr "申请登记的详细信息"
-#: src/client.cpp:1194
+#: src/client.cpp:1199
msgid "Password Change"
msgstr "密码更改"
-#: src/client.cpp:1195
+#: src/client.cpp:1200
msgid "Password changed successfully!"
msgstr "密码成功!"
-#: src/client.cpp:1214
+#: src/client.cpp:1219
msgid "Email Change"
msgstr "电子邮件变更"
-#: src/client.cpp:1215
+#: src/client.cpp:1220
msgid "Email changed successfully!"
msgstr "电子邮件已变更成功!"
-#: src/client.cpp:1235
+#: src/client.cpp:1240
msgid "Unregister Successful"
msgstr "注销成功"
-#: src/client.cpp:1236
+#: src/client.cpp:1241
msgid "Farewell, come back any time..."
msgstr "永别了,任何时候回来... ..."
-#: src/client.cpp:1423 src/client.cpp:1453 src/client.cpp:1497
-#: src/client.cpp:1922 src/client.cpp:1929
+#: src/client.cpp:1428 src/client.cpp:1458 src/client.cpp:1502
+#: src/client.cpp:1927 src/client.cpp:1934
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
-#: src/client.cpp:1628
+#: src/client.cpp:1633
#, c-format
msgid "Invalid update host: %s"
msgstr ""
-#: src/client.cpp:1662 src/client.cpp:1668
+#: src/client.cpp:1667 src/client.cpp:1673
msgid "Error creating updates directory!"
msgstr "创建更新目录错误!"
-#: src/client.cpp:1689
+#: src/client.cpp:1694
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
-#: src/commandhandler.cpp:301
+#: src/commandhandler.cpp:303
msgid "Unknown command."
msgstr "未知命令。"
-#: src/commandhandler.cpp:401
+#: src/commandhandler.cpp:403
msgid "Cannot send empty whispers!"
msgstr "无法发送空白密语!"
-#: src/commandhandler.cpp:415
+#: src/commandhandler.cpp:417
#, c-format
msgid ""
"Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
"you."
msgstr "无法同 \"%s\" 建立一个私人谈话标签页!或者已经存在,或者那就是自己。"
-#: src/commandhandler.cpp:435
+#: src/commandhandler.cpp:437
#, c-format
msgid "Requesting to join channel %s."
msgstr "请求加入频道%s。"
-#: src/commandhandler.cpp:451 src/net/ea/gui/partytab.cpp:125
+#: src/commandhandler.cpp:453 src/net/ea/gui/partytab.cpp:125
msgid "Party name is missing."
msgstr "帮会名称缺失。"
-#: src/commandhandler.cpp:462
+#: src/commandhandler.cpp:464
msgid "Guild name is missing."
msgstr "公会名称是缺少的。"
-#: src/commandhandler.cpp:475 src/commandhandler.cpp:582
-#: src/commandhandler.cpp:623 src/commandhandler.cpp:653
+#: src/commandhandler.cpp:477 src/commandhandler.cpp:589
+#: src/commandhandler.cpp:630 src/commandhandler.cpp:660
msgid "Please specify a name."
msgstr "请指定一个名称。"
-#: src/commandhandler.cpp:516
+#: src/commandhandler.cpp:523
msgid "Return toggles chat."
msgstr ""
-#: src/commandhandler.cpp:516
+#: src/commandhandler.cpp:523
msgid "Message closes chat."
msgstr "讯息关闭聊天。"
-#: src/commandhandler.cpp:527
+#: src/commandhandler.cpp:534
msgid "Return now toggles chat."
msgstr "<回车>键现在切换聊天。"
-#: src/commandhandler.cpp:533
+#: src/commandhandler.cpp:540
msgid "Message now closes chat."
msgstr "讯息现在关闭聊天。"
-#: src/commandhandler.cpp:561
+#: src/commandhandler.cpp:568
msgid "friend"
msgstr "朋友"
-#: src/commandhandler.cpp:566
+#: src/commandhandler.cpp:573
msgid "disregarded"
msgstr "无视"
-#: src/commandhandler.cpp:571
+#: src/commandhandler.cpp:578
msgid "neutral"
msgstr "中性"
-#: src/commandhandler.cpp:590
+#: src/commandhandler.cpp:597
#, c-format
msgid "Player already %s!"
msgstr "玩家已经%s!"
-#: src/commandhandler.cpp:604
+#: src/commandhandler.cpp:611
#, c-format
msgid "Player successfully %s!"
msgstr "玩家成功%s!"
-#: src/commandhandler.cpp:612
+#: src/commandhandler.cpp:619
#, c-format
msgid "Player could not be %s!"
msgstr ""
-#: src/commandhandler.cpp:634
+#: src/commandhandler.cpp:641
msgid "Player wasn't ignored!"
msgstr "是不能忽视的!"
-#: src/commandhandler.cpp:641
+#: src/commandhandler.cpp:648
msgid "Player no longer ignored!"
msgstr "玩家不再被忽略!"
-#: src/commandhandler.cpp:643
+#: src/commandhandler.cpp:650
msgid "Player could not be unignored!"
msgstr "玩家不能被忽略!"
-#: src/commandhandler.cpp:660
+#: src/commandhandler.cpp:667
msgid "Player already erased!"
msgstr "玩家已经被删除!"
-#: src/commandhandler.cpp:671
+#: src/commandhandler.cpp:678
msgid "Player successfully erased!"
msgstr ""
-#: src/commandhandler.cpp:673
+#: src/commandhandler.cpp:680
msgid "Player could not be erased!"
msgstr ""
-#: src/commandhandler.cpp:972 src/commandhandler.cpp:1018
+#: src/commandhandler.cpp:980 src/commandhandler.cpp:1026
#, c-format
msgid "Client uptime: %s"
msgstr ""
-#: src/commandhandler.cpp:982
+#: src/commandhandler.cpp:990
#, c-format
msgid "%d week"
msgid_plural "%d weeks"
msgstr[0] ""
-#: src/commandhandler.cpp:991
+#: src/commandhandler.cpp:999
#, c-format
msgid "%d day"
msgid_plural "%d days"
msgstr[0] ""
-#: src/commandhandler.cpp:999
+#: src/commandhandler.cpp:1007
#, c-format
msgid "%d hour"
msgid_plural "%d hours"
msgstr[0] ""
-#: src/commandhandler.cpp:1007
+#: src/commandhandler.cpp:1015
#, c-format
msgid "%d minute"
msgid_plural "%d minutes"
msgstr[0] ""
-#: src/commandhandler.cpp:1015
+#: src/commandhandler.cpp:1023
#, c-format
msgid "%d second"
msgid_plural "%d seconds"
msgstr[0] ""
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1102
msgid "font cache size"
msgstr ""
-#: src/commandhandler.cpp:1106
+#: src/commandhandler.cpp:1114
msgid "Cache size:"
msgstr ""
-#: src/commandhandler.cpp:1110
+#: src/commandhandler.cpp:1118
msgid "Created:"
msgstr "创建于:"
-#: src/commandhandler.cpp:1112
+#: src/commandhandler.cpp:1120
msgid "Deleted:"
msgstr "删除:"
-#: src/commandhandler.cpp:1159 src/commandhandler.cpp:1166
+#: src/commandhandler.cpp:1167 src/commandhandler.cpp:1174
msgid "Resource images:"
msgstr ""
-#: src/commandhandler.cpp:1161 src/commandhandler.cpp:1168
+#: src/commandhandler.cpp:1169 src/commandhandler.cpp:1176
msgid "Resource orphaned images:"
msgstr ""
@@ -291,43 +291,43 @@ msgstr ""
msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
msgstr "/%s的选项是\"yes\",\"no\",\"true\",\"false\",\"1\",\"0\"。"
-#: src/game.cpp:246 src/gui/widgets/chattab.cpp:411
+#: src/game.cpp:252 src/gui/widgets/chattab.cpp:409
msgid "General"
msgstr "常规"
-#: src/game.cpp:250 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:413
+#: src/game.cpp:256 src/gui/debugwindow.cpp:54 src/gui/widgets/chattab.cpp:411
msgid "Debug"
msgstr "调试 "
-#: src/game.cpp:488
+#: src/game.cpp:511
msgid "Screenshot saved as "
msgstr "截图保存为"
-#: src/game.cpp:496
+#: src/game.cpp:519
msgid "Saving screenshot failed!"
msgstr "保存屏幕快照失败!"
-#: src/game.cpp:536
+#: src/game.cpp:559
msgid "The connection to the server was lost."
msgstr "服务器的连接丢失。"
-#: src/game.cpp:548
+#: src/game.cpp:571
msgid "Network Error"
msgstr "网络错误"
-#: src/game.cpp:1213
+#: src/game.cpp:1236
msgid "Ignoring incoming trade requests"
msgstr "忽略新进的交易请求"
-#: src/game.cpp:1220
+#: src/game.cpp:1243
msgid "Accepting incoming trade requests"
msgstr "接受传入的交易请求"
-#: src/game.cpp:1606
+#: src/game.cpp:1629
msgid "Could Not Load Map"
msgstr "不能加载地图"
-#: src/game.cpp:1607
+#: src/game.cpp:1630
#, c-format
msgid "Error while loading %s"
msgstr "加载%s时出现错误"
@@ -356,103 +356,103 @@ msgstr "评论: %s"
msgid "Bot Checker"
msgstr "机器人检查"
-#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
+#: src/gui/botcheckerwindow.cpp:295 src/gui/setup_relations.cpp:64
msgid "Name"
msgstr "姓名"
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:134
-#: src/gui/popupmenu.cpp:292 src/gui/popupmenu.cpp:617
-#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:266
+#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:133
+#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:646
+#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:265
msgid "Attack"
msgstr "攻击"
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:279
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:297
#: src/keyboardconfig.cpp:62
msgid "Talk"
msgstr "说话"
-#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:245
-#: src/gui/popupmenu.cpp:284 src/gui/popupmenu.cpp:674
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:263
+#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:703
msgid "Move"
msgstr "移动"
-#: src/gui/botcheckerwindow.cpp:300
+#: src/gui/botcheckerwindow.cpp:299
msgid "Result"
msgstr "结果"
-#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:123
+#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:124
msgid "Reset"
msgstr "重置"
-#: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:97
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:260
-#: src/gui/popupmenu.cpp:281 src/gui/popupmenu.cpp:688
+#: src/gui/buydialog.cpp:56 src/gui/buydialog.cpp:63 src/gui/buydialog.cpp:98
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:278
+#: src/gui/popupmenu.cpp:299 src/gui/popupmenu.cpp:717
msgid "Buy"
msgstr "购买"
-#: src/gui/buydialog.cpp:88 src/gui/buydialog.cpp:302
-#: src/gui/selldialog.cpp:87 src/gui/selldialog.cpp:324
+#: src/gui/buydialog.cpp:89 src/gui/buydialog.cpp:303
+#: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
#, c-format
msgid "Price: %s / Total: %s"
msgstr "价格:%s / 总价:%s"
#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
#. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:93 src/gui/itemamountwindow.cpp:207
-#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:113
-#: src/gui/selldialog.cpp:90 src/gui/statuswindow.cpp:974
+#: src/gui/buydialog.cpp:94 src/gui/itemamountwindow.cpp:207
+#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:973
msgid "+"
msgstr "+"
#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
#. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:96 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:986
+#: src/gui/buydialog.cpp:97 src/gui/itemamountwindow.cpp:206
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:985
msgid "-"
msgstr "-"
-#: src/gui/buydialog.cpp:98 src/gui/quitdialog.cpp:49
-#: src/gui/quitdialog.cpp:54 src/gui/quitdialog.cpp:55
-#: src/gui/selldialog.cpp:93 src/gui/serverdialog.cpp:288
+#: src/gui/buydialog.cpp:99 src/gui/quitdialog.cpp:47
+#: src/gui/quitdialog.cpp:49 src/gui/quitdialog.cpp:50
+#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:294
#: src/keyboardconfig.cpp:290
msgid "Quit"
msgstr "退出"
-#: src/gui/buydialog.cpp:99 src/gui/selldialog.cpp:94
-#: src/gui/statuswindow.cpp:503 src/gui/statuswindow.cpp:552
-#: src/gui/statuswindow.cpp:973 src/gui/statuswindow.cpp:1004
+#: src/gui/buydialog.cpp:100 src/gui/selldialog.cpp:95
+#: src/gui/statuswindow.cpp:504 src/gui/statuswindow.cpp:553
+#: src/gui/statuswindow.cpp:972 src/gui/statuswindow.cpp:1003
msgid "Max"
msgstr "最大"
#: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:146 src/gui/setup_other.cpp:133
+#: src/gui/inventorywindow.cpp:147 src/gui/setup_other.cpp:133
msgid "Shop"
msgstr "商店"
-#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:262
-#: src/gui/popupmenu.cpp:282 src/gui/popupmenu.cpp:690
+#: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:280
+#: src/gui/popupmenu.cpp:300 src/gui/popupmenu.cpp:719
#: src/gui/selldialog.cpp:53 src/gui/selldialog.cpp:60
-#: src/gui/selldialog.cpp:92
+#: src/gui/selldialog.cpp:93
msgid "Sell"
msgstr "出售"
#: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
-#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:93
+#: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:96
#: src/gui/connectiondialog.cpp:47 src/gui/itemamountwindow.cpp:209
-#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:336
-#: src/gui/popupmenu.cpp:357 src/gui/popupmenu.cpp:460
-#: src/gui/popupmenu.cpp:487 src/gui/popupmenu.cpp:511
-#: src/gui/popupmenu.cpp:525 src/gui/popupmenu.cpp:544
-#: src/gui/popupmenu.cpp:750 src/gui/popupmenu.cpp:774
-#: src/gui/popupmenu.cpp:1684 src/gui/popupmenu.cpp:1712
-#: src/gui/popupmenu.cpp:1768 src/gui/popupmenu.cpp:1811
-#: src/gui/popupmenu.cpp:1846 src/gui/popupmenu.cpp:1886
-#: src/gui/popupmenu.cpp:1953 src/gui/popupmenu.cpp:1973
-#: src/gui/quitdialog.cpp:59 src/gui/register.cpp:82 src/gui/setup.cpp:71
-#: src/gui/socialwindow.cpp:973 src/gui/textcommandeditor.cpp:238
+#: src/gui/npcpostdialog.cpp:58 src/gui/popupmenu.cpp:354
+#: src/gui/popupmenu.cpp:375 src/gui/popupmenu.cpp:489
+#: src/gui/popupmenu.cpp:516 src/gui/popupmenu.cpp:540
+#: src/gui/popupmenu.cpp:554 src/gui/popupmenu.cpp:573
+#: src/gui/popupmenu.cpp:790 src/gui/popupmenu.cpp:814
+#: src/gui/popupmenu.cpp:1734 src/gui/popupmenu.cpp:1762
+#: src/gui/popupmenu.cpp:1818 src/gui/popupmenu.cpp:1861
+#: src/gui/popupmenu.cpp:1896 src/gui/popupmenu.cpp:1936
+#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2023
+#: src/gui/quitdialog.cpp:54 src/gui/register.cpp:82 src/gui/setup.cpp:72
+#: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:238
#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updaterwindow.cpp:157
+#: src/gui/updaterwindow.cpp:161
msgid "Cancel"
msgstr "取消"
@@ -484,7 +484,7 @@ msgid "The email address entries mismatch."
msgstr "电子邮件地址不匹配。"
#: src/gui/changepassworddialog.cpp:50 src/gui/changepassworddialog.cpp:59
-#: src/gui/charselectdialog.cpp:140
+#: src/gui/charselectdialog.cpp:139
msgid "Change Password"
msgstr "更换密码"
@@ -519,121 +519,121 @@ msgstr "新的密码输入不匹配。"
msgid "Create Character"
msgstr "创建角色"
-#: src/gui/charcreatedialog.cpp:73 src/gui/logindialog.cpp:94
+#: src/gui/charcreatedialog.cpp:76 src/gui/logindialog.cpp:94
#: src/gui/register.cpp:75
msgid "Name:"
msgstr "姓名"
#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
#. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:76 src/gui/charcreatedialog.cpp:81
-#: src/gui/charcreatedialog.cpp:87 src/gui/outfitwindow.cpp:81
+#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:84
+#: src/gui/charcreatedialog.cpp:90 src/gui/outfitwindow.cpp:85
msgid ">"
msgstr ">"
#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
#. You may change this symbol if your language uses another.
-#: src/gui/charcreatedialog.cpp:79 src/gui/charcreatedialog.cpp:82
-#: src/gui/charcreatedialog.cpp:88 src/gui/outfitwindow.cpp:80
+#: src/gui/charcreatedialog.cpp:82 src/gui/charcreatedialog.cpp:85
+#: src/gui/charcreatedialog.cpp:91 src/gui/outfitwindow.cpp:84
msgid "<"
msgstr "<"
-#: src/gui/charcreatedialog.cpp:80
+#: src/gui/charcreatedialog.cpp:83
msgid "Hair color:"
msgstr "头发颜色:"
-#: src/gui/charcreatedialog.cpp:83
+#: src/gui/charcreatedialog.cpp:86
msgid "Hair style:"
msgstr "发型:"
-#: src/gui/charcreatedialog.cpp:89
+#: src/gui/charcreatedialog.cpp:92
msgid "Race:"
msgstr ""
-#: src/gui/charcreatedialog.cpp:92 src/gui/charselectdialog.cpp:479
-#: src/gui/socialwindow.cpp:1033
+#: src/gui/charcreatedialog.cpp:95 src/gui/charselectdialog.cpp:478
+#: src/gui/socialwindow.cpp:1139
msgid "Create"
msgstr "建立"
-#: src/gui/charcreatedialog.cpp:94 src/gui/register.cpp:98
+#: src/gui/charcreatedialog.cpp:97 src/gui/register.cpp:98
msgid "Male"
msgstr "帅哥"
-#: src/gui/charcreatedialog.cpp:95 src/gui/register.cpp:99
+#: src/gui/charcreatedialog.cpp:98 src/gui/register.cpp:99
msgid "Female"
msgstr "美女"
-#: src/gui/charcreatedialog.cpp:113 src/gui/charcreatedialog.cpp:300
+#: src/gui/charcreatedialog.cpp:116 src/gui/charcreatedialog.cpp:303
#, c-format
msgid "Please distribute %d points"
msgstr "请分发%d点数"
-#: src/gui/charcreatedialog.cpp:219
+#: src/gui/charcreatedialog.cpp:222
msgid "Your name needs to be at least 4 characters."
msgstr "你的名字需要至少4个字符"
-#: src/gui/charcreatedialog.cpp:291
+#: src/gui/charcreatedialog.cpp:294
msgid "Character stats OK"
msgstr "角色状态可以"
-#: src/gui/charcreatedialog.cpp:305
+#: src/gui/charcreatedialog.cpp:308
#, c-format
msgid "Please remove %d points"
msgstr "请删除%d点数"
-#: src/gui/charselectdialog.cpp:77
+#: src/gui/charselectdialog.cpp:76
msgid "Confirm Character Delete"
msgstr "确认删除角色"
-#: src/gui/charselectdialog.cpp:78
+#: src/gui/charselectdialog.cpp:77
msgid "Are you sure you want to delete this character?"
msgstr "你确定想删除这个角色?"
-#: src/gui/charselectdialog.cpp:126
+#: src/gui/charselectdialog.cpp:125
msgid "Account and Character Management"
msgstr "帐号和角色管理"
-#: src/gui/charselectdialog.cpp:139
+#: src/gui/charselectdialog.cpp:138
msgid "Switch Login"
msgstr "登录"
-#: src/gui/charselectdialog.cpp:153 src/gui/unregisterdialog.cpp:50
+#: src/gui/charselectdialog.cpp:152 src/gui/unregisterdialog.cpp:50
#: src/gui/unregisterdialog.cpp:58
msgid "Unregister"
msgstr "注销"
-#: src/gui/charselectdialog.cpp:162
+#: src/gui/charselectdialog.cpp:161
msgid "Change Email"
msgstr "变更电子邮件"
-#: src/gui/charselectdialog.cpp:254
+#: src/gui/charselectdialog.cpp:253
msgid "Incorrect password"
msgstr "不正确的密码"
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:286
msgid "Enter password for deleting character"
msgstr "删除字符输入的密码"
-#: src/gui/charselectdialog.cpp:287
+#: src/gui/charselectdialog.cpp:286
msgid "Enter password:"
msgstr "输入密码:"
-#: src/gui/charselectdialog.cpp:409 src/gui/serverdialog.cpp:292
-#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:120
-#: src/gui/shopwindow.cpp:123 src/gui/textcommandeditor.cpp:241
+#: src/gui/charselectdialog.cpp:408 src/gui/serverdialog.cpp:298
+#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:122
+#: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:241
msgid "Delete"
msgstr "删除"
-#: src/gui/charselectdialog.cpp:467
+#: src/gui/charselectdialog.cpp:466
msgid "Choose"
msgstr "选择"
-#: src/gui/charselectdialog.cpp:470
+#: src/gui/charselectdialog.cpp:469
#, c-format
msgid "Level %d"
msgstr "等级 %d"
-#: src/gui/charselectdialog.cpp:481 src/gui/charselectdialog.cpp:482
+#: src/gui/charselectdialog.cpp:480 src/gui/charselectdialog.cpp:481
msgid "(empty)"
msgstr "()"
@@ -705,12 +705,12 @@ msgstr "???"
msgid "Chat"
msgstr "聊天"
-#: src/gui/chatwindow.cpp:606
+#: src/gui/chatwindow.cpp:609
#, c-format
msgid "Present: %s; %d players are present."
msgstr ""
-#: src/gui/chatwindow.cpp:993
+#: src/gui/chatwindow.cpp:996
#, c-format
msgid "Whispering to %s: %s"
msgstr "对%s密语到:%s"
@@ -723,145 +723,145 @@ msgstr "是"
msgid "No"
msgstr "否"
-#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:150
-#: src/gui/popupmenu.cpp:159 src/gui/popupmenu.cpp:384
-#: src/gui/popupmenu.cpp:390 src/gui/popupmenu.cpp:632
-#: src/gui/popupmenu.cpp:640
+#: src/gui/confirmdialog.cpp:52 src/gui/popupmenu.cpp:149
+#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:402
+#: src/gui/popupmenu.cpp:408 src/gui/popupmenu.cpp:661
+#: src/gui/popupmenu.cpp:669
msgid "Ignore"
msgstr "忽略"
-#: src/gui/debugwindow.cpp:70 src/gui/minimap.cpp:49 src/gui/minimap.cpp:96
+#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:97
#: src/gui/setup_other.cpp:64
msgid "Map"
msgstr "地图"
-#: src/gui/debugwindow.cpp:71
+#: src/gui/debugwindow.cpp:73
msgid "Target"
msgstr ""
-#: src/gui/debugwindow.cpp:72
+#: src/gui/debugwindow.cpp:74
msgid "Net"
msgstr ""
-#: src/gui/debugwindow.cpp:145 src/gui/debugwindow.cpp:220
-#: src/gui/debugwindow.cpp:249
+#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
+#: src/gui/debugwindow.cpp:251
msgid "Music:"
msgstr "音乐:"
-#: src/gui/debugwindow.cpp:146 src/gui/debugwindow.cpp:224
-#: src/gui/debugwindow.cpp:251
+#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:226
+#: src/gui/debugwindow.cpp:253
msgid "Map:"
msgstr "地图:"
-#: src/gui/debugwindow.cpp:147 src/gui/debugwindow.cpp:222
-#: src/gui/debugwindow.cpp:250
+#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:224
+#: src/gui/debugwindow.cpp:252
msgid "Minimap:"
msgstr "小地图:"
-#: src/gui/debugwindow.cpp:148 src/gui/debugwindow.cpp:218
-#: src/gui/debugwindow.cpp:247
+#: src/gui/debugwindow.cpp:150 src/gui/debugwindow.cpp:220
+#: src/gui/debugwindow.cpp:249
msgid "Cursor:"
msgstr "光标:"
-#: src/gui/debugwindow.cpp:149 src/gui/debugwindow.cpp:201
-#: src/gui/debugwindow.cpp:206
+#: src/gui/debugwindow.cpp:151 src/gui/debugwindow.cpp:203
+#: src/gui/debugwindow.cpp:208
msgid "Player Position:"
msgstr "的位置:"
-#: src/gui/debugwindow.cpp:152
+#: src/gui/debugwindow.cpp:154
msgid "Particle count:"
msgstr ""
-#: src/gui/debugwindow.cpp:154 src/gui/debugwindow.cpp:235
-#: src/gui/debugwindow.cpp:254
+#: src/gui/debugwindow.cpp:156 src/gui/debugwindow.cpp:237
+#: src/gui/debugwindow.cpp:256
msgid "Map actors count:"
msgstr "地图演员数:"
-#: src/gui/debugwindow.cpp:162 src/gui/debugwindow.cpp:173
+#: src/gui/debugwindow.cpp:164 src/gui/debugwindow.cpp:175
#, c-format
msgid "%d FPS (Software)"
msgstr "%d FPS (软件)"
-#: src/gui/debugwindow.cpp:166
+#: src/gui/debugwindow.cpp:168
#, c-format
msgid "%d FPS (fast OpenGL)"
msgstr "%d的FPS (快速 OpenGL)"
-#: src/gui/debugwindow.cpp:169
+#: src/gui/debugwindow.cpp:171
#, c-format
msgid "%d FPS (old OpenGL)"
msgstr "%d FPS (旧的OpenGL)"
-#: src/gui/debugwindow.cpp:176
+#: src/gui/debugwindow.cpp:178
#, c-format
msgid "%d FPS"
msgstr "%d的FPS"
-#: src/gui/debugwindow.cpp:188 src/gui/debugwindow.cpp:240
+#: src/gui/debugwindow.cpp:190 src/gui/debugwindow.cpp:242
msgid "Textures count:"
msgstr ""
-#: src/gui/debugwindow.cpp:231
+#: src/gui/debugwindow.cpp:233
#, c-format
msgid "Particle count: %d"
msgstr "粒子数:%d个"
-#: src/gui/debugwindow.cpp:268 src/gui/debugwindow.cpp:299
-#: src/gui/debugwindow.cpp:343
+#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:301
+#: src/gui/debugwindow.cpp:345
msgid "Target:"
msgstr "目标:"
-#: src/gui/debugwindow.cpp:269 src/gui/debugwindow.cpp:304
-#: src/gui/debugwindow.cpp:344
+#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:306
+#: src/gui/debugwindow.cpp:346
msgid "Target Id:"
msgstr "目标ID:"
-#: src/gui/debugwindow.cpp:270 src/gui/debugwindow.cpp:308
-#: src/gui/debugwindow.cpp:313 src/gui/debugwindow.cpp:345
+#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:310
+#: src/gui/debugwindow.cpp:315 src/gui/debugwindow.cpp:347
msgid "Target Level:"
msgstr "目标水平:"
-#: src/gui/debugwindow.cpp:271 src/gui/debugwindow.cpp:316
-#: src/gui/debugwindow.cpp:346
+#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:318
+#: src/gui/debugwindow.cpp:348
msgid "Target Party:"
msgstr "目标:"
-#: src/gui/debugwindow.cpp:272 src/gui/debugwindow.cpp:319
-#: src/gui/debugwindow.cpp:347
+#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:321
+#: src/gui/debugwindow.cpp:349
msgid "Target Guild:"
msgstr "目标公会:"
-#: src/gui/debugwindow.cpp:273 src/gui/debugwindow.cpp:333
-#: src/gui/debugwindow.cpp:338 src/gui/debugwindow.cpp:348
+#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:335
+#: src/gui/debugwindow.cpp:340 src/gui/debugwindow.cpp:350
msgid "Attack delay:"
msgstr "攻击延迟:"
-#: src/gui/debugwindow.cpp:274 src/gui/debugwindow.cpp:323
-#: src/gui/debugwindow.cpp:349
+#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:325
+#: src/gui/debugwindow.cpp:351
msgid "Minimal hit:"
msgstr ""
-#: src/gui/debugwindow.cpp:275 src/gui/debugwindow.cpp:325
-#: src/gui/debugwindow.cpp:350
+#: src/gui/debugwindow.cpp:277 src/gui/debugwindow.cpp:327
+#: src/gui/debugwindow.cpp:352
msgid "Maximum hit:"
msgstr ""
-#: src/gui/debugwindow.cpp:276 src/gui/debugwindow.cpp:327
-#: src/gui/debugwindow.cpp:351
+#: src/gui/debugwindow.cpp:278 src/gui/debugwindow.cpp:329
+#: src/gui/debugwindow.cpp:353
msgid "Critical hit:"
msgstr ""
-#: src/gui/debugwindow.cpp:385 src/gui/debugwindow.cpp:390
+#: src/gui/debugwindow.cpp:387 src/gui/debugwindow.cpp:392
#, c-format
msgid "Ping: %s ms"
msgstr ""
-#: src/gui/debugwindow.cpp:393
+#: src/gui/debugwindow.cpp:395
#, c-format
msgid "In: %d bytes/s"
msgstr "输入:%d 字节/"
-#: src/gui/debugwindow.cpp:395
+#: src/gui/debugwindow.cpp:397
#, c-format
msgid "Out: %d bytes/s"
msgstr ""
@@ -870,26 +870,26 @@ msgstr ""
msgid "Did You Know?"
msgstr "你知道吗?"
-#: src/gui/didyouknowwindow.cpp:61 src/gui/helpwindow.cpp:57
-#: src/gui/inventorywindow.cpp:175 src/gui/npcdialog.cpp:53
-#: src/gui/popupmenu.cpp:559 src/gui/shopwindow.cpp:111
+#: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
+#: src/gui/inventorywindow.cpp:176 src/gui/npcdialog.cpp:53
+#: src/gui/popupmenu.cpp:588 src/gui/shopwindow.cpp:113
msgid "Close"
msgstr "关闭"
-#: src/gui/didyouknowwindow.cpp:62
+#: src/gui/didyouknowwindow.cpp:64
msgid "< Previous"
msgstr "<上一页"
-#: src/gui/didyouknowwindow.cpp:63
+#: src/gui/didyouknowwindow.cpp:65
msgid "Next >"
msgstr "下一页>"
-#: src/gui/didyouknowwindow.cpp:64
+#: src/gui/didyouknowwindow.cpp:66
msgid "Auto open this window"
msgstr "自动打开这个窗口"
#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
-#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:58 src/gui/textdialog.cpp:50
+#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:53 src/gui/textdialog.cpp:50
msgid "OK"
msgstr "确定"
@@ -897,10 +897,10 @@ msgstr "确定"
msgid "Equipment"
msgstr "装备"
-#: src/gui/equipmentwindow.cpp:93 src/gui/inventorywindow.cpp:130
-#: src/gui/inventorywindow.cpp:511 src/gui/inventorywindow.cpp:520
-#: src/gui/popupmenu.cpp:1643 src/gui/popupmenu.cpp:1738
-#: src/gui/popupmenu.cpp:1783
+#: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:131
+#: src/gui/inventorywindow.cpp:512 src/gui/inventorywindow.cpp:521
+#: src/gui/popupmenu.cpp:1693 src/gui/popupmenu.cpp:1788
+#: src/gui/popupmenu.cpp:1833
msgid "Unequip"
msgstr "卸下装备"
@@ -913,75 +913,75 @@ msgstr "帮助"
msgid "Inventory"
msgstr "物品栏"
-#: src/gui/inventorywindow.cpp:104
+#: src/gui/inventorywindow.cpp:105
msgid "Slots:"
msgstr "槽:"
-#: src/gui/inventorywindow.cpp:115
+#: src/gui/inventorywindow.cpp:116
msgid "Filter:"
msgstr "过滤器:"
-#: src/gui/inventorywindow.cpp:116
+#: src/gui/inventorywindow.cpp:117
msgid "Sort:"
msgstr "排序:"
-#: src/gui/inventorywindow.cpp:122
+#: src/gui/inventorywindow.cpp:123
msgid "na"
msgstr "na"
-#: src/gui/inventorywindow.cpp:123
+#: src/gui/inventorywindow.cpp:124
msgid "az"
msgstr "az"
-#: src/gui/inventorywindow.cpp:124
+#: src/gui/inventorywindow.cpp:125
msgid "id"
msgstr "id"
-#: src/gui/inventorywindow.cpp:128 src/gui/inventorywindow.cpp:513
-#: src/gui/inventorywindow.cpp:522 src/gui/popupmenu.cpp:1645
-#: src/gui/popupmenu.cpp:1740 src/gui/popupmenu.cpp:1785
+#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
+#: src/gui/inventorywindow.cpp:523 src/gui/popupmenu.cpp:1695
+#: src/gui/popupmenu.cpp:1790 src/gui/popupmenu.cpp:1835
msgid "Equip"
msgstr "装备"
-#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
-#: src/gui/inventorywindow.cpp:518 src/gui/popupmenu.cpp:1648
-#: src/gui/popupmenu.cpp:1707 src/gui/popupmenu.cpp:1744
-#: src/gui/popupmenu.cpp:1788
+#: src/gui/inventorywindow.cpp:130 src/gui/inventorywindow.cpp:515
+#: src/gui/inventorywindow.cpp:519 src/gui/popupmenu.cpp:1698
+#: src/gui/popupmenu.cpp:1757 src/gui/popupmenu.cpp:1794
+#: src/gui/popupmenu.cpp:1838
msgid "Use"
msgstr "使用"
-#: src/gui/inventorywindow.cpp:143 src/gui/inventorywindow.cpp:619
-#: src/gui/popupmenu.cpp:1652 src/gui/popupmenu.cpp:1749
-#: src/gui/popupmenu.cpp:1792
+#: src/gui/inventorywindow.cpp:144 src/gui/inventorywindow.cpp:620
+#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1799
+#: src/gui/popupmenu.cpp:1842
msgid "Drop..."
msgstr "掉落... ..."
-#: src/gui/inventorywindow.cpp:144 src/gui/popupmenu.cpp:1661
-#: src/gui/popupmenu.cpp:1758 src/gui/popupmenu.cpp:1801
+#: src/gui/inventorywindow.cpp:145 src/gui/popupmenu.cpp:1711
+#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1851
msgid "Split"
msgstr "分离"
-#: src/gui/inventorywindow.cpp:145 src/gui/outfitwindow.cpp:59
-#: src/gui/popupmenu.cpp:520
+#: src/gui/inventorywindow.cpp:146 src/gui/outfitwindow.cpp:60
+#: src/gui/popupmenu.cpp:549
msgid "Outfits"
msgstr "装具"
-#: src/gui/inventorywindow.cpp:148
+#: src/gui/inventorywindow.cpp:149
msgid "Weight:"
msgstr "重量:"
-#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:610
-#: src/gui/popupmenu.cpp:1624 src/gui/popupmenu.cpp:1761
-#: src/gui/popupmenu.cpp:1804 src/gui/setup.cpp:72
+#: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:611
+#: src/gui/popupmenu.cpp:1674 src/gui/popupmenu.cpp:1811
+#: src/gui/popupmenu.cpp:1854 src/gui/setup.cpp:73
msgid "Store"
msgstr "存储"
-#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1668
+#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1718
msgid "Retrieve"
msgstr "取回"
-#: src/gui/inventorywindow.cpp:621 src/gui/popupmenu.cpp:1657
-#: src/gui/popupmenu.cpp:1754 src/gui/popupmenu.cpp:1797
+#: src/gui/inventorywindow.cpp:622 src/gui/popupmenu.cpp:1707
+#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1847
#: src/gui/windowmenu.cpp:97
msgid "Drop"
msgstr "丢弃"
@@ -1022,11 +1022,11 @@ msgstr ""
msgid "Unknown."
msgstr "未知。"
-#: src/gui/itempopup.cpp:176 src/gui/itempopup.cpp:182
+#: src/gui/itempopup.cpp:177 src/gui/itempopup.cpp:183
msgid ", "
msgstr ","
-#: src/gui/itempopup.cpp:192
+#: src/gui/itempopup.cpp:193
#, c-format
msgid "Weight: %s"
msgstr "重量:%s"
@@ -1035,88 +1035,92 @@ msgstr "重量:%s"
msgid "Kill stats"
msgstr "杀敌统计"
-#: src/gui/killstats.cpp:64
+#: src/gui/killstats.cpp:65
msgid "Reset stats"
msgstr "复位统计"
-#: src/gui/killstats.cpp:65
+#: src/gui/killstats.cpp:66
msgid "Reset timer"
msgstr "复位定时器"
-#: src/gui/killstats.cpp:69 src/gui/killstats.cpp:205
+#: src/gui/killstats.cpp:70 src/gui/killstats.cpp:206
#, c-format
msgid "Level: %d at %f%%"
msgstr "等级:%d 在 %f%%"
-#: src/gui/killstats.cpp:73 src/gui/killstats.cpp:210
+#: src/gui/killstats.cpp:74 src/gui/killstats.cpp:211
#, c-format
msgid "Exp: %d/%d Left: %d"
msgstr ""
-#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:216
-#: src/gui/killstats.cpp:225
+#: src/gui/killstats.cpp:77 src/gui/killstats.cpp:217
+#: src/gui/killstats.cpp:226
#, c-format
msgid "1%% = %d exp, avg mob for 1%%: %s"
msgstr ""
-#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:142
-#: src/gui/killstats.cpp:234
+#: src/gui/killstats.cpp:80 src/gui/killstats.cpp:143
+#: src/gui/killstats.cpp:235
#, c-format
msgid "Kills: %s, total exp: %s"
msgstr ""
-#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
-#: src/gui/killstats.cpp:220 src/gui/killstats.cpp:230
+#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145
+#: src/gui/killstats.cpp:221 src/gui/killstats.cpp:231
#, c-format
msgid "Avg Exp: %s, No. of avg mob to next level: %s"
msgstr ""
-#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:162
-#: src/gui/killstats.cpp:237
+#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:163
+#: src/gui/killstats.cpp:238
#, c-format
msgid "Kills/Min: %s, Exp/Min: %s"
msgstr ""
-#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:89 src/gui/killstats.cpp:94
-#: src/gui/killstats.cpp:289 src/gui/killstats.cpp:305
-#: src/gui/killstats.cpp:323
+#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:90 src/gui/killstats.cpp:95
+#: src/gui/killstats.cpp:290 src/gui/killstats.cpp:306
+#: src/gui/killstats.cpp:324
#, c-format
msgid "Exp speed per %d min: %s"
msgid_plural "Exp speed per %d min: %s"
msgstr[0] ""
-#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
+#: src/gui/killstats.cpp:88 src/gui/killstats.cpp:93 src/gui/killstats.cpp:98
#, c-format
msgid "Time for next level per %d min: %s"
msgid_plural "Time for next level per %d min: %s"
msgstr[0] ""
-#: src/gui/killstats.cpp:100 src/gui/killstats.cpp:241
+#: src/gui/killstats.cpp:101 src/gui/killstats.cpp:242
msgid "Last kill exp:"
msgstr "最后EXP:"
-#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:355
-#: src/gui/killstats.cpp:361 src/gui/killstats.cpp:367
-#: src/gui/killstats.cpp:372
+#: src/gui/killstats.cpp:103 src/gui/killstats.cpp:356
+#: src/gui/killstats.cpp:362 src/gui/killstats.cpp:368
+#: src/gui/killstats.cpp:373
msgid "Time before jacko spawn:"
msgstr ""
-#: src/gui/killstats.cpp:294 src/gui/killstats.cpp:301
-#: src/gui/killstats.cpp:311 src/gui/killstats.cpp:318
-#: src/gui/killstats.cpp:330 src/gui/killstats.cpp:337
+#: src/gui/killstats.cpp:295 src/gui/killstats.cpp:302
+#: src/gui/killstats.cpp:312 src/gui/killstats.cpp:319
+#: src/gui/killstats.cpp:331 src/gui/killstats.cpp:338
#, c-format
msgid " Time for next level: %s"
msgstr ""
-#: src/gui/killstats.cpp:361
+#: src/gui/killstats.cpp:362
#, c-format
msgid "%s %d?"
msgstr "%s %d?"
-#: src/gui/killstats.cpp:367
+#: src/gui/killstats.cpp:368
msgid "jacko spawning"
msgstr ""
+#: src/guildmanager.cpp:464 src/net/ea/guildhandler.cpp:439
+msgid "You have left the guild."
+msgstr "你已经离开工会."
+
#: src/gui/logindialog.cpp:59
msgid "Normal"
msgstr "正常"
@@ -1133,7 +1137,7 @@ msgstr "跳过"
msgid "Login"
msgstr "登录"
-#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:246
+#: src/gui/logindialog.cpp:91 src/gui/serverdialog.cpp:252
#: src/gui/widgets/chattab.cpp:173
msgid "Server:"
msgstr "服务器:"
@@ -1215,11 +1219,11 @@ msgstr "提交"
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:107 src/gui/popupmenu.cpp:561
+#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:590
msgid "Clear"
msgstr "清除"
-#: src/gui/npcdialog.cpp:222
+#: src/gui/npcdialog.cpp:223
msgid "> Next"
msgstr ""
@@ -1235,346 +1239,346 @@ msgstr "发送"
msgid "Failed to send as sender or letter invalid."
msgstr "发送信件失败或者信件无效。"
-#: src/gui/outfitwindow.cpp:82 src/gui/outfitwindow.cpp:886
+#: src/gui/outfitwindow.cpp:86 src/gui/outfitwindow.cpp:890
#, c-format
msgid "Outfit: %d"
msgstr ""
-#: src/gui/outfitwindow.cpp:84 src/gui/outfitwindow.cpp:888
+#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:892
#, c-format
msgid "Key: %s"
msgstr ""
-#: src/gui/outfitwindow.cpp:87
+#: src/gui/outfitwindow.cpp:91
msgid "Unequip first"
msgstr ""
-#: src/gui/outfitwindow.cpp:90
+#: src/gui/outfitwindow.cpp:94
msgid "Away outfit"
msgstr ""
-#: src/gui/popupmenu.cpp:133 src/gui/popupmenu.cpp:616
+#: src/gui/popupmenu.cpp:132 src/gui/popupmenu.cpp:645
#: src/gui/widgets/tradetab.cpp:44
msgid "Trade"
msgstr "交易"
-#: src/gui/popupmenu.cpp:135 src/gui/popupmenu.cpp:375
+#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:393
msgid "Whisper"
msgstr "密语"
-#: src/gui/popupmenu.cpp:139 src/gui/popupmenu.cpp:621
+#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:650
msgid "Heal"
msgstr "愈合"
-#: src/gui/popupmenu.cpp:146 src/gui/popupmenu.cpp:381
-#: src/gui/popupmenu.cpp:628
+#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:399
+#: src/gui/popupmenu.cpp:657
msgid "Be friend"
msgstr "是朋友"
-#: src/gui/popupmenu.cpp:148 src/gui/popupmenu.cpp:157
-#: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:383
-#: src/gui/popupmenu.cpp:389 src/gui/popupmenu.cpp:408
-#: src/gui/popupmenu.cpp:630 src/gui/popupmenu.cpp:638
-#: src/gui/popupmenu.cpp:662
+#: src/gui/popupmenu.cpp:147 src/gui/popupmenu.cpp:156
+#: src/gui/popupmenu.cpp:183 src/gui/popupmenu.cpp:401
+#: src/gui/popupmenu.cpp:407 src/gui/popupmenu.cpp:426
+#: src/gui/popupmenu.cpp:659 src/gui/popupmenu.cpp:667
+#: src/gui/popupmenu.cpp:691
msgid "Disregard"
msgstr ""
-#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:161
-#: src/gui/popupmenu.cpp:170 src/gui/popupmenu.cpp:177
-#: src/gui/popupmenu.cpp:385 src/gui/popupmenu.cpp:391
-#: src/gui/popupmenu.cpp:398 src/gui/popupmenu.cpp:403
-#: src/gui/popupmenu.cpp:633 src/gui/popupmenu.cpp:641
-#: src/gui/popupmenu.cpp:649 src/gui/popupmenu.cpp:655
+#: src/gui/popupmenu.cpp:151 src/gui/popupmenu.cpp:160
+#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:176
+#: src/gui/popupmenu.cpp:403 src/gui/popupmenu.cpp:409
+#: src/gui/popupmenu.cpp:416 src/gui/popupmenu.cpp:421
+#: src/gui/popupmenu.cpp:662 src/gui/popupmenu.cpp:670
+#: src/gui/popupmenu.cpp:678 src/gui/popupmenu.cpp:684
msgid "Erase"
msgstr ""
-#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:175
-#: src/gui/popupmenu.cpp:182 src/gui/popupmenu.cpp:395
-#: src/gui/popupmenu.cpp:402 src/gui/popupmenu.cpp:407
-#: src/gui/popupmenu.cpp:646 src/gui/popupmenu.cpp:654
-#: src/gui/popupmenu.cpp:660
+#: src/gui/popupmenu.cpp:165 src/gui/popupmenu.cpp:174
+#: src/gui/popupmenu.cpp:181 src/gui/popupmenu.cpp:413
+#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:425
+#: src/gui/popupmenu.cpp:675 src/gui/popupmenu.cpp:683
+#: src/gui/popupmenu.cpp:689
msgid "Unignore"
msgstr ""
-#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:186
-#: src/gui/popupmenu.cpp:397 src/gui/popupmenu.cpp:410
-#: src/gui/popupmenu.cpp:648 src/gui/popupmenu.cpp:664
+#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:185
+#: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:428
+#: src/gui/popupmenu.cpp:677 src/gui/popupmenu.cpp:693
#: src/playerrelations.cpp:400
msgid "Completely ignore"
msgstr "完全忽略"
-#: src/gui/popupmenu.cpp:194 src/gui/popupmenu.cpp:418
-#: src/gui/popupmenu.cpp:672
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:436
+#: src/gui/popupmenu.cpp:701
msgid "Follow"
msgstr "按照"
-#: src/gui/popupmenu.cpp:196 src/gui/popupmenu.cpp:419
-#: src/gui/popupmenu.cpp:673
+#: src/gui/popupmenu.cpp:195 src/gui/popupmenu.cpp:437
+#: src/gui/popupmenu.cpp:702
msgid "Imitation"
msgstr ""
-#: src/gui/popupmenu.cpp:206 src/gui/popupmenu.cpp:710
+#: src/gui/popupmenu.cpp:205 src/gui/popupmenu.cpp:739
msgid "Invite to party"
msgstr ""
-#: src/gui/popupmenu.cpp:211 src/gui/popupmenu.cpp:428
-#: src/gui/popupmenu.cpp:715
+#: src/gui/popupmenu.cpp:210 src/gui/popupmenu.cpp:446
+#: src/gui/popupmenu.cpp:744
msgid "Kick from party"
msgstr "踢从党"
-#: src/gui/popupmenu.cpp:226 src/gui/popupmenu.cpp:439
-#: src/gui/popupmenu.cpp:729
+#: src/gui/popupmenu.cpp:225 src/gui/popupmenu.cpp:237
+#: src/gui/popupmenu.cpp:460 src/gui/popupmenu.cpp:761
msgid "Kick from guild"
msgstr "踢从公会"
-#: src/gui/popupmenu.cpp:228 src/gui/popupmenu.cpp:441
-#: src/gui/popupmenu.cpp:731
+#: src/gui/popupmenu.cpp:230 src/gui/popupmenu.cpp:242
+#: src/gui/popupmenu.cpp:465 src/gui/popupmenu.cpp:766
msgid "Change pos in guild"
msgstr ""
-#: src/gui/popupmenu.cpp:234 src/gui/popupmenu.cpp:446
-#: src/gui/popupmenu.cpp:737
+#: src/gui/popupmenu.cpp:251 src/gui/popupmenu.cpp:474
+#: src/gui/popupmenu.cpp:776
msgid "Invite to guild"
msgstr ""
-#: src/gui/popupmenu.cpp:242
+#: src/gui/popupmenu.cpp:260
msgid "Kick player"
msgstr "踢球员"
-#: src/gui/popupmenu.cpp:244
+#: src/gui/popupmenu.cpp:262
msgid "Nuke"
msgstr ""
-#: src/gui/popupmenu.cpp:247 src/gui/popupmenu.cpp:675
+#: src/gui/popupmenu.cpp:265 src/gui/popupmenu.cpp:704
msgid "Show Items"
msgstr "显示项目"
-#: src/gui/popupmenu.cpp:248 src/gui/popupmenu.cpp:676
-#: src/gui/popupmenu.cpp:1970
+#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:705
+#: src/gui/popupmenu.cpp:2020
msgid "Undress"
msgstr ""
-#: src/gui/popupmenu.cpp:250 src/gui/popupmenu.cpp:286
-#: src/gui/popupmenu.cpp:420 src/gui/popupmenu.cpp:678
-#: src/gui/popupmenu.cpp:746
+#: src/gui/popupmenu.cpp:268 src/gui/popupmenu.cpp:304
+#: src/gui/popupmenu.cpp:438 src/gui/popupmenu.cpp:707
+#: src/gui/popupmenu.cpp:786
msgid "Add comment"
msgstr "发表评论"
-#: src/gui/popupmenu.cpp:268 src/gui/popupmenu.cpp:453
-#: src/gui/popupmenu.cpp:695
+#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:482
+#: src/gui/popupmenu.cpp:724
msgid "Buy (?)"
msgstr "购买(?)"
-#: src/gui/popupmenu.cpp:270 src/gui/popupmenu.cpp:454
-#: src/gui/popupmenu.cpp:697
+#: src/gui/popupmenu.cpp:288 src/gui/popupmenu.cpp:483
+#: src/gui/popupmenu.cpp:726
msgid "Sell (?)"
msgstr "出售(?)"
-#: src/gui/popupmenu.cpp:298
+#: src/gui/popupmenu.cpp:316
msgid "Kick"
msgstr ""
-#: src/gui/popupmenu.cpp:309
+#: src/gui/popupmenu.cpp:327
msgid "Remove from attack list"
msgstr ""
-#: src/gui/popupmenu.cpp:315
+#: src/gui/popupmenu.cpp:333
msgid "Add to priority attack list"
msgstr "优先攻击列表"
-#: src/gui/popupmenu.cpp:317
+#: src/gui/popupmenu.cpp:335
msgid "Add to attack list"
msgstr "加入攻击清单"
-#: src/gui/popupmenu.cpp:320
+#: src/gui/popupmenu.cpp:338
msgid "Add to ignore list"
msgstr ""
-#: src/gui/popupmenu.cpp:333 src/gui/popupmenu.cpp:457
+#: src/gui/popupmenu.cpp:351 src/gui/popupmenu.cpp:486
msgid "Add name to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:483
+#: src/gui/popupmenu.cpp:512
msgid "Pick up"
msgstr "拾取"
-#: src/gui/popupmenu.cpp:484 src/gui/popupmenu.cpp:1682
-#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1805
+#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:1732
+#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1855
msgid "Add to chat"
msgstr "加入聊天"
-#: src/gui/popupmenu.cpp:501
+#: src/gui/popupmenu.cpp:530
msgid "Map Item"
msgstr "地图项"
-#: src/gui/popupmenu.cpp:502
+#: src/gui/popupmenu.cpp:531
msgid "Rename"
msgstr "重命名"
-#: src/gui/popupmenu.cpp:503 src/gui/popupmenu.cpp:1923
-#: src/gui/popupmenu.cpp:1941 src/gui/popupmenu.cpp:1946
+#: src/gui/popupmenu.cpp:532 src/gui/popupmenu.cpp:1973
+#: src/gui/popupmenu.cpp:1991 src/gui/popupmenu.cpp:1996
msgid "Remove"
msgstr ""
-#: src/gui/popupmenu.cpp:508
+#: src/gui/popupmenu.cpp:537
msgid "Warp"
msgstr ""
-#: src/gui/popupmenu.cpp:522
+#: src/gui/popupmenu.cpp:551
msgid "Load old outfits"
msgstr ""
-#: src/gui/popupmenu.cpp:538 src/gui/windowmenu.cpp:96
+#: src/gui/popupmenu.cpp:567 src/gui/windowmenu.cpp:96
msgid "Spells"
msgstr "法术"
-#: src/gui/popupmenu.cpp:540
+#: src/gui/popupmenu.cpp:569
msgid "Load old spells"
msgstr ""
-#: src/gui/popupmenu.cpp:541
+#: src/gui/popupmenu.cpp:570
msgid "Edit spell"
msgstr ""
-#: src/gui/popupmenu.cpp:567
+#: src/gui/popupmenu.cpp:596
msgid "Disable highlight"
msgstr "禁用"
-#: src/gui/popupmenu.cpp:572
+#: src/gui/popupmenu.cpp:601
msgid "Enable highlight"
msgstr "启用突出"
-#: src/gui/popupmenu.cpp:577
-msgid "Dont remove name"
+#: src/gui/popupmenu.cpp:606
+msgid "Don't remove name"
msgstr ""
-#: src/gui/popupmenu.cpp:582
+#: src/gui/popupmenu.cpp:611
msgid "Remove name"
msgstr ""
-#: src/gui/popupmenu.cpp:587
+#: src/gui/popupmenu.cpp:616
msgid "Enable away"
msgstr "启用远"
-#: src/gui/popupmenu.cpp:592
+#: src/gui/popupmenu.cpp:621
msgid "Disable away"
msgstr ""
-#: src/gui/popupmenu.cpp:598 src/gui/socialwindow.cpp:1035
+#: src/gui/popupmenu.cpp:627 src/gui/socialwindow.cpp:1141
msgid "Leave"
msgstr "留下"
-#: src/gui/popupmenu.cpp:758
+#: src/gui/popupmenu.cpp:798
msgid "Change guild position"
msgstr "更改公会的立场"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1189
+#: src/gui/popupmenu.cpp:1234
msgid "Rename map sign "
msgstr "重命名的地图标志"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1191
+#: src/gui/popupmenu.cpp:1236
msgid "Name: "
msgstr "名称:"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1241
+#: src/gui/popupmenu.cpp:1286
msgid "Player comment "
msgstr "玩家评论"
#. TRANSLATORS: number of chars in string should be near original
-#: src/gui/popupmenu.cpp:1243
+#: src/gui/popupmenu.cpp:1288
msgid "Comment: "
msgstr "评论:"
-#: src/gui/popupmenu.cpp:1607
+#: src/gui/popupmenu.cpp:1657
msgid "Add to trade"
msgstr ""
-#: src/gui/popupmenu.cpp:1613
+#: src/gui/popupmenu.cpp:1663
msgid "Add to trade 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1616
+#: src/gui/popupmenu.cpp:1666
msgid "Add to trade half"
msgstr ""
-#: src/gui/popupmenu.cpp:1618
+#: src/gui/popupmenu.cpp:1668
msgid "Add to trade all"
msgstr ""
-#: src/gui/popupmenu.cpp:1630
+#: src/gui/popupmenu.cpp:1680
msgid "Store 10"
msgstr "商店10"
-#: src/gui/popupmenu.cpp:1633
+#: src/gui/popupmenu.cpp:1683
msgid "Store half"
msgstr "商店的一半"
-#: src/gui/popupmenu.cpp:1635
+#: src/gui/popupmenu.cpp:1685
msgid "Store all"
msgstr "商店所有"
-#: src/gui/popupmenu.cpp:1653 src/gui/popupmenu.cpp:1750
-#: src/gui/popupmenu.cpp:1793
+#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1800
+#: src/gui/popupmenu.cpp:1843
msgid "Drop all"
msgstr "所有"
-#: src/gui/popupmenu.cpp:1674
+#: src/gui/popupmenu.cpp:1724
msgid "Retrieve 10"
msgstr "拿出10"
-#: src/gui/popupmenu.cpp:1677
+#: src/gui/popupmenu.cpp:1727
msgid "Retrieve half"
msgstr "拿出一半"
-#: src/gui/popupmenu.cpp:1679
+#: src/gui/popupmenu.cpp:1729
msgid "Retrieve all"
msgstr "检索所有"
-#: src/gui/popupmenu.cpp:1710 src/gui/popupmenu.cpp:1766
+#: src/gui/popupmenu.cpp:1760 src/gui/popupmenu.cpp:1816
msgid "Load old item shortcuts"
msgstr ""
-#: src/gui/popupmenu.cpp:1809
+#: src/gui/popupmenu.cpp:1859
msgid "Load old drop shortcuts"
msgstr ""
-#: src/gui/popupmenu.cpp:1835 src/gui/popupmenu.cpp:1870
+#: src/gui/popupmenu.cpp:1885 src/gui/popupmenu.cpp:1920
msgid "Hide"
msgstr "隐藏"
-#: src/gui/popupmenu.cpp:1841 src/gui/popupmenu.cpp:1876
+#: src/gui/popupmenu.cpp:1891 src/gui/popupmenu.cpp:1926
msgid "Show"
msgstr "显示"
-#: src/gui/popupmenu.cpp:1883
+#: src/gui/popupmenu.cpp:1933
msgid "Reset yellow bar"
msgstr ""
-#: src/gui/popupmenu.cpp:1885 src/gui/statuswindow.cpp:240
+#: src/gui/popupmenu.cpp:1935 src/gui/statuswindow.cpp:241
msgid "Copy to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:1903 src/gui/socialwindow.cpp:854
-#: src/gui/socialwindow.cpp:889 src/gui/socialwindow.cpp:924
+#: src/gui/popupmenu.cpp:1953 src/gui/socialwindow.cpp:958
+#: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028
msgid "(default)"
msgstr "(默认)"
-#: src/gui/popupmenu.cpp:1915 src/gui/popupmenu.cpp:1933
+#: src/gui/popupmenu.cpp:1965 src/gui/popupmenu.cpp:1983
msgid "Move up"
msgstr "x"
-#: src/gui/popupmenu.cpp:1920 src/gui/popupmenu.cpp:1938
+#: src/gui/popupmenu.cpp:1970 src/gui/popupmenu.cpp:1988
msgid "Move down"
msgstr ""
-#: src/gui/quitdialog.cpp:56
+#: src/gui/quitdialog.cpp:51
msgid "Switch server"
msgstr "交换服务器"
-#: src/gui/quitdialog.cpp:57
+#: src/gui/quitdialog.cpp:52
msgid "Switch character"
msgstr "交换角色"
@@ -1610,64 +1614,64 @@ msgstr "密码不能少于%d个字符。"
msgid "Passwords do not match."
msgstr "密码不一致."
-#: src/gui/serverdialog.cpp:231
+#: src/gui/serverdialog.cpp:237
msgid "Choose Your Server"
msgstr "选择您的服务器"
-#: src/gui/serverdialog.cpp:242
+#: src/gui/serverdialog.cpp:248
msgid "Choose Your Server *** SAFE MODE ***"
msgstr "选择你的服务器***安全模式***"
-#: src/gui/serverdialog.cpp:247
+#: src/gui/serverdialog.cpp:253
msgid "Port:"
msgstr "端口:"
-#: src/gui/serverdialog.cpp:251
+#: src/gui/serverdialog.cpp:257
msgid "Use same ip for game sub servers"
msgstr "游戏分服务器使用相同的IP"
-#: src/gui/serverdialog.cpp:265
+#: src/gui/serverdialog.cpp:271
msgid "Server type:"
msgstr "服务器类型:"
-#: src/gui/serverdialog.cpp:289
+#: src/gui/serverdialog.cpp:295
msgid "Load"
msgstr "负载"
-#: src/gui/serverdialog.cpp:290
+#: src/gui/serverdialog.cpp:296
msgid "Connect"
msgstr "连接"
-#: src/gui/serverdialog.cpp:291
+#: src/gui/serverdialog.cpp:297
msgid "Custom Server"
msgstr "自定义服务器"
-#: src/gui/serverdialog.cpp:396
+#: src/gui/serverdialog.cpp:402
msgid "Please type both the address and the port of a server."
msgstr "请输入服务器的IP地址和端口"
-#: src/gui/serverdialog.cpp:554
+#: src/gui/serverdialog.cpp:560
#, c-format
msgid "Downloading server list...%2.2f%%"
msgstr "下载服务器列表...%2.2f%%"
-#: src/gui/serverdialog.cpp:559
+#: src/gui/serverdialog.cpp:565
msgid "Waiting for server..."
msgstr "等待服务器..."
-#: src/gui/serverdialog.cpp:563
+#: src/gui/serverdialog.cpp:569
msgid "Preparing download"
msgstr "准备下载"
-#: src/gui/serverdialog.cpp:567
+#: src/gui/serverdialog.cpp:573
msgid "Error retreiving server list!"
msgstr "错误retreiving的服务器列表!"
-#: src/gui/serverdialog.cpp:672
+#: src/gui/serverdialog.cpp:678
msgid "requires a newer version"
msgstr "需要较新版本"
-#: src/gui/serverdialog.cpp:674
+#: src/gui/serverdialog.cpp:680
#, c-format
msgid "requires v%s"
msgstr "需要 v%s"
@@ -1812,6 +1816,14 @@ msgstr "时间"
msgid "Use local time"
msgstr "使用本地时间"
+#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:157
+msgid "Other"
+msgstr "其他"
+
+#: src/gui/setup_chat.cpp:125
+msgid "Highlight words (separated by comma)"
+msgstr ""
+
#: src/gui/setup_colors.cpp:49
msgid "This is what the color looks like"
msgstr "这就是该色彩看起来的样子"
@@ -1859,11 +1871,11 @@ msgstr "蓝色:"
msgid "Alpha:"
msgstr "阿尔法:"
-#: src/gui/setup.cpp:70
+#: src/gui/setup.cpp:71
msgid "Apply"
msgstr "应用"
-#: src/gui/setup.cpp:73
+#: src/gui/setup.cpp:74
msgid "Reset Windows"
msgstr "重置窗口"
@@ -2040,34 +2052,42 @@ msgid "Log NPC dialogue"
msgstr "NPC对话"
#: src/gui/setup_other.cpp:148
-msgid "Other"
-msgstr "其他"
+msgid "Bots support"
+msgstr ""
#: src/gui/setup_other.cpp:150
+msgid "Enable auction bot support"
+msgstr ""
+
+#: src/gui/setup_other.cpp:153
+msgid "Enable guild bot support and disable native guild support"
+msgstr ""
+
+#: src/gui/setup_other.cpp:159
msgid "Enable server side attack"
msgstr "启用服务器端的攻击"
-#: src/gui/setup_other.cpp:153
+#: src/gui/setup_other.cpp:162
msgid "Enable bot checker"
msgstr "启用BOT检查"
-#: src/gui/setup_other.cpp:156
+#: src/gui/setup_other.cpp:165
msgid "Enable buggy servers protection"
msgstr "启用BUG保护"
-#: src/gui/setup_other.cpp:159
+#: src/gui/setup_other.cpp:168
msgid "Enable debug log"
msgstr "启用调试日志"
-#: src/gui/setup_other.cpp:162
+#: src/gui/setup_other.cpp:171
msgid "Low traffic mode"
msgstr "低流量模式"
-#: src/gui/setup_other.cpp:165
+#: src/gui/setup_other.cpp:174
msgid "Hide shield sprite"
msgstr ""
-#: src/gui/setup_other.cpp:168
+#: src/gui/setup_other.cpp:177
msgid "Show background"
msgstr "显示背景"
@@ -2163,6 +2183,10 @@ msgstr "显示状态"
msgid "Show ip addresses on screenshots"
msgstr ""
+#: src/gui/setup_players.cpp:81
+msgid "Allow self heal with mouse click"
+msgstr ""
+
#: src/gui/setup_relations.cpp:65
msgid "Relation"
msgstr "关系"
@@ -2435,261 +2459,266 @@ msgstr "粒子效果更改的设置。"
msgid "Changes will take effect on map change."
msgstr "变更会在地图更换时生效。"
-#: src/gui/shopwindow.cpp:74
+#: src/gui/shopwindow.cpp:75
msgid "Personal Shop"
msgstr "个人商店"
-#: src/gui/shopwindow.cpp:116
+#: src/gui/shopwindow.cpp:118
msgid "Buy items"
msgstr "购买物品"
-#: src/gui/shopwindow.cpp:117
+#: src/gui/shopwindow.cpp:119
msgid "Sell items"
msgstr "出售物品"
-#: src/gui/shopwindow.cpp:119 src/gui/shopwindow.cpp:122
-#: src/gui/tradewindow.cpp:88
+#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
+#: src/gui/tradewindow.cpp:89
msgid "Add"
msgstr "添加"
-#: src/gui/shopwindow.cpp:121 src/gui/shopwindow.cpp:124
+#: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
msgid "Announce"
msgstr "公布"
-#: src/gui/shopwindow.cpp:125
+#: src/gui/shopwindow.cpp:127
msgid "Show links in announce"
msgstr "显示在公布的联系"
-#: src/gui/shopwindow.cpp:723 src/net/ea/tradehandler.cpp:106
+#: src/gui/shopwindow.cpp:148 src/gui/shopwindow.cpp:149
+msgid "Auction"
+msgstr ""
+
+#: src/gui/shopwindow.cpp:748 src/net/ea/tradehandler.cpp:106
#: src/net/manaserv/tradehandler.cpp:127
msgid "Request for Trade"
msgstr "请求交易"
-#: src/gui/shopwindow.cpp:724
+#: src/gui/shopwindow.cpp:749
#, c-format
msgid "%s wants to %s %s do you accept?"
msgstr "%s想要%s %s 你接受吗?"
-#: src/gui/skilldialog.cpp:272 src/gui/windowmenu.cpp:81
+#: src/gui/skilldialog.cpp:276 src/gui/windowmenu.cpp:81
msgid "Skills"
msgstr "技能"
-#: src/gui/skilldialog.cpp:283
+#: src/gui/skilldialog.cpp:288
msgid "Up"
msgstr "升级"
-#: src/gui/skilldialog.cpp:336
+#: src/gui/skilldialog.cpp:341
#, c-format
msgid "Skill points available: %d"
msgstr "技能点:%d个"
-#: src/gui/skilldialog.cpp:413
+#: src/gui/skilldialog.cpp:418
#, c-format
msgid "Skill Set %d"
msgstr ""
-#: src/gui/skilldialog.cpp:425
+#: src/gui/skilldialog.cpp:430
#, c-format
msgid "Skill %d"
msgstr "技能为%d"
-#: src/gui/skilldialog.cpp:492 src/gui/skilldialog.cpp:545
+#: src/gui/skilldialog.cpp:497 src/gui/skilldialog.cpp:550
#, c-format
msgid "Lvl: %d"
msgstr "等级: %d"
-#: src/gui/skilldialog.cpp:537
+#: src/gui/skilldialog.cpp:542
#, c-format
msgid "Lvl: %d (%+d)"
msgstr "等级: %d(%+d)"
-#: src/gui/socialwindow.cpp:117 src/net/ea/gui/guildtab.cpp:52
+#: src/gui/socialwindow.cpp:118 src/gui/socialwindow.cpp:216
+#: src/gui/widgets/guildchattab.cpp:43 src/net/ea/gui/guildtab.cpp:52
msgid "Guild"
msgstr "帮会"
-#: src/gui/socialwindow.cpp:146
+#: src/gui/socialwindow.cpp:147
#, c-format
msgid "Invited user %s to guild %s."
msgstr "邀请用户%s加入公会%s"
-#: src/gui/socialwindow.cpp:160
+#: src/gui/socialwindow.cpp:161
#, c-format
msgid "Guild %s quit requested."
msgstr "退出公会%s的请求。"
-#: src/gui/socialwindow.cpp:187
+#: src/gui/socialwindow.cpp:188
msgid "Member Invite to Guild"
msgstr "会员邀请到公会"
-#: src/gui/socialwindow.cpp:188
+#: src/gui/socialwindow.cpp:189
#, c-format
msgid "Who would you like to invite to guild %s?"
msgstr "你要邀请谁加入工会%s?"
-#: src/gui/socialwindow.cpp:197
+#: src/gui/socialwindow.cpp:198
msgid "Leave Guild?"
msgstr "离开公会?"
-#: src/gui/socialwindow.cpp:198
+#: src/gui/socialwindow.cpp:199
#, c-format
msgid "Are you sure you want to leave guild %s?"
msgstr "你确定要离开工会%s吗?"
-#: src/gui/socialwindow.cpp:215 src/net/ea/gui/partytab.cpp:50
+#: src/gui/socialwindow.cpp:319 src/net/ea/gui/partytab.cpp:50
msgid "Party"
msgstr "t"
-#: src/gui/socialwindow.cpp:243
+#: src/gui/socialwindow.cpp:347
#, c-format
msgid "Invited user %s to party."
msgstr "邀请用户%s加入团队."
-#: src/gui/socialwindow.cpp:257
+#: src/gui/socialwindow.cpp:361
#, c-format
msgid "Party %s quit requested."
msgstr ""
-#: src/gui/socialwindow.cpp:284
+#: src/gui/socialwindow.cpp:388
msgid "Member Invite to Party"
msgstr ""
-#: src/gui/socialwindow.cpp:285
+#: src/gui/socialwindow.cpp:389
#, c-format
msgid "Who would you like to invite to party %s?"
msgstr ""
-#: src/gui/socialwindow.cpp:294
+#: src/gui/socialwindow.cpp:398
msgid "Leave Party?"
msgstr "离开团队?"
-#: src/gui/socialwindow.cpp:295
+#: src/gui/socialwindow.cpp:399
#, c-format
msgid "Are you sure you want to leave party %s?"
msgstr ""
-#: src/gui/socialwindow.cpp:521
+#: src/gui/socialwindow.cpp:625
msgid "Nav"
msgstr ""
-#: src/gui/socialwindow.cpp:799
+#: src/gui/socialwindow.cpp:903
msgid "Atk"
msgstr ""
-#: src/gui/socialwindow.cpp:840
+#: src/gui/socialwindow.cpp:944
msgid "Priority mobs"
msgstr ""
-#: src/gui/socialwindow.cpp:872
+#: src/gui/socialwindow.cpp:976
msgid "Attack mobs"
msgstr "攻击暴徒"
-#: src/gui/socialwindow.cpp:907
+#: src/gui/socialwindow.cpp:1011
msgid "Ignore mobs"
msgstr ""
-#: src/gui/socialwindow.cpp:970
+#: src/gui/socialwindow.cpp:1074
msgid "Create Guild"
msgstr "创建帮会"
-#: src/gui/socialwindow.cpp:971 src/gui/socialwindow.cpp:1387
+#: src/gui/socialwindow.cpp:1075 src/gui/socialwindow.cpp:1503
msgid "Create Party"
msgstr "建立"
-#: src/gui/socialwindow.cpp:1013 src/gui/windowmenu.cpp:93
+#: src/gui/socialwindow.cpp:1117 src/gui/windowmenu.cpp:93
msgid "Social"
msgstr ""
-#: src/gui/socialwindow.cpp:1034
+#: src/gui/socialwindow.cpp:1140
msgid "Invite"
msgstr "邀请"
-#: src/gui/socialwindow.cpp:1176
+#: src/gui/socialwindow.cpp:1286
#, c-format
msgid "Accepted party invite from %s."
msgstr "接受%s团队的邀请."
-#: src/gui/socialwindow.cpp:1186
+#: src/gui/socialwindow.cpp:1296
#, c-format
msgid "Rejected party invite from %s."
msgstr "拒绝%s的团队邀请."
-#: src/gui/socialwindow.cpp:1203
+#: src/gui/socialwindow.cpp:1313
#, c-format
msgid "Accepted guild invite from %s."
msgstr "已接受公会邀请来自%s."
-#: src/gui/socialwindow.cpp:1213
+#: src/gui/socialwindow.cpp:1326
#, c-format
msgid "Rejected guild invite from %s."
msgstr "拒绝%s的公会邀请."
-#: src/gui/socialwindow.cpp:1257
+#: src/gui/socialwindow.cpp:1373
#, c-format
msgid "Creating guild called %s."
msgstr "创建公会的名为%s"
-#: src/gui/socialwindow.cpp:1280
+#: src/gui/socialwindow.cpp:1396
#, c-format
msgid "Creating party called %s."
msgstr "创建团队名字为%s的"
-#: src/gui/socialwindow.cpp:1294
+#: src/gui/socialwindow.cpp:1410
msgid "Guild Name"
msgstr "公会名称"
-#: src/gui/socialwindow.cpp:1295
+#: src/gui/socialwindow.cpp:1411
msgid "Choose your guild's name."
msgstr "选择你的公会的名字."
-#: src/gui/socialwindow.cpp:1309
+#: src/gui/socialwindow.cpp:1425
msgid "Received guild request, but one already exists."
msgstr ""
-#: src/gui/socialwindow.cpp:1315
+#: src/gui/socialwindow.cpp:1431
#, c-format
msgid "%s has invited you to join the guild %s."
msgstr "%s邀请你加入公会%s"
-#: src/gui/socialwindow.cpp:1321
+#: src/gui/socialwindow.cpp:1437
msgid "Accept Guild Invite"
msgstr "接受邀请"
-#: src/gui/socialwindow.cpp:1336
+#: src/gui/socialwindow.cpp:1452
msgid "Received party request, but one already exists."
msgstr "接受到一个已经存在的帮会邀请。"
-#: src/gui/socialwindow.cpp:1347
+#: src/gui/socialwindow.cpp:1463
msgid "You have been invited you to join a party."
msgstr "您已被邀请您加入党。"
-#: src/gui/socialwindow.cpp:1351
+#: src/gui/socialwindow.cpp:1467
#, c-format
msgid "You have been invited to join the %s party."
msgstr "您已被邀请加入%s的团队。"
-#: src/gui/socialwindow.cpp:1359
+#: src/gui/socialwindow.cpp:1475
#, c-format
msgid "%s has invited you to join their party."
msgstr "%s已经邀请你加入他们的帮会。"
-#: src/gui/socialwindow.cpp:1364
+#: src/gui/socialwindow.cpp:1480
#, c-format
msgid "%s has invited you to join the %s party."
msgstr "%s已经邀请你加入帮会%s。"
-#: src/gui/socialwindow.cpp:1373
+#: src/gui/socialwindow.cpp:1489
msgid "Accept Party Invite"
msgstr "接受帮会邀请"
-#: src/gui/socialwindow.cpp:1388
+#: src/gui/socialwindow.cpp:1504
msgid "Cannot create party. You are already in a party"
msgstr "无法建立团队.您已经在一个队伍中了"
-#: src/gui/socialwindow.cpp:1393
+#: src/gui/socialwindow.cpp:1509
msgid "Party Name"
msgstr ""
-#: src/gui/socialwindow.cpp:1394
+#: src/gui/socialwindow.cpp:1510
msgid "Choose your party's name."
msgstr "选择n的名称。"
@@ -2697,418 +2726,418 @@ msgstr "选择n的名称。"
msgid "Specials"
msgstr "特价商品"
-#: src/gui/statuspopup.cpp:197
+#: src/gui/statuspopup.cpp:198
msgid "(D) default moves"
msgstr ""
-#: src/gui/statuspopup.cpp:202
+#: src/gui/statuspopup.cpp:203
msgid "(I) invert moves"
msgstr ""
-#: src/gui/statuspopup.cpp:207
+#: src/gui/statuspopup.cpp:208
msgid "(c) moves with some crazy moves"
msgstr ""
-#: src/gui/statuspopup.cpp:212
+#: src/gui/statuspopup.cpp:213
msgid "(C) moves with crazy moves"
msgstr ""
-#: src/gui/statuspopup.cpp:217
+#: src/gui/statuspopup.cpp:218
msgid "(d) double normal + crazy"
msgstr ""
-#: src/gui/statuspopup.cpp:222
+#: src/gui/statuspopup.cpp:223
msgid "(?) move"
msgstr ""
-#: src/gui/statuspopup.cpp:240
+#: src/gui/statuspopup.cpp:241
msgid "(a) custom crazy move"
msgstr ""
-#: src/gui/statuspopup.cpp:244
+#: src/gui/statuspopup.cpp:245
msgid "(?) crazy move"
msgstr ""
-#: src/gui/statuspopup.cpp:254
+#: src/gui/statuspopup.cpp:255
msgid "(0) default moves to target"
msgstr ""
-#: src/gui/statuspopup.cpp:259
+#: src/gui/statuspopup.cpp:260
msgid "(1) moves to target in distance 1"
msgstr ""
-#: src/gui/statuspopup.cpp:264
+#: src/gui/statuspopup.cpp:265
msgid "(2) moves to target in distance 2"
msgstr ""
-#: src/gui/statuspopup.cpp:269
+#: src/gui/statuspopup.cpp:270
msgid "(3) moves to target in distance 3"
msgstr ""
-#: src/gui/statuspopup.cpp:274
+#: src/gui/statuspopup.cpp:275
msgid "(5) moves to target in distance 5"
msgstr ""
-#: src/gui/statuspopup.cpp:279
+#: src/gui/statuspopup.cpp:280
msgid "(7) moves to target in distance 7"
msgstr ""
-#: src/gui/statuspopup.cpp:284
+#: src/gui/statuspopup.cpp:285
msgid "(A) moves to target in attack range"
msgstr ""
-#: src/gui/statuspopup.cpp:289
+#: src/gui/statuspopup.cpp:290
msgid "(?) move to target"
msgstr "(?)移动到目标"
-#: src/gui/statuspopup.cpp:297
+#: src/gui/statuspopup.cpp:298
msgid "(D) default follow"
msgstr ""
-#: src/gui/statuspopup.cpp:301
+#: src/gui/statuspopup.cpp:302
msgid "(R) relative follow"
msgstr ""
-#: src/gui/statuspopup.cpp:305
+#: src/gui/statuspopup.cpp:306
msgid "(M) mirror follow"
msgstr ""
-#: src/gui/statuspopup.cpp:309
+#: src/gui/statuspopup.cpp:310
msgid "(P) pet follow"
msgstr ""
-#: src/gui/statuspopup.cpp:313
+#: src/gui/statuspopup.cpp:314
msgid "(?) unknown follow"
msgstr ""
-#: src/gui/statuspopup.cpp:322 src/gui/statuspopup.cpp:345
+#: src/gui/statuspopup.cpp:323 src/gui/statuspopup.cpp:346
msgid "(D) default attack"
msgstr ""
-#: src/gui/statuspopup.cpp:327
+#: src/gui/statuspopup.cpp:328
msgid "(s) switch attack without shield"
msgstr ""
-#: src/gui/statuspopup.cpp:332
+#: src/gui/statuspopup.cpp:333
msgid "(S) switch attack with shield"
msgstr ""
-#: src/gui/statuspopup.cpp:336 src/gui/statuspopup.cpp:361
+#: src/gui/statuspopup.cpp:337 src/gui/statuspopup.cpp:362
msgid "(?) attack"
msgstr "(?) 攻击"
-#: src/gui/statuspopup.cpp:349
+#: src/gui/statuspopup.cpp:350
msgid "(G) go and attack"
msgstr "(G) 去攻击"
-#: src/gui/statuspopup.cpp:353
+#: src/gui/statuspopup.cpp:354
msgid "(A) go, attack, pickup"
msgstr ""
-#: src/gui/statuspopup.cpp:357
+#: src/gui/statuspopup.cpp:358
msgid "(d) without auto attack"
msgstr ""
-#: src/gui/statuspopup.cpp:375
+#: src/gui/statuspopup.cpp:376
msgid "(S) small pick up 1x1 cells"
msgstr ""
-#: src/gui/statuspopup.cpp:379
+#: src/gui/statuspopup.cpp:380
msgid "(D) default pick up 2x1 cells"
msgstr ""
-#: src/gui/statuspopup.cpp:383
+#: src/gui/statuspopup.cpp:384
msgid "(F) forward pick up 2x3 cells"
msgstr ""
-#: src/gui/statuspopup.cpp:387
+#: src/gui/statuspopup.cpp:388
msgid "(3) pick up 3x3 cells"
msgstr ""
-#: src/gui/statuspopup.cpp:391
+#: src/gui/statuspopup.cpp:392
msgid "(g) go and pick up in distance 4"
msgstr ""
-#: src/gui/statuspopup.cpp:395
+#: src/gui/statuspopup.cpp:396
msgid "(G) go and pick up in distance 8"
msgstr ""
-#: src/gui/statuspopup.cpp:399
+#: src/gui/statuspopup.cpp:400
msgid "(A) go and pick up in max distance"
msgstr ""
-#: src/gui/statuspopup.cpp:403
+#: src/gui/statuspopup.cpp:404
msgid "(?) pick up"
msgstr "(?)拿起"
-#: src/gui/statuspopup.cpp:412
+#: src/gui/statuspopup.cpp:413
msgid "(N) normal map view"
msgstr ""
-#: src/gui/statuspopup.cpp:416
+#: src/gui/statuspopup.cpp:417
msgid "(D) debug map view"
msgstr ""
-#: src/gui/statuspopup.cpp:420
+#: src/gui/statuspopup.cpp:421
msgid "(u) ultra map view"
msgstr ""
-#: src/gui/statuspopup.cpp:424
+#: src/gui/statuspopup.cpp:425
msgid "(U) ultra map view 2"
msgstr ""
-#: src/gui/statuspopup.cpp:428
+#: src/gui/statuspopup.cpp:429
msgid "(e) empty map view"
msgstr ""
-#: src/gui/statuspopup.cpp:432
+#: src/gui/statuspopup.cpp:433
msgid "(b) black & white map view"
msgstr ""
-#: src/gui/statuspopup.cpp:436
+#: src/gui/statuspopup.cpp:437
msgid "(?) map view"
msgstr ""
-#: src/gui/statuspopup.cpp:444
+#: src/gui/statuspopup.cpp:445
msgid "(f) use #flar for magic attack"
msgstr ""
-#: src/gui/statuspopup.cpp:449
+#: src/gui/statuspopup.cpp:450
msgid "(c) use #chiza for magic attack"
msgstr ""
-#: src/gui/statuspopup.cpp:454
+#: src/gui/statuspopup.cpp:455
msgid "(I) use #ingrav for magic attack"
msgstr ""
-#: src/gui/statuspopup.cpp:459
+#: src/gui/statuspopup.cpp:460
msgid "(F) use #frillyar for magic attack"
msgstr ""
-#: src/gui/statuspopup.cpp:464
+#: src/gui/statuspopup.cpp:465
msgid "(U) use #upmarmu for magic attack"
msgstr ""
-#: src/gui/statuspopup.cpp:468
+#: src/gui/statuspopup.cpp:469
msgid "(?) magic attack"
msgstr ""
-#: src/gui/statuspopup.cpp:477
+#: src/gui/statuspopup.cpp:478
msgid "(D) default imitation"
msgstr ""
-#: src/gui/statuspopup.cpp:481
+#: src/gui/statuspopup.cpp:482
msgid "(O) outfits imitation"
msgstr ""
-#: src/gui/statuspopup.cpp:485
+#: src/gui/statuspopup.cpp:486
msgid "(?) imitation"
msgstr ""
-#: src/gui/statuspopup.cpp:494
+#: src/gui/statuspopup.cpp:495
msgid "(O) on keyboard"
msgstr ""
-#: src/gui/statuspopup.cpp:497
+#: src/gui/statuspopup.cpp:498
msgid "(A) away"
msgstr ""
-#: src/gui/statuspopup.cpp:500 src/gui/statuspopup.cpp:520
+#: src/gui/statuspopup.cpp:501 src/gui/statuspopup.cpp:521
msgid "(?) away"
msgstr ""
-#: src/gui/statuspopup.cpp:508
+#: src/gui/statuspopup.cpp:509
msgid "(G) game camera mode"
msgstr ""
-#: src/gui/statuspopup.cpp:512
+#: src/gui/statuspopup.cpp:513
msgid "(F) free camera mode"
msgstr ""
-#: src/gui/statuspopup.cpp:516
+#: src/gui/statuspopup.cpp:517
msgid "(D) design camera mode"
msgstr ""
-#: src/gui/statuspopup.cpp:527
+#: src/gui/statuspopup.cpp:528
msgid "Game modifiers are disabled"
msgstr ""
-#: src/gui/statuspopup.cpp:532
+#: src/gui/statuspopup.cpp:533
msgid "Game modifiers are enabled"
msgstr ""
-#: src/gui/statuswindow.cpp:142 src/gui/statuswindow.cpp:272
-#: src/gui/statuswindow.cpp:335
+#: src/gui/statuswindow.cpp:143 src/gui/statuswindow.cpp:273
+#: src/gui/statuswindow.cpp:336
#, c-format
msgid "Level: %d"
msgstr "等级:%d"
-#: src/gui/statuswindow.cpp:143 src/gui/statuswindow.cpp:258
-#: src/gui/statuswindow.cpp:302
+#: src/gui/statuswindow.cpp:144 src/gui/statuswindow.cpp:259
+#: src/gui/statuswindow.cpp:303
#, c-format
msgid "Money: %s"
msgstr "金币: %s"
-#: src/gui/statuswindow.cpp:149
+#: src/gui/statuswindow.cpp:150
msgid "HP:"
msgstr "HP:"
-#: src/gui/statuswindow.cpp:156
+#: src/gui/statuswindow.cpp:157
msgid "Exp:"
msgstr "经验:"
-#: src/gui/statuswindow.cpp:170
+#: src/gui/statuswindow.cpp:171
msgid "MP:"
msgstr "MP:"
-#: src/gui/statuswindow.cpp:202 src/gui/statuswindow.cpp:385
+#: src/gui/statuswindow.cpp:203 src/gui/statuswindow.cpp:386
#, c-format
msgid "Job: %d"
msgstr "职业:%d"
-#: src/gui/statuswindow.cpp:203
+#: src/gui/statuswindow.cpp:204
msgid "Job:"
msgstr "职业:"
-#: src/gui/statuswindow.cpp:261 src/gui/statuswindow.cpp:309
+#: src/gui/statuswindow.cpp:262 src/gui/statuswindow.cpp:310
#, c-format
msgid "Character points: %d"
msgstr "角色可用点: %d"
-#: src/gui/statuswindow.cpp:267
+#: src/gui/statuswindow.cpp:268
#, c-format
msgid "Level: %d (GM %d)"
msgstr "级别:%d (GM %d)"
-#: src/gui/statuswindow.cpp:323
+#: src/gui/statuswindow.cpp:324
#, c-format
msgid "Correction points: %d"
msgstr ""
-#: src/gui/statuswindow.cpp:646 src/gui/statuswindow.cpp:711
-#: src/gui/statuswindow.cpp:731 src/gui/statuswindow.cpp:747
-#: src/gui/statuswindow.cpp:793 src/gui/statuswindow.cpp:822
-#: src/gui/statuswindow.cpp:845 src/gui/statuswindow.cpp:864
+#: src/gui/statuswindow.cpp:647 src/gui/statuswindow.cpp:712
+#: src/gui/statuswindow.cpp:732 src/gui/statuswindow.cpp:748
+#: src/gui/statuswindow.cpp:794 src/gui/statuswindow.cpp:823
+#: src/gui/statuswindow.cpp:846 src/gui/statuswindow.cpp:865
msgid "(D)"
msgstr "(D)"
-#: src/gui/statuswindow.cpp:649 src/gui/statuswindow.cpp:772
+#: src/gui/statuswindow.cpp:650 src/gui/statuswindow.cpp:773
msgid "(I)"
msgstr "(I)"
-#: src/gui/statuswindow.cpp:652 src/gui/statuswindow.cpp:769
+#: src/gui/statuswindow.cpp:653 src/gui/statuswindow.cpp:770
msgid "(c)"
msgstr "(c)"
-#: src/gui/statuswindow.cpp:655
+#: src/gui/statuswindow.cpp:656
msgid "(C)"
msgstr "(C)"
-#: src/gui/statuswindow.cpp:658 src/gui/statuswindow.cpp:756
+#: src/gui/statuswindow.cpp:659 src/gui/statuswindow.cpp:757
msgid "(d)"
msgstr "(d)"
-#: src/gui/statuswindow.cpp:661 src/gui/statuswindow.cpp:675
-#: src/gui/statuswindow.cpp:704 src/gui/statuswindow.cpp:723
-#: src/gui/statuswindow.cpp:740 src/gui/statuswindow.cpp:759
-#: src/gui/statuswindow.cpp:781 src/gui/statuswindow.cpp:811
-#: src/gui/statuswindow.cpp:837 src/gui/statuswindow.cpp:851
-#: src/gui/statuswindow.cpp:867 src/gui/statuswindow.cpp:880
+#: src/gui/statuswindow.cpp:662 src/gui/statuswindow.cpp:676
+#: src/gui/statuswindow.cpp:705 src/gui/statuswindow.cpp:724
+#: src/gui/statuswindow.cpp:741 src/gui/statuswindow.cpp:760
+#: src/gui/statuswindow.cpp:782 src/gui/statuswindow.cpp:812
+#: src/gui/statuswindow.cpp:838 src/gui/statuswindow.cpp:852
+#: src/gui/statuswindow.cpp:868 src/gui/statuswindow.cpp:881
msgid "(?)"
msgstr "(?)"
-#: src/gui/statuswindow.cpp:672
+#: src/gui/statuswindow.cpp:673
msgid "(a)"
msgstr "(a)"
-#: src/gui/statuswindow.cpp:683
+#: src/gui/statuswindow.cpp:684
msgid "(0)"
msgstr "(0)"
-#: src/gui/statuswindow.cpp:686
+#: src/gui/statuswindow.cpp:687
msgid "(1)"
msgstr "(1)"
-#: src/gui/statuswindow.cpp:689
+#: src/gui/statuswindow.cpp:690
msgid "(2)"
msgstr "(2)"
-#: src/gui/statuswindow.cpp:692 src/gui/statuswindow.cpp:799
+#: src/gui/statuswindow.cpp:693 src/gui/statuswindow.cpp:800
msgid "(3)"
msgstr "(3)"
-#: src/gui/statuswindow.cpp:695
+#: src/gui/statuswindow.cpp:696
msgid "(5)"
msgstr "(5)"
-#: src/gui/statuswindow.cpp:698
+#: src/gui/statuswindow.cpp:699
msgid "(7)"
msgstr "(7)"
-#: src/gui/statuswindow.cpp:701 src/gui/statuswindow.cpp:753
-#: src/gui/statuswindow.cpp:808 src/gui/statuswindow.cpp:877
+#: src/gui/statuswindow.cpp:702 src/gui/statuswindow.cpp:754
+#: src/gui/statuswindow.cpp:809 src/gui/statuswindow.cpp:878
msgid "(A)"
msgstr "(A)"
-#: src/gui/statuswindow.cpp:714
+#: src/gui/statuswindow.cpp:715
msgid "(R)"
msgstr "(R)"
-#: src/gui/statuswindow.cpp:717
+#: src/gui/statuswindow.cpp:718
msgid "(M)"
msgstr "(M)"
-#: src/gui/statuswindow.cpp:720
+#: src/gui/statuswindow.cpp:721
msgid "(P)"
msgstr "(P)"
-#: src/gui/statuswindow.cpp:734
+#: src/gui/statuswindow.cpp:735
msgid "(s)"
msgstr "(s)"
-#: src/gui/statuswindow.cpp:737 src/gui/statuswindow.cpp:790
+#: src/gui/statuswindow.cpp:738 src/gui/statuswindow.cpp:791
msgid "(S)"
msgstr "(S)"
-#: src/gui/statuswindow.cpp:750 src/gui/statuswindow.cpp:805
-#: src/gui/statuswindow.cpp:858
+#: src/gui/statuswindow.cpp:751 src/gui/statuswindow.cpp:806
+#: src/gui/statuswindow.cpp:859
msgid "(G)"
msgstr "(G)"
-#: src/gui/statuswindow.cpp:766
+#: src/gui/statuswindow.cpp:767
msgid "(f)"
msgstr "(f)"
-#: src/gui/statuswindow.cpp:775 src/gui/statuswindow.cpp:796
-#: src/gui/statuswindow.cpp:861
+#: src/gui/statuswindow.cpp:776 src/gui/statuswindow.cpp:797
+#: src/gui/statuswindow.cpp:862
msgid "(F)"
msgstr "(F)"
-#: src/gui/statuswindow.cpp:778 src/gui/statuswindow.cpp:828
+#: src/gui/statuswindow.cpp:779 src/gui/statuswindow.cpp:829
msgid "(U)"
msgstr "(U)"
-#: src/gui/statuswindow.cpp:802
+#: src/gui/statuswindow.cpp:803
msgid "(g)"
msgstr "(g)"
-#: src/gui/statuswindow.cpp:819
+#: src/gui/statuswindow.cpp:820
msgid "(N)"
msgstr "(N)"
-#: src/gui/statuswindow.cpp:825
+#: src/gui/statuswindow.cpp:826
msgid "(u)"
msgstr "(u)"
-#: src/gui/statuswindow.cpp:831
+#: src/gui/statuswindow.cpp:832
msgid "(e)"
msgstr "(e)"
-#: src/gui/statuswindow.cpp:834
+#: src/gui/statuswindow.cpp:835
msgid "(b)"
msgstr "(b)"
-#: src/gui/statuswindow.cpp:848 src/gui/statuswindow.cpp:874
+#: src/gui/statuswindow.cpp:849 src/gui/statuswindow.cpp:875
msgid "(O)"
msgstr "(O)"
@@ -3216,24 +3245,24 @@ msgstr "已同意。等待中……"
msgid "Trade: You"
msgstr "交易:你"
-#: src/gui/tradewindow.cpp:110 src/gui/tradewindow.cpp:166
+#: src/gui/tradewindow.cpp:111 src/gui/tradewindow.cpp:167
#, c-format
msgid "You get %s"
msgstr "你得到%s"
-#: src/gui/tradewindow.cpp:111
+#: src/gui/tradewindow.cpp:112
msgid "You give:"
msgstr "你给予:"
-#: src/gui/tradewindow.cpp:115
+#: src/gui/tradewindow.cpp:116
msgid "Change"
msgstr "改变"
-#: src/gui/tradewindow.cpp:374
+#: src/gui/tradewindow.cpp:375
msgid "You don't have enough money."
msgstr "你没有足够的钱币."
-#: src/gui/tradewindow.cpp:453
+#: src/gui/tradewindow.cpp:454
msgid "Failed adding item. You can not overlap one kind of item on the window."
msgstr "添加物品失败。你不能覆盖窗口中的该类物品。"
@@ -3242,33 +3271,33 @@ msgstr "添加物品失败。你不能覆盖窗口中的该类物品。"
msgid "Name: %s"
msgstr "姓名:%s"
-#: src/gui/updaterwindow.cpp:136
+#: src/gui/updaterwindow.cpp:138
msgid "Updating..."
msgstr "更新..."
-#: src/gui/updaterwindow.cpp:155
+#: src/gui/updaterwindow.cpp:159
msgid "Connecting..."
msgstr "连接中..."
-#: src/gui/updaterwindow.cpp:158
+#: src/gui/updaterwindow.cpp:162
msgid "Play"
msgstr "开始"
-#: src/gui/updaterwindow.cpp:556
+#: src/gui/updaterwindow.cpp:564
msgid "##1 The update process is incomplete."
msgstr "##1 更新过程不完整。"
#. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:558
+#: src/gui/updaterwindow.cpp:566
msgid "##1 It is strongly recommended that"
msgstr "##1 强烈建议"
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:560
+#: src/gui/updaterwindow.cpp:568
msgid "##1 you try again later."
msgstr ""
-#: src/gui/updaterwindow.cpp:686
+#: src/gui/updaterwindow.cpp:744
msgid "Completed"
msgstr "已完成"
@@ -3420,23 +3449,23 @@ msgstr "家居广场边界"
msgid "Road Point"
msgstr "路点"
-#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:471
+#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:472
msgid "Who Is Online - Updating"
msgstr "谁在线 - 更新"
-#: src/gui/whoisonline.cpp:101
+#: src/gui/whoisonline.cpp:102
msgid "Update"
msgstr "更新"
-#: src/gui/whoisonline.cpp:294
+#: src/gui/whoisonline.cpp:295
msgid "Who Is Online - "
msgstr "谁在线 -"
-#: src/gui/whoisonline.cpp:485
+#: src/gui/whoisonline.cpp:486
msgid "Who Is Online - error"
msgstr "谁在线 - 错误"
-#: src/gui/whoisonline.cpp:516
+#: src/gui/whoisonline.cpp:517
msgid "Who Is Online - Update"
msgstr "谁在线 - 更新"
@@ -3501,7 +3530,8 @@ msgid "This command makes <nick> a channel operator."
msgstr "该命令使<昵称>成为频道管理员。"
#: src/gui/widgets/channeltab.cpp:85 src/gui/widgets/channeltab.cpp:94
-#: src/net/ea/gui/guildtab.cpp:69 src/net/ea/gui/partytab.cpp:85
+#: src/gui/widgets/guildchattab.cpp:61 src/net/ea/gui/guildtab.cpp:69
+#: src/net/ea/gui/partytab.cpp:85
msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
msgstr "如果<昵称>之间有空格,用双引号(\")括起来。"
@@ -3539,6 +3569,41 @@ msgstr "%s 全局公告:"
msgid "%s whispers: %s"
msgstr "%s私语:%s"
+#: src/gui/widgets/guildchattab.cpp:59 src/net/ea/gui/guildtab.cpp:67
+#: src/net/ea/gui/partytab.cpp:83
+msgid "Command: /invite <nick>"
+msgstr "命令:/invite <昵称>"
+
+#: src/gui/widgets/guildchattab.cpp:60 src/net/ea/gui/guildtab.cpp:68
+msgid "This command invites <nick> to the guild you're in."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:66 src/net/ea/gui/guildtab.cpp:74
+#: src/net/ea/gui/partytab.cpp:90
+msgid "Command: /leave"
+msgstr "命令:/leave"
+
+#: src/gui/widgets/guildchattab.cpp:67 src/net/ea/gui/guildtab.cpp:75
+msgid "This command causes the player to leave the guild."
+msgstr ""
+
+#: src/gui/widgets/guildchattab.cpp:109 src/net/ea/gui/guildtab.cpp:135
+#: src/net/ea/gui/partytab.cpp:69
+msgid "/help > Display this help."
+msgstr "/help > 显示该帮助信息。"
+
+#: src/gui/widgets/guildchattab.cpp:110 src/net/ea/gui/guildtab.cpp:136
+msgid "/invite > Invite a player to your guild"
+msgstr "/invite > "
+
+#: src/gui/widgets/guildchattab.cpp:111 src/net/ea/gui/guildtab.cpp:137
+msgid "/leave > Leave the guild you are in"
+msgstr "/leave > "
+
+#: src/gui/widgets/guildchattab.cpp:112 src/net/ea/gui/guildtab.cpp:138
+msgid "/kick > Kick some one from the guild you are in"
+msgstr "/kick >"
+
#: src/gui/widgets/setupitem.cpp:271 src/gui/widgets/setupitem.cpp:394
msgid "Edit"
msgstr "编辑"
@@ -4068,67 +4133,67 @@ msgid ""
"strange behaviour."
msgstr ""
-#: src/localplayer.cpp:372
+#: src/localplayer.cpp:370
msgid "You were killed by "
msgstr "你被打死"
-#: src/localplayer.cpp:1403
+#: src/localplayer.cpp:1401
msgid "Tried to pick up nonexistent item."
msgstr ""
-#: src/localplayer.cpp:1405
+#: src/localplayer.cpp:1403
msgid "Item is too heavy."
msgstr "项目是太重了。"
-#: src/localplayer.cpp:1407
+#: src/localplayer.cpp:1405
msgid "Item is too far away."
msgstr "物品太远了。"
-#: src/localplayer.cpp:1409
+#: src/localplayer.cpp:1407
msgid "Inventory is full."
msgstr ""
-#: src/localplayer.cpp:1411
+#: src/localplayer.cpp:1409
msgid "Stack is too big."
msgstr ""
-#: src/localplayer.cpp:1414
+#: src/localplayer.cpp:1412
msgid "Item belongs to someone else."
msgstr ""
-#: src/localplayer.cpp:1417
+#: src/localplayer.cpp:1415
msgid "Unknown problem picking up item."
msgstr ""
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1441
+#: src/localplayer.cpp:1439
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
msgstr[0] "你拾起%d[@@%d|%s @@]。"
-#: src/localplayer.cpp:3175
+#: src/localplayer.cpp:3173
msgid "Away"
msgstr "距离"
-#: src/localplayer.cpp:3476
+#: src/localplayer.cpp:3474
msgid "Follow: "
msgstr "跟随:"
-#: src/localplayer.cpp:3478 src/localplayer.cpp:3493
+#: src/localplayer.cpp:3476 src/localplayer.cpp:3491
msgid "Follow canceled"
msgstr ""
-#: src/localplayer.cpp:3485
+#: src/localplayer.cpp:3483
msgid "Imitation: "
msgstr ""
-#: src/localplayer.cpp:3487 src/localplayer.cpp:3495
+#: src/localplayer.cpp:3485 src/localplayer.cpp:3493
msgid "Imitation canceled"
msgstr ""
-#: src/localplayer.cpp:3847
+#: src/localplayer.cpp:3845
msgid "You see "
msgstr "你看"
@@ -4304,28 +4369,28 @@ msgstr "角色已删除。"
msgid "Failed to delete character."
msgstr "删除角色失败。"
-#: src/net/ea/chathandler.cpp:60 src/net/ea/chathandler.cpp:66
-#: src/net/ea/chathandler.cpp:71 src/net/ea/chathandler.cpp:77
-#: src/net/ea/chathandler.cpp:82 src/net/ea/chathandler.cpp:88
-#: src/net/ea/chathandler.cpp:95 src/net/ea/chathandler.cpp:101
+#: src/net/ea/chathandler.cpp:61 src/net/ea/chathandler.cpp:67
+#: src/net/ea/chathandler.cpp:72 src/net/ea/chathandler.cpp:78
+#: src/net/ea/chathandler.cpp:83 src/net/ea/chathandler.cpp:89
+#: src/net/ea/chathandler.cpp:96 src/net/ea/chathandler.cpp:102
msgid "Channels are not supported!"
msgstr "聊天频道不被支持!"
-#: src/net/ea/chathandler.cpp:128
+#: src/net/ea/chathandler.cpp:129
#, c-format
msgid "Whisper could not be sent, %s is offline."
msgstr "密语无法发送,%s离线。"
-#: src/net/ea/chathandler.cpp:136
+#: src/net/ea/chathandler.cpp:137
#, c-format
msgid "Whisper could not be sent, ignored by %s."
msgstr ""
-#: src/net/ea/chathandler.cpp:348
+#: src/net/ea/chathandler.cpp:355
msgid "MVP player."
msgstr "MVP球员。"
-#: src/net/ea/chathandler.cpp:352
+#: src/net/ea/chathandler.cpp:359
msgid "MVP player: "
msgstr "MVP球员:"
@@ -4342,38 +4407,6 @@ msgstr "游戏"
msgid "Request to quit denied!"
msgstr ""
-#: src/net/ea/gui/guildtab.cpp:67 src/net/ea/gui/partytab.cpp:83
-msgid "Command: /invite <nick>"
-msgstr "命令:/invite <昵称>"
-
-#: src/net/ea/gui/guildtab.cpp:68
-msgid "This command invites <nick> to the guild you're in."
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:74 src/net/ea/gui/partytab.cpp:90
-msgid "Command: /leave"
-msgstr "命令:/leave"
-
-#: src/net/ea/gui/guildtab.cpp:75
-msgid "This command causes the player to leave the guild."
-msgstr ""
-
-#: src/net/ea/gui/guildtab.cpp:135 src/net/ea/gui/partytab.cpp:69
-msgid "/help > Display this help."
-msgstr "/help > 显示该帮助信息。"
-
-#: src/net/ea/gui/guildtab.cpp:136
-msgid "/invite > Invite a player to your guild"
-msgstr "/invite > "
-
-#: src/net/ea/gui/guildtab.cpp:137
-msgid "/leave > Leave the guild you are in"
-msgstr "/leave > "
-
-#: src/net/ea/gui/guildtab.cpp:138
-msgid "/kick > Kick some one from the guild you are in"
-msgstr "/kick >"
-
#: src/net/ea/guildhandler.cpp:83 src/net/manaserv/guildhandler.cpp:85
msgid "Guild created."
msgstr "帮会已创建"
@@ -4390,85 +4423,81 @@ msgstr ""
msgid "Unknown server response."
msgstr "未知的服务器的响应。"
-#: src/net/ea/guildhandler.cpp:180
+#: src/net/ea/guildhandler.cpp:181
#, c-format
msgid "Guild name: %s"
msgstr ""
-#: src/net/ea/guildhandler.cpp:182
+#: src/net/ea/guildhandler.cpp:183
#, c-format
msgid "Guild master: %s"
msgstr "工会会长: %s"
-#: src/net/ea/guildhandler.cpp:184
+#: src/net/ea/guildhandler.cpp:185
#, c-format
msgid "Guild level: %d"
msgstr "工会等级: %d"
-#: src/net/ea/guildhandler.cpp:186
+#: src/net/ea/guildhandler.cpp:187
#, c-format
msgid "Online members: %d"
msgstr "在线玩家: %d"
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:189
#, c-format
msgid "Max members: %d"
msgstr "最大成员: %d"
-#: src/net/ea/guildhandler.cpp:190
+#: src/net/ea/guildhandler.cpp:191
#, c-format
msgid "Average level: %d"
msgstr "平均等级: %d"
-#: src/net/ea/guildhandler.cpp:192
+#: src/net/ea/guildhandler.cpp:193
#, c-format
msgid "Guild exp: %d"
msgstr "工会经验值: %d"
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:195
#, c-format
msgid "Guild next exp: %d"
msgstr "工会下一级所需经验: %d"
-#: src/net/ea/guildhandler.cpp:196
+#: src/net/ea/guildhandler.cpp:197
#, c-format
msgid "Guild castle: %s"
msgstr ""
-#: src/net/ea/guildhandler.cpp:402
+#: src/net/ea/guildhandler.cpp:403
msgid "Could not inivte user to guild."
msgstr ""
-#: src/net/ea/guildhandler.cpp:406
+#: src/net/ea/guildhandler.cpp:407
msgid "User rejected guild invite."
msgstr ""
-#: src/net/ea/guildhandler.cpp:410
+#: src/net/ea/guildhandler.cpp:411
msgid "User is now part of your guild."
msgstr "用户现在是你们的工会成员了."
-#: src/net/ea/guildhandler.cpp:414
+#: src/net/ea/guildhandler.cpp:415
msgid "Your guild is full."
msgstr ""
-#: src/net/ea/guildhandler.cpp:418
+#: src/net/ea/guildhandler.cpp:419
msgid "Unknown guild invite response."
msgstr "未知工会邀请响应."
-#: src/net/ea/guildhandler.cpp:438
-msgid "You have left the guild."
-msgstr "你已经离开工会."
-
-#: src/net/ea/guildhandler.cpp:452
+#: src/net/ea/guildhandler.cpp:453
#, c-format
msgid "%s has left your guild."
msgstr "%s已经离开工会."
-#: src/net/ea/guildhandler.cpp:483
+#: src/net/ea/guildhandler.cpp:484
msgid "You was kicked from guild."
msgstr "你已经被工会开除!."
-#: src/net/ea/guildhandler.cpp:496
+#: src/net/ea/guildhandler.cpp:497
#, c-format
msgid "%s has kicked from your guild."
msgstr "%s已经被工会开除."
@@ -4696,12 +4725,12 @@ msgstr ""
msgid "You have left the party."
msgstr "你以退出帮会"
-#: src/net/ea/partyhandler.cpp:368
+#: src/net/ea/partyhandler.cpp:369
#, c-format
msgid "%s has left your party."
msgstr "%s已经离开你的帮会。"
-#: src/net/ea/partyhandler.cpp:444
+#: src/net/ea/partyhandler.cpp:448
#, c-format
msgid "An unknown member tried to say: %s"
msgstr "一未知成员尝试说:%s"
@@ -4824,7 +4853,7 @@ msgstr ""
"\"false\"用来禁止物品共享。"
#: src/net/ea/playerhandler.cpp:336 src/net/ea/playerhandler.cpp:346
-#: src/net/ea/playerhandler.cpp:425
+#: src/net/ea/playerhandler.cpp:428
msgid "Message"
msgstr "讯息"
@@ -4837,21 +4866,21 @@ msgstr "你已携带超过半数负重。无法回复健康(体力)"
msgid "You are carrying less than half your weight. You can regain health."
msgstr ""
-#: src/net/ea/playerhandler.cpp:451
+#: src/net/ea/playerhandler.cpp:454
#, c-format
msgid "You picked up %s."
msgstr "你捡起了%s"
-#: src/net/ea/playerhandler.cpp:457
+#: src/net/ea/playerhandler.cpp:460
#, c-format
msgid "You spent %s."
msgstr "你花费 %s."
-#: src/net/ea/playerhandler.cpp:501
+#: src/net/ea/playerhandler.cpp:506
msgid "Cannot raise skill!"
msgstr "不能提升技能!"
-#: src/net/ea/playerhandler.cpp:618
+#: src/net/ea/playerhandler.cpp:624
msgid "Equip arrows first."
msgstr "请先装备弓箭。"
@@ -4990,7 +5019,7 @@ msgstr "交易取消。"
msgid "Trade completed."
msgstr "交易完成。"
-#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:259
+#: src/net/manaserv/attributes.cpp:160 src/net/tmwa/generalhandler.cpp:258
msgid "Strength"
msgstr "力量"
@@ -4999,7 +5028,7 @@ msgstr "力量"
msgid "Strength %+.1f"
msgstr "力量%+.1f"
-#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:260
+#: src/net/manaserv/attributes.cpp:173 src/net/tmwa/generalhandler.cpp:259
msgid "Agility"
msgstr "敏捷"
@@ -5008,7 +5037,7 @@ msgstr "敏捷"
msgid "Agility %+.1f"
msgstr "敏捷 %+.1f"
-#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:263
+#: src/net/manaserv/attributes.cpp:186 src/net/tmwa/generalhandler.cpp:262
msgid "Dexterity"
msgstr "敏捷"
@@ -5017,7 +5046,7 @@ msgstr "敏捷"
msgid "Dexterity %+.1f"
msgstr "灵巧%+.1f"
-#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:261
+#: src/net/manaserv/attributes.cpp:199 src/net/tmwa/generalhandler.cpp:260
msgid "Vitality"
msgstr "生命"
@@ -5026,7 +5055,7 @@ msgstr "生命"
msgid "Vitality %+.1f"
msgstr "活力%+.1f"
-#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:262
+#: src/net/manaserv/attributes.cpp:212 src/net/tmwa/generalhandler.cpp:261
msgid "Intelligence"
msgstr "智慧"
@@ -5296,111 +5325,115 @@ msgstr "不能出售,交易。"
msgid "Unable to sell unsellable item."
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:109
+#: src/net/tmwa/generalhandler.cpp:108
#, c-format
msgid "Strength %+d"
msgstr "力量 %+d"
-#: src/net/tmwa/generalhandler.cpp:110
+#: src/net/tmwa/generalhandler.cpp:109
#, c-format
msgid "Agility %+d"
msgstr "敏捷 %+d"
-#: src/net/tmwa/generalhandler.cpp:111
+#: src/net/tmwa/generalhandler.cpp:110
#, c-format
msgid "Vitality %+d"
msgstr "生命 %+d"
-#: src/net/tmwa/generalhandler.cpp:112
+#: src/net/tmwa/generalhandler.cpp:111
#, c-format
msgid "Intelligence %+d"
msgstr "智慧 %+d"
-#: src/net/tmwa/generalhandler.cpp:113
+#: src/net/tmwa/generalhandler.cpp:112
#, c-format
msgid "Dexterity %+d"
msgstr "敏捷 %+d"
-#: src/net/tmwa/generalhandler.cpp:114
+#: src/net/tmwa/generalhandler.cpp:113
#, c-format
msgid "Luck %+d"
msgstr "幸运 %+d"
-#: src/net/tmwa/generalhandler.cpp:140
+#: src/net/tmwa/generalhandler.cpp:139
msgid "Authentication failed."
msgstr "身份验证失败。"
-#: src/net/tmwa/generalhandler.cpp:143
+#: src/net/tmwa/generalhandler.cpp:142
msgid "No servers available."
msgstr "没有可用的服务器。"
-#: src/net/tmwa/generalhandler.cpp:147
+#: src/net/tmwa/generalhandler.cpp:146
msgid "Someone else is trying to use this account."
msgstr "别人尝试使用该帐户。"
-#: src/net/tmwa/generalhandler.cpp:150
+#: src/net/tmwa/generalhandler.cpp:149
msgid "This account is already logged in."
msgstr "此帐户已登录。"
-#: src/net/tmwa/generalhandler.cpp:153
+#: src/net/tmwa/generalhandler.cpp:152
msgid "Speed hack detected."
msgstr "检测速度劈。"
-#: src/net/tmwa/generalhandler.cpp:156
+#: src/net/tmwa/generalhandler.cpp:155
msgid "Duplicated login."
msgstr "重复登录。"
-#: src/net/tmwa/generalhandler.cpp:159
+#: src/net/tmwa/generalhandler.cpp:158
msgid "Unknown connection error."
msgstr "未知的连接错误。"
-#: src/net/tmwa/generalhandler.cpp:232
+#: src/net/tmwa/generalhandler.cpp:231
msgid "Got disconnected from server!"
msgstr "和服务器失去连接"
-#: src/net/tmwa/generalhandler.cpp:264
+#: src/net/tmwa/generalhandler.cpp:263
msgid "Luck"
msgstr "幸运"
-#: src/net/tmwa/generalhandler.cpp:267
+#: src/net/tmwa/generalhandler.cpp:266
msgid "Defense"
msgstr "国防"
-#: src/net/tmwa/generalhandler.cpp:268
+#: src/net/tmwa/generalhandler.cpp:267
msgid "M.Attack"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:269
+#: src/net/tmwa/generalhandler.cpp:268
msgid "M.Defense"
msgstr ""
-#: src/net/tmwa/generalhandler.cpp:271
+#: src/net/tmwa/generalhandler.cpp:270
#, no-c-format
msgid "% Accuracy"
msgstr "%精度"
-#: src/net/tmwa/generalhandler.cpp:273
+#: src/net/tmwa/generalhandler.cpp:272
#, no-c-format
msgid "% Evade"
msgstr "%闪避"
-#: src/net/tmwa/generalhandler.cpp:275
+#: src/net/tmwa/generalhandler.cpp:274
#, no-c-format
msgid "% Critical"
msgstr "%"
-#: src/net/tmwa/generalhandler.cpp:276
+#: src/net/tmwa/generalhandler.cpp:275
msgid "Attack Delay"
msgstr "攻击延迟"
-#: src/net/tmwa/generalhandler.cpp:278
+#: src/net/tmwa/generalhandler.cpp:277
msgid "Walk Delay"
msgstr "步行延迟"
-#: src/net/tmwa/generalhandler.cpp:280
+#: src/net/tmwa/generalhandler.cpp:279
msgid "Attack Range"
msgstr "攻击范围"
+#: src/net/tmwa/generalhandler.cpp:281
+msgid "Damage per sec."
+msgstr ""
+
#: src/net/tmwa/network.cpp:152
msgid "Empty address given to Network::connect()!"
msgstr "空的地址给网络:连接()!"
@@ -5434,31 +5467,31 @@ msgstr ""
msgid "Floating bubble"
msgstr "流动的泡沫"
-#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:248
+#: src/resources/beinginfo.cpp:36 src/resources/itemdb.cpp:246
#: src/resources/monsterdb.cpp:84
msgid "unnamed"
msgstr "未知怪兽"
-#: src/resources/itemdb.cpp:65
+#: src/resources/itemdb.cpp:63
#, c-format
msgid "Attack %+d"
msgstr "攻击 %+d"
-#: src/resources/itemdb.cpp:66
+#: src/resources/itemdb.cpp:64
#, c-format
msgid "Defense %+d"
msgstr "防护 %+d"
-#: src/resources/itemdb.cpp:67
+#: src/resources/itemdb.cpp:65
#, c-format
msgid "HP %+d"
msgstr "HP %+d"
-#: src/resources/itemdb.cpp:68
+#: src/resources/itemdb.cpp:66
#, c-format
msgid "MP %+d"
msgstr "MP %+d"
-#: src/resources/itemdb.cpp:171
+#: src/resources/itemdb.cpp:169
msgid "Unknown item"
msgstr "未知物品"
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 554fcfbf5..d15b6131a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -139,6 +139,8 @@ SET(SRCS
gui/widgets/emoteshortcutcontainer.h
gui/widgets/flowcontainer.cpp
gui/widgets/flowcontainer.h
+ gui/widgets/guildchattab.cpp
+ gui/widgets/guildchattab.h
gui/widgets/horizontcontainer.cpp
gui/widgets/horizontcontainer.h
gui/widgets/icon.cpp
@@ -468,6 +470,8 @@ SET(SRCS
animatedsprite.h
animationparticle.cpp
animationparticle.h
+ auctionmanager.cpp
+ auctionmanager.h
avatar.cpp
avatar.h
being.cpp
@@ -510,6 +514,8 @@ SET(SRCS
guichanfwd.h
guild.cpp
guild.h
+ guildmanager.cpp
+ guildmanager.h
imageparticle.cpp
imageparticle.h
imagesprite.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 7263592ff..a0c96a8ec 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -45,6 +45,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
gui/widgets/emoteshortcutcontainer.h \
gui/widgets/flowcontainer.cpp \
gui/widgets/flowcontainer.h \
+ gui/widgets/guildchattab.cpp \
+ gui/widgets/guildchattab.h \
gui/widgets/horizontcontainer.cpp \
gui/widgets/horizontcontainer.h \
gui/widgets/icon.cpp \
@@ -378,6 +380,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
animatedsprite.h \
animationparticle.cpp \
animationparticle.h \
+ auctionmanager.cpp \
+ auctionmanager.h \
avatar.cpp \
avatar.h \
being.cpp \
@@ -420,6 +424,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
guichanfwd.h \
guild.cpp \
guild.h \
+ guildmanager.cpp \
+ guildmanager.h \
imageparticle.cpp \
imageparticle.h \
imagesprite.cpp \
diff --git a/src/actorsprite.cpp b/src/actorsprite.cpp
index 848e84e0f..2b133eca5 100644
--- a/src/actorsprite.cpp
+++ b/src/actorsprite.cpp
@@ -477,9 +477,6 @@ void ActorSprite::loadTargetCursor(const std::string &filename,
if (size < TC_SMALL || size >= NUM_TC)
return;
-// assert(size > -1);
-// assert(size < 3);
-
ResourceManager *resman = ResourceManager::getInstance();
ImageSet *currentImageSet = resman->getImageSet(filename, width, height);
@@ -493,7 +490,6 @@ void ActorSprite::loadTargetCursor(const std::string &filename,
for (unsigned int i = 0; i < currentImageSet->size(); ++i)
{
-// anim->addFrame(currentImageSet->get(i), 0,
anim->addFrame(currentImageSet->get(i), 75,
(16 - (currentImageSet->getWidth() / 2)),
(16 - (currentImageSet->getHeight() / 2)),
diff --git a/src/animatedsprite.cpp b/src/animatedsprite.cpp
index 7414c94bc..27be02e36 100644
--- a/src/animatedsprite.cpp
+++ b/src/animatedsprite.cpp
@@ -32,8 +32,6 @@
#include "utils/xml.h"
-#include <cassert>
-
#include "debug.h"
AnimatedSprite::AnimatedSprite(SpriteDef *sprite):
@@ -46,8 +44,6 @@ AnimatedSprite::AnimatedSprite(SpriteDef *sprite):
mAnimation(0),
mFrame(0)
{
-// assert(mSprite);
-
mAlpha = 1.0f;
// Take possession of the sprite
diff --git a/src/auctionmanager.cpp b/src/auctionmanager.cpp
new file mode 100644
index 000000000..b360279ba
--- /dev/null
+++ b/src/auctionmanager.cpp
@@ -0,0 +1,89 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2011 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "auctionmanager.h"
+
+#include "actorspritemanager.h"
+#include "client.h"
+#include "configuration.h"
+#include "localplayer.h"
+
+#include "net/chathandler.h"
+#include "net/net.h"
+
+#include "utils/gettext.h"
+#include "utils/stringutils.h"
+
+#include "debug.h"
+
+bool AuctionManager::mEnableAuctionBot = false;
+
+AuctionManager::AuctionManager()
+{
+}
+
+AuctionManager::~AuctionManager()
+{
+}
+
+void AuctionManager::init()
+{
+ if (auctionManager)
+ return;
+
+ int val = serverConfig.getValue("enableAuctionBot", -1);
+ if (val == -1)
+ {
+ if (Client::isTmw())
+ val = 1;
+ else
+ val = 0;
+ serverConfig.setValue("enableAuctionBot", val);
+ }
+ mEnableAuctionBot = val;
+ if (mEnableAuctionBot)
+ auctionManager = new AuctionManager();
+}
+
+void AuctionManager::send(std::string msg)
+{
+ Net::getChatHandler()->privateMessage("AuctionBot", msg);
+}
+
+bool AuctionManager::processAuctionMessage(std::string msg)
+{
+ if (msg.size() > 4 && msg[0] == '#' && msg[1] == '#')
+ msg = msg.substr(3);
+
+ return false;
+}
+
+void AuctionManager::clear()
+{
+}
+
+void AuctionManager::reload()
+{
+}
+
+void AuctionManager::sendMail(std::string mail)
+{
+ Net::getChatHandler()->privateMessage("AuctionBot", "!mail " + mail);
+}
diff --git a/src/auctionmanager.h b/src/auctionmanager.h
new file mode 100644
index 000000000..bdc0497ae
--- /dev/null
+++ b/src/auctionmanager.h
@@ -0,0 +1,58 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2011 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef AUCTIONMANAGER_H
+#define AUCTIONMANAGER_H
+
+#include "utils/dtor.h"
+
+#include <map>
+#include <string>
+#include <vector>
+
+class AuctionManager
+{
+ public:
+ AuctionManager();
+
+ ~AuctionManager();
+
+ static void init();
+
+ void send(std::string msg);
+
+ bool processAuctionMessage(std::string msg);
+
+ static bool getEnableAuctionBot()
+ { return mEnableAuctionBot; }
+
+ void clear();
+
+ void reload();
+
+ void sendMail(std::string mail);
+
+ private:
+ static bool mEnableAuctionBot;
+};
+
+extern AuctionManager *auctionManager;
+
+#endif // AUCTIONMANAGER_H
diff --git a/src/being.cpp b/src/being.cpp
index d3181c32a..b4c97f15d 100644
--- a/src/being.cpp
+++ b/src/being.cpp
@@ -79,7 +79,6 @@
#include "utils/stringutils.h"
#include "utils/xml.h"
-#include <cassert>
#include <cmath>
#include "debug.h"
@@ -97,6 +96,7 @@ class BeingCacheEntry
mId(id),
mName(""),
mPartyName(""),
+ mGuildName(""),
mLevel(0),
mPvpRank(0),
mTime(0),
@@ -129,9 +129,15 @@ class BeingCacheEntry
void setPartyName(const std::string &name)
{ mPartyName = name; }
+ void setGuildName(const std::string &name)
+ { mGuildName = name; }
+
const std::string &getPartyName() const
{ return mPartyName; }
+ const std::string &getGuildName() const
+ { return mGuildName; }
+
void setLevel(int n)
{ mLevel = n; }
@@ -172,6 +178,7 @@ class BeingCacheEntry
int mId; /**< Unique sprite id */
std::string mName; /**< Name of character */
std::string mPartyName;
+ std::string mGuildName;
int mLevel;
unsigned int mPvpRank;
int mTime;
@@ -752,7 +759,6 @@ void Being::setGuildName(const std::string &name)
mGuildName = name;
}
-
void Being::setGuildPos(const std::string &pos A_UNUSED)
{
// logger->log("Got guild position \"%s\" for being %s(%i)", pos.c_str(), mName.c_str(), mId);
@@ -871,7 +877,11 @@ void Being::updateGuild()
return;
}
if (guild->getMember(getName()))
+ {
setGuild(guild);
+ if (!guild->getName().empty())
+ mGuildName = guild->getName();
+ }
updateColors();
}
@@ -1443,6 +1453,11 @@ int Being::getOffset(char pos, char neg) const
if (mDirection & pos)
offset = -offset;
+ if (offset > 32)
+ offset = 32;
+ if (offset < -32)
+ offset = -32;
+
return offset;
}
@@ -1769,6 +1784,7 @@ bool Being::updateFromCache()
if (!entry->getName().empty())
setName(entry->getName());
setPartyName(entry->getPartyName());
+ setGuildName(entry->getGuildName());
setLevel(entry->getLevel());
setPvpRank(entry->getPvpRank());
setIp(entry->getIp());
@@ -1820,6 +1836,7 @@ void Being::addToCache()
entry->setName(getName());
entry->setLevel(getLevel());
entry->setPartyName(getPartyName());
+ entry->setGuildName(getGuildName());
entry->setTime(cur_time);
entry->setPvpRank(getPvpRank());
entry->setIp(getIp());
@@ -2039,14 +2056,28 @@ void Being::drawHpBar(Graphics *graphics, int maxHP, int hp, int damage,
int dx = static_cast<int>(static_cast<float>(width) / p);
+ if (!damage || (!hp && maxHP == damage))
+ {
+ graphics->setColor(userPalette->getColorWithAlpha(color1));
+
+ graphics->fillRectangle(gcn::Rectangle(
+ x, y, dx, height));
+ return;
+ }
+ else if (width - dx <= 0)
+ {
+ graphics->setColor(userPalette->getColorWithAlpha(color2));
+
+ graphics->fillRectangle(gcn::Rectangle(
+ x, y, width, height));
+ return;
+ }
+
graphics->setColor(userPalette->getColorWithAlpha(color1));
graphics->fillRectangle(gcn::Rectangle(
x, y, dx, height));
- if (width - dx <= 0)
- return;
-
graphics->setColor(userPalette->getColorWithAlpha(color2));
graphics->fillRectangle(gcn::Rectangle(
diff --git a/src/client.cpp b/src/client.cpp
index 0e871ed91..ab176c00b 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -23,6 +23,7 @@
#include "client.h"
#include "main.h"
+#include "auctionmanager.h"
#include "chatlogger.h"
#include "configuration.h"
#include "dropshortcut.h"
@@ -30,6 +31,7 @@
#include "event.h"
#include "game.h"
#include "guild.h"
+#include "guildmanager.h"
#include "graphicsvertexes.h"
#include "itemshortcut.h"
#include "keyboardconfig.h"
@@ -112,7 +114,6 @@
#endif
#include <sys/stat.h>
-#include <cassert>
#include <iostream>
#include <fstream>
@@ -254,9 +255,10 @@ Client::Client(const Options &options):
mLimitFps(false),
mConfigAutoSaved(false),
mIsMinimized(false),
+ mInputFocused(true),
+ mMouseFocused(true),
mGuiAlpha(1.0f)
{
- assert(!mInstance);
mInstance = this;
logger = new Logger;
@@ -540,7 +542,7 @@ Client::Client(const Options &options):
loginData.username = mOptions.username;
loginData.password = mOptions.password;
- loginData.remember = serverConfig.getValue("remember", 0);
+ loginData.remember = serverConfig.getValue("remember", 1);
loginData.registerLogin = false;
if (mCurrentServer.hostname.empty())
@@ -786,13 +788,16 @@ int Client::exec()
else
loginData.username = mOptions.username;
- loginData.remember = serverConfig.getValue("remember", 0);
+ loginData.remember = serverConfig.getValue("remember", 1);
Net::connectToServer(mCurrentServer);
if (mumbleManager)
mumbleManager->setServer(mCurrentServer.hostname);
+ GuildManager::init();
+ AuctionManager::init();
+
if (!mConfigAutoSaved)
{
mConfigAutoSaved = true;
@@ -2180,3 +2185,14 @@ void Client::closeDialogs()
NpcDialog::closeAll();
SellDialog::closeAll();
}
+
+bool Client::isTmw()
+{
+ if (getServerName() == "server.themanaworld.org"
+ || Client::getServerName() == "themanaworld.org"
+ || Client::getServerName() == "81.161.192.4")
+ {
+ return true;
+ }
+ return false;
+}
diff --git a/src/client.h b/src/client.h
index 986e06cfb..3edf12674 100644
--- a/src/client.h
+++ b/src/client.h
@@ -260,6 +260,8 @@ public:
static void setFramerate(int fpsLimit);
+ static bool isTmw();
+
void optionChanged(const std::string &name);
void action(const gcn::ActionEvent &event);
diff --git a/src/commandhandler.cpp b/src/commandhandler.cpp
index f650ac8d1..dc962a17d 100644
--- a/src/commandhandler.cpp
+++ b/src/commandhandler.cpp
@@ -22,10 +22,12 @@
#include "commandhandler.h"
+#include "auctionmanager.h"
#include "actorspritemanager.h"
#include "channelmanager.h"
#include "channel.h"
#include "game.h"
+#include "guildmanager.h"
#include "localplayer.h"
#include "logger.h"
#include "main.h"
@@ -497,7 +499,12 @@ void CommandHandler::handleMe(const std::string &args, ChatTab *tab)
return;
const Guild *guild = player_node->getGuild();
if (guild)
- Net::getGuildHandler()->chat(guild->getId(), str);
+ {
+ if (guild->getServerGuild())
+ Net::getGuildHandler()->chat(guild->getId(), str);
+ else if (guildManager)
+ guildManager->chat(str);
+ }
break;
}
default:
@@ -859,7 +866,8 @@ void CommandHandler::handleHack(const std::string &args, ChatTab *tab A_UNUSED)
void CommandHandler::handleMail(const std::string &args, ChatTab *tab A_UNUSED)
{
- Net::getChatHandler()->privateMessage("AuctionBot", "!mail " + args);
+ if (auctionManager && auctionManager->getEnableAuctionBot())
+ auctionManager->sendMail(args);
}
void CommandHandler::handlePriceLoad(const std::string &args A_UNUSED,
diff --git a/src/compoundsprite.cpp b/src/compoundsprite.cpp
index 99fae4f88..c6921b2e8 100644
--- a/src/compoundsprite.cpp
+++ b/src/compoundsprite.cpp
@@ -410,7 +410,11 @@ void CompoundSprite::setAlpha(float alpha)
{
if (alpha != mAlpha)
{
+#ifdef USE_OPENGL
if (mEnableAlphaFix && Image::mUseOpenGL == 0 && size() > 3)
+#else
+ if (mEnableAlphaFix && size() > 3)
+#endif
{
SpriteConstIterator it, it_end;
for (it = begin(), it_end = end(); it != it_end; ++ it)
diff --git a/src/defaults.cpp b/src/defaults.cpp
index 16f4620d4..7c0d8148c 100644
--- a/src/defaults.cpp
+++ b/src/defaults.cpp
@@ -216,6 +216,7 @@ DefaultsData* getConfigDefaults()
AddDEF(configData, "disableBeingCaching", false);
AddDEF(configData, "enableReorderSprites", true);
AddDEF(configData, "showip", false);
+ AddDEF(configData, "seflMouseHeal", true);
return configData;
}
diff --git a/src/game.cpp b/src/game.cpp
index 82f919976..5a372a6bd 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -26,19 +26,19 @@
#include "actorspritemanager.h"
#include "actorsprite.h"
+#include "auctionmanager.h"
#include "being.h"
#include "channelmanager.h"
#include "client.h"
#include "commandhandler.h"
#include "configuration.h"
+#include "dropshortcut.h"
#include "effectmanager.h"
-#include "event.h"
-#include "spellmanager.h"
#include "emoteshortcut.h"
+#include "event.h"
+#include "guildmanager.h"
#include "graphics.h"
#include "itemshortcut.h"
-#include "dropshortcut.h"
-#include "spellshortcut.h"
#include "joystick.h"
#include "keyboardconfig.h"
#include "localplayer.h"
@@ -47,6 +47,8 @@
#include "particle.h"
#include "playerrelations.h"
#include "sound.h"
+#include "spellmanager.h"
+#include "spellshortcut.h"
#include "gui/botcheckerwindow.h"
#include "gui/buyselldialog.h"
@@ -156,6 +158,8 @@ Particle *particleEngine = NULL;
EffectManager *effectManager = NULL;
SpellManager *spellManager = NULL;
Viewport *viewport = NULL; /**< Viewport on the map. */
+GuildManager *guildManager = NULL;
+AuctionManager *auctionManager = NULL;
ChatTab *localChatTab = NULL;
ChatTab *debugChatTab = NULL;
@@ -175,6 +179,8 @@ static void initEngines()
commandHandler = new CommandHandler;
channelManager = new ChannelManager;
effectManager = new EffectManager;
+ AuctionManager::init();
+ GuildManager::init();
particleEngine = new Particle(NULL);
particleEngine->setupEngine();
@@ -295,6 +301,12 @@ static void destroyGuiWindows()
if (whoIsOnline)
whoIsOnline->setAllowUpdate(false);
+ if (auctionManager)
+ auctionManager->clear();
+
+ if (guildManager)
+ guildManager->clear();
+
del_0(windowMenu);
del_0(localChatTab) // Need to do this first, so it can remove itself
del_0(debugChatTab)
@@ -327,6 +339,12 @@ static void destroyGuiWindows()
del_0(didYouKnowWindow);
Mana::Event::trigger(CHANNEL_GAME, Mana::Event(EVENT_GUIWINDOWSUNLOADED));
+
+ if (auctionManager && AuctionManager::getEnableAuctionBot())
+ auctionManager->reload();
+
+ if (guildManager && GuildManager::getEnableGuildBot())
+ guildManager->reload();
}
Game *Game::mInstance = 0;
@@ -393,6 +411,9 @@ Game::Game():
setupWindow->setInGame(true);
clearKeysArray();
+ if (guildManager && GuildManager::getEnableGuildBot())
+ guildManager->requestGuildInfo();
+
Mana::Event::trigger(CHANNEL_GAME, Mana::Event(EVENT_CONSTRUCTED));
}
@@ -413,14 +434,16 @@ Game::~Game()
del_0(player_node)
del_0(channelManager)
del_0(commandHandler)
- del_0(effectManager);
+ del_0(effectManager)
del_0(joystick)
del_0(particleEngine)
del_0(viewport)
del_0(mCurrentMap)
- del_0(spellManager);
- del_0(spellShortcut);
- del_0(mumbleManager);
+ del_0(spellManager)
+ del_0(spellShortcut)
+ del_0(auctionManager)
+ del_0(guildManager)
+ del_0(mumbleManager)
Being::clearCache();
diff --git a/src/graphics.cpp b/src/graphics.cpp
index c5dc38b72..abd7341e2 100644
--- a/src/graphics.cpp
+++ b/src/graphics.cpp
@@ -20,8 +20,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <cassert>
-
#include "graphics.h"
#include "graphicsvertexes.h"
diff --git a/src/gui/botcheckerwindow.cpp b/src/gui/botcheckerwindow.cpp
index 2851d3d1d..7c0339ead 100644
--- a/src/gui/botcheckerwindow.cpp
+++ b/src/gui/botcheckerwindow.cpp
@@ -290,7 +290,6 @@ BotCheckerWindow::BotCheckerWindow():
}
mPlayerTitleTable = new GuiTable(mPlayerTableTitleModel);
- //mPlayerTitleTable->setBackgroundColor(gcn::Color(0xbf, 0xbf, 0xbf));
mPlayerTitleTable->setHeight(1);
mPlayerTableTitleModel->set(0, 0, new Label(_("Name")));
@@ -303,6 +302,7 @@ BotCheckerWindow::BotCheckerWindow():
setWindowName("BotCheckerWindow");
setCloseButton(true);
+ setStickyButtonLock(true);
setDefaultSize(w, h, ImageRect::CENTER);
playersScrollArea = new ScrollArea(mTable);
diff --git a/src/gui/buydialog.cpp b/src/gui/buydialog.cpp
index 04dd425c1..8c1ad62ce 100644
--- a/src/gui/buydialog.cpp
+++ b/src/gui/buydialog.cpp
@@ -72,6 +72,7 @@ void BuyDialog::init()
setWindowName("Buy");
setResizable(true);
setCloseButton(true);
+ setStickyButtonLock(true);
setMinWidth(260);
setMinHeight(230);
setDefaultSize(260, 230, ImageRect::CENTER);
diff --git a/src/gui/charcreatedialog.cpp b/src/gui/charcreatedialog.cpp
index 91c284985..d1773e7f3 100644
--- a/src/gui/charcreatedialog.cpp
+++ b/src/gui/charcreatedialog.cpp
@@ -60,6 +60,9 @@ CharCreateDialog::CharCreateDialog(CharSelectDialog *parent, int slot):
mRace(0),
mSlot(slot)
{
+ setStickyButtonLock(true);
+ setSticky(true);
+
mPlayer = new Being(0, ActorSprite::PLAYER, mRace, NULL);
mPlayer->setGender(GENDER_MALE);
diff --git a/src/gui/charselectdialog.cpp b/src/gui/charselectdialog.cpp
index 28c7a083c..1942ebaeb 100644
--- a/src/gui/charselectdialog.cpp
+++ b/src/gui/charselectdialog.cpp
@@ -60,7 +60,6 @@
#include <guichan/font.hpp>
#include <string>
-#include <cassert>
#include "debug.h"
@@ -342,8 +341,8 @@ void CharSelectDialog::setCharacters(const Net::Characters &characters)
void CharSelectDialog::lock()
{
- assert(!mLocked);
- setLocked(true);
+ if (!mLocked)
+ setLocked(true);
}
void CharSelectDialog::unlock()
diff --git a/src/gui/chatwindow.cpp b/src/gui/chatwindow.cpp
index 1ef3139db..784fb812a 100644
--- a/src/gui/chatwindow.cpp
+++ b/src/gui/chatwindow.cpp
@@ -167,6 +167,8 @@ ChatWindow::ChatWindow():
setResizable(true);
setDefaultVisible(true);
setSaveVisible(true);
+ setStickyButtonLock(true);
+
setDefaultSize(600, 123, ImageRect::LOWER_LEFT);
setMinWidth(150);
setMinHeight(90);
@@ -211,6 +213,7 @@ ChatWindow::ChatWindow():
fillCommands();
initTradeFilter();
loadCustomList();
+ parseHighlights();
}
ChatWindow::~ChatWindow()
@@ -659,7 +662,7 @@ void ChatWindow::mouseDragged(gcn::MouseEvent &event)
if (event.isConsumed())
return;
- if (isMovable() && mMoved)
+ if (canMove() && isMovable() && mMoved)
{
int newX = std::max(0, getX() + event.getX() - mDragOffsetX);
int newY = std::max(0, getY() + event.getY() - mDragOffsetY);
@@ -1458,12 +1461,8 @@ void ChatWindow::saveState()
std::string ChatWindow::doReplace(const std::string &msg)
{
- if (Client::getServerName() == "server.themanaworld.org"
- || Client::getServerName() == "themanaworld.org"
- || Client::getServerName() == "81.161.192.4")
- {
+ if (Client::isTmw())
return msg;
- }
std::string str = msg;
replaceSpecialChars(str);
@@ -1503,7 +1502,7 @@ void ChatWindow::addToAwayLog(std::string line)
if (mAwayLog.size() > 20)
mAwayLog.pop_front();
- if (line.find(player_node->getName()) != std::string::npos)
+ if (findI(line, mHighlights) != std::string::npos)
mAwayLog.push_back("##9away:" + line);
}
@@ -1520,3 +1519,20 @@ void ChatWindow::displayAwayLog()
++i;
}
}
+
+void ChatWindow::parseHighlights()
+{
+ mHighlights.clear();
+ if (!player_node)
+ return;
+
+ splitToStringVector(mHighlights, config.getStringValue(
+ "highlightWords"), ',');
+
+ mHighlights.push_back(player_node->getName());
+}
+
+bool ChatWindow::findHighlight(std::string &str)
+{
+ return findI(str, mHighlights) != std::string::npos;
+} \ No newline at end of file
diff --git a/src/gui/chatwindow.h b/src/gui/chatwindow.h
index b6a37ef79..6e1d548a3 100644
--- a/src/gui/chatwindow.h
+++ b/src/gui/chatwindow.h
@@ -260,6 +260,10 @@ class ChatWindow : public Window,
void clearAwayLog()
{ mAwayLog.clear(); }
+ void parseHighlights();
+
+ bool findHighlight(std::string &str);
+
protected:
friend class ChatTab;
friend class WhisperTab;
@@ -329,6 +333,7 @@ class ChatWindow : public Window,
int mChatColor;
unsigned int mChatHistoryIndex;
std::list<std::string> mAwayLog;
+ std::vector<std::string> mHighlights;
};
extern ChatWindow *chatWindow;
diff --git a/src/gui/debugwindow.cpp b/src/gui/debugwindow.cpp
index 0b84dda1e..dc540a782 100644
--- a/src/gui/debugwindow.cpp
+++ b/src/gui/debugwindow.cpp
@@ -60,6 +60,8 @@ DebugWindow::DebugWindow():
setResizable(true);
setCloseButton(true);
setSaveVisible(true);
+ setStickyButtonLock(true);
+
setDefaultSize(400, 150, ImageRect::CENTER);
mTabs = new TabbedArea;
diff --git a/src/gui/didyouknowwindow.cpp b/src/gui/didyouknowwindow.cpp
index 4d89bd924..d62417fc4 100644
--- a/src/gui/didyouknowwindow.cpp
+++ b/src/gui/didyouknowwindow.cpp
@@ -51,6 +51,8 @@ DidYouKnowWindow::DidYouKnowWindow():
setContentSize(455, 350);
setWindowName("DidYouKnow");
setResizable(true);
+ setStickyButtonLock(true);
+
setupWindow->registerWindowForReset(this);
setDefaultSize(500, 400, ImageRect::CENTER);
diff --git a/src/gui/equipmentwindow.cpp b/src/gui/equipmentwindow.cpp
index 67ec78e49..0375d096f 100644
--- a/src/gui/equipmentwindow.cpp
+++ b/src/gui/equipmentwindow.cpp
@@ -80,6 +80,8 @@ EquipmentWindow::EquipmentWindow(Equipment *equipment, Being *being,
setCloseButton(true);
setSaveVisible(true);
+ setStickyButtonLock(true);
+
setDefaultSize(180, 345, ImageRect::CENTER);
mBoxes.reserve(13);
@@ -99,6 +101,9 @@ EquipmentWindow::EquipmentWindow(Equipment *equipment, Being *being,
add(mPlayerBox);
add(mUnequip);
+ mHighlightColor = Theme::getThemeColor(Theme::HIGHLIGHT);
+ mBorderColor = Theme::getThemeColor(Theme::BORDER);
+ setForegroundColor(Theme::getThemeColor(Theme::TEXT));
}
EquipmentWindow::~EquipmentWindow()
@@ -138,16 +143,15 @@ void EquipmentWindow::draw(gcn::Graphics *graphics)
continue;
if (i == mSelected)
{
- const gcn::Color color = Theme::getThemeColor(Theme::HIGHLIGHT);
-
+ mHighlightColor.a = getGuiAlpha();
// Set color to the highlight color
- g->setColor(gcn::Color(color.r, color.g, color.b, getGuiAlpha()));
+ g->setColor(mHighlightColor);
g->fillRectangle(gcn::Rectangle(box->first,
box->second, BOX_WIDTH, BOX_HEIGHT));
}
// Set color black
- g->setColor(gcn::Color(0, 0, 0));
+ g->setColor(mBorderColor);
// Draw box border
g->drawRectangle(gcn::Rectangle(box->first, box->second,
BOX_WIDTH, BOX_HEIGHT));
@@ -167,7 +171,7 @@ void EquipmentWindow::draw(gcn::Graphics *graphics)
g->drawImage(image, box->first + 2, box->second + 2);
if (i == EQUIP_PROJECTILE_SLOT)
{
- g->setColor(Theme::getThemeColor(Theme::TEXT));
+ g->setColor(getForegroundColor());
graphics->drawText(toString(item->getQuantity()),
box->first + (BOX_WIDTH / 2),
box->second - fontHeight,
diff --git a/src/gui/equipmentwindow.h b/src/gui/equipmentwindow.h
index c59600dd8..cadf27620 100644
--- a/src/gui/equipmentwindow.h
+++ b/src/gui/equipmentwindow.h
@@ -116,6 +116,8 @@ class EquipmentWindow : public Window, public gcn::ActionListener
bool mForing;
Being *mBeing;
std::vector<std::pair<int, int>*> mBoxes;
+ gcn::Color mHighlightColor;
+ gcn::Color mBorderColor;
};
extern EquipmentWindow *equipmentWindow;
diff --git a/src/gui/helpwindow.cpp b/src/gui/helpwindow.cpp
index 368049389..b772ea36a 100644
--- a/src/gui/helpwindow.cpp
+++ b/src/gui/helpwindow.cpp
@@ -47,6 +47,8 @@ HelpWindow::HelpWindow():
setContentSize(455, 350);
setWindowName("Help");
setResizable(true);
+ setStickyButtonLock(true);
+
setupWindow->registerWindowForReset(this);
setDefaultSize(500, 400, ImageRect::CENTER);
diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index 3b7b7b273..d0454c4e1 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -89,6 +89,7 @@ InventoryWindow::InventoryWindow(Inventory *inventory):
setResizable(true);
setCloseButton(true);
setSaveVisible(true);
+ setStickyButtonLock(true);
setDefaultSize(387, 307, ImageRect::CENTER);
setMinWidth(316);
diff --git a/src/gui/itemamountwindow.cpp b/src/gui/itemamountwindow.cpp
index a3f591634..059f3d785 100644
--- a/src/gui/itemamountwindow.cpp
+++ b/src/gui/itemamountwindow.cpp
@@ -63,7 +63,7 @@ public:
if (i->first < 0)
continue;
- ItemInfo info = (*i->second);
+ const ItemInfo &info = (*i->second);
std::string name = info.getName();
if (name != "unnamed" && !info.getName().empty()
&& info.getName() != "unnamed")
diff --git a/src/gui/itempopup.cpp b/src/gui/itempopup.cpp
index f5117ed5a..4d401a627 100644
--- a/src/gui/itempopup.cpp
+++ b/src/gui/itempopup.cpp
@@ -32,6 +32,7 @@
#include "gui/theme.h"
#include "gui/widgets/icon.h"
+#include "gui/widgets/label.h"
#include "gui/widgets/textbox.h"
#include "utils/gettext.h"
@@ -54,7 +55,7 @@ ItemPopup::ItemPopup():
mLastColor(1)
{
// Item Name
- mItemName = new gcn::Label;
+ mItemName = new Label;
mItemName->setFont(boldFont);
mItemName->setPosition(getPadding(), getPadding());
diff --git a/src/gui/killstats.cpp b/src/gui/killstats.cpp
index 05a265da7..b9ce7c2a7 100644
--- a/src/gui/killstats.cpp
+++ b/src/gui/killstats.cpp
@@ -55,6 +55,7 @@ KillStats::KillStats():
setWindowName("Kill stats");
setCloseButton(true);
setResizable(true);
+ setStickyButtonLock(true);
setDefaultSize(250, 250, 350, 300);
listen(Mana::CHANNEL_ATTRIBUTES);
diff --git a/src/gui/minimap.cpp b/src/gui/minimap.cpp
index c735eec82..c3a4417f6 100644
--- a/src/gui/minimap.cpp
+++ b/src/gui/minimap.cpp
@@ -29,6 +29,7 @@
#include "localplayer.h"
#include "logger.h"
#include "map.h"
+#include "party.h"
#include "gui/userpalette.h"
#include "gui/setup.h"
@@ -275,9 +276,10 @@ void Minimap::draw(gcn::Graphics *graphics)
{
type = UserPalette::GM;
}
- else if (being->isInParty())
+ else if (being->getGuild() == player_node->getGuild()
+ || being->getGuildName() == player_node->getGuildName())
{
- type = UserPalette::PARTY;
+ type = UserPalette::GUILD;
}
else if (being)
{
@@ -317,6 +319,49 @@ void Minimap::draw(gcn::Graphics *graphics)
dotSize, dotSize));
}
+ if (player_node->isInParty())
+ {
+ Party *party = player_node->getParty();
+ if (party)
+ {
+ PartyMember *m = party->getMember(player_node->getName());
+ Party::MemberList *members = party->getMembers();
+ if (m && members)
+ {
+ const std::string curMap = m->getMap();
+ Party::MemberList::const_iterator it = members->begin();
+ const Party::MemberList::const_iterator
+ it_end = members->end();
+ while (it != it_end)
+ {
+ PartyMember *member = *it;
+ if (member && member->getMap() == curMap
+ && member->getOnline() && member != m)
+ {
+ if (userPalette)
+ {
+ graphics->setColor(userPalette->getColor(
+ UserPalette::PARTY));
+ }
+
+ const int offsetHeight = static_cast<int>(
+ mHeightProportion);
+ const int offsetWidth = static_cast<int>(
+ mWidthProportion);
+
+ graphics->fillRectangle(gcn::Rectangle(
+ static_cast<int>(member->getX()
+ * mWidthProportion) + mapOriginX - offsetWidth,
+ static_cast<int>(member->getY()
+ * mHeightProportion) + mapOriginY - offsetHeight,
+ 2, 2));
+ }
+ ++ it;
+ }
+ }
+ }
+ }
+
const Vector &pos = player_node->getPosition();
// logger->log("width:" + toString(graph->getWidth()));
diff --git a/src/gui/npcdialog.cpp b/src/gui/npcdialog.cpp
index 36677446d..0db618d69 100644
--- a/src/gui/npcdialog.cpp
+++ b/src/gui/npcdialog.cpp
@@ -69,6 +69,7 @@ NpcDialog::NpcDialog(int npcId)
setResizable(true);
//setupWindow->registerWindowForReset(this);
setFocusable(true);
+ setStickyButtonLock(true);
setMinWidth(200);
setMinHeight(150);
diff --git a/src/gui/outfitwindow.cpp b/src/gui/outfitwindow.cpp
index 09e75856f..9601e3ca5 100644
--- a/src/gui/outfitwindow.cpp
+++ b/src/gui/outfitwindow.cpp
@@ -32,6 +32,7 @@
#include "playerinfo.h"
#include "gui/chatwindow.h"
+#include "gui/theme.h"
#include "gui/viewport.h"
#include "gui/widgets/button.h"
@@ -71,11 +72,14 @@ OutfitWindow::OutfitWindow():
setWindowName("Outfits");
setResizable(true);
setCloseButton(true);
+ setStickyButtonLock(true);
+
setDefaultSize(250, 400, 150, 230);
setMinWidth(145);
setMinHeight(220);
- addMouseListener(this);
+ mBorderColor = Theme::getThemeColor(Theme::BORDER, 64);
+ mBackgroundColor = Theme::getThemeColor(Theme::BACKGROUND, 32);
mPreviousButton = new Button(_("<"), "previous", this);
mNextButton = new Button(_(">"), "next", this);
@@ -303,9 +307,9 @@ void OutfitWindow::draw(gcn::Graphics *graphics)
const int itemX = 10 + ((i % mGridWidth) * mBoxWidth);
const int itemY = 25 + ((i / mGridWidth) * mBoxHeight);
- graphics->setColor(gcn::Color(0, 0, 0, 64));
+ graphics->setColor(mBorderColor);
graphics->drawRectangle(gcn::Rectangle(itemX, itemY, 32, 32));
- graphics->setColor(gcn::Color(255, 255, 255, 32));
+ graphics->setColor(mBackgroundColor);
graphics->fillRectangle(gcn::Rectangle(itemX, itemY, 32, 32));
if (mItems[mCurrentOutfit][i] < 0)
diff --git a/src/gui/outfitwindow.h b/src/gui/outfitwindow.h
index 60634dbdd..8dd5fd6a3 100644
--- a/src/gui/outfitwindow.h
+++ b/src/gui/outfitwindow.h
@@ -137,6 +137,8 @@ class OutfitWindow : public Window, gcn::ActionListener
int mAwayOutfit;
Image *mBackgroundImg;
+ gcn::Color mBorderColor;
+ gcn::Color mBackgroundColor;
static float mAlpha;
};
diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp
index eefa83500..0eac0a4f9 100644
--- a/src/gui/popupmenu.cpp
+++ b/src/gui/popupmenu.cpp
@@ -27,6 +27,7 @@
#include "being.h"
#include "dropshortcut.h"
#include "guild.h"
+#include "guildmanager.h"
#include "flooritem.h"
#include "graphics.h"
#include "item.h"
@@ -77,8 +78,6 @@
#include "utils/gettext.h"
#include "utils/stringutils.h"
-#include <cassert>
-
#include "debug.h"
std::string tradePartnerName("");
@@ -224,14 +223,33 @@ void PopupMenu::showPopup(int x, int y, Being *being)
{
mBrowserBox->addRow(strprintf(
"@@guild-kick|%s@@", _("Kick from guild")));
- mBrowserBox->addRow(strprintf("@@guild-pos|%s >@@",
+ if (guild2->getServerGuild())
+ {
+ mBrowserBox->addRow(strprintf(
+ "@@guild-pos|%s >@@",
+ _("Change pos in guild")));
+ }
+ }
+ }
+ else if (guild2->getMember(mNick))
+ {
+ mBrowserBox->addRow(strprintf(
+ "@@guild-kick|%s@@", _("Kick from guild")));
+ if (guild2->getServerGuild())
+ {
+ mBrowserBox->addRow(strprintf(
+ "@@guild-pos|%s >@@",
_("Change pos in guild")));
}
}
else
{
- mBrowserBox->addRow(strprintf(
- "@@guild|%s@@", _("Invite to guild")));
+ if (guild2->getServerGuild()
+ || (guildManager && guildManager->havePower()))
+ {
+ mBrowserBox->addRow(strprintf(
+ "@@guild|%s@@", _("Invite to guild")));
+ }
}
}
@@ -435,15 +453,26 @@ void PopupMenu::showPlayerPopup(int x, int y, std::string nick)
{
if (guild2->getMember(mNick))
{
- mBrowserBox->addRow(strprintf(
- "@@guild-kick|%s@@", _("Kick from guild")));
- mBrowserBox->addRow(strprintf(
- "@@guild-pos|%s >@@", _("Change pos in guild")));
+ if (guild2->getServerGuild() || (guildManager
+ && guildManager->havePower()))
+ {
+ mBrowserBox->addRow(strprintf(
+ "@@guild-kick|%s@@", _("Kick from guild")));
+ }
+ if (guild2->getServerGuild())
+ {
+ mBrowserBox->addRow(strprintf(
+ "@@guild-pos|%s >@@", _("Change pos in guild")));
+ }
}
else
{
- mBrowserBox->addRow(strprintf(
- "@@guild|%s@@", _("Invite to guild")));
+ if (guild2->getServerGuild() || (guildManager
+ && guildManager->havePower()))
+ {
+ mBrowserBox->addRow(strprintf(
+ "@@guild|%s@@", _("Invite to guild")));
+ }
}
}
@@ -574,7 +603,7 @@ void PopupMenu::showChatPopup(int x, int y, ChatTab *tab)
if (tab->getRemoveNames())
{
mBrowserBox->addRow(strprintf("@@dont remove name|%s@@",
- _("Dont remove name")));
+ _("Don't remove name")));
}
else
{
@@ -725,16 +754,27 @@ void PopupMenu::showChatPopup(int x, int y, ChatTab *tab)
{
if (guild1->getId() == guild2->getId())
{
- mBrowserBox->addRow(strprintf(
- "@@guild-kick|%s@@", _("Kick from guild")));
- mBrowserBox->addRow(strprintf(
- "@@guild-pos|%s >@@", _("Change pos in guild")));
+ if (guild2->getServerGuild() || (guildManager
+ && guildManager->havePower()))
+ {
+ mBrowserBox->addRow(strprintf(
+ "@@guild-kick|%s@@", _("Kick from guild")));
+ }
+ if (guild2->getServerGuild())
+ {
+ mBrowserBox->addRow(strprintf("@@guild-pos|%s >@@",
+ _("Change pos in guild")));
+ }
}
}
else
{
- mBrowserBox->addRow(strprintf(
- "@@guild|%s@@", _("Invite to guild")));
+ if (guild2->getServerGuild() || (guildManager
+ && guildManager->havePower()))
+ {
+ mBrowserBox->addRow(strprintf(
+ "@@guild|%s@@", _("Invite to guild")));
+ }
}
}
}
@@ -897,7 +937,12 @@ void PopupMenu::handleLink(const std::string &link,
{
const Guild *guild = player_node->getGuild();
if (guild)
- Net::getGuildHandler()->invite(guild->getId(), mNick);
+ {
+ if (guild->getServerGuild())
+ Net::getGuildHandler()->invite(guild->getId(), mNick);
+ else if (guildManager)
+ guildManager->invite(mNick);
+ }
}
}
else if (link == "nuke" && being)
@@ -1263,7 +1308,12 @@ void PopupMenu::handleLink(const std::string &link,
{
const Guild *guild = player_node->getGuild();
if (guild)
- Net::getGuildHandler()->kick(guild->getMember(mNick));
+ {
+ if (guild->getServerGuild())
+ Net::getGuildHandler()->kick(guild->getMember(mNick));
+ else if (guildManager)
+ guildManager->kick(mNick);
+ }
}
}
else if (link == "enable highlight" && mTab)
diff --git a/src/gui/quitdialog.cpp b/src/gui/quitdialog.cpp
index f66872b5d..04f43fb88 100644
--- a/src/gui/quitdialog.cpp
+++ b/src/gui/quitdialog.cpp
@@ -41,23 +41,17 @@
#include "utils/gettext.h"
-#include <assert.h>
-
#include "debug.h"
QuitDialog::QuitDialog(QuitDialog** pointerToMe):
Window(_("Quit"), true, NULL), mMyPointer(pointerToMe)
{
-// int width = 200;
-// int height = 120;
-
mForceQuit = new RadioButton(_("Quit"), "quitdialog");
mLogoutQuit = new RadioButton(_("Quit"), "quitdialog");
mSwitchAccountServer = new RadioButton(_("Switch server"), "quitdialog");
mSwitchCharacter = new RadioButton(_("Switch character"), "quitdialog");
mOkButton = new Button(_("OK"), "ok", this);
mCancelButton = new Button(_("Cancel"), "cancel", this);
-// setContentSize(width, height);
addKeyListener(this);
@@ -149,10 +143,11 @@ void QuitDialog::action(const gcn::ActionEvent &event)
}
else if (mSwitchCharacter->isSelected())
{
- assert(Client::getState() == STATE_GAME);
-
- Net::getCharHandler()->switchCharacter();
- Client::closeDialogs();
+ if (Client::getState() == STATE_GAME)
+ {
+ Net::getCharHandler()->switchCharacter();
+ Client::closeDialogs();
+ }
}
}
scheduleDelete();
diff --git a/src/gui/selldialog.cpp b/src/gui/selldialog.cpp
index cf9bfb667..d9030e3fb 100644
--- a/src/gui/selldialog.cpp
+++ b/src/gui/selldialog.cpp
@@ -69,6 +69,7 @@ void SellDialog::init()
//setupWindow->registerWindowForReset(this);
setResizable(true);
setCloseButton(true);
+ setStickyButtonLock(true);
setMinWidth(260);
setMinHeight(230);
setDefaultSize(260, 230, ImageRect::CENTER);
diff --git a/src/gui/serverdialog.cpp b/src/gui/serverdialog.cpp
index 143d3e5a3..763c190d6 100644
--- a/src/gui/serverdialog.cpp
+++ b/src/gui/serverdialog.cpp
@@ -158,6 +158,10 @@ public:
ServersListBox(ServersListModel *model):
ListBox(model)
{
+ mHighlightColor = Theme::getThemeColor(Theme::HIGHLIGHT);
+ mTextColor = Theme::getThemeColor(Theme::TEXT);
+ mNotSupportedColor = Theme::getThemeColor(
+ Theme::SERVER_VERSION_NOT_SUPPORTED);
}
void draw(gcn::Graphics *graphics)
@@ -169,20 +173,18 @@ public:
updateAlpha();
- graphics->setColor(Theme::getThemeColor(Theme::HIGHLIGHT,
- static_cast<int>(mAlpha * 255.0f)));
+ mHighlightColor.a = static_cast<int>(mAlpha * 255.0f);
+ graphics->setColor(mHighlightColor);
graphics->setFont(getFont());
const int height = getRowHeight();
- const gcn::Color unsupported =
- Theme::getThemeColor(Theme::SERVER_VERSION_NOT_SUPPORTED,
- static_cast<int>(mAlpha * 255.0f));
+ mNotSupportedColor.a = static_cast<int>(mAlpha * 255.0f);
// Draw filled rectangle around the selected list element
if (mSelected >= 0)
{
- graphics->fillRectangle(gcn::Rectangle(0, height * mSelected,
- getWidth(), height));
+ graphics->fillRectangle(gcn::Rectangle(0,
+ height * mSelected, getWidth(), height));
}
// Draw the list elements
@@ -191,7 +193,7 @@ public:
{
ServerInfo info = model->getServer(i);
- graphics->setColor(Theme::getThemeColor(Theme::TEXT));
+ graphics->setColor(mTextColor);
int top;
@@ -212,7 +214,7 @@ public:
if (info.version.first > 0)
{
- graphics->setColor(unsupported);
+ graphics->setColor(mNotSupportedColor);
graphics->drawText(info.version.second,
getWidth() - info.version.first - 2, top);
@@ -224,6 +226,10 @@ public:
{
return 2 * getFont()->getHeight();
}
+private:
+ gcn::Color mHighlightColor;
+ gcn::Color mTextColor;
+ gcn::Color mNotSupportedColor;
};
diff --git a/src/gui/setup.cpp b/src/gui/setup.cpp
index 690871189..76e3936c2 100644
--- a/src/gui/setup.cpp
+++ b/src/gui/setup.cpp
@@ -55,6 +55,7 @@ Setup::Setup():
{
setCloseButton(true);
setResizable(true);
+ setStickyButtonLock(true);
int width = 620;
int height = 450;
diff --git a/src/gui/setup_chat.cpp b/src/gui/setup_chat.cpp
index 722a3f8b2..9e75b9c0a 100644
--- a/src/gui/setup_chat.cpp
+++ b/src/gui/setup_chat.cpp
@@ -120,6 +120,11 @@ Setup_Chat::Setup_Chat()
new SetupItemCheckBox(_("Use local time"), "",
"useLocalTime", this, "useLocalTimeEvent");
+ new SetupItemLabel(_("Other"), "", this);
+
+ new SetupItemTextField(_("Highlight words (separated by comma)"), "",
+ "highlightWords", this, "highlightWordsEvent");
+
setDimension(gcn::Rectangle(0, 0, 550, 350));
}
@@ -128,5 +133,8 @@ void Setup_Chat::apply()
SetupTabScroll::apply();
if (chatWindow)
+ {
chatWindow->adjustTabSize();
+ chatWindow->parseHighlights();
+ }
}
diff --git a/src/gui/setup_other.cpp b/src/gui/setup_other.cpp
index b405f5045..1cad4c594 100644
--- a/src/gui/setup_other.cpp
+++ b/src/gui/setup_other.cpp
@@ -145,6 +145,15 @@ Setup_Other::Setup_Other()
this, "logNpcInGuiEvent");
+ new SetupItemLabel(_("Bots support"), "", this);
+
+ new SetupItemCheckBox(_("Enable auction bot support"), "",
+ "enableAuctionBot", this, "enableAuctionBotEvent", false);
+
+ new SetupItemCheckBox(_("Enable guild bot support and disable native "
+ "guild support"), "", "enableGuildBot", this,
+ "enableGuildBotEvent", false);
+
new SetupItemLabel(_("Other"), "", this);
new SetupItemCheckBox(_("Enable server side attack"), "",
diff --git a/src/gui/setup_players.cpp b/src/gui/setup_players.cpp
index 78c77f6f1..670fc3635 100644
--- a/src/gui/setup_players.cpp
+++ b/src/gui/setup_players.cpp
@@ -78,6 +78,9 @@ Setup_Players::Setup_Players()
new SetupItemCheckBox(_("Show ip addresses on screenshots"), "",
"showip", this, "showipEvent");
+ new SetupItemCheckBox(_("Allow self heal with mouse click"), "",
+ "selfMouseHeal", this, "selfMouseHealEvent");
+
setDimension(gcn::Rectangle(0, 0, 550, 350));
}
diff --git a/src/gui/shopwindow.cpp b/src/gui/shopwindow.cpp
index 4311a04d2..9aaf88bf3 100644
--- a/src/gui/shopwindow.cpp
+++ b/src/gui/shopwindow.cpp
@@ -40,6 +40,7 @@
#include "gui/widgets/tradetab.h"
#include "actorspritemanager.h"
+#include "auctionmanager.h"
#include "configuration.h"
#include "confirmdialog.h"
#include "inventory.h"
@@ -85,6 +86,7 @@ ShopWindow::ShopWindow():
setWindowName("Personal Shop");
setResizable(true);
setCloseButton(true);
+ setStickyButtonLock(true);
setMinWidth(260);
setMinHeight(230);
setDefaultSize(380, 300, ImageRect::CENTER);
@@ -141,6 +143,19 @@ ShopWindow::ShopWindow():
place(0, 7, mAnnounceLinks, 8);
place(15, 7, mCloseButton);
+ if (auctionManager && auctionManager->getEnableAuctionBot())
+ {
+ mBuyAuctionButton = new Button(_("Auction"), "auction buy", this);
+ mSellAuctionButton = new Button(_("Auction"), "auction sell", this);
+ place(4, 6, mBuyAuctionButton);
+ place(12, 6, mSellAuctionButton);
+ }
+ else
+ {
+ mBuyAuctionButton = 0;
+ mSellAuctionButton = 0;
+ }
+
Layout &layout = getLayout();
layout.setRowHeight(0, Layout::AUTO_SET);
@@ -207,6 +222,16 @@ void ShopWindow::action(const gcn::ActionEvent &event)
{
announce(mSellShopItems, SELL);
}
+ else if (event.getId() == "auction buy" && mBuyShopItems
+ && mBuyShopItems->getNumberOfElements() > 0)
+ {
+ Net::getChatHandler()->privateMessage("AuctionBot", "!pull4144 seek");
+ }
+ else if (event.getId() == "auction sell" && mSellShopItems
+ && mSellShopItems->getNumberOfElements() > 0)
+ {
+ Net::getChatHandler()->privateMessage("AuctionBot", "!pull4144 offer");
+ }
if (mSelectedItem < 1)
return;
diff --git a/src/gui/shopwindow.h b/src/gui/shopwindow.h
index e3fd9a5ca..8b170f31e 100644
--- a/src/gui/shopwindow.h
+++ b/src/gui/shopwindow.h
@@ -151,9 +151,11 @@ class ShopWindow : public Window, public gcn::ActionListener,
gcn::Button *mBuyAddButton;
gcn::Button *mBuyDeleteButton;
gcn::Button *mBuyAnnounceButton;
+ gcn::Button *mBuyAuctionButton;
gcn::Button *mSellAddButton;
gcn::Button *mSellDeleteButton;
gcn::Button *mSellAnnounceButton;
+ gcn::Button *mSellAuctionButton;
gcn::CheckBox *mAnnounceLinks;
ShopItems *mBuyShopItems;
diff --git a/src/gui/skilldialog.cpp b/src/gui/skilldialog.cpp
index 896f06cab..bf87e804d 100644
--- a/src/gui/skilldialog.cpp
+++ b/src/gui/skilldialog.cpp
@@ -152,7 +152,9 @@ public:
SkillListBox(SkillModel *model):
ListBox(model),
mModel(model),
- mPopup(new TextPopup())
+ mPopup(new TextPopup()),
+ mHighlightColor(Theme::getThemeColor(Theme::HIGHLIGHT)),
+ mTextColor(Theme::getThemeColor(Theme::TEXT))
{
}
@@ -187,8 +189,8 @@ public:
Graphics *graphics = static_cast<Graphics*>(gcnGraphics);
- graphics->setColor(Theme::getThemeColor(Theme::HIGHLIGHT,
- static_cast<int>(mAlpha * 255.0f)));
+ mHighlightColor.a = static_cast<int>(mAlpha * 255.0f);
+ graphics->setColor(mHighlightColor);
graphics->setFont(getFont());
// Draw filled rectangle around the selected list element
@@ -199,7 +201,7 @@ public:
}
// Draw the list elements
- graphics->setColor(Theme::getThemeColor(Theme::TEXT));
+ graphics->setColor(mTextColor);
for (int i = 0, y = 1;
i < model->getNumberOfElements();
++i, y += getRowHeight())
@@ -239,6 +241,8 @@ public:
private:
SkillModel *mModel;
TextPopup *mPopup;
+ gcn::Color mHighlightColor;
+ gcn::Color mTextColor;
};
class SkillTab : public Tab
@@ -275,6 +279,7 @@ SkillDialog::SkillDialog():
setCloseButton(true);
setResizable(true);
setSaveVisible(true);
+ setStickyButtonLock(true);
setDefaultSize(windowContainer->getWidth() - 280, 30, 275, 425);
setupWindow->registerWindowForReset(this);
diff --git a/src/gui/socialwindow.cpp b/src/gui/socialwindow.cpp
index e3aa69b30..749f26f85 100644
--- a/src/gui/socialwindow.cpp
+++ b/src/gui/socialwindow.cpp
@@ -23,6 +23,7 @@
#include "actorspritemanager.h"
#include "guild.h"
+#include "guildmanager.h"
#include "keyboardconfig.h"
#include "localplayer.h"
#include "logger.h"
@@ -108,10 +109,10 @@ protected:
AvatarListBox *mList;
};
-class GuildTab : public SocialTab, public gcn::ActionListener
+class SocialGuildTab : public SocialTab, public gcn::ActionListener
{
public:
- GuildTab(Guild *guild):
+ SocialGuildTab(Guild *guild):
mGuild(guild)
{
setCaption(_("Guild"));
@@ -125,7 +126,7 @@ public:
mScroll->setVerticalScrollPolicy(gcn::ScrollArea::SHOW_ALWAYS);
}
- ~GuildTab()
+ ~SocialGuildTab()
{
delete mList;
mList = 0;
@@ -206,10 +207,113 @@ private:
Guild *mGuild;
};
-class PartyTab : public SocialTab, public gcn::ActionListener
+class SocialGuildTab2 : public SocialTab, public gcn::ActionListener
{
public:
- PartyTab(Party *party):
+ SocialGuildTab2(Guild *guild):
+ mGuild(guild)
+ {
+ setCaption(_("Guild"));
+
+ setTabColor(&Theme::getThemeColor(Theme::GUILD_SOCIAL_TAB));
+
+ mList = new AvatarListBox(guild);
+ mScroll = new ScrollArea(mList);
+
+ mScroll->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_AUTO);
+ mScroll->setVerticalScrollPolicy(gcn::ScrollArea::SHOW_ALWAYS);
+ }
+
+ ~SocialGuildTab2()
+ {
+ delete mList;
+ mList = 0;
+ delete mScroll;
+ mScroll = 0;
+ }
+
+ void action(const gcn::ActionEvent &event)
+ {
+/*
+ if (event.getId() == "do invite")
+ {
+ std::string name = mInviteDialog->getText();
+ Net::getGuildHandler()->invite(mGuild->getId(), name);
+
+ if (localChatTab)
+ {
+ localChatTab->chatLog(strprintf(
+ _("Invited user %s to guild %s."),
+ name.c_str(), mGuild->getName().c_str()), BY_SERVER);
+ }
+ mInviteDialog = 0;
+ }
+ else if (event.getId() == "~do invite")
+ {
+ mInviteDialog = 0;
+ }
+ else if (event.getId() == "yes")
+ {
+ Net::getGuildHandler()->leave(mGuild->getId());
+ if (localChatTab)
+ {
+ localChatTab->chatLog(strprintf(_("Guild %s quit requested."),
+ mGuild->getName().c_str()), BY_SERVER);
+ }
+ mConfirmDialog = 0;
+ }
+ else if (event.getId() == "~yes")
+ {
+ mConfirmDialog = 0;
+ }
+*/
+ }
+
+ void updateList()
+ {
+ }
+
+ void updateAvatar(std::string name A_UNUSED)
+ {
+ }
+
+ void resetDamage(std::string name A_UNUSED)
+ {
+ }
+
+protected:
+ void invite()
+ {
+/*
+ mInviteDialog = new TextDialog(_("Member Invite to Guild"),
+ strprintf(_("Who would you like to invite to guild %s?"),
+ mGuild->getName().c_str()),
+ socialWindow);
+ mInviteDialog->setActionEventId("do invite");
+ mInviteDialog->addActionListener(this);
+*/
+ }
+
+ void leave()
+ {
+/*
+ mConfirmDialog = new ConfirmDialog(_("Leave Guild?"),
+ strprintf(_("Are you sure you want to leave guild %s?"),
+ mGuild->getName().c_str()),
+ socialWindow);
+
+ mConfirmDialog->addActionListener(this);
+*/
+ }
+
+private:
+ Guild *mGuild;
+};
+
+class SocialPartyTab : public SocialTab, public gcn::ActionListener
+{
+public:
+ SocialPartyTab(Party *party):
mParty(party)
{
setCaption(_("Party"));
@@ -223,7 +327,7 @@ public:
mScroll->setVerticalScrollPolicy(gcn::ScrollArea::SHOW_ALWAYS);
}
- ~PartyTab()
+ ~SocialPartyTab()
{
delete mList;
mList = 0;
@@ -340,10 +444,10 @@ public:
std::vector<Avatar*> mMembers;
};
-class PlayersTab : public SocialTab
+class SocialPlayersTab : public SocialTab
{
public:
- PlayersTab(std::string name)
+ SocialPlayersTab(std::string name)
{
mBeings = new BeingsListModal();
@@ -358,7 +462,7 @@ public:
setCaption(name);
}
- ~PlayersTab()
+ ~SocialPlayersTab()
{
delete mList;
mList = 0;
@@ -505,10 +609,10 @@ private:
};
-class NavigationTab : public SocialTab
+class SocialNavigationTab : public SocialTab
{
public:
- NavigationTab()
+ SocialNavigationTab()
{
mBeings = new BeingsListModal();
@@ -522,7 +626,7 @@ public:
}
- ~NavigationTab()
+ ~SocialNavigationTab()
{
delete mList;
mList = 0;
@@ -783,10 +887,10 @@ protected:
};
-class AttackTab : public SocialTab
+class SocialAttackTab : public SocialTab
{
public:
- AttackTab()
+ SocialAttackTab()
{
mBeings = new BeingsListModal();
@@ -799,7 +903,7 @@ public:
setCaption(_("Atk"));
}
- ~AttackTab()
+ ~SocialAttackTab()
{
delete mList;
mList = 0;
@@ -1025,6 +1129,8 @@ SocialWindow::SocialWindow() :
setResizable(true);
setSaveVisible(true);
setCloseButton(true);
+ setStickyButtonLock(true);
+
setMinWidth(120);
setMinHeight(55);
setDefaultSize(590, 200, 150, 120);
@@ -1046,15 +1152,15 @@ SocialWindow::SocialWindow() :
loadWindowState();
- mPlayers = new PlayersTab("P");
+ mPlayers = new SocialPlayersTab("P");
mTabs->addTab(mPlayers, mPlayers->mScroll);
- mNavigation = new NavigationTab();
+ mNavigation = new SocialNavigationTab();
mTabs->addTab(mNavigation, mNavigation->mScroll);
if (config.getBoolValue("enableAttackFilter"))
{
- mAttackFilter = new AttackTab();
+ mAttackFilter = new SocialAttackTab();
mTabs->addTab(mAttackFilter, mAttackFilter->mScroll);
}
else
@@ -1106,9 +1212,13 @@ bool SocialWindow::addTab(Guild *guild)
if (mGuilds.find(guild) != mGuilds.end())
return false;
- GuildTab *tab = new GuildTab(guild);
- mGuilds[guild] = tab;
+ SocialTab *tab = 0;
+ if (guild->getServerGuild())
+ tab = new SocialGuildTab(guild);
+ else
+ tab = new SocialGuildTab2(guild);
+ mGuilds[guild] = tab;
mTabs->addTab(tab, tab->mScroll);
updateButtons();
@@ -1136,7 +1246,7 @@ bool SocialWindow::addTab(Party *party)
if (mParties.find(party) != mParties.end())
return false;
- PartyTab *tab = new PartyTab(party);
+ SocialPartyTab *tab = new SocialPartyTab(party);
mParties[party] = tab;
mTabs->addTab(tab, tab->mScroll);
@@ -1203,7 +1313,10 @@ void SocialWindow::action(const gcn::ActionEvent &event)
strprintf(_("Accepted guild invite from %s."),
mPartyInviter.c_str()));
}
- Net::getGuildHandler()->inviteResponse(mGuildInvited, true);
+ if (!guildManager || !GuildManager::getEnableGuildBot())
+ Net::getGuildHandler()->inviteResponse(mGuildInvited, true);
+ else
+ guildManager->inviteResponse(true);
}
else if (eventId == "no")
{
@@ -1213,7 +1326,10 @@ void SocialWindow::action(const gcn::ActionEvent &event)
strprintf(_("Rejected guild invite from %s."),
mPartyInviter.c_str()));
}
- Net::getGuildHandler()->inviteResponse(mGuildInvited, false);
+ if (!guildManager || !GuildManager::getEnableGuildBot())
+ Net::getGuildHandler()->inviteResponse(mGuildInvited, false);
+ else
+ guildManager->inviteResponse(false);
}
mGuildInvited = 0;
@@ -1449,7 +1565,7 @@ void SocialWindow::updatePortals()
void SocialWindow::updatePortalNames()
{
if (mNavigation)
- static_cast<NavigationTab*>(mNavigation)->updateNames();
+ static_cast<SocialNavigationTab*>(mNavigation)->updateNames();
}
void SocialWindow::selectPortal(unsigned num)
@@ -1461,21 +1577,26 @@ void SocialWindow::selectPortal(unsigned num)
int SocialWindow::getPortalIndex(int x, int y)
{
if (mNavigation)
- return static_cast<NavigationTab*>(mNavigation)->getPortalIndex(x, y);
+ {
+ return static_cast<SocialNavigationTab*>(
+ mNavigation)->getPortalIndex(x, y);
+ }
else
+ {
return -1;
+ }
}
void SocialWindow::addPortal(int x, int y)
{
if (mNavigation)
- static_cast<NavigationTab*>(mNavigation)->addPortal(x, y);
+ static_cast<SocialNavigationTab*>(mNavigation)->addPortal(x, y);
}
void SocialWindow::removePortal(int x, int y)
{
if (mNavigation)
- static_cast<NavigationTab*>(mNavigation)->removePortal(x, y);
+ static_cast<SocialNavigationTab*>(mNavigation)->removePortal(x, y);
}
void SocialWindow::nextTab()
diff --git a/src/gui/specialswindow.cpp b/src/gui/specialswindow.cpp
index a5d95c7ff..702c31718 100644
--- a/src/gui/specialswindow.cpp
+++ b/src/gui/specialswindow.cpp
@@ -82,6 +82,7 @@ SpecialsWindow::SpecialsWindow():
setCloseButton(true);
setResizable(true);
setSaveVisible(true);
+ setStickyButtonLock(true);
setDefaultSize(windowContainer->getWidth() - 280, 30, 275, 425);
setupWindow->registerWindowForReset(this);
diff --git a/src/gui/spellpopup.cpp b/src/gui/spellpopup.cpp
index 86aeb2206..a918e037d 100644
--- a/src/gui/spellpopup.cpp
+++ b/src/gui/spellpopup.cpp
@@ -27,6 +27,8 @@
#include "gui/gui.h"
#include "gui/palette.h"
+#include "gui/widgets/label.h"
+
#include "textcommand.h"
#include "graphics.h"
@@ -36,7 +38,6 @@
#include "utils/stringutils.h"
#include <guichan/font.hpp>
-#include <guichan/widgets/label.hpp>
#include "debug.h"
@@ -44,7 +45,7 @@ SpellPopup::SpellPopup():
Popup("SpellPopup")
{
// Item Name
- mItemName = new gcn::Label;
+ mItemName = new Label;
mItemName->setFont(boldFont);
mItemName->setPosition(getPadding(), getPadding());
diff --git a/src/gui/statuspopup.cpp b/src/gui/statuspopup.cpp
index 08400a916..bb7a295ab 100644
--- a/src/gui/statuspopup.cpp
+++ b/src/gui/statuspopup.cpp
@@ -28,6 +28,7 @@
#include "gui/palette.h"
#include "gui/viewport.h"
+#include "gui/widgets/label.h"
#include "gui/widgets/layout.h"
#include "gui/widgets/textbox.h"
@@ -50,51 +51,51 @@ StatusPopup::StatusPopup():
const int fontHeight = getFont()->getHeight();
- mMoveType = new gcn::Label;
+ mMoveType = new Label;
mMoveType->setPosition(getPadding(), getPadding());
- mCrazyMoveType = new gcn::Label;
+ mCrazyMoveType = new Label;
mCrazyMoveType->setPosition(getPadding(), fontHeight + getPadding());
- mMoveToTargetType = new gcn::Label;
+ mMoveToTargetType = new Label;
mMoveToTargetType->setPosition(getPadding(),
2 * fontHeight + getPadding());
- mFollowMode = new gcn::Label;
+ mFollowMode = new Label;
mFollowMode->setPosition(getPadding(), 3 * fontHeight + getPadding());
- mAttackWeaponType = new gcn::Label;
+ mAttackWeaponType = new Label;
mAttackWeaponType->setPosition(getPadding(),
4 + 4 * fontHeight + getPadding());
- mAttackType = new gcn::Label;
+ mAttackType = new Label;
mAttackType->setPosition(getPadding(), 4 + 5 * fontHeight + getPadding());
- mMagicAttackType = new gcn::Label;
+ mMagicAttackType = new Label;
mMagicAttackType->setPosition(getPadding(),
4 + 6 * fontHeight + getPadding());
- mDropCounter = new gcn::Label;
+ mDropCounter = new Label;
mDropCounter->setPosition(getPadding(), 8 + 7 * fontHeight + getPadding());
- mPickUpType = new gcn::Label;
+ mPickUpType = new Label;
mPickUpType->setPosition(getPadding(), 8 + 8 * fontHeight + getPadding());
- mMapType = new gcn::Label;
+ mMapType = new Label;
mMapType->setPosition(getPadding(), 12 + 9 * fontHeight + getPadding());
- mImitationMode = new gcn::Label;
+ mImitationMode = new Label;
mImitationMode->setPosition(getPadding(),
16 + 10 * fontHeight + getPadding());
- mAwayMode = new gcn::Label;
+ mAwayMode = new Label;
mAwayMode->setPosition(getPadding(), 16 + 11 * fontHeight + getPadding());
- mCameraMode = new gcn::Label;
+ mCameraMode = new Label;
mCameraMode->setPosition(getPadding(),
16 + 12 * fontHeight + getPadding());
- mDisableGameModifiers = new gcn::Label;
+ mDisableGameModifiers = new Label;
mDisableGameModifiers->setPosition(getPadding(),
20 + 13 * fontHeight + getPadding());
diff --git a/src/gui/statuswindow.cpp b/src/gui/statuswindow.cpp
index fcc324730..d1fde2dd1 100644
--- a/src/gui/statuswindow.cpp
+++ b/src/gui/statuswindow.cpp
@@ -132,6 +132,7 @@ StatusWindow::StatusWindow():
setResizable(true);
setCloseButton(true);
setSaveVisible(true);
+ setStickyButtonLock(true);
setDefaultSize((windowContainer->getWidth() - 365) / 2,
(windowContainer->getHeight() - 255) / 2, 365, 275);
@@ -356,7 +357,7 @@ void StatusWindow::event(Mana::Channels channel A_UNUSED,
if (!lvl)
{
- // possible server broken and dont send job level,
+ // possible server broken and don't send job level,
// then we fixing it :)
if (exp.second < 20000)
{
@@ -372,7 +373,7 @@ void StatusWindow::event(Mana::Channels channel A_UNUSED,
}
if (exp.first < oldExp && exp.second >= 20000)
- { // possible job level up. but server broken and dont send
+ { // possible job level up. but server broken and don't send
// new job exp limit, we fixing it
lvl ++;
blocked = true;
@@ -889,7 +890,6 @@ void StatusWindow::updateStatusBar(ProgressBar *bar, bool percent A_UNUSED)
col.r = 100;
col.g = 100;
col.b = 100;
-// bar->setColor(new gcn::Color(100, 100, 100));
bar->setColor(col);
}
else
@@ -898,7 +898,6 @@ void StatusWindow::updateStatusBar(ProgressBar *bar, bool percent A_UNUSED)
col.r = 255;
col.g = 255;
col.b = 0;
-// bar->setColor(new gcn::Color(255, 255, 0));
bar->setColor(col);
}
}
diff --git a/src/gui/textcommandeditor.cpp b/src/gui/textcommandeditor.cpp
index 8cf9fa398..9d759c4a2 100644
--- a/src/gui/textcommandeditor.cpp
+++ b/src/gui/textcommandeditor.cpp
@@ -71,7 +71,7 @@ public:
if (i->first < 0)
continue;
- ItemInfo info = (*i->second);
+ const ItemInfo &info = (*i->second);
std::string name = info.getName();
if (name != "unnamed" && !info.getName().empty()
&& info.getName() != "unnamed")
diff --git a/src/gui/textpopup.cpp b/src/gui/textpopup.cpp
index 7f1e0e6b8..1ff601154 100644
--- a/src/gui/textpopup.cpp
+++ b/src/gui/textpopup.cpp
@@ -26,6 +26,9 @@
#include "gui/gui.h"
#include "gui/palette.h"
+#include "gui/theme.h"
+
+#include "gui/widgets/label.h"
#include "graphics.h"
#include "units.h"
@@ -34,7 +37,6 @@
#include "utils/stringutils.h"
#include <guichan/font.hpp>
-#include <guichan/widgets/label.hpp>
#include "debug.h"
@@ -43,13 +45,13 @@ TextPopup::TextPopup():
{
const int fontHeight = getFont()->getHeight();
- mText1 = new gcn::Label;
+ mText1 = new Label;
mText1->setPosition(getPadding(), getPadding());
- mText2 = new gcn::Label;
+ mText2 = new Label;
mText2->setPosition(getPadding(), fontHeight + 2 * getPadding());
- mText3 = new gcn::Label;
+ mText3 = new Label;
mText3->setPosition(getPadding(), (2 * fontHeight) + 2 * getPadding());
add(mText1);
diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp
index 056eafc0f..0607564f9 100644
--- a/src/gui/theme.cpp
+++ b/src/gui/theme.cpp
@@ -599,6 +599,7 @@ static int readColorType(const std::string &type)
"TEXT",
"SHADOW",
"OUTLINE",
+ "BORDER",
"PROGRESS_BAR",
"BUTTON",
"BUTTON_DISABLED",
@@ -608,11 +609,15 @@ static int readColorType(const std::string &type)
"GUILD_CHAT_TAB",
"GUILD_SOCIAL_TAB",
"BACKGROUND",
+ "BACKGROUND_GRAY",
+ "SCROLLBAR_GRAY",
+ "DROPDOWN_SHADOW",
"HIGHLIGHT",
"TAB_FLASH",
"TAB_PLAYER_FLASH",
"SHOP_WARNING",
"ITEM_EQUIPPED",
+ "ITEM_NOT_EQUIPPED",
"CHAT",
"GM",
"PLAYER",
@@ -639,7 +644,16 @@ static int readColorType(const std::string &type)
"SERVER_VERSION_NOT_SUPPORTED",
"WARNING",
"CHARM",
- "PLAYER_ADVANCED"
+ "PLAYER_ADVANCED",
+ "RED",
+ "GREEN",
+ "BLUE",
+ "ORANGE",
+ "YELLOW",
+ "PINK",
+ "PURPLE",
+ "GRAY",
+ "BROWN"
};
if (type.empty())
diff --git a/src/gui/theme.h b/src/gui/theme.h
index 120214232..fbc6f13da 100644
--- a/src/gui/theme.h
+++ b/src/gui/theme.h
@@ -143,6 +143,7 @@ class Theme : public Palette, public ConfigListener
TEXT = 0,
SHADOW,
OUTLINE,
+ BORDER,
PROGRESS_BAR,
BUTTON,
BUTTON_DISABLED,
@@ -152,11 +153,15 @@ class Theme : public Palette, public ConfigListener
GUILD_CHAT_TAB,
GUILD_SOCIAL_TAB,
BACKGROUND,
+ BACKGROUND_GRAY,
+ SCROLLBAR_GRAY,
+ DROPDOWN_SHADOW,
HIGHLIGHT,
TAB_FLASH,
TAB_PLAYER_FLASH,
SHOP_WARNING,
ITEM_EQUIPPED,
+ ITEM_NOT_EQUIPPED,
CHAT,
GM,
PLAYER,
@@ -184,6 +189,15 @@ class Theme : public Palette, public ConfigListener
WARNING,
CHARM,
PLAYER_ADVANCED,
+ RED,
+ GREEN,
+ BLUE,
+ ORANGE,
+ YELLOW,
+ PINK,
+ PURPLE,
+ GRAY,
+ BROWN,
THEME_COLORS_END
};
diff --git a/src/gui/tradewindow.cpp b/src/gui/tradewindow.cpp
index d00fb61f4..3c19ee9c2 100644
--- a/src/gui/tradewindow.cpp
+++ b/src/gui/tradewindow.cpp
@@ -78,6 +78,7 @@ TradeWindow::TradeWindow():
setWindowName("Trade");
setResizable(true);
setCloseButton(true);
+ setStickyButtonLock(true);
setDefaultSize(386, 180, ImageRect::CENTER);
setMinWidth(386);
setMinHeight(180);
diff --git a/src/gui/updaterwindow.cpp b/src/gui/updaterwindow.cpp
index 7534b12a9..4ba1c9179 100644
--- a/src/gui/updaterwindow.cpp
+++ b/src/gui/updaterwindow.cpp
@@ -54,6 +54,8 @@
const std::string xmlUpdateFile = "resources.xml";
const std::string txtUpdateFile = "resources2.txt";
+const std::string updateServer2
+ = "http://download.evolonline.org/manaplus/updates/";
std::vector<updateFile> loadXMLFile(const std::string &fileName);
std::vector<updateFile> loadTxtFile(const std::string &fileName);
@@ -137,6 +139,7 @@ UpdaterWindow::UpdaterWindow(const std::string &updateHost,
mDownloadStatus(UPDATE_NEWS),
mUpdateHost(updateHost),
mUpdatesDir(updatesDir),
+ mUpdatesDirReal(updatesDir),
mCurrentFile("news.txt"),
mDownloadProgress(0.0f),
mCurrentChecksum(0),
@@ -147,6 +150,7 @@ UpdaterWindow::UpdaterWindow(const std::string &updateHost,
mMemoryBuffer(NULL),
mDownload(NULL),
mUpdateIndex(0),
+ mUpdateIndexOffset(0),
mLoadUpdates(applyUpdates),
mUpdateType(updateType)
{
@@ -181,6 +185,9 @@ UpdaterWindow::UpdaterWindow(const std::string &updateHost,
setVisible(true);
mCancelButton->requestFocus();
+ mUpdateServerPath = mUpdateHost;
+ removeProtocol(mUpdateServerPath);
+
// Try to download the updates list
download();
}
@@ -539,8 +546,9 @@ void UpdaterWindow::logic()
mProgressBar->setProgress(mDownloadProgress);
if (mUpdateFiles.size() && mUpdateIndex <= mUpdateFiles.size())
{
- mProgressBar->setText(strprintf("%d/%d",
- mUpdateIndex + 1, (int)mUpdateFiles.size() + 1));
+ mProgressBar->setText(strprintf("%d/%d", mUpdateIndex
+ + mUpdateIndexOffset + 1, (int)mUpdateFiles.size()
+ + (int)mTempUpdateFiles.size() + 1));
}
else
{
@@ -582,13 +590,12 @@ void UpdaterWindow::logic()
// Parse current memory buffer as news and dispose of the data
loadPatch();
-/*
- mCurrentFile = "news.txt";
- mStoreInMemory = true;
- mDownloadStatus = UPDATE_NEWS;
- download(); // download() changes mDownloadComplete to false
-*/
- mDownloadStatus = UPDATE_COMPLETE;
+ mUpdateHost = updateServer2 + mUpdateServerPath;
+ mUpdatesDir += "/fix";
+ mCurrentFile = xmlUpdateFile;
+ mStoreInMemory = false;
+ mDownloadStatus = UPDATE_LIST2;
+ download();
}
break;
@@ -681,7 +688,58 @@ void UpdaterWindow::logic()
}
}
break;
+ case UPDATE_LIST2:
+ if (mDownloadComplete)
+ {
+ if (mCurrentFile == xmlUpdateFile)
+ {
+ mTempUpdateFiles = loadXMLFile(
+ mUpdatesDir + "/" + xmlUpdateFile);
+ }
+ mUpdateIndexOffset = mUpdateIndex;
+ mUpdateIndex = 0;
+ mStoreInMemory = false;
+ mDownloadStatus = UPDATE_RESOURCES2;
+ download();
+ }
+ break;
+ case UPDATE_RESOURCES2:
+ if (mDownloadComplete)
+ {
+ if (mUpdateIndex < mTempUpdateFiles.size())
+ {
+ updateFile thisFile = mTempUpdateFiles[mUpdateIndex];
+ mCurrentFile = thisFile.name;
+ std::string checksum;
+ checksum = thisFile.hash;
+ std::stringstream ss(checksum);
+ ss >> std::hex >> mCurrentChecksum;
+
+ std::ifstream temp(
+ (mUpdatesDir + "/" + mCurrentFile).c_str());
+
+ if (!temp.is_open() || !validateFile(mUpdatesDir + "/"
+ + mCurrentFile, mCurrentChecksum))
+ {
+ temp.close();
+ download();
+ }
+ else
+ {
+ temp.close();
+ logger->log("%s already here", mCurrentFile.c_str());
+ }
+ mUpdateIndex++;
+ }
+ else
+ {
+ mUpdatesDir = mUpdatesDirReal;
+ mDownloadStatus = UPDATE_COMPLETE;
+ }
+ }
+ break;
case UPDATE_COMPLETE:
+ mUpdatesDir = mUpdatesDirReal;
enable();
setLabel(_("Completed"));
break;
diff --git a/src/gui/updaterwindow.h b/src/gui/updaterwindow.h
index a1dc556d5..e9a45241f 100644
--- a/src/gui/updaterwindow.h
+++ b/src/gui/updaterwindow.h
@@ -146,7 +146,9 @@ private:
UPDATE_COMPLETE,
UPDATE_NEWS,
UPDATE_RESOURCES,
- UPDATE_PATCH
+ UPDATE_PATCH,
+ UPDATE_LIST2,
+ UPDATE_RESOURCES2
};
/** Status of the current download. */
@@ -158,6 +160,8 @@ private:
/** Place where the updates are stored (absolute path). */
std::string mUpdatesDir;
+ std::string mUpdatesDirReal;
+
/** The file currently downloading. */
std::string mCurrentFile;
@@ -194,9 +198,15 @@ private:
/** List of files to download. */
std::vector<updateFile> mUpdateFiles;
+ /** List of temp files to download. */
+ std::vector<updateFile> mTempUpdateFiles;
+
/** Index of the file to be downloaded. */
unsigned int mUpdateIndex;
+ /** Index offset for disaplay downloaded file. */
+ unsigned int mUpdateIndexOffset;
+
/** Tells ~UpdaterWindow() if it should load updates */
bool mLoadUpdates;
@@ -208,6 +218,7 @@ private:
ProgressBar *mProgressBar; /**< Update progress bar. */
BrowserBox *mBrowserBox; /**< Box to display news. */
ScrollArea *mScrollArea; /**< Used to scroll news box. */
+ std::string mUpdateServerPath;
};
#endif
diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp
index 70d02b016..b6e09c011 100644
--- a/src/gui/viewport.cpp
+++ b/src/gui/viewport.cpp
@@ -79,10 +79,12 @@ Viewport::Viewport():
mScrollCenterOffsetX = config.getIntValue("ScrollCenterOffsetX");
mScrollCenterOffsetY = config.getIntValue("ScrollCenterOffsetY");
mShowBeingPopup = config.getBoolValue("showBeingPopup");
+ mSelfMouseHeal = config.getBoolValue("selfMouseHeal");
config.addListener("ScrollLaziness", this);
config.addListener("ScrollRadius", this);
config.addListener("showBeingPopup", this);
+ config.addListener("selfMouseHeal", this);
mPopupMenu = new PopupMenu;
mBeingPopup = new BeingPopup;
@@ -96,6 +98,7 @@ Viewport::~Viewport()
config.removeListener("ScrollLaziness", this);
config.removeListener("ScrollRadius", this);
config.removeListener("showBeingPopup", this);
+ config.removeListener("selfMouseHeal", this);
delete mPopupMenu;
mPopupMenu = 0;
@@ -145,8 +148,10 @@ void Viewport::draw(gcn::Graphics *gcnGraphics)
if (mScrollLaziness < 1)
mScrollLaziness = 1; // Avoids division by zero
+ int cnt = 0;
+
// Apply lazy scrolling
- while (lastTick < tick_time)
+ while (lastTick < tick_time && cnt < 32)
{
if (player_x > static_cast<int>(mPixelViewX) + mScrollRadius)
{
@@ -172,17 +177,29 @@ void Viewport::draw(gcn::Graphics *gcnGraphics)
- static_cast<int>(mPixelViewY) + mScrollRadius) /
static_cast<float>(mScrollLaziness);
}
- lastTick++;
+ lastTick ++;
+ cnt ++;
}
// Auto center when player is off screen
- if (player_x - static_cast<int>(mPixelViewX) > graphics->mWidth / 2
- || static_cast<int>(mPixelViewX) - player_x > graphics->mWidth / 2
- || static_cast<int>(mPixelViewY) - player_y
- > graphics->getHeight() / 2
- || player_y - static_cast<int>(mPixelViewY)
- > graphics->getHeight() / 2)
+ if (cnt > 30 || player_x - static_cast<int>(mPixelViewX)
+ > graphics->mWidth / 2 || static_cast<int>(mPixelViewX)
+ - player_x > graphics->mWidth / 2 || static_cast<int>(mPixelViewY)
+ - player_y > graphics->getHeight() / 2 || player_y
+ - static_cast<int>(mPixelViewY) > graphics->getHeight() / 2)
{
+ if (player_x <= 0 || player_y <= 0)
+ {
+ if (debugChatTab)
+ debugChatTab->chatLog("incorrect player position!");
+ logger->log("incorrect player position: %d, %d, %d, %d",
+ player_x, player_y, (int)mPixelViewX, (int)mPixelViewY);
+ if (player_node)
+ {
+ logger->log("tile position: %d, %d",
+ player_node->getTileX(), player_node->getTileY());
+ }
+ }
mPixelViewX = static_cast<float>(player_x);
mPixelViewY = static_cast<float>(player_y);
};
@@ -459,17 +476,24 @@ void Viewport::mousePressed(gcn::MouseEvent &event)
if (mHoverBeing->getType() == ActorSprite::PLAYER)
{
if (actorSpriteManager)
- actorSpriteManager->heal(player_node, mHoverBeing);
+ {
+ if (player_node != mHoverBeing || mSelfMouseHeal)
+ actorSpriteManager->heal(player_node, mHoverBeing);
+ }
}
else if (player_node->withinAttackRange(mHoverBeing) ||
keyboard.isKeyActive(keyboard.KEY_ATTACK))
{
- player_node->attack(mHoverBeing,
- !keyboard.isKeyActive(keyboard.KEY_TARGET));
+ if (player_node != mHoverBeing)
+ {
+ player_node->attack(mHoverBeing,
+ !keyboard.isKeyActive(keyboard.KEY_TARGET));
+ }
}
else if (!keyboard.isKeyActive(keyboard.KEY_ATTACK))
{
- player_node->setGotoTarget(mHoverBeing);
+ if (player_node != mHoverBeing)
+ player_node->setGotoTarget(mHoverBeing);
}
}
// Picks up a item if we clicked on one
diff --git a/src/gui/viewport.h b/src/gui/viewport.h
index d6ee54834..50c81aff4 100644
--- a/src/gui/viewport.h
+++ b/src/gui/viewport.h
@@ -285,6 +285,7 @@ class Viewport : public WindowContainer, public gcn::MouseListener,
int mScrollRadius;
int mScrollLaziness;
bool mShowBeingPopup;
+ bool mSelfMouseHeal;
int mScrollCenterOffsetX;
int mScrollCenterOffsetY;
int mMouseX; /**< Current mouse position in pixels. */
diff --git a/src/gui/whoisonline.cpp b/src/gui/whoisonline.cpp
index 99da53c66..1e9f686e4 100644
--- a/src/gui/whoisonline.cpp
+++ b/src/gui/whoisonline.cpp
@@ -97,6 +97,7 @@ WhoIsOnline::WhoIsOnline():
// setContentSize(w, h);
setCloseButton(true);
setResizable(true);
+ setStickyButtonLock(true);
mUpdateButton = new Button(_("Update"), "update", this);
mUpdateButton->setEnabled(false);
diff --git a/src/gui/widgets/avatarlistbox.cpp b/src/gui/widgets/avatarlistbox.cpp
index 0d35ad188..d4764cba5 100644
--- a/src/gui/widgets/avatarlistbox.cpp
+++ b/src/gui/widgets/avatarlistbox.cpp
@@ -66,6 +66,9 @@ AvatarListBox::AvatarListBox(AvatarListModel *model):
config.addListener("showgender", this);
config.addListener("showlevel", this);
+
+ mHighlightColor = Theme::getThemeColor(Theme::HIGHLIGHT);
+ setForegroundColor(Theme::getThemeColor(Theme::TEXT));
}
AvatarListBox::~AvatarListBox()
@@ -102,8 +105,8 @@ void AvatarListBox::draw(gcn::Graphics *gcnGraphics)
Graphics *graphics = static_cast<Graphics*>(gcnGraphics);
- graphics->setColor(Theme::getThemeColor(Theme::HIGHLIGHT,
- static_cast<int>(mAlpha * 255.0f)));
+ mHighlightColor.a = static_cast<int>(mAlpha * 255.0f);
+ graphics->setColor(mHighlightColor);
graphics->setFont(getFont());
const int fontHeight = getFont()->getHeight();
@@ -113,7 +116,7 @@ void AvatarListBox::draw(gcn::Graphics *gcnGraphics)
const std::string name = player_node->getName();
// Draw the list elements
- graphics->setColor(Theme::getThemeColor(Theme::TEXT));
+ graphics->setColor(getForegroundColor());
for (int i = 0, y = 0;
i < model->getNumberOfElements();
++i, y += fontHeight)
@@ -206,7 +209,7 @@ void AvatarListBox::draw(gcn::Graphics *gcnGraphics)
if (a->getLevel() > 1)
{
- graphics->setColor(Theme::getThemeColor(Theme::TEXT));
+ graphics->setColor(getForegroundColor());
int minHp = 40 + ((a->getLevel() - 1) * 5);
if (minHp < 0)
minHp = 40;
@@ -283,7 +286,7 @@ void AvatarListBox::draw(gcn::Graphics *gcnGraphics)
}
}
- graphics->setColor(Theme::getThemeColor(Theme::TEXT));
+ graphics->setColor(getForegroundColor());
// Draw Name
if (a->getType() == MapItem::SEPARATOR)
diff --git a/src/gui/widgets/avatarlistbox.h b/src/gui/widgets/avatarlistbox.h
index 2fe1dfe3d..afb4abdf5 100644
--- a/src/gui/widgets/avatarlistbox.h
+++ b/src/gui/widgets/avatarlistbox.h
@@ -62,6 +62,7 @@ public:
private:
bool mShowGender;
bool mShowLevel;
+ gcn::Color mHighlightColor;
static int instances;
static Image *onlineIcon;
diff --git a/src/gui/widgets/browserbox.cpp b/src/gui/widgets/browserbox.cpp
index 7df70bd04..65a25363d 100644
--- a/src/gui/widgets/browserbox.cpp
+++ b/src/gui/widgets/browserbox.cpp
@@ -64,6 +64,19 @@ BrowserBox::BrowserBox(unsigned int mode, bool opaque):
{
setFocusable(true);
addMouseListener(this);
+
+ mBackgroundColor = Theme::getThemeColor(Theme::BACKGROUND);
+ mHighlightColor = Theme::getThemeColor(Theme::HIGHLIGHT);
+ mHyperLinkColor = Theme::getThemeColor(Theme::HYPERLINK);
+ mColors[RED] = Theme::getThemeColor(Theme::RED);
+ mColors[GREEN] = Theme::getThemeColor(Theme::GREEN);
+ mColors[BLUE] = Theme::getThemeColor(Theme::BLUE);
+ mColors[ORANGE] = Theme::getThemeColor(Theme::ORANGE);
+ mColors[YELLOW] = Theme::getThemeColor(Theme::YELLOW);
+ mColors[PINK] = Theme::getThemeColor(Theme::PINK);
+ mColors[PURPLE] = Theme::getThemeColor(Theme::PURPLE);
+ mColors[GRAY] = Theme::getThemeColor(Theme::GRAY);
+ mColors[BROWN] = Theme::getThemeColor(Theme::BROWN);
}
BrowserBox::~BrowserBox()
@@ -310,7 +323,7 @@ void BrowserBox::draw(gcn::Graphics *graphics)
if (mOpaque)
{
- graphics->setColor(Theme::getThemeColor(Theme::BACKGROUND));
+ graphics->setColor(mBackgroundColor);
graphics->fillRectangle(gcn::Rectangle(0, 0, getWidth(), getHeight()));
}
@@ -319,7 +332,7 @@ void BrowserBox::draw(gcn::Graphics *graphics)
{
if ((mHighMode & BACKGROUND))
{
- graphics->setColor(Theme::getThemeColor(Theme::HIGHLIGHT));
+ graphics->setColor(mHighlightColor);
graphics->fillRectangle(gcn::Rectangle(
mLinks[mSelectedLink].x1,
mLinks[mSelectedLink].y1,
@@ -330,7 +343,7 @@ void BrowserBox::draw(gcn::Graphics *graphics)
if ((mHighMode & UNDERLINE))
{
- graphics->setColor(Theme::getThemeColor(Theme::HYPERLINK));
+ graphics->setColor(mHyperLinkColor);
graphics->drawLine(
mLinks[mSelectedLink].x1,
mLinks[mSelectedLink].y2,
@@ -474,15 +487,15 @@ int BrowserBox::calcHeight()
switch (c)
{
- case '1': selColor = RED; break;
- case '2': selColor = GREEN; break;
- case '3': selColor = BLUE; break;
- case '4': selColor = ORANGE; break;
- case '5': selColor = YELLOW; break;
- case '6': selColor = PINK; break;
- case '7': selColor = PURPLE; break;
- case '8': selColor = GRAY; break;
- case '9': selColor = BROWN; break;
+ case '1': selColor = mColors[RED]; break;
+ case '2': selColor = mColors[GREEN]; break;
+ case '3': selColor = mColors[BLUE]; break;
+ case '4': selColor = mColors[ORANGE]; break;
+ case '5': selColor = mColors[YELLOW]; break;
+ case '6': selColor = mColors[PINK]; break;
+ case '7': selColor = mColors[PURPLE]; break;
+ case '8': selColor = mColors[GRAY]; break;
+ case '9': selColor = mColors[BROWN]; break;
case '0':
default:
selColor = textColor;
diff --git a/src/gui/widgets/browserbox.h b/src/gui/widgets/browserbox.h
index 6fdb40042..cd69ce56f 100644
--- a/src/gui/widgets/browserbox.h
+++ b/src/gui/widgets/browserbox.h
@@ -147,27 +147,18 @@ class BrowserBox : public gcn::Widget,
AUTO_WRAP /**< Maybe it needs a fix or to be redone. */
};
- /**
- * BrowserBox colors.
- *
- * NOTES (by Javila):
- * - color values is "0x" prefix followed by HTML color style.
- * - we can add up to 10 different colors: [0..9].
- * - not all colors will be fine with all backgrounds due transparent
- * windows and widgets. So, I think it's better keep BrowserBox
- * opaque (white background) by default.
- */
enum
{
- RED = 0xff0000, /**< Color 1 */
- GREEN = 0x009000, /**< Color 2 */
- BLUE = 0x0000ff, /**< Color 3 */
- ORANGE = 0xe0980e, /**< Color 4 */
- YELLOW = 0xf1dc27, /**< Color 5 */
- PINK = 0xff00d8, /**< Color 6 */
- PURPLE = 0x8415e2, /**< Color 7 */
- GRAY = 0x919191, /**< Color 8 */
- BROWN = 0x8e4c17 /**< Color 9 */
+ RED = 0,
+ GREEN = 1,
+ BLUE = 2,
+ ORANGE = 3,
+ YELLOW = 4,
+ PINK = 5,
+ PURPLE = 6,
+ GRAY = 7,
+ BROWN = 8,
+ COLORS_MAX = 9
};
/**
@@ -225,6 +216,11 @@ class BrowserBox : public gcn::Widget,
bool mAlwaysUpdate;
bool mProcessVersion;
bool mEnableImages;
+
+ gcn::Color mBackgroundColor;
+ gcn::Color mHighlightColor;
+ gcn::Color mHyperLinkColor;
+ gcn::Color mColors[COLORS_MAX];
};
#endif
diff --git a/src/gui/widgets/button.cpp b/src/gui/widgets/button.cpp
index 2d9678a53..7c46ae9df 100644
--- a/src/gui/widgets/button.cpp
+++ b/src/gui/widgets/button.cpp
@@ -135,6 +135,9 @@ void Button::init()
}
updateAlpha();
}
+ mEnabledColor = Theme::getThemeColor(Theme::BUTTON);
+ mDisabledColor = Theme::getThemeColor(Theme::BUTTON_DISABLED);
+
mInstances++;
}
@@ -202,7 +205,7 @@ void Button::draw(gcn::Graphics *graphics)
}
else
{
- // because we dont know where parent windows was moved,
+ // because we don't know where parent windows was moved,
// need recalc vertexes
gcn::ClipRectangle &rect = static_cast<Graphics*>(
graphics)->getTopClip();
@@ -238,9 +241,9 @@ void Button::draw(gcn::Graphics *graphics)
// drawImageRect(0, 0, getWidth(), getHeight(), button[mode]);
if (mode == BUTTON_DISABLED)
- graphics->setColor(Theme::getThemeColor(Theme::BUTTON_DISABLED));
+ graphics->setColor(mDisabledColor);
else
- graphics->setColor(Theme::getThemeColor(Theme::BUTTON));
+ graphics->setColor(mEnabledColor);
int textX;
int textY = getHeight() / 2 - getFont()->getHeight() / 2;
diff --git a/src/gui/widgets/button.h b/src/gui/widgets/button.h
index 8c43b6ddd..1b62179b3 100644
--- a/src/gui/widgets/button.h
+++ b/src/gui/widgets/button.h
@@ -101,6 +101,8 @@ class Button : public gcn::Button, public gcn::WidgetListener
int mMode;
int mXOffset;
int mYOffset;
+ gcn::Color mEnabledColor;
+ gcn::Color mDisabledColor;
};
#endif
diff --git a/src/gui/widgets/chattab.cpp b/src/gui/widgets/chattab.cpp
index 785bdd6be..81c0d277f 100644
--- a/src/gui/widgets/chattab.cpp
+++ b/src/gui/widgets/chattab.cpp
@@ -283,9 +283,7 @@ void ChatTab::chatLog(std::string line, Own own,
{
if (player_node)
{
- std::string::size_type pos
- = tmp.text.find(player_node->getName());
- if (pos != std::string::npos)
+ if (chatWindow && chatWindow->findHighlight(tmp.text))
setFlash(2);
else
setFlash(1);
diff --git a/src/gui/widgets/checkbox.cpp b/src/gui/widgets/checkbox.cpp
index 61e5d9118..65d26e196 100644
--- a/src/gui/widgets/checkbox.cpp
+++ b/src/gui/widgets/checkbox.cpp
@@ -86,6 +86,8 @@ CheckBox::CheckBox(const std::string &caption, bool selected,
if (listener)
addActionListener(listener);
+
+ setForegroundColor(Theme::getThemeColor(Theme::TEXT));
}
CheckBox::~CheckBox()
@@ -114,7 +116,7 @@ void CheckBox::draw(gcn::Graphics* graphics)
drawBox(graphics);
graphics->setFont(getFont());
- graphics->setColor(Theme::getThemeColor(Theme::TEXT));
+ graphics->setColor(getForegroundColor());
const int h = getHeight() + getHeight() / 2;
diff --git a/src/gui/widgets/container.cpp b/src/gui/widgets/container.cpp
index 96cea7119..558257507 100644
--- a/src/gui/widgets/container.cpp
+++ b/src/gui/widgets/container.cpp
@@ -37,7 +37,7 @@ Container::~Container()
bool Container::safeRemove(gcn::Widget* widget)
{
- WidgetListIterator iter;
+ WidgetListConstIterator iter;
for (iter = mWidgets.begin(); iter != mWidgets.end(); ++iter)
{
if (*iter == widget)
diff --git a/src/gui/widgets/container.h b/src/gui/widgets/container.h
index 1d8872477..c011b8925 100644
--- a/src/gui/widgets/container.h
+++ b/src/gui/widgets/container.h
@@ -26,6 +26,10 @@
#include <guichan/widget.hpp>
#include <guichan/widgets/container.hpp>
+#if !defined USE_INTERNALGUICHAN
+typedef std::list<gcn::Widget *>::const_iterator WidgetListConstIterator;
+#endif
+
/**
* A widget container.
*
diff --git a/src/gui/widgets/desktop.cpp b/src/gui/widgets/desktop.cpp
index cfb757638..46240f76d 100644
--- a/src/gui/widgets/desktop.cpp
+++ b/src/gui/widgets/desktop.cpp
@@ -53,8 +53,12 @@ Desktop::Desktop() :
mVersionLabel = new Label(strprintf("%s (Mana %s)", appName.c_str(),
FULL_VERSION));
- mVersionLabel->setBackgroundColor(gcn::Color(255, 255, 255, 128));
+ mVersionLabel->setBackgroundColor(
+ Theme::getThemeColor(Theme::BACKGROUND, 128));
add(mVersionLabel, 25, 2);
+
+ mBackgroundColor = Theme::getThemeColor(Theme::BACKGROUND, 128);
+ mBackgroundGrayColor = Theme::getThemeColor(Theme::BACKGROUND_GRAY);
}
Desktop::~Desktop()
@@ -84,8 +88,7 @@ void Desktop::draw(gcn::Graphics *graphics)
if (!mWallpaper || (getWidth() > mWallpaper->getWidth() ||
getHeight() > mWallpaper->getHeight()))
{
- // TODO: Color from palette
- g->setColor(gcn::Color(64, 64, 64));
+ g->setColor(mBackgroundGrayColor);
g->fillRectangle(gcn::Rectangle(0, 0, getWidth(), getHeight()));
}
@@ -106,7 +109,7 @@ void Desktop::draw(gcn::Graphics *graphics)
}
// Draw a thin border under the application version...
- g->setColor(gcn::Color(255, 255, 255, 128));
+ g->setColor(mBackgroundColor);
g->fillRectangle(gcn::Rectangle(mVersionLabel->getDimension()));
Container::draw(graphics);
diff --git a/src/gui/widgets/desktop.h b/src/gui/widgets/desktop.h
index 962cc3c01..6364ecfe9 100644
--- a/src/gui/widgets/desktop.h
+++ b/src/gui/widgets/desktop.h
@@ -68,6 +68,8 @@ class Desktop : public Container, gcn::WidgetListener
Image *mWallpaper;
gcn::Label *mVersionLabel;
+ gcn::Color mBackgroundColor;
+ gcn::Color mBackgroundGrayColor;
};
#endif // DESKTOP_H
diff --git a/src/gui/widgets/dropdown.cpp b/src/gui/widgets/dropdown.cpp
index 681d7736e..f01d3fb55 100644
--- a/src/gui/widgets/dropdown.cpp
+++ b/src/gui/widgets/dropdown.cpp
@@ -101,6 +101,10 @@ DropDown::DropDown(gcn::ListModel *listModel):
}
instances++;
+
+ mHighlightColor = Theme::getThemeColor(Theme::HIGHLIGHT);
+ mShadowColor = Theme::getThemeColor(Theme::DROPDOWN_SHADOW);
+ setForegroundColor(Theme::getThemeColor(Theme::TEXT));
}
DropDown::~DropDown()
@@ -163,25 +167,20 @@ void DropDown::draw(gcn::Graphics* graphics)
updateAlpha();
const int alpha = static_cast<int>(mAlpha * 255.0f);
- gcn::Color faceColor = getBaseColor();
- faceColor.a = alpha;
- const gcn::Color *highlightColor = &Theme::getThemeColor(Theme::HIGHLIGHT,
- alpha);
- gcn::Color shadowColor = faceColor - 0x303030;
- shadowColor.a = alpha;
+ mHighlightColor.a = alpha;
+ mShadowColor.a = alpha;
if (mListBox->getListModel() && mListBox->getSelected() >= 0)
{
graphics->setFont(getFont());
- graphics->setColor(Theme::getThemeColor(Theme::TEXT));
+ graphics->setColor(getForegroundColor());
graphics->drawText(mListBox->getListModel()->getElementAt(
mListBox->getSelected()), 1, 0);
}
if (isFocused())
{
- if (highlightColor)
- graphics->setColor(*highlightColor);
+ graphics->setColor(mHighlightColor);
graphics->drawRectangle(gcn::Rectangle(0, 0, getWidth() - h, h));
}
@@ -193,10 +192,9 @@ void DropDown::draw(gcn::Graphics* graphics)
// Draw two lines separating the ListBox with selected
// element view.
- if (highlightColor)
- graphics->setColor(*highlightColor);
+ graphics->setColor(mHighlightColor);
graphics->drawLine(0, h, getWidth(), h);
- graphics->setColor(shadowColor);
+ graphics->setColor(mShadowColor);
graphics->drawLine(0, h + 1, getWidth(), h + 1);
}
}
diff --git a/src/gui/widgets/dropdown.h b/src/gui/widgets/dropdown.h
index d85c3166c..6a22ba497 100644
--- a/src/gui/widgets/dropdown.h
+++ b/src/gui/widgets/dropdown.h
@@ -87,6 +87,9 @@ class DropDown : public gcn::DropDown
*/
void drawButton(gcn::Graphics *graphics);
+ gcn::Color mShadowColor;
+ gcn::Color mHighlightColor;
+
// Add own Images.
static int instances;
static Image *buttons[2][2];
diff --git a/src/gui/widgets/dropshortcutcontainer.cpp b/src/gui/widgets/dropshortcutcontainer.cpp
index 92f02c78f..b628cf2d4 100644
--- a/src/gui/widgets/dropshortcutcontainer.cpp
+++ b/src/gui/widgets/dropshortcutcontainer.cpp
@@ -73,6 +73,8 @@ DropShortcutContainer::DropShortcutContainer():
mBoxHeight = 1;
mBoxWidth = 1;
}
+ mEquipedColor = Theme::getThemeColor(Theme::ITEM_EQUIPPED);
+ mUnEquipedColor = Theme::getThemeColor(Theme::ITEM_NOT_EQUIPPED);
}
DropShortcutContainer::~DropShortcutContainer()
@@ -110,12 +112,6 @@ void DropShortcutContainer::draw(gcn::Graphics *graphics)
if (mBackgroundImg)
g->drawImage(mBackgroundImg, itemX, itemY);
-/* // Draw item keyboard shortcut.
- const char *key = SDL_GetKeyName(
- (SDLKey) keyboard.getKeyValue(keyboard.KEY_SHORTCUT_1 + i));
- graphics->setColor(guiPalette->getColor(Palette::TEXT));
- g->drawText(key, itemX + 2, itemY + 2, gcn::Graphics::LEFT);
-*/
if (dropShortcut->getItem(i) < 0)
continue;
@@ -142,11 +138,11 @@ void DropShortcutContainer::draw(gcn::Graphics *graphics)
image->setAlpha(1.0f);
g->drawImage(image, itemX, itemY);
if (item->isEquipped())
- g->setColor(Theme::getThemeColor(Theme::ITEM_EQUIPPED));
+ g->setColor(mEquipedColor);
else
- g->setColor(Theme::getThemeColor(Theme::TEXT));
+ g->setColor(mUnEquipedColor);
g->drawText(caption, itemX + mBoxWidth / 2,
- itemY + mBoxHeight - 14, gcn::Graphics::CENTER);
+ itemY + mBoxHeight - 14, gcn::Graphics::CENTER);
}
}
}
diff --git a/src/gui/widgets/dropshortcutcontainer.h b/src/gui/widgets/dropshortcutcontainer.h
index 723b215cf..b2d63a7dd 100644
--- a/src/gui/widgets/dropshortcutcontainer.h
+++ b/src/gui/widgets/dropshortcutcontainer.h
@@ -84,6 +84,8 @@ class DropShortcutContainer : public ShortcutContainer
Item *mItemMoved;
ItemPopup *mItemPopup;
+ gcn::Color mEquipedColor;
+ gcn::Color mUnEquipedColor;
};
#endif
diff --git a/src/gui/widgets/emoteshortcutcontainer.cpp b/src/gui/widgets/emoteshortcutcontainer.cpp
index 5bb972adc..5aced193f 100644
--- a/src/gui/widgets/emoteshortcutcontainer.cpp
+++ b/src/gui/widgets/emoteshortcutcontainer.cpp
@@ -80,6 +80,7 @@ EmoteShortcutContainer::EmoteShortcutContainer():
mBoxHeight = 1;
mBoxWidth = 1;
}
+ setForegroundColor(Theme::getThemeColor(Theme::TEXT));
}
EmoteShortcutContainer::~EmoteShortcutContainer()
@@ -118,20 +119,9 @@ void EmoteShortcutContainer::draw(gcn::Graphics *graphics)
std::string key = keyboard.getKeyValueString(
keyboard.KEY_EMOTE_1 + i);
- graphics->setColor(Theme::getThemeColor(Theme::TEXT));
+ graphics->setColor(getForegroundColor());
g->drawText(key, emoteX + 2, emoteY + 2, gcn::Graphics::LEFT);
-/*
- if (emoteShortcut->getEmote(i)
- && static_cast<unsigned>(emoteShortcut->getEmote(i)) - 1
- < mEmoteImg.size()
- && mEmoteImg[emoteShortcut->getEmote(i) - 1])
- {
- mEmoteImg[emoteShortcut->getEmote(i) - 1]->draw(g, emoteX + 2,
- emoteY + 10);
- }
-*/
-
if (i < mEmoteImg.size() && mEmoteImg[i] && mEmoteImg[i]->sprite)
mEmoteImg[i]->sprite->draw(g, emoteX + 2, emoteY + 10);
}
diff --git a/src/gui/widgets/guildchattab.cpp b/src/gui/widgets/guildchattab.cpp
new file mode 100644
index 000000000..0353ac23f
--- /dev/null
+++ b/src/gui/widgets/guildchattab.cpp
@@ -0,0 +1,128 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2008-2009 The Mana World Development Team
+ * Copyright (C) 2009-2010 The Mana Developers
+ * Copyright (C) 2011 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "gui/widgets/guildchattab.h"
+
+#include "chatlogger.h"
+#include "commandhandler.h"
+#include "guild.h"
+#include "guildmanager.h"
+#include "localplayer.h"
+
+#include "gui/theme.h"
+
+#include "resources/iteminfo.h"
+#include "resources/itemdb.h"
+
+#include "utils/dtor.h"
+#include "utils/gettext.h"
+#include "utils/stringutils.h"
+
+#include "debug.h"
+
+GuildChatTab::GuildChatTab() :
+ ChatTab(_("Guild"))
+{
+ setTabColor(&Theme::getThemeColor(Theme::GUILD_CHAT_TAB));
+}
+
+GuildChatTab::~GuildChatTab()
+{
+}
+
+bool GuildChatTab::handleCommand(const std::string &type,
+ const std::string &args)
+{
+ if (type == "help")
+ {
+ if (args == "invite")
+ {
+ chatLog(_("Command: /invite <nick>"));
+ chatLog(_("This command invites <nick> to the guild you're in."));
+ chatLog(_("If the <nick> has spaces in it, enclose it in "
+ "double quotes (\")."));
+ }
+ else if (args == "leave")
+ {
+ chatLog(_("Command: /leave"));
+ chatLog(_("This command causes the player to leave the guild."));
+ }
+ else
+ return false;
+ }
+ else if (type == "invite" && guildManager)
+ {
+ guildManager->invite(args);
+ }
+ else if (type == "leave" && guildManager)
+ {
+ guildManager->leave();
+ }
+ else if (type == "kick" && guildManager)
+ {
+ guildManager->kick(args);
+ }
+ else if (type == "notice" && guildManager)
+ {
+ guildManager->notice(args);
+ }
+ else
+ {
+ return false;
+ }
+
+ return true;
+}
+
+void GuildChatTab::handleInput(const std::string &msg)
+{
+ if (!guildManager)
+ return;
+
+ if (chatWindow)
+ guildManager->chat(chatWindow->doReplace(msg));
+ else
+ guildManager->chat(msg);
+}
+
+void GuildChatTab::showHelp()
+{
+ chatLog(_("/help > Display this help."));
+ chatLog(_("/invite > Invite a player to your guild"));
+ chatLog(_("/leave > Leave the guild you are in"));
+ chatLog(_("/kick > Kick some one from the guild you are in"));
+}
+
+void GuildChatTab::getAutoCompleteList(std::vector<std::string> &names) const
+{
+ if (!guildManager)
+ return;
+
+ guildManager->getNames(names);
+ names.push_back("/notice ");
+}
+
+void GuildChatTab::saveToLogFile(std::string &msg)
+{
+ if (chatLogger)
+ chatLogger->log("#Guild", msg);
+}
diff --git a/src/gui/widgets/guildchattab.h b/src/gui/widgets/guildchattab.h
new file mode 100644
index 000000000..4f5ee3a8e
--- /dev/null
+++ b/src/gui/widgets/guildchattab.h
@@ -0,0 +1,52 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2009 The Mana World Development Team
+ * Copyright (C) 2009-2010 The Mana Developers
+ * Copyright (C) 2011 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef GUI_GUILDTAB_H
+#define GUI_GUILDTAB_H
+
+#include "gui/widgets/chattab.h"
+
+/**
+ * A tab for a guild chat channel.
+ */
+class GuildChatTab : public ChatTab
+{
+ public:
+ GuildChatTab();
+
+ ~GuildChatTab();
+
+ bool handleCommand(const std::string &type, const std::string &args);
+
+ void showHelp();
+
+ void saveToLogFile(std::string &msg);
+
+ int getType() const { return ChatTab::TAB_GUILD; }
+
+ protected:
+ void handleInput(const std::string &msg);
+
+ void getAutoCompleteList(std::vector<std::string> &names) const;
+};
+
+#endif
diff --git a/src/gui/widgets/guitable.cpp b/src/gui/widgets/guitable.cpp
index e25e0bb8c..e02eda88c 100644
--- a/src/gui/widgets/guitable.cpp
+++ b/src/gui/widgets/guitable.cpp
@@ -88,17 +88,17 @@ void GuiTableActionListener::action(const gcn::ActionEvent
}
-GuiTable::GuiTable(TableModel *initial_model, gcn::Color background,
- bool opacity) :
+GuiTable::GuiTable(TableModel *initial_model, bool opacity) :
mLinewiseMode(false),
mWrappingEnabled(false),
mOpaque(opacity),
- mBackgroundColor(background),
mModel(NULL),
mSelectedRow(0),
mSelectedColumn(0),
mTopWidget(NULL)
{
+ mBackgroundColor = Theme::getThemeColor(Theme::BACKGROUND);
+ mHighlightColor = Theme::getThemeColor(Theme::HIGHLIGHT);
setModel(initial_model);
setFocusable(true);
@@ -292,8 +292,8 @@ void GuiTable::draw(gcn::Graphics* graphics)
if (mOpaque)
{
- graphics->setColor(Theme::getThemeColor(Theme::BACKGROUND,
- static_cast<int>(mAlpha * 255.0f)));
+ mBackgroundColor.a = static_cast<int>(mAlpha * 255.0f);
+ graphics->setColor(mBackgroundColor);
graphics->fillRectangle(gcn::Rectangle(0, 0, getWidth(), getHeight()));
}
@@ -304,7 +304,7 @@ void GuiTable::draw(gcn::Graphics* graphics)
first_row = 0;
unsigned rows_nr = 1 + (getHeight() / getRowHeight()); // May overestimate
- // by one.
+ // by one.
unsigned max_rows_nr;
if (mModel->getRows() < first_row)
@@ -343,8 +343,8 @@ void GuiTable::draw(gcn::Graphics* graphics)
widget->setDimension(bounds);
- graphics->setColor(Theme::getThemeColor(Theme::HIGHLIGHT,
- static_cast<int>(mAlpha * 255.0f)));
+ mHighlightColor.a = static_cast<int>(mAlpha * 255.0f);
+ graphics->setColor(mHighlightColor);
if (mSelectedRow > 0)
{
diff --git a/src/gui/widgets/guitable.h b/src/gui/widgets/guitable.h
index c4fab6a0d..d248c4820 100644
--- a/src/gui/widgets/guitable.h
+++ b/src/gui/widgets/guitable.h
@@ -58,7 +58,6 @@ class GuiTable : public gcn::Widget,
public:
GuiTable(TableModel * initial_model = NULL,
- gcn::Color background = 0xffffff,
bool opacity = true);
virtual ~GuiTable();
@@ -190,6 +189,8 @@ private:
/** Vector for compactness; used as a list in practice. */
std::vector<GuiTableActionListener *> mActionListeners;
+
+ gcn::Color mHighlightColor;
};
diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp
index b79f26226..91b674018 100644
--- a/src/gui/widgets/itemcontainer.cpp
+++ b/src/gui/widgets/itemcontainer.cpp
@@ -118,6 +118,9 @@ ItemContainer::ItemContainer(Inventory *inventory, bool forceQuantity):
if (!mSelImg)
logger->log1("Error: Unable to load selection.png");
+ mEquipedColor = Theme::getThemeColor(Theme::ITEM_EQUIPPED);
+ mUnEquipedColor = Theme::getThemeColor(Theme::ITEM_NOT_EQUIPPED);
+
addKeyListener(this);
addMouseListener(this);
addWidgetListener(this);
@@ -204,15 +207,16 @@ void ItemContainer::draw(gcn::Graphics *graphics)
caption = "Eq.";
if (item->isEquipped())
- g->setColor(Theme::getThemeColor(Theme::ITEM_EQUIPPED));
+ g->setColor(mEquipedColor);
else
- g->setColor(gcn::Color(0, 0, 0));
+ g->setColor(mUnEquipedColor);
g->drawText(caption, itemX + BOX_WIDTH / 2,
itemY + BOX_HEIGHT - 14, gcn::Graphics::CENTER);
}
}
+/*
// Draw an orange box around the selected item
if (isFocused() && mHighlightedIndex != -1 && mGridColumns)
{
@@ -221,6 +225,7 @@ void ItemContainer::draw(gcn::Graphics *graphics)
g->setColor(gcn::Color(255, 128, 0));
g->drawRectangle(gcn::Rectangle(itemX, itemY, BOX_WIDTH, BOX_HEIGHT));
}
+*/
}
void ItemContainer::selectNone()
diff --git a/src/gui/widgets/itemcontainer.h b/src/gui/widgets/itemcontainer.h
index 5fd897a29..df7de63ee 100644
--- a/src/gui/widgets/itemcontainer.h
+++ b/src/gui/widgets/itemcontainer.h
@@ -202,6 +202,8 @@ class ItemContainer : public gcn::Widget,
typedef SelectionListenerList::iterator SelectionListenerIterator;
SelectionListenerList mSelectionListeners;
+ gcn::Color mEquipedColor;
+ gcn::Color mUnEquipedColor;
};
#endif
diff --git a/src/gui/widgets/itemshortcutcontainer.cpp b/src/gui/widgets/itemshortcutcontainer.cpp
index 328d5ae4d..79685fe45 100644
--- a/src/gui/widgets/itemshortcutcontainer.cpp
+++ b/src/gui/widgets/itemshortcutcontainer.cpp
@@ -77,6 +77,9 @@ ItemShortcutContainer::ItemShortcutContainer(unsigned number):
mBoxHeight = 1;
mBoxWidth = 1;
}
+ setForegroundColor(Theme::getThemeColor(Theme::TEXT));
+ mEquipedColor = Theme::getThemeColor(Theme::ITEM_EQUIPPED);
+ mUnEquipedColor = Theme::getThemeColor(Theme::ITEM_NOT_EQUIPPED);
}
ItemShortcutContainer::~ItemShortcutContainer()
@@ -119,7 +122,7 @@ void ItemShortcutContainer::draw(gcn::Graphics *graphics)
// Draw item keyboard shortcut.
std::string key = keyboard.getKeyValueString(
keyboard.KEY_SHORTCUT_1 + i);
- graphics->setColor(Theme::getThemeColor(Theme::TEXT));
+ graphics->setColor(getForegroundColor());
g->drawText(key, itemX + 2, itemY + 2, gcn::Graphics::LEFT);
@@ -154,14 +157,9 @@ void ItemShortcutContainer::draw(gcn::Graphics *graphics)
image->setAlpha(1.0f);
g->drawImage(image, itemX, itemY);
if (item->isEquipped())
- {
- g->setColor(Theme::getThemeColor(
- Theme::ITEM_EQUIPPED));
- }
+ g->setColor(mEquipedColor);
else
- {
- graphics->setColor(Theme::getThemeColor(Theme::TEXT));
- }
+ g->setColor(mUnEquipedColor);
g->drawText(caption, itemX + mBoxWidth / 2,
itemY + mBoxHeight - 14, gcn::Graphics::CENTER);
}
diff --git a/src/gui/widgets/itemshortcutcontainer.h b/src/gui/widgets/itemshortcutcontainer.h
index 7eac431ec..e6b32c6f8 100644
--- a/src/gui/widgets/itemshortcutcontainer.h
+++ b/src/gui/widgets/itemshortcutcontainer.h
@@ -88,7 +88,8 @@ class ItemShortcutContainer : public ShortcutContainer
ItemPopup *mItemPopup;
SpellPopup *mSpellPopup;
+ gcn::Color mEquipedColor;
+ gcn::Color mUnEquipedColor;
};
-//extern SpellManager *spellManager;
#endif
diff --git a/src/gui/widgets/label.cpp b/src/gui/widgets/label.cpp
index 16b813dd5..67e8bd12b 100644
--- a/src/gui/widgets/label.cpp
+++ b/src/gui/widgets/label.cpp
@@ -26,6 +26,7 @@
Label::Label()
{
+ setForegroundColor(Theme::getThemeColor(Theme::TEXT));
}
Label::Label(const std::string &caption) :
diff --git a/src/gui/widgets/layout.cpp b/src/gui/widgets/layout.cpp
index 382d169dc..a14b416ce 100644
--- a/src/gui/widgets/layout.cpp
+++ b/src/gui/widgets/layout.cpp
@@ -68,7 +68,9 @@ LayoutArray &LayoutCell::getArray()
void LayoutCell::reflow(int nx, int ny, int nw, int nh)
{
- assert(mType != NONE);
+ if (mType == NONE)
+ return;
+
nx += mHPadding;
ny += mVPadding;
nw -= 2 * mHPadding;
@@ -81,7 +83,8 @@ void LayoutCell::reflow(int nx, int ny, int nw, int nh)
void LayoutCell::computeSizes()
{
- assert(mType == ARRAY);
+ if (mType != ARRAY)
+ return;
std::vector< std::vector< LayoutCell * > >::iterator
i = mArray->mCells.begin();
diff --git a/src/gui/widgets/listbox.cpp b/src/gui/widgets/listbox.cpp
index de8707406..53299ca46 100644
--- a/src/gui/widgets/listbox.cpp
+++ b/src/gui/widgets/listbox.cpp
@@ -41,6 +41,8 @@ float ListBox::mAlpha = 1.0;
ListBox::ListBox(gcn::ListModel *listModel):
gcn::ListBox(listModel)
{
+ mHighlightColor = Theme::getThemeColor(Theme::HIGHLIGHT);
+ setForegroundColor(Theme::getThemeColor(Theme::TEXT));
}
ListBox::~ListBox()
@@ -63,8 +65,8 @@ void ListBox::draw(gcn::Graphics *graphics)
updateAlpha();
- graphics->setColor(Theme::getThemeColor(Theme::HIGHLIGHT,
- static_cast<int>(mAlpha * 255.0f)));
+ mHighlightColor.a = static_cast<int>(mAlpha * 255.0f);
+ graphics->setColor(mHighlightColor);
graphics->setFont(getFont());
const int height = getRowHeight();
@@ -77,7 +79,7 @@ void ListBox::draw(gcn::Graphics *graphics)
}
// Draw the list elements
- graphics->setColor(Theme::getThemeColor(Theme::TEXT));
+ graphics->setColor(getForegroundColor());
for (int i = 0, y = 0; i < mListModel->getNumberOfElements();
++i, y += height)
{
diff --git a/src/gui/widgets/listbox.h b/src/gui/widgets/listbox.h
index 5f8c20059..418b83f58 100644
--- a/src/gui/widgets/listbox.h
+++ b/src/gui/widgets/listbox.h
@@ -73,6 +73,7 @@ class ListBox : public gcn::ListBox
void mouseDragged(gcn::MouseEvent &event);
protected:
+ gcn::Color mHighlightColor;
static float mAlpha;
};
diff --git a/src/gui/widgets/radiobutton.cpp b/src/gui/widgets/radiobutton.cpp
index a82ec3e8d..e641be323 100644
--- a/src/gui/widgets/radiobutton.cpp
+++ b/src/gui/widgets/radiobutton.cpp
@@ -46,6 +46,7 @@ RadioButton::RadioButton(const std::string &caption, const std::string &group,
gcn::RadioButton(caption, group, marked),
mHasMouse(false)
{
+ setForegroundColor(Theme::getThemeColor(Theme::TEXT));
if (instances == 0)
{
radioNormal = Theme::getImageFromTheme("radioout.png");
diff --git a/src/gui/widgets/scrollarea.cpp b/src/gui/widgets/scrollarea.cpp
index 08f0b5a70..2796d3ab2 100644
--- a/src/gui/widgets/scrollarea.cpp
+++ b/src/gui/widgets/scrollarea.cpp
@@ -73,7 +73,6 @@ ScrollArea::ScrollArea(gcn::Widget *widget):
mDrawWidth(0),
mDrawHeight(0)
{
-// addWidgetListener(this);
init();
}
@@ -219,6 +218,9 @@ void ScrollArea::init()
}
instances++;
+
+ mGray = Theme::getThemeColor(Theme::SCROLLBAR_GRAY, 32);
+ mBackground = Theme::getThemeColor(Theme::BACKGROUND);
}
void ScrollArea::logic()
@@ -336,7 +338,7 @@ void ScrollArea::drawFrame(gcn::Graphics *graphics)
}
else
{
- // because we dont know where parent windows was moved,
+ // because we don't know where parent windows was moved,
// need recalc vertexes
gcn::ClipRectangle &rect = static_cast<Graphics*>(
graphics)->getTopClip();
@@ -439,17 +441,17 @@ void ScrollArea::drawRightButton(gcn::Graphics *graphics)
void ScrollArea::drawVBar(gcn::Graphics *graphics)
{
const gcn::Rectangle dim = getVerticalBarDimension();
- graphics->setColor(gcn::Color(0, 0, 0, 32));
+ graphics->setColor(mGray);
graphics->fillRectangle(dim);
- graphics->setColor(gcn::Color(255, 255, 255));
+ graphics->setColor(mBackground);
}
void ScrollArea::drawHBar(gcn::Graphics *graphics)
{
const gcn::Rectangle dim = getHorizontalBarDimension();
- graphics->setColor(gcn::Color(0, 0, 0, 32));
+ graphics->setColor(mGray);
graphics->fillRectangle(dim);
- graphics->setColor(gcn::Color(255, 255, 255));
+ graphics->setColor(mBackground);
}
void ScrollArea::drawVMarker(gcn::Graphics *graphics)
diff --git a/src/gui/widgets/scrollarea.h b/src/gui/widgets/scrollarea.h
index 440fcec15..095010f3c 100644
--- a/src/gui/widgets/scrollarea.h
+++ b/src/gui/widgets/scrollarea.h
@@ -156,6 +156,9 @@ class ScrollArea : public gcn::ScrollArea, public gcn::WidgetListener
int mYOffset;
int mDrawWidth;
int mDrawHeight;
+
+ gcn::Color mGray;
+ gcn::Color mBackground;
};
#endif
diff --git a/src/gui/widgets/shoplistbox.cpp b/src/gui/widgets/shoplistbox.cpp
index 2fe28181b..793491808 100644
--- a/src/gui/widgets/shoplistbox.cpp
+++ b/src/gui/widgets/shoplistbox.cpp
@@ -50,9 +50,7 @@ ShopListBox::ShopListBox(gcn::ListModel *listModel):
mShopItems(0)
{
mRowHeight = getFont()->getHeight();
- mPriceCheck = true;
-
- mItemPopup = new ItemPopup;
+ init();
}
ShopListBox::ShopListBox(gcn::ListModel *listModel, ShopItems *shopListModel):
@@ -61,9 +59,17 @@ ShopListBox::ShopListBox(gcn::ListModel *listModel, ShopItems *shopListModel):
mShopItems(shopListModel)
{
mRowHeight = std::max(getFont()->getHeight(), ITEM_ICON_SIZE);
- mPriceCheck = true;
+ init();
+}
+void ShopListBox::init()
+{
+ mPriceCheck = true;
mItemPopup = new ItemPopup;
+ mHighlightColor = Theme::getThemeColor(Theme::HIGHLIGHT);
+ mBackgroundColor = Theme::getThemeColor(Theme::BACKGROUND);
+ mWarningColor = Theme::getThemeColor(Theme::SHOP_WARNING);
+ setForegroundColor(Theme::getThemeColor(Theme::TEXT));
}
void ShopListBox::setPlayersMoney(int money)
@@ -80,8 +86,7 @@ void ShopListBox::draw(gcn::Graphics *gcnGraphics)
mAlpha = Client::getGuiAlpha();
int alpha = static_cast<int>(mAlpha * 255.0f);
- const gcn::Color* highlightColor =
- &Theme::getThemeColor(Theme::HIGHLIGHT, alpha);
+ mHighlightColor.a = alpha;
Graphics *graphics = static_cast<Graphics*>(gcnGraphics);
@@ -93,29 +98,30 @@ void ShopListBox::draw(gcn::Graphics *gcnGraphics)
++i, y += mRowHeight)
{
gcn::Color temp;
- const gcn::Color* backgroundColor =
- &Theme::getThemeColor(Theme::BACKGROUND, alpha);
+ gcn::Color* backgroundColor = &mBackgroundColor;
+ mBackgroundColor.a = alpha;
if (mShopItems && mShopItems->at(i) &&
mPlayerMoney < mShopItems->at(i)->getPrice() && mPriceCheck)
{
if (i != mSelected)
{
- backgroundColor = &Theme::getThemeColor(Theme::SHOP_WARNING,
- alpha);
+ backgroundColor = &mWarningColor;
+ backgroundColor->a = alpha;
}
else
{
- temp = Theme::getThemeColor(Theme::SHOP_WARNING, alpha);
- temp.r = (temp.r + highlightColor->r) / 2;
- temp.g = (temp.g + highlightColor->g) / 2;
- temp.b = (temp.g + highlightColor->b) / 2;
+ temp = mWarningColor;
+ temp.r = (temp.r + mHighlightColor.r) / 2;
+ temp.g = (temp.g + mHighlightColor.g) / 2;
+ temp.b = (temp.g + mHighlightColor.b) / 2;
+ temp.a = alpha;
backgroundColor = &temp;
}
}
else if (i == mSelected)
{
- backgroundColor = highlightColor;
+ backgroundColor = &mHighlightColor;
}
graphics->setColor(*backgroundColor);
@@ -130,9 +136,9 @@ void ShopListBox::draw(gcn::Graphics *gcnGraphics)
graphics->drawImage(icon, 1, y);
}
}
- graphics->setColor(Theme::getThemeColor(Theme::TEXT));
+ graphics->setColor(getForegroundColor());
graphics->drawText(mListModel->getElementAt(i), ITEM_ICON_SIZE + 5,
- y + (ITEM_ICON_SIZE - getFont()->getHeight()) / 2);
+ y + (ITEM_ICON_SIZE - getFont()->getHeight()) / 2);
}
}
diff --git a/src/gui/widgets/shoplistbox.h b/src/gui/widgets/shoplistbox.h
index 917f46729..38e238f20 100644
--- a/src/gui/widgets/shoplistbox.h
+++ b/src/gui/widgets/shoplistbox.h
@@ -85,6 +85,8 @@ class ShopListBox : public ListBox
void mouseExited(gcn::MouseEvent& mouseEvent A_UNUSED);
private:
+ void init();
+
int mPlayerMoney;
/**
@@ -100,6 +102,10 @@ class ShopListBox : public ListBox
static float mAlpha;
bool mPriceCheck;
+
+ gcn::Color mHighlightColor;
+ gcn::Color mBackgroundColor;
+ gcn::Color mWarningColor;
};
#endif // SHOPLISTBOX_H
diff --git a/src/gui/widgets/spellshortcutcontainer.cpp b/src/gui/widgets/spellshortcutcontainer.cpp
index 8d5b563bb..8abe727b5 100644
--- a/src/gui/widgets/spellshortcutcontainer.cpp
+++ b/src/gui/widgets/spellshortcutcontainer.cpp
@@ -81,6 +81,7 @@ SpellShortcutContainer::SpellShortcutContainer(unsigned number):
mBoxHeight = 1;
mBoxWidth = 1;
}
+ setForegroundColor(Theme::getThemeColor(Theme::TEXT));
}
SpellShortcutContainer::~SpellShortcutContainer()
@@ -106,11 +107,10 @@ void SpellShortcutContainer::draw(gcn::Graphics *graphics)
Graphics *g = static_cast<Graphics*>(graphics);
- graphics->setColor(gcn::Color(0, 0, 0, 255));
graphics->setFont(getFont());
int selectedId = spellShortcut->getSelectedItem();
- g->setColor(Theme::getThemeColor(Theme::TEXT));
+ g->setColor(getForegroundColor());
for (unsigned i = 0; i < mMaxItems; i++)
{
diff --git a/src/gui/widgets/tab.cpp b/src/gui/widgets/tab.cpp
index b7d6b4458..530f1ac82 100644
--- a/src/gui/widgets/tab.cpp
+++ b/src/gui/widgets/tab.cpp
@@ -77,6 +77,8 @@ Tab::Tab() : gcn::Tab(),
mMode(0)
{
init();
+ mFlashColor = Theme::getThemeColor(Theme::TAB_FLASH);
+ mPlayerFlashColor = Theme::getThemeColor(Theme::TAB_PLAYER_FLASH);
}
Tab::~Tab()
@@ -177,12 +179,10 @@ void Tab::draw(gcn::Graphics *graphics)
switch (mFlash)
{
case 1:
- mLabel->setForegroundColor(Theme::getThemeColor(
- Theme::TAB_FLASH));
+ mLabel->setForegroundColor(mFlashColor);
break;
case 2:
- mLabel->setForegroundColor(Theme::getThemeColor(
- Theme::TAB_PLAYER_FLASH));
+ mLabel->setForegroundColor(mPlayerFlashColor);
break;
default:
break;
diff --git a/src/gui/widgets/tab.h b/src/gui/widgets/tab.h
index 5847bd505..ba51e6c74 100644
--- a/src/gui/widgets/tab.h
+++ b/src/gui/widgets/tab.h
@@ -91,6 +91,8 @@ class Tab : public gcn::Tab, public gcn::WidgetListener
GraphicsVertexes *mVertexes;
bool mRedraw;
int mMode;
+ gcn::Color mFlashColor;
+ gcn::Color mPlayerFlashColor;
};
#endif
diff --git a/src/gui/widgets/textfield.cpp b/src/gui/widgets/textfield.cpp
index f80039650..2729e5407 100644
--- a/src/gui/widgets/textfield.cpp
+++ b/src/gui/widgets/textfield.cpp
@@ -59,6 +59,8 @@ TextField::TextField(const std::string &text, bool loseFocusOnTab,
mLoseFocusOnTab = loseFocusOnTab;
+ setForegroundColor(Theme::getThemeColor(Theme::TEXT));
+
if (instances == 0)
{
// Load the skin
@@ -136,7 +138,7 @@ void TextField::draw(gcn::Graphics *graphics)
mXScroll);
}
- graphics->setColor(Theme::getThemeColor(Theme::TEXT));
+ graphics->setColor(getForegroundColor());
graphics->setFont(getFont());
graphics->drawText(mText, 1 - mXScroll, 1);
}
diff --git a/src/gui/widgets/window.cpp b/src/gui/widgets/window.cpp
index 9a7c689e6..4435496a7 100644
--- a/src/gui/widgets/window.cpp
+++ b/src/gui/widgets/window.cpp
@@ -60,6 +60,7 @@ Window::Window(const std::string &caption, bool modal, Window *parent,
mSaveVisible(false),
mStickyButton(false),
mSticky(false),
+ mStickyButtonLock(false),
mMinWinWidth(100),
mMinWinHeight(40),
mMaxWinWidth(graphics->mWidth),
@@ -95,6 +96,7 @@ Window::Window(const std::string &caption, bool modal, Window *parent,
addWidgetListener(this);
mCaptionFont = getFont();
+ setForegroundColor(Theme::getThemeColor(Theme::TEXT));
}
Window::~Window()
@@ -146,15 +148,10 @@ void Window::draw(gcn::Graphics *graphics)
g->drawImageRect2(mVertexes, mSkin->getBorder());
-/*
- g->drawImageRect(0, 0, getWidth(),
- getHeight(), mSkin->getBorder());
-*/
-
// Draw title
if (mShowTitle)
{
- g->setColor(Theme::getThemeColor(Theme::TEXT));
+ g->setColor(getForegroundColor());
g->setFont(mCaptionFont);
g->drawText(getCaption(), 7, 5, gcn::Graphics::LEFT);
}
@@ -162,9 +159,9 @@ void Window::draw(gcn::Graphics *graphics)
// Draw Close Button
if (mCloseButton && mSkin->getCloseImage())
{
- g->drawImage(mSkin->getCloseImage(),
- getWidth() - mSkin->getCloseImage()->getWidth() - getPadding(),
- getPadding());
+ Image *button = mSkin->getCloseImage();
+ const int x = getWidth() - button->getWidth() - getPadding();
+ g->drawImage(button, x, getPadding());
}
// Draw Sticky Button
@@ -175,7 +172,7 @@ void Window::draw(gcn::Graphics *graphics)
{
int x = getWidth() - button->getWidth() - getPadding();
if (mCloseButton && mSkin->getCloseImage())
- x -= mSkin->getCloseImage()->getWidth();
+ x -= mSkin->getCloseImage()->getWidth() + getPadding();
g->drawImage(button, x, getPadding());
}
@@ -371,7 +368,7 @@ void Window::widgetHidden(const gcn::Event &event A_UNUSED)
if (gui)
gui->setCursorType(Gui::CURSOR_POINTER);
- WidgetListIterator it;
+ WidgetListConstIterator it;
if (!mFocusHandler)
return;
@@ -403,6 +400,13 @@ void Window::setSticky(bool sticky)
mSticky = sticky;
}
+void Window::setStickyButtonLock(bool lock)
+{
+ mStickyButtonLock = lock;
+ mStickyButton = lock;
+// mMovable = false;
+}
+
void Window::setVisible(bool visible)
{
setVisible(visible, false);
@@ -417,7 +421,10 @@ void Window::setVisible(bool visible, bool forceSticky)
if (visible)
checkIfIsOffScreen();
- gcn::Window::setVisible((!forceSticky && isSticky()) || visible);
+ if (isStickyButtonLock())
+ gcn::Window::setVisible(visible);
+ else
+ gcn::Window::setVisible((!forceSticky && isSticky()) || visible);
}
void Window::scheduleDelete()
@@ -483,7 +490,10 @@ void Window::mousePressed(gcn::MouseEvent &event)
// Handle window resizing
mouseResize = getResizeHandles(event);
- mMoved = !mouseResize;
+ if (canMove())
+ mMoved = !mouseResize;
+ else
+ mMoved = false;
}
}
@@ -545,10 +555,24 @@ void Window::mouseMoved(gcn::MouseEvent &event)
viewport->hideBeingPopup();
}
+bool Window::canMove()
+{
+ return !mStickyButtonLock || !mSticky;
+}
+
void Window::mouseDragged(gcn::MouseEvent &event)
{
- // Let Guichan handle title bar drag
- gcn::Window::mouseDragged(event);
+ if (canMove())
+ {
+ // Let Guichan handle title bar drag
+ gcn::Window::mouseDragged(event);
+ }
+ else
+ {
+ if (!event.isConsumed() && event.getSource() == this)
+ event.consume();
+ return;
+ }
// Keep guichan window inside screen when it may be moved
if (isMovable() && mMoved)
@@ -639,21 +663,22 @@ void Window::setModal(bool modal)
void Window::loadWindowState()
{
const std::string &name = mWindowName;
- assert(!name.empty());
+ if (name.empty())
+ return;
setPosition(config.getValueInt(name + "WinX", mDefaultX),
- config.getValueInt(name + "WinY", mDefaultY));
+ config.getValueInt(name + "WinY", mDefaultY));
if (mSaveVisible)
{
setVisible(config.getValueBool(name
- + "Visible", mDefaultVisible));
+ + "Visible", mDefaultVisible));
}
if (mStickyButton)
{
setSticky(config.getValueBool(name
- + "Sticky", isSticky()));
+ + "Sticky", isSticky()));
}
if (mGrip)
@@ -685,10 +710,10 @@ void Window::loadWindowState()
int width = getWidth();
int height = getHeight();
- if (getX() + width >= viewport->getWidth())
- width = viewport->getWidth() - getX() - 1;
- if (getY() + height >= viewport->getHeight())
- height = viewport->getHeight() - getY() - 1;
+ if (getX() + width > viewport->getWidth())
+ width = viewport->getWidth() - getX();
+ if (getY() + height > viewport->getHeight())
+ height = viewport->getHeight() - getY();
if (width < 0)
width = 0;
if (height < 0)
@@ -815,7 +840,7 @@ void Window::resetToDefaultSize()
int Window::getResizeHandles(gcn::MouseEvent &event)
{
- if (event.getX() < 0 || event.getY() < 0)
+ if ((mStickyButtonLock && mSticky) || event.getX() < 0 || event.getY() < 0)
return 0;
int resizeHandles = 0;
diff --git a/src/gui/widgets/window.h b/src/gui/widgets/window.h
index d36d6c5ad..b9f65dceb 100644
--- a/src/gui/widgets/window.h
+++ b/src/gui/widgets/window.h
@@ -189,6 +189,17 @@ class Window : public gcn::Window, gcn::WidgetListener
{ return mSticky; }
/**
+ * Sets whether the window sticky mean window locked or not.
+ */
+ void setStickyButtonLock(bool sticky);
+
+ /**
+ * Returns whether the window sticky locking window.
+ */
+ bool isStickyButtonLock() const
+ { return mStickyButtonLock; }
+
+ /**
* Overloads window setVisible by Guichan to allow sticky window
* handling.
*/
@@ -387,6 +398,9 @@ class Window : public gcn::Window, gcn::WidgetListener
void setCaptionFont(gcn::Font *font)
{ mCaptionFont = font; }
+ protected:
+ bool canMove();
+
private:
enum ResizeHandles
{
@@ -423,6 +437,7 @@ class Window : public gcn::Window, gcn::WidgetListener
bool mSaveVisible; /**< Window will save visibility */
bool mStickyButton; /**< Window has a sticky button */
bool mSticky; /**< Window resists hiding*/
+ bool mStickyButtonLock; /**< Window locked if sticky enabled*/
int mMinWinWidth; /**< Minimum window width */
int mMinWinHeight; /**< Minimum window height */
int mMaxWinWidth; /**< Maximum window width */
diff --git a/src/guild.cpp b/src/guild.cpp
index b84602858..98e5bb519 100644
--- a/src/guild.cpp
+++ b/src/guild.cpp
@@ -24,6 +24,8 @@
#include "actorspritemanager.h"
+#include "utils/stringutils.h"
+
#include "debug.h"
class SortGuildFunctor
@@ -33,10 +35,22 @@ class SortGuildFunctor
{
if (!m1 || !m2)
return false;
+
+ if (m1->getOnline() != m2->getOnline())
+ return m1->getOnline() > m2->getOnline();
+
if (m1->getPos() != m2->getPos())
- return m1->getPos() < m2->getPos();
+ return m1->getPos() > m2->getPos();
- return m1->getName() < m2->getName();
+ if (m1->getName() != m2->getName())
+ {
+ std::string s1 = m1->getName();
+ std::string s2 = m2->getName();
+ toLower(s1);
+ toLower(s2);
+ return s1 < s2;
+ }
+ return false;
}
} guildSorter;
@@ -66,7 +80,8 @@ Guild::GuildMap Guild::guilds;
Guild::Guild(short id):
mId(id),
mCanInviteUsers(false),
- mEmblemId(0)
+ mEmblemId(0),
+ mServerGuild(true)
{
guilds[id] = this;
}
diff --git a/src/guild.h b/src/guild.h
index 7986eb5d3..62135e9ad 100644
--- a/src/guild.h
+++ b/src/guild.h
@@ -178,11 +178,17 @@ public:
void setEmblemId(int id)
{ mEmblemId = id; }
- int getEmblemId()
+ int getEmblemId() const
{ return mEmblemId; }
static void clearGuilds();
+ void setServerGuild(bool b)
+ { mServerGuild = b; }
+
+ bool getServerGuild() const
+ { return mServerGuild; }
+
private:
typedef std::map<int, Guild*> GuildMap;
static GuildMap guilds;
@@ -199,6 +205,7 @@ private:
bool mCanInviteUsers;
int mEmblemId;
PositionsMap mPositions;
+ bool mServerGuild;
};
#endif // GUILD_H
diff --git a/src/guildmanager.cpp b/src/guildmanager.cpp
new file mode 100644
index 000000000..1a8d5b433
--- /dev/null
+++ b/src/guildmanager.cpp
@@ -0,0 +1,477 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2011 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "guildmanager.h"
+
+#include "actorspritemanager.h"
+#include "client.h"
+#include "configuration.h"
+#include "guild.h"
+#include "localplayer.h"
+
+#include "gui/socialwindow.h"
+
+#include "gui/widgets/guildchattab.h"
+
+#include "net/chathandler.h"
+#include "net/net.h"
+
+#include "utils/gettext.h"
+#include "utils/stringutils.h"
+
+#include "debug.h"
+
+bool GuildManager::mEnableGuildBot = false;
+
+GuildManager::GuildManager() :
+ mGotInfo(false),
+ mGotName(false),
+ mHavePower(false),
+ mTab(0),
+ mRequest(false)
+{
+}
+
+GuildManager::~GuildManager()
+{
+ delete mTab;
+ mTab = 0;
+}
+
+void GuildManager::init()
+{
+ if (guildManager)
+ return;
+
+ int val = serverConfig.getValue("enableGuildBot", -1);
+ if (val == -1)
+ {
+ if (Client::isTmw())
+ val = 1;
+ else
+ val = 0;
+ serverConfig.setValue("enableGuildBot", val);
+ }
+ mEnableGuildBot = val;
+ if (mEnableGuildBot)
+ guildManager = new GuildManager();
+}
+
+void GuildManager::reload()
+{
+ mGotInfo = false;
+ mGotName = false;
+ mHavePower = false;
+ mRequest = false;
+ mTempList.clear();
+
+ if (socialWindow)
+ {
+ Guild *guild = Guild::getGuild(1);
+ if (guild)
+ socialWindow->removeTab(guild);
+ }
+ delete mTab;
+ mTab = 0;
+}
+
+void GuildManager::send(std::string msg)
+{
+ Net::getChatHandler()->privateMessage("guild", msg);
+}
+
+void GuildManager::chat(std::string msg)
+{
+ if (!player_node || !mTab)
+ return;
+
+ Net::getChatHandler()->privateMessage("guild", msg);
+ mTab->chatLog(player_node->getName(), msg);
+}
+
+void GuildManager::getNames(std::vector<std::string> &names)
+{
+ Guild *guild = createGuild();
+ guild->getNames(names);
+}
+
+void GuildManager::requestGuildInfo()
+{
+ if (mRequest)
+ return;
+
+ if (!mGotName)
+ {
+ send("!info " + toString(tick_time));
+ mRequest = true;
+ }
+ else if (!mGotInfo)
+ {
+ send("!getonlineinfo " + toString(tick_time));
+ mRequest = true;
+ }
+}
+
+void GuildManager::updateList()
+{
+ Guild *guild = Guild::getGuild(1);
+ if (guild)
+ {
+ guild->setServerGuild(false);
+ std::vector<std::string>::iterator it = mTempList.begin();
+ std::vector<std::string>::iterator it_end = mTempList.end();
+ int i = 0;
+ while (it != it_end)
+ {
+ std::string name = *it;
+ if (name.size() > 1)
+ {
+ int status = atoi(name.substr(name.size() - 1).c_str());
+
+ name = name.substr(0, name.size() - 1);
+ GuildMember *m = guild->addMember(i, 0, name);
+ if (m)
+ {
+ m->setOnline(status & 1);
+ m->setGender(GENDER_UNSPECIFIED);
+ if (status & 2)
+ m->setPos(10);
+ else
+ m->setPos(0);
+ if (player_node && name == player_node->getName())
+ {
+ mHavePower = (status & 2);
+ m->setOnline(true);
+ }
+ }
+ }
+ ++ it;
+ i ++;
+ }
+ guild->sort();
+ createTab(guild);
+ if (actorSpriteManager)
+ {
+ actorSpriteManager->updatePlayerGuild();
+ actorSpriteManager->updatePlayerColors();
+ }
+ }
+ mTempList.clear();
+ mGotInfo = true;
+}
+
+void GuildManager::createTab(Guild *guild)
+{
+ if (!mTab)
+ {
+ mTab = new GuildChatTab();
+ mTab->loadFromLogFile("#Guild");
+ if (player_node)
+ player_node->addGuild(guild);
+ }
+}
+
+Guild *GuildManager::createGuild()
+{
+ Guild *guild = Guild::getGuild(1);
+ if (!guild)
+ return 0;
+
+ guild->setServerGuild(false);
+ return guild;
+}
+
+bool GuildManager::processGuildMessage(std::string msg)
+{
+ bool res = process(msg);
+
+ if (!mRequest)
+ requestGuildInfo();
+
+ return res;
+}
+
+bool GuildManager::process(std::string msg)
+{
+ if (msg.size() > 4 && msg[0] == '#' && msg[1] == '#')
+ msg = msg.substr(3);
+
+ bool haveNick = (msg.find(": ") != std::string::npos);
+
+ if (!haveNick && findCutLast(msg, " is now Offline."))
+ {
+ Guild *guild = createGuild();
+ if (!guild)
+ return false;
+ if (msg.size() < 4)
+ return false;
+ if (msg[0] == '#' && msg[1] == '#')
+ msg = msg.substr(3);
+
+ GuildMember *m = guild->addMember(msg);
+ if (m)
+ m->setOnline(false);
+ guild->sort();
+ mRequest = false;
+ return true;
+ }
+ else if (!haveNick && findCutLast(msg, " is now Online."))
+ {
+ Guild *guild = createGuild();
+ if (!guild)
+ return false;
+ if (msg.size() < 4)
+ return false;
+ if (msg[0] == '#' && msg[1] == '#')
+ msg = msg.substr(3);
+ GuildMember *m = guild->addMember(msg);
+ if (m)
+ m->setOnline(true);
+ guild->sort();
+ mRequest = false;
+ return true;
+ }
+ else if (findCutFirst(msg, "Welcome to the "))
+ {
+ Guild *guild = createGuild();
+ if (!guild)
+ return false;
+// logger->log("welcome message: %s", msg.c_str());
+ int pos = msg.find("! (");
+ if (pos == (int)std::string::npos)
+ return false;
+ msg = msg.substr(0, pos);
+ guild->setName(msg);
+ if (player_node)
+ player_node->setGuildName(msg);
+ mGotName = true;
+ mRequest = false;
+ return true;
+ }
+ else if (findCutFirst(msg, "Player name: "))
+ {
+ Guild *guild = createGuild();
+ if (!guild)
+ return false;
+ int pos = msg.find("Access Level: ");
+ if (pos == (int)std::string::npos)
+ return false;
+
+ msg = msg.substr(pos);
+ if (!findCutFirst(msg, "Access Level: "))
+ return false;
+
+ pos = msg.find(", Guild:");
+ if (pos == (int)std::string::npos)
+ return false;
+
+ int level = atoi(msg.substr(0, pos).c_str());
+ if (level >= 10)
+ mHavePower = true;
+ else
+ mHavePower = false;
+
+ msg = msg.substr(pos + strlen(", Guild:"));
+ pos = msg.find(", No. Of Online Players: ");
+ if (pos == (int)std::string::npos)
+ return false;
+
+ msg = msg.substr(0, pos);
+// logger->log("guild name: %s", msg.c_str());
+
+ guild->setName(msg);
+ if (player_node)
+ player_node->setGuildName(msg);
+ mGotName = true;
+ mRequest = false;
+ return true;
+ }
+ else if (findCutFirst(msg, "OL#"))
+ {
+// logger->log("OL");
+ mTempList.clear();
+ splitToStringVector(mTempList, msg, '#');
+ if (msg.size() < 1 || msg[msg.size() - 1] != '#')
+ updateList();
+ mRequest = false;
+ return true;
+ }
+ else if (findCutFirst(msg, "oL#"))
+ {
+// logger->log("oL");
+ splitToStringVector(mTempList, msg, '#');
+ if (msg.size() < 1 || msg[msg.size() - 1] != '#')
+ updateList();
+ mRequest = false;
+ return true;
+ }
+ else if (msg == "You are currently not in a guild. For more information "
+ "or to discuss the possibility of adding you own guild "
+ "please contact Jero.")
+ {
+ mRequest = true;
+ return true;
+ }
+ else if (findCutFirst(msg, "You have been invited to the ")
+ && findCutLast(msg, " guild chat. If you would like to accept "
+ "this invitation please reply \"yes\" and if not then \"no\" ."))
+ {
+ if (socialWindow)
+ socialWindow->showGuildInvite(msg, 1, "");
+ return true;
+ }
+ else if (!haveNick && (findCutLast(msg, " has been removed "
+ "from the Guild.") || findCutLast(msg," has left the Guild.")))
+ {
+ Guild *guild = createGuild();
+ if (!guild)
+ return false;
+ if (msg.size() < 4)
+ return false;
+ if (msg[0] == '#' && msg[1] == '#')
+ msg = msg.substr(3);
+
+ if (actorSpriteManager)
+ {
+ Being *b = actorSpriteManager->findBeingByName(
+ msg, Being::PLAYER);
+
+ if (b)
+ {
+ b->clearGuilds();
+ b->setGuildName("");
+ b->updateColors();
+ }
+ }
+
+ guild->removeMember(msg);
+ return true;
+ }
+ else if (msg == "You have been removed from the Guild"
+ || msg == "You have left the Guild")
+ {
+ return afterRemove();
+ }
+ else
+ {
+ Guild *guild = createGuild();
+ if (!guild)
+ return false;
+ if (!mTab)
+ {
+ createTab(guild);
+ }
+ if (mTab)
+ {
+ std::string::size_type pos = msg.find(": ", 0);
+ if (pos != std::string::npos)
+ {
+ std::string sender_name = ((pos == std::string::npos)
+ ? "" : msg.substr(0, pos));
+ if (!guild->getMember(sender_name))
+ {
+ mTab->chatLog(msg);
+ return true;
+ }
+
+ msg.erase(0, pos + 2);
+ if (msg.size() > 3 && msg[0] == '#' && msg[1] == '#')
+ msg.erase(0, 3);
+
+ trim(msg);
+ mTab->chatLog(sender_name, msg);
+ }
+ else
+ {
+ mTab->chatLog(msg);
+ }
+ return true;
+ }
+ }
+ return false;
+}
+
+void GuildManager::kick(std::string msg)
+{
+ send("!remove " + msg);
+}
+
+void GuildManager::invite(std::string msg)
+{
+ send("!invite " + msg);
+}
+
+void GuildManager::leave()
+{
+ send("!leave");
+}
+
+void GuildManager::notice(std::string msg)
+{
+ if (msg.empty())
+ send("!removemotd");
+ else
+ send("!setmotd " + msg);
+}
+
+void GuildManager::clear()
+{
+ if (socialWindow)
+ {
+ Guild *guild = Guild::getGuild(1);
+ if (guild)
+ socialWindow->removeTab(guild);
+ }
+}
+
+void GuildManager::inviteResponse(bool response)
+{
+ if (response)
+ send("yes");
+ else
+ send("no");
+}
+
+bool GuildManager::afterRemove()
+{
+ Guild *guild = createGuild();
+ if (!guild)
+ return false;
+ guild->removeFromMembers();
+ guild->clearMembers();
+ if (player_node)
+ {
+ player_node->setGuildName("");
+ player_node->clearGuilds();
+ }
+ SERVER_NOTICE(_("You have left the guild."))
+ delete mTab;
+ mTab = 0;
+
+ if (socialWindow)
+ socialWindow->removeTab(guild);
+ if (actorSpriteManager)
+ {
+ actorSpriteManager->updatePlayerGuild();
+ actorSpriteManager->updatePlayerColors();
+ }
+ reload();
+ return true;
+}
diff --git a/src/guildmanager.h b/src/guildmanager.h
new file mode 100644
index 000000000..80014e352
--- /dev/null
+++ b/src/guildmanager.h
@@ -0,0 +1,94 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2011 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef GUILDMANAGER_H
+#define GUILDMANAGER_H
+
+#include "utils/dtor.h"
+
+#include <map>
+#include <string>
+#include <vector>
+
+class Guild;
+class GuildChatTab;
+
+class GuildManager
+{
+ public:
+ GuildManager();
+
+ ~GuildManager();
+
+ static void init();
+
+ void chat(std::string msg);
+
+ void send(std::string msg);
+
+ bool processGuildMessage(std::string msg);
+
+ void getNames(std::vector<std::string> &names);
+
+ void requestGuildInfo();
+
+ void updateList();
+
+ static bool getEnableGuildBot()
+ { return mEnableGuildBot; }
+
+ void kick(std::string msg);
+
+ void invite(std::string msg);
+
+ void leave();
+
+ void notice(std::string msg);
+
+ void createTab(Guild *guild);
+
+ Guild *createGuild();
+
+ void clear();
+
+ void reload();
+
+ void inviteResponse(bool response);
+
+ bool afterRemove();
+
+ bool havePower()
+ { return mHavePower; }
+
+ private:
+ bool process(std::string msg);
+
+ static bool mEnableGuildBot;
+ bool mGotInfo;
+ bool mGotName;
+ bool mHavePower;
+ std::vector<std::string> mTempList;
+ GuildChatTab *mTab;
+ bool mRequest;
+};
+
+extern GuildManager *guildManager;
+
+#endif // GUILDMANAGER_H
diff --git a/src/joystick.cpp b/src/joystick.cpp
index 8f808a2d1..f45729351 100644
--- a/src/joystick.cpp
+++ b/src/joystick.cpp
@@ -24,8 +24,6 @@
#include "joystick.h"
#include "logger.h"
-#include <cassert>
-
#include "debug.h"
int Joystick::joystickCount = 0;
@@ -48,7 +46,8 @@ Joystick::Joystick(int no):
mCalibrating(false),
mEnabled(false)
{
- assert(no < joystickCount);
+ if (no >= joystickCount)
+ no = joystickCount;
mJoystick = SDL_JoystickOpen(no);
diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index 5192390bc..e9386a5ee 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -78,8 +78,6 @@
#include "utils/gettext.h"
#include "utils/stringutils.h"
-#include <cassert>
-
#include "mumblemanager.h"
#include "debug.h"
diff --git a/src/main.h b/src/main.h
index 9f8bbc6ac..f8b6d97ba 100644
--- a/src/main.h
+++ b/src/main.h
@@ -85,8 +85,8 @@
//define DEBUG_ALPHA_CACHE 1
//define DEBUG_OPENGL_LEAKS 1
-#define SMALL_VERSION "1.1.8.21"
-#define CHECK_VERSION "01.01.08.21"
+#define SMALL_VERSION "1.1.9.4"
+#define CHECK_VERSION "01.01.09.04"
#define PACKAGE_EXTENDED_VERSION "ManaPlus (" PACKAGE_OS \
diff --git a/src/map.cpp b/src/map.cpp
index 700f6d0d2..947bb8f09 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -918,7 +918,7 @@ void Map::draw(Graphics *graphics, int scrollX, int scrollY)
}
}
- // Dont draw if gui opacity == 1
+ // Don't draw if gui opacity == 1
if (mBeingOpacity && mOpacity != 1.0f)
{
// Draws beings with a lower opacity to make them visible
@@ -2015,7 +2015,10 @@ void Map::reduce()
{
MapLayer *layer = *ri;
if (x >= layer->mWidth || y >= layer->mHeight)
+ {
+ ++ ri;
continue;
+ }
Image *img = layer->mTiles[x + y * layer->mWidth];
if (img && !img->isAlphaVisible())
diff --git a/src/net/ea/beinghandler.cpp b/src/net/ea/beinghandler.cpp
index 06e86f8a4..4a5cfb841 100644
--- a/src/net/ea/beinghandler.cpp
+++ b/src/net/ea/beinghandler.cpp
@@ -29,6 +29,7 @@
#include "client.h"
#include "effectmanager.h"
#include "guild.h"
+#include "guildmanager.h"
#include "keyboardconfig.h"
#include "localplayer.h"
#include "logger.h"
@@ -661,7 +662,8 @@ void BeingHandler::processPlayerGuilPartyInfo(Net::MessageIn &msg)
if ((dstBeing = actorSpriteManager->findBeing(msg.readInt32())))
{
dstBeing->setPartyName(msg.readString(24));
- dstBeing->setGuildName(msg.readString(24));
+ if (!guildManager || !GuildManager::getEnableGuildBot())
+ dstBeing->setGuildName(msg.readString(24));
dstBeing->setGuildPos(msg.readString(24));
dstBeing->addToCache();
msg.readString(24); // Discard this
diff --git a/src/net/ea/chathandler.cpp b/src/net/ea/chathandler.cpp
index c188a2204..5737cc2b2 100644
--- a/src/net/ea/chathandler.cpp
+++ b/src/net/ea/chathandler.cpp
@@ -25,6 +25,7 @@
#include "actorspritemanager.h"
#include "being.h"
#include "configuration.h"
+#include "guildmanager.h"
#include "localplayer.h"
#include "playerrelations.h"
#include "logger.h"
@@ -161,6 +162,12 @@ void ChatHandler::processWhisper(Net::MessageIn &msg)
if (nick != "Server")
{
+ if (guildManager && GuildManager::getEnableGuildBot()
+ && nick == "guild" && guildManager->processGuildMessage(chatMsg))
+ {
+ return;
+ }
+
if (player_relations.hasPermission(
nick, PlayerRelation::WHISPER))
{
diff --git a/src/net/ea/guildhandler.cpp b/src/net/ea/guildhandler.cpp
index 0210a76ff..2accb1f1d 100644
--- a/src/net/ea/guildhandler.cpp
+++ b/src/net/ea/guildhandler.cpp
@@ -125,6 +125,7 @@ void GuildHandler::processGuildPositionInfo(Net::MessageIn &msg)
if (!guildTab && chatWindow)
{
guildTab = new GuildTab();
+ guildTab->loadFromLogFile("#Guild");
if (player_node)
player_node->addGuild(taGuild);
memberList(guildId);
diff --git a/src/net/ea/partyhandler.cpp b/src/net/ea/partyhandler.cpp
index 045a2332b..bd6f19d97 100644
--- a/src/net/ea/partyhandler.cpp
+++ b/src/net/ea/partyhandler.cpp
@@ -359,6 +359,7 @@ void PartyHandler::processPartyLeave(Net::MessageIn &msg)
if (socialWindow && Ea::taParty)
socialWindow->removeTab(Ea::taParty);
+ player_node->setPartyName("");
}
else
{
@@ -372,7 +373,10 @@ void PartyHandler::processPartyLeave(Net::MessageIn &msg)
{
Being *b = actorSpriteManager->findBeing(id);
if (b && b->getType() == Being::PLAYER)
+ {
b->setParty(0);
+ b->setPartyName("");
+ }
}
if (Ea::taParty)
Ea::taParty->removeMember(id);
diff --git a/src/net/ea/playerhandler.cpp b/src/net/ea/playerhandler.cpp
index 4198c14ad..3af237b5b 100644
--- a/src/net/ea/playerhandler.cpp
+++ b/src/net/ea/playerhandler.cpp
@@ -359,9 +359,11 @@ void PlayerHandler::processPlayerStatUpdate1(Net::MessageIn &msg)
case 0x0029:
PlayerInfo::setStatBase(EA_ATK, value);
+ PlayerInfo::updateAttrs();
break;
case 0x002a:
PlayerInfo::setStatMod(EA_ATK, value);
+ PlayerInfo::updateAttrs();
break;
case 0x002b:
@@ -402,8 +404,9 @@ void PlayerHandler::processPlayerStatUpdate1(Net::MessageIn &msg)
case 0x0035:
player_node->setAttackSpeed(value);
- PlayerInfo::setStatBase(ATTACK_SPEED, value);
- PlayerInfo::setStatMod(ATTACK_SPEED, 0);
+ PlayerInfo::setStatBase(ATTACK_DELAY, value);
+ PlayerInfo::setStatMod(ATTACK_DELAY, 0);
+ PlayerInfo::updateAttrs();
break;
case 0x0037:
@@ -484,6 +487,8 @@ void PlayerHandler::processPlayerStatUpdate3(Net::MessageIn &msg)
PlayerInfo::setStatBase(type, base, false);
PlayerInfo::setStatMod(type, bonus);
+ if (type == EA_ATK || type == ATTACK_DELAY)
+ PlayerInfo::updateAttrs();
}
void PlayerHandler::processPlayerStatUpdate4(Net::MessageIn &msg)
@@ -552,6 +557,7 @@ void PlayerHandler::processPlayerStatUpdate5(Net::MessageIn &msg)
PlayerInfo::setStatBase(EA_ATK, msg.readInt16(), false);
PlayerInfo::setStatMod(EA_ATK, msg.readInt16());
+ PlayerInfo::updateAttrs();
val = msg.readInt16();
PlayerInfo::setStatBase(EA_MATK, val, false);
@@ -636,4 +642,8 @@ int PlayerHandler::getJobLocation() const
return EA_JOB;
}
+int PlayerHandler::getAttackLocation() const
+{
+ return EA_ATK;
+}
} // namespace Ea
diff --git a/src/net/ea/playerhandler.h b/src/net/ea/playerhandler.h
index 8b8751630..57bcbdcd5 100644
--- a/src/net/ea/playerhandler.h
+++ b/src/net/ea/playerhandler.h
@@ -55,6 +55,8 @@ class PlayerHandler : public Net::PlayerHandler
int getJobLocation() const;
+ int getAttackLocation() const;
+
void processWalkResponse(Net::MessageIn &msg);
void processPlayerWarp(Net::MessageIn &msg);
diff --git a/src/net/manaserv/adminhandler.cpp b/src/net/manaserv/adminhandler.cpp
index 2c76e99a3..a8860d73b 100644
--- a/src/net/manaserv/adminhandler.cpp
+++ b/src/net/manaserv/adminhandler.cpp
@@ -91,7 +91,8 @@ void AdminHandler::mute(int playerId A_UNUSED, int type A_UNUSED,
// TODO
}
-void AdminHandler::warp(std::string map, int x, int y)
+void AdminHandler::warp(std::string map A_UNUSED,
+ int x A_UNUSED, int y A_UNUSED)
{
// TODO
}
diff --git a/src/net/manaserv/adminhandler.h b/src/net/manaserv/adminhandler.h
index 65e9ea2b0..17d296bd6 100644
--- a/src/net/manaserv/adminhandler.h
+++ b/src/net/manaserv/adminhandler.h
@@ -24,6 +24,7 @@
#define NET_MANASERV_ADMINHANDLER_H
#include "net/adminhandler.h"
+#include "string"
#ifdef __GNUC__
#define A_UNUSED __attribute__ ((unused))
diff --git a/src/net/manaserv/messagehandler.cpp b/src/net/manaserv/messagehandler.cpp
index 7524c95e8..2e9603f19 100644
--- a/src/net/manaserv/messagehandler.cpp
+++ b/src/net/manaserv/messagehandler.cpp
@@ -24,8 +24,6 @@
#include "net/manaserv/network.h"
-#include <cassert>
-
namespace ManaServ
{
diff --git a/src/net/manaserv/playerhandler.cpp b/src/net/manaserv/playerhandler.cpp
index 3dfddb436..da8958044 100644
--- a/src/net/manaserv/playerhandler.cpp
+++ b/src/net/manaserv/playerhandler.cpp
@@ -432,6 +432,11 @@ int PlayerHandler::getJobLocation() const
return -1;
}
+int PlayerHandler::getAttackLocation() const
+{
+ return -1;
+}
+
Vector PlayerHandler::getDefaultWalkSpeed() const
{
// Return translation in pixels per ticks.
diff --git a/src/net/manaserv/playerhandler.h b/src/net/manaserv/playerhandler.h
index dcd05d5fc..f00fea42a 100644
--- a/src/net/manaserv/playerhandler.h
+++ b/src/net/manaserv/playerhandler.h
@@ -74,6 +74,7 @@ class PlayerHandler : public MessageHandler, public Net::PlayerHandler
bool canCorrectAttributes() const;
int getJobLocation() const;
+ int getAttackLocation() const;
Vector getDefaultWalkSpeed() const;
diff --git a/src/net/playerhandler.h b/src/net/playerhandler.h
index 2abd12d57..47d666036 100644
--- a/src/net/playerhandler.h
+++ b/src/net/playerhandler.h
@@ -68,6 +68,8 @@ class PlayerHandler
virtual int getJobLocation() const = 0;
+ virtual int getAttackLocation() const = 0;
+
virtual Vector getDefaultWalkSpeed() const = 0;
};
diff --git a/src/net/tmwa/beinghandler.cpp b/src/net/tmwa/beinghandler.cpp
index 17503a406..ce2db733f 100644
--- a/src/net/tmwa/beinghandler.cpp
+++ b/src/net/tmwa/beinghandler.cpp
@@ -331,6 +331,9 @@ void BeingHandler::processBeingChangeLook(Net::MessageIn &msg, bool look2)
dstBeing->setSpriteColor(SPRITE_HAIR,
ColorDB::getHairColor(id));
break;
+ case 7: // Clothes color
+ // ignoring it
+ break;
case 8: // eAthena LOOK_SHIELD
if (!config.getBoolValue("hideShield"))
{
@@ -552,7 +555,7 @@ void BeingHandler::processPlayerMoveUpdate(Net::MessageIn &msg, int msgType)
dstBeing->setTileCoords(srcX, srcY);
dstBeing->setDestination(dstX, dstY);
- // because server dont send direction in move packet,
+ // because server don't send direction in move packet,
// we fixing it
if (srcX != dstX || srcY != dstY)
diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp
index 746cb6620..e1b565399 100644
--- a/src/net/tmwa/generalhandler.cpp
+++ b/src/net/tmwa/generalhandler.cpp
@@ -67,7 +67,6 @@
#include "utils/gettext.h"
-#include <assert.h>
#include <list>
#include "debug.h"
@@ -273,12 +272,14 @@ void GeneralHandler::event(Mana::Channels channel,
statusWindow->addAttribute(FLEE, _("% Evade"), false, "");
// xgettext:no-c-format
statusWindow->addAttribute(CRIT, _("% Critical"), false, "");
- statusWindow->addAttribute(ATTACK_SPEED, _("Attack Delay"),
+ statusWindow->addAttribute(ATTACK_DELAY, _("Attack Delay"),
false, "");
statusWindow->addAttribute(WALK_SPEED, _("Walk Delay"),
false, "");
statusWindow->addAttribute(ATTACK_RANGE, _("Attack Range"),
false, "");
+ statusWindow->addAttribute(ATTACK_SPEED, _("Damage per sec."),
+ false, "");
}
else if (event.getName() == Mana::EVENT_GUIWINDOWSUNLOADING)
{
diff --git a/src/particlecontainer.cpp b/src/particlecontainer.cpp
index d00c68a63..70b1e2c84 100644
--- a/src/particlecontainer.cpp
+++ b/src/particlecontainer.cpp
@@ -20,8 +20,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <cassert>
-
#include "particle.h"
#include "particlecontainer.h"
diff --git a/src/party.h b/src/party.h
index 466f63a19..e286a794a 100644
--- a/src/party.h
+++ b/src/party.h
@@ -149,6 +149,11 @@ public:
void sort();
+ typedef std::vector<PartyMember*> MemberList;
+
+ MemberList *getMembers()
+ { return &mMembers; }
+
static Party *getParty(short id);
static void clearParties();
@@ -164,7 +169,6 @@ private:
~Party();
- typedef std::vector<PartyMember*> MemberList;
MemberList mMembers;
std::string mName;
short mId;
diff --git a/src/playerinfo.cpp b/src/playerinfo.cpp
index 3bb196921..769d24a16 100644
--- a/src/playerinfo.cpp
+++ b/src/playerinfo.cpp
@@ -31,6 +31,9 @@
#include "resources/itemdb.h"
#include "resources/iteminfo.h"
+#include "net/net.h"
+#include "net/playerhandler.h"
+
#include "debug.h"
namespace PlayerInfo
@@ -280,6 +283,23 @@ void setTrading(bool trading)
}
}
+void updateAttrs()
+{
+ int attr = Net::getPlayerHandler()->getAttackLocation();
+ if (attr != -1 && getStatBase(ATTACK_DELAY))
+ {
+ setStatBase(ATTACK_SPEED, getStatBase(attr) * 1000 / getStatBase(
+ ATTACK_DELAY), false);
+ setStatMod(ATTACK_SPEED, getStatMod(attr) * 1000 / getStatBase(
+ ATTACK_DELAY), true);
+ }
+ else
+ {
+ setStatBase(ATTACK_SPEED, 0, false);
+ setStatMod(ATTACK_SPEED, 0, true);
+ }
+}
+
class PlayerInfoListener : Mana::Listener
{
public:
diff --git a/src/playerinfo.h b/src/playerinfo.h
index 401dd26e0..b90e47ce9 100644
--- a/src/playerinfo.h
+++ b/src/playerinfo.h
@@ -45,9 +45,10 @@ enum Attribute
SKILL_POINTS,
CHAR_POINTS,
CORR_POINTS,
- ATTACK_SPEED = 100,
+ ATTACK_DELAY = 100,
ATTACK_RANGE = 101,
- WALK_SPEED = 102
+ WALK_SPEED = 102,
+ ATTACK_SPEED = 103
};
/**
@@ -218,6 +219,8 @@ namespace PlayerInfo
*/
void setTrading(bool trading);
+ void updateAttrs();
+
/**
* Initializes some internals.
*/
diff --git a/src/resources/imageloader.cpp b/src/resources/imageloader.cpp
index c63d33c00..72a839573 100644
--- a/src/resources/imageloader.cpp
+++ b/src/resources/imageloader.cpp
@@ -29,8 +29,6 @@
#include <guichan/sdl/sdlpixel.hpp>
-#include <cassert>
-
#include "debug.h"
#ifdef free
@@ -79,12 +77,10 @@ int ProxyImage::getHeight() const
return mImage->mBounds.h;
else
return 0;
-// return mSDLImage ? mSDLImage->h : mImage->getHeight();
}
gcn::Color ProxyImage::getPixel(int x, int y)
{
- assert(mSDLImage);
return gcn::SDLgetPixel(mSDLImage, x, y);
}
diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp
index e60127997..733c12958 100644
--- a/src/resources/itemdb.cpp
+++ b/src/resources/itemdb.cpp
@@ -36,8 +36,6 @@
#include <libxml/tree.h>
-#include <cassert>
-
#include "debug.h"
namespace
@@ -435,7 +433,8 @@ void ItemDB::unload()
bool ItemDB::exists(int id)
{
- assert(mLoaded);
+ if (!mLoaded)
+ return false;
ItemInfos::const_iterator i = mItemInfos.find(id);
@@ -444,7 +443,8 @@ bool ItemDB::exists(int id)
const ItemInfo &ItemDB::get(int id)
{
- assert(mLoaded);
+ if (!mLoaded)
+ load();
ItemInfos::const_iterator i = mItemInfos.find(id);
@@ -459,7 +459,8 @@ const ItemInfo &ItemDB::get(int id)
const ItemInfo &ItemDB::get(const std::string &name)
{
- assert(mLoaded);
+ if (!mLoaded)
+ load();
NamedItemInfos::const_iterator i = mNamedItemInfos.find(normalize(name));
@@ -560,6 +561,10 @@ int parseDirectionName(std::string name)
id = DIRECTION_RIGHT;
else if (name == "downright" || name == "rightdown")
id = DIRECTION_DOWNRIGHT;
+ else if (name == "downall")
+ id = -2;
+ else if (name == "upall")
+ id = -3;
return id;
}
@@ -593,7 +598,7 @@ void loadSoundRef(ItemInfo *itemInfo, xmlNodePtr node)
else
{
logger->log("ItemDB: Ignoring unknown sound event '%s'",
- event.c_str());
+ event.c_str());
}
}
@@ -624,21 +629,100 @@ void loadReplaceSprite(ItemInfo *itemInfo, xmlNodePtr replaceNode)
std::string removeSprite = XML::getProperty(replaceNode, "sprite", "");
int direction = parseDirectionName(XML::getProperty(
replaceNode, "direction", "all"));
- std::map<int, int> *mapList = itemInfo->addReplaceSprite(
- parseSpriteName(removeSprite), direction);
-
- if (!mapList)
- return;
itemInfo->setRemoveSprites();
- for_each_xml_child_node(itemNode, replaceNode)
+ switch (direction)
{
- if (xmlStrEqual(itemNode->name, BAD_CAST "item"))
+ case -1:
{
- int from = XML::getProperty(itemNode, "from", 0);
- int to = XML::getProperty(itemNode, "to", 1);
- (*mapList)[from] = to;
+ for_each_xml_child_node(itemNode, replaceNode)
+ {
+ if (xmlStrEqual(itemNode->name, BAD_CAST "item"))
+ {
+ int from = XML::getProperty(itemNode, "from", 0);
+ int to = XML::getProperty(itemNode, "to", 1);
+ for (int f = 0; f < 9; f ++)
+ {
+ std::map<int, int> *mapList
+ = itemInfo->addReplaceSprite(
+ parseSpriteName(removeSprite), f);
+ if (!mapList)
+ continue;
+ (*mapList)[from] = to;
+ }
+ }
+ }
+ break;
+ }
+ case -2:
+ {
+ for_each_xml_child_node(itemNode, replaceNode)
+ {
+ if (xmlStrEqual(itemNode->name, BAD_CAST "item"))
+ {
+ int from = XML::getProperty(itemNode, "from", 0);
+ int to = XML::getProperty(itemNode, "to", 1);
+ std::map<int, int> *mapList = itemInfo->addReplaceSprite(
+ parseSpriteName(removeSprite), DIRECTION_DOWN);
+ if (mapList)
+ (*mapList)[from] = to;
+
+ mapList = itemInfo->addReplaceSprite(parseSpriteName(
+ removeSprite), DIRECTION_DOWNLEFT);
+ if (mapList)
+ (*mapList)[from] = to;
+
+ mapList = itemInfo->addReplaceSprite(parseSpriteName(
+ removeSprite), DIRECTION_DOWNRIGHT);
+ if (mapList)
+ (*mapList)[from] = to;
+ }
+ }
+ break;
+ }
+ case -3:
+ {
+ for_each_xml_child_node(itemNode, replaceNode)
+ {
+ if (xmlStrEqual(itemNode->name, BAD_CAST "item"))
+ {
+ int from = XML::getProperty(itemNode, "from", 0);
+ int to = XML::getProperty(itemNode, "to", 1);
+ std::map<int, int> *mapList = itemInfo->addReplaceSprite(
+ parseSpriteName(removeSprite), DIRECTION_UP);
+ if (mapList)
+ (*mapList)[from] = to;
+
+ mapList = itemInfo->addReplaceSprite(parseSpriteName(
+ removeSprite), DIRECTION_UPLEFT);
+ if (mapList)
+ (*mapList)[from] = to;
+
+ mapList = itemInfo->addReplaceSprite(parseSpriteName(
+ removeSprite), DIRECTION_UPRIGHT);
+ if (mapList)
+ (*mapList)[from] = to;
+ }
+ }
+ break;
+ }
+ default:
+ {
+ std::map<int, int> *mapList = itemInfo->addReplaceSprite(
+ parseSpriteName(removeSprite), direction);
+ if (!mapList)
+ return;
+ for_each_xml_child_node(itemNode, replaceNode)
+ {
+ if (xmlStrEqual(itemNode->name, BAD_CAST "item"))
+ {
+ int from = XML::getProperty(itemNode, "from", 0);
+ int to = XML::getProperty(itemNode, "to", 1);
+ (*mapList)[from] = to;
+ }
+ }
+ break;
}
}
}
diff --git a/src/resources/iteminfo.cpp b/src/resources/iteminfo.cpp
index 56cfc01f6..fb4b8ed5e 100644
--- a/src/resources/iteminfo.cpp
+++ b/src/resources/iteminfo.cpp
@@ -144,25 +144,6 @@ const std::string &ItemInfo::getSound(EquipmentSoundEvent event) const
std::map<int, int> *ItemInfo::addReplaceSprite(int sprite, int direction)
{
- if (direction == -1)
- {
- SpriteToItemMap *spMap = new SpriteToItemMap();
- for (int f = 0; f < 9; f ++)
- {
- if (!mSpriteToItemReplaceMap[f])
- {
- mSpriteToItemReplaceMap[f] = spMap;
- direction = f;
- }
- }
- if (direction >= 0)
- mSpriteToItemReplaceList.push_back(spMap);
- else
- delete spMap;
- if (direction == -1)
- direction = 1;
- }
-
if (direction < 0 || direction >= 9)
return 0;
diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp
index 70c45054f..685d415ff 100644
--- a/src/resources/mapreader.cpp
+++ b/src/resources/mapreader.cpp
@@ -37,7 +37,6 @@
#include "utils/stringutils.h"
#include "utils/xml.h"
-#include <cassert>
#include <iostream>
#include <zlib.h>
@@ -110,7 +109,8 @@ int inflateMemory(unsigned char *in, unsigned int inLength,
}
ret = inflate(&strm, Z_NO_FLUSH);
- assert(ret != Z_STREAM_ERROR);
+ if (ret == Z_STREAM_ERROR)
+ return ret;
switch (ret)
{
@@ -140,7 +140,7 @@ int inflateMemory(unsigned char *in, unsigned int inLength,
}
}
while (ret != Z_STREAM_END);
- assert(strm.avail_in == 0);
+// assert(strm.avail_in == 0);
outLength = bufferSize - strm.avail_out;
(void) inflateEnd(&strm);
diff --git a/src/resources/resource.cpp b/src/resources/resource.cpp
index b180712c1..552af06ec 100644
--- a/src/resources/resource.cpp
+++ b/src/resources/resource.cpp
@@ -27,8 +27,6 @@
#include "resources/resourcemanager.h"
-#include <cassert>
-
#include "debug.h"
Resource::~Resource()
diff --git a/src/utils/stringutils.cpp b/src/utils/stringutils.cpp
index 13170092e..176c5499c 100644
--- a/src/utils/stringutils.cpp
+++ b/src/utils/stringutils.cpp
@@ -181,9 +181,9 @@ unsigned long findI(std::string str, std::string subStr)
return str.find(subStr);
}
-unsigned long findI(std::string str, std::vector<std::string> &list)
+unsigned long findI(std::string text, std::vector<std::string> &list)
{
- str = toLower(str);
+ std::string str = toLower(text);
unsigned long idx;
for (std::vector<std::string>::iterator i = list.begin();
i != list.end(); ++i)
@@ -414,6 +414,19 @@ std::list<std::string> splitToStringList(const std::string &text,
return tokens;
}
+void splitToStringVector(std::vector<std::string> &tokens,
+ const std::string &text, char separator)
+{
+ std::stringstream ss(text);
+ std::string item;
+ while(std::getline(ss, item, separator))
+ {
+ item = trim(item);
+ if (!item.empty())
+ tokens.push_back(item);
+ }
+}
+
std::string combineDye(std::string file, std::string dye)
{
if (dye.empty())
@@ -511,3 +524,65 @@ void deleteCharLeft(std::string &str, unsigned *pos)
break;
}
}
+
+bool findLast(std::string &str1, std::string str2)
+{
+ const unsigned s1 = str1.size();
+ const unsigned s2 = str2.size();
+ if (s1 < s2)
+ return false;
+ std::string tmp = str1.substr(s1 - s2);
+ if (tmp == str2)
+ return true;
+ return false;
+}
+
+bool findFirst(std::string &str1, std::string str2)
+{
+ const unsigned s1 = str1.size();
+ const unsigned s2 = str2.size();
+ if (s1 < s2)
+ return false;
+ std::string tmp = str1.substr(0, s2);
+ if (tmp == str2)
+ return true;
+ return false;
+}
+
+bool findCutLast(std::string &str1, std::string str2)
+{
+ const unsigned s1 = str1.size();
+ const unsigned s2 = str2.size();
+ if (s1 < s2)
+ return false;
+ std::string tmp = str1.substr(s1 - s2);
+ if (tmp == str2)
+ {
+ str1 = str1.substr(0, s1 - s2);
+ return true;
+ }
+ return false;
+}
+
+bool findCutFirst(std::string &str1, std::string str2)
+{
+ const unsigned s1 = str1.size();
+ const unsigned s2 = str2.size();
+ if (s1 < s2)
+ return false;
+ std::string tmp = str1.substr(0, s2);
+ if (tmp == str2)
+ {
+ str1 = str1.substr(s2);
+ return true;
+ }
+ return false;
+}
+
+std::string &removeProtocol(std::string &url)
+{
+ int i = url.find("://");
+ if (i != (int)std::string::npos)
+ url = url.substr(i + 3);
+ return url;
+}
diff --git a/src/utils/stringutils.h b/src/utils/stringutils.h
index 94747d2fe..25fe11e2d 100644
--- a/src/utils/stringutils.h
+++ b/src/utils/stringutils.h
@@ -133,7 +133,7 @@ bool isWordSeparator(char chr);
unsigned long findI(std::string str, std::string subStr);
-unsigned long findI(std::string str, std::vector<std::string> &list);
+unsigned long findI(std::string text, std::vector<std::string> &list);
const std::string encodeStr(unsigned int value, unsigned int size = 0);
@@ -176,6 +176,9 @@ std::list<int> splitToIntList(const std::string &text, char separator);
std::list<std::string> splitToStringList(const std::string &text,
char separator);
+void splitToStringVector(std::vector<std::string> &tokens,
+ const std::string &text, char separator);
+
std::string combineDye(std::string file, std::string dye);
std::string combineDye2(std::string file, std::string dye);
@@ -190,4 +193,14 @@ std::string stringToHexPath(const std::string &str);
void deleteCharLeft(std::string &str, unsigned *pos);
+bool findLast(std::string &str1, std::string str2);
+
+bool findFirst(std::string &str1, std::string str2);
+
+bool findCutLast(std::string &str1, std::string str2);
+
+bool findCutFirst(std::string &str1, std::string str2);
+
+std::string &removeProtocol(std::string &url);
+
#endif // UTILS_STRINGUTILS_H
diff --git a/tests/maketest.sh b/tests/maketest.sh
new file mode 100755
index 000000000..eeea5706e
--- /dev/null
+++ b/tests/maketest.sh
@@ -0,0 +1,148 @@
+#!/bin/sh
+
+dir=`pwd`
+export LANG=C
+
+#--enable-applebuild=yes
+#--without-librt
+
+echo start >make2.log
+
+autoreconf -i
+echo opengl+debug+guichan >>make2.log
+make clean 2>>make2.log
+./configure --prefix=$dir/run \
+--datadir=$dir/run/share/games \
+--bindir=$dir/run/bin \
+--mandir=$dir/run/share/man \
+--enable-memdebug=yes \
+--with-internalguichan=yes \
+--enable-tcmalloc=no \
+--enable-googleprofiler=no
+make -j5 2>>make2.log
+
+autoreconf -i
+echo opengl+guichan >>make2.log
+make clean 2>>make2.log
+./configure --prefix=$dir/run \
+--datadir=$dir/run/share/games \
+--bindir=$dir/run/bin \
+--mandir=$dir/run/share/man \
+--enable-memdebug=no \
+--with-internalguichan=yes \
+--enable-tcmalloc=no \
+--enable-googleprofiler=no
+make -j5 2>>make2.log
+
+autoreconf -i
+echo opengl >>make2.log
+make clean 2>>make2.log
+./configure --prefix=$dir/run \
+--datadir=$dir/run/share/games \
+--bindir=$dir/run/bin \
+--mandir=$dir/run/share/man \
+--enable-memdebug=no \
+--with-internalguichan=no \
+--enable-tcmalloc=no \
+--enable-googleprofiler=no
+make -j5 2>>make2.log
+
+autoreconf -i
+echo opengl+manaserv >>make2.log
+make clean 2>>make2.log
+./configure --prefix=$dir/run \
+--datadir=$dir/run/share/games \
+--bindir=$dir/run/bin \
+--mandir=$dir/run/share/man \
+--enable-memdebug=no \
+--with-internalguichan=no \
+--enable-tcmalloc=no \
+--enable-googleprofiler=no \
+--enable-manaserv=yes
+make -j5 2>>make2.log
+
+autoreconf -i
+echo opengl+guichan+manaserv >>make2.log
+make clean 2>>make2.log
+./configure --prefix=$dir/run \
+--datadir=$dir/run/share/games \
+--bindir=$dir/run/bin \
+--mandir=$dir/run/share/man \
+--enable-memdebug=no \
+--with-internalguichan=yes \
+--enable-tcmalloc=no \
+--enable-googleprofiler=no \
+--enable-manaserv=yes
+make -j5 2>>make2.log
+
+autoreconf -i
+echo guichan >>make2.log
+make clean 2>>make2.log
+./configure --prefix=$dir/run \
+--datadir=$dir/run/share/games \
+--bindir=$dir/run/bin \
+--mandir=$dir/run/share/man \
+--enable-memdebug=no \
+--with-internalguichan=yes \
+--enable-tcmalloc=no \
+--enable-googleprofiler=no \
+--without-opengl
+make -j5 2>>make2.log
+
+autoreconf -i
+echo "-" >>make2.log
+make clean 2>>make2.log
+./configure --prefix=$dir/run \
+--datadir=$dir/run/share/games \
+--bindir=$dir/run/bin \
+--mandir=$dir/run/share/man \
+--enable-memdebug=no \
+--with-internalguichan=no \
+--enable-tcmalloc=no \
+--enable-googleprofiler=no \
+--without-opengl
+make -j5 2>>make2.log
+
+autoreconf -i
+echo guichan+manaserv >>make2.log
+make clean 2>>make2.log
+./configure --prefix=$dir/run \
+--datadir=$dir/run/share/games \
+--bindir=$dir/run/bin \
+--mandir=$dir/run/share/man \
+--enable-memdebug=no \
+--with-internalguichan=yes \
+--enable-tcmalloc=no \
+--enable-googleprofiler=no \
+--enable-manaserv=yes \
+--without-opengl
+make -j5 2>>make2.log
+
+autoreconf -i
+echo opengl+debug+guichan+portable >>make2.log
+make clean 2>>make2.log
+./configure --prefix=$dir/run \
+--datadir=$dir/run/share/games \
+--bindir=$dir/run/bin \
+--mandir=$dir/run/share/man \
+--enable-memdebug=yes \
+--with-internalguichan=yes \
+--enable-tcmalloc=no \
+--enable-googleprofiler=no \
+--enable-portable=yes
+make -j5 2>>make2.log
+
+autoreconf -i
+echo opengl+guichan+portable+manaserv >>make2.log
+make clean 2>>make2.log
+./configure --prefix=$dir/run \
+--datadir=$dir/run/share/games \
+--bindir=$dir/run/bin \
+--mandir=$dir/run/share/man \
+--enable-memdebug=no \
+--with-internalguichan=yes \
+--enable-tcmalloc=no \
+--enable-googleprofiler=no \
+--enable-manaserv=yes \
+--enable-portable=yes
+make -j5 2>>make2.log