summaryrefslogtreecommitdiff
path: root/po
diff options
context:
space:
mode:
Diffstat (limited to 'po')
-rw-r--r--po/cs.po166
-rw-r--r--po/de.po233
-rw-r--r--po/es.po155
-rw-r--r--po/fi.po489
-rw-r--r--po/fr.po155
-rw-r--r--po/id.po270
-rw-r--r--po/it.po163
-rw-r--r--po/ja.po169
-rw-r--r--po/manaplus.pot151
-rw-r--r--po/nl_BE.po153
-rw-r--r--po/pl.po155
-rw-r--r--po/pt.po228
-rw-r--r--po/pt_BR.po161
-rw-r--r--po/ru.po153
-rw-r--r--po/zh_CN.po163
15 files changed, 1514 insertions, 1450 deletions
diff --git a/po/cs.po b/po/cs.po
index 6f83f1062..97aac2408 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-01-21 19:25+0300\n"
-"PO-Revision-Date: 2012-01-05 20:43+0000\n"
+"POT-Creation-Date: 2012-01-25 20:17+0300\n"
+"PO-Revision-Date: 2012-01-25 17:27+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Czech (http://www.transifex.net/projects/p/manaplus/team/"
"cs/)\n"
@@ -43,47 +43,47 @@ msgstr ""
msgid "I"
msgstr ""
-#: src/client.cpp:946 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:947 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
msgid "Setup"
msgstr "Nastavení"
-#: src/client.cpp:953 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:954 src/gui/setup_perfomance.cpp:48
msgid "Perfomance"
msgstr "Výkon"
-#: src/client.cpp:958 src/gui/setup_video.cpp:315
+#: src/client.cpp:959 src/gui/setup_video.cpp:315
msgid "Video"
msgstr "Video"
-#: src/client.cpp:963
+#: src/client.cpp:964
msgid "Themes"
msgstr ""
-#: src/client.cpp:1045
+#: src/client.cpp:1046
msgid "Connecting to server"
msgstr "Připojuji se k serveru"
-#: src/client.cpp:1076
+#: src/client.cpp:1077
msgid "Logging in"
msgstr "Přihlašuji se"
-#: src/client.cpp:1109
+#: src/client.cpp:1110
msgid "Entering game world"
msgstr "Vstupuji do herního světa"
-#: src/client.cpp:1210
+#: src/client.cpp:1211
msgid "Requesting characters"
msgstr "Požaduji postavy"
-#: src/client.cpp:1241
+#: src/client.cpp:1242
msgid "Connecting to the game server"
msgstr "Připojuji se k hernímu serveru"
-#: src/client.cpp:1251
+#: src/client.cpp:1252
msgid "Changing game servers"
msgstr "Zaměňuji herní servery"
-#: src/client.cpp:1294 src/client.cpp:1301 src/client.cpp:1435
+#: src/client.cpp:1295 src/client.cpp:1302 src/client.cpp:1436
#: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:256
#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
@@ -93,50 +93,50 @@ msgstr "Zaměňuji herní servery"
msgid "Error"
msgstr "Chyba"
-#: src/client.cpp:1310
+#: src/client.cpp:1311
msgid "Requesting registration details"
msgstr "Požaduji registrační detaily"
-#: src/client.cpp:1336
+#: src/client.cpp:1337
msgid "Password Change"
msgstr "Změna hesla"
-#: src/client.cpp:1337
+#: src/client.cpp:1338
msgid "Password changed successfully!"
msgstr "Heslo úspěšně změněno!"
-#: src/client.cpp:1356
+#: src/client.cpp:1357
msgid "Email Change"
msgstr "Změna emailu"
-#: src/client.cpp:1357
+#: src/client.cpp:1358
msgid "Email changed successfully!"
msgstr "Email úspěšně změněn!"
-#: src/client.cpp:1377
+#: src/client.cpp:1378
msgid "Unregister Successful"
msgstr "Zrušení registrace úspěšné"
-#: src/client.cpp:1378
+#: src/client.cpp:1379
msgid "Farewell, come back any time..."
msgstr "Nashledanou, vraťte se kdykoli..."
-#: src/client.cpp:1583 src/client.cpp:1616 src/client.cpp:1631
-#: src/client.cpp:2063 src/client.cpp:2070
+#: src/client.cpp:1584 src/client.cpp:1617 src/client.cpp:1632
+#: src/client.cpp:2064 src/client.cpp:2071
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
-#: src/client.cpp:1769
+#: src/client.cpp:1770
#, c-format
msgid "Invalid update host: %s"
msgstr "Neplatný host updatů: %s"
-#: src/client.cpp:1803 src/client.cpp:1809
+#: src/client.cpp:1804 src/client.cpp:1810
msgid "Error creating updates directory!"
msgstr "Chyba při vytváření adresáře s updaty!"
-#: src/client.cpp:1830
+#: src/client.cpp:1831
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "Chyba: %s neexistuje a nelze ho vytvořit. Ukončuji."
@@ -415,7 +415,7 @@ msgstr ""
msgid "Result"
msgstr "Výsledek"
-#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:124
+#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:128
msgid "Reset"
msgstr "Vynulovat"
@@ -438,16 +438,16 @@ msgstr ""
#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:207
-#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:765
+#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:118
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:770
msgid "+"
msgstr ""
#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:777
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:119
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:782
msgid "-"
msgstr ""
@@ -459,8 +459,8 @@ msgid "Quit"
msgstr "Ukončit"
#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
-#: src/gui/statuswindow.cpp:515 src/gui/statuswindow.cpp:565
-#: src/gui/statuswindow.cpp:764 src/gui/statuswindow.cpp:795
+#: src/gui/statuswindow.cpp:515 src/gui/statuswindow.cpp:570
+#: src/gui/statuswindow.cpp:769 src/gui/statuswindow.cpp:800
msgid "Max"
msgstr "Vše"
@@ -491,7 +491,7 @@ msgstr "Prodej"
#: src/gui/quitdialog.cpp:55 src/gui/register.cpp:82 src/gui/setup.cpp:72
#: src/gui/socialwindow.cpp:1198 src/gui/textcommandeditor.cpp:241
#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updaterwindow.cpp:162
+#: src/gui/updaterwindow.cpp:168
msgid "Cancel"
msgstr "Zrušit"
@@ -915,7 +915,7 @@ msgid "Did You Know?"
msgstr "Víte že ... ?"
#: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
-#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:53
+#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
#: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:113
msgid "Close"
msgstr "Zavřít"
@@ -1254,24 +1254,24 @@ msgstr "stavový řádek"
msgid "Need"
msgstr "Potřebuješ"
-#: src/gui/npcdialog.cpp:51
+#: src/gui/npcdialog.cpp:52
msgid "Stop waiting"
msgstr ""
-#: src/gui/npcdialog.cpp:52
+#: src/gui/npcdialog.cpp:53
msgid "Next"
msgstr "Další"
-#: src/gui/npcdialog.cpp:54
+#: src/gui/npcdialog.cpp:55
msgid "Submit"
msgstr "Odeslat"
-#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
+#: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
#: src/gui/setup_other.cpp:151
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:632
+#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:632
msgid "Clear"
msgstr "Vyprázdnit"
@@ -1293,6 +1293,7 @@ msgid "Outfit: %d"
msgstr "Výstroj: %d"
#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:892
+#: src/gui/windowmenu.cpp:302
#, c-format
msgid "Key: %s"
msgstr "Klávesa: %s"
@@ -2787,7 +2788,7 @@ msgstr "Ignorovat monstra"
msgid "Create Guild"
msgstr "Vytvořit gildu"
-#: src/gui/socialwindow.cpp:1196 src/gui/socialwindow.cpp:1629
+#: src/gui/socialwindow.cpp:1196 src/gui/socialwindow.cpp:1631
msgid "Create Party"
msgstr "Vytvořit partu"
@@ -2799,93 +2800,103 @@ msgstr "Společenství"
msgid "Invite"
msgstr "Pozvat"
-#: src/gui/socialwindow.cpp:1412
+#. TRANSLATORS: here P is title for visible players tab in social window
+#: src/gui/socialwindow.cpp:1277
+msgid "P"
+msgstr ""
+
+#. TRANSLATORS: here F is title for friends tab in social window
+#: src/gui/socialwindow.cpp:1281
+msgid "F"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1414
#, c-format
msgid "Accepted party invite from %s."
msgstr "Přijato pozvání do party od %s."
-#: src/gui/socialwindow.cpp:1422
+#: src/gui/socialwindow.cpp:1424
#, c-format
msgid "Rejected party invite from %s."
msgstr "Odmítnuto přijetí do party od %s."
-#: src/gui/socialwindow.cpp:1439
+#: src/gui/socialwindow.cpp:1441
#, c-format
msgid "Accepted guild invite from %s."
msgstr "Přijato pozvání do gildy od %s."
-#: src/gui/socialwindow.cpp:1452
+#: src/gui/socialwindow.cpp:1454
#, c-format
msgid "Rejected guild invite from %s."
msgstr "Odmítnuto pozvání do gildy od %s."
-#: src/gui/socialwindow.cpp:1499
+#: src/gui/socialwindow.cpp:1501
#, c-format
msgid "Creating guild called %s."
msgstr "Vytvářím gildu s názvem %s."
-#: src/gui/socialwindow.cpp:1522
+#: src/gui/socialwindow.cpp:1524
#, c-format
msgid "Creating party called %s."
msgstr "Vytvářím partu s názvem %s."
-#: src/gui/socialwindow.cpp:1536
+#: src/gui/socialwindow.cpp:1538
msgid "Guild Name"
msgstr "Název gildy"
-#: src/gui/socialwindow.cpp:1537
+#: src/gui/socialwindow.cpp:1539
msgid "Choose your guild's name."
msgstr "Zvolte jméno vaší gildy."
-#: src/gui/socialwindow.cpp:1551
+#: src/gui/socialwindow.cpp:1553
msgid "Received guild request, but one already exists."
msgstr "Obdržen požadavek na vytvoření gildy, ale tato již existuje."
-#: src/gui/socialwindow.cpp:1557
+#: src/gui/socialwindow.cpp:1559
#, c-format
msgid "%s has invited you to join the guild %s."
msgstr "%s vás zve ke vstupu do gildy %s."
-#: src/gui/socialwindow.cpp:1563
+#: src/gui/socialwindow.cpp:1565
msgid "Accept Guild Invite"
msgstr "Přílmout pozvání do gildy"
-#: src/gui/socialwindow.cpp:1578
+#: src/gui/socialwindow.cpp:1580
msgid "Received party request, but one already exists."
msgstr "Obdržen požadavek na vytvoření party, ale tato již existuje."
-#: src/gui/socialwindow.cpp:1589
+#: src/gui/socialwindow.cpp:1591
msgid "You have been invited you to join a party."
msgstr "Byli jste pozváni k připojení se do party."
-#: src/gui/socialwindow.cpp:1593
+#: src/gui/socialwindow.cpp:1595
#, c-format
msgid "You have been invited to join the %s party."
msgstr "Byli jste pozváni k připojení se do party %s."
-#: src/gui/socialwindow.cpp:1601
+#: src/gui/socialwindow.cpp:1603
#, c-format
msgid "%s has invited you to join their party."
msgstr "%s vás pozval ke vstupu do své party."
-#: src/gui/socialwindow.cpp:1606
+#: src/gui/socialwindow.cpp:1608
#, c-format
msgid "%s has invited you to join the %s party."
msgstr "%s vás zve ke vstupu do party: %s."
-#: src/gui/socialwindow.cpp:1615
+#: src/gui/socialwindow.cpp:1617
msgid "Accept Party Invite"
msgstr "Přijmout pozvání do party"
-#: src/gui/socialwindow.cpp:1630
+#: src/gui/socialwindow.cpp:1632
msgid "Cannot create party. You are already in a party"
msgstr "Nemohu vytvořit partu. Již jste členem party."
-#: src/gui/socialwindow.cpp:1635
+#: src/gui/socialwindow.cpp:1637
msgid "Party Name"
msgstr "Jméno party"
-#: src/gui/socialwindow.cpp:1636
+#: src/gui/socialwindow.cpp:1638
msgid "Choose your party's name."
msgstr "Zvolte jméno vaší party."
@@ -3079,29 +3090,29 @@ msgstr "Jméno: %s"
msgid "Updating..."
msgstr "Aktualizuje se..."
-#: src/gui/updaterwindow.cpp:160
+#: src/gui/updaterwindow.cpp:166
msgid "Connecting..."
msgstr "Připojuji se..."
-#: src/gui/updaterwindow.cpp:163
+#: src/gui/updaterwindow.cpp:169
msgid "Play"
msgstr "Hrát"
-#: src/gui/updaterwindow.cpp:566
+#: src/gui/updaterwindow.cpp:570
msgid "##1 The update process is incomplete."
msgstr "##1 Proces aktualizace není kompletní."
#. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:568
+#: src/gui/updaterwindow.cpp:572
msgid "##1 It is strongly recommended that"
msgstr "##1 silně doporučujeme zkusit"
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:570
+#: src/gui/updaterwindow.cpp:574
msgid "##1 you try again later."
msgstr "##1 aktualizaci později"
-#: src/gui/updaterwindow.cpp:746
+#: src/gui/updaterwindow.cpp:750
msgid "Completed"
msgstr "Hotovo"
@@ -3976,9 +3987,9 @@ msgstr ""
"chovat podivně."
#: src/localplayer.cpp:384
-#, fuzzy, c-format
+#, c-format
msgid "You were killed by %s"
-msgstr "Zabil vás "
+msgstr ""
#: src/localplayer.cpp:1439
msgid "Tried to pick up nonexistent item."
@@ -4287,23 +4298,23 @@ msgstr "Modifikátory hry jsou vypnuty"
msgid "Game modifiers are unknown"
msgstr ""
-#: src/localplayer.cpp:3757
+#: src/localplayer.cpp:3758
msgid "Follow: "
msgstr ""
-#: src/localplayer.cpp:3759 src/localplayer.cpp:3774
+#: src/localplayer.cpp:3760 src/localplayer.cpp:3775
msgid "Follow canceled"
msgstr "Následování zrušeno."
-#: src/localplayer.cpp:3766
+#: src/localplayer.cpp:3767
msgid "Imitation: "
msgstr ""
-#: src/localplayer.cpp:3768 src/localplayer.cpp:3776
+#: src/localplayer.cpp:3769 src/localplayer.cpp:3777
msgid "Imitation canceled"
msgstr "Imitace zrušena."
-#: src/localplayer.cpp:4124
+#: src/localplayer.cpp:4125
msgid "You see "
msgstr "Vidíte "
@@ -4474,9 +4485,8 @@ msgid "Incorrect slot."
msgstr "Nesprávný slot."
#: src/net/ea/charserverhandler.cpp:167
-#, fuzzy
msgid "Incorrect race."
-msgstr "Nesprávný účes."
+msgstr ""
#: src/net/ea/charserverhandler.cpp:182 src/net/manaserv/charhandler.cpp:210
msgid "Info"
@@ -4631,9 +4641,8 @@ msgid "%s has left your guild."
msgstr "%s opustil vaši gildu."
#: src/net/ea/guildhandler.cpp:499
-#, fuzzy
msgid "You were kicked from guild."
-msgstr "Byl jste vykopnut z gildy."
+msgstr ""
#: src/net/ea/guildhandler.cpp:512
#, c-format
@@ -5631,6 +5640,3 @@ msgstr ""
#: src/resources/itemdb.cpp:167
msgid "Unknown item"
msgstr "Neznámý předmět"
-
-#~ msgid "> Next"
-#~ msgstr "> Další"
diff --git a/po/de.po b/po/de.po
index 5a36bce07..14bd2763a 100644
--- a/po/de.po
+++ b/po/de.po
@@ -13,9 +13,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-01-21 19:25+0300\n"
-"PO-Revision-Date: 2012-01-20 22:13+0000\n"
-"Last-Translator: Rosemarie Tauber <horos@online.de>\n"
+"POT-Creation-Date: 2012-01-25 20:17+0300\n"
+"PO-Revision-Date: 2012-01-25 17:27+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: German (http://www.transifex.net/projects/p/manaplus/team/"
"de/)\n"
"Language: de\n"
@@ -46,47 +46,47 @@ msgstr "A"
msgid "I"
msgstr "I"
-#: src/client.cpp:946 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:947 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
msgid "Setup"
msgstr "Einstellungen"
-#: src/client.cpp:953 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:954 src/gui/setup_perfomance.cpp:48
msgid "Perfomance"
msgstr "Leistung"
-#: src/client.cpp:958 src/gui/setup_video.cpp:315
+#: src/client.cpp:959 src/gui/setup_video.cpp:315
msgid "Video"
msgstr "Video"
-#: src/client.cpp:963
+#: src/client.cpp:964
msgid "Themes"
msgstr ""
-#: src/client.cpp:1045
+#: src/client.cpp:1046
msgid "Connecting to server"
msgstr "Verbinde zum Server"
-#: src/client.cpp:1076
+#: src/client.cpp:1077
msgid "Logging in"
msgstr "Anmelden"
-#: src/client.cpp:1109
+#: src/client.cpp:1110
msgid "Entering game world"
msgstr "Betrete die Spielwelt"
-#: src/client.cpp:1210
+#: src/client.cpp:1211
msgid "Requesting characters"
msgstr "Spielfiguren werden angefragt"
-#: src/client.cpp:1241
+#: src/client.cpp:1242
msgid "Connecting to the game server"
msgstr "Verbinde zum Charakterserver"
-#: src/client.cpp:1251
+#: src/client.cpp:1252
msgid "Changing game servers"
msgstr "Charakterserver wechseln"
-#: src/client.cpp:1294 src/client.cpp:1301 src/client.cpp:1435
+#: src/client.cpp:1295 src/client.cpp:1302 src/client.cpp:1436
#: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:256
#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
@@ -96,50 +96,50 @@ msgstr "Charakterserver wechseln"
msgid "Error"
msgstr "Fehler"
-#: src/client.cpp:1310
+#: src/client.cpp:1311
msgid "Requesting registration details"
msgstr "Anfrage der Registrierungsdetails"
-#: src/client.cpp:1336
+#: src/client.cpp:1337
msgid "Password Change"
msgstr "Passwort ändern"
-#: src/client.cpp:1337
+#: src/client.cpp:1338
msgid "Password changed successfully!"
msgstr "Passwort erfolgreich geändert!"
-#: src/client.cpp:1356
+#: src/client.cpp:1357
msgid "Email Change"
msgstr "E-Mail ändern"
-#: src/client.cpp:1357
+#: src/client.cpp:1358
msgid "Email changed successfully!"
msgstr "E-Mail erfolgreich geändert!"
-#: src/client.cpp:1377
+#: src/client.cpp:1378
msgid "Unregister Successful"
msgstr "erfolgreich abgemeldet."
-#: src/client.cpp:1378
+#: src/client.cpp:1379
msgid "Farewell, come back any time..."
msgstr "Leb wohl und komme jeder Zeit wieder..."
-#: src/client.cpp:1583 src/client.cpp:1616 src/client.cpp:1631
-#: src/client.cpp:2063 src/client.cpp:2070
+#: src/client.cpp:1584 src/client.cpp:1617 src/client.cpp:1632
+#: src/client.cpp:2064 src/client.cpp:2071
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%s existiert nicht und kann nicht erstellt werden! Beende."
-#: src/client.cpp:1769
+#: src/client.cpp:1770
#, c-format
msgid "Invalid update host: %s"
msgstr "Ungültiger Updateserver: %s"
-#: src/client.cpp:1803 src/client.cpp:1809
+#: src/client.cpp:1804 src/client.cpp:1810
msgid "Error creating updates directory!"
msgstr "Fehler beim Erstellen des Verzeichnisses für Updates!"
-#: src/client.cpp:1830
+#: src/client.cpp:1831
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
@@ -258,7 +258,7 @@ msgstr "Spieler konnte nicht gelöscht werden!"
#: src/commandhandler.cpp:931 src/commandhandler.cpp:977
#, c-format
msgid "Client uptime: %s"
-msgstr ""
+msgstr "Client läuft seit: %s"
#: src/commandhandler.cpp:941
#, c-format
@@ -415,7 +415,7 @@ msgstr "Bewegen"
msgid "Result"
msgstr "Resultat"
-#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:124
+#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:128
msgid "Reset"
msgstr "Zurücksetzten"
@@ -438,16 +438,16 @@ msgstr "Menge"
#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:207
-#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:765
+#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:118
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:770
msgid "+"
msgstr "+"
#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:777
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:119
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:782
msgid "-"
msgstr "-"
@@ -459,8 +459,8 @@ msgid "Quit"
msgstr "Beenden"
#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
-#: src/gui/statuswindow.cpp:515 src/gui/statuswindow.cpp:565
-#: src/gui/statuswindow.cpp:764 src/gui/statuswindow.cpp:795
+#: src/gui/statuswindow.cpp:515 src/gui/statuswindow.cpp:570
+#: src/gui/statuswindow.cpp:769 src/gui/statuswindow.cpp:800
msgid "Max"
msgstr "Max"
@@ -491,7 +491,7 @@ msgstr "Verkaufen"
#: src/gui/quitdialog.cpp:55 src/gui/register.cpp:82 src/gui/setup.cpp:72
#: src/gui/socialwindow.cpp:1198 src/gui/textcommandeditor.cpp:241
#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updaterwindow.cpp:162
+#: src/gui/updaterwindow.cpp:168
msgid "Cancel"
msgstr "Abbrechen"
@@ -915,7 +915,7 @@ msgid "Did You Know?"
msgstr "Wusstest du schon?"
#: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
-#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:53
+#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
#: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:113
msgid "Close"
msgstr "Schließen"
@@ -1081,7 +1081,7 @@ msgstr "Gewicht: %s"
#: src/gui/killstats.cpp:46 src/gui/windowmenu.cpp:69
msgid "Kill stats"
-msgstr ""
+msgstr "Besiegte Gegner Statistik"
#: src/gui/killstats.cpp:67
msgid "Reset stats"
@@ -1252,24 +1252,24 @@ msgstr "Status Balken"
msgid "Need"
msgstr "Muss"
-#: src/gui/npcdialog.cpp:51
+#: src/gui/npcdialog.cpp:52
msgid "Stop waiting"
msgstr ""
-#: src/gui/npcdialog.cpp:52
+#: src/gui/npcdialog.cpp:53
msgid "Next"
msgstr "Weiter"
-#: src/gui/npcdialog.cpp:54
+#: src/gui/npcdialog.cpp:55
msgid "Submit"
msgstr "Absenden"
-#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
+#: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
#: src/gui/setup_other.cpp:151
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:632
+#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:632
msgid "Clear"
msgstr "Frei"
@@ -1291,6 +1291,7 @@ msgid "Outfit: %d"
msgstr "Ausrüstung: %d"
#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:892
+#: src/gui/windowmenu.cpp:302
#, c-format
msgid "Key: %s"
msgstr "Taste: %s"
@@ -1498,7 +1499,7 @@ msgstr "Entfernen"
#: src/gui/popupmenu.cpp:573
msgid "Warp"
-msgstr ""
+msgstr "Warp"
#: src/gui/popupmenu.cpp:589
msgid "Clear outfit"
@@ -1709,7 +1710,7 @@ msgstr "Port:"
#: src/gui/serverdialog.cpp:257
msgid "Use same ip for game sub servers"
-msgstr ""
+msgstr "Benutze die selbe IP auf Zweitservern des Spiels"
#: src/gui/serverdialog.cpp:271
msgid "Server type:"
@@ -2112,7 +2113,7 @@ msgstr "Eigenen HP-Balken anzeigen"
#: src/gui/setup_other.cpp:117
msgid "Enable quick stats"
-msgstr ""
+msgstr "Aktiviere schnelleres Aufwerten der Spelerattribute"
#: src/gui/setup_other.cpp:120
msgid "Cycle player targets"
@@ -2184,11 +2185,11 @@ msgstr "Debug-Protokoll benutzen"
#: src/gui/setup_other.cpp:181
msgid "Low traffic mode"
-msgstr ""
+msgstr "Niedriger Datenverkehr Modus"
#: src/gui/setup_other.cpp:184
msgid "Hide shield sprite"
-msgstr ""
+msgstr "Zeige das Schild nicht an"
#: src/gui/setup_other.cpp:187
msgid "Show background"
@@ -2452,7 +2453,7 @@ msgstr ""
#: src/gui/setup_theme.cpp:200
msgid "Japanese font"
-msgstr ""
+msgstr "Japanische Schrift"
#: src/gui/setup_theme.cpp:237
msgid "Font size"
@@ -2791,7 +2792,7 @@ msgstr ""
msgid "Create Guild"
msgstr "Gilde erstellen"
-#: src/gui/socialwindow.cpp:1196 src/gui/socialwindow.cpp:1629
+#: src/gui/socialwindow.cpp:1196 src/gui/socialwindow.cpp:1631
msgid "Create Party"
msgstr "Party erstellen"
@@ -2803,93 +2804,103 @@ msgstr "Sozial"
msgid "Invite"
msgstr "Einladen"
-#: src/gui/socialwindow.cpp:1412
+#. TRANSLATORS: here P is title for visible players tab in social window
+#: src/gui/socialwindow.cpp:1277
+msgid "P"
+msgstr ""
+
+#. TRANSLATORS: here F is title for friends tab in social window
+#: src/gui/socialwindow.cpp:1281
+msgid "F"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1414
#, c-format
msgid "Accepted party invite from %s."
msgstr "Partyeinladung von %s angenommen."
-#: src/gui/socialwindow.cpp:1422
+#: src/gui/socialwindow.cpp:1424
#, c-format
msgid "Rejected party invite from %s."
msgstr "Partyeinladung von %s abgelehnt."
-#: src/gui/socialwindow.cpp:1439
+#: src/gui/socialwindow.cpp:1441
#, c-format
msgid "Accepted guild invite from %s."
msgstr "Guildeneinladung von %s angenommen."
-#: src/gui/socialwindow.cpp:1452
+#: src/gui/socialwindow.cpp:1454
#, c-format
msgid "Rejected guild invite from %s."
msgstr "Guildeneinladung von %s abgelehnt."
-#: src/gui/socialwindow.cpp:1499
+#: src/gui/socialwindow.cpp:1501
#, c-format
msgid "Creating guild called %s."
msgstr "Erstelle der Gilde %s."
-#: src/gui/socialwindow.cpp:1522
+#: src/gui/socialwindow.cpp:1524
#, c-format
msgid "Creating party called %s."
msgstr "Erstelle die Party \"%s\""
-#: src/gui/socialwindow.cpp:1536
+#: src/gui/socialwindow.cpp:1538
msgid "Guild Name"
msgstr "Gildenname"
-#: src/gui/socialwindow.cpp:1537
+#: src/gui/socialwindow.cpp:1539
msgid "Choose your guild's name."
msgstr "Wähle den Namen deiner Gilde"
-#: src/gui/socialwindow.cpp:1551
+#: src/gui/socialwindow.cpp:1553
msgid "Received guild request, but one already exists."
msgstr "Anfrage für eine Party erhalten, es wurde schoneinmal angefragt."
-#: src/gui/socialwindow.cpp:1557
+#: src/gui/socialwindow.cpp:1559
#, c-format
msgid "%s has invited you to join the guild %s."
msgstr "%s hat dich eingeladen, seiner Gilde %s beizutreten."
-#: src/gui/socialwindow.cpp:1563
+#: src/gui/socialwindow.cpp:1565
msgid "Accept Guild Invite"
msgstr "Nehme Gildeneinladung an"
-#: src/gui/socialwindow.cpp:1578
+#: src/gui/socialwindow.cpp:1580
msgid "Received party request, but one already exists."
msgstr "Anfrage für eine Party erhalten, aber du bist bereits in einer Party."
-#: src/gui/socialwindow.cpp:1589
+#: src/gui/socialwindow.cpp:1591
msgid "You have been invited you to join a party."
msgstr "Du wurdest zu einer Party eingeladen."
-#: src/gui/socialwindow.cpp:1593
+#: src/gui/socialwindow.cpp:1595
#, c-format
msgid "You have been invited to join the %s party."
msgstr "Du wurdest zu der Party %s eingeladen."
-#: src/gui/socialwindow.cpp:1601
+#: src/gui/socialwindow.cpp:1603
#, c-format
msgid "%s has invited you to join their party."
msgstr "%s hat dich in seine Party eingeladen."
-#: src/gui/socialwindow.cpp:1606
+#: src/gui/socialwindow.cpp:1608
#, c-format
msgid "%s has invited you to join the %s party."
msgstr "%s hat dich eingeladen, an der Party %s teilzunehmen."
-#: src/gui/socialwindow.cpp:1615
+#: src/gui/socialwindow.cpp:1617
msgid "Accept Party Invite"
msgstr "Nehme Partyeinladung an"
-#: src/gui/socialwindow.cpp:1630
+#: src/gui/socialwindow.cpp:1632
msgid "Cannot create party. You are already in a party"
msgstr "Konnte keine Partie erstellen. Du bist schon in einer Partie."
-#: src/gui/socialwindow.cpp:1635
+#: src/gui/socialwindow.cpp:1637
msgid "Party Name"
msgstr "Partyname"
-#: src/gui/socialwindow.cpp:1636
+#: src/gui/socialwindow.cpp:1638
msgid "Choose your party's name."
msgstr "Name deiner Party wählen."
@@ -3085,29 +3096,29 @@ msgstr "Name : %s"
msgid "Updating..."
msgstr "Aktualisiere..."
-#: src/gui/updaterwindow.cpp:160
+#: src/gui/updaterwindow.cpp:166
msgid "Connecting..."
msgstr "Verbinde..."
-#: src/gui/updaterwindow.cpp:163
+#: src/gui/updaterwindow.cpp:169
msgid "Play"
msgstr "Los!"
-#: src/gui/updaterwindow.cpp:566
+#: src/gui/updaterwindow.cpp:570
msgid "##1 The update process is incomplete."
msgstr "##1 Update wurde nicht erfolgreich abgeschlossen."
#. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:568
+#: src/gui/updaterwindow.cpp:572
msgid "##1 It is strongly recommended that"
msgstr "##1 Es wird dringend empfohlen,"
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:570
+#: src/gui/updaterwindow.cpp:574
msgid "##1 you try again later."
msgstr "##1 Du versuchts es später erneut."
-#: src/gui/updaterwindow.cpp:746
+#: src/gui/updaterwindow.cpp:750
msgid "Completed"
msgstr "Fertig"
@@ -3476,7 +3487,7 @@ msgstr "Wer ist Online"
#: src/gui/windowmenu.cpp:69
msgid "KS"
-msgstr ""
+msgstr "BGS"
#: src/gui/windowmenu.cpp:71
msgid "Smilies"
@@ -3524,7 +3535,7 @@ msgstr "ZS"
#: src/gui/windowmenu.cpp:97
msgid "DR"
-msgstr ""
+msgstr "WW"
#: src/gui/windowmenu.cpp:98
msgid "YK"
@@ -3536,7 +3547,7 @@ msgstr "Wusstest du schon"
#: src/gui/windowmenu.cpp:100
msgid "SET"
-msgstr ""
+msgstr "EINST"
#: src/gui/worldselectdialog.cpp:77
msgid "Select World"
@@ -3648,7 +3659,7 @@ msgstr "Handeln erlauben/verbieten"
#: src/keyboardconfig.cpp:80
msgid "Change Map View Mode"
-msgstr ""
+msgstr "Wechsle Ansichtsmodus der Karte"
#: src/keyboardconfig.cpp:82
msgid "Select OK"
@@ -3723,7 +3734,7 @@ msgstr "Debugfenster"
#: src/keyboardconfig.cpp:149
msgid "Social Window"
-msgstr ""
+msgstr "Gesellschaftsfenster"
#: src/keyboardconfig.cpp:151
msgid "Emote Shortcut Window"
@@ -3731,7 +3742,7 @@ msgstr "Kurztasten für Gefühle"
#: src/keyboardconfig.cpp:153
msgid "Outfits Window"
-msgstr ""
+msgstr "Kleidungs Fenster"
#: src/keyboardconfig.cpp:155
msgid "Shop Window"
@@ -3739,11 +3750,11 @@ msgstr "Kauf Fenster"
#: src/keyboardconfig.cpp:157
msgid "Quick drop Window"
-msgstr ""
+msgstr "Schnelles wegwerfen Fenster"
#: src/keyboardconfig.cpp:159
msgid "Kill Stats Window"
-msgstr ""
+msgstr "Besiegte Gegner Fenster"
#: src/keyboardconfig.cpp:161
msgid "Commands Window"
@@ -3763,11 +3774,11 @@ msgstr "Wusstest du schon Fenster"
#: src/keyboardconfig.cpp:171
msgid "Previous Social Tab"
-msgstr ""
+msgstr "Vorheriger Gesellschaftstab"
#: src/keyboardconfig.cpp:173
msgid "Next Social Tab"
-msgstr ""
+msgstr "Nächster Gesellschaftstab"
#: src/keyboardconfig.cpp:175
msgid "Emotes Keys"
@@ -3934,7 +3945,7 @@ msgstr ""
#: src/keyboardconfig.cpp:330
msgid "Change move type"
-msgstr ""
+msgstr "Wechsle die Bewegungsart"
#: src/keyboardconfig.cpp:332
msgid "Change Attack Weapon Type"
@@ -3962,7 +3973,7 @@ msgstr "An/Aus Audio"
#: src/keyboardconfig.cpp:344
msgid "Enable / Disable away mode"
-msgstr ""
+msgstr "Aktiviere/Deaktiviere abwesend Modus"
#: src/keyboardconfig.cpp:346
msgid "Emulate right click from keyboard"
@@ -3982,6 +3993,8 @@ msgid ""
"Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
"strange behaviour."
msgstr ""
+"Konflikt zwischen \"%s\" und \"%s\" Tasten. Ändere die Tastenbelegung oder "
+"das Spiel lässt sich nicht richtig steuern."
#: src/localplayer.cpp:384
#, c-format
@@ -4294,23 +4307,23 @@ msgstr "Spielmodifikatoren sind deaktiviert"
msgid "Game modifiers are unknown"
msgstr ""
-#: src/localplayer.cpp:3757
+#: src/localplayer.cpp:3758
msgid "Follow: "
msgstr "Folgen:"
-#: src/localplayer.cpp:3759 src/localplayer.cpp:3774
+#: src/localplayer.cpp:3760 src/localplayer.cpp:3775
msgid "Follow canceled"
msgstr "Folgen abgebrochen"
-#: src/localplayer.cpp:3766
+#: src/localplayer.cpp:3767
msgid "Imitation: "
msgstr ""
-#: src/localplayer.cpp:3768 src/localplayer.cpp:3776
+#: src/localplayer.cpp:3769 src/localplayer.cpp:3777
msgid "Imitation canceled"
msgstr ""
-#: src/localplayer.cpp:4124
+#: src/localplayer.cpp:4125
msgid "You see "
msgstr "Du siehst"
@@ -4340,7 +4353,7 @@ msgstr "-l --log-file : Log Datei benutzen"
#: src/main.cpp:58
msgid " -L --chat-log-dir : Chat log dir to use"
-msgstr ""
+msgstr " -L --chat-log-dir : Verzeichnis für die Chat Log"
#: src/main.cpp:59
msgid " -v --version : Display the version"
@@ -4376,7 +4389,7 @@ msgstr " -p --port : Port des Loginservers"
#: src/main.cpp:67
msgid " --update-host : Use this update host"
-msgstr ""
+msgstr " --update-host : Benutzt diesen Aktualisierungs Host"
#: src/main.cpp:68
msgid " -D --default : Choose default character server and character"
@@ -4944,7 +4957,7 @@ msgstr "Du bist nicht Tod, du ruhst dich nur aus."
#: src/net/ea/playerhandler.cpp:121
msgid "You are no more."
-msgstr ""
+msgstr "Du bit tot."
#: src/net/ea/playerhandler.cpp:122
msgid "You have ceased to be."
@@ -4965,14 +4978,16 @@ msgstr "Deines Lebens beraubt, ruhst du in Frieden."
#: src/net/ea/playerhandler.cpp:126
msgid "If you weren't so animated, you'd be pushing up the daisies."
msgstr ""
+"Wenn sie nicht so unvorsichtig gewesen währen, könnten sie die Radischen "
+"noch von oben sehen."
#: src/net/ea/playerhandler.cpp:127
msgid "Your metabolic processes are now history."
-msgstr ""
+msgstr "Deine metabolischen Prozesse sind nun Geschichte."
#: src/net/ea/playerhandler.cpp:128
msgid "You're off the twig."
-msgstr ""
+msgstr "Du bist weg vom Fenster."
#: src/net/ea/playerhandler.cpp:129
msgid "You've kicked the bucket."
@@ -5020,7 +5035,7 @@ msgstr ""
#: src/net/ea/playerhandler.cpp:505
msgid "Cannot raise skill!"
-msgstr ""
+msgstr "Kann diese Fähigkeit nicht aufwerten!"
#: src/net/ea/playerhandler.cpp:623
msgid "Equip arrows first."
@@ -5032,7 +5047,7 @@ msgstr "Handeln Fehlgeschlagen"
#: src/net/ea/specialhandler.cpp:146
msgid "Emote failed!"
-msgstr ""
+msgstr "Emotion fehlgeschlagen"
#: src/net/ea/specialhandler.cpp:149
msgid "Sit failed!"
@@ -5040,7 +5055,7 @@ msgstr "Sitzen Fehlgeschlagen"
#: src/net/ea/specialhandler.cpp:152
msgid "Chat creating failed!"
-msgstr ""
+msgstr "Chat starten fehlgeschlagen."
#: src/net/ea/specialhandler.cpp:155
msgid "Could not join party!"
@@ -5052,7 +5067,7 @@ msgstr ""
#: src/net/ea/specialhandler.cpp:171
msgid "You have not yet reached a high enough lvl!"
-msgstr ""
+msgstr "Du hast noch ein zu niedriges Level!"
#: src/net/ea/specialhandler.cpp:174
msgid "Insufficient HP!"
@@ -5064,7 +5079,7 @@ msgstr ""
#: src/net/ea/specialhandler.cpp:180
msgid "You have no memos!"
-msgstr ""
+msgstr "Du hast keine Erinnerungen!"
#: src/net/ea/specialhandler.cpp:183
msgid "You cannot do that right now!"
@@ -5096,7 +5111,7 @@ msgstr "Huh? Was ist das?"
#: src/net/ea/specialhandler.cpp:213
msgid "Warp failed..."
-msgstr ""
+msgstr "Warp fehlgeschlagen..."
#: src/net/ea/specialhandler.cpp:216
msgid "Could not steal anything..."
@@ -5144,14 +5159,18 @@ msgstr ""
#: src/net/ea/tradehandler.cpp:242
msgid "Failed adding item. Trade partner has no free slot."
msgstr ""
+"Gegenstand hinzufügen fehlgeschlagen. Handelspartner hat keinen Platz in "
+"seinem Inventar."
#: src/net/ea/tradehandler.cpp:247
msgid "Failed adding item. You can't trade this item."
msgstr ""
+"Gegenstand hinzufügen fehlgeschlagen. Sie können diesen Gegenstand nicht "
+"handeln."
#: src/net/ea/tradehandler.cpp:251
msgid "Failed adding item for unknown reason."
-msgstr ""
+msgstr "Gegenstand hinzufügen aus unbekannten Gründen fehlgeschlagen."
#: src/net/ea/tradehandler.cpp:270 src/net/manaserv/tradehandler.cpp:160
msgid "Trade canceled."
@@ -5266,7 +5285,7 @@ msgstr ""
#: src/net/manaserv/charhandler.cpp:178
msgid "Invalid slot number."
-msgstr ""
+msgstr "Falsche Slotnummer"
#: src/net/manaserv/charhandler.cpp:210
msgid "Player deleted."
@@ -5468,7 +5487,7 @@ msgstr ""
#: src/net/tmwa/buysellhandler.cpp:143
msgid "Unable to sell unsellable item."
-msgstr ""
+msgstr "Es ist nicht möglich einen unverkäuflichen Gegenstand zu verkaufen."
#: src/net/tmwa/generalhandler.cpp:108
#, c-format
@@ -5565,7 +5584,7 @@ msgstr "% Critical"
#: src/net/tmwa/generalhandler.cpp:282
msgid "Attack Delay"
-msgstr ""
+msgstr "Angriffs Verzögerung"
#: src/net/tmwa/generalhandler.cpp:284
msgid "Walk Delay"
diff --git a/po/es.po b/po/es.po
index 82983c66f..8d3ecbf6c 100644
--- a/po/es.po
+++ b/po/es.po
@@ -12,9 +12,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-01-21 19:25+0300\n"
-"PO-Revision-Date: 2012-01-19 19:27+0000\n"
-"Last-Translator: Nelson Martell <nelson6e65-manaplus@yahoo.es>\n"
+"POT-Creation-Date: 2012-01-25 20:17+0300\n"
+"PO-Revision-Date: 2012-01-25 17:27+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/"
"manaplus/team/es/)\n"
"Language: es\n"
@@ -45,47 +45,47 @@ msgstr "A"
msgid "I"
msgstr "I"
-#: src/client.cpp:946 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:947 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
msgid "Setup"
msgstr "Configuración"
-#: src/client.cpp:953 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:954 src/gui/setup_perfomance.cpp:48
msgid "Perfomance"
msgstr "Rendimiento"
-#: src/client.cpp:958 src/gui/setup_video.cpp:315
+#: src/client.cpp:959 src/gui/setup_video.cpp:315
msgid "Video"
msgstr "Vídeo"
-#: src/client.cpp:963
+#: src/client.cpp:964
msgid "Themes"
msgstr "Temas"
-#: src/client.cpp:1045
+#: src/client.cpp:1046
msgid "Connecting to server"
msgstr "Conectando al servidor"
-#: src/client.cpp:1076
+#: src/client.cpp:1077
msgid "Logging in"
msgstr "Accediendo a la cuenta"
-#: src/client.cpp:1109
+#: src/client.cpp:1110
msgid "Entering game world"
msgstr "Entrando al mundo del juego"
-#: src/client.cpp:1210
+#: src/client.cpp:1211
msgid "Requesting characters"
msgstr "Cargando personajes"
-#: src/client.cpp:1241
+#: src/client.cpp:1242
msgid "Connecting to the game server"
msgstr "Conectando al servidor del juego"
-#: src/client.cpp:1251
+#: src/client.cpp:1252
msgid "Changing game servers"
msgstr "Cambiando servidores del juego"
-#: src/client.cpp:1294 src/client.cpp:1301 src/client.cpp:1435
+#: src/client.cpp:1295 src/client.cpp:1302 src/client.cpp:1436
#: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:256
#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
@@ -95,50 +95,50 @@ msgstr "Cambiando servidores del juego"
msgid "Error"
msgstr "Error"
-#: src/client.cpp:1310
+#: src/client.cpp:1311
msgid "Requesting registration details"
msgstr "Solicitando detalles de registro"
-#: src/client.cpp:1336
+#: src/client.cpp:1337
msgid "Password Change"
msgstr "Cambio de contraseña"
-#: src/client.cpp:1337
+#: src/client.cpp:1338
msgid "Password changed successfully!"
msgstr "¡Contraseña cambiada exitosamente!"
-#: src/client.cpp:1356
+#: src/client.cpp:1357
msgid "Email Change"
msgstr "Cambio de Email"
-#: src/client.cpp:1357
+#: src/client.cpp:1358
msgid "Email changed successfully!"
msgstr "¡Email modificado exitosamente!"
-#: src/client.cpp:1377
+#: src/client.cpp:1378
msgid "Unregister Successful"
msgstr "Registro cancelado"
-#: src/client.cpp:1378
+#: src/client.cpp:1379
msgid "Farewell, come back any time..."
msgstr "Adiós, vuelve cuando quieras..."
-#: src/client.cpp:1583 src/client.cpp:1616 src/client.cpp:1631
-#: src/client.cpp:2063 src/client.cpp:2070
+#: src/client.cpp:1584 src/client.cpp:1617 src/client.cpp:1632
+#: src/client.cpp:2064 src/client.cpp:2071
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "¡%s no existe y no puede ser creado! Saliendo."
-#: src/client.cpp:1769
+#: src/client.cpp:1770
#, c-format
msgid "Invalid update host: %s"
msgstr "Servidor de actualización inválido: %s"
-#: src/client.cpp:1803 src/client.cpp:1809
+#: src/client.cpp:1804 src/client.cpp:1810
msgid "Error creating updates directory!"
msgstr "¡Error al crear la carpeta de actualizaciones!"
-#: src/client.cpp:1830
+#: src/client.cpp:1831
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "Error: ¡%s no existe y no puede ser creado! Saliendo."
@@ -413,7 +413,7 @@ msgstr "Mover"
msgid "Result"
msgstr "Resultado"
-#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:124
+#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:128
msgid "Reset"
msgstr "Restablecer"
@@ -436,16 +436,16 @@ msgstr "Cantidad:"
#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:207
-#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:765
+#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:118
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:770
msgid "+"
msgstr "+"
#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:777
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:119
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:782
msgid "-"
msgstr "-"
@@ -457,8 +457,8 @@ msgid "Quit"
msgstr "Salir"
#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
-#: src/gui/statuswindow.cpp:515 src/gui/statuswindow.cpp:565
-#: src/gui/statuswindow.cpp:764 src/gui/statuswindow.cpp:795
+#: src/gui/statuswindow.cpp:515 src/gui/statuswindow.cpp:570
+#: src/gui/statuswindow.cpp:769 src/gui/statuswindow.cpp:800
msgid "Max"
msgstr "Máximo"
@@ -489,7 +489,7 @@ msgstr "Vender"
#: src/gui/quitdialog.cpp:55 src/gui/register.cpp:82 src/gui/setup.cpp:72
#: src/gui/socialwindow.cpp:1198 src/gui/textcommandeditor.cpp:241
#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updaterwindow.cpp:162
+#: src/gui/updaterwindow.cpp:168
msgid "Cancel"
msgstr "Cancelar"
@@ -913,7 +913,7 @@ msgid "Did You Know?"
msgstr "¿Sabías que...?"
#: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
-#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:53
+#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
#: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:113
msgid "Close"
msgstr "Cerrar"
@@ -1250,24 +1250,24 @@ msgstr "barra de estado"
msgid "Need"
msgstr "Necesitas"
-#: src/gui/npcdialog.cpp:51
+#: src/gui/npcdialog.cpp:52
msgid "Stop waiting"
msgstr "Dejar de esperar"
-#: src/gui/npcdialog.cpp:52
+#: src/gui/npcdialog.cpp:53
msgid "Next"
msgstr "Siguiente"
-#: src/gui/npcdialog.cpp:54
+#: src/gui/npcdialog.cpp:55
msgid "Submit"
msgstr "Enviar"
-#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
+#: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
#: src/gui/setup_other.cpp:151
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:632
+#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:632
msgid "Clear"
msgstr "Limpiar"
@@ -1289,6 +1289,7 @@ msgid "Outfit: %d"
msgstr "Conjuntos: %d"
#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:892
+#: src/gui/windowmenu.cpp:302
#, c-format
msgid "Key: %s"
msgstr "Tecla: %s"
@@ -2784,7 +2785,7 @@ msgstr "Criaturas ignoradas"
msgid "Create Guild"
msgstr "Crear Clan"
-#: src/gui/socialwindow.cpp:1196 src/gui/socialwindow.cpp:1629
+#: src/gui/socialwindow.cpp:1196 src/gui/socialwindow.cpp:1631
msgid "Create Party"
msgstr "Crear grupo"
@@ -2796,93 +2797,103 @@ msgstr "Social"
msgid "Invite"
msgstr "Invitar"
-#: src/gui/socialwindow.cpp:1412
+#. TRANSLATORS: here P is title for visible players tab in social window
+#: src/gui/socialwindow.cpp:1277
+msgid "P"
+msgstr ""
+
+#. TRANSLATORS: here F is title for friends tab in social window
+#: src/gui/socialwindow.cpp:1281
+msgid "F"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1414
#, c-format
msgid "Accepted party invite from %s."
msgstr "Aceptada la invitación de %s."
-#: src/gui/socialwindow.cpp:1422
+#: src/gui/socialwindow.cpp:1424
#, c-format
msgid "Rejected party invite from %s."
msgstr "Cancelada la invitación de %s."
-#: src/gui/socialwindow.cpp:1439
+#: src/gui/socialwindow.cpp:1441
#, c-format
msgid "Accepted guild invite from %s."
msgstr "Aceptada la invitación al clan de %s."
-#: src/gui/socialwindow.cpp:1452
+#: src/gui/socialwindow.cpp:1454
#, c-format
msgid "Rejected guild invite from %s."
msgstr "Rechazada la invitación al clan de %s."
-#: src/gui/socialwindow.cpp:1499
+#: src/gui/socialwindow.cpp:1501
#, c-format
msgid "Creating guild called %s."
msgstr "Creando clan llamado %s."
-#: src/gui/socialwindow.cpp:1522
+#: src/gui/socialwindow.cpp:1524
#, c-format
msgid "Creating party called %s."
msgstr "Creando grupo llamado %s."
-#: src/gui/socialwindow.cpp:1536
+#: src/gui/socialwindow.cpp:1538
msgid "Guild Name"
msgstr "Nombre del clan"
-#: src/gui/socialwindow.cpp:1537
+#: src/gui/socialwindow.cpp:1539
msgid "Choose your guild's name."
msgstr "Escoge el nombre de tu clan."
-#: src/gui/socialwindow.cpp:1551
+#: src/gui/socialwindow.cpp:1553
msgid "Received guild request, but one already exists."
msgstr "Recibida petición de creación del clan, pero ya existe."
-#: src/gui/socialwindow.cpp:1557
+#: src/gui/socialwindow.cpp:1559
#, c-format
msgid "%s has invited you to join the guild %s."
msgstr "%s te ha invitado al clan %s."
-#: src/gui/socialwindow.cpp:1563
+#: src/gui/socialwindow.cpp:1565
msgid "Accept Guild Invite"
msgstr "Aceptar invitación al clan"
-#: src/gui/socialwindow.cpp:1578
+#: src/gui/socialwindow.cpp:1580
msgid "Received party request, but one already exists."
msgstr "Recibida petición de creación del grupo, pero ya existe."
-#: src/gui/socialwindow.cpp:1589
+#: src/gui/socialwindow.cpp:1591
msgid "You have been invited you to join a party."
msgstr "Fuiste invitado a un grupo."
-#: src/gui/socialwindow.cpp:1593
+#: src/gui/socialwindow.cpp:1595
#, c-format
msgid "You have been invited to join the %s party."
msgstr "Has sido invitado para unirte al grupo %s."
-#: src/gui/socialwindow.cpp:1601
+#: src/gui/socialwindow.cpp:1603
#, c-format
msgid "%s has invited you to join their party."
msgstr "%s te ha invitado a unirte a su grupo."
-#: src/gui/socialwindow.cpp:1606
+#: src/gui/socialwindow.cpp:1608
#, c-format
msgid "%s has invited you to join the %s party."
msgstr "%s te ha invitado para unirte al grupo %s."
-#: src/gui/socialwindow.cpp:1615
+#: src/gui/socialwindow.cpp:1617
msgid "Accept Party Invite"
msgstr "Aceptar invitación al grupo"
-#: src/gui/socialwindow.cpp:1630
+#: src/gui/socialwindow.cpp:1632
msgid "Cannot create party. You are already in a party"
msgstr "No se pudo crear un grupo. Ya estás en uno."
-#: src/gui/socialwindow.cpp:1635
+#: src/gui/socialwindow.cpp:1637
msgid "Party Name"
msgstr "Nombre del grupo"
-#: src/gui/socialwindow.cpp:1636
+#: src/gui/socialwindow.cpp:1638
msgid "Choose your party's name."
msgstr "Escoge el nombre del grupo."
@@ -3078,29 +3089,29 @@ msgstr "Nombre: %s"
msgid "Updating..."
msgstr "Actualizando..."
-#: src/gui/updaterwindow.cpp:160
+#: src/gui/updaterwindow.cpp:166
msgid "Connecting..."
msgstr "Conectando..."
-#: src/gui/updaterwindow.cpp:163
+#: src/gui/updaterwindow.cpp:169
msgid "Play"
msgstr "Jugar"
-#: src/gui/updaterwindow.cpp:566
+#: src/gui/updaterwindow.cpp:570
msgid "##1 The update process is incomplete."
msgstr "##1 El proceso de actualización esta incompleto."
#. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:568
+#: src/gui/updaterwindow.cpp:572
msgid "##1 It is strongly recommended that"
msgstr "##1 Es altamente recomendado que"
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:570
+#: src/gui/updaterwindow.cpp:574
msgid "##1 you try again later."
msgstr "##1 lo intentes de nuevo más tarde."
-#: src/gui/updaterwindow.cpp:746
+#: src/gui/updaterwindow.cpp:750
msgid "Completed"
msgstr "Completado"
@@ -4289,23 +4300,23 @@ msgstr "Modificadores del juego están deshabilitados"
msgid "Game modifiers are unknown"
msgstr "Los modificadores del juego son desconocidos"
-#: src/localplayer.cpp:3757
+#: src/localplayer.cpp:3758
msgid "Follow: "
msgstr "Seguir: "
-#: src/localplayer.cpp:3759 src/localplayer.cpp:3774
+#: src/localplayer.cpp:3760 src/localplayer.cpp:3775
msgid "Follow canceled"
msgstr "Seguir cancelado"
-#: src/localplayer.cpp:3766
+#: src/localplayer.cpp:3767
msgid "Imitation: "
msgstr "Imitación: "
-#: src/localplayer.cpp:3768 src/localplayer.cpp:3776
+#: src/localplayer.cpp:3769 src/localplayer.cpp:3777
msgid "Imitation canceled"
msgstr "Imitación cancelada"
-#: src/localplayer.cpp:4124
+#: src/localplayer.cpp:4125
msgid "You see "
msgstr "Ves "
diff --git a/po/fi.po b/po/fi.po
index fa82c7eae..2ab7d810e 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-01-21 19:25+0300\n"
-"PO-Revision-Date: 2012-01-05 20:43+0000\n"
+"POT-Creation-Date: 2012-01-25 20:17+0300\n"
+"PO-Revision-Date: 2012-01-25 17:27+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: fi\n"
@@ -34,54 +34,54 @@ msgstr "huti"
#. TRANSLATORS: this away status writed in player nick
#: src/being.cpp:1534
msgid "A"
-msgstr ""
+msgstr "P"
#. TRANSLATORS: this inactive status writed in player nick
#: src/being.cpp:1539
msgid "I"
-msgstr ""
+msgstr "-"
-#: src/client.cpp:946 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:947 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
msgid "Setup"
msgstr "Asetukset"
-#: src/client.cpp:953 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:954 src/gui/setup_perfomance.cpp:48
msgid "Perfomance"
-msgstr ""
+msgstr "Tehokkuus"
-#: src/client.cpp:958 src/gui/setup_video.cpp:315
+#: src/client.cpp:959 src/gui/setup_video.cpp:315
msgid "Video"
msgstr "Kuva"
-#: src/client.cpp:963
+#: src/client.cpp:964
msgid "Themes"
-msgstr ""
+msgstr "Teemat"
-#: src/client.cpp:1045
+#: src/client.cpp:1046
msgid "Connecting to server"
msgstr "Yhdistän palvelimeen"
-#: src/client.cpp:1076
+#: src/client.cpp:1077
msgid "Logging in"
msgstr "Kirjaudun sisään"
-#: src/client.cpp:1109
+#: src/client.cpp:1110
msgid "Entering game world"
msgstr "Siirryn pelimaailmaan"
-#: src/client.cpp:1210
+#: src/client.cpp:1211
msgid "Requesting characters"
msgstr "Pyydän hahmoja"
-#: src/client.cpp:1241
+#: src/client.cpp:1242
msgid "Connecting to the game server"
msgstr "Yhdistän pelipalvelimeen"
-#: src/client.cpp:1251
+#: src/client.cpp:1252
msgid "Changing game servers"
msgstr "Vaihdan pelipalvelinta"
-#: src/client.cpp:1294 src/client.cpp:1301 src/client.cpp:1435
+#: src/client.cpp:1295 src/client.cpp:1302 src/client.cpp:1436
#: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:256
#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
@@ -91,50 +91,50 @@ msgstr "Vaihdan pelipalvelinta"
msgid "Error"
msgstr "Virhe"
-#: src/client.cpp:1310
+#: src/client.cpp:1311
msgid "Requesting registration details"
msgstr "Pyydän rekisteröitymisen yksityiskohtia"
-#: src/client.cpp:1336
+#: src/client.cpp:1337
msgid "Password Change"
msgstr "Salasanan vaihto"
-#: src/client.cpp:1337
+#: src/client.cpp:1338
msgid "Password changed successfully!"
msgstr "Salasana vaihdettu onnistuneesti!"
-#: src/client.cpp:1356
+#: src/client.cpp:1357
msgid "Email Change"
msgstr "Sähköpostin vaihto"
-#: src/client.cpp:1357
+#: src/client.cpp:1358
msgid "Email changed successfully!"
msgstr "Sähköpostiosoite vaihdettu onnistuneesti!"
-#: src/client.cpp:1377
+#: src/client.cpp:1378
msgid "Unregister Successful"
msgstr "Tietojen poisto onnistui"
-#: src/client.cpp:1378
+#: src/client.cpp:1379
msgid "Farewell, come back any time..."
msgstr "Näkemisiin, tule pian takaisin..."
-#: src/client.cpp:1583 src/client.cpp:1616 src/client.cpp:1631
-#: src/client.cpp:2063 src/client.cpp:2070
+#: src/client.cpp:1584 src/client.cpp:1617 src/client.cpp:1632
+#: src/client.cpp:2064 src/client.cpp:2071
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%s ei ole olemassa eikä sitä voi luoda! Poistun."
-#: src/client.cpp:1769
+#: src/client.cpp:1770
#, c-format
msgid "Invalid update host: %s"
msgstr "Epäkelpo päivitysosoite: %s"
-#: src/client.cpp:1803 src/client.cpp:1809
+#: src/client.cpp:1804 src/client.cpp:1810
msgid "Error creating updates directory!"
msgstr "Päivityshakemistoa luodessa tapahtui virhe!"
-#: src/client.cpp:1830
+#: src/client.cpp:1831
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "Virhe: %s ei ole olemassa eikä sitä voi luoda! Poistun."
@@ -231,11 +231,11 @@ msgstr "Pelaajan uudelleenhuomiointi epäonnistui."
#: src/commandhandler.cpp:591
msgid "blacklisted"
-msgstr ""
+msgstr "mustalistattu"
#: src/commandhandler.cpp:596
msgid "enemy"
-msgstr ""
+msgstr "vihollinen"
#: src/commandhandler.cpp:611
msgid "Player already erased!"
@@ -379,7 +379,7 @@ msgstr "PvP-taso: %d"
#: src/gui/beingpopup.cpp:162
#, c-format
msgid "Comment: %s"
-msgstr ""
+msgstr "Kommentti: %s"
#: src/gui/botcheckerwindow.cpp:266
msgid "Bot Checker"
@@ -410,7 +410,7 @@ msgstr "Liiku"
msgid "Result"
msgstr "Tulos"
-#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:124
+#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:128
msgid "Reset"
msgstr "Nollaa"
@@ -428,21 +428,21 @@ msgstr "Hinta: %s / Kaikkiaan: %s"
#: src/gui/buydialog.cpp:103
msgid "Amount:"
-msgstr ""
+msgstr "Määrä:"
#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:207
-#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:765
+#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:118
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:770
msgid "+"
msgstr "+"
#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:777
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:119
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:782
msgid "-"
msgstr "-"
@@ -454,8 +454,8 @@ msgid "Quit"
msgstr "Sulje"
#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
-#: src/gui/statuswindow.cpp:515 src/gui/statuswindow.cpp:565
-#: src/gui/statuswindow.cpp:764 src/gui/statuswindow.cpp:795
+#: src/gui/statuswindow.cpp:515 src/gui/statuswindow.cpp:570
+#: src/gui/statuswindow.cpp:769 src/gui/statuswindow.cpp:800
msgid "Max"
msgstr "Max"
@@ -486,7 +486,7 @@ msgstr "Myy"
#: src/gui/quitdialog.cpp:55 src/gui/register.cpp:82 src/gui/setup.cpp:72
#: src/gui/socialwindow.cpp:1198 src/gui/textcommandeditor.cpp:241
#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updaterwindow.cpp:162
+#: src/gui/updaterwindow.cpp:168
msgid "Cancel"
msgstr "Peru"
@@ -893,7 +893,7 @@ msgstr "Kriittinen osuma:"
#: src/gui/debugwindow.cpp:387 src/gui/debugwindow.cpp:392
#, c-format
msgid "Ping: %s ms"
-msgstr ""
+msgstr "Ping: %s ms"
#: src/gui/debugwindow.cpp:395
#, c-format
@@ -907,25 +907,25 @@ msgstr "Ulos: %d tavua/s"
#: src/gui/didyouknowwindow.cpp:47
msgid "Did You Know?"
-msgstr ""
+msgstr "Tiesitkö?"
#: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
-#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:53
+#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
#: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:113
msgid "Close"
msgstr "Sulje"
#: src/gui/didyouknowwindow.cpp:64
msgid "< Previous"
-msgstr ""
+msgstr "< Edellinen"
#: src/gui/didyouknowwindow.cpp:65
msgid "Next >"
-msgstr ""
+msgstr "Seuraava >"
#: src/gui/didyouknowwindow.cpp:66
msgid "Auto open this window"
-msgstr ""
+msgstr "Avaa tämä ikkuna automaattisesti"
#: src/gui/editdialog.cpp:47 src/gui/itemamountwindow.cpp:208
#: src/gui/okdialog.cpp:45 src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
@@ -949,23 +949,23 @@ msgstr "Apua"
#: src/gui/inventorywindow.cpp:71
msgid "by name"
-msgstr ""
+msgstr "nimi"
#: src/gui/inventorywindow.cpp:72
msgid "by id"
-msgstr ""
+msgstr "id"
#: src/gui/inventorywindow.cpp:73
msgid "by weight"
-msgstr ""
+msgstr "paino"
#: src/gui/inventorywindow.cpp:74
msgid "by amount"
-msgstr ""
+msgstr "määrä"
#: src/gui/inventorywindow.cpp:75
msgid "by type"
-msgstr ""
+msgstr "tyyppi"
#: src/gui/inventorywindow.cpp:112 src/gui/windowmenu.cpp:76
#: src/inventory.cpp:249
@@ -1089,36 +1089,36 @@ msgstr "Nollaa ajastin"
#: src/gui/killstats.cpp:72 src/gui/killstats.cpp:208
#, c-format
msgid "Level: %d at %f%%"
-msgstr ""
+msgstr "Taso: %d @ %f%%"
#: src/gui/killstats.cpp:76 src/gui/killstats.cpp:213
#, c-format
msgid "Exp: %d/%d Left: %d"
-msgstr ""
+msgstr "Kokemus: %d/%d, jäljellä: %d"
#: src/gui/killstats.cpp:79 src/gui/killstats.cpp:219
#: src/gui/killstats.cpp:228
#, c-format
msgid "1%% = %d exp, avg mob for 1%%: %s"
-msgstr ""
+msgstr "1%% = %d kp, keskim. vastustajaa 1%%:iin: %s"
#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145
#: src/gui/killstats.cpp:237
#, c-format
msgid "Kills: %s, total exp: %s"
-msgstr ""
+msgstr "Tappoja: %s, kp kaikkiaan: %s"
#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:147
#: src/gui/killstats.cpp:223 src/gui/killstats.cpp:233
#, c-format
msgid "Avg Exp: %s, No. of avg mob to next level: %s"
-msgstr ""
+msgstr "Keskim. kp: %s, Keskim. vastustajaa seur. tasoon: %s"
#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:165
#: src/gui/killstats.cpp:240
#, c-format
msgid "Kills/Min: %s, Exp/Min: %s"
-msgstr ""
+msgstr "Tappoa/min: %s, kp/min: %s"
#: src/gui/killstats.cpp:87 src/gui/killstats.cpp:92 src/gui/killstats.cpp:97
#: src/gui/killstats.cpp:292 src/gui/killstats.cpp:308
@@ -1126,41 +1126,41 @@ msgstr ""
#, c-format
msgid "Exp speed per %d min: %s"
msgid_plural "Exp speed per %d min: %s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Kokemustahti / %d min: %s"
+msgstr[1] "Kokemustahti / %d min: %s<"
#: src/gui/killstats.cpp:90 src/gui/killstats.cpp:95 src/gui/killstats.cpp:100
#, c-format
msgid "Time for next level per %d min: %s"
msgid_plural "Time for next level per %d min: %s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Aika ensi tasolle %d min perusteella: %s"
+msgstr[1] "Aika ensi tasolle %d min perusteella: %s"
#: src/gui/killstats.cpp:103 src/gui/killstats.cpp:244
msgid "Last kill exp:"
-msgstr ""
+msgstr "Viime tapon kp:"
#: src/gui/killstats.cpp:105 src/gui/killstats.cpp:358
#: src/gui/killstats.cpp:364 src/gui/killstats.cpp:370
#: src/gui/killstats.cpp:375
msgid "Time before jacko spawn:"
-msgstr ""
+msgstr "Aika jackon resetiin:"
#: src/gui/killstats.cpp:297 src/gui/killstats.cpp:304
#: src/gui/killstats.cpp:314 src/gui/killstats.cpp:321
#: src/gui/killstats.cpp:333 src/gui/killstats.cpp:340
#, c-format
msgid " Time for next level: %s"
-msgstr ""
+msgstr " Aika seur. tasolle: %s"
#: src/gui/killstats.cpp:364
#, c-format
msgid "%s %d?"
-msgstr ""
+msgstr "%s %d?"
#: src/gui/killstats.cpp:370
msgid "jacko spawning"
-msgstr ""
+msgstr "jacko elää!"
#: src/guildmanager.cpp:485 src/net/ea/guildhandler.cpp:451
msgid "You have left the guild."
@@ -1247,24 +1247,24 @@ msgstr "tilapalkki"
msgid "Need"
msgstr "Tarvitaan"
-#: src/gui/npcdialog.cpp:51
+#: src/gui/npcdialog.cpp:52
msgid "Stop waiting"
-msgstr ""
+msgstr "Lakkaa odottamasta"
-#: src/gui/npcdialog.cpp:52
+#: src/gui/npcdialog.cpp:53
msgid "Next"
msgstr "Seuraava"
-#: src/gui/npcdialog.cpp:54
+#: src/gui/npcdialog.cpp:55
msgid "Submit"
msgstr "Lähetä"
-#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
+#: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
#: src/gui/setup_other.cpp:151
msgid "NPC"
msgstr "Ei-pelaajahahmo (NPC)"
-#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:632
+#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:632
msgid "Clear"
msgstr "Tyhjennä"
@@ -1286,6 +1286,7 @@ msgid "Outfit: %d"
msgstr "Asu: %d"
#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:892
+#: src/gui/windowmenu.cpp:302
#, c-format
msgid "Key: %s"
msgstr "Näppäin: %s"
@@ -1333,7 +1334,7 @@ msgstr "Vaimenna"
#: src/gui/popupmenu.cpp:685 src/gui/popupmenu.cpp:693
#: src/gui/popupmenu.cpp:716
msgid "Black list"
-msgstr ""
+msgstr "Musta lista"
#: src/gui/popupmenu.cpp:152 src/gui/popupmenu.cpp:160
#: src/gui/popupmenu.cpp:168 src/gui/popupmenu.cpp:415
@@ -1341,7 +1342,7 @@ msgstr ""
#: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:694
#: src/gui/popupmenu.cpp:702
msgid "Set as enemy"
-msgstr ""
+msgstr "Aseta viholliseksi"
#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:177
@@ -1429,17 +1430,17 @@ msgstr "Riisu"
#: src/gui/popupmenu.cpp:467 src/gui/popupmenu.cpp:741
#: src/gui/popupmenu.cpp:830
msgid "Add comment"
-msgstr ""
+msgstr "Lisää kommentti"
#: src/gui/popupmenu.cpp:286 src/gui/popupmenu.cpp:515
#: src/gui/popupmenu.cpp:756 src/gui/popupmenu.cpp:835
msgid "Buy (?)"
-msgstr ""
+msgstr "Osta (?)"
#: src/gui/popupmenu.cpp:287 src/gui/popupmenu.cpp:516
#: src/gui/popupmenu.cpp:757 src/gui/popupmenu.cpp:836
msgid "Sell (?)"
-msgstr ""
+msgstr "Myy (?)"
#: src/gui/popupmenu.cpp:312
msgid "Kick"
@@ -1471,7 +1472,7 @@ msgstr "Pelaajat"
#: src/gui/popupmenu.cpp:546
msgid "Pick up"
-msgstr "Nosta"
+msgstr "Poimi"
#: src/gui/popupmenu.cpp:547 src/gui/popupmenu.cpp:1848
#: src/gui/popupmenu.cpp:1932 src/gui/popupmenu.cpp:1979
@@ -1493,11 +1494,11 @@ msgstr "Poista"
#: src/gui/popupmenu.cpp:573
msgid "Warp"
-msgstr ""
+msgstr "Warppaa"
#: src/gui/popupmenu.cpp:589
msgid "Clear outfit"
-msgstr ""
+msgstr "Poista asu"
#: src/gui/popupmenu.cpp:608 src/gui/windowmenu.cpp:96
msgid "Spells"
@@ -1521,7 +1522,7 @@ msgstr "Salli korostus"
#: src/gui/popupmenu.cpp:640
msgid "Don't remove name"
-msgstr ""
+msgstr "Älä poista nimeä"
#: src/gui/popupmenu.cpp:642
msgid "Remove name"
@@ -1541,7 +1542,7 @@ msgstr "Eroa"
#: src/gui/popupmenu.cpp:654
msgid "Copy to clipboard"
-msgstr ""
+msgstr "Kopioi leikepöydälle"
#: src/gui/popupmenu.cpp:849
msgid "Change guild position"
@@ -1560,12 +1561,12 @@ msgstr "Nimi: "
#. TRANSLATORS: number of chars in string should be near original
#: src/gui/popupmenu.cpp:1382
msgid "Player comment "
-msgstr ""
+msgstr "Pelaajakommentti "
#. TRANSLATORS: number of chars in string should be near original
#: src/gui/popupmenu.cpp:1384
msgid "Comment: "
-msgstr ""
+msgstr "Kommentti: "
#: src/gui/popupmenu.cpp:1786
msgid "Add to trade"
@@ -1598,7 +1599,7 @@ msgstr "Varastoi kaikki"
#: src/gui/popupmenu.cpp:1824 src/gui/popupmenu.cpp:1920
#: src/gui/popupmenu.cpp:1967
msgid "Drop all"
-msgstr ""
+msgstr "Pudota kaikki"
#: src/gui/popupmenu.cpp:1843
msgid "Retrieve 10"
@@ -1634,7 +1635,7 @@ msgstr "Palauta oletusmuokkaimet (keltainen palkki)"
#: src/gui/popupmenu.cpp:2062 src/gui/statuswindow.cpp:242
msgid "Copy to chat"
-msgstr ""
+msgstr "Kopioi keskusteluun"
#: src/gui/popupmenu.cpp:2082 src/gui/setup_theme.cpp:88
#: src/gui/setup_theme.cpp:145 src/gui/socialwindow.cpp:982
@@ -1696,7 +1697,7 @@ msgstr "Valitse palvelimesi"
#: src/gui/serverdialog.cpp:248
msgid "Choose Your Server *** SAFE MODE ***"
-msgstr ""
+msgstr "Valitse palvelimesi *** VARMUUSTILA ***"
#: src/gui/serverdialog.cpp:253
msgid "Port:"
@@ -1816,7 +1817,7 @@ msgstr "Näytä keskustelun värilista"
#: src/gui/setup_chat.cpp:64
msgid "Commands"
-msgstr ""
+msgstr "Komennot"
#: src/gui/setup_chat.cpp:66
msgid "Allow magic and GM commands in all chat tabs"
@@ -1824,7 +1825,7 @@ msgstr "Salli magia ja GM-komennot kaikilla keskusteluvälilehdillä"
#: src/gui/setup_chat.cpp:70
msgid "Limits"
-msgstr ""
+msgstr "Rajat"
#: src/gui/setup_chat.cpp:72
msgid "Limit max chars in chat line"
@@ -1836,7 +1837,7 @@ msgstr "Keskusteluvälilehden riviraja"
#: src/gui/setup_chat.cpp:79
msgid "Logs"
-msgstr ""
+msgstr "Lokit"
#: src/gui/setup_chat.cpp:81
msgid "Enable chat Log"
@@ -1848,7 +1849,7 @@ msgstr "Näytä keskusteluhistoria"
#: src/gui/setup_chat.cpp:88
msgid "Messages"
-msgstr ""
+msgstr "Viestit"
#: src/gui/setup_chat.cpp:90
msgid "Hide shop messages"
@@ -1856,7 +1857,7 @@ msgstr "Piilota kauppaviestit"
#: src/gui/setup_chat.cpp:94
msgid "Tabs"
-msgstr ""
+msgstr "Välilehdet"
#: src/gui/setup_chat.cpp:96
msgid "Put all whispers in tabs"
@@ -1888,23 +1889,23 @@ msgstr "Muuta välilehden kokoa tarpeen mukaan"
#: src/gui/setup_chat.cpp:118
msgid "Time"
-msgstr ""
+msgstr "Aika"
#: src/gui/setup_chat.cpp:120
msgid "Use local time"
-msgstr ""
+msgstr "Käytä paikallista aikaa"
#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:166
msgid "Other"
-msgstr ""
+msgstr "Muu"
#: src/gui/setup_chat.cpp:125
msgid "Highlight words (separated by comma)"
-msgstr ""
+msgstr "Korosta sanat (pilkuin erotettu)"
#: src/gui/setup_chat.cpp:128
msgid "Show MVP messages"
-msgstr ""
+msgstr "Näytä MVP-viestit"
#: src/gui/setup_colors.cpp:49
msgid "This is what the color looks like"
@@ -1975,7 +1976,7 @@ msgstr "Ota peliohjain käyttöön"
#: src/gui/setup_joystick.cpp:75
msgid "Use joystick if client window inactive"
-msgstr ""
+msgstr "Käytä peliohjainta jos asiakasikkuna ei ole aktiivinen"
#: src/gui/setup_joystick.cpp:78
msgid "Joystick"
@@ -1987,7 +1988,7 @@ msgstr "Lopeta"
#: src/gui/setup_joystick.cpp:149
msgid "Rotate the stick and dont press buttons"
-msgstr ""
+msgstr "Pyöritä ohjainta, älä paina nappeja"
#: src/gui/setup_keyboard.cpp:80
msgid "Keyboard"
@@ -2067,19 +2068,19 @@ msgstr "Piirrä siirtymäpikanäppäimet kartalle"
#: src/gui/setup_other.cpp:87
msgid "Enable lazy scrolling"
-msgstr ""
+msgstr "Ota laiska vieritys käyttöön"
#: src/gui/setup_other.cpp:90
msgid "Scroll laziness"
-msgstr ""
+msgstr "Vierityksen laiskuus"
#: src/gui/setup_other.cpp:93
msgid "Scroll radius"
-msgstr ""
+msgstr "Vierityksen säde"
#: src/gui/setup_other.cpp:97
msgid "Moving"
-msgstr ""
+msgstr "Liikkuminen"
#: src/gui/setup_other.cpp:99
msgid "Auto fix position"
@@ -2099,7 +2100,7 @@ msgstr "Villiliike (a) -ohjelma"
#: src/gui/setup_other.cpp:112
msgid "Player"
-msgstr ""
+msgstr "Pelaaja"
#: src/gui/setup_other.cpp:114
msgid "Show own hp bar"
@@ -2123,7 +2124,7 @@ msgstr "Näytä pelaajaponnahdusikkunat"
#: src/gui/setup_other.cpp:129
msgid "Afk message"
-msgstr ""
+msgstr "Poissaoloviesti"
#: src/gui/setup_other.cpp:132
msgid "Show job"
@@ -2135,7 +2136,7 @@ msgstr "Ota käyttöön hyökkäyssuodin"
#: src/gui/setup_other.cpp:138
msgid "Enable advert protocol"
-msgstr ""
+msgstr "Ota käyttöön mainosprotokolla"
#: src/gui/setup_other.cpp:144
msgid "Accept sell/buy requests"
@@ -2151,15 +2152,15 @@ msgstr "Kirjaa keskustelut ei-pelaajahahmojen kanssa lokiin"
#: src/gui/setup_other.cpp:157
msgid "Bots support"
-msgstr ""
+msgstr "Bottien tuki"
#: src/gui/setup_other.cpp:159
msgid "Enable auction bot support"
-msgstr ""
+msgstr "Ota käyttöön huutokauppabotin tuki"
#: src/gui/setup_other.cpp:162
msgid "Enable guild bot support and disable native guild support"
-msgstr ""
+msgstr "Ota käyttöön kiltabottien tuki ja poista sisäinen kiltatuki käytöstä"
#: src/gui/setup_other.cpp:168
msgid "Enable server side attack"
@@ -2171,7 +2172,7 @@ msgstr "Ota bottitutka käyttöön"
#: src/gui/setup_other.cpp:174
msgid "Enable buggy servers protection (do not disable)"
-msgstr ""
+msgstr "Ota käyttöön bugisten palvelinten suojaus (älä poista käytöstä)"
#: src/gui/setup_other.cpp:178
msgid "Enable debug log"
@@ -2191,11 +2192,11 @@ msgstr "Näytä tausta"
#: src/gui/setup_perfomance.cpp:55
msgid "Better perfomance (enable for better perfomance)"
-msgstr ""
+msgstr "Ota lisätehot käyttöön ;)"
#: src/gui/setup_perfomance.cpp:58
msgid "Auto adjust perfomance"
-msgstr ""
+msgstr "Sopeuta tehokkuusasetukset automaattisesti"
#: src/gui/setup_perfomance.cpp:61
msgid "Hw acceleration"
@@ -2204,38 +2205,39 @@ msgstr "Rautakiihdytys"
#: src/gui/setup_perfomance.cpp:64
msgid "Enable opacity cache (Software, can use many memory)"
msgstr ""
+"Ota käyttöön läpinäkyvyysvälimuisti (ohjelmallinen, voi olla muistisyöppö)"
#: src/gui/setup_perfomance.cpp:67
msgid "Enable map reduce (Software)"
-msgstr ""
+msgstr "Ota käyttöön karttareduktio (ohjelmallinen)"
#: src/gui/setup_perfomance.cpp:70
msgid "Better quality (disable for better perfomance)"
-msgstr ""
+msgstr "Parempi laatu (poista käytöstä jos tarvitset lisätehoa)"
#: src/gui/setup_perfomance.cpp:73
msgid "Enable alpha channel fix (Software, can be very slow)"
-msgstr ""
+msgstr "Ota käyttöön alfakanavan korjaus (ohjelmallinen, voi olla hidas)"
#: src/gui/setup_perfomance.cpp:77
msgid "Show beings transparency"
-msgstr ""
+msgstr "Näytä olioiden läpinäkyvyys"
#: src/gui/setup_perfomance.cpp:80
msgid "Enable reorder sprites."
-msgstr ""
+msgstr "Ota käyttöön uudelleenjärjestyshahmot"
#: src/gui/setup_perfomance.cpp:83
msgid "Small memory (enable for lower memory usage)"
-msgstr ""
+msgstr "Pieni muisti, käytä vähemmän muistia"
#: src/gui/setup_perfomance.cpp:86
msgid "Disable advanced beings caching (Software)"
-msgstr ""
+msgstr "Poista kehittynyt olentojen välimuisti käytöstä (ohjelmallinen)"
#: src/gui/setup_perfomance.cpp:89
msgid "Disable beings caching (Software)"
-msgstr ""
+msgstr "Poista olentojen välimuisti käytöstä (ohjelmallinen)"
#: src/gui/setup_players.cpp:54
msgid "Show gender"
@@ -2251,7 +2253,7 @@ msgstr "Näytä oma nimi"
#: src/gui/setup_players.cpp:63
msgid "Enable extended mouse targeting"
-msgstr ""
+msgstr "Ota käyttöön laajennettu kohteen valinta hiirellä"
#: src/gui/setup_players.cpp:66
msgid "Target dead players"
@@ -2267,19 +2269,19 @@ msgstr "Turvaa kaupat"
#: src/gui/setup_players.cpp:75
msgid "Unsecure chars in names"
-msgstr ""
+msgstr "Turvattomia merkkejä nimissä"
#: src/gui/setup_players.cpp:78
msgid "Show statuses"
-msgstr ""
+msgstr "Näytä tilat"
#: src/gui/setup_players.cpp:81
msgid "Show ip addresses on screenshots"
-msgstr ""
+msgstr "Näytä IP-osoitteet kuvakaappauksissa"
#: src/gui/setup_players.cpp:84
msgid "Allow self heal with mouse click"
-msgstr ""
+msgstr "Salli itsen parantaminen hiiren napsautuksella"
#: src/gui/setup_relations.cpp:65
msgid "Relation"
@@ -2307,11 +2309,11 @@ msgstr "Pyyhitty"
#: src/gui/setup_relations.cpp:75
msgid "Blacklisted"
-msgstr ""
+msgstr "Mustalla listalla"
#: src/gui/setup_relations.cpp:76
msgid "Enemy"
-msgstr ""
+msgstr "Vihollinen"
#: src/gui/setup_relations.cpp:240
msgid "Allow trading"
@@ -2327,7 +2329,7 @@ msgstr "Vanha"
#: src/gui/setup_relations.cpp:247
msgid "Relations"
-msgstr ""
+msgstr "Suhteet"
#: src/gui/setup_relations.cpp:272
msgid "When ignoring:"
@@ -2359,59 +2361,59 @@ msgstr "Jättimäinen (15)"
#: src/gui/setup_theme.cpp:146
msgid "Chinese (China)"
-msgstr ""
+msgstr "Kiina (kiina)"
#: src/gui/setup_theme.cpp:147
msgid "Czech"
-msgstr ""
+msgstr "Tsekki"
#: src/gui/setup_theme.cpp:148
msgid "English"
-msgstr ""
+msgstr "Englanti"
#: src/gui/setup_theme.cpp:149
msgid "Finnish"
-msgstr ""
+msgstr "Suomi"
#: src/gui/setup_theme.cpp:150
msgid "French"
-msgstr ""
+msgstr "Ranska"
#: src/gui/setup_theme.cpp:151
msgid "German"
-msgstr ""
+msgstr "Saksa"
#: src/gui/setup_theme.cpp:152
msgid "Indonesian"
-msgstr ""
+msgstr "Indonesia"
#: src/gui/setup_theme.cpp:153
msgid "Polish"
-msgstr ""
+msgstr "Puola"
#: src/gui/setup_theme.cpp:154
msgid "Japanese"
-msgstr ""
+msgstr "Japani"
#: src/gui/setup_theme.cpp:155
msgid "Dutch (Belgium/Flemish)"
-msgstr ""
+msgstr "Hollanti (Belgia/fleemi)"
#: src/gui/setup_theme.cpp:156
msgid "Portuguese"
-msgstr ""
+msgstr "Portugali"
#: src/gui/setup_theme.cpp:157
msgid "Portuguese (Brazilian)"
-msgstr ""
+msgstr "Portugali (Brasilia)"
#: src/gui/setup_theme.cpp:158
msgid "Russian"
-msgstr ""
+msgstr "Venäjä"
#: src/gui/setup_theme.cpp:159
msgid "Spanish (Castilian)"
-msgstr ""
+msgstr "Espanja (Kastilli)"
#: src/gui/setup_theme.cpp:191
msgid "Theme"
@@ -2423,7 +2425,7 @@ msgstr "Käyttöliittymän teema"
#: src/gui/setup_theme.cpp:194
msgid "Language"
-msgstr ""
+msgstr "Kieli"
#: src/gui/setup_theme.cpp:195
msgid "Main Font"
@@ -2443,11 +2445,11 @@ msgstr "Ohjekirjasin"
#: src/gui/setup_theme.cpp:199
msgid "Secure font"
-msgstr ""
+msgstr "Turvallinen kirjasin"
#: src/gui/setup_theme.cpp:200
msgid "Japanese font"
-msgstr ""
+msgstr "Japanilainen kirjasin"
#: src/gui/setup_theme.cpp:237
msgid "Font size"
@@ -2524,7 +2526,7 @@ msgstr "Hiukkastehosteet"
#: src/gui/setup_video.cpp:293
msgid "Show pickup notification"
-msgstr "Näytä ottoviesti"
+msgstr "Näytä poimintaviesti"
#. TRANSLATORS: Refers to "Show own name"
#: src/gui/setup_video.cpp:295
@@ -2645,7 +2647,7 @@ msgstr "Näytä linkit ilmoituksessa"
#: src/gui/shopwindow.cpp:148 src/gui/shopwindow.cpp:149
msgid "Auction"
-msgstr ""
+msgstr "Huutokauppa"
#: src/gui/shopwindow.cpp:748 src/net/ea/tradehandler.cpp:104
#: src/net/manaserv/tradehandler.cpp:127
@@ -2779,7 +2781,7 @@ msgstr "Ohitettavat kohteet"
msgid "Create Guild"
msgstr "Luo kilta"
-#: src/gui/socialwindow.cpp:1196 src/gui/socialwindow.cpp:1629
+#: src/gui/socialwindow.cpp:1196 src/gui/socialwindow.cpp:1631
msgid "Create Party"
msgstr "Luo ryhmä"
@@ -2791,93 +2793,103 @@ msgstr "Suhteet"
msgid "Invite"
msgstr "Kutsu"
-#: src/gui/socialwindow.cpp:1412
+#. TRANSLATORS: here P is title for visible players tab in social window
+#: src/gui/socialwindow.cpp:1277
+msgid "P"
+msgstr ""
+
+#. TRANSLATORS: here F is title for friends tab in social window
+#: src/gui/socialwindow.cpp:1281
+msgid "F"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1414
#, c-format
msgid "Accepted party invite from %s."
msgstr "Otit vastaan ryhmäkutsun pelaajalta %s."
-#: src/gui/socialwindow.cpp:1422
+#: src/gui/socialwindow.cpp:1424
#, c-format
msgid "Rejected party invite from %s."
msgstr "Kieltäydyit pelaajan %s ryhmäkutsusta."
-#: src/gui/socialwindow.cpp:1439
+#: src/gui/socialwindow.cpp:1441
#, c-format
msgid "Accepted guild invite from %s."
msgstr "Otit vastaan kiltakutsun pelaajalta %s."
-#: src/gui/socialwindow.cpp:1452
+#: src/gui/socialwindow.cpp:1454
#, c-format
msgid "Rejected guild invite from %s."
msgstr "Kieltäydyit pelaajan %s kiltakutsusta."
-#: src/gui/socialwindow.cpp:1499
+#: src/gui/socialwindow.cpp:1501
#, c-format
msgid "Creating guild called %s."
msgstr "Luon killan %s."
-#: src/gui/socialwindow.cpp:1522
+#: src/gui/socialwindow.cpp:1524
#, c-format
msgid "Creating party called %s."
msgstr "Luon ryhmän %s."
-#: src/gui/socialwindow.cpp:1536
+#: src/gui/socialwindow.cpp:1538
msgid "Guild Name"
msgstr "Killan nimi"
-#: src/gui/socialwindow.cpp:1537
+#: src/gui/socialwindow.cpp:1539
msgid "Choose your guild's name."
msgstr "Valitse killallesi nimi."
-#: src/gui/socialwindow.cpp:1551
+#: src/gui/socialwindow.cpp:1553
msgid "Received guild request, but one already exists."
msgstr "Vastaanotin kiltapyynnön, mutta sellainen on jo olemassa."
-#: src/gui/socialwindow.cpp:1557
+#: src/gui/socialwindow.cpp:1559
#, c-format
msgid "%s has invited you to join the guild %s."
msgstr "%s on kutsunut sinut liittymään kiltaan %s."
-#: src/gui/socialwindow.cpp:1563
+#: src/gui/socialwindow.cpp:1565
msgid "Accept Guild Invite"
msgstr "Ota kiltakutsu vastaan"
-#: src/gui/socialwindow.cpp:1578
+#: src/gui/socialwindow.cpp:1580
msgid "Received party request, but one already exists."
msgstr "Sain ryhmäpyynnön, mutta sellainen on jo olemassa."
-#: src/gui/socialwindow.cpp:1589
+#: src/gui/socialwindow.cpp:1591
msgid "You have been invited you to join a party."
msgstr "Sinut on kutsuttu liittymään ryhmään."
-#: src/gui/socialwindow.cpp:1593
+#: src/gui/socialwindow.cpp:1595
#, c-format
msgid "You have been invited to join the %s party."
msgstr "Sinut on kutsuttu liittymään ryhmään %s."
-#: src/gui/socialwindow.cpp:1601
+#: src/gui/socialwindow.cpp:1603
#, c-format
msgid "%s has invited you to join their party."
msgstr "%s on kutsunut sinut liittymään ryhmäänsä."
-#: src/gui/socialwindow.cpp:1606
+#: src/gui/socialwindow.cpp:1608
#, c-format
msgid "%s has invited you to join the %s party."
msgstr "%s on kutsunut sinut liittymään ryhmäänsä %s."
-#: src/gui/socialwindow.cpp:1615
+#: src/gui/socialwindow.cpp:1617
msgid "Accept Party Invite"
msgstr "Ota ryhmäkutsu vastaan"
-#: src/gui/socialwindow.cpp:1630
+#: src/gui/socialwindow.cpp:1632
msgid "Cannot create party. You are already in a party"
msgstr "Ryhmän luominen epäonnistui, olet jo ryhmän jäsen."
-#: src/gui/socialwindow.cpp:1635
+#: src/gui/socialwindow.cpp:1637
msgid "Party Name"
msgstr "Ryhmän nimi"
-#: src/gui/socialwindow.cpp:1636
+#: src/gui/socialwindow.cpp:1638
msgid "Choose your party's name."
msgstr "Anna ryhmällesi nimi."
@@ -2991,7 +3003,7 @@ msgstr "Komento:"
#: src/gui/textcommandeditor.cpp:200
msgid "Comment:"
-msgstr ""
+msgstr "Kommentti:"
#: src/gui/textcommandeditor.cpp:203
msgid "Mana:"
@@ -3071,29 +3083,29 @@ msgstr "Nimi: %s"
msgid "Updating..."
msgstr "Päivitetään..."
-#: src/gui/updaterwindow.cpp:160
+#: src/gui/updaterwindow.cpp:166
msgid "Connecting..."
msgstr "Yhdistetään..."
-#: src/gui/updaterwindow.cpp:163
+#: src/gui/updaterwindow.cpp:169
msgid "Play"
msgstr "Pelaa"
-#: src/gui/updaterwindow.cpp:566
+#: src/gui/updaterwindow.cpp:570
msgid "##1 The update process is incomplete."
msgstr "##1 Päivitysprosessi keskeytyi"
#. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:568
+#: src/gui/updaterwindow.cpp:572
msgid "##1 It is strongly recommended that"
msgstr "##1 Suosittelemme vahvasti että"
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:570
+#: src/gui/updaterwindow.cpp:574
msgid "##1 you try again later."
msgstr "##1 yrität myöhemmin uudelleen"
-#: src/gui/updaterwindow.cpp:746
+#: src/gui/updaterwindow.cpp:750
msgid "Completed"
msgstr "Valmis"
@@ -3155,7 +3167,7 @@ msgstr "Hiukkastehosteet"
#: src/gui/userpalette.cpp:132
msgid "Pickup Notification"
-msgstr "Ottoilmoitus"
+msgstr "Poimintailmoitus"
#: src/gui/userpalette.cpp:133
msgid "Exp Notification"
@@ -3515,11 +3527,11 @@ msgstr "Pu"
#: src/gui/windowmenu.cpp:98
msgid "YK"
-msgstr ""
+msgstr "T?"
#: src/gui/windowmenu.cpp:98
msgid "Did you know"
-msgstr ""
+msgstr "Tiesitkö"
#: src/gui/windowmenu.cpp:100
msgid "SET"
@@ -3547,7 +3559,7 @@ msgstr "Kärry"
#: src/keyboardconfig.cpp:43
msgid "Basic Keys"
-msgstr ""
+msgstr "Perusnäppäimet"
#: src/keyboardconfig.cpp:44
msgid "Move Up"
@@ -3595,7 +3607,7 @@ msgstr "Keskeytä hyökkäys"
#: src/keyboardconfig.cpp:65
msgid "Untarget"
-msgstr ""
+msgstr "Poista kohdevalinta"
#: src/keyboardconfig.cpp:66
msgid "Target Closest"
@@ -3611,11 +3623,11 @@ msgstr "Pelaaja kohteeksi"
#: src/keyboardconfig.cpp:71
msgid "Pickup"
-msgstr "Nouki"
+msgstr "Poimi"
#: src/keyboardconfig.cpp:72
msgid "Change Pickup Type"
-msgstr "Muuta noston tyyppiä"
+msgstr "Muuta poiminnan tyyppiä"
#: src/keyboardconfig.cpp:74
msgid "Hide Windows"
@@ -3643,7 +3655,7 @@ msgstr "Valitse OK"
#: src/keyboardconfig.cpp:85
msgid "Shortcuts Keys"
-msgstr ""
+msgstr "Pikavalintanäppäimet"
#: src/keyboardconfig.cpp:86
msgid "Item Shortcuts Key"
@@ -3666,7 +3678,7 @@ msgstr "Tavarapikavalinta %d"
#: src/keyboardconfig.cpp:128
msgid "Windows Keys"
-msgstr ""
+msgstr "Ikkunanäppäimet"
#: src/keyboardconfig.cpp:129
msgid "Help Window"
@@ -3746,7 +3758,7 @@ msgstr "Kuka on linjoilla -ikkuna"
#: src/keyboardconfig.cpp:168
msgid "Did you know Window"
-msgstr ""
+msgstr "Tiesitkö-ikkuna"
#: src/keyboardconfig.cpp:171
msgid "Previous Social Tab"
@@ -3758,7 +3770,7 @@ msgstr "Seuraava sos. välilehti"
#: src/keyboardconfig.cpp:175
msgid "Emotes Keys"
-msgstr ""
+msgstr "Elenäppäimet"
#: src/keyboardconfig.cpp:176
msgid "Smilie"
@@ -3793,7 +3805,7 @@ msgstr "Eleen pikavalinta %d"
#: src/keyboardconfig.cpp:270
msgid "Outfits Keys"
-msgstr ""
+msgstr "Asunäppäimet"
#: src/keyboardconfig.cpp:271
msgid "Wear Outfit"
@@ -3809,7 +3821,7 @@ msgstr "Kopioi varusteet asuksi"
#: src/keyboardconfig.cpp:277
msgid "Chat Keys"
-msgstr ""
+msgstr "Keskustelunäppäimet"
#: src/keyboardconfig.cpp:278
msgid "Toggle Chat"
@@ -3833,7 +3845,7 @@ msgstr "Seuraava keskusteluvälilehti"
#: src/keyboardconfig.cpp:289
msgid "Close current Chat Tab"
-msgstr ""
+msgstr "Sulje tämä keskusteluvälilehti"
#: src/keyboardconfig.cpp:291
msgid "Previous chat line"
@@ -3853,7 +3865,7 @@ msgstr "Poistu keskustelusyötöstä"
#: src/keyboardconfig.cpp:299
msgid "Other Keys"
-msgstr ""
+msgstr "Muut näppäimet"
#: src/keyboardconfig.cpp:300
msgid "Ignore input 1"
@@ -3917,7 +3929,7 @@ msgstr "Vaihda magiahyökkäystä"
#: src/keyboardconfig.cpp:329
msgid "Switch pvp attack"
-msgstr ""
+msgstr "Vaihda PvP-hyökkäystä"
#: src/keyboardconfig.cpp:330
msgid "Change move type"
@@ -3961,7 +3973,7 @@ msgstr "Vaihda kameran toimintaa"
#: src/keyboardconfig.cpp:350
msgid "Modifier key"
-msgstr ""
+msgstr "Muokkausnäppäin"
#: src/keyboardconfig.cpp:429
#, c-format
@@ -3973,13 +3985,13 @@ msgstr ""
"ole hyvä ja poista päällekkäisyydet. "
#: src/localplayer.cpp:384
-#, fuzzy, c-format
+#, c-format
msgid "You were killed by %s"
-msgstr "Sinut otti hengiltä "
+msgstr "Sinut tappoi %s."
#: src/localplayer.cpp:1439
msgid "Tried to pick up nonexistent item."
-msgstr "Yritit nostaa olemattoman tavaran."
+msgstr "Yritit poimia olemattoman tavaran."
#: src/localplayer.cpp:1442
msgid "Item is too heavy."
@@ -4003,7 +4015,7 @@ msgstr "Tavara kuuluu jollekulle muulle."
#: src/localplayer.cpp:1457
msgid "Unknown problem picking up item."
-msgstr "Tuntematon ongelma esti tavaran nostamisen."
+msgstr "Tuntematon ongelma esti tavaran poimimisen."
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
@@ -4011,8 +4023,8 @@ msgstr "Tuntematon ongelma esti tavaran nostamisen."
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
-msgstr[0] "[@@%2$d|%3$s@@] (%1$d kpl) otettu."
-msgstr[1] "[@@%2$d|%3$s@@] (%1$d kpl) otettu."
+msgstr[0] "[@@%2$d|%3$s@@] (%1$d kpl) poimittu."
+msgstr[1] "[@@%2$d|%3$s@@] (%1$d kpl) poimittu."
#: src/localplayer.cpp:1898
msgid "(D) default moves"
@@ -4036,12 +4048,12 @@ msgstr "(d) tuplaa tavallinen + villi"
#: src/localplayer.cpp:1903
msgid "(?) unknown move"
-msgstr ""
+msgstr "(?) tuntematon liikkumistapa"
#: src/localplayer.cpp:1925
#, c-format
msgid "(%d) crazy move number %d"
-msgstr ""
+msgstr "(%d) villiliike nro %d"
#: src/localplayer.cpp:1930
msgid "(a) custom crazy move"
@@ -4081,7 +4093,7 @@ msgstr "(A) siirry kohteen luo hyökkäyskantamalla"
#: src/localplayer.cpp:1955
msgid "(a) archer attack range"
-msgstr ""
+msgstr "(a) jousiampujan hyökkäyskantama"
#: src/localplayer.cpp:1956
msgid "(?) move to target"
@@ -4129,7 +4141,7 @@ msgstr "(G) mene ja hyökkää"
#: src/localplayer.cpp:2023
msgid "(A) go, attack, pickup"
-msgstr "(A) mene, hyökkää, nosta"
+msgstr "(A) mene, hyökkää, poimi"
#: src/localplayer.cpp:2024
msgid "(d) without auto attack"
@@ -4137,35 +4149,35 @@ msgstr "(d) ei automaattista hyökkäystä"
#: src/localplayer.cpp:2058
msgid "(S) small pick up 1x1 cells"
-msgstr "(S) pieni nosto 1x1 ruutua"
+msgstr "(S) pieni poiminta 1x1 ruutua"
#: src/localplayer.cpp:2059
msgid "(D) default pick up 2x1 cells"
-msgstr "(D) oletusnosto 2x1 ruutua"
+msgstr "(D) oletuspoiminta 2x1 ruutua"
#: src/localplayer.cpp:2060
msgid "(F) forward pick up 2x3 cells"
-msgstr "(F) nosto edestä 2x3 ruutua"
+msgstr "(F) poiminta edestä 2x3 ruutua"
#: src/localplayer.cpp:2061
msgid "(3) pick up 3x3 cells"
-msgstr "(3) nosto 3x3 ruutua"
+msgstr "(3) poiminta 3x3 ruutua"
#: src/localplayer.cpp:2062
msgid "(g) go and pick up in distance 4"
-msgstr "(g) mene ja nosta etäisyydellä 4"
+msgstr "(g) mene ja poimi etäisyydellä 4"
#: src/localplayer.cpp:2063
msgid "(G) go and pick up in distance 8"
-msgstr "(G) mene ja nosta etäisyydellä 8"
+msgstr "(G) mene ja poimi etäisyydellä 8"
#: src/localplayer.cpp:2064
msgid "(A) go and pick up in max distance"
-msgstr "(A) mene ja nosta maksimietäisyydellä"
+msgstr "(A) mene ja poimi maksimietäisyydellä"
#: src/localplayer.cpp:2065
msgid "(?) pick up"
-msgstr "(?) nosta"
+msgstr "(?) poiminta"
#: src/localplayer.cpp:2078
msgid "(N) normal map view"
@@ -4217,23 +4229,23 @@ msgstr "(?) taikahyökkäys"
#: src/localplayer.cpp:2126
msgid "(a) attack all players"
-msgstr ""
+msgstr "(a) hyökkää kaikkien pelaajien kimppuun"
#: src/localplayer.cpp:2127
msgid "(f) attack not friends"
-msgstr ""
+msgstr "(f) säästä ystävät, listi muut"
#: src/localplayer.cpp:2128
msgid "(b) attack bad relations"
-msgstr ""
+msgstr "(b) hyökkää jos huonot suhteet"
#: src/localplayer.cpp:2129
msgid "(d) dont attack players"
-msgstr ""
+msgstr "(d) älä hyökkää pelaajien kimppuun"
#: src/localplayer.cpp:2130
msgid "(?) pvp attack"
-msgstr ""
+msgstr "(?) pelaajien kanssa taistelu"
#: src/localplayer.cpp:2149
msgid "(D) default imitation"
@@ -4281,47 +4293,47 @@ msgstr "Pelimuokkaimet poissa käytöstä"
#: src/localplayer.cpp:2241
msgid "Game modifiers are unknown"
-msgstr ""
+msgstr "Pelimuokkaimet ovat tuntemattomia"
-#: src/localplayer.cpp:3757
+#: src/localplayer.cpp:3758
msgid "Follow: "
msgstr "Seuraa: "
-#: src/localplayer.cpp:3759 src/localplayer.cpp:3774
+#: src/localplayer.cpp:3760 src/localplayer.cpp:3775
msgid "Follow canceled"
msgstr "Seuraaminen keskeytetty"
-#: src/localplayer.cpp:3766
+#: src/localplayer.cpp:3767
msgid "Imitation: "
msgstr "Matki: "
-#: src/localplayer.cpp:3768 src/localplayer.cpp:3776
+#: src/localplayer.cpp:3769 src/localplayer.cpp:3777
msgid "Imitation canceled"
msgstr "Matkiminen keskeytetty"
-#: src/localplayer.cpp:4124
+#: src/localplayer.cpp:4125
msgid "You see "
msgstr "Näet "
#: src/main.cpp:50
msgid "manaplus [options] [manaplus-file]"
-msgstr ""
+msgstr "manaplus [asetukset] [manaplus-tiedosto]"
#: src/main.cpp:51
msgid "[manaplus-file] : The manaplus file is an XML file (.manaplus)"
-msgstr ""
+msgstr "[manaplus-tiedosto] : Manaplus-tiedosto on XML-tiedosto (.manaplus)"
#: src/main.cpp:53
msgid " used to set custom parameters"
-msgstr ""
+msgstr " jolla asetetaan erikoisvalitsimia"
#: src/main.cpp:54
msgid " to the manaplus client."
-msgstr ""
+msgstr " manaplus-ohjelmalle."
#: src/main.cpp:56
msgid "Options:"
-msgstr "Parametrit:"
+msgstr "Asetusvivut:"
#: src/main.cpp:57
msgid " -l --log-file : Log file to use"
@@ -4394,7 +4406,7 @@ msgstr " --safemode : Käynnistä peli vikasietotilassa"
#: src/main.cpp:77
msgid " -T --tests : Start testing drivers and auto configuring"
-msgstr ""
+msgstr " -T --tests : Käynnistä ajuritestaus ja automaattiasetukset"
#: src/main.cpp:80
msgid " --no-opengl : Disable OpenGL for this session"
@@ -4469,9 +4481,8 @@ msgid "Incorrect slot."
msgstr "Väärä paikka."
#: src/net/ea/charserverhandler.cpp:167
-#, fuzzy
msgid "Incorrect race."
-msgstr "Väärä hiustyyli."
+msgstr "Väärä rotu."
#: src/net/ea/charserverhandler.cpp:182 src/net/manaserv/charhandler.cpp:210
msgid "Info"
@@ -4512,19 +4523,19 @@ msgstr "MVP-pelaaja: "
#: src/net/ea/chathandler.cpp:370
msgid "All whispers ignored."
-msgstr ""
+msgstr "Kaikki kuiskaukset jätetään huomiotta."
#: src/net/ea/chathandler.cpp:374
msgid "All whispers ignore failed."
-msgstr ""
+msgstr "Kuiskausten huomiotta jättäminen epäonnistui."
#: src/net/ea/chathandler.cpp:385
msgid "All whispers unignored."
-msgstr ""
+msgstr "Kaikki kuiskaukset huomioidaan taas."
#: src/net/ea/chathandler.cpp:389
msgid "All whispers unignore failed."
-msgstr ""
+msgstr "Kuiskausten huomiointi epäonnistui."
#: src/net/ea/gamehandler.cpp:92
#, c-format
@@ -4626,9 +4637,8 @@ msgid "%s has left your guild."
msgstr "%s on eronnut killastasi."
#: src/net/ea/guildhandler.cpp:499
-#, fuzzy
msgid "You were kicked from guild."
-msgstr "Sinut on potkittu killasta."
+msgstr "Sinut potkittiin ulos killasta."
#: src/net/ea/guildhandler.cpp:512
#, c-format
@@ -5008,7 +5018,7 @@ msgstr "Kannat roinaa alle puolet elopainoasi, ja paranet jälleen."
#: src/net/ea/playerhandler.cpp:453
#, c-format
msgid "You picked up %s."
-msgstr "%s nostettu."
+msgstr "%s poimittu."
#: src/net/ea/playerhandler.cpp:459
#, c-format
@@ -5576,7 +5586,7 @@ msgstr "Hyökkäyskantama"
#: src/net/tmwa/generalhandler.cpp:288
msgid "Damage per sec."
-msgstr ""
+msgstr "Vahinko sekunnissa."
#: src/net/tmwa/network.cpp:153
msgid "Empty address given to Network::connect()!"
@@ -5639,6 +5649,3 @@ msgstr "MP %+d"
#: src/resources/itemdb.cpp:167
msgid "Unknown item"
msgstr "Tuntematon tavara"
-
-#~ msgid "> Next"
-#~ msgstr "> Seuraava"
diff --git a/po/fr.po b/po/fr.po
index 19c2ea2ac..ac2456f68 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -13,9 +13,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-01-21 19:25+0300\n"
-"PO-Revision-Date: 2012-01-19 19:50+0000\n"
-"Last-Translator: reid <reidyaro@gmail.com>\n"
+"POT-Creation-Date: 2012-01-25 20:17+0300\n"
+"PO-Revision-Date: 2012-01-25 17:27+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: French (http://www.transifex.net/projects/p/manaplus/team/"
"fr/)\n"
"Language: fr\n"
@@ -46,47 +46,47 @@ msgstr "A"
msgid "I"
msgstr "I"
-#: src/client.cpp:946 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:947 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
msgid "Setup"
msgstr "Configuration"
-#: src/client.cpp:953 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:954 src/gui/setup_perfomance.cpp:48
msgid "Perfomance"
msgstr "Performance"
-#: src/client.cpp:958 src/gui/setup_video.cpp:315
+#: src/client.cpp:959 src/gui/setup_video.cpp:315
msgid "Video"
msgstr "Vidéo"
-#: src/client.cpp:963
+#: src/client.cpp:964
msgid "Themes"
msgstr "Thèmes"
-#: src/client.cpp:1045
+#: src/client.cpp:1046
msgid "Connecting to server"
msgstr "Connexion au serveur"
-#: src/client.cpp:1076
+#: src/client.cpp:1077
msgid "Logging in"
msgstr "Connexion"
-#: src/client.cpp:1109
+#: src/client.cpp:1110
msgid "Entering game world"
msgstr "Vous entrez dans un nouveau monde"
-#: src/client.cpp:1210
+#: src/client.cpp:1211
msgid "Requesting characters"
msgstr "Téléchargement des personnages"
-#: src/client.cpp:1241
+#: src/client.cpp:1242
msgid "Connecting to the game server"
msgstr "Connexion au serveur de jeu"
-#: src/client.cpp:1251
+#: src/client.cpp:1252
msgid "Changing game servers"
msgstr "Changement de serveur de jeu"
-#: src/client.cpp:1294 src/client.cpp:1301 src/client.cpp:1435
+#: src/client.cpp:1295 src/client.cpp:1302 src/client.cpp:1436
#: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:256
#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
@@ -96,50 +96,50 @@ msgstr "Changement de serveur de jeu"
msgid "Error"
msgstr "Erreur"
-#: src/client.cpp:1310
+#: src/client.cpp:1311
msgid "Requesting registration details"
msgstr "Demande des paramètres d'inscription"
-#: src/client.cpp:1336
+#: src/client.cpp:1337
msgid "Password Change"
msgstr "Changement de mot de passe"
-#: src/client.cpp:1337
+#: src/client.cpp:1338
msgid "Password changed successfully!"
msgstr "Le mot de passe a été changé avec succès !"
-#: src/client.cpp:1356
+#: src/client.cpp:1357
msgid "Email Change"
msgstr "Changer d'e-mail"
-#: src/client.cpp:1357
+#: src/client.cpp:1358
msgid "Email changed successfully!"
msgstr "L'adresse e-mail a été changée avec succès !"
-#: src/client.cpp:1377
+#: src/client.cpp:1378
msgid "Unregister Successful"
msgstr "Désinscription réussie"
-#: src/client.cpp:1378
+#: src/client.cpp:1379
msgid "Farewell, come back any time..."
msgstr "A bientôt, revenez quand vous voudrez..."
-#: src/client.cpp:1583 src/client.cpp:1616 src/client.cpp:1631
-#: src/client.cpp:2063 src/client.cpp:2070
+#: src/client.cpp:1584 src/client.cpp:1617 src/client.cpp:1632
+#: src/client.cpp:2064 src/client.cpp:2071
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%s n'existe pas et ne peut pas être créé ! Fermeture du programme."
-#: src/client.cpp:1769
+#: src/client.cpp:1770
#, c-format
msgid "Invalid update host: %s"
msgstr "Site de mise à jour invalide : %s"
-#: src/client.cpp:1803 src/client.cpp:1809
+#: src/client.cpp:1804 src/client.cpp:1810
msgid "Error creating updates directory!"
msgstr "Impossible de créer le dossier de mise à jour !"
-#: src/client.cpp:1830
+#: src/client.cpp:1831
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
@@ -417,7 +417,7 @@ msgstr "Déplacement"
msgid "Result"
msgstr "Résultat"
-#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:124
+#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:128
msgid "Reset"
msgstr "Réinitialiser"
@@ -440,16 +440,16 @@ msgstr "Montant:"
#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:207
-#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:765
+#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:118
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:770
msgid "+"
msgstr "+"
#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:777
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:119
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:782
msgid "-"
msgstr "-"
@@ -461,8 +461,8 @@ msgid "Quit"
msgstr "Quitter"
#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
-#: src/gui/statuswindow.cpp:515 src/gui/statuswindow.cpp:565
-#: src/gui/statuswindow.cpp:764 src/gui/statuswindow.cpp:795
+#: src/gui/statuswindow.cpp:515 src/gui/statuswindow.cpp:570
+#: src/gui/statuswindow.cpp:769 src/gui/statuswindow.cpp:800
msgid "Max"
msgstr "Max."
@@ -493,7 +493,7 @@ msgstr "Vendre"
#: src/gui/quitdialog.cpp:55 src/gui/register.cpp:82 src/gui/setup.cpp:72
#: src/gui/socialwindow.cpp:1198 src/gui/textcommandeditor.cpp:241
#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updaterwindow.cpp:162
+#: src/gui/updaterwindow.cpp:168
msgid "Cancel"
msgstr "Annuler"
@@ -917,7 +917,7 @@ msgid "Did You Know?"
msgstr "Le saviez-vous ?"
#: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
-#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:53
+#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
#: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:113
msgid "Close"
msgstr "Fermer"
@@ -1254,24 +1254,24 @@ msgstr "Barre de Statut"
msgid "Need"
msgstr "Restant"
-#: src/gui/npcdialog.cpp:51
+#: src/gui/npcdialog.cpp:52
msgid "Stop waiting"
msgstr "Arrêter d'attendre "
-#: src/gui/npcdialog.cpp:52
+#: src/gui/npcdialog.cpp:53
msgid "Next"
msgstr "Suivant"
-#: src/gui/npcdialog.cpp:54
+#: src/gui/npcdialog.cpp:55
msgid "Submit"
msgstr "Soumettre"
-#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
+#: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
#: src/gui/setup_other.cpp:151
msgid "NPC"
msgstr "PNJ"
-#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:632
+#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:632
msgid "Clear"
msgstr "Effacer"
@@ -1293,6 +1293,7 @@ msgid "Outfit: %d"
msgstr "Tenue : %d"
#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:892
+#: src/gui/windowmenu.cpp:302
#, c-format
msgid "Key: %s"
msgstr "Touche : %s"
@@ -2794,7 +2795,7 @@ msgstr "Ignorer les monstres"
msgid "Create Guild"
msgstr "Créer une Guilde"
-#: src/gui/socialwindow.cpp:1196 src/gui/socialwindow.cpp:1629
+#: src/gui/socialwindow.cpp:1196 src/gui/socialwindow.cpp:1631
msgid "Create Party"
msgstr "Créer un groupe"
@@ -2806,97 +2807,107 @@ msgstr "Social"
msgid "Invite"
msgstr "Inviter"
-#: src/gui/socialwindow.cpp:1412
+#. TRANSLATORS: here P is title for visible players tab in social window
+#: src/gui/socialwindow.cpp:1277
+msgid "P"
+msgstr ""
+
+#. TRANSLATORS: here F is title for friends tab in social window
+#: src/gui/socialwindow.cpp:1281
+msgid "F"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1414
#, c-format
msgid "Accepted party invite from %s."
msgstr "Invitation dans le groupe acceptée de la part de %s."
-#: src/gui/socialwindow.cpp:1422
+#: src/gui/socialwindow.cpp:1424
#, c-format
msgid "Rejected party invite from %s."
msgstr "Invitation dans le groupe de la part de %s refusée."
-#: src/gui/socialwindow.cpp:1439
+#: src/gui/socialwindow.cpp:1441
#, c-format
msgid "Accepted guild invite from %s."
msgstr "Invitation dans la guilde acceptée de la part de %s."
-#: src/gui/socialwindow.cpp:1452
+#: src/gui/socialwindow.cpp:1454
#, c-format
msgid "Rejected guild invite from %s."
msgstr "Invitation dans la guilde de la part de %s refusée."
-#: src/gui/socialwindow.cpp:1499
+#: src/gui/socialwindow.cpp:1501
#, c-format
msgid "Creating guild called %s."
msgstr "La guilde %s a été créée."
-#: src/gui/socialwindow.cpp:1522
+#: src/gui/socialwindow.cpp:1524
#, c-format
msgid "Creating party called %s."
msgstr "Le groupe %s a été créé."
-#: src/gui/socialwindow.cpp:1536
+#: src/gui/socialwindow.cpp:1538
msgid "Guild Name"
msgstr "Nom de la guilde"
-#: src/gui/socialwindow.cpp:1537
+#: src/gui/socialwindow.cpp:1539
msgid "Choose your guild's name."
msgstr "Choisissez le nom de la guilde."
-#: src/gui/socialwindow.cpp:1551
+#: src/gui/socialwindow.cpp:1553
msgid "Received guild request, but one already exists."
msgstr ""
"Vous avez reçu une invitation pour rejoindre une guilde, mais vous êtes déjà "
"dans une."
-#: src/gui/socialwindow.cpp:1557
+#: src/gui/socialwindow.cpp:1559
#, c-format
msgid "%s has invited you to join the guild %s."
msgstr "%s vous a invité à rejoindre la guilde %s."
-#: src/gui/socialwindow.cpp:1563
+#: src/gui/socialwindow.cpp:1565
msgid "Accept Guild Invite"
msgstr "Accepter l'invitation dans cette guilde"
-#: src/gui/socialwindow.cpp:1578
+#: src/gui/socialwindow.cpp:1580
msgid "Received party request, but one already exists."
msgstr ""
"Vous avez reçu une invitation pour rejoindre un groupe, mais vous êtes déjà "
"dans un groupe."
-#: src/gui/socialwindow.cpp:1589
+#: src/gui/socialwindow.cpp:1591
msgid "You have been invited you to join a party."
msgstr "Vous avez été invité à rejoindre un groupe."
-#: src/gui/socialwindow.cpp:1593
+#: src/gui/socialwindow.cpp:1595
#, c-format
msgid "You have been invited to join the %s party."
msgstr "Vous avez été invité à rejoindre le groupe %s."
-#: src/gui/socialwindow.cpp:1601
+#: src/gui/socialwindow.cpp:1603
#, c-format
msgid "%s has invited you to join their party."
msgstr "%s vous a invité à rejoindre son groupe."
-#: src/gui/socialwindow.cpp:1606
+#: src/gui/socialwindow.cpp:1608
#, c-format
msgid "%s has invited you to join the %s party."
msgstr "%s vous a invité à rejoindre le groupe %s."
-#: src/gui/socialwindow.cpp:1615
+#: src/gui/socialwindow.cpp:1617
msgid "Accept Party Invite"
msgstr "Accepter l'invitation pour ce groupe"
-#: src/gui/socialwindow.cpp:1630
+#: src/gui/socialwindow.cpp:1632
msgid "Cannot create party. You are already in a party"
msgstr "Ne peut pas créer un groupe. Vous faites déjà partie d'un groupe."
-#: src/gui/socialwindow.cpp:1635
+#: src/gui/socialwindow.cpp:1637
msgid "Party Name"
msgstr "Nom du groupe"
-#: src/gui/socialwindow.cpp:1636
+#: src/gui/socialwindow.cpp:1638
msgid "Choose your party's name."
msgstr "Choisissez le nom du groupe."
@@ -3092,29 +3103,29 @@ msgstr "Nom : %s"
msgid "Updating..."
msgstr "Mise à jour en cours..."
-#: src/gui/updaterwindow.cpp:160
+#: src/gui/updaterwindow.cpp:166
msgid "Connecting..."
msgstr "Connexion..."
-#: src/gui/updaterwindow.cpp:163
+#: src/gui/updaterwindow.cpp:169
msgid "Play"
msgstr "Jouer"
-#: src/gui/updaterwindow.cpp:566
+#: src/gui/updaterwindow.cpp:570
msgid "##1 The update process is incomplete."
msgstr "##1 Le processus de mise à jour n'est pas achevé"
#. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:568
+#: src/gui/updaterwindow.cpp:572
msgid "##1 It is strongly recommended that"
msgstr "##1 Il est fortement recommandé que"
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:570
+#: src/gui/updaterwindow.cpp:574
msgid "##1 you try again later."
msgstr "##1 Essayez à nouveau plus tard"
-#: src/gui/updaterwindow.cpp:746
+#: src/gui/updaterwindow.cpp:750
msgid "Completed"
msgstr "Terminé"
@@ -4307,23 +4318,23 @@ msgstr "Modificateurs de mode de jeu désactivés"
msgid "Game modifiers are unknown"
msgstr "Les modificateurs de jeux sont inconnus"
-#: src/localplayer.cpp:3757
+#: src/localplayer.cpp:3758
msgid "Follow: "
msgstr "Suivre : "
-#: src/localplayer.cpp:3759 src/localplayer.cpp:3774
+#: src/localplayer.cpp:3760 src/localplayer.cpp:3775
msgid "Follow canceled"
msgstr "Suivi annulé"
-#: src/localplayer.cpp:3766
+#: src/localplayer.cpp:3767
msgid "Imitation: "
msgstr "Imitation: "
-#: src/localplayer.cpp:3768 src/localplayer.cpp:3776
+#: src/localplayer.cpp:3769 src/localplayer.cpp:3777
msgid "Imitation canceled"
msgstr "Imitation annulée"
-#: src/localplayer.cpp:4124
+#: src/localplayer.cpp:4125
msgid "You see "
msgstr "Vous voyez "
diff --git a/po/id.po b/po/id.po
index 1340e7d01..05ea93539 100644
--- a/po/id.po
+++ b/po/id.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-01-21 19:25+0300\n"
-"PO-Revision-Date: 2011-11-11 21:38+0000\n"
-"Last-Translator: akaras <akaras@inbox.ru>\n"
+"POT-Creation-Date: 2012-01-25 20:17+0300\n"
+"PO-Revision-Date: 2012-01-25 17:27+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Indonesian (http://www.transifex.net/projects/p/manaplus/team/"
"id/)\n"
"Language: id\n"
@@ -43,47 +43,47 @@ msgstr "A"
msgid "I"
msgstr "l"
-#: src/client.cpp:946 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:947 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
msgid "Setup"
msgstr "Pengaturan"
-#: src/client.cpp:953 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:954 src/gui/setup_perfomance.cpp:48
msgid "Perfomance"
msgstr ""
-#: src/client.cpp:958 src/gui/setup_video.cpp:315
+#: src/client.cpp:959 src/gui/setup_video.cpp:315
msgid "Video"
msgstr "Video"
-#: src/client.cpp:963
+#: src/client.cpp:964
msgid "Themes"
msgstr ""
-#: src/client.cpp:1045
+#: src/client.cpp:1046
msgid "Connecting to server"
msgstr "Terhubung dengan server"
-#: src/client.cpp:1076
+#: src/client.cpp:1077
msgid "Logging in"
msgstr "Masuk"
-#: src/client.cpp:1109
+#: src/client.cpp:1110
msgid "Entering game world"
msgstr "Memasuki arena permainan"
-#: src/client.cpp:1210
+#: src/client.cpp:1211
msgid "Requesting characters"
msgstr "Pemilihan karakter"
-#: src/client.cpp:1241
+#: src/client.cpp:1242
msgid "Connecting to the game server"
msgstr "terhubung dengan server"
-#: src/client.cpp:1251
+#: src/client.cpp:1252
msgid "Changing game servers"
msgstr "Pergantian server"
-#: src/client.cpp:1294 src/client.cpp:1301 src/client.cpp:1435
+#: src/client.cpp:1295 src/client.cpp:1302 src/client.cpp:1436
#: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:256
#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
@@ -93,50 +93,50 @@ msgstr "Pergantian server"
msgid "Error"
msgstr "Kesalahan"
-#: src/client.cpp:1310
+#: src/client.cpp:1311
msgid "Requesting registration details"
msgstr "Meminta detail registrasi"
-#: src/client.cpp:1336
+#: src/client.cpp:1337
msgid "Password Change"
msgstr "Ubah sandi"
-#: src/client.cpp:1337
+#: src/client.cpp:1338
msgid "Password changed successfully!"
msgstr "Perubahan sandi berhasil"
-#: src/client.cpp:1356
+#: src/client.cpp:1357
msgid "Email Change"
msgstr "Perubahan email"
-#: src/client.cpp:1357
+#: src/client.cpp:1358
msgid "Email changed successfully!"
msgstr "Perubahan email berhasil"
-#: src/client.cpp:1377
+#: src/client.cpp:1378
msgid "Unregister Successful"
msgstr "Telah tidak terdaftar"
-#: src/client.cpp:1378
+#: src/client.cpp:1379
msgid "Farewell, come back any time..."
msgstr "Selamat tinggal, datang kembali setiap saat"
-#: src/client.cpp:1583 src/client.cpp:1616 src/client.cpp:1631
-#: src/client.cpp:2063 src/client.cpp:2070
+#: src/client.cpp:1584 src/client.cpp:1617 src/client.cpp:1632
+#: src/client.cpp:2064 src/client.cpp:2071
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%s tidak ada dan tidak dapat dibuat!keluar."
-#: src/client.cpp:1769
+#: src/client.cpp:1770
#, c-format
msgid "Invalid update host: %s"
msgstr "Gagal mengupdate host: %s"
-#: src/client.cpp:1803 src/client.cpp:1809
+#: src/client.cpp:1804 src/client.cpp:1810
msgid "Error creating updates directory!"
msgstr "Gagal membuat direktori update!"
-#: src/client.cpp:1830
+#: src/client.cpp:1831
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "kesalahan %s tidak ada dan tidak dapat dibuat!keluar."
@@ -406,7 +406,7 @@ msgstr "Jalan"
msgid "Result"
msgstr "Hasil"
-#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:124
+#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:128
msgid "Reset"
msgstr "Reset"
@@ -429,16 +429,16 @@ msgstr ""
#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:207
-#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:765
+#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:118
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:770
msgid "+"
msgstr "+"
#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:777
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:119
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:782
msgid "-"
msgstr "-"
@@ -450,8 +450,8 @@ msgid "Quit"
msgstr "Keluar"
#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
-#: src/gui/statuswindow.cpp:515 src/gui/statuswindow.cpp:565
-#: src/gui/statuswindow.cpp:764 src/gui/statuswindow.cpp:795
+#: src/gui/statuswindow.cpp:515 src/gui/statuswindow.cpp:570
+#: src/gui/statuswindow.cpp:769 src/gui/statuswindow.cpp:800
msgid "Max"
msgstr "Max"
@@ -482,7 +482,7 @@ msgstr "Jual"
#: src/gui/quitdialog.cpp:55 src/gui/register.cpp:82 src/gui/setup.cpp:72
#: src/gui/socialwindow.cpp:1198 src/gui/textcommandeditor.cpp:241
#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updaterwindow.cpp:162
+#: src/gui/updaterwindow.cpp:168
msgid "Cancel"
msgstr "Batal"
@@ -906,7 +906,7 @@ msgid "Did You Know?"
msgstr "Apakah kamu tahu?"
#: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
-#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:53
+#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
#: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:113
msgid "Close"
msgstr "Tutup"
@@ -1241,24 +1241,24 @@ msgstr ""
msgid "Need"
msgstr "Butuh"
-#: src/gui/npcdialog.cpp:51
+#: src/gui/npcdialog.cpp:52
msgid "Stop waiting"
msgstr ""
-#: src/gui/npcdialog.cpp:52
+#: src/gui/npcdialog.cpp:53
msgid "Next"
msgstr "Berikutnya"
-#: src/gui/npcdialog.cpp:54
+#: src/gui/npcdialog.cpp:55
msgid "Submit"
msgstr "Masukan"
-#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
+#: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
#: src/gui/setup_other.cpp:151
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:632
+#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:632
msgid "Clear"
msgstr "Hapus"
@@ -1280,6 +1280,7 @@ msgid "Outfit: %d"
msgstr "Setelan: %d"
#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:892
+#: src/gui/windowmenu.cpp:302
#, c-format
msgid "Key: %s"
msgstr "Kunci: %s"
@@ -1490,9 +1491,8 @@ msgid "Warp"
msgstr ""
#: src/gui/popupmenu.cpp:589
-#, fuzzy
msgid "Clear outfit"
-msgstr "Setelan saat bepergian"
+msgstr ""
#: src/gui/popupmenu.cpp:608 src/gui/windowmenu.cpp:96
msgid "Spells"
@@ -1535,9 +1535,8 @@ msgid "Leave"
msgstr ""
#: src/gui/popupmenu.cpp:654
-#, fuzzy
msgid "Copy to clipboard"
-msgstr "Pindahkan ke chat"
+msgstr ""
#: src/gui/popupmenu.cpp:849
msgid "Change guild position"
@@ -2772,7 +2771,7 @@ msgstr "Abaikan mobs"
msgid "Create Guild"
msgstr ""
-#: src/gui/socialwindow.cpp:1196 src/gui/socialwindow.cpp:1629
+#: src/gui/socialwindow.cpp:1196 src/gui/socialwindow.cpp:1631
msgid "Create Party"
msgstr ""
@@ -2784,93 +2783,103 @@ msgstr ""
msgid "Invite"
msgstr ""
-#: src/gui/socialwindow.cpp:1412
+#. TRANSLATORS: here P is title for visible players tab in social window
+#: src/gui/socialwindow.cpp:1277
+msgid "P"
+msgstr ""
+
+#. TRANSLATORS: here F is title for friends tab in social window
+#: src/gui/socialwindow.cpp:1281
+msgid "F"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1414
#, c-format
msgid "Accepted party invite from %s."
msgstr ""
-#: src/gui/socialwindow.cpp:1422
+#: src/gui/socialwindow.cpp:1424
#, c-format
msgid "Rejected party invite from %s."
msgstr ""
-#: src/gui/socialwindow.cpp:1439
+#: src/gui/socialwindow.cpp:1441
#, c-format
msgid "Accepted guild invite from %s."
msgstr ""
-#: src/gui/socialwindow.cpp:1452
+#: src/gui/socialwindow.cpp:1454
#, c-format
msgid "Rejected guild invite from %s."
msgstr ""
-#: src/gui/socialwindow.cpp:1499
+#: src/gui/socialwindow.cpp:1501
#, c-format
msgid "Creating guild called %s."
msgstr ""
-#: src/gui/socialwindow.cpp:1522
+#: src/gui/socialwindow.cpp:1524
#, c-format
msgid "Creating party called %s."
msgstr ""
-#: src/gui/socialwindow.cpp:1536
+#: src/gui/socialwindow.cpp:1538
msgid "Guild Name"
msgstr ""
-#: src/gui/socialwindow.cpp:1537
+#: src/gui/socialwindow.cpp:1539
msgid "Choose your guild's name."
msgstr ""
-#: src/gui/socialwindow.cpp:1551
+#: src/gui/socialwindow.cpp:1553
msgid "Received guild request, but one already exists."
msgstr ""
-#: src/gui/socialwindow.cpp:1557
+#: src/gui/socialwindow.cpp:1559
#, c-format
msgid "%s has invited you to join the guild %s."
msgstr ""
-#: src/gui/socialwindow.cpp:1563
+#: src/gui/socialwindow.cpp:1565
msgid "Accept Guild Invite"
msgstr ""
-#: src/gui/socialwindow.cpp:1578
+#: src/gui/socialwindow.cpp:1580
msgid "Received party request, but one already exists."
msgstr ""
-#: src/gui/socialwindow.cpp:1589
+#: src/gui/socialwindow.cpp:1591
msgid "You have been invited you to join a party."
msgstr ""
-#: src/gui/socialwindow.cpp:1593
+#: src/gui/socialwindow.cpp:1595
#, c-format
msgid "You have been invited to join the %s party."
msgstr ""
-#: src/gui/socialwindow.cpp:1601
+#: src/gui/socialwindow.cpp:1603
#, c-format
msgid "%s has invited you to join their party."
msgstr ""
-#: src/gui/socialwindow.cpp:1606
+#: src/gui/socialwindow.cpp:1608
#, c-format
msgid "%s has invited you to join the %s party."
msgstr ""
-#: src/gui/socialwindow.cpp:1615
+#: src/gui/socialwindow.cpp:1617
msgid "Accept Party Invite"
msgstr ""
-#: src/gui/socialwindow.cpp:1630
+#: src/gui/socialwindow.cpp:1632
msgid "Cannot create party. You are already in a party"
msgstr ""
-#: src/gui/socialwindow.cpp:1635
+#: src/gui/socialwindow.cpp:1637
msgid "Party Name"
msgstr ""
-#: src/gui/socialwindow.cpp:1636
+#: src/gui/socialwindow.cpp:1638
msgid "Choose your party's name."
msgstr ""
@@ -3064,29 +3073,29 @@ msgstr "Nama: %s"
msgid "Updating..."
msgstr "Mengupdate..."
-#: src/gui/updaterwindow.cpp:160
+#: src/gui/updaterwindow.cpp:166
msgid "Connecting..."
msgstr "Menyambung..."
-#: src/gui/updaterwindow.cpp:163
+#: src/gui/updaterwindow.cpp:169
msgid "Play"
msgstr "Main"
-#: src/gui/updaterwindow.cpp:566
+#: src/gui/updaterwindow.cpp:570
msgid "##1 The update process is incomplete."
msgstr ""
#. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:568
+#: src/gui/updaterwindow.cpp:572
msgid "##1 It is strongly recommended that"
msgstr ""
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:570
+#: src/gui/updaterwindow.cpp:574
msgid "##1 you try again later."
msgstr ""
-#: src/gui/updaterwindow.cpp:746
+#: src/gui/updaterwindow.cpp:750
msgid "Completed"
msgstr ""
@@ -3959,9 +3968,9 @@ msgid ""
msgstr ""
#: src/localplayer.cpp:384
-#, fuzzy, c-format
+#, c-format
msgid "You were killed by %s"
-msgstr "Keluarkan dari organisasi"
+msgstr ""
#: src/localplayer.cpp:1439
msgid "Tried to pick up nonexistent item."
@@ -4020,9 +4029,8 @@ msgid "(d) double normal + crazy"
msgstr "(d) normal ganda + mode gila"
#: src/localplayer.cpp:1903
-#, fuzzy
msgid "(?) unknown move"
-msgstr "(?) jalan"
+msgstr ""
#: src/localplayer.cpp:1925
#, c-format
@@ -4266,27 +4274,26 @@ msgid "Game modifiers are disabled"
msgstr "Perombakan game tidak diperbolehkan"
#: src/localplayer.cpp:2241
-#, fuzzy
msgid "Game modifiers are unknown"
-msgstr "Perombakan game diperbolehkan"
+msgstr ""
-#: src/localplayer.cpp:3757
+#: src/localplayer.cpp:3758
msgid "Follow: "
msgstr "Ikuti:"
-#: src/localplayer.cpp:3759 src/localplayer.cpp:3774
+#: src/localplayer.cpp:3760 src/localplayer.cpp:3775
msgid "Follow canceled"
msgstr "Batal mengikuti"
-#: src/localplayer.cpp:3766
+#: src/localplayer.cpp:3767
msgid "Imitation: "
msgstr "Tirukan:"
-#: src/localplayer.cpp:3768 src/localplayer.cpp:3776
+#: src/localplayer.cpp:3769 src/localplayer.cpp:3777
msgid "Imitation canceled"
msgstr "Batal menirukan"
-#: src/localplayer.cpp:4124
+#: src/localplayer.cpp:4125
msgid "You see "
msgstr ""
@@ -4455,9 +4462,8 @@ msgid "Incorrect slot."
msgstr ""
#: src/net/ea/charserverhandler.cpp:167
-#, fuzzy
msgid "Incorrect race."
-msgstr "Sandi tidak benar"
+msgstr ""
#: src/net/ea/charserverhandler.cpp:182 src/net/manaserv/charhandler.cpp:210
msgid "Info"
@@ -4612,9 +4618,8 @@ msgid "%s has left your guild."
msgstr ""
#: src/net/ea/guildhandler.cpp:499
-#, fuzzy
msgid "You were kicked from guild."
-msgstr "Keluarkan dari organisasi"
+msgstr ""
#: src/net/ea/guildhandler.cpp:512
#, c-format
@@ -5608,96 +5613,3 @@ msgstr "MP %+d"
#: src/resources/itemdb.cpp:167
msgid "Unknown item"
msgstr ""
-
-#~ msgid "Waiting for server"
-#~ msgstr "Menunggu ke server"
-
-#~ msgid "Load old outfits"
-#~ msgstr "Memuat setelan lama"
-
-#~ msgid "(D)"
-#~ msgstr "(D)"
-
-#~ msgid "(I)"
-#~ msgstr "(l)"
-
-#~ msgid "(c)"
-#~ msgstr "(c)"
-
-#~ msgid "(C)"
-#~ msgstr "(C)"
-
-#~ msgid "(d)"
-#~ msgstr "(d)"
-
-#~ msgid "(?)"
-#~ msgstr "(?)"
-
-#~ msgid "(a)"
-#~ msgstr "(a)"
-
-#~ msgid "(0)"
-#~ msgstr "(0)"
-
-#~ msgid "(1)"
-#~ msgstr "(1)"
-
-#~ msgid "(2)"
-#~ msgstr "(2)"
-
-#~ msgid "(3)"
-#~ msgstr "(3)"
-
-#~ msgid "(5)"
-#~ msgstr "(5)"
-
-#~ msgid "(7)"
-#~ msgstr "(7)"
-
-#~ msgid "(A)"
-#~ msgstr "(A)"
-
-#~ msgid "(R)"
-#~ msgstr "(R)"
-
-#~ msgid "(M)"
-#~ msgstr "(M)"
-
-#~ msgid "(P)"
-#~ msgstr "(P)"
-
-#~ msgid "(s)"
-#~ msgstr "(s)"
-
-#~ msgid "(S)"
-#~ msgstr "(S)"
-
-#~ msgid "(G)"
-#~ msgstr "(G)"
-
-#~ msgid "(f)"
-#~ msgstr "(f)"
-
-#~ msgid "(F)"
-#~ msgstr "(F)"
-
-#~ msgid "(U)"
-#~ msgstr "(U)"
-
-#~ msgid "(b)"
-#~ msgstr "(b)"
-
-#~ msgid "(g)"
-#~ msgstr "(g)"
-
-#~ msgid "(N)"
-#~ msgstr "(N)"
-
-#~ msgid "(u)"
-#~ msgstr "(u)"
-
-#~ msgid "(e)"
-#~ msgstr "(e)"
-
-#~ msgid "(O)"
-#~ msgstr "(O)"
diff --git a/po/it.po b/po/it.po
index 9bcabbf02..4439e91cb 100644
--- a/po/it.po
+++ b/po/it.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-01-19 19:53+0300\n"
-"PO-Revision-Date: 2012-01-19 16:56+0000\n"
+"POT-Creation-Date: 2012-01-25 20:17+0300\n"
+"PO-Revision-Date: 2012-01-25 17:27+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Italian (http://www.transifex.net/projects/p/manaplus/team/it/)\n"
"MIME-Version: 1.0\n"
@@ -43,47 +43,47 @@ msgstr ""
msgid "I"
msgstr ""
-#: src/client.cpp:946 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:947 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
msgid "Setup"
msgstr "Impostazioni"
-#: src/client.cpp:953 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:954 src/gui/setup_perfomance.cpp:48
msgid "Perfomance"
msgstr ""
-#: src/client.cpp:958 src/gui/setup_video.cpp:315
+#: src/client.cpp:959 src/gui/setup_video.cpp:315
msgid "Video"
msgstr "Video"
-#: src/client.cpp:963
+#: src/client.cpp:964
msgid "Themes"
msgstr ""
-#: src/client.cpp:1045
+#: src/client.cpp:1046
msgid "Connecting to server"
msgstr "Connessione al server"
-#: src/client.cpp:1076
+#: src/client.cpp:1077
msgid "Logging in"
msgstr "Accesso all'account"
-#: src/client.cpp:1109
+#: src/client.cpp:1110
msgid "Entering game world"
msgstr "Accesso al gioco"
-#: src/client.cpp:1210
+#: src/client.cpp:1211
msgid "Requesting characters"
msgstr "Caricamento personaggi"
-#: src/client.cpp:1241
+#: src/client.cpp:1242
msgid "Connecting to the game server"
msgstr "Connessione al server del gioco"
-#: src/client.cpp:1251
+#: src/client.cpp:1252
msgid "Changing game servers"
msgstr "Cambiamento server del gioco"
-#: src/client.cpp:1294 src/client.cpp:1301 src/client.cpp:1435
+#: src/client.cpp:1295 src/client.cpp:1302 src/client.cpp:1436
#: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:256
#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
@@ -93,50 +93,50 @@ msgstr "Cambiamento server del gioco"
msgid "Error"
msgstr "Errore"
-#: src/client.cpp:1310
+#: src/client.cpp:1311
msgid "Requesting registration details"
msgstr "Richiesta dettagli di registrazione"
-#: src/client.cpp:1336
+#: src/client.cpp:1337
msgid "Password Change"
msgstr "Cambia password"
-#: src/client.cpp:1337
+#: src/client.cpp:1338
msgid "Password changed successfully!"
msgstr "Password modificata con successo!"
-#: src/client.cpp:1356
+#: src/client.cpp:1357
msgid "Email Change"
msgstr "Cambia Email"
-#: src/client.cpp:1357
+#: src/client.cpp:1358
msgid "Email changed successfully!"
msgstr "Email cambiata con successo!"
-#: src/client.cpp:1377
+#: src/client.cpp:1378
msgid "Unregister Successful"
msgstr "Annullamento registrazione effettuato con successo"
-#: src/client.cpp:1378
+#: src/client.cpp:1379
msgid "Farewell, come back any time..."
msgstr "Addio, torna quando vuoi..."
-#: src/client.cpp:1583 src/client.cpp:1616 src/client.cpp:1631
-#: src/client.cpp:2063 src/client.cpp:2070
+#: src/client.cpp:1584 src/client.cpp:1617 src/client.cpp:1632
+#: src/client.cpp:2064 src/client.cpp:2071
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%s non esiste e non può essere creato! Uscita in corso."
-#: src/client.cpp:1769
+#: src/client.cpp:1770
#, c-format
msgid "Invalid update host: %s"
msgstr "Invalido aggiornamento host: %s"
-#: src/client.cpp:1803 src/client.cpp:1809
+#: src/client.cpp:1804 src/client.cpp:1810
msgid "Error creating updates directory!"
msgstr "Errore durante la creazione della directory degli aggiornamenti"
-#: src/client.cpp:1830
+#: src/client.cpp:1831
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "Errore: %s non esiste e non può essere creato! Ucita in corso."
@@ -412,7 +412,7 @@ msgstr "Movimento"
msgid "Result"
msgstr "Risultato"
-#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:124
+#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:128
msgid "Reset"
msgstr "Reimposta"
@@ -435,16 +435,16 @@ msgstr ""
#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:207
-#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:765
+#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:118
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:770
msgid "+"
msgstr "+"
#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:777
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:119
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:782
msgid "-"
msgstr "-"
@@ -456,8 +456,8 @@ msgid "Quit"
msgstr "Esci"
#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
-#: src/gui/statuswindow.cpp:515 src/gui/statuswindow.cpp:565
-#: src/gui/statuswindow.cpp:764 src/gui/statuswindow.cpp:795
+#: src/gui/statuswindow.cpp:515 src/gui/statuswindow.cpp:570
+#: src/gui/statuswindow.cpp:769 src/gui/statuswindow.cpp:800
msgid "Max"
msgstr "Massimo"
@@ -488,7 +488,7 @@ msgstr "Vendi"
#: src/gui/quitdialog.cpp:55 src/gui/register.cpp:82 src/gui/setup.cpp:72
#: src/gui/socialwindow.cpp:1198 src/gui/textcommandeditor.cpp:241
#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updaterwindow.cpp:162
+#: src/gui/updaterwindow.cpp:168
msgid "Cancel"
msgstr "Annulla"
@@ -912,7 +912,7 @@ msgid "Did You Know?"
msgstr ""
#: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
-#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:53
+#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
#: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:113
msgid "Close"
msgstr "Chiudi"
@@ -1249,24 +1249,24 @@ msgstr "Barra dello stato"
msgid "Need"
msgstr "Bisogno"
-#: src/gui/npcdialog.cpp:51
+#: src/gui/npcdialog.cpp:52
msgid "Stop waiting"
msgstr ""
-#: src/gui/npcdialog.cpp:52
+#: src/gui/npcdialog.cpp:53
msgid "Next"
msgstr "Prossimo"
-#: src/gui/npcdialog.cpp:54
+#: src/gui/npcdialog.cpp:55
msgid "Submit"
msgstr "Invia"
-#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
+#: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
#: src/gui/setup_other.cpp:151
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:632
+#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:632
msgid "Clear"
msgstr "Cancella"
@@ -1288,6 +1288,7 @@ msgid "Outfit: %d"
msgstr "Outfit: %d"
#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:892
+#: src/gui/windowmenu.cpp:302
#, c-format
msgid "Key: %s"
msgstr "Chiave: %s"
@@ -1745,11 +1746,11 @@ msgstr "Preparazione download"
msgid "Error retreiving server list!"
msgstr "Errore nel ricevimento della lista sei server!"
-#: src/gui/serverdialog.cpp:678
+#: src/gui/serverdialog.cpp:681
msgid "requires a newer version"
msgstr "Richiede una versione più nuova"
-#: src/gui/serverdialog.cpp:680
+#: src/gui/serverdialog.cpp:683
#, c-format
msgid "requires v%s"
msgstr "Richiede v%s"
@@ -2786,7 +2787,7 @@ msgstr ""
msgid "Create Guild"
msgstr "Crea una Gilda"
-#: src/gui/socialwindow.cpp:1196 src/gui/socialwindow.cpp:1629
+#: src/gui/socialwindow.cpp:1196 src/gui/socialwindow.cpp:1631
msgid "Create Party"
msgstr "Crea gruppo"
@@ -2798,93 +2799,103 @@ msgstr "Sociale"
msgid "Invite"
msgstr "Invita"
-#: src/gui/socialwindow.cpp:1412
+#. TRANSLATORS: here P is title for visible players tab in social window
+#: src/gui/socialwindow.cpp:1277
+msgid "P"
+msgstr ""
+
+#. TRANSLATORS: here F is title for friends tab in social window
+#: src/gui/socialwindow.cpp:1281
+msgid "F"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1414
#, c-format
msgid "Accepted party invite from %s."
msgstr "Accettato invito al gruppo da parte di %s"
-#: src/gui/socialwindow.cpp:1422
+#: src/gui/socialwindow.cpp:1424
#, c-format
msgid "Rejected party invite from %s."
msgstr "Rifiutato invito al gruppo da parte di %s"
-#: src/gui/socialwindow.cpp:1439
+#: src/gui/socialwindow.cpp:1441
#, c-format
msgid "Accepted guild invite from %s."
msgstr "Accettato invito alla gilda da parte di %s"
-#: src/gui/socialwindow.cpp:1452
+#: src/gui/socialwindow.cpp:1454
#, c-format
msgid "Rejected guild invite from %s."
msgstr "Rifiutato invito alla gilda da parte di %s"
-#: src/gui/socialwindow.cpp:1499
+#: src/gui/socialwindow.cpp:1501
#, c-format
msgid "Creating guild called %s."
msgstr "Stai creando una gilda chiamata %s"
-#: src/gui/socialwindow.cpp:1522
+#: src/gui/socialwindow.cpp:1524
#, c-format
msgid "Creating party called %s."
msgstr "Stai creando un party chiamato %s"
-#: src/gui/socialwindow.cpp:1536
+#: src/gui/socialwindow.cpp:1538
msgid "Guild Name"
msgstr "Nome della gilda"
-#: src/gui/socialwindow.cpp:1537
+#: src/gui/socialwindow.cpp:1539
msgid "Choose your guild's name."
msgstr "Scegli un nome per la tua gilda"
-#: src/gui/socialwindow.cpp:1551
+#: src/gui/socialwindow.cpp:1553
msgid "Received guild request, but one already exists."
msgstr "Ricevuto invito ad una gilda, ma ne hai già una."
-#: src/gui/socialwindow.cpp:1557
+#: src/gui/socialwindow.cpp:1559
#, c-format
msgid "%s has invited you to join the guild %s."
msgstr "%s ti ha invitato ad entrare nella gilda %s"
-#: src/gui/socialwindow.cpp:1563
+#: src/gui/socialwindow.cpp:1565
msgid "Accept Guild Invite"
msgstr "Accetta invito alla gilda"
-#: src/gui/socialwindow.cpp:1578
+#: src/gui/socialwindow.cpp:1580
msgid "Received party request, but one already exists."
msgstr "Ricevuta richiesta di party, ma ne esiste già una."
-#: src/gui/socialwindow.cpp:1589
+#: src/gui/socialwindow.cpp:1591
msgid "You have been invited you to join a party."
msgstr "Sei stato invitato ad entrare in un party"
-#: src/gui/socialwindow.cpp:1593
+#: src/gui/socialwindow.cpp:1595
#, c-format
msgid "You have been invited to join the %s party."
msgstr "Sei stato invitato ad entrare nel gruppo %s"
-#: src/gui/socialwindow.cpp:1601
+#: src/gui/socialwindow.cpp:1603
#, c-format
msgid "%s has invited you to join their party."
msgstr "%s ti ha invitato ad unirti al suo party."
-#: src/gui/socialwindow.cpp:1606
+#: src/gui/socialwindow.cpp:1608
#, c-format
msgid "%s has invited you to join the %s party."
msgstr "%s ti ha invitato ad unirti al party %s."
-#: src/gui/socialwindow.cpp:1615
+#: src/gui/socialwindow.cpp:1617
msgid "Accept Party Invite"
msgstr "Accetta invito nel party"
-#: src/gui/socialwindow.cpp:1630
+#: src/gui/socialwindow.cpp:1632
msgid "Cannot create party. You are already in a party"
msgstr "Impossibile creare un party, sei già in un party"
-#: src/gui/socialwindow.cpp:1635
+#: src/gui/socialwindow.cpp:1637
msgid "Party Name"
msgstr "Nome del gruppo"
-#: src/gui/socialwindow.cpp:1636
+#: src/gui/socialwindow.cpp:1638
msgid "Choose your party's name."
msgstr "Scegli un nome per il tuo party"
@@ -3081,29 +3092,29 @@ msgstr "Nome: %s"
msgid "Updating..."
msgstr "Aggiornamento..."
-#: src/gui/updaterwindow.cpp:160
+#: src/gui/updaterwindow.cpp:166
msgid "Connecting..."
msgstr "Connessione..."
-#: src/gui/updaterwindow.cpp:163
+#: src/gui/updaterwindow.cpp:169
msgid "Play"
msgstr "Gioca"
-#: src/gui/updaterwindow.cpp:566
+#: src/gui/updaterwindow.cpp:570
msgid "##1 The update process is incomplete."
msgstr "##1 L'aggiornamento è stato completato."
#. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:568
+#: src/gui/updaterwindow.cpp:572
msgid "##1 It is strongly recommended that"
msgstr "##1 È fortemente raccomandato"
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:570
+#: src/gui/updaterwindow.cpp:574
msgid "##1 you try again later."
msgstr "##1 riprova più tardi"
-#: src/gui/updaterwindow.cpp:746
+#: src/gui/updaterwindow.cpp:750
msgid "Completed"
msgstr "Completato"
@@ -4294,23 +4305,23 @@ msgstr ""
msgid "Game modifiers are unknown"
msgstr ""
-#: src/localplayer.cpp:3757
+#: src/localplayer.cpp:3758
msgid "Follow: "
msgstr ""
-#: src/localplayer.cpp:3759 src/localplayer.cpp:3774
+#: src/localplayer.cpp:3760 src/localplayer.cpp:3775
msgid "Follow canceled"
msgstr ""
-#: src/localplayer.cpp:3766
+#: src/localplayer.cpp:3767
msgid "Imitation: "
msgstr ""
-#: src/localplayer.cpp:3768 src/localplayer.cpp:3776
+#: src/localplayer.cpp:3769 src/localplayer.cpp:3777
msgid "Imitation canceled"
msgstr ""
-#: src/localplayer.cpp:4124
+#: src/localplayer.cpp:4125
msgid "You see "
msgstr ""
@@ -4535,16 +4546,16 @@ msgstr ""
msgid "All whispers unignore failed."
msgstr ""
-#: src/net/ea/gamehandler.cpp:87
+#: src/net/ea/gamehandler.cpp:92
#, c-format
msgid "Online users: %d"
msgstr ""
-#: src/net/ea/gamehandler.cpp:99
+#: src/net/ea/gamehandler.cpp:104
msgid "Game"
msgstr ""
-#: src/net/ea/gamehandler.cpp:99
+#: src/net/ea/gamehandler.cpp:104
msgid "Request to quit denied!"
msgstr ""
diff --git a/po/ja.po b/po/ja.po
index 6a8589ea0..b4b7bb429 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -12,9 +12,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-01-21 19:25+0300\n"
-"PO-Revision-Date: 2012-01-21 09:20+0000\n"
-"Last-Translator: Candy <HarajukuCupcakes@gmail.com>\n"
+"POT-Creation-Date: 2012-01-25 20:17+0300\n"
+"PO-Revision-Date: 2012-01-25 17:27+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Japanese (http://www.transifex.net/projects/p/manaplus/team/"
"ja/)\n"
"Language: ja\n"
@@ -45,47 +45,47 @@ msgstr "A"
msgid "I"
msgstr "I"
-#: src/client.cpp:946 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:947 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
msgid "Setup"
msgstr "設定"
-#: src/client.cpp:953 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:954 src/gui/setup_perfomance.cpp:48
msgid "Perfomance"
msgstr "パフォーマンス"
-#: src/client.cpp:958 src/gui/setup_video.cpp:315
+#: src/client.cpp:959 src/gui/setup_video.cpp:315
msgid "Video"
msgstr "ビデオ"
-#: src/client.cpp:963
+#: src/client.cpp:964
msgid "Themes"
msgstr "テーマ"
-#: src/client.cpp:1045
+#: src/client.cpp:1046
msgid "Connecting to server"
msgstr "サーバーに接続しています"
-#: src/client.cpp:1076
+#: src/client.cpp:1077
msgid "Logging in"
msgstr "ログインしています"
-#: src/client.cpp:1109
+#: src/client.cpp:1110
msgid "Entering game world"
msgstr "ゲームの世界に移動しています"
-#: src/client.cpp:1210
+#: src/client.cpp:1211
msgid "Requesting characters"
msgstr "キャラクターを呼び出しています"
-#: src/client.cpp:1241
+#: src/client.cpp:1242
msgid "Connecting to the game server"
msgstr "ゲームサーバーに接続しています"
-#: src/client.cpp:1251
+#: src/client.cpp:1252
msgid "Changing game servers"
msgstr "ゲームサーバーを変更しています"
-#: src/client.cpp:1294 src/client.cpp:1301 src/client.cpp:1435
+#: src/client.cpp:1295 src/client.cpp:1302 src/client.cpp:1436
#: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:256
#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
@@ -95,50 +95,50 @@ msgstr "ゲームサーバーを変更しています"
msgid "Error"
msgstr "エラー"
-#: src/client.cpp:1310
+#: src/client.cpp:1311
msgid "Requesting registration details"
msgstr "登録内容を呼び出しています"
-#: src/client.cpp:1336
+#: src/client.cpp:1337
msgid "Password Change"
msgstr "パスワード変更"
-#: src/client.cpp:1337
+#: src/client.cpp:1338
msgid "Password changed successfully!"
msgstr "パスワードを変更しました"
-#: src/client.cpp:1356
+#: src/client.cpp:1357
msgid "Email Change"
msgstr "メールアドレス変更"
-#: src/client.cpp:1357
+#: src/client.cpp:1358
msgid "Email changed successfully!"
msgstr "メールアドレスを変更しました"
-#: src/client.cpp:1377
+#: src/client.cpp:1378
msgid "Unregister Successful"
msgstr "登録を解除しました"
-#: src/client.cpp:1378
+#: src/client.cpp:1379
msgid "Farewell, come back any time..."
msgstr "さようなら また会いましょう"
-#: src/client.cpp:1583 src/client.cpp:1616 src/client.cpp:1631
-#: src/client.cpp:2063 src/client.cpp:2070
+#: src/client.cpp:1584 src/client.cpp:1617 src/client.cpp:1632
+#: src/client.cpp:2064 src/client.cpp:2071
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%sは存在しない為、作成できません"
-#: src/client.cpp:1769
+#: src/client.cpp:1770
#, c-format
msgid "Invalid update host: %s"
msgstr "無効なアップデートホスト:%s"
-#: src/client.cpp:1803 src/client.cpp:1809
+#: src/client.cpp:1804 src/client.cpp:1810
msgid "Error creating updates directory!"
msgstr "更新フォルダの作成エラー"
-#: src/client.cpp:1830
+#: src/client.cpp:1831
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "エラー: %s は存在しない為、作成できません"
@@ -408,7 +408,7 @@ msgstr "動く"
msgid "Result"
msgstr "結果"
-#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:124
+#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:128
msgid "Reset"
msgstr "リセット"
@@ -431,16 +431,16 @@ msgstr "量:"
#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:207
-#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:765
+#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:118
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:770
msgid "+"
msgstr "+"
#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:777
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:119
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:782
msgid "-"
msgstr "-"
@@ -452,8 +452,8 @@ msgid "Quit"
msgstr "終了"
#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
-#: src/gui/statuswindow.cpp:515 src/gui/statuswindow.cpp:565
-#: src/gui/statuswindow.cpp:764 src/gui/statuswindow.cpp:795
+#: src/gui/statuswindow.cpp:515 src/gui/statuswindow.cpp:570
+#: src/gui/statuswindow.cpp:769 src/gui/statuswindow.cpp:800
msgid "Max"
msgstr "最大"
@@ -484,7 +484,7 @@ msgstr "売る"
#: src/gui/quitdialog.cpp:55 src/gui/register.cpp:82 src/gui/setup.cpp:72
#: src/gui/socialwindow.cpp:1198 src/gui/textcommandeditor.cpp:241
#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updaterwindow.cpp:162
+#: src/gui/updaterwindow.cpp:168
msgid "Cancel"
msgstr "キャンセル"
@@ -627,7 +627,7 @@ msgstr "アカウントとキャラクター管理"
#: src/gui/charselectdialog.cpp:139
msgid "Switch Login"
-msgstr "他のアカウントでログイン"
+msgstr "別アカウントでログイン"
#: src/gui/charselectdialog.cpp:154 src/gui/unregisterdialog.cpp:50
#: src/gui/unregisterdialog.cpp:58
@@ -908,7 +908,7 @@ msgid "Did You Know?"
msgstr "豆知識"
#: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
-#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:53
+#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
#: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:113
msgid "Close"
msgstr "閉じる"
@@ -982,7 +982,7 @@ msgstr "フィルタ:"
#: src/gui/inventorywindow.cpp:556 src/gui/popupmenu.cpp:1814
#: src/gui/popupmenu.cpp:1910 src/gui/popupmenu.cpp:1957
msgid "Equip"
-msgstr "装着する"
+msgstr "装着"
#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:548
#: src/gui/inventorywindow.cpp:552 src/gui/popupmenu.cpp:1818
@@ -1243,24 +1243,24 @@ msgstr "情勢"
msgid "Need"
msgstr "必要"
-#: src/gui/npcdialog.cpp:51
+#: src/gui/npcdialog.cpp:52
msgid "Stop waiting"
msgstr "キャンセル"
-#: src/gui/npcdialog.cpp:52
+#: src/gui/npcdialog.cpp:53
msgid "Next"
msgstr "次"
-#: src/gui/npcdialog.cpp:54
+#: src/gui/npcdialog.cpp:55
msgid "Submit"
msgstr "決定"
-#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
+#: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
#: src/gui/setup_other.cpp:151
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:632
+#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:632
msgid "Clear"
msgstr "クリア"
@@ -1282,6 +1282,7 @@ msgid "Outfit: %d"
msgstr "服装: %d"
#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:892
+#: src/gui/windowmenu.cpp:302
#, c-format
msgid "Key: %s"
msgstr "鍵: %s"
@@ -2166,7 +2167,7 @@ msgstr "ボットチェッカーを有効にする"
#: src/gui/setup_other.cpp:174
msgid "Enable buggy servers protection (do not disable)"
-msgstr "不安定なサーバーの保護を有効にする(無効にしない)"
+msgstr "不安定なサーバー保護を有効にする(無効にしない)"
#: src/gui/setup_other.cpp:178
msgid "Enable debug log"
@@ -2522,7 +2523,7 @@ msgstr "パーティクル効果"
#: src/gui/setup_video.cpp:293
msgid "Show pickup notification"
-msgstr "ピックアップ通知表示"
+msgstr "収集通知表示"
#. TRANSLATORS: Refers to "Show own name"
#: src/gui/setup_video.cpp:295
@@ -2776,7 +2777,7 @@ msgstr "敵を無視する"
msgid "Create Guild"
msgstr "ギルドを作成する"
-#: src/gui/socialwindow.cpp:1196 src/gui/socialwindow.cpp:1629
+#: src/gui/socialwindow.cpp:1196 src/gui/socialwindow.cpp:1631
msgid "Create Party"
msgstr "パーティを作る"
@@ -2788,93 +2789,103 @@ msgstr "ソーシャル"
msgid "Invite"
msgstr "招待"
-#: src/gui/socialwindow.cpp:1412
+#. TRANSLATORS: here P is title for visible players tab in social window
+#: src/gui/socialwindow.cpp:1277
+msgid "P"
+msgstr ""
+
+#. TRANSLATORS: here F is title for friends tab in social window
+#: src/gui/socialwindow.cpp:1281
+msgid "F"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1414
#, c-format
msgid "Accepted party invite from %s."
msgstr "%sからのパーティ招待を承認しました"
-#: src/gui/socialwindow.cpp:1422
+#: src/gui/socialwindow.cpp:1424
#, c-format
msgid "Rejected party invite from %s."
msgstr "%sからのパーティ招待を拒否しました"
-#: src/gui/socialwindow.cpp:1439
+#: src/gui/socialwindow.cpp:1441
#, c-format
msgid "Accepted guild invite from %s."
msgstr "%sからのギルド招待を承認しました"
-#: src/gui/socialwindow.cpp:1452
+#: src/gui/socialwindow.cpp:1454
#, c-format
msgid "Rejected guild invite from %s."
msgstr "%sからのギルド招待を拒否しました"
-#: src/gui/socialwindow.cpp:1499
+#: src/gui/socialwindow.cpp:1501
#, c-format
msgid "Creating guild called %s."
msgstr "ギルド %sを作成しました"
-#: src/gui/socialwindow.cpp:1522
+#: src/gui/socialwindow.cpp:1524
#, c-format
msgid "Creating party called %s."
msgstr "パーティ %sを作成しました"
-#: src/gui/socialwindow.cpp:1536
+#: src/gui/socialwindow.cpp:1538
msgid "Guild Name"
msgstr "ギルド名"
-#: src/gui/socialwindow.cpp:1537
+#: src/gui/socialwindow.cpp:1539
msgid "Choose your guild's name."
msgstr "ギルド名を選んでください"
-#: src/gui/socialwindow.cpp:1551
+#: src/gui/socialwindow.cpp:1553
msgid "Received guild request, but one already exists."
msgstr "ギルド招待を承認したが既に入会しています"
-#: src/gui/socialwindow.cpp:1557
+#: src/gui/socialwindow.cpp:1559
#, c-format
msgid "%s has invited you to join the guild %s."
msgstr "%sがギルド %sへ招待しています"
-#: src/gui/socialwindow.cpp:1563
+#: src/gui/socialwindow.cpp:1565
msgid "Accept Guild Invite"
msgstr "ギルド招待を受け入れる"
-#: src/gui/socialwindow.cpp:1578
+#: src/gui/socialwindow.cpp:1580
msgid "Received party request, but one already exists."
msgstr "パーティ招待を承認したが既に入会しています"
-#: src/gui/socialwindow.cpp:1589
+#: src/gui/socialwindow.cpp:1591
msgid "You have been invited you to join a party."
msgstr "パーティに招待されました"
-#: src/gui/socialwindow.cpp:1593
+#: src/gui/socialwindow.cpp:1595
#, c-format
msgid "You have been invited to join the %s party."
msgstr "パーティ %sに招待されました"
-#: src/gui/socialwindow.cpp:1601
+#: src/gui/socialwindow.cpp:1603
#, c-format
msgid "%s has invited you to join their party."
msgstr "%sはあなたをパーティに招待しました"
-#: src/gui/socialwindow.cpp:1606
+#: src/gui/socialwindow.cpp:1608
#, c-format
msgid "%s has invited you to join the %s party."
msgstr "%sはあなたを%sというパーティに招待しました"
-#: src/gui/socialwindow.cpp:1615
+#: src/gui/socialwindow.cpp:1617
msgid "Accept Party Invite"
msgstr "パーティ招待を受け入れます"
-#: src/gui/socialwindow.cpp:1630
+#: src/gui/socialwindow.cpp:1632
msgid "Cannot create party. You are already in a party"
msgstr "パーティーを作成することはできません。もうパーティーに入っています"
-#: src/gui/socialwindow.cpp:1635
+#: src/gui/socialwindow.cpp:1637
msgid "Party Name"
msgstr "パーティ名"
-#: src/gui/socialwindow.cpp:1636
+#: src/gui/socialwindow.cpp:1638
msgid "Choose your party's name."
msgstr "パーティ名を選んでください"
@@ -3070,29 +3081,29 @@ msgstr "名前: %s"
msgid "Updating..."
msgstr "更新しています..."
-#: src/gui/updaterwindow.cpp:160
+#: src/gui/updaterwindow.cpp:166
msgid "Connecting..."
msgstr "接続しています..."
-#: src/gui/updaterwindow.cpp:163
+#: src/gui/updaterwindow.cpp:169
msgid "Play"
msgstr "プレイ"
-#: src/gui/updaterwindow.cpp:566
+#: src/gui/updaterwindow.cpp:570
msgid "##1 The update process is incomplete."
msgstr "##1 アップデートは完了していません"
#. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:568
+#: src/gui/updaterwindow.cpp:572
msgid "##1 It is strongly recommended that"
msgstr "##1 する事を強く推奨します"
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:570
+#: src/gui/updaterwindow.cpp:574
msgid "##1 you try again later."
msgstr "##1 しばらくたってからもう一度試してください"
-#: src/gui/updaterwindow.cpp:746
+#: src/gui/updaterwindow.cpp:750
msgid "Completed"
msgstr "完了"
@@ -4009,7 +4020,7 @@ msgstr "不明なエラーの為拾えません"
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
-msgstr[0] "%d [@@%d|%s@@]を拾いました"
+msgstr[0] "%d [@@%d|%s@@]を手に入れました"
#: src/localplayer.cpp:1898
msgid "(D) default moves"
@@ -4280,23 +4291,23 @@ msgstr "ゲームモディファイアは無効になってます"
msgid "Game modifiers are unknown"
msgstr "不明なゲームモディファイアー"
-#: src/localplayer.cpp:3757
+#: src/localplayer.cpp:3758
msgid "Follow: "
msgstr "フォロー: "
-#: src/localplayer.cpp:3759 src/localplayer.cpp:3774
+#: src/localplayer.cpp:3760 src/localplayer.cpp:3775
msgid "Follow canceled"
msgstr "フォローを止める"
-#: src/localplayer.cpp:3766
+#: src/localplayer.cpp:3767
msgid "Imitation: "
msgstr "真似: "
-#: src/localplayer.cpp:3768 src/localplayer.cpp:3776
+#: src/localplayer.cpp:3769 src/localplayer.cpp:3777
msgid "Imitation canceled"
msgstr "真似をやめる"
-#: src/localplayer.cpp:4124
+#: src/localplayer.cpp:4125
msgid "You see "
msgstr " が見える"
@@ -4471,7 +4482,7 @@ msgstr "間違ったスロット"
#: src/net/ea/charserverhandler.cpp:167
msgid "Incorrect race."
-msgstr ""
+msgstr "種別が間違っています"
#: src/net/ea/charserverhandler.cpp:182 src/net/manaserv/charhandler.cpp:210
msgid "Info"
@@ -5000,7 +5011,7 @@ msgstr "インベントリーが体重の半分以下になった為、体力は
#: src/net/ea/playerhandler.cpp:453
#, c-format
msgid "You picked up %s."
-msgstr "%sを拾いました"
+msgstr "%sを手に入れました"
#: src/net/ea/playerhandler.cpp:459
#, c-format
diff --git a/po/manaplus.pot b/po/manaplus.pot
index d36082bed..91737f2b7 100644
--- a/po/manaplus.pot
+++ b/po/manaplus.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-01-21 19:25+0300\n"
+"POT-Creation-Date: 2012-01-25 20:17+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -40,47 +40,47 @@ msgstr ""
msgid "I"
msgstr ""
-#: src/client.cpp:946 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:947 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
msgid "Setup"
msgstr ""
-#: src/client.cpp:953 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:954 src/gui/setup_perfomance.cpp:48
msgid "Perfomance"
msgstr ""
-#: src/client.cpp:958 src/gui/setup_video.cpp:315
+#: src/client.cpp:959 src/gui/setup_video.cpp:315
msgid "Video"
msgstr ""
-#: src/client.cpp:963
+#: src/client.cpp:964
msgid "Themes"
msgstr ""
-#: src/client.cpp:1045
+#: src/client.cpp:1046
msgid "Connecting to server"
msgstr ""
-#: src/client.cpp:1076
+#: src/client.cpp:1077
msgid "Logging in"
msgstr ""
-#: src/client.cpp:1109
+#: src/client.cpp:1110
msgid "Entering game world"
msgstr ""
-#: src/client.cpp:1210
+#: src/client.cpp:1211
msgid "Requesting characters"
msgstr ""
-#: src/client.cpp:1241
+#: src/client.cpp:1242
msgid "Connecting to the game server"
msgstr ""
-#: src/client.cpp:1251
+#: src/client.cpp:1252
msgid "Changing game servers"
msgstr ""
-#: src/client.cpp:1294 src/client.cpp:1301 src/client.cpp:1435
+#: src/client.cpp:1295 src/client.cpp:1302 src/client.cpp:1436
#: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:256
#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
@@ -90,50 +90,50 @@ msgstr ""
msgid "Error"
msgstr ""
-#: src/client.cpp:1310
+#: src/client.cpp:1311
msgid "Requesting registration details"
msgstr ""
-#: src/client.cpp:1336
+#: src/client.cpp:1337
msgid "Password Change"
msgstr ""
-#: src/client.cpp:1337
+#: src/client.cpp:1338
msgid "Password changed successfully!"
msgstr ""
-#: src/client.cpp:1356
+#: src/client.cpp:1357
msgid "Email Change"
msgstr ""
-#: src/client.cpp:1357
+#: src/client.cpp:1358
msgid "Email changed successfully!"
msgstr ""
-#: src/client.cpp:1377
+#: src/client.cpp:1378
msgid "Unregister Successful"
msgstr ""
-#: src/client.cpp:1378
+#: src/client.cpp:1379
msgid "Farewell, come back any time..."
msgstr ""
-#: src/client.cpp:1583 src/client.cpp:1616 src/client.cpp:1631
-#: src/client.cpp:2063 src/client.cpp:2070
+#: src/client.cpp:1584 src/client.cpp:1617 src/client.cpp:1632
+#: src/client.cpp:2064 src/client.cpp:2071
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
-#: src/client.cpp:1769
+#: src/client.cpp:1770
#, c-format
msgid "Invalid update host: %s"
msgstr ""
-#: src/client.cpp:1803 src/client.cpp:1809
+#: src/client.cpp:1804 src/client.cpp:1810
msgid "Error creating updates directory!"
msgstr ""
-#: src/client.cpp:1830
+#: src/client.cpp:1831
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
@@ -405,7 +405,7 @@ msgstr ""
msgid "Result"
msgstr ""
-#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:124
+#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:128
msgid "Reset"
msgstr ""
@@ -428,16 +428,16 @@ msgstr ""
#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:207
-#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:765
+#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:118
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:770
msgid "+"
msgstr ""
#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:777
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:119
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:782
msgid "-"
msgstr ""
@@ -449,8 +449,8 @@ msgid "Quit"
msgstr ""
#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
-#: src/gui/statuswindow.cpp:515 src/gui/statuswindow.cpp:565
-#: src/gui/statuswindow.cpp:764 src/gui/statuswindow.cpp:795
+#: src/gui/statuswindow.cpp:515 src/gui/statuswindow.cpp:570
+#: src/gui/statuswindow.cpp:769 src/gui/statuswindow.cpp:800
msgid "Max"
msgstr ""
@@ -481,7 +481,7 @@ msgstr ""
#: src/gui/quitdialog.cpp:55 src/gui/register.cpp:82 src/gui/setup.cpp:72
#: src/gui/socialwindow.cpp:1198 src/gui/textcommandeditor.cpp:241
#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updaterwindow.cpp:162
+#: src/gui/updaterwindow.cpp:168
msgid "Cancel"
msgstr ""
@@ -905,7 +905,7 @@ msgid "Did You Know?"
msgstr ""
#: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
-#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:53
+#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
#: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:113
msgid "Close"
msgstr ""
@@ -1242,24 +1242,24 @@ msgstr ""
msgid "Need"
msgstr ""
-#: src/gui/npcdialog.cpp:51
+#: src/gui/npcdialog.cpp:52
msgid "Stop waiting"
msgstr ""
-#: src/gui/npcdialog.cpp:52
+#: src/gui/npcdialog.cpp:53
msgid "Next"
msgstr ""
-#: src/gui/npcdialog.cpp:54
+#: src/gui/npcdialog.cpp:55
msgid "Submit"
msgstr ""
-#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
+#: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
#: src/gui/setup_other.cpp:151
msgid "NPC"
msgstr ""
-#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:632
+#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:632
msgid "Clear"
msgstr ""
@@ -1281,6 +1281,7 @@ msgid "Outfit: %d"
msgstr ""
#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:892
+#: src/gui/windowmenu.cpp:302
#, c-format
msgid "Key: %s"
msgstr ""
@@ -2771,7 +2772,7 @@ msgstr ""
msgid "Create Guild"
msgstr ""
-#: src/gui/socialwindow.cpp:1196 src/gui/socialwindow.cpp:1629
+#: src/gui/socialwindow.cpp:1196 src/gui/socialwindow.cpp:1631
msgid "Create Party"
msgstr ""
@@ -2783,93 +2784,103 @@ msgstr ""
msgid "Invite"
msgstr ""
-#: src/gui/socialwindow.cpp:1412
+#. TRANSLATORS: here P is title for visible players tab in social window
+#: src/gui/socialwindow.cpp:1277
+msgid "P"
+msgstr ""
+
+#. TRANSLATORS: here F is title for friends tab in social window
+#: src/gui/socialwindow.cpp:1281
+msgid "F"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1414
#, c-format
msgid "Accepted party invite from %s."
msgstr ""
-#: src/gui/socialwindow.cpp:1422
+#: src/gui/socialwindow.cpp:1424
#, c-format
msgid "Rejected party invite from %s."
msgstr ""
-#: src/gui/socialwindow.cpp:1439
+#: src/gui/socialwindow.cpp:1441
#, c-format
msgid "Accepted guild invite from %s."
msgstr ""
-#: src/gui/socialwindow.cpp:1452
+#: src/gui/socialwindow.cpp:1454
#, c-format
msgid "Rejected guild invite from %s."
msgstr ""
-#: src/gui/socialwindow.cpp:1499
+#: src/gui/socialwindow.cpp:1501
#, c-format
msgid "Creating guild called %s."
msgstr ""
-#: src/gui/socialwindow.cpp:1522
+#: src/gui/socialwindow.cpp:1524
#, c-format
msgid "Creating party called %s."
msgstr ""
-#: src/gui/socialwindow.cpp:1536
+#: src/gui/socialwindow.cpp:1538
msgid "Guild Name"
msgstr ""
-#: src/gui/socialwindow.cpp:1537
+#: src/gui/socialwindow.cpp:1539
msgid "Choose your guild's name."
msgstr ""
-#: src/gui/socialwindow.cpp:1551
+#: src/gui/socialwindow.cpp:1553
msgid "Received guild request, but one already exists."
msgstr ""
-#: src/gui/socialwindow.cpp:1557
+#: src/gui/socialwindow.cpp:1559
#, c-format
msgid "%s has invited you to join the guild %s."
msgstr ""
-#: src/gui/socialwindow.cpp:1563
+#: src/gui/socialwindow.cpp:1565
msgid "Accept Guild Invite"
msgstr ""
-#: src/gui/socialwindow.cpp:1578
+#: src/gui/socialwindow.cpp:1580
msgid "Received party request, but one already exists."
msgstr ""
-#: src/gui/socialwindow.cpp:1589
+#: src/gui/socialwindow.cpp:1591
msgid "You have been invited you to join a party."
msgstr ""
-#: src/gui/socialwindow.cpp:1593
+#: src/gui/socialwindow.cpp:1595
#, c-format
msgid "You have been invited to join the %s party."
msgstr ""
-#: src/gui/socialwindow.cpp:1601
+#: src/gui/socialwindow.cpp:1603
#, c-format
msgid "%s has invited you to join their party."
msgstr ""
-#: src/gui/socialwindow.cpp:1606
+#: src/gui/socialwindow.cpp:1608
#, c-format
msgid "%s has invited you to join the %s party."
msgstr ""
-#: src/gui/socialwindow.cpp:1615
+#: src/gui/socialwindow.cpp:1617
msgid "Accept Party Invite"
msgstr ""
-#: src/gui/socialwindow.cpp:1630
+#: src/gui/socialwindow.cpp:1632
msgid "Cannot create party. You are already in a party"
msgstr ""
-#: src/gui/socialwindow.cpp:1635
+#: src/gui/socialwindow.cpp:1637
msgid "Party Name"
msgstr ""
-#: src/gui/socialwindow.cpp:1636
+#: src/gui/socialwindow.cpp:1638
msgid "Choose your party's name."
msgstr ""
@@ -3063,29 +3074,29 @@ msgstr ""
msgid "Updating..."
msgstr ""
-#: src/gui/updaterwindow.cpp:160
+#: src/gui/updaterwindow.cpp:166
msgid "Connecting..."
msgstr ""
-#: src/gui/updaterwindow.cpp:163
+#: src/gui/updaterwindow.cpp:169
msgid "Play"
msgstr ""
-#: src/gui/updaterwindow.cpp:566
+#: src/gui/updaterwindow.cpp:570
msgid "##1 The update process is incomplete."
msgstr ""
#. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:568
+#: src/gui/updaterwindow.cpp:572
msgid "##1 It is strongly recommended that"
msgstr ""
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:570
+#: src/gui/updaterwindow.cpp:574
msgid "##1 you try again later."
msgstr ""
-#: src/gui/updaterwindow.cpp:746
+#: src/gui/updaterwindow.cpp:750
msgid "Completed"
msgstr ""
@@ -4268,23 +4279,23 @@ msgstr ""
msgid "Game modifiers are unknown"
msgstr ""
-#: src/localplayer.cpp:3757
+#: src/localplayer.cpp:3758
msgid "Follow: "
msgstr ""
-#: src/localplayer.cpp:3759 src/localplayer.cpp:3774
+#: src/localplayer.cpp:3760 src/localplayer.cpp:3775
msgid "Follow canceled"
msgstr ""
-#: src/localplayer.cpp:3766
+#: src/localplayer.cpp:3767
msgid "Imitation: "
msgstr ""
-#: src/localplayer.cpp:3768 src/localplayer.cpp:3776
+#: src/localplayer.cpp:3769 src/localplayer.cpp:3777
msgid "Imitation canceled"
msgstr ""
-#: src/localplayer.cpp:4124
+#: src/localplayer.cpp:4125
msgid "You see "
msgstr ""
diff --git a/po/nl_BE.po b/po/nl_BE.po
index 6ed92b105..0d1cb855e 100644
--- a/po/nl_BE.po
+++ b/po/nl_BE.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-01-21 19:25+0300\n"
-"PO-Revision-Date: 2012-01-19 16:56+0000\n"
+"POT-Creation-Date: 2012-01-25 20:17+0300\n"
+"PO-Revision-Date: 2012-01-25 17:27+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Dutch (Belgium) (http://www.transifex.net/projects/p/manaplus/"
"team/nl_BE/)\n"
@@ -42,47 +42,47 @@ msgstr "A"
msgid "I"
msgstr "I"
-#: src/client.cpp:946 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:947 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
msgid "Setup"
msgstr "Configureren"
-#: src/client.cpp:953 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:954 src/gui/setup_perfomance.cpp:48
msgid "Perfomance"
msgstr ""
-#: src/client.cpp:958 src/gui/setup_video.cpp:315
+#: src/client.cpp:959 src/gui/setup_video.cpp:315
msgid "Video"
msgstr "Video"
-#: src/client.cpp:963
+#: src/client.cpp:964
msgid "Themes"
msgstr ""
-#: src/client.cpp:1045
+#: src/client.cpp:1046
msgid "Connecting to server"
msgstr "Verbinden met server"
-#: src/client.cpp:1076
+#: src/client.cpp:1077
msgid "Logging in"
msgstr "Inloggen"
-#: src/client.cpp:1109
+#: src/client.cpp:1110
msgid "Entering game world"
msgstr "Spelwereld binnenkomen"
-#: src/client.cpp:1210
+#: src/client.cpp:1211
msgid "Requesting characters"
msgstr "Aanvragen personage"
-#: src/client.cpp:1241
+#: src/client.cpp:1242
msgid "Connecting to the game server"
msgstr "Verbinden met de spelserver"
-#: src/client.cpp:1251
+#: src/client.cpp:1252
msgid "Changing game servers"
msgstr "Wijzigen spelservers"
-#: src/client.cpp:1294 src/client.cpp:1301 src/client.cpp:1435
+#: src/client.cpp:1295 src/client.cpp:1302 src/client.cpp:1436
#: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:256
#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
@@ -92,50 +92,50 @@ msgstr "Wijzigen spelservers"
msgid "Error"
msgstr "Fout"
-#: src/client.cpp:1310
+#: src/client.cpp:1311
msgid "Requesting registration details"
msgstr "Aanvragen registratie details"
-#: src/client.cpp:1336
+#: src/client.cpp:1337
msgid "Password Change"
msgstr "Paswoord Wijziging"
-#: src/client.cpp:1337
+#: src/client.cpp:1338
msgid "Password changed successfully!"
msgstr "Paswoord is gewijzigd!"
-#: src/client.cpp:1356
+#: src/client.cpp:1357
msgid "Email Change"
msgstr "Email Wijziging"
-#: src/client.cpp:1357
+#: src/client.cpp:1358
msgid "Email changed successfully!"
msgstr "Email is gewijzigd!"
-#: src/client.cpp:1377
+#: src/client.cpp:1378
msgid "Unregister Successful"
msgstr "Registratie ongedaan gemaakt!"
-#: src/client.cpp:1378
+#: src/client.cpp:1379
msgid "Farewell, come back any time..."
msgstr "Tot ziens..."
-#: src/client.cpp:1583 src/client.cpp:1616 src/client.cpp:1631
-#: src/client.cpp:2063 src/client.cpp:2070
+#: src/client.cpp:1584 src/client.cpp:1617 src/client.cpp:1632
+#: src/client.cpp:2064 src/client.cpp:2071
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%s bestaat niet en kan niet gecreëerd worden! Stoppen."
-#: src/client.cpp:1769
+#: src/client.cpp:1770
#, c-format
msgid "Invalid update host: %s"
msgstr "Ongeldige update host %s"
-#: src/client.cpp:1803 src/client.cpp:1809
+#: src/client.cpp:1804 src/client.cpp:1810
msgid "Error creating updates directory!"
msgstr "Fout bij het creëren van de update map!"
-#: src/client.cpp:1830
+#: src/client.cpp:1831
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "Fout: %s bestaat niet en kan niet gecreëerd worden! Stoppen."
@@ -410,7 +410,7 @@ msgstr "Beweeg"
msgid "Result"
msgstr "Resultaat"
-#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:124
+#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:128
msgid "Reset"
msgstr "Reset"
@@ -433,16 +433,16 @@ msgstr ""
#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:207
-#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:765
+#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:118
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:770
msgid "+"
msgstr "+"
#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:777
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:119
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:782
msgid "-"
msgstr "-"
@@ -454,8 +454,8 @@ msgid "Quit"
msgstr "Afsluiten"
#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
-#: src/gui/statuswindow.cpp:515 src/gui/statuswindow.cpp:565
-#: src/gui/statuswindow.cpp:764 src/gui/statuswindow.cpp:795
+#: src/gui/statuswindow.cpp:515 src/gui/statuswindow.cpp:570
+#: src/gui/statuswindow.cpp:769 src/gui/statuswindow.cpp:800
msgid "Max"
msgstr "Maximum"
@@ -486,7 +486,7 @@ msgstr "Verkopen"
#: src/gui/quitdialog.cpp:55 src/gui/register.cpp:82 src/gui/setup.cpp:72
#: src/gui/socialwindow.cpp:1198 src/gui/textcommandeditor.cpp:241
#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updaterwindow.cpp:162
+#: src/gui/updaterwindow.cpp:168
msgid "Cancel"
msgstr "Annuleren"
@@ -910,7 +910,7 @@ msgid "Did You Know?"
msgstr "Weet u?"
#: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
-#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:53
+#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
#: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:113
msgid "Close"
msgstr "Sluiten"
@@ -1247,24 +1247,24 @@ msgstr ""
msgid "Need"
msgstr "Nood"
-#: src/gui/npcdialog.cpp:51
+#: src/gui/npcdialog.cpp:52
msgid "Stop waiting"
msgstr ""
-#: src/gui/npcdialog.cpp:52
+#: src/gui/npcdialog.cpp:53
msgid "Next"
msgstr "Volgende"
-#: src/gui/npcdialog.cpp:54
+#: src/gui/npcdialog.cpp:55
msgid "Submit"
msgstr "Indienen"
-#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
+#: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
#: src/gui/setup_other.cpp:151
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:632
+#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:632
msgid "Clear"
msgstr "Wissen"
@@ -1286,6 +1286,7 @@ msgid "Outfit: %d"
msgstr "Kleren: %d"
#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:892
+#: src/gui/windowmenu.cpp:302
#, c-format
msgid "Key: %s"
msgstr "Sleutel: %s"
@@ -2784,7 +2785,7 @@ msgstr ""
msgid "Create Guild"
msgstr "Guild aanmaken"
-#: src/gui/socialwindow.cpp:1196 src/gui/socialwindow.cpp:1629
+#: src/gui/socialwindow.cpp:1196 src/gui/socialwindow.cpp:1631
msgid "Create Party"
msgstr "Groep aanmaken"
@@ -2796,93 +2797,103 @@ msgstr "Sociaal"
msgid "Invite"
msgstr "Nodig uit"
-#: src/gui/socialwindow.cpp:1412
+#. TRANSLATORS: here P is title for visible players tab in social window
+#: src/gui/socialwindow.cpp:1277
+msgid "P"
+msgstr ""
+
+#. TRANSLATORS: here F is title for friends tab in social window
+#: src/gui/socialwindow.cpp:1281
+msgid "F"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1414
#, c-format
msgid "Accepted party invite from %s."
msgstr "Uitnodiging voor groep %s aanvaard."
-#: src/gui/socialwindow.cpp:1422
+#: src/gui/socialwindow.cpp:1424
#, c-format
msgid "Rejected party invite from %s."
msgstr "Uitnodiging voor groep %s geweigerd."
-#: src/gui/socialwindow.cpp:1439
+#: src/gui/socialwindow.cpp:1441
#, c-format
msgid "Accepted guild invite from %s."
msgstr "Uitnodiging voor guild %s aanvaard."
-#: src/gui/socialwindow.cpp:1452
+#: src/gui/socialwindow.cpp:1454
#, c-format
msgid "Rejected guild invite from %s."
msgstr "Uitnodiging voor guild %s geweigerd."
-#: src/gui/socialwindow.cpp:1499
+#: src/gui/socialwindow.cpp:1501
#, c-format
msgid "Creating guild called %s."
msgstr "Maken van guild %s."
-#: src/gui/socialwindow.cpp:1522
+#: src/gui/socialwindow.cpp:1524
#, c-format
msgid "Creating party called %s."
msgstr "Maken van groep %s."
-#: src/gui/socialwindow.cpp:1536
+#: src/gui/socialwindow.cpp:1538
msgid "Guild Name"
msgstr "Guild Naam"
-#: src/gui/socialwindow.cpp:1537
+#: src/gui/socialwindow.cpp:1539
msgid "Choose your guild's name."
msgstr "Kies uw guild naam"
-#: src/gui/socialwindow.cpp:1551
+#: src/gui/socialwindow.cpp:1553
msgid "Received guild request, but one already exists."
msgstr "Uitnodiging tot guild ontvangen, maar er is er al één."
-#: src/gui/socialwindow.cpp:1557
+#: src/gui/socialwindow.cpp:1559
#, c-format
msgid "%s has invited you to join the guild %s."
msgstr "%s heeft je uitgenodigd om guid %s te vervoegen."
-#: src/gui/socialwindow.cpp:1563
+#: src/gui/socialwindow.cpp:1565
msgid "Accept Guild Invite"
msgstr "Guild Uitnodiging Aanvaarden"
-#: src/gui/socialwindow.cpp:1578
+#: src/gui/socialwindow.cpp:1580
msgid "Received party request, but one already exists."
msgstr "Uitnodiging tot groep ontvangen, maar er is er al één."
-#: src/gui/socialwindow.cpp:1589
+#: src/gui/socialwindow.cpp:1591
msgid "You have been invited you to join a party."
msgstr "U bent uitgenodigd om je bij een groep te voegen."
-#: src/gui/socialwindow.cpp:1593
+#: src/gui/socialwindow.cpp:1595
#, c-format
msgid "You have been invited to join the %s party."
msgstr "U bent uitgenodigd om je bij groep %s te voegen."
-#: src/gui/socialwindow.cpp:1601
+#: src/gui/socialwindow.cpp:1603
#, c-format
msgid "%s has invited you to join their party."
msgstr "%s heeft je uitgenodigd om je bij hun groep te voegen."
-#: src/gui/socialwindow.cpp:1606
+#: src/gui/socialwindow.cpp:1608
#, c-format
msgid "%s has invited you to join the %s party."
msgstr "%s heeft je uitgenodigd om je bij groep %s te voegen."
-#: src/gui/socialwindow.cpp:1615
+#: src/gui/socialwindow.cpp:1617
msgid "Accept Party Invite"
msgstr "Groepsuitnodiging aanvaarden"
-#: src/gui/socialwindow.cpp:1630
+#: src/gui/socialwindow.cpp:1632
msgid "Cannot create party. You are already in a party"
msgstr "Kan groep niet aanmaken. Je bent al in een groep."
-#: src/gui/socialwindow.cpp:1635
+#: src/gui/socialwindow.cpp:1637
msgid "Party Name"
msgstr "Groep Naam"
-#: src/gui/socialwindow.cpp:1636
+#: src/gui/socialwindow.cpp:1638
msgid "Choose your party's name."
msgstr "Kies uw groepsnaam."
@@ -3078,29 +3089,29 @@ msgstr "Naam: %s"
msgid "Updating..."
msgstr "Actualiseren..."
-#: src/gui/updaterwindow.cpp:160
+#: src/gui/updaterwindow.cpp:166
msgid "Connecting..."
msgstr "Verbinden..."
-#: src/gui/updaterwindow.cpp:163
+#: src/gui/updaterwindow.cpp:169
msgid "Play"
msgstr "Spelen"
-#: src/gui/updaterwindow.cpp:566
+#: src/gui/updaterwindow.cpp:570
msgid "##1 The update process is incomplete."
msgstr "##1 Het updateproces is onvolledig."
#. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:568
+#: src/gui/updaterwindow.cpp:572
msgid "##1 It is strongly recommended that"
msgstr "##1 Het is ten sterkste aanbevolen dat"
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:570
+#: src/gui/updaterwindow.cpp:574
msgid "##1 you try again later."
msgstr "##1 probeer later opnieuw."
-#: src/gui/updaterwindow.cpp:746
+#: src/gui/updaterwindow.cpp:750
msgid "Completed"
msgstr "Voltooid"
@@ -4292,23 +4303,23 @@ msgstr ""
msgid "Game modifiers are unknown"
msgstr ""
-#: src/localplayer.cpp:3757
+#: src/localplayer.cpp:3758
msgid "Follow: "
msgstr "Volg: "
-#: src/localplayer.cpp:3759 src/localplayer.cpp:3774
+#: src/localplayer.cpp:3760 src/localplayer.cpp:3775
msgid "Follow canceled"
msgstr "Volgen onderbroken"
-#: src/localplayer.cpp:3766
+#: src/localplayer.cpp:3767
msgid "Imitation: "
msgstr "Imitatie: "
-#: src/localplayer.cpp:3768 src/localplayer.cpp:3776
+#: src/localplayer.cpp:3769 src/localplayer.cpp:3777
msgid "Imitation canceled"
msgstr "Imitatie onderbroken"
-#: src/localplayer.cpp:4124
+#: src/localplayer.cpp:4125
msgid "You see "
msgstr ""
diff --git a/po/pl.po b/po/pl.po
index 1a3a7dd59..1f2ee4bdc 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-01-21 19:25+0300\n"
-"PO-Revision-Date: 2012-01-19 21:15+0000\n"
-"Last-Translator: derpella <matwa@poczta.pl>\n"
+"POT-Creation-Date: 2012-01-25 20:17+0300\n"
+"PO-Revision-Date: 2012-01-25 17:27+0000\n"
+"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Polish (http://www.transifex.net/projects/p/manaplus/team/"
"pl/)\n"
"Language: pl\n"
@@ -43,47 +43,47 @@ msgstr "A"
msgid "I"
msgstr "I"
-#: src/client.cpp:946 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:947 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
msgid "Setup"
msgstr "Konfiguracja"
-#: src/client.cpp:953 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:954 src/gui/setup_perfomance.cpp:48
msgid "Perfomance"
msgstr "Wydajność programu"
-#: src/client.cpp:958 src/gui/setup_video.cpp:315
+#: src/client.cpp:959 src/gui/setup_video.cpp:315
msgid "Video"
msgstr "Obraz"
-#: src/client.cpp:963
+#: src/client.cpp:964
msgid "Themes"
msgstr "Skórki"
-#: src/client.cpp:1045
+#: src/client.cpp:1046
msgid "Connecting to server"
msgstr "Łączenie z serwerem"
-#: src/client.cpp:1076
+#: src/client.cpp:1077
msgid "Logging in"
msgstr "Logowanie"
-#: src/client.cpp:1109
+#: src/client.cpp:1110
msgid "Entering game world"
msgstr "Wchodzenie do świata gry"
-#: src/client.cpp:1210
+#: src/client.cpp:1211
msgid "Requesting characters"
msgstr "Sprawdzanie postaci"
-#: src/client.cpp:1241
+#: src/client.cpp:1242
msgid "Connecting to the game server"
msgstr "Łączenie się z serwerem gry"
-#: src/client.cpp:1251
+#: src/client.cpp:1252
msgid "Changing game servers"
msgstr "Zmiana serwera"
-#: src/client.cpp:1294 src/client.cpp:1301 src/client.cpp:1435
+#: src/client.cpp:1295 src/client.cpp:1302 src/client.cpp:1436
#: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:256
#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
@@ -93,50 +93,50 @@ msgstr "Zmiana serwera"
msgid "Error"
msgstr "Błąd"
-#: src/client.cpp:1310
+#: src/client.cpp:1311
msgid "Requesting registration details"
msgstr "Sprawdzanie szczegółów rejestracji"
-#: src/client.cpp:1336
+#: src/client.cpp:1337
msgid "Password Change"
msgstr "Zmiana hasła"
-#: src/client.cpp:1337
+#: src/client.cpp:1338
msgid "Password changed successfully!"
msgstr "Hasło zmienione z powodzeniem!"
-#: src/client.cpp:1356
+#: src/client.cpp:1357
msgid "Email Change"
msgstr "Zmiana adresu e-mail"
-#: src/client.cpp:1357
+#: src/client.cpp:1358
msgid "Email changed successfully!"
msgstr "Adres e-mail zmieniony z powodzeniem!"
-#: src/client.cpp:1377
+#: src/client.cpp:1378
msgid "Unregister Successful"
msgstr "Wyrejestrowano z powodzeniem"
-#: src/client.cpp:1378
+#: src/client.cpp:1379
msgid "Farewell, come back any time..."
msgstr "Żegnaj, będziemy czekać na Twój powrót..."
-#: src/client.cpp:1583 src/client.cpp:1616 src/client.cpp:1631
-#: src/client.cpp:2063 src/client.cpp:2070
+#: src/client.cpp:1584 src/client.cpp:1617 src/client.cpp:1632
+#: src/client.cpp:2064 src/client.cpp:2071
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%s nie istnieje i nie może byś utworzone! Wyjście."
-#: src/client.cpp:1769
+#: src/client.cpp:1770
#, c-format
msgid "Invalid update host: %s"
msgstr "Nieprawidłowy serwer aktualizacji: %s"
-#: src/client.cpp:1803 src/client.cpp:1809
+#: src/client.cpp:1804 src/client.cpp:1810
msgid "Error creating updates directory!"
msgstr "Błąd podczas tworzenia katalogu aktualizacji!"
-#: src/client.cpp:1830
+#: src/client.cpp:1831
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "Błąd: %s nie istnieje i nie może być utworzone! Wyjście."
@@ -414,7 +414,7 @@ msgstr "Podejdź"
msgid "Result"
msgstr "Rezultat"
-#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:124
+#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:128
msgid "Reset"
msgstr "Resetuj"
@@ -437,16 +437,16 @@ msgstr "Ilość:"
#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:207
-#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:765
+#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:118
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:770
msgid "+"
msgstr "+"
#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:777
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:119
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:782
msgid "-"
msgstr "-"
@@ -458,8 +458,8 @@ msgid "Quit"
msgstr "Wyjdź"
#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
-#: src/gui/statuswindow.cpp:515 src/gui/statuswindow.cpp:565
-#: src/gui/statuswindow.cpp:764 src/gui/statuswindow.cpp:795
+#: src/gui/statuswindow.cpp:515 src/gui/statuswindow.cpp:570
+#: src/gui/statuswindow.cpp:769 src/gui/statuswindow.cpp:800
msgid "Max"
msgstr "Maks."
@@ -490,7 +490,7 @@ msgstr "Sprzedaj"
#: src/gui/quitdialog.cpp:55 src/gui/register.cpp:82 src/gui/setup.cpp:72
#: src/gui/socialwindow.cpp:1198 src/gui/textcommandeditor.cpp:241
#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updaterwindow.cpp:162
+#: src/gui/updaterwindow.cpp:168
msgid "Cancel"
msgstr "Anuluj"
@@ -914,7 +914,7 @@ msgid "Did You Know?"
msgstr "Cz wiesz że..."
#: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
-#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:53
+#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
#: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:113
msgid "Close"
msgstr "Zamknij"
@@ -1253,24 +1253,24 @@ msgstr "pasek statusu"
msgid "Need"
msgstr "Potrzeba"
-#: src/gui/npcdialog.cpp:51
+#: src/gui/npcdialog.cpp:52
msgid "Stop waiting"
msgstr "Przerwij"
-#: src/gui/npcdialog.cpp:52
+#: src/gui/npcdialog.cpp:53
msgid "Next"
msgstr "Dalej"
-#: src/gui/npcdialog.cpp:54
+#: src/gui/npcdialog.cpp:55
msgid "Submit"
msgstr "Zatwierdź"
-#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
+#: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
#: src/gui/setup_other.cpp:151
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:632
+#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:632
msgid "Clear"
msgstr "Wyczyść"
@@ -1292,6 +1292,7 @@ msgid "Outfit: %d"
msgstr "Strój: %d"
#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:892
+#: src/gui/windowmenu.cpp:302
#, c-format
msgid "Key: %s"
msgstr "Klawisz: %s"
@@ -2787,7 +2788,7 @@ msgstr "Ignoruj moby"
msgid "Create Guild"
msgstr "Utwórz gildię"
-#: src/gui/socialwindow.cpp:1196 src/gui/socialwindow.cpp:1629
+#: src/gui/socialwindow.cpp:1196 src/gui/socialwindow.cpp:1631
msgid "Create Party"
msgstr "Utwórz grupę"
@@ -2799,93 +2800,103 @@ msgstr "Społeczność"
msgid "Invite"
msgstr "Zaproś"
-#: src/gui/socialwindow.cpp:1412
+#. TRANSLATORS: here P is title for visible players tab in social window
+#: src/gui/socialwindow.cpp:1277
+msgid "P"
+msgstr ""
+
+#. TRANSLATORS: here F is title for friends tab in social window
+#: src/gui/socialwindow.cpp:1281
+msgid "F"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1414
#, c-format
msgid "Accepted party invite from %s."
msgstr "Zaakceptowano zaproszenie do grupy od %s."
-#: src/gui/socialwindow.cpp:1422
+#: src/gui/socialwindow.cpp:1424
#, c-format
msgid "Rejected party invite from %s."
msgstr "Odrzucono zaproszenie do grupy od %s."
-#: src/gui/socialwindow.cpp:1439
+#: src/gui/socialwindow.cpp:1441
#, c-format
msgid "Accepted guild invite from %s."
msgstr "Akceptowano zaproszenie do gildii od %s."
-#: src/gui/socialwindow.cpp:1452
+#: src/gui/socialwindow.cpp:1454
#, c-format
msgid "Rejected guild invite from %s."
msgstr "Odrzucono zaproszenie do gildii od %s."
-#: src/gui/socialwindow.cpp:1499
+#: src/gui/socialwindow.cpp:1501
#, c-format
msgid "Creating guild called %s."
msgstr "Tworzenie gildii o nazwie %s."
-#: src/gui/socialwindow.cpp:1522
+#: src/gui/socialwindow.cpp:1524
#, c-format
msgid "Creating party called %s."
msgstr "Tworzenie grupy o nazwie %s."
-#: src/gui/socialwindow.cpp:1536
+#: src/gui/socialwindow.cpp:1538
msgid "Guild Name"
msgstr "Nazwa gildii"
-#: src/gui/socialwindow.cpp:1537
+#: src/gui/socialwindow.cpp:1539
msgid "Choose your guild's name."
msgstr "Wybierz nazwę gildii."
-#: src/gui/socialwindow.cpp:1551
+#: src/gui/socialwindow.cpp:1553
msgid "Received guild request, but one already exists."
msgstr "Gildia o tej nazwie już istnieje."
-#: src/gui/socialwindow.cpp:1557
+#: src/gui/socialwindow.cpp:1559
#, c-format
msgid "%s has invited you to join the guild %s."
msgstr "%s zaprosił/a Cię do gildii %s."
-#: src/gui/socialwindow.cpp:1563
+#: src/gui/socialwindow.cpp:1565
msgid "Accept Guild Invite"
msgstr "Akceptuj zaproszenie do gildii"
-#: src/gui/socialwindow.cpp:1578
+#: src/gui/socialwindow.cpp:1580
msgid "Received party request, but one already exists."
msgstr "Grupa o takiej nazwie już istnieje."
-#: src/gui/socialwindow.cpp:1589
+#: src/gui/socialwindow.cpp:1591
msgid "You have been invited you to join a party."
msgstr "Zostałeś/aś zaproszony/a do grupy."
-#: src/gui/socialwindow.cpp:1593
+#: src/gui/socialwindow.cpp:1595
#, c-format
msgid "You have been invited to join the %s party."
msgstr "Zostałeś/aś zaproszony/a do grupy %s."
-#: src/gui/socialwindow.cpp:1601
+#: src/gui/socialwindow.cpp:1603
#, c-format
msgid "%s has invited you to join their party."
msgstr "%s zaprosił/a Cię do grupy."
-#: src/gui/socialwindow.cpp:1606
+#: src/gui/socialwindow.cpp:1608
#, c-format
msgid "%s has invited you to join the %s party."
msgstr "%s zaprosił/a Cię do grupy %s ."
-#: src/gui/socialwindow.cpp:1615
+#: src/gui/socialwindow.cpp:1617
msgid "Accept Party Invite"
msgstr "Zaakceptuj zaproszenie do grupy"
-#: src/gui/socialwindow.cpp:1630
+#: src/gui/socialwindow.cpp:1632
msgid "Cannot create party. You are already in a party"
msgstr "Nie można utworzyć grupy. Już należysz do grupy."
-#: src/gui/socialwindow.cpp:1635
+#: src/gui/socialwindow.cpp:1637
msgid "Party Name"
msgstr "Nazwa grupy"
-#: src/gui/socialwindow.cpp:1636
+#: src/gui/socialwindow.cpp:1638
msgid "Choose your party's name."
msgstr "Wybierz nazwę grupy."
@@ -3081,29 +3092,29 @@ msgstr "Imię: %s"
msgid "Updating..."
msgstr "Aktualizacja..."
-#: src/gui/updaterwindow.cpp:160
+#: src/gui/updaterwindow.cpp:166
msgid "Connecting..."
msgstr "Łączenie..."
-#: src/gui/updaterwindow.cpp:163
+#: src/gui/updaterwindow.cpp:169
msgid "Play"
msgstr "Graj"
-#: src/gui/updaterwindow.cpp:566
+#: src/gui/updaterwindow.cpp:570
msgid "##1 The update process is incomplete."
msgstr "##1 Proces aktualizacji jest niekompletny."
#. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:568
+#: src/gui/updaterwindow.cpp:572
msgid "##1 It is strongly recommended that"
msgstr "##1 Jest mocno zalecane abyś"
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:570
+#: src/gui/updaterwindow.cpp:574
msgid "##1 you try again later."
msgstr "##1 Spróbuj ponownie później."
-#: src/gui/updaterwindow.cpp:746
+#: src/gui/updaterwindow.cpp:750
msgid "Completed"
msgstr "Zakończono"
@@ -4289,23 +4300,23 @@ msgstr "Modyfikatory gry wyłączone."
msgid "Game modifiers are unknown"
msgstr "Modyfikatory gry nieznane"
-#: src/localplayer.cpp:3757
+#: src/localplayer.cpp:3758
msgid "Follow: "
msgstr "Podążasz za: "
-#: src/localplayer.cpp:3759 src/localplayer.cpp:3774
+#: src/localplayer.cpp:3760 src/localplayer.cpp:3775
msgid "Follow canceled"
msgstr "Podążanie anulowane."
-#: src/localplayer.cpp:3766
+#: src/localplayer.cpp:3767
msgid "Imitation: "
msgstr "Imitujesz: "
-#: src/localplayer.cpp:3768 src/localplayer.cpp:3776
+#: src/localplayer.cpp:3769 src/localplayer.cpp:3777
msgid "Imitation canceled"
msgstr "Imitacja anulowana"
-#: src/localplayer.cpp:4124
+#: src/localplayer.cpp:4125
msgid "You see "
msgstr "Widzisz "
diff --git a/po/pt.po b/po/pt.po
index a4eebe0ee..b570120d5 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -4,14 +4,14 @@
#
# Translators:
# Andrei Karas <akaras@inbox.ru>, 2011.
-# <freya.df@gmail.com>, 2011.
+# <freya.df@gmail.com>, 2011, 2012.
# freya <freya.df@gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-01-21 19:25+0300\n"
-"PO-Revision-Date: 2012-01-19 16:56+0000\n"
+"POT-Creation-Date: 2012-01-25 20:17+0300\n"
+"PO-Revision-Date: 2012-01-25 17:27+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Portuguese (http://www.transifex.net/projects/p/manaplus/team/"
"pt/)\n"
@@ -43,47 +43,47 @@ msgstr "A"
msgid "I"
msgstr "l"
-#: src/client.cpp:946 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:947 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
msgid "Setup"
msgstr "Configurar"
-#: src/client.cpp:953 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:954 src/gui/setup_perfomance.cpp:48
msgid "Perfomance"
msgstr "Performance"
-#: src/client.cpp:958 src/gui/setup_video.cpp:315
+#: src/client.cpp:959 src/gui/setup_video.cpp:315
msgid "Video"
msgstr "Vídeo"
-#: src/client.cpp:963
+#: src/client.cpp:964
msgid "Themes"
msgstr "Temas"
-#: src/client.cpp:1045
+#: src/client.cpp:1046
msgid "Connecting to server"
msgstr "Conectando ao servidor"
-#: src/client.cpp:1076
+#: src/client.cpp:1077
msgid "Logging in"
msgstr "Efetuando login"
-#: src/client.cpp:1109
+#: src/client.cpp:1110
msgid "Entering game world"
msgstr "Entrando no domínio do jogo"
-#: src/client.cpp:1210
+#: src/client.cpp:1211
msgid "Requesting characters"
msgstr "Requisitando personagens"
-#: src/client.cpp:1241
+#: src/client.cpp:1242
msgid "Connecting to the game server"
msgstr "Conectando ao servidor do jogo"
-#: src/client.cpp:1251
+#: src/client.cpp:1252
msgid "Changing game servers"
msgstr "Mudando servidores do jogo"
-#: src/client.cpp:1294 src/client.cpp:1301 src/client.cpp:1435
+#: src/client.cpp:1295 src/client.cpp:1302 src/client.cpp:1436
#: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:256
#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
@@ -93,50 +93,50 @@ msgstr "Mudando servidores do jogo"
msgid "Error"
msgstr "Erro"
-#: src/client.cpp:1310
+#: src/client.cpp:1311
msgid "Requesting registration details"
msgstr "Requisitando detalhes do registro"
-#: src/client.cpp:1336
+#: src/client.cpp:1337
msgid "Password Change"
msgstr "Mudar senha"
-#: src/client.cpp:1337
+#: src/client.cpp:1338
msgid "Password changed successfully!"
msgstr "Senha modificada com sucesso!"
-#: src/client.cpp:1356
+#: src/client.cpp:1357
msgid "Email Change"
msgstr "Mudar email"
-#: src/client.cpp:1357
+#: src/client.cpp:1358
msgid "Email changed successfully!"
msgstr "Email modificado com sucesso!"
-#: src/client.cpp:1377
+#: src/client.cpp:1378
msgid "Unregister Successful"
msgstr "Registro cancelado com sucesso"
-#: src/client.cpp:1378
+#: src/client.cpp:1379
msgid "Farewell, come back any time..."
msgstr "Tchau, volte sempre..."
-#: src/client.cpp:1583 src/client.cpp:1616 src/client.cpp:1631
-#: src/client.cpp:2063 src/client.cpp:2070
+#: src/client.cpp:1584 src/client.cpp:1617 src/client.cpp:1632
+#: src/client.cpp:2064 src/client.cpp:2071
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%s não existe e não pode ser criado! Saindo."
-#: src/client.cpp:1769
+#: src/client.cpp:1770
#, c-format
msgid "Invalid update host: %s"
msgstr "Host de atualização inválido: %s"
-#: src/client.cpp:1803 src/client.cpp:1809
+#: src/client.cpp:1804 src/client.cpp:1810
msgid "Error creating updates directory!"
msgstr "Erro ao criar pasta de atualizações!"
-#: src/client.cpp:1830
+#: src/client.cpp:1831
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "Erro: %s não existe e não pode se criado! Saindo."
@@ -237,7 +237,7 @@ msgstr "Na Lista Negra"
#: src/commandhandler.cpp:596
msgid "enemy"
-msgstr ""
+msgstr "Inimigo"
#: src/commandhandler.cpp:611
msgid "Player already erased!"
@@ -411,7 +411,7 @@ msgstr "Mover"
msgid "Result"
msgstr "Resultado"
-#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:124
+#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:128
msgid "Reset"
msgstr "Resetar"
@@ -434,16 +434,16 @@ msgstr "Quantidade:"
#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:207
-#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:765
+#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:118
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:770
msgid "+"
msgstr "+"
#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:777
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:119
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:782
msgid "-"
msgstr "-"
@@ -455,8 +455,8 @@ msgid "Quit"
msgstr "Sair"
#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
-#: src/gui/statuswindow.cpp:515 src/gui/statuswindow.cpp:565
-#: src/gui/statuswindow.cpp:764 src/gui/statuswindow.cpp:795
+#: src/gui/statuswindow.cpp:515 src/gui/statuswindow.cpp:570
+#: src/gui/statuswindow.cpp:769 src/gui/statuswindow.cpp:800
msgid "Max"
msgstr "Máximo"
@@ -487,7 +487,7 @@ msgstr "Vender"
#: src/gui/quitdialog.cpp:55 src/gui/register.cpp:82 src/gui/setup.cpp:72
#: src/gui/socialwindow.cpp:1198 src/gui/textcommandeditor.cpp:241
#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updaterwindow.cpp:162
+#: src/gui/updaterwindow.cpp:168
msgid "Cancel"
msgstr "Cancelar"
@@ -911,7 +911,7 @@ msgid "Did You Know?"
msgstr "Você sabia?"
#: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
-#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:53
+#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
#: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:113
msgid "Close"
msgstr "Fechar"
@@ -1248,24 +1248,24 @@ msgstr "Barra de Status"
msgid "Need"
msgstr "Precisa"
-#: src/gui/npcdialog.cpp:51
+#: src/gui/npcdialog.cpp:52
msgid "Stop waiting"
-msgstr ""
+msgstr "Pare de esperar"
-#: src/gui/npcdialog.cpp:52
+#: src/gui/npcdialog.cpp:53
msgid "Next"
msgstr "Próximo"
-#: src/gui/npcdialog.cpp:54
+#: src/gui/npcdialog.cpp:55
msgid "Submit"
msgstr "Enviar"
-#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
+#: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
#: src/gui/setup_other.cpp:151
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:632
+#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:632
msgid "Clear"
msgstr "Limpar"
@@ -1287,6 +1287,7 @@ msgid "Outfit: %d"
msgstr "Roupas: %d"
#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:892
+#: src/gui/windowmenu.cpp:302
#, c-format
msgid "Key: %s"
msgstr "Tecla: %s"
@@ -1342,7 +1343,7 @@ msgstr "Lista Negra"
#: src/gui/popupmenu.cpp:686 src/gui/popupmenu.cpp:694
#: src/gui/popupmenu.cpp:702
msgid "Set as enemy"
-msgstr ""
+msgstr "Definir como inimigo."
#: src/gui/popupmenu.cpp:153 src/gui/popupmenu.cpp:161
#: src/gui/popupmenu.cpp:169 src/gui/popupmenu.cpp:177
@@ -1498,7 +1499,7 @@ msgstr "Urdidura"
#: src/gui/popupmenu.cpp:589
msgid "Clear outfit"
-msgstr ""
+msgstr "Limpar equipamento"
#: src/gui/popupmenu.cpp:608 src/gui/windowmenu.cpp:96
msgid "Spells"
@@ -1542,7 +1543,7 @@ msgstr "Sair"
#: src/gui/popupmenu.cpp:654
msgid "Copy to clipboard"
-msgstr ""
+msgstr "CopiaCopiar para a área de transferência"
#: src/gui/popupmenu.cpp:849
msgid "Change guild position"
@@ -1975,7 +1976,7 @@ msgstr "Habilitar joystick"
#: src/gui/setup_joystick.cpp:75
msgid "Use joystick if client window inactive"
-msgstr ""
+msgstr "Use joystick se a janela cliente estiver inativo"
#: src/gui/setup_joystick.cpp:78
msgid "Joystick"
@@ -1987,7 +1988,7 @@ msgstr "Parar"
#: src/gui/setup_joystick.cpp:149
msgid "Rotate the stick and dont press buttons"
-msgstr ""
+msgstr "Girar o bastão e não pressionar os botões"
#: src/gui/setup_keyboard.cpp:80
msgid "Keyboard"
@@ -2171,7 +2172,7 @@ msgstr "Habilitar Analisador de bot"
#: src/gui/setup_other.cpp:174
msgid "Enable buggy servers protection (do not disable)"
-msgstr ""
+msgstr "Habilitar proteção contra bugs no servidor (não pode ser desabilitado)"
#: src/gui/setup_other.cpp:178
msgid "Enable debug log"
@@ -2311,7 +2312,7 @@ msgstr "Na Lista Negra "
#: src/gui/setup_relations.cpp:76
msgid "Enemy"
-msgstr ""
+msgstr "Inimigo"
#: src/gui/setup_relations.cpp:240
msgid "Allow trading"
@@ -2359,59 +2360,59 @@ msgstr "Enorme (15)"
#: src/gui/setup_theme.cpp:146
msgid "Chinese (China)"
-msgstr ""
+msgstr "Chinês (China)"
#: src/gui/setup_theme.cpp:147
msgid "Czech"
-msgstr ""
+msgstr "Tcheco"
#: src/gui/setup_theme.cpp:148
msgid "English"
-msgstr ""
+msgstr "Inglês"
#: src/gui/setup_theme.cpp:149
msgid "Finnish"
-msgstr ""
+msgstr "Finlandês"
#: src/gui/setup_theme.cpp:150
msgid "French"
-msgstr ""
+msgstr "Francês"
#: src/gui/setup_theme.cpp:151
msgid "German"
-msgstr ""
+msgstr "Alemão"
#: src/gui/setup_theme.cpp:152
msgid "Indonesian"
-msgstr ""
+msgstr "Indonésio"
#: src/gui/setup_theme.cpp:153
msgid "Polish"
-msgstr ""
+msgstr "Polonês"
#: src/gui/setup_theme.cpp:154
msgid "Japanese"
-msgstr ""
+msgstr "Japonês"
#: src/gui/setup_theme.cpp:155
msgid "Dutch (Belgium/Flemish)"
-msgstr ""
+msgstr "Holandês (Bélgica / Flandres)"
#: src/gui/setup_theme.cpp:156
msgid "Portuguese"
-msgstr ""
+msgstr "Português"
#: src/gui/setup_theme.cpp:157
msgid "Portuguese (Brazilian)"
-msgstr ""
+msgstr "Português (Brasileiro)"
#: src/gui/setup_theme.cpp:158
msgid "Russian"
-msgstr ""
+msgstr "Russo"
#: src/gui/setup_theme.cpp:159
msgid "Spanish (Castilian)"
-msgstr ""
+msgstr "Espanhol (castelhano)"
#: src/gui/setup_theme.cpp:191
msgid "Theme"
@@ -2423,7 +2424,7 @@ msgstr "Tema"
#: src/gui/setup_theme.cpp:194
msgid "Language"
-msgstr ""
+msgstr "Linguagem"
#: src/gui/setup_theme.cpp:195
msgid "Main Font"
@@ -2782,7 +2783,7 @@ msgstr "Ignorar mobss"
msgid "Create Guild"
msgstr "Criar guilda"
-#: src/gui/socialwindow.cpp:1196 src/gui/socialwindow.cpp:1629
+#: src/gui/socialwindow.cpp:1196 src/gui/socialwindow.cpp:1631
msgid "Create Party"
msgstr "Criar grupo"
@@ -2794,93 +2795,103 @@ msgstr "Social"
msgid "Invite"
msgstr "Convidar"
-#: src/gui/socialwindow.cpp:1412
+#. TRANSLATORS: here P is title for visible players tab in social window
+#: src/gui/socialwindow.cpp:1277
+msgid "P"
+msgstr ""
+
+#. TRANSLATORS: here F is title for friends tab in social window
+#: src/gui/socialwindow.cpp:1281
+msgid "F"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1414
#, c-format
msgid "Accepted party invite from %s."
msgstr "Aceitou convite para o grupo de %s."
-#: src/gui/socialwindow.cpp:1422
+#: src/gui/socialwindow.cpp:1424
#, c-format
msgid "Rejected party invite from %s."
msgstr "Rejeitou convite para o grupo de %s."
-#: src/gui/socialwindow.cpp:1439
+#: src/gui/socialwindow.cpp:1441
#, c-format
msgid "Accepted guild invite from %s."
msgstr "Aceitou convite para a guilda de %s."
-#: src/gui/socialwindow.cpp:1452
+#: src/gui/socialwindow.cpp:1454
#, c-format
msgid "Rejected guild invite from %s."
msgstr "Rejeitou convite para a guilda de %s."
-#: src/gui/socialwindow.cpp:1499
+#: src/gui/socialwindow.cpp:1501
#, c-format
msgid "Creating guild called %s."
msgstr "Criando guilda chamada %s."
-#: src/gui/socialwindow.cpp:1522
+#: src/gui/socialwindow.cpp:1524
#, c-format
msgid "Creating party called %s."
msgstr "Criando grupo chamado %s."
-#: src/gui/socialwindow.cpp:1536
+#: src/gui/socialwindow.cpp:1538
msgid "Guild Name"
msgstr "Nome da guilda"
-#: src/gui/socialwindow.cpp:1537
+#: src/gui/socialwindow.cpp:1539
msgid "Choose your guild's name."
msgstr "Escolha o nome da sua guilda."
-#: src/gui/socialwindow.cpp:1551
+#: src/gui/socialwindow.cpp:1553
msgid "Received guild request, but one already exists."
msgstr "Requisição de guilda recebida, mas já existe uma."
-#: src/gui/socialwindow.cpp:1557
+#: src/gui/socialwindow.cpp:1559
#, c-format
msgid "%s has invited you to join the guild %s."
msgstr "%s te convidou para entrar na guilda %s."
-#: src/gui/socialwindow.cpp:1563
+#: src/gui/socialwindow.cpp:1565
msgid "Accept Guild Invite"
msgstr "Aceitar convite para a guilda"
-#: src/gui/socialwindow.cpp:1578
+#: src/gui/socialwindow.cpp:1580
msgid "Received party request, but one already exists."
msgstr "Requisição de grupo recebida, mas já existe um."
-#: src/gui/socialwindow.cpp:1589
+#: src/gui/socialwindow.cpp:1591
msgid "You have been invited you to join a party."
msgstr "Você foi convidado para entrar em um grupo."
-#: src/gui/socialwindow.cpp:1593
+#: src/gui/socialwindow.cpp:1595
#, c-format
msgid "You have been invited to join the %s party."
msgstr "Você foi convidado para entrar no grupo %s."
-#: src/gui/socialwindow.cpp:1601
+#: src/gui/socialwindow.cpp:1603
#, c-format
msgid "%s has invited you to join their party."
msgstr "%s te convidou para entrar em seu grupo."
-#: src/gui/socialwindow.cpp:1606
+#: src/gui/socialwindow.cpp:1608
#, c-format
msgid "%s has invited you to join the %s party."
msgstr "%s te convidou para entrar no grupo %s."
-#: src/gui/socialwindow.cpp:1615
+#: src/gui/socialwindow.cpp:1617
msgid "Accept Party Invite"
msgstr "Aceitar convite para o grupo"
-#: src/gui/socialwindow.cpp:1630
+#: src/gui/socialwindow.cpp:1632
msgid "Cannot create party. You are already in a party"
msgstr "Não foi possível criar o grupo. Você já faz parte de um."
-#: src/gui/socialwindow.cpp:1635
+#: src/gui/socialwindow.cpp:1637
msgid "Party Name"
msgstr "Nome do grupo"
-#: src/gui/socialwindow.cpp:1636
+#: src/gui/socialwindow.cpp:1638
msgid "Choose your party's name."
msgstr "Escolha o nome do seu grupo."
@@ -3075,29 +3086,29 @@ msgstr "Nome: %s"
msgid "Updating..."
msgstr "Atualizando..."
-#: src/gui/updaterwindow.cpp:160
+#: src/gui/updaterwindow.cpp:166
msgid "Connecting..."
msgstr "Conectando..."
-#: src/gui/updaterwindow.cpp:163
+#: src/gui/updaterwindow.cpp:169
msgid "Play"
msgstr "Jogar"
-#: src/gui/updaterwindow.cpp:566
+#: src/gui/updaterwindow.cpp:570
msgid "##1 The update process is incomplete."
msgstr "##1 O processo de update está incompleto."
#. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:568
+#: src/gui/updaterwindow.cpp:572
msgid "##1 It is strongly recommended that"
msgstr "##1 É altamente recomendado que"
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:570
+#: src/gui/updaterwindow.cpp:574
msgid "##1 you try again later."
msgstr "##1 tente novamente mais tarde."
-#: src/gui/updaterwindow.cpp:746
+#: src/gui/updaterwindow.cpp:750
msgid "Completed"
msgstr "Concluído"
@@ -3918,7 +3929,7 @@ msgstr "Trocar feitiço de ataque"
#: src/keyboardconfig.cpp:329
msgid "Switch pvp attack"
-msgstr ""
+msgstr "Trocar ataque de pvp"
#: src/keyboardconfig.cpp:330
msgid "Change move type"
@@ -3976,7 +3987,7 @@ msgstr ""
#: src/localplayer.cpp:384
#, c-format
msgid "You were killed by %s"
-msgstr ""
+msgstr "Você foi morto por %s"
#: src/localplayer.cpp:1439
msgid "Tried to pick up nonexistent item."
@@ -4037,12 +4048,12 @@ msgstr "(d) dobro normal + louco"
#: src/localplayer.cpp:1903
msgid "(?) unknown move"
-msgstr ""
+msgstr "(?) Movimento desconhecido"
#: src/localplayer.cpp:1925
#, c-format
msgid "(%d) crazy move number %d"
-msgstr ""
+msgstr "(%d) movimento louco numero %d"
#: src/localplayer.cpp:1930
msgid "(a) custom crazy move"
@@ -4218,23 +4229,23 @@ msgstr "(?) Feitiço de ataque"
#: src/localplayer.cpp:2126
msgid "(a) attack all players"
-msgstr ""
+msgstr "(a) atacar todos inimigos"
#: src/localplayer.cpp:2127
msgid "(f) attack not friends"
-msgstr ""
+msgstr "(f) não atacar amigos"
#: src/localplayer.cpp:2128
msgid "(b) attack bad relations"
-msgstr ""
+msgstr "(b) atacar más relações"
#: src/localplayer.cpp:2129
msgid "(d) dont attack players"
-msgstr ""
+msgstr "(d) não atacar jogadores"
#: src/localplayer.cpp:2130
msgid "(?) pvp attack"
-msgstr ""
+msgstr "(?) Ataque PVP"
#: src/localplayer.cpp:2149
msgid "(D) default imitation"
@@ -4282,25 +4293,25 @@ msgstr "Modificadores de jogo desativados"
#: src/localplayer.cpp:2241
msgid "Game modifiers are unknown"
-msgstr ""
+msgstr "Modificador de jogo desconhecido"
-#: src/localplayer.cpp:3757
+#: src/localplayer.cpp:3758
msgid "Follow: "
msgstr "Seguindo:"
-#: src/localplayer.cpp:3759 src/localplayer.cpp:3774
+#: src/localplayer.cpp:3760 src/localplayer.cpp:3775
msgid "Follow canceled"
msgstr "Seguir cancelado"
-#: src/localplayer.cpp:3766
+#: src/localplayer.cpp:3767
msgid "Imitation: "
msgstr "Imitando:"
-#: src/localplayer.cpp:3768 src/localplayer.cpp:3776
+#: src/localplayer.cpp:3769 src/localplayer.cpp:3777
msgid "Imitation canceled"
msgstr "Imitação cancelada"
-#: src/localplayer.cpp:4124
+#: src/localplayer.cpp:4125
msgid "You see "
msgstr "Você vê "
@@ -4399,6 +4410,7 @@ msgstr " --safemode : Inicia o jogo em modo seguro"
#: src/main.cpp:77
msgid " -T --tests : Start testing drivers and auto configuring"
msgstr ""
+" -T --testes : Começar a testar drivers para auto configuração"
#: src/main.cpp:80
msgid " --no-opengl : Disable OpenGL for this session"
@@ -4474,7 +4486,7 @@ msgstr "Slot incorreto."
#: src/net/ea/charserverhandler.cpp:167
msgid "Incorrect race."
-msgstr ""
+msgstr "Corrida incorreta:"
#: src/net/ea/charserverhandler.cpp:182 src/net/manaserv/charhandler.cpp:210
msgid "Info"
@@ -4630,7 +4642,7 @@ msgstr "%s saiu de sua Guilda."
#: src/net/ea/guildhandler.cpp:499
msgid "You were kicked from guild."
-msgstr ""
+msgstr "Você foi expulso da guilda."
#: src/net/ea/guildhandler.cpp:512
#, c-format
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 83e2254a9..f82ba68ac 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,14 +6,14 @@
# <alasmirt@gmail.com>, 2011, 2012.
# alastrim <alasmirt@gmail.com>, 2011.
# Andrei Karas <akaras@inbox.ru>, 2011.
-# <freya.df@gmail.com>, 2011.
+# <freya.df@gmail.com>, 2011, 2012.
# freya <freya.df@gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-01-21 19:25+0300\n"
-"PO-Revision-Date: 2012-01-19 16:56+0000\n"
+"POT-Creation-Date: 2012-01-25 20:17+0300\n"
+"PO-Revision-Date: 2012-01-25 17:27+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.net/projects/p/"
"manaplus/team/pt_BR/)\n"
@@ -45,47 +45,47 @@ msgstr "A"
msgid "I"
msgstr "I"
-#: src/client.cpp:946 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:947 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
msgid "Setup"
msgstr "por peso"
-#: src/client.cpp:953 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:954 src/gui/setup_perfomance.cpp:48
msgid "Perfomance"
msgstr "Performance"
-#: src/client.cpp:958 src/gui/setup_video.cpp:315
+#: src/client.cpp:959 src/gui/setup_video.cpp:315
msgid "Video"
msgstr "Vídeo"
-#: src/client.cpp:963
+#: src/client.cpp:964
msgid "Themes"
msgstr "Temas"
-#: src/client.cpp:1045
+#: src/client.cpp:1046
msgid "Connecting to server"
msgstr "por quantidade"
-#: src/client.cpp:1076
+#: src/client.cpp:1077
msgid "Logging in"
msgstr "por tipo"
-#: src/client.cpp:1109
+#: src/client.cpp:1110
msgid "Entering game world"
msgstr "Habilitar rolagem preguisoça "
-#: src/client.cpp:1210
+#: src/client.cpp:1211
msgid "Requesting characters"
msgstr "Rolagem preguiçosa"
-#: src/client.cpp:1241
+#: src/client.cpp:1242
msgid "Connecting to the game server"
msgstr "Conectando ao servidor do jogo"
-#: src/client.cpp:1251
+#: src/client.cpp:1252
msgid "Changing game servers"
msgstr "Mudando servidores do jogo"
-#: src/client.cpp:1294 src/client.cpp:1301 src/client.cpp:1435
+#: src/client.cpp:1295 src/client.cpp:1302 src/client.cpp:1436
#: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:256
#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
@@ -95,50 +95,50 @@ msgstr "Mudando servidores do jogo"
msgid "Error"
msgstr "Erro"
-#: src/client.cpp:1310
+#: src/client.cpp:1311
msgid "Requesting registration details"
msgstr "Requisitando detalhes do registro"
-#: src/client.cpp:1336
+#: src/client.cpp:1337
msgid "Password Change"
msgstr "Mudar senha"
-#: src/client.cpp:1337
+#: src/client.cpp:1338
msgid "Password changed successfully!"
msgstr "Senha modificada com sucesso!"
-#: src/client.cpp:1356
+#: src/client.cpp:1357
msgid "Email Change"
msgstr "Mudar email"
-#: src/client.cpp:1357
+#: src/client.cpp:1358
msgid "Email changed successfully!"
msgstr "Email modificado com sucesso!"
-#: src/client.cpp:1377
+#: src/client.cpp:1378
msgid "Unregister Successful"
msgstr "Registro cancelado com sucesso"
-#: src/client.cpp:1378
+#: src/client.cpp:1379
msgid "Farewell, come back any time..."
msgstr "Tchau, volte sempre..."
-#: src/client.cpp:1583 src/client.cpp:1616 src/client.cpp:1631
-#: src/client.cpp:2063 src/client.cpp:2070
+#: src/client.cpp:1584 src/client.cpp:1617 src/client.cpp:1632
+#: src/client.cpp:2064 src/client.cpp:2071
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%s não existe e não pode ser criado! Saindo."
-#: src/client.cpp:1769
+#: src/client.cpp:1770
#, c-format
msgid "Invalid update host: %s"
msgstr "Host de atualização inválido: %s"
-#: src/client.cpp:1803 src/client.cpp:1809
+#: src/client.cpp:1804 src/client.cpp:1810
msgid "Error creating updates directory!"
msgstr "Erro ao criar pasta de atualizações!"
-#: src/client.cpp:1830
+#: src/client.cpp:1831
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "Erro: %s não existe e não pode se criado! Saindo."
@@ -413,7 +413,7 @@ msgstr "Mover"
msgid "Result"
msgstr "Resultado"
-#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:124
+#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:128
msgid "Reset"
msgstr "Resetar"
@@ -436,16 +436,16 @@ msgstr "Quantidade:"
#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:207
-#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:765
+#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:118
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:770
msgid "+"
msgstr "+"
#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:777
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:119
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:782
msgid "-"
msgstr "-"
@@ -457,8 +457,8 @@ msgid "Quit"
msgstr "Sair"
#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
-#: src/gui/statuswindow.cpp:515 src/gui/statuswindow.cpp:565
-#: src/gui/statuswindow.cpp:764 src/gui/statuswindow.cpp:795
+#: src/gui/statuswindow.cpp:515 src/gui/statuswindow.cpp:570
+#: src/gui/statuswindow.cpp:769 src/gui/statuswindow.cpp:800
msgid "Max"
msgstr "Máximo"
@@ -489,7 +489,7 @@ msgstr "Vender"
#: src/gui/quitdialog.cpp:55 src/gui/register.cpp:82 src/gui/setup.cpp:72
#: src/gui/socialwindow.cpp:1198 src/gui/textcommandeditor.cpp:241
#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updaterwindow.cpp:162
+#: src/gui/updaterwindow.cpp:168
msgid "Cancel"
msgstr "Cancelar"
@@ -913,7 +913,7 @@ msgid "Did You Know?"
msgstr "Você Sabia?"
#: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
-#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:53
+#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
#: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:113
msgid "Close"
msgstr "Fechar"
@@ -1250,24 +1250,24 @@ msgstr "Barra de Status"
msgid "Need"
msgstr "Precisa"
-#: src/gui/npcdialog.cpp:51
+#: src/gui/npcdialog.cpp:52
msgid "Stop waiting"
msgstr "Parar de esperar"
-#: src/gui/npcdialog.cpp:52
+#: src/gui/npcdialog.cpp:53
msgid "Next"
msgstr "Próximo"
-#: src/gui/npcdialog.cpp:54
+#: src/gui/npcdialog.cpp:55
msgid "Submit"
msgstr "Enviar"
-#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
+#: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
#: src/gui/setup_other.cpp:151
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:632
+#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:632
msgid "Clear"
msgstr "Limpar"
@@ -1289,6 +1289,7 @@ msgid "Outfit: %d"
msgstr "Roupas: %d"
#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:892
+#: src/gui/windowmenu.cpp:302
#, c-format
msgid "Key: %s"
msgstr "Tecla: %s"
@@ -2784,7 +2785,7 @@ msgstr "Ignorar mobs"
msgid "Create Guild"
msgstr "Criar guilda"
-#: src/gui/socialwindow.cpp:1196 src/gui/socialwindow.cpp:1629
+#: src/gui/socialwindow.cpp:1196 src/gui/socialwindow.cpp:1631
msgid "Create Party"
msgstr "Criar grupo"
@@ -2796,93 +2797,103 @@ msgstr "Social"
msgid "Invite"
msgstr "Convidar"
-#: src/gui/socialwindow.cpp:1412
+#. TRANSLATORS: here P is title for visible players tab in social window
+#: src/gui/socialwindow.cpp:1277
+msgid "P"
+msgstr ""
+
+#. TRANSLATORS: here F is title for friends tab in social window
+#: src/gui/socialwindow.cpp:1281
+msgid "F"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1414
#, c-format
msgid "Accepted party invite from %s."
msgstr "Aceitou convite para o grupo de %s."
-#: src/gui/socialwindow.cpp:1422
+#: src/gui/socialwindow.cpp:1424
#, c-format
msgid "Rejected party invite from %s."
msgstr "Rejeitou convite para o grupo de %s."
-#: src/gui/socialwindow.cpp:1439
+#: src/gui/socialwindow.cpp:1441
#, c-format
msgid "Accepted guild invite from %s."
msgstr "Aceitou convite para a guilda de %s."
-#: src/gui/socialwindow.cpp:1452
+#: src/gui/socialwindow.cpp:1454
#, c-format
msgid "Rejected guild invite from %s."
msgstr "Rejeitou convite para a guilda de %s."
-#: src/gui/socialwindow.cpp:1499
+#: src/gui/socialwindow.cpp:1501
#, c-format
msgid "Creating guild called %s."
msgstr "Criando guilda chamada %s."
-#: src/gui/socialwindow.cpp:1522
+#: src/gui/socialwindow.cpp:1524
#, c-format
msgid "Creating party called %s."
msgstr "Criando grupo chamado %s."
-#: src/gui/socialwindow.cpp:1536
+#: src/gui/socialwindow.cpp:1538
msgid "Guild Name"
msgstr "Nome da guilda"
-#: src/gui/socialwindow.cpp:1537
+#: src/gui/socialwindow.cpp:1539
msgid "Choose your guild's name."
msgstr "Escolha o nome da sua guilda."
-#: src/gui/socialwindow.cpp:1551
+#: src/gui/socialwindow.cpp:1553
msgid "Received guild request, but one already exists."
msgstr "Requisição de guilda recebida, mas já existe uma."
-#: src/gui/socialwindow.cpp:1557
+#: src/gui/socialwindow.cpp:1559
#, c-format
msgid "%s has invited you to join the guild %s."
msgstr "%s te convidou para entrar na guilda %s."
-#: src/gui/socialwindow.cpp:1563
+#: src/gui/socialwindow.cpp:1565
msgid "Accept Guild Invite"
msgstr "Aceitar convite para a guilda"
-#: src/gui/socialwindow.cpp:1578
+#: src/gui/socialwindow.cpp:1580
msgid "Received party request, but one already exists."
msgstr "Requisição de grupo recebida, mas já existe um."
-#: src/gui/socialwindow.cpp:1589
+#: src/gui/socialwindow.cpp:1591
msgid "You have been invited you to join a party."
msgstr "Você foi convidado para entrar em um grupo."
-#: src/gui/socialwindow.cpp:1593
+#: src/gui/socialwindow.cpp:1595
#, c-format
msgid "You have been invited to join the %s party."
msgstr "Você foi convidado para entrar no grupo %s."
-#: src/gui/socialwindow.cpp:1601
+#: src/gui/socialwindow.cpp:1603
#, c-format
msgid "%s has invited you to join their party."
msgstr "%s te convidou para entrar em seu grupo."
-#: src/gui/socialwindow.cpp:1606
+#: src/gui/socialwindow.cpp:1608
#, c-format
msgid "%s has invited you to join the %s party."
msgstr "%s te convidou para entrar no grupo %s."
-#: src/gui/socialwindow.cpp:1615
+#: src/gui/socialwindow.cpp:1617
msgid "Accept Party Invite"
msgstr "Aceitar convite para o grupo"
-#: src/gui/socialwindow.cpp:1630
+#: src/gui/socialwindow.cpp:1632
msgid "Cannot create party. You are already in a party"
msgstr "Não foi possível criar o grupo. Você já faz parte de um."
-#: src/gui/socialwindow.cpp:1635
+#: src/gui/socialwindow.cpp:1637
msgid "Party Name"
msgstr "Nome do grupo"
-#: src/gui/socialwindow.cpp:1636
+#: src/gui/socialwindow.cpp:1638
msgid "Choose your party's name."
msgstr "Escolha o nome do seu grupo."
@@ -3077,29 +3088,29 @@ msgstr "Nome: %s"
msgid "Updating..."
msgstr "Atualizando..."
-#: src/gui/updaterwindow.cpp:160
+#: src/gui/updaterwindow.cpp:166
msgid "Connecting..."
msgstr "Conectando..."
-#: src/gui/updaterwindow.cpp:163
+#: src/gui/updaterwindow.cpp:169
msgid "Play"
msgstr "Jogar"
-#: src/gui/updaterwindow.cpp:566
+#: src/gui/updaterwindow.cpp:570
msgid "##1 The update process is incomplete."
msgstr "##1 O processo de update está incompleto."
#. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:568
+#: src/gui/updaterwindow.cpp:572
msgid "##1 It is strongly recommended that"
msgstr "##1 É altamente recomendado que"
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:570
+#: src/gui/updaterwindow.cpp:574
msgid "##1 you try again later."
msgstr "##1 tente novamente mais tarde."
-#: src/gui/updaterwindow.cpp:746
+#: src/gui/updaterwindow.cpp:750
msgid "Completed"
msgstr "Concluído"
@@ -3978,7 +3989,7 @@ msgstr ""
#: src/localplayer.cpp:384
#, c-format
msgid "You were killed by %s"
-msgstr ""
+msgstr "Você foi morto por %s"
#: src/localplayer.cpp:1439
msgid "Tried to pick up nonexistent item."
@@ -4286,23 +4297,23 @@ msgstr "Modificadores de jogo desativados"
msgid "Game modifiers are unknown"
msgstr "Modificadores são desconhecidos"
-#: src/localplayer.cpp:3757
+#: src/localplayer.cpp:3758
msgid "Follow: "
msgstr "Seguindo:"
-#: src/localplayer.cpp:3759 src/localplayer.cpp:3774
+#: src/localplayer.cpp:3760 src/localplayer.cpp:3775
msgid "Follow canceled"
msgstr "Seguindo cancelado"
-#: src/localplayer.cpp:3766
+#: src/localplayer.cpp:3767
msgid "Imitation: "
msgstr "Imitando:"
-#: src/localplayer.cpp:3768 src/localplayer.cpp:3776
+#: src/localplayer.cpp:3769 src/localplayer.cpp:3777
msgid "Imitation canceled"
msgstr "Imitação cancelada"
-#: src/localplayer.cpp:4124
+#: src/localplayer.cpp:4125
msgid "You see "
msgstr "Você vê "
@@ -4476,7 +4487,7 @@ msgstr "Slot incorreto."
#: src/net/ea/charserverhandler.cpp:167
msgid "Incorrect race."
-msgstr ""
+msgstr "Corrida incorreta."
#: src/net/ea/charserverhandler.cpp:182 src/net/manaserv/charhandler.cpp:210
msgid "Info"
@@ -4632,7 +4643,7 @@ msgstr "%s saiu de sua Guilda."
#: src/net/ea/guildhandler.cpp:499
msgid "You were kicked from guild."
-msgstr ""
+msgstr "Você foi expulso da guilda."
#: src/net/ea/guildhandler.cpp:512
#, c-format
diff --git a/po/ru.po b/po/ru.po
index 324296f5c..6beede284 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-01-21 19:25+0300\n"
-"PO-Revision-Date: 2012-01-19 16:57+0000\n"
+"POT-Creation-Date: 2012-01-25 20:17+0300\n"
+"PO-Revision-Date: 2012-01-25 17:28+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Russian (http://www.transifex.net/projects/p/manaplus/team/"
"ru/)\n"
@@ -45,47 +45,47 @@ msgstr "О"
msgid "I"
msgstr "Б"
-#: src/client.cpp:946 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:947 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
msgid "Setup"
msgstr "Настройка"
-#: src/client.cpp:953 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:954 src/gui/setup_perfomance.cpp:48
msgid "Perfomance"
msgstr "Производительность"
-#: src/client.cpp:958 src/gui/setup_video.cpp:315
+#: src/client.cpp:959 src/gui/setup_video.cpp:315
msgid "Video"
msgstr "Видео"
-#: src/client.cpp:963
+#: src/client.cpp:964
msgid "Themes"
msgstr "Темы"
-#: src/client.cpp:1045
+#: src/client.cpp:1046
msgid "Connecting to server"
msgstr "Идет подключение к серверу..."
-#: src/client.cpp:1076
+#: src/client.cpp:1077
msgid "Logging in"
msgstr "Авторизация"
-#: src/client.cpp:1109
+#: src/client.cpp:1110
msgid "Entering game world"
msgstr "Входим в игровой мир"
-#: src/client.cpp:1210
+#: src/client.cpp:1211
msgid "Requesting characters"
msgstr "Получение списка персонажей"
-#: src/client.cpp:1241
+#: src/client.cpp:1242
msgid "Connecting to the game server"
msgstr "Подключение к игровому серверу"
-#: src/client.cpp:1251
+#: src/client.cpp:1252
msgid "Changing game servers"
msgstr "Смена игрового сервера"
-#: src/client.cpp:1294 src/client.cpp:1301 src/client.cpp:1435
+#: src/client.cpp:1295 src/client.cpp:1302 src/client.cpp:1436
#: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:256
#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
@@ -95,50 +95,50 @@ msgstr "Смена игрового сервера"
msgid "Error"
msgstr "Ошибка"
-#: src/client.cpp:1310
+#: src/client.cpp:1311
msgid "Requesting registration details"
msgstr "Запрос регистрационных данных"
-#: src/client.cpp:1336
+#: src/client.cpp:1337
msgid "Password Change"
msgstr "Изменить Пароль"
-#: src/client.cpp:1337
+#: src/client.cpp:1338
msgid "Password changed successfully!"
msgstr "Пароль изменен!"
-#: src/client.cpp:1356
+#: src/client.cpp:1357
msgid "Email Change"
msgstr "Сменить Email"
-#: src/client.cpp:1357
+#: src/client.cpp:1358
msgid "Email changed successfully!"
msgstr "Email изменен!"
-#: src/client.cpp:1377
+#: src/client.cpp:1378
msgid "Unregister Successful"
msgstr "Регистрация удалена"
-#: src/client.cpp:1378
+#: src/client.cpp:1379
msgid "Farewell, come back any time..."
msgstr "Хорошо, возвращайтесь в любое время..."
-#: src/client.cpp:1583 src/client.cpp:1616 src/client.cpp:1631
-#: src/client.cpp:2063 src/client.cpp:2070
+#: src/client.cpp:1584 src/client.cpp:1617 src/client.cpp:1632
+#: src/client.cpp:2064 src/client.cpp:2071
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%s не существует, и не может быть создано! Выход."
-#: src/client.cpp:1769
+#: src/client.cpp:1770
#, c-format
msgid "Invalid update host: %s"
msgstr "Некорректный сервер обновлений: %s"
-#: src/client.cpp:1803 src/client.cpp:1809
+#: src/client.cpp:1804 src/client.cpp:1810
msgid "Error creating updates directory!"
msgstr "Ошибка создания директории для обновлений!"
-#: src/client.cpp:1830
+#: src/client.cpp:1831
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "Ошибка: %s не существует, и не может быть создан! Выход."
@@ -419,7 +419,7 @@ msgstr "Движение"
msgid "Result"
msgstr "Результат"
-#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:124
+#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:128
msgid "Reset"
msgstr "Сбросить"
@@ -442,16 +442,16 @@ msgstr "Количество:"
#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:207
-#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:765
+#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:118
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:770
msgid "+"
msgstr "+"
#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:777
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:119
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:782
msgid "-"
msgstr "-"
@@ -463,8 +463,8 @@ msgid "Quit"
msgstr "Выход"
#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
-#: src/gui/statuswindow.cpp:515 src/gui/statuswindow.cpp:565
-#: src/gui/statuswindow.cpp:764 src/gui/statuswindow.cpp:795
+#: src/gui/statuswindow.cpp:515 src/gui/statuswindow.cpp:570
+#: src/gui/statuswindow.cpp:769 src/gui/statuswindow.cpp:800
msgid "Max"
msgstr "Макс"
@@ -495,7 +495,7 @@ msgstr "Продать"
#: src/gui/quitdialog.cpp:55 src/gui/register.cpp:82 src/gui/setup.cpp:72
#: src/gui/socialwindow.cpp:1198 src/gui/textcommandeditor.cpp:241
#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updaterwindow.cpp:162
+#: src/gui/updaterwindow.cpp:168
msgid "Cancel"
msgstr "Отмена"
@@ -919,7 +919,7 @@ msgid "Did You Know?"
msgstr "Вы знаете?"
#: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
-#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:53
+#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
#: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:113
msgid "Close"
msgstr "Закрыть"
@@ -1258,24 +1258,24 @@ msgstr "статус"
msgid "Need"
msgstr "Нужно"
-#: src/gui/npcdialog.cpp:51
+#: src/gui/npcdialog.cpp:52
msgid "Stop waiting"
msgstr "Остановить ожидание"
-#: src/gui/npcdialog.cpp:52
+#: src/gui/npcdialog.cpp:53
msgid "Next"
msgstr "Следующий"
-#: src/gui/npcdialog.cpp:54
+#: src/gui/npcdialog.cpp:55
msgid "Submit"
msgstr "Применить"
-#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
+#: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
#: src/gui/setup_other.cpp:151
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:632
+#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:632
msgid "Clear"
msgstr "Очистить"
@@ -1297,6 +1297,7 @@ msgid "Outfit: %d"
msgstr "Наряд: %d"
#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:892
+#: src/gui/windowmenu.cpp:302
#, c-format
msgid "Key: %s"
msgstr "Клавиша: %s"
@@ -2799,7 +2800,7 @@ msgstr "Игнорируемые монстры"
msgid "Create Guild"
msgstr "Создать Гильдию"
-#: src/gui/socialwindow.cpp:1196 src/gui/socialwindow.cpp:1629
+#: src/gui/socialwindow.cpp:1196 src/gui/socialwindow.cpp:1631
msgid "Create Party"
msgstr "Создать группу"
@@ -2811,93 +2812,103 @@ msgstr "Общество"
msgid "Invite"
msgstr "Пригласить"
-#: src/gui/socialwindow.cpp:1412
+#. TRANSLATORS: here P is title for visible players tab in social window
+#: src/gui/socialwindow.cpp:1277
+msgid "P"
+msgstr "И"
+
+#. TRANSLATORS: here F is title for friends tab in social window
+#: src/gui/socialwindow.cpp:1281
+msgid "F"
+msgstr "Д"
+
+#: src/gui/socialwindow.cpp:1414
#, c-format
msgid "Accepted party invite from %s."
msgstr "Принято приглашение в группу от %s."
-#: src/gui/socialwindow.cpp:1422
+#: src/gui/socialwindow.cpp:1424
#, c-format
msgid "Rejected party invite from %s."
msgstr "Отклонено приглашение в группу от %s."
-#: src/gui/socialwindow.cpp:1439
+#: src/gui/socialwindow.cpp:1441
#, c-format
msgid "Accepted guild invite from %s."
msgstr "Принято приглашение в гильдию от %s."
-#: src/gui/socialwindow.cpp:1452
+#: src/gui/socialwindow.cpp:1454
#, c-format
msgid "Rejected guild invite from %s."
msgstr "Отклонено приглашение в гильдию от %s."
-#: src/gui/socialwindow.cpp:1499
+#: src/gui/socialwindow.cpp:1501
#, c-format
msgid "Creating guild called %s."
msgstr "Создание гильдии с именем %s."
-#: src/gui/socialwindow.cpp:1522
+#: src/gui/socialwindow.cpp:1524
#, c-format
msgid "Creating party called %s."
msgstr "Создание группы с именем %s."
-#: src/gui/socialwindow.cpp:1536
+#: src/gui/socialwindow.cpp:1538
msgid "Guild Name"
msgstr "Имя гильдии"
-#: src/gui/socialwindow.cpp:1537
+#: src/gui/socialwindow.cpp:1539
msgid "Choose your guild's name."
msgstr "Выберите имя для гильдии."
-#: src/gui/socialwindow.cpp:1551
+#: src/gui/socialwindow.cpp:1553
msgid "Received guild request, but one already exists."
msgstr "Получено приглашение в гильдию, но оно не первое."
-#: src/gui/socialwindow.cpp:1557
+#: src/gui/socialwindow.cpp:1559
#, c-format
msgid "%s has invited you to join the guild %s."
msgstr "%s приглашает присоединиться к гильдии %s."
-#: src/gui/socialwindow.cpp:1563
+#: src/gui/socialwindow.cpp:1565
msgid "Accept Guild Invite"
msgstr "Принять приглашение в гильдию"
-#: src/gui/socialwindow.cpp:1578
+#: src/gui/socialwindow.cpp:1580
msgid "Received party request, but one already exists."
msgstr "Получено приглашение в группу, но оно не порвое."
-#: src/gui/socialwindow.cpp:1589
+#: src/gui/socialwindow.cpp:1591
msgid "You have been invited you to join a party."
msgstr "Вас приглашают в группу."
-#: src/gui/socialwindow.cpp:1593
+#: src/gui/socialwindow.cpp:1595
#, c-format
msgid "You have been invited to join the %s party."
msgstr "Вас приглашают присоединиться к группе %s."
-#: src/gui/socialwindow.cpp:1601
+#: src/gui/socialwindow.cpp:1603
#, c-format
msgid "%s has invited you to join their party."
msgstr "%s приглашает Вас к себе в группу."
-#: src/gui/socialwindow.cpp:1606
+#: src/gui/socialwindow.cpp:1608
#, c-format
msgid "%s has invited you to join the %s party."
msgstr "%s приглашает присоединиться к %s группе."
-#: src/gui/socialwindow.cpp:1615
+#: src/gui/socialwindow.cpp:1617
msgid "Accept Party Invite"
msgstr "Принять приглашение в группу"
-#: src/gui/socialwindow.cpp:1630
+#: src/gui/socialwindow.cpp:1632
msgid "Cannot create party. You are already in a party"
msgstr "Не удалось создать группу. Вы уже состоите в другой."
-#: src/gui/socialwindow.cpp:1635
+#: src/gui/socialwindow.cpp:1637
msgid "Party Name"
msgstr "Имя группы"
-#: src/gui/socialwindow.cpp:1636
+#: src/gui/socialwindow.cpp:1638
msgid "Choose your party's name."
msgstr "Выберите имя будущей группы."
@@ -3093,29 +3104,29 @@ msgstr "Имя: %s"
msgid "Updating..."
msgstr "Обновление..."
-#: src/gui/updaterwindow.cpp:160
+#: src/gui/updaterwindow.cpp:166
msgid "Connecting..."
msgstr "Соединение..."
-#: src/gui/updaterwindow.cpp:163
+#: src/gui/updaterwindow.cpp:169
msgid "Play"
msgstr "Играть"
-#: src/gui/updaterwindow.cpp:566
+#: src/gui/updaterwindow.cpp:570
msgid "##1 The update process is incomplete."
msgstr "##1 Процесс обновления не завершен!"
#. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:568
+#: src/gui/updaterwindow.cpp:572
msgid "##1 It is strongly recommended that"
msgstr "##1 Настоятельно рекомендуется"
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:570
+#: src/gui/updaterwindow.cpp:574
msgid "##1 you try again later."
msgstr "##1 попытаться еще раз немного погодя."
-#: src/gui/updaterwindow.cpp:746
+#: src/gui/updaterwindow.cpp:750
msgid "Completed"
msgstr "Завершено"
@@ -4304,23 +4315,23 @@ msgstr "Игровые модификаторы выключены"
msgid "Game modifiers are unknown"
msgstr "Игровые модификаторы в неизвестном положении"
-#: src/localplayer.cpp:3757
+#: src/localplayer.cpp:3758
msgid "Follow: "
msgstr "Следование: "
-#: src/localplayer.cpp:3759 src/localplayer.cpp:3774
+#: src/localplayer.cpp:3760 src/localplayer.cpp:3775
msgid "Follow canceled"
msgstr "Следование отменено"
-#: src/localplayer.cpp:3766
+#: src/localplayer.cpp:3767
msgid "Imitation: "
msgstr "Имитация: "
-#: src/localplayer.cpp:3768 src/localplayer.cpp:3776
+#: src/localplayer.cpp:3769 src/localplayer.cpp:3777
msgid "Imitation canceled"
msgstr "Имитация отменена"
-#: src/localplayer.cpp:4124
+#: src/localplayer.cpp:4125
msgid "You see "
msgstr "Вы видите "
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 32a6a190d..c8b454e0c 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-01-21 19:25+0300\n"
-"PO-Revision-Date: 2012-01-05 20:43+0000\n"
+"POT-Creation-Date: 2012-01-25 20:17+0300\n"
+"PO-Revision-Date: 2012-01-25 17:27+0000\n"
"Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
"Language-Team: Chinese (China) (http://www.transifex.net/projects/p/manaplus/"
"team/zh_CN/)\n"
@@ -43,47 +43,47 @@ msgstr "A"
msgid "I"
msgstr "I"
-#: src/client.cpp:946 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
+#: src/client.cpp:947 src/gui/setup.cpp:54 src/gui/windowmenu.cpp:100
msgid "Setup"
msgstr "魔法攻击"
-#: src/client.cpp:953 src/gui/setup_perfomance.cpp:48
+#: src/client.cpp:954 src/gui/setup_perfomance.cpp:48
msgid "Perfomance"
msgstr "性能"
-#: src/client.cpp:958 src/gui/setup_video.cpp:315
+#: src/client.cpp:959 src/gui/setup_video.cpp:315
msgid "Video"
msgstr "视频"
-#: src/client.cpp:963
+#: src/client.cpp:964
msgid "Themes"
msgstr "主题"
-#: src/client.cpp:1045
+#: src/client.cpp:1046
msgid "Connecting to server"
msgstr "魔法防御"
-#: src/client.cpp:1076
+#: src/client.cpp:1077
msgid "Logging in"
msgstr "尝试捡起不存在的物品。"
-#: src/client.cpp:1109
+#: src/client.cpp:1110
msgid "Entering game world"
msgstr "捡起物品发生不存在的物品。"
-#: src/client.cpp:1210
+#: src/client.cpp:1211
msgid "Requesting characters"
msgstr "请求角色"
-#: src/client.cpp:1241
+#: src/client.cpp:1242
msgid "Connecting to the game server"
msgstr "连接到游戏服务器"
-#: src/client.cpp:1251
+#: src/client.cpp:1252
msgid "Changing game servers"
msgstr "更改游戏服务器"
-#: src/client.cpp:1294 src/client.cpp:1301 src/client.cpp:1435
+#: src/client.cpp:1295 src/client.cpp:1302 src/client.cpp:1436
#: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
#: src/gui/charcreatedialog.cpp:230 src/gui/charselectdialog.cpp:256
#: src/gui/register.cpp:228 src/gui/serverdialog.cpp:401
@@ -93,50 +93,50 @@ msgstr "更改游戏服务器"
msgid "Error"
msgstr "错误"
-#: src/client.cpp:1310
+#: src/client.cpp:1311
msgid "Requesting registration details"
msgstr "请求注册的详细信息"
-#: src/client.cpp:1336
+#: src/client.cpp:1337
msgid "Password Change"
msgstr "密码更改"
-#: src/client.cpp:1337
+#: src/client.cpp:1338
msgid "Password changed successfully!"
msgstr "更改密码成功!"
-#: src/client.cpp:1356
+#: src/client.cpp:1357
msgid "Email Change"
msgstr "更改电子邮件"
-#: src/client.cpp:1357
+#: src/client.cpp:1358
msgid "Email changed successfully!"
msgstr "更改电子邮件成功!"
-#: src/client.cpp:1377
+#: src/client.cpp:1378
msgid "Unregister Successful"
msgstr "注销成功"
-#: src/client.cpp:1378
+#: src/client.cpp:1379
msgid "Farewell, come back any time..."
msgstr "再见,随时欢迎回来... ..."
-#: src/client.cpp:1583 src/client.cpp:1616 src/client.cpp:1631
-#: src/client.cpp:2063 src/client.cpp:2070
+#: src/client.cpp:1584 src/client.cpp:1617 src/client.cpp:1632
+#: src/client.cpp:2064 src/client.cpp:2071
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%s 不存在,并且无法创建!退出。"
-#: src/client.cpp:1769
+#: src/client.cpp:1770
#, c-format
msgid "Invalid update host: %s"
msgstr "无效的更新主机: %s"
-#: src/client.cpp:1803 src/client.cpp:1809
+#: src/client.cpp:1804 src/client.cpp:1810
msgid "Error creating updates directory!"
msgstr "创建更新目录错误!"
-#: src/client.cpp:1830
+#: src/client.cpp:1831
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "错误:%s 不存在并且无法创建!退出。"
@@ -403,7 +403,7 @@ msgstr "移动"
msgid "Result"
msgstr "结果"
-#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:124
+#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:128
msgid "Reset"
msgstr "重置"
@@ -426,16 +426,16 @@ msgstr ""
#. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:207
-#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:114
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:765
+#: src/gui/itemamountwindow.cpp:235 src/gui/npcdialog.cpp:118
+#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:770
msgid "+"
msgstr "+"
#. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
#. You may change this symbol if your language uses another.
#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:206
-#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:115
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:777
+#: src/gui/itemamountwindow.cpp:234 src/gui/npcdialog.cpp:119
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:782
msgid "-"
msgstr "-"
@@ -447,8 +447,8 @@ msgid "Quit"
msgstr "退出"
#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:95
-#: src/gui/statuswindow.cpp:515 src/gui/statuswindow.cpp:565
-#: src/gui/statuswindow.cpp:764 src/gui/statuswindow.cpp:795
+#: src/gui/statuswindow.cpp:515 src/gui/statuswindow.cpp:570
+#: src/gui/statuswindow.cpp:769 src/gui/statuswindow.cpp:800
msgid "Max"
msgstr "最大"
@@ -479,7 +479,7 @@ msgstr "出售"
#: src/gui/quitdialog.cpp:55 src/gui/register.cpp:82 src/gui/setup.cpp:72
#: src/gui/socialwindow.cpp:1198 src/gui/textcommandeditor.cpp:241
#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updaterwindow.cpp:162
+#: src/gui/updaterwindow.cpp:168
msgid "Cancel"
msgstr "取消"
@@ -903,7 +903,7 @@ msgid "Did You Know?"
msgstr "你知道吗?"
#: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
-#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:53
+#: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
#: src/gui/popupmenu.cpp:630 src/gui/shopwindow.cpp:113
msgid "Close"
msgstr "关闭"
@@ -1238,24 +1238,24 @@ msgstr "状态栏"
msgid "Need"
msgstr "需要"
-#: src/gui/npcdialog.cpp:51
+#: src/gui/npcdialog.cpp:52
msgid "Stop waiting"
msgstr ""
-#: src/gui/npcdialog.cpp:52
+#: src/gui/npcdialog.cpp:53
msgid "Next"
msgstr "下一个"
-#: src/gui/npcdialog.cpp:54
+#: src/gui/npcdialog.cpp:55
msgid "Submit"
msgstr "提交"
-#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
+#: src/gui/npcdialog.cpp:60 src/gui/npcpostdialog.cpp:42
#: src/gui/setup_other.cpp:151
msgid "NPC"
msgstr "NPC"
-#: src/gui/npcdialog.cpp:108 src/gui/popupmenu.cpp:632
+#: src/gui/npcdialog.cpp:112 src/gui/popupmenu.cpp:632
msgid "Clear"
msgstr "清除"
@@ -1277,6 +1277,7 @@ msgid "Outfit: %d"
msgstr "套装: %d"
#: src/gui/outfitwindow.cpp:88 src/gui/outfitwindow.cpp:892
+#: src/gui/windowmenu.cpp:302
#, c-format
msgid "Key: %s"
msgstr "按键:%s"
@@ -2767,7 +2768,7 @@ msgstr ""
msgid "Create Guild"
msgstr "创建帮会"
-#: src/gui/socialwindow.cpp:1196 src/gui/socialwindow.cpp:1629
+#: src/gui/socialwindow.cpp:1196 src/gui/socialwindow.cpp:1631
msgid "Create Party"
msgstr "建立"
@@ -2779,93 +2780,103 @@ msgstr ""
msgid "Invite"
msgstr "邀请"
-#: src/gui/socialwindow.cpp:1412
+#. TRANSLATORS: here P is title for visible players tab in social window
+#: src/gui/socialwindow.cpp:1277
+msgid "P"
+msgstr ""
+
+#. TRANSLATORS: here F is title for friends tab in social window
+#: src/gui/socialwindow.cpp:1281
+msgid "F"
+msgstr ""
+
+#: src/gui/socialwindow.cpp:1414
#, c-format
msgid "Accepted party invite from %s."
msgstr "接受%s团队的邀请."
-#: src/gui/socialwindow.cpp:1422
+#: src/gui/socialwindow.cpp:1424
#, c-format
msgid "Rejected party invite from %s."
msgstr "拒绝%s的团队邀请."
-#: src/gui/socialwindow.cpp:1439
+#: src/gui/socialwindow.cpp:1441
#, c-format
msgid "Accepted guild invite from %s."
msgstr "已接受公会邀请来自%s."
-#: src/gui/socialwindow.cpp:1452
+#: src/gui/socialwindow.cpp:1454
#, c-format
msgid "Rejected guild invite from %s."
msgstr "拒绝%s的公会邀请."
-#: src/gui/socialwindow.cpp:1499
+#: src/gui/socialwindow.cpp:1501
#, c-format
msgid "Creating guild called %s."
msgstr "创建公会的名为%s"
-#: src/gui/socialwindow.cpp:1522
+#: src/gui/socialwindow.cpp:1524
#, c-format
msgid "Creating party called %s."
msgstr "创建团队名字为%s的"
-#: src/gui/socialwindow.cpp:1536
+#: src/gui/socialwindow.cpp:1538
msgid "Guild Name"
msgstr "公会名称"
-#: src/gui/socialwindow.cpp:1537
+#: src/gui/socialwindow.cpp:1539
msgid "Choose your guild's name."
msgstr "选择你的公会的名字."
-#: src/gui/socialwindow.cpp:1551
+#: src/gui/socialwindow.cpp:1553
msgid "Received guild request, but one already exists."
msgstr ""
-#: src/gui/socialwindow.cpp:1557
+#: src/gui/socialwindow.cpp:1559
#, c-format
msgid "%s has invited you to join the guild %s."
msgstr "%s邀请你加入公会%s"
-#: src/gui/socialwindow.cpp:1563
+#: src/gui/socialwindow.cpp:1565
msgid "Accept Guild Invite"
msgstr "接受邀请"
-#: src/gui/socialwindow.cpp:1578
+#: src/gui/socialwindow.cpp:1580
msgid "Received party request, but one already exists."
msgstr "接受到一个已经存在的帮会邀请。"
-#: src/gui/socialwindow.cpp:1589
+#: src/gui/socialwindow.cpp:1591
msgid "You have been invited you to join a party."
msgstr "您已被邀请您加入党。"
-#: src/gui/socialwindow.cpp:1593
+#: src/gui/socialwindow.cpp:1595
#, c-format
msgid "You have been invited to join the %s party."
msgstr "您已被邀请加入%s的团队。"
-#: src/gui/socialwindow.cpp:1601
+#: src/gui/socialwindow.cpp:1603
#, c-format
msgid "%s has invited you to join their party."
msgstr "%s已经邀请你加入他们的帮会。"
-#: src/gui/socialwindow.cpp:1606
+#: src/gui/socialwindow.cpp:1608
#, c-format
msgid "%s has invited you to join the %s party."
msgstr "%s已经邀请你加入帮会%s。"
-#: src/gui/socialwindow.cpp:1615
+#: src/gui/socialwindow.cpp:1617
msgid "Accept Party Invite"
msgstr "接受帮会邀请"
-#: src/gui/socialwindow.cpp:1630
+#: src/gui/socialwindow.cpp:1632
msgid "Cannot create party. You are already in a party"
msgstr "无法建立团队.您已经在一个队伍中了"
-#: src/gui/socialwindow.cpp:1635
+#: src/gui/socialwindow.cpp:1637
msgid "Party Name"
msgstr ""
-#: src/gui/socialwindow.cpp:1636
+#: src/gui/socialwindow.cpp:1638
msgid "Choose your party's name."
msgstr "选择n的名称。"
@@ -3059,29 +3070,29 @@ msgstr "姓名:%s"
msgid "Updating..."
msgstr "更新..."
-#: src/gui/updaterwindow.cpp:160
+#: src/gui/updaterwindow.cpp:166
msgid "Connecting..."
msgstr "连接中..."
-#: src/gui/updaterwindow.cpp:163
+#: src/gui/updaterwindow.cpp:169
msgid "Play"
msgstr "开始"
-#: src/gui/updaterwindow.cpp:566
+#: src/gui/updaterwindow.cpp:570
msgid "##1 The update process is incomplete."
msgstr "##1 更新过程不完整。"
#. TRANSLATORS: Continues "you try again later.".
-#: src/gui/updaterwindow.cpp:568
+#: src/gui/updaterwindow.cpp:572
msgid "##1 It is strongly recommended that"
msgstr "##1 强烈建议"
#. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/updaterwindow.cpp:570
+#: src/gui/updaterwindow.cpp:574
msgid "##1 you try again later."
msgstr ""
-#: src/gui/updaterwindow.cpp:746
+#: src/gui/updaterwindow.cpp:750
msgid "Completed"
msgstr "已完成"
@@ -3954,9 +3965,9 @@ msgid ""
msgstr ""
#: src/localplayer.cpp:384
-#, fuzzy, c-format
+#, c-format
msgid "You were killed by %s"
-msgstr "你被打死"
+msgstr ""
#: src/localplayer.cpp:1439
msgid "Tried to pick up nonexistent item."
@@ -4263,23 +4274,23 @@ msgstr ""
msgid "Game modifiers are unknown"
msgstr ""
-#: src/localplayer.cpp:3757
+#: src/localplayer.cpp:3758
msgid "Follow: "
msgstr "跟随:"
-#: src/localplayer.cpp:3759 src/localplayer.cpp:3774
+#: src/localplayer.cpp:3760 src/localplayer.cpp:3775
msgid "Follow canceled"
msgstr ""
-#: src/localplayer.cpp:3766
+#: src/localplayer.cpp:3767
msgid "Imitation: "
msgstr ""
-#: src/localplayer.cpp:3768 src/localplayer.cpp:3776
+#: src/localplayer.cpp:3769 src/localplayer.cpp:3777
msgid "Imitation canceled"
msgstr ""
-#: src/localplayer.cpp:4124
+#: src/localplayer.cpp:4125
msgid "You see "
msgstr "你看"
@@ -4448,9 +4459,8 @@ msgid "Incorrect slot."
msgstr ""
#: src/net/ea/charserverhandler.cpp:167
-#, fuzzy
msgid "Incorrect race."
-msgstr "不正确的头发。"
+msgstr ""
#: src/net/ea/charserverhandler.cpp:182 src/net/manaserv/charhandler.cpp:210
msgid "Info"
@@ -4605,9 +4615,8 @@ msgid "%s has left your guild."
msgstr "%s已经离开工会."
#: src/net/ea/guildhandler.cpp:499
-#, fuzzy
msgid "You were kicked from guild."
-msgstr "你已经被工会开除!."
+msgstr ""
#: src/net/ea/guildhandler.cpp:512
#, c-format