Large translation file update

Also updated the list of files with strings to translate, the contact
address and the copyright assignment.

1 files changed, 1775 insertions, 1126 deletions

diff --git a/po/ru.po b/po/ru.po
index 8d92a547..413ffcb3 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mana\n"
-"Report-Msgid-Bugs-To: themanaworld-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2009-06-09 21:24+0200\n"
+"Report-Msgid-Bugs-To: dev@manasource.org\n"
+"POT-Creation-Date: 2010-03-05 21:43+0100\n"
 "PO-Revision-Date: 2009-05-11 20:01+0000\n"
 "Last-Translator: Koptev Oleg <Unknown>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -17,578 +17,731 @@ msgstr ""
 "X-Launchpad-Export-Date: 2009-05-11 21:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
-#: src/commandhandler.cpp:113 src/commandhandler.cpp:273
+#: src/client.cpp:553 src/gui/setup.cpp:43 src/gui/windowmenu.cpp:62
+msgid "Setup"
+msgstr "Настройка"
+
+#: src/client.cpp:623
+#, fuzzy
+msgid "Connecting to server"
+msgstr "Подключение к серверу карт..."
+
+#: src/client.cpp:650
+#, fuzzy
+msgid "Logging in"
+msgstr "Вход"
+
+#: src/client.cpp:683
+msgid "Entering game world"
+msgstr ""
+
+#: src/client.cpp:739
+#, fuzzy
+msgid "Requesting characters"
+msgstr "Выбор персонажа"
+
+#: src/client.cpp:768
+#, fuzzy
+msgid "Connecting to the game server"
+msgstr "Подключение к серверу карт..."
+
+#: src/client.cpp:799 src/client.cpp:806 src/client.cpp:940
+#: src/gui/changeemaildialog.cpp:156 src/gui/changepassworddialog.cpp:149
+#: src/gui/charcreatedialog.cpp:177 src/gui/register.cpp:218
+#: src/gui/serverdialog.cpp:261 src/gui/unregisterdialog.cpp:133
+#: src/net/ea/charserverhandler.cpp:135 src/net/ea/charserverhandler.cpp:152
+#: src/net/manaserv/charhandler.cpp:161 src/net/manaserv/charhandler.cpp:204
+msgid "Error"
+msgstr "Ошибка"
+
+#: src/client.cpp:815
+msgid "Requesting registration details"
+msgstr ""
+
+#: src/client.cpp:842
+#, fuzzy
+msgid "Password Change"
+msgstr "Пароль:"
+
+#: src/client.cpp:843
+msgid "Password changed successfully!"
+msgstr ""
+
+#: src/client.cpp:862
+#, fuzzy
+msgid "Email Change"
+msgstr "Сменить"
+
+#: src/client.cpp:863
+msgid "Email changed successfully!"
+msgstr ""
+
+#: src/client.cpp:883
+#, fuzzy
+msgid "Unregister Successful"
+msgstr "Удалить регистрацию"
+
+#: src/client.cpp:884
+msgid "Farewell, come back any time..."
+msgstr ""
+
+#: src/client.cpp:1007 src/client.cpp:1030
+#, c-format
+msgid "%s doesn't exist and can't be created! Exiting."
+msgstr ""
+
+#: src/client.cpp:1119
+#, c-format
+msgid "Invalid update host: %s"
+msgstr ""
+
+#: src/client.cpp:1153 src/client.cpp:1159
+msgid "Error creating updates directory!"
+msgstr ""
+
+#: src/commandhandler.cpp:127 src/commandhandler.cpp:308
 msgid "Unknown command."
 msgstr "Неизвесная команда"
 
-#: src/commandhandler.cpp:142
+#: src/commandhandler.cpp:156
 msgid "-- Help --"
 msgstr "-- Помощь --"
 
-#: src/commandhandler.cpp:143
+#: src/commandhandler.cpp:157
 msgid "/help > Display this help"
 msgstr "/help > Отображает этото текст"
 
-#: src/commandhandler.cpp:145
+#: src/commandhandler.cpp:159
 msgid "/where > Display map name"
 msgstr "/where > Отображает имя карты"
 
-#: src/commandhandler.cpp:146
+#: src/commandhandler.cpp:160
 msgid "/who > Display number of online users"
 msgstr "/who > Отображает количество пользователей он-лайн"
 
-#: src/commandhandler.cpp:147
+#: src/commandhandler.cpp:161
 msgid "/me > Tell something about yourself"
 msgstr "/me > Расскажите что-нибудь о себе"
 
-#: src/commandhandler.cpp:149
+#: src/commandhandler.cpp:163
 msgid "/clear > Clears this window"
 msgstr "/clear > Очищает это окно"
 
-#: src/commandhandler.cpp:151
+#: src/commandhandler.cpp:165
 msgid "/msg > Send a private message to a user"
 msgstr "/msg > Послать приватное сообщение пользователю"
 
-#: src/commandhandler.cpp:152
+#: src/commandhandler.cpp:166
 msgid "/whisper > Alias of msg"
 msgstr "/whisper > Вариант команды msg"
 
-#: src/commandhandler.cpp:153
+#: src/commandhandler.cpp:167
 msgid "/w > Alias of msg"
 msgstr "/w > Вариант команды msg"
 
-#: src/commandhandler.cpp:154
+#: src/commandhandler.cpp:168
 msgid "/query > Makes a tab for private messages with another user"
 msgstr ""
 
-#: src/commandhandler.cpp:155
+#: src/commandhandler.cpp:169
 msgid "/q > Alias of query"
 msgstr ""
 
-#: src/commandhandler.cpp:157
+#: src/commandhandler.cpp:171
+msgid "/ignore > ignore a player"
+msgstr ""
+
+#: src/commandhandler.cpp:172
+msgid "/unignore > stop ignoring a player"
+msgstr ""
+
+#: src/commandhandler.cpp:174
 msgid "/list > Display all public channels"
 msgstr ""
 
-#: src/commandhandler.cpp:158
+#: src/commandhandler.cpp:175
 msgid "/join > Join or create a channel"
 msgstr "/join > Создать или присоединиться к каналу"
 
-#: src/commandhandler.cpp:160
+#: src/commandhandler.cpp:177
+#, fuzzy
+msgid "/createparty > Create a new party"
+msgstr "Пригласить пользователя на канал"
+
+#: src/commandhandler.cpp:178
 msgid "/party > Invite a user to party"
 msgstr "Пригласить пользователя на канал"
 
-#: src/commandhandler.cpp:162
+#: src/commandhandler.cpp:180
 msgid "/record > Start recording the chat to an external file"
 msgstr "/record > Записывать чат во внешний файл"
 
-#: src/commandhandler.cpp:163
+#: src/commandhandler.cpp:181
 msgid "/toggle > Determine whether <return> toggles the chat log"
 msgstr ""
 
-#: src/commandhandler.cpp:164
+#: src/commandhandler.cpp:182
 msgid "/present > Get list of players present (sent to chat log, if logging)"
 msgstr ""
 
-#: src/commandhandler.cpp:166
+#: src/commandhandler.cpp:184
 msgid "/announce > Global announcement (GM only)"
 msgstr ""
 
-#: src/commandhandler.cpp:170
+#: src/commandhandler.cpp:188
 #, fuzzy
 msgid "For more information, type /help <command>."
 msgstr "Чтобы получить больше информации, наберите /help <команда>"
 
-#: src/commandhandler.cpp:174
+#: src/commandhandler.cpp:192
 msgid "Command: /help"
 msgstr "Команда: /help"
 
-#: src/commandhandler.cpp:175
+#: src/commandhandler.cpp:193
 msgid "This command displays a list of all commands available."
 msgstr "Эта команда показывает список доступных команд"
 
-#: src/commandhandler.cpp:176
+#: src/commandhandler.cpp:194
 msgid "Command: /help <command>"
 msgstr "Команда: /help <команда>"
 
-#: src/commandhandler.cpp:177
+#: src/commandhandler.cpp:195
 msgid "This command displays help on <command>."
 msgstr "Эта команда показывает помощь по <команде>."
 
-#: src/commandhandler.cpp:185
+#: src/commandhandler.cpp:203
 msgid "Command: /announce <msg>"
 msgstr ""
 
-#: src/commandhandler.cpp:186
+#: src/commandhandler.cpp:204
 msgid "*** only available to a GM ***"
 msgstr ""
 
-#: src/commandhandler.cpp:187
+#: src/commandhandler.cpp:205
 msgid "This command sends the message <msg> to all players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:192
+#: src/commandhandler.cpp:210
 msgid "Command: /clear"
 msgstr "Команда: /clear"
 
-#: src/commandhandler.cpp:193
+#: src/commandhandler.cpp:211
 msgid "This command clears the chat log of previous chat."
 msgstr "Эта команда очищает лог чата."
 
-#: src/commandhandler.cpp:197
+#: src/commandhandler.cpp:215
+#, fuzzy
+msgid "Command: /ignore <player>"
+msgstr "Команда: /join <канал>"
+
+#: src/commandhandler.cpp:216
+#, fuzzy
+msgid "This command ignores the given player regardless of current relations."
+msgstr "Эта команда показывает имя текущей карты."
+
+#: src/commandhandler.cpp:221
 msgid "Command: /join <channel>"
 msgstr "Команда: /join <канал>"
 
-#: src/commandhandler.cpp:198
+#: src/commandhandler.cpp:222
 msgid "This command makes you enter <channel>."
 msgstr "Команда для входа на <канал>."
 
-#: src/commandhandler.cpp:199
+#: src/commandhandler.cpp:223
 msgid "If <channel> doesn't exist, it's created."
 msgstr "Если <канал> не существует, он будет создан."
 
-#: src/commandhandler.cpp:203
+#: src/commandhandler.cpp:227
 msgid "Command: /list"
 msgstr "Команда: /list"
 
-#: src/commandhandler.cpp:204
+#: src/commandhandler.cpp:228
 msgid "This command shows a list of all channels."
 msgstr "Эта команда показывает список всех каналов."
 
-#: src/commandhandler.cpp:208
+#: src/commandhandler.cpp:232
 msgid "Command: /me <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:209
+#: src/commandhandler.cpp:233
 msgid "This command tell others you are (doing) <msg>."
 msgstr ""
 
-#: src/commandhandler.cpp:213
+#: src/commandhandler.cpp:237
 msgid "Command: /msg <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:214
+#: src/commandhandler.cpp:238
 msgid "Command: /whisper <nick> <message>"
 msgstr ""
 
-#: src/commandhandler.cpp:215
+#: src/commandhandler.cpp:239
 msgid "Command: /w <nick> <message>"
 msgstr "Команда: /w <ник> <сообщение>"
 
-#: src/commandhandler.cpp:216
+#: src/commandhandler.cpp:240
 msgid "This command sends the text <message> to <nick>."
 msgstr "Эта команда посылает текст <сообщение> пользователю <nick>."
 
-#: src/commandhandler.cpp:217 src/commandhandler.cpp:231
-#: src/gui/widgets/channeltab.cpp:81 src/gui/widgets/channeltab.cpp:90
-#: src/net/ea/gui/partytab.cpp:79
+#: src/commandhandler.cpp:241 src/commandhandler.cpp:260
+#: src/gui/widgets/channeltab.cpp:82 src/gui/widgets/channeltab.cpp:91
+#: src/net/ea/gui/guildtab.cpp:75 src/net/ea/gui/partytab.cpp:75
 msgid "If the <nick> has spaces in it, enclose it in double quotes (\")."
 msgstr "Если ник содержит пробелы, заключите его в кавычки (\")."
 
-#: src/commandhandler.cpp:222
+#: src/commandhandler.cpp:246
 msgid "Command: /query <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:223
+#: src/commandhandler.cpp:247
 msgid "Command: /q <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:224
+#: src/commandhandler.cpp:248
 msgid "This command tries to make a tab for whispers betweenyou and <nick>."
 msgstr ""
 
-#: src/commandhandler.cpp:229
+#: src/commandhandler.cpp:253
+#, fuzzy
+msgid "Command: /createparty <name>"
+msgstr "Команда: /clear"
+
+#: src/commandhandler.cpp:254
+#, fuzzy
+msgid "This command creates a new party called <name>."
+msgstr "Команда для входа на <канал>."
+
+#: src/commandhandler.cpp:258
 msgid "Command: /party <nick>"
 msgstr ""
 
-#: src/commandhandler.cpp:230 src/net/ea/gui/partytab.cpp:78
+#: src/commandhandler.cpp:259 src/net/ea/gui/partytab.cpp:74
 msgid "This command invites <nick> to party with you."
 msgstr ""
 
-#: src/commandhandler.cpp:236
+#: src/commandhandler.cpp:265
 msgid "Command: /present"
 msgstr ""
 
-#: src/commandhandler.cpp:237
+#: src/commandhandler.cpp:266
 msgid ""
 "This command gets a list of players within hearing and sends it to either "
 "the record log if recording, or the chat log otherwise."
 msgstr ""
 
-#: src/commandhandler.cpp:243
+#: src/commandhandler.cpp:272
 msgid "Command: /record <filename>"
 msgstr ""
 
-#: src/commandhandler.cpp:244
+#: src/commandhandler.cpp:273
 msgid "This command starts recording the chat log to the file <filename>."
 msgstr ""
 
-#: src/commandhandler.cpp:246
+#: src/commandhandler.cpp:275
 msgid "Command: /record"
 msgstr ""
 
-#: src/commandhandler.cpp:247
+#: src/commandhandler.cpp:276
 msgid "This command finishes a recording session."
 msgstr ""
 
-#: src/commandhandler.cpp:251
+#: src/commandhandler.cpp:280
 msgid "Command: /toggle <state>"
 msgstr ""
 
-#: src/commandhandler.cpp:252
+#: src/commandhandler.cpp:281
 msgid ""
 "This command sets whether the return key should toggle the chat log, or "
 "whether the chat log turns off automatically."
 msgstr ""
 
-#: src/commandhandler.cpp:254
+#: src/commandhandler.cpp:283
 msgid ""
 "<state> can be one of \"1\", \"yes\", \"true\" to turn the toggle on, or \"0"
 "\", \"no\", \"false\" to turn the toggle off."
 msgstr ""
 
-#: src/commandhandler.cpp:257
+#: src/commandhandler.cpp:286
 msgid "Command: /toggle"
 msgstr ""
 
-#: src/commandhandler.cpp:258
+#: src/commandhandler.cpp:287
 msgid "This command displays the return toggle status."
 msgstr ""
 
-#: src/commandhandler.cpp:262
+#: src/commandhandler.cpp:291 src/gui/widgets/whispertab.cpp:93
+#, fuzzy
+msgid "Command: /unignore <player>"
+msgstr "Команда: /join <канал>"
+
+#: src/commandhandler.cpp:292
+msgid "This command stops ignoring the given player if they are being ignored"
+msgstr ""
+
+#: src/commandhandler.cpp:297
 msgid "Command: /where"
 msgstr "Команда: /where"
 
-#: src/commandhandler.cpp:263
+#: src/commandhandler.cpp:298
 msgid "This command displays the name of the current map."
 msgstr "Эта команда показывает имя текущей карты."
 
-#: src/commandhandler.cpp:267
+#: src/commandhandler.cpp:302
 msgid "Command: /who"
 msgstr "Команда: /who"
 
-#: src/commandhandler.cpp:268
+#: src/commandhandler.cpp:303
 msgid "This command displays the number of players currently online."
 msgstr ""
 
-#: src/commandhandler.cpp:274
+#: src/commandhandler.cpp:309
 msgid "Type /help for a list of commands."
 msgstr "Введите /help для получения списка команд."
 
-#: src/commandhandler.cpp:340
+#: src/commandhandler.cpp:375
 msgid "Cannot send empty whispers!"
 msgstr ""
 
-#: src/commandhandler.cpp:348
+#: src/commandhandler.cpp:383
 #, c-format
 msgid ""
 "Cannot create a whisper tab for nick \"%s\"! It either already exists, or is "
 "you."
 msgstr ""
 
-#: src/commandhandler.cpp:362
+#: src/commandhandler.cpp:397
 #, c-format
 msgid "Requesting to join channel %s."
 msgstr ""
 
-#: src/commandhandler.cpp:394
+#: src/commandhandler.cpp:410 src/net/ea/gui/partytab.cpp:109
+msgid "Party name is missing."
+msgstr ""
+
+#: src/commandhandler.cpp:423 src/commandhandler.cpp:471
+#: src/commandhandler.cpp:493
+msgid "Please specify a name."
+msgstr ""
+
+#: src/commandhandler.cpp:441
 msgid "Return toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:394
+#: src/commandhandler.cpp:441
 msgid "Message closes chat."
 msgstr ""
 
-#: src/commandhandler.cpp:403
+#: src/commandhandler.cpp:450
 msgid "Return now toggles chat."
 msgstr ""
 
-#: src/commandhandler.cpp:407
+#: src/commandhandler.cpp:454
 msgid "Message now closes chat."
 msgstr ""
 
-#: src/commandhandler.h:31
-#, c-format
-msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
+#: src/commandhandler.cpp:477
+msgid "Player already ignored!"
 msgstr ""
 
-#: src/engine.cpp:88
-msgid "Could not load map"
+#: src/commandhandler.cpp:484
+msgid "Player successfully ignored!"
 msgstr ""
 
-#: src/engine.cpp:89
-#, c-format
-msgid "Error while loading %s"
+#: src/commandhandler.cpp:486
+msgid "Player could not be ignored!"
 msgstr ""
 
-#: src/game.cpp:237
-msgid "General"
+#: src/commandhandler.cpp:501
+msgid "Player wasn't ignored!"
 msgstr ""
 
