summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBlue <bluesansdouze@gmail.com>2009-05-12 20:46:56 +0200
committerBlue <bluesansdouze@gmail.com>2009-05-12 20:46:56 +0200
commit9071a692116745f2cafd8556cbff28095910730e (patch)
tree6fbc96a1cb00558c4015d1eff25f45b2c6ccdcb8
parent2e94f4e92821bad6ebb328d00b2bd918c4b1b99e (diff)
parent0257eaf4d3945eac7cb3e50ccf8dfef18fa29698 (diff)
downloadmana-9071a692116745f2cafd8556cbff28095910730e.tar.gz
mana-9071a692116745f2cafd8556cbff28095910730e.tar.bz2
mana-9071a692116745f2cafd8556cbff28095910730e.tar.xz
mana-9071a692116745f2cafd8556cbff28095910730e.zip
Merge branch 'master' of git@gitorious.org:tmw/mainline
-rw-r--r--AUTHORS4
-rw-r--r--README.cmake66
-rw-r--r--po/ar.po375
-rw-r--r--po/ca.po337
-rw-r--r--po/cs.po355
-rw-r--r--po/da.po354
-rw-r--r--po/de.po564
-rw-r--r--po/en_GB.po375
-rw-r--r--po/eo.po337
-rw-r--r--po/es.po430
-rw-r--r--po/fi.po375
-rw-r--r--po/fr.po801
-rw-r--r--po/he.po375
-rw-r--r--po/hr.po375
-rw-r--r--po/id.po368
-rw-r--r--po/it.po375
-rw-r--r--po/ja.po361
-rw-r--r--po/nl.po371
-rw-r--r--po/pl.po523
-rw-r--r--po/pt.po369
-rw-r--r--po/pt_BR.po378
-rw-r--r--po/ru.po453
-rw-r--r--po/sk.po345
-rw-r--r--po/sv.po370
-rw-r--r--po/th.po361
-rw-r--r--po/tmw.pot337
-rw-r--r--po/zh_TW.po1426
-rw-r--r--src/CMakeLists.txt11
-rw-r--r--src/being.h3
-rw-r--r--src/commandhandler.cpp3
-rw-r--r--src/game.cpp15
-rw-r--r--src/gui/chat.cpp3
-rw-r--r--src/gui/equipmentwindow.cpp5
-rw-r--r--src/gui/inventorywindow.cpp10
-rw-r--r--src/gui/itemamount.cpp8
-rw-r--r--src/gui/itemcontainer.cpp115
-rw-r--r--src/gui/itemcontainer.h7
-rw-r--r--src/gui/minimap.cpp27
-rw-r--r--src/gui/ministatus.cpp6
-rw-r--r--src/gui/partywindow.cpp56
-rw-r--r--src/gui/partywindow.h4
-rw-r--r--src/gui/popupmenu.cpp12
-rw-r--r--src/gui/setup_players.cpp8
-rw-r--r--src/gui/setup_players.h1
-rw-r--r--src/gui/setup_video.cpp254
-rw-r--r--src/gui/setup_video.h14
-rw-r--r--src/gui/skill.cpp5
-rw-r--r--src/gui/status.cpp8
-rw-r--r--src/gui/statuswindow.cpp2
-rw-r--r--src/gui/storagewindow.cpp2
-rw-r--r--src/gui/widgets/avatar.cpp8
-rw-r--r--src/gui/widgets/tab.cpp8
-rw-r--r--src/gui/widgets/tab.h4
-rw-r--r--src/gui/widgets/whispertab.cpp2
-rw-r--r--src/itemshortcut.cpp11
-rw-r--r--src/keyboardconfig.cpp7
-rw-r--r--src/localplayer.cpp80
-rw-r--r--src/localplayer.h50
-rw-r--r--src/net/ea/generalhandler.cpp21
-rw-r--r--src/net/ea/gui/partytab.cpp2
-rw-r--r--src/net/ea/inventoryhandler.cpp4
-rw-r--r--src/net/ea/partyhandler.cpp15
-rw-r--r--src/net/ea/playerhandler.cpp2
-rw-r--r--src/net/ea/skillhandler.cpp4
-rw-r--r--src/net/ea/tradehandler.cpp12
-rw-r--r--src/net/tmwserv/generalhandler.cpp23
-rw-r--r--src/net/tmwserv/inventoryhandler.cpp3
-rw-r--r--src/net/tmwserv/partyhandler.cpp2
-rw-r--r--src/net/tmwserv/playerhandler.cpp3
-rw-r--r--src/net/tmwserv/tradehandler.cpp2
-rw-r--r--src/player.cpp17
-rw-r--r--src/player.h12
-rw-r--r--src/playerrelations.cpp14
-rw-r--r--src/resources/itemdb.cpp10
-rw-r--r--src/resources/itemdb.h11
-rw-r--r--src/utils/sha256.cpp2
76 files changed, 5729 insertions, 6339 deletions
diff --git a/AUTHORS b/AUTHORS
index 2e676026..86a41d53 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -57,9 +57,11 @@ Ti Sing Hao
== Translators ==
+Alexander Breidenbroich (German) <metast gmx.de>
Bjrn Lindeijer (Dutch) <bjorn lindeijer.nl>
Eugenio Favalli (Italian) <elvenprogrammer gmail.com>
-Kess Vargavind (Swedish) <vargavind@gmail.com>
+Jumpy (French) <antoinebcn@hotmail.com>
+Kess Vargavind (Swedish) <vargavind gmail.com>
Leif Kildelund (Danish) <gonzo.dark gmail.com>
Matthias Hartmann (German) <hartmann.matthias gmail.com>
Blue Sans Douze (French) <bluesansdouze gmail.com>
diff --git a/README.cmake b/README.cmake
new file mode 100644
index 00000000..5796a5c8
--- /dev/null
+++ b/README.cmake
@@ -0,0 +1,66 @@
+This readme explains the most common parameters to CMake needed for
+building tmw.
+
+Basic syntax
+------------
+
+cmake [options] <source directory>
+
+If you don't need any special options just change to the directory where
+you extracted the sources and do `cmake . && make'
+
+The syntax for setting variables to control CMakes behaviour is
+-D <variable>=<value>
+
+
+How do I...
+-----------
+
+- Use a custom install prefix (like --prefix on autoconf)?
+ CMAKE_INSTALL_PREFIX=/path/to/prefix
+- Create a debug build?
+ CMAKE_BUILD_TYPE=Debug .
+- Add additional package search directories?
+ CMAKE_PREFIX_PATH=/prefix/path
+- Add additional include search directories?
+ CMAKE_INCLUDE_PATH=/include/path
+
+For example, to build tmw to install in /opt/tmw, with libraries in
+/build/tmw/lib, and SDL-headers in /build/tmw/include/SDL you'd use
+the following command:
+
+cmake -D CMAKE_PREFIX_PATH=/build/tmw \
+ -D CMAKE_INCLUDE_PATH=/build/tmw/include/SDL \
+ -D CMAKE_INSTALL_PREFIX=/opt/tmw .
+
+
+Crosscompiling using CMake
+--------------------------
+
+The following example assumes you're doing a Windows-build from within a
+UNIX environement, using mingw32 installed in /build/mingw32.
+
+- create a toolchain-file describing your environement:
+$ cat /build/toolchain.cmake
+# the name of the target operating system
+SET(CMAKE_SYSTEM_NAME Windows)
+# which compilers to use for C and C++
+SET(CMAKE_C_COMPILER i386-mingw32-gcc)
+SET(CMAKE_CXX_COMPILER i386-mingw32-g++)
+# here is the target environment located
+SET(CMAKE_FIND_ROOT_PATH /build/mingw32 /build/tmw-libs )
+# adjust the default behaviour of the FIND_XXX() commands:
+# search headers and libraries in the target environment, search
+# programs in the host environment
+set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+
+- set your PATH to include the bin-directory of your mingw32-installation:
+$ export PATH=/build/mingw32/bin:$PATH
+
+- configure the source tree for the build, using the toolchain file:
+$ cmake -DCMAKE_TOOLCHAIN_FILE=/build/toolchain.cmake .
+
+- use make for building the application
+
diff --git a/po/ar.po b/po/ar.po
index a5bf0865..d1b53ac6 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: tmw\n"
"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-05-10 16:39+0200\n"
+"POT-Creation-Date: 2009-05-12 00:11+0200\n"
"PO-Revision-Date: 2009-01-09 11:47+0000\n"
"Last-Translator: Bjørn Lindeijer <bjorn@lindeijer.nl>\n"
"Language-Team: Arabic <ar@li.org>\n"
@@ -175,7 +175,7 @@ msgstr ""
#: src/commandhandler.cpp:216 src/commandhandler.cpp:230
#: src/gui/widgets/channeltab.cpp:81 src/gui/widgets/channeltab.cpp:90
-#: src/net/ea/gui/partytab.cpp:76
+#: src/net/ea/gui/partytab.cpp:79
msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
msgstr ""
@@ -195,7 +195,7 @@ msgstr ""
msgid "Command: /party <nick>"
msgstr ""
-#: src/commandhandler.cpp:229 src/net/ea/gui/partytab.cpp:75
+#: src/commandhandler.cpp:229 src/net/ea/gui/partytab.cpp:78
msgid "This command invites <nick> to party with you."
msgstr ""
@@ -508,7 +508,7 @@ msgstr "موافق"
msgid "Previous"
msgstr "السّابق"
-#: src/gui/charselectdialog.cpp:113 src/gui/npcdialog.cpp:44
+#: src/gui/charselectdialog.cpp:113 src/gui/npcdialog.cpp:43
msgid "Next"
msgstr "التّالي"
@@ -533,7 +533,7 @@ msgstr "جديد"
#: src/gui/charselectdialog.cpp:118 src/gui/charselectdialog.cpp:165
#: src/gui/charselectdialog.cpp:166 src/gui/charselectdialog.cpp:315
-#: src/gui/setup_players.cpp:230
+#: src/gui/setup_players.cpp:228
msgid "Delete"
msgstr "حذف"
@@ -568,19 +568,15 @@ msgstr ""
msgid "%d players are present."
msgstr ""
-#: src/gui/chat.cpp:348 src/gui/chat.cpp:354
+#: src/gui/chat.cpp:333
msgid "Present: "
msgstr ""
-#: src/gui/chat.cpp:348 src/gui/chat.cpp:354
-msgid "; "
-msgstr ""
-
-#: src/gui/chat.cpp:349
+#: src/gui/chat.cpp:350
msgid "Attendance written to record log."
msgstr ""
-#: src/gui/chat.cpp:474
+#: src/gui/chat.cpp:475
#, c-format
msgid "Whispering to %s: %s"
msgstr ""
@@ -630,7 +626,7 @@ msgstr ""
msgid "Help"
msgstr ""
-#: src/gui/help.cpp:47 src/gui/npcdialog.cpp:45 src/gui/storagewindow.cpp:68
+#: src/gui/help.cpp:47 src/gui/npcdialog.cpp:44 src/gui/storagewindow.cpp:68
msgid "Close"
msgstr ""
@@ -723,7 +719,7 @@ msgid "Register"
msgstr "تسجيل"
#: src/gui/magic.cpp:32 src/gui/skilldialog.cpp:117 src/gui/windowmenu.cpp:64
-#: src/localplayer.cpp:845
+#: src/localplayer.cpp:848
msgid "Magic"
msgstr ""
@@ -739,33 +735,25 @@ msgstr ""
msgid "Cast Test Spell 3"
msgstr ""
-#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
+#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:86
#, fuzzy
msgid "Map"
msgstr "خارطة صغيرة"
-#: src/gui/npcdialog.cpp:43
+#: src/gui/npcdialog.cpp:42
msgid "Waiting for server"
msgstr ""
-#: src/gui/npcdialog.cpp:46
+#: src/gui/npcdialog.cpp:45
#, fuzzy
msgid "Submit"
msgstr "مغادرة"
-#: src/gui/npcdialog.cpp:49 src/gui/npcpostdialog.cpp:39
+#: src/gui/npcdialog.cpp:48 src/gui/npcpostdialog.cpp:39
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:95
-msgid "+"
-msgstr ""
-
-#: src/gui/npcdialog.cpp:96
-msgid "-"
-msgstr ""
-
-#: src/gui/npcdialog.cpp:105
+#: src/gui/npcdialog.cpp:104
msgid "Reset"
msgstr ""
@@ -773,8 +761,7 @@ msgstr ""
msgid "Send"
msgstr ""
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:268
-#: src/gui/setup_video.cpp:567
+#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:142
msgid "Text"
msgstr ""
@@ -826,8 +813,8 @@ msgstr ""
msgid "Is"
msgstr ""
-#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:33
-#: src/net/ea/gui/partytab.cpp:37
+#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:45
+#: src/net/ea/gui/partytab.cpp:39
msgid "Party"
msgstr ""
@@ -1295,26 +1282,22 @@ msgid "???"
msgstr ""
#: src/gui/setup_players.cpp:224
-msgid "Save player list"
-msgstr ""
-
-#: src/gui/setup_players.cpp:226
msgid "Allow trading"
msgstr ""
-#: src/gui/setup_players.cpp:228
+#: src/gui/setup_players.cpp:226
msgid "Allow whispers"
msgstr ""
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:230
msgid "Put all whispers in tabs"
msgstr ""
-#: src/gui/setup_players.cpp:234
+#: src/gui/setup_players.cpp:232
msgid "Players"
msgstr ""
-#: src/gui/setup_players.cpp:259
+#: src/gui/setup_players.cpp:257
msgid "When ignoring:"
msgstr ""
@@ -1335,157 +1318,147 @@ msgstr ""
msgid "Large"
msgstr ""
-#: src/gui/setup_video.cpp:151
+#: src/gui/setup_video.cpp:141
+msgid "No text"
+msgstr ""
+
+#: src/gui/setup_video.cpp:143
+msgid "Bubbles, no names"
+msgstr ""
+
+#: src/gui/setup_video.cpp:144
+msgid "Bubbles with names"
+msgstr ""
+
+#: src/gui/setup_video.cpp:153
+msgid "off"
+msgstr "واقف"
+
+#: src/gui/setup_video.cpp:154 src/gui/setup_video.cpp:164
+msgid "low"
+msgstr "منخفض"
+
+#: src/gui/setup_video.cpp:155 src/gui/setup_video.cpp:166
+msgid "high"
+msgstr "مرتفع"
+
+#: src/gui/setup_video.cpp:165
+msgid "medium"
+msgstr ""
+
+#: src/gui/setup_video.cpp:167
+msgid "max"
+msgstr ""
+
+#: src/gui/setup_video.cpp:187
msgid "Full screen"
msgstr "ملء الشاشة"
-#: src/gui/setup_video.cpp:152
+#: src/gui/setup_video.cpp:188
msgid "OpenGL"
msgstr "OpenGL"
-#: src/gui/setup_video.cpp:153
+#: src/gui/setup_video.cpp:189
msgid "Custom cursor"
msgstr "مؤشّر مخصّص"
-#: src/gui/setup_video.cpp:155
+#: src/gui/setup_video.cpp:191
msgid "Visible names"
msgstr ""
-#: src/gui/setup_video.cpp:157
+#: src/gui/setup_video.cpp:193
msgid "Particle effects"
msgstr ""
-#: src/gui/setup_video.cpp:159
+#: src/gui/setup_video.cpp:195
msgid "Show name"
msgstr ""
-#: src/gui/setup_video.cpp:160
+#: src/gui/setup_video.cpp:196
msgid "Show pickup notification"
msgstr ""
-#: src/gui/setup_video.cpp:161
+#: src/gui/setup_video.cpp:197
msgid "in chat"
msgstr ""
-#: src/gui/setup_video.cpp:162
+#: src/gui/setup_video.cpp:198
msgid "as particle"
msgstr ""
-#: src/gui/setup_video.cpp:167
+#: src/gui/setup_video.cpp:203
msgid "FPS Limit:"
msgstr "حدّ FPS:"
-#: src/gui/setup_video.cpp:184
+#: src/gui/setup_video.cpp:214
msgid "Video"
msgstr "مرئية"
-#: src/gui/setup_video.cpp:189
+#: src/gui/setup_video.cpp:219
msgid "Overhead text"
msgstr ""
-#: src/gui/setup_video.cpp:190
+#: src/gui/setup_video.cpp:220
msgid "Gui opacity"
msgstr "عتمة واجهة المستخدم"
-#: src/gui/setup_video.cpp:191
-msgid "Scroll radius"
-msgstr "نصف قطر اللفّ"
-
-#: src/gui/setup_video.cpp:192
-msgid "Scroll laziness"
-msgstr "كسل اللفّ"
-
-#: src/gui/setup_video.cpp:193
+#: src/gui/setup_video.cpp:221
msgid "Ambient FX"
msgstr "مؤثّرات محيطة"
-#: src/gui/setup_video.cpp:194
+#: src/gui/setup_video.cpp:222
msgid "Particle Detail"
msgstr ""
-#: src/gui/setup_video.cpp:195
+#: src/gui/setup_video.cpp:223
msgid "Font size"
msgstr ""
-#: src/gui/setup_video.cpp:265 src/gui/setup_video.cpp:564
-msgid "No text"
-msgstr ""
-
-#: src/gui/setup_video.cpp:271 src/gui/setup_video.cpp:570
-msgid "Bubbles, no names"
-msgstr ""
-
-#: src/gui/setup_video.cpp:274 src/gui/setup_video.cpp:573
-msgid "Bubbles with names"
-msgstr ""
-
-#: src/gui/setup_video.cpp:282 src/gui/setup_video.cpp:610
-msgid "off"
-msgstr "واقف"
-
-#: src/gui/setup_video.cpp:285 src/gui/setup_video.cpp:296
-#: src/gui/setup_video.cpp:613 src/gui/setup_video.cpp:627
-msgid "low"
-msgstr "منخفض"
-
-#: src/gui/setup_video.cpp:288 src/gui/setup_video.cpp:302
-#: src/gui/setup_video.cpp:616 src/gui/setup_video.cpp:633
-msgid "high"
-msgstr "مرتفع"
-
-#: src/gui/setup_video.cpp:299 src/gui/setup_video.cpp:630
-msgid "medium"
-msgstr ""
-
-#: src/gui/setup_video.cpp:305 src/gui/setup_video.cpp:636
-msgid "max"
-msgstr ""
-
-#: src/gui/setup_video.cpp:410
+#: src/gui/setup_video.cpp:356
msgid "Failed to switch to "
msgstr ""
-#: src/gui/setup_video.cpp:411
+#: src/gui/setup_video.cpp:357
msgid "windowed"
msgstr ""
-#: src/gui/setup_video.cpp:411
+#: src/gui/setup_video.cpp:357
msgid "fullscreen"
msgstr ""
-#: src/gui/setup_video.cpp:412
+#: src/gui/setup_video.cpp:358
msgid "mode and restoration of old mode also failed!"
msgstr ""
-#: src/gui/setup_video.cpp:421
+#: src/gui/setup_video.cpp:367
msgid "Switching to full screen"
msgstr "جارِ ملء الشاشة"
-#: src/gui/setup_video.cpp:422
+#: src/gui/setup_video.cpp:368
msgid "Restart needed for changes to take effect."
msgstr "يجب إعادة التشغيل لتفعّل التغييرات."
-#: src/gui/setup_video.cpp:434
+#: src/gui/setup_video.cpp:380
msgid "Changing OpenGL"
msgstr "تغيير OpenGL"
-#: src/gui/setup_video.cpp:435
+#: src/gui/setup_video.cpp:381
msgid "Applying change to OpenGL requires restart."
msgstr "تطبيق التغيير على OpenGL يحتاج لإعادة تشغيل."
-#: src/gui/setup_video.cpp:520
+#: src/gui/setup_video.cpp:442
msgid "Screen resolution changed"
msgstr ""
-#: src/gui/setup_video.cpp:521
+#: src/gui/setup_video.cpp:443
msgid "Restart your client for the change to take effect."
msgstr ""
-#: src/gui/setup_video.cpp:545
+#: src/gui/setup_video.cpp:467
msgid "Particle effect settings changed."
msgstr ""
-#: src/gui/setup_video.cpp:546
+#: src/gui/setup_video.cpp:468
msgid "Changes will take effect on map change."
msgstr ""
@@ -2007,55 +1980,55 @@ msgstr ""
msgid "Ignore input 2"
msgstr ""
-#: src/localplayer.cpp:834
+#: src/localplayer.cpp:837
msgid "Unarmed"
msgstr ""
-#: src/localplayer.cpp:835
+#: src/localplayer.cpp:838
msgid "Knife"
msgstr ""
-#: src/localplayer.cpp:836
+#: src/localplayer.cpp:839
msgid "Sword"
msgstr ""
-#: src/localplayer.cpp:837
+#: src/localplayer.cpp:840
msgid "Polearm"
msgstr ""
-#: src/localplayer.cpp:838
+#: src/localplayer.cpp:841
msgid "Staff"
msgstr ""
-#: src/localplayer.cpp:839
+#: src/localplayer.cpp:842
msgid "Whip"
msgstr ""
-#: src/localplayer.cpp:840
+#: src/localplayer.cpp:843
msgid "Bow"
msgstr ""
-#: src/localplayer.cpp:841
+#: src/localplayer.cpp:844
msgid "Shooting"
msgstr ""
-#: src/localplayer.cpp:842
+#: src/localplayer.cpp:845
msgid "Mace"
msgstr ""
-#: src/localplayer.cpp:843
+#: src/localplayer.cpp:846
msgid "Axe"
msgstr ""
-#: src/localplayer.cpp:844
+#: src/localplayer.cpp:847
msgid "Thrown"
msgstr ""
-#: src/localplayer.cpp:846
+#: src/localplayer.cpp:849
msgid "Craft"
msgstr ""
-#: src/localplayer.cpp:847
+#: src/localplayer.cpp:850
msgid "Unknown Skill"
msgstr ""
@@ -2267,193 +2240,193 @@ msgstr ""
msgid "Unable to unequip."
msgstr ""
-#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:82
-#, c-format
-msgid "Strength: %d"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:81
+#, fuzzy, c-format
+msgid "Strength %+d"
+msgstr "القوّة:"
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:84
-#, c-format
-msgid "Agility: %d"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:82
+#, fuzzy, c-format
+msgid "Agility %+d"
+msgstr "خفّة الحركة:"
-#: src/net/ea/generalhandler.cpp:96 src/net/tmwserv/generalhandler.cpp:88
-#, c-format
-msgid "Vitality: %d"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:84
+#, fuzzy, c-format
+msgid "Vitality %+d"
+msgstr "نشاط:"
-#: src/net/ea/generalhandler.cpp:98 src/net/tmwserv/generalhandler.cpp:90
-#, c-format
-msgid "Intelligence: %d"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:85
+#, fuzzy, c-format
+msgid "Intelligence %+d"
+msgstr "ذكاء:"
-#: src/net/ea/generalhandler.cpp:100 src/net/tmwserv/generalhandler.cpp:86
-#, c-format
-msgid "Dexterity: %d"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:83
+#, fuzzy, c-format
+msgid "Dexterity %+d"
+msgstr "المهارة:"
-#: src/net/ea/generalhandler.cpp:102
-#, c-format
-msgid "Luck: %d"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:96
+#, fuzzy, c-format
+msgid "Luck %+d"
+msgstr "مهاجمة %+d"
-#: src/net/ea/generalhandler.cpp:125
+#: src/net/ea/generalhandler.cpp:118
msgid "Authentication failed"
msgstr ""
-#: src/net/ea/generalhandler.cpp:128
+#: src/net/ea/generalhandler.cpp:121
msgid "No servers available"
msgstr ""
-#: src/net/ea/generalhandler.cpp:132
+#: src/net/ea/generalhandler.cpp:125
msgid "Someone else is trying to use this account"
msgstr ""
-#: src/net/ea/generalhandler.cpp:135
+#: src/net/ea/generalhandler.cpp:128
msgid "This account is already logged in"
msgstr ""
-#: src/net/ea/generalhandler.cpp:138
+#: src/net/ea/generalhandler.cpp:131
msgid "Speed hack detected"
msgstr ""
-#: src/net/ea/generalhandler.cpp:141
+#: src/net/ea/generalhandler.cpp:134
msgid "Duplicated login"
msgstr ""
-#: src/net/ea/generalhandler.cpp:144
+#: src/net/ea/generalhandler.cpp:137
msgid "Unknown connection error"
msgstr ""
-#: src/net/ea/generalhandler.cpp:201
+#: src/net/ea/generalhandler.cpp:194
msgid "Got disconnected from server!"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:52
+#: src/net/ea/gui/partytab.cpp:55
msgid "/help > Display this help."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:53
+#: src/net/ea/gui/partytab.cpp:56
msgid "/create > Create a new party"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:54
+#: src/net/ea/gui/partytab.cpp:57
msgid "/new > Alias of create"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:55
+#: src/net/ea/gui/partytab.cpp:58
msgid "/invite > Invite a player to your party"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:56
+#: src/net/ea/gui/partytab.cpp:59
msgid "/leave > Leave the party you are in"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:57
+#: src/net/ea/gui/partytab.cpp:60
msgid "/kick > Kick some one from the party you are in"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:58
+#: src/net/ea/gui/partytab.cpp:61
msgid "/item > Show/change party item sharing options"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:59
+#: src/net/ea/gui/partytab.cpp:62
msgid "/exp > Show/change party experience sharing options"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:68
+#: src/net/ea/gui/partytab.cpp:71
msgid "Command: /new <party-name>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:69
+#: src/net/ea/gui/partytab.cpp:72
msgid "Command: /create <party-name>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:70
+#: src/net/ea/gui/partytab.cpp:73
msgid "These commands create a new party called <party-name>."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:74
+#: src/net/ea/gui/partytab.cpp:77
msgid "Command: /invite <nick>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:81
+#: src/net/ea/gui/partytab.cpp:84
msgid "Command: /leave"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:82
+#: src/net/ea/gui/partytab.cpp:85
msgid "This command causes the player to leave the party."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/ea/gui/partytab.cpp:89
msgid "Command: /item <policy>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:87
+#: src/net/ea/gui/partytab.cpp:90
msgid "This command changes the party's item sharing policy."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:88
+#: src/net/ea/gui/partytab.cpp:91
msgid ""
"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
"\"0\", \"no\", \"false\" to disable item sharing."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:94
msgid "Command: /item"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:92
+#: src/net/ea/gui/partytab.cpp:95
msgid "This command displays the party's current item sharing policy."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:96
+#: src/net/ea/gui/partytab.cpp:99
msgid "Command: /exp <policy>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/ea/gui/partytab.cpp:100
msgid "This command changes the party's experience sharing policy."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:98
+#: src/net/ea/gui/partytab.cpp:101
msgid ""
"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:104
msgid "Command: /exp"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:102
+#: src/net/ea/gui/partytab.cpp:105
msgid "This command displays the party's current experience sharing policy."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:110
+#: src/net/ea/gui/partytab.cpp:113
msgid "Party name is missing."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:133 src/net/ea/partyhandler.cpp:191
+#: src/net/ea/gui/partytab.cpp:136 src/net/ea/partyhandler.cpp:194
msgid "Item sharing enabled."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:136 src/net/ea/partyhandler.cpp:197
+#: src/net/ea/gui/partytab.cpp:139 src/net/ea/partyhandler.cpp:200
msgid "Item sharing disabled."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:139 src/net/ea/partyhandler.cpp:203
+#: src/net/ea/gui/partytab.cpp:142 src/net/ea/partyhandler.cpp:206
msgid "Item sharing not possible."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:165 src/net/ea/partyhandler.cpp:168
+#: src/net/ea/gui/partytab.cpp:168 src/net/ea/partyhandler.cpp:171
msgid "Experience sharing enabled."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:168 src/net/ea/partyhandler.cpp:174
+#: src/net/ea/gui/partytab.cpp:171 src/net/ea/partyhandler.cpp:177
msgid "Experience sharing disabled."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:171 src/net/ea/partyhandler.cpp:180
+#: src/net/ea/gui/partytab.cpp:174 src/net/ea/partyhandler.cpp:183
msgid "Experience sharing not possible."
msgstr ""
@@ -2516,45 +2489,45 @@ msgstr ""
msgid "Party successfully created."
msgstr ""
-#: src/net/ea/partyhandler.cpp:115
+#: src/net/ea/partyhandler.cpp:118
#, c-format
msgid "%s is already a member of a party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:119
+#: src/net/ea/partyhandler.cpp:122
#, c-format
msgid "%s refused your invitation."
msgstr ""
-#: src/net/ea/partyhandler.cpp:123
+#: src/net/ea/partyhandler.cpp:126
#, c-format
msgid "%s is now a member of your party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:127
+#: src/net/ea/partyhandler.cpp:130
#, c-format
msgid "Unknown invite response for %s."
msgstr ""
-#: src/net/ea/partyhandler.cpp:232
+#: src/net/ea/partyhandler.cpp:235
msgid "You have left the party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:235
+#: src/net/ea/partyhandler.cpp:239
#, c-format
msgid "%s has left your party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:272
+#: src/net/ea/partyhandler.cpp:274
#, c-format
msgid "An unknown member tried to say: %s"
msgstr ""
-#: src/net/ea/partyhandler.cpp:298
+#: src/net/ea/partyhandler.cpp:300
msgid "Inviting like this isn't supported at the moment."
msgstr ""
-#: src/net/ea/partyhandler.cpp:327
+#: src/net/ea/partyhandler.cpp:329
#, c-format
msgid "%s is not in your party!"
msgstr ""
@@ -2847,10 +2820,10 @@ msgstr "قوّة الذات:"
msgid "Topic: "
msgstr ""
-#: src/net/tmwserv/generalhandler.cpp:92
-#, c-format
-msgid "Willpower: %d"
-msgstr ""
+#: src/net/tmwserv/generalhandler.cpp:86
+#, fuzzy, c-format
+msgid "Willpower %+d"
+msgstr "قوّة الذات:"
#: src/net/tmwserv/loginhandler.cpp:80
msgid "Wrong magic_token"
@@ -2947,3 +2920,9 @@ msgstr ""
#: src/resources/npcdb.cpp:53
msgid "NPC Database: Error while loading npcs.xml!"
msgstr ""
+
+#~ msgid "Scroll radius"
+#~ msgstr "نصف قطر اللفّ"
+
+#~ msgid "Scroll laziness"
+#~ msgstr "كسل اللفّ"
diff --git a/po/ca.po b/po/ca.po
index e8850337..c17bf1c2 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: tmw\n"
"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-05-10 16:39+0200\n"
+"POT-Creation-Date: 2009-05-12 00:11+0200\n"
"PO-Revision-Date: 2009-01-09 11:46+0000\n"
"Last-Translator: Habari <Unknown>\n"
"Language-Team: Catalan <ca@li.org>\n"
@@ -175,7 +175,7 @@ msgstr ""
#: src/commandhandler.cpp:216 src/commandhandler.cpp:230
#: src/gui/widgets/channeltab.cpp:81 src/gui/widgets/channeltab.cpp:90
-#: src/net/ea/gui/partytab.cpp:76
+#: src/net/ea/gui/partytab.cpp:79
msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
msgstr ""
@@ -195,7 +195,7 @@ msgstr ""
msgid "Command: /party <nick>"
msgstr ""
-#: src/commandhandler.cpp:229 src/net/ea/gui/partytab.cpp:75
+#: src/commandhandler.cpp:229 src/net/ea/gui/partytab.cpp:78
msgid "This command invites <nick> to party with you."
msgstr ""
@@ -508,7 +508,7 @@ msgstr "ok"
msgid "Previous"
msgstr ""
-#: src/gui/charselectdialog.cpp:113 src/gui/npcdialog.cpp:44
+#: src/gui/charselectdialog.cpp:113 src/gui/npcdialog.cpp:43
msgid "Next"
msgstr ""
@@ -533,7 +533,7 @@ msgstr ""
#: src/gui/charselectdialog.cpp:118 src/gui/charselectdialog.cpp:165
#: src/gui/charselectdialog.cpp:166 src/gui/charselectdialog.cpp:315
-#: src/gui/setup_players.cpp:230
+#: src/gui/setup_players.cpp:228
msgid "Delete"
msgstr ""
@@ -568,19 +568,15 @@ msgstr ""
msgid "%d players are present."
msgstr ""
-#: src/gui/chat.cpp:348 src/gui/chat.cpp:354
+#: src/gui/chat.cpp:333
msgid "Present: "
msgstr ""
-#: src/gui/chat.cpp:348 src/gui/chat.cpp:354
-msgid "; "
-msgstr ""
-
-#: src/gui/chat.cpp:349
+#: src/gui/chat.cpp:350
msgid "Attendance written to record log."
msgstr ""
-#: src/gui/chat.cpp:474
+#: src/gui/chat.cpp:475
#, c-format
msgid "Whispering to %s: %s"
msgstr ""
@@ -630,7 +626,7 @@ msgstr ""
msgid "Help"
msgstr ""
-#: src/gui/help.cpp:47 src/gui/npcdialog.cpp:45 src/gui/storagewindow.cpp:68
+#: src/gui/help.cpp:47 src/gui/npcdialog.cpp:44 src/gui/storagewindow.cpp:68
msgid "Close"
msgstr ""
@@ -723,7 +719,7 @@ msgid "Register"
msgstr ""
#: src/gui/magic.cpp:32 src/gui/skilldialog.cpp:117 src/gui/windowmenu.cpp:64
-#: src/localplayer.cpp:845
+#: src/localplayer.cpp:848
msgid "Magic"
msgstr ""
@@ -739,32 +735,24 @@ msgstr ""
msgid "Cast Test Spell 3"
msgstr ""
-#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
+#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:86
msgid "Map"
msgstr ""
-#: src/gui/npcdialog.cpp:43
+#: src/gui/npcdialog.cpp:42
msgid "Waiting for server"
msgstr ""
-#: src/gui/npcdialog.cpp:46
+#: src/gui/npcdialog.cpp:45
#, fuzzy
msgid "Submit"
msgstr "sortir"
-#: src/gui/npcdialog.cpp:49 src/gui/npcpostdialog.cpp:39
+#: src/gui/npcdialog.cpp:48 src/gui/npcpostdialog.cpp:39
msgid "NPC"
msgstr ""
-#: src/gui/npcdialog.cpp:95
-msgid "+"
-msgstr ""
-
-#: src/gui/npcdialog.cpp:96
-msgid "-"
-msgstr ""
-
-#: src/gui/npcdialog.cpp:105
+#: src/gui/npcdialog.cpp:104
msgid "Reset"
msgstr ""
@@ -772,8 +760,7 @@ msgstr ""
msgid "Send"
msgstr ""
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:268
-#: src/gui/setup_video.cpp:567
+#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:142
msgid "Text"
msgstr ""
@@ -825,8 +812,8 @@ msgstr ""
msgid "Is"
msgstr ""
-#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:33
-#: src/net/ea/gui/partytab.cpp:37
+#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:45
+#: src/net/ea/gui/partytab.cpp:39
msgid "Party"
msgstr ""
@@ -1290,26 +1277,22 @@ msgid "???"
msgstr ""
#: src/gui/setup_players.cpp:224
-msgid "Save player list"
-msgstr ""
-
-#: src/gui/setup_players.cpp:226
msgid "Allow trading"
msgstr ""
-#: src/gui/setup_players.cpp:228
+#: src/gui/setup_players.cpp:226
msgid "Allow whispers"
msgstr ""
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:230
msgid "Put all whispers in tabs"
msgstr ""
-#: src/gui/setup_players.cpp:234
+#: src/gui/setup_players.cpp:232
msgid "Players"
msgstr ""
-#: src/gui/setup_players.cpp:259
+#: src/gui/setup_players.cpp:257
msgid "When ignoring:"
msgstr ""
@@ -1329,157 +1312,147 @@ msgstr ""
msgid "Large"
msgstr ""
-#: src/gui/setup_video.cpp:151
-msgid "Full screen"
-msgstr ""
-
-#: src/gui/setup_video.cpp:152
-msgid "OpenGL"
-msgstr ""
-
-#: src/gui/setup_video.cpp:153
-msgid "Custom cursor"
+#: src/gui/setup_video.cpp:141
+msgid "No text"
msgstr ""
-#: src/gui/setup_video.cpp:155
-msgid "Visible names"
+#: src/gui/setup_video.cpp:143
+msgid "Bubbles, no names"
msgstr ""
-#: src/gui/setup_video.cpp:157
-msgid "Particle effects"
+#: src/gui/setup_video.cpp:144
+msgid "Bubbles with names"
msgstr ""
-#: src/gui/setup_video.cpp:159
-msgid "Show name"
+#: src/gui/setup_video.cpp:153
+msgid "off"
msgstr ""
-#: src/gui/setup_video.cpp:160
-msgid "Show pickup notification"
+#: src/gui/setup_video.cpp:154 src/gui/setup_video.cpp:164
+msgid "low"
msgstr ""
-#: src/gui/setup_video.cpp:161
-msgid "in chat"
+#: src/gui/setup_video.cpp:155 src/gui/setup_video.cpp:166
+msgid "high"
msgstr ""
-#: src/gui/setup_video.cpp:162
-msgid "as particle"
+#: src/gui/setup_video.cpp:165
+msgid "medium"
msgstr ""
#: src/gui/setup_video.cpp:167
-msgid "FPS Limit:"
+msgid "max"
msgstr ""
-#: src/gui/setup_video.cpp:184
-msgid "Video"
+#: src/gui/setup_video.cpp:187
+msgid "Full screen"
msgstr ""
-#: src/gui/setup_video.cpp:189
-msgid "Overhead text"
+#: src/gui/setup_video.cpp:188
+msgid "OpenGL"
msgstr ""
-#: src/gui/setup_video.cpp:190
-msgid "Gui opacity"
+#: src/gui/setup_video.cpp:189
+msgid "Custom cursor"
msgstr ""
#: src/gui/setup_video.cpp:191
-msgid "Scroll radius"
+msgid "Visible names"
msgstr ""
-#: src/gui/setup_video.cpp:192
-msgid "Scroll laziness"
+#: src/gui/setup_video.cpp:193
+msgid "Particle effects"
msgstr ""
-#: src/gui/setup_video.cpp:193
-msgid "Ambient FX"
+#: src/gui/setup_video.cpp:195
+msgid "Show name"
msgstr ""
-#: src/gui/setup_video.cpp:194
-msgid "Particle Detail"
+#: src/gui/setup_video.cpp:196
+msgid "Show pickup notification"
msgstr ""
-#: src/gui/setup_video.cpp:195
-msgid "Font size"
+#: src/gui/setup_video.cpp:197
+msgid "in chat"
msgstr ""
-#: src/gui/setup_video.cpp:265 src/gui/setup_video.cpp:564
-msgid "No text"
+#: src/gui/setup_video.cpp:198
+msgid "as particle"
msgstr ""
-#: src/gui/setup_video.cpp:271 src/gui/setup_video.cpp:570
-msgid "Bubbles, no names"
+#: src/gui/setup_video.cpp:203
+msgid "FPS Limit:"
msgstr ""
-#: src/gui/setup_video.cpp:274 src/gui/setup_video.cpp:573
-msgid "Bubbles with names"
+#: src/gui/setup_video.cpp:214
+msgid "Video"
msgstr ""
-#: src/gui/setup_video.cpp:282 src/gui/setup_video.cpp:610
-msgid "off"
+#: src/gui/setup_video.cpp:219
+msgid "Overhead text"
msgstr ""
-#: src/gui/setup_video.cpp:285 src/gui/setup_video.cpp:296
-#: src/gui/setup_video.cpp:613 src/gui/setup_video.cpp:627
-msgid "low"
+#: src/gui/setup_video.cpp:220
+msgid "Gui opacity"
msgstr ""
-#: src/gui/setup_video.cpp:288 src/gui/setup_video.cpp:302
-#: src/gui/setup_video.cpp:616 src/gui/setup_video.cpp:633
-msgid "high"
+#: src/gui/setup_video.cpp:221
+msgid "Ambient FX"
msgstr ""
-#: src/gui/setup_video.cpp:299 src/gui/setup_video.cpp:630
-msgid "medium"
+#: src/gui/setup_video.cpp:222
+msgid "Particle Detail"
msgstr ""
-#: src/gui/setup_video.cpp:305 src/gui/setup_video.cpp:636
-msgid "max"
+#: src/gui/setup_video.cpp:223
+msgid "Font size"
msgstr ""
-#: src/gui/setup_video.cpp:410
+#: src/gui/setup_video.cpp:356
msgid "Failed to switch to "
msgstr ""
-#: src/gui/setup_video.cpp:411
+#: src/gui/setup_video.cpp:357
msgid "windowed"
msgstr ""
-#: src/gui/setup_video.cpp:411
+#: src/gui/setup_video.cpp:357
msgid "fullscreen"
msgstr ""
-#: src/gui/setup_video.cpp:412
+#: src/gui/setup_video.cpp:358
msgid "mode and restoration of old mode also failed!"
msgstr ""
-#: src/gui/setup_video.cpp:421
+#: src/gui/setup_video.cpp:367
msgid "Switching to full screen"
msgstr ""
-#: src/gui/setup_video.cpp:422
+#: src/gui/setup_video.cpp:368
msgid "Restart needed for changes to take effect."
msgstr ""
-#: src/gui/setup_video.cpp:434
+#: src/gui/setup_video.cpp:380
msgid "Changing OpenGL"
msgstr ""
-#: src/gui/setup_video.cpp:435
+#: src/gui/setup_video.cpp:381
msgid "Applying change to OpenGL requires restart."
msgstr ""
-#: src/gui/setup_video.cpp:520
+#: src/gui/setup_video.cpp:442
msgid "Screen resolution changed"
msgstr ""
-#: src/gui/setup_video.cpp:521
+#: src/gui/setup_video.cpp:443
msgid "Restart your client for the change to take effect."
msgstr ""
-#: src/gui/setup_video.cpp:545
+#: src/gui/setup_video.cpp:467
msgid "Particle effect settings changed."
msgstr ""
-#: src/gui/setup_video.cpp:546
+#: src/gui/setup_video.cpp:468
msgid "Changes will take effect on map change."
msgstr ""
@@ -2000,55 +1973,55 @@ msgstr ""
msgid "Ignore input 2"
msgstr ""
-#: src/localplayer.cpp:834
+#: src/localplayer.cpp:837
msgid "Unarmed"
msgstr ""
-#: src/localplayer.cpp:835
+#: src/localplayer.cpp:838
msgid "Knife"
msgstr ""
-#: src/localplayer.cpp:836
+#: src/localplayer.cpp:839
msgid "Sword"
msgstr ""
-#: src/localplayer.cpp:837
+#: src/localplayer.cpp:840
msgid "Polearm"
msgstr ""
-#: src/localplayer.cpp:838
+#: src/localplayer.cpp:841
msgid "Staff"
msgstr ""
-#: src/localplayer.cpp:839
+#: src/localplayer.cpp:842
msgid "Whip"
msgstr ""
-#: src/localplayer.cpp:840
+#: src/localplayer.cpp:843
msgid "Bow"
msgstr ""
-#: src/localplayer.cpp:841
+#: src/localplayer.cpp:844
msgid "Shooting"
msgstr ""
-#: src/localplayer.cpp:842
+#: src/localplayer.cpp:845
msgid "Mace"
msgstr ""
-#: src/localplayer.cpp:843
+#: src/localplayer.cpp:846
msgid "Axe"
msgstr ""
-#: src/localplayer.cpp:844
+#: src/localplayer.cpp:847
msgid "Thrown"
msgstr ""
-#: src/localplayer.cpp:846
+#: src/localplayer.cpp:849
msgid "Craft"
msgstr ""
-#: src/localplayer.cpp:847
+#: src/localplayer.cpp:850
msgid "Unknown Skill"
msgstr ""
@@ -2260,193 +2233,193 @@ msgstr ""
msgid "Unable to unequip."
msgstr ""
-#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:82
+#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:81
#, c-format
-msgid "Strength: %d"
+msgid "Strength %+d"
msgstr ""
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:82
#, c-format
-msgid "Agility: %d"
+msgid "Agility %+d"
msgstr ""
-#: src/net/ea/generalhandler.cpp:96 src/net/tmwserv/generalhandler.cpp:88
+#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:84
#, c-format
-msgid "Vitality: %d"
+msgid "Vitality %+d"
msgstr ""
-#: src/net/ea/generalhandler.cpp:98 src/net/tmwserv/generalhandler.cpp:90
+#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:85
#, c-format
-msgid "Intelligence: %d"
+msgid "Intelligence %+d"
msgstr ""
-#: src/net/ea/generalhandler.cpp:100 src/net/tmwserv/generalhandler.cpp:86
+#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:83
#, c-format
-msgid "Dexterity: %d"
+msgid "Dexterity %+d"
msgstr ""
-#: src/net/ea/generalhandler.cpp:102
+#: src/net/ea/generalhandler.cpp:96
#, c-format
-msgid "Luck: %d"
+msgid "Luck %+d"
msgstr ""
-#: src/net/ea/generalhandler.cpp:125
+#: src/net/ea/generalhandler.cpp:118
msgid "Authentication failed"
msgstr ""
-#: src/net/ea/generalhandler.cpp:128
+#: src/net/ea/generalhandler.cpp:121
msgid "No servers available"
msgstr ""
-#: src/net/ea/generalhandler.cpp:132
+#: src/net/ea/generalhandler.cpp:125
msgid "Someone else is trying to use this account"
msgstr ""
-#: src/net/ea/generalhandler.cpp:135
+#: src/net/ea/generalhandler.cpp:128
msgid "This account is already logged in"
msgstr ""
-#: src/net/ea/generalhandler.cpp:138
+#: src/net/ea/generalhandler.cpp:131
msgid "Speed hack detected"
msgstr ""
-#: src/net/ea/generalhandler.cpp:141
+#: src/net/ea/generalhandler.cpp:134
msgid "Duplicated login"
msgstr ""
-#: src/net/ea/generalhandler.cpp:144
+#: src/net/ea/generalhandler.cpp:137
msgid "Unknown connection error"
msgstr ""
-#: src/net/ea/generalhandler.cpp:201
+#: src/net/ea/generalhandler.cpp:194
msgid "Got disconnected from server!"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:52
+#: src/net/ea/gui/partytab.cpp:55
msgid "/help > Display this help."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:53
+#: src/net/ea/gui/partytab.cpp:56
msgid "/create > Create a new party"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:54
+#: src/net/ea/gui/partytab.cpp:57
msgid "/new > Alias of create"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:55
+#: src/net/ea/gui/partytab.cpp:58
msgid "/invite > Invite a player to your party"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:56
+#: src/net/ea/gui/partytab.cpp:59
msgid "/leave > Leave the party you are in"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:57
+#: src/net/ea/gui/partytab.cpp:60
msgid "/kick > Kick some one from the party you are in"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:58
+#: src/net/ea/gui/partytab.cpp:61
msgid "/item > Show/change party item sharing options"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:59
+#: src/net/ea/gui/partytab.cpp:62
msgid "/exp > Show/change party experience sharing options"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:68
+#: src/net/ea/gui/partytab.cpp:71
msgid "Command: /new <party-name>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:69
+#: src/net/ea/gui/partytab.cpp:72
msgid "Command: /create <party-name>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:70
+#: src/net/ea/gui/partytab.cpp:73
msgid "These commands create a new party called <party-name>."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:74
+#: src/net/ea/gui/partytab.cpp:77
msgid "Command: /invite <nick>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:81
+#: src/net/ea/gui/partytab.cpp:84
msgid "Command: /leave"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:82
+#: src/net/ea/gui/partytab.cpp:85
msgid "This command causes the player to leave the party."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/ea/gui/partytab.cpp:89
msgid "Command: /item <policy>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:87
+#: src/net/ea/gui/partytab.cpp:90
msgid "This command changes the party's item sharing policy."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:88
+#: src/net/ea/gui/partytab.cpp:91
msgid ""
"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
"\"0\", \"no\", \"false\" to disable item sharing."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:94
msgid "Command: /item"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:92
+#: src/net/ea/gui/partytab.cpp:95
msgid "This command displays the party's current item sharing policy."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:96
+#: src/net/ea/gui/partytab.cpp:99
msgid "Command: /exp <policy>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/ea/gui/partytab.cpp:100
msgid "This command changes the party's experience sharing policy."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:98
+#: src/net/ea/gui/partytab.cpp:101
msgid ""
"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:104
msgid "Command: /exp"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:102
+#: src/net/ea/gui/partytab.cpp:105
msgid "This command displays the party's current experience sharing policy."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:110
+#: src/net/ea/gui/partytab.cpp:113
msgid "Party name is missing."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:133 src/net/ea/partyhandler.cpp:191
+#: src/net/ea/gui/partytab.cpp:136 src/net/ea/partyhandler.cpp:194
msgid "Item sharing enabled."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:136 src/net/ea/partyhandler.cpp:197
+#: src/net/ea/gui/partytab.cpp:139 src/net/ea/partyhandler.cpp:200
msgid "Item sharing disabled."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:139 src/net/ea/partyhandler.cpp:203
+#: src/net/ea/gui/partytab.cpp:142 src/net/ea/partyhandler.cpp:206
msgid "Item sharing not possible."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:165 src/net/ea/partyhandler.cpp:168
+#: src/net/ea/gui/partytab.cpp:168 src/net/ea/partyhandler.cpp:171
msgid "Experience sharing enabled."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:168 src/net/ea/partyhandler.cpp:174
+#: src/net/ea/gui/partytab.cpp:171 src/net/ea/partyhandler.cpp:177
msgid "Experience sharing disabled."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:171 src/net/ea/partyhandler.cpp:180
+#: src/net/ea/gui/partytab.cpp:174 src/net/ea/partyhandler.cpp:183
msgid "Experience sharing not possible."
msgstr ""
@@ -2509,45 +2482,45 @@ msgstr ""
msgid "Party successfully created."
msgstr ""
-#: src/net/ea/partyhandler.cpp:115
+#: src/net/ea/partyhandler.cpp:118
#, c-format
msgid "%s is already a member of a party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:119
+#: src/net/ea/partyhandler.cpp:122
#, c-format
msgid "%s refused your invitation."
msgstr ""
-#: src/net/ea/partyhandler.cpp:123
+#: src/net/ea/partyhandler.cpp:126
#, c-format
msgid "%s is now a member of your party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:127
+#: src/net/ea/partyhandler.cpp:130
#, c-format
msgid "Unknown invite response for %s."
msgstr ""
-#: src/net/ea/partyhandler.cpp:232
+#: src/net/ea/partyhandler.cpp:235
msgid "You have left the party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:235
+#: src/net/ea/partyhandler.cpp:239
#, c-format
msgid "%s has left your party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:272
+#: src/net/ea/partyhandler.cpp:274
#, c-format
msgid "An unknown member tried to say: %s"
msgstr ""
-#: src/net/ea/partyhandler.cpp:298
+#: src/net/ea/partyhandler.cpp:300
msgid "Inviting like this isn't supported at the moment."
msgstr ""
-#: src/net/ea/partyhandler.cpp:327
+#: src/net/ea/partyhandler.cpp:329
#, c-format
msgid "%s is not in your party!"
msgstr ""
@@ -2840,9 +2813,9 @@ msgstr ""
msgid "Topic: "
msgstr ""
-#: src/net/tmwserv/generalhandler.cpp:92
+#: src/net/tmwserv/generalhandler.cpp:86
#, c-format
-msgid "Willpower: %d"
+msgid "Willpower %+d"
msgstr ""
#: src/net/tmwserv/loginhandler.cpp:80
diff --git a/po/cs.po b/po/cs.po
index a8d194e9..3b0b8763 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: tmw\n"
"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-05-10 16:39+0200\n"
+"POT-Creation-Date: 2009-05-12 00:11+0200\n"
"PO-Revision-Date: 2009-03-26 13:00+0000\n"
"Last-Translator: Lubos <alvinx12@centrum.cz>\n"
"Language-Team: Czech <cs@li.org>\n"
@@ -175,7 +175,7 @@ msgstr ""
#: src/commandhandler.cpp:216 src/commandhandler.cpp:230
#: src/gui/widgets/channeltab.cpp:81 src/gui/widgets/channeltab.cpp:90
-#: src/net/ea/gui/partytab.cpp:76
+#: src/net/ea/gui/partytab.cpp:79
msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
msgstr ""
@@ -195,7 +195,7 @@ msgstr ""
msgid "Command: /party <nick>"
msgstr ""
-#: src/commandhandler.cpp:229 src/net/ea/gui/partytab.cpp:75
+#: src/commandhandler.cpp:229 src/net/ea/gui/partytab.cpp:78
msgid "This command invites <nick> to party with you."
msgstr ""
@@ -508,7 +508,7 @@ msgstr "Ok"
msgid "Previous"
msgstr "Předchozí"
-#: src/gui/charselectdialog.cpp:113 src/gui/npcdialog.cpp:44
+#: src/gui/charselectdialog.cpp:113 src/gui/npcdialog.cpp:43
msgid "Next"
msgstr "Další"
@@ -533,7 +533,7 @@ msgstr "Nová"
#: src/gui/charselectdialog.cpp:118 src/gui/charselectdialog.cpp:165
#: src/gui/charselectdialog.cpp:166 src/gui/charselectdialog.cpp:315
-#: src/gui/setup_players.cpp:230
+#: src/gui/setup_players.cpp:228
msgid "Delete"
msgstr "Odstranit"
@@ -568,19 +568,15 @@ msgstr ""
msgid "%d players are present."
msgstr ""
-#: src/gui/chat.cpp:348 src/gui/chat.cpp:354
+#: src/gui/chat.cpp:333
msgid "Present: "
msgstr ""
-#: src/gui/chat.cpp:348 src/gui/chat.cpp:354
-msgid "; "
-msgstr ""
-
-#: src/gui/chat.cpp:349
+#: src/gui/chat.cpp:350
msgid "Attendance written to record log."
msgstr ""
-#: src/gui/chat.cpp:474
+#: src/gui/chat.cpp:475
#, c-format
msgid "Whispering to %s: %s"
msgstr ""
@@ -630,7 +626,7 @@ msgstr ""
msgid "Help"
msgstr ""
-#: src/gui/help.cpp:47 src/gui/npcdialog.cpp:45 src/gui/storagewindow.cpp:68
+#: src/gui/help.cpp:47 src/gui/npcdialog.cpp:44 src/gui/storagewindow.cpp:68
msgid "Close"
msgstr ""
@@ -723,7 +719,7 @@ msgid "Register"
msgstr "Registrace"
#: src/gui/magic.cpp:32 src/gui/skilldialog.cpp:117 src/gui/windowmenu.cpp:64
-#: src/localplayer.cpp:845
+#: src/localplayer.cpp:848
msgid "Magic"
msgstr ""
@@ -739,32 +735,24 @@ msgstr ""
msgid "Cast Test Spell 3"
msgstr ""
-#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
+#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:86
#, fuzzy
msgid "Map"
msgstr "MiniMapa"
-#: src/gui/npcdialog.cpp:43
+#: src/gui/npcdialog.cpp:42
msgid "Waiting for server"
msgstr ""
-#: src/gui/npcdialog.cpp:46
+#: src/gui/npcdialog.cpp:45
msgid "Submit"
msgstr ""
-#: src/gui/npcdialog.cpp:49 src/gui/npcpostdialog.cpp:39
+#: src/gui/npcdialog.cpp:48 src/gui/npcpostdialog.cpp:39
msgid "NPC"
msgstr ""
-#: src/gui/npcdialog.cpp:95
-msgid "+"
-msgstr ""
-
-#: src/gui/npcdialog.cpp:96
-msgid "-"
-msgstr ""
-
-#: src/gui/npcdialog.cpp:105
+#: src/gui/npcdialog.cpp:104
msgid "Reset"
msgstr ""
@@ -772,8 +760,7 @@ msgstr ""
msgid "Send"
msgstr ""
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:268
-#: src/gui/setup_video.cpp:567
+#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:142
msgid "Text"
msgstr ""
@@ -825,8 +812,8 @@ msgstr ""
msgid "Is"
msgstr ""
-#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:33
-#: src/net/ea/gui/partytab.cpp:37
+#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:45
+#: src/net/ea/gui/partytab.cpp:39
msgid "Party"
msgstr ""
@@ -1292,26 +1279,22 @@ msgid "???"
msgstr ""
#: src/gui/setup_players.cpp:224
-msgid "Save player list"
-msgstr ""
-
-#: src/gui/setup_players.cpp:226
msgid "Allow trading"
msgstr ""
-#: src/gui/setup_players.cpp:228
+#: src/gui/setup_players.cpp:226
msgid "Allow whispers"
msgstr ""
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:230
msgid "Put all whispers in tabs"
msgstr ""
-#: src/gui/setup_players.cpp:234
+#: src/gui/setup_players.cpp:232
msgid "Players"
msgstr ""
-#: src/gui/setup_players.cpp:259
+#: src/gui/setup_players.cpp:257
msgid "When ignoring:"
msgstr ""
@@ -1332,157 +1315,147 @@ msgstr ""
msgid "Large"
msgstr ""
-#: src/gui/setup_video.cpp:151
-msgid "Full screen"
-msgstr ""
-
-#: src/gui/setup_video.cpp:152
-msgid "OpenGL"
-msgstr "OpenGL"
-
-#: src/gui/setup_video.cpp:153
-msgid "Custom cursor"
+#: src/gui/setup_video.cpp:141
+msgid "No text"
msgstr ""
-#: src/gui/setup_video.cpp:155
-msgid "Visible names"
+#: src/gui/setup_video.cpp:143
+msgid "Bubbles, no names"
msgstr ""
-#: src/gui/setup_video.cpp:157
-msgid "Particle effects"
+#: src/gui/setup_video.cpp:144
+msgid "Bubbles with names"
msgstr ""
-#: src/gui/setup_video.cpp:159
-msgid "Show name"
+#: src/gui/setup_video.cpp:153
+msgid "off"
msgstr ""
-#: src/gui/setup_video.cpp:160
-msgid "Show pickup notification"
+#: src/gui/setup_video.cpp:154 src/gui/setup_video.cpp:164
+msgid "low"
msgstr ""
-#: src/gui/setup_video.cpp:161
-msgid "in chat"
+#: src/gui/setup_video.cpp:155 src/gui/setup_video.cpp:166
+msgid "high"
msgstr ""
-#: src/gui/setup_video.cpp:162
-msgid "as particle"
+#: src/gui/setup_video.cpp:165
+msgid "medium"
msgstr ""
#: src/gui/setup_video.cpp:167
-msgid "FPS Limit:"
+msgid "max"
msgstr ""
-#: src/gui/setup_video.cpp:184
-msgid "Video"
+#: src/gui/setup_video.cpp:187
+msgid "Full screen"
msgstr ""
-#: src/gui/setup_video.cpp:189
-msgid "Overhead text"
-msgstr ""
+#: src/gui/setup_video.cpp:188
+msgid "OpenGL"
+msgstr "OpenGL"
-#: src/gui/setup_video.cpp:190
-msgid "Gui opacity"
+#: src/gui/setup_video.cpp:189
+msgid "Custom cursor"
msgstr ""
#: src/gui/setup_video.cpp:191
-msgid "Scroll radius"
+msgid "Visible names"
msgstr ""
-#: src/gui/setup_video.cpp:192
-msgid "Scroll laziness"
+#: src/gui/setup_video.cpp:193
+msgid "Particle effects"
msgstr ""
-#: src/gui/setup_video.cpp:193
-msgid "Ambient FX"
+#: src/gui/setup_video.cpp:195
+msgid "Show name"
msgstr ""
-#: src/gui/setup_video.cpp:194
-msgid "Particle Detail"
+#: src/gui/setup_video.cpp:196
+msgid "Show pickup notification"
msgstr ""
-#: src/gui/setup_video.cpp:195
-msgid "Font size"
+#: src/gui/setup_video.cpp:197
+msgid "in chat"
msgstr ""
-#: src/gui/setup_video.cpp:265 src/gui/setup_video.cpp:564
-msgid "No text"
+#: src/gui/setup_video.cpp:198
+msgid "as particle"
msgstr ""
-#: src/gui/setup_video.cpp:271 src/gui/setup_video.cpp:570
-msgid "Bubbles, no names"
+#: src/gui/setup_video.cpp:203
+msgid "FPS Limit:"
msgstr ""
-#: src/gui/setup_video.cpp:274 src/gui/setup_video.cpp:573
-msgid "Bubbles with names"
+#: src/gui/setup_video.cpp:214
+msgid "Video"
msgstr ""
-#: src/gui/setup_video.cpp:282 src/gui/setup_video.cpp:610
-msgid "off"
+#: src/gui/setup_video.cpp:219
+msgid "Overhead text"
msgstr ""
-#: src/gui/setup_video.cpp:285 src/gui/setup_video.cpp:296
-#: src/gui/setup_video.cpp:613 src/gui/setup_video.cpp:627
-msgid "low"
+#: src/gui/setup_video.cpp:220
+msgid "Gui opacity"
msgstr ""
-#: src/gui/setup_video.cpp:288 src/gui/setup_video.cpp:302
-#: src/gui/setup_video.cpp:616 src/gui/setup_video.cpp:633
-msgid "high"
+#: src/gui/setup_video.cpp:221
+msgid "Ambient FX"
msgstr ""
-#: src/gui/setup_video.cpp:299 src/gui/setup_video.cpp:630
-msgid "medium"
+#: src/gui/setup_video.cpp:222
+msgid "Particle Detail"
msgstr ""
-#: src/gui/setup_video.cpp:305 src/gui/setup_video.cpp:636
-msgid "max"
+#: src/gui/setup_video.cpp:223
+msgid "Font size"
msgstr ""
-#: src/gui/setup_video.cpp:410
+#: src/gui/setup_video.cpp:356
msgid "Failed to switch to "
msgstr ""
-#: src/gui/setup_video.cpp:411
+#: src/gui/setup_video.cpp:357
msgid "windowed"
msgstr ""
-#: src/gui/setup_video.cpp:411
+#: src/gui/setup_video.cpp:357
msgid "fullscreen"
msgstr ""
-#: src/gui/setup_video.cpp:412
+#: src/gui/setup_video.cpp:358
msgid "mode and restoration of old mode also failed!"
msgstr ""
-#: src/gui/setup_video.cpp:421
+#: src/gui/setup_video.cpp:367
msgid "Switching to full screen"
msgstr ""
-#: src/gui/setup_video.cpp:422
+#: src/gui/setup_video.cpp:368
msgid "Restart needed for changes to take effect."
msgstr ""
-#: src/gui/setup_video.cpp:434
+#: src/gui/setup_video.cpp:380
msgid "Changing OpenGL"
msgstr ""
-#: src/gui/setup_video.cpp:435
+#: src/gui/setup_video.cpp:381
msgid "Applying change to OpenGL requires restart."
msgstr ""
-#: src/gui/setup_video.cpp:520
+#: src/gui/setup_video.cpp:442
msgid "Screen resolution changed"
msgstr ""
-#: src/gui/setup_video.cpp:521
+#: src/gui/setup_video.cpp:443
msgid "Restart your client for the change to take effect."
msgstr ""
-#: src/gui/setup_video.cpp:545
+#: src/gui/setup_video.cpp:467
msgid "Particle effect settings changed."
msgstr ""
-#: src/gui/setup_video.cpp:546
+#: src/gui/setup_video.cpp:468
msgid "Changes will take effect on map change."
msgstr ""
@@ -2003,55 +1976,55 @@ msgstr ""
msgid "Ignore input 2"
msgstr ""
-#: src/localplayer.cpp:834
+#: src/localplayer.cpp:837
msgid "Unarmed"
msgstr ""
-#: src/localplayer.cpp:835
+#: src/localplayer.cpp:838
msgid "Knife"
msgstr ""
-#: src/localplayer.cpp:836
+#: src/localplayer.cpp:839
msgid "Sword"
msgstr ""
-#: src/localplayer.cpp:837
+#: src/localplayer.cpp:840
msgid "Polearm"
msgstr ""
-#: src/localplayer.cpp:838
+#: src/localplayer.cpp:841
msgid "Staff"
msgstr ""
-#: src/localplayer.cpp:839
+#: src/localplayer.cpp:842
msgid "Whip"
msgstr ""
-#: src/localplayer.cpp:840
+#: src/localplayer.cpp:843
msgid "Bow"
msgstr ""
-#: src/localplayer.cpp:841
+#: src/localplayer.cpp:844
msgid "Shooting"
msgstr ""
-#: src/localplayer.cpp:842
+#: src/localplayer.cpp:845
msgid "Mace"
msgstr ""
-#: src/localplayer.cpp:843
+#: src/localplayer.cpp:846
msgid "Axe"
msgstr ""
-#: src/localplayer.cpp:844
+#: src/localplayer.cpp:847
msgid "Thrown"
msgstr ""
-#: src/localplayer.cpp:846
+#: src/localplayer.cpp:849
msgid "Craft"
msgstr ""
-#: src/localplayer.cpp:847
+#: src/localplayer.cpp:850
msgid "Unknown Skill"
msgstr ""
@@ -2263,193 +2236,193 @@ msgstr ""
msgid "Unable to unequip."
msgstr ""
-#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:82
-#, c-format
-msgid "Strength: %d"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:81
+#, fuzzy, c-format
+msgid "Strength %+d"
+msgstr "Síla:"
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:82
#, c-format
-msgid "Agility: %d"
+msgid "Agility %+d"
msgstr ""
-#: src/net/ea/generalhandler.cpp:96 src/net/tmwserv/generalhandler.cpp:88
-#, c-format
-msgid "Vitality: %d"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:84
+#, fuzzy, c-format
+msgid "Vitality %+d"
+msgstr "Vitalita:"
-#: src/net/ea/generalhandler.cpp:98 src/net/tmwserv/generalhandler.cpp:90
-#, c-format
-msgid "Intelligence: %d"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:85
+#, fuzzy, c-format
+msgid "Intelligence %+d"
+msgstr "Inteligence:"
-#: src/net/ea/generalhandler.cpp:100 src/net/tmwserv/generalhandler.cpp:86
+#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:83
#, c-format
-msgid "Dexterity: %d"
+msgid "Dexterity %+d"
msgstr ""
-#: src/net/ea/generalhandler.cpp:102
-#, c-format
-msgid "Luck: %d"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:96
+#, fuzzy, c-format
+msgid "Luck %+d"
+msgstr "Útok %+d"
-#: src/net/ea/generalhandler.cpp:125
+#: src/net/ea/generalhandler.cpp:118
msgid "Authentication failed"
msgstr ""
-#: src/net/ea/generalhandler.cpp:128
+#: src/net/ea/generalhandler.cpp:121
msgid "No servers available"
msgstr ""
-#: src/net/ea/generalhandler.cpp:132
+#: src/net/ea/generalhandler.cpp:125
msgid "Someone else is trying to use this account"
msgstr ""
-#: src/net/ea/generalhandler.cpp:135
+#: src/net/ea/generalhandler.cpp:128
msgid "This account is already logged in"
msgstr ""
-#: src/net/ea/generalhandler.cpp:138
+#: src/net/ea/generalhandler.cpp:131
msgid "Speed hack detected"
msgstr ""
-#: src/net/ea/generalhandler.cpp:141
+#: src/net/ea/generalhandler.cpp:134
msgid "Duplicated login"
msgstr ""
-#: src/net/ea/generalhandler.cpp:144
+#: src/net/ea/generalhandler.cpp:137
msgid "Unknown connection error"
msgstr ""
-#: src/net/ea/generalhandler.cpp:201
+#: src/net/ea/generalhandler.cpp:194
msgid "Got disconnected from server!"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:52
+#: src/net/ea/gui/partytab.cpp:55
msgid "/help > Display this help."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:53
+#: src/net/ea/gui/partytab.cpp:56
msgid "/create > Create a new party"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:54
+#: src/net/ea/gui/partytab.cpp:57
msgid "/new > Alias of create"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:55
+#: src/net/ea/gui/partytab.cpp:58
msgid "/invite > Invite a player to your party"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:56
+#: src/net/ea/gui/partytab.cpp:59
msgid "/leave > Leave the party you are in"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:57
+#: src/net/ea/gui/partytab.cpp:60
msgid "/kick > Kick some one from the party you are in"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:58
+#: src/net/ea/gui/partytab.cpp:61
msgid "/item > Show/change party item sharing options"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:59
+#: src/net/ea/gui/partytab.cpp:62
msgid "/exp > Show/change party experience sharing options"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:68
+#: src/net/ea/gui/partytab.cpp:71
msgid "Command: /new <party-name>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:69
+#: src/net/ea/gui/partytab.cpp:72
msgid "Command: /create <party-name>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:70
+#: src/net/ea/gui/partytab.cpp:73
msgid "These commands create a new party called <party-name>."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:74
+#: src/net/ea/gui/partytab.cpp:77
msgid "Command: /invite <nick>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:81
+#: src/net/ea/gui/partytab.cpp:84
msgid "Command: /leave"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:82
+#: src/net/ea/gui/partytab.cpp:85
msgid "This command causes the player to leave the party."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/ea/gui/partytab.cpp:89
msgid "Command: /item <policy>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:87
+#: src/net/ea/gui/partytab.cpp:90
msgid "This command changes the party's item sharing policy."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:88
+#: src/net/ea/gui/partytab.cpp:91
msgid ""
"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
"\"0\", \"no\", \"false\" to disable item sharing."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:94
msgid "Command: /item"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:92
+#: src/net/ea/gui/partytab.cpp:95
msgid "This command displays the party's current item sharing policy."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:96
+#: src/net/ea/gui/partytab.cpp:99
msgid "Command: /exp <policy>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/ea/gui/partytab.cpp:100
msgid "This command changes the party's experience sharing policy."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:98
+#: src/net/ea/gui/partytab.cpp:101
msgid ""
"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:104
msgid "Command: /exp"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:102
+#: src/net/ea/gui/partytab.cpp:105
msgid "This command displays the party's current experience sharing policy."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:110
+#: src/net/ea/gui/partytab.cpp:113
msgid "Party name is missing."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:133 src/net/ea/partyhandler.cpp:191
+#: src/net/ea/gui/partytab.cpp:136 src/net/ea/partyhandler.cpp:194
msgid "Item sharing enabled."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:136 src/net/ea/partyhandler.cpp:197
+#: src/net/ea/gui/partytab.cpp:139 src/net/ea/partyhandler.cpp:200
msgid "Item sharing disabled."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:139 src/net/ea/partyhandler.cpp:203
+#: src/net/ea/gui/partytab.cpp:142 src/net/ea/partyhandler.cpp:206
msgid "Item sharing not possible."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:165 src/net/ea/partyhandler.cpp:168
+#: src/net/ea/gui/partytab.cpp:168 src/net/ea/partyhandler.cpp:171
msgid "Experience sharing enabled."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:168 src/net/ea/partyhandler.cpp:174
+#: src/net/ea/gui/partytab.cpp:171 src/net/ea/partyhandler.cpp:177
msgid "Experience sharing disabled."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:171 src/net/ea/partyhandler.cpp:180
+#: src/net/ea/gui/partytab.cpp:174 src/net/ea/partyhandler.cpp:183
msgid "Experience sharing not possible."
msgstr ""
@@ -2512,45 +2485,45 @@ msgstr ""
msgid "Party successfully created."
msgstr ""
-#: src/net/ea/partyhandler.cpp:115
+#: src/net/ea/partyhandler.cpp:118
#, c-format
msgid "%s is already a member of a party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:119
+#: src/net/ea/partyhandler.cpp:122
#, c-format
msgid "%s refused your invitation."
msgstr ""
-#: src/net/ea/partyhandler.cpp:123
+#: src/net/ea/partyhandler.cpp:126
#, c-format
msgid "%s is now a member of your party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:127
+#: src/net/ea/partyhandler.cpp:130
#, c-format
msgid "Unknown invite response for %s."
msgstr ""
-#: src/net/ea/partyhandler.cpp:232
+#: src/net/ea/partyhandler.cpp:235
msgid "You have left the party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:235
+#: src/net/ea/partyhandler.cpp:239
#, c-format
msgid "%s has left your party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:272
+#: src/net/ea/partyhandler.cpp:274
#, c-format
msgid "An unknown member tried to say: %s"
msgstr ""
-#: src/net/ea/partyhandler.cpp:298
+#: src/net/ea/partyhandler.cpp:300
msgid "Inviting like this isn't supported at the moment."
msgstr ""
-#: src/net/ea/partyhandler.cpp:327
+#: src/net/ea/partyhandler.cpp:329
#, c-format
msgid "%s is not in your party!"
msgstr ""
@@ -2843,9 +2816,9 @@ msgstr ""
msgid "Topic: "
msgstr ""
-#: src/net/tmwserv/generalhandler.cpp:92
+#: src/net/tmwserv/generalhandler.cpp:86
#, c-format
-msgid "Willpower: %d"
+msgid "Willpower %+d"
msgstr ""
#: src/net/tmwserv/loginhandler.cpp:80
diff --git a/po/da.po b/po/da.po
index 3becf5e9..8fb074ac 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: tmw\n"
"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-05-10 16:39+0200\n"
+"POT-Creation-Date: 2009-05-12 00:11+0200\n"
"PO-Revision-Date: 2008-12-28 14:45+0000\n"
"Last-Translator: GonzoDark AKA IchigoBlack <Gonzo.Dark@gmail.com>\n"
"Language-Team: Danish <none@none.none>\n"
@@ -194,7 +194,7 @@ msgstr "Denne kommando sender beskeden <besked> til <navn>."
#: src/commandhandler.cpp:216 src/commandhandler.cpp:230
#: src/gui/widgets/channeltab.cpp:81 src/gui/widgets/channeltab.cpp:90
-#: src/net/ea/gui/partytab.cpp:76
+#: src/net/ea/gui/partytab.cpp:79
msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
msgstr "Hvis navnet har mellemrum i det, skal det omringes med følgende (\")."
@@ -217,7 +217,7 @@ msgstr ""
msgid "Command: /party <nick>"
msgstr "Kommando: /w <navn> <besked>"
-#: src/commandhandler.cpp:229 src/net/ea/gui/partytab.cpp:75
+#: src/commandhandler.cpp:229 src/net/ea/gui/partytab.cpp:78
msgid "This command invites <nick> to party with you."
msgstr ""
@@ -551,7 +551,7 @@ msgstr ""
msgid "Previous"
msgstr "Forrige"
-#: src/gui/charselectdialog.cpp:113 src/gui/npcdialog.cpp:44
+#: src/gui/charselectdialog.cpp:113 src/gui/npcdialog.cpp:43
msgid "Next"
msgstr "Næste"
@@ -576,7 +576,7 @@ msgstr "Opret"
#: src/gui/charselectdialog.cpp:118 src/gui/charselectdialog.cpp:165
#: src/gui/charselectdialog.cpp:166 src/gui/charselectdialog.cpp:315
-#: src/gui/setup_players.cpp:230
+#: src/gui/setup_players.cpp:228
msgid "Delete"
msgstr "Slet"
@@ -612,19 +612,15 @@ msgstr "Chat"
msgid "%d players are present."
msgstr ""
-#: src/gui/chat.cpp:348 src/gui/chat.cpp:354
+#: src/gui/chat.cpp:333
msgid "Present: "
msgstr "Til stede: "
-#: src/gui/chat.cpp:348 src/gui/chat.cpp:354
-msgid "; "
-msgstr ""
-
-#: src/gui/chat.cpp:349
+#: src/gui/chat.cpp:350
msgid "Attendance written to record log."
msgstr "Fremmøde skrives til loggen"
-#: src/gui/chat.cpp:474
+#: src/gui/chat.cpp:475
#, fuzzy, c-format
msgid "Whispering to %s: %s"
msgstr "Hvisker til "
@@ -677,7 +673,7 @@ msgstr "Klaner"
msgid "Help"
msgstr "Hjælp"
-#: src/gui/help.cpp:47 src/gui/npcdialog.cpp:45 src/gui/storagewindow.cpp:68
+#: src/gui/help.cpp:47 src/gui/npcdialog.cpp:44 src/gui/storagewindow.cpp:68
msgid "Close"
msgstr "Luk"
@@ -776,7 +772,7 @@ msgid "Register"
msgstr "Registrer"
#: src/gui/magic.cpp:32 src/gui/skilldialog.cpp:117 src/gui/windowmenu.cpp:64
-#: src/localplayer.cpp:845
+#: src/localplayer.cpp:848
msgid "Magic"
msgstr ""
@@ -792,33 +788,25 @@ msgstr ""
msgid "Cast Test Spell 3"
msgstr ""
-#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
+#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:86
#, fuzzy
msgid "Map"
msgstr "MiniKort"
-#: src/gui/npcdialog.cpp:43
+#: src/gui/npcdialog.cpp:42
msgid "Waiting for server"
msgstr ""
-#: src/gui/npcdialog.cpp:46
+#: src/gui/npcdialog.cpp:45
#, fuzzy
msgid "Submit"
msgstr "Opdel"
-#: src/gui/npcdialog.cpp:49 src/gui/npcpostdialog.cpp:39
+#: src/gui/npcdialog.cpp:48 src/gui/npcpostdialog.cpp:39
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:95
-msgid "+"
-msgstr ""
-
-#: src/gui/npcdialog.cpp:96
-msgid "-"
-msgstr ""
-
-#: src/gui/npcdialog.cpp:105
+#: src/gui/npcdialog.cpp:104
#, fuzzy
msgid "Reset"
msgstr "Nuværende:"
@@ -828,8 +816,7 @@ msgstr "Nuværende:"
msgid "Send"
msgstr "Lyd"
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:268
-#: src/gui/setup_video.cpp:567
+#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:142
#, fuzzy
msgid "Text"
msgstr "Næste"
@@ -883,8 +870,8 @@ msgstr "Hvisk"
msgid "Is"
msgstr "Er"
-#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:33
-#: src/net/ea/gui/partytab.cpp:37
+#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:45
+#: src/net/ea/gui/partytab.cpp:39
#, fuzzy
msgid "Party"
msgstr "Gruppe"
@@ -1376,26 +1363,22 @@ msgid "???"
msgstr "???"
#: src/gui/setup_players.cpp:224
-msgid "Save player list"
-msgstr "Gem bruger liste"
-
-#: src/gui/setup_players.cpp:226
msgid "Allow trading"
msgstr "Tillad handel"
-#: src/gui/setup_players.cpp:228
+#: src/gui/setup_players.cpp:226
msgid "Allow whispers"
msgstr "Tillad hviskere"
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:230
msgid "Put all whispers in tabs"
msgstr ""
-#: src/gui/setup_players.cpp:234
+#: src/gui/setup_players.cpp:232
msgid "Players"
msgstr "Brugere"
-#: src/gui/setup_players.cpp:259
+#: src/gui/setup_players.cpp:257
msgid "When ignoring:"
msgstr "Når ignorer:"
@@ -1417,163 +1400,153 @@ msgstr "mellem"
msgid "Large"
msgstr ""
-#: src/gui/setup_video.cpp:151
+#: src/gui/setup_video.cpp:141
+#, fuzzy
+msgid "No text"
+msgstr "Næste"
+
+#: src/gui/setup_video.cpp:143
+#, fuzzy
+msgid "Bubbles, no names"
+msgstr "Synlige navne"
+
+#: src/gui/setup_video.cpp:144
+msgid "Bubbles with names"
+msgstr ""
+
+#: src/gui/setup_video.cpp:153
+msgid "off"
+msgstr "fra"
+
+#: src/gui/setup_video.cpp:154 src/gui/setup_video.cpp:164
+msgid "low"
+msgstr "lav"
+
+#: src/gui/setup_video.cpp:155 src/gui/setup_video.cpp:166
+msgid "high"
+msgstr "høj"
+
+#: src/gui/setup_video.cpp:165
+msgid "medium"
+msgstr "mellem"
+
+#: src/gui/setup_video.cpp:167
+msgid "max"
+msgstr "maks"
+
+#: src/gui/setup_video.cpp:187
msgid "Full screen"
msgstr "Fuld Skærm"
-#: src/gui/setup_video.cpp:152
+#: src/gui/setup_video.cpp:188
msgid "OpenGL"
msgstr "OpenGL"
-#: src/gui/setup_video.cpp:153
+#: src/gui/setup_video.cpp:189
msgid "Custom cursor"
msgstr "Brugerdefineret Musepil"
-#: src/gui/setup_video.cpp:155
+#: src/gui/setup_video.cpp:191
msgid "Visible names"
msgstr "Synlige navne"
-#: src/gui/setup_video.cpp:157
+#: src/gui/setup_video.cpp:193
msgid "Particle effects"
msgstr "Partikel effekter"
-#: src/gui/setup_video.cpp:159
+#: src/gui/setup_video.cpp:195
msgid "Show name"
msgstr "Vis navn"
-#: src/gui/setup_video.cpp:160
+#: src/gui/setup_video.cpp:196
msgid "Show pickup notification"
msgstr ""
-#: src/gui/setup_video.cpp:161
+#: src/gui/setup_video.cpp:197
#, fuzzy
msgid "in chat"
msgstr "inc"
-#: src/gui/setup_video.cpp:162
+#: src/gui/setup_video.cpp:198
msgid "as particle"
msgstr ""
-#: src/gui/setup_video.cpp:167
+#: src/gui/setup_video.cpp:203
msgid "FPS Limit:"
msgstr "FPS grænse:"
-#: src/gui/setup_video.cpp:184
+#: src/gui/setup_video.cpp:214
msgid "Video"
msgstr "Video"
-#: src/gui/setup_video.cpp:189
+#: src/gui/setup_video.cpp:219
msgid "Overhead text"
msgstr ""
-#: src/gui/setup_video.cpp:190
+#: src/gui/setup_video.cpp:220
msgid "Gui opacity"
msgstr "Gennemsigtighed"
-#: src/gui/setup_video.cpp:191
-msgid "Scroll radius"
-msgstr "Følsomhed på mus"
-
-#: src/gui/setup_video.cpp:192
-msgid "Scroll laziness"
-msgstr "Acceleration på mus"
-
-#: src/gui/setup_video.cpp:193
+#: src/gui/setup_video.cpp:221
msgid "Ambient FX"
msgstr "Omgivende FX"
-#: src/gui/setup_video.cpp:194
+#: src/gui/setup_video.cpp:222
msgid "Particle Detail"
msgstr "Partikel Detalje"
-#: src/gui/setup_video.cpp:195
+#: src/gui/setup_video.cpp:223
msgid "Font size"
msgstr ""
-#: src/gui/setup_video.cpp:265 src/gui/setup_video.cpp:564
-#, fuzzy
-msgid "No text"
-msgstr "Næste"
-
-#: src/gui/setup_video.cpp:271 src/gui/setup_video.cpp:570
-#, fuzzy
-msgid "Bubbles, no names"
-msgstr "Synlige navne"
-
-#: src/gui/setup_video.cpp:274 src/gui/setup_video.cpp:573
-msgid "Bubbles with names"
-msgstr ""
-
-#: src/gui/setup_video.cpp:282 src/gui/setup_video.cpp:610
-msgid "off"
-msgstr "fra"
-
-#: src/gui/setup_video.cpp:285 src/gui/setup_video.cpp:296
-#: src/gui/setup_video.cpp:613 src/gui/setup_video.cpp:627
-msgid "low"
-msgstr "lav"
-
-#: src/gui/setup_video.cpp:288 src/gui/setup_video.cpp:302
-#: src/gui/setup_video.cpp:616 src/gui/setup_video.cpp:633
-msgid "high"
-msgstr "høj"
-
-#: src/gui/setup_video.cpp:299 src/gui/setup_video.cpp:630
-msgid "medium"
-msgstr "mellem"
-
-#: src/gui/setup_video.cpp:305 src/gui/setup_video.cpp:636
-msgid "max"
-msgstr "maks"
-
-#: src/gui/setup_video.cpp:410
+#: src/gui/setup_video.cpp:356
msgid "Failed to switch to "
msgstr "Fejlede i at skifte til "
-#: src/gui/setup_video.cpp:411
+#: src/gui/setup_video.cpp:357
msgid "windowed"
msgstr "vinduet"
-#: src/gui/setup_video.cpp:411
+#: src/gui/setup_video.cpp:357
#, fuzzy
msgid "fullscreen"
msgstr "Fuld Skærm"
-#: src/gui/setup_video.cpp:412
+#: src/gui/setup_video.cpp:358
msgid "mode and restoration of old mode also failed!"
msgstr "opsætning og genoprettelse af gammel opsætning fejlede også!"
-#: src/gui/setup_video.cpp:421
+#: src/gui/setup_video.cpp:367
msgid "Switching to full screen"
msgstr "Skifter til fuld skærm"
-#: src/gui/setup_video.cpp:422
+#: src/gui/setup_video.cpp:368
msgid "Restart needed for changes to take effect."
msgstr "Ændringerne kræver at du genstarter klienten."
-#: src/gui/setup_video.cpp:434
+#: src/gui/setup_video.cpp:380
msgid "Changing OpenGL"
msgstr "Skrifter til OpenGL"
-#: src/gui/setup_video.cpp:435
+#: src/gui/setup_video.cpp:381
msgid "Applying change to OpenGL requires restart."
msgstr "Ændringerne til OpenGL kræver at du genstarter klienten."
-#: src/gui/setup_video.cpp:520
+#: src/gui/setup_video.cpp:442
msgid "Screen resolution changed"
msgstr "Skærm opløsning ændret"
-#: src/gui/setup_video.cpp:521
+#: src/gui/setup_video.cpp:443
#, fuzzy
msgid "Restart your client for the change to take effect."
msgstr "Ændringerne kræver at du genstarter klienten."
-#: src/gui/setup_video.cpp:545
+#: src/gui/setup_video.cpp:467
#, fuzzy
msgid "Particle effect settings changed."
msgstr "Partikel effekt opsætningen er ændret"
-#: src/gui/setup_video.cpp:546
+#: src/gui/setup_video.cpp:468
msgid "Changes will take effect on map change."
msgstr ""
@@ -2147,63 +2120,63 @@ msgstr ""
msgid "Ignore input 2"
msgstr ""
-#: src/localplayer.cpp:834
+#: src/localplayer.cpp:837
#, fuzzy
msgid "Unarmed"
msgstr "Unavngivet"
-#: src/localplayer.cpp:835
+#: src/localplayer.cpp:838
msgid "Knife"
msgstr ""
-#: src/localplayer.cpp:836
+#: src/localplayer.cpp:839
#, fuzzy
msgid "Sword"
msgstr "Lyd"
-#: src/localplayer.cpp:837
+#: src/localplayer.cpp:840
#, fuzzy
msgid "Polearm"
msgstr "Bruger"
-#: src/localplayer.cpp:838
+#: src/localplayer.cpp:841
#, fuzzy
msgid "Staff"
msgstr "Status"
-#: src/localplayer.cpp:839
+#: src/localplayer.cpp:842
#, fuzzy
msgid "Whip"
msgstr "Hvisk"
-#: src/localplayer.cpp:840
+#: src/localplayer.cpp:843
#, fuzzy
msgid "Bow"
msgstr "lav"
-#: src/localplayer.cpp:841
+#: src/localplayer.cpp:844
msgid "Shooting"
msgstr ""
-#: src/localplayer.cpp:842
+#: src/localplayer.cpp:845
#, fuzzy
msgid "Mace"
msgstr "Mand"
-#: src/localplayer.cpp:843
+#: src/localplayer.cpp:846
msgid "Axe"
msgstr ""
-#: src/localplayer.cpp:844
+#: src/localplayer.cpp:847
msgid "Thrown"
msgstr ""
-#: src/localplayer.cpp:846
+#: src/localplayer.cpp:849
#, fuzzy
msgid "Craft"
msgstr "Opret"
-#: src/localplayer.cpp:847
+#: src/localplayer.cpp:850
#, fuzzy
msgid "Unknown Skill"
msgstr "Ukendt genstand"
@@ -2442,143 +2415,143 @@ msgstr "Tag af"
msgid "Unable to unequip."
msgstr ""
-#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:82
+#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:81
#, fuzzy, c-format
-msgid "Strength: %d"
+msgid "Strength %+d"
msgstr "Styrke"
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:82
#, fuzzy, c-format
-msgid "Agility: %d"
+msgid "Agility %+d"
msgstr "Adræthed"
-#: src/net/ea/generalhandler.cpp:96 src/net/tmwserv/generalhandler.cpp:88
+#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:84
#, fuzzy, c-format
-msgid "Vitality: %d"
+msgid "Vitality %+d"
msgstr "Helbred"
-#: src/net/ea/generalhandler.cpp:98 src/net/tmwserv/generalhandler.cpp:90
+#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:85
#, fuzzy, c-format
-msgid "Intelligence: %d"
+msgid "Intelligence %+d"
msgstr "Intelligens"
-#: src/net/ea/generalhandler.cpp:100 src/net/tmwserv/generalhandler.cpp:86
+#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:83
#, fuzzy, c-format
-msgid "Dexterity: %d"
+msgid "Dexterity %+d"
msgstr "Behændighed"
-#: src/net/ea/generalhandler.cpp:102
+#: src/net/ea/generalhandler.cpp:96
#, fuzzy, c-format
-msgid "Luck: %d"
+msgid "Luck %+d"
msgstr "Held"
-#: src/net/ea/generalhandler.cpp:125
+#: src/net/ea/generalhandler.cpp:118
#, fuzzy
msgid "Authentication failed"
msgstr "Chat skabelsen fejlede!"
-#: src/net/ea/generalhandler.cpp:128
+#: src/net/ea/generalhandler.cpp:121
#, fuzzy
msgid "No servers available"
msgstr "Ingen opsætning tilgængelig"
-#: src/net/ea/generalhandler.cpp:132
+#: src/net/ea/generalhandler.cpp:125
msgid "Someone else is trying to use this account"
msgstr ""
-#: src/net/ea/generalhandler.cpp:135
+#: src/net/ea/generalhandler.cpp:128
msgid "This account is already logged in"
msgstr ""
-#: src/net/ea/generalhandler.cpp:138
+#: src/net/ea/generalhandler.cpp:131
msgid "Speed hack detected"
msgstr ""
-#: src/net/ea/generalhandler.cpp:141
+#: src/net/ea/generalhandler.cpp:134
msgid "Duplicated login"
msgstr ""
-#: src/net/ea/generalhandler.cpp:144
+#: src/net/ea/generalhandler.cpp:137
msgid "Unknown connection error"
msgstr ""
-#: src/net/ea/generalhandler.cpp:201
+#: src/net/ea/generalhandler.cpp:194
msgid "Got disconnected from server!"
msgstr "Blev smidt af serveren!"
-#: src/net/ea/gui/partytab.cpp:52
+#: src/net/ea/gui/partytab.cpp:55
#, fuzzy
msgid "/help > Display this help."
msgstr "/help: Viser denne hjælp"
-#: src/net/ea/gui/partytab.cpp:53
+#: src/net/ea/gui/partytab.cpp:56
msgid "/create > Create a new party"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:54
+#: src/net/ea/gui/partytab.cpp:57
msgid "/new > Alias of create"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:55
+#: src/net/ea/gui/partytab.cpp:58
msgid "/invite > Invite a player to your party"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:56
+#: src/net/ea/gui/partytab.cpp:59
msgid "/leave > Leave the party you are in"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:57
+#: src/net/ea/gui/partytab.cpp:60
msgid "/kick > Kick some one from the party you are in"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:58
+#: src/net/ea/gui/partytab.cpp:61
msgid "/item > Show/change party item sharing options"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:59
+#: src/net/ea/gui/partytab.cpp:62
msgid "/exp > Show/change party experience sharing options"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:68
+#: src/net/ea/gui/partytab.cpp:71
#, fuzzy
msgid "Command: /new <party-name>"
msgstr "Kommando /toggle <tilstand>"
-#: src/net/ea/gui/partytab.cpp:69
+#: src/net/ea/gui/partytab.cpp:72
#, fuzzy
msgid "Command: /create <party-name>"
msgstr "Kommando /toggle <tilstand>"
-#: src/net/ea/gui/partytab.cpp:70
+#: src/net/ea/gui/partytab.cpp:73
msgid "These commands create a new party called <party-name>."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:74
+#: src/net/ea/gui/partytab.cpp:77
#, fuzzy
msgid "Command: /invite <nick>"
msgstr "Kommando: /w <navn> <besked>"
-#: src/net/ea/gui/partytab.cpp:81
+#: src/net/ea/gui/partytab.cpp:84
#, fuzzy
msgid "Command: /leave"
msgstr "Kommando: /clear"
-#: src/net/ea/gui/partytab.cpp:82
+#: src/net/ea/gui/partytab.cpp:85
#, fuzzy
msgid "This command causes the player to leave the party."
msgstr "Denne kommando viser fokusering af chat vinduets status."
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/ea/gui/partytab.cpp:89
#, fuzzy
msgid "Command: /item <policy>"
msgstr "Kommando: /toggle"
-#: src/net/ea/gui/partytab.cpp:87
+#: src/net/ea/gui/partytab.cpp:90
#, fuzzy
msgid "This command changes the party's item sharing policy."
msgstr "Denne kommando sender beskeden <besked> til <navn>."
-#: src/net/ea/gui/partytab.cpp:88
+#: src/net/ea/gui/partytab.cpp:91
#, fuzzy
msgid ""
"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
@@ -2588,26 +2561,26 @@ msgstr ""
"af chat vindue til, eller \"0\", \"no\", \"false\" for at slå fokusering af "
"chat vindue fra."
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:94
#, fuzzy
msgid "Command: /item"
msgstr "Kommando: /toggle"
-#: src/net/ea/gui/partytab.cpp:92
+#: src/net/ea/gui/partytab.cpp:95
#, fuzzy
msgid "This command displays the party's current item sharing policy."
msgstr "Denne kommando viser det nuværende bane navn."
-#: src/net/ea/gui/partytab.cpp:96
+#: src/net/ea/gui/partytab.cpp:99
#, fuzzy
msgid "Command: /exp <policy>"
msgstr "Kommando: /help <kommando>"
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/ea/gui/partytab.cpp:100
msgid "This command changes the party's experience sharing policy."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:98
+#: src/net/ea/gui/partytab.cpp:101
#, fuzzy
msgid ""
"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
@@ -2617,41 +2590,41 @@ msgstr ""
"af chat vindue til, eller \"0\", \"no\", \"false\" for at slå fokusering af "
"chat vindue fra."
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:104
#, fuzzy
msgid "Command: /exp"
msgstr "Kommando: /help"
-#: src/net/ea/gui/partytab.cpp:102
+#: src/net/ea/gui/partytab.cpp:105
#, fuzzy
msgid "This command displays the party's current experience sharing policy."
msgstr "Denne kommando viser det nuværende bane navn."
-#: src/net/ea/gui/partytab.cpp:110
+#: src/net/ea/gui/partytab.cpp:113
msgid "Party name is missing."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:133 src/net/ea/partyhandler.cpp:191
+#: src/net/ea/gui/partytab.cpp:136 src/net/ea/partyhandler.cpp:194
msgid "Item sharing enabled."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:136 src/net/ea/partyhandler.cpp:197
+#: src/net/ea/gui/partytab.cpp:139 src/net/ea/partyhandler.cpp:200
msgid "Item sharing disabled."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:139 src/net/ea/partyhandler.cpp:203
+#: src/net/ea/gui/partytab.cpp:142 src/net/ea/partyhandler.cpp:206
msgid "Item sharing not possible."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:165 src/net/ea/partyhandler.cpp:168
+#: src/net/ea/gui/partytab.cpp:168 src/net/ea/partyhandler.cpp:171
msgid "Experience sharing enabled."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:168 src/net/ea/partyhandler.cpp:174
+#: src/net/ea/gui/partytab.cpp:171 src/net/ea/partyhandler.cpp:177
msgid "Experience sharing disabled."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:171 src/net/ea/partyhandler.cpp:180
+#: src/net/ea/gui/partytab.cpp:174 src/net/ea/partyhandler.cpp:183
msgid "Experience sharing not possible."
msgstr ""
@@ -2722,46 +2695,46 @@ msgstr "Kunne ikke tilslutte sig gruppen!"
msgid "Party successfully created."
msgstr ""
-#: src/net/ea/partyhandler.cpp:115
+#: src/net/ea/partyhandler.cpp:118
#, c-format
msgid "%s is already a member of a party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:119
+#: src/net/ea/partyhandler.cpp:122
#, c-format
msgid "%s refused your invitation."
msgstr ""
-#: src/net/ea/partyhandler.cpp:123
+#: src/net/ea/partyhandler.cpp:126
#, c-format
msgid "%s is now a member of your party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:127
+#: src/net/ea/partyhandler.cpp:130
#, c-format
msgid "Unknown invite response for %s."
msgstr ""
-#: src/net/ea/partyhandler.cpp:232
+#: src/net/ea/partyhandler.cpp:235
#, fuzzy
msgid "You have left the party."
msgstr "Du er holdt op med at være til."
-#: src/net/ea/partyhandler.cpp:235
+#: src/net/ea/partyhandler.cpp:239
#, c-format
msgid "%s has left your party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:272
+#: src/net/ea/partyhandler.cpp:274
#, c-format
msgid "An unknown member tried to say: %s"
msgstr ""
-#: src/net/ea/partyhandler.cpp:298
+#: src/net/ea/partyhandler.cpp:300
msgid "Inviting like this isn't supported at the moment."
msgstr ""
-#: src/net/ea/partyhandler.cpp:327
+#: src/net/ea/partyhandler.cpp:329
#, fuzzy, c-format
msgid "%s is not in your party!"
msgstr "Kunne ikke tilslutte sig gruppen!"
@@ -3068,9 +3041,9 @@ msgstr "Viljestyrke:"
msgid "Topic: "
msgstr ""
-#: src/net/tmwserv/generalhandler.cpp:92
+#: src/net/tmwserv/generalhandler.cpp:86
#, fuzzy, c-format
-msgid "Willpower: %d"
+msgid "Willpower %+d"
msgstr "Viljestyrke:"
#: src/net/tmwserv/loginhandler.cpp:80
@@ -3175,6 +3148,15 @@ msgstr ""
msgid "NPC Database: Error while loading npcs.xml!"
msgstr "NPC Database: Fejl under indlæsning af npcs.xml!"
+#~ msgid "Save player list"
+#~ msgstr "Gem bruger liste"
+
+#~ msgid "Scroll radius"
+#~ msgstr "Følsomhed på mus"
+
+#~ msgid "Scroll laziness"
+#~ msgstr "Acceleration på mus"
+
#~ msgid "Emote"
#~ msgstr "Emote"
diff --git a/po/de.po b/po/de.po
index a8f09b4e..d034ac8a 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,14 +7,14 @@ msgid ""
msgstr ""
"Project-Id-Version: The Mana World 0.1.0\n"
"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-05-10 16:39+0200\n"
-"PO-Revision-Date: 2009-05-06 11:59+0000\n"
+"POT-Creation-Date: 2009-05-12 00:11+0200\n"
+"PO-Revision-Date: 2009-05-11 08:15+0000\n"
"Last-Translator: Terwarf <Unknown>\n"
"Language-Team: German\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-05-10 13:48+0000\n"
+"X-Launchpad-Export-Date: 2009-05-11 21:56+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#: src/commandhandler.cpp:141
@@ -22,9 +22,8 @@ msgid "-- Help --"
msgstr "-- Hilfe --"
#: src/commandhandler.cpp:142
-#, fuzzy
msgid "/help > Display this help"
-msgstr "/help > Diese Hilfe anzeigen"
+msgstr "/help > diese Hilfe anzeigen"
#: src/commandhandler.cpp:144
msgid "/where > Display map name"
@@ -32,7 +31,7 @@ msgstr "/where > Zeige den Namen der aktuellen Karte"
#: src/commandhandler.cpp:145
msgid "/who > Display number of online users"
-msgstr "/who > Zeige Zahl der angemeldeten Spieler"
+msgstr "/who > Zeige Anzahl der angemeldeten Spieler"
#: src/commandhandler.cpp:146
msgid "/me > Tell something about yourself"
@@ -181,7 +180,7 @@ msgstr "Dieser Befehl sendet den Text <Nachricht> an den Spieler <Name>."
#: src/commandhandler.cpp:216 src/commandhandler.cpp:230
#: src/gui/widgets/channeltab.cpp:81 src/gui/widgets/channeltab.cpp:90
-#: src/net/ea/gui/partytab.cpp:76
+#: src/net/ea/gui/partytab.cpp:79
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 "
@@ -205,7 +204,7 @@ msgstr ""
msgid "Command: /party <nick>"
msgstr "Befehl: /party <Name>"
-#: src/commandhandler.cpp:229 src/net/ea/gui/partytab.cpp:75
+#: src/commandhandler.cpp:229 src/net/ea/gui/partytab.cpp:78
msgid "This command invites <nick> to party with you."
msgstr "Dieser Befehl lädt Spieler <Name> zu einer Party mit Dir ein."
@@ -294,18 +293,17 @@ msgid "Type /help for a list of commands."
msgstr "Gib /help ein, um eine Liste der Befehle zu erhalten."
#: src/commandhandler.cpp:339
-#, fuzzy
msgid "Cannot send empty whispers!"
-msgstr "Kann keine leeren privaten Nachrichten senden!"
+msgstr "Kann keine leeren Nachrichten versenden!"
#: src/commandhandler.cpp:346
-#, fuzzy, c-format
+#, c-format
msgid ""
"Cannot create a whisper tab for nick '%s'! It either already exists, or is "
"you."
msgstr ""
-"Kann keinen neuen Tab für Spieler '%s' erstellen! Entweder es ist noch ein "
-"Tab geöffnet, oder der Spieler bist Du."
+"Kann keinen neuen Tab für Spieler '%s' erstellen - entweder es existiert "
+"bereits einer, oder der Spieler bist Du."
#: src/commandhandler.cpp:392
msgid "Return toggles chat."
@@ -331,7 +329,7 @@ msgstr ""
#: src/game.cpp:236
msgid "General"
-msgstr "Generell"
+msgstr "Öffentlich"
#: src/game.cpp:400
msgid "Screenshot saved to ~/"
@@ -533,7 +531,7 @@ msgstr "Ok"
msgid "Previous"
msgstr "Zurück"
-#: src/gui/charselectdialog.cpp:113 src/gui/npcdialog.cpp:44
+#: src/gui/charselectdialog.cpp:113 src/gui/npcdialog.cpp:43
msgid "Next"
msgstr "Weiter"
@@ -558,7 +556,7 @@ msgstr "Neu"
#: src/gui/charselectdialog.cpp:118 src/gui/charselectdialog.cpp:165
#: src/gui/charselectdialog.cpp:166 src/gui/charselectdialog.cpp:315
-#: src/gui/setup_players.cpp:230
+#: src/gui/setup_players.cpp:228
msgid "Delete"
msgstr "Löschen"
@@ -591,21 +589,17 @@ msgstr "Chat"
#: src/gui/chat.cpp:332
#, c-format
msgid "%d players are present."
-msgstr ""
+msgstr "%d Spieler sind anwesend."
-#: src/gui/chat.cpp:348 src/gui/chat.cpp:354
+#: src/gui/chat.cpp:333
msgid "Present: "
msgstr "Anwesend: "
-#: src/gui/chat.cpp:348 src/gui/chat.cpp:354
-msgid "; "
-msgstr ""
-
-#: src/gui/chat.cpp:349
+#: src/gui/chat.cpp:350
msgid "Attendance written to record log."
msgstr "Anwesenheitsliste wurde ins Chatlog geschrieben."
-#: src/gui/chat.cpp:474
+#: src/gui/chat.cpp:475
#, c-format
msgid "Whispering to %s: %s"
msgstr "Flüsternd zu %s: %s"
@@ -655,7 +649,7 @@ msgstr "Gilde verlassen"
msgid "Help"
msgstr "Hilfe"
-#: src/gui/help.cpp:47 src/gui/npcdialog.cpp:45 src/gui/storagewindow.cpp:68
+#: src/gui/help.cpp:47 src/gui/npcdialog.cpp:44 src/gui/storagewindow.cpp:68
msgid "Close"
msgstr "Schließen"
@@ -748,7 +742,7 @@ msgid "Register"
msgstr "Registrieren"
#: src/gui/magic.cpp:32 src/gui/skilldialog.cpp:117 src/gui/windowmenu.cpp:64
-#: src/localplayer.cpp:845
+#: src/localplayer.cpp:848
msgid "Magic"
msgstr "Magie"
@@ -764,33 +758,23 @@ msgstr "Spruch 2 sprechen"
msgid "Cast Test Spell 3"
msgstr "Spruch 3 sprechen"
-#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
-#, fuzzy
+#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:86
msgid "Map"
-msgstr "Max"
+msgstr "Karte"
-#: src/gui/npcdialog.cpp:43
+#: src/gui/npcdialog.cpp:42
msgid "Waiting for server"
msgstr "Warte auf den Server"
-#: src/gui/npcdialog.cpp:46
-#, fuzzy
+#: src/gui/npcdialog.cpp:45
msgid "Submit"
-msgstr "Sitzen"
+msgstr "Absenden"
-#: src/gui/npcdialog.cpp:49 src/gui/npcpostdialog.cpp:39
+#: src/gui/npcdialog.cpp:48 src/gui/npcpostdialog.cpp:39
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:95
-msgid "+"
-msgstr ""
-
-#: src/gui/npcdialog.cpp:96
-msgid "-"
-msgstr ""
-
-#: src/gui/npcdialog.cpp:105
+#: src/gui/npcdialog.cpp:104
msgid "Reset"
msgstr "Zurücksetzten"
@@ -798,8 +782,7 @@ msgstr "Zurücksetzten"
msgid "Send"
msgstr "Senden"
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:268
-#: src/gui/setup_video.cpp:567
+#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:142
msgid "Text"
msgstr "Text"
@@ -849,10 +832,10 @@ msgstr "geflüsterte Nachricht"
#: src/gui/palette.cpp:97
msgid "Is"
-msgstr "ist"
+msgstr "Handlungen"
-#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:33
-#: src/net/ea/gui/partytab.cpp:37
+#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:45
+#: src/net/ea/gui/partytab.cpp:39
msgid "Party"
msgstr "Party"
@@ -873,7 +856,6 @@ msgid "Being"
msgstr "Aktionen"
#: src/gui/palette.cpp:104
-#, fuzzy
msgid "Other Players' Names"
msgstr "Namen anderer Spieler"
@@ -898,24 +880,20 @@ msgid "Unknown Item Type"
msgstr "Unbekannter Gegenstand"
#: src/gui/palette.cpp:111
-#, fuzzy
msgid "Generics"
-msgstr "Gewöhnlich"
+msgstr "Allgemeiner Gegenstand"
#: src/gui/palette.cpp:112
-#, fuzzy
msgid "Hats"
-msgstr "Hut"
+msgstr "Hüte"
#: src/gui/palette.cpp:113
-#, fuzzy
msgid "Usables"
-msgstr "Benutzbar"
+msgstr "Benutzbare Gegenstände"
#: src/gui/palette.cpp:114
-#, fuzzy
msgid "Shirts"
-msgstr "Hemd"
+msgstr "Hemden"
#: src/gui/palette.cpp:115
msgid "1 Handed Weapons"
@@ -934,19 +912,16 @@ msgid "2 Handed Weapons"
msgstr "zweihändige Waffen"
#: src/gui/palette.cpp:119
-#, fuzzy
msgid "Shields"
-msgstr "Schild"
+msgstr "Schilde"
#: src/gui/palette.cpp:120
-#, fuzzy
msgid "Rings"
-msgstr "Ring"
+msgstr "Ringe"
#: src/gui/palette.cpp:121
-#, fuzzy
msgid "Necklaces"
-msgstr "Halskette"
+msgstr "Halsketten"
#: src/gui/palette.cpp:122
msgid "Arms"
@@ -1017,7 +992,7 @@ msgstr "@@attack|%s angreifen@@"
#: src/gui/popupmenu.cpp:94
#, c-format
msgid "@@friend|Befriend %s@@"
-msgstr "@@friend|Füge %s als Freund hinzu"
+msgstr "@@friend|Füge %s@@ als Freund hinzu"
#: src/gui/popupmenu.cpp:97
#, c-format
@@ -1060,14 +1035,13 @@ msgid "@@cancel|Cancel@@"
msgstr "@@cancel|Abbrechen@@"
#: src/gui/popupmenu.cpp:157
-#, fuzzy, c-format
+#, c-format
msgid "@@pickup|Pick up %s@@"
-msgstr "@@pickup|%s aufheben@@"
+msgstr "@@pickup|Aufheben %s@@"
#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:373
-#, fuzzy
msgid "@@chat|Add to chat@@"
-msgstr "@@chat|Zum Chat hinzufügen@@"
+msgstr "@@chat|Zu Chat hinzufügen@@"
#: src/gui/popupmenu.cpp:348
msgid "@@use|Unequip@@"
@@ -1090,13 +1064,12 @@ msgid "@@split|Split@@"
msgstr "@@split|Aufteilen@@"
#: src/gui/popupmenu.cpp:364
-#, fuzzy
msgid "@@store|Store@@"
-msgstr "@@ignore|Ignoriere %s@@"
+msgstr "@@store|Einlagern@@"
#: src/gui/popupmenu.cpp:371
msgid "@@retrieve|Retrieve@@"
-msgstr ""
+msgstr "@@retrieve|Wiederholen@@"
#: src/gui/quitdialog.cpp:37
msgid "Switch server"
@@ -1326,200 +1299,184 @@ msgid "???"
msgstr "???"
#: src/gui/setup_players.cpp:224
-msgid "Save player list"
-msgstr "Spielerliste sichern"
-
-#: src/gui/setup_players.cpp:226
msgid "Allow trading"
msgstr "Handeln erlauben"
-#: src/gui/setup_players.cpp:228
+#: src/gui/setup_players.cpp:226
msgid "Allow whispers"
msgstr "Flüstern erlauben"
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:230
msgid "Put all whispers in tabs"
msgstr "Alle privaten Nachrichten in Tabs öffnen"
-#: src/gui/setup_players.cpp:234
+#: src/gui/setup_players.cpp:232
msgid "Players"
msgstr "Spieler"
-#: src/gui/setup_players.cpp:259
+#: src/gui/setup_players.cpp:257
msgid "When ignoring:"
msgstr "Wenn ignorierend:"
#: src/gui/setup_video.cpp:112
msgid "Tiny"
-msgstr ""
+msgstr "Winzig"
#: src/gui/setup_video.cpp:113
-#, fuzzy
msgid "Small"
-msgstr "Verkaufen"
+msgstr "Klein"
#: src/gui/setup_video.cpp:114
-#, fuzzy
msgid "Medium"
msgstr "Mittel"
#: src/gui/setup_video.cpp:115
msgid "Large"
-msgstr ""
+msgstr "Groß"
+
+#: src/gui/setup_video.cpp:141
+msgid "No text"
+msgstr "Kein Text"
+
+#: src/gui/setup_video.cpp:143
+msgid "Bubbles, no names"
+msgstr "Blasen, keine Namen"
+
+#: src/gui/setup_video.cpp:144
+msgid "Bubbles with names"
+msgstr "Blasen mit Namen"
+
+#: src/gui/setup_video.cpp:153
+msgid "off"
+msgstr "Aus"
+
+#: src/gui/setup_video.cpp:154 src/gui/setup_video.cpp:164
+msgid "low"
+msgstr "Niedrig"
+
+#: src/gui/setup_video.cpp:155 src/gui/setup_video.cpp:166
+msgid "high"
+msgstr "Hoch"
+
+#: src/gui/setup_video.cpp:165
+msgid "medium"
+msgstr "Mittel"
-#: src/gui/setup_video.cpp:151
+#: src/gui/setup_video.cpp:167
+msgid "max"
+msgstr "max"
+
+#: src/gui/setup_video.cpp:187
msgid "Full screen"
msgstr "Vollbild"
-#: src/gui/setup_video.cpp:152
+#: src/gui/setup_video.cpp:188
msgid "OpenGL"
msgstr "OpenGL"
-#: src/gui/setup_video.cpp:153
+#: src/gui/setup_video.cpp:189
msgid "Custom cursor"
msgstr "Benutzerdefinierten Zeiger"
-#: src/gui/setup_video.cpp:155
+#: src/gui/setup_video.cpp:191
msgid "Visible names"
msgstr "Sichtbare Namen"
-#: src/gui/setup_video.cpp:157
+#: src/gui/setup_video.cpp:193
msgid "Particle effects"
msgstr "Partikeleffekte"
-#: src/gui/setup_video.cpp:159
+#: src/gui/setup_video.cpp:195
msgid "Show name"
-msgstr "Zeige Namen"
+msgstr "Zeige eigenen Namen"
-#: src/gui/setup_video.cpp:160
+#: src/gui/setup_video.cpp:196
msgid "Show pickup notification"
msgstr "Benachrichtigung über aufgehobene Gegenstände zeigen"
-#: src/gui/setup_video.cpp:161
+#: src/gui/setup_video.cpp:197
msgid "in chat"
msgstr "im Chatfenster"
-#: src/gui/setup_video.cpp:162
+#: src/gui/setup_video.cpp:198
msgid "as particle"
msgstr "als Partikeleffekt"
-#: src/gui/setup_video.cpp:167
+#: src/gui/setup_video.cpp:203
msgid "FPS Limit:"
msgstr "FPS-Limit:"
-#: src/gui/setup_video.cpp:184
+#: src/gui/setup_video.cpp:214
msgid "Video"
msgstr "Video"
-#: src/gui/setup_video.cpp:189
+#: src/gui/setup_video.cpp:219
msgid "Overhead text"
msgstr "Chat über Spielen"
-#: src/gui/setup_video.cpp:190
+#: src/gui/setup_video.cpp:220
msgid "Gui opacity"
msgstr "GUI Transparenz"
-#: src/gui/setup_video.cpp:191
-msgid "Scroll radius"
-msgstr "Scroll-Radius"
-
-#: src/gui/setup_video.cpp:192
-msgid "Scroll laziness"
-msgstr "Scroll-Trägheit"
-
-#: src/gui/setup_video.cpp:193
+#: src/gui/setup_video.cpp:221
msgid "Ambient FX"
msgstr "Hintergrundeffekte"
-#: src/gui/setup_video.cpp:194
+#: src/gui/setup_video.cpp:222
msgid "Particle Detail"
msgstr "Partikeldetail"
-#: src/gui/setup_video.cpp:195
+#: src/gui/setup_video.cpp:223
msgid "Font size"
-msgstr ""
-
-#: src/gui/setup_video.cpp:265 src/gui/setup_video.cpp:564
-msgid "No text"
-msgstr "Kein Text"
-
-#: src/gui/setup_video.cpp:271 src/gui/setup_video.cpp:570
-msgid "Bubbles, no names"
-msgstr "Blasen, keine Namen"
+msgstr "Schriftgröße"
-#: src/gui/setup_video.cpp:274 src/gui/setup_video.cpp:573
-msgid "Bubbles with names"
-msgstr "Blasen mit Namen"
-
-#: src/gui/setup_video.cpp:282 src/gui/setup_video.cpp:610
-msgid "off"
-msgstr "Aus"
-
-#: src/gui/setup_video.cpp:285 src/gui/setup_video.cpp:296
-#: src/gui/setup_video.cpp:613 src/gui/setup_video.cpp:627
-msgid "low"
-msgstr "Niedrig"
-
-#: src/gui/setup_video.cpp:288 src/gui/setup_video.cpp:302
-#: src/gui/setup_video.cpp:616 src/gui/setup_video.cpp:633
-msgid "high"
-msgstr "Hoch"
-
-#: src/gui/setup_video.cpp:299 src/gui/setup_video.cpp:630
-msgid "medium"
-msgstr "Mittel"
-
-#: src/gui/setup_video.cpp:305 src/gui/setup_video.cpp:636
-msgid "max"
-msgstr "max"
-
-#: src/gui/setup_video.cpp:410
+#: src/gui/setup_video.cpp:356
msgid "Failed to switch to "
msgstr "Konnte nicht Auflösung nicht ändern in "
-#: src/gui/setup_video.cpp:411
+#: src/gui/setup_video.cpp:357
msgid "windowed"
msgstr "Im Fenster"
-#: src/gui/setup_video.cpp:411
+#: src/gui/setup_video.cpp:357
msgid "fullscreen"
msgstr "Vollbild"
-#: src/gui/setup_video.cpp:412
+#: src/gui/setup_video.cpp:358
msgid "mode and restoration of old mode also failed!"
msgstr "und Wiederherstellung der alten Auflösung schlug fehl!"
-#: src/gui/setup_video.cpp:421
+#: src/gui/setup_video.cpp:367
msgid "Switching to full screen"
msgstr "Wechsle zum Vollbildmodus"
-#: src/gui/setup_video.cpp:422
+#: src/gui/setup_video.cpp:368
msgid "Restart needed for changes to take effect."
msgstr "Änderungen treten erst nach einem Neustart des Programmes in Kraft."
-#: src/gui/setup_video.cpp:434
+#: src/gui/setup_video.cpp:380
msgid "Changing OpenGL"
msgstr "Ändere OpenGL"
-#: src/gui/setup_video.cpp:435
+#: src/gui/setup_video.cpp:381
msgid "Applying change to OpenGL requires restart."
msgstr ""
"Änderungen an OpenGL werden erst nach einem Neustart der Anwendung "
"übernommen."
-#: src/gui/setup_video.cpp:520
+#: src/gui/setup_video.cpp:442
msgid "Screen resolution changed"
msgstr "Auflösung geändert"
-#: src/gui/setup_video.cpp:521
+#: src/gui/setup_video.cpp:443
msgid "Restart your client for the change to take effect."
msgstr "Starte das Spiel neu um die Änderungen zu übernehmen."
-#: src/gui/setup_video.cpp:545
+#: src/gui/setup_video.cpp:467
msgid "Particle effect settings changed."
msgstr "Partikeleffekteinstellungen geändert."
-#: src/gui/setup_video.cpp:546
+#: src/gui/setup_video.cpp:468
msgid "Changes will take effect on map change."
msgstr "Änderung werden beim nächsten Kartenwechsel übernommen."
@@ -1995,9 +1952,8 @@ msgid "Debug Window"
msgstr "Debugfenster"
#: src/keyboardconfig.cpp:80
-#, fuzzy
msgid "Party Window"
-msgstr "Chatfenster"
+msgstr "Partyfenster"
#: src/keyboardconfig.cpp:81
msgid "Emote Shortcut Window"
@@ -2045,55 +2001,55 @@ msgstr "Ignoriere input 1"
msgid "Ignore input 2"
msgstr "Ignoriere inpu 2"
-#: src/localplayer.cpp:834
+#: src/localplayer.cpp:837
msgid "Unarmed"
msgstr "Unbewaffnet"
-#: src/localplayer.cpp:835
+#: src/localplayer.cpp:838
msgid "Knife"
msgstr "Messer"
-#: src/localplayer.cpp:836
+#: src/localplayer.cpp:839
msgid "Sword"
msgstr "Schwertpolearm"
-#: src/localplayer.cpp:837
+#: src/localplayer.cpp:840
msgid "Polearm"
msgstr "Waffenarm"
-#: src/localplayer.cpp:838
+#: src/localplayer.cpp:841
msgid "Staff"
msgstr "Stab"
-#: src/localplayer.cpp:839
+#: src/localplayer.cpp:842
msgid "Whip"
msgstr "Peitsche"
-#: src/localplayer.cpp:840
+#: src/localplayer.cpp:843
msgid "Bow"
msgstr "Bogen"
-#: src/localplayer.cpp:841
+#: src/localplayer.cpp:844
msgid "Shooting"
msgstr "Schießen"
-#: src/localplayer.cpp:842
+#: src/localplayer.cpp:845
msgid "Mace"
msgstr "Irrgarten"
-#: src/localplayer.cpp:843
+#: src/localplayer.cpp:846
msgid "Axe"
msgstr "Axt"
-#: src/localplayer.cpp:844
+#: src/localplayer.cpp:847
msgid "Thrown"
msgstr "Geworfen"
-#: src/localplayer.cpp:846
+#: src/localplayer.cpp:849
msgid "Craft"
msgstr "Handwerk"
-#: src/localplayer.cpp:847
+#: src/localplayer.cpp:850
msgid "Unknown Skill"
msgstr "Unbekannte Fähigkeit"
@@ -2122,80 +2078,65 @@ msgid "tmw"
msgstr "tmw"
#: src/main.cpp:567
-#, fuzzy
msgid "Options:"
-msgstr "Optionen: "
+msgstr "Optionen:"
#: src/main.cpp:568
-#, fuzzy
msgid " -C --config-file : Configuration file to use"
-msgstr " -C --configfile : zu benutzende Konfigurationsdatei"
+msgstr " -C --config-file : zu benutzende Konfigurationsdatei"
#: src/main.cpp:569
-#, fuzzy
msgid " -d --data : Directory to load game data from"
-msgstr ""
-" -d --data : Verzeichnis, aus dem die Spieldaten geladen werden sollen"
+msgstr " -d --data : Datenverzeichnis, aus dem das Spiel geladen werden soll"
#: src/main.cpp:570
msgid " -D --default : Choose default character server and character"
-msgstr ""
+msgstr " -D --default : Wähle zuletzt benutzten Server und Spieler aus"
#: src/main.cpp:572
-#, fuzzy
msgid " -h --help : Display this help"
-msgstr " -h --help : Zeige diese Hilfe"
+msgstr " - --help : Display this help"
#: src/main.cpp:573
-#, fuzzy
msgid " -S --home-dir : Directory to use as home directory"
msgstr ""
-" -S --homedir : Verzeichnis, in dem Updates und Einstellungen abgelegt "
-"werden sollen"
+" -S --home-dir : Verzeichnis, das als Heimatverzeichnis benutzt werden soll"
#: src/main.cpp:574
-#, fuzzy
msgid " -H --update-host : Use this update host"
-msgstr " -H --updatehost : Benutze angegebenen Updateserver"
+msgstr " -H --update-host : Benutze angegebenen Updateserver"
#: src/main.cpp:575
-#, fuzzy
msgid " -P --password : Login with this password"
-msgstr " -P --password : Anmeldung mit angegebenem Passwort"
+msgstr " -P --password : Angegebenes Passwort benutzen"
#: src/main.cpp:576
-#, fuzzy
msgid " -c --character : Login with this character"
-msgstr " -c --character : Anmeldung mit angegebenem Charakter"
+msgstr " -c --charakter : Mit angegebenem Spieler anmelden"
#: src/main.cpp:577
-#, fuzzy
msgid " -p --port : Login Server Port"
-msgstr " -o --port : Port des Loginservers"
+msgstr " -p --port : Port des Anmeldungsservers"
#: src/main.cpp:578
-#, fuzzy
msgid " -s --server : Login Server name or IP"
-msgstr " -s --server : Name oder IP des Loginservers"
+msgstr " -s --server : Name oder IP des Anmeldungsservers"
#: src/main.cpp:579
-#, fuzzy
msgid " -u --skip-update : Skip the update downloads"
-msgstr " -u --skipupdate : Überspringe den Download von Updates"
+msgstr " -u --skip-update : Überspringe das Herunterladen von Updates"
#: src/main.cpp:580
-#, fuzzy
msgid " -U --username : Login with this username"
-msgstr " -U --username : Anmeldung mit angegebenem Benutzernamen"
+msgstr " -U --username : Mit angegebenem Benutzernamen anmelden"
#: src/main.cpp:582
msgid " -O --no-opengl : Disable OpenGL for this session"
-msgstr ""
+msgstr " -O --no-opengl : OpenGL-Erweiterungen deaktivieren"
#: src/main.cpp:584
-#, fuzzy
msgid " -v --version : Display the version"
-msgstr " -v --version : Zeige die Version des Clients an"
+msgstr " -v --version : Die Version des Spieles anzeigen"
#: src/main.cpp:589
msgid "The Mana World "
@@ -2323,139 +2264,139 @@ msgstr "Kann Gegenstand nicht Ausrüsten."
msgid "Unable to unequip."
msgstr "Kann Gegenstand nicht ablegen."
-#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:82
-#, c-format
-msgid "Strength: %d"
+#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:81
+#, fuzzy, c-format
+msgid "Strength %+d"
msgstr "Stärke: %d"
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:84
-#, c-format
-msgid "Agility: %d"
+#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:82
+#, fuzzy, c-format
+msgid "Agility %+d"
msgstr "Beweglichkeit: %d"
-#: src/net/ea/generalhandler.cpp:96 src/net/tmwserv/generalhandler.cpp:88
-#, c-format
-msgid "Vitality: %d"
+#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:84
+#, fuzzy, c-format
+msgid "Vitality %+d"
msgstr "Gesundheit: %d"
-#: src/net/ea/generalhandler.cpp:98 src/net/tmwserv/generalhandler.cpp:90
-#, c-format
-msgid "Intelligence: %d"
+#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:85
+#, fuzzy, c-format
+msgid "Intelligence %+d"
msgstr "Intelligenz: %d"
-#: src/net/ea/generalhandler.cpp:100 src/net/tmwserv/generalhandler.cpp:86
-#, c-format
-msgid "Dexterity: %d"
+#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:83
+#, fuzzy, c-format
+msgid "Dexterity %+d"
msgstr "Genauigkeit: %d"
-#: src/net/ea/generalhandler.cpp:102
-#, c-format
-msgid "Luck: %d"
+#: src/net/ea/generalhandler.cpp:96
+#, fuzzy, c-format
+msgid "Luck %+d"
msgstr "Glück: %d"
-#: src/net/ea/generalhandler.cpp:125
+#: src/net/ea/generalhandler.cpp:118
msgid "Authentication failed"
msgstr "Authentifizierung verweigert"
-#: src/net/ea/generalhandler.cpp:128
+#: src/net/ea/generalhandler.cpp:121
msgid "No servers available"
msgstr "Keine Server verfügbar"
-#: src/net/ea/generalhandler.cpp:132
+#: src/net/ea/generalhandler.cpp:125
msgid "Someone else is trying to use this account"
-msgstr ""
+msgstr "Jemand anderes versucht diesen Account zu benutzen"
-#: src/net/ea/generalhandler.cpp:135
+#: src/net/ea/generalhandler.cpp:128
msgid "This account is already logged in"
msgstr "Dieser Account ist bereits angemeldet"
-#: src/net/ea/generalhandler.cpp:138
+#: src/net/ea/generalhandler.cpp:131
msgid "Speed hack detected"
msgstr "Speed hack festgestellt"
-#: src/net/ea/generalhandler.cpp:141
+#: src/net/ea/generalhandler.cpp:134
msgid "Duplicated login"
msgstr "Mehrfache Anmeldung"
-#: src/net/ea/generalhandler.cpp:144
+#: src/net/ea/generalhandler.cpp:137
msgid "Unknown connection error"
msgstr "Unbekannter Verbindungsfehler"
-#: src/net/ea/generalhandler.cpp:201
+#: src/net/ea/generalhandler.cpp:194
msgid "Got disconnected from server!"
msgstr "Verbindung zum Server unterbrochen!"
-#: src/net/ea/gui/partytab.cpp:52
+#: src/net/ea/gui/partytab.cpp:55
msgid "/help > Display this help."
msgstr "/help > Diese Hilfe anzeigen"
-#: src/net/ea/gui/partytab.cpp:53
+#: src/net/ea/gui/partytab.cpp:56
msgid "/create > Create a new party"
msgstr "/create > Erstelle eine neue Party"
-#: src/net/ea/gui/partytab.cpp:54
+#: src/net/ea/gui/partytab.cpp:57
msgid "/new > Alias of create"
msgstr "/new > Ersatz für create"
-#: src/net/ea/gui/partytab.cpp:55
+#: src/net/ea/gui/partytab.cpp:58
msgid "/invite > Invite a player to your party"
msgstr "/invite > Lade einen Spieler zu Deiner Party ein"
-#: src/net/ea/gui/partytab.cpp:56
+#: src/net/ea/gui/partytab.cpp:59
msgid "/leave > Leave the party you are in"
msgstr "/leave > Verlasse die Party, in der Du Mitglied bist"
-#: src/net/ea/gui/partytab.cpp:57
+#: src/net/ea/gui/partytab.cpp:60
msgid "/kick > Kick some one from the party you are in"
msgstr "/kick > Werfe jemanden aus Deiner Party"
-#: src/net/ea/gui/partytab.cpp:58
+#: src/net/ea/gui/partytab.cpp:61
msgid "/item > Show/change party item sharing options"
msgstr ""
"/item > Zeige oder ändere die Optionen zum Teilen der Gegenstände in der "
"Party"
-#: src/net/ea/gui/partytab.cpp:59
+#: src/net/ea/gui/partytab.cpp:62
msgid "/exp > Show/change party experience sharing options"
msgstr ""
"/exp > Zeige oder ändere die Optionen zum Teilen der Erfahrungspunkte in der "
"Party"
-#: src/net/ea/gui/partytab.cpp:68
+#: src/net/ea/gui/partytab.cpp:71
msgid "Command: /new <party-name>"
msgstr "Befehl: /new <Party-Name>"
-#: src/net/ea/gui/partytab.cpp:69
+#: src/net/ea/gui/partytab.cpp:72
msgid "Command: /create <party-name>"
msgstr "Befehl: /create <Party-Name>"
-#: src/net/ea/gui/partytab.cpp:70
+#: src/net/ea/gui/partytab.cpp:73
msgid "These commands create a new party called <party-name>."
msgstr "Dieser Befehl erstellt eine neue Party mit dem Namen <Party-Name>"
-#: src/net/ea/gui/partytab.cpp:74
+#: src/net/ea/gui/partytab.cpp:77
msgid "Command: /invite <nick>"
msgstr "Befehl: /invite <Name>"
-#: src/net/ea/gui/partytab.cpp:81
+#: src/net/ea/gui/partytab.cpp:84
msgid "Command: /leave"
msgstr "Befehl: /leave"
-#: src/net/ea/gui/partytab.cpp:82
+#: src/net/ea/gui/partytab.cpp:85
msgid "This command causes the player to leave the party."
msgstr "Dieser Befehl lässt Dich die Party verlassen"
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/ea/gui/partytab.cpp:89
msgid "Command: /item <policy>"
msgstr "Befehl: /item <Wert>"
-#: src/net/ea/gui/partytab.cpp:87
+#: src/net/ea/gui/partytab.cpp:90
msgid "This command changes the party's item sharing policy."
msgstr ""
"Dieser Befehl ändert die Einstellungen zum Teilen von Gegenständen in einer "
"Party."
-#: src/net/ea/gui/partytab.cpp:88
+#: src/net/ea/gui/partytab.cpp:91
msgid ""
"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
"\"0\", \"no\", \"false\" to disable item sharing."
@@ -2463,25 +2404,25 @@ msgstr ""
"<Wert> darf enthalten: \"1\",\"yes\" oder \"true\" um das Teilen von "
"Gegenständen zu erlauben, \"0\",\"no\" oder \"false\" um es zu verbieten."
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:94
msgid "Command: /item"
msgstr "Befehl: /item"
-#: src/net/ea/gui/partytab.cpp:92
+#: src/net/ea/gui/partytab.cpp:95
msgid "This command displays the party's current item sharing policy."
msgstr ""
"Dieser Befehl zeigt an, ob Gegenstände in der Party geteilt werden, oder "
"nicht."
-#: src/net/ea/gui/partytab.cpp:96
+#: src/net/ea/gui/partytab.cpp:99
msgid "Command: /exp <policy>"
msgstr "Befehl: /exp <Wert>"
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/ea/gui/partytab.cpp:100
msgid "This command changes the party's experience sharing policy."
msgstr "Dieser Befehl ändert das Teilen der Erfahrungspunkte in einer Party."
-#: src/net/ea/gui/partytab.cpp:98
+#: src/net/ea/gui/partytab.cpp:101
msgid ""
"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
@@ -2489,41 +2430,41 @@ msgstr ""
"Gültige Werte für <Wert> sind: \"1\",\"yes\",\"true\" um das Teilen zu "
"erlauben, \"0\",\"no\",\"false\" verbieten es."
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:104
msgid "Command: /exp"
msgstr "Befehl: /exp"
-#: src/net/ea/gui/partytab.cpp:102
+#: src/net/ea/gui/partytab.cpp:105
msgid "This command displays the party's current experience sharing policy."
msgstr ""
"Dieser Befehl zeigt an, ob das Teilen von Erfahrungspunkten in der Party "
"aktiviert ist."
-#: src/net/ea/gui/partytab.cpp:110
+#: src/net/ea/gui/partytab.cpp:113
msgid "Party name is missing."
msgstr "Name der Party fehlt."
-#: src/net/ea/gui/partytab.cpp:133 src/net/ea/partyhandler.cpp:191
+#: src/net/ea/gui/partytab.cpp:136 src/net/ea/partyhandler.cpp:194
msgid "Item sharing enabled."
msgstr "Teilen von Gegenständen aktiviert."
-#: src/net/ea/gui/partytab.cpp:136 src/net/ea/partyhandler.cpp:197
+#: src/net/ea/gui/partytab.cpp:139 src/net/ea/partyhandler.cpp:200
msgid "Item sharing disabled."
msgstr "Teilen von Gegenständen deaktiviert."
-#: src/net/ea/gui/partytab.cpp:139 src/net/ea/partyhandler.cpp:203
+#: src/net/ea/gui/partytab.cpp:142 src/net/ea/partyhandler.cpp:206
msgid "Item sharing not possible."
msgstr "Teilen von Gegenständen nicht möglich."
-#: src/net/ea/gui/partytab.cpp:165 src/net/ea/partyhandler.cpp:168
+#: src/net/ea/gui/partytab.cpp:168 src/net/ea/partyhandler.cpp:171
msgid "Experience sharing enabled."
msgstr "Teilen der Erfahrungspunkte aktiviert."
-#: src/net/ea/gui/partytab.cpp:168 src/net/ea/partyhandler.cpp:174
+#: src/net/ea/gui/partytab.cpp:171 src/net/ea/partyhandler.cpp:177
msgid "Experience sharing disabled."
msgstr "Teilen der Erfahrungspunkte deaktiviert."
-#: src/net/ea/gui/partytab.cpp:171 src/net/ea/partyhandler.cpp:180
+#: src/net/ea/gui/partytab.cpp:174 src/net/ea/partyhandler.cpp:183
msgid "Experience sharing not possible."
msgstr "Teilen der Erfahrungspunkte nicht möglich."
@@ -2532,9 +2473,9 @@ msgid "Unable to pick up item"
msgstr "Kann Gegenstand nicht aufheben"
#: src/net/ea/inventoryhandler.cpp:193
-#, fuzzy, c-format
+#, c-format
msgid "You picked up %s [@@%d|%s@@]"
-msgstr "Du hast %s [%s] aufgehoben"
+msgstr "Du hast %s [@@%d|%s@@] aufgehoben"
#: src/net/ea/inventoryhandler.cpp:239
msgid "Failed to use item"
@@ -2590,45 +2531,45 @@ msgstr "Konnte Party nicht erstellen."
msgid "Party successfully created."
msgstr "Party erfolgreich erstellt."
-#: src/net/ea/partyhandler.cpp:115
+#: src/net/ea/partyhandler.cpp:118
#, c-format
msgid "%s is already a member of a party."
msgstr "%s ist bereits Mitglied einer Party."
-#: src/net/ea/partyhandler.cpp:119
+#: src/net/ea/partyhandler.cpp:122
#, c-format
msgid "%s refused your invitation."
msgstr "%s hat Deine Einladung zurückgewiesen."
-#: src/net/ea/partyhandler.cpp:123
+#: src/net/ea/partyhandler.cpp:126
#, c-format
msgid "%s is now a member of your party."
msgstr "%s ist nun Mitglied Deiner Party."
-#: src/net/ea/partyhandler.cpp:127
+#: src/net/ea/partyhandler.cpp:130
#, c-format
msgid "Unknown invite response for %s."
msgstr "Unbekannte Reaktion auf die Einladung von %s."
-#: src/net/ea/partyhandler.cpp:232
+#: src/net/ea/partyhandler.cpp:235
msgid "You have left the party."
msgstr "Du hast die Party verlassen."
-#: src/net/ea/partyhandler.cpp:235
+#: src/net/ea/partyhandler.cpp:239
#, c-format
msgid "%s has left your party."
msgstr "%s hat Deine Party verlassen."
-#: src/net/ea/partyhandler.cpp:272
+#: src/net/ea/partyhandler.cpp:274
#, c-format
msgid "An unknown member tried to say: %s"
msgstr "Ein unbekanntes Mitglied hat versucht, \"%s\" zu sagen."
-#: src/net/ea/partyhandler.cpp:298
+#: src/net/ea/partyhandler.cpp:300
msgid "Inviting like this isn't supported at the moment."
-msgstr ""
+msgstr "Einladungen auf diesem Weg werden im Moment nicht unterstützt."
-#: src/net/ea/partyhandler.cpp:327
+#: src/net/ea/partyhandler.cpp:329
#, c-format
msgid "%s is not in your party!"
msgstr "%s ist nicht in Deiner Party!"
@@ -2655,9 +2596,8 @@ msgid "Game Over!"
msgstr "Game Over!"
#: src/net/ea/playerhandler.cpp:102
-#, fuzzy
msgid "Insert coin to continue."
-msgstr "Insert coin to continue"
+msgstr "Insert coin to continue."
#: src/net/ea/playerhandler.cpp:103 src/net/tmwserv/beinghandler.cpp:317
msgid ""
@@ -2938,74 +2878,66 @@ msgstr "Willenskraft:"
msgid "Topic: "
msgstr "Thema: "
-#: src/net/tmwserv/generalhandler.cpp:92
-#, c-format
-msgid "Willpower: %d"
+#: src/net/tmwserv/generalhandler.cpp:86
+#, fuzzy, c-format
+msgid "Willpower %+d"
msgstr "Willenskraft: %d"
#: src/net/tmwserv/loginhandler.cpp:80
msgid "Wrong magic_token"
-msgstr ""
+msgstr "Fehlerhaftes Magiemerkmal"
#: src/net/tmwserv/loginhandler.cpp:83 src/net/tmwserv/loginhandler.cpp:182
-#, fuzzy
msgid "Already logged in"
-msgstr "Es läuft bereits eine Aufzeichnung."
+msgstr "Bereits angemeldet"
#: src/net/tmwserv/loginhandler.cpp:86 src/net/tmwserv/loginhandler.cpp:185
-#, fuzzy
msgid "Server is full"
-msgstr "Server"
+msgstr "Server ist voll"
#: src/net/tmwserv/loginhandler.cpp:110
-#, fuzzy
msgid "New password incorrect"
-msgstr "Gib dein neues Passwort zweimal ein:"
+msgstr "Neues Passwort fehlerhaft"
#: src/net/tmwserv/loginhandler.cpp:113
msgid "Old password incorrect"
-msgstr ""
+msgstr "Altes Passwort fehlerhaft"
#: src/net/tmwserv/loginhandler.cpp:116 src/net/tmwserv/loginhandler.cpp:146
msgid "Account not connected. Please login first."
-msgstr ""
+msgstr "Account nicht verbunden. Bitte melde Dich zuerst an."
#: src/net/tmwserv/loginhandler.cpp:140
-#, fuzzy
msgid "New email address incorrect"
-msgstr "Gib die neue Email Adresse zweimal ein:"
+msgstr "Neue Emailadresse ist fehlerhaft"
#: src/net/tmwserv/loginhandler.cpp:143
-#, fuzzy
msgid "Old email address incorrect"
-msgstr "Gib die neue Email Adresse zweimal ein:"
+msgstr "Alte Emailadresse ist fehlerhaft"
#: src/net/tmwserv/loginhandler.cpp:149
-#, fuzzy
msgid "The new Email Address already exists."
-msgstr "Gib die neue Email Adresse zweimal ein:"
+msgstr "Die neue Emailadresse ist bereits vorhanden."
#: src/net/tmwserv/loginhandler.cpp:176 src/net/tmwserv/loginhandler.cpp:208
msgid "Client version is too old"
-msgstr ""
+msgstr "Die Version des Spiels ist zu alt"
#: src/net/tmwserv/loginhandler.cpp:179
-#, fuzzy
msgid "Wrong username or password"
-msgstr "Fallsches Passwort"
+msgstr "Benutzername oder Passwort falsch"
#: src/net/tmwserv/loginhandler.cpp:211
msgid "Wrong username, password or email address"
-msgstr ""
+msgstr "Benutzername, Passwort oder Emailadresse falsch"
#: src/net/tmwserv/loginhandler.cpp:214
-#, fuzzy
msgid "Username already exists"
-msgstr "Dieser Spielername ist bereits vergeben"
+msgstr "Benutzername bereits vorhanden"
#: src/net/tmwserv/loginhandler.cpp:217
msgid "Email address already exists"
-msgstr ""
+msgstr "Emailadresse bereits vorhanden"
#: src/resources/itemdb.cpp:52
#, c-format
@@ -3047,12 +2979,39 @@ msgstr "monsters.xml"
msgid "NPC Database: Error while loading npcs.xml!"
msgstr "NPC Datenbank: Fehler beim Laden von npcs.xml!"
+#~ msgid "Save player list"
+#~ msgstr "Spielerliste sichern"
+
+#~ msgid "Scroll radius"
+#~ msgstr "Scroll-Radius"
+
+#~ msgid "Scroll laziness"
+#~ msgstr "Scroll-Trägheit"
+
#~ msgid "MiniMap"
#~ msgstr "Übersichtskarte"
+#~ msgid "; "
+#~ msgstr "; "
+
+#~ msgid "+"
+#~ msgstr "+"
+
+#~ msgid "-"
+#~ msgstr "-"
+
#~ msgid "Emote"
#~ msgstr "Gefühle"
+#~ msgid "inc"
+#~ msgstr "Verringern"
+
+#~ msgid "use"
+#~ msgstr "benutze"
+
+#~ msgid " -D --default : Bypass the login process with default settings"
+#~ msgstr " -D --default : Überspringe die Anmeldung mit den Voreinstellungen"
+
#~ msgid "NPC Number Request"
#~ msgstr "NPC Nummer Anfrage"
@@ -3066,17 +3025,8 @@ msgstr "NPC Datenbank: Fehler beim Laden von npcs.xml!"
#~ msgid "NPC Text Request"
#~ msgstr "NPC text Anfrage"
-#~ msgid "inc"
-#~ msgstr "Verringern"
-
-#~ msgid "use"
-#~ msgstr "benutze"
-
#~ msgid "%s: %s"
#~ msgstr "%s: %s"
#~ msgid "Emote Window"
#~ msgstr "Gefühlsfenster"
-
-#~ msgid " -D --default : Bypass the login process with default settings"
-#~ msgstr " -D --default : Überspringe die Anmeldung mit den Voreinstellungen"
diff --git a/po/en_GB.po b/po/en_GB.po
index fc3be43e..436c318b 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: tmw\n"
"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-05-10 16:39+0200\n"
+"POT-Creation-Date: 2009-05-12 00:11+0200\n"
"PO-Revision-Date: 2009-01-09 11:48+0000\n"
"Last-Translator: Me <Glich.Glich@googlemail.com>\n"
"Language-Team: English (United Kingdom) <en_GB@li.org>\n"
@@ -175,7 +175,7 @@ msgstr ""
#: src/commandhandler.cpp:216 src/commandhandler.cpp:230
#: src/gui/widgets/channeltab.cpp:81 src/gui/widgets/channeltab.cpp:90
-#: src/net/ea/gui/partytab.cpp:76
+#: src/net/ea/gui/partytab.cpp:79
msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
msgstr ""
@@ -195,7 +195,7 @@ msgstr ""
msgid "Command: /party <nick>"
msgstr ""
-#: src/commandhandler.cpp:229 src/net/ea/gui/partytab.cpp:75
+#: src/commandhandler.cpp:229 src/net/ea/gui/partytab.cpp:78
msgid "This command invites <nick> to party with you."
msgstr ""
@@ -508,7 +508,7 @@ msgstr "Ok"
msgid "Previous"
msgstr "Previous"
-#: src/gui/charselectdialog.cpp:113 src/gui/npcdialog.cpp:44
+#: src/gui/charselectdialog.cpp:113 src/gui/npcdialog.cpp:43
msgid "Next"
msgstr "Next"
@@ -533,7 +533,7 @@ msgstr "New"
#: src/gui/charselectdialog.cpp:118 src/gui/charselectdialog.cpp:165
#: src/gui/charselectdialog.cpp:166 src/gui/charselectdialog.cpp:315
-#: src/gui/setup_players.cpp:230
+#: src/gui/setup_players.cpp:228
msgid "Delete"
msgstr "Delete"
@@ -568,19 +568,15 @@ msgstr ""
msgid "%d players are present."
msgstr ""
-#: src/gui/chat.cpp:348 src/gui/chat.cpp:354
+#: src/gui/chat.cpp:333
msgid "Present: "
msgstr ""
-#: src/gui/chat.cpp:348 src/gui/chat.cpp:354
-msgid "; "
-msgstr ""
-
-#: src/gui/chat.cpp:349
+#: src/gui/chat.cpp:350
msgid "Attendance written to record log."
msgstr ""
-#: src/gui/chat.cpp:474
+#: src/gui/chat.cpp:475
#, c-format
msgid "Whispering to %s: %s"
msgstr ""
@@ -630,7 +626,7 @@ msgstr ""
msgid "Help"
msgstr ""
-#: src/gui/help.cpp:47 src/gui/npcdialog.cpp:45 src/gui/storagewindow.cpp:68
+#: src/gui/help.cpp:47 src/gui/npcdialog.cpp:44 src/gui/storagewindow.cpp:68
msgid "Close"
msgstr ""
@@ -723,7 +719,7 @@ msgid "Register"
msgstr "Register"
#: src/gui/magic.cpp:32 src/gui/skilldialog.cpp:117 src/gui/windowmenu.cpp:64
-#: src/localplayer.cpp:845
+#: src/localplayer.cpp:848
msgid "Magic"
msgstr ""
@@ -739,33 +735,25 @@ msgstr ""
msgid "Cast Test Spell 3"
msgstr ""
-#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
+#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:86
#, fuzzy
msgid "Map"
msgstr "MiniMap"
-#: src/gui/npcdialog.cpp:43
+#: src/gui/npcdialog.cpp:42
msgid "Waiting for server"
msgstr ""
-#: src/gui/npcdialog.cpp:46
+#: src/gui/npcdialog.cpp:45
#, fuzzy
msgid "Submit"
msgstr "Exit"
-#: src/gui/npcdialog.cpp:49 src/gui/npcpostdialog.cpp:39
+#: src/gui/npcdialog.cpp:48 src/gui/npcpostdialog.cpp:39
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:95
-msgid "+"
-msgstr ""
-
-#: src/gui/npcdialog.cpp:96
-msgid "-"
-msgstr ""
-
-#: src/gui/npcdialog.cpp:105
+#: src/gui/npcdialog.cpp:104
msgid "Reset"
msgstr ""
@@ -773,8 +761,7 @@ msgstr ""
msgid "Send"
msgstr ""
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:268
-#: src/gui/setup_video.cpp:567
+#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:142
msgid "Text"
msgstr ""
@@ -826,8 +813,8 @@ msgstr ""
msgid "Is"
msgstr ""
-#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:33
-#: src/net/ea/gui/partytab.cpp:37
+#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:45
+#: src/net/ea/gui/partytab.cpp:39
msgid "Party"
msgstr ""
@@ -1295,26 +1282,22 @@ msgid "???"
msgstr ""
#: src/gui/setup_players.cpp:224
-msgid "Save player list"
-msgstr ""
-
-#: src/gui/setup_players.cpp:226
msgid "Allow trading"
msgstr ""
-#: src/gui/setup_players.cpp:228
+#: src/gui/setup_players.cpp:226
msgid "Allow whispers"
msgstr ""
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:230
msgid "Put all whispers in tabs"
msgstr ""
-#: src/gui/setup_players.cpp:234
+#: src/gui/setup_players.cpp:232
msgid "Players"
msgstr ""
-#: src/gui/setup_players.cpp:259
+#: src/gui/setup_players.cpp:257
msgid "When ignoring:"
msgstr ""
@@ -1335,157 +1318,147 @@ msgstr ""
msgid "Large"
msgstr ""
-#: src/gui/setup_video.cpp:151
+#: src/gui/setup_video.cpp:141
+msgid "No text"
+msgstr ""
+
+#: src/gui/setup_video.cpp:143
+msgid "Bubbles, no names"
+msgstr ""
+
+#: src/gui/setup_video.cpp:144
+msgid "Bubbles with names"
+msgstr ""
+
+#: src/gui/setup_video.cpp:153
+msgid "off"
+msgstr "off"
+
+#: src/gui/setup_video.cpp:154 src/gui/setup_video.cpp:164
+msgid "low"
+msgstr "low"
+
+#: src/gui/setup_video.cpp:155 src/gui/setup_video.cpp:166
+msgid "high"
+msgstr "high"
+
+#: src/gui/setup_video.cpp:165
+msgid "medium"
+msgstr ""
+
+#: src/gui/setup_video.cpp:167
+msgid "max"
+msgstr ""
+
+#: src/gui/setup_video.cpp:187
msgid "Full screen"
msgstr "Full screen"
-#: src/gui/setup_video.cpp:152
+#: src/gui/setup_video.cpp:188
msgid "OpenGL"
msgstr "OpenGL"
-#: src/gui/setup_video.cpp:153
+#: src/gui/setup_video.cpp:189
msgid "Custom cursor"
msgstr "Custom cursor"
-#: src/gui/setup_video.cpp:155
+#: src/gui/setup_video.cpp:191
msgid "Visible names"
msgstr ""
-#: src/gui/setup_video.cpp:157
+#: src/gui/setup_video.cpp:193
msgid "Particle effects"
msgstr ""
-#: src/gui/setup_video.cpp:159
+#: src/gui/setup_video.cpp:195
msgid "Show name"
msgstr ""
-#: src/gui/setup_video.cpp:160
+#: src/gui/setup_video.cpp:196
msgid "Show pickup notification"
msgstr ""
-#: src/gui/setup_video.cpp:161
+#: src/gui/setup_video.cpp:197
msgid "in chat"
msgstr ""
-#: src/gui/setup_video.cpp:162
+#: src/gui/setup_video.cpp:198
msgid "as particle"
msgstr ""
-#: src/gui/setup_video.cpp:167
+#: src/gui/setup_video.cpp:203
msgid "FPS Limit:"
msgstr "FPS Limit:"
-#: src/gui/setup_video.cpp:184
+#: src/gui/setup_video.cpp:214
msgid "Video"
msgstr "Video"
-#: src/gui/setup_video.cpp:189
+#: src/gui/setup_video.cpp:219
msgid "Overhead text"
msgstr ""
-#: src/gui/setup_video.cpp:190
+#: src/gui/setup_video.cpp:220
msgid "Gui opacity"
msgstr "Gui opacity"
-#: src/gui/setup_video.cpp:191
-msgid "Scroll radius"
-msgstr "Scroll radius"
-
-#: src/gui/setup_video.cpp:192
-msgid "Scroll laziness"
-msgstr "Scroll laziness"
-
-#: src/gui/setup_video.cpp:193
+#: src/gui/setup_video.cpp:221
msgid "Ambient FX"
msgstr "Ambient FX"
-#: src/gui/setup_video.cpp:194
+#: src/gui/setup_video.cpp:222
msgid "Particle Detail"
msgstr ""
-#: src/gui/setup_video.cpp:195
+#: src/gui/setup_video.cpp:223
msgid "Font size"
msgstr ""
-#: src/gui/setup_video.cpp:265 src/gui/setup_video.cpp:564
-msgid "No text"
-msgstr ""
-
-#: src/gui/setup_video.cpp:271 src/gui/setup_video.cpp:570
-msgid "Bubbles, no names"
-msgstr ""
-
-#: src/gui/setup_video.cpp:274 src/gui/setup_video.cpp:573
-msgid "Bubbles with names"
-msgstr ""
-
-#: src/gui/setup_video.cpp:282 src/gui/setup_video.cpp:610
-msgid "off"
-msgstr "off"
-
-#: src/gui/setup_video.cpp:285 src/gui/setup_video.cpp:296
-#: src/gui/setup_video.cpp:613 src/gui/setup_video.cpp:627
-msgid "low"
-msgstr "low"
-
-#: src/gui/setup_video.cpp:288 src/gui/setup_video.cpp:302
-#: src/gui/setup_video.cpp:616 src/gui/setup_video.cpp:633
-msgid "high"
-msgstr "high"
-
-#: src/gui/setup_video.cpp:299 src/gui/setup_video.cpp:630
-msgid "medium"
-msgstr ""
-
-#: src/gui/setup_video.cpp:305 src/gui/setup_video.cpp:636
-msgid "max"
-msgstr ""
-
-#: src/gui/setup_video.cpp:410
+#: src/gui/setup_video.cpp:356
msgid "Failed to switch to "
msgstr ""
-#: src/gui/setup_video.cpp:411
+#: src/gui/setup_video.cpp:357
msgid "windowed"
msgstr ""
-#: src/gui/setup_video.cpp:411
+#: src/gui/setup_video.cpp:357
msgid "fullscreen"
msgstr ""
-#: src/gui/setup_video.cpp:412
+#: src/gui/setup_video.cpp:358
msgid "mode and restoration of old mode also failed!"
msgstr ""
-#: src/gui/setup_video.cpp:421
+#: src/gui/setup_video.cpp:367
msgid "Switching to full screen"
msgstr "Switching to full screen"
-#: src/gui/setup_video.cpp:422
+#: src/gui/setup_video.cpp:368
msgid "Restart needed for changes to take effect."
msgstr "Restart needed for changes to take effect."
-#: src/gui/setup_video.cpp:434
+#: src/gui/setup_video.cpp:380
msgid "Changing OpenGL"
msgstr "Changing OpenGL"
-#: src/gui/setup_video.cpp:435
+#: src/gui/setup_video.cpp:381
msgid "Applying change to OpenGL requires restart."
msgstr "Applying change to OpenGL requires restart."
-#: src/gui/setup_video.cpp:520
+#: src/gui/setup_video.cpp:442
msgid "Screen resolution changed"
msgstr ""
-#: src/gui/setup_video.cpp:521
+#: src/gui/setup_video.cpp:443
msgid "Restart your client for the change to take effect."
msgstr ""
-#: src/gui/setup_video.cpp:545
+#: src/gui/setup_video.cpp:467
msgid "Particle effect settings changed."
msgstr ""
-#: src/gui/setup_video.cpp:546
+#: src/gui/setup_video.cpp:468
msgid "Changes will take effect on map change."
msgstr ""
@@ -2007,55 +1980,55 @@ msgstr ""
msgid "Ignore input 2"
msgstr ""
-#: src/localplayer.cpp:834
+#: src/localplayer.cpp:837
msgid "Unarmed"
msgstr ""
-#: src/localplayer.cpp:835
+#: src/localplayer.cpp:838
msgid "Knife"
msgstr ""
-#: src/localplayer.cpp:836
+#: src/localplayer.cpp:839
msgid "Sword"
msgstr ""
-#: src/localplayer.cpp:837
+#: src/localplayer.cpp:840
msgid "Polearm"
msgstr ""
-#: src/localplayer.cpp:838
+#: src/localplayer.cpp:841
msgid "Staff"
msgstr ""
-#: src/localplayer.cpp:839
+#: src/localplayer.cpp:842
msgid "Whip"
msgstr ""
-#: src/localplayer.cpp:840
+#: src/localplayer.cpp:843
msgid "Bow"
msgstr ""
-#: src/localplayer.cpp:841
+#: src/localplayer.cpp:844
msgid "Shooting"
msgstr ""
-#: src/localplayer.cpp:842
+#: src/localplayer.cpp:845
msgid "Mace"
msgstr ""
-#: src/localplayer.cpp:843
+#: src/localplayer.cpp:846
msgid "Axe"
msgstr ""
-#: src/localplayer.cpp:844
+#: src/localplayer.cpp:847
msgid "Thrown"
msgstr ""
-#: src/localplayer.cpp:846
+#: src/localplayer.cpp:849
msgid "Craft"
msgstr ""
-#: src/localplayer.cpp:847
+#: src/localplayer.cpp:850
msgid "Unknown Skill"
msgstr ""
@@ -2267,193 +2240,193 @@ msgstr ""
msgid "Unable to unequip."
msgstr ""
-#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:82
-#, c-format
-msgid "Strength: %d"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:81
+#, fuzzy, c-format
+msgid "Strength %+d"
+msgstr "Strength:"
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:84
-#, c-format
-msgid "Agility: %d"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:82
+#, fuzzy, c-format
+msgid "Agility %+d"
+msgstr "Agility:"
-#: src/net/ea/generalhandler.cpp:96 src/net/tmwserv/generalhandler.cpp:88
-#, c-format
-msgid "Vitality: %d"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:84
+#, fuzzy, c-format
+msgid "Vitality %+d"
+msgstr "Vitality:"
-#: src/net/ea/generalhandler.cpp:98 src/net/tmwserv/generalhandler.cpp:90
-#, c-format
-msgid "Intelligence: %d"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:85
+#, fuzzy, c-format
+msgid "Intelligence %+d"
+msgstr "Intelligence:"
-#: src/net/ea/generalhandler.cpp:100 src/net/tmwserv/generalhandler.cpp:86
-#, c-format
-msgid "Dexterity: %d"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:83
+#, fuzzy, c-format
+msgid "Dexterity %+d"
+msgstr "Dexterity:"
-#: src/net/ea/generalhandler.cpp:102
-#, c-format
-msgid "Luck: %d"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:96
+#, fuzzy, c-format
+msgid "Luck %+d"
+msgstr "Attack %+d"
-#: src/net/ea/generalhandler.cpp:125
+#: src/net/ea/generalhandler.cpp:118
msgid "Authentication failed"
msgstr ""
-#: src/net/ea/generalhandler.cpp:128
+#: src/net/ea/generalhandler.cpp:121
msgid "No servers available"
msgstr ""
-#: src/net/ea/generalhandler.cpp:132
+#: src/net/ea/generalhandler.cpp:125
msgid "Someone else is trying to use this account"
msgstr ""
-#: src/net/ea/generalhandler.cpp:135
+#: src/net/ea/generalhandler.cpp:128
msgid "This account is already logged in"
msgstr ""
-#: src/net/ea/generalhandler.cpp:138
+#: src/net/ea/generalhandler.cpp:131
msgid "Speed hack detected"
msgstr ""
-#: src/net/ea/generalhandler.cpp:141
+#: src/net/ea/generalhandler.cpp:134
msgid "Duplicated login"
msgstr ""
-#: src/net/ea/generalhandler.cpp:144
+#: src/net/ea/generalhandler.cpp:137
msgid "Unknown connection error"
msgstr ""
-#: src/net/ea/generalhandler.cpp:201
+#: src/net/ea/generalhandler.cpp:194
msgid "Got disconnected from server!"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:52
+#: src/net/ea/gui/partytab.cpp:55
msgid "/help > Display this help."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:53
+#: src/net/ea/gui/partytab.cpp:56
msgid "/create > Create a new party"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:54
+#: src/net/ea/gui/partytab.cpp:57
msgid "/new > Alias of create"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:55
+#: src/net/ea/gui/partytab.cpp:58
msgid "/invite > Invite a player to your party"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:56
+#: src/net/ea/gui/partytab.cpp:59
msgid "/leave > Leave the party you are in"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:57
+#: src/net/ea/gui/partytab.cpp:60
msgid "/kick > Kick some one from the party you are in"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:58
+#: src/net/ea/gui/partytab.cpp:61
msgid "/item > Show/change party item sharing options"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:59
+#: src/net/ea/gui/partytab.cpp:62
msgid "/exp > Show/change party experience sharing options"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:68
+#: src/net/ea/gui/partytab.cpp:71
msgid "Command: /new <party-name>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:69
+#: src/net/ea/gui/partytab.cpp:72
msgid "Command: /create <party-name>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:70
+#: src/net/ea/gui/partytab.cpp:73
msgid "These commands create a new party called <party-name>."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:74
+#: src/net/ea/gui/partytab.cpp:77
msgid "Command: /invite <nick>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:81
+#: src/net/ea/gui/partytab.cpp:84
msgid "Command: /leave"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:82
+#: src/net/ea/gui/partytab.cpp:85
msgid "This command causes the player to leave the party."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/ea/gui/partytab.cpp:89
msgid "Command: /item <policy>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:87
+#: src/net/ea/gui/partytab.cpp:90
msgid "This command changes the party's item sharing policy."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:88
+#: src/net/ea/gui/partytab.cpp:91
msgid ""
"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
"\"0\", \"no\", \"false\" to disable item sharing."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:94
msgid "Command: /item"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:92
+#: src/net/ea/gui/partytab.cpp:95
msgid "This command displays the party's current item sharing policy."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:96
+#: src/net/ea/gui/partytab.cpp:99
msgid "Command: /exp <policy>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/ea/gui/partytab.cpp:100
msgid "This command changes the party's experience sharing policy."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:98
+#: src/net/ea/gui/partytab.cpp:101
msgid ""
"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:104
msgid "Command: /exp"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:102
+#: src/net/ea/gui/partytab.cpp:105
msgid "This command displays the party's current experience sharing policy."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:110
+#: src/net/ea/gui/partytab.cpp:113
msgid "Party name is missing."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:133 src/net/ea/partyhandler.cpp:191
+#: src/net/ea/gui/partytab.cpp:136 src/net/ea/partyhandler.cpp:194
msgid "Item sharing enabled."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:136 src/net/ea/partyhandler.cpp:197
+#: src/net/ea/gui/partytab.cpp:139 src/net/ea/partyhandler.cpp:200
msgid "Item sharing disabled."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:139 src/net/ea/partyhandler.cpp:203
+#: src/net/ea/gui/partytab.cpp:142 src/net/ea/partyhandler.cpp:206
msgid "Item sharing not possible."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:165 src/net/ea/partyhandler.cpp:168
+#: src/net/ea/gui/partytab.cpp:168 src/net/ea/partyhandler.cpp:171
msgid "Experience sharing enabled."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:168 src/net/ea/partyhandler.cpp:174
+#: src/net/ea/gui/partytab.cpp:171 src/net/ea/partyhandler.cpp:177
msgid "Experience sharing disabled."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:171 src/net/ea/partyhandler.cpp:180
+#: src/net/ea/gui/partytab.cpp:174 src/net/ea/partyhandler.cpp:183
msgid "Experience sharing not possible."
msgstr ""
@@ -2516,45 +2489,45 @@ msgstr ""
msgid "Party successfully created."
msgstr ""
-#: src/net/ea/partyhandler.cpp:115
+#: src/net/ea/partyhandler.cpp:118
#, c-format
msgid "%s is already a member of a party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:119
+#: src/net/ea/partyhandler.cpp:122
#, c-format
msgid "%s refused your invitation."
msgstr ""
-#: src/net/ea/partyhandler.cpp:123
+#: src/net/ea/partyhandler.cpp:126
#, c-format
msgid "%s is now a member of your party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:127
+#: src/net/ea/partyhandler.cpp:130
#, c-format
msgid "Unknown invite response for %s."
msgstr ""
-#: src/net/ea/partyhandler.cpp:232
+#: src/net/ea/partyhandler.cpp:235
msgid "You have left the party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:235
+#: src/net/ea/partyhandler.cpp:239
#, c-format
msgid "%s has left your party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:272
+#: src/net/ea/partyhandler.cpp:274
#, c-format
msgid "An unknown member tried to say: %s"
msgstr ""
-#: src/net/ea/partyhandler.cpp:298
+#: src/net/ea/partyhandler.cpp:300
msgid "Inviting like this isn't supported at the moment."
msgstr ""
-#: src/net/ea/partyhandler.cpp:327
+#: src/net/ea/partyhandler.cpp:329
#, c-format
msgid "%s is not in your party!"
msgstr ""
@@ -2847,10 +2820,10 @@ msgstr "Willpower:"
msgid "Topic: "
msgstr ""
-#: src/net/tmwserv/generalhandler.cpp:92
-#, c-format
-msgid "Willpower: %d"
-msgstr ""
+#: src/net/tmwserv/generalhandler.cpp:86
+#, fuzzy, c-format
+msgid "Willpower %+d"
+msgstr "Willpower:"
#: src/net/tmwserv/loginhandler.cpp:80
msgid "Wrong magic_token"
@@ -2947,3 +2920,9 @@ msgstr ""
#: src/resources/npcdb.cpp:53
msgid "NPC Database: Error while loading npcs.xml!"
msgstr ""
+
+#~ msgid "Scroll radius"
+#~ msgstr "Scroll radius"
+
+#~ msgid "Scroll laziness"
+#~ msgstr "Scroll laziness"
diff --git a/po/eo.po b/po/eo.po
index 9ccb02ee..60ee7d59 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: tmw\n"
"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-05-10 16:39+0200\n"
+"POT-Creation-Date: 2009-05-12 00:11+0200\n"
"PO-Revision-Date: 2009-01-09 11:34+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Esperanto <eo@li.org>\n"
@@ -175,7 +175,7 @@ msgstr ""
#: src/commandhandler.cpp:216 src/commandhandler.cpp:230
#: src/gui/widgets/channeltab.cpp:81 src/gui/widgets/channeltab.cpp:90
-#: src/net/ea/gui/partytab.cpp:76
+#: src/net/ea/gui/partytab.cpp:79
msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
msgstr ""
@@ -195,7 +195,7 @@ msgstr ""
msgid "Command: /party <nick>"
msgstr ""
-#: src/commandhandler.cpp:229 src/net/ea/gui/partytab.cpp:75
+#: src/commandhandler.cpp:229 src/net/ea/gui/partytab.cpp:78
msgid "This command invites <nick> to party with you."
msgstr ""
@@ -508,7 +508,7 @@ msgstr ""
msgid "Previous"
msgstr ""
-#: src/gui/charselectdialog.cpp:113 src/gui/npcdialog.cpp:44
+#: src/gui/charselectdialog.cpp:113 src/gui/npcdialog.cpp:43
msgid "Next"
msgstr ""
@@ -533,7 +533,7 @@ msgstr ""
#: src/gui/charselectdialog.cpp:118 src/gui/charselectdialog.cpp:165
#: src/gui/charselectdialog.cpp:166 src/gui/charselectdialog.cpp:315
-#: src/gui/setup_players.cpp:230
+#: src/gui/setup_players.cpp:228
msgid "Delete"
msgstr ""
@@ -568,19 +568,15 @@ msgstr ""
msgid "%d players are present."
msgstr ""
-#: src/gui/chat.cpp:348 src/gui/chat.cpp:354
+#: src/gui/chat.cpp:333
msgid "Present: "
msgstr ""
-#: src/gui/chat.cpp:348 src/gui/chat.cpp:354
-msgid "; "
-msgstr ""
-
-#: src/gui/chat.cpp:349
+#: src/gui/chat.cpp:350
msgid "Attendance written to record log."
msgstr ""
-#: src/gui/chat.cpp:474
+#: src/gui/chat.cpp:475
#, c-format
msgid "Whispering to %s: %s"
msgstr ""
@@ -630,7 +626,7 @@ msgstr ""
msgid "Help"
msgstr ""
-#: src/gui/help.cpp:47 src/gui/npcdialog.cpp:45 src/gui/storagewindow.cpp:68
+#: src/gui/help.cpp:47 src/gui/npcdialog.cpp:44 src/gui/storagewindow.cpp:68
msgid "Close"
msgstr ""
@@ -723,7 +719,7 @@ msgid "Register"
msgstr ""
#: src/gui/magic.cpp:32 src/gui/skilldialog.cpp:117 src/gui/windowmenu.cpp:64
-#: src/localplayer.cpp:845
+#: src/localplayer.cpp:848
msgid "Magic"
msgstr ""
@@ -739,31 +735,23 @@ msgstr ""
msgid "Cast Test Spell 3"
msgstr ""
-#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
+#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:86
msgid "Map"
msgstr ""
-#: src/gui/npcdialog.cpp:43
+#: src/gui/npcdialog.cpp:42
msgid "Waiting for server"
msgstr ""
-#: src/gui/npcdialog.cpp:46
+#: src/gui/npcdialog.cpp:45
msgid "Submit"
msgstr ""
-#: src/gui/npcdialog.cpp:49 src/gui/npcpostdialog.cpp:39
+#: src/gui/npcdialog.cpp:48 src/gui/npcpostdialog.cpp:39
msgid "NPC"
msgstr ""
-#: src/gui/npcdialog.cpp:95
-msgid "+"
-msgstr ""
-
-#: src/gui/npcdialog.cpp:96
-msgid "-"
-msgstr ""
-
-#: src/gui/npcdialog.cpp:105
+#: src/gui/npcdialog.cpp:104
msgid "Reset"
msgstr ""
@@ -771,8 +759,7 @@ msgstr ""
msgid "Send"
msgstr ""
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:268
-#: src/gui/setup_video.cpp:567
+#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:142
msgid "Text"
msgstr ""
@@ -824,8 +811,8 @@ msgstr ""
msgid "Is"
msgstr ""
-#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:33
-#: src/net/ea/gui/partytab.cpp:37
+#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:45
+#: src/net/ea/gui/partytab.cpp:39
msgid "Party"
msgstr ""
@@ -1289,26 +1276,22 @@ msgid "???"
msgstr ""
#: src/gui/setup_players.cpp:224
-msgid "Save player list"
-msgstr ""
-
-#: src/gui/setup_players.cpp:226
msgid "Allow trading"
msgstr ""
-#: src/gui/setup_players.cpp:228
+#: src/gui/setup_players.cpp:226
msgid "Allow whispers"
msgstr ""
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:230
msgid "Put all whispers in tabs"
msgstr ""
-#: src/gui/setup_players.cpp:234
+#: src/gui/setup_players.cpp:232
msgid "Players"
msgstr ""
-#: src/gui/setup_players.cpp:259
+#: src/gui/setup_players.cpp:257
msgid "When ignoring:"
msgstr ""
@@ -1328,157 +1311,147 @@ msgstr ""
msgid "Large"
msgstr ""
-#: src/gui/setup_video.cpp:151
-msgid "Full screen"
-msgstr ""
-
-#: src/gui/setup_video.cpp:152
-msgid "OpenGL"
-msgstr ""
-
-#: src/gui/setup_video.cpp:153
-msgid "Custom cursor"
+#: src/gui/setup_video.cpp:141
+msgid "No text"
msgstr ""
-#: src/gui/setup_video.cpp:155
-msgid "Visible names"
+#: src/gui/setup_video.cpp:143
+msgid "Bubbles, no names"
msgstr ""
-#: src/gui/setup_video.cpp:157
-msgid "Particle effects"
+#: src/gui/setup_video.cpp:144
+msgid "Bubbles with names"
msgstr ""
-#: src/gui/setup_video.cpp:159
-msgid "Show name"
+#: src/gui/setup_video.cpp:153
+msgid "off"
msgstr ""
-#: src/gui/setup_video.cpp:160
-msgid "Show pickup notification"
+#: src/gui/setup_video.cpp:154 src/gui/setup_video.cpp:164
+msgid "low"
msgstr ""
-#: src/gui/setup_video.cpp:161
-msgid "in chat"
+#: src/gui/setup_video.cpp:155 src/gui/setup_video.cpp:166
+msgid "high"
msgstr ""
-#: src/gui/setup_video.cpp:162
-msgid "as particle"
+#: src/gui/setup_video.cpp:165
+msgid "medium"
msgstr ""
#: src/gui/setup_video.cpp:167
-msgid "FPS Limit:"
+msgid "max"
msgstr ""
-#: src/gui/setup_video.cpp:184
-msgid "Video"
+#: src/gui/setup_video.cpp:187
+msgid "Full screen"
msgstr ""
-#: src/gui/setup_video.cpp:189
-msgid "Overhead text"
+#: src/gui/setup_video.cpp:188
+msgid "OpenGL"
msgstr ""
-#: src/gui/setup_video.cpp:190
-msgid "Gui opacity"
+#: src/gui/setup_video.cpp:189
+msgid "Custom cursor"
msgstr ""
#: src/gui/setup_video.cpp:191
-msgid "Scroll radius"
+msgid "Visible names"
msgstr ""
-#: src/gui/setup_video.cpp:192
-msgid "Scroll laziness"
+#: src/gui/setup_video.cpp:193
+msgid "Particle effects"
msgstr ""
-#: src/gui/setup_video.cpp:193
-msgid "Ambient FX"
+#: src/gui/setup_video.cpp:195
+msgid "Show name"
msgstr ""
-#: src/gui/setup_video.cpp:194
-msgid "Particle Detail"
+#: src/gui/setup_video.cpp:196
+msgid "Show pickup notification"
msgstr ""
-#: src/gui/setup_video.cpp:195
-msgid "Font size"
+#: src/gui/setup_video.cpp:197
+msgid "in chat"
msgstr ""
-#: src/gui/setup_video.cpp:265 src/gui/setup_video.cpp:564
-msgid "No text"
+#: src/gui/setup_video.cpp:198
+msgid "as particle"
msgstr ""
-#: src/gui/setup_video.cpp:271 src/gui/setup_video.cpp:570
-msgid "Bubbles, no names"
+#: src/gui/setup_video.cpp:203
+msgid "FPS Limit:"
msgstr ""
-#: src/gui/setup_video.cpp:274 src/gui/setup_video.cpp:573
-msgid "Bubbles with names"
+#: src/gui/setup_video.cpp:214
+msgid "Video"
msgstr ""
-#: src/gui/setup_video.cpp:282 src/gui/setup_video.cpp:610
-msgid "off"
+#: src/gui/setup_video.cpp:219
+msgid "Overhead text"
msgstr ""
-#: src/gui/setup_video.cpp:285 src/gui/setup_video.cpp:296
-#: src/gui/setup_video.cpp:613 src/gui/setup_video.cpp:627
-msgid "low"
+#: src/gui/setup_video.cpp:220
+msgid "Gui opacity"
msgstr ""
-#: src/gui/setup_video.cpp:288 src/gui/setup_video.cpp:302
-#: src/gui/setup_video.cpp:616 src/gui/setup_video.cpp:633
-msgid "high"
+#: src/gui/setup_video.cpp:221
+msgid "Ambient FX"
msgstr ""
-#: src/gui/setup_video.cpp:299 src/gui/setup_video.cpp:630
-msgid "medium"
+#: src/gui/setup_video.cpp:222
+msgid "Particle Detail"
msgstr ""
-#: src/gui/setup_video.cpp:305 src/gui/setup_video.cpp:636
-msgid "max"
+#: src/gui/setup_video.cpp:223
+msgid "Font size"
msgstr ""
-#: src/gui/setup_video.cpp:410
+#: src/gui/setup_video.cpp:356
msgid "Failed to switch to "
msgstr ""
-#: src/gui/setup_video.cpp:411
+#: src/gui/setup_video.cpp:357
msgid "windowed"
msgstr ""
-#: src/gui/setup_video.cpp:411
+#: src/gui/setup_video.cpp:357
msgid "fullscreen"
msgstr ""
-#: src/gui/setup_video.cpp:412
+#: src/gui/setup_video.cpp:358
msgid "mode and restoration of old mode also failed!"
msgstr ""
-#: src/gui/setup_video.cpp:421
+#: src/gui/setup_video.cpp:367
msgid "Switching to full screen"
msgstr ""
-#: src/gui/setup_video.cpp:422
+#: src/gui/setup_video.cpp:368
msgid "Restart needed for changes to take effect."
msgstr ""
-#: src/gui/setup_video.cpp:434
+#: src/gui/setup_video.cpp:380
msgid "Changing OpenGL"
msgstr ""
-#: src/gui/setup_video.cpp:435
+#: src/gui/setup_video.cpp:381
msgid "Applying change to OpenGL requires restart."
msgstr ""
-#: src/gui/setup_video.cpp:520
+#: src/gui/setup_video.cpp:442
msgid "Screen resolution changed"
msgstr ""
-#: src/gui/setup_video.cpp:521
+#: src/gui/setup_video.cpp:443
msgid "Restart your client for the change to take effect."
msgstr ""
-#: src/gui/setup_video.cpp:545
+#: src/gui/setup_video.cpp:467
msgid "Particle effect settings changed."
msgstr ""
-#: src/gui/setup_video.cpp:546
+#: src/gui/setup_video.cpp:468
msgid "Changes will take effect on map change."
msgstr ""
@@ -1999,55 +1972,55 @@ msgstr ""
msgid "Ignore input 2"
msgstr ""
-#: src/localplayer.cpp:834
+#: src/localplayer.cpp:837
msgid "Unarmed"
msgstr ""
-#: src/localplayer.cpp:835
+#: src/localplayer.cpp:838
msgid "Knife"
msgstr ""
-#: src/localplayer.cpp:836
+#: src/localplayer.cpp:839
msgid "Sword"
msgstr ""
-#: src/localplayer.cpp:837
+#: src/localplayer.cpp:840
msgid "Polearm"
msgstr ""
-#: src/localplayer.cpp:838
+#: src/localplayer.cpp:841
msgid "Staff"
msgstr ""
-#: src/localplayer.cpp:839
+#: src/localplayer.cpp:842
msgid "Whip"
msgstr ""
-#: src/localplayer.cpp:840
+#: src/localplayer.cpp:843
msgid "Bow"
msgstr ""
-#: src/localplayer.cpp:841
+#: src/localplayer.cpp:844
msgid "Shooting"
msgstr ""
-#: src/localplayer.cpp:842
+#: src/localplayer.cpp:845
msgid "Mace"
msgstr ""
-#: src/localplayer.cpp:843
+#: src/localplayer.cpp:846
msgid "Axe"
msgstr ""
-#: src/localplayer.cpp:844
+#: src/localplayer.cpp:847
msgid "Thrown"
msgstr ""
-#: src/localplayer.cpp:846
+#: src/localplayer.cpp:849
msgid "Craft"
msgstr ""
-#: src/localplayer.cpp:847
+#: src/localplayer.cpp:850
msgid "Unknown Skill"
msgstr ""
@@ -2259,193 +2232,193 @@ msgstr ""
msgid "Unable to unequip."
msgstr ""
-#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:82
+#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:81
#, c-format
-msgid "Strength: %d"
+msgid "Strength %+d"
msgstr ""
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:82
#, c-format
-msgid "Agility: %d"
+msgid "Agility %+d"
msgstr ""
-#: src/net/ea/generalhandler.cpp:96 src/net/tmwserv/generalhandler.cpp:88
+#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:84
#, c-format
-msgid "Vitality: %d"
+msgid "Vitality %+d"
msgstr ""
-#: src/net/ea/generalhandler.cpp:98 src/net/tmwserv/generalhandler.cpp:90
+#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:85
#, c-format
-msgid "Intelligence: %d"
+msgid "Intelligence %+d"
msgstr ""
-#: src/net/ea/generalhandler.cpp:100 src/net/tmwserv/generalhandler.cpp:86
+#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:83
#, c-format
-msgid "Dexterity: %d"
+msgid "Dexterity %+d"
msgstr ""
-#: src/net/ea/generalhandler.cpp:102
+#: src/net/ea/generalhandler.cpp:96
#, c-format
-msgid "Luck: %d"
+msgid "Luck %+d"
msgstr ""
-#: src/net/ea/generalhandler.cpp:125
+#: src/net/ea/generalhandler.cpp:118
msgid "Authentication failed"
msgstr ""
-#: src/net/ea/generalhandler.cpp:128
+#: src/net/ea/generalhandler.cpp:121
msgid "No servers available"
msgstr ""
-#: src/net/ea/generalhandler.cpp:132
+#: src/net/ea/generalhandler.cpp:125
msgid "Someone else is trying to use this account"
msgstr ""
-#: src/net/ea/generalhandler.cpp:135
+#: src/net/ea/generalhandler.cpp:128
msgid "This account is already logged in"
msgstr ""
-#: src/net/ea/generalhandler.cpp:138
+#: src/net/ea/generalhandler.cpp:131
msgid "Speed hack detected"
msgstr ""
-#: src/net/ea/generalhandler.cpp:141
+#: src/net/ea/generalhandler.cpp:134
msgid "Duplicated login"
msgstr ""
-#: src/net/ea/generalhandler.cpp:144
+#: src/net/ea/generalhandler.cpp:137
msgid "Unknown connection error"
msgstr ""
-#: src/net/ea/generalhandler.cpp:201
+#: src/net/ea/generalhandler.cpp:194
msgid "Got disconnected from server!"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:52
+#: src/net/ea/gui/partytab.cpp:55
msgid "/help > Display this help."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:53
+#: src/net/ea/gui/partytab.cpp:56
msgid "/create > Create a new party"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:54
+#: src/net/ea/gui/partytab.cpp:57
msgid "/new > Alias of create"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:55
+#: src/net/ea/gui/partytab.cpp:58
msgid "/invite > Invite a player to your party"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:56
+#: src/net/ea/gui/partytab.cpp:59
msgid "/leave > Leave the party you are in"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:57
+#: src/net/ea/gui/partytab.cpp:60
msgid "/kick > Kick some one from the party you are in"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:58
+#: src/net/ea/gui/partytab.cpp:61
msgid "/item > Show/change party item sharing options"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:59
+#: src/net/ea/gui/partytab.cpp:62
msgid "/exp > Show/change party experience sharing options"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:68
+#: src/net/ea/gui/partytab.cpp:71
msgid "Command: /new <party-name>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:69
+#: src/net/ea/gui/partytab.cpp:72
msgid "Command: /create <party-name>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:70
+#: src/net/ea/gui/partytab.cpp:73
msgid "These commands create a new party called <party-name>."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:74
+#: src/net/ea/gui/partytab.cpp:77
msgid "Command: /invite <nick>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:81
+#: src/net/ea/gui/partytab.cpp:84
msgid "Command: /leave"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:82
+#: src/net/ea/gui/partytab.cpp:85
msgid "This command causes the player to leave the party."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/ea/gui/partytab.cpp:89
msgid "Command: /item <policy>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:87
+#: src/net/ea/gui/partytab.cpp:90
msgid "This command changes the party's item sharing policy."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:88
+#: src/net/ea/gui/partytab.cpp:91
msgid ""
"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
"\"0\", \"no\", \"false\" to disable item sharing."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:94
msgid "Command: /item"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:92
+#: src/net/ea/gui/partytab.cpp:95
msgid "This command displays the party's current item sharing policy."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:96
+#: src/net/ea/gui/partytab.cpp:99
msgid "Command: /exp <policy>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/ea/gui/partytab.cpp:100
msgid "This command changes the party's experience sharing policy."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:98
+#: src/net/ea/gui/partytab.cpp:101
msgid ""
"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:104
msgid "Command: /exp"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:102
+#: src/net/ea/gui/partytab.cpp:105
msgid "This command displays the party's current experience sharing policy."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:110
+#: src/net/ea/gui/partytab.cpp:113
msgid "Party name is missing."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:133 src/net/ea/partyhandler.cpp:191
+#: src/net/ea/gui/partytab.cpp:136 src/net/ea/partyhandler.cpp:194
msgid "Item sharing enabled."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:136 src/net/ea/partyhandler.cpp:197
+#: src/net/ea/gui/partytab.cpp:139 src/net/ea/partyhandler.cpp:200
msgid "Item sharing disabled."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:139 src/net/ea/partyhandler.cpp:203
+#: src/net/ea/gui/partytab.cpp:142 src/net/ea/partyhandler.cpp:206
msgid "Item sharing not possible."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:165 src/net/ea/partyhandler.cpp:168
+#: src/net/ea/gui/partytab.cpp:168 src/net/ea/partyhandler.cpp:171
msgid "Experience sharing enabled."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:168 src/net/ea/partyhandler.cpp:174
+#: src/net/ea/gui/partytab.cpp:171 src/net/ea/partyhandler.cpp:177
msgid "Experience sharing disabled."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:171 src/net/ea/partyhandler.cpp:180
+#: src/net/ea/gui/partytab.cpp:174 src/net/ea/partyhandler.cpp:183
msgid "Experience sharing not possible."
msgstr ""
@@ -2508,45 +2481,45 @@ msgstr ""
msgid "Party successfully created."
msgstr ""
-#: src/net/ea/partyhandler.cpp:115
+#: src/net/ea/partyhandler.cpp:118
#, c-format
msgid "%s is already a member of a party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:119
+#: src/net/ea/partyhandler.cpp:122
#, c-format
msgid "%s refused your invitation."
msgstr ""
-#: src/net/ea/partyhandler.cpp:123
+#: src/net/ea/partyhandler.cpp:126
#, c-format
msgid "%s is now a member of your party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:127
+#: src/net/ea/partyhandler.cpp:130
#, c-format
msgid "Unknown invite response for %s."
msgstr ""
-#: src/net/ea/partyhandler.cpp:232
+#: src/net/ea/partyhandler.cpp:235
msgid "You have left the party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:235
+#: src/net/ea/partyhandler.cpp:239
#, c-format
msgid "%s has left your party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:272
+#: src/net/ea/partyhandler.cpp:274
#, c-format
msgid "An unknown member tried to say: %s"
msgstr ""
-#: src/net/ea/partyhandler.cpp:298
+#: src/net/ea/partyhandler.cpp:300
msgid "Inviting like this isn't supported at the moment."
msgstr ""
-#: src/net/ea/partyhandler.cpp:327
+#: src/net/ea/partyhandler.cpp:329
#, c-format
msgid "%s is not in your party!"
msgstr ""
@@ -2839,9 +2812,9 @@ msgstr ""
msgid "Topic: "
msgstr ""
-#: src/net/tmwserv/generalhandler.cpp:92
+#: src/net/tmwserv/generalhandler.cpp:86
#, c-format
-msgid "Willpower: %d"
+msgid "Willpower %+d"
msgstr ""
#: src/net/tmwserv/loginhandler.cpp:80
diff --git a/po/es.po b/po/es.po
index 16db5284..94aa9b43 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,14 +7,14 @@ msgid ""
msgstr ""
"Project-Id-Version: tmw\n"
"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-05-10 16:39+0200\n"
-"PO-Revision-Date: 2009-05-03 13:13+0000\n"
+"POT-Creation-Date: 2009-05-12 00:11+0200\n"
+"PO-Revision-Date: 2009-05-10 15:53+0000\n"
"Last-Translator: Jumpy <Unknown>\n"
"Language-Team: Spanish <es@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-05-10 13:48+0000\n"
+"X-Launchpad-Export-Date: 2009-05-11 21:56+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#: src/commandhandler.cpp:141
@@ -22,9 +22,8 @@ msgid "-- Help --"
msgstr "ayuda"
#: src/commandhandler.cpp:142
-#, fuzzy
msgid "/help > Display this help"
-msgstr "/help > Mostrar la ayuda"
+msgstr "/help > Muestra la ayuda"
#: src/commandhandler.cpp:144
msgid "/where > Display map name"
@@ -57,6 +56,7 @@ msgstr "/w Alias para un mensaje"
#: src/commandhandler.cpp:153
msgid "/query > Makes a tab for private messages with another user"
msgstr ""
+"/query > Crea una ventana para mensajes privados con un otro utilizador"
#: src/commandhandler.cpp:154
msgid "/q > Alias of query"
@@ -64,19 +64,19 @@ msgstr "/q > Alias para una demanda"
#: src/commandhandler.cpp:156
msgid "/list > Display all public channels"
-msgstr ""
+msgstr "/list > Enseña la lista de los salones publicos"
#: src/commandhandler.cpp:157
msgid "/join > Join or create a channel"
-msgstr ""
+msgstr "/join > Entrar o crear un salon"
#: src/commandhandler.cpp:159
msgid "/party > Invite a user to party"
-msgstr ""
+msgstr "/party > Invita un jugador en un grupo"
#: src/commandhandler.cpp:161
msgid "/record > Start recording the chat to an external file"
-msgstr ""
+msgstr "/record > Empieza a registrar el chat en un archivo externo"
#: src/commandhandler.cpp:162
msgid "/toggle > Determine whether <return> toggles the chat log"
@@ -140,7 +140,7 @@ msgstr ""
#: src/commandhandler.cpp:198
msgid "If <channel> doesn't exist, it's created."
-msgstr ""
+msgstr "Si <channel> no existe, lo crea"
#: src/commandhandler.cpp:202
msgid "Command: /list"
@@ -176,7 +176,7 @@ msgstr ""
#: src/commandhandler.cpp:216 src/commandhandler.cpp:230
#: src/gui/widgets/channeltab.cpp:81 src/gui/widgets/channeltab.cpp:90
-#: src/net/ea/gui/partytab.cpp:76
+#: src/net/ea/gui/partytab.cpp:79
msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
msgstr "si el <mote> incluye espacios , escribelo entre comillas (\"\")"
@@ -196,7 +196,7 @@ msgstr ""
msgid "Command: /party <nick>"
msgstr ""
-#: src/commandhandler.cpp:229 src/net/ea/gui/partytab.cpp:75
+#: src/commandhandler.cpp:229 src/net/ea/gui/partytab.cpp:78
msgid "This command invites <nick> to party with you."
msgstr ""
@@ -510,7 +510,7 @@ msgstr "Aceptar"
msgid "Previous"
msgstr "Anterior"
-#: src/gui/charselectdialog.cpp:113 src/gui/npcdialog.cpp:44
+#: src/gui/charselectdialog.cpp:113 src/gui/npcdialog.cpp:43
msgid "Next"
msgstr "Siguiente"
@@ -535,7 +535,7 @@ msgstr "Nuevo"
#: src/gui/charselectdialog.cpp:118 src/gui/charselectdialog.cpp:165
#: src/gui/charselectdialog.cpp:166 src/gui/charselectdialog.cpp:315
-#: src/gui/setup_players.cpp:230
+#: src/gui/setup_players.cpp:228
msgid "Delete"
msgstr "Eliminar"
@@ -570,19 +570,15 @@ msgstr ""
msgid "%d players are present."
msgstr ""
-#: src/gui/chat.cpp:348 src/gui/chat.cpp:354
+#: src/gui/chat.cpp:333
msgid "Present: "
msgstr ""
-#: src/gui/chat.cpp:348 src/gui/chat.cpp:354
-msgid "; "
-msgstr ""
-
-#: src/gui/chat.cpp:349
+#: src/gui/chat.cpp:350
msgid "Attendance written to record log."
msgstr ""
-#: src/gui/chat.cpp:474
+#: src/gui/chat.cpp:475
#, c-format
msgid "Whispering to %s: %s"
msgstr "susurrando a %s: %s"
@@ -632,7 +628,7 @@ msgstr ""
msgid "Help"
msgstr "Ayuda"
-#: src/gui/help.cpp:47 src/gui/npcdialog.cpp:45 src/gui/storagewindow.cpp:68
+#: src/gui/help.cpp:47 src/gui/npcdialog.cpp:44 src/gui/storagewindow.cpp:68
msgid "Close"
msgstr "Cerrar"
@@ -725,7 +721,7 @@ msgid "Register"
msgstr "Registrar"
#: src/gui/magic.cpp:32 src/gui/skilldialog.cpp:117 src/gui/windowmenu.cpp:64
-#: src/localplayer.cpp:845
+#: src/localplayer.cpp:848
msgid "Magic"
msgstr ""
@@ -741,33 +737,23 @@ msgstr ""
msgid "Cast Test Spell 3"
msgstr ""
-#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
-#, fuzzy
+#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:86
msgid "Map"
-msgstr "Minimapa"
+msgstr ""
-#: src/gui/npcdialog.cpp:43
+#: src/gui/npcdialog.cpp:42
msgid "Waiting for server"
msgstr ""
-#: src/gui/npcdialog.cpp:46
-#, fuzzy
+#: src/gui/npcdialog.cpp:45
msgid "Submit"
-msgstr "Salir"
+msgstr ""
-#: src/gui/npcdialog.cpp:49 src/gui/npcpostdialog.cpp:39
+#: src/gui/npcdialog.cpp:48 src/gui/npcpostdialog.cpp:39
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:95
-msgid "+"
-msgstr ""
-
-#: src/gui/npcdialog.cpp:96
-msgid "-"
-msgstr ""
-
-#: src/gui/npcdialog.cpp:105
+#: src/gui/npcdialog.cpp:104
msgid "Reset"
msgstr ""
@@ -775,8 +761,7 @@ msgstr ""
msgid "Send"
msgstr ""
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:268
-#: src/gui/setup_video.cpp:567
+#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:142
msgid "Text"
msgstr ""
@@ -828,8 +813,8 @@ msgstr ""
msgid "Is"
msgstr ""
-#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:33
-#: src/net/ea/gui/partytab.cpp:37
+#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:45
+#: src/net/ea/gui/partytab.cpp:39
msgid "Party"
msgstr ""
@@ -878,14 +863,12 @@ msgid "Generics"
msgstr ""
#: src/gui/palette.cpp:112
-#, fuzzy
msgid "Hats"
-msgstr "Estadísticas"
+msgstr ""
#: src/gui/palette.cpp:113
-#, fuzzy
msgid "Usables"
-msgstr "Usar"
+msgstr ""
#: src/gui/palette.cpp:114
msgid "Shirts"
@@ -908,9 +891,8 @@ msgid "2 Handed Weapons"
msgstr ""
#: src/gui/palette.cpp:119
-#, fuzzy
msgid "Shields"
-msgstr "Habilidades"
+msgstr ""
#: src/gui/palette.cpp:120
msgid "Rings"
@@ -1032,9 +1014,9 @@ msgid "@@cancel|Cancel@@"
msgstr "@@cancel|Cancelar@@"
#: src/gui/popupmenu.cpp:157
-#, fuzzy, c-format
+#, c-format
msgid "@@pickup|Pick up %s@@"
-msgstr "@@pickup|Recoger %s@@"
+msgstr ""
#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:373
msgid "@@chat|Add to chat@@"
@@ -1061,9 +1043,8 @@ msgid "@@split|Split@@"
msgstr "@@split|Dividir@@"
#: src/gui/popupmenu.cpp:364
-#, fuzzy
msgid "@@store|Store@@"
-msgstr "@@use|Usar@@"
+msgstr ""
#: src/gui/popupmenu.cpp:371
msgid "@@retrieve|Retrieve@@"
@@ -1297,26 +1278,22 @@ msgid "???"
msgstr ""
#: src/gui/setup_players.cpp:224
-msgid "Save player list"
-msgstr "guardar lista de jugdores"
-
-#: src/gui/setup_players.cpp:226
msgid "Allow trading"
msgstr "permitir comercio"
-#: src/gui/setup_players.cpp:228
+#: src/gui/setup_players.cpp:226
msgid "Allow whispers"
msgstr "permitir susurros"
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:230
msgid "Put all whispers in tabs"
msgstr ""
-#: src/gui/setup_players.cpp:234
+#: src/gui/setup_players.cpp:232
msgid "Players"
msgstr "Jugadores"
-#: src/gui/setup_players.cpp:259
+#: src/gui/setup_players.cpp:257
msgid "When ignoring:"
msgstr "cuando ignorando"
@@ -1325,170 +1302,158 @@ msgid "Tiny"
msgstr ""
#: src/gui/setup_video.cpp:113
-#, fuzzy
msgid "Small"
-msgstr "Vender"
+msgstr ""
#: src/gui/setup_video.cpp:114
-#, fuzzy
msgid "Medium"
-msgstr "Medio"
+msgstr ""
#: src/gui/setup_video.cpp:115
msgid "Large"
msgstr ""
-#: src/gui/setup_video.cpp:151
+#: src/gui/setup_video.cpp:141
+msgid "No text"
+msgstr ""
+
+#: src/gui/setup_video.cpp:143
+msgid "Bubbles, no names"
+msgstr ""
+
+#: src/gui/setup_video.cpp:144
+msgid "Bubbles with names"
+msgstr ""
+
+#: src/gui/setup_video.cpp:153
+msgid "off"
+msgstr "desactivado"
+
+#: src/gui/setup_video.cpp:154 src/gui/setup_video.cpp:164
+msgid "low"
+msgstr "bajo"
+
+#: src/gui/setup_video.cpp:155 src/gui/setup_video.cpp:166
+msgid "high"
+msgstr "alto"
+
+#: src/gui/setup_video.cpp:165
+msgid "medium"
+msgstr "Medio"
+
+#: src/gui/setup_video.cpp:167
+msgid "max"
+msgstr "max"
+
+#: src/gui/setup_video.cpp:187
msgid "Full screen"
msgstr "Pantalla completa"
-#: src/gui/setup_video.cpp:152
+#: src/gui/setup_video.cpp:188
msgid "OpenGL"
msgstr "OpenGL"
-#: src/gui/setup_video.cpp:153
+#: src/gui/setup_video.cpp:189
msgid "Custom cursor"
msgstr "Cursor propio"
-#: src/gui/setup_video.cpp:155
+#: src/gui/setup_video.cpp:191
msgid "Visible names"
msgstr ""
-#: src/gui/setup_video.cpp:157
+#: src/gui/setup_video.cpp:193
msgid "Particle effects"
msgstr ""
-#: src/gui/setup_video.cpp:159
+#: src/gui/setup_video.cpp:195
msgid "Show name"
msgstr ""
-#: src/gui/setup_video.cpp:160
+#: src/gui/setup_video.cpp:196
msgid "Show pickup notification"
msgstr ""
-#: src/gui/setup_video.cpp:161
+#: src/gui/setup_video.cpp:197
msgid "in chat"
msgstr ""
-#: src/gui/setup_video.cpp:162
+#: src/gui/setup_video.cpp:198
msgid "as particle"
msgstr ""
-#: src/gui/setup_video.cpp:167
+#: src/gui/setup_video.cpp:203
msgid "FPS Limit:"
msgstr "Límite de FPS:"
-#: src/gui/setup_video.cpp:184
+#: src/gui/setup_video.cpp:214
msgid "Video"
msgstr "Vídeo"
-#: src/gui/setup_video.cpp:189
+#: src/gui/setup_video.cpp:219
msgid "Overhead text"
msgstr ""
-#: src/gui/setup_video.cpp:190
+#: src/gui/setup_video.cpp:220
msgid "Gui opacity"
msgstr "Transparencia menus"
-#: src/gui/setup_video.cpp:191
-msgid "Scroll radius"
-msgstr "Ratio de scroll"
-
-#: src/gui/setup_video.cpp:192
-msgid "Scroll laziness"
-msgstr "Velocidad de scroll"
-
-#: src/gui/setup_video.cpp:193
+#: src/gui/setup_video.cpp:221
msgid "Ambient FX"
msgstr "Efectos ambientales"
-#: src/gui/setup_video.cpp:194
+#: src/gui/setup_video.cpp:222
msgid "Particle Detail"
msgstr "detalle particulas"
-#: src/gui/setup_video.cpp:195
+#: src/gui/setup_video.cpp:223
msgid "Font size"
msgstr ""
-#: src/gui/setup_video.cpp:265 src/gui/setup_video.cpp:564
-msgid "No text"
-msgstr ""
-
-#: src/gui/setup_video.cpp:271 src/gui/setup_video.cpp:570
-msgid "Bubbles, no names"
-msgstr ""
-
-#: src/gui/setup_video.cpp:274 src/gui/setup_video.cpp:573
-msgid "Bubbles with names"
-msgstr ""
-
-#: src/gui/setup_video.cpp:282 src/gui/setup_video.cpp:610
-msgid "off"
-msgstr "desactivado"
-
-#: src/gui/setup_video.cpp:285 src/gui/setup_video.cpp:296
-#: src/gui/setup_video.cpp:613 src/gui/setup_video.cpp:627
-msgid "low"
-msgstr "bajo"
-
-#: src/gui/setup_video.cpp:288 src/gui/setup_video.cpp:302
-#: src/gui/setup_video.cpp:616 src/gui/setup_video.cpp:633
-msgid "high"
-msgstr "alto"
-
-#: src/gui/setup_video.cpp:299 src/gui/setup_video.cpp:630
-msgid "medium"
-msgstr "Medio"
-
-#: src/gui/setup_video.cpp:305 src/gui/setup_video.cpp:636
-msgid "max"
-msgstr "max"
-
-#: src/gui/setup_video.cpp:410
+#: src/gui/setup_video.cpp:356
msgid "Failed to switch to "
msgstr ""
-#: src/gui/setup_video.cpp:411
+#: src/gui/setup_video.cpp:357
msgid "windowed"
msgstr ""
-#: src/gui/setup_video.cpp:411
+#: src/gui/setup_video.cpp:357
msgid "fullscreen"
msgstr ""
-#: src/gui/setup_video.cpp:412
+#: src/gui/setup_video.cpp:358
msgid "mode and restoration of old mode also failed!"
msgstr ""
-#: src/gui/setup_video.cpp:421
+#: src/gui/setup_video.cpp:367
msgid "Switching to full screen"
msgstr "Cambiar a pantalla completa"
-#: src/gui/setup_video.cpp:422
+#: src/gui/setup_video.cpp:368
msgid "Restart needed for changes to take effect."
msgstr "Se necesita reiniciar para aplicar los cambios."
-#: src/gui/setup_video.cpp:434
+#: src/gui/setup_video.cpp:380
msgid "Changing OpenGL"
msgstr "Cambiar a OpenGL"
-#: src/gui/setup_video.cpp:435
+#: src/gui/setup_video.cpp:381
msgid "Applying change to OpenGL requires restart."
msgstr "Se necesita reiniciar para aplicar los cambios hechos a OpenGL."
-#: src/gui/setup_video.cpp:520
+#: src/gui/setup_video.cpp:442
msgid "Screen resolution changed"
msgstr ""
-#: src/gui/setup_video.cpp:521
+#: src/gui/setup_video.cpp:443
msgid "Restart your client for the change to take effect."
msgstr ""
-#: src/gui/setup_video.cpp:545
+#: src/gui/setup_video.cpp:467
msgid "Particle effect settings changed."
msgstr ""
-#: src/gui/setup_video.cpp:546
+#: src/gui/setup_video.cpp:468
msgid "Changes will take effect on map change."
msgstr ""
@@ -1962,9 +1927,8 @@ msgid "Debug Window"
msgstr ""
#: src/keyboardconfig.cpp:80
-#, fuzzy
msgid "Party Window"
-msgstr "Reiniciar ventanas"
+msgstr ""
#: src/keyboardconfig.cpp:81
msgid "Emote Shortcut Window"
@@ -2012,55 +1976,55 @@ msgstr ""
msgid "Ignore input 2"
msgstr ""
-#: src/localplayer.cpp:834
+#: src/localplayer.cpp:837
msgid "Unarmed"
msgstr ""
-#: src/localplayer.cpp:835
+#: src/localplayer.cpp:838
msgid "Knife"
msgstr ""
-#: src/localplayer.cpp:836
+#: src/localplayer.cpp:839
msgid "Sword"
msgstr ""
-#: src/localplayer.cpp:837
+#: src/localplayer.cpp:840
msgid "Polearm"
msgstr ""
-#: src/localplayer.cpp:838
+#: src/localplayer.cpp:841
msgid "Staff"
msgstr ""
-#: src/localplayer.cpp:839
+#: src/localplayer.cpp:842
msgid "Whip"
msgstr ""
-#: src/localplayer.cpp:840
+#: src/localplayer.cpp:843
msgid "Bow"
msgstr ""
-#: src/localplayer.cpp:841
+#: src/localplayer.cpp:844
msgid "Shooting"
msgstr ""
-#: src/localplayer.cpp:842
+#: src/localplayer.cpp:845
msgid "Mace"
msgstr ""
-#: src/localplayer.cpp:843
+#: src/localplayer.cpp:846
msgid "Axe"
msgstr ""
-#: src/localplayer.cpp:844
+#: src/localplayer.cpp:847
msgid "Thrown"
msgstr ""
-#: src/localplayer.cpp:846
+#: src/localplayer.cpp:849
msgid "Craft"
msgstr ""
-#: src/localplayer.cpp:847
+#: src/localplayer.cpp:850
msgid "Unknown Skill"
msgstr ""
@@ -2105,9 +2069,8 @@ msgid " -D --default : Choose default character server and character"
msgstr ""
#: src/main.cpp:572
-#, fuzzy
msgid " -h --help : Display this help"
-msgstr "/help > Mostrar la ayuda"
+msgstr ""
#: src/main.cpp:573
msgid " -S --home-dir : Directory to use as home directory"
@@ -2273,193 +2236,193 @@ msgstr ""
msgid "Unable to unequip."
msgstr ""
-#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:82
-#, c-format
-msgid "Strength: %d"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:81
+#, fuzzy, c-format
+msgid "Strength %+d"
+msgstr "Fuerza"
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:84
-#, c-format
-msgid "Agility: %d"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:82
+#, fuzzy, c-format
+msgid "Agility %+d"
+msgstr "agilidad2"
-#: src/net/ea/generalhandler.cpp:96 src/net/tmwserv/generalhandler.cpp:88
-#, c-format
-msgid "Vitality: %d"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:84
+#, fuzzy, c-format
+msgid "Vitality %+d"
+msgstr "vitalidad"
-#: src/net/ea/generalhandler.cpp:98 src/net/tmwserv/generalhandler.cpp:90
-#, c-format
-msgid "Intelligence: %d"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:85
+#, fuzzy, c-format
+msgid "Intelligence %+d"
+msgstr "inteligencia"
-#: src/net/ea/generalhandler.cpp:100 src/net/tmwserv/generalhandler.cpp:86
-#, c-format
-msgid "Dexterity: %d"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:83
+#, fuzzy, c-format
+msgid "Dexterity %+d"
+msgstr "Destreza"
-#: src/net/ea/generalhandler.cpp:102
-#, c-format
-msgid "Luck: %d"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:96
+#, fuzzy, c-format
+msgid "Luck %+d"
+msgstr "Suerte"
-#: src/net/ea/generalhandler.cpp:125
+#: src/net/ea/generalhandler.cpp:118
msgid "Authentication failed"
msgstr ""
-#: src/net/ea/generalhandler.cpp:128
+#: src/net/ea/generalhandler.cpp:121
msgid "No servers available"
msgstr ""
-#: src/net/ea/generalhandler.cpp:132
+#: src/net/ea/generalhandler.cpp:125
msgid "Someone else is trying to use this account"
msgstr ""
-#: src/net/ea/generalhandler.cpp:135
+#: src/net/ea/generalhandler.cpp:128
msgid "This account is already logged in"
msgstr ""
-#: src/net/ea/generalhandler.cpp:138
+#: src/net/ea/generalhandler.cpp:131
msgid "Speed hack detected"
msgstr ""
-#: src/net/ea/generalhandler.cpp:141
+#: src/net/ea/generalhandler.cpp:134
msgid "Duplicated login"
msgstr ""
-#: src/net/ea/generalhandler.cpp:144
+#: src/net/ea/generalhandler.cpp:137
msgid "Unknown connection error"
msgstr ""
-#: src/net/ea/generalhandler.cpp:201
+#: src/net/ea/generalhandler.cpp:194
msgid "Got disconnected from server!"
msgstr "fuiste desconectado del servidor!!"
-#: src/net/ea/gui/partytab.cpp:52
+#: src/net/ea/gui/partytab.cpp:55
msgid "/help > Display this help."
msgstr "/help > Mostrar la ayuda"
-#: src/net/ea/gui/partytab.cpp:53
+#: src/net/ea/gui/partytab.cpp:56
msgid "/create > Create a new party"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:54
+#: src/net/ea/gui/partytab.cpp:57
msgid "/new > Alias of create"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:55
+#: src/net/ea/gui/partytab.cpp:58
msgid "/invite > Invite a player to your party"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:56
+#: src/net/ea/gui/partytab.cpp:59
msgid "/leave > Leave the party you are in"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:57
+#: src/net/ea/gui/partytab.cpp:60
msgid "/kick > Kick some one from the party you are in"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:58
+#: src/net/ea/gui/partytab.cpp:61
msgid "/item > Show/change party item sharing options"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:59
+#: src/net/ea/gui/partytab.cpp:62
msgid "/exp > Show/change party experience sharing options"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:68
+#: src/net/ea/gui/partytab.cpp:71
msgid "Command: /new <party-name>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:69
+#: src/net/ea/gui/partytab.cpp:72
msgid "Command: /create <party-name>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:70
+#: src/net/ea/gui/partytab.cpp:73
msgid "These commands create a new party called <party-name>."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:74
+#: src/net/ea/gui/partytab.cpp:77
msgid "Command: /invite <nick>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:81
+#: src/net/ea/gui/partytab.cpp:84
msgid "Command: /leave"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:82
+#: src/net/ea/gui/partytab.cpp:85
msgid "This command causes the player to leave the party."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/ea/gui/partytab.cpp:89
msgid "Command: /item <policy>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:87
+#: src/net/ea/gui/partytab.cpp:90
msgid "This command changes the party's item sharing policy."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:88
+#: src/net/ea/gui/partytab.cpp:91
msgid ""
"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
"\"0\", \"no\", \"false\" to disable item sharing."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:94
msgid "Command: /item"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:92
+#: src/net/ea/gui/partytab.cpp:95
msgid "This command displays the party's current item sharing policy."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:96
+#: src/net/ea/gui/partytab.cpp:99
msgid "Command: /exp <policy>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/ea/gui/partytab.cpp:100
msgid "This command changes the party's experience sharing policy."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:98
+#: src/net/ea/gui/partytab.cpp:101
msgid ""
"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:104
msgid "Command: /exp"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:102
+#: src/net/ea/gui/partytab.cpp:105
msgid "This command displays the party's current experience sharing policy."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:110
+#: src/net/ea/gui/partytab.cpp:113
msgid "Party name is missing."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:133 src/net/ea/partyhandler.cpp:191
+#: src/net/ea/gui/partytab.cpp:136 src/net/ea/partyhandler.cpp:194
msgid "Item sharing enabled."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:136 src/net/ea/partyhandler.cpp:197
+#: src/net/ea/gui/partytab.cpp:139 src/net/ea/partyhandler.cpp:200
msgid "Item sharing disabled."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:139 src/net/ea/partyhandler.cpp:203
+#: src/net/ea/gui/partytab.cpp:142 src/net/ea/partyhandler.cpp:206
msgid "Item sharing not possible."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:165 src/net/ea/partyhandler.cpp:168
+#: src/net/ea/gui/partytab.cpp:168 src/net/ea/partyhandler.cpp:171
msgid "Experience sharing enabled."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:168 src/net/ea/partyhandler.cpp:174
+#: src/net/ea/gui/partytab.cpp:171 src/net/ea/partyhandler.cpp:177
msgid "Experience sharing disabled."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:171 src/net/ea/partyhandler.cpp:180
+#: src/net/ea/gui/partytab.cpp:174 src/net/ea/partyhandler.cpp:183
msgid "Experience sharing not possible."
msgstr ""
@@ -2522,45 +2485,45 @@ msgstr ""
msgid "Party successfully created."
msgstr ""
-#: src/net/ea/partyhandler.cpp:115
+#: src/net/ea/partyhandler.cpp:118
#, c-format
msgid "%s is already a member of a party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:119
+#: src/net/ea/partyhandler.cpp:122
#, c-format
msgid "%s refused your invitation."
msgstr ""
-#: src/net/ea/partyhandler.cpp:123
+#: src/net/ea/partyhandler.cpp:126
#, c-format
msgid "%s is now a member of your party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:127
+#: src/net/ea/partyhandler.cpp:130
#, c-format
msgid "Unknown invite response for %s."
msgstr ""
-#: src/net/ea/partyhandler.cpp:232
+#: src/net/ea/partyhandler.cpp:235
msgid "You have left the party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:235
+#: src/net/ea/partyhandler.cpp:239
#, c-format
msgid "%s has left your party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:272
+#: src/net/ea/partyhandler.cpp:274
#, c-format
msgid "An unknown member tried to say: %s"
msgstr ""
-#: src/net/ea/partyhandler.cpp:298
+#: src/net/ea/partyhandler.cpp:300
msgid "Inviting like this isn't supported at the moment."
msgstr ""
-#: src/net/ea/partyhandler.cpp:327
+#: src/net/ea/partyhandler.cpp:329
#, c-format
msgid "%s is not in your party!"
msgstr ""
@@ -2853,10 +2816,10 @@ msgstr "Fuerza de voluntad:"
msgid "Topic: "
msgstr ""
-#: src/net/tmwserv/generalhandler.cpp:92
-#, c-format
-msgid "Willpower: %d"
-msgstr ""
+#: src/net/tmwserv/generalhandler.cpp:86
+#, fuzzy, c-format
+msgid "Willpower %+d"
+msgstr "Fuerza de voluntad:"
#: src/net/tmwserv/loginhandler.cpp:80
msgid "Wrong magic_token"
@@ -2953,3 +2916,12 @@ msgstr ""
#: src/resources/npcdb.cpp:53
msgid "NPC Database: Error while loading npcs.xml!"
msgstr ""
+
+#~ msgid "Save player list"
+#~ msgstr "guardar lista de jugdores"
+
+#~ msgid "Scroll radius"
+#~ msgstr "Ratio de scroll"
+
+#~ msgid "Scroll laziness"
+#~ msgstr "Velocidad de scroll"
diff --git a/po/fi.po b/po/fi.po
index a41e35f9..c0b0e5b0 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: tmw\n"
"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-05-10 16:39+0200\n"
+"POT-Creation-Date: 2009-05-12 00:11+0200\n"
"PO-Revision-Date: 2009-04-21 16:37+0000\n"
"Last-Translator: ville-v <villev90@gmail.com>\n"
"Language-Team: Finnish <fi@li.org>\n"
@@ -175,7 +175,7 @@ msgstr ""
#: src/commandhandler.cpp:216 src/commandhandler.cpp:230
#: src/gui/widgets/channeltab.cpp:81 src/gui/widgets/channeltab.cpp:90
-#: src/net/ea/gui/partytab.cpp:76
+#: src/net/ea/gui/partytab.cpp:79
msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
msgstr ""
@@ -195,7 +195,7 @@ msgstr ""
msgid "Command: /party <nick>"
msgstr ""
-#: src/commandhandler.cpp:229 src/net/ea/gui/partytab.cpp:75
+#: src/commandhandler.cpp:229 src/net/ea/gui/partytab.cpp:78
msgid "This command invites <nick> to party with you."
msgstr ""
@@ -508,7 +508,7 @@ msgstr "Ok"
msgid "Previous"
msgstr "Edellinen"
-#: src/gui/charselectdialog.cpp:113 src/gui/npcdialog.cpp:44
+#: src/gui/charselectdialog.cpp:113 src/gui/npcdialog.cpp:43
msgid "Next"
msgstr "Seuraava"
@@ -533,7 +533,7 @@ msgstr "Uusi"
#: src/gui/charselectdialog.cpp:118 src/gui/charselectdialog.cpp:165
#: src/gui/charselectdialog.cpp:166 src/gui/charselectdialog.cpp:315
-#: src/gui/setup_players.cpp:230
+#: src/gui/setup_players.cpp:228
msgid "Delete"
msgstr "Poista"
@@ -568,19 +568,15 @@ msgstr ""
msgid "%d players are present."
msgstr ""
-#: src/gui/chat.cpp:348 src/gui/chat.cpp:354
+#: src/gui/chat.cpp:333
msgid "Present: "
msgstr ""
-#: src/gui/chat.cpp:348 src/gui/chat.cpp:354
-msgid "; "
-msgstr ""
-
-#: src/gui/chat.cpp:349
+#: src/gui/chat.cpp:350
msgid "Attendance written to record log."
msgstr ""
-#: src/gui/chat.cpp:474
+#: src/gui/chat.cpp:475
#, c-format
msgid "Whispering to %s: %s"
msgstr ""
@@ -630,7 +626,7 @@ msgstr ""
msgid "Help"
msgstr ""
-#: src/gui/help.cpp:47 src/gui/npcdialog.cpp:45 src/gui/storagewindow.cpp:68
+#: src/gui/help.cpp:47 src/gui/npcdialog.cpp:44 src/gui/storagewindow.cpp:68
msgid "Close"
msgstr ""
@@ -723,7 +719,7 @@ msgid "Register"
msgstr "Rekisteröidy"
#: src/gui/magic.cpp:32 src/gui/skilldialog.cpp:117 src/gui/windowmenu.cpp:64
-#: src/localplayer.cpp:845
+#: src/localplayer.cpp:848
msgid "Magic"
msgstr ""
@@ -739,33 +735,25 @@ msgstr ""
msgid "Cast Test Spell 3"
msgstr ""
-#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
+#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:86
#, fuzzy
msgid "Map"
msgstr "Apukartta"
-#: src/gui/npcdialog.cpp:43
+#: src/gui/npcdialog.cpp:42
msgid "Waiting for server"
msgstr ""
-#: src/gui/npcdialog.cpp:46
+#: src/gui/npcdialog.cpp:45
#, fuzzy
msgid "Submit"
msgstr "Sulje"
-#: src/gui/npcdialog.cpp:49 src/gui/npcpostdialog.cpp:39
+#: src/gui/npcdialog.cpp:48 src/gui/npcpostdialog.cpp:39
msgid "NPC"
msgstr "Epäpelattava hahmo"
-#: src/gui/npcdialog.cpp:95
-msgid "+"
-msgstr ""
-
-#: src/gui/npcdialog.cpp:96
-msgid "-"
-msgstr ""
-
-#: src/gui/npcdialog.cpp:105
+#: src/gui/npcdialog.cpp:104
msgid "Reset"
msgstr ""
@@ -773,8 +761,7 @@ msgstr ""
msgid "Send"
msgstr ""
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:268
-#: src/gui/setup_video.cpp:567
+#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:142
msgid "Text"
msgstr ""
@@ -826,8 +813,8 @@ msgstr ""
msgid "Is"
msgstr ""
-#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:33
-#: src/net/ea/gui/partytab.cpp:37
+#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:45
+#: src/net/ea/gui/partytab.cpp:39
msgid "Party"
msgstr ""
@@ -1295,26 +1282,22 @@ msgid "???"
msgstr ""
#: src/gui/setup_players.cpp:224
-msgid "Save player list"
-msgstr ""
-
-#: src/gui/setup_players.cpp:226
msgid "Allow trading"
msgstr ""
-#: src/gui/setup_players.cpp:228
+#: src/gui/setup_players.cpp:226
msgid "Allow whispers"
msgstr ""
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:230
msgid "Put all whispers in tabs"
msgstr ""
-#: src/gui/setup_players.cpp:234
+#: src/gui/setup_players.cpp:232
msgid "Players"
msgstr ""
-#: src/gui/setup_players.cpp:259
+#: src/gui/setup_players.cpp:257
msgid "When ignoring:"
msgstr ""
@@ -1335,157 +1318,147 @@ msgstr ""
msgid "Large"
msgstr ""
-#: src/gui/setup_video.cpp:151
+#: src/gui/setup_video.cpp:141
+msgid "No text"
+msgstr ""
+
+#: src/gui/setup_video.cpp:143
+msgid "Bubbles, no names"
+msgstr ""
+
+#: src/gui/setup_video.cpp:144
+msgid "Bubbles with names"
+msgstr ""
+
+#: src/gui/setup_video.cpp:153
+msgid "off"
+msgstr "pois päältä"
+
+#: src/gui/setup_video.cpp:154 src/gui/setup_video.cpp:164
+msgid "low"
+msgstr "matala"
+
+#: src/gui/setup_video.cpp:155 src/gui/setup_video.cpp:166
+msgid "high"
+msgstr "korkea"
+
+#: src/gui/setup_video.cpp:165
+msgid "medium"
+msgstr ""
+
+#: src/gui/setup_video.cpp:167
+msgid "max"
+msgstr ""
+
+#: src/gui/setup_video.cpp:187
msgid "Full screen"
msgstr "Kokoruututila"
-#: src/gui/setup_video.cpp:152
+#: src/gui/setup_video.cpp:188
msgid "OpenGL"
msgstr "OpenGL"
-#: src/gui/setup_video.cpp:153
+#: src/gui/setup_video.cpp:189
msgid "Custom cursor"
msgstr "Tyylitelty hiiren osoitin"
-#: src/gui/setup_video.cpp:155
+#: src/gui/setup_video.cpp:191
msgid "Visible names"
msgstr "Näytä nimet"
-#: src/gui/setup_video.cpp:157
+#: src/gui/setup_video.cpp:193
msgid "Particle effects"
msgstr ""
-#: src/gui/setup_video.cpp:159
+#: src/gui/setup_video.cpp:195
msgid "Show name"
msgstr ""
-#: src/gui/setup_video.cpp:160
+#: src/gui/setup_video.cpp:196
msgid "Show pickup notification"
msgstr ""
-#: src/gui/setup_video.cpp:161
+#: src/gui/setup_video.cpp:197
msgid "in chat"
msgstr ""
-#: src/gui/setup_video.cpp:162
+#: src/gui/setup_video.cpp:198
msgid "as particle"
msgstr ""
-#: src/gui/setup_video.cpp:167
+#: src/gui/setup_video.cpp:203
msgid "FPS Limit:"
msgstr "Piirtonopeusrajoitin (kuvaa / sekunti)"
-#: src/gui/setup_video.cpp:184
+#: src/gui/setup_video.cpp:214
msgid "Video"
msgstr "Kuva"
-#: src/gui/setup_video.cpp:189
+#: src/gui/setup_video.cpp:219
msgid "Overhead text"
msgstr ""
-#: src/gui/setup_video.cpp:190
+#: src/gui/setup_video.cpp:220
msgid "Gui opacity"
msgstr "Käyttöliittymän läpinäkyvyys"
-#: src/gui/setup_video.cpp:191
-msgid "Scroll radius"
-msgstr "Kameran perässälaahaus"
-
-#: src/gui/setup_video.cpp:192
-msgid "Scroll laziness"
-msgstr "Kameran perässälaahauksen tiukkuus"
-
-#: src/gui/setup_video.cpp:193
+#: src/gui/setup_video.cpp:221
msgid "Ambient FX"
msgstr "Taustaäänet"
-#: src/gui/setup_video.cpp:194
+#: src/gui/setup_video.cpp:222
msgid "Particle Detail"
msgstr ""
-#: src/gui/setup_video.cpp:195
+#: src/gui/setup_video.cpp:223
msgid "Font size"
msgstr ""
-#: src/gui/setup_video.cpp:265 src/gui/setup_video.cpp:564
-msgid "No text"
-msgstr ""
-
-#: src/gui/setup_video.cpp:271 src/gui/setup_video.cpp:570
-msgid "Bubbles, no names"
-msgstr ""
-
-#: src/gui/setup_video.cpp:274 src/gui/setup_video.cpp:573
-msgid "Bubbles with names"
-msgstr ""
-
-#: src/gui/setup_video.cpp:282 src/gui/setup_video.cpp:610
-msgid "off"
-msgstr "pois päältä"
-
-#: src/gui/setup_video.cpp:285 src/gui/setup_video.cpp:296
-#: src/gui/setup_video.cpp:613 src/gui/setup_video.cpp:627
-msgid "low"
-msgstr "matala"
-
-#: src/gui/setup_video.cpp:288 src/gui/setup_video.cpp:302
-#: src/gui/setup_video.cpp:616 src/gui/setup_video.cpp:633
-msgid "high"
-msgstr "korkea"
-
-#: src/gui/setup_video.cpp:299 src/gui/setup_video.cpp:630
-msgid "medium"
-msgstr ""
-
-#: src/gui/setup_video.cpp:305 src/gui/setup_video.cpp:636
-msgid "max"
-msgstr ""
-
-#: src/gui/setup_video.cpp:410
+#: src/gui/setup_video.cpp:356
msgid "Failed to switch to "
msgstr ""
-#: src/gui/setup_video.cpp:411
+#: src/gui/setup_video.cpp:357
msgid "windowed"
msgstr ""
-#: src/gui/setup_video.cpp:411
+#: src/gui/setup_video.cpp:357
msgid "fullscreen"
msgstr ""
-#: src/gui/setup_video.cpp:412
+#: src/gui/setup_video.cpp:358
msgid "mode and restoration of old mode also failed!"
msgstr ""
-#: src/gui/setup_video.cpp:421
+#: src/gui/setup_video.cpp:367
msgid "Switching to full screen"
msgstr "Kokoruututilaan siirtyminen"
-#: src/gui/setup_video.cpp:422
+#: src/gui/setup_video.cpp:368
msgid "Restart needed for changes to take effect."
msgstr "Ohjelma pitää käynnistää uudelleen, jotta muutokset astuvat voimaan."
-#: src/gui/setup_video.cpp:434
+#: src/gui/setup_video.cpp:380
msgid "Changing OpenGL"
msgstr "Vaihdetaan OpenGL -toimintatilaan"
-#: src/gui/setup_video.cpp:435
+#: src/gui/setup_video.cpp:381
msgid "Applying change to OpenGL requires restart."
msgstr "OpenGL -asetusten muutokset vaativat ohjelman uudelleenkäynnistyksen"
-#: src/gui/setup_video.cpp:520
+#: src/gui/setup_video.cpp:442
msgid "Screen resolution changed"
msgstr ""
-#: src/gui/setup_video.cpp:521
+#: src/gui/setup_video.cpp:443
msgid "Restart your client for the change to take effect."
msgstr ""
-#: src/gui/setup_video.cpp:545
+#: src/gui/setup_video.cpp:467
msgid "Particle effect settings changed."
msgstr ""
-#: src/gui/setup_video.cpp:546
+#: src/gui/setup_video.cpp:468
msgid "Changes will take effect on map change."
msgstr ""
@@ -2007,55 +1980,55 @@ msgstr ""
msgid "Ignore input 2"
msgstr ""
-#: src/localplayer.cpp:834
+#: src/localplayer.cpp:837
msgid "Unarmed"
msgstr ""
-#: src/localplayer.cpp:835
+#: src/localplayer.cpp:838
msgid "Knife"
msgstr ""
-#: src/localplayer.cpp:836
+#: src/localplayer.cpp:839
msgid "Sword"
msgstr ""
-#: src/localplayer.cpp:837
+#: src/localplayer.cpp:840
msgid "Polearm"
msgstr ""
-#: src/localplayer.cpp:838
+#: src/localplayer.cpp:841
msgid "Staff"
msgstr ""
-#: src/localplayer.cpp:839
+#: src/localplayer.cpp:842
msgid "Whip"
msgstr ""
-#: src/localplayer.cpp:840
+#: src/localplayer.cpp:843
msgid "Bow"
msgstr ""
-#: src/localplayer.cpp:841
+#: src/localplayer.cpp:844
msgid "Shooting"
msgstr ""
-#: src/localplayer.cpp:842
+#: src/localplayer.cpp:845
msgid "Mace"
msgstr ""
-#: src/localplayer.cpp:843
+#: src/localplayer.cpp:846
msgid "Axe"
msgstr ""
-#: src/localplayer.cpp:844
+#: src/localplayer.cpp:847
msgid "Thrown"
msgstr ""
-#: src/localplayer.cpp:846
+#: src/localplayer.cpp:849
msgid "Craft"
msgstr ""
-#: src/localplayer.cpp:847
+#: src/localplayer.cpp:850
msgid "Unknown Skill"
msgstr ""
@@ -2267,193 +2240,193 @@ msgstr ""
msgid "Unable to unequip."
msgstr ""
-#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:82
-#, c-format
-msgid "Strength: %d"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:81
+#, fuzzy, c-format
+msgid "Strength %+d"
+msgstr "Voima:"
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:84
-#, c-format
-msgid "Agility: %d"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:82
+#, fuzzy, c-format
+msgid "Agility %+d"
+msgstr "Ketteryys:"
-#: src/net/ea/generalhandler.cpp:96 src/net/tmwserv/generalhandler.cpp:88
-#, c-format
-msgid "Vitality: %d"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:84
+#, fuzzy, c-format
+msgid "Vitality %+d"
+msgstr "Elinvoima:"
-#: src/net/ea/generalhandler.cpp:98 src/net/tmwserv/generalhandler.cpp:90
-#, c-format
-msgid "Intelligence: %d"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:85
+#, fuzzy, c-format
+msgid "Intelligence %+d"
+msgstr "Älykkyys:"
-#: src/net/ea/generalhandler.cpp:100 src/net/tmwserv/generalhandler.cpp:86
-#, c-format
-msgid "Dexterity: %d"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:83
+#, fuzzy, c-format
+msgid "Dexterity %+d"
+msgstr "Näppäryys:"
-#: src/net/ea/generalhandler.cpp:102
-#, c-format
-msgid "Luck: %d"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:96
+#, fuzzy, c-format
+msgid "Luck %+d"
+msgstr "Hyökkäys %+d"
-#: src/net/ea/generalhandler.cpp:125
+#: src/net/ea/generalhandler.cpp:118
msgid "Authentication failed"
msgstr ""
-#: src/net/ea/generalhandler.cpp:128
+#: src/net/ea/generalhandler.cpp:121
msgid "No servers available"
msgstr ""
-#: src/net/ea/generalhandler.cpp:132
+#: src/net/ea/generalhandler.cpp:125
msgid "Someone else is trying to use this account"
msgstr ""
-#: src/net/ea/generalhandler.cpp:135
+#: src/net/ea/generalhandler.cpp:128
msgid "This account is already logged in"
msgstr ""
-#: src/net/ea/generalhandler.cpp:138
+#: src/net/ea/generalhandler.cpp:131
msgid "Speed hack detected"
msgstr ""
-#: src/net/ea/generalhandler.cpp:141
+#: src/net/ea/generalhandler.cpp:134
msgid "Duplicated login"
msgstr ""
-#: src/net/ea/generalhandler.cpp:144
+#: src/net/ea/generalhandler.cpp:137
msgid "Unknown connection error"
msgstr ""
-#: src/net/ea/generalhandler.cpp:201
+#: src/net/ea/generalhandler.cpp:194
msgid "Got disconnected from server!"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:52
+#: src/net/ea/gui/partytab.cpp:55
msgid "/help > Display this help."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:53
+#: src/net/ea/gui/partytab.cpp:56
msgid "/create > Create a new party"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:54
+#: src/net/ea/gui/partytab.cpp:57
msgid "/new > Alias of create"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:55
+#: src/net/ea/gui/partytab.cpp:58
msgid "/invite > Invite a player to your party"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:56
+#: src/net/ea/gui/partytab.cpp:59
msgid "/leave > Leave the party you are in"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:57
+#: src/net/ea/gui/partytab.cpp:60
msgid "/kick > Kick some one from the party you are in"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:58
+#: src/net/ea/gui/partytab.cpp:61
msgid "/item > Show/change party item sharing options"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:59
+#: src/net/ea/gui/partytab.cpp:62
msgid "/exp > Show/change party experience sharing options"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:68
+#: src/net/ea/gui/partytab.cpp:71
msgid "Command: /new <party-name>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:69
+#: src/net/ea/gui/partytab.cpp:72
msgid "Command: /create <party-name>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:70
+#: src/net/ea/gui/partytab.cpp:73
msgid "These commands create a new party called <party-name>."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:74
+#: src/net/ea/gui/partytab.cpp:77
msgid "Command: /invite <nick>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:81
+#: src/net/ea/gui/partytab.cpp:84
msgid "Command: /leave"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:82
+#: src/net/ea/gui/partytab.cpp:85
msgid "This command causes the player to leave the party."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/ea/gui/partytab.cpp:89
msgid "Command: /item <policy>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:87
+#: src/net/ea/gui/partytab.cpp:90
msgid "This command changes the party's item sharing policy."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:88
+#: src/net/ea/gui/partytab.cpp:91
msgid ""
"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
"\"0\", \"no\", \"false\" to disable item sharing."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:94
msgid "Command: /item"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:92
+#: src/net/ea/gui/partytab.cpp:95
msgid "This command displays the party's current item sharing policy."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:96
+#: src/net/ea/gui/partytab.cpp:99
msgid "Command: /exp <policy>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/ea/gui/partytab.cpp:100
msgid "This command changes the party's experience sharing policy."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:98
+#: src/net/ea/gui/partytab.cpp:101
msgid ""
"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:104
msgid "Command: /exp"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:102
+#: src/net/ea/gui/partytab.cpp:105
msgid "This command displays the party's current experience sharing policy."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:110
+#: src/net/ea/gui/partytab.cpp:113
msgid "Party name is missing."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:133 src/net/ea/partyhandler.cpp:191
+#: src/net/ea/gui/partytab.cpp:136 src/net/ea/partyhandler.cpp:194
msgid "Item sharing enabled."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:136 src/net/ea/partyhandler.cpp:197
+#: src/net/ea/gui/partytab.cpp:139 src/net/ea/partyhandler.cpp:200
msgid "Item sharing disabled."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:139 src/net/ea/partyhandler.cpp:203
+#: src/net/ea/gui/partytab.cpp:142 src/net/ea/partyhandler.cpp:206
msgid "Item sharing not possible."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:165 src/net/ea/partyhandler.cpp:168
+#: src/net/ea/gui/partytab.cpp:168 src/net/ea/partyhandler.cpp:171
msgid "Experience sharing enabled."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:168 src/net/ea/partyhandler.cpp:174
+#: src/net/ea/gui/partytab.cpp:171 src/net/ea/partyhandler.cpp:177
msgid "Experience sharing disabled."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:171 src/net/ea/partyhandler.cpp:180
+#: src/net/ea/gui/partytab.cpp:174 src/net/ea/partyhandler.cpp:183
msgid "Experience sharing not possible."
msgstr ""
@@ -2516,45 +2489,45 @@ msgstr ""
msgid "Party successfully created."
msgstr ""
-#: src/net/ea/partyhandler.cpp:115
+#: src/net/ea/partyhandler.cpp:118
#, c-format
msgid "%s is already a member of a party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:119
+#: src/net/ea/partyhandler.cpp:122
#, c-format
msgid "%s refused your invitation."
msgstr ""
-#: src/net/ea/partyhandler.cpp:123
+#: src/net/ea/partyhandler.cpp:126
#, c-format
msgid "%s is now a member of your party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:127
+#: src/net/ea/partyhandler.cpp:130
#, c-format
msgid "Unknown invite response for %s."
msgstr ""
-#: src/net/ea/partyhandler.cpp:232
+#: src/net/ea/partyhandler.cpp:235
msgid "You have left the party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:235
+#: src/net/ea/partyhandler.cpp:239
#, c-format
msgid "%s has left your party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:272
+#: src/net/ea/partyhandler.cpp:274
#, c-format
msgid "An unknown member tried to say: %s"
msgstr ""
-#: src/net/ea/partyhandler.cpp:298
+#: src/net/ea/partyhandler.cpp:300
msgid "Inviting like this isn't supported at the moment."
msgstr ""
-#: src/net/ea/partyhandler.cpp:327
+#: src/net/ea/partyhandler.cpp:329
#, c-format
msgid "%s is not in your party!"
msgstr ""
@@ -2847,10 +2820,10 @@ msgstr "Tahdonvoima:"
msgid "Topic: "
msgstr ""
-#: src/net/tmwserv/generalhandler.cpp:92
-#, c-format
-msgid "Willpower: %d"
-msgstr ""
+#: src/net/tmwserv/generalhandler.cpp:86
+#, fuzzy, c-format
+msgid "Willpower %+d"
+msgstr "Tahdonvoima:"
#: src/net/tmwserv/loginhandler.cpp:80
msgid "Wrong magic_token"
@@ -2947,3 +2920,9 @@ msgstr ""
#: src/resources/npcdb.cpp:53
msgid "NPC Database: Error while loading npcs.xml!"
msgstr ""
+
+#~ msgid "Scroll radius"
+#~ msgstr "Kameran perässälaahaus"
+
+#~ msgid "Scroll laziness"
+#~ msgstr "Kameran perässälaahauksen tiukkuus"
diff --git a/po/fr.po b/po/fr.po
index 64f37b3b..2a2d06b7 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,14 +8,14 @@ msgid ""
msgstr ""
"Project-Id-Version: The Mana World 0.1.0\n"
"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-05-10 16:39+0200\n"
-"PO-Revision-Date: 2009-05-10 12:10+0000\n"
+"POT-Creation-Date: 2009-05-12 00:11+0200\n"
+"PO-Revision-Date: 2009-05-10 20:26+0000\n"
"Last-Translator: Jumpy <Unknown>\n"
"Language-Team: French\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-05-10 13:48+0000\n"
+"X-Launchpad-Export-Date: 2009-05-11 21:56+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#: src/commandhandler.cpp:141
@@ -23,43 +23,42 @@ msgid "-- Help --"
msgstr "-- Aide --"
#: src/commandhandler.cpp:142
-#, fuzzy
msgid "/help > Display this help"
-msgstr "/help > Affiche cette aide."
+msgstr "/help > Montre l'aide"
#: src/commandhandler.cpp:144
msgid "/where > Display map name"
-msgstr "/where > Affiche le nom de la carte."
+msgstr "/where > Affiche le nom de la carte"
#: src/commandhandler.cpp:145
msgid "/who > Display number of online users"
-msgstr "/who > Affiche le nombre d'utilisateurs en ligne."
+msgstr "/who > Affiche le nombre d'utilisateurs en ligne"
#: src/commandhandler.cpp:146
msgid "/me > Tell something about yourself"
-msgstr "/me > Dire quelque chose à votre propos."
+msgstr "/me > Dire quelque chose à votre propos"
#: src/commandhandler.cpp:148
msgid "/clear > Clears this window"
-msgstr "/clear > Vide cette fenêtre."
+msgstr "/clear > Vide cette fenêtre"
#: src/commandhandler.cpp:150
msgid "/msg > Send a private message to a user"
-msgstr "/msg > Envoie un message privé à un utilisateur."
+msgstr "/msg > Envoie un message privé à un utilisateur"
#: src/commandhandler.cpp:151
msgid "/whisper > Alias of msg"
-msgstr "/whisper > Alias de msg."
+msgstr "/whisper > Alias de msg"
#: src/commandhandler.cpp:152
msgid "/w > Alias of msg"
-msgstr "/w > Alias de msg."
+msgstr "/w > Alias de msg"
#: src/commandhandler.cpp:153
msgid "/query > Makes a tab for private messages with another user"
msgstr ""
"/query > Créé un nouvel onglet pour vos messages privés avec un autre "
-"utilisateur."
+"utilisateur"
#: src/commandhandler.cpp:154
msgid "/q > Alias of query"
@@ -71,11 +70,11 @@ msgstr "/list > Affiche une liste de tous les salons publics"
#: src/commandhandler.cpp:157
msgid "/join > Join or create a channel"
-msgstr "/join > Rejoint ou crée un salon"
+msgstr "/join > Rejoindre ou créer un salon."
#: src/commandhandler.cpp:159
msgid "/party > Invite a user to party"
-msgstr "/party Invite un utilisateur dans un groupe"
+msgstr "/party > Invite un utilisateur dans un groupe"
#: src/commandhandler.cpp:161
msgid "/record > Start recording the chat to an external file"
@@ -99,27 +98,27 @@ msgstr "/announce > Annonce globale (MJ uniquement)"
#: src/commandhandler.cpp:169
msgid "For more information, type /help <command>"
-msgstr "Pour plus d'information sur une commande, tapez /help <commande>"
+msgstr "Pour plus d'informations sur une commande, tapez /help <commande>"
#: src/commandhandler.cpp:173
msgid "Command: /help"
-msgstr "Commande: /help"
+msgstr "Commande : /help"
#: src/commandhandler.cpp:174
msgid "This command displays a list of all commands available."
-msgstr "Cette commande affiche une liste de toutes les commandes disponibles"
+msgstr "Cette commande affiche une liste de toutes les commandes disponibles."
#: src/commandhandler.cpp:175
msgid "Command: /help <command>"
-msgstr "Commande: /help <commande>"
+msgstr "Commande : /help <commande>"
#: src/commandhandler.cpp:176
msgid "This command displays help on <command>."
-msgstr "Cette commande affiche une aide sur la commande concernée"
+msgstr "Cette commande affiche une aide sur la commande <command>."
#: src/commandhandler.cpp:184
msgid "Command: /announce <msg>"
-msgstr "Commande: /announce <msg>"
+msgstr "Commande : /announce <msg>"
#: src/commandhandler.cpp:185
msgid "*** only available to a GM ***"
@@ -127,37 +126,37 @@ msgstr "*** uniquement disponible pour les MJ ***"
#: src/commandhandler.cpp:186
msgid "This command sends the message <msg> to all players currently online."
-msgstr "Cette commande envoie le message <msg> à tous les joueurs en ligne"
+msgstr "Cette commande envoie le message <msg> à tous les joueurs en ligne."
#: src/commandhandler.cpp:191
msgid "Command: /clear"
-msgstr "Commande: /clear"
+msgstr "Commande : /clear"
#: src/commandhandler.cpp:192
msgid "This command clears the chat log of previous chat."
msgstr ""
-"Cette commande vide l'historique de conversation de la précédente "
-"conversation"
+"Cette commande vide l'historique de conversation de la conversation "
+"précédente."
#: src/commandhandler.cpp:196
msgid "Command: /join <channel>"
-msgstr "Commande: /join <salon>"
+msgstr "Commande : /join <channel>"
#: src/commandhandler.cpp:197
msgid "This command makes you enter <channel>."
-msgstr "Cette commande vous fait rentrer dans le salon <salon>"
+msgstr "Cette commande vous fait rentrer dans le salon <channel>."
#: src/commandhandler.cpp:198
msgid "If <channel> doesn't exist, it's created."
-msgstr "Si <salon> n'existe pas, il sera créé"
+msgstr "Si <channel> n'existe pas, il sera créé."
#: src/commandhandler.cpp:202
msgid "Command: /list"
-msgstr "Commande: /list"
+msgstr "Commande : /list"
#: src/commandhandler.cpp:203
msgid "This command shows a list of all channels."
-msgstr "Cette commande affiche une liste de tous les salons publics"
+msgstr "Cette commande affiche une liste de tous les salons publics."
#: src/commandhandler.cpp:207
msgid "Command: /me <message>"
@@ -165,31 +164,31 @@ msgstr "Commande : /me <message>"
#: src/commandhandler.cpp:208
msgid "This command tell others you are (doing) <msg>."
-msgstr "Cette commande informe les autres joueurs que vous faites <message>"
+msgstr "Cette commande informe les autres joueurs que vous faites <msg>."
#: src/commandhandler.cpp:212
msgid "Command: /msg <nick> <message>"
-msgstr "Commande : /msg <pseudo> <message>"
+msgstr "Commande : /msg <nick> <message>"
#: src/commandhandler.cpp:213
msgid "Command: /whisper <nick> <message>"
-msgstr "Commande : /whisper <pseudo> <message>"
+msgstr "Commande : /whisper <nick> <message>"
#: src/commandhandler.cpp:214
msgid "Command: /w <nick> <message>"
-msgstr "Commande : /w <pseudo> <message>"
+msgstr "Commande : /w <nick> <message>"
#: src/commandhandler.cpp:215
msgid "This command sends the text <message> to <nick>."
-msgstr "Cette commande envoie le texte <message> au joueur <pseudo>"
+msgstr "Cette commande envoie le texte <message> au joueur <nick>"
#: src/commandhandler.cpp:216 src/commandhandler.cpp:230
#: src/gui/widgets/channeltab.cpp:81 src/gui/widgets/channeltab.cpp:90
-#: src/net/ea/gui/partytab.cpp:76
+#: src/net/ea/gui/partytab.cpp:79
msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
msgstr ""
-"Si le <pseudo> contient des espaces, entourez le de guillemets (exemple : "
-"\"pseu do\")"
+"Si le <nick> contient des espaces, entourez le de guillemets (exemple : \"ni "
+"ck\")."
#: src/commandhandler.cpp:221
msgid "Command: /query <nick>"
@@ -202,15 +201,15 @@ msgstr "Commande : /q <nick>"
#: src/commandhandler.cpp:223
msgid "This command tries to make a tab for whispers betweenyou and <nick>."
msgstr ""
-"Cette commande essaye de créer une fenêtre de dialogue entre vous et <pseudo>"
+"Cette commande essaye de créer une fenêtre de dialogue entre vous et <nick>"
#: src/commandhandler.cpp:228
msgid "Command: /party <nick>"
-msgstr "Commande : /party <pseudo>"
+msgstr "Commande : /party <nick>"
-#: src/commandhandler.cpp:229 src/net/ea/gui/partytab.cpp:75
+#: src/commandhandler.cpp:229 src/net/ea/gui/partytab.cpp:78
msgid "This command invites <nick> to party with you."
-msgstr "Cette commande invite <pseudo> à rejoindre votre groupe"
+msgstr "Cette commande invite <nick> à rejoindre votre groupe."
#: src/commandhandler.cpp:235
msgid "Command: /present"
@@ -222,18 +221,18 @@ msgid ""
"the record log if recording, or the chat log otherwise."
msgstr ""
"Cette commande récupère une liste de tous les joueurs présents et l'envoie "
-"dans le fichier d'enregistrement, si il est activé, ou dans l'enregistrement "
+"dans le fichier d'enregistrement s'il est activé, ou dans l'enregistrement "
"de la conversation."
#: src/commandhandler.cpp:242
msgid "Command: /record <filename>"
-msgstr "Commande : /record <fichier>"
+msgstr "Commande : /record <filename>"
#: src/commandhandler.cpp:243
msgid "This command starts recording the chat log to the file <filename>."
msgstr ""
"Cette commande active l'enregistrement de la conversation dans le fichier "
-"<fichier>"
+"<filename>."
#: src/commandhandler.cpp:245
msgid "Command: /record"
@@ -241,12 +240,11 @@ msgstr "Commande : /record"
#: src/commandhandler.cpp:246
msgid "This command finishes a recording session."
-msgstr ""
-"Cette commande termine une session d'enregistrement démarrée avec /record"
+msgstr "Cette commande termine une session d'enregistrement."
#: src/commandhandler.cpp:250
msgid "Command: /toggle <state>"
-msgstr "Command: /toggle <statut>"
+msgstr "Command: /toggle <state>"
#: src/commandhandler.cpp:251
msgid ""
@@ -254,15 +252,16 @@ msgid ""
"whether the chat log turns off automatically."
msgstr ""
"Cette commande définie si la touche entrée doit fermer le fichier "
-"d'enregistrement de la conversation ou si celui-ci se fermera automatiquement"
+"d'enregistrement de la conversation ou si celui-ci se fermera "
+"automatiquement."
#: src/commandhandler.cpp:253
msgid ""
"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
"\", \"no\", \"false\" to turn the toggle off."
msgstr ""
-"<state> peut être en position \"1\", \"oui\", \"vrai\" pour activer le "
-"bouton sur marche, ou \"0\", \"non\", \"faux\" pour désactiver le bouton."
+"<state> peut être en position \"1\", \"yes\", \"true\" pour activer le "
+"bouton sur marche, ou \"0\", \"no\", \"false\" pour désactiver le bouton."
#: src/commandhandler.cpp:256
msgid "Command: /toggle"
@@ -297,22 +296,21 @@ msgid "Type /help for a list of commands."
msgstr "Entrer /help pour obtenir une liste des commandes disponibles."
#: src/commandhandler.cpp:339
-#, fuzzy
msgid "Cannot send empty whispers!"
-msgstr "Impossible d'envoyer un message privé vide !"
+msgstr "Vous ne pouvez pas envoyer des messages privés vides !"
#: src/commandhandler.cpp:346
-#, fuzzy, c-format
+#, c-format
msgid ""
"Cannot create a whisper tab for nick '%s'! It either already exists, or is "
"you."
msgstr ""
-"Impossible de créer un onglet pour le pseudo '%s' ! Soit il existe déjà, "
-"soit c'est votre pseudo."
+"Vous ne pouvez pas créer une fenêtre de dialogue privée avec '%s' ! Elle "
+"existe déjà ou il s'agit de vous même."
#: src/commandhandler.cpp:392
msgid "Return toggles chat."
-msgstr ""
+msgstr "La touche enter ferme maintenant la ligne d'entrée du chat."
#: src/commandhandler.cpp:392
msgid "Message closes chat."
@@ -320,7 +318,7 @@ msgstr "Ce message ferme la conversation."
#: src/commandhandler.cpp:401
msgid "Return now toggles chat."
-msgstr ""
+msgstr "La touche enter ferme la ligne d'entrée de la conversation."
#: src/commandhandler.cpp:405
msgid "Message now closes chat."
@@ -370,11 +368,11 @@ msgstr "non"
#: src/game.cpp:794
msgid "Ignoring incoming trade requests"
-msgstr "Ignorer les requêtes d'échanges entrantes."
+msgstr "Ignorer les requêtes d'échanges entrantes"
#: src/game.cpp:801
msgid "Accepting incoming trade requests"
-msgstr "Accepter les requêtes d'échanges entrantes."
+msgstr "Accepter les requêtes d'échanges entrantes"
#: src/gui/buddywindow.cpp:35
msgid "Buddy"
@@ -442,7 +440,7 @@ msgstr "Compte : %s"
#: src/gui/changeemaildialog.cpp:49
msgid "Type New Email Address twice:"
-msgstr "Entrer la nouvelle adresse mail de nouveau :"
+msgstr "Entrer de nouveau la nouvelle adresse mail :"
#: src/gui/changepassworddialog.cpp:44 src/gui/changepassworddialog.cpp:55
#: src/gui/charselectdialog.cpp:120
@@ -456,7 +454,7 @@ msgstr "Mot de passe :"
#: src/gui/changepassworddialog.cpp:52
msgid "Type New Password twice:"
-msgstr "Entrer le nouveau mot de passe de nouveau :"
+msgstr "Entrer une nouvelle fois le nouveau mot de passe :"
#: src/gui/charcreatedialog.cpp:54
msgid "Create Character"
@@ -473,7 +471,7 @@ msgstr "Couleur des cheveux :"
#: src/gui/charcreatedialog.cpp:72
msgid "Hair Style:"
-msgstr "Coiffure :"
+msgstr "Coupe :"
#: src/gui/charcreatedialog.cpp:73
msgid "Create"
@@ -500,7 +498,7 @@ msgstr "Erreur"
#: src/gui/charcreatedialog.cpp:173
msgid "Your name needs to be at least 4 characters."
-msgstr "Votre nom doit comporter un minimum de 4 caractères"
+msgstr "Votre nom doit comporter un minimum de 4 caractères."
#: src/gui/charcreatedialog.cpp:226
msgid "Character stats OK"
@@ -537,7 +535,7 @@ msgstr "Ok"
msgid "Previous"
msgstr "Précédent"
-#: src/gui/charselectdialog.cpp:113 src/gui/npcdialog.cpp:44
+#: src/gui/charselectdialog.cpp:113 src/gui/npcdialog.cpp:43
msgid "Next"
msgstr "Suivant"
@@ -562,7 +560,7 @@ msgstr "Nouveau"
#: src/gui/charselectdialog.cpp:118 src/gui/charselectdialog.cpp:165
#: src/gui/charselectdialog.cpp:166 src/gui/charselectdialog.cpp:315
-#: src/gui/setup_players.cpp:230
+#: src/gui/setup_players.cpp:228
msgid "Delete"
msgstr "Supprimer"
@@ -590,29 +588,25 @@ msgstr "Argent : %s"
#: src/gui/chat.cpp:73 src/gui/palette.cpp:93
msgid "Chat"
-msgstr "Chat"
+msgstr "Conversation"
#: src/gui/chat.cpp:332
#, c-format
msgid "%d players are present."
-msgstr ""
+msgstr "%d joueurs sont présents."
-#: src/gui/chat.cpp:348 src/gui/chat.cpp:354
+#: src/gui/chat.cpp:333
msgid "Present: "
msgstr "Présent : "
-#: src/gui/chat.cpp:348 src/gui/chat.cpp:354
-msgid "; "
-msgstr ""
-
-#: src/gui/chat.cpp:349
+#: src/gui/chat.cpp:350
msgid "Attendance written to record log."
-msgstr "Présence écrite dans le fichier d'enregistrement"
+msgstr "Présence inscrite dans le fichier d'enregistrement."
-#: src/gui/chat.cpp:474
+#: src/gui/chat.cpp:475
#, c-format
msgid "Whispering to %s: %s"
-msgstr "Envoyé à %s : %s"
+msgstr "Message privé envoyé à %s : %s"
#: src/gui/confirmdialog.cpp:42
msgid "Yes"
@@ -659,7 +653,7 @@ msgstr "Quitter la guilde"
msgid "Help"
msgstr "Aide"
-#: src/gui/help.cpp:47 src/gui/npcdialog.cpp:45 src/gui/storagewindow.cpp:68
+#: src/gui/help.cpp:47 src/gui/npcdialog.cpp:44 src/gui/storagewindow.cpp:68
msgid "Close"
msgstr "Fermer"
@@ -752,7 +746,7 @@ msgid "Register"
msgstr "S'inscrire"
#: src/gui/magic.cpp:32 src/gui/skilldialog.cpp:117 src/gui/windowmenu.cpp:64
-#: src/localplayer.cpp:845
+#: src/localplayer.cpp:848
msgid "Magic"
msgstr "Magie"
@@ -768,33 +762,23 @@ msgstr "Jeter le sort d'essai 2"
msgid "Cast Test Spell 3"
msgstr "Jeter le sort d'essai 3"
-#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
-#, fuzzy
+#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:86
msgid "Map"
-msgstr "Max."
+msgstr "Plan"
-#: src/gui/npcdialog.cpp:43
+#: src/gui/npcdialog.cpp:42
msgid "Waiting for server"
msgstr "Attente du serveur"
-#: src/gui/npcdialog.cpp:46
-#, fuzzy
+#: src/gui/npcdialog.cpp:45
msgid "Submit"
-msgstr "S'assoir"
+msgstr "Soumettre"
-#: src/gui/npcdialog.cpp:49 src/gui/npcpostdialog.cpp:39
+#: src/gui/npcdialog.cpp:48 src/gui/npcpostdialog.cpp:39
msgid "NPC"
msgstr "PNJ"
-#: src/gui/npcdialog.cpp:95
-msgid "+"
-msgstr ""
-
-#: src/gui/npcdialog.cpp:96
-msgid "-"
-msgstr ""
-
-#: src/gui/npcdialog.cpp:105
+#: src/gui/npcdialog.cpp:104
msgid "Reset"
msgstr "Réinitialiser"
@@ -802,8 +786,7 @@ msgstr "Réinitialiser"
msgid "Send"
msgstr "Envoyer"
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:268
-#: src/gui/setup_video.cpp:567
+#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:142
msgid "Text"
msgstr "Texte"
@@ -855,8 +838,8 @@ msgstr "Message privé"
msgid "Is"
msgstr "Est"
-#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:33
-#: src/net/ea/gui/partytab.cpp:37
+#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:45
+#: src/net/ea/gui/partytab.cpp:39
msgid "Party"
msgstr "Groupe"
@@ -877,7 +860,6 @@ msgid "Being"
msgstr "Forme de vie"
#: src/gui/palette.cpp:104
-#, fuzzy
msgid "Other Players' Names"
msgstr "Nom des autres joueurs"
@@ -902,24 +884,20 @@ msgid "Unknown Item Type"
msgstr "Type inconnu d'objet"
#: src/gui/palette.cpp:111
-#, fuzzy
msgid "Generics"
-msgstr "Commun"
+msgstr "Génériques"
#: src/gui/palette.cpp:112
-#, fuzzy
msgid "Hats"
-msgstr "Chapeau"
+msgstr "Chapeaux"
#: src/gui/palette.cpp:113
-#, fuzzy
msgid "Usables"
-msgstr "Utilisable"
+msgstr "Utilisables"
#: src/gui/palette.cpp:114
-#, fuzzy
msgid "Shirts"
-msgstr "TShirt"
+msgstr "Chemises"
#: src/gui/palette.cpp:115
msgid "1 Handed Weapons"
@@ -938,19 +916,16 @@ msgid "2 Handed Weapons"
msgstr "Armes à deux mains"
#: src/gui/palette.cpp:119
-#, fuzzy
msgid "Shields"
-msgstr "Bouclier"
+msgstr "Boucliers"
#: src/gui/palette.cpp:120
-#, fuzzy
msgid "Rings"
-msgstr "Anneau"
+msgstr "Anneaux"
#: src/gui/palette.cpp:121
-#, fuzzy
msgid "Necklaces"
-msgstr "Collier"
+msgstr "Colliers"
#: src/gui/palette.cpp:122
msgid "Arms"
@@ -1006,7 +981,7 @@ msgstr "1/4 Barre de vie"
#: src/gui/popupmenu.cpp:75
msgid "@@name|Add name to chat@@"
-msgstr "@@nom|Ajouter le nom dans la conversation@@"
+msgstr "@@name|Ajouter le nom dans la conversation@@"
#: src/gui/popupmenu.cpp:87
#, c-format
@@ -1026,7 +1001,7 @@ msgstr "@@friend|Être ami avec %s@@"
#: src/gui/popupmenu.cpp:97
#, c-format
msgid "@@disregard|Disregard %s@@"
-msgstr "@@négliger|Négliger %s@@"
+msgstr "@@disregard|Négliger%s@@"
#: src/gui/popupmenu.cpp:98
#, c-format
@@ -1051,7 +1026,7 @@ msgstr "@@guild|Inviter %s à rejoindre votre guilde@@"
#: src/gui/popupmenu.cpp:114
#, c-format
msgid "@@party|Invite %s to join your party@@"
-msgstr "@@party|Invitation de %s à joindre votre partie @@"
+msgstr "@@party|Invitation de %s à joindre votre groupe@@"
#: src/gui/popupmenu.cpp:125
#, c-format
@@ -1064,12 +1039,11 @@ msgid "@@cancel|Cancel@@"
msgstr "@@cancel|Annuler@@"
#: src/gui/popupmenu.cpp:157
-#, fuzzy, c-format
+#, c-format
msgid "@@pickup|Pick up %s@@"
msgstr "@@pickup|Ramasser %s@@"
#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:373
-#, fuzzy
msgid "@@chat|Add to chat@@"
msgstr "@@chat|Ajouter à la conversation@@"
@@ -1094,13 +1068,12 @@ msgid "@@split|Split@@"
msgstr "@@split|Partager@@"
#: src/gui/popupmenu.cpp:364
-#, fuzzy
msgid "@@store|Store@@"
-msgstr "@@ignore|Ignorer %s@@"
+msgstr "@@store|Magasin@@"
#: src/gui/popupmenu.cpp:371
msgid "@@retrieve|Retrieve@@"
-msgstr ""
+msgstr "@@retrieve|Retirer@@"
#: src/gui/quitdialog.cpp:37
msgid "Switch server"
@@ -1112,7 +1085,7 @@ msgstr "Changer de personnage"
#: src/gui/recorder.cpp:87
msgid "Finishing recording."
-msgstr "Fin de l'engistrement"
+msgstr "Fin de l'engistrement."
#: src/gui/recorder.cpp:91
msgid "Not currently recording."
@@ -1300,7 +1273,7 @@ msgstr "Conflit(s) de touche détecté"
#: src/gui/setup_keyboard.cpp:120
msgid "Resolve them, or gameplay may result in strange behaviour."
msgstr ""
-"Trouver une solution ou des choses étranges se produiront pendant la partie"
+"Trouver une solution ou des choses étranges se produiront pendant la partie."
#: src/gui/setup_players.cpp:56
msgid "Name"
@@ -1331,200 +1304,184 @@ msgid "???"
msgstr "???"
#: src/gui/setup_players.cpp:224
-msgid "Save player list"
-msgstr "Sauvegarder la liste de joueurs"
-
-#: src/gui/setup_players.cpp:226
msgid "Allow trading"
msgstr "Autoriser les échanges"
-#: src/gui/setup_players.cpp:228
+#: src/gui/setup_players.cpp:226
msgid "Allow whispers"
msgstr "Autoriser les messages privés"
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:230
msgid "Put all whispers in tabs"
msgstr "Placer tous les messages privés dans des onglets"
-#: src/gui/setup_players.cpp:234
+#: src/gui/setup_players.cpp:232
msgid "Players"
msgstr "Joueurs"
-#: src/gui/setup_players.cpp:259
+#: src/gui/setup_players.cpp:257
msgid "When ignoring:"
msgstr "Quand ignoré :"
#: src/gui/setup_video.cpp:112
msgid "Tiny"
-msgstr ""
+msgstr "fin"
#: src/gui/setup_video.cpp:113
-#, fuzzy
msgid "Small"
-msgstr "Vendre"
+msgstr "Petit"
#: src/gui/setup_video.cpp:114
-#, fuzzy
msgid "Medium"
-msgstr "moyen"
+msgstr "Medium"
#: src/gui/setup_video.cpp:115
msgid "Large"
-msgstr ""
+msgstr "Grand"
+
+#: src/gui/setup_video.cpp:141
+msgid "No text"
+msgstr "Pas de texte"
+
+#: src/gui/setup_video.cpp:143
+msgid "Bubbles, no names"
+msgstr "Bulles, sans noms"
+
+#: src/gui/setup_video.cpp:144
+msgid "Bubbles with names"
+msgstr "Bulles avec noms"
+
+#: src/gui/setup_video.cpp:153
+msgid "off"
+msgstr "aucun"
+
+#: src/gui/setup_video.cpp:154 src/gui/setup_video.cpp:164
+msgid "low"
+msgstr "léger"
+
+#: src/gui/setup_video.cpp:155 src/gui/setup_video.cpp:166
+msgid "high"
+msgstr "élevé"
-#: src/gui/setup_video.cpp:151
+#: src/gui/setup_video.cpp:165
+msgid "medium"
+msgstr "moyen"
+
+#: src/gui/setup_video.cpp:167
+msgid "max"
+msgstr "max"
+
+#: src/gui/setup_video.cpp:187
msgid "Full screen"
msgstr "Plein écran"
-#: src/gui/setup_video.cpp:152
+#: src/gui/setup_video.cpp:188
msgid "OpenGL"
msgstr "Ouvrir GL"
-#: src/gui/setup_video.cpp:153
+#: src/gui/setup_video.cpp:189
msgid "Custom cursor"
msgstr "Curseur personnalisé"
-#: src/gui/setup_video.cpp:155
+#: src/gui/setup_video.cpp:191
msgid "Visible names"
msgstr "Afficher les noms"
-#: src/gui/setup_video.cpp:157
+#: src/gui/setup_video.cpp:193
msgid "Particle effects"
msgstr "Effets de particules"
-#: src/gui/setup_video.cpp:159
+#: src/gui/setup_video.cpp:195
msgid "Show name"
msgstr "Afficher le nom"
-#: src/gui/setup_video.cpp:160
+#: src/gui/setup_video.cpp:196
msgid "Show pickup notification"
msgstr "Afficher les messages de ramassage"
-#: src/gui/setup_video.cpp:161
+#: src/gui/setup_video.cpp:197
msgid "in chat"
msgstr "dans la conversation"
-#: src/gui/setup_video.cpp:162
+#: src/gui/setup_video.cpp:198
msgid "as particle"
msgstr "avec des particules"
-#: src/gui/setup_video.cpp:167
+#: src/gui/setup_video.cpp:203
msgid "FPS Limit:"
msgstr "Limite FPS :"
-#: src/gui/setup_video.cpp:184
+#: src/gui/setup_video.cpp:214
msgid "Video"
msgstr "Vidéo"
-#: src/gui/setup_video.cpp:189
+#: src/gui/setup_video.cpp:219
msgid "Overhead text"
msgstr "Texte aérien"
-#: src/gui/setup_video.cpp:190
+#: src/gui/setup_video.cpp:220
msgid "Gui opacity"
msgstr "Opacité de l'interface"
-#: src/gui/setup_video.cpp:191
-msgid "Scroll radius"
-msgstr "Rayon du défilement"
-
-#: src/gui/setup_video.cpp:192
-msgid "Scroll laziness"
-msgstr "Lenteur du défilement"
-
-#: src/gui/setup_video.cpp:193
+#: src/gui/setup_video.cpp:221
msgid "Ambient FX"
msgstr "Effets ambiants"
-#: src/gui/setup_video.cpp:194
+#: src/gui/setup_video.cpp:222
msgid "Particle Detail"
msgstr "Détail des particules"
-#: src/gui/setup_video.cpp:195
+#: src/gui/setup_video.cpp:223
msgid "Font size"
-msgstr ""
-
-#: src/gui/setup_video.cpp:265 src/gui/setup_video.cpp:564
-msgid "No text"
-msgstr "Pas de texte"
-
-#: src/gui/setup_video.cpp:271 src/gui/setup_video.cpp:570
-msgid "Bubbles, no names"
-msgstr "Bulles, sans noms"
+msgstr "Taille de police"
-#: src/gui/setup_video.cpp:274 src/gui/setup_video.cpp:573
-msgid "Bubbles with names"
-msgstr "Bulles avec noms"
-
-#: src/gui/setup_video.cpp:282 src/gui/setup_video.cpp:610
-msgid "off"
-msgstr "aucun"
-
-#: src/gui/setup_video.cpp:285 src/gui/setup_video.cpp:296
-#: src/gui/setup_video.cpp:613 src/gui/setup_video.cpp:627
-msgid "low"
-msgstr "léger"
-
-#: src/gui/setup_video.cpp:288 src/gui/setup_video.cpp:302
-#: src/gui/setup_video.cpp:616 src/gui/setup_video.cpp:633
-msgid "high"
-msgstr "élevé"
-
-#: src/gui/setup_video.cpp:299 src/gui/setup_video.cpp:630
-msgid "medium"
-msgstr "moyen"
-
-#: src/gui/setup_video.cpp:305 src/gui/setup_video.cpp:636
-msgid "max"
-msgstr "max"
-
-#: src/gui/setup_video.cpp:410
+#: src/gui/setup_video.cpp:356
msgid "Failed to switch to "
msgstr "Impossible de passer à "
-#: src/gui/setup_video.cpp:411
+#: src/gui/setup_video.cpp:357
msgid "windowed"
msgstr "fenetré"
-#: src/gui/setup_video.cpp:411
+#: src/gui/setup_video.cpp:357
msgid "fullscreen"
msgstr "plein écran"
-#: src/gui/setup_video.cpp:412
+#: src/gui/setup_video.cpp:358
msgid "mode and restoration of old mode also failed!"
msgstr "le mode et la restauration du vieux mode ont également échoué !"
-#: src/gui/setup_video.cpp:421
+#: src/gui/setup_video.cpp:367
msgid "Switching to full screen"
msgstr "Passage en plein écran"
-#: src/gui/setup_video.cpp:422
+#: src/gui/setup_video.cpp:368
msgid "Restart needed for changes to take effect."
msgstr ""
"Les changements ne seront pris en compte qu'au prochain démarrage du jeu."
-#: src/gui/setup_video.cpp:434
+#: src/gui/setup_video.cpp:380
msgid "Changing OpenGL"
msgstr "Changement OpenGL"
-#: src/gui/setup_video.cpp:435
+#: src/gui/setup_video.cpp:381
msgid "Applying change to OpenGL requires restart."
msgstr ""
"Le changement OpenGL ne sera pris en compte qu'au prochain démarrage du jeu."
-#: src/gui/setup_video.cpp:520
+#: src/gui/setup_video.cpp:442
msgid "Screen resolution changed"
msgstr "Résolution de l'écran changée"
-#: src/gui/setup_video.cpp:521
+#: src/gui/setup_video.cpp:443
msgid "Restart your client for the change to take effect."
-msgstr "Rédémarrez le jeu pour que les changements soient appliqués"
+msgstr "Rédémarrez le jeu pour que les changements soient appliqués."
-#: src/gui/setup_video.cpp:545
+#: src/gui/setup_video.cpp:467
msgid "Particle effect settings changed."
-msgstr "Paramètres d'effet de particules changés"
+msgstr "Paramètres d'effet de particules changés."
-#: src/gui/setup_video.cpp:546
+#: src/gui/setup_video.cpp:468
msgid "Changes will take effect on map change."
msgstr "Les changements seront appliqués au changement de carte."
@@ -1543,7 +1500,7 @@ msgstr "Compétences"
#: src/gui/skill.cpp:145 src/gui/skill.cpp:197
#, c-format
msgid "Skill points: %d"
-msgstr "Points d'aptitude : %d"
+msgstr "Points de compétences : %d"
#: src/gui/skill.cpp:146
msgid "Up"
@@ -1631,7 +1588,7 @@ msgstr "Agilité"
#: src/gui/status.cpp:200
msgid "Vitality"
-msgstr "Vitalité :"
+msgstr "Vitalité"
#: src/gui/status.cpp:201
msgid "Intelligence"
@@ -1660,7 +1617,7 @@ msgstr "Stockage"
#: src/gui/storagewindow.cpp:65
msgid "Store"
-msgstr "Stocker"
+msgstr "Entreposer"
#: src/gui/storagewindow.cpp:66
msgid "Retrieve"
@@ -1731,7 +1688,7 @@ msgstr "Jouer"
#: src/gui/updatewindow.cpp:325
msgid "curl error "
-msgstr "Erreur curl "
+msgstr "Courbe d'erreur "
#: src/gui/updatewindow.cpp:326
msgid " host: "
@@ -1755,7 +1712,7 @@ msgstr "Terminé"
#: src/gui/widgets/channeltab.cpp:49
msgid "/users > Lists the users in the current channel"
-msgstr "/users > Affiche la liste des différents utilisateurs dans ce salon"
+msgstr "/users > Affiche la liste des utilisateurs de ce salon"
#: src/gui/widgets/channeltab.cpp:50
msgid "/topic > Set the topic of the current channel"
@@ -1763,7 +1720,7 @@ msgstr "/topic > Change le sujet du salon"
#: src/gui/widgets/channeltab.cpp:51
msgid "/quit > Leave a channel"
-msgstr "/quit > Quitte un salon"
+msgstr "/quit > Quitter un salon"
#: src/gui/widgets/channeltab.cpp:52
msgid "/op > Make a user a channel operator"
@@ -1771,15 +1728,15 @@ msgstr "/op > Faire de l'utilisateur un opérateur du salon"
#: src/gui/widgets/channeltab.cpp:53
msgid "/kick > Kick a user from the channel"
-msgstr "/kick > Sort un utilisateur du salon"
+msgstr "/kick > Sortir un utilisateur du salon"
#: src/gui/widgets/channeltab.cpp:63
msgid "Command: /users"
-msgstr "Commande: /users"
+msgstr "Commande : /users"
#: src/gui/widgets/channeltab.cpp:64
msgid "This command shows the users in this channel."
-msgstr "The commande affiche la liste d'utilisateurs présents dans ce salon"
+msgstr "The commande affiche la liste d'utilisateurs présents dans ce salon."
#: src/gui/widgets/channeltab.cpp:68
msgid "Command: /topic <message>"
@@ -1795,7 +1752,7 @@ msgstr "Commande : /quit"
#: src/gui/widgets/channeltab.cpp:74
msgid "This command leaves the current channel."
-msgstr "Cette commande quitte le salon"
+msgstr "Cette commande quitte le salon."
#: src/gui/widgets/channeltab.cpp:75
msgid "If you're the last person in the channel, it will be deleted."
@@ -1804,11 +1761,11 @@ msgstr ""
#: src/gui/widgets/channeltab.cpp:79
msgid "Command: /op <nick>"
-msgstr "Commande : /op <pseudo>"
+msgstr "Commande : /op <nick>"
#: src/gui/widgets/channeltab.cpp:80
msgid "This command makes <nick> a channel operator."
-msgstr "Cette commande donne les droit d'opérateur du salon à <pseudo>"
+msgstr "Cette commande donne les droit d'opérateur du salon à <nick>"
#: src/gui/widgets/channeltab.cpp:83
msgid "Channel operators can kick and op other users from the channel."
@@ -1818,11 +1775,11 @@ msgstr ""
#: src/gui/widgets/channeltab.cpp:88
msgid "Command: /kick <nick>"
-msgstr "Commande : /kick <pseudo>"
+msgstr "Commande : /kick <nick>"
#: src/gui/widgets/channeltab.cpp:89
msgid "This command makes <nick> leave the channel."
-msgstr "Cette commande sort <pseudo> du salon."
+msgstr "Cette commande sort <nick> du salon."
#: src/gui/widgets/channeltab.cpp:118
msgid "Need a user to op!"
@@ -1864,7 +1821,7 @@ msgstr "Commande : /close"
#: src/gui/widgets/whispertab.cpp:79
msgid "This command closes the current whisper tab."
-msgstr "Cette commande ferme l'onglet courant de conversation privée"
+msgstr "Cette commande ferme l'onglet courant de conversation privée."
#: src/gui/windowmenu.cpp:59
msgid "Status"
@@ -1916,7 +1873,7 @@ msgstr "Arrêter d'attaquer"
#: src/keyboardconfig.cpp:49
msgid "Target Closest"
-msgstr "Cibler le plus proche"
+msgstr "Cible la plus proche"
#: src/keyboardconfig.cpp:50
msgid "Target NPC"
@@ -2001,9 +1958,8 @@ msgid "Debug Window"
msgstr "Fenêtre de debug"
#: src/keyboardconfig.cpp:80
-#, fuzzy
msgid "Party Window"
-msgstr "Fenêtre de conversation"
+msgstr "Fenêtre de groupe"
#: src/keyboardconfig.cpp:81
msgid "Emote Shortcut Window"
@@ -2051,55 +2007,55 @@ msgstr "Ignorer l'entrée 1"
msgid "Ignore input 2"
msgstr "Ignorer l'entrée 2"
-#: src/localplayer.cpp:834
+#: src/localplayer.cpp:837
msgid "Unarmed"
-msgstr "Non armé"
+msgstr "Désarmé"
-#: src/localplayer.cpp:835
+#: src/localplayer.cpp:838
msgid "Knife"
msgstr "Couteau"
-#: src/localplayer.cpp:836
+#: src/localplayer.cpp:839
msgid "Sword"
msgstr "Épée"
-#: src/localplayer.cpp:837
+#: src/localplayer.cpp:840
msgid "Polearm"
msgstr "Pique"
-#: src/localplayer.cpp:838
+#: src/localplayer.cpp:841
msgid "Staff"
msgstr "Bâton"
-#: src/localplayer.cpp:839
+#: src/localplayer.cpp:842
msgid "Whip"
msgstr "Fouet"
-#: src/localplayer.cpp:840
+#: src/localplayer.cpp:843
msgid "Bow"
msgstr "Arc"
-#: src/localplayer.cpp:841
+#: src/localplayer.cpp:844
msgid "Shooting"
msgstr "Tirer"
-#: src/localplayer.cpp:842
+#: src/localplayer.cpp:845
msgid "Mace"
msgstr "Masse"
-#: src/localplayer.cpp:843
+#: src/localplayer.cpp:846
msgid "Axe"
msgstr "Hache"
-#: src/localplayer.cpp:844
+#: src/localplayer.cpp:847
msgid "Thrown"
msgstr "Lancé"
-#: src/localplayer.cpp:846
+#: src/localplayer.cpp:849
msgid "Craft"
msgstr "Métier"
-#: src/localplayer.cpp:847
+#: src/localplayer.cpp:850
msgid "Unknown Skill"
msgstr "Compétence inconnue"
@@ -2130,77 +2086,68 @@ msgid "tmw"
msgstr "tmw"
#: src/main.cpp:567
-#, fuzzy
msgid "Options:"
-msgstr "Options : "
+msgstr "Options :"
#: src/main.cpp:568
-#, fuzzy
msgid " -C --config-file : Configuration file to use"
-msgstr " -C --configfile : Fichier de configuration à utiliser"
+msgstr " -C --config-file : Fichier de configuration a utiliser"
#: src/main.cpp:569
-#, fuzzy
msgid " -d --data : Directory to load game data from"
-msgstr " -d --data : Dossier à partir duquel charger les données de jeu"
+msgstr ""
+" -d --data : Repertoire dans lequel les données du jeu se trouvent et "
+"seront chargées"
#: src/main.cpp:570
msgid " -D --default : Choose default character server and character"
msgstr ""
+" -D --default : Choisir le serveur de personnages et le personnage par "
+"défaut"
#: src/main.cpp:572
-#, fuzzy
msgid " -h --help : Display this help"
-msgstr " -h --help : Affiche cette aide"
+msgstr " -h --help : Montre cette aide"
#: src/main.cpp:573
-#, fuzzy
msgid " -S --home-dir : Directory to use as home directory"
-msgstr " -S --homedir : Dossier à utiliser en tant que dossier personnel"
+msgstr " -S --home-dir : Répertoire a utiliser comme répertoire principal"
#: src/main.cpp:574
-#, fuzzy
msgid " -H --update-host : Use this update host"
-msgstr " -H --updatehost : Adresse à utiliser comme adresse de mise à jour"
+msgstr " -H --update-host : Utilise cette mise à jour d'Hôte"
#: src/main.cpp:575
-#, fuzzy
msgid " -P --password : Login with this password"
-msgstr " -P --password : Se connecter avec ce mot de passe"
+msgstr " -P --password : Se connecter avec ce mot de passe"
#: src/main.cpp:576
-#, fuzzy
msgid " -c --character : Login with this character"
-msgstr " -c --character : Se connecter avec ce personnage"
+msgstr " -c --character : Se connecter avec ce personnage"
#: src/main.cpp:577
-#, fuzzy
msgid " -p --port : Login Server Port"
-msgstr " -o --port : Port du serveur de connexion"
+msgstr " -p --port : Port de connexion au serveur"
#: src/main.cpp:578
-#, fuzzy
msgid " -s --server : Login Server name or IP"
-msgstr " -s --server : Nom ou IP du serveur de connexion"
+msgstr " -s --server : Ip ou nom du serveur pour la connection"
#: src/main.cpp:579
-#, fuzzy
msgid " -u --skip-update : Skip the update downloads"
-msgstr " -u --skipupdate : Sauter le téléchargement des mises à jour"
+msgstr " -u --skip-update : Passer les téléchargements de mise à jour"
#: src/main.cpp:580
-#, fuzzy
msgid " -U --username : Login with this username"
-msgstr " -U --username : Se connecter avec ce nom d'utilisateur"
+msgstr " -U --username : Se connecter avec ce nom d'utilisateur"
#: src/main.cpp:582
msgid " -O --no-opengl : Disable OpenGL for this session"
-msgstr ""
+msgstr " -O --no-opengl : Désactive OpenGL pour cette session"
#: src/main.cpp:584
-#, fuzzy
msgid " -v --version : Display the version"
-msgstr " -v --version : Affiche la version"
+msgstr " -v --version : Affiche la version"
#: src/main.cpp:589
msgid "The Mana World "
@@ -2232,7 +2179,7 @@ msgstr "Rien à vendre"
#: src/net/ea/buysellhandler.cpp:119
msgid "Thanks for buying"
-msgstr "Merci d'avoir acheté"
+msgstr "Merci pour votre achat"
#: src/net/ea/buysellhandler.cpp:126
msgid "Unable to buy"
@@ -2274,7 +2221,7 @@ msgstr "Personnage supprimé"
#: src/net/ea/charserverhandler.cpp:140
msgid "Failed to delete character."
-msgstr "La suppresion du personnage n'a pu se réaliser"
+msgstr "La suppresion du personnage n'a pu s\"effectuer."
#: src/net/ea/charserverhandler.cpp:224
#: src/net/tmwserv/charserverhandler.cpp:253
@@ -2307,7 +2254,8 @@ msgstr "Chance :"
#: src/net/ea/chathandler.cpp:78
msgid "Whisper could not be sent, user is offline"
-msgstr "Le message privé ne peut pas être envoyé, l'utilisateur est hors-ligne"
+msgstr ""
+"Le message privé ne peut pas être envoyé, l'utilisateur n'est pas connecté."
#: src/net/ea/chathandler.cpp:81
msgid "Whisper could not be sent, ignored by user"
@@ -2319,7 +2267,7 @@ msgstr ""
#: src/net/ea/chathandler.cpp:221 src/net/ea/chathandler.cpp:226
#: src/net/ea/chathandler.cpp:231 src/net/ea/chathandler.cpp:236
msgid "Channels are not supported!"
-msgstr "Les canaux ne sont pas gérés !"
+msgstr "Les salons ne sont pas gérés !"
#: src/net/ea/equipmenthandler.cpp:111
msgid "Unable to equip."
@@ -2329,133 +2277,133 @@ msgstr "Impossible d'équiper cet objet."
msgid "Unable to unequip."
msgstr "Impossible de deséquiper cet objet."
-#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:82
-#, c-format
-msgid "Strength: %d"
+#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:81
+#, fuzzy, c-format
+msgid "Strength %+d"
msgstr "Force : %d"
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:84
-#, c-format
-msgid "Agility: %d"
+#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:82
+#, fuzzy, c-format
+msgid "Agility %+d"
msgstr "Agilité : %d"
-#: src/net/ea/generalhandler.cpp:96 src/net/tmwserv/generalhandler.cpp:88
-#, c-format
-msgid "Vitality: %d"
+#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:84
+#, fuzzy, c-format
+msgid "Vitality %+d"
msgstr "Vitalité : %d"
-#: src/net/ea/generalhandler.cpp:98 src/net/tmwserv/generalhandler.cpp:90
-#, c-format
-msgid "Intelligence: %d"
+#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:85
+#, fuzzy, c-format
+msgid "Intelligence %+d"
msgstr "Intelligence : %d"
-#: src/net/ea/generalhandler.cpp:100 src/net/tmwserv/generalhandler.cpp:86
-#, c-format
-msgid "Dexterity: %d"
+#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:83
+#, fuzzy, c-format
+msgid "Dexterity %+d"
msgstr "Dextérité : %d"
-#: src/net/ea/generalhandler.cpp:102
-#, c-format
-msgid "Luck: %d"
+#: src/net/ea/generalhandler.cpp:96
+#, fuzzy, c-format
+msgid "Luck %+d"
msgstr "Chance : %d"
-#: src/net/ea/generalhandler.cpp:125
+#: src/net/ea/generalhandler.cpp:118
msgid "Authentication failed"
msgstr "Échec de l'indentification"
-#: src/net/ea/generalhandler.cpp:128
+#: src/net/ea/generalhandler.cpp:121
msgid "No servers available"
msgstr "Aucun serveur n'est disponible"
-#: src/net/ea/generalhandler.cpp:132
+#: src/net/ea/generalhandler.cpp:125
msgid "Someone else is trying to use this account"
-msgstr ""
+msgstr "Quelqu'un d'autre essaye d'utiliser ce compte"
-#: src/net/ea/generalhandler.cpp:135
+#: src/net/ea/generalhandler.cpp:128
msgid "This account is already logged in"
msgstr "Ce compte est déjà connecté"
-#: src/net/ea/generalhandler.cpp:138
+#: src/net/ea/generalhandler.cpp:131
msgid "Speed hack detected"
msgstr "Speed hack detecté"
-#: src/net/ea/generalhandler.cpp:141
+#: src/net/ea/generalhandler.cpp:134
msgid "Duplicated login"
msgstr "Identification dupliquée"
-#: src/net/ea/generalhandler.cpp:144
+#: src/net/ea/generalhandler.cpp:137
msgid "Unknown connection error"
msgstr "Erreur de connexion inconnue"
-#: src/net/ea/generalhandler.cpp:201
+#: src/net/ea/generalhandler.cpp:194
msgid "Got disconnected from server!"
msgstr "Vous avez été déconnecté du serveur !"
-#: src/net/ea/gui/partytab.cpp:52
+#: src/net/ea/gui/partytab.cpp:55
msgid "/help > Display this help."
msgstr "/help > Affiche cette aide."
-#: src/net/ea/gui/partytab.cpp:53
+#: src/net/ea/gui/partytab.cpp:56
msgid "/create > Create a new party"
msgstr "/create > Créer un nouveau groupe"
-#: src/net/ea/gui/partytab.cpp:54
+#: src/net/ea/gui/partytab.cpp:57
msgid "/new > Alias of create"
msgstr "/new > Alias de création"
-#: src/net/ea/gui/partytab.cpp:55
+#: src/net/ea/gui/partytab.cpp:58
msgid "/invite > Invite a player to your party"
msgstr "/invite > Invite un joueur à rejoindre votre groupe"
-#: src/net/ea/gui/partytab.cpp:56
+#: src/net/ea/gui/partytab.cpp:59
msgid "/leave > Leave the party you are in"
msgstr "/leave > Quitte le groupe dans lequel vous vous trouvez"
-#: src/net/ea/gui/partytab.cpp:57
+#: src/net/ea/gui/partytab.cpp:60
msgid "/kick > Kick some one from the party you are in"
msgstr "/kick > Sortir quelqu'un du groupe dont vous faites partie"
-#: src/net/ea/gui/partytab.cpp:58
+#: src/net/ea/gui/partytab.cpp:61
msgid "/item > Show/change party item sharing options"
msgstr "/item > Affiche / Modifie les préférences d'échange d'objet du groupe"
-#: src/net/ea/gui/partytab.cpp:59
+#: src/net/ea/gui/partytab.cpp:62
msgid "/exp > Show/change party experience sharing options"
-msgstr "/exp >Affiche / Modifie les préférences d'expérience du groupe"
+msgstr "/exp > Affiche / Modifie les préférences d'expérience du groupe"
-#: src/net/ea/gui/partytab.cpp:68
+#: src/net/ea/gui/partytab.cpp:71
msgid "Command: /new <party-name>"
-msgstr "Commande : /new <nom-du-groupe>"
+msgstr "Commande : /new <party-name>"
-#: src/net/ea/gui/partytab.cpp:69
+#: src/net/ea/gui/partytab.cpp:72
msgid "Command: /create <party-name>"
-msgstr "Commande : /create <nom-du-groupe>"
+msgstr "Commande : /create <party-name>"
-#: src/net/ea/gui/partytab.cpp:70
+#: src/net/ea/gui/partytab.cpp:73
msgid "These commands create a new party called <party-name>."
-msgstr "Cette commande crée un nouveau groupe appelé <nom-du-groupe>"
+msgstr "Cette commande crée un nouveau groupe appelé <party-name>"
-#: src/net/ea/gui/partytab.cpp:74
+#: src/net/ea/gui/partytab.cpp:77
msgid "Command: /invite <nick>"
-msgstr "Commande : /invite <pseudo>"
+msgstr "Commande : /invite <nick>"
-#: src/net/ea/gui/partytab.cpp:81
+#: src/net/ea/gui/partytab.cpp:84
msgid "Command: /leave"
msgstr "Commande : /leave"
-#: src/net/ea/gui/partytab.cpp:82
+#: src/net/ea/gui/partytab.cpp:85
msgid "This command causes the player to leave the party."
-msgstr "Cette commande vous fait quitter votre groupe actuel"
+msgstr "Cette commande vous fait quitter votre groupe actuel."
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/ea/gui/partytab.cpp:89
msgid "Command: /item <policy>"
-msgstr "Commande : /item <préférences>"
+msgstr "Commande : /item <policy>"
-#: src/net/ea/gui/partytab.cpp:87
+#: src/net/ea/gui/partytab.cpp:90
msgid "This command changes the party's item sharing policy."
msgstr "Cette commande change les préférences d'échange d'objet du groupe."
-#: src/net/ea/gui/partytab.cpp:88
+#: src/net/ea/gui/partytab.cpp:91
msgid ""
"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
"\"0\", \"no\", \"false\" to disable item sharing."
@@ -2463,26 +2411,26 @@ msgstr ""
"<préférences> peut être \"1\", \"yes\", \"true\" pour activer l'échange "
"d'objet, ou \"0\", \"no\", \"false\" pour le désactiver."
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:94
msgid "Command: /item"
msgstr "Commande : /item"
-#: src/net/ea/gui/partytab.cpp:92
+#: src/net/ea/gui/partytab.cpp:95
msgid "This command displays the party's current item sharing policy."
msgstr ""
"Cette commande affiche les préférences actuelles du groupe sur le partage "
"d'objet."
-#: src/net/ea/gui/partytab.cpp:96
+#: src/net/ea/gui/partytab.cpp:99
msgid "Command: /exp <policy>"
-msgstr "Commande : /exp <préférences>"
+msgstr "Commande : /exp <policy>"
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/ea/gui/partytab.cpp:100
msgid "This command changes the party's experience sharing policy."
msgstr ""
-"Cette commande change les préférences du groupe sur le partage d'expérience"
+"Cette commande change les préférences du groupe sur le partage d'expérience."
-#: src/net/ea/gui/partytab.cpp:98
+#: src/net/ea/gui/partytab.cpp:101
msgid ""
"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
@@ -2490,41 +2438,41 @@ msgstr ""
"<préférences> peut être \"1\", \"yes\", \"true\" pour activer le partage "
"d'expérience, ou \"0\", \"no\", \"false\" pour le désactiver."
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:104
msgid "Command: /exp"
msgstr "Commande : /exp"
-#: src/net/ea/gui/partytab.cpp:102
+#: src/net/ea/gui/partytab.cpp:105
msgid "This command displays the party's current experience sharing policy."
msgstr ""
"Cette commande affiche les préférences actuelles du groupe sur le partage "
"d'expérience."
-#: src/net/ea/gui/partytab.cpp:110
+#: src/net/ea/gui/partytab.cpp:113
msgid "Party name is missing."
msgstr "Indiquez un nom de groupe."
-#: src/net/ea/gui/partytab.cpp:133 src/net/ea/partyhandler.cpp:191
+#: src/net/ea/gui/partytab.cpp:136 src/net/ea/partyhandler.cpp:194
msgid "Item sharing enabled."
msgstr "Partage d'objet activé."
-#: src/net/ea/gui/partytab.cpp:136 src/net/ea/partyhandler.cpp:197
+#: src/net/ea/gui/partytab.cpp:139 src/net/ea/partyhandler.cpp:200
msgid "Item sharing disabled."
msgstr "Partage d'objet desactivé."
-#: src/net/ea/gui/partytab.cpp:139 src/net/ea/partyhandler.cpp:203
+#: src/net/ea/gui/partytab.cpp:142 src/net/ea/partyhandler.cpp:206
msgid "Item sharing not possible."
msgstr "Partage d'objet impossible."
-#: src/net/ea/gui/partytab.cpp:165 src/net/ea/partyhandler.cpp:168
+#: src/net/ea/gui/partytab.cpp:168 src/net/ea/partyhandler.cpp:171
msgid "Experience sharing enabled."
msgstr "Partage d'expérience authorisé."
-#: src/net/ea/gui/partytab.cpp:168 src/net/ea/partyhandler.cpp:174
+#: src/net/ea/gui/partytab.cpp:171 src/net/ea/partyhandler.cpp:177
msgid "Experience sharing disabled."
msgstr "Partage d'expérience non authorisé."
-#: src/net/ea/gui/partytab.cpp:171 src/net/ea/partyhandler.cpp:180
+#: src/net/ea/gui/partytab.cpp:174 src/net/ea/partyhandler.cpp:183
msgid "Experience sharing not possible."
msgstr "Partage d'expérience impossible."
@@ -2533,9 +2481,9 @@ msgid "Unable to pick up item"
msgstr "Impossible de ramasser l'objet"
#: src/net/ea/inventoryhandler.cpp:193
-#, fuzzy, c-format
+#, c-format
msgid "You picked up %s [@@%d|%s@@]"
-msgstr "vous avez ramassé %s [%s]"
+msgstr "Vous avez ramassé %s [@@%d|%s@@]"
#: src/net/ea/inventoryhandler.cpp:239
msgid "Failed to use item"
@@ -2561,7 +2509,7 @@ msgstr "Rejeté par le server"
msgid ""
"You have been permanently banned from the game. Please contact the GM Team."
msgstr ""
-"Vous avez été banni de façon permanent du jeu. Merci de vous mettre en "
+"Vous avez été banni de façon permanente du jeu. Merci de vous mettre en "
"contact avec l'équipe des MJ."
#: src/net/ea/loginhandler.cpp:127
@@ -2591,45 +2539,45 @@ msgstr "Le groupe n'a pu être créé."
msgid "Party successfully created."
msgstr "Création du groupe réussie."
-#: src/net/ea/partyhandler.cpp:115
+#: src/net/ea/partyhandler.cpp:118
#, c-format
msgid "%s is already a member of a party."
msgstr "%s est déjà membre du groupe."
-#: src/net/ea/partyhandler.cpp:119
+#: src/net/ea/partyhandler.cpp:122
#, c-format
msgid "%s refused your invitation."
msgstr "%s a refusé votre invitation."
-#: src/net/ea/partyhandler.cpp:123
+#: src/net/ea/partyhandler.cpp:126
#, c-format
msgid "%s is now a member of your party."
msgstr "%s est maintenant membre de votre groupe."
-#: src/net/ea/partyhandler.cpp:127
+#: src/net/ea/partyhandler.cpp:130
#, c-format
msgid "Unknown invite response for %s."
-msgstr "Réponse d'invitation de %s inconnue"
+msgstr "Réponse d'invitation de %s inconnue."
-#: src/net/ea/partyhandler.cpp:232
+#: src/net/ea/partyhandler.cpp:235
msgid "You have left the party."
msgstr "vous avez quitté le groupe."
-#: src/net/ea/partyhandler.cpp:235
+#: src/net/ea/partyhandler.cpp:239
#, c-format
msgid "%s has left your party."
-msgstr "%s a quitté le groupe"
+msgstr "%s a quitté le groupe."
-#: src/net/ea/partyhandler.cpp:272
+#: src/net/ea/partyhandler.cpp:274
#, c-format
msgid "An unknown member tried to say: %s"
msgstr "Un membre inconnu a essayé de dire : %s"
-#: src/net/ea/partyhandler.cpp:298
+#: src/net/ea/partyhandler.cpp:300
msgid "Inviting like this isn't supported at the moment."
-msgstr ""
+msgstr "Cette manière d'inviter n'est pas en place actuellement."
-#: src/net/ea/partyhandler.cpp:327
+#: src/net/ea/partyhandler.cpp:329
#, c-format
msgid "%s is not in your party!"
msgstr "%s n'est pas membre de votre groupe !"
@@ -2646,7 +2594,7 @@ msgstr ""
#: src/net/ea/playerhandler.cpp:99 src/net/tmwserv/beinghandler.cpp:314
msgid "You are not that alive anymore."
-msgstr "Vous n'êtes plus tout a fait en vie."
+msgstr "Vous n'êtes plus vraiment en vie."
#: src/net/ea/playerhandler.cpp:100 src/net/tmwserv/beinghandler.cpp:315
msgid "The cold hands of the grim reaper are grabbing for your soul."
@@ -2657,17 +2605,16 @@ msgid "Game Over!"
msgstr "Jeu terminé !"
#: src/net/ea/playerhandler.cpp:102
-#, fuzzy
msgid "Insert coin to continue."
-msgstr "Insérez une pièce pour continuer"
+msgstr "veuillez insérer une pièce pour continuer."
#: src/net/ea/playerhandler.cpp:103 src/net/tmwserv/beinghandler.cpp:317
msgid ""
"No, kids. Your character did not really die. It... err... went to a better "
"place."
msgstr ""
-"No, mon enfant. Ton personnage n'est pas vraiment mort... Il... enfin il... "
-"est parti dans un monde meilleur."
+"No, mon enfant. Ton personnage n'est pas vraiment mort... Il... enfin,.. "
+"il... est parti dans un monde meilleur."
#: src/net/ea/playerhandler.cpp:105 src/net/tmwserv/beinghandler.cpp:318
msgid ""
@@ -2683,7 +2630,7 @@ msgstr "J'ai la sensation que cela ne s'est pas aussi bien passé que prévu."
#: src/net/ea/playerhandler.cpp:109 src/net/tmwserv/beinghandler.cpp:320
msgid "Do you want your possessions identified?"
-msgstr "Voulez*vous que vos biens soient identifiés ?"
+msgstr "Voulez-vous que vos biens soient identifiés ?"
#: src/net/ea/playerhandler.cpp:111 src/net/tmwserv/beinghandler.cpp:321
msgid "Sadly, no trace of you was ever found..."
@@ -2695,7 +2642,7 @@ msgstr "Vaporisé."
#: src/net/ea/playerhandler.cpp:115 src/net/tmwserv/beinghandler.cpp:323
msgid "Looks like you got your head handed to you."
-msgstr "Il semble que l'on vous a rendu votre tête."
+msgstr "Il semble que l'on vous ait rendu votre tête."
#: src/net/ea/playerhandler.cpp:117 src/net/tmwserv/beinghandler.cpp:324
msgid ""
@@ -2710,7 +2657,7 @@ msgstr "Vous n'êtes pas encore mort. Vous vous reposez seulement."
#: src/net/ea/playerhandler.cpp:121
msgid "You are no more."
-msgstr "Vous n'êtes plus"
+msgstr "Vous n'existez plus."
#: src/net/ea/playerhandler.cpp:122
msgid "You have ceased to be."
@@ -2718,7 +2665,7 @@ msgstr "Vous avez cessez d'exister."
#: src/net/ea/playerhandler.cpp:123
msgid "You've expired and gone to meet your maker."
-msgstr "Tu es fini et est parti retrouvé ton créateur."
+msgstr "Tu es fini. Tu es parti retrouver ton créateur."
#: src/net/ea/playerhandler.cpp:124
msgid "You're a stiff."
@@ -2726,12 +2673,12 @@ msgstr "Tu es un dur."
#: src/net/ea/playerhandler.cpp:125
msgid "Bereft of life, you rest in peace."
-msgstr "Privé de vie, vous reposez en paix."
+msgstr "Privé de toute essence de vie, vous reposez en paix."
#: src/net/ea/playerhandler.cpp:126
msgid "If you weren't so animated, you'd be pushing up the daisies."
msgstr ""
-"Si tu n'étais pas autant en forme, tu serai en train de manger les "
+"Si tu n'étais pas autant en forme, tu serais en train de manger les "
"pissenlits par la racine."
#: src/net/ea/playerhandler.cpp:127
@@ -2740,27 +2687,27 @@ msgstr "Vos processus métaboliques appartiennent au passé maintenant."
#: src/net/ea/playerhandler.cpp:128
msgid "You're off the twig."
-msgstr ""
+msgstr "Tu es en dehors des clous"
#: src/net/ea/playerhandler.cpp:129
msgid "You've kicked the bucket."
-msgstr ""
+msgstr "Tu viens de toucher le fond."
#: src/net/ea/playerhandler.cpp:130
msgid ""
"You've shuffled off your mortal coil, run down the curtain and joined the "
"bleedin' choir invisibile."
msgstr ""
-"Vous êtes sorti de votre envellope mortelle et avez rejoint l'armée de "
-"l'invisible"
+"Vous êtes sorti de votre enveloppe charnelle et mortelle. Vous avez rejoint "
+"l'armée de l'ombre."
#: src/net/ea/playerhandler.cpp:132
msgid "You are an ex-player."
-msgstr "Tu es un ancien joueur"
+msgstr "Tu n'es plus qu'un ancien joueur sans intérêt."
#: src/net/ea/playerhandler.cpp:133
msgid "You're pining for the fjords."
-msgstr ""
+msgstr "Tu reposes au fond de l'eau."
#: src/net/ea/playerhandler.cpp:246 src/net/ea/playerhandler.cpp:269
msgid "Message"
@@ -2770,8 +2717,8 @@ msgstr "Message"
msgid ""
"You are carrying more than half your weight. You are unable to regain health."
msgstr ""
-"Vous portez plus de la moitié de votre poid. vous n'êtes plus en mesure de "
-"regagner vos points de vie."
+"Vous portez plus de la moitié du poids de votre inventaire. Vous n'êtes plus "
+"en mesure de regagner vos points de vie."
#: src/net/ea/playerhandler.cpp:289
msgid "You picked up "
@@ -2779,7 +2726,7 @@ msgstr "Vous avez ramassé "
#: src/net/ea/playerhandler.cpp:412
msgid "Equip arrows first"
-msgstr "Equiper en premier les flêches"
+msgstr "Equiper les flêches en premier"
#: src/net/ea/skillhandler.cpp:138
msgid "Trade failed!"
@@ -2819,7 +2766,7 @@ msgstr "PV insuffisant !"
#: src/net/ea/skillhandler.cpp:171
msgid "You have no memos!"
-msgstr "Vous n'avez aps de messages !"
+msgstr "Vous n'avez pas de messages !"
#: src/net/ea/skillhandler.cpp:174
msgid "You cannot do that right now!"
@@ -2879,7 +2826,7 @@ msgstr "Echange impossible. Ce personnage n'existe pas."
#: src/net/ea/tradehandler.cpp:124
msgid "Trade cancelled due to an unknown reason."
-msgstr "Echange annul\" pour une raison inconnue."
+msgstr "Echange annulé pour une raison inconnue."
#: src/net/ea/tradehandler.cpp:130
msgid "Trade: You and "
@@ -2895,19 +2842,19 @@ msgstr " annulé"
#: src/net/ea/tradehandler.cpp:144
msgid "Unhandled trade cancel packet"
-msgstr "paquet de troc non pris en charge"
+msgstr "Paquet de troc non pris en charge"
#: src/net/ea/tradehandler.cpp:194
msgid "Failed adding item. Trade partner is over weighted."
msgstr ""
-"Impossible de rajouter un objet. Votre partner pour cet échange est "
+"Impossible de rajouter un objet. Votre partenaire pour cet échange est "
"surchargé."
#: src/net/ea/tradehandler.cpp:199
msgid "Failed adding item. Trade partner has no free slot."
msgstr ""
-"Impossible de rajouter un objet. Votre partner pour cet échange n'a plus de "
-"place libre."
+"Impossible de rajouter un objet. Votre partenaire pour cet échange n'a plus "
+"de place libre."
#: src/net/ea/tradehandler.cpp:203
msgid "Failed adding item for unknown reason."
@@ -2941,74 +2888,66 @@ msgstr "Volonté :"
msgid "Topic: "
msgstr "Sujet : "
-#: src/net/tmwserv/generalhandler.cpp:92
-#, c-format
-msgid "Willpower: %d"
+#: src/net/tmwserv/generalhandler.cpp:86
+#, fuzzy, c-format
+msgid "Willpower %+d"
msgstr "Volonté : %d"
#: src/net/tmwserv/loginhandler.cpp:80
msgid "Wrong magic_token"
-msgstr ""
+msgstr "Mauvaise empreinte magique"
#: src/net/tmwserv/loginhandler.cpp:83 src/net/tmwserv/loginhandler.cpp:182
-#, fuzzy
msgid "Already logged in"
-msgstr "Enregistrement en cours."
+msgstr "Déjà connecté"
#: src/net/tmwserv/loginhandler.cpp:86 src/net/tmwserv/loginhandler.cpp:185
-#, fuzzy
msgid "Server is full"
-msgstr "Serveur"
+msgstr "Le serveur est plein"
#: src/net/tmwserv/loginhandler.cpp:110
-#, fuzzy
msgid "New password incorrect"
-msgstr "Entrer le nouveau mot de passe de nouveau :"
+msgstr "Nouveau mot de passe incorrect"
#: src/net/tmwserv/loginhandler.cpp:113
msgid "Old password incorrect"
-msgstr ""
+msgstr "Ancien mot de passe incorrect"
#: src/net/tmwserv/loginhandler.cpp:116 src/net/tmwserv/loginhandler.cpp:146
msgid "Account not connected. Please login first."
-msgstr ""
+msgstr "Compte non connecté. Identifiez-vous tout d'abord."
#: src/net/tmwserv/loginhandler.cpp:140
-#, fuzzy
msgid "New email address incorrect"
-msgstr "Entrer la nouvelle adresse mail de nouveau :"
+msgstr "Nouvelle adresse email incorrecte"
#: src/net/tmwserv/loginhandler.cpp:143
-#, fuzzy
msgid "Old email address incorrect"
-msgstr "Entrer la nouvelle adresse mail de nouveau :"
+msgstr "Ancienne adresse email incorrecte"
#: src/net/tmwserv/loginhandler.cpp:149
-#, fuzzy
msgid "The new Email Address already exists."
-msgstr "Entrer la nouvelle adresse mail de nouveau :"
+msgstr "Cette nouvelle adresse email existe déjà."
#: src/net/tmwserv/loginhandler.cpp:176 src/net/tmwserv/loginhandler.cpp:208
msgid "Client version is too old"
-msgstr ""
+msgstr "La version de votre client est trop ancienne."
#: src/net/tmwserv/loginhandler.cpp:179
-#, fuzzy
msgid "Wrong username or password"
-msgstr "Mauvais mot de passe"
+msgstr "Mauvais nom d'utilisateur ou mot de passe."
#: src/net/tmwserv/loginhandler.cpp:211
msgid "Wrong username, password or email address"
-msgstr ""
+msgstr "Mauvais nom d'utilisateur, mot de passe ou adrese email."
#: src/net/tmwserv/loginhandler.cpp:214
-#, fuzzy
msgid "Username already exists"
-msgstr "Ce nom d'utilisateur est déjà utilisé"
+msgstr "Ce nom d'utilisateur existe déjà"
#: src/net/tmwserv/loginhandler.cpp:217
msgid "Email address already exists"
-msgstr ""
+msgstr "Cette adresse email existe déjà"
#: src/resources/itemdb.cpp:52
#, c-format
@@ -3036,7 +2975,7 @@ msgstr "items.xml"
#: src/resources/itemdb.cpp:150
msgid "Unnamed"
-msgstr "anonyme"
+msgstr "Aonyme"
#: src/resources/monsterdb.cpp:45 src/resources/monsterdb.cpp:67
msgid "unnamed"
@@ -3051,12 +2990,41 @@ msgid "NPC Database: Error while loading npcs.xml!"
msgstr ""
"Base de donnée des PNJ : Erreur pendant le chargement du fichier npcs.xml !"
-#~ msgid "Emote"
-#~ msgstr "Emote"
+#~ msgid "Scroll radius"
+#~ msgstr "Rayon du défilement"
+
+#~ msgid "Scroll laziness"
+#~ msgstr "Lenteur du défilement"
#~ msgid "MiniMap"
#~ msgstr "Plan"
+#~ msgid "; "
+#~ msgstr "; "
+
+#~ msgid "+"
+#~ msgstr "+"
+
+#~ msgid "-"
+#~ msgstr "-"
+
+#~ msgid "Save player list"
+#~ msgstr "Sauvegarder la liste de joueurs"
+
+#~ msgid "Emote"
+#~ msgstr "Emote"
+
+#~ msgid "inc"
+#~ msgstr "inc"
+
+#~ msgid "use"
+#~ msgstr "Utiliser"
+
+#~ msgid " -D --default : Bypass the login process with default settings"
+#~ msgstr ""
+#~ " -D --default : Bypasser le processus de connexion par la configuration "
+#~ "par défaut"
+
#~ msgid "NPC Number Request"
#~ msgstr "Requête de nombre PNJ"
@@ -3070,19 +3038,8 @@ msgstr ""
#~ msgid "NPC Text Request"
#~ msgstr "Requête de texte PNJ"
-#~ msgid "use"
-#~ msgstr "Utiliser"
-
#~ msgid "%s: %s"
#~ msgstr "%s : %s"
#~ msgid "Emote Window"
#~ msgstr "Fenêtre d'emote"
-
-#~ msgid "inc"
-#~ msgstr "inc"
-
-#~ msgid " -D --default : Bypass the login process with default settings"
-#~ msgstr ""
-#~ " -D --default : Bypasser le processus de connexion par la configuration "
-#~ "par défaut"
diff --git a/po/he.po b/po/he.po
index 304f4688..4be6cad4 100644
--- a/po/he.po
+++ b/po/he.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: tmw\n"
"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-05-10 16:39+0200\n"
+"POT-Creation-Date: 2009-05-12 00:11+0200\n"
"PO-Revision-Date: 2009-01-09 12:19+0000\n"
"Last-Translator: Ddorda <d.dorda@gmail.com>\n"
"Language-Team: Hebrew <he@li.org>\n"
@@ -175,7 +175,7 @@ msgstr ""
#: src/commandhandler.cpp:216 src/commandhandler.cpp:230
#: src/gui/widgets/channeltab.cpp:81 src/gui/widgets/channeltab.cpp:90
-#: src/net/ea/gui/partytab.cpp:76
+#: src/net/ea/gui/partytab.cpp:79
msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
msgstr ""
@@ -195,7 +195,7 @@ msgstr ""
msgid "Command: /party <nick>"
msgstr ""
-#: src/commandhandler.cpp:229 src/net/ea/gui/partytab.cpp:75
+#: src/commandhandler.cpp:229 src/net/ea/gui/partytab.cpp:78
msgid "This command invites <nick> to party with you."
msgstr ""
@@ -508,7 +508,7 @@ msgstr "אישור"
msgid "Previous"
msgstr "הקודם"
-#: src/gui/charselectdialog.cpp:113 src/gui/npcdialog.cpp:44
+#: src/gui/charselectdialog.cpp:113 src/gui/npcdialog.cpp:43
msgid "Next"
msgstr "הבא"
@@ -533,7 +533,7 @@ msgstr "חדש"
#: src/gui/charselectdialog.cpp:118 src/gui/charselectdialog.cpp:165
#: src/gui/charselectdialog.cpp:166 src/gui/charselectdialog.cpp:315
-#: src/gui/setup_players.cpp:230
+#: src/gui/setup_players.cpp:228
msgid "Delete"
msgstr "מחק"
@@ -568,19 +568,15 @@ msgstr ""
msgid "%d players are present."
msgstr ""
-#: src/gui/chat.cpp:348 src/gui/chat.cpp:354
+#: src/gui/chat.cpp:333
msgid "Present: "
msgstr ""
-#: src/gui/chat.cpp:348 src/gui/chat.cpp:354
-msgid "; "
-msgstr ""
-
-#: src/gui/chat.cpp:349
+#: src/gui/chat.cpp:350
msgid "Attendance written to record log."
msgstr ""
-#: src/gui/chat.cpp:474
+#: src/gui/chat.cpp:475
#, c-format
msgid "Whispering to %s: %s"
msgstr ""
@@ -630,7 +626,7 @@ msgstr ""
msgid "Help"
msgstr ""
-#: src/gui/help.cpp:47 src/gui/npcdialog.cpp:45 src/gui/storagewindow.cpp:68
+#: src/gui/help.cpp:47 src/gui/npcdialog.cpp:44 src/gui/storagewindow.cpp:68
msgid "Close"
msgstr ""
@@ -723,7 +719,7 @@ msgid "Register"
msgstr "הרשם"
#: src/gui/magic.cpp:32 src/gui/skilldialog.cpp:117 src/gui/windowmenu.cpp:64
-#: src/localplayer.cpp:845
+#: src/localplayer.cpp:848
msgid "Magic"
msgstr ""
@@ -739,33 +735,25 @@ msgstr ""
msgid "Cast Test Spell 3"
msgstr ""
-#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
+#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:86
#, fuzzy
msgid "Map"
msgstr "מיני-מפה"
-#: src/gui/npcdialog.cpp:43
+#: src/gui/npcdialog.cpp:42
msgid "Waiting for server"
msgstr ""
-#: src/gui/npcdialog.cpp:46
+#: src/gui/npcdialog.cpp:45
#, fuzzy
msgid "Submit"
msgstr "יציאה"
-#: src/gui/npcdialog.cpp:49 src/gui/npcpostdialog.cpp:39
+#: src/gui/npcdialog.cpp:48 src/gui/npcpostdialog.cpp:39
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:95
-msgid "+"
-msgstr ""
-
-#: src/gui/npcdialog.cpp:96
-msgid "-"
-msgstr ""
-
-#: src/gui/npcdialog.cpp:105
+#: src/gui/npcdialog.cpp:104
msgid "Reset"
msgstr ""
@@ -773,8 +761,7 @@ msgstr ""
msgid "Send"
msgstr ""
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:268
-#: src/gui/setup_video.cpp:567
+#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:142
msgid "Text"
msgstr ""
@@ -826,8 +813,8 @@ msgstr ""
msgid "Is"
msgstr ""
-#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:33
-#: src/net/ea/gui/partytab.cpp:37
+#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:45
+#: src/net/ea/gui/partytab.cpp:39
msgid "Party"
msgstr ""
@@ -1295,26 +1282,22 @@ msgid "???"
msgstr ""
#: src/gui/setup_players.cpp:224
-msgid "Save player list"
-msgstr ""
-
-#: src/gui/setup_players.cpp:226
msgid "Allow trading"
msgstr ""
-#: src/gui/setup_players.cpp:228
+#: src/gui/setup_players.cpp:226
msgid "Allow whispers"
msgstr ""
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:230
msgid "Put all whispers in tabs"
msgstr ""
-#: src/gui/setup_players.cpp:234
+#: src/gui/setup_players.cpp:232
msgid "Players"
msgstr ""
-#: src/gui/setup_players.cpp:259
+#: src/gui/setup_players.cpp:257
msgid "When ignoring:"
msgstr ""
@@ -1335,157 +1318,147 @@ msgstr ""
msgid "Large"
msgstr ""
-#: src/gui/setup_video.cpp:151
+#: src/gui/setup_video.cpp:141
+msgid "No text"
+msgstr ""
+
+#: src/gui/setup_video.cpp:143
+msgid "Bubbles, no names"
+msgstr ""
+
+#: src/gui/setup_video.cpp:144
+msgid "Bubbles with names"
+msgstr ""
+
+#: src/gui/setup_video.cpp:153
+msgid "off"
+msgstr "כבוי"
+
+#: src/gui/setup_video.cpp:154 src/gui/setup_video.cpp:164
+msgid "low"
+msgstr "נמוך"
+
+#: src/gui/setup_video.cpp:155 src/gui/setup_video.cpp:166
+msgid "high"
+msgstr "גבוה"
+
+#: src/gui/setup_video.cpp:165
+msgid "medium"
+msgstr ""
+
+#: src/gui/setup_video.cpp:167
+msgid "max"
+msgstr ""
+
+#: src/gui/setup_video.cpp:187
msgid "Full screen"
msgstr "מסך מלא"
-#: src/gui/setup_video.cpp:152
+#: src/gui/setup_video.cpp:188
msgid "OpenGL"
msgstr "‏OpenGL"
-#: src/gui/setup_video.cpp:153
+#: src/gui/setup_video.cpp:189
msgid "Custom cursor"
msgstr "סמן-עכבר מותאם"
-#: src/gui/setup_video.cpp:155
+#: src/gui/setup_video.cpp:191
msgid "Visible names"
msgstr "שמות גלויים"
-#: src/gui/setup_video.cpp:157
+#: src/gui/setup_video.cpp:193
msgid "Particle effects"
msgstr ""
-#: src/gui/setup_video.cpp:159
+#: src/gui/setup_video.cpp:195
msgid "Show name"
msgstr ""
-#: src/gui/setup_video.cpp:160
+#: src/gui/setup_video.cpp:196
msgid "Show pickup notification"
msgstr ""
-#: src/gui/setup_video.cpp:161
+#: src/gui/setup_video.cpp:197
msgid "in chat"
msgstr ""
-#: src/gui/setup_video.cpp:162
+#: src/gui/setup_video.cpp:198
msgid "as particle"
msgstr ""
-#: src/gui/setup_video.cpp:167
+#: src/gui/setup_video.cpp:203
msgid "FPS Limit:"
msgstr "הגבלת FPS:"
-#: src/gui/setup_video.cpp:184
+#: src/gui/setup_video.cpp:214
msgid "Video"
msgstr "וידאו"
-#: src/gui/setup_video.cpp:189
+#: src/gui/setup_video.cpp:219
msgid "Overhead text"
msgstr ""
-#: src/gui/setup_video.cpp:190
+#: src/gui/setup_video.cpp:220
msgid "Gui opacity"
msgstr "אטימות Gui"
-#: src/gui/setup_video.cpp:191
-msgid "Scroll radius"
-msgstr "תווך גלילה"
-
-#: src/gui/setup_video.cpp:192
-msgid "Scroll laziness"
-msgstr "עצלנות גלילה"
-
-#: src/gui/setup_video.cpp:193
+#: src/gui/setup_video.cpp:221
msgid "Ambient FX"
msgstr "אופף FX"
-#: src/gui/setup_video.cpp:194
+#: src/gui/setup_video.cpp:222
msgid "Particle Detail"
msgstr ""
-#: src/gui/setup_video.cpp:195
+#: src/gui/setup_video.cpp:223
msgid "Font size"
msgstr ""
-#: src/gui/setup_video.cpp:265 src/gui/setup_video.cpp:564
-msgid "No text"
-msgstr ""
-
-#: src/gui/setup_video.cpp:271 src/gui/setup_video.cpp:570
-msgid "Bubbles, no names"
-msgstr ""
-
-#: src/gui/setup_video.cpp:274 src/gui/setup_video.cpp:573
-msgid "Bubbles with names"
-msgstr ""
-
-#: src/gui/setup_video.cpp:282 src/gui/setup_video.cpp:610
-msgid "off"
-msgstr "כבוי"
-
-#: src/gui/setup_video.cpp:285 src/gui/setup_video.cpp:296
-#: src/gui/setup_video.cpp:613 src/gui/setup_video.cpp:627
-msgid "low"
-msgstr "נמוך"
-
-#: src/gui/setup_video.cpp:288 src/gui/setup_video.cpp:302
-#: src/gui/setup_video.cpp:616 src/gui/setup_video.cpp:633
-msgid "high"
-msgstr "גבוה"
-
-#: src/gui/setup_video.cpp:299 src/gui/setup_video.cpp:630
-msgid "medium"
-msgstr ""
-
-#: src/gui/setup_video.cpp:305 src/gui/setup_video.cpp:636
-msgid "max"
-msgstr ""
-
-#: src/gui/setup_video.cpp:410
+#: src/gui/setup_video.cpp:356
msgid "Failed to switch to "
msgstr ""
-#: src/gui/setup_video.cpp:411
+#: src/gui/setup_video.cpp:357
msgid "windowed"
msgstr ""
-#: src/gui/setup_video.cpp:411
+#: src/gui/setup_video.cpp:357
msgid "fullscreen"
msgstr ""
-#: src/gui/setup_video.cpp:412
+#: src/gui/setup_video.cpp:358
msgid "mode and restoration of old mode also failed!"
msgstr ""
-#: src/gui/setup_video.cpp:421
+#: src/gui/setup_video.cpp:367
msgid "Switching to full screen"
msgstr "מחליף למסך מלא"
-#: src/gui/setup_video.cpp:422
+#: src/gui/setup_video.cpp:368
msgid "Restart needed for changes to take effect."
msgstr "נדרש איתחול כדי שהשינויים יהיו ברי-תוקף."
-#: src/gui/setup_video.cpp:434
+#: src/gui/setup_video.cpp:380
msgid "Changing OpenGL"
msgstr "משנה OpenGL"
-#: src/gui/setup_video.cpp:435
+#: src/gui/setup_video.cpp:381
msgid "Applying change to OpenGL requires restart."
msgstr "אישור שינויים עבור OpenGL דורש איתחול."
-#: src/gui/setup_video.cpp:520
+#: src/gui/setup_video.cpp:442
msgid "Screen resolution changed"
msgstr ""
-#: src/gui/setup_video.cpp:521
+#: src/gui/setup_video.cpp:443
msgid "Restart your client for the change to take effect."
msgstr ""
-#: src/gui/setup_video.cpp:545
+#: src/gui/setup_video.cpp:467
msgid "Particle effect settings changed."
msgstr ""
-#: src/gui/setup_video.cpp:546
+#: src/gui/setup_video.cpp:468
msgid "Changes will take effect on map change."
msgstr ""
@@ -2007,55 +1980,55 @@ msgstr ""
msgid "Ignore input 2"
msgstr ""
-#: src/localplayer.cpp:834
+#: src/localplayer.cpp:837
msgid "Unarmed"
msgstr ""
-#: src/localplayer.cpp:835
+#: src/localplayer.cpp:838
msgid "Knife"
msgstr ""
-#: src/localplayer.cpp:836
+#: src/localplayer.cpp:839
msgid "Sword"
msgstr ""
-#: src/localplayer.cpp:837
+#: src/localplayer.cpp:840
msgid "Polearm"
msgstr ""
-#: src/localplayer.cpp:838
+#: src/localplayer.cpp:841
msgid "Staff"
msgstr ""
-#: src/localplayer.cpp:839
+#: src/localplayer.cpp:842
msgid "Whip"
msgstr ""
-#: src/localplayer.cpp:840
+#: src/localplayer.cpp:843
msgid "Bow"
msgstr ""
-#: src/localplayer.cpp:841
+#: src/localplayer.cpp:844
msgid "Shooting"
msgstr ""
-#: src/localplayer.cpp:842
+#: src/localplayer.cpp:845
msgid "Mace"
msgstr ""
-#: src/localplayer.cpp:843
+#: src/localplayer.cpp:846
msgid "Axe"
msgstr ""
-#: src/localplayer.cpp:844
+#: src/localplayer.cpp:847
msgid "Thrown"
msgstr ""
-#: src/localplayer.cpp:846
+#: src/localplayer.cpp:849
msgid "Craft"
msgstr ""
-#: src/localplayer.cpp:847
+#: src/localplayer.cpp:850
msgid "Unknown Skill"
msgstr ""
@@ -2267,193 +2240,193 @@ msgstr ""
msgid "Unable to unequip."
msgstr ""
-#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:82
-#, c-format
-msgid "Strength: %d"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:81
+#, fuzzy, c-format
+msgid "Strength %+d"
+msgstr "עוצמה:"
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:84
-#, c-format
-msgid "Agility: %d"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:82
+#, fuzzy, c-format
+msgid "Agility %+d"
+msgstr "זריזות:"
-#: src/net/ea/generalhandler.cpp:96 src/net/tmwserv/generalhandler.cpp:88
-#, c-format
-msgid "Vitality: %d"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:84
+#, fuzzy, c-format
+msgid "Vitality %+d"
+msgstr "חיוניות:"
-#: src/net/ea/generalhandler.cpp:98 src/net/tmwserv/generalhandler.cpp:90
-#, c-format
-msgid "Intelligence: %d"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:85
+#, fuzzy, c-format
+msgid "Intelligence %+d"
+msgstr "תבונה:"
-#: src/net/ea/generalhandler.cpp:100 src/net/tmwserv/generalhandler.cpp:86
-#, c-format
-msgid "Dexterity: %d"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:83
+#, fuzzy, c-format
+msgid "Dexterity %+d"
+msgstr "מיומנות:"
-#: src/net/ea/generalhandler.cpp:102
-#, c-format
-msgid "Luck: %d"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:96
+#, fuzzy, c-format
+msgid "Luck %+d"
+msgstr "התקפה %+d"
-#: src/net/ea/generalhandler.cpp:125
+#: src/net/ea/generalhandler.cpp:118
msgid "Authentication failed"
msgstr ""
-#: src/net/ea/generalhandler.cpp:128
+#: src/net/ea/generalhandler.cpp:121
msgid "No servers available"
msgstr ""
-#: src/net/ea/generalhandler.cpp:132
+#: src/net/ea/generalhandler.cpp:125
msgid "Someone else is trying to use this account"
msgstr ""
-#: src/net/ea/generalhandler.cpp:135
+#: src/net/ea/generalhandler.cpp:128
msgid "This account is already logged in"
msgstr ""
-#: src/net/ea/generalhandler.cpp:138
+#: src/net/ea/generalhandler.cpp:131
msgid "Speed hack detected"
msgstr ""
-#: src/net/ea/generalhandler.cpp:141
+#: src/net/ea/generalhandler.cpp:134
msgid "Duplicated login"
msgstr ""
-#: src/net/ea/generalhandler.cpp:144
+#: src/net/ea/generalhandler.cpp:137
msgid "Unknown connection error"
msgstr ""
-#: src/net/ea/generalhandler.cpp:201
+#: src/net/ea/generalhandler.cpp:194
msgid "Got disconnected from server!"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:52
+#: src/net/ea/gui/partytab.cpp:55
msgid "/help > Display this help."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:53
+#: src/net/ea/gui/partytab.cpp:56
msgid "/create > Create a new party"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:54
+#: src/net/ea/gui/partytab.cpp:57
msgid "/new > Alias of create"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:55
+#: src/net/ea/gui/partytab.cpp:58
msgid "/invite > Invite a player to your party"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:56
+#: src/net/ea/gui/partytab.cpp:59
msgid "/leave > Leave the party you are in"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:57
+#: src/net/ea/gui/partytab.cpp:60
msgid "/kick > Kick some one from the party you are in"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:58
+#: src/net/ea/gui/partytab.cpp:61
msgid "/item > Show/change party item sharing options"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:59
+#: src/net/ea/gui/partytab.cpp:62
msgid "/exp > Show/change party experience sharing options"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:68
+#: src/net/ea/gui/partytab.cpp:71
msgid "Command: /new <party-name>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:69
+#: src/net/ea/gui/partytab.cpp:72
msgid "Command: /create <party-name>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:70
+#: src/net/ea/gui/partytab.cpp:73
msgid "These commands create a new party called <party-name>."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:74
+#: src/net/ea/gui/partytab.cpp:77
msgid "Command: /invite <nick>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:81
+#: src/net/ea/gui/partytab.cpp:84
msgid "Command: /leave"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:82
+#: src/net/ea/gui/partytab.cpp:85
msgid "This command causes the player to leave the party."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/ea/gui/partytab.cpp:89
msgid "Command: /item <policy>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:87
+#: src/net/ea/gui/partytab.cpp:90
msgid "This command changes the party's item sharing policy."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:88
+#: src/net/ea/gui/partytab.cpp:91
msgid ""
"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
"\"0\", \"no\", \"false\" to disable item sharing."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:94
msgid "Command: /item"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:92
+#: src/net/ea/gui/partytab.cpp:95
msgid "This command displays the party's current item sharing policy."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:96
+#: src/net/ea/gui/partytab.cpp:99
msgid "Command: /exp <policy>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/ea/gui/partytab.cpp:100
msgid "This command changes the party's experience sharing policy."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:98
+#: src/net/ea/gui/partytab.cpp:101
msgid ""
"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:104
msgid "Command: /exp"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:102
+#: src/net/ea/gui/partytab.cpp:105
msgid "This command displays the party's current experience sharing policy."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:110
+#: src/net/ea/gui/partytab.cpp:113
msgid "Party name is missing."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:133 src/net/ea/partyhandler.cpp:191
+#: src/net/ea/gui/partytab.cpp:136 src/net/ea/partyhandler.cpp:194
msgid "Item sharing enabled."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:136 src/net/ea/partyhandler.cpp:197
+#: src/net/ea/gui/partytab.cpp:139 src/net/ea/partyhandler.cpp:200
msgid "Item sharing disabled."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:139 src/net/ea/partyhandler.cpp:203
+#: src/net/ea/gui/partytab.cpp:142 src/net/ea/partyhandler.cpp:206
msgid "Item sharing not possible."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:165 src/net/ea/partyhandler.cpp:168
+#: src/net/ea/gui/partytab.cpp:168 src/net/ea/partyhandler.cpp:171
msgid "Experience sharing enabled."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:168 src/net/ea/partyhandler.cpp:174
+#: src/net/ea/gui/partytab.cpp:171 src/net/ea/partyhandler.cpp:177
msgid "Experience sharing disabled."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:171 src/net/ea/partyhandler.cpp:180
+#: src/net/ea/gui/partytab.cpp:174 src/net/ea/partyhandler.cpp:183
msgid "Experience sharing not possible."
msgstr ""
@@ -2516,45 +2489,45 @@ msgstr ""
msgid "Party successfully created."
msgstr ""
-#: src/net/ea/partyhandler.cpp:115
+#: src/net/ea/partyhandler.cpp:118
#, c-format
msgid "%s is already a member of a party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:119
+#: src/net/ea/partyhandler.cpp:122
#, c-format
msgid "%s refused your invitation."
msgstr ""
-#: src/net/ea/partyhandler.cpp:123
+#: src/net/ea/partyhandler.cpp:126
#, c-format
msgid "%s is now a member of your party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:127
+#: src/net/ea/partyhandler.cpp:130
#, c-format
msgid "Unknown invite response for %s."
msgstr ""
-#: src/net/ea/partyhandler.cpp:232
+#: src/net/ea/partyhandler.cpp:235
msgid "You have left the party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:235
+#: src/net/ea/partyhandler.cpp:239
#, c-format
msgid "%s has left your party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:272
+#: src/net/ea/partyhandler.cpp:274
#, c-format
msgid "An unknown member tried to say: %s"
msgstr ""
-#: src/net/ea/partyhandler.cpp:298
+#: src/net/ea/partyhandler.cpp:300
msgid "Inviting like this isn't supported at the moment."
msgstr ""
-#: src/net/ea/partyhandler.cpp:327
+#: src/net/ea/partyhandler.cpp:329
#, c-format
msgid "%s is not in your party!"
msgstr ""
@@ -2847,10 +2820,10 @@ msgstr "כח רצון:"
msgid "Topic: "
msgstr ""
-#: src/net/tmwserv/generalhandler.cpp:92
-#, c-format
-msgid "Willpower: %d"
-msgstr ""
+#: src/net/tmwserv/generalhandler.cpp:86
+#, fuzzy, c-format
+msgid "Willpower %+d"
+msgstr "כח רצון:"
#: src/net/tmwserv/loginhandler.cpp:80
msgid "Wrong magic_token"
@@ -2947,3 +2920,9 @@ msgstr ""
#: src/resources/npcdb.cpp:53
msgid "NPC Database: Error while loading npcs.xml!"
msgstr ""
+
+#~ msgid "Scroll radius"
+#~ msgstr "תווך גלילה"
+
+#~ msgid "Scroll laziness"
+#~ msgstr "עצלנות גלילה"
diff --git a/po/hr.po b/po/hr.po
index 716a0b03..328d0a55 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: tmw\n"
"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-05-10 16:39+0200\n"
+"POT-Creation-Date: 2009-05-12 00:11+0200\n"
"PO-Revision-Date: 2009-04-21 16:37+0000\n"
"Last-Translator: Bjørn Lindeijer <bjorn@lindeijer.nl>\n"
"Language-Team: Croatian <hr@li.org>\n"
@@ -175,7 +175,7 @@ msgstr ""
#: src/commandhandler.cpp:216 src/commandhandler.cpp:230
#: src/gui/widgets/channeltab.cpp:81 src/gui/widgets/channeltab.cpp:90
-#: src/net/ea/gui/partytab.cpp:76
+#: src/net/ea/gui/partytab.cpp:79
msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
msgstr ""
@@ -195,7 +195,7 @@ msgstr ""
msgid "Command: /party <nick>"
msgstr ""
-#: src/commandhandler.cpp:229 src/net/ea/gui/partytab.cpp:75
+#: src/commandhandler.cpp:229 src/net/ea/gui/partytab.cpp:78
msgid "This command invites <nick> to party with you."
msgstr ""
@@ -508,7 +508,7 @@ msgstr "U redu"
msgid "Previous"
msgstr "Prethodni"
-#: src/gui/charselectdialog.cpp:113 src/gui/npcdialog.cpp:44
+#: src/gui/charselectdialog.cpp:113 src/gui/npcdialog.cpp:43
msgid "Next"
msgstr "Slijedeći"
@@ -533,7 +533,7 @@ msgstr "Novi"
#: src/gui/charselectdialog.cpp:118 src/gui/charselectdialog.cpp:165
#: src/gui/charselectdialog.cpp:166 src/gui/charselectdialog.cpp:315
-#: src/gui/setup_players.cpp:230
+#: src/gui/setup_players.cpp:228
msgid "Delete"
msgstr "Obriši"
@@ -568,19 +568,15 @@ msgstr ""
msgid "%d players are present."
msgstr ""
-#: src/gui/chat.cpp:348 src/gui/chat.cpp:354
+#: src/gui/chat.cpp:333
msgid "Present: "
msgstr ""
-#: src/gui/chat.cpp:348 src/gui/chat.cpp:354
-msgid "; "
-msgstr ""
-
-#: src/gui/chat.cpp:349
+#: src/gui/chat.cpp:350
msgid "Attendance written to record log."
msgstr ""
-#: src/gui/chat.cpp:474
+#: src/gui/chat.cpp:475
#, c-format
msgid "Whispering to %s: %s"
msgstr "Šaptaj prema %s: %s"
@@ -630,7 +626,7 @@ msgstr ""
msgid "Help"
msgstr ""
-#: src/gui/help.cpp:47 src/gui/npcdialog.cpp:45 src/gui/storagewindow.cpp:68
+#: src/gui/help.cpp:47 src/gui/npcdialog.cpp:44 src/gui/storagewindow.cpp:68
msgid "Close"
msgstr ""
@@ -723,7 +719,7 @@ msgid "Register"
msgstr "Registriraj se"
#: src/gui/magic.cpp:32 src/gui/skilldialog.cpp:117 src/gui/windowmenu.cpp:64
-#: src/localplayer.cpp:845
+#: src/localplayer.cpp:848
msgid "Magic"
msgstr ""
@@ -739,33 +735,25 @@ msgstr ""
msgid "Cast Test Spell 3"
msgstr ""
-#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
+#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:86
#, fuzzy
msgid "Map"
msgstr "Karta"
-#: src/gui/npcdialog.cpp:43
+#: src/gui/npcdialog.cpp:42
msgid "Waiting for server"
msgstr ""
-#: src/gui/npcdialog.cpp:46
+#: src/gui/npcdialog.cpp:45
#, fuzzy
msgid "Submit"
msgstr "Izlaz"
-#: src/gui/npcdialog.cpp:49 src/gui/npcpostdialog.cpp:39
+#: src/gui/npcdialog.cpp:48 src/gui/npcpostdialog.cpp:39
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:95
-msgid "+"
-msgstr ""
-
-#: src/gui/npcdialog.cpp:96
-msgid "-"
-msgstr ""
-
-#: src/gui/npcdialog.cpp:105
+#: src/gui/npcdialog.cpp:104
msgid "Reset"
msgstr ""
@@ -773,8 +761,7 @@ msgstr ""
msgid "Send"
msgstr ""
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:268
-#: src/gui/setup_video.cpp:567
+#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:142
msgid "Text"
msgstr ""
@@ -826,8 +813,8 @@ msgstr ""
msgid "Is"
msgstr ""
-#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:33
-#: src/net/ea/gui/partytab.cpp:37
+#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:45
+#: src/net/ea/gui/partytab.cpp:39
msgid "Party"
msgstr ""
@@ -1295,26 +1282,22 @@ msgid "???"
msgstr ""
#: src/gui/setup_players.cpp:224
-msgid "Save player list"
-msgstr ""
-
-#: src/gui/setup_players.cpp:226
msgid "Allow trading"
msgstr ""
-#: src/gui/setup_players.cpp:228
+#: src/gui/setup_players.cpp:226
msgid "Allow whispers"
msgstr ""
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:230
msgid "Put all whispers in tabs"
msgstr ""
-#: src/gui/setup_players.cpp:234
+#: src/gui/setup_players.cpp:232
msgid "Players"
msgstr ""
-#: src/gui/setup_players.cpp:259
+#: src/gui/setup_players.cpp:257
msgid "When ignoring:"
msgstr ""
@@ -1335,157 +1318,147 @@ msgstr ""
msgid "Large"
msgstr ""
-#: src/gui/setup_video.cpp:151
+#: src/gui/setup_video.cpp:141
+msgid "No text"
+msgstr ""
+
+#: src/gui/setup_video.cpp:143
+msgid "Bubbles, no names"
+msgstr ""
+
+#: src/gui/setup_video.cpp:144
+msgid "Bubbles with names"
+msgstr ""
+
+#: src/gui/setup_video.cpp:153
+msgid "off"
+msgstr "isključeno"
+
+#: src/gui/setup_video.cpp:154 src/gui/setup_video.cpp:164
+msgid "low"
+msgstr "nisko"
+
+#: src/gui/setup_video.cpp:155 src/gui/setup_video.cpp:166
+msgid "high"
+msgstr "visoko"
+
+#: src/gui/setup_video.cpp:165
+msgid "medium"
+msgstr ""
+
+#: src/gui/setup_video.cpp:167
+msgid "max"
+msgstr ""
+
+#: src/gui/setup_video.cpp:187
msgid "Full screen"
msgstr "Pregled na čitavom ekranu"
-#: src/gui/setup_video.cpp:152
+#: src/gui/setup_video.cpp:188
msgid "OpenGL"
msgstr "OpenGL"
-#: src/gui/setup_video.cpp:153
+#: src/gui/setup_video.cpp:189
msgid "Custom cursor"
msgstr "Vlastiti kursor"
-#: src/gui/setup_video.cpp:155
+#: src/gui/setup_video.cpp:191
msgid "Visible names"
msgstr "Vidljiva imena"
-#: src/gui/setup_video.cpp:157
+#: src/gui/setup_video.cpp:193
msgid "Particle effects"
msgstr ""
-#: src/gui/setup_video.cpp:159
+#: src/gui/setup_video.cpp:195
msgid "Show name"
msgstr ""
-#: src/gui/setup_video.cpp:160
+#: src/gui/setup_video.cpp:196
msgid "Show pickup notification"
msgstr ""
-#: src/gui/setup_video.cpp:161
+#: src/gui/setup_video.cpp:197
msgid "in chat"
msgstr ""
-#: src/gui/setup_video.cpp:162
+#: src/gui/setup_video.cpp:198
msgid "as particle"
msgstr ""
-#: src/gui/setup_video.cpp:167
+#: src/gui/setup_video.cpp:203
msgid "FPS Limit:"
msgstr "Ograničenje sličica u sekundi"
-#: src/gui/setup_video.cpp:184
+#: src/gui/setup_video.cpp:214
msgid "Video"
msgstr "Slika"
-#: src/gui/setup_video.cpp:189
+#: src/gui/setup_video.cpp:219
msgid "Overhead text"
msgstr ""
-#: src/gui/setup_video.cpp:190
+#: src/gui/setup_video.cpp:220
msgid "Gui opacity"
msgstr "Prozirnost sučelja"
-#: src/gui/setup_video.cpp:191
-msgid "Scroll radius"
-msgstr "Polumjer klizanja"
-
-#: src/gui/setup_video.cpp:192
-msgid "Scroll laziness"
-msgstr "Brzina klizanja"
-
-#: src/gui/setup_video.cpp:193
+#: src/gui/setup_video.cpp:221
msgid "Ambient FX"
msgstr "Efekti okruženja"
-#: src/gui/setup_video.cpp:194
+#: src/gui/setup_video.cpp:222
msgid "Particle Detail"
msgstr ""
-#: src/gui/setup_video.cpp:195
+#: src/gui/setup_video.cpp:223
msgid "Font size"
msgstr ""
-#: src/gui/setup_video.cpp:265 src/gui/setup_video.cpp:564
-msgid "No text"
-msgstr ""
-
-#: src/gui/setup_video.cpp:271 src/gui/setup_video.cpp:570
-msgid "Bubbles, no names"
-msgstr ""
-
-#: src/gui/setup_video.cpp:274 src/gui/setup_video.cpp:573
-msgid "Bubbles with names"
-msgstr ""
-
-#: src/gui/setup_video.cpp:282 src/gui/setup_video.cpp:610
-msgid "off"
-msgstr "isključeno"
-
-#: src/gui/setup_video.cpp:285 src/gui/setup_video.cpp:296
-#: src/gui/setup_video.cpp:613 src/gui/setup_video.cpp:627
-msgid "low"
-msgstr "nisko"
-
-#: src/gui/setup_video.cpp:288 src/gui/setup_video.cpp:302
-#: src/gui/setup_video.cpp:616 src/gui/setup_video.cpp:633
-msgid "high"
-msgstr "visoko"
-
-#: src/gui/setup_video.cpp:299 src/gui/setup_video.cpp:630
-msgid "medium"
-msgstr ""
-
-#: src/gui/setup_video.cpp:305 src/gui/setup_video.cpp:636
-msgid "max"
-msgstr ""
-
-#: src/gui/setup_video.cpp:410
+#: src/gui/setup_video.cpp:356
msgid "Failed to switch to "
msgstr ""
-#: src/gui/setup_video.cpp:411
+#: src/gui/setup_video.cpp:357
msgid "windowed"
msgstr ""
-#: src/gui/setup_video.cpp:411
+#: src/gui/setup_video.cpp:357
msgid "fullscreen"
msgstr ""
-#: src/gui/setup_video.cpp:412
+#: src/gui/setup_video.cpp:358
msgid "mode and restoration of old mode also failed!"
msgstr ""
-#: src/gui/setup_video.cpp:421
+#: src/gui/setup_video.cpp:367
msgid "Switching to full screen"
msgstr "Prebacivanje u pregled na čitavom ekranu"
-#: src/gui/setup_video.cpp:422
+#: src/gui/setup_video.cpp:368
msgid "Restart needed for changes to take effect."
msgstr "Potrebno je ponovno pokrenuti klijent za izvršavanje promjena."
-#: src/gui/setup_video.cpp:434
+#: src/gui/setup_video.cpp:380
msgid "Changing OpenGL"
msgstr "Promjena OpenGL-a"
-#: src/gui/setup_video.cpp:435
+#: src/gui/setup_video.cpp:381
msgid "Applying change to OpenGL requires restart."
msgstr "Izmjene OpenGL-a zahtjevaju ponovno pokretanje klijenta."
-#: src/gui/setup_video.cpp:520
+#: src/gui/setup_video.cpp:442
msgid "Screen resolution changed"
msgstr ""
-#: src/gui/setup_video.cpp:521
+#: src/gui/setup_video.cpp:443
msgid "Restart your client for the change to take effect."
msgstr ""
-#: src/gui/setup_video.cpp:545
+#: src/gui/setup_video.cpp:467
msgid "Particle effect settings changed."
msgstr ""
-#: src/gui/setup_video.cpp:546
+#: src/gui/setup_video.cpp:468
msgid "Changes will take effect on map change."
msgstr ""
@@ -2007,55 +1980,55 @@ msgstr ""
msgid "Ignore input 2"
msgstr ""
-#: src/localplayer.cpp:834
+#: src/localplayer.cpp:837
msgid "Unarmed"
msgstr ""
-#: src/localplayer.cpp:835
+#: src/localplayer.cpp:838
msgid "Knife"
msgstr ""
-#: src/localplayer.cpp:836
+#: src/localplayer.cpp:839
msgid "Sword"
msgstr ""
-#: src/localplayer.cpp:837
+#: src/localplayer.cpp:840
msgid "Polearm"
msgstr ""
-#: src/localplayer.cpp:838
+#: src/localplayer.cpp:841
msgid "Staff"
msgstr ""
-#: src/localplayer.cpp:839
+#: src/localplayer.cpp:842
msgid "Whip"
msgstr ""
-#: src/localplayer.cpp:840
+#: src/localplayer.cpp:843
msgid "Bow"
msgstr ""
-#: src/localplayer.cpp:841
+#: src/localplayer.cpp:844
msgid "Shooting"
msgstr ""
-#: src/localplayer.cpp:842
+#: src/localplayer.cpp:845
msgid "Mace"
msgstr ""
-#: src/localplayer.cpp:843
+#: src/localplayer.cpp:846
msgid "Axe"
msgstr ""
-#: src/localplayer.cpp:844
+#: src/localplayer.cpp:847
msgid "Thrown"
msgstr ""
-#: src/localplayer.cpp:846
+#: src/localplayer.cpp:849
msgid "Craft"
msgstr ""
-#: src/localplayer.cpp:847
+#: src/localplayer.cpp:850
msgid "Unknown Skill"
msgstr ""
@@ -2267,193 +2240,193 @@ msgstr ""
msgid "Unable to unequip."
msgstr ""
-#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:82
-#, c-format
-msgid "Strength: %d"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:81
+#, fuzzy, c-format
+msgid "Strength %+d"
+msgstr "Snaga:"
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:84
-#, c-format
-msgid "Agility: %d"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:82
+#, fuzzy, c-format
+msgid "Agility %+d"
+msgstr "Okretnost:"
-#: src/net/ea/generalhandler.cpp:96 src/net/tmwserv/generalhandler.cpp:88
-#, c-format
-msgid "Vitality: %d"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:84
+#, fuzzy, c-format
+msgid "Vitality %+d"
+msgstr "Vitalnost:"
-#: src/net/ea/generalhandler.cpp:98 src/net/tmwserv/generalhandler.cpp:90
-#, c-format
-msgid "Intelligence: %d"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:85
+#, fuzzy, c-format
+msgid "Intelligence %+d"
+msgstr "Inteligencija:"
-#: src/net/ea/generalhandler.cpp:100 src/net/tmwserv/generalhandler.cpp:86
-#, c-format
-msgid "Dexterity: %d"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:83
+#, fuzzy, c-format
+msgid "Dexterity %+d"
+msgstr "Spretnost:"
-#: src/net/ea/generalhandler.cpp:102
-#, c-format
-msgid "Luck: %d"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:96
+#, fuzzy, c-format
+msgid "Luck %+d"
+msgstr "Napad %+d"
-#: src/net/ea/generalhandler.cpp:125
+#: src/net/ea/generalhandler.cpp:118
msgid "Authentication failed"
msgstr ""
-#: src/net/ea/generalhandler.cpp:128
+#: src/net/ea/generalhandler.cpp:121
msgid "No servers available"
msgstr ""
-#: src/net/ea/generalhandler.cpp:132
+#: src/net/ea/generalhandler.cpp:125
msgid "Someone else is trying to use this account"
msgstr ""
-#: src/net/ea/generalhandler.cpp:135
+#: src/net/ea/generalhandler.cpp:128
msgid "This account is already logged in"
msgstr ""
-#: src/net/ea/generalhandler.cpp:138
+#: src/net/ea/generalhandler.cpp:131
msgid "Speed hack detected"
msgstr ""
-#: src/net/ea/generalhandler.cpp:141
+#: src/net/ea/generalhandler.cpp:134
msgid "Duplicated login"
msgstr ""
-#: src/net/ea/generalhandler.cpp:144
+#: src/net/ea/generalhandler.cpp:137
msgid "Unknown connection error"
msgstr ""
-#: src/net/ea/generalhandler.cpp:201
+#: src/net/ea/generalhandler.cpp:194
msgid "Got disconnected from server!"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:52
+#: src/net/ea/gui/partytab.cpp:55
msgid "/help > Display this help."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:53
+#: src/net/ea/gui/partytab.cpp:56
msgid "/create > Create a new party"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:54
+#: src/net/ea/gui/partytab.cpp:57
msgid "/new > Alias of create"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:55
+#: src/net/ea/gui/partytab.cpp:58
msgid "/invite > Invite a player to your party"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:56
+#: src/net/ea/gui/partytab.cpp:59
msgid "/leave > Leave the party you are in"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:57
+#: src/net/ea/gui/partytab.cpp:60
msgid "/kick > Kick some one from the party you are in"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:58
+#: src/net/ea/gui/partytab.cpp:61
msgid "/item > Show/change party item sharing options"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:59
+#: src/net/ea/gui/partytab.cpp:62
msgid "/exp > Show/change party experience sharing options"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:68
+#: src/net/ea/gui/partytab.cpp:71
msgid "Command: /new <party-name>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:69
+#: src/net/ea/gui/partytab.cpp:72
msgid "Command: /create <party-name>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:70
+#: src/net/ea/gui/partytab.cpp:73
msgid "These commands create a new party called <party-name>."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:74
+#: src/net/ea/gui/partytab.cpp:77
msgid "Command: /invite <nick>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:81
+#: src/net/ea/gui/partytab.cpp:84
msgid "Command: /leave"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:82
+#: src/net/ea/gui/partytab.cpp:85
msgid "This command causes the player to leave the party."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/ea/gui/partytab.cpp:89
msgid "Command: /item <policy>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:87
+#: src/net/ea/gui/partytab.cpp:90
msgid "This command changes the party's item sharing policy."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:88
+#: src/net/ea/gui/partytab.cpp:91
msgid ""
"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
"\"0\", \"no\", \"false\" to disable item sharing."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:94
msgid "Command: /item"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:92
+#: src/net/ea/gui/partytab.cpp:95
msgid "This command displays the party's current item sharing policy."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:96
+#: src/net/ea/gui/partytab.cpp:99
msgid "Command: /exp <policy>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/ea/gui/partytab.cpp:100
msgid "This command changes the party's experience sharing policy."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:98
+#: src/net/ea/gui/partytab.cpp:101
msgid ""
"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:104
msgid "Command: /exp"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:102
+#: src/net/ea/gui/partytab.cpp:105
msgid "This command displays the party's current experience sharing policy."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:110
+#: src/net/ea/gui/partytab.cpp:113
msgid "Party name is missing."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:133 src/net/ea/partyhandler.cpp:191
+#: src/net/ea/gui/partytab.cpp:136 src/net/ea/partyhandler.cpp:194
msgid "Item sharing enabled."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:136 src/net/ea/partyhandler.cpp:197
+#: src/net/ea/gui/partytab.cpp:139 src/net/ea/partyhandler.cpp:200
msgid "Item sharing disabled."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:139 src/net/ea/partyhandler.cpp:203
+#: src/net/ea/gui/partytab.cpp:142 src/net/ea/partyhandler.cpp:206
msgid "Item sharing not possible."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:165 src/net/ea/partyhandler.cpp:168
+#: src/net/ea/gui/partytab.cpp:168 src/net/ea/partyhandler.cpp:171
msgid "Experience sharing enabled."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:168 src/net/ea/partyhandler.cpp:174
+#: src/net/ea/gui/partytab.cpp:171 src/net/ea/partyhandler.cpp:177
msgid "Experience sharing disabled."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:171 src/net/ea/partyhandler.cpp:180
+#: src/net/ea/gui/partytab.cpp:174 src/net/ea/partyhandler.cpp:183
msgid "Experience sharing not possible."
msgstr ""
@@ -2516,45 +2489,45 @@ msgstr ""
msgid "Party successfully created."
msgstr ""
-#: src/net/ea/partyhandler.cpp:115
+#: src/net/ea/partyhandler.cpp:118
#, c-format
msgid "%s is already a member of a party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:119
+#: src/net/ea/partyhandler.cpp:122
#, c-format
msgid "%s refused your invitation."
msgstr ""
-#: src/net/ea/partyhandler.cpp:123
+#: src/net/ea/partyhandler.cpp:126
#, c-format
msgid "%s is now a member of your party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:127
+#: src/net/ea/partyhandler.cpp:130
#, c-format
msgid "Unknown invite response for %s."
msgstr ""
-#: src/net/ea/partyhandler.cpp:232
+#: src/net/ea/partyhandler.cpp:235
msgid "You have left the party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:235
+#: src/net/ea/partyhandler.cpp:239
#, c-format
msgid "%s has left your party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:272
+#: src/net/ea/partyhandler.cpp:274
#, c-format
msgid "An unknown member tried to say: %s"
msgstr ""
-#: src/net/ea/partyhandler.cpp:298
+#: src/net/ea/partyhandler.cpp:300
msgid "Inviting like this isn't supported at the moment."
msgstr ""
-#: src/net/ea/partyhandler.cpp:327
+#: src/net/ea/partyhandler.cpp:329
#, c-format
msgid "%s is not in your party!"
msgstr ""
@@ -2847,10 +2820,10 @@ msgstr "Snaga volje:"
msgid "Topic: "
msgstr ""
-#: src/net/tmwserv/generalhandler.cpp:92
-#, c-format
-msgid "Willpower: %d"
-msgstr ""
+#: src/net/tmwserv/generalhandler.cpp:86
+#, fuzzy, c-format
+msgid "Willpower %+d"
+msgstr "Snaga volje:"
#: src/net/tmwserv/loginhandler.cpp:80
msgid "Wrong magic_token"
@@ -2947,3 +2920,9 @@ msgstr ""
#: src/resources/npcdb.cpp:53
msgid "NPC Database: Error while loading npcs.xml!"
msgstr ""
+
+#~ msgid "Scroll radius"
+#~ msgstr "Polumjer klizanja"
+
+#~ msgid "Scroll laziness"
+#~ msgstr "Brzina klizanja"
diff --git a/po/id.po b/po/id.po
index 129d3007..bc219868 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: tmw\n"
"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-05-10 16:39+0200\n"
+"POT-Creation-Date: 2009-05-12 00:11+0200\n"
"PO-Revision-Date: 2009-01-09 12:22+0000\n"
"Last-Translator: ActiveFile <activefile@gmail.com>\n"
"Language-Team: Indonesian <id@li.org>\n"
@@ -175,7 +175,7 @@ msgstr ""
#: src/commandhandler.cpp:216 src/commandhandler.cpp:230
#: src/gui/widgets/channeltab.cpp:81 src/gui/widgets/channeltab.cpp:90
-#: src/net/ea/gui/partytab.cpp:76
+#: src/net/ea/gui/partytab.cpp:79
msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
msgstr ""
@@ -195,7 +195,7 @@ msgstr ""
msgid "Command: /party <nick>"
msgstr ""
-#: src/commandhandler.cpp:229 src/net/ea/gui/partytab.cpp:75
+#: src/commandhandler.cpp:229 src/net/ea/gui/partytab.cpp:78
msgid "This command invites <nick> to party with you."
msgstr ""
@@ -508,7 +508,7 @@ msgstr "Ok"
msgid "Previous"
msgstr "Sebelumnya"
-#: src/gui/charselectdialog.cpp:113 src/gui/npcdialog.cpp:44
+#: src/gui/charselectdialog.cpp:113 src/gui/npcdialog.cpp:43
msgid "Next"
msgstr "Berikutnya"
@@ -533,7 +533,7 @@ msgstr "Buat baru"
#: src/gui/charselectdialog.cpp:118 src/gui/charselectdialog.cpp:165
#: src/gui/charselectdialog.cpp:166 src/gui/charselectdialog.cpp:315
-#: src/gui/setup_players.cpp:230
+#: src/gui/setup_players.cpp:228
msgid "Delete"
msgstr "Hapus"
@@ -568,19 +568,15 @@ msgstr ""
msgid "%d players are present."
msgstr ""
-#: src/gui/chat.cpp:348 src/gui/chat.cpp:354
+#: src/gui/chat.cpp:333
msgid "Present: "
msgstr ""
-#: src/gui/chat.cpp:348 src/gui/chat.cpp:354
-msgid "; "
-msgstr ""
-
-#: src/gui/chat.cpp:349
+#: src/gui/chat.cpp:350
msgid "Attendance written to record log."
msgstr ""
-#: src/gui/chat.cpp:474
+#: src/gui/chat.cpp:475
#, c-format
msgid "Whispering to %s: %s"
msgstr ""
@@ -630,7 +626,7 @@ msgstr ""
msgid "Help"
msgstr ""
-#: src/gui/help.cpp:47 src/gui/npcdialog.cpp:45 src/gui/storagewindow.cpp:68
+#: src/gui/help.cpp:47 src/gui/npcdialog.cpp:44 src/gui/storagewindow.cpp:68
msgid "Close"
msgstr ""
@@ -723,7 +719,7 @@ msgid "Register"
msgstr "Mendaftar"
#: src/gui/magic.cpp:32 src/gui/skilldialog.cpp:117 src/gui/windowmenu.cpp:64
-#: src/localplayer.cpp:845
+#: src/localplayer.cpp:848
msgid "Magic"
msgstr ""
@@ -739,33 +735,25 @@ msgstr ""
msgid "Cast Test Spell 3"
msgstr ""
-#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
+#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:86
#, fuzzy
msgid "Map"
msgstr "MiniMap"
-#: src/gui/npcdialog.cpp:43
+#: src/gui/npcdialog.cpp:42
msgid "Waiting for server"
msgstr ""
-#: src/gui/npcdialog.cpp:46
+#: src/gui/npcdialog.cpp:45
#, fuzzy
msgid "Submit"
msgstr "Keluar"
-#: src/gui/npcdialog.cpp:49 src/gui/npcpostdialog.cpp:39
+#: src/gui/npcdialog.cpp:48 src/gui/npcpostdialog.cpp:39
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:95
-msgid "+"
-msgstr ""
-
-#: src/gui/npcdialog.cpp:96
-msgid "-"
-msgstr ""
-
-#: src/gui/npcdialog.cpp:105
+#: src/gui/npcdialog.cpp:104
msgid "Reset"
msgstr ""
@@ -773,8 +761,7 @@ msgstr ""
msgid "Send"
msgstr ""
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:268
-#: src/gui/setup_video.cpp:567
+#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:142
msgid "Text"
msgstr ""
@@ -826,8 +813,8 @@ msgstr ""
msgid "Is"
msgstr ""
-#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:33
-#: src/net/ea/gui/partytab.cpp:37
+#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:45
+#: src/net/ea/gui/partytab.cpp:39
msgid "Party"
msgstr ""
@@ -1295,26 +1282,22 @@ msgid "???"
msgstr ""
#: src/gui/setup_players.cpp:224
-msgid "Save player list"
-msgstr ""
-
-#: src/gui/setup_players.cpp:226
msgid "Allow trading"
msgstr ""
-#: src/gui/setup_players.cpp:228
+#: src/gui/setup_players.cpp:226
msgid "Allow whispers"
msgstr ""
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:230
msgid "Put all whispers in tabs"
msgstr ""
-#: src/gui/setup_players.cpp:234
+#: src/gui/setup_players.cpp:232
msgid "Players"
msgstr ""
-#: src/gui/setup_players.cpp:259
+#: src/gui/setup_players.cpp:257
msgid "When ignoring:"
msgstr ""
@@ -1335,157 +1318,147 @@ msgstr ""
msgid "Large"
msgstr ""
-#: src/gui/setup_video.cpp:151
+#: src/gui/setup_video.cpp:141
+msgid "No text"
+msgstr ""
+
+#: src/gui/setup_video.cpp:143
+msgid "Bubbles, no names"
+msgstr ""
+
+#: src/gui/setup_video.cpp:144
+msgid "Bubbles with names"
+msgstr ""
+
+#: src/gui/setup_video.cpp:153
+msgid "off"
+msgstr "mati"
+
+#: src/gui/setup_video.cpp:154 src/gui/setup_video.cpp:164
+msgid "low"
+msgstr "rendah"
+
+#: src/gui/setup_video.cpp:155 src/gui/setup_video.cpp:166
+msgid "high"
+msgstr "tinggi"
+
+#: src/gui/setup_video.cpp:165
+msgid "medium"
+msgstr ""
+
+#: src/gui/setup_video.cpp:167
+msgid "max"
+msgstr ""
+
+#: src/gui/setup_video.cpp:187
msgid "Full screen"
msgstr "Layar penuh"
-#: src/gui/setup_video.cpp:152
+#: src/gui/setup_video.cpp:188
msgid "OpenGL"
msgstr "OpenGL"
-#: src/gui/setup_video.cpp:153
+#: src/gui/setup_video.cpp:189
msgid "Custom cursor"
msgstr ""
-#: src/gui/setup_video.cpp:155
+#: src/gui/setup_video.cpp:191
msgid "Visible names"
msgstr ""
-#: src/gui/setup_video.cpp:157
+#: src/gui/setup_video.cpp:193
msgid "Particle effects"
msgstr ""
-#: src/gui/setup_video.cpp:159
+#: src/gui/setup_video.cpp:195
msgid "Show name"
msgstr ""
-#: src/gui/setup_video.cpp:160
+#: src/gui/setup_video.cpp:196
msgid "Show pickup notification"
msgstr ""
-#: src/gui/setup_video.cpp:161
+#: src/gui/setup_video.cpp:197
msgid "in chat"
msgstr ""
-#: src/gui/setup_video.cpp:162
+#: src/gui/setup_video.cpp:198
msgid "as particle"
msgstr ""
-#: src/gui/setup_video.cpp:167
+#: src/gui/setup_video.cpp:203
msgid "FPS Limit:"
msgstr "Batas FPS"
-#: src/gui/setup_video.cpp:184
+#: src/gui/setup_video.cpp:214
msgid "Video"
msgstr "Video"
-#: src/gui/setup_video.cpp:189
+#: src/gui/setup_video.cpp:219
msgid "Overhead text"
msgstr ""
-#: src/gui/setup_video.cpp:190
+#: src/gui/setup_video.cpp:220
msgid "Gui opacity"
msgstr ""
-#: src/gui/setup_video.cpp:191
-msgid "Scroll radius"
-msgstr "Radius gulungan"
-
-#: src/gui/setup_video.cpp:192
-msgid "Scroll laziness"
-msgstr ""
-
-#: src/gui/setup_video.cpp:193
+#: src/gui/setup_video.cpp:221
msgid "Ambient FX"
msgstr ""
-#: src/gui/setup_video.cpp:194
+#: src/gui/setup_video.cpp:222
msgid "Particle Detail"
msgstr ""
-#: src/gui/setup_video.cpp:195
+#: src/gui/setup_video.cpp:223
msgid "Font size"
msgstr ""
-#: src/gui/setup_video.cpp:265 src/gui/setup_video.cpp:564
-msgid "No text"
-msgstr ""
-
-#: src/gui/setup_video.cpp:271 src/gui/setup_video.cpp:570
-msgid "Bubbles, no names"
-msgstr ""
-
-#: src/gui/setup_video.cpp:274 src/gui/setup_video.cpp:573
-msgid "Bubbles with names"
-msgstr ""
-
-#: src/gui/setup_video.cpp:282 src/gui/setup_video.cpp:610
-msgid "off"
-msgstr "mati"
-
-#: src/gui/setup_video.cpp:285 src/gui/setup_video.cpp:296
-#: src/gui/setup_video.cpp:613 src/gui/setup_video.cpp:627
-msgid "low"
-msgstr "rendah"
-
-#: src/gui/setup_video.cpp:288 src/gui/setup_video.cpp:302
-#: src/gui/setup_video.cpp:616 src/gui/setup_video.cpp:633
-msgid "high"
-msgstr "tinggi"
-
-#: src/gui/setup_video.cpp:299 src/gui/setup_video.cpp:630
-msgid "medium"
-msgstr ""
-
-#: src/gui/setup_video.cpp:305 src/gui/setup_video.cpp:636
-msgid "max"
-msgstr ""
-
-#: src/gui/setup_video.cpp:410
+#: src/gui/setup_video.cpp:356
msgid "Failed to switch to "
msgstr ""
-#: src/gui/setup_video.cpp:411
+#: src/gui/setup_video.cpp:357
msgid "windowed"
msgstr ""
-#: src/gui/setup_video.cpp:411
+#: src/gui/setup_video.cpp:357
msgid "fullscreen"
msgstr ""
-#: src/gui/setup_video.cpp:412
+#: src/gui/setup_video.cpp:358
msgid "mode and restoration of old mode also failed!"
msgstr ""
-#: src/gui/setup_video.cpp:421
+#: src/gui/setup_video.cpp:367
msgid "Switching to full screen"
msgstr "Mengganti ke layar penuh"
-#: src/gui/setup_video.cpp:422
+#: src/gui/setup_video.cpp:368
msgid "Restart needed for changes to take effect."
msgstr "Memulai dari awal di butuhkan untuk melihat efek"
-#: src/gui/setup_video.cpp:434
+#: src/gui/setup_video.cpp:380
msgid "Changing OpenGL"
msgstr "Mengubah OpenGL"
-#: src/gui/setup_video.cpp:435
+#: src/gui/setup_video.cpp:381
msgid "Applying change to OpenGL requires restart."
msgstr "Mendaftar perubahan ke OpenGL membutuhkan memulai dari awal"
-#: src/gui/setup_video.cpp:520
+#: src/gui/setup_video.cpp:442
msgid "Screen resolution changed"
msgstr ""
-#: src/gui/setup_video.cpp:521
+#: src/gui/setup_video.cpp:443
msgid "Restart your client for the change to take effect."
msgstr ""
-#: src/gui/setup_video.cpp:545
+#: src/gui/setup_video.cpp:467
msgid "Particle effect settings changed."
msgstr ""
-#: src/gui/setup_video.cpp:546
+#: src/gui/setup_video.cpp:468
msgid "Changes will take effect on map change."
msgstr ""
@@ -2006,55 +1979,55 @@ msgstr ""
msgid "Ignore input 2"
msgstr ""
-#: src/localplayer.cpp:834
+#: src/localplayer.cpp:837
msgid "Unarmed"
msgstr ""
-#: src/localplayer.cpp:835
+#: src/localplayer.cpp:838
msgid "Knife"
msgstr ""
-#: src/localplayer.cpp:836
+#: src/localplayer.cpp:839
msgid "Sword"
msgstr ""
-#: src/localplayer.cpp:837
+#: src/localplayer.cpp:840
msgid "Polearm"
msgstr ""
-#: src/localplayer.cpp:838
+#: src/localplayer.cpp:841
msgid "Staff"
msgstr ""
-#: src/localplayer.cpp:839
+#: src/localplayer.cpp:842
msgid "Whip"
msgstr ""
-#: src/localplayer.cpp:840
+#: src/localplayer.cpp:843
msgid "Bow"
msgstr ""
-#: src/localplayer.cpp:841
+#: src/localplayer.cpp:844
msgid "Shooting"
msgstr ""
-#: src/localplayer.cpp:842
+#: src/localplayer.cpp:845
msgid "Mace"
msgstr ""
-#: src/localplayer.cpp:843
+#: src/localplayer.cpp:846
msgid "Axe"
msgstr ""
-#: src/localplayer.cpp:844
+#: src/localplayer.cpp:847
msgid "Thrown"
msgstr ""
-#: src/localplayer.cpp:846
+#: src/localplayer.cpp:849
msgid "Craft"
msgstr ""
-#: src/localplayer.cpp:847
+#: src/localplayer.cpp:850
msgid "Unknown Skill"
msgstr ""
@@ -2266,193 +2239,193 @@ msgstr ""
msgid "Unable to unequip."
msgstr ""
-#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:82
-#, c-format
-msgid "Strength: %d"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:81
+#, fuzzy, c-format
+msgid "Strength %+d"
+msgstr "Kekuatan"
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:82
#, c-format
-msgid "Agility: %d"
+msgid "Agility %+d"
msgstr ""
-#: src/net/ea/generalhandler.cpp:96 src/net/tmwserv/generalhandler.cpp:88
-#, c-format
-msgid "Vitality: %d"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:84
+#, fuzzy, c-format
+msgid "Vitality %+d"
+msgstr "Daya/Tenaga Hidup"
-#: src/net/ea/generalhandler.cpp:98 src/net/tmwserv/generalhandler.cpp:90
-#, c-format
-msgid "Intelligence: %d"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:85
+#, fuzzy, c-format
+msgid "Intelligence %+d"
+msgstr "Kecerdasan"
-#: src/net/ea/generalhandler.cpp:100 src/net/tmwserv/generalhandler.cpp:86
-#, c-format
-msgid "Dexterity: %d"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:83
+#, fuzzy, c-format
+msgid "Dexterity %+d"
+msgstr "Ketangkasan"
-#: src/net/ea/generalhandler.cpp:102
-#, c-format
-msgid "Luck: %d"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:96
+#, fuzzy, c-format
+msgid "Luck %+d"
+msgstr "Serangan %+d"
-#: src/net/ea/generalhandler.cpp:125
+#: src/net/ea/generalhandler.cpp:118
msgid "Authentication failed"
msgstr ""
-#: src/net/ea/generalhandler.cpp:128
+#: src/net/ea/generalhandler.cpp:121
msgid "No servers available"
msgstr ""
-#: src/net/ea/generalhandler.cpp:132
+#: src/net/ea/generalhandler.cpp:125
msgid "Someone else is trying to use this account"
msgstr ""
-#: src/net/ea/generalhandler.cpp:135
+#: src/net/ea/generalhandler.cpp:128
msgid "This account is already logged in"
msgstr ""
-#: src/net/ea/generalhandler.cpp:138
+#: src/net/ea/generalhandler.cpp:131
msgid "Speed hack detected"
msgstr ""
-#: src/net/ea/generalhandler.cpp:141
+#: src/net/ea/generalhandler.cpp:134
msgid "Duplicated login"
msgstr ""
-#: src/net/ea/generalhandler.cpp:144
+#: src/net/ea/generalhandler.cpp:137
msgid "Unknown connection error"
msgstr ""
-#: src/net/ea/generalhandler.cpp:201
+#: src/net/ea/generalhandler.cpp:194
msgid "Got disconnected from server!"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:52
+#: src/net/ea/gui/partytab.cpp:55
msgid "/help > Display this help."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:53
+#: src/net/ea/gui/partytab.cpp:56
msgid "/create > Create a new party"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:54
+#: src/net/ea/gui/partytab.cpp:57
msgid "/new > Alias of create"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:55
+#: src/net/ea/gui/partytab.cpp:58
msgid "/invite > Invite a player to your party"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:56
+#: src/net/ea/gui/partytab.cpp:59
msgid "/leave > Leave the party you are in"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:57
+#: src/net/ea/gui/partytab.cpp:60
msgid "/kick > Kick some one from the party you are in"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:58
+#: src/net/ea/gui/partytab.cpp:61
msgid "/item > Show/change party item sharing options"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:59
+#: src/net/ea/gui/partytab.cpp:62
msgid "/exp > Show/change party experience sharing options"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:68
+#: src/net/ea/gui/partytab.cpp:71
msgid "Command: /new <party-name>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:69
+#: src/net/ea/gui/partytab.cpp:72
msgid "Command: /create <party-name>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:70
+#: src/net/ea/gui/partytab.cpp:73
msgid "These commands create a new party called <party-name>."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:74
+#: src/net/ea/gui/partytab.cpp:77
msgid "Command: /invite <nick>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:81
+#: src/net/ea/gui/partytab.cpp:84
msgid "Command: /leave"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:82
+#: src/net/ea/gui/partytab.cpp:85
msgid "This command causes the player to leave the party."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/ea/gui/partytab.cpp:89
msgid "Command: /item <policy>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:87
+#: src/net/ea/gui/partytab.cpp:90
msgid "This command changes the party's item sharing policy."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:88
+#: src/net/ea/gui/partytab.cpp:91
msgid ""
"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
"\"0\", \"no\", \"false\" to disable item sharing."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:94
msgid "Command: /item"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:92
+#: src/net/ea/gui/partytab.cpp:95
msgid "This command displays the party's current item sharing policy."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:96
+#: src/net/ea/gui/partytab.cpp:99
msgid "Command: /exp <policy>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/ea/gui/partytab.cpp:100
msgid "This command changes the party's experience sharing policy."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:98
+#: src/net/ea/gui/partytab.cpp:101
msgid ""
"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:104
msgid "Command: /exp"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:102
+#: src/net/ea/gui/partytab.cpp:105
msgid "This command displays the party's current experience sharing policy."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:110
+#: src/net/ea/gui/partytab.cpp:113
msgid "Party name is missing."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:133 src/net/ea/partyhandler.cpp:191
+#: src/net/ea/gui/partytab.cpp:136 src/net/ea/partyhandler.cpp:194
msgid "Item sharing enabled."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:136 src/net/ea/partyhandler.cpp:197
+#: src/net/ea/gui/partytab.cpp:139 src/net/ea/partyhandler.cpp:200
msgid "Item sharing disabled."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:139 src/net/ea/partyhandler.cpp:203
+#: src/net/ea/gui/partytab.cpp:142 src/net/ea/partyhandler.cpp:206
msgid "Item sharing not possible."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:165 src/net/ea/partyhandler.cpp:168
+#: src/net/ea/gui/partytab.cpp:168 src/net/ea/partyhandler.cpp:171
msgid "Experience sharing enabled."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:168 src/net/ea/partyhandler.cpp:174
+#: src/net/ea/gui/partytab.cpp:171 src/net/ea/partyhandler.cpp:177
msgid "Experience sharing disabled."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:171 src/net/ea/partyhandler.cpp:180
+#: src/net/ea/gui/partytab.cpp:174 src/net/ea/partyhandler.cpp:183
msgid "Experience sharing not possible."
msgstr ""
@@ -2515,45 +2488,45 @@ msgstr ""
msgid "Party successfully created."
msgstr ""
-#: src/net/ea/partyhandler.cpp:115
+#: src/net/ea/partyhandler.cpp:118
#, c-format
msgid "%s is already a member of a party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:119
+#: src/net/ea/partyhandler.cpp:122
#, c-format
msgid "%s refused your invitation."
msgstr ""
-#: src/net/ea/partyhandler.cpp:123
+#: src/net/ea/partyhandler.cpp:126
#, c-format
msgid "%s is now a member of your party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:127
+#: src/net/ea/partyhandler.cpp:130
#, c-format
msgid "Unknown invite response for %s."
msgstr ""
-#: src/net/ea/partyhandler.cpp:232
+#: src/net/ea/partyhandler.cpp:235
msgid "You have left the party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:235
+#: src/net/ea/partyhandler.cpp:239
#, c-format
msgid "%s has left your party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:272
+#: src/net/ea/partyhandler.cpp:274
#, c-format
msgid "An unknown member tried to say: %s"
msgstr ""
-#: src/net/ea/partyhandler.cpp:298
+#: src/net/ea/partyhandler.cpp:300
msgid "Inviting like this isn't supported at the moment."
msgstr ""
-#: src/net/ea/partyhandler.cpp:327
+#: src/net/ea/partyhandler.cpp:329
#, c-format
msgid "%s is not in your party!"
msgstr ""
@@ -2846,10 +2819,10 @@ msgstr "Ketekunan"
msgid "Topic: "
msgstr ""
-#: src/net/tmwserv/generalhandler.cpp:92
-#, c-format
-msgid "Willpower: %d"
-msgstr ""
+#: src/net/tmwserv/generalhandler.cpp:86
+#, fuzzy, c-format
+msgid "Willpower %+d"
+msgstr "Ketekunan"
#: src/net/tmwserv/loginhandler.cpp:80
msgid "Wrong magic_token"
@@ -2946,3 +2919,6 @@ msgstr ""
#: src/resources/npcdb.cpp:53
msgid "NPC Database: Error while loading npcs.xml!"
msgstr ""
+
+#~ msgid "Scroll radius"
+#~ msgstr "Radius gulungan"
diff --git a/po/it.po b/po/it.po
index 8107315a..3e011217 100644
--- a/po/it.po
+++ b/po/it.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: The Mana World 0.1.0\n"
"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-05-10 16:39+0200\n"
+"POT-Creation-Date: 2009-05-12 00:11+0200\n"
"PO-Revision-Date: 2009-01-09 12:36+0000\n"
"Last-Translator: Bjørn Lindeijer <bjorn@lindeijer.nl>\n"
"Language-Team: Italian\n"
@@ -177,7 +177,7 @@ msgstr ""
#: src/commandhandler.cpp:216 src/commandhandler.cpp:230
#: src/gui/widgets/channeltab.cpp:81 src/gui/widgets/channeltab.cpp:90
-#: src/net/ea/gui/partytab.cpp:76
+#: src/net/ea/gui/partytab.cpp:79
msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
msgstr ""
@@ -197,7 +197,7 @@ msgstr ""
msgid "Command: /party <nick>"
msgstr ""
-#: src/commandhandler.cpp:229 src/net/ea/gui/partytab.cpp:75
+#: src/commandhandler.cpp:229 src/net/ea/gui/partytab.cpp:78
msgid "This command invites <nick> to party with you."
msgstr ""
@@ -510,7 +510,7 @@ msgstr "Ok"
msgid "Previous"
msgstr "Precedente"
-#: src/gui/charselectdialog.cpp:113 src/gui/npcdialog.cpp:44
+#: src/gui/charselectdialog.cpp:113 src/gui/npcdialog.cpp:43
msgid "Next"
msgstr "Prossimo"
@@ -535,7 +535,7 @@ msgstr "Nuovo"
#: src/gui/charselectdialog.cpp:118 src/gui/charselectdialog.cpp:165
#: src/gui/charselectdialog.cpp:166 src/gui/charselectdialog.cpp:315
-#: src/gui/setup_players.cpp:230
+#: src/gui/setup_players.cpp:228
msgid "Delete"
msgstr "Elimina"
@@ -570,19 +570,15 @@ msgstr ""
msgid "%d players are present."
msgstr ""
-#: src/gui/chat.cpp:348 src/gui/chat.cpp:354
+#: src/gui/chat.cpp:333
msgid "Present: "
msgstr ""
-#: src/gui/chat.cpp:348 src/gui/chat.cpp:354
-msgid "; "
-msgstr ""
-
-#: src/gui/chat.cpp:349
+#: src/gui/chat.cpp:350
msgid "Attendance written to record log."
msgstr ""
-#: src/gui/chat.cpp:474
+#: src/gui/chat.cpp:475
#, c-format
msgid "Whispering to %s: %s"
msgstr ""
@@ -632,7 +628,7 @@ msgstr ""
msgid "Help"
msgstr ""
-#: src/gui/help.cpp:47 src/gui/npcdialog.cpp:45 src/gui/storagewindow.cpp:68
+#: src/gui/help.cpp:47 src/gui/npcdialog.cpp:44 src/gui/storagewindow.cpp:68
msgid "Close"
msgstr ""
@@ -725,7 +721,7 @@ msgid "Register"
msgstr "Registra"
#: src/gui/magic.cpp:32 src/gui/skilldialog.cpp:117 src/gui/windowmenu.cpp:64
-#: src/localplayer.cpp:845
+#: src/localplayer.cpp:848
msgid "Magic"
msgstr ""
@@ -741,33 +737,25 @@ msgstr ""
msgid "Cast Test Spell 3"
msgstr ""
-#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
+#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:86
#, fuzzy
msgid "Map"
msgstr "Mini mappa"
-#: src/gui/npcdialog.cpp:43
+#: src/gui/npcdialog.cpp:42
msgid "Waiting for server"
msgstr ""
-#: src/gui/npcdialog.cpp:46
+#: src/gui/npcdialog.cpp:45
#, fuzzy
msgid "Submit"
msgstr "Esci"
-#: src/gui/npcdialog.cpp:49 src/gui/npcpostdialog.cpp:39
+#: src/gui/npcdialog.cpp:48 src/gui/npcpostdialog.cpp:39
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:95
-msgid "+"
-msgstr ""
-
-#: src/gui/npcdialog.cpp:96
-msgid "-"
-msgstr ""
-
-#: src/gui/npcdialog.cpp:105
+#: src/gui/npcdialog.cpp:104
msgid "Reset"
msgstr ""
@@ -775,8 +763,7 @@ msgstr ""
msgid "Send"
msgstr ""
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:268
-#: src/gui/setup_video.cpp:567
+#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:142
msgid "Text"
msgstr ""
@@ -828,8 +815,8 @@ msgstr ""
msgid "Is"
msgstr ""
-#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:33
-#: src/net/ea/gui/partytab.cpp:37
+#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:45
+#: src/net/ea/gui/partytab.cpp:39
msgid "Party"
msgstr ""
@@ -1297,26 +1284,22 @@ msgid "???"
msgstr ""
#: src/gui/setup_players.cpp:224
-msgid "Save player list"
-msgstr ""
-
-#: src/gui/setup_players.cpp:226
msgid "Allow trading"
msgstr ""
-#: src/gui/setup_players.cpp:228
+#: src/gui/setup_players.cpp:226
msgid "Allow whispers"
msgstr ""
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:230
msgid "Put all whispers in tabs"
msgstr ""
-#: src/gui/setup_players.cpp:234
+#: src/gui/setup_players.cpp:232
msgid "Players"
msgstr ""
-#: src/gui/setup_players.cpp:259
+#: src/gui/setup_players.cpp:257
msgid "When ignoring:"
msgstr ""
@@ -1337,157 +1320,147 @@ msgstr ""
msgid "Large"
msgstr ""
-#: src/gui/setup_video.cpp:151
+#: src/gui/setup_video.cpp:141
+msgid "No text"
+msgstr ""
+
+#: src/gui/setup_video.cpp:143
+msgid "Bubbles, no names"
+msgstr ""
+
+#: src/gui/setup_video.cpp:144
+msgid "Bubbles with names"
+msgstr ""
+
+#: src/gui/setup_video.cpp:153
+msgid "off"
+msgstr "Spento"
+
+#: src/gui/setup_video.cpp:154 src/gui/setup_video.cpp:164
+msgid "low"
+msgstr "Basso"
+
+#: src/gui/setup_video.cpp:155 src/gui/setup_video.cpp:166
+msgid "high"
+msgstr "Alto"
+
+#: src/gui/setup_video.cpp:165
+msgid "medium"
+msgstr ""
+
+#: src/gui/setup_video.cpp:167
+msgid "max"
+msgstr ""
+
+#: src/gui/setup_video.cpp:187
msgid "Full screen"
msgstr "Schermo intero"
-#: src/gui/setup_video.cpp:152
+#: src/gui/setup_video.cpp:188
msgid "OpenGL"
msgstr "OpenGL"
-#: src/gui/setup_video.cpp:153
+#: src/gui/setup_video.cpp:189
msgid "Custom cursor"
msgstr "Cursore personalizzato"
-#: src/gui/setup_video.cpp:155
+#: src/gui/setup_video.cpp:191
msgid "Visible names"
msgstr ""
-#: src/gui/setup_video.cpp:157
+#: src/gui/setup_video.cpp:193
msgid "Particle effects"
msgstr ""
-#: src/gui/setup_video.cpp:159
+#: src/gui/setup_video.cpp:195
msgid "Show name"
msgstr ""
-#: src/gui/setup_video.cpp:160
+#: src/gui/setup_video.cpp:196
msgid "Show pickup notification"
msgstr ""
-#: src/gui/setup_video.cpp:161
+#: src/gui/setup_video.cpp:197
msgid "in chat"
msgstr ""
-#: src/gui/setup_video.cpp:162
+#: src/gui/setup_video.cpp:198
msgid "as particle"
msgstr ""
-#: src/gui/setup_video.cpp:167
+#: src/gui/setup_video.cpp:203
msgid "FPS Limit:"
msgstr "Limita FPS:"
-#: src/gui/setup_video.cpp:184
+#: src/gui/setup_video.cpp:214
msgid "Video"
msgstr "Video"
-#: src/gui/setup_video.cpp:189
+#: src/gui/setup_video.cpp:219
msgid "Overhead text"
msgstr ""
-#: src/gui/setup_video.cpp:190
+#: src/gui/setup_video.cpp:220
msgid "Gui opacity"
msgstr "Opacità IU"
-#: src/gui/setup_video.cpp:191
-msgid "Scroll radius"
-msgstr "Raggio dello scroll"
-
-#: src/gui/setup_video.cpp:192
-msgid "Scroll laziness"
-msgstr "Lentezza dello scroll"
-
-#: src/gui/setup_video.cpp:193
+#: src/gui/setup_video.cpp:221
msgid "Ambient FX"
msgstr "Suoni ambientali"
-#: src/gui/setup_video.cpp:194
+#: src/gui/setup_video.cpp:222
msgid "Particle Detail"
msgstr ""
-#: src/gui/setup_video.cpp:195
+#: src/gui/setup_video.cpp:223
msgid "Font size"
msgstr ""
-#: src/gui/setup_video.cpp:265 src/gui/setup_video.cpp:564
-msgid "No text"
-msgstr ""
-
-#: src/gui/setup_video.cpp:271 src/gui/setup_video.cpp:570
-msgid "Bubbles, no names"
-msgstr ""
-
-#: src/gui/setup_video.cpp:274 src/gui/setup_video.cpp:573
-msgid "Bubbles with names"
-msgstr ""
-
-#: src/gui/setup_video.cpp:282 src/gui/setup_video.cpp:610
-msgid "off"
-msgstr "Spento"
-
-#: src/gui/setup_video.cpp:285 src/gui/setup_video.cpp:296
-#: src/gui/setup_video.cpp:613 src/gui/setup_video.cpp:627
-msgid "low"
-msgstr "Basso"
-
-#: src/gui/setup_video.cpp:288 src/gui/setup_video.cpp:302
-#: src/gui/setup_video.cpp:616 src/gui/setup_video.cpp:633
-msgid "high"
-msgstr "Alto"
-
-#: src/gui/setup_video.cpp:299 src/gui/setup_video.cpp:630
-msgid "medium"
-msgstr ""
-
-#: src/gui/setup_video.cpp:305 src/gui/setup_video.cpp:636
-msgid "max"
-msgstr ""
-
-#: src/gui/setup_video.cpp:410
+#: src/gui/setup_video.cpp:356
msgid "Failed to switch to "
msgstr ""
-#: src/gui/setup_video.cpp:411
+#: src/gui/setup_video.cpp:357
msgid "windowed"
msgstr ""
-#: src/gui/setup_video.cpp:411
+#: src/gui/setup_video.cpp:357
msgid "fullscreen"
msgstr ""
-#: src/gui/setup_video.cpp:412
+#: src/gui/setup_video.cpp:358
msgid "mode and restoration of old mode also failed!"
msgstr ""
-#: src/gui/setup_video.cpp:421
+#: src/gui/setup_video.cpp:367
msgid "Switching to full screen"
msgstr "Modalità a schermo intero"
-#: src/gui/setup_video.cpp:422
+#: src/gui/setup_video.cpp:368
msgid "Restart needed for changes to take effect."
msgstr "Riavvio necessario affinchè i cambiamenti abbiano effetto."
-#: src/gui/setup_video.cpp:434
+#: src/gui/setup_video.cpp:380
msgid "Changing OpenGL"
msgstr "Modifica OpenGL"
-#: src/gui/setup_video.cpp:435
+#: src/gui/setup_video.cpp:381
msgid "Applying change to OpenGL requires restart."
msgstr "Applicare le modifiche ad OpenGL richiede il riavvio."
-#: src/gui/setup_video.cpp:520
+#: src/gui/setup_video.cpp:442
msgid "Screen resolution changed"
msgstr ""
-#: src/gui/setup_video.cpp:521
+#: src/gui/setup_video.cpp:443
msgid "Restart your client for the change to take effect."
msgstr ""
-#: src/gui/setup_video.cpp:545
+#: src/gui/setup_video.cpp:467
msgid "Particle effect settings changed."
msgstr ""
-#: src/gui/setup_video.cpp:546
+#: src/gui/setup_video.cpp:468
msgid "Changes will take effect on map change."
msgstr ""
@@ -2009,55 +1982,55 @@ msgstr ""
msgid "Ignore input 2"
msgstr ""
-#: src/localplayer.cpp:834
+#: src/localplayer.cpp:837
msgid "Unarmed"
msgstr ""
-#: src/localplayer.cpp:835
+#: src/localplayer.cpp:838
msgid "Knife"
msgstr ""
-#: src/localplayer.cpp:836
+#: src/localplayer.cpp:839
msgid "Sword"
msgstr ""
-#: src/localplayer.cpp:837
+#: src/localplayer.cpp:840
msgid "Polearm"
msgstr ""
-#: src/localplayer.cpp:838
+#: src/localplayer.cpp:841
msgid "Staff"
msgstr ""
-#: src/localplayer.cpp:839
+#: src/localplayer.cpp:842
msgid "Whip"
msgstr ""
-#: src/localplayer.cpp:840
+#: src/localplayer.cpp:843
msgid "Bow"
msgstr ""
-#: src/localplayer.cpp:841
+#: src/localplayer.cpp:844
msgid "Shooting"
msgstr ""
-#: src/localplayer.cpp:842
+#: src/localplayer.cpp:845
msgid "Mace"
msgstr ""
-#: src/localplayer.cpp:843
+#: src/localplayer.cpp:846
msgid "Axe"
msgstr ""
-#: src/localplayer.cpp:844
+#: src/localplayer.cpp:847
msgid "Thrown"
msgstr ""
-#: src/localplayer.cpp:846
+#: src/localplayer.cpp:849
msgid "Craft"
msgstr ""
-#: src/localplayer.cpp:847
+#: src/localplayer.cpp:850
msgid "Unknown Skill"
msgstr ""
@@ -2269,193 +2242,193 @@ msgstr ""
msgid "Unable to unequip."
msgstr ""
-#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:82
-#, c-format
-msgid "Strength: %d"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:81
+#, fuzzy, c-format
+msgid "Strength %+d"
+msgstr "Forza:"
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:84
-#, c-format
-msgid "Agility: %d"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:82
+#, fuzzy, c-format
+msgid "Agility %+d"
+msgstr "Agilità:"
-#: src/net/ea/generalhandler.cpp:96 src/net/tmwserv/generalhandler.cpp:88
-#, c-format
-msgid "Vitality: %d"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:84
+#, fuzzy, c-format
+msgid "Vitality %+d"
+msgstr "Vitalità:"
-#: src/net/ea/generalhandler.cpp:98 src/net/tmwserv/generalhandler.cpp:90
-#, c-format
-msgid "Intelligence: %d"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:85
+#, fuzzy, c-format
+msgid "Intelligence %+d"
+msgstr "Intelligenza:"
-#: src/net/ea/generalhandler.cpp:100 src/net/tmwserv/generalhandler.cpp:86
-#, c-format
-msgid "Dexterity: %d"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:83
+#, fuzzy, c-format
+msgid "Dexterity %+d"
+msgstr "Destrezza:"
-#: src/net/ea/generalhandler.cpp:102
-#, c-format
-msgid "Luck: %d"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:96
+#, fuzzy, c-format
+msgid "Luck %+d"
+msgstr "Attacco %+d"
-#: src/net/ea/generalhandler.cpp:125
+#: src/net/ea/generalhandler.cpp:118
msgid "Authentication failed"
msgstr ""
-#: src/net/ea/generalhandler.cpp:128
+#: src/net/ea/generalhandler.cpp:121
msgid "No servers available"
msgstr ""
-#: src/net/ea/generalhandler.cpp:132
+#: src/net/ea/generalhandler.cpp:125
msgid "Someone else is trying to use this account"
msgstr ""
-#: src/net/ea/generalhandler.cpp:135
+#: src/net/ea/generalhandler.cpp:128
msgid "This account is already logged in"
msgstr ""
-#: src/net/ea/generalhandler.cpp:138
+#: src/net/ea/generalhandler.cpp:131
msgid "Speed hack detected"
msgstr ""
-#: src/net/ea/generalhandler.cpp:141
+#: src/net/ea/generalhandler.cpp:134
msgid "Duplicated login"
msgstr ""
-#: src/net/ea/generalhandler.cpp:144
+#: src/net/ea/generalhandler.cpp:137
msgid "Unknown connection error"
msgstr ""
-#: src/net/ea/generalhandler.cpp:201
+#: src/net/ea/generalhandler.cpp:194
msgid "Got disconnected from server!"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:52
+#: src/net/ea/gui/partytab.cpp:55
msgid "/help > Display this help."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:53
+#: src/net/ea/gui/partytab.cpp:56
msgid "/create > Create a new party"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:54
+#: src/net/ea/gui/partytab.cpp:57
msgid "/new > Alias of create"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:55
+#: src/net/ea/gui/partytab.cpp:58
msgid "/invite > Invite a player to your party"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:56
+#: src/net/ea/gui/partytab.cpp:59
msgid "/leave > Leave the party you are in"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:57
+#: src/net/ea/gui/partytab.cpp:60
msgid "/kick > Kick some one from the party you are in"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:58
+#: src/net/ea/gui/partytab.cpp:61
msgid "/item > Show/change party item sharing options"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:59
+#: src/net/ea/gui/partytab.cpp:62
msgid "/exp > Show/change party experience sharing options"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:68
+#: src/net/ea/gui/partytab.cpp:71
msgid "Command: /new <party-name>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:69
+#: src/net/ea/gui/partytab.cpp:72
msgid "Command: /create <party-name>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:70
+#: src/net/ea/gui/partytab.cpp:73
msgid "These commands create a new party called <party-name>."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:74
+#: src/net/ea/gui/partytab.cpp:77
msgid "Command: /invite <nick>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:81
+#: src/net/ea/gui/partytab.cpp:84
msgid "Command: /leave"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:82
+#: src/net/ea/gui/partytab.cpp:85
msgid "This command causes the player to leave the party."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/ea/gui/partytab.cpp:89
msgid "Command: /item <policy>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:87
+#: src/net/ea/gui/partytab.cpp:90
msgid "This command changes the party's item sharing policy."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:88
+#: src/net/ea/gui/partytab.cpp:91
msgid ""
"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
"\"0\", \"no\", \"false\" to disable item sharing."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:94
msgid "Command: /item"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:92
+#: src/net/ea/gui/partytab.cpp:95
msgid "This command displays the party's current item sharing policy."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:96
+#: src/net/ea/gui/partytab.cpp:99
msgid "Command: /exp <policy>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/ea/gui/partytab.cpp:100
msgid "This command changes the party's experience sharing policy."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:98
+#: src/net/ea/gui/partytab.cpp:101
msgid ""
"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:104
msgid "Command: /exp"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:102
+#: src/net/ea/gui/partytab.cpp:105
msgid "This command displays the party's current experience sharing policy."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:110
+#: src/net/ea/gui/partytab.cpp:113
msgid "Party name is missing."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:133 src/net/ea/partyhandler.cpp:191
+#: src/net/ea/gui/partytab.cpp:136 src/net/ea/partyhandler.cpp:194
msgid "Item sharing enabled."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:136 src/net/ea/partyhandler.cpp:197
+#: src/net/ea/gui/partytab.cpp:139 src/net/ea/partyhandler.cpp:200
msgid "Item sharing disabled."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:139 src/net/ea/partyhandler.cpp:203
+#: src/net/ea/gui/partytab.cpp:142 src/net/ea/partyhandler.cpp:206
msgid "Item sharing not possible."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:165 src/net/ea/partyhandler.cpp:168
+#: src/net/ea/gui/partytab.cpp:168 src/net/ea/partyhandler.cpp:171
msgid "Experience sharing enabled."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:168 src/net/ea/partyhandler.cpp:174
+#: src/net/ea/gui/partytab.cpp:171 src/net/ea/partyhandler.cpp:177
msgid "Experience sharing disabled."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:171 src/net/ea/partyhandler.cpp:180
+#: src/net/ea/gui/partytab.cpp:174 src/net/ea/partyhandler.cpp:183
msgid "Experience sharing not possible."
msgstr ""
@@ -2518,45 +2491,45 @@ msgstr ""
msgid "Party successfully created."
msgstr ""
-#: src/net/ea/partyhandler.cpp:115
+#: src/net/ea/partyhandler.cpp:118
#, c-format
msgid "%s is already a member of a party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:119
+#: src/net/ea/partyhandler.cpp:122
#, c-format
msgid "%s refused your invitation."
msgstr ""
-#: src/net/ea/partyhandler.cpp:123
+#: src/net/ea/partyhandler.cpp:126
#, c-format
msgid "%s is now a member of your party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:127
+#: src/net/ea/partyhandler.cpp:130
#, c-format
msgid "Unknown invite response for %s."
msgstr ""
-#: src/net/ea/partyhandler.cpp:232
+#: src/net/ea/partyhandler.cpp:235
msgid "You have left the party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:235
+#: src/net/ea/partyhandler.cpp:239
#, c-format
msgid "%s has left your party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:272
+#: src/net/ea/partyhandler.cpp:274
#, c-format
msgid "An unknown member tried to say: %s"
msgstr ""
-#: src/net/ea/partyhandler.cpp:298
+#: src/net/ea/partyhandler.cpp:300
msgid "Inviting like this isn't supported at the moment."
msgstr ""
-#: src/net/ea/partyhandler.cpp:327
+#: src/net/ea/partyhandler.cpp:329
#, c-format
msgid "%s is not in your party!"
msgstr ""
@@ -2849,10 +2822,10 @@ msgstr "Volontà:"
msgid "Topic: "
msgstr ""
-#: src/net/tmwserv/generalhandler.cpp:92
-#, c-format
-msgid "Willpower: %d"
-msgstr ""
+#: src/net/tmwserv/generalhandler.cpp:86
+#, fuzzy, c-format
+msgid "Willpower %+d"
+msgstr "Volontà:"
#: src/net/tmwserv/loginhandler.cpp:80
msgid "Wrong magic_token"
@@ -2949,3 +2922,9 @@ msgstr ""
#: src/resources/npcdb.cpp:53
msgid "NPC Database: Error while loading npcs.xml!"
msgstr ""
+
+#~ msgid "Scroll radius"
+#~ msgstr "Raggio dello scroll"
+
+#~ msgid "Scroll laziness"
+#~ msgstr "Lentezza dello scroll"
diff --git a/po/ja.po b/po/ja.po
index 59ac832e..c5cf7b61 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: tmw\n"
"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-05-10 16:39+0200\n"
+"POT-Creation-Date: 2009-05-12 00:11+0200\n"
"PO-Revision-Date: 2009-01-09 12:31+0000\n"
"Last-Translator: Bjørn Lindeijer <bjorn@lindeijer.nl>\n"
"Language-Team: Japanese <ja@li.org>\n"
@@ -175,7 +175,7 @@ msgstr ""
#: src/commandhandler.cpp:216 src/commandhandler.cpp:230
#: src/gui/widgets/channeltab.cpp:81 src/gui/widgets/channeltab.cpp:90
-#: src/net/ea/gui/partytab.cpp:76
+#: src/net/ea/gui/partytab.cpp:79
msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
msgstr ""
@@ -195,7 +195,7 @@ msgstr ""
msgid "Command: /party <nick>"
msgstr ""
-#: src/commandhandler.cpp:229 src/net/ea/gui/partytab.cpp:75
+#: src/commandhandler.cpp:229 src/net/ea/gui/partytab.cpp:78
msgid "This command invites <nick> to party with you."
msgstr ""
@@ -508,7 +508,7 @@ msgstr "了解"
msgid "Previous"
msgstr "前へ"
-#: src/gui/charselectdialog.cpp:113 src/gui/npcdialog.cpp:44
+#: src/gui/charselectdialog.cpp:113 src/gui/npcdialog.cpp:43
msgid "Next"
msgstr "次へ"
@@ -533,7 +533,7 @@ msgstr "新規"
#: src/gui/charselectdialog.cpp:118 src/gui/charselectdialog.cpp:165
#: src/gui/charselectdialog.cpp:166 src/gui/charselectdialog.cpp:315
-#: src/gui/setup_players.cpp:230
+#: src/gui/setup_players.cpp:228
msgid "Delete"
msgstr "削除"
@@ -568,19 +568,15 @@ msgstr ""
msgid "%d players are present."
msgstr ""
-#: src/gui/chat.cpp:348 src/gui/chat.cpp:354
+#: src/gui/chat.cpp:333
msgid "Present: "
msgstr ""
-#: src/gui/chat.cpp:348 src/gui/chat.cpp:354
-msgid "; "
-msgstr ""
-
-#: src/gui/chat.cpp:349
+#: src/gui/chat.cpp:350
msgid "Attendance written to record log."
msgstr ""
-#: src/gui/chat.cpp:474
+#: src/gui/chat.cpp:475
#, c-format
msgid "Whispering to %s: %s"
msgstr ""
@@ -630,7 +626,7 @@ msgstr ""
msgid "Help"
msgstr ""
-#: src/gui/help.cpp:47 src/gui/npcdialog.cpp:45 src/gui/storagewindow.cpp:68
+#: src/gui/help.cpp:47 src/gui/npcdialog.cpp:44 src/gui/storagewindow.cpp:68
msgid "Close"
msgstr ""
@@ -723,7 +719,7 @@ msgid "Register"
msgstr ""
#: src/gui/magic.cpp:32 src/gui/skilldialog.cpp:117 src/gui/windowmenu.cpp:64
-#: src/localplayer.cpp:845
+#: src/localplayer.cpp:848
msgid "Magic"
msgstr ""
@@ -739,32 +735,24 @@ msgstr ""
msgid "Cast Test Spell 3"
msgstr ""
-#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
+#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:86
msgid "Map"
msgstr ""
-#: src/gui/npcdialog.cpp:43
+#: src/gui/npcdialog.cpp:42
msgid "Waiting for server"
msgstr ""
-#: src/gui/npcdialog.cpp:46
+#: src/gui/npcdialog.cpp:45
#, fuzzy
msgid "Submit"
msgstr "終了"
-#: src/gui/npcdialog.cpp:49 src/gui/npcpostdialog.cpp:39
+#: src/gui/npcdialog.cpp:48 src/gui/npcpostdialog.cpp:39
msgid "NPC"
msgstr ""
-#: src/gui/npcdialog.cpp:95
-msgid "+"
-msgstr ""
-
-#: src/gui/npcdialog.cpp:96
-msgid "-"
-msgstr ""
-
-#: src/gui/npcdialog.cpp:105
+#: src/gui/npcdialog.cpp:104
msgid "Reset"
msgstr ""
@@ -772,8 +760,7 @@ msgstr ""
msgid "Send"
msgstr ""
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:268
-#: src/gui/setup_video.cpp:567
+#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:142
msgid "Text"
msgstr ""
@@ -825,8 +812,8 @@ msgstr ""
msgid "Is"
msgstr ""
-#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:33
-#: src/net/ea/gui/partytab.cpp:37
+#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:45
+#: src/net/ea/gui/partytab.cpp:39
msgid "Party"
msgstr ""
@@ -1293,26 +1280,22 @@ msgid "???"
msgstr ""
#: src/gui/setup_players.cpp:224
-msgid "Save player list"
-msgstr ""
-
-#: src/gui/setup_players.cpp:226
msgid "Allow trading"
msgstr ""
-#: src/gui/setup_players.cpp:228
+#: src/gui/setup_players.cpp:226
msgid "Allow whispers"
msgstr ""
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:230
msgid "Put all whispers in tabs"
msgstr ""
-#: src/gui/setup_players.cpp:234
+#: src/gui/setup_players.cpp:232
msgid "Players"
msgstr ""
-#: src/gui/setup_players.cpp:259
+#: src/gui/setup_players.cpp:257
msgid "When ignoring:"
msgstr ""
@@ -1332,157 +1315,147 @@ msgstr ""
msgid "Large"
msgstr ""
-#: src/gui/setup_video.cpp:151
-msgid "Full screen"
-msgstr ""
-
-#: src/gui/setup_video.cpp:152
-msgid "OpenGL"
-msgstr ""
-
-#: src/gui/setup_video.cpp:153
-msgid "Custom cursor"
+#: src/gui/setup_video.cpp:141
+msgid "No text"
msgstr ""
-#: src/gui/setup_video.cpp:155
-msgid "Visible names"
+#: src/gui/setup_video.cpp:143
+msgid "Bubbles, no names"
msgstr ""
-#: src/gui/setup_video.cpp:157
-msgid "Particle effects"
+#: src/gui/setup_video.cpp:144
+msgid "Bubbles with names"
msgstr ""
-#: src/gui/setup_video.cpp:159
-msgid "Show name"
+#: src/gui/setup_video.cpp:153
+msgid "off"
msgstr ""
-#: src/gui/setup_video.cpp:160
-msgid "Show pickup notification"
+#: src/gui/setup_video.cpp:154 src/gui/setup_video.cpp:164
+msgid "low"
msgstr ""
-#: src/gui/setup_video.cpp:161
-msgid "in chat"
+#: src/gui/setup_video.cpp:155 src/gui/setup_video.cpp:166
+msgid "high"
msgstr ""
-#: src/gui/setup_video.cpp:162
-msgid "as particle"
+#: src/gui/setup_video.cpp:165
+msgid "medium"
msgstr ""
#: src/gui/setup_video.cpp:167
-msgid "FPS Limit:"
+msgid "max"
msgstr ""
-#: src/gui/setup_video.cpp:184
-msgid "Video"
+#: src/gui/setup_video.cpp:187
+msgid "Full screen"
msgstr ""
-#: src/gui/setup_video.cpp:189
-msgid "Overhead text"
+#: src/gui/setup_video.cpp:188
+msgid "OpenGL"
msgstr ""
-#: src/gui/setup_video.cpp:190
-msgid "Gui opacity"
+#: src/gui/setup_video.cpp:189
+msgid "Custom cursor"
msgstr ""
#: src/gui/setup_video.cpp:191
-msgid "Scroll radius"
+msgid "Visible names"
msgstr ""
-#: src/gui/setup_video.cpp:192
-msgid "Scroll laziness"
+#: src/gui/setup_video.cpp:193
+msgid "Particle effects"
msgstr ""
-#: src/gui/setup_video.cpp:193
-msgid "Ambient FX"
+#: src/gui/setup_video.cpp:195
+msgid "Show name"
msgstr ""
-#: src/gui/setup_video.cpp:194
-msgid "Particle Detail"
+#: src/gui/setup_video.cpp:196
+msgid "Show pickup notification"
msgstr ""
-#: src/gui/setup_video.cpp:195
-msgid "Font size"
+#: src/gui/setup_video.cpp:197
+msgid "in chat"
msgstr ""
-#: src/gui/setup_video.cpp:265 src/gui/setup_video.cpp:564
-msgid "No text"
+#: src/gui/setup_video.cpp:198
+msgid "as particle"
msgstr ""
-#: src/gui/setup_video.cpp:271 src/gui/setup_video.cpp:570
-msgid "Bubbles, no names"
+#: src/gui/setup_video.cpp:203
+msgid "FPS Limit:"
msgstr ""
-#: src/gui/setup_video.cpp:274 src/gui/setup_video.cpp:573
-msgid "Bubbles with names"
+#: src/gui/setup_video.cpp:214
+msgid "Video"
msgstr ""
-#: src/gui/setup_video.cpp:282 src/gui/setup_video.cpp:610
-msgid "off"
+#: src/gui/setup_video.cpp:219
+msgid "Overhead text"
msgstr ""
-#: src/gui/setup_video.cpp:285 src/gui/setup_video.cpp:296
-#: src/gui/setup_video.cpp:613 src/gui/setup_video.cpp:627
-msgid "low"
+#: src/gui/setup_video.cpp:220
+msgid "Gui opacity"
msgstr ""
-#: src/gui/setup_video.cpp:288 src/gui/setup_video.cpp:302
-#: src/gui/setup_video.cpp:616 src/gui/setup_video.cpp:633
-msgid "high"
+#: src/gui/setup_video.cpp:221
+msgid "Ambient FX"
msgstr ""
-#: src/gui/setup_video.cpp:299 src/gui/setup_video.cpp:630
-msgid "medium"
+#: src/gui/setup_video.cpp:222
+msgid "Particle Detail"
msgstr ""
-#: src/gui/setup_video.cpp:305 src/gui/setup_video.cpp:636
-msgid "max"
+#: src/gui/setup_video.cpp:223
+msgid "Font size"
msgstr ""
-#: src/gui/setup_video.cpp:410
+#: src/gui/setup_video.cpp:356
msgid "Failed to switch to "
msgstr ""
-#: src/gui/setup_video.cpp:411
+#: src/gui/setup_video.cpp:357
msgid "windowed"
msgstr ""
-#: src/gui/setup_video.cpp:411
+#: src/gui/setup_video.cpp:357
msgid "fullscreen"
msgstr ""
-#: src/gui/setup_video.cpp:412
+#: src/gui/setup_video.cpp:358
msgid "mode and restoration of old mode also failed!"
msgstr ""
-#: src/gui/setup_video.cpp:421
+#: src/gui/setup_video.cpp:367
msgid "Switching to full screen"
msgstr ""
-#: src/gui/setup_video.cpp:422
+#: src/gui/setup_video.cpp:368
msgid "Restart needed for changes to take effect."
msgstr ""
-#: src/gui/setup_video.cpp:434
+#: src/gui/setup_video.cpp:380
msgid "Changing OpenGL"
msgstr ""
-#: src/gui/setup_video.cpp:435
+#: src/gui/setup_video.cpp:381
msgid "Applying change to OpenGL requires restart."
msgstr ""
-#: src/gui/setup_video.cpp:520
+#: src/gui/setup_video.cpp:442
msgid "Screen resolution changed"
msgstr ""
-#: src/gui/setup_video.cpp:521
+#: src/gui/setup_video.cpp:443
msgid "Restart your client for the change to take effect."
msgstr ""
-#: src/gui/setup_video.cpp:545
+#: src/gui/setup_video.cpp:467
msgid "Particle effect settings changed."
msgstr ""
-#: src/gui/setup_video.cpp:546
+#: src/gui/setup_video.cpp:468
msgid "Changes will take effect on map change."
msgstr ""
@@ -2003,55 +1976,55 @@ msgstr ""
msgid "Ignore input 2"
msgstr ""
-#: src/localplayer.cpp:834
+#: src/localplayer.cpp:837
msgid "Unarmed"
msgstr ""
-#: src/localplayer.cpp:835
+#: src/localplayer.cpp:838
msgid "Knife"
msgstr ""
-#: src/localplayer.cpp:836
+#: src/localplayer.cpp:839
msgid "Sword"
msgstr ""
-#: src/localplayer.cpp:837
+#: src/localplayer.cpp:840
msgid "Polearm"
msgstr ""
-#: src/localplayer.cpp:838
+#: src/localplayer.cpp:841
msgid "Staff"
msgstr ""
-#: src/localplayer.cpp:839
+#: src/localplayer.cpp:842
msgid "Whip"
msgstr ""
-#: src/localplayer.cpp:840
+#: src/localplayer.cpp:843
msgid "Bow"
msgstr ""
-#: src/localplayer.cpp:841
+#: src/localplayer.cpp:844
msgid "Shooting"
msgstr ""
-#: src/localplayer.cpp:842
+#: src/localplayer.cpp:845
msgid "Mace"
msgstr ""
-#: src/localplayer.cpp:843
+#: src/localplayer.cpp:846
msgid "Axe"
msgstr ""
-#: src/localplayer.cpp:844
+#: src/localplayer.cpp:847
msgid "Thrown"
msgstr ""
-#: src/localplayer.cpp:846
+#: src/localplayer.cpp:849
msgid "Craft"
msgstr ""
-#: src/localplayer.cpp:847
+#: src/localplayer.cpp:850
msgid "Unknown Skill"
msgstr ""
@@ -2263,193 +2236,193 @@ msgstr ""
msgid "Unable to unequip."
msgstr ""
-#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:82
-#, c-format
-msgid "Strength: %d"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:81
+#, fuzzy, c-format
+msgid "Strength %+d"
+msgstr "筋力:"
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:84
-#, c-format
-msgid "Agility: %d"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:82
+#, fuzzy, c-format
+msgid "Agility %+d"
+msgstr "素早さ:"
-#: src/net/ea/generalhandler.cpp:96 src/net/tmwserv/generalhandler.cpp:88
-#, c-format
-msgid "Vitality: %d"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:84
+#, fuzzy, c-format
+msgid "Vitality %+d"
+msgstr "体力:"
-#: src/net/ea/generalhandler.cpp:98 src/net/tmwserv/generalhandler.cpp:90
-#, c-format
-msgid "Intelligence: %d"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:85
+#, fuzzy, c-format
+msgid "Intelligence %+d"
+msgstr "知性:"
-#: src/net/ea/generalhandler.cpp:100 src/net/tmwserv/generalhandler.cpp:86
-#, c-format
-msgid "Dexterity: %d"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:83
+#, fuzzy, c-format
+msgid "Dexterity %+d"
+msgstr "敏捷:"
-#: src/net/ea/generalhandler.cpp:102
+#: src/net/ea/generalhandler.cpp:96
#, c-format
-msgid "Luck: %d"
+msgid "Luck %+d"
msgstr ""
-#: src/net/ea/generalhandler.cpp:125
+#: src/net/ea/generalhandler.cpp:118
msgid "Authentication failed"
msgstr ""
-#: src/net/ea/generalhandler.cpp:128
+#: src/net/ea/generalhandler.cpp:121
msgid "No servers available"
msgstr ""
-#: src/net/ea/generalhandler.cpp:132
+#: src/net/ea/generalhandler.cpp:125
msgid "Someone else is trying to use this account"
msgstr ""
-#: src/net/ea/generalhandler.cpp:135
+#: src/net/ea/generalhandler.cpp:128
msgid "This account is already logged in"
msgstr ""
-#: src/net/ea/generalhandler.cpp:138
+#: src/net/ea/generalhandler.cpp:131
msgid "Speed hack detected"
msgstr ""
-#: src/net/ea/generalhandler.cpp:141
+#: src/net/ea/generalhandler.cpp:134
msgid "Duplicated login"
msgstr ""
-#: src/net/ea/generalhandler.cpp:144
+#: src/net/ea/generalhandler.cpp:137
msgid "Unknown connection error"
msgstr ""
-#: src/net/ea/generalhandler.cpp:201
+#: src/net/ea/generalhandler.cpp:194
msgid "Got disconnected from server!"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:52
+#: src/net/ea/gui/partytab.cpp:55
msgid "/help > Display this help."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:53
+#: src/net/ea/gui/partytab.cpp:56
msgid "/create > Create a new party"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:54
+#: src/net/ea/gui/partytab.cpp:57
msgid "/new > Alias of create"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:55
+#: src/net/ea/gui/partytab.cpp:58
msgid "/invite > Invite a player to your party"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:56
+#: src/net/ea/gui/partytab.cpp:59
msgid "/leave > Leave the party you are in"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:57
+#: src/net/ea/gui/partytab.cpp:60
msgid "/kick > Kick some one from the party you are in"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:58
+#: src/net/ea/gui/partytab.cpp:61
msgid "/item > Show/change party item sharing options"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:59
+#: src/net/ea/gui/partytab.cpp:62
msgid "/exp > Show/change party experience sharing options"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:68
+#: src/net/ea/gui/partytab.cpp:71
msgid "Command: /new <party-name>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:69
+#: src/net/ea/gui/partytab.cpp:72
msgid "Command: /create <party-name>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:70
+#: src/net/ea/gui/partytab.cpp:73
msgid "These commands create a new party called <party-name>."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:74
+#: src/net/ea/gui/partytab.cpp:77
msgid "Command: /invite <nick>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:81
+#: src/net/ea/gui/partytab.cpp:84
msgid "Command: /leave"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:82
+#: src/net/ea/gui/partytab.cpp:85
msgid "This command causes the player to leave the party."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/ea/gui/partytab.cpp:89
msgid "Command: /item <policy>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:87
+#: src/net/ea/gui/partytab.cpp:90
msgid "This command changes the party's item sharing policy."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:88
+#: src/net/ea/gui/partytab.cpp:91
msgid ""
"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
"\"0\", \"no\", \"false\" to disable item sharing."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:94
msgid "Command: /item"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:92
+#: src/net/ea/gui/partytab.cpp:95
msgid "This command displays the party's current item sharing policy."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:96
+#: src/net/ea/gui/partytab.cpp:99
msgid "Command: /exp <policy>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/ea/gui/partytab.cpp:100
msgid "This command changes the party's experience sharing policy."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:98
+#: src/net/ea/gui/partytab.cpp:101
msgid ""
"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:104
msgid "Command: /exp"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:102
+#: src/net/ea/gui/partytab.cpp:105
msgid "This command displays the party's current experience sharing policy."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:110
+#: src/net/ea/gui/partytab.cpp:113
msgid "Party name is missing."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:133 src/net/ea/partyhandler.cpp:191
+#: src/net/ea/gui/partytab.cpp:136 src/net/ea/partyhandler.cpp:194
msgid "Item sharing enabled."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:136 src/net/ea/partyhandler.cpp:197
+#: src/net/ea/gui/partytab.cpp:139 src/net/ea/partyhandler.cpp:200
msgid "Item sharing disabled."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:139 src/net/ea/partyhandler.cpp:203
+#: src/net/ea/gui/partytab.cpp:142 src/net/ea/partyhandler.cpp:206
msgid "Item sharing not possible."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:165 src/net/ea/partyhandler.cpp:168
+#: src/net/ea/gui/partytab.cpp:168 src/net/ea/partyhandler.cpp:171
msgid "Experience sharing enabled."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:168 src/net/ea/partyhandler.cpp:174
+#: src/net/ea/gui/partytab.cpp:171 src/net/ea/partyhandler.cpp:177
msgid "Experience sharing disabled."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:171 src/net/ea/partyhandler.cpp:180
+#: src/net/ea/gui/partytab.cpp:174 src/net/ea/partyhandler.cpp:183
msgid "Experience sharing not possible."
msgstr ""
@@ -2512,45 +2485,45 @@ msgstr ""
msgid "Party successfully created."
msgstr ""
-#: src/net/ea/partyhandler.cpp:115
+#: src/net/ea/partyhandler.cpp:118
#, c-format
msgid "%s is already a member of a party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:119
+#: src/net/ea/partyhandler.cpp:122
#, c-format
msgid "%s refused your invitation."
msgstr ""
-#: src/net/ea/partyhandler.cpp:123
+#: src/net/ea/partyhandler.cpp:126
#, c-format
msgid "%s is now a member of your party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:127
+#: src/net/ea/partyhandler.cpp:130
#, c-format
msgid "Unknown invite response for %s."
msgstr ""
-#: src/net/ea/partyhandler.cpp:232
+#: src/net/ea/partyhandler.cpp:235
msgid "You have left the party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:235
+#: src/net/ea/partyhandler.cpp:239
#, c-format
msgid "%s has left your party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:272
+#: src/net/ea/partyhandler.cpp:274
#, c-format
msgid "An unknown member tried to say: %s"
msgstr ""
-#: src/net/ea/partyhandler.cpp:298
+#: src/net/ea/partyhandler.cpp:300
msgid "Inviting like this isn't supported at the moment."
msgstr ""
-#: src/net/ea/partyhandler.cpp:327
+#: src/net/ea/partyhandler.cpp:329
#, c-format
msgid "%s is not in your party!"
msgstr ""
@@ -2843,10 +2816,10 @@ msgstr "精神:"
msgid "Topic: "
msgstr ""
-#: src/net/tmwserv/generalhandler.cpp:92
-#, c-format
-msgid "Willpower: %d"
-msgstr ""
+#: src/net/tmwserv/generalhandler.cpp:86
+#, fuzzy, c-format
+msgid "Willpower %+d"
+msgstr "精神:"
#: src/net/tmwserv/loginhandler.cpp:80
msgid "Wrong magic_token"
diff --git a/po/nl.po b/po/nl.po
index 497e9591..397c9c24 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: The Mana World 0.1.0\n"
"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-05-10 16:39+0200\n"
+"POT-Creation-Date: 2009-05-12 00:11+0200\n"
"PO-Revision-Date: 2009-01-18 16:53+0000\n"
"Last-Translator: Bjørn Lindeijer <bjorn@lindeijer.nl>\n"
"Language-Team: Dutch\n"
@@ -175,7 +175,7 @@ msgstr ""
#: src/commandhandler.cpp:216 src/commandhandler.cpp:230
#: src/gui/widgets/channeltab.cpp:81 src/gui/widgets/channeltab.cpp:90
-#: src/net/ea/gui/partytab.cpp:76
+#: src/net/ea/gui/partytab.cpp:79
msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
msgstr ""
@@ -195,7 +195,7 @@ msgstr ""
msgid "Command: /party <nick>"
msgstr ""
-#: src/commandhandler.cpp:229 src/net/ea/gui/partytab.cpp:75
+#: src/commandhandler.cpp:229 src/net/ea/gui/partytab.cpp:78
msgid "This command invites <nick> to party with you."
msgstr ""
@@ -508,7 +508,7 @@ msgstr "OK"
msgid "Previous"
msgstr "Vorige"
-#: src/gui/charselectdialog.cpp:113 src/gui/npcdialog.cpp:44
+#: src/gui/charselectdialog.cpp:113 src/gui/npcdialog.cpp:43
msgid "Next"
msgstr "Volgende"
@@ -533,7 +533,7 @@ msgstr "Nieuw"
#: src/gui/charselectdialog.cpp:118 src/gui/charselectdialog.cpp:165
#: src/gui/charselectdialog.cpp:166 src/gui/charselectdialog.cpp:315
-#: src/gui/setup_players.cpp:230
+#: src/gui/setup_players.cpp:228
msgid "Delete"
msgstr "Verwijderen"
@@ -568,19 +568,15 @@ msgstr ""
msgid "%d players are present."
msgstr ""
-#: src/gui/chat.cpp:348 src/gui/chat.cpp:354
+#: src/gui/chat.cpp:333
msgid "Present: "
msgstr ""
-#: src/gui/chat.cpp:348 src/gui/chat.cpp:354
-msgid "; "
-msgstr ""
-
-#: src/gui/chat.cpp:349
+#: src/gui/chat.cpp:350
msgid "Attendance written to record log."
msgstr ""
-#: src/gui/chat.cpp:474
+#: src/gui/chat.cpp:475
#, c-format
msgid "Whispering to %s: %s"
msgstr ""
@@ -630,7 +626,7 @@ msgstr ""
msgid "Help"
msgstr ""
-#: src/gui/help.cpp:47 src/gui/npcdialog.cpp:45 src/gui/storagewindow.cpp:68
+#: src/gui/help.cpp:47 src/gui/npcdialog.cpp:44 src/gui/storagewindow.cpp:68
msgid "Close"
msgstr "Sluiten"
@@ -723,7 +719,7 @@ msgid "Register"
msgstr "Aanmelden"
#: src/gui/magic.cpp:32 src/gui/skilldialog.cpp:117 src/gui/windowmenu.cpp:64
-#: src/localplayer.cpp:845
+#: src/localplayer.cpp:848
msgid "Magic"
msgstr ""
@@ -739,33 +735,25 @@ msgstr ""
msgid "Cast Test Spell 3"
msgstr ""
-#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
+#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:86
#, fuzzy
msgid "Map"
msgstr "Kaartje"
-#: src/gui/npcdialog.cpp:43
+#: src/gui/npcdialog.cpp:42
msgid "Waiting for server"
msgstr ""
-#: src/gui/npcdialog.cpp:46
+#: src/gui/npcdialog.cpp:45
#, fuzzy
msgid "Submit"
msgstr "Afsluiten"
-#: src/gui/npcdialog.cpp:49 src/gui/npcpostdialog.cpp:39
+#: src/gui/npcdialog.cpp:48 src/gui/npcpostdialog.cpp:39
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:95
-msgid "+"
-msgstr ""
-
-#: src/gui/npcdialog.cpp:96
-msgid "-"
-msgstr ""
-
-#: src/gui/npcdialog.cpp:105
+#: src/gui/npcdialog.cpp:104
msgid "Reset"
msgstr ""
@@ -773,8 +761,7 @@ msgstr ""
msgid "Send"
msgstr ""
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:268
-#: src/gui/setup_video.cpp:567
+#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:142
msgid "Text"
msgstr ""
@@ -826,8 +813,8 @@ msgstr ""
msgid "Is"
msgstr ""
-#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:33
-#: src/net/ea/gui/partytab.cpp:37
+#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:45
+#: src/net/ea/gui/partytab.cpp:39
msgid "Party"
msgstr ""
@@ -1295,26 +1282,22 @@ msgid "???"
msgstr ""
#: src/gui/setup_players.cpp:224
-msgid "Save player list"
-msgstr ""
-
-#: src/gui/setup_players.cpp:226
msgid "Allow trading"
msgstr ""
-#: src/gui/setup_players.cpp:228
+#: src/gui/setup_players.cpp:226
msgid "Allow whispers"
msgstr ""
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:230
msgid "Put all whispers in tabs"
msgstr ""
-#: src/gui/setup_players.cpp:234
+#: src/gui/setup_players.cpp:232
msgid "Players"
msgstr "Spelers"
-#: src/gui/setup_players.cpp:259
+#: src/gui/setup_players.cpp:257
msgid "When ignoring:"
msgstr ""
@@ -1336,157 +1319,147 @@ msgstr "gemiddeld"
msgid "Large"
msgstr ""
-#: src/gui/setup_video.cpp:151
+#: src/gui/setup_video.cpp:141
+msgid "No text"
+msgstr ""
+
+#: src/gui/setup_video.cpp:143
+msgid "Bubbles, no names"
+msgstr ""
+
+#: src/gui/setup_video.cpp:144
+msgid "Bubbles with names"
+msgstr ""
+
+#: src/gui/setup_video.cpp:153
+msgid "off"
+msgstr "uit"
+
+#: src/gui/setup_video.cpp:154 src/gui/setup_video.cpp:164
+msgid "low"
+msgstr "laag"
+
+#: src/gui/setup_video.cpp:155 src/gui/setup_video.cpp:166
+msgid "high"
+msgstr "hoog"
+
+#: src/gui/setup_video.cpp:165
+msgid "medium"
+msgstr "gemiddeld"
+
+#: src/gui/setup_video.cpp:167
+msgid "max"
+msgstr "max"
+
+#: src/gui/setup_video.cpp:187
msgid "Full screen"
msgstr "Volledig scherm"
-#: src/gui/setup_video.cpp:152
+#: src/gui/setup_video.cpp:188
msgid "OpenGL"
msgstr "OpenGL"
-#: src/gui/setup_video.cpp:153
+#: src/gui/setup_video.cpp:189
msgid "Custom cursor"
msgstr "Aangepaste cursor"
-#: src/gui/setup_video.cpp:155
+#: src/gui/setup_video.cpp:191
msgid "Visible names"
msgstr ""
-#: src/gui/setup_video.cpp:157
+#: src/gui/setup_video.cpp:193
msgid "Particle effects"
msgstr ""
-#: src/gui/setup_video.cpp:159
+#: src/gui/setup_video.cpp:195
msgid "Show name"
msgstr ""
-#: src/gui/setup_video.cpp:160
+#: src/gui/setup_video.cpp:196
msgid "Show pickup notification"
msgstr ""
-#: src/gui/setup_video.cpp:161
+#: src/gui/setup_video.cpp:197
msgid "in chat"
msgstr ""
-#: src/gui/setup_video.cpp:162
+#: src/gui/setup_video.cpp:198
msgid "as particle"
msgstr ""
-#: src/gui/setup_video.cpp:167
+#: src/gui/setup_video.cpp:203
msgid "FPS Limit:"
msgstr "FPS limiet:"
-#: src/gui/setup_video.cpp:184
+#: src/gui/setup_video.cpp:214
msgid "Video"
msgstr "Video"
-#: src/gui/setup_video.cpp:189
+#: src/gui/setup_video.cpp:219
msgid "Overhead text"
msgstr ""
-#: src/gui/setup_video.cpp:190
+#: src/gui/setup_video.cpp:220
msgid "Gui opacity"
msgstr "Dekking van de GUI"
-#: src/gui/setup_video.cpp:191
-msgid "Scroll radius"
-msgstr "Scroll radius"
-
-#: src/gui/setup_video.cpp:192
-msgid "Scroll laziness"
-msgstr "Scroll vertraging"
-
-#: src/gui/setup_video.cpp:193
+#: src/gui/setup_video.cpp:221
msgid "Ambient FX"
msgstr "Omgevingseffecten"
-#: src/gui/setup_video.cpp:194
+#: src/gui/setup_video.cpp:222
msgid "Particle Detail"
msgstr ""
-#: src/gui/setup_video.cpp:195
+#: src/gui/setup_video.cpp:223
msgid "Font size"
msgstr ""
-#: src/gui/setup_video.cpp:265 src/gui/setup_video.cpp:564
-msgid "No text"
-msgstr ""
-
-#: src/gui/setup_video.cpp:271 src/gui/setup_video.cpp:570
-msgid "Bubbles, no names"
-msgstr ""
-
-#: src/gui/setup_video.cpp:274 src/gui/setup_video.cpp:573
-msgid "Bubbles with names"
-msgstr ""
-
-#: src/gui/setup_video.cpp:282 src/gui/setup_video.cpp:610
-msgid "off"
-msgstr "uit"
-
-#: src/gui/setup_video.cpp:285 src/gui/setup_video.cpp:296
-#: src/gui/setup_video.cpp:613 src/gui/setup_video.cpp:627
-msgid "low"
-msgstr "laag"
-
-#: src/gui/setup_video.cpp:288 src/gui/setup_video.cpp:302
-#: src/gui/setup_video.cpp:616 src/gui/setup_video.cpp:633
-msgid "high"
-msgstr "hoog"
-
-#: src/gui/setup_video.cpp:299 src/gui/setup_video.cpp:630
-msgid "medium"
-msgstr "gemiddeld"
-
-#: src/gui/setup_video.cpp:305 src/gui/setup_video.cpp:636
-msgid "max"
-msgstr "max"
-
-#: src/gui/setup_video.cpp:410
+#: src/gui/setup_video.cpp:356
msgid "Failed to switch to "
msgstr ""
-#: src/gui/setup_video.cpp:411
+#: src/gui/setup_video.cpp:357
msgid "windowed"
msgstr ""
-#: src/gui/setup_video.cpp:411
+#: src/gui/setup_video.cpp:357
msgid "fullscreen"
msgstr ""
-#: src/gui/setup_video.cpp:412
+#: src/gui/setup_video.cpp:358
msgid "mode and restoration of old mode also failed!"
msgstr ""
-#: src/gui/setup_video.cpp:421
+#: src/gui/setup_video.cpp:367
msgid "Switching to full screen"
msgstr "Overgaan naar volledig scherm"
-#: src/gui/setup_video.cpp:422
+#: src/gui/setup_video.cpp:368
msgid "Restart needed for changes to take effect."
msgstr "De veranderingen worden pas actief na opnieuw opstarten"
-#: src/gui/setup_video.cpp:434
+#: src/gui/setup_video.cpp:380
msgid "Changing OpenGL"
msgstr "Veranderen van OpenGL"
-#: src/gui/setup_video.cpp:435
+#: src/gui/setup_video.cpp:381
msgid "Applying change to OpenGL requires restart."
msgstr "Het wisselen van of naar OpenGL wordt pas actief na opnieuw opstarten"
-#: src/gui/setup_video.cpp:520
+#: src/gui/setup_video.cpp:442
msgid "Screen resolution changed"
msgstr ""
-#: src/gui/setup_video.cpp:521
+#: src/gui/setup_video.cpp:443
msgid "Restart your client for the change to take effect."
msgstr ""
-#: src/gui/setup_video.cpp:545
+#: src/gui/setup_video.cpp:467
msgid "Particle effect settings changed."
msgstr ""
-#: src/gui/setup_video.cpp:546
+#: src/gui/setup_video.cpp:468
msgid "Changes will take effect on map change."
msgstr ""
@@ -2008,55 +1981,55 @@ msgstr ""
msgid "Ignore input 2"
msgstr ""
-#: src/localplayer.cpp:834
+#: src/localplayer.cpp:837
msgid "Unarmed"
msgstr ""
-#: src/localplayer.cpp:835
+#: src/localplayer.cpp:838
msgid "Knife"
msgstr ""
-#: src/localplayer.cpp:836
+#: src/localplayer.cpp:839
msgid "Sword"
msgstr ""
-#: src/localplayer.cpp:837
+#: src/localplayer.cpp:840
msgid "Polearm"
msgstr ""
-#: src/localplayer.cpp:838
+#: src/localplayer.cpp:841
msgid "Staff"
msgstr ""
-#: src/localplayer.cpp:839
+#: src/localplayer.cpp:842
msgid "Whip"
msgstr ""
-#: src/localplayer.cpp:840
+#: src/localplayer.cpp:843
msgid "Bow"
msgstr ""
-#: src/localplayer.cpp:841
+#: src/localplayer.cpp:844
msgid "Shooting"
msgstr ""
-#: src/localplayer.cpp:842
+#: src/localplayer.cpp:845
msgid "Mace"
msgstr ""
-#: src/localplayer.cpp:843
+#: src/localplayer.cpp:846
msgid "Axe"
msgstr ""
-#: src/localplayer.cpp:844
+#: src/localplayer.cpp:847
msgid "Thrown"
msgstr ""
-#: src/localplayer.cpp:846
+#: src/localplayer.cpp:849
msgid "Craft"
msgstr ""
-#: src/localplayer.cpp:847
+#: src/localplayer.cpp:850
msgid "Unknown Skill"
msgstr ""
@@ -2268,193 +2241,193 @@ msgstr ""
msgid "Unable to unequip."
msgstr ""
-#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:82
-#, c-format
-msgid "Strength: %d"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:81
+#, fuzzy, c-format
+msgid "Strength %+d"
+msgstr "Sterkte:"
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:84
-#, c-format
-msgid "Agility: %d"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:82
+#, fuzzy, c-format
+msgid "Agility %+d"
+msgstr "Agiliteit:"
-#: src/net/ea/generalhandler.cpp:96 src/net/tmwserv/generalhandler.cpp:88
-#, c-format
-msgid "Vitality: %d"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:84
+#, fuzzy, c-format
+msgid "Vitality %+d"
+msgstr "Vitaliteit:"
-#: src/net/ea/generalhandler.cpp:98 src/net/tmwserv/generalhandler.cpp:90
-#, c-format
-msgid "Intelligence: %d"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:85
+#, fuzzy, c-format
+msgid "Intelligence %+d"
+msgstr "Intelligentie:"
-#: src/net/ea/generalhandler.cpp:100 src/net/tmwserv/generalhandler.cpp:86
-#, c-format
-msgid "Dexterity: %d"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:83
+#, fuzzy, c-format
+msgid "Dexterity %+d"
+msgstr "Dexteriteit:"
-#: src/net/ea/generalhandler.cpp:102
+#: src/net/ea/generalhandler.cpp:96
#, c-format
-msgid "Luck: %d"
+msgid "Luck %+d"
msgstr ""
-#: src/net/ea/generalhandler.cpp:125
+#: src/net/ea/generalhandler.cpp:118
msgid "Authentication failed"
msgstr ""
-#: src/net/ea/generalhandler.cpp:128
+#: src/net/ea/generalhandler.cpp:121
msgid "No servers available"
msgstr ""
-#: src/net/ea/generalhandler.cpp:132
+#: src/net/ea/generalhandler.cpp:125
msgid "Someone else is trying to use this account"
msgstr ""
-#: src/net/ea/generalhandler.cpp:135
+#: src/net/ea/generalhandler.cpp:128
msgid "This account is already logged in"
msgstr ""
-#: src/net/ea/generalhandler.cpp:138
+#: src/net/ea/generalhandler.cpp:131
msgid "Speed hack detected"
msgstr ""
-#: src/net/ea/generalhandler.cpp:141
+#: src/net/ea/generalhandler.cpp:134
msgid "Duplicated login"
msgstr ""
-#: src/net/ea/generalhandler.cpp:144
+#: src/net/ea/generalhandler.cpp:137
msgid "Unknown connection error"
msgstr ""
-#: src/net/ea/generalhandler.cpp:201
+#: src/net/ea/generalhandler.cpp:194
msgid "Got disconnected from server!"
msgstr "De verbinding met de server werd verbroken!"
-#: src/net/ea/gui/partytab.cpp:52
+#: src/net/ea/gui/partytab.cpp:55
msgid "/help > Display this help."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:53
+#: src/net/ea/gui/partytab.cpp:56
msgid "/create > Create a new party"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:54
+#: src/net/ea/gui/partytab.cpp:57
msgid "/new > Alias of create"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:55
+#: src/net/ea/gui/partytab.cpp:58
msgid "/invite > Invite a player to your party"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:56
+#: src/net/ea/gui/partytab.cpp:59
msgid "/leave > Leave the party you are in"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:57
+#: src/net/ea/gui/partytab.cpp:60
msgid "/kick > Kick some one from the party you are in"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:58
+#: src/net/ea/gui/partytab.cpp:61
msgid "/item > Show/change party item sharing options"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:59
+#: src/net/ea/gui/partytab.cpp:62
msgid "/exp > Show/change party experience sharing options"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:68
+#: src/net/ea/gui/partytab.cpp:71
msgid "Command: /new <party-name>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:69
+#: src/net/ea/gui/partytab.cpp:72
msgid "Command: /create <party-name>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:70
+#: src/net/ea/gui/partytab.cpp:73
msgid "These commands create a new party called <party-name>."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:74
+#: src/net/ea/gui/partytab.cpp:77
msgid "Command: /invite <nick>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:81
+#: src/net/ea/gui/partytab.cpp:84
msgid "Command: /leave"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:82
+#: src/net/ea/gui/partytab.cpp:85
msgid "This command causes the player to leave the party."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/ea/gui/partytab.cpp:89
msgid "Command: /item <policy>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:87
+#: src/net/ea/gui/partytab.cpp:90
msgid "This command changes the party's item sharing policy."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:88
+#: src/net/ea/gui/partytab.cpp:91
msgid ""
"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
"\"0\", \"no\", \"false\" to disable item sharing."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:94
msgid "Command: /item"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:92
+#: src/net/ea/gui/partytab.cpp:95
msgid "This command displays the party's current item sharing policy."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:96
+#: src/net/ea/gui/partytab.cpp:99
msgid "Command: /exp <policy>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/ea/gui/partytab.cpp:100
msgid "This command changes the party's experience sharing policy."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:98
+#: src/net/ea/gui/partytab.cpp:101
msgid ""
"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:104
msgid "Command: /exp"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:102
+#: src/net/ea/gui/partytab.cpp:105
msgid "This command displays the party's current experience sharing policy."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:110
+#: src/net/ea/gui/partytab.cpp:113
msgid "Party name is missing."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:133 src/net/ea/partyhandler.cpp:191
+#: src/net/ea/gui/partytab.cpp:136 src/net/ea/partyhandler.cpp:194
msgid "Item sharing enabled."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:136 src/net/ea/partyhandler.cpp:197
+#: src/net/ea/gui/partytab.cpp:139 src/net/ea/partyhandler.cpp:200
msgid "Item sharing disabled."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:139 src/net/ea/partyhandler.cpp:203
+#: src/net/ea/gui/partytab.cpp:142 src/net/ea/partyhandler.cpp:206
msgid "Item sharing not possible."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:165 src/net/ea/partyhandler.cpp:168
+#: src/net/ea/gui/partytab.cpp:168 src/net/ea/partyhandler.cpp:171
msgid "Experience sharing enabled."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:168 src/net/ea/partyhandler.cpp:174
+#: src/net/ea/gui/partytab.cpp:171 src/net/ea/partyhandler.cpp:177
msgid "Experience sharing disabled."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:171 src/net/ea/partyhandler.cpp:180
+#: src/net/ea/gui/partytab.cpp:174 src/net/ea/partyhandler.cpp:183
msgid "Experience sharing not possible."
msgstr ""
@@ -2517,45 +2490,45 @@ msgstr ""
msgid "Party successfully created."
msgstr ""
-#: src/net/ea/partyhandler.cpp:115
+#: src/net/ea/partyhandler.cpp:118
#, c-format
msgid "%s is already a member of a party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:119
+#: src/net/ea/partyhandler.cpp:122
#, c-format
msgid "%s refused your invitation."
msgstr ""
-#: src/net/ea/partyhandler.cpp:123
+#: src/net/ea/partyhandler.cpp:126
#, c-format
msgid "%s is now a member of your party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:127
+#: src/net/ea/partyhandler.cpp:130
#, c-format
msgid "Unknown invite response for %s."
msgstr ""
-#: src/net/ea/partyhandler.cpp:232
+#: src/net/ea/partyhandler.cpp:235
msgid "You have left the party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:235
+#: src/net/ea/partyhandler.cpp:239
#, c-format
msgid "%s has left your party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:272
+#: src/net/ea/partyhandler.cpp:274
#, c-format
msgid "An unknown member tried to say: %s"
msgstr ""
-#: src/net/ea/partyhandler.cpp:298
+#: src/net/ea/partyhandler.cpp:300
msgid "Inviting like this isn't supported at the moment."
msgstr ""
-#: src/net/ea/partyhandler.cpp:327
+#: src/net/ea/partyhandler.cpp:329
#, c-format
msgid "%s is not in your party!"
msgstr ""
@@ -2848,10 +2821,10 @@ msgstr "Wilskracht:"
msgid "Topic: "
msgstr ""
-#: src/net/tmwserv/generalhandler.cpp:92
-#, c-format
-msgid "Willpower: %d"
-msgstr ""
+#: src/net/tmwserv/generalhandler.cpp:86
+#, fuzzy, c-format
+msgid "Willpower %+d"
+msgstr "Wilskracht:"
#: src/net/tmwserv/loginhandler.cpp:80
msgid "Wrong magic_token"
@@ -2948,3 +2921,9 @@ msgstr ""
#: src/resources/npcdb.cpp:53
msgid "NPC Database: Error while loading npcs.xml!"
msgstr ""
+
+#~ msgid "Scroll radius"
+#~ msgstr "Scroll radius"
+
+#~ msgid "Scroll laziness"
+#~ msgstr "Scroll vertraging"
diff --git a/po/pl.po b/po/pl.po
index a5873ba4..21031dc6 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,14 +9,14 @@ msgid ""
msgstr ""
"Project-Id-Version: The Mana World 0.1.0\n"
"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-05-10 16:39+0200\n"
-"PO-Revision-Date: 2009-04-29 15:31+0000\n"
-"Last-Translator: lusmanko <Unknown>\n"
+"POT-Creation-Date: 2009-05-12 00:11+0200\n"
+"PO-Revision-Date: 2009-05-10 15:42+0000\n"
+"Last-Translator: Bjørn Lindeijer <bjorn@lindeijer.nl>\n"
"Language-Team: <pl@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-05-10 13:48+0000\n"
+"X-Launchpad-Export-Date: 2009-05-11 21:56+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#: src/commandhandler.cpp:141
@@ -24,9 +24,8 @@ msgid "-- Help --"
msgstr "-- Pomoc --"
#: src/commandhandler.cpp:142
-#, fuzzy
msgid "/help > Display this help"
-msgstr "/help > Wyświetla tą pomoc"
+msgstr ""
#: src/commandhandler.cpp:144
msgid "/where > Display map name"
@@ -182,7 +181,7 @@ msgstr "Ta komenda wysyła tekst <wiadomość> do <ksywka>"
#: src/commandhandler.cpp:216 src/commandhandler.cpp:230
#: src/gui/widgets/channeltab.cpp:81 src/gui/widgets/channeltab.cpp:90
-#: src/net/ea/gui/partytab.cpp:76
+#: src/net/ea/gui/partytab.cpp:79
msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
msgstr "Jeżeli <postać> ma spację, należy ją zapisać w cudzysłowie (\")"
@@ -204,7 +203,7 @@ msgstr ""
msgid "Command: /party <nick>"
msgstr "Komenda: /party <ksywka>"
-#: src/commandhandler.cpp:229 src/net/ea/gui/partytab.cpp:75
+#: src/commandhandler.cpp:229 src/net/ea/gui/partytab.cpp:78
msgid "This command invites <nick> to party with you."
msgstr "Ta komenda zaprasza <ksywka> do twojej grupy."
@@ -290,18 +289,15 @@ msgid "Type /help for a list of commands."
msgstr "Wpisz /help aby usyskać listę komend."
#: src/commandhandler.cpp:339
-#, fuzzy
msgid "Cannot send empty whispers!"
-msgstr "Nie można wysłać pustych szeptów!"
+msgstr ""
#: src/commandhandler.cpp:346
-#, fuzzy, c-format
+#, c-format
msgid ""
"Cannot create a whisper tab for nick '%s'! It either already exists, or is "
"you."
msgstr ""
-"Nie można utworzyć zakładki szeptu dla ksywki '%s'!Już istnieje, lub podana "
-"ksywka to ty."
#: src/commandhandler.cpp:392
msgid "Return toggles chat."
@@ -527,7 +523,7 @@ msgstr "Ok"
msgid "Previous"
msgstr "Poprzednia"
-#: src/gui/charselectdialog.cpp:113 src/gui/npcdialog.cpp:44
+#: src/gui/charselectdialog.cpp:113 src/gui/npcdialog.cpp:43
msgid "Next"
msgstr "Następna"
@@ -552,7 +548,7 @@ msgstr "Nowa"
#: src/gui/charselectdialog.cpp:118 src/gui/charselectdialog.cpp:165
#: src/gui/charselectdialog.cpp:166 src/gui/charselectdialog.cpp:315
-#: src/gui/setup_players.cpp:230
+#: src/gui/setup_players.cpp:228
msgid "Delete"
msgstr "Usuń"
@@ -587,19 +583,15 @@ msgstr "Czat"
msgid "%d players are present."
msgstr ""
-#: src/gui/chat.cpp:348 src/gui/chat.cpp:354
+#: src/gui/chat.cpp:333
msgid "Present: "
msgstr "Obecny: "
-#: src/gui/chat.cpp:348 src/gui/chat.cpp:354
-msgid "; "
-msgstr ""
-
-#: src/gui/chat.cpp:349
+#: src/gui/chat.cpp:350
msgid "Attendance written to record log."
msgstr "Dozór wpisany do dziennika zapisu"
-#: src/gui/chat.cpp:474
+#: src/gui/chat.cpp:475
#, c-format
msgid "Whispering to %s: %s"
msgstr "Szepczesz do %s: %s"
@@ -649,7 +641,7 @@ msgstr "Opuść Gildię"
msgid "Help"
msgstr "Pomoc"
-#: src/gui/help.cpp:47 src/gui/npcdialog.cpp:45 src/gui/storagewindow.cpp:68
+#: src/gui/help.cpp:47 src/gui/npcdialog.cpp:44 src/gui/storagewindow.cpp:68
msgid "Close"
msgstr "Zamknij"
@@ -742,7 +734,7 @@ msgid "Register"
msgstr "Rejestruj"
#: src/gui/magic.cpp:32 src/gui/skilldialog.cpp:117 src/gui/windowmenu.cpp:64
-#: src/localplayer.cpp:845
+#: src/localplayer.cpp:848
msgid "Magic"
msgstr "Magia"
@@ -758,33 +750,23 @@ msgstr "Test Rzucania Zaklęcia 2"
msgid "Cast Test Spell 3"
msgstr "Test Rzucania Zaklęcia 3"
-#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
-#, fuzzy
+#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:86
msgid "Map"
-msgstr "Maks."
+msgstr ""
-#: src/gui/npcdialog.cpp:43
+#: src/gui/npcdialog.cpp:42
msgid "Waiting for server"
msgstr "Oczekiwanie na serwer"
-#: src/gui/npcdialog.cpp:46
-#, fuzzy
+#: src/gui/npcdialog.cpp:45
msgid "Submit"
-msgstr "Usiądź"
+msgstr ""
-#: src/gui/npcdialog.cpp:49 src/gui/npcpostdialog.cpp:39
+#: src/gui/npcdialog.cpp:48 src/gui/npcpostdialog.cpp:39
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:95
-msgid "+"
-msgstr ""
-
-#: src/gui/npcdialog.cpp:96
-msgid "-"
-msgstr ""
-
-#: src/gui/npcdialog.cpp:105
+#: src/gui/npcdialog.cpp:104
msgid "Reset"
msgstr "Resetuj"
@@ -792,8 +774,7 @@ msgstr "Resetuj"
msgid "Send"
msgstr "Wyślij"
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:268
-#: src/gui/setup_video.cpp:567
+#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:142
msgid "Text"
msgstr "Tekst"
@@ -845,8 +826,8 @@ msgstr "Szept"
msgid "Is"
msgstr "Jest"
-#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:33
-#: src/net/ea/gui/partytab.cpp:37
+#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:45
+#: src/net/ea/gui/partytab.cpp:39
msgid "Party"
msgstr "Grupa"
@@ -867,9 +848,8 @@ msgid "Being"
msgstr "Byt"
#: src/gui/palette.cpp:104
-#, fuzzy
msgid "Other Players' Names"
-msgstr "Imiona Innych Graczy"
+msgstr ""
#: src/gui/palette.cpp:105
msgid "Own Name"
@@ -892,24 +872,20 @@ msgid "Unknown Item Type"
msgstr "Nieznany Typ Przedmiotu"
#: src/gui/palette.cpp:111
-#, fuzzy
msgid "Generics"
-msgstr "Ogólne"
+msgstr ""
#: src/gui/palette.cpp:112
-#, fuzzy
msgid "Hats"
-msgstr "Kapelusze"
+msgstr ""
#: src/gui/palette.cpp:113
-#, fuzzy
msgid "Usables"
-msgstr "Używalne"
+msgstr ""
#: src/gui/palette.cpp:114
-#, fuzzy
msgid "Shirts"
-msgstr "Koszulki"
+msgstr ""
#: src/gui/palette.cpp:115
msgid "1 Handed Weapons"
@@ -928,19 +904,16 @@ msgid "2 Handed Weapons"
msgstr "Bronie dwuręczne"
#: src/gui/palette.cpp:119
-#, fuzzy
msgid "Shields"
-msgstr "Tarcze"
+msgstr ""
#: src/gui/palette.cpp:120
-#, fuzzy
msgid "Rings"
-msgstr "Pierścienie"
+msgstr ""
#: src/gui/palette.cpp:121
-#, fuzzy
msgid "Necklaces"
-msgstr "Naszyjniki"
+msgstr ""
#: src/gui/palette.cpp:122
msgid "Arms"
@@ -1054,14 +1027,13 @@ msgid "@@cancel|Cancel@@"
msgstr "@@cancel|Anuluj@@"
#: src/gui/popupmenu.cpp:157
-#, fuzzy, c-format
+#, c-format
msgid "@@pickup|Pick up %s@@"
-msgstr "@@pickup|Podnieś %s@@"
+msgstr ""
#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:373
-#, fuzzy
msgid "@@chat|Add to chat@@"
-msgstr "@@chat|Dodaj do Czatu@@"
+msgstr ""
#: src/gui/popupmenu.cpp:348
msgid "@@use|Unequip@@"
@@ -1084,9 +1056,8 @@ msgid "@@split|Split@@"
msgstr "@@split|Rozdziel@@"
#: src/gui/popupmenu.cpp:364
-#, fuzzy
msgid "@@store|Store@@"
-msgstr "@@ignore|Ignoruj %s@@"
+msgstr ""
#: src/gui/popupmenu.cpp:371
msgid "@@retrieve|Retrieve@@"
@@ -1320,26 +1291,22 @@ msgid "???"
msgstr "???"
#: src/gui/setup_players.cpp:224
-msgid "Save player list"
-msgstr "Zapisz listę graczy"
-
-#: src/gui/setup_players.cpp:226
msgid "Allow trading"
msgstr "Zezwól na handel"
-#: src/gui/setup_players.cpp:228
+#: src/gui/setup_players.cpp:226
msgid "Allow whispers"
msgstr "Zezwól na szepty"
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:230
msgid "Put all whispers in tabs"
msgstr "Umieść wszystkie szepty w zakładkach"
-#: src/gui/setup_players.cpp:234
+#: src/gui/setup_players.cpp:232
msgid "Players"
msgstr "Gracze"
-#: src/gui/setup_players.cpp:259
+#: src/gui/setup_players.cpp:257
msgid "When ignoring:"
msgstr "Gdy ignorowany:"
@@ -1348,170 +1315,158 @@ msgid "Tiny"
msgstr ""
#: src/gui/setup_video.cpp:113
-#, fuzzy
msgid "Small"
-msgstr "Sprzedaj"
+msgstr ""
#: src/gui/setup_video.cpp:114
-#, fuzzy
msgid "Medium"
-msgstr "średnie"
+msgstr ""
#: src/gui/setup_video.cpp:115
msgid "Large"
msgstr ""
-#: src/gui/setup_video.cpp:151
+#: src/gui/setup_video.cpp:141
+msgid "No text"
+msgstr "Brak tekstu"
+
+#: src/gui/setup_video.cpp:143
+msgid "Bubbles, no names"
+msgstr "Bąbelki, brak imion"
+
+#: src/gui/setup_video.cpp:144
+msgid "Bubbles with names"
+msgstr "Bąbelki z imionami"
+
+#: src/gui/setup_video.cpp:153
+msgid "off"
+msgstr "wyłączone"
+
+#: src/gui/setup_video.cpp:154 src/gui/setup_video.cpp:164
+msgid "low"
+msgstr "niskie"
+
+#: src/gui/setup_video.cpp:155 src/gui/setup_video.cpp:166
+msgid "high"
+msgstr "wysokie"
+
+#: src/gui/setup_video.cpp:165
+msgid "medium"
+msgstr "średnie"
+
+#: src/gui/setup_video.cpp:167
+msgid "max"
+msgstr "max"
+
+#: src/gui/setup_video.cpp:187
msgid "Full screen"
msgstr "Pełen ekran"
-#: src/gui/setup_video.cpp:152
+#: src/gui/setup_video.cpp:188
msgid "OpenGL"
msgstr "OpenGL"
-#: src/gui/setup_video.cpp:153
+#: src/gui/setup_video.cpp:189
msgid "Custom cursor"
msgstr "Własny kursor"
-#: src/gui/setup_video.cpp:155
+#: src/gui/setup_video.cpp:191
msgid "Visible names"
msgstr "Widoczne imiona"
-#: src/gui/setup_video.cpp:157
+#: src/gui/setup_video.cpp:193
msgid "Particle effects"
msgstr "Efekty cząsteczkowe"
-#: src/gui/setup_video.cpp:159
+#: src/gui/setup_video.cpp:195
msgid "Show name"
msgstr "Pokaż imię"
-#: src/gui/setup_video.cpp:160
+#: src/gui/setup_video.cpp:196
msgid "Show pickup notification"
msgstr "Pokaż powiadomienie o podniesieniu"
-#: src/gui/setup_video.cpp:161
+#: src/gui/setup_video.cpp:197
msgid "in chat"
msgstr "w czacie"
-#: src/gui/setup_video.cpp:162
+#: src/gui/setup_video.cpp:198
msgid "as particle"
msgstr "jako cząsteczkę"
-#: src/gui/setup_video.cpp:167
+#: src/gui/setup_video.cpp:203
msgid "FPS Limit:"
msgstr "Limit FPS:"
-#: src/gui/setup_video.cpp:184
+#: src/gui/setup_video.cpp:214
msgid "Video"
msgstr "Obraz"
-#: src/gui/setup_video.cpp:189
+#: src/gui/setup_video.cpp:219
msgid "Overhead text"
msgstr "Tekst nad głową"
-#: src/gui/setup_video.cpp:190
+#: src/gui/setup_video.cpp:220
msgid "Gui opacity"
msgstr "Przezroczystość GUI"
-#: src/gui/setup_video.cpp:191
-msgid "Scroll radius"
-msgstr "Skok przy przewijaniu ekranu"
-
-#: src/gui/setup_video.cpp:192
-msgid "Scroll laziness"
-msgstr "Opóźnienie przy przewijaniu ekranu"
-
-#: src/gui/setup_video.cpp:193
+#: src/gui/setup_video.cpp:221
msgid "Ambient FX"
msgstr "Efekty otoczenia"
-#: src/gui/setup_video.cpp:194
+#: src/gui/setup_video.cpp:222
msgid "Particle Detail"
msgstr "Detale cząsteczek"
-#: src/gui/setup_video.cpp:195
+#: src/gui/setup_video.cpp:223
msgid "Font size"
msgstr ""
-#: src/gui/setup_video.cpp:265 src/gui/setup_video.cpp:564
-msgid "No text"
-msgstr "Brak tekstu"
-
-#: src/gui/setup_video.cpp:271 src/gui/setup_video.cpp:570
-msgid "Bubbles, no names"
-msgstr "Bąbelki, brak imion"
-
-#: src/gui/setup_video.cpp:274 src/gui/setup_video.cpp:573
-msgid "Bubbles with names"
-msgstr "Bąbelki z imionami"
-
-#: src/gui/setup_video.cpp:282 src/gui/setup_video.cpp:610
-msgid "off"
-msgstr "wyłączone"
-
-#: src/gui/setup_video.cpp:285 src/gui/setup_video.cpp:296
-#: src/gui/setup_video.cpp:613 src/gui/setup_video.cpp:627
-msgid "low"
-msgstr "niskie"
-
-#: src/gui/setup_video.cpp:288 src/gui/setup_video.cpp:302
-#: src/gui/setup_video.cpp:616 src/gui/setup_video.cpp:633
-msgid "high"
-msgstr "wysokie"
-
-#: src/gui/setup_video.cpp:299 src/gui/setup_video.cpp:630
-msgid "medium"
-msgstr "średnie"
-
-#: src/gui/setup_video.cpp:305 src/gui/setup_video.cpp:636
-msgid "max"
-msgstr "max"
-
-#: src/gui/setup_video.cpp:410
+#: src/gui/setup_video.cpp:356
msgid "Failed to switch to "
msgstr "Nie udało się przełączyć na "
-#: src/gui/setup_video.cpp:411
+#: src/gui/setup_video.cpp:357
msgid "windowed"
msgstr "w oknie"
-#: src/gui/setup_video.cpp:411
+#: src/gui/setup_video.cpp:357
msgid "fullscreen"
msgstr "pełny ekran"
-#: src/gui/setup_video.cpp:412
+#: src/gui/setup_video.cpp:358
msgid "mode and restoration of old mode also failed!"
msgstr "tryb i przywrócenie starego trybu również nie powiodło się!"
-#: src/gui/setup_video.cpp:421
+#: src/gui/setup_video.cpp:367
msgid "Switching to full screen"
msgstr "Przełączanie na pełen ekran"
-#: src/gui/setup_video.cpp:422
+#: src/gui/setup_video.cpp:368
msgid "Restart needed for changes to take effect."
msgstr "Wymagane ponowne uruchomienie aby zastosować zmiany."
-#: src/gui/setup_video.cpp:434
+#: src/gui/setup_video.cpp:380
msgid "Changing OpenGL"
msgstr "Zmień na OpenGL"
-#: src/gui/setup_video.cpp:435
+#: src/gui/setup_video.cpp:381
msgid "Applying change to OpenGL requires restart."
msgstr "Zastosowanie zmiany na OpenGL wymaga ponownego uruchomienia."
-#: src/gui/setup_video.cpp:520
+#: src/gui/setup_video.cpp:442
msgid "Screen resolution changed"
msgstr "Zmieniono rozdzielczość ekranu"
-#: src/gui/setup_video.cpp:521
+#: src/gui/setup_video.cpp:443
msgid "Restart your client for the change to take effect."
msgstr "Uruchom ponownie twojego klienta, aby mogły zajść zmiany."
-#: src/gui/setup_video.cpp:545
+#: src/gui/setup_video.cpp:467
msgid "Particle effect settings changed."
msgstr "Zmieniono ustawienia efektów cząsteczek"
-#: src/gui/setup_video.cpp:546
+#: src/gui/setup_video.cpp:468
msgid "Changes will take effect on map change."
msgstr "Zmiany nastąpią po zmianie mapy."
@@ -1985,9 +1940,8 @@ msgid "Debug Window"
msgstr "Okno diagnostyczne"
#: src/keyboardconfig.cpp:80
-#, fuzzy
msgid "Party Window"
-msgstr "Okno Czatu"
+msgstr ""
#: src/keyboardconfig.cpp:81
msgid "Emote Shortcut Window"
@@ -2035,55 +1989,55 @@ msgstr "Ignoruj wprowadzenie 1"
msgid "Ignore input 2"
msgstr "Ignoruj wprowadzenie 2"
-#: src/localplayer.cpp:834
+#: src/localplayer.cpp:837
msgid "Unarmed"
msgstr "Nieuzbrojony"
-#: src/localplayer.cpp:835
+#: src/localplayer.cpp:838
msgid "Knife"
msgstr "Nóż"
-#: src/localplayer.cpp:836
+#: src/localplayer.cpp:839
msgid "Sword"
msgstr "Miecz"
-#: src/localplayer.cpp:837
+#: src/localplayer.cpp:840
msgid "Polearm"
msgstr "Kij"
-#: src/localplayer.cpp:838
+#: src/localplayer.cpp:841
msgid "Staff"
msgstr "Laska"
-#: src/localplayer.cpp:839
+#: src/localplayer.cpp:842
msgid "Whip"
msgstr "Bat"
-#: src/localplayer.cpp:840
+#: src/localplayer.cpp:843
msgid "Bow"
msgstr "Łuk"
-#: src/localplayer.cpp:841
+#: src/localplayer.cpp:844
msgid "Shooting"
msgstr "Strzelectwo"
-#: src/localplayer.cpp:842
+#: src/localplayer.cpp:845
msgid "Mace"
msgstr "Maczuga"
-#: src/localplayer.cpp:843
+#: src/localplayer.cpp:846
msgid "Axe"
msgstr "Topór"
-#: src/localplayer.cpp:844
+#: src/localplayer.cpp:847
msgid "Thrown"
msgstr "Rzucana"
-#: src/localplayer.cpp:846
+#: src/localplayer.cpp:849
msgid "Craft"
msgstr "Rrzemiosło"
-#: src/localplayer.cpp:847
+#: src/localplayer.cpp:850
msgid "Unknown Skill"
msgstr "Nieznana Umiejętność"
@@ -2112,77 +2066,64 @@ msgid "tmw"
msgstr "tmw"
#: src/main.cpp:567
-#, fuzzy
msgid "Options:"
-msgstr "Opcje: "
+msgstr ""
#: src/main.cpp:568
-#, fuzzy
msgid " -C --config-file : Configuration file to use"
-msgstr " -C --configfile : Plik konfiguracyjny do użycia"
+msgstr ""
#: src/main.cpp:569
-#, fuzzy
msgid " -d --data : Directory to load game data from"
-msgstr " -d --data : Katalog, z którego mają być wczytane dane gry"
+msgstr ""
#: src/main.cpp:570
msgid " -D --default : Choose default character server and character"
msgstr ""
#: src/main.cpp:572
-#, fuzzy
msgid " -h --help : Display this help"
-msgstr " -h --help : Pokazuje tą pomoc"
+msgstr ""
#: src/main.cpp:573
-#, fuzzy
msgid " -S --home-dir : Directory to use as home directory"
-msgstr " -S --homedir : Katalog do użycia jako katalog domowy"
+msgstr ""
#: src/main.cpp:574
-#, fuzzy
msgid " -H --update-host : Use this update host"
-msgstr " -H --updatehost : Użyj tego hosta aktualizacyjnego"
+msgstr ""
#: src/main.cpp:575
-#, fuzzy
msgid " -P --password : Login with this password"
-msgstr " -P --password : Zaloguj z tym hasłem"
+msgstr ""
#: src/main.cpp:576
-#, fuzzy
msgid " -c --character : Login with this character"
-msgstr " -c --character : Zaloguj z tą postacią"
+msgstr ""
#: src/main.cpp:577
-#, fuzzy
msgid " -p --port : Login Server Port"
-msgstr " -o --port : Port serwera logowania"
+msgstr ""
#: src/main.cpp:578
-#, fuzzy
msgid " -s --server : Login Server name or IP"
-msgstr " -s --server : Nazwa serweru logowania lub IP"
+msgstr ""
#: src/main.cpp:579
-#, fuzzy
msgid " -u --skip-update : Skip the update downloads"
-msgstr " -u --skipupdate : Pomiń pobieranie aktualizacji"
+msgstr ""
#: src/main.cpp:580
-#, fuzzy
msgid " -U --username : Login with this username"
-msgstr " -U --username : Zaloguj z tą nazwą użytkownika"
+msgstr ""
#: src/main.cpp:582
msgid " -O --no-opengl : Disable OpenGL for this session"
msgstr ""
#: src/main.cpp:584
-#, fuzzy
msgid " -v --version : Display the version"
-msgstr " -v --version : Pokazuje wersję"
+msgstr ""
#: src/main.cpp:589
msgid "The Mana World "
@@ -2309,133 +2250,133 @@ msgstr "Nie można założyć."
msgid "Unable to unequip."
msgstr "Nie można zdjąć."
-#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:82
-#, c-format
-msgid "Strength: %d"
+#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:81
+#, fuzzy, c-format
+msgid "Strength %+d"
msgstr "Siła: %d"
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:84
-#, c-format
-msgid "Agility: %d"
+#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:82
+#, fuzzy, c-format
+msgid "Agility %+d"
msgstr "Zwinność: %d"
-#: src/net/ea/generalhandler.cpp:96 src/net/tmwserv/generalhandler.cpp:88
-#, c-format
-msgid "Vitality: %d"
+#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:84
+#, fuzzy, c-format
+msgid "Vitality %+d"
msgstr "Witalność: %d"
-#: src/net/ea/generalhandler.cpp:98 src/net/tmwserv/generalhandler.cpp:90
-#, c-format
-msgid "Intelligence: %d"
+#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:85
+#, fuzzy, c-format
+msgid "Intelligence %+d"
msgstr "Inteligencja: %d"
-#: src/net/ea/generalhandler.cpp:100 src/net/tmwserv/generalhandler.cpp:86
-#, c-format
-msgid "Dexterity: %d"
+#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:83
+#, fuzzy, c-format
+msgid "Dexterity %+d"
msgstr "Zręczność: %d"
-#: src/net/ea/generalhandler.cpp:102
-#, c-format
-msgid "Luck: %d"
+#: src/net/ea/generalhandler.cpp:96
+#, fuzzy, c-format
+msgid "Luck %+d"
msgstr "Szczęście: %d"
-#: src/net/ea/generalhandler.cpp:125
+#: src/net/ea/generalhandler.cpp:118
msgid "Authentication failed"
msgstr "Uwierzytelnienie nie powiodło się"
-#: src/net/ea/generalhandler.cpp:128
+#: src/net/ea/generalhandler.cpp:121
msgid "No servers available"
msgstr "Brak dostępnych serwerów"
-#: src/net/ea/generalhandler.cpp:132
+#: src/net/ea/generalhandler.cpp:125
msgid "Someone else is trying to use this account"
msgstr ""
-#: src/net/ea/generalhandler.cpp:135
+#: src/net/ea/generalhandler.cpp:128
msgid "This account is already logged in"
msgstr "To konto jest już zalogowane"
-#: src/net/ea/generalhandler.cpp:138
+#: src/net/ea/generalhandler.cpp:131
msgid "Speed hack detected"
msgstr "Wykryto Speed hack"
-#: src/net/ea/generalhandler.cpp:141
+#: src/net/ea/generalhandler.cpp:134
msgid "Duplicated login"
msgstr "Zduplikowany login"
-#: src/net/ea/generalhandler.cpp:144
+#: src/net/ea/generalhandler.cpp:137
msgid "Unknown connection error"
msgstr "Nieznany błąd połączenia"
-#: src/net/ea/generalhandler.cpp:201
+#: src/net/ea/generalhandler.cpp:194
msgid "Got disconnected from server!"
msgstr "Rozłączono z serwerem!"
-#: src/net/ea/gui/partytab.cpp:52
+#: src/net/ea/gui/partytab.cpp:55
msgid "/help > Display this help."
msgstr "/help > Wyświetla tą pomoc"
-#: src/net/ea/gui/partytab.cpp:53
+#: src/net/ea/gui/partytab.cpp:56
msgid "/create > Create a new party"
msgstr "/create > Utworzenie nowej grupy"
-#: src/net/ea/gui/partytab.cpp:54
+#: src/net/ea/gui/partytab.cpp:57
msgid "/new > Alias of create"
msgstr "/new > Alias create"
-#: src/net/ea/gui/partytab.cpp:55
+#: src/net/ea/gui/partytab.cpp:58
msgid "/invite > Invite a player to your party"
msgstr "/invite > Zaproszenie gracza do twojej grupy"
-#: src/net/ea/gui/partytab.cpp:56
+#: src/net/ea/gui/partytab.cpp:59
msgid "/leave > Leave the party you are in"
msgstr "/leave > Opuszenie grupy, w której jesteś"
-#: src/net/ea/gui/partytab.cpp:57
+#: src/net/ea/gui/partytab.cpp:60
msgid "/kick > Kick some one from the party you are in"
msgstr "/kick > Wykopanie kogoś z grupy, w której jesteś"
-#: src/net/ea/gui/partytab.cpp:58
+#: src/net/ea/gui/partytab.cpp:61
msgid "/item > Show/change party item sharing options"
msgstr "/item > Pokaż/zmień opcje podziału przedmiotu w grupie"
-#: src/net/ea/gui/partytab.cpp:59
+#: src/net/ea/gui/partytab.cpp:62
msgid "/exp > Show/change party experience sharing options"
msgstr "/exp > Pokaż/zmień opcje pozdziału doświadczenia w grupie"
-#: src/net/ea/gui/partytab.cpp:68
+#: src/net/ea/gui/partytab.cpp:71
msgid "Command: /new <party-name>"
msgstr "Komenda: /new <nazwa-grupy>"
-#: src/net/ea/gui/partytab.cpp:69
+#: src/net/ea/gui/partytab.cpp:72
msgid "Command: /create <party-name>"
msgstr "Komenda: /create <nazwa-grupy>"
-#: src/net/ea/gui/partytab.cpp:70
+#: src/net/ea/gui/partytab.cpp:73
msgid "These commands create a new party called <party-name>."
msgstr "Te komendy utworzą nową grupę nazwaną <nazwa-grupy>."
-#: src/net/ea/gui/partytab.cpp:74
+#: src/net/ea/gui/partytab.cpp:77
msgid "Command: /invite <nick>"
msgstr "Komenda: /invite <ksywka>"
-#: src/net/ea/gui/partytab.cpp:81
+#: src/net/ea/gui/partytab.cpp:84
msgid "Command: /leave"
msgstr "Komenda: /leave"
-#: src/net/ea/gui/partytab.cpp:82
+#: src/net/ea/gui/partytab.cpp:85
msgid "This command causes the player to leave the party."
msgstr "Komenda powoduje opuszczenie grupy przez gracza"
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/ea/gui/partytab.cpp:89
msgid "Command: /item <policy>"
msgstr "Komenda: /item <zasada>"
-#: src/net/ea/gui/partytab.cpp:87
+#: src/net/ea/gui/partytab.cpp:90
msgid "This command changes the party's item sharing policy."
msgstr "Komenda zmienia zasadę pozdziału przedmiotu w grupie"
-#: src/net/ea/gui/partytab.cpp:88
+#: src/net/ea/gui/partytab.cpp:91
msgid ""
"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
"\"0\", \"no\", \"false\" to disable item sharing."
@@ -2443,23 +2384,23 @@ msgstr ""
"<zasada> może być jedną z \"1\", \"yes\", \"true\" aby aktywować pozdział "
"przedmiotu lub \"0\", \"no\", \"false\" by wyłączyć podział przedmiotu."
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:94
msgid "Command: /item"
msgstr "Komenda: /przedmiot"
-#: src/net/ea/gui/partytab.cpp:92
+#: src/net/ea/gui/partytab.cpp:95
msgid "This command displays the party's current item sharing policy."
msgstr "Komenda pokazuje zasadę pozdziału przedmiotu w grupie."
-#: src/net/ea/gui/partytab.cpp:96
+#: src/net/ea/gui/partytab.cpp:99
msgid "Command: /exp <policy>"
msgstr "Komenda: /exp <zadada>"
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/ea/gui/partytab.cpp:100
msgid "This command changes the party's experience sharing policy."
msgstr "Komenda zmienia zasadę pozdziału doświadczenia w grupie."
-#: src/net/ea/gui/partytab.cpp:98
+#: src/net/ea/gui/partytab.cpp:101
msgid ""
"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
@@ -2468,39 +2409,39 @@ msgstr ""
"doświadczenia, lub \"0\", \"no\", \"false\" aby wyłączyć pozdział "
"doświadczenia."
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:104
msgid "Command: /exp"
msgstr "Komenda: /exp"
-#: src/net/ea/gui/partytab.cpp:102
+#: src/net/ea/gui/partytab.cpp:105
msgid "This command displays the party's current experience sharing policy."
msgstr "Komenda pokazuje obecną zasadę podziału doświadczenia w grupie."
-#: src/net/ea/gui/partytab.cpp:110
+#: src/net/ea/gui/partytab.cpp:113
msgid "Party name is missing."
msgstr "Brakuje nazwy grupy."
-#: src/net/ea/gui/partytab.cpp:133 src/net/ea/partyhandler.cpp:191
+#: src/net/ea/gui/partytab.cpp:136 src/net/ea/partyhandler.cpp:194
msgid "Item sharing enabled."
msgstr "Podział przedmiotu włączony."
-#: src/net/ea/gui/partytab.cpp:136 src/net/ea/partyhandler.cpp:197
+#: src/net/ea/gui/partytab.cpp:139 src/net/ea/partyhandler.cpp:200
msgid "Item sharing disabled."
msgstr "Podział przedmiotu wyłączony."
-#: src/net/ea/gui/partytab.cpp:139 src/net/ea/partyhandler.cpp:203
+#: src/net/ea/gui/partytab.cpp:142 src/net/ea/partyhandler.cpp:206
msgid "Item sharing not possible."
msgstr "Podział przedmiotu nie jest możliwy."
-#: src/net/ea/gui/partytab.cpp:165 src/net/ea/partyhandler.cpp:168
+#: src/net/ea/gui/partytab.cpp:168 src/net/ea/partyhandler.cpp:171
msgid "Experience sharing enabled."
msgstr "Podział doświadczenia włączony."
-#: src/net/ea/gui/partytab.cpp:168 src/net/ea/partyhandler.cpp:174
+#: src/net/ea/gui/partytab.cpp:171 src/net/ea/partyhandler.cpp:177
msgid "Experience sharing disabled."
msgstr "Podział doświadczenia wyłączony."
-#: src/net/ea/gui/partytab.cpp:171 src/net/ea/partyhandler.cpp:180
+#: src/net/ea/gui/partytab.cpp:174 src/net/ea/partyhandler.cpp:183
msgid "Experience sharing not possible."
msgstr "Podział doświadczenia nie jest możliwy."
@@ -2509,9 +2450,9 @@ msgid "Unable to pick up item"
msgstr "Nie można podnieść przedmiotu"
#: src/net/ea/inventoryhandler.cpp:193
-#, fuzzy, c-format
+#, c-format
msgid "You picked up %s [@@%d|%s@@]"
-msgstr "Podniosłeś %s [%s]"
+msgstr ""
#: src/net/ea/inventoryhandler.cpp:239
msgid "Failed to use item"
@@ -2565,45 +2506,45 @@ msgstr "Nie można utworzyć grupy."
msgid "Party successfully created."
msgstr "Pomyślnie utworzono grupę."
-#: src/net/ea/partyhandler.cpp:115
+#: src/net/ea/partyhandler.cpp:118
#, c-format
msgid "%s is already a member of a party."
msgstr "%s już jest członkiem grupy."
-#: src/net/ea/partyhandler.cpp:119
+#: src/net/ea/partyhandler.cpp:122
#, c-format
msgid "%s refused your invitation."
msgstr "%s odmówił zaproszenia."
-#: src/net/ea/partyhandler.cpp:123
+#: src/net/ea/partyhandler.cpp:126
#, c-format
msgid "%s is now a member of your party."
msgstr "%s jest od teraz członkiem twojej grupy."
-#: src/net/ea/partyhandler.cpp:127
+#: src/net/ea/partyhandler.cpp:130
#, c-format
msgid "Unknown invite response for %s."
msgstr "Nieznana odpowiedź na zaproszenie dla %s"
-#: src/net/ea/partyhandler.cpp:232
+#: src/net/ea/partyhandler.cpp:235
msgid "You have left the party."
msgstr "Opuściłeś grupę."
-#: src/net/ea/partyhandler.cpp:235
+#: src/net/ea/partyhandler.cpp:239
#, c-format
msgid "%s has left your party."
msgstr "%s opuścił twoją grupę."
-#: src/net/ea/partyhandler.cpp:272
+#: src/net/ea/partyhandler.cpp:274
#, c-format
msgid "An unknown member tried to say: %s"
msgstr "Nieznany członek próbował powiedzieć: %s"
-#: src/net/ea/partyhandler.cpp:298
+#: src/net/ea/partyhandler.cpp:300
msgid "Inviting like this isn't supported at the moment."
msgstr ""
-#: src/net/ea/partyhandler.cpp:327
+#: src/net/ea/partyhandler.cpp:329
#, c-format
msgid "%s is not in your party!"
msgstr "%s nie jest w twojej grupie!"
@@ -2629,9 +2570,8 @@ msgid "Game Over!"
msgstr "Koniec gry!"
#: src/net/ea/playerhandler.cpp:102
-#, fuzzy
msgid "Insert coin to continue."
-msgstr "Wrzuć moneŧę, by kontynuować"
+msgstr ""
#: src/net/ea/playerhandler.cpp:103 src/net/tmwserv/beinghandler.cpp:317
msgid ""
@@ -2902,9 +2842,9 @@ msgstr "Siła woli:"
msgid "Topic: "
msgstr "Temat: "
-#: src/net/tmwserv/generalhandler.cpp:92
-#, c-format
-msgid "Willpower: %d"
+#: src/net/tmwserv/generalhandler.cpp:86
+#, fuzzy, c-format
+msgid "Willpower %+d"
msgstr "Siłą woli: %d"
#: src/net/tmwserv/loginhandler.cpp:80
@@ -2912,19 +2852,16 @@ msgid "Wrong magic_token"
msgstr ""
#: src/net/tmwserv/loginhandler.cpp:83 src/net/tmwserv/loginhandler.cpp:182
-#, fuzzy
msgid "Already logged in"
-msgstr "Już zapisuje."
+msgstr ""
#: src/net/tmwserv/loginhandler.cpp:86 src/net/tmwserv/loginhandler.cpp:185
-#, fuzzy
msgid "Server is full"
-msgstr "Serwer"
+msgstr ""
#: src/net/tmwserv/loginhandler.cpp:110
-#, fuzzy
msgid "New password incorrect"
-msgstr "Wpisz dwukrotnie nowe hasło:"
+msgstr ""
#: src/net/tmwserv/loginhandler.cpp:113
msgid "Old password incorrect"
@@ -2935,37 +2872,32 @@ msgid "Account not connected. Please login first."
msgstr ""
#: src/net/tmwserv/loginhandler.cpp:140
-#, fuzzy
msgid "New email address incorrect"
-msgstr "Wpisz dwukrotnie nowy adres email:"
+msgstr ""
#: src/net/tmwserv/loginhandler.cpp:143
-#, fuzzy
msgid "Old email address incorrect"
-msgstr "Wpisz dwukrotnie nowy adres email:"
+msgstr ""
#: src/net/tmwserv/loginhandler.cpp:149
-#, fuzzy
msgid "The new Email Address already exists."
-msgstr "Wpisz dwukrotnie nowy adres email:"
+msgstr ""
#: src/net/tmwserv/loginhandler.cpp:176 src/net/tmwserv/loginhandler.cpp:208
msgid "Client version is too old"
msgstr ""
#: src/net/tmwserv/loginhandler.cpp:179
-#, fuzzy
msgid "Wrong username or password"
-msgstr "Nieprawidłowe hasło"
+msgstr ""
#: src/net/tmwserv/loginhandler.cpp:211
msgid "Wrong username, password or email address"
msgstr ""
#: src/net/tmwserv/loginhandler.cpp:214
-#, fuzzy
msgid "Username already exists"
-msgstr "Ta nazwa użytkownika jest już zajęta"
+msgstr ""
#: src/net/tmwserv/loginhandler.cpp:217
msgid "Email address already exists"
@@ -3011,12 +2943,31 @@ msgstr "monsters.xml"
msgid "NPC Database: Error while loading npcs.xml!"
msgstr "Baza NPC: Błąd podczas wczytywania npcs.xml!"
-#~ msgid "Emote"
-#~ msgstr "Emoty"
+#~ msgid "Save player list"
+#~ msgstr "Zapisz listę graczy"
+
+#~ msgid "Scroll radius"
+#~ msgstr "Skok przy przewijaniu ekranu"
+
+#~ msgid "Scroll laziness"
+#~ msgstr "Opóźnienie przy przewijaniu ekranu"
#~ msgid "MiniMap"
#~ msgstr "MiniMapa"
+#~ msgid "Emote"
+#~ msgstr "Emoty"
+
+#~ msgid "inc"
+#~ msgstr "podw."
+
+#~ msgid "use"
+#~ msgstr "użyj"
+
+#~ msgid " -D --default : Bypass the login process with default settings"
+#~ msgstr ""
+#~ " -D --default : Pomiń proces logowania z domyślnymi ustawieniami"
+
#~ msgid "NPC Number Request"
#~ msgstr "Prośba NPC Numer"
@@ -3030,18 +2981,8 @@ msgstr "Baza NPC: Błąd podczas wczytywania npcs.xml!"
#~ msgid "NPC Text Request"
#~ msgstr "Tekst NPC - Prośba"
-#~ msgid "inc"
-#~ msgstr "podw."
-
-#~ msgid "use"
-#~ msgstr "użyj"
-
#~ msgid "%s: %s"
#~ msgstr "%s: %s"
#~ msgid "Emote Window"
#~ msgstr "Okno Emotek"
-
-#~ msgid " -D --default : Bypass the login process with default settings"
-#~ msgstr ""
-#~ " -D --default : Pomiń proces logowania z domyślnymi ustawieniami"
diff --git a/po/pt.po b/po/pt.po
index dc07bbb3..a0b117f2 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: tmw\n"
"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-05-10 16:39+0200\n"
+"POT-Creation-Date: 2009-05-12 00:11+0200\n"
"PO-Revision-Date: 2009-01-09 12:36+0000\n"
"Last-Translator: Bjørn Lindeijer <bjorn@lindeijer.nl>\n"
"Language-Team: Portuguese <pt@li.org>\n"
@@ -175,7 +175,7 @@ msgstr ""
#: src/commandhandler.cpp:216 src/commandhandler.cpp:230
#: src/gui/widgets/channeltab.cpp:81 src/gui/widgets/channeltab.cpp:90
-#: src/net/ea/gui/partytab.cpp:76
+#: src/net/ea/gui/partytab.cpp:79
msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
msgstr ""
@@ -195,7 +195,7 @@ msgstr ""
msgid "Command: /party <nick>"
msgstr ""
-#: src/commandhandler.cpp:229 src/net/ea/gui/partytab.cpp:75
+#: src/commandhandler.cpp:229 src/net/ea/gui/partytab.cpp:78
msgid "This command invites <nick> to party with you."
msgstr ""
@@ -508,7 +508,7 @@ msgstr "Ok"
msgid "Previous"
msgstr "Anterior"
-#: src/gui/charselectdialog.cpp:113 src/gui/npcdialog.cpp:44
+#: src/gui/charselectdialog.cpp:113 src/gui/npcdialog.cpp:43
msgid "Next"
msgstr "Seguinte"
@@ -533,7 +533,7 @@ msgstr "Novo"
#: src/gui/charselectdialog.cpp:118 src/gui/charselectdialog.cpp:165
#: src/gui/charselectdialog.cpp:166 src/gui/charselectdialog.cpp:315
-#: src/gui/setup_players.cpp:230
+#: src/gui/setup_players.cpp:228
msgid "Delete"
msgstr "Eliminar"
@@ -568,19 +568,15 @@ msgstr ""
msgid "%d players are present."
msgstr ""
-#: src/gui/chat.cpp:348 src/gui/chat.cpp:354
+#: src/gui/chat.cpp:333
msgid "Present: "
msgstr ""
-#: src/gui/chat.cpp:348 src/gui/chat.cpp:354
-msgid "; "
-msgstr ""
-
-#: src/gui/chat.cpp:349
+#: src/gui/chat.cpp:350
msgid "Attendance written to record log."
msgstr ""
-#: src/gui/chat.cpp:474
+#: src/gui/chat.cpp:475
#, c-format
msgid "Whispering to %s: %s"
msgstr ""
@@ -630,7 +626,7 @@ msgstr ""
msgid "Help"
msgstr ""
-#: src/gui/help.cpp:47 src/gui/npcdialog.cpp:45 src/gui/storagewindow.cpp:68
+#: src/gui/help.cpp:47 src/gui/npcdialog.cpp:44 src/gui/storagewindow.cpp:68
msgid "Close"
msgstr ""
@@ -723,7 +719,7 @@ msgid "Register"
msgstr "Registo"
#: src/gui/magic.cpp:32 src/gui/skilldialog.cpp:117 src/gui/windowmenu.cpp:64
-#: src/localplayer.cpp:845
+#: src/localplayer.cpp:848
msgid "Magic"
msgstr ""
@@ -739,33 +735,25 @@ msgstr ""
msgid "Cast Test Spell 3"
msgstr ""
-#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
+#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:86
#, fuzzy
msgid "Map"
msgstr "MiniMapa"
-#: src/gui/npcdialog.cpp:43
+#: src/gui/npcdialog.cpp:42
msgid "Waiting for server"
msgstr ""
-#: src/gui/npcdialog.cpp:46
+#: src/gui/npcdialog.cpp:45
#, fuzzy
msgid "Submit"
msgstr "Sair"
-#: src/gui/npcdialog.cpp:49 src/gui/npcpostdialog.cpp:39
+#: src/gui/npcdialog.cpp:48 src/gui/npcpostdialog.cpp:39
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:95
-msgid "+"
-msgstr ""
-
-#: src/gui/npcdialog.cpp:96
-msgid "-"
-msgstr ""
-
-#: src/gui/npcdialog.cpp:105
+#: src/gui/npcdialog.cpp:104
msgid "Reset"
msgstr ""
@@ -773,8 +761,7 @@ msgstr ""
msgid "Send"
msgstr ""
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:268
-#: src/gui/setup_video.cpp:567
+#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:142
msgid "Text"
msgstr ""
@@ -826,8 +813,8 @@ msgstr ""
msgid "Is"
msgstr ""
-#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:33
-#: src/net/ea/gui/partytab.cpp:37
+#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:45
+#: src/net/ea/gui/partytab.cpp:39
msgid "Party"
msgstr ""
@@ -1295,26 +1282,22 @@ msgid "???"
msgstr ""
#: src/gui/setup_players.cpp:224
-msgid "Save player list"
-msgstr ""
-
-#: src/gui/setup_players.cpp:226
msgid "Allow trading"
msgstr ""
-#: src/gui/setup_players.cpp:228
+#: src/gui/setup_players.cpp:226
msgid "Allow whispers"
msgstr ""
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:230
msgid "Put all whispers in tabs"
msgstr ""
-#: src/gui/setup_players.cpp:234
+#: src/gui/setup_players.cpp:232
msgid "Players"
msgstr ""
-#: src/gui/setup_players.cpp:259
+#: src/gui/setup_players.cpp:257
msgid "When ignoring:"
msgstr ""
@@ -1335,157 +1318,147 @@ msgstr ""
msgid "Large"
msgstr ""
-#: src/gui/setup_video.cpp:151
+#: src/gui/setup_video.cpp:141
+msgid "No text"
+msgstr ""
+
+#: src/gui/setup_video.cpp:143
+msgid "Bubbles, no names"
+msgstr ""
+
+#: src/gui/setup_video.cpp:144
+msgid "Bubbles with names"
+msgstr ""
+
+#: src/gui/setup_video.cpp:153
+msgid "off"
+msgstr "desligado"
+
+#: src/gui/setup_video.cpp:154 src/gui/setup_video.cpp:164
+msgid "low"
+msgstr "baixo"
+
+#: src/gui/setup_video.cpp:155 src/gui/setup_video.cpp:166
+msgid "high"
+msgstr "elevado"
+
+#: src/gui/setup_video.cpp:165
+msgid "medium"
+msgstr ""
+
+#: src/gui/setup_video.cpp:167
+msgid "max"
+msgstr ""
+
+#: src/gui/setup_video.cpp:187
msgid "Full screen"
msgstr "Ecrã completo"
-#: src/gui/setup_video.cpp:152
+#: src/gui/setup_video.cpp:188
msgid "OpenGL"
msgstr "OpenGL"
-#: src/gui/setup_video.cpp:153
+#: src/gui/setup_video.cpp:189
msgid "Custom cursor"
msgstr "Cursor personalizado"
-#: src/gui/setup_video.cpp:155
+#: src/gui/setup_video.cpp:191
msgid "Visible names"
msgstr ""
-#: src/gui/setup_video.cpp:157
+#: src/gui/setup_video.cpp:193
msgid "Particle effects"
msgstr ""
-#: src/gui/setup_video.cpp:159
+#: src/gui/setup_video.cpp:195
msgid "Show name"
msgstr ""
-#: src/gui/setup_video.cpp:160
+#: src/gui/setup_video.cpp:196
msgid "Show pickup notification"
msgstr ""
-#: src/gui/setup_video.cpp:161
+#: src/gui/setup_video.cpp:197
msgid "in chat"
msgstr ""
-#: src/gui/setup_video.cpp:162
+#: src/gui/setup_video.cpp:198
msgid "as particle"
msgstr ""
-#: src/gui/setup_video.cpp:167
+#: src/gui/setup_video.cpp:203
msgid "FPS Limit:"
msgstr "Limite de FPS:"
-#: src/gui/setup_video.cpp:184
+#: src/gui/setup_video.cpp:214
msgid "Video"
msgstr "Vídeo"
-#: src/gui/setup_video.cpp:189
+#: src/gui/setup_video.cpp:219
msgid "Overhead text"
msgstr ""
-#: src/gui/setup_video.cpp:190
+#: src/gui/setup_video.cpp:220
msgid "Gui opacity"
msgstr "Opacidade do Interface"
-#: src/gui/setup_video.cpp:191
-msgid "Scroll radius"
-msgstr ""
-
-#: src/gui/setup_video.cpp:192
-msgid "Scroll laziness"
-msgstr ""
-
-#: src/gui/setup_video.cpp:193
+#: src/gui/setup_video.cpp:221
msgid "Ambient FX"
msgstr "Efeitos Ambientais"
-#: src/gui/setup_video.cpp:194
+#: src/gui/setup_video.cpp:222
msgid "Particle Detail"
msgstr ""
-#: src/gui/setup_video.cpp:195
+#: src/gui/setup_video.cpp:223
msgid "Font size"
msgstr ""
-#: src/gui/setup_video.cpp:265 src/gui/setup_video.cpp:564
-msgid "No text"
-msgstr ""
-
-#: src/gui/setup_video.cpp:271 src/gui/setup_video.cpp:570
-msgid "Bubbles, no names"
-msgstr ""
-
-#: src/gui/setup_video.cpp:274 src/gui/setup_video.cpp:573
-msgid "Bubbles with names"
-msgstr ""
-
-#: src/gui/setup_video.cpp:282 src/gui/setup_video.cpp:610
-msgid "off"
-msgstr "desligado"
-
-#: src/gui/setup_video.cpp:285 src/gui/setup_video.cpp:296
-#: src/gui/setup_video.cpp:613 src/gui/setup_video.cpp:627
-msgid "low"
-msgstr "baixo"
-
-#: src/gui/setup_video.cpp:288 src/gui/setup_video.cpp:302
-#: src/gui/setup_video.cpp:616 src/gui/setup_video.cpp:633
-msgid "high"
-msgstr "elevado"
-
-#: src/gui/setup_video.cpp:299 src/gui/setup_video.cpp:630
-msgid "medium"
-msgstr ""
-
-#: src/gui/setup_video.cpp:305 src/gui/setup_video.cpp:636
-msgid "max"
-msgstr ""
-
-#: src/gui/setup_video.cpp:410
+#: src/gui/setup_video.cpp:356
msgid "Failed to switch to "
msgstr ""
-#: src/gui/setup_video.cpp:411
+#: src/gui/setup_video.cpp:357
msgid "windowed"
msgstr ""
-#: src/gui/setup_video.cpp:411
+#: src/gui/setup_video.cpp:357
msgid "fullscreen"
msgstr ""
-#: src/gui/setup_video.cpp:412
+#: src/gui/setup_video.cpp:358
msgid "mode and restoration of old mode also failed!"
msgstr ""
-#: src/gui/setup_video.cpp:421
+#: src/gui/setup_video.cpp:367
msgid "Switching to full screen"
msgstr "Mudar para ecrã completo"
-#: src/gui/setup_video.cpp:422
+#: src/gui/setup_video.cpp:368
msgid "Restart needed for changes to take effect."
msgstr "É necessário reiniciar para as alterações terem efeito."
-#: src/gui/setup_video.cpp:434
+#: src/gui/setup_video.cpp:380
msgid "Changing OpenGL"
msgstr "Mudando OpenGL"
-#: src/gui/setup_video.cpp:435
+#: src/gui/setup_video.cpp:381
msgid "Applying change to OpenGL requires restart."
msgstr "É necessário reiniciar para as alterações ao OpenGl terem efeito."
-#: src/gui/setup_video.cpp:520
+#: src/gui/setup_video.cpp:442
msgid "Screen resolution changed"
msgstr ""
-#: src/gui/setup_video.cpp:521
+#: src/gui/setup_video.cpp:443
msgid "Restart your client for the change to take effect."
msgstr ""
-#: src/gui/setup_video.cpp:545
+#: src/gui/setup_video.cpp:467
msgid "Particle effect settings changed."
msgstr ""
-#: src/gui/setup_video.cpp:546
+#: src/gui/setup_video.cpp:468
msgid "Changes will take effect on map change."
msgstr ""
@@ -2007,55 +1980,55 @@ msgstr ""
msgid "Ignore input 2"
msgstr ""
-#: src/localplayer.cpp:834
+#: src/localplayer.cpp:837
msgid "Unarmed"
msgstr ""
-#: src/localplayer.cpp:835
+#: src/localplayer.cpp:838
msgid "Knife"
msgstr ""
-#: src/localplayer.cpp:836
+#: src/localplayer.cpp:839
msgid "Sword"
msgstr ""
-#: src/localplayer.cpp:837
+#: src/localplayer.cpp:840
msgid "Polearm"
msgstr ""
-#: src/localplayer.cpp:838
+#: src/localplayer.cpp:841
msgid "Staff"
msgstr ""
-#: src/localplayer.cpp:839
+#: src/localplayer.cpp:842
msgid "Whip"
msgstr ""
-#: src/localplayer.cpp:840
+#: src/localplayer.cpp:843
msgid "Bow"
msgstr ""
-#: src/localplayer.cpp:841
+#: src/localplayer.cpp:844
msgid "Shooting"
msgstr ""
-#: src/localplayer.cpp:842
+#: src/localplayer.cpp:845
msgid "Mace"
msgstr ""
-#: src/localplayer.cpp:843
+#: src/localplayer.cpp:846
msgid "Axe"
msgstr ""
-#: src/localplayer.cpp:844
+#: src/localplayer.cpp:847
msgid "Thrown"
msgstr ""
-#: src/localplayer.cpp:846
+#: src/localplayer.cpp:849
msgid "Craft"
msgstr ""
-#: src/localplayer.cpp:847
+#: src/localplayer.cpp:850
msgid "Unknown Skill"
msgstr ""
@@ -2267,193 +2240,195 @@ msgstr ""
msgid "Unable to unequip."
msgstr ""
-#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:82
-#, c-format
-msgid "Strength: %d"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:81
+#, fuzzy, c-format
+msgid "Strength %+d"
+msgstr "Força:"
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:84
-#, c-format
-msgid "Agility: %d"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:82
+#, fuzzy, c-format
+msgid "Agility %+d"
+msgstr "Agilidade:"
-#: src/net/ea/generalhandler.cpp:96 src/net/tmwserv/generalhandler.cpp:88
-#, c-format
-msgid "Vitality: %d"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:84
+#, fuzzy, c-format
+msgid "Vitality %+d"
+msgstr "Vitalidade:"
-#: src/net/ea/generalhandler.cpp:98 src/net/tmwserv/generalhandler.cpp:90
-#, c-format
-msgid "Intelligence: %d"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:85
+#, fuzzy, c-format
+msgid "Intelligence %+d"
+msgstr "Inteligência:"
-#: src/net/ea/generalhandler.cpp:100 src/net/tmwserv/generalhandler.cpp:86
-#, c-format
-msgid "Dexterity: %d"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:83
+#, fuzzy, c-format
+msgid "Dexterity %+d"
+msgstr "Destreza:"
-#: src/net/ea/generalhandler.cpp:102
-#, c-format
-msgid "Luck: %d"
+#: src/net/ea/generalhandler.cpp:96
+#, fuzzy, c-format
+msgid "Luck %+d"
msgstr ""
+"Copy text \t\r\n"
+"Ataque %+d"
-#: src/net/ea/generalhandler.cpp:125
+#: src/net/ea/generalhandler.cpp:118
msgid "Authentication failed"
msgstr ""
-#: src/net/ea/generalhandler.cpp:128
+#: src/net/ea/generalhandler.cpp:121
msgid "No servers available"
msgstr ""
-#: src/net/ea/generalhandler.cpp:132
+#: src/net/ea/generalhandler.cpp:125
msgid "Someone else is trying to use this account"
msgstr ""
-#: src/net/ea/generalhandler.cpp:135
+#: src/net/ea/generalhandler.cpp:128
msgid "This account is already logged in"
msgstr ""
-#: src/net/ea/generalhandler.cpp:138
+#: src/net/ea/generalhandler.cpp:131
msgid "Speed hack detected"
msgstr ""
-#: src/net/ea/generalhandler.cpp:141
+#: src/net/ea/generalhandler.cpp:134
msgid "Duplicated login"
msgstr ""
-#: src/net/ea/generalhandler.cpp:144
+#: src/net/ea/generalhandler.cpp:137
msgid "Unknown connection error"
msgstr ""
-#: src/net/ea/generalhandler.cpp:201
+#: src/net/ea/generalhandler.cpp:194
msgid "Got disconnected from server!"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:52
+#: src/net/ea/gui/partytab.cpp:55
msgid "/help > Display this help."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:53
+#: src/net/ea/gui/partytab.cpp:56
msgid "/create > Create a new party"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:54
+#: src/net/ea/gui/partytab.cpp:57
msgid "/new > Alias of create"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:55
+#: src/net/ea/gui/partytab.cpp:58
msgid "/invite > Invite a player to your party"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:56
+#: src/net/ea/gui/partytab.cpp:59
msgid "/leave > Leave the party you are in"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:57
+#: src/net/ea/gui/partytab.cpp:60
msgid "/kick > Kick some one from the party you are in"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:58
+#: src/net/ea/gui/partytab.cpp:61
msgid "/item > Show/change party item sharing options"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:59
+#: src/net/ea/gui/partytab.cpp:62
msgid "/exp > Show/change party experience sharing options"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:68
+#: src/net/ea/gui/partytab.cpp:71
msgid "Command: /new <party-name>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:69
+#: src/net/ea/gui/partytab.cpp:72
msgid "Command: /create <party-name>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:70
+#: src/net/ea/gui/partytab.cpp:73
msgid "These commands create a new party called <party-name>."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:74
+#: src/net/ea/gui/partytab.cpp:77
msgid "Command: /invite <nick>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:81
+#: src/net/ea/gui/partytab.cpp:84
msgid "Command: /leave"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:82
+#: src/net/ea/gui/partytab.cpp:85
msgid "This command causes the player to leave the party."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/ea/gui/partytab.cpp:89
msgid "Command: /item <policy>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:87
+#: src/net/ea/gui/partytab.cpp:90
msgid "This command changes the party's item sharing policy."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:88
+#: src/net/ea/gui/partytab.cpp:91
msgid ""
"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
"\"0\", \"no\", \"false\" to disable item sharing."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:94
msgid "Command: /item"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:92
+#: src/net/ea/gui/partytab.cpp:95
msgid "This command displays the party's current item sharing policy."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:96
+#: src/net/ea/gui/partytab.cpp:99
msgid "Command: /exp <policy>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/ea/gui/partytab.cpp:100
msgid "This command changes the party's experience sharing policy."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:98
+#: src/net/ea/gui/partytab.cpp:101
msgid ""
"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:104
msgid "Command: /exp"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:102
+#: src/net/ea/gui/partytab.cpp:105
msgid "This command displays the party's current experience sharing policy."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:110
+#: src/net/ea/gui/partytab.cpp:113
msgid "Party name is missing."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:133 src/net/ea/partyhandler.cpp:191
+#: src/net/ea/gui/partytab.cpp:136 src/net/ea/partyhandler.cpp:194
msgid "Item sharing enabled."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:136 src/net/ea/partyhandler.cpp:197
+#: src/net/ea/gui/partytab.cpp:139 src/net/ea/partyhandler.cpp:200
msgid "Item sharing disabled."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:139 src/net/ea/partyhandler.cpp:203
+#: src/net/ea/gui/partytab.cpp:142 src/net/ea/partyhandler.cpp:206
msgid "Item sharing not possible."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:165 src/net/ea/partyhandler.cpp:168
+#: src/net/ea/gui/partytab.cpp:168 src/net/ea/partyhandler.cpp:171
msgid "Experience sharing enabled."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:168 src/net/ea/partyhandler.cpp:174
+#: src/net/ea/gui/partytab.cpp:171 src/net/ea/partyhandler.cpp:177
msgid "Experience sharing disabled."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:171 src/net/ea/partyhandler.cpp:180
+#: src/net/ea/gui/partytab.cpp:174 src/net/ea/partyhandler.cpp:183
msgid "Experience sharing not possible."
msgstr ""
@@ -2516,45 +2491,45 @@ msgstr ""
msgid "Party successfully created."
msgstr ""
-#: src/net/ea/partyhandler.cpp:115
+#: src/net/ea/partyhandler.cpp:118
#, c-format
msgid "%s is already a member of a party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:119
+#: src/net/ea/partyhandler.cpp:122
#, c-format
msgid "%s refused your invitation."
msgstr ""
-#: src/net/ea/partyhandler.cpp:123
+#: src/net/ea/partyhandler.cpp:126
#, c-format
msgid "%s is now a member of your party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:127
+#: src/net/ea/partyhandler.cpp:130
#, c-format
msgid "Unknown invite response for %s."
msgstr ""
-#: src/net/ea/partyhandler.cpp:232
+#: src/net/ea/partyhandler.cpp:235
msgid "You have left the party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:235
+#: src/net/ea/partyhandler.cpp:239
#, c-format
msgid "%s has left your party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:272
+#: src/net/ea/partyhandler.cpp:274
#, c-format
msgid "An unknown member tried to say: %s"
msgstr ""
-#: src/net/ea/partyhandler.cpp:298
+#: src/net/ea/partyhandler.cpp:300
msgid "Inviting like this isn't supported at the moment."
msgstr ""
-#: src/net/ea/partyhandler.cpp:327
+#: src/net/ea/partyhandler.cpp:329
#, c-format
msgid "%s is not in your party!"
msgstr ""
@@ -2847,10 +2822,10 @@ msgstr "Força de Vontade:"
msgid "Topic: "
msgstr ""
-#: src/net/tmwserv/generalhandler.cpp:92
-#, c-format
-msgid "Willpower: %d"
-msgstr ""
+#: src/net/tmwserv/generalhandler.cpp:86
+#, fuzzy, c-format
+msgid "Willpower %+d"
+msgstr "Força de Vontade:"
#: src/net/tmwserv/loginhandler.cpp:80
msgid "Wrong magic_token"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index b7c68dbb..80cfae41 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: tmw\n"
"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-05-10 16:39+0200\n"
+"POT-Creation-Date: 2009-05-12 00:11+0200\n"
"PO-Revision-Date: 2009-01-21 20:48+0000\n"
"Last-Translator: Bruno <brunorafaelcardoso@gmail.com>\n"
"Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
@@ -175,7 +175,7 @@ msgstr ""
#: src/commandhandler.cpp:216 src/commandhandler.cpp:230
#: src/gui/widgets/channeltab.cpp:81 src/gui/widgets/channeltab.cpp:90
-#: src/net/ea/gui/partytab.cpp:76
+#: src/net/ea/gui/partytab.cpp:79
msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
msgstr "Se <nick> possuir espaços, coloque dentro de parenteses (\")."
@@ -195,7 +195,7 @@ msgstr ""
msgid "Command: /party <nick>"
msgstr ""
-#: src/commandhandler.cpp:229 src/net/ea/gui/partytab.cpp:75
+#: src/commandhandler.cpp:229 src/net/ea/gui/partytab.cpp:78
msgid "This command invites <nick> to party with you."
msgstr ""
@@ -508,7 +508,7 @@ msgstr "Ok"
msgid "Previous"
msgstr "Anterior"
-#: src/gui/charselectdialog.cpp:113 src/gui/npcdialog.cpp:44
+#: src/gui/charselectdialog.cpp:113 src/gui/npcdialog.cpp:43
msgid "Next"
msgstr "Próximo"
@@ -533,7 +533,7 @@ msgstr "Novo"
#: src/gui/charselectdialog.cpp:118 src/gui/charselectdialog.cpp:165
#: src/gui/charselectdialog.cpp:166 src/gui/charselectdialog.cpp:315
-#: src/gui/setup_players.cpp:230
+#: src/gui/setup_players.cpp:228
msgid "Delete"
msgstr "Excluir"
@@ -568,19 +568,15 @@ msgstr ""
msgid "%d players are present."
msgstr ""
-#: src/gui/chat.cpp:348 src/gui/chat.cpp:354
+#: src/gui/chat.cpp:333
msgid "Present: "
msgstr ""
-#: src/gui/chat.cpp:348 src/gui/chat.cpp:354
-msgid "; "
-msgstr ""
-
-#: src/gui/chat.cpp:349
+#: src/gui/chat.cpp:350
msgid "Attendance written to record log."
msgstr ""
-#: src/gui/chat.cpp:474
+#: src/gui/chat.cpp:475
#, c-format
msgid "Whispering to %s: %s"
msgstr "Sussurrando para %s: %s"
@@ -630,7 +626,7 @@ msgstr ""
msgid "Help"
msgstr "Ajuda"
-#: src/gui/help.cpp:47 src/gui/npcdialog.cpp:45 src/gui/storagewindow.cpp:68
+#: src/gui/help.cpp:47 src/gui/npcdialog.cpp:44 src/gui/storagewindow.cpp:68
msgid "Close"
msgstr "Fechar"
@@ -723,7 +719,7 @@ msgid "Register"
msgstr "Registrar"
#: src/gui/magic.cpp:32 src/gui/skilldialog.cpp:117 src/gui/windowmenu.cpp:64
-#: src/localplayer.cpp:845
+#: src/localplayer.cpp:848
msgid "Magic"
msgstr ""
@@ -739,33 +735,25 @@ msgstr ""
msgid "Cast Test Spell 3"
msgstr ""
-#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
+#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:86
#, fuzzy
msgid "Map"
msgstr "MiniMapa"
-#: src/gui/npcdialog.cpp:43
+#: src/gui/npcdialog.cpp:42
msgid "Waiting for server"
msgstr ""
-#: src/gui/npcdialog.cpp:46
+#: src/gui/npcdialog.cpp:45
#, fuzzy
msgid "Submit"
msgstr "Sair"
-#: src/gui/npcdialog.cpp:49 src/gui/npcpostdialog.cpp:39
+#: src/gui/npcdialog.cpp:48 src/gui/npcpostdialog.cpp:39
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:95
-msgid "+"
-msgstr ""
-
-#: src/gui/npcdialog.cpp:96
-msgid "-"
-msgstr ""
-
-#: src/gui/npcdialog.cpp:105
+#: src/gui/npcdialog.cpp:104
msgid "Reset"
msgstr ""
@@ -773,8 +761,7 @@ msgstr ""
msgid "Send"
msgstr ""
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:268
-#: src/gui/setup_video.cpp:567
+#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:142
msgid "Text"
msgstr ""
@@ -826,8 +813,8 @@ msgstr ""
msgid "Is"
msgstr ""
-#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:33
-#: src/net/ea/gui/partytab.cpp:37
+#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:45
+#: src/net/ea/gui/partytab.cpp:39
msgid "Party"
msgstr ""
@@ -1295,26 +1282,22 @@ msgid "???"
msgstr ""
#: src/gui/setup_players.cpp:224
-msgid "Save player list"
-msgstr "Salvar lista de jogadores"
-
-#: src/gui/setup_players.cpp:226
msgid "Allow trading"
msgstr "Permitir trocas"
-#: src/gui/setup_players.cpp:228
+#: src/gui/setup_players.cpp:226
msgid "Allow whispers"
msgstr "Permitir sussuros"
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:230
msgid "Put all whispers in tabs"
msgstr ""
-#: src/gui/setup_players.cpp:234
+#: src/gui/setup_players.cpp:232
msgid "Players"
msgstr "Jogadores"
-#: src/gui/setup_players.cpp:259
+#: src/gui/setup_players.cpp:257
msgid "When ignoring:"
msgstr "Quando ignorado:"
@@ -1336,157 +1319,147 @@ msgstr "médio"
msgid "Large"
msgstr ""
-#: src/gui/setup_video.cpp:151
+#: src/gui/setup_video.cpp:141
+msgid "No text"
+msgstr ""
+
+#: src/gui/setup_video.cpp:143
+msgid "Bubbles, no names"
+msgstr ""
+
+#: src/gui/setup_video.cpp:144
+msgid "Bubbles with names"
+msgstr ""
+
+#: src/gui/setup_video.cpp:153
+msgid "off"
+msgstr "desligado"
+
+#: src/gui/setup_video.cpp:154 src/gui/setup_video.cpp:164
+msgid "low"
+msgstr "baixo"
+
+#: src/gui/setup_video.cpp:155 src/gui/setup_video.cpp:166
+msgid "high"
+msgstr "alto"
+
+#: src/gui/setup_video.cpp:165
+msgid "medium"
+msgstr "médio"
+
+#: src/gui/setup_video.cpp:167
+msgid "max"
+msgstr "máximo"
+
+#: src/gui/setup_video.cpp:187
msgid "Full screen"
msgstr "Tela cheia"
-#: src/gui/setup_video.cpp:152
+#: src/gui/setup_video.cpp:188
msgid "OpenGL"
msgstr "OpenGL"
-#: src/gui/setup_video.cpp:153
+#: src/gui/setup_video.cpp:189
msgid "Custom cursor"
msgstr "Cursor customizado"
-#: src/gui/setup_video.cpp:155
+#: src/gui/setup_video.cpp:191
msgid "Visible names"
msgstr "Nomes visíveis"
-#: src/gui/setup_video.cpp:157
+#: src/gui/setup_video.cpp:193
msgid "Particle effects"
msgstr ""
-#: src/gui/setup_video.cpp:159
+#: src/gui/setup_video.cpp:195
msgid "Show name"
msgstr ""
-#: src/gui/setup_video.cpp:160
+#: src/gui/setup_video.cpp:196
msgid "Show pickup notification"
msgstr ""
-#: src/gui/setup_video.cpp:161
+#: src/gui/setup_video.cpp:197
msgid "in chat"
msgstr ""
-#: src/gui/setup_video.cpp:162
+#: src/gui/setup_video.cpp:198
msgid "as particle"
msgstr ""
-#: src/gui/setup_video.cpp:167
+#: src/gui/setup_video.cpp:203
msgid "FPS Limit:"
msgstr "Limite FPS:"
-#: src/gui/setup_video.cpp:184
+#: src/gui/setup_video.cpp:214
msgid "Video"
msgstr "Vídeo"
-#: src/gui/setup_video.cpp:189
+#: src/gui/setup_video.cpp:219
msgid "Overhead text"
msgstr ""
-#: src/gui/setup_video.cpp:190
+#: src/gui/setup_video.cpp:220
msgid "Gui opacity"
msgstr "Opacidade da GUI"
-#: src/gui/setup_video.cpp:191
-msgid "Scroll radius"
-msgstr "Rolar radius"
-
-#: src/gui/setup_video.cpp:192
-msgid "Scroll laziness"
-msgstr "Rolar Laziness"
-
-#: src/gui/setup_video.cpp:193
+#: src/gui/setup_video.cpp:221
msgid "Ambient FX"
msgstr "Ambiente FX"
-#: src/gui/setup_video.cpp:194
+#: src/gui/setup_video.cpp:222
msgid "Particle Detail"
msgstr "Detalhe de partículas"
-#: src/gui/setup_video.cpp:195
+#: src/gui/setup_video.cpp:223
msgid "Font size"
msgstr ""
-#: src/gui/setup_video.cpp:265 src/gui/setup_video.cpp:564
-msgid "No text"
-msgstr ""
-
-#: src/gui/setup_video.cpp:271 src/gui/setup_video.cpp:570
-msgid "Bubbles, no names"
-msgstr ""
-
-#: src/gui/setup_video.cpp:274 src/gui/setup_video.cpp:573
-msgid "Bubbles with names"
-msgstr ""
-
-#: src/gui/setup_video.cpp:282 src/gui/setup_video.cpp:610
-msgid "off"
-msgstr "desligado"
-
-#: src/gui/setup_video.cpp:285 src/gui/setup_video.cpp:296
-#: src/gui/setup_video.cpp:613 src/gui/setup_video.cpp:627
-msgid "low"
-msgstr "baixo"
-
-#: src/gui/setup_video.cpp:288 src/gui/setup_video.cpp:302
-#: src/gui/setup_video.cpp:616 src/gui/setup_video.cpp:633
-msgid "high"
-msgstr "alto"
-
-#: src/gui/setup_video.cpp:299 src/gui/setup_video.cpp:630
-msgid "medium"
-msgstr "médio"
-
-#: src/gui/setup_video.cpp:305 src/gui/setup_video.cpp:636
-msgid "max"
-msgstr "máximo"
-
-#: src/gui/setup_video.cpp:410
+#: src/gui/setup_video.cpp:356
msgid "Failed to switch to "
msgstr ""
-#: src/gui/setup_video.cpp:411
+#: src/gui/setup_video.cpp:357
msgid "windowed"
msgstr ""
-#: src/gui/setup_video.cpp:411
+#: src/gui/setup_video.cpp:357
msgid "fullscreen"
msgstr ""
-#: src/gui/setup_video.cpp:412
+#: src/gui/setup_video.cpp:358
msgid "mode and restoration of old mode also failed!"
msgstr ""
-#: src/gui/setup_video.cpp:421
+#: src/gui/setup_video.cpp:367
msgid "Switching to full screen"
msgstr "Mudando para Tela cheia"
-#: src/gui/setup_video.cpp:422
+#: src/gui/setup_video.cpp:368
msgid "Restart needed for changes to take effect."
msgstr "É preciso reiniciar para as mudanças terem efeito."
-#: src/gui/setup_video.cpp:434
+#: src/gui/setup_video.cpp:380
msgid "Changing OpenGL"
msgstr "Trocando OpenGL"
-#: src/gui/setup_video.cpp:435
+#: src/gui/setup_video.cpp:381
msgid "Applying change to OpenGL requires restart."
msgstr "Aplicando mudança a OpenGL requer reiniciar o jogo."
-#: src/gui/setup_video.cpp:520
+#: src/gui/setup_video.cpp:442
msgid "Screen resolution changed"
msgstr ""
-#: src/gui/setup_video.cpp:521
+#: src/gui/setup_video.cpp:443
msgid "Restart your client for the change to take effect."
msgstr ""
-#: src/gui/setup_video.cpp:545
+#: src/gui/setup_video.cpp:467
msgid "Particle effect settings changed."
msgstr ""
-#: src/gui/setup_video.cpp:546
+#: src/gui/setup_video.cpp:468
msgid "Changes will take effect on map change."
msgstr ""
@@ -2009,55 +1982,55 @@ msgstr ""
msgid "Ignore input 2"
msgstr ""
-#: src/localplayer.cpp:834
+#: src/localplayer.cpp:837
msgid "Unarmed"
msgstr ""
-#: src/localplayer.cpp:835
+#: src/localplayer.cpp:838
msgid "Knife"
msgstr ""
-#: src/localplayer.cpp:836
+#: src/localplayer.cpp:839
msgid "Sword"
msgstr ""
-#: src/localplayer.cpp:837
+#: src/localplayer.cpp:840
msgid "Polearm"
msgstr ""
-#: src/localplayer.cpp:838
+#: src/localplayer.cpp:841
msgid "Staff"
msgstr ""
-#: src/localplayer.cpp:839
+#: src/localplayer.cpp:842
msgid "Whip"
msgstr ""
-#: src/localplayer.cpp:840
+#: src/localplayer.cpp:843
msgid "Bow"
msgstr ""
-#: src/localplayer.cpp:841
+#: src/localplayer.cpp:844
msgid "Shooting"
msgstr ""
-#: src/localplayer.cpp:842
+#: src/localplayer.cpp:845
msgid "Mace"
msgstr ""
-#: src/localplayer.cpp:843
+#: src/localplayer.cpp:846
msgid "Axe"
msgstr ""
-#: src/localplayer.cpp:844
+#: src/localplayer.cpp:847
msgid "Thrown"
msgstr ""
-#: src/localplayer.cpp:846
+#: src/localplayer.cpp:849
msgid "Craft"
msgstr ""
-#: src/localplayer.cpp:847
+#: src/localplayer.cpp:850
msgid "Unknown Skill"
msgstr ""
@@ -2269,193 +2242,193 @@ msgstr ""
msgid "Unable to unequip."
msgstr ""
-#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:82
-#, c-format
-msgid "Strength: %d"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:81
+#, fuzzy, c-format
+msgid "Strength %+d"
+msgstr "Força"
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:84
-#, c-format
-msgid "Agility: %d"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:82
+#, fuzzy, c-format
+msgid "Agility %+d"
+msgstr "Agilidade"
-#: src/net/ea/generalhandler.cpp:96 src/net/tmwserv/generalhandler.cpp:88
-#, c-format
-msgid "Vitality: %d"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:84
+#, fuzzy, c-format
+msgid "Vitality %+d"
+msgstr "Vitalidade"
-#: src/net/ea/generalhandler.cpp:98 src/net/tmwserv/generalhandler.cpp:90
-#, c-format
-msgid "Intelligence: %d"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:85
+#, fuzzy, c-format
+msgid "Intelligence %+d"
+msgstr "Inteligência"
-#: src/net/ea/generalhandler.cpp:100 src/net/tmwserv/generalhandler.cpp:86
-#, c-format
-msgid "Dexterity: %d"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:83
+#, fuzzy, c-format
+msgid "Dexterity %+d"
+msgstr "Destreza"
-#: src/net/ea/generalhandler.cpp:102
-#, c-format
-msgid "Luck: %d"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:96
+#, fuzzy, c-format
+msgid "Luck %+d"
+msgstr "Sorte"
-#: src/net/ea/generalhandler.cpp:125
+#: src/net/ea/generalhandler.cpp:118
msgid "Authentication failed"
msgstr ""
-#: src/net/ea/generalhandler.cpp:128
+#: src/net/ea/generalhandler.cpp:121
msgid "No servers available"
msgstr ""
-#: src/net/ea/generalhandler.cpp:132
+#: src/net/ea/generalhandler.cpp:125
msgid "Someone else is trying to use this account"
msgstr ""
-#: src/net/ea/generalhandler.cpp:135
+#: src/net/ea/generalhandler.cpp:128
msgid "This account is already logged in"
msgstr ""
-#: src/net/ea/generalhandler.cpp:138
+#: src/net/ea/generalhandler.cpp:131
msgid "Speed hack detected"
msgstr ""
-#: src/net/ea/generalhandler.cpp:141
+#: src/net/ea/generalhandler.cpp:134
msgid "Duplicated login"
msgstr ""
-#: src/net/ea/generalhandler.cpp:144
+#: src/net/ea/generalhandler.cpp:137
msgid "Unknown connection error"
msgstr ""
-#: src/net/ea/generalhandler.cpp:201
+#: src/net/ea/generalhandler.cpp:194
msgid "Got disconnected from server!"
msgstr "Você foi desconectado do servidor!"
-#: src/net/ea/gui/partytab.cpp:52
+#: src/net/ea/gui/partytab.cpp:55
msgid "/help > Display this help."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:53
+#: src/net/ea/gui/partytab.cpp:56
msgid "/create > Create a new party"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:54
+#: src/net/ea/gui/partytab.cpp:57
msgid "/new > Alias of create"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:55
+#: src/net/ea/gui/partytab.cpp:58
msgid "/invite > Invite a player to your party"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:56
+#: src/net/ea/gui/partytab.cpp:59
msgid "/leave > Leave the party you are in"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:57
+#: src/net/ea/gui/partytab.cpp:60
msgid "/kick > Kick some one from the party you are in"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:58
+#: src/net/ea/gui/partytab.cpp:61
msgid "/item > Show/change party item sharing options"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:59
+#: src/net/ea/gui/partytab.cpp:62
msgid "/exp > Show/change party experience sharing options"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:68
+#: src/net/ea/gui/partytab.cpp:71
msgid "Command: /new <party-name>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:69
+#: src/net/ea/gui/partytab.cpp:72
msgid "Command: /create <party-name>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:70
+#: src/net/ea/gui/partytab.cpp:73
msgid "These commands create a new party called <party-name>."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:74
+#: src/net/ea/gui/partytab.cpp:77
msgid "Command: /invite <nick>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:81
+#: src/net/ea/gui/partytab.cpp:84
msgid "Command: /leave"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:82
+#: src/net/ea/gui/partytab.cpp:85
msgid "This command causes the player to leave the party."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/ea/gui/partytab.cpp:89
msgid "Command: /item <policy>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:87
+#: src/net/ea/gui/partytab.cpp:90
msgid "This command changes the party's item sharing policy."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:88
+#: src/net/ea/gui/partytab.cpp:91
msgid ""
"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
"\"0\", \"no\", \"false\" to disable item sharing."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:94
msgid "Command: /item"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:92
+#: src/net/ea/gui/partytab.cpp:95
msgid "This command displays the party's current item sharing policy."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:96
+#: src/net/ea/gui/partytab.cpp:99
msgid "Command: /exp <policy>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/ea/gui/partytab.cpp:100
msgid "This command changes the party's experience sharing policy."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:98
+#: src/net/ea/gui/partytab.cpp:101
msgid ""
"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:104
msgid "Command: /exp"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:102
+#: src/net/ea/gui/partytab.cpp:105
msgid "This command displays the party's current experience sharing policy."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:110
+#: src/net/ea/gui/partytab.cpp:113
msgid "Party name is missing."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:133 src/net/ea/partyhandler.cpp:191
+#: src/net/ea/gui/partytab.cpp:136 src/net/ea/partyhandler.cpp:194
msgid "Item sharing enabled."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:136 src/net/ea/partyhandler.cpp:197
+#: src/net/ea/gui/partytab.cpp:139 src/net/ea/partyhandler.cpp:200
msgid "Item sharing disabled."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:139 src/net/ea/partyhandler.cpp:203
+#: src/net/ea/gui/partytab.cpp:142 src/net/ea/partyhandler.cpp:206
msgid "Item sharing not possible."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:165 src/net/ea/partyhandler.cpp:168
+#: src/net/ea/gui/partytab.cpp:168 src/net/ea/partyhandler.cpp:171
msgid "Experience sharing enabled."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:168 src/net/ea/partyhandler.cpp:174
+#: src/net/ea/gui/partytab.cpp:171 src/net/ea/partyhandler.cpp:177
msgid "Experience sharing disabled."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:171 src/net/ea/partyhandler.cpp:180
+#: src/net/ea/gui/partytab.cpp:174 src/net/ea/partyhandler.cpp:183
msgid "Experience sharing not possible."
msgstr ""
@@ -2518,45 +2491,45 @@ msgstr ""
msgid "Party successfully created."
msgstr ""
-#: src/net/ea/partyhandler.cpp:115
+#: src/net/ea/partyhandler.cpp:118
#, c-format
msgid "%s is already a member of a party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:119
+#: src/net/ea/partyhandler.cpp:122
#, c-format
msgid "%s refused your invitation."
msgstr ""
-#: src/net/ea/partyhandler.cpp:123
+#: src/net/ea/partyhandler.cpp:126
#, c-format
msgid "%s is now a member of your party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:127
+#: src/net/ea/partyhandler.cpp:130
#, c-format
msgid "Unknown invite response for %s."
msgstr ""
-#: src/net/ea/partyhandler.cpp:232
+#: src/net/ea/partyhandler.cpp:235
msgid "You have left the party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:235
+#: src/net/ea/partyhandler.cpp:239
#, c-format
msgid "%s has left your party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:272
+#: src/net/ea/partyhandler.cpp:274
#, c-format
msgid "An unknown member tried to say: %s"
msgstr ""
-#: src/net/ea/partyhandler.cpp:298
+#: src/net/ea/partyhandler.cpp:300
msgid "Inviting like this isn't supported at the moment."
msgstr ""
-#: src/net/ea/partyhandler.cpp:327
+#: src/net/ea/partyhandler.cpp:329
#, c-format
msgid "%s is not in your party!"
msgstr ""
@@ -2849,10 +2822,10 @@ msgstr "Força de Vontade:"
msgid "Topic: "
msgstr ""
-#: src/net/tmwserv/generalhandler.cpp:92
-#, c-format
-msgid "Willpower: %d"
-msgstr ""
+#: src/net/tmwserv/generalhandler.cpp:86
+#, fuzzy, c-format
+msgid "Willpower %+d"
+msgstr "Força de Vontade:"
#: src/net/tmwserv/loginhandler.cpp:80
msgid "Wrong magic_token"
@@ -2949,3 +2922,12 @@ msgstr ""
#: src/resources/npcdb.cpp:53
msgid "NPC Database: Error while loading npcs.xml!"
msgstr ""
+
+#~ msgid "Save player list"
+#~ msgstr "Salvar lista de jogadores"
+
+#~ msgid "Scroll radius"
+#~ msgstr "Rolar radius"
+
+#~ msgid "Scroll laziness"
+#~ msgstr "Rolar Laziness"
diff --git a/po/ru.po b/po/ru.po
index 0c4586fa..541c9811 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -7,14 +7,14 @@ msgid ""
msgstr ""
"Project-Id-Version: tmw\n"
"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-05-10 16:39+0200\n"
-"PO-Revision-Date: 2009-03-19 09:49+0000\n"
-"Last-Translator: Alexander Aleschenko <Unknown>\n"
+"POT-Creation-Date: 2009-05-12 00:11+0200\n"
+"PO-Revision-Date: 2009-05-11 20:01+0000\n"
+"Last-Translator: Koptev Oleg <Unknown>\n"
"Language-Team: Russian <ru@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-05-10 13:48+0000\n"
+"X-Launchpad-Export-Date: 2009-05-11 21:56+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
#: src/commandhandler.cpp:141
@@ -23,35 +23,35 @@ msgstr "-- Помощь --"
#: src/commandhandler.cpp:142
msgid "/help > Display this help"
-msgstr ""
+msgstr "/help > Отображает этото текст"
#: src/commandhandler.cpp:144
msgid "/where > Display map name"
-msgstr ""
+msgstr "/where > Отображает имя карты"
#: src/commandhandler.cpp:145
msgid "/who > Display number of online users"
-msgstr ""
+msgstr "/who > Отображает количество пользователей он-лайн"
#: src/commandhandler.cpp:146
msgid "/me > Tell something about yourself"
-msgstr ""
+msgstr "/me > Расскажите что-нибудь о себе"
#: src/commandhandler.cpp:148
msgid "/clear > Clears this window"
-msgstr ""
+msgstr "/clear > Очищает это окно"
#: src/commandhandler.cpp:150
msgid "/msg > Send a private message to a user"
-msgstr ""
+msgstr "/msg > Послать приватное сообщение пользователю"
#: src/commandhandler.cpp:151
msgid "/whisper > Alias of msg"
-msgstr ""
+msgstr "/whisper > Вариант команды msg"
#: src/commandhandler.cpp:152
msgid "/w > Alias of msg"
-msgstr ""
+msgstr "/w > Вариант команды msg"
#: src/commandhandler.cpp:153
msgid "/query > Makes a tab for private messages with another user"
@@ -67,15 +67,15 @@ msgstr ""
#: src/commandhandler.cpp:157
msgid "/join > Join or create a channel"
-msgstr ""
+msgstr "/join > Создать или присоединиться к каналу"
#: src/commandhandler.cpp:159
msgid "/party > Invite a user to party"
-msgstr ""
+msgstr "Пригласить пользователя на канал"
#: src/commandhandler.cpp:161
msgid "/record > Start recording the chat to an external file"
-msgstr ""
+msgstr "/record > Записывать чат во внешний файл"
#: src/commandhandler.cpp:162
msgid "/toggle > Determine whether <return> toggles the chat log"
@@ -107,7 +107,7 @@ msgstr "Команда: /help <команда>"
#: src/commandhandler.cpp:176
msgid "This command displays help on <command>."
-msgstr ""
+msgstr "Эта команда показывает помощь по <команде>."
#: src/commandhandler.cpp:184
msgid "Command: /announce <msg>"
@@ -131,23 +131,23 @@ msgstr "Эта команда очищает лог чата."
#: src/commandhandler.cpp:196
msgid "Command: /join <channel>"
-msgstr ""
+msgstr "Команда: /join <канал>"
#: src/commandhandler.cpp:197
msgid "This command makes you enter <channel>."
-msgstr ""
+msgstr "Команда для входа на <канал>."
#: src/commandhandler.cpp:198
msgid "If <channel> doesn't exist, it's created."
-msgstr ""
+msgstr "Если <канал> не существует, он будет создан."
#: src/commandhandler.cpp:202
msgid "Command: /list"
-msgstr ""
+msgstr "Команда: /list"
#: src/commandhandler.cpp:203
msgid "This command shows a list of all channels."
-msgstr ""
+msgstr "Эта команда показывает список всех каналов."
#: src/commandhandler.cpp:207
msgid "Command: /me <message>"
@@ -167,15 +167,15 @@ msgstr ""
#: src/commandhandler.cpp:214
msgid "Command: /w <nick> <message>"
-msgstr ""
+msgstr "Команда: /w <ник> <сообщение>"
#: src/commandhandler.cpp:215
msgid "This command sends the text <message> to <nick>."
-msgstr ""
+msgstr "Эта команда посылает текст <сообщение> пользователю <nick>."
#: src/commandhandler.cpp:216 src/commandhandler.cpp:230
#: src/gui/widgets/channeltab.cpp:81 src/gui/widgets/channeltab.cpp:90
-#: src/net/ea/gui/partytab.cpp:76
+#: src/net/ea/gui/partytab.cpp:79
msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
msgstr "Если ник содержит пробелы, заключите его в кавычки (\")."
@@ -195,7 +195,7 @@ msgstr ""
msgid "Command: /party <nick>"
msgstr ""
-#: src/commandhandler.cpp:229 src/net/ea/gui/partytab.cpp:75
+#: src/commandhandler.cpp:229 src/net/ea/gui/partytab.cpp:78
msgid "This command invites <nick> to party with you."
msgstr ""
@@ -508,7 +508,7 @@ msgstr "Ok"
msgid "Previous"
msgstr "Предыдущий"
-#: src/gui/charselectdialog.cpp:113 src/gui/npcdialog.cpp:44
+#: src/gui/charselectdialog.cpp:113 src/gui/npcdialog.cpp:43
msgid "Next"
msgstr "Следующий"
@@ -533,7 +533,7 @@ msgstr "Новый"
#: src/gui/charselectdialog.cpp:118 src/gui/charselectdialog.cpp:165
#: src/gui/charselectdialog.cpp:166 src/gui/charselectdialog.cpp:315
-#: src/gui/setup_players.cpp:230
+#: src/gui/setup_players.cpp:228
msgid "Delete"
msgstr "Удалить"
@@ -568,19 +568,15 @@ msgstr ""
msgid "%d players are present."
msgstr ""
-#: src/gui/chat.cpp:348 src/gui/chat.cpp:354
+#: src/gui/chat.cpp:333
msgid "Present: "
msgstr ""
-#: src/gui/chat.cpp:348 src/gui/chat.cpp:354
-msgid "; "
-msgstr ""
-
-#: src/gui/chat.cpp:349
+#: src/gui/chat.cpp:350
msgid "Attendance written to record log."
msgstr ""
-#: src/gui/chat.cpp:474
+#: src/gui/chat.cpp:475
#, c-format
msgid "Whispering to %s: %s"
msgstr ""
@@ -630,7 +626,7 @@ msgstr ""
msgid "Help"
msgstr "Помощь"
-#: src/gui/help.cpp:47 src/gui/npcdialog.cpp:45 src/gui/storagewindow.cpp:68
+#: src/gui/help.cpp:47 src/gui/npcdialog.cpp:44 src/gui/storagewindow.cpp:68
msgid "Close"
msgstr "Закрыть"
@@ -723,7 +719,7 @@ msgid "Register"
msgstr "Зарегистрироваться"
#: src/gui/magic.cpp:32 src/gui/skilldialog.cpp:117 src/gui/windowmenu.cpp:64
-#: src/localplayer.cpp:845
+#: src/localplayer.cpp:848
msgid "Magic"
msgstr ""
@@ -739,33 +735,23 @@ msgstr ""
msgid "Cast Test Spell 3"
msgstr ""
-#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
-#, fuzzy
+#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:86
msgid "Map"
-msgstr "МиниКарта"
+msgstr ""
-#: src/gui/npcdialog.cpp:43
+#: src/gui/npcdialog.cpp:42
msgid "Waiting for server"
msgstr ""
-#: src/gui/npcdialog.cpp:46
-#, fuzzy
+#: src/gui/npcdialog.cpp:45
msgid "Submit"
-msgstr "Выход"
+msgstr ""
-#: src/gui/npcdialog.cpp:49 src/gui/npcpostdialog.cpp:39
+#: src/gui/npcdialog.cpp:48 src/gui/npcpostdialog.cpp:39
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:95
-msgid "+"
-msgstr ""
-
-#: src/gui/npcdialog.cpp:96
-msgid "-"
-msgstr ""
-
-#: src/gui/npcdialog.cpp:105
+#: src/gui/npcdialog.cpp:104
msgid "Reset"
msgstr ""
@@ -773,8 +759,7 @@ msgstr ""
msgid "Send"
msgstr ""
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:268
-#: src/gui/setup_video.cpp:567
+#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:142
msgid "Text"
msgstr ""
@@ -826,8 +811,8 @@ msgstr ""
msgid "Is"
msgstr ""
-#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:33
-#: src/net/ea/gui/partytab.cpp:37
+#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:45
+#: src/net/ea/gui/partytab.cpp:39
msgid "Party"
msgstr ""
@@ -876,14 +861,12 @@ msgid "Generics"
msgstr ""
#: src/gui/palette.cpp:112
-#, fuzzy
msgid "Hats"
-msgstr "Статистика"
+msgstr ""
#: src/gui/palette.cpp:113
-#, fuzzy
msgid "Usables"
-msgstr "Использовать"
+msgstr ""
#: src/gui/palette.cpp:114
msgid "Shirts"
@@ -906,9 +889,8 @@ msgid "2 Handed Weapons"
msgstr ""
#: src/gui/palette.cpp:119
-#, fuzzy
msgid "Shields"
-msgstr "Умения"
+msgstr ""
#: src/gui/palette.cpp:120
msgid "Rings"
@@ -1030,9 +1012,9 @@ msgid "@@cancel|Cancel@@"
msgstr "@@cancelОтмена@@"
#: src/gui/popupmenu.cpp:157
-#, fuzzy, c-format
+#, c-format
msgid "@@pickup|Pick up %s@@"
-msgstr "@@pickup|Подобрать %s@@"
+msgstr ""
#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:373
msgid "@@chat|Add to chat@@"
@@ -1059,9 +1041,8 @@ msgid "@@split|Split@@"
msgstr "@@split|Разделить@@"
#: src/gui/popupmenu.cpp:364
-#, fuzzy
msgid "@@store|Store@@"
-msgstr "@@use|Использовать@@"
+msgstr ""
#: src/gui/popupmenu.cpp:371
msgid "@@retrieve|Retrieve@@"
@@ -1295,26 +1276,22 @@ msgid "???"
msgstr ""
#: src/gui/setup_players.cpp:224
-msgid "Save player list"
-msgstr "Сохранить список игроков"
-
-#: src/gui/setup_players.cpp:226
msgid "Allow trading"
msgstr "Разрешить торговлю"
-#: src/gui/setup_players.cpp:228
+#: src/gui/setup_players.cpp:226
msgid "Allow whispers"
msgstr ""
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:230
msgid "Put all whispers in tabs"
msgstr ""
-#: src/gui/setup_players.cpp:234
+#: src/gui/setup_players.cpp:232
msgid "Players"
msgstr "Игроки"
-#: src/gui/setup_players.cpp:259
+#: src/gui/setup_players.cpp:257
msgid "When ignoring:"
msgstr ""
@@ -1323,170 +1300,158 @@ msgid "Tiny"
msgstr ""
#: src/gui/setup_video.cpp:113
-#, fuzzy
msgid "Small"
-msgstr "Продать"
+msgstr ""
#: src/gui/setup_video.cpp:114
-#, fuzzy
msgid "Medium"
-msgstr "средне"
+msgstr ""
#: src/gui/setup_video.cpp:115
msgid "Large"
msgstr ""
-#: src/gui/setup_video.cpp:151
+#: src/gui/setup_video.cpp:141
+msgid "No text"
+msgstr ""
+
+#: src/gui/setup_video.cpp:143
+msgid "Bubbles, no names"
+msgstr ""
+
+#: src/gui/setup_video.cpp:144
+msgid "Bubbles with names"
+msgstr ""
+
+#: src/gui/setup_video.cpp:153
+msgid "off"
+msgstr "выкл"
+
+#: src/gui/setup_video.cpp:154 src/gui/setup_video.cpp:164
+msgid "low"
+msgstr "низ."
+
+#: src/gui/setup_video.cpp:155 src/gui/setup_video.cpp:166
+msgid "high"
+msgstr "выс."
+
+#: src/gui/setup_video.cpp:165
+msgid "medium"
+msgstr "средне"
+
+#: src/gui/setup_video.cpp:167
+msgid "max"
+msgstr "максимальное"
+
+#: src/gui/setup_video.cpp:187
msgid "Full screen"
msgstr "На полный экран"
-#: src/gui/setup_video.cpp:152
+#: src/gui/setup_video.cpp:188
msgid "OpenGL"
msgstr "OpenGL"
-#: src/gui/setup_video.cpp:153
+#: src/gui/setup_video.cpp:189
msgid "Custom cursor"
msgstr "Выборочный курсор"
-#: src/gui/setup_video.cpp:155
+#: src/gui/setup_video.cpp:191
msgid "Visible names"
msgstr ""
-#: src/gui/setup_video.cpp:157
+#: src/gui/setup_video.cpp:193
msgid "Particle effects"
msgstr ""
-#: src/gui/setup_video.cpp:159
+#: src/gui/setup_video.cpp:195
msgid "Show name"
msgstr ""
-#: src/gui/setup_video.cpp:160
+#: src/gui/setup_video.cpp:196
msgid "Show pickup notification"
msgstr ""
-#: src/gui/setup_video.cpp:161
+#: src/gui/setup_video.cpp:197
msgid "in chat"
msgstr ""
-#: src/gui/setup_video.cpp:162
+#: src/gui/setup_video.cpp:198
msgid "as particle"
msgstr ""
-#: src/gui/setup_video.cpp:167
+#: src/gui/setup_video.cpp:203
msgid "FPS Limit:"
msgstr "Ограничение кадр/с:"
-#: src/gui/setup_video.cpp:184
+#: src/gui/setup_video.cpp:214
msgid "Video"
msgstr "Видео"
-#: src/gui/setup_video.cpp:189
+#: src/gui/setup_video.cpp:219
msgid "Overhead text"
msgstr ""
-#: src/gui/setup_video.cpp:190
+#: src/gui/setup_video.cpp:220
msgid "Gui opacity"
msgstr "Прозрачность интерфейса"
-#: src/gui/setup_video.cpp:191
-msgid "Scroll radius"
-msgstr "Радиус прокрутки"
-
-#: src/gui/setup_video.cpp:192
-msgid "Scroll laziness"
-msgstr "Заторможенность прокрутки"
-
-#: src/gui/setup_video.cpp:193
+#: src/gui/setup_video.cpp:221
msgid "Ambient FX"
msgstr "Эффекты окружающей среды"
-#: src/gui/setup_video.cpp:194
+#: src/gui/setup_video.cpp:222
msgid "Particle Detail"
msgstr ""
-#: src/gui/setup_video.cpp:195
+#: src/gui/setup_video.cpp:223
msgid "Font size"
msgstr ""
-#: src/gui/setup_video.cpp:265 src/gui/setup_video.cpp:564
-msgid "No text"
-msgstr ""
-
-#: src/gui/setup_video.cpp:271 src/gui/setup_video.cpp:570
-msgid "Bubbles, no names"
-msgstr ""
-
-#: src/gui/setup_video.cpp:274 src/gui/setup_video.cpp:573
-msgid "Bubbles with names"
-msgstr ""
-
-#: src/gui/setup_video.cpp:282 src/gui/setup_video.cpp:610
-msgid "off"
-msgstr "выкл"
-
-#: src/gui/setup_video.cpp:285 src/gui/setup_video.cpp:296
-#: src/gui/setup_video.cpp:613 src/gui/setup_video.cpp:627
-msgid "low"
-msgstr "низ."
-
-#: src/gui/setup_video.cpp:288 src/gui/setup_video.cpp:302
-#: src/gui/setup_video.cpp:616 src/gui/setup_video.cpp:633
-msgid "high"
-msgstr "выс."
-
-#: src/gui/setup_video.cpp:299 src/gui/setup_video.cpp:630
-msgid "medium"
-msgstr "средне"
-
-#: src/gui/setup_video.cpp:305 src/gui/setup_video.cpp:636
-msgid "max"
-msgstr "максимальное"
-
-#: src/gui/setup_video.cpp:410
+#: src/gui/setup_video.cpp:356
msgid "Failed to switch to "
msgstr ""
-#: src/gui/setup_video.cpp:411
+#: src/gui/setup_video.cpp:357
msgid "windowed"
msgstr ""
-#: src/gui/setup_video.cpp:411
+#: src/gui/setup_video.cpp:357
msgid "fullscreen"
msgstr ""
-#: src/gui/setup_video.cpp:412
+#: src/gui/setup_video.cpp:358
msgid "mode and restoration of old mode also failed!"
msgstr ""
-#: src/gui/setup_video.cpp:421
+#: src/gui/setup_video.cpp:367
msgid "Switching to full screen"
msgstr "Переключение в полноэкранный режим"
-#: src/gui/setup_video.cpp:422
+#: src/gui/setup_video.cpp:368
msgid "Restart needed for changes to take effect."
msgstr "Для вступления в силу выбранных настроек требуется перезагрузка игры."
-#: src/gui/setup_video.cpp:434
+#: src/gui/setup_video.cpp:380
msgid "Changing OpenGL"
msgstr "Переключение на OpenGL"
-#: src/gui/setup_video.cpp:435
+#: src/gui/setup_video.cpp:381
msgid "Applying change to OpenGL requires restart."
msgstr "Переход к OpenGL требует перезагрузки игры."
-#: src/gui/setup_video.cpp:520
+#: src/gui/setup_video.cpp:442
msgid "Screen resolution changed"
msgstr ""
-#: src/gui/setup_video.cpp:521
+#: src/gui/setup_video.cpp:443
msgid "Restart your client for the change to take effect."
msgstr ""
-#: src/gui/setup_video.cpp:545
+#: src/gui/setup_video.cpp:467
msgid "Particle effect settings changed."
msgstr ""
-#: src/gui/setup_video.cpp:546
+#: src/gui/setup_video.cpp:468
msgid "Changes will take effect on map change."
msgstr ""
@@ -1958,9 +1923,8 @@ msgid "Debug Window"
msgstr ""
#: src/keyboardconfig.cpp:80
-#, fuzzy
msgid "Party Window"
-msgstr "Восстановить расположение окон"
+msgstr ""
#: src/keyboardconfig.cpp:81
msgid "Emote Shortcut Window"
@@ -2008,55 +1972,55 @@ msgstr ""
msgid "Ignore input 2"
msgstr ""
-#: src/localplayer.cpp:834
+#: src/localplayer.cpp:837
msgid "Unarmed"
msgstr ""
-#: src/localplayer.cpp:835
+#: src/localplayer.cpp:838
msgid "Knife"
msgstr ""
-#: src/localplayer.cpp:836
+#: src/localplayer.cpp:839
msgid "Sword"
msgstr ""
-#: src/localplayer.cpp:837
+#: src/localplayer.cpp:840
msgid "Polearm"
msgstr ""
-#: src/localplayer.cpp:838
+#: src/localplayer.cpp:841
msgid "Staff"
msgstr ""
-#: src/localplayer.cpp:839
+#: src/localplayer.cpp:842
msgid "Whip"
msgstr ""
-#: src/localplayer.cpp:840
+#: src/localplayer.cpp:843
msgid "Bow"
msgstr ""
-#: src/localplayer.cpp:841
+#: src/localplayer.cpp:844
msgid "Shooting"
msgstr ""
-#: src/localplayer.cpp:842
+#: src/localplayer.cpp:845
msgid "Mace"
msgstr ""
-#: src/localplayer.cpp:843
+#: src/localplayer.cpp:846
msgid "Axe"
msgstr ""
-#: src/localplayer.cpp:844
+#: src/localplayer.cpp:847
msgid "Thrown"
msgstr ""
-#: src/localplayer.cpp:846
+#: src/localplayer.cpp:849
msgid "Craft"
msgstr ""
-#: src/localplayer.cpp:847
+#: src/localplayer.cpp:850
msgid "Unknown Skill"
msgstr ""
@@ -2268,193 +2232,193 @@ msgstr ""
msgid "Unable to unequip."
msgstr ""
-#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:82
-#, c-format
-msgid "Strength: %d"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:81
+#, fuzzy, c-format
+msgid "Strength %+d"
+msgstr "Сила"
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:84
-#, c-format
-msgid "Agility: %d"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:82
+#, fuzzy, c-format
+msgid "Agility %+d"
+msgstr "Выносливость:"
-#: src/net/ea/generalhandler.cpp:96 src/net/tmwserv/generalhandler.cpp:88
-#, c-format
-msgid "Vitality: %d"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:84
+#, fuzzy, c-format
+msgid "Vitality %+d"
+msgstr "Живучесть:"
-#: src/net/ea/generalhandler.cpp:98 src/net/tmwserv/generalhandler.cpp:90
-#, c-format
-msgid "Intelligence: %d"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:85
+#, fuzzy, c-format
+msgid "Intelligence %+d"
+msgstr "Интеллект"
-#: src/net/ea/generalhandler.cpp:100 src/net/tmwserv/generalhandler.cpp:86
-#, c-format
-msgid "Dexterity: %d"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:83
+#, fuzzy, c-format
+msgid "Dexterity %+d"
+msgstr "Ловкость"
-#: src/net/ea/generalhandler.cpp:102
-#, c-format
-msgid "Luck: %d"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:96
+#, fuzzy, c-format
+msgid "Luck %+d"
+msgstr "Удача"
-#: src/net/ea/generalhandler.cpp:125
+#: src/net/ea/generalhandler.cpp:118
msgid "Authentication failed"
msgstr ""
-#: src/net/ea/generalhandler.cpp:128
+#: src/net/ea/generalhandler.cpp:121
msgid "No servers available"
msgstr ""
-#: src/net/ea/generalhandler.cpp:132
+#: src/net/ea/generalhandler.cpp:125
msgid "Someone else is trying to use this account"
msgstr ""
-#: src/net/ea/generalhandler.cpp:135
+#: src/net/ea/generalhandler.cpp:128
msgid "This account is already logged in"
msgstr ""
-#: src/net/ea/generalhandler.cpp:138
+#: src/net/ea/generalhandler.cpp:131
msgid "Speed hack detected"
msgstr ""
-#: src/net/ea/generalhandler.cpp:141
+#: src/net/ea/generalhandler.cpp:134
msgid "Duplicated login"
msgstr ""
-#: src/net/ea/generalhandler.cpp:144
+#: src/net/ea/generalhandler.cpp:137
msgid "Unknown connection error"
msgstr ""
-#: src/net/ea/generalhandler.cpp:201
+#: src/net/ea/generalhandler.cpp:194
msgid "Got disconnected from server!"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:52
+#: src/net/ea/gui/partytab.cpp:55
msgid "/help > Display this help."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:53
+#: src/net/ea/gui/partytab.cpp:56
msgid "/create > Create a new party"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:54
+#: src/net/ea/gui/partytab.cpp:57
msgid "/new > Alias of create"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:55
+#: src/net/ea/gui/partytab.cpp:58
msgid "/invite > Invite a player to your party"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:56
+#: src/net/ea/gui/partytab.cpp:59
msgid "/leave > Leave the party you are in"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:57
+#: src/net/ea/gui/partytab.cpp:60
msgid "/kick > Kick some one from the party you are in"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:58
+#: src/net/ea/gui/partytab.cpp:61
msgid "/item > Show/change party item sharing options"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:59
+#: src/net/ea/gui/partytab.cpp:62
msgid "/exp > Show/change party experience sharing options"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:68
+#: src/net/ea/gui/partytab.cpp:71
msgid "Command: /new <party-name>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:69
+#: src/net/ea/gui/partytab.cpp:72
msgid "Command: /create <party-name>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:70
+#: src/net/ea/gui/partytab.cpp:73
msgid "These commands create a new party called <party-name>."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:74
+#: src/net/ea/gui/partytab.cpp:77
msgid "Command: /invite <nick>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:81
+#: src/net/ea/gui/partytab.cpp:84
msgid "Command: /leave"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:82
+#: src/net/ea/gui/partytab.cpp:85
msgid "This command causes the player to leave the party."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/ea/gui/partytab.cpp:89
msgid "Command: /item <policy>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:87
+#: src/net/ea/gui/partytab.cpp:90
msgid "This command changes the party's item sharing policy."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:88
+#: src/net/ea/gui/partytab.cpp:91
msgid ""
"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
"\"0\", \"no\", \"false\" to disable item sharing."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:94
msgid "Command: /item"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:92
+#: src/net/ea/gui/partytab.cpp:95
msgid "This command displays the party's current item sharing policy."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:96
+#: src/net/ea/gui/partytab.cpp:99
msgid "Command: /exp <policy>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/ea/gui/partytab.cpp:100
msgid "This command changes the party's experience sharing policy."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:98
+#: src/net/ea/gui/partytab.cpp:101
msgid ""
"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:104
msgid "Command: /exp"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:102
+#: src/net/ea/gui/partytab.cpp:105
msgid "This command displays the party's current experience sharing policy."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:110
+#: src/net/ea/gui/partytab.cpp:113
msgid "Party name is missing."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:133 src/net/ea/partyhandler.cpp:191
+#: src/net/ea/gui/partytab.cpp:136 src/net/ea/partyhandler.cpp:194
msgid "Item sharing enabled."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:136 src/net/ea/partyhandler.cpp:197
+#: src/net/ea/gui/partytab.cpp:139 src/net/ea/partyhandler.cpp:200
msgid "Item sharing disabled."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:139 src/net/ea/partyhandler.cpp:203
+#: src/net/ea/gui/partytab.cpp:142 src/net/ea/partyhandler.cpp:206
msgid "Item sharing not possible."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:165 src/net/ea/partyhandler.cpp:168
+#: src/net/ea/gui/partytab.cpp:168 src/net/ea/partyhandler.cpp:171
msgid "Experience sharing enabled."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:168 src/net/ea/partyhandler.cpp:174
+#: src/net/ea/gui/partytab.cpp:171 src/net/ea/partyhandler.cpp:177
msgid "Experience sharing disabled."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:171 src/net/ea/partyhandler.cpp:180
+#: src/net/ea/gui/partytab.cpp:174 src/net/ea/partyhandler.cpp:183
msgid "Experience sharing not possible."
msgstr ""
@@ -2517,45 +2481,45 @@ msgstr ""
msgid "Party successfully created."
msgstr ""
-#: src/net/ea/partyhandler.cpp:115
+#: src/net/ea/partyhandler.cpp:118
#, c-format
msgid "%s is already a member of a party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:119
+#: src/net/ea/partyhandler.cpp:122
#, c-format
msgid "%s refused your invitation."
msgstr ""
-#: src/net/ea/partyhandler.cpp:123
+#: src/net/ea/partyhandler.cpp:126
#, c-format
msgid "%s is now a member of your party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:127
+#: src/net/ea/partyhandler.cpp:130
#, c-format
msgid "Unknown invite response for %s."
msgstr ""
-#: src/net/ea/partyhandler.cpp:232
+#: src/net/ea/partyhandler.cpp:235
msgid "You have left the party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:235
+#: src/net/ea/partyhandler.cpp:239
#, c-format
msgid "%s has left your party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:272
+#: src/net/ea/partyhandler.cpp:274
#, c-format
msgid "An unknown member tried to say: %s"
msgstr ""
-#: src/net/ea/partyhandler.cpp:298
+#: src/net/ea/partyhandler.cpp:300
msgid "Inviting like this isn't supported at the moment."
msgstr ""
-#: src/net/ea/partyhandler.cpp:327
+#: src/net/ea/partyhandler.cpp:329
#, c-format
msgid "%s is not in your party!"
msgstr ""
@@ -2848,10 +2812,10 @@ msgstr "Сила волиr:"
msgid "Topic: "
msgstr ""
-#: src/net/tmwserv/generalhandler.cpp:92
-#, c-format
-msgid "Willpower: %d"
-msgstr ""
+#: src/net/tmwserv/generalhandler.cpp:86
+#, fuzzy, c-format
+msgid "Willpower %+d"
+msgstr "Сила волиr:"
#: src/net/tmwserv/loginhandler.cpp:80
msgid "Wrong magic_token"
@@ -2948,3 +2912,12 @@ msgstr ""
#: src/resources/npcdb.cpp:53
msgid "NPC Database: Error while loading npcs.xml!"
msgstr ""
+
+#~ msgid "Scroll radius"
+#~ msgstr "Радиус прокрутки"
+
+#~ msgid "Scroll laziness"
+#~ msgstr "Заторможенность прокрутки"
+
+#~ msgid "Save player list"
+#~ msgstr "Сохранить список игроков"
diff --git a/po/sk.po b/po/sk.po
index c8cb9cd2..5ed1556d 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: tmw\n"
"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-05-10 16:39+0200\n"
+"POT-Creation-Date: 2009-05-12 00:11+0200\n"
"PO-Revision-Date: 2009-04-07 18:10+0000\n"
"Last-Translator: Dalanos <Unknown>\n"
"Language-Team: Slovak <sk@li.org>\n"
@@ -175,7 +175,7 @@ msgstr ""
#: src/commandhandler.cpp:216 src/commandhandler.cpp:230
#: src/gui/widgets/channeltab.cpp:81 src/gui/widgets/channeltab.cpp:90
-#: src/net/ea/gui/partytab.cpp:76
+#: src/net/ea/gui/partytab.cpp:79
msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
msgstr "Ak <nick> medzery v mene, použi dvojité úvodzovky (\")."
@@ -195,7 +195,7 @@ msgstr ""
msgid "Command: /party <nick>"
msgstr ""
-#: src/commandhandler.cpp:229 src/net/ea/gui/partytab.cpp:75
+#: src/commandhandler.cpp:229 src/net/ea/gui/partytab.cpp:78
msgid "This command invites <nick> to party with you."
msgstr ""
@@ -508,7 +508,7 @@ msgstr "Ano"
msgid "Previous"
msgstr "Predchádzajúci"
-#: src/gui/charselectdialog.cpp:113 src/gui/npcdialog.cpp:44
+#: src/gui/charselectdialog.cpp:113 src/gui/npcdialog.cpp:43
msgid "Next"
msgstr "Nasledujúci"
@@ -533,7 +533,7 @@ msgstr "Nový"
#: src/gui/charselectdialog.cpp:118 src/gui/charselectdialog.cpp:165
#: src/gui/charselectdialog.cpp:166 src/gui/charselectdialog.cpp:315
-#: src/gui/setup_players.cpp:230
+#: src/gui/setup_players.cpp:228
msgid "Delete"
msgstr "Vymazať"
@@ -568,19 +568,15 @@ msgstr ""
msgid "%d players are present."
msgstr ""
-#: src/gui/chat.cpp:348 src/gui/chat.cpp:354
+#: src/gui/chat.cpp:333
msgid "Present: "
msgstr ""
-#: src/gui/chat.cpp:348 src/gui/chat.cpp:354
-msgid "; "
-msgstr ""
-
-#: src/gui/chat.cpp:349
+#: src/gui/chat.cpp:350
msgid "Attendance written to record log."
msgstr ""
-#: src/gui/chat.cpp:474
+#: src/gui/chat.cpp:475
#, c-format
msgid "Whispering to %s: %s"
msgstr "Nápoveda pre %s: %s"
@@ -630,7 +626,7 @@ msgstr ""
msgid "Help"
msgstr "Nápoveda"
-#: src/gui/help.cpp:47 src/gui/npcdialog.cpp:45 src/gui/storagewindow.cpp:68
+#: src/gui/help.cpp:47 src/gui/npcdialog.cpp:44 src/gui/storagewindow.cpp:68
msgid "Close"
msgstr "Zatvoriť"
@@ -723,7 +719,7 @@ msgid "Register"
msgstr "Registrovať"
#: src/gui/magic.cpp:32 src/gui/skilldialog.cpp:117 src/gui/windowmenu.cpp:64
-#: src/localplayer.cpp:845
+#: src/localplayer.cpp:848
msgid "Magic"
msgstr ""
@@ -739,33 +735,25 @@ msgstr ""
msgid "Cast Test Spell 3"
msgstr ""
-#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
+#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:86
#, fuzzy
msgid "Map"
msgstr "MiniMapa"
-#: src/gui/npcdialog.cpp:43
+#: src/gui/npcdialog.cpp:42
msgid "Waiting for server"
msgstr ""
-#: src/gui/npcdialog.cpp:46
+#: src/gui/npcdialog.cpp:45
#, fuzzy
msgid "Submit"
msgstr "Ukončiť"
-#: src/gui/npcdialog.cpp:49 src/gui/npcpostdialog.cpp:39
+#: src/gui/npcdialog.cpp:48 src/gui/npcpostdialog.cpp:39
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:95
-msgid "+"
-msgstr ""
-
-#: src/gui/npcdialog.cpp:96
-msgid "-"
-msgstr ""
-
-#: src/gui/npcdialog.cpp:105
+#: src/gui/npcdialog.cpp:104
msgid "Reset"
msgstr ""
@@ -773,8 +761,7 @@ msgstr ""
msgid "Send"
msgstr ""
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:268
-#: src/gui/setup_video.cpp:567
+#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:142
msgid "Text"
msgstr ""
@@ -826,8 +813,8 @@ msgstr ""
msgid "Is"
msgstr ""
-#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:33
-#: src/net/ea/gui/partytab.cpp:37
+#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:45
+#: src/net/ea/gui/partytab.cpp:39
msgid "Party"
msgstr ""
@@ -1294,26 +1281,22 @@ msgid "???"
msgstr ""
#: src/gui/setup_players.cpp:224
-msgid "Save player list"
-msgstr ""
-
-#: src/gui/setup_players.cpp:226
msgid "Allow trading"
msgstr ""
-#: src/gui/setup_players.cpp:228
+#: src/gui/setup_players.cpp:226
msgid "Allow whispers"
msgstr ""
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:230
msgid "Put all whispers in tabs"
msgstr ""
-#: src/gui/setup_players.cpp:234
+#: src/gui/setup_players.cpp:232
msgid "Players"
msgstr ""
-#: src/gui/setup_players.cpp:259
+#: src/gui/setup_players.cpp:257
msgid "When ignoring:"
msgstr ""
@@ -1334,157 +1317,147 @@ msgstr ""
msgid "Large"
msgstr ""
-#: src/gui/setup_video.cpp:151
-msgid "Full screen"
-msgstr ""
-
-#: src/gui/setup_video.cpp:152
-msgid "OpenGL"
-msgstr ""
-
-#: src/gui/setup_video.cpp:153
-msgid "Custom cursor"
+#: src/gui/setup_video.cpp:141
+msgid "No text"
msgstr ""
-#: src/gui/setup_video.cpp:155
-msgid "Visible names"
+#: src/gui/setup_video.cpp:143
+msgid "Bubbles, no names"
msgstr ""
-#: src/gui/setup_video.cpp:157
-msgid "Particle effects"
+#: src/gui/setup_video.cpp:144
+msgid "Bubbles with names"
msgstr ""
-#: src/gui/setup_video.cpp:159
-msgid "Show name"
+#: src/gui/setup_video.cpp:153
+msgid "off"
msgstr ""
-#: src/gui/setup_video.cpp:160
-msgid "Show pickup notification"
+#: src/gui/setup_video.cpp:154 src/gui/setup_video.cpp:164
+msgid "low"
msgstr ""
-#: src/gui/setup_video.cpp:161
-msgid "in chat"
+#: src/gui/setup_video.cpp:155 src/gui/setup_video.cpp:166
+msgid "high"
msgstr ""
-#: src/gui/setup_video.cpp:162
-msgid "as particle"
+#: src/gui/setup_video.cpp:165
+msgid "medium"
msgstr ""
#: src/gui/setup_video.cpp:167
-msgid "FPS Limit:"
+msgid "max"
msgstr ""
-#: src/gui/setup_video.cpp:184
-msgid "Video"
+#: src/gui/setup_video.cpp:187
+msgid "Full screen"
msgstr ""
-#: src/gui/setup_video.cpp:189
-msgid "Overhead text"
+#: src/gui/setup_video.cpp:188
+msgid "OpenGL"
msgstr ""
-#: src/gui/setup_video.cpp:190
-msgid "Gui opacity"
+#: src/gui/setup_video.cpp:189
+msgid "Custom cursor"
msgstr ""
#: src/gui/setup_video.cpp:191
-msgid "Scroll radius"
+msgid "Visible names"
msgstr ""
-#: src/gui/setup_video.cpp:192
-msgid "Scroll laziness"
+#: src/gui/setup_video.cpp:193
+msgid "Particle effects"
msgstr ""
-#: src/gui/setup_video.cpp:193
-msgid "Ambient FX"
+#: src/gui/setup_video.cpp:195
+msgid "Show name"
msgstr ""
-#: src/gui/setup_video.cpp:194
-msgid "Particle Detail"
+#: src/gui/setup_video.cpp:196
+msgid "Show pickup notification"
msgstr ""
-#: src/gui/setup_video.cpp:195
-msgid "Font size"
+#: src/gui/setup_video.cpp:197
+msgid "in chat"
msgstr ""
-#: src/gui/setup_video.cpp:265 src/gui/setup_video.cpp:564
-msgid "No text"
+#: src/gui/setup_video.cpp:198
+msgid "as particle"
msgstr ""
-#: src/gui/setup_video.cpp:271 src/gui/setup_video.cpp:570
-msgid "Bubbles, no names"
+#: src/gui/setup_video.cpp:203
+msgid "FPS Limit:"
msgstr ""
-#: src/gui/setup_video.cpp:274 src/gui/setup_video.cpp:573
-msgid "Bubbles with names"
+#: src/gui/setup_video.cpp:214
+msgid "Video"
msgstr ""
-#: src/gui/setup_video.cpp:282 src/gui/setup_video.cpp:610
-msgid "off"
+#: src/gui/setup_video.cpp:219
+msgid "Overhead text"
msgstr ""
-#: src/gui/setup_video.cpp:285 src/gui/setup_video.cpp:296
-#: src/gui/setup_video.cpp:613 src/gui/setup_video.cpp:627
-msgid "low"
+#: src/gui/setup_video.cpp:220
+msgid "Gui opacity"
msgstr ""
-#: src/gui/setup_video.cpp:288 src/gui/setup_video.cpp:302
-#: src/gui/setup_video.cpp:616 src/gui/setup_video.cpp:633
-msgid "high"
+#: src/gui/setup_video.cpp:221
+msgid "Ambient FX"
msgstr ""
-#: src/gui/setup_video.cpp:299 src/gui/setup_video.cpp:630
-msgid "medium"
+#: src/gui/setup_video.cpp:222
+msgid "Particle Detail"
msgstr ""
-#: src/gui/setup_video.cpp:305 src/gui/setup_video.cpp:636
-msgid "max"
+#: src/gui/setup_video.cpp:223
+msgid "Font size"
msgstr ""
-#: src/gui/setup_video.cpp:410
+#: src/gui/setup_video.cpp:356
msgid "Failed to switch to "
msgstr ""
-#: src/gui/setup_video.cpp:411
+#: src/gui/setup_video.cpp:357
msgid "windowed"
msgstr ""
-#: src/gui/setup_video.cpp:411
+#: src/gui/setup_video.cpp:357
msgid "fullscreen"
msgstr ""
-#: src/gui/setup_video.cpp:412
+#: src/gui/setup_video.cpp:358
msgid "mode and restoration of old mode also failed!"
msgstr ""
-#: src/gui/setup_video.cpp:421
+#: src/gui/setup_video.cpp:367
msgid "Switching to full screen"
msgstr ""
-#: src/gui/setup_video.cpp:422
+#: src/gui/setup_video.cpp:368
msgid "Restart needed for changes to take effect."
msgstr ""
-#: src/gui/setup_video.cpp:434
+#: src/gui/setup_video.cpp:380
msgid "Changing OpenGL"
msgstr ""
-#: src/gui/setup_video.cpp:435
+#: src/gui/setup_video.cpp:381
msgid "Applying change to OpenGL requires restart."
msgstr ""
-#: src/gui/setup_video.cpp:520
+#: src/gui/setup_video.cpp:442
msgid "Screen resolution changed"
msgstr ""
-#: src/gui/setup_video.cpp:521
+#: src/gui/setup_video.cpp:443
msgid "Restart your client for the change to take effect."
msgstr ""
-#: src/gui/setup_video.cpp:545
+#: src/gui/setup_video.cpp:467
msgid "Particle effect settings changed."
msgstr ""
-#: src/gui/setup_video.cpp:546
+#: src/gui/setup_video.cpp:468
msgid "Changes will take effect on map change."
msgstr ""
@@ -2005,55 +1978,55 @@ msgstr ""
msgid "Ignore input 2"
msgstr ""
-#: src/localplayer.cpp:834
+#: src/localplayer.cpp:837
msgid "Unarmed"
msgstr ""
-#: src/localplayer.cpp:835
+#: src/localplayer.cpp:838
msgid "Knife"
msgstr ""
-#: src/localplayer.cpp:836
+#: src/localplayer.cpp:839
msgid "Sword"
msgstr ""
-#: src/localplayer.cpp:837
+#: src/localplayer.cpp:840
msgid "Polearm"
msgstr ""
-#: src/localplayer.cpp:838
+#: src/localplayer.cpp:841
msgid "Staff"
msgstr ""
-#: src/localplayer.cpp:839
+#: src/localplayer.cpp:842
msgid "Whip"
msgstr ""
-#: src/localplayer.cpp:840
+#: src/localplayer.cpp:843
msgid "Bow"
msgstr ""
-#: src/localplayer.cpp:841
+#: src/localplayer.cpp:844
msgid "Shooting"
msgstr ""
-#: src/localplayer.cpp:842
+#: src/localplayer.cpp:845
msgid "Mace"
msgstr ""
-#: src/localplayer.cpp:843
+#: src/localplayer.cpp:846
msgid "Axe"
msgstr ""
-#: src/localplayer.cpp:844
+#: src/localplayer.cpp:847
msgid "Thrown"
msgstr ""
-#: src/localplayer.cpp:846
+#: src/localplayer.cpp:849
msgid "Craft"
msgstr ""
-#: src/localplayer.cpp:847
+#: src/localplayer.cpp:850
msgid "Unknown Skill"
msgstr ""
@@ -2265,193 +2238,193 @@ msgstr ""
msgid "Unable to unequip."
msgstr ""
-#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:82
-#, c-format
-msgid "Strength: %d"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:81
+#, fuzzy, c-format
+msgid "Strength %+d"
+msgstr "Sila:"
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:82
#, c-format
-msgid "Agility: %d"
+msgid "Agility %+d"
msgstr ""
-#: src/net/ea/generalhandler.cpp:96 src/net/tmwserv/generalhandler.cpp:88
+#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:84
#, c-format
-msgid "Vitality: %d"
+msgid "Vitality %+d"
msgstr ""
-#: src/net/ea/generalhandler.cpp:98 src/net/tmwserv/generalhandler.cpp:90
-#, c-format
-msgid "Intelligence: %d"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:85
+#, fuzzy, c-format
+msgid "Intelligence %+d"
+msgstr "Inteligencia:"
-#: src/net/ea/generalhandler.cpp:100 src/net/tmwserv/generalhandler.cpp:86
+#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:83
#, c-format
-msgid "Dexterity: %d"
+msgid "Dexterity %+d"
msgstr ""
-#: src/net/ea/generalhandler.cpp:102
+#: src/net/ea/generalhandler.cpp:96
#, c-format
-msgid "Luck: %d"
+msgid "Luck %+d"
msgstr ""
-#: src/net/ea/generalhandler.cpp:125
+#: src/net/ea/generalhandler.cpp:118
msgid "Authentication failed"
msgstr ""
-#: src/net/ea/generalhandler.cpp:128
+#: src/net/ea/generalhandler.cpp:121
msgid "No servers available"
msgstr ""
-#: src/net/ea/generalhandler.cpp:132
+#: src/net/ea/generalhandler.cpp:125
msgid "Someone else is trying to use this account"
msgstr ""
-#: src/net/ea/generalhandler.cpp:135
+#: src/net/ea/generalhandler.cpp:128
msgid "This account is already logged in"
msgstr ""
-#: src/net/ea/generalhandler.cpp:138
+#: src/net/ea/generalhandler.cpp:131
msgid "Speed hack detected"
msgstr ""
-#: src/net/ea/generalhandler.cpp:141
+#: src/net/ea/generalhandler.cpp:134
msgid "Duplicated login"
msgstr ""
-#: src/net/ea/generalhandler.cpp:144
+#: src/net/ea/generalhandler.cpp:137
msgid "Unknown connection error"
msgstr ""
-#: src/net/ea/generalhandler.cpp:201
+#: src/net/ea/generalhandler.cpp:194
msgid "Got disconnected from server!"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:52
+#: src/net/ea/gui/partytab.cpp:55
msgid "/help > Display this help."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:53
+#: src/net/ea/gui/partytab.cpp:56
msgid "/create > Create a new party"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:54
+#: src/net/ea/gui/partytab.cpp:57
msgid "/new > Alias of create"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:55
+#: src/net/ea/gui/partytab.cpp:58
msgid "/invite > Invite a player to your party"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:56
+#: src/net/ea/gui/partytab.cpp:59
msgid "/leave > Leave the party you are in"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:57
+#: src/net/ea/gui/partytab.cpp:60
msgid "/kick > Kick some one from the party you are in"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:58
+#: src/net/ea/gui/partytab.cpp:61
msgid "/item > Show/change party item sharing options"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:59
+#: src/net/ea/gui/partytab.cpp:62
msgid "/exp > Show/change party experience sharing options"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:68
+#: src/net/ea/gui/partytab.cpp:71
msgid "Command: /new <party-name>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:69
+#: src/net/ea/gui/partytab.cpp:72
msgid "Command: /create <party-name>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:70
+#: src/net/ea/gui/partytab.cpp:73
msgid "These commands create a new party called <party-name>."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:74
+#: src/net/ea/gui/partytab.cpp:77
msgid "Command: /invite <nick>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:81
+#: src/net/ea/gui/partytab.cpp:84
msgid "Command: /leave"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:82
+#: src/net/ea/gui/partytab.cpp:85
msgid "This command causes the player to leave the party."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/ea/gui/partytab.cpp:89
msgid "Command: /item <policy>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:87
+#: src/net/ea/gui/partytab.cpp:90
msgid "This command changes the party's item sharing policy."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:88
+#: src/net/ea/gui/partytab.cpp:91
msgid ""
"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
"\"0\", \"no\", \"false\" to disable item sharing."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:94
msgid "Command: /item"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:92
+#: src/net/ea/gui/partytab.cpp:95
msgid "This command displays the party's current item sharing policy."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:96
+#: src/net/ea/gui/partytab.cpp:99
msgid "Command: /exp <policy>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/ea/gui/partytab.cpp:100
msgid "This command changes the party's experience sharing policy."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:98
+#: src/net/ea/gui/partytab.cpp:101
msgid ""
"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:104
msgid "Command: /exp"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:102
+#: src/net/ea/gui/partytab.cpp:105
msgid "This command displays the party's current experience sharing policy."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:110
+#: src/net/ea/gui/partytab.cpp:113
msgid "Party name is missing."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:133 src/net/ea/partyhandler.cpp:191
+#: src/net/ea/gui/partytab.cpp:136 src/net/ea/partyhandler.cpp:194
msgid "Item sharing enabled."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:136 src/net/ea/partyhandler.cpp:197
+#: src/net/ea/gui/partytab.cpp:139 src/net/ea/partyhandler.cpp:200
msgid "Item sharing disabled."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:139 src/net/ea/partyhandler.cpp:203
+#: src/net/ea/gui/partytab.cpp:142 src/net/ea/partyhandler.cpp:206
msgid "Item sharing not possible."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:165 src/net/ea/partyhandler.cpp:168
+#: src/net/ea/gui/partytab.cpp:168 src/net/ea/partyhandler.cpp:171
msgid "Experience sharing enabled."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:168 src/net/ea/partyhandler.cpp:174
+#: src/net/ea/gui/partytab.cpp:171 src/net/ea/partyhandler.cpp:177
msgid "Experience sharing disabled."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:171 src/net/ea/partyhandler.cpp:180
+#: src/net/ea/gui/partytab.cpp:174 src/net/ea/partyhandler.cpp:183
msgid "Experience sharing not possible."
msgstr ""
@@ -2514,45 +2487,45 @@ msgstr ""
msgid "Party successfully created."
msgstr ""
-#: src/net/ea/partyhandler.cpp:115
+#: src/net/ea/partyhandler.cpp:118
#, c-format
msgid "%s is already a member of a party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:119
+#: src/net/ea/partyhandler.cpp:122
#, c-format
msgid "%s refused your invitation."
msgstr ""
-#: src/net/ea/partyhandler.cpp:123
+#: src/net/ea/partyhandler.cpp:126
#, c-format
msgid "%s is now a member of your party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:127
+#: src/net/ea/partyhandler.cpp:130
#, c-format
msgid "Unknown invite response for %s."
msgstr ""
-#: src/net/ea/partyhandler.cpp:232
+#: src/net/ea/partyhandler.cpp:235
msgid "You have left the party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:235
+#: src/net/ea/partyhandler.cpp:239
#, c-format
msgid "%s has left your party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:272
+#: src/net/ea/partyhandler.cpp:274
#, c-format
msgid "An unknown member tried to say: %s"
msgstr ""
-#: src/net/ea/partyhandler.cpp:298
+#: src/net/ea/partyhandler.cpp:300
msgid "Inviting like this isn't supported at the moment."
msgstr ""
-#: src/net/ea/partyhandler.cpp:327
+#: src/net/ea/partyhandler.cpp:329
#, c-format
msgid "%s is not in your party!"
msgstr ""
@@ -2845,9 +2818,9 @@ msgstr ""
msgid "Topic: "
msgstr ""
-#: src/net/tmwserv/generalhandler.cpp:92
+#: src/net/tmwserv/generalhandler.cpp:86
#, c-format
-msgid "Willpower: %d"
+msgid "Willpower %+d"
msgstr ""
#: src/net/tmwserv/loginhandler.cpp:80
diff --git a/po/sv.po b/po/sv.po
index 6acd9f36..51b17695 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: tmw\n"
"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-05-10 16:39+0200\n"
+"POT-Creation-Date: 2009-05-12 00:11+0200\n"
"PO-Revision-Date: 2009-04-22 11:32+0000\n"
"Last-Translator: Kess Vargavind <Unknown>\n"
"Language-Team: Swedish <sv@li.org>\n"
@@ -179,7 +179,7 @@ msgstr "Det här kommandot skickar <meddelande> till <spelare>."
#: src/commandhandler.cpp:216 src/commandhandler.cpp:230
#: src/gui/widgets/channeltab.cpp:81 src/gui/widgets/channeltab.cpp:90
-#: src/net/ea/gui/partytab.cpp:76
+#: src/net/ea/gui/partytab.cpp:79
msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
msgstr ""
"Om <spelare> innehåller mellanslag, måste du sätta citattecken (\") runt det."
@@ -202,7 +202,7 @@ msgstr ""
msgid "Command: /party <nick>"
msgstr "Kommando: /party <spelare>"
-#: src/commandhandler.cpp:229 src/net/ea/gui/partytab.cpp:75
+#: src/commandhandler.cpp:229 src/net/ea/gui/partytab.cpp:78
msgid "This command invites <nick> to party with you."
msgstr "Det här kommandot bjuder in <spelare> till din grupp."
@@ -525,7 +525,7 @@ msgstr "Ok"
msgid "Previous"
msgstr "Föregående"
-#: src/gui/charselectdialog.cpp:113 src/gui/npcdialog.cpp:44
+#: src/gui/charselectdialog.cpp:113 src/gui/npcdialog.cpp:43
msgid "Next"
msgstr "Nästa"
@@ -550,7 +550,7 @@ msgstr "Ny"
#: src/gui/charselectdialog.cpp:118 src/gui/charselectdialog.cpp:165
#: src/gui/charselectdialog.cpp:166 src/gui/charselectdialog.cpp:315
-#: src/gui/setup_players.cpp:230
+#: src/gui/setup_players.cpp:228
msgid "Delete"
msgstr "Ta bort"
@@ -585,19 +585,15 @@ msgstr "Chatt"
msgid "%d players are present."
msgstr ""
-#: src/gui/chat.cpp:348 src/gui/chat.cpp:354
+#: src/gui/chat.cpp:333
msgid "Present: "
msgstr "Närvarande: "
-#: src/gui/chat.cpp:348 src/gui/chat.cpp:354
-msgid "; "
-msgstr ""
-
-#: src/gui/chat.cpp:349
+#: src/gui/chat.cpp:350
msgid "Attendance written to record log."
msgstr "Närvaro loggades till fil."
-#: src/gui/chat.cpp:474
+#: src/gui/chat.cpp:475
#, c-format
msgid "Whispering to %s: %s"
msgstr "Viskar till %s: %s"
@@ -647,7 +643,7 @@ msgstr "Lämna gille"
msgid "Help"
msgstr "Hjälp"
-#: src/gui/help.cpp:47 src/gui/npcdialog.cpp:45 src/gui/storagewindow.cpp:68
+#: src/gui/help.cpp:47 src/gui/npcdialog.cpp:44 src/gui/storagewindow.cpp:68
msgid "Close"
msgstr "Stäng"
@@ -740,7 +736,7 @@ msgid "Register"
msgstr "Registrera"
#: src/gui/magic.cpp:32 src/gui/skilldialog.cpp:117 src/gui/windowmenu.cpp:64
-#: src/localplayer.cpp:845
+#: src/localplayer.cpp:848
msgid "Magic"
msgstr "Magi"
@@ -756,33 +752,25 @@ msgstr "Använd testmagi 2"
msgid "Cast Test Spell 3"
msgstr "Använd testmagi 3"
-#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
+#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:86
#, fuzzy
msgid "Map"
msgstr "Max"
-#: src/gui/npcdialog.cpp:43
+#: src/gui/npcdialog.cpp:42
msgid "Waiting for server"
msgstr "Väntar på server"
-#: src/gui/npcdialog.cpp:46
+#: src/gui/npcdialog.cpp:45
#, fuzzy
msgid "Submit"
msgstr "Sitt"
-#: src/gui/npcdialog.cpp:49 src/gui/npcpostdialog.cpp:39
+#: src/gui/npcdialog.cpp:48 src/gui/npcpostdialog.cpp:39
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:95
-msgid "+"
-msgstr ""
-
-#: src/gui/npcdialog.cpp:96
-msgid "-"
-msgstr ""
-
-#: src/gui/npcdialog.cpp:105
+#: src/gui/npcdialog.cpp:104
msgid "Reset"
msgstr "Återställ"
@@ -790,8 +778,7 @@ msgstr "Återställ"
msgid "Send"
msgstr "Skicka"
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:268
-#: src/gui/setup_video.cpp:567
+#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:142
msgid "Text"
msgstr "Text"
@@ -843,8 +830,8 @@ msgstr "Viskning"
msgid "Is"
msgstr "Är"
-#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:33
-#: src/net/ea/gui/partytab.cpp:37
+#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:45
+#: src/net/ea/gui/partytab.cpp:39
msgid "Party"
msgstr "Grupp"
@@ -1318,26 +1305,22 @@ msgid "???"
msgstr "???"
#: src/gui/setup_players.cpp:224
-msgid "Save player list"
-msgstr "Kom ihåg spelarlista"
-
-#: src/gui/setup_players.cpp:226
msgid "Allow trading"
msgstr "Tillåt byteshandel"
-#: src/gui/setup_players.cpp:228
+#: src/gui/setup_players.cpp:226
msgid "Allow whispers"
msgstr "Tillåt viskningar"
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:230
msgid "Put all whispers in tabs"
msgstr "Visa alla viskningar i egna flikar"
-#: src/gui/setup_players.cpp:234
+#: src/gui/setup_players.cpp:232
msgid "Players"
msgstr "Spelare"
-#: src/gui/setup_players.cpp:259
+#: src/gui/setup_players.cpp:257
msgid "When ignoring:"
msgstr "Vid ignorering:"
@@ -1359,157 +1342,147 @@ msgstr "medium"
msgid "Large"
msgstr ""
-#: src/gui/setup_video.cpp:151
+#: src/gui/setup_video.cpp:141
+msgid "No text"
+msgstr "Ingen text"
+
+#: src/gui/setup_video.cpp:143
+msgid "Bubbles, no names"
+msgstr "Textbubblor utan namn"
+
+#: src/gui/setup_video.cpp:144
+msgid "Bubbles with names"
+msgstr "Textbubblor med namn"
+
+#: src/gui/setup_video.cpp:153
+msgid "off"
+msgstr "av"
+
+#: src/gui/setup_video.cpp:154 src/gui/setup_video.cpp:164
+msgid "low"
+msgstr "låg"
+
+#: src/gui/setup_video.cpp:155 src/gui/setup_video.cpp:166
+msgid "high"
+msgstr "hög"
+
+#: src/gui/setup_video.cpp:165
+msgid "medium"
+msgstr "medium"
+
+#: src/gui/setup_video.cpp:167
+msgid "max"
+msgstr "maximal"
+
+#: src/gui/setup_video.cpp:187
msgid "Full screen"
msgstr "Helskärm"
-#: src/gui/setup_video.cpp:152
+#: src/gui/setup_video.cpp:188
msgid "OpenGL"
msgstr "OpenGL"
-#: src/gui/setup_video.cpp:153
+#: src/gui/setup_video.cpp:189
msgid "Custom cursor"
msgstr "Särskild muspekare"
-#: src/gui/setup_video.cpp:155
+#: src/gui/setup_video.cpp:191
msgid "Visible names"
msgstr "Synliga namn"
-#: src/gui/setup_video.cpp:157
+#: src/gui/setup_video.cpp:193
msgid "Particle effects"
msgstr "Partikeleffekter"
-#: src/gui/setup_video.cpp:159
+#: src/gui/setup_video.cpp:195
msgid "Show name"
msgstr "Visa namn"
-#: src/gui/setup_video.cpp:160
+#: src/gui/setup_video.cpp:196
msgid "Show pickup notification"
msgstr "Visa erhållna saker"
-#: src/gui/setup_video.cpp:161
+#: src/gui/setup_video.cpp:197
msgid "in chat"
msgstr "i chattfönster"
-#: src/gui/setup_video.cpp:162
+#: src/gui/setup_video.cpp:198
msgid "as particle"
msgstr "som partikel"
-#: src/gui/setup_video.cpp:167
+#: src/gui/setup_video.cpp:203
msgid "FPS Limit:"
msgstr "FPS-gräns:"
-#: src/gui/setup_video.cpp:184
+#: src/gui/setup_video.cpp:214
msgid "Video"
msgstr "Video"
-#: src/gui/setup_video.cpp:189
+#: src/gui/setup_video.cpp:219
msgid "Overhead text"
msgstr "Text ovanför huvudet"
-#: src/gui/setup_video.cpp:190
+#: src/gui/setup_video.cpp:220
msgid "Gui opacity"
msgstr "Genomskinlighet"
-#: src/gui/setup_video.cpp:191
-msgid "Scroll radius"
-msgstr "Rullningsradie"
-
-#: src/gui/setup_video.cpp:192
-msgid "Scroll laziness"
-msgstr "Tröghet för rullning"
-
-#: src/gui/setup_video.cpp:193
+#: src/gui/setup_video.cpp:221
msgid "Ambient FX"
msgstr "Omgivande FX"
-#: src/gui/setup_video.cpp:194
+#: src/gui/setup_video.cpp:222
msgid "Particle Detail"
msgstr "Partikeldetaljer"
-#: src/gui/setup_video.cpp:195
+#: src/gui/setup_video.cpp:223
msgid "Font size"
msgstr ""
-#: src/gui/setup_video.cpp:265 src/gui/setup_video.cpp:564
-msgid "No text"
-msgstr "Ingen text"
-
-#: src/gui/setup_video.cpp:271 src/gui/setup_video.cpp:570
-msgid "Bubbles, no names"
-msgstr "Textbubblor utan namn"
-
-#: src/gui/setup_video.cpp:274 src/gui/setup_video.cpp:573
-msgid "Bubbles with names"
-msgstr "Textbubblor med namn"
-
-#: src/gui/setup_video.cpp:282 src/gui/setup_video.cpp:610
-msgid "off"
-msgstr "av"
-
-#: src/gui/setup_video.cpp:285 src/gui/setup_video.cpp:296
-#: src/gui/setup_video.cpp:613 src/gui/setup_video.cpp:627
-msgid "low"
-msgstr "låg"
-
-#: src/gui/setup_video.cpp:288 src/gui/setup_video.cpp:302
-#: src/gui/setup_video.cpp:616 src/gui/setup_video.cpp:633
-msgid "high"
-msgstr "hög"
-
-#: src/gui/setup_video.cpp:299 src/gui/setup_video.cpp:630
-msgid "medium"
-msgstr "medium"
-
-#: src/gui/setup_video.cpp:305 src/gui/setup_video.cpp:636
-msgid "max"
-msgstr "maximal"
-
-#: src/gui/setup_video.cpp:410
+#: src/gui/setup_video.cpp:356
msgid "Failed to switch to "
msgstr "Kunde inte byta till "
-#: src/gui/setup_video.cpp:411
+#: src/gui/setup_video.cpp:357
msgid "windowed"
msgstr "som fönster"
-#: src/gui/setup_video.cpp:411
+#: src/gui/setup_video.cpp:357
msgid "fullscreen"
msgstr "helskärm"
-#: src/gui/setup_video.cpp:412
+#: src/gui/setup_video.cpp:358
msgid "mode and restoration of old mode also failed!"
msgstr ""
-#: src/gui/setup_video.cpp:421
+#: src/gui/setup_video.cpp:367
msgid "Switching to full screen"
msgstr "Byte till helskärm"
-#: src/gui/setup_video.cpp:422
+#: src/gui/setup_video.cpp:368
msgid "Restart needed for changes to take effect."
msgstr "Omstart krävs för att ändringarna ska synas."
-#: src/gui/setup_video.cpp:434
+#: src/gui/setup_video.cpp:380
msgid "Changing OpenGL"
msgstr "Ändrar OpenGL"
-#: src/gui/setup_video.cpp:435
+#: src/gui/setup_video.cpp:381
msgid "Applying change to OpenGL requires restart."
msgstr "Ändringar i OpenGL kräver omstart."
-#: src/gui/setup_video.cpp:520
+#: src/gui/setup_video.cpp:442
msgid "Screen resolution changed"
msgstr "Skärmupplösning ändrad"
-#: src/gui/setup_video.cpp:521
+#: src/gui/setup_video.cpp:443
msgid "Restart your client for the change to take effect."
msgstr "Starta om din klient för att ändringen ska börja gälla."
-#: src/gui/setup_video.cpp:545
+#: src/gui/setup_video.cpp:467
msgid "Particle effect settings changed."
msgstr "Inställningar för partikeleffekter ändrade."
-#: src/gui/setup_video.cpp:546
+#: src/gui/setup_video.cpp:468
msgid "Changes will take effect on map change."
msgstr "Förändringar kommer att börja gälla när du byter karta."
@@ -2036,55 +2009,55 @@ msgstr ""
msgid "Ignore input 2"
msgstr ""
-#: src/localplayer.cpp:834
+#: src/localplayer.cpp:837
msgid "Unarmed"
msgstr ""
-#: src/localplayer.cpp:835
+#: src/localplayer.cpp:838
msgid "Knife"
msgstr "Kniv"
-#: src/localplayer.cpp:836
+#: src/localplayer.cpp:839
msgid "Sword"
msgstr "Svärd"
-#: src/localplayer.cpp:837
+#: src/localplayer.cpp:840
msgid "Polearm"
msgstr "Spjut"
-#: src/localplayer.cpp:838
+#: src/localplayer.cpp:841
msgid "Staff"
msgstr "Stav"
-#: src/localplayer.cpp:839
+#: src/localplayer.cpp:842
msgid "Whip"
msgstr "Piska"
-#: src/localplayer.cpp:840
+#: src/localplayer.cpp:843
msgid "Bow"
msgstr "Båge"
-#: src/localplayer.cpp:841
+#: src/localplayer.cpp:844
msgid "Shooting"
msgstr "Skjutvapen"
-#: src/localplayer.cpp:842
+#: src/localplayer.cpp:845
msgid "Mace"
msgstr "Spikklubba"
-#: src/localplayer.cpp:843
+#: src/localplayer.cpp:846
msgid "Axe"
msgstr "Yxa"
-#: src/localplayer.cpp:844
+#: src/localplayer.cpp:847
msgid "Thrown"
msgstr "Kastvapen"
-#: src/localplayer.cpp:846
+#: src/localplayer.cpp:849
msgid "Craft"
msgstr ""
-#: src/localplayer.cpp:847
+#: src/localplayer.cpp:850
msgid "Unknown Skill"
msgstr ""
@@ -2309,193 +2282,193 @@ msgstr "Kan inte utrusta."
msgid "Unable to unequip."
msgstr "Kan inte avrusta."
-#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:82
-#, c-format
-msgid "Strength: %d"
+#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:81
+#, fuzzy, c-format
+msgid "Strength %+d"
msgstr "Styrka: %d"
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:84
-#, c-format
-msgid "Agility: %d"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:82
+#, fuzzy, c-format
+msgid "Agility %+d"
+msgstr "Smidighet"
-#: src/net/ea/generalhandler.cpp:96 src/net/tmwserv/generalhandler.cpp:88
-#, c-format
-msgid "Vitality: %d"
+#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:84
+#, fuzzy, c-format
+msgid "Vitality %+d"
msgstr "Livskraft: %d"
-#: src/net/ea/generalhandler.cpp:98 src/net/tmwserv/generalhandler.cpp:90
-#, c-format
-msgid "Intelligence: %d"
+#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:85
+#, fuzzy, c-format
+msgid "Intelligence %+d"
msgstr "Intelligens: %d"
-#: src/net/ea/generalhandler.cpp:100 src/net/tmwserv/generalhandler.cpp:86
-#, c-format
-msgid "Dexterity: %d"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:83
+#, fuzzy, c-format
+msgid "Dexterity %+d"
+msgstr "Skicklighet"
-#: src/net/ea/generalhandler.cpp:102
-#, c-format
-msgid "Luck: %d"
+#: src/net/ea/generalhandler.cpp:96
+#, fuzzy, c-format
+msgid "Luck %+d"
msgstr "Tur: %d"
-#: src/net/ea/generalhandler.cpp:125
+#: src/net/ea/generalhandler.cpp:118
msgid "Authentication failed"
msgstr "Behörighetskontroll misslyckades"
-#: src/net/ea/generalhandler.cpp:128
+#: src/net/ea/generalhandler.cpp:121
msgid "No servers available"
msgstr "Ingen server är tillgänglig"
-#: src/net/ea/generalhandler.cpp:132
+#: src/net/ea/generalhandler.cpp:125
msgid "Someone else is trying to use this account"
msgstr ""
-#: src/net/ea/generalhandler.cpp:135
+#: src/net/ea/generalhandler.cpp:128
msgid "This account is already logged in"
msgstr "Det här kontot är redan inloggat"
-#: src/net/ea/generalhandler.cpp:138
+#: src/net/ea/generalhandler.cpp:131
msgid "Speed hack detected"
msgstr ""
-#: src/net/ea/generalhandler.cpp:141
+#: src/net/ea/generalhandler.cpp:134
msgid "Duplicated login"
msgstr ""
-#: src/net/ea/generalhandler.cpp:144
+#: src/net/ea/generalhandler.cpp:137
msgid "Unknown connection error"
msgstr ""
-#: src/net/ea/generalhandler.cpp:201
+#: src/net/ea/generalhandler.cpp:194
msgid "Got disconnected from server!"
msgstr "Kopplades från servern!"
-#: src/net/ea/gui/partytab.cpp:52
+#: src/net/ea/gui/partytab.cpp:55
msgid "/help > Display this help."
msgstr "/help > Visa den här hjälpen"
-#: src/net/ea/gui/partytab.cpp:53
+#: src/net/ea/gui/partytab.cpp:56
msgid "/create > Create a new party"
msgstr "/create > Skapa ny grupp"
-#: src/net/ea/gui/partytab.cpp:54
+#: src/net/ea/gui/partytab.cpp:57
msgid "/new > Alias of create"
msgstr "/new > Alias för /create"
-#: src/net/ea/gui/partytab.cpp:55
+#: src/net/ea/gui/partytab.cpp:58
msgid "/invite > Invite a player to your party"
msgstr "/invite > Bjud in en spelare till din grupp"
-#: src/net/ea/gui/partytab.cpp:56
+#: src/net/ea/gui/partytab.cpp:59
msgid "/leave > Leave the party you are in"
msgstr "/leave > Lämna gruppen du är i"
-#: src/net/ea/gui/partytab.cpp:57
+#: src/net/ea/gui/partytab.cpp:60
msgid "/kick > Kick some one from the party you are in"
msgstr "/kick > Sparka ut någon från din grupp"
-#: src/net/ea/gui/partytab.cpp:58
+#: src/net/ea/gui/partytab.cpp:61
msgid "/item > Show/change party item sharing options"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:59
+#: src/net/ea/gui/partytab.cpp:62
msgid "/exp > Show/change party experience sharing options"
msgstr "/exp > Visa/ändra hur erfarenhet fördelas i gruppen"
-#: src/net/ea/gui/partytab.cpp:68
+#: src/net/ea/gui/partytab.cpp:71
msgid "Command: /new <party-name>"
msgstr "Kommando: /new <grupp>"
-#: src/net/ea/gui/partytab.cpp:69
+#: src/net/ea/gui/partytab.cpp:72
msgid "Command: /create <party-name>"
msgstr "Kommando: /create <grupp>"
-#: src/net/ea/gui/partytab.cpp:70
+#: src/net/ea/gui/partytab.cpp:73
msgid "These commands create a new party called <party-name>."
msgstr "Dessa kommandon skapar <grupp>."
-#: src/net/ea/gui/partytab.cpp:74
+#: src/net/ea/gui/partytab.cpp:77
msgid "Command: /invite <nick>"
msgstr "Kommando: /invite <spelare>"
-#: src/net/ea/gui/partytab.cpp:81
+#: src/net/ea/gui/partytab.cpp:84
msgid "Command: /leave"
msgstr "Kommando: /leave"
-#: src/net/ea/gui/partytab.cpp:82
+#: src/net/ea/gui/partytab.cpp:85
msgid "This command causes the player to leave the party."
msgstr "Det här kommandot får spelaren att lämna gruppen."
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/ea/gui/partytab.cpp:89
msgid "Command: /item <policy>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:87
+#: src/net/ea/gui/partytab.cpp:90
msgid "This command changes the party's item sharing policy."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:88
+#: src/net/ea/gui/partytab.cpp:91
msgid ""
"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
"\"0\", \"no\", \"false\" to disable item sharing."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:94
msgid "Command: /item"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:92
+#: src/net/ea/gui/partytab.cpp:95
msgid "This command displays the party's current item sharing policy."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:96
+#: src/net/ea/gui/partytab.cpp:99
msgid "Command: /exp <policy>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/ea/gui/partytab.cpp:100
msgid "This command changes the party's experience sharing policy."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:98
+#: src/net/ea/gui/partytab.cpp:101
msgid ""
"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:104
msgid "Command: /exp"
msgstr "Kommando: /exp"
-#: src/net/ea/gui/partytab.cpp:102
+#: src/net/ea/gui/partytab.cpp:105
msgid "This command displays the party's current experience sharing policy."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:110
+#: src/net/ea/gui/partytab.cpp:113
msgid "Party name is missing."
msgstr "Du måste ange gruppens namn."
-#: src/net/ea/gui/partytab.cpp:133 src/net/ea/partyhandler.cpp:191
+#: src/net/ea/gui/partytab.cpp:136 src/net/ea/partyhandler.cpp:194
msgid "Item sharing enabled."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:136 src/net/ea/partyhandler.cpp:197
+#: src/net/ea/gui/partytab.cpp:139 src/net/ea/partyhandler.cpp:200
msgid "Item sharing disabled."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:139 src/net/ea/partyhandler.cpp:203
+#: src/net/ea/gui/partytab.cpp:142 src/net/ea/partyhandler.cpp:206
msgid "Item sharing not possible."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:165 src/net/ea/partyhandler.cpp:168
+#: src/net/ea/gui/partytab.cpp:168 src/net/ea/partyhandler.cpp:171
msgid "Experience sharing enabled."
msgstr "Fördelning av erfarenhet aktiverad."
-#: src/net/ea/gui/partytab.cpp:168 src/net/ea/partyhandler.cpp:174
+#: src/net/ea/gui/partytab.cpp:171 src/net/ea/partyhandler.cpp:177
msgid "Experience sharing disabled."
msgstr "Fördelning av erfarenhet inaktiverad."
-#: src/net/ea/gui/partytab.cpp:171 src/net/ea/partyhandler.cpp:180
+#: src/net/ea/gui/partytab.cpp:174 src/net/ea/partyhandler.cpp:183
msgid "Experience sharing not possible."
msgstr "Fördelning av erfarenhet ej möjlig."
@@ -2558,45 +2531,45 @@ msgstr "Kunde inte skapa grupp."
msgid "Party successfully created."
msgstr "Grupp skapad."
-#: src/net/ea/partyhandler.cpp:115
+#: src/net/ea/partyhandler.cpp:118
#, c-format
msgid "%s is already a member of a party."
msgstr "%s är redan medlem i en grupp."
-#: src/net/ea/partyhandler.cpp:119
+#: src/net/ea/partyhandler.cpp:122
#, c-format
msgid "%s refused your invitation."
msgstr "%s avvisade din inbjudan."
-#: src/net/ea/partyhandler.cpp:123
+#: src/net/ea/partyhandler.cpp:126
#, c-format
msgid "%s is now a member of your party."
msgstr "%s är nu en medlem i din grupp."
-#: src/net/ea/partyhandler.cpp:127
+#: src/net/ea/partyhandler.cpp:130
#, c-format
msgid "Unknown invite response for %s."
msgstr ""
-#: src/net/ea/partyhandler.cpp:232
+#: src/net/ea/partyhandler.cpp:235
msgid "You have left the party."
msgstr "Du har lämnat gruppen."
-#: src/net/ea/partyhandler.cpp:235
+#: src/net/ea/partyhandler.cpp:239
#, c-format
msgid "%s has left your party."
msgstr "%s har lämnat din grupp."
-#: src/net/ea/partyhandler.cpp:272
+#: src/net/ea/partyhandler.cpp:274
#, c-format
msgid "An unknown member tried to say: %s"
msgstr "En okänd medlem försökte säga: %s"
-#: src/net/ea/partyhandler.cpp:298
+#: src/net/ea/partyhandler.cpp:300
msgid "Inviting like this isn't supported at the moment."
msgstr ""
-#: src/net/ea/partyhandler.cpp:327
+#: src/net/ea/partyhandler.cpp:329
#, c-format
msgid "%s is not in your party!"
msgstr "%s är inte med i din grupp!"
@@ -2895,10 +2868,10 @@ msgstr "Viljestyrka:"
msgid "Topic: "
msgstr "Ämne: "
-#: src/net/tmwserv/generalhandler.cpp:92
-#, c-format
-msgid "Willpower: %d"
-msgstr ""
+#: src/net/tmwserv/generalhandler.cpp:86
+#, fuzzy, c-format
+msgid "Willpower %+d"
+msgstr "Viljestyrka:"
#: src/net/tmwserv/loginhandler.cpp:80
msgid "Wrong magic_token"
@@ -3002,6 +2975,15 @@ msgstr ""
msgid "NPC Database: Error while loading npcs.xml!"
msgstr ""
+#~ msgid "Save player list"
+#~ msgstr "Kom ihåg spelarlista"
+
+#~ msgid "Scroll radius"
+#~ msgstr "Rullningsradie"
+
+#~ msgid "Scroll laziness"
+#~ msgstr "Tröghet för rullning"
+
#~ msgid "MiniMap"
#~ msgstr "Minikarta"
diff --git a/po/th.po b/po/th.po
index 4a723eea..10d32605 100644
--- a/po/th.po
+++ b/po/th.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: tmw\n"
"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-05-10 16:39+0200\n"
+"POT-Creation-Date: 2009-05-12 00:11+0200\n"
"PO-Revision-Date: 2009-01-09 12:37+0000\n"
"Last-Translator: Bjørn Lindeijer <bjorn@lindeijer.nl>\n"
"Language-Team: Thai <th@li.org>\n"
@@ -175,7 +175,7 @@ msgstr ""
#: src/commandhandler.cpp:216 src/commandhandler.cpp:230
#: src/gui/widgets/channeltab.cpp:81 src/gui/widgets/channeltab.cpp:90
-#: src/net/ea/gui/partytab.cpp:76
+#: src/net/ea/gui/partytab.cpp:79
msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
msgstr ""
@@ -195,7 +195,7 @@ msgstr ""
msgid "Command: /party <nick>"
msgstr ""
-#: src/commandhandler.cpp:229 src/net/ea/gui/partytab.cpp:75
+#: src/commandhandler.cpp:229 src/net/ea/gui/partytab.cpp:78
msgid "This command invites <nick> to party with you."
msgstr ""
@@ -508,7 +508,7 @@ msgstr "ตกลง"
msgid "Previous"
msgstr "ก่อนหน้า"
-#: src/gui/charselectdialog.cpp:113 src/gui/npcdialog.cpp:44
+#: src/gui/charselectdialog.cpp:113 src/gui/npcdialog.cpp:43
msgid "Next"
msgstr "ถัดไป"
@@ -533,7 +533,7 @@ msgstr "สร้างใหม่"
#: src/gui/charselectdialog.cpp:118 src/gui/charselectdialog.cpp:165
#: src/gui/charselectdialog.cpp:166 src/gui/charselectdialog.cpp:315
-#: src/gui/setup_players.cpp:230
+#: src/gui/setup_players.cpp:228
msgid "Delete"
msgstr "ลบทิ้ง"
@@ -568,19 +568,15 @@ msgstr ""
msgid "%d players are present."
msgstr ""
-#: src/gui/chat.cpp:348 src/gui/chat.cpp:354
+#: src/gui/chat.cpp:333
msgid "Present: "
msgstr ""
-#: src/gui/chat.cpp:348 src/gui/chat.cpp:354
-msgid "; "
-msgstr ""
-
-#: src/gui/chat.cpp:349
+#: src/gui/chat.cpp:350
msgid "Attendance written to record log."
msgstr ""
-#: src/gui/chat.cpp:474
+#: src/gui/chat.cpp:475
#, c-format
msgid "Whispering to %s: %s"
msgstr ""
@@ -630,7 +626,7 @@ msgstr ""
msgid "Help"
msgstr ""
-#: src/gui/help.cpp:47 src/gui/npcdialog.cpp:45 src/gui/storagewindow.cpp:68
+#: src/gui/help.cpp:47 src/gui/npcdialog.cpp:44 src/gui/storagewindow.cpp:68
msgid "Close"
msgstr ""
@@ -723,7 +719,7 @@ msgid "Register"
msgstr "สมัครสมาชิก"
#: src/gui/magic.cpp:32 src/gui/skilldialog.cpp:117 src/gui/windowmenu.cpp:64
-#: src/localplayer.cpp:845
+#: src/localplayer.cpp:848
msgid "Magic"
msgstr ""
@@ -739,32 +735,24 @@ msgstr ""
msgid "Cast Test Spell 3"
msgstr ""
-#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
+#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:86
msgid "Map"
msgstr ""
-#: src/gui/npcdialog.cpp:43
+#: src/gui/npcdialog.cpp:42
msgid "Waiting for server"
msgstr ""
-#: src/gui/npcdialog.cpp:46
+#: src/gui/npcdialog.cpp:45
#, fuzzy
msgid "Submit"
msgstr "ออก"
-#: src/gui/npcdialog.cpp:49 src/gui/npcpostdialog.cpp:39
+#: src/gui/npcdialog.cpp:48 src/gui/npcpostdialog.cpp:39
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:95
-msgid "+"
-msgstr ""
-
-#: src/gui/npcdialog.cpp:96
-msgid "-"
-msgstr ""
-
-#: src/gui/npcdialog.cpp:105
+#: src/gui/npcdialog.cpp:104
msgid "Reset"
msgstr ""
@@ -772,8 +760,7 @@ msgstr ""
msgid "Send"
msgstr ""
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:268
-#: src/gui/setup_video.cpp:567
+#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:142
msgid "Text"
msgstr ""
@@ -825,8 +812,8 @@ msgstr ""
msgid "Is"
msgstr ""
-#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:33
-#: src/net/ea/gui/partytab.cpp:37
+#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:45
+#: src/net/ea/gui/partytab.cpp:39
msgid "Party"
msgstr ""
@@ -1292,26 +1279,22 @@ msgid "???"
msgstr ""
#: src/gui/setup_players.cpp:224
-msgid "Save player list"
-msgstr ""
-
-#: src/gui/setup_players.cpp:226
msgid "Allow trading"
msgstr ""
-#: src/gui/setup_players.cpp:228
+#: src/gui/setup_players.cpp:226
msgid "Allow whispers"
msgstr ""
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:230
msgid "Put all whispers in tabs"
msgstr ""
-#: src/gui/setup_players.cpp:234
+#: src/gui/setup_players.cpp:232
msgid "Players"
msgstr ""
-#: src/gui/setup_players.cpp:259
+#: src/gui/setup_players.cpp:257
msgid "When ignoring:"
msgstr ""
@@ -1331,157 +1314,147 @@ msgstr ""
msgid "Large"
msgstr ""
-#: src/gui/setup_video.cpp:151
-msgid "Full screen"
-msgstr ""
-
-#: src/gui/setup_video.cpp:152
-msgid "OpenGL"
-msgstr ""
-
-#: src/gui/setup_video.cpp:153
-msgid "Custom cursor"
+#: src/gui/setup_video.cpp:141
+msgid "No text"
msgstr ""
-#: src/gui/setup_video.cpp:155
-msgid "Visible names"
+#: src/gui/setup_video.cpp:143
+msgid "Bubbles, no names"
msgstr ""
-#: src/gui/setup_video.cpp:157
-msgid "Particle effects"
+#: src/gui/setup_video.cpp:144
+msgid "Bubbles with names"
msgstr ""
-#: src/gui/setup_video.cpp:159
-msgid "Show name"
+#: src/gui/setup_video.cpp:153
+msgid "off"
msgstr ""
-#: src/gui/setup_video.cpp:160
-msgid "Show pickup notification"
+#: src/gui/setup_video.cpp:154 src/gui/setup_video.cpp:164
+msgid "low"
msgstr ""
-#: src/gui/setup_video.cpp:161
-msgid "in chat"
+#: src/gui/setup_video.cpp:155 src/gui/setup_video.cpp:166
+msgid "high"
msgstr ""
-#: src/gui/setup_video.cpp:162
-msgid "as particle"
+#: src/gui/setup_video.cpp:165
+msgid "medium"
msgstr ""
#: src/gui/setup_video.cpp:167
-msgid "FPS Limit:"
+msgid "max"
msgstr ""
-#: src/gui/setup_video.cpp:184
-msgid "Video"
+#: src/gui/setup_video.cpp:187
+msgid "Full screen"
msgstr ""
-#: src/gui/setup_video.cpp:189
-msgid "Overhead text"
+#: src/gui/setup_video.cpp:188
+msgid "OpenGL"
msgstr ""
-#: src/gui/setup_video.cpp:190
-msgid "Gui opacity"
+#: src/gui/setup_video.cpp:189
+msgid "Custom cursor"
msgstr ""
#: src/gui/setup_video.cpp:191
-msgid "Scroll radius"
+msgid "Visible names"
msgstr ""
-#: src/gui/setup_video.cpp:192
-msgid "Scroll laziness"
+#: src/gui/setup_video.cpp:193
+msgid "Particle effects"
msgstr ""
-#: src/gui/setup_video.cpp:193
-msgid "Ambient FX"
+#: src/gui/setup_video.cpp:195
+msgid "Show name"
msgstr ""
-#: src/gui/setup_video.cpp:194
-msgid "Particle Detail"
+#: src/gui/setup_video.cpp:196
+msgid "Show pickup notification"
msgstr ""
-#: src/gui/setup_video.cpp:195
-msgid "Font size"
+#: src/gui/setup_video.cpp:197
+msgid "in chat"
msgstr ""
-#: src/gui/setup_video.cpp:265 src/gui/setup_video.cpp:564
-msgid "No text"
+#: src/gui/setup_video.cpp:198
+msgid "as particle"
msgstr ""
-#: src/gui/setup_video.cpp:271 src/gui/setup_video.cpp:570
-msgid "Bubbles, no names"
+#: src/gui/setup_video.cpp:203
+msgid "FPS Limit:"
msgstr ""
-#: src/gui/setup_video.cpp:274 src/gui/setup_video.cpp:573
-msgid "Bubbles with names"
+#: src/gui/setup_video.cpp:214
+msgid "Video"
msgstr ""
-#: src/gui/setup_video.cpp:282 src/gui/setup_video.cpp:610
-msgid "off"
+#: src/gui/setup_video.cpp:219
+msgid "Overhead text"
msgstr ""
-#: src/gui/setup_video.cpp:285 src/gui/setup_video.cpp:296
-#: src/gui/setup_video.cpp:613 src/gui/setup_video.cpp:627
-msgid "low"
+#: src/gui/setup_video.cpp:220
+msgid "Gui opacity"
msgstr ""
-#: src/gui/setup_video.cpp:288 src/gui/setup_video.cpp:302
-#: src/gui/setup_video.cpp:616 src/gui/setup_video.cpp:633
-msgid "high"
+#: src/gui/setup_video.cpp:221
+msgid "Ambient FX"
msgstr ""
-#: src/gui/setup_video.cpp:299 src/gui/setup_video.cpp:630
-msgid "medium"
+#: src/gui/setup_video.cpp:222
+msgid "Particle Detail"
msgstr ""
-#: src/gui/setup_video.cpp:305 src/gui/setup_video.cpp:636
-msgid "max"
+#: src/gui/setup_video.cpp:223
+msgid "Font size"
msgstr ""
-#: src/gui/setup_video.cpp:410
+#: src/gui/setup_video.cpp:356
msgid "Failed to switch to "
msgstr ""
-#: src/gui/setup_video.cpp:411
+#: src/gui/setup_video.cpp:357
msgid "windowed"
msgstr ""
-#: src/gui/setup_video.cpp:411
+#: src/gui/setup_video.cpp:357
msgid "fullscreen"
msgstr ""
-#: src/gui/setup_video.cpp:412
+#: src/gui/setup_video.cpp:358
msgid "mode and restoration of old mode also failed!"
msgstr ""
-#: src/gui/setup_video.cpp:421
+#: src/gui/setup_video.cpp:367
msgid "Switching to full screen"
msgstr ""
-#: src/gui/setup_video.cpp:422
+#: src/gui/setup_video.cpp:368
msgid "Restart needed for changes to take effect."
msgstr ""
-#: src/gui/setup_video.cpp:434
+#: src/gui/setup_video.cpp:380
msgid "Changing OpenGL"
msgstr ""
-#: src/gui/setup_video.cpp:435
+#: src/gui/setup_video.cpp:381
msgid "Applying change to OpenGL requires restart."
msgstr ""
-#: src/gui/setup_video.cpp:520
+#: src/gui/setup_video.cpp:442
msgid "Screen resolution changed"
msgstr ""
-#: src/gui/setup_video.cpp:521
+#: src/gui/setup_video.cpp:443
msgid "Restart your client for the change to take effect."
msgstr ""
-#: src/gui/setup_video.cpp:545
+#: src/gui/setup_video.cpp:467
msgid "Particle effect settings changed."
msgstr ""
-#: src/gui/setup_video.cpp:546
+#: src/gui/setup_video.cpp:468
msgid "Changes will take effect on map change."
msgstr ""
@@ -2002,55 +1975,55 @@ msgstr ""
msgid "Ignore input 2"
msgstr ""
-#: src/localplayer.cpp:834
+#: src/localplayer.cpp:837
msgid "Unarmed"
msgstr ""
-#: src/localplayer.cpp:835
+#: src/localplayer.cpp:838
msgid "Knife"
msgstr ""
-#: src/localplayer.cpp:836
+#: src/localplayer.cpp:839
msgid "Sword"
msgstr ""
-#: src/localplayer.cpp:837
+#: src/localplayer.cpp:840
msgid "Polearm"
msgstr ""
-#: src/localplayer.cpp:838
+#: src/localplayer.cpp:841
msgid "Staff"
msgstr ""
-#: src/localplayer.cpp:839
+#: src/localplayer.cpp:842
msgid "Whip"
msgstr ""
-#: src/localplayer.cpp:840
+#: src/localplayer.cpp:843
msgid "Bow"
msgstr ""
-#: src/localplayer.cpp:841
+#: src/localplayer.cpp:844
msgid "Shooting"
msgstr ""
-#: src/localplayer.cpp:842
+#: src/localplayer.cpp:845
msgid "Mace"
msgstr ""
-#: src/localplayer.cpp:843
+#: src/localplayer.cpp:846
msgid "Axe"
msgstr ""
-#: src/localplayer.cpp:844
+#: src/localplayer.cpp:847
msgid "Thrown"
msgstr ""
-#: src/localplayer.cpp:846
+#: src/localplayer.cpp:849
msgid "Craft"
msgstr ""
-#: src/localplayer.cpp:847
+#: src/localplayer.cpp:850
msgid "Unknown Skill"
msgstr ""
@@ -2262,193 +2235,193 @@ msgstr ""
msgid "Unable to unequip."
msgstr ""
-#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:82
-#, c-format
-msgid "Strength: %d"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:81
+#, fuzzy, c-format
+msgid "Strength %+d"
+msgstr "Strength:"
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:84
-#, c-format
-msgid "Agility: %d"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:82
+#, fuzzy, c-format
+msgid "Agility %+d"
+msgstr "Agility:"
-#: src/net/ea/generalhandler.cpp:96 src/net/tmwserv/generalhandler.cpp:88
-#, c-format
-msgid "Vitality: %d"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:84
+#, fuzzy, c-format
+msgid "Vitality %+d"
+msgstr "Vitality:"
-#: src/net/ea/generalhandler.cpp:98 src/net/tmwserv/generalhandler.cpp:90
-#, c-format
-msgid "Intelligence: %d"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:85
+#, fuzzy, c-format
+msgid "Intelligence %+d"
+msgstr "Intelligence:"
-#: src/net/ea/generalhandler.cpp:100 src/net/tmwserv/generalhandler.cpp:86
-#, c-format
-msgid "Dexterity: %d"
-msgstr ""
+#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:83
+#, fuzzy, c-format
+msgid "Dexterity %+d"
+msgstr "Dexterity:"
-#: src/net/ea/generalhandler.cpp:102
+#: src/net/ea/generalhandler.cpp:96
#, c-format
-msgid "Luck: %d"
+msgid "Luck %+d"
msgstr ""
-#: src/net/ea/generalhandler.cpp:125
+#: src/net/ea/generalhandler.cpp:118
msgid "Authentication failed"
msgstr ""
-#: src/net/ea/generalhandler.cpp:128
+#: src/net/ea/generalhandler.cpp:121
msgid "No servers available"
msgstr ""
-#: src/net/ea/generalhandler.cpp:132
+#: src/net/ea/generalhandler.cpp:125
msgid "Someone else is trying to use this account"
msgstr ""
-#: src/net/ea/generalhandler.cpp:135
+#: src/net/ea/generalhandler.cpp:128
msgid "This account is already logged in"
msgstr ""
-#: src/net/ea/generalhandler.cpp:138
+#: src/net/ea/generalhandler.cpp:131
msgid "Speed hack detected"
msgstr ""
-#: src/net/ea/generalhandler.cpp:141
+#: src/net/ea/generalhandler.cpp:134
msgid "Duplicated login"
msgstr ""
-#: src/net/ea/generalhandler.cpp:144
+#: src/net/ea/generalhandler.cpp:137
msgid "Unknown connection error"
msgstr ""
-#: src/net/ea/generalhandler.cpp:201
+#: src/net/ea/generalhandler.cpp:194
msgid "Got disconnected from server!"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:52
+#: src/net/ea/gui/partytab.cpp:55
msgid "/help > Display this help."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:53
+#: src/net/ea/gui/partytab.cpp:56
msgid "/create > Create a new party"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:54
+#: src/net/ea/gui/partytab.cpp:57
msgid "/new > Alias of create"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:55
+#: src/net/ea/gui/partytab.cpp:58
msgid "/invite > Invite a player to your party"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:56
+#: src/net/ea/gui/partytab.cpp:59
msgid "/leave > Leave the party you are in"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:57
+#: src/net/ea/gui/partytab.cpp:60
msgid "/kick > Kick some one from the party you are in"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:58
+#: src/net/ea/gui/partytab.cpp:61
msgid "/item > Show/change party item sharing options"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:59
+#: src/net/ea/gui/partytab.cpp:62
msgid "/exp > Show/change party experience sharing options"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:68
+#: src/net/ea/gui/partytab.cpp:71
msgid "Command: /new <party-name>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:69
+#: src/net/ea/gui/partytab.cpp:72
msgid "Command: /create <party-name>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:70
+#: src/net/ea/gui/partytab.cpp:73
msgid "These commands create a new party called <party-name>."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:74
+#: src/net/ea/gui/partytab.cpp:77
msgid "Command: /invite <nick>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:81
+#: src/net/ea/gui/partytab.cpp:84
msgid "Command: /leave"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:82
+#: src/net/ea/gui/partytab.cpp:85
msgid "This command causes the player to leave the party."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/ea/gui/partytab.cpp:89
msgid "Command: /item <policy>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:87
+#: src/net/ea/gui/partytab.cpp:90
msgid "This command changes the party's item sharing policy."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:88
+#: src/net/ea/gui/partytab.cpp:91
msgid ""
"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
"\"0\", \"no\", \"false\" to disable item sharing."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:94
msgid "Command: /item"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:92
+#: src/net/ea/gui/partytab.cpp:95
msgid "This command displays the party's current item sharing policy."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:96
+#: src/net/ea/gui/partytab.cpp:99
msgid "Command: /exp <policy>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/ea/gui/partytab.cpp:100
msgid "This command changes the party's experience sharing policy."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:98
+#: src/net/ea/gui/partytab.cpp:101
msgid ""
"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:104
msgid "Command: /exp"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:102
+#: src/net/ea/gui/partytab.cpp:105
msgid "This command displays the party's current experience sharing policy."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:110
+#: src/net/ea/gui/partytab.cpp:113
msgid "Party name is missing."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:133 src/net/ea/partyhandler.cpp:191
+#: src/net/ea/gui/partytab.cpp:136 src/net/ea/partyhandler.cpp:194
msgid "Item sharing enabled."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:136 src/net/ea/partyhandler.cpp:197
+#: src/net/ea/gui/partytab.cpp:139 src/net/ea/partyhandler.cpp:200
msgid "Item sharing disabled."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:139 src/net/ea/partyhandler.cpp:203
+#: src/net/ea/gui/partytab.cpp:142 src/net/ea/partyhandler.cpp:206
msgid "Item sharing not possible."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:165 src/net/ea/partyhandler.cpp:168
+#: src/net/ea/gui/partytab.cpp:168 src/net/ea/partyhandler.cpp:171
msgid "Experience sharing enabled."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:168 src/net/ea/partyhandler.cpp:174
+#: src/net/ea/gui/partytab.cpp:171 src/net/ea/partyhandler.cpp:177
msgid "Experience sharing disabled."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:171 src/net/ea/partyhandler.cpp:180
+#: src/net/ea/gui/partytab.cpp:174 src/net/ea/partyhandler.cpp:183
msgid "Experience sharing not possible."
msgstr ""
@@ -2511,45 +2484,45 @@ msgstr ""
msgid "Party successfully created."
msgstr ""
-#: src/net/ea/partyhandler.cpp:115
+#: src/net/ea/partyhandler.cpp:118
#, c-format
msgid "%s is already a member of a party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:119
+#: src/net/ea/partyhandler.cpp:122
#, c-format
msgid "%s refused your invitation."
msgstr ""
-#: src/net/ea/partyhandler.cpp:123
+#: src/net/ea/partyhandler.cpp:126
#, c-format
msgid "%s is now a member of your party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:127
+#: src/net/ea/partyhandler.cpp:130
#, c-format
msgid "Unknown invite response for %s."
msgstr ""
-#: src/net/ea/partyhandler.cpp:232
+#: src/net/ea/partyhandler.cpp:235
msgid "You have left the party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:235
+#: src/net/ea/partyhandler.cpp:239
#, c-format
msgid "%s has left your party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:272
+#: src/net/ea/partyhandler.cpp:274
#, c-format
msgid "An unknown member tried to say: %s"
msgstr ""
-#: src/net/ea/partyhandler.cpp:298
+#: src/net/ea/partyhandler.cpp:300
msgid "Inviting like this isn't supported at the moment."
msgstr ""
-#: src/net/ea/partyhandler.cpp:327
+#: src/net/ea/partyhandler.cpp:329
#, c-format
msgid "%s is not in your party!"
msgstr ""
@@ -2842,10 +2815,10 @@ msgstr "Willpower:"
msgid "Topic: "
msgstr ""
-#: src/net/tmwserv/generalhandler.cpp:92
-#, c-format
-msgid "Willpower: %d"
-msgstr ""
+#: src/net/tmwserv/generalhandler.cpp:86
+#, fuzzy, c-format
+msgid "Willpower %+d"
+msgstr "Willpower:"
#: src/net/tmwserv/loginhandler.cpp:80
msgid "Wrong magic_token"
diff --git a/po/tmw.pot b/po/tmw.pot
index 4110526b..41b215cc 100644
--- a/po/tmw.pot
+++ b/po/tmw.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-05-10 16:39+0200\n"
+"POT-Creation-Date: 2009-05-12 00:11+0200\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"
@@ -174,7 +174,7 @@ msgstr ""
#: src/commandhandler.cpp:216 src/commandhandler.cpp:230
#: src/gui/widgets/channeltab.cpp:81 src/gui/widgets/channeltab.cpp:90
-#: src/net/ea/gui/partytab.cpp:76
+#: src/net/ea/gui/partytab.cpp:79
msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
msgstr ""
@@ -194,7 +194,7 @@ msgstr ""
msgid "Command: /party <nick>"
msgstr ""
-#: src/commandhandler.cpp:229 src/net/ea/gui/partytab.cpp:75
+#: src/commandhandler.cpp:229 src/net/ea/gui/partytab.cpp:78
msgid "This command invites <nick> to party with you."
msgstr ""
@@ -507,7 +507,7 @@ msgstr ""
msgid "Previous"
msgstr ""
-#: src/gui/charselectdialog.cpp:113 src/gui/npcdialog.cpp:44
+#: src/gui/charselectdialog.cpp:113 src/gui/npcdialog.cpp:43
msgid "Next"
msgstr ""
@@ -532,7 +532,7 @@ msgstr ""
#: src/gui/charselectdialog.cpp:118 src/gui/charselectdialog.cpp:165
#: src/gui/charselectdialog.cpp:166 src/gui/charselectdialog.cpp:315
-#: src/gui/setup_players.cpp:230
+#: src/gui/setup_players.cpp:228
msgid "Delete"
msgstr ""
@@ -567,19 +567,15 @@ msgstr ""
msgid "%d players are present."
msgstr ""
-#: src/gui/chat.cpp:348 src/gui/chat.cpp:354
+#: src/gui/chat.cpp:333
msgid "Present: "
msgstr ""
-#: src/gui/chat.cpp:348 src/gui/chat.cpp:354
-msgid "; "
-msgstr ""
-
-#: src/gui/chat.cpp:349
+#: src/gui/chat.cpp:350
msgid "Attendance written to record log."
msgstr ""
-#: src/gui/chat.cpp:474
+#: src/gui/chat.cpp:475
#, c-format
msgid "Whispering to %s: %s"
msgstr ""
@@ -629,7 +625,7 @@ msgstr ""
msgid "Help"
msgstr ""
-#: src/gui/help.cpp:47 src/gui/npcdialog.cpp:45 src/gui/storagewindow.cpp:68
+#: src/gui/help.cpp:47 src/gui/npcdialog.cpp:44 src/gui/storagewindow.cpp:68
msgid "Close"
msgstr ""
@@ -722,7 +718,7 @@ msgid "Register"
msgstr ""
#: src/gui/magic.cpp:32 src/gui/skilldialog.cpp:117 src/gui/windowmenu.cpp:64
-#: src/localplayer.cpp:845
+#: src/localplayer.cpp:848
msgid "Magic"
msgstr ""
@@ -738,31 +734,23 @@ msgstr ""
msgid "Cast Test Spell 3"
msgstr ""
-#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
+#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:86
msgid "Map"
msgstr ""
-#: src/gui/npcdialog.cpp:43
+#: src/gui/npcdialog.cpp:42
msgid "Waiting for server"
msgstr ""
-#: src/gui/npcdialog.cpp:46
+#: src/gui/npcdialog.cpp:45
msgid "Submit"
msgstr ""
-#: src/gui/npcdialog.cpp:49 src/gui/npcpostdialog.cpp:39
+#: src/gui/npcdialog.cpp:48 src/gui/npcpostdialog.cpp:39
msgid "NPC"
msgstr ""
-#: src/gui/npcdialog.cpp:95
-msgid "+"
-msgstr ""
-
-#: src/gui/npcdialog.cpp:96
-msgid "-"
-msgstr ""
-
-#: src/gui/npcdialog.cpp:105
+#: src/gui/npcdialog.cpp:104
msgid "Reset"
msgstr ""
@@ -770,8 +758,7 @@ msgstr ""
msgid "Send"
msgstr ""
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:268
-#: src/gui/setup_video.cpp:567
+#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:142
msgid "Text"
msgstr ""
@@ -823,8 +810,8 @@ msgstr ""
msgid "Is"
msgstr ""
-#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:33
-#: src/net/ea/gui/partytab.cpp:37
+#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:45
+#: src/net/ea/gui/partytab.cpp:39
msgid "Party"
msgstr ""
@@ -1288,26 +1275,22 @@ msgid "???"
msgstr ""
#: src/gui/setup_players.cpp:224
-msgid "Save player list"
-msgstr ""
-
-#: src/gui/setup_players.cpp:226
msgid "Allow trading"
msgstr ""
-#: src/gui/setup_players.cpp:228
+#: src/gui/setup_players.cpp:226
msgid "Allow whispers"
msgstr ""
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:230
msgid "Put all whispers in tabs"
msgstr ""
-#: src/gui/setup_players.cpp:234
+#: src/gui/setup_players.cpp:232
msgid "Players"
msgstr ""
-#: src/gui/setup_players.cpp:259
+#: src/gui/setup_players.cpp:257
msgid "When ignoring:"
msgstr ""
@@ -1327,157 +1310,147 @@ msgstr ""
msgid "Large"
msgstr ""
-#: src/gui/setup_video.cpp:151
-msgid "Full screen"
-msgstr ""
-
-#: src/gui/setup_video.cpp:152
-msgid "OpenGL"
-msgstr ""
-
-#: src/gui/setup_video.cpp:153
-msgid "Custom cursor"
+#: src/gui/setup_video.cpp:141
+msgid "No text"
msgstr ""
-#: src/gui/setup_video.cpp:155
-msgid "Visible names"
+#: src/gui/setup_video.cpp:143
+msgid "Bubbles, no names"
msgstr ""
-#: src/gui/setup_video.cpp:157
-msgid "Particle effects"
+#: src/gui/setup_video.cpp:144
+msgid "Bubbles with names"
msgstr ""
-#: src/gui/setup_video.cpp:159
-msgid "Show name"
+#: src/gui/setup_video.cpp:153
+msgid "off"
msgstr ""
-#: src/gui/setup_video.cpp:160
-msgid "Show pickup notification"
+#: src/gui/setup_video.cpp:154 src/gui/setup_video.cpp:164
+msgid "low"
msgstr ""
-#: src/gui/setup_video.cpp:161
-msgid "in chat"
+#: src/gui/setup_video.cpp:155 src/gui/setup_video.cpp:166
+msgid "high"
msgstr ""
-#: src/gui/setup_video.cpp:162
-msgid "as particle"
+#: src/gui/setup_video.cpp:165
+msgid "medium"
msgstr ""
#: src/gui/setup_video.cpp:167
-msgid "FPS Limit:"
+msgid "max"
msgstr ""
-#: src/gui/setup_video.cpp:184
-msgid "Video"
+#: src/gui/setup_video.cpp:187
+msgid "Full screen"
msgstr ""
-#: src/gui/setup_video.cpp:189
-msgid "Overhead text"
+#: src/gui/setup_video.cpp:188
+msgid "OpenGL"
msgstr ""
-#: src/gui/setup_video.cpp:190
-msgid "Gui opacity"
+#: src/gui/setup_video.cpp:189
+msgid "Custom cursor"
msgstr ""
#: src/gui/setup_video.cpp:191
-msgid "Scroll radius"
+msgid "Visible names"
msgstr ""
-#: src/gui/setup_video.cpp:192
-msgid "Scroll laziness"
+#: src/gui/setup_video.cpp:193
+msgid "Particle effects"
msgstr ""
-#: src/gui/setup_video.cpp:193
-msgid "Ambient FX"
+#: src/gui/setup_video.cpp:195
+msgid "Show name"
msgstr ""
-#: src/gui/setup_video.cpp:194
-msgid "Particle Detail"
+#: src/gui/setup_video.cpp:196
+msgid "Show pickup notification"
msgstr ""
-#: src/gui/setup_video.cpp:195
-msgid "Font size"
+#: src/gui/setup_video.cpp:197
+msgid "in chat"
msgstr ""
-#: src/gui/setup_video.cpp:265 src/gui/setup_video.cpp:564
-msgid "No text"
+#: src/gui/setup_video.cpp:198
+msgid "as particle"
msgstr ""
-#: src/gui/setup_video.cpp:271 src/gui/setup_video.cpp:570
-msgid "Bubbles, no names"
+#: src/gui/setup_video.cpp:203
+msgid "FPS Limit:"
msgstr ""
-#: src/gui/setup_video.cpp:274 src/gui/setup_video.cpp:573
-msgid "Bubbles with names"
+#: src/gui/setup_video.cpp:214
+msgid "Video"
msgstr ""
-#: src/gui/setup_video.cpp:282 src/gui/setup_video.cpp:610
-msgid "off"
+#: src/gui/setup_video.cpp:219
+msgid "Overhead text"
msgstr ""
-#: src/gui/setup_video.cpp:285 src/gui/setup_video.cpp:296
-#: src/gui/setup_video.cpp:613 src/gui/setup_video.cpp:627
-msgid "low"
+#: src/gui/setup_video.cpp:220
+msgid "Gui opacity"
msgstr ""
-#: src/gui/setup_video.cpp:288 src/gui/setup_video.cpp:302
-#: src/gui/setup_video.cpp:616 src/gui/setup_video.cpp:633
-msgid "high"
+#: src/gui/setup_video.cpp:221
+msgid "Ambient FX"
msgstr ""
-#: src/gui/setup_video.cpp:299 src/gui/setup_video.cpp:630
-msgid "medium"
+#: src/gui/setup_video.cpp:222
+msgid "Particle Detail"
msgstr ""
-#: src/gui/setup_video.cpp:305 src/gui/setup_video.cpp:636
-msgid "max"
+#: src/gui/setup_video.cpp:223
+msgid "Font size"
msgstr ""
-#: src/gui/setup_video.cpp:410
+#: src/gui/setup_video.cpp:356
msgid "Failed to switch to "
msgstr ""
-#: src/gui/setup_video.cpp:411
+#: src/gui/setup_video.cpp:357
msgid "windowed"
msgstr ""
-#: src/gui/setup_video.cpp:411
+#: src/gui/setup_video.cpp:357
msgid "fullscreen"
msgstr ""
-#: src/gui/setup_video.cpp:412
+#: src/gui/setup_video.cpp:358
msgid "mode and restoration of old mode also failed!"
msgstr ""
-#: src/gui/setup_video.cpp:421
+#: src/gui/setup_video.cpp:367
msgid "Switching to full screen"
msgstr ""
-#: src/gui/setup_video.cpp:422
+#: src/gui/setup_video.cpp:368
msgid "Restart needed for changes to take effect."
msgstr ""
-#: src/gui/setup_video.cpp:434
+#: src/gui/setup_video.cpp:380
msgid "Changing OpenGL"
msgstr ""
-#: src/gui/setup_video.cpp:435
+#: src/gui/setup_video.cpp:381
msgid "Applying change to OpenGL requires restart."
msgstr ""
-#: src/gui/setup_video.cpp:520
+#: src/gui/setup_video.cpp:442
msgid "Screen resolution changed"
msgstr ""
-#: src/gui/setup_video.cpp:521
+#: src/gui/setup_video.cpp:443
msgid "Restart your client for the change to take effect."
msgstr ""
-#: src/gui/setup_video.cpp:545
+#: src/gui/setup_video.cpp:467
msgid "Particle effect settings changed."
msgstr ""
-#: src/gui/setup_video.cpp:546
+#: src/gui/setup_video.cpp:468
msgid "Changes will take effect on map change."
msgstr ""
@@ -1998,55 +1971,55 @@ msgstr ""
msgid "Ignore input 2"
msgstr ""
-#: src/localplayer.cpp:834
+#: src/localplayer.cpp:837
msgid "Unarmed"
msgstr ""
-#: src/localplayer.cpp:835
+#: src/localplayer.cpp:838
msgid "Knife"
msgstr ""
-#: src/localplayer.cpp:836
+#: src/localplayer.cpp:839
msgid "Sword"
msgstr ""
-#: src/localplayer.cpp:837
+#: src/localplayer.cpp:840
msgid "Polearm"
msgstr ""
-#: src/localplayer.cpp:838
+#: src/localplayer.cpp:841
msgid "Staff"
msgstr ""
-#: src/localplayer.cpp:839
+#: src/localplayer.cpp:842
msgid "Whip"
msgstr ""
-#: src/localplayer.cpp:840
+#: src/localplayer.cpp:843
msgid "Bow"
msgstr ""
-#: src/localplayer.cpp:841
+#: src/localplayer.cpp:844
msgid "Shooting"
msgstr ""
-#: src/localplayer.cpp:842
+#: src/localplayer.cpp:845
msgid "Mace"
msgstr ""
-#: src/localplayer.cpp:843
+#: src/localplayer.cpp:846
msgid "Axe"
msgstr ""
-#: src/localplayer.cpp:844
+#: src/localplayer.cpp:847
msgid "Thrown"
msgstr ""
-#: src/localplayer.cpp:846
+#: src/localplayer.cpp:849
msgid "Craft"
msgstr ""
-#: src/localplayer.cpp:847
+#: src/localplayer.cpp:850
msgid "Unknown Skill"
msgstr ""
@@ -2258,193 +2231,193 @@ msgstr ""
msgid "Unable to unequip."
msgstr ""
-#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:82
+#: src/net/ea/generalhandler.cpp:91 src/net/tmwserv/generalhandler.cpp:81
#, c-format
-msgid "Strength: %d"
+msgid "Strength %+d"
msgstr ""
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:82
#, c-format
-msgid "Agility: %d"
+msgid "Agility %+d"
msgstr ""
-#: src/net/ea/generalhandler.cpp:96 src/net/tmwserv/generalhandler.cpp:88
+#: src/net/ea/generalhandler.cpp:93 src/net/tmwserv/generalhandler.cpp:84
#, c-format
-msgid "Vitality: %d"
+msgid "Vitality %+d"
msgstr ""
-#: src/net/ea/generalhandler.cpp:98 src/net/tmwserv/generalhandler.cpp:90
+#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:85
#, c-format
-msgid "Intelligence: %d"
+msgid "Intelligence %+d"
msgstr ""
-#: src/net/ea/generalhandler.cpp:100 src/net/tmwserv/generalhandler.cpp:86
+#: src/net/ea/generalhandler.cpp:95 src/net/tmwserv/generalhandler.cpp:83
#, c-format
-msgid "Dexterity: %d"
+msgid "Dexterity %+d"
msgstr ""
-#: src/net/ea/generalhandler.cpp:102
+#: src/net/ea/generalhandler.cpp:96
#, c-format
-msgid "Luck: %d"
+msgid "Luck %+d"
msgstr ""
-#: src/net/ea/generalhandler.cpp:125
+#: src/net/ea/generalhandler.cpp:118
msgid "Authentication failed"
msgstr ""
-#: src/net/ea/generalhandler.cpp:128
+#: src/net/ea/generalhandler.cpp:121
msgid "No servers available"
msgstr ""
-#: src/net/ea/generalhandler.cpp:132
+#: src/net/ea/generalhandler.cpp:125
msgid "Someone else is trying to use this account"
msgstr ""
-#: src/net/ea/generalhandler.cpp:135
+#: src/net/ea/generalhandler.cpp:128
msgid "This account is already logged in"
msgstr ""
-#: src/net/ea/generalhandler.cpp:138
+#: src/net/ea/generalhandler.cpp:131
msgid "Speed hack detected"
msgstr ""
-#: src/net/ea/generalhandler.cpp:141
+#: src/net/ea/generalhandler.cpp:134
msgid "Duplicated login"
msgstr ""
-#: src/net/ea/generalhandler.cpp:144
+#: src/net/ea/generalhandler.cpp:137
msgid "Unknown connection error"
msgstr ""
-#: src/net/ea/generalhandler.cpp:201
+#: src/net/ea/generalhandler.cpp:194
msgid "Got disconnected from server!"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:52
+#: src/net/ea/gui/partytab.cpp:55
msgid "/help > Display this help."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:53
+#: src/net/ea/gui/partytab.cpp:56
msgid "/create > Create a new party"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:54
+#: src/net/ea/gui/partytab.cpp:57
msgid "/new > Alias of create"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:55
+#: src/net/ea/gui/partytab.cpp:58
msgid "/invite > Invite a player to your party"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:56
+#: src/net/ea/gui/partytab.cpp:59
msgid "/leave > Leave the party you are in"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:57
+#: src/net/ea/gui/partytab.cpp:60
msgid "/kick > Kick some one from the party you are in"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:58
+#: src/net/ea/gui/partytab.cpp:61
msgid "/item > Show/change party item sharing options"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:59
+#: src/net/ea/gui/partytab.cpp:62
msgid "/exp > Show/change party experience sharing options"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:68
+#: src/net/ea/gui/partytab.cpp:71
msgid "Command: /new <party-name>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:69
+#: src/net/ea/gui/partytab.cpp:72
msgid "Command: /create <party-name>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:70
+#: src/net/ea/gui/partytab.cpp:73
msgid "These commands create a new party called <party-name>."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:74
+#: src/net/ea/gui/partytab.cpp:77
msgid "Command: /invite <nick>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:81
+#: src/net/ea/gui/partytab.cpp:84
msgid "Command: /leave"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:82
+#: src/net/ea/gui/partytab.cpp:85
msgid "This command causes the player to leave the party."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:86
+#: src/net/ea/gui/partytab.cpp:89
msgid "Command: /item <policy>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:87
+#: src/net/ea/gui/partytab.cpp:90
msgid "This command changes the party's item sharing policy."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:88
+#: src/net/ea/gui/partytab.cpp:91
msgid ""
"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
"\"0\", \"no\", \"false\" to disable item sharing."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:94
msgid "Command: /item"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:92
+#: src/net/ea/gui/partytab.cpp:95
msgid "This command displays the party's current item sharing policy."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:96
+#: src/net/ea/gui/partytab.cpp:99
msgid "Command: /exp <policy>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/ea/gui/partytab.cpp:100
msgid "This command changes the party's experience sharing policy."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:98
+#: src/net/ea/gui/partytab.cpp:101
msgid ""
"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:104
msgid "Command: /exp"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:102
+#: src/net/ea/gui/partytab.cpp:105
msgid "This command displays the party's current experience sharing policy."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:110
+#: src/net/ea/gui/partytab.cpp:113
msgid "Party name is missing."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:133 src/net/ea/partyhandler.cpp:191
+#: src/net/ea/gui/partytab.cpp:136 src/net/ea/partyhandler.cpp:194
msgid "Item sharing enabled."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:136 src/net/ea/partyhandler.cpp:197
+#: src/net/ea/gui/partytab.cpp:139 src/net/ea/partyhandler.cpp:200
msgid "Item sharing disabled."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:139 src/net/ea/partyhandler.cpp:203
+#: src/net/ea/gui/partytab.cpp:142 src/net/ea/partyhandler.cpp:206
msgid "Item sharing not possible."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:165 src/net/ea/partyhandler.cpp:168
+#: src/net/ea/gui/partytab.cpp:168 src/net/ea/partyhandler.cpp:171
msgid "Experience sharing enabled."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:168 src/net/ea/partyhandler.cpp:174
+#: src/net/ea/gui/partytab.cpp:171 src/net/ea/partyhandler.cpp:177
msgid "Experience sharing disabled."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:171 src/net/ea/partyhandler.cpp:180
+#: src/net/ea/gui/partytab.cpp:174 src/net/ea/partyhandler.cpp:183
msgid "Experience sharing not possible."
msgstr ""
@@ -2507,45 +2480,45 @@ msgstr ""
msgid "Party successfully created."
msgstr ""
-#: src/net/ea/partyhandler.cpp:115
+#: src/net/ea/partyhandler.cpp:118
#, c-format
msgid "%s is already a member of a party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:119
+#: src/net/ea/partyhandler.cpp:122
#, c-format
msgid "%s refused your invitation."
msgstr ""
-#: src/net/ea/partyhandler.cpp:123
+#: src/net/ea/partyhandler.cpp:126
#, c-format
msgid "%s is now a member of your party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:127
+#: src/net/ea/partyhandler.cpp:130
#, c-format
msgid "Unknown invite response for %s."
msgstr ""
-#: src/net/ea/partyhandler.cpp:232
+#: src/net/ea/partyhandler.cpp:235
msgid "You have left the party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:235
+#: src/net/ea/partyhandler.cpp:239
#, c-format
msgid "%s has left your party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:272
+#: src/net/ea/partyhandler.cpp:274
#, c-format
msgid "An unknown member tried to say: %s"
msgstr ""
-#: src/net/ea/partyhandler.cpp:298
+#: src/net/ea/partyhandler.cpp:300
msgid "Inviting like this isn't supported at the moment."
msgstr ""
-#: src/net/ea/partyhandler.cpp:327
+#: src/net/ea/partyhandler.cpp:329
#, c-format
msgid "%s is not in your party!"
msgstr ""
@@ -2838,9 +2811,9 @@ msgstr ""
msgid "Topic: "
msgstr ""
-#: src/net/tmwserv/generalhandler.cpp:92
+#: src/net/tmwserv/generalhandler.cpp:86
#, c-format
-msgid "Willpower: %d"
+msgid "Willpower %+d"
msgstr ""
#: src/net/tmwserv/loginhandler.cpp:80
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 49f80bb8..7da3be89 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,302 +8,301 @@ msgid ""
msgstr ""
"Project-Id-Version: tmw\n"
"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-04-21 17:27+0200\n"
-"PO-Revision-Date: 2009-05-08 06:15+0000\n"
+"POT-Creation-Date: 2009-05-10 16:39+0200\n"
+"PO-Revision-Date: 2009-05-11 03:32+0000\n"
"Last-Translator: netwareboss <netwareboss@gmail.com>\n"
"Language-Team: Traditional Chinese <themanaworld-"
"devel@lists.sourceforge.net>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2009-05-10 13:48+0000\n"
+"X-Launchpad-Export-Date: 2009-05-11 21:56+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
"X-Poedit-Country: China\n"
"X-Poedit-Language: Chinese\n"
"X-Poedit-SourceCharset: utf-8\n"
-#: src/commandhandler.cpp:142
+#: src/commandhandler.cpp:141
msgid "-- Help --"
msgstr "-- 說明 --"
-#: src/commandhandler.cpp:143 src/net/ea/gui/partytab.cpp:53
-msgid "/help > Display this help."
-msgstr "/help > 顯示這個說明文件。"
+#: src/commandhandler.cpp:142
+msgid "/help > Display this help"
+msgstr "/help >顯示指令說明"
-#: src/commandhandler.cpp:145
+#: src/commandhandler.cpp:144
msgid "/where > Display map name"
msgstr "/where > 顯示地圖名稱"
-#: src/commandhandler.cpp:146
+#: src/commandhandler.cpp:145
msgid "/who > Display number of online users"
msgstr "/who > 顯示線上使用者的數量"
-#: src/commandhandler.cpp:147
+#: src/commandhandler.cpp:146
msgid "/me > Tell something about yourself"
msgstr "/me > 顯示關於自己的資訊"
-#: src/commandhandler.cpp:149
+#: src/commandhandler.cpp:148
msgid "/clear > Clears this window"
msgstr "/clear > 清除這個視窗"
-#: src/commandhandler.cpp:151
+#: src/commandhandler.cpp:150
msgid "/msg > Send a private message to a user"
msgstr "/msg > 傳送私人訊息給某使用者"
-#: src/commandhandler.cpp:152
+#: src/commandhandler.cpp:151
msgid "/whisper > Alias of msg"
msgstr "/whisper > 效果同 msg"
-#: src/commandhandler.cpp:153
+#: src/commandhandler.cpp:152
msgid "/w > Alias of msg"
msgstr "/w > 效果同 msg"
-#: src/commandhandler.cpp:154
+#: src/commandhandler.cpp:153
msgid "/query > Makes a tab for private messages with another user"
msgstr "/query > 建立與另一個使用者的私人訊息分頁"
-#: src/commandhandler.cpp:155
+#: src/commandhandler.cpp:154
msgid "/q > Alias of query"
msgstr "/q > 效果同 query"
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:156
msgid "/list > Display all public channels"
msgstr "/list > 顯示所有公開頻道"
-#: src/commandhandler.cpp:158
+#: src/commandhandler.cpp:157
msgid "/join > Join or create a channel"
msgstr "/join > 加入或建立頻道"
-#: src/commandhandler.cpp:160
+#: src/commandhandler.cpp:159
msgid "/party > Invite a user to party"
msgstr "/party > 邀請使用者組隊"
-#: src/commandhandler.cpp:162
+#: src/commandhandler.cpp:161
msgid "/record > Start recording the chat to an external file"
msgstr "/record > 開始紀錄對話內容到外部檔案"
-#: src/commandhandler.cpp:163
+#: src/commandhandler.cpp:162
msgid "/toggle > Determine whether <return> toggles the chat log"
msgstr ""
-#: src/commandhandler.cpp:164
+#: src/commandhandler.cpp:163
msgid "/present > Get list of players present (sent to chat log, if logging)"
msgstr "/present > 取得上線玩家的清單(如果開啟記錄,傳送到聊天紀錄)"
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:165
msgid "/announce > Global announcement (GM only)"
msgstr "/announce > 全域廣播 (GM 專用)"
-#: src/commandhandler.cpp:170
+#: src/commandhandler.cpp:169
msgid "For more information, type /help <command>"
msgstr "輸入/help <指令> 獲取更多幫助訊息"
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:173
msgid "Command: /help"
msgstr "指令: /help"
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:174
msgid "This command displays a list of all commands available."
msgstr "該指令可顯示所有可用指令。"
-#: src/commandhandler.cpp:176
+#: src/commandhandler.cpp:175
msgid "Command: /help <command>"
msgstr "指令: /help <指令>"
-#: src/commandhandler.cpp:177
+#: src/commandhandler.cpp:176
msgid "This command displays help on <command>."
msgstr "該指令會顯示<指令>的幫助訊息"
-#: src/commandhandler.cpp:185
+#: src/commandhandler.cpp:184
msgid "Command: /announce <msg>"
msgstr "指令: /announce <信息>"
-#: src/commandhandler.cpp:186
+#: src/commandhandler.cpp:185
msgid "*** only available to a GM ***"
msgstr "*** 只有GM可用 ***"
-#: src/commandhandler.cpp:187
+#: src/commandhandler.cpp:186
msgid "This command sends the message <msg> to all players currently online."
msgstr "該指令會發送<信息>給所有線上用戶。"
-#: src/commandhandler.cpp:192
+#: src/commandhandler.cpp:191
msgid "Command: /clear"
msgstr "指令: /clear"
-#: src/commandhandler.cpp:193
+#: src/commandhandler.cpp:192
msgid "This command clears the chat log of previous chat."
msgstr "該指令可以清除聊天紀錄。"
-#: src/commandhandler.cpp:197
+#: src/commandhandler.cpp:196
msgid "Command: /join <channel>"
msgstr "指令: /join <頻道名稱>"
-#: src/commandhandler.cpp:198
+#: src/commandhandler.cpp:197
msgid "This command makes you enter <channel>."
msgstr "這個指令可以讓你輸入 <頻道名稱>."
-#: src/commandhandler.cpp:199
+#: src/commandhandler.cpp:198
msgid "If <channel> doesn't exist, it's created."
msgstr "假如 <頻道名稱> 不存在,那就建立."
-#: src/commandhandler.cpp:203
+#: src/commandhandler.cpp:202
msgid "Command: /list"
msgstr "指令: /list"
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:203
msgid "This command shows a list of all channels."
msgstr "這個指令會顯示所有頻道的清單。"
-#: src/commandhandler.cpp:208
+#: src/commandhandler.cpp:207
msgid "Command: /me <message>"
msgstr "指令: /me <message>"
-#: src/commandhandler.cpp:209
+#: src/commandhandler.cpp:208
msgid "This command tell others you are (doing) <msg>."
msgstr "這個指令會告訴其他人您正在做 <msg> 的事。"
-#: src/commandhandler.cpp:213
+#: src/commandhandler.cpp:212
msgid "Command: /msg <nick> <message>"
msgstr "指令: /msg <nick> <message>"
-#: src/commandhandler.cpp:214
+#: src/commandhandler.cpp:213
msgid "Command: /whisper <nick> <message>"
msgstr "指令: /whisper <nick> <message>"
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:214
msgid "Command: /w <nick> <message>"
msgstr "指令: /w <nick> <message>"
-#: src/commandhandler.cpp:216
+#: src/commandhandler.cpp:215
msgid "This command sends the text <message> to <nick>."
msgstr "這個指令會傳送 <message> 的文字給 <nick>。"
-#: src/commandhandler.cpp:217 src/commandhandler.cpp:231
+#: src/commandhandler.cpp:216 src/commandhandler.cpp:230
#: src/gui/widgets/channeltab.cpp:81 src/gui/widgets/channeltab.cpp:90
-#: src/net/ea/gui/partytab.cpp:77
+#: src/net/ea/gui/partytab.cpp:76
msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
msgstr "如果<暱稱>之間有空格,用雙引號(\")括起來。"
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:221
msgid "Command: /query <nick>"
msgstr "指令: /query <nick>"
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:222
msgid "Command: /q <nick>"
msgstr "指令: /q <nick>"
-#: src/commandhandler.cpp:224
+#: src/commandhandler.cpp:223
msgid "This command tries to make a tab for whispers betweenyou and <nick>."
msgstr "這個指令會嘗試建立您和 <nick> 之間的悄悄話分頁。"
-#: src/commandhandler.cpp:229
+#: src/commandhandler.cpp:228
msgid "Command: /party <nick>"
msgstr "指令: /party <nick>"
-#: src/commandhandler.cpp:230 src/net/ea/gui/partytab.cpp:76
+#: src/commandhandler.cpp:229 src/net/ea/gui/partytab.cpp:75
msgid "This command invites <nick> to party with you."
msgstr "這個指令會邀請 <nick> 跟您組隊。"
-#: src/commandhandler.cpp:236
+#: src/commandhandler.cpp:235
msgid "Command: /present"
msgstr "指令: /present"
-#: src/commandhandler.cpp:237
+#: src/commandhandler.cpp:236
msgid ""
"This command gets a list of players within hearing and sends it to either "
"the record log if recording, or the chat log otherwise."
msgstr ""
-#: src/commandhandler.cpp:243
+#: src/commandhandler.cpp:242
msgid "Command: /record <filename>"
msgstr "指令: /record <filename>"
-#: src/commandhandler.cpp:244
+#: src/commandhandler.cpp:243
msgid "This command starts recording the chat log to the file <filename>."
msgstr "這個指令會開始將聊天紀錄錄製為檔案 <filename>。"
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:245
msgid "Command: /record"
msgstr "指令: /record"
-#: src/commandhandler.cpp:247
+#: src/commandhandler.cpp:246
msgid "This command finishes a recording session."
msgstr "這個指令會結束錄製的作業階段。"
-#: src/commandhandler.cpp:251
+#: src/commandhandler.cpp:250
msgid "Command: /toggle <state>"
msgstr "指令: /toggle <state>"
-#: src/commandhandler.cpp:252
+#: src/commandhandler.cpp:251
msgid ""
"This command sets whether the return key should toggle the chat log, or "
"whether the chat log turns off automatically."
msgstr ""
-#: src/commandhandler.cpp:254
+#: src/commandhandler.cpp:253
msgid ""
"<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or "
"\"0\", \"no\", \"false\" to turn the toggle off."
msgstr ""
-"<state> 可以是 \"1\"、\"yes\"、\"true\" 其中之一來代表切換為開,或是 \"0\"、\"no\"、\"false\" "
-"來代表切換為關仔嶺。"
+"可以是 \"1\"、\"yes\"、\"true\" 其中之一來代表切換為開,或是 \"0\"、\"no\"、\"false\" 來代表切換為關閉."
-#: src/commandhandler.cpp:257
+#: src/commandhandler.cpp:256
msgid "Command: /toggle"
msgstr "指令: /toggle"
-#: src/commandhandler.cpp:258
+#: src/commandhandler.cpp:257
msgid "This command displays the return toggle status."
msgstr ""
-#: src/commandhandler.cpp:262
+#: src/commandhandler.cpp:261
msgid "Command: /where"
msgstr "指令: /where"
-#: src/commandhandler.cpp:263
+#: src/commandhandler.cpp:262
msgid "This command displays the name of the current map."
msgstr "這個指令顯示目前地圖名。"
-#: src/commandhandler.cpp:267
+#: src/commandhandler.cpp:266
msgid "Command: /who"
msgstr "指令: /who"
-#: src/commandhandler.cpp:268
+#: src/commandhandler.cpp:267
msgid "This command displays the number of players currently online."
msgstr "這調指令可顯示目前線上人數。"
-#: src/commandhandler.cpp:273
+#: src/commandhandler.cpp:272
msgid "Unknown command."
msgstr "不明指令"
-#: src/commandhandler.cpp:274
+#: src/commandhandler.cpp:273
msgid "Type /help for a list of commands."
msgstr "輸入 /help 獲取指令列表。"
-#: src/commandhandler.cpp:336
-msgid "Cannont send empty whispers!"
-msgstr "不能送出空的悄悄話!"
+#: src/commandhandler.cpp:339
+msgid "Cannot send empty whispers!"
+msgstr "傳送密語失敗"
-#: src/commandhandler.cpp:343
+#: src/commandhandler.cpp:346
#, c-format
msgid ""
-"Cannont create a whisper tab for nick '%s'!It either already exists, or is "
+"Cannot create a whisper tab for nick '%s'! It either already exists, or is "
"you."
-msgstr "不能建立 nick 「%s」的悄悄話分頁!它已經存在,或者對象是你自己。"
+msgstr ""
-#: src/commandhandler.cpp:389
+#: src/commandhandler.cpp:392
msgid "Return toggles chat."
msgstr ""
-#: src/commandhandler.cpp:389
+#: src/commandhandler.cpp:392
msgid "Message closes chat."
msgstr ""
-#: src/commandhandler.cpp:398
+#: src/commandhandler.cpp:401
msgid "Return now toggles chat."
msgstr ""
-#: src/commandhandler.cpp:402
+#: src/commandhandler.cpp:405
msgid "Message now closes chat."
msgstr ""
@@ -313,45 +312,45 @@ msgid ""
"Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
msgstr "/%s 的選項可以是 \"yes\"、\"no\"、\"true\"、\"false\"、\"1\"、\"0\"。"
-#: src/game.cpp:248
+#: src/game.cpp:236
msgid "General"
msgstr "一般"
-#: src/game.cpp:411
+#: src/game.cpp:400
msgid "Screenshot saved to ~/"
msgstr "抓圖存到 ~/"
-#: src/game.cpp:416
+#: src/game.cpp:405
msgid "Saving screenshot failed!"
msgstr "儲存抓圖失敗!"
-#: src/game.cpp:492
-msgid "Network Error"
-msgstr "網路錯誤"
-
-#: src/game.cpp:493
+#: src/game.cpp:481
msgid "The connection to the server was lost, the program will now quit"
msgstr "已中斷連線到伺服器,程式將要離開"
-#: src/game.cpp:664 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
+#: src/game.cpp:487
+msgid "Network Error"
+msgstr "網路錯誤"
+
+#: src/game.cpp:646 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
#: src/gui/quitdialog.cpp:35 src/gui/quitdialog.cpp:36 src/gui/sell.cpp:73
#: src/keyboardconfig.cpp:100
msgid "Quit"
msgstr "離開"
-#: src/game.cpp:665
+#: src/game.cpp:647
msgid "Are you sure you want to quit?"
msgstr "您確定要離開?"
-#: src/game.cpp:672
+#: src/game.cpp:654
msgid "no"
msgstr "否"
-#: src/game.cpp:813
+#: src/game.cpp:794
msgid "Ignoring incoming trade requests"
msgstr "忽略收到的交易要求"
-#: src/game.cpp:820
+#: src/game.cpp:801
msgid "Accepting incoming trade requests"
msgstr "接受收到的交易要求"
@@ -363,12 +362,12 @@ msgstr "好友"
msgid "Buddy List"
msgstr "好友清單"
-#: src/gui/buy.cpp:46 src/gui/buy.cpp:70 src/gui/buysell.cpp:39
+#: src/gui/buy.cpp:46 src/gui/buy.cpp:70 src/gui/buysell.cpp:40
msgid "Buy"
msgstr "購買"
#: src/gui/buy.cpp:65 src/gui/buy.cpp:256 src/gui/sell.cpp:67
-#: src/gui/sell.cpp:277
+#: src/gui/sell.cpp:278
#, c-format
msgid "Price: %s / Total: %s"
msgstr "價格: %s / 總共: %s"
@@ -378,13 +377,13 @@ msgid "Max"
msgstr "最大"
#: src/gui/buy.cpp:73 src/gui/buy.cpp:223 src/gui/buy.cpp:241
-#: src/gui/sell.cpp:75 src/gui/sell.cpp:249 src/gui/sell.cpp:263
+#: src/gui/sell.cpp:75 src/gui/sell.cpp:250 src/gui/sell.cpp:264
#, c-format
msgid "Description: %s"
msgstr "說明:%s"
#: src/gui/buy.cpp:74 src/gui/buy.cpp:225 src/gui/buy.cpp:242
-#: src/gui/sell.cpp:76 src/gui/sell.cpp:251 src/gui/sell.cpp:264
+#: src/gui/sell.cpp:76 src/gui/sell.cpp:252 src/gui/sell.cpp:265
#, c-format
msgid "Effect: %s"
msgstr "效果:%s"
@@ -393,203 +392,211 @@ msgstr "效果:%s"
msgid "Shop"
msgstr "商店"
-#: src/gui/buysell.cpp:39 src/gui/sell.cpp:46 src/gui/sell.cpp:72
+#: src/gui/buysell.cpp:40 src/gui/sell.cpp:46 src/gui/sell.cpp:72
msgid "Sell"
msgstr "出售"
-#: src/gui/buysell.cpp:39 src/gui/changeemaildialog.cpp:52
-#: src/gui/changepassworddialog.cpp:55 src/gui/charcreatedialog.cpp:75
-#: src/gui/char_select.cpp:112 src/gui/connection.cpp:38
-#: src/gui/item_amount.cpp:67 src/gui/login.cpp:74
-#: src/gui/npcintegerdialog.cpp:49 src/gui/npclistdialog.cpp:58
-#: src/gui/npcpostdialog.cpp:54 src/gui/npcstringdialog.cpp:47
+#: src/gui/buysell.cpp:40 src/gui/changeemaildialog.cpp:53
+#: src/gui/changepassworddialog.cpp:56 src/gui/charcreatedialog.cpp:74
+#: src/gui/charselectdialog.cpp:111 src/gui/connection.cpp:38
+#: src/gui/itemamount.cpp:94 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
#: src/gui/quitdialog.cpp:40 src/gui/register.cpp:81
-#: src/gui/serverdialog.cpp:103 src/gui/serverselectdialog.cpp:58
-#: src/gui/setup.cpp:73 src/gui/textdialog.cpp:37
-#: src/gui/unregisterdialog.cpp:52 src/gui/updatewindow.cpp:112
+#: src/gui/serverdialog.cpp:104 src/gui/serverselectdialog.cpp:67
+#: src/gui/setup.cpp:72 src/gui/textdialog.cpp:37
+#: src/gui/unregisterdialog.cpp:53 src/gui/updatewindow.cpp:112
msgid "Cancel"
msgstr "取消"
-#: src/gui/changeemaildialog.cpp:42 src/gui/changeemaildialog.cpp:51
-#: src/gui/char_select.cpp:122
+#: src/gui/changeemaildialog.cpp:43 src/gui/changeemaildialog.cpp:52
+#: src/gui/charselectdialog.cpp:121
msgid "Change Email Address"
msgstr "變更郵件地址"
-#: src/gui/changeemaildialog.cpp:46 src/gui/changepassworddialog.cpp:47
-#: src/gui/char_select.cpp:124
+#: src/gui/changeemaildialog.cpp:47 src/gui/changepassworddialog.cpp:48
+#: src/gui/charselectdialog.cpp:123
#, c-format
msgid "Account: %s"
msgstr "帳號: %s"
-#: src/gui/changeemaildialog.cpp:48
+#: src/gui/changeemaildialog.cpp:49
msgid "Type New Email Address twice:"
msgstr "輸入新的電子郵件地址兩次:"
-#: src/gui/changepassworddialog.cpp:43 src/gui/changepassworddialog.cpp:54
-#: src/gui/char_select.cpp:121
+#: src/gui/changepassworddialog.cpp:44 src/gui/changepassworddialog.cpp:55
+#: src/gui/charselectdialog.cpp:120
msgid "Change Password"
msgstr "變更密碼"
-#: src/gui/changepassworddialog.cpp:49 src/gui/login.cpp:51
-#: src/gui/register.cpp:61 src/gui/unregisterdialog.cpp:49
+#: src/gui/changepassworddialog.cpp:50 src/gui/login.cpp:52
+#: src/gui/register.cpp:61 src/gui/unregisterdialog.cpp:50
msgid "Password:"
msgstr "密碼:"
-#: src/gui/changepassworddialog.cpp:51
+#: src/gui/changepassworddialog.cpp:52
msgid "Type New Password twice:"
msgstr "輸入新密碼兩次:"
-#: src/gui/charcreatedialog.cpp:55
+#: src/gui/charcreatedialog.cpp:54
msgid "Create Character"
msgstr "新增角色"
-#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:50
+#: src/gui/charcreatedialog.cpp:66 src/gui/login.cpp:51
#: src/gui/register.cpp:60
msgid "Name:"
msgstr "名字:"
-#: src/gui/charcreatedialog.cpp:70
+#: src/gui/charcreatedialog.cpp:69
msgid "Hair Color:"
msgstr "髮色:"
-#: src/gui/charcreatedialog.cpp:73
+#: src/gui/charcreatedialog.cpp:72
msgid "Hair Style:"
msgstr "髮型:"
-#: src/gui/charcreatedialog.cpp:74
+#: src/gui/charcreatedialog.cpp:73
msgid "Create"
msgstr "創造"
-#: src/gui/charcreatedialog.cpp:76 src/gui/register.cpp:75
+#: src/gui/charcreatedialog.cpp:75 src/gui/register.cpp:75
msgid "Male"
msgstr "男生"
-#: src/gui/charcreatedialog.cpp:77 src/gui/register.cpp:76
+#: src/gui/charcreatedialog.cpp:76 src/gui/register.cpp:76
msgid "Female"
msgstr "女生"
-#: src/gui/charcreatedialog.cpp:95 src/gui/charcreatedialog.cpp:235
+#: src/gui/charcreatedialog.cpp:94 src/gui/charcreatedialog.cpp:234
#, c-format
msgid "Please distribute %d points"
msgstr "請分配%d點數"
-#: src/gui/charcreatedialog.cpp:173 src/gui/register.cpp:222
-#: src/gui/serverdialog.cpp:162 src/main.cpp:1487
+#: src/gui/charcreatedialog.cpp:172 src/gui/register.cpp:222
+#: src/gui/serverdialog.cpp:163 src/main.cpp:1503
#: src/net/ea/charserverhandler.cpp:123 src/net/ea/charserverhandler.cpp:140
msgid "Error"
msgstr "錯誤"
-#: src/gui/charcreatedialog.cpp:174
+#: src/gui/charcreatedialog.cpp:173
msgid "Your name needs to be at least 4 characters."
msgstr "你的名字至少需要4個字元"
-#: src/gui/charcreatedialog.cpp:227
+#: src/gui/charcreatedialog.cpp:226
msgid "Character stats OK"
msgstr "角色狀態確定"
-#: src/gui/charcreatedialog.cpp:239
+#: src/gui/charcreatedialog.cpp:238
#, c-format
msgid "Please remove %d points"
msgstr "請移除%d點數"
-#: src/gui/char_select.cpp:79
+#: src/gui/charselectdialog.cpp:78
msgid "Confirm Character Delete"
msgstr "確認刪除角色"
-#: src/gui/char_select.cpp:80
+#: src/gui/charselectdialog.cpp:79
msgid "Are you sure you want to delete this character?"
msgstr "你確定想刪除這個角色?"
-#: src/gui/char_select.cpp:98
+#: src/gui/charselectdialog.cpp:97
msgid "Account and Character Management"
msgstr "帳號與角色管理"
-#: src/gui/char_select.cpp:105
+#: src/gui/charselectdialog.cpp:104
msgid "Select Character"
msgstr "選擇角色"
-#: src/gui/char_select.cpp:111 src/gui/item_amount.cpp:66
-#: src/gui/ok_dialog.cpp:42 src/gui/quitdialog.cpp:39
-#: src/gui/serverdialog.cpp:102
+#: src/gui/charselectdialog.cpp:110 src/gui/itemamount.cpp:93
+#: src/gui/okdialog.cpp:42 src/gui/quitdialog.cpp:39
+#: src/gui/serverdialog.cpp:103
msgid "Ok"
msgstr "確認"
-#: src/gui/char_select.cpp:113
+#: src/gui/charselectdialog.cpp:112
msgid "Previous"
msgstr "上一個"
-#: src/gui/char_select.cpp:114 src/gui/npc_text.cpp:88
+#: src/gui/charselectdialog.cpp:113 src/gui/npcdialog.cpp:44
msgid "Next"
msgstr "下一個"
-#: src/gui/char_select.cpp:115 src/gui/char_select.cpp:125
-#: src/gui/char_select.cpp:302 src/gui/char_select.cpp:323
-#: src/gui/unregisterdialog.cpp:48
+#: src/gui/charselectdialog.cpp:114 src/gui/charselectdialog.cpp:124
+#: src/gui/charselectdialog.cpp:301 src/gui/charselectdialog.cpp:322
+#: src/gui/unregisterdialog.cpp:49
#, c-format
msgid "Name: %s"
msgstr "名字:%s"
-#: src/gui/char_select.cpp:116 src/gui/char_select.cpp:126
-#: src/gui/char_select.cpp:304 src/gui/char_select.cpp:324
-#: src/gui/status.cpp:56 src/gui/status.cpp:175
+#: src/gui/charselectdialog.cpp:115 src/gui/charselectdialog.cpp:125
+#: src/gui/charselectdialog.cpp:303 src/gui/charselectdialog.cpp:323
+#: src/gui/status.cpp:55 src/gui/status.cpp:174
#, c-format
msgid "Level: %d"
msgstr "等級:%d"
-#: src/gui/char_select.cpp:118 src/gui/char_select.cpp:165
-#: src/gui/char_select.cpp:167 src/gui/char_select.cpp:333
+#: src/gui/charselectdialog.cpp:117 src/gui/charselectdialog.cpp:164
+#: src/gui/charselectdialog.cpp:166 src/gui/charselectdialog.cpp:332
msgid "New"
msgstr "新增"
-#: src/gui/char_select.cpp:119 src/gui/char_select.cpp:166
-#: src/gui/char_select.cpp:167 src/gui/char_select.cpp:316
+#: src/gui/charselectdialog.cpp:118 src/gui/charselectdialog.cpp:165
+#: src/gui/charselectdialog.cpp:166 src/gui/charselectdialog.cpp:315
#: src/gui/setup_players.cpp:230
msgid "Delete"
msgstr "刪除"
-#: src/gui/char_select.cpp:120 src/gui/unregisterdialog.cpp:51
+#: src/gui/charselectdialog.cpp:119 src/gui/unregisterdialog.cpp:52
msgid "Unregister"
msgstr "取消註冊"
-#: src/gui/char_select.cpp:127
+#: src/gui/charselectdialog.cpp:126
#, c-format
msgid "Money: %d"
msgstr "金錢:%d"
-#: src/gui/char_select.cpp:162 src/gui/char_select.cpp:306
-#: src/gui/char_select.cpp:326
+#: src/gui/charselectdialog.cpp:161 src/gui/charselectdialog.cpp:305
+#: src/gui/charselectdialog.cpp:325
#, c-format
msgid "Job Level: %d"
msgstr "職業等級:%d"
-#: src/gui/char_select.cpp:163 src/gui/char_select.cpp:309
-#: src/gui/char_select.cpp:328 src/gui/status.cpp:58 src/gui/status.cpp:183
+#: src/gui/charselectdialog.cpp:162 src/gui/charselectdialog.cpp:308
+#: src/gui/charselectdialog.cpp:327 src/gui/status.cpp:57
+#: src/gui/status.cpp:182
#, c-format
msgid "Money: %s"
msgstr "金錢: %s"
-#: src/gui/chat.cpp:72 src/gui/menuwindow.cpp:65 src/gui/palette.cpp:93
+#: src/gui/chat.cpp:73 src/gui/palette.cpp:93
msgid "Chat"
msgstr "聊天"
-#: src/gui/chat.cpp:341 src/gui/chat.cpp:347
+#: src/gui/chat.cpp:332
+#, c-format
+msgid "%d players are present."
+msgstr "%d 位玩家的清單"
+
+#: src/gui/chat.cpp:348 src/gui/chat.cpp:354
msgid "Present: "
msgstr "上線: "
-#: src/gui/chat.cpp:342
+#: src/gui/chat.cpp:348 src/gui/chat.cpp:354
+msgid "; "
+msgstr ""
+
+#: src/gui/chat.cpp:349
msgid "Attendance written to record log."
msgstr "將上線訊息寫入錄製紀錄。"
-#: src/gui/chat.cpp:451
+#: src/gui/chat.cpp:474
#, c-format
msgid "Whispering to %s: %s"
msgstr "對%s竊竊私語:%s"
-#: src/gui/confirm_dialog.cpp:42
+#: src/gui/confirmdialog.cpp:42
msgid "Yes"
msgstr "是"
-#: src/gui/confirm_dialog.cpp:43
+#: src/gui/confirmdialog.cpp:43
msgid "No"
msgstr "否"
@@ -597,26 +604,16 @@ msgstr "否"
msgid "Connecting..."
msgstr "連線中..."
-#: src/gui/emotecontainer.cpp:61
+#: src/gui/emotepopup.cpp:64
msgid "Unable to load selection.png"
msgstr "無法讀取 selection.png"
-#: src/gui/emotewindow.cpp:37 src/gui/menuwindow.cpp:76
-msgid "Emote"
-msgstr "表情"
-
-#: src/gui/emotewindow.cpp:47 src/gui/inventorywindow.cpp:67
-#: src/gui/inventorywindow.cpp:68 src/gui/inventorywindow.cpp:280
-#: src/gui/skill.cpp:147
-msgid "Use"
-msgstr "使用"
-
-#: src/gui/equipmentwindow.cpp:68 src/gui/menuwindow.cpp:67
+#: src/gui/equipmentwindow.cpp:68 src/gui/windowmenu.cpp:60
msgid "Equipment"
msgstr "裝備"
-#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:274
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:74
+#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:268
msgid "Unequip"
msgstr "卸下裝備"
@@ -640,97 +637,100 @@ msgstr "離開公會"
msgid "Help"
msgstr "說明"
-#: src/gui/help.cpp:47 src/gui/npc_text.cpp:95
+#: src/gui/help.cpp:47 src/gui/npcdialog.cpp:45 src/gui/storagewindow.cpp:68
msgid "Close"
msgstr "關閉"
-#: src/gui/inventorywindow.cpp:51 src/gui/menuwindow.cpp:68
+#: src/gui/inventorywindow.cpp:54 src/gui/windowmenu.cpp:61
msgid "Inventory"
msgstr "物品攔"
-#: src/gui/inventorywindow.cpp:66 src/gui/inventorywindow.cpp:68
-#: src/gui/inventorywindow.cpp:277
+#: src/gui/inventorywindow.cpp:69 src/gui/inventorywindow.cpp:71
+#: src/gui/inventorywindow.cpp:270
msgid "Equip"
msgstr "裝備"
-#: src/gui/inventorywindow.cpp:77
+#: src/gui/inventorywindow.cpp:70 src/gui/inventorywindow.cpp:71
+#: src/gui/inventorywindow.cpp:274 src/gui/skill.cpp:147
+msgid "Use"
+msgstr "使用"
+
+#: src/gui/inventorywindow.cpp:80
msgid "Drop"
msgstr "丟棄"
-#: src/gui/inventorywindow.cpp:79
+#: src/gui/inventorywindow.cpp:81
msgid "Split"
msgstr "分開"
-#: src/gui/inventorywindow.cpp:93
+#: src/gui/inventorywindow.cpp:92
msgid "Slots:"
msgstr "欄位:"
-#: src/gui/inventorywindow.cpp:94
+#: src/gui/inventorywindow.cpp:93
msgid "Weight:"
msgstr "重量:"
-#: src/gui/item_amount.cpp:68
+#: src/gui/itemamount.cpp:95
msgid "All"
msgstr "全部"
-#: src/gui/item_amount.cpp:92
+#: src/gui/itemamount.cpp:121
msgid "Select amount of items to trade."
msgstr "請選擇交易的物品數量"
-#: src/gui/item_amount.cpp:95
+#: src/gui/itemamount.cpp:124
msgid "Select amount of items to drop."
msgstr "請選擇丟棄的物品數量"
-#: src/gui/item_amount.cpp:98
+#: src/gui/itemamount.cpp:127
msgid "Select amount of items to store."
msgstr "選擇要儲存的物品數量。"
-#: src/gui/item_amount.cpp:101
+#: src/gui/itemamount.cpp:130
msgid "Select amount of items to retrieve."
msgstr "選擇要取回的物品數量。"
-#: src/gui/item_amount.cpp:104
+#: src/gui/itemamount.cpp:133
msgid "Select amount of items to split."
msgstr "請選擇你要分離的物品數量"
-#: src/gui/itempopup.cpp:89
+#: src/gui/itempopup.cpp:91
msgid "Weight: "
msgstr "重量: "
-#: src/gui/login.cpp:47
+#: src/gui/login.cpp:48
msgid "Login"
msgstr "登入"
-#: src/gui/login.cpp:53 src/gui/register.cpp:64 src/gui/serverdialog.cpp:75
-#: src/gui/widgets/chattab.cpp:136
+#: src/gui/login.cpp:54 src/gui/register.cpp:64 src/gui/serverdialog.cpp:76
+#: src/gui/widgets/chattab.cpp:135
msgid "Server:"
msgstr "伺服器:"
-#: src/gui/login.cpp:54 src/gui/register.cpp:65 src/gui/serverdialog.cpp:76
+#: src/gui/login.cpp:55 src/gui/register.cpp:65 src/gui/serverdialog.cpp:77
msgid "Port:"
-msgstr "Port:"
+msgstr "端口(port):"
-#: src/gui/login.cpp:55
+#: src/gui/login.cpp:56
msgid "Recent:"
msgstr "最近的:"
-#: src/gui/login.cpp:72
+#: src/gui/login.cpp:73
msgid "Remember Username"
msgstr "保存用戶名"
-#: src/gui/login.cpp:73 src/gui/npcintegerdialog.cpp:48
-#: src/gui/npclistdialog.cpp:57 src/gui/npcstringdialog.cpp:46
-#: src/gui/serverselectdialog.cpp:57 src/gui/textdialog.cpp:36
-#: src/gui/trade.cpp:70 src/gui/trade.cpp:72
+#: src/gui/login.cpp:74 src/gui/serverselectdialog.cpp:66
+#: src/gui/textdialog.cpp:36 src/gui/trade.cpp:69 src/gui/trade.cpp:71
msgid "OK"
msgstr "確定"
-#: src/gui/login.cpp:75 src/gui/register.cpp:56 src/gui/register.cpp:80
+#: src/gui/login.cpp:76 src/gui/register.cpp:56 src/gui/register.cpp:80
msgid "Register"
msgstr "註冊"
-#: src/gui/magic.cpp:32 src/gui/menuwindow.cpp:71 src/gui/skilldialog.cpp:117
-#: src/localplayer.cpp:860
+#: src/gui/magic.cpp:32 src/gui/skilldialog.cpp:117 src/gui/windowmenu.cpp:64
+#: src/localplayer.cpp:845
msgid "Magic"
msgstr "魔法"
@@ -746,69 +746,40 @@ msgstr "施展測試咒文 2"
msgid "Cast Test Spell 3"
msgstr "施展測試咒文 3"
-#: src/gui/menuwindow.cpp:66
-msgid "Status"
-msgstr "狀態"
-
-#: src/gui/menuwindow.cpp:69 src/gui/skill.cpp:126 src/gui/skilldialog.cpp:99
-msgid "Skills"
-msgstr "技能"
-
-#: src/gui/menuwindow.cpp:72
-msgid "Guilds"
-msgstr "公會"
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
+msgid "Map"
+msgstr "地圖"
-#: src/gui/menuwindow.cpp:73
-msgid "Buddys"
-msgstr "好友"
+#: src/gui/npcdialog.cpp:43
+msgid "Waiting for server"
+msgstr "等待伺服器中"
-#: src/gui/menuwindow.cpp:75
-msgid "Shortcut"
-msgstr "快捷鍵"
+#: src/gui/npcdialog.cpp:46
+msgid "Submit"
+msgstr "確認"
-#: src/gui/menuwindow.cpp:77 src/gui/setup.cpp:65 src/main.cpp:920
-msgid "Setup"
-msgstr "設定"
+#: src/gui/npcdialog.cpp:49 src/gui/npcpostdialog.cpp:39
+msgid "NPC"
+msgstr "NPC"
-#: src/gui/minimap.cpp:39
-msgid "MiniMap"
-msgstr "小地圖"
+#: src/gui/npcdialog.cpp:95
+msgid "+"
+msgstr "增加"
-#: src/gui/npcintegerdialog.cpp:39
-msgid "NPC Number Request"
-msgstr ""
+#: src/gui/npcdialog.cpp:96
+msgid "-"
+msgstr "減少"
-#: src/gui/npcintegerdialog.cpp:50
+#: src/gui/npcdialog.cpp:105
msgid "Reset"
msgstr "重設"
-#: src/gui/npcintegerdialog.cpp:101 src/gui/npclistdialog.cpp:123
-#: src/gui/npcstringdialog.cpp:75
-msgid ""
-"\n"
-"> Cancel\n"
-msgstr ""
-"\n"
-"> 取消\n"
-
-#: src/gui/npcpostdialog.cpp:39 src/gui/npc_text.cpp:37
-msgid "NPC"
-msgstr "NPC"
-
#: src/gui/npcpostdialog.cpp:51
msgid "Send"
msgstr "傳送"
-#: src/gui/npcstringdialog.cpp:39
-msgid "NPC Text Request"
-msgstr "NPC 文字要求"
-
-#: src/gui/npc_text.cpp:53 src/gui/npc_text.cpp:119
-msgid "Waiting for server"
-msgstr "等待伺服器"
-
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:233
-#: src/gui/setup_video.cpp:495
+#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:268
+#: src/gui/setup_video.cpp:567
msgid "Text"
msgstr "文字"
@@ -861,7 +832,7 @@ msgid "Is"
msgstr "是"
#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:33
-#: src/net/ea/gui/partytab.cpp:38
+#: src/net/ea/gui/partytab.cpp:37
msgid "Party"
msgstr "隊伍"
@@ -879,11 +850,11 @@ msgstr "超連結"
#: src/gui/palette.cpp:103
msgid "Being"
-msgstr "生物"
+msgstr "物件"
#: src/gui/palette.cpp:104
-msgid "Other Player's Names"
-msgstr "其他玩家的名字"
+msgid "Other Players' Names"
+msgstr "其他使用者名字"
#: src/gui/palette.cpp:105
msgid "Own Name"
@@ -899,27 +870,27 @@ msgstr "電腦"
#: src/gui/palette.cpp:108
msgid "Monsters"
-msgstr "Monsters"
+msgstr "怪物"
#: src/gui/palette.cpp:110
msgid "Unknown Item Type"
msgstr "不明物品類型"
#: src/gui/palette.cpp:111
-msgid "Generic"
+msgid "Generics"
msgstr "一般"
#: src/gui/palette.cpp:112
-msgid "Hat"
+msgid "Hats"
msgstr "帽子"
#: src/gui/palette.cpp:113
-msgid "Usable"
-msgstr "可使用"
+msgid "Usables"
+msgstr "可使用的"
#: src/gui/palette.cpp:114
-msgid "Shirt"
-msgstr "襯衫"
+msgid "Shirts"
+msgstr "內衣"
#: src/gui/palette.cpp:115
msgid "1 Handed Weapons"
@@ -938,16 +909,16 @@ msgid "2 Handed Weapons"
msgstr "雙手武器"
#: src/gui/palette.cpp:119
-msgid "Shield"
+msgid "Shields"
msgstr "盾牌"
#: src/gui/palette.cpp:120
-msgid "Ring"
-msgstr "指環"
+msgid "Rings"
+msgstr "戒指"
#: src/gui/palette.cpp:121
-msgid "Necklace"
-msgstr "項鍊"
+msgid "Necklaces"
+msgstr "腕甲"
#: src/gui/palette.cpp:122
msgid "Arms"
@@ -955,7 +926,7 @@ msgstr "武器"
#: src/gui/palette.cpp:123
msgid "Ammo"
-msgstr ""
+msgstr "阿木"
#: src/gui/palette.cpp:125
msgid "Particle Effects"
@@ -1001,94 +972,102 @@ msgstr "1/2 HP 量"
msgid "1/4 HP Bar"
msgstr "1/4 HP 量"
-#: src/gui/popupmenu.cpp:73
+#: src/gui/popupmenu.cpp:75
msgid "@@name|Add name to chat@@"
-msgstr ""
+msgstr "@@name|增加聊天名單@@"
-#: src/gui/popupmenu.cpp:85
+#: src/gui/popupmenu.cpp:87
#, c-format
msgid "@@trade|Trade With %s@@"
msgstr "@@交易|與%s交易@@"
-#: src/gui/popupmenu.cpp:86 src/gui/popupmenu.cpp:128
+#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:130
#, c-format
msgid "@@attack|Attack %s@@"
msgstr "@@攻擊|攻擊%s@@"
-#: src/gui/popupmenu.cpp:92
+#: src/gui/popupmenu.cpp:94
#, c-format
msgid "@@friend|Befriend %s@@"
-msgstr ""
+msgstr "@@friend|與%s交朋友@@"
-#: src/gui/popupmenu.cpp:95
+#: src/gui/popupmenu.cpp:97
#, c-format
msgid "@@disregard|Disregard %s@@"
msgstr ""
-#: src/gui/popupmenu.cpp:96
+#: src/gui/popupmenu.cpp:98
#, c-format
msgid "@@ignore|Ignore %s@@"
msgstr ""
-#: src/gui/popupmenu.cpp:100 src/gui/popupmenu.cpp:105
+#: src/gui/popupmenu.cpp:102 src/gui/popupmenu.cpp:107
#, c-format
msgid "@@unignore|Un-Ignore %s@@"
msgstr ""
-#: src/gui/popupmenu.cpp:101
+#: src/gui/popupmenu.cpp:103
#, c-format
msgid "@@ignore|Completely ignore %s@@"
msgstr ""
-#: src/gui/popupmenu.cpp:111
+#: src/gui/popupmenu.cpp:113
#, c-format
msgid "@@guild|Invite %s to join your guild@@"
-msgstr ""
+msgstr "@@guild|邀請 %s 加入你的公會@@"
-#: src/gui/popupmenu.cpp:112
+#: src/gui/popupmenu.cpp:114
#, c-format
msgid "@@party|Invite %s to join your party@@"
-msgstr ""
+msgstr "@@party|邀請 %s 加入你的隊伍@@"
-#: src/gui/popupmenu.cpp:123
+#: src/gui/popupmenu.cpp:125
#, c-format
msgid "@@talk|Talk To %s@@"
-msgstr ""
+msgstr "@@對話|與 %s 對話@@"
-#: src/gui/popupmenu.cpp:142 src/gui/popupmenu.cpp:160
-#: src/gui/popupmenu.cpp:354
+#: src/gui/popupmenu.cpp:144 src/gui/popupmenu.cpp:162
+#: src/gui/popupmenu.cpp:375
msgid "@@cancel|Cancel@@"
msgstr "@@取消|取消@@"
-#: src/gui/popupmenu.cpp:155
+#: src/gui/popupmenu.cpp:157
#, c-format
-msgid "@@pickup|Pick Up %s@@"
-msgstr "@@撿起|撿起%s@@"
+msgid "@@pickup|Pick up %s@@"
+msgstr "@@pickup|撿起 %s @@"
-#: src/gui/popupmenu.cpp:156 src/gui/popupmenu.cpp:352
-msgid "@@chat|Add to Chat@@"
-msgstr ""
+#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:373
+msgid "@@chat|Add to chat@@"
+msgstr "@@chat|加入聊天@@"
-#: src/gui/popupmenu.cpp:336 src/gui/popupmenu.cpp:341
-msgid "@@use|Equip@@"
-msgstr "@@使用|裝備@@"
-
-#: src/gui/popupmenu.cpp:339
+#: src/gui/popupmenu.cpp:348
msgid "@@use|Unequip@@"
msgstr "@@使用|卸下@@"
-#: src/gui/popupmenu.cpp:345
+#: src/gui/popupmenu.cpp:350
+msgid "@@use|Equip@@"
+msgstr "@@使用|裝備@@"
+
+#: src/gui/popupmenu.cpp:353
msgid "@@use|Use@@"
msgstr "@@使用|使用@@"
-#: src/gui/popupmenu.cpp:347
+#: src/gui/popupmenu.cpp:355
msgid "@@drop|Drop@@"
msgstr "@@丟棄|丟棄@@"
-#: src/gui/popupmenu.cpp:350
+#: src/gui/popupmenu.cpp:359
msgid "@@split|Split@@"
msgstr "@@分離|分離@@"
+#: src/gui/popupmenu.cpp:364
+msgid "@@store|Store@@"
+msgstr "@@store|"
+
+#: src/gui/popupmenu.cpp:371
+msgid "@@retrieve|Retrieve@@"
+msgstr ""
+
#: src/gui/quitdialog.cpp:37
msgid "Switch server"
msgstr "交換伺服器"
@@ -1157,18 +1136,30 @@ msgstr "密碼不能少於%d個字元。"
msgid "Passwords do not match."
msgstr "密碼不一樣."
-#: src/gui/serverdialog.cpp:73
+#: src/gui/serverdialog.cpp:74
msgid "Choose your server"
msgstr "選擇您的伺服器"
-#: src/gui/serverdialog.cpp:163
+#: src/gui/serverdialog.cpp:164
msgid "Please type both the address and the port of a server."
msgstr "請輸入伺服氣得IP地址和Port"
-#: src/gui/serverselectdialog.cpp:50
+#: src/gui/serverselectdialog.cpp:59
msgid "Select Server"
msgstr "選擇伺服器"
+#: src/gui/setup.cpp:64 src/gui/windowmenu.cpp:69 src/main.cpp:933
+msgid "Setup"
+msgstr "設定"
+
+#: src/gui/setup.cpp:72
+msgid "Apply"
+msgstr "確定"
+
+#: src/gui/setup.cpp:72
+msgid "Reset Windows"
+msgstr "重置視窗"
+
#: src/gui/setup_audio.cpp:41
msgid "Sound"
msgstr "聲音"
@@ -1185,11 +1176,11 @@ msgstr "音效音量"
msgid "Music volume"
msgstr "音樂音量"
-#: src/gui/setup_colors.cpp:44
+#: src/gui/setup_colors.cpp:45
msgid "This is what the color looks like"
msgstr "這是顏色看起來的樣子"
-#: src/gui/setup_colors.cpp:49
+#: src/gui/setup_colors.cpp:50
msgid "Colors"
msgstr "顏色"
@@ -1197,22 +1188,22 @@ msgstr "顏色"
msgid "Type: "
msgstr "類型: "
-#: src/gui/setup_colors.cpp:82 src/gui/setup_colors.cpp:434
+#: src/gui/setup_colors.cpp:82 src/gui/setup_colors.cpp:430
msgid "Static"
-msgstr ""
+msgstr "狀態"
#: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:431
msgid "Pulse"
-msgstr ""
+msgstr "暫停"
#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:87
-#: src/gui/setup_colors.cpp:436
+#: src/gui/setup_colors.cpp:432
msgid "Rainbow"
msgstr "彩虹"
#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
-#: src/gui/setup_colors.cpp:436
+#: src/gui/setup_colors.cpp:432
msgid "Spectrum"
msgstr "光譜"
@@ -1220,26 +1211,18 @@ msgstr "光譜"
msgid "Delay: "
msgstr "延遲: "
-#: src/gui/setup_colors.cpp:109
+#: src/gui/setup_colors.cpp:108
msgid "Red: "
msgstr "紅: "
-#: src/gui/setup_colors.cpp:125
+#: src/gui/setup_colors.cpp:123
msgid "Green: "
msgstr "綠: "
-#: src/gui/setup_colors.cpp:141
+#: src/gui/setup_colors.cpp:138
msgid "Blue: "
msgstr "藍: "
-#: src/gui/setup.cpp:73
-msgid "Apply"
-msgstr "確定"
-
-#: src/gui/setup.cpp:73
-msgid "Reset Windows"
-msgstr "重置視窗"
-
#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:78
msgid "Press the button to start calibration"
msgstr "按下按鈕開始矯正"
@@ -1308,7 +1291,7 @@ msgstr "不理"
msgid "Ignored"
msgstr "忽略"
-#: src/gui/setup_players.cpp:207
+#: src/gui/setup_players.cpp:207 src/gui/setup_video.cpp:131
msgid "???"
msgstr "???"
@@ -1336,153 +1319,173 @@ msgstr "玩家"
msgid "When ignoring:"
msgstr "當忽略時:"
-#: src/gui/setup_video.cpp:123
+#: src/gui/setup_video.cpp:112
+msgid "Tiny"
+msgstr ""
+
+#: src/gui/setup_video.cpp:113
+msgid "Small"
+msgstr "小型"
+
+#: src/gui/setup_video.cpp:114
+msgid "Medium"
+msgstr "中型"
+
+#: src/gui/setup_video.cpp:115
+msgid "Large"
+msgstr "大型"
+
+#: src/gui/setup_video.cpp:151
msgid "Full screen"
msgstr "全螢幕"
-#: src/gui/setup_video.cpp:124
+#: src/gui/setup_video.cpp:152
msgid "OpenGL"
msgstr "OpenGL"
-#: src/gui/setup_video.cpp:125
+#: src/gui/setup_video.cpp:153
msgid "Custom cursor"
msgstr "自訂滑鼠標"
-#: src/gui/setup_video.cpp:126
+#: src/gui/setup_video.cpp:155
msgid "Visible names"
msgstr "可見的名稱"
-#: src/gui/setup_video.cpp:127
+#: src/gui/setup_video.cpp:157
msgid "Particle effects"
msgstr "粒子效果"
-#: src/gui/setup_video.cpp:128
+#: src/gui/setup_video.cpp:159
msgid "Show name"
msgstr "顯示名稱"
-#: src/gui/setup_video.cpp:129
+#: src/gui/setup_video.cpp:160
msgid "Show pickup notification"
msgstr "顯示撿拾通知"
-#: src/gui/setup_video.cpp:130
+#: src/gui/setup_video.cpp:161
msgid "in chat"
msgstr "聊天中"
-#: src/gui/setup_video.cpp:131
+#: src/gui/setup_video.cpp:162
msgid "as particle"
-msgstr ""
+msgstr "如同練習"
-#: src/gui/setup_video.cpp:136
+#: src/gui/setup_video.cpp:167
msgid "FPS Limit:"
msgstr "FPS限制:"
-#: src/gui/setup_video.cpp:152
+#: src/gui/setup_video.cpp:184
msgid "Video"
msgstr "顯示"
-#: src/gui/setup_video.cpp:157
+#: src/gui/setup_video.cpp:189
msgid "Overhead text"
msgstr "置頂文字"
-#: src/gui/setup_video.cpp:158
+#: src/gui/setup_video.cpp:190
msgid "Gui opacity"
msgstr "Gui 透明度"
-#: src/gui/setup_video.cpp:159
+#: src/gui/setup_video.cpp:191
msgid "Scroll radius"
msgstr "捲動半徑"
-#: src/gui/setup_video.cpp:160
+#: src/gui/setup_video.cpp:192
msgid "Scroll laziness"
msgstr "捲動延遲"
-#: src/gui/setup_video.cpp:161
+#: src/gui/setup_video.cpp:193
msgid "Ambient FX"
msgstr "Ambient FX"
-#: src/gui/setup_video.cpp:162
+#: src/gui/setup_video.cpp:194
msgid "Particle Detail"
msgstr "紋理細節"
-#: src/gui/setup_video.cpp:230 src/gui/setup_video.cpp:492
+#: src/gui/setup_video.cpp:195
+msgid "Font size"
+msgstr "字型大小"
+
+#: src/gui/setup_video.cpp:265 src/gui/setup_video.cpp:564
msgid "No text"
msgstr "沒有文字"
-#: src/gui/setup_video.cpp:236 src/gui/setup_video.cpp:498
+#: src/gui/setup_video.cpp:271 src/gui/setup_video.cpp:570
msgid "Bubbles, no names"
-msgstr ""
+msgstr "有聊天泡泡,沒名字"
-#: src/gui/setup_video.cpp:239 src/gui/setup_video.cpp:501
+#: src/gui/setup_video.cpp:274 src/gui/setup_video.cpp:573
msgid "Bubbles with names"
-msgstr ""
+msgstr "聊天泡泡加名字"
-#: src/gui/setup_video.cpp:247 src/gui/setup_video.cpp:538
+#: src/gui/setup_video.cpp:282 src/gui/setup_video.cpp:610
msgid "off"
msgstr "關閉"
-#: src/gui/setup_video.cpp:250 src/gui/setup_video.cpp:261
-#: src/gui/setup_video.cpp:541 src/gui/setup_video.cpp:555
+#: src/gui/setup_video.cpp:285 src/gui/setup_video.cpp:296
+#: src/gui/setup_video.cpp:613 src/gui/setup_video.cpp:627
msgid "low"
msgstr "低"
-#: src/gui/setup_video.cpp:253 src/gui/setup_video.cpp:267
-#: src/gui/setup_video.cpp:544 src/gui/setup_video.cpp:561
+#: src/gui/setup_video.cpp:288 src/gui/setup_video.cpp:302
+#: src/gui/setup_video.cpp:616 src/gui/setup_video.cpp:633
msgid "high"
msgstr "高"
-#: src/gui/setup_video.cpp:264 src/gui/setup_video.cpp:558
+#: src/gui/setup_video.cpp:299 src/gui/setup_video.cpp:630
msgid "medium"
msgstr "中"
-#: src/gui/setup_video.cpp:270 src/gui/setup_video.cpp:564
+#: src/gui/setup_video.cpp:305 src/gui/setup_video.cpp:636
msgid "max"
msgstr "最大"
-#: src/gui/setup_video.cpp:340
+#: src/gui/setup_video.cpp:410
msgid "Failed to switch to "
msgstr "無法切換到 "
-#: src/gui/setup_video.cpp:341
+#: src/gui/setup_video.cpp:411
msgid "windowed"
msgstr "視窗化"
-#: src/gui/setup_video.cpp:341
+#: src/gui/setup_video.cpp:411
msgid "fullscreen"
msgstr "全螢幕"
-#: src/gui/setup_video.cpp:342
+#: src/gui/setup_video.cpp:412
msgid "mode and restoration of old mode also failed!"
msgstr ""
-#: src/gui/setup_video.cpp:351
+#: src/gui/setup_video.cpp:421
msgid "Switching to full screen"
msgstr "切換全螢幕"
-#: src/gui/setup_video.cpp:352
+#: src/gui/setup_video.cpp:422
msgid "Restart needed for changes to take effect."
msgstr "請重新啟動"
-#: src/gui/setup_video.cpp:364
+#: src/gui/setup_video.cpp:434
msgid "Changing OpenGL"
msgstr "切換為OpenGL"
-#: src/gui/setup_video.cpp:365
+#: src/gui/setup_video.cpp:435
msgid "Applying change to OpenGL requires restart."
msgstr "確認切換OpenGL需要重新開始"
-#: src/gui/setup_video.cpp:448
+#: src/gui/setup_video.cpp:520
msgid "Screen resolution changed"
msgstr "螢幕解析度已變更"
-#: src/gui/setup_video.cpp:449
+#: src/gui/setup_video.cpp:521
msgid "Restart your client for the change to take effect."
msgstr "請重新啟動您的客戶端讓變更生效。"
-#: src/gui/setup_video.cpp:473
+#: src/gui/setup_video.cpp:545
msgid "Particle effect settings changed."
msgstr "粒子效果設定值已變更。"
-#: src/gui/setup_video.cpp:474
+#: src/gui/setup_video.cpp:546
msgid "Changes will take effect on map change."
msgstr "變更會在地圖改變後生效。"
@@ -1494,6 +1497,10 @@ msgstr "skills.xml"
msgid "Mystery Skill"
msgstr "神秘技能"
+#: src/gui/skill.cpp:126 src/gui/skilldialog.cpp:99 src/gui/windowmenu.cpp:62
+msgid "Skills"
+msgstr "技能"
+
#: src/gui/skill.cpp:145 src/gui/skill.cpp:197
#, c-format
msgid "Skill points: %d"
@@ -1503,182 +1510,174 @@ msgstr "技能點數:%d"
msgid "Up"
msgstr "升級"
-#: src/gui/skill.cpp:146
-msgid "inc"
-msgstr ""
-
-#: src/gui/skill.cpp:147
-msgid "use"
-msgstr "使用"
-
#: src/gui/skilldialog.cpp:113
msgid "Weapons"
msgstr "武器"
#: src/gui/skilldialog.cpp:121
msgid "Crafts"
-msgstr ""
+msgstr "工藝品"
-#: src/gui/status.cpp:57 src/gui/status.cpp:178
+#: src/gui/status.cpp:56 src/gui/status.cpp:177
#, c-format
msgid "Job: %d"
msgstr "職業:%d"
-#: src/gui/status.cpp:61
+#: src/gui/status.cpp:60
msgid "HP:"
msgstr "HP:"
-#: src/gui/status.cpp:64
+#: src/gui/status.cpp:63
msgid "Exp:"
msgstr "Exp:"
-#: src/gui/status.cpp:67
+#: src/gui/status.cpp:66
msgid "MP:"
msgstr "MP:"
-#: src/gui/status.cpp:70
+#: src/gui/status.cpp:69
msgid "Job:"
msgstr "職業:"
-#: src/gui/status.cpp:78
+#: src/gui/status.cpp:77
msgid "Stats"
msgstr "狀態"
-#: src/gui/status.cpp:79
+#: src/gui/status.cpp:78
msgid "Total"
msgstr "總共"
-#: src/gui/status.cpp:80
+#: src/gui/status.cpp:79
msgid "Cost"
msgstr "需求"
-#: src/gui/status.cpp:84
+#: src/gui/status.cpp:83
msgid "Attack:"
msgstr "攻擊:"
-#: src/gui/status.cpp:85
+#: src/gui/status.cpp:84
msgid "Defense:"
msgstr "防禦:"
-#: src/gui/status.cpp:86
+#: src/gui/status.cpp:85
msgid "M.Attack:"
msgstr "摩攻:"
-#: src/gui/status.cpp:87
+#: src/gui/status.cpp:86
msgid "M.Defense:"
msgstr "魔防:"
-#: src/gui/status.cpp:89
+#: src/gui/status.cpp:88
#, no-c-format
msgid "% Accuracy:"
msgstr "% Ac準確度:"
-#: src/gui/status.cpp:91
+#: src/gui/status.cpp:90
#, no-c-format
msgid "% Evade:"
msgstr "% E迴避率:"
-#: src/gui/status.cpp:93
+#: src/gui/status.cpp:92
#, no-c-format
msgid "% Reflex:"
msgstr "% 傷害反射:"
-#: src/gui/status.cpp:199
+#: src/gui/status.cpp:198
msgid "Strength"
msgstr "力量"
-#: src/gui/status.cpp:200
+#: src/gui/status.cpp:199
msgid "Agility"
msgstr "敏捷"
-#: src/gui/status.cpp:201
+#: src/gui/status.cpp:200
msgid "Vitality"
msgstr "體力"
-#: src/gui/status.cpp:202
+#: src/gui/status.cpp:201
msgid "Intelligence"
msgstr "智力"
-#: src/gui/status.cpp:203
+#: src/gui/status.cpp:202
msgid "Dexterity"
msgstr "閃躲"
-#: src/gui/status.cpp:204
+#: src/gui/status.cpp:203
msgid "Luck"
msgstr "幸運"
-#: src/gui/status.cpp:222
+#: src/gui/status.cpp:221
#, c-format
msgid "Remaining Status Points: %d"
msgstr "剩餘狀態點數:%d"
-#: src/gui/status.cpp:383 src/gui/status.cpp:405
+#: src/gui/status.cpp:384
msgid "Max level"
msgstr "最大等級"
-#: src/gui/storagewindow.cpp:53
+#: src/gui/storagewindow.cpp:54
msgid "Storage"
msgstr "貯藏庫"
-#: src/gui/storagewindow.cpp:64
+#: src/gui/storagewindow.cpp:65
msgid "Store"
msgstr "寄放"
-#: src/gui/storagewindow.cpp:65
+#: src/gui/storagewindow.cpp:66
msgid "Retrieve"
msgstr "取回"
-#: src/gui/storagewindow.cpp:75
+#: src/gui/storagewindow.cpp:78
msgid "Slots: "
msgstr "欄位: "
-#: src/gui/trade.cpp:52
+#: src/gui/trade.cpp:51
msgid "Propose trade"
msgstr "是否交易"
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:52
msgid "Confirmed. Waiting..."
msgstr "已確認。請稍候..."
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:53
msgid "Agree trade"
msgstr "同意交易"
-#: src/gui/trade.cpp:55
+#: src/gui/trade.cpp:54
msgid "Agreed. Waiting..."
msgstr "已同意。請稍候..."
-#: src/gui/trade.cpp:58
+#: src/gui/trade.cpp:57
msgid "Trade: You"
msgstr "交易:您"
-#: src/gui/trade.cpp:71 src/gui/trade.cpp:72
+#: src/gui/trade.cpp:70 src/gui/trade.cpp:71
msgid "Trade"
msgstr "交易"
-#: src/gui/trade.cpp:74
+#: src/gui/trade.cpp:73
msgid "Add"
msgstr "增加"
-#: src/gui/trade.cpp:96 src/gui/trade.cpp:132 src/gui/trade.cpp:178
+#: src/gui/trade.cpp:95 src/gui/trade.cpp:131
#, c-format
msgid "You get %s."
msgstr "您得到 %s。"
-#: src/gui/trade.cpp:97
+#: src/gui/trade.cpp:96
msgid "You give:"
msgstr "你付出:"
-#: src/gui/trade.cpp:101
+#: src/gui/trade.cpp:100
msgid "Change"
msgstr "更改"
-#: src/gui/trade.cpp:271
+#: src/gui/trade.cpp:268
msgid ""
"Failed adding item. You can not overlap one kind of item on the window."
msgstr "增加物品失敗。你不能覆蓋視窗中的該類物品能。"
-#: src/gui/trade.cpp:321
+#: src/gui/trade.cpp:311
msgid "You don't have enough money"
msgstr "您沒有足夠的錢"
@@ -1790,21 +1789,21 @@ msgstr "需要指定要成為 op 的使用者!"
msgid "Need a user to kick!"
msgstr "需要指定要踢掉的使用者!"
-#: src/gui/widgets/chattab.cpp:115
+#: src/gui/widgets/chattab.cpp:114
msgid "Global announcement:"
msgstr "主要公告:"
-#: src/gui/widgets/chattab.cpp:121
+#: src/gui/widgets/chattab.cpp:120
#, c-format
msgid "Global announcement from %s:"
msgstr "%s 主要公告:"
-#: src/gui/widgets/chattab.cpp:147
+#: src/gui/widgets/chattab.cpp:146
#, c-format
msgid "%s whispers: "
msgstr "%s 的悄悄話: "
-#: src/gui/widgets/chattab.cpp:241 src/resources/itemdb.cpp:108
+#: src/gui/widgets/chattab.cpp:240 src/resources/itemdb.cpp:107
msgid "Unknown item"
msgstr "不明的物品"
@@ -1812,23 +1811,34 @@ msgstr "不明的物品"
msgid "Cannot send empty chat!"
msgstr "不能傳送空的聊天訊息!"
-#: src/gui/widgets/whispertab.cpp:55
-#, c-format
-msgid "%s: %s"
-msgstr "%s: %s"
-
-#: src/gui/widgets/whispertab.cpp:69
+#: src/gui/widgets/whispertab.cpp:68
msgid "/close > Close the whisper tab"
msgstr "/close > 關閉悄悄話分頁"
-#: src/gui/widgets/whispertab.cpp:79
+#: src/gui/widgets/whispertab.cpp:78
msgid "Command: /close"
msgstr "指令: /close"
-#: src/gui/widgets/whispertab.cpp:80
+#: src/gui/widgets/whispertab.cpp:79
msgid "This command closes the current whisper tab."
msgstr "這個指令會關閉目前的悄悄話分頁。"
+#: src/gui/windowmenu.cpp:59
+msgid "Status"
+msgstr "狀態"
+
+#: src/gui/windowmenu.cpp:65
+msgid "Guilds"
+msgstr "公會"
+
+#: src/gui/windowmenu.cpp:66
+msgid "Buddys"
+msgstr "好友"
+
+#: src/gui/windowmenu.cpp:68
+msgid "Shortcut"
+msgstr "快捷鍵"
+
#: src/keyboardconfig.cpp:41
msgid "Move Up"
msgstr "上移"
@@ -1948,8 +1958,8 @@ msgid "Debug Window"
msgstr "程式除錯視窗"
#: src/keyboardconfig.cpp:80
-msgid "Emote Window"
-msgstr "表情視窗"
+msgid "Party Window"
+msgstr "隊伍視窗"
#: src/keyboardconfig.cpp:81
msgid "Emote Shortcut Window"
@@ -1997,159 +2007,163 @@ msgstr "忽略輸入 1"
msgid "Ignore input 2"
msgstr "忽略輸入 2"
-#: src/localplayer.cpp:849
+#: src/localplayer.cpp:834
msgid "Unarmed"
msgstr "未命名"
-#: src/localplayer.cpp:850
+#: src/localplayer.cpp:835
msgid "Knife"
msgstr "小刀"
-#: src/localplayer.cpp:851
+#: src/localplayer.cpp:836
msgid "Sword"
msgstr "劍"
-#: src/localplayer.cpp:852
+#: src/localplayer.cpp:837
msgid "Polearm"
msgstr "長戰斧"
-#: src/localplayer.cpp:853
+#: src/localplayer.cpp:838
msgid "Staff"
msgstr "杖"
-#: src/localplayer.cpp:854
+#: src/localplayer.cpp:839
msgid "Whip"
msgstr "鞭子"
-#: src/localplayer.cpp:855
+#: src/localplayer.cpp:840
msgid "Bow"
msgstr "弓"
-#: src/localplayer.cpp:856
+#: src/localplayer.cpp:841
msgid "Shooting"
msgstr "射擊"
-#: src/localplayer.cpp:857
+#: src/localplayer.cpp:842
msgid "Mace"
msgstr "錘"
-#: src/localplayer.cpp:858
+#: src/localplayer.cpp:843
msgid "Axe"
msgstr "斧"
-#: src/localplayer.cpp:859
+#: src/localplayer.cpp:844
msgid "Thrown"
msgstr "投擲"
-#: src/localplayer.cpp:861
+#: src/localplayer.cpp:846
msgid "Craft"
-msgstr ""
+msgstr "工藝品"
-#: src/localplayer.cpp:862
+#: src/localplayer.cpp:847
msgid "Unknown Skill"
msgstr "不明的技能"
-#: src/main.cpp:253
+#: src/main.cpp:255
msgid "Invalid update host: "
msgstr "無效的更新主機: "
-#: src/main.cpp:286 src/main.cpp:292
+#: src/main.cpp:288 src/main.cpp:294
msgid "Error creating updates directory!"
msgstr "建立更新目錄失敗!"
-#: src/main.cpp:325
+#: src/main.cpp:327
msgid " can't be created, but it doesn't exist! Exiting."
msgstr " 不能建立,但是它也不存在!現在結束。"
-#: src/main.cpp:481
+#: src/main.cpp:483
msgid "Couldn't set "
msgstr "無法設定 "
-#: src/main.cpp:482
+#: src/main.cpp:484
msgid " video mode: "
msgstr " 視訊模式: "
-#: src/main.cpp:562
+#: src/main.cpp:566
msgid "tmw"
msgstr "tmw"
-#: src/main.cpp:563
-msgid "Options: "
-msgstr "選項: "
-
-#: src/main.cpp:564
-msgid " -C --configfile : Configuration file to use"
-msgstr " -C --configfile : 要使用的組態檔案"
-
-#: src/main.cpp:565
-msgid " -d --data : Directory to load game data from"
-msgstr " -d --data : 用來載入遊戲資料的目錄"
-
-#: src/main.cpp:566
-msgid " -D --default : Bypass the login process with default settings"
-msgstr " -D --default : 以預設的設定值跳過登入程序"
+#: src/main.cpp:567
+msgid "Options:"
+msgstr "選項:"
#: src/main.cpp:568
-msgid " -h --help : Display this help"
-msgstr " -h --help : 顯示這個說明"
+msgid " -C --config-file : Configuration file to use"
+msgstr " -C --config-file : 使用此設定檔"
#: src/main.cpp:569
-msgid " -S --homedir : Directory to use as home directory"
-msgstr " -S --homedir : 做為家目錄的目錄"
+msgid " -d --data : Directory to load game data from"
+msgstr ""
#: src/main.cpp:570
-msgid " -H --updatehost : Use this update host"
-msgstr " -H --updatehost : 使用這個更新主機"
-
-#: src/main.cpp:571
-msgid " -P --password : Login with this password"
-msgstr " -P --password : 以這個密碼登入"
+msgid " -D --default : Choose default character server and character"
+msgstr " -D --default : 選擇預設的角色伺服器及角色"
#: src/main.cpp:572
-msgid " -c --character : Login with this character"
-msgstr " -c --character : 以這個角色登入"
+msgid " -h --help : Display this help"
+msgstr " -h --help : 顯示求助說明"
#: src/main.cpp:573
-msgid " -o --port : Login Server Port"
-msgstr " -o --port : 登入伺服器連接埠"
+msgid " -S --home-dir : Directory to use as home directory"
+msgstr " -S --home-dir : 設定此目錄為家目錄"
#: src/main.cpp:574
-msgid " -s --server : Login Server name or IP"
-msgstr " -s --server : 登入伺服器名稱或 IP"
+msgid " -H --update-host : Use this update host"
+msgstr " -H --update-host : 使用此更新伺服器"
#: src/main.cpp:575
-msgid " -u --skipupdate : Skip the update downloads"
-msgstr " -u --skipupdate : 略過更新的下載"
+msgid " -P --password : Login with this password"
+msgstr " -P --password : 用此密碼登入"
#: src/main.cpp:576
-msgid " -U --username : Login with this username"
-msgstr " -U --username : 以這個使用者名稱登入"
+msgid " -c --character : Login with this character"
+msgstr " -c --character : 用此帳號登入"
#: src/main.cpp:577
-msgid " -v --version : Display the version"
-msgstr " -v --version : 顯示版本"
+msgid " -p --port : Login Server Port"
+msgstr " -p --port : 伺服器端口"
+
+#: src/main.cpp:578
+msgid " -s --server : Login Server name or IP"
+msgstr " -s --server : 登入伺服器名稱或IP位址"
+
+#: src/main.cpp:579
+msgid " -u --skip-update : Skip the update downloads"
+msgstr " -u --skip-update : 不使用更新"
+
+#: src/main.cpp:580
+msgid " -U --username : Login with this username"
+msgstr " -U -username : 使用此帳號登入"
#: src/main.cpp:582
+msgid " -O --no-opengl : Disable OpenGL for this session"
+msgstr " -O --no-opengl : 不使用OpenGL"
+
+#: src/main.cpp:584
+msgid " -v --version : Display the version"
+msgstr " -v --version : 顯示遊戲版本"
+
+#: src/main.cpp:589
msgid "The Mana World "
-msgstr ""
+msgstr "瑪那世界 "
-#: src/main.cpp:1499
+#: src/main.cpp:1515
msgid "Connecting to map server..."
msgstr "正在連接到地圖伺服器..."
-#: src/main.cpp:1507
+#: src/main.cpp:1523
msgid "Connecting to character server..."
msgstr "正在連接角色伺服器..."
-#: src/main.cpp:1515
+#: src/main.cpp:1531
msgid "Connecting to account server..."
msgstr "正在連接帳號伺服器..."
-#: src/net/ea/adminhandler.cpp:67
+#: src/net/ea/adminhandler.cpp:66
msgid "Kick failed!"
msgstr "踢人失敗!"
-#: src/net/ea/adminhandler.cpp:69
+#: src/net/ea/adminhandler.cpp:68
msgid "Kick succeeded!"
msgstr "踢人成功!"
@@ -2230,18 +2244,18 @@ msgstr "閃躲:"
msgid "Luck:"
msgstr "幸運:"
-#: src/net/ea/chathandler.cpp:81
+#: src/net/ea/chathandler.cpp:78
msgid "Whisper could not be sent, user is offline"
msgstr "無法傳送悄悄話,使用者已離線"
-#: src/net/ea/chathandler.cpp:84
+#: src/net/ea/chathandler.cpp:81
msgid "Whisper could not be sent, ignored by user"
msgstr "無法傳送悄悄話,被使用者忽略"
-#: src/net/ea/chathandler.cpp:203 src/net/ea/chathandler.cpp:209
-#: src/net/ea/chathandler.cpp:214 src/net/ea/chathandler.cpp:219
-#: src/net/ea/chathandler.cpp:224 src/net/ea/chathandler.cpp:229
-#: src/net/ea/chathandler.cpp:234 src/net/ea/chathandler.cpp:239
+#: src/net/ea/chathandler.cpp:200 src/net/ea/chathandler.cpp:206
+#: src/net/ea/chathandler.cpp:211 src/net/ea/chathandler.cpp:216
+#: src/net/ea/chathandler.cpp:221 src/net/ea/chathandler.cpp:226
+#: src/net/ea/chathandler.cpp:231 src/net/ea/chathandler.cpp:236
msgid "Channels are not supported!"
msgstr "頻道不支援!"
@@ -2253,125 +2267,133 @@ msgstr "無法裝備。"
msgid "Unable to unequip."
msgstr "無法卸下裝備。"
-#: src/net/ea/generalhandler.cpp:90 src/net/tmwserv/generalhandler.cpp:80
+#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:82
#, c-format
msgid "Strength: %d"
msgstr "力量: %d"
-#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:82
+#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:84
#, c-format
msgid "Agility: %d"
msgstr "敏捷: %d"
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:86
+#: src/net/ea/generalhandler.cpp:96 src/net/tmwserv/generalhandler.cpp:88
#, c-format
msgid "Vitality: %d"
msgstr "體力: %d"
-#: src/net/ea/generalhandler.cpp:96 src/net/tmwserv/generalhandler.cpp:88
+#: src/net/ea/generalhandler.cpp:98 src/net/tmwserv/generalhandler.cpp:90
#, c-format
msgid "Intelligence: %d"
msgstr "智力: %d"
-#: src/net/ea/generalhandler.cpp:98 src/net/tmwserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:100 src/net/tmwserv/generalhandler.cpp:86
#, c-format
msgid "Dexterity: %d"
msgstr "閃躲: %d"
-#: src/net/ea/generalhandler.cpp:100
+#: src/net/ea/generalhandler.cpp:102
#, c-format
msgid "Luck: %d"
msgstr "幸運: %d"
-#: src/net/ea/generalhandler.cpp:123
+#: src/net/ea/generalhandler.cpp:125
msgid "Authentication failed"
msgstr "驗證失敗"
-#: src/net/ea/generalhandler.cpp:126
+#: src/net/ea/generalhandler.cpp:128
msgid "No servers available"
msgstr "沒有可用的伺服器"
-#: src/net/ea/generalhandler.cpp:129
+#: src/net/ea/generalhandler.cpp:132
+msgid "Someone else is trying to use this account"
+msgstr "此帳號正在使用中"
+
+#: src/net/ea/generalhandler.cpp:135
msgid "This account is already logged in"
msgstr "這個帳號已經登入"
-#: src/net/ea/generalhandler.cpp:132
+#: src/net/ea/generalhandler.cpp:138
msgid "Speed hack detected"
-msgstr ""
+msgstr "使用加速器"
-#: src/net/ea/generalhandler.cpp:135
+#: src/net/ea/generalhandler.cpp:141
msgid "Duplicated login"
msgstr "重複登入"
-#: src/net/ea/generalhandler.cpp:138
+#: src/net/ea/generalhandler.cpp:144
msgid "Unknown connection error"
msgstr "不明的連線錯誤"
-#: src/net/ea/generalhandler.cpp:197
+#: src/net/ea/generalhandler.cpp:201
msgid "Got disconnected from server!"
msgstr "和伺服器失去連線"
-#: src/net/ea/gui/partytab.cpp:54
+#: src/net/ea/gui/partytab.cpp:52
+msgid "/help > Display this help."
+msgstr "/help > 顯示這個說明文件。"
+
+#: src/net/ea/gui/partytab.cpp:53
msgid "/create > Create a new party"
msgstr "/create > 建立新的隊伍"
-#: src/net/ea/gui/partytab.cpp:55
+#: src/net/ea/gui/partytab.cpp:54
msgid "/new > Alias of create"
msgstr "/new > 效果同 create 指令"
-#: src/net/ea/gui/partytab.cpp:56
+#: src/net/ea/gui/partytab.cpp:55
msgid "/invite > Invite a player to your party"
msgstr "/invite > 邀請玩家加入您的隊伍"
-#: src/net/ea/gui/partytab.cpp:57
+#: src/net/ea/gui/partytab.cpp:56
msgid "/leave > Leave the party you are in"
msgstr "/leave > 離開您加入的隊伍"
-#: src/net/ea/gui/partytab.cpp:58
+#: src/net/ea/gui/partytab.cpp:57
msgid "/kick > Kick some one from the party you are in"
msgstr "/kick > 從您加入的隊伍中把某人踢出"
-#: src/net/ea/gui/partytab.cpp:59
+#: src/net/ea/gui/partytab.cpp:58
msgid "/item > Show/change party item sharing options"
msgstr "/item > 顯示/改變隊伍道具分享選項"
-#: src/net/ea/gui/partytab.cpp:60
+#: src/net/ea/gui/partytab.cpp:59
msgid "/exp > Show/change party experience sharing options"
msgstr "/exp > 顯示/改變隊伍經驗值分享選項"
-#: src/net/ea/gui/partytab.cpp:69
+#: src/net/ea/gui/partytab.cpp:68
msgid "Command: /new <party-name>"
msgstr "指令: /new <party-name>"
-#: src/net/ea/gui/partytab.cpp:70
+#: src/net/ea/gui/partytab.cpp:69
msgid "Command: /create <party-name>"
msgstr "指令: /create <party-name>"
-#: src/net/ea/gui/partytab.cpp:71
+#: src/net/ea/gui/partytab.cpp:70
msgid "These commands create a new party called <party-name>."
msgstr "這些指令會建立叫做 <party-name> 的新隊伍。"
-#: src/net/ea/gui/partytab.cpp:75
+#: src/net/ea/gui/partytab.cpp:74
msgid "Command: /invite <nick>"
msgstr "指令: /invite <nick>"
-#: src/net/ea/gui/partytab.cpp:82
+#: src/net/ea/gui/partytab.cpp:81
msgid "Command: /leave"
msgstr "指令: /leave"
-#: src/net/ea/gui/partytab.cpp:83
+#: src/net/ea/gui/partytab.cpp:82
msgid "This command causes the player to leave the party."
msgstr "這個指令會使玩家離開隊伍。"
-#: src/net/ea/gui/partytab.cpp:87
+#: src/net/ea/gui/partytab.cpp:86
msgid "Command: /item <policy>"
msgstr "指令: /item <policy>"
-#: src/net/ea/gui/partytab.cpp:88
+#: src/net/ea/gui/partytab.cpp:87
msgid "This command changes the party's item sharing policy."
msgstr "這個指令會改變隊伍的道具分享政策。"
-#: src/net/ea/gui/partytab.cpp:89
+#: src/net/ea/gui/partytab.cpp:88
msgid ""
"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
"\"0\", \"no\", \"false\" to disable item sharing."
@@ -2379,23 +2401,23 @@ msgstr ""
"<policy> 可以是 \"1\"、\"yes\"、\"true\" 之一代表啟用道具分享,或是 \"0\"、\"no\"、\"false\" "
"來停用道具分享。"
-#: src/net/ea/gui/partytab.cpp:92
+#: src/net/ea/gui/partytab.cpp:91
msgid "Command: /item"
msgstr "指令: /item"
-#: src/net/ea/gui/partytab.cpp:93
+#: src/net/ea/gui/partytab.cpp:92
msgid "This command displays the party's current item sharing policy."
msgstr "這個指令會顯示此隊伍目前的道具分享政策。"
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/ea/gui/partytab.cpp:96
msgid "Command: /exp <policy>"
msgstr "指令: /exp <policy>"
-#: src/net/ea/gui/partytab.cpp:98
+#: src/net/ea/gui/partytab.cpp:97
msgid "This command changes the party's experience sharing policy."
msgstr "這個指令會改變此隊伍的經驗值分享政策。"
-#: src/net/ea/gui/partytab.cpp:99
+#: src/net/ea/gui/partytab.cpp:98
msgid ""
"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
"sharing, or \"0\", \"no\", \"false\" to disable experience sharing."
@@ -2403,77 +2425,77 @@ msgstr ""
"<policy> 可以是 \"1\"、\"yes\"、\"true\" 之一代表啟用經驗值分享,或是 \"0\"、\"no\"、\"false\" "
"來停用經驗值分享。"
-#: src/net/ea/gui/partytab.cpp:102
+#: src/net/ea/gui/partytab.cpp:101
msgid "Command: /exp"
msgstr "指令: /exp"
-#: src/net/ea/gui/partytab.cpp:103
+#: src/net/ea/gui/partytab.cpp:102
msgid "This command displays the party's current experience sharing policy."
msgstr "這個指令會顯示此隊伍目前的經驗值分享政策。"
-#: src/net/ea/gui/partytab.cpp:111
+#: src/net/ea/gui/partytab.cpp:110
msgid "Party name is missing."
msgstr "漏掉隊伍名稱。"
-#: src/net/ea/gui/partytab.cpp:134 src/net/ea/partyhandler.cpp:188
+#: src/net/ea/gui/partytab.cpp:133 src/net/ea/partyhandler.cpp:191
msgid "Item sharing enabled."
msgstr "物品分享已啟用。"
-#: src/net/ea/gui/partytab.cpp:137 src/net/ea/partyhandler.cpp:194
+#: src/net/ea/gui/partytab.cpp:136 src/net/ea/partyhandler.cpp:197
msgid "Item sharing disabled."
msgstr "物品分享已停用。"
-#: src/net/ea/gui/partytab.cpp:140 src/net/ea/partyhandler.cpp:200
+#: src/net/ea/gui/partytab.cpp:139 src/net/ea/partyhandler.cpp:203
msgid "Item sharing not possible."
msgstr "物品分享不可能。"
-#: src/net/ea/gui/partytab.cpp:166 src/net/ea/partyhandler.cpp:165
+#: src/net/ea/gui/partytab.cpp:165 src/net/ea/partyhandler.cpp:168
msgid "Experience sharing enabled."
msgstr "經驗值分享已啟用。"
-#: src/net/ea/gui/partytab.cpp:169 src/net/ea/partyhandler.cpp:171
+#: src/net/ea/gui/partytab.cpp:168 src/net/ea/partyhandler.cpp:174
msgid "Experience sharing disabled."
msgstr "經驗值分享已停用。"
-#: src/net/ea/gui/partytab.cpp:172 src/net/ea/partyhandler.cpp:177
+#: src/net/ea/gui/partytab.cpp:171 src/net/ea/partyhandler.cpp:180
msgid "Experience sharing not possible."
msgstr "經驗值分享不可能。"
-#: src/net/ea/inventoryhandler.cpp:184
+#: src/net/ea/inventoryhandler.cpp:183
msgid "Unable to pick up item"
msgstr "無法撿拾物品"
-#: src/net/ea/inventoryhandler.cpp:194
+#: src/net/ea/inventoryhandler.cpp:193
#, c-format
-msgid "You picked up %s [%s]"
-msgstr "您已經撿起 %s [%s]"
+msgid "You picked up %s [@@%d|%s@@]"
+msgstr "你撿起了 %s [@@%d|%s@@]"
-#: src/net/ea/inventoryhandler.cpp:240
+#: src/net/ea/inventoryhandler.cpp:239
msgid "Failed to use item"
msgstr "使用物品失敗"
-#: src/net/ea/loginhandler.cpp:111
+#: src/net/ea/loginhandler.cpp:110
msgid "Unregistered ID"
msgstr "未註冊的 ID"
-#: src/net/ea/loginhandler.cpp:114
+#: src/net/ea/loginhandler.cpp:113
msgid "Wrong password"
msgstr "錯誤的密碼"
-#: src/net/ea/loginhandler.cpp:117
+#: src/net/ea/loginhandler.cpp:116
msgid "Account expired"
msgstr "帳號已過期"
-#: src/net/ea/loginhandler.cpp:120
+#: src/net/ea/loginhandler.cpp:119
msgid "Rejected from server"
msgstr "被伺服器拒絕"
-#: src/net/ea/loginhandler.cpp:124
+#: src/net/ea/loginhandler.cpp:123
msgid ""
"You have been permanently banned from the game. Please contact the GM Team."
msgstr "您已經被這個遊戲永遠列入黑名單。請連絡 GM 團隊。"
-#: src/net/ea/loginhandler.cpp:128
+#: src/net/ea/loginhandler.cpp:127
#, c-format
msgid ""
"You have been temporarily banned from the game until %s.\n"
@@ -2482,190 +2504,196 @@ msgstr ""
"您暫時被此遊戲列入黑名單,直到 %s。\n"
" 請透過討論區連絡 GM 團隊。"
-#: src/net/ea/loginhandler.cpp:135
+#: src/net/ea/loginhandler.cpp:134
msgid "This user name is already taken"
msgstr "這個使用者名稱已經被使用了"
-#: src/net/ea/loginhandler.cpp:138
+#: src/net/ea/loginhandler.cpp:137 src/net/tmwserv/loginhandler.cpp:89
+#: src/net/tmwserv/loginhandler.cpp:119 src/net/tmwserv/loginhandler.cpp:152
+#: src/net/tmwserv/loginhandler.cpp:188 src/net/tmwserv/loginhandler.cpp:220
msgid "Unknown error"
msgstr "不明的錯誤"
-#: src/net/ea/partyhandler.cpp:78
-msgid "Party successfully created."
-msgstr "隊伍已成功的建立。"
-
-#: src/net/ea/partyhandler.cpp:82
+#: src/net/ea/partyhandler.cpp:77
msgid "Could not create party."
msgstr "無法建立隊伍。"
-#: src/net/ea/partyhandler.cpp:112
+#: src/net/ea/partyhandler.cpp:80
+msgid "Party successfully created."
+msgstr "隊伍已成功的建立。"
+
+#: src/net/ea/partyhandler.cpp:115
#, c-format
msgid "%s is already a member of a party."
msgstr "%s 已經是隊伍的一員。"
-#: src/net/ea/partyhandler.cpp:116
+#: src/net/ea/partyhandler.cpp:119
#, c-format
msgid "%s refused your invitation."
msgstr "%s 拒絕您的邀請。"
-#: src/net/ea/partyhandler.cpp:120
+#: src/net/ea/partyhandler.cpp:123
#, c-format
msgid "%s is now a member of your party."
msgstr "%s 現在已經是您隊伍的成員。"
-#: src/net/ea/partyhandler.cpp:124
+#: src/net/ea/partyhandler.cpp:127
#, c-format
msgid "Unknown invite response for %s."
msgstr "給 %s 的不明邀請回應。"
-#: src/net/ea/partyhandler.cpp:229
+#: src/net/ea/partyhandler.cpp:232
msgid "You have left the party."
msgstr "您已經離開此隊伍。"
-#: src/net/ea/partyhandler.cpp:232
+#: src/net/ea/partyhandler.cpp:235
#, c-format
msgid "%s has left your party."
msgstr "%s 已經離開您的隊伍。"
-#: src/net/ea/partyhandler.cpp:269
+#: src/net/ea/partyhandler.cpp:272
#, c-format
msgid "An unknown member tried to say: %s"
msgstr "不明的成員試著要說:%s"
-#: src/net/ea/partyhandler.cpp:323
+#: src/net/ea/partyhandler.cpp:298
+msgid "Inviting like this isn't supported at the moment."
+msgstr "此時無法支援邀請"
+
+#: src/net/ea/partyhandler.cpp:327
#, c-format
msgid "%s is not in your party!"
msgstr "%s 不在您的隊伍中!"
-#: src/net/ea/playerhandler.cpp:108 src/net/tmwserv/beinghandler.cpp:312
+#: src/net/ea/playerhandler.cpp:96 src/net/tmwserv/beinghandler.cpp:312
msgid "You are dead."
msgstr "您已經死亡。"
-#: src/net/ea/playerhandler.cpp:109 src/net/tmwserv/beinghandler.cpp:313
+#: src/net/ea/playerhandler.cpp:97 src/net/tmwserv/beinghandler.cpp:313
msgid "We regret to inform you that your character was killed in battle."
msgstr "我們很遺憾的通知您,您的角色已經在戰鬥中被殺了。"
-#: src/net/ea/playerhandler.cpp:111 src/net/tmwserv/beinghandler.cpp:314
+#: src/net/ea/playerhandler.cpp:99 src/net/tmwserv/beinghandler.cpp:314
msgid "You are not that alive anymore."
msgstr "您不再是那麼有活力。"
-#: src/net/ea/playerhandler.cpp:112 src/net/tmwserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:100 src/net/tmwserv/beinghandler.cpp:315
msgid "The cold hands of the grim reaper are grabbing for your soul."
msgstr "殘酷的死神用冰冷的手正在抽出你的靈魂。"
-#: src/net/ea/playerhandler.cpp:113 src/net/tmwserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:101 src/net/tmwserv/beinghandler.cpp:316
msgid "Game Over!"
msgstr "遊戲結束!"
-#: src/net/ea/playerhandler.cpp:114
-msgid "Insert coin to continue"
-msgstr "投入硬幣接關"
+#: src/net/ea/playerhandler.cpp:102
+msgid "Insert coin to continue."
+msgstr "請投入金幣"
-#: src/net/ea/playerhandler.cpp:115 src/net/tmwserv/beinghandler.cpp:317
+#: src/net/ea/playerhandler.cpp:103 src/net/tmwserv/beinghandler.cpp:317
msgid ""
"No, kids. Your character did not really die. It... err... went to a better "
"place."
msgstr "不,孩子。您的角色並沒有真的死掉。他...呃...去了更好的地方。"
-#: src/net/ea/playerhandler.cpp:117 src/net/tmwserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:105 src/net/tmwserv/beinghandler.cpp:318
msgid ""
"Your plan of breaking your enemies weapon by bashing it with your throat "
"failed."
msgstr "您想讓敵人的武器插入您的喉嚨好折斷它的計畫失敗了。"
-#: src/net/ea/playerhandler.cpp:119 src/net/tmwserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:107 src/net/tmwserv/beinghandler.cpp:319
msgid "I guess this did not run too well."
-msgstr ""
+msgstr "我猜這並沒有跑得很好"
-#: src/net/ea/playerhandler.cpp:121 src/net/tmwserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:109 src/net/tmwserv/beinghandler.cpp:320
msgid "Do you want your possessions identified?"
msgstr "您想要鑑定你的財產嗎?"
-#: src/net/ea/playerhandler.cpp:123 src/net/tmwserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:111 src/net/tmwserv/beinghandler.cpp:321
msgid "Sadly, no trace of you was ever found..."
msgstr "很悲傷的,沒有人發現你的蹤跡..."
-#: src/net/ea/playerhandler.cpp:125 src/net/tmwserv/beinghandler.cpp:322
+#: src/net/ea/playerhandler.cpp:113 src/net/tmwserv/beinghandler.cpp:322
msgid "Annihilated."
msgstr "灰飛煙滅了。"
-#: src/net/ea/playerhandler.cpp:127 src/net/tmwserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:115 src/net/tmwserv/beinghandler.cpp:323
msgid "Looks like you got your head handed to you."
msgstr "看起來你把你的頭拿在手上。"
-#: src/net/ea/playerhandler.cpp:129 src/net/tmwserv/beinghandler.cpp:324
+#: src/net/ea/playerhandler.cpp:117 src/net/tmwserv/beinghandler.cpp:324
msgid ""
"You screwed up again, dump your body down the tubes and get you another one."
msgstr ""
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/ea/playerhandler.cpp:120
msgid "You're not dead yet. You're just resting."
msgstr "您還沒有死。您現在只是在休息。"
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/ea/playerhandler.cpp:121
msgid "You are no more."
-msgstr ""
+msgstr "你已經沒有更多"
-#: src/net/ea/playerhandler.cpp:134
+#: src/net/ea/playerhandler.cpp:122
msgid "You have ceased to be."
msgstr ""
-#: src/net/ea/playerhandler.cpp:135
+#: src/net/ea/playerhandler.cpp:123
msgid "You've expired and gone to meet your maker."
-msgstr ""
+msgstr "你已經過期了,請求助管理員"
-#: src/net/ea/playerhandler.cpp:136
+#: src/net/ea/playerhandler.cpp:124
msgid "You're a stiff."
msgstr "身體僵硬"
-#: src/net/ea/playerhandler.cpp:137
+#: src/net/ea/playerhandler.cpp:125
msgid "Bereft of life, you rest in peace."
msgstr "失去了生命,您安詳的休息了。"
-#: src/net/ea/playerhandler.cpp:138
+#: src/net/ea/playerhandler.cpp:126
msgid "If you weren't so animated, you'd be pushing up the daisies."
msgstr ""
-#: src/net/ea/playerhandler.cpp:139
+#: src/net/ea/playerhandler.cpp:127
msgid "Your metabolic processes are now history."
msgstr ""
-#: src/net/ea/playerhandler.cpp:140
+#: src/net/ea/playerhandler.cpp:128
msgid "You're off the twig."
-msgstr ""
+msgstr "你折斷了樹枝"
-#: src/net/ea/playerhandler.cpp:141
+#: src/net/ea/playerhandler.cpp:129
msgid "You've kicked the bucket."
msgstr "你踢了水桶"
-#: src/net/ea/playerhandler.cpp:142
+#: src/net/ea/playerhandler.cpp:130
msgid ""
"You've shuffled off your mortal coil, run down the curtain and joined the "
"bleedin' choir invisibile."
msgstr ""
-#: src/net/ea/playerhandler.cpp:144
+#: src/net/ea/playerhandler.cpp:132
msgid "You are an ex-player."
msgstr "您已是前-玩家。"
-#: src/net/ea/playerhandler.cpp:145
+#: src/net/ea/playerhandler.cpp:133
msgid "You're pining for the fjords."
msgstr ""
-#: src/net/ea/playerhandler.cpp:258 src/net/ea/playerhandler.cpp:281
+#: src/net/ea/playerhandler.cpp:246 src/net/ea/playerhandler.cpp:269
msgid "Message"
msgstr "訊息"
-#: src/net/ea/playerhandler.cpp:259
+#: src/net/ea/playerhandler.cpp:247
msgid ""
"You are carrying more than half your weight. You are unable to regain health."
msgstr "您已經攜帶超過負重能力的一半。您將無法恢復生命。"
-#: src/net/ea/playerhandler.cpp:301
+#: src/net/ea/playerhandler.cpp:289
msgid "You picked up "
msgstr "您已經撿起 "
-#: src/net/ea/playerhandler.cpp:424
+#: src/net/ea/playerhandler.cpp:412
msgid "Equip arrows first"
msgstr "請先裝備弓箭"
@@ -2807,7 +2835,7 @@ msgstr "交易已完成。"
#: src/net/tmwserv/beinghandler.cpp:328
msgid " Press OK to respawn"
-msgstr ""
+msgstr " 請按確認啟動"
#: src/net/tmwserv/beinghandler.cpp:329
msgid "You died"
@@ -2821,40 +2849,96 @@ msgstr "沒有可用的遊戲伺服器。"
msgid "Willpower:"
msgstr "意志力:"
-#: src/net/tmwserv/chathandler.cpp:151
+#: src/net/tmwserv/chathandler.cpp:157
msgid "Topic: "
msgstr "主題: "
-#: src/net/tmwserv/generalhandler.cpp:90
+#: src/net/tmwserv/generalhandler.cpp:92
#, c-format
msgid "Willpower: %d"
msgstr "意志力: %d"
-#: src/resources/itemdb.cpp:53
+#: src/net/tmwserv/loginhandler.cpp:80
+msgid "Wrong magic_token"
+msgstr "錯誤的魔法代號"
+
+#: src/net/tmwserv/loginhandler.cpp:83 src/net/tmwserv/loginhandler.cpp:182
+msgid "Already logged in"
+msgstr "已經登入"
+
+#: src/net/tmwserv/loginhandler.cpp:86 src/net/tmwserv/loginhandler.cpp:185
+msgid "Server is full"
+msgstr "伺服器人數已滿"
+
+#: src/net/tmwserv/loginhandler.cpp:110
+msgid "New password incorrect"
+msgstr "新密碼不正確"
+
+#: src/net/tmwserv/loginhandler.cpp:113
+msgid "Old password incorrect"
+msgstr "舊密碼輸入錯誤"
+
+#: src/net/tmwserv/loginhandler.cpp:116 src/net/tmwserv/loginhandler.cpp:146
+msgid "Account not connected. Please login first."
+msgstr "帳號還沒連線,請先登入"
+
+#: src/net/tmwserv/loginhandler.cpp:140
+msgid "New email address incorrect"
+msgstr "新的Email位址不正確"
+
+#: src/net/tmwserv/loginhandler.cpp:143
+msgid "Old email address incorrect"
+msgstr "舊得Email位址不正確"
+
+#: src/net/tmwserv/loginhandler.cpp:149
+msgid "The new Email Address already exists."
+msgstr "Email已經被註冊"
+
+#: src/net/tmwserv/loginhandler.cpp:176 src/net/tmwserv/loginhandler.cpp:208
+msgid "Client version is too old"
+msgstr "遊戲版本太老舊!!"
+
+#: src/net/tmwserv/loginhandler.cpp:179
+msgid "Wrong username or password"
+msgstr "錯誤的帳號或密碼"
+
+#: src/net/tmwserv/loginhandler.cpp:211
+msgid "Wrong username, password or email address"
+msgstr "錯誤的帳號或密碼及E-mail"
+
+#: src/net/tmwserv/loginhandler.cpp:214
+msgid "Username already exists"
+msgstr "名字已經有人使用"
+
+#: src/net/tmwserv/loginhandler.cpp:217
+msgid "Email address already exists"
+msgstr "E-mail已經存在"
+
+#: src/resources/itemdb.cpp:52
#, c-format
msgid "Attack %+d"
msgstr "攻擊 %+d"
-#: src/resources/itemdb.cpp:54
+#: src/resources/itemdb.cpp:53
#, c-format
msgid "Defense %+d"
msgstr "防禦 %+d"
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:54
#, c-format
msgid "HP %+d"
msgstr "HP %+d"
-#: src/resources/itemdb.cpp:56
+#: src/resources/itemdb.cpp:55
#, c-format
msgid "MP %+d"
msgstr "MP %+d"
-#: src/resources/itemdb.cpp:113
+#: src/resources/itemdb.cpp:112
msgid "items.xml"
msgstr "items.xml"
-#: src/resources/itemdb.cpp:151
+#: src/resources/itemdb.cpp:150
msgid "Unnamed"
msgstr "未知物品"
@@ -2870,6 +2954,118 @@ msgstr "monsters.xml"
msgid "NPC Database: Error while loading npcs.xml!"
msgstr "NPC 資料庫:當載入 npcs.xml 時發生錯誤!"
+#~ msgid "MiniMap"
+#~ msgstr "小地圖"
+
+#, c-format
+#~ msgid "@@pickup|Pick Up %s@@"
+#~ msgstr "@@撿起|撿起%s@@"
+
+#~ msgid "Emote"
+#~ msgstr "表情"
+
+#~ msgid "use"
+#~ msgstr "使用"
+
+#~ msgid "Insert coin to continue"
+#~ msgstr "投入硬幣接關"
+
+#~ msgid "Options: "
+#~ msgstr "選項: "
+
+#~ msgid " -C --configfile : Configuration file to use"
+#~ msgstr " -C --configfile : 要使用的組態檔案"
+
+#~ msgid " -d --data : Directory to load game data from"
+#~ msgstr " -d --data : 用來載入遊戲資料的目錄"
+
+#~ msgid " -D --default : Bypass the login process with default settings"
+#~ msgstr " -D --default : 以預設的設定值跳過登入程序"
+
+#~ msgid " -h --help : Display this help"
+#~ msgstr " -h --help : 顯示這個說明"
+
+#~ msgid " -H --updatehost : Use this update host"
+#~ msgstr " -H --updatehost : 使用這個更新主機"
+
+#~ msgid " -P --password : Login with this password"
+#~ msgstr " -P --password : 以這個密碼登入"
+
+#~ msgid " -u --skipupdate : Skip the update downloads"
+#~ msgstr " -u --skipupdate : 略過更新的下載"
+
+#~ msgid " -U --username : Login with this username"
+#~ msgstr " -U --username : 以這個使用者名稱登入"
+
+#~ msgid " -v --version : Display the version"
+#~ msgstr " -v --version : 顯示版本"
+
+#~ msgid "Cannont send empty whispers!"
+#~ msgstr "不能送出空的悄悄話!"
+
+#, c-format
+#~ msgid ""
+#~ "Cannont create a whisper tab for nick '%s'!It either already exists, or is "
+#~ "you."
+#~ msgstr "不能建立 nick 「%s」的悄悄話分頁!它已經存在,或者對象是你自己。"
+
+#~ msgid ""
+#~ "\n"
+#~ "> Cancel\n"
+#~ msgstr ""
+#~ "\n"
+#~ "> 取消\n"
+
+#~ msgid "NPC Text Request"
+#~ msgstr "NPC 文字要求"
+
+#~ msgid "Other Player's Names"
+#~ msgstr "其他玩家的名字"
+
+#~ msgid "Generic"
+#~ msgstr "一般"
+
+#~ msgid "Hat"
+#~ msgstr "帽子"
+
+#~ msgid "Usable"
+#~ msgstr "可使用"
+
+#~ msgid "Shirt"
+#~ msgstr "襯衫"
+
+#~ msgid "Shield"
+#~ msgstr "盾牌"
+
+#~ msgid "Ring"
+#~ msgstr "指環"
+
+#~ msgid "Necklace"
+#~ msgstr "項鍊"
+
+#, c-format
+#~ msgid "%s: %s"
+#~ msgstr "%s: %s"
+
+#~ msgid "Emote Window"
+#~ msgstr "表情視窗"
+
+#~ msgid " -S --homedir : Directory to use as home directory"
+#~ msgstr " -S --homedir : 做為家目錄的目錄"
+
+#~ msgid " -c --character : Login with this character"
+#~ msgstr " -c --character : 以這個角色登入"
+
+#~ msgid " -o --port : Login Server Port"
+#~ msgstr " -o --port : 登入伺服器連接埠"
+
+#~ msgid " -s --server : Login Server name or IP"
+#~ msgstr " -s --server : 登入伺服器名稱或 IP"
+
+#, c-format
+#~ msgid "You picked up %s [%s]"
+#~ msgstr "您已經撿起 %s [%s]"
+
#~ msgid "Gold: %d"
#~ msgstr "金幣:%d"
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 861d9d18..08110c43 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -14,6 +14,10 @@ SET(FLAGS "-DPACKAGE_VERSION=\\\"${VERSION}\\\"")
SET(FLAGS "${FLAGS} -DPKG_DATADIR=\\\"${PKG_DATADIR}/\\\"")
SET(FLAGS "${FLAGS} -DLOCALEDIR=\\\"${LOCALEDIR}/\\\"")
+IF (WIN32)
+ SET(EXTRA_LIBRARIES ws2_32 winmm)
+ENDIF()
+
SET(GUICHAN_COMPONENTS "SDL")
FIND_PACKAGE(Guichan REQUIRED ${GUICHAN_COMPONENTS})
@@ -548,8 +552,8 @@ SET(SRCS_TMW
SET (PROGRAMS tmw tmw-ea)
-ADD_EXECUTABLE(tmw ${SRCS} ${SRCS_TMW})
-ADD_EXECUTABLE(tmw-ea ${SRCS} ${SRCS_EA})
+ADD_EXECUTABLE(tmw WIN32 ${SRCS} ${SRCS_TMW})
+ADD_EXECUTABLE(tmw-ea WIN32 ${SRCS} ${SRCS_EA})
FOREACH(program ${PROGRAMS})
TARGET_LINK_LIBRARIES(${program} ${SDL_LIBRARY}
@@ -563,7 +567,8 @@ FOREACH(program ${PROGRAMS})
${CURL_LIBRARIES}
${LIBXML2_LIBRARIES}
${GUICHAN_LIBRARIES}
- ${OPENGL_LIBRARIES})
+ ${OPENGL_LIBRARIES}
+ ${EXTRA_LIBRARIES})
INSTALL(TARGETS ${program} RUNTIME DESTINATION ${PKG_BINDIR})
ENDFOREACH(program)
diff --git a/src/being.h b/src/being.h
index 4d1b0138..6c849350 100644
--- a/src/being.h
+++ b/src/being.h
@@ -131,8 +131,7 @@ class Being : public Sprite, public ConfigListener
NO_SPEECH = 0,
TEXT_OVERHEAD,
NO_NAME_IN_BUBBLE,
- NAME_IN_BUBBLE,
- NUM_SPEECH
+ NAME_IN_BUBBLE
};
enum AttackType
diff --git a/src/commandhandler.cpp b/src/commandhandler.cpp
index 6265f350..462cb3b9 100644
--- a/src/commandhandler.cpp
+++ b/src/commandhandler.cpp
@@ -34,6 +34,7 @@
#include "net/chathandler.h"
#include "net/maphandler.h"
#include "net/net.h"
+#include "net/partyhandler.h"
#include "utils/gettext.h"
#include "utils/stringutils.h"
@@ -369,7 +370,7 @@ void CommandHandler::handleListChannels(const std::string &args, ChatTab *tab)
void CommandHandler::handleParty(const std::string &args, ChatTab *tab)
{
if (args != "")
- player_node->inviteToParty(args);
+ Net::getPartyHandler()->invite(args);
else
tab->chatLog("Please specify a name.", BY_SERVER);
}
diff --git a/src/game.cpp b/src/game.cpp
index d3ca2e7c..b56cbdde 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -920,19 +920,8 @@ void Game::handleInput()
if (keyboard.isKeyActive(keyboard.KEY_ATTACK) ||
(joystick && joystick->buttonPressed(0)))
{
- Being *target = NULL;
-
- bool newTarget = !keyboard.isKeyActive(keyboard.KEY_TARGET);
- // A set target has highest priority
- if (!player_node->getTarget())
- {
- Uint16 targetX = x, targetY = y;
-
- // Only auto target Monsters
- target = beingManager->findNearestLivingBeing(targetX, targetY,
- 20, Being::MONSTER);
- }
- player_node->attack(target, newTarget);
+ if (player_node->getTarget())
+ player_node->attack(player_node->getTarget(), true);
}
#endif
diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp
index 027297a2..eca224fc 100644
--- a/src/gui/chat.cpp
+++ b/src/gui/chat.cpp
@@ -493,7 +493,8 @@ ChatTab *ChatWindow::addWhisperTab(const std::string &nick, bool switchTo)
ChatTab *ret = mWhispers[tempNick] = new WhisperTab(nick);
- mChatTabs->setSelectedTab(ret);
+ if (switchTo)
+ mChatTabs->setSelectedTab(ret);
return ret;
}
diff --git a/src/gui/equipmentwindow.cpp b/src/gui/equipmentwindow.cpp
index aa81361d..44006971 100644
--- a/src/gui/equipmentwindow.cpp
+++ b/src/gui/equipmentwindow.cpp
@@ -33,6 +33,9 @@
#include "item.h"
#include "localplayer.h"
+#include "net/inventoryhandler.h"
+#include "net/net.h"
+
#include "resources/image.h"
#include "resources/iteminfo.h"
#include "resources/resourcemanager.h"
@@ -176,7 +179,7 @@ void EquipmentWindow::action(const gcn::ActionEvent &event)
mInventory->getItem(mEquipment->getEquipment(mSelected)) :
mInventory->getItem(mEquipment->getArrows());
#endif
- player_node->unequipItem(item);
+ Net::getInventoryHandler()->unequipItem(item);
setSelected(-1);
}
}
diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp
index efa5bc2e..d6cd3a84 100644
--- a/src/gui/inventorywindow.cpp
+++ b/src/gui/inventorywindow.cpp
@@ -92,8 +92,8 @@ InventoryWindow::InventoryWindow(int invSize):
mSlotsLabel = new Label(_("Slots:"));
mWeightLabel = new Label(_("Weight:"));
- mSlotsBar = new ProgressBar(1.0f, 100, 20, gcn::Color(225, 200, 25));
- mWeightBar = new ProgressBar(1.0f, 100, 20, gcn::Color(0, 0, 255));
+ mSlotsBar = new ProgressBar(0.0f, 100, 20, gcn::Color(225, 200, 25));
+ mWeightBar = new ProgressBar(0.0f, 100, 20, gcn::Color(0, 0, 255));
place(0, 0, mWeightLabel).setPadding(3);
place(1, 0, mWeightBar, 3);
@@ -166,12 +166,12 @@ void InventoryWindow::action(const gcn::ActionEvent &event)
if (item->isEquipment())
{
if (item->isEquipped())
- player_node->unequipItem(item);
+ Net::getInventoryHandler()->unequipItem(item);
else
- player_node->equipItem(item);
+ Net::getInventoryHandler()->equipItem(item);
}
else
- player_node->useItem(item);
+ Net::getInventoryHandler()->useItem(item);
}
else if (event.getId() == "drop")
{
diff --git a/src/gui/itemamount.cpp b/src/gui/itemamount.cpp
index 393cd8bc..252daf19 100644
--- a/src/gui/itemamount.cpp
+++ b/src/gui/itemamount.cpp
@@ -33,7 +33,9 @@
#include "gui/widgets/icon.h"
#include "item.h"
-#include "localplayer.h"
+
+#include "net/inventoryhandler.h"
+#include "net/net.h"
#include "utils/gettext.h"
@@ -45,10 +47,10 @@ void ItemAmountWindow::finish(Item *item, int amount, Usage usage)
tradeWindow->tradeItem(item, amount);
break;
case ItemDrop:
- player_node->dropItem(item, amount);
+ Net::getInventoryHandler()->dropItem(item, amount);
break;
case ItemSplit:
- player_node->splitItem(item, amount);
+ Net::getInventoryHandler()->splitItem(item, amount);
break;
case StoreAdd:
storageWindow->addStore(item, amount);
diff --git a/src/gui/itemcontainer.cpp b/src/gui/itemcontainer.cpp
index 4779b004..6cbdabb2 100644
--- a/src/gui/itemcontainer.cpp
+++ b/src/gui/itemcontainer.cpp
@@ -27,11 +27,13 @@
#include "gui/sdlinput.h"
#include "gui/viewport.h"
+#include "net/net.h"
+#include "net/inventoryhandler.h"
+
#include "graphics.h"
#include "inventory.h"
#include "item.h"
#include "itemshortcut.h"
-#include "localplayer.h"
#include "log.h"
#include "resources/image.h"
@@ -53,8 +55,8 @@ ItemContainer::ItemContainer(Inventory *inventory, bool forceQuantity):
mInventory(inventory),
mGridColumns(1),
mGridRows(1),
- mSelectedItem(NULL),
- mHighlightedItem(NULL),
+ mSelectedIndex(-1),
+ mHighlightedIndex(-1),
mSelectionStatus(SEL_NONE),
mForceQuantity(forceQuantity),
mSwapItems(false),
@@ -92,8 +94,8 @@ void ItemContainer::draw(gcn::Graphics *graphics)
{
int itemX = i * BOX_WIDTH;
int itemY = j * BOX_HEIGHT;
-
- Item *item = mInventory->getItem((j * mGridColumns) + i);
+ int itemIndex = (j * mGridColumns) + i;
+ Item *item = mInventory->getItem(itemIndex);
if (!item || item->getId() == 0)
continue;
@@ -101,7 +103,7 @@ void ItemContainer::draw(gcn::Graphics *graphics)
Image *image = item->getImage();
if (image)
{
- if (item == mSelectedItem)
+ if (itemIndex == mSelectedIndex)
{
if (mSelectionStatus == SEL_DRAGGING) {
// Reposition the coords to that of the cursor.
@@ -133,11 +135,10 @@ void ItemContainer::draw(gcn::Graphics *graphics)
}
// Draw an orange box around the selected item
- if (isFocused() && mHighlightedItem)
+ if (isFocused() && mHighlightedIndex != -1)
{
- const int i = mHighlightedItem->getInvIndex();
- const int itemX = (i % mGridColumns) * BOX_WIDTH;
- const int itemY = (i / mGridColumns) * BOX_HEIGHT;
+ const int itemX = (mHighlightedIndex % mGridColumns) * BOX_WIDTH;
+ const int itemY = (mHighlightedIndex / mGridColumns) * BOX_HEIGHT;
g->setColor(gcn::Color(255, 128, 0));
g->drawRectangle(gcn::Rectangle(itemX, itemY, BOX_WIDTH, BOX_HEIGHT));
}
@@ -145,18 +146,24 @@ void ItemContainer::draw(gcn::Graphics *graphics)
void ItemContainer::selectNone()
{
- setSelectedItem(NULL);
+ setSelectedIndex(-1);
+ mSelectionStatus = SEL_NONE;
}
-void ItemContainer::setSelectedItem(Item *item)
+void ItemContainer::setSelectedIndex(int newIndex)
{
- if (mSelectedItem != item)
+ if (mSelectedIndex != newIndex)
{
- mSelectedItem = item;
+ mSelectedIndex = newIndex;
distributeValueChangedEvent();
}
}
+Item *ItemContainer::getSelectedItem() const
+{
+ return mInventory->getItem(mSelectedIndex);
+}
+
void ItemContainer::distributeValueChangedEvent()
{
SelectionListenerIterator i, i_end;
@@ -229,21 +236,20 @@ void ItemContainer::mousePressed(gcn::MouseEvent &event)
chatWindow->addItemText(item->getInfo().getName());
}
- if (mSelectedItem && mSelectedItem == item)
+ if (mSelectedIndex == index)
{
mSelectionStatus = SEL_DESELECTING;
}
else if (item && item->getId())
{
- setSelectedItem(item);
+ setSelectedIndex(index);
mSelectionStatus = SEL_SELECTING;
itemShortcut->setItemSelected(item->getId());
}
else
{
- setSelectedItem(NULL);
- mSelectionStatus = SEL_NONE;
+ selectNone();
}
}
}
@@ -266,8 +272,7 @@ void ItemContainer::mouseReleased(gcn::MouseEvent &event)
mSelectionStatus = SEL_SELECTED;
return;
case SEL_DESELECTING:
- setSelectedItem(NULL);
- mSelectionStatus = SEL_NONE;
+ selectNone();
return;
case SEL_DRAGGING:
mSelectionStatus = SEL_SELECTED;
@@ -279,12 +284,10 @@ void ItemContainer::mouseReleased(gcn::MouseEvent &event)
int index = getSlotIndex(event.getX(), event.getY());
if (index == Inventory::NO_SLOT_INDEX)
return;
- Item *item = mInventory->getItem(index);
- if (item == mSelectedItem)
+ if (index == mSelectedIndex || mSelectedIndex == -1)
return;
- player_node->moveInvItem(mSelectedItem, index);
- setSelectedItem(NULL);
- mSelectionStatus = SEL_NONE;
+ Net::getInventoryHandler()->moveItem(mSelectedIndex, index);
+ selectNone();
}
@@ -332,49 +335,47 @@ int ItemContainer::getSlotIndex(int x, int y) const
void ItemContainer::keyAction()
{
// If there is no highlight then return.
- if (!mHighlightedItem)
+ if (mHighlightedIndex == -1)
return;
// If the highlight is on the selected item, then deselect it.
- if (mHighlightedItem == mSelectedItem)
+ if (mHighlightedIndex == mSelectedIndex)
{
- setSelectedItem(NULL);
- mSelectionStatus = SEL_NONE;
+ selectNone();
}
// Check and swap items if necessary.
else if (mSwapItems &&
- mSelectedItem &&
- mHighlightedItem->getId())
+ mSelectedIndex != -1 &&
+ mHighlightedIndex != -1)
{
- player_node->moveInvItem(
- mSelectedItem, mHighlightedItem->getInvIndex());
- setSelectedItem(mHighlightedItem);
+ Net::getInventoryHandler()->moveItem(
+ mSelectedIndex, mHighlightedIndex);
+ setSelectedIndex(mHighlightedIndex);
}
// If the highlight is on an item then select it.
- else if (mHighlightedItem->getId())
+ else if (mHighlightedIndex != -1)
{
- setSelectedItem(mHighlightedItem);
+ setSelectedIndex(mHighlightedIndex);
mSelectionStatus = SEL_SELECTED;
}
// If the highlight is on a blank space then move it.
- else if (mSelectedItem)
+ else if (mSelectedIndex != -1)
{
- player_node->moveInvItem(
- mSelectedItem, mHighlightedItem->getInvIndex());
- setSelectedItem(NULL);
- mSelectionStatus = SEL_NONE;
+ Net::getInventoryHandler()->moveItem(
+ mSelectedIndex, mHighlightedIndex);
+ selectNone();
}
}
void ItemContainer::moveHighlight(Direction direction)
{
- if (!mHighlightedItem)
+ if (mHighlightedIndex == -1)
{
- if (mSelectedItem) {
- mHighlightedItem = mSelectedItem;
+ if (mSelectedIndex != -1) {
+ mHighlightedIndex = mSelectedIndex;
}
else {
- mHighlightedItem = mInventory->getItem(0);
+ mHighlightedIndex = 0;
}
return;
}
@@ -382,34 +383,34 @@ void ItemContainer::moveHighlight(Direction direction)
switch (direction)
{
case Left:
- if (mHighlightedItem->getInvIndex() % mGridColumns == 0)
+ if (mHighlightedIndex % mGridColumns == 0)
{
- mHighlightedItem += mGridColumns;
+ mHighlightedIndex += mGridColumns;
}
- mHighlightedItem--;
+ mHighlightedIndex--;
break;
case Right:
- if ((mHighlightedItem->getInvIndex() % mGridColumns) ==
+ if ((mHighlightedIndex % mGridColumns) ==
(mGridColumns - 1))
{
- mHighlightedItem -= mGridColumns;
+ mHighlightedIndex -= mGridColumns;
}
- mHighlightedItem++;
+ mHighlightedIndex++;
break;
case Up:
- if (mHighlightedItem->getInvIndex() / mGridColumns == 0)
+ if (mHighlightedIndex / mGridColumns == 0)
{
- mHighlightedItem += (mGridColumns * mGridRows);
+ mHighlightedIndex += (mGridColumns * mGridRows);
}
- mHighlightedItem -= mGridColumns;
+ mHighlightedIndex -= mGridColumns;
break;
case Down:
- if ((mHighlightedItem->getInvIndex() / mGridColumns) ==
+ if ((mHighlightedIndex / mGridColumns) ==
(mGridRows - 1))
{
- mHighlightedItem -= (mGridColumns * mGridRows);
+ mHighlightedIndex -= (mGridColumns * mGridRows);
}
- mHighlightedItem += mGridColumns;
+ mHighlightedIndex += mGridColumns;
break;
}
}
diff --git a/src/gui/itemcontainer.h b/src/gui/itemcontainer.h
index bc7caf5d..f446a647 100644
--- a/src/gui/itemcontainer.h
+++ b/src/gui/itemcontainer.h
@@ -86,8 +86,7 @@ class ItemContainer : public gcn::Widget,
/**
* Returns the selected item.
*/
- Item *getSelectedItem() const
- { return mSelectedItem; }
+ Item *getSelectedItem() const;
/**
* Sets selected item to NULL.
@@ -145,7 +144,7 @@ class ItemContainer : public gcn::Widget,
/**
* Sets the currently selected item.
*/
- void setSelectedItem(Item *item);
+ void setSelectedIndex(int index);
/**
* Find the current item index by the most recently used item ID
@@ -174,7 +173,7 @@ class ItemContainer : public gcn::Widget,
Inventory *mInventory;
int mGridColumns, mGridRows;
Image *mSelImg;
- Item *mSelectedItem, *mHighlightedItem;
+ int mSelectedIndex, mHighlightedIndex;
SelectionState mSelectionStatus;
bool mForceQuantity;
bool mSwapItems;
diff --git a/src/gui/minimap.cpp b/src/gui/minimap.cpp
index 3dab63a3..a5bdc59d 100644
--- a/src/gui/minimap.cpp
+++ b/src/gui/minimap.cpp
@@ -31,7 +31,6 @@
#include "player.h"
#include "gui/palette.h"
-#include "gui/partywindow.h"
#include "resources/image.h"
#include "resources/resourcemanager.h"
@@ -56,13 +55,13 @@ Minimap::Minimap():
setResizable(false);
setDefaultVisible(true);
- setSaveVisible(false);
+ setSaveVisible(true);
setStickyButton(true);
setSticky(false);
loadWindowState();
- setVisible(mShow);
+ setVisible(mShow, isSticky());
}
Minimap::~Minimap()
@@ -94,9 +93,6 @@ void Minimap::setMap(Map *map)
ResourceManager *resman = ResourceManager::getInstance();
mMapImage = resman->getImage(map->getProperty("minimap"));
- if (!mShow)
- return;
-
if (mMapImage)
{
const int offsetX = 2 * getPadding();
@@ -120,17 +116,19 @@ void Minimap::setMap(Map *map)
setDefaultSize(getX(), getY(), getWidth(), getHeight());
resetToDefaultSize();
- setVisible(true);
+ if (mShow)
+ setVisible(true);
}
else
{
- setVisible(false);
+ if (!isSticky())
+ setVisible(false);
}
}
void Minimap::toggle()
{
- setVisible(!mShow, isSticky());
+ setVisible(!isVisible(), isSticky());
mShow = isVisible();
}
@@ -183,6 +181,8 @@ void Minimap::draw(gcn::Graphics *graphics)
{
case Being::PLAYER:
{
+ const Player *player = static_cast<const Player*>(being);
+
Palette::ColorType type = Palette::PC;
if (being == player_node)
@@ -190,14 +190,15 @@ void Minimap::draw(gcn::Graphics *graphics)
type = Palette::SELF;
dotSize = 3;
}
- else if (partyWindow->findMember(being->getId()))
+ else if (player->isGM())
+ {
+ type = Palette::GM_NAME;
+ }
+ else if (player->isInParty())
{
type = Palette::PARTY;
}
- if (static_cast<const Player*>(being)->isGM())
- type = Palette::GM_NAME;
-
graphics->setColor(guiPalette->getColor(type));
break;
}
diff --git a/src/gui/ministatus.cpp b/src/gui/ministatus.cpp
index b4bc29e9..65d2391d 100644
--- a/src/gui/ministatus.cpp
+++ b/src/gui/ministatus.cpp
@@ -36,10 +36,10 @@
MiniStatusWindow::MiniStatusWindow():
Popup("MiniStatus")
{
- mHpBar = new ProgressBar(1.0f, 100, 20, gcn::Color(0, 171, 34));
+ mHpBar = new ProgressBar(0.0f, 100, 20, gcn::Color(0, 171, 34));
#ifdef EATHENA_SUPPORT
- mMpBar = new ProgressBar(1.0f, 100, 20, gcn::Color(26, 102, 230));
- mXpBar = new ProgressBar(1.0f, 100, 20, gcn::Color(143, 192, 211));
+ mMpBar = new ProgressBar(0.0f, 100, 20, gcn::Color(26, 102, 230));
+ mXpBar = new ProgressBar(0.0f, 100, 20, gcn::Color(143, 192, 211));
#endif
mHpBar->setPosition(0, 3);
diff --git a/src/gui/partywindow.cpp b/src/gui/partywindow.cpp
index dbd8f3ef..317811ee 100644
--- a/src/gui/partywindow.cpp
+++ b/src/gui/partywindow.cpp
@@ -23,6 +23,9 @@
#include "gui/widgets/chattab.h"
+#include "beingmanager.h"
+#include "player.h"
+
#include "net/net.h"
#include "net/partyhandler.h"
@@ -46,15 +49,15 @@ PartyWindow::PartyWindow() :
{
setWindowName("Party");
setVisible(false);
+ setSaveVisible(true);
setResizable(true);
setSaveVisible(true);
setCloseButton(true);
- setMinWidth(200);
+ setMinWidth(212);
setMinHeight(200);
- setDefaultSize(590, 200, 200, 200);
+ setDefaultSize(590, 200, 212, 200);
loadWindowState();
- setVisible(false); // Do not start out visible
}
PartyWindow::~PartyWindow()
@@ -62,6 +65,16 @@ PartyWindow::~PartyWindow()
delete_all(mMembers);
}
+void PartyWindow::setPartyName(const std::string &name)
+{
+ setCaption(strprintf(_("Party (%s)"), name.c_str()));
+}
+
+void PartyWindow::clearPartyName()
+{
+ setCaption(_("Party"));
+}
+
PartyMember *PartyWindow::findMember(int id) const
{
PartyList::const_iterator it = mMembers.find(id);
@@ -105,18 +118,15 @@ int PartyWindow::findMember(const std::string &name) const
void PartyWindow::updateMember(int id, const std::string &memberName,
bool leader, bool online)
{
- PartyMember *player = findOrCreateMember(id);
- player->name = memberName;
- player->leader = leader;
- player->online = online;
- player->avatar->setName(memberName);
- player->avatar->setOnline(online);
-
- // show the window
- if (mMembers.size() > 0)
- {
- setVisible(true);
- }
+ PartyMember *member = findOrCreateMember(id);
+ member->name = memberName;
+ member->leader = leader;
+ member->online = online;
+ member->avatar->setName(memberName);
+ member->avatar->setOnline(online);
+
+ if (Player *player = dynamic_cast<Player*>(beingManager->findBeing(id)))
+ player->setInParty(true);
}
void PartyWindow::updateMemberHP(int id, int hp, int maxhp)
@@ -130,11 +140,8 @@ void PartyWindow::removeMember(int id)
{
mMembers.erase(id);
- // if no-one left, remove the party window
- if (mMembers.size() < 1)
- {
- setVisible(false);
- }
+ if (Player *player = dynamic_cast<Player*>(beingManager->findBeing(id)))
+ player->setInParty(false);
}
void PartyWindow::removeMember(const std::string &name)
@@ -201,10 +208,19 @@ void PartyWindow::action(const gcn::ActionEvent &event)
}
}
+void clearMembersSub(const std::pair<int, PartyMember*> &p)
+{
+ Player *player = dynamic_cast<Player*>(beingManager->findBeing(p.first));
+ if (player)
+ player->setInParty(false);
+}
+
void PartyWindow::clearMembers()
{
clearLayout();
+ std::for_each(mMembers.begin(), mMembers.end(), clearMembersSub);
+
delete_all(mMembers);
mMembers.clear();
}
diff --git a/src/gui/partywindow.h b/src/gui/partywindow.h
index 65e8d772..8cea500f 100644
--- a/src/gui/partywindow.h
+++ b/src/gui/partywindow.h
@@ -65,6 +65,10 @@ class PartyWindow : public Window, gcn::ActionListener
*/
~PartyWindow();
+ void setPartyName(const std::string &name);
+
+ void clearPartyName();
+
/**
* Find a party member based on ID. Returns NULL if not found.
*/
diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp
index 46a33d6c..2dcf2628 100644
--- a/src/gui/popupmenu.cpp
+++ b/src/gui/popupmenu.cpp
@@ -40,6 +40,8 @@
#include "net/adminhandler.h"
#include "net/inventoryhandler.h"
#include "net/net.h"
+#include "net/partyhandler.h"
+#include "net/tradehandler.h"
#include "resources/itemdb.h"
#include "resources/iteminfo.h"
@@ -182,7 +184,7 @@ void PopupMenu::handleLink(const std::string &link)
being &&
being->getType() == Being::PLAYER)
{
- player_node->trade(being);
+ Net::getTradeHandler()->request(being);
tradePartnerName = being->getName();
}
#ifdef EATHENA_SUPPORT
@@ -261,13 +263,13 @@ void PopupMenu::handleLink(const std::string &link)
if (mItem->isEquipment())
{
if (mItem->isEquipped())
- player_node->unequipItem(mItem);
+ Net::getInventoryHandler()->unequipItem(mItem);
else
- player_node->equipItem(mItem);
+ Net::getInventoryHandler()->equipItem(mItem);
}
else
{
- player_node->useItem(mItem);
+ Net::getInventoryHandler()->useItem(mItem);
}
}
@@ -302,7 +304,7 @@ void PopupMenu::handleLink(const std::string &link)
else if (link == "party" && being && being->getType() == Being::PLAYER)
{
- player_node->inviteToParty(dynamic_cast<Player*>(being));
+ Net::getPartyHandler()->invite(dynamic_cast<Player*>(being));
}
else if (link == "name" && being)
diff --git a/src/gui/setup_players.cpp b/src/gui/setup_players.cpp
index c5dffe3d..f0d88a30 100644
--- a/src/gui/setup_players.cpp
+++ b/src/gui/setup_players.cpp
@@ -221,8 +221,6 @@ Setup_Players::Setup_Players():
mPlayerTable(new GuiTable(mPlayerTableModel)),
mPlayerTitleTable(new GuiTable(mPlayerTableTitleModel)),
mPlayerScrollArea(new ScrollArea(mPlayerTable)),
- mPersistIgnores(new CheckBox(_("Save player list"),
- player_relations.getPersistIgnores())),
mDefaultTrading(new CheckBox(_("Allow trading"),
player_relations.getDefault() & PlayerRelation::TRADE)),
mDefaultWhisper(new CheckBox(_("Allow whispers"),
@@ -288,9 +286,8 @@ Setup_Players::Setup_Players():
place(0, 6, mWhisperTabCheckBox);
place(2, 5, ignore_action_label);
place(2, 6, mIgnoreActionChoicesBox, 2).setPadding(2);
- place(2, 7, mPersistIgnores);
- place(2, 8, mDefaultTrading);
- place(2, 9, mDefaultWhisper);
+ place(2, 7, mDefaultTrading);
+ place(2, 8, mDefaultWhisper);
player_relations.addListener(this);
@@ -326,7 +323,6 @@ void Setup_Players::reset()
void Setup_Players::apply()
{
- player_relations.setPersistIgnores(mPersistIgnores->isSelected());
player_relations.store();
unsigned int old_default_relations = player_relations.getDefault() &
diff --git a/src/gui/setup_players.h b/src/gui/setup_players.h
index d7507d19..3096cab9 100644
--- a/src/gui/setup_players.h
+++ b/src/gui/setup_players.h
@@ -58,7 +58,6 @@ private:
GuiTable *mPlayerTitleTable;
gcn::ScrollArea *mPlayerScrollArea;
- gcn::CheckBox *mPersistIgnores;
gcn::CheckBox *mDefaultTrading;
gcn::CheckBox *mDefaultWhisper;
diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp
index bbbeb6d7..9add3251 100644
--- a/src/gui/setup_video.cpp
+++ b/src/gui/setup_video.cpp
@@ -109,10 +109,10 @@ ModeListModel::ModeListModel()
const char *SIZE_NAME[4] =
{
- N_("Tiny"),
- N_("Small"),
- N_("Medium"),
- N_("Large"),
+ N_("Tiny"),
+ N_("Small"),
+ N_("Medium"),
+ N_("Large"),
};
class FontSizeChoiceListModel : public gcn::ListModel
@@ -134,6 +134,41 @@ public:
}
};
+static const char *speechModeToString(Being::Speech mode)
+{
+ switch (mode)
+ {
+ case Being::NO_SPEECH: return _("No text");
+ case Being::TEXT_OVERHEAD: return _("Text");
+ case Being::NO_NAME_IN_BUBBLE: return _("Bubbles, no names");
+ case Being::NAME_IN_BUBBLE: return _("Bubbles with names");
+ }
+ return "";
+}
+
+static const char *overlayDetailToString(int detail)
+{
+ switch (detail)
+ {
+ case 0: return _("off");
+ case 1: return _("low");
+ case 2: return _("high");
+ }
+ return "";
+}
+
+static const char *particleDetailToString(int detail)
+{
+ switch (detail)
+ {
+ case 0: return _("low");
+ case 1: return _("medium");
+ case 2: return _("high");
+ case 3: return _("max");
+ }
+ return "";
+}
+
Setup_Video::Setup_Video():
mFullScreenEnabled(config.getValue("screen", false)),
mOpenGLEnabled(config.getValue("opengl", false)),
@@ -145,7 +180,8 @@ Setup_Video::Setup_Video():
mPickupParticleEnabled(config.getValue("showpickupparticle", false)),
mOpacity(config.getValue("guialpha", 0.8)),
mFps((int) config.getValue("fpslimit", 60)),
- mSpeechMode((int) config.getValue("speech", Being::TEXT_OVERHEAD)),
+ mSpeechMode(static_cast<Being::Speech>(
+ config.getValue("speech", Being::TEXT_OVERHEAD))),
mModeListModel(new ModeListModel),
mModeList(new ListBox(mModeListModel)),
mFsCheckBox(new CheckBox(_("Full screen"), mFullScreenEnabled)),
@@ -167,12 +203,6 @@ Setup_Video::Setup_Video():
mFpsCheckBox(new CheckBox(_("FPS Limit:"))),
mFpsSlider(new Slider(10, 120)),
mFpsField(new TextField),
- mOriginalScrollLaziness((int) config.getValue("ScrollLaziness", 16)),
- mScrollLazinessSlider(new Slider(1, 64)),
- mScrollLazinessField(new TextField),
- mOriginalScrollRadius((int) config.getValue("ScrollRadius", 0)),
- mScrollRadiusSlider(new Slider(0, 128)),
- mScrollRadiusField(new TextField),
mOverlayDetail((int) config.getValue("OverlayDetail", 2)),
mOverlayDetailSlider(new Slider(0, 2)),
mOverlayDetailField(new Label("")),
@@ -188,8 +218,6 @@ Setup_Video::Setup_Video():
speechLabel = new Label(_("Overhead text"));
alphaLabel = new Label(_("Gui opacity"));
- scrollRadiusLabel = new Label(_("Scroll radius"));
- scrollLazinessLabel = new Label(_("Scroll laziness"));
overlayDetailLabel = new Label(_("Ambient FX"));
particleDetailLabel = new Label(_("Particle Detail"));
fontSizeLabel = new Label(_("Font size"));
@@ -223,10 +251,6 @@ Setup_Video::Setup_Video():
mFpsCheckBox->setActionEventId("fpslimitcheckbox");
mSpeechSlider->setActionEventId("speech");
mFpsSlider->setActionEventId("fpslimitslider");
- mScrollRadiusSlider->setActionEventId("scrollradiusslider");
- mScrollRadiusField->setActionEventId("scrollradiusfield");
- mScrollLazinessSlider->setActionEventId("scrolllazinessslider");
- mScrollLazinessField->setActionEventId("scrolllazinessfield");
mOverlayDetailSlider->setActionEventId("overlaydetailslider");
mOverlayDetailField->setActionEventId("overlaydetailfield");
mParticleDetailSlider->setActionEventId("particledetailslider");
@@ -243,98 +267,28 @@ Setup_Video::Setup_Video():
mFpsCheckBox->addActionListener(this);
mSpeechSlider->addActionListener(this);
mFpsSlider->addActionListener(this);
- mFpsField->addKeyListener(this);
- mScrollRadiusSlider->addActionListener(this);
- mScrollRadiusField->addKeyListener(this);
- mScrollLazinessSlider->addActionListener(this);
- mScrollLazinessField->addKeyListener(this);
mOverlayDetailSlider->addActionListener(this);
mOverlayDetailField->addKeyListener(this);
mParticleDetailSlider->addActionListener(this);
mParticleDetailField->addKeyListener(this);
- mScrollRadiusField->setText(toString(mOriginalScrollRadius));
- mScrollRadiusSlider->setValue(mOriginalScrollRadius);
-
- mScrollLazinessField->setText(toString(mOriginalScrollLaziness));
- mScrollLazinessSlider->setValue(mOriginalScrollLaziness);
-
- switch (mSpeechMode)
- {
- case 0:
- mSpeechLabel->setCaption(_("No text"));
- break;
- case 1:
- mSpeechLabel->setCaption(_("Text"));
- break;
- case 2:
- mSpeechLabel->setCaption(_("Bubbles, no names"));
- break;
- case 3:
- mSpeechLabel->setCaption(_("Bubbles with names"));
- break;
- }
+ mSpeechLabel->setCaption(speechModeToString(mSpeechMode));
mSpeechSlider->setValue(mSpeechMode);
- switch (mOverlayDetail)
- {
- case 0:
- mOverlayDetailField->setCaption(_("off"));
- break;
- case 1:
- mOverlayDetailField->setCaption(_("low"));
- break;
- case 2:
- mOverlayDetailField->setCaption(_("high"));
- break;
- }
+ mOverlayDetailField->setCaption(overlayDetailToString(mOverlayDetail));
mOverlayDetailSlider->setValue(mOverlayDetail);
- switch (mParticleDetail)
- {
- case 0:
- mParticleDetailField->setCaption(_("low"));
- break;
- case 1:
- mParticleDetailField->setCaption(_("medium"));
- break;
- case 2:
- mParticleDetailField->setCaption(_("high"));
- break;
- case 3:
- mParticleDetailField->setCaption(_("max"));
- break;
- }
+ mParticleDetailField->setCaption(particleDetailToString(mParticleDetail));
mParticleDetailSlider->setValue(mParticleDetail);
- int fontSizeSelected;
- switch (mFontSize)
- {
- case 10:
- fontSizeSelected = 0;
- break;
- case 11:
- fontSizeSelected = 1;
- break;
- case 12:
- fontSizeSelected = 2;
- break;
- case 13:
- fontSizeSelected = 3;
- break;
- default:
- fontSizeSelected = 1;
- break;
- }
-
- mFontSizeDropDown->setSelected(fontSizeSelected);
+ mFontSizeDropDown->setSelected(mFontSize - 10);
mFontSizeDropDown->adjustHeight();
// Do the layout
LayoutHelper h(this);
ContainerPlacer place = h.getPlacer(0, 0);
- place(0, 0, scrollArea, 1, 6).setPadding(2);
+ place(0, 0, scrollArea, 1, 5).setPadding(2);
place(1, 0, mFsCheckBox, 2);
place(3, 0, mOpenGLCheckBox, 1);
@@ -360,25 +314,17 @@ Setup_Video::Setup_Video():
place(1, 8, mFpsCheckBox).setPadding(3);
place(2, 8, mFpsField).setPadding(1);
- place(0, 9, mScrollRadiusSlider);
- place(1, 9, scrollRadiusLabel);
- place(2, 9, mScrollRadiusField).setPadding(1);
+ place(0, 9, mSpeechSlider);
+ place(1, 9, speechLabel);
+ place(2, 9, mSpeechLabel, 3).setPadding(2);
- place(0, 10, mScrollLazinessSlider);
- place(1, 10, scrollLazinessLabel);
- place(2, 10, mScrollLazinessField).setPadding(1);
+ place(0, 10, mOverlayDetailSlider);
+ place(1, 10, overlayDetailLabel);
+ place(2, 10, mOverlayDetailField, 3).setPadding(2);
- place(0, 11, mSpeechSlider);
- place(1, 11, speechLabel);
- place(2, 11, mSpeechLabel, 3).setPadding(2);
-
- place(0, 12, mOverlayDetailSlider);
- place(1, 12, overlayDetailLabel);
- place(2, 12, mOverlayDetailField, 3).setPadding(2);
-
- place(0, 13, mParticleDetailSlider);
- place(1, 13, particleDetailLabel);
- place(2, 13, mParticleDetailField, 3).setPadding(2);
+ place(0, 11, mParticleDetailSlider);
+ place(1, 11, particleDetailLabel);
+ place(2, 11, mParticleDetailField, 3).setPadding(2);
setDimension(gcn::Rectangle(0, 0, 325, 300));
}
@@ -446,7 +392,8 @@ void Setup_Video::apply()
mVisibleNamesEnabled = config.getValue("visiblenames", true);
mParticleEffectsEnabled = config.getValue("particleeffects", true);
mNameEnabled = config.getValue("showownname", false);
- mSpeechMode = (int) config.getValue("speech", Being::TEXT_OVERHEAD);
+ mSpeechMode = static_cast<Being::Speech>(
+ config.getValue("speech", Being::TEXT_OVERHEAD));
mOpacity = config.getValue("guialpha", 0.8);
mOverlayDetail = (int) config.getValue("OverlayDetail", 2);
mOpenGLEnabled = config.getValue("opengl", false);
@@ -454,26 +401,6 @@ void Setup_Video::apply()
mPickupParticleEnabled = config.getValue("showpickupparticle", false);
}
-int Setup_Video::updateSlider(gcn::Slider *slider, gcn::TextField *field,
- const std::string &configName)
-{
- int value;
- std::stringstream temp(field->getText());
- temp >> value;
- if (value < slider->getScaleStart())
- {
- value = (int) slider->getScaleStart();
- }
- else if (value > slider->getScaleEnd())
- {
- value = (int) slider->getScaleEnd();
- }
- field->setText(toString(value));
- slider->setValue(value);
- config.setValue(configName, value);
- return value;
-}
-
void Setup_Video::cancel()
{
mFsCheckBox->setSelected(mFullScreenEnabled);
@@ -487,11 +414,6 @@ void Setup_Video::cancel()
mOverlayDetailSlider->setValue(mOverlayDetail);
mParticleDetailSlider->setValue(mParticleDetail);
- mScrollRadiusField->setText(toString(mOriginalScrollRadius));
- mScrollLazinessField->setText(toString(mOriginalScrollLaziness));
- updateSlider(mScrollRadiusSlider, mScrollRadiusField, "ScrollRadius");
- updateSlider(mScrollLazinessSlider, mScrollLazinessField, "ScrollLaziness");
-
config.setValue("screen", mFullScreenEnabled);
config.setValue("customcursor", mCustomCursorEnabled);
config.setValue("visiblenames", mVisibleNamesEnabled);
@@ -557,22 +479,9 @@ void Setup_Video::action(const gcn::ActionEvent &event)
}
else if (event.getId() == "speech")
{
- int val = (int) mSpeechSlider->getValue();
- switch (val)
- {
- case 0:
- mSpeechLabel->setCaption(_("No text"));
- break;
- case 1:
- mSpeechLabel->setCaption(_("Text"));
- break;
- case 2:
- mSpeechLabel->setCaption(_("Bubbles, no names"));
- break;
- case 3:
- mSpeechLabel->setCaption(_("Bubbles with names"));
- break;
- }
+ Being::Speech val =
+ static_cast<Being::Speech>(mSpeechSlider->getValue());
+ mSpeechLabel->setCaption(speechModeToString(val));
mSpeechSlider->setValue(val);
config.setValue("speech", val);
}
@@ -589,53 +498,16 @@ void Setup_Video::action(const gcn::ActionEvent &event)
mFps = (int) mFpsSlider->getValue();
mFpsField->setText(toString(mFps));
}
- else if (event.getId() == "scrollradiusslider")
- {
- int val = (int) mScrollRadiusSlider->getValue();
- mScrollRadiusField->setText(toString(val));
- config.setValue("ScrollRadius", val);
- }
- else if (event.getId() == "scrolllazinessslider")
- {
- int val = (int) mScrollLazinessSlider->getValue();
- mScrollLazinessField->setText(toString(val));
- config.setValue("ScrollLaziness", val);
- }
else if (event.getId() == "overlaydetailslider")
{
int val = (int) mOverlayDetailSlider->getValue();
- switch (val)
- {
- case 0:
- mOverlayDetailField->setCaption(_("off"));
- break;
- case 1:
- mOverlayDetailField->setCaption(_("low"));
- break;
- case 2:
- mOverlayDetailField->setCaption(_("high"));
- break;
- }
+ mOverlayDetailField->setCaption(overlayDetailToString(val));
config.setValue("OverlayDetail", val);
}
else if (event.getId() == "particledetailslider")
{
int val = (int) mParticleDetailSlider->getValue();
- switch (val)
- {
- case 0:
- mParticleDetailField->setCaption(_("low"));
- break;
- case 1:
- mParticleDetailField->setCaption(_("medium"));
- break;
- case 2:
- mParticleDetailField->setCaption(_("high"));
- break;
- case 3:
- mParticleDetailField->setCaption(_("max"));
- break;
- }
+ mParticleDetailField->setCaption(particleDetailToString(val));
config.setValue("particleEmitterSkip", 3 - val);
Particle::emitterSkip = 4 - val;
}
@@ -678,6 +550,4 @@ void Setup_Video::keyPressed(gcn::KeyEvent &event)
mFpsField->setText("");
mFps = 0;
}
- updateSlider(mScrollRadiusSlider, mScrollRadiusField, "ScrollRadius");
- updateSlider(mScrollLazinessSlider, mScrollLazinessField, "ScrollLaziness");
}
diff --git a/src/gui/setup_video.h b/src/gui/setup_video.h
index 9b9cbfde..01b9cd4f 100644
--- a/src/gui/setup_video.h
+++ b/src/gui/setup_video.h
@@ -22,6 +22,7 @@
#ifndef GUI_SETUP_VIDEO_H
#define GUI_SETUP_VIDEO_H
+#include "being.h"
#include "guichanfwd.h"
#include "gui/setuptab.h"
@@ -44,9 +45,6 @@ class Setup_Video : public SetupTab, public gcn::ActionListener,
void keyPressed(gcn::KeyEvent &event);
private:
- int updateSlider(gcn::Slider *slider, gcn::TextField *field,
- const std::string &configName);
-
bool mFullScreenEnabled;
bool mOpenGLEnabled;
bool mCustomCursorEnabled;
@@ -57,7 +55,7 @@ class Setup_Video : public SetupTab, public gcn::ActionListener,
bool mPickupParticleEnabled;
double mOpacity;
int mFps;
- int mSpeechMode;
+ Being::Speech mSpeechMode;
class ModeListModel *mModeListModel;
@@ -88,14 +86,6 @@ class Setup_Video : public SetupTab, public gcn::ActionListener,
gcn::Slider *mFpsSlider;
gcn::TextField *mFpsField;
- int mOriginalScrollLaziness;
- gcn::Slider *mScrollLazinessSlider;
- gcn::TextField *mScrollLazinessField;
-
- int mOriginalScrollRadius;
- gcn::Slider *mScrollRadiusSlider;
- gcn::TextField *mScrollRadiusField;
-
int mOverlayDetail;
gcn::Slider *mOverlayDetailSlider;
gcn::Label *mOverlayDetailField;
diff --git a/src/gui/skill.cpp b/src/gui/skill.cpp
index b6f6f124..3a4fb75c 100644
--- a/src/gui/skill.cpp
+++ b/src/gui/skill.cpp
@@ -33,6 +33,9 @@
#include "localplayer.h"
#include "log.h"
+#include "net/net.h"
+#include "net/skillhandler.h"
+
#include "utils/dtor.h"
#include "utils/gettext.h"
#include "utils/stringutils.h"
@@ -173,7 +176,7 @@ void SkillDialog::action(const gcn::ActionEvent &event)
// Increment skill
int selectedSkill = mTable->getSelectedRow();
if (selectedSkill >= 0)
- player_node->raiseSkill(mSkillList[selectedSkill]->id);
+ Net::getSkillHandler()->up(mSkillList[selectedSkill]->id);
}
else if (event.getId() == "skill" && mTable->getSelectedRow() > -1)
{
diff --git a/src/gui/status.cpp b/src/gui/status.cpp
index c9681fa9..7fc42fdb 100644
--- a/src/gui/status.cpp
+++ b/src/gui/status.cpp
@@ -58,16 +58,16 @@ StatusWindow::StatusWindow(LocalPlayer *player):
Units::formatCurrency(mCurrency).c_str()));
mHpLabel = new Label(_("HP:"));
- mHpBar = new ProgressBar(1.0f, 80, 15, gcn::Color(0, 171, 34));
+ mHpBar = new ProgressBar(0.0f, 80, 15, gcn::Color(0, 171, 34));
mXpLabel = new Label(_("Exp:"));
- mXpBar = new ProgressBar(1.0f, 80, 15, gcn::Color(143, 192, 211));
+ mXpBar = new ProgressBar(0.0f, 80, 15, gcn::Color(143, 192, 211));
mMpLabel = new Label(_("MP:"));
- mMpBar = new ProgressBar(1.0f, 80, 15, gcn::Color(26, 102, 230));
+ mMpBar = new ProgressBar(0.0f, 80, 15, gcn::Color(26, 102, 230));
mJobLabel = new Label(_("Job:"));
- mJobBar = new ProgressBar(1.0f, 80, 15, gcn::Color(220, 135, 203));
+ mJobBar = new ProgressBar(0.0f, 80, 15, gcn::Color(220, 135, 203));
// ----------------------
// Stats Part
diff --git a/src/gui/statuswindow.cpp b/src/gui/statuswindow.cpp
index e76c19a7..edbf387b 100644
--- a/src/gui/statuswindow.cpp
+++ b/src/gui/statuswindow.cpp
@@ -50,7 +50,7 @@ StatusWindow::StatusWindow(LocalPlayer *player):
mMoneyLabel = new Label("Money:");
mHpLabel = new Label("HP:");
- mHpBar = new ProgressBar(1.0f, 80, 15, gcn::Color(0, 171, 34));
+ mHpBar = new ProgressBar(0.0f, 80, 15, gcn::Color(0, 171, 34));
mHpValueLabel = new Label;
int y = 3;
diff --git a/src/gui/storagewindow.cpp b/src/gui/storagewindow.cpp
index 6502399a..593a49a3 100644
--- a/src/gui/storagewindow.cpp
+++ b/src/gui/storagewindow.cpp
@@ -77,7 +77,7 @@ StorageWindow::StorageWindow(int invSize):
mSlotsLabel = new Label(_("Slots: "));
- mSlotsBar = new ProgressBar(1.0f, 100, 20, gcn::Color(225, 200, 25));
+ mSlotsBar = new ProgressBar(0.0f, 100, 20, gcn::Color(225, 200, 25));
mSlotsBar->setText(strprintf("%d/%d", mUsedSlots, mMaxSlots));
mSlotsBar->setProgress((float) mUsedSlots / mMaxSlots);
diff --git a/src/gui/widgets/avatar.cpp b/src/gui/widgets/avatar.cpp
index 116640d8..b120c51f 100644
--- a/src/gui/widgets/avatar.cpp
+++ b/src/gui/widgets/avatar.cpp
@@ -104,13 +104,7 @@ void Avatar::updateAvatarLabel()
std::ostringstream ss;
ss << mName;
- if (mName == player_node->getName())
- {
- mHp = player_node->getHp();
- mMaxHp = player_node->getMaxHp();
- }
-
- if (mMaxHp != 0)
+ if (mName != player_node->getName() && mMaxHp != 0)
ss << " (" << mHp << "/" << mMaxHp << ")";
mLabel->setCaption(ss.str());
diff --git a/src/gui/widgets/tab.cpp b/src/gui/widgets/tab.cpp
index c98ecee4..f2231fca 100644
--- a/src/gui/widgets/tab.cpp
+++ b/src/gui/widgets/tab.cpp
@@ -63,7 +63,7 @@ static TabData const data[TAB_COUNT] = {
ImageRect Tab::tabImg[TAB_COUNT];
Tab::Tab() : gcn::Tab(),
- mTabColor(guiPalette->getColor(Palette::TEXT))
+ mTabColor(&guiPalette->getColor(Palette::TEXT))
{
init();
}
@@ -127,7 +127,7 @@ void Tab::draw(gcn::Graphics *graphics)
{
mode = TAB_SELECTED;
// if tab is selected, it doesnt need to highlight activity
- mLabel->setForegroundColor(mTabColor);
+ mLabel->setForegroundColor(*mTabColor);
mHighlighted = false;
}
else if (mHighlighted)
@@ -137,7 +137,7 @@ void Tab::draw(gcn::Graphics *graphics)
}
else
{
- mLabel->setForegroundColor(mTabColor);
+ mLabel->setForegroundColor(*mTabColor);
}
}
@@ -163,7 +163,7 @@ void Tab::draw(gcn::Graphics *graphics)
drawChildren(graphics);
}
-void Tab::setTabColor(const gcn::Color &color)
+void Tab::setTabColor(const gcn::Color *color)
{
mTabColor = color;
}
diff --git a/src/gui/widgets/tab.h b/src/gui/widgets/tab.h
index 134d5591..eea2586c 100644
--- a/src/gui/widgets/tab.h
+++ b/src/gui/widgets/tab.h
@@ -45,7 +45,7 @@ class Tab : public gcn::Tab
/**
* Set the normal color fo the tab's text.
*/
- void setTabColor(const gcn::Color &color);
+ void setTabColor(const gcn::Color *color);
/**
* Set tab highlighted
@@ -64,7 +64,7 @@ class Tab : public gcn::Tab
static int mInstances; /**< Number of tab instances */
static float mAlpha;
- gcn::Color mTabColor;
+ const gcn::Color *mTabColor;
bool mHighlighted;
};
diff --git a/src/gui/widgets/whispertab.cpp b/src/gui/widgets/whispertab.cpp
index 17ee3fc4..23325108 100644
--- a/src/gui/widgets/whispertab.cpp
+++ b/src/gui/widgets/whispertab.cpp
@@ -35,7 +35,7 @@ WhisperTab::WhisperTab(const std::string &nick) :
ChatTab(nick),
mNick(nick)
{
- setTabColor(guiPalette->getColor(Palette::WHISPER));
+ setTabColor(&guiPalette->getColor(Palette::WHISPER));
}
WhisperTab::~WhisperTab()
diff --git a/src/itemshortcut.cpp b/src/itemshortcut.cpp
index bd247300..6024e67a 100644
--- a/src/itemshortcut.cpp
+++ b/src/itemshortcut.cpp
@@ -25,6 +25,9 @@
#include "itemshortcut.h"
#include "localplayer.h"
+#include "net/inventoryhandler.h"
+#include "net/net.h"
+
#include "utils/stringutils.h"
ItemShortcut::ItemShortcut *itemShortcut;
@@ -72,16 +75,14 @@ void ItemShortcut::useItem(int index)
{
if (item->isEquipment())
{
-#ifdef EATHENA_SUPPORT
if (item->isEquipped())
- player_node->unequipItem(item);
+ Net::getInventoryHandler()->unequipItem(item);
else
-#endif
- player_node->equipItem(item);
+ Net::getInventoryHandler()->equipItem(item);
}
else
{
- player_node->useItem(item);
+ Net::getInventoryHandler()->useItem(item);
}
}
}
diff --git a/src/keyboardconfig.cpp b/src/keyboardconfig.cpp
index efb8f189..ff05d75b 100644
--- a/src/keyboardconfig.cpp
+++ b/src/keyboardconfig.cpp
@@ -153,10 +153,13 @@ bool KeyboardConfig::hasConflicts()
{
for (j = i, j++; j < KEY_TOTAL; j++)
{
- // Allow for item shortcut and emote keys to overlap, but no other keys
+ // Allow for item shortcut and emote keys to overlap
+ // as well as emote and ignore keys, but no other keys
if (!((((i >= KEY_SHORTCUT_1) && (i <= KEY_SHORTCUT_12)) &&
((j >= KEY_EMOTE_1) && (j <= KEY_EMOTE_12))) ||
- ((i == KEY_TOGGLE_CHAT) && (j == KEY_OK))) &&
+ ((i == KEY_TOGGLE_CHAT) && (j == KEY_OK)) ||
+ ((i == KEY_EMOTE) &&
+ (j == KEY_IGNORE_INPUT_1 || j == KEY_IGNORE_INPUT_2))) &&
(mKey[i].value == mKey[j].value)
)
{
diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index 8a60a4b3..059ccd31 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -336,53 +336,6 @@ void LocalPlayer::setInvItem(int index, int id, int amount)
#endif
-void LocalPlayer::inviteToParty(const std::string &name)
-{
- Net::getPartyHandler()->invite(name);
-}
-
-void LocalPlayer::inviteToParty(Player *player)
-{
- Net::getPartyHandler()->invite(player);
-}
-
-void LocalPlayer::moveInvItem(Item *item, int newIndex)
-{
- Net::getInventoryHandler()->moveItem(item->getInvIndex(), newIndex);
-}
-
-void LocalPlayer::equipItem(Item *item)
-{
- Net::getInventoryHandler()->equipItem(item);
-}
-
-void LocalPlayer::unequipItem(Item *item)
-{
- Net::getInventoryHandler()->unequipItem(item);
-
- // Tidy equipment directly to avoid weapon still shown bug, for instance
-#ifdef TMWSERV_SUPPORT
- mEquipment->setEquipment(item->getInvIndex(), 0);
-#else
- mEquipment->removeEquipment(item->getInvIndex());
-#endif
-}
-
-void LocalPlayer::useItem(Item *item)
-{
- Net::getInventoryHandler()->useItem(item);
-}
-
-void LocalPlayer::dropItem(Item *item, int quantity)
-{
- Net::getInventoryHandler()->dropItem(item, quantity);
-}
-
-void LocalPlayer::splitItem(Item *item, int quantity)
-{
- Net::getInventoryHandler()->splitItem(item, quantity);
-}
-
void LocalPlayer::pickUp(FloorItem *item)
{
#ifdef TMWSERV_SUPPORT
@@ -623,16 +576,6 @@ void LocalPlayer::stopWalking(bool sendToServer)
}
#endif
-#ifdef EATHENA_SUPPORT
-void LocalPlayer::raiseSkill(Uint16 skillId)
-{
- if (mSkillPoint <= 0)
- return;
-
- Net::getSkillHandler()->up(skillId);
-}
-#endif
-
void LocalPlayer::toggleSit()
{
if (mLastAction != -1)
@@ -659,24 +602,6 @@ void LocalPlayer::emote(Uint8 emotion)
Net::getPlayerHandler()->emote(emotion);
}
-void LocalPlayer::tradeReply(bool accept)
-{
- if (!accept)
- mTrading = false;
-
- Net::getTradeHandler()->respond(accept);
-}
-
-void LocalPlayer::trade(Being *being) const
-{
- Net::getTradeHandler()->request(being);
-}
-
-bool LocalPlayer::tradeRequestOk() const
-{
- return !mTrading;
-}
-
#ifdef TMWSERV_SUPPORT
void LocalPlayer::attack()
@@ -806,11 +731,6 @@ void LocalPlayer::stopAttack()
mLastTarget = -1;
}
-void LocalPlayer::revive()
-{
- Net::getPlayerHandler()->respawn();
-}
-
#ifdef TMWSERV_SUPPORT
void LocalPlayer::raiseAttribute(size_t attr)
diff --git a/src/localplayer.h b/src/localplayer.h
index 930020db..bab254ab 100644
--- a/src/localplayer.h
+++ b/src/localplayer.h
@@ -187,37 +187,6 @@ class LocalPlayer : public Player
void setInvItem(int index, int id, int amount);
#endif
- /**
- * Invite a player to join their party
- */
- void inviteToParty(const std::string &name);
-
- /**
- * Invite a player to join their party
- */
- void inviteToParty(Player *player);
-
- /**
- * Move the Inventory item from the old slot to the new slot.
- */
- void moveInvItem(Item *item, int newIndex);
-
- /**
- * Equips an item.
- */
- void equipItem(Item *item);
-
- /**
- * Unequips an item.
- */
- void unequipItem(Item *item);
-
- void useItem(Item *item);
-
- void dropItem(Item *item, int quantity);
-
- void splitItem(Item *item, int quantity);
-
void pickUp(FloorItem *item);
#ifdef EATHENA_SUPPORT
@@ -233,20 +202,10 @@ class LocalPlayer : public Player
int getAttackRange();
/**
- * Sents a trade request to the given being.
- */
- void trade(Being *being) const;
-
- /**
- * Accept or decline a trade offer
- */
- void tradeReply(bool accept);
-
- /**
* Returns true when the player is ready to accept a trade offer.
* Returns false otherwise.
*/
- bool tradeRequestOk() const;
+ bool tradeRequestOk() const { return !mTrading; }
/**
* Sets the trading state of the player, i.e. whether or not he is
@@ -321,10 +280,7 @@ class LocalPlayer : public Player
*/
bool withinAttackRange(Being *target);
-#ifdef EATHENA_SUPPORT
- void raiseSkill(Uint16 skillId);
-#else
-
+#ifdef TMWSERV_SUPPORT
/**
* Stops the player dead in his tracks
*/
@@ -344,8 +300,6 @@ class LocalPlayer : public Player
void toggleSit();
void emote(Uint8 emotion);
- void revive();
-
/**
* Shows item pickup effect if the player is on a map.
*/
diff --git a/src/net/ea/generalhandler.cpp b/src/net/ea/generalhandler.cpp
index b8d75671..404bff69 100644
--- a/src/net/ea/generalhandler.cpp
+++ b/src/net/ea/generalhandler.cpp
@@ -87,20 +87,13 @@ GeneralHandler::GeneralHandler():
handledMessages = _messages;
generalHandler = this;
- std::list<ItemDB::Stat*> stats;
- ItemDB::Stat stat;
- stat.tag = "str"; stat.format = N_("Strength: %d");
- stats.push_back(&stat);
- stat.tag = "agi"; stat.format = N_("Agility: %d");
- stats.push_back(&stat);
- stat.tag = "vit"; stat.format = N_("Vitality: %d");
- stats.push_back(&stat);
- stat.tag = "int"; stat.format = N_("Intelligence: %d");
- stats.push_back(&stat);
- stat.tag = "dex"; stat.format = N_("Dexterity: %d");
- stats.push_back(&stat);
- stat.tag = "luck"; stat.format = N_("Luck: %d");
- stats.push_back(&stat);
+ std::list<ItemDB::Stat> stats;
+ stats.push_back(ItemDB::Stat("str", N_("Strength %+d")));
+ stats.push_back(ItemDB::Stat("agi", N_("Agility %+d")));
+ stats.push_back(ItemDB::Stat("vit", N_("Vitality %+d")));
+ stats.push_back(ItemDB::Stat("int", N_("Intelligence %+d")));
+ stats.push_back(ItemDB::Stat("dex", N_("Dexterity %+d")));
+ stats.push_back(ItemDB::Stat("luck", N_("Luck %+d")));
ItemDB::setStatsList(stats);
}
diff --git a/src/net/ea/gui/partytab.cpp b/src/net/ea/gui/partytab.cpp
index 12ca0d8d..9b0fc8c5 100644
--- a/src/net/ea/gui/partytab.cpp
+++ b/src/net/ea/gui/partytab.cpp
@@ -38,7 +38,7 @@
PartyTab::PartyTab() :
ChatTab(_("Party"))
{
- setTabColor(guiPalette->getColor(Palette::PARTY));
+ setTabColor(&guiPalette->getColor(Palette::PARTY));
}
PartyTab::~PartyTab()
diff --git a/src/net/ea/inventoryhandler.cpp b/src/net/ea/inventoryhandler.cpp
index 1c48aa6c..30c583b8 100644
--- a/src/net/ea/inventoryhandler.cpp
+++ b/src/net/ea/inventoryhandler.cpp
@@ -27,6 +27,7 @@
#include "net/messageout.h"
#include "configuration.h"
+#include "equipment.h"
#include "inventory.h"
#include "item.h"
#include "itemshortcut.h"
@@ -318,6 +319,9 @@ void InventoryHandler::unequipItem(const Item *item)
MessageOut outMsg(CMSG_PLAYER_UNEQUIP);
outMsg.writeInt16(item->getInvIndex() + INVENTORY_OFFSET);
+
+ // Tidy equipment directly to avoid weapon still shown bug, for instance
+ player_node->mEquipment->removeEquipment(item->getInvIndex());
}
void InventoryHandler::useItem(const Item *item)
diff --git a/src/net/ea/partyhandler.cpp b/src/net/ea/partyhandler.cpp
index e5b20a38..2f1b02ab 100644
--- a/src/net/ea/partyhandler.cpp
+++ b/src/net/ea/partyhandler.cpp
@@ -79,6 +79,7 @@ void PartyHandler::handleMessage(MessageIn &msg)
{
partyTab->chatLog(_("Party successfully created."), BY_SERVER);
player_node->setInParty(true);
+ partyWindow->setVisible(true);
}
break;
case SMSG_PARTY_INFO:
@@ -90,6 +91,7 @@ void PartyHandler::handleMessage(MessageIn &msg)
int length = msg.readInt16();
std::string party = msg.readString(24);
+ partyWindow->setPartyName(party);
int count = (length - 28) / 46;
for (int i = 0; i < count; i++)
@@ -101,13 +103,7 @@ void PartyHandler::handleMessage(MessageIn &msg)
bool online = msg.readInt8() == 0;
partyWindow->updateMember(id, nick, leader, online);
-
- Being *being = beingManager->findBeing(id);
- if (being)
- being->setName(nick);
}
-
- partyWindow->setVisible(true);
}
break;
case SMSG_PARTY_INVITE_RESPONSE:
@@ -230,15 +226,16 @@ void PartyHandler::handleMessage(MessageIn &msg)
msg.readInt8(); // fail
if (id == player_node->getId())
{
- player_node->setInParty(false);
partyWindow->clearMembers();
partyWindow->setVisible(false);
partyTab->chatLog(_("You have left the party."), BY_SERVER);
}
else
+ {
partyTab->chatLog(strprintf(_("%s has left your party."),
nick.c_str()), BY_SERVER);
- partyWindow->removeMember(id);
+ partyWindow->removeMember(id);
+ }
break;
}
case SMSG_PARTY_UPDATE_HP:
@@ -305,7 +302,7 @@ void PartyHandler::inviteResponse(const std::string &inviter, bool accept)
MessageOut outMsg(CMSG_PARTY_INVITED);
outMsg.writeInt32(player_node->getId());
outMsg.writeInt32(accept ? 1 : 0);
- player_node->setInParty(player_node->getInParty() || accept);
+ player_node->setInParty(player_node->isInParty() || accept);
}
void PartyHandler::leave()
diff --git a/src/net/ea/playerhandler.cpp b/src/net/ea/playerhandler.cpp
index 3f8fbc09..29f0bac4 100644
--- a/src/net/ea/playerhandler.cpp
+++ b/src/net/ea/playerhandler.cpp
@@ -75,7 +75,7 @@ namespace {
{
void action(const gcn::ActionEvent &event)
{
- player_node->revive();
+ Net::getPlayerHandler()->respawn();
deathNotice = NULL;
buyDialog->setVisible(false);
sellDialog->setVisible(false);
diff --git a/src/net/ea/skillhandler.cpp b/src/net/ea/skillhandler.cpp
index 0239a2c8..69b0fd65 100644
--- a/src/net/ea/skillhandler.cpp
+++ b/src/net/ea/skillhandler.cpp
@@ -26,6 +26,7 @@
#include "net/messagein.h"
#include "net/messageout.h"
+#include "localplayer.h"
#include "log.h"
#include "gui/skill.h"
@@ -216,6 +217,9 @@ void SkillHandler::handleMessage(MessageIn &msg)
void SkillHandler::up(int skillId)
{
+ if (player_node->mSkillPoint <= 0)
+ return;
+
MessageOut outMsg(CMSG_SKILL_LEVELUP_REQUEST);
outMsg.writeInt16(skillId);
}
diff --git a/src/net/ea/tradehandler.cpp b/src/net/ea/tradehandler.cpp
index ee8e6733..74722332 100644
--- a/src/net/ea/tradehandler.cpp
+++ b/src/net/ea/tradehandler.cpp
@@ -23,6 +23,7 @@
#include "net/ea/protocol.h"
+#include "net/inventoryhandler.h"
#include "net/messagein.h"
#include "net/messageout.h"
@@ -48,7 +49,7 @@ namespace {
{
void action(const gcn::ActionEvent &event)
{
- player_node->tradeReply(event.getId() == "yes");
+ Net::getTradeHandler()->respond(event.getId() == "yes");
}
} listener;
}
@@ -91,7 +92,7 @@ void TradeHandler::handleMessage(MessageIn &msg)
{
if (!player_node->tradeRequestOk())
{
- player_node->tradeReply(false);
+ Net::getTradeHandler()->respond(false);
break;
}
@@ -104,7 +105,7 @@ void TradeHandler::handleMessage(MessageIn &msg)
}
else
{
- player_node->tradeReply(false);
+ Net::getTradeHandler()->respond(false);
break;
}
break;
@@ -183,7 +184,7 @@ void TradeHandler::handleMessage(MessageIn &msg)
// Successfully added item
if (item->isEquipment() && item->isEquipped())
{
- player_node->unequipItem(item);
+ Net::getInventoryHandler()->unequipItem(item);
}
tradeWindow->addItem(item->getId(), true, quantity,
item->isEquipment());
@@ -236,6 +237,9 @@ void TradeHandler::request(Being *being)
void TradeHandler::respond(bool accept)
{
+ if (!accept)
+ player_node->setTrading(false);
+
MessageOut outMsg(CMSG_TRADE_RESPONSE);
outMsg.writeInt8(accept ? 3 : 4);
}
diff --git a/src/net/tmwserv/generalhandler.cpp b/src/net/tmwserv/generalhandler.cpp
index 0a0ca346..5886aafb 100644
--- a/src/net/tmwserv/generalhandler.cpp
+++ b/src/net/tmwserv/generalhandler.cpp
@@ -20,6 +20,7 @@
*/
#include "gui/inventorywindow.h"
+#include "gui/partywindow.h"
#include "net/tmwserv/generalhandler.h"
@@ -77,20 +78,13 @@ GeneralHandler::GeneralHandler():
generalHandler = this;
- std::list<ItemDB::Stat*> stats;
- ItemDB::Stat stat;
- stat.tag = "str"; stat.format = N_("Strength: %d");
- stats.push_back(&stat);
- stat.tag = "agi"; stat.format = N_("Agility: %d");
- stats.push_back(&stat);
- stat.tag = "dex"; stat.format = N_("Dexterity: %d");
- stats.push_back(&stat);
- stat.tag = "vit"; stat.format = N_("Vitality: %d");
- stats.push_back(&stat);
- stat.tag = "int"; stat.format = N_("Intelligence: %d");
- stats.push_back(&stat);
- stat.tag = "will"; stat.format = N_("Willpower: %d");
- stats.push_back(&stat);
+ std::list<ItemDB::Stat> stats;
+ stats.push_back(ItemDB::Stat("str", N_("Strength %+d")));
+ stats.push_back(ItemDB::Stat("agi", N_("Agility %+d")));
+ stats.push_back(ItemDB::Stat("dex", N_("Dexterity %+d")));
+ stats.push_back(ItemDB::Stat("vit", N_("Vitality %+d")));
+ stats.push_back(ItemDB::Stat("int", N_("Intelligence %+d")));
+ stats.push_back(ItemDB::Stat("will", N_("Willpower %+d")));
ItemDB::setStatsList(stats);
}
@@ -151,6 +145,7 @@ void GeneralHandler::tick()
void GeneralHandler::guiWindowsLoaded()
{
inventoryWindow->setSplitAllowed(true);
+ partyWindow->clearPartyName();
}
void GeneralHandler::guiWindowsUnloaded()
diff --git a/src/net/tmwserv/inventoryhandler.cpp b/src/net/tmwserv/inventoryhandler.cpp
index d78c8318..8110fdd2 100644
--- a/src/net/tmwserv/inventoryhandler.cpp
+++ b/src/net/tmwserv/inventoryhandler.cpp
@@ -100,6 +100,9 @@ void InventoryHandler::unequipItem(const Item *item)
MessageOut msg(PGMSG_UNEQUIP);
msg.writeInt8(item->getInvIndex());
Net::GameServer::connection->send(msg);
+
+ // Tidy equipment directly to avoid weapon still shown bug, for instance
+ player_node->mEquipment->setEquipment(item->getInvIndex(), 0);
}
void InventoryHandler::useItem(const Item *item)
diff --git a/src/net/tmwserv/partyhandler.cpp b/src/net/tmwserv/partyhandler.cpp
index 01de1be8..47ef791c 100644
--- a/src/net/tmwserv/partyhandler.cpp
+++ b/src/net/tmwserv/partyhandler.cpp
@@ -99,7 +99,7 @@ void PartyHandler::handleMessage(MessageIn &msg)
localChatTab->chatLog(name + " joined the party");
- if (!player_node->getInParty())
+ if (!player_node->isInParty())
player_node->setInParty(true);
partyWindow->updateMember(id, name);
diff --git a/src/net/tmwserv/playerhandler.cpp b/src/net/tmwserv/playerhandler.cpp
index c7769ede..b697e8a8 100644
--- a/src/net/tmwserv/playerhandler.cpp
+++ b/src/net/tmwserv/playerhandler.cpp
@@ -29,6 +29,7 @@
#include "net/messagein.h"
#include "net/messageout.h"
+#include "net/net.h"
#include "effectmanager.h"
#include "engine.h"
@@ -81,7 +82,7 @@ namespace {
{
void action(const gcn::ActionEvent &event)
{
- player_node->revive();
+ Net::getPlayerHandler()->respawn();
deathNotice = NULL;
buyDialog->setVisible(false);
sellDialog->setVisible(false);
diff --git a/src/net/tmwserv/tradehandler.cpp b/src/net/tmwserv/tradehandler.cpp
index 4c462a3f..74789a34 100644
--- a/src/net/tmwserv/tradehandler.cpp
+++ b/src/net/tmwserv/tradehandler.cpp
@@ -167,6 +167,8 @@ void TradeHandler::request(Being *being)
void TradeHandler::respond(bool accept)
{
// TODO
+ if (!accept)
+ player_node->setTrading(false);
}
void TradeHandler::addItem(Item *item, int amount)
diff --git a/src/player.cpp b/src/player.cpp
index f658b8b5..453b8bdd 100644
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -31,7 +31,6 @@
#include "text.h"
#include "gui/palette.h"
-#include "gui/partywindow.h"
#include "resources/colordb.h"
#include "resources/itemdb.h"
@@ -77,7 +76,11 @@ void Player::setName(const std::string &name)
{
color = &guiPalette->getColor(Palette::SELF);
}
- else if (partyWindow->findMember(getId()))
+ else if (mIsGM)
+ {
+ color = &guiPalette->getColor(Palette::GM);
+ }
+ else if (mInParty)
{
color = &guiPalette->getColor(Palette::PARTY);
}
@@ -301,9 +304,15 @@ short Player::getNumberOfGuilds()
#endif
-void Player::setInParty(bool value)
+void Player::setInParty(bool inParty)
{
- mInParty = value;
+ mInParty = inParty;
+
+ if (this != player_node && mName)
+ {
+ Palette::ColorType colorType = mInParty ? Palette::PARTY : Palette::PC;
+ mName->setColor(&guiPalette->getColor(colorType));
+ }
}
void Player::optionChanged(const std::string &value)
diff --git a/src/player.h b/src/player.h
index 5d037b75..330d0c14 100644
--- a/src/player.h
+++ b/src/player.h
@@ -120,14 +120,13 @@ class Player : public Being
#endif
/**
- * Set the player in party
+ * Set whether the player in the LocalPlayer's party. Players that are
+ * in the same party as the local player get their name displayed in
+ * a different color.
*/
- void setInParty(bool value);
+ void setInParty(bool inParty);
- /**
- * Returns whether player is in the party
- */
- bool getInParty() const { return mInParty; }
+ bool isInParty() const { return mInParty; }
/**
* Gets the way the character is blocked by other objects.
@@ -138,7 +137,6 @@ class Player : public Being
/**
* Called when a option (set with config.addListener()) is changed
*/
-
void optionChanged(const std::string &value);
protected:
diff --git a/src/playerrelations.cpp b/src/playerrelations.cpp
index 4a431e2a..316bd9ed 100644
--- a/src/playerrelations.cpp
+++ b/src/playerrelations.cpp
@@ -107,7 +107,7 @@ void PlayerRelationsManager::clear()
delete names;
}
-#define PERSIST_IGNORE_LIST "persist-player-list"
+#define PERSIST_IGNORE_LIST "persistent-player-list"
#define PLAYER_IGNORE_STRATEGY "player-ignore-strategy"
#define DEFAULT_PERMISSIONS "default-player-permissions"
@@ -125,7 +125,7 @@ void PlayerRelationsManager::load()
{
clear();
- mPersistIgnores = config.getValue(PERSIST_IGNORE_LIST, 0);
+ mPersistIgnores = config.getValue(PERSIST_IGNORE_LIST, 1);
mDefaultPermissions = (int) config.getValue(DEFAULT_PERMISSIONS, mDefaultPermissions);
std::string ignore_strategy_name = config.getValue(PLAYER_IGNORE_STRATEGY, DEFAULT_IGNORE_STRATEGY);
int ignore_strategy_index = getPlayerIgnoreStrategyIndex(ignore_strategy_name);
@@ -203,7 +203,8 @@ bool PlayerRelationsManager::hasPermission(Being *being, unsigned int flags)
return true;
}
-bool PlayerRelationsManager::hasPermission(const std::string &name, unsigned int flags)
+bool PlayerRelationsManager::hasPermission(const std::string &name,
+ unsigned int flags)
{
unsigned int rejections = flags & ~checkPermissionSilently(name, flags);
bool permitted = rejections == 0;
@@ -214,8 +215,7 @@ bool PlayerRelationsManager::hasPermission(const std::string &name, unsigned int
Player *to_ignore = dynamic_cast<Player *>(beingManager->findBeingByName(name, Being::PLAYER));
if (to_ignore)
- mIgnoreStrategy->ignore(to_ignore,
- rejections);
+ mIgnoreStrategy->ignore(to_ignore, rejections);
}
}
@@ -297,8 +297,8 @@ public:
}
virtual void ignore(Player *player, unsigned int flags)
- {
- }
+ {
+ }
};
class PIS_dotdotdot : public PlayerIgnoreStrategy
diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp
index 66c07849..99907ca7 100644
--- a/src/resources/itemdb.cpp
+++ b/src/resources/itemdb.cpp
@@ -55,9 +55,9 @@ static char const *const fields[][2] =
{ "mp", N_("MP %+d") }
};
-static std::list<ItemDB::Stat*> extraStats;
+static std::list<ItemDB::Stat> extraStats;
-void ItemDB::setStatsList(std::list<ItemDB::Stat*> stats)
+void ItemDB::setStatsList(const std::list<ItemDB::Stat> &stats)
{
extraStats = stats;
}
@@ -163,13 +163,13 @@ void ItemDB::load()
if (!effect.empty()) effect += " / ";
effect += strprintf(gettext(fields[i][1]), value);
}
- for (std::list<Stat*>::iterator it = extraStats.begin();
+ for (std::list<Stat>::iterator it = extraStats.begin();
it != extraStats.end(); it++)
{
- int value = XML::getProperty(node, (*it)->tag.c_str(), 0);
+ int value = XML::getProperty(node, it->tag.c_str(), 0);
if (!value) continue;
if (!effect.empty()) effect += " / ";
- effect += strprintf((*it)->format.c_str(), value);
+ effect += strprintf(it->format.c_str(), value);
}
std::string temp = XML::getProperty(node, "effect", "");
if (!effect.empty() && !temp.empty())
diff --git a/src/resources/itemdb.h b/src/resources/itemdb.h
index 2bb8fd5e..d0964e49 100644
--- a/src/resources/itemdb.h
+++ b/src/resources/itemdb.h
@@ -46,12 +46,19 @@ namespace ItemDB
const ItemInfo &get(int id);
const ItemInfo &get(const std::string &name);
- struct Stat {
+ struct Stat
+ {
+ Stat(const std::string &tag,
+ const std::string &format):
+ tag(tag),
+ format(format)
+ {}
+
std::string tag;
std::string format;
};
- void setStatsList(std::list<Stat*> stats);
+ void setStatsList(const std::list<Stat> &stats);
// Items database
typedef std::map<int, ItemInfo*> ItemInfos;
diff --git a/src/utils/sha256.cpp b/src/utils/sha256.cpp
index 76763ec3..b9d5c810 100644
--- a/src/utils/sha256.cpp
+++ b/src/utils/sha256.cpp
@@ -70,7 +70,9 @@
#include "utils/sha256.h"
+#ifdef HAVE_CONFIG_H
#include "config.h"
+#endif
#include <memory.h>