summaryrefslogtreecommitdiff
path: root/po
diff options
context:
space:
mode:
Diffstat (limited to 'po')
-rw-r--r--po/ar.po1232
-rw-r--r--po/ca.po1198
-rw-r--r--po/cs.po1226
-rw-r--r--po/da.po1291
-rw-r--r--po/de.po1254
-rw-r--r--po/en_GB.po1232
-rw-r--r--po/eo.po1195
-rw-r--r--po/es.po1249
-rw-r--r--po/fi.po1237
-rw-r--r--po/fr.po1237
-rw-r--r--po/he.po1237
-rw-r--r--po/hr.po1237
-rw-r--r--po/id.po1231
-rw-r--r--po/it.po1232
-rw-r--r--po/ja.po1221
-rw-r--r--po/nl.po1236
-rw-r--r--po/pl.po1244
-rw-r--r--po/pt.po1232
-rw-r--r--po/pt_BR.po1254
-rw-r--r--po/ru.po1232
-rw-r--r--po/sk.po1245
-rw-r--r--po/sv.po1249
-rw-r--r--po/th.po1222
-rw-r--r--po/tmw.pot1195
24 files changed, 16089 insertions, 13529 deletions
diff --git a/po/ar.po b/po/ar.po
index 276ee0ba..71560b2b 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-04-21 17:27+0200\n"
+"POT-Creation-Date: 2009-05-10 15:53+0200\n"
"PO-Revision-Date: 2008-07-16 18:28+0000\n"
"Last-Translator: صقر بن عبدالله <Unknown>\n"
"Language-Team: Arabic <ar@li.org>\n"
@@ -17,286 +17,286 @@ msgstr ""
"X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
"X-Generator: Launchpad (build Unknown)\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."
+#: src/commandhandler.cpp:142
+msgid "/help > Display this help"
msgstr ""
-#: src/commandhandler.cpp:145
+#: src/commandhandler.cpp:144
msgid "/where > Display map name"
msgstr ""
-#: src/commandhandler.cpp:146
+#: src/commandhandler.cpp:145
msgid "/who > Display number of online users"
msgstr ""
-#: src/commandhandler.cpp:147
+#: src/commandhandler.cpp:146
msgid "/me > Tell something about yourself"
msgstr ""
-#: src/commandhandler.cpp:149
+#: src/commandhandler.cpp:148
msgid "/clear > Clears this window"
msgstr ""
-#: src/commandhandler.cpp:151
+#: src/commandhandler.cpp:150
msgid "/msg > Send a private message to a user"
msgstr ""
-#: src/commandhandler.cpp:152
+#: src/commandhandler.cpp:151
msgid "/whisper > Alias of msg"
msgstr ""
-#: src/commandhandler.cpp:153
+#: src/commandhandler.cpp:152
msgid "/w > Alias of msg"
msgstr ""
-#: src/commandhandler.cpp:154
+#: src/commandhandler.cpp:153
msgid "/query > Makes a tab for private messages with another user"
msgstr ""
-#: src/commandhandler.cpp:155
+#: src/commandhandler.cpp:154
msgid "/q > Alias of query"
msgstr ""
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:156
msgid "/list > Display all public channels"
msgstr ""
-#: src/commandhandler.cpp:158
+#: src/commandhandler.cpp:157
msgid "/join > Join or create a channel"
msgstr ""
-#: src/commandhandler.cpp:160
+#: src/commandhandler.cpp:159
msgid "/party > Invite a user to party"
msgstr ""
-#: src/commandhandler.cpp:162
+#: src/commandhandler.cpp:161
msgid "/record > Start recording the chat to an external file"
msgstr ""
-#: 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 ""
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:165
msgid "/announce > Global announcement (GM only)"
msgstr ""
-#: src/commandhandler.cpp:170
+#: src/commandhandler.cpp:169
msgid "For more information, type /help <command>"
msgstr ""
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:173
msgid "Command: /help"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: src/commandhandler.cpp:186
+#: src/commandhandler.cpp:185
msgid "*** only available to a GM ***"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: src/commandhandler.cpp:209
+#: src/commandhandler.cpp:208
msgid "This command tell others you are (doing) <msg>."
msgstr ""
-#: src/commandhandler.cpp:213
+#: src/commandhandler.cpp:212
msgid "Command: /msg <nick> <message>"
msgstr ""
-#: src/commandhandler.cpp:214
+#: src/commandhandler.cpp:213
msgid "Command: /whisper <nick> <message>"
msgstr ""
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:214
msgid "Command: /w <nick> <message>"
msgstr ""
-#: src/commandhandler.cpp:216
+#: src/commandhandler.cpp:215
msgid "This command sends the text <message> to <nick>."
msgstr ""
-#: 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 ""
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:222
msgid "Command: /q <nick>"
msgstr ""
-#: src/commandhandler.cpp:224
+#: src/commandhandler.cpp:223
msgid "This command tries to make a tab for whispers betweenyou and <nick>."
msgstr ""
-#: src/commandhandler.cpp:229
+#: src/commandhandler.cpp:228
msgid "Command: /party <nick>"
msgstr ""
-#: 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 ""
-#: src/commandhandler.cpp:236
+#: src/commandhandler.cpp:235
msgid "Command: /present"
msgstr ""
-#: 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 ""
-#: src/commandhandler.cpp:244
+#: src/commandhandler.cpp:243
msgid "This command starts recording the chat log to the file <filename>."
msgstr ""
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:245
msgid "Command: /record"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: src/commandhandler.cpp:257
+#: src/commandhandler.cpp:256
msgid "Command: /toggle"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: src/commandhandler.cpp:336
-msgid "Cannont send empty whispers!"
+#: 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 ""
-#: 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 ""
@@ -305,46 +305,46 @@ msgstr ""
msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
msgstr ""
-#: 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"
+#: src/game.cpp:481
+msgid "The connection to the server was lost, the program will now quit"
msgstr ""
-#: src/game.cpp:493
-msgid "The connection to the server was lost, the program will now quit"
+#: src/game.cpp:487
+msgid "Network Error"
msgstr ""
-#: src/game.cpp:664 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
+#: 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
#, fuzzy
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 ""
@@ -357,12 +357,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
#, fuzzy, c-format
msgid "Price: %s / Total: %s"
msgstr "السعر: %d GP / الإجمالي: %d GP"
@@ -372,13 +372,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"
@@ -388,205 +388,213 @@ 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 ""
-#: 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
#, fuzzy
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
#, fuzzy, 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
#, fuzzy, c-format
msgid "Money: %s"
msgstr "النقود: %d"
-#: 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
#, fuzzy
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 ""
+
+#: 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 ""
-#: 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 "لا"
@@ -594,26 +602,16 @@ msgstr "لا"
msgid "Connecting..."
msgstr "جارِ الاتّصال..."
-#: src/gui/emotecontainer.cpp:61
+#: src/gui/emotepopup.cpp:64
msgid "Unable to load selection.png"
msgstr ""
-#: 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 "تجريد من العتاد"
@@ -638,100 +636,103 @@ 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
#, fuzzy
msgid "Select amount of items to store."
msgstr "انتقاء كمّيّة من المواد للمتاجرة بها."
-#: src/gui/item_amount.cpp:101
+#: src/gui/itemamount.cpp:130
#, fuzzy
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 "المنفذ:"
-#: src/gui/login.cpp:55
+#: src/gui/login.cpp:56
#, fuzzy
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 ""
@@ -747,71 +748,44 @@ msgstr ""
msgid "Cast Test Spell 3"
msgstr ""
-#: 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/minimap.cpp:45 src/gui/minimap.cpp:84
+#, fuzzy
+msgid "Map"
+msgstr "خارطة صغيرة"
-#: src/gui/menuwindow.cpp:72
-msgid "Guilds"
+#: src/gui/npcdialog.cpp:43
+msgid "Waiting for server"
msgstr ""
-#: src/gui/menuwindow.cpp:73
+#: src/gui/npcdialog.cpp:46
#, fuzzy
-msgid "Buddys"
-msgstr "شراء"
-
-#: src/gui/menuwindow.cpp:75
-msgid "Shortcut"
-msgstr "اختصار"
+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"
+#: src/gui/npcdialog.cpp:96
+msgid "-"
msgstr ""
-#: src/gui/npcintegerdialog.cpp:50
+#: src/gui/npcdialog.cpp:105
#, fuzzy
msgid "Reset"
msgstr "تسجيل"
-#: src/gui/npcintegerdialog.cpp:101 src/gui/npclistdialog.cpp:123
-#: src/gui/npcstringdialog.cpp:75
-#, fuzzy
-msgid ""
-"\n"
-"> Cancel\n"
-msgstr "إلغاء"
-
-#: src/gui/npcpostdialog.cpp:39 src/gui/npc_text.cpp:37
-msgid "NPC"
-msgstr "NPC"
-
#: src/gui/npcpostdialog.cpp:51
#, fuzzy
msgid "Send"
msgstr "صوت"
-#: src/gui/npcstringdialog.cpp:39
-msgid "NPC Text Request"
-msgstr ""
-
-#: 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
#, fuzzy
msgid "Text"
msgstr "التّالي"
@@ -866,7 +840,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
#, fuzzy
msgid "Party"
msgstr "المنفذ:"
@@ -889,7 +863,7 @@ msgid "Being"
msgstr ""
#: src/gui/palette.cpp:104
-msgid "Other Player's Names"
+msgid "Other Players' Names"
msgstr ""
#: src/gui/palette.cpp:105
@@ -916,21 +890,22 @@ msgid "Unknown Item Type"
msgstr ""
#: src/gui/palette.cpp:111
-msgid "Generic"
+msgid "Generics"
msgstr ""
#: src/gui/palette.cpp:112
-msgid "Hat"
-msgstr ""
+#, fuzzy
+msgid "Hats"
+msgstr "الحالة"
#: src/gui/palette.cpp:113
#, fuzzy
-msgid "Usable"
+msgid "Usables"
msgstr "استخدام"
#: src/gui/palette.cpp:114
#, fuzzy
-msgid "Shirt"
+msgid "Shirts"
msgstr "اختصار"
#: src/gui/palette.cpp:115
@@ -953,15 +928,15 @@ msgstr ""
#: src/gui/palette.cpp:119
#, fuzzy
-msgid "Shield"
+msgid "Shields"
msgstr "بيع"
#: src/gui/palette.cpp:120
-msgid "Ring"
+msgid "Rings"
msgstr ""
#: src/gui/palette.cpp:121
-msgid "Necklace"
+msgid "Necklaces"
msgstr ""
#: src/gui/palette.cpp:122
@@ -1017,95 +992,104 @@ msgstr ""
msgid "1/4 HP Bar"
msgstr ""
-#: src/gui/popupmenu.cpp:73
+#: src/gui/popupmenu.cpp:75
msgid "@@name|Add name to chat@@"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: src/gui/popupmenu.cpp:112
+#: src/gui/popupmenu.cpp:114
#, c-format
msgid "@@party|Invite %s to join your party@@"
msgstr ""
-#: src/gui/popupmenu.cpp:123
+#: src/gui/popupmenu.cpp:125
#, fuzzy, c-format
msgid "@@talk|Talk To %s@@"
msgstr "@@محادثة|تحدّث مع NPC@@"
-#: 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
-#, c-format
-msgid "@@pickup|Pick Up %s@@"
+#: src/gui/popupmenu.cpp:157
+#, fuzzy, c-format
+msgid "@@pickup|Pick up %s@@"
msgstr "@@اقتطاف|اقتطاف %s@@"
-#: src/gui/popupmenu.cpp:156 src/gui/popupmenu.cpp:352
-msgid "@@chat|Add to Chat@@"
+#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:373
+msgid "@@chat|Add to chat@@"
msgstr ""
-#: src/gui/popupmenu.cpp:336 src/gui/popupmenu.cpp:341
-msgid "@@use|Equip@@"
-msgstr "@@استخدام|استخدام العتاد@@"
-
-#: src/gui/popupmenu.cpp:339
+#: src/gui/popupmenu.cpp:348
#, fuzzy
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
+#, fuzzy
+msgid "@@store|Store@@"
+msgstr "@@استخدم|استخدم@@"
+
+#: src/gui/popupmenu.cpp:371
+msgid "@@retrieve|Retrieve@@"
+msgstr ""
+
#: src/gui/quitdialog.cpp:37
msgid "Switch server"
msgstr "تبديل الخادوم"
@@ -1175,20 +1159,32 @@ msgstr "يجب أن يكون طول كلمة السرّ أقل من %d محار
msgid "Passwords do not match."
msgstr "كلمات السرّ غير متطابقة."
-#: src/gui/serverdialog.cpp:73
+#: src/gui/serverdialog.cpp:74
#, fuzzy
msgid "Choose your server"
msgstr "اختار خادومك لـMana World"
-#: src/gui/serverdialog.cpp:163
+#: src/gui/serverdialog.cpp:164
msgid "Please type both the address and the port of a server."
msgstr "رجاء طباعة عنوان ومنفذ الخادوم."
-#: src/gui/serverselectdialog.cpp:50
+#: src/gui/serverselectdialog.cpp:59
#, fuzzy
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 "صوت"
@@ -1205,11 +1201,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 ""
@@ -1217,23 +1213,23 @@ 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
#, fuzzy
msgid "Static"
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 ""
#: 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
#, fuzzy
msgid "Spectrum"
msgstr "تثبيت"
@@ -1242,26 +1238,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 "إضغط على الزرّ لبدأ المعايرة"
@@ -1332,7 +1320,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 ""
@@ -1360,156 +1348,177 @@ 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
+#, fuzzy
+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 ""
-#: 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 "عتمة واجهة المستخدم"
-#: 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 "مؤثّرات محيطة"
-#: 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
#, fuzzy
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 ""
-#: 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 ""
-#: 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
#, fuzzy
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
#, fuzzy
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 ""
@@ -1522,6 +1531,10 @@ msgstr "مهارات"
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"
@@ -1531,15 +1544,6 @@ msgstr ""
msgid "Up"
msgstr ""
-#: src/gui/skill.cpp:146
-msgid "inc"
-msgstr ""
-
-#: src/gui/skill.cpp:147
-#, fuzzy
-msgid "use"
-msgstr "استخدام"
-
#: src/gui/skilldialog.cpp:113
msgid "Weapons"
msgstr ""
@@ -1549,179 +1553,179 @@ msgstr ""
msgid "Crafts"
msgstr "إنشاء"
-#: src/gui/status.cpp:57 src/gui/status.cpp:178
+#: src/gui/status.cpp:56 src/gui/status.cpp:177
#, fuzzy, c-format
msgid "Job: %d"
msgstr "المستوى: %d"
-#: src/gui/status.cpp:61
+#: src/gui/status.cpp:60
msgid "HP:"
msgstr ""
-#: src/gui/status.cpp:64
+#: src/gui/status.cpp:63
msgid "Exp:"
msgstr ""
-#: src/gui/status.cpp:67
+#: src/gui/status.cpp:66
msgid "MP:"
msgstr ""
-#: src/gui/status.cpp:70
+#: src/gui/status.cpp:69
#, fuzzy
msgid "Job:"
msgstr "المستوى: %d"
-#: src/gui/status.cpp:78
+#: src/gui/status.cpp:77
#, fuzzy
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
#, fuzzy
msgid "Attack:"
msgstr "مهاجمة %+d"
-#: src/gui/status.cpp:85
+#: src/gui/status.cpp:84
#, fuzzy
msgid "Defense:"
msgstr "دفاع %+d"
-#: src/gui/status.cpp:86
+#: src/gui/status.cpp:85
#, fuzzy
msgid "M.Attack:"
msgstr "مهاجمة %+d"
-#: src/gui/status.cpp:87
+#: src/gui/status.cpp:86
#, fuzzy
msgid "M.Defense:"
msgstr "دفاع %+d"
-#: src/gui/status.cpp:89
+#: src/gui/status.cpp:88
#, no-c-format
msgid "% Accuracy:"
msgstr ""
-#: src/gui/status.cpp:91
+#: src/gui/status.cpp:90
#, no-c-format
msgid "% Evade:"
msgstr ""
-#: 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
#, fuzzy
msgid "Strength"
msgstr "القوّة:"
-#: src/gui/status.cpp:200
+#: src/gui/status.cpp:199
#, fuzzy
msgid "Agility"
msgstr "خفّة الحركة:"
-#: src/gui/status.cpp:201
+#: src/gui/status.cpp:200
#, fuzzy
msgid "Vitality"
msgstr "نشاط:"
-#: src/gui/status.cpp:202
+#: src/gui/status.cpp:201
#, fuzzy
msgid "Intelligence"
msgstr "ذكاء:"
-#: src/gui/status.cpp:203
+#: src/gui/status.cpp:202
#, fuzzy
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 ""
-#: 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
#, fuzzy
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
#, fuzzy
msgid "Confirmed. Waiting..."
msgstr "جارِ الاتّصال..."
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:53
#, fuzzy
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
#, fuzzy, c-format
msgid "You get %s."
msgstr "أنت تحصل على %d GP."
-#: 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 ""
@@ -1833,21 +1837,21 @@ msgstr ""
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 ""
-#: src/gui/widgets/chattab.cpp:147
+#: src/gui/widgets/chattab.cpp:146
#, c-format
msgid "%s whispers: "
msgstr ""
-#: 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 ""
@@ -1855,23 +1859,35 @@ msgstr ""
msgid "Cannot send empty chat!"
msgstr ""
-#: src/gui/widgets/whispertab.cpp:55
-#, c-format
-msgid "%s: %s"
-msgstr ""
-
-#: src/gui/widgets/whispertab.cpp:69
+#: src/gui/widgets/whispertab.cpp:68
msgid "/close > Close the whisper tab"
msgstr ""
-#: src/gui/widgets/whispertab.cpp:79
+#: src/gui/widgets/whispertab.cpp:78
msgid "Command: /close"
msgstr ""
-#: 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
+#, fuzzy
+msgid "Buddys"
+msgstr "شراء"
+
+#: src/gui/windowmenu.cpp:68
+msgid "Shortcut"
+msgstr "اختصار"
+
#: src/keyboardconfig.cpp:41
msgid "Move Up"
msgstr ""
@@ -2003,7 +2019,7 @@ msgstr "تصفير النوافذ"
#: src/keyboardconfig.cpp:80
#, fuzzy
-msgid "Emote Window"
+msgid "Party Window"
msgstr "تصفير النوافذ"
#: src/keyboardconfig.cpp:81
@@ -2054,166 +2070,170 @@ msgstr ""
msgid "Ignore input 2"
msgstr ""
-#: 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
#, fuzzy
msgid "Sword"
msgstr "صوت"
-#: src/localplayer.cpp:852
+#: src/localplayer.cpp:837
msgid "Polearm"
msgstr ""
-#: src/localplayer.cpp:853
+#: src/localplayer.cpp:838
#, fuzzy
msgid "Staff"
msgstr "الحالة"
-#: src/localplayer.cpp:854
+#: src/localplayer.cpp:839
msgid "Whip"
msgstr ""
-#: src/localplayer.cpp:855
+#: src/localplayer.cpp:840
#, fuzzy
msgid "Bow"
msgstr "منخفض"
-#: src/localplayer.cpp:856
+#: src/localplayer.cpp:841
msgid "Shooting"
msgstr ""
-#: src/localplayer.cpp:857
+#: src/localplayer.cpp:842
#, fuzzy
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
#, fuzzy
msgid "Craft"
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 ""
-#: src/main.cpp:563
-msgid "Options: "
-msgstr ""
-
-#: src/main.cpp:564
-msgid " -C --configfile : Configuration file to use"
-msgstr ""
-
-#: src/main.cpp:565
-msgid " -d --data : Directory to load game data from"
-msgstr ""
-
-#: src/main.cpp:566
-msgid " -D --default : Bypass the login process with default settings"
+#: src/main.cpp:567
+msgid "Options:"
msgstr ""
#: src/main.cpp:568
-msgid " -h --help : Display this help"
+msgid " -C --config-file : Configuration file to use"
msgstr ""
#: src/main.cpp:569
-msgid " -S --homedir : Directory to use as home directory"
+msgid " -d --data : Directory to load game data from"
msgstr ""
#: src/main.cpp:570
-msgid " -H --updatehost : Use this update host"
-msgstr ""
-
-#: src/main.cpp:571
-msgid " -P --password : Login with this password"
+msgid " -D --default : Choose default character server and character"
msgstr ""
#: src/main.cpp:572
-msgid " -c --character : Login with this character"
+msgid " -h --help : Display this help"
msgstr ""
#: src/main.cpp:573
-msgid " -o --port : Login Server Port"
+msgid " -S --home-dir : Directory to use as home directory"
msgstr ""
#: src/main.cpp:574
-msgid " -s --server : Login Server name or IP"
+msgid " -H --update-host : Use this update host"
msgstr ""
#: src/main.cpp:575
-msgid " -u --skipupdate : Skip the update downloads"
+msgid " -P --password : Login with this password"
msgstr ""
#: src/main.cpp:576
-msgid " -U --username : Login with this username"
+msgid " -c --character : Login with this character"
msgstr ""
#: src/main.cpp:577
-msgid " -v --version : Display the version"
+msgid " -p --port : Login Server Port"
+msgstr ""
+
+#: src/main.cpp:578
+msgid " -s --server : Login Server name or IP"
+msgstr ""
+
+#: src/main.cpp:579
+msgid " -u --skip-update : Skip the update downloads"
+msgstr ""
+
+#: src/main.cpp:580
+msgid " -U --username : Login with this username"
msgstr ""
#: src/main.cpp:582
+msgid " -O --no-opengl : Disable OpenGL for this session"
+msgstr ""
+
+#: src/main.cpp:584
+msgid " -v --version : Display the version"
+msgstr ""
+
+#: src/main.cpp:589
#, fuzzy
msgid "The Mana World "
msgstr "اختار خادومك لـMana World"
-#: src/main.cpp:1499
+#: src/main.cpp:1515
#, fuzzy
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 ""
@@ -2300,18 +2320,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 ""
@@ -2324,416 +2344,430 @@ 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
#, fuzzy, c-format
msgid "Strength: %d"
msgstr "القوّة:"
-#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:82
+#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:84
#, fuzzy, c-format
msgid "Agility: %d"
msgstr "خفّة الحركة:"
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:86
+#: src/net/ea/generalhandler.cpp:96 src/net/tmwserv/generalhandler.cpp:88
#, fuzzy, c-format
msgid "Vitality: %d"
msgstr "نشاط:"
-#: src/net/ea/generalhandler.cpp:96 src/net/tmwserv/generalhandler.cpp:88
+#: src/net/ea/generalhandler.cpp:98 src/net/tmwserv/generalhandler.cpp:90
#, fuzzy, c-format
msgid "Intelligence: %d"
msgstr "ذكاء:"
-#: src/net/ea/generalhandler.cpp:98 src/net/tmwserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:100 src/net/tmwserv/generalhandler.cpp:86
#, fuzzy, c-format
msgid "Dexterity: %d"
msgstr "المهارة:"
-#: src/net/ea/generalhandler.cpp:100
+#: src/net/ea/generalhandler.cpp:102
#, c-format
msgid "Luck: %d"
msgstr ""
-#: 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 ""
-#: 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 ""
+
+#: src/net/ea/gui/partytab.cpp:53
msgid "/create > Create a new party"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:55
+#: src/net/ea/gui/partytab.cpp:54
msgid "/new > Alias of create"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:56
+#: src/net/ea/gui/partytab.cpp:55
msgid "/invite > Invite a player to your party"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:57
+#: src/net/ea/gui/partytab.cpp:56
msgid "/leave > Leave the party you are in"
msgstr ""
-#: 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 ""
-#: src/net/ea/gui/partytab.cpp:59
+#: src/net/ea/gui/partytab.cpp:58
msgid "/item > Show/change party item sharing options"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:60
+#: src/net/ea/gui/partytab.cpp:59
msgid "/exp > Show/change party experience sharing options"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:69
+#: src/net/ea/gui/partytab.cpp:68
msgid "Command: /new <party-name>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:70
+#: src/net/ea/gui/partytab.cpp:69
msgid "Command: /create <party-name>"
msgstr ""
-#: 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 ""
-#: src/net/ea/gui/partytab.cpp:75
+#: src/net/ea/gui/partytab.cpp:74
msgid "Command: /invite <nick>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:82
+#: src/net/ea/gui/partytab.cpp:81
msgid "Command: /leave"
msgstr ""
-#: 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 ""
-#: 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."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:92
+#: src/net/ea/gui/partytab.cpp:91
msgid "Command: /item"
msgstr ""
-#: 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 ""
-#: 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."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:102
+#: src/net/ea/gui/partytab.cpp:101
msgid "Command: /exp"
msgstr ""
-#: 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]"
+msgid "You picked up %s [@@%d|%s@@]"
msgstr ""
-#: 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
#, fuzzy
msgid "Unregistered ID"
msgstr "إلغاء التسجيل"
-#: src/net/ea/loginhandler.cpp:114
+#: src/net/ea/loginhandler.cpp:113
#, fuzzy
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
#, fuzzy
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 ""
-#: 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"
" Please contact the GM team via the forums."
msgstr ""
-#: 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."
+#: src/net/ea/partyhandler.cpp:77
+msgid "Could not create party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:82
-msgid "Could not create party."
+#: src/net/ea/partyhandler.cpp:80
+msgid "Party successfully created."
msgstr ""
-#: src/net/ea/partyhandler.cpp:112
+#: src/net/ea/partyhandler.cpp:115
#, c-format
msgid "%s is already a member of a party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:116
+#: src/net/ea/partyhandler.cpp:119
#, c-format
msgid "%s refused your invitation."
msgstr ""
-#: src/net/ea/partyhandler.cpp:120
+#: src/net/ea/partyhandler.cpp:123
#, c-format
msgid "%s is now a member of your party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:124
+#: src/net/ea/partyhandler.cpp:127
#, c-format
msgid "Unknown invite response for %s."
msgstr ""
-#: 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 ""
-#: src/net/ea/partyhandler.cpp:269
+#: src/net/ea/partyhandler.cpp:272
#, c-format
msgid "An unknown member tried to say: %s"
msgstr ""
-#: 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 ""
-#: 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"
+#: 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 ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
@@ -2891,40 +2925,98 @@ 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
#, fuzzy, c-format
msgid "Willpower: %d"
msgstr "قوّة الذات:"
-#: 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
+#, fuzzy
+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 ""
+
+#: src/net/tmwserv/loginhandler.cpp:143
+msgid "Old email address incorrect"
+msgstr ""
+
+#: src/net/tmwserv/loginhandler.cpp:149
+msgid "The new Email Address already exists."
+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 "كلمة السرّ:"
+
+#: src/net/tmwserv/loginhandler.cpp:211
+msgid "Wrong username, password or email address"
+msgstr ""
+
+#: src/net/tmwserv/loginhandler.cpp:214
+msgid "Username already exists"
+msgstr ""
+
+#: src/net/tmwserv/loginhandler.cpp:217
+msgid "Email address already exists"
+msgstr ""
+
+#: src/resources/itemdb.cpp:52
#, fuzzy, c-format
msgid "Attack %+d"
msgstr "مهاجمة %+d"
-#: src/resources/itemdb.cpp:54
+#: src/resources/itemdb.cpp:53
#, fuzzy, 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 ""
-#: src/resources/itemdb.cpp:151
+#: src/resources/itemdb.cpp:150
msgid "Unnamed"
msgstr ""
@@ -2940,6 +3032,20 @@ msgstr ""
msgid "NPC Database: Error while loading npcs.xml!"
msgstr ""
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "> Cancel\n"
+#~ msgstr "إلغاء"
+
+#, fuzzy
+#~ msgid "use"
+#~ msgstr "استخدام"
+
+#, fuzzy
+#~ msgid "Emote Window"
+#~ msgstr "تصفير النوافذ"
+
#~ msgid "@@description|Description@@"
#~ msgstr "@@الوصف|الوصف@@"
diff --git a/po/ca.po b/po/ca.po
index a6830d5f..7318530f 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-04-21 17:27+0200\n"
+"POT-Creation-Date: 2009-05-10 15:53+0200\n"
"PO-Revision-Date: 2008-07-03 17:21+0000\n"
"Last-Translator: Habari <thomas.becerril@gmail.com>\n"
"Language-Team: Catalan <ca@li.org>\n"
@@ -17,286 +17,286 @@ msgstr ""
"X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
"X-Generator: Launchpad (build Unknown)\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."
+#: src/commandhandler.cpp:142
+msgid "/help > Display this help"
msgstr ""
-#: src/commandhandler.cpp:145
+#: src/commandhandler.cpp:144
msgid "/where > Display map name"
msgstr ""
-#: src/commandhandler.cpp:146
+#: src/commandhandler.cpp:145
msgid "/who > Display number of online users"
msgstr ""
-#: src/commandhandler.cpp:147
+#: src/commandhandler.cpp:146
msgid "/me > Tell something about yourself"
msgstr ""
-#: src/commandhandler.cpp:149
+#: src/commandhandler.cpp:148
msgid "/clear > Clears this window"
msgstr ""
-#: src/commandhandler.cpp:151
+#: src/commandhandler.cpp:150
msgid "/msg > Send a private message to a user"
msgstr ""
-#: src/commandhandler.cpp:152
+#: src/commandhandler.cpp:151
msgid "/whisper > Alias of msg"
msgstr ""
-#: src/commandhandler.cpp:153
+#: src/commandhandler.cpp:152
msgid "/w > Alias of msg"
msgstr ""
-#: src/commandhandler.cpp:154
+#: src/commandhandler.cpp:153
msgid "/query > Makes a tab for private messages with another user"
msgstr ""
-#: src/commandhandler.cpp:155
+#: src/commandhandler.cpp:154
msgid "/q > Alias of query"
msgstr ""
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:156
msgid "/list > Display all public channels"
msgstr ""
-#: src/commandhandler.cpp:158
+#: src/commandhandler.cpp:157
msgid "/join > Join or create a channel"
msgstr ""
-#: src/commandhandler.cpp:160
+#: src/commandhandler.cpp:159
msgid "/party > Invite a user to party"
msgstr ""
-#: src/commandhandler.cpp:162
+#: src/commandhandler.cpp:161
msgid "/record > Start recording the chat to an external file"
msgstr ""
-#: 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 ""
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:165
msgid "/announce > Global announcement (GM only)"
msgstr ""
-#: src/commandhandler.cpp:170
+#: src/commandhandler.cpp:169
msgid "For more information, type /help <command>"
msgstr ""
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:173
msgid "Command: /help"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: src/commandhandler.cpp:186
+#: src/commandhandler.cpp:185
msgid "*** only available to a GM ***"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: src/commandhandler.cpp:209
+#: src/commandhandler.cpp:208
msgid "This command tell others you are (doing) <msg>."
msgstr ""
-#: src/commandhandler.cpp:213
+#: src/commandhandler.cpp:212
msgid "Command: /msg <nick> <message>"
msgstr ""
-#: src/commandhandler.cpp:214
+#: src/commandhandler.cpp:213
msgid "Command: /whisper <nick> <message>"
msgstr ""
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:214
msgid "Command: /w <nick> <message>"
msgstr ""
-#: src/commandhandler.cpp:216
+#: src/commandhandler.cpp:215
msgid "This command sends the text <message> to <nick>."
msgstr ""
-#: 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 ""
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:222
msgid "Command: /q <nick>"
msgstr ""
-#: src/commandhandler.cpp:224
+#: src/commandhandler.cpp:223
msgid "This command tries to make a tab for whispers betweenyou and <nick>."
msgstr ""
-#: src/commandhandler.cpp:229
+#: src/commandhandler.cpp:228
msgid "Command: /party <nick>"
msgstr ""
-#: 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 ""
-#: src/commandhandler.cpp:236
+#: src/commandhandler.cpp:235
msgid "Command: /present"
msgstr ""
-#: 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 ""
-#: src/commandhandler.cpp:244
+#: src/commandhandler.cpp:243
msgid "This command starts recording the chat log to the file <filename>."
msgstr ""
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:245
msgid "Command: /record"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: src/commandhandler.cpp:257
+#: src/commandhandler.cpp:256
msgid "Command: /toggle"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: src/commandhandler.cpp:336
-msgid "Cannont send empty whispers!"
+#: 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 ""
-#: 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 ""
@@ -305,45 +305,45 @@ msgstr ""
msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
msgstr ""
-#: 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"
+#: src/game.cpp:481
+msgid "The connection to the server was lost, the program will now quit"
msgstr ""
-#: src/game.cpp:493
-msgid "The connection to the server was lost, the program will now quit"
+#: src/game.cpp:487
+msgid "Network Error"
msgstr ""
-#: src/game.cpp:664 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
+#: 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 "sortir"
-#: 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 ""
@@ -355,12 +355,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
#, fuzzy, c-format
msgid "Price: %s / Total: %s"
msgstr "preu %d GP / total %d GP"
@@ -370,13 +370,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 ""
#: 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 ""
@@ -385,204 +385,212 @@ msgstr ""
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 ""
-#: 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 "nom"
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: 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 "ok"
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: 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
#, fuzzy
msgid "Chat"
msgstr "canvi"
-#: src/gui/chat.cpp:341 src/gui/chat.cpp:347
+#: src/gui/chat.cpp:332
+#, c-format
+msgid "%d players are present."
+msgstr ""
+
+#: 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 ""
-#: src/gui/confirm_dialog.cpp:42
+#: src/gui/confirmdialog.cpp:42
msgid "Yes"
msgstr "si"
-#: src/gui/confirm_dialog.cpp:43
+#: src/gui/confirmdialog.cpp:43
msgid "No"
msgstr "no"
@@ -590,26 +598,16 @@ msgstr "no"
msgid "Connecting..."
msgstr ""
-#: src/gui/emotecontainer.cpp:61
+#: src/gui/emotepopup.cpp:64
msgid "Unable to load selection.png"
msgstr ""
-#: 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 ""
@@ -633,97 +631,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 ""
-#: 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 ""
@@ -739,67 +740,41 @@ msgstr ""
msgid "Cast Test Spell 3"
msgstr ""
-#: src/gui/menuwindow.cpp:66
-msgid "Status"
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
+msgid "Map"
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/menuwindow.cpp:73
-msgid "Buddys"
+#: src/gui/npcdialog.cpp:43
+msgid "Waiting for server"
msgstr ""
-#: src/gui/menuwindow.cpp:75
-msgid "Shortcut"
-msgstr ""
+#: src/gui/npcdialog.cpp:46
+#, fuzzy
+msgid "Submit"
+msgstr "sortir"
-#: src/gui/menuwindow.cpp:77 src/gui/setup.cpp:65 src/main.cpp:920
-msgid "Setup"
+#: src/gui/npcdialog.cpp:49 src/gui/npcpostdialog.cpp:39
+msgid "NPC"
msgstr ""
-#: src/gui/minimap.cpp:39
-msgid "MiniMap"
+#: src/gui/npcdialog.cpp:95
+msgid "+"
msgstr ""
-#: src/gui/npcintegerdialog.cpp:39
-msgid "NPC Number Request"
+#: 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 ""
-
-#: src/gui/npcpostdialog.cpp:39 src/gui/npc_text.cpp:37
-msgid "NPC"
-msgstr ""
-
#: src/gui/npcpostdialog.cpp:51
msgid "Send"
msgstr ""
-#: src/gui/npcstringdialog.cpp:39
-msgid "NPC Text Request"
-msgstr ""
-
-#: 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 ""
@@ -852,7 +827,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 ""
@@ -873,7 +848,7 @@ msgid "Being"
msgstr ""
#: src/gui/palette.cpp:104
-msgid "Other Player's Names"
+msgid "Other Players' Names"
msgstr ""
#: src/gui/palette.cpp:105
@@ -899,19 +874,19 @@ 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"
+msgid "Usables"
msgstr ""
#: src/gui/palette.cpp:114
-msgid "Shirt"
+msgid "Shirts"
msgstr ""
#: src/gui/palette.cpp:115
@@ -931,15 +906,15 @@ msgid "2 Handed Weapons"
msgstr ""
#: src/gui/palette.cpp:119
-msgid "Shield"
+msgid "Shields"
msgstr ""
#: src/gui/palette.cpp:120
-msgid "Ring"
+msgid "Rings"
msgstr ""
#: src/gui/palette.cpp:121
-msgid "Necklace"
+msgid "Necklaces"
msgstr ""
#: src/gui/palette.cpp:122
@@ -994,94 +969,102 @@ msgstr ""
msgid "1/4 HP Bar"
msgstr ""
-#: src/gui/popupmenu.cpp:73
+#: src/gui/popupmenu.cpp:75
msgid "@@name|Add name to chat@@"
msgstr ""
-#: src/gui/popupmenu.cpp:85
+#: src/gui/popupmenu.cpp:87
#, c-format
msgid "@@trade|Trade With %s@@"
msgstr ""
-#: 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 ""
-#: src/gui/popupmenu.cpp:92
+#: src/gui/popupmenu.cpp:94
#, c-format
msgid "@@friend|Befriend %s@@"
msgstr ""
-#: 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 ""
-#: src/gui/popupmenu.cpp:112
+#: src/gui/popupmenu.cpp:114
#, c-format
msgid "@@party|Invite %s to join your party@@"
msgstr ""
-#: src/gui/popupmenu.cpp:123
+#: src/gui/popupmenu.cpp:125
#, c-format
msgid "@@talk|Talk To %s@@"
msgstr ""
-#: 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@@"
+msgid "@@pickup|Pick up %s@@"
msgstr ""
-#: src/gui/popupmenu.cpp:156 src/gui/popupmenu.cpp:352
-msgid "@@chat|Add to Chat@@"
+#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:373
+msgid "@@chat|Add to chat@@"
msgstr ""
-#: src/gui/popupmenu.cpp:336 src/gui/popupmenu.cpp:341
-msgid "@@use|Equip@@"
+#: src/gui/popupmenu.cpp:348
+msgid "@@use|Unequip@@"
msgstr ""
-#: src/gui/popupmenu.cpp:339
-msgid "@@use|Unequip@@"
+#: src/gui/popupmenu.cpp:350
+msgid "@@use|Equip@@"
msgstr ""
-#: src/gui/popupmenu.cpp:345
+#: 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 ""
+
+#: src/gui/popupmenu.cpp:371
+msgid "@@retrieve|Retrieve@@"
+msgstr ""
+
#: src/gui/quitdialog.cpp:37
msgid "Switch server"
msgstr ""
@@ -1150,18 +1133,30 @@ msgstr ""
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 ""
-#: 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 ""
@@ -1178,11 +1173,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 ""
@@ -1190,22 +1185,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 ""
#: 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 ""
#: 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 ""
@@ -1213,26 +1208,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 ""
@@ -1302,7 +1289,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 ""
@@ -1330,153 +1317,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 ""
-#: 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 ""
-#: src/gui/setup_video.cpp:136
+#: src/gui/setup_video.cpp:167
msgid "FPS Limit:"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: src/gui/setup_video.cpp:365
+#: src/gui/setup_video.cpp:435
msgid "Applying change to OpenGL requires restart."
msgstr ""
-#: 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 ""
@@ -1488,6 +1495,10 @@ msgstr ""
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"
@@ -1497,14 +1508,6 @@ msgstr ""
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 ""
@@ -1513,165 +1516,165 @@ msgstr ""
msgid "Crafts"
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 ""
-#: src/gui/status.cpp:61
+#: src/gui/status.cpp:60
msgid "HP:"
msgstr ""
-#: src/gui/status.cpp:64
+#: src/gui/status.cpp:63
msgid "Exp:"
msgstr ""
-#: src/gui/status.cpp:67
+#: src/gui/status.cpp:66
msgid "MP:"
msgstr ""
-#: 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 ""
-#: src/gui/status.cpp:91
+#: src/gui/status.cpp:90
#, no-c-format
msgid "% Evade:"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: 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 "canvi"
-#: 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 ""
@@ -1783,21 +1786,21 @@ msgstr ""
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 ""
-#: src/gui/widgets/chattab.cpp:147
+#: src/gui/widgets/chattab.cpp:146
#, c-format
msgid "%s whispers: "
msgstr ""
-#: 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 ""
@@ -1805,23 +1808,34 @@ msgstr ""
msgid "Cannot send empty chat!"
msgstr ""
-#: src/gui/widgets/whispertab.cpp:55
-#, c-format
-msgid "%s: %s"
-msgstr ""
-
-#: src/gui/widgets/whispertab.cpp:69
+#: src/gui/widgets/whispertab.cpp:68
msgid "/close > Close the whisper tab"
msgstr ""
-#: src/gui/widgets/whispertab.cpp:79
+#: src/gui/widgets/whispertab.cpp:78
msgid "Command: /close"
msgstr ""
-#: 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 ""
@@ -1941,7 +1955,7 @@ msgid "Debug Window"
msgstr ""
#: src/keyboardconfig.cpp:80
-msgid "Emote Window"
+msgid "Party Window"
msgstr ""
#: src/keyboardconfig.cpp:81
@@ -1990,159 +2004,163 @@ msgstr ""
msgid "Ignore input 2"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: src/main.cpp:563
-msgid "Options: "
-msgstr ""
-
-#: src/main.cpp:564
-msgid " -C --configfile : Configuration file to use"
-msgstr ""
-
-#: src/main.cpp:565
-msgid " -d --data : Directory to load game data from"
-msgstr ""
-
-#: src/main.cpp:566
-msgid " -D --default : Bypass the login process with default settings"
+#: src/main.cpp:567
+msgid "Options:"
msgstr ""
#: src/main.cpp:568
-msgid " -h --help : Display this help"
+msgid " -C --config-file : Configuration file to use"
msgstr ""
#: src/main.cpp:569
-msgid " -S --homedir : Directory to use as home directory"
+msgid " -d --data : Directory to load game data from"
msgstr ""
#: src/main.cpp:570
-msgid " -H --updatehost : Use this update host"
-msgstr ""
-
-#: src/main.cpp:571
-msgid " -P --password : Login with this password"
+msgid " -D --default : Choose default character server and character"
msgstr ""
#: src/main.cpp:572
-msgid " -c --character : Login with this character"
+msgid " -h --help : Display this help"
msgstr ""
#: src/main.cpp:573
-msgid " -o --port : Login Server Port"
+msgid " -S --home-dir : Directory to use as home directory"
msgstr ""
#: src/main.cpp:574
-msgid " -s --server : Login Server name or IP"
+msgid " -H --update-host : Use this update host"
msgstr ""
#: src/main.cpp:575
-msgid " -u --skipupdate : Skip the update downloads"
+msgid " -P --password : Login with this password"
msgstr ""
#: src/main.cpp:576
-msgid " -U --username : Login with this username"
+msgid " -c --character : Login with this character"
msgstr ""
#: src/main.cpp:577
-msgid " -v --version : Display the version"
+msgid " -p --port : Login Server Port"
+msgstr ""
+
+#: src/main.cpp:578
+msgid " -s --server : Login Server name or IP"
+msgstr ""
+
+#: src/main.cpp:579
+msgid " -u --skip-update : Skip the update downloads"
+msgstr ""
+
+#: src/main.cpp:580
+msgid " -U --username : Login with this username"
msgstr ""
#: src/main.cpp:582
+msgid " -O --no-opengl : Disable OpenGL for this session"
+msgstr ""
+
+#: src/main.cpp:584
+msgid " -v --version : Display the version"
+msgstr ""
+
+#: src/main.cpp:589
msgid "The Mana World "
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 ""
@@ -2223,18 +2241,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 ""
@@ -2246,413 +2264,427 @@ 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 ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: src/net/ea/generalhandler.cpp:100
+#: src/net/ea/generalhandler.cpp:102
#, c-format
msgid "Luck: %d"
msgstr ""
-#: 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 ""
-#: 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 ""
+
+#: src/net/ea/gui/partytab.cpp:53
msgid "/create > Create a new party"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:55
+#: src/net/ea/gui/partytab.cpp:54
msgid "/new > Alias of create"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:56
+#: src/net/ea/gui/partytab.cpp:55
msgid "/invite > Invite a player to your party"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:57
+#: src/net/ea/gui/partytab.cpp:56
msgid "/leave > Leave the party you are in"
msgstr ""
-#: 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 ""
-#: src/net/ea/gui/partytab.cpp:59
+#: src/net/ea/gui/partytab.cpp:58
msgid "/item > Show/change party item sharing options"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:60
+#: src/net/ea/gui/partytab.cpp:59
msgid "/exp > Show/change party experience sharing options"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:69
+#: src/net/ea/gui/partytab.cpp:68
msgid "Command: /new <party-name>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:70
+#: src/net/ea/gui/partytab.cpp:69
msgid "Command: /create <party-name>"
msgstr ""
-#: 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 ""
-#: src/net/ea/gui/partytab.cpp:75
+#: src/net/ea/gui/partytab.cpp:74
msgid "Command: /invite <nick>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:82
+#: src/net/ea/gui/partytab.cpp:81
msgid "Command: /leave"
msgstr ""
-#: 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 ""
-#: 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."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:92
+#: src/net/ea/gui/partytab.cpp:91
msgid "Command: /item"
msgstr ""
-#: 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 ""
-#: 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."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:102
+#: src/net/ea/gui/partytab.cpp:101
msgid "Command: /exp"
msgstr ""
-#: 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]"
+msgid "You picked up %s [@@%d|%s@@]"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: 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"
" Please contact the GM team via the forums."
msgstr ""
-#: 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."
+#: src/net/ea/partyhandler.cpp:77
+msgid "Could not create party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:82
-msgid "Could not create party."
+#: src/net/ea/partyhandler.cpp:80
+msgid "Party successfully created."
msgstr ""
-#: src/net/ea/partyhandler.cpp:112
+#: src/net/ea/partyhandler.cpp:115
#, c-format
msgid "%s is already a member of a party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:116
+#: src/net/ea/partyhandler.cpp:119
#, c-format
msgid "%s refused your invitation."
msgstr ""
-#: src/net/ea/partyhandler.cpp:120
+#: src/net/ea/partyhandler.cpp:123
#, c-format
msgid "%s is now a member of your party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:124
+#: src/net/ea/partyhandler.cpp:127
#, c-format
msgid "Unknown invite response for %s."
msgstr ""
-#: 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 ""
-#: src/net/ea/partyhandler.cpp:269
+#: src/net/ea/partyhandler.cpp:272
#, c-format
msgid "An unknown member tried to say: %s"
msgstr ""
-#: 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 ""
-#: 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"
+#: 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 ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
@@ -2808,40 +2840,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 ""
-#: 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 ""
+
+#: src/net/tmwserv/loginhandler.cpp:143
+msgid "Old email address incorrect"
+msgstr ""
+
+#: src/net/tmwserv/loginhandler.cpp:149
+msgid "The new Email Address already exists."
+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
+msgid "Wrong username or password"
+msgstr ""
+
+#: src/net/tmwserv/loginhandler.cpp:211
+msgid "Wrong username, password or email address"
+msgstr ""
+
+#: src/net/tmwserv/loginhandler.cpp:214
+msgid "Username already exists"
+msgstr ""
+
+#: src/net/tmwserv/loginhandler.cpp:217
+msgid "Email address already exists"
+msgstr ""
+
+#: src/resources/itemdb.cpp:52
#, c-format
msgid "Attack %+d"
msgstr ""
-#: src/resources/itemdb.cpp:54
+#: src/resources/itemdb.cpp:53
#, c-format
msgid "Defense %+d"
msgstr ""
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:54
#, c-format
msgid "HP %+d"
msgstr ""
-#: src/resources/itemdb.cpp:56
+#: src/resources/itemdb.cpp:55
#, c-format
msgid "MP %+d"
msgstr ""
-#: src/resources/itemdb.cpp:113
+#: src/resources/itemdb.cpp:112
msgid "items.xml"
msgstr ""
-#: src/resources/itemdb.cpp:151
+#: src/resources/itemdb.cpp:150
msgid "Unnamed"
msgstr ""
diff --git a/po/cs.po b/po/cs.po
index babf4c79..f8d6f07c 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-04-21 17:27+0200\n"
+"POT-Creation-Date: 2009-05-10 15:53+0200\n"
"PO-Revision-Date: 2008-12-17 16:31+0000\n"
"Last-Translator: Lubos <alvinx12@centrum.cz>\n"
"Language-Team: Czech <cs@li.org>\n"
@@ -17,286 +17,286 @@ msgstr ""
"X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
"X-Generator: Launchpad (build Unknown)\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."
+#: src/commandhandler.cpp:142
+msgid "/help > Display this help"
msgstr ""
-#: src/commandhandler.cpp:145
+#: src/commandhandler.cpp:144
msgid "/where > Display map name"
msgstr ""
-#: src/commandhandler.cpp:146
+#: src/commandhandler.cpp:145
msgid "/who > Display number of online users"
msgstr ""
-#: src/commandhandler.cpp:147
+#: src/commandhandler.cpp:146
msgid "/me > Tell something about yourself"
msgstr ""
-#: src/commandhandler.cpp:149
+#: src/commandhandler.cpp:148
msgid "/clear > Clears this window"
msgstr ""
-#: src/commandhandler.cpp:151
+#: src/commandhandler.cpp:150
msgid "/msg > Send a private message to a user"
msgstr ""
-#: src/commandhandler.cpp:152
+#: src/commandhandler.cpp:151
msgid "/whisper > Alias of msg"
msgstr ""
-#: src/commandhandler.cpp:153
+#: src/commandhandler.cpp:152
msgid "/w > Alias of msg"
msgstr ""
-#: src/commandhandler.cpp:154
+#: src/commandhandler.cpp:153
msgid "/query > Makes a tab for private messages with another user"
msgstr ""
-#: src/commandhandler.cpp:155
+#: src/commandhandler.cpp:154
msgid "/q > Alias of query"
msgstr ""
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:156
msgid "/list > Display all public channels"
msgstr ""
-#: src/commandhandler.cpp:158
+#: src/commandhandler.cpp:157
msgid "/join > Join or create a channel"
msgstr ""
-#: src/commandhandler.cpp:160
+#: src/commandhandler.cpp:159
msgid "/party > Invite a user to party"
msgstr ""
-#: src/commandhandler.cpp:162
+#: src/commandhandler.cpp:161
msgid "/record > Start recording the chat to an external file"
msgstr ""
-#: 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 ""
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:165
msgid "/announce > Global announcement (GM only)"
msgstr ""
-#: src/commandhandler.cpp:170
+#: src/commandhandler.cpp:169
msgid "For more information, type /help <command>"
msgstr ""
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:173
msgid "Command: /help"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: src/commandhandler.cpp:186
+#: src/commandhandler.cpp:185
msgid "*** only available to a GM ***"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: src/commandhandler.cpp:209
+#: src/commandhandler.cpp:208
msgid "This command tell others you are (doing) <msg>."
msgstr ""
-#: src/commandhandler.cpp:213
+#: src/commandhandler.cpp:212
msgid "Command: /msg <nick> <message>"
msgstr ""
-#: src/commandhandler.cpp:214
+#: src/commandhandler.cpp:213
msgid "Command: /whisper <nick> <message>"
msgstr ""
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:214
msgid "Command: /w <nick> <message>"
msgstr ""
-#: src/commandhandler.cpp:216
+#: src/commandhandler.cpp:215
msgid "This command sends the text <message> to <nick>."
msgstr ""
-#: 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 ""
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:222
msgid "Command: /q <nick>"
msgstr ""
-#: src/commandhandler.cpp:224
+#: src/commandhandler.cpp:223
msgid "This command tries to make a tab for whispers betweenyou and <nick>."
msgstr ""
-#: src/commandhandler.cpp:229
+#: src/commandhandler.cpp:228
msgid "Command: /party <nick>"
msgstr ""
-#: 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 ""
-#: src/commandhandler.cpp:236
+#: src/commandhandler.cpp:235
msgid "Command: /present"
msgstr ""
-#: 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 ""
-#: src/commandhandler.cpp:244
+#: src/commandhandler.cpp:243
msgid "This command starts recording the chat log to the file <filename>."
msgstr ""
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:245
msgid "Command: /record"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: src/commandhandler.cpp:257
+#: src/commandhandler.cpp:256
msgid "Command: /toggle"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: src/commandhandler.cpp:336
-msgid "Cannont send empty whispers!"
+#: 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 ""
-#: 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 ""
@@ -305,46 +305,46 @@ msgstr ""
msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
msgstr ""
-#: 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"
+#: src/game.cpp:481
+msgid "The connection to the server was lost, the program will now quit"
msgstr ""
-#: src/game.cpp:493
-msgid "The connection to the server was lost, the program will now quit"
+#: src/game.cpp:487
+msgid "Network Error"
msgstr ""
-#: src/game.cpp:664 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
+#: 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
#, fuzzy
msgid "Are you sure you want to quit?"
msgstr "Jste si jistí, že chcete vymazat tuto postavu?"
-#: 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 ""
@@ -357,12 +357,12 @@ msgstr "Nákup"
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 "Nákup"
#: 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 ""
@@ -372,13 +372,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 "Popis: %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 ""
@@ -387,207 +387,215 @@ msgstr ""
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 "Prodej"
-#: 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 "Zrušit"
-#: 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 "Změnit e-mail"
-#: 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 "Účet: %s"
-#: src/gui/changeemaildialog.cpp:48
+#: src/gui/changeemaildialog.cpp:49
#, fuzzy
msgid "Type New Email Address twice:"
msgstr "Změnit e-mail"
-#: 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 "Změnit heslo"
-#: 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 "Heslo:"
-#: 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 "Vytvořit postavu"
-#: 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 "Jméno:"
-#: src/gui/charcreatedialog.cpp:70
+#: src/gui/charcreatedialog.cpp:69
msgid "Hair Color:"
msgstr "Barva vlasů:"
-#: src/gui/charcreatedialog.cpp:73
+#: src/gui/charcreatedialog.cpp:72
msgid "Hair Style:"
msgstr "Styl vlasů:"
-#: src/gui/charcreatedialog.cpp:74
+#: src/gui/charcreatedialog.cpp:73
msgid "Create"
msgstr "Vytvořit"
-#: src/gui/charcreatedialog.cpp:76 src/gui/register.cpp:75
+#: src/gui/charcreatedialog.cpp:75 src/gui/register.cpp:75
msgid "Male"
msgstr "Muž"
-#: src/gui/charcreatedialog.cpp:77 src/gui/register.cpp:76
+#: src/gui/charcreatedialog.cpp:76 src/gui/register.cpp:76
msgid "Female"
msgstr "Žena"
-#: 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 "Rozdělte prosím %d bodů"
-#: 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 "Chyba"
-#: src/gui/charcreatedialog.cpp:174
+#: src/gui/charcreatedialog.cpp:173
#, fuzzy
msgid "Your name needs to be at least 4 characters."
msgstr "Uživatelské jméno musí být nejméně %d znaků dlouhé."
-#: 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 "Odstraňte prosím %d bodů."
-#: src/gui/char_select.cpp:79
+#: src/gui/charselectdialog.cpp:78
msgid "Confirm Character Delete"
msgstr "Potvrďte vymazání postavy"
-#: src/gui/char_select.cpp:80
+#: src/gui/charselectdialog.cpp:79
msgid "Are you sure you want to delete this character?"
msgstr "Jste si jistí, že chcete vymazat tuto postavu?"
-#: src/gui/char_select.cpp:98
+#: src/gui/charselectdialog.cpp:97
msgid "Account and Character Management"
msgstr "Správa účtu a postavy"
-#: src/gui/char_select.cpp:105
+#: src/gui/charselectdialog.cpp:104
#, fuzzy
msgid "Select Character"
msgstr "Vytvořit postavu"
-#: 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 "Ok"
-#: src/gui/char_select.cpp:113
+#: src/gui/charselectdialog.cpp:112
msgid "Previous"
msgstr "Předchozí"
-#: 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 "Další"
-#: 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 "Jméno: %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 "Úroveň: %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 "Nová"
-#: 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 "Odstranit"
-#: src/gui/char_select.cpp:120 src/gui/unregisterdialog.cpp:51
+#: src/gui/charselectdialog.cpp:119 src/gui/unregisterdialog.cpp:52
msgid "Unregister"
msgstr "Zrušit registraci"
-#: src/gui/char_select.cpp:127
+#: src/gui/charselectdialog.cpp:126
#, c-format
msgid "Money: %d"
msgstr "Peníze: %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
#, fuzzy, c-format
msgid "Job Level: %d"
msgstr "Úroveň: %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
#, fuzzy, c-format
msgid "Money: %s"
msgstr "Peníze: %d"
-#: 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
#, fuzzy
msgid "Chat"
msgstr "Vytvořit"
-#: src/gui/chat.cpp:341 src/gui/chat.cpp:347
+#: src/gui/chat.cpp:332
+#, c-format
+msgid "%d players are present."
+msgstr ""
+
+#: 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 ""
-#: src/gui/confirm_dialog.cpp:42
+#: src/gui/confirmdialog.cpp:42
msgid "Yes"
msgstr "Ano"
-#: src/gui/confirm_dialog.cpp:43
+#: src/gui/confirmdialog.cpp:43
msgid "No"
msgstr "Ne"
@@ -595,26 +603,16 @@ msgstr "Ne"
msgid "Connecting..."
msgstr "Připojuji se..."
-#: src/gui/emotecontainer.cpp:61
+#: src/gui/emotepopup.cpp:64
msgid "Unable to load selection.png"
msgstr ""
-#: 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 "Vybavení"
-#: 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 ""
@@ -641,101 +639,104 @@ msgstr "Gildy"
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 "Inventář"
-#: 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 "Vybavit"
-#: 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 "Upustit"
-#: src/gui/inventorywindow.cpp:79
+#: src/gui/inventorywindow.cpp:81
msgid "Split"
msgstr "Rozdělit"
-#: 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 "Vyberte množství zboží, se kterým budete obchodovat."
-#: src/gui/item_amount.cpp:95
+#: src/gui/itemamount.cpp:124
msgid "Select amount of items to drop."
msgstr "Vyberte množství zboží, které chcete upustit."
-#: src/gui/item_amount.cpp:98
+#: src/gui/itemamount.cpp:127
#, fuzzy
msgid "Select amount of items to store."
msgstr "Vyberte množství zboží, se kterým budete obchodovat."
-#: src/gui/item_amount.cpp:101
+#: src/gui/itemamount.cpp:130
#, fuzzy
msgid "Select amount of items to retrieve."
msgstr "Vyberte množství zboží, se kterým budete obchodovat."
-#: src/gui/item_amount.cpp:104
+#: src/gui/itemamount.cpp:133
#, fuzzy
msgid "Select amount of items to split."
msgstr "Vyberte množství zboží, které chcete upustit."
-#: 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 "Server:"
-#: 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:"
-#: src/gui/login.cpp:55
+#: src/gui/login.cpp:56
#, fuzzy
msgid "Recent:"
msgstr "Registrace"
-#: src/gui/login.cpp:72
+#: src/gui/login.cpp:73
msgid "Remember Username"
msgstr "Zapamatovat uživatelské jméno"
-#: 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 "Registrace"
-#: 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 ""
@@ -751,71 +752,44 @@ msgstr ""
msgid "Cast Test Spell 3"
msgstr ""
-#: src/gui/menuwindow.cpp:66
-msgid "Status"
-msgstr "Stav"
-
-#: src/gui/menuwindow.cpp:69 src/gui/skill.cpp:126 src/gui/skilldialog.cpp:99
-msgid "Skills"
-msgstr "Dovednosti"
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
+#, fuzzy
+msgid "Map"
+msgstr "MiniMapa"
-#: src/gui/menuwindow.cpp:72
-msgid "Guilds"
-msgstr "Gildy"
+#: src/gui/npcdialog.cpp:43
+msgid "Waiting for server"
+msgstr ""
-#: src/gui/menuwindow.cpp:73
+#: src/gui/npcdialog.cpp:46
#, fuzzy
-msgid "Buddys"
-msgstr "Nákup"
-
-#: src/gui/menuwindow.cpp:75
-msgid "Shortcut"
-msgstr "Zkratka"
+msgid "Submit"
+msgstr "Rozdělit"
-#: src/gui/menuwindow.cpp:77 src/gui/setup.cpp:65 src/main.cpp:920
-msgid "Setup"
-msgstr "Nastavení"
+#: src/gui/npcdialog.cpp:49 src/gui/npcpostdialog.cpp:39
+msgid "NPC"
+msgstr ""
-#: src/gui/minimap.cpp:39
-msgid "MiniMap"
-msgstr "MiniMapa"
+#: src/gui/npcdialog.cpp:95
+msgid "+"
+msgstr ""
-#: src/gui/npcintegerdialog.cpp:39
-msgid "NPC Number Request"
+#: src/gui/npcdialog.cpp:96
+msgid "-"
msgstr ""
-#: src/gui/npcintegerdialog.cpp:50
+#: src/gui/npcdialog.cpp:105
#, fuzzy
msgid "Reset"
msgstr "Registrace"
-#: src/gui/npcintegerdialog.cpp:101 src/gui/npclistdialog.cpp:123
-#: src/gui/npcstringdialog.cpp:75
-#, fuzzy
-msgid ""
-"\n"
-"> Cancel\n"
-msgstr "Zrušit"
-
-#: src/gui/npcpostdialog.cpp:39 src/gui/npc_text.cpp:37
-msgid "NPC"
-msgstr ""
-
#: src/gui/npcpostdialog.cpp:51
#, fuzzy
msgid "Send"
msgstr "Zvuk"
-#: src/gui/npcstringdialog.cpp:39
-msgid "NPC Text Request"
-msgstr ""
-
-#: 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
#, fuzzy
msgid "Text"
msgstr "Další"
@@ -869,7 +843,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
#, fuzzy
msgid "Party"
msgstr "Port:"
@@ -892,7 +866,7 @@ msgid "Being"
msgstr ""
#: src/gui/palette.cpp:104
-msgid "Other Player's Names"
+msgid "Other Players' Names"
msgstr ""
#: src/gui/palette.cpp:105
@@ -918,21 +892,22 @@ msgid "Unknown Item Type"
msgstr ""
#: src/gui/palette.cpp:111
-msgid "Generic"
+msgid "Generics"
msgstr ""
#: src/gui/palette.cpp:112
-msgid "Hat"
-msgstr ""
+#, fuzzy
+msgid "Hats"
+msgstr "Stav"
#: src/gui/palette.cpp:113
#, fuzzy
-msgid "Usable"
+msgid "Usables"
msgstr "Muž"
#: src/gui/palette.cpp:114
#, fuzzy
-msgid "Shirt"
+msgid "Shirts"
msgstr "Zkratka"
#: src/gui/palette.cpp:115
@@ -954,15 +929,15 @@ msgstr ""
#: src/gui/palette.cpp:119
#, fuzzy
-msgid "Shield"
+msgid "Shields"
msgstr "Prodej"
#: src/gui/palette.cpp:120
-msgid "Ring"
+msgid "Rings"
msgstr ""
#: src/gui/palette.cpp:121
-msgid "Necklace"
+msgid "Necklaces"
msgstr ""
#: src/gui/palette.cpp:122
@@ -1018,94 +993,102 @@ msgstr ""
msgid "1/4 HP Bar"
msgstr ""
-#: src/gui/popupmenu.cpp:73
+#: src/gui/popupmenu.cpp:75
msgid "@@name|Add name to chat@@"
msgstr ""
-#: src/gui/popupmenu.cpp:85
+#: src/gui/popupmenu.cpp:87
#, c-format
msgid "@@trade|Trade With %s@@"
msgstr ""
-#: 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 ""
-#: src/gui/popupmenu.cpp:92
+#: src/gui/popupmenu.cpp:94
#, c-format
msgid "@@friend|Befriend %s@@"
msgstr ""
-#: 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 ""
-#: src/gui/popupmenu.cpp:112
+#: src/gui/popupmenu.cpp:114
#, c-format
msgid "@@party|Invite %s to join your party@@"
msgstr ""
-#: src/gui/popupmenu.cpp:123
+#: src/gui/popupmenu.cpp:125
#, c-format
msgid "@@talk|Talk To %s@@"
msgstr ""
-#: 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@@"
+msgid "@@pickup|Pick up %s@@"
msgstr ""
-#: src/gui/popupmenu.cpp:156 src/gui/popupmenu.cpp:352
-msgid "@@chat|Add to Chat@@"
+#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:373
+msgid "@@chat|Add to chat@@"
msgstr ""
-#: src/gui/popupmenu.cpp:336 src/gui/popupmenu.cpp:341
-msgid "@@use|Equip@@"
+#: src/gui/popupmenu.cpp:348
+msgid "@@use|Unequip@@"
msgstr ""
-#: src/gui/popupmenu.cpp:339
-msgid "@@use|Unequip@@"
+#: src/gui/popupmenu.cpp:350
+msgid "@@use|Equip@@"
msgstr ""
-#: src/gui/popupmenu.cpp:345
+#: 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 ""
+
+#: src/gui/popupmenu.cpp:371
+msgid "@@retrieve|Retrieve@@"
+msgstr ""
+
#: src/gui/quitdialog.cpp:37
#, fuzzy
msgid "Switch server"
@@ -1176,19 +1159,31 @@ msgstr "Heslo musí být kratší než %d znaků."
msgid "Passwords do not match."
msgstr "Hesla se neshodují."
-#: 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 ""
-#: src/gui/serverselectdialog.cpp:50
+#: src/gui/serverselectdialog.cpp:59
#, fuzzy
msgid "Select Server"
msgstr "Server:"
+#: src/gui/setup.cpp:64 src/gui/windowmenu.cpp:69 src/main.cpp:933
+msgid "Setup"
+msgstr "Nastavení"
+
+#: 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 "Zvuk"
@@ -1205,11 +1200,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 ""
@@ -1217,23 +1212,23 @@ 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
#, fuzzy
msgid "Static"
msgstr "Stav"
#: 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 ""
#: 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
#, fuzzy
msgid "Spectrum"
msgstr "Nastavení"
@@ -1242,26 +1237,18 @@ msgstr "Nastavení"
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 ""
@@ -1332,7 +1319,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 ""
@@ -1360,154 +1347,175 @@ 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
+#, fuzzy
+msgid "Small"
+msgstr "Prodej"
+
+#: 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 ""
-#: src/gui/setup_video.cpp:136
+#: src/gui/setup_video.cpp:167
msgid "FPS Limit:"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: 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
#, fuzzy
msgid "No text"
msgstr "Další"
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: src/gui/setup_video.cpp:365
+#: src/gui/setup_video.cpp:435
msgid "Applying change to OpenGL requires restart."
msgstr ""
-#: 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 ""
@@ -1520,6 +1528,10 @@ msgstr "Dovednosti"
msgid "Mystery Skill"
msgstr ""
+#: src/gui/skill.cpp:126 src/gui/skilldialog.cpp:99 src/gui/windowmenu.cpp:62
+msgid "Skills"
+msgstr "Dovednosti"
+
#: src/gui/skill.cpp:145 src/gui/skill.cpp:197
#, c-format
msgid "Skill points: %d"
@@ -1529,14 +1541,6 @@ msgstr ""
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 ""
@@ -1546,179 +1550,179 @@ msgstr ""
msgid "Crafts"
msgstr "Vytvořit"
-#: src/gui/status.cpp:57 src/gui/status.cpp:178
+#: src/gui/status.cpp:56 src/gui/status.cpp:177
#, fuzzy, c-format
msgid "Job: %d"
msgstr "Úroveň: %d"
-#: src/gui/status.cpp:61
+#: src/gui/status.cpp:60
msgid "HP:"
msgstr ""
-#: src/gui/status.cpp:64
+#: src/gui/status.cpp:63
msgid "Exp:"
msgstr ""
-#: src/gui/status.cpp:67
+#: src/gui/status.cpp:66
msgid "MP:"
msgstr ""
-#: src/gui/status.cpp:70
+#: src/gui/status.cpp:69
#, fuzzy
msgid "Job:"
msgstr "Úroveň: %d"
-#: src/gui/status.cpp:78
+#: src/gui/status.cpp:77
#, fuzzy
msgid "Stats"
msgstr "Stav"
-#: 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
#, fuzzy
msgid "Attack:"
msgstr "Útok %+d"
-#: src/gui/status.cpp:85
+#: src/gui/status.cpp:84
#, fuzzy
msgid "Defense:"
msgstr "Obrana %+d"
-#: src/gui/status.cpp:86
+#: src/gui/status.cpp:85
#, fuzzy
msgid "M.Attack:"
msgstr "Útok %+d"
-#: src/gui/status.cpp:87
+#: src/gui/status.cpp:86
#, fuzzy
msgid "M.Defense:"
msgstr "Obrana %+d"
-#: src/gui/status.cpp:89
+#: src/gui/status.cpp:88
#, no-c-format
msgid "% Accuracy:"
msgstr ""
-#: src/gui/status.cpp:91
+#: src/gui/status.cpp:90
#, no-c-format
msgid "% Evade:"
msgstr ""
-#: 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
#, fuzzy
msgid "Strength"
msgstr "Síla:"
-#: src/gui/status.cpp:200
+#: src/gui/status.cpp:199
#, fuzzy
msgid "Agility"
msgstr "Vitalita:"
-#: src/gui/status.cpp:201
+#: src/gui/status.cpp:200
#, fuzzy
msgid "Vitality"
msgstr "Vitalita:"
-#: src/gui/status.cpp:202
+#: src/gui/status.cpp:201
#, fuzzy
msgid "Intelligence"
msgstr "Inteligence:"
-#: 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 ""
-#: src/gui/status.cpp:383 src/gui/status.cpp:405
+#: src/gui/status.cpp:384
#, fuzzy
msgid "Max level"
msgstr "Muž"
-#: src/gui/storagewindow.cpp:53
+#: src/gui/storagewindow.cpp:54
msgid "Storage"
msgstr ""
-#: src/gui/storagewindow.cpp:64
+#: src/gui/storagewindow.cpp:65
#, fuzzy
msgid "Store"
msgstr "Síla:"
-#: 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 "Nabídnout obchod"
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:52
#, fuzzy
msgid "Confirmed. Waiting..."
msgstr "Připojuji se..."
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:53
#, fuzzy
msgid "Agree trade"
msgstr "Nabídnout obchod"
-#: 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 ""
-#: 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 "Změnit"
-#: 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 ""
@@ -1830,21 +1834,21 @@ msgstr ""
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 ""
-#: src/gui/widgets/chattab.cpp:147
+#: src/gui/widgets/chattab.cpp:146
#, c-format
msgid "%s whispers: "
msgstr ""
-#: 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 ""
@@ -1852,23 +1856,35 @@ msgstr ""
msgid "Cannot send empty chat!"
msgstr ""
-#: src/gui/widgets/whispertab.cpp:55
-#, c-format
-msgid "%s: %s"
-msgstr ""
-
-#: src/gui/widgets/whispertab.cpp:69
+#: src/gui/widgets/whispertab.cpp:68
msgid "/close > Close the whisper tab"
msgstr ""
-#: src/gui/widgets/whispertab.cpp:79
+#: src/gui/widgets/whispertab.cpp:78
msgid "Command: /close"
msgstr ""
-#: 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 "Stav"
+
+#: src/gui/windowmenu.cpp:65
+msgid "Guilds"
+msgstr "Gildy"
+
+#: src/gui/windowmenu.cpp:66
+#, fuzzy
+msgid "Buddys"
+msgstr "Nákup"
+
+#: src/gui/windowmenu.cpp:68
+msgid "Shortcut"
+msgstr "Zkratka"
+
#: src/keyboardconfig.cpp:41
msgid "Move Up"
msgstr ""
@@ -1994,8 +2010,9 @@ msgid "Debug Window"
msgstr ""
#: src/keyboardconfig.cpp:80
-msgid "Emote Window"
-msgstr ""
+#, fuzzy
+msgid "Party Window"
+msgstr "Stav"
#: src/keyboardconfig.cpp:81
msgid "Emote Shortcut Window"
@@ -2045,164 +2062,168 @@ msgstr ""
msgid "Ignore input 2"
msgstr ""
-#: 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
#, fuzzy
msgid "Sword"
msgstr "Zvuk"
-#: src/localplayer.cpp:852
+#: src/localplayer.cpp:837
msgid "Polearm"
msgstr ""
-#: src/localplayer.cpp:853
+#: src/localplayer.cpp:838
#, fuzzy
msgid "Staff"
msgstr "Stav"
-#: 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
#, fuzzy
msgid "Mace"
msgstr "Muž"
-#: 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
#, fuzzy
msgid "Craft"
msgstr "Vytvořit"
-#: 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 ""
-#: src/main.cpp:563
-msgid "Options: "
-msgstr ""
-
-#: src/main.cpp:564
-msgid " -C --configfile : Configuration file to use"
-msgstr ""
-
-#: src/main.cpp:565
-msgid " -d --data : Directory to load game data from"
-msgstr ""
-
-#: src/main.cpp:566
-msgid " -D --default : Bypass the login process with default settings"
+#: src/main.cpp:567
+msgid "Options:"
msgstr ""
#: src/main.cpp:568
-msgid " -h --help : Display this help"
+msgid " -C --config-file : Configuration file to use"
msgstr ""
#: src/main.cpp:569
-msgid " -S --homedir : Directory to use as home directory"
+msgid " -d --data : Directory to load game data from"
msgstr ""
#: src/main.cpp:570
-msgid " -H --updatehost : Use this update host"
-msgstr ""
-
-#: src/main.cpp:571
-msgid " -P --password : Login with this password"
+msgid " -D --default : Choose default character server and character"
msgstr ""
#: src/main.cpp:572
-msgid " -c --character : Login with this character"
+msgid " -h --help : Display this help"
msgstr ""
#: src/main.cpp:573
-msgid " -o --port : Login Server Port"
+msgid " -S --home-dir : Directory to use as home directory"
msgstr ""
#: src/main.cpp:574
-msgid " -s --server : Login Server name or IP"
+msgid " -H --update-host : Use this update host"
msgstr ""
#: src/main.cpp:575
-msgid " -u --skipupdate : Skip the update downloads"
+msgid " -P --password : Login with this password"
msgstr ""
#: src/main.cpp:576
-msgid " -U --username : Login with this username"
+msgid " -c --character : Login with this character"
msgstr ""
#: src/main.cpp:577
-msgid " -v --version : Display the version"
+msgid " -p --port : Login Server Port"
+msgstr ""
+
+#: src/main.cpp:578
+msgid " -s --server : Login Server name or IP"
+msgstr ""
+
+#: src/main.cpp:579
+msgid " -u --skip-update : Skip the update downloads"
+msgstr ""
+
+#: src/main.cpp:580
+msgid " -U --username : Login with this username"
msgstr ""
#: src/main.cpp:582
+msgid " -O --no-opengl : Disable OpenGL for this session"
+msgstr ""
+
+#: src/main.cpp:584
+msgid " -v --version : Display the version"
+msgstr ""
+
+#: src/main.cpp:589
msgid "The Mana World "
msgstr ""
-#: src/main.cpp:1499
+#: src/main.cpp:1515
#, fuzzy
msgid "Connecting to map server..."
msgstr "Připojuji se..."
-#: 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 ""
@@ -2288,18 +2309,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 ""
@@ -2311,417 +2332,431 @@ 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
#, fuzzy, c-format
msgid "Strength: %d"
msgstr "Síla:"
-#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:82
+#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:84
#, fuzzy, c-format
msgid "Agility: %d"
msgstr "Vitalita:"
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:86
+#: src/net/ea/generalhandler.cpp:96 src/net/tmwserv/generalhandler.cpp:88
#, fuzzy, c-format
msgid "Vitality: %d"
msgstr "Vitalita:"
-#: src/net/ea/generalhandler.cpp:96 src/net/tmwserv/generalhandler.cpp:88
+#: src/net/ea/generalhandler.cpp:98 src/net/tmwserv/generalhandler.cpp:90
#, fuzzy, c-format
msgid "Intelligence: %d"
msgstr "Inteligence:"
-#: 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 ""
-#: src/net/ea/generalhandler.cpp:100
+#: src/net/ea/generalhandler.cpp:102
#, c-format
msgid "Luck: %d"
msgstr ""
-#: 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 ""
-#: 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 ""
+
+#: src/net/ea/gui/partytab.cpp:53
msgid "/create > Create a new party"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:55
+#: src/net/ea/gui/partytab.cpp:54
msgid "/new > Alias of create"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:56
+#: src/net/ea/gui/partytab.cpp:55
msgid "/invite > Invite a player to your party"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:57
+#: src/net/ea/gui/partytab.cpp:56
msgid "/leave > Leave the party you are in"
msgstr ""
-#: 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 ""
-#: src/net/ea/gui/partytab.cpp:59
+#: src/net/ea/gui/partytab.cpp:58
msgid "/item > Show/change party item sharing options"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:60
+#: src/net/ea/gui/partytab.cpp:59
msgid "/exp > Show/change party experience sharing options"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:69
+#: src/net/ea/gui/partytab.cpp:68
msgid "Command: /new <party-name>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:70
+#: src/net/ea/gui/partytab.cpp:69
msgid "Command: /create <party-name>"
msgstr ""
-#: 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 ""
-#: src/net/ea/gui/partytab.cpp:75
+#: src/net/ea/gui/partytab.cpp:74
msgid "Command: /invite <nick>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:82
+#: src/net/ea/gui/partytab.cpp:81
msgid "Command: /leave"
msgstr ""
-#: 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 ""
-#: 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."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:92
+#: src/net/ea/gui/partytab.cpp:91
msgid "Command: /item"
msgstr ""
-#: 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 ""
-#: 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."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:102
+#: src/net/ea/gui/partytab.cpp:101
msgid "Command: /exp"
msgstr ""
-#: 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]"
+msgid "You picked up %s [@@%d|%s@@]"
msgstr ""
-#: 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
#, fuzzy
msgid "Unregistered ID"
msgstr "Zrušit registraci"
-#: src/net/ea/loginhandler.cpp:114
+#: src/net/ea/loginhandler.cpp:113
#, fuzzy
msgid "Wrong password"
msgstr "Změnit heslo"
-#: src/net/ea/loginhandler.cpp:117
+#: src/net/ea/loginhandler.cpp:116
#, fuzzy
msgid "Account expired"
msgstr "Účet: %s"
-#: src/net/ea/loginhandler.cpp:120
+#: src/net/ea/loginhandler.cpp:119
#, fuzzy
msgid "Rejected from server"
msgstr "Server:"
-#: 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 ""
-#: 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"
" Please contact the GM team via the forums."
msgstr ""
-#: 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."
+#: src/net/ea/partyhandler.cpp:77
+msgid "Could not create party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:82
-msgid "Could not create party."
+#: src/net/ea/partyhandler.cpp:80
+msgid "Party successfully created."
msgstr ""
-#: src/net/ea/partyhandler.cpp:112
+#: src/net/ea/partyhandler.cpp:115
#, c-format
msgid "%s is already a member of a party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:116
+#: src/net/ea/partyhandler.cpp:119
#, c-format
msgid "%s refused your invitation."
msgstr ""
-#: src/net/ea/partyhandler.cpp:120
+#: src/net/ea/partyhandler.cpp:123
#, c-format
msgid "%s is now a member of your party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:124
+#: src/net/ea/partyhandler.cpp:127
#, c-format
msgid "Unknown invite response for %s."
msgstr ""
-#: 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 ""
-#: src/net/ea/partyhandler.cpp:269
+#: src/net/ea/partyhandler.cpp:272
#, c-format
msgid "An unknown member tried to say: %s"
msgstr ""
-#: 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 ""
-#: 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"
+#: 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 ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
@@ -2878,40 +2913,101 @@ 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 ""
-#: 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
+#, fuzzy
+msgid "Server is full"
+msgstr "Server:"
+
+#: 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
+#, fuzzy
+msgid "New email address incorrect"
+msgstr "Změnit e-mail"
+
+#: src/net/tmwserv/loginhandler.cpp:143
+#, fuzzy
+msgid "Old email address incorrect"
+msgstr "Změnit e-mail"
+
+#: src/net/tmwserv/loginhandler.cpp:149
+#, fuzzy
+msgid "The new Email Address already exists."
+msgstr "Změnit e-mail"
+
+#: 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 "Změnit heslo"
+
+#: src/net/tmwserv/loginhandler.cpp:211
+msgid "Wrong username, password or email address"
+msgstr ""
+
+#: src/net/tmwserv/loginhandler.cpp:214
+msgid "Username already exists"
+msgstr ""
+
+#: src/net/tmwserv/loginhandler.cpp:217
+msgid "Email address already exists"
+msgstr ""
+
+#: src/resources/itemdb.cpp:52
#, fuzzy, c-format
msgid "Attack %+d"
msgstr "Útok %+d"
-#: src/resources/itemdb.cpp:54
+#: src/resources/itemdb.cpp:53
#, fuzzy, c-format
msgid "Defense %+d"
msgstr "Obrana %+d"
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:54
#, c-format
msgid "HP %+d"
msgstr ""
-#: src/resources/itemdb.cpp:56
+#: src/resources/itemdb.cpp:55
#, c-format
msgid "MP %+d"
msgstr ""
-#: src/resources/itemdb.cpp:113
+#: src/resources/itemdb.cpp:112
msgid "items.xml"
msgstr ""
-#: src/resources/itemdb.cpp:151
+#: src/resources/itemdb.cpp:150
msgid "Unnamed"
msgstr ""
@@ -2928,6 +3024,12 @@ msgid "NPC Database: Error while loading npcs.xml!"
msgstr ""
#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "> Cancel\n"
+#~ msgstr "Zrušit"
+
+#, fuzzy
#~ msgid "Money: %d GP"
#~ msgstr "Peníze: %d"
diff --git a/po/da.po b/po/da.po
index 97027b2e..4038bb2d 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-04-21 17:27+0200\n"
+"POT-Creation-Date: 2009-05-10 15:53+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"
@@ -17,215 +17,215 @@ msgstr ""
"X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
-#: src/commandhandler.cpp:142
+#: src/commandhandler.cpp:141
msgid "-- Help --"
msgstr "--Hjælp--"
-#: src/commandhandler.cpp:143 src/net/ea/gui/partytab.cpp:53
+#: src/commandhandler.cpp:142
#, fuzzy
-msgid "/help > Display this help."
+msgid "/help > Display this help"
msgstr "/help: Viser denne hjælp"
-#: src/commandhandler.cpp:145
+#: src/commandhandler.cpp:144
#, fuzzy
msgid "/where > Display map name"
msgstr "/where: Viser bane navnet"
-#: src/commandhandler.cpp:146
+#: src/commandhandler.cpp:145
#, fuzzy
msgid "/who > Display number of online users"
msgstr "/who: Viser antalet af online brugere"
-#: src/commandhandler.cpp:147
+#: src/commandhandler.cpp:146
msgid "/me > Tell something about yourself"
msgstr ""
-#: src/commandhandler.cpp:149
+#: src/commandhandler.cpp:148
#, fuzzy
msgid "/clear > Clears this window"
msgstr "/clear: Rydder dette vindue"
-#: src/commandhandler.cpp:151
+#: src/commandhandler.cpp:150
#, fuzzy
msgid "/msg > Send a private message to a user"
msgstr ""
"/whisper <navn> <besked>: Sender en privat besked til det givne brugernavn"
-#: src/commandhandler.cpp:152
+#: src/commandhandler.cpp:151
msgid "/whisper > Alias of msg"
msgstr ""
-#: src/commandhandler.cpp:153
+#: src/commandhandler.cpp:152
msgid "/w > Alias of msg"
msgstr ""
-#: src/commandhandler.cpp:154
+#: src/commandhandler.cpp:153
msgid "/query > Makes a tab for private messages with another user"
msgstr ""
-#: src/commandhandler.cpp:155
+#: src/commandhandler.cpp:154
msgid "/q > Alias of query"
msgstr ""
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:156
msgid "/list > Display all public channels"
msgstr ""
-#: src/commandhandler.cpp:158
+#: src/commandhandler.cpp:157
msgid "/join > Join or create a channel"
msgstr ""
-#: src/commandhandler.cpp:160
+#: src/commandhandler.cpp:159
#, fuzzy
msgid "/party > Invite a user to party"
msgstr "@@party|Inviter %s med i dit party@@"
-#: src/commandhandler.cpp:162
+#: src/commandhandler.cpp:161
msgid "/record > Start recording the chat to an external file"
msgstr ""
-#: src/commandhandler.cpp:163
+#: src/commandhandler.cpp:162
#, fuzzy
msgid "/toggle > Determine whether <return> toggles the chat log"
msgstr "/toggle: Bestemmer om <retur> bringer focus på chat loggen."
-#: src/commandhandler.cpp:164
+#: src/commandhandler.cpp:163
#, fuzzy
msgid "/present > Get list of players present (sent to chat log, if logging)"
msgstr "/present: Får listen af tilstedeværende brugere"
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:165
#, fuzzy
msgid "/announce > Global announcement (GM only)"
msgstr "/announce: Global meddelelse (Kun for GM)"
-#: src/commandhandler.cpp:170
+#: src/commandhandler.cpp:169
msgid "For more information, type /help <command>"
msgstr "For at få mere information, skriv /help <kommando>"
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:173
msgid "Command: /help"
msgstr "Kommando: /help"
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:174
msgid "This command displays a list of all commands available."
msgstr "Denne kommando viser en liste over alle tilgængelige kommandoer"
-#: src/commandhandler.cpp:176
+#: src/commandhandler.cpp:175
msgid "Command: /help <command>"
msgstr "Kommando: /help <kommando>"
-#: src/commandhandler.cpp:177
+#: src/commandhandler.cpp:176
msgid "This command displays help on <command>."
msgstr "Denne kommando viser hjælp for <kommando>"
-#: src/commandhandler.cpp:185
+#: src/commandhandler.cpp:184
msgid "Command: /announce <msg>"
msgstr "Kommando: /announce <besked>"
-#: src/commandhandler.cpp:186
+#: src/commandhandler.cpp:185
msgid "*** only available to a GM ***"
msgstr "*** kun tilgængelig for en GM ***"
-#: src/commandhandler.cpp:187
+#: src/commandhandler.cpp:186
msgid "This command sends the message <msg> to all players currently online."
msgstr "Denne kommando sender beskeden <besked> til alle brugere online."
-#: src/commandhandler.cpp:192
+#: src/commandhandler.cpp:191
msgid "Command: /clear"
msgstr "Kommando: /clear"
-#: src/commandhandler.cpp:193
+#: src/commandhandler.cpp:192
msgid "This command clears the chat log of previous chat."
msgstr "Denne commando rydder chat loggen"
-#: src/commandhandler.cpp:197
+#: src/commandhandler.cpp:196
#, fuzzy
msgid "Command: /join <channel>"
msgstr "Kommando: /help"
-#: src/commandhandler.cpp:198
+#: src/commandhandler.cpp:197
#, fuzzy
msgid "This command makes you enter <channel>."
msgstr "Denne kommando viser hjælp for <kommando>"
-#: 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
#, fuzzy
msgid "Command: /list"
msgstr "Kommando: /help"
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:203
#, fuzzy
msgid "This command shows a list of all channels."
msgstr "Denne kommando viser en liste over alle tilgængelige kommandoer"
-#: src/commandhandler.cpp:208
+#: src/commandhandler.cpp:207
#, fuzzy
msgid "Command: /me <message>"
msgstr "Kommando: /announce <besked>"
-#: src/commandhandler.cpp:209
+#: src/commandhandler.cpp:208
msgid "This command tell others you are (doing) <msg>."
msgstr ""
-#: src/commandhandler.cpp:213
+#: src/commandhandler.cpp:212
#, fuzzy
msgid "Command: /msg <nick> <message>"
msgstr "Kommando: /msg <navn> <besked>"
-#: src/commandhandler.cpp:214
+#: src/commandhandler.cpp:213
#, fuzzy
msgid "Command: /whisper <nick> <message>"
msgstr "Kommando: /whisper <navn> <besked>"
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:214
#, fuzzy
msgid "Command: /w <nick> <message>"
msgstr "Kommando: /w <navn> <besked>"
-#: src/commandhandler.cpp:216
+#: src/commandhandler.cpp:215
#, fuzzy
msgid "This command sends the text <message> to <nick>."
msgstr "Denne kommando sender beskeden <besked> til <navn>."
-#: 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 "Hvis navnet har mellemrum i det, skal det omringes med følgende (\")."
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:221
#, fuzzy
msgid "Command: /query <nick>"
msgstr "Kommando: /w <navn> <besked>"
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:222
#, fuzzy
msgid "Command: /q <nick>"
msgstr "Kommando: /w <navn> <besked>"
-#: src/commandhandler.cpp:224
+#: src/commandhandler.cpp:223
msgid "This command tries to make a tab for whispers betweenyou and <nick>."
msgstr ""
-#: src/commandhandler.cpp:229
+#: src/commandhandler.cpp:228
#, fuzzy
msgid "Command: /party <nick>"
msgstr "Kommando: /w <navn> <besked>"
-#: 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 ""
-#: src/commandhandler.cpp:236
+#: src/commandhandler.cpp:235
msgid "Command: /present"
msgstr "Kommando: /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."
@@ -234,31 +234,31 @@ msgstr ""
"lytteradius, og sender listen til enten record loggen, hvis du optager, "
"ellers er det chat loggen."
-#: src/commandhandler.cpp:243
+#: src/commandhandler.cpp:242
#, fuzzy
msgid "Command: /record <filename>"
msgstr "Kommando: /clear"
-#: src/commandhandler.cpp:244
+#: src/commandhandler.cpp:243
#, fuzzy
msgid "This command starts recording the chat log to the file <filename>."
msgstr "Denne commando rydder chat loggen"
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:245
#, fuzzy
msgid "Command: /record"
msgstr "Kommando: /clear"
-#: src/commandhandler.cpp:247
+#: src/commandhandler.cpp:246
#, fuzzy
msgid "This command finishes a recording session."
msgstr "Denne kommando viser fokusering af chat vinduets status."
-#: src/commandhandler.cpp:251
+#: src/commandhandler.cpp:250
msgid "Command: /toggle <state>"
msgstr "Kommando /toggle <tilstand>"
-#: 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."
@@ -266,7 +266,7 @@ msgstr ""
"Denne kommando bestemmer om retur, skal bruges til at fokusere på chat "
"loggen, ellerom chat om chat loggen, automatisk skal slå fra."
-#: 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."
@@ -275,63 +275,64 @@ msgstr ""
"af chat vindue til, eller \"0\", \"no\", \"false\" for at slå fokusering af "
"chat vindue fra."
-#: src/commandhandler.cpp:257
+#: src/commandhandler.cpp:256
msgid "Command: /toggle"
msgstr "Kommando: /toggle"
-#: src/commandhandler.cpp:258
+#: src/commandhandler.cpp:257
msgid "This command displays the return toggle status."
msgstr "Denne kommando viser fokusering af chat vinduets status."
-#: src/commandhandler.cpp:262
+#: src/commandhandler.cpp:261
msgid "Command: /where"
msgstr "kommando: /where"
-#: src/commandhandler.cpp:263
+#: src/commandhandler.cpp:262
msgid "This command displays the name of the current map."
msgstr "Denne kommando viser det nuværende bane navn."
-#: src/commandhandler.cpp:267
+#: src/commandhandler.cpp:266
msgid "Command: /who"
msgstr "Kommando: /who"
-#: src/commandhandler.cpp:268
+#: src/commandhandler.cpp:267
msgid "This command displays the number of players currently online."
msgstr ""
"Denne kommando viser det antal af online brugere, der nuværende er online."
-#: src/commandhandler.cpp:273
+#: src/commandhandler.cpp:272
msgid "Unknown command."
msgstr "Ukendt kommando"
-#: src/commandhandler.cpp:274
+#: src/commandhandler.cpp:273
msgid "Type /help for a list of commands."
msgstr "Skriv /help for at få en liste med kommandoer"
-#: src/commandhandler.cpp:336
-msgid "Cannont send empty whispers!"
-msgstr ""
+#: src/commandhandler.cpp:339
+#, fuzzy
+msgid "Cannot send empty whispers!"
+msgstr "Kan ikke råbe!"
-#: 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 ""
-#: src/commandhandler.cpp:389
+#: src/commandhandler.cpp:392
msgid "Return toggles chat."
msgstr "Retur bringer focus på chatten."
-#: src/commandhandler.cpp:389
+#: src/commandhandler.cpp:392
msgid "Message closes chat."
msgstr "Besked lukker chat."
-#: src/commandhandler.cpp:398
+#: src/commandhandler.cpp:401
msgid "Return now toggles chat."
msgstr "Enter bringer nu focus på chatten."
-#: src/commandhandler.cpp:402
+#: src/commandhandler.cpp:405
msgid "Message now closes chat."
msgstr "Besked lukker nu chat."
@@ -342,46 +343,46 @@ msgstr ""
"Mulighederne til /toggle er \"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 "Skærmbillede gemt under ~/"
-#: src/game.cpp:416
+#: src/game.cpp:405
msgid "Saving screenshot failed!"
msgstr "Gemningen af skærmbilledet fejlede!"
-#: src/game.cpp:492
-msgid "Network Error"
-msgstr "Netværk Fejl"
-
-#: src/game.cpp:493
+#: src/game.cpp:481
msgid "The connection to the server was lost, the program will now quit"
msgstr "Forbindelsen til serveren er tabt, programmet vil nu lukke"
-#: src/game.cpp:664 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
+#: src/game.cpp:487
+msgid "Network Error"
+msgstr "Netværk Fejl"
+
+#: 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 "Afslut"
-#: src/game.cpp:665
+#: src/game.cpp:647
#, fuzzy
msgid "Are you sure you want to quit?"
msgstr "Er du sikker på at du gerne vil stoppe?"
-#: src/game.cpp:672
+#: src/game.cpp:654
msgid "no"
msgstr "nej"
-#: src/game.cpp:813
+#: src/game.cpp:794
msgid "Ignoring incoming trade requests"
msgstr "Ignorer indkomne handels anmodninger"
-#: src/game.cpp:820
+#: src/game.cpp:801
msgid "Accepting incoming trade requests"
msgstr "Accepter indkomne handels anmodninger"
@@ -394,12 +395,12 @@ msgstr "Køb"
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 "Køb"
#: 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
#, fuzzy, c-format
msgid "Price: %s / Total: %s"
msgstr "Pris: %d GP / Total: %d GP"
@@ -410,13 +411,13 @@ msgid "Max"
msgstr "maks"
#: 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 "Beskrivelse: %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 "Effekt: %s"
@@ -426,205 +427,213 @@ msgstr "Effekt: %s"
msgid "Shop"
msgstr "Butik"
-#: 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 "Sælg"
-#: 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 "Fortryd"
-#: 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 "Skift e-mail adresse"
-#: 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 "Bruger: %s"
-#: src/gui/changeemaildialog.cpp:48
+#: src/gui/changeemaildialog.cpp:49
#, fuzzy
msgid "Type New Email Address twice:"
msgstr "Skift e-mail adresse"
-#: 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 "Skift adgangskode"
-#: 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 "Adgangskode:"
-#: 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 "Lav Bruger"
-#: 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 "Navn:"
-#: src/gui/charcreatedialog.cpp:70
+#: src/gui/charcreatedialog.cpp:69
msgid "Hair Color:"
msgstr "Hårfarve:"
-#: src/gui/charcreatedialog.cpp:73
+#: src/gui/charcreatedialog.cpp:72
msgid "Hair Style:"
msgstr "Frisure:"
-#: src/gui/charcreatedialog.cpp:74
+#: src/gui/charcreatedialog.cpp:73
msgid "Create"
msgstr "Opret"
-#: src/gui/charcreatedialog.cpp:76 src/gui/register.cpp:75
+#: src/gui/charcreatedialog.cpp:75 src/gui/register.cpp:75
msgid "Male"
msgstr "Mand"
-#: src/gui/charcreatedialog.cpp:77 src/gui/register.cpp:76
+#: src/gui/charcreatedialog.cpp:76 src/gui/register.cpp:76
msgid "Female"
msgstr "Kvinde"
-#: 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 "Du mangler at fordele %d points"
-#: 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 "Fejl"
-#: src/gui/charcreatedialog.cpp:174
+#: src/gui/charcreatedialog.cpp:173
msgid "Your name needs to be at least 4 characters."
msgstr "Dit navn skal være mindst 4 bogstaver langt."
-#: src/gui/charcreatedialog.cpp:227
+#: src/gui/charcreatedialog.cpp:226
msgid "Character stats OK"
msgstr "Du har brugt alle dine points"
-#: src/gui/charcreatedialog.cpp:239
+#: src/gui/charcreatedialog.cpp:238
#, c-format
msgid "Please remove %d points"
msgstr "Du skal fjerne %d points"
-#: src/gui/char_select.cpp:79
+#: src/gui/charselectdialog.cpp:78
msgid "Confirm Character Delete"
msgstr "Bekræft sletning af karakter"
-#: src/gui/char_select.cpp:80
+#: src/gui/charselectdialog.cpp:79
msgid "Are you sure you want to delete this character?"
msgstr "Er du sikker på at du vil slette denne karakter?"
-#: src/gui/char_select.cpp:98
+#: src/gui/charselectdialog.cpp:97
msgid "Account and Character Management"
msgstr "Ret konto og karakter"
-#: src/gui/char_select.cpp:105
+#: src/gui/charselectdialog.cpp:104
msgid "Select Character"
msgstr "Vælg Karakter"
-#: 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 "Forrige"
-#: 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 "Næste"
-#: 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 "Navn: %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 "Niveau: %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 "Opret"
-#: 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 "Slet"
-#: src/gui/char_select.cpp:120 src/gui/unregisterdialog.cpp:51
+#: src/gui/charselectdialog.cpp:119 src/gui/unregisterdialog.cpp:52
msgid "Unregister"
msgstr "Frameld"
-#: src/gui/char_select.cpp:127
+#: src/gui/charselectdialog.cpp:126
#, c-format
msgid "Money: %d"
msgstr "Penge: %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
#, fuzzy, c-format
msgid "Job Level: %d"
msgstr "Niveau: %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
#, fuzzy, c-format
msgid "Money: %s"
msgstr "Penge: %d"
-#: 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
#, fuzzy
msgid "Chat"
msgstr "Chat"
-#: src/gui/chat.cpp:341 src/gui/chat.cpp:347
+#: src/gui/chat.cpp:332
+#, c-format
+msgid "%d players are present."
+msgstr ""
+
+#: src/gui/chat.cpp:348 src/gui/chat.cpp:354
msgid "Present: "
msgstr "Til stede: "
-#: 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 "Fremmøde skrives til loggen"
-#: src/gui/chat.cpp:451
+#: src/gui/chat.cpp:474
#, fuzzy, c-format
msgid "Whispering to %s: %s"
msgstr "Hvisker til "
-#: src/gui/confirm_dialog.cpp:42
+#: src/gui/confirmdialog.cpp:42
msgid "Yes"
msgstr "Ja"
-#: src/gui/confirm_dialog.cpp:43
+#: src/gui/confirmdialog.cpp:43
msgid "No"
msgstr "Nej"
@@ -632,26 +641,16 @@ msgstr "Nej"
msgid "Connecting..."
msgstr "Opretter forbindelse..."
-#: src/gui/emotecontainer.cpp:61
+#: src/gui/emotepopup.cpp:64
msgid "Unable to load selection.png"
msgstr "Kan ikke loade valgte-billede.png"
-#: src/gui/emotewindow.cpp:37 src/gui/menuwindow.cpp:76
-msgid "Emote"
-msgstr "Emote"
-
-#: 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 "Brug"
-
-#: src/gui/equipmentwindow.cpp:68 src/gui/menuwindow.cpp:67
+#: src/gui/equipmentwindow.cpp:68 src/gui/windowmenu.cpp:60
msgid "Equipment"
msgstr "Udstyr"
-#: 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 "Tag af"
@@ -678,103 +677,106 @@ msgstr "Klaner"
msgid "Help"
msgstr "Hjælp"
-#: 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 "Luk"
-#: src/gui/inventorywindow.cpp:51 src/gui/menuwindow.cpp:68
+#: src/gui/inventorywindow.cpp:54 src/gui/windowmenu.cpp:61
msgid "Inventory"
msgstr "Inventarliste"
-#: 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 "Tag på"
-#: 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 "Brug"
+
+#: src/gui/inventorywindow.cpp:80
msgid "Drop"
msgstr "Smid"
-#: src/gui/inventorywindow.cpp:79
+#: src/gui/inventorywindow.cpp:81
msgid "Split"
msgstr "Opdel"
-#: src/gui/inventorywindow.cpp:93
+#: src/gui/inventorywindow.cpp:92
#, fuzzy
msgid "Slots:"
msgstr " g Pladser: "
-#: src/gui/inventorywindow.cpp:94
+#: src/gui/inventorywindow.cpp:93
#, fuzzy
msgid "Weight:"
msgstr "Vægt: "
-#: 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 "Vælg hvor mange genstande du vil bytte."
-#: src/gui/item_amount.cpp:95
+#: src/gui/itemamount.cpp:124
msgid "Select amount of items to drop."
msgstr "Vælg hvor mange genstande du vil smide."
-#: src/gui/item_amount.cpp:98
+#: src/gui/itemamount.cpp:127
#, fuzzy
msgid "Select amount of items to store."
msgstr "Vælg hvor mange genstande du vil bytte."
-#: src/gui/item_amount.cpp:101
+#: src/gui/itemamount.cpp:130
#, fuzzy
msgid "Select amount of items to retrieve."
msgstr "Vælg hvor mange genstande du vil bytte."
-#: src/gui/item_amount.cpp:104
+#: src/gui/itemamount.cpp:133
msgid "Select amount of items to split."
msgstr "Vælg hvor mange genstande du vil opdele."
-#: src/gui/itempopup.cpp:89
+#: src/gui/itempopup.cpp:91
#, fuzzy
msgid "Weight: "
msgstr "Vægt: "
-#: src/gui/login.cpp:47
+#: src/gui/login.cpp:48
msgid "Login"
msgstr "Log Ind"
-#: 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 "Server:"
-#: 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:"
-#: src/gui/login.cpp:55
+#: src/gui/login.cpp:56
#, fuzzy
msgid "Recent:"
msgstr "Nuværende:"
-#: src/gui/login.cpp:72
+#: src/gui/login.cpp:73
msgid "Remember Username"
msgstr "Husk Brugernavn"
-#: 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 "OK"
-#: 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 "Registrer"
-#: 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 ""
@@ -790,71 +792,44 @@ msgstr ""
msgid "Cast Test Spell 3"
msgstr ""
-#: src/gui/menuwindow.cpp:66
-msgid "Status"
-msgstr "Status"
-
-#: src/gui/menuwindow.cpp:69 src/gui/skill.cpp:126 src/gui/skilldialog.cpp:99
-msgid "Skills"
-msgstr "Færdigheder"
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
+#, fuzzy
+msgid "Map"
+msgstr "MiniKort"
-#: src/gui/menuwindow.cpp:72
-msgid "Guilds"
-msgstr "Klaner"
+#: src/gui/npcdialog.cpp:43
+msgid "Waiting for server"
+msgstr ""
-#: src/gui/menuwindow.cpp:73
+#: src/gui/npcdialog.cpp:46
#, fuzzy
-msgid "Buddys"
-msgstr "Køb"
-
-#: src/gui/menuwindow.cpp:75
-msgid "Shortcut"
-msgstr "Genvej"
+msgid "Submit"
+msgstr "Opdel"
-#: src/gui/menuwindow.cpp:77 src/gui/setup.cpp:65 src/main.cpp:920
-msgid "Setup"
-msgstr "Opsætning"
+#: src/gui/npcdialog.cpp:49 src/gui/npcpostdialog.cpp:39
+msgid "NPC"
+msgstr "NPC"
-#: src/gui/minimap.cpp:39
-msgid "MiniMap"
-msgstr "MiniKort"
+#: src/gui/npcdialog.cpp:95
+msgid "+"
+msgstr ""
-#: src/gui/npcintegerdialog.cpp:39
-msgid "NPC Number Request"
+#: src/gui/npcdialog.cpp:96
+msgid "-"
msgstr ""
-#: src/gui/npcintegerdialog.cpp:50
+#: src/gui/npcdialog.cpp:105
#, fuzzy
msgid "Reset"
msgstr "Nuværende:"
-#: src/gui/npcintegerdialog.cpp:101 src/gui/npclistdialog.cpp:123
-#: src/gui/npcstringdialog.cpp:75
-#, fuzzy
-msgid ""
-"\n"
-"> Cancel\n"
-msgstr "Fortryd"
-
-#: src/gui/npcpostdialog.cpp:39 src/gui/npc_text.cpp:37
-msgid "NPC"
-msgstr "NPC"
-
#: src/gui/npcpostdialog.cpp:51
#, fuzzy
msgid "Send"
msgstr "Lyd"
-#: src/gui/npcstringdialog.cpp:39
-msgid "NPC Text Request"
-msgstr ""
-
-#: 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
#, fuzzy
msgid "Text"
msgstr "Næste"
@@ -909,7 +884,7 @@ msgid "Is"
msgstr "Er"
#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:33
-#: src/net/ea/gui/partytab.cpp:38
+#: src/net/ea/gui/partytab.cpp:37
#, fuzzy
msgid "Party"
msgstr "Gruppe"
@@ -932,7 +907,7 @@ msgid "Being"
msgstr ""
#: src/gui/palette.cpp:104
-msgid "Other Player's Names"
+msgid "Other Players' Names"
msgstr ""
#: src/gui/palette.cpp:105
@@ -960,21 +935,22 @@ msgid "Unknown Item Type"
msgstr "Ukendt genstand"
#: src/gui/palette.cpp:111
-msgid "Generic"
+msgid "Generics"
msgstr ""
#: src/gui/palette.cpp:112
-msgid "Hat"
-msgstr ""
+#, fuzzy
+msgid "Hats"
+msgstr "Status"
#: src/gui/palette.cpp:113
#, fuzzy
-msgid "Usable"
+msgid "Usables"
msgstr "Brug"
#: src/gui/palette.cpp:114
#, fuzzy
-msgid "Shirt"
+msgid "Shirts"
msgstr "Genvej"
#: src/gui/palette.cpp:115
@@ -997,15 +973,15 @@ msgstr ""
#: src/gui/palette.cpp:119
#, fuzzy
-msgid "Shield"
+msgid "Shields"
msgstr "Sælg"
#: src/gui/palette.cpp:120
-msgid "Ring"
+msgid "Rings"
msgstr ""
#: src/gui/palette.cpp:121
-msgid "Necklace"
+msgid "Necklaces"
msgstr ""
#: src/gui/palette.cpp:122
@@ -1063,95 +1039,104 @@ msgstr ""
msgid "1/4 HP Bar"
msgstr ""
-#: src/gui/popupmenu.cpp:73
+#: src/gui/popupmenu.cpp:75
msgid "@@name|Add name to chat@@"
msgstr ""
-#: src/gui/popupmenu.cpp:85
+#: src/gui/popupmenu.cpp:87
#, fuzzy, c-format
msgid "@@trade|Trade With %s@@"
msgstr "@@trade|Byt Med "
-#: src/gui/popupmenu.cpp:86 src/gui/popupmenu.cpp:128
+#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:130
#, fuzzy, c-format
msgid "@@attack|Attack %s@@"
msgstr "@@attack|Angrib "
-#: src/gui/popupmenu.cpp:92
+#: src/gui/popupmenu.cpp:94
#, fuzzy, c-format
msgid "@@friend|Befriend %s@@"
msgstr "@@friend|Bliv ven med "
-#: src/gui/popupmenu.cpp:95
+#: src/gui/popupmenu.cpp:97
#, fuzzy, c-format
msgid "@@disregard|Disregard %s@@"
msgstr "@@disregard|Se bort fra "
-#: src/gui/popupmenu.cpp:96
+#: src/gui/popupmenu.cpp:98
#, fuzzy, c-format
msgid "@@ignore|Ignore %s@@"
msgstr "@@ignore|Bloker "
-#: src/gui/popupmenu.cpp:100 src/gui/popupmenu.cpp:105
+#: src/gui/popupmenu.cpp:102 src/gui/popupmenu.cpp:107
#, fuzzy, c-format
msgid "@@unignore|Un-Ignore %s@@"
msgstr "@@unignore|Fjern blokering "
-#: src/gui/popupmenu.cpp:101
+#: src/gui/popupmenu.cpp:103
#, fuzzy, c-format
msgid "@@ignore|Completely ignore %s@@"
msgstr "@@ignore|Bloker fuldstændig "
-#: src/gui/popupmenu.cpp:111
+#: src/gui/popupmenu.cpp:113
#, fuzzy, c-format
msgid "@@guild|Invite %s to join your guild@@"
msgstr "@@party|Inviter %s med i dit party@@"
-#: src/gui/popupmenu.cpp:112
+#: src/gui/popupmenu.cpp:114
#, c-format
msgid "@@party|Invite %s to join your party@@"
msgstr "@@party|Inviter %s med i dit party@@"
-#: src/gui/popupmenu.cpp:123
+#: src/gui/popupmenu.cpp:125
#, fuzzy, c-format
msgid "@@talk|Talk To %s@@"
msgstr "@@talk|Snak Til NPC@@"
-#: 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 "@@cancel|Annuller@@"
-#: src/gui/popupmenu.cpp:155
-#, c-format
-msgid "@@pickup|Pick Up %s@@"
+#: src/gui/popupmenu.cpp:157
+#, fuzzy, c-format
+msgid "@@pickup|Pick up %s@@"
msgstr "@@pickup|Saml Op %s@@"
-#: src/gui/popupmenu.cpp:156 src/gui/popupmenu.cpp:352
-msgid "@@chat|Add to Chat@@"
+#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:373
+msgid "@@chat|Add to chat@@"
msgstr ""
-#: src/gui/popupmenu.cpp:336 src/gui/popupmenu.cpp:341
-msgid "@@use|Equip@@"
-msgstr "@@use|Tag på@@"
-
-#: src/gui/popupmenu.cpp:339
+#: src/gui/popupmenu.cpp:348
#, fuzzy
msgid "@@use|Unequip@@"
msgstr "@@use|Tag af@@"
-#: src/gui/popupmenu.cpp:345
+#: src/gui/popupmenu.cpp:350
+msgid "@@use|Equip@@"
+msgstr "@@use|Tag på@@"
+
+#: src/gui/popupmenu.cpp:353
msgid "@@use|Use@@"
msgstr "@@use|Brug@@"
-#: src/gui/popupmenu.cpp:347
+#: src/gui/popupmenu.cpp:355
msgid "@@drop|Drop@@"
msgstr "@@drop|Smid@@"
-#: src/gui/popupmenu.cpp:350
+#: src/gui/popupmenu.cpp:359
msgid "@@split|Split@@"
msgstr "@@split|Opdel@@"
+#: src/gui/popupmenu.cpp:364
+#, fuzzy
+msgid "@@store|Store@@"
+msgstr "@@ignore|Bloker "
+
+#: src/gui/popupmenu.cpp:371
+msgid "@@retrieve|Retrieve@@"
+msgstr ""
+
#: src/gui/quitdialog.cpp:37
msgid "Switch server"
msgstr "Skift server"
@@ -1222,20 +1207,32 @@ msgstr "Adgangskoden skal være mindre end %d bogstaver langt."
msgid "Passwords do not match."
msgstr "De indtastede adgangskoder stemmer ikke overens."
-#: src/gui/serverdialog.cpp:73
+#: src/gui/serverdialog.cpp:74
#, fuzzy
msgid "Choose your server"
msgstr "Vælg din Mana World Server"
-#: src/gui/serverdialog.cpp:163
+#: src/gui/serverdialog.cpp:164
msgid "Please type both the address and the port of a server."
msgstr "Skriv både adressen og porten på serveren."
-#: src/gui/serverselectdialog.cpp:50
+#: src/gui/serverselectdialog.cpp:59
#, fuzzy
msgid "Select Server"
msgstr "Vælg Server"
+#: src/gui/setup.cpp:64 src/gui/windowmenu.cpp:69 src/main.cpp:933
+msgid "Setup"
+msgstr "Opsætning"
+
+#: src/gui/setup.cpp:72
+msgid "Apply"
+msgstr "Anvend"
+
+#: src/gui/setup.cpp:72
+msgid "Reset Windows"
+msgstr "Nulstil Vinduer"
+
#: src/gui/setup_audio.cpp:41
msgid "Sound"
msgstr "Lyd"
@@ -1252,11 +1249,11 @@ msgstr "Lydstyrke på effekter"
msgid "Music volume"
msgstr "Lydstyrke på musik"
-#: 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
#, fuzzy
msgid "Colors"
msgstr "Farver:"
@@ -1265,24 +1262,24 @@ msgstr "Farver:"
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
#, fuzzy
msgid "Static"
msgstr "Status"
#: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:431
#, fuzzy
msgid "Pulse"
msgstr "Brug"
#: 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
#, fuzzy
msgid "Spectrum"
msgstr "Opsætning"
@@ -1291,27 +1288,19 @@ msgstr "Opsætning"
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
#, fuzzy
msgid "Green: "
msgstr "Til stede: "
-#: src/gui/setup_colors.cpp:141
+#: src/gui/setup_colors.cpp:138
msgid "Blue: "
msgstr ""
-#: src/gui/setup.cpp:73
-msgid "Apply"
-msgstr "Anvend"
-
-#: src/gui/setup.cpp:73
-msgid "Reset Windows"
-msgstr "Nulstil Vinduer"
-
#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:78
msgid "Press the button to start calibration"
msgstr "Tryk på knappen for at starte justeringen."
@@ -1382,7 +1371,7 @@ msgstr "Se bort fra"
msgid "Ignored"
msgstr "Ignorer"
-#: src/gui/setup_players.cpp:207
+#: src/gui/setup_players.cpp:207 src/gui/setup_video.cpp:131
msgid "???"
msgstr "???"
@@ -1410,159 +1399,181 @@ msgstr "Brugere"
msgid "When ignoring:"
msgstr "Når ignorer:"
-#: src/gui/setup_video.cpp:123
+#: src/gui/setup_video.cpp:112
+msgid "Tiny"
+msgstr ""
+
+#: src/gui/setup_video.cpp:113
+#, fuzzy
+msgid "Small"
+msgstr "Sælg"
+
+#: src/gui/setup_video.cpp:114
+#, fuzzy
+msgid "Medium"
+msgstr "mellem"
+
+#: src/gui/setup_video.cpp:115
+msgid "Large"
+msgstr ""
+
+#: src/gui/setup_video.cpp:151
msgid "Full screen"
msgstr "Fuld Skærm"
-#: 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 "Brugerdefineret Musepil"
-#: src/gui/setup_video.cpp:126
+#: src/gui/setup_video.cpp:155
msgid "Visible names"
msgstr "Synlige navne"
-#: src/gui/setup_video.cpp:127
+#: src/gui/setup_video.cpp:157
msgid "Particle effects"
msgstr "Partikel effekter"
-#: src/gui/setup_video.cpp:128
+#: src/gui/setup_video.cpp:159
msgid "Show name"
msgstr "Vis navn"
-#: 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
#, fuzzy
msgid "in chat"
msgstr "inc"
-#: src/gui/setup_video.cpp:131
+#: src/gui/setup_video.cpp:162
msgid "as particle"
msgstr ""
-#: src/gui/setup_video.cpp:136
+#: src/gui/setup_video.cpp:167
msgid "FPS Limit:"
msgstr "FPS grænse:"
-#: src/gui/setup_video.cpp:152
+#: src/gui/setup_video.cpp:184
msgid "Video"
msgstr "Video"
-#: 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 "Gennemsigtighed"
-#: src/gui/setup_video.cpp:159
+#: src/gui/setup_video.cpp:191
msgid "Scroll radius"
msgstr "Følsomhed på mus"
-#: src/gui/setup_video.cpp:160
+#: src/gui/setup_video.cpp:192
msgid "Scroll laziness"
msgstr "Acceleration på mus"
-#: src/gui/setup_video.cpp:161
+#: src/gui/setup_video.cpp:193
msgid "Ambient FX"
msgstr "Omgivende FX"
-#: src/gui/setup_video.cpp:162
+#: src/gui/setup_video.cpp:194
msgid "Particle Detail"
msgstr "Partikel Detalje"
-#: 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
#, fuzzy
msgid "No text"
msgstr "Næste"
-#: src/gui/setup_video.cpp:236 src/gui/setup_video.cpp:498
+#: 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:239 src/gui/setup_video.cpp:501
+#: src/gui/setup_video.cpp:274 src/gui/setup_video.cpp:573
msgid "Bubbles with names"
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 "fra"
-#: 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 "lav"
-#: 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 "høj"
-#: 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 "mellem"
-#: 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 "maks"
-#: src/gui/setup_video.cpp:340
+#: src/gui/setup_video.cpp:410
msgid "Failed to switch to "
msgstr "Fejlede i at skifte til "
-#: src/gui/setup_video.cpp:341
+#: src/gui/setup_video.cpp:411
msgid "windowed"
msgstr "vinduet"
-#: src/gui/setup_video.cpp:341
+#: src/gui/setup_video.cpp:411
#, fuzzy
msgid "fullscreen"
msgstr "Fuld Skærm"
-#: src/gui/setup_video.cpp:342
+#: src/gui/setup_video.cpp:412
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:351
+#: src/gui/setup_video.cpp:421
msgid "Switching to full screen"
msgstr "Skifter til fuld skærm"
-#: src/gui/setup_video.cpp:352
+#: src/gui/setup_video.cpp:422
msgid "Restart needed for changes to take effect."
msgstr "Ændringerne kræver at du genstarter klienten."
-#: src/gui/setup_video.cpp:364
+#: src/gui/setup_video.cpp:434
msgid "Changing OpenGL"
msgstr "Skrifter til OpenGL"
-#: src/gui/setup_video.cpp:365
+#: src/gui/setup_video.cpp:435
msgid "Applying change to OpenGL requires restart."
msgstr "Ændringerne til OpenGL kræver at du genstarter klienten."
-#: src/gui/setup_video.cpp:448
+#: src/gui/setup_video.cpp:520
msgid "Screen resolution changed"
msgstr "Skærm opløsning ændret"
-#: src/gui/setup_video.cpp:449
+#: src/gui/setup_video.cpp:521
#, fuzzy
msgid "Restart your client for the change to take effect."
msgstr "Ændringerne kræver at du genstarter klienten."
-#: src/gui/setup_video.cpp:473
+#: src/gui/setup_video.cpp:545
#, fuzzy
msgid "Particle effect settings changed."
msgstr "Partikel effekt opsætningen er ændret"
-#: src/gui/setup_video.cpp:474
+#: src/gui/setup_video.cpp:546
msgid "Changes will take effect on map change."
msgstr ""
@@ -1575,6 +1586,10 @@ msgstr "Færdigheder"
msgid "Mystery Skill"
msgstr ""
+#: src/gui/skill.cpp:126 src/gui/skilldialog.cpp:99 src/gui/windowmenu.cpp:62
+msgid "Skills"
+msgstr "Færdigheder"
+
#: src/gui/skill.cpp:145 src/gui/skill.cpp:197
#, c-format
msgid "Skill points: %d"
@@ -1584,15 +1599,6 @@ msgstr "Færdigheds points: %d"
msgid "Up"
msgstr "Op"
-#: src/gui/skill.cpp:146
-msgid "inc"
-msgstr "inc"
-
-#: src/gui/skill.cpp:147
-#, fuzzy
-msgid "use"
-msgstr "Brug"
-
#: src/gui/skilldialog.cpp:113
msgid "Weapons"
msgstr ""
@@ -1602,184 +1608,184 @@ msgstr ""
msgid "Crafts"
msgstr "Opret"
-#: src/gui/status.cpp:57 src/gui/status.cpp:178
+#: src/gui/status.cpp:56 src/gui/status.cpp:177
#, fuzzy, c-format
msgid "Job: %d"
msgstr "Karriere: %d"
-#: src/gui/status.cpp:61
+#: src/gui/status.cpp:60
msgid "HP:"
msgstr ""
-#: src/gui/status.cpp:64
+#: src/gui/status.cpp:63
msgid "Exp:"
msgstr ""
-#: src/gui/status.cpp:67
+#: src/gui/status.cpp:66
msgid "MP:"
msgstr ""
-#: src/gui/status.cpp:70
+#: src/gui/status.cpp:69
#, fuzzy
msgid "Job:"
msgstr "Karriere: %d"
-#: src/gui/status.cpp:78
+#: src/gui/status.cpp:77
#, fuzzy
msgid "Stats"
msgstr "Status"
-#: src/gui/status.cpp:79
+#: src/gui/status.cpp:78
msgid "Total"
msgstr "Total"
-#: src/gui/status.cpp:80
+#: src/gui/status.cpp:79
msgid "Cost"
msgstr "Pris"
-#: src/gui/status.cpp:84
+#: src/gui/status.cpp:83
#, fuzzy
msgid "Attack:"
msgstr "Angrib:"
-#: src/gui/status.cpp:85
+#: src/gui/status.cpp:84
#, fuzzy
msgid "Defense:"
msgstr "Forsvar:"
-#: src/gui/status.cpp:86
+#: src/gui/status.cpp:85
#, fuzzy
msgid "M.Attack:"
msgstr "M.Angrib:"
-#: src/gui/status.cpp:87
+#: src/gui/status.cpp:86
#, fuzzy
msgid "M.Defense:"
msgstr "M.Forsvar:"
-#: src/gui/status.cpp:89
+#: src/gui/status.cpp:88
#, fuzzy, no-c-format
msgid "% Accuracy:"
msgstr "% Nøjagtighed:"
-#: src/gui/status.cpp:91
+#: src/gui/status.cpp:90
#, fuzzy, no-c-format
msgid "% Evade:"
msgstr "% Undvig:"
-#: src/gui/status.cpp:93
+#: src/gui/status.cpp:92
#, no-c-format
msgid "% Reflex:"
msgstr "% Refleks:"
-#: src/gui/status.cpp:199
+#: src/gui/status.cpp:198
#, fuzzy
msgid "Strength"
msgstr "Styrke"
-#: src/gui/status.cpp:200
+#: src/gui/status.cpp:199
#, fuzzy
msgid "Agility"
msgstr "Adræthed"
-#: src/gui/status.cpp:201
+#: src/gui/status.cpp:200
#, fuzzy
msgid "Vitality"
msgstr "Helbred"
-#: src/gui/status.cpp:202
+#: src/gui/status.cpp:201
#, fuzzy
msgid "Intelligence"
msgstr "Intelligens"
-#: src/gui/status.cpp:203
+#: src/gui/status.cpp:202
#, fuzzy
msgid "Dexterity"
msgstr "Behændighed"
-#: src/gui/status.cpp:204
+#: src/gui/status.cpp:203
msgid "Luck"
msgstr "Held"
-#: src/gui/status.cpp:222
+#: src/gui/status.cpp:221
#, c-format
msgid "Remaining Status Points: %d"
msgstr "Tilgode Status Points: %d"
-#: src/gui/status.cpp:383 src/gui/status.cpp:405
+#: src/gui/status.cpp:384
#, fuzzy
msgid "Max level"
msgstr "Mand"
-#: src/gui/storagewindow.cpp:53
+#: src/gui/storagewindow.cpp:54
msgid "Storage"
msgstr ""
-#: src/gui/storagewindow.cpp:64
+#: src/gui/storagewindow.cpp:65
#, fuzzy
msgid "Store"
msgstr "Stop"
-#: src/gui/storagewindow.cpp:65
+#: src/gui/storagewindow.cpp:66
msgid "Retrieve"
msgstr ""
-#: src/gui/storagewindow.cpp:75
+#: src/gui/storagewindow.cpp:78
#, fuzzy
msgid "Slots: "
msgstr " g Pladser: "
-#: src/gui/trade.cpp:52
+#: src/gui/trade.cpp:51
msgid "Propose trade"
msgstr "Foreslå handel"
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:52
#, fuzzy
msgid "Confirmed. Waiting..."
msgstr "Opretter forbindelse..."
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:53
#, fuzzy
msgid "Agree trade"
msgstr "Foreslå handel"
-#: src/gui/trade.cpp:55
+#: src/gui/trade.cpp:54
#, fuzzy
msgid "Agreed. Waiting..."
msgstr "Updatere..."
-#: src/gui/trade.cpp:58
+#: src/gui/trade.cpp:57
msgid "Trade: You"
msgstr "Handel: Dig"
-#: src/gui/trade.cpp:71 src/gui/trade.cpp:72
+#: src/gui/trade.cpp:70 src/gui/trade.cpp:71
msgid "Trade"
msgstr "Handel"
-#: src/gui/trade.cpp:74
+#: src/gui/trade.cpp:73
msgid "Add"
msgstr "Tilføj"
-#: 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
#, fuzzy, c-format
msgid "You get %s."
msgstr "Du får %d GP."
-#: src/gui/trade.cpp:97
+#: src/gui/trade.cpp:96
msgid "You give:"
msgstr "Du giver:"
-#: src/gui/trade.cpp:101
+#: src/gui/trade.cpp:100
msgid "Change"
msgstr "Ændre"
-#: 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 ""
"Fejlede i at tilføje genstand. Du kan ikke overlappe en slags genstand på "
"vinduet."
-#: src/gui/trade.cpp:321
+#: src/gui/trade.cpp:311
#, fuzzy
msgid "You don't have enough money"
msgstr "Du har ingen memorandaer!"
@@ -1900,22 +1906,22 @@ msgstr ""
msgid "Need a user to kick!"
msgstr ""
-#: src/gui/widgets/chattab.cpp:115
+#: src/gui/widgets/chattab.cpp:114
#, fuzzy
msgid "Global announcement:"
msgstr "Global meddelelse: "
-#: src/gui/widgets/chattab.cpp:121
+#: src/gui/widgets/chattab.cpp:120
#, fuzzy, c-format
msgid "Global announcement from %s:"
msgstr "Global meddelelse fra "
-#: src/gui/widgets/chattab.cpp:147
+#: src/gui/widgets/chattab.cpp:146
#, fuzzy, c-format
msgid "%s whispers: "
msgstr "Tillad hviskere"
-#: 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 "Ukendt genstand"
@@ -1924,25 +1930,37 @@ msgstr "Ukendt genstand"
msgid "Cannot send empty chat!"
msgstr "Kan ikke råbe!"
-#: src/gui/widgets/whispertab.cpp:55
-#, fuzzy, c-format
-msgid "%s: %s"
-msgstr "Bane; %s"
-
-#: src/gui/widgets/whispertab.cpp:69
+#: src/gui/widgets/whispertab.cpp:68
msgid "/close > Close the whisper tab"
msgstr ""
-#: src/gui/widgets/whispertab.cpp:79
+#: src/gui/widgets/whispertab.cpp:78
#, fuzzy
msgid "Command: /close"
msgstr "Kommando: /clear"
-#: src/gui/widgets/whispertab.cpp:80
+#: src/gui/widgets/whispertab.cpp:79
#, fuzzy
msgid "This command closes the current whisper tab."
msgstr "Denne kommando viser det nuværende bane navn."
+#: src/gui/windowmenu.cpp:59
+msgid "Status"
+msgstr "Status"
+
+#: src/gui/windowmenu.cpp:65
+msgid "Guilds"
+msgstr "Klaner"
+
+#: src/gui/windowmenu.cpp:66
+#, fuzzy
+msgid "Buddys"
+msgstr "Køb"
+
+#: src/gui/windowmenu.cpp:68
+msgid "Shortcut"
+msgstr "Genvej"
+
#: src/keyboardconfig.cpp:41
msgid "Move Up"
msgstr ""
@@ -2078,8 +2096,8 @@ msgstr "Nulstil Vinduer"
#: src/keyboardconfig.cpp:80
#, fuzzy
-msgid "Emote Window"
-msgstr "Emote fejlede!"
+msgid "Party Window"
+msgstr "Nulstil Vinduer"
#: src/keyboardconfig.cpp:81
msgid "Emote Shortcut Window"
@@ -2129,175 +2147,188 @@ msgstr ""
msgid "Ignore input 2"
msgstr ""
-#: src/localplayer.cpp:849
+#: src/localplayer.cpp:834
#, fuzzy
msgid "Unarmed"
msgstr "Unavngivet"
-#: src/localplayer.cpp:850
+#: src/localplayer.cpp:835
msgid "Knife"
msgstr ""
-#: src/localplayer.cpp:851
+#: src/localplayer.cpp:836
#, fuzzy
msgid "Sword"
msgstr "Lyd"
-#: src/localplayer.cpp:852
+#: src/localplayer.cpp:837
#, fuzzy
msgid "Polearm"
msgstr "Bruger"
-#: src/localplayer.cpp:853
+#: src/localplayer.cpp:838
#, fuzzy
msgid "Staff"
msgstr "Status"
-#: src/localplayer.cpp:854
+#: src/localplayer.cpp:839
#, fuzzy
msgid "Whip"
msgstr "Hvisk"
-#: src/localplayer.cpp:855
+#: src/localplayer.cpp:840
#, fuzzy
msgid "Bow"
msgstr "lav"
-#: src/localplayer.cpp:856
+#: src/localplayer.cpp:841
msgid "Shooting"
msgstr ""
-#: src/localplayer.cpp:857
+#: src/localplayer.cpp:842
#, fuzzy
msgid "Mace"
msgstr "Mand"
-#: 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
#, fuzzy
msgid "Craft"
msgstr "Opret"
-#: src/localplayer.cpp:862
+#: src/localplayer.cpp:847
#, fuzzy
msgid "Unknown Skill"
msgstr "Ukendt genstand"
-#: src/main.cpp:253
+#: src/main.cpp:255
msgid "Invalid update host: "
msgstr "Ugyldigt opdaterings host: "
-#: src/main.cpp:286 src/main.cpp:292
+#: src/main.cpp:288 src/main.cpp:294
msgid "Error creating updates directory!"
msgstr "Fejl under oprettelsen af opdateringen mappen!"
-#: src/main.cpp:325
+#: src/main.cpp:327
msgid " can't be created, but it doesn't exist! Exiting."
msgstr " kan ikke laves, men det findes ikke! Lukker."
-#: src/main.cpp:481
+#: src/main.cpp:483
msgid "Couldn't set "
msgstr "Kunne ikke definere "
-#: src/main.cpp:482
+#: src/main.cpp:484
msgid " video mode: "
msgstr " skærm opsætning: "
-#: src/main.cpp:562
+#: src/main.cpp:566
msgid "tmw"
msgstr ""
-#: src/main.cpp:563
-msgid "Options: "
+#: src/main.cpp:567
+#, fuzzy
+msgid "Options:"
msgstr "Opsætning: "
-#: src/main.cpp:564
-msgid " -C --configfile : Configuration file to use"
+#: src/main.cpp:568
+#, fuzzy
+msgid " -C --config-file : Configuration file to use"
msgstr " -C --configfile : Configurations fil til brug"
-#: src/main.cpp:565
-msgid " -d --data : Directory to load game data from"
+#: src/main.cpp:569
+#, fuzzy
+msgid " -d --data : Directory to load game data from"
msgstr " -d --data : Mappen at indlæse spillets data fra"
-#: src/main.cpp:566
-msgid " -D --default : Bypass the login process with default settings"
+#: src/main.cpp:570
+msgid " -D --default : Choose default character server and character"
msgstr ""
-" -D --default : Overskriv login processen med normale indstillinger"
-#: src/main.cpp:568
-msgid " -h --help : Display this help"
+#: src/main.cpp:572
+#, fuzzy
+msgid " -h --help : Display this help"
msgstr " -h --help : Viser denne hjælp"
-#: src/main.cpp:569
+#: src/main.cpp:573
#, fuzzy
-msgid " -S --homedir : Directory to use as home directory"
+msgid " -S --home-dir : Directory to use as home directory"
msgstr " -d --data : Mappen at indlæse spillets data fra"
-#: src/main.cpp:570
-msgid " -H --updatehost : Use this update host"
+#: src/main.cpp:574
+#, fuzzy
+msgid " -H --update-host : Use this update host"
msgstr " -H --updatehost : Brug denne opdaterings host"
-#: src/main.cpp:571
-msgid " -P --password : Login with this password"
+#: src/main.cpp:575
+#, fuzzy
+msgid " -P --password : Login with this password"
msgstr " -P --password : Logind med denne adgangskode"
-#: src/main.cpp:572
+#: src/main.cpp:576
#, fuzzy
-msgid " -c --character : Login with this character"
+msgid " -c --character : Login with this character"
msgstr " -p --playername : Logind med denne bruger"
-#: src/main.cpp:573
-msgid " -o --port : Login Server Port"
-msgstr ""
+#: src/main.cpp:577
+#, fuzzy
+msgid " -p --port : Login Server Port"
+msgstr " -U --username : Logind med dette brugernavn"
-#: src/main.cpp:574
+#: src/main.cpp:578
#, fuzzy
-msgid " -s --server : Login Server name or IP"
+msgid " -s --server : Login Server name or IP"
msgstr " -U --username : Logind med dette brugernavn"
-#: src/main.cpp:575
-msgid " -u --skipupdate : Skip the update downloads"
+#: src/main.cpp:579
+#, fuzzy
+msgid " -u --skip-update : Skip the update downloads"
msgstr " -u --skipupdate : Spring opdateringerne over"
-#: src/main.cpp:576
-msgid " -U --username : Login with this username"
+#: src/main.cpp:580
+#, fuzzy
+msgid " -U --username : Login with this username"
msgstr " -U --username : Logind med dette brugernavn"
-#: src/main.cpp:577
-msgid " -v --version : Display the version"
+#: 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 : Viser den nuværende version"
-#: src/main.cpp:582
+#: src/main.cpp:589
#, fuzzy
msgid "The Mana World "
msgstr "Vælg din Mana World Server"
-#: src/main.cpp:1499
+#: src/main.cpp:1515
#, fuzzy
msgid "Connecting to map server..."
msgstr "Opretter forbindelse til bane serveren..."
-#: src/main.cpp:1507
+#: src/main.cpp:1523
msgid "Connecting to character server..."
msgstr "Opretter forbindelse til karakter serveren..."
-#: src/main.cpp:1515
+#: src/main.cpp:1531
msgid "Connecting to account server..."
msgstr "Opretter forbindelse til bruger serveren..."
-#: src/net/ea/adminhandler.cpp:67
+#: src/net/ea/adminhandler.cpp:66
#, fuzzy
msgid "Kick failed!"
msgstr "Sæt dig fejlede!"
-#: src/net/ea/adminhandler.cpp:69
+#: src/net/ea/adminhandler.cpp:68
msgid "Kick succeeded!"
msgstr ""
@@ -2388,18 +2419,18 @@ msgstr "Behændighed"
msgid "Luck:"
msgstr "Held"
-#: 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 ""
@@ -2412,134 +2443,143 @@ msgstr "Tag af"
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
#, fuzzy, c-format
msgid "Strength: %d"
msgstr "Styrke"
-#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:82
+#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:84
#, fuzzy, c-format
msgid "Agility: %d"
msgstr "Adræthed"
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:86
+#: src/net/ea/generalhandler.cpp:96 src/net/tmwserv/generalhandler.cpp:88
#, fuzzy, c-format
msgid "Vitality: %d"
msgstr "Helbred"
-#: src/net/ea/generalhandler.cpp:96 src/net/tmwserv/generalhandler.cpp:88
+#: src/net/ea/generalhandler.cpp:98 src/net/tmwserv/generalhandler.cpp:90
#, fuzzy, c-format
msgid "Intelligence: %d"
msgstr "Intelligens"
-#: src/net/ea/generalhandler.cpp:98 src/net/tmwserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:100 src/net/tmwserv/generalhandler.cpp:86
#, fuzzy, c-format
msgid "Dexterity: %d"
msgstr "Behændighed"
-#: src/net/ea/generalhandler.cpp:100
+#: src/net/ea/generalhandler.cpp:102
#, fuzzy, c-format
msgid "Luck: %d"
msgstr "Held"
-#: src/net/ea/generalhandler.cpp:123
+#: src/net/ea/generalhandler.cpp:125
#, fuzzy
msgid "Authentication failed"
msgstr "Chat skabelsen fejlede!"
-#: src/net/ea/generalhandler.cpp:126
+#: src/net/ea/generalhandler.cpp:128
#, fuzzy
msgid "No servers available"
msgstr "Ingen opsætning tilgængelig"
-#: 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 ""
-#: 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 "Blev smidt af serveren!"
-#: src/net/ea/gui/partytab.cpp:54
+#: src/net/ea/gui/partytab.cpp:52
+#, fuzzy
+msgid "/help > Display this help."
+msgstr "/help: Viser denne hjælp"
+
+#: src/net/ea/gui/partytab.cpp:53
msgid "/create > Create a new party"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:55
+#: src/net/ea/gui/partytab.cpp:54
msgid "/new > Alias of create"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:56
+#: src/net/ea/gui/partytab.cpp:55
msgid "/invite > Invite a player to your party"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:57
+#: src/net/ea/gui/partytab.cpp:56
msgid "/leave > Leave the party you are in"
msgstr ""
-#: 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 ""
-#: src/net/ea/gui/partytab.cpp:59
+#: src/net/ea/gui/partytab.cpp:58
msgid "/item > Show/change party item sharing options"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:60
+#: src/net/ea/gui/partytab.cpp:59
msgid "/exp > Show/change party experience sharing options"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:69
+#: src/net/ea/gui/partytab.cpp:68
#, fuzzy
msgid "Command: /new <party-name>"
msgstr "Kommando /toggle <tilstand>"
-#: src/net/ea/gui/partytab.cpp:70
+#: src/net/ea/gui/partytab.cpp:69
#, fuzzy
msgid "Command: /create <party-name>"
msgstr "Kommando /toggle <tilstand>"
-#: 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 ""
-#: src/net/ea/gui/partytab.cpp:75
+#: src/net/ea/gui/partytab.cpp:74
#, fuzzy
msgid "Command: /invite <nick>"
msgstr "Kommando: /w <navn> <besked>"
-#: src/net/ea/gui/partytab.cpp:82
+#: src/net/ea/gui/partytab.cpp:81
#, fuzzy
msgid "Command: /leave"
msgstr "Kommando: /clear"
-#: src/net/ea/gui/partytab.cpp:83
+#: src/net/ea/gui/partytab.cpp:82
#, 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:87
+#: src/net/ea/gui/partytab.cpp:86
#, fuzzy
msgid "Command: /item <policy>"
msgstr "Kommando: /toggle"
-#: src/net/ea/gui/partytab.cpp:88
+#: src/net/ea/gui/partytab.cpp:87
#, 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:89
+#: src/net/ea/gui/partytab.cpp:88
#, fuzzy
msgid ""
"<policy> can be one of \"1\", \"yes\", \"true\" to enable item sharing, or "
@@ -2549,26 +2589,26 @@ msgstr ""
"af chat vindue til, eller \"0\", \"no\", \"false\" for at slå fokusering af "
"chat vindue fra."
-#: src/net/ea/gui/partytab.cpp:92
+#: src/net/ea/gui/partytab.cpp:91
#, fuzzy
msgid "Command: /item"
msgstr "Kommando: /toggle"
-#: src/net/ea/gui/partytab.cpp:93
+#: src/net/ea/gui/partytab.cpp:92
#, 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:97
+#: src/net/ea/gui/partytab.cpp:96
#, fuzzy
msgid "Command: /exp <policy>"
msgstr "Kommando: /help <kommando>"
-#: 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
#, fuzzy
msgid ""
"<policy> can be one of \"1\", \"yes\", \"true\" to enable experience "
@@ -2578,175 +2618,182 @@ msgstr ""
"af chat vindue til, eller \"0\", \"no\", \"false\" for at slå fokusering af "
"chat vindue fra."
-#: src/net/ea/gui/partytab.cpp:102
+#: src/net/ea/gui/partytab.cpp:101
#, fuzzy
msgid "Command: /exp"
msgstr "Kommando: /help"
-#: src/net/ea/gui/partytab.cpp:103
+#: src/net/ea/gui/partytab.cpp:102
#, 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: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
#, fuzzy
msgid "Unable to pick up item"
msgstr "Kunne ikke skabe mThread"
-#: src/net/ea/inventoryhandler.cpp:194
+#: src/net/ea/inventoryhandler.cpp:193
#, fuzzy, c-format
-msgid "You picked up %s [%s]"
+msgid "You picked up %s [@@%d|%s@@]"
msgstr "Du samlede op "
-#: src/net/ea/inventoryhandler.cpp:240
+#: src/net/ea/inventoryhandler.cpp:239
#, fuzzy
msgid "Failed to use item"
msgstr "Fejlede i at skifte til "
-#: src/net/ea/loginhandler.cpp:111
+#: src/net/ea/loginhandler.cpp:110
#, fuzzy
msgid "Unregistered ID"
msgstr "Frameld"
-#: src/net/ea/loginhandler.cpp:114
+#: src/net/ea/loginhandler.cpp:113
#, fuzzy
msgid "Wrong password"
msgstr "Skift adgangskode"
-#: src/net/ea/loginhandler.cpp:117
+#: src/net/ea/loginhandler.cpp:116
#, fuzzy
msgid "Account expired"
msgstr "Bruger: %s"
-#: src/net/ea/loginhandler.cpp:120
+#: src/net/ea/loginhandler.cpp:119
#, fuzzy
msgid "Rejected from server"
msgstr "Blev smidt af serveren!"
-#: 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 ""
-#: 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"
" Please contact the GM team via the forums."
msgstr ""
-#: 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
#, fuzzy
msgid "Unknown error"
msgstr "Ukendt genstand"
-#: src/net/ea/partyhandler.cpp:78
-msgid "Party successfully created."
-msgstr ""
-
-#: src/net/ea/partyhandler.cpp:82
+#: src/net/ea/partyhandler.cpp:77
#, fuzzy
msgid "Could not create party."
msgstr "Kunne ikke tilslutte sig gruppen!"
-#: 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 ""
-#: src/net/ea/partyhandler.cpp:116
+#: src/net/ea/partyhandler.cpp:119
#, c-format
msgid "%s refused your invitation."
msgstr ""
-#: src/net/ea/partyhandler.cpp:120
+#: src/net/ea/partyhandler.cpp:123
#, c-format
msgid "%s is now a member of your party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:124
+#: src/net/ea/partyhandler.cpp:127
#, c-format
msgid "Unknown invite response for %s."
msgstr ""
-#: src/net/ea/partyhandler.cpp:229
+#: src/net/ea/partyhandler.cpp:232
#, fuzzy
msgid "You have left the party."
msgstr "Du er holdt op med at være til."
-#: src/net/ea/partyhandler.cpp:232
+#: src/net/ea/partyhandler.cpp:235
#, c-format
msgid "%s has left your party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:269
+#: src/net/ea/partyhandler.cpp:272
#, c-format
msgid "An unknown member tried to say: %s"
msgstr ""
-#: 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
#, fuzzy, c-format
msgid "%s is not in your party!"
msgstr "Kunne ikke tilslutte sig gruppen!"
-#: 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 "Du er død."
-#: 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 ""
"Vi er ked af at måtte informere dig, om at din karakter var dræbt i kamp."
-#: 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 "Du er ikke så levende som du engang har været."
-#: 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 "De kolder hænder der tilhøre Grim Reaper, griber ud efter din sjæl"
-#: 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 "Game Over!"
-#: src/net/ea/playerhandler.cpp:114
-msgid "Insert coin to continue"
+#: src/net/ea/playerhandler.cpp:102
+#, fuzzy
+msgid "Insert coin to continue."
msgstr "Indsæt en mønt for at fortsætte"
-#: 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."
@@ -2754,109 +2801,109 @@ msgstr ""
"Nej, børn. Din karakter døde ikke rigtigt. Den.. err... tog til et bedre "
"sted."
-#: 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 "Din plan om at smadre fjendens våben, ved at benytte din hals fejlede."
-#: 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 "Jeg går ud fra at dette ikke gik alt for godt."
-#: 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 "Du vil gerne have dine ejendele identificeret?"
-#: 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 "Desværre, blev der aldrig fundet noget spor efter dig..."
-#: 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 "Udslettet."
-#: 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 "Det ser ud til at du fik du hoved udleveret til dig."
-#: 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 "Du kvajede dig igen, smid din krop ned i kloakken og find dig en ny."
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/ea/playerhandler.cpp:120
msgid "You're not dead yet. You're just resting."
msgstr "Du er ikke død endnu. Du hviler dig bare."
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/ea/playerhandler.cpp:121
msgid "You are no more."
msgstr "Du er ikke mere."
-#: src/net/ea/playerhandler.cpp:134
+#: src/net/ea/playerhandler.cpp:122
msgid "You have ceased to be."
msgstr "Du er holdt op med at være til."
-#: src/net/ea/playerhandler.cpp:135
+#: src/net/ea/playerhandler.cpp:123
msgid "You've expired and gone to meet your maker."
msgstr "Du er udløbet og er gået hen for at møde din skaber."
-#: src/net/ea/playerhandler.cpp:136
+#: src/net/ea/playerhandler.cpp:124
msgid "You're a stiff."
msgstr "Du er en hård nød at knække, men desværre død."
-#: src/net/ea/playerhandler.cpp:137
+#: src/net/ea/playerhandler.cpp:125
msgid "Bereft of life, you rest in peace."
msgstr "Du siver langtsomt ud af din krop, du kan nu endelig slappe af."
-#: 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 ""
"Hvis det ikke var fordi du var så animeret, kunne du sikker imponere Chuck "
"Norris."
-#: src/net/ea/playerhandler.cpp:139
+#: src/net/ea/playerhandler.cpp:127
msgid "Your metabolic processes are now history."
msgstr "Din tid er ovre."
-#: src/net/ea/playerhandler.cpp:140
+#: src/net/ea/playerhandler.cpp:128
msgid "You're off the twig."
msgstr "Drik noget syre."
-#: src/net/ea/playerhandler.cpp:141
+#: src/net/ea/playerhandler.cpp:129
msgid "You've kicked the bucket."
msgstr "Du har stillet træskoene."
-#: 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 "Du har spist af dødens pølse for den sidste gang."
-#: src/net/ea/playerhandler.cpp:144
+#: src/net/ea/playerhandler.cpp:132
msgid "You are an ex-player."
msgstr "Du er en forhenværende spiller."
-#: src/net/ea/playerhandler.cpp:145
+#: src/net/ea/playerhandler.cpp:133
msgid "You're pining for the fjords."
msgstr "Du er tabt bag en vogn."
-#: 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 "Besked"
-#: src/net/ea/playerhandler.cpp:259
+#: src/net/ea/playerhandler.cpp:247
#, fuzzy
msgid ""
"You are carrying more than half your weight. You are unable to regain health."
msgstr ""
"Du bære på mere en halvdelen af din vægt. Du kan derfor ikke genvinde liv."
-#: src/net/ea/playerhandler.cpp:301
+#: src/net/ea/playerhandler.cpp:289
msgid "You picked up "
msgstr "Du samlede op "
-#: src/net/ea/playerhandler.cpp:424
+#: src/net/ea/playerhandler.cpp:412
msgid "Equip arrows first"
msgstr "Tag først pile på"
@@ -3018,40 +3065,102 @@ msgstr "Ingen opsætning tilgængelig"
msgid "Willpower:"
msgstr "Viljestyrke:"
-#: 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
#, fuzzy, c-format
msgid "Willpower: %d"
msgstr "Viljestyrke:"
-#: 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
+#, fuzzy
+msgid "Server is full"
+msgstr "Server"
+
+#: 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
+#, fuzzy
+msgid "New email address incorrect"
+msgstr "Skift e-mail adresse"
+
+#: src/net/tmwserv/loginhandler.cpp:143
+#, fuzzy
+msgid "Old email address incorrect"
+msgstr "Skift e-mail adresse"
+
+#: src/net/tmwserv/loginhandler.cpp:149
+#, fuzzy
+msgid "The new Email Address already exists."
+msgstr "Skift e-mail adresse"
+
+#: 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 "Skift adgangskode"
+
+#: 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 "Brugernavn er %s"
+
+#: src/net/tmwserv/loginhandler.cpp:217
+msgid "Email address already exists"
+msgstr ""
+
+#: src/resources/itemdb.cpp:52
#, fuzzy, c-format
msgid "Attack %+d"
msgstr "Angrib:"
-#: src/resources/itemdb.cpp:54
+#: src/resources/itemdb.cpp:53
#, fuzzy, c-format
msgid "Defense %+d"
msgstr "Forsvar:"
-#: 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 ""
-#: src/resources/itemdb.cpp:151
+#: src/resources/itemdb.cpp:150
msgid "Unnamed"
msgstr "Unavngivet"
@@ -3067,6 +3176,37 @@ msgstr ""
msgid "NPC Database: Error while loading npcs.xml!"
msgstr "NPC Database: Fejl under indlæsning af npcs.xml!"
+#~ msgid "Emote"
+#~ msgstr "Emote"
+
+#~ msgid "MiniMap"
+#~ msgstr "MiniKort"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "> Cancel\n"
+#~ msgstr "Fortryd"
+
+#~ msgid "inc"
+#~ msgstr "inc"
+
+#, fuzzy
+#~ msgid "use"
+#~ msgstr "Brug"
+
+#, fuzzy
+#~ msgid "%s: %s"
+#~ msgstr "Bane; %s"
+
+#, fuzzy
+#~ msgid "Emote Window"
+#~ msgstr "Emote fejlede!"
+
+#~ msgid " -D --default : Bypass the login process with default settings"
+#~ msgstr ""
+#~ " -D --default : Overskriv login processen med normale indstillinger"
+
#~ msgid "Gold: %d"
#~ msgstr "Guld: %d"
@@ -3122,10 +3262,6 @@ msgstr "NPC Database: Fejl under indlæsning af npcs.xml!"
#~ msgid "Keep"
#~ msgstr "Behold"
-#, fuzzy
-#~ msgid "Map"
-#~ msgstr "MiniKort"
-
#~ msgid "@@party-invite|Invite "
#~ msgstr "@@party-invite|Inviter "
@@ -3282,9 +3418,6 @@ msgstr "NPC Database: Fejl under indlæsning af npcs.xml!"
#~ msgid "Trying to connect to account server..."
#~ msgstr "Prøver at opretter forbindelse til bruger serveren..."
-#~ msgid "Username is %s"
-#~ msgstr "Brugernavn er %s"
-
#, fuzzy
#~ msgid "Trying to connect to char server..."
#~ msgstr "Prøver at oprette forbindelse til karakter serveren..."
diff --git a/po/de.po b/po/de.po
index c4ad01c0..0d3e7e87 100644
--- a/po/de.po
+++ b/po/de.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-04-21 17:27+0200\n"
+"POT-Creation-Date: 2009-05-10 15:53+0200\n"
"PO-Revision-Date: 2009-04-20 12:27+0000\n"
"Last-Translator: JohnTooray <Unknown>\n"
"Language-Team: German\n"
@@ -17,300 +17,301 @@ msgstr ""
"X-Launchpad-Export-Date: 2009-04-21 14:40+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
-#: src/commandhandler.cpp:142
+#: src/commandhandler.cpp:141
msgid "-- Help --"
msgstr "-- Hilfe --"
-#: src/commandhandler.cpp:143 src/net/ea/gui/partytab.cpp:53
+#: src/commandhandler.cpp:142
#, fuzzy
-msgid "/help > Display this help."
+msgid "/help > Display this help"
msgstr "/help: Hilfe anzeigen"
-#: src/commandhandler.cpp:145
+#: src/commandhandler.cpp:144
#, fuzzy
msgid "/where > Display map name"
msgstr "/where: Zeigt den Namen der Karte an"
-#: src/commandhandler.cpp:146
+#: src/commandhandler.cpp:145
msgid "/who > Display number of online users"
msgstr ""
-#: src/commandhandler.cpp:147
+#: src/commandhandler.cpp:146
msgid "/me > Tell something about yourself"
msgstr ""
-#: src/commandhandler.cpp:149
+#: src/commandhandler.cpp:148
msgid "/clear > Clears this window"
msgstr ""
-#: src/commandhandler.cpp:151
+#: src/commandhandler.cpp:150
msgid "/msg > Send a private message to a user"
msgstr ""
-#: src/commandhandler.cpp:152
+#: src/commandhandler.cpp:151
msgid "/whisper > Alias of msg"
msgstr ""
-#: src/commandhandler.cpp:153
+#: src/commandhandler.cpp:152
msgid "/w > Alias of msg"
msgstr ""
-#: src/commandhandler.cpp:154
+#: src/commandhandler.cpp:153
msgid "/query > Makes a tab for private messages with another user"
msgstr ""
-#: src/commandhandler.cpp:155
+#: src/commandhandler.cpp:154
msgid "/q > Alias of query"
msgstr ""
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:156
msgid "/list > Display all public channels"
msgstr ""
-#: src/commandhandler.cpp:158
+#: src/commandhandler.cpp:157
msgid "/join > Join or create a channel"
msgstr ""
-#: src/commandhandler.cpp:160
+#: src/commandhandler.cpp:159
#, fuzzy
msgid "/party > Invite a user to party"
msgstr "@@party|%s in deine Gruppe einladen@@"
-#: src/commandhandler.cpp:162
+#: src/commandhandler.cpp:161
msgid "/record > Start recording the chat to an external file"
msgstr ""
-#: 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 ""
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:165
#, fuzzy
msgid "/announce > Global announcement (GM only)"
msgstr "Globale Ansage:"
-#: src/commandhandler.cpp:170
+#: src/commandhandler.cpp:169
msgid "For more information, type /help <command>"
msgstr ""
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:173
msgid "Command: /help"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: src/commandhandler.cpp:186
+#: src/commandhandler.cpp:185
msgid "*** only available to a GM ***"
msgstr ""
-#: 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 ""
-#: src/commandhandler.cpp:193
+#: src/commandhandler.cpp:192
msgid "This command clears the chat log of previous chat."
msgstr "Dieser Befehl bereinigt den Chatlog des vorherigen Chats."
-#: src/commandhandler.cpp:197
+#: src/commandhandler.cpp:196
msgid "Command: /join <channel>"
msgstr ""
-#: 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 ""
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:203
#, fuzzy
msgid "This command shows a list of all channels."
msgstr "Dieser Befehl bereinigt den Chatlog des vorherigen Chats."
-#: src/commandhandler.cpp:208
+#: src/commandhandler.cpp:207
#, fuzzy
msgid "Command: /me <message>"
msgstr "Befehl: /whisper <Spitzname> <Nachricht>"
-#: src/commandhandler.cpp:209
+#: src/commandhandler.cpp:208
msgid "This command tell others you are (doing) <msg>."
msgstr ""
-#: src/commandhandler.cpp:213
+#: src/commandhandler.cpp:212
#, fuzzy
msgid "Command: /msg <nick> <message>"
msgstr "Befehl: /whisper <Spitzname> <Nachricht>"
-#: src/commandhandler.cpp:214
+#: src/commandhandler.cpp:213
#, fuzzy
msgid "Command: /whisper <nick> <message>"
msgstr "Befehl: /whisper <Spitzname> <Nachricht>"
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:214
#, fuzzy
msgid "Command: /w <nick> <message>"
msgstr "Befehl: /whisper <Spitzname> <Nachricht>"
-#: src/commandhandler.cpp:216
+#: src/commandhandler.cpp:215
msgid "This command sends the text <message> to <nick>."
msgstr ""
-#: 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
#, fuzzy
msgid "Command: /query <nick>"
msgstr "Befehl: /whisper <Spitzname> <Nachricht>"
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:222
#, fuzzy
msgid "Command: /q <nick>"
msgstr "Befehl: /whisper <Spitzname> <Nachricht>"
-#: src/commandhandler.cpp:224
+#: src/commandhandler.cpp:223
msgid "This command tries to make a tab for whispers betweenyou and <nick>."
msgstr ""
-#: src/commandhandler.cpp:229
+#: src/commandhandler.cpp:228
#, fuzzy
msgid "Command: /party <nick>"
msgstr "Befehl: /whisper <Spitzname> <Nachricht>"
-#: 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 ""
-#: src/commandhandler.cpp:236
+#: src/commandhandler.cpp:235
msgid "Command: /present"
msgstr ""
-#: 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 ""
-#: src/commandhandler.cpp:244
+#: src/commandhandler.cpp:243
#, fuzzy
msgid "This command starts recording the chat log to the file <filename>."
msgstr "Dieser Befehl bereinigt den Chatlog des vorherigen Chats."
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:245
msgid "Command: /record"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: src/commandhandler.cpp:257
+#: src/commandhandler.cpp:256
msgid "Command: /toggle"
msgstr ""
-#: src/commandhandler.cpp:258
+#: src/commandhandler.cpp:257
#, fuzzy
msgid "This command displays the return toggle status."
msgstr "Dieser Befehl bereinigt den Chatlog des vorherigen Chats."
-#: src/commandhandler.cpp:262
+#: src/commandhandler.cpp:261
msgid "Command: /where"
msgstr ""
-#: 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 ""
-#: 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 "Unbekannter Befehl."
-#: src/commandhandler.cpp:274
+#: src/commandhandler.cpp:273
msgid "Type /help for a list of commands."
msgstr ""
-#: src/commandhandler.cpp:336
-msgid "Cannont send empty whispers!"
-msgstr ""
+#: src/commandhandler.cpp:339
+#, fuzzy
+msgid "Cannot send empty whispers!"
+msgstr "Kann nicht rufen!"
-#: 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 ""
-#: 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 ""
@@ -319,47 +320,47 @@ msgstr ""
msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
msgstr ""
-#: 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
#, fuzzy
msgid "Saving screenshot failed!"
msgstr "Sitzen fehlgeschlagen!"
-#: src/game.cpp:492
-msgid "Network Error"
+#: src/game.cpp:481
+msgid "The connection to the server was lost, the program will now quit"
msgstr ""
-#: src/game.cpp:493
-msgid "The connection to the server was lost, the program will now quit"
+#: src/game.cpp:487
+msgid "Network Error"
msgstr ""
-#: src/game.cpp:664 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
+#: 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 "Beenden"
-#: src/game.cpp:665
+#: src/game.cpp:647
#, fuzzy
msgid "Are you sure you want to quit?"
msgstr "Bist du sicher, dass du diesen Charakter löschen möchtest?"
-#: 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 ""
@@ -372,12 +373,12 @@ msgstr "Kaufen"
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 "Kaufen"
#: 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
#, fuzzy, c-format
msgid "Price: %s / Total: %s"
msgstr "Preis: %d GP / Summe: %d GP"
@@ -388,13 +389,13 @@ msgid "Max"
msgstr "max"
#: 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 "Beschreibung: %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 "Effekt: %s"
@@ -403,205 +404,213 @@ msgstr "Effekt: %s"
msgid "Shop"
msgstr "Geschäft"
-#: 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 "Verkaufen"
-#: 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 "Abbrechen"
-#: 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 "Email-Adresse ändern"
-#: 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 "Account: %s"
-#: src/gui/changeemaildialog.cpp:48
+#: src/gui/changeemaildialog.cpp:49
#, fuzzy
msgid "Type New Email Address twice:"
msgstr "Email-Adresse ändern"
-#: 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 "Kennwort ändern"
-#: 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 "Passwort:"
-#: 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 "Charakter erstellen"
-#: 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 "Name :"
-#: src/gui/charcreatedialog.cpp:70
+#: src/gui/charcreatedialog.cpp:69
msgid "Hair Color:"
msgstr "Haarfarbe"
-#: src/gui/charcreatedialog.cpp:73
+#: src/gui/charcreatedialog.cpp:72
msgid "Hair Style:"
msgstr "Frisur"
-#: src/gui/charcreatedialog.cpp:74
+#: src/gui/charcreatedialog.cpp:73
msgid "Create"
msgstr "Erstellen"
-#: src/gui/charcreatedialog.cpp:76 src/gui/register.cpp:75
+#: src/gui/charcreatedialog.cpp:75 src/gui/register.cpp:75
msgid "Male"
msgstr "Männlich"
-#: src/gui/charcreatedialog.cpp:77 src/gui/register.cpp:76
+#: src/gui/charcreatedialog.cpp:76 src/gui/register.cpp:76
msgid "Female"
msgstr "Weiblich"
-#: 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 "Bitte verteile %d Punkte"
-#: 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 "Fehler"
-#: src/gui/charcreatedialog.cpp:174
+#: src/gui/charcreatedialog.cpp:173
msgid "Your name needs to be at least 4 characters."
msgstr "Dein Name muss aus mindestens 4 Zeichen bestehen."
-#: src/gui/charcreatedialog.cpp:227
+#: src/gui/charcreatedialog.cpp:226
msgid "Character stats OK"
msgstr "Spielfigurattribute OK"
-#: src/gui/charcreatedialog.cpp:239
+#: src/gui/charcreatedialog.cpp:238
#, c-format
msgid "Please remove %d points"
msgstr "Bitte entferne %d Punkte"
-#: src/gui/char_select.cpp:79
+#: src/gui/charselectdialog.cpp:78
msgid "Confirm Character Delete"
msgstr "Bestätige Charakter-Löschung"
-#: src/gui/char_select.cpp:80
+#: src/gui/charselectdialog.cpp:79
msgid "Are you sure you want to delete this character?"
msgstr "Bist du sicher, dass du diesen Charakter löschen möchtest?"
-#: src/gui/char_select.cpp:98
+#: src/gui/charselectdialog.cpp:97
msgid "Account and Character Management"
msgstr "Account- und Charakterverwaltung"
-#: src/gui/char_select.cpp:105
+#: src/gui/charselectdialog.cpp:104
msgid "Select Character"
msgstr "Spielfigur auswählen"
-#: 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 "Ok"
-#: src/gui/char_select.cpp:113
+#: src/gui/charselectdialog.cpp:112
msgid "Previous"
msgstr "Zurück"
-#: 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 "Weiter"
-#: 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 "Name : %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 "Stufe: %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 "Neu"
-#: 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 "Löschen"
-#: src/gui/char_select.cpp:120 src/gui/unregisterdialog.cpp:51
+#: src/gui/charselectdialog.cpp:119 src/gui/unregisterdialog.cpp:52
msgid "Unregister"
msgstr "Abmelden"
-#: src/gui/char_select.cpp:127
+#: src/gui/charselectdialog.cpp:126
#, c-format
msgid "Money: %d"
msgstr "Geld: %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 "Beruf Stufe: %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
#, fuzzy, c-format
msgid "Money: %s"
msgstr "Geld: %d"
-#: 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
#, fuzzy
msgid "Chat"
msgstr "Erstellen"
-#: src/gui/chat.cpp:341 src/gui/chat.cpp:347
+#: src/gui/chat.cpp:332
+#, c-format
+msgid "%d players are present."
+msgstr ""
+
+#: 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 "Flüsternd zu %s: %s"
-#: src/gui/confirm_dialog.cpp:42
+#: src/gui/confirmdialog.cpp:42
msgid "Yes"
msgstr "Ja"
-#: src/gui/confirm_dialog.cpp:43
+#: src/gui/confirmdialog.cpp:43
msgid "No"
msgstr "Nein"
@@ -609,26 +618,16 @@ msgstr "Nein"
msgid "Connecting..."
msgstr "Verbinde..."
-#: src/gui/emotecontainer.cpp:61
+#: src/gui/emotepopup.cpp:64
msgid "Unable to load selection.png"
msgstr ""
-#: 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 "Benutzen"
-
-#: src/gui/equipmentwindow.cpp:68 src/gui/menuwindow.cpp:67
+#: src/gui/equipmentwindow.cpp:68 src/gui/windowmenu.cpp:60
msgid "Equipment"
msgstr "Ausrüstung"
-#: 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 "Ablegen"
@@ -655,101 +654,104 @@ msgstr "Gilden"
msgid "Help"
msgstr "Hilfe"
-#: 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 "Schließen"
-#: src/gui/inventorywindow.cpp:51 src/gui/menuwindow.cpp:68
+#: src/gui/inventorywindow.cpp:54 src/gui/windowmenu.cpp:61
msgid "Inventory"
msgstr "Inventar"
-#: 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 "Ausrüsten"
-#: 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 "Benutzen"
+
+#: src/gui/inventorywindow.cpp:80
msgid "Drop"
msgstr "Wegwerfen"
-#: src/gui/inventorywindow.cpp:79
+#: src/gui/inventorywindow.cpp:81
msgid "Split"
msgstr "Aufteilen"
-#: src/gui/inventorywindow.cpp:93
+#: src/gui/inventorywindow.cpp:92
msgid "Slots:"
msgstr ""
-#: src/gui/inventorywindow.cpp:94
+#: src/gui/inventorywindow.cpp:93
#, fuzzy
msgid "Weight:"
msgstr "Gewicht: %d / %d"
-#: 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 "Wähle aus, wieviele Gegenstände Du tauschen möchtest."
-#: src/gui/item_amount.cpp:95
+#: src/gui/itemamount.cpp:124
msgid "Select amount of items to drop."
msgstr "Wähle aus, wieviele Gegenstände Du wegwerfen möchtest."
-#: src/gui/item_amount.cpp:98
+#: src/gui/itemamount.cpp:127
#, fuzzy
msgid "Select amount of items to store."
msgstr "Wähle aus, wieviele Gegenstände Du tauschen möchtest."
-#: src/gui/item_amount.cpp:101
+#: src/gui/itemamount.cpp:130
#, fuzzy
msgid "Select amount of items to retrieve."
msgstr "Wähle aus, wieviele Gegenstände Du tauschen möchtest."
-#: src/gui/item_amount.cpp:104
+#: src/gui/itemamount.cpp:133
msgid "Select amount of items to split."
msgstr "Wähle aus, wieviel Gegenstände Du aufteilen möchtest."
-#: src/gui/itempopup.cpp:89
+#: src/gui/itempopup.cpp:91
#, fuzzy
msgid "Weight: "
msgstr "Gewicht: %d / %d"
-#: src/gui/login.cpp:47
+#: src/gui/login.cpp:48
msgid "Login"
msgstr "Anmelden"
-#: 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 "Server:"
-#: 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:"
-#: 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 "Benutzernamen merken"
-#: 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 "Ok"
-#: 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 "Registrieren"
-#: 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 ""
@@ -765,71 +767,44 @@ msgstr ""
msgid "Cast Test Spell 3"
msgstr ""
-#: src/gui/menuwindow.cpp:66
-msgid "Status"
-msgstr "Status"
-
-#: src/gui/menuwindow.cpp:69 src/gui/skill.cpp:126 src/gui/skilldialog.cpp:99
-msgid "Skills"
-msgstr "Fertigkeiten"
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
+#, fuzzy
+msgid "Map"
+msgstr "max"
-#: src/gui/menuwindow.cpp:72
-msgid "Guilds"
-msgstr "Gilden"
+#: src/gui/npcdialog.cpp:43
+msgid "Waiting for server"
+msgstr ""
-#: src/gui/menuwindow.cpp:73
+#: src/gui/npcdialog.cpp:46
#, fuzzy
-msgid "Buddys"
-msgstr "Kaufen"
-
-#: src/gui/menuwindow.cpp:75
-msgid "Shortcut"
-msgstr "Tastenkürzel"
+msgid "Submit"
+msgstr "Aufteilen"
-#: src/gui/menuwindow.cpp:77 src/gui/setup.cpp:65 src/main.cpp:920
-msgid "Setup"
-msgstr "Einstellungen"
+#: src/gui/npcdialog.cpp:49 src/gui/npcpostdialog.cpp:39
+msgid "NPC"
+msgstr "NPC"
-#: src/gui/minimap.cpp:39
-msgid "MiniMap"
-msgstr "Übersichtskarte"
+#: src/gui/npcdialog.cpp:95
+msgid "+"
+msgstr ""
-#: src/gui/npcintegerdialog.cpp:39
-msgid "NPC Number Request"
+#: src/gui/npcdialog.cpp:96
+msgid "-"
msgstr ""
-#: src/gui/npcintegerdialog.cpp:50
+#: src/gui/npcdialog.cpp:105
#, fuzzy
msgid "Reset"
msgstr "Registrieren"
-#: src/gui/npcintegerdialog.cpp:101 src/gui/npclistdialog.cpp:123
-#: src/gui/npcstringdialog.cpp:75
-#, fuzzy
-msgid ""
-"\n"
-"> Cancel\n"
-msgstr "Abbrechen"
-
-#: src/gui/npcpostdialog.cpp:39 src/gui/npc_text.cpp:37
-msgid "NPC"
-msgstr "NPC"
-
#: src/gui/npcpostdialog.cpp:51
#, fuzzy
msgid "Send"
msgstr "Ton"
-#: src/gui/npcstringdialog.cpp:39
-msgid "NPC Text Request"
-msgstr ""
-
-#: 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
#, fuzzy
msgid "Text"
msgstr "Weiter"
@@ -886,7 +861,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
#, fuzzy
msgid "Party"
msgstr "Los!"
@@ -909,7 +884,7 @@ msgid "Being"
msgstr ""
#: src/gui/palette.cpp:104
-msgid "Other Player's Names"
+msgid "Other Players' Names"
msgstr ""
#: src/gui/palette.cpp:105
@@ -936,21 +911,22 @@ msgid "Unknown Item Type"
msgstr ""
#: src/gui/palette.cpp:111
-msgid "Generic"
+msgid "Generics"
msgstr ""
#: src/gui/palette.cpp:112
-msgid "Hat"
-msgstr ""
+#, fuzzy
+msgid "Hats"
+msgstr "Statistiken"
#: src/gui/palette.cpp:113
#, fuzzy
-msgid "Usable"
+msgid "Usables"
msgstr "Benutzen"
#: src/gui/palette.cpp:114
#, fuzzy
-msgid "Shirt"
+msgid "Shirts"
msgstr "Tastenkürzel"
#: src/gui/palette.cpp:115
@@ -973,15 +949,15 @@ msgstr ""
#: src/gui/palette.cpp:119
#, fuzzy
-msgid "Shield"
+msgid "Shields"
msgstr "Verkaufen"
#: src/gui/palette.cpp:120
-msgid "Ring"
+msgid "Rings"
msgstr ""
#: src/gui/palette.cpp:121
-msgid "Necklace"
+msgid "Necklaces"
msgstr ""
#: src/gui/palette.cpp:122
@@ -1038,94 +1014,103 @@ msgstr ""
msgid "1/4 HP Bar"
msgstr ""
-#: src/gui/popupmenu.cpp:73
+#: src/gui/popupmenu.cpp:75
msgid "@@name|Add name to chat@@"
msgstr ""
-#: src/gui/popupmenu.cpp:85
+#: src/gui/popupmenu.cpp:87
#, c-format
msgid "@@trade|Trade With %s@@"
msgstr "@@trade|Mit %s handeln@@"
-#: 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 "@@attack|%s angreifen@@"
-#: src/gui/popupmenu.cpp:92
+#: src/gui/popupmenu.cpp:94
#, c-format
msgid "@@friend|Befriend %s@@"
msgstr ""
-#: 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
#, fuzzy, c-format
msgid "@@ignore|Ignore %s@@"
msgstr "@@guild|%s einladen@@"
-#: 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
#, fuzzy, c-format
msgid "@@guild|Invite %s to join your guild@@"
msgstr "@@party|%s in deine Gruppe einladen@@"
-#: src/gui/popupmenu.cpp:112
+#: src/gui/popupmenu.cpp:114
#, c-format
msgid "@@party|Invite %s to join your party@@"
msgstr "@@party|%s in deine Gruppe einladen@@"
-#: src/gui/popupmenu.cpp:123
+#: src/gui/popupmenu.cpp:125
#, fuzzy, c-format
msgid "@@talk|Talk To %s@@"
msgstr "@@talk|Mit NSC reden@@"
-#: 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 "@@cancel|Abbrechen@@"
-#: src/gui/popupmenu.cpp:155
-#, c-format
-msgid "@@pickup|Pick Up %s@@"
+#: src/gui/popupmenu.cpp:157
+#, fuzzy, c-format
+msgid "@@pickup|Pick up %s@@"
msgstr "@@pickup|%s aufheben@@"
-#: src/gui/popupmenu.cpp:156 src/gui/popupmenu.cpp:352
-msgid "@@chat|Add to Chat@@"
+#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:373
+msgid "@@chat|Add to chat@@"
msgstr ""
-#: src/gui/popupmenu.cpp:336 src/gui/popupmenu.cpp:341
-msgid "@@use|Equip@@"
-msgstr "@@use|Ausrüsten@@"
-
-#: 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 "@@use|Ausrüsten@@"
+
+#: src/gui/popupmenu.cpp:353
msgid "@@use|Use@@"
msgstr "@@use|Nutzen@@"
-#: src/gui/popupmenu.cpp:347
+#: src/gui/popupmenu.cpp:355
msgid "@@drop|Drop@@"
msgstr "@@drop|Fallen lassen@@"
-#: src/gui/popupmenu.cpp:350
+#: src/gui/popupmenu.cpp:359
msgid "@@split|Split@@"
msgstr "@@split|Aufteilen@@"
+#: src/gui/popupmenu.cpp:364
+#, fuzzy
+msgid "@@store|Store@@"
+msgstr "@@guild|%s einladen@@"
+
+#: src/gui/popupmenu.cpp:371
+msgid "@@retrieve|Retrieve@@"
+msgstr ""
+
#: src/gui/quitdialog.cpp:37
msgid "Switch server"
msgstr "Server wechseln"
@@ -1195,19 +1180,31 @@ msgstr "Das Passwort muss kürzer als %d Zeichen sein."
msgid "Passwords do not match."
msgstr "Passwörter stimmen nicht überein."
-#: src/gui/serverdialog.cpp:73
+#: src/gui/serverdialog.cpp:74
#, fuzzy
msgid "Choose your server"
msgstr "Wähle Deinen Mana World Spielserver"
-#: src/gui/serverdialog.cpp:163
+#: src/gui/serverdialog.cpp:164
msgid "Please type both the address and the port of a server."
msgstr "Bitte die Adresse und den Port eines Servers eingeben"
-#: src/gui/serverselectdialog.cpp:50
+#: src/gui/serverselectdialog.cpp:59
msgid "Select Server"
msgstr "Server auswählen"
+#: src/gui/setup.cpp:64 src/gui/windowmenu.cpp:69 src/main.cpp:933
+msgid "Setup"
+msgstr "Einstellungen"
+
+#: src/gui/setup.cpp:72
+msgid "Apply"
+msgstr "Anwenden"
+
+#: src/gui/setup.cpp:72
+msgid "Reset Windows"
+msgstr "Fenster zurücksetzen"
+
#: src/gui/setup_audio.cpp:41
msgid "Sound"
msgstr "Ton"
@@ -1224,11 +1221,11 @@ msgstr "Lautstärke der Klangeffekte"
msgid "Music volume"
msgstr "Latustärke der Musik"
-#: 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
#, fuzzy
msgid "Colors"
msgstr "Schließen"
@@ -1237,24 +1234,24 @@ msgstr "Schließen"
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
#, fuzzy
msgid "Static"
msgstr "Statistiken"
#: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:431
#, fuzzy
msgid "Pulse"
msgstr "Schließen"
#: 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
#, fuzzy
msgid "Spectrum"
msgstr "Einstellungen"
@@ -1263,26 +1260,18 @@ msgstr "Einstellungen"
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 "Anwenden"
-
-#: src/gui/setup.cpp:73
-msgid "Reset Windows"
-msgstr "Fenster zurücksetzen"
-
#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:78
msgid "Press the button to start calibration"
msgstr "Knopf drücken um die Kalibrierung zu starten"
@@ -1351,7 +1340,7 @@ msgstr "Unbeachtet"
msgid "Ignored"
msgstr "Ignoriert"
-#: src/gui/setup_players.cpp:207
+#: src/gui/setup_players.cpp:207 src/gui/setup_video.cpp:131
msgid "???"
msgstr ""
@@ -1379,160 +1368,182 @@ msgstr "Spieler"
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
+#, fuzzy
+msgid "Small"
+msgstr "Verkaufen"
+
+#: src/gui/setup_video.cpp:114
+#, fuzzy
+msgid "Medium"
+msgstr "Mittel"
+
+#: src/gui/setup_video.cpp:115
+msgid "Large"
+msgstr ""
+
+#: src/gui/setup_video.cpp:151
msgid "Full screen"
msgstr "Vollbild"
-#: 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 "Benutzerdefinierten Zeiger"
-#: src/gui/setup_video.cpp:126
+#: src/gui/setup_video.cpp:155
msgid "Visible names"
msgstr "Sichtbare Namen"
-#: src/gui/setup_video.cpp:127
+#: src/gui/setup_video.cpp:157
#, fuzzy
msgid "Particle effects"
msgstr "Partikeldetail"
-#: 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 ""
-#: src/gui/setup_video.cpp:136
+#: src/gui/setup_video.cpp:167
msgid "FPS Limit:"
msgstr "FPS-Limit:"
-#: src/gui/setup_video.cpp:152
+#: src/gui/setup_video.cpp:184
msgid "Video"
msgstr "Video"
-#: 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 Transparenz"
-#: src/gui/setup_video.cpp:159
+#: src/gui/setup_video.cpp:191
msgid "Scroll radius"
msgstr "Scroll-Radius"
-#: src/gui/setup_video.cpp:160
+#: src/gui/setup_video.cpp:192
msgid "Scroll laziness"
msgstr "Scroll-Trägheit"
-#: src/gui/setup_video.cpp:161
+#: src/gui/setup_video.cpp:193
msgid "Ambient FX"
msgstr "Hintergrundeffekte"
-#: src/gui/setup_video.cpp:162
+#: src/gui/setup_video.cpp:194
msgid "Particle Detail"
msgstr "Partikeldetail"
-#: 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
#, fuzzy
msgid "No text"
msgstr "Weiter"
-#: src/gui/setup_video.cpp:236 src/gui/setup_video.cpp:498
+#: src/gui/setup_video.cpp:271 src/gui/setup_video.cpp:570
#, fuzzy
msgid "Bubbles, no names"
msgstr "Sichtbare Namen"
-#: 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 ""
-#: 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 "Aus"
-#: 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 "Niedrig"
-#: 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 "Hoch"
-#: 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 "Mittel"
-#: 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 "max"
-#: 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
#, fuzzy
msgid "fullscreen"
msgstr "Vollbild"
-#: 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 "Wechsle zum Vollbildmodus"
-#: src/gui/setup_video.cpp:352
+#: src/gui/setup_video.cpp:422
msgid "Restart needed for changes to take effect."
msgstr "Änderungen treten erst nach einem Neustart des Programmes in Kraft."
-#: src/gui/setup_video.cpp:364
+#: src/gui/setup_video.cpp:434
msgid "Changing OpenGL"
msgstr "Ändere OpenGL"
-#: src/gui/setup_video.cpp:365
+#: src/gui/setup_video.cpp:435
msgid "Applying change to OpenGL requires restart."
msgstr ""
"Änderungen an OpenGL werden erst nach einem Neustart der Anwendung "
"übernommen."
-#: 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
#, fuzzy
msgid "Restart your client for the change to take effect."
msgstr "Änderungen treten erst nach einem Neustart des Programmes in Kraft."
-#: 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 ""
@@ -1545,6 +1556,10 @@ msgstr "Fertigkeiten"
msgid "Mystery Skill"
msgstr ""
+#: src/gui/skill.cpp:126 src/gui/skilldialog.cpp:99 src/gui/windowmenu.cpp:62
+msgid "Skills"
+msgstr "Fertigkeiten"
+
#: src/gui/skill.cpp:145 src/gui/skill.cpp:197
#, c-format
msgid "Skill points: %d"
@@ -1554,15 +1569,6 @@ msgstr "Fähigkeitspunkte: %d"
msgid "Up"
msgstr "Erhöhen"
-#: src/gui/skill.cpp:146
-msgid "inc"
-msgstr ""
-
-#: src/gui/skill.cpp:147
-#, fuzzy
-msgid "use"
-msgstr "Benutzen"
-
#: src/gui/skilldialog.cpp:113
msgid "Weapons"
msgstr ""
@@ -1572,173 +1578,173 @@ msgstr ""
msgid "Crafts"
msgstr "Erstellen"
-#: 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 "Job: %d"
-#: src/gui/status.cpp:61
+#: src/gui/status.cpp:60
msgid "HP:"
msgstr ""
-#: src/gui/status.cpp:64
+#: src/gui/status.cpp:63
msgid "Exp:"
msgstr ""
-#: src/gui/status.cpp:67
+#: src/gui/status.cpp:66
msgid "MP:"
msgstr ""
-#: src/gui/status.cpp:70
+#: src/gui/status.cpp:69
#, fuzzy
msgid "Job:"
msgstr "Job: %d"
-#: src/gui/status.cpp:78
+#: src/gui/status.cpp:77
msgid "Stats"
msgstr "Statistiken"
-#: src/gui/status.cpp:79
+#: src/gui/status.cpp:78
msgid "Total"
msgstr "Gesamt"
-#: src/gui/status.cpp:80
+#: src/gui/status.cpp:79
msgid "Cost"
msgstr "Preis"
-#: src/gui/status.cpp:84
+#: src/gui/status.cpp:83
msgid "Attack:"
msgstr "Angriff:"
-#: src/gui/status.cpp:85
+#: src/gui/status.cpp:84
msgid "Defense:"
msgstr "Verteidigung:"
-#: src/gui/status.cpp:86
+#: src/gui/status.cpp:85
msgid "M.Attack:"
msgstr "M.Angriff:"
-#: src/gui/status.cpp:87
+#: src/gui/status.cpp:86
msgid "M.Defense:"
msgstr "M.Verteidigung:"
-#: src/gui/status.cpp:89
+#: src/gui/status.cpp:88
#, no-c-format
msgid "% Accuracy:"
msgstr "% Genauigkeit"
-#: src/gui/status.cpp:91
+#: src/gui/status.cpp:90
#, no-c-format
msgid "% Evade:"
msgstr "% Ausweichen:"
-#: src/gui/status.cpp:93
+#: src/gui/status.cpp:92
#, no-c-format
msgid "% Reflex:"
msgstr "% Reaktion:"
-#: src/gui/status.cpp:199
+#: src/gui/status.cpp:198
msgid "Strength"
msgstr "Stärke"
-#: src/gui/status.cpp:200
+#: src/gui/status.cpp:199
msgid "Agility"
msgstr "Beweglichkeit"
-#: src/gui/status.cpp:201
+#: src/gui/status.cpp:200
msgid "Vitality"
msgstr "Gesundheit"
-#: src/gui/status.cpp:202
+#: src/gui/status.cpp:201
msgid "Intelligence"
msgstr "Intelligenz"
-#: src/gui/status.cpp:203
+#: src/gui/status.cpp:202
msgid "Dexterity"
msgstr "Ausdauer"
-#: src/gui/status.cpp:204
+#: src/gui/status.cpp:203
msgid "Luck"
msgstr "Glück"
-#: src/gui/status.cpp:222
+#: src/gui/status.cpp:221
#, c-format
msgid "Remaining Status Points: %d"
msgstr "Verbleibende Statuspunkte: %d"
-#: src/gui/status.cpp:383 src/gui/status.cpp:405
+#: src/gui/status.cpp:384
#, fuzzy
msgid "Max level"
msgstr "Männlich"
-#: src/gui/storagewindow.cpp:53
+#: src/gui/storagewindow.cpp:54
msgid "Storage"
msgstr ""
-#: src/gui/storagewindow.cpp:64
+#: src/gui/storagewindow.cpp:65
#, fuzzy
msgid "Store"
msgstr "Stopp"
-#: src/gui/storagewindow.cpp:65
+#: src/gui/storagewindow.cpp:66
msgid "Retrieve"
msgstr ""
-#: src/gui/storagewindow.cpp:75
+#: src/gui/storagewindow.cpp:78
#, fuzzy
msgid "Slots: "
msgstr "Fähigkeitspunkte: %d"
-#: src/gui/trade.cpp:52
+#: src/gui/trade.cpp:51
msgid "Propose trade"
msgstr "Handel vorschlagen"
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:52
#, fuzzy
msgid "Confirmed. Waiting..."
msgstr "Verbinde..."
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:53
#, fuzzy
msgid "Agree trade"
msgstr "Handel vorschlagen"
-#: src/gui/trade.cpp:55
+#: src/gui/trade.cpp:54
#, fuzzy
msgid "Agreed. Waiting..."
msgstr "Aktualisiere..."
-#: src/gui/trade.cpp:58
+#: src/gui/trade.cpp:57
#, fuzzy
msgid "Trade: You"
msgstr "Handeln"
-#: src/gui/trade.cpp:71 src/gui/trade.cpp:72
+#: src/gui/trade.cpp:70 src/gui/trade.cpp:71
msgid "Trade"
msgstr "Handeln"
-#: src/gui/trade.cpp:74
+#: src/gui/trade.cpp:73
msgid "Add"
msgstr "Hinzufügen"
-#: 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
#, fuzzy, c-format
msgid "You get %s."
msgstr "Du erhälst %d GP."
-#: src/gui/trade.cpp:97
+#: src/gui/trade.cpp:96
msgid "You give:"
msgstr "Du gibst:"
-#: src/gui/trade.cpp:101
+#: src/gui/trade.cpp:100
msgid "Change"
msgstr "Ändern"
-#: 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
#, fuzzy
msgid "You don't have enough money"
msgstr "Keine Memos vorhanden!"
@@ -1857,21 +1863,21 @@ msgstr ""
msgid "Need a user to kick!"
msgstr ""
-#: src/gui/widgets/chattab.cpp:115
+#: src/gui/widgets/chattab.cpp:114
msgid "Global announcement:"
msgstr "Globale Ansage:"
-#: src/gui/widgets/chattab.cpp:121
+#: src/gui/widgets/chattab.cpp:120
#, c-format
msgid "Global announcement from %s:"
msgstr "Globale Ansage von %s:"
-#: src/gui/widgets/chattab.cpp:147
+#: src/gui/widgets/chattab.cpp:146
#, fuzzy, c-format
msgid "%s whispers: "
msgstr "%s flüstert:"
-#: src/gui/widgets/chattab.cpp:241 src/resources/itemdb.cpp:108
+#: src/gui/widgets/chattab.cpp:240 src/resources/itemdb.cpp:107
#, fuzzy
msgid "Unknown item"
msgstr "Unbekannter Befehl"
@@ -1881,24 +1887,36 @@ msgstr "Unbekannter Befehl"
msgid "Cannot send empty chat!"
msgstr "Kann nicht rufen!"
-#: src/gui/widgets/whispertab.cpp:55
-#, c-format
-msgid "%s: %s"
-msgstr ""
-
-#: src/gui/widgets/whispertab.cpp:69
+#: src/gui/widgets/whispertab.cpp:68
msgid "/close > Close the whisper tab"
msgstr ""
-#: src/gui/widgets/whispertab.cpp:79
+#: src/gui/widgets/whispertab.cpp:78
msgid "Command: /close"
msgstr ""
-#: src/gui/widgets/whispertab.cpp:80
+#: src/gui/widgets/whispertab.cpp:79
#, fuzzy
msgid "This command closes the current whisper tab."
msgstr "Dieser Befehl bereinigt den Chatlog des vorherigen Chats."
+#: src/gui/windowmenu.cpp:59
+msgid "Status"
+msgstr "Status"
+
+#: src/gui/windowmenu.cpp:65
+msgid "Guilds"
+msgstr "Gilden"
+
+#: src/gui/windowmenu.cpp:66
+#, fuzzy
+msgid "Buddys"
+msgstr "Kaufen"
+
+#: src/gui/windowmenu.cpp:68
+msgid "Shortcut"
+msgstr "Tastenkürzel"
+
#: src/keyboardconfig.cpp:41
msgid "Move Up"
msgstr ""
@@ -2033,8 +2051,8 @@ msgstr "Fenster zurücksetzen"
#: src/keyboardconfig.cpp:80
#, fuzzy
-msgid "Emote Window"
-msgstr "Emote fehlgeschlagen!"
+msgid "Party Window"
+msgstr "Fenster zurücksetzen"
#: src/keyboardconfig.cpp:81
msgid "Emote Shortcut Window"
@@ -2084,168 +2102,173 @@ msgstr ""
msgid "Ignore input 2"
msgstr ""
-#: src/localplayer.cpp:849
+#: src/localplayer.cpp:834
#, fuzzy
msgid "Unarmed"
msgstr "Unbenannt"
-#: src/localplayer.cpp:850
+#: src/localplayer.cpp:835
msgid "Knife"
msgstr ""
-#: src/localplayer.cpp:851
+#: src/localplayer.cpp:836
#, fuzzy
msgid "Sword"
msgstr "Ton"
-#: src/localplayer.cpp:852
+#: src/localplayer.cpp:837
msgid "Polearm"
msgstr ""
-#: src/localplayer.cpp:853
+#: src/localplayer.cpp:838
#, fuzzy
msgid "Staff"
msgstr "Statistiken"
-#: src/localplayer.cpp:854
+#: src/localplayer.cpp:839
msgid "Whip"
msgstr ""
-#: src/localplayer.cpp:855
+#: src/localplayer.cpp:840
#, fuzzy
msgid "Bow"
msgstr "Niedrig"
-#: src/localplayer.cpp:856
+#: src/localplayer.cpp:841
msgid "Shooting"
msgstr ""
-#: src/localplayer.cpp:857
+#: src/localplayer.cpp:842
#, fuzzy
msgid "Mace"
msgstr "Männlich"
-#: 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
#, fuzzy
msgid "Craft"
msgstr "Erstellen"
-#: 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 ""
-#: src/main.cpp:563
-msgid "Options: "
+#: src/main.cpp:567
+msgid "Options:"
msgstr ""
-#: src/main.cpp:564
-msgid " -C --configfile : Configuration file to use"
+#: src/main.cpp:568
+msgid " -C --config-file : Configuration file to use"
msgstr ""
-#: src/main.cpp:565
-msgid " -d --data : Directory to load game data from"
+#: src/main.cpp:569
+msgid " -d --data : Directory to load game data from"
msgstr ""
-#: src/main.cpp:566
-msgid " -D --default : Bypass the login process with default settings"
+#: src/main.cpp:570
+msgid " -D --default : Choose default character server and character"
msgstr ""
-#: src/main.cpp:568
+#: src/main.cpp:572
#, fuzzy
-msgid " -h --help : Display this help"
+msgid " -h --help : Display this help"
msgstr "/help: Hilfe anzeigen"
-#: src/main.cpp:569
-msgid " -S --homedir : Directory to use as home directory"
+#: src/main.cpp:573
+msgid " -S --home-dir : Directory to use as home directory"
msgstr ""
-#: src/main.cpp:570
-msgid " -H --updatehost : Use this update host"
+#: src/main.cpp:574
+msgid " -H --update-host : Use this update host"
msgstr ""
-#: src/main.cpp:571
-msgid " -P --password : Login with this password"
+#: src/main.cpp:575
+msgid " -P --password : Login with this password"
msgstr ""
-#: src/main.cpp:572
-msgid " -c --character : Login with this character"
+#: src/main.cpp:576
+msgid " -c --character : Login with this character"
msgstr ""
-#: src/main.cpp:573
-msgid " -o --port : Login Server Port"
+#: src/main.cpp:577
+msgid " -p --port : Login Server Port"
msgstr ""
-#: src/main.cpp:574
-msgid " -s --server : Login Server name or IP"
+#: src/main.cpp:578
+msgid " -s --server : Login Server name or IP"
msgstr ""
-#: src/main.cpp:575
-msgid " -u --skipupdate : Skip the update downloads"
+#: src/main.cpp:579
+msgid " -u --skip-update : Skip the update downloads"
msgstr ""
-#: src/main.cpp:576
-msgid " -U --username : Login with this username"
+#: src/main.cpp:580
+msgid " -U --username : Login with this username"
msgstr ""
-#: src/main.cpp:577
-msgid " -v --version : Display the version"
+#: src/main.cpp:582
+msgid " -O --no-opengl : Disable OpenGL for this session"
msgstr ""
-#: src/main.cpp:582
+#: src/main.cpp:584
+#, fuzzy
+msgid " -v --version : Display the version"
+msgstr "/help: Hilfe anzeigen"
+
+#: src/main.cpp:589
#, fuzzy
msgid "The Mana World "
msgstr "Wähle Deinen Mana World Spielserver"
-#: src/main.cpp:1499
+#: src/main.cpp:1515
msgid "Connecting to map server..."
msgstr "Verbinde zu [map server]..."
-#: src/main.cpp:1507
+#: src/main.cpp:1523
msgid "Connecting to character server..."
msgstr "Verbinde zu [character server]..."
-#: src/main.cpp:1515
+#: src/main.cpp:1531
msgid "Connecting to account server..."
msgstr "Verbinde zu [account server]..."
-#: src/net/ea/adminhandler.cpp:67
+#: src/net/ea/adminhandler.cpp:66
#, fuzzy
msgid "Kick failed!"
msgstr "Sitzen fehlgeschlagen!"
-#: src/net/ea/adminhandler.cpp:69
+#: src/net/ea/adminhandler.cpp:68
msgid "Kick succeeded!"
msgstr ""
@@ -2333,18 +2356,18 @@ msgstr "Ausdauer"
msgid "Luck:"
msgstr "Glück"
-#: 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 ""
@@ -2357,427 +2380,442 @@ msgstr "Ablegen"
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
#, fuzzy, c-format
msgid "Strength: %d"
msgstr "Stärke"
-#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:82
+#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:84
#, fuzzy, c-format
msgid "Agility: %d"
msgstr "Beweglichkeit"
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:86
+#: src/net/ea/generalhandler.cpp:96 src/net/tmwserv/generalhandler.cpp:88
#, fuzzy, c-format
msgid "Vitality: %d"
msgstr "Gesundheit"
-#: src/net/ea/generalhandler.cpp:96 src/net/tmwserv/generalhandler.cpp:88
+#: src/net/ea/generalhandler.cpp:98 src/net/tmwserv/generalhandler.cpp:90
#, fuzzy, c-format
msgid "Intelligence: %d"
msgstr "Intelligenz"
-#: src/net/ea/generalhandler.cpp:98 src/net/tmwserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:100 src/net/tmwserv/generalhandler.cpp:86
#, fuzzy, c-format
msgid "Dexterity: %d"
msgstr "Ausdauer"
-#: src/net/ea/generalhandler.cpp:100
+#: src/net/ea/generalhandler.cpp:102
#, fuzzy, c-format
msgid "Luck: %d"
msgstr "Glück"
-#: src/net/ea/generalhandler.cpp:123
+#: src/net/ea/generalhandler.cpp:125
#, fuzzy
msgid "Authentication failed"
msgstr "Chat-Erstellung fehlgeschlagen!"
-#: 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 ""
-#: 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 "Verbindung zum Server unterbrochen!"
-#: src/net/ea/gui/partytab.cpp:54
+#: src/net/ea/gui/partytab.cpp:52
+#, fuzzy
+msgid "/help > Display this help."
+msgstr "/help: Hilfe anzeigen"
+
+#: src/net/ea/gui/partytab.cpp:53
msgid "/create > Create a new party"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:55
+#: src/net/ea/gui/partytab.cpp:54
msgid "/new > Alias of create"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:56
+#: src/net/ea/gui/partytab.cpp:55
msgid "/invite > Invite a player to your party"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:57
+#: src/net/ea/gui/partytab.cpp:56
msgid "/leave > Leave the party you are in"
msgstr ""
-#: 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 ""
-#: src/net/ea/gui/partytab.cpp:59
+#: src/net/ea/gui/partytab.cpp:58
msgid "/item > Show/change party item sharing options"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:60
+#: src/net/ea/gui/partytab.cpp:59
msgid "/exp > Show/change party experience sharing options"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:69
+#: src/net/ea/gui/partytab.cpp:68
msgid "Command: /new <party-name>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:70
+#: src/net/ea/gui/partytab.cpp:69
msgid "Command: /create <party-name>"
msgstr ""
-#: 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 ""
-#: src/net/ea/gui/partytab.cpp:75
+#: src/net/ea/gui/partytab.cpp:74
#, fuzzy
msgid "Command: /invite <nick>"
msgstr "Befehl: /whisper <Spitzname> <Nachricht>"
-#: src/net/ea/gui/partytab.cpp:82
+#: src/net/ea/gui/partytab.cpp:81
msgid "Command: /leave"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:83
+#: src/net/ea/gui/partytab.cpp:82
#, fuzzy
msgid "This command causes the player to leave the party."
msgstr "Dieser Befehl bereinigt den Chatlog des vorherigen Chats."
-#: src/net/ea/gui/partytab.cpp:87
+#: src/net/ea/gui/partytab.cpp:86
#, fuzzy
msgid "Command: /item <policy>"
msgstr "Befehl: /whisper <Spitzname> <Nachricht>"
-#: 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."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:92
+#: src/net/ea/gui/partytab.cpp:91
msgid "Command: /item"
msgstr ""
-#: 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
#, fuzzy
msgid "Command: /exp <policy>"
msgstr "Befehl: /whisper <Spitzname> <Nachricht>"
-#: 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."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:102
+#: src/net/ea/gui/partytab.cpp:101
msgid "Command: /exp"
msgstr ""
-#: 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]"
+msgid "You picked up %s [@@%d|%s@@]"
msgstr ""
-#: 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
#, fuzzy
msgid "Unregistered ID"
msgstr "Abmelden"
-#: src/net/ea/loginhandler.cpp:114
+#: src/net/ea/loginhandler.cpp:113
#, fuzzy
msgid "Wrong password"
msgstr "Kennwort ändern"
-#: src/net/ea/loginhandler.cpp:117
+#: src/net/ea/loginhandler.cpp:116
#, fuzzy
msgid "Account expired"
msgstr "Account: %s"
-#: src/net/ea/loginhandler.cpp:120
+#: src/net/ea/loginhandler.cpp:119
#, fuzzy
msgid "Rejected from server"
msgstr "Verbindung zum Server unterbrochen!"
-#: 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 ""
-#: 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"
" Please contact the GM team via the forums."
msgstr ""
-#: 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
#, fuzzy
msgid "Unknown error"
msgstr "Unbekannter Befehl"
-#: src/net/ea/partyhandler.cpp:78
-msgid "Party successfully created."
-msgstr ""
-
-#: src/net/ea/partyhandler.cpp:82
+#: src/net/ea/partyhandler.cpp:77
#, fuzzy
msgid "Could not create party."
msgstr "Kann der Gruppe nicht beitreten!"
-#: 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 ""
-#: src/net/ea/partyhandler.cpp:116
+#: src/net/ea/partyhandler.cpp:119
#, c-format
msgid "%s refused your invitation."
msgstr ""
-#: src/net/ea/partyhandler.cpp:120
+#: src/net/ea/partyhandler.cpp:123
#, c-format
msgid "%s is now a member of your party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:124
+#: src/net/ea/partyhandler.cpp:127
#, c-format
msgid "Unknown invite response for %s."
msgstr ""
-#: 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 ""
-#: src/net/ea/partyhandler.cpp:269
+#: src/net/ea/partyhandler.cpp:272
#, c-format
msgid "An unknown member tried to say: %s"
msgstr ""
-#: 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
#, fuzzy, c-format
msgid "%s is not in your party!"
msgstr "Kann der Gruppe nicht beitreten!"
-#: 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
#, fuzzy
msgid "You are not that alive anymore."
msgstr "Du kannst dies momentan nicht tun!"
-#: 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"
+#: 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 ""
-#: 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
#, fuzzy
msgid "You are no more."
msgstr "Keine Memos vorhanden!"
-#: src/net/ea/playerhandler.cpp:134
+#: src/net/ea/playerhandler.cpp:122
#, fuzzy
msgid "You have ceased to be."
msgstr "Keine Memos vorhanden!"
-#: src/net/ea/playerhandler.cpp:135
+#: src/net/ea/playerhandler.cpp:123
msgid "You've expired and gone to meet your maker."
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 ""
-#: 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 ""
@@ -2939,40 +2977,101 @@ msgstr ""
msgid "Willpower:"
msgstr "Willenskraft:"
-#: 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
#, fuzzy, c-format
msgid "Willpower: %d"
msgstr "Willenskraft:"
-#: 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
+#, fuzzy
+msgid "Server is full"
+msgstr "Server:"
+
+#: 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
+#, fuzzy
+msgid "New email address incorrect"
+msgstr "Email-Adresse ändern"
+
+#: src/net/tmwserv/loginhandler.cpp:143
+#, fuzzy
+msgid "Old email address incorrect"
+msgstr "Email-Adresse ändern"
+
+#: src/net/tmwserv/loginhandler.cpp:149
+#, fuzzy
+msgid "The new Email Address already exists."
+msgstr "Email-Adresse ändern"
+
+#: 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 "Kennwort ändern"
+
+#: src/net/tmwserv/loginhandler.cpp:211
+msgid "Wrong username, password or email address"
+msgstr ""
+
+#: src/net/tmwserv/loginhandler.cpp:214
+msgid "Username already exists"
+msgstr ""
+
+#: src/net/tmwserv/loginhandler.cpp:217
+msgid "Email address already exists"
+msgstr ""
+
+#: src/resources/itemdb.cpp:52
#, fuzzy, c-format
msgid "Attack %+d"
msgstr "Angriff:"
-#: src/resources/itemdb.cpp:54
+#: src/resources/itemdb.cpp:53
#, fuzzy, c-format
msgid "Defense %+d"
msgstr "Verteidigung:"
-#: 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 ""
-#: src/resources/itemdb.cpp:151
+#: src/resources/itemdb.cpp:150
msgid "Unnamed"
msgstr "Unbenannt"
@@ -2989,6 +3088,23 @@ msgstr ""
msgid "NPC Database: Error while loading npcs.xml!"
msgstr ""
+#~ msgid "MiniMap"
+#~ msgstr "Übersichtskarte"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "> Cancel\n"
+#~ msgstr "Abbrechen"
+
+#, fuzzy
+#~ msgid "use"
+#~ msgstr "Benutzen"
+
+#, fuzzy
+#~ msgid "Emote Window"
+#~ msgstr "Emote fehlgeschlagen!"
+
#~ msgid "Gold: %d"
#~ msgstr "Gold: %d"
diff --git a/po/en_GB.po b/po/en_GB.po
index 82db3684..533e1ce0 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-04-21 17:27+0200\n"
+"POT-Creation-Date: 2009-05-10 15:53+0200\n"
"PO-Revision-Date: 2008-05-10 16:51+0000\n"
"Last-Translator: Me <Glich.Glich@googlemail.com>\n"
"Language-Team: English (United Kingdom) <en_GB@li.org>\n"
@@ -17,286 +17,286 @@ msgstr ""
"X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
"X-Generator: Launchpad (build Unknown)\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."
+#: src/commandhandler.cpp:142
+msgid "/help > Display this help"
msgstr ""
-#: src/commandhandler.cpp:145
+#: src/commandhandler.cpp:144
msgid "/where > Display map name"
msgstr ""
-#: src/commandhandler.cpp:146
+#: src/commandhandler.cpp:145
msgid "/who > Display number of online users"
msgstr ""
-#: src/commandhandler.cpp:147
+#: src/commandhandler.cpp:146
msgid "/me > Tell something about yourself"
msgstr ""
-#: src/commandhandler.cpp:149
+#: src/commandhandler.cpp:148
msgid "/clear > Clears this window"
msgstr ""
-#: src/commandhandler.cpp:151
+#: src/commandhandler.cpp:150
msgid "/msg > Send a private message to a user"
msgstr ""
-#: src/commandhandler.cpp:152
+#: src/commandhandler.cpp:151
msgid "/whisper > Alias of msg"
msgstr ""
-#: src/commandhandler.cpp:153
+#: src/commandhandler.cpp:152
msgid "/w > Alias of msg"
msgstr ""
-#: src/commandhandler.cpp:154
+#: src/commandhandler.cpp:153
msgid "/query > Makes a tab for private messages with another user"
msgstr ""
-#: src/commandhandler.cpp:155
+#: src/commandhandler.cpp:154
msgid "/q > Alias of query"
msgstr ""
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:156
msgid "/list > Display all public channels"
msgstr ""
-#: src/commandhandler.cpp:158
+#: src/commandhandler.cpp:157
msgid "/join > Join or create a channel"
msgstr ""
-#: src/commandhandler.cpp:160
+#: src/commandhandler.cpp:159
msgid "/party > Invite a user to party"
msgstr ""
-#: src/commandhandler.cpp:162
+#: src/commandhandler.cpp:161
msgid "/record > Start recording the chat to an external file"
msgstr ""
-#: 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 ""
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:165
msgid "/announce > Global announcement (GM only)"
msgstr ""
-#: src/commandhandler.cpp:170
+#: src/commandhandler.cpp:169
msgid "For more information, type /help <command>"
msgstr ""
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:173
msgid "Command: /help"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: src/commandhandler.cpp:186
+#: src/commandhandler.cpp:185
msgid "*** only available to a GM ***"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: src/commandhandler.cpp:209
+#: src/commandhandler.cpp:208
msgid "This command tell others you are (doing) <msg>."
msgstr ""
-#: src/commandhandler.cpp:213
+#: src/commandhandler.cpp:212
msgid "Command: /msg <nick> <message>"
msgstr ""
-#: src/commandhandler.cpp:214
+#: src/commandhandler.cpp:213
msgid "Command: /whisper <nick> <message>"
msgstr ""
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:214
msgid "Command: /w <nick> <message>"
msgstr ""
-#: src/commandhandler.cpp:216
+#: src/commandhandler.cpp:215
msgid "This command sends the text <message> to <nick>."
msgstr ""
-#: 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 ""
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:222
msgid "Command: /q <nick>"
msgstr ""
-#: src/commandhandler.cpp:224
+#: src/commandhandler.cpp:223
msgid "This command tries to make a tab for whispers betweenyou and <nick>."
msgstr ""
-#: src/commandhandler.cpp:229
+#: src/commandhandler.cpp:228
msgid "Command: /party <nick>"
msgstr ""
-#: 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 ""
-#: src/commandhandler.cpp:236
+#: src/commandhandler.cpp:235
msgid "Command: /present"
msgstr ""
-#: 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 ""
-#: src/commandhandler.cpp:244
+#: src/commandhandler.cpp:243
msgid "This command starts recording the chat log to the file <filename>."
msgstr ""
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:245
msgid "Command: /record"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: src/commandhandler.cpp:257
+#: src/commandhandler.cpp:256
msgid "Command: /toggle"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: src/commandhandler.cpp:336
-msgid "Cannont send empty whispers!"
+#: 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 ""
-#: 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 ""
@@ -305,46 +305,46 @@ msgstr ""
msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
msgstr ""
-#: 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"
+#: src/game.cpp:481
+msgid "The connection to the server was lost, the program will now quit"
msgstr ""
-#: src/game.cpp:493
-msgid "The connection to the server was lost, the program will now quit"
+#: src/game.cpp:487
+msgid "Network Error"
msgstr ""
-#: src/game.cpp:664 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
+#: 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 "Exit"
-#: src/game.cpp:665
+#: src/game.cpp:647
#, fuzzy
msgid "Are you sure you want to quit?"
msgstr "Are you sure you want to delete this character?"
-#: 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 ""
@@ -357,12 +357,12 @@ msgstr "Buy"
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 "Buy"
#: 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
#, fuzzy, c-format
msgid "Price: %s / Total: %s"
msgstr "Price: %d GP / Total: %d GP"
@@ -372,13 +372,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 "Description: %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 "Effect: %s"
@@ -388,205 +388,213 @@ msgstr "Effect: %s"
msgid "Shop"
msgstr "Stop"
-#: 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 "Sell"
-#: 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 "Cancel"
-#: 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 ""
-#: 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
#, fuzzy
msgid "Change Password"
msgstr "Password:"
-#: 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 "Password:"
-#: 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 "Create Character"
-#: 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 "Name:"
-#: src/gui/charcreatedialog.cpp:70
+#: src/gui/charcreatedialog.cpp:69
msgid "Hair Color:"
msgstr "Hair Colour:"
-#: src/gui/charcreatedialog.cpp:73
+#: src/gui/charcreatedialog.cpp:72
msgid "Hair Style:"
msgstr "Hair Style:"
-#: src/gui/charcreatedialog.cpp:74
+#: src/gui/charcreatedialog.cpp:73
msgid "Create"
msgstr "Create"
-#: 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 "Please distribute %d points"
-#: 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 "Error"
-#: src/gui/charcreatedialog.cpp:174
+#: src/gui/charcreatedialog.cpp:173
msgid "Your name needs to be at least 4 characters."
msgstr "Your name needs to be at least 4 characters."
-#: src/gui/charcreatedialog.cpp:227
+#: src/gui/charcreatedialog.cpp:226
msgid "Character stats OK"
msgstr "Character stats OK"
-#: src/gui/charcreatedialog.cpp:239
+#: src/gui/charcreatedialog.cpp:238
#, c-format
msgid "Please remove %d points"
msgstr "Please remove %d points"
-#: 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 "Are you sure you want to delete this character?"
-#: 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 "Select Character"
-#: 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 "Ok"
-#: src/gui/char_select.cpp:113
+#: src/gui/charselectdialog.cpp:112
msgid "Previous"
msgstr "Previous"
-#: 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 "Next"
-#: 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 "Name: %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 "Level: %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 "New"
-#: 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 "Delete"
-#: src/gui/char_select.cpp:120 src/gui/unregisterdialog.cpp:51
+#: src/gui/charselectdialog.cpp:119 src/gui/unregisterdialog.cpp:52
msgid "Unregister"
msgstr "Unregister"
-#: src/gui/char_select.cpp:127
+#: src/gui/charselectdialog.cpp:126
#, c-format
msgid "Money: %d"
msgstr "Money: %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
#, fuzzy, c-format
msgid "Job Level: %d"
msgstr "Level: %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
#, fuzzy, c-format
msgid "Money: %s"
msgstr "Money: %d"
-#: 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
#, fuzzy
msgid "Chat"
msgstr "Create"
-#: src/gui/chat.cpp:341 src/gui/chat.cpp:347
+#: src/gui/chat.cpp:332
+#, c-format
+msgid "%d players are present."
+msgstr ""
+
+#: 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 ""
-#: src/gui/confirm_dialog.cpp:42
+#: src/gui/confirmdialog.cpp:42
msgid "Yes"
msgstr "Yes"
-#: src/gui/confirm_dialog.cpp:43
+#: src/gui/confirmdialog.cpp:43
msgid "No"
msgstr "No"
@@ -594,26 +602,16 @@ msgstr "No"
msgid "Connecting..."
msgstr "Connecting..."
-#: src/gui/emotecontainer.cpp:61
+#: src/gui/emotepopup.cpp:64
msgid "Unable to load selection.png"
msgstr ""
-#: 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 "Use"
-
-#: src/gui/equipmentwindow.cpp:68 src/gui/menuwindow.cpp:67
+#: src/gui/equipmentwindow.cpp:68 src/gui/windowmenu.cpp:60
msgid "Equipment"
msgstr "Equipment"
-#: 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 "Unequip"
@@ -638,100 +636,103 @@ 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 "Inventory"
-#: 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 "Equip"
-#: 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 "Use"
+
+#: src/gui/inventorywindow.cpp:80
msgid "Drop"
msgstr "Drop"
-#: src/gui/inventorywindow.cpp:79
+#: src/gui/inventorywindow.cpp:81
msgid "Split"
msgstr "Split"
-#: 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 "Select amount of items to trade."
-#: src/gui/item_amount.cpp:95
+#: src/gui/itemamount.cpp:124
msgid "Select amount of items to drop."
msgstr "Select amount of items to drop."
-#: src/gui/item_amount.cpp:98
+#: src/gui/itemamount.cpp:127
#, fuzzy
msgid "Select amount of items to store."
msgstr "Select amount of items to trade."
-#: src/gui/item_amount.cpp:101
+#: src/gui/itemamount.cpp:130
#, fuzzy
msgid "Select amount of items to retrieve."
msgstr "Select amount of items to trade."
-#: src/gui/item_amount.cpp:104
+#: src/gui/itemamount.cpp:133
msgid "Select amount of items to split."
msgstr "Select amount of items to split."
-#: 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 "Login"
-#: 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 "Server:"
-#: 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:"
-#: src/gui/login.cpp:55
+#: src/gui/login.cpp:56
#, fuzzy
msgid "Recent:"
msgstr "Register"
-#: 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 "Register"
-#: 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 ""
@@ -747,71 +748,44 @@ msgstr ""
msgid "Cast Test Spell 3"
msgstr ""
-#: src/gui/menuwindow.cpp:66
-msgid "Status"
-msgstr "Status"
-
-#: src/gui/menuwindow.cpp:69 src/gui/skill.cpp:126 src/gui/skilldialog.cpp:99
-msgid "Skills"
-msgstr "Skills"
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
+#, fuzzy
+msgid "Map"
+msgstr "MiniMap"
-#: src/gui/menuwindow.cpp:72
-msgid "Guilds"
+#: src/gui/npcdialog.cpp:43
+msgid "Waiting for server"
msgstr ""
-#: src/gui/menuwindow.cpp:73
+#: src/gui/npcdialog.cpp:46
#, fuzzy
-msgid "Buddys"
-msgstr "Buy"
-
-#: src/gui/menuwindow.cpp:75
-msgid "Shortcut"
-msgstr "Shortcut"
+msgid "Submit"
+msgstr "Split"
-#: src/gui/menuwindow.cpp:77 src/gui/setup.cpp:65 src/main.cpp:920
-msgid "Setup"
-msgstr "Setup"
+#: src/gui/npcdialog.cpp:49 src/gui/npcpostdialog.cpp:39
+msgid "NPC"
+msgstr "NPC"
-#: src/gui/minimap.cpp:39
-msgid "MiniMap"
-msgstr "MiniMap"
+#: src/gui/npcdialog.cpp:95
+msgid "+"
+msgstr ""
-#: src/gui/npcintegerdialog.cpp:39
-msgid "NPC Number Request"
+#: src/gui/npcdialog.cpp:96
+msgid "-"
msgstr ""
-#: src/gui/npcintegerdialog.cpp:50
+#: src/gui/npcdialog.cpp:105
#, fuzzy
msgid "Reset"
msgstr "Register"
-#: src/gui/npcintegerdialog.cpp:101 src/gui/npclistdialog.cpp:123
-#: src/gui/npcstringdialog.cpp:75
-#, fuzzy
-msgid ""
-"\n"
-"> Cancel\n"
-msgstr "Cancel"
-
-#: src/gui/npcpostdialog.cpp:39 src/gui/npc_text.cpp:37
-msgid "NPC"
-msgstr "NPC"
-
#: src/gui/npcpostdialog.cpp:51
#, fuzzy
msgid "Send"
msgstr "Sound"
-#: src/gui/npcstringdialog.cpp:39
-msgid "NPC Text Request"
-msgstr ""
-
-#: 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
#, fuzzy
msgid "Text"
msgstr "Next"
@@ -866,7 +840,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
#, fuzzy
msgid "Party"
msgstr "Port:"
@@ -889,7 +863,7 @@ msgid "Being"
msgstr ""
#: src/gui/palette.cpp:104
-msgid "Other Player's Names"
+msgid "Other Players' Names"
msgstr ""
#: src/gui/palette.cpp:105
@@ -916,21 +890,22 @@ msgid "Unknown Item Type"
msgstr ""
#: src/gui/palette.cpp:111
-msgid "Generic"
+msgid "Generics"
msgstr ""
#: src/gui/palette.cpp:112
-msgid "Hat"
-msgstr ""
+#, fuzzy
+msgid "Hats"
+msgstr "Status"
#: src/gui/palette.cpp:113
#, fuzzy
-msgid "Usable"
+msgid "Usables"
msgstr "Use"
#: src/gui/palette.cpp:114
#, fuzzy
-msgid "Shirt"
+msgid "Shirts"
msgstr "Shortcut"
#: src/gui/palette.cpp:115
@@ -953,15 +928,15 @@ msgstr ""
#: src/gui/palette.cpp:119
#, fuzzy
-msgid "Shield"
+msgid "Shields"
msgstr "Sell"
#: src/gui/palette.cpp:120
-msgid "Ring"
+msgid "Rings"
msgstr ""
#: src/gui/palette.cpp:121
-msgid "Necklace"
+msgid "Necklaces"
msgstr ""
#: src/gui/palette.cpp:122
@@ -1017,95 +992,104 @@ msgstr ""
msgid "1/4 HP Bar"
msgstr ""
-#: src/gui/popupmenu.cpp:73
+#: src/gui/popupmenu.cpp:75
msgid "@@name|Add name to chat@@"
msgstr ""
-#: src/gui/popupmenu.cpp:85
+#: src/gui/popupmenu.cpp:87
#, c-format
msgid "@@trade|Trade With %s@@"
msgstr "@@trade|Trade With %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 "@@attack|Attack %s@@"
-#: src/gui/popupmenu.cpp:92
+#: src/gui/popupmenu.cpp:94
#, c-format
msgid "@@friend|Befriend %s@@"
msgstr ""
-#: 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 ""
-#: src/gui/popupmenu.cpp:112
+#: src/gui/popupmenu.cpp:114
#, c-format
msgid "@@party|Invite %s to join your party@@"
msgstr ""
-#: src/gui/popupmenu.cpp:123
+#: src/gui/popupmenu.cpp:125
#, fuzzy, c-format
msgid "@@talk|Talk To %s@@"
msgstr "@@talk|Talk To NPC@@"
-#: 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 "@@cancel|Cancel@@"
-#: src/gui/popupmenu.cpp:155
-#, c-format
-msgid "@@pickup|Pick Up %s@@"
+#: src/gui/popupmenu.cpp:157
+#, fuzzy, c-format
+msgid "@@pickup|Pick up %s@@"
msgstr "@@pickup|Pick Up %s@@"
-#: src/gui/popupmenu.cpp:156 src/gui/popupmenu.cpp:352
-msgid "@@chat|Add to Chat@@"
+#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:373
+msgid "@@chat|Add to chat@@"
msgstr ""
-#: src/gui/popupmenu.cpp:336 src/gui/popupmenu.cpp:341
-msgid "@@use|Equip@@"
-msgstr "@@use|Equip@@"
-
-#: src/gui/popupmenu.cpp:339
+#: src/gui/popupmenu.cpp:348
#, fuzzy
msgid "@@use|Unequip@@"
msgstr "@@use|Equip@@"
-#: src/gui/popupmenu.cpp:345
+#: src/gui/popupmenu.cpp:350
+msgid "@@use|Equip@@"
+msgstr "@@use|Equip@@"
+
+#: src/gui/popupmenu.cpp:353
msgid "@@use|Use@@"
msgstr "@@use|Use@@"
-#: src/gui/popupmenu.cpp:347
+#: src/gui/popupmenu.cpp:355
msgid "@@drop|Drop@@"
msgstr "@@drop|Drop@@"
-#: src/gui/popupmenu.cpp:350
+#: src/gui/popupmenu.cpp:359
msgid "@@split|Split@@"
msgstr "@@split|Split@@"
+#: src/gui/popupmenu.cpp:364
+#, fuzzy
+msgid "@@store|Store@@"
+msgstr "@@use|Use@@"
+
+#: src/gui/popupmenu.cpp:371
+msgid "@@retrieve|Retrieve@@"
+msgstr ""
+
#: src/gui/quitdialog.cpp:37
msgid "Switch server"
msgstr "Switch server"
@@ -1175,20 +1159,32 @@ msgstr "The password needs to be less than %d characters long."
msgid "Passwords do not match."
msgstr "Passwords do not match."
-#: src/gui/serverdialog.cpp:73
+#: src/gui/serverdialog.cpp:74
#, fuzzy
msgid "Choose your server"
msgstr "Choose your Mana World Server"
-#: src/gui/serverdialog.cpp:163
+#: src/gui/serverdialog.cpp:164
msgid "Please type both the address and the port of a server."
msgstr "Please type both the address and the port of a server."
-#: src/gui/serverselectdialog.cpp:50
+#: src/gui/serverselectdialog.cpp:59
#, fuzzy
msgid "Select Server"
msgstr "Select Character"
+#: src/gui/setup.cpp:64 src/gui/windowmenu.cpp:69 src/main.cpp:933
+msgid "Setup"
+msgstr "Setup"
+
+#: src/gui/setup.cpp:72
+msgid "Apply"
+msgstr "Apply"
+
+#: src/gui/setup.cpp:72
+msgid "Reset Windows"
+msgstr "Reset Windows"
+
#: src/gui/setup_audio.cpp:41
msgid "Sound"
msgstr "Sound"
@@ -1205,11 +1201,11 @@ msgstr "Sfx volume"
msgid "Music volume"
msgstr "Music volume"
-#: 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 ""
@@ -1217,23 +1213,23 @@ 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
#, fuzzy
msgid "Static"
msgstr "Status"
#: 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 ""
#: 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
#, fuzzy
msgid "Spectrum"
msgstr "Setup"
@@ -1242,26 +1238,18 @@ msgstr "Setup"
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 "Apply"
-
-#: src/gui/setup.cpp:73
-msgid "Reset Windows"
-msgstr "Reset Windows"
-
#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:78
msgid "Press the button to start calibration"
msgstr "Press the button to start calibration"
@@ -1332,7 +1320,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 ""
@@ -1360,156 +1348,177 @@ 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
+#, fuzzy
+msgid "Small"
+msgstr "Sell"
+
+#: 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 "Full screen"
-#: 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 "Custom cursor"
-#: 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 ""
-#: src/gui/setup_video.cpp:136
+#: src/gui/setup_video.cpp:167
msgid "FPS Limit:"
msgstr "FPS Limit:"
-#: src/gui/setup_video.cpp:152
+#: src/gui/setup_video.cpp:184
msgid "Video"
msgstr "Video"
-#: 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 opacity"
-#: src/gui/setup_video.cpp:159
+#: src/gui/setup_video.cpp:191
msgid "Scroll radius"
msgstr "Scroll radius"
-#: src/gui/setup_video.cpp:160
+#: src/gui/setup_video.cpp:192
msgid "Scroll laziness"
msgstr "Scroll laziness"
-#: 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
#, fuzzy
msgid "No text"
msgstr "Next"
-#: 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 ""
-#: 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 ""
-#: 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 "off"
-#: 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 "low"
-#: 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 "high"
-#: 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
#, fuzzy
msgid "fullscreen"
msgstr "Full screen"
-#: 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 "Switching to full screen"
-#: src/gui/setup_video.cpp:352
+#: src/gui/setup_video.cpp:422
msgid "Restart needed for changes to take effect."
msgstr "Restart needed for changes to take effect."
-#: src/gui/setup_video.cpp:364
+#: src/gui/setup_video.cpp:434
msgid "Changing OpenGL"
msgstr "Changing OpenGL"
-#: src/gui/setup_video.cpp:365
+#: src/gui/setup_video.cpp:435
msgid "Applying change to OpenGL requires restart."
msgstr "Applying change to OpenGL requires restart."
-#: 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
#, fuzzy
msgid "Restart your client for the change to take effect."
msgstr "Restart needed for changes to take effect."
-#: 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 ""
@@ -1522,6 +1531,10 @@ msgstr "Skills"
msgid "Mystery Skill"
msgstr ""
+#: src/gui/skill.cpp:126 src/gui/skilldialog.cpp:99 src/gui/windowmenu.cpp:62
+msgid "Skills"
+msgstr "Skills"
+
#: src/gui/skill.cpp:145 src/gui/skill.cpp:197
#, c-format
msgid "Skill points: %d"
@@ -1531,15 +1544,6 @@ msgstr ""
msgid "Up"
msgstr ""
-#: src/gui/skill.cpp:146
-msgid "inc"
-msgstr ""
-
-#: src/gui/skill.cpp:147
-#, fuzzy
-msgid "use"
-msgstr "Use"
-
#: src/gui/skilldialog.cpp:113
msgid "Weapons"
msgstr ""
@@ -1549,179 +1553,179 @@ msgstr ""
msgid "Crafts"
msgstr "Create"
-#: src/gui/status.cpp:57 src/gui/status.cpp:178
+#: src/gui/status.cpp:56 src/gui/status.cpp:177
#, fuzzy, c-format
msgid "Job: %d"
msgstr "Level: %d"
-#: src/gui/status.cpp:61
+#: src/gui/status.cpp:60
msgid "HP:"
msgstr ""
-#: src/gui/status.cpp:64
+#: src/gui/status.cpp:63
msgid "Exp:"
msgstr ""
-#: src/gui/status.cpp:67
+#: src/gui/status.cpp:66
msgid "MP:"
msgstr ""
-#: src/gui/status.cpp:70
+#: src/gui/status.cpp:69
#, fuzzy
msgid "Job:"
msgstr "Level: %d"
-#: src/gui/status.cpp:78
+#: src/gui/status.cpp:77
#, fuzzy
msgid "Stats"
msgstr "Status"
-#: 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
#, fuzzy
msgid "Attack:"
msgstr "Attack %+d"
-#: src/gui/status.cpp:85
+#: src/gui/status.cpp:84
#, fuzzy
msgid "Defense:"
msgstr "Defense %+d"
-#: src/gui/status.cpp:86
+#: src/gui/status.cpp:85
#, fuzzy
msgid "M.Attack:"
msgstr "Attack %+d"
-#: src/gui/status.cpp:87
+#: src/gui/status.cpp:86
#, fuzzy
msgid "M.Defense:"
msgstr "Defense %+d"
-#: src/gui/status.cpp:89
+#: src/gui/status.cpp:88
#, no-c-format
msgid "% Accuracy:"
msgstr ""
-#: src/gui/status.cpp:91
+#: src/gui/status.cpp:90
#, no-c-format
msgid "% Evade:"
msgstr ""
-#: 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
#, fuzzy
msgid "Strength"
msgstr "Strength:"
-#: src/gui/status.cpp:200
+#: src/gui/status.cpp:199
#, fuzzy
msgid "Agility"
msgstr "Agility:"
-#: src/gui/status.cpp:201
+#: src/gui/status.cpp:200
#, fuzzy
msgid "Vitality"
msgstr "Vitality:"
-#: src/gui/status.cpp:202
+#: src/gui/status.cpp:201
#, fuzzy
msgid "Intelligence"
msgstr "Intelligence:"
-#: src/gui/status.cpp:203
+#: src/gui/status.cpp:202
#, fuzzy
msgid "Dexterity"
msgstr "Dexterity:"
-#: 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 ""
-#: 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
#, fuzzy
msgid "Store"
msgstr "Stop"
-#: 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 "Propose trade"
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:52
#, fuzzy
msgid "Confirmed. Waiting..."
msgstr "Connecting..."
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:53
#, fuzzy
msgid "Agree trade"
msgstr "Propose trade"
-#: 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 "Add"
-#: 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
#, fuzzy, c-format
msgid "You get %s."
msgstr "You get %d GP."
-#: src/gui/trade.cpp:97
+#: src/gui/trade.cpp:96
msgid "You give:"
msgstr "You give:"
-#: src/gui/trade.cpp:101
+#: src/gui/trade.cpp:100
msgid "Change"
msgstr "Change"
-#: 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 ""
@@ -1833,21 +1837,21 @@ msgstr ""
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 ""
-#: src/gui/widgets/chattab.cpp:147
+#: src/gui/widgets/chattab.cpp:146
#, c-format
msgid "%s whispers: "
msgstr ""
-#: 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 ""
@@ -1855,23 +1859,35 @@ msgstr ""
msgid "Cannot send empty chat!"
msgstr ""
-#: src/gui/widgets/whispertab.cpp:55
-#, c-format
-msgid "%s: %s"
-msgstr ""
-
-#: src/gui/widgets/whispertab.cpp:69
+#: src/gui/widgets/whispertab.cpp:68
msgid "/close > Close the whisper tab"
msgstr ""
-#: src/gui/widgets/whispertab.cpp:79
+#: src/gui/widgets/whispertab.cpp:78
msgid "Command: /close"
msgstr ""
-#: 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 "Status"
+
+#: src/gui/windowmenu.cpp:65
+msgid "Guilds"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:66
+#, fuzzy
+msgid "Buddys"
+msgstr "Buy"
+
+#: src/gui/windowmenu.cpp:68
+msgid "Shortcut"
+msgstr "Shortcut"
+
#: src/keyboardconfig.cpp:41
msgid "Move Up"
msgstr ""
@@ -2003,7 +2019,7 @@ msgstr "Reset Windows"
#: src/keyboardconfig.cpp:80
#, fuzzy
-msgid "Emote Window"
+msgid "Party Window"
msgstr "Reset Windows"
#: src/keyboardconfig.cpp:81
@@ -2054,166 +2070,170 @@ msgstr ""
msgid "Ignore input 2"
msgstr ""
-#: 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
#, fuzzy
msgid "Sword"
msgstr "Sound"
-#: src/localplayer.cpp:852
+#: src/localplayer.cpp:837
msgid "Polearm"
msgstr ""
-#: src/localplayer.cpp:853
+#: src/localplayer.cpp:838
#, fuzzy
msgid "Staff"
msgstr "Status"
-#: src/localplayer.cpp:854
+#: src/localplayer.cpp:839
msgid "Whip"
msgstr ""
-#: src/localplayer.cpp:855
+#: src/localplayer.cpp:840
#, fuzzy
msgid "Bow"
msgstr "low"
-#: src/localplayer.cpp:856
+#: src/localplayer.cpp:841
msgid "Shooting"
msgstr ""
-#: src/localplayer.cpp:857
+#: src/localplayer.cpp:842
#, fuzzy
msgid "Mace"
msgstr "Cancel"
-#: 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
#, fuzzy
msgid "Craft"
msgstr "Create"
-#: 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 ""
-#: src/main.cpp:563
-msgid "Options: "
-msgstr ""
-
-#: src/main.cpp:564
-msgid " -C --configfile : Configuration file to use"
-msgstr ""
-
-#: src/main.cpp:565
-msgid " -d --data : Directory to load game data from"
-msgstr ""
-
-#: src/main.cpp:566
-msgid " -D --default : Bypass the login process with default settings"
+#: src/main.cpp:567
+msgid "Options:"
msgstr ""
#: src/main.cpp:568
-msgid " -h --help : Display this help"
+msgid " -C --config-file : Configuration file to use"
msgstr ""
#: src/main.cpp:569
-msgid " -S --homedir : Directory to use as home directory"
+msgid " -d --data : Directory to load game data from"
msgstr ""
#: src/main.cpp:570
-msgid " -H --updatehost : Use this update host"
-msgstr ""
-
-#: src/main.cpp:571
-msgid " -P --password : Login with this password"
+msgid " -D --default : Choose default character server and character"
msgstr ""
#: src/main.cpp:572
-msgid " -c --character : Login with this character"
+msgid " -h --help : Display this help"
msgstr ""
#: src/main.cpp:573
-msgid " -o --port : Login Server Port"
+msgid " -S --home-dir : Directory to use as home directory"
msgstr ""
#: src/main.cpp:574
-msgid " -s --server : Login Server name or IP"
+msgid " -H --update-host : Use this update host"
msgstr ""
#: src/main.cpp:575
-msgid " -u --skipupdate : Skip the update downloads"
+msgid " -P --password : Login with this password"
msgstr ""
#: src/main.cpp:576
-msgid " -U --username : Login with this username"
+msgid " -c --character : Login with this character"
msgstr ""
#: src/main.cpp:577
-msgid " -v --version : Display the version"
+msgid " -p --port : Login Server Port"
+msgstr ""
+
+#: src/main.cpp:578
+msgid " -s --server : Login Server name or IP"
+msgstr ""
+
+#: src/main.cpp:579
+msgid " -u --skip-update : Skip the update downloads"
+msgstr ""
+
+#: src/main.cpp:580
+msgid " -U --username : Login with this username"
msgstr ""
#: src/main.cpp:582
+msgid " -O --no-opengl : Disable OpenGL for this session"
+msgstr ""
+
+#: src/main.cpp:584
+msgid " -v --version : Display the version"
+msgstr ""
+
+#: src/main.cpp:589
#, fuzzy
msgid "The Mana World "
msgstr "Choose your Mana World Server"
-#: src/main.cpp:1499
+#: src/main.cpp:1515
#, fuzzy
msgid "Connecting to map server..."
msgstr "Connecting..."
-#: 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 ""
@@ -2300,18 +2320,18 @@ msgstr "Dexterity:"
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 ""
@@ -2324,416 +2344,430 @@ msgstr "Unequip"
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
#, fuzzy, c-format
msgid "Strength: %d"
msgstr "Strength:"
-#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:82
+#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:84
#, fuzzy, c-format
msgid "Agility: %d"
msgstr "Agility:"
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:86
+#: src/net/ea/generalhandler.cpp:96 src/net/tmwserv/generalhandler.cpp:88
#, fuzzy, c-format
msgid "Vitality: %d"
msgstr "Vitality:"
-#: src/net/ea/generalhandler.cpp:96 src/net/tmwserv/generalhandler.cpp:88
+#: src/net/ea/generalhandler.cpp:98 src/net/tmwserv/generalhandler.cpp:90
#, fuzzy, c-format
msgid "Intelligence: %d"
msgstr "Intelligence:"
-#: src/net/ea/generalhandler.cpp:98 src/net/tmwserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:100 src/net/tmwserv/generalhandler.cpp:86
#, fuzzy, c-format
msgid "Dexterity: %d"
msgstr "Dexterity:"
-#: src/net/ea/generalhandler.cpp:100
+#: src/net/ea/generalhandler.cpp:102
#, c-format
msgid "Luck: %d"
msgstr ""
-#: 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 ""
-#: 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 ""
+
+#: src/net/ea/gui/partytab.cpp:53
msgid "/create > Create a new party"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:55
+#: src/net/ea/gui/partytab.cpp:54
msgid "/new > Alias of create"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:56
+#: src/net/ea/gui/partytab.cpp:55
msgid "/invite > Invite a player to your party"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:57
+#: src/net/ea/gui/partytab.cpp:56
msgid "/leave > Leave the party you are in"
msgstr ""
-#: 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 ""
-#: src/net/ea/gui/partytab.cpp:59
+#: src/net/ea/gui/partytab.cpp:58
msgid "/item > Show/change party item sharing options"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:60
+#: src/net/ea/gui/partytab.cpp:59
msgid "/exp > Show/change party experience sharing options"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:69
+#: src/net/ea/gui/partytab.cpp:68
msgid "Command: /new <party-name>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:70
+#: src/net/ea/gui/partytab.cpp:69
msgid "Command: /create <party-name>"
msgstr ""
-#: 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 ""
-#: src/net/ea/gui/partytab.cpp:75
+#: src/net/ea/gui/partytab.cpp:74
msgid "Command: /invite <nick>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:82
+#: src/net/ea/gui/partytab.cpp:81
msgid "Command: /leave"
msgstr ""
-#: 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 ""
-#: 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."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:92
+#: src/net/ea/gui/partytab.cpp:91
msgid "Command: /item"
msgstr ""
-#: 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 ""
-#: 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."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:102
+#: src/net/ea/gui/partytab.cpp:101
msgid "Command: /exp"
msgstr ""
-#: 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]"
+msgid "You picked up %s [@@%d|%s@@]"
msgstr ""
-#: 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
#, fuzzy
msgid "Unregistered ID"
msgstr "Unregister"
-#: src/net/ea/loginhandler.cpp:114
+#: src/net/ea/loginhandler.cpp:113
#, fuzzy
msgid "Wrong password"
msgstr "Password:"
-#: 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
#, fuzzy
msgid "Rejected from server"
msgstr "Select Character"
-#: 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 ""
-#: 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"
" Please contact the GM team via the forums."
msgstr ""
-#: 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."
+#: src/net/ea/partyhandler.cpp:77
+msgid "Could not create party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:82
-msgid "Could not create party."
+#: src/net/ea/partyhandler.cpp:80
+msgid "Party successfully created."
msgstr ""
-#: src/net/ea/partyhandler.cpp:112
+#: src/net/ea/partyhandler.cpp:115
#, c-format
msgid "%s is already a member of a party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:116
+#: src/net/ea/partyhandler.cpp:119
#, c-format
msgid "%s refused your invitation."
msgstr ""
-#: src/net/ea/partyhandler.cpp:120
+#: src/net/ea/partyhandler.cpp:123
#, c-format
msgid "%s is now a member of your party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:124
+#: src/net/ea/partyhandler.cpp:127
#, c-format
msgid "Unknown invite response for %s."
msgstr ""
-#: 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 ""
-#: src/net/ea/partyhandler.cpp:269
+#: src/net/ea/partyhandler.cpp:272
#, c-format
msgid "An unknown member tried to say: %s"
msgstr ""
-#: 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 ""
-#: 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"
+#: 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 ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
@@ -2891,40 +2925,98 @@ msgstr ""
msgid "Willpower:"
msgstr "Willpower:"
-#: 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
#, fuzzy, c-format
msgid "Willpower: %d"
msgstr "Willpower:"
-#: 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
+#, fuzzy
+msgid "Server is full"
+msgstr "Server:"
+
+#: 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 ""
+
+#: src/net/tmwserv/loginhandler.cpp:143
+msgid "Old email address incorrect"
+msgstr ""
+
+#: src/net/tmwserv/loginhandler.cpp:149
+msgid "The new Email Address already exists."
+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 "Password:"
+
+#: src/net/tmwserv/loginhandler.cpp:211
+msgid "Wrong username, password or email address"
+msgstr ""
+
+#: src/net/tmwserv/loginhandler.cpp:214
+msgid "Username already exists"
+msgstr ""
+
+#: src/net/tmwserv/loginhandler.cpp:217
+msgid "Email address already exists"
+msgstr ""
+
+#: src/resources/itemdb.cpp:52
#, fuzzy, c-format
msgid "Attack %+d"
msgstr "Attack %+d"
-#: src/resources/itemdb.cpp:54
+#: src/resources/itemdb.cpp:53
#, fuzzy, c-format
msgid "Defense %+d"
msgstr "Defense %+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 ""
-#: src/resources/itemdb.cpp:151
+#: src/resources/itemdb.cpp:150
msgid "Unnamed"
msgstr ""
@@ -2940,6 +3032,20 @@ msgstr ""
msgid "NPC Database: Error while loading npcs.xml!"
msgstr ""
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "> Cancel\n"
+#~ msgstr "Cancel"
+
+#, fuzzy
+#~ msgid "use"
+#~ msgstr "Use"
+
+#, fuzzy
+#~ msgid "Emote Window"
+#~ msgstr "Reset Windows"
+
#~ msgid "@@description|Description@@"
#~ msgstr "@@description|Description@@"
diff --git a/po/eo.po b/po/eo.po
index 573834cb..102922e1 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-04-21 17:27+0200\n"
+"POT-Creation-Date: 2009-05-10 15:53+0200\n"
"PO-Revision-Date: 2008-11-10 22:03+0000\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Esperanto <eo@li.org>\n"
@@ -17,286 +17,286 @@ msgstr ""
"X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
"X-Generator: Launchpad (build Unknown)\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."
+#: src/commandhandler.cpp:142
+msgid "/help > Display this help"
msgstr ""
-#: src/commandhandler.cpp:145
+#: src/commandhandler.cpp:144
msgid "/where > Display map name"
msgstr ""
-#: src/commandhandler.cpp:146
+#: src/commandhandler.cpp:145
msgid "/who > Display number of online users"
msgstr ""
-#: src/commandhandler.cpp:147
+#: src/commandhandler.cpp:146
msgid "/me > Tell something about yourself"
msgstr ""
-#: src/commandhandler.cpp:149
+#: src/commandhandler.cpp:148
msgid "/clear > Clears this window"
msgstr ""
-#: src/commandhandler.cpp:151
+#: src/commandhandler.cpp:150
msgid "/msg > Send a private message to a user"
msgstr ""
-#: src/commandhandler.cpp:152
+#: src/commandhandler.cpp:151
msgid "/whisper > Alias of msg"
msgstr ""
-#: src/commandhandler.cpp:153
+#: src/commandhandler.cpp:152
msgid "/w > Alias of msg"
msgstr ""
-#: src/commandhandler.cpp:154
+#: src/commandhandler.cpp:153
msgid "/query > Makes a tab for private messages with another user"
msgstr ""
-#: src/commandhandler.cpp:155
+#: src/commandhandler.cpp:154
msgid "/q > Alias of query"
msgstr ""
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:156
msgid "/list > Display all public channels"
msgstr ""
-#: src/commandhandler.cpp:158
+#: src/commandhandler.cpp:157
msgid "/join > Join or create a channel"
msgstr ""
-#: src/commandhandler.cpp:160
+#: src/commandhandler.cpp:159
msgid "/party > Invite a user to party"
msgstr ""
-#: src/commandhandler.cpp:162
+#: src/commandhandler.cpp:161
msgid "/record > Start recording the chat to an external file"
msgstr ""
-#: 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 ""
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:165
msgid "/announce > Global announcement (GM only)"
msgstr ""
-#: src/commandhandler.cpp:170
+#: src/commandhandler.cpp:169
msgid "For more information, type /help <command>"
msgstr ""
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:173
msgid "Command: /help"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: src/commandhandler.cpp:186
+#: src/commandhandler.cpp:185
msgid "*** only available to a GM ***"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: src/commandhandler.cpp:209
+#: src/commandhandler.cpp:208
msgid "This command tell others you are (doing) <msg>."
msgstr ""
-#: src/commandhandler.cpp:213
+#: src/commandhandler.cpp:212
msgid "Command: /msg <nick> <message>"
msgstr ""
-#: src/commandhandler.cpp:214
+#: src/commandhandler.cpp:213
msgid "Command: /whisper <nick> <message>"
msgstr ""
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:214
msgid "Command: /w <nick> <message>"
msgstr ""
-#: src/commandhandler.cpp:216
+#: src/commandhandler.cpp:215
msgid "This command sends the text <message> to <nick>."
msgstr ""
-#: 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 ""
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:222
msgid "Command: /q <nick>"
msgstr ""
-#: src/commandhandler.cpp:224
+#: src/commandhandler.cpp:223
msgid "This command tries to make a tab for whispers betweenyou and <nick>."
msgstr ""
-#: src/commandhandler.cpp:229
+#: src/commandhandler.cpp:228
msgid "Command: /party <nick>"
msgstr ""
-#: 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 ""
-#: src/commandhandler.cpp:236
+#: src/commandhandler.cpp:235
msgid "Command: /present"
msgstr ""
-#: 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 ""
-#: src/commandhandler.cpp:244
+#: src/commandhandler.cpp:243
msgid "This command starts recording the chat log to the file <filename>."
msgstr ""
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:245
msgid "Command: /record"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: src/commandhandler.cpp:257
+#: src/commandhandler.cpp:256
msgid "Command: /toggle"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: src/commandhandler.cpp:336
-msgid "Cannont send empty whispers!"
+#: 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 ""
-#: 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 ""
@@ -305,45 +305,45 @@ msgstr ""
msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
msgstr ""
-#: 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"
+#: src/game.cpp:481
+msgid "The connection to the server was lost, the program will now quit"
msgstr ""
-#: src/game.cpp:493
-msgid "The connection to the server was lost, the program will now quit"
+#: src/game.cpp:487
+msgid "Network Error"
msgstr ""
-#: src/game.cpp:664 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
+#: 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 ""
@@ -355,12 +355,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 ""
@@ -370,13 +370,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 ""
#: 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 ""
@@ -385,203 +385,211 @@ msgstr ""
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 ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
+
+#: 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 ""
-#: 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 ""
@@ -589,26 +597,16 @@ msgstr ""
msgid "Connecting..."
msgstr ""
-#: src/gui/emotecontainer.cpp:61
+#: src/gui/emotepopup.cpp:64
msgid "Unable to load selection.png"
msgstr ""
-#: 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 ""
@@ -632,97 +630,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 ""
-#: 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 ""
@@ -738,67 +739,40 @@ msgstr ""
msgid "Cast Test Spell 3"
msgstr ""
-#: src/gui/menuwindow.cpp:66
-msgid "Status"
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
+msgid "Map"
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/menuwindow.cpp:73
-msgid "Buddys"
+#: src/gui/npcdialog.cpp:43
+msgid "Waiting for server"
msgstr ""
-#: src/gui/menuwindow.cpp:75
-msgid "Shortcut"
+#: src/gui/npcdialog.cpp:46
+msgid "Submit"
msgstr ""
-#: src/gui/menuwindow.cpp:77 src/gui/setup.cpp:65 src/main.cpp:920
-msgid "Setup"
+#: src/gui/npcdialog.cpp:49 src/gui/npcpostdialog.cpp:39
+msgid "NPC"
msgstr ""
-#: src/gui/minimap.cpp:39
-msgid "MiniMap"
+#: src/gui/npcdialog.cpp:95
+msgid "+"
msgstr ""
-#: src/gui/npcintegerdialog.cpp:39
-msgid "NPC Number Request"
+#: 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 ""
-
-#: src/gui/npcpostdialog.cpp:39 src/gui/npc_text.cpp:37
-msgid "NPC"
-msgstr ""
-
#: src/gui/npcpostdialog.cpp:51
msgid "Send"
msgstr ""
-#: src/gui/npcstringdialog.cpp:39
-msgid "NPC Text Request"
-msgstr ""
-
-#: 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 ""
@@ -851,7 +825,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 ""
@@ -872,7 +846,7 @@ msgid "Being"
msgstr ""
#: src/gui/palette.cpp:104
-msgid "Other Player's Names"
+msgid "Other Players' Names"
msgstr ""
#: src/gui/palette.cpp:105
@@ -896,19 +870,19 @@ 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"
+msgid "Usables"
msgstr ""
#: src/gui/palette.cpp:114
-msgid "Shirt"
+msgid "Shirts"
msgstr ""
#: src/gui/palette.cpp:115
@@ -928,15 +902,15 @@ msgid "2 Handed Weapons"
msgstr ""
#: src/gui/palette.cpp:119
-msgid "Shield"
+msgid "Shields"
msgstr ""
#: src/gui/palette.cpp:120
-msgid "Ring"
+msgid "Rings"
msgstr ""
#: src/gui/palette.cpp:121
-msgid "Necklace"
+msgid "Necklaces"
msgstr ""
#: src/gui/palette.cpp:122
@@ -991,94 +965,102 @@ msgstr ""
msgid "1/4 HP Bar"
msgstr ""
-#: src/gui/popupmenu.cpp:73
+#: src/gui/popupmenu.cpp:75
msgid "@@name|Add name to chat@@"
msgstr ""
-#: src/gui/popupmenu.cpp:85
+#: src/gui/popupmenu.cpp:87
#, c-format
msgid "@@trade|Trade With %s@@"
msgstr ""
-#: 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 ""
-#: src/gui/popupmenu.cpp:92
+#: src/gui/popupmenu.cpp:94
#, c-format
msgid "@@friend|Befriend %s@@"
msgstr ""
-#: 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 ""
-#: src/gui/popupmenu.cpp:112
+#: src/gui/popupmenu.cpp:114
#, c-format
msgid "@@party|Invite %s to join your party@@"
msgstr ""
-#: src/gui/popupmenu.cpp:123
+#: src/gui/popupmenu.cpp:125
#, c-format
msgid "@@talk|Talk To %s@@"
msgstr ""
-#: 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@@"
+msgid "@@pickup|Pick up %s@@"
msgstr ""
-#: src/gui/popupmenu.cpp:156 src/gui/popupmenu.cpp:352
-msgid "@@chat|Add to Chat@@"
+#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:373
+msgid "@@chat|Add to chat@@"
msgstr ""
-#: src/gui/popupmenu.cpp:336 src/gui/popupmenu.cpp:341
-msgid "@@use|Equip@@"
+#: src/gui/popupmenu.cpp:348
+msgid "@@use|Unequip@@"
msgstr ""
-#: src/gui/popupmenu.cpp:339
-msgid "@@use|Unequip@@"
+#: src/gui/popupmenu.cpp:350
+msgid "@@use|Equip@@"
msgstr ""
-#: src/gui/popupmenu.cpp:345
+#: 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 ""
+
+#: src/gui/popupmenu.cpp:371
+msgid "@@retrieve|Retrieve@@"
+msgstr ""
+
#: src/gui/quitdialog.cpp:37
msgid "Switch server"
msgstr ""
@@ -1147,18 +1129,30 @@ msgstr ""
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 ""
-#: 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 ""
@@ -1175,11 +1169,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 ""
@@ -1187,22 +1181,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 ""
#: 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 ""
#: 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 ""
@@ -1210,26 +1204,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 ""
@@ -1298,7 +1284,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 ""
@@ -1326,153 +1312,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 ""
-#: 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 ""
-#: src/gui/setup_video.cpp:136
+#: src/gui/setup_video.cpp:167
msgid "FPS Limit:"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: src/gui/setup_video.cpp:365
+#: src/gui/setup_video.cpp:435
msgid "Applying change to OpenGL requires restart."
msgstr ""
-#: 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 ""
@@ -1484,6 +1490,10 @@ msgstr ""
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"
@@ -1493,14 +1503,6 @@ msgstr ""
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 ""
@@ -1509,165 +1511,165 @@ msgstr ""
msgid "Crafts"
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 ""
-#: src/gui/status.cpp:61
+#: src/gui/status.cpp:60
msgid "HP:"
msgstr ""
-#: src/gui/status.cpp:64
+#: src/gui/status.cpp:63
msgid "Exp:"
msgstr ""
-#: src/gui/status.cpp:67
+#: src/gui/status.cpp:66
msgid "MP:"
msgstr ""
-#: 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 ""
-#: src/gui/status.cpp:91
+#: src/gui/status.cpp:90
#, no-c-format
msgid "% Evade:"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
@@ -1779,21 +1781,21 @@ msgstr ""
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 ""
-#: src/gui/widgets/chattab.cpp:147
+#: src/gui/widgets/chattab.cpp:146
#, c-format
msgid "%s whispers: "
msgstr ""
-#: 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 ""
@@ -1801,23 +1803,34 @@ msgstr ""
msgid "Cannot send empty chat!"
msgstr ""
-#: src/gui/widgets/whispertab.cpp:55
-#, c-format
-msgid "%s: %s"
-msgstr ""
-
-#: src/gui/widgets/whispertab.cpp:69
+#: src/gui/widgets/whispertab.cpp:68
msgid "/close > Close the whisper tab"
msgstr ""
-#: src/gui/widgets/whispertab.cpp:79
+#: src/gui/widgets/whispertab.cpp:78
msgid "Command: /close"
msgstr ""
-#: 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 ""
@@ -1937,7 +1950,7 @@ msgid "Debug Window"
msgstr ""
#: src/keyboardconfig.cpp:80
-msgid "Emote Window"
+msgid "Party Window"
msgstr ""
#: src/keyboardconfig.cpp:81
@@ -1986,159 +1999,163 @@ msgstr ""
msgid "Ignore input 2"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: src/main.cpp:563
-msgid "Options: "
-msgstr ""
-
-#: src/main.cpp:564
-msgid " -C --configfile : Configuration file to use"
-msgstr ""
-
-#: src/main.cpp:565
-msgid " -d --data : Directory to load game data from"
-msgstr ""
-
-#: src/main.cpp:566
-msgid " -D --default : Bypass the login process with default settings"
+#: src/main.cpp:567
+msgid "Options:"
msgstr ""
#: src/main.cpp:568
-msgid " -h --help : Display this help"
+msgid " -C --config-file : Configuration file to use"
msgstr ""
#: src/main.cpp:569
-msgid " -S --homedir : Directory to use as home directory"
+msgid " -d --data : Directory to load game data from"
msgstr ""
#: src/main.cpp:570
-msgid " -H --updatehost : Use this update host"
-msgstr ""
-
-#: src/main.cpp:571
-msgid " -P --password : Login with this password"
+msgid " -D --default : Choose default character server and character"
msgstr ""
#: src/main.cpp:572
-msgid " -c --character : Login with this character"
+msgid " -h --help : Display this help"
msgstr ""
#: src/main.cpp:573
-msgid " -o --port : Login Server Port"
+msgid " -S --home-dir : Directory to use as home directory"
msgstr ""
#: src/main.cpp:574
-msgid " -s --server : Login Server name or IP"
+msgid " -H --update-host : Use this update host"
msgstr ""
#: src/main.cpp:575
-msgid " -u --skipupdate : Skip the update downloads"
+msgid " -P --password : Login with this password"
msgstr ""
#: src/main.cpp:576
-msgid " -U --username : Login with this username"
+msgid " -c --character : Login with this character"
msgstr ""
#: src/main.cpp:577
-msgid " -v --version : Display the version"
+msgid " -p --port : Login Server Port"
+msgstr ""
+
+#: src/main.cpp:578
+msgid " -s --server : Login Server name or IP"
+msgstr ""
+
+#: src/main.cpp:579
+msgid " -u --skip-update : Skip the update downloads"
+msgstr ""
+
+#: src/main.cpp:580
+msgid " -U --username : Login with this username"
msgstr ""
#: src/main.cpp:582
+msgid " -O --no-opengl : Disable OpenGL for this session"
+msgstr ""
+
+#: src/main.cpp:584
+msgid " -v --version : Display the version"
+msgstr ""
+
+#: src/main.cpp:589
msgid "The Mana World "
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 ""
@@ -2219,18 +2236,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 ""
@@ -2242,413 +2259,427 @@ 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 ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: src/net/ea/generalhandler.cpp:100
+#: src/net/ea/generalhandler.cpp:102
#, c-format
msgid "Luck: %d"
msgstr ""
-#: 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 ""
-#: 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 ""
+
+#: src/net/ea/gui/partytab.cpp:53
msgid "/create > Create a new party"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:55
+#: src/net/ea/gui/partytab.cpp:54
msgid "/new > Alias of create"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:56
+#: src/net/ea/gui/partytab.cpp:55
msgid "/invite > Invite a player to your party"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:57
+#: src/net/ea/gui/partytab.cpp:56
msgid "/leave > Leave the party you are in"
msgstr ""
-#: 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 ""
-#: src/net/ea/gui/partytab.cpp:59
+#: src/net/ea/gui/partytab.cpp:58
msgid "/item > Show/change party item sharing options"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:60
+#: src/net/ea/gui/partytab.cpp:59
msgid "/exp > Show/change party experience sharing options"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:69
+#: src/net/ea/gui/partytab.cpp:68
msgid "Command: /new <party-name>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:70
+#: src/net/ea/gui/partytab.cpp:69
msgid "Command: /create <party-name>"
msgstr ""
-#: 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 ""
-#: src/net/ea/gui/partytab.cpp:75
+#: src/net/ea/gui/partytab.cpp:74
msgid "Command: /invite <nick>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:82
+#: src/net/ea/gui/partytab.cpp:81
msgid "Command: /leave"
msgstr ""
-#: 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 ""
-#: 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."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:92
+#: src/net/ea/gui/partytab.cpp:91
msgid "Command: /item"
msgstr ""
-#: 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 ""
-#: 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."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:102
+#: src/net/ea/gui/partytab.cpp:101
msgid "Command: /exp"
msgstr ""
-#: 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]"
+msgid "You picked up %s [@@%d|%s@@]"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: 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"
" Please contact the GM team via the forums."
msgstr ""
-#: 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."
+#: src/net/ea/partyhandler.cpp:77
+msgid "Could not create party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:82
-msgid "Could not create party."
+#: src/net/ea/partyhandler.cpp:80
+msgid "Party successfully created."
msgstr ""
-#: src/net/ea/partyhandler.cpp:112
+#: src/net/ea/partyhandler.cpp:115
#, c-format
msgid "%s is already a member of a party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:116
+#: src/net/ea/partyhandler.cpp:119
#, c-format
msgid "%s refused your invitation."
msgstr ""
-#: src/net/ea/partyhandler.cpp:120
+#: src/net/ea/partyhandler.cpp:123
#, c-format
msgid "%s is now a member of your party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:124
+#: src/net/ea/partyhandler.cpp:127
#, c-format
msgid "Unknown invite response for %s."
msgstr ""
-#: 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 ""
-#: src/net/ea/partyhandler.cpp:269
+#: src/net/ea/partyhandler.cpp:272
#, c-format
msgid "An unknown member tried to say: %s"
msgstr ""
-#: 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 ""
-#: 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"
+#: 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 ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
@@ -2804,40 +2835,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 ""
-#: 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 ""
+
+#: src/net/tmwserv/loginhandler.cpp:143
+msgid "Old email address incorrect"
+msgstr ""
+
+#: src/net/tmwserv/loginhandler.cpp:149
+msgid "The new Email Address already exists."
+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
+msgid "Wrong username or password"
+msgstr ""
+
+#: src/net/tmwserv/loginhandler.cpp:211
+msgid "Wrong username, password or email address"
+msgstr ""
+
+#: src/net/tmwserv/loginhandler.cpp:214
+msgid "Username already exists"
+msgstr ""
+
+#: src/net/tmwserv/loginhandler.cpp:217
+msgid "Email address already exists"
+msgstr ""
+
+#: src/resources/itemdb.cpp:52
#, c-format
msgid "Attack %+d"
msgstr ""
-#: src/resources/itemdb.cpp:54
+#: src/resources/itemdb.cpp:53
#, c-format
msgid "Defense %+d"
msgstr ""
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:54
#, c-format
msgid "HP %+d"
msgstr ""
-#: src/resources/itemdb.cpp:56
+#: src/resources/itemdb.cpp:55
#, c-format
msgid "MP %+d"
msgstr ""
-#: src/resources/itemdb.cpp:113
+#: src/resources/itemdb.cpp:112
msgid "items.xml"
msgstr ""
-#: src/resources/itemdb.cpp:151
+#: src/resources/itemdb.cpp:150
msgid "Unnamed"
msgstr ""
diff --git a/po/es.po b/po/es.po
index 879b0ff1..c71ab014 100644
--- a/po/es.po
+++ b/po/es.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-04-21 17:27+0200\n"
+"POT-Creation-Date: 2009-05-10 15:53+0200\n"
"PO-Revision-Date: 2009-01-27 13:52+0000\n"
"Last-Translator: Habari <thomas.becerril@gmail.com>\n"
"Language-Team: Spanish <es@li.org>\n"
@@ -17,312 +17,313 @@ msgstr ""
"X-Launchpad-Export-Date: 2009-02-12 19:04+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
-#: src/commandhandler.cpp:142
+#: src/commandhandler.cpp:141
msgid "-- Help --"
msgstr "ayuda"
-#: src/commandhandler.cpp:143 src/net/ea/gui/partytab.cpp:53
+#: src/commandhandler.cpp:142
#, fuzzy
-msgid "/help > Display this help."
+msgid "/help > Display this help"
msgstr "/help : muestra esta ayuda"
-#: src/commandhandler.cpp:145
+#: src/commandhandler.cpp:144
#, fuzzy
msgid "/where > Display map name"
msgstr "/where : muestra nombre del mapa"
-#: src/commandhandler.cpp:146
+#: src/commandhandler.cpp:145
#, fuzzy
msgid "/who > Display number of online users"
msgstr "/who muestra el numero de jugadores online"
-#: src/commandhandler.cpp:147
+#: src/commandhandler.cpp:146
msgid "/me > Tell something about yourself"
msgstr ""
-#: src/commandhandler.cpp:149
+#: src/commandhandler.cpp:148
#, fuzzy
msgid "/clear > Clears this window"
msgstr "/clear : limpia esta ventana"
-#: src/commandhandler.cpp:151
+#: src/commandhandler.cpp:150
#, fuzzy
msgid "/msg > Send a private message to a user"
msgstr "/whisper <nick> <mensaje> : manda un <mensaje> privado para <nick>"
-#: src/commandhandler.cpp:152
+#: src/commandhandler.cpp:151
msgid "/whisper > Alias of msg"
msgstr ""
-#: src/commandhandler.cpp:153
+#: src/commandhandler.cpp:152
msgid "/w > Alias of msg"
msgstr ""
-#: src/commandhandler.cpp:154
+#: src/commandhandler.cpp:153
msgid "/query > Makes a tab for private messages with another user"
msgstr ""
-#: src/commandhandler.cpp:155
+#: src/commandhandler.cpp:154
msgid "/q > Alias of query"
msgstr ""
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:156
msgid "/list > Display all public channels"
msgstr ""
-#: src/commandhandler.cpp:158
+#: src/commandhandler.cpp:157
msgid "/join > Join or create a channel"
msgstr ""
-#: src/commandhandler.cpp:160
+#: src/commandhandler.cpp:159
msgid "/party > Invite a user to party"
msgstr ""
-#: src/commandhandler.cpp:162
+#: src/commandhandler.cpp:161
msgid "/record > Start recording the chat to an external file"
msgstr ""
-#: 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 ""
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:165
#, fuzzy
msgid "/announce > Global announcement (GM only)"
msgstr "/announce ; anuncio global (GM solo)"
-#: src/commandhandler.cpp:170
+#: src/commandhandler.cpp:169
msgid "For more information, type /help <command>"
msgstr "Par mas ayuda teclea el comando /help"
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:173
msgid "Command: /help"
msgstr "comando: /help"
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:174
msgid "This command displays a list of all commands available."
msgstr "este comando da una lista de todos los comandos que hay"
-#: src/commandhandler.cpp:176
+#: src/commandhandler.cpp:175
msgid "Command: /help <command>"
msgstr "comando: /help <comando>"
-#: src/commandhandler.cpp:177
+#: src/commandhandler.cpp:176
msgid "This command displays help on <command>."
msgstr "este comando muestra ayuda sobre <otro comando>"
-#: src/commandhandler.cpp:185
+#: src/commandhandler.cpp:184
msgid "Command: /announce <msg>"
msgstr "comando : /announce <mensaje>"
-#: src/commandhandler.cpp:186
+#: src/commandhandler.cpp:185
msgid "*** only available to a GM ***"
msgstr "solo disponible para GM"
-#: src/commandhandler.cpp:187
+#: src/commandhandler.cpp:186
msgid "This command sends the message <msg> to all players currently online."
msgstr "este comando manda un mensaje a todos los jugadores que esten online"
-#: src/commandhandler.cpp:192
+#: src/commandhandler.cpp:191
msgid "Command: /clear"
msgstr "comando: /clear"
-#: src/commandhandler.cpp:193
+#: src/commandhandler.cpp:192
msgid "This command clears the chat log of previous chat."
msgstr "este comando borra"
-#: src/commandhandler.cpp:197
+#: src/commandhandler.cpp:196
#, fuzzy
msgid "Command: /join <channel>"
msgstr "comando: /help"
-#: src/commandhandler.cpp:198
+#: src/commandhandler.cpp:197
#, fuzzy
msgid "This command makes you enter <channel>."
msgstr "este comando muestra ayuda sobre <otro comando>"
-#: 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
#, fuzzy
msgid "Command: /list"
msgstr "comando: /help"
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:203
#, fuzzy
msgid "This command shows a list of all channels."
msgstr "este comando da una lista de todos los comandos que hay"
-#: src/commandhandler.cpp:208
+#: src/commandhandler.cpp:207
#, fuzzy
msgid "Command: /me <message>"
msgstr "comando : /announce <mensaje>"
-#: src/commandhandler.cpp:209
+#: src/commandhandler.cpp:208
msgid "This command tell others you are (doing) <msg>."
msgstr ""
-#: src/commandhandler.cpp:213
+#: src/commandhandler.cpp:212
#, fuzzy
msgid "Command: /msg <nick> <message>"
msgstr "comando: /w <mote> <mensaje>"
-#: src/commandhandler.cpp:214
+#: src/commandhandler.cpp:213
#, fuzzy
msgid "Command: /whisper <nick> <message>"
msgstr "comando: /whisper <mote> <mensaje>"
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:214
#, fuzzy
msgid "Command: /w <nick> <message>"
msgstr "comando: /w <mote> <mensaje>"
-#: src/commandhandler.cpp:216
+#: src/commandhandler.cpp:215
#, fuzzy
msgid "This command sends the text <message> to <nick>."
msgstr "este comando manda un mensaje <mensaje> a <mote>"
-#: 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 "si el <mote> incluye espacios , escribelo entre comillas (\"\")"
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:221
#, fuzzy
msgid "Command: /query <nick>"
msgstr "comando: /w <mote> <mensaje>"
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:222
#, fuzzy
msgid "Command: /q <nick>"
msgstr "comando: /w <mote> <mensaje>"
-#: src/commandhandler.cpp:224
+#: src/commandhandler.cpp:223
msgid "This command tries to make a tab for whispers betweenyou and <nick>."
msgstr ""
-#: src/commandhandler.cpp:229
+#: src/commandhandler.cpp:228
#, fuzzy
msgid "Command: /party <nick>"
msgstr "comando: /w <mote> <mensaje>"
-#: 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 ""
-#: src/commandhandler.cpp:236
+#: src/commandhandler.cpp:235
#, fuzzy
msgid "Command: /present"
msgstr "comando: /where"
-#: 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
#, fuzzy
msgid "Command: /record <filename>"
msgstr "comando: /clear"
-#: src/commandhandler.cpp:244
+#: src/commandhandler.cpp:243
#, fuzzy
msgid "This command starts recording the chat log to the file <filename>."
msgstr "este comando borra"
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:245
#, fuzzy
msgid "Command: /record"
msgstr "comando: /clear"
-#: src/commandhandler.cpp:247
+#: src/commandhandler.cpp:246
msgid "This command finishes a recording session."
msgstr ""
-#: src/commandhandler.cpp:251
+#: src/commandhandler.cpp:250
#, fuzzy
msgid "Command: /toggle <state>"
msgstr "comando : /announce <mensaje>"
-#: 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 ""
-#: src/commandhandler.cpp:257
+#: src/commandhandler.cpp:256
#, fuzzy
msgid "Command: /toggle"
msgstr "comando: /clear"
-#: src/commandhandler.cpp:258
+#: src/commandhandler.cpp:257
#, fuzzy
msgid "This command displays the return toggle status."
msgstr "este comando muestra el nombre del mapa actual"
-#: src/commandhandler.cpp:262
+#: src/commandhandler.cpp:261
msgid "Command: /where"
msgstr "comando: /where"
-#: src/commandhandler.cpp:263
+#: src/commandhandler.cpp:262
msgid "This command displays the name of the current map."
msgstr "este comando muestra el nombre del mapa actual"
-#: src/commandhandler.cpp:267
+#: src/commandhandler.cpp:266
msgid "Command: /who"
msgstr "comando: /who"
-#: src/commandhandler.cpp:268
+#: src/commandhandler.cpp:267
msgid "This command displays the number of players currently online."
msgstr ""
"este comando muestra el numero de jugadores que actualmente estan conectados"
-#: src/commandhandler.cpp:273
+#: src/commandhandler.cpp:272
msgid "Unknown command."
msgstr "Orden desconocida."
-#: src/commandhandler.cpp:274
+#: src/commandhandler.cpp:273
msgid "Type /help for a list of commands."
msgstr "teclea /help para una lista de comandos"
-#: src/commandhandler.cpp:336
-msgid "Cannont send empty whispers!"
-msgstr ""
+#: src/commandhandler.cpp:339
+#, fuzzy
+msgid "Cannot send empty whispers!"
+msgstr "no puedes gritar"
-#: 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 ""
-#: 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 ""
@@ -331,47 +332,47 @@ msgstr ""
msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
msgstr ""
-#: 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
#, fuzzy
msgid "Saving screenshot failed!"
msgstr "sentarse fallido"
-#: src/game.cpp:492
-msgid "Network Error"
+#: src/game.cpp:481
+msgid "The connection to the server was lost, the program will now quit"
msgstr ""
-#: src/game.cpp:493
-msgid "The connection to the server was lost, the program will now quit"
+#: src/game.cpp:487
+msgid "Network Error"
msgstr ""
-#: src/game.cpp:664 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
+#: 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 "Salir"
-#: src/game.cpp:665
+#: src/game.cpp:647
#, fuzzy
msgid "Are you sure you want to quit?"
msgstr "¿Seguro que quieres borrar este personaje?"
-#: 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 ""
@@ -384,12 +385,12 @@ msgstr "Comprar"
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 "Comprar"
#: 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
#, fuzzy, c-format
msgid "Price: %s / Total: %s"
msgstr "Precio: %d GP / Total: %d GP"
@@ -400,13 +401,13 @@ msgid "Max"
msgstr "max"
#: 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 "Descripción: %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 "Efecto: %s"
@@ -415,205 +416,213 @@ msgstr "Efecto: %s"
msgid "Shop"
msgstr "tienda"
-#: 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 "Vender"
-#: 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 "Cancelar"
-#: 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 ""
-#: 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
#, fuzzy
msgid "Change Password"
msgstr "Contraseña:"
-#: 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 "Contraseña:"
-#: 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 "Crear Personaje"
-#: 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 "Nombre:"
-#: src/gui/charcreatedialog.cpp:70
+#: src/gui/charcreatedialog.cpp:69
msgid "Hair Color:"
msgstr "Color de pelo:"
-#: src/gui/charcreatedialog.cpp:73
+#: src/gui/charcreatedialog.cpp:72
msgid "Hair Style:"
msgstr "corte de pelo"
-#: src/gui/charcreatedialog.cpp:74
+#: src/gui/charcreatedialog.cpp:73
msgid "Create"
msgstr "Crear"
-#: src/gui/charcreatedialog.cpp:76 src/gui/register.cpp:75
+#: src/gui/charcreatedialog.cpp:75 src/gui/register.cpp:75
msgid "Male"
msgstr "Hombre"
-#: src/gui/charcreatedialog.cpp:77 src/gui/register.cpp:76
+#: src/gui/charcreatedialog.cpp:76 src/gui/register.cpp:76
msgid "Female"
msgstr "Mujer"
-#: 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 "Distribuya %d puntos"
-#: 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 "Error"
-#: src/gui/charcreatedialog.cpp:174
+#: src/gui/charcreatedialog.cpp:173
msgid "Your name needs to be at least 4 characters."
msgstr "El nombre debe tener al menos 4 caracteres."
-#: src/gui/charcreatedialog.cpp:227
+#: src/gui/charcreatedialog.cpp:226
msgid "Character stats OK"
msgstr "Estatus personaje OK"
-#: src/gui/charcreatedialog.cpp:239
+#: src/gui/charcreatedialog.cpp:238
#, c-format
msgid "Please remove %d points"
msgstr "por favor quita %d puntos"
-#: src/gui/char_select.cpp:79
+#: src/gui/charselectdialog.cpp:78
msgid "Confirm Character Delete"
msgstr "confirmar borrado de personaje"
-#: src/gui/char_select.cpp:80
+#: src/gui/charselectdialog.cpp:79
msgid "Are you sure you want to delete this character?"
msgstr "¿Seguro que quieres borrar este personaje?"
-#: 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 "Seleccionar personaje"
-#: 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 "Aceptar"
-#: src/gui/char_select.cpp:113
+#: src/gui/charselectdialog.cpp:112
msgid "Previous"
msgstr "Anterior"
-#: 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 "Siguiente"
-#: 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 "Nombre: %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 "Nivel: %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 "Nuevo"
-#: 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 "Eliminar"
-#: src/gui/char_select.cpp:120 src/gui/unregisterdialog.cpp:51
+#: src/gui/charselectdialog.cpp:119 src/gui/unregisterdialog.cpp:52
msgid "Unregister"
msgstr "Cancelar Cuenta"
-#: src/gui/char_select.cpp:127
+#: src/gui/charselectdialog.cpp:126
#, c-format
msgid "Money: %d"
msgstr "Dinero: %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 "nivel de trabajo %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
#, fuzzy, c-format
msgid "Money: %s"
msgstr "Dinero: %d"
-#: 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
#, fuzzy
msgid "Chat"
msgstr "Crear"
-#: src/gui/chat.cpp:341 src/gui/chat.cpp:347
+#: src/gui/chat.cpp:332
+#, c-format
+msgid "%d players are present."
+msgstr ""
+
+#: 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 "susurrando a %s: %s"
-#: src/gui/confirm_dialog.cpp:42
+#: src/gui/confirmdialog.cpp:42
msgid "Yes"
msgstr "Sí"
-#: src/gui/confirm_dialog.cpp:43
+#: src/gui/confirmdialog.cpp:43
msgid "No"
msgstr "No"
@@ -621,26 +630,16 @@ msgstr "No"
msgid "Connecting..."
msgstr "Conectando…"
-#: src/gui/emotecontainer.cpp:61
+#: src/gui/emotepopup.cpp:64
msgid "Unable to load selection.png"
msgstr ""
-#: 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 "Usar"
-
-#: src/gui/equipmentwindow.cpp:68 src/gui/menuwindow.cpp:67
+#: src/gui/equipmentwindow.cpp:68 src/gui/windowmenu.cpp:60
msgid "Equipment"
msgstr "Equipo"
-#: 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 "quitarselo"
@@ -665,102 +664,105 @@ msgstr ""
msgid "Help"
msgstr "Ayuda"
-#: 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 "Cerrar"
-#: src/gui/inventorywindow.cpp:51 src/gui/menuwindow.cpp:68
+#: src/gui/inventorywindow.cpp:54 src/gui/windowmenu.cpp:61
msgid "Inventory"
msgstr "Inventario"
-#: 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 "Equipar"
-#: 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 "Usar"
+
+#: src/gui/inventorywindow.cpp:80
msgid "Drop"
msgstr "tirar"
-#: src/gui/inventorywindow.cpp:79
+#: src/gui/inventorywindow.cpp:81
msgid "Split"
msgstr "Dividir"
-#: src/gui/inventorywindow.cpp:93
+#: src/gui/inventorywindow.cpp:92
msgid "Slots:"
msgstr ""
-#: src/gui/inventorywindow.cpp:94
+#: src/gui/inventorywindow.cpp:93
#, fuzzy
msgid "Weight:"
msgstr "peso: %d / %d"
-#: 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 "Seleccione objetos para comerciar."
-#: src/gui/item_amount.cpp:95
+#: src/gui/itemamount.cpp:124
msgid "Select amount of items to drop."
msgstr "Seleccione objetos para soltar."
-#: src/gui/item_amount.cpp:98
+#: src/gui/itemamount.cpp:127
#, fuzzy
msgid "Select amount of items to store."
msgstr "Seleccione objetos para comerciar."
-#: src/gui/item_amount.cpp:101
+#: src/gui/itemamount.cpp:130
#, fuzzy
msgid "Select amount of items to retrieve."
msgstr "Seleccione objetos para comerciar."
-#: src/gui/item_amount.cpp:104
+#: src/gui/itemamount.cpp:133
msgid "Select amount of items to split."
msgstr "Seleccione objetos para dividir."
-#: src/gui/itempopup.cpp:89
+#: src/gui/itempopup.cpp:91
#, fuzzy
msgid "Weight: "
msgstr "peso: %d / %d"
-#: src/gui/login.cpp:47
+#: src/gui/login.cpp:48
msgid "Login"
msgstr "conectarse"
-#: 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 "Servidor:"
-#: 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 "Puerto:"
-#: src/gui/login.cpp:55
+#: src/gui/login.cpp:56
#, fuzzy
msgid "Recent:"
msgstr "Registrar"
-#: src/gui/login.cpp:72
+#: src/gui/login.cpp:73
msgid "Remember Username"
msgstr "recordar nombre de usuario"
-#: 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 "Aceptar"
-#: 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 "Registrar"
-#: 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 ""
@@ -776,71 +778,44 @@ msgstr ""
msgid "Cast Test Spell 3"
msgstr ""
-#: src/gui/menuwindow.cpp:66
-msgid "Status"
-msgstr "Estado"
-
-#: src/gui/menuwindow.cpp:69 src/gui/skill.cpp:126 src/gui/skilldialog.cpp:99
-msgid "Skills"
-msgstr "Habilidades"
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
+#, fuzzy
+msgid "Map"
+msgstr "max"
-#: src/gui/menuwindow.cpp:72
-msgid "Guilds"
+#: src/gui/npcdialog.cpp:43
+msgid "Waiting for server"
msgstr ""
-#: src/gui/menuwindow.cpp:73
+#: src/gui/npcdialog.cpp:46
#, fuzzy
-msgid "Buddys"
-msgstr "Comprar"
-
-#: src/gui/menuwindow.cpp:75
-msgid "Shortcut"
-msgstr "Atajos"
+msgid "Submit"
+msgstr "Dividir"
-#: src/gui/menuwindow.cpp:77 src/gui/setup.cpp:65 src/main.cpp:920
-msgid "Setup"
-msgstr "Configuración"
+#: src/gui/npcdialog.cpp:49 src/gui/npcpostdialog.cpp:39
+msgid "NPC"
+msgstr "NPC"
-#: src/gui/minimap.cpp:39
-msgid "MiniMap"
-msgstr "Minimapa"
+#: src/gui/npcdialog.cpp:95
+msgid "+"
+msgstr ""
-#: src/gui/npcintegerdialog.cpp:39
-msgid "NPC Number Request"
+#: src/gui/npcdialog.cpp:96
+msgid "-"
msgstr ""
-#: src/gui/npcintegerdialog.cpp:50
+#: src/gui/npcdialog.cpp:105
#, fuzzy
msgid "Reset"
msgstr "Registrar"
-#: src/gui/npcintegerdialog.cpp:101 src/gui/npclistdialog.cpp:123
-#: src/gui/npcstringdialog.cpp:75
-#, fuzzy
-msgid ""
-"\n"
-"> Cancel\n"
-msgstr "Cancelar"
-
-#: src/gui/npcpostdialog.cpp:39 src/gui/npc_text.cpp:37
-msgid "NPC"
-msgstr "NPC"
-
#: src/gui/npcpostdialog.cpp:51
#, fuzzy
msgid "Send"
msgstr "Sonido"
-#: src/gui/npcstringdialog.cpp:39
-msgid "NPC Text Request"
-msgstr ""
-
-#: 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
#, fuzzy
msgid "Text"
msgstr "Siguiente"
@@ -897,7 +872,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
#, fuzzy
msgid "Party"
msgstr "Jugar"
@@ -920,7 +895,7 @@ msgid "Being"
msgstr ""
#: src/gui/palette.cpp:104
-msgid "Other Player's Names"
+msgid "Other Players' Names"
msgstr ""
#: src/gui/palette.cpp:105
@@ -947,21 +922,22 @@ msgid "Unknown Item Type"
msgstr ""
#: src/gui/palette.cpp:111
-msgid "Generic"
+msgid "Generics"
msgstr ""
#: src/gui/palette.cpp:112
-msgid "Hat"
-msgstr ""
+#, fuzzy
+msgid "Hats"
+msgstr "Estadísticas"
#: src/gui/palette.cpp:113
#, fuzzy
-msgid "Usable"
+msgid "Usables"
msgstr "Usar"
#: src/gui/palette.cpp:114
#, fuzzy
-msgid "Shirt"
+msgid "Shirts"
msgstr "Atajos"
#: src/gui/palette.cpp:115
@@ -984,15 +960,15 @@ msgstr ""
#: src/gui/palette.cpp:119
#, fuzzy
-msgid "Shield"
+msgid "Shields"
msgstr "Vender"
#: src/gui/palette.cpp:120
-msgid "Ring"
+msgid "Rings"
msgstr ""
#: src/gui/palette.cpp:121
-msgid "Necklace"
+msgid "Necklaces"
msgstr ""
#: src/gui/palette.cpp:122
@@ -1049,94 +1025,103 @@ msgstr ""
msgid "1/4 HP Bar"
msgstr ""
-#: src/gui/popupmenu.cpp:73
+#: src/gui/popupmenu.cpp:75
msgid "@@name|Add name to chat@@"
msgstr ""
-#: src/gui/popupmenu.cpp:85
+#: src/gui/popupmenu.cpp:87
#, c-format
msgid "@@trade|Trade With %s@@"
msgstr "@@trade|Comerciar con %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 "@@attack|Atacar a %s@@"
-#: src/gui/popupmenu.cpp:92
+#: src/gui/popupmenu.cpp:94
#, c-format
msgid "@@friend|Befriend %s@@"
msgstr ""
-#: 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 ""
-#: src/gui/popupmenu.cpp:112
+#: src/gui/popupmenu.cpp:114
#, c-format
msgid "@@party|Invite %s to join your party@@"
msgstr ""
-#: src/gui/popupmenu.cpp:123
+#: src/gui/popupmenu.cpp:125
#, fuzzy, c-format
msgid "@@talk|Talk To %s@@"
msgstr "@@talk|Hablar al NPC@@"
-#: 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 "@@cancel|Cancelar@@"
-#: src/gui/popupmenu.cpp:155
-#, c-format
-msgid "@@pickup|Pick Up %s@@"
+#: src/gui/popupmenu.cpp:157
+#, fuzzy, c-format
+msgid "@@pickup|Pick up %s@@"
msgstr "@@pickup|Recoger %s@@"
-#: src/gui/popupmenu.cpp:156 src/gui/popupmenu.cpp:352
-msgid "@@chat|Add to Chat@@"
+#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:373
+msgid "@@chat|Add to chat@@"
msgstr ""
-#: src/gui/popupmenu.cpp:336 src/gui/popupmenu.cpp:341
-msgid "@@use|Equip@@"
-msgstr "@@use|Equipar@@"
-
-#: src/gui/popupmenu.cpp:339
+#: src/gui/popupmenu.cpp:348
msgid "@@use|Unequip@@"
msgstr "@@usar|quitarselo@@"
-#: src/gui/popupmenu.cpp:345
+#: src/gui/popupmenu.cpp:350
+msgid "@@use|Equip@@"
+msgstr "@@use|Equipar@@"
+
+#: src/gui/popupmenu.cpp:353
msgid "@@use|Use@@"
msgstr "@@use|Usar@@"
-#: src/gui/popupmenu.cpp:347
+#: src/gui/popupmenu.cpp:355
msgid "@@drop|Drop@@"
msgstr "@@drop|Tirar@@"
-#: src/gui/popupmenu.cpp:350
+#: src/gui/popupmenu.cpp:359
msgid "@@split|Split@@"
msgstr "@@split|Dividir@@"
+#: src/gui/popupmenu.cpp:364
+#, fuzzy
+msgid "@@store|Store@@"
+msgstr "@@use|Usar@@"
+
+#: src/gui/popupmenu.cpp:371
+msgid "@@retrieve|Retrieve@@"
+msgstr ""
+
#: src/gui/quitdialog.cpp:37
msgid "Switch server"
msgstr "Cambiar servidor"
@@ -1206,19 +1191,31 @@ msgstr "La contraseña puede tener como máximo %d caracteres."
msgid "Passwords do not match."
msgstr "Las contraseñas no coinciden."
-#: src/gui/serverdialog.cpp:73
+#: src/gui/serverdialog.cpp:74
#, fuzzy
msgid "Choose your server"
msgstr "Elija su servidor de Mana World"
-#: src/gui/serverdialog.cpp:163
+#: src/gui/serverdialog.cpp:164
msgid "Please type both the address and the port of a server."
msgstr "Escriba la dirección y el puerto de un servidor."
-#: src/gui/serverselectdialog.cpp:50
+#: src/gui/serverselectdialog.cpp:59
msgid "Select Server"
msgstr "Seleccionar servidor"
+#: src/gui/setup.cpp:64 src/gui/windowmenu.cpp:69 src/main.cpp:933
+msgid "Setup"
+msgstr "Configuración"
+
+#: src/gui/setup.cpp:72
+msgid "Apply"
+msgstr "Aplicar"
+
+#: src/gui/setup.cpp:72
+msgid "Reset Windows"
+msgstr "Reiniciar ventanas"
+
#: src/gui/setup_audio.cpp:41
msgid "Sound"
msgstr "Sonido"
@@ -1235,11 +1232,11 @@ msgstr "Volumen efectos"
msgid "Music volume"
msgstr "Volumen musica"
-#: 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
#, fuzzy
msgid "Colors"
msgstr "Cerrar"
@@ -1248,24 +1245,24 @@ msgstr "Cerrar"
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
#, fuzzy
msgid "Static"
msgstr "Estadísticas"
#: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:431
#, fuzzy
msgid "Pulse"
msgstr "Cerrar"
#: 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
#, fuzzy
msgid "Spectrum"
msgstr "Configuración"
@@ -1274,26 +1271,18 @@ msgstr "Configuración"
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 "Aplicar"
-
-#: src/gui/setup.cpp:73
-msgid "Reset Windows"
-msgstr "Reiniciar ventanas"
-
#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:78
msgid "Press the button to start calibration"
msgstr "Presione el botón para comenzar la calibración"
@@ -1362,7 +1351,7 @@ msgstr "desestimado"
msgid "Ignored"
msgstr "Ingnorado"
-#: src/gui/setup_players.cpp:207
+#: src/gui/setup_players.cpp:207 src/gui/setup_video.cpp:131
msgid "???"
msgstr ""
@@ -1390,157 +1379,179 @@ msgstr "Jugadores"
msgid "When ignoring:"
msgstr "cuando ignorando"
-#: src/gui/setup_video.cpp:123
+#: src/gui/setup_video.cpp:112
+msgid "Tiny"
+msgstr ""
+
+#: src/gui/setup_video.cpp:113
+#, fuzzy
+msgid "Small"
+msgstr "Vender"
+
+#: src/gui/setup_video.cpp:114
+#, fuzzy
+msgid "Medium"
+msgstr "Medio"
+
+#: src/gui/setup_video.cpp:115
+msgid "Large"
+msgstr ""
+
+#: src/gui/setup_video.cpp:151
msgid "Full screen"
msgstr "Pantalla completa"
-#: 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 "Cursor propio"
-#: 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
#, fuzzy
msgid "Particle effects"
msgstr "detalle particulas"
-#: 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 ""
-#: src/gui/setup_video.cpp:136
+#: src/gui/setup_video.cpp:167
msgid "FPS Limit:"
msgstr "Límite de FPS:"
-#: src/gui/setup_video.cpp:152
+#: src/gui/setup_video.cpp:184
msgid "Video"
msgstr "Vídeo"
-#: 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 "Transparencia menus"
-#: src/gui/setup_video.cpp:159
+#: src/gui/setup_video.cpp:191
msgid "Scroll radius"
msgstr "Ratio de scroll"
-#: src/gui/setup_video.cpp:160
+#: src/gui/setup_video.cpp:192
msgid "Scroll laziness"
msgstr "Velocidad de scroll"
-#: src/gui/setup_video.cpp:161
+#: src/gui/setup_video.cpp:193
msgid "Ambient FX"
msgstr "Efectos ambientales"
-#: src/gui/setup_video.cpp:162
+#: src/gui/setup_video.cpp:194
msgid "Particle Detail"
msgstr "detalle particulas"
-#: 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
#, fuzzy
msgid "No text"
msgstr "Siguiente"
-#: 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 ""
-#: 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 ""
-#: 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 "desactivado"
-#: 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 "bajo"
-#: 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 "alto"
-#: 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 "Medio"
-#: 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 "max"
-#: 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
#, fuzzy
msgid "fullscreen"
msgstr "Pantalla completa"
-#: 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 "Cambiar a pantalla completa"
-#: src/gui/setup_video.cpp:352
+#: src/gui/setup_video.cpp:422
msgid "Restart needed for changes to take effect."
msgstr "Se necesita reiniciar para aplicar los cambios."
-#: src/gui/setup_video.cpp:364
+#: src/gui/setup_video.cpp:434
msgid "Changing OpenGL"
msgstr "Cambiar a OpenGL"
-#: src/gui/setup_video.cpp:365
+#: src/gui/setup_video.cpp:435
msgid "Applying change to OpenGL requires restart."
msgstr "Se necesita reiniciar para aplicar los cambios hechos a 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
#, fuzzy
msgid "Restart your client for the change to take effect."
msgstr "Se necesita reiniciar para aplicar los cambios."
-#: 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 ""
@@ -1553,6 +1564,10 @@ msgstr "Habilidades"
msgid "Mystery Skill"
msgstr "habilidad mis"
+#: src/gui/skill.cpp:126 src/gui/skilldialog.cpp:99 src/gui/windowmenu.cpp:62
+msgid "Skills"
+msgstr "Habilidades"
+
#: src/gui/skill.cpp:145 src/gui/skill.cpp:197
#, c-format
msgid "Skill points: %d"
@@ -1562,15 +1577,6 @@ msgstr "puntos de habilidad: %d"
msgid "Up"
msgstr "Arriba"
-#: src/gui/skill.cpp:146
-msgid "inc"
-msgstr ""
-
-#: src/gui/skill.cpp:147
-#, fuzzy
-msgid "use"
-msgstr "Usar"
-
#: src/gui/skilldialog.cpp:113
msgid "Weapons"
msgstr ""
@@ -1580,175 +1586,175 @@ msgstr ""
msgid "Crafts"
msgstr "Crear"
-#: 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 "trabajo : %d"
-#: src/gui/status.cpp:61
+#: src/gui/status.cpp:60
msgid "HP:"
msgstr ""
-#: src/gui/status.cpp:64
+#: src/gui/status.cpp:63
msgid "Exp:"
msgstr ""
-#: src/gui/status.cpp:67
+#: src/gui/status.cpp:66
msgid "MP:"
msgstr ""
-#: src/gui/status.cpp:70
+#: src/gui/status.cpp:69
#, fuzzy
msgid "Job:"
msgstr "trabajo : %d"
-#: src/gui/status.cpp:78
+#: src/gui/status.cpp:77
msgid "Stats"
msgstr "Estadísticas"
-#: src/gui/status.cpp:79
+#: src/gui/status.cpp:78
msgid "Total"
msgstr "Total"
-#: src/gui/status.cpp:80
+#: src/gui/status.cpp:79
msgid "Cost"
msgstr "Coste"
-#: src/gui/status.cpp:84
+#: src/gui/status.cpp:83
msgid "Attack:"
msgstr "Ataque:"
-#: src/gui/status.cpp:85
+#: src/gui/status.cpp:84
msgid "Defense:"
msgstr "defensa"
-#: src/gui/status.cpp:86
+#: src/gui/status.cpp:85
msgid "M.Attack:"
msgstr "ataque magico"
-#: src/gui/status.cpp:87
+#: src/gui/status.cpp:86
msgid "M.Defense:"
msgstr "defensa magica"
-#: src/gui/status.cpp:89
+#: src/gui/status.cpp:88
#, no-c-format
msgid "% Accuracy:"
msgstr "% AcPunteria"
-#: src/gui/status.cpp:91
+#: src/gui/status.cpp:90
#, no-c-format
msgid "% Evade:"
msgstr "% agilidad"
-#: src/gui/status.cpp:93
+#: src/gui/status.cpp:92
#, no-c-format
msgid "% Reflex:"
msgstr "% reflejos"
-#: src/gui/status.cpp:199
+#: src/gui/status.cpp:198
msgid "Strength"
msgstr "Fuerza"
-#: src/gui/status.cpp:200
+#: src/gui/status.cpp:199
msgid "Agility"
msgstr "agilidad2"
-#: src/gui/status.cpp:201
+#: src/gui/status.cpp:200
msgid "Vitality"
msgstr "vitalidad"
-#: src/gui/status.cpp:202
+#: src/gui/status.cpp:201
msgid "Intelligence"
msgstr "inteligencia"
-#: src/gui/status.cpp:203
+#: src/gui/status.cpp:202
msgid "Dexterity"
msgstr "Destreza"
-#: src/gui/status.cpp:204
+#: src/gui/status.cpp:203
msgid "Luck"
msgstr "Suerte"
-#: src/gui/status.cpp:222
+#: src/gui/status.cpp:221
#, c-format
msgid "Remaining Status Points: %d"
msgstr "puntos de estatus que te quedan: %d"
-#: src/gui/status.cpp:383 src/gui/status.cpp:405
+#: src/gui/status.cpp:384
#, fuzzy
msgid "Max level"
msgstr "Hombre"
-#: src/gui/storagewindow.cpp:53
+#: src/gui/storagewindow.cpp:54
msgid "Storage"
msgstr ""
-#: src/gui/storagewindow.cpp:64
+#: src/gui/storagewindow.cpp:65
#, fuzzy
msgid "Store"
msgstr "Detener"
-#: src/gui/storagewindow.cpp:65
+#: src/gui/storagewindow.cpp:66
msgid "Retrieve"
msgstr ""
-#: src/gui/storagewindow.cpp:75
+#: src/gui/storagewindow.cpp:78
#, fuzzy
msgid "Slots: "
msgstr "puntos de habilidad: %d"
-#: src/gui/trade.cpp:52
+#: src/gui/trade.cpp:51
msgid "Propose trade"
msgstr "Proponer"
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:52
#, fuzzy
msgid "Confirmed. Waiting..."
msgstr "Conectando…"
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:53
#, fuzzy
msgid "Agree trade"
msgstr "Proponer"
-#: src/gui/trade.cpp:55
+#: src/gui/trade.cpp:54
#, fuzzy
msgid "Agreed. Waiting..."
msgstr "Actualizando ..."
-#: src/gui/trade.cpp:58
+#: src/gui/trade.cpp:57
#, fuzzy
msgid "Trade: You"
msgstr "Comercio"
-#: src/gui/trade.cpp:71 src/gui/trade.cpp:72
+#: src/gui/trade.cpp:70 src/gui/trade.cpp:71
msgid "Trade"
msgstr "Comercio"
-#: src/gui/trade.cpp:74
+#: src/gui/trade.cpp:73
msgid "Add"
msgstr "Añadir"
-#: 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
#, fuzzy, c-format
msgid "You get %s."
msgstr "Tu consigues %d GP."
-#: src/gui/trade.cpp:97
+#: src/gui/trade.cpp:96
msgid "You give:"
msgstr "Tu das:"
-#: src/gui/trade.cpp:101
+#: src/gui/trade.cpp:100
msgid "Change"
msgstr "Modificar"
-#: 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 ""
"no se pudo añadir objeto: No puedes sobreponer un tipo de objeto en la "
"ventana"
-#: src/gui/trade.cpp:321
+#: src/gui/trade.cpp:311
#, fuzzy
msgid "You don't have enough money"
msgstr "No tienes ningun memo"
@@ -1869,21 +1875,21 @@ msgstr ""
msgid "Need a user to kick!"
msgstr ""
-#: src/gui/widgets/chattab.cpp:115
+#: src/gui/widgets/chattab.cpp:114
msgid "Global announcement:"
msgstr "Anuncio Global"
-#: src/gui/widgets/chattab.cpp:121
+#: src/gui/widgets/chattab.cpp:120
#, c-format
msgid "Global announcement from %s:"
msgstr "Anuncio global de %s"
-#: src/gui/widgets/chattab.cpp:147
+#: src/gui/widgets/chattab.cpp:146
#, fuzzy, c-format
msgid "%s whispers: "
msgstr "%s susurra"
-#: src/gui/widgets/chattab.cpp:241 src/resources/itemdb.cpp:108
+#: src/gui/widgets/chattab.cpp:240 src/resources/itemdb.cpp:107
#, fuzzy
msgid "Unknown item"
msgstr "Comando desconocido"
@@ -1893,25 +1899,37 @@ msgstr "Comando desconocido"
msgid "Cannot send empty chat!"
msgstr "no puedes gritar"
-#: src/gui/widgets/whispertab.cpp:55
-#, c-format
-msgid "%s: %s"
-msgstr ""
-
-#: src/gui/widgets/whispertab.cpp:69
+#: src/gui/widgets/whispertab.cpp:68
msgid "/close > Close the whisper tab"
msgstr ""
-#: src/gui/widgets/whispertab.cpp:79
+#: src/gui/widgets/whispertab.cpp:78
#, fuzzy
msgid "Command: /close"
msgstr "comando: /clear"
-#: src/gui/widgets/whispertab.cpp:80
+#: src/gui/widgets/whispertab.cpp:79
#, fuzzy
msgid "This command closes the current whisper tab."
msgstr "este comando muestra el nombre del mapa actual"
+#: src/gui/windowmenu.cpp:59
+msgid "Status"
+msgstr "Estado"
+
+#: src/gui/windowmenu.cpp:65
+msgid "Guilds"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:66
+#, fuzzy
+msgid "Buddys"
+msgstr "Comprar"
+
+#: src/gui/windowmenu.cpp:68
+msgid "Shortcut"
+msgstr "Atajos"
+
#: src/keyboardconfig.cpp:41
msgid "Move Up"
msgstr ""
@@ -2046,8 +2064,8 @@ msgstr "Reiniciar ventanas"
#: src/keyboardconfig.cpp:80
#, fuzzy
-msgid "Emote Window"
-msgstr "emcion fallida"
+msgid "Party Window"
+msgstr "Reiniciar ventanas"
#: src/keyboardconfig.cpp:81
msgid "Emote Shortcut Window"
@@ -2097,168 +2115,173 @@ msgstr ""
msgid "Ignore input 2"
msgstr ""
-#: src/localplayer.cpp:849
+#: src/localplayer.cpp:834
#, fuzzy
msgid "Unarmed"
msgstr "sin nombre"
-#: src/localplayer.cpp:850
+#: src/localplayer.cpp:835
msgid "Knife"
msgstr ""
-#: src/localplayer.cpp:851
+#: src/localplayer.cpp:836
#, fuzzy
msgid "Sword"
msgstr "Sonido"
-#: src/localplayer.cpp:852
+#: src/localplayer.cpp:837
msgid "Polearm"
msgstr ""
-#: src/localplayer.cpp:853
+#: src/localplayer.cpp:838
#, fuzzy
msgid "Staff"
msgstr "Estadísticas"
-#: src/localplayer.cpp:854
+#: src/localplayer.cpp:839
msgid "Whip"
msgstr ""
-#: src/localplayer.cpp:855
+#: src/localplayer.cpp:840
#, fuzzy
msgid "Bow"
msgstr "bajo"
-#: src/localplayer.cpp:856
+#: src/localplayer.cpp:841
msgid "Shooting"
msgstr ""
-#: src/localplayer.cpp:857
+#: src/localplayer.cpp:842
#, fuzzy
msgid "Mace"
msgstr "Hombre"
-#: 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
#, fuzzy
msgid "Craft"
msgstr "Crear"
-#: 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 ""
-#: src/main.cpp:563
-msgid "Options: "
+#: src/main.cpp:567
+msgid "Options:"
msgstr ""
-#: src/main.cpp:564
-msgid " -C --configfile : Configuration file to use"
+#: src/main.cpp:568
+msgid " -C --config-file : Configuration file to use"
msgstr ""
-#: src/main.cpp:565
-msgid " -d --data : Directory to load game data from"
+#: src/main.cpp:569
+msgid " -d --data : Directory to load game data from"
msgstr ""
-#: src/main.cpp:566
-msgid " -D --default : Bypass the login process with default settings"
+#: src/main.cpp:570
+msgid " -D --default : Choose default character server and character"
msgstr ""
-#: src/main.cpp:568
+#: src/main.cpp:572
#, fuzzy
-msgid " -h --help : Display this help"
+msgid " -h --help : Display this help"
msgstr "/help : muestra esta ayuda"
-#: src/main.cpp:569
-msgid " -S --homedir : Directory to use as home directory"
+#: src/main.cpp:573
+msgid " -S --home-dir : Directory to use as home directory"
msgstr ""
-#: src/main.cpp:570
-msgid " -H --updatehost : Use this update host"
+#: src/main.cpp:574
+msgid " -H --update-host : Use this update host"
msgstr ""
-#: src/main.cpp:571
-msgid " -P --password : Login with this password"
+#: src/main.cpp:575
+msgid " -P --password : Login with this password"
msgstr ""
-#: src/main.cpp:572
-msgid " -c --character : Login with this character"
+#: src/main.cpp:576
+msgid " -c --character : Login with this character"
msgstr ""
-#: src/main.cpp:573
-msgid " -o --port : Login Server Port"
+#: src/main.cpp:577
+msgid " -p --port : Login Server Port"
msgstr ""
-#: src/main.cpp:574
-msgid " -s --server : Login Server name or IP"
+#: src/main.cpp:578
+msgid " -s --server : Login Server name or IP"
msgstr ""
-#: src/main.cpp:575
-msgid " -u --skipupdate : Skip the update downloads"
+#: src/main.cpp:579
+msgid " -u --skip-update : Skip the update downloads"
msgstr ""
-#: src/main.cpp:576
-msgid " -U --username : Login with this username"
+#: src/main.cpp:580
+msgid " -U --username : Login with this username"
msgstr ""
-#: src/main.cpp:577
-msgid " -v --version : Display the version"
+#: src/main.cpp:582
+msgid " -O --no-opengl : Disable OpenGL for this session"
msgstr ""
-#: src/main.cpp:582
+#: src/main.cpp:584
+#, fuzzy
+msgid " -v --version : Display the version"
+msgstr "/help : muestra esta ayuda"
+
+#: src/main.cpp:589
#, fuzzy
msgid "The Mana World "
msgstr "Elija su servidor de Mana World"
-#: src/main.cpp:1499
+#: src/main.cpp:1515
msgid "Connecting to map server..."
msgstr "conectando al servidor de mapas...."
-#: src/main.cpp:1507
+#: src/main.cpp:1523
msgid "Connecting to character server..."
msgstr "conectando al servidor de personajes..."
-#: src/main.cpp:1515
+#: src/main.cpp:1531
msgid "Connecting to account server..."
msgstr "conectando al servidor de cuentas de usuario..."
-#: src/net/ea/adminhandler.cpp:67
+#: src/net/ea/adminhandler.cpp:66
#, fuzzy
msgid "Kick failed!"
msgstr "sentarse fallido"
-#: src/net/ea/adminhandler.cpp:69
+#: src/net/ea/adminhandler.cpp:68
msgid "Kick succeeded!"
msgstr ""
@@ -2346,18 +2369,18 @@ msgstr "Destreza"
msgid "Luck:"
msgstr "Suerte"
-#: 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 ""
@@ -2370,434 +2393,449 @@ msgstr "quitarselo"
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
#, fuzzy, c-format
msgid "Strength: %d"
msgstr "Fuerza"
-#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:82
+#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:84
#, fuzzy, c-format
msgid "Agility: %d"
msgstr "agilidad2"
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:86
+#: src/net/ea/generalhandler.cpp:96 src/net/tmwserv/generalhandler.cpp:88
#, fuzzy, c-format
msgid "Vitality: %d"
msgstr "vitalidad"
-#: src/net/ea/generalhandler.cpp:96 src/net/tmwserv/generalhandler.cpp:88
+#: src/net/ea/generalhandler.cpp:98 src/net/tmwserv/generalhandler.cpp:90
#, fuzzy, c-format
msgid "Intelligence: %d"
msgstr "inteligencia"
-#: src/net/ea/generalhandler.cpp:98 src/net/tmwserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:100 src/net/tmwserv/generalhandler.cpp:86
#, fuzzy, c-format
msgid "Dexterity: %d"
msgstr "Destreza"
-#: src/net/ea/generalhandler.cpp:100
+#: src/net/ea/generalhandler.cpp:102
#, fuzzy, c-format
msgid "Luck: %d"
msgstr "Suerte"
-#: src/net/ea/generalhandler.cpp:123
+#: src/net/ea/generalhandler.cpp:125
#, fuzzy
msgid "Authentication failed"
msgstr "creacion de chat fallida"
-#: 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 ""
-#: 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 "fuiste desconectado del servidor!!"
-#: src/net/ea/gui/partytab.cpp:54
+#: src/net/ea/gui/partytab.cpp:52
+#, fuzzy
+msgid "/help > Display this help."
+msgstr "/help : muestra esta ayuda"
+
+#: src/net/ea/gui/partytab.cpp:53
msgid "/create > Create a new party"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:55
+#: src/net/ea/gui/partytab.cpp:54
msgid "/new > Alias of create"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:56
+#: src/net/ea/gui/partytab.cpp:55
msgid "/invite > Invite a player to your party"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:57
+#: src/net/ea/gui/partytab.cpp:56
msgid "/leave > Leave the party you are in"
msgstr ""
-#: 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 ""
-#: src/net/ea/gui/partytab.cpp:59
+#: src/net/ea/gui/partytab.cpp:58
msgid "/item > Show/change party item sharing options"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:60
+#: src/net/ea/gui/partytab.cpp:59
msgid "/exp > Show/change party experience sharing options"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:69
+#: src/net/ea/gui/partytab.cpp:68
#, fuzzy
msgid "Command: /new <party-name>"
msgstr "comando : /announce <mensaje>"
-#: src/net/ea/gui/partytab.cpp:70
+#: src/net/ea/gui/partytab.cpp:69
#, fuzzy
msgid "Command: /create <party-name>"
msgstr "comando: /clear"
-#: 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 ""
-#: src/net/ea/gui/partytab.cpp:75
+#: src/net/ea/gui/partytab.cpp:74
#, fuzzy
msgid "Command: /invite <nick>"
msgstr "comando: /w <mote> <mensaje>"
-#: src/net/ea/gui/partytab.cpp:82
+#: src/net/ea/gui/partytab.cpp:81
#, fuzzy
msgid "Command: /leave"
msgstr "comando: /clear"
-#: src/net/ea/gui/partytab.cpp:83
+#: src/net/ea/gui/partytab.cpp:82
#, fuzzy
msgid "This command causes the player to leave the party."
msgstr "este comando borra"
-#: src/net/ea/gui/partytab.cpp:87
+#: src/net/ea/gui/partytab.cpp:86
#, fuzzy
msgid "Command: /item <policy>"
msgstr "comando: /help"
-#: src/net/ea/gui/partytab.cpp:88
+#: src/net/ea/gui/partytab.cpp:87
#, fuzzy
msgid "This command changes the party's item sharing policy."
msgstr "este comando manda un mensaje <mensaje> a <mote>"
-#: 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."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:92
+#: src/net/ea/gui/partytab.cpp:91
#, fuzzy
msgid "Command: /item"
msgstr "comando: /help"
-#: src/net/ea/gui/partytab.cpp:93
+#: src/net/ea/gui/partytab.cpp:92
#, fuzzy
msgid "This command displays the party's current item sharing policy."
msgstr "este comando muestra el nombre del mapa actual"
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/ea/gui/partytab.cpp:96
#, fuzzy
msgid "Command: /exp <policy>"
msgstr "comando: /help <comando>"
-#: 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."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:102
+#: src/net/ea/gui/partytab.cpp:101
#, fuzzy
msgid "Command: /exp"
msgstr "comando: /help"
-#: src/net/ea/gui/partytab.cpp:103
+#: src/net/ea/gui/partytab.cpp:102
#, fuzzy
msgid "This command displays the party's current experience sharing policy."
msgstr "este comando muestra el nombre del mapa actual"
-#: 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]"
+msgid "You picked up %s [@@%d|%s@@]"
msgstr ""
-#: 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
#, fuzzy
msgid "Unregistered ID"
msgstr "Cancelar Cuenta"
-#: src/net/ea/loginhandler.cpp:114
+#: src/net/ea/loginhandler.cpp:113
#, fuzzy
msgid "Wrong password"
msgstr "Contraseña:"
-#: 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
#, fuzzy
msgid "Rejected from server"
msgstr "fuiste desconectado del servidor!!"
-#: 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 ""
-#: 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"
" Please contact the GM team via the forums."
msgstr ""
-#: 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
#, fuzzy
msgid "Unknown error"
msgstr "Comando desconocido"
-#: src/net/ea/partyhandler.cpp:78
-msgid "Party successfully created."
-msgstr ""
-
-#: src/net/ea/partyhandler.cpp:82
+#: src/net/ea/partyhandler.cpp:77
#, fuzzy
msgid "Could not create party."
msgstr "no pudiste unirte al grupo"
-#: 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 ""
-#: src/net/ea/partyhandler.cpp:116
+#: src/net/ea/partyhandler.cpp:119
#, c-format
msgid "%s refused your invitation."
msgstr ""
-#: src/net/ea/partyhandler.cpp:120
+#: src/net/ea/partyhandler.cpp:123
#, c-format
msgid "%s is now a member of your party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:124
+#: src/net/ea/partyhandler.cpp:127
#, c-format
msgid "Unknown invite response for %s."
msgstr ""
-#: 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 ""
-#: src/net/ea/partyhandler.cpp:269
+#: src/net/ea/partyhandler.cpp:272
#, c-format
msgid "An unknown member tried to say: %s"
msgstr ""
-#: 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
#, fuzzy, c-format
msgid "%s is not in your party!"
msgstr "no pudiste unirte al grupo"
-#: 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
#, fuzzy
msgid "You are not that alive anymore."
msgstr "no puedes hacer eso ahora mismo"
-#: 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"
+#: 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 ""
-#: 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
#, fuzzy
msgid "You are no more."
msgstr "No tienes ningun memo"
-#: src/net/ea/playerhandler.cpp:134
+#: src/net/ea/playerhandler.cpp:122
#, fuzzy
msgid "You have ceased to be."
msgstr "No tienes ningun memo"
-#: src/net/ea/playerhandler.cpp:135
+#: src/net/ea/playerhandler.cpp:123
msgid "You've expired and gone to meet your maker."
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 ""
-#: 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 ""
@@ -2959,40 +2997,98 @@ msgstr ""
msgid "Willpower:"
msgstr "Fuerza de voluntad:"
-#: 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
#, fuzzy, c-format
msgid "Willpower: %d"
msgstr "Fuerza de voluntad:"
-#: 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
+#, fuzzy
+msgid "Server is full"
+msgstr "Servidor:"
+
+#: 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 ""
+
+#: src/net/tmwserv/loginhandler.cpp:143
+msgid "Old email address incorrect"
+msgstr ""
+
+#: src/net/tmwserv/loginhandler.cpp:149
+msgid "The new Email Address already exists."
+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 "Contraseña:"
+
+#: src/net/tmwserv/loginhandler.cpp:211
+msgid "Wrong username, password or email address"
+msgstr ""
+
+#: src/net/tmwserv/loginhandler.cpp:214
+msgid "Username already exists"
+msgstr ""
+
+#: src/net/tmwserv/loginhandler.cpp:217
+msgid "Email address already exists"
+msgstr ""
+
+#: src/resources/itemdb.cpp:52
#, fuzzy, c-format
msgid "Attack %+d"
msgstr "Ataque:"
-#: src/resources/itemdb.cpp:54
+#: src/resources/itemdb.cpp:53
#, fuzzy, c-format
msgid "Defense %+d"
msgstr "defensa"
-#: 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 ""
-#: src/resources/itemdb.cpp:151
+#: src/resources/itemdb.cpp:150
msgid "Unnamed"
msgstr "sin nombre"
@@ -3009,6 +3105,23 @@ msgstr ""
msgid "NPC Database: Error while loading npcs.xml!"
msgstr ""
+#~ msgid "MiniMap"
+#~ msgstr "Minimapa"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "> Cancel\n"
+#~ msgstr "Cancelar"
+
+#, fuzzy
+#~ msgid "use"
+#~ msgstr "Usar"
+
+#, fuzzy
+#~ msgid "Emote Window"
+#~ msgstr "emcion fallida"
+
#~ msgid "Gold: %d"
#~ msgstr "oro: %d"
diff --git a/po/fi.po b/po/fi.po
index 2ebc53d9..933b43c9 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-04-21 17:27+0200\n"
+"POT-Creation-Date: 2009-05-10 15:53+0200\n"
"PO-Revision-Date: 2008-12-30 10:23+0000\n"
"Last-Translator: ville-v <villev90@gmail.com>\n"
"Language-Team: Finnish <fi@li.org>\n"
@@ -17,287 +17,287 @@ msgstr ""
"X-Launchpad-Export-Date: 2009-04-21 14:44+0000\n"
"X-Generator: Launchpad (build Unknown)\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."
+#: src/commandhandler.cpp:142
+msgid "/help > Display this help"
msgstr ""
-#: src/commandhandler.cpp:145
+#: src/commandhandler.cpp:144
msgid "/where > Display map name"
msgstr ""
-#: src/commandhandler.cpp:146
+#: src/commandhandler.cpp:145
msgid "/who > Display number of online users"
msgstr ""
-#: src/commandhandler.cpp:147
+#: src/commandhandler.cpp:146
msgid "/me > Tell something about yourself"
msgstr ""
-#: src/commandhandler.cpp:149
+#: src/commandhandler.cpp:148
msgid "/clear > Clears this window"
msgstr ""
-#: src/commandhandler.cpp:151
+#: src/commandhandler.cpp:150
msgid "/msg > Send a private message to a user"
msgstr ""
-#: src/commandhandler.cpp:152
+#: src/commandhandler.cpp:151
msgid "/whisper > Alias of msg"
msgstr ""
-#: src/commandhandler.cpp:153
+#: src/commandhandler.cpp:152
msgid "/w > Alias of msg"
msgstr ""
-#: src/commandhandler.cpp:154
+#: src/commandhandler.cpp:153
msgid "/query > Makes a tab for private messages with another user"
msgstr ""
-#: src/commandhandler.cpp:155
+#: src/commandhandler.cpp:154
msgid "/q > Alias of query"
msgstr ""
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:156
msgid "/list > Display all public channels"
msgstr ""
-#: src/commandhandler.cpp:158
+#: src/commandhandler.cpp:157
msgid "/join > Join or create a channel"
msgstr ""
-#: src/commandhandler.cpp:160
+#: src/commandhandler.cpp:159
#, fuzzy
msgid "/party > Invite a user to party"
msgstr "@@party|Kutsu %s mukaan ryhmääsi@@"
-#: src/commandhandler.cpp:162
+#: src/commandhandler.cpp:161
msgid "/record > Start recording the chat to an external file"
msgstr ""
-#: 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 ""
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:165
msgid "/announce > Global announcement (GM only)"
msgstr ""
-#: src/commandhandler.cpp:170
+#: src/commandhandler.cpp:169
msgid "For more information, type /help <command>"
msgstr ""
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:173
msgid "Command: /help"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: src/commandhandler.cpp:186
+#: src/commandhandler.cpp:185
msgid "*** only available to a GM ***"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: src/commandhandler.cpp:209
+#: src/commandhandler.cpp:208
msgid "This command tell others you are (doing) <msg>."
msgstr ""
-#: src/commandhandler.cpp:213
+#: src/commandhandler.cpp:212
msgid "Command: /msg <nick> <message>"
msgstr ""
-#: src/commandhandler.cpp:214
+#: src/commandhandler.cpp:213
msgid "Command: /whisper <nick> <message>"
msgstr ""
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:214
msgid "Command: /w <nick> <message>"
msgstr ""
-#: src/commandhandler.cpp:216
+#: src/commandhandler.cpp:215
msgid "This command sends the text <message> to <nick>."
msgstr ""
-#: 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 ""
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:222
msgid "Command: /q <nick>"
msgstr ""
-#: src/commandhandler.cpp:224
+#: src/commandhandler.cpp:223
msgid "This command tries to make a tab for whispers betweenyou and <nick>."
msgstr ""
-#: src/commandhandler.cpp:229
+#: src/commandhandler.cpp:228
msgid "Command: /party <nick>"
msgstr ""
-#: 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 ""
-#: src/commandhandler.cpp:236
+#: src/commandhandler.cpp:235
msgid "Command: /present"
msgstr ""
-#: 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 ""
-#: src/commandhandler.cpp:244
+#: src/commandhandler.cpp:243
msgid "This command starts recording the chat log to the file <filename>."
msgstr ""
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:245
msgid "Command: /record"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: src/commandhandler.cpp:257
+#: src/commandhandler.cpp:256
msgid "Command: /toggle"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: src/commandhandler.cpp:336
-msgid "Cannont send empty whispers!"
+#: 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 ""
-#: 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 ""
@@ -306,46 +306,46 @@ msgstr ""
msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
msgstr ""
-#: 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"
+#: src/game.cpp:481
+msgid "The connection to the server was lost, the program will now quit"
msgstr ""
-#: src/game.cpp:493
-msgid "The connection to the server was lost, the program will now quit"
+#: src/game.cpp:487
+msgid "Network Error"
msgstr ""
-#: src/game.cpp:664 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
+#: 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 "Sulje"
-#: src/game.cpp:665
+#: src/game.cpp:647
#, fuzzy
msgid "Are you sure you want to quit?"
msgstr "Oletko varma, että haluat poistaa tämän hahmon?"
-#: 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 ""
@@ -358,12 +358,12 @@ msgstr "Osta"
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 "Osta"
#: 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
#, fuzzy, c-format
msgid "Price: %s / Total: %s"
msgstr "Kappalehinta: %d GP / Yhteensä: %d GP"
@@ -373,13 +373,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 "Kuvaus: %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 "Vaikutus: %s"
@@ -389,206 +389,214 @@ msgstr "Vaikutus: %s"
msgid "Shop"
msgstr "Lopeta"
-#: 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 "Myy"
-#: 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 "Peru"
-#: 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 "Vaihda sähköpostiosoite"
-#: 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 "Tili: %s"
-#: src/gui/changeemaildialog.cpp:48
+#: src/gui/changeemaildialog.cpp:49
#, fuzzy
msgid "Type New Email Address twice:"
msgstr "Vaihda sähköpostiosoite"
-#: 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 "Vaihda salasana"
-#: 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 "Salasana:"
-#: 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 "Luo hahmo"
-#: 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 "Nimi:"
-#: src/gui/charcreatedialog.cpp:70
+#: src/gui/charcreatedialog.cpp:69
msgid "Hair Color:"
msgstr "Hiusten väri:"
-#: src/gui/charcreatedialog.cpp:73
+#: src/gui/charcreatedialog.cpp:72
msgid "Hair Style:"
msgstr "Hiustyyli:"
-#: src/gui/charcreatedialog.cpp:74
+#: src/gui/charcreatedialog.cpp:73
msgid "Create"
msgstr "Luo"
-#: src/gui/charcreatedialog.cpp:76 src/gui/register.cpp:75
+#: src/gui/charcreatedialog.cpp:75 src/gui/register.cpp:75
msgid "Male"
msgstr "Miespuolinen"
-#: src/gui/charcreatedialog.cpp:77 src/gui/register.cpp:76
+#: src/gui/charcreatedialog.cpp:76 src/gui/register.cpp:76
msgid "Female"
msgstr "Naispuolinen"
-#: 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 "Jaa %d pistettä"
-#: 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 "Virhe"
-#: src/gui/charcreatedialog.cpp:174
+#: src/gui/charcreatedialog.cpp:173
msgid "Your name needs to be at least 4 characters."
msgstr "Nimessäsi täytyy olla ainakin 4 merkkiä."
-#: src/gui/charcreatedialog.cpp:227
+#: src/gui/charcreatedialog.cpp:226
msgid "Character stats OK"
msgstr "Hahmon pistejako OK"
-#: src/gui/charcreatedialog.cpp:239
+#: src/gui/charcreatedialog.cpp:238
#, c-format
msgid "Please remove %d points"
msgstr "%d pistettä liikaa"
-#: src/gui/char_select.cpp:79
+#: src/gui/charselectdialog.cpp:78
msgid "Confirm Character Delete"
msgstr "Vahvista hahmon poistopyyntö"
-#: src/gui/char_select.cpp:80
+#: src/gui/charselectdialog.cpp:79
msgid "Are you sure you want to delete this character?"
msgstr "Oletko varma, että haluat poistaa tämän hahmon?"
-#: src/gui/char_select.cpp:98
+#: src/gui/charselectdialog.cpp:97
msgid "Account and Character Management"
msgstr "Tilin ja hahmojen hallinta"
-#: src/gui/char_select.cpp:105
+#: src/gui/charselectdialog.cpp:104
#, fuzzy
msgid "Select Character"
msgstr "Luo hahmo"
-#: 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 "Ok"
-#: src/gui/char_select.cpp:113
+#: src/gui/charselectdialog.cpp:112
msgid "Previous"
msgstr "Edellinen"
-#: 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 "Seuraava"
-#: 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 "Nimi: %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 "Taso: %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 "Uusi"
-#: 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 "Poista"
-#: src/gui/char_select.cpp:120 src/gui/unregisterdialog.cpp:51
+#: src/gui/charselectdialog.cpp:119 src/gui/unregisterdialog.cpp:52
msgid "Unregister"
msgstr "Poista palvelimelta"
-#: src/gui/char_select.cpp:127
+#: src/gui/charselectdialog.cpp:126
#, c-format
msgid "Money: %d"
msgstr "Rahatilanne: %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
#, fuzzy, c-format
msgid "Job Level: %d"
msgstr "Taso: %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
#, fuzzy, c-format
msgid "Money: %s"
msgstr "Rahatilanne: %d"
-#: 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
#, fuzzy
msgid "Chat"
msgstr "Luo"
-#: src/gui/chat.cpp:341 src/gui/chat.cpp:347
+#: src/gui/chat.cpp:332
+#, c-format
+msgid "%d players are present."
+msgstr ""
+
+#: 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 ""
-#: src/gui/confirm_dialog.cpp:42
+#: src/gui/confirmdialog.cpp:42
msgid "Yes"
msgstr "Kyllä"
-#: src/gui/confirm_dialog.cpp:43
+#: src/gui/confirmdialog.cpp:43
msgid "No"
msgstr "Ei"
@@ -596,26 +604,16 @@ msgstr "Ei"
msgid "Connecting..."
msgstr "Yhdistetään..."
-#: src/gui/emotecontainer.cpp:61
+#: src/gui/emotepopup.cpp:64
msgid "Unable to load selection.png"
msgstr ""
-#: 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 "Käytä"
-
-#: src/gui/equipmentwindow.cpp:68 src/gui/menuwindow.cpp:67
+#: src/gui/equipmentwindow.cpp:68 src/gui/windowmenu.cpp:60
msgid "Equipment"
msgstr "Varusteet"
-#: 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 "Poista varuste käytöstä"
@@ -642,99 +640,102 @@ msgstr "Kiltatoiminta"
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 "Tavaraluettelo"
-#: 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 "Ota käyttöön"
-#: 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 "Käytä"
+
+#: src/gui/inventorywindow.cpp:80
msgid "Drop"
msgstr "Pudota"
-#: src/gui/inventorywindow.cpp:79
+#: src/gui/inventorywindow.cpp:81
msgid "Split"
msgstr "Jaa"
-#: 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 "Anna vaihdettavien tavaroiden määrä."
-#: src/gui/item_amount.cpp:95
+#: src/gui/itemamount.cpp:124
msgid "Select amount of items to drop."
msgstr "Anna pudotettavien tavaroiden määrä."
-#: src/gui/item_amount.cpp:98
+#: src/gui/itemamount.cpp:127
#, fuzzy
msgid "Select amount of items to store."
msgstr "Anna vaihdettavien tavaroiden määrä."
-#: src/gui/item_amount.cpp:101
+#: src/gui/itemamount.cpp:130
#, fuzzy
msgid "Select amount of items to retrieve."
msgstr "Anna vaihdettavien tavaroiden määrä."
-#: src/gui/item_amount.cpp:104
+#: src/gui/itemamount.cpp:133
msgid "Select amount of items to split."
msgstr "Anna eri pinoon jaettavien tavaroiden määrä."
-#: 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 "Kirjaudu sisään"
-#: 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 "Palvelin:"
-#: 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 "Portti:"
-#: 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 "Muista käyttäjätunnus"
-#: 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 "Rekisteröidy"
-#: 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 ""
@@ -750,71 +751,44 @@ msgstr ""
msgid "Cast Test Spell 3"
msgstr ""
-#: src/gui/menuwindow.cpp:66
-msgid "Status"
-msgstr "Hahmon tiedot"
-
-#: src/gui/menuwindow.cpp:69 src/gui/skill.cpp:126 src/gui/skilldialog.cpp:99
-msgid "Skills"
-msgstr "Taidot"
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
+#, fuzzy
+msgid "Map"
+msgstr "Apukartta"
-#: src/gui/menuwindow.cpp:72
-msgid "Guilds"
-msgstr "Kiltatoiminta"
+#: src/gui/npcdialog.cpp:43
+msgid "Waiting for server"
+msgstr ""
-#: src/gui/menuwindow.cpp:73
+#: src/gui/npcdialog.cpp:46
#, fuzzy
-msgid "Buddys"
-msgstr "Osta"
-
-#: src/gui/menuwindow.cpp:75
-msgid "Shortcut"
-msgstr "Pikavalinnat"
+msgid "Submit"
+msgstr "Jaa"
-#: src/gui/menuwindow.cpp:77 src/gui/setup.cpp:65 src/main.cpp:920
-msgid "Setup"
-msgstr "Asetukset"
+#: src/gui/npcdialog.cpp:49 src/gui/npcpostdialog.cpp:39
+msgid "NPC"
+msgstr "Epäpelattava hahmo"
-#: src/gui/minimap.cpp:39
-msgid "MiniMap"
-msgstr "Apukartta"
+#: src/gui/npcdialog.cpp:95
+msgid "+"
+msgstr ""
-#: src/gui/npcintegerdialog.cpp:39
-msgid "NPC Number Request"
+#: src/gui/npcdialog.cpp:96
+msgid "-"
msgstr ""
-#: src/gui/npcintegerdialog.cpp:50
+#: src/gui/npcdialog.cpp:105
#, fuzzy
msgid "Reset"
msgstr "Rekisteröidy"
-#: src/gui/npcintegerdialog.cpp:101 src/gui/npclistdialog.cpp:123
-#: src/gui/npcstringdialog.cpp:75
-#, fuzzy
-msgid ""
-"\n"
-"> Cancel\n"
-msgstr "Peru"
-
-#: src/gui/npcpostdialog.cpp:39 src/gui/npc_text.cpp:37
-msgid "NPC"
-msgstr "Epäpelattava hahmo"
-
#: src/gui/npcpostdialog.cpp:51
#, fuzzy
msgid "Send"
msgstr "Ääni"
-#: src/gui/npcstringdialog.cpp:39
-msgid "NPC Text Request"
-msgstr ""
-
-#: 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
#, fuzzy
msgid "Text"
msgstr "Seuraava"
@@ -869,7 +843,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
#, fuzzy
msgid "Party"
msgstr "Portti:"
@@ -892,7 +866,7 @@ msgid "Being"
msgstr ""
#: src/gui/palette.cpp:104
-msgid "Other Player's Names"
+msgid "Other Players' Names"
msgstr ""
#: src/gui/palette.cpp:105
@@ -919,21 +893,22 @@ msgid "Unknown Item Type"
msgstr ""
#: src/gui/palette.cpp:111
-msgid "Generic"
+msgid "Generics"
msgstr ""
#: src/gui/palette.cpp:112
-msgid "Hat"
-msgstr ""
+#, fuzzy
+msgid "Hats"
+msgstr "Hahmon tiedot"
#: src/gui/palette.cpp:113
#, fuzzy
-msgid "Usable"
+msgid "Usables"
msgstr "Käytä"
#: src/gui/palette.cpp:114
#, fuzzy
-msgid "Shirt"
+msgid "Shirts"
msgstr "Pikavalinnat"
#: src/gui/palette.cpp:115
@@ -954,15 +929,15 @@ msgstr ""
#: src/gui/palette.cpp:119
#, fuzzy
-msgid "Shield"
+msgid "Shields"
msgstr "Myy"
#: src/gui/palette.cpp:120
-msgid "Ring"
+msgid "Rings"
msgstr ""
#: src/gui/palette.cpp:121
-msgid "Necklace"
+msgid "Necklaces"
msgstr ""
#: src/gui/palette.cpp:122
@@ -1017,95 +992,104 @@ msgstr ""
msgid "1/4 HP Bar"
msgstr ""
-#: src/gui/popupmenu.cpp:73
+#: src/gui/popupmenu.cpp:75
msgid "@@name|Add name to chat@@"
msgstr ""
-#: src/gui/popupmenu.cpp:85
+#: src/gui/popupmenu.cpp:87
#, c-format
msgid "@@trade|Trade With %s@@"
msgstr "@@trade|Vaihda tavaroita %s kanssa@@"
-#: 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 "@@attack|Hyökkää %s kimppuun@@"
-#: src/gui/popupmenu.cpp:92
+#: src/gui/popupmenu.cpp:94
#, c-format
msgid "@@friend|Befriend %s@@"
msgstr ""
-#: 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
#, fuzzy, c-format
msgid "@@ignore|Ignore %s@@"
msgstr "@@guild|Kutsu %s mukaan kiltaan@@"
-#: 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
#, fuzzy, c-format
msgid "@@guild|Invite %s to join your guild@@"
msgstr "@@party|Kutsu %s mukaan ryhmääsi@@"
-#: src/gui/popupmenu.cpp:112
+#: src/gui/popupmenu.cpp:114
#, c-format
msgid "@@party|Invite %s to join your party@@"
msgstr "@@party|Kutsu %s mukaan ryhmääsi@@"
-#: src/gui/popupmenu.cpp:123
+#: src/gui/popupmenu.cpp:125
#, fuzzy, c-format
msgid "@@talk|Talk To %s@@"
msgstr "@@talk|Puhu epäpelattavalle hahmolle@@"
-#: 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 "@@cancel|Peruuta@@"
-#: src/gui/popupmenu.cpp:155
-#, c-format
-msgid "@@pickup|Pick Up %s@@"
+#: src/gui/popupmenu.cpp:157
+#, fuzzy, c-format
+msgid "@@pickup|Pick up %s@@"
msgstr "@@pickup|Poimi %s@@"
-#: src/gui/popupmenu.cpp:156 src/gui/popupmenu.cpp:352
-msgid "@@chat|Add to Chat@@"
+#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:373
+msgid "@@chat|Add to chat@@"
msgstr ""
-#: src/gui/popupmenu.cpp:336 src/gui/popupmenu.cpp:341
-msgid "@@use|Equip@@"
-msgstr "@@use|Ota varuste käyttöön@@"
-
-#: src/gui/popupmenu.cpp:339
+#: src/gui/popupmenu.cpp:348
#, fuzzy
msgid "@@use|Unequip@@"
msgstr "@@use|Ota varuste käyttöön@@"
-#: src/gui/popupmenu.cpp:345
+#: src/gui/popupmenu.cpp:350
+msgid "@@use|Equip@@"
+msgstr "@@use|Ota varuste käyttöön@@"
+
+#: src/gui/popupmenu.cpp:353
msgid "@@use|Use@@"
msgstr "@@use|Käytä@@"
-#: src/gui/popupmenu.cpp:347
+#: src/gui/popupmenu.cpp:355
msgid "@@drop|Drop@@"
msgstr "@@drop|Pudota maahan@@"
-#: src/gui/popupmenu.cpp:350
+#: src/gui/popupmenu.cpp:359
msgid "@@split|Split@@"
msgstr "@@split|Pinon jako@@"
+#: src/gui/popupmenu.cpp:364
+#, fuzzy
+msgid "@@store|Store@@"
+msgstr "@@guild|Kutsu %s mukaan kiltaan@@"
+
+#: src/gui/popupmenu.cpp:371
+msgid "@@retrieve|Retrieve@@"
+msgstr ""
+
#: src/gui/quitdialog.cpp:37
msgid "Switch server"
msgstr "Vaihda palvelinta"
@@ -1175,20 +1159,32 @@ msgstr "Salasanan tulee olla alle %d merkkiä pitkä."
msgid "Passwords do not match."
msgstr "Salasanat eivät täsmää."
-#: src/gui/serverdialog.cpp:73
+#: src/gui/serverdialog.cpp:74
#, fuzzy
msgid "Choose your server"
msgstr "Valitse Mana World -palvelimesi"
-#: src/gui/serverdialog.cpp:163
+#: src/gui/serverdialog.cpp:164
msgid "Please type both the address and the port of a server."
msgstr "Kirjoita kenttiin sekä palvelimen osoite että portti"
-#: src/gui/serverselectdialog.cpp:50
+#: src/gui/serverselectdialog.cpp:59
#, fuzzy
msgid "Select Server"
msgstr "Vaihda palvelinta"
+#: src/gui/setup.cpp:64 src/gui/windowmenu.cpp:69 src/main.cpp:933
+msgid "Setup"
+msgstr "Asetukset"
+
+#: src/gui/setup.cpp:72
+msgid "Apply"
+msgstr "Käytä"
+
+#: src/gui/setup.cpp:72
+msgid "Reset Windows"
+msgstr "Palauta ikkunoiden oletusasetukset"
+
#: src/gui/setup_audio.cpp:41
msgid "Sound"
msgstr "Ääni"
@@ -1205,11 +1201,11 @@ msgstr "Äänitehosteiden voimakkuus"
msgid "Music volume"
msgstr "Musiikin voimakkuus"
-#: 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 ""
@@ -1217,23 +1213,23 @@ 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
#, fuzzy
msgid "Static"
msgstr "Hahmon tiedot"
#: 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 ""
#: 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
#, fuzzy
msgid "Spectrum"
msgstr "Asetukset"
@@ -1242,26 +1238,18 @@ msgstr "Asetukset"
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 "Käytä"
-
-#: src/gui/setup.cpp:73
-msgid "Reset Windows"
-msgstr "Palauta ikkunoiden oletusasetukset"
-
#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:78
msgid "Press the button to start calibration"
msgstr "Paina tätä nappia aloittaaksesi peliohjaimen kalibroinnin"
@@ -1332,7 +1320,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 ""
@@ -1360,157 +1348,178 @@ 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
+#, fuzzy
+msgid "Small"
+msgstr "Myy"
+
+#: 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 "Kokoruututila"
-#: 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 "Tyylitelty hiiren osoitin"
-#: src/gui/setup_video.cpp:126
+#: src/gui/setup_video.cpp:155
msgid "Visible names"
msgstr "Näytä nimet"
-#: 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 ""
-#: src/gui/setup_video.cpp:136
+#: src/gui/setup_video.cpp:167
msgid "FPS Limit:"
msgstr "Piirtonopeusrajoitin (kuvaa / sekunti)"
-#: src/gui/setup_video.cpp:152
+#: src/gui/setup_video.cpp:184
msgid "Video"
msgstr "Kuva"
-#: 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 "Käyttöliittymän läpinäkyvyys"
-#: src/gui/setup_video.cpp:159
+#: src/gui/setup_video.cpp:191
msgid "Scroll radius"
msgstr "Kameran perässälaahaus"
-#: src/gui/setup_video.cpp:160
+#: src/gui/setup_video.cpp:192
msgid "Scroll laziness"
msgstr "Kameran perässälaahauksen tiukkuus"
-#: src/gui/setup_video.cpp:161
+#: src/gui/setup_video.cpp:193
msgid "Ambient FX"
msgstr "Taustaäänet"
-#: 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
#, fuzzy
msgid "No text"
msgstr "Seuraava"
-#: src/gui/setup_video.cpp:236 src/gui/setup_video.cpp:498
+#: src/gui/setup_video.cpp:271 src/gui/setup_video.cpp:570
#, fuzzy
msgid "Bubbles, no names"
msgstr "Näytä nimet"
-#: 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 ""
-#: 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 "pois päältä"
-#: 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 "matala"
-#: 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 "korkea"
-#: 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
#, fuzzy
msgid "fullscreen"
msgstr "Kokoruututila"
-#: 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 "Kokoruututilaan siirtyminen"
-#: src/gui/setup_video.cpp:352
+#: src/gui/setup_video.cpp:422
msgid "Restart needed for changes to take effect."
msgstr "Ohjelma pitää käynnistää uudelleen, jotta muutokset astuvat voimaan."
-#: src/gui/setup_video.cpp:364
+#: src/gui/setup_video.cpp:434
msgid "Changing OpenGL"
msgstr "Vaihdetaan OpenGL -toimintatilaan"
-#: src/gui/setup_video.cpp:365
+#: src/gui/setup_video.cpp:435
msgid "Applying change to OpenGL requires restart."
msgstr "OpenGL -asetusten muutokset vaativat ohjelman uudelleenkäynnistyksen"
-#: 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
#, fuzzy
msgid "Restart your client for the change to take effect."
msgstr "Ohjelma pitää käynnistää uudelleen, jotta muutokset astuvat voimaan."
-#: 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 ""
@@ -1523,6 +1532,10 @@ msgstr "Taidot"
msgid "Mystery Skill"
msgstr ""
+#: src/gui/skill.cpp:126 src/gui/skilldialog.cpp:99 src/gui/windowmenu.cpp:62
+msgid "Skills"
+msgstr "Taidot"
+
#: src/gui/skill.cpp:145 src/gui/skill.cpp:197
#, c-format
msgid "Skill points: %d"
@@ -1532,15 +1545,6 @@ msgstr ""
msgid "Up"
msgstr ""
-#: src/gui/skill.cpp:146
-msgid "inc"
-msgstr ""
-
-#: src/gui/skill.cpp:147
-#, fuzzy
-msgid "use"
-msgstr "Käytä"
-
#: src/gui/skilldialog.cpp:113
msgid "Weapons"
msgstr ""
@@ -1550,179 +1554,179 @@ msgstr ""
msgid "Crafts"
msgstr "Luo"
-#: src/gui/status.cpp:57 src/gui/status.cpp:178
+#: src/gui/status.cpp:56 src/gui/status.cpp:177
#, fuzzy, c-format
msgid "Job: %d"
msgstr "Rahatilanne: %d"
-#: src/gui/status.cpp:61
+#: src/gui/status.cpp:60
msgid "HP:"
msgstr ""
-#: src/gui/status.cpp:64
+#: src/gui/status.cpp:63
msgid "Exp:"
msgstr ""
-#: src/gui/status.cpp:67
+#: src/gui/status.cpp:66
msgid "MP:"
msgstr ""
-#: src/gui/status.cpp:70
+#: src/gui/status.cpp:69
msgid "Job:"
msgstr ""
-#: src/gui/status.cpp:78
+#: src/gui/status.cpp:77
#, fuzzy
msgid "Stats"
msgstr "Hahmon tiedot"
-#: 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
#, fuzzy
msgid "Attack:"
msgstr "Hyökkäys %+d"
-#: src/gui/status.cpp:85
+#: src/gui/status.cpp:84
#, fuzzy
msgid "Defense:"
msgstr "Puolustus %+d"
-#: src/gui/status.cpp:86
+#: src/gui/status.cpp:85
#, fuzzy
msgid "M.Attack:"
msgstr "Hyökkäys %+d"
-#: src/gui/status.cpp:87
+#: src/gui/status.cpp:86
#, fuzzy
msgid "M.Defense:"
msgstr "Puolustus %+d"
-#: src/gui/status.cpp:89
+#: src/gui/status.cpp:88
#, no-c-format
msgid "% Accuracy:"
msgstr ""
-#: src/gui/status.cpp:91
+#: src/gui/status.cpp:90
#, no-c-format
msgid "% Evade:"
msgstr ""
-#: 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
#, fuzzy
msgid "Strength"
msgstr "Voima:"
-#: src/gui/status.cpp:200
+#: src/gui/status.cpp:199
#, fuzzy
msgid "Agility"
msgstr "Ketteryys:"
-#: src/gui/status.cpp:201
+#: src/gui/status.cpp:200
#, fuzzy
msgid "Vitality"
msgstr "Elinvoima:"
-#: src/gui/status.cpp:202
+#: src/gui/status.cpp:201
#, fuzzy
msgid "Intelligence"
msgstr "Älykkyys:"
-#: src/gui/status.cpp:203
+#: src/gui/status.cpp:202
#, fuzzy
msgid "Dexterity"
msgstr "Näppäryys:"
-#: 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 ""
-#: src/gui/status.cpp:383 src/gui/status.cpp:405
+#: src/gui/status.cpp:384
#, fuzzy
msgid "Max level"
msgstr "Miespuolinen"
-#: src/gui/storagewindow.cpp:53
+#: src/gui/storagewindow.cpp:54
msgid "Storage"
msgstr ""
-#: src/gui/storagewindow.cpp:64
+#: src/gui/storagewindow.cpp:65
#, fuzzy
msgid "Store"
msgstr "Lopeta"
-#: 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 "Ehdota vaihtokauppaa"
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:52
#, fuzzy
msgid "Confirmed. Waiting..."
msgstr "Yhdistetään..."
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:53
#, fuzzy
msgid "Agree trade"
msgstr "Ehdota vaihtokauppaa"
-#: 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 "Lisää"
-#: 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
#, fuzzy, c-format
msgid "You get %s."
msgstr "Sait %d GP"
-#: src/gui/trade.cpp:97
+#: src/gui/trade.cpp:96
msgid "You give:"
msgstr "Annat:"
-#: src/gui/trade.cpp:101
+#: src/gui/trade.cpp:100
msgid "Change"
msgstr "Muuta"
-#: 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 ""
@@ -1834,21 +1838,21 @@ msgstr ""
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 ""
-#: src/gui/widgets/chattab.cpp:147
+#: src/gui/widgets/chattab.cpp:146
#, c-format
msgid "%s whispers: "
msgstr ""
-#: 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 ""
@@ -1856,23 +1860,35 @@ msgstr ""
msgid "Cannot send empty chat!"
msgstr ""
-#: src/gui/widgets/whispertab.cpp:55
-#, c-format
-msgid "%s: %s"
-msgstr ""
-
-#: src/gui/widgets/whispertab.cpp:69
+#: src/gui/widgets/whispertab.cpp:68
msgid "/close > Close the whisper tab"
msgstr ""
-#: src/gui/widgets/whispertab.cpp:79
+#: src/gui/widgets/whispertab.cpp:78
msgid "Command: /close"
msgstr ""
-#: 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 "Hahmon tiedot"
+
+#: src/gui/windowmenu.cpp:65
+msgid "Guilds"
+msgstr "Kiltatoiminta"
+
+#: src/gui/windowmenu.cpp:66
+#, fuzzy
+msgid "Buddys"
+msgstr "Osta"
+
+#: src/gui/windowmenu.cpp:68
+msgid "Shortcut"
+msgstr "Pikavalinnat"
+
#: src/keyboardconfig.cpp:41
msgid "Move Up"
msgstr ""
@@ -2003,7 +2019,7 @@ msgstr "Palauta ikkunoiden oletusasetukset"
#: src/keyboardconfig.cpp:80
#, fuzzy
-msgid "Emote Window"
+msgid "Party Window"
msgstr "Palauta ikkunoiden oletusasetukset"
#: src/keyboardconfig.cpp:81
@@ -2053,165 +2069,169 @@ msgstr ""
msgid "Ignore input 2"
msgstr ""
-#: 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
#, fuzzy
msgid "Sword"
msgstr "Ääni"
-#: 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
#, fuzzy
msgid "Bow"
msgstr "matala"
-#: src/localplayer.cpp:856
+#: src/localplayer.cpp:841
msgid "Shooting"
msgstr ""
-#: src/localplayer.cpp:857
+#: src/localplayer.cpp:842
#, fuzzy
msgid "Mace"
msgstr "Miespuolinen"
-#: 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
#, fuzzy
msgid "Craft"
msgstr "Luo"
-#: 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 ""
-#: src/main.cpp:563
-msgid "Options: "
-msgstr ""
-
-#: src/main.cpp:564
-msgid " -C --configfile : Configuration file to use"
-msgstr ""
-
-#: src/main.cpp:565
-msgid " -d --data : Directory to load game data from"
-msgstr ""
-
-#: src/main.cpp:566
-msgid " -D --default : Bypass the login process with default settings"
+#: src/main.cpp:567
+msgid "Options:"
msgstr ""
#: src/main.cpp:568
-msgid " -h --help : Display this help"
+msgid " -C --config-file : Configuration file to use"
msgstr ""
#: src/main.cpp:569
-msgid " -S --homedir : Directory to use as home directory"
+msgid " -d --data : Directory to load game data from"
msgstr ""
#: src/main.cpp:570
-msgid " -H --updatehost : Use this update host"
-msgstr ""
-
-#: src/main.cpp:571
-msgid " -P --password : Login with this password"
+msgid " -D --default : Choose default character server and character"
msgstr ""
#: src/main.cpp:572
-msgid " -c --character : Login with this character"
+msgid " -h --help : Display this help"
msgstr ""
#: src/main.cpp:573
-msgid " -o --port : Login Server Port"
+msgid " -S --home-dir : Directory to use as home directory"
msgstr ""
#: src/main.cpp:574
-msgid " -s --server : Login Server name or IP"
+msgid " -H --update-host : Use this update host"
msgstr ""
#: src/main.cpp:575
-msgid " -u --skipupdate : Skip the update downloads"
+msgid " -P --password : Login with this password"
msgstr ""
#: src/main.cpp:576
-msgid " -U --username : Login with this username"
+msgid " -c --character : Login with this character"
msgstr ""
#: src/main.cpp:577
-msgid " -v --version : Display the version"
+msgid " -p --port : Login Server Port"
+msgstr ""
+
+#: src/main.cpp:578
+msgid " -s --server : Login Server name or IP"
+msgstr ""
+
+#: src/main.cpp:579
+msgid " -u --skip-update : Skip the update downloads"
+msgstr ""
+
+#: src/main.cpp:580
+msgid " -U --username : Login with this username"
msgstr ""
#: src/main.cpp:582
+msgid " -O --no-opengl : Disable OpenGL for this session"
+msgstr ""
+
+#: src/main.cpp:584
+msgid " -v --version : Display the version"
+msgstr ""
+
+#: src/main.cpp:589
#, fuzzy
msgid "The Mana World "
msgstr "Valitse Mana World -palvelimesi"
-#: src/main.cpp:1499
+#: src/main.cpp:1515
#, fuzzy
msgid "Connecting to map server..."
msgstr "Yhdistetään..."
-#: 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 ""
@@ -2293,18 +2313,18 @@ msgstr "Näppäryys:"
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 ""
@@ -2317,416 +2337,430 @@ msgstr "Poista varuste käytöstä"
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
#, fuzzy, c-format
msgid "Strength: %d"
msgstr "Voima:"
-#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:82
+#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:84
#, fuzzy, c-format
msgid "Agility: %d"
msgstr "Ketteryys:"
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:86
+#: src/net/ea/generalhandler.cpp:96 src/net/tmwserv/generalhandler.cpp:88
#, fuzzy, c-format
msgid "Vitality: %d"
msgstr "Elinvoima:"
-#: src/net/ea/generalhandler.cpp:96 src/net/tmwserv/generalhandler.cpp:88
+#: src/net/ea/generalhandler.cpp:98 src/net/tmwserv/generalhandler.cpp:90
#, fuzzy, c-format
msgid "Intelligence: %d"
msgstr "Älykkyys:"
-#: src/net/ea/generalhandler.cpp:98 src/net/tmwserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:100 src/net/tmwserv/generalhandler.cpp:86
#, fuzzy, c-format
msgid "Dexterity: %d"
msgstr "Näppäryys:"
-#: src/net/ea/generalhandler.cpp:100
+#: src/net/ea/generalhandler.cpp:102
#, c-format
msgid "Luck: %d"
msgstr ""
-#: 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 ""
-#: 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 ""
+
+#: src/net/ea/gui/partytab.cpp:53
msgid "/create > Create a new party"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:55
+#: src/net/ea/gui/partytab.cpp:54
msgid "/new > Alias of create"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:56
+#: src/net/ea/gui/partytab.cpp:55
msgid "/invite > Invite a player to your party"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:57
+#: src/net/ea/gui/partytab.cpp:56
msgid "/leave > Leave the party you are in"
msgstr ""
-#: 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 ""
-#: src/net/ea/gui/partytab.cpp:59
+#: src/net/ea/gui/partytab.cpp:58
msgid "/item > Show/change party item sharing options"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:60
+#: src/net/ea/gui/partytab.cpp:59
msgid "/exp > Show/change party experience sharing options"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:69
+#: src/net/ea/gui/partytab.cpp:68
msgid "Command: /new <party-name>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:70
+#: src/net/ea/gui/partytab.cpp:69
msgid "Command: /create <party-name>"
msgstr ""
-#: 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 ""
-#: src/net/ea/gui/partytab.cpp:75
+#: src/net/ea/gui/partytab.cpp:74
msgid "Command: /invite <nick>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:82
+#: src/net/ea/gui/partytab.cpp:81
msgid "Command: /leave"
msgstr ""
-#: 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 ""
-#: 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."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:92
+#: src/net/ea/gui/partytab.cpp:91
msgid "Command: /item"
msgstr ""
-#: 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 ""
-#: 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."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:102
+#: src/net/ea/gui/partytab.cpp:101
msgid "Command: /exp"
msgstr ""
-#: 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]"
+msgid "You picked up %s [@@%d|%s@@]"
msgstr ""
-#: 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
#, fuzzy
msgid "Unregistered ID"
msgstr "Poista palvelimelta"
-#: src/net/ea/loginhandler.cpp:114
+#: src/net/ea/loginhandler.cpp:113
#, fuzzy
msgid "Wrong password"
msgstr "Vaihda salasana"
-#: src/net/ea/loginhandler.cpp:117
+#: src/net/ea/loginhandler.cpp:116
#, fuzzy
msgid "Account expired"
msgstr "Tili: %s"
-#: 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 ""
-#: 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"
" Please contact the GM team via the forums."
msgstr ""
-#: 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."
+#: src/net/ea/partyhandler.cpp:77
+msgid "Could not create party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:82
-msgid "Could not create party."
+#: src/net/ea/partyhandler.cpp:80
+msgid "Party successfully created."
msgstr ""
-#: src/net/ea/partyhandler.cpp:112
+#: src/net/ea/partyhandler.cpp:115
#, c-format
msgid "%s is already a member of a party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:116
+#: src/net/ea/partyhandler.cpp:119
#, c-format
msgid "%s refused your invitation."
msgstr ""
-#: src/net/ea/partyhandler.cpp:120
+#: src/net/ea/partyhandler.cpp:123
#, c-format
msgid "%s is now a member of your party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:124
+#: src/net/ea/partyhandler.cpp:127
#, c-format
msgid "Unknown invite response for %s."
msgstr ""
-#: 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 ""
-#: src/net/ea/partyhandler.cpp:269
+#: src/net/ea/partyhandler.cpp:272
#, c-format
msgid "An unknown member tried to say: %s"
msgstr ""
-#: 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 ""
-#: 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"
+#: 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 ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
@@ -2884,40 +2918,101 @@ msgstr ""
msgid "Willpower:"
msgstr "Tahdonvoima:"
-#: 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
#, fuzzy, c-format
msgid "Willpower: %d"
msgstr "Tahdonvoima:"
-#: 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
+#, fuzzy
+msgid "Server is full"
+msgstr "Palvelin:"
+
+#: 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
+#, fuzzy
+msgid "New email address incorrect"
+msgstr "Vaihda sähköpostiosoite"
+
+#: src/net/tmwserv/loginhandler.cpp:143
+#, fuzzy
+msgid "Old email address incorrect"
+msgstr "Vaihda sähköpostiosoite"
+
+#: src/net/tmwserv/loginhandler.cpp:149
+#, fuzzy
+msgid "The new Email Address already exists."
+msgstr "Vaihda sähköpostiosoite"
+
+#: 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 "Vaihda salasana"
+
+#: src/net/tmwserv/loginhandler.cpp:211
+msgid "Wrong username, password or email address"
+msgstr ""
+
+#: src/net/tmwserv/loginhandler.cpp:214
+msgid "Username already exists"
+msgstr ""
+
+#: src/net/tmwserv/loginhandler.cpp:217
+msgid "Email address already exists"
+msgstr ""
+
+#: src/resources/itemdb.cpp:52
#, c-format
msgid "Attack %+d"
msgstr "Hyökkäys %+d"
-#: src/resources/itemdb.cpp:54
+#: src/resources/itemdb.cpp:53
#, c-format
msgid "Defense %+d"
msgstr "Puolustus %+d"
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:54
#, c-format
msgid "HP %+d"
msgstr "Iskupisteet %+d"
-#: src/resources/itemdb.cpp:56
+#: src/resources/itemdb.cpp:55
#, c-format
msgid "MP %+d"
msgstr "Taikapisteet %+d"
-#: src/resources/itemdb.cpp:113
+#: src/resources/itemdb.cpp:112
msgid "items.xml"
msgstr ""
-#: src/resources/itemdb.cpp:151
+#: src/resources/itemdb.cpp:150
msgid "Unnamed"
msgstr ""
@@ -2933,6 +3028,20 @@ msgstr ""
msgid "NPC Database: Error while loading npcs.xml!"
msgstr ""
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "> Cancel\n"
+#~ msgstr "Peru"
+
+#, fuzzy
+#~ msgid "use"
+#~ msgstr "Käytä"
+
+#, fuzzy
+#~ msgid "Emote Window"
+#~ msgstr "Palauta ikkunoiden oletusasetukset"
+
#~ msgid "@@description|Description@@"
#~ msgstr "@@description|Kuvaus@@"
diff --git a/po/fr.po b/po/fr.po
index 3ec34201..060f9154 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -8,7 +8,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-04-21 17:27+0200\n"
+"POT-Creation-Date: 2009-05-10 15:53+0200\n"
"PO-Revision-Date: 2008-12-26 10:43+0000\n"
"Last-Translator: Johan Serre <Unknown>\n"
"Language-Team: French\n"
@@ -18,287 +18,287 @@ msgstr ""
"X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
"X-Generator: Launchpad (build Unknown)\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."
+#: src/commandhandler.cpp:142
+msgid "/help > Display this help"
msgstr ""
-#: src/commandhandler.cpp:145
+#: src/commandhandler.cpp:144
msgid "/where > Display map name"
msgstr ""
-#: src/commandhandler.cpp:146
+#: src/commandhandler.cpp:145
msgid "/who > Display number of online users"
msgstr ""
-#: src/commandhandler.cpp:147
+#: src/commandhandler.cpp:146
msgid "/me > Tell something about yourself"
msgstr ""
-#: src/commandhandler.cpp:149
+#: src/commandhandler.cpp:148
msgid "/clear > Clears this window"
msgstr ""
-#: src/commandhandler.cpp:151
+#: src/commandhandler.cpp:150
msgid "/msg > Send a private message to a user"
msgstr ""
-#: src/commandhandler.cpp:152
+#: src/commandhandler.cpp:151
msgid "/whisper > Alias of msg"
msgstr ""
-#: src/commandhandler.cpp:153
+#: src/commandhandler.cpp:152
msgid "/w > Alias of msg"
msgstr ""
-#: src/commandhandler.cpp:154
+#: src/commandhandler.cpp:153
msgid "/query > Makes a tab for private messages with another user"
msgstr ""
-#: src/commandhandler.cpp:155
+#: src/commandhandler.cpp:154
msgid "/q > Alias of query"
msgstr ""
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:156
msgid "/list > Display all public channels"
msgstr ""
-#: src/commandhandler.cpp:158
+#: src/commandhandler.cpp:157
msgid "/join > Join or create a channel"
msgstr ""
-#: src/commandhandler.cpp:160
+#: src/commandhandler.cpp:159
#, fuzzy
msgid "/party > Invite a user to party"
msgstr "@@partie| Invitation de %s à joindre votre partie @@"
-#: src/commandhandler.cpp:162
+#: src/commandhandler.cpp:161
msgid "/record > Start recording the chat to an external file"
msgstr ""
-#: 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 ""
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:165
msgid "/announce > Global announcement (GM only)"
msgstr ""
-#: src/commandhandler.cpp:170
+#: src/commandhandler.cpp:169
msgid "For more information, type /help <command>"
msgstr ""
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:173
msgid "Command: /help"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: src/commandhandler.cpp:186
+#: src/commandhandler.cpp:185
msgid "*** only available to a GM ***"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: src/commandhandler.cpp:209
+#: src/commandhandler.cpp:208
msgid "This command tell others you are (doing) <msg>."
msgstr ""
-#: src/commandhandler.cpp:213
+#: src/commandhandler.cpp:212
msgid "Command: /msg <nick> <message>"
msgstr ""
-#: src/commandhandler.cpp:214
+#: src/commandhandler.cpp:213
msgid "Command: /whisper <nick> <message>"
msgstr ""
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:214
msgid "Command: /w <nick> <message>"
msgstr ""
-#: src/commandhandler.cpp:216
+#: src/commandhandler.cpp:215
msgid "This command sends the text <message> to <nick>."
msgstr ""
-#: 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 ""
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:222
msgid "Command: /q <nick>"
msgstr ""
-#: src/commandhandler.cpp:224
+#: src/commandhandler.cpp:223
msgid "This command tries to make a tab for whispers betweenyou and <nick>."
msgstr ""
-#: src/commandhandler.cpp:229
+#: src/commandhandler.cpp:228
msgid "Command: /party <nick>"
msgstr ""
-#: 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 ""
-#: src/commandhandler.cpp:236
+#: src/commandhandler.cpp:235
msgid "Command: /present"
msgstr ""
-#: 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 ""
-#: src/commandhandler.cpp:244
+#: src/commandhandler.cpp:243
msgid "This command starts recording the chat log to the file <filename>."
msgstr ""
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:245
msgid "Command: /record"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: src/commandhandler.cpp:257
+#: src/commandhandler.cpp:256
msgid "Command: /toggle"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: src/commandhandler.cpp:336
-msgid "Cannont send empty whispers!"
+#: 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 ""
-#: 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 ""
@@ -307,46 +307,46 @@ msgstr ""
msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
msgstr ""
-#: 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"
+#: src/game.cpp:481
+msgid "The connection to the server was lost, the program will now quit"
msgstr ""
-#: src/game.cpp:493
-msgid "The connection to the server was lost, the program will now quit"
+#: src/game.cpp:487
+msgid "Network Error"
msgstr ""
-#: src/game.cpp:664 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
+#: 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 "Quitter"
-#: src/game.cpp:665
+#: src/game.cpp:647
#, fuzzy
msgid "Are you sure you want to quit?"
msgstr "Êtes-vous certain de vouloir supprimer ce personnage ?"
-#: 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 ""
@@ -359,12 +359,12 @@ msgstr "Acheter"
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 "Acheter"
#: 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
#, fuzzy, c-format
msgid "Price: %s / Total: %s"
msgstr "Prix : %d PO / Total : %d PO"
@@ -374,13 +374,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 "Description : %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 "Effet : %s"
@@ -390,205 +390,213 @@ msgstr "Effet : %s"
msgid "Shop"
msgstr "Stop"
-#: 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 "Vendre"
-#: 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 "Annuler"
-#: 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 "Changer l'adresse email"
-#: 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 "Compte: %s"
-#: src/gui/changeemaildialog.cpp:48
+#: src/gui/changeemaildialog.cpp:49
#, fuzzy
msgid "Type New Email Address twice:"
msgstr "Changer l'adresse email"
-#: 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 "Changer le mot de passe"
-#: 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 "Mot de passe :"
-#: 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 "Création du personnage"
-#: 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 "Nom :"
-#: src/gui/charcreatedialog.cpp:70
+#: src/gui/charcreatedialog.cpp:69
msgid "Hair Color:"
msgstr "Couleur des cheveux"
-#: src/gui/charcreatedialog.cpp:73
+#: src/gui/charcreatedialog.cpp:72
msgid "Hair Style:"
msgstr "Coiffure :"
-#: src/gui/charcreatedialog.cpp:74
+#: src/gui/charcreatedialog.cpp:73
msgid "Create"
msgstr "Créer"
-#: src/gui/charcreatedialog.cpp:76 src/gui/register.cpp:75
+#: src/gui/charcreatedialog.cpp:75 src/gui/register.cpp:75
msgid "Male"
msgstr "Masculin"
-#: src/gui/charcreatedialog.cpp:77 src/gui/register.cpp:76
+#: src/gui/charcreatedialog.cpp:76 src/gui/register.cpp:76
msgid "Female"
msgstr "Féminin"
-#: 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 "Veuillez distribuer %d points"
-#: 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 "Erreur"
-#: src/gui/charcreatedialog.cpp:174
+#: 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"
-#: src/gui/charcreatedialog.cpp:227
+#: src/gui/charcreatedialog.cpp:226
msgid "Character stats OK"
msgstr "Caractéristiques Ok"
-#: src/gui/charcreatedialog.cpp:239
+#: src/gui/charcreatedialog.cpp:238
#, c-format
msgid "Please remove %d points"
msgstr "Veuillez retirer %d points"
-#: src/gui/char_select.cpp:79
+#: src/gui/charselectdialog.cpp:78
msgid "Confirm Character Delete"
msgstr "Confirmer la suppression du personnage"
-#: src/gui/char_select.cpp:80
+#: src/gui/charselectdialog.cpp:79
msgid "Are you sure you want to delete this character?"
msgstr "Êtes-vous certain de vouloir supprimer ce personnage ?"
-#: src/gui/char_select.cpp:98
+#: src/gui/charselectdialog.cpp:97
msgid "Account and Character Management"
msgstr "Gestion du compte et du personnage"
-#: src/gui/char_select.cpp:105
+#: src/gui/charselectdialog.cpp:104
msgid "Select Character"
msgstr "Choix du personnage"
-#: 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 "Ok"
-#: src/gui/char_select.cpp:113
+#: src/gui/charselectdialog.cpp:112
msgid "Previous"
msgstr "Précédent"
-#: 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 "Suivant"
-#: 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 "Nom : %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 "Niveau : %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 "Nouveau"
-#: 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 "Supprimer"
-#: src/gui/char_select.cpp:120 src/gui/unregisterdialog.cpp:51
+#: src/gui/charselectdialog.cpp:119 src/gui/unregisterdialog.cpp:52
msgid "Unregister"
msgstr "Se désinscrire"
-#: src/gui/char_select.cpp:127
+#: src/gui/charselectdialog.cpp:126
#, c-format
msgid "Money: %d"
msgstr "Argent : %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
#, fuzzy, c-format
msgid "Job Level: %d"
msgstr "Niveau : %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
#, fuzzy, c-format
msgid "Money: %s"
msgstr "Argent : %d"
-#: 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
#, fuzzy
msgid "Chat"
msgstr "Créer"
-#: src/gui/chat.cpp:341 src/gui/chat.cpp:347
+#: src/gui/chat.cpp:332
+#, c-format
+msgid "%d players are present."
+msgstr ""
+
+#: 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 ""
-#: src/gui/confirm_dialog.cpp:42
+#: src/gui/confirmdialog.cpp:42
msgid "Yes"
msgstr "Oui"
-#: src/gui/confirm_dialog.cpp:43
+#: src/gui/confirmdialog.cpp:43
msgid "No"
msgstr "Non"
@@ -596,26 +604,16 @@ msgstr "Non"
msgid "Connecting..."
msgstr "Connexion..."
-#: src/gui/emotecontainer.cpp:61
+#: src/gui/emotepopup.cpp:64
msgid "Unable to load selection.png"
msgstr ""
-#: 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 "Utiliser"
-
-#: src/gui/equipmentwindow.cpp:68 src/gui/menuwindow.cpp:67
+#: src/gui/equipmentwindow.cpp:68 src/gui/windowmenu.cpp:60
msgid "Equipment"
msgstr "Équipement"
-#: 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 "Retirer"
@@ -642,100 +640,103 @@ msgstr "Guildes"
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 "Inventaire"
-#: 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 "Équiper"
-#: 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 "Utiliser"
+
+#: src/gui/inventorywindow.cpp:80
msgid "Drop"
msgstr "Lâcher"
-#: src/gui/inventorywindow.cpp:79
+#: src/gui/inventorywindow.cpp:81
msgid "Split"
msgstr "Partager"
-#: 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 "Choisissez le nombre d'objets à troquer."
-#: src/gui/item_amount.cpp:95
+#: src/gui/itemamount.cpp:124
msgid "Select amount of items to drop."
msgstr "Choisissez le nombre d'objets à lâcher."
-#: src/gui/item_amount.cpp:98
+#: src/gui/itemamount.cpp:127
#, fuzzy
msgid "Select amount of items to store."
msgstr "Choisissez le nombre d'objets à troquer."
-#: src/gui/item_amount.cpp:101
+#: src/gui/itemamount.cpp:130
#, fuzzy
msgid "Select amount of items to retrieve."
msgstr "Choisissez le nombre d'objets à troquer."
-#: src/gui/item_amount.cpp:104
+#: src/gui/itemamount.cpp:133
msgid "Select amount of items to split."
msgstr "Choisissez le nombre d'objets à déplacer."
-#: 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 "Connexion"
-#: 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 "Serveur :"
-#: 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 :"
-#: src/gui/login.cpp:55
+#: src/gui/login.cpp:56
#, fuzzy
msgid "Recent:"
msgstr "S'inscrire"
-#: src/gui/login.cpp:72
+#: src/gui/login.cpp:73
msgid "Remember Username"
msgstr "Se souvenir du nom d'utilisateur"
-#: 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 "S'inscrire"
-#: 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 ""
@@ -751,71 +752,44 @@ msgstr ""
msgid "Cast Test Spell 3"
msgstr ""
-#: src/gui/menuwindow.cpp:66
-msgid "Status"
-msgstr "Statut"
-
-#: src/gui/menuwindow.cpp:69 src/gui/skill.cpp:126 src/gui/skilldialog.cpp:99
-msgid "Skills"
-msgstr "Compétences"
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
+#, fuzzy
+msgid "Map"
+msgstr "Plan"
-#: src/gui/menuwindow.cpp:72
-msgid "Guilds"
-msgstr "Guildes"
+#: src/gui/npcdialog.cpp:43
+msgid "Waiting for server"
+msgstr ""
-#: src/gui/menuwindow.cpp:73
+#: src/gui/npcdialog.cpp:46
#, fuzzy
-msgid "Buddys"
-msgstr "Acheter"
-
-#: src/gui/menuwindow.cpp:75
-msgid "Shortcut"
-msgstr "Raccourci"
+msgid "Submit"
+msgstr "Partager"
-#: src/gui/menuwindow.cpp:77 src/gui/setup.cpp:65 src/main.cpp:920
-msgid "Setup"
-msgstr "Configuration"
+#: src/gui/npcdialog.cpp:49 src/gui/npcpostdialog.cpp:39
+msgid "NPC"
+msgstr "PNJ"
-#: src/gui/minimap.cpp:39
-msgid "MiniMap"
-msgstr "Plan"
+#: src/gui/npcdialog.cpp:95
+msgid "+"
+msgstr ""
-#: src/gui/npcintegerdialog.cpp:39
-msgid "NPC Number Request"
+#: src/gui/npcdialog.cpp:96
+msgid "-"
msgstr ""
-#: src/gui/npcintegerdialog.cpp:50
+#: src/gui/npcdialog.cpp:105
#, fuzzy
msgid "Reset"
msgstr "S'inscrire"
-#: src/gui/npcintegerdialog.cpp:101 src/gui/npclistdialog.cpp:123
-#: src/gui/npcstringdialog.cpp:75
-#, fuzzy
-msgid ""
-"\n"
-"> Cancel\n"
-msgstr "Annuler"
-
-#: src/gui/npcpostdialog.cpp:39 src/gui/npc_text.cpp:37
-msgid "NPC"
-msgstr "PNJ"
-
#: src/gui/npcpostdialog.cpp:51
#, fuzzy
msgid "Send"
msgstr "Son"
-#: src/gui/npcstringdialog.cpp:39
-msgid "NPC Text Request"
-msgstr ""
-
-#: 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
#, fuzzy
msgid "Text"
msgstr "Suivant"
@@ -870,7 +844,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
#, fuzzy
msgid "Party"
msgstr "Port :"
@@ -893,7 +867,7 @@ msgid "Being"
msgstr ""
#: src/gui/palette.cpp:104
-msgid "Other Player's Names"
+msgid "Other Players' Names"
msgstr ""
#: src/gui/palette.cpp:105
@@ -920,21 +894,22 @@ msgid "Unknown Item Type"
msgstr ""
#: src/gui/palette.cpp:111
-msgid "Generic"
+msgid "Generics"
msgstr ""
#: src/gui/palette.cpp:112
-msgid "Hat"
-msgstr ""
+#, fuzzy
+msgid "Hats"
+msgstr "Statut"
#: src/gui/palette.cpp:113
#, fuzzy
-msgid "Usable"
+msgid "Usables"
msgstr "Utiliser"
#: src/gui/palette.cpp:114
#, fuzzy
-msgid "Shirt"
+msgid "Shirts"
msgstr "Raccourci"
#: src/gui/palette.cpp:115
@@ -957,15 +932,15 @@ msgstr ""
#: src/gui/palette.cpp:119
#, fuzzy
-msgid "Shield"
+msgid "Shields"
msgstr "Vendre"
#: src/gui/palette.cpp:120
-msgid "Ring"
+msgid "Rings"
msgstr ""
#: src/gui/palette.cpp:121
-msgid "Necklace"
+msgid "Necklaces"
msgstr ""
#: src/gui/palette.cpp:122
@@ -1021,95 +996,104 @@ msgstr ""
msgid "1/4 HP Bar"
msgstr ""
-#: src/gui/popupmenu.cpp:73
+#: src/gui/popupmenu.cpp:75
msgid "@@name|Add name to chat@@"
msgstr ""
-#: src/gui/popupmenu.cpp:85
+#: src/gui/popupmenu.cpp:87
#, c-format
msgid "@@trade|Trade With %s@@"
msgstr "@@trade|Troquer avec %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 "@@attack|Attaquer %s@@"
-#: src/gui/popupmenu.cpp:92
+#: src/gui/popupmenu.cpp:94
#, c-format
msgid "@@friend|Befriend %s@@"
msgstr ""
-#: 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
#, fuzzy, c-format
msgid "@@ignore|Ignore %s@@"
msgstr "@@guilde|Invite %s@@"
-#: 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
#, fuzzy, c-format
msgid "@@guild|Invite %s to join your guild@@"
msgstr "@@partie| Invitation de %s à joindre votre partie @@"
-#: src/gui/popupmenu.cpp:112
+#: src/gui/popupmenu.cpp:114
#, c-format
msgid "@@party|Invite %s to join your party@@"
msgstr "@@partie| Invitation de %s à joindre votre partie @@"
-#: src/gui/popupmenu.cpp:123
+#: src/gui/popupmenu.cpp:125
#, fuzzy, c-format
msgid "@@talk|Talk To %s@@"
msgstr "@@talk|Parler au PNJ@@"
-#: 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 "@@cancel|Annuler@@"
-#: src/gui/popupmenu.cpp:155
-#, c-format
-msgid "@@pickup|Pick Up %s@@"
+#: src/gui/popupmenu.cpp:157
+#, fuzzy, c-format
+msgid "@@pickup|Pick up %s@@"
msgstr "@@pickup|Ramasser %s@@"
-#: src/gui/popupmenu.cpp:156 src/gui/popupmenu.cpp:352
-msgid "@@chat|Add to Chat@@"
+#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:373
+msgid "@@chat|Add to chat@@"
msgstr ""
-#: src/gui/popupmenu.cpp:336 src/gui/popupmenu.cpp:341
-msgid "@@use|Equip@@"
-msgstr "@@use|Équiper@@"
-
-#: src/gui/popupmenu.cpp:339
+#: src/gui/popupmenu.cpp:348
#, fuzzy
msgid "@@use|Unequip@@"
msgstr "@@use|Équiper@@"
-#: src/gui/popupmenu.cpp:345
+#: src/gui/popupmenu.cpp:350
+msgid "@@use|Equip@@"
+msgstr "@@use|Équiper@@"
+
+#: src/gui/popupmenu.cpp:353
msgid "@@use|Use@@"
msgstr "@@use|Utiliser@@"
-#: src/gui/popupmenu.cpp:347
+#: src/gui/popupmenu.cpp:355
msgid "@@drop|Drop@@"
msgstr "@@drop|Lâcher@@"
-#: src/gui/popupmenu.cpp:350
+#: src/gui/popupmenu.cpp:359
msgid "@@split|Split@@"
msgstr "@@split|Partager@@"
+#: src/gui/popupmenu.cpp:364
+#, fuzzy
+msgid "@@store|Store@@"
+msgstr "@@guilde|Invite %s@@"
+
+#: src/gui/popupmenu.cpp:371
+msgid "@@retrieve|Retrieve@@"
+msgstr ""
+
#: src/gui/quitdialog.cpp:37
msgid "Switch server"
msgstr "Changer de serveur"
@@ -1179,20 +1163,32 @@ msgstr "Le mot de passe doit faire moins de %d caractères."
msgid "Passwords do not match."
msgstr "Les deux mots de passe ne correspondent pas."
-#: src/gui/serverdialog.cpp:73
+#: src/gui/serverdialog.cpp:74
#, fuzzy
msgid "Choose your server"
msgstr "Choisissez votre serveur The Mana World"
-#: src/gui/serverdialog.cpp:163
+#: src/gui/serverdialog.cpp:164
msgid "Please type both the address and the port of a server."
msgstr "Veuillez entrer l'adresse et le port du serveur."
-#: src/gui/serverselectdialog.cpp:50
+#: src/gui/serverselectdialog.cpp:59
#, fuzzy
msgid "Select Server"
msgstr "Choix du personnage"
+#: src/gui/setup.cpp:64 src/gui/windowmenu.cpp:69 src/main.cpp:933
+msgid "Setup"
+msgstr "Configuration"
+
+#: src/gui/setup.cpp:72
+msgid "Apply"
+msgstr "Appliquer"
+
+#: src/gui/setup.cpp:72
+msgid "Reset Windows"
+msgstr "Rétablir les fenêtres"
+
#: src/gui/setup_audio.cpp:41
msgid "Sound"
msgstr "Son"
@@ -1209,11 +1205,11 @@ msgstr "Volume des effets sonores"
msgid "Music volume"
msgstr "Volume de la musique"
-#: 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 ""
@@ -1221,23 +1217,23 @@ 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
#, fuzzy
msgid "Static"
msgstr "Statut"
#: 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 ""
#: 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
#, fuzzy
msgid "Spectrum"
msgstr "Configuration"
@@ -1246,26 +1242,18 @@ msgstr "Configuration"
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 "Appliquer"
-
-#: src/gui/setup.cpp:73
-msgid "Reset Windows"
-msgstr "Rétablir les fenêtres"
-
#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:78
msgid "Press the button to start calibration"
msgstr "Presser le bouton pour démarrer la calibration"
@@ -1336,7 +1324,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 ""
@@ -1364,160 +1352,181 @@ 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
+#, fuzzy
+msgid "Small"
+msgstr "Vendre"
+
+#: 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 "Plein écran"
-#: 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 "Curseur personnalisé"
-#: src/gui/setup_video.cpp:126
+#: src/gui/setup_video.cpp:155
msgid "Visible names"
msgstr "Afficher les noms"
-#: 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 ""
-#: src/gui/setup_video.cpp:136
+#: src/gui/setup_video.cpp:167
msgid "FPS Limit:"
msgstr "Limite FPS :"
-#: src/gui/setup_video.cpp:152
+#: src/gui/setup_video.cpp:184
msgid "Video"
msgstr "Vidéo"
-#: 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 "Opacité de l'interface"
-#: src/gui/setup_video.cpp:159
+#: src/gui/setup_video.cpp:191
msgid "Scroll radius"
msgstr "Rayon du scrolling"
-#: src/gui/setup_video.cpp:160
+#: src/gui/setup_video.cpp:192
msgid "Scroll laziness"
msgstr "Paresse du scrolling"
-#: src/gui/setup_video.cpp:161
+#: src/gui/setup_video.cpp:193
msgid "Ambient FX"
msgstr "Effets ambiants"
-#: 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
#, fuzzy
msgid "No text"
msgstr "Suivant"
-#: src/gui/setup_video.cpp:236 src/gui/setup_video.cpp:498
+#: src/gui/setup_video.cpp:271 src/gui/setup_video.cpp:570
#, fuzzy
msgid "Bubbles, no names"
msgstr "Afficher les noms"
-#: 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 ""
-#: 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 "aucun"
-#: 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 "léger"
-#: 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 "complet"
-#: 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
#, fuzzy
msgid "fullscreen"
msgstr "Plein écran"
-#: 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 "Passage en plein écran"
-#: src/gui/setup_video.cpp:352
+#: src/gui/setup_video.cpp:422
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:364
+#: src/gui/setup_video.cpp:434
msgid "Changing OpenGL"
msgstr "Changement OpenGL"
-#: src/gui/setup_video.cpp:365
+#: src/gui/setup_video.cpp:435
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:448
+#: src/gui/setup_video.cpp:520
msgid "Screen resolution changed"
msgstr ""
-#: src/gui/setup_video.cpp:449
+#: src/gui/setup_video.cpp:521
#, fuzzy
msgid "Restart your client for the change to take effect."
msgstr ""
"Les changements ne seront pris en compte qu'au prochain démarrage du jeu."
-#: 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 ""
@@ -1530,6 +1539,10 @@ msgstr "Compétences"
msgid "Mystery Skill"
msgstr ""
+#: src/gui/skill.cpp:126 src/gui/skilldialog.cpp:99 src/gui/windowmenu.cpp:62
+msgid "Skills"
+msgstr "Compétences"
+
#: src/gui/skill.cpp:145 src/gui/skill.cpp:197
#, c-format
msgid "Skill points: %d"
@@ -1539,15 +1552,6 @@ msgstr ""
msgid "Up"
msgstr ""
-#: src/gui/skill.cpp:146
-msgid "inc"
-msgstr ""
-
-#: src/gui/skill.cpp:147
-#, fuzzy
-msgid "use"
-msgstr "Utiliser"
-
#: src/gui/skilldialog.cpp:113
msgid "Weapons"
msgstr ""
@@ -1557,180 +1561,180 @@ msgstr ""
msgid "Crafts"
msgstr "Créer"
-#: src/gui/status.cpp:57 src/gui/status.cpp:178
+#: src/gui/status.cpp:56 src/gui/status.cpp:177
#, fuzzy, c-format
msgid "Job: %d"
msgstr "Niveau : %d"
-#: src/gui/status.cpp:61
+#: src/gui/status.cpp:60
msgid "HP:"
msgstr ""
-#: src/gui/status.cpp:64
+#: src/gui/status.cpp:63
msgid "Exp:"
msgstr ""
-#: src/gui/status.cpp:67
+#: src/gui/status.cpp:66
msgid "MP:"
msgstr ""
-#: src/gui/status.cpp:70
+#: src/gui/status.cpp:69
#, fuzzy
msgid "Job:"
msgstr "Niveau : %d"
-#: src/gui/status.cpp:78
+#: src/gui/status.cpp:77
#, fuzzy
msgid "Stats"
msgstr "Statut"
-#: 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
#, fuzzy
msgid "Attack:"
msgstr "Attaque %+d"
-#: src/gui/status.cpp:85
+#: src/gui/status.cpp:84
#, fuzzy
msgid "Defense:"
msgstr "Défense %+d"
-#: src/gui/status.cpp:86
+#: src/gui/status.cpp:85
#, fuzzy
msgid "M.Attack:"
msgstr "Attaque %+d"
-#: src/gui/status.cpp:87
+#: src/gui/status.cpp:86
#, fuzzy
msgid "M.Defense:"
msgstr "Défense %+d"
-#: src/gui/status.cpp:89
+#: src/gui/status.cpp:88
#, no-c-format
msgid "% Accuracy:"
msgstr ""
-#: src/gui/status.cpp:91
+#: src/gui/status.cpp:90
#, no-c-format
msgid "% Evade:"
msgstr ""
-#: 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
#, fuzzy
msgid "Strength"
msgstr "Force :"
-#: src/gui/status.cpp:200
+#: src/gui/status.cpp:199
#, fuzzy
msgid "Agility"
msgstr "Agilité :"
-#: src/gui/status.cpp:201
+#: src/gui/status.cpp:200
#, fuzzy
msgid "Vitality"
msgstr "Vitalité :"
-#: src/gui/status.cpp:202
+#: src/gui/status.cpp:201
#, fuzzy
msgid "Intelligence"
msgstr "Intelligence :"
-#: src/gui/status.cpp:203
+#: src/gui/status.cpp:202
#, fuzzy
msgid "Dexterity"
msgstr "Dextérité :"
-#: 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 ""
-#: src/gui/status.cpp:383 src/gui/status.cpp:405
+#: src/gui/status.cpp:384
#, fuzzy
msgid "Max level"
msgstr "Masculin"
-#: src/gui/storagewindow.cpp:53
+#: src/gui/storagewindow.cpp:54
msgid "Storage"
msgstr ""
-#: src/gui/storagewindow.cpp:64
+#: src/gui/storagewindow.cpp:65
#, fuzzy
msgid "Store"
msgstr "Stop"
-#: 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 "Proposer ce troc"
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:52
#, fuzzy
msgid "Confirmed. Waiting..."
msgstr "Connexion..."
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:53
#, fuzzy
msgid "Agree trade"
msgstr "Proposer ce troc"
-#: 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 "Ajouter"
-#: 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
#, fuzzy, c-format
msgid "You get %s."
msgstr "Vous obtenez %d PO."
-#: src/gui/trade.cpp:97
+#: src/gui/trade.cpp:96
msgid "You give:"
msgstr "Vous donnez :"
-#: src/gui/trade.cpp:101
+#: src/gui/trade.cpp:100
msgid "Change"
msgstr "Changer"
-#: 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 ""
@@ -1842,21 +1846,21 @@ msgstr ""
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 ""
-#: src/gui/widgets/chattab.cpp:147
+#: src/gui/widgets/chattab.cpp:146
#, c-format
msgid "%s whispers: "
msgstr ""
-#: 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 ""
@@ -1864,23 +1868,35 @@ msgstr ""
msgid "Cannot send empty chat!"
msgstr ""
-#: src/gui/widgets/whispertab.cpp:55
-#, c-format
-msgid "%s: %s"
-msgstr ""
-
-#: src/gui/widgets/whispertab.cpp:69
+#: src/gui/widgets/whispertab.cpp:68
msgid "/close > Close the whisper tab"
msgstr ""
-#: src/gui/widgets/whispertab.cpp:79
+#: src/gui/widgets/whispertab.cpp:78
msgid "Command: /close"
msgstr ""
-#: 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 "Statut"
+
+#: src/gui/windowmenu.cpp:65
+msgid "Guilds"
+msgstr "Guildes"
+
+#: src/gui/windowmenu.cpp:66
+#, fuzzy
+msgid "Buddys"
+msgstr "Acheter"
+
+#: src/gui/windowmenu.cpp:68
+msgid "Shortcut"
+msgstr "Raccourci"
+
#: src/keyboardconfig.cpp:41
msgid "Move Up"
msgstr ""
@@ -2012,7 +2028,7 @@ msgstr "Rétablir les fenêtres"
#: src/keyboardconfig.cpp:80
#, fuzzy
-msgid "Emote Window"
+msgid "Party Window"
msgstr "Rétablir les fenêtres"
#: src/keyboardconfig.cpp:81
@@ -2063,166 +2079,170 @@ msgstr ""
msgid "Ignore input 2"
msgstr ""
-#: 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
#, fuzzy
msgid "Sword"
msgstr "Son"
-#: src/localplayer.cpp:852
+#: src/localplayer.cpp:837
msgid "Polearm"
msgstr ""
-#: src/localplayer.cpp:853
+#: src/localplayer.cpp:838
#, fuzzy
msgid "Staff"
msgstr "Statut"
-#: src/localplayer.cpp:854
+#: src/localplayer.cpp:839
msgid "Whip"
msgstr ""
-#: src/localplayer.cpp:855
+#: src/localplayer.cpp:840
#, fuzzy
msgid "Bow"
msgstr "léger"
-#: src/localplayer.cpp:856
+#: src/localplayer.cpp:841
msgid "Shooting"
msgstr ""
-#: src/localplayer.cpp:857
+#: src/localplayer.cpp:842
#, fuzzy
msgid "Mace"
msgstr "Masculin"
-#: 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
#, fuzzy
msgid "Craft"
msgstr "Créer"
-#: 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 ""
-#: src/main.cpp:563
-msgid "Options: "
-msgstr ""
-
-#: src/main.cpp:564
-msgid " -C --configfile : Configuration file to use"
-msgstr ""
-
-#: src/main.cpp:565
-msgid " -d --data : Directory to load game data from"
-msgstr ""
-
-#: src/main.cpp:566
-msgid " -D --default : Bypass the login process with default settings"
+#: src/main.cpp:567
+msgid "Options:"
msgstr ""
#: src/main.cpp:568
-msgid " -h --help : Display this help"
+msgid " -C --config-file : Configuration file to use"
msgstr ""
#: src/main.cpp:569
-msgid " -S --homedir : Directory to use as home directory"
+msgid " -d --data : Directory to load game data from"
msgstr ""
#: src/main.cpp:570
-msgid " -H --updatehost : Use this update host"
-msgstr ""
-
-#: src/main.cpp:571
-msgid " -P --password : Login with this password"
+msgid " -D --default : Choose default character server and character"
msgstr ""
#: src/main.cpp:572
-msgid " -c --character : Login with this character"
+msgid " -h --help : Display this help"
msgstr ""
#: src/main.cpp:573
-msgid " -o --port : Login Server Port"
+msgid " -S --home-dir : Directory to use as home directory"
msgstr ""
#: src/main.cpp:574
-msgid " -s --server : Login Server name or IP"
+msgid " -H --update-host : Use this update host"
msgstr ""
#: src/main.cpp:575
-msgid " -u --skipupdate : Skip the update downloads"
+msgid " -P --password : Login with this password"
msgstr ""
#: src/main.cpp:576
-msgid " -U --username : Login with this username"
+msgid " -c --character : Login with this character"
msgstr ""
#: src/main.cpp:577
-msgid " -v --version : Display the version"
+msgid " -p --port : Login Server Port"
+msgstr ""
+
+#: src/main.cpp:578
+msgid " -s --server : Login Server name or IP"
+msgstr ""
+
+#: src/main.cpp:579
+msgid " -u --skip-update : Skip the update downloads"
+msgstr ""
+
+#: src/main.cpp:580
+msgid " -U --username : Login with this username"
msgstr ""
#: src/main.cpp:582
+msgid " -O --no-opengl : Disable OpenGL for this session"
+msgstr ""
+
+#: src/main.cpp:584
+msgid " -v --version : Display the version"
+msgstr ""
+
+#: src/main.cpp:589
#, fuzzy
msgid "The Mana World "
msgstr "Choisissez votre serveur The Mana World"
-#: src/main.cpp:1499
+#: src/main.cpp:1515
#, fuzzy
msgid "Connecting to map server..."
msgstr "Connexion..."
-#: 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 ""
@@ -2309,18 +2329,18 @@ msgstr "Dextérité :"
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 ""
@@ -2333,417 +2353,431 @@ msgstr "Retirer"
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
#, fuzzy, c-format
msgid "Strength: %d"
msgstr "Force :"
-#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:82
+#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:84
#, fuzzy, c-format
msgid "Agility: %d"
msgstr "Agilité :"
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:86
+#: src/net/ea/generalhandler.cpp:96 src/net/tmwserv/generalhandler.cpp:88
#, fuzzy, c-format
msgid "Vitality: %d"
msgstr "Vitalité :"
-#: src/net/ea/generalhandler.cpp:96 src/net/tmwserv/generalhandler.cpp:88
+#: src/net/ea/generalhandler.cpp:98 src/net/tmwserv/generalhandler.cpp:90
#, fuzzy, c-format
msgid "Intelligence: %d"
msgstr "Intelligence :"
-#: src/net/ea/generalhandler.cpp:98 src/net/tmwserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:100 src/net/tmwserv/generalhandler.cpp:86
#, fuzzy, c-format
msgid "Dexterity: %d"
msgstr "Dextérité :"
-#: src/net/ea/generalhandler.cpp:100
+#: src/net/ea/generalhandler.cpp:102
#, c-format
msgid "Luck: %d"
msgstr ""
-#: 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 ""
-#: 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 ""
+
+#: src/net/ea/gui/partytab.cpp:53
msgid "/create > Create a new party"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:55
+#: src/net/ea/gui/partytab.cpp:54
msgid "/new > Alias of create"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:56
+#: src/net/ea/gui/partytab.cpp:55
msgid "/invite > Invite a player to your party"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:57
+#: src/net/ea/gui/partytab.cpp:56
msgid "/leave > Leave the party you are in"
msgstr ""
-#: 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 ""
-#: src/net/ea/gui/partytab.cpp:59
+#: src/net/ea/gui/partytab.cpp:58
msgid "/item > Show/change party item sharing options"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:60
+#: src/net/ea/gui/partytab.cpp:59
msgid "/exp > Show/change party experience sharing options"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:69
+#: src/net/ea/gui/partytab.cpp:68
msgid "Command: /new <party-name>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:70
+#: src/net/ea/gui/partytab.cpp:69
msgid "Command: /create <party-name>"
msgstr ""
-#: 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 ""
-#: src/net/ea/gui/partytab.cpp:75
+#: src/net/ea/gui/partytab.cpp:74
msgid "Command: /invite <nick>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:82
+#: src/net/ea/gui/partytab.cpp:81
msgid "Command: /leave"
msgstr ""
-#: 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 ""
-#: 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."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:92
+#: src/net/ea/gui/partytab.cpp:91
msgid "Command: /item"
msgstr ""
-#: 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 ""
-#: 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."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:102
+#: src/net/ea/gui/partytab.cpp:101
msgid "Command: /exp"
msgstr ""
-#: 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]"
+msgid "You picked up %s [@@%d|%s@@]"
msgstr ""
-#: 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
#, fuzzy
msgid "Unregistered ID"
msgstr "Se désinscrire"
-#: src/net/ea/loginhandler.cpp:114
+#: src/net/ea/loginhandler.cpp:113
#, fuzzy
msgid "Wrong password"
msgstr "Changer le mot de passe"
-#: src/net/ea/loginhandler.cpp:117
+#: src/net/ea/loginhandler.cpp:116
#, fuzzy
msgid "Account expired"
msgstr "Compte: %s"
-#: src/net/ea/loginhandler.cpp:120
+#: src/net/ea/loginhandler.cpp:119
#, fuzzy
msgid "Rejected from server"
msgstr "Choix du personnage"
-#: 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 ""
-#: 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"
" Please contact the GM team via the forums."
msgstr ""
-#: 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."
+#: src/net/ea/partyhandler.cpp:77
+msgid "Could not create party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:82
-msgid "Could not create party."
+#: src/net/ea/partyhandler.cpp:80
+msgid "Party successfully created."
msgstr ""
-#: src/net/ea/partyhandler.cpp:112
+#: src/net/ea/partyhandler.cpp:115
#, c-format
msgid "%s is already a member of a party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:116
+#: src/net/ea/partyhandler.cpp:119
#, c-format
msgid "%s refused your invitation."
msgstr ""
-#: src/net/ea/partyhandler.cpp:120
+#: src/net/ea/partyhandler.cpp:123
#, c-format
msgid "%s is now a member of your party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:124
+#: src/net/ea/partyhandler.cpp:127
#, c-format
msgid "Unknown invite response for %s."
msgstr ""
-#: 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 ""
-#: src/net/ea/partyhandler.cpp:269
+#: src/net/ea/partyhandler.cpp:272
#, c-format
msgid "An unknown member tried to say: %s"
msgstr ""
-#: 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 ""
-#: 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"
+#: 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 ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
@@ -2901,40 +2935,101 @@ msgstr ""
msgid "Willpower:"
msgstr "Volonté :"
-#: 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
#, fuzzy, c-format
msgid "Willpower: %d"
msgstr "Volonté :"
-#: 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
+#, fuzzy
+msgid "Server is full"
+msgstr "Serveur :"
+
+#: 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
+#, fuzzy
+msgid "New email address incorrect"
+msgstr "Changer l'adresse email"
+
+#: src/net/tmwserv/loginhandler.cpp:143
+#, fuzzy
+msgid "Old email address incorrect"
+msgstr "Changer l'adresse email"
+
+#: src/net/tmwserv/loginhandler.cpp:149
+#, fuzzy
+msgid "The new Email Address already exists."
+msgstr "Changer l'adresse 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
+#, fuzzy
+msgid "Wrong username or password"
+msgstr "Changer le mot de passe"
+
+#: src/net/tmwserv/loginhandler.cpp:211
+msgid "Wrong username, password or email address"
+msgstr ""
+
+#: src/net/tmwserv/loginhandler.cpp:214
+msgid "Username already exists"
+msgstr ""
+
+#: src/net/tmwserv/loginhandler.cpp:217
+msgid "Email address already exists"
+msgstr ""
+
+#: src/resources/itemdb.cpp:52
#, fuzzy, c-format
msgid "Attack %+d"
msgstr "Attaque %+d"
-#: src/resources/itemdb.cpp:54
+#: src/resources/itemdb.cpp:53
#, fuzzy, c-format
msgid "Defense %+d"
msgstr "Défense %+d"
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:54
#, c-format
msgid "HP %+d"
msgstr "PV %+d"
-#: src/resources/itemdb.cpp:56
+#: src/resources/itemdb.cpp:55
#, c-format
msgid "MP %+d"
msgstr "PM %+d"
-#: src/resources/itemdb.cpp:113
+#: src/resources/itemdb.cpp:112
msgid "items.xml"
msgstr ""
-#: src/resources/itemdb.cpp:151
+#: src/resources/itemdb.cpp:150
msgid "Unnamed"
msgstr ""
@@ -2950,6 +3045,20 @@ msgstr ""
msgid "NPC Database: Error while loading npcs.xml!"
msgstr ""
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "> Cancel\n"
+#~ msgstr "Annuler"
+
+#, fuzzy
+#~ msgid "use"
+#~ msgstr "Utiliser"
+
+#, fuzzy
+#~ msgid "Emote Window"
+#~ msgstr "Rétablir les fenêtres"
+
#~ msgid "@@description|Description@@"
#~ msgstr "@@description|Description@@"
diff --git a/po/he.po b/po/he.po
index 9037b1fc..52956f73 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-04-21 17:27+0200\n"
+"POT-Creation-Date: 2009-05-10 15:53+0200\n"
"PO-Revision-Date: 2008-10-20 00:23+0000\n"
"Last-Translator: Ddorda <d.dorda@gmail.com>\n"
"Language-Team: Hebrew <he@li.org>\n"
@@ -17,287 +17,287 @@ msgstr ""
"X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
"X-Generator: Launchpad (build Unknown)\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."
+#: src/commandhandler.cpp:142
+msgid "/help > Display this help"
msgstr ""
-#: src/commandhandler.cpp:145
+#: src/commandhandler.cpp:144
msgid "/where > Display map name"
msgstr ""
-#: src/commandhandler.cpp:146
+#: src/commandhandler.cpp:145
msgid "/who > Display number of online users"
msgstr ""
-#: src/commandhandler.cpp:147
+#: src/commandhandler.cpp:146
msgid "/me > Tell something about yourself"
msgstr ""
-#: src/commandhandler.cpp:149
+#: src/commandhandler.cpp:148
msgid "/clear > Clears this window"
msgstr ""
-#: src/commandhandler.cpp:151
+#: src/commandhandler.cpp:150
msgid "/msg > Send a private message to a user"
msgstr ""
-#: src/commandhandler.cpp:152
+#: src/commandhandler.cpp:151
msgid "/whisper > Alias of msg"
msgstr ""
-#: src/commandhandler.cpp:153
+#: src/commandhandler.cpp:152
msgid "/w > Alias of msg"
msgstr ""
-#: src/commandhandler.cpp:154
+#: src/commandhandler.cpp:153
msgid "/query > Makes a tab for private messages with another user"
msgstr ""
-#: src/commandhandler.cpp:155
+#: src/commandhandler.cpp:154
msgid "/q > Alias of query"
msgstr ""
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:156
msgid "/list > Display all public channels"
msgstr ""
-#: src/commandhandler.cpp:158
+#: src/commandhandler.cpp:157
msgid "/join > Join or create a channel"
msgstr ""
-#: src/commandhandler.cpp:160
+#: src/commandhandler.cpp:159
#, fuzzy
msgid "/party > Invite a user to party"
msgstr "@@party|הזמן את %s להצטרף למסיבה@@"
-#: src/commandhandler.cpp:162
+#: src/commandhandler.cpp:161
msgid "/record > Start recording the chat to an external file"
msgstr ""
-#: 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 ""
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:165
msgid "/announce > Global announcement (GM only)"
msgstr ""
-#: src/commandhandler.cpp:170
+#: src/commandhandler.cpp:169
msgid "For more information, type /help <command>"
msgstr ""
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:173
msgid "Command: /help"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: src/commandhandler.cpp:186
+#: src/commandhandler.cpp:185
msgid "*** only available to a GM ***"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: src/commandhandler.cpp:209
+#: src/commandhandler.cpp:208
msgid "This command tell others you are (doing) <msg>."
msgstr ""
-#: src/commandhandler.cpp:213
+#: src/commandhandler.cpp:212
msgid "Command: /msg <nick> <message>"
msgstr ""
-#: src/commandhandler.cpp:214
+#: src/commandhandler.cpp:213
msgid "Command: /whisper <nick> <message>"
msgstr ""
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:214
msgid "Command: /w <nick> <message>"
msgstr ""
-#: src/commandhandler.cpp:216
+#: src/commandhandler.cpp:215
msgid "This command sends the text <message> to <nick>."
msgstr ""
-#: 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 ""
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:222
msgid "Command: /q <nick>"
msgstr ""
-#: src/commandhandler.cpp:224
+#: src/commandhandler.cpp:223
msgid "This command tries to make a tab for whispers betweenyou and <nick>."
msgstr ""
-#: src/commandhandler.cpp:229
+#: src/commandhandler.cpp:228
msgid "Command: /party <nick>"
msgstr ""
-#: 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 ""
-#: src/commandhandler.cpp:236
+#: src/commandhandler.cpp:235
msgid "Command: /present"
msgstr ""
-#: 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 ""
-#: src/commandhandler.cpp:244
+#: src/commandhandler.cpp:243
msgid "This command starts recording the chat log to the file <filename>."
msgstr ""
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:245
msgid "Command: /record"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: src/commandhandler.cpp:257
+#: src/commandhandler.cpp:256
msgid "Command: /toggle"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: src/commandhandler.cpp:336
-msgid "Cannont send empty whispers!"
+#: 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 ""
-#: 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 ""
@@ -306,46 +306,46 @@ msgstr ""
msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
msgstr ""
-#: 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"
+#: src/game.cpp:481
+msgid "The connection to the server was lost, the program will now quit"
msgstr ""
-#: src/game.cpp:493
-msgid "The connection to the server was lost, the program will now quit"
+#: src/game.cpp:487
+msgid "Network Error"
msgstr ""
-#: src/game.cpp:664 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
+#: 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
#, fuzzy
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 ""
@@ -358,12 +358,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
#, fuzzy, c-format
msgid "Price: %s / Total: %s"
msgstr "מחיר: %d זהב / סה\"כ %d זהב"
@@ -373,13 +373,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"
@@ -389,206 +389,214 @@ 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
#, fuzzy
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
#, fuzzy
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
#, fuzzy, 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
#, fuzzy, c-format
msgid "Money: %s"
msgstr "זהב: %d"
-#: 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
#, fuzzy
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 ""
+
+#: 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 ""
-#: 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 "לא"
@@ -596,26 +604,16 @@ msgstr "לא"
msgid "Connecting..."
msgstr "מתחבר..."
-#: src/gui/emotecontainer.cpp:61
+#: src/gui/emotepopup.cpp:64
msgid "Unable to load selection.png"
msgstr ""
-#: 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 "הורד"
@@ -642,100 +640,103 @@ 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
#, fuzzy
msgid "Select amount of items to store."
msgstr "בחר כמות חפצים לסחור."
-#: src/gui/item_amount.cpp:101
+#: src/gui/itemamount.cpp:130
#, fuzzy
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 "פורט:"
-#: src/gui/login.cpp:55
+#: src/gui/login.cpp:56
#, fuzzy
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 ""
@@ -751,71 +752,44 @@ msgstr ""
msgid "Cast Test Spell 3"
msgstr ""
-#: 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/minimap.cpp:45 src/gui/minimap.cpp:84
+#, fuzzy
+msgid "Map"
+msgstr "מיני-מפה"
-#: src/gui/menuwindow.cpp:72
-msgid "Guilds"
-msgstr "גילדות"
+#: src/gui/npcdialog.cpp:43
+msgid "Waiting for server"
+msgstr ""
-#: src/gui/menuwindow.cpp:73
+#: src/gui/npcdialog.cpp:46
#, fuzzy
-msgid "Buddys"
-msgstr "קנה"
-
-#: src/gui/menuwindow.cpp:75
-msgid "Shortcut"
-msgstr "קיצור-דרך"
+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"
+#: src/gui/npcdialog.cpp:96
+msgid "-"
msgstr ""
-#: src/gui/npcintegerdialog.cpp:50
+#: src/gui/npcdialog.cpp:105
#, fuzzy
msgid "Reset"
msgstr "הרשם"
-#: src/gui/npcintegerdialog.cpp:101 src/gui/npclistdialog.cpp:123
-#: src/gui/npcstringdialog.cpp:75
-#, fuzzy
-msgid ""
-"\n"
-"> Cancel\n"
-msgstr "ביטול"
-
-#: src/gui/npcpostdialog.cpp:39 src/gui/npc_text.cpp:37
-msgid "NPC"
-msgstr "NPC"
-
#: src/gui/npcpostdialog.cpp:51
#, fuzzy
msgid "Send"
msgstr "צליל"
-#: src/gui/npcstringdialog.cpp:39
-msgid "NPC Text Request"
-msgstr ""
-
-#: 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
#, fuzzy
msgid "Text"
msgstr "הבא"
@@ -870,7 +844,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
#, fuzzy
msgid "Party"
msgstr "פורט:"
@@ -893,7 +867,7 @@ msgid "Being"
msgstr ""
#: src/gui/palette.cpp:104
-msgid "Other Player's Names"
+msgid "Other Players' Names"
msgstr ""
#: src/gui/palette.cpp:105
@@ -920,21 +894,22 @@ msgid "Unknown Item Type"
msgstr ""
#: src/gui/palette.cpp:111
-msgid "Generic"
+msgid "Generics"
msgstr ""
#: src/gui/palette.cpp:112
-msgid "Hat"
-msgstr ""
+#, fuzzy
+msgid "Hats"
+msgstr "מצב"
#: src/gui/palette.cpp:113
#, fuzzy
-msgid "Usable"
+msgid "Usables"
msgstr "השתמש"
#: src/gui/palette.cpp:114
#, fuzzy
-msgid "Shirt"
+msgid "Shirts"
msgstr "קיצור-דרך"
#: src/gui/palette.cpp:115
@@ -957,15 +932,15 @@ msgstr ""
#: src/gui/palette.cpp:119
#, fuzzy
-msgid "Shield"
+msgid "Shields"
msgstr "מכר"
#: src/gui/palette.cpp:120
-msgid "Ring"
+msgid "Rings"
msgstr ""
#: src/gui/palette.cpp:121
-msgid "Necklace"
+msgid "Necklaces"
msgstr ""
#: src/gui/palette.cpp:122
@@ -1021,95 +996,104 @@ msgstr ""
msgid "1/4 HP Bar"
msgstr ""
-#: src/gui/popupmenu.cpp:73
+#: src/gui/popupmenu.cpp:75
msgid "@@name|Add name to chat@@"
msgstr ""
-#: src/gui/popupmenu.cpp:85
+#: src/gui/popupmenu.cpp:87
#, c-format
msgid "@@trade|Trade With %s@@"
msgstr "@@trade|סחור עם %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 "@@attack|תקוף את %s@@"
-#: src/gui/popupmenu.cpp:92
+#: src/gui/popupmenu.cpp:94
#, c-format
msgid "@@friend|Befriend %s@@"
msgstr ""
-#: 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
#, fuzzy, c-format
msgid "@@ignore|Ignore %s@@"
msgstr "@@guild|הזמן את %s@@"
-#: 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
#, fuzzy, c-format
msgid "@@guild|Invite %s to join your guild@@"
msgstr "@@party|הזמן את %s להצטרף למסיבה@@"
-#: src/gui/popupmenu.cpp:112
+#: src/gui/popupmenu.cpp:114
#, c-format
msgid "@@party|Invite %s to join your party@@"
msgstr "@@party|הזמן את %s להצטרף למסיבה@@"
-#: src/gui/popupmenu.cpp:123
+#: src/gui/popupmenu.cpp:125
#, fuzzy, c-format
msgid "@@talk|Talk To %s@@"
msgstr "@@talk|דבר אל NPC@@"
-#: 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 "@@cancel|ביטול@@"
-#: src/gui/popupmenu.cpp:155
-#, c-format
-msgid "@@pickup|Pick Up %s@@"
+#: src/gui/popupmenu.cpp:157
+#, fuzzy, c-format
+msgid "@@pickup|Pick up %s@@"
msgstr "@@pickup|הרם %s@@"
-#: src/gui/popupmenu.cpp:156 src/gui/popupmenu.cpp:352
-msgid "@@chat|Add to Chat@@"
+#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:373
+msgid "@@chat|Add to chat@@"
msgstr ""
-#: src/gui/popupmenu.cpp:336 src/gui/popupmenu.cpp:341
-msgid "@@use|Equip@@"
-msgstr "@@use|החזק@@"
-
-#: src/gui/popupmenu.cpp:339
+#: src/gui/popupmenu.cpp:348
#, fuzzy
msgid "@@use|Unequip@@"
msgstr "@@use|החזק@@"
-#: src/gui/popupmenu.cpp:345
+#: src/gui/popupmenu.cpp:350
+msgid "@@use|Equip@@"
+msgstr "@@use|החזק@@"
+
+#: src/gui/popupmenu.cpp:353
msgid "@@use|Use@@"
msgstr "@@use|Use@@"
-#: src/gui/popupmenu.cpp:347
+#: src/gui/popupmenu.cpp:355
msgid "@@drop|Drop@@"
msgstr "@@drop|השלך@@"
-#: src/gui/popupmenu.cpp:350
+#: src/gui/popupmenu.cpp:359
msgid "@@split|Split@@"
msgstr "@@split|פצל@@"
+#: src/gui/popupmenu.cpp:364
+#, fuzzy
+msgid "@@store|Store@@"
+msgstr "@@guild|הזמן את %s@@"
+
+#: src/gui/popupmenu.cpp:371
+msgid "@@retrieve|Retrieve@@"
+msgstr ""
+
#: src/gui/quitdialog.cpp:37
#, fuzzy
msgid "Switch server"
@@ -1180,20 +1164,32 @@ msgstr "הסיסמה חייבת להכיל פחות מ-%d תוים."
msgid "Passwords do not match."
msgstr "הסיסמאות אינן תואמות."
-#: src/gui/serverdialog.cpp:73
+#: src/gui/serverdialog.cpp:74
#, fuzzy
msgid "Choose your server"
msgstr "בחר את שרת ה-Mana World"
-#: src/gui/serverdialog.cpp:163
+#: src/gui/serverdialog.cpp:164
msgid "Please type both the address and the port of a server."
msgstr "אנא הכנס גם את כתובת וגם את פורט השרת."
-#: src/gui/serverselectdialog.cpp:50
+#: src/gui/serverselectdialog.cpp:59
#, fuzzy
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 "צליל"
@@ -1210,11 +1206,11 @@ msgstr "עוצמת SFX"
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 ""
@@ -1222,23 +1218,23 @@ 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
#, fuzzy
msgid "Static"
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 ""
#: 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
#, fuzzy
msgid "Spectrum"
msgstr "הגדרות"
@@ -1247,26 +1243,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 "לחץ על הכפתור בכדי להתחיל בכיול"
@@ -1337,7 +1325,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 ""
@@ -1365,157 +1353,178 @@ 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
+#, fuzzy
+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 ""
-#: 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 "אופף 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
#, fuzzy
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
#, fuzzy
msgid "Bubbles, no names"
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 ""
-#: 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
#, fuzzy
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
#, fuzzy
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 ""
@@ -1528,6 +1537,10 @@ msgstr "כישורים"
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"
@@ -1537,15 +1550,6 @@ msgstr ""
msgid "Up"
msgstr ""
-#: src/gui/skill.cpp:146
-msgid "inc"
-msgstr ""
-
-#: src/gui/skill.cpp:147
-#, fuzzy
-msgid "use"
-msgstr "השתמש"
-
#: src/gui/skilldialog.cpp:113
msgid "Weapons"
msgstr ""
@@ -1555,180 +1559,180 @@ msgstr ""
msgid "Crafts"
msgstr "צור"
-#: src/gui/status.cpp:57 src/gui/status.cpp:178
+#: src/gui/status.cpp:56 src/gui/status.cpp:177
#, fuzzy, c-format
msgid "Job: %d"
msgstr "רמה: %d"
-#: src/gui/status.cpp:61
+#: src/gui/status.cpp:60
msgid "HP:"
msgstr ""
-#: src/gui/status.cpp:64
+#: src/gui/status.cpp:63
msgid "Exp:"
msgstr ""
-#: src/gui/status.cpp:67
+#: src/gui/status.cpp:66
msgid "MP:"
msgstr ""
-#: src/gui/status.cpp:70
+#: src/gui/status.cpp:69
#, fuzzy
msgid "Job:"
msgstr "רמה: %d"
-#: src/gui/status.cpp:78
+#: src/gui/status.cpp:77
#, fuzzy
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
#, fuzzy
msgid "Attack:"
msgstr "התקפה %+d"
-#: src/gui/status.cpp:85
+#: src/gui/status.cpp:84
#, fuzzy
msgid "Defense:"
msgstr "הגנה %+d"
-#: src/gui/status.cpp:86
+#: src/gui/status.cpp:85
#, fuzzy
msgid "M.Attack:"
msgstr "התקפה %+d"
-#: src/gui/status.cpp:87
+#: src/gui/status.cpp:86
#, fuzzy
msgid "M.Defense:"
msgstr "הגנה %+d"
-#: src/gui/status.cpp:89
+#: src/gui/status.cpp:88
#, no-c-format
msgid "% Accuracy:"
msgstr ""
-#: src/gui/status.cpp:91
+#: src/gui/status.cpp:90
#, no-c-format
msgid "% Evade:"
msgstr ""
-#: 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
#, fuzzy
msgid "Strength"
msgstr "עוצמה:"
-#: src/gui/status.cpp:200
+#: src/gui/status.cpp:199
#, fuzzy
msgid "Agility"
msgstr "זריזות:"
-#: src/gui/status.cpp:201
+#: src/gui/status.cpp:200
#, fuzzy
msgid "Vitality"
msgstr "חיוניות:"
-#: src/gui/status.cpp:202
+#: src/gui/status.cpp:201
#, fuzzy
msgid "Intelligence"
msgstr "תבונה:"
-#: src/gui/status.cpp:203
+#: src/gui/status.cpp:202
#, fuzzy
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 ""
-#: src/gui/status.cpp:383 src/gui/status.cpp:405
+#: src/gui/status.cpp:384
#, fuzzy
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
#, fuzzy
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
#, fuzzy
msgid "Confirmed. Waiting..."
msgstr "מתחבר..."
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:53
#, fuzzy
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
#, fuzzy, c-format
msgid "You get %s."
msgstr "אתה מקבל %d זהב."
-#: 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 ""
@@ -1840,21 +1844,21 @@ msgstr ""
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 ""
-#: src/gui/widgets/chattab.cpp:147
+#: src/gui/widgets/chattab.cpp:146
#, c-format
msgid "%s whispers: "
msgstr ""
-#: 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 ""
@@ -1862,23 +1866,35 @@ msgstr ""
msgid "Cannot send empty chat!"
msgstr ""
-#: src/gui/widgets/whispertab.cpp:55
-#, c-format
-msgid "%s: %s"
-msgstr ""
-
-#: src/gui/widgets/whispertab.cpp:69
+#: src/gui/widgets/whispertab.cpp:68
msgid "/close > Close the whisper tab"
msgstr ""
-#: src/gui/widgets/whispertab.cpp:79
+#: src/gui/widgets/whispertab.cpp:78
msgid "Command: /close"
msgstr ""
-#: 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
+#, fuzzy
+msgid "Buddys"
+msgstr "קנה"
+
+#: src/gui/windowmenu.cpp:68
+msgid "Shortcut"
+msgstr "קיצור-דרך"
+
#: src/keyboardconfig.cpp:41
msgid "Move Up"
msgstr ""
@@ -2010,7 +2026,7 @@ msgstr "אתחל חלונות"
#: src/keyboardconfig.cpp:80
#, fuzzy
-msgid "Emote Window"
+msgid "Party Window"
msgstr "אתחל חלונות"
#: src/keyboardconfig.cpp:81
@@ -2061,166 +2077,170 @@ msgstr ""
msgid "Ignore input 2"
msgstr ""
-#: 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
#, fuzzy
msgid "Sword"
msgstr "צליל"
-#: src/localplayer.cpp:852
+#: src/localplayer.cpp:837
msgid "Polearm"
msgstr ""
-#: src/localplayer.cpp:853
+#: src/localplayer.cpp:838
#, fuzzy
msgid "Staff"
msgstr "מצב"
-#: src/localplayer.cpp:854
+#: src/localplayer.cpp:839
msgid "Whip"
msgstr ""
-#: src/localplayer.cpp:855
+#: src/localplayer.cpp:840
#, fuzzy
msgid "Bow"
msgstr "נמוך"
-#: src/localplayer.cpp:856
+#: src/localplayer.cpp:841
msgid "Shooting"
msgstr ""
-#: src/localplayer.cpp:857
+#: src/localplayer.cpp:842
#, fuzzy
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
#, fuzzy
msgid "Craft"
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 ""
-#: src/main.cpp:563
-msgid "Options: "
-msgstr ""
-
-#: src/main.cpp:564
-msgid " -C --configfile : Configuration file to use"
-msgstr ""
-
-#: src/main.cpp:565
-msgid " -d --data : Directory to load game data from"
-msgstr ""
-
-#: src/main.cpp:566
-msgid " -D --default : Bypass the login process with default settings"
+#: src/main.cpp:567
+msgid "Options:"
msgstr ""
#: src/main.cpp:568
-msgid " -h --help : Display this help"
+msgid " -C --config-file : Configuration file to use"
msgstr ""
#: src/main.cpp:569
-msgid " -S --homedir : Directory to use as home directory"
+msgid " -d --data : Directory to load game data from"
msgstr ""
#: src/main.cpp:570
-msgid " -H --updatehost : Use this update host"
-msgstr ""
-
-#: src/main.cpp:571
-msgid " -P --password : Login with this password"
+msgid " -D --default : Choose default character server and character"
msgstr ""
#: src/main.cpp:572
-msgid " -c --character : Login with this character"
+msgid " -h --help : Display this help"
msgstr ""
#: src/main.cpp:573
-msgid " -o --port : Login Server Port"
+msgid " -S --home-dir : Directory to use as home directory"
msgstr ""
#: src/main.cpp:574
-msgid " -s --server : Login Server name or IP"
+msgid " -H --update-host : Use this update host"
msgstr ""
#: src/main.cpp:575
-msgid " -u --skipupdate : Skip the update downloads"
+msgid " -P --password : Login with this password"
msgstr ""
#: src/main.cpp:576
-msgid " -U --username : Login with this username"
+msgid " -c --character : Login with this character"
msgstr ""
#: src/main.cpp:577
-msgid " -v --version : Display the version"
+msgid " -p --port : Login Server Port"
+msgstr ""
+
+#: src/main.cpp:578
+msgid " -s --server : Login Server name or IP"
+msgstr ""
+
+#: src/main.cpp:579
+msgid " -u --skip-update : Skip the update downloads"
+msgstr ""
+
+#: src/main.cpp:580
+msgid " -U --username : Login with this username"
msgstr ""
#: src/main.cpp:582
+msgid " -O --no-opengl : Disable OpenGL for this session"
+msgstr ""
+
+#: src/main.cpp:584
+msgid " -v --version : Display the version"
+msgstr ""
+
+#: src/main.cpp:589
#, fuzzy
msgid "The Mana World "
msgstr "בחר את שרת ה-Mana World"
-#: src/main.cpp:1499
+#: src/main.cpp:1515
#, fuzzy
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 ""
@@ -2307,18 +2327,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 ""
@@ -2331,417 +2351,431 @@ 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
#, fuzzy, c-format
msgid "Strength: %d"
msgstr "עוצמה:"
-#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:82
+#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:84
#, fuzzy, c-format
msgid "Agility: %d"
msgstr "זריזות:"
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:86
+#: src/net/ea/generalhandler.cpp:96 src/net/tmwserv/generalhandler.cpp:88
#, fuzzy, c-format
msgid "Vitality: %d"
msgstr "חיוניות:"
-#: src/net/ea/generalhandler.cpp:96 src/net/tmwserv/generalhandler.cpp:88
+#: src/net/ea/generalhandler.cpp:98 src/net/tmwserv/generalhandler.cpp:90
#, fuzzy, c-format
msgid "Intelligence: %d"
msgstr "תבונה:"
-#: src/net/ea/generalhandler.cpp:98 src/net/tmwserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:100 src/net/tmwserv/generalhandler.cpp:86
#, fuzzy, c-format
msgid "Dexterity: %d"
msgstr "מיומנות:"
-#: src/net/ea/generalhandler.cpp:100
+#: src/net/ea/generalhandler.cpp:102
#, c-format
msgid "Luck: %d"
msgstr ""
-#: 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 ""
-#: 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 ""
+
+#: src/net/ea/gui/partytab.cpp:53
msgid "/create > Create a new party"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:55
+#: src/net/ea/gui/partytab.cpp:54
msgid "/new > Alias of create"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:56
+#: src/net/ea/gui/partytab.cpp:55
msgid "/invite > Invite a player to your party"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:57
+#: src/net/ea/gui/partytab.cpp:56
msgid "/leave > Leave the party you are in"
msgstr ""
-#: 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 ""
-#: src/net/ea/gui/partytab.cpp:59
+#: src/net/ea/gui/partytab.cpp:58
msgid "/item > Show/change party item sharing options"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:60
+#: src/net/ea/gui/partytab.cpp:59
msgid "/exp > Show/change party experience sharing options"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:69
+#: src/net/ea/gui/partytab.cpp:68
msgid "Command: /new <party-name>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:70
+#: src/net/ea/gui/partytab.cpp:69
msgid "Command: /create <party-name>"
msgstr ""
-#: 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 ""
-#: src/net/ea/gui/partytab.cpp:75
+#: src/net/ea/gui/partytab.cpp:74
msgid "Command: /invite <nick>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:82
+#: src/net/ea/gui/partytab.cpp:81
msgid "Command: /leave"
msgstr ""
-#: 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 ""
-#: 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."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:92
+#: src/net/ea/gui/partytab.cpp:91
msgid "Command: /item"
msgstr ""
-#: 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 ""
-#: 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."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:102
+#: src/net/ea/gui/partytab.cpp:101
msgid "Command: /exp"
msgstr ""
-#: 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]"
+msgid "You picked up %s [@@%d|%s@@]"
msgstr ""
-#: 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
#, fuzzy
msgid "Unregistered ID"
msgstr "בטל רישום"
-#: src/net/ea/loginhandler.cpp:114
+#: src/net/ea/loginhandler.cpp:113
#, fuzzy
msgid "Wrong password"
msgstr "שנה סיסמה"
-#: src/net/ea/loginhandler.cpp:117
+#: src/net/ea/loginhandler.cpp:116
#, fuzzy
msgid "Account expired"
msgstr "משתמש: %s"
-#: src/net/ea/loginhandler.cpp:120
+#: src/net/ea/loginhandler.cpp:119
#, fuzzy
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 ""
-#: 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"
" Please contact the GM team via the forums."
msgstr ""
-#: 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."
+#: src/net/ea/partyhandler.cpp:77
+msgid "Could not create party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:82
-msgid "Could not create party."
+#: src/net/ea/partyhandler.cpp:80
+msgid "Party successfully created."
msgstr ""
-#: src/net/ea/partyhandler.cpp:112
+#: src/net/ea/partyhandler.cpp:115
#, c-format
msgid "%s is already a member of a party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:116
+#: src/net/ea/partyhandler.cpp:119
#, c-format
msgid "%s refused your invitation."
msgstr ""
-#: src/net/ea/partyhandler.cpp:120
+#: src/net/ea/partyhandler.cpp:123
#, c-format
msgid "%s is now a member of your party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:124
+#: src/net/ea/partyhandler.cpp:127
#, c-format
msgid "Unknown invite response for %s."
msgstr ""
-#: 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 ""
-#: src/net/ea/partyhandler.cpp:269
+#: src/net/ea/partyhandler.cpp:272
#, c-format
msgid "An unknown member tried to say: %s"
msgstr ""
-#: 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 ""
-#: 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"
+#: 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 ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
@@ -2899,40 +2933,101 @@ 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
#, fuzzy, c-format
msgid "Willpower: %d"
msgstr "כח רצון:"
-#: 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
+#, fuzzy
+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
+#, fuzzy
+msgid "New email address incorrect"
+msgstr "שנה כתובת דואר אלקטרוני"
+
+#: src/net/tmwserv/loginhandler.cpp:143
+#, fuzzy
+msgid "Old email address incorrect"
+msgstr "שנה כתובת דואר אלקטרוני"
+
+#: src/net/tmwserv/loginhandler.cpp:149
+#, fuzzy
+msgid "The new Email Address already exists."
+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 "שנה סיסמה"
+
+#: src/net/tmwserv/loginhandler.cpp:211
+msgid "Wrong username, password or email address"
+msgstr ""
+
+#: src/net/tmwserv/loginhandler.cpp:214
+msgid "Username already exists"
+msgstr ""
+
+#: src/net/tmwserv/loginhandler.cpp:217
+msgid "Email address already exists"
+msgstr ""
+
+#: src/resources/itemdb.cpp:52
#, fuzzy, c-format
msgid "Attack %+d"
msgstr "התקפה %+d"
-#: src/resources/itemdb.cpp:54
+#: src/resources/itemdb.cpp:53
#, fuzzy, 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 ""
-#: src/resources/itemdb.cpp:151
+#: src/resources/itemdb.cpp:150
msgid "Unnamed"
msgstr ""
@@ -2948,6 +3043,20 @@ msgstr ""
msgid "NPC Database: Error while loading npcs.xml!"
msgstr ""
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "> Cancel\n"
+#~ msgstr "ביטול"
+
+#, fuzzy
+#~ msgid "use"
+#~ msgstr "השתמש"
+
+#, fuzzy
+#~ msgid "Emote Window"
+#~ msgstr "אתחל חלונות"
+
#~ msgid "@@description|Description@@"
#~ msgstr "@@description|תיאור@@"
diff --git a/po/hr.po b/po/hr.po
index 8bffd3ae..82c5b01c 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-04-21 17:27+0200\n"
+"POT-Creation-Date: 2009-05-10 15:53+0200\n"
"PO-Revision-Date: 2009-04-10 08:39+0000\n"
"Last-Translator: Dino Paskvan <Unknown>\n"
"Language-Team: Croatian <hr@li.org>\n"
@@ -17,287 +17,287 @@ msgstr ""
"X-Launchpad-Export-Date: 2009-04-21 14:44+0000\n"
"X-Generator: Launchpad (build Unknown)\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."
+#: src/commandhandler.cpp:142
+msgid "/help > Display this help"
msgstr ""
-#: src/commandhandler.cpp:145
+#: src/commandhandler.cpp:144
msgid "/where > Display map name"
msgstr ""
-#: src/commandhandler.cpp:146
+#: src/commandhandler.cpp:145
msgid "/who > Display number of online users"
msgstr ""
-#: src/commandhandler.cpp:147
+#: src/commandhandler.cpp:146
msgid "/me > Tell something about yourself"
msgstr ""
-#: src/commandhandler.cpp:149
+#: src/commandhandler.cpp:148
msgid "/clear > Clears this window"
msgstr ""
-#: src/commandhandler.cpp:151
+#: src/commandhandler.cpp:150
msgid "/msg > Send a private message to a user"
msgstr ""
-#: src/commandhandler.cpp:152
+#: src/commandhandler.cpp:151
msgid "/whisper > Alias of msg"
msgstr ""
-#: src/commandhandler.cpp:153
+#: src/commandhandler.cpp:152
msgid "/w > Alias of msg"
msgstr ""
-#: src/commandhandler.cpp:154
+#: src/commandhandler.cpp:153
msgid "/query > Makes a tab for private messages with another user"
msgstr ""
-#: src/commandhandler.cpp:155
+#: src/commandhandler.cpp:154
msgid "/q > Alias of query"
msgstr ""
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:156
msgid "/list > Display all public channels"
msgstr ""
-#: src/commandhandler.cpp:158
+#: src/commandhandler.cpp:157
msgid "/join > Join or create a channel"
msgstr ""
-#: src/commandhandler.cpp:160
+#: src/commandhandler.cpp:159
#, fuzzy
msgid "/party > Invite a user to party"
msgstr "@@party|Pozovi %s da se pridruži tvojoj skupini@@"
-#: src/commandhandler.cpp:162
+#: src/commandhandler.cpp:161
msgid "/record > Start recording the chat to an external file"
msgstr ""
-#: 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 ""
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:165
msgid "/announce > Global announcement (GM only)"
msgstr ""
-#: src/commandhandler.cpp:170
+#: src/commandhandler.cpp:169
msgid "For more information, type /help <command>"
msgstr ""
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:173
msgid "Command: /help"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: src/commandhandler.cpp:186
+#: src/commandhandler.cpp:185
msgid "*** only available to a GM ***"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: src/commandhandler.cpp:209
+#: src/commandhandler.cpp:208
msgid "This command tell others you are (doing) <msg>."
msgstr ""
-#: src/commandhandler.cpp:213
+#: src/commandhandler.cpp:212
msgid "Command: /msg <nick> <message>"
msgstr ""
-#: src/commandhandler.cpp:214
+#: src/commandhandler.cpp:213
msgid "Command: /whisper <nick> <message>"
msgstr ""
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:214
msgid "Command: /w <nick> <message>"
msgstr ""
-#: src/commandhandler.cpp:216
+#: src/commandhandler.cpp:215
msgid "This command sends the text <message> to <nick>."
msgstr ""
-#: 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 ""
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:222
msgid "Command: /q <nick>"
msgstr ""
-#: src/commandhandler.cpp:224
+#: src/commandhandler.cpp:223
msgid "This command tries to make a tab for whispers betweenyou and <nick>."
msgstr ""
-#: src/commandhandler.cpp:229
+#: src/commandhandler.cpp:228
msgid "Command: /party <nick>"
msgstr ""
-#: 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 ""
-#: src/commandhandler.cpp:236
+#: src/commandhandler.cpp:235
msgid "Command: /present"
msgstr ""
-#: 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 ""
-#: src/commandhandler.cpp:244
+#: src/commandhandler.cpp:243
msgid "This command starts recording the chat log to the file <filename>."
msgstr ""
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:245
msgid "Command: /record"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: src/commandhandler.cpp:257
+#: src/commandhandler.cpp:256
msgid "Command: /toggle"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: src/commandhandler.cpp:336
-msgid "Cannont send empty whispers!"
+#: 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 ""
-#: 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 ""
@@ -306,46 +306,46 @@ msgstr ""
msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
msgstr ""
-#: 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"
+#: src/game.cpp:481
+msgid "The connection to the server was lost, the program will now quit"
msgstr ""
-#: src/game.cpp:493
-msgid "The connection to the server was lost, the program will now quit"
+#: src/game.cpp:487
+msgid "Network Error"
msgstr ""
-#: src/game.cpp:664 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
+#: 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 "Izlaz"
-#: src/game.cpp:665
+#: src/game.cpp:647
#, fuzzy
msgid "Are you sure you want to quit?"
msgstr "Da li ste sigurni da želite obrisati ovog lika?"
-#: 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 ""
@@ -358,12 +358,12 @@ msgstr "Kupi"
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 "Kupi"
#: 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
#, fuzzy, c-format
msgid "Price: %s / Total: %s"
msgstr "Cijena: %d zlatnika / Ukupno: %d zlatnika"
@@ -373,13 +373,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 "Opis: %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 "Učinak: %s"
@@ -389,206 +389,214 @@ msgstr "Učinak: %s"
msgid "Shop"
msgstr "Zaustavi"
-#: 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 "Prodaj"
-#: 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 "Poništi"
-#: 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 "Promijeni Email Adresu"
-#: 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 "Korisnički račun: %s"
-#: src/gui/changeemaildialog.cpp:48
+#: src/gui/changeemaildialog.cpp:49
#, fuzzy
msgid "Type New Email Address twice:"
msgstr "Promijeni Email Adresu"
-#: 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 "Promijeni Lozinku"
-#: 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 "Lozinka"
-#: 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 "Stvori Lika"
-#: 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 "Ime:"
-#: src/gui/charcreatedialog.cpp:70
+#: src/gui/charcreatedialog.cpp:69
msgid "Hair Color:"
msgstr "Boja kose:"
-#: src/gui/charcreatedialog.cpp:73
+#: src/gui/charcreatedialog.cpp:72
msgid "Hair Style:"
msgstr "Frizura:"
-#: src/gui/charcreatedialog.cpp:74
+#: src/gui/charcreatedialog.cpp:73
msgid "Create"
msgstr "Stvori"
-#: src/gui/charcreatedialog.cpp:76 src/gui/register.cpp:75
+#: src/gui/charcreatedialog.cpp:75 src/gui/register.cpp:75
msgid "Male"
msgstr "Muško"
-#: src/gui/charcreatedialog.cpp:77 src/gui/register.cpp:76
+#: src/gui/charcreatedialog.cpp:76 src/gui/register.cpp:76
msgid "Female"
msgstr "Žensko"
-#: 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 "Molimo, rasporedi %d bodova"
-#: 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 "Greška"
-#: src/gui/charcreatedialog.cpp:174
+#: src/gui/charcreatedialog.cpp:173
msgid "Your name needs to be at least 4 characters."
msgstr "Ime mora imati barem 4 znaka."
-#: src/gui/charcreatedialog.cpp:227
+#: src/gui/charcreatedialog.cpp:226
msgid "Character stats OK"
msgstr "Podaci lika su u redu"
-#: src/gui/charcreatedialog.cpp:239
+#: src/gui/charcreatedialog.cpp:238
#, c-format
msgid "Please remove %d points"
msgstr "Molimo, oduzmi %d bodova"
-#: src/gui/char_select.cpp:79
+#: src/gui/charselectdialog.cpp:78
msgid "Confirm Character Delete"
msgstr "Potvrdi Brisanje Lika"
-#: src/gui/char_select.cpp:80
+#: src/gui/charselectdialog.cpp:79
msgid "Are you sure you want to delete this character?"
msgstr "Da li ste sigurni da želite obrisati ovog lika?"
-#: src/gui/char_select.cpp:98
+#: src/gui/charselectdialog.cpp:97
msgid "Account and Character Management"
msgstr "Upravljanje Računom i Likovima"
-#: src/gui/char_select.cpp:105
+#: src/gui/charselectdialog.cpp:104
#, fuzzy
msgid "Select Character"
msgstr "Stvori Lika"
-#: 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 "U redu"
-#: src/gui/char_select.cpp:113
+#: src/gui/charselectdialog.cpp:112
msgid "Previous"
msgstr "Prethodni"
-#: 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 "Slijedeći"
-#: 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 "Ime: %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 "Nivo: %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 "Novi"
-#: 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 "Obriši"
-#: src/gui/char_select.cpp:120 src/gui/unregisterdialog.cpp:51
+#: src/gui/charselectdialog.cpp:119 src/gui/unregisterdialog.cpp:52
msgid "Unregister"
msgstr "Odjavi"
-#: src/gui/char_select.cpp:127
+#: src/gui/charselectdialog.cpp:126
#, c-format
msgid "Money: %d"
msgstr "Novac: %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
#, fuzzy, c-format
msgid "Job Level: %d"
msgstr "Nivo: %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
#, fuzzy, c-format
msgid "Money: %s"
msgstr "Novac: %d"
-#: 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
#, fuzzy
msgid "Chat"
msgstr "Stvori"
-#: src/gui/chat.cpp:341 src/gui/chat.cpp:347
+#: src/gui/chat.cpp:332
+#, c-format
+msgid "%d players are present."
+msgstr ""
+
+#: 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 ""
-#: src/gui/confirm_dialog.cpp:42
+#: src/gui/confirmdialog.cpp:42
msgid "Yes"
msgstr "Da"
-#: src/gui/confirm_dialog.cpp:43
+#: src/gui/confirmdialog.cpp:43
msgid "No"
msgstr "Ne"
@@ -596,26 +604,16 @@ msgstr "Ne"
msgid "Connecting..."
msgstr "Spajanje..."
-#: src/gui/emotecontainer.cpp:61
+#: src/gui/emotepopup.cpp:64
msgid "Unable to load selection.png"
msgstr ""
-#: 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 "Upotrijebi"
-
-#: src/gui/equipmentwindow.cpp:68 src/gui/menuwindow.cpp:67
+#: src/gui/equipmentwindow.cpp:68 src/gui/windowmenu.cpp:60
msgid "Equipment"
msgstr "Oprema"
-#: 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 "Skini opremu"
@@ -642,99 +640,102 @@ msgstr "Cehovi"
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 "Zalihe"
-#: 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 "Opremi"
-#: 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 "Upotrijebi"
+
+#: src/gui/inventorywindow.cpp:80
msgid "Drop"
msgstr "Ispusti"
-#: src/gui/inventorywindow.cpp:79
+#: src/gui/inventorywindow.cpp:81
msgid "Split"
msgstr "Razdvoji"
-#: 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 "Odaberi količinu predmeta za razmjenu."
-#: src/gui/item_amount.cpp:95
+#: src/gui/itemamount.cpp:124
msgid "Select amount of items to drop."
msgstr "Odaberi količinu predmeta za ispuštanje."
-#: src/gui/item_amount.cpp:98
+#: src/gui/itemamount.cpp:127
#, fuzzy
msgid "Select amount of items to store."
msgstr "Odaberi količinu predmeta za razmjenu."
-#: src/gui/item_amount.cpp:101
+#: src/gui/itemamount.cpp:130
#, fuzzy
msgid "Select amount of items to retrieve."
msgstr "Odaberi količinu predmeta za razmjenu."
-#: src/gui/item_amount.cpp:104
+#: src/gui/itemamount.cpp:133
msgid "Select amount of items to split."
msgstr "Odaberi količinu predmeta za razdvajanje."
-#: 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 "Korisničko ime"
-#: 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 "Poslužitelj:"
-#: 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:"
-#: 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 "Zapamti korisničko ime"
-#: 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 "Registriraj se"
-#: 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 ""
@@ -750,71 +751,44 @@ msgstr ""
msgid "Cast Test Spell 3"
msgstr ""
-#: src/gui/menuwindow.cpp:66
-msgid "Status"
-msgstr "Stanje"
-
-#: src/gui/menuwindow.cpp:69 src/gui/skill.cpp:126 src/gui/skilldialog.cpp:99
-msgid "Skills"
-msgstr "Vještine"
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
+#, fuzzy
+msgid "Map"
+msgstr "Karta"
-#: src/gui/menuwindow.cpp:72
-msgid "Guilds"
-msgstr "Cehovi"
+#: src/gui/npcdialog.cpp:43
+msgid "Waiting for server"
+msgstr ""
-#: src/gui/menuwindow.cpp:73
+#: src/gui/npcdialog.cpp:46
#, fuzzy
-msgid "Buddys"
-msgstr "Kupi"
-
-#: src/gui/menuwindow.cpp:75
-msgid "Shortcut"
-msgstr "Kratica"
+msgid "Submit"
+msgstr "Razdvoji"
-#: src/gui/menuwindow.cpp:77 src/gui/setup.cpp:65 src/main.cpp:920
-msgid "Setup"
-msgstr "Podešavanje"
+#: src/gui/npcdialog.cpp:49 src/gui/npcpostdialog.cpp:39
+msgid "NPC"
+msgstr "NPC"
-#: src/gui/minimap.cpp:39
-msgid "MiniMap"
-msgstr "Karta"
+#: src/gui/npcdialog.cpp:95
+msgid "+"
+msgstr ""
-#: src/gui/npcintegerdialog.cpp:39
-msgid "NPC Number Request"
+#: src/gui/npcdialog.cpp:96
+msgid "-"
msgstr ""
-#: src/gui/npcintegerdialog.cpp:50
+#: src/gui/npcdialog.cpp:105
#, fuzzy
msgid "Reset"
msgstr "Registriraj se"
-#: src/gui/npcintegerdialog.cpp:101 src/gui/npclistdialog.cpp:123
-#: src/gui/npcstringdialog.cpp:75
-#, fuzzy
-msgid ""
-"\n"
-"> Cancel\n"
-msgstr "Poništi"
-
-#: src/gui/npcpostdialog.cpp:39 src/gui/npc_text.cpp:37
-msgid "NPC"
-msgstr "NPC"
-
#: src/gui/npcpostdialog.cpp:51
#, fuzzy
msgid "Send"
msgstr "Zvuk"
-#: src/gui/npcstringdialog.cpp:39
-msgid "NPC Text Request"
-msgstr ""
-
-#: 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
#, fuzzy
msgid "Text"
msgstr "Slijedeći"
@@ -869,7 +843,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
#, fuzzy
msgid "Party"
msgstr "Port:"
@@ -892,7 +866,7 @@ msgid "Being"
msgstr ""
#: src/gui/palette.cpp:104
-msgid "Other Player's Names"
+msgid "Other Players' Names"
msgstr ""
#: src/gui/palette.cpp:105
@@ -919,21 +893,22 @@ msgid "Unknown Item Type"
msgstr ""
#: src/gui/palette.cpp:111
-msgid "Generic"
+msgid "Generics"
msgstr ""
#: src/gui/palette.cpp:112
-msgid "Hat"
-msgstr ""
+#, fuzzy
+msgid "Hats"
+msgstr "Stanje"
#: src/gui/palette.cpp:113
#, fuzzy
-msgid "Usable"
+msgid "Usables"
msgstr "Upotrijebi"
#: src/gui/palette.cpp:114
#, fuzzy
-msgid "Shirt"
+msgid "Shirts"
msgstr "Kratica"
#: src/gui/palette.cpp:115
@@ -954,15 +929,15 @@ msgstr ""
#: src/gui/palette.cpp:119
#, fuzzy
-msgid "Shield"
+msgid "Shields"
msgstr "Prodaj"
#: src/gui/palette.cpp:120
-msgid "Ring"
+msgid "Rings"
msgstr ""
#: src/gui/palette.cpp:121
-msgid "Necklace"
+msgid "Necklaces"
msgstr ""
#: src/gui/palette.cpp:122
@@ -1017,95 +992,104 @@ msgstr ""
msgid "1/4 HP Bar"
msgstr ""
-#: src/gui/popupmenu.cpp:73
+#: src/gui/popupmenu.cpp:75
msgid "@@name|Add name to chat@@"
msgstr ""
-#: src/gui/popupmenu.cpp:85
+#: src/gui/popupmenu.cpp:87
#, c-format
msgid "@@trade|Trade With %s@@"
msgstr "@@trade|Razmijeni se s %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 "@@attack|Napadni %s@@"
-#: src/gui/popupmenu.cpp:92
+#: src/gui/popupmenu.cpp:94
#, c-format
msgid "@@friend|Befriend %s@@"
msgstr ""
-#: 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
#, fuzzy, c-format
msgid "@@ignore|Ignore %s@@"
msgstr "@@guild|Pozovi %s@@"
-#: 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
#, fuzzy, c-format
msgid "@@guild|Invite %s to join your guild@@"
msgstr "@@party|Pozovi %s da se pridruži tvojoj skupini@@"
-#: src/gui/popupmenu.cpp:112
+#: src/gui/popupmenu.cpp:114
#, c-format
msgid "@@party|Invite %s to join your party@@"
msgstr "@@party|Pozovi %s da se pridruži tvojoj skupini@@"
-#: src/gui/popupmenu.cpp:123
+#: src/gui/popupmenu.cpp:125
#, fuzzy, c-format
msgid "@@talk|Talk To %s@@"
msgstr "@@talk|Razgovaraj s NPC-em@@"
-#: 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 "@@cancel|Otkaži@@"
-#: src/gui/popupmenu.cpp:155
-#, c-format
-msgid "@@pickup|Pick Up %s@@"
+#: src/gui/popupmenu.cpp:157
+#, fuzzy, c-format
+msgid "@@pickup|Pick up %s@@"
msgstr "@@pickup|Uzmi %s@@"
-#: src/gui/popupmenu.cpp:156 src/gui/popupmenu.cpp:352
-msgid "@@chat|Add to Chat@@"
+#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:373
+msgid "@@chat|Add to chat@@"
msgstr ""
-#: src/gui/popupmenu.cpp:336 src/gui/popupmenu.cpp:341
-msgid "@@use|Equip@@"
-msgstr "@@use|Opremi@@"
-
-#: src/gui/popupmenu.cpp:339
+#: src/gui/popupmenu.cpp:348
#, fuzzy
msgid "@@use|Unequip@@"
msgstr "@@use|Opremi@@"
-#: src/gui/popupmenu.cpp:345
+#: src/gui/popupmenu.cpp:350
+msgid "@@use|Equip@@"
+msgstr "@@use|Opremi@@"
+
+#: src/gui/popupmenu.cpp:353
msgid "@@use|Use@@"
msgstr "@@use|Upotrijebi@@"
-#: src/gui/popupmenu.cpp:347
+#: src/gui/popupmenu.cpp:355
msgid "@@drop|Drop@@"
msgstr "@@drop|Ispusti@@"
-#: src/gui/popupmenu.cpp:350
+#: src/gui/popupmenu.cpp:359
msgid "@@split|Split@@"
msgstr "@@split|Razdvoji@@"
+#: src/gui/popupmenu.cpp:364
+#, fuzzy
+msgid "@@store|Store@@"
+msgstr "@@guild|Pozovi %s@@"
+
+#: src/gui/popupmenu.cpp:371
+msgid "@@retrieve|Retrieve@@"
+msgstr ""
+
#: src/gui/quitdialog.cpp:37
msgid "Switch server"
msgstr "Promijeni poslužitelj"
@@ -1175,20 +1159,32 @@ msgstr "Lozinka mora biti kraća od %d znakova."
msgid "Passwords do not match."
msgstr "Lozinke se ne podudaraju."
-#: src/gui/serverdialog.cpp:73
+#: src/gui/serverdialog.cpp:74
#, fuzzy
msgid "Choose your server"
msgstr "Odaberite svoj Mana World poslužitelj"
-#: src/gui/serverdialog.cpp:163
+#: src/gui/serverdialog.cpp:164
msgid "Please type both the address and the port of a server."
msgstr "Molimo upišite adresu poslužitelja i port poslužitelja."
-#: src/gui/serverselectdialog.cpp:50
+#: src/gui/serverselectdialog.cpp:59
#, fuzzy
msgid "Select Server"
msgstr "Promijeni poslužitelj"
+#: src/gui/setup.cpp:64 src/gui/windowmenu.cpp:69 src/main.cpp:933
+msgid "Setup"
+msgstr "Podešavanje"
+
+#: src/gui/setup.cpp:72
+msgid "Apply"
+msgstr "Primjeni"
+
+#: src/gui/setup.cpp:72
+msgid "Reset Windows"
+msgstr "Ponovno pokreni prozore"
+
#: src/gui/setup_audio.cpp:41
msgid "Sound"
msgstr "Zvuk"
@@ -1205,11 +1201,11 @@ msgstr "Glasnoća zvučnih efekata"
msgid "Music volume"
msgstr "Glasnoća glazbe"
-#: 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 ""
@@ -1217,23 +1213,23 @@ 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
#, fuzzy
msgid "Static"
msgstr "Stanje"
#: 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 ""
#: 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
#, fuzzy
msgid "Spectrum"
msgstr "Podešavanje"
@@ -1242,26 +1238,18 @@ msgstr "Podešavanje"
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 "Primjeni"
-
-#: src/gui/setup.cpp:73
-msgid "Reset Windows"
-msgstr "Ponovno pokreni prozore"
-
#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:78
msgid "Press the button to start calibration"
msgstr "Pritisnite tipku za početak kalibracije"
@@ -1332,7 +1320,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 ""
@@ -1360,157 +1348,178 @@ 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
+#, fuzzy
+msgid "Small"
+msgstr "Prodaj"
+
+#: 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 "Pregled na čitavom ekranu"
-#: 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 "Vlastiti kursor"
-#: src/gui/setup_video.cpp:126
+#: src/gui/setup_video.cpp:155
msgid "Visible names"
msgstr "Vidljiva imena"
-#: 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 ""
-#: src/gui/setup_video.cpp:136
+#: src/gui/setup_video.cpp:167
msgid "FPS Limit:"
msgstr "Ograničenje sličica u sekundi"
-#: src/gui/setup_video.cpp:152
+#: src/gui/setup_video.cpp:184
msgid "Video"
msgstr "Slika"
-#: 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 "Prozirnost sučelja"
-#: src/gui/setup_video.cpp:159
+#: src/gui/setup_video.cpp:191
msgid "Scroll radius"
msgstr "Polumjer klizanja"
-#: src/gui/setup_video.cpp:160
+#: src/gui/setup_video.cpp:192
msgid "Scroll laziness"
msgstr "Brzina klizanja"
-#: src/gui/setup_video.cpp:161
+#: src/gui/setup_video.cpp:193
msgid "Ambient FX"
msgstr "Efekti okruženja"
-#: 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
#, fuzzy
msgid "No text"
msgstr "Slijedeći"
-#: src/gui/setup_video.cpp:236 src/gui/setup_video.cpp:498
+#: src/gui/setup_video.cpp:271 src/gui/setup_video.cpp:570
#, fuzzy
msgid "Bubbles, no names"
msgstr "Vidljiva imena"
-#: 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 ""
-#: 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 "isključeno"
-#: 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 "nisko"
-#: 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 "visoko"
-#: 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
#, fuzzy
msgid "fullscreen"
msgstr "Pregled na čitavom ekranu"
-#: 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 "Prebacivanje u pregled na čitavom ekranu"
-#: src/gui/setup_video.cpp:352
+#: src/gui/setup_video.cpp:422
msgid "Restart needed for changes to take effect."
msgstr "Potrebno je ponovno pokrenuti klijent za izvršavanje promjena."
-#: src/gui/setup_video.cpp:364
+#: src/gui/setup_video.cpp:434
msgid "Changing OpenGL"
msgstr "Promjena OpenGL-a"
-#: src/gui/setup_video.cpp:365
+#: src/gui/setup_video.cpp:435
msgid "Applying change to OpenGL requires restart."
msgstr "Izmjene OpenGL-a zahtjevaju ponovno pokretanje klijenta."
-#: 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
#, fuzzy
msgid "Restart your client for the change to take effect."
msgstr "Potrebno je ponovno pokrenuti klijent za izvršavanje promjena."
-#: 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 ""
@@ -1523,6 +1532,10 @@ msgstr "Vještine"
msgid "Mystery Skill"
msgstr ""
+#: src/gui/skill.cpp:126 src/gui/skilldialog.cpp:99 src/gui/windowmenu.cpp:62
+msgid "Skills"
+msgstr "Vještine"
+
#: src/gui/skill.cpp:145 src/gui/skill.cpp:197
#, c-format
msgid "Skill points: %d"
@@ -1532,15 +1545,6 @@ msgstr ""
msgid "Up"
msgstr ""
-#: src/gui/skill.cpp:146
-msgid "inc"
-msgstr ""
-
-#: src/gui/skill.cpp:147
-#, fuzzy
-msgid "use"
-msgstr "Upotrijebi"
-
#: src/gui/skilldialog.cpp:113
msgid "Weapons"
msgstr ""
@@ -1550,179 +1554,179 @@ msgstr ""
msgid "Crafts"
msgstr "Stvori"
-#: src/gui/status.cpp:57 src/gui/status.cpp:178
+#: src/gui/status.cpp:56 src/gui/status.cpp:177
#, fuzzy, c-format
msgid "Job: %d"
msgstr "Novac: %d"
-#: src/gui/status.cpp:61
+#: src/gui/status.cpp:60
msgid "HP:"
msgstr ""
-#: src/gui/status.cpp:64
+#: src/gui/status.cpp:63
msgid "Exp:"
msgstr ""
-#: src/gui/status.cpp:67
+#: src/gui/status.cpp:66
msgid "MP:"
msgstr ""
-#: src/gui/status.cpp:70
+#: src/gui/status.cpp:69
msgid "Job:"
msgstr ""
-#: src/gui/status.cpp:78
+#: src/gui/status.cpp:77
#, fuzzy
msgid "Stats"
msgstr "Stanje"
-#: 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
#, fuzzy
msgid "Attack:"
msgstr "Napad %+d"
-#: src/gui/status.cpp:85
+#: src/gui/status.cpp:84
#, fuzzy
msgid "Defense:"
msgstr "Obrana %+d"
-#: src/gui/status.cpp:86
+#: src/gui/status.cpp:85
#, fuzzy
msgid "M.Attack:"
msgstr "Napad %+d"
-#: src/gui/status.cpp:87
+#: src/gui/status.cpp:86
#, fuzzy
msgid "M.Defense:"
msgstr "Obrana %+d"
-#: src/gui/status.cpp:89
+#: src/gui/status.cpp:88
#, no-c-format
msgid "% Accuracy:"
msgstr ""
-#: src/gui/status.cpp:91
+#: src/gui/status.cpp:90
#, no-c-format
msgid "% Evade:"
msgstr ""
-#: 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
#, fuzzy
msgid "Strength"
msgstr "Snaga:"
-#: src/gui/status.cpp:200
+#: src/gui/status.cpp:199
#, fuzzy
msgid "Agility"
msgstr "Okretnost:"
-#: src/gui/status.cpp:201
+#: src/gui/status.cpp:200
#, fuzzy
msgid "Vitality"
msgstr "Vitalnost:"
-#: src/gui/status.cpp:202
+#: src/gui/status.cpp:201
#, fuzzy
msgid "Intelligence"
msgstr "Inteligencija:"
-#: src/gui/status.cpp:203
+#: src/gui/status.cpp:202
#, fuzzy
msgid "Dexterity"
msgstr "Spretnost:"
-#: 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 ""
-#: src/gui/status.cpp:383 src/gui/status.cpp:405
+#: src/gui/status.cpp:384
#, fuzzy
msgid "Max level"
msgstr "Muško"
-#: src/gui/storagewindow.cpp:53
+#: src/gui/storagewindow.cpp:54
msgid "Storage"
msgstr ""
-#: src/gui/storagewindow.cpp:64
+#: src/gui/storagewindow.cpp:65
#, fuzzy
msgid "Store"
msgstr "Zaustavi"
-#: 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 "Predloži razmjenu"
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:52
#, fuzzy
msgid "Confirmed. Waiting..."
msgstr "Spajanje..."
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:53
#, fuzzy
msgid "Agree trade"
msgstr "Predloži razmjenu"
-#: 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 "Dodaj"
-#: 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
#, fuzzy, c-format
msgid "You get %s."
msgstr "Dobivaš %d zlatnika."
-#: src/gui/trade.cpp:97
+#: src/gui/trade.cpp:96
msgid "You give:"
msgstr "Daješ:"
-#: src/gui/trade.cpp:101
+#: src/gui/trade.cpp:100
msgid "Change"
msgstr "Izmijeni"
-#: 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 ""
@@ -1834,21 +1838,21 @@ msgstr ""
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 ""
-#: src/gui/widgets/chattab.cpp:147
+#: src/gui/widgets/chattab.cpp:146
#, c-format
msgid "%s whispers: "
msgstr ""
-#: 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 ""
@@ -1856,23 +1860,35 @@ msgstr ""
msgid "Cannot send empty chat!"
msgstr ""
-#: src/gui/widgets/whispertab.cpp:55
-#, c-format
-msgid "%s: %s"
-msgstr ""
-
-#: src/gui/widgets/whispertab.cpp:69
+#: src/gui/widgets/whispertab.cpp:68
msgid "/close > Close the whisper tab"
msgstr ""
-#: src/gui/widgets/whispertab.cpp:79
+#: src/gui/widgets/whispertab.cpp:78
msgid "Command: /close"
msgstr ""
-#: 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 "Stanje"
+
+#: src/gui/windowmenu.cpp:65
+msgid "Guilds"
+msgstr "Cehovi"
+
+#: src/gui/windowmenu.cpp:66
+#, fuzzy
+msgid "Buddys"
+msgstr "Kupi"
+
+#: src/gui/windowmenu.cpp:68
+msgid "Shortcut"
+msgstr "Kratica"
+
#: src/keyboardconfig.cpp:41
msgid "Move Up"
msgstr ""
@@ -2003,7 +2019,7 @@ msgstr "Ponovno pokreni prozore"
#: src/keyboardconfig.cpp:80
#, fuzzy
-msgid "Emote Window"
+msgid "Party Window"
msgstr "Ponovno pokreni prozore"
#: src/keyboardconfig.cpp:81
@@ -2053,165 +2069,169 @@ msgstr ""
msgid "Ignore input 2"
msgstr ""
-#: 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
#, fuzzy
msgid "Sword"
msgstr "Zvuk"
-#: 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
#, fuzzy
msgid "Bow"
msgstr "nisko"
-#: src/localplayer.cpp:856
+#: src/localplayer.cpp:841
msgid "Shooting"
msgstr ""
-#: src/localplayer.cpp:857
+#: src/localplayer.cpp:842
#, fuzzy
msgid "Mace"
msgstr "Muško"
-#: 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
#, fuzzy
msgid "Craft"
msgstr "Stvori"
-#: 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 ""
-#: src/main.cpp:563
-msgid "Options: "
-msgstr ""
-
-#: src/main.cpp:564
-msgid " -C --configfile : Configuration file to use"
-msgstr ""
-
-#: src/main.cpp:565
-msgid " -d --data : Directory to load game data from"
-msgstr ""
-
-#: src/main.cpp:566
-msgid " -D --default : Bypass the login process with default settings"
+#: src/main.cpp:567
+msgid "Options:"
msgstr ""
#: src/main.cpp:568
-msgid " -h --help : Display this help"
+msgid " -C --config-file : Configuration file to use"
msgstr ""
#: src/main.cpp:569
-msgid " -S --homedir : Directory to use as home directory"
+msgid " -d --data : Directory to load game data from"
msgstr ""
#: src/main.cpp:570
-msgid " -H --updatehost : Use this update host"
-msgstr ""
-
-#: src/main.cpp:571
-msgid " -P --password : Login with this password"
+msgid " -D --default : Choose default character server and character"
msgstr ""
#: src/main.cpp:572
-msgid " -c --character : Login with this character"
+msgid " -h --help : Display this help"
msgstr ""
#: src/main.cpp:573
-msgid " -o --port : Login Server Port"
+msgid " -S --home-dir : Directory to use as home directory"
msgstr ""
#: src/main.cpp:574
-msgid " -s --server : Login Server name or IP"
+msgid " -H --update-host : Use this update host"
msgstr ""
#: src/main.cpp:575
-msgid " -u --skipupdate : Skip the update downloads"
+msgid " -P --password : Login with this password"
msgstr ""
#: src/main.cpp:576
-msgid " -U --username : Login with this username"
+msgid " -c --character : Login with this character"
msgstr ""
#: src/main.cpp:577
-msgid " -v --version : Display the version"
+msgid " -p --port : Login Server Port"
+msgstr ""
+
+#: src/main.cpp:578
+msgid " -s --server : Login Server name or IP"
+msgstr ""
+
+#: src/main.cpp:579
+msgid " -u --skip-update : Skip the update downloads"
+msgstr ""
+
+#: src/main.cpp:580
+msgid " -U --username : Login with this username"
msgstr ""
#: src/main.cpp:582
+msgid " -O --no-opengl : Disable OpenGL for this session"
+msgstr ""
+
+#: src/main.cpp:584
+msgid " -v --version : Display the version"
+msgstr ""
+
+#: src/main.cpp:589
#, fuzzy
msgid "The Mana World "
msgstr "Odaberite svoj Mana World poslužitelj"
-#: src/main.cpp:1499
+#: src/main.cpp:1515
#, fuzzy
msgid "Connecting to map server..."
msgstr "Spajanje..."
-#: 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 ""
@@ -2293,18 +2313,18 @@ msgstr "Spretnost:"
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 ""
@@ -2317,416 +2337,430 @@ msgstr "Skini opremu"
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
#, fuzzy, c-format
msgid "Strength: %d"
msgstr "Snaga:"
-#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:82
+#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:84
#, fuzzy, c-format
msgid "Agility: %d"
msgstr "Okretnost:"
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:86
+#: src/net/ea/generalhandler.cpp:96 src/net/tmwserv/generalhandler.cpp:88
#, fuzzy, c-format
msgid "Vitality: %d"
msgstr "Vitalnost:"
-#: src/net/ea/generalhandler.cpp:96 src/net/tmwserv/generalhandler.cpp:88
+#: src/net/ea/generalhandler.cpp:98 src/net/tmwserv/generalhandler.cpp:90
#, fuzzy, c-format
msgid "Intelligence: %d"
msgstr "Inteligencija:"
-#: src/net/ea/generalhandler.cpp:98 src/net/tmwserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:100 src/net/tmwserv/generalhandler.cpp:86
#, fuzzy, c-format
msgid "Dexterity: %d"
msgstr "Spretnost:"
-#: src/net/ea/generalhandler.cpp:100
+#: src/net/ea/generalhandler.cpp:102
#, c-format
msgid "Luck: %d"
msgstr ""
-#: 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 ""
-#: 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 ""
+
+#: src/net/ea/gui/partytab.cpp:53
msgid "/create > Create a new party"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:55
+#: src/net/ea/gui/partytab.cpp:54
msgid "/new > Alias of create"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:56
+#: src/net/ea/gui/partytab.cpp:55
msgid "/invite > Invite a player to your party"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:57
+#: src/net/ea/gui/partytab.cpp:56
msgid "/leave > Leave the party you are in"
msgstr ""
-#: 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 ""
-#: src/net/ea/gui/partytab.cpp:59
+#: src/net/ea/gui/partytab.cpp:58
msgid "/item > Show/change party item sharing options"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:60
+#: src/net/ea/gui/partytab.cpp:59
msgid "/exp > Show/change party experience sharing options"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:69
+#: src/net/ea/gui/partytab.cpp:68
msgid "Command: /new <party-name>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:70
+#: src/net/ea/gui/partytab.cpp:69
msgid "Command: /create <party-name>"
msgstr ""
-#: 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 ""
-#: src/net/ea/gui/partytab.cpp:75
+#: src/net/ea/gui/partytab.cpp:74
msgid "Command: /invite <nick>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:82
+#: src/net/ea/gui/partytab.cpp:81
msgid "Command: /leave"
msgstr ""
-#: 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 ""
-#: 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."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:92
+#: src/net/ea/gui/partytab.cpp:91
msgid "Command: /item"
msgstr ""
-#: 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 ""
-#: 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."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:102
+#: src/net/ea/gui/partytab.cpp:101
msgid "Command: /exp"
msgstr ""
-#: 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]"
+msgid "You picked up %s [@@%d|%s@@]"
msgstr ""
-#: 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
#, fuzzy
msgid "Unregistered ID"
msgstr "Odjavi"
-#: src/net/ea/loginhandler.cpp:114
+#: src/net/ea/loginhandler.cpp:113
#, fuzzy
msgid "Wrong password"
msgstr "Promijeni Lozinku"
-#: src/net/ea/loginhandler.cpp:117
+#: src/net/ea/loginhandler.cpp:116
#, fuzzy
msgid "Account expired"
msgstr "Korisnički račun: %s"
-#: 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 ""
-#: 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"
" Please contact the GM team via the forums."
msgstr ""
-#: 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."
+#: src/net/ea/partyhandler.cpp:77
+msgid "Could not create party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:82
-msgid "Could not create party."
+#: src/net/ea/partyhandler.cpp:80
+msgid "Party successfully created."
msgstr ""
-#: src/net/ea/partyhandler.cpp:112
+#: src/net/ea/partyhandler.cpp:115
#, c-format
msgid "%s is already a member of a party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:116
+#: src/net/ea/partyhandler.cpp:119
#, c-format
msgid "%s refused your invitation."
msgstr ""
-#: src/net/ea/partyhandler.cpp:120
+#: src/net/ea/partyhandler.cpp:123
#, c-format
msgid "%s is now a member of your party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:124
+#: src/net/ea/partyhandler.cpp:127
#, c-format
msgid "Unknown invite response for %s."
msgstr ""
-#: 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 ""
-#: src/net/ea/partyhandler.cpp:269
+#: src/net/ea/partyhandler.cpp:272
#, c-format
msgid "An unknown member tried to say: %s"
msgstr ""
-#: 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 ""
-#: 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"
+#: 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 ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
@@ -2884,40 +2918,101 @@ msgstr ""
msgid "Willpower:"
msgstr "Snaga volje:"
-#: 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
#, fuzzy, c-format
msgid "Willpower: %d"
msgstr "Snaga volje:"
-#: 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
+#, fuzzy
+msgid "Server is full"
+msgstr "Poslužitelj:"
+
+#: 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
+#, fuzzy
+msgid "New email address incorrect"
+msgstr "Promijeni Email Adresu"
+
+#: src/net/tmwserv/loginhandler.cpp:143
+#, fuzzy
+msgid "Old email address incorrect"
+msgstr "Promijeni Email Adresu"
+
+#: src/net/tmwserv/loginhandler.cpp:149
+#, fuzzy
+msgid "The new Email Address already exists."
+msgstr "Promijeni Email Adresu"
+
+#: 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 "Promijeni Lozinku"
+
+#: src/net/tmwserv/loginhandler.cpp:211
+msgid "Wrong username, password or email address"
+msgstr ""
+
+#: src/net/tmwserv/loginhandler.cpp:214
+msgid "Username already exists"
+msgstr ""
+
+#: src/net/tmwserv/loginhandler.cpp:217
+msgid "Email address already exists"
+msgstr ""
+
+#: src/resources/itemdb.cpp:52
#, c-format
msgid "Attack %+d"
msgstr "Napad %+d"
-#: src/resources/itemdb.cpp:54
+#: src/resources/itemdb.cpp:53
#, c-format
msgid "Defense %+d"
msgstr "Obrana %+d"
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:54
#, c-format
msgid "HP %+d"
msgstr "Zdravlje %+d"
-#: src/resources/itemdb.cpp:56
+#: src/resources/itemdb.cpp:55
#, c-format
msgid "MP %+d"
msgstr "Mana %+d"
-#: src/resources/itemdb.cpp:113
+#: src/resources/itemdb.cpp:112
msgid "items.xml"
msgstr ""
-#: src/resources/itemdb.cpp:151
+#: src/resources/itemdb.cpp:150
msgid "Unnamed"
msgstr ""
@@ -2933,6 +3028,20 @@ msgstr ""
msgid "NPC Database: Error while loading npcs.xml!"
msgstr ""
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "> Cancel\n"
+#~ msgstr "Poništi"
+
+#, fuzzy
+#~ msgid "use"
+#~ msgstr "Upotrijebi"
+
+#, fuzzy
+#~ msgid "Emote Window"
+#~ msgstr "Ponovno pokreni prozore"
+
#~ msgid "@@description|Description@@"
#~ msgstr "@@description|Opis@@"
diff --git a/po/id.po b/po/id.po
index 9f7e6041..0828d6e5 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-04-21 17:27+0200\n"
+"POT-Creation-Date: 2009-05-10 15:53+0200\n"
"PO-Revision-Date: 2008-03-26 09:11+0000\n"
"Last-Translator: ActiveFile <activefile@gmail.com>\n"
"Language-Team: Indonesian <id@li.org>\n"
@@ -17,286 +17,286 @@ msgstr ""
"X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
"X-Generator: Launchpad (build Unknown)\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."
+#: src/commandhandler.cpp:142
+msgid "/help > Display this help"
msgstr ""
-#: src/commandhandler.cpp:145
+#: src/commandhandler.cpp:144
msgid "/where > Display map name"
msgstr ""
-#: src/commandhandler.cpp:146
+#: src/commandhandler.cpp:145
msgid "/who > Display number of online users"
msgstr ""
-#: src/commandhandler.cpp:147
+#: src/commandhandler.cpp:146
msgid "/me > Tell something about yourself"
msgstr ""
-#: src/commandhandler.cpp:149
+#: src/commandhandler.cpp:148
msgid "/clear > Clears this window"
msgstr ""
-#: src/commandhandler.cpp:151
+#: src/commandhandler.cpp:150
msgid "/msg > Send a private message to a user"
msgstr ""
-#: src/commandhandler.cpp:152
+#: src/commandhandler.cpp:151
msgid "/whisper > Alias of msg"
msgstr ""
-#: src/commandhandler.cpp:153
+#: src/commandhandler.cpp:152
msgid "/w > Alias of msg"
msgstr ""
-#: src/commandhandler.cpp:154
+#: src/commandhandler.cpp:153
msgid "/query > Makes a tab for private messages with another user"
msgstr ""
-#: src/commandhandler.cpp:155
+#: src/commandhandler.cpp:154
msgid "/q > Alias of query"
msgstr ""
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:156
msgid "/list > Display all public channels"
msgstr ""
-#: src/commandhandler.cpp:158
+#: src/commandhandler.cpp:157
msgid "/join > Join or create a channel"
msgstr ""
-#: src/commandhandler.cpp:160
+#: src/commandhandler.cpp:159
msgid "/party > Invite a user to party"
msgstr ""
-#: src/commandhandler.cpp:162
+#: src/commandhandler.cpp:161
msgid "/record > Start recording the chat to an external file"
msgstr ""
-#: 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 ""
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:165
msgid "/announce > Global announcement (GM only)"
msgstr ""
-#: src/commandhandler.cpp:170
+#: src/commandhandler.cpp:169
msgid "For more information, type /help <command>"
msgstr ""
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:173
msgid "Command: /help"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: src/commandhandler.cpp:186
+#: src/commandhandler.cpp:185
msgid "*** only available to a GM ***"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: src/commandhandler.cpp:209
+#: src/commandhandler.cpp:208
msgid "This command tell others you are (doing) <msg>."
msgstr ""
-#: src/commandhandler.cpp:213
+#: src/commandhandler.cpp:212
msgid "Command: /msg <nick> <message>"
msgstr ""
-#: src/commandhandler.cpp:214
+#: src/commandhandler.cpp:213
msgid "Command: /whisper <nick> <message>"
msgstr ""
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:214
msgid "Command: /w <nick> <message>"
msgstr ""
-#: src/commandhandler.cpp:216
+#: src/commandhandler.cpp:215
msgid "This command sends the text <message> to <nick>."
msgstr ""
-#: 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 ""
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:222
msgid "Command: /q <nick>"
msgstr ""
-#: src/commandhandler.cpp:224
+#: src/commandhandler.cpp:223
msgid "This command tries to make a tab for whispers betweenyou and <nick>."
msgstr ""
-#: src/commandhandler.cpp:229
+#: src/commandhandler.cpp:228
msgid "Command: /party <nick>"
msgstr ""
-#: 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 ""
-#: src/commandhandler.cpp:236
+#: src/commandhandler.cpp:235
msgid "Command: /present"
msgstr ""
-#: 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 ""
-#: src/commandhandler.cpp:244
+#: src/commandhandler.cpp:243
msgid "This command starts recording the chat log to the file <filename>."
msgstr ""
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:245
msgid "Command: /record"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: src/commandhandler.cpp:257
+#: src/commandhandler.cpp:256
msgid "Command: /toggle"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: src/commandhandler.cpp:336
-msgid "Cannont send empty whispers!"
+#: 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 ""
-#: 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 ""
@@ -305,46 +305,46 @@ msgstr ""
msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
msgstr ""
-#: 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"
+#: src/game.cpp:481
+msgid "The connection to the server was lost, the program will now quit"
msgstr ""
-#: src/game.cpp:493
-msgid "The connection to the server was lost, the program will now quit"
+#: src/game.cpp:487
+msgid "Network Error"
msgstr ""
-#: src/game.cpp:664 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
+#: 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 "Keluar"
-#: src/game.cpp:665
+#: src/game.cpp:647
#, fuzzy
msgid "Are you sure you want to quit?"
msgstr "Apakah anda bersungguh-sungguh ingin menghapus karakter ini?"
-#: 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 ""
@@ -357,12 +357,12 @@ msgstr "Beli"
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 "Beli"
#: 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
#, fuzzy, c-format
msgid "Price: %s / Total: %s"
msgstr "Harga: %d GP / Jumlah: %d GP"
@@ -372,13 +372,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 "Deskripsi: %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 "Efek: %s"
@@ -388,205 +388,213 @@ msgstr "Efek: %s"
msgid "Shop"
msgstr "Berhenti"
-#: 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 "Jual"
-#: 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 "Batal"
-#: 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 ""
-#: 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
#, fuzzy
msgid "Change Password"
msgstr "Kata Sandi:"
-#: 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 "Kata Sandi:"
-#: 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 "Buat Karakter"
-#: 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 "Nama:"
-#: src/gui/charcreatedialog.cpp:70
+#: src/gui/charcreatedialog.cpp:69
msgid "Hair Color:"
msgstr "Warna Rambut:"
-#: src/gui/charcreatedialog.cpp:73
+#: src/gui/charcreatedialog.cpp:72
msgid "Hair Style:"
msgstr "Gaya Rambut:"
-#: src/gui/charcreatedialog.cpp:74
+#: src/gui/charcreatedialog.cpp:73
msgid "Create"
msgstr "Buat"
-#: 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 "Tolong distribusikan %d point"
-#: 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 "Kesalahan"
-#: src/gui/charcreatedialog.cpp:174
+#: src/gui/charcreatedialog.cpp:173
msgid "Your name needs to be at least 4 characters."
msgstr "Nama anda sekurang-kurangnya harus 4 karakter"
-#: src/gui/charcreatedialog.cpp:227
+#: src/gui/charcreatedialog.cpp:226
msgid "Character stats OK"
msgstr "Stats Karakter OK"
-#: src/gui/charcreatedialog.cpp:239
+#: src/gui/charcreatedialog.cpp:238
#, c-format
msgid "Please remove %d points"
msgstr "Tolong hilangkan %d point"
-#: 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 "Apakah anda bersungguh-sungguh ingin menghapus karakter ini?"
-#: 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 "Pilih Karakter"
-#: 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 "Ok"
-#: src/gui/char_select.cpp:113
+#: src/gui/charselectdialog.cpp:112
msgid "Previous"
msgstr "Sebelumnya"
-#: 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 "Berikutnya"
-#: 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 "Nama: %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 "Tingkatan: %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 "Buat baru"
-#: 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 "Hapus"
-#: src/gui/char_select.cpp:120 src/gui/unregisterdialog.cpp:51
+#: src/gui/charselectdialog.cpp:119 src/gui/unregisterdialog.cpp:52
msgid "Unregister"
msgstr "Tidak terdaftar"
-#: src/gui/char_select.cpp:127
+#: src/gui/charselectdialog.cpp:126
#, c-format
msgid "Money: %d"
msgstr "Uang: %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
#, fuzzy, c-format
msgid "Job Level: %d"
msgstr "Tingkatan: %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
#, fuzzy, c-format
msgid "Money: %s"
msgstr "Uang: %d"
-#: 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
#, fuzzy
msgid "Chat"
msgstr "Buat"
-#: src/gui/chat.cpp:341 src/gui/chat.cpp:347
+#: src/gui/chat.cpp:332
+#, c-format
+msgid "%d players are present."
+msgstr ""
+
+#: 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 ""
-#: src/gui/confirm_dialog.cpp:42
+#: src/gui/confirmdialog.cpp:42
msgid "Yes"
msgstr "Ya"
-#: src/gui/confirm_dialog.cpp:43
+#: src/gui/confirmdialog.cpp:43
msgid "No"
msgstr "Tidak"
@@ -594,26 +602,16 @@ msgstr "Tidak"
msgid "Connecting..."
msgstr "Menyambung..."
-#: src/gui/emotecontainer.cpp:61
+#: src/gui/emotepopup.cpp:64
msgid "Unable to load selection.png"
msgstr ""
-#: 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 "Gunakan"
-
-#: src/gui/equipmentwindow.cpp:68 src/gui/menuwindow.cpp:67
+#: src/gui/equipmentwindow.cpp:68 src/gui/windowmenu.cpp:60
msgid "Equipment"
msgstr "Perlengkapan"
-#: 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 ""
@@ -638,100 +636,103 @@ 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 "Inventaris"
-#: 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 "Gunakan"
+
+#: src/gui/inventorywindow.cpp:80
msgid "Drop"
msgstr "Jatuh"
-#: src/gui/inventorywindow.cpp:79
+#: src/gui/inventorywindow.cpp:81
msgid "Split"
msgstr "Pecah"
-#: 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 "Pilih jumlah item yang mau di perdagangkan"
-#: src/gui/item_amount.cpp:95
+#: src/gui/itemamount.cpp:124
msgid "Select amount of items to drop."
msgstr "Pilih jumlah item yang mau di buang"
-#: src/gui/item_amount.cpp:98
+#: src/gui/itemamount.cpp:127
#, fuzzy
msgid "Select amount of items to store."
msgstr "Pilih jumlah item yang mau di perdagangkan"
-#: src/gui/item_amount.cpp:101
+#: src/gui/itemamount.cpp:130
#, fuzzy
msgid "Select amount of items to retrieve."
msgstr "Pilih jumlah item yang mau di perdagangkan"
-#: src/gui/item_amount.cpp:104
+#: src/gui/itemamount.cpp:133
msgid "Select amount of items to split."
msgstr "Pilih jumlah item yang mau di pisahkan"
-#: 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 "Login"
-#: 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 "Server:"
-#: 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:"
-#: src/gui/login.cpp:55
+#: src/gui/login.cpp:56
#, fuzzy
msgid "Recent:"
msgstr "Mendaftar"
-#: 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 "Mendaftar"
-#: 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 ""
@@ -747,71 +748,44 @@ msgstr ""
msgid "Cast Test Spell 3"
msgstr ""
-#: src/gui/menuwindow.cpp:66
-msgid "Status"
-msgstr "Status"
-
-#: src/gui/menuwindow.cpp:69 src/gui/skill.cpp:126 src/gui/skilldialog.cpp:99
-msgid "Skills"
-msgstr "Keahlian"
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
+#, fuzzy
+msgid "Map"
+msgstr "MiniMap"
-#: src/gui/menuwindow.cpp:72
-msgid "Guilds"
+#: src/gui/npcdialog.cpp:43
+msgid "Waiting for server"
msgstr ""
-#: src/gui/menuwindow.cpp:73
+#: src/gui/npcdialog.cpp:46
#, fuzzy
-msgid "Buddys"
-msgstr "Beli"
-
-#: src/gui/menuwindow.cpp:75
-msgid "Shortcut"
-msgstr "Tombol Singkat"
+msgid "Submit"
+msgstr "Pecah"
-#: src/gui/menuwindow.cpp:77 src/gui/setup.cpp:65 src/main.cpp:920
-msgid "Setup"
-msgstr "Atur"
+#: src/gui/npcdialog.cpp:49 src/gui/npcpostdialog.cpp:39
+msgid "NPC"
+msgstr "NPC"
-#: src/gui/minimap.cpp:39
-msgid "MiniMap"
-msgstr "MiniMap"
+#: src/gui/npcdialog.cpp:95
+msgid "+"
+msgstr ""
-#: src/gui/npcintegerdialog.cpp:39
-msgid "NPC Number Request"
+#: src/gui/npcdialog.cpp:96
+msgid "-"
msgstr ""
-#: src/gui/npcintegerdialog.cpp:50
+#: src/gui/npcdialog.cpp:105
#, fuzzy
msgid "Reset"
msgstr "Mendaftar"
-#: src/gui/npcintegerdialog.cpp:101 src/gui/npclistdialog.cpp:123
-#: src/gui/npcstringdialog.cpp:75
-#, fuzzy
-msgid ""
-"\n"
-"> Cancel\n"
-msgstr "Batal"
-
-#: src/gui/npcpostdialog.cpp:39 src/gui/npc_text.cpp:37
-msgid "NPC"
-msgstr "NPC"
-
#: src/gui/npcpostdialog.cpp:51
#, fuzzy
msgid "Send"
msgstr "Suara"
-#: src/gui/npcstringdialog.cpp:39
-msgid "NPC Text Request"
-msgstr ""
-
-#: 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
#, fuzzy
msgid "Text"
msgstr "Berikutnya"
@@ -866,7 +840,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
#, fuzzy
msgid "Party"
msgstr "Port:"
@@ -889,7 +863,7 @@ msgid "Being"
msgstr ""
#: src/gui/palette.cpp:104
-msgid "Other Player's Names"
+msgid "Other Players' Names"
msgstr ""
#: src/gui/palette.cpp:105
@@ -916,21 +890,22 @@ msgid "Unknown Item Type"
msgstr ""
#: src/gui/palette.cpp:111
-msgid "Generic"
+msgid "Generics"
msgstr ""
#: src/gui/palette.cpp:112
-msgid "Hat"
-msgstr ""
+#, fuzzy
+msgid "Hats"
+msgstr "Status"
#: src/gui/palette.cpp:113
#, fuzzy
-msgid "Usable"
+msgid "Usables"
msgstr "Gunakan"
#: src/gui/palette.cpp:114
#, fuzzy
-msgid "Shirt"
+msgid "Shirts"
msgstr "Tombol Singkat"
#: src/gui/palette.cpp:115
@@ -953,15 +928,15 @@ msgstr ""
#: src/gui/palette.cpp:119
#, fuzzy
-msgid "Shield"
+msgid "Shields"
msgstr "Jual"
#: src/gui/palette.cpp:120
-msgid "Ring"
+msgid "Rings"
msgstr ""
#: src/gui/palette.cpp:121
-msgid "Necklace"
+msgid "Necklaces"
msgstr ""
#: src/gui/palette.cpp:122
@@ -1017,95 +992,104 @@ msgstr ""
msgid "1/4 HP Bar"
msgstr ""
-#: src/gui/popupmenu.cpp:73
+#: src/gui/popupmenu.cpp:75
msgid "@@name|Add name to chat@@"
msgstr ""
-#: src/gui/popupmenu.cpp:85
+#: src/gui/popupmenu.cpp:87
#, c-format
msgid "@@trade|Trade With %s@@"
msgstr "@@trade|Dagang Dengan %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 "@@attack|Serang%s@@"
-#: src/gui/popupmenu.cpp:92
+#: src/gui/popupmenu.cpp:94
#, c-format
msgid "@@friend|Befriend %s@@"
msgstr ""
-#: 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 ""
-#: src/gui/popupmenu.cpp:112
+#: src/gui/popupmenu.cpp:114
#, c-format
msgid "@@party|Invite %s to join your party@@"
msgstr ""
-#: src/gui/popupmenu.cpp:123
+#: src/gui/popupmenu.cpp:125
#, fuzzy, c-format
msgid "@@talk|Talk To %s@@"
msgstr "@@talk|Bicara dengan NPC@@"
-#: 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 "@@cancel|Batal@@"
-#: src/gui/popupmenu.cpp:155
-#, c-format
-msgid "@@pickup|Pick Up %s@@"
+#: src/gui/popupmenu.cpp:157
+#, fuzzy, c-format
+msgid "@@pickup|Pick up %s@@"
msgstr "@@pickup|Ambil %s@@"
-#: src/gui/popupmenu.cpp:156 src/gui/popupmenu.cpp:352
-msgid "@@chat|Add to Chat@@"
+#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:373
+msgid "@@chat|Add to chat@@"
msgstr ""
-#: src/gui/popupmenu.cpp:336 src/gui/popupmenu.cpp:341
-msgid "@@use|Equip@@"
-msgstr "@@use|Melengkapi@@"
-
-#: src/gui/popupmenu.cpp:339
+#: src/gui/popupmenu.cpp:348
#, fuzzy
msgid "@@use|Unequip@@"
msgstr "@@use|Melengkapi@@"
-#: src/gui/popupmenu.cpp:345
+#: src/gui/popupmenu.cpp:350
+msgid "@@use|Equip@@"
+msgstr "@@use|Melengkapi@@"
+
+#: src/gui/popupmenu.cpp:353
msgid "@@use|Use@@"
msgstr "@@use|Gunakan@@"
-#: src/gui/popupmenu.cpp:347
+#: src/gui/popupmenu.cpp:355
msgid "@@drop|Drop@@"
msgstr "@@drop|Buang@@"
-#: src/gui/popupmenu.cpp:350
+#: src/gui/popupmenu.cpp:359
msgid "@@split|Split@@"
msgstr "@@split|Pisah@@"
+#: src/gui/popupmenu.cpp:364
+#, fuzzy
+msgid "@@store|Store@@"
+msgstr "@@use|Gunakan@@"
+
+#: src/gui/popupmenu.cpp:371
+msgid "@@retrieve|Retrieve@@"
+msgstr ""
+
#: src/gui/quitdialog.cpp:37
msgid "Switch server"
msgstr "Ganti Server"
@@ -1175,20 +1159,32 @@ msgstr ""
msgid "Passwords do not match."
msgstr "Kata sandi tidak sama."
-#: src/gui/serverdialog.cpp:73
+#: src/gui/serverdialog.cpp:74
#, fuzzy
msgid "Choose your server"
msgstr "Pilih Server Mana World"
-#: src/gui/serverdialog.cpp:163
+#: src/gui/serverdialog.cpp:164
msgid "Please type both the address and the port of a server."
msgstr "Tolong tulis address dan port dari server"
-#: src/gui/serverselectdialog.cpp:50
+#: src/gui/serverselectdialog.cpp:59
#, fuzzy
msgid "Select Server"
msgstr "Pilih Karakter"
+#: src/gui/setup.cpp:64 src/gui/windowmenu.cpp:69 src/main.cpp:933
+msgid "Setup"
+msgstr "Atur"
+
+#: src/gui/setup.cpp:72
+msgid "Apply"
+msgstr "Terapkan"
+
+#: src/gui/setup.cpp:72
+msgid "Reset Windows"
+msgstr ""
+
#: src/gui/setup_audio.cpp:41
msgid "Sound"
msgstr "Suara"
@@ -1205,11 +1201,11 @@ msgstr "Volume sfx"
msgid "Music volume"
msgstr "Volume Musik"
-#: 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 ""
@@ -1217,23 +1213,23 @@ 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
#, fuzzy
msgid "Static"
msgstr "Status"
#: 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 ""
#: 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
#, fuzzy
msgid "Spectrum"
msgstr "Atur"
@@ -1242,26 +1238,18 @@ msgstr "Atur"
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 "Terapkan"
-
-#: 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 "Tekan tombol untuk memulai kalibrasi"
@@ -1332,7 +1320,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 ""
@@ -1360,156 +1348,177 @@ 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
+#, fuzzy
+msgid "Small"
+msgstr "Jual"
+
+#: 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 "Layar penuh"
-#: 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 ""
-#: src/gui/setup_video.cpp:136
+#: src/gui/setup_video.cpp:167
msgid "FPS Limit:"
msgstr "Batas FPS"
-#: src/gui/setup_video.cpp:152
+#: src/gui/setup_video.cpp:184
msgid "Video"
msgstr "Video"
-#: 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 ""
-#: src/gui/setup_video.cpp:159
+#: src/gui/setup_video.cpp:191
msgid "Scroll radius"
msgstr "Radius gulungan"
-#: 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 ""
-#: 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
#, fuzzy
msgid "No text"
msgstr "Berikutnya"
-#: 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 ""
-#: 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 ""
-#: 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 "mati"
-#: 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 "rendah"
-#: 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 "tinggi"
-#: 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
#, fuzzy
msgid "fullscreen"
msgstr "Layar penuh"
-#: 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 "Mengganti ke layar penuh"
-#: src/gui/setup_video.cpp:352
+#: src/gui/setup_video.cpp:422
msgid "Restart needed for changes to take effect."
msgstr "Memulai dari awal di butuhkan untuk melihat efek"
-#: src/gui/setup_video.cpp:364
+#: src/gui/setup_video.cpp:434
msgid "Changing OpenGL"
msgstr "Mengubah OpenGL"
-#: src/gui/setup_video.cpp:365
+#: src/gui/setup_video.cpp:435
msgid "Applying change to OpenGL requires restart."
msgstr "Mendaftar perubahan ke OpenGL membutuhkan memulai dari awal"
-#: 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
#, fuzzy
msgid "Restart your client for the change to take effect."
msgstr "Memulai dari awal di butuhkan untuk melihat efek"
-#: 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 ""
@@ -1522,6 +1531,10 @@ msgstr "Keahlian"
msgid "Mystery Skill"
msgstr ""
+#: src/gui/skill.cpp:126 src/gui/skilldialog.cpp:99 src/gui/windowmenu.cpp:62
+msgid "Skills"
+msgstr "Keahlian"
+
#: src/gui/skill.cpp:145 src/gui/skill.cpp:197
#, c-format
msgid "Skill points: %d"
@@ -1531,15 +1544,6 @@ msgstr ""
msgid "Up"
msgstr ""
-#: src/gui/skill.cpp:146
-msgid "inc"
-msgstr ""
-
-#: src/gui/skill.cpp:147
-#, fuzzy
-msgid "use"
-msgstr "Gunakan"
-
#: src/gui/skilldialog.cpp:113
msgid "Weapons"
msgstr ""
@@ -1549,179 +1553,179 @@ msgstr ""
msgid "Crafts"
msgstr "Buat"
-#: src/gui/status.cpp:57 src/gui/status.cpp:178
+#: src/gui/status.cpp:56 src/gui/status.cpp:177
#, fuzzy, c-format
msgid "Job: %d"
msgstr "Tingkatan: %d"
-#: src/gui/status.cpp:61
+#: src/gui/status.cpp:60
msgid "HP:"
msgstr ""
-#: src/gui/status.cpp:64
+#: src/gui/status.cpp:63
msgid "Exp:"
msgstr ""
-#: src/gui/status.cpp:67
+#: src/gui/status.cpp:66
msgid "MP:"
msgstr ""
-#: src/gui/status.cpp:70
+#: src/gui/status.cpp:69
#, fuzzy
msgid "Job:"
msgstr "Tingkatan: %d"
-#: src/gui/status.cpp:78
+#: src/gui/status.cpp:77
#, fuzzy
msgid "Stats"
msgstr "Status"
-#: 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
#, fuzzy
msgid "Attack:"
msgstr "Serangan %+d"
-#: src/gui/status.cpp:85
+#: src/gui/status.cpp:84
#, fuzzy
msgid "Defense:"
msgstr "Pertahanan %+d"
-#: src/gui/status.cpp:86
+#: src/gui/status.cpp:85
#, fuzzy
msgid "M.Attack:"
msgstr "Serangan %+d"
-#: src/gui/status.cpp:87
+#: src/gui/status.cpp:86
#, fuzzy
msgid "M.Defense:"
msgstr "Pertahanan %+d"
-#: src/gui/status.cpp:89
+#: src/gui/status.cpp:88
#, no-c-format
msgid "% Accuracy:"
msgstr ""
-#: src/gui/status.cpp:91
+#: src/gui/status.cpp:90
#, no-c-format
msgid "% Evade:"
msgstr ""
-#: 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
#, fuzzy
msgid "Strength"
msgstr "Kekuatan"
-#: src/gui/status.cpp:200
+#: src/gui/status.cpp:199
#, fuzzy
msgid "Agility"
msgstr "Daya/Tenaga Hidup"
-#: src/gui/status.cpp:201
+#: src/gui/status.cpp:200
#, fuzzy
msgid "Vitality"
msgstr "Daya/Tenaga Hidup"
-#: src/gui/status.cpp:202
+#: src/gui/status.cpp:201
#, fuzzy
msgid "Intelligence"
msgstr "Kecerdasan"
-#: src/gui/status.cpp:203
+#: src/gui/status.cpp:202
#, fuzzy
msgid "Dexterity"
msgstr "Ketangkasan"
-#: 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 ""
-#: 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
#, fuzzy
msgid "Store"
msgstr "Berhenti"
-#: 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 "Menawarkan tukar menukar"
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:52
#, fuzzy
msgid "Confirmed. Waiting..."
msgstr "Menyambung..."
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:53
#, fuzzy
msgid "Agree trade"
msgstr "Menawarkan tukar menukar"
-#: 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 "Tambah"
-#: 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
#, fuzzy, c-format
msgid "You get %s."
msgstr "Anda mendapatkan %d GP."
-#: src/gui/trade.cpp:97
+#: src/gui/trade.cpp:96
msgid "You give:"
msgstr "Anda memberikan:"
-#: src/gui/trade.cpp:101
+#: src/gui/trade.cpp:100
msgid "Change"
msgstr "Ubah"
-#: 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 ""
@@ -1833,21 +1837,21 @@ msgstr ""
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 ""
-#: src/gui/widgets/chattab.cpp:147
+#: src/gui/widgets/chattab.cpp:146
#, c-format
msgid "%s whispers: "
msgstr ""
-#: 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 ""
@@ -1855,23 +1859,35 @@ msgstr ""
msgid "Cannot send empty chat!"
msgstr ""
-#: src/gui/widgets/whispertab.cpp:55
-#, c-format
-msgid "%s: %s"
-msgstr ""
-
-#: src/gui/widgets/whispertab.cpp:69
+#: src/gui/widgets/whispertab.cpp:68
msgid "/close > Close the whisper tab"
msgstr ""
-#: src/gui/widgets/whispertab.cpp:79
+#: src/gui/widgets/whispertab.cpp:78
msgid "Command: /close"
msgstr ""
-#: 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 "Status"
+
+#: src/gui/windowmenu.cpp:65
+msgid "Guilds"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:66
+#, fuzzy
+msgid "Buddys"
+msgstr "Beli"
+
+#: src/gui/windowmenu.cpp:68
+msgid "Shortcut"
+msgstr "Tombol Singkat"
+
#: src/keyboardconfig.cpp:41
msgid "Move Up"
msgstr ""
@@ -1997,8 +2013,9 @@ msgid "Debug Window"
msgstr ""
#: src/keyboardconfig.cpp:80
-msgid "Emote Window"
-msgstr ""
+#, fuzzy
+msgid "Party Window"
+msgstr "Status"
#: src/keyboardconfig.cpp:81
msgid "Emote Shortcut Window"
@@ -2048,166 +2065,170 @@ msgstr ""
msgid "Ignore input 2"
msgstr ""
-#: 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
#, fuzzy
msgid "Sword"
msgstr "Suara"
-#: src/localplayer.cpp:852
+#: src/localplayer.cpp:837
msgid "Polearm"
msgstr ""
-#: src/localplayer.cpp:853
+#: src/localplayer.cpp:838
#, fuzzy
msgid "Staff"
msgstr "Status"
-#: src/localplayer.cpp:854
+#: src/localplayer.cpp:839
msgid "Whip"
msgstr ""
-#: src/localplayer.cpp:855
+#: src/localplayer.cpp:840
#, fuzzy
msgid "Bow"
msgstr "rendah"
-#: src/localplayer.cpp:856
+#: src/localplayer.cpp:841
msgid "Shooting"
msgstr ""
-#: src/localplayer.cpp:857
+#: src/localplayer.cpp:842
#, fuzzy
msgid "Mace"
msgstr "Batal"
-#: 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
#, fuzzy
msgid "Craft"
msgstr "Buat"
-#: 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 ""
-#: src/main.cpp:563
-msgid "Options: "
-msgstr ""
-
-#: src/main.cpp:564
-msgid " -C --configfile : Configuration file to use"
-msgstr ""
-
-#: src/main.cpp:565
-msgid " -d --data : Directory to load game data from"
-msgstr ""
-
-#: src/main.cpp:566
-msgid " -D --default : Bypass the login process with default settings"
+#: src/main.cpp:567
+msgid "Options:"
msgstr ""
#: src/main.cpp:568
-msgid " -h --help : Display this help"
+msgid " -C --config-file : Configuration file to use"
msgstr ""
#: src/main.cpp:569
-msgid " -S --homedir : Directory to use as home directory"
+msgid " -d --data : Directory to load game data from"
msgstr ""
#: src/main.cpp:570
-msgid " -H --updatehost : Use this update host"
-msgstr ""
-
-#: src/main.cpp:571
-msgid " -P --password : Login with this password"
+msgid " -D --default : Choose default character server and character"
msgstr ""
#: src/main.cpp:572
-msgid " -c --character : Login with this character"
+msgid " -h --help : Display this help"
msgstr ""
#: src/main.cpp:573
-msgid " -o --port : Login Server Port"
+msgid " -S --home-dir : Directory to use as home directory"
msgstr ""
#: src/main.cpp:574
-msgid " -s --server : Login Server name or IP"
+msgid " -H --update-host : Use this update host"
msgstr ""
#: src/main.cpp:575
-msgid " -u --skipupdate : Skip the update downloads"
+msgid " -P --password : Login with this password"
msgstr ""
#: src/main.cpp:576
-msgid " -U --username : Login with this username"
+msgid " -c --character : Login with this character"
msgstr ""
#: src/main.cpp:577
-msgid " -v --version : Display the version"
+msgid " -p --port : Login Server Port"
+msgstr ""
+
+#: src/main.cpp:578
+msgid " -s --server : Login Server name or IP"
+msgstr ""
+
+#: src/main.cpp:579
+msgid " -u --skip-update : Skip the update downloads"
+msgstr ""
+
+#: src/main.cpp:580
+msgid " -U --username : Login with this username"
msgstr ""
#: src/main.cpp:582
+msgid " -O --no-opengl : Disable OpenGL for this session"
+msgstr ""
+
+#: src/main.cpp:584
+msgid " -v --version : Display the version"
+msgstr ""
+
+#: src/main.cpp:589
#, fuzzy
msgid "The Mana World "
msgstr "Pilih Server Mana World"
-#: src/main.cpp:1499
+#: src/main.cpp:1515
#, fuzzy
msgid "Connecting to map server..."
msgstr "Menyambung..."
-#: 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 ""
@@ -2294,18 +2315,18 @@ msgstr "Ketangkasan"
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 ""
@@ -2317,416 +2338,430 @@ 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
#, fuzzy, c-format
msgid "Strength: %d"
msgstr "Kekuatan"
-#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:82
+#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:84
#, fuzzy, c-format
msgid "Agility: %d"
msgstr "Daya/Tenaga Hidup"
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:86
+#: src/net/ea/generalhandler.cpp:96 src/net/tmwserv/generalhandler.cpp:88
#, fuzzy, c-format
msgid "Vitality: %d"
msgstr "Daya/Tenaga Hidup"
-#: src/net/ea/generalhandler.cpp:96 src/net/tmwserv/generalhandler.cpp:88
+#: src/net/ea/generalhandler.cpp:98 src/net/tmwserv/generalhandler.cpp:90
#, fuzzy, c-format
msgid "Intelligence: %d"
msgstr "Kecerdasan"
-#: src/net/ea/generalhandler.cpp:98 src/net/tmwserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:100 src/net/tmwserv/generalhandler.cpp:86
#, fuzzy, c-format
msgid "Dexterity: %d"
msgstr "Ketangkasan"
-#: src/net/ea/generalhandler.cpp:100
+#: src/net/ea/generalhandler.cpp:102
#, c-format
msgid "Luck: %d"
msgstr ""
-#: 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 ""
-#: 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 ""
+
+#: src/net/ea/gui/partytab.cpp:53
msgid "/create > Create a new party"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:55
+#: src/net/ea/gui/partytab.cpp:54
msgid "/new > Alias of create"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:56
+#: src/net/ea/gui/partytab.cpp:55
msgid "/invite > Invite a player to your party"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:57
+#: src/net/ea/gui/partytab.cpp:56
msgid "/leave > Leave the party you are in"
msgstr ""
-#: 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 ""
-#: src/net/ea/gui/partytab.cpp:59
+#: src/net/ea/gui/partytab.cpp:58
msgid "/item > Show/change party item sharing options"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:60
+#: src/net/ea/gui/partytab.cpp:59
msgid "/exp > Show/change party experience sharing options"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:69
+#: src/net/ea/gui/partytab.cpp:68
msgid "Command: /new <party-name>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:70
+#: src/net/ea/gui/partytab.cpp:69
msgid "Command: /create <party-name>"
msgstr ""
-#: 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 ""
-#: src/net/ea/gui/partytab.cpp:75
+#: src/net/ea/gui/partytab.cpp:74
msgid "Command: /invite <nick>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:82
+#: src/net/ea/gui/partytab.cpp:81
msgid "Command: /leave"
msgstr ""
-#: 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 ""
-#: 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."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:92
+#: src/net/ea/gui/partytab.cpp:91
msgid "Command: /item"
msgstr ""
-#: 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 ""
-#: 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."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:102
+#: src/net/ea/gui/partytab.cpp:101
msgid "Command: /exp"
msgstr ""
-#: 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]"
+msgid "You picked up %s [@@%d|%s@@]"
msgstr ""
-#: 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
#, fuzzy
msgid "Unregistered ID"
msgstr "Tidak terdaftar"
-#: src/net/ea/loginhandler.cpp:114
+#: src/net/ea/loginhandler.cpp:113
#, fuzzy
msgid "Wrong password"
msgstr "Kata Sandi:"
-#: 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
#, fuzzy
msgid "Rejected from server"
msgstr "Pilih Karakter"
-#: 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 ""
-#: 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"
" Please contact the GM team via the forums."
msgstr ""
-#: 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."
+#: src/net/ea/partyhandler.cpp:77
+msgid "Could not create party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:82
-msgid "Could not create party."
+#: src/net/ea/partyhandler.cpp:80
+msgid "Party successfully created."
msgstr ""
-#: src/net/ea/partyhandler.cpp:112
+#: src/net/ea/partyhandler.cpp:115
#, c-format
msgid "%s is already a member of a party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:116
+#: src/net/ea/partyhandler.cpp:119
#, c-format
msgid "%s refused your invitation."
msgstr ""
-#: src/net/ea/partyhandler.cpp:120
+#: src/net/ea/partyhandler.cpp:123
#, c-format
msgid "%s is now a member of your party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:124
+#: src/net/ea/partyhandler.cpp:127
#, c-format
msgid "Unknown invite response for %s."
msgstr ""
-#: 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 ""
-#: src/net/ea/partyhandler.cpp:269
+#: src/net/ea/partyhandler.cpp:272
#, c-format
msgid "An unknown member tried to say: %s"
msgstr ""
-#: 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 ""
-#: 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"
+#: 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 ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
@@ -2884,40 +2919,98 @@ msgstr ""
msgid "Willpower:"
msgstr "Ketekunan"
-#: 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
#, fuzzy, c-format
msgid "Willpower: %d"
msgstr "Ketekunan"
-#: 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
+#, fuzzy
+msgid "Server is full"
+msgstr "Server:"
+
+#: 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 ""
+
+#: src/net/tmwserv/loginhandler.cpp:143
+msgid "Old email address incorrect"
+msgstr ""
+
+#: src/net/tmwserv/loginhandler.cpp:149
+msgid "The new Email Address already exists."
+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 "Kata Sandi:"
+
+#: src/net/tmwserv/loginhandler.cpp:211
+msgid "Wrong username, password or email address"
+msgstr ""
+
+#: src/net/tmwserv/loginhandler.cpp:214
+msgid "Username already exists"
+msgstr ""
+
+#: src/net/tmwserv/loginhandler.cpp:217
+msgid "Email address already exists"
+msgstr ""
+
+#: src/resources/itemdb.cpp:52
#, fuzzy, c-format
msgid "Attack %+d"
msgstr "Serangan %+d"
-#: src/resources/itemdb.cpp:54
+#: src/resources/itemdb.cpp:53
#, fuzzy, c-format
msgid "Defense %+d"
msgstr "Pertahanan %+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 ""
-#: src/resources/itemdb.cpp:151
+#: src/resources/itemdb.cpp:150
msgid "Unnamed"
msgstr ""
@@ -2933,6 +3026,16 @@ msgstr ""
msgid "NPC Database: Error while loading npcs.xml!"
msgstr ""
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "> Cancel\n"
+#~ msgstr "Batal"
+
+#, fuzzy
+#~ msgid "use"
+#~ msgstr "Gunakan"
+
#~ msgid "@@description|Description@@"
#~ msgstr "@@description|Deskripsi@@"
diff --git a/po/it.po b/po/it.po
index e5d615be..b668aeb2 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-04-21 17:27+0200\n"
+"POT-Creation-Date: 2009-05-10 15:53+0200\n"
"PO-Revision-Date: 2007-12-03 01:45+0000\n"
"Last-Translator: Bjørn Lindeijer <bjorn@lindeijer.nl>\n"
"Language-Team: Italian\n"
@@ -19,286 +19,286 @@ msgstr ""
"X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
"X-Generator: Launchpad (build Unknown)\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."
+#: src/commandhandler.cpp:142
+msgid "/help > Display this help"
msgstr ""
-#: src/commandhandler.cpp:145
+#: src/commandhandler.cpp:144
msgid "/where > Display map name"
msgstr ""
-#: src/commandhandler.cpp:146
+#: src/commandhandler.cpp:145
msgid "/who > Display number of online users"
msgstr ""
-#: src/commandhandler.cpp:147
+#: src/commandhandler.cpp:146
msgid "/me > Tell something about yourself"
msgstr ""
-#: src/commandhandler.cpp:149
+#: src/commandhandler.cpp:148
msgid "/clear > Clears this window"
msgstr ""
-#: src/commandhandler.cpp:151
+#: src/commandhandler.cpp:150
msgid "/msg > Send a private message to a user"
msgstr ""
-#: src/commandhandler.cpp:152
+#: src/commandhandler.cpp:151
msgid "/whisper > Alias of msg"
msgstr ""
-#: src/commandhandler.cpp:153
+#: src/commandhandler.cpp:152
msgid "/w > Alias of msg"
msgstr ""
-#: src/commandhandler.cpp:154
+#: src/commandhandler.cpp:153
msgid "/query > Makes a tab for private messages with another user"
msgstr ""
-#: src/commandhandler.cpp:155
+#: src/commandhandler.cpp:154
msgid "/q > Alias of query"
msgstr ""
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:156
msgid "/list > Display all public channels"
msgstr ""
-#: src/commandhandler.cpp:158
+#: src/commandhandler.cpp:157
msgid "/join > Join or create a channel"
msgstr ""
-#: src/commandhandler.cpp:160
+#: src/commandhandler.cpp:159
msgid "/party > Invite a user to party"
msgstr ""
-#: src/commandhandler.cpp:162
+#: src/commandhandler.cpp:161
msgid "/record > Start recording the chat to an external file"
msgstr ""
-#: 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 ""
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:165
msgid "/announce > Global announcement (GM only)"
msgstr ""
-#: src/commandhandler.cpp:170
+#: src/commandhandler.cpp:169
msgid "For more information, type /help <command>"
msgstr ""
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:173
msgid "Command: /help"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: src/commandhandler.cpp:186
+#: src/commandhandler.cpp:185
msgid "*** only available to a GM ***"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: src/commandhandler.cpp:209
+#: src/commandhandler.cpp:208
msgid "This command tell others you are (doing) <msg>."
msgstr ""
-#: src/commandhandler.cpp:213
+#: src/commandhandler.cpp:212
msgid "Command: /msg <nick> <message>"
msgstr ""
-#: src/commandhandler.cpp:214
+#: src/commandhandler.cpp:213
msgid "Command: /whisper <nick> <message>"
msgstr ""
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:214
msgid "Command: /w <nick> <message>"
msgstr ""
-#: src/commandhandler.cpp:216
+#: src/commandhandler.cpp:215
msgid "This command sends the text <message> to <nick>."
msgstr ""
-#: 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 ""
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:222
msgid "Command: /q <nick>"
msgstr ""
-#: src/commandhandler.cpp:224
+#: src/commandhandler.cpp:223
msgid "This command tries to make a tab for whispers betweenyou and <nick>."
msgstr ""
-#: src/commandhandler.cpp:229
+#: src/commandhandler.cpp:228
msgid "Command: /party <nick>"
msgstr ""
-#: 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 ""
-#: src/commandhandler.cpp:236
+#: src/commandhandler.cpp:235
msgid "Command: /present"
msgstr ""
-#: 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 ""
-#: src/commandhandler.cpp:244
+#: src/commandhandler.cpp:243
msgid "This command starts recording the chat log to the file <filename>."
msgstr ""
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:245
msgid "Command: /record"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: src/commandhandler.cpp:257
+#: src/commandhandler.cpp:256
msgid "Command: /toggle"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: src/commandhandler.cpp:336
-msgid "Cannont send empty whispers!"
+#: 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 ""
-#: 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 ""
@@ -307,46 +307,46 @@ msgstr ""
msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
msgstr ""
-#: 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"
+#: src/game.cpp:481
+msgid "The connection to the server was lost, the program will now quit"
msgstr ""
-#: src/game.cpp:493
-msgid "The connection to the server was lost, the program will now quit"
+#: src/game.cpp:487
+msgid "Network Error"
msgstr ""
-#: src/game.cpp:664 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
+#: 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 "Esci"
-#: src/game.cpp:665
+#: src/game.cpp:647
#, fuzzy
msgid "Are you sure you want to quit?"
msgstr "Sei sicuro di voler cancellare questo personaggio?"
-#: 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 ""
@@ -359,12 +359,12 @@ msgstr "Compra"
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 "Compra"
#: 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
#, fuzzy, c-format
msgid "Price: %s / Total: %s"
msgstr "Prezzo: %d GP / Totale: %d GP"
@@ -374,13 +374,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 "Descrizione : %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 "Effetto : %s"
@@ -390,205 +390,213 @@ msgstr "Effetto : %s"
msgid "Shop"
msgstr "Ferma"
-#: 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 "Vendi"
-#: 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 "Cancella"
-#: 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 ""
-#: 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
#, fuzzy
msgid "Change Password"
msgstr "Password:"
-#: 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 "Password:"
-#: 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 "Crea Personaggio"
-#: 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 "Nome :"
-#: src/gui/charcreatedialog.cpp:70
+#: src/gui/charcreatedialog.cpp:69
msgid "Hair Color:"
msgstr "Colore Capelli"
-#: src/gui/charcreatedialog.cpp:73
+#: src/gui/charcreatedialog.cpp:72
msgid "Hair Style:"
msgstr "Stile Capelli:"
-#: src/gui/charcreatedialog.cpp:74
+#: src/gui/charcreatedialog.cpp:73
msgid "Create"
msgstr "Create"
-#: 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 "Prego distribuisci %d points"
-#: 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 "Errore"
-#: src/gui/charcreatedialog.cpp:174
+#: src/gui/charcreatedialog.cpp:173
msgid "Your name needs to be at least 4 characters."
msgstr "Il tuo nome deve contenere almeno 4 caratteri."
-#: src/gui/charcreatedialog.cpp:227
+#: src/gui/charcreatedialog.cpp:226
msgid "Character stats OK"
msgstr "Statistiche personaggio OK"
-#: src/gui/charcreatedialog.cpp:239
+#: src/gui/charcreatedialog.cpp:238
#, c-format
msgid "Please remove %d points"
msgstr "Prego rimuovi %d punti"
-#: 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 "Sei sicuro di voler cancellare questo personaggio?"
-#: 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 "Scelta Personaggio"
-#: 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 "Ok"
-#: src/gui/char_select.cpp:113
+#: src/gui/charselectdialog.cpp:112
msgid "Previous"
msgstr "Precedente"
-#: 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 "Prossimo"
-#: 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 "Nome : %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 "Livello: %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 "Nuovo"
-#: 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 "Elimina"
-#: src/gui/char_select.cpp:120 src/gui/unregisterdialog.cpp:51
+#: src/gui/charselectdialog.cpp:119 src/gui/unregisterdialog.cpp:52
msgid "Unregister"
msgstr "Cancella registrazione"
-#: src/gui/char_select.cpp:127
+#: src/gui/charselectdialog.cpp:126
#, c-format
msgid "Money: %d"
msgstr "Monete: %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
#, fuzzy, c-format
msgid "Job Level: %d"
msgstr "Livello: %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
#, fuzzy, c-format
msgid "Money: %s"
msgstr "Monete: %d"
-#: 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
#, fuzzy
msgid "Chat"
msgstr "Create"
-#: src/gui/chat.cpp:341 src/gui/chat.cpp:347
+#: src/gui/chat.cpp:332
+#, c-format
+msgid "%d players are present."
+msgstr ""
+
+#: 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 ""
-#: src/gui/confirm_dialog.cpp:42
+#: src/gui/confirmdialog.cpp:42
msgid "Yes"
msgstr "Si"
-#: src/gui/confirm_dialog.cpp:43
+#: src/gui/confirmdialog.cpp:43
msgid "No"
msgstr "No"
@@ -596,26 +604,16 @@ msgstr "No"
msgid "Connecting..."
msgstr "Connessione..."
-#: src/gui/emotecontainer.cpp:61
+#: src/gui/emotepopup.cpp:64
msgid "Unable to load selection.png"
msgstr ""
-#: 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 "Usa"
-
-#: src/gui/equipmentwindow.cpp:68 src/gui/menuwindow.cpp:67
+#: src/gui/equipmentwindow.cpp:68 src/gui/windowmenu.cpp:60
msgid "Equipment"
msgstr "Equipaggiamento"
-#: 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 "Rimuovi"
@@ -640,100 +638,103 @@ 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 "Inventario"
-#: 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 "Equipaggia"
-#: 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 "Usa"
+
+#: src/gui/inventorywindow.cpp:80
msgid "Drop"
msgstr "Lascia"
-#: src/gui/inventorywindow.cpp:79
+#: src/gui/inventorywindow.cpp:81
msgid "Split"
msgstr "Lascia"
-#: 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 "Seleziona la quantità di oggetti da scambiare."
-#: src/gui/item_amount.cpp:95
+#: src/gui/itemamount.cpp:124
msgid "Select amount of items to drop."
msgstr "Seleziona la quantità di oggetti da lasciare."
-#: src/gui/item_amount.cpp:98
+#: src/gui/itemamount.cpp:127
#, fuzzy
msgid "Select amount of items to store."
msgstr "Seleziona la quantità di oggetti da scambiare."
-#: src/gui/item_amount.cpp:101
+#: src/gui/itemamount.cpp:130
#, fuzzy
msgid "Select amount of items to retrieve."
msgstr "Seleziona la quantità di oggetti da scambiare."
-#: src/gui/item_amount.cpp:104
+#: src/gui/itemamount.cpp:133
msgid "Select amount of items to split."
msgstr "Seleziona la quantità di oggetti da lasciare."
-#: 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 "Autenticazione"
-#: 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 "Server:"
-#: 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 "Porta:"
-#: src/gui/login.cpp:55
+#: src/gui/login.cpp:56
#, fuzzy
msgid "Recent:"
msgstr "Registra"
-#: 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 "Registra"
-#: 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 ""
@@ -749,71 +750,44 @@ msgstr ""
msgid "Cast Test Spell 3"
msgstr ""
-#: src/gui/menuwindow.cpp:66
-msgid "Status"
-msgstr "Stato"
-
-#: src/gui/menuwindow.cpp:69 src/gui/skill.cpp:126 src/gui/skilldialog.cpp:99
-msgid "Skills"
-msgstr "Abilità"
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
+#, fuzzy
+msgid "Map"
+msgstr "Mini mappa"
-#: src/gui/menuwindow.cpp:72
-msgid "Guilds"
+#: src/gui/npcdialog.cpp:43
+msgid "Waiting for server"
msgstr ""
-#: src/gui/menuwindow.cpp:73
+#: src/gui/npcdialog.cpp:46
#, fuzzy
-msgid "Buddys"
-msgstr "Compra"
-
-#: src/gui/menuwindow.cpp:75
-msgid "Shortcut"
-msgstr "Scorciatoia"
+msgid "Submit"
+msgstr "Lascia"
-#: src/gui/menuwindow.cpp:77 src/gui/setup.cpp:65 src/main.cpp:920
-msgid "Setup"
-msgstr "Impostazioni"
+#: src/gui/npcdialog.cpp:49 src/gui/npcpostdialog.cpp:39
+msgid "NPC"
+msgstr "NPC"
-#: src/gui/minimap.cpp:39
-msgid "MiniMap"
-msgstr "Mini mappa"
+#: src/gui/npcdialog.cpp:95
+msgid "+"
+msgstr ""
-#: src/gui/npcintegerdialog.cpp:39
-msgid "NPC Number Request"
+#: src/gui/npcdialog.cpp:96
+msgid "-"
msgstr ""
-#: src/gui/npcintegerdialog.cpp:50
+#: src/gui/npcdialog.cpp:105
#, fuzzy
msgid "Reset"
msgstr "Registra"
-#: src/gui/npcintegerdialog.cpp:101 src/gui/npclistdialog.cpp:123
-#: src/gui/npcstringdialog.cpp:75
-#, fuzzy
-msgid ""
-"\n"
-"> Cancel\n"
-msgstr "Cancella"
-
-#: src/gui/npcpostdialog.cpp:39 src/gui/npc_text.cpp:37
-msgid "NPC"
-msgstr "NPC"
-
#: src/gui/npcpostdialog.cpp:51
#, fuzzy
msgid "Send"
msgstr "Suono"
-#: src/gui/npcstringdialog.cpp:39
-msgid "NPC Text Request"
-msgstr ""
-
-#: 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
#, fuzzy
msgid "Text"
msgstr "Prossimo"
@@ -868,7 +842,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
#, fuzzy
msgid "Party"
msgstr "Porta:"
@@ -891,7 +865,7 @@ msgid "Being"
msgstr ""
#: src/gui/palette.cpp:104
-msgid "Other Player's Names"
+msgid "Other Players' Names"
msgstr ""
#: src/gui/palette.cpp:105
@@ -918,21 +892,22 @@ msgid "Unknown Item Type"
msgstr ""
#: src/gui/palette.cpp:111
-msgid "Generic"
+msgid "Generics"
msgstr ""
#: src/gui/palette.cpp:112
-msgid "Hat"
-msgstr ""
+#, fuzzy
+msgid "Hats"
+msgstr "Stato"
#: src/gui/palette.cpp:113
#, fuzzy
-msgid "Usable"
+msgid "Usables"
msgstr "Usa"
#: src/gui/palette.cpp:114
#, fuzzy
-msgid "Shirt"
+msgid "Shirts"
msgstr "Scorciatoia"
#: src/gui/palette.cpp:115
@@ -955,15 +930,15 @@ msgstr ""
#: src/gui/palette.cpp:119
#, fuzzy
-msgid "Shield"
+msgid "Shields"
msgstr "Vendi"
#: src/gui/palette.cpp:120
-msgid "Ring"
+msgid "Rings"
msgstr ""
#: src/gui/palette.cpp:121
-msgid "Necklace"
+msgid "Necklaces"
msgstr ""
#: src/gui/palette.cpp:122
@@ -1019,95 +994,104 @@ msgstr ""
msgid "1/4 HP Bar"
msgstr ""
-#: src/gui/popupmenu.cpp:73
+#: src/gui/popupmenu.cpp:75
msgid "@@name|Add name to chat@@"
msgstr ""
-#: src/gui/popupmenu.cpp:85
+#: src/gui/popupmenu.cpp:87
#, c-format
msgid "@@trade|Trade With %s@@"
msgstr "@@trade|Scambia Con %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 "@@attack|Attacca %s@@"
-#: src/gui/popupmenu.cpp:92
+#: src/gui/popupmenu.cpp:94
#, c-format
msgid "@@friend|Befriend %s@@"
msgstr ""
-#: 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 ""
-#: src/gui/popupmenu.cpp:112
+#: src/gui/popupmenu.cpp:114
#, c-format
msgid "@@party|Invite %s to join your party@@"
msgstr ""
-#: src/gui/popupmenu.cpp:123
+#: src/gui/popupmenu.cpp:125
#, fuzzy, c-format
msgid "@@talk|Talk To %s@@"
msgstr "@@talk|Parla con NPC@@"
-#: 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 "@@cancel|Cancella@@"
-#: src/gui/popupmenu.cpp:155
-#, c-format
-msgid "@@pickup|Pick Up %s@@"
+#: src/gui/popupmenu.cpp:157
+#, fuzzy, c-format
+msgid "@@pickup|Pick up %s@@"
msgstr "@@pickup|Raccogli %s@@"
-#: src/gui/popupmenu.cpp:156 src/gui/popupmenu.cpp:352
-msgid "@@chat|Add to Chat@@"
+#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:373
+msgid "@@chat|Add to chat@@"
msgstr ""
-#: src/gui/popupmenu.cpp:336 src/gui/popupmenu.cpp:341
-msgid "@@use|Equip@@"
-msgstr "@@use|Equipaggia@@"
-
-#: src/gui/popupmenu.cpp:339
+#: src/gui/popupmenu.cpp:348
#, fuzzy
msgid "@@use|Unequip@@"
msgstr "@@use|Equipaggia@@"
-#: src/gui/popupmenu.cpp:345
+#: src/gui/popupmenu.cpp:350
+msgid "@@use|Equip@@"
+msgstr "@@use|Equipaggia@@"
+
+#: src/gui/popupmenu.cpp:353
msgid "@@use|Use@@"
msgstr "@@usa|Usa@@"
-#: src/gui/popupmenu.cpp:347
+#: src/gui/popupmenu.cpp:355
msgid "@@drop|Drop@@"
msgstr "@@drop|Lascia@@"
-#: src/gui/popupmenu.cpp:350
+#: src/gui/popupmenu.cpp:359
msgid "@@split|Split@@"
msgstr "@@split|Lascia@@"
+#: src/gui/popupmenu.cpp:364
+#, fuzzy
+msgid "@@store|Store@@"
+msgstr "@@usa|Usa@@"
+
+#: src/gui/popupmenu.cpp:371
+msgid "@@retrieve|Retrieve@@"
+msgstr ""
+
#: src/gui/quitdialog.cpp:37
msgid "Switch server"
msgstr "Cambia server"
@@ -1177,20 +1161,32 @@ msgstr "La password deve contenere meno di %d caratteri."
msgid "Passwords do not match."
msgstr "Le password non corrispondono."
-#: src/gui/serverdialog.cpp:73
+#: src/gui/serverdialog.cpp:74
#, fuzzy
msgid "Choose your server"
msgstr "Scegli il tuo server Mana World"
-#: src/gui/serverdialog.cpp:163
+#: src/gui/serverdialog.cpp:164
msgid "Please type both the address and the port of a server."
msgstr "Per favore inserisci l'indirizzo e la porta del server."
-#: src/gui/serverselectdialog.cpp:50
+#: src/gui/serverselectdialog.cpp:59
#, fuzzy
msgid "Select Server"
msgstr "Scelta Personaggio"
+#: src/gui/setup.cpp:64 src/gui/windowmenu.cpp:69 src/main.cpp:933
+msgid "Setup"
+msgstr "Impostazioni"
+
+#: src/gui/setup.cpp:72
+msgid "Apply"
+msgstr "Applica"
+
+#: src/gui/setup.cpp:72
+msgid "Reset Windows"
+msgstr "Resetta finestre"
+
#: src/gui/setup_audio.cpp:41
msgid "Sound"
msgstr "Suono"
@@ -1207,11 +1203,11 @@ msgstr "Volume effetti sonori"
msgid "Music volume"
msgstr "Volume musica"
-#: 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 ""
@@ -1219,23 +1215,23 @@ 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
#, fuzzy
msgid "Static"
msgstr "Stato"
#: 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 ""
#: 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
#, fuzzy
msgid "Spectrum"
msgstr "Impostazioni"
@@ -1244,26 +1240,18 @@ msgstr "Impostazioni"
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 "Applica"
-
-#: src/gui/setup.cpp:73
-msgid "Reset Windows"
-msgstr "Resetta finestre"
-
#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:78
msgid "Press the button to start calibration"
msgstr "Premi il pulsante per cominciare la calibrazione"
@@ -1334,7 +1322,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 ""
@@ -1362,156 +1350,177 @@ 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
+#, fuzzy
+msgid "Small"
+msgstr "Vendi"
+
+#: 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 "Schermo intero"
-#: 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 "Cursore personalizzato"
-#: 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 ""
-#: src/gui/setup_video.cpp:136
+#: src/gui/setup_video.cpp:167
msgid "FPS Limit:"
msgstr "Limita FPS:"
-#: src/gui/setup_video.cpp:152
+#: src/gui/setup_video.cpp:184
msgid "Video"
msgstr "Video"
-#: 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 "Opacità IU"
-#: src/gui/setup_video.cpp:159
+#: src/gui/setup_video.cpp:191
msgid "Scroll radius"
msgstr "Raggio dello scroll"
-#: src/gui/setup_video.cpp:160
+#: src/gui/setup_video.cpp:192
msgid "Scroll laziness"
msgstr "Lentezza dello scroll"
-#: src/gui/setup_video.cpp:161
+#: src/gui/setup_video.cpp:193
msgid "Ambient FX"
msgstr "Suoni ambientali"
-#: 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
#, fuzzy
msgid "No text"
msgstr "Prossimo"
-#: 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 ""
-#: 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 ""
-#: 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 "Spento"
-#: 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 "Basso"
-#: 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 "Alto"
-#: 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
#, fuzzy
msgid "fullscreen"
msgstr "Schermo intero"
-#: 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 "Modalità a schermo intero"
-#: src/gui/setup_video.cpp:352
+#: src/gui/setup_video.cpp:422
msgid "Restart needed for changes to take effect."
msgstr "Riavvio necessario affinchè i cambiamenti abbiano effetto."
-#: src/gui/setup_video.cpp:364
+#: src/gui/setup_video.cpp:434
msgid "Changing OpenGL"
msgstr "Modifica OpenGL"
-#: src/gui/setup_video.cpp:365
+#: src/gui/setup_video.cpp:435
msgid "Applying change to OpenGL requires restart."
msgstr "Applicare le modifiche ad OpenGL richiede il riavvio."
-#: 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
#, fuzzy
msgid "Restart your client for the change to take effect."
msgstr "Riavvio necessario affinchè i cambiamenti abbiano effetto."
-#: 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 ""
@@ -1524,6 +1533,10 @@ msgstr "Abilità"
msgid "Mystery Skill"
msgstr ""
+#: src/gui/skill.cpp:126 src/gui/skilldialog.cpp:99 src/gui/windowmenu.cpp:62
+msgid "Skills"
+msgstr "Abilità"
+
#: src/gui/skill.cpp:145 src/gui/skill.cpp:197
#, c-format
msgid "Skill points: %d"
@@ -1533,15 +1546,6 @@ msgstr ""
msgid "Up"
msgstr ""
-#: src/gui/skill.cpp:146
-msgid "inc"
-msgstr ""
-
-#: src/gui/skill.cpp:147
-#, fuzzy
-msgid "use"
-msgstr "Usa"
-
#: src/gui/skilldialog.cpp:113
msgid "Weapons"
msgstr ""
@@ -1551,179 +1555,179 @@ msgstr ""
msgid "Crafts"
msgstr "Create"
-#: src/gui/status.cpp:57 src/gui/status.cpp:178
+#: src/gui/status.cpp:56 src/gui/status.cpp:177
#, fuzzy, c-format
msgid "Job: %d"
msgstr "Livello: %d"
-#: src/gui/status.cpp:61
+#: src/gui/status.cpp:60
msgid "HP:"
msgstr ""
-#: src/gui/status.cpp:64
+#: src/gui/status.cpp:63
msgid "Exp:"
msgstr ""
-#: src/gui/status.cpp:67
+#: src/gui/status.cpp:66
msgid "MP:"
msgstr ""
-#: src/gui/status.cpp:70
+#: src/gui/status.cpp:69
#, fuzzy
msgid "Job:"
msgstr "Livello: %d"
-#: src/gui/status.cpp:78
+#: src/gui/status.cpp:77
#, fuzzy
msgid "Stats"
msgstr "Stato"
-#: 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
#, fuzzy
msgid "Attack:"
msgstr "Attacco %+d"
-#: src/gui/status.cpp:85
+#: src/gui/status.cpp:84
#, fuzzy
msgid "Defense:"
msgstr "Difesa %+d"
-#: src/gui/status.cpp:86
+#: src/gui/status.cpp:85
#, fuzzy
msgid "M.Attack:"
msgstr "Attacco %+d"
-#: src/gui/status.cpp:87
+#: src/gui/status.cpp:86
#, fuzzy
msgid "M.Defense:"
msgstr "Difesa %+d"
-#: src/gui/status.cpp:89
+#: src/gui/status.cpp:88
#, no-c-format
msgid "% Accuracy:"
msgstr ""
-#: src/gui/status.cpp:91
+#: src/gui/status.cpp:90
#, no-c-format
msgid "% Evade:"
msgstr ""
-#: 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
#, fuzzy
msgid "Strength"
msgstr "Forza:"
-#: src/gui/status.cpp:200
+#: src/gui/status.cpp:199
#, fuzzy
msgid "Agility"
msgstr "Agilità:"
-#: src/gui/status.cpp:201
+#: src/gui/status.cpp:200
#, fuzzy
msgid "Vitality"
msgstr "Vitalità:"
-#: src/gui/status.cpp:202
+#: src/gui/status.cpp:201
#, fuzzy
msgid "Intelligence"
msgstr "Intelligenza:"
-#: src/gui/status.cpp:203
+#: src/gui/status.cpp:202
#, fuzzy
msgid "Dexterity"
msgstr "Destrezza:"
-#: 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 ""
-#: 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
#, fuzzy
msgid "Store"
msgstr "Ferma"
-#: 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 "Inizia uno scambio"
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:52
#, fuzzy
msgid "Confirmed. Waiting..."
msgstr "Connessione..."
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:53
#, fuzzy
msgid "Agree trade"
msgstr "Inizia uno scambio"
-#: 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 "Aggiungi"
-#: 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
#, fuzzy, c-format
msgid "You get %s."
msgstr "Ottieni %d GP."
-#: src/gui/trade.cpp:97
+#: src/gui/trade.cpp:96
msgid "You give:"
msgstr "Dai:"
-#: src/gui/trade.cpp:101
+#: src/gui/trade.cpp:100
msgid "Change"
msgstr "Cambia"
-#: 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 ""
@@ -1835,21 +1839,21 @@ msgstr ""
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 ""
-#: src/gui/widgets/chattab.cpp:147
+#: src/gui/widgets/chattab.cpp:146
#, c-format
msgid "%s whispers: "
msgstr ""
-#: 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 ""
@@ -1857,23 +1861,35 @@ msgstr ""
msgid "Cannot send empty chat!"
msgstr ""
-#: src/gui/widgets/whispertab.cpp:55
-#, c-format
-msgid "%s: %s"
-msgstr ""
-
-#: src/gui/widgets/whispertab.cpp:69
+#: src/gui/widgets/whispertab.cpp:68
msgid "/close > Close the whisper tab"
msgstr ""
-#: src/gui/widgets/whispertab.cpp:79
+#: src/gui/widgets/whispertab.cpp:78
msgid "Command: /close"
msgstr ""
-#: 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 "Stato"
+
+#: src/gui/windowmenu.cpp:65
+msgid "Guilds"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:66
+#, fuzzy
+msgid "Buddys"
+msgstr "Compra"
+
+#: src/gui/windowmenu.cpp:68
+msgid "Shortcut"
+msgstr "Scorciatoia"
+
#: src/keyboardconfig.cpp:41
msgid "Move Up"
msgstr ""
@@ -2005,7 +2021,7 @@ msgstr "Resetta finestre"
#: src/keyboardconfig.cpp:80
#, fuzzy
-msgid "Emote Window"
+msgid "Party Window"
msgstr "Resetta finestre"
#: src/keyboardconfig.cpp:81
@@ -2056,166 +2072,170 @@ msgstr ""
msgid "Ignore input 2"
msgstr ""
-#: 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
#, fuzzy
msgid "Sword"
msgstr "Suono"
-#: src/localplayer.cpp:852
+#: src/localplayer.cpp:837
msgid "Polearm"
msgstr ""
-#: src/localplayer.cpp:853
+#: src/localplayer.cpp:838
#, fuzzy
msgid "Staff"
msgstr "Stato"
-#: src/localplayer.cpp:854
+#: src/localplayer.cpp:839
msgid "Whip"
msgstr ""
-#: src/localplayer.cpp:855
+#: src/localplayer.cpp:840
#, fuzzy
msgid "Bow"
msgstr "Basso"
-#: src/localplayer.cpp:856
+#: src/localplayer.cpp:841
msgid "Shooting"
msgstr ""
-#: src/localplayer.cpp:857
+#: src/localplayer.cpp:842
#, fuzzy
msgid "Mace"
msgstr "Cancella"
-#: 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
#, fuzzy
msgid "Craft"
msgstr "Create"
-#: 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 ""
-#: src/main.cpp:563
-msgid "Options: "
-msgstr ""
-
-#: src/main.cpp:564
-msgid " -C --configfile : Configuration file to use"
-msgstr ""
-
-#: src/main.cpp:565
-msgid " -d --data : Directory to load game data from"
-msgstr ""
-
-#: src/main.cpp:566
-msgid " -D --default : Bypass the login process with default settings"
+#: src/main.cpp:567
+msgid "Options:"
msgstr ""
#: src/main.cpp:568
-msgid " -h --help : Display this help"
+msgid " -C --config-file : Configuration file to use"
msgstr ""
#: src/main.cpp:569
-msgid " -S --homedir : Directory to use as home directory"
+msgid " -d --data : Directory to load game data from"
msgstr ""
#: src/main.cpp:570
-msgid " -H --updatehost : Use this update host"
-msgstr ""
-
-#: src/main.cpp:571
-msgid " -P --password : Login with this password"
+msgid " -D --default : Choose default character server and character"
msgstr ""
#: src/main.cpp:572
-msgid " -c --character : Login with this character"
+msgid " -h --help : Display this help"
msgstr ""
#: src/main.cpp:573
-msgid " -o --port : Login Server Port"
+msgid " -S --home-dir : Directory to use as home directory"
msgstr ""
#: src/main.cpp:574
-msgid " -s --server : Login Server name or IP"
+msgid " -H --update-host : Use this update host"
msgstr ""
#: src/main.cpp:575
-msgid " -u --skipupdate : Skip the update downloads"
+msgid " -P --password : Login with this password"
msgstr ""
#: src/main.cpp:576
-msgid " -U --username : Login with this username"
+msgid " -c --character : Login with this character"
msgstr ""
#: src/main.cpp:577
-msgid " -v --version : Display the version"
+msgid " -p --port : Login Server Port"
+msgstr ""
+
+#: src/main.cpp:578
+msgid " -s --server : Login Server name or IP"
+msgstr ""
+
+#: src/main.cpp:579
+msgid " -u --skip-update : Skip the update downloads"
+msgstr ""
+
+#: src/main.cpp:580
+msgid " -U --username : Login with this username"
msgstr ""
#: src/main.cpp:582
+msgid " -O --no-opengl : Disable OpenGL for this session"
+msgstr ""
+
+#: src/main.cpp:584
+msgid " -v --version : Display the version"
+msgstr ""
+
+#: src/main.cpp:589
#, fuzzy
msgid "The Mana World "
msgstr "Scegli il tuo server Mana World"
-#: src/main.cpp:1499
+#: src/main.cpp:1515
#, fuzzy
msgid "Connecting to map server..."
msgstr "Connessione..."
-#: 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 ""
@@ -2302,18 +2322,18 @@ msgstr "Destrezza:"
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 ""
@@ -2326,416 +2346,430 @@ msgstr "Rimuovi"
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
#, fuzzy, c-format
msgid "Strength: %d"
msgstr "Forza:"
-#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:82
+#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:84
#, fuzzy, c-format
msgid "Agility: %d"
msgstr "Agilità:"
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:86
+#: src/net/ea/generalhandler.cpp:96 src/net/tmwserv/generalhandler.cpp:88
#, fuzzy, c-format
msgid "Vitality: %d"
msgstr "Vitalità:"
-#: src/net/ea/generalhandler.cpp:96 src/net/tmwserv/generalhandler.cpp:88
+#: src/net/ea/generalhandler.cpp:98 src/net/tmwserv/generalhandler.cpp:90
#, fuzzy, c-format
msgid "Intelligence: %d"
msgstr "Intelligenza:"
-#: src/net/ea/generalhandler.cpp:98 src/net/tmwserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:100 src/net/tmwserv/generalhandler.cpp:86
#, fuzzy, c-format
msgid "Dexterity: %d"
msgstr "Destrezza:"
-#: src/net/ea/generalhandler.cpp:100
+#: src/net/ea/generalhandler.cpp:102
#, c-format
msgid "Luck: %d"
msgstr ""
-#: 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 ""
-#: 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 ""
+
+#: src/net/ea/gui/partytab.cpp:53
msgid "/create > Create a new party"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:55
+#: src/net/ea/gui/partytab.cpp:54
msgid "/new > Alias of create"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:56
+#: src/net/ea/gui/partytab.cpp:55
msgid "/invite > Invite a player to your party"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:57
+#: src/net/ea/gui/partytab.cpp:56
msgid "/leave > Leave the party you are in"
msgstr ""
-#: 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 ""
-#: src/net/ea/gui/partytab.cpp:59
+#: src/net/ea/gui/partytab.cpp:58
msgid "/item > Show/change party item sharing options"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:60
+#: src/net/ea/gui/partytab.cpp:59
msgid "/exp > Show/change party experience sharing options"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:69
+#: src/net/ea/gui/partytab.cpp:68
msgid "Command: /new <party-name>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:70
+#: src/net/ea/gui/partytab.cpp:69
msgid "Command: /create <party-name>"
msgstr ""
-#: 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 ""
-#: src/net/ea/gui/partytab.cpp:75
+#: src/net/ea/gui/partytab.cpp:74
msgid "Command: /invite <nick>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:82
+#: src/net/ea/gui/partytab.cpp:81
msgid "Command: /leave"
msgstr ""
-#: 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 ""
-#: 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."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:92
+#: src/net/ea/gui/partytab.cpp:91
msgid "Command: /item"
msgstr ""
-#: 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 ""
-#: 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."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:102
+#: src/net/ea/gui/partytab.cpp:101
msgid "Command: /exp"
msgstr ""
-#: 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]"
+msgid "You picked up %s [@@%d|%s@@]"
msgstr ""
-#: 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
#, fuzzy
msgid "Unregistered ID"
msgstr "Cancella registrazione"
-#: src/net/ea/loginhandler.cpp:114
+#: src/net/ea/loginhandler.cpp:113
#, fuzzy
msgid "Wrong password"
msgstr "Password:"
-#: 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
#, fuzzy
msgid "Rejected from server"
msgstr "Scelta Personaggio"
-#: 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 ""
-#: 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"
" Please contact the GM team via the forums."
msgstr ""
-#: 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."
+#: src/net/ea/partyhandler.cpp:77
+msgid "Could not create party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:82
-msgid "Could not create party."
+#: src/net/ea/partyhandler.cpp:80
+msgid "Party successfully created."
msgstr ""
-#: src/net/ea/partyhandler.cpp:112
+#: src/net/ea/partyhandler.cpp:115
#, c-format
msgid "%s is already a member of a party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:116
+#: src/net/ea/partyhandler.cpp:119
#, c-format
msgid "%s refused your invitation."
msgstr ""
-#: src/net/ea/partyhandler.cpp:120
+#: src/net/ea/partyhandler.cpp:123
#, c-format
msgid "%s is now a member of your party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:124
+#: src/net/ea/partyhandler.cpp:127
#, c-format
msgid "Unknown invite response for %s."
msgstr ""
-#: 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 ""
-#: src/net/ea/partyhandler.cpp:269
+#: src/net/ea/partyhandler.cpp:272
#, c-format
msgid "An unknown member tried to say: %s"
msgstr ""
-#: 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 ""
-#: 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"
+#: 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 ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
@@ -2893,40 +2927,98 @@ msgstr ""
msgid "Willpower:"
msgstr "Volontà:"
-#: 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
#, fuzzy, c-format
msgid "Willpower: %d"
msgstr "Volontà:"
-#: 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
+#, fuzzy
+msgid "Server is full"
+msgstr "Server:"
+
+#: 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 ""
+
+#: src/net/tmwserv/loginhandler.cpp:143
+msgid "Old email address incorrect"
+msgstr ""
+
+#: src/net/tmwserv/loginhandler.cpp:149
+msgid "The new Email Address already exists."
+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 "Password:"
+
+#: src/net/tmwserv/loginhandler.cpp:211
+msgid "Wrong username, password or email address"
+msgstr ""
+
+#: src/net/tmwserv/loginhandler.cpp:214
+msgid "Username already exists"
+msgstr ""
+
+#: src/net/tmwserv/loginhandler.cpp:217
+msgid "Email address already exists"
+msgstr ""
+
+#: src/resources/itemdb.cpp:52
#, fuzzy, c-format
msgid "Attack %+d"
msgstr "Attacco %+d"
-#: src/resources/itemdb.cpp:54
+#: src/resources/itemdb.cpp:53
#, fuzzy, c-format
msgid "Defense %+d"
msgstr "Difesa %+d"
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:54
#, c-format
msgid "HP %+d"
msgstr "PF %+d"
-#: src/resources/itemdb.cpp:56
+#: src/resources/itemdb.cpp:55
#, c-format
msgid "MP %+d"
msgstr "PM %+d"
-#: src/resources/itemdb.cpp:113
+#: src/resources/itemdb.cpp:112
msgid "items.xml"
msgstr ""
-#: src/resources/itemdb.cpp:151
+#: src/resources/itemdb.cpp:150
msgid "Unnamed"
msgstr ""
@@ -2942,6 +3034,20 @@ msgstr ""
msgid "NPC Database: Error while loading npcs.xml!"
msgstr ""
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "> Cancel\n"
+#~ msgstr "Cancella"
+
+#, fuzzy
+#~ msgid "use"
+#~ msgstr "Usa"
+
+#, fuzzy
+#~ msgid "Emote Window"
+#~ msgstr "Resetta finestre"
+
#~ msgid "@@description|Description@@"
#~ msgstr "@@description|Descrizione@@"
diff --git a/po/ja.po b/po/ja.po
index 85417aeb..d96acc5b 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-04-21 17:27+0200\n"
+"POT-Creation-Date: 2009-05-10 15:53+0200\n"
"PO-Revision-Date: 2008-06-28 16:27+0000\n"
"Last-Translator: fate <Unknown>\n"
"Language-Team: Japanese <ja@li.org>\n"
@@ -17,286 +17,286 @@ msgstr ""
"X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
"X-Generator: Launchpad (build Unknown)\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."
+#: src/commandhandler.cpp:142
+msgid "/help > Display this help"
msgstr ""
-#: src/commandhandler.cpp:145
+#: src/commandhandler.cpp:144
msgid "/where > Display map name"
msgstr ""
-#: src/commandhandler.cpp:146
+#: src/commandhandler.cpp:145
msgid "/who > Display number of online users"
msgstr ""
-#: src/commandhandler.cpp:147
+#: src/commandhandler.cpp:146
msgid "/me > Tell something about yourself"
msgstr ""
-#: src/commandhandler.cpp:149
+#: src/commandhandler.cpp:148
msgid "/clear > Clears this window"
msgstr ""
-#: src/commandhandler.cpp:151
+#: src/commandhandler.cpp:150
msgid "/msg > Send a private message to a user"
msgstr ""
-#: src/commandhandler.cpp:152
+#: src/commandhandler.cpp:151
msgid "/whisper > Alias of msg"
msgstr ""
-#: src/commandhandler.cpp:153
+#: src/commandhandler.cpp:152
msgid "/w > Alias of msg"
msgstr ""
-#: src/commandhandler.cpp:154
+#: src/commandhandler.cpp:153
msgid "/query > Makes a tab for private messages with another user"
msgstr ""
-#: src/commandhandler.cpp:155
+#: src/commandhandler.cpp:154
msgid "/q > Alias of query"
msgstr ""
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:156
msgid "/list > Display all public channels"
msgstr ""
-#: src/commandhandler.cpp:158
+#: src/commandhandler.cpp:157
msgid "/join > Join or create a channel"
msgstr ""
-#: src/commandhandler.cpp:160
+#: src/commandhandler.cpp:159
msgid "/party > Invite a user to party"
msgstr ""
-#: src/commandhandler.cpp:162
+#: src/commandhandler.cpp:161
msgid "/record > Start recording the chat to an external file"
msgstr ""
-#: 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 ""
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:165
msgid "/announce > Global announcement (GM only)"
msgstr ""
-#: src/commandhandler.cpp:170
+#: src/commandhandler.cpp:169
msgid "For more information, type /help <command>"
msgstr ""
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:173
msgid "Command: /help"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: src/commandhandler.cpp:186
+#: src/commandhandler.cpp:185
msgid "*** only available to a GM ***"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: src/commandhandler.cpp:209
+#: src/commandhandler.cpp:208
msgid "This command tell others you are (doing) <msg>."
msgstr ""
-#: src/commandhandler.cpp:213
+#: src/commandhandler.cpp:212
msgid "Command: /msg <nick> <message>"
msgstr ""
-#: src/commandhandler.cpp:214
+#: src/commandhandler.cpp:213
msgid "Command: /whisper <nick> <message>"
msgstr ""
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:214
msgid "Command: /w <nick> <message>"
msgstr ""
-#: src/commandhandler.cpp:216
+#: src/commandhandler.cpp:215
msgid "This command sends the text <message> to <nick>."
msgstr ""
-#: 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 ""
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:222
msgid "Command: /q <nick>"
msgstr ""
-#: src/commandhandler.cpp:224
+#: src/commandhandler.cpp:223
msgid "This command tries to make a tab for whispers betweenyou and <nick>."
msgstr ""
-#: src/commandhandler.cpp:229
+#: src/commandhandler.cpp:228
msgid "Command: /party <nick>"
msgstr ""
-#: 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 ""
-#: src/commandhandler.cpp:236
+#: src/commandhandler.cpp:235
msgid "Command: /present"
msgstr ""
-#: 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 ""
-#: src/commandhandler.cpp:244
+#: src/commandhandler.cpp:243
msgid "This command starts recording the chat log to the file <filename>."
msgstr ""
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:245
msgid "Command: /record"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: src/commandhandler.cpp:257
+#: src/commandhandler.cpp:256
msgid "Command: /toggle"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: src/commandhandler.cpp:336
-msgid "Cannont send empty whispers!"
+#: 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 ""
-#: 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 ""
@@ -305,46 +305,46 @@ msgstr ""
msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
msgstr ""
-#: 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"
+#: src/game.cpp:481
+msgid "The connection to the server was lost, the program will now quit"
msgstr ""
-#: src/game.cpp:493
-msgid "The connection to the server was lost, the program will now quit"
+#: src/game.cpp:487
+msgid "Network Error"
msgstr ""
-#: src/game.cpp:664 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
+#: 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
#, fuzzy
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 ""
@@ -357,12 +357,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
#, fuzzy, c-format
msgid "Price: %s / Total: %s"
msgstr "価格: %d GP / 合計: %d GP"
@@ -372,13 +372,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"
@@ -387,205 +387,213 @@ 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 ""
-#: 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
#, fuzzy
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 ""
-#: 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
#, fuzzy, 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 "GP: %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
#, fuzzy, 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
#, fuzzy, c-format
msgid "Money: %s"
msgstr "GP: %d"
-#: 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
#, fuzzy
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 ""
+
+#: 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 ""
-#: 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 "いいえ"
@@ -593,26 +601,16 @@ msgstr "いいえ"
msgid "Connecting..."
msgstr "接続しています..."
-#: src/gui/emotecontainer.cpp:61
+#: src/gui/emotepopup.cpp:64
msgid "Unable to load selection.png"
msgstr ""
-#: 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 ""
@@ -637,97 +635,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 "ポート:"
-#: 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 ""
@@ -743,69 +744,41 @@ msgstr ""
msgid "Cast Test Spell 3"
msgstr ""
-#: 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"
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
+msgid "Map"
msgstr ""
-#: src/gui/menuwindow.cpp:72
-msgid "Guilds"
+#: src/gui/npcdialog.cpp:43
+msgid "Waiting for server"
msgstr ""
-#: src/gui/menuwindow.cpp:73
+#: src/gui/npcdialog.cpp:46
#, fuzzy
-msgid "Buddys"
-msgstr "買う"
+msgid "Submit"
+msgstr "分割"
-#: src/gui/menuwindow.cpp:75
-msgid "Shortcut"
+#: src/gui/npcdialog.cpp:49 src/gui/npcpostdialog.cpp:39
+msgid "NPC"
msgstr ""
-#: src/gui/menuwindow.cpp:77 src/gui/setup.cpp:65 src/main.cpp:920
-msgid "Setup"
-msgstr "セットアップ"
-
-#: src/gui/minimap.cpp:39
-msgid "MiniMap"
+#: src/gui/npcdialog.cpp:95
+msgid "+"
msgstr ""
-#: src/gui/npcintegerdialog.cpp:39
-msgid "NPC Number Request"
+#: 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
-#, fuzzy
-msgid ""
-"\n"
-"> Cancel\n"
-msgstr "取消"
-
-#: src/gui/npcpostdialog.cpp:39 src/gui/npc_text.cpp:37
-msgid "NPC"
-msgstr ""
-
#: src/gui/npcpostdialog.cpp:51
msgid "Send"
msgstr ""
-#: src/gui/npcstringdialog.cpp:39
-msgid "NPC Text Request"
-msgstr ""
-
-#: 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
#, fuzzy
msgid "Text"
msgstr "次へ"
@@ -859,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
#, fuzzy
msgid "Party"
msgstr "ポート:"
@@ -882,7 +855,7 @@ msgid "Being"
msgstr ""
#: src/gui/palette.cpp:104
-msgid "Other Player's Names"
+msgid "Other Players' Names"
msgstr ""
#: src/gui/palette.cpp:105
@@ -908,21 +881,22 @@ msgid "Unknown Item Type"
msgstr ""
#: src/gui/palette.cpp:111
-msgid "Generic"
+msgid "Generics"
msgstr ""
#: src/gui/palette.cpp:112
-msgid "Hat"
-msgstr ""
+#, fuzzy
+msgid "Hats"
+msgstr "状態"
#: src/gui/palette.cpp:113
#, fuzzy
-msgid "Usable"
+msgid "Usables"
msgstr "使う"
#: src/gui/palette.cpp:114
#, fuzzy
-msgid "Shirt"
+msgid "Shirts"
msgstr "分割"
#: src/gui/palette.cpp:115
@@ -943,15 +917,15 @@ msgid "2 Handed Weapons"
msgstr ""
#: src/gui/palette.cpp:119
-msgid "Shield"
+msgid "Shields"
msgstr ""
#: src/gui/palette.cpp:120
-msgid "Ring"
+msgid "Rings"
msgstr ""
#: src/gui/palette.cpp:121
-msgid "Necklace"
+msgid "Necklaces"
msgstr ""
#: src/gui/palette.cpp:122
@@ -1007,95 +981,104 @@ msgstr ""
msgid "1/4 HP Bar"
msgstr ""
-#: src/gui/popupmenu.cpp:73
+#: src/gui/popupmenu.cpp:75
msgid "@@name|Add name to chat@@"
msgstr ""
-#: src/gui/popupmenu.cpp:85
+#: src/gui/popupmenu.cpp:87
#, c-format
msgid "@@trade|Trade With %s@@"
msgstr ""
-#: 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 "@@attack|%sを攻撃する@@"
-#: src/gui/popupmenu.cpp:92
+#: src/gui/popupmenu.cpp:94
#, c-format
msgid "@@friend|Befriend %s@@"
msgstr ""
-#: 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 ""
-#: src/gui/popupmenu.cpp:112
+#: src/gui/popupmenu.cpp:114
#, c-format
msgid "@@party|Invite %s to join your party@@"
msgstr ""
-#: src/gui/popupmenu.cpp:123
+#: src/gui/popupmenu.cpp:125
#, fuzzy, c-format
msgid "@@talk|Talk To %s@@"
msgstr "@@talk|NPCを喋る@@"
-#: 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@@"
+msgid "@@pickup|Pick up %s@@"
msgstr ""
-#: src/gui/popupmenu.cpp:156 src/gui/popupmenu.cpp:352
-msgid "@@chat|Add to Chat@@"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:336 src/gui/popupmenu.cpp:341
-msgid "@@use|Equip@@"
+#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:373
+msgid "@@chat|Add to chat@@"
msgstr ""
-#: src/gui/popupmenu.cpp:339
+#: src/gui/popupmenu.cpp:348
#, fuzzy
msgid "@@use|Unequip@@"
msgstr "@@use|使う@@"
-#: src/gui/popupmenu.cpp:345
+#: src/gui/popupmenu.cpp:350
+msgid "@@use|Equip@@"
+msgstr ""
+
+#: src/gui/popupmenu.cpp:353
msgid "@@use|Use@@"
msgstr "@@use|使う@@"
-#: 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
+#, fuzzy
+msgid "@@store|Store@@"
+msgstr "@@use|使う@@"
+
+#: src/gui/popupmenu.cpp:371
+msgid "@@retrieve|Retrieve@@"
+msgstr ""
+
#: src/gui/quitdialog.cpp:37
#, fuzzy
msgid "Switch server"
@@ -1167,19 +1150,31 @@ msgstr ""
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 ""
-#: src/gui/serverselectdialog.cpp:50
+#: src/gui/serverselectdialog.cpp:59
#, fuzzy
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 ""
@@ -1196,11 +1191,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 ""
@@ -1208,23 +1203,23 @@ 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
#, fuzzy
msgid "Static"
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 ""
#: 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
#, fuzzy
msgid "Spectrum"
msgstr "セットアップ"
@@ -1233,26 +1228,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 ""
@@ -1323,7 +1310,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 ""
@@ -1351,154 +1338,174 @@ 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 ""
-#: 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 ""
-#: src/gui/setup_video.cpp:136
+#: src/gui/setup_video.cpp:167
msgid "FPS Limit:"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: 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
#, fuzzy
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 ""
-#: 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 ""
-#: 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 ""
-#: src/gui/setup_video.cpp:365
+#: src/gui/setup_video.cpp:435
msgid "Applying change to OpenGL requires restart."
msgstr ""
-#: 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 ""
@@ -1510,6 +1517,10 @@ msgstr ""
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"
@@ -1519,15 +1530,6 @@ msgstr ""
msgid "Up"
msgstr ""
-#: src/gui/skill.cpp:146
-msgid "inc"
-msgstr ""
-
-#: src/gui/skill.cpp:147
-#, fuzzy
-msgid "use"
-msgstr "使う"
-
#: src/gui/skilldialog.cpp:113
msgid "Weapons"
msgstr ""
@@ -1537,175 +1539,175 @@ msgstr ""
msgid "Crafts"
msgstr "作成"
-#: src/gui/status.cpp:57 src/gui/status.cpp:178
+#: src/gui/status.cpp:56 src/gui/status.cpp:177
#, fuzzy, c-format
msgid "Job: %d"
msgstr "レベル: %d"
-#: src/gui/status.cpp:61
+#: src/gui/status.cpp:60
msgid "HP:"
msgstr ""
-#: src/gui/status.cpp:64
+#: src/gui/status.cpp:63
msgid "Exp:"
msgstr ""
-#: src/gui/status.cpp:67
+#: src/gui/status.cpp:66
msgid "MP:"
msgstr ""
-#: src/gui/status.cpp:70
+#: src/gui/status.cpp:69
#, fuzzy
msgid "Job:"
msgstr "レベル: %d"
-#: src/gui/status.cpp:78
+#: src/gui/status.cpp:77
#, fuzzy
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 ""
-#: src/gui/status.cpp:91
+#: src/gui/status.cpp:90
#, no-c-format
msgid "% Evade:"
msgstr ""
-#: 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
#, fuzzy
msgid "Strength"
msgstr "筋力:"
-#: src/gui/status.cpp:200
+#: src/gui/status.cpp:199
#, fuzzy
msgid "Agility"
msgstr "素早さ:"
-#: src/gui/status.cpp:201
+#: src/gui/status.cpp:200
#, fuzzy
msgid "Vitality"
msgstr "体力:"
-#: src/gui/status.cpp:202
+#: src/gui/status.cpp:201
#, fuzzy
msgid "Intelligence"
msgstr "知性:"
-#: src/gui/status.cpp:203
+#: src/gui/status.cpp:202
#, fuzzy
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 ""
-#: 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
#, fuzzy
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
#, fuzzy
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 ""
-#: src/gui/trade.cpp:97
+#: src/gui/trade.cpp:96
msgid "You give:"
msgstr ""
-#: src/gui/trade.cpp:101
+#: src/gui/trade.cpp:100
#, fuzzy
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 ""
@@ -1817,21 +1819,21 @@ msgstr ""
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 ""
-#: src/gui/widgets/chattab.cpp:147
+#: src/gui/widgets/chattab.cpp:146
#, c-format
msgid "%s whispers: "
msgstr ""
-#: 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 ""
@@ -1839,23 +1841,35 @@ msgstr ""
msgid "Cannot send empty chat!"
msgstr ""
-#: src/gui/widgets/whispertab.cpp:55
-#, c-format
-msgid "%s: %s"
-msgstr ""
-
-#: src/gui/widgets/whispertab.cpp:69
+#: src/gui/widgets/whispertab.cpp:68
msgid "/close > Close the whisper tab"
msgstr ""
-#: src/gui/widgets/whispertab.cpp:79
+#: src/gui/widgets/whispertab.cpp:78
msgid "Command: /close"
msgstr ""
-#: 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
+#, fuzzy
+msgid "Buddys"
+msgstr "買う"
+
+#: src/gui/windowmenu.cpp:68
+msgid "Shortcut"
+msgstr ""
+
#: src/keyboardconfig.cpp:41
msgid "Move Up"
msgstr ""
@@ -1977,8 +1991,9 @@ msgid "Debug Window"
msgstr ""
#: src/keyboardconfig.cpp:80
-msgid "Emote Window"
-msgstr ""
+#, fuzzy
+msgid "Party Window"
+msgstr "状態"
#: src/keyboardconfig.cpp:81
msgid "Emote Shortcut Window"
@@ -2028,163 +2043,167 @@ msgstr ""
msgid "Ignore input 2"
msgstr ""
-#: 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
#, fuzzy
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
#, fuzzy
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
#, fuzzy
msgid "Craft"
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 ""
-#: src/main.cpp:563
-msgid "Options: "
-msgstr ""
-
-#: src/main.cpp:564
-msgid " -C --configfile : Configuration file to use"
-msgstr ""
-
-#: src/main.cpp:565
-msgid " -d --data : Directory to load game data from"
-msgstr ""
-
-#: src/main.cpp:566
-msgid " -D --default : Bypass the login process with default settings"
+#: src/main.cpp:567
+msgid "Options:"
msgstr ""
#: src/main.cpp:568
-msgid " -h --help : Display this help"
+msgid " -C --config-file : Configuration file to use"
msgstr ""
#: src/main.cpp:569
-msgid " -S --homedir : Directory to use as home directory"
+msgid " -d --data : Directory to load game data from"
msgstr ""
#: src/main.cpp:570
-msgid " -H --updatehost : Use this update host"
-msgstr ""
-
-#: src/main.cpp:571
-msgid " -P --password : Login with this password"
+msgid " -D --default : Choose default character server and character"
msgstr ""
#: src/main.cpp:572
-msgid " -c --character : Login with this character"
+msgid " -h --help : Display this help"
msgstr ""
#: src/main.cpp:573
-msgid " -o --port : Login Server Port"
+msgid " -S --home-dir : Directory to use as home directory"
msgstr ""
#: src/main.cpp:574
-msgid " -s --server : Login Server name or IP"
+msgid " -H --update-host : Use this update host"
msgstr ""
#: src/main.cpp:575
-msgid " -u --skipupdate : Skip the update downloads"
+msgid " -P --password : Login with this password"
msgstr ""
#: src/main.cpp:576
-msgid " -U --username : Login with this username"
+msgid " -c --character : Login with this character"
msgstr ""
#: src/main.cpp:577
-msgid " -v --version : Display the version"
+msgid " -p --port : Login Server Port"
+msgstr ""
+
+#: src/main.cpp:578
+msgid " -s --server : Login Server name or IP"
+msgstr ""
+
+#: src/main.cpp:579
+msgid " -u --skip-update : Skip the update downloads"
+msgstr ""
+
+#: src/main.cpp:580
+msgid " -U --username : Login with this username"
msgstr ""
#: src/main.cpp:582
+msgid " -O --no-opengl : Disable OpenGL for this session"
+msgstr ""
+
+#: src/main.cpp:584
+msgid " -v --version : Display the version"
+msgstr ""
+
+#: src/main.cpp:589
msgid "The Mana World "
msgstr ""
-#: src/main.cpp:1499
+#: src/main.cpp:1515
#, fuzzy
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 ""
@@ -2271,18 +2290,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 ""
@@ -2294,416 +2313,430 @@ 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
#, fuzzy, c-format
msgid "Strength: %d"
msgstr "筋力:"
-#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:82
+#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:84
#, fuzzy, c-format
msgid "Agility: %d"
msgstr "素早さ:"
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:86
+#: src/net/ea/generalhandler.cpp:96 src/net/tmwserv/generalhandler.cpp:88
#, fuzzy, c-format
msgid "Vitality: %d"
msgstr "体力:"
-#: src/net/ea/generalhandler.cpp:96 src/net/tmwserv/generalhandler.cpp:88
+#: src/net/ea/generalhandler.cpp:98 src/net/tmwserv/generalhandler.cpp:90
#, fuzzy, c-format
msgid "Intelligence: %d"
msgstr "知性:"
-#: src/net/ea/generalhandler.cpp:98 src/net/tmwserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:100 src/net/tmwserv/generalhandler.cpp:86
#, fuzzy, c-format
msgid "Dexterity: %d"
msgstr "敏捷:"
-#: src/net/ea/generalhandler.cpp:100
+#: src/net/ea/generalhandler.cpp:102
#, c-format
msgid "Luck: %d"
msgstr ""
-#: 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 ""
-#: 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 ""
+
+#: src/net/ea/gui/partytab.cpp:53
msgid "/create > Create a new party"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:55
+#: src/net/ea/gui/partytab.cpp:54
msgid "/new > Alias of create"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:56
+#: src/net/ea/gui/partytab.cpp:55
msgid "/invite > Invite a player to your party"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:57
+#: src/net/ea/gui/partytab.cpp:56
msgid "/leave > Leave the party you are in"
msgstr ""
-#: 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 ""
-#: src/net/ea/gui/partytab.cpp:59
+#: src/net/ea/gui/partytab.cpp:58
msgid "/item > Show/change party item sharing options"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:60
+#: src/net/ea/gui/partytab.cpp:59
msgid "/exp > Show/change party experience sharing options"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:69
+#: src/net/ea/gui/partytab.cpp:68
msgid "Command: /new <party-name>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:70
+#: src/net/ea/gui/partytab.cpp:69
msgid "Command: /create <party-name>"
msgstr ""
-#: 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 ""
-#: src/net/ea/gui/partytab.cpp:75
+#: src/net/ea/gui/partytab.cpp:74
msgid "Command: /invite <nick>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:82
+#: src/net/ea/gui/partytab.cpp:81
msgid "Command: /leave"
msgstr ""
-#: 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 ""
-#: 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."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:92
+#: src/net/ea/gui/partytab.cpp:91
msgid "Command: /item"
msgstr ""
-#: 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 ""
-#: 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."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:102
+#: src/net/ea/gui/partytab.cpp:101
msgid "Command: /exp"
msgstr ""
-#: 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]"
+msgid "You picked up %s [@@%d|%s@@]"
msgstr ""
-#: 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
#, fuzzy
msgid "Unregistered ID"
msgstr "登録削除"
-#: src/net/ea/loginhandler.cpp:114
+#: src/net/ea/loginhandler.cpp:113
#, fuzzy
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
#, fuzzy
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 ""
-#: 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"
" Please contact the GM team via the forums."
msgstr ""
-#: 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."
+#: src/net/ea/partyhandler.cpp:77
+msgid "Could not create party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:82
-msgid "Could not create party."
+#: src/net/ea/partyhandler.cpp:80
+msgid "Party successfully created."
msgstr ""
-#: src/net/ea/partyhandler.cpp:112
+#: src/net/ea/partyhandler.cpp:115
#, c-format
msgid "%s is already a member of a party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:116
+#: src/net/ea/partyhandler.cpp:119
#, c-format
msgid "%s refused your invitation."
msgstr ""
-#: src/net/ea/partyhandler.cpp:120
+#: src/net/ea/partyhandler.cpp:123
#, c-format
msgid "%s is now a member of your party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:124
+#: src/net/ea/partyhandler.cpp:127
#, c-format
msgid "Unknown invite response for %s."
msgstr ""
-#: 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 ""
-#: src/net/ea/partyhandler.cpp:269
+#: src/net/ea/partyhandler.cpp:272
#, c-format
msgid "An unknown member tried to say: %s"
msgstr ""
-#: 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 ""
-#: 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"
+#: 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 ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
@@ -2860,40 +2893,98 @@ 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
#, fuzzy, c-format
msgid "Willpower: %d"
msgstr "精神:"
-#: 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
+#, fuzzy
+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 ""
+
+#: src/net/tmwserv/loginhandler.cpp:143
+msgid "Old email address incorrect"
+msgstr ""
+
+#: src/net/tmwserv/loginhandler.cpp:149
+msgid "The new Email Address already exists."
+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 "パスワード:"
+
+#: src/net/tmwserv/loginhandler.cpp:211
+msgid "Wrong username, password or email address"
+msgstr ""
+
+#: src/net/tmwserv/loginhandler.cpp:214
+msgid "Username already exists"
+msgstr ""
+
+#: src/net/tmwserv/loginhandler.cpp:217
+msgid "Email address already exists"
+msgstr ""
+
+#: src/resources/itemdb.cpp:52
#, c-format
msgid "Attack %+d"
msgstr ""
-#: src/resources/itemdb.cpp:54
+#: src/resources/itemdb.cpp:53
#, c-format
msgid "Defense %+d"
msgstr ""
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:54
#, c-format
msgid "HP %+d"
msgstr ""
-#: src/resources/itemdb.cpp:56
+#: src/resources/itemdb.cpp:55
#, c-format
msgid "MP %+d"
msgstr ""
-#: src/resources/itemdb.cpp:113
+#: src/resources/itemdb.cpp:112
msgid "items.xml"
msgstr ""
-#: src/resources/itemdb.cpp:151
+#: src/resources/itemdb.cpp:150
msgid "Unnamed"
msgstr ""
@@ -2910,6 +3001,16 @@ msgid "NPC Database: Error while loading npcs.xml!"
msgstr ""
#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "> Cancel\n"
+#~ msgstr "取消"
+
+#, fuzzy
+#~ msgid "use"
+#~ msgstr "使う"
+
+#, fuzzy
#~ msgid "Money: %d GP"
#~ msgstr "GP: %d"
diff --git a/po/nl.po b/po/nl.po
index a5b9e454..0026261f 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-04-21 17:27+0200\n"
+"POT-Creation-Date: 2009-05-10 15:53+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"
@@ -17,302 +17,302 @@ msgstr ""
"X-Launchpad-Export-Date: 2009-01-25 22:24+0000\n"
"X-Generator: Launchpad (build Unknown)\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."
+#: src/commandhandler.cpp:142
+msgid "/help > Display this help"
msgstr ""
-#: src/commandhandler.cpp:145
+#: src/commandhandler.cpp:144
msgid "/where > Display map name"
msgstr ""
-#: src/commandhandler.cpp:146
+#: src/commandhandler.cpp:145
#, fuzzy
msgid "/who > Display number of online users"
msgstr "/who: Geef het aantal online gebruikers weer"
-#: src/commandhandler.cpp:147
+#: src/commandhandler.cpp:146
msgid "/me > Tell something about yourself"
msgstr ""
-#: src/commandhandler.cpp:149
+#: src/commandhandler.cpp:148
msgid "/clear > Clears this window"
msgstr ""
-#: src/commandhandler.cpp:151
+#: src/commandhandler.cpp:150
msgid "/msg > Send a private message to a user"
msgstr ""
-#: src/commandhandler.cpp:152
+#: src/commandhandler.cpp:151
msgid "/whisper > Alias of msg"
msgstr ""
-#: src/commandhandler.cpp:153
+#: src/commandhandler.cpp:152
msgid "/w > Alias of msg"
msgstr ""
-#: src/commandhandler.cpp:154
+#: src/commandhandler.cpp:153
msgid "/query > Makes a tab for private messages with another user"
msgstr ""
-#: src/commandhandler.cpp:155
+#: src/commandhandler.cpp:154
msgid "/q > Alias of query"
msgstr ""
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:156
msgid "/list > Display all public channels"
msgstr ""
-#: src/commandhandler.cpp:158
+#: src/commandhandler.cpp:157
msgid "/join > Join or create a channel"
msgstr ""
-#: src/commandhandler.cpp:160
+#: src/commandhandler.cpp:159
msgid "/party > Invite a user to party"
msgstr ""
-#: src/commandhandler.cpp:162
+#: src/commandhandler.cpp:161
msgid "/record > Start recording the chat to an external file"
msgstr ""
-#: 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 ""
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:165
#, fuzzy
msgid "/announce > Global announcement (GM only)"
msgstr "/announce: Globale aankondiging (alleen voor GM)"
-#: src/commandhandler.cpp:170
+#: src/commandhandler.cpp:169
msgid "For more information, type /help <command>"
msgstr ""
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:173
msgid "Command: /help"
msgstr "Commando: /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 "Commando: /help <commando>"
-#: 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 "Commando: /announce <msg>"
-#: src/commandhandler.cpp:186
+#: src/commandhandler.cpp:185
msgid "*** only available to a GM ***"
msgstr ""
-#: 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 "Commando: /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
#, fuzzy
msgid "Command: /join <channel>"
msgstr "Commando: /help"
-#: 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
#, fuzzy
msgid "Command: /list"
msgstr "Commando: /help"
-#: 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
#, fuzzy
msgid "Command: /me <message>"
msgstr "Commando: /announce <msg>"
-#: src/commandhandler.cpp:209
+#: src/commandhandler.cpp:208
msgid "This command tell others you are (doing) <msg>."
msgstr ""
-#: src/commandhandler.cpp:213
+#: src/commandhandler.cpp:212
#, fuzzy
msgid "Command: /msg <nick> <message>"
msgstr "Commando: /announce <msg>"
-#: src/commandhandler.cpp:214
+#: src/commandhandler.cpp:213
#, fuzzy
msgid "Command: /whisper <nick> <message>"
msgstr "Commando: /announce <msg>"
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:214
#, fuzzy
msgid "Command: /w <nick> <message>"
msgstr "Commando: /announce <msg>"
-#: src/commandhandler.cpp:216
+#: src/commandhandler.cpp:215
msgid "This command sends the text <message> to <nick>."
msgstr ""
-#: 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
#, fuzzy
msgid "Command: /query <nick>"
msgstr "Commando: /announce <msg>"
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:222
#, fuzzy
msgid "Command: /q <nick>"
msgstr "Commando: /clear"
-#: src/commandhandler.cpp:224
+#: src/commandhandler.cpp:223
msgid "This command tries to make a tab for whispers betweenyou and <nick>."
msgstr ""
-#: src/commandhandler.cpp:229
+#: src/commandhandler.cpp:228
#, fuzzy
msgid "Command: /party <nick>"
msgstr "Commando: /help <commando>"
-#: 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 ""
-#: src/commandhandler.cpp:236
+#: src/commandhandler.cpp:235
#, fuzzy
msgid "Command: /present"
msgstr "Commando: /where"
-#: 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
#, fuzzy
msgid "Command: /record <filename>"
msgstr "Commando: /clear"
-#: src/commandhandler.cpp:244
+#: src/commandhandler.cpp:243
msgid "This command starts recording the chat log to the file <filename>."
msgstr ""
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:245
#, fuzzy
msgid "Command: /record"
msgstr "Commando: /clear"
-#: src/commandhandler.cpp:247
+#: src/commandhandler.cpp:246
msgid "This command finishes a recording session."
msgstr ""
-#: src/commandhandler.cpp:251
+#: src/commandhandler.cpp:250
#, fuzzy
msgid "Command: /toggle <state>"
msgstr "Commando: /announce <msg>"
-#: 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 ""
-#: src/commandhandler.cpp:257
+#: src/commandhandler.cpp:256
#, fuzzy
msgid "Command: /toggle"
msgstr "Commando: /clear"
-#: 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 "Commando: /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 ""
-#: 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 "Type /help voor een lijst van commando's."
-#: src/commandhandler.cpp:336
-msgid "Cannont send empty whispers!"
+#: 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 ""
-#: 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 ""
@@ -321,47 +321,47 @@ msgstr ""
msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
msgstr ""
-#: 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
#, fuzzy
msgid "Saving screenshot failed!"
msgstr "Zitten niet mogelijk!"
-#: src/game.cpp:492
-msgid "Network Error"
+#: src/game.cpp:481
+msgid "The connection to the server was lost, the program will now quit"
msgstr ""
-#: src/game.cpp:493
-msgid "The connection to the server was lost, the program will now quit"
+#: src/game.cpp:487
+msgid "Network Error"
msgstr ""
-#: src/game.cpp:664 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
+#: 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 "Afsluiten"
-#: src/game.cpp:665
+#: src/game.cpp:647
#, fuzzy
msgid "Are you sure you want to quit?"
msgstr "Weet je zeker dat je deze personage wilt verwijderen?"
-#: 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 ""
@@ -374,12 +374,12 @@ msgstr "Kopen"
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 "Kopen"
#: 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 ""
@@ -390,13 +390,13 @@ msgid "Max"
msgstr "max"
#: 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 "Beschrijving: %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 "Effect: %s"
@@ -405,205 +405,213 @@ msgstr "Effect: %s"
msgid "Shop"
msgstr "Winkel"
-#: 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 "Verkopen"
-#: 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 "Annuleren"
-#: 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 ""
-#: 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
#, fuzzy
msgid "Change Password"
msgstr "Wachtwoord:"
-#: 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 "Wachtwoord:"
-#: 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 "Personage Aanmaken"
-#: 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 "Naam:"
-#: src/gui/charcreatedialog.cpp:70
+#: src/gui/charcreatedialog.cpp:69
msgid "Hair Color:"
msgstr "Haarkleur:"
-#: src/gui/charcreatedialog.cpp:73
+#: src/gui/charcreatedialog.cpp:72
msgid "Hair Style:"
msgstr "Haarstijl:"
-#: src/gui/charcreatedialog.cpp:74
+#: src/gui/charcreatedialog.cpp:73
msgid "Create"
msgstr "Aanmaken"
-#: src/gui/charcreatedialog.cpp:76 src/gui/register.cpp:75
+#: src/gui/charcreatedialog.cpp:75 src/gui/register.cpp:75
msgid "Male"
msgstr "Mannelijk"
-#: src/gui/charcreatedialog.cpp:77 src/gui/register.cpp:76
+#: src/gui/charcreatedialog.cpp:76 src/gui/register.cpp:76
msgid "Female"
msgstr "Vrouwelijk"
-#: 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 "Nog %d punten te verdelen"
-#: 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 "Fout"
-#: src/gui/charcreatedialog.cpp:174
+#: src/gui/charcreatedialog.cpp:173
msgid "Your name needs to be at least 4 characters."
msgstr "Je naam moet uit tenminste 4 tekens bestaan"
-#: src/gui/charcreatedialog.cpp:227
+#: src/gui/charcreatedialog.cpp:226
msgid "Character stats OK"
msgstr "Attributen van personage OK"
-#: src/gui/charcreatedialog.cpp:239
+#: src/gui/charcreatedialog.cpp:238
#, c-format
msgid "Please remove %d points"
msgstr "Verwijder alstublieft %d punten"
-#: 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 "Weet je zeker dat je deze personage wilt verwijderen?"
-#: 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 "Kies Personage"
-#: 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 "OK"
-#: src/gui/char_select.cpp:113
+#: src/gui/charselectdialog.cpp:112
msgid "Previous"
msgstr "Vorige"
-#: 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 "Volgende"
-#: 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 "Naam: %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 "Level: %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 "Nieuw"
-#: 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 "Verwijderen"
-#: src/gui/char_select.cpp:120 src/gui/unregisterdialog.cpp:51
+#: src/gui/charselectdialog.cpp:119 src/gui/unregisterdialog.cpp:52
msgid "Unregister"
msgstr "Registreren"
-#: src/gui/char_select.cpp:127
+#: src/gui/charselectdialog.cpp:126
#, c-format
msgid "Money: %d"
msgstr "Geld: %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 ""
-#: 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
#, fuzzy, c-format
msgid "Money: %s"
msgstr "Geld: %d"
-#: 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
#, fuzzy
msgid "Chat"
msgstr "Aanmaken"
-#: src/gui/chat.cpp:341 src/gui/chat.cpp:347
+#: src/gui/chat.cpp:332
+#, c-format
+msgid "%d players are present."
+msgstr ""
+
+#: 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 ""
-#: src/gui/confirm_dialog.cpp:42
+#: src/gui/confirmdialog.cpp:42
msgid "Yes"
msgstr "Ja"
-#: src/gui/confirm_dialog.cpp:43
+#: src/gui/confirmdialog.cpp:43
msgid "No"
msgstr "Nee"
@@ -611,26 +619,16 @@ msgstr "Nee"
msgid "Connecting..."
msgstr "Verbinden..."
-#: src/gui/emotecontainer.cpp:61
+#: src/gui/emotepopup.cpp:64
msgid "Unable to load selection.png"
msgstr ""
-#: 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 "Gebruiken"
-
-#: src/gui/equipmentwindow.cpp:68 src/gui/menuwindow.cpp:67
+#: src/gui/equipmentwindow.cpp:68 src/gui/windowmenu.cpp:60
msgid "Equipment"
msgstr "Uitrusting"
-#: 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 "Afdoen"
@@ -655,103 +653,106 @@ 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 "Sluiten"
-#: src/gui/inventorywindow.cpp:51 src/gui/menuwindow.cpp:68
+#: src/gui/inventorywindow.cpp:54 src/gui/windowmenu.cpp:61
msgid "Inventory"
msgstr "Inventaris"
-#: 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 "Uitrusten"
-#: 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 "Gebruiken"
+
+#: src/gui/inventorywindow.cpp:80
msgid "Drop"
msgstr "Neerleggen"
-#: src/gui/inventorywindow.cpp:79
+#: src/gui/inventorywindow.cpp:81
msgid "Split"
msgstr "Splitsen"
-#: src/gui/inventorywindow.cpp:93
+#: src/gui/inventorywindow.cpp:92
msgid "Slots:"
msgstr ""
-#: src/gui/inventorywindow.cpp:94
+#: src/gui/inventorywindow.cpp:93
#, fuzzy
msgid "Weight:"
msgstr "Gewicht: %d / %d"
-#: 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 "Selecteer het aantal exemplaren om te verhandelen"
-#: src/gui/item_amount.cpp:95
+#: src/gui/itemamount.cpp:124
msgid "Select amount of items to drop."
msgstr "Selecteer het aantal exemplaren om neer te leggen"
-#: src/gui/item_amount.cpp:98
+#: src/gui/itemamount.cpp:127
#, fuzzy
msgid "Select amount of items to store."
msgstr "Selecteer het aantal exemplaren om te verhandelen"
-#: src/gui/item_amount.cpp:101
+#: src/gui/itemamount.cpp:130
#, fuzzy
msgid "Select amount of items to retrieve."
msgstr "Selecteer het aantal exemplaren om te verhandelen"
-#: src/gui/item_amount.cpp:104
+#: src/gui/itemamount.cpp:133
#, fuzzy
msgid "Select amount of items to split."
msgstr "Selecteer het aantal exemplaren om neer te leggen"
-#: src/gui/itempopup.cpp:89
+#: src/gui/itempopup.cpp:91
#, fuzzy
msgid "Weight: "
msgstr "Gewicht: %d / %d"
-#: src/gui/login.cpp:47
+#: src/gui/login.cpp:48
msgid "Login"
msgstr "Inloggen"
-#: 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 "Server:"
-#: 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 "Poort:"
-#: src/gui/login.cpp:55
+#: src/gui/login.cpp:56
#, fuzzy
msgid "Recent:"
msgstr "Aanmelden"
-#: src/gui/login.cpp:72
+#: src/gui/login.cpp:73
msgid "Remember Username"
msgstr "Onthoud Naam"
-#: 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 "OK"
-#: 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 "Aanmelden"
-#: 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 ""
@@ -767,71 +768,44 @@ msgstr ""
msgid "Cast Test Spell 3"
msgstr ""
-#: src/gui/menuwindow.cpp:66
-msgid "Status"
-msgstr "Status"
-
-#: src/gui/menuwindow.cpp:69 src/gui/skill.cpp:126 src/gui/skilldialog.cpp:99
-msgid "Skills"
-msgstr "Vaardigheden"
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
+#, fuzzy
+msgid "Map"
+msgstr "max"
-#: src/gui/menuwindow.cpp:72
-msgid "Guilds"
+#: src/gui/npcdialog.cpp:43
+msgid "Waiting for server"
msgstr ""
-#: src/gui/menuwindow.cpp:73
+#: src/gui/npcdialog.cpp:46
#, fuzzy
-msgid "Buddys"
-msgstr "Kopen"
-
-#: src/gui/menuwindow.cpp:75
-msgid "Shortcut"
-msgstr "Sneltoets"
+msgid "Submit"
+msgstr "Splitsen"
-#: src/gui/menuwindow.cpp:77 src/gui/setup.cpp:65 src/main.cpp:920
-msgid "Setup"
-msgstr "Configureren"
+#: src/gui/npcdialog.cpp:49 src/gui/npcpostdialog.cpp:39
+msgid "NPC"
+msgstr "NPC"
-#: src/gui/minimap.cpp:39
-msgid "MiniMap"
-msgstr "Kaartje"
+#: src/gui/npcdialog.cpp:95
+msgid "+"
+msgstr ""
-#: src/gui/npcintegerdialog.cpp:39
-msgid "NPC Number Request"
+#: src/gui/npcdialog.cpp:96
+msgid "-"
msgstr ""
-#: src/gui/npcintegerdialog.cpp:50
+#: src/gui/npcdialog.cpp:105
#, fuzzy
msgid "Reset"
msgstr "Aanmelden"
-#: src/gui/npcintegerdialog.cpp:101 src/gui/npclistdialog.cpp:123
-#: src/gui/npcstringdialog.cpp:75
-#, fuzzy
-msgid ""
-"\n"
-"> Cancel\n"
-msgstr "Annuleren"
-
-#: src/gui/npcpostdialog.cpp:39 src/gui/npc_text.cpp:37
-msgid "NPC"
-msgstr "NPC"
-
#: src/gui/npcpostdialog.cpp:51
#, fuzzy
msgid "Send"
msgstr "Geluid"
-#: src/gui/npcstringdialog.cpp:39
-msgid "NPC Text Request"
-msgstr ""
-
-#: 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
#, fuzzy
msgid "Text"
msgstr "Volgende"
@@ -888,7 +862,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
#, fuzzy
msgid "Party"
msgstr "Spelen"
@@ -911,7 +885,7 @@ msgid "Being"
msgstr ""
#: src/gui/palette.cpp:104
-msgid "Other Player's Names"
+msgid "Other Players' Names"
msgstr ""
#: src/gui/palette.cpp:105
@@ -938,21 +912,22 @@ msgid "Unknown Item Type"
msgstr ""
#: src/gui/palette.cpp:111
-msgid "Generic"
+msgid "Generics"
msgstr ""
#: src/gui/palette.cpp:112
-msgid "Hat"
-msgstr ""
+#, fuzzy
+msgid "Hats"
+msgstr "Status"
#: src/gui/palette.cpp:113
#, fuzzy
-msgid "Usable"
+msgid "Usables"
msgstr "Gebruiken"
#: src/gui/palette.cpp:114
#, fuzzy
-msgid "Shirt"
+msgid "Shirts"
msgstr "Sneltoets"
#: src/gui/palette.cpp:115
@@ -974,15 +949,15 @@ msgstr ""
#: src/gui/palette.cpp:119
#, fuzzy
-msgid "Shield"
+msgid "Shields"
msgstr "Verkopen"
#: src/gui/palette.cpp:120
-msgid "Ring"
+msgid "Rings"
msgstr ""
#: src/gui/palette.cpp:121
-msgid "Necklace"
+msgid "Necklaces"
msgstr ""
#: src/gui/palette.cpp:122
@@ -1037,94 +1012,103 @@ msgstr ""
msgid "1/4 HP Bar"
msgstr ""
-#: src/gui/popupmenu.cpp:73
+#: src/gui/popupmenu.cpp:75
msgid "@@name|Add name to chat@@"
msgstr ""
-#: src/gui/popupmenu.cpp:85
+#: src/gui/popupmenu.cpp:87
#, c-format
msgid "@@trade|Trade With %s@@"
msgstr "@@trade|Handelen met %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 "@@attack|%s aanvallen@@"
-#: src/gui/popupmenu.cpp:92
+#: src/gui/popupmenu.cpp:94
#, c-format
msgid "@@friend|Befriend %s@@"
msgstr ""
-#: 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 ""
-#: src/gui/popupmenu.cpp:112
+#: src/gui/popupmenu.cpp:114
#, c-format
msgid "@@party|Invite %s to join your party@@"
msgstr ""
-#: src/gui/popupmenu.cpp:123
+#: src/gui/popupmenu.cpp:125
#, fuzzy, c-format
msgid "@@talk|Talk To %s@@"
msgstr "@@talk|Praat met NPC@@"
-#: 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 "@@cancel|Annuleren@@"
-#: src/gui/popupmenu.cpp:155
-#, c-format
-msgid "@@pickup|Pick Up %s@@"
+#: src/gui/popupmenu.cpp:157
+#, fuzzy, c-format
+msgid "@@pickup|Pick up %s@@"
msgstr "@@pickup|%s oppakken@@"
-#: src/gui/popupmenu.cpp:156 src/gui/popupmenu.cpp:352
-msgid "@@chat|Add to Chat@@"
+#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:373
+msgid "@@chat|Add to chat@@"
msgstr ""
-#: src/gui/popupmenu.cpp:336 src/gui/popupmenu.cpp:341
-msgid "@@use|Equip@@"
-msgstr "@@use|Uitrusten@@"
-
-#: 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 "@@use|Uitrusten@@"
+
+#: src/gui/popupmenu.cpp:353
msgid "@@use|Use@@"
msgstr "@@use|Gebruiken@@"
-#: src/gui/popupmenu.cpp:347
+#: src/gui/popupmenu.cpp:355
msgid "@@drop|Drop@@"
msgstr "@@drop|Neerleggen@@"
-#: src/gui/popupmenu.cpp:350
+#: src/gui/popupmenu.cpp:359
msgid "@@split|Split@@"
msgstr ""
+#: src/gui/popupmenu.cpp:364
+#, fuzzy
+msgid "@@store|Store@@"
+msgstr "@@use|Gebruiken@@"
+
+#: src/gui/popupmenu.cpp:371
+msgid "@@retrieve|Retrieve@@"
+msgstr ""
+
#: src/gui/quitdialog.cpp:37
msgid "Switch server"
msgstr "Van server wisselen"
@@ -1194,19 +1178,31 @@ msgstr "Het wachtwoord moet uit minder dan %d tekens bestaan."
msgid "Passwords do not match."
msgstr "Wachtwoorden komen niet overeen."
-#: src/gui/serverdialog.cpp:73
+#: src/gui/serverdialog.cpp:74
#, fuzzy
msgid "Choose your server"
msgstr "Kies uw Mana World server"
-#: src/gui/serverdialog.cpp:163
+#: src/gui/serverdialog.cpp:164
msgid "Please type both the address and the port of a server."
msgstr ""
-#: src/gui/serverselectdialog.cpp:50
+#: src/gui/serverselectdialog.cpp:59
msgid "Select Server"
msgstr "Server Selecteren"
+#: src/gui/setup.cpp:64 src/gui/windowmenu.cpp:69 src/main.cpp:933
+msgid "Setup"
+msgstr "Configureren"
+
+#: src/gui/setup.cpp:72
+msgid "Apply"
+msgstr "Toepassen"
+
+#: src/gui/setup.cpp:72
+msgid "Reset Windows"
+msgstr "Vensters in beginstand"
+
#: src/gui/setup_audio.cpp:41
msgid "Sound"
msgstr "Geluid"
@@ -1223,11 +1219,11 @@ msgstr "Volume van geluiden"
msgid "Music volume"
msgstr "Muziek volume"
-#: 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
#, fuzzy
msgid "Colors"
msgstr "Sluiten"
@@ -1236,24 +1232,24 @@ msgstr "Sluiten"
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
#, fuzzy
msgid "Static"
msgstr "Status"
#: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:431
#, fuzzy
msgid "Pulse"
msgstr "Sluiten"
#: 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
#, fuzzy
msgid "Spectrum"
msgstr "Configureren"
@@ -1262,26 +1258,18 @@ msgstr "Configureren"
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 "Toepassen"
-
-#: src/gui/setup.cpp:73
-msgid "Reset Windows"
-msgstr "Vensters in beginstand"
-
#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:78
msgid "Press the button to start calibration"
msgstr "Druk op de knop om het kalibreren te starten"
@@ -1350,7 +1338,7 @@ msgstr ""
msgid "Ignored"
msgstr "Genegeerd"
-#: src/gui/setup_players.cpp:207
+#: src/gui/setup_players.cpp:207 src/gui/setup_video.cpp:131
msgid "???"
msgstr ""
@@ -1378,156 +1366,178 @@ msgstr "Spelers"
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
+#, fuzzy
+msgid "Small"
+msgstr "Verkopen"
+
+#: src/gui/setup_video.cpp:114
+#, fuzzy
+msgid "Medium"
+msgstr "gemiddeld"
+
+#: src/gui/setup_video.cpp:115
+msgid "Large"
+msgstr ""
+
+#: src/gui/setup_video.cpp:151
msgid "Full screen"
msgstr "Volledig scherm"
-#: 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 "Aangepaste cursor"
-#: 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 ""
-#: src/gui/setup_video.cpp:136
+#: src/gui/setup_video.cpp:167
msgid "FPS Limit:"
msgstr "FPS limiet:"
-#: src/gui/setup_video.cpp:152
+#: src/gui/setup_video.cpp:184
msgid "Video"
msgstr "Video"
-#: 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 "Dekking van de GUI"
-#: src/gui/setup_video.cpp:159
+#: src/gui/setup_video.cpp:191
msgid "Scroll radius"
msgstr "Scroll radius"
-#: src/gui/setup_video.cpp:160
+#: src/gui/setup_video.cpp:192
msgid "Scroll laziness"
msgstr "Scroll vertraging"
-#: src/gui/setup_video.cpp:161
+#: src/gui/setup_video.cpp:193
msgid "Ambient FX"
msgstr "Omgevingseffecten"
-#: 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
#, fuzzy
msgid "No text"
msgstr "Volgende"
-#: 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 ""
-#: 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 ""
-#: 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 "uit"
-#: 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 "laag"
-#: 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 "hoog"
-#: 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 "gemiddeld"
-#: 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 "max"
-#: 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
#, fuzzy
msgid "fullscreen"
msgstr "Volledig scherm"
-#: 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 "Overgaan naar volledig scherm"
-#: src/gui/setup_video.cpp:352
+#: src/gui/setup_video.cpp:422
msgid "Restart needed for changes to take effect."
msgstr "De veranderingen worden pas actief na opnieuw opstarten"
-#: src/gui/setup_video.cpp:364
+#: src/gui/setup_video.cpp:434
msgid "Changing OpenGL"
msgstr "Veranderen van OpenGL"
-#: src/gui/setup_video.cpp:365
+#: src/gui/setup_video.cpp:435
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:448
+#: src/gui/setup_video.cpp:520
msgid "Screen resolution changed"
msgstr ""
-#: src/gui/setup_video.cpp:449
+#: src/gui/setup_video.cpp:521
#, fuzzy
msgid "Restart your client for the change to take effect."
msgstr "De veranderingen worden pas actief na opnieuw opstarten"
-#: 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 ""
@@ -1540,6 +1550,10 @@ msgstr "Vaardigheden"
msgid "Mystery Skill"
msgstr ""
+#: src/gui/skill.cpp:126 src/gui/skilldialog.cpp:99 src/gui/windowmenu.cpp:62
+msgid "Skills"
+msgstr "Vaardigheden"
+
#: src/gui/skill.cpp:145 src/gui/skill.cpp:197
#, c-format
msgid "Skill points: %d"
@@ -1549,15 +1563,6 @@ msgstr ""
msgid "Up"
msgstr ""
-#: src/gui/skill.cpp:146
-msgid "inc"
-msgstr ""
-
-#: src/gui/skill.cpp:147
-#, fuzzy
-msgid "use"
-msgstr "Gebruiken"
-
#: src/gui/skilldialog.cpp:113
msgid "Weapons"
msgstr ""
@@ -1567,170 +1572,170 @@ msgstr ""
msgid "Crafts"
msgstr "Aanmaken"
-#: 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 ""
-#: src/gui/status.cpp:61
+#: src/gui/status.cpp:60
msgid "HP:"
msgstr ""
-#: src/gui/status.cpp:64
+#: src/gui/status.cpp:63
msgid "Exp:"
msgstr ""
-#: src/gui/status.cpp:67
+#: src/gui/status.cpp:66
msgid "MP:"
msgstr ""
-#: 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 "Totaal"
-#: src/gui/status.cpp:80
+#: src/gui/status.cpp:79
msgid "Cost"
msgstr "Kosten"
-#: 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 ""
-#: src/gui/status.cpp:91
+#: src/gui/status.cpp:90
#, no-c-format
msgid "% Evade:"
msgstr ""
-#: 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 ""
-#: src/gui/status.cpp:383 src/gui/status.cpp:405
+#: src/gui/status.cpp:384
#, fuzzy
msgid "Max level"
msgstr "Mannelijk"
-#: src/gui/storagewindow.cpp:53
+#: src/gui/storagewindow.cpp:54
msgid "Storage"
msgstr ""
-#: src/gui/storagewindow.cpp:64
+#: src/gui/storagewindow.cpp:65
#, fuzzy
msgid "Store"
msgstr "Stoppen"
-#: 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
#, fuzzy
msgid "Confirmed. Waiting..."
msgstr "Verbinden..."
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:53
msgid "Agree trade"
msgstr ""
-#: src/gui/trade.cpp:55
+#: src/gui/trade.cpp:54
#, fuzzy
msgid "Agreed. Waiting..."
msgstr "Actualiseren..."
-#: 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 "Toevoegen"
-#: 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
#, fuzzy, c-format
msgid "You get %s."
msgstr "Jij krijgt %d GP."
-#: src/gui/trade.cpp:97
+#: src/gui/trade.cpp:96
msgid "You give:"
msgstr "Je geeft:"
-#: src/gui/trade.cpp:101
+#: src/gui/trade.cpp:100
#, fuzzy
msgid "Change"
msgstr "Annuleren"
-#: 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 ""
@@ -1847,21 +1852,21 @@ msgstr ""
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 ""
-#: src/gui/widgets/chattab.cpp:147
+#: src/gui/widgets/chattab.cpp:146
#, fuzzy, c-format
msgid "%s whispers: "
msgstr "%s fluistert:"
-#: src/gui/widgets/chattab.cpp:241 src/resources/itemdb.cpp:108
+#: src/gui/widgets/chattab.cpp:240 src/resources/itemdb.cpp:107
#, fuzzy
msgid "Unknown item"
msgstr "Onbekende opdracht"
@@ -1870,24 +1875,36 @@ msgstr "Onbekende opdracht"
msgid "Cannot send empty chat!"
msgstr ""
-#: src/gui/widgets/whispertab.cpp:55
-#, c-format
-msgid "%s: %s"
-msgstr ""
-
-#: src/gui/widgets/whispertab.cpp:69
+#: src/gui/widgets/whispertab.cpp:68
msgid "/close > Close the whisper tab"
msgstr ""
-#: src/gui/widgets/whispertab.cpp:79
+#: src/gui/widgets/whispertab.cpp:78
#, fuzzy
msgid "Command: /close"
msgstr "Commando: /clear"
-#: 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 "Status"
+
+#: src/gui/windowmenu.cpp:65
+msgid "Guilds"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:66
+#, fuzzy
+msgid "Buddys"
+msgstr "Kopen"
+
+#: src/gui/windowmenu.cpp:68
+msgid "Shortcut"
+msgstr "Sneltoets"
+
#: src/keyboardconfig.cpp:41
msgid "Move Up"
msgstr ""
@@ -2019,7 +2036,7 @@ msgstr "Vensters in beginstand"
#: src/keyboardconfig.cpp:80
#, fuzzy
-msgid "Emote Window"
+msgid "Party Window"
msgstr "Vensters in beginstand"
#: src/keyboardconfig.cpp:81
@@ -2070,166 +2087,170 @@ msgstr ""
msgid "Ignore input 2"
msgstr ""
-#: src/localplayer.cpp:849
+#: src/localplayer.cpp:834
#, fuzzy
msgid "Unarmed"
msgstr "Naamloos"
-#: src/localplayer.cpp:850
+#: src/localplayer.cpp:835
msgid "Knife"
msgstr ""
-#: src/localplayer.cpp:851
+#: src/localplayer.cpp:836
#, fuzzy
msgid "Sword"
msgstr "Geluid"
-#: 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
#, fuzzy
msgid "Bow"
msgstr "laag"
-#: src/localplayer.cpp:856
+#: src/localplayer.cpp:841
msgid "Shooting"
msgstr ""
-#: src/localplayer.cpp:857
+#: src/localplayer.cpp:842
#, fuzzy
msgid "Mace"
msgstr "Mannelijk"
-#: 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
#, fuzzy
msgid "Craft"
msgstr "Aanmaken"
-#: 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 ""
-#: src/main.cpp:563
-msgid "Options: "
-msgstr ""
-
-#: src/main.cpp:564
-msgid " -C --configfile : Configuration file to use"
-msgstr ""
-
-#: src/main.cpp:565
-msgid " -d --data : Directory to load game data from"
-msgstr ""
-
-#: src/main.cpp:566
-msgid " -D --default : Bypass the login process with default settings"
+#: src/main.cpp:567
+msgid "Options:"
msgstr ""
#: src/main.cpp:568
-msgid " -h --help : Display this help"
+msgid " -C --config-file : Configuration file to use"
msgstr ""
#: src/main.cpp:569
-msgid " -S --homedir : Directory to use as home directory"
+msgid " -d --data : Directory to load game data from"
msgstr ""
#: src/main.cpp:570
-msgid " -H --updatehost : Use this update host"
-msgstr ""
-
-#: src/main.cpp:571
-msgid " -P --password : Login with this password"
+msgid " -D --default : Choose default character server and character"
msgstr ""
#: src/main.cpp:572
-msgid " -c --character : Login with this character"
+msgid " -h --help : Display this help"
msgstr ""
#: src/main.cpp:573
-msgid " -o --port : Login Server Port"
+msgid " -S --home-dir : Directory to use as home directory"
msgstr ""
#: src/main.cpp:574
-msgid " -s --server : Login Server name or IP"
+msgid " -H --update-host : Use this update host"
msgstr ""
#: src/main.cpp:575
-msgid " -u --skipupdate : Skip the update downloads"
+msgid " -P --password : Login with this password"
msgstr ""
#: src/main.cpp:576
-msgid " -U --username : Login with this username"
+msgid " -c --character : Login with this character"
msgstr ""
#: src/main.cpp:577
-msgid " -v --version : Display the version"
+msgid " -p --port : Login Server Port"
+msgstr ""
+
+#: src/main.cpp:578
+msgid " -s --server : Login Server name or IP"
+msgstr ""
+
+#: src/main.cpp:579
+msgid " -u --skip-update : Skip the update downloads"
+msgstr ""
+
+#: src/main.cpp:580
+msgid " -U --username : Login with this username"
msgstr ""
#: src/main.cpp:582
+msgid " -O --no-opengl : Disable OpenGL for this session"
+msgstr ""
+
+#: src/main.cpp:584
+msgid " -v --version : Display the version"
+msgstr ""
+
+#: src/main.cpp:589
#, fuzzy
msgid "The Mana World "
msgstr "Kies uw Mana World server"
-#: src/main.cpp:1499
+#: src/main.cpp:1515
msgid "Connecting to map server..."
msgstr "Verbinden met de map server..."
-#: src/main.cpp:1507
+#: src/main.cpp:1523
msgid "Connecting to character server..."
msgstr "Verbinden met de karakter server..."
-#: src/main.cpp:1515
+#: src/main.cpp:1531
msgid "Connecting to account server..."
msgstr "Verbinden met de account server..."
-#: src/net/ea/adminhandler.cpp:67
+#: src/net/ea/adminhandler.cpp:66
#, fuzzy
msgid "Kick failed!"
msgstr "Zitten niet mogelijk!"
-#: src/net/ea/adminhandler.cpp:69
+#: src/net/ea/adminhandler.cpp:68
msgid "Kick succeeded!"
msgstr ""
@@ -2311,18 +2332,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 ""
@@ -2335,425 +2356,439 @@ msgstr "Afdoen"
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 ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: src/net/ea/generalhandler.cpp:100
+#: src/net/ea/generalhandler.cpp:102
#, c-format
msgid "Luck: %d"
msgstr ""
-#: 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 ""
-#: 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 "De verbinding met de server werd verbroken!"
-#: src/net/ea/gui/partytab.cpp:54
+#: src/net/ea/gui/partytab.cpp:52
+msgid "/help > Display this help."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:53
msgid "/create > Create a new party"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:55
+#: src/net/ea/gui/partytab.cpp:54
msgid "/new > Alias of create"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:56
+#: src/net/ea/gui/partytab.cpp:55
msgid "/invite > Invite a player to your party"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:57
+#: src/net/ea/gui/partytab.cpp:56
msgid "/leave > Leave the party you are in"
msgstr ""
-#: 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 ""
-#: src/net/ea/gui/partytab.cpp:59
+#: src/net/ea/gui/partytab.cpp:58
msgid "/item > Show/change party item sharing options"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:60
+#: src/net/ea/gui/partytab.cpp:59
msgid "/exp > Show/change party experience sharing options"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:69
+#: src/net/ea/gui/partytab.cpp:68
#, fuzzy
msgid "Command: /new <party-name>"
msgstr "Commando: /announce <msg>"
-#: src/net/ea/gui/partytab.cpp:70
+#: src/net/ea/gui/partytab.cpp:69
#, fuzzy
msgid "Command: /create <party-name>"
msgstr "Commando: /clear"
-#: 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 ""
-#: src/net/ea/gui/partytab.cpp:75
+#: src/net/ea/gui/partytab.cpp:74
#, fuzzy
msgid "Command: /invite <nick>"
msgstr "Commando: /announce <msg>"
-#: src/net/ea/gui/partytab.cpp:82
+#: src/net/ea/gui/partytab.cpp:81
#, fuzzy
msgid "Command: /leave"
msgstr "Commando: /clear"
-#: 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
#, fuzzy
msgid "Command: /item <policy>"
msgstr "Commando: /help"
-#: 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."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:92
+#: src/net/ea/gui/partytab.cpp:91
#, fuzzy
msgid "Command: /item"
msgstr "Commando: /help"
-#: 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
#, fuzzy
msgid "Command: /exp <policy>"
msgstr "Commando: /help <commando>"
-#: 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."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:102
+#: src/net/ea/gui/partytab.cpp:101
#, fuzzy
msgid "Command: /exp"
msgstr "Commando: /help"
-#: 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]"
+msgid "You picked up %s [@@%d|%s@@]"
msgstr ""
-#: 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
#, fuzzy
msgid "Unregistered ID"
msgstr "Registreren"
-#: src/net/ea/loginhandler.cpp:114
+#: src/net/ea/loginhandler.cpp:113
#, fuzzy
msgid "Wrong password"
msgstr "Wachtwoord:"
-#: 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
#, fuzzy
msgid "Rejected from server"
msgstr "De verbinding met de server werd verbroken!"
-#: 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 ""
-#: 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"
" Please contact the GM team via the forums."
msgstr ""
-#: 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
#, fuzzy
msgid "Unknown error"
msgstr "Onbekende opdracht"
-#: src/net/ea/partyhandler.cpp:78
-msgid "Party successfully created."
+#: src/net/ea/partyhandler.cpp:77
+msgid "Could not create party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:82
-msgid "Could not create party."
+#: src/net/ea/partyhandler.cpp:80
+msgid "Party successfully created."
msgstr ""
-#: src/net/ea/partyhandler.cpp:112
+#: src/net/ea/partyhandler.cpp:115
#, c-format
msgid "%s is already a member of a party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:116
+#: src/net/ea/partyhandler.cpp:119
#, c-format
msgid "%s refused your invitation."
msgstr ""
-#: src/net/ea/partyhandler.cpp:120
+#: src/net/ea/partyhandler.cpp:123
#, c-format
msgid "%s is now a member of your party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:124
+#: src/net/ea/partyhandler.cpp:127
#, c-format
msgid "Unknown invite response for %s."
msgstr ""
-#: 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 ""
-#: src/net/ea/partyhandler.cpp:269
+#: src/net/ea/partyhandler.cpp:272
#, c-format
msgid "An unknown member tried to say: %s"
msgstr ""
-#: 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 ""
-#: 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"
+#: 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 ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
@@ -2913,40 +2948,98 @@ msgstr ""
msgid "Willpower:"
msgstr "Wilskracht:"
-#: 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
#, fuzzy, c-format
msgid "Willpower: %d"
msgstr "Wilskracht:"
-#: 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
+#, fuzzy
+msgid "Server is full"
+msgstr "Server:"
+
+#: 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 ""
+
+#: src/net/tmwserv/loginhandler.cpp:143
+msgid "Old email address incorrect"
+msgstr ""
+
+#: src/net/tmwserv/loginhandler.cpp:149
+msgid "The new Email Address already exists."
+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 "Wachtwoord:"
+
+#: src/net/tmwserv/loginhandler.cpp:211
+msgid "Wrong username, password or email address"
+msgstr ""
+
+#: src/net/tmwserv/loginhandler.cpp:214
+msgid "Username already exists"
+msgstr ""
+
+#: src/net/tmwserv/loginhandler.cpp:217
+msgid "Email address already exists"
+msgstr ""
+
+#: src/resources/itemdb.cpp:52
#, c-format
msgid "Attack %+d"
msgstr ""
-#: src/resources/itemdb.cpp:54
+#: src/resources/itemdb.cpp:53
#, c-format
msgid "Defense %+d"
msgstr ""
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:54
#, c-format
msgid "HP %+d"
msgstr ""
-#: src/resources/itemdb.cpp:56
+#: src/resources/itemdb.cpp:55
#, c-format
msgid "MP %+d"
msgstr ""
-#: src/resources/itemdb.cpp:113
+#: src/resources/itemdb.cpp:112
msgid "items.xml"
msgstr ""
-#: src/resources/itemdb.cpp:151
+#: src/resources/itemdb.cpp:150
msgid "Unnamed"
msgstr "Naamloos"
@@ -2963,6 +3056,23 @@ msgstr ""
msgid "NPC Database: Error while loading npcs.xml!"
msgstr ""
+#~ msgid "MiniMap"
+#~ msgstr "Kaartje"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "> Cancel\n"
+#~ msgstr "Annuleren"
+
+#, fuzzy
+#~ msgid "use"
+#~ msgstr "Gebruiken"
+
+#, fuzzy
+#~ msgid "Emote Window"
+#~ msgstr "Vensters in beginstand"
+
#~ msgid "Gold: %d"
#~ msgstr "Goud: %d"
diff --git a/po/pl.po b/po/pl.po
index 537c0206..963f00c8 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: The Mana World 0.1.0\n"
"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-04-21 17:27+0200\n"
+"POT-Creation-Date: 2009-05-10 15:53+0200\n"
"PO-Revision-Date: 2009-01-27 17:06+0000\n"
"Last-Translator: Krzysztof Daszuta <irukard@gmail.com>\n"
"Language-Team: <pl@li.org>\n"
@@ -19,312 +19,312 @@ msgstr ""
"X-Launchpad-Export-Date: 2009-02-12 19:04+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
-#: src/commandhandler.cpp:142
+#: src/commandhandler.cpp:141
msgid "-- Help --"
msgstr "-- Pomoc --"
-#: src/commandhandler.cpp:143 src/net/ea/gui/partytab.cpp:53
+#: src/commandhandler.cpp:142
#, fuzzy
-msgid "/help > Display this help."
+msgid "/help > Display this help"
msgstr "/help: Wyświetla pomoc"
-#: src/commandhandler.cpp:145
+#: src/commandhandler.cpp:144
#, fuzzy
msgid "/where > Display map name"
msgstr "/where: Wyświetla nazwę mapy"
-#: src/commandhandler.cpp:146
+#: src/commandhandler.cpp:145
#, fuzzy
msgid "/who > Display number of online users"
msgstr "/who: Wyświetla liczbę połączonych graczy"
-#: src/commandhandler.cpp:147
+#: src/commandhandler.cpp:146
msgid "/me > Tell something about yourself"
msgstr ""
-#: src/commandhandler.cpp:149
+#: src/commandhandler.cpp:148
#, fuzzy
msgid "/clear > Clears this window"
msgstr "/clear: Czyści okno"
-#: src/commandhandler.cpp:151
+#: src/commandhandler.cpp:150
#, fuzzy
msgid "/msg > Send a private message to a user"
msgstr "/whisper <postać> <wiadomość>: Wysyła prywatną <wiadomość> do <postać>"
-#: src/commandhandler.cpp:152
+#: src/commandhandler.cpp:151
msgid "/whisper > Alias of msg"
msgstr ""
-#: src/commandhandler.cpp:153
+#: src/commandhandler.cpp:152
msgid "/w > Alias of msg"
msgstr ""
-#: src/commandhandler.cpp:154
+#: src/commandhandler.cpp:153
msgid "/query > Makes a tab for private messages with another user"
msgstr ""
-#: src/commandhandler.cpp:155
+#: src/commandhandler.cpp:154
msgid "/q > Alias of query"
msgstr ""
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:156
msgid "/list > Display all public channels"
msgstr ""
-#: src/commandhandler.cpp:158
+#: src/commandhandler.cpp:157
msgid "/join > Join or create a channel"
msgstr ""
-#: src/commandhandler.cpp:160
+#: src/commandhandler.cpp:159
msgid "/party > Invite a user to party"
msgstr ""
-#: src/commandhandler.cpp:162
+#: src/commandhandler.cpp:161
msgid "/record > Start recording the chat to an external file"
msgstr ""
-#: 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 ""
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:165
#, fuzzy
msgid "/announce > Global announcement (GM only)"
msgstr "/announce: Ogłoszenie ogólne (tylko GM)"
-#: src/commandhandler.cpp:170
+#: src/commandhandler.cpp:169
msgid "For more information, type /help <command>"
msgstr "Aby uzyskać więcej informacji wpisz /help <komenda>"
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:173
msgid "Command: /help"
msgstr "Komenda: /help"
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:174
msgid "This command displays a list of all commands available."
msgstr "Ta komenda wyświetla listę dostępnych komend."
-#: src/commandhandler.cpp:176
+#: src/commandhandler.cpp:175
msgid "Command: /help <command>"
msgstr "Komenda: /help <komenda>"
-#: src/commandhandler.cpp:177
+#: src/commandhandler.cpp:176
msgid "This command displays help on <command>."
msgstr "Ta komenda wyświetla pomoc dotyczącą <komenda>"
-#: src/commandhandler.cpp:185
+#: src/commandhandler.cpp:184
msgid "Command: /announce <msg>"
msgstr "Komenda: /announce <wiadomość>"
-#: src/commandhandler.cpp:186
+#: src/commandhandler.cpp:185
msgid "*** only available to a GM ***"
msgstr "*** dostępne tylko dla GM ***"
-#: src/commandhandler.cpp:187
+#: src/commandhandler.cpp:186
msgid "This command sends the message <msg> to all players currently online."
msgstr ""
"Ta komenda wysyła wiadomość <wiadomość> to wszystkich połączonych graczy."
-#: src/commandhandler.cpp:192
+#: src/commandhandler.cpp:191
msgid "Command: /clear"
msgstr "Komenda: /clear"
-#: src/commandhandler.cpp:193
+#: src/commandhandler.cpp:192
msgid "This command clears the chat log of previous chat."
msgstr "Ta komenda czyści zawartość okna."
-#: src/commandhandler.cpp:197
+#: src/commandhandler.cpp:196
#, fuzzy
msgid "Command: /join <channel>"
msgstr "Komenda: /help"
-#: src/commandhandler.cpp:198
+#: src/commandhandler.cpp:197
#, fuzzy
msgid "This command makes you enter <channel>."
msgstr "Ta komenda wyświetla pomoc dotyczącą <komenda>"
-#: 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
#, fuzzy
msgid "Command: /list"
msgstr "Komenda: /help"
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:203
#, fuzzy
msgid "This command shows a list of all channels."
msgstr "Ta komenda wyświetla listę dostępnych komend."
-#: src/commandhandler.cpp:208
+#: src/commandhandler.cpp:207
#, fuzzy
msgid "Command: /me <message>"
msgstr "Komenda: /announce <wiadomość>"
-#: src/commandhandler.cpp:209
+#: src/commandhandler.cpp:208
msgid "This command tell others you are (doing) <msg>."
msgstr ""
-#: src/commandhandler.cpp:213
+#: src/commandhandler.cpp:212
#, fuzzy
msgid "Command: /msg <nick> <message>"
msgstr "Komenda: /w <postać> <wiadomość>"
-#: src/commandhandler.cpp:214
+#: src/commandhandler.cpp:213
#, fuzzy
msgid "Command: /whisper <nick> <message>"
msgstr "Komenda: /whisper <postać> <wiadomość>"
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:214
#, fuzzy
msgid "Command: /w <nick> <message>"
msgstr "Komenda: /w <postać> <wiadomość>"
-#: src/commandhandler.cpp:216
+#: src/commandhandler.cpp:215
#, fuzzy
msgid "This command sends the text <message> to <nick>."
msgstr "Ta komenda wysyła wiadomość <wiadomość> do <postać>"
-#: 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 "Jeżeli <postać> ma spacje należy ją zapisać w cudzysłowie (\")"
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:221
#, fuzzy
msgid "Command: /query <nick>"
msgstr "Komenda: /w <postać> <wiadomość>"
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:222
#, fuzzy
msgid "Command: /q <nick>"
msgstr "Komenda: /w <postać> <wiadomość>"
-#: src/commandhandler.cpp:224
+#: src/commandhandler.cpp:223
msgid "This command tries to make a tab for whispers betweenyou and <nick>."
msgstr ""
-#: src/commandhandler.cpp:229
+#: src/commandhandler.cpp:228
#, fuzzy
msgid "Command: /party <nick>"
msgstr "Komenda: /w <postać> <wiadomość>"
-#: 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 ""
-#: src/commandhandler.cpp:236
+#: src/commandhandler.cpp:235
#, fuzzy
msgid "Command: /present"
msgstr "Komenda: /where"
-#: 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
#, fuzzy
msgid "Command: /record <filename>"
msgstr "Komenda: /clear"
-#: src/commandhandler.cpp:244
+#: src/commandhandler.cpp:243
#, fuzzy
msgid "This command starts recording the chat log to the file <filename>."
msgstr "Ta komenda czyści zawartość okna."
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:245
#, fuzzy
msgid "Command: /record"
msgstr "Komenda: /clear"
-#: src/commandhandler.cpp:247
+#: src/commandhandler.cpp:246
msgid "This command finishes a recording session."
msgstr ""
-#: src/commandhandler.cpp:251
+#: src/commandhandler.cpp:250
#, fuzzy
msgid "Command: /toggle <state>"
msgstr "Komenda: /announce <wiadomość>"
-#: 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 ""
-#: src/commandhandler.cpp:257
+#: src/commandhandler.cpp:256
#, fuzzy
msgid "Command: /toggle"
msgstr "Komenda: /clear"
-#: src/commandhandler.cpp:258
+#: src/commandhandler.cpp:257
#, fuzzy
msgid "This command displays the return toggle status."
msgstr "Ta komenda wyświetla nazwę aktualnej mapy."
-#: src/commandhandler.cpp:262
+#: src/commandhandler.cpp:261
msgid "Command: /where"
msgstr "Komenda: /where"
-#: src/commandhandler.cpp:263
+#: src/commandhandler.cpp:262
msgid "This command displays the name of the current map."
msgstr "Ta komenda wyświetla nazwę aktualnej mapy."
-#: src/commandhandler.cpp:267
+#: src/commandhandler.cpp:266
msgid "Command: /who"
msgstr "Komenda: /who"
-#: src/commandhandler.cpp:268
+#: src/commandhandler.cpp:267
msgid "This command displays the number of players currently online."
msgstr "Ta komenda wyświetla liczbę połączonych graczy."
-#: src/commandhandler.cpp:273
+#: src/commandhandler.cpp:272
msgid "Unknown command."
msgstr "Nieznane polecenie."
-#: src/commandhandler.cpp:274
+#: src/commandhandler.cpp:273
msgid "Type /help for a list of commands."
msgstr "Wpisz /help aby usyskać listę komend."
-#: src/commandhandler.cpp:336
-msgid "Cannont send empty whispers!"
+#: 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 ""
-#: 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 ""
@@ -333,46 +333,46 @@ msgstr ""
msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
msgstr ""
-#: 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"
+#: src/game.cpp:481
+msgid "The connection to the server was lost, the program will now quit"
msgstr ""
-#: src/game.cpp:493
-msgid "The connection to the server was lost, the program will now quit"
+#: src/game.cpp:487
+msgid "Network Error"
msgstr ""
-#: src/game.cpp:664 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
+#: 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 "Wyjdź"
-#: src/game.cpp:665
+#: src/game.cpp:647
#, fuzzy
msgid "Are you sure you want to quit?"
msgstr "Czy jesteś pewien, że chcesz usunąć tę postać?"
-#: 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 ""
@@ -385,12 +385,12 @@ msgstr "Kup"
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 "Kup"
#: 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
#, fuzzy, c-format
msgid "Price: %s / Total: %s"
msgstr "Cena: %d GP / Razem: %d GP"
@@ -401,13 +401,13 @@ msgid "Max"
msgstr "max"
#: 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 "Opis: %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 "Efekt: %s"
@@ -416,204 +416,212 @@ msgstr "Efekt: %s"
msgid "Shop"
msgstr "Sklep"
-#: 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 "Sprzedaj"
-#: 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 "Anuluj"
-#: 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 ""
-#: 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 "Zmień hasło"
-#: 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 "Hasło:"
-#: 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 "Stwórz postać"
-#: 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 "Imię:"
-#: src/gui/charcreatedialog.cpp:70
+#: src/gui/charcreatedialog.cpp:69
msgid "Hair Color:"
msgstr "Kolor włosów:"
-#: src/gui/charcreatedialog.cpp:73
+#: src/gui/charcreatedialog.cpp:72
msgid "Hair Style:"
msgstr "Fryzura:"
-#: src/gui/charcreatedialog.cpp:74
+#: src/gui/charcreatedialog.cpp:73
msgid "Create"
msgstr "Stwórz"
-#: src/gui/charcreatedialog.cpp:76 src/gui/register.cpp:75
+#: src/gui/charcreatedialog.cpp:75 src/gui/register.cpp:75
msgid "Male"
msgstr "Mężczyzna"
-#: src/gui/charcreatedialog.cpp:77 src/gui/register.cpp:76
+#: src/gui/charcreatedialog.cpp:76 src/gui/register.cpp:76
msgid "Female"
msgstr "Kobieta"
-#: 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 "Proszę wykorzystać %d punktów"
-#: 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 "Błąd"
-#: src/gui/charcreatedialog.cpp:174
+#: src/gui/charcreatedialog.cpp:173
msgid "Your name needs to be at least 4 characters."
msgstr "Twoje imię musi mieć conajmniej 4 znaki."
-#: src/gui/charcreatedialog.cpp:227
+#: src/gui/charcreatedialog.cpp:226
msgid "Character stats OK"
msgstr "Statystyki postaci w porządku."
-#: src/gui/charcreatedialog.cpp:239
+#: src/gui/charcreatedialog.cpp:238
#, c-format
msgid "Please remove %d points"
msgstr "Proszę usunąć %d punktów"
-#: src/gui/char_select.cpp:79
+#: src/gui/charselectdialog.cpp:78
msgid "Confirm Character Delete"
msgstr "Potwierdź usunięcie postaci"
-#: src/gui/char_select.cpp:80
+#: src/gui/charselectdialog.cpp:79
msgid "Are you sure you want to delete this character?"
msgstr "Czy jesteś pewien, że chcesz usunąć tę postać?"
-#: 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 "Wybierz postać"
-#: 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 "Ok"
-#: src/gui/char_select.cpp:113
+#: src/gui/charselectdialog.cpp:112
msgid "Previous"
msgstr "Poprzedni"
-#: 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 "Następny"
-#: 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 "Imię: %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 "Poziom: %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 "Nowa"
-#: 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 "Usuń"
-#: src/gui/char_select.cpp:120 src/gui/unregisterdialog.cpp:51
+#: src/gui/charselectdialog.cpp:119 src/gui/unregisterdialog.cpp:52
msgid "Unregister"
msgstr "Wyrejestruj"
-#: src/gui/char_select.cpp:127
+#: src/gui/charselectdialog.cpp:126
#, c-format
msgid "Money: %d"
msgstr "Pieniądze: %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 ""
-#: 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
#, fuzzy, c-format
msgid "Money: %s"
msgstr "Pieniądze: %d"
-#: 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
#, fuzzy
msgid "Chat"
msgstr "Stwórz"
-#: src/gui/chat.cpp:341 src/gui/chat.cpp:347
+#: src/gui/chat.cpp:332
+#, c-format
+msgid "%d players are present."
+msgstr ""
+
+#: 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 "Szepczesz do %s: %s"
-#: src/gui/confirm_dialog.cpp:42
+#: src/gui/confirmdialog.cpp:42
msgid "Yes"
msgstr "Tak"
-#: src/gui/confirm_dialog.cpp:43
+#: src/gui/confirmdialog.cpp:43
msgid "No"
msgstr "Nie"
@@ -621,26 +629,16 @@ msgstr "Nie"
msgid "Connecting..."
msgstr "Łączenie..."
-#: src/gui/emotecontainer.cpp:61
+#: src/gui/emotepopup.cpp:64
msgid "Unable to load selection.png"
msgstr ""
-#: 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 "Użyj"
-
-#: src/gui/equipmentwindow.cpp:68 src/gui/menuwindow.cpp:67
+#: src/gui/equipmentwindow.cpp:68 src/gui/windowmenu.cpp:60
msgid "Equipment"
msgstr "Ekwipunek"
-#: 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 "Zdejmij"
@@ -665,102 +663,105 @@ msgstr ""
msgid "Help"
msgstr "Pomoc"
-#: 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 "Zamknij"
-#: src/gui/inventorywindow.cpp:51 src/gui/menuwindow.cpp:68
+#: src/gui/inventorywindow.cpp:54 src/gui/windowmenu.cpp:61
msgid "Inventory"
msgstr "Inwentarz"
-#: 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 "Załóż"
-#: 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 "Użyj"
+
+#: src/gui/inventorywindow.cpp:80
msgid "Drop"
msgstr "Upuść"
-#: src/gui/inventorywindow.cpp:79
+#: src/gui/inventorywindow.cpp:81
msgid "Split"
msgstr "Podziel"
-#: src/gui/inventorywindow.cpp:93
+#: src/gui/inventorywindow.cpp:92
msgid "Slots:"
msgstr ""
-#: src/gui/inventorywindow.cpp:94
+#: src/gui/inventorywindow.cpp:93
#, fuzzy
msgid "Weight:"
msgstr "Ciężar: %d / %d"
-#: 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 "Wybierz ilość przedmiotów do wymiany."
-#: src/gui/item_amount.cpp:95
+#: src/gui/itemamount.cpp:124
msgid "Select amount of items to drop."
msgstr "Wybierz ilość przedmiotów do upuszczenia."
-#: src/gui/item_amount.cpp:98
+#: src/gui/itemamount.cpp:127
#, fuzzy
msgid "Select amount of items to store."
msgstr "Wybierz ilość przedmiotów do wymiany."
-#: src/gui/item_amount.cpp:101
+#: src/gui/itemamount.cpp:130
#, fuzzy
msgid "Select amount of items to retrieve."
msgstr "Wybierz ilość przedmiotów do wymiany."
-#: src/gui/item_amount.cpp:104
+#: src/gui/itemamount.cpp:133
msgid "Select amount of items to split."
msgstr "Wybierz ilość przedmiotów do podziału."
-#: src/gui/itempopup.cpp:89
+#: src/gui/itempopup.cpp:91
#, fuzzy
msgid "Weight: "
msgstr "Ciężar: %d / %d"
-#: src/gui/login.cpp:47
+#: src/gui/login.cpp:48
msgid "Login"
msgstr "Użytkownik"
-#: 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 "Serwer:"
-#: 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:"
-#: src/gui/login.cpp:55
+#: src/gui/login.cpp:56
#, fuzzy
msgid "Recent:"
msgstr "Rejestruj"
-#: src/gui/login.cpp:72
+#: src/gui/login.cpp:73
msgid "Remember Username"
msgstr "Zapamiętaj użytkownika"
-#: 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 "Ok"
-#: 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 "Rejestruj"
-#: 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 ""
@@ -776,71 +777,44 @@ msgstr ""
msgid "Cast Test Spell 3"
msgstr ""
-#: src/gui/menuwindow.cpp:66
-msgid "Status"
-msgstr "Stan"
-
-#: src/gui/menuwindow.cpp:69 src/gui/skill.cpp:126 src/gui/skilldialog.cpp:99
-msgid "Skills"
-msgstr "Zdolności"
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
+#, fuzzy
+msgid "Map"
+msgstr "max"
-#: src/gui/menuwindow.cpp:72
-msgid "Guilds"
+#: src/gui/npcdialog.cpp:43
+msgid "Waiting for server"
msgstr ""
-#: src/gui/menuwindow.cpp:73
+#: src/gui/npcdialog.cpp:46
#, fuzzy
-msgid "Buddys"
-msgstr "Kup"
-
-#: src/gui/menuwindow.cpp:75
-msgid "Shortcut"
-msgstr "Skrót"
+msgid "Submit"
+msgstr "Podziel"
-#: src/gui/menuwindow.cpp:77 src/gui/setup.cpp:65 src/main.cpp:920
-msgid "Setup"
-msgstr "Konfiguracja"
+#: src/gui/npcdialog.cpp:49 src/gui/npcpostdialog.cpp:39
+msgid "NPC"
+msgstr "NPC"
-#: src/gui/minimap.cpp:39
-msgid "MiniMap"
-msgstr "MiniMapa"
+#: src/gui/npcdialog.cpp:95
+msgid "+"
+msgstr ""
-#: src/gui/npcintegerdialog.cpp:39
-msgid "NPC Number Request"
+#: src/gui/npcdialog.cpp:96
+msgid "-"
msgstr ""
-#: src/gui/npcintegerdialog.cpp:50
+#: src/gui/npcdialog.cpp:105
#, fuzzy
msgid "Reset"
msgstr "Rejestruj"
-#: src/gui/npcintegerdialog.cpp:101 src/gui/npclistdialog.cpp:123
-#: src/gui/npcstringdialog.cpp:75
-#, fuzzy
-msgid ""
-"\n"
-"> Cancel\n"
-msgstr "Anuluj"
-
-#: src/gui/npcpostdialog.cpp:39 src/gui/npc_text.cpp:37
-msgid "NPC"
-msgstr "NPC"
-
#: src/gui/npcpostdialog.cpp:51
#, fuzzy
msgid "Send"
msgstr "Dźwięk"
-#: src/gui/npcstringdialog.cpp:39
-msgid "NPC Text Request"
-msgstr ""
-
-#: 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
#, fuzzy
msgid "Text"
msgstr "Następny"
@@ -897,7 +871,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
#, fuzzy
msgid "Party"
msgstr "Graj"
@@ -920,7 +894,7 @@ msgid "Being"
msgstr ""
#: src/gui/palette.cpp:104
-msgid "Other Player's Names"
+msgid "Other Players' Names"
msgstr ""
#: src/gui/palette.cpp:105
@@ -947,21 +921,22 @@ msgid "Unknown Item Type"
msgstr ""
#: src/gui/palette.cpp:111
-msgid "Generic"
+msgid "Generics"
msgstr ""
#: src/gui/palette.cpp:112
-msgid "Hat"
-msgstr ""
+#, fuzzy
+msgid "Hats"
+msgstr "Statystyki"
#: src/gui/palette.cpp:113
#, fuzzy
-msgid "Usable"
+msgid "Usables"
msgstr "Użyj"
#: src/gui/palette.cpp:114
#, fuzzy
-msgid "Shirt"
+msgid "Shirts"
msgstr "Skrót"
#: src/gui/palette.cpp:115
@@ -984,15 +959,15 @@ msgstr ""
#: src/gui/palette.cpp:119
#, fuzzy
-msgid "Shield"
+msgid "Shields"
msgstr "Sprzedaj"
#: src/gui/palette.cpp:120
-msgid "Ring"
+msgid "Rings"
msgstr ""
#: src/gui/palette.cpp:121
-msgid "Necklace"
+msgid "Necklaces"
msgstr ""
#: src/gui/palette.cpp:122
@@ -1049,94 +1024,103 @@ msgstr ""
msgid "1/4 HP Bar"
msgstr ""
-#: src/gui/popupmenu.cpp:73
+#: src/gui/popupmenu.cpp:75
msgid "@@name|Add name to chat@@"
msgstr ""
-#: src/gui/popupmenu.cpp:85
+#: src/gui/popupmenu.cpp:87
#, c-format
msgid "@@trade|Trade With %s@@"
msgstr "@@trade|Targ z %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 "@@attack|Atakuj %s@@"
-#: src/gui/popupmenu.cpp:92
+#: src/gui/popupmenu.cpp:94
#, c-format
msgid "@@friend|Befriend %s@@"
msgstr ""
-#: 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 ""
-#: src/gui/popupmenu.cpp:112
+#: src/gui/popupmenu.cpp:114
#, c-format
msgid "@@party|Invite %s to join your party@@"
msgstr ""
-#: src/gui/popupmenu.cpp:123
+#: src/gui/popupmenu.cpp:125
#, fuzzy, c-format
msgid "@@talk|Talk To %s@@"
msgstr "@@talk|Rozmawiaj z NPC@@"
-#: 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 "@@cancel|Anuluj@@"
-#: src/gui/popupmenu.cpp:155
-#, c-format
-msgid "@@pickup|Pick Up %s@@"
+#: src/gui/popupmenu.cpp:157
+#, fuzzy, c-format
+msgid "@@pickup|Pick up %s@@"
msgstr "@@pickup|Podnieś %s@@"
-#: src/gui/popupmenu.cpp:156 src/gui/popupmenu.cpp:352
-msgid "@@chat|Add to Chat@@"
+#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:373
+msgid "@@chat|Add to chat@@"
msgstr ""
-#: src/gui/popupmenu.cpp:336 src/gui/popupmenu.cpp:341
-msgid "@@use|Equip@@"
-msgstr "@@use|Załóż@@"
-
-#: 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 "@@use|Załóż@@"
+
+#: src/gui/popupmenu.cpp:353
msgid "@@use|Use@@"
msgstr "@@use|Użyj@@"
-#: src/gui/popupmenu.cpp:347
+#: src/gui/popupmenu.cpp:355
msgid "@@drop|Drop@@"
msgstr "@@drop|Upuść@@"
-#: src/gui/popupmenu.cpp:350
+#: src/gui/popupmenu.cpp:359
msgid "@@split|Split@@"
msgstr "@@split|Rozdziel@@"
+#: src/gui/popupmenu.cpp:364
+#, fuzzy
+msgid "@@store|Store@@"
+msgstr "@@use|Użyj@@"
+
+#: src/gui/popupmenu.cpp:371
+msgid "@@retrieve|Retrieve@@"
+msgstr ""
+
#: src/gui/quitdialog.cpp:37
msgid "Switch server"
msgstr "Zmień serwer"
@@ -1206,19 +1190,31 @@ msgstr "Hasło nie może mieć więcej jak %d znaków."
msgid "Passwords do not match."
msgstr "Hasła nie zgadzają się."
-#: src/gui/serverdialog.cpp:73
+#: src/gui/serverdialog.cpp:74
#, fuzzy
msgid "Choose your server"
msgstr "Wybierz serwer Mana World"
-#: src/gui/serverdialog.cpp:163
+#: src/gui/serverdialog.cpp:164
msgid "Please type both the address and the port of a server."
msgstr "Proszę wpisać adres i port serwera"
-#: src/gui/serverselectdialog.cpp:50
+#: src/gui/serverselectdialog.cpp:59
msgid "Select Server"
msgstr "Wybierz serwer"
+#: src/gui/setup.cpp:64 src/gui/windowmenu.cpp:69 src/main.cpp:933
+msgid "Setup"
+msgstr "Konfiguracja"
+
+#: src/gui/setup.cpp:72
+msgid "Apply"
+msgstr "Zastosuj"
+
+#: src/gui/setup.cpp:72
+msgid "Reset Windows"
+msgstr "Zresetuj okna"
+
#: src/gui/setup_audio.cpp:41
msgid "Sound"
msgstr "Dźwięk"
@@ -1235,11 +1231,11 @@ msgstr "Głośność efektów dźwiękowych"
msgid "Music volume"
msgstr "Głośność muzyki"
-#: 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
#, fuzzy
msgid "Colors"
msgstr "Zamknij"
@@ -1248,24 +1244,24 @@ msgstr "Zamknij"
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
#, fuzzy
msgid "Static"
msgstr "Statystyki"
#: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:431
#, fuzzy
msgid "Pulse"
msgstr "Zamknij"
#: 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
#, fuzzy
msgid "Spectrum"
msgstr "Konfiguracja"
@@ -1274,26 +1270,18 @@ msgstr "Konfiguracja"
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 "Zastosuj"
-
-#: src/gui/setup.cpp:73
-msgid "Reset Windows"
-msgstr "Zresetuj okna"
-
#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:78
msgid "Press the button to start calibration"
msgstr "Wciśnij przycisk aby rozpocząć kalibrację"
@@ -1362,7 +1350,7 @@ msgstr ""
msgid "Ignored"
msgstr "Ignorowany"
-#: src/gui/setup_players.cpp:207
+#: src/gui/setup_players.cpp:207 src/gui/setup_video.cpp:131
msgid "???"
msgstr ""
@@ -1390,158 +1378,180 @@ msgstr "Gracze"
msgid "When ignoring:"
msgstr "Gdy ignorowany:"
-#: src/gui/setup_video.cpp:123
+#: src/gui/setup_video.cpp:112
+msgid "Tiny"
+msgstr ""
+
+#: src/gui/setup_video.cpp:113
+#, fuzzy
+msgid "Small"
+msgstr "Sprzedaj"
+
+#: src/gui/setup_video.cpp:114
+#, fuzzy
+msgid "Medium"
+msgstr "średni"
+
+#: src/gui/setup_video.cpp:115
+msgid "Large"
+msgstr ""
+
+#: src/gui/setup_video.cpp:151
msgid "Full screen"
msgstr "Pełen ekran"
-#: 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 "Własny kursor"
-#: 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
#, fuzzy
msgid "Particle effects"
msgstr "Detale cząsteczek"
-#: 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 ""
-#: src/gui/setup_video.cpp:136
+#: src/gui/setup_video.cpp:167
msgid "FPS Limit:"
msgstr "Limit FPS:"
-#: src/gui/setup_video.cpp:152
+#: src/gui/setup_video.cpp:184
msgid "Video"
msgstr "Obraz"
-#: 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 "Przezroczystość GUI"
-#: src/gui/setup_video.cpp:159
+#: src/gui/setup_video.cpp:191
msgid "Scroll radius"
msgstr "Skok przy przewijaniu ekranu"
-#: src/gui/setup_video.cpp:160
+#: src/gui/setup_video.cpp:192
msgid "Scroll laziness"
msgstr "Opóźnienie przy przewijaniu ekranu"
-#: src/gui/setup_video.cpp:161
+#: src/gui/setup_video.cpp:193
msgid "Ambient FX"
msgstr "Dźwięki otoczenia"
-#: src/gui/setup_video.cpp:162
+#: src/gui/setup_video.cpp:194
msgid "Particle Detail"
msgstr "Detale cząsteczek"
-#: 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
#, fuzzy
msgid "No text"
msgstr "Następny"
-#: 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 ""
-#: 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 ""
-#: 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 "wyłączone"
-#: 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 "niskie"
-#: 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 "wysokie"
-#: 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 "średni"
-#: 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 "max"
-#: 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
#, fuzzy
msgid "fullscreen"
msgstr "Pełen ekran"
-#: 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 "Przełączanie na pełen ekran"
-#: src/gui/setup_video.cpp:352
+#: src/gui/setup_video.cpp:422
msgid "Restart needed for changes to take effect."
msgstr "Wymagane ponowne uruchomienia aby zastosować zmiany."
-#: src/gui/setup_video.cpp:364
+#: src/gui/setup_video.cpp:434
msgid "Changing OpenGL"
msgstr "Zmień ustawienia OpenGL"
-#: src/gui/setup_video.cpp:365
+#: src/gui/setup_video.cpp:435
msgid "Applying change to OpenGL requires restart."
msgstr ""
"Zastosowywanie zmian w konfiguracji OpenGL wymaga ponownego uruchomienia."
-#: 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
#, fuzzy
msgid "Restart your client for the change to take effect."
msgstr "Wymagane ponowne uruchomienia aby zastosować zmiany."
-#: 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 ""
@@ -1554,6 +1564,10 @@ msgstr "Zdolności"
msgid "Mystery Skill"
msgstr ""
+#: src/gui/skill.cpp:126 src/gui/skilldialog.cpp:99 src/gui/windowmenu.cpp:62
+msgid "Skills"
+msgstr "Zdolności"
+
#: src/gui/skill.cpp:145 src/gui/skill.cpp:197
#, c-format
msgid "Skill points: %d"
@@ -1563,15 +1577,6 @@ msgstr ""
msgid "Up"
msgstr "Góra"
-#: src/gui/skill.cpp:146
-msgid "inc"
-msgstr ""
-
-#: src/gui/skill.cpp:147
-#, fuzzy
-msgid "use"
-msgstr "Użyj"
-
#: src/gui/skilldialog.cpp:113
msgid "Weapons"
msgstr ""
@@ -1581,171 +1586,171 @@ msgstr ""
msgid "Crafts"
msgstr "Stwórz"
-#: 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 ""
-#: src/gui/status.cpp:61
+#: src/gui/status.cpp:60
msgid "HP:"
msgstr ""
-#: src/gui/status.cpp:64
+#: src/gui/status.cpp:63
msgid "Exp:"
msgstr ""
-#: src/gui/status.cpp:67
+#: src/gui/status.cpp:66
msgid "MP:"
msgstr ""
-#: 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 "Statystyki"
-#: src/gui/status.cpp:79
+#: src/gui/status.cpp:78
msgid "Total"
msgstr "Razem"
-#: src/gui/status.cpp:80
+#: src/gui/status.cpp:79
msgid "Cost"
msgstr "Koszt"
-#: src/gui/status.cpp:84
+#: src/gui/status.cpp:83
msgid "Attack:"
msgstr "Atak:"
-#: src/gui/status.cpp:85
+#: src/gui/status.cpp:84
msgid "Defense:"
msgstr "Obrona:"
-#: src/gui/status.cpp:86
+#: src/gui/status.cpp:85
msgid "M.Attack:"
msgstr "Atak M.:"
-#: src/gui/status.cpp:87
+#: src/gui/status.cpp:86
msgid "M.Defense:"
msgstr "Obrona M.:"
-#: src/gui/status.cpp:89
+#: src/gui/status.cpp:88
#, no-c-format
msgid "% Accuracy:"
msgstr ""
-#: src/gui/status.cpp:91
+#: src/gui/status.cpp:90
#, no-c-format
msgid "% Evade:"
msgstr ""
-#: 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 "Siła"
-#: 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 "Witalność"
-#: src/gui/status.cpp:202
+#: src/gui/status.cpp:201
msgid "Intelligence"
msgstr "Inteligencja"
-#: src/gui/status.cpp:203
+#: src/gui/status.cpp:202
msgid "Dexterity"
msgstr "Celność"
-#: src/gui/status.cpp:204
+#: src/gui/status.cpp:203
msgid "Luck"
msgstr "Szczęście"
-#: src/gui/status.cpp:222
+#: src/gui/status.cpp:221
#, c-format
msgid "Remaining Status Points: %d"
msgstr ""
-#: src/gui/status.cpp:383 src/gui/status.cpp:405
+#: src/gui/status.cpp:384
#, fuzzy
msgid "Max level"
msgstr "Mężczyzna"
-#: src/gui/storagewindow.cpp:53
+#: src/gui/storagewindow.cpp:54
msgid "Storage"
msgstr ""
-#: src/gui/storagewindow.cpp:64
+#: src/gui/storagewindow.cpp:65
#, fuzzy
msgid "Store"
msgstr "Zatrzymaj"
-#: 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 "Oferuj handel"
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:52
#, fuzzy
msgid "Confirmed. Waiting..."
msgstr "Łączenie..."
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:53
#, fuzzy
msgid "Agree trade"
msgstr "Oferuj handel"
-#: src/gui/trade.cpp:55
+#: src/gui/trade.cpp:54
#, fuzzy
msgid "Agreed. Waiting..."
msgstr "Aktualizacja..."
-#: src/gui/trade.cpp:58
+#: src/gui/trade.cpp:57
#, fuzzy
msgid "Trade: You"
msgstr "Handel"
-#: src/gui/trade.cpp:71 src/gui/trade.cpp:72
+#: src/gui/trade.cpp:70 src/gui/trade.cpp:71
msgid "Trade"
msgstr "Handel"
-#: src/gui/trade.cpp:74
+#: src/gui/trade.cpp:73
msgid "Add"
msgstr "Dodaj"
-#: 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
#, fuzzy, c-format
msgid "You get %s."
msgstr "Otrzymujesz %d GP"
-#: src/gui/trade.cpp:97
+#: src/gui/trade.cpp:96
msgid "You give:"
msgstr "Dajesz:"
-#: src/gui/trade.cpp:101
+#: src/gui/trade.cpp:100
msgid "Change"
msgstr "Zmień"
-#: 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 ""
@@ -1865,21 +1870,21 @@ msgstr ""
msgid "Need a user to kick!"
msgstr ""
-#: src/gui/widgets/chattab.cpp:115
+#: src/gui/widgets/chattab.cpp:114
msgid "Global announcement:"
msgstr "Ogłoszenie ogólne:"
-#: src/gui/widgets/chattab.cpp:121
+#: src/gui/widgets/chattab.cpp:120
#, c-format
msgid "Global announcement from %s:"
msgstr "Ogłoszenie ogólne od %s:"
-#: src/gui/widgets/chattab.cpp:147
+#: src/gui/widgets/chattab.cpp:146
#, fuzzy, c-format
msgid "%s whispers: "
msgstr "%s szepcze:"
-#: src/gui/widgets/chattab.cpp:241 src/resources/itemdb.cpp:108
+#: src/gui/widgets/chattab.cpp:240 src/resources/itemdb.cpp:107
#, fuzzy
msgid "Unknown item"
msgstr "Nieznane polecenie"
@@ -1888,25 +1893,37 @@ msgstr "Nieznane polecenie"
msgid "Cannot send empty chat!"
msgstr ""
-#: src/gui/widgets/whispertab.cpp:55
-#, c-format
-msgid "%s: %s"
-msgstr ""
-
-#: src/gui/widgets/whispertab.cpp:69
+#: src/gui/widgets/whispertab.cpp:68
msgid "/close > Close the whisper tab"
msgstr ""
-#: src/gui/widgets/whispertab.cpp:79
+#: src/gui/widgets/whispertab.cpp:78
#, fuzzy
msgid "Command: /close"
msgstr "Komenda: /clear"
-#: src/gui/widgets/whispertab.cpp:80
+#: src/gui/widgets/whispertab.cpp:79
#, fuzzy
msgid "This command closes the current whisper tab."
msgstr "Ta komenda wyświetla nazwę aktualnej mapy."
+#: src/gui/windowmenu.cpp:59
+msgid "Status"
+msgstr "Stan"
+
+#: src/gui/windowmenu.cpp:65
+msgid "Guilds"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:66
+#, fuzzy
+msgid "Buddys"
+msgstr "Kup"
+
+#: src/gui/windowmenu.cpp:68
+msgid "Shortcut"
+msgstr "Skrót"
+
#: src/keyboardconfig.cpp:41
msgid "Move Up"
msgstr ""
@@ -2040,7 +2057,7 @@ msgstr "Zresetuj okna"
#: src/keyboardconfig.cpp:80
#, fuzzy
-msgid "Emote Window"
+msgid "Party Window"
msgstr "Zresetuj okna"
#: src/keyboardconfig.cpp:81
@@ -2091,168 +2108,173 @@ msgstr ""
msgid "Ignore input 2"
msgstr ""
-#: src/localplayer.cpp:849
+#: src/localplayer.cpp:834
#, fuzzy
msgid "Unarmed"
msgstr "Nienazwany"
-#: src/localplayer.cpp:850
+#: src/localplayer.cpp:835
msgid "Knife"
msgstr ""
-#: src/localplayer.cpp:851
+#: src/localplayer.cpp:836
#, fuzzy
msgid "Sword"
msgstr "Dźwięk"
-#: src/localplayer.cpp:852
+#: src/localplayer.cpp:837
msgid "Polearm"
msgstr ""
-#: src/localplayer.cpp:853
+#: src/localplayer.cpp:838
#, fuzzy
msgid "Staff"
msgstr "Statystyki"
-#: src/localplayer.cpp:854
+#: src/localplayer.cpp:839
msgid "Whip"
msgstr ""
-#: src/localplayer.cpp:855
+#: src/localplayer.cpp:840
#, fuzzy
msgid "Bow"
msgstr "niskie"
-#: src/localplayer.cpp:856
+#: src/localplayer.cpp:841
msgid "Shooting"
msgstr ""
-#: src/localplayer.cpp:857
+#: src/localplayer.cpp:842
#, fuzzy
msgid "Mace"
msgstr "Mężczyzna"
-#: 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
#, fuzzy
msgid "Craft"
msgstr "Stwórz"
-#: 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 ""
-#: src/main.cpp:563
-msgid "Options: "
+#: src/main.cpp:567
+msgid "Options:"
msgstr ""
-#: src/main.cpp:564
-msgid " -C --configfile : Configuration file to use"
+#: src/main.cpp:568
+msgid " -C --config-file : Configuration file to use"
msgstr ""
-#: src/main.cpp:565
-msgid " -d --data : Directory to load game data from"
+#: src/main.cpp:569
+msgid " -d --data : Directory to load game data from"
msgstr ""
-#: src/main.cpp:566
-msgid " -D --default : Bypass the login process with default settings"
+#: src/main.cpp:570
+msgid " -D --default : Choose default character server and character"
msgstr ""
-#: src/main.cpp:568
+#: src/main.cpp:572
#, fuzzy
-msgid " -h --help : Display this help"
+msgid " -h --help : Display this help"
msgstr "/help: Wyświetla pomoc"
-#: src/main.cpp:569
-msgid " -S --homedir : Directory to use as home directory"
+#: src/main.cpp:573
+msgid " -S --home-dir : Directory to use as home directory"
msgstr ""
-#: src/main.cpp:570
-msgid " -H --updatehost : Use this update host"
+#: src/main.cpp:574
+msgid " -H --update-host : Use this update host"
msgstr ""
-#: src/main.cpp:571
-msgid " -P --password : Login with this password"
+#: src/main.cpp:575
+msgid " -P --password : Login with this password"
msgstr ""
-#: src/main.cpp:572
-msgid " -c --character : Login with this character"
+#: src/main.cpp:576
+msgid " -c --character : Login with this character"
msgstr ""
-#: src/main.cpp:573
-msgid " -o --port : Login Server Port"
+#: src/main.cpp:577
+msgid " -p --port : Login Server Port"
msgstr ""
-#: src/main.cpp:574
-msgid " -s --server : Login Server name or IP"
+#: src/main.cpp:578
+msgid " -s --server : Login Server name or IP"
msgstr ""
-#: src/main.cpp:575
-msgid " -u --skipupdate : Skip the update downloads"
+#: src/main.cpp:579
+msgid " -u --skip-update : Skip the update downloads"
msgstr ""
-#: src/main.cpp:576
-msgid " -U --username : Login with this username"
+#: src/main.cpp:580
+msgid " -U --username : Login with this username"
msgstr ""
-#: src/main.cpp:577
-msgid " -v --version : Display the version"
+#: src/main.cpp:582
+msgid " -O --no-opengl : Disable OpenGL for this session"
msgstr ""
-#: src/main.cpp:582
+#: src/main.cpp:584
+#, fuzzy
+msgid " -v --version : Display the version"
+msgstr "/help: Wyświetla pomoc"
+
+#: src/main.cpp:589
#, fuzzy
msgid "The Mana World "
msgstr "Wybierz serwer Mana World"
-#: src/main.cpp:1499
+#: src/main.cpp:1515
msgid "Connecting to map server..."
msgstr "Łączenie z serwerem map..."
-#: src/main.cpp:1507
+#: src/main.cpp:1523
msgid "Connecting to character server..."
msgstr "Łączenie z serwerem postaci..."
-#: src/main.cpp:1515
+#: src/main.cpp:1531
msgid "Connecting to account server..."
msgstr "Łączenie z serwerem kont..."
-#: src/net/ea/adminhandler.cpp:67
+#: src/net/ea/adminhandler.cpp:66
#, fuzzy
msgid "Kick failed!"
msgstr "Handel zakończony niepowodzeniem!"
-#: src/net/ea/adminhandler.cpp:69
+#: src/net/ea/adminhandler.cpp:68
msgid "Kick succeeded!"
msgstr ""
@@ -2340,18 +2362,18 @@ msgstr "Celność"
msgid "Luck:"
msgstr "Szczęście"
-#: 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 ""
@@ -2364,431 +2386,446 @@ msgstr "Zdejmij"
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
#, fuzzy, c-format
msgid "Strength: %d"
msgstr "Siła"
-#: 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 ""
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:86
+#: src/net/ea/generalhandler.cpp:96 src/net/tmwserv/generalhandler.cpp:88
#, fuzzy, c-format
msgid "Vitality: %d"
msgstr "Witalność"
-#: src/net/ea/generalhandler.cpp:96 src/net/tmwserv/generalhandler.cpp:88
+#: src/net/ea/generalhandler.cpp:98 src/net/tmwserv/generalhandler.cpp:90
#, fuzzy, c-format
msgid "Intelligence: %d"
msgstr "Inteligencja"
-#: src/net/ea/generalhandler.cpp:98 src/net/tmwserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:100 src/net/tmwserv/generalhandler.cpp:86
#, fuzzy, c-format
msgid "Dexterity: %d"
msgstr "Celność"
-#: src/net/ea/generalhandler.cpp:100
+#: src/net/ea/generalhandler.cpp:102
#, fuzzy, c-format
msgid "Luck: %d"
msgstr "Szczęście"
-#: 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 ""
-#: 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 "Rozłączono z serwerem!"
-#: src/net/ea/gui/partytab.cpp:54
+#: src/net/ea/gui/partytab.cpp:52
+#, fuzzy
+msgid "/help > Display this help."
+msgstr "/help: Wyświetla pomoc"
+
+#: src/net/ea/gui/partytab.cpp:53
msgid "/create > Create a new party"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:55
+#: src/net/ea/gui/partytab.cpp:54
msgid "/new > Alias of create"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:56
+#: src/net/ea/gui/partytab.cpp:55
msgid "/invite > Invite a player to your party"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:57
+#: src/net/ea/gui/partytab.cpp:56
msgid "/leave > Leave the party you are in"
msgstr ""
-#: 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 ""
-#: src/net/ea/gui/partytab.cpp:59
+#: src/net/ea/gui/partytab.cpp:58
msgid "/item > Show/change party item sharing options"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:60
+#: src/net/ea/gui/partytab.cpp:59
msgid "/exp > Show/change party experience sharing options"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:69
+#: src/net/ea/gui/partytab.cpp:68
#, fuzzy
msgid "Command: /new <party-name>"
msgstr "Komenda: /announce <wiadomość>"
-#: src/net/ea/gui/partytab.cpp:70
+#: src/net/ea/gui/partytab.cpp:69
#, fuzzy
msgid "Command: /create <party-name>"
msgstr "Komenda: /clear"
-#: 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 ""
-#: src/net/ea/gui/partytab.cpp:75
+#: src/net/ea/gui/partytab.cpp:74
#, fuzzy
msgid "Command: /invite <nick>"
msgstr "Komenda: /w <postać> <wiadomość>"
-#: src/net/ea/gui/partytab.cpp:82
+#: src/net/ea/gui/partytab.cpp:81
#, fuzzy
msgid "Command: /leave"
msgstr "Komenda: /clear"
-#: src/net/ea/gui/partytab.cpp:83
+#: src/net/ea/gui/partytab.cpp:82
#, fuzzy
msgid "This command causes the player to leave the party."
msgstr "Ta komenda czyści zawartość okna."
-#: src/net/ea/gui/partytab.cpp:87
+#: src/net/ea/gui/partytab.cpp:86
#, fuzzy
msgid "Command: /item <policy>"
msgstr "Komenda: /help"
-#: src/net/ea/gui/partytab.cpp:88
+#: src/net/ea/gui/partytab.cpp:87
#, fuzzy
msgid "This command changes the party's item sharing policy."
msgstr "Ta komenda wysyła wiadomość <wiadomość> do <postać>"
-#: 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."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:92
+#: src/net/ea/gui/partytab.cpp:91
#, fuzzy
msgid "Command: /item"
msgstr "Komenda: /help"
-#: src/net/ea/gui/partytab.cpp:93
+#: src/net/ea/gui/partytab.cpp:92
#, fuzzy
msgid "This command displays the party's current item sharing policy."
msgstr "Ta komenda wyświetla nazwę aktualnej mapy."
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/ea/gui/partytab.cpp:96
#, fuzzy
msgid "Command: /exp <policy>"
msgstr "Komenda: /help <komenda>"
-#: 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."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:102
+#: src/net/ea/gui/partytab.cpp:101
#, fuzzy
msgid "Command: /exp"
msgstr "Komenda: /help"
-#: src/net/ea/gui/partytab.cpp:103
+#: src/net/ea/gui/partytab.cpp:102
#, fuzzy
msgid "This command displays the party's current experience sharing policy."
msgstr "Ta komenda wyświetla nazwę aktualnej mapy."
-#: 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]"
+msgid "You picked up %s [@@%d|%s@@]"
msgstr ""
-#: 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
#, fuzzy
msgid "Unregistered ID"
msgstr "Wyrejestruj"
-#: src/net/ea/loginhandler.cpp:114
+#: src/net/ea/loginhandler.cpp:113
#, fuzzy
msgid "Wrong password"
msgstr "Zmień hasło"
-#: 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
#, fuzzy
msgid "Rejected from server"
msgstr "Rozłączono z serwerem!"
-#: 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 ""
-#: 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"
" Please contact the GM team via the forums."
msgstr ""
-#: 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
#, fuzzy
msgid "Unknown error"
msgstr "Nieznane polecenie"
-#: src/net/ea/partyhandler.cpp:78
-msgid "Party successfully created."
-msgstr ""
-
-#: src/net/ea/partyhandler.cpp:82
+#: src/net/ea/partyhandler.cpp:77
#, fuzzy
msgid "Could not create party."
msgstr "Nie mogę nic ukraść..."
-#: 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 ""
-#: src/net/ea/partyhandler.cpp:116
+#: src/net/ea/partyhandler.cpp:119
#, c-format
msgid "%s refused your invitation."
msgstr ""
-#: src/net/ea/partyhandler.cpp:120
+#: src/net/ea/partyhandler.cpp:123
#, c-format
msgid "%s is now a member of your party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:124
+#: src/net/ea/partyhandler.cpp:127
#, c-format
msgid "Unknown invite response for %s."
msgstr ""
-#: 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 ""
-#: src/net/ea/partyhandler.cpp:269
+#: src/net/ea/partyhandler.cpp:272
#, c-format
msgid "An unknown member tried to say: %s"
msgstr ""
-#: 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 ""
-#: 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
#, fuzzy
msgid "You are not that alive anymore."
msgstr "Nie możesz teraz tego zrobić!"
-#: 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"
+#: 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 ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
@@ -2950,40 +2987,98 @@ msgstr ""
msgid "Willpower:"
msgstr "Siła woli:"
-#: 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
#, fuzzy, c-format
msgid "Willpower: %d"
msgstr "Siła woli:"
-#: 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
+#, fuzzy
+msgid "Server is full"
+msgstr "Serwer:"
+
+#: 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 ""
+
+#: src/net/tmwserv/loginhandler.cpp:143
+msgid "Old email address incorrect"
+msgstr ""
+
+#: src/net/tmwserv/loginhandler.cpp:149
+msgid "The new Email Address already exists."
+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 "Zmień hasło"
+
+#: src/net/tmwserv/loginhandler.cpp:211
+msgid "Wrong username, password or email address"
+msgstr ""
+
+#: src/net/tmwserv/loginhandler.cpp:214
+msgid "Username already exists"
+msgstr ""
+
+#: src/net/tmwserv/loginhandler.cpp:217
+msgid "Email address already exists"
+msgstr ""
+
+#: src/resources/itemdb.cpp:52
#, fuzzy, c-format
msgid "Attack %+d"
msgstr "Atak:"
-#: src/resources/itemdb.cpp:54
+#: src/resources/itemdb.cpp:53
#, fuzzy, c-format
msgid "Defense %+d"
msgstr "Obrona:"
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:54
#, c-format
msgid "HP %+d"
msgstr "PŻ %+d"
-#: src/resources/itemdb.cpp:56
+#: src/resources/itemdb.cpp:55
#, c-format
msgid "MP %+d"
msgstr "PM %+d"
-#: src/resources/itemdb.cpp:113
+#: src/resources/itemdb.cpp:112
msgid "items.xml"
msgstr ""
-#: src/resources/itemdb.cpp:151
+#: src/resources/itemdb.cpp:150
msgid "Unnamed"
msgstr "Nienazwany"
@@ -3000,6 +3095,23 @@ msgstr ""
msgid "NPC Database: Error while loading npcs.xml!"
msgstr ""
+#~ msgid "MiniMap"
+#~ msgstr "MiniMapa"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "> Cancel\n"
+#~ msgstr "Anuluj"
+
+#, fuzzy
+#~ msgid "use"
+#~ msgstr "Użyj"
+
+#, fuzzy
+#~ msgid "Emote Window"
+#~ msgstr "Zresetuj okna"
+
#~ msgid "Gold: %d"
#~ msgstr "Złoto: %d"
diff --git a/po/pt.po b/po/pt.po
index d175560e..2118d1ce 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-04-21 17:27+0200\n"
+"POT-Creation-Date: 2009-05-10 15:53+0200\n"
"PO-Revision-Date: 2008-02-03 10:14+0000\n"
"Last-Translator: Tiago Silva <Unknown>\n"
"Language-Team: Portuguese <pt@li.org>\n"
@@ -17,286 +17,286 @@ msgstr ""
"X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
"X-Generator: Launchpad (build Unknown)\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."
+#: src/commandhandler.cpp:142
+msgid "/help > Display this help"
msgstr ""
-#: src/commandhandler.cpp:145
+#: src/commandhandler.cpp:144
msgid "/where > Display map name"
msgstr ""
-#: src/commandhandler.cpp:146
+#: src/commandhandler.cpp:145
msgid "/who > Display number of online users"
msgstr ""
-#: src/commandhandler.cpp:147
+#: src/commandhandler.cpp:146
msgid "/me > Tell something about yourself"
msgstr ""
-#: src/commandhandler.cpp:149
+#: src/commandhandler.cpp:148
msgid "/clear > Clears this window"
msgstr ""
-#: src/commandhandler.cpp:151
+#: src/commandhandler.cpp:150
msgid "/msg > Send a private message to a user"
msgstr ""
-#: src/commandhandler.cpp:152
+#: src/commandhandler.cpp:151
msgid "/whisper > Alias of msg"
msgstr ""
-#: src/commandhandler.cpp:153
+#: src/commandhandler.cpp:152
msgid "/w > Alias of msg"
msgstr ""
-#: src/commandhandler.cpp:154
+#: src/commandhandler.cpp:153
msgid "/query > Makes a tab for private messages with another user"
msgstr ""
-#: src/commandhandler.cpp:155
+#: src/commandhandler.cpp:154
msgid "/q > Alias of query"
msgstr ""
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:156
msgid "/list > Display all public channels"
msgstr ""
-#: src/commandhandler.cpp:158
+#: src/commandhandler.cpp:157
msgid "/join > Join or create a channel"
msgstr ""
-#: src/commandhandler.cpp:160
+#: src/commandhandler.cpp:159
msgid "/party > Invite a user to party"
msgstr ""
-#: src/commandhandler.cpp:162
+#: src/commandhandler.cpp:161
msgid "/record > Start recording the chat to an external file"
msgstr ""
-#: 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 ""
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:165
msgid "/announce > Global announcement (GM only)"
msgstr ""
-#: src/commandhandler.cpp:170
+#: src/commandhandler.cpp:169
msgid "For more information, type /help <command>"
msgstr ""
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:173
msgid "Command: /help"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: src/commandhandler.cpp:186
+#: src/commandhandler.cpp:185
msgid "*** only available to a GM ***"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: src/commandhandler.cpp:209
+#: src/commandhandler.cpp:208
msgid "This command tell others you are (doing) <msg>."
msgstr ""
-#: src/commandhandler.cpp:213
+#: src/commandhandler.cpp:212
msgid "Command: /msg <nick> <message>"
msgstr ""
-#: src/commandhandler.cpp:214
+#: src/commandhandler.cpp:213
msgid "Command: /whisper <nick> <message>"
msgstr ""
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:214
msgid "Command: /w <nick> <message>"
msgstr ""
-#: src/commandhandler.cpp:216
+#: src/commandhandler.cpp:215
msgid "This command sends the text <message> to <nick>."
msgstr ""
-#: 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 ""
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:222
msgid "Command: /q <nick>"
msgstr ""
-#: src/commandhandler.cpp:224
+#: src/commandhandler.cpp:223
msgid "This command tries to make a tab for whispers betweenyou and <nick>."
msgstr ""
-#: src/commandhandler.cpp:229
+#: src/commandhandler.cpp:228
msgid "Command: /party <nick>"
msgstr ""
-#: 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 ""
-#: src/commandhandler.cpp:236
+#: src/commandhandler.cpp:235
msgid "Command: /present"
msgstr ""
-#: 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 ""
-#: src/commandhandler.cpp:244
+#: src/commandhandler.cpp:243
msgid "This command starts recording the chat log to the file <filename>."
msgstr ""
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:245
msgid "Command: /record"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: src/commandhandler.cpp:257
+#: src/commandhandler.cpp:256
msgid "Command: /toggle"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: src/commandhandler.cpp:336
-msgid "Cannont send empty whispers!"
+#: 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 ""
-#: 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 ""
@@ -305,46 +305,46 @@ msgstr ""
msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
msgstr ""
-#: 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"
+#: src/game.cpp:481
+msgid "The connection to the server was lost, the program will now quit"
msgstr ""
-#: src/game.cpp:493
-msgid "The connection to the server was lost, the program will now quit"
+#: src/game.cpp:487
+msgid "Network Error"
msgstr ""
-#: src/game.cpp:664 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
+#: 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 "Sair"
-#: src/game.cpp:665
+#: src/game.cpp:647
#, fuzzy
msgid "Are you sure you want to quit?"
msgstr "Tem a certeza que quer apagar este personagem"
-#: 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 ""
@@ -357,12 +357,12 @@ msgstr "Comprar"
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 "Comprar"
#: 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
#, fuzzy, c-format
msgid "Price: %s / Total: %s"
msgstr "Preço: %d GP / Total: %d GP"
@@ -372,13 +372,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 "Descrição: %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 "Efeito: %s"
@@ -388,205 +388,213 @@ msgstr "Efeito: %s"
msgid "Shop"
msgstr "Parar"
-#: 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 "Vender"
-#: 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 "Cancelar"
-#: 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 ""
-#: 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
#, fuzzy
msgid "Change Password"
msgstr "Senha:"
-#: 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 "Senha:"
-#: 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 "Criar Personagem"
-#: 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 "Nome:"
-#: src/gui/charcreatedialog.cpp:70
+#: src/gui/charcreatedialog.cpp:69
msgid "Hair Color:"
msgstr "Cor de Cabelo:"
-#: src/gui/charcreatedialog.cpp:73
+#: src/gui/charcreatedialog.cpp:72
msgid "Hair Style:"
msgstr "Estilo do Cabelo:"
-#: src/gui/charcreatedialog.cpp:74
+#: src/gui/charcreatedialog.cpp:73
msgid "Create"
msgstr "Criar"
-#: 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 "Por favor distribua %d potos"
-#: 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 "Erro"
-#: src/gui/charcreatedialog.cpp:174
+#: src/gui/charcreatedialog.cpp:173
msgid "Your name needs to be at least 4 characters."
msgstr "O seu nome necessita de pelo menos 4 caracteres"
-#: src/gui/charcreatedialog.cpp:227
+#: src/gui/charcreatedialog.cpp:226
msgid "Character stats OK"
msgstr "Estatisticas da personagem OK"
-#: src/gui/charcreatedialog.cpp:239
+#: src/gui/charcreatedialog.cpp:238
#, c-format
msgid "Please remove %d points"
msgstr "Por favor remova %d pontos"
-#: 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 "Tem a certeza que quer apagar este personagem"
-#: 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 "Seleccione um Personagem"
-#: 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 "Ok"
-#: src/gui/char_select.cpp:113
+#: src/gui/charselectdialog.cpp:112
msgid "Previous"
msgstr "Anterior"
-#: 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 "Seguinte"
-#: 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 "Nome: %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 "Nível: %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 "Novo"
-#: 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 "Eliminar"
-#: src/gui/char_select.cpp:120 src/gui/unregisterdialog.cpp:51
+#: src/gui/charselectdialog.cpp:119 src/gui/unregisterdialog.cpp:52
msgid "Unregister"
msgstr "Remover o Registo"
-#: src/gui/char_select.cpp:127
+#: src/gui/charselectdialog.cpp:126
#, c-format
msgid "Money: %d"
msgstr "Dinheiro: %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
#, fuzzy, c-format
msgid "Job Level: %d"
msgstr "Nível: %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
#, fuzzy, c-format
msgid "Money: %s"
msgstr "Dinheiro: %d"
-#: 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
#, fuzzy
msgid "Chat"
msgstr "Criar"
-#: src/gui/chat.cpp:341 src/gui/chat.cpp:347
+#: src/gui/chat.cpp:332
+#, c-format
+msgid "%d players are present."
+msgstr ""
+
+#: 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 ""
-#: src/gui/confirm_dialog.cpp:42
+#: src/gui/confirmdialog.cpp:42
msgid "Yes"
msgstr "Sim"
-#: src/gui/confirm_dialog.cpp:43
+#: src/gui/confirmdialog.cpp:43
msgid "No"
msgstr "Não"
@@ -594,26 +602,16 @@ msgstr "Não"
msgid "Connecting..."
msgstr "Conectando..."
-#: src/gui/emotecontainer.cpp:61
+#: src/gui/emotepopup.cpp:64
msgid "Unable to load selection.png"
msgstr ""
-#: 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 "Usar"
-
-#: src/gui/equipmentwindow.cpp:68 src/gui/menuwindow.cpp:67
+#: src/gui/equipmentwindow.cpp:68 src/gui/windowmenu.cpp:60
msgid "Equipment"
msgstr "Equipamento"
-#: 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 "Desequipar"
@@ -638,100 +636,103 @@ 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 "Inventário"
-#: 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 "Equipar"
-#: 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 "Usar"
+
+#: src/gui/inventorywindow.cpp:80
msgid "Drop"
msgstr "Largar"
-#: src/gui/inventorywindow.cpp:79
+#: src/gui/inventorywindow.cpp:81
msgid "Split"
msgstr "Dividir"
-#: 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 "Seleccionar a quantidade de itens a negociar."
-#: src/gui/item_amount.cpp:95
+#: src/gui/itemamount.cpp:124
msgid "Select amount of items to drop."
msgstr "Seleccionar a quantidade de itens a largar."
-#: src/gui/item_amount.cpp:98
+#: src/gui/itemamount.cpp:127
#, fuzzy
msgid "Select amount of items to store."
msgstr "Seleccionar a quantidade de itens a negociar."
-#: src/gui/item_amount.cpp:101
+#: src/gui/itemamount.cpp:130
#, fuzzy
msgid "Select amount of items to retrieve."
msgstr "Seleccionar a quantidade de itens a negociar."
-#: src/gui/item_amount.cpp:104
+#: src/gui/itemamount.cpp:133
msgid "Select amount of items to split."
msgstr "Seleccionar a quantidade de itens a dividir."
-#: 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 "Autenticar"
-#: 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 "Servidor:"
-#: 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 "Porta:"
-#: src/gui/login.cpp:55
+#: src/gui/login.cpp:56
#, fuzzy
msgid "Recent:"
msgstr "Registo"
-#: 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 "Registo"
-#: 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 ""
@@ -747,71 +748,44 @@ msgstr ""
msgid "Cast Test Spell 3"
msgstr ""
-#: src/gui/menuwindow.cpp:66
-msgid "Status"
-msgstr "Estado"
-
-#: src/gui/menuwindow.cpp:69 src/gui/skill.cpp:126 src/gui/skilldialog.cpp:99
-msgid "Skills"
-msgstr "Competências"
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
+#, fuzzy
+msgid "Map"
+msgstr "MiniMapa"
-#: src/gui/menuwindow.cpp:72
-msgid "Guilds"
+#: src/gui/npcdialog.cpp:43
+msgid "Waiting for server"
msgstr ""
-#: src/gui/menuwindow.cpp:73
+#: src/gui/npcdialog.cpp:46
#, fuzzy
-msgid "Buddys"
-msgstr "Comprar"
-
-#: src/gui/menuwindow.cpp:75
-msgid "Shortcut"
-msgstr "Atalho"
+msgid "Submit"
+msgstr "Dividir"
-#: src/gui/menuwindow.cpp:77 src/gui/setup.cpp:65 src/main.cpp:920
-msgid "Setup"
-msgstr "Configuração"
+#: src/gui/npcdialog.cpp:49 src/gui/npcpostdialog.cpp:39
+msgid "NPC"
+msgstr "NPC"
-#: src/gui/minimap.cpp:39
-msgid "MiniMap"
-msgstr "MiniMapa"
+#: src/gui/npcdialog.cpp:95
+msgid "+"
+msgstr ""
-#: src/gui/npcintegerdialog.cpp:39
-msgid "NPC Number Request"
+#: src/gui/npcdialog.cpp:96
+msgid "-"
msgstr ""
-#: src/gui/npcintegerdialog.cpp:50
+#: src/gui/npcdialog.cpp:105
#, fuzzy
msgid "Reset"
msgstr "Registo"
-#: src/gui/npcintegerdialog.cpp:101 src/gui/npclistdialog.cpp:123
-#: src/gui/npcstringdialog.cpp:75
-#, fuzzy
-msgid ""
-"\n"
-"> Cancel\n"
-msgstr "Cancelar"
-
-#: src/gui/npcpostdialog.cpp:39 src/gui/npc_text.cpp:37
-msgid "NPC"
-msgstr "NPC"
-
#: src/gui/npcpostdialog.cpp:51
#, fuzzy
msgid "Send"
msgstr "Som"
-#: src/gui/npcstringdialog.cpp:39
-msgid "NPC Text Request"
-msgstr ""
-
-#: 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
#, fuzzy
msgid "Text"
msgstr "Seguinte"
@@ -866,7 +840,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
#, fuzzy
msgid "Party"
msgstr "Porta:"
@@ -889,7 +863,7 @@ msgid "Being"
msgstr ""
#: src/gui/palette.cpp:104
-msgid "Other Player's Names"
+msgid "Other Players' Names"
msgstr ""
#: src/gui/palette.cpp:105
@@ -916,21 +890,22 @@ msgid "Unknown Item Type"
msgstr ""
#: src/gui/palette.cpp:111
-msgid "Generic"
+msgid "Generics"
msgstr ""
#: src/gui/palette.cpp:112
-msgid "Hat"
-msgstr ""
+#, fuzzy
+msgid "Hats"
+msgstr "Estado"
#: src/gui/palette.cpp:113
#, fuzzy
-msgid "Usable"
+msgid "Usables"
msgstr "Usar"
#: src/gui/palette.cpp:114
#, fuzzy
-msgid "Shirt"
+msgid "Shirts"
msgstr "Atalho"
#: src/gui/palette.cpp:115
@@ -953,15 +928,15 @@ msgstr ""
#: src/gui/palette.cpp:119
#, fuzzy
-msgid "Shield"
+msgid "Shields"
msgstr "Vender"
#: src/gui/palette.cpp:120
-msgid "Ring"
+msgid "Rings"
msgstr ""
#: src/gui/palette.cpp:121
-msgid "Necklace"
+msgid "Necklaces"
msgstr ""
#: src/gui/palette.cpp:122
@@ -1017,95 +992,104 @@ msgstr ""
msgid "1/4 HP Bar"
msgstr ""
-#: src/gui/popupmenu.cpp:73
+#: src/gui/popupmenu.cpp:75
msgid "@@name|Add name to chat@@"
msgstr ""
-#: src/gui/popupmenu.cpp:85
+#: src/gui/popupmenu.cpp:87
#, c-format
msgid "@@trade|Trade With %s@@"
msgstr "@@trade|Negociar com %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 "@@attack|Atacar %s@@"
-#: src/gui/popupmenu.cpp:92
+#: src/gui/popupmenu.cpp:94
#, c-format
msgid "@@friend|Befriend %s@@"
msgstr ""
-#: 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 ""
-#: src/gui/popupmenu.cpp:112
+#: src/gui/popupmenu.cpp:114
#, c-format
msgid "@@party|Invite %s to join your party@@"
msgstr ""
-#: src/gui/popupmenu.cpp:123
+#: src/gui/popupmenu.cpp:125
#, fuzzy, c-format
msgid "@@talk|Talk To %s@@"
msgstr "@@talk|Falar com o NPC@@"
-#: 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 "@@cancel|Cancelar@@"
-#: src/gui/popupmenu.cpp:155
-#, c-format
-msgid "@@pickup|Pick Up %s@@"
+#: src/gui/popupmenu.cpp:157
+#, fuzzy, c-format
+msgid "@@pickup|Pick up %s@@"
msgstr "@@pickup|Apanhar %s@@"
-#: src/gui/popupmenu.cpp:156 src/gui/popupmenu.cpp:352
-msgid "@@chat|Add to Chat@@"
+#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:373
+msgid "@@chat|Add to chat@@"
msgstr ""
-#: src/gui/popupmenu.cpp:336 src/gui/popupmenu.cpp:341
-msgid "@@use|Equip@@"
-msgstr "@@use|Equipar@@"
-
-#: src/gui/popupmenu.cpp:339
+#: src/gui/popupmenu.cpp:348
#, fuzzy
msgid "@@use|Unequip@@"
msgstr "@@use|Equipar@@"
-#: src/gui/popupmenu.cpp:345
+#: src/gui/popupmenu.cpp:350
+msgid "@@use|Equip@@"
+msgstr "@@use|Equipar@@"
+
+#: src/gui/popupmenu.cpp:353
msgid "@@use|Use@@"
msgstr "@@use|Usar@@"
-#: src/gui/popupmenu.cpp:347
+#: src/gui/popupmenu.cpp:355
msgid "@@drop|Drop@@"
msgstr "@@drop|Largar@@"
-#: src/gui/popupmenu.cpp:350
+#: src/gui/popupmenu.cpp:359
msgid "@@split|Split@@"
msgstr "@@split|Dividir@@"
+#: src/gui/popupmenu.cpp:364
+#, fuzzy
+msgid "@@store|Store@@"
+msgstr "@@use|Usar@@"
+
+#: src/gui/popupmenu.cpp:371
+msgid "@@retrieve|Retrieve@@"
+msgstr ""
+
#: src/gui/quitdialog.cpp:37
msgid "Switch server"
msgstr "Mudar de servidor"
@@ -1175,20 +1159,32 @@ msgstr "A password só pode ter até %d caracteres."
msgid "Passwords do not match."
msgstr "As senhas não coincidem."
-#: src/gui/serverdialog.cpp:73
+#: src/gui/serverdialog.cpp:74
#, fuzzy
msgid "Choose your server"
msgstr "Escolha o seu Servidor de Mana World"
-#: src/gui/serverdialog.cpp:163
+#: src/gui/serverdialog.cpp:164
msgid "Please type both the address and the port of a server."
msgstr "Por favor escreva o endereço e a porta do servidor."
-#: src/gui/serverselectdialog.cpp:50
+#: src/gui/serverselectdialog.cpp:59
#, fuzzy
msgid "Select Server"
msgstr "Seleccione um Personagem"
+#: src/gui/setup.cpp:64 src/gui/windowmenu.cpp:69 src/main.cpp:933
+msgid "Setup"
+msgstr "Configuração"
+
+#: src/gui/setup.cpp:72
+msgid "Apply"
+msgstr "Aplicar"
+
+#: src/gui/setup.cpp:72
+msgid "Reset Windows"
+msgstr "Reiniciar Janelas"
+
#: src/gui/setup_audio.cpp:41
msgid "Sound"
msgstr "Som"
@@ -1205,11 +1201,11 @@ msgstr "Volume dos Efeitos"
msgid "Music volume"
msgstr "Volume da Música"
-#: 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 ""
@@ -1217,23 +1213,23 @@ 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
#, fuzzy
msgid "Static"
msgstr "Estado"
#: 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 ""
#: 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
#, fuzzy
msgid "Spectrum"
msgstr "Configuração"
@@ -1242,26 +1238,18 @@ msgstr "Configuração"
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 "Aplicar"
-
-#: src/gui/setup.cpp:73
-msgid "Reset Windows"
-msgstr "Reiniciar Janelas"
-
#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:78
msgid "Press the button to start calibration"
msgstr "Pressione o botão para começar a calibragem"
@@ -1332,7 +1320,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 ""
@@ -1360,156 +1348,177 @@ 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
+#, fuzzy
+msgid "Small"
+msgstr "Vender"
+
+#: 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 "Ecrã completo"
-#: 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 "Cursor personalizado"
-#: 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 ""
-#: src/gui/setup_video.cpp:136
+#: src/gui/setup_video.cpp:167
msgid "FPS Limit:"
msgstr "Limite de FPS:"
-#: src/gui/setup_video.cpp:152
+#: src/gui/setup_video.cpp:184
msgid "Video"
msgstr "Vídeo"
-#: 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 "Opacidade do Interface"
-#: 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 "Efeitos Ambientais"
-#: 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
#, fuzzy
msgid "No text"
msgstr "Seguinte"
-#: 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 ""
-#: 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 ""
-#: 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 "desligado"
-#: 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 "baixo"
-#: 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 "elevado"
-#: 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
#, fuzzy
msgid "fullscreen"
msgstr "Ecrã completo"
-#: 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 "Mudar para ecrã completo"
-#: src/gui/setup_video.cpp:352
+#: src/gui/setup_video.cpp:422
msgid "Restart needed for changes to take effect."
msgstr "É necessário reiniciar para as alterações terem efeito."
-#: src/gui/setup_video.cpp:364
+#: src/gui/setup_video.cpp:434
msgid "Changing OpenGL"
msgstr "Mudando OpenGL"
-#: src/gui/setup_video.cpp:365
+#: src/gui/setup_video.cpp:435
msgid "Applying change to OpenGL requires restart."
msgstr "É necessário reiniciar para as alterações ao OpenGl terem efeito."
-#: 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
#, fuzzy
msgid "Restart your client for the change to take effect."
msgstr "É necessário reiniciar para as alterações terem efeito."
-#: 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 ""
@@ -1522,6 +1531,10 @@ msgstr "Competências"
msgid "Mystery Skill"
msgstr ""
+#: src/gui/skill.cpp:126 src/gui/skilldialog.cpp:99 src/gui/windowmenu.cpp:62
+msgid "Skills"
+msgstr "Competências"
+
#: src/gui/skill.cpp:145 src/gui/skill.cpp:197
#, c-format
msgid "Skill points: %d"
@@ -1531,15 +1544,6 @@ msgstr ""
msgid "Up"
msgstr ""
-#: src/gui/skill.cpp:146
-msgid "inc"
-msgstr ""
-
-#: src/gui/skill.cpp:147
-#, fuzzy
-msgid "use"
-msgstr "Usar"
-
#: src/gui/skilldialog.cpp:113
msgid "Weapons"
msgstr ""
@@ -1549,187 +1553,187 @@ msgstr ""
msgid "Crafts"
msgstr "Criar"
-#: src/gui/status.cpp:57 src/gui/status.cpp:178
+#: src/gui/status.cpp:56 src/gui/status.cpp:177
#, fuzzy, c-format
msgid "Job: %d"
msgstr "Nível: %d"
-#: src/gui/status.cpp:61
+#: src/gui/status.cpp:60
msgid "HP:"
msgstr ""
-#: src/gui/status.cpp:64
+#: src/gui/status.cpp:63
msgid "Exp:"
msgstr ""
-#: src/gui/status.cpp:67
+#: src/gui/status.cpp:66
msgid "MP:"
msgstr ""
-#: src/gui/status.cpp:70
+#: src/gui/status.cpp:69
#, fuzzy
msgid "Job:"
msgstr "Nível: %d"
-#: src/gui/status.cpp:78
+#: src/gui/status.cpp:77
#, fuzzy
msgid "Stats"
msgstr "Estado"
-#: 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
#, fuzzy
msgid "Attack:"
msgstr ""
"Copy text \t\r\n"
"Ataque %+d"
-#: src/gui/status.cpp:85
+#: src/gui/status.cpp:84
#, fuzzy
msgid "Defense:"
msgstr ""
"Copy text \t\r\n"
"Defesa %+d"
-#: src/gui/status.cpp:86
+#: src/gui/status.cpp:85
#, fuzzy
msgid "M.Attack:"
msgstr ""
"Copy text \t\r\n"
"Ataque %+d"
-#: src/gui/status.cpp:87
+#: src/gui/status.cpp:86
#, fuzzy
msgid "M.Defense:"
msgstr ""
"Copy text \t\r\n"
"Defesa %+d"
-#: src/gui/status.cpp:89
+#: src/gui/status.cpp:88
#, no-c-format
msgid "% Accuracy:"
msgstr ""
-#: src/gui/status.cpp:91
+#: src/gui/status.cpp:90
#, no-c-format
msgid "% Evade:"
msgstr ""
-#: 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
#, fuzzy
msgid "Strength"
msgstr "Força:"
-#: src/gui/status.cpp:200
+#: src/gui/status.cpp:199
#, fuzzy
msgid "Agility"
msgstr "Agilidade:"
-#: src/gui/status.cpp:201
+#: src/gui/status.cpp:200
#, fuzzy
msgid "Vitality"
msgstr "Vitalidade:"
-#: src/gui/status.cpp:202
+#: src/gui/status.cpp:201
#, fuzzy
msgid "Intelligence"
msgstr "Inteligência:"
-#: src/gui/status.cpp:203
+#: src/gui/status.cpp:202
#, fuzzy
msgid "Dexterity"
msgstr "Destreza:"
-#: 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 ""
-#: 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
#, fuzzy
msgid "Store"
msgstr "Parar"
-#: 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 "Propor Negócio"
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:52
#, fuzzy
msgid "Confirmed. Waiting..."
msgstr "Conectando..."
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:53
#, fuzzy
msgid "Agree trade"
msgstr "Propor Negócio"
-#: 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 "Adicionar"
-#: 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
#, fuzzy, c-format
msgid "You get %s."
msgstr "Recebe %d GP."
-#: src/gui/trade.cpp:97
+#: src/gui/trade.cpp:96
msgid "You give:"
msgstr "Dá:"
-#: src/gui/trade.cpp:101
+#: src/gui/trade.cpp:100
msgid "Change"
msgstr "Modificar"
-#: 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 ""
@@ -1841,21 +1845,21 @@ msgstr ""
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 ""
-#: src/gui/widgets/chattab.cpp:147
+#: src/gui/widgets/chattab.cpp:146
#, c-format
msgid "%s whispers: "
msgstr ""
-#: 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 ""
@@ -1863,23 +1867,35 @@ msgstr ""
msgid "Cannot send empty chat!"
msgstr ""
-#: src/gui/widgets/whispertab.cpp:55
-#, c-format
-msgid "%s: %s"
-msgstr ""
-
-#: src/gui/widgets/whispertab.cpp:69
+#: src/gui/widgets/whispertab.cpp:68
msgid "/close > Close the whisper tab"
msgstr ""
-#: src/gui/widgets/whispertab.cpp:79
+#: src/gui/widgets/whispertab.cpp:78
msgid "Command: /close"
msgstr ""
-#: 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 "Estado"
+
+#: src/gui/windowmenu.cpp:65
+msgid "Guilds"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:66
+#, fuzzy
+msgid "Buddys"
+msgstr "Comprar"
+
+#: src/gui/windowmenu.cpp:68
+msgid "Shortcut"
+msgstr "Atalho"
+
#: src/keyboardconfig.cpp:41
msgid "Move Up"
msgstr ""
@@ -2015,7 +2031,7 @@ msgstr "Reiniciar Janelas"
#: src/keyboardconfig.cpp:80
#, fuzzy
-msgid "Emote Window"
+msgid "Party Window"
msgstr "Reiniciar Janelas"
#: src/keyboardconfig.cpp:81
@@ -2066,166 +2082,170 @@ msgstr ""
msgid "Ignore input 2"
msgstr ""
-#: 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
#, fuzzy
msgid "Sword"
msgstr "Som"
-#: src/localplayer.cpp:852
+#: src/localplayer.cpp:837
msgid "Polearm"
msgstr ""
-#: src/localplayer.cpp:853
+#: src/localplayer.cpp:838
#, fuzzy
msgid "Staff"
msgstr "Estado"
-#: src/localplayer.cpp:854
+#: src/localplayer.cpp:839
msgid "Whip"
msgstr ""
-#: src/localplayer.cpp:855
+#: src/localplayer.cpp:840
#, fuzzy
msgid "Bow"
msgstr "baixo"
-#: src/localplayer.cpp:856
+#: src/localplayer.cpp:841
msgid "Shooting"
msgstr ""
-#: src/localplayer.cpp:857
+#: src/localplayer.cpp:842
#, fuzzy
msgid "Mace"
msgstr "Cancelar"
-#: 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
#, fuzzy
msgid "Craft"
msgstr "Criar"
-#: 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 ""
-#: src/main.cpp:563
-msgid "Options: "
-msgstr ""
-
-#: src/main.cpp:564
-msgid " -C --configfile : Configuration file to use"
-msgstr ""
-
-#: src/main.cpp:565
-msgid " -d --data : Directory to load game data from"
-msgstr ""
-
-#: src/main.cpp:566
-msgid " -D --default : Bypass the login process with default settings"
+#: src/main.cpp:567
+msgid "Options:"
msgstr ""
#: src/main.cpp:568
-msgid " -h --help : Display this help"
+msgid " -C --config-file : Configuration file to use"
msgstr ""
#: src/main.cpp:569
-msgid " -S --homedir : Directory to use as home directory"
+msgid " -d --data : Directory to load game data from"
msgstr ""
#: src/main.cpp:570
-msgid " -H --updatehost : Use this update host"
-msgstr ""
-
-#: src/main.cpp:571
-msgid " -P --password : Login with this password"
+msgid " -D --default : Choose default character server and character"
msgstr ""
#: src/main.cpp:572
-msgid " -c --character : Login with this character"
+msgid " -h --help : Display this help"
msgstr ""
#: src/main.cpp:573
-msgid " -o --port : Login Server Port"
+msgid " -S --home-dir : Directory to use as home directory"
msgstr ""
#: src/main.cpp:574
-msgid " -s --server : Login Server name or IP"
+msgid " -H --update-host : Use this update host"
msgstr ""
#: src/main.cpp:575
-msgid " -u --skipupdate : Skip the update downloads"
+msgid " -P --password : Login with this password"
msgstr ""
#: src/main.cpp:576
-msgid " -U --username : Login with this username"
+msgid " -c --character : Login with this character"
msgstr ""
#: src/main.cpp:577
-msgid " -v --version : Display the version"
+msgid " -p --port : Login Server Port"
+msgstr ""
+
+#: src/main.cpp:578
+msgid " -s --server : Login Server name or IP"
+msgstr ""
+
+#: src/main.cpp:579
+msgid " -u --skip-update : Skip the update downloads"
+msgstr ""
+
+#: src/main.cpp:580
+msgid " -U --username : Login with this username"
msgstr ""
#: src/main.cpp:582
+msgid " -O --no-opengl : Disable OpenGL for this session"
+msgstr ""
+
+#: src/main.cpp:584
+msgid " -v --version : Display the version"
+msgstr ""
+
+#: src/main.cpp:589
#, fuzzy
msgid "The Mana World "
msgstr "Escolha o seu Servidor de Mana World"
-#: src/main.cpp:1499
+#: src/main.cpp:1515
#, fuzzy
msgid "Connecting to map server..."
msgstr "Conectando..."
-#: 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 ""
@@ -2312,18 +2332,18 @@ msgstr "Destreza:"
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 ""
@@ -2336,416 +2356,430 @@ msgstr "Desequipar"
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
#, fuzzy, c-format
msgid "Strength: %d"
msgstr "Força:"
-#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:82
+#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:84
#, fuzzy, c-format
msgid "Agility: %d"
msgstr "Agilidade:"
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:86
+#: src/net/ea/generalhandler.cpp:96 src/net/tmwserv/generalhandler.cpp:88
#, fuzzy, c-format
msgid "Vitality: %d"
msgstr "Vitalidade:"
-#: src/net/ea/generalhandler.cpp:96 src/net/tmwserv/generalhandler.cpp:88
+#: src/net/ea/generalhandler.cpp:98 src/net/tmwserv/generalhandler.cpp:90
#, fuzzy, c-format
msgid "Intelligence: %d"
msgstr "Inteligência:"
-#: src/net/ea/generalhandler.cpp:98 src/net/tmwserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:100 src/net/tmwserv/generalhandler.cpp:86
#, fuzzy, c-format
msgid "Dexterity: %d"
msgstr "Destreza:"
-#: src/net/ea/generalhandler.cpp:100
+#: src/net/ea/generalhandler.cpp:102
#, c-format
msgid "Luck: %d"
msgstr ""
-#: 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 ""
-#: 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 ""
+
+#: src/net/ea/gui/partytab.cpp:53
msgid "/create > Create a new party"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:55
+#: src/net/ea/gui/partytab.cpp:54
msgid "/new > Alias of create"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:56
+#: src/net/ea/gui/partytab.cpp:55
msgid "/invite > Invite a player to your party"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:57
+#: src/net/ea/gui/partytab.cpp:56
msgid "/leave > Leave the party you are in"
msgstr ""
-#: 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 ""
-#: src/net/ea/gui/partytab.cpp:59
+#: src/net/ea/gui/partytab.cpp:58
msgid "/item > Show/change party item sharing options"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:60
+#: src/net/ea/gui/partytab.cpp:59
msgid "/exp > Show/change party experience sharing options"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:69
+#: src/net/ea/gui/partytab.cpp:68
msgid "Command: /new <party-name>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:70
+#: src/net/ea/gui/partytab.cpp:69
msgid "Command: /create <party-name>"
msgstr ""
-#: 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 ""
-#: src/net/ea/gui/partytab.cpp:75
+#: src/net/ea/gui/partytab.cpp:74
msgid "Command: /invite <nick>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:82
+#: src/net/ea/gui/partytab.cpp:81
msgid "Command: /leave"
msgstr ""
-#: 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 ""
-#: 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."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:92
+#: src/net/ea/gui/partytab.cpp:91
msgid "Command: /item"
msgstr ""
-#: 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 ""
-#: 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."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:102
+#: src/net/ea/gui/partytab.cpp:101
msgid "Command: /exp"
msgstr ""
-#: 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]"
+msgid "You picked up %s [@@%d|%s@@]"
msgstr ""
-#: 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
#, fuzzy
msgid "Unregistered ID"
msgstr "Remover o Registo"
-#: src/net/ea/loginhandler.cpp:114
+#: src/net/ea/loginhandler.cpp:113
#, fuzzy
msgid "Wrong password"
msgstr "Senha:"
-#: 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
#, fuzzy
msgid "Rejected from server"
msgstr "Seleccione um Personagem"
-#: 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 ""
-#: 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"
" Please contact the GM team via the forums."
msgstr ""
-#: 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."
+#: src/net/ea/partyhandler.cpp:77
+msgid "Could not create party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:82
-msgid "Could not create party."
+#: src/net/ea/partyhandler.cpp:80
+msgid "Party successfully created."
msgstr ""
-#: src/net/ea/partyhandler.cpp:112
+#: src/net/ea/partyhandler.cpp:115
#, c-format
msgid "%s is already a member of a party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:116
+#: src/net/ea/partyhandler.cpp:119
#, c-format
msgid "%s refused your invitation."
msgstr ""
-#: src/net/ea/partyhandler.cpp:120
+#: src/net/ea/partyhandler.cpp:123
#, c-format
msgid "%s is now a member of your party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:124
+#: src/net/ea/partyhandler.cpp:127
#, c-format
msgid "Unknown invite response for %s."
msgstr ""
-#: 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 ""
-#: src/net/ea/partyhandler.cpp:269
+#: src/net/ea/partyhandler.cpp:272
#, c-format
msgid "An unknown member tried to say: %s"
msgstr ""
-#: 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 ""
-#: 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"
+#: 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 ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
@@ -2903,44 +2937,102 @@ msgstr ""
msgid "Willpower:"
msgstr "Força de Vontade:"
-#: 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
#, fuzzy, c-format
msgid "Willpower: %d"
msgstr "Força de Vontade:"
-#: 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
+#, fuzzy
+msgid "Server is full"
+msgstr "Servidor:"
+
+#: 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 ""
+
+#: src/net/tmwserv/loginhandler.cpp:143
+msgid "Old email address incorrect"
+msgstr ""
+
+#: src/net/tmwserv/loginhandler.cpp:149
+msgid "The new Email Address already exists."
+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 "Senha:"
+
+#: src/net/tmwserv/loginhandler.cpp:211
+msgid "Wrong username, password or email address"
+msgstr ""
+
+#: src/net/tmwserv/loginhandler.cpp:214
+msgid "Username already exists"
+msgstr ""
+
+#: src/net/tmwserv/loginhandler.cpp:217
+msgid "Email address already exists"
+msgstr ""
+
+#: src/resources/itemdb.cpp:52
#, fuzzy, c-format
msgid "Attack %+d"
msgstr ""
"Copy text \t\r\n"
"Ataque %+d"
-#: src/resources/itemdb.cpp:54
+#: src/resources/itemdb.cpp:53
#, fuzzy, c-format
msgid "Defense %+d"
msgstr ""
"Copy text \t\r\n"
"Defesa %+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 ""
-#: src/resources/itemdb.cpp:151
+#: src/resources/itemdb.cpp:150
msgid "Unnamed"
msgstr ""
@@ -2956,6 +3048,20 @@ msgstr ""
msgid "NPC Database: Error while loading npcs.xml!"
msgstr ""
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "> Cancel\n"
+#~ msgstr "Cancelar"
+
+#, fuzzy
+#~ msgid "use"
+#~ msgstr "Usar"
+
+#, fuzzy
+#~ msgid "Emote Window"
+#~ msgstr "Reiniciar Janelas"
+
#~ msgid "@@description|Description@@"
#~ msgstr "@@descrição|Descrição@@"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 2ee0ebde..01ad4130 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-04-21 17:27+0200\n"
+"POT-Creation-Date: 2009-05-10 15:53+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"
@@ -17,312 +17,313 @@ msgstr ""
"X-Launchpad-Export-Date: 2009-01-25 22:24+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
-#: src/commandhandler.cpp:142
+#: src/commandhandler.cpp:141
msgid "-- Help --"
msgstr "--Ajuda--"
-#: src/commandhandler.cpp:143 src/net/ea/gui/partytab.cpp:53
+#: src/commandhandler.cpp:142
#, fuzzy
-msgid "/help > Display this help."
+msgid "/help > Display this help"
msgstr "/help: Mostra esta ajuda"
-#: src/commandhandler.cpp:145
+#: src/commandhandler.cpp:144
#, fuzzy
msgid "/where > Display map name"
msgstr "/where: mostra o nome do mapa"
-#: src/commandhandler.cpp:146
+#: src/commandhandler.cpp:145
#, fuzzy
msgid "/who > Display number of online users"
msgstr "/who Mostra os jogadores online"
-#: src/commandhandler.cpp:147
+#: src/commandhandler.cpp:146
msgid "/me > Tell something about yourself"
msgstr ""
-#: src/commandhandler.cpp:149
+#: src/commandhandler.cpp:148
#, fuzzy
msgid "/clear > Clears this window"
msgstr "/clear: limpa esta janela"
-#: src/commandhandler.cpp:151
+#: src/commandhandler.cpp:150
#, fuzzy
msgid "/msg > Send a private message to a user"
msgstr "/whisper <nick> <mensagem>: Envia uma mensagem particular"
-#: src/commandhandler.cpp:152
+#: src/commandhandler.cpp:151
msgid "/whisper > Alias of msg"
msgstr ""
-#: src/commandhandler.cpp:153
+#: src/commandhandler.cpp:152
msgid "/w > Alias of msg"
msgstr ""
-#: src/commandhandler.cpp:154
+#: src/commandhandler.cpp:153
msgid "/query > Makes a tab for private messages with another user"
msgstr ""
-#: src/commandhandler.cpp:155
+#: src/commandhandler.cpp:154
msgid "/q > Alias of query"
msgstr ""
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:156
msgid "/list > Display all public channels"
msgstr ""
-#: src/commandhandler.cpp:158
+#: src/commandhandler.cpp:157
msgid "/join > Join or create a channel"
msgstr ""
-#: src/commandhandler.cpp:160
+#: src/commandhandler.cpp:159
#, fuzzy
msgid "/party > Invite a user to party"
msgstr "@@grupo|Convidar %s para entrar para o seu grupo"
-#: src/commandhandler.cpp:162
+#: src/commandhandler.cpp:161
msgid "/record > Start recording the chat to an external file"
msgstr ""
-#: 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 ""
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:165
#, fuzzy
msgid "/announce > Global announcement (GM only)"
msgstr "/announce: Aviso geral (Apenas GM)"
-#: src/commandhandler.cpp:170
+#: src/commandhandler.cpp:169
msgid "For more information, type /help <command>"
msgstr "Para mais informações, digite /help <comando>"
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:173
msgid "Command: /help"
msgstr "Comando: /help"
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:174
msgid "This command displays a list of all commands available."
msgstr "Exibe uma lista de todos os comandos disponiveis."
-#: src/commandhandler.cpp:176
+#: src/commandhandler.cpp:175
msgid "Command: /help <command>"
msgstr "Comando: /help <comando>"
-#: src/commandhandler.cpp:177
+#: src/commandhandler.cpp:176
msgid "This command displays help on <command>."
msgstr "Exibe o conteudo de ajuda de <comando>"
-#: src/commandhandler.cpp:185
+#: src/commandhandler.cpp:184
msgid "Command: /announce <msg>"
msgstr "Comandos: /announce <msg>"
-#: src/commandhandler.cpp:186
+#: src/commandhandler.cpp:185
msgid "*** only available to a GM ***"
msgstr "*** Disponivel apenas para GM's ***"
-#: src/commandhandler.cpp:187
+#: src/commandhandler.cpp:186
msgid "This command sends the message <msg> to all players currently online."
msgstr "Este comando envia uma mensagem <msg> para todos os jogadores online."
-#: src/commandhandler.cpp:192
+#: src/commandhandler.cpp:191
msgid "Command: /clear"
msgstr "Comandos: /clear"
-#: src/commandhandler.cpp:193
+#: src/commandhandler.cpp:192
msgid "This command clears the chat log of previous chat."
msgstr "Limpa os logs do chat anterior."
-#: src/commandhandler.cpp:197
+#: src/commandhandler.cpp:196
#, fuzzy
msgid "Command: /join <channel>"
msgstr "Comando: /help"
-#: src/commandhandler.cpp:198
+#: src/commandhandler.cpp:197
#, fuzzy
msgid "This command makes you enter <channel>."
msgstr "Exibe o conteudo de ajuda de <comando>"
-#: 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
#, fuzzy
msgid "Command: /list"
msgstr "Comando: /help"
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:203
#, fuzzy
msgid "This command shows a list of all channels."
msgstr "Exibe uma lista de todos os comandos disponiveis."
-#: src/commandhandler.cpp:208
+#: src/commandhandler.cpp:207
#, fuzzy
msgid "Command: /me <message>"
msgstr "Comandos: /announce <msg>"
-#: src/commandhandler.cpp:209
+#: src/commandhandler.cpp:208
msgid "This command tell others you are (doing) <msg>."
msgstr ""
-#: src/commandhandler.cpp:213
+#: src/commandhandler.cpp:212
#, fuzzy
msgid "Command: /msg <nick> <message>"
msgstr "Comando: /w <nick> <msg>"
-#: src/commandhandler.cpp:214
+#: src/commandhandler.cpp:213
#, fuzzy
msgid "Command: /whisper <nick> <message>"
msgstr "Comando: /whisper <nick> <msg>"
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:214
#, fuzzy
msgid "Command: /w <nick> <message>"
msgstr "Comando: /w <nick> <msg>"
-#: src/commandhandler.cpp:216
+#: src/commandhandler.cpp:215
#, fuzzy
msgid "This command sends the text <message> to <nick>."
msgstr "Envia uma mensagem <msg> para <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 "Se <nick> possuir espaços, coloque dentro de parenteses (\")."
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:221
#, fuzzy
msgid "Command: /query <nick>"
msgstr "Comando: /w <nick> <msg>"
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:222
#, fuzzy
msgid "Command: /q <nick>"
msgstr "Comando: /w <nick> <msg>"
-#: src/commandhandler.cpp:224
+#: src/commandhandler.cpp:223
msgid "This command tries to make a tab for whispers betweenyou and <nick>."
msgstr ""
-#: src/commandhandler.cpp:229
+#: src/commandhandler.cpp:228
#, fuzzy
msgid "Command: /party <nick>"
msgstr "Comando: /w <nick> <msg>"
-#: 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 ""
-#: src/commandhandler.cpp:236
+#: src/commandhandler.cpp:235
#, fuzzy
msgid "Command: /present"
msgstr "Comando: /where"
-#: 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
#, fuzzy
msgid "Command: /record <filename>"
msgstr "Comandos: /clear"
-#: src/commandhandler.cpp:244
+#: src/commandhandler.cpp:243
#, fuzzy
msgid "This command starts recording the chat log to the file <filename>."
msgstr "Limpa os logs do chat anterior."
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:245
#, fuzzy
msgid "Command: /record"
msgstr "Comandos: /clear"
-#: src/commandhandler.cpp:247
+#: src/commandhandler.cpp:246
msgid "This command finishes a recording session."
msgstr ""
-#: src/commandhandler.cpp:251
+#: src/commandhandler.cpp:250
#, fuzzy
msgid "Command: /toggle <state>"
msgstr "Comandos: /announce <msg>"
-#: 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 ""
-#: src/commandhandler.cpp:257
+#: src/commandhandler.cpp:256
#, fuzzy
msgid "Command: /toggle"
msgstr "Comandos: /clear"
-#: src/commandhandler.cpp:258
+#: src/commandhandler.cpp:257
#, fuzzy
msgid "This command displays the return toggle status."
msgstr "Mostra o nome do mapa atual."
-#: src/commandhandler.cpp:262
+#: src/commandhandler.cpp:261
msgid "Command: /where"
msgstr "Comando: /where"
-#: src/commandhandler.cpp:263
+#: src/commandhandler.cpp:262
msgid "This command displays the name of the current map."
msgstr "Mostra o nome do mapa atual."
-#: src/commandhandler.cpp:267
+#: src/commandhandler.cpp:266
msgid "Command: /who"
msgstr "Comando: /who"
-#: src/commandhandler.cpp:268
+#: src/commandhandler.cpp:267
msgid "This command displays the number of players currently online."
msgstr "Exibe o total de jogadores online."
-#: src/commandhandler.cpp:273
+#: src/commandhandler.cpp:272
msgid "Unknown command."
msgstr "Comando desconhecido."
-#: src/commandhandler.cpp:274
+#: src/commandhandler.cpp:273
msgid "Type /help for a list of commands."
msgstr "Digite /help para uma lista de todos os comandos."
-#: src/commandhandler.cpp:336
-msgid "Cannont send empty whispers!"
-msgstr ""
+#: src/commandhandler.cpp:339
+#, fuzzy
+msgid "Cannot send empty whispers!"
+msgstr "Impossivel gritar!"
-#: 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 ""
-#: 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 ""
@@ -331,47 +332,47 @@ msgstr ""
msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
msgstr ""
-#: 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
#, fuzzy
msgid "Saving screenshot failed!"
msgstr "Falha ao sentar!"
-#: src/game.cpp:492
-msgid "Network Error"
+#: src/game.cpp:481
+msgid "The connection to the server was lost, the program will now quit"
msgstr ""
-#: src/game.cpp:493
-msgid "The connection to the server was lost, the program will now quit"
+#: src/game.cpp:487
+msgid "Network Error"
msgstr ""
-#: src/game.cpp:664 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
+#: 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 "Sair"
-#: src/game.cpp:665
+#: src/game.cpp:647
#, fuzzy
msgid "Are you sure you want to quit?"
msgstr "Tem certeza que deseja excluir este personagem?"
-#: 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 ""
@@ -384,12 +385,12 @@ msgstr "Comprar"
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 "Comprar"
#: 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
#, fuzzy, c-format
msgid "Price: %s / Total: %s"
msgstr "Preço: %d GP / Total: %d GP"
@@ -400,13 +401,13 @@ msgid "Max"
msgstr "máximo"
#: 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 "Descrição: %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 "Efeito: %s"
@@ -415,205 +416,213 @@ msgstr "Efeito: %s"
msgid "Shop"
msgstr "Loja"
-#: 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 "Vender"
-#: 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 "Cancelar"
-#: 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 "Alterar e-mail"
-#: 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 "Conta: %s"
-#: src/gui/changeemaildialog.cpp:48
+#: src/gui/changeemaildialog.cpp:49
#, fuzzy
msgid "Type New Email Address twice:"
msgstr "Alterar e-mail"
-#: 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 "Alterar senha"
-#: 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 "Senha:"
-#: 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 "Criar Personagem"
-#: 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 "Nome:"
-#: src/gui/charcreatedialog.cpp:70
+#: src/gui/charcreatedialog.cpp:69
msgid "Hair Color:"
msgstr "Cor do Cabelo:"
-#: src/gui/charcreatedialog.cpp:73
+#: src/gui/charcreatedialog.cpp:72
msgid "Hair Style:"
msgstr "Estilo do Cabelo:"
-#: src/gui/charcreatedialog.cpp:74
+#: src/gui/charcreatedialog.cpp:73
msgid "Create"
msgstr "Criar"
-#: src/gui/charcreatedialog.cpp:76 src/gui/register.cpp:75
+#: src/gui/charcreatedialog.cpp:75 src/gui/register.cpp:75
msgid "Male"
msgstr "Homem"
-#: src/gui/charcreatedialog.cpp:77 src/gui/register.cpp:76
+#: src/gui/charcreatedialog.cpp:76 src/gui/register.cpp:76
msgid "Female"
msgstr "Mulher"
-#: 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 "Por favor distribua %d pontos"
-#: 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 "Erro"
-#: src/gui/charcreatedialog.cpp:174
+#: src/gui/charcreatedialog.cpp:173
msgid "Your name needs to be at least 4 characters."
msgstr "Seu nome precisa ter no mínimo 4 caracteres."
-#: src/gui/charcreatedialog.cpp:227
+#: src/gui/charcreatedialog.cpp:226
msgid "Character stats OK"
msgstr "Status do personagem OK"
-#: src/gui/charcreatedialog.cpp:239
+#: src/gui/charcreatedialog.cpp:238
#, c-format
msgid "Please remove %d points"
msgstr "Por favor remova %d pontos"
-#: src/gui/char_select.cpp:79
+#: src/gui/charselectdialog.cpp:78
msgid "Confirm Character Delete"
msgstr "Confimar exclusão do personagem"
-#: src/gui/char_select.cpp:80
+#: src/gui/charselectdialog.cpp:79
msgid "Are you sure you want to delete this character?"
msgstr "Tem certeza que deseja excluir este personagem?"
-#: src/gui/char_select.cpp:98
+#: src/gui/charselectdialog.cpp:97
msgid "Account and Character Management"
msgstr "Gerenciamento de Conta e Personagem"
-#: src/gui/char_select.cpp:105
+#: src/gui/charselectdialog.cpp:104
msgid "Select Character"
msgstr "Selecionar personagem"
-#: 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 "Ok"
-#: src/gui/char_select.cpp:113
+#: src/gui/charselectdialog.cpp:112
msgid "Previous"
msgstr "Anterior"
-#: 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 "Próximo"
-#: 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 "Nome: %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 "Nível: %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 "Novo"
-#: 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 "Excluir"
-#: src/gui/char_select.cpp:120 src/gui/unregisterdialog.cpp:51
+#: src/gui/charselectdialog.cpp:119 src/gui/unregisterdialog.cpp:52
msgid "Unregister"
msgstr "Cancelar Registro"
-#: src/gui/char_select.cpp:127
+#: src/gui/charselectdialog.cpp:126
#, c-format
msgid "Money: %d"
msgstr "Dinheiro: %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 "Nível de Trabalho: %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
#, fuzzy, c-format
msgid "Money: %s"
msgstr "Dinheiro: %d"
-#: 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
#, fuzzy
msgid "Chat"
msgstr "Criar"
-#: src/gui/chat.cpp:341 src/gui/chat.cpp:347
+#: src/gui/chat.cpp:332
+#, c-format
+msgid "%d players are present."
+msgstr ""
+
+#: 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 "Sussurrando para %s: %s"
-#: src/gui/confirm_dialog.cpp:42
+#: src/gui/confirmdialog.cpp:42
msgid "Yes"
msgstr "Sim"
-#: src/gui/confirm_dialog.cpp:43
+#: src/gui/confirmdialog.cpp:43
msgid "No"
msgstr "Não"
@@ -621,26 +630,16 @@ msgstr "Não"
msgid "Connecting..."
msgstr "Conectando..."
-#: src/gui/emotecontainer.cpp:61
+#: src/gui/emotepopup.cpp:64
msgid "Unable to load selection.png"
msgstr ""
-#: 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 "Usar"
-
-#: src/gui/equipmentwindow.cpp:68 src/gui/menuwindow.cpp:67
+#: src/gui/equipmentwindow.cpp:68 src/gui/windowmenu.cpp:60
msgid "Equipment"
msgstr "Equipamento"
-#: 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 "Desequipar"
@@ -667,102 +666,105 @@ msgstr "Guildas"
msgid "Help"
msgstr "Ajuda"
-#: 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 "Fechar"
-#: src/gui/inventorywindow.cpp:51 src/gui/menuwindow.cpp:68
+#: src/gui/inventorywindow.cpp:54 src/gui/windowmenu.cpp:61
msgid "Inventory"
msgstr "Inventório"
-#: 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 "Equipar"
-#: 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 "Usar"
+
+#: src/gui/inventorywindow.cpp:80
msgid "Drop"
msgstr "Descartar"
-#: src/gui/inventorywindow.cpp:79
+#: src/gui/inventorywindow.cpp:81
msgid "Split"
msgstr "Dividir"
-#: src/gui/inventorywindow.cpp:93
+#: src/gui/inventorywindow.cpp:92
msgid "Slots:"
msgstr ""
-#: src/gui/inventorywindow.cpp:94
+#: src/gui/inventorywindow.cpp:93
#, fuzzy
msgid "Weight:"
msgstr "Capacidade: %d / %d"
-#: 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 "Selecionar montante de itens para negociar."
-#: src/gui/item_amount.cpp:95
+#: src/gui/itemamount.cpp:124
msgid "Select amount of items to drop."
msgstr "Selecionar montante de itens para descartar."
-#: src/gui/item_amount.cpp:98
+#: src/gui/itemamount.cpp:127
#, fuzzy
msgid "Select amount of items to store."
msgstr "Selecionar montante de itens para negociar."
-#: src/gui/item_amount.cpp:101
+#: src/gui/itemamount.cpp:130
#, fuzzy
msgid "Select amount of items to retrieve."
msgstr "Selecionar montante de itens para negociar."
-#: src/gui/item_amount.cpp:104
+#: src/gui/itemamount.cpp:133
msgid "Select amount of items to split."
msgstr "Selecionar montante de itens para dividir."
-#: src/gui/itempopup.cpp:89
+#: src/gui/itempopup.cpp:91
#, fuzzy
msgid "Weight: "
msgstr "Capacidade: %d / %d"
-#: src/gui/login.cpp:47
+#: src/gui/login.cpp:48
msgid "Login"
msgstr "Login"
-#: 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 "Servidor:"
-#: 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 "Porta:"
-#: src/gui/login.cpp:55
+#: src/gui/login.cpp:56
#, fuzzy
msgid "Recent:"
msgstr "Registrar"
-#: src/gui/login.cpp:72
+#: src/gui/login.cpp:73
msgid "Remember Username"
msgstr "Lembrar nome de usuário"
-#: 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 "OK"
-#: 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 "Registrar"
-#: 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 ""
@@ -778,71 +780,44 @@ msgstr ""
msgid "Cast Test Spell 3"
msgstr ""
-#: src/gui/menuwindow.cpp:66
-msgid "Status"
-msgstr "Status"
-
-#: src/gui/menuwindow.cpp:69 src/gui/skill.cpp:126 src/gui/skilldialog.cpp:99
-msgid "Skills"
-msgstr "Habilidades"
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
+#, fuzzy
+msgid "Map"
+msgstr "máximo"
-#: src/gui/menuwindow.cpp:72
-msgid "Guilds"
-msgstr "Guildas"
+#: src/gui/npcdialog.cpp:43
+msgid "Waiting for server"
+msgstr ""
-#: src/gui/menuwindow.cpp:73
+#: src/gui/npcdialog.cpp:46
#, fuzzy
-msgid "Buddys"
-msgstr "Comprar"
-
-#: src/gui/menuwindow.cpp:75
-msgid "Shortcut"
-msgstr "Atalho"
+msgid "Submit"
+msgstr "Dividir"
-#: src/gui/menuwindow.cpp:77 src/gui/setup.cpp:65 src/main.cpp:920
-msgid "Setup"
-msgstr "Configurar"
+#: src/gui/npcdialog.cpp:49 src/gui/npcpostdialog.cpp:39
+msgid "NPC"
+msgstr "NPC"
-#: src/gui/minimap.cpp:39
-msgid "MiniMap"
-msgstr "MiniMapa"
+#: src/gui/npcdialog.cpp:95
+msgid "+"
+msgstr ""
-#: src/gui/npcintegerdialog.cpp:39
-msgid "NPC Number Request"
+#: src/gui/npcdialog.cpp:96
+msgid "-"
msgstr ""
-#: src/gui/npcintegerdialog.cpp:50
+#: src/gui/npcdialog.cpp:105
#, fuzzy
msgid "Reset"
msgstr "Registrar"
-#: src/gui/npcintegerdialog.cpp:101 src/gui/npclistdialog.cpp:123
-#: src/gui/npcstringdialog.cpp:75
-#, fuzzy
-msgid ""
-"\n"
-"> Cancel\n"
-msgstr "Cancelar"
-
-#: src/gui/npcpostdialog.cpp:39 src/gui/npc_text.cpp:37
-msgid "NPC"
-msgstr "NPC"
-
#: src/gui/npcpostdialog.cpp:51
#, fuzzy
msgid "Send"
msgstr "Som"
-#: src/gui/npcstringdialog.cpp:39
-msgid "NPC Text Request"
-msgstr ""
-
-#: 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
#, fuzzy
msgid "Text"
msgstr "Próximo"
@@ -899,7 +874,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
#, fuzzy
msgid "Party"
msgstr "Jogar"
@@ -922,7 +897,7 @@ msgid "Being"
msgstr ""
#: src/gui/palette.cpp:104
-msgid "Other Player's Names"
+msgid "Other Players' Names"
msgstr ""
#: src/gui/palette.cpp:105
@@ -949,21 +924,22 @@ msgid "Unknown Item Type"
msgstr ""
#: src/gui/palette.cpp:111
-msgid "Generic"
+msgid "Generics"
msgstr ""
#: src/gui/palette.cpp:112
-msgid "Hat"
-msgstr ""
+#, fuzzy
+msgid "Hats"
+msgstr "Status"
#: src/gui/palette.cpp:113
#, fuzzy
-msgid "Usable"
+msgid "Usables"
msgstr "Usar"
#: src/gui/palette.cpp:114
#, fuzzy
-msgid "Shirt"
+msgid "Shirts"
msgstr "Atalho"
#: src/gui/palette.cpp:115
@@ -986,15 +962,15 @@ msgstr ""
#: src/gui/palette.cpp:119
#, fuzzy
-msgid "Shield"
+msgid "Shields"
msgstr "Vender"
#: src/gui/palette.cpp:120
-msgid "Ring"
+msgid "Rings"
msgstr ""
#: src/gui/palette.cpp:121
-msgid "Necklace"
+msgid "Necklaces"
msgstr ""
#: src/gui/palette.cpp:122
@@ -1051,94 +1027,103 @@ msgstr ""
msgid "1/4 HP Bar"
msgstr ""
-#: src/gui/popupmenu.cpp:73
+#: src/gui/popupmenu.cpp:75
msgid "@@name|Add name to chat@@"
msgstr ""
-#: src/gui/popupmenu.cpp:85
+#: src/gui/popupmenu.cpp:87
#, c-format
msgid "@@trade|Trade With %s@@"
msgstr "@@Negociar|Negociar com %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 "@@atacar|Atacar %s@@"
-#: src/gui/popupmenu.cpp:92
+#: src/gui/popupmenu.cpp:94
#, c-format
msgid "@@friend|Befriend %s@@"
msgstr ""
-#: 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
#, fuzzy, c-format
msgid "@@ignore|Ignore %s@@"
msgstr "@@guilda|convidar %s@@"
-#: 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
#, fuzzy, c-format
msgid "@@guild|Invite %s to join your guild@@"
msgstr "@@grupo|Convidar %s para entrar para o seu grupo"
-#: src/gui/popupmenu.cpp:112
+#: src/gui/popupmenu.cpp:114
#, c-format
msgid "@@party|Invite %s to join your party@@"
msgstr "@@grupo|Convidar %s para entrar para o seu grupo"
-#: src/gui/popupmenu.cpp:123
+#: src/gui/popupmenu.cpp:125
#, fuzzy, c-format
msgid "@@talk|Talk To %s@@"
msgstr "@@falar|Falar com NPC@@"
-#: 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 "@@cancelar|Cancelar@@"
-#: src/gui/popupmenu.cpp:155
-#, c-format
-msgid "@@pickup|Pick Up %s@@"
+#: src/gui/popupmenu.cpp:157
+#, fuzzy, c-format
+msgid "@@pickup|Pick up %s@@"
msgstr "@@pegar|Pegar %s@@"
-#: src/gui/popupmenu.cpp:156 src/gui/popupmenu.cpp:352
-msgid "@@chat|Add to Chat@@"
+#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:373
+msgid "@@chat|Add to chat@@"
msgstr ""
-#: src/gui/popupmenu.cpp:336 src/gui/popupmenu.cpp:341
-msgid "@@use|Equip@@"
-msgstr "@@usar|Equipar@@"
-
-#: src/gui/popupmenu.cpp:339
+#: src/gui/popupmenu.cpp:348
msgid "@@use|Unequip@@"
msgstr "@@usar|Desequipar@@"
-#: src/gui/popupmenu.cpp:345
+#: src/gui/popupmenu.cpp:350
+msgid "@@use|Equip@@"
+msgstr "@@usar|Equipar@@"
+
+#: src/gui/popupmenu.cpp:353
msgid "@@use|Use@@"
msgstr "@@usar|Usar@@"
-#: src/gui/popupmenu.cpp:347
+#: src/gui/popupmenu.cpp:355
msgid "@@drop|Drop@@"
msgstr "@@descartar|Descartar@@"
-#: src/gui/popupmenu.cpp:350
+#: src/gui/popupmenu.cpp:359
msgid "@@split|Split@@"
msgstr "@@dividir|Dividir@@"
+#: src/gui/popupmenu.cpp:364
+#, fuzzy
+msgid "@@store|Store@@"
+msgstr "@@guilda|convidar %s@@"
+
+#: src/gui/popupmenu.cpp:371
+msgid "@@retrieve|Retrieve@@"
+msgstr ""
+
#: src/gui/quitdialog.cpp:37
msgid "Switch server"
msgstr "Trocar servidor"
@@ -1208,19 +1193,31 @@ msgstr "A senha deve ser menor que %d caracteres."
msgid "Passwords do not match."
msgstr "Senhas não conferem."
-#: src/gui/serverdialog.cpp:73
+#: src/gui/serverdialog.cpp:74
#, fuzzy
msgid "Choose your server"
msgstr "Escolha seu Servidor de Mana World"
-#: src/gui/serverdialog.cpp:163
+#: src/gui/serverdialog.cpp:164
msgid "Please type both the address and the port of a server."
msgstr "Por favor especifique ambos os Endereços e a Porta do servidor"
-#: src/gui/serverselectdialog.cpp:50
+#: src/gui/serverselectdialog.cpp:59
msgid "Select Server"
msgstr "Selecionar Servidor"
+#: src/gui/setup.cpp:64 src/gui/windowmenu.cpp:69 src/main.cpp:933
+msgid "Setup"
+msgstr "Configurar"
+
+#: src/gui/setup.cpp:72
+msgid "Apply"
+msgstr "Aplicar"
+
+#: src/gui/setup.cpp:72
+msgid "Reset Windows"
+msgstr "Restaurar janelas"
+
#: src/gui/setup_audio.cpp:41
msgid "Sound"
msgstr "Som"
@@ -1237,11 +1234,11 @@ msgstr "Volume Sfx"
msgid "Music volume"
msgstr "Volume da Música"
-#: 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
#, fuzzy
msgid "Colors"
msgstr "Fechar"
@@ -1250,24 +1247,24 @@ msgstr "Fechar"
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
#, fuzzy
msgid "Static"
msgstr "Status"
#: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:431
#, fuzzy
msgid "Pulse"
msgstr "Fechar"
#: 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
#, fuzzy
msgid "Spectrum"
msgstr "Configurar"
@@ -1276,26 +1273,18 @@ msgstr "Configurar"
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 "Aplicar"
-
-#: src/gui/setup.cpp:73
-msgid "Reset Windows"
-msgstr "Restaurar janelas"
-
#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:78
msgid "Press the button to start calibration"
msgstr "Aperto o botão para começar a calibração"
@@ -1364,7 +1353,7 @@ msgstr "Desconsiderado"
msgid "Ignored"
msgstr "Ignorado"
-#: src/gui/setup_players.cpp:207
+#: src/gui/setup_players.cpp:207 src/gui/setup_video.cpp:131
msgid "???"
msgstr ""
@@ -1392,158 +1381,180 @@ msgstr "Jogadores"
msgid "When ignoring:"
msgstr "Quando ignorado:"
-#: src/gui/setup_video.cpp:123
+#: src/gui/setup_video.cpp:112
+msgid "Tiny"
+msgstr ""
+
+#: src/gui/setup_video.cpp:113
+#, fuzzy
+msgid "Small"
+msgstr "Vender"
+
+#: src/gui/setup_video.cpp:114
+#, fuzzy
+msgid "Medium"
+msgstr "médio"
+
+#: src/gui/setup_video.cpp:115
+msgid "Large"
+msgstr ""
+
+#: src/gui/setup_video.cpp:151
msgid "Full screen"
msgstr "Tela cheia"
-#: 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 "Cursor customizado"
-#: src/gui/setup_video.cpp:126
+#: src/gui/setup_video.cpp:155
msgid "Visible names"
msgstr "Nomes visíveis"
-#: src/gui/setup_video.cpp:127
+#: src/gui/setup_video.cpp:157
#, fuzzy
msgid "Particle effects"
msgstr "Detalhe de partículas"
-#: 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 ""
-#: src/gui/setup_video.cpp:136
+#: src/gui/setup_video.cpp:167
msgid "FPS Limit:"
msgstr "Limite FPS:"
-#: src/gui/setup_video.cpp:152
+#: src/gui/setup_video.cpp:184
msgid "Video"
msgstr "Vídeo"
-#: 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 "Opacidade da GUI"
-#: src/gui/setup_video.cpp:159
+#: src/gui/setup_video.cpp:191
msgid "Scroll radius"
msgstr "Rolar radius"
-#: src/gui/setup_video.cpp:160
+#: src/gui/setup_video.cpp:192
msgid "Scroll laziness"
msgstr "Rolar Laziness"
-#: src/gui/setup_video.cpp:161
+#: src/gui/setup_video.cpp:193
msgid "Ambient FX"
msgstr "Ambiente FX"
-#: src/gui/setup_video.cpp:162
+#: src/gui/setup_video.cpp:194
msgid "Particle Detail"
msgstr "Detalhe de partículas"
-#: 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
#, fuzzy
msgid "No text"
msgstr "Próximo"
-#: src/gui/setup_video.cpp:236 src/gui/setup_video.cpp:498
+#: src/gui/setup_video.cpp:271 src/gui/setup_video.cpp:570
#, fuzzy
msgid "Bubbles, no names"
msgstr "Nomes visíveis"
-#: 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 ""
-#: 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 "desligado"
-#: 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 "baixo"
-#: 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 "alto"
-#: 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 "médio"
-#: 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 "máximo"
-#: 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
#, fuzzy
msgid "fullscreen"
msgstr "Tela cheia"
-#: 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 "Mudando para Tela cheia"
-#: src/gui/setup_video.cpp:352
+#: src/gui/setup_video.cpp:422
msgid "Restart needed for changes to take effect."
msgstr "É preciso reiniciar para as mudanças terem efeito."
-#: src/gui/setup_video.cpp:364
+#: src/gui/setup_video.cpp:434
msgid "Changing OpenGL"
msgstr "Trocando OpenGL"
-#: src/gui/setup_video.cpp:365
+#: src/gui/setup_video.cpp:435
msgid "Applying change to OpenGL requires restart."
msgstr "Aplicando mudança a OpenGL requer reiniciar o jogo."
-#: 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
#, fuzzy
msgid "Restart your client for the change to take effect."
msgstr "É preciso reiniciar para as mudanças terem efeito."
-#: 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 ""
@@ -1556,6 +1567,10 @@ msgstr "Habilidades"
msgid "Mystery Skill"
msgstr "Habilidade Mistério"
+#: src/gui/skill.cpp:126 src/gui/skilldialog.cpp:99 src/gui/windowmenu.cpp:62
+msgid "Skills"
+msgstr "Habilidades"
+
#: src/gui/skill.cpp:145 src/gui/skill.cpp:197
#, c-format
msgid "Skill points: %d"
@@ -1565,15 +1580,6 @@ msgstr "Pontos de habilidade: %d"
msgid "Up"
msgstr "Acima"
-#: src/gui/skill.cpp:146
-msgid "inc"
-msgstr ""
-
-#: src/gui/skill.cpp:147
-#, fuzzy
-msgid "use"
-msgstr "Usar"
-
#: src/gui/skilldialog.cpp:113
msgid "Weapons"
msgstr ""
@@ -1583,174 +1589,174 @@ msgstr ""
msgid "Crafts"
msgstr "Criar"
-#: 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 "Trabalho: %d"
-#: src/gui/status.cpp:61
+#: src/gui/status.cpp:60
msgid "HP:"
msgstr ""
-#: src/gui/status.cpp:64
+#: src/gui/status.cpp:63
msgid "Exp:"
msgstr ""
-#: src/gui/status.cpp:67
+#: src/gui/status.cpp:66
msgid "MP:"
msgstr ""
-#: src/gui/status.cpp:70
+#: src/gui/status.cpp:69
#, fuzzy
msgid "Job:"
msgstr "Trabalho: %d"
-#: src/gui/status.cpp:78
+#: src/gui/status.cpp:77
msgid "Stats"
msgstr "Status"
-#: src/gui/status.cpp:79
+#: src/gui/status.cpp:78
msgid "Total"
msgstr "Total"
-#: src/gui/status.cpp:80
+#: src/gui/status.cpp:79
msgid "Cost"
msgstr "Custo"
-#: src/gui/status.cpp:84
+#: src/gui/status.cpp:83
msgid "Attack:"
msgstr "Ataque:"
-#: src/gui/status.cpp:85
+#: src/gui/status.cpp:84
msgid "Defense:"
msgstr "Defesa:"
-#: src/gui/status.cpp:86
+#: src/gui/status.cpp:85
msgid "M.Attack:"
msgstr "M. Ataque:"
-#: src/gui/status.cpp:87
+#: src/gui/status.cpp:86
msgid "M.Defense:"
msgstr "M. Defesa:"
-#: src/gui/status.cpp:89
+#: src/gui/status.cpp:88
#, no-c-format
msgid "% Accuracy:"
msgstr "% Acuracidade:"
-#: src/gui/status.cpp:91
+#: src/gui/status.cpp:90
#, no-c-format
msgid "% Evade:"
msgstr "% Evasão:"
-#: src/gui/status.cpp:93
+#: src/gui/status.cpp:92
#, no-c-format
msgid "% Reflex:"
msgstr "% Reflexo:"
-#: src/gui/status.cpp:199
+#: src/gui/status.cpp:198
msgid "Strength"
msgstr "Força"
-#: src/gui/status.cpp:200
+#: src/gui/status.cpp:199
msgid "Agility"
msgstr "Agilidade"
-#: src/gui/status.cpp:201
+#: src/gui/status.cpp:200
msgid "Vitality"
msgstr "Vitalidade"
-#: src/gui/status.cpp:202
+#: src/gui/status.cpp:201
msgid "Intelligence"
msgstr "Inteligência"
-#: src/gui/status.cpp:203
+#: src/gui/status.cpp:202
msgid "Dexterity"
msgstr "Destreza"
-#: src/gui/status.cpp:204
+#: src/gui/status.cpp:203
msgid "Luck"
msgstr "Sorte"
-#: src/gui/status.cpp:222
+#: src/gui/status.cpp:221
#, c-format
msgid "Remaining Status Points: %d"
msgstr "Pontos de Status Restantes: %d"
-#: src/gui/status.cpp:383 src/gui/status.cpp:405
+#: src/gui/status.cpp:384
#, fuzzy
msgid "Max level"
msgstr "Homem"
-#: src/gui/storagewindow.cpp:53
+#: src/gui/storagewindow.cpp:54
msgid "Storage"
msgstr ""
-#: src/gui/storagewindow.cpp:64
+#: src/gui/storagewindow.cpp:65
#, fuzzy
msgid "Store"
msgstr "Parar"
-#: src/gui/storagewindow.cpp:65
+#: src/gui/storagewindow.cpp:66
msgid "Retrieve"
msgstr ""
-#: src/gui/storagewindow.cpp:75
+#: src/gui/storagewindow.cpp:78
#, fuzzy
msgid "Slots: "
msgstr "Pontos de habilidade: %d"
-#: src/gui/trade.cpp:52
+#: src/gui/trade.cpp:51
msgid "Propose trade"
msgstr "Propor negócio"
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:52
#, fuzzy
msgid "Confirmed. Waiting..."
msgstr "Conectando..."
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:53
#, fuzzy
msgid "Agree trade"
msgstr "Propor negócio"
-#: src/gui/trade.cpp:55
+#: src/gui/trade.cpp:54
#, fuzzy
msgid "Agreed. Waiting..."
msgstr "Atualizando..."
-#: src/gui/trade.cpp:58
+#: src/gui/trade.cpp:57
#, fuzzy
msgid "Trade: You"
msgstr "Comércio"
-#: src/gui/trade.cpp:71 src/gui/trade.cpp:72
+#: src/gui/trade.cpp:70 src/gui/trade.cpp:71
msgid "Trade"
msgstr "Comércio"
-#: src/gui/trade.cpp:74
+#: src/gui/trade.cpp:73
msgid "Add"
msgstr "Adicionar"
-#: 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
#, fuzzy, c-format
msgid "You get %s."
msgstr "Voc pegou %d GP."
-#: src/gui/trade.cpp:97
+#: src/gui/trade.cpp:96
msgid "You give:"
msgstr "Você dá:"
-#: src/gui/trade.cpp:101
+#: src/gui/trade.cpp:100
msgid "Change"
msgstr "Mudar"
-#: 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 ""
"Falha ao adicionar item. Você não pode duplicar um tipo de item na janela."
-#: src/gui/trade.cpp:321
+#: src/gui/trade.cpp:311
#, fuzzy
msgid "You don't have enough money"
msgstr "Você não tem nenhuma nota armazenada"
@@ -1871,21 +1877,21 @@ msgstr ""
msgid "Need a user to kick!"
msgstr ""
-#: src/gui/widgets/chattab.cpp:115
+#: src/gui/widgets/chattab.cpp:114
msgid "Global announcement:"
msgstr "Anúncio geral:"
-#: src/gui/widgets/chattab.cpp:121
+#: src/gui/widgets/chattab.cpp:120
#, c-format
msgid "Global announcement from %s:"
msgstr "Anúncio geral de %s:"
-#: src/gui/widgets/chattab.cpp:147
+#: src/gui/widgets/chattab.cpp:146
#, fuzzy, c-format
msgid "%s whispers: "
msgstr "%s sussura:"
-#: src/gui/widgets/chattab.cpp:241 src/resources/itemdb.cpp:108
+#: src/gui/widgets/chattab.cpp:240 src/resources/itemdb.cpp:107
#, fuzzy
msgid "Unknown item"
msgstr "Comando desconhecido"
@@ -1895,25 +1901,37 @@ msgstr "Comando desconhecido"
msgid "Cannot send empty chat!"
msgstr "Impossivel gritar!"
-#: src/gui/widgets/whispertab.cpp:55
-#, c-format
-msgid "%s: %s"
-msgstr ""
-
-#: src/gui/widgets/whispertab.cpp:69
+#: src/gui/widgets/whispertab.cpp:68
msgid "/close > Close the whisper tab"
msgstr ""
-#: src/gui/widgets/whispertab.cpp:79
+#: src/gui/widgets/whispertab.cpp:78
#, fuzzy
msgid "Command: /close"
msgstr "Comandos: /clear"
-#: src/gui/widgets/whispertab.cpp:80
+#: src/gui/widgets/whispertab.cpp:79
#, fuzzy
msgid "This command closes the current whisper tab."
msgstr "Mostra o nome do mapa atual."
+#: src/gui/windowmenu.cpp:59
+msgid "Status"
+msgstr "Status"
+
+#: src/gui/windowmenu.cpp:65
+msgid "Guilds"
+msgstr "Guildas"
+
+#: src/gui/windowmenu.cpp:66
+#, fuzzy
+msgid "Buddys"
+msgstr "Comprar"
+
+#: src/gui/windowmenu.cpp:68
+msgid "Shortcut"
+msgstr "Atalho"
+
#: src/keyboardconfig.cpp:41
msgid "Move Up"
msgstr ""
@@ -2048,8 +2066,8 @@ msgstr "Restaurar janelas"
#: src/keyboardconfig.cpp:80
#, fuzzy
-msgid "Emote Window"
-msgstr "Falha no Emote!"
+msgid "Party Window"
+msgstr "Restaurar janelas"
#: src/keyboardconfig.cpp:81
msgid "Emote Shortcut Window"
@@ -2099,168 +2117,173 @@ msgstr ""
msgid "Ignore input 2"
msgstr ""
-#: src/localplayer.cpp:849
+#: src/localplayer.cpp:834
#, fuzzy
msgid "Unarmed"
msgstr "Sem nome"
-#: src/localplayer.cpp:850
+#: src/localplayer.cpp:835
msgid "Knife"
msgstr ""
-#: src/localplayer.cpp:851
+#: src/localplayer.cpp:836
#, fuzzy
msgid "Sword"
msgstr "Som"
-#: src/localplayer.cpp:852
+#: src/localplayer.cpp:837
msgid "Polearm"
msgstr ""
-#: src/localplayer.cpp:853
+#: src/localplayer.cpp:838
#, fuzzy
msgid "Staff"
msgstr "Status"
-#: src/localplayer.cpp:854
+#: src/localplayer.cpp:839
msgid "Whip"
msgstr ""
-#: src/localplayer.cpp:855
+#: src/localplayer.cpp:840
#, fuzzy
msgid "Bow"
msgstr "baixo"
-#: src/localplayer.cpp:856
+#: src/localplayer.cpp:841
msgid "Shooting"
msgstr ""
-#: src/localplayer.cpp:857
+#: src/localplayer.cpp:842
#, fuzzy
msgid "Mace"
msgstr "Homem"
-#: 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
#, fuzzy
msgid "Craft"
msgstr "Criar"
-#: 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 ""
-#: src/main.cpp:563
-msgid "Options: "
+#: src/main.cpp:567
+msgid "Options:"
msgstr ""
-#: src/main.cpp:564
-msgid " -C --configfile : Configuration file to use"
+#: src/main.cpp:568
+msgid " -C --config-file : Configuration file to use"
msgstr ""
-#: src/main.cpp:565
-msgid " -d --data : Directory to load game data from"
+#: src/main.cpp:569
+msgid " -d --data : Directory to load game data from"
msgstr ""
-#: src/main.cpp:566
-msgid " -D --default : Bypass the login process with default settings"
+#: src/main.cpp:570
+msgid " -D --default : Choose default character server and character"
msgstr ""
-#: src/main.cpp:568
+#: src/main.cpp:572
#, fuzzy
-msgid " -h --help : Display this help"
+msgid " -h --help : Display this help"
msgstr "/help: Mostra esta ajuda"
-#: src/main.cpp:569
-msgid " -S --homedir : Directory to use as home directory"
+#: src/main.cpp:573
+msgid " -S --home-dir : Directory to use as home directory"
msgstr ""
-#: src/main.cpp:570
-msgid " -H --updatehost : Use this update host"
+#: src/main.cpp:574
+msgid " -H --update-host : Use this update host"
msgstr ""
-#: src/main.cpp:571
-msgid " -P --password : Login with this password"
+#: src/main.cpp:575
+msgid " -P --password : Login with this password"
msgstr ""
-#: src/main.cpp:572
-msgid " -c --character : Login with this character"
+#: src/main.cpp:576
+msgid " -c --character : Login with this character"
msgstr ""
-#: src/main.cpp:573
-msgid " -o --port : Login Server Port"
+#: src/main.cpp:577
+msgid " -p --port : Login Server Port"
msgstr ""
-#: src/main.cpp:574
-msgid " -s --server : Login Server name or IP"
+#: src/main.cpp:578
+msgid " -s --server : Login Server name or IP"
msgstr ""
-#: src/main.cpp:575
-msgid " -u --skipupdate : Skip the update downloads"
+#: src/main.cpp:579
+msgid " -u --skip-update : Skip the update downloads"
msgstr ""
-#: src/main.cpp:576
-msgid " -U --username : Login with this username"
+#: src/main.cpp:580
+msgid " -U --username : Login with this username"
msgstr ""
-#: src/main.cpp:577
-msgid " -v --version : Display the version"
+#: src/main.cpp:582
+msgid " -O --no-opengl : Disable OpenGL for this session"
msgstr ""
-#: src/main.cpp:582
+#: src/main.cpp:584
+#, fuzzy
+msgid " -v --version : Display the version"
+msgstr "/help: Mostra esta ajuda"
+
+#: src/main.cpp:589
#, fuzzy
msgid "The Mana World "
msgstr "Escolha seu Servidor de Mana World"
-#: src/main.cpp:1499
+#: src/main.cpp:1515
msgid "Connecting to map server..."
msgstr "Conectando ao servidor de mapas..."
-#: src/main.cpp:1507
+#: src/main.cpp:1523
msgid "Connecting to character server..."
msgstr "Conectando ao servidor de personagens..."
-#: src/main.cpp:1515
+#: src/main.cpp:1531
msgid "Connecting to account server..."
msgstr "Conectando ao servidor de contas..."
-#: src/net/ea/adminhandler.cpp:67
+#: src/net/ea/adminhandler.cpp:66
#, fuzzy
msgid "Kick failed!"
msgstr "Falha ao sentar!"
-#: src/net/ea/adminhandler.cpp:69
+#: src/net/ea/adminhandler.cpp:68
msgid "Kick succeeded!"
msgstr ""
@@ -2348,18 +2371,18 @@ msgstr "Destreza"
msgid "Luck:"
msgstr "Sorte"
-#: 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 ""
@@ -2372,435 +2395,450 @@ msgstr "Desequipar"
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
#, fuzzy, c-format
msgid "Strength: %d"
msgstr "Força"
-#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:82
+#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:84
#, fuzzy, c-format
msgid "Agility: %d"
msgstr "Agilidade"
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:86
+#: src/net/ea/generalhandler.cpp:96 src/net/tmwserv/generalhandler.cpp:88
#, fuzzy, c-format
msgid "Vitality: %d"
msgstr "Vitalidade"
-#: src/net/ea/generalhandler.cpp:96 src/net/tmwserv/generalhandler.cpp:88
+#: src/net/ea/generalhandler.cpp:98 src/net/tmwserv/generalhandler.cpp:90
#, fuzzy, c-format
msgid "Intelligence: %d"
msgstr "Inteligência"
-#: src/net/ea/generalhandler.cpp:98 src/net/tmwserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:100 src/net/tmwserv/generalhandler.cpp:86
#, fuzzy, c-format
msgid "Dexterity: %d"
msgstr "Destreza"
-#: src/net/ea/generalhandler.cpp:100
+#: src/net/ea/generalhandler.cpp:102
#, fuzzy, c-format
msgid "Luck: %d"
msgstr "Sorte"
-#: src/net/ea/generalhandler.cpp:123
+#: src/net/ea/generalhandler.cpp:125
#, fuzzy
msgid "Authentication failed"
msgstr "Falha ao criar Chat!"
-#: 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 ""
-#: 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 "Você foi desconectado do servidor!"
-#: src/net/ea/gui/partytab.cpp:54
+#: src/net/ea/gui/partytab.cpp:52
+#, fuzzy
+msgid "/help > Display this help."
+msgstr "/help: Mostra esta ajuda"
+
+#: src/net/ea/gui/partytab.cpp:53
msgid "/create > Create a new party"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:55
+#: src/net/ea/gui/partytab.cpp:54
msgid "/new > Alias of create"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:56
+#: src/net/ea/gui/partytab.cpp:55
msgid "/invite > Invite a player to your party"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:57
+#: src/net/ea/gui/partytab.cpp:56
msgid "/leave > Leave the party you are in"
msgstr ""
-#: 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 ""
-#: src/net/ea/gui/partytab.cpp:59
+#: src/net/ea/gui/partytab.cpp:58
msgid "/item > Show/change party item sharing options"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:60
+#: src/net/ea/gui/partytab.cpp:59
msgid "/exp > Show/change party experience sharing options"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:69
+#: src/net/ea/gui/partytab.cpp:68
#, fuzzy
msgid "Command: /new <party-name>"
msgstr "Comandos: /announce <msg>"
-#: src/net/ea/gui/partytab.cpp:70
+#: src/net/ea/gui/partytab.cpp:69
#, fuzzy
msgid "Command: /create <party-name>"
msgstr "Comandos: /clear"
-#: 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 ""
-#: src/net/ea/gui/partytab.cpp:75
+#: src/net/ea/gui/partytab.cpp:74
#, fuzzy
msgid "Command: /invite <nick>"
msgstr "Comando: /w <nick> <msg>"
-#: src/net/ea/gui/partytab.cpp:82
+#: src/net/ea/gui/partytab.cpp:81
#, fuzzy
msgid "Command: /leave"
msgstr "Comandos: /clear"
-#: src/net/ea/gui/partytab.cpp:83
+#: src/net/ea/gui/partytab.cpp:82
#, fuzzy
msgid "This command causes the player to leave the party."
msgstr "Limpa os logs do chat anterior."
-#: src/net/ea/gui/partytab.cpp:87
+#: src/net/ea/gui/partytab.cpp:86
#, fuzzy
msgid "Command: /item <policy>"
msgstr "Comando: /help"
-#: src/net/ea/gui/partytab.cpp:88
+#: src/net/ea/gui/partytab.cpp:87
#, fuzzy
msgid "This command changes the party's item sharing policy."
msgstr "Envia uma mensagem <msg> para <nick>."
-#: 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."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:92
+#: src/net/ea/gui/partytab.cpp:91
#, fuzzy
msgid "Command: /item"
msgstr "Comando: /help"
-#: src/net/ea/gui/partytab.cpp:93
+#: src/net/ea/gui/partytab.cpp:92
#, fuzzy
msgid "This command displays the party's current item sharing policy."
msgstr "Mostra o nome do mapa atual."
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/ea/gui/partytab.cpp:96
#, fuzzy
msgid "Command: /exp <policy>"
msgstr "Comando: /help <comando>"
-#: 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."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:102
+#: src/net/ea/gui/partytab.cpp:101
#, fuzzy
msgid "Command: /exp"
msgstr "Comando: /help"
-#: src/net/ea/gui/partytab.cpp:103
+#: src/net/ea/gui/partytab.cpp:102
#, fuzzy
msgid "This command displays the party's current experience sharing policy."
msgstr "Mostra o nome do mapa atual."
-#: 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]"
+msgid "You picked up %s [@@%d|%s@@]"
msgstr ""
-#: 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
#, fuzzy
msgid "Unregistered ID"
msgstr "Cancelar Registro"
-#: src/net/ea/loginhandler.cpp:114
+#: src/net/ea/loginhandler.cpp:113
#, fuzzy
msgid "Wrong password"
msgstr "Alterar senha"
-#: src/net/ea/loginhandler.cpp:117
+#: src/net/ea/loginhandler.cpp:116
#, fuzzy
msgid "Account expired"
msgstr "Conta: %s"
-#: src/net/ea/loginhandler.cpp:120
+#: src/net/ea/loginhandler.cpp:119
#, fuzzy
msgid "Rejected from server"
msgstr "Você foi desconectado do servidor!"
-#: 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 ""
-#: 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"
" Please contact the GM team via the forums."
msgstr ""
-#: 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
#, fuzzy
msgid "Unknown error"
msgstr "Comando desconhecido"
-#: src/net/ea/partyhandler.cpp:78
-msgid "Party successfully created."
-msgstr ""
-
-#: src/net/ea/partyhandler.cpp:82
+#: src/net/ea/partyhandler.cpp:77
#, fuzzy
msgid "Could not create party."
msgstr "Impossivel entrar no grupo!"
-#: 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 ""
-#: src/net/ea/partyhandler.cpp:116
+#: src/net/ea/partyhandler.cpp:119
#, c-format
msgid "%s refused your invitation."
msgstr ""
-#: src/net/ea/partyhandler.cpp:120
+#: src/net/ea/partyhandler.cpp:123
#, c-format
msgid "%s is now a member of your party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:124
+#: src/net/ea/partyhandler.cpp:127
#, c-format
msgid "Unknown invite response for %s."
msgstr ""
-#: 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 ""
-#: src/net/ea/partyhandler.cpp:269
+#: src/net/ea/partyhandler.cpp:272
#, c-format
msgid "An unknown member tried to say: %s"
msgstr ""
-#: 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
#, fuzzy, c-format
msgid "%s is not in your party!"
msgstr "Impossivel entrar no grupo!"
-#: 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
#, fuzzy
msgid "You are not that alive anymore."
msgstr "Você não pode fazer isso agora!"
-#: 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"
+#: 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 ""
-#: 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
#, fuzzy
msgid "You are no more."
msgstr "Você não tem nenhuma nota armazenada"
-#: src/net/ea/playerhandler.cpp:134
+#: src/net/ea/playerhandler.cpp:122
#, fuzzy
msgid "You have ceased to be."
msgstr "Você não tem nenhuma nota armazenada"
-#: src/net/ea/playerhandler.cpp:135
+#: src/net/ea/playerhandler.cpp:123
msgid "You've expired and gone to meet your maker."
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 ""
-#: 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 ""
@@ -2962,40 +3000,101 @@ msgstr ""
msgid "Willpower:"
msgstr "Força de Vontade:"
-#: 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
#, fuzzy, c-format
msgid "Willpower: %d"
msgstr "Força de Vontade:"
-#: 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
+#, fuzzy
+msgid "Server is full"
+msgstr "Servidor:"
+
+#: 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
+#, fuzzy
+msgid "New email address incorrect"
+msgstr "Alterar e-mail"
+
+#: src/net/tmwserv/loginhandler.cpp:143
+#, fuzzy
+msgid "Old email address incorrect"
+msgstr "Alterar e-mail"
+
+#: src/net/tmwserv/loginhandler.cpp:149
+#, fuzzy
+msgid "The new Email Address already exists."
+msgstr "Alterar e-mail"
+
+#: 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 "Alterar senha"
+
+#: src/net/tmwserv/loginhandler.cpp:211
+msgid "Wrong username, password or email address"
+msgstr ""
+
+#: src/net/tmwserv/loginhandler.cpp:214
+msgid "Username already exists"
+msgstr ""
+
+#: src/net/tmwserv/loginhandler.cpp:217
+msgid "Email address already exists"
+msgstr ""
+
+#: src/resources/itemdb.cpp:52
#, fuzzy, c-format
msgid "Attack %+d"
msgstr "Ataque:"
-#: src/resources/itemdb.cpp:54
+#: src/resources/itemdb.cpp:53
#, fuzzy, c-format
msgid "Defense %+d"
msgstr "Defesa:"
-#: 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 ""
-#: src/resources/itemdb.cpp:151
+#: src/resources/itemdb.cpp:150
msgid "Unnamed"
msgstr "Sem nome"
@@ -3012,6 +3111,23 @@ msgstr ""
msgid "NPC Database: Error while loading npcs.xml!"
msgstr ""
+#~ msgid "MiniMap"
+#~ msgstr "MiniMapa"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "> Cancel\n"
+#~ msgstr "Cancelar"
+
+#, fuzzy
+#~ msgid "use"
+#~ msgstr "Usar"
+
+#, fuzzy
+#~ msgid "Emote Window"
+#~ msgstr "Falha no Emote!"
+
#~ msgid "Gold: %d"
#~ msgstr "Ouro: %d"
diff --git a/po/ru.po b/po/ru.po
index f4d5e6c4..c182eac2 100644
--- a/po/ru.po
+++ b/po/ru.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-04-21 17:27+0200\n"
+"POT-Creation-Date: 2009-05-10 15:53+0200\n"
"PO-Revision-Date: 2008-01-08 11:50+0000\n"
"Last-Translator: idle sign <Unknown>\n"
"Language-Team: Russian <ru@li.org>\n"
@@ -17,286 +17,286 @@ msgstr ""
"X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
"X-Generator: Launchpad (build Unknown)\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."
+#: src/commandhandler.cpp:142
+msgid "/help > Display this help"
msgstr ""
-#: src/commandhandler.cpp:145
+#: src/commandhandler.cpp:144
msgid "/where > Display map name"
msgstr ""
-#: src/commandhandler.cpp:146
+#: src/commandhandler.cpp:145
msgid "/who > Display number of online users"
msgstr ""
-#: src/commandhandler.cpp:147
+#: src/commandhandler.cpp:146
msgid "/me > Tell something about yourself"
msgstr ""
-#: src/commandhandler.cpp:149
+#: src/commandhandler.cpp:148
msgid "/clear > Clears this window"
msgstr ""
-#: src/commandhandler.cpp:151
+#: src/commandhandler.cpp:150
msgid "/msg > Send a private message to a user"
msgstr ""
-#: src/commandhandler.cpp:152
+#: src/commandhandler.cpp:151
msgid "/whisper > Alias of msg"
msgstr ""
-#: src/commandhandler.cpp:153
+#: src/commandhandler.cpp:152
msgid "/w > Alias of msg"
msgstr ""
-#: src/commandhandler.cpp:154
+#: src/commandhandler.cpp:153
msgid "/query > Makes a tab for private messages with another user"
msgstr ""
-#: src/commandhandler.cpp:155
+#: src/commandhandler.cpp:154
msgid "/q > Alias of query"
msgstr ""
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:156
msgid "/list > Display all public channels"
msgstr ""
-#: src/commandhandler.cpp:158
+#: src/commandhandler.cpp:157
msgid "/join > Join or create a channel"
msgstr ""
-#: src/commandhandler.cpp:160
+#: src/commandhandler.cpp:159
msgid "/party > Invite a user to party"
msgstr ""
-#: src/commandhandler.cpp:162
+#: src/commandhandler.cpp:161
msgid "/record > Start recording the chat to an external file"
msgstr ""
-#: 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 ""
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:165
msgid "/announce > Global announcement (GM only)"
msgstr ""
-#: src/commandhandler.cpp:170
+#: src/commandhandler.cpp:169
msgid "For more information, type /help <command>"
msgstr ""
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:173
msgid "Command: /help"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: src/commandhandler.cpp:186
+#: src/commandhandler.cpp:185
msgid "*** only available to a GM ***"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: src/commandhandler.cpp:209
+#: src/commandhandler.cpp:208
msgid "This command tell others you are (doing) <msg>."
msgstr ""
-#: src/commandhandler.cpp:213
+#: src/commandhandler.cpp:212
msgid "Command: /msg <nick> <message>"
msgstr ""
-#: src/commandhandler.cpp:214
+#: src/commandhandler.cpp:213
msgid "Command: /whisper <nick> <message>"
msgstr ""
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:214
msgid "Command: /w <nick> <message>"
msgstr ""
-#: src/commandhandler.cpp:216
+#: src/commandhandler.cpp:215
msgid "This command sends the text <message> to <nick>."
msgstr ""
-#: 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 ""
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:222
msgid "Command: /q <nick>"
msgstr ""
-#: src/commandhandler.cpp:224
+#: src/commandhandler.cpp:223
msgid "This command tries to make a tab for whispers betweenyou and <nick>."
msgstr ""
-#: src/commandhandler.cpp:229
+#: src/commandhandler.cpp:228
msgid "Command: /party <nick>"
msgstr ""
-#: 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 ""
-#: src/commandhandler.cpp:236
+#: src/commandhandler.cpp:235
msgid "Command: /present"
msgstr ""
-#: 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 ""
-#: src/commandhandler.cpp:244
+#: src/commandhandler.cpp:243
msgid "This command starts recording the chat log to the file <filename>."
msgstr ""
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:245
msgid "Command: /record"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: src/commandhandler.cpp:257
+#: src/commandhandler.cpp:256
msgid "Command: /toggle"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: src/commandhandler.cpp:336
-msgid "Cannont send empty whispers!"
+#: 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 ""
-#: 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 ""
@@ -305,46 +305,46 @@ msgstr ""
msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
msgstr ""
-#: 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"
+#: src/game.cpp:481
+msgid "The connection to the server was lost, the program will now quit"
msgstr ""
-#: src/game.cpp:493
-msgid "The connection to the server was lost, the program will now quit"
+#: src/game.cpp:487
+msgid "Network Error"
msgstr ""
-#: src/game.cpp:664 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
+#: 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
#, fuzzy
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 ""
@@ -357,12 +357,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
#, fuzzy, c-format
msgid "Price: %s / Total: %s"
msgstr "Стоимость: %d GP / Всегоl: %d GP"
@@ -372,13 +372,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"
@@ -388,205 +388,213 @@ 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 ""
-#: 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
#, fuzzy
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 "Имя должно содержать не менее четырех символов."
-#: 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 "Ok"
-#: 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
#, fuzzy, 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
#, fuzzy, c-format
msgid "Money: %s"
msgstr "Деньги: %d"
-#: 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
#, fuzzy
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 ""
+
+#: 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 ""
-#: 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 "Нет"
@@ -594,26 +602,16 @@ msgstr "Нет"
msgid "Connecting..."
msgstr "Соединение..."
-#: src/gui/emotecontainer.cpp:61
+#: src/gui/emotepopup.cpp:64
msgid "Unable to load selection.png"
msgstr ""
-#: 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 "Снять"
@@ -638,100 +636,103 @@ 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
#, fuzzy
msgid "Select amount of items to store."
msgstr "Сколько предметов продать."
-#: src/gui/item_amount.cpp:101
+#: src/gui/itemamount.cpp:130
#, fuzzy
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 "Порт:"
-#: src/gui/login.cpp:55
+#: src/gui/login.cpp:56
#, fuzzy
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 ""
@@ -747,71 +748,44 @@ msgstr ""
msgid "Cast Test Spell 3"
msgstr ""
-#: 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/minimap.cpp:45 src/gui/minimap.cpp:84
+#, fuzzy
+msgid "Map"
+msgstr "МиниКарта"
-#: src/gui/menuwindow.cpp:72
-msgid "Guilds"
+#: src/gui/npcdialog.cpp:43
+msgid "Waiting for server"
msgstr ""
-#: src/gui/menuwindow.cpp:73
+#: src/gui/npcdialog.cpp:46
#, fuzzy
-msgid "Buddys"
-msgstr "Купить"
-
-#: src/gui/menuwindow.cpp:75
-msgid "Shortcut"
-msgstr "Клавиша"
+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"
+#: src/gui/npcdialog.cpp:96
+msgid "-"
msgstr ""
-#: src/gui/npcintegerdialog.cpp:50
+#: src/gui/npcdialog.cpp:105
#, fuzzy
msgid "Reset"
msgstr "Зарегистрироваться"
-#: src/gui/npcintegerdialog.cpp:101 src/gui/npclistdialog.cpp:123
-#: src/gui/npcstringdialog.cpp:75
-#, fuzzy
-msgid ""
-"\n"
-"> Cancel\n"
-msgstr "Отмена"
-
-#: src/gui/npcpostdialog.cpp:39 src/gui/npc_text.cpp:37
-msgid "NPC"
-msgstr "NPC"
-
#: src/gui/npcpostdialog.cpp:51
#, fuzzy
msgid "Send"
msgstr "Звук"
-#: src/gui/npcstringdialog.cpp:39
-msgid "NPC Text Request"
-msgstr ""
-
-#: 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
#, fuzzy
msgid "Text"
msgstr "Следующий"
@@ -866,7 +840,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
#, fuzzy
msgid "Party"
msgstr "Порт:"
@@ -889,7 +863,7 @@ msgid "Being"
msgstr ""
#: src/gui/palette.cpp:104
-msgid "Other Player's Names"
+msgid "Other Players' Names"
msgstr ""
#: src/gui/palette.cpp:105
@@ -916,21 +890,22 @@ msgid "Unknown Item Type"
msgstr ""
#: src/gui/palette.cpp:111
-msgid "Generic"
+msgid "Generics"
msgstr ""
#: src/gui/palette.cpp:112
-msgid "Hat"
-msgstr ""
+#, fuzzy
+msgid "Hats"
+msgstr "Состояние"
#: src/gui/palette.cpp:113
#, fuzzy
-msgid "Usable"
+msgid "Usables"
msgstr "Использовать"
#: src/gui/palette.cpp:114
#, fuzzy
-msgid "Shirt"
+msgid "Shirts"
msgstr "Клавиша"
#: src/gui/palette.cpp:115
@@ -953,15 +928,15 @@ msgstr ""
#: src/gui/palette.cpp:119
#, fuzzy
-msgid "Shield"
+msgid "Shields"
msgstr "Продать"
#: src/gui/palette.cpp:120
-msgid "Ring"
+msgid "Rings"
msgstr ""
#: src/gui/palette.cpp:121
-msgid "Necklace"
+msgid "Necklaces"
msgstr ""
#: src/gui/palette.cpp:122
@@ -1017,95 +992,104 @@ msgstr ""
msgid "1/4 HP Bar"
msgstr ""
-#: src/gui/popupmenu.cpp:73
+#: src/gui/popupmenu.cpp:75
msgid "@@name|Add name to chat@@"
msgstr ""
-#: src/gui/popupmenu.cpp:85
+#: src/gui/popupmenu.cpp:87
#, c-format
msgid "@@trade|Trade With %s@@"
msgstr "@@trade|Торговать с %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 "@@attack|Атаковать %s@@"
-#: src/gui/popupmenu.cpp:92
+#: src/gui/popupmenu.cpp:94
#, c-format
msgid "@@friend|Befriend %s@@"
msgstr ""
-#: 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 ""
-#: src/gui/popupmenu.cpp:112
+#: src/gui/popupmenu.cpp:114
#, c-format
msgid "@@party|Invite %s to join your party@@"
msgstr ""
-#: src/gui/popupmenu.cpp:123
+#: src/gui/popupmenu.cpp:125
#, fuzzy, c-format
msgid "@@talk|Talk To %s@@"
msgstr "@@talk|Говорить с NPC@@"
-#: 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 "@@cancelОтмена@@"
-#: src/gui/popupmenu.cpp:155
-#, c-format
-msgid "@@pickup|Pick Up %s@@"
+#: src/gui/popupmenu.cpp:157
+#, fuzzy, c-format
+msgid "@@pickup|Pick up %s@@"
msgstr "@@pickup|Подобрать %s@@"
-#: src/gui/popupmenu.cpp:156 src/gui/popupmenu.cpp:352
-msgid "@@chat|Add to Chat@@"
+#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:373
+msgid "@@chat|Add to chat@@"
msgstr ""
-#: src/gui/popupmenu.cpp:336 src/gui/popupmenu.cpp:341
-msgid "@@use|Equip@@"
-msgstr "@@use|Надеть@@"
-
-#: src/gui/popupmenu.cpp:339
+#: src/gui/popupmenu.cpp:348
#, fuzzy
msgid "@@use|Unequip@@"
msgstr "@@use|Надеть@@"
-#: src/gui/popupmenu.cpp:345
+#: src/gui/popupmenu.cpp:350
+msgid "@@use|Equip@@"
+msgstr "@@use|Надеть@@"
+
+#: src/gui/popupmenu.cpp:353
msgid "@@use|Use@@"
msgstr "@@use|Использовать@@"
-#: src/gui/popupmenu.cpp:347
+#: src/gui/popupmenu.cpp:355
msgid "@@drop|Drop@@"
msgstr "@@drop|Сбросить@@"
-#: src/gui/popupmenu.cpp:350
+#: src/gui/popupmenu.cpp:359
msgid "@@split|Split@@"
msgstr "@@split|Разделить@@"
+#: src/gui/popupmenu.cpp:364
+#, fuzzy
+msgid "@@store|Store@@"
+msgstr "@@use|Использовать@@"
+
+#: src/gui/popupmenu.cpp:371
+msgid "@@retrieve|Retrieve@@"
+msgstr ""
+
#: src/gui/quitdialog.cpp:37
msgid "Switch server"
msgstr "Сменить сервер"
@@ -1175,20 +1159,32 @@ msgstr "Пароль не должен содержать более %d симв
msgid "Passwords do not match."
msgstr "Пароли не совпадают."
-#: src/gui/serverdialog.cpp:73
+#: src/gui/serverdialog.cpp:74
#, fuzzy
msgid "Choose your server"
msgstr "Выберите сервер Mana World"
-#: src/gui/serverdialog.cpp:163
+#: src/gui/serverdialog.cpp:164
msgid "Please type both the address and the port of a server."
msgstr "Следует указать адрес и порт сервера."
-#: src/gui/serverselectdialog.cpp:50
+#: src/gui/serverselectdialog.cpp:59
#, fuzzy
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 "Звук"
@@ -1205,11 +1201,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 ""
@@ -1217,23 +1213,23 @@ 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
#, fuzzy
msgid "Static"
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 ""
#: 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
#, fuzzy
msgid "Spectrum"
msgstr "Настройка"
@@ -1242,26 +1238,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 "Нажмите кнопку, чтобы начать калибровку"
@@ -1332,7 +1320,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 ""
@@ -1360,156 +1348,177 @@ 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
+#, fuzzy
+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 ""
-#: src/gui/setup_video.cpp:136
+#: src/gui/setup_video.cpp:167
msgid "FPS Limit:"
msgstr "Ограничение кадр/с:"
-#: 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 "Прозрачность интерфейса"
-#: 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 "Эффекты окружающей среды"
-#: 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
#, fuzzy
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 ""
-#: 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 ""
-#: 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
#, fuzzy
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
#, fuzzy
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 ""
@@ -1522,6 +1531,10 @@ msgstr "Умения"
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"
@@ -1531,15 +1544,6 @@ msgstr ""
msgid "Up"
msgstr ""
-#: src/gui/skill.cpp:146
-msgid "inc"
-msgstr ""
-
-#: src/gui/skill.cpp:147
-#, fuzzy
-msgid "use"
-msgstr "Использовать"
-
#: src/gui/skilldialog.cpp:113
msgid "Weapons"
msgstr ""
@@ -1549,179 +1553,179 @@ msgstr ""
msgid "Crafts"
msgstr "Создать"
-#: src/gui/status.cpp:57 src/gui/status.cpp:178
+#: src/gui/status.cpp:56 src/gui/status.cpp:177
#, fuzzy, c-format
msgid "Job: %d"
msgstr "Уровень: %d"
-#: src/gui/status.cpp:61
+#: src/gui/status.cpp:60
msgid "HP:"
msgstr ""
-#: src/gui/status.cpp:64
+#: src/gui/status.cpp:63
msgid "Exp:"
msgstr ""
-#: src/gui/status.cpp:67
+#: src/gui/status.cpp:66
msgid "MP:"
msgstr ""
-#: src/gui/status.cpp:70
+#: src/gui/status.cpp:69
#, fuzzy
msgid "Job:"
msgstr "Уровень: %d"
-#: src/gui/status.cpp:78
+#: src/gui/status.cpp:77
#, fuzzy
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
#, fuzzy
msgid "Attack:"
msgstr "Атака %+d"
-#: src/gui/status.cpp:85
+#: src/gui/status.cpp:84
#, fuzzy
msgid "Defense:"
msgstr "Защита %+d"
-#: src/gui/status.cpp:86
+#: src/gui/status.cpp:85
#, fuzzy
msgid "M.Attack:"
msgstr "Атака %+d"
-#: src/gui/status.cpp:87
+#: src/gui/status.cpp:86
#, fuzzy
msgid "M.Defense:"
msgstr "Защита %+d"
-#: src/gui/status.cpp:89
+#: src/gui/status.cpp:88
#, no-c-format
msgid "% Accuracy:"
msgstr ""
-#: src/gui/status.cpp:91
+#: src/gui/status.cpp:90
#, no-c-format
msgid "% Evade:"
msgstr ""
-#: 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
#, fuzzy
msgid "Strength"
msgstr "Сила:"
-#: src/gui/status.cpp:200
+#: src/gui/status.cpp:199
#, fuzzy
msgid "Agility"
msgstr "Выносливость:"
-#: src/gui/status.cpp:201
+#: src/gui/status.cpp:200
#, fuzzy
msgid "Vitality"
msgstr "Живучесть:"
-#: src/gui/status.cpp:202
+#: src/gui/status.cpp:201
#, fuzzy
msgid "Intelligence"
msgstr "Интеллект:"
-#: src/gui/status.cpp:203
+#: src/gui/status.cpp:202
#, fuzzy
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 ""
-#: 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
#, fuzzy
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
#, fuzzy
msgid "Confirmed. Waiting..."
msgstr "Соединение..."
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:53
#, fuzzy
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
#, fuzzy, c-format
msgid "You get %s."
msgstr "Вы получили %d GP."
-#: 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 ""
@@ -1833,21 +1837,21 @@ msgstr ""
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 ""
-#: src/gui/widgets/chattab.cpp:147
+#: src/gui/widgets/chattab.cpp:146
#, c-format
msgid "%s whispers: "
msgstr ""
-#: 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 ""
@@ -1855,23 +1859,35 @@ msgstr ""
msgid "Cannot send empty chat!"
msgstr ""
-#: src/gui/widgets/whispertab.cpp:55
-#, c-format
-msgid "%s: %s"
-msgstr ""
-
-#: src/gui/widgets/whispertab.cpp:69
+#: src/gui/widgets/whispertab.cpp:68
msgid "/close > Close the whisper tab"
msgstr ""
-#: src/gui/widgets/whispertab.cpp:79
+#: src/gui/widgets/whispertab.cpp:78
msgid "Command: /close"
msgstr ""
-#: 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
+#, fuzzy
+msgid "Buddys"
+msgstr "Купить"
+
+#: src/gui/windowmenu.cpp:68
+msgid "Shortcut"
+msgstr "Клавиша"
+
#: src/keyboardconfig.cpp:41
msgid "Move Up"
msgstr ""
@@ -2003,7 +2019,7 @@ msgstr "Восстановить расположение окон"
#: src/keyboardconfig.cpp:80
#, fuzzy
-msgid "Emote Window"
+msgid "Party Window"
msgstr "Восстановить расположение окон"
#: src/keyboardconfig.cpp:81
@@ -2054,166 +2070,170 @@ msgstr ""
msgid "Ignore input 2"
msgstr ""
-#: 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
#, fuzzy
msgid "Sword"
msgstr "Звук"
-#: src/localplayer.cpp:852
+#: src/localplayer.cpp:837
msgid "Polearm"
msgstr ""
-#: src/localplayer.cpp:853
+#: src/localplayer.cpp:838
#, fuzzy
msgid "Staff"
msgstr "Состояние"
-#: src/localplayer.cpp:854
+#: src/localplayer.cpp:839
msgid "Whip"
msgstr ""
-#: src/localplayer.cpp:855
+#: src/localplayer.cpp:840
#, fuzzy
msgid "Bow"
msgstr "низ."
-#: src/localplayer.cpp:856
+#: src/localplayer.cpp:841
msgid "Shooting"
msgstr ""
-#: src/localplayer.cpp:857
+#: src/localplayer.cpp:842
#, fuzzy
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
#, fuzzy
msgid "Craft"
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 ""
-#: src/main.cpp:563
-msgid "Options: "
-msgstr ""
-
-#: src/main.cpp:564
-msgid " -C --configfile : Configuration file to use"
-msgstr ""
-
-#: src/main.cpp:565
-msgid " -d --data : Directory to load game data from"
-msgstr ""
-
-#: src/main.cpp:566
-msgid " -D --default : Bypass the login process with default settings"
+#: src/main.cpp:567
+msgid "Options:"
msgstr ""
#: src/main.cpp:568
-msgid " -h --help : Display this help"
+msgid " -C --config-file : Configuration file to use"
msgstr ""
#: src/main.cpp:569
-msgid " -S --homedir : Directory to use as home directory"
+msgid " -d --data : Directory to load game data from"
msgstr ""
#: src/main.cpp:570
-msgid " -H --updatehost : Use this update host"
-msgstr ""
-
-#: src/main.cpp:571
-msgid " -P --password : Login with this password"
+msgid " -D --default : Choose default character server and character"
msgstr ""
#: src/main.cpp:572
-msgid " -c --character : Login with this character"
+msgid " -h --help : Display this help"
msgstr ""
#: src/main.cpp:573
-msgid " -o --port : Login Server Port"
+msgid " -S --home-dir : Directory to use as home directory"
msgstr ""
#: src/main.cpp:574
-msgid " -s --server : Login Server name or IP"
+msgid " -H --update-host : Use this update host"
msgstr ""
#: src/main.cpp:575
-msgid " -u --skipupdate : Skip the update downloads"
+msgid " -P --password : Login with this password"
msgstr ""
#: src/main.cpp:576
-msgid " -U --username : Login with this username"
+msgid " -c --character : Login with this character"
msgstr ""
#: src/main.cpp:577
-msgid " -v --version : Display the version"
+msgid " -p --port : Login Server Port"
+msgstr ""
+
+#: src/main.cpp:578
+msgid " -s --server : Login Server name or IP"
+msgstr ""
+
+#: src/main.cpp:579
+msgid " -u --skip-update : Skip the update downloads"
+msgstr ""
+
+#: src/main.cpp:580
+msgid " -U --username : Login with this username"
msgstr ""
#: src/main.cpp:582
+msgid " -O --no-opengl : Disable OpenGL for this session"
+msgstr ""
+
+#: src/main.cpp:584
+msgid " -v --version : Display the version"
+msgstr ""
+
+#: src/main.cpp:589
#, fuzzy
msgid "The Mana World "
msgstr "Выберите сервер Mana World"
-#: src/main.cpp:1499
+#: src/main.cpp:1515
#, fuzzy
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 ""
@@ -2300,18 +2320,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 ""
@@ -2324,416 +2344,430 @@ 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
#, fuzzy, c-format
msgid "Strength: %d"
msgstr "Сила:"
-#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:82
+#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:84
#, fuzzy, c-format
msgid "Agility: %d"
msgstr "Выносливость:"
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:86
+#: src/net/ea/generalhandler.cpp:96 src/net/tmwserv/generalhandler.cpp:88
#, fuzzy, c-format
msgid "Vitality: %d"
msgstr "Живучесть:"
-#: src/net/ea/generalhandler.cpp:96 src/net/tmwserv/generalhandler.cpp:88
+#: src/net/ea/generalhandler.cpp:98 src/net/tmwserv/generalhandler.cpp:90
#, fuzzy, c-format
msgid "Intelligence: %d"
msgstr "Интеллект:"
-#: src/net/ea/generalhandler.cpp:98 src/net/tmwserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:100 src/net/tmwserv/generalhandler.cpp:86
#, fuzzy, c-format
msgid "Dexterity: %d"
msgstr "Ловкость:"
-#: src/net/ea/generalhandler.cpp:100
+#: src/net/ea/generalhandler.cpp:102
#, c-format
msgid "Luck: %d"
msgstr ""
-#: 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 ""
-#: 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 ""
+
+#: src/net/ea/gui/partytab.cpp:53
msgid "/create > Create a new party"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:55
+#: src/net/ea/gui/partytab.cpp:54
msgid "/new > Alias of create"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:56
+#: src/net/ea/gui/partytab.cpp:55
msgid "/invite > Invite a player to your party"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:57
+#: src/net/ea/gui/partytab.cpp:56
msgid "/leave > Leave the party you are in"
msgstr ""
-#: 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 ""
-#: src/net/ea/gui/partytab.cpp:59
+#: src/net/ea/gui/partytab.cpp:58
msgid "/item > Show/change party item sharing options"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:60
+#: src/net/ea/gui/partytab.cpp:59
msgid "/exp > Show/change party experience sharing options"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:69
+#: src/net/ea/gui/partytab.cpp:68
msgid "Command: /new <party-name>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:70
+#: src/net/ea/gui/partytab.cpp:69
msgid "Command: /create <party-name>"
msgstr ""
-#: 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 ""
-#: src/net/ea/gui/partytab.cpp:75
+#: src/net/ea/gui/partytab.cpp:74
msgid "Command: /invite <nick>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:82
+#: src/net/ea/gui/partytab.cpp:81
msgid "Command: /leave"
msgstr ""
-#: 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 ""
-#: 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."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:92
+#: src/net/ea/gui/partytab.cpp:91
msgid "Command: /item"
msgstr ""
-#: 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 ""
-#: 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."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:102
+#: src/net/ea/gui/partytab.cpp:101
msgid "Command: /exp"
msgstr ""
-#: 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]"
+msgid "You picked up %s [@@%d|%s@@]"
msgstr ""
-#: 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
#, fuzzy
msgid "Unregistered ID"
msgstr "Удалить регистрацию"
-#: src/net/ea/loginhandler.cpp:114
+#: src/net/ea/loginhandler.cpp:113
#, fuzzy
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
#, fuzzy
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 ""
-#: 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"
" Please contact the GM team via the forums."
msgstr ""
-#: 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."
+#: src/net/ea/partyhandler.cpp:77
+msgid "Could not create party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:82
-msgid "Could not create party."
+#: src/net/ea/partyhandler.cpp:80
+msgid "Party successfully created."
msgstr ""
-#: src/net/ea/partyhandler.cpp:112
+#: src/net/ea/partyhandler.cpp:115
#, c-format
msgid "%s is already a member of a party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:116
+#: src/net/ea/partyhandler.cpp:119
#, c-format
msgid "%s refused your invitation."
msgstr ""
-#: src/net/ea/partyhandler.cpp:120
+#: src/net/ea/partyhandler.cpp:123
#, c-format
msgid "%s is now a member of your party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:124
+#: src/net/ea/partyhandler.cpp:127
#, c-format
msgid "Unknown invite response for %s."
msgstr ""
-#: 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 ""
-#: src/net/ea/partyhandler.cpp:269
+#: src/net/ea/partyhandler.cpp:272
#, c-format
msgid "An unknown member tried to say: %s"
msgstr ""
-#: 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 ""
-#: 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"
+#: 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 ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
@@ -2891,40 +2925,98 @@ msgstr ""
msgid "Willpower:"
msgstr "Сила волиr:"
-#: 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
#, fuzzy, c-format
msgid "Willpower: %d"
msgstr "Сила волиr:"
-#: 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
+#, fuzzy
+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 ""
+
+#: src/net/tmwserv/loginhandler.cpp:143
+msgid "Old email address incorrect"
+msgstr ""
+
+#: src/net/tmwserv/loginhandler.cpp:149
+msgid "The new Email Address already exists."
+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 "Пароль:"
+
+#: src/net/tmwserv/loginhandler.cpp:211
+msgid "Wrong username, password or email address"
+msgstr ""
+
+#: src/net/tmwserv/loginhandler.cpp:214
+msgid "Username already exists"
+msgstr ""
+
+#: src/net/tmwserv/loginhandler.cpp:217
+msgid "Email address already exists"
+msgstr ""
+
+#: src/resources/itemdb.cpp:52
#, fuzzy, c-format
msgid "Attack %+d"
msgstr "Атака %+d"
-#: src/resources/itemdb.cpp:54
+#: src/resources/itemdb.cpp:53
#, fuzzy, 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 "Мана %+d"
-#: src/resources/itemdb.cpp:113
+#: src/resources/itemdb.cpp:112
msgid "items.xml"
msgstr ""
-#: src/resources/itemdb.cpp:151
+#: src/resources/itemdb.cpp:150
msgid "Unnamed"
msgstr ""
@@ -2940,6 +3032,20 @@ msgstr ""
msgid "NPC Database: Error while loading npcs.xml!"
msgstr ""
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "> Cancel\n"
+#~ msgstr "Отмена"
+
+#, fuzzy
+#~ msgid "use"
+#~ msgstr "Использовать"
+
+#, fuzzy
+#~ msgid "Emote Window"
+#~ msgstr "Восстановить расположение окон"
+
#~ msgid "@@description|Description@@"
#~ msgstr "@@description|Описание@@"
diff --git a/po/sk.po b/po/sk.po
index 655065b6..a66ff0ef 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-04-21 17:27+0200\n"
+"POT-Creation-Date: 2009-05-10 15:53+0200\n"
"PO-Revision-Date: 2009-04-07 18:10+0000\n"
"Last-Translator: Dalanos <Unknown>\n"
"Language-Team: Slovak <sk@li.org>\n"
@@ -17,311 +17,312 @@ msgstr ""
"X-Launchpad-Export-Date: 2009-04-21 14:40+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
-#: src/commandhandler.cpp:142
+#: src/commandhandler.cpp:141
msgid "-- Help --"
msgstr "-- Pomoc --"
-#: src/commandhandler.cpp:143 src/net/ea/gui/partytab.cpp:53
+#: src/commandhandler.cpp:142
#, fuzzy
-msgid "/help > Display this help."
+msgid "/help > Display this help"
msgstr "/help: Zobraziť túto pomoc"
-#: src/commandhandler.cpp:145
+#: src/commandhandler.cpp:144
#, fuzzy
msgid "/where > Display map name"
msgstr "/where: Zobraziť meno mapy"
-#: src/commandhandler.cpp:146
+#: src/commandhandler.cpp:145
#, fuzzy
msgid "/who > Display number of online users"
msgstr "/who: Zobrazí počet pripojených používateľov"
-#: src/commandhandler.cpp:147
+#: src/commandhandler.cpp:146
msgid "/me > Tell something about yourself"
msgstr ""
-#: src/commandhandler.cpp:149
+#: src/commandhandler.cpp:148
#, fuzzy
msgid "/clear > Clears this window"
msgstr "/clear: Vymazať obsah tohto okna"
-#: src/commandhandler.cpp:151
+#: src/commandhandler.cpp:150
#, fuzzy
msgid "/msg > Send a private message to a user"
msgstr "/whisper <nick> <správa>: Pošlať privátnu <správu> pre <nick>"
-#: src/commandhandler.cpp:152
+#: src/commandhandler.cpp:151
msgid "/whisper > Alias of msg"
msgstr ""
-#: src/commandhandler.cpp:153
+#: src/commandhandler.cpp:152
msgid "/w > Alias of msg"
msgstr ""
-#: src/commandhandler.cpp:154
+#: src/commandhandler.cpp:153
msgid "/query > Makes a tab for private messages with another user"
msgstr ""
-#: src/commandhandler.cpp:155
+#: src/commandhandler.cpp:154
msgid "/q > Alias of query"
msgstr ""
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:156
msgid "/list > Display all public channels"
msgstr ""
-#: src/commandhandler.cpp:158
+#: src/commandhandler.cpp:157
msgid "/join > Join or create a channel"
msgstr ""
-#: src/commandhandler.cpp:160
+#: src/commandhandler.cpp:159
msgid "/party > Invite a user to party"
msgstr ""
-#: src/commandhandler.cpp:162
+#: src/commandhandler.cpp:161
msgid "/record > Start recording the chat to an external file"
msgstr ""
-#: 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 ""
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:165
#, fuzzy
msgid "/announce > Global announcement (GM only)"
msgstr "/announce: Celosvetové oznámenie (iba GM)"
-#: src/commandhandler.cpp:170
+#: src/commandhandler.cpp:169
msgid "For more information, type /help <command>"
msgstr "Pre viac informácií, napíšte /help <príkaz>"
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:173
msgid "Command: /help"
msgstr "Príkaz: /hel"
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:174
msgid "This command displays a list of all commands available."
msgstr "Tento príkaz zobrazí zoznam veštkých prístupných príkazov."
-#: src/commandhandler.cpp:176
+#: src/commandhandler.cpp:175
msgid "Command: /help <command>"
msgstr "Príkaz: /help <príkaz>"
-#: src/commandhandler.cpp:177
+#: src/commandhandler.cpp:176
msgid "This command displays help on <command>."
msgstr "Tento príkaz zobrazí nápovedu pre <príkaz>."
-#: src/commandhandler.cpp:185
+#: src/commandhandler.cpp:184
msgid "Command: /announce <msg>"
msgstr "Príkaz: /announce <správa>"
-#: src/commandhandler.cpp:186
+#: src/commandhandler.cpp:185
msgid "*** only available to a GM ***"
msgstr "*** prístupné iba pre GM ***"
-#: src/commandhandler.cpp:187
+#: src/commandhandler.cpp:186
msgid "This command sends the message <msg> to all players currently online."
msgstr "Tento príkaz pošle správu <správa> všetkým pripojeným používateľom."
-#: src/commandhandler.cpp:192
+#: src/commandhandler.cpp:191
msgid "Command: /clear"
msgstr "Príkaz: /clear"
-#: src/commandhandler.cpp:193
+#: src/commandhandler.cpp:192
msgid "This command clears the chat log of previous chat."
msgstr "Tento príkaz vymaže obsah logu predchádzajúceho rozhovoru."
-#: src/commandhandler.cpp:197
+#: src/commandhandler.cpp:196
#, fuzzy
msgid "Command: /join <channel>"
msgstr "Príkaz: /hel"
-#: src/commandhandler.cpp:198
+#: src/commandhandler.cpp:197
#, fuzzy
msgid "This command makes you enter <channel>."
msgstr "Tento príkaz zobrazí nápovedu pre <príkaz>."
-#: 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
#, fuzzy
msgid "Command: /list"
msgstr "Príkaz: /hel"
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:203
#, fuzzy
msgid "This command shows a list of all channels."
msgstr "Tento príkaz zobrazí zoznam veštkých prístupných príkazov."
-#: src/commandhandler.cpp:208
+#: src/commandhandler.cpp:207
#, fuzzy
msgid "Command: /me <message>"
msgstr "Príkaz: /announce <správa>"
-#: src/commandhandler.cpp:209
+#: src/commandhandler.cpp:208
msgid "This command tell others you are (doing) <msg>."
msgstr ""
-#: src/commandhandler.cpp:213
+#: src/commandhandler.cpp:212
#, fuzzy
msgid "Command: /msg <nick> <message>"
msgstr "Príkaz: /w <nick> <správa>"
-#: src/commandhandler.cpp:214
+#: src/commandhandler.cpp:213
#, fuzzy
msgid "Command: /whisper <nick> <message>"
msgstr "Príkaz: /whisper <nick> <správa>"
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:214
#, fuzzy
msgid "Command: /w <nick> <message>"
msgstr "Príkaz: /w <nick> <správa>"
-#: src/commandhandler.cpp:216
+#: src/commandhandler.cpp:215
#, fuzzy
msgid "This command sends the text <message> to <nick>."
msgstr "Tento Príkaz pošle spravábu <správa> pre <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 "Ak <nick> medzery v mene, použi dvojité úvodzovky (\")."
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:221
#, fuzzy
msgid "Command: /query <nick>"
msgstr "Príkaz: /w <nick> <správa>"
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:222
#, fuzzy
msgid "Command: /q <nick>"
msgstr "Príkaz: /w <nick> <správa>"
-#: src/commandhandler.cpp:224
+#: src/commandhandler.cpp:223
msgid "This command tries to make a tab for whispers betweenyou and <nick>."
msgstr ""
-#: src/commandhandler.cpp:229
+#: src/commandhandler.cpp:228
#, fuzzy
msgid "Command: /party <nick>"
msgstr "Príkaz: /w <nick> <správa>"
-#: 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 ""
-#: src/commandhandler.cpp:236
+#: src/commandhandler.cpp:235
#, fuzzy
msgid "Command: /present"
msgstr "Príkaz: /where"
-#: 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
#, fuzzy
msgid "Command: /record <filename>"
msgstr "Príkaz: /clear"
-#: src/commandhandler.cpp:244
+#: src/commandhandler.cpp:243
#, fuzzy
msgid "This command starts recording the chat log to the file <filename>."
msgstr "Tento príkaz vymaže obsah logu predchádzajúceho rozhovoru."
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:245
#, fuzzy
msgid "Command: /record"
msgstr "Príkaz: /clear"
-#: src/commandhandler.cpp:247
+#: src/commandhandler.cpp:246
msgid "This command finishes a recording session."
msgstr ""
-#: src/commandhandler.cpp:251
+#: src/commandhandler.cpp:250
#, fuzzy
msgid "Command: /toggle <state>"
msgstr "Príkaz: /announce <správa>"
-#: 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 ""
-#: src/commandhandler.cpp:257
+#: src/commandhandler.cpp:256
#, fuzzy
msgid "Command: /toggle"
msgstr "Príkaz: /clear"
-#: src/commandhandler.cpp:258
+#: src/commandhandler.cpp:257
#, fuzzy
msgid "This command displays the return toggle status."
msgstr "Tento príkaz zobrazí meno aktuálne mapy."
-#: src/commandhandler.cpp:262
+#: src/commandhandler.cpp:261
msgid "Command: /where"
msgstr "Príkaz: /where"
-#: src/commandhandler.cpp:263
+#: src/commandhandler.cpp:262
msgid "This command displays the name of the current map."
msgstr "Tento príkaz zobrazí meno aktuálne mapy."
-#: src/commandhandler.cpp:267
+#: src/commandhandler.cpp:266
msgid "Command: /who"
msgstr "Príkaz: /who"
-#: src/commandhandler.cpp:268
+#: src/commandhandler.cpp:267
msgid "This command displays the number of players currently online."
msgstr "Tento príkaz zobrazí počet aktuálne pripojených hráčov."
-#: src/commandhandler.cpp:273
+#: src/commandhandler.cpp:272
msgid "Unknown command."
msgstr "Neznámy príkaz."
-#: src/commandhandler.cpp:274
+#: src/commandhandler.cpp:273
msgid "Type /help for a list of commands."
msgstr "Napíš /help pre zoznam príkazov."
-#: src/commandhandler.cpp:336
-msgid "Cannont send empty whispers!"
-msgstr ""
+#: src/commandhandler.cpp:339
+#, fuzzy
+msgid "Cannot send empty whispers!"
+msgstr "Nemôžem kričať!"
-#: 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 ""
-#: 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 ""
@@ -330,47 +331,47 @@ msgstr ""
msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
msgstr ""
-#: 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
#, fuzzy
msgid "Saving screenshot failed!"
msgstr "Sadnutie sa nepodarilo!"
-#: src/game.cpp:492
-msgid "Network Error"
+#: src/game.cpp:481
+msgid "The connection to the server was lost, the program will now quit"
msgstr ""
-#: src/game.cpp:493
-msgid "The connection to the server was lost, the program will now quit"
+#: src/game.cpp:487
+msgid "Network Error"
msgstr ""
-#: src/game.cpp:664 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
+#: 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 "Ukončiť"
-#: src/game.cpp:665
+#: src/game.cpp:647
#, fuzzy
msgid "Are you sure you want to quit?"
msgstr "Naozaj chcete odstrániť túto postavu?"
-#: 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 ""
@@ -383,12 +384,12 @@ msgstr "Kúpiť"
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 "Kúpiť"
#: 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
#, fuzzy, c-format
msgid "Price: %s / Total: %s"
msgstr "Cena: %d GP / Spolu: %d GP"
@@ -398,13 +399,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 "Popis: %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 "Effekt: %s"
@@ -413,206 +414,214 @@ msgstr "Effekt: %s"
msgid "Shop"
msgstr "Obchod"
-#: 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 "Predaj"
-#: 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 "Zrušiť"
-#: 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 "Zmeniť Emailovú adresu"
-#: 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 "Účet: %s"
-#: src/gui/changeemaildialog.cpp:48
+#: src/gui/changeemaildialog.cpp:49
#, fuzzy
msgid "Type New Email Address twice:"
msgstr "Zmeniť Emailovú adresu"
-#: 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 "Zmeniť heslo"
-#: 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 "Heslo:"
-#: 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 "Vytvoriť postavu"
-#: 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 "Meno"
-#: src/gui/charcreatedialog.cpp:70
+#: src/gui/charcreatedialog.cpp:69
msgid "Hair Color:"
msgstr "Farba vlasov:"
-#: src/gui/charcreatedialog.cpp:73
+#: src/gui/charcreatedialog.cpp:72
msgid "Hair Style:"
msgstr "Štýl vlasov:"
-#: src/gui/charcreatedialog.cpp:74
+#: src/gui/charcreatedialog.cpp:73
msgid "Create"
msgstr "Vytvoriť"
-#: src/gui/charcreatedialog.cpp:76 src/gui/register.cpp:75
+#: src/gui/charcreatedialog.cpp:75 src/gui/register.cpp:75
msgid "Male"
msgstr "Muž"
-#: src/gui/charcreatedialog.cpp:77 src/gui/register.cpp:76
+#: src/gui/charcreatedialog.cpp:76 src/gui/register.cpp:76
msgid "Female"
msgstr "Žena"
-#: 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 ""
-#: 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 "Chyba"
-#: src/gui/charcreatedialog.cpp:174
+#: src/gui/charcreatedialog.cpp:173
#, fuzzy
msgid "Your name needs to be at least 4 characters."
msgstr "Heslo musí byť menšie %d ako písmen."
-#: 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 ""
-#: src/gui/char_select.cpp:79
+#: src/gui/charselectdialog.cpp:78
msgid "Confirm Character Delete"
msgstr "Potvrďte zmazanie postavy"
-#: src/gui/char_select.cpp:80
+#: src/gui/charselectdialog.cpp:79
msgid "Are you sure you want to delete this character?"
msgstr "Naozaj chcete odstrániť túto postavu?"
-#: src/gui/char_select.cpp:98
+#: src/gui/charselectdialog.cpp:97
msgid "Account and Character Management"
msgstr "Účet a správa postáv"
-#: src/gui/char_select.cpp:105
+#: src/gui/charselectdialog.cpp:104
msgid "Select Character"
msgstr "Vyberte postavu"
-#: 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 "Ano"
-#: src/gui/char_select.cpp:113
+#: src/gui/charselectdialog.cpp:112
msgid "Previous"
msgstr "Predchádzajúci"
-#: 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 "Nasledujúci"
-#: 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 "Meno: %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 "Level: %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 "Nový"
-#: 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 "Vymazať"
-#: src/gui/char_select.cpp:120 src/gui/unregisterdialog.cpp:51
+#: src/gui/charselectdialog.cpp:119 src/gui/unregisterdialog.cpp:52
msgid "Unregister"
msgstr "Zrušiť registráciu"
-#: src/gui/char_select.cpp:127
+#: src/gui/charselectdialog.cpp:126
#, c-format
msgid "Money: %d"
msgstr "Peniaze: %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 "Pracovná úroveň: %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
#, fuzzy, c-format
msgid "Money: %s"
msgstr "Peniaze: %d"
-#: 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
#, fuzzy
msgid "Chat"
msgstr "Vytvoriť"
-#: src/gui/chat.cpp:341 src/gui/chat.cpp:347
+#: src/gui/chat.cpp:332
+#, c-format
+msgid "%d players are present."
+msgstr ""
+
+#: 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 "Nápoveda pre %s: %s"
-#: src/gui/confirm_dialog.cpp:42
+#: src/gui/confirmdialog.cpp:42
msgid "Yes"
msgstr "Áno"
-#: src/gui/confirm_dialog.cpp:43
+#: src/gui/confirmdialog.cpp:43
msgid "No"
msgstr "Nie"
@@ -620,26 +629,16 @@ msgstr "Nie"
msgid "Connecting..."
msgstr "Pripájam sa..."
-#: src/gui/emotecontainer.cpp:61
+#: src/gui/emotepopup.cpp:64
msgid "Unable to load selection.png"
msgstr ""
-#: 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 "Použiť"
-
-#: src/gui/equipmentwindow.cpp:68 src/gui/menuwindow.cpp:67
+#: src/gui/equipmentwindow.cpp:68 src/gui/windowmenu.cpp:60
msgid "Equipment"
msgstr "Vybavenie"
-#: 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 "Odstrojiť"
@@ -664,102 +663,105 @@ msgstr ""
msgid "Help"
msgstr "Nápoveda"
-#: 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 "Zatvoriť"
-#: src/gui/inventorywindow.cpp:51 src/gui/menuwindow.cpp:68
+#: src/gui/inventorywindow.cpp:54 src/gui/windowmenu.cpp:61
msgid "Inventory"
msgstr "Inventár"
-#: 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 "Vystrojiť"
-#: 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 "Použiť"
+
+#: src/gui/inventorywindow.cpp:80
msgid "Drop"
msgstr "Zahodiť"
-#: 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
#, fuzzy
msgid "Weight:"
msgstr "Nosnosť: %d / %d"
-#: 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 "Zvoľte množstvo vecí k predaju."
-#: src/gui/item_amount.cpp:95
+#: src/gui/itemamount.cpp:124
msgid "Select amount of items to drop."
msgstr "Zvoľte množstvo vecí k zahodeniu."
-#: src/gui/item_amount.cpp:98
+#: src/gui/itemamount.cpp:127
#, fuzzy
msgid "Select amount of items to store."
msgstr "Zvoľte množstvo vecí k predaju."
-#: src/gui/item_amount.cpp:101
+#: src/gui/itemamount.cpp:130
#, fuzzy
msgid "Select amount of items to retrieve."
msgstr "Zvoľte množstvo vecí k predaju."
-#: src/gui/item_amount.cpp:104
+#: src/gui/itemamount.cpp:133
#, fuzzy
msgid "Select amount of items to split."
msgstr "Zvoľte množstvo vecí k zahodeniu."
-#: src/gui/itempopup.cpp:89
+#: src/gui/itempopup.cpp:91
#, fuzzy
msgid "Weight: "
msgstr "Nosnosť: %d / %d"
-#: src/gui/login.cpp:47
+#: src/gui/login.cpp:48
msgid "Login"
msgstr "Prihlásenie"
-#: 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 "Server:"
-#: 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 ""
-#: 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 "Zapamätať si používateľské meno"
-#: 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 "Potvrdiť"
-#: 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 "Registrovať"
-#: 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 ""
@@ -775,71 +777,44 @@ msgstr ""
msgid "Cast Test Spell 3"
msgstr ""
-#: src/gui/menuwindow.cpp:66
-msgid "Status"
-msgstr "Stav"
-
-#: src/gui/menuwindow.cpp:69 src/gui/skill.cpp:126 src/gui/skilldialog.cpp:99
-msgid "Skills"
-msgstr "Schopnosti"
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
+#, fuzzy
+msgid "Map"
+msgstr "MiniMapa"
-#: src/gui/menuwindow.cpp:72
-msgid "Guilds"
+#: src/gui/npcdialog.cpp:43
+msgid "Waiting for server"
msgstr ""
-#: src/gui/menuwindow.cpp:73
+#: src/gui/npcdialog.cpp:46
#, fuzzy
-msgid "Buddys"
-msgstr "Kúpiť"
-
-#: src/gui/menuwindow.cpp:75
-msgid "Shortcut"
-msgstr "Skratka"
+msgid "Submit"
+msgstr "Ukončiť"
-#: src/gui/menuwindow.cpp:77 src/gui/setup.cpp:65 src/main.cpp:920
-msgid "Setup"
-msgstr "Nastavenie"
+#: src/gui/npcdialog.cpp:49 src/gui/npcpostdialog.cpp:39
+msgid "NPC"
+msgstr "NPC"
-#: src/gui/minimap.cpp:39
-msgid "MiniMap"
-msgstr "MiniMapa"
+#: src/gui/npcdialog.cpp:95
+msgid "+"
+msgstr ""
-#: src/gui/npcintegerdialog.cpp:39
-msgid "NPC Number Request"
+#: src/gui/npcdialog.cpp:96
+msgid "-"
msgstr ""
-#: src/gui/npcintegerdialog.cpp:50
+#: src/gui/npcdialog.cpp:105
#, fuzzy
msgid "Reset"
msgstr "Registrovať"
-#: src/gui/npcintegerdialog.cpp:101 src/gui/npclistdialog.cpp:123
-#: src/gui/npcstringdialog.cpp:75
-#, fuzzy
-msgid ""
-"\n"
-"> Cancel\n"
-msgstr "Zrušiť"
-
-#: src/gui/npcpostdialog.cpp:39 src/gui/npc_text.cpp:37
-msgid "NPC"
-msgstr "NPC"
-
#: src/gui/npcpostdialog.cpp:51
#, fuzzy
msgid "Send"
msgstr "Zvuk"
-#: src/gui/npcstringdialog.cpp:39
-msgid "NPC Text Request"
-msgstr ""
-
-#: 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
#, fuzzy
msgid "Text"
msgstr "Nasledujúci"
@@ -894,7 +869,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 ""
@@ -916,7 +891,7 @@ msgid "Being"
msgstr ""
#: src/gui/palette.cpp:104
-msgid "Other Player's Names"
+msgid "Other Players' Names"
msgstr ""
#: src/gui/palette.cpp:105
@@ -943,21 +918,22 @@ msgid "Unknown Item Type"
msgstr ""
#: src/gui/palette.cpp:111
-msgid "Generic"
+msgid "Generics"
msgstr ""
#: src/gui/palette.cpp:112
-msgid "Hat"
-msgstr ""
+#, fuzzy
+msgid "Hats"
+msgstr "Stav"
#: src/gui/palette.cpp:113
#, fuzzy
-msgid "Usable"
+msgid "Usables"
msgstr "Použiť"
#: src/gui/palette.cpp:114
#, fuzzy
-msgid "Shirt"
+msgid "Shirts"
msgstr "Skratka"
#: src/gui/palette.cpp:115
@@ -979,15 +955,15 @@ msgstr ""
#: src/gui/palette.cpp:119
#, fuzzy
-msgid "Shield"
+msgid "Shields"
msgstr "Predaj"
#: src/gui/palette.cpp:120
-msgid "Ring"
+msgid "Rings"
msgstr ""
#: src/gui/palette.cpp:121
-msgid "Necklace"
+msgid "Necklaces"
msgstr ""
#: src/gui/palette.cpp:122
@@ -1042,94 +1018,102 @@ msgstr ""
msgid "1/4 HP Bar"
msgstr ""
-#: src/gui/popupmenu.cpp:73
+#: src/gui/popupmenu.cpp:75
msgid "@@name|Add name to chat@@"
msgstr ""
-#: src/gui/popupmenu.cpp:85
+#: src/gui/popupmenu.cpp:87
#, c-format
msgid "@@trade|Trade With %s@@"
msgstr "@@obchod|Obchodovať s %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 "@@útok|Útok %s@@"
-#: src/gui/popupmenu.cpp:92
+#: src/gui/popupmenu.cpp:94
#, c-format
msgid "@@friend|Befriend %s@@"
msgstr ""
-#: 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 ""
-#: src/gui/popupmenu.cpp:112
+#: src/gui/popupmenu.cpp:114
#, c-format
msgid "@@party|Invite %s to join your party@@"
msgstr ""
-#: src/gui/popupmenu.cpp:123
+#: src/gui/popupmenu.cpp:125
#, fuzzy, c-format
msgid "@@talk|Talk To %s@@"
msgstr "@@hovoriť|Hovoriť s NPC@@"
-#: 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 "@@zrušiť|Zrušiť@@"
-#: src/gui/popupmenu.cpp:155
+#: src/gui/popupmenu.cpp:157
#, c-format
-msgid "@@pickup|Pick Up %s@@"
+msgid "@@pickup|Pick up %s@@"
msgstr ""
-#: src/gui/popupmenu.cpp:156 src/gui/popupmenu.cpp:352
-msgid "@@chat|Add to Chat@@"
+#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:373
+msgid "@@chat|Add to chat@@"
msgstr ""
-#: 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 "@@použiť|Odstrojiť@@"
-#: 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 ""
+
+#: src/gui/popupmenu.cpp:371
+msgid "@@retrieve|Retrieve@@"
+msgstr ""
+
#: src/gui/quitdialog.cpp:37
#, fuzzy
msgid "Switch server"
@@ -1201,18 +1185,30 @@ msgstr "Heslo musí byť menšie %d ako písmen."
msgid "Passwords do not match."
msgstr "Heslá sa nezhodujú."
-#: 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 ""
-#: src/gui/serverselectdialog.cpp:50
+#: src/gui/serverselectdialog.cpp:59
msgid "Select Server"
msgstr "Vyberte Server"
+#: src/gui/setup.cpp:64 src/gui/windowmenu.cpp:69 src/main.cpp:933
+msgid "Setup"
+msgstr "Nastavenie"
+
+#: src/gui/setup.cpp:72
+msgid "Apply"
+msgstr "Použiť"
+
+#: src/gui/setup.cpp:72
+msgid "Reset Windows"
+msgstr ""
+
#: src/gui/setup_audio.cpp:41
msgid "Sound"
msgstr "Zvuk"
@@ -1229,11 +1225,11 @@ msgstr "Sfx zvuk"
msgid "Music volume"
msgstr "Hudobný zvuk"
-#: 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
#, fuzzy
msgid "Colors"
msgstr "Zatvoriť"
@@ -1242,24 +1238,24 @@ msgstr "Zatvoriť"
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
#, fuzzy
msgid "Static"
msgstr "Stav"
#: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:431
#, fuzzy
msgid "Pulse"
msgstr "Zatvoriť"
#: 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
#, fuzzy
msgid "Spectrum"
msgstr "Nastavenie"
@@ -1268,26 +1264,18 @@ msgstr "Nastavenie"
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 "Použiť"
-
-#: 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 ""
@@ -1358,7 +1346,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 ""
@@ -1386,154 +1374,175 @@ 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
+#, fuzzy
+msgid "Small"
+msgstr "Predaj"
+
+#: 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 ""
-#: 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 ""
-#: src/gui/setup_video.cpp:136
+#: src/gui/setup_video.cpp:167
msgid "FPS Limit:"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: 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
#, fuzzy
msgid "No text"
msgstr "Nasledujúci"
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: src/gui/setup_video.cpp:365
+#: src/gui/setup_video.cpp:435
msgid "Applying change to OpenGL requires restart."
msgstr ""
-#: 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 ""
@@ -1546,6 +1555,10 @@ msgstr "Schopnosti"
msgid "Mystery Skill"
msgstr ""
+#: src/gui/skill.cpp:126 src/gui/skilldialog.cpp:99 src/gui/windowmenu.cpp:62
+msgid "Skills"
+msgstr "Schopnosti"
+
#: src/gui/skill.cpp:145 src/gui/skill.cpp:197
#, c-format
msgid "Skill points: %d"
@@ -1555,15 +1568,6 @@ msgstr ""
msgid "Up"
msgstr ""
-#: src/gui/skill.cpp:146
-msgid "inc"
-msgstr ""
-
-#: src/gui/skill.cpp:147
-#, fuzzy
-msgid "use"
-msgstr "Použiť"
-
#: src/gui/skilldialog.cpp:113
msgid "Weapons"
msgstr ""
@@ -1573,170 +1577,170 @@ msgstr ""
msgid "Crafts"
msgstr "Vytvoriť"
-#: 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 ""
-#: src/gui/status.cpp:61
+#: src/gui/status.cpp:60
msgid "HP:"
msgstr ""
-#: src/gui/status.cpp:64
+#: src/gui/status.cpp:63
msgid "Exp:"
msgstr ""
-#: src/gui/status.cpp:67
+#: src/gui/status.cpp:66
msgid "MP:"
msgstr ""
-#: 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 ""
-#: src/gui/status.cpp:91
+#: src/gui/status.cpp:90
#, no-c-format
msgid "% Evade:"
msgstr ""
-#: 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
#, fuzzy
msgid "Intelligence"
msgstr "Inteligencia:"
-#: 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 ""
-#: src/gui/status.cpp:383 src/gui/status.cpp:405
+#: src/gui/status.cpp:384
#, fuzzy
msgid "Max level"
msgstr "Muž"
-#: src/gui/storagewindow.cpp:53
+#: src/gui/storagewindow.cpp:54
msgid "Storage"
msgstr ""
-#: src/gui/storagewindow.cpp:64
+#: src/gui/storagewindow.cpp:65
#, fuzzy
msgid "Store"
msgstr "Sila:"
-#: 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
#, fuzzy
msgid "Confirmed. Waiting..."
msgstr "Pripájam sa..."
-#: 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 ""
-#: src/gui/trade.cpp:97
+#: src/gui/trade.cpp:96
msgid "You give:"
msgstr ""
-#: src/gui/trade.cpp:101
+#: src/gui/trade.cpp:100
#, fuzzy
msgid "Change"
msgstr "Zrušiť"
-#: 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
#, fuzzy
msgid "You don't have enough money"
msgstr "Nemáš žiadne poznámky!"
@@ -1857,21 +1861,21 @@ msgstr ""
msgid "Need a user to kick!"
msgstr ""
-#: src/gui/widgets/chattab.cpp:115
+#: src/gui/widgets/chattab.cpp:114
msgid "Global announcement:"
msgstr "Globálne oznámenie:"
-#: src/gui/widgets/chattab.cpp:121
+#: src/gui/widgets/chattab.cpp:120
#, c-format
msgid "Global announcement from %s:"
msgstr "Globálne oznámenie od %s:"
-#: src/gui/widgets/chattab.cpp:147
+#: src/gui/widgets/chattab.cpp:146
#, fuzzy, c-format
msgid "%s whispers: "
msgstr "%s nápoveda:"
-#: src/gui/widgets/chattab.cpp:241 src/resources/itemdb.cpp:108
+#: src/gui/widgets/chattab.cpp:240 src/resources/itemdb.cpp:107
#, fuzzy
msgid "Unknown item"
msgstr "Neznámy príkaz"
@@ -1881,25 +1885,37 @@ msgstr "Neznámy príkaz"
msgid "Cannot send empty chat!"
msgstr "Nemôžem kričať!"
-#: src/gui/widgets/whispertab.cpp:55
-#, c-format
-msgid "%s: %s"
-msgstr ""
-
-#: src/gui/widgets/whispertab.cpp:69
+#: src/gui/widgets/whispertab.cpp:68
msgid "/close > Close the whisper tab"
msgstr ""
-#: src/gui/widgets/whispertab.cpp:79
+#: src/gui/widgets/whispertab.cpp:78
#, fuzzy
msgid "Command: /close"
msgstr "Príkaz: /clear"
-#: src/gui/widgets/whispertab.cpp:80
+#: src/gui/widgets/whispertab.cpp:79
#, fuzzy
msgid "This command closes the current whisper tab."
msgstr "Tento príkaz zobrazí meno aktuálne mapy."
+#: src/gui/windowmenu.cpp:59
+msgid "Status"
+msgstr "Stav"
+
+#: src/gui/windowmenu.cpp:65
+msgid "Guilds"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:66
+#, fuzzy
+msgid "Buddys"
+msgstr "Kúpiť"
+
+#: src/gui/windowmenu.cpp:68
+msgid "Shortcut"
+msgstr "Skratka"
+
#: src/keyboardconfig.cpp:41
msgid "Move Up"
msgstr ""
@@ -2023,8 +2039,8 @@ msgstr ""
#: src/keyboardconfig.cpp:80
#, fuzzy
-msgid "Emote Window"
-msgstr "Zobrazenie smajlíka sa nepodarilo!"
+msgid "Party Window"
+msgstr "Stav"
#: src/keyboardconfig.cpp:81
msgid "Emote Shortcut Window"
@@ -2074,164 +2090,169 @@ msgstr ""
msgid "Ignore input 2"
msgstr ""
-#: 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
#, fuzzy
msgid "Sword"
msgstr "Zvuk"
-#: 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
#, fuzzy
msgid "Mace"
msgstr "Muž"
-#: 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
#, fuzzy
msgid "Craft"
msgstr "Vytvoriť"
-#: 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 ""
-#: src/main.cpp:563
-msgid "Options: "
+#: src/main.cpp:567
+msgid "Options:"
msgstr ""
-#: src/main.cpp:564
-msgid " -C --configfile : Configuration file to use"
+#: src/main.cpp:568
+msgid " -C --config-file : Configuration file to use"
msgstr ""
-#: src/main.cpp:565
-msgid " -d --data : Directory to load game data from"
+#: src/main.cpp:569
+msgid " -d --data : Directory to load game data from"
msgstr ""
-#: src/main.cpp:566
-msgid " -D --default : Bypass the login process with default settings"
+#: src/main.cpp:570
+msgid " -D --default : Choose default character server and character"
msgstr ""
-#: src/main.cpp:568
+#: src/main.cpp:572
#, fuzzy
-msgid " -h --help : Display this help"
+msgid " -h --help : Display this help"
msgstr "/help: Zobraziť túto pomoc"
-#: src/main.cpp:569
-msgid " -S --homedir : Directory to use as home directory"
+#: src/main.cpp:573
+msgid " -S --home-dir : Directory to use as home directory"
msgstr ""
-#: src/main.cpp:570
-msgid " -H --updatehost : Use this update host"
+#: src/main.cpp:574
+msgid " -H --update-host : Use this update host"
msgstr ""
-#: src/main.cpp:571
-msgid " -P --password : Login with this password"
+#: src/main.cpp:575
+msgid " -P --password : Login with this password"
msgstr ""
-#: src/main.cpp:572
-msgid " -c --character : Login with this character"
+#: src/main.cpp:576
+msgid " -c --character : Login with this character"
msgstr ""
-#: src/main.cpp:573
-msgid " -o --port : Login Server Port"
+#: src/main.cpp:577
+msgid " -p --port : Login Server Port"
msgstr ""
-#: src/main.cpp:574
-msgid " -s --server : Login Server name or IP"
+#: src/main.cpp:578
+msgid " -s --server : Login Server name or IP"
msgstr ""
-#: src/main.cpp:575
-msgid " -u --skipupdate : Skip the update downloads"
+#: src/main.cpp:579
+msgid " -u --skip-update : Skip the update downloads"
msgstr ""
-#: src/main.cpp:576
-msgid " -U --username : Login with this username"
+#: src/main.cpp:580
+msgid " -U --username : Login with this username"
msgstr ""
-#: src/main.cpp:577
-msgid " -v --version : Display the version"
+#: src/main.cpp:582
+msgid " -O --no-opengl : Disable OpenGL for this session"
msgstr ""
-#: src/main.cpp:582
+#: src/main.cpp:584
+#, fuzzy
+msgid " -v --version : Display the version"
+msgstr "/help: Zobraziť túto pomoc"
+
+#: src/main.cpp:589
msgid "The Mana World "
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
#, fuzzy
msgid "Kick failed!"
msgstr "Sadnutie sa nepodarilo!"
-#: src/net/ea/adminhandler.cpp:69
+#: src/net/ea/adminhandler.cpp:68
msgid "Kick succeeded!"
msgstr ""
@@ -2314,18 +2335,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 ""
@@ -2338,435 +2359,450 @@ msgstr "Odstrojiť"
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
#, fuzzy, c-format
msgid "Strength: %d"
msgstr "Sila:"
-#: 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 ""
-#: 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 ""
-#: src/net/ea/generalhandler.cpp:96 src/net/tmwserv/generalhandler.cpp:88
+#: src/net/ea/generalhandler.cpp:98 src/net/tmwserv/generalhandler.cpp:90
#, fuzzy, c-format
msgid "Intelligence: %d"
msgstr "Inteligencia:"
-#: 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 ""
-#: src/net/ea/generalhandler.cpp:100
+#: src/net/ea/generalhandler.cpp:102
#, c-format
msgid "Luck: %d"
msgstr ""
-#: src/net/ea/generalhandler.cpp:123
+#: src/net/ea/generalhandler.cpp:125
#, fuzzy
msgid "Authentication failed"
msgstr "Vytvorenie postavy sa nepodarilo"
-#: 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 ""
-#: 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
+#, fuzzy
+msgid "/help > Display this help."
+msgstr "/help: Zobraziť túto pomoc"
+
+#: src/net/ea/gui/partytab.cpp:53
msgid "/create > Create a new party"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:55
+#: src/net/ea/gui/partytab.cpp:54
msgid "/new > Alias of create"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:56
+#: src/net/ea/gui/partytab.cpp:55
msgid "/invite > Invite a player to your party"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:57
+#: src/net/ea/gui/partytab.cpp:56
msgid "/leave > Leave the party you are in"
msgstr ""
-#: 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 ""
-#: src/net/ea/gui/partytab.cpp:59
+#: src/net/ea/gui/partytab.cpp:58
msgid "/item > Show/change party item sharing options"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:60
+#: src/net/ea/gui/partytab.cpp:59
msgid "/exp > Show/change party experience sharing options"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:69
+#: src/net/ea/gui/partytab.cpp:68
#, fuzzy
msgid "Command: /new <party-name>"
msgstr "Príkaz: /announce <správa>"
-#: src/net/ea/gui/partytab.cpp:70
+#: src/net/ea/gui/partytab.cpp:69
#, fuzzy
msgid "Command: /create <party-name>"
msgstr "Príkaz: /clear"
-#: 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 ""
-#: src/net/ea/gui/partytab.cpp:75
+#: src/net/ea/gui/partytab.cpp:74
#, fuzzy
msgid "Command: /invite <nick>"
msgstr "Príkaz: /w <nick> <správa>"
-#: src/net/ea/gui/partytab.cpp:82
+#: src/net/ea/gui/partytab.cpp:81
#, fuzzy
msgid "Command: /leave"
msgstr "Príkaz: /clear"
-#: src/net/ea/gui/partytab.cpp:83
+#: src/net/ea/gui/partytab.cpp:82
#, fuzzy
msgid "This command causes the player to leave the party."
msgstr "Tento príkaz vymaže obsah logu predchádzajúceho rozhovoru."
-#: src/net/ea/gui/partytab.cpp:87
+#: src/net/ea/gui/partytab.cpp:86
#, fuzzy
msgid "Command: /item <policy>"
msgstr "Príkaz: /hel"
-#: src/net/ea/gui/partytab.cpp:88
+#: src/net/ea/gui/partytab.cpp:87
#, fuzzy
msgid "This command changes the party's item sharing policy."
msgstr "Tento Príkaz pošle spravábu <správa> pre <nick>."
-#: 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."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:92
+#: src/net/ea/gui/partytab.cpp:91
#, fuzzy
msgid "Command: /item"
msgstr "Príkaz: /hel"
-#: src/net/ea/gui/partytab.cpp:93
+#: src/net/ea/gui/partytab.cpp:92
#, fuzzy
msgid "This command displays the party's current item sharing policy."
msgstr "Tento príkaz zobrazí meno aktuálne mapy."
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/ea/gui/partytab.cpp:96
#, fuzzy
msgid "Command: /exp <policy>"
msgstr "Príkaz: /help <príkaz>"
-#: 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."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:102
+#: src/net/ea/gui/partytab.cpp:101
#, fuzzy
msgid "Command: /exp"
msgstr "Príkaz: /hel"
-#: src/net/ea/gui/partytab.cpp:103
+#: src/net/ea/gui/partytab.cpp:102
#, fuzzy
msgid "This command displays the party's current experience sharing policy."
msgstr "Tento príkaz zobrazí meno aktuálne mapy."
-#: 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]"
+msgid "You picked up %s [@@%d|%s@@]"
msgstr ""
-#: 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
#, fuzzy
msgid "Unregistered ID"
msgstr "Zrušiť registráciu"
-#: src/net/ea/loginhandler.cpp:114
+#: src/net/ea/loginhandler.cpp:113
#, fuzzy
msgid "Wrong password"
msgstr "Zmeniť heslo"
-#: src/net/ea/loginhandler.cpp:117
+#: src/net/ea/loginhandler.cpp:116
#, fuzzy
msgid "Account expired"
msgstr "Účet: %s"
-#: src/net/ea/loginhandler.cpp:120
+#: src/net/ea/loginhandler.cpp:119
#, fuzzy
msgid "Rejected from server"
msgstr "Vyberte Server"
-#: 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 ""
-#: 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"
" Please contact the GM team via the forums."
msgstr ""
-#: 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
#, fuzzy
msgid "Unknown error"
msgstr "Neznámy príkaz"
-#: src/net/ea/partyhandler.cpp:78
-msgid "Party successfully created."
-msgstr ""
-
-#: src/net/ea/partyhandler.cpp:82
+#: src/net/ea/partyhandler.cpp:77
#, fuzzy
msgid "Could not create party."
msgstr "Nie je možné vstúpiť do párty!"
-#: 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 ""
-#: src/net/ea/partyhandler.cpp:116
+#: src/net/ea/partyhandler.cpp:119
#, c-format
msgid "%s refused your invitation."
msgstr ""
-#: src/net/ea/partyhandler.cpp:120
+#: src/net/ea/partyhandler.cpp:123
#, c-format
msgid "%s is now a member of your party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:124
+#: src/net/ea/partyhandler.cpp:127
#, c-format
msgid "Unknown invite response for %s."
msgstr ""
-#: 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 ""
-#: src/net/ea/partyhandler.cpp:269
+#: src/net/ea/partyhandler.cpp:272
#, c-format
msgid "An unknown member tried to say: %s"
msgstr ""
-#: 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
#, fuzzy, c-format
msgid "%s is not in your party!"
msgstr "Nie je možné vstúpiť do párty!"
-#: 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
#, fuzzy
msgid "You are not that alive anymore."
msgstr "Práve teraz to nemôžeš robiť."
-#: 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"
+#: 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 ""
-#: 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
#, fuzzy
msgid "You are no more."
msgstr "Nemáš žiadne poznámky!"
-#: src/net/ea/playerhandler.cpp:134
+#: src/net/ea/playerhandler.cpp:122
#, fuzzy
msgid "You have ceased to be."
msgstr "Nemáš žiadne poznámky!"
-#: src/net/ea/playerhandler.cpp:135
+#: src/net/ea/playerhandler.cpp:123
msgid "You've expired and gone to meet your maker."
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 ""
-#: 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 ""
@@ -2926,40 +2962,101 @@ 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 ""
-#: 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
+#, fuzzy
+msgid "Server is full"
+msgstr "Server:"
+
+#: 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
+#, fuzzy
+msgid "New email address incorrect"
+msgstr "Zmeniť Emailovú adresu"
+
+#: src/net/tmwserv/loginhandler.cpp:143
+#, fuzzy
+msgid "Old email address incorrect"
+msgstr "Zmeniť Emailovú adresu"
+
+#: src/net/tmwserv/loginhandler.cpp:149
+#, fuzzy
+msgid "The new Email Address already exists."
+msgstr "Zmeniť Emailovú adresu"
+
+#: 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 "Zmeniť heslo"
+
+#: src/net/tmwserv/loginhandler.cpp:211
+msgid "Wrong username, password or email address"
+msgstr ""
+
+#: src/net/tmwserv/loginhandler.cpp:214
+msgid "Username already exists"
+msgstr ""
+
+#: src/net/tmwserv/loginhandler.cpp:217
+msgid "Email address already exists"
+msgstr ""
+
+#: src/resources/itemdb.cpp:52
#, c-format
msgid "Attack %+d"
msgstr ""
-#: src/resources/itemdb.cpp:54
+#: src/resources/itemdb.cpp:53
#, c-format
msgid "Defense %+d"
msgstr ""
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:54
#, c-format
msgid "HP %+d"
msgstr ""
-#: src/resources/itemdb.cpp:56
+#: src/resources/itemdb.cpp:55
#, c-format
msgid "MP %+d"
msgstr ""
-#: src/resources/itemdb.cpp:113
+#: src/resources/itemdb.cpp:112
msgid "items.xml"
msgstr ""
-#: src/resources/itemdb.cpp:151
+#: src/resources/itemdb.cpp:150
msgid "Unnamed"
msgstr ""
@@ -2975,6 +3072,20 @@ msgstr ""
msgid "NPC Database: Error while loading npcs.xml!"
msgstr ""
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "> Cancel\n"
+#~ msgstr "Zrušiť"
+
+#, fuzzy
+#~ msgid "use"
+#~ msgstr "Použiť"
+
+#, fuzzy
+#~ msgid "Emote Window"
+#~ msgstr "Zobrazenie smajlíka sa nepodarilo!"
+
#~ msgid "Gold: %d"
#~ msgstr "Zlato: %d"
diff --git a/po/sv.po b/po/sv.po
index 17274f7a..c09ba0f6 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-04-21 17:27+0200\n"
+"POT-Creation-Date: 2009-05-10 15:53+0200\n"
"PO-Revision-Date: 2009-01-29 01:20+0100\n"
"Last-Translator: Kess Vargavind <vargavind@gmail.com>\n"
"Language-Team: Swedish <sv@li.org>\n"
@@ -17,313 +17,314 @@ msgstr ""
"X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
"X-Generator: Launchpad (build Unknown)\n"
-#: src/commandhandler.cpp:142
+#: src/commandhandler.cpp:141
msgid "-- Help --"
msgstr "-- Hjälp --"
-#: src/commandhandler.cpp:143 src/net/ea/gui/partytab.cpp:53
+#: src/commandhandler.cpp:142
#, fuzzy
-msgid "/help > Display this help."
+msgid "/help > Display this help"
msgstr "/help: Visar den här hjälptexten"
-#: src/commandhandler.cpp:145
+#: src/commandhandler.cpp:144
#, fuzzy
msgid "/where > Display map name"
msgstr "/where: Visar namnet på kartan där du befinner dig"
-#: src/commandhandler.cpp:146
+#: src/commandhandler.cpp:145
#, fuzzy
msgid "/who > Display number of online users"
msgstr "/who: Visar antalet inloggade spelare"
-#: src/commandhandler.cpp:147
+#: src/commandhandler.cpp:146
msgid "/me > Tell something about yourself"
msgstr ""
-#: src/commandhandler.cpp:149
+#: src/commandhandler.cpp:148
#, fuzzy
msgid "/clear > Clears this window"
msgstr "/clear: Tömmer det här fönstret på text"
-#: src/commandhandler.cpp:151
+#: src/commandhandler.cpp:150
#, fuzzy
msgid "/msg > Send a private message to a user"
msgstr "/whisper <namn> <text>: Skickar ett privat meddelande till en spelare"
-#: src/commandhandler.cpp:152
+#: src/commandhandler.cpp:151
msgid "/whisper > Alias of msg"
msgstr ""
-#: src/commandhandler.cpp:153
+#: src/commandhandler.cpp:152
msgid "/w > Alias of msg"
msgstr ""
-#: src/commandhandler.cpp:154
+#: src/commandhandler.cpp:153
msgid "/query > Makes a tab for private messages with another user"
msgstr ""
-#: src/commandhandler.cpp:155
+#: src/commandhandler.cpp:154
msgid "/q > Alias of query"
msgstr ""
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:156
msgid "/list > Display all public channels"
msgstr ""
-#: src/commandhandler.cpp:158
+#: src/commandhandler.cpp:157
msgid "/join > Join or create a channel"
msgstr ""
-#: src/commandhandler.cpp:160
+#: src/commandhandler.cpp:159
msgid "/party > Invite a user to party"
msgstr ""
-#: src/commandhandler.cpp:162
+#: src/commandhandler.cpp:161
msgid "/record > Start recording the chat to an external file"
msgstr ""
-#: 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 ""
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:165
#, fuzzy
msgid "/announce > Global announcement (GM only)"
msgstr "/announce: Globalt meddelande (endast GM)"
-#: src/commandhandler.cpp:170
+#: src/commandhandler.cpp:169
msgid "For more information, type /help <command>"
msgstr "För mer information skriv /help <kommando>"
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:173
msgid "Command: /help"
msgstr "Kommando: /help"
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:174
msgid "This command displays a list of all commands available."
msgstr "Det här kommandot visar en lista över alla tillgängliga kommandon."
-#: src/commandhandler.cpp:176
+#: src/commandhandler.cpp:175
msgid "Command: /help <command>"
msgstr "Kommando: /help <kommando>"
-#: src/commandhandler.cpp:177
+#: src/commandhandler.cpp:176
msgid "This command displays help on <command>."
msgstr "Det här kommandot ger mer information om <kommando>."
-#: src/commandhandler.cpp:185
+#: src/commandhandler.cpp:184
msgid "Command: /announce <msg>"
msgstr "Kommando: /announce <text>"
-#: src/commandhandler.cpp:186
+#: src/commandhandler.cpp:185
msgid "*** only available to a GM ***"
msgstr "*** endast en GM kan använda det här kommandot ***"
-#: src/commandhandler.cpp:187
+#: src/commandhandler.cpp:186
msgid "This command sends the message <msg> to all players currently online."
msgstr ""
"Det här kommandot skickar meddelandet <text> till alla inloggade spelare."
-#: src/commandhandler.cpp:192
+#: src/commandhandler.cpp:191
msgid "Command: /clear"
msgstr "Kommando: /clear"
-#: src/commandhandler.cpp:193
+#: src/commandhandler.cpp:192
msgid "This command clears the chat log of previous chat."
msgstr "Det här kommandot tömmer chattloggen."
-#: src/commandhandler.cpp:197
+#: src/commandhandler.cpp:196
#, fuzzy
msgid "Command: /join <channel>"
msgstr "Kommando: /help"
-#: src/commandhandler.cpp:198
+#: src/commandhandler.cpp:197
#, fuzzy
msgid "This command makes you enter <channel>."
msgstr "Det här kommandot ger mer information om <kommando>."
-#: 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
#, fuzzy
msgid "Command: /list"
msgstr "Kommando: /help"
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:203
#, fuzzy
msgid "This command shows a list of all channels."
msgstr "Det här kommandot visar en lista över alla tillgängliga kommandon."
-#: src/commandhandler.cpp:208
+#: src/commandhandler.cpp:207
#, fuzzy
msgid "Command: /me <message>"
msgstr "Kommando: /announce <text>"
-#: src/commandhandler.cpp:209
+#: src/commandhandler.cpp:208
msgid "This command tell others you are (doing) <msg>."
msgstr ""
-#: src/commandhandler.cpp:213
+#: src/commandhandler.cpp:212
#, fuzzy
msgid "Command: /msg <nick> <message>"
msgstr "Kommando: /w <namn> <text>"
-#: src/commandhandler.cpp:214
+#: src/commandhandler.cpp:213
#, fuzzy
msgid "Command: /whisper <nick> <message>"
msgstr "Kommando: /whisper <namn> <text>"
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:214
#, fuzzy
msgid "Command: /w <nick> <message>"
msgstr "Kommando: /w <namn> <text>"
-#: src/commandhandler.cpp:216
+#: src/commandhandler.cpp:215
#, fuzzy
msgid "This command sends the text <message> to <nick>."
msgstr "Det här kommandot skickar meddelandet <text> till karaktären <namn>."
-#: 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 ""
"Om <namn> innehåller mellanslag, måste du sätta citattecken (\") runt det."
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:221
#, fuzzy
msgid "Command: /query <nick>"
msgstr "Kommando: /w <namn> <text>"
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:222
#, fuzzy
msgid "Command: /q <nick>"
msgstr "Kommando: /w <namn> <text>"
-#: src/commandhandler.cpp:224
+#: src/commandhandler.cpp:223
msgid "This command tries to make a tab for whispers betweenyou and <nick>."
msgstr ""
-#: src/commandhandler.cpp:229
+#: src/commandhandler.cpp:228
#, fuzzy
msgid "Command: /party <nick>"
msgstr "Kommando: /w <namn> <text>"
-#: 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 ""
-#: src/commandhandler.cpp:236
+#: src/commandhandler.cpp:235
#, fuzzy
msgid "Command: /present"
msgstr "Kommando: /where"
-#: 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
#, fuzzy
msgid "Command: /record <filename>"
msgstr "Kommando: /clear"
-#: src/commandhandler.cpp:244
+#: src/commandhandler.cpp:243
#, fuzzy
msgid "This command starts recording the chat log to the file <filename>."
msgstr "Det här kommandot tömmer chattloggen."
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:245
#, fuzzy
msgid "Command: /record"
msgstr "Kommando: /clear"
-#: src/commandhandler.cpp:247
+#: src/commandhandler.cpp:246
msgid "This command finishes a recording session."
msgstr ""
-#: src/commandhandler.cpp:251
+#: src/commandhandler.cpp:250
#, fuzzy
msgid "Command: /toggle <state>"
msgstr "Kommando: /announce <text>"
-#: 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 ""
-#: src/commandhandler.cpp:257
+#: src/commandhandler.cpp:256
#, fuzzy
msgid "Command: /toggle"
msgstr "Kommando: /clear"
-#: src/commandhandler.cpp:258
+#: src/commandhandler.cpp:257
#, fuzzy
msgid "This command displays the return toggle status."
msgstr "Det här kommandot visar namnet på den karta där du befinner dig."
-#: src/commandhandler.cpp:262
+#: src/commandhandler.cpp:261
msgid "Command: /where"
msgstr "Kommando: /where"
-#: src/commandhandler.cpp:263
+#: src/commandhandler.cpp:262
msgid "This command displays the name of the current map."
msgstr "Det här kommandot visar namnet på den karta där du befinner dig."
-#: src/commandhandler.cpp:267
+#: src/commandhandler.cpp:266
msgid "Command: /who"
msgstr "Kommando: /who"
-#: src/commandhandler.cpp:268
+#: src/commandhandler.cpp:267
msgid "This command displays the number of players currently online."
msgstr "Det här kommandot visar antalet spelare som är inloggade just nu."
-#: src/commandhandler.cpp:273
+#: src/commandhandler.cpp:272
msgid "Unknown command."
msgstr "Okänt kommando."
-#: src/commandhandler.cpp:274
+#: src/commandhandler.cpp:273
msgid "Type /help for a list of commands."
msgstr "Skriv /help för en lista med kommandon."
-#: src/commandhandler.cpp:336
-msgid "Cannont send empty whispers!"
-msgstr ""
+#: src/commandhandler.cpp:339
+#, fuzzy
+msgid "Cannot send empty whispers!"
+msgstr "Kan inte skrika!"
-#: 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 ""
-#: 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 ""
@@ -332,47 +333,47 @@ msgstr ""
msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
msgstr ""
-#: 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
#, fuzzy
msgid "Saving screenshot failed!"
msgstr "Kan inte sitta ned!"
-#: src/game.cpp:492
-msgid "Network Error"
+#: src/game.cpp:481
+msgid "The connection to the server was lost, the program will now quit"
msgstr ""
-#: src/game.cpp:493
-msgid "The connection to the server was lost, the program will now quit"
+#: src/game.cpp:487
+msgid "Network Error"
msgstr ""
-#: src/game.cpp:664 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
+#: 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 "Avsluta"
-#: src/game.cpp:665
+#: src/game.cpp:647
#, fuzzy
msgid "Are you sure you want to quit?"
msgstr "Är du säker på att du vill ta bort den här karaktären?"
-#: 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 ""
@@ -385,12 +386,12 @@ msgstr "Köp"
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 "Köp"
#: 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
#, fuzzy, c-format
msgid "Price: %s / Total: %s"
msgstr "Pris: %d GP / Totalt: %d GP"
@@ -401,13 +402,13 @@ msgid "Max"
msgstr "maximal"
#: 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 "Beskrivning: %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 "Effekt: %s"
@@ -416,205 +417,213 @@ msgstr "Effekt: %s"
msgid "Shop"
msgstr "Affär"
-#: 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 "Sälj"
-#: 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 "Avbryt"
-#: 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 ""
-#: 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
#, fuzzy
msgid "Change Password"
msgstr "Lösenord:"
-#: 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 "Lösenord:"
-#: 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 "Skapa karaktär"
-#: 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 "Namn:"
-#: src/gui/charcreatedialog.cpp:70
+#: src/gui/charcreatedialog.cpp:69
msgid "Hair Color:"
msgstr "Hårfärg:"
-#: src/gui/charcreatedialog.cpp:73
+#: src/gui/charcreatedialog.cpp:72
msgid "Hair Style:"
msgstr "Frisyr:"
-#: src/gui/charcreatedialog.cpp:74
+#: src/gui/charcreatedialog.cpp:73
msgid "Create"
msgstr "Skapa"
-#: src/gui/charcreatedialog.cpp:76 src/gui/register.cpp:75
+#: src/gui/charcreatedialog.cpp:75 src/gui/register.cpp:75
msgid "Male"
msgstr "Man"
-#: src/gui/charcreatedialog.cpp:77 src/gui/register.cpp:76
+#: src/gui/charcreatedialog.cpp:76 src/gui/register.cpp:76
msgid "Female"
msgstr "Kvinna"
-#: 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 "Var vänlig fördela %d poäng"
-#: 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 "Fel"
-#: src/gui/charcreatedialog.cpp:174
+#: src/gui/charcreatedialog.cpp:173
msgid "Your name needs to be at least 4 characters."
msgstr "Ditt namn måste vara minst 4 tecken långt."
-#: src/gui/charcreatedialog.cpp:227
+#: src/gui/charcreatedialog.cpp:226
msgid "Character stats OK"
msgstr "Karaktärens värden OK"
-#: src/gui/charcreatedialog.cpp:239
+#: src/gui/charcreatedialog.cpp:238
#, c-format
msgid "Please remove %d points"
msgstr "Var vänlig ta bort %d poäng"
-#: src/gui/char_select.cpp:79
+#: src/gui/charselectdialog.cpp:78
msgid "Confirm Character Delete"
msgstr "Bekräfta borttagning av karaktär"
-#: src/gui/char_select.cpp:80
+#: src/gui/charselectdialog.cpp:79
msgid "Are you sure you want to delete this character?"
msgstr "Är du säker på att du vill ta bort den här karaktären?"
-#: 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 "Välj karaktär"
-#: 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 "Ok"
-#: src/gui/char_select.cpp:113
+#: src/gui/charselectdialog.cpp:112
msgid "Previous"
msgstr "Föregående"
-#: 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 "Nästa"
-#: 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 "Namn: %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 "Nivå: %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 "Ny"
-#: 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 "Ta bort"
-#: src/gui/char_select.cpp:120 src/gui/unregisterdialog.cpp:51
+#: src/gui/charselectdialog.cpp:119 src/gui/unregisterdialog.cpp:52
msgid "Unregister"
msgstr "Avregistrera"
-#: src/gui/char_select.cpp:127
+#: src/gui/charselectdialog.cpp:126
#, c-format
msgid "Money: %d"
msgstr "Pengar: %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 "Jobbnivå: %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
#, fuzzy, c-format
msgid "Money: %s"
msgstr "Pengar: %d"
-#: 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
#, fuzzy
msgid "Chat"
msgstr "Skapa"
-#: src/gui/chat.cpp:341 src/gui/chat.cpp:347
+#: src/gui/chat.cpp:332
+#, c-format
+msgid "%d players are present."
+msgstr ""
+
+#: 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 "Viskar till %s: %s"
-#: src/gui/confirm_dialog.cpp:42
+#: src/gui/confirmdialog.cpp:42
msgid "Yes"
msgstr "Ja"
-#: src/gui/confirm_dialog.cpp:43
+#: src/gui/confirmdialog.cpp:43
msgid "No"
msgstr "Nej"
@@ -622,26 +631,16 @@ msgstr "Nej"
msgid "Connecting..."
msgstr "Ansluter..."
-#: src/gui/emotecontainer.cpp:61
+#: src/gui/emotepopup.cpp:64
msgid "Unable to load selection.png"
msgstr ""
-#: 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 "Använd"
-
-#: src/gui/equipmentwindow.cpp:68 src/gui/menuwindow.cpp:67
+#: src/gui/equipmentwindow.cpp:68 src/gui/windowmenu.cpp:60
msgid "Equipment"
msgstr "Utrustning"
-#: 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 "Avrusta"
@@ -666,102 +665,105 @@ msgstr ""
msgid "Help"
msgstr "Hjälp"
-#: 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 "Stäng"
-#: src/gui/inventorywindow.cpp:51 src/gui/menuwindow.cpp:68
+#: src/gui/inventorywindow.cpp:54 src/gui/windowmenu.cpp:61
msgid "Inventory"
msgstr "Inventarium"
-#: 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 "Utrusta"
-#: 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 "Använd"
+
+#: src/gui/inventorywindow.cpp:80
msgid "Drop"
msgstr "Släpp"
-#: src/gui/inventorywindow.cpp:79
+#: src/gui/inventorywindow.cpp:81
msgid "Split"
msgstr "Dela"
-#: src/gui/inventorywindow.cpp:93
+#: src/gui/inventorywindow.cpp:92
msgid "Slots:"
msgstr ""
-#: src/gui/inventorywindow.cpp:94
+#: src/gui/inventorywindow.cpp:93
#, fuzzy
msgid "Weight:"
msgstr "Vikt: %d / %d"
-#: 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 "Välj antal föremål att handla med."
-#: src/gui/item_amount.cpp:95
+#: src/gui/itemamount.cpp:124
msgid "Select amount of items to drop."
msgstr "Välj antal föremål att släppa."
-#: src/gui/item_amount.cpp:98
+#: src/gui/itemamount.cpp:127
#, fuzzy
msgid "Select amount of items to store."
msgstr "Välj antal föremål att handla med."
-#: src/gui/item_amount.cpp:101
+#: src/gui/itemamount.cpp:130
#, fuzzy
msgid "Select amount of items to retrieve."
msgstr "Välj antal föremål att handla med."
-#: src/gui/item_amount.cpp:104
+#: src/gui/itemamount.cpp:133
msgid "Select amount of items to split."
msgstr "Välj antal föremål att dela."
-#: src/gui/itempopup.cpp:89
+#: src/gui/itempopup.cpp:91
#, fuzzy
msgid "Weight: "
msgstr "Vikt: %d / %d"
-#: src/gui/login.cpp:47
+#: src/gui/login.cpp:48
msgid "Login"
msgstr "Användarnamn"
-#: 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 "Server:"
-#: 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:"
-#: src/gui/login.cpp:55
+#: src/gui/login.cpp:56
#, fuzzy
msgid "Recent:"
msgstr "Registrera"
-#: src/gui/login.cpp:72
+#: src/gui/login.cpp:73
msgid "Remember Username"
msgstr "Kom ihåg användarnamnet"
-#: 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 "Ok"
-#: 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 "Registrera"
-#: 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 ""
@@ -777,71 +779,44 @@ msgstr ""
msgid "Cast Test Spell 3"
msgstr ""
-#: src/gui/menuwindow.cpp:66
-msgid "Status"
-msgstr "Status"
-
-#: src/gui/menuwindow.cpp:69 src/gui/skill.cpp:126 src/gui/skilldialog.cpp:99
-msgid "Skills"
-msgstr "Färdigheter"
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
+#, fuzzy
+msgid "Map"
+msgstr "maximal"
-#: src/gui/menuwindow.cpp:72
-msgid "Guilds"
+#: src/gui/npcdialog.cpp:43
+msgid "Waiting for server"
msgstr ""
-#: src/gui/menuwindow.cpp:73
+#: src/gui/npcdialog.cpp:46
#, fuzzy
-msgid "Buddys"
-msgstr "Köp"
-
-#: src/gui/menuwindow.cpp:75
-msgid "Shortcut"
-msgstr "Genvägar"
+msgid "Submit"
+msgstr "Dela"
-#: src/gui/menuwindow.cpp:77 src/gui/setup.cpp:65 src/main.cpp:920
-msgid "Setup"
-msgstr "Inställningar"
+#: src/gui/npcdialog.cpp:49 src/gui/npcpostdialog.cpp:39
+msgid "NPC"
+msgstr "NPC"
-#: src/gui/minimap.cpp:39
-msgid "MiniMap"
-msgstr "Minikarta"
+#: src/gui/npcdialog.cpp:95
+msgid "+"
+msgstr ""
-#: src/gui/npcintegerdialog.cpp:39
-msgid "NPC Number Request"
+#: src/gui/npcdialog.cpp:96
+msgid "-"
msgstr ""
-#: src/gui/npcintegerdialog.cpp:50
+#: src/gui/npcdialog.cpp:105
#, fuzzy
msgid "Reset"
msgstr "Registrera"
-#: src/gui/npcintegerdialog.cpp:101 src/gui/npclistdialog.cpp:123
-#: src/gui/npcstringdialog.cpp:75
-#, fuzzy
-msgid ""
-"\n"
-"> Cancel\n"
-msgstr "Avbryt"
-
-#: src/gui/npcpostdialog.cpp:39 src/gui/npc_text.cpp:37
-msgid "NPC"
-msgstr "NPC"
-
#: src/gui/npcpostdialog.cpp:51
#, fuzzy
msgid "Send"
msgstr "Ljud"
-#: src/gui/npcstringdialog.cpp:39
-msgid "NPC Text Request"
-msgstr ""
-
-#: 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
#, fuzzy
msgid "Text"
msgstr "Nästa"
@@ -898,7 +873,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
#, fuzzy
msgid "Party"
msgstr "Spela"
@@ -921,7 +896,7 @@ msgid "Being"
msgstr ""
#: src/gui/palette.cpp:104
-msgid "Other Player's Names"
+msgid "Other Players' Names"
msgstr ""
#: src/gui/palette.cpp:105
@@ -948,21 +923,22 @@ msgid "Unknown Item Type"
msgstr ""
#: src/gui/palette.cpp:111
-msgid "Generic"
+msgid "Generics"
msgstr ""
#: src/gui/palette.cpp:112
-msgid "Hat"
-msgstr ""
+#, fuzzy
+msgid "Hats"
+msgstr "Statistik"
#: src/gui/palette.cpp:113
#, fuzzy
-msgid "Usable"
+msgid "Usables"
msgstr "Använd"
#: src/gui/palette.cpp:114
#, fuzzy
-msgid "Shirt"
+msgid "Shirts"
msgstr "Genvägar"
#: src/gui/palette.cpp:115
@@ -985,15 +961,15 @@ msgstr ""
#: src/gui/palette.cpp:119
#, fuzzy
-msgid "Shield"
+msgid "Shields"
msgstr "Sälj"
#: src/gui/palette.cpp:120
-msgid "Ring"
+msgid "Rings"
msgstr ""
#: src/gui/palette.cpp:121
-msgid "Necklace"
+msgid "Necklaces"
msgstr ""
#: src/gui/palette.cpp:122
@@ -1050,94 +1026,103 @@ msgstr ""
msgid "1/4 HP Bar"
msgstr ""
-#: src/gui/popupmenu.cpp:73
+#: src/gui/popupmenu.cpp:75
msgid "@@name|Add name to chat@@"
msgstr ""
-#: src/gui/popupmenu.cpp:85
+#: src/gui/popupmenu.cpp:87
#, c-format
msgid "@@trade|Trade With %s@@"
msgstr "@@trade|Handla med %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 "@@attack|Attackera %s@@"
-#: src/gui/popupmenu.cpp:92
+#: src/gui/popupmenu.cpp:94
#, c-format
msgid "@@friend|Befriend %s@@"
msgstr ""
-#: 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 ""
-#: src/gui/popupmenu.cpp:112
+#: src/gui/popupmenu.cpp:114
#, c-format
msgid "@@party|Invite %s to join your party@@"
msgstr ""
-#: src/gui/popupmenu.cpp:123
+#: src/gui/popupmenu.cpp:125
#, fuzzy, c-format
msgid "@@talk|Talk To %s@@"
msgstr "@@talk|Prata med NPC@@"
-#: 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 "@@cancel|Avbryt@@"
-#: src/gui/popupmenu.cpp:155
-#, c-format
-msgid "@@pickup|Pick Up %s@@"
+#: src/gui/popupmenu.cpp:157
+#, fuzzy, c-format
+msgid "@@pickup|Pick up %s@@"
msgstr "@@pickup|Plocka upp %s@@"
-#: src/gui/popupmenu.cpp:156 src/gui/popupmenu.cpp:352
-msgid "@@chat|Add to Chat@@"
+#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:373
+msgid "@@chat|Add to chat@@"
msgstr ""
-#: src/gui/popupmenu.cpp:336 src/gui/popupmenu.cpp:341
-msgid "@@use|Equip@@"
-msgstr "@@use|Utrusta@@"
-
-#: src/gui/popupmenu.cpp:339
+#: src/gui/popupmenu.cpp:348
msgid "@@use|Unequip@@"
msgstr "@@use|Avrusta@@"
-#: src/gui/popupmenu.cpp:345
+#: src/gui/popupmenu.cpp:350
+msgid "@@use|Equip@@"
+msgstr "@@use|Utrusta@@"
+
+#: src/gui/popupmenu.cpp:353
msgid "@@use|Use@@"
msgstr "@@use|Använd@@"
-#: src/gui/popupmenu.cpp:347
+#: src/gui/popupmenu.cpp:355
msgid "@@drop|Drop@@"
msgstr "@@drop|Släpp@@"
-#: src/gui/popupmenu.cpp:350
+#: src/gui/popupmenu.cpp:359
msgid "@@split|Split@@"
msgstr "@@split|Dela@@"
+#: src/gui/popupmenu.cpp:364
+#, fuzzy
+msgid "@@store|Store@@"
+msgstr "@@use|Använd@@"
+
+#: src/gui/popupmenu.cpp:371
+msgid "@@retrieve|Retrieve@@"
+msgstr ""
+
#: src/gui/quitdialog.cpp:37
msgid "Switch server"
msgstr "Byt server"
@@ -1207,19 +1192,31 @@ msgstr "Lösenordet måste vara kortare än %d tecken."
msgid "Passwords do not match."
msgstr "Lösenorden stämmer inte överens."
-#: src/gui/serverdialog.cpp:73
+#: src/gui/serverdialog.cpp:74
#, fuzzy
msgid "Choose your server"
msgstr "Välj din Mana World-server"
-#: src/gui/serverdialog.cpp:163
+#: src/gui/serverdialog.cpp:164
msgid "Please type both the address and the port of a server."
msgstr "Var vänlig skriv både adressen och porten till en server."
-#: src/gui/serverselectdialog.cpp:50
+#: src/gui/serverselectdialog.cpp:59
msgid "Select Server"
msgstr "Välj server"
+#: src/gui/setup.cpp:64 src/gui/windowmenu.cpp:69 src/main.cpp:933
+msgid "Setup"
+msgstr "Inställningar"
+
+#: src/gui/setup.cpp:72
+msgid "Apply"
+msgstr "Verkställ"
+
+#: src/gui/setup.cpp:72
+msgid "Reset Windows"
+msgstr "Återställ fönster"
+
#: src/gui/setup_audio.cpp:41
msgid "Sound"
msgstr "Ljud"
@@ -1236,11 +1233,11 @@ msgstr "Volym för ljudeffekter"
msgid "Music volume"
msgstr "Musikvolym"
-#: 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
#, fuzzy
msgid "Colors"
msgstr "Stäng"
@@ -1249,24 +1246,24 @@ msgstr "Stäng"
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
#, fuzzy
msgid "Static"
msgstr "Statistik"
#: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
-#: src/gui/setup_colors.cpp:435
+#: src/gui/setup_colors.cpp:431
#, fuzzy
msgid "Pulse"
msgstr "Stäng"
#: 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
#, fuzzy
msgid "Spectrum"
msgstr "Inställningar"
@@ -1275,26 +1272,18 @@ msgstr "Inställningar"
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 "Verkställ"
-
-#: src/gui/setup.cpp:73
-msgid "Reset Windows"
-msgstr "Återställ fönster"
-
#: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:78
msgid "Press the button to start calibration"
msgstr "Klicka på knappen för att starta kalibreringen"
@@ -1363,7 +1352,7 @@ msgstr "Förbisedd"
msgid "Ignored"
msgstr "Ignorerad"
-#: src/gui/setup_players.cpp:207
+#: src/gui/setup_players.cpp:207 src/gui/setup_video.cpp:131
msgid "???"
msgstr ""
@@ -1391,157 +1380,179 @@ msgstr "Spelare"
msgid "When ignoring:"
msgstr "Vid ignorering:"
-#: src/gui/setup_video.cpp:123
+#: src/gui/setup_video.cpp:112
+msgid "Tiny"
+msgstr ""
+
+#: src/gui/setup_video.cpp:113
+#, fuzzy
+msgid "Small"
+msgstr "Sälj"
+
+#: src/gui/setup_video.cpp:114
+#, fuzzy
+msgid "Medium"
+msgstr "medium"
+
+#: src/gui/setup_video.cpp:115
+msgid "Large"
+msgstr ""
+
+#: src/gui/setup_video.cpp:151
msgid "Full screen"
msgstr "Helskärm"
-#: 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 "Särskild muspekare"
-#: 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
#, fuzzy
msgid "Particle effects"
msgstr "Partikeldetaljer"
-#: 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 ""
-#: src/gui/setup_video.cpp:136
+#: src/gui/setup_video.cpp:167
msgid "FPS Limit:"
msgstr "FPS-gräns:"
-#: src/gui/setup_video.cpp:152
+#: src/gui/setup_video.cpp:184
msgid "Video"
msgstr "Video"
-#: 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 "Genomskinlighet"
-#: src/gui/setup_video.cpp:159
+#: src/gui/setup_video.cpp:191
msgid "Scroll radius"
msgstr "Rullningsradie"
-#: src/gui/setup_video.cpp:160
+#: src/gui/setup_video.cpp:192
msgid "Scroll laziness"
msgstr "Tröghet för rullning"
-#: src/gui/setup_video.cpp:161
+#: src/gui/setup_video.cpp:193
msgid "Ambient FX"
msgstr "Omgivande FX"
-#: src/gui/setup_video.cpp:162
+#: src/gui/setup_video.cpp:194
msgid "Particle Detail"
msgstr "Partikeldetaljer"
-#: 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
#, fuzzy
msgid "No text"
msgstr "Nästa"
-#: 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 ""
-#: 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 ""
-#: 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 "av"
-#: 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 "låg"
-#: 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 "hög"
-#: 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 "medium"
-#: 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 "maximal"
-#: 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
#, fuzzy
msgid "fullscreen"
msgstr "Helskärm"
-#: 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 "Byte till helskärm"
-#: src/gui/setup_video.cpp:352
+#: src/gui/setup_video.cpp:422
msgid "Restart needed for changes to take effect."
msgstr "Omstart krävs för att ändringarna ska synas."
-#: src/gui/setup_video.cpp:364
+#: src/gui/setup_video.cpp:434
msgid "Changing OpenGL"
msgstr "Ändrar OpenGL"
-#: src/gui/setup_video.cpp:365
+#: src/gui/setup_video.cpp:435
msgid "Applying change to OpenGL requires restart."
msgstr "Ändringar i OpenGL kräver omstart."
-#: 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
#, fuzzy
msgid "Restart your client for the change to take effect."
msgstr "Omstart krävs för att ändringarna ska synas."
-#: 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 ""
@@ -1554,6 +1565,10 @@ msgstr "Färdigheter"
msgid "Mystery Skill"
msgstr "Mystisk förmåga"
+#: src/gui/skill.cpp:126 src/gui/skilldialog.cpp:99 src/gui/windowmenu.cpp:62
+msgid "Skills"
+msgstr "Färdigheter"
+
#: src/gui/skill.cpp:145 src/gui/skill.cpp:197
#, c-format
msgid "Skill points: %d"
@@ -1563,15 +1578,6 @@ msgstr "Färdighetspoäng: %d"
msgid "Up"
msgstr "Upp"
-#: src/gui/skill.cpp:146
-msgid "inc"
-msgstr ""
-
-#: src/gui/skill.cpp:147
-#, fuzzy
-msgid "use"
-msgstr "Använd"
-
#: src/gui/skilldialog.cpp:113
msgid "Weapons"
msgstr ""
@@ -1581,175 +1587,175 @@ msgstr ""
msgid "Crafts"
msgstr "Skapa"
-#: 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 "Jobb: %d"
-#: src/gui/status.cpp:61
+#: src/gui/status.cpp:60
msgid "HP:"
msgstr ""
-#: src/gui/status.cpp:64
+#: src/gui/status.cpp:63
msgid "Exp:"
msgstr ""
-#: src/gui/status.cpp:67
+#: src/gui/status.cpp:66
msgid "MP:"
msgstr ""
-#: src/gui/status.cpp:70
+#: src/gui/status.cpp:69
#, fuzzy
msgid "Job:"
msgstr "Jobb: %d"
-#: src/gui/status.cpp:78
+#: src/gui/status.cpp:77
msgid "Stats"
msgstr "Statistik"
-#: src/gui/status.cpp:79
+#: src/gui/status.cpp:78
msgid "Total"
msgstr "Totalt"
-#: src/gui/status.cpp:80
+#: src/gui/status.cpp:79
msgid "Cost"
msgstr "Kostnad"
-#: src/gui/status.cpp:84
+#: src/gui/status.cpp:83
msgid "Attack:"
msgstr "Attack:"
-#: src/gui/status.cpp:85
+#: src/gui/status.cpp:84
msgid "Defense:"
msgstr "Försvar:"
-#: src/gui/status.cpp:86
+#: src/gui/status.cpp:85
msgid "M.Attack:"
msgstr "M. attack:"
-#: src/gui/status.cpp:87
+#: src/gui/status.cpp:86
msgid "M.Defense:"
msgstr "M. försvar:"
-#: src/gui/status.cpp:89
+#: src/gui/status.cpp:88
#, fuzzy, no-c-format
msgid "% Accuracy:"
msgstr "% Precision:"
-#: src/gui/status.cpp:91
+#: src/gui/status.cpp:90
#, fuzzy, no-c-format
msgid "% Evade:"
msgstr "% Undvikan:"
-#: src/gui/status.cpp:93
+#: src/gui/status.cpp:92
#, no-c-format
msgid "% Reflex:"
msgstr "% Reflexer:"
-#: src/gui/status.cpp:199
+#: src/gui/status.cpp:198
msgid "Strength"
msgstr "Styrka"
-#: src/gui/status.cpp:200
+#: src/gui/status.cpp:199
msgid "Agility"
msgstr "Smidighet"
-#: src/gui/status.cpp:201
+#: src/gui/status.cpp:200
msgid "Vitality"
msgstr "Hälsa"
-#: src/gui/status.cpp:202
+#: src/gui/status.cpp:201
msgid "Intelligence"
msgstr "Intelligens"
-#: src/gui/status.cpp:203
+#: src/gui/status.cpp:202
msgid "Dexterity"
msgstr "Skicklighet"
-#: src/gui/status.cpp:204
+#: src/gui/status.cpp:203
msgid "Luck"
msgstr "Tur"
-#: src/gui/status.cpp:222
+#: src/gui/status.cpp:221
#, c-format
msgid "Remaining Status Points: %d"
msgstr "Återstående statuspoäng: %d"
-#: src/gui/status.cpp:383 src/gui/status.cpp:405
+#: src/gui/status.cpp:384
#, fuzzy
msgid "Max level"
msgstr "Man"
-#: src/gui/storagewindow.cpp:53
+#: src/gui/storagewindow.cpp:54
msgid "Storage"
msgstr ""
-#: src/gui/storagewindow.cpp:64
+#: src/gui/storagewindow.cpp:65
#, fuzzy
msgid "Store"
msgstr "Stopp"
-#: src/gui/storagewindow.cpp:65
+#: src/gui/storagewindow.cpp:66
msgid "Retrieve"
msgstr ""
-#: src/gui/storagewindow.cpp:75
+#: src/gui/storagewindow.cpp:78
#, fuzzy
msgid "Slots: "
msgstr "Färdighetspoäng: %d"
-#: src/gui/trade.cpp:52
+#: src/gui/trade.cpp:51
msgid "Propose trade"
msgstr "Föreslå handel"
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:52
#, fuzzy
msgid "Confirmed. Waiting..."
msgstr "Ansluter..."
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:53
#, fuzzy
msgid "Agree trade"
msgstr "Föreslå handel"
-#: src/gui/trade.cpp:55
+#: src/gui/trade.cpp:54
#, fuzzy
msgid "Agreed. Waiting..."
msgstr "Uppdaterar..."
-#: src/gui/trade.cpp:58
+#: src/gui/trade.cpp:57
#, fuzzy
msgid "Trade: You"
msgstr "Byteshandla"
-#: src/gui/trade.cpp:71 src/gui/trade.cpp:72
+#: src/gui/trade.cpp:70 src/gui/trade.cpp:71
msgid "Trade"
msgstr "Byteshandla"
-#: src/gui/trade.cpp:74
+#: src/gui/trade.cpp:73
msgid "Add"
msgstr "Lägg till"
-#: 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
#, fuzzy, c-format
msgid "You get %s."
msgstr "Du får %d GP."
-#: src/gui/trade.cpp:97
+#: src/gui/trade.cpp:96
msgid "You give:"
msgstr "Du ger:"
-#: src/gui/trade.cpp:101
+#: src/gui/trade.cpp:100
msgid "Change"
msgstr "Ändra"
-#: 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 ""
"Kan inte lägga till vald sak. Det går inte att byteshandla med samma slags "
"sak flera gånger."
-#: src/gui/trade.cpp:321
+#: src/gui/trade.cpp:311
#, fuzzy
msgid "You don't have enough money"
msgstr "Du har inga anteckningar!"
@@ -1870,21 +1876,21 @@ msgstr ""
msgid "Need a user to kick!"
msgstr ""
-#: src/gui/widgets/chattab.cpp:115
+#: src/gui/widgets/chattab.cpp:114
msgid "Global announcement:"
msgstr "Globalt meddelande:"
-#: src/gui/widgets/chattab.cpp:121
+#: src/gui/widgets/chattab.cpp:120
#, c-format
msgid "Global announcement from %s:"
msgstr "Globalt meddelande från %s:"
-#: src/gui/widgets/chattab.cpp:147
+#: src/gui/widgets/chattab.cpp:146
#, fuzzy, c-format
msgid "%s whispers: "
msgstr "%s viskar:"
-#: src/gui/widgets/chattab.cpp:241 src/resources/itemdb.cpp:108
+#: src/gui/widgets/chattab.cpp:240 src/resources/itemdb.cpp:107
#, fuzzy
msgid "Unknown item"
msgstr "Okänt kommando"
@@ -1894,25 +1900,37 @@ msgstr "Okänt kommando"
msgid "Cannot send empty chat!"
msgstr "Kan inte skrika!"
-#: src/gui/widgets/whispertab.cpp:55
-#, c-format
-msgid "%s: %s"
-msgstr ""
-
-#: src/gui/widgets/whispertab.cpp:69
+#: src/gui/widgets/whispertab.cpp:68
msgid "/close > Close the whisper tab"
msgstr ""
-#: src/gui/widgets/whispertab.cpp:79
+#: src/gui/widgets/whispertab.cpp:78
#, fuzzy
msgid "Command: /close"
msgstr "Kommando: /clear"
-#: src/gui/widgets/whispertab.cpp:80
+#: src/gui/widgets/whispertab.cpp:79
#, fuzzy
msgid "This command closes the current whisper tab."
msgstr "Det här kommandot visar namnet på den karta där du befinner dig."
+#: src/gui/windowmenu.cpp:59
+msgid "Status"
+msgstr "Status"
+
+#: src/gui/windowmenu.cpp:65
+msgid "Guilds"
+msgstr ""
+
+#: src/gui/windowmenu.cpp:66
+#, fuzzy
+msgid "Buddys"
+msgstr "Köp"
+
+#: src/gui/windowmenu.cpp:68
+msgid "Shortcut"
+msgstr "Genvägar"
+
#: src/keyboardconfig.cpp:41
msgid "Move Up"
msgstr ""
@@ -2047,8 +2065,8 @@ msgstr "Återställ fönster"
#: src/keyboardconfig.cpp:80
#, fuzzy
-msgid "Emote Window"
-msgstr "Kan inte visa smiley!"
+msgid "Party Window"
+msgstr "Återställ fönster"
#: src/keyboardconfig.cpp:81
msgid "Emote Shortcut Window"
@@ -2098,168 +2116,173 @@ msgstr ""
msgid "Ignore input 2"
msgstr ""
-#: src/localplayer.cpp:849
+#: src/localplayer.cpp:834
#, fuzzy
msgid "Unarmed"
msgstr "Namnlös"
-#: src/localplayer.cpp:850
+#: src/localplayer.cpp:835
msgid "Knife"
msgstr ""
-#: src/localplayer.cpp:851
+#: src/localplayer.cpp:836
#, fuzzy
msgid "Sword"
msgstr "Ljud"
-#: src/localplayer.cpp:852
+#: src/localplayer.cpp:837
msgid "Polearm"
msgstr ""
-#: src/localplayer.cpp:853
+#: src/localplayer.cpp:838
#, fuzzy
msgid "Staff"
msgstr "Statistik"
-#: src/localplayer.cpp:854
+#: src/localplayer.cpp:839
msgid "Whip"
msgstr ""
-#: src/localplayer.cpp:855
+#: src/localplayer.cpp:840
#, fuzzy
msgid "Bow"
msgstr "låg"
-#: src/localplayer.cpp:856
+#: src/localplayer.cpp:841
msgid "Shooting"
msgstr ""
-#: src/localplayer.cpp:857
+#: src/localplayer.cpp:842
#, fuzzy
msgid "Mace"
msgstr "Man"
-#: 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
#, fuzzy
msgid "Craft"
msgstr "Skapa"
-#: 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 ""
-#: src/main.cpp:563
-msgid "Options: "
+#: src/main.cpp:567
+msgid "Options:"
msgstr ""
-#: src/main.cpp:564
-msgid " -C --configfile : Configuration file to use"
+#: src/main.cpp:568
+msgid " -C --config-file : Configuration file to use"
msgstr ""
-#: src/main.cpp:565
-msgid " -d --data : Directory to load game data from"
+#: src/main.cpp:569
+msgid " -d --data : Directory to load game data from"
msgstr ""
-#: src/main.cpp:566
-msgid " -D --default : Bypass the login process with default settings"
+#: src/main.cpp:570
+msgid " -D --default : Choose default character server and character"
msgstr ""
-#: src/main.cpp:568
+#: src/main.cpp:572
#, fuzzy
-msgid " -h --help : Display this help"
+msgid " -h --help : Display this help"
msgstr "/help: Visar den här hjälptexten"
-#: src/main.cpp:569
-msgid " -S --homedir : Directory to use as home directory"
+#: src/main.cpp:573
+msgid " -S --home-dir : Directory to use as home directory"
msgstr ""
-#: src/main.cpp:570
-msgid " -H --updatehost : Use this update host"
+#: src/main.cpp:574
+msgid " -H --update-host : Use this update host"
msgstr ""
-#: src/main.cpp:571
-msgid " -P --password : Login with this password"
+#: src/main.cpp:575
+msgid " -P --password : Login with this password"
msgstr ""
-#: src/main.cpp:572
-msgid " -c --character : Login with this character"
+#: src/main.cpp:576
+msgid " -c --character : Login with this character"
msgstr ""
-#: src/main.cpp:573
-msgid " -o --port : Login Server Port"
+#: src/main.cpp:577
+msgid " -p --port : Login Server Port"
msgstr ""
-#: src/main.cpp:574
-msgid " -s --server : Login Server name or IP"
+#: src/main.cpp:578
+msgid " -s --server : Login Server name or IP"
msgstr ""
-#: src/main.cpp:575
-msgid " -u --skipupdate : Skip the update downloads"
+#: src/main.cpp:579
+msgid " -u --skip-update : Skip the update downloads"
msgstr ""
-#: src/main.cpp:576
-msgid " -U --username : Login with this username"
+#: src/main.cpp:580
+msgid " -U --username : Login with this username"
msgstr ""
-#: src/main.cpp:577
-msgid " -v --version : Display the version"
+#: src/main.cpp:582
+msgid " -O --no-opengl : Disable OpenGL for this session"
msgstr ""
-#: src/main.cpp:582
+#: src/main.cpp:584
+#, fuzzy
+msgid " -v --version : Display the version"
+msgstr "/help: Visar den här hjälptexten"
+
+#: src/main.cpp:589
#, fuzzy
msgid "The Mana World "
msgstr "Välj din Mana World-server"
-#: src/main.cpp:1499
+#: src/main.cpp:1515
msgid "Connecting to map server..."
msgstr "Ansluter till kartservern..."
-#: src/main.cpp:1507
+#: src/main.cpp:1523
msgid "Connecting to character server..."
msgstr "Ansluter till karaktärsservern..."
-#: src/main.cpp:1515
+#: src/main.cpp:1531
msgid "Connecting to account server..."
msgstr "Ansluter till kontoservern..."
-#: src/net/ea/adminhandler.cpp:67
+#: src/net/ea/adminhandler.cpp:66
#, fuzzy
msgid "Kick failed!"
msgstr "Kan inte sitta ned!"
-#: src/net/ea/adminhandler.cpp:69
+#: src/net/ea/adminhandler.cpp:68
msgid "Kick succeeded!"
msgstr ""
@@ -2347,18 +2370,18 @@ msgstr "Skicklighet"
msgid "Luck:"
msgstr "Tur"
-#: 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 ""
@@ -2371,434 +2394,449 @@ msgstr "Avrusta"
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
#, fuzzy, c-format
msgid "Strength: %d"
msgstr "Styrka"
-#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:82
+#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:84
#, fuzzy, c-format
msgid "Agility: %d"
msgstr "Smidighet"
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:86
+#: src/net/ea/generalhandler.cpp:96 src/net/tmwserv/generalhandler.cpp:88
#, fuzzy, c-format
msgid "Vitality: %d"
msgstr "Hälsa"
-#: src/net/ea/generalhandler.cpp:96 src/net/tmwserv/generalhandler.cpp:88
+#: src/net/ea/generalhandler.cpp:98 src/net/tmwserv/generalhandler.cpp:90
#, fuzzy, c-format
msgid "Intelligence: %d"
msgstr "Intelligens"
-#: src/net/ea/generalhandler.cpp:98 src/net/tmwserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:100 src/net/tmwserv/generalhandler.cpp:86
#, fuzzy, c-format
msgid "Dexterity: %d"
msgstr "Skicklighet"
-#: src/net/ea/generalhandler.cpp:100
+#: src/net/ea/generalhandler.cpp:102
#, fuzzy, c-format
msgid "Luck: %d"
msgstr "Tur"
-#: src/net/ea/generalhandler.cpp:123
+#: src/net/ea/generalhandler.cpp:125
#, fuzzy
msgid "Authentication failed"
msgstr "Kan inte skicka chattmeddelande!"
-#: 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 ""
-#: 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 "Kopplades från servern!"
-#: src/net/ea/gui/partytab.cpp:54
+#: src/net/ea/gui/partytab.cpp:52
+#, fuzzy
+msgid "/help > Display this help."
+msgstr "/help: Visar den här hjälptexten"
+
+#: src/net/ea/gui/partytab.cpp:53
msgid "/create > Create a new party"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:55
+#: src/net/ea/gui/partytab.cpp:54
msgid "/new > Alias of create"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:56
+#: src/net/ea/gui/partytab.cpp:55
msgid "/invite > Invite a player to your party"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:57
+#: src/net/ea/gui/partytab.cpp:56
msgid "/leave > Leave the party you are in"
msgstr ""
-#: 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 ""
-#: src/net/ea/gui/partytab.cpp:59
+#: src/net/ea/gui/partytab.cpp:58
msgid "/item > Show/change party item sharing options"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:60
+#: src/net/ea/gui/partytab.cpp:59
msgid "/exp > Show/change party experience sharing options"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:69
+#: src/net/ea/gui/partytab.cpp:68
#, fuzzy
msgid "Command: /new <party-name>"
msgstr "Kommando: /announce <text>"
-#: src/net/ea/gui/partytab.cpp:70
+#: src/net/ea/gui/partytab.cpp:69
#, fuzzy
msgid "Command: /create <party-name>"
msgstr "Kommando: /clear"
-#: 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 ""
-#: src/net/ea/gui/partytab.cpp:75
+#: src/net/ea/gui/partytab.cpp:74
#, fuzzy
msgid "Command: /invite <nick>"
msgstr "Kommando: /w <namn> <text>"
-#: src/net/ea/gui/partytab.cpp:82
+#: src/net/ea/gui/partytab.cpp:81
#, fuzzy
msgid "Command: /leave"
msgstr "Kommando: /clear"
-#: src/net/ea/gui/partytab.cpp:83
+#: src/net/ea/gui/partytab.cpp:82
#, fuzzy
msgid "This command causes the player to leave the party."
msgstr "Det här kommandot tömmer chattloggen."
-#: src/net/ea/gui/partytab.cpp:87
+#: src/net/ea/gui/partytab.cpp:86
#, fuzzy
msgid "Command: /item <policy>"
msgstr "Kommando: /help"
-#: src/net/ea/gui/partytab.cpp:88
+#: src/net/ea/gui/partytab.cpp:87
#, fuzzy
msgid "This command changes the party's item sharing policy."
msgstr "Det här kommandot skickar meddelandet <text> till karaktären <namn>."
-#: 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."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:92
+#: src/net/ea/gui/partytab.cpp:91
#, fuzzy
msgid "Command: /item"
msgstr "Kommando: /help"
-#: src/net/ea/gui/partytab.cpp:93
+#: src/net/ea/gui/partytab.cpp:92
#, fuzzy
msgid "This command displays the party's current item sharing policy."
msgstr "Det här kommandot visar namnet på den karta där du befinner dig."
-#: src/net/ea/gui/partytab.cpp:97
+#: src/net/ea/gui/partytab.cpp:96
#, fuzzy
msgid "Command: /exp <policy>"
msgstr "Kommando: /help <kommando>"
-#: 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."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:102
+#: src/net/ea/gui/partytab.cpp:101
#, fuzzy
msgid "Command: /exp"
msgstr "Kommando: /help"
-#: src/net/ea/gui/partytab.cpp:103
+#: src/net/ea/gui/partytab.cpp:102
#, fuzzy
msgid "This command displays the party's current experience sharing policy."
msgstr "Det här kommandot visar namnet på den karta där du befinner dig."
-#: 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]"
+msgid "You picked up %s [@@%d|%s@@]"
msgstr ""
-#: 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
#, fuzzy
msgid "Unregistered ID"
msgstr "Avregistrera"
-#: src/net/ea/loginhandler.cpp:114
+#: src/net/ea/loginhandler.cpp:113
#, fuzzy
msgid "Wrong password"
msgstr "Lösenord:"
-#: 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
#, fuzzy
msgid "Rejected from server"
msgstr "Kopplades från servern!"
-#: 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 ""
-#: 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"
" Please contact the GM team via the forums."
msgstr ""
-#: 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
#, fuzzy
msgid "Unknown error"
msgstr "Okänt kommando"
-#: src/net/ea/partyhandler.cpp:78
-msgid "Party successfully created."
-msgstr ""
-
-#: src/net/ea/partyhandler.cpp:82
+#: src/net/ea/partyhandler.cpp:77
#, fuzzy
msgid "Could not create party."
msgstr "Kan inte ansluta till gruppen!"
-#: 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 ""
-#: src/net/ea/partyhandler.cpp:116
+#: src/net/ea/partyhandler.cpp:119
#, c-format
msgid "%s refused your invitation."
msgstr ""
-#: src/net/ea/partyhandler.cpp:120
+#: src/net/ea/partyhandler.cpp:123
#, c-format
msgid "%s is now a member of your party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:124
+#: src/net/ea/partyhandler.cpp:127
#, c-format
msgid "Unknown invite response for %s."
msgstr ""
-#: 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 ""
-#: src/net/ea/partyhandler.cpp:269
+#: src/net/ea/partyhandler.cpp:272
#, c-format
msgid "An unknown member tried to say: %s"
msgstr ""
-#: 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
#, fuzzy, c-format
msgid "%s is not in your party!"
msgstr "Kan inte ansluta till gruppen!"
-#: 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
#, fuzzy
msgid "You are not that alive anymore."
msgstr "Du kan inte göra det just nu!"
-#: 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"
+#: 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 ""
-#: 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
#, fuzzy
msgid "You are no more."
msgstr "Du har inga anteckningar!"
-#: src/net/ea/playerhandler.cpp:134
+#: src/net/ea/playerhandler.cpp:122
#, fuzzy
msgid "You have ceased to be."
msgstr "Du har inga anteckningar!"
-#: src/net/ea/playerhandler.cpp:135
+#: src/net/ea/playerhandler.cpp:123
msgid "You've expired and gone to meet your maker."
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 ""
-#: 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 ""
@@ -2960,40 +2998,98 @@ msgstr ""
msgid "Willpower:"
msgstr "Viljestyrka:"
-#: 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
#, fuzzy, c-format
msgid "Willpower: %d"
msgstr "Viljestyrka:"
-#: 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
+#, fuzzy
+msgid "Server is full"
+msgstr "Server:"
+
+#: 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 ""
+
+#: src/net/tmwserv/loginhandler.cpp:143
+msgid "Old email address incorrect"
+msgstr ""
+
+#: src/net/tmwserv/loginhandler.cpp:149
+msgid "The new Email Address already exists."
+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 "Lösenord:"
+
+#: src/net/tmwserv/loginhandler.cpp:211
+msgid "Wrong username, password or email address"
+msgstr ""
+
+#: src/net/tmwserv/loginhandler.cpp:214
+msgid "Username already exists"
+msgstr ""
+
+#: src/net/tmwserv/loginhandler.cpp:217
+msgid "Email address already exists"
+msgstr ""
+
+#: src/resources/itemdb.cpp:52
#, fuzzy, c-format
msgid "Attack %+d"
msgstr "Attack:"
-#: src/resources/itemdb.cpp:54
+#: src/resources/itemdb.cpp:53
#, fuzzy, c-format
msgid "Defense %+d"
msgstr "Försvar:"
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:54
#, c-format
msgid "HP %+d"
msgstr "Hälsa %+d"
-#: src/resources/itemdb.cpp:56
+#: src/resources/itemdb.cpp:55
#, c-format
msgid "MP %+d"
msgstr "Mana %+d"
-#: src/resources/itemdb.cpp:113
+#: src/resources/itemdb.cpp:112
msgid "items.xml"
msgstr ""
-#: src/resources/itemdb.cpp:151
+#: src/resources/itemdb.cpp:150
msgid "Unnamed"
msgstr "Namnlös"
@@ -3010,6 +3106,23 @@ msgstr ""
msgid "NPC Database: Error while loading npcs.xml!"
msgstr ""
+#~ msgid "MiniMap"
+#~ msgstr "Minikarta"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "> Cancel\n"
+#~ msgstr "Avbryt"
+
+#, fuzzy
+#~ msgid "use"
+#~ msgstr "Använd"
+
+#, fuzzy
+#~ msgid "Emote Window"
+#~ msgstr "Kan inte visa smiley!"
+
#~ msgid "Gold: %d"
#~ msgstr "Guld: %d"
diff --git a/po/th.po b/po/th.po
index eb49f7e7..4c31125d 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-04-21 17:27+0200\n"
+"POT-Creation-Date: 2009-05-10 15:53+0200\n"
"PO-Revision-Date: 2008-11-25 06:16+0000\n"
"Last-Translator: Tharawut Paripaiboon <Unknown>\n"
"Language-Team: Thai <th@li.org>\n"
@@ -17,286 +17,286 @@ msgstr ""
"X-Launchpad-Export-Date: 2009-01-06 12:40+0000\n"
"X-Generator: Launchpad (build Unknown)\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."
+#: src/commandhandler.cpp:142
+msgid "/help > Display this help"
msgstr ""
-#: src/commandhandler.cpp:145
+#: src/commandhandler.cpp:144
msgid "/where > Display map name"
msgstr ""
-#: src/commandhandler.cpp:146
+#: src/commandhandler.cpp:145
msgid "/who > Display number of online users"
msgstr ""
-#: src/commandhandler.cpp:147
+#: src/commandhandler.cpp:146
msgid "/me > Tell something about yourself"
msgstr ""
-#: src/commandhandler.cpp:149
+#: src/commandhandler.cpp:148
msgid "/clear > Clears this window"
msgstr ""
-#: src/commandhandler.cpp:151
+#: src/commandhandler.cpp:150
msgid "/msg > Send a private message to a user"
msgstr ""
-#: src/commandhandler.cpp:152
+#: src/commandhandler.cpp:151
msgid "/whisper > Alias of msg"
msgstr ""
-#: src/commandhandler.cpp:153
+#: src/commandhandler.cpp:152
msgid "/w > Alias of msg"
msgstr ""
-#: src/commandhandler.cpp:154
+#: src/commandhandler.cpp:153
msgid "/query > Makes a tab for private messages with another user"
msgstr ""
-#: src/commandhandler.cpp:155
+#: src/commandhandler.cpp:154
msgid "/q > Alias of query"
msgstr ""
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:156
msgid "/list > Display all public channels"
msgstr ""
-#: src/commandhandler.cpp:158
+#: src/commandhandler.cpp:157
msgid "/join > Join or create a channel"
msgstr ""
-#: src/commandhandler.cpp:160
+#: src/commandhandler.cpp:159
msgid "/party > Invite a user to party"
msgstr ""
-#: src/commandhandler.cpp:162
+#: src/commandhandler.cpp:161
msgid "/record > Start recording the chat to an external file"
msgstr ""
-#: 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 ""
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:165
msgid "/announce > Global announcement (GM only)"
msgstr ""
-#: src/commandhandler.cpp:170
+#: src/commandhandler.cpp:169
msgid "For more information, type /help <command>"
msgstr ""
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:173
msgid "Command: /help"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: src/commandhandler.cpp:186
+#: src/commandhandler.cpp:185
msgid "*** only available to a GM ***"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: src/commandhandler.cpp:209
+#: src/commandhandler.cpp:208
msgid "This command tell others you are (doing) <msg>."
msgstr ""
-#: src/commandhandler.cpp:213
+#: src/commandhandler.cpp:212
msgid "Command: /msg <nick> <message>"
msgstr ""
-#: src/commandhandler.cpp:214
+#: src/commandhandler.cpp:213
msgid "Command: /whisper <nick> <message>"
msgstr ""
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:214
msgid "Command: /w <nick> <message>"
msgstr ""
-#: src/commandhandler.cpp:216
+#: src/commandhandler.cpp:215
msgid "This command sends the text <message> to <nick>."
msgstr ""
-#: 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 ""
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:222
msgid "Command: /q <nick>"
msgstr ""
-#: src/commandhandler.cpp:224
+#: src/commandhandler.cpp:223
msgid "This command tries to make a tab for whispers betweenyou and <nick>."
msgstr ""
-#: src/commandhandler.cpp:229
+#: src/commandhandler.cpp:228
msgid "Command: /party <nick>"
msgstr ""
-#: 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 ""
-#: src/commandhandler.cpp:236
+#: src/commandhandler.cpp:235
msgid "Command: /present"
msgstr ""
-#: 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 ""
-#: src/commandhandler.cpp:244
+#: src/commandhandler.cpp:243
msgid "This command starts recording the chat log to the file <filename>."
msgstr ""
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:245
msgid "Command: /record"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: src/commandhandler.cpp:257
+#: src/commandhandler.cpp:256
msgid "Command: /toggle"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: src/commandhandler.cpp:336
-msgid "Cannont send empty whispers!"
+#: 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 ""
-#: 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 ""
@@ -305,46 +305,46 @@ msgstr ""
msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
msgstr ""
-#: 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"
+#: src/game.cpp:481
+msgid "The connection to the server was lost, the program will now quit"
msgstr ""
-#: src/game.cpp:493
-msgid "The connection to the server was lost, the program will now quit"
+#: src/game.cpp:487
+msgid "Network Error"
msgstr ""
-#: src/game.cpp:664 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
+#: 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
#, fuzzy
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 ""
@@ -357,12 +357,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
#, fuzzy, c-format
msgid "Price: %s / Total: %s"
msgstr "ราคา: %d GP / ทั้งหมด: %d GP"
@@ -372,13 +372,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 ""
#: 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 ""
@@ -387,207 +387,215 @@ msgstr ""
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 "เปลี่ยนที่อยู่ Email"
-#: 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 ""
-#: src/gui/changeemaildialog.cpp:48
+#: src/gui/changeemaildialog.cpp:49
#, fuzzy
msgid "Type New Email Address twice:"
msgstr "เปลี่ยนที่อยู่ Email"
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: 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
#, fuzzy
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 ""
-#: 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
#, fuzzy
msgid "Unregister"
msgstr "สมัครสมาชิก"
-#: src/gui/char_select.cpp:127
+#: src/gui/charselectdialog.cpp:126
#, c-format
msgid "Money: %d"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: 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
#, fuzzy
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 ""
+
+#: 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 ""
-#: 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 "ไม่"
@@ -595,26 +603,16 @@ msgstr "ไม่"
msgid "Connecting..."
msgstr "กำลังเชื่อมต่อ..."
-#: src/gui/emotecontainer.cpp:61
+#: src/gui/emotepopup.cpp:64
msgid "Unable to load selection.png"
msgstr ""
-#: 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 ""
@@ -639,98 +637,101 @@ 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 ""
-#: src/gui/login.cpp:55
+#: src/gui/login.cpp:56
#, fuzzy
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,70 +747,42 @@ msgstr ""
msgid "Cast Test Spell 3"
msgstr ""
-#: 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"
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
+msgid "Map"
msgstr ""
-#: src/gui/menuwindow.cpp:72
-msgid "Guilds"
+#: src/gui/npcdialog.cpp:43
+msgid "Waiting for server"
msgstr ""
-#: src/gui/menuwindow.cpp:73
+#: src/gui/npcdialog.cpp:46
#, fuzzy
-msgid "Buddys"
-msgstr "ซื้อ"
-
-#: src/gui/menuwindow.cpp:75
-msgid "Shortcut"
-msgstr ""
+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"
+#: src/gui/npcdialog.cpp:95
+msgid "+"
msgstr ""
-#: src/gui/npcintegerdialog.cpp:39
-msgid "NPC Number Request"
+#: src/gui/npcdialog.cpp:96
+msgid "-"
msgstr ""
-#: src/gui/npcintegerdialog.cpp:50
+#: src/gui/npcdialog.cpp:105
#, fuzzy
msgid "Reset"
msgstr "สมัครสมาชิก"
-#: src/gui/npcintegerdialog.cpp:101 src/gui/npclistdialog.cpp:123
-#: src/gui/npcstringdialog.cpp:75
-#, fuzzy
-msgid ""
-"\n"
-"> Cancel\n"
-msgstr "ยกเลิก"
-
-#: 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 ""
-
-#: 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
#, fuzzy
msgid "Text"
msgstr "ถัดไป"
@@ -863,7 +836,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 ""
@@ -884,7 +857,7 @@ msgid "Being"
msgstr ""
#: src/gui/palette.cpp:104
-msgid "Other Player's Names"
+msgid "Other Players' Names"
msgstr ""
#: src/gui/palette.cpp:105
@@ -911,20 +884,21 @@ msgid "Unknown Item Type"
msgstr ""
#: src/gui/palette.cpp:111
-msgid "Generic"
+msgid "Generics"
msgstr ""
#: src/gui/palette.cpp:112
-msgid "Hat"
-msgstr ""
+#, fuzzy
+msgid "Hats"
+msgstr "สถานะ"
#: src/gui/palette.cpp:113
#, fuzzy
-msgid "Usable"
+msgid "Usables"
msgstr "ใช้"
#: src/gui/palette.cpp:114
-msgid "Shirt"
+msgid "Shirts"
msgstr ""
#: src/gui/palette.cpp:115
@@ -945,15 +919,15 @@ msgid "2 Handed Weapons"
msgstr ""
#: src/gui/palette.cpp:119
-msgid "Shield"
+msgid "Shields"
msgstr ""
#: src/gui/palette.cpp:120
-msgid "Ring"
+msgid "Rings"
msgstr ""
#: src/gui/palette.cpp:121
-msgid "Necklace"
+msgid "Necklaces"
msgstr ""
#: src/gui/palette.cpp:122
@@ -1009,94 +983,102 @@ msgstr ""
msgid "1/4 HP Bar"
msgstr ""
-#: src/gui/popupmenu.cpp:73
+#: src/gui/popupmenu.cpp:75
msgid "@@name|Add name to chat@@"
msgstr ""
-#: src/gui/popupmenu.cpp:85
+#: src/gui/popupmenu.cpp:87
#, c-format
msgid "@@trade|Trade With %s@@"
msgstr ""
-#: 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 ""
-#: src/gui/popupmenu.cpp:92
+#: src/gui/popupmenu.cpp:94
#, c-format
msgid "@@friend|Befriend %s@@"
msgstr ""
-#: 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 ""
-#: src/gui/popupmenu.cpp:112
+#: src/gui/popupmenu.cpp:114
#, c-format
msgid "@@party|Invite %s to join your party@@"
msgstr ""
-#: src/gui/popupmenu.cpp:123
+#: src/gui/popupmenu.cpp:125
#, c-format
msgid "@@talk|Talk To %s@@"
msgstr ""
-#: 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@@"
+msgid "@@pickup|Pick up %s@@"
msgstr ""
-#: src/gui/popupmenu.cpp:156 src/gui/popupmenu.cpp:352
-msgid "@@chat|Add to Chat@@"
+#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:373
+msgid "@@chat|Add to chat@@"
msgstr ""
-#: src/gui/popupmenu.cpp:336 src/gui/popupmenu.cpp:341
-msgid "@@use|Equip@@"
+#: src/gui/popupmenu.cpp:348
+msgid "@@use|Unequip@@"
msgstr ""
-#: src/gui/popupmenu.cpp:339
-msgid "@@use|Unequip@@"
+#: src/gui/popupmenu.cpp:350
+msgid "@@use|Equip@@"
msgstr ""
-#: src/gui/popupmenu.cpp:345
+#: 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 ""
+
+#: src/gui/popupmenu.cpp:371
+msgid "@@retrieve|Retrieve@@"
+msgstr ""
+
#: src/gui/quitdialog.cpp:37
msgid "Switch server"
msgstr ""
@@ -1167,18 +1149,30 @@ msgstr ""
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 ""
-#: 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 ""
@@ -1195,11 +1189,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 ""
@@ -1207,23 +1201,23 @@ 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
#, fuzzy
msgid "Static"
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 ""
#: 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
#, fuzzy
msgid "Spectrum"
msgstr "ตั้งค่า"
@@ -1232,26 +1226,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 ""
@@ -1322,7 +1308,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 ""
@@ -1350,154 +1336,174 @@ 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 ""
-#: 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 ""
-#: src/gui/setup_video.cpp:136
+#: src/gui/setup_video.cpp:167
msgid "FPS Limit:"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: 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
#, fuzzy
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 ""
-#: 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 ""
-#: 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 ""
-#: src/gui/setup_video.cpp:365
+#: src/gui/setup_video.cpp:435
msgid "Applying change to OpenGL requires restart."
msgstr ""
-#: 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 ""
@@ -1509,6 +1515,10 @@ msgstr ""
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"
@@ -1518,15 +1528,6 @@ msgstr ""
msgid "Up"
msgstr ""
-#: src/gui/skill.cpp:146
-msgid "inc"
-msgstr ""
-
-#: src/gui/skill.cpp:147
-#, fuzzy
-msgid "use"
-msgstr "ใช้"
-
#: src/gui/skilldialog.cpp:113
msgid "Weapons"
msgstr ""
@@ -1536,175 +1537,175 @@ msgstr ""
msgid "Crafts"
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 ""
-#: src/gui/status.cpp:61
+#: src/gui/status.cpp:60
msgid "HP:"
msgstr ""
-#: src/gui/status.cpp:64
+#: src/gui/status.cpp:63
msgid "Exp:"
msgstr ""
-#: src/gui/status.cpp:67
+#: src/gui/status.cpp:66
msgid "MP:"
msgstr ""
-#: src/gui/status.cpp:70
+#: src/gui/status.cpp:69
msgid "Job:"
msgstr ""
-#: src/gui/status.cpp:78
+#: src/gui/status.cpp:77
#, fuzzy
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 ""
-#: src/gui/status.cpp:91
+#: src/gui/status.cpp:90
#, no-c-format
msgid "% Evade:"
msgstr ""
-#: 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
#, fuzzy
msgid "Strength"
msgstr "Strength:"
-#: src/gui/status.cpp:200
+#: src/gui/status.cpp:199
#, fuzzy
msgid "Agility"
msgstr "Agility:"
-#: src/gui/status.cpp:201
+#: src/gui/status.cpp:200
#, fuzzy
msgid "Vitality"
msgstr "Vitality:"
-#: src/gui/status.cpp:202
+#: src/gui/status.cpp:201
#, fuzzy
msgid "Intelligence"
msgstr "Intelligence:"
-#: src/gui/status.cpp:203
+#: src/gui/status.cpp:202
#, fuzzy
msgid "Dexterity"
msgstr "Dexterity:"
-#: 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 ""
-#: src/gui/status.cpp:383 src/gui/status.cpp:405
+#: src/gui/status.cpp:384
#, fuzzy
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
#, fuzzy
msgid "Store"
msgstr "Strength:"
-#: 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
#, fuzzy
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 ""
-#: src/gui/trade.cpp:97
+#: src/gui/trade.cpp:96
msgid "You give:"
msgstr ""
-#: src/gui/trade.cpp:101
+#: src/gui/trade.cpp:100
#, fuzzy
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 ""
@@ -1816,21 +1817,21 @@ msgstr ""
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 ""
-#: src/gui/widgets/chattab.cpp:147
+#: src/gui/widgets/chattab.cpp:146
#, c-format
msgid "%s whispers: "
msgstr ""
-#: 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 ""
@@ -1838,23 +1839,35 @@ msgstr ""
msgid "Cannot send empty chat!"
msgstr ""
-#: src/gui/widgets/whispertab.cpp:55
-#, c-format
-msgid "%s: %s"
-msgstr ""
-
-#: src/gui/widgets/whispertab.cpp:69
+#: src/gui/widgets/whispertab.cpp:68
msgid "/close > Close the whisper tab"
msgstr ""
-#: src/gui/widgets/whispertab.cpp:79
+#: src/gui/widgets/whispertab.cpp:78
msgid "Command: /close"
msgstr ""
-#: 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
+#, fuzzy
+msgid "Buddys"
+msgstr "ซื้อ"
+
+#: src/gui/windowmenu.cpp:68
+msgid "Shortcut"
+msgstr ""
+
#: src/keyboardconfig.cpp:41
msgid "Move Up"
msgstr ""
@@ -1975,8 +1988,9 @@ msgid "Debug Window"
msgstr ""
#: src/keyboardconfig.cpp:80
-msgid "Emote Window"
-msgstr ""
+#, fuzzy
+msgid "Party Window"
+msgstr "สถานะ"
#: src/keyboardconfig.cpp:81
msgid "Emote Shortcut Window"
@@ -2025,163 +2039,167 @@ msgstr ""
msgid "Ignore input 2"
msgstr ""
-#: 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
#, fuzzy
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
#, fuzzy
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
#, fuzzy
msgid "Craft"
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 ""
-#: src/main.cpp:563
-msgid "Options: "
-msgstr ""
-
-#: src/main.cpp:564
-msgid " -C --configfile : Configuration file to use"
-msgstr ""
-
-#: src/main.cpp:565
-msgid " -d --data : Directory to load game data from"
-msgstr ""
-
-#: src/main.cpp:566
-msgid " -D --default : Bypass the login process with default settings"
+#: src/main.cpp:567
+msgid "Options:"
msgstr ""
#: src/main.cpp:568
-msgid " -h --help : Display this help"
+msgid " -C --config-file : Configuration file to use"
msgstr ""
#: src/main.cpp:569
-msgid " -S --homedir : Directory to use as home directory"
+msgid " -d --data : Directory to load game data from"
msgstr ""
#: src/main.cpp:570
-msgid " -H --updatehost : Use this update host"
-msgstr ""
-
-#: src/main.cpp:571
-msgid " -P --password : Login with this password"
+msgid " -D --default : Choose default character server and character"
msgstr ""
#: src/main.cpp:572
-msgid " -c --character : Login with this character"
+msgid " -h --help : Display this help"
msgstr ""
#: src/main.cpp:573
-msgid " -o --port : Login Server Port"
+msgid " -S --home-dir : Directory to use as home directory"
msgstr ""
#: src/main.cpp:574
-msgid " -s --server : Login Server name or IP"
+msgid " -H --update-host : Use this update host"
msgstr ""
#: src/main.cpp:575
-msgid " -u --skipupdate : Skip the update downloads"
+msgid " -P --password : Login with this password"
msgstr ""
#: src/main.cpp:576
-msgid " -U --username : Login with this username"
+msgid " -c --character : Login with this character"
msgstr ""
#: src/main.cpp:577
-msgid " -v --version : Display the version"
+msgid " -p --port : Login Server Port"
+msgstr ""
+
+#: src/main.cpp:578
+msgid " -s --server : Login Server name or IP"
+msgstr ""
+
+#: src/main.cpp:579
+msgid " -u --skip-update : Skip the update downloads"
+msgstr ""
+
+#: src/main.cpp:580
+msgid " -U --username : Login with this username"
msgstr ""
#: src/main.cpp:582
+msgid " -O --no-opengl : Disable OpenGL for this session"
+msgstr ""
+
+#: src/main.cpp:584
+msgid " -v --version : Display the version"
+msgstr ""
+
+#: src/main.cpp:589
msgid "The Mana World "
msgstr ""
-#: src/main.cpp:1499
+#: src/main.cpp:1515
#, fuzzy
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 ""
@@ -2268,18 +2286,18 @@ msgstr "Dexterity:"
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 ""
@@ -2291,415 +2309,429 @@ 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
#, fuzzy, c-format
msgid "Strength: %d"
msgstr "Strength:"
-#: src/net/ea/generalhandler.cpp:92 src/net/tmwserv/generalhandler.cpp:82
+#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:84
#, fuzzy, c-format
msgid "Agility: %d"
msgstr "Agility:"
-#: src/net/ea/generalhandler.cpp:94 src/net/tmwserv/generalhandler.cpp:86
+#: src/net/ea/generalhandler.cpp:96 src/net/tmwserv/generalhandler.cpp:88
#, fuzzy, c-format
msgid "Vitality: %d"
msgstr "Vitality:"
-#: src/net/ea/generalhandler.cpp:96 src/net/tmwserv/generalhandler.cpp:88
+#: src/net/ea/generalhandler.cpp:98 src/net/tmwserv/generalhandler.cpp:90
#, fuzzy, c-format
msgid "Intelligence: %d"
msgstr "Intelligence:"
-#: src/net/ea/generalhandler.cpp:98 src/net/tmwserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:100 src/net/tmwserv/generalhandler.cpp:86
#, fuzzy, c-format
msgid "Dexterity: %d"
msgstr "Dexterity:"
-#: src/net/ea/generalhandler.cpp:100
+#: src/net/ea/generalhandler.cpp:102
#, c-format
msgid "Luck: %d"
msgstr ""
-#: 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 ""
-#: 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 ""
+
+#: src/net/ea/gui/partytab.cpp:53
msgid "/create > Create a new party"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:55
+#: src/net/ea/gui/partytab.cpp:54
msgid "/new > Alias of create"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:56
+#: src/net/ea/gui/partytab.cpp:55
msgid "/invite > Invite a player to your party"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:57
+#: src/net/ea/gui/partytab.cpp:56
msgid "/leave > Leave the party you are in"
msgstr ""
-#: 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 ""
-#: src/net/ea/gui/partytab.cpp:59
+#: src/net/ea/gui/partytab.cpp:58
msgid "/item > Show/change party item sharing options"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:60
+#: src/net/ea/gui/partytab.cpp:59
msgid "/exp > Show/change party experience sharing options"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:69
+#: src/net/ea/gui/partytab.cpp:68
msgid "Command: /new <party-name>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:70
+#: src/net/ea/gui/partytab.cpp:69
msgid "Command: /create <party-name>"
msgstr ""
-#: 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 ""
-#: src/net/ea/gui/partytab.cpp:75
+#: src/net/ea/gui/partytab.cpp:74
msgid "Command: /invite <nick>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:82
+#: src/net/ea/gui/partytab.cpp:81
msgid "Command: /leave"
msgstr ""
-#: 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 ""
-#: 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."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:92
+#: src/net/ea/gui/partytab.cpp:91
msgid "Command: /item"
msgstr ""
-#: 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 ""
-#: 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."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:102
+#: src/net/ea/gui/partytab.cpp:101
msgid "Command: /exp"
msgstr ""
-#: 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]"
+msgid "You picked up %s [@@%d|%s@@]"
msgstr ""
-#: 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
#, fuzzy
msgid "Unregistered ID"
msgstr "สมัครสมาชิก"
-#: src/net/ea/loginhandler.cpp:114
+#: src/net/ea/loginhandler.cpp:113
#, fuzzy
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 ""
-#: 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"
" Please contact the GM team via the forums."
msgstr ""
-#: 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."
+#: src/net/ea/partyhandler.cpp:77
+msgid "Could not create party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:82
-msgid "Could not create party."
+#: src/net/ea/partyhandler.cpp:80
+msgid "Party successfully created."
msgstr ""
-#: src/net/ea/partyhandler.cpp:112
+#: src/net/ea/partyhandler.cpp:115
#, c-format
msgid "%s is already a member of a party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:116
+#: src/net/ea/partyhandler.cpp:119
#, c-format
msgid "%s refused your invitation."
msgstr ""
-#: src/net/ea/partyhandler.cpp:120
+#: src/net/ea/partyhandler.cpp:123
#, c-format
msgid "%s is now a member of your party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:124
+#: src/net/ea/partyhandler.cpp:127
#, c-format
msgid "Unknown invite response for %s."
msgstr ""
-#: 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 ""
-#: src/net/ea/partyhandler.cpp:269
+#: src/net/ea/partyhandler.cpp:272
#, c-format
msgid "An unknown member tried to say: %s"
msgstr ""
-#: 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 ""
-#: 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"
+#: 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 ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
@@ -2856,40 +2888,100 @@ msgstr ""
msgid "Willpower:"
msgstr "Willpower:"
-#: 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
#, fuzzy, c-format
msgid "Willpower: %d"
msgstr "Willpower:"
-#: 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
+#, fuzzy
+msgid "New email address incorrect"
+msgstr "เปลี่ยนที่อยู่ Email"
+
+#: src/net/tmwserv/loginhandler.cpp:143
+#, fuzzy
+msgid "Old email address incorrect"
+msgstr "เปลี่ยนที่อยู่ Email"
+
+#: src/net/tmwserv/loginhandler.cpp:149
+#, fuzzy
+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
+#, fuzzy
+msgid "Wrong username or password"
+msgstr "เปลี่ยนรหัสผ่าน"
+
+#: src/net/tmwserv/loginhandler.cpp:211
+msgid "Wrong username, password or email address"
+msgstr ""
+
+#: src/net/tmwserv/loginhandler.cpp:214
+msgid "Username already exists"
+msgstr ""
+
+#: src/net/tmwserv/loginhandler.cpp:217
+msgid "Email address already exists"
+msgstr ""
+
+#: src/resources/itemdb.cpp:52
#, c-format
msgid "Attack %+d"
msgstr ""
-#: src/resources/itemdb.cpp:54
+#: src/resources/itemdb.cpp:53
#, c-format
msgid "Defense %+d"
msgstr ""
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:54
#, c-format
msgid "HP %+d"
msgstr ""
-#: src/resources/itemdb.cpp:56
+#: src/resources/itemdb.cpp:55
#, c-format
msgid "MP %+d"
msgstr ""
-#: src/resources/itemdb.cpp:113
+#: src/resources/itemdb.cpp:112
msgid "items.xml"
msgstr ""
-#: src/resources/itemdb.cpp:151
+#: src/resources/itemdb.cpp:150
msgid "Unnamed"
msgstr ""
@@ -2904,3 +2996,13 @@ msgstr ""
#: src/resources/npcdb.cpp:53
msgid "NPC Database: Error while loading npcs.xml!"
msgstr ""
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "> Cancel\n"
+#~ msgstr "ยกเลิก"
+
+#, fuzzy
+#~ msgid "use"
+#~ msgstr "ใช้"
diff --git a/po/tmw.pot b/po/tmw.pot
index c43bb846..ee7efc6a 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-04-21 17:27+0200\n"
+"POT-Creation-Date: 2009-05-10 15:53+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"
@@ -16,286 +16,286 @@ msgstr ""
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\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."
+#: src/commandhandler.cpp:142
+msgid "/help > Display this help"
msgstr ""
-#: src/commandhandler.cpp:145
+#: src/commandhandler.cpp:144
msgid "/where > Display map name"
msgstr ""
-#: src/commandhandler.cpp:146
+#: src/commandhandler.cpp:145
msgid "/who > Display number of online users"
msgstr ""
-#: src/commandhandler.cpp:147
+#: src/commandhandler.cpp:146
msgid "/me > Tell something about yourself"
msgstr ""
-#: src/commandhandler.cpp:149
+#: src/commandhandler.cpp:148
msgid "/clear > Clears this window"
msgstr ""
-#: src/commandhandler.cpp:151
+#: src/commandhandler.cpp:150
msgid "/msg > Send a private message to a user"
msgstr ""
-#: src/commandhandler.cpp:152
+#: src/commandhandler.cpp:151
msgid "/whisper > Alias of msg"
msgstr ""
-#: src/commandhandler.cpp:153
+#: src/commandhandler.cpp:152
msgid "/w > Alias of msg"
msgstr ""
-#: src/commandhandler.cpp:154
+#: src/commandhandler.cpp:153
msgid "/query > Makes a tab for private messages with another user"
msgstr ""
-#: src/commandhandler.cpp:155
+#: src/commandhandler.cpp:154
msgid "/q > Alias of query"
msgstr ""
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:156
msgid "/list > Display all public channels"
msgstr ""
-#: src/commandhandler.cpp:158
+#: src/commandhandler.cpp:157
msgid "/join > Join or create a channel"
msgstr ""
-#: src/commandhandler.cpp:160
+#: src/commandhandler.cpp:159
msgid "/party > Invite a user to party"
msgstr ""
-#: src/commandhandler.cpp:162
+#: src/commandhandler.cpp:161
msgid "/record > Start recording the chat to an external file"
msgstr ""
-#: 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 ""
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:165
msgid "/announce > Global announcement (GM only)"
msgstr ""
-#: src/commandhandler.cpp:170
+#: src/commandhandler.cpp:169
msgid "For more information, type /help <command>"
msgstr ""
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:173
msgid "Command: /help"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: src/commandhandler.cpp:186
+#: src/commandhandler.cpp:185
msgid "*** only available to a GM ***"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: src/commandhandler.cpp:209
+#: src/commandhandler.cpp:208
msgid "This command tell others you are (doing) <msg>."
msgstr ""
-#: src/commandhandler.cpp:213
+#: src/commandhandler.cpp:212
msgid "Command: /msg <nick> <message>"
msgstr ""
-#: src/commandhandler.cpp:214
+#: src/commandhandler.cpp:213
msgid "Command: /whisper <nick> <message>"
msgstr ""
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:214
msgid "Command: /w <nick> <message>"
msgstr ""
-#: src/commandhandler.cpp:216
+#: src/commandhandler.cpp:215
msgid "This command sends the text <message> to <nick>."
msgstr ""
-#: 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 ""
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:222
msgid "Command: /q <nick>"
msgstr ""
-#: src/commandhandler.cpp:224
+#: src/commandhandler.cpp:223
msgid "This command tries to make a tab for whispers betweenyou and <nick>."
msgstr ""
-#: src/commandhandler.cpp:229
+#: src/commandhandler.cpp:228
msgid "Command: /party <nick>"
msgstr ""
-#: 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 ""
-#: src/commandhandler.cpp:236
+#: src/commandhandler.cpp:235
msgid "Command: /present"
msgstr ""
-#: 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 ""
-#: src/commandhandler.cpp:244
+#: src/commandhandler.cpp:243
msgid "This command starts recording the chat log to the file <filename>."
msgstr ""
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:245
msgid "Command: /record"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: src/commandhandler.cpp:257
+#: src/commandhandler.cpp:256
msgid "Command: /toggle"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: src/commandhandler.cpp:336
-msgid "Cannont send empty whispers!"
+#: 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 ""
-#: 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 ""
@@ -304,45 +304,45 @@ msgstr ""
msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
msgstr ""
-#: 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"
+#: src/game.cpp:481
+msgid "The connection to the server was lost, the program will now quit"
msgstr ""
-#: src/game.cpp:493
-msgid "The connection to the server was lost, the program will now quit"
+#: src/game.cpp:487
+msgid "Network Error"
msgstr ""
-#: src/game.cpp:664 src/gui/buy.cpp:71 src/gui/quitdialog.cpp:32
+#: 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 ""
@@ -354,12 +354,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 ""
@@ -369,13 +369,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 ""
#: 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 ""
@@ -384,203 +384,211 @@ msgstr ""
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 ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
+
+#: 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 ""
-#: 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 ""
@@ -588,26 +596,16 @@ msgstr ""
msgid "Connecting..."
msgstr ""
-#: src/gui/emotecontainer.cpp:61
+#: src/gui/emotepopup.cpp:64
msgid "Unable to load selection.png"
msgstr ""
-#: 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 ""
@@ -631,97 +629,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 ""
-#: 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 ""
@@ -737,67 +738,40 @@ msgstr ""
msgid "Cast Test Spell 3"
msgstr ""
-#: src/gui/menuwindow.cpp:66
-msgid "Status"
+#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
+msgid "Map"
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/menuwindow.cpp:73
-msgid "Buddys"
+#: src/gui/npcdialog.cpp:43
+msgid "Waiting for server"
msgstr ""
-#: src/gui/menuwindow.cpp:75
-msgid "Shortcut"
+#: src/gui/npcdialog.cpp:46
+msgid "Submit"
msgstr ""
-#: src/gui/menuwindow.cpp:77 src/gui/setup.cpp:65 src/main.cpp:920
-msgid "Setup"
+#: src/gui/npcdialog.cpp:49 src/gui/npcpostdialog.cpp:39
+msgid "NPC"
msgstr ""
-#: src/gui/minimap.cpp:39
-msgid "MiniMap"
+#: src/gui/npcdialog.cpp:95
+msgid "+"
msgstr ""
-#: src/gui/npcintegerdialog.cpp:39
-msgid "NPC Number Request"
+#: 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 ""
-
-#: src/gui/npcpostdialog.cpp:39 src/gui/npc_text.cpp:37
-msgid "NPC"
-msgstr ""
-
#: src/gui/npcpostdialog.cpp:51
msgid "Send"
msgstr ""
-#: src/gui/npcstringdialog.cpp:39
-msgid "NPC Text Request"
-msgstr ""
-
-#: 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 ""
@@ -850,7 +824,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 ""
@@ -871,7 +845,7 @@ msgid "Being"
msgstr ""
#: src/gui/palette.cpp:104
-msgid "Other Player's Names"
+msgid "Other Players' Names"
msgstr ""
#: src/gui/palette.cpp:105
@@ -895,19 +869,19 @@ 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"
+msgid "Usables"
msgstr ""
#: src/gui/palette.cpp:114
-msgid "Shirt"
+msgid "Shirts"
msgstr ""
#: src/gui/palette.cpp:115
@@ -927,15 +901,15 @@ msgid "2 Handed Weapons"
msgstr ""
#: src/gui/palette.cpp:119
-msgid "Shield"
+msgid "Shields"
msgstr ""
#: src/gui/palette.cpp:120
-msgid "Ring"
+msgid "Rings"
msgstr ""
#: src/gui/palette.cpp:121
-msgid "Necklace"
+msgid "Necklaces"
msgstr ""
#: src/gui/palette.cpp:122
@@ -990,94 +964,102 @@ msgstr ""
msgid "1/4 HP Bar"
msgstr ""
-#: src/gui/popupmenu.cpp:73
+#: src/gui/popupmenu.cpp:75
msgid "@@name|Add name to chat@@"
msgstr ""
-#: src/gui/popupmenu.cpp:85
+#: src/gui/popupmenu.cpp:87
#, c-format
msgid "@@trade|Trade With %s@@"
msgstr ""
-#: 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 ""
-#: src/gui/popupmenu.cpp:92
+#: src/gui/popupmenu.cpp:94
#, c-format
msgid "@@friend|Befriend %s@@"
msgstr ""
-#: 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 ""
-#: src/gui/popupmenu.cpp:112
+#: src/gui/popupmenu.cpp:114
#, c-format
msgid "@@party|Invite %s to join your party@@"
msgstr ""
-#: src/gui/popupmenu.cpp:123
+#: src/gui/popupmenu.cpp:125
#, c-format
msgid "@@talk|Talk To %s@@"
msgstr ""
-#: 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@@"
+msgid "@@pickup|Pick up %s@@"
msgstr ""
-#: src/gui/popupmenu.cpp:156 src/gui/popupmenu.cpp:352
-msgid "@@chat|Add to Chat@@"
+#: src/gui/popupmenu.cpp:158 src/gui/popupmenu.cpp:373
+msgid "@@chat|Add to chat@@"
msgstr ""
-#: src/gui/popupmenu.cpp:336 src/gui/popupmenu.cpp:341
-msgid "@@use|Equip@@"
+#: src/gui/popupmenu.cpp:348
+msgid "@@use|Unequip@@"
msgstr ""
-#: src/gui/popupmenu.cpp:339
-msgid "@@use|Unequip@@"
+#: src/gui/popupmenu.cpp:350
+msgid "@@use|Equip@@"
msgstr ""
-#: src/gui/popupmenu.cpp:345
+#: 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 ""
+
+#: src/gui/popupmenu.cpp:371
+msgid "@@retrieve|Retrieve@@"
+msgstr ""
+
#: src/gui/quitdialog.cpp:37
msgid "Switch server"
msgstr ""
@@ -1146,18 +1128,30 @@ msgstr ""
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 ""
-#: 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 ""
@@ -1174,11 +1168,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 ""
@@ -1186,22 +1180,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 ""
#: 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 ""
#: 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 ""
@@ -1209,26 +1203,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 ""
@@ -1297,7 +1283,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 ""
@@ -1325,153 +1311,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 ""
-#: 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 ""
-#: src/gui/setup_video.cpp:136
+#: src/gui/setup_video.cpp:167
msgid "FPS Limit:"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: src/gui/setup_video.cpp:365
+#: src/gui/setup_video.cpp:435
msgid "Applying change to OpenGL requires restart."
msgstr ""
-#: 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 ""
@@ -1483,6 +1489,10 @@ msgstr ""
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"
@@ -1492,14 +1502,6 @@ msgstr ""
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 ""
@@ -1508,165 +1510,165 @@ msgstr ""
msgid "Crafts"
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 ""
-#: src/gui/status.cpp:61
+#: src/gui/status.cpp:60
msgid "HP:"
msgstr ""
-#: src/gui/status.cpp:64
+#: src/gui/status.cpp:63
msgid "Exp:"
msgstr ""
-#: src/gui/status.cpp:67
+#: src/gui/status.cpp:66
msgid "MP:"
msgstr ""
-#: 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 ""
-#: src/gui/status.cpp:91
+#: src/gui/status.cpp:90
#, no-c-format
msgid "% Evade:"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
@@ -1778,21 +1780,21 @@ msgstr ""
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 ""
-#: src/gui/widgets/chattab.cpp:147
+#: src/gui/widgets/chattab.cpp:146
#, c-format
msgid "%s whispers: "
msgstr ""
-#: 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 ""
@@ -1800,23 +1802,34 @@ msgstr ""
msgid "Cannot send empty chat!"
msgstr ""
-#: src/gui/widgets/whispertab.cpp:55
-#, c-format
-msgid "%s: %s"
-msgstr ""
-
-#: src/gui/widgets/whispertab.cpp:69
+#: src/gui/widgets/whispertab.cpp:68
msgid "/close > Close the whisper tab"
msgstr ""
-#: src/gui/widgets/whispertab.cpp:79
+#: src/gui/widgets/whispertab.cpp:78
msgid "Command: /close"
msgstr ""
-#: 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 ""
@@ -1936,7 +1949,7 @@ msgid "Debug Window"
msgstr ""
#: src/keyboardconfig.cpp:80
-msgid "Emote Window"
+msgid "Party Window"
msgstr ""
#: src/keyboardconfig.cpp:81
@@ -1985,159 +1998,163 @@ msgstr ""
msgid "Ignore input 2"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: src/main.cpp:563
-msgid "Options: "
-msgstr ""
-
-#: src/main.cpp:564
-msgid " -C --configfile : Configuration file to use"
-msgstr ""
-
-#: src/main.cpp:565
-msgid " -d --data : Directory to load game data from"
-msgstr ""
-
-#: src/main.cpp:566
-msgid " -D --default : Bypass the login process with default settings"
+#: src/main.cpp:567
+msgid "Options:"
msgstr ""
#: src/main.cpp:568
-msgid " -h --help : Display this help"
+msgid " -C --config-file : Configuration file to use"
msgstr ""
#: src/main.cpp:569
-msgid " -S --homedir : Directory to use as home directory"
+msgid " -d --data : Directory to load game data from"
msgstr ""
#: src/main.cpp:570
-msgid " -H --updatehost : Use this update host"
-msgstr ""
-
-#: src/main.cpp:571
-msgid " -P --password : Login with this password"
+msgid " -D --default : Choose default character server and character"
msgstr ""
#: src/main.cpp:572
-msgid " -c --character : Login with this character"
+msgid " -h --help : Display this help"
msgstr ""
#: src/main.cpp:573
-msgid " -o --port : Login Server Port"
+msgid " -S --home-dir : Directory to use as home directory"
msgstr ""
#: src/main.cpp:574
-msgid " -s --server : Login Server name or IP"
+msgid " -H --update-host : Use this update host"
msgstr ""
#: src/main.cpp:575
-msgid " -u --skipupdate : Skip the update downloads"
+msgid " -P --password : Login with this password"
msgstr ""
#: src/main.cpp:576
-msgid " -U --username : Login with this username"
+msgid " -c --character : Login with this character"
msgstr ""
#: src/main.cpp:577
-msgid " -v --version : Display the version"
+msgid " -p --port : Login Server Port"
+msgstr ""
+
+#: src/main.cpp:578
+msgid " -s --server : Login Server name or IP"
+msgstr ""
+
+#: src/main.cpp:579
+msgid " -u --skip-update : Skip the update downloads"
+msgstr ""
+
+#: src/main.cpp:580
+msgid " -U --username : Login with this username"
msgstr ""
#: src/main.cpp:582
+msgid " -O --no-opengl : Disable OpenGL for this session"
+msgstr ""
+
+#: src/main.cpp:584
+msgid " -v --version : Display the version"
+msgstr ""
+
+#: src/main.cpp:589
msgid "The Mana World "
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 ""
@@ -2218,18 +2235,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 ""
@@ -2241,413 +2258,427 @@ 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 ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: src/net/ea/generalhandler.cpp:100
+#: src/net/ea/generalhandler.cpp:102
#, c-format
msgid "Luck: %d"
msgstr ""
-#: 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 ""
-#: 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 ""
+
+#: src/net/ea/gui/partytab.cpp:53
msgid "/create > Create a new party"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:55
+#: src/net/ea/gui/partytab.cpp:54
msgid "/new > Alias of create"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:56
+#: src/net/ea/gui/partytab.cpp:55
msgid "/invite > Invite a player to your party"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:57
+#: src/net/ea/gui/partytab.cpp:56
msgid "/leave > Leave the party you are in"
msgstr ""
-#: 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 ""
-#: src/net/ea/gui/partytab.cpp:59
+#: src/net/ea/gui/partytab.cpp:58
msgid "/item > Show/change party item sharing options"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:60
+#: src/net/ea/gui/partytab.cpp:59
msgid "/exp > Show/change party experience sharing options"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:69
+#: src/net/ea/gui/partytab.cpp:68
msgid "Command: /new <party-name>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:70
+#: src/net/ea/gui/partytab.cpp:69
msgid "Command: /create <party-name>"
msgstr ""
-#: 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 ""
-#: src/net/ea/gui/partytab.cpp:75
+#: src/net/ea/gui/partytab.cpp:74
msgid "Command: /invite <nick>"
msgstr ""
-#: src/net/ea/gui/partytab.cpp:82
+#: src/net/ea/gui/partytab.cpp:81
msgid "Command: /leave"
msgstr ""
-#: 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 ""
-#: 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."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:92
+#: src/net/ea/gui/partytab.cpp:91
msgid "Command: /item"
msgstr ""
-#: 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 ""
-#: 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."
msgstr ""
-#: src/net/ea/gui/partytab.cpp:102
+#: src/net/ea/gui/partytab.cpp:101
msgid "Command: /exp"
msgstr ""
-#: 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]"
+msgid "You picked up %s [@@%d|%s@@]"
msgstr ""
-#: 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 ""
-#: 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 ""
-#: 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"
" Please contact the GM team via the forums."
msgstr ""
-#: 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."
+#: src/net/ea/partyhandler.cpp:77
+msgid "Could not create party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:82
-msgid "Could not create party."
+#: src/net/ea/partyhandler.cpp:80
+msgid "Party successfully created."
msgstr ""
-#: src/net/ea/partyhandler.cpp:112
+#: src/net/ea/partyhandler.cpp:115
#, c-format
msgid "%s is already a member of a party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:116
+#: src/net/ea/partyhandler.cpp:119
#, c-format
msgid "%s refused your invitation."
msgstr ""
-#: src/net/ea/partyhandler.cpp:120
+#: src/net/ea/partyhandler.cpp:123
#, c-format
msgid "%s is now a member of your party."
msgstr ""
-#: src/net/ea/partyhandler.cpp:124
+#: src/net/ea/partyhandler.cpp:127
#, c-format
msgid "Unknown invite response for %s."
msgstr ""
-#: 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 ""
-#: src/net/ea/partyhandler.cpp:269
+#: src/net/ea/partyhandler.cpp:272
#, c-format
msgid "An unknown member tried to say: %s"
msgstr ""
-#: 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 ""
-#: 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"
+#: 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 ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
-#: 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 ""
@@ -2803,40 +2834,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 ""
-#: 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 ""
+
+#: src/net/tmwserv/loginhandler.cpp:143
+msgid "Old email address incorrect"
+msgstr ""
+
+#: src/net/tmwserv/loginhandler.cpp:149
+msgid "The new Email Address already exists."
+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
+msgid "Wrong username or password"
+msgstr ""
+
+#: src/net/tmwserv/loginhandler.cpp:211
+msgid "Wrong username, password or email address"
+msgstr ""
+
+#: src/net/tmwserv/loginhandler.cpp:214
+msgid "Username already exists"
+msgstr ""
+
+#: src/net/tmwserv/loginhandler.cpp:217
+msgid "Email address already exists"
+msgstr ""
+
+#: src/resources/itemdb.cpp:52
#, c-format
msgid "Attack %+d"
msgstr ""
-#: src/resources/itemdb.cpp:54
+#: src/resources/itemdb.cpp:53
#, c-format
msgid "Defense %+d"
msgstr ""
-#: src/resources/itemdb.cpp:55
+#: src/resources/itemdb.cpp:54
#, c-format
msgid "HP %+d"
msgstr ""
-#: src/resources/itemdb.cpp:56
+#: src/resources/itemdb.cpp:55
#, c-format
msgid "MP %+d"
msgstr ""
-#: src/resources/itemdb.cpp:113
+#: src/resources/itemdb.cpp:112
msgid "items.xml"
msgstr ""
-#: src/resources/itemdb.cpp:151
+#: src/resources/itemdb.cpp:150
msgid "Unnamed"
msgstr ""
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-22 11:21:22 +0000