-#: src/game.cpp:404
-msgid "Screenshot saved to ~/"
+#: src/commandhandler.cpp:506
+msgid "Player no longer ignored!"
 msgstr ""
 
-#: src/game.cpp:409
-msgid "Saving screenshot failed!"
+#: src/commandhandler.cpp:508
+msgid "Player could not be unignored!"
 msgstr ""
 
-#: src/game.cpp:485
-msgid "The connection to the server was lost, the program will now quit"
+#: src/commandhandler.h:31
+#, c-format
+msgid "Options to /%s are \"yes\", \"no\", \"true\", \"false\", \"1\", \"0\"."
 msgstr ""
 
-#: src/game.cpp:491
-msgid "Network Error"
+#: src/game.cpp:172
+msgid "General"
 msgstr ""
 
-#: src/game.cpp:657 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:101
-msgid "Quit"
-msgstr "Выход"
+#: src/game.cpp:326
+msgid "Screenshot saved as "
+msgstr ""
 
-#: src/game.cpp:658
-msgid "Are you sure you want to quit?"
+#: src/game.cpp:331
+msgid "Saving screenshot failed!"
 msgstr ""
 
-#: src/game.cpp:665
-msgid "no"
+#: src/game.cpp:355
+#, fuzzy
+msgid "The connection to the server was lost."
+msgstr "Подключение к серверу карт..."
+
+#: src/game.cpp:360
+msgid "Network Error"
 msgstr ""
 
-#: src/game.cpp:805
+#: src/game.cpp:705
 msgid "Ignoring incoming trade requests"
 msgstr ""
 
-#: src/game.cpp:812
+#: src/game.cpp:712
 msgid "Accepting incoming trade requests"
 msgstr ""
 
-#: src/gui/buddywindow.cpp:35
-msgid "Buddy"
+#: src/game.cpp:946
+msgid "Could Not Load Map"
 msgstr ""
 
-#: src/gui/buddywindow.cpp:38
-msgid "Buddy List"
+#: src/game.cpp:947
+#, c-format
+msgid "Error while loading %s"
 msgstr ""
 
-#: src/gui/buy.cpp:46 src/gui/buy.cpp:70 src/gui/buysell.cpp:40
+#: src/gui/beingpopup.cpp:75
+#, c-format
+msgid "Party: %s"
+msgstr ""
+
+#: src/gui/buy.cpp:49 src/gui/buy.cpp:78 src/gui/buysell.cpp:47
 msgid "Buy"
 msgstr "Купить"
 
-#: src/gui/buy.cpp:65 src/gui/buy.cpp:256 src/gui/sell.cpp:67
-#: src/gui/sell.cpp:278
+#: src/gui/buy.cpp:69 src/gui/buy.cpp:256 src/gui/sell.cpp:71
+#: src/gui/sell.cpp:276
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr ""
 
-#: src/gui/buy.cpp:72 src/gui/sell.cpp:74
-msgid "Max"
+#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buy.cpp:74 src/gui/itemamount.cpp:99 src/gui/npcdialog.cpp:100
+#: src/gui/sell.cpp:74 src/gui/statuswindow.cpp:479
+msgid "+"
 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:250 src/gui/sell.cpp:264
-#, c-format
-msgid "Description: %s"
-msgstr "Описание: %s"
+#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
+#. You may change this symbol if your language uses another.
+#: src/gui/buy.cpp:77 src/gui/itemamount.cpp:98 src/gui/npcdialog.cpp:101
+#: src/gui/sell.cpp:75 src/gui/statuswindow.cpp:491
+msgid "-"
+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:252 src/gui/sell.cpp:265
-#, c-format
-msgid "Effect: %s"
-msgstr "Эффект: %s"
+#: src/gui/buy.cpp:79 src/gui/quitdialog.cpp:40 src/gui/quitdialog.cpp:42
+#: src/gui/quitdialog.cpp:43 src/gui/sell.cpp:77 src/gui/serverdialog.cpp:182
+#: src/keyboardconfig.cpp:103
+msgid "Quit"
+msgstr "Выход"
 
-#: src/gui/buysell.cpp:34
+#: src/gui/buy.cpp:80 src/gui/sell.cpp:78 src/gui/statuswindow.cpp:408
+#: src/gui/statuswindow.cpp:478 src/gui/statuswindow.cpp:512
+msgid "Max"
+msgstr ""
+
+#: src/gui/buysell.cpp:38
 msgid "Shop"
 msgstr "Магазин"
 
-#: src/gui/buysell.cpp:40 src/gui/sell.cpp:46 src/gui/sell.cpp:72
+#: src/gui/buysell.cpp:47 src/gui/sell.cpp:49 src/gui/sell.cpp:76
 msgid "Sell"
 msgstr "Продать"
 
-#: src/gui/buysell.cpp:40 src/gui/changeemaildialog.cpp:53
-#: src/gui/changepassworddialog.cpp:57 src/gui/charcreatedialog.cpp:74
-#: src/gui/charselectdialog.cpp:104 src/gui/connection.cpp:38
-#: src/gui/itemamount.cpp:96 src/gui/login.cpp:75 src/gui/npcpostdialog.cpp:54
-#: src/gui/quitdialog.cpp:40 src/gui/register.cpp:81
-#: src/gui/serverdialog.cpp:104 src/gui/serverselectdialog.cpp:67
-#: src/gui/setup.cpp:73 src/gui/textdialog.cpp:37
-#: src/gui/unregisterdialog.cpp:53 src/gui/updatewindow.cpp:112
+#: src/gui/buysell.cpp:47 src/gui/changeemaildialog.cpp:55
+#: src/gui/changepassworddialog.cpp:58 src/gui/charcreatedialog.cpp:79
+#: src/gui/connectiondialog.cpp:44 src/gui/itemamount.cpp:101
+#: src/gui/npcpostdialog.cpp:57 src/gui/popupmenu.cpp:178
+#: src/gui/popupmenu.cpp:197 src/gui/popupmenu.cpp:402
+#: src/gui/quitdialog.cpp:47 src/gui/register.cpp:74 src/gui/setup.cpp:51
+#: src/gui/socialwindow.cpp:242 src/gui/textdialog.cpp:39
+#: src/gui/unregisterdialog.cpp:56 src/gui/updatewindow.cpp:144
 msgid "Cancel"
 msgstr "Отмена"
 
-#: src/gui/changeemaildialog.cpp:43 src/gui/changeemaildialog.cpp:52
-#: src/gui/charselectdialog.cpp:115
+#: src/gui/changeemaildialog.cpp:45 src/gui/changeemaildialog.cpp:54
 msgid "Change Email Address"
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:47 src/gui/changepassworddialog.cpp:51
-#: src/gui/charselectdialog.cpp:107
+#: src/gui/changeemaildialog.cpp:49 src/gui/changepassworddialog.cpp:52
 #, c-format
 msgid "Account: %s"
 msgstr ""
 
-#: src/gui/changeemaildialog.cpp:49
-msgid "Type New Email Address twice:"
+#: src/gui/changeemaildialog.cpp:51
+msgid "Type new email address twice:"
+msgstr ""
+
+#: src/gui/changeemaildialog.cpp:127
+#, fuzzy, c-format
+msgid "The new email address needs to be at least %d characters long."
+msgstr "Имя пользователя должно содержать не менее %d символов."
+
+#: src/gui/changeemaildialog.cpp:134
+#, fuzzy, c-format
+msgid "The new email address needs to be less than %d characters long."
+msgstr "Имя пользователя не должно содержать более %d символов."
+
+#: src/gui/changeemaildialog.cpp:141
+msgid "The email address entries mismatch."
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:46 src/gui/changepassworddialog.cpp:55
-#: src/gui/charselectdialog.cpp:110
+#: src/gui/changepassworddialog.cpp:47 src/gui/changepassworddialog.cpp:56
+#: src/gui/charselectdialog.cpp:128
 msgid "Change Password"
 msgstr ""
 
-#: src/gui/changepassworddialog.cpp:60 src/gui/login.cpp:52
-#: src/gui/register.cpp:61 src/gui/unregisterdialog.cpp:50
+#: src/gui/changepassworddialog.cpp:61 src/gui/login.cpp:53
+#: src/gui/register.cpp:68 src/gui/unregisterdialog.cpp:53
 msgid "Password:"
 msgstr "Пароль:"
 
-#: src/gui/changepassworddialog.cpp:62
+#: src/gui/changepassworddialog.cpp:63
 msgid "Type new password twice:"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:54
+#: src/gui/changepassworddialog.cpp:110
+msgid "Enter the old password first."
+msgstr ""
+
+#: src/gui/changepassworddialog.cpp:116
+#, fuzzy, c-format
+msgid "The new password needs to be at least %d characters long."
+msgstr "Пароль должен содержать не менее %d символов."
+
+#: src/gui/changepassworddialog.cpp:123
+#, fuzzy, c-format
+msgid "The new password needs to be less than %d characters long."
+msgstr "Пароль не должен содержать более %d символов."
+
+#: src/gui/changepassworddialog.cpp:130
+msgid "The new password entries mismatch."
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:53
 msgid "Create Character"
 msgstr "Создать персонажа"
 
-#: src/gui/charcreatedialog.cpp:66 src/gui/login.cpp:51
-#: src/gui/register.cpp:60
+#: src/gui/charcreatedialog.cpp:67 src/gui/login.cpp:52
+#: src/gui/register.cpp:67
 msgid "Name:"
 msgstr "Имя:"
 
-#: src/gui/charcreatedialog.cpp:69
-msgid "Hair Color:"
+#. TRANSLATORS: This is a narrow symbol used to denote 'next'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:70 src/gui/charcreatedialog.cpp:75
+#: src/gui/outfitwindow.cpp:67
+msgid ">"
+msgstr ""
+
+#. TRANSLATORS: This is a narrow symbol used to denote 'previous'.
+#. You may change this symbol if your language uses another.
+#: src/gui/charcreatedialog.cpp:73 src/gui/charcreatedialog.cpp:76
+#: src/gui/outfitwindow.cpp:66
+msgid "<"
+msgstr ""
+
+#: src/gui/charcreatedialog.cpp:74
+#, fuzzy
+msgid "Hair color:"
 msgstr "Цвет волос:"
 
-#: src/gui/charcreatedialog.cpp:72
-msgid "Hair Style:"
+#: src/gui/charcreatedialog.cpp:77
+#, fuzzy
+msgid "Hair style:"
 msgstr "Стрижка:"
 
-#: src/gui/charcreatedialog.cpp:73
+#: src/gui/charcreatedialog.cpp:78 src/gui/charselectdialog.cpp:397
+#: src/gui/socialwindow.cpp:296
 msgid "Create"
 msgstr "Создать"
 
-#: src/gui/charcreatedialog.cpp:75 src/gui/register.cpp:75
+#: src/gui/charcreatedialog.cpp:80 src/gui/register.cpp:90
 msgid "Male"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:76 src/gui/register.cpp:76
+#: src/gui/charcreatedialog.cpp:81 src/gui/register.cpp:91
 msgid "Female"
 msgstr ""
 
-#: src/gui/charcreatedialog.cpp:94 src/gui/charcreatedialog.cpp:234
+#: src/gui/charcreatedialog.cpp:99 src/gui/charcreatedialog.cpp:251
 #, c-format
 msgid "Please distribute %d points"
 msgstr "Распределите очки (%d)"
 
-#: src/gui/charcreatedialog.cpp:172 src/gui/register.cpp:222
-#: src/gui/serverdialog.cpp:163 src/main.cpp:1517
-#: src/net/ea/charserverhandler.cpp:123 src/net/ea/charserverhandler.cpp:140
-msgid "Error"
-msgstr "Ошибка"
-
-#: src/gui/charcreatedialog.cpp:173
+#: src/gui/charcreatedialog.cpp:178
 msgid "Your name needs to be at least 4 characters."
 msgstr "Имя должно содержать не менее четырех символов."
 
-#: src/gui/charcreatedialog.cpp:226
+#: src/gui/charcreatedialog.cpp:242
 msgid "Character stats OK"
 msgstr "Данные персонажа в порядке"
 
-#: src/gui/charcreatedialog.cpp:238
+#: src/gui/charcreatedialog.cpp:256
 #, c-format
 msgid "Please remove %d points"
 msgstr "Снимите очки (%d)"
 
-#: src/gui/charselectdialog.cpp:77
+#: src/gui/charselectdialog.cpp:69
 msgid "Confirm Character Delete"
 msgstr "Подтвердите удаление героя"
 
-#: src/gui/charselectdialog.cpp:78
+#: src/gui/charselectdialog.cpp:70
 msgid "Are you sure you want to delete this character?"
 msgstr "Вы уверены, что хотите удалить этого персонажа?"
 
-#: src/gui/charselectdialog.cpp:95
+#: src/gui/charselectdialog.cpp:117
 msgid "Account and Character Management"
 msgstr ""
 
-#: src/gui/charselectdialog.cpp:103 src/gui/login.cpp:74
-#: src/gui/okdialog.cpp:42 src/gui/quitdialog.cpp:39
-#: src/gui/serverdialog.cpp:103 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/charselectdialog.cpp:105
-msgid "Previous"
-msgstr "Предыдущий"
-
-#: src/gui/charselectdialog.cpp:106 src/gui/npcdialog.cpp:43
-msgid "Next"
-msgstr "Следующий"
-
-#: src/gui/charselectdialog.cpp:108 src/gui/charselectdialog.cpp:117
-#: src/gui/charselectdialog.cpp:296 src/gui/charselectdialog.cpp:317
-#: src/gui/unregisterdialog.cpp:49
-#, c-format
-msgid "Name: %s"
-msgstr "Имя: %s"
+#: src/gui/charselectdialog.cpp:127
+msgid "Switch Login"
+msgstr ""
 
-#: src/gui/charselectdialog.cpp:109 src/gui/charselectdialog.cpp:118
-#: src/gui/charselectdialog.cpp:298 src/gui/charselectdialog.cpp:318
-#: src/gui/status.cpp:55 src/gui/status.cpp:174
-#, c-format
-msgid "Level: %d"
-msgstr "Уровень: %d"
+#: src/gui/charselectdialog.cpp:141 src/gui/unregisterdialog.cpp:47
+#: src/gui/unregisterdialog.cpp:55
+msgid "Unregister"
+msgstr "Удалить регистрацию"
 
-#: src/gui/charselectdialog.cpp:112 src/gui/charselectdialog.cpp:157
-#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:327
-msgid "New"
-msgstr "Новый"
+#: src/gui/charselectdialog.cpp:150
+#, fuzzy
+msgid "Change Email"
+msgstr "Сменить"
 
-#: src/gui/charselectdialog.cpp:113 src/gui/charselectdialog.cpp:158
-#: src/gui/charselectdialog.cpp:159 src/gui/charselectdialog.cpp:310
-#: src/gui/setup_players.cpp:228
+#: src/gui/charselectdialog.cpp:335 src/gui/serverdialog.cpp:185
+#: src/gui/setup_players.cpp:230
 msgid "Delete"
 msgstr "Удалить"
 
-#: src/gui/charselectdialog.cpp:114 src/gui/unregisterdialog.cpp:52
-msgid "Unregister"
-msgstr "Удалить регистрацию"
-
-#: src/gui/charselectdialog.cpp:119
-#, c-format
-msgid "Money: %d"
-msgstr "Деньги: %d"
-
-#: src/gui/charselectdialog.cpp:154 src/gui/charselectdialog.cpp:300
-#: src/gui/charselectdialog.cpp:320
-#, c-format
-msgid "Job Level: %d"
-msgstr ""
+#: src/gui/charselectdialog.cpp:387
+#, fuzzy
+msgid "Choose"
+msgstr "Закрыть"
 
-#: src/gui/charselectdialog.cpp:155 src/gui/charselectdialog.cpp:303
-#: src/gui/charselectdialog.cpp:322 src/gui/status.cpp:57
-#: src/gui/status.cpp:182
-#, c-format
-msgid "Money: %s"
+#: src/gui/charselectdialog.cpp:399 src/gui/charselectdialog.cpp:400
+msgid "(empty)"
 msgstr ""
 
-#: src/gui/chat.cpp:73 src/gui/palette.cpp:93
+#: src/gui/chat.cpp:77 src/gui/palette.cpp:96
 msgid "Chat"
 msgstr ""
 
-#: src/gui/chat.cpp:326
+#: src/gui/chat.cpp:287
 #, c-format
-msgid "%d players are present."
+msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chat.cpp:327
-msgid "Present: "
-msgstr ""
-
-#: src/gui/chat.cpp:344
+#: src/gui/chat.cpp:305
 msgid "Attendance written to record log."
 msgstr ""
 
-#: src/gui/chat.cpp:471
+#: src/gui/chat.cpp:469
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr ""
@@ -601,180 +754,221 @@ msgstr "Да"
 msgid "No"
 msgstr "Нет"
 
-#: src/gui/connection.cpp:40 src/gui/updatewindow.cpp:110
-msgid "Connecting..."
-msgstr "Соединение..."
+#: src/gui/debugwindow.cpp:43
+msgid "Debug"
+msgstr ""
 
-#: src/gui/equipmentwindow.cpp:71 src/gui/windowmenu.cpp:60
-msgid "Equipment"
-msgstr "Снаряжение"
+#: src/gui/debugwindow.cpp:56
+#, c-format
+msgid "%d FPS (OpenGL)"
+msgstr ""
 
-#: src/gui/equipmentwindow.cpp:90 src/gui/inventorywindow.cpp:74
-#: src/gui/inventorywindow.cpp:76 src/gui/inventorywindow.cpp:269
-msgid "Unequip"
-msgstr "Снять"
+#: src/gui/debugwindow.cpp:61 src/gui/debugwindow.cpp:64
+#, c-format
+msgid "%d FPS"
+msgstr ""
 
-#: src/gui/guildwindow.cpp:50 src/gui/guildwindow.cpp:54
-msgid "Guild"
+#: src/gui/debugwindow.cpp:65 src/gui/debugwindow.cpp:104
+#, c-format
+msgid "Music: %s"
 msgstr ""
 
-#: src/gui/guildwindow.cpp:63
-msgid "Create Guild"
+#: src/gui/debugwindow.cpp:66 src/gui/debugwindow.cpp:108
+#, fuzzy, c-format
+msgid "Map: %s"
+msgstr "Имя: %s"
+
+#: src/gui/debugwindow.cpp:67 src/gui/debugwindow.cpp:106
+#, c-format
+msgid "Minimap: %s"
 msgstr ""
 
-#: src/gui/guildwindow.cpp:64
-msgid "Invite User"
+#: src/gui/debugwindow.cpp:68 src/gui/debugwindow.cpp:99
+#, c-format
+msgid "Cursor: (%d, %d)"
 msgstr ""
 
-#: src/gui/guildwindow.cpp:65
-msgid "Quit Guild"
+#: src/gui/debugwindow.cpp:69 src/gui/debugwindow.cpp:111
+#, c-format
+msgid "Particle count: %d"
+msgstr ""
+
+#: src/gui/debugwindow.cpp:116
+#, c-format
+msgid "Particle detail: %s"
 msgstr ""
 
-#: src/gui/help.cpp:34
+#: src/gui/debugwindow.cpp:121
+#, fuzzy, c-format
+msgid "Ambient FX: %s"
+msgstr "Эффекты окружающей среды"
+
+#: src/gui/equipmentwindow.cpp:69 src/gui/windowmenu.cpp:56
+msgid "Equipment"
+msgstr "Снаряжение"
+
+#: src/gui/equipmentwindow.cpp:87 src/gui/inventorywindow.cpp:77
+#: src/gui/inventorywindow.cpp:79 src/gui/inventorywindow.cpp:298
+#: src/gui/popupmenu.cpp:372
+msgid "Unequip"
+msgstr "Снять"
+
+#: src/gui/help.cpp:36
 msgid "Help"
 msgstr "Помощь"
 
-#: src/gui/help.cpp:47 src/gui/npcdialog.cpp:44 src/gui/storagewindow.cpp:68
+#: src/gui/help.cpp:50 src/gui/npcdialog.cpp:46 src/gui/storagewindow.cpp:73
 msgid "Close"
 msgstr "Закрыть"
 
-#: src/gui/inventorywindow.cpp:54 src/gui/windowmenu.cpp:61
+#: src/gui/inventorywindow.cpp:56 src/gui/windowmenu.cpp:57
 msgid "Inventory"
 msgstr "Инвентарь"
 
-#: src/gui/inventorywindow.cpp:69 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:271
+#: src/gui/inventorywindow.cpp:72 src/gui/inventorywindow.cpp:74
+#: src/gui/inventorywindow.cpp:300 src/gui/popupmenu.cpp:374
 msgid "Equip"
 msgstr "Надеть"
 
-#: src/gui/inventorywindow.cpp:70 src/gui/inventorywindow.cpp:71
-#: src/gui/inventorywindow.cpp:275 src/gui/skill.cpp:150
+#: src/gui/inventorywindow.cpp:73 src/gui/inventorywindow.cpp:74
+#: src/gui/inventorywindow.cpp:304 src/gui/popupmenu.cpp:377
 msgid "Use"
 msgstr "Использовать"
 
-#: src/gui/inventorywindow.cpp:80
-msgid "Drop"
+#: src/gui/inventorywindow.cpp:83 src/gui/inventorywindow.cpp:308
+#: src/gui/popupmenu.cpp:380
+#, fuzzy
+msgid "Drop..."
 msgstr "Сбросить"
 
-#: src/gui/inventorywindow.cpp:81
+#: src/gui/inventorywindow.cpp:84 src/gui/popupmenu.cpp:386
 msgid "Split"
 msgstr "Разделить"
 
-#: src/gui/inventorywindow.cpp:92 src/gui/storagewindow.cpp:78
+#: src/gui/inventorywindow.cpp:85 src/gui/outfitwindow.cpp:51
+msgid "Outfits"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:96 src/gui/storagewindow.cpp:83
 msgid "Slots:"
 msgstr ""
 
-#: src/gui/inventorywindow.cpp:93
+#: src/gui/inventorywindow.cpp:97
 msgid "Weight:"
 msgstr ""
 
-#: src/gui/itemamount.cpp:95
-msgid "Ok"
-msgstr "Ok"
+#: src/gui/inventorywindow.cpp:310 src/gui/popupmenu.cpp:382
+msgid "Drop"
+msgstr "Сбросить"
+
+#: src/gui/itemamount.cpp:100 src/gui/okdialog.cpp:42
+#: src/gui/quitdialog.cpp:46 src/gui/textdialog.cpp:38 src/gui/trade.cpp:73
+#: src/gui/trade.cpp:75
+msgid "OK"
+msgstr "ОК"
 
-#: src/gui/itemamount.cpp:97
+#: src/gui/itemamount.cpp:102
 msgid "All"
 msgstr ""
 
-#: src/gui/itemamount.cpp:123
+#: src/gui/itemamount.cpp:128
 msgid "Select amount of items to trade."
 msgstr "Сколько предметов продать."
 
-#: src/gui/itemamount.cpp:126
+#: src/gui/itemamount.cpp:131
 msgid "Select amount of items to drop."
 msgstr "Сколько предметов сбросить."
 
-#: src/gui/itemamount.cpp:129
+#: src/gui/itemamount.cpp:134
 msgid "Select amount of items to store."
 msgstr ""
 
-#: src/gui/itemamount.cpp:132
+#: src/gui/itemamount.cpp:137
 msgid "Select amount of items to retrieve."
 msgstr ""
 
-#: src/gui/itemamount.cpp:135
+#: src/gui/itemamount.cpp:140
 msgid "Select amount of items to split."
 msgstr "Сколько предметов разделить."
 
-#: src/gui/itempopup.cpp:91
-msgid "Weight: "
-msgstr ""
+#: src/gui/itempopup.cpp:92
+#, fuzzy, c-format
+msgid "Weight: %s"
+msgstr "Эффект: %s"
 
-#: src/gui/login.cpp:48
+#: src/gui/login.cpp:49 src/gui/login.cpp:61
 msgid "Login"
 msgstr "Вход"
 
-#: 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:55 src/gui/register.cpp:65 src/gui/serverdialog.cpp:77
-msgid "Port:"
-msgstr "Порт:"
-
-#: src/gui/login.cpp:56
-msgid "Recent:"
+#: src/gui/login.cpp:58
+msgid "Remember username"
 msgstr ""
 
-#: src/gui/login.cpp:73
-msgid "Remember Username"
-msgstr ""
-
-#: src/gui/login.cpp:76 src/gui/register.cpp:56 src/gui/register.cpp:80
+#: src/gui/login.cpp:59 src/gui/register.cpp:58 src/gui/register.cpp:73
 msgid "Register"
 msgstr "Зарегистрироваться"
 
-#: src/gui/magic.cpp:32 src/gui/skilldialog.cpp:117 src/gui/windowmenu.cpp:64
-#: src/localplayer.cpp:771
-msgid "Magic"
-msgstr ""
-
-#: src/gui/magic.cpp:39
-msgid "Cast Test Spell 1"
-msgstr ""
-
-#: src/gui/magic.cpp:40
-msgid "Cast Test Spell 2"
-msgstr ""
-
-#: src/gui/magic.cpp:41
-msgid "Cast Test Spell 3"
-msgstr ""
+#: src/gui/login.cpp:60
+#, fuzzy
+msgid "Change Server"
+msgstr "Сменить"
 
-#: src/gui/minimap.cpp:45 src/gui/minimap.cpp:84
+#: src/gui/minimap.cpp:46 src/gui/minimap.cpp:87
 msgid "Map"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:42
+#: src/gui/npcdialog.cpp:44
 msgid "Waiting for server"
 msgstr ""
 
 #: src/gui/npcdialog.cpp:45
+msgid "Next"
+msgstr "Следующий"
+
+#: src/gui/npcdialog.cpp:47
 msgid "Submit"
 msgstr ""
 
-#: src/gui/npcdialog.cpp:48 src/gui/npcpostdialog.cpp:39
+#: src/gui/npcdialog.cpp:52 src/gui/npcpostdialog.cpp:41
 msgid "NPC"
 msgstr "NPC"
 
-#: src/gui/npcdialog.cpp:104
+#: src/gui/npcdialog.cpp:110
 msgid "Reset"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:44
+#. TRANSLATORS: Please leave the \n sequences intact.
+#: src/gui/npcdialog.cpp:171
+#, fuzzy
+msgid ""
+"\n"
+"> Next\n"
+msgstr "Следующий"
+
+#: src/gui/npcpostdialog.cpp:47
 msgid "To:"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:51
+#: src/gui/npcpostdialog.cpp:54
 msgid "Send"
 msgstr ""
 
-#: src/gui/npcpostdialog.cpp:85
+#: src/gui/npcpostdialog.cpp:96
 msgid "Failed to send as sender or letter invalid."
 msgstr ""
 
-#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:142
+#: src/gui/outfitwindow.cpp:68 src/gui/outfitwindow.cpp:141
+#: src/gui/outfitwindow.cpp:154
+#, c-format
+msgid "Outfit: %d"
+msgstr ""
+
+#: src/gui/outfitwindow.cpp:70
+#, fuzzy
+msgid "Unequip first"
+msgstr "Снять"
+
+#: src/gui/palette.cpp:81 src/gui/setup_video.cpp:143
 msgid "Text"
 msgstr ""
 
@@ -790,325 +984,292 @@ msgstr ""
 msgid "Progress Bar Labels"
 msgstr ""
 
+#: src/gui/palette.cpp:85
+msgid "Buttons"
+msgstr ""
+
 #: src/gui/palette.cpp:86
+msgid "Disabled Buttons"
+msgstr ""
+
+#: src/gui/palette.cpp:87
+msgid "Tabs"
+msgstr ""
+
+#: src/gui/palette.cpp:89
 msgid "Background"
 msgstr ""
 
-#: src/gui/palette.cpp:88
+#: src/gui/palette.cpp:91
 msgid "Highlight"
 msgstr ""
 
-#: src/gui/palette.cpp:89
+#: src/gui/palette.cpp:92
 msgid "Tab Highlight"
 msgstr ""
 
-#: src/gui/palette.cpp:90
-msgid "Item too expensive"
+#: src/gui/palette.cpp:93
+msgid "Item Too Expensive"
 msgstr ""
 
-#: src/gui/palette.cpp:91
-msgid "Item is equipped"
+#: src/gui/palette.cpp:94
+msgid "Item Is Equipped"
 msgstr ""
 
-#: src/gui/palette.cpp:94
+#: src/gui/palette.cpp:97
 msgid "GM"
 msgstr ""
 
-#: src/gui/palette.cpp:95
+#: src/gui/palette.cpp:98
 msgid "Player"
 msgstr ""
 
-#: src/gui/palette.cpp:96
+#: src/gui/palette.cpp:99
 msgid "Whisper"
 msgstr ""
 
-#: src/gui/palette.cpp:97
+#: src/gui/palette.cpp:100
 msgid "Is"
 msgstr ""
 
-#: src/gui/palette.cpp:98 src/gui/partywindow.cpp:48
-#: src/gui/partywindow.cpp:75 src/net/ea/gui/partytab.cpp:39
+#: src/gui/palette.cpp:101 src/net/ea/gui/partytab.cpp:43
 msgid "Party"
 msgstr ""
 
-#: src/gui/palette.cpp:99
+#: src/gui/palette.cpp:102 src/net/ea/gui/guildtab.cpp:45
+msgid "Guild"
+msgstr ""
+
+#: src/gui/palette.cpp:103
 msgid "Server"
 msgstr ""
 
-#: src/gui/palette.cpp:100
+#: src/gui/palette.cpp:104
 msgid "Logger"
 msgstr ""
 
-#: src/gui/palette.cpp:101
+#: src/gui/palette.cpp:105
 msgid "Hyperlink"
 msgstr ""
 
-#: src/gui/palette.cpp:103
+#: src/gui/palette.cpp:107
 msgid "Being"
 msgstr ""
 
-#: src/gui/palette.cpp:104
+#: src/gui/palette.cpp:108
 msgid "Other Players' Names"
 msgstr ""
 
-#: src/gui/palette.cpp:105
+#: src/gui/palette.cpp:109
 msgid "Own Name"
 msgstr ""
 
-#: src/gui/palette.cpp:106
+#: src/gui/palette.cpp:110
 msgid "GM Names"
 msgstr ""
 
-#: src/gui/palette.cpp:107
+#: src/gui/palette.cpp:111
 msgid "NPCs"
 msgstr ""
 
-#: src/gui/palette.cpp:108
+#: src/gui/palette.cpp:112
 msgid "Monsters"
 msgstr ""
 
-#: src/gui/palette.cpp:110
+#: src/gui/palette.cpp:114
 msgid "Unknown Item Type"
 msgstr ""
 
-#: src/gui/palette.cpp:111
+#: src/gui/palette.cpp:115
 msgid "Generics"
 msgstr ""
 
-#: src/gui/palette.cpp:112
+#: src/gui/palette.cpp:116
 msgid "Hats"
 msgstr ""
 
-#: src/gui/palette.cpp:113
+#: src/gui/palette.cpp:117
 msgid "Usables"
 msgstr ""
 
-#: src/gui/palette.cpp:114
+#: src/gui/palette.cpp:118
 msgid "Shirts"
 msgstr ""
 
-#: src/gui/palette.cpp:115
-msgid "1 Handed Weapons"
+#: src/gui/palette.cpp:119
+msgid "One Handed Weapons"
 msgstr ""
 
-#: src/gui/palette.cpp:116
+#: src/gui/palette.cpp:120
 msgid "Pants"
 msgstr ""
 
-#: src/gui/palette.cpp:117
+#: src/gui/palette.cpp:121
 msgid "Shoes"
 msgstr ""
 
-#: src/gui/palette.cpp:118
-msgid "2 Handed Weapons"
+#: src/gui/palette.cpp:122
+msgid "Two Handed Weapons"
 msgstr ""
 
-#: src/gui/palette.cpp:119
+#: src/gui/palette.cpp:123
 msgid "Shields"
 msgstr ""
 
-#: src/gui/palette.cpp:120
+#: src/gui/palette.cpp:124
 msgid "Rings"
 msgstr ""
 
-#: src/gui/palette.cpp:121
+#: src/gui/palette.cpp:125
 msgid "Necklaces"
 msgstr ""
 
-#: src/gui/palette.cpp:122
+#: src/gui/palette.cpp:126
 msgid "Arms"
 msgstr ""
 
-#: src/gui/palette.cpp:123
+#: src/gui/palette.cpp:127
 msgid "Ammo"
 msgstr ""
 
-#: src/gui/palette.cpp:125
+#: src/gui/palette.cpp:129
 msgid "Particle Effects"
 msgstr ""
 
-#: src/gui/palette.cpp:126
+#: src/gui/palette.cpp:130
 msgid "Pickup Notification"
 msgstr ""
 
-#: src/gui/palette.cpp:127
+#: src/gui/palette.cpp:131
 msgid "Exp Notification"
 msgstr ""
 
-#: src/gui/palette.cpp:129
-msgid "Player hits Monster"
+#: src/gui/palette.cpp:133
+msgid "Player Hits Monster"
 msgstr ""
 
-#: src/gui/palette.cpp:131
-msgid "Monster hits Player"
+#: src/gui/palette.cpp:135
+msgid "Monster Hits Player"
 msgstr ""
 
-#: src/gui/palette.cpp:132
+#: src/gui/palette.cpp:136
 msgid "Critical Hit"
 msgstr ""
 
-#: src/gui/palette.cpp:133
+#: src/gui/palette.cpp:137
 msgid "Misses"
 msgstr ""
 
-#: src/gui/palette.cpp:135
+#: src/gui/palette.cpp:139
 msgid "HP Bar"
 msgstr ""
 
-#: src/gui/palette.cpp:136
+#: src/gui/palette.cpp:140
 msgid "3/4 HP Bar"
 msgstr ""
 
-#: src/gui/palette.cpp:137
+#: src/gui/palette.cpp:141
 msgid "1/2 HP Bar"
 msgstr ""
 
-#: src/gui/palette.cpp:138
+#: src/gui/palette.cpp:142
 msgid "1/4 HP Bar"
 msgstr ""
 
-#: src/gui/partywindow.cpp:70
-#, c-format
-msgid "Party (%s)"
-msgstr ""
+#: src/gui/popupmenu.cpp:84
+#, fuzzy, c-format
+msgid "Trade with %s..."
+msgstr "@@trade|Торговать с %s@@"
 
-#: src/gui/partywindow.cpp:174
-msgid "Received party request, but one already exists."
-msgstr ""
+#: src/gui/popupmenu.cpp:88 src/gui/popupmenu.cpp:161
+#, fuzzy, c-format
+msgid "Attack %s"
+msgstr "Атака %+d"
 
-#: src/gui/partywindow.cpp:182
-#, c-format
-msgid "%s has invited you to join their party."
-msgstr ""
+#: src/gui/popupmenu.cpp:92
+#, fuzzy, c-format
+msgid "Whisper %s"
+msgstr "Сила волиr:"
 
-#: src/gui/partywindow.cpp:185
+#: src/gui/popupmenu.cpp:101
 #, c-format
-msgid "%s has invited you to join the %s party."
-msgstr ""
-
-#: src/gui/partywindow.cpp:191
-msgid "Accept Party Invite"
+msgid "Befriend %s"
 msgstr ""
 
-#: src/gui/partywindow.cpp:204
+#: src/gui/popupmenu.cpp:106
 #, c-format
-msgid "Accepted invite from %s."
+msgid "Disregard %s"
 msgstr ""
 
-#: src/gui/partywindow.cpp:211
+#: src/gui/popupmenu.cpp:109
 #, c-format
-msgid "Rejected invite from %s."
+msgid "Ignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:77
-msgid "@@name|Add name to chat@@"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:89
-#, c-format
-msgid "@@trade|Trade With %s@@"
-msgstr "@@trade|Торговать с %s@@"
-
-#: src/gui/popupmenu.cpp:90 src/gui/popupmenu.cpp:138
-#, c-format
-msgid "@@attack|Attack %s@@"
-msgstr "@@attack|Атаковать %s@@"
-
-#: src/gui/popupmenu.cpp:96
+#: src/gui/popupmenu.cpp:115 src/gui/popupmenu.cpp:124
 #, c-format
-msgid "@@friend|Befriend %s@@"
+msgid "Unignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:99
+#: src/gui/popupmenu.cpp:118
 #, c-format
-msgid "@@disregard|Disregard %s@@"
+msgid "Completely ignore %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:100
+#: src/gui/popupmenu.cpp:130
 #, c-format
-msgid "@@ignore|Ignore %s@@"
+msgid "Follow %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:104 src/gui/popupmenu.cpp:109
+#: src/gui/popupmenu.cpp:133
 #, c-format
-msgid "@@unignore|Un-Ignore %s@@"
+msgid "Invite %s to join your guild"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:105
+#: src/gui/popupmenu.cpp:137
 #, c-format
-msgid "@@ignore|Completely ignore %s@@"
+msgid "Invite %s to join your party"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:116
-#, c-format
-msgid "@@guild|Invite %s to join your guild@@"
+#: src/gui/popupmenu.cpp:144
+msgid "Kick player"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:119
+#: src/gui/popupmenu.cpp:153
 #, c-format
-msgid "@@party|Invite %s to join your party@@"
+msgid "Talk to %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:124
-msgid "@@admin-kick|Kick player@@"
+#: src/gui/popupmenu.cpp:166
+msgid "Kick monster"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:132
-#, c-format
-msgid "@@talk|Talk To %s@@"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:141
-msgid "@@admin-kick|Kick monster@@"
+#: src/gui/popupmenu.cpp:174
+msgid "Add name to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:170
-#: src/gui/popupmenu.cpp:383
-msgid "@@cancel|Cancel@@"
-msgstr "@@cancelОтмена@@"
-
-#: src/gui/popupmenu.cpp:165
+#: src/gui/popupmenu.cpp:191
 #, c-format
-msgid "@@pickup|Pick up %s@@"
+msgid "Pick up %s"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:166 src/gui/popupmenu.cpp:381
-msgid "@@chat|Add to chat@@"
+#: src/gui/popupmenu.cpp:193 src/gui/popupmenu.cpp:400
+msgid "Add to chat"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:356
-msgid "@@use|Unequip@@"
-msgstr ""
-
-#: src/gui/popupmenu.cpp:358
-msgid "@@use|Equip@@"
-msgstr "@@use|Надеть@@"
-
-#: src/gui/popupmenu.cpp:361
-msgid "@@use|Use@@"
-msgstr "@@use|Использовать@@"
-
-#: src/gui/popupmenu.cpp:363
-msgid "@@drop|Drop@@"
-msgstr "@@drop|Сбросить@@"
-
-#: src/gui/popupmenu.cpp:367
-msgid "@@split|Split@@"
-msgstr "@@split|Разделить@@"
-
-#: src/gui/popupmenu.cpp:372
-msgid "@@store|Store@@"
+#: src/gui/popupmenu.cpp:391 src/gui/storagewindow.cpp:70
+msgid "Store"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:379
-msgid "@@retrieve|Retrieve@@"
+#: src/gui/popupmenu.cpp:398 src/gui/storagewindow.cpp:71
+msgid "Retrieve"
 msgstr ""
 
-#: src/gui/quitdialog.cpp:37
+#: src/gui/quitdialog.cpp:44
 msgid "Switch server"
 msgstr "Сменить сервер"
 
-#: src/gui/quitdialog.cpp:38
+#: src/gui/quitdialog.cpp:45
 msgid "Switch character"
 msgstr "Сменить персонажа"
 
@@ -1128,137 +1289,182 @@ msgstr ""
 msgid "Starting to record..."
 msgstr ""
 
-#: src/gui/recorder.cpp:113
+#: src/gui/recorder.cpp:112
 msgid "Failed to start recording."
 msgstr ""
 
-#: src/gui/recorder.h:39
+#: src/gui/recorder.h:38
 msgid "Recording..."
 msgstr ""
 
-#: src/gui/recorder.h:40
+#: src/gui/recorder.h:39
 msgid "Stop recording"
 msgstr ""
 
-#: src/gui/register.cpp:62
+#: src/gui/register.cpp:69
 msgid "Confirm:"
 msgstr "Подтвердите:"
 
-#: src/gui/register.cpp:67
+#: src/gui/register.cpp:100
 msgid "Email:"
 msgstr "Email:"
 
-#: src/gui/register.cpp:170
+#: src/gui/register.cpp:166
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "Имя пользователя должно содержать не менее %d символов."
 
-#: src/gui/register.cpp:178
+#: src/gui/register.cpp:174
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "Имя пользователя не должно содержать более %d символов."
 
-#: src/gui/register.cpp:186
+#: src/gui/register.cpp:182 src/gui/unregisterdialog.cpp:117
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "Пароль должен содержать не менее %d символов."
 
-#: src/gui/register.cpp:194
+#: src/gui/register.cpp:190 src/gui/unregisterdialog.cpp:124
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "Пароль не должен содержать более %d символов."
 
-#: src/gui/register.cpp:201
+#: src/gui/register.cpp:197
 msgid "Passwords do not match."
 msgstr "Пароли не совпадают."
 
-#: src/gui/serverdialog.cpp:74
-msgid "Choose your server"
+#: src/gui/serverdialog.cpp:134
+msgid "Choose Your Server"
 msgstr ""
 
-#: src/gui/serverdialog.cpp:164
+#: src/gui/serverdialog.cpp:141 src/gui/widgets/chattab.cpp:139
+msgid "Server:"
+msgstr "Сервер:"
+
+#: src/gui/serverdialog.cpp:142
+msgid "Port:"
+msgstr "Порт:"
+
+#: src/gui/serverdialog.cpp:143
+#, fuzzy
+msgid "Server type:"
+msgstr "Сервер:"
+
+#: src/gui/serverdialog.cpp:183
+#, fuzzy
+msgid "Connect"
+msgstr "Соединение..."
+
+#: src/gui/serverdialog.cpp:184
+#, fuzzy
+msgid "Custom Server"
+msgstr "Выборочный курсор"
+
+#: src/gui/serverdialog.cpp:262
 msgid "Please type both the address and the port of a server."
 msgstr "Следует указать адрес и порт сервера."
 
-#: src/gui/serverselectdialog.cpp:59
-msgid "Select Server"
-msgstr "Выберите сервер"
-
-#: src/gui/setup.cpp:65 src/gui/windowmenu.cpp:69 src/main.cpp:939
-msgid "Setup"
-msgstr "Настройка"
+#: src/gui/serverdialog.cpp:411
+#, c-format
+msgid "Downloading server list...%2.2f%%"
+msgstr ""
 
-#: src/gui/setup.cpp:73
-msgid "Apply"
-msgstr "Применить"
+#: src/gui/serverdialog.cpp:417
+#, fuzzy
+msgid "Waiting for server..."
+msgstr "Подключение к серверу карт..."
 
-#: src/gui/setup.cpp:73
-msgid "Reset Windows"
-msgstr "Восстановить расположение окон"
+#: src/gui/serverdialog.cpp:421
+msgid "Preparing download"
+msgstr ""
 
-#: src/gui/setup_audio.cpp:41
+#: src/gui/setup_audio.cpp:42
 msgid "Sound"
 msgstr "Звук"
 
-#: src/gui/setup_audio.cpp:45
+#: src/gui/setup_audio.cpp:43
+msgid "Download music"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:47
 msgid "Audio"
 msgstr "Аудио"
 
-#: src/gui/setup_audio.cpp:48
+#: src/gui/setup_audio.cpp:50
 msgid "Sfx volume"
 msgstr "Громкость эффектов"
 
-#: src/gui/setup_audio.cpp:49
+#: src/gui/setup_audio.cpp:51
 msgid "Music volume"
 msgstr "Громкость музыки"
 
-#: src/gui/setup_colors.cpp:45
+#: src/gui/setup_audio.cpp:94
+msgid "Notice"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:94
+msgid "You may have to restart your client if you want to download new music"
+msgstr ""
+
+#: src/gui/setup_audio.cpp:106
+msgid "Sound Engine"
+msgstr ""
+
+#: src/gui/setup_colors.cpp:44
 msgid "This is what the color looks like"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:50
+#: src/gui/setup_colors.cpp:49
 msgid "Colors"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:71
-msgid "Type: "
+#: src/gui/setup_colors.cpp:70
+msgid "Type:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:82 src/gui/setup_colors.cpp:430
+#: src/gui/setup_colors.cpp:81 src/gui/setup_colors.cpp:433
 msgid "Static"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:84 src/gui/setup_colors.cpp:85
-#: src/gui/setup_colors.cpp:431
+#: src/gui/setup_colors.cpp:83 src/gui/setup_colors.cpp:84
+#: src/gui/setup_colors.cpp:434
 msgid "Pulse"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:87
-#: src/gui/setup_colors.cpp:432
+#: src/gui/setup_colors.cpp:85 src/gui/setup_colors.cpp:86
+#: src/gui/setup_colors.cpp:435
 msgid "Rainbow"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
-#: src/gui/setup_colors.cpp:432
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:88
+#: src/gui/setup_colors.cpp:435
 msgid "Spectrum"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:93
-msgid "Delay: "
+#: src/gui/setup_colors.cpp:92
+msgid "Delay:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:108
-msgid "Red: "
+#: src/gui/setup_colors.cpp:107
+msgid "Red:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:123
-msgid "Green: "
+#: src/gui/setup_colors.cpp:122
+msgid "Green:"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:138
-msgid "Blue: "
+#: src/gui/setup_colors.cpp:137
+msgid "Blue:"
 msgstr ""
 
+#: src/gui/setup.cpp:51
+msgid "Apply"
+msgstr "Применить"
+
+#: src/gui/setup.cpp:51
+msgid "Reset Windows"
+msgstr "Восстановить расположение окон"
+
 #: src/gui/setup_joystick.cpp:37 src/gui/setup_joystick.cpp:78
 msgid "Press the button to start calibration"
 msgstr "Нажмите кнопку, чтобы начать калибровку"
@@ -1299,430 +1505,598 @@ msgstr "По умолчанию"
 msgid "Key Conflict(s) Detected."
 msgstr ""
 
-#: src/gui/setup_keyboard.cpp:120
-msgid "Resolve them, or gameplay may result in strange behaviour."
-msgstr ""
-
-#: src/gui/setup_players.cpp:56
+#: src/gui/setup_players.cpp:57
 msgid "Name"
 msgstr "Имя"
 
-#: src/gui/setup_players.cpp:57
+#: src/gui/setup_players.cpp:58
 msgid "Relation"
 msgstr ""
 
-#: src/gui/setup_players.cpp:62
+#: src/gui/setup_players.cpp:63
 msgid "Neutral"
 msgstr "Нейтральное"
 
-#: src/gui/setup_players.cpp:63
+#: src/gui/setup_players.cpp:64
 msgid "Friend"
 msgstr "Друг"
 
-#: src/gui/setup_players.cpp:64
+#: src/gui/setup_players.cpp:65
 msgid "Disregarded"
 msgstr ""
 
-#: src/gui/setup_players.cpp:65
+#: src/gui/setup_players.cpp:66
 msgid "Ignored"
 msgstr ""
 
-#: src/gui/setup_players.cpp:207 src/gui/setup_video.cpp:131
+#: src/gui/setup_players.cpp:208 src/gui/setup_video.cpp:132
 msgid "???"
 msgstr ""
 
-#: src/gui/setup_players.cpp:224
+#: src/gui/setup_players.cpp:226
 msgid "Allow trading"
 msgstr "Разрешить торговлю"
 
-#: src/gui/setup_players.cpp:226
+#: src/gui/setup_players.cpp:228
 msgid "Allow whispers"
 msgstr ""
 
-#: src/gui/setup_players.cpp:230
+#: src/gui/setup_players.cpp:232
 msgid "Put all whispers in tabs"
 msgstr ""
 
-#: src/gui/setup_players.cpp:232
+#: src/gui/setup_players.cpp:234
+msgid "Show gender"
+msgstr ""
+
+#: src/gui/setup_players.cpp:236
 msgid "Players"
 msgstr "Игроки"
 
-#: src/gui/setup_players.cpp:257
+#: src/gui/setup_players.cpp:261
 msgid "When ignoring:"
 msgstr ""
 
-#: src/gui/setup_video.cpp:112
+#: src/gui/setup_video.cpp:113
 msgid "Tiny"
 msgstr ""
 
-#: src/gui/setup_video.cpp:113
+#: src/gui/setup_video.cpp:114
 msgid "Small"
 msgstr ""
 
-#: src/gui/setup_video.cpp:114
+#: src/gui/setup_video.cpp:115
 msgid "Medium"
 msgstr ""
 
-#: src/gui/setup_video.cpp:115
+#: src/gui/setup_video.cpp:116
 msgid "Large"
 msgstr ""
 
-#: src/gui/setup_video.cpp:141
+#: src/gui/setup_video.cpp:142
 msgid "No text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:143
+#: src/gui/setup_video.cpp:144
 msgid "Bubbles, no names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:144
+#: src/gui/setup_video.cpp:145
 msgid "Bubbles with names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:153
+#: src/gui/setup_video.cpp:157
 msgid "off"
 msgstr "выкл"
 
-#: src/gui/setup_video.cpp:154 src/gui/setup_video.cpp:164
+#: src/gui/setup_video.cpp:158 src/gui/setup_video.cpp:171
 msgid "low"
 msgstr "низ."
 
-#: src/gui/setup_video.cpp:155 src/gui/setup_video.cpp:166
+#: src/gui/setup_video.cpp:159 src/gui/setup_video.cpp:173
 msgid "high"
 msgstr "выс."
 
-#: src/gui/setup_video.cpp:165
+#: src/gui/setup_video.cpp:172
 msgid "medium"
 msgstr "средне"
 
-#: src/gui/setup_video.cpp:167
+#: src/gui/setup_video.cpp:174
 msgid "max"
 msgstr "максимальное"
 
-#: src/gui/setup_video.cpp:187
+#: src/gui/setup_video.cpp:196
 msgid "Full screen"
 msgstr "На полный экран"
 
-#: src/gui/setup_video.cpp:188
+#: src/gui/setup_video.cpp:197
 msgid "OpenGL"
 msgstr "OpenGL"
 
-#: src/gui/setup_video.cpp:189
+#: src/gui/setup_video.cpp:198
 msgid "Custom cursor"
 msgstr "Выборочный курсор"
 
-#: src/gui/setup_video.cpp:191
+#: src/gui/setup_video.cpp:200
 msgid "Visible names"
 msgstr ""
 
-#: src/gui/setup_video.cpp:193
+#: src/gui/setup_video.cpp:202
 msgid "Particle effects"
 msgstr ""
 
-#: src/gui/setup_video.cpp:195
-msgid "Show name"
+#: src/gui/setup_video.cpp:204
+msgid "Show own name"
 msgstr ""
 
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:205
 msgid "Show pickup notification"
 msgstr ""
 
-#: src/gui/setup_video.cpp:197
+#. TRANSLATORS: Refers to "Show own name"
+#: src/gui/setup_video.cpp:207
 msgid "in chat"
 msgstr ""
 
-#: src/gui/setup_video.cpp:198
+#. TRANSLATORS: Refers to "Show own name"
+#: src/gui/setup_video.cpp:209
 msgid "as particle"
 msgstr ""
 
-#: src/gui/setup_video.cpp:203
-msgid "FPS Limit:"
+#: src/gui/setup_video.cpp:214
+#, fuzzy
+msgid "FPS limit:"
 msgstr "Ограничение кадр/с:"
 
-#: src/gui/setup_video.cpp:214
+#: src/gui/setup_video.cpp:225
 msgid "Video"
 msgstr "Видео"
 
-#: src/gui/setup_video.cpp:219
+#: src/gui/setup_video.cpp:227
+msgid "Show monster damage"
+msgstr ""
+
+#: src/gui/setup_video.cpp:233
 msgid "Overhead text"
 msgstr ""
 
-#: src/gui/setup_video.cpp:220
+#: src/gui/setup_video.cpp:234
 msgid "Gui opacity"
 msgstr "Прозрачность интерфейса"
 
-#: src/gui/setup_video.cpp:221
+#: src/gui/setup_video.cpp:235
 msgid "Ambient FX"
 msgstr "Эффекты окружающей среды"
 
-#: src/gui/setup_video.cpp:222
-msgid "Particle Detail"
+#: src/gui/setup_video.cpp:236
+msgid "Particle detail"
 msgstr ""
 
-#: src/gui/setup_video.cpp:223
+#: src/gui/setup_video.cpp:237
 msgid "Font size"
 msgstr ""
 
-#: src/gui/setup_video.cpp:356
-msgid "Failed to switch to "
-msgstr ""
-
-#: src/gui/setup_video.cpp:357
-msgid "windowed"
-msgstr ""
+#: src/gui/setup_video.cpp:251 src/gui/setup_video.cpp:454
+#: src/gui/setup_video.cpp:568
+#, fuzzy
+msgid "None"
+msgstr "Нет"
 
-#: src/gui/setup_video.cpp:357
-msgid "fullscreen"
+#: src/gui/setup_video.cpp:381
+msgid ""
+"Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:358
-msgid "mode and restoration of old mode also failed!"
+#: src/gui/setup_video.cpp:387
+msgid ""
+"Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:367
-msgid "Switching to full screen"
+#: src/gui/setup_video.cpp:398
+#, fuzzy
+msgid "Switching to Full Screen"
 msgstr "Переключение в полноэкранный режим"
 
-#: src/gui/setup_video.cpp:368
+#: src/gui/setup_video.cpp:399
 msgid "Restart needed for changes to take effect."
 msgstr "Для вступления в силу выбранных настроек требуется перезагрузка игры."
 
-#: src/gui/setup_video.cpp:380
-msgid "Changing OpenGL"
+#: src/gui/setup_video.cpp:411
+#, fuzzy
+msgid "Changing to OpenGL"
 msgstr "Переключение на OpenGL"
 
-#: src/gui/setup_video.cpp:381
+#: src/gui/setup_video.cpp:412
 msgid "Applying change to OpenGL requires restart."
 msgstr "Переход к OpenGL требует перезагрузки игры."
 
-#: src/gui/setup_video.cpp:442
-msgid "Screen resolution changed"
+#: src/gui/setup_video.cpp:486 src/gui/setup_video.cpp:491
+msgid "Screen Resolution Changed"
 msgstr ""
 
-#: src/gui/setup_video.cpp:443
+#: src/gui/setup_video.cpp:487 src/gui/setup_video.cpp:492
 msgid "Restart your client for the change to take effect."
 msgstr ""
 
-#: src/gui/setup_video.cpp:467
-msgid "Particle effect settings changed."
+#: src/gui/setup_video.cpp:489
+msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
-#: src/gui/setup_video.cpp:468
-msgid "Changes will take effect on map change."
+#: src/gui/setup_video.cpp:522
+msgid "Particle Effect Settings Changed."
 msgstr ""
 
-#: src/gui/skill.cpp:53
-msgid "Mystery Skill"
+#: src/gui/setup_video.cpp:523
+msgid "Changes will take effect on map change."
 msgstr ""
 
-#: src/gui/skill.cpp:129 src/gui/skilldialog.cpp:99 src/gui/windowmenu.cpp:62
+#: src/gui/skilldialog.cpp:197 src/gui/windowmenu.cpp:58
 msgid "Skills"
 msgstr "Умения"
 
-#: src/gui/skill.cpp:148 src/gui/skill.cpp:200
+#: src/gui/skilldialog.cpp:208
+msgid "Up"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:262
 #, c-format
-msgid "Skill points: %d"
+msgid "Skill points available: %d"
 msgstr ""
 
-#: src/gui/skill.cpp:149
-msgid "Up"
+#: src/gui/skilldialog.cpp:314
+#, c-format
+msgid "Skill Set %d"
+msgstr ""
+
+#: src/gui/skilldialog.cpp:323
+#, fuzzy, c-format
+msgid "Skill %d"
+msgstr "Умения"
+
+#: src/gui/skilldialog.cpp:405
+#, fuzzy, c-format
+msgid "Lvl: %d (%+d)"
+msgstr "Уровень: %d"
+
+#: src/gui/skilldialog.cpp:416
+#, fuzzy, c-format
+msgid "Lvl: %d"
+msgstr "Уровень: %d"
+
+#: src/gui/socialwindow.cpp:117
+#, c-format
+msgid "Invited user %s to guild %s."
 msgstr ""
 
-#: src/gui/skilldialog.cpp:113
-msgid "Weapons"
+#: src/gui/socialwindow.cpp:126
+#, c-format
+msgid "Guild %s quit requested."
 msgstr ""
 
-#: src/gui/skilldialog.cpp:121
-msgid "Crafts"
+#: src/gui/socialwindow.cpp:136
+msgid "Member Invite to Guild"
 msgstr ""
 
-#: src/gui/status.cpp:56 src/gui/status.cpp:177
+#: src/gui/socialwindow.cpp:137
 #, c-format
-msgid "Job: %d"
+msgid "Who would you like to invite to guild %s?"
 msgstr ""
 
-#: src/gui/status.cpp:60
-msgid "HP:"
+#: src/gui/socialwindow.cpp:146
+msgid "Leave Guild?"
 msgstr ""
 
-#: src/gui/status.cpp:63
-msgid "Exp:"
+#: src/gui/socialwindow.cpp:147
+#, fuzzy, c-format
+msgid "Are you sure you want to leave guild %s?"
+msgstr "Вы уверены, что хотите удалить этого персонажа?"
+
+#: src/gui/socialwindow.cpp:182
+#, fuzzy, c-format
+msgid "Invited user %s to party."
+msgstr "Пригласить пользователя на канал"
+
+#: src/gui/socialwindow.cpp:189
+#, c-format
+msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/status.cpp:66
-msgid "MP:"
+#: src/gui/socialwindow.cpp:199
+#, fuzzy
+msgid "Member Invite to Party"
+msgstr "Пригласить пользователя на канал"
+
+#: src/gui/socialwindow.cpp:200
+#, c-format
+msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/status.cpp:69
-msgid "Job:"
+#: src/gui/socialwindow.cpp:209
+msgid "Leave Party?"
 msgstr ""
 
-#: src/gui/status.cpp:77
-msgid "Stats"
-msgstr "Статистика"
+#: src/gui/socialwindow.cpp:210
+#, fuzzy, c-format
+msgid "Are you sure you want to leave party %s?"
+msgstr "Вы уверены, что хотите удалить этого персонажа?"
 
-#: src/gui/status.cpp:78
-msgid "Total"
-msgstr "Всего"
+#: src/gui/socialwindow.cpp:239
+msgid "Create Guild"
+msgstr ""
 
-#: src/gui/status.cpp:79
-msgid "Cost"
-msgstr "Стоимость"
+#: src/gui/socialwindow.cpp:240 src/gui/socialwindow.cpp:564
+#, fuzzy
+msgid "Create Party"
+msgstr "Создать персонажа"
 
-#: src/gui/status.cpp:83
-msgid "Attack:"
-msgstr "Атака:"
+#: src/gui/socialwindow.cpp:279 src/gui/windowmenu.cpp:60
+msgid "Social"
+msgstr ""
 
-#: src/gui/status.cpp:84
-msgid "Defense:"
-msgstr "Защита:"
+#: src/gui/socialwindow.cpp:297
+msgid "Invite"
+msgstr ""
 
-#: src/gui/status.cpp:85
-msgid "M.Attack:"
+#: src/gui/socialwindow.cpp:298
+msgid "Leave"
 msgstr ""
 
-#: src/gui/status.cpp:86
-msgid "M.Defense:"
+#: src/gui/socialwindow.cpp:394
+#, c-format
+msgid "Accepted party invite from %s."
 msgstr ""
 
-#: src/gui/status.cpp:88
-#, no-c-format
-msgid "% Accuracy:"
+#: src/gui/socialwindow.cpp:400
+#, c-format
+msgid "Rejected party invite from %s."
 msgstr ""
 
-#: src/gui/status.cpp:90
-#, no-c-format
-msgid "% Evade:"
+#: src/gui/socialwindow.cpp:413
+#, c-format
+msgid "Accepted guild invite from %s."
 msgstr ""
 
-#: src/gui/status.cpp:92
-#, no-c-format
-msgid "% Reflex:"
+#: src/gui/socialwindow.cpp:419
+#, c-format
+msgid "Rejected guild invite from %s."
 msgstr ""
 
-#: src/gui/status.cpp:198
-msgid "Strength"
-msgstr "Сила"
+#: src/gui/socialwindow.cpp:463
+#, c-format
+msgid "Creating guild called %s."
+msgstr ""
 
-#: src/gui/status.cpp:199
-msgid "Agility"
+#: src/gui/socialwindow.cpp:477
+#, c-format
+msgid "Creating party called %s."
 msgstr ""
 
-#: src/gui/status.cpp:200
-msgid "Vitality"
+#: src/gui/socialwindow.cpp:484
+msgid "Guild Name"
 msgstr ""
 
-#: src/gui/status.cpp:201
-msgid "Intelligence"
-msgstr "Интеллект"
+#: src/gui/socialwindow.cpp:485
+msgid "Choose your guild's name."
+msgstr ""
 
-#: src/gui/status.cpp:202
-msgid "Dexterity"
-msgstr "Ловкость"
+#: src/gui/socialwindow.cpp:497
+msgid "Received guild request, but one already exists."
+msgstr ""
 
-#: src/gui/status.cpp:203
-msgid "Luck"
-msgstr "Удача"
+#: src/gui/socialwindow.cpp:502
+#, c-format
+msgid "%s has invited you to join the guild %s."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:507
+msgid "Accept Guild Invite"
+msgstr ""
 
-#: src/gui/status.cpp:221
+#: src/gui/socialwindow.cpp:519
+msgid "Received party request, but one already exists."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:529
+msgid "You have been invited you to join a party."
+msgstr ""
+
+#: src/gui/socialwindow.cpp:533
 #, c-format
-msgid "Remaining Status Points: %d"
+msgid "You have been invited to join the %s party."
 msgstr ""
 
-#: src/gui/status.cpp:384
-msgid "Max level"
+#: src/gui/socialwindow.cpp:541
+#, c-format
+msgid "%s has invited you to join their party."
 msgstr ""
 
-#: src/gui/storagewindow.cpp:54
-msgid "Storage"
+#: src/gui/socialwindow.cpp:546
+#, c-format
+msgid "%s has invited you to join the %s party."
 msgstr ""
 
-#: src/gui/storagewindow.cpp:65
-msgid "Store"
+#: src/gui/socialwindow.cpp:554
+msgid "Accept Party Invite"
 msgstr ""
 
-#: src/gui/storagewindow.cpp:66
-msgid "Retrieve"
+#: src/gui/socialwindow.cpp:565
+msgid "Cannot create party. You are already in a party"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:570
+msgid "Party Name"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:571
+msgid "Choose your party's name."
+msgstr ""
+
+#: src/gui/specialswindow.cpp:85 src/gui/windowmenu.cpp:59
+msgid "Specials"
+msgstr ""
+
+#: src/gui/specialswindow.cpp:174
+#, c-format
+msgid "Specials Set %d"
+msgstr ""
+
+#: src/gui/specialswindow.cpp:191
+#, c-format
+msgid "Special %d"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:99 src/gui/statuswindow.cpp:247
+#, c-format
+msgid "Level: %d"
+msgstr "Уровень: %d"
+
+#: src/gui/statuswindow.cpp:100 src/gui/statuswindow.cpp:211
+#, c-format
+msgid "Money: %s"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:102
+msgid "HP:"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:107
+msgid "Exp:"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:112
+msgid "MP:"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:132 src/gui/statuswindow.cpp:219
+#, c-format
+msgid "Job: %d"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:133
+msgid "Job:"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:194
+msgid "HP"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:200
+msgid "MP"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:206
+msgid "Exp"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:215
+#, fuzzy
+msgid "Money"
+msgstr "Деньги: %d"
+
+#: src/gui/statuswindow.cpp:225
+msgid "Job"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:229
+#, fuzzy, c-format
+msgid "Character points: %d"
+msgstr "Данные персонажа в порядке"
+
+#: src/gui/statuswindow.cpp:235
+#, c-format
+msgid "Correction points: %d"
+msgstr ""
+
+#: src/gui/statuswindow.cpp:251
+#, fuzzy
+msgid "Level"
+msgstr "Уровень: %d"
+
+#: src/gui/storagewindow.cpp:58
+msgid "Storage"
 msgstr ""
 
-#: src/gui/trade.cpp:51
+#: src/gui/trade.cpp:52
 msgid "Propose trade"
 msgstr "Предложить торговлю"
 
-#: src/gui/trade.cpp:52
+#: src/gui/trade.cpp:53
 msgid "Confirmed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:53
+#: src/gui/trade.cpp:54
 msgid "Agree trade"
 msgstr ""
 
-#: src/gui/trade.cpp:54
+#: src/gui/trade.cpp:55
 msgid "Agreed. Waiting..."
 msgstr ""
 
-#: src/gui/trade.cpp:57
+#: src/gui/trade.cpp:58
 msgid "Trade: You"
 msgstr ""
 
-#: src/gui/trade.cpp:70 src/gui/trade.cpp:71
+#: src/gui/trade.cpp:74 src/gui/trade.cpp:75
 msgid "Trade"
 msgstr ""
 
-#: src/gui/trade.cpp:73
+#: src/gui/trade.cpp:77
 msgid "Add"
 msgstr "Добавить"
 
-#: src/gui/trade.cpp:95 src/gui/trade.cpp:131
-#, c-format
-msgid "You get %s."
-msgstr ""
+#: src/gui/trade.cpp:99 src/gui/trade.cpp:135
+#, fuzzy, c-format
+msgid "You get %s"
+msgstr "Вы отдаете:"
 
-#: src/gui/trade.cpp:96
+#: src/gui/trade.cpp:100
 msgid "You give:"
 msgstr "Вы отдаете:"
 
-#: src/gui/trade.cpp:100
+#: src/gui/trade.cpp:104
 msgid "Change"
 msgstr "Сменить"
 
-#: src/gui/trade.cpp:268
+#: src/gui/trade.cpp:275
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr ""
 
-#: src/gui/trade.cpp:311
+#: src/gui/trade.cpp:318
 msgid "You don't have enough money."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:91
+#: src/gui/unregisterdialog.cpp:51
+#, c-format
+msgid "Name: %s"
+msgstr "Имя: %s"
+
+#: src/gui/updatewindow.cpp:124
 msgid "Updating..."
 msgstr "Обновление..."
 
-#: src/gui/updatewindow.cpp:113
-msgid "Play"
-msgstr ""
-
-#: src/gui/updatewindow.cpp:325
-msgid "curl error "
-msgstr ""
+#: src/gui/updatewindow.cpp:142
+msgid "Connecting..."
+msgstr "Соединение..."
 
-#: src/gui/updatewindow.cpp:326
-msgid " host: "
+#: src/gui/updatewindow.cpp:145
+msgid "Play"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:449
+#: src/gui/updatewindow.cpp:405
 msgid "##1  The update process is incomplete."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:450
+#. TRANSLATORS: Continues "you try again later.".
+#: src/gui/updatewindow.cpp:407
 msgid "##1  It is strongly recommended that"
 msgstr ""
 
-#: src/gui/updatewindow.cpp:451
-msgid "##1  you try again later"
+#. TRANSLATORS: Begins "It is strongly recommended that".
+#: src/gui/updatewindow.cpp:409
+msgid "##1  you try again later."
 msgstr ""
 
-#: src/gui/updatewindow.cpp:518
+#: src/gui/updatewindow.cpp:501
 msgid "Completed"
 msgstr "Завершено"
 
@@ -1774,1208 +2148,1447 @@ msgstr ""
 msgid "If you're the last person in the channel, it will be deleted."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:79
+#: src/gui/widgets/channeltab.cpp:80
 msgid "Command: /op <nick>"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:80
+#: src/gui/widgets/channeltab.cpp:81
 msgid "This command makes <nick> a channel operator."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:83
+#: src/gui/widgets/channeltab.cpp:84
 msgid "Channel operators can kick and op other users from the channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:88
+#: src/gui/widgets/channeltab.cpp:89
 msgid "Command: /kick <nick>"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:89
+#: src/gui/widgets/channeltab.cpp:90
 msgid "This command makes <nick> leave the channel."
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:118
+#: src/gui/widgets/channeltab.cpp:119
 msgid "Need a user to op!"
 msgstr ""
 
-#: src/gui/widgets/channeltab.cpp:125
+#: src/gui/widgets/channeltab.cpp:126
 msgid "Need a user to kick!"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:114
+#: src/gui/widgets/chattab.cpp:118
 msgid "Global announcement:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:120
+#: src/gui/widgets/chattab.cpp:124
 #, c-format
 msgid "Global announcement from %s:"
 msgstr ""
 
-#: src/gui/widgets/chattab.cpp:146
+#: src/gui/widgets/chattab.cpp:150
 #, c-format
-msgid "%s whispers: "
+msgid "%s whispers: %s"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:49
+#: src/gui/widgets/whispertab.cpp:51
 msgid "Cannot send empty chat!"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:68
+#: src/gui/widgets/whispertab.cpp:70
+msgid "/ignore > Ignore the other player"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:71
+msgid "/unignore > Stop ignoring the other player"
+msgstr ""
+
+#: src/gui/widgets/whispertab.cpp:72
 msgid "/close > Close the whisper tab"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:78
+#: src/gui/widgets/whispertab.cpp:82
 msgid "Command: /close"
 msgstr ""
 
-#: src/gui/widgets/whispertab.cpp:79
+#: src/gui/widgets/whispertab.cpp:83
 msgid "This command closes the current whisper tab."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:59
-msgid "Status"
-msgstr "Состояние"
+#: src/gui/widgets/whispertab.cpp:87
+#, fuzzy
+msgid "Command: /ignore"
+msgstr "Команда: /where"
 
-#: src/gui/windowmenu.cpp:65
-msgid "Guilds"
-msgstr ""
+#: src/gui/widgets/whispertab.cpp:88
+#, fuzzy
+msgid "This command ignores the other player regardless of current relations."
+msgstr "Эта команда показывает имя текущей карты."
 
-#: src/gui/windowmenu.cpp:66
-msgid "Buddys"
+#: src/gui/widgets/whispertab.cpp:94
+msgid "This command stops ignoring the other player if they are being ignored."
 msgstr ""
 
-#: src/gui/windowmenu.cpp:68
+#: src/gui/windowmenu.cpp:55
+msgid "Status"
+msgstr "Состояние"
+
+#: src/gui/windowmenu.cpp:61
 msgid "Shortcut"
 msgstr "Клавиша"
 
-#: src/keyboardconfig.cpp:41
+#: src/gui/worldselectdialog.cpp:71
+#, fuzzy
+msgid "Select World"
+msgstr "Выберите сервер"
+
+#: src/gui/worldselectdialog.cpp:76
+#, fuzzy
+msgid "Change Login"
+msgstr "Сменить"
+
+#: src/gui/worldselectdialog.cpp:77
+msgid "Choose World"
+msgstr ""
+
+#: src/keyboardconfig.cpp:40
 msgid "Move Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:42
+#: src/keyboardconfig.cpp:41
 msgid "Move Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:43
+#: src/keyboardconfig.cpp:42
 msgid "Move Left"
 msgstr ""
 
-#: src/keyboardconfig.cpp:44
+#: src/keyboardconfig.cpp:43
 msgid "Move Right"
 msgstr ""
 
-#: src/keyboardconfig.cpp:45
+#: src/keyboardconfig.cpp:44 src/net/ea/generalhandler.cpp:223
 msgid "Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:46
+#: src/keyboardconfig.cpp:45
 msgid "Target & Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:47
+#: src/keyboardconfig.cpp:46
 msgid "Smilie"
 msgstr ""
 
-#: src/keyboardconfig.cpp:48
+#: src/keyboardconfig.cpp:47
 msgid "Talk"
 msgstr ""
 
-#: src/keyboardconfig.cpp:49
+#: src/keyboardconfig.cpp:48
 msgid "Stop Attack"
 msgstr ""
 
-#: src/keyboardconfig.cpp:50
-msgid "Target Closest"
+#: src/keyboardconfig.cpp:49
+msgid "Target Monster"
 msgstr ""
 
-#: src/keyboardconfig.cpp:51
+#: src/keyboardconfig.cpp:50
 msgid "Target NPC"
 msgstr ""
 
-#: src/keyboardconfig.cpp:52
+#: src/keyboardconfig.cpp:51
 msgid "Target Player"
 msgstr ""
 
-#: src/keyboardconfig.cpp:53
+#: src/keyboardconfig.cpp:52
 msgid "Pickup"
 msgstr ""
 
-#: src/keyboardconfig.cpp:54
+#: src/keyboardconfig.cpp:53
 msgid "Hide Windows"
 msgstr ""
 
-#: src/keyboardconfig.cpp:55
+#: src/keyboardconfig.cpp:54
 msgid "Sit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:56
+#: src/keyboardconfig.cpp:55
 msgid "Screenshot"
 msgstr ""
 
-#: src/keyboardconfig.cpp:57
+#: src/keyboardconfig.cpp:56
 msgid "Enable/Disable Trading"
 msgstr ""
 
-#: src/keyboardconfig.cpp:58
+#: src/keyboardconfig.cpp:57
 msgid "Find Path to Mouse"
 msgstr ""
 
-#: src/keyboardconfig.cpp:59 src/keyboardconfig.cpp:60
-#: src/keyboardconfig.cpp:61 src/keyboardconfig.cpp:62
-#: src/keyboardconfig.cpp:63 src/keyboardconfig.cpp:64
-#: src/keyboardconfig.cpp:65 src/keyboardconfig.cpp:66
-#: src/keyboardconfig.cpp:67 src/keyboardconfig.cpp:68
-#: src/keyboardconfig.cpp:69 src/keyboardconfig.cpp:70
+#: src/keyboardconfig.cpp:58 src/keyboardconfig.cpp:59
+#: src/keyboardconfig.cpp:60 src/keyboardconfig.cpp:61
+#: src/keyboardconfig.cpp:62 src/keyboardconfig.cpp:63
+#: src/keyboardconfig.cpp:64 src/keyboardconfig.cpp:65
+#: src/keyboardconfig.cpp:66 src/keyboardconfig.cpp:67
+#: src/keyboardconfig.cpp:68 src/keyboardconfig.cpp:69
 #, c-format
 msgid "Item Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:71
+#: src/keyboardconfig.cpp:70
 msgid "Help Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:72
+#: src/keyboardconfig.cpp:71
 msgid "Status Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:73
+#: src/keyboardconfig.cpp:72
 msgid "Inventory Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:74
+#: src/keyboardconfig.cpp:73
 #, fuzzy
 msgid "Equipment Window"
 msgstr "Снаряжение"
 
-#: src/keyboardconfig.cpp:75
+#: src/keyboardconfig.cpp:74
 msgid "Skill Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:76
+#: src/keyboardconfig.cpp:75
 msgid "Minimap Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:77
+#: src/keyboardconfig.cpp:76
 msgid "Chat Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:78
+#: src/keyboardconfig.cpp:77
 msgid "Item Shortcut Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:79
+#: src/keyboardconfig.cpp:78
 msgid "Setup Window"
 msgstr ""
 
-#: src/keyboardconfig.cpp:80
+#: src/keyboardconfig.cpp:79
 msgid "Debug Window"
 msgstr ""
 
+#: src/keyboardconfig.cpp:80
+msgid "Social Window"
+msgstr ""
+
 #: src/keyboardconfig.cpp:81
-msgid "Party Window"
+msgid "Emote Shortcut Window"
 msgstr ""
 
 #: src/keyboardconfig.cpp:82
-msgid "Emote Shortcut Window"
+#, fuzzy
+msgid "Outfits Window"
+msgstr "Снаряжение"
+
+#: src/keyboardconfig.cpp:83
+msgid "Wear Outfit"
+msgstr ""
+
+#: src/keyboardconfig.cpp:84
+msgid "Copy Outfit"
 msgstr ""
 
-#: src/keyboardconfig.cpp:83 src/keyboardconfig.cpp:84
 #: src/keyboardconfig.cpp:85 src/keyboardconfig.cpp:86
 #: src/keyboardconfig.cpp:87 src/keyboardconfig.cpp:88
 #: src/keyboardconfig.cpp:89 src/keyboardconfig.cpp:90
 #: src/keyboardconfig.cpp:91 src/keyboardconfig.cpp:92
 #: src/keyboardconfig.cpp:93 src/keyboardconfig.cpp:94
+#: src/keyboardconfig.cpp:95 src/keyboardconfig.cpp:96
 #, c-format
 msgid "Emote Shortcut %d"
 msgstr ""
 
-#: src/keyboardconfig.cpp:95
+#: src/keyboardconfig.cpp:97
 msgid "Toggle Chat"
 msgstr ""
 
-#: src/keyboardconfig.cpp:96
+#: src/keyboardconfig.cpp:98
 msgid "Scroll Chat Up"
 msgstr ""
 
-#: src/keyboardconfig.cpp:97
+#: src/keyboardconfig.cpp:99
 msgid "Scroll Chat Down"
 msgstr ""
 
-#: src/keyboardconfig.cpp:98
+#: src/keyboardconfig.cpp:100
 msgid "Previous Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:99
+#: src/keyboardconfig.cpp:101
 msgid "Next Chat Tab"
 msgstr ""
 
-#: src/keyboardconfig.cpp:100
+#: src/keyboardconfig.cpp:102
 msgid "Select OK"
 msgstr ""
 
-#: src/keyboardconfig.cpp:102
+#: src/keyboardconfig.cpp:104
 msgid "Ignore input 1"
 msgstr ""
 
-#: src/keyboardconfig.cpp:103
+#: src/keyboardconfig.cpp:105
 msgid "Ignore input 2"
 msgstr ""
 
-#: src/localplayer.cpp:760
-msgid "Unarmed"
-msgstr ""
-
-#: src/localplayer.cpp:761
-msgid "Knife"
-msgstr ""
-
-#: src/localplayer.cpp:762
-msgid "Sword"
-msgstr ""
-
-#: src/localplayer.cpp:763
-msgid "Polearm"
-msgstr ""
-
-#: src/localplayer.cpp:764
-msgid "Staff"
-msgstr ""
-
-#: src/localplayer.cpp:765
-msgid "Whip"
-msgstr ""
-
-#: src/localplayer.cpp:766
-msgid "Bow"
-msgstr ""
-
-#: src/localplayer.cpp:767
-msgid "Shooting"
-msgstr ""
-
-#: src/localplayer.cpp:768
-msgid "Mace"
-msgstr ""
-
-#: src/localplayer.cpp:769
-msgid "Axe"
-msgstr ""
-
-#: src/localplayer.cpp:770
-msgid "Thrown"
-msgstr ""
-
-#: src/localplayer.cpp:772
-msgid "Craft"
-msgstr ""
-
-#: src/localplayer.cpp:773
-msgid "Unknown Skill"
-msgstr ""
-
-#: src/main.cpp:263
-msgid "Invalid update host: "
-msgstr ""
-
-#: src/main.cpp:296 src/main.cpp:302
-msgid "Error creating updates directory!"
-msgstr ""
-
-#: src/main.cpp:339
-msgid " can't be created, but it doesn't exist! Exiting."
+#: src/keyboardconfig.cpp:178
+#, c-format
+msgid ""
+"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
+"strange behaviour."
 msgstr ""
 
-#: src/main.cpp:492
-msgid "Couldn't set "
+#: src/localplayer.cpp:913
+msgid "Unable to pick up item."
 msgstr ""
 
-#: src/main.cpp:493
-msgid " video mode: "
-msgstr ""
+#. TRANSLATORS: This sentence may be translated differently
+#. for different grammatical numbers (singular, plural, ...)
+#: src/localplayer.cpp:922
+#, c-format
+msgid "You picked up %d [@@%d|%s@@]."
+msgid_plural "You picked up %d [@@%d|%s@@]."
+msgstr[0] ""
+msgstr[1] ""
 
-#: src/main.cpp:575
-msgid "mana"
+#: src/main.cpp:43
+msgid "mana [options] [mana-file]"
 msgstr ""
 
-#: src/main.cpp:576
+#: src/main.cpp:44
 msgid "Options:"
 msgstr ""
 
-#: src/main.cpp:577
-msgid "  -C --config-file : Configuration file to use"
+#: src/main.cpp:45
+msgid "  -v --version        : Display the version"
 msgstr ""
 
-#: src/main.cpp:578
-msgid "  -d --data        : Directory to load game data from"
-msgstr ""
+#: src/main.cpp:46
+#, fuzzy
+msgid "  -h --help           : Display this help"
+msgstr "/help > Отображает этото текст"
 
-#: src/main.cpp:579
-msgid "  -D --default     : Choose default character server and character"
+#: src/main.cpp:47
+msgid "  -C --config-dir     : Configuration directory to use"
 msgstr ""
 
-#: src/main.cpp:581
-msgid "  -h --help        : Display this help"
+#: src/main.cpp:48
+msgid "  -U --username       : Login with this username"
 msgstr ""
 
-#: src/main.cpp:582
-msgid "  -S --home-dir    : Directory to use as home directory"
+#: src/main.cpp:49
+msgid "  -P --password       : Login with this password"
 msgstr ""
 
-#: src/main.cpp:583
-msgid "  -H --update-host : Use this update host"
+#: src/main.cpp:50
+msgid "  -c --character      : Login with this character"
 msgstr ""
 
-#: src/main.cpp:584
-msgid "  -P --password    : Login with this password"
+#: src/main.cpp:51
+msgid "  -s --server         : Login server name or IP"
 msgstr ""
 
-#: src/main.cpp:585
-msgid "  -c --character   : Login with this character"
+#: src/main.cpp:52
+msgid "  -p --port           : Login server port"
 msgstr ""
 
-#: src/main.cpp:586
-msgid "  -p --port        : Login server port"
+#: src/main.cpp:53
+msgid "     --update-host    : Use this update host"
 msgstr ""
 
-#: src/main.cpp:587
-msgid "  -s --server      : Login server name or IP"
+#: src/main.cpp:54
+msgid "  -D --default        : Choose default character server and character"
 msgstr ""
 
-#: src/main.cpp:588
-msgid "  -u --skip-update : Skip the update downloads"
+#: src/main.cpp:56
+msgid "  -u --skip-update    : Skip the update downloads"
 msgstr ""
 
-#: src/main.cpp:589
-msgid "  -U --username    : Login with this username"
+#: src/main.cpp:57
+msgid "  -d --data           : Directory to load game data from"
 msgstr ""
 
-#: src/main.cpp:591
-msgid "  -O --no-opengl   : Disable OpenGL for this session"
+#: src/main.cpp:58
+msgid "  -L --localdata-dir  : Directory to use as local data directory"
 msgstr ""
 
-#: src/main.cpp:593
-msgid "  -v --version     : Display the version"
+#: src/main.cpp:59
+msgid "     --screenshot-dir : Directory to store screenshots"
 msgstr ""
 
-#: src/main.cpp:1528
-msgid "Connecting to map server..."
-msgstr "Подключение к серверу карт..."
-
-#: src/main.cpp:1536
-msgid "Connecting to character server..."
+#: src/main.cpp:61
+msgid "     --no-opengl      : Disable OpenGL for this session"
 msgstr ""
 
-#: src/main.cpp:1544
-msgid "Connecting to account server..."
-msgstr "Соединение с сервером авторизации..."
-
-#: src/net/ea/adminhandler.cpp:66
+#: src/net/ea/adminhandler.cpp:63
 msgid "Kick failed!"
 msgstr ""
 
-#: src/net/ea/adminhandler.cpp:68
+#: src/net/ea/adminhandler.cpp:65
 msgid "Kick succeeded!"
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:111
+#: src/net/ea/buysellhandler.cpp:110
 msgid "Nothing to sell."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:119
+#: src/net/ea/buysellhandler.cpp:117
 msgid "Thanks for buying."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:126
+#: src/net/ea/buysellhandler.cpp:124
 msgid "Unable to buy."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:132
+#: src/net/ea/buysellhandler.cpp:130
 msgid "Thanks for selling."
 msgstr ""
 
-#: src/net/ea/buysellhandler.cpp:134
+#: src/net/ea/buysellhandler.cpp:132
 msgid "Unable to sell."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:95
-msgid "Access denied"
+#: src/net/ea/charserverhandler.cpp:103
+msgid "Access denied."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:98
-msgid "Cannot use this ID"
+#: src/net/ea/charserverhandler.cpp:106
+msgid "Cannot use this ID."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:101
-msgid "Unknown failure to select character"
+#: src/net/ea/charserverhandler.cpp:109
+msgid "Unknown failure to select character."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:123
+#: src/net/ea/charserverhandler.cpp:135
 msgid "Failed to create character. Most likely the name is already taken."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:135
+#: src/net/ea/charserverhandler.cpp:147 src/net/manaserv/charhandler.cpp:187
 msgid "Info"
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:135
+#: src/net/ea/charserverhandler.cpp:147
 #, fuzzy
 msgid "Character deleted."
 msgstr "Подтвердите удаление героя"
 
-#: src/net/ea/charserverhandler.cpp:140
+#: src/net/ea/charserverhandler.cpp:152
 msgid "Failed to delete character."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:224
-#: src/net/manaserv/charserverhandler.cpp:253
+#: src/net/ea/charserverhandler.cpp:237 src/net/manaserv/charhandler.cpp:263
 msgid "Strength:"
 msgstr "Сила:"
 
-#: src/net/ea/charserverhandler.cpp:225
-#: src/net/manaserv/charserverhandler.cpp:254
+#: src/net/ea/charserverhandler.cpp:238 src/net/manaserv/charhandler.cpp:264
 msgid "Agility:"
 msgstr "Выносливость:"
 
-#: src/net/ea/charserverhandler.cpp:226
-#: src/net/manaserv/charserverhandler.cpp:256
+#: src/net/ea/charserverhandler.cpp:239 src/net/manaserv/charhandler.cpp:266
 msgid "Vitality:"
 msgstr "Живучесть:"
 
-#: src/net/ea/charserverhandler.cpp:227
-#: src/net/manaserv/charserverhandler.cpp:257
+#: src/net/ea/charserverhandler.cpp:240 src/net/manaserv/charhandler.cpp:267
 msgid "Intelligence:"
 msgstr "Интеллект:"
 
-#: src/net/ea/charserverhandler.cpp:228
-#: src/net/manaserv/charserverhandler.cpp:255
+#: src/net/ea/charserverhandler.cpp:241 src/net/manaserv/charhandler.cpp:265
 msgid "Dexterity:"
 msgstr "Ловкость:"
 
-#: src/net/ea/charserverhandler.cpp:229
+#: src/net/ea/charserverhandler.cpp:242
 msgid "Luck:"
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:78
+#: src/net/ea/chathandler.cpp:80
 msgid "Whisper could not be sent, user is offline."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:82
+#: src/net/ea/chathandler.cpp:84
 msgid "Whisper could not be sent, ignored by user."
 msgstr ""
 
-#: src/net/ea/chathandler.cpp:202 src/net/ea/chathandler.cpp:208
-#: src/net/ea/chathandler.cpp:213 src/net/ea/chathandler.cpp:218
-#: src/net/ea/chathandler.cpp:223 src/net/ea/chathandler.cpp:228
-#: src/net/ea/chathandler.cpp:233 src/net/ea/chathandler.cpp:238
+#: src/net/ea/chathandler.cpp:171
+#, fuzzy
+msgid "MVP player."
+msgstr "Игроки"
+
+#: src/net/ea/chathandler.cpp:204 src/net/ea/chathandler.cpp:210
+#: src/net/ea/chathandler.cpp:215 src/net/ea/chathandler.cpp:220
+#: src/net/ea/chathandler.cpp:225 src/net/ea/chathandler.cpp:230
+#: src/net/ea/chathandler.cpp:235 src/net/ea/chathandler.cpp:240
 msgid "Channels are not supported!"
 msgstr ""
 
-#: src/net/ea/equipmenthandler.cpp:111
-msgid "Unable to equip."
+#: src/net/ea/gamehandler.cpp:86
+#, c-format
+msgid "Online users: %d"
 msgstr ""
 
-#: src/net/ea/equipmenthandler.cpp:152
-msgid "Unable to unequip."
+#: src/net/ea/gamehandler.cpp:100
+#, fuzzy
+msgid "Game"
+msgstr "Имя"
+
+#: src/net/ea/gamehandler.cpp:100
+msgid "Request to quit denied!"
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:91 src/net/manaserv/generalhandler.cpp:82
+#: src/net/ea/generalhandler.cpp:102 src/net/manaserv/generalhandler.cpp:95
 #, fuzzy, c-format
 msgid "Strength %+d"
 msgstr "Сила"
 
-#: src/net/ea/generalhandler.cpp:92 src/net/manaserv/generalhandler.cpp:83
+#: src/net/ea/generalhandler.cpp:103 src/net/manaserv/generalhandler.cpp:96
 #, fuzzy, c-format
 msgid "Agility %+d"
 msgstr "Выносливость:"
 
-#: src/net/ea/generalhandler.cpp:93 src/net/manaserv/generalhandler.cpp:85
+#: src/net/ea/generalhandler.cpp:104 src/net/manaserv/generalhandler.cpp:98
 #, fuzzy, c-format
 msgid "Vitality %+d"
 msgstr "Живучесть:"
 
-#: src/net/ea/generalhandler.cpp:94 src/net/manaserv/generalhandler.cpp:86
+#: src/net/ea/generalhandler.cpp:105 src/net/manaserv/generalhandler.cpp:99
 #, fuzzy, c-format
 msgid "Intelligence %+d"
 msgstr "Интеллект"
 
-#: src/net/ea/generalhandler.cpp:95 src/net/manaserv/generalhandler.cpp:84
+#: src/net/ea/generalhandler.cpp:106 src/net/manaserv/generalhandler.cpp:97
 #, fuzzy, c-format
 msgid "Dexterity %+d"
 msgstr "Ловкость"
 
-#: src/net/ea/generalhandler.cpp:96
+#: src/net/ea/generalhandler.cpp:107
 #, fuzzy, c-format
 msgid "Luck %+d"
 msgstr "Удача"
 
-#: src/net/ea/generalhandler.cpp:118
-msgid "Authentication failed"
+#: src/net/ea/generalhandler.cpp:130
+msgid "Authentication failed."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:121
-msgid "No servers available"
+#: src/net/ea/generalhandler.cpp:133
+msgid "No servers available."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:125
-msgid "Someone else is trying to use this account"
+#: src/net/ea/generalhandler.cpp:137
+msgid "Someone else is trying to use this account."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:128
-msgid "This account is already logged in"
+#: src/net/ea/generalhandler.cpp:140
+msgid "This account is already logged in."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:131
-msgid "Speed hack detected"
+#: src/net/ea/generalhandler.cpp:143
+msgid "Speed hack detected."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:134
-msgid "Duplicated login"
+#: src/net/ea/generalhandler.cpp:146
+msgid "Duplicated login."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:137
-msgid "Unknown connection error"
+#: src/net/ea/generalhandler.cpp:149
+msgid "Unknown connection error."
 msgstr ""
 
-#: src/net/ea/generalhandler.cpp:194
+#: src/net/ea/generalhandler.cpp:205
 msgid "Got disconnected from server!"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:55
+#: src/net/ea/generalhandler.cpp:216 src/net/manaserv/generalhandler.cpp:166
+msgid "Strength"
+msgstr "Сила"
+
+#: src/net/ea/generalhandler.cpp:217 src/net/manaserv/generalhandler.cpp:167
+msgid "Agility"
+msgstr ""
+
+#: src/net/ea/generalhandler.cpp:218 src/net/manaserv/generalhandler.cpp:169
+msgid "Vitality"
+msgstr ""
+
+#: src/net/ea/generalhandler.cpp:219 src/net/manaserv/generalhandler.cpp:170
+msgid "Intelligence"
+msgstr "Интеллект"
+
+#: src/net/ea/generalhandler.cpp:220 src/net/manaserv/generalhandler.cpp:168
+msgid "Dexterity"
+msgstr "Ловкость"
+
+#: src/net/ea/generalhandler.cpp:221
+msgid "Luck"
+msgstr "Удача"
+
+#: src/net/ea/generalhandler.cpp:224
+#, fuzzy
+msgid "Defense"
+msgstr "Защита:"
+
+#: src/net/ea/generalhandler.cpp:225
+#, fuzzy
+msgid "M.Attack"
+msgstr "Атака:"
+
+#: src/net/ea/generalhandler.cpp:226
+#, fuzzy
+msgid "M.Defense"
+msgstr "Защита:"
+
+#: src/net/ea/generalhandler.cpp:227
+#, c-format
+msgid "% Accuracy"
+msgstr ""
+
+#: src/net/ea/generalhandler.cpp:228
+#, c-format
+msgid "% Evade"
+msgstr ""
+
+#: src/net/ea/generalhandler.cpp:229
+#, c-format
+msgid "% Critical"
+msgstr ""
+
+#: src/net/ea/gui/guildtab.cpp:61 src/net/ea/gui/partytab.cpp:59
 msgid "/help > Display this help."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:56
-msgid "/create > Create a new party"
+#: src/net/ea/gui/guildtab.cpp:62
+#, fuzzy
+msgid "/invite > Invite a player to your guild"
+msgstr "Пригласить пользователя на канал"
+
+#: src/net/ea/gui/guildtab.cpp:63
+msgid "/leave > Leave the guild you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:57
-msgid "/new > Alias of create"
+#: src/net/ea/gui/guildtab.cpp:64
+msgid "/kick > Kick some one from the guild you are in"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:58
-msgid "/invite > Invite a player to your party"
+#: src/net/ea/gui/guildtab.cpp:73 src/net/ea/gui/partytab.cpp:73
+msgid "Command: /invite <nick>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:59
-msgid "/leave > Leave the party you are in"
+#: src/net/ea/gui/guildtab.cpp:74
+msgid "This command invites <nick> to the guild you're in."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:60
-msgid "/kick > Kick some one from the party you are in"
+#: src/net/ea/gui/guildtab.cpp:80 src/net/ea/gui/partytab.cpp:80
+msgid "Command: /leave"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:61
-msgid "/item > Show/change party item sharing options"
+#: src/net/ea/gui/guildtab.cpp:81
+#, fuzzy
+msgid "This command causes the player to leave the guild."
+msgstr "Эта команда посылает текст <сообщение> пользователю <nick>."
+
+#: src/net/ea/gui/guildtab.cpp:89
+msgid "Guild name is missing."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:62
-msgid "/exp > Show/change party experience sharing options"
+#: src/net/ea/guildhandler.cpp:293
+msgid "Could not inivte user to guild."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:71
-msgid "Command: /new <party-name>"
+#: src/net/ea/guildhandler.cpp:298
+msgid "User rejected guild invite."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:72
-msgid "Command: /create <party-name>"
+#: src/net/ea/guildhandler.cpp:303
+msgid "User is now part of your guild."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:73
-msgid "These commands create a new party called <party-name>."
+#: src/net/ea/guildhandler.cpp:308
+msgid "Your guild is full."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:77
-msgid "Command: /invite <nick>"
+#: src/net/ea/guildhandler.cpp:313
+msgid "Unknown guild invite response."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:84
-msgid "Command: /leave"
+#: src/net/ea/guildhandler.cpp:390
+msgid "Guild creation isn't supported yet."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:85
+#: src/net/ea/gui/partytab.cpp:60
+msgid "/invite > Invite a player to your party"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:61
+msgid "/leave > Leave the party you are in"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:62
+msgid "/kick > Kick some one from the party you are in"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:63
+msgid "/item > Show/change party item sharing options"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:64
+msgid "/exp > Show/change party experience sharing options"
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:81
 msgid "This command causes the player to leave the party."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:89
+#: src/net/ea/gui/partytab.cpp:85
 msgid "Command: /item <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:90
+#: src/net/ea/gui/partytab.cpp:86
 msgid "This command changes the party's item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:91
+#: src/net/ea/gui/partytab.cpp:87
 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:94
+#: src/net/ea/gui/partytab.cpp:90
 msgid "Command: /item"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:95
+#: src/net/ea/gui/partytab.cpp:91
 msgid "This command displays the party's current item sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:99
+#: src/net/ea/gui/partytab.cpp:95
 msgid "Command: /exp <policy>"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:100
+#: src/net/ea/gui/partytab.cpp:96
 msgid "This command changes the party's experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:101
+#: src/net/ea/gui/partytab.cpp:97
 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:104
+#: src/net/ea/gui/partytab.cpp:100
 msgid "Command: /exp"
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:105
+#: src/net/ea/gui/partytab.cpp:101
 msgid "This command displays the party's current experience sharing policy."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:113
-msgid "Party name is missing."
-msgstr ""
-
-#: src/net/ea/gui/partytab.cpp:136 src/net/ea/partyhandler.cpp:194
+#: src/net/ea/gui/partytab.cpp:132 src/net/ea/partyhandler.cpp:198
 msgid "Item sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:139 src/net/ea/partyhandler.cpp:200
+#: src/net/ea/gui/partytab.cpp:135 src/net/ea/partyhandler.cpp:204
 msgid "Item sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:142 src/net/ea/partyhandler.cpp:206
+#: src/net/ea/gui/partytab.cpp:138 src/net/ea/partyhandler.cpp:210
 msgid "Item sharing not possible."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:168 src/net/ea/partyhandler.cpp:171
+#: src/net/ea/gui/partytab.cpp:141
+msgid "Item sharing unknown."
+msgstr ""
+
+#: src/net/ea/gui/partytab.cpp:167 src/net/ea/partyhandler.cpp:174
 msgid "Experience sharing enabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:171 src/net/ea/partyhandler.cpp:177
+#: src/net/ea/gui/partytab.cpp:170 src/net/ea/partyhandler.cpp:180
 msgid "Experience sharing disabled."
 msgstr ""
 
-#: src/net/ea/gui/partytab.cpp:174 src/net/ea/partyhandler.cpp:183
+#: src/net/ea/gui/partytab.cpp:173 src/net/ea/partyhandler.cpp:186
 msgid "Experience sharing not possible."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:185
-msgid "Unable to pick up item."
+#: src/net/ea/gui/partytab.cpp:176
+msgid "Experience sharing unknown."
 msgstr ""
 
-#. TRANSLATORS: Used as in "You picked up a ...", when
-#. picking up only one item.
-#: src/net/ea/inventoryhandler.cpp:195
-msgid "a"
+#: src/net/ea/inventoryhandler.cpp:281
+msgid "Failed to use item."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:199
-#, c-format
-msgid "You picked up %s [@@%d|%s@@]."
+#: src/net/ea/inventoryhandler.cpp:391
+msgid "Unable to equip."
 msgstr ""
 
-#: src/net/ea/inventoryhandler.cpp:245
-msgid "Failed to use item."
+#: src/net/ea/inventoryhandler.cpp:402
+msgid "Unable to unequip."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:76
+#: src/net/ea/loginhandler.cpp:79
 msgid "Account was not found. Please re-login."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:79 src/net/manaserv/loginhandler.cpp:113
-msgid "Old password incorrect"
+#: src/net/ea/loginhandler.cpp:82 src/net/manaserv/loginhandler.cpp:121
+msgid "Old password incorrect."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:82
-msgid "New password too short"
+#: src/net/ea/loginhandler.cpp:85
+msgid "New password too short."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:85 src/net/ea/loginhandler.cpp:169
-#: src/net/manaserv/loginhandler.cpp:89 src/net/manaserv/loginhandler.cpp:119
-#: src/net/manaserv/loginhandler.cpp:152 src/net/manaserv/loginhandler.cpp:188
-#: src/net/manaserv/loginhandler.cpp:220
-msgid "Unknown error"
-msgstr ""
+#: src/net/ea/loginhandler.cpp:88 src/net/ea/loginhandler.cpp:175
+#: src/net/manaserv/charhandler.cpp:158 src/net/manaserv/loginhandler.cpp:96
+#: src/net/manaserv/loginhandler.cpp:127 src/net/manaserv/loginhandler.cpp:161
+#: src/net/manaserv/loginhandler.cpp:279 src/net/manaserv/loginhandler.cpp:316
+#, fuzzy
+msgid "Unknown error."
+msgstr "Неизвесная команда"
 
-#: src/net/ea/loginhandler.cpp:142
-msgid "Unregistered ID"
-msgstr ""
+#: src/net/ea/loginhandler.cpp:149
+#, fuzzy
+msgid "Unregistered ID."
+msgstr "Удалить регистрацию"
 
-#: src/net/ea/loginhandler.cpp:145
-msgid "Wrong password"
+#: src/net/ea/loginhandler.cpp:152
+msgid "Wrong password."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:148
-msgid "Account expired"
+#: src/net/ea/loginhandler.cpp:155
+msgid "Account expired."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:151
-msgid "Rejected from server"
+#: src/net/ea/loginhandler.cpp:158
+msgid "Rejected from server."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:155
+#: src/net/ea/loginhandler.cpp:161
 msgid ""
-"You have been permanently banned from the game. Please contact the GM Team."
+"You have been permanently banned from the game. Please contact the GM team."
 msgstr ""
 
-#: src/net/ea/loginhandler.cpp:159
+#: src/net/ea/loginhandler.cpp:165
 #, 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:166
-msgid "This user name is already taken"
+#: src/net/ea/loginhandler.cpp:172
+msgid "This user name is already taken."
+msgstr ""
+
+#: src/net/ea/network.cpp:145
+msgid "Empty address given to Network::connect()!"
+msgstr ""
+
+#: src/net/ea/network.cpp:345
+msgid "Unable to resolve host \""
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:77
+#: src/net/ea/network.cpp:414
+#, fuzzy
+msgid "Connection to server terminated. "
+msgstr "Подключение к серверу карт..."
+
+#: src/net/ea/partyhandler.cpp:81
 msgid "Could not create party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:80
+#: src/net/ea/partyhandler.cpp:84
 msgid "Party successfully created."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:115
+#: src/net/ea/partyhandler.cpp:118
 #, c-format
 msgid "%s is already a member of a party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:119
+#: src/net/ea/partyhandler.cpp:122
 #, c-format
 msgid "%s refused your invitation."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:123
+#: src/net/ea/partyhandler.cpp:126
 #, c-format
 msgid "%s is now a member of your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:127
+#: src/net/ea/partyhandler.cpp:130
 #, c-format
 msgid "Unknown invite response for %s."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:234
+#: src/net/ea/partyhandler.cpp:238
 msgid "You have left the party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:238
+#: src/net/ea/partyhandler.cpp:249
 #, c-format
 msgid "%s has left your party."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:273
+#: src/net/ea/partyhandler.cpp:301
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:299
+#: src/net/ea/partyhandler.cpp:329
 msgid "Inviting like this isn't supported at the moment."
 msgstr ""
 
-#: src/net/ea/partyhandler.cpp:328
+#: src/net/ea/partyhandler.cpp:334
+msgid "You can only inivte when you are in a party!"
+msgstr ""
+
+#: src/net/ea/partyhandler.cpp:365
 #, c-format
 msgid "%s is not in your party!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:96 src/net/manaserv/beinghandler.cpp:312
+#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:304
 msgid "You are dead."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:97 src/net/manaserv/beinghandler.cpp:313
+#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:305
 msgid "We regret to inform you that your character was killed in battle."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:99 src/net/manaserv/beinghandler.cpp:314
+#: src/net/ea/playerhandler.cpp:102 src/net/manaserv/beinghandler.cpp:307
 msgid "You are not that alive anymore."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:100 src/net/manaserv/beinghandler.cpp:315
+#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:308
 msgid "The cold hands of the grim reaper are grabbing for your soul."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:101 src/net/manaserv/beinghandler.cpp:316
+#: src/net/ea/playerhandler.cpp:104 src/net/manaserv/beinghandler.cpp:309
 msgid "Game Over!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:102
+#: src/net/ea/playerhandler.cpp:105
 msgid "Insert coin to continue."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:103 src/net/manaserv/beinghandler.cpp:317
+#: src/net/ea/playerhandler.cpp:106 src/net/manaserv/beinghandler.cpp:310
 msgid ""
 "No, kids. Your character did not really die. It... err... went to a better "
 "place."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:105 src/net/manaserv/beinghandler.cpp:318
+#: src/net/ea/playerhandler.cpp:108 src/net/manaserv/beinghandler.cpp:312
 msgid ""
 "Your plan of breaking your enemies weapon by bashing it with your throat "
 "failed."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:107 src/net/manaserv/beinghandler.cpp:319
+#: src/net/ea/playerhandler.cpp:110 src/net/manaserv/beinghandler.cpp:314
 msgid "I guess this did not run too well."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:109 src/net/manaserv/beinghandler.cpp:320
+#: src/net/ea/playerhandler.cpp:112 src/net/manaserv/beinghandler.cpp:315
 msgid "Do you want your possessions identified?"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:111 src/net/manaserv/beinghandler.cpp:321
+#: src/net/ea/playerhandler.cpp:114 src/net/manaserv/beinghandler.cpp:316
 msgid "Sadly, no trace of you was ever found..."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:113 src/net/manaserv/beinghandler.cpp:322
+#: src/net/ea/playerhandler.cpp:116 src/net/manaserv/beinghandler.cpp:317
 msgid "Annihilated."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:115 src/net/manaserv/beinghandler.cpp:323
+#: src/net/ea/playerhandler.cpp:118 src/net/manaserv/beinghandler.cpp:318
 msgid "Looks like you got your head handed to you."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:117 src/net/manaserv/beinghandler.cpp:324
+#: src/net/ea/playerhandler.cpp:120 src/net/manaserv/beinghandler.cpp:319
 msgid ""
 "You screwed up again, dump your body down the tubes and get you another one."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:120
+#: src/net/ea/playerhandler.cpp:123
 msgid "You're not dead yet. You're just resting."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:121
+#: src/net/ea/playerhandler.cpp:124
 msgid "You are no more."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:122
+#: src/net/ea/playerhandler.cpp:125
 msgid "You have ceased to be."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:123
+#: src/net/ea/playerhandler.cpp:126
 msgid "You've expired and gone to meet your maker."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:124
+#: src/net/ea/playerhandler.cpp:127
 msgid "You're a stiff."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:125
+#: src/net/ea/playerhandler.cpp:128
 msgid "Bereft of life, you rest in peace."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:126
+#: src/net/ea/playerhandler.cpp:129
 msgid "If you weren't so animated, you'd be pushing up the daisies."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:127
+#: src/net/ea/playerhandler.cpp:130
 msgid "Your metabolic processes are now history."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:128
+#: src/net/ea/playerhandler.cpp:131
 msgid "You're off the twig."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:129
+#: src/net/ea/playerhandler.cpp:132
 msgid "You've kicked the bucket."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:130
+#: src/net/ea/playerhandler.cpp:133
 msgid ""
 "You've shuffled off your mortal coil, run down the curtain and joined the "
 "bleedin' choir invisibile."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:132
+#: src/net/ea/playerhandler.cpp:135
 msgid "You are an ex-player."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:133
+#: src/net/ea/playerhandler.cpp:136
 msgid "You're pining for the fjords."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:246 src/net/ea/playerhandler.cpp:270
+#: src/net/ea/playerhandler.cpp:249 src/net/ea/playerhandler.cpp:310
 msgid "Message"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:247
+#: src/net/ea/playerhandler.cpp:250
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:290
-msgid "You picked up "
+#: src/net/ea/playerhandler.cpp:333
+#, c-format
+msgid "You picked up %s."
+msgstr ""
+
+#: src/net/ea/playerhandler.cpp:369
+msgid "Cannot raise skill!"
 msgstr ""
 
-#: src/net/ea/playerhandler.cpp:413
+#: src/net/ea/playerhandler.cpp:532
 msgid "Equip arrows first."
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:139
+#: src/net/ea/specialhandler.cpp:147
 msgid "Trade failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:142
+#: src/net/ea/specialhandler.cpp:150
 msgid "Emote failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:145
+#: src/net/ea/specialhandler.cpp:153
 msgid "Sit failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:148
+#: src/net/ea/specialhandler.cpp:156
 msgid "Chat creating failed!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:151
+#: src/net/ea/specialhandler.cpp:159
 msgid "Could not join party!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:154
+#: src/net/ea/specialhandler.cpp:162
 msgid "Cannot shout!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:163
+#: src/net/ea/specialhandler.cpp:171
 msgid "You have not yet reached a high enough lvl!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:166
+#: src/net/ea/specialhandler.cpp:174
 msgid "Insufficient HP!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:169
+#: src/net/ea/specialhandler.cpp:177
 msgid "Insufficient SP!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:172
+#: src/net/ea/specialhandler.cpp:180
 msgid "You have no memos!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:175
+#: src/net/ea/specialhandler.cpp:183
 msgid "You cannot do that right now!"
 msgstr "Вы не можете сделать это сейчас!"
 
-#: src/net/ea/skillhandler.cpp:178
+#: src/net/ea/specialhandler.cpp:186
 msgid "Seems you need more money... ;-)"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:181
+#: src/net/ea/specialhandler.cpp:189
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "Вы не можете использовать это умение с этим видом оружия!"
 
-#: src/net/ea/skillhandler.cpp:184
+#: src/net/ea/specialhandler.cpp:192
 msgid "You need another red gem!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:187
+#: src/net/ea/specialhandler.cpp:195
 msgid "You need another blue gem!"
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:190
+#: src/net/ea/specialhandler.cpp:198
 msgid "You're carrying to much to do this!"
 msgstr "Вы несёте слишком много, чтобы сделать это!"
 
-#: src/net/ea/skillhandler.cpp:193
+#: src/net/ea/specialhandler.cpp:201
 msgid "Huh? What's that?"
 msgstr "А? Что это?"
 
-#: src/net/ea/skillhandler.cpp:202
+#: src/net/ea/specialhandler.cpp:210
 msgid "Warp failed..."
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:205
+#: src/net/ea/specialhandler.cpp:213
 msgid "Could not steal anything..."
 msgstr ""
 
-#: src/net/ea/skillhandler.cpp:208
+#: src/net/ea/specialhandler.cpp:216
 msgid "Poison had no effect..."
 msgstr "Яд не подействовал..."
 
-#: src/net/ea/tradehandler.cpp:103 src/net/manaserv/tradehandler.cpp:114
+#: src/net/ea/tradehandler.cpp:107 src/net/manaserv/tradehandler.cpp:116
 msgid "Request for Trade"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:104 src/net/manaserv/tradehandler.cpp:115
+#: src/net/ea/tradehandler.cpp:108 src/net/manaserv/tradehandler.cpp:117
 #, c-format
 msgid "%s wants to trade with you, do you accept?"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:119
+#: src/net/ea/tradehandler.cpp:124
 msgid "Trading isn't possible. Trade partner is too far away."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:123
+#: src/net/ea/tradehandler.cpp:128
 msgid "Trading isn't possible. Character doesn't exist."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:127
+#: src/net/ea/tradehandler.cpp:132
 msgid "Trade cancelled due to an unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:132
+#: src/net/ea/tradehandler.cpp:137
 #, c-format
 msgid "Trade: You and %s"
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:139
+#: src/net/ea/tradehandler.cpp:144
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:148
+#: src/net/ea/tradehandler.cpp:153
 msgid "Unhandled trade cancel packet."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:198
+#: src/net/ea/tradehandler.cpp:202
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:203
+#: src/net/ea/tradehandler.cpp:207
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:207
+#: src/net/ea/tradehandler.cpp:211
 msgid "Failed adding item for unknown reason."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:220 src/net/manaserv/tradehandler.cpp:147
+#: src/net/ea/tradehandler.cpp:224 src/net/manaserv/tradehandler.cpp:149
 msgid "Trade canceled."
 msgstr ""
 
-#: src/net/ea/tradehandler.cpp:227 src/net/manaserv/tradehandler.cpp:154
+#: src/net/ea/tradehandler.cpp:231 src/net/manaserv/tradehandler.cpp:156
 msgid "Trade completed."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:328
-msgid " Press OK to respawn"
+#: src/net/manaserv/beinghandler.cpp:324
+msgid "Press OK to respawn."
 msgstr ""
 
-#: src/net/manaserv/beinghandler.cpp:329
-msgid "You died"
+#: src/net/manaserv/beinghandler.cpp:325
+#, fuzzy
+msgid "You Died"
+msgstr "Вы отдаете:"
+
+#: src/net/manaserv/charhandler.cpp:128 src/net/manaserv/charhandler.cpp:196
+msgid "Not logged in."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:131
+msgid "No empty slot."
 msgstr ""
 
-#: src/net/manaserv/charserverhandler.cpp:219
+#: src/net/manaserv/charhandler.cpp:134
+msgid "Invalid name."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:137
+#, fuzzy
+msgid "Character's name already exists."
+msgstr "Подтвердите удаление героя"
+
+#: src/net/manaserv/charhandler.cpp:140
+msgid "Invalid hairstyle."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:143
+msgid "Invalid hair color."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:146
+msgid "Invalid gender."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:149
+#, fuzzy
+msgid "Character's stats are too high."
+msgstr "Данные персонажа в порядке"
+
+#: src/net/manaserv/charhandler.cpp:152
+#, fuzzy
+msgid "Character's stats are too low."
+msgstr "Данные персонажа в порядке"
+
+#: src/net/manaserv/charhandler.cpp:155
+msgid "One stat is zero."
+msgstr ""
+
+#: src/net/manaserv/charhandler.cpp:187
+#, fuzzy
+msgid "Player deleted."
+msgstr "Подтвердите удаление героя"
+
+#: src/net/manaserv/charhandler.cpp:199
+#, fuzzy
+msgid "Selection out of range."
+msgstr "Сколько предметов продать."
+
+#: src/net/manaserv/charhandler.cpp:202
+#, fuzzy, c-format
+msgid "Unknown error (%d)."
+msgstr "Неизвесная команда"
+
+#: src/net/manaserv/charhandler.cpp:242
 msgid "No gameservers are available."
 msgstr ""
 
-#: src/net/manaserv/charserverhandler.cpp:258
+#: src/net/manaserv/charhandler.cpp:268
 msgid "Willpower:"
 msgstr "Сила волиr:"
 
-#: src/net/manaserv/chathandler.cpp:158 src/net/manaserv/guildhandler.cpp:250
+#: src/net/manaserv/chathandler.cpp:180 src/net/manaserv/chathandler.cpp:301
+#: src/net/manaserv/guildhandler.cpp:259
 #, c-format
 msgid "Topic: %s"
 msgstr ""
 
-#: src/net/manaserv/generalhandler.cpp:87
+#: src/net/manaserv/chathandler.cpp:184 src/net/manaserv/chathandler.cpp:262
+msgid "Players in this channel:"
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:201
+#, fuzzy
+msgid "Error joining channel."
+msgstr "Команда: /join <канал>"
+
+#: src/net/manaserv/chathandler.cpp:207
+msgid "Listing channels."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:219
+msgid "End of channel list."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:291
+#, c-format
+msgid "%s entered the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:296
+#, c-format
+msgid "%s left the channel."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:312
+#, c-format
+msgid "%s has set mode %s on user %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:322
+#, c-format
+msgid "%s has kicked %s."
+msgstr ""
+
+#: src/net/manaserv/chathandler.cpp:327
+#, fuzzy
+msgid "Unknown channel event."
+msgstr "Неизвесная команда"
+
+#: src/net/manaserv/generalhandler.cpp:100
 #, fuzzy, c-format
 msgid "Willpower %+d"
 msgstr "Сила волиr:"
 
-#: src/net/manaserv/guildhandler.cpp:74
+#: src/net/manaserv/generalhandler.cpp:171
+#, fuzzy
+msgid "Willpower"
+msgstr "Сила волиr:"
+
+#: src/net/manaserv/guildhandler.cpp:81
 msgid "Guild created."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:79
+#: src/net/manaserv/guildhandler.cpp:86
 msgid "Error creating guild."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:89
+#: src/net/manaserv/guildhandler.cpp:96
 msgid "Invite sent."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:194
+#: src/net/manaserv/guildhandler.cpp:203
 msgid "Member was promoted successfully."
 msgstr ""
 
-#: src/net/manaserv/guildhandler.cpp:199
+#: src/net/manaserv/guildhandler.cpp:208
 msgid "Failed to promote member."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:80
-msgid "Wrong magic_token"
+#: src/net/manaserv/loginhandler.cpp:87
+msgid "Wrong magic_token."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:83 src/net/manaserv/loginhandler.cpp:182
-msgid "Already logged in"
+#: src/net/manaserv/loginhandler.cpp:90 src/net/manaserv/loginhandler.cpp:269
+msgid "Already logged in."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:86 src/net/manaserv/loginhandler.cpp:185
-msgid "Server is full"
+#: src/net/manaserv/loginhandler.cpp:93 src/net/manaserv/loginhandler.cpp:272
+msgid "Server is full."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:110
-msgid "New password incorrect"
+#: src/net/manaserv/loginhandler.cpp:118
+msgid "New password incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:116 src/net/manaserv/loginhandler.cpp:146
+#: src/net/manaserv/loginhandler.cpp:124 src/net/manaserv/loginhandler.cpp:155
 msgid "Account not connected. Please login first."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:140
-msgid "New email address incorrect"
+#: src/net/manaserv/loginhandler.cpp:149
+msgid "New email address incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:143
-msgid "Old email address incorrect"
+#: src/net/manaserv/loginhandler.cpp:152
+msgid "Old email address incorrect."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:149
-msgid "The new Email Address already exists."
+#: src/net/manaserv/loginhandler.cpp:158
+msgid "The new email address already exists."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:176 src/net/manaserv/loginhandler.cpp:208
-msgid "Client version is too old"
+#: src/net/manaserv/loginhandler.cpp:239
+msgid ""
+"Client registration is not allowed. Please contact server administration."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:263 src/net/manaserv/loginhandler.cpp:300
+msgid "Client version is too old."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:179
-msgid "Wrong username or password"
+#: src/net/manaserv/loginhandler.cpp:266
+msgid "Wrong username or password."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:211
-msgid "Wrong username, password or email address"
+#: src/net/manaserv/loginhandler.cpp:275
+msgid "Login attempt too soon after previous attempt."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:214
-msgid "Username already exists"
+#: src/net/manaserv/loginhandler.cpp:303
+msgid "Wrong username, password or email address."
 msgstr ""
 
-#: src/net/manaserv/loginhandler.cpp:217
-msgid "Email address already exists"
+#: src/net/manaserv/loginhandler.cpp:306
+msgid "Username already exists."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:86
+#: src/net/manaserv/loginhandler.cpp:309
+msgid "Email address already exists."
+msgstr ""
+
+#: src/net/manaserv/loginhandler.cpp:312
+msgid "You took too long with the captcha or your response was incorrect."
+msgstr ""
+
+#: src/net/manaserv/partyhandler.cpp:88
 msgid "Joined party."
 msgstr ""
 
-#: src/net/manaserv/partyhandler.cpp:103
+#: src/net/manaserv/partyhandler.cpp:106
 #, c-format
 msgid "%s joined the party."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:93
+#: src/net/manaserv/partyhandler.cpp:123
+#, c-format
+msgid "%s rejected your invite."
+msgstr ""
+
+#: src/net/manaserv/tradehandler.cpp:96
 msgid "Accepting incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:95
+#: src/net/manaserv/tradehandler.cpp:98
 msgid "Ignoring incoming trade requests."
 msgstr ""
 
-#: src/net/manaserv/tradehandler.cpp:133
+#: src/net/manaserv/tradehandler.cpp:135
 #, c-format
 msgid "Trading with %s"
 msgstr ""
 
+#: src/playerrelations.cpp:304
+#, fuzzy
+msgid "Completely ignore"
+msgstr "Завершено"
+
+#: src/playerrelations.cpp:318
+msgid "Print '...'"
+msgstr ""
+
+#: src/playerrelations.cpp:334
+msgid "Blink name"
+msgstr ""
+
+#: src/playerrelations.cpp:371
+msgid "Floating '...' bubble"
+msgstr ""
+
+#: src/playerrelations.cpp:374
+msgid "Floating bubble"
+msgstr ""
+
 #: src/resources/itemdb.cpp:52
 #, c-format
 msgid "Attack %+d"
@@ -2996,20 +3609,56 @@ msgstr "HP %+d"
 msgid "MP %+d"
 msgstr "Мана %+d"
 
-#: src/resources/itemdb.cpp:113
+#: src/resources/itemdb.cpp:114
 msgid "Unknown item"
 msgstr ""
 
-#: src/resources/itemdb.cpp:156
-msgid "Unnamed"
-msgstr ""
-
-#: src/resources/monsterdb.cpp:45 src/resources/monsterdb.cpp:67
+#: src/resources/itemdb.cpp:158 src/resources/monsterdb.cpp:45
+#: src/resources/monsterdb.cpp:67
 msgid "unnamed"
 msgstr ""
 
-#~ msgid "Select Character"
-#~ msgstr "Выбор персонажа"
+#~ msgid "Description: %s"
+#~ msgstr "Описание: %s"
+
+#~ msgid "Previous"
+#~ msgstr "Предыдущий"
+
+#~ msgid "New"
+#~ msgstr "Новый"
+
+#~ msgid "Ok"
+#~ msgstr "Ok"
+
+#~ msgid "@@attack|Attack %s@@"
+#~ msgstr "@@attack|Атаковать %s@@"
+
+#~ msgid "@@cancel|Cancel@@"
+#~ msgstr "@@cancelОтмена@@"
+
+#~ msgid "@@use|Equip@@"
+#~ msgstr "@@use|Надеть@@"
+
+#~ msgid "@@use|Use@@"
+#~ msgstr "@@use|Использовать@@"
+
+#~ msgid "@@drop|Drop@@"
+#~ msgstr "@@drop|Сбросить@@"
+
+#~ msgid "@@split|Split@@"
+#~ msgstr "@@split|Разделить@@"
+
+#~ msgid "Stats"
+#~ msgstr "Статистика"
+
+#~ msgid "Total"
+#~ msgstr "Всего"
+
+#~ msgid "Cost"
+#~ msgstr "Стоимость"
+
+#~ msgid "Connecting to account server..."
+#~ msgstr "Соединение с сервером авторизации..."
 
 #~ msgid "Scroll radius"
 #~ msgstr "Радиус прокрутки"