summaryrefslogtreecommitdiff
path: root/po
diff options
context:
space:
mode:
Diffstat (limited to 'po')
-rw-r--r--po/de.po428
-rw-r--r--po/es.po440
-rw-r--r--po/fi.po432
-rw-r--r--po/fr.po434
-rw-r--r--po/hr.po427
-rw-r--r--po/hu.po427
-rw-r--r--po/id.po439
-rw-r--r--po/ja.po432
-rw-r--r--po/manaplus.pot423
-rw-r--r--po/nl_BE.po474
-rw-r--r--po/pt.po434
-rw-r--r--po/pt_BR.po434
-rw-r--r--po/ru.po436
-rw-r--r--po/zh_CN.po432
14 files changed, 3207 insertions, 2885 deletions
diff --git a/po/de.po b/po/de.po
index 02a19572a..739266db9 100644
--- a/po/de.po
+++ b/po/de.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-09-02 18:27+0300\n"
+"POT-Creation-Date: 2011-09-10 01:34+0300\n"
"PO-Revision-Date: 2011-09-02 15:29+0000\n"
"Last-Translator: akaras <akaras@inbox.ru>\n"
"Language-Team: German (http://www.transifex.net/projects/p/manaplus/team/"
@@ -22,25 +22,25 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-#: src/actorspritemanager.cpp:1034
+#: src/actorspritemanager.cpp:1046
msgid "Visible on map"
msgstr ""
-#: src/being.cpp:549
+#: src/being.cpp:551
msgid "dodge"
msgstr "ausweichen"
-#: src/being.cpp:549
+#: src/being.cpp:551
msgid "miss"
msgstr "verfehlt"
#. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1529
+#: src/being.cpp:1532
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1534
+#: src/being.cpp:1537
msgid "I"
msgstr ""
@@ -110,22 +110,22 @@ msgstr "erfolgreich abgemeldet."
msgid "Farewell, come back any time..."
msgstr "Leb wohl und komme jeder Zeit wieder..."
-#: src/client.cpp:1428 src/client.cpp:1458 src/client.cpp:1502
-#: src/client.cpp:1927 src/client.cpp:1934
+#: src/client.cpp:1428 src/client.cpp:1458 src/client.cpp:1504
+#: src/client.cpp:1929 src/client.cpp:1936
#, 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:1633
+#: src/client.cpp:1635
#, c-format
msgid "Invalid update host: %s"
msgstr "Ungültiger Updateserver: %s"
-#: src/client.cpp:1667 src/client.cpp:1673
+#: src/client.cpp:1669 src/client.cpp:1675
msgid "Error creating updates directory!"
msgstr "Fehler beim Erstellen des Verzeichnisses für Updates!"
-#: src/client.cpp:1694
+#: src/client.cpp:1696
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
@@ -327,19 +327,19 @@ msgstr "Die Verbindung zum Server wurde getrennt."
msgid "Network Error"
msgstr "Netzwerkfehler"
-#: src/game.cpp:1236
+#: src/game.cpp:1243
msgid "Ignoring incoming trade requests"
msgstr "Ignoriere eingehende Handelsanfragen"
-#: src/game.cpp:1243
+#: src/game.cpp:1250
msgid "Accepting incoming trade requests"
msgstr "Akzeptiere eingehende Handelsanfragen"
-#: src/game.cpp:1629
+#: src/game.cpp:1636
msgid "Could Not Load Map"
msgstr "Karte konnte nicht geladen werden."
-#: src/game.cpp:1630
+#: src/game.cpp:1637
#, c-format
msgid "Error while loading %s"
msgstr "Fehler beim Laden von %s"
@@ -368,31 +368,31 @@ msgstr ""
msgid "Bot Checker"
msgstr "Bot-Prüfer"
-#: src/gui/botcheckerwindow.cpp:295 src/gui/setup_relations.cpp:64
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
msgid "Name"
msgstr "Name"
-#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:133
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:133
#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:646
#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:265
msgid "Attack"
msgstr "Angriff"
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:297
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297
#: src/keyboardconfig.cpp:62
msgid "Talk"
msgstr "Sprechen"
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:263
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:263
#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:703
msgid "Move"
msgstr "Bewegen"
-#: src/gui/botcheckerwindow.cpp:299
+#: src/gui/botcheckerwindow.cpp:300
msgid "Result"
msgstr "Resultat"
-#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:124
+#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:124
msgid "Reset"
msgstr "Zurücksetzten"
@@ -438,7 +438,7 @@ msgid "Max"
msgstr "Max"
#: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:147 src/gui/setup_other.cpp:133
+#: src/gui/inventorywindow.cpp:176 src/gui/setup_other.cpp:142
msgid "Shop"
msgstr "Laden"
@@ -457,10 +457,10 @@ msgstr "Verkaufen"
#: src/gui/popupmenu.cpp:516 src/gui/popupmenu.cpp:540
#: src/gui/popupmenu.cpp:554 src/gui/popupmenu.cpp:573
#: src/gui/popupmenu.cpp:790 src/gui/popupmenu.cpp:814
-#: src/gui/popupmenu.cpp:1734 src/gui/popupmenu.cpp:1762
-#: src/gui/popupmenu.cpp:1818 src/gui/popupmenu.cpp:1861
-#: src/gui/popupmenu.cpp:1896 src/gui/popupmenu.cpp:1936
-#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2023
+#: src/gui/popupmenu.cpp:1737 src/gui/popupmenu.cpp:1765
+#: src/gui/popupmenu.cpp:1821 src/gui/popupmenu.cpp:1864
+#: src/gui/popupmenu.cpp:1899 src/gui/popupmenu.cpp:1939
+#: src/gui/popupmenu.cpp:2006 src/gui/popupmenu.cpp:2026
#: src/gui/quitdialog.cpp:54 src/gui/register.cpp:82 src/gui/setup.cpp:72
#: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:238
#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
@@ -562,7 +562,7 @@ msgstr "Frisur:"
msgid "Race:"
msgstr ""
-#: src/gui/charcreatedialog.cpp:95 src/gui/charselectdialog.cpp:478
+#: src/gui/charcreatedialog.cpp:95 src/gui/charselectdialog.cpp:480
#: src/gui/socialwindow.cpp:1139
msgid "Create"
msgstr "Erstellen"
@@ -630,26 +630,26 @@ msgstr ""
msgid "Enter password:"
msgstr ""
-#: src/gui/charselectdialog.cpp:408 src/gui/serverdialog.cpp:298
+#: src/gui/charselectdialog.cpp:410 src/gui/serverdialog.cpp:298
#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:122
#: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:241
msgid "Delete"
msgstr "Löschen"
-#: src/gui/charselectdialog.cpp:466
+#: src/gui/charselectdialog.cpp:468
msgid "Choose"
msgstr "Wähle"
-#: src/gui/charselectdialog.cpp:469
+#: src/gui/charselectdialog.cpp:471
#, c-format
msgid "Level %d"
msgstr "Level: %d"
-#: src/gui/charselectdialog.cpp:480 src/gui/charselectdialog.cpp:481
+#: src/gui/charselectdialog.cpp:482 src/gui/charselectdialog.cpp:483
msgid "(empty)"
msgstr "(leer)"
-#: src/gui/chatwindow.cpp:112
+#: src/gui/chatwindow.cpp:112 src/gui/inventorywindow.cpp:70
msgid "default"
msgstr "Standard"
@@ -705,11 +705,12 @@ msgstr "Regenbogen 2"
msgid "rainbow 3"
msgstr "Regenbogen 3"
-#: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
-#: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
-#: src/gui/setup_theme.cpp:73 src/gui/setup_theme.cpp:127
-#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
-#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
+#: src/gui/chatwindow.cpp:142 src/gui/inventorywindow.cpp:90
+#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78
+#: src/gui/setup_relations.cpp:220 src/gui/setup_theme.cpp:73
+#: src/gui/setup_theme.cpp:127 src/gui/setup_video.cpp:211
+#: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141
+#: src/gui/textcommandeditor.cpp:160
msgid "???"
msgstr "???"
@@ -742,7 +743,7 @@ msgstr "Nein"
msgid "Ignore"
msgstr "ignorieren"
-#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:97
+#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:99
#: src/gui/setup_other.cpp:64
msgid "Map"
msgstr "Karte"
@@ -883,7 +884,7 @@ msgid "Did You Know?"
msgstr ""
#: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
-#: src/gui/inventorywindow.cpp:176 src/gui/npcdialog.cpp:53
+#: src/gui/inventorywindow.cpp:206 src/gui/npcdialog.cpp:53
#: src/gui/popupmenu.cpp:588 src/gui/shopwindow.cpp:113
msgid "Close"
msgstr "Schließen"
@@ -909,10 +910,10 @@ msgstr "Ok"
msgid "Equipment"
msgstr "Ausrüstung"
-#: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:131
-#: src/gui/inventorywindow.cpp:512 src/gui/inventorywindow.cpp:521
-#: src/gui/popupmenu.cpp:1693 src/gui/popupmenu.cpp:1788
-#: src/gui/popupmenu.cpp:1833
+#: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160
+#: src/gui/inventorywindow.cpp:539 src/gui/inventorywindow.cpp:548
+#: src/gui/popupmenu.cpp:1696 src/gui/popupmenu.cpp:1791
+#: src/gui/popupmenu.cpp:1836
msgid "Unequip"
msgstr "Ablegen"
@@ -920,80 +921,90 @@ msgstr "Ablegen"
msgid "Help"
msgstr "Hilfe"
-#: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76
+#: src/gui/inventorywindow.cpp:71
+#, fuzzy
+msgid "by name"
+msgstr "Umbenennen"
+
+#: src/gui/inventorywindow.cpp:72
+msgid "by id"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:73
+#, fuzzy
+msgid "by weight"
+msgstr "Gewicht:"
+
+#: src/gui/inventorywindow.cpp:74
+msgid "by amount"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:75
+msgid "by type"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:111 src/gui/windowmenu.cpp:76
#: src/inventory.cpp:249
msgid "Inventory"
msgstr "Inventar"
-#: src/gui/inventorywindow.cpp:105
+#: src/gui/inventorywindow.cpp:136
msgid "Slots:"
msgstr "Plätze:"
-#: src/gui/inventorywindow.cpp:116
+#: src/gui/inventorywindow.cpp:148
msgid "Filter:"
msgstr "Filter:"
-#: src/gui/inventorywindow.cpp:117
+#: src/gui/inventorywindow.cpp:149
msgid "Sort:"
msgstr "Sortieren:"
-#: src/gui/inventorywindow.cpp:123
-msgid "na"
-msgstr ""
-
-#: src/gui/inventorywindow.cpp:124
-msgid "az"
-msgstr ""
-
-#: src/gui/inventorywindow.cpp:125
-msgid "id"
-msgstr ""
-
-#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
-#: src/gui/inventorywindow.cpp:523 src/gui/popupmenu.cpp:1695
-#: src/gui/popupmenu.cpp:1790 src/gui/popupmenu.cpp:1835
+#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:541
+#: src/gui/inventorywindow.cpp:550 src/gui/popupmenu.cpp:1698
+#: src/gui/popupmenu.cpp:1793 src/gui/popupmenu.cpp:1838
msgid "Equip"
msgstr "Ausrüsten"
-#: src/gui/inventorywindow.cpp:130 src/gui/inventorywindow.cpp:515
-#: src/gui/inventorywindow.cpp:519 src/gui/popupmenu.cpp:1698
-#: src/gui/popupmenu.cpp:1757 src/gui/popupmenu.cpp:1794
-#: src/gui/popupmenu.cpp:1838
+#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:542
+#: src/gui/inventorywindow.cpp:546 src/gui/popupmenu.cpp:1701
+#: src/gui/popupmenu.cpp:1760 src/gui/popupmenu.cpp:1797
+#: src/gui/popupmenu.cpp:1841
msgid "Use"
msgstr "Benutzen"
-#: src/gui/inventorywindow.cpp:144 src/gui/inventorywindow.cpp:620
-#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1799
-#: src/gui/popupmenu.cpp:1842
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:646
+#: src/gui/popupmenu.cpp:1705 src/gui/popupmenu.cpp:1802
+#: src/gui/popupmenu.cpp:1845
msgid "Drop..."
msgstr "Wegwerfen"
-#: src/gui/inventorywindow.cpp:145 src/gui/popupmenu.cpp:1711
-#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1851
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1714
+#: src/gui/popupmenu.cpp:1811 src/gui/popupmenu.cpp:1854
msgid "Split"
msgstr "Aufteilen"
-#: src/gui/inventorywindow.cpp:146 src/gui/outfitwindow.cpp:60
+#: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60
#: src/gui/popupmenu.cpp:549
msgid "Outfits"
msgstr "Ausrüstung"
-#: src/gui/inventorywindow.cpp:149
+#: src/gui/inventorywindow.cpp:178
msgid "Weight:"
msgstr "Gewicht:"
-#: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:611
-#: src/gui/popupmenu.cpp:1674 src/gui/popupmenu.cpp:1811
-#: src/gui/popupmenu.cpp:1854 src/gui/setup.cpp:73
+#: src/gui/inventorywindow.cpp:204 src/gui/inventorywindow.cpp:637
+#: src/gui/popupmenu.cpp:1677 src/gui/popupmenu.cpp:1814
+#: src/gui/popupmenu.cpp:1857 src/gui/setup.cpp:73
msgid "Store"
msgstr "Aufbewahren"
-#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1718
+#: src/gui/inventorywindow.cpp:205 src/gui/popupmenu.cpp:1721
msgid "Retrieve"
msgstr "Abholen"
-#: src/gui/inventorywindow.cpp:622 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1847
+#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1710
+#: src/gui/popupmenu.cpp:1807 src/gui/popupmenu.cpp:1850
#: src/gui/windowmenu.cpp:97
msgid "Drop"
msgstr "Wegwerfen"
@@ -1047,91 +1058,91 @@ msgstr "Gewicht: %s"
msgid "Kill stats"
msgstr ""
-#: src/gui/killstats.cpp:65
+#: src/gui/killstats.cpp:66
msgid "Reset stats"
msgstr "Statistik zurücksetzen"
-#: src/gui/killstats.cpp:66
+#: src/gui/killstats.cpp:67
msgid "Reset timer"
msgstr "Timer zurücksetzen"
-#: src/gui/killstats.cpp:70 src/gui/killstats.cpp:206
+#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:207
#, c-format
msgid "Level: %d at %f%%"
msgstr ""
-#: src/gui/killstats.cpp:74 src/gui/killstats.cpp:211
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:212
#, c-format
msgid "Exp: %d/%d Left: %d"
msgstr ""
-#: src/gui/killstats.cpp:77 src/gui/killstats.cpp:217
-#: src/gui/killstats.cpp:226
+#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:218
+#: src/gui/killstats.cpp:227
#, c-format
msgid "1%% = %d exp, avg mob for 1%%: %s"
msgstr ""
-#: src/gui/killstats.cpp:80 src/gui/killstats.cpp:143
-#: src/gui/killstats.cpp:235
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:236
#, c-format
msgid "Kills: %s, total exp: %s"
msgstr ""
-#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145
-#: src/gui/killstats.cpp:221 src/gui/killstats.cpp:231
+#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:146
+#: src/gui/killstats.cpp:222 src/gui/killstats.cpp:232
#, c-format
msgid "Avg Exp: %s, No. of avg mob to next level: %s"
msgstr ""
-#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:163
-#: src/gui/killstats.cpp:238
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:164
+#: src/gui/killstats.cpp:239
#, c-format
msgid "Kills/Min: %s, Exp/Min: %s"
msgstr ""
-#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:90 src/gui/killstats.cpp:95
-#: src/gui/killstats.cpp:290 src/gui/killstats.cpp:306
-#: src/gui/killstats.cpp:324
+#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
+#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
+#: src/gui/killstats.cpp:325
#, c-format
msgid "Exp speed per %d min: %s"
msgid_plural "Exp speed per %d min: %s"
msgstr[0] ""
msgstr[1] ""
-#: src/gui/killstats.cpp:88 src/gui/killstats.cpp:93 src/gui/killstats.cpp:98
+#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:94 src/gui/killstats.cpp:99
#, c-format
msgid "Time for next level per %d min: %s"
msgid_plural "Time for next level per %d min: %s"
msgstr[0] ""
msgstr[1] ""
-#: src/gui/killstats.cpp:101 src/gui/killstats.cpp:242
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
msgid "Last kill exp:"
msgstr ""
-#: src/gui/killstats.cpp:103 src/gui/killstats.cpp:356
-#: src/gui/killstats.cpp:362 src/gui/killstats.cpp:368
-#: src/gui/killstats.cpp:373
+#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
+#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:374
msgid "Time before jacko spawn:"
msgstr ""
-#: src/gui/killstats.cpp:295 src/gui/killstats.cpp:302
-#: src/gui/killstats.cpp:312 src/gui/killstats.cpp:319
-#: src/gui/killstats.cpp:331 src/gui/killstats.cpp:338
+#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
+#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
+#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
#, c-format
msgid " Time for next level: %s"
msgstr ""
-#: src/gui/killstats.cpp:362
+#: src/gui/killstats.cpp:363
#, c-format
msgid "%s %d?"
msgstr ""
-#: src/gui/killstats.cpp:368
+#: src/gui/killstats.cpp:369
msgid "jacko spawning"
msgstr ""
-#: src/guildmanager.cpp:464 src/net/ea/guildhandler.cpp:439
+#: src/guildmanager.cpp:484 src/net/ea/guildhandler.cpp:439
msgid "You have left the guild."
msgstr "Du hast die Guilde verlassen."
@@ -1229,7 +1240,7 @@ msgid "Submit"
msgstr "Absenden"
#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:142
+#: src/gui/setup_other.cpp:151
msgid "NPC"
msgstr "NPC"
@@ -1317,7 +1328,7 @@ msgstr ""
#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:185
#: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:428
#: src/gui/popupmenu.cpp:677 src/gui/popupmenu.cpp:693
-#: src/playerrelations.cpp:400
+#: src/playerrelations.cpp:415
msgid "Completely ignore"
msgstr "@@ignore|Ignoriere %s komplett@@"
@@ -1368,7 +1379,7 @@ msgid "Show Items"
msgstr ""
#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:705
-#: src/gui/popupmenu.cpp:2020
+#: src/gui/popupmenu.cpp:2023
msgid "Undress"
msgstr ""
@@ -1416,8 +1427,8 @@ msgstr ""
msgid "Pick up"
msgstr "Aufheben"
-#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:1732
-#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1855
+#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:1735
+#: src/gui/popupmenu.cpp:1815 src/gui/popupmenu.cpp:1858
msgid "Add to chat"
msgstr "Zu Chat hinzufügen"
@@ -1429,8 +1440,8 @@ msgstr ""
msgid "Rename"
msgstr "Umbenennen"
-#: src/gui/popupmenu.cpp:532 src/gui/popupmenu.cpp:1973
-#: src/gui/popupmenu.cpp:1991 src/gui/popupmenu.cpp:1996
+#: src/gui/popupmenu.cpp:532 src/gui/popupmenu.cpp:1976
+#: src/gui/popupmenu.cpp:1994 src/gui/popupmenu.cpp:1999
msgid "Remove"
msgstr "Entfernen"
@@ -1506,85 +1517,85 @@ msgstr ""
msgid "Comment: "
msgstr ""
-#: src/gui/popupmenu.cpp:1657
+#: src/gui/popupmenu.cpp:1660
msgid "Add to trade"
msgstr ""
-#: src/gui/popupmenu.cpp:1663
+#: src/gui/popupmenu.cpp:1666
msgid "Add to trade 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1666
+#: src/gui/popupmenu.cpp:1669
msgid "Add to trade half"
msgstr ""
-#: src/gui/popupmenu.cpp:1668
+#: src/gui/popupmenu.cpp:1671
msgid "Add to trade all"
msgstr ""
-#: src/gui/popupmenu.cpp:1680
+#: src/gui/popupmenu.cpp:1683
msgid "Store 10"
msgstr "10 aufbewahren"
-#: src/gui/popupmenu.cpp:1683
+#: src/gui/popupmenu.cpp:1686
msgid "Store half"
msgstr "Die Hälfte aufbewahren"
-#: src/gui/popupmenu.cpp:1685
+#: src/gui/popupmenu.cpp:1688
msgid "Store all"
msgstr "Alles aufbewahren"
-#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1800
-#: src/gui/popupmenu.cpp:1843
+#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1803
+#: src/gui/popupmenu.cpp:1846
msgid "Drop all"
msgstr ""
-#: src/gui/popupmenu.cpp:1724
+#: src/gui/popupmenu.cpp:1727
msgid "Retrieve 10"
msgstr "10 abholen"
-#: src/gui/popupmenu.cpp:1727
+#: src/gui/popupmenu.cpp:1730
msgid "Retrieve half"
msgstr "Die Hälfte abholen"
-#: src/gui/popupmenu.cpp:1729
+#: src/gui/popupmenu.cpp:1732
msgid "Retrieve all"
msgstr "Alles abholen"
-#: src/gui/popupmenu.cpp:1760 src/gui/popupmenu.cpp:1816
+#: src/gui/popupmenu.cpp:1763 src/gui/popupmenu.cpp:1819
msgid "Load old item shortcuts"
msgstr ""
-#: src/gui/popupmenu.cpp:1859
+#: src/gui/popupmenu.cpp:1862
msgid "Load old drop shortcuts"
msgstr ""
-#: src/gui/popupmenu.cpp:1885 src/gui/popupmenu.cpp:1920
+#: src/gui/popupmenu.cpp:1888 src/gui/popupmenu.cpp:1923
msgid "Hide"
msgstr ""
-#: src/gui/popupmenu.cpp:1891 src/gui/popupmenu.cpp:1926
+#: src/gui/popupmenu.cpp:1894 src/gui/popupmenu.cpp:1929
msgid "Show"
msgstr ""
-#: src/gui/popupmenu.cpp:1933
+#: src/gui/popupmenu.cpp:1936
msgid "Reset yellow bar"
msgstr ""
-#: src/gui/popupmenu.cpp:1935 src/gui/statuswindow.cpp:241
+#: src/gui/popupmenu.cpp:1938 src/gui/statuswindow.cpp:241
msgid "Copy to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:1953 src/gui/socialwindow.cpp:958
+#: src/gui/popupmenu.cpp:1956 src/gui/socialwindow.cpp:958
#: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028
msgid "(default)"
msgstr ""
-#: src/gui/popupmenu.cpp:1965 src/gui/popupmenu.cpp:1983
+#: src/gui/popupmenu.cpp:1968 src/gui/popupmenu.cpp:1986
msgid "Move up"
msgstr ""
-#: src/gui/popupmenu.cpp:1970 src/gui/popupmenu.cpp:1988
+#: src/gui/popupmenu.cpp:1973 src/gui/popupmenu.cpp:1991
msgid "Move down"
msgstr ""
@@ -1832,7 +1843,7 @@ msgstr "Zeit"
msgid "Use local time"
msgstr ""
-#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:157
+#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:166
msgid "Other"
msgstr ""
@@ -1995,115 +2006,128 @@ msgstr "Zeige Pfad"
msgid "Draw hotkeys on map"
msgstr "Zeige Hotekeys auf der Karte"
-#: src/gui/setup_other.cpp:88
+#: src/gui/setup_other.cpp:87
+#, fuzzy
+msgid "Enable lazy scrolling"
+msgstr "Aufzeichnen des Chats einschalten"
+
+#: src/gui/setup_other.cpp:90
+msgid "Scroll laziness"
+msgstr ""
+
+#: src/gui/setup_other.cpp:93
+msgid "Scroll radius"
+msgstr ""
+
+#: src/gui/setup_other.cpp:97
msgid "Moving"
msgstr ""
-#: src/gui/setup_other.cpp:90
+#: src/gui/setup_other.cpp:99
msgid "Auto fix position"
msgstr "Automatischen Berichtigen der Position"
-#: src/gui/setup_other.cpp:93
+#: src/gui/setup_other.cpp:102
msgid "Attack while moving"
msgstr "Während des Bewegens angreifen"
-#: src/gui/setup_other.cpp:96
+#: src/gui/setup_other.cpp:105
msgid "Sync player move"
msgstr "Synchronisiere Bewegungen des Spielers"
-#: src/gui/setup_other.cpp:99
+#: src/gui/setup_other.cpp:108
msgid "Crazy move A program"
msgstr "Verrückte Bewegungen A-Programm"
-#: src/gui/setup_other.cpp:103
+#: src/gui/setup_other.cpp:112
msgid "Player"
msgstr "Spieler"
-#: src/gui/setup_other.cpp:105
+#: src/gui/setup_other.cpp:114
msgid "Show own hp bar"
msgstr "Eigenen HP-Balken anzeigen"
-#: src/gui/setup_other.cpp:108
+#: src/gui/setup_other.cpp:117
msgid "Enable quick stats"
msgstr ""
-#: src/gui/setup_other.cpp:111
+#: src/gui/setup_other.cpp:120
msgid "Cycle player targets"
msgstr "Angriffsziele des Spielers einkreisen"
-#: src/gui/setup_other.cpp:114
+#: src/gui/setup_other.cpp:123
msgid "Show job exp messages"
msgstr "Zeige \"job exp\"-Nachrichten"
-#: src/gui/setup_other.cpp:117
+#: src/gui/setup_other.cpp:126
msgid "Show players popups"
msgstr ""
-#: src/gui/setup_other.cpp:120
+#: src/gui/setup_other.cpp:129
msgid "Afk message"
msgstr ""
-#: src/gui/setup_other.cpp:123
+#: src/gui/setup_other.cpp:132
msgid "Show job"
msgstr "Zeige Job"
-#: src/gui/setup_other.cpp:126
+#: src/gui/setup_other.cpp:135
msgid "Enable attack filter"
msgstr ""
-#: src/gui/setup_other.cpp:129
+#: src/gui/setup_other.cpp:138
msgid "Enable advert protocol"
msgstr ""
-#: src/gui/setup_other.cpp:135
+#: src/gui/setup_other.cpp:144
msgid "Accept sell/buy requests"
msgstr "Verkauf- und Kaufanfragen akzeptieren"
-#: src/gui/setup_other.cpp:138
+#: src/gui/setup_other.cpp:147
msgid "Enable shop mode"
msgstr "Laden-Modus einschalten"
-#: src/gui/setup_other.cpp:144
+#: src/gui/setup_other.cpp:153
msgid "Log NPC dialogue"
msgstr "Protokolliere NPC Dialoge"
-#: src/gui/setup_other.cpp:148
+#: src/gui/setup_other.cpp:157
msgid "Bots support"
msgstr ""
-#: src/gui/setup_other.cpp:150
+#: src/gui/setup_other.cpp:159
msgid "Enable auction bot support"
msgstr ""
-#: src/gui/setup_other.cpp:153
+#: src/gui/setup_other.cpp:162
msgid "Enable guild bot support and disable native guild support"
msgstr ""
-#: src/gui/setup_other.cpp:159
+#: src/gui/setup_other.cpp:168
msgid "Enable server side attack"
msgstr ""
-#: src/gui/setup_other.cpp:162
+#: src/gui/setup_other.cpp:171
msgid "Enable bot checker"
msgstr "Botprüfer einschalten"
-#: src/gui/setup_other.cpp:165
+#: src/gui/setup_other.cpp:174
msgid "Enable buggy servers protection"
msgstr ""
-#: src/gui/setup_other.cpp:168
+#: src/gui/setup_other.cpp:177
msgid "Enable debug log"
msgstr "Debug-Protokoll benutzen"
-#: src/gui/setup_other.cpp:171
+#: src/gui/setup_other.cpp:180
msgid "Low traffic mode"
msgstr ""
-#: src/gui/setup_other.cpp:174
+#: src/gui/setup_other.cpp:183
msgid "Hide shield sprite"
msgstr ""
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:186
msgid "Show background"
msgstr "Zeige Hintergrund"
@@ -2120,27 +2144,27 @@ msgid "Auto adjust perfomance"
msgstr ""
#: src/gui/setup_perfomance.cpp:61
-msgid "Show beings transparency"
+msgid "Hw acceleration"
msgstr ""
#: src/gui/setup_perfomance.cpp:64
-msgid "Hw acceleration"
+msgid "Enable opacity cache (Software, can use many memory)"
msgstr ""
#: src/gui/setup_perfomance.cpp:67
-msgid "Enable opacity cache (Software, can use many memory)"
+msgid "Enable map reduce (Software)"
msgstr ""
#: src/gui/setup_perfomance.cpp:70
-msgid "Enable map reduce (Software)"
+msgid "Better quality (disable for better perfomance)"
msgstr ""
#: src/gui/setup_perfomance.cpp:73
-msgid "Better quality (disable for better perfomance)"
+msgid "Enable alpha channel fix (Software, can be very slow)"
msgstr ""
-#: src/gui/setup_perfomance.cpp:76
-msgid "Enable alpha channel fix (Software, can be very slow)"
+#: src/gui/setup_perfomance.cpp:77
+msgid "Show beings transparency"
msgstr ""
#: src/gui/setup_perfomance.cpp:80
@@ -2395,7 +2419,7 @@ msgid "FPS limit:"
msgstr "FPS Limit:"
#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
-#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709
+#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:710
msgid "Alt FPS limit: "
msgstr "Alt FPS Limit:"
@@ -2421,7 +2445,7 @@ msgstr "Partikeldetail"
#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
-#: src/gui/setup_video.cpp:707
+#: src/gui/setup_video.cpp:708
msgid "None"
msgstr "Kein(e)"
@@ -2535,22 +2559,22 @@ msgstr "Erhöhen"
msgid "Skill points available: %d"
msgstr "Fähigkeitspunkte verfügbar: %d"
-#: src/gui/skilldialog.cpp:418
+#: src/gui/skilldialog.cpp:420
#, c-format
msgid "Skill Set %d"
msgstr ""
-#: src/gui/skilldialog.cpp:430
+#: src/gui/skilldialog.cpp:432
#, c-format
msgid "Skill %d"
msgstr ""
-#: src/gui/skilldialog.cpp:497 src/gui/skilldialog.cpp:550
+#: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554
#, c-format
msgid "Lvl: %d"
msgstr "Lvl: %d"
-#: src/gui/skilldialog.cpp:542
+#: src/gui/skilldialog.cpp:546
#, c-format
msgid "Lvl: %d (%+d)"
msgstr ""
@@ -3475,23 +3499,23 @@ msgstr ""
msgid "Road Point"
msgstr ""
-#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:472
+#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:474
msgid "Who Is Online - Updating"
msgstr ""
-#: src/gui/whoisonline.cpp:102
+#: src/gui/whoisonline.cpp:104
msgid "Update"
msgstr ""
-#: src/gui/whoisonline.cpp:295
+#: src/gui/whoisonline.cpp:297
msgid "Who Is Online - "
msgstr ""
-#: src/gui/whoisonline.cpp:486
+#: src/gui/whoisonline.cpp:488
msgid "Who Is Online - error"
msgstr ""
-#: src/gui/whoisonline.cpp:517
+#: src/gui/whoisonline.cpp:519
msgid "Who Is Online - Update"
msgstr ""
@@ -4163,68 +4187,68 @@ msgid ""
"strange behaviour."
msgstr ""
-#: src/localplayer.cpp:370
+#: src/localplayer.cpp:372
msgid "You were killed by "
msgstr ""
-#: src/localplayer.cpp:1401
+#: src/localplayer.cpp:1413
msgid "Tried to pick up nonexistent item."
msgstr ""
-#: src/localplayer.cpp:1403
+#: src/localplayer.cpp:1415
msgid "Item is too heavy."
msgstr ""
-#: src/localplayer.cpp:1405
+#: src/localplayer.cpp:1417
msgid "Item is too far away."
msgstr ""
-#: src/localplayer.cpp:1407
+#: src/localplayer.cpp:1419
msgid "Inventory is full."
msgstr ""
-#: src/localplayer.cpp:1409
+#: src/localplayer.cpp:1421
msgid "Stack is too big."
msgstr ""
-#: src/localplayer.cpp:1412
+#: src/localplayer.cpp:1424
msgid "Item belongs to someone else."
msgstr ""
-#: src/localplayer.cpp:1415
+#: src/localplayer.cpp:1427
msgid "Unknown problem picking up item."
msgstr ""
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1439
+#: src/localplayer.cpp:1451
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
msgstr[0] ""
msgstr[1] ""
-#: src/localplayer.cpp:3173
+#: src/localplayer.cpp:3187
msgid "Away"
msgstr "Abwesend"
-#: src/localplayer.cpp:3474
+#: src/localplayer.cpp:3488
msgid "Follow: "
msgstr "Folgen:"
-#: src/localplayer.cpp:3476 src/localplayer.cpp:3491
+#: src/localplayer.cpp:3490 src/localplayer.cpp:3505
msgid "Follow canceled"
msgstr ""
-#: src/localplayer.cpp:3483
+#: src/localplayer.cpp:3497
msgid "Imitation: "
msgstr ""
-#: src/localplayer.cpp:3485 src/localplayer.cpp:3493
+#: src/localplayer.cpp:3499 src/localplayer.cpp:3507
msgid "Imitation canceled"
msgstr ""
-#: src/localplayer.cpp:3845
+#: src/localplayer.cpp:3859
msgid "You see "
msgstr "Du siehst"
@@ -4425,16 +4449,16 @@ msgstr ""
msgid "MVP player: "
msgstr ""
-#: src/net/ea/gamehandler.cpp:86
+#: src/net/ea/gamehandler.cpp:87
#, c-format
msgid "Online users: %d"
msgstr ""
-#: src/net/ea/gamehandler.cpp:98
+#: src/net/ea/gamehandler.cpp:99
msgid "Game"
msgstr "Spiel"
-#: src/net/ea/gamehandler.cpp:98
+#: src/net/ea/gamehandler.cpp:99
msgid "Request to quit denied!"
msgstr ""
@@ -5484,19 +5508,19 @@ msgstr "Verbindung mit Server abgebrochen. "
msgid "%s is not in your party!"
msgstr "%s ist nicht in Deiner Party!"
-#: src/playerrelations.cpp:414
+#: src/playerrelations.cpp:429
msgid "Print '...'"
msgstr "Drucke '..'"
-#: src/playerrelations.cpp:434
+#: src/playerrelations.cpp:449
msgid "Blink name"
msgstr "Blinkender Name"
-#: src/playerrelations.cpp:478
+#: src/playerrelations.cpp:493
msgid "Floating '...' bubble"
msgstr "Schwebende '...' Blase"
-#: src/playerrelations.cpp:481
+#: src/playerrelations.cpp:496
msgid "Floating bubble"
msgstr "Schwebende Blase"
diff --git a/po/es.po b/po/es.po
index ea3abab4d..7f98a9e97 100644
--- a/po/es.po
+++ b/po/es.po
@@ -2,18 +2,19 @@
# Copyright (C) YEAR The ManaPlus Developers
# This file is distributed under the same license as the PACKAGE package.
#
-# Nelson <nelson6eeduardo65@gmail.com>, 2011.
-# Nelson Martell <nelson6eeduardo65@gmail.com>, 2011.
-# Nelson Martell <nelson6e65-manaplus@yahoo.es>, 2011.
-# Jumpy <antoinebcn@hotmail.com>, 2011.
+# Translators:
# Andrei Karas <akaras@inbox.ru>, 2011.
+# Jumpy <antoinebcn@hotmail.com>, 2011.
+# Nelson Martell <nelson6e65-manaplus@yahoo.es>, 2011.
+# Nelson Martell <nelson6eeduardo65@gmail.com>, 2011.
+# Nelson <nelson6eeduardo65@gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-09-02 18:27+0300\n"
-"PO-Revision-Date: 2011-09-02 22:15+0000\n"
-"Last-Translator: nelson6e65 <nelson6e65-manaplus@yahoo.es>\n"
+"POT-Creation-Date: 2011-09-10 01:34+0300\n"
+"PO-Revision-Date: 2011-09-09 22:37+0000\n"
+"Last-Translator: akaras <akaras@inbox.ru>\n"
"Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/"
"manaplus/team/es/)\n"
"Language: es\n"
@@ -22,25 +23,25 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-#: src/actorspritemanager.cpp:1034
+#: src/actorspritemanager.cpp:1046
msgid "Visible on map"
msgstr "Visible sobre el mapa"
-#: src/being.cpp:549
+#: src/being.cpp:551
msgid "dodge"
msgstr "evade"
-#: src/being.cpp:549
+#: src/being.cpp:551
msgid "miss"
msgstr "falla"
#. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1529
+#: src/being.cpp:1532
msgid "A"
msgstr "A"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1534
+#: src/being.cpp:1537
msgid "I"
msgstr "I"
@@ -110,22 +111,22 @@ msgstr "Registro cancelado"
msgid "Farewell, come back any time..."
msgstr "Adiós, vuelve cuando quieras..."
-#: src/client.cpp:1428 src/client.cpp:1458 src/client.cpp:1502
-#: src/client.cpp:1927 src/client.cpp:1934
+#: src/client.cpp:1428 src/client.cpp:1458 src/client.cpp:1504
+#: src/client.cpp:1929 src/client.cpp:1936
#, 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:1633
+#: src/client.cpp:1635
#, c-format
msgid "Invalid update host: %s"
msgstr "Servidor de actualización inválido: %s"
-#: src/client.cpp:1667 src/client.cpp:1673
+#: src/client.cpp:1669 src/client.cpp:1675
msgid "Error creating updates directory!"
msgstr "¡Error al crear la carpeta de actualizaciones!"
-#: src/client.cpp:1694
+#: src/client.cpp:1696
#, 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."
@@ -326,19 +327,19 @@ msgstr "Se ha perdido la conexión con el servidor."
msgid "Network Error"
msgstr "Error de Red"
-#: src/game.cpp:1236
+#: src/game.cpp:1243
msgid "Ignoring incoming trade requests"
msgstr "Ignorando las peticiones de intercambio"
-#: src/game.cpp:1243
+#: src/game.cpp:1250
msgid "Accepting incoming trade requests"
msgstr "Aceptando las peticiones de intercambio"
-#: src/game.cpp:1629
+#: src/game.cpp:1636
msgid "Could Not Load Map"
msgstr "No se pudo cargar el mapa"
-#: src/game.cpp:1630
+#: src/game.cpp:1637
#, c-format
msgid "Error while loading %s"
msgstr "Error mientras cargaba %s"
@@ -367,31 +368,31 @@ msgstr "Comentario: %s"
msgid "Bot Checker"
msgstr "Bot Checker"
-#: src/gui/botcheckerwindow.cpp:295 src/gui/setup_relations.cpp:64
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
msgid "Name"
msgstr "Nombre"
-#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:133
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:133
#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:646
#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:265
msgid "Attack"
msgstr "Atacar"
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:297
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297
#: src/keyboardconfig.cpp:62
msgid "Talk"
msgstr "Hablar"
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:263
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:263
#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:703
msgid "Move"
msgstr "Mover"
-#: src/gui/botcheckerwindow.cpp:299
+#: src/gui/botcheckerwindow.cpp:300
msgid "Result"
msgstr "Resultado"
-#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:124
+#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:124
msgid "Reset"
msgstr "Restablecer"
@@ -437,7 +438,7 @@ msgid "Max"
msgstr "Máximo"
#: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:147 src/gui/setup_other.cpp:133
+#: src/gui/inventorywindow.cpp:176 src/gui/setup_other.cpp:142
msgid "Shop"
msgstr "Tienda"
@@ -456,10 +457,10 @@ msgstr "Vender"
#: src/gui/popupmenu.cpp:516 src/gui/popupmenu.cpp:540
#: src/gui/popupmenu.cpp:554 src/gui/popupmenu.cpp:573
#: src/gui/popupmenu.cpp:790 src/gui/popupmenu.cpp:814
-#: src/gui/popupmenu.cpp:1734 src/gui/popupmenu.cpp:1762
-#: src/gui/popupmenu.cpp:1818 src/gui/popupmenu.cpp:1861
-#: src/gui/popupmenu.cpp:1896 src/gui/popupmenu.cpp:1936
-#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2023
+#: src/gui/popupmenu.cpp:1737 src/gui/popupmenu.cpp:1765
+#: src/gui/popupmenu.cpp:1821 src/gui/popupmenu.cpp:1864
+#: src/gui/popupmenu.cpp:1899 src/gui/popupmenu.cpp:1939
+#: src/gui/popupmenu.cpp:2006 src/gui/popupmenu.cpp:2026
#: src/gui/quitdialog.cpp:54 src/gui/register.cpp:82 src/gui/setup.cpp:72
#: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:238
#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
@@ -561,7 +562,7 @@ msgstr "Peinado:"
msgid "Race:"
msgstr "Race:"
-#: src/gui/charcreatedialog.cpp:95 src/gui/charselectdialog.cpp:478
+#: src/gui/charcreatedialog.cpp:95 src/gui/charselectdialog.cpp:480
#: src/gui/socialwindow.cpp:1139
msgid "Create"
msgstr "Crear"
@@ -629,26 +630,26 @@ msgstr "Ingrese la contraseña para borrar el personaje"
msgid "Enter password:"
msgstr "Ingrese contraseña:"
-#: src/gui/charselectdialog.cpp:408 src/gui/serverdialog.cpp:298
+#: src/gui/charselectdialog.cpp:410 src/gui/serverdialog.cpp:298
#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:122
#: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:241
msgid "Delete"
msgstr "Borrar"
-#: src/gui/charselectdialog.cpp:466
+#: src/gui/charselectdialog.cpp:468
msgid "Choose"
msgstr "Seleccionar"
-#: src/gui/charselectdialog.cpp:469
+#: src/gui/charselectdialog.cpp:471
#, c-format
msgid "Level %d"
msgstr "Nivel: %d"
-#: src/gui/charselectdialog.cpp:480 src/gui/charselectdialog.cpp:481
+#: src/gui/charselectdialog.cpp:482 src/gui/charselectdialog.cpp:483
msgid "(empty)"
msgstr "(vacío)"
-#: src/gui/chatwindow.cpp:112
+#: src/gui/chatwindow.cpp:112 src/gui/inventorywindow.cpp:70
msgid "default"
msgstr "predeterminado"
@@ -704,11 +705,12 @@ msgstr "arco iris 2"
msgid "rainbow 3"
msgstr "arco iris 3"
-#: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
-#: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
-#: src/gui/setup_theme.cpp:73 src/gui/setup_theme.cpp:127
-#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
-#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
+#: src/gui/chatwindow.cpp:142 src/gui/inventorywindow.cpp:90
+#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78
+#: src/gui/setup_relations.cpp:220 src/gui/setup_theme.cpp:73
+#: src/gui/setup_theme.cpp:127 src/gui/setup_video.cpp:211
+#: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141
+#: src/gui/textcommandeditor.cpp:160
msgid "???"
msgstr "???"
@@ -741,7 +743,7 @@ msgstr "No"
msgid "Ignore"
msgstr "Ignorar"
-#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:97
+#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:99
#: src/gui/setup_other.cpp:64
msgid "Map"
msgstr "Mapa"
@@ -882,7 +884,7 @@ msgid "Did You Know?"
msgstr "¿Sabías que...?"
#: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
-#: src/gui/inventorywindow.cpp:176 src/gui/npcdialog.cpp:53
+#: src/gui/inventorywindow.cpp:206 src/gui/npcdialog.cpp:53
#: src/gui/popupmenu.cpp:588 src/gui/shopwindow.cpp:113
msgid "Close"
msgstr "Cerrar"
@@ -908,10 +910,10 @@ msgstr "OK"
msgid "Equipment"
msgstr "Equipamiento"
-#: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:131
-#: src/gui/inventorywindow.cpp:512 src/gui/inventorywindow.cpp:521
-#: src/gui/popupmenu.cpp:1693 src/gui/popupmenu.cpp:1788
-#: src/gui/popupmenu.cpp:1833
+#: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160
+#: src/gui/inventorywindow.cpp:539 src/gui/inventorywindow.cpp:548
+#: src/gui/popupmenu.cpp:1696 src/gui/popupmenu.cpp:1791
+#: src/gui/popupmenu.cpp:1836
msgid "Unequip"
msgstr "Quitárselo"
@@ -919,80 +921,88 @@ msgstr "Quitárselo"
msgid "Help"
msgstr "Ayuda"
-#: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76
+#: src/gui/inventorywindow.cpp:71
+msgid "by name"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:72
+msgid "by id"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:73
+msgid "by weight"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:74
+msgid "by amount"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:75
+msgid "by type"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:111 src/gui/windowmenu.cpp:76
#: src/inventory.cpp:249
msgid "Inventory"
msgstr "Inventario"
-#: src/gui/inventorywindow.cpp:105
+#: src/gui/inventorywindow.cpp:136
msgid "Slots:"
msgstr "Espacios:"
-#: src/gui/inventorywindow.cpp:116
+#: src/gui/inventorywindow.cpp:148
msgid "Filter:"
msgstr "Filtro:"
-#: src/gui/inventorywindow.cpp:117
+#: src/gui/inventorywindow.cpp:149
msgid "Sort:"
msgstr "Ordenar:"
-#: src/gui/inventorywindow.cpp:123
-msgid "na"
-msgstr "na"
-
-#: src/gui/inventorywindow.cpp:124
-msgid "az"
-msgstr "az"
-
-#: src/gui/inventorywindow.cpp:125
-msgid "id"
-msgstr "id"
-
-#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
-#: src/gui/inventorywindow.cpp:523 src/gui/popupmenu.cpp:1695
-#: src/gui/popupmenu.cpp:1790 src/gui/popupmenu.cpp:1835
+#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:541
+#: src/gui/inventorywindow.cpp:550 src/gui/popupmenu.cpp:1698
+#: src/gui/popupmenu.cpp:1793 src/gui/popupmenu.cpp:1838
msgid "Equip"
msgstr "Equipar"
-#: src/gui/inventorywindow.cpp:130 src/gui/inventorywindow.cpp:515
-#: src/gui/inventorywindow.cpp:519 src/gui/popupmenu.cpp:1698
-#: src/gui/popupmenu.cpp:1757 src/gui/popupmenu.cpp:1794
-#: src/gui/popupmenu.cpp:1838
+#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:542
+#: src/gui/inventorywindow.cpp:546 src/gui/popupmenu.cpp:1701
+#: src/gui/popupmenu.cpp:1760 src/gui/popupmenu.cpp:1797
+#: src/gui/popupmenu.cpp:1841
msgid "Use"
msgstr "Usar"
-#: src/gui/inventorywindow.cpp:144 src/gui/inventorywindow.cpp:620
-#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1799
-#: src/gui/popupmenu.cpp:1842
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:646
+#: src/gui/popupmenu.cpp:1705 src/gui/popupmenu.cpp:1802
+#: src/gui/popupmenu.cpp:1845
msgid "Drop..."
msgstr "Tirar..."
-#: src/gui/inventorywindow.cpp:145 src/gui/popupmenu.cpp:1711
-#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1851
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1714
+#: src/gui/popupmenu.cpp:1811 src/gui/popupmenu.cpp:1854
msgid "Split"
msgstr "Dividir"
-#: src/gui/inventorywindow.cpp:146 src/gui/outfitwindow.cpp:60
+#: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60
#: src/gui/popupmenu.cpp:549
msgid "Outfits"
msgstr "Conjuntos"
-#: src/gui/inventorywindow.cpp:149
+#: src/gui/inventorywindow.cpp:178
msgid "Weight:"
msgstr "Peso:"
-#: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:611
-#: src/gui/popupmenu.cpp:1674 src/gui/popupmenu.cpp:1811
-#: src/gui/popupmenu.cpp:1854 src/gui/setup.cpp:73
+#: src/gui/inventorywindow.cpp:204 src/gui/inventorywindow.cpp:637
+#: src/gui/popupmenu.cpp:1677 src/gui/popupmenu.cpp:1814
+#: src/gui/popupmenu.cpp:1857 src/gui/setup.cpp:73
msgid "Store"
msgstr "Almacenar"
-#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1718
+#: src/gui/inventorywindow.cpp:205 src/gui/popupmenu.cpp:1721
msgid "Retrieve"
msgstr "Recuperar"
-#: src/gui/inventorywindow.cpp:622 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1847
+#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1710
+#: src/gui/popupmenu.cpp:1807 src/gui/popupmenu.cpp:1850
#: src/gui/windowmenu.cpp:97
msgid "Drop"
msgstr "Tirar"
@@ -1046,91 +1056,91 @@ msgstr "Peso: %s"
msgid "Kill stats"
msgstr "Estadísticas"
-#: src/gui/killstats.cpp:65
+#: src/gui/killstats.cpp:66
msgid "Reset stats"
msgstr "Restablecer estadísticas"
-#: src/gui/killstats.cpp:66
+#: src/gui/killstats.cpp:67
msgid "Reset timer"
msgstr "Restablecer cronometrador"
-#: src/gui/killstats.cpp:70 src/gui/killstats.cpp:206
+#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:207
#, c-format
msgid "Level: %d at %f%%"
msgstr "Nivel: %d de %f%%"
-#: src/gui/killstats.cpp:74 src/gui/killstats.cpp:211
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:212
#, c-format
msgid "Exp: %d/%d Left: %d"
msgstr "Exp: %d/%d Queda: %d"
-#: src/gui/killstats.cpp:77 src/gui/killstats.cpp:217
-#: src/gui/killstats.cpp:226
+#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:218
+#: src/gui/killstats.cpp:227
#, c-format
msgid "1%% = %d exp, avg mob for 1%%: %s"
msgstr "1%% = %d exp, prom. pandilla para 1%%: %s"
-#: src/gui/killstats.cpp:80 src/gui/killstats.cpp:143
-#: src/gui/killstats.cpp:235
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:236
#, c-format
msgid "Kills: %s, total exp: %s"
msgstr "Muertes: %s, exp. total: %s"
-#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145
-#: src/gui/killstats.cpp:221 src/gui/killstats.cpp:231
+#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:146
+#: src/gui/killstats.cpp:222 src/gui/killstats.cpp:232
#, c-format
msgid "Avg Exp: %s, No. of avg mob to next level: %s"
msgstr "Prom. Exp: %s, Prom. de pandilla para siguiente nivel: %s"
-#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:163
-#: src/gui/killstats.cpp:238
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:164
+#: src/gui/killstats.cpp:239
#, c-format
msgid "Kills/Min: %s, Exp/Min: %s"
msgstr "Matanza/Mín: %s, Exp/Mín: %s"
-#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:90 src/gui/killstats.cpp:95
-#: src/gui/killstats.cpp:290 src/gui/killstats.cpp:306
-#: src/gui/killstats.cpp:324
+#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
+#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
+#: src/gui/killstats.cpp:325
#, c-format
msgid "Exp speed per %d min: %s"
msgid_plural "Exp speed per %d min: %s"
msgstr[0] "Rapidez de experiencia por %d minuto: %s"
msgstr[1] "Rapidez de experiencia por %d minutos: %s"
-#: src/gui/killstats.cpp:88 src/gui/killstats.cpp:93 src/gui/killstats.cpp:98
+#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:94 src/gui/killstats.cpp:99
#, c-format
msgid "Time for next level per %d min: %s"
msgid_plural "Time for next level per %d min: %s"
msgstr[0] "Tiempo para el siguiente nivel por %d minuto: %s"
msgstr[1] "Tiempo para el siguiente nivel por %d minutos: %s"
-#: src/gui/killstats.cpp:101 src/gui/killstats.cpp:242
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
msgid "Last kill exp:"
msgstr "Exp de último monstruo eliminado:"
-#: src/gui/killstats.cpp:103 src/gui/killstats.cpp:356
-#: src/gui/killstats.cpp:362 src/gui/killstats.cpp:368
-#: src/gui/killstats.cpp:373
+#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
+#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:374
msgid "Time before jacko spawn:"
msgstr "Tiempo antes de que jacko desove:"
-#: src/gui/killstats.cpp:295 src/gui/killstats.cpp:302
-#: src/gui/killstats.cpp:312 src/gui/killstats.cpp:319
-#: src/gui/killstats.cpp:331 src/gui/killstats.cpp:338
+#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
+#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
+#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
#, c-format
msgid " Time for next level: %s"
msgstr " Tiempo para el siguiente nivel: %s"
-#: src/gui/killstats.cpp:362
+#: src/gui/killstats.cpp:363
#, c-format
msgid "%s %d?"
msgstr "¿%s %d?"
-#: src/gui/killstats.cpp:368
+#: src/gui/killstats.cpp:369
msgid "jacko spawning"
msgstr "desove de jacko"
-#: src/guildmanager.cpp:464 src/net/ea/guildhandler.cpp:439
+#: src/guildmanager.cpp:484 src/net/ea/guildhandler.cpp:439
msgid "You have left the guild."
msgstr "Has dejado el gremio."
@@ -1228,7 +1238,7 @@ msgid "Submit"
msgstr "Enviar"
#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:142
+#: src/gui/setup_other.cpp:151
msgid "NPC"
msgstr "NPC"
@@ -1316,7 +1326,7 @@ msgstr "Des-ignorar"
#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:185
#: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:428
#: src/gui/popupmenu.cpp:677 src/gui/popupmenu.cpp:693
-#: src/playerrelations.cpp:400
+#: src/playerrelations.cpp:415
msgid "Completely ignore"
msgstr "Ignorar completamente"
@@ -1367,7 +1377,7 @@ msgid "Show Items"
msgstr "Mostrar artículos"
#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:705
-#: src/gui/popupmenu.cpp:2020
+#: src/gui/popupmenu.cpp:2023
msgid "Undress"
msgstr "Desvestir"
@@ -1415,8 +1425,8 @@ msgstr "Agregar nombre al chat"
msgid "Pick up"
msgstr "Recoger"
-#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:1732
-#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1855
+#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:1735
+#: src/gui/popupmenu.cpp:1815 src/gui/popupmenu.cpp:1858
msgid "Add to chat"
msgstr "Añadir al chat"
@@ -1428,8 +1438,8 @@ msgstr "Mapa Objeto"
msgid "Rename"
msgstr "Renombrar"
-#: src/gui/popupmenu.cpp:532 src/gui/popupmenu.cpp:1973
-#: src/gui/popupmenu.cpp:1991 src/gui/popupmenu.cpp:1996
+#: src/gui/popupmenu.cpp:532 src/gui/popupmenu.cpp:1976
+#: src/gui/popupmenu.cpp:1994 src/gui/popupmenu.cpp:1999
msgid "Remove"
msgstr "Quitar"
@@ -1505,85 +1515,85 @@ msgstr "Comentario del jugador "
msgid "Comment: "
msgstr "Comentario: "
-#: src/gui/popupmenu.cpp:1657
+#: src/gui/popupmenu.cpp:1660
msgid "Add to trade"
msgstr "Agredar al intercambio"
-#: src/gui/popupmenu.cpp:1663
+#: src/gui/popupmenu.cpp:1666
msgid "Add to trade 10"
msgstr "Agregar 10 al intercambio"
-#: src/gui/popupmenu.cpp:1666
+#: src/gui/popupmenu.cpp:1669
msgid "Add to trade half"
msgstr "Agregar la mitad al intercambio"
-#: src/gui/popupmenu.cpp:1668
+#: src/gui/popupmenu.cpp:1671
msgid "Add to trade all"
msgstr "Agregar todo al intercambio"
-#: src/gui/popupmenu.cpp:1680
+#: src/gui/popupmenu.cpp:1683
msgid "Store 10"
msgstr "Almacenar 10"
-#: src/gui/popupmenu.cpp:1683
+#: src/gui/popupmenu.cpp:1686
msgid "Store half"
msgstr "Almacenar la mitad"
-#: src/gui/popupmenu.cpp:1685
+#: src/gui/popupmenu.cpp:1688
msgid "Store all"
msgstr "Almacenar todo"
-#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1800
-#: src/gui/popupmenu.cpp:1843
+#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1803
+#: src/gui/popupmenu.cpp:1846
msgid "Drop all"
msgstr "Tirar todo"
-#: src/gui/popupmenu.cpp:1724
+#: src/gui/popupmenu.cpp:1727
msgid "Retrieve 10"
msgstr "Recuperar 10"
-#: src/gui/popupmenu.cpp:1727
+#: src/gui/popupmenu.cpp:1730
msgid "Retrieve half"
msgstr "Recuperar la mitad"
-#: src/gui/popupmenu.cpp:1729
+#: src/gui/popupmenu.cpp:1732
msgid "Retrieve all"
msgstr "Recuperar todo"
-#: src/gui/popupmenu.cpp:1760 src/gui/popupmenu.cpp:1816
+#: src/gui/popupmenu.cpp:1763 src/gui/popupmenu.cpp:1819
msgid "Load old item shortcuts"
msgstr "Cargar atajos antiguos de artículos"
-#: src/gui/popupmenu.cpp:1859
+#: src/gui/popupmenu.cpp:1862
msgid "Load old drop shortcuts"
msgstr "Cargar atajos antiguos de soltar (drop)"
-#: src/gui/popupmenu.cpp:1885 src/gui/popupmenu.cpp:1920
+#: src/gui/popupmenu.cpp:1888 src/gui/popupmenu.cpp:1923
msgid "Hide"
msgstr "Ocultar"
-#: src/gui/popupmenu.cpp:1891 src/gui/popupmenu.cpp:1926
+#: src/gui/popupmenu.cpp:1894 src/gui/popupmenu.cpp:1929
msgid "Show"
msgstr "Mostrar"
-#: src/gui/popupmenu.cpp:1933
+#: src/gui/popupmenu.cpp:1936
msgid "Reset yellow bar"
msgstr "Restablecer barra amarilla"
-#: src/gui/popupmenu.cpp:1935 src/gui/statuswindow.cpp:241
+#: src/gui/popupmenu.cpp:1938 src/gui/statuswindow.cpp:241
msgid "Copy to chat"
msgstr "Copiar al chat"
-#: src/gui/popupmenu.cpp:1953 src/gui/socialwindow.cpp:958
+#: src/gui/popupmenu.cpp:1956 src/gui/socialwindow.cpp:958
#: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028
msgid "(default)"
msgstr "(predeterminado)"
-#: src/gui/popupmenu.cpp:1965 src/gui/popupmenu.cpp:1983
+#: src/gui/popupmenu.cpp:1968 src/gui/popupmenu.cpp:1986
msgid "Move up"
msgstr "Subir"
-#: src/gui/popupmenu.cpp:1970 src/gui/popupmenu.cpp:1988
+#: src/gui/popupmenu.cpp:1973 src/gui/popupmenu.cpp:1991
msgid "Move down"
msgstr "Bajar"
@@ -1831,7 +1841,7 @@ msgstr "Tiempo"
msgid "Use local time"
msgstr "Usar hora local"
-#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:157
+#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:166
msgid "Other"
msgstr "Otro"
@@ -1994,115 +2004,127 @@ msgstr "Dibujar trayectoria"
msgid "Draw hotkeys on map"
msgstr "Dibujar teclas de acceso rápido en el mapa"
-#: src/gui/setup_other.cpp:88
+#: src/gui/setup_other.cpp:87
+msgid "Enable lazy scrolling"
+msgstr ""
+
+#: src/gui/setup_other.cpp:90
+msgid "Scroll laziness"
+msgstr ""
+
+#: src/gui/setup_other.cpp:93
+msgid "Scroll radius"
+msgstr ""
+
+#: src/gui/setup_other.cpp:97
msgid "Moving"
msgstr "En movimiento"
-#: src/gui/setup_other.cpp:90
+#: src/gui/setup_other.cpp:99
msgid "Auto fix position"
msgstr "Corrección automatica de la posición"
-#: src/gui/setup_other.cpp:93
+#: src/gui/setup_other.cpp:102
msgid "Attack while moving"
msgstr "Atacar mientras está en movimiento"
-#: src/gui/setup_other.cpp:96
+#: src/gui/setup_other.cpp:105
msgid "Sync player move"
msgstr "Sincronización de movimiento de jugador"
-#: src/gui/setup_other.cpp:99
+#: src/gui/setup_other.cpp:108
msgid "Crazy move A program"
msgstr "Programa de movimientos locos A"
-#: src/gui/setup_other.cpp:103
+#: src/gui/setup_other.cpp:112
msgid "Player"
msgstr "Jugador"
-#: src/gui/setup_other.cpp:105
+#: src/gui/setup_other.cpp:114
msgid "Show own hp bar"
msgstr "Mostrar barra de energía propia"
-#: src/gui/setup_other.cpp:108
+#: src/gui/setup_other.cpp:117
msgid "Enable quick stats"
msgstr "Habilitar estadísticas rápidas"
-#: src/gui/setup_other.cpp:111
+#: src/gui/setup_other.cpp:120
msgid "Cycle player targets"
msgstr "Apuntar a los jugadores en derredor, no necesariamente al más cercano"
-#: src/gui/setup_other.cpp:114
+#: src/gui/setup_other.cpp:123
msgid "Show job exp messages"
msgstr "Mostrar los mensajes de experiencia de trabajo"
-#: src/gui/setup_other.cpp:117
+#: src/gui/setup_other.cpp:126
msgid "Show players popups"
msgstr "Mostrar las ventanas emergentes de jugadores"
-#: src/gui/setup_other.cpp:120
+#: src/gui/setup_other.cpp:129
msgid "Afk message"
msgstr "Mensaje afk"
-#: src/gui/setup_other.cpp:123
+#: src/gui/setup_other.cpp:132
msgid "Show job"
msgstr "Mostrar trabajo"
-#: src/gui/setup_other.cpp:126
+#: src/gui/setup_other.cpp:135
msgid "Enable attack filter"
msgstr "Habilitar filtro de ataque"
-#: src/gui/setup_other.cpp:129
+#: src/gui/setup_other.cpp:138
msgid "Enable advert protocol"
msgstr "Habilitar el protocolo de anuncio"
-#: src/gui/setup_other.cpp:135
+#: src/gui/setup_other.cpp:144
msgid "Accept sell/buy requests"
msgstr "Aceptar solicitudes de compra / venta"
-#: src/gui/setup_other.cpp:138
+#: src/gui/setup_other.cpp:147
msgid "Enable shop mode"
msgstr "Habilitar la tienda"
-#: src/gui/setup_other.cpp:144
+#: src/gui/setup_other.cpp:153
msgid "Log NPC dialogue"
msgstr "Registro de diálogo de NPC"
-#: src/gui/setup_other.cpp:148
+#: src/gui/setup_other.cpp:157
msgid "Bots support"
msgstr "Soporte de bots"
-#: src/gui/setup_other.cpp:150
+#: src/gui/setup_other.cpp:159
msgid "Enable auction bot support"
msgstr "Habilitar soporte para auction bot"
-#: src/gui/setup_other.cpp:153
+#: src/gui/setup_other.cpp:162
msgid "Enable guild bot support and disable native guild support"
msgstr "Habilitar soporte de bot clan y deshabilitar soporte de clan nativo"
-#: src/gui/setup_other.cpp:159
+#: src/gui/setup_other.cpp:168
msgid "Enable server side attack"
msgstr "Habilitar los ataques colaterales de servidor"
-#: src/gui/setup_other.cpp:162
+#: src/gui/setup_other.cpp:171
msgid "Enable bot checker"
msgstr "Habilitar el control de robot"
-#: src/gui/setup_other.cpp:165
+#: src/gui/setup_other.cpp:174
msgid "Enable buggy servers protection"
msgstr "Habilitar la proteción contra servidores defectuosos"
-#: src/gui/setup_other.cpp:168
+#: src/gui/setup_other.cpp:177
msgid "Enable debug log"
msgstr "Habilitar registro de depuración"
-#: src/gui/setup_other.cpp:171
+#: src/gui/setup_other.cpp:180
msgid "Low traffic mode"
msgstr "Modo de bajo tráfico"
-#: src/gui/setup_other.cpp:174
+#: src/gui/setup_other.cpp:183
msgid "Hide shield sprite"
msgstr "Ocultar los objetos escudos"
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:186
msgid "Show background"
msgstr "Mostrar fondo"
@@ -2119,29 +2141,29 @@ msgid "Auto adjust perfomance"
msgstr "Ajustar rendimiento automáticamente"
#: src/gui/setup_perfomance.cpp:61
-msgid "Show beings transparency"
-msgstr "Mostrar transparencia de criaturas"
-
-#: src/gui/setup_perfomance.cpp:64
msgid "Hw acceleration"
msgstr "Aceleración de hardware"
-#: src/gui/setup_perfomance.cpp:67
+#: src/gui/setup_perfomance.cpp:64
msgid "Enable opacity cache (Software, can use many memory)"
msgstr "Habilitar caché de opacidad (Software, puede usar mucha memoria)"
-#: src/gui/setup_perfomance.cpp:70
+#: src/gui/setup_perfomance.cpp:67
msgid "Enable map reduce (Software)"
msgstr "Habilitar reducción de mapa (Software)"
-#: src/gui/setup_perfomance.cpp:73
+#: src/gui/setup_perfomance.cpp:70
msgid "Better quality (disable for better perfomance)"
msgstr "Mejor calidad (desabilitar para un mejor desmpeño)"
-#: src/gui/setup_perfomance.cpp:76
+#: src/gui/setup_perfomance.cpp:73
msgid "Enable alpha channel fix (Software, can be very slow)"
msgstr "Habilitar corrección de canal alfa (Software, puede ser muy lento)"
+#: src/gui/setup_perfomance.cpp:77
+msgid "Show beings transparency"
+msgstr "Mostrar transparencia de criaturas"
+
#: src/gui/setup_perfomance.cpp:80
msgid "Enable reorder sprites."
msgstr "Habilitar re ordenamiento de sprites."
@@ -2394,7 +2416,7 @@ msgid "FPS limit:"
msgstr "Límite FPS:"
#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
-#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709
+#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:710
msgid "Alt FPS limit: "
msgstr "Límite FPS alternativo: "
@@ -2420,7 +2442,7 @@ msgstr "Detalle de partículas"
#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
-#: src/gui/setup_video.cpp:707
+#: src/gui/setup_video.cpp:708
msgid "None"
msgstr "Nada"
@@ -2529,22 +2551,22 @@ msgstr "Incrementar"
msgid "Skill points available: %d"
msgstr "Puntos de habilidades: %d"
-#: src/gui/skilldialog.cpp:418
+#: src/gui/skilldialog.cpp:420
#, c-format
msgid "Skill Set %d"
msgstr "Habilidades %d"
-#: src/gui/skilldialog.cpp:430
+#: src/gui/skilldialog.cpp:432
#, c-format
msgid "Skill %d"
msgstr "Habilidad %d"
-#: src/gui/skilldialog.cpp:497 src/gui/skilldialog.cpp:550
+#: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554
#, c-format
msgid "Lvl: %d"
msgstr "Nivel: %d"
-#: src/gui/skilldialog.cpp:542
+#: src/gui/skilldialog.cpp:546
#, c-format
msgid "Lvl: %d (%+d)"
msgstr "Nivel: %d (%+d)"
@@ -3469,23 +3491,23 @@ msgstr "Limites de Lugar de Inicio"
msgid "Road Point"
msgstr "Mostrar camino"
-#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:472
+#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:474
msgid "Who Is Online - Updating"
msgstr "Quién está conectado - Actualizando"
-#: src/gui/whoisonline.cpp:102
+#: src/gui/whoisonline.cpp:104
msgid "Update"
msgstr "Actualizar"
-#: src/gui/whoisonline.cpp:295
+#: src/gui/whoisonline.cpp:297
msgid "Who Is Online - "
msgstr "Quienes están conectados - "
-#: src/gui/whoisonline.cpp:486
+#: src/gui/whoisonline.cpp:488
msgid "Who Is Online - error"
msgstr "Quienes están conectados - error"
-#: src/gui/whoisonline.cpp:517
+#: src/gui/whoisonline.cpp:519
msgid "Who Is Online - Update"
msgstr "Quienes están conectados - Actualizar"
@@ -4159,68 +4181,68 @@ msgstr ""
"Conflito con las teclas \"%s\" e \"%s\" . Resuelva el conflicto, o el juego "
"puede presentar un comportamiento raro."
-#: src/localplayer.cpp:370
+#: src/localplayer.cpp:372
msgid "You were killed by "
msgstr "Fuiste eliminado por "
-#: src/localplayer.cpp:1401
+#: src/localplayer.cpp:1413
msgid "Tried to pick up nonexistent item."
msgstr "Intentaste recoger un objeto inexistante."
-#: src/localplayer.cpp:1403
+#: src/localplayer.cpp:1415
msgid "Item is too heavy."
msgstr "El artículo es muy pesado."
-#: src/localplayer.cpp:1405
+#: src/localplayer.cpp:1417
msgid "Item is too far away."
msgstr "El artículo está muy lejos."
-#: src/localplayer.cpp:1407
+#: src/localplayer.cpp:1419
msgid "Inventory is full."
msgstr "El inventario está lleno."
-#: src/localplayer.cpp:1409
+#: src/localplayer.cpp:1421
msgid "Stack is too big."
msgstr "El agrupamiento es demasiado grande."
-#: src/localplayer.cpp:1412
+#: src/localplayer.cpp:1424
msgid "Item belongs to someone else."
msgstr "El artículo pertenece a alguien más."
-#: src/localplayer.cpp:1415
+#: src/localplayer.cpp:1427
msgid "Unknown problem picking up item."
msgstr "Problema desconocido al intentar recoger el artículo."
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1439
+#: src/localplayer.cpp:1451
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
msgstr[0] "Usted cogió un/a %d [@@%d|%s@@]."
msgstr[1] "Usted Cogió %d [@@%d|%s@@]."
-#: src/localplayer.cpp:3173
+#: src/localplayer.cpp:3187
msgid "Away"
msgstr "Fuera del Teclado"
-#: src/localplayer.cpp:3474
+#: src/localplayer.cpp:3488
msgid "Follow: "
msgstr "Seguir: "
-#: src/localplayer.cpp:3476 src/localplayer.cpp:3491
+#: src/localplayer.cpp:3490 src/localplayer.cpp:3505
msgid "Follow canceled"
msgstr "Seguir cancelado"
-#: src/localplayer.cpp:3483
+#: src/localplayer.cpp:3497
msgid "Imitation: "
msgstr "Imitacion: "
-#: src/localplayer.cpp:3485 src/localplayer.cpp:3493
+#: src/localplayer.cpp:3499 src/localplayer.cpp:3507
msgid "Imitation canceled"
msgstr "Imitación cancelada"
-#: src/localplayer.cpp:3845
+#: src/localplayer.cpp:3859
msgid "You see "
msgstr "Ves "
@@ -4421,16 +4443,16 @@ msgstr "Jugador VIP."
msgid "MVP player: "
msgstr "Jugador MVP: "
-#: src/net/ea/gamehandler.cpp:86
+#: src/net/ea/gamehandler.cpp:87
#, c-format
msgid "Online users: %d"
msgstr "Jugadores online: %d"
-#: src/net/ea/gamehandler.cpp:98
+#: src/net/ea/gamehandler.cpp:99
msgid "Game"
msgstr "Juego"
-#: src/net/ea/gamehandler.cpp:98
+#: src/net/ea/gamehandler.cpp:99
msgid "Request to quit denied!"
msgstr "Petición de salida denegada!"
@@ -5496,19 +5518,19 @@ msgstr "Conexión al servidor terminada."
msgid "%s is not in your party!"
msgstr "%s no está en tu grupo!"
-#: src/playerrelations.cpp:414
+#: src/playerrelations.cpp:429
msgid "Print '...'"
msgstr "Imprimir '...'"
-#: src/playerrelations.cpp:434
+#: src/playerrelations.cpp:449
msgid "Blink name"
msgstr "Parpadear nombre"
-#: src/playerrelations.cpp:478
+#: src/playerrelations.cpp:493
msgid "Floating '...' bubble"
msgstr "Burbuja '...' flotante"
-#: src/playerrelations.cpp:481
+#: src/playerrelations.cpp:496
msgid "Floating bubble"
msgstr "Burbuja Flotante"
diff --git a/po/fi.po b/po/fi.po
index c7586f8c4..78f41e550 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -2,14 +2,15 @@
# Copyright (C) YEAR The ManaPlus Developers
# This file is distributed under the same license as the PACKAGE package.
#
-# Sini Ruohomaa <sini.ruohomaa@iki.fi>, 2011.
+# Translators:
# Andrei Karas <akaras@inbox.ru>, 2011.
+# Sini Ruohomaa <sini.ruohomaa@iki.fi>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-09-02 18:27+0300\n"
-"PO-Revision-Date: 2011-09-02 15:29+0000\n"
+"POT-Creation-Date: 2011-09-10 01:34+0300\n"
+"PO-Revision-Date: 2011-09-09 22:37+0000\n"
"Last-Translator: akaras <akaras@inbox.ru>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: fi\n"
@@ -18,25 +19,25 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-#: src/actorspritemanager.cpp:1034
+#: src/actorspritemanager.cpp:1046
msgid "Visible on map"
msgstr "Näkyvillä kartalla"
-#: src/being.cpp:549
+#: src/being.cpp:551
msgid "dodge"
msgstr "väistö"
-#: src/being.cpp:549
+#: src/being.cpp:551
msgid "miss"
msgstr "huti"
#. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1529
+#: src/being.cpp:1532
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1534
+#: src/being.cpp:1537
msgid "I"
msgstr ""
@@ -106,22 +107,22 @@ msgstr "Tietojen poisto onnistui"
msgid "Farewell, come back any time..."
msgstr "Näkemisiin, tule pian takaisin..."
-#: src/client.cpp:1428 src/client.cpp:1458 src/client.cpp:1502
-#: src/client.cpp:1927 src/client.cpp:1934
+#: src/client.cpp:1428 src/client.cpp:1458 src/client.cpp:1504
+#: src/client.cpp:1929 src/client.cpp:1936
#, 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:1633
+#: src/client.cpp:1635
#, c-format
msgid "Invalid update host: %s"
msgstr "Epäkelpo päivitysosoite: %s"
-#: src/client.cpp:1667 src/client.cpp:1673
+#: src/client.cpp:1669 src/client.cpp:1675
msgid "Error creating updates directory!"
msgstr "Päivityshakemistoa luodessa tapahtui virhe!"
-#: src/client.cpp:1694
+#: src/client.cpp:1696
#, 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."
@@ -323,19 +324,19 @@ msgstr "Yhteys palvelimeen katkesi."
msgid "Network Error"
msgstr "Verkkovirhe"
-#: src/game.cpp:1236
+#: src/game.cpp:1243
msgid "Ignoring incoming trade requests"
msgstr "Et huomioi kaupankäyntipyyntöjä"
-#: src/game.cpp:1243
+#: src/game.cpp:1250
msgid "Accepting incoming trade requests"
msgstr "Hyväksyt kaupankäyntipyynnöt"
-#: src/game.cpp:1629
+#: src/game.cpp:1636
msgid "Could Not Load Map"
msgstr "Kartan lataaminen epäonnistui"
-#: src/game.cpp:1630
+#: src/game.cpp:1637
#, c-format
msgid "Error while loading %s"
msgstr "Kohdetta %s ladattaessa tapahtui virhe."
@@ -364,31 +365,31 @@ msgstr ""
msgid "Bot Checker"
msgstr "Bottitutka"
-#: src/gui/botcheckerwindow.cpp:295 src/gui/setup_relations.cpp:64
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
msgid "Name"
msgstr "Nimi"
-#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:133
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:133
#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:646
#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:265
msgid "Attack"
msgstr "Hyökkää"
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:297
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297
#: src/keyboardconfig.cpp:62
msgid "Talk"
msgstr "Keskustele"
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:263
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:263
#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:703
msgid "Move"
msgstr "Liiku"
-#: src/gui/botcheckerwindow.cpp:299
+#: src/gui/botcheckerwindow.cpp:300
msgid "Result"
msgstr "Tulos"
-#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:124
+#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:124
msgid "Reset"
msgstr "Nollaa"
@@ -434,7 +435,7 @@ msgid "Max"
msgstr "Max"
#: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:147 src/gui/setup_other.cpp:133
+#: src/gui/inventorywindow.cpp:176 src/gui/setup_other.cpp:142
msgid "Shop"
msgstr "Kauppa"
@@ -453,10 +454,10 @@ msgstr "Myy"
#: src/gui/popupmenu.cpp:516 src/gui/popupmenu.cpp:540
#: src/gui/popupmenu.cpp:554 src/gui/popupmenu.cpp:573
#: src/gui/popupmenu.cpp:790 src/gui/popupmenu.cpp:814
-#: src/gui/popupmenu.cpp:1734 src/gui/popupmenu.cpp:1762
-#: src/gui/popupmenu.cpp:1818 src/gui/popupmenu.cpp:1861
-#: src/gui/popupmenu.cpp:1896 src/gui/popupmenu.cpp:1936
-#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2023
+#: src/gui/popupmenu.cpp:1737 src/gui/popupmenu.cpp:1765
+#: src/gui/popupmenu.cpp:1821 src/gui/popupmenu.cpp:1864
+#: src/gui/popupmenu.cpp:1899 src/gui/popupmenu.cpp:1939
+#: src/gui/popupmenu.cpp:2006 src/gui/popupmenu.cpp:2026
#: src/gui/quitdialog.cpp:54 src/gui/register.cpp:82 src/gui/setup.cpp:72
#: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:238
#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
@@ -558,7 +559,7 @@ msgstr "Hiustyyli:"
msgid "Race:"
msgstr "Rotu: "
-#: src/gui/charcreatedialog.cpp:95 src/gui/charselectdialog.cpp:478
+#: src/gui/charcreatedialog.cpp:95 src/gui/charselectdialog.cpp:480
#: src/gui/socialwindow.cpp:1139
msgid "Create"
msgstr "Luo"
@@ -626,26 +627,26 @@ msgstr "Anna salasana hahmon poistamiseksi"
msgid "Enter password:"
msgstr "Salasana:"
-#: src/gui/charselectdialog.cpp:408 src/gui/serverdialog.cpp:298
+#: src/gui/charselectdialog.cpp:410 src/gui/serverdialog.cpp:298
#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:122
#: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:241
msgid "Delete"
msgstr "Poista"
-#: src/gui/charselectdialog.cpp:466
+#: src/gui/charselectdialog.cpp:468
msgid "Choose"
msgstr "Valitse"
-#: src/gui/charselectdialog.cpp:469
+#: src/gui/charselectdialog.cpp:471
#, c-format
msgid "Level %d"
msgstr "Taso %d"
-#: src/gui/charselectdialog.cpp:480 src/gui/charselectdialog.cpp:481
+#: src/gui/charselectdialog.cpp:482 src/gui/charselectdialog.cpp:483
msgid "(empty)"
msgstr "(tyhjä)"
-#: src/gui/chatwindow.cpp:112
+#: src/gui/chatwindow.cpp:112 src/gui/inventorywindow.cpp:70
msgid "default"
msgstr "oletus"
@@ -701,11 +702,12 @@ msgstr "sateenkaari 2"
msgid "rainbow 3"
msgstr "sateenkaari 3"
-#: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
-#: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
-#: src/gui/setup_theme.cpp:73 src/gui/setup_theme.cpp:127
-#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
-#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
+#: src/gui/chatwindow.cpp:142 src/gui/inventorywindow.cpp:90
+#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78
+#: src/gui/setup_relations.cpp:220 src/gui/setup_theme.cpp:73
+#: src/gui/setup_theme.cpp:127 src/gui/setup_video.cpp:211
+#: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141
+#: src/gui/textcommandeditor.cpp:160
msgid "???"
msgstr "???"
@@ -738,7 +740,7 @@ msgstr "Ei"
msgid "Ignore"
msgstr "Ohita"
-#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:97
+#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:99
#: src/gui/setup_other.cpp:64
msgid "Map"
msgstr "Kartta"
@@ -879,7 +881,7 @@ msgid "Did You Know?"
msgstr ""
#: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
-#: src/gui/inventorywindow.cpp:176 src/gui/npcdialog.cpp:53
+#: src/gui/inventorywindow.cpp:206 src/gui/npcdialog.cpp:53
#: src/gui/popupmenu.cpp:588 src/gui/shopwindow.cpp:113
msgid "Close"
msgstr "Sulje"
@@ -905,10 +907,10 @@ msgstr "Ok"
msgid "Equipment"
msgstr "Varusteet"
-#: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:131
-#: src/gui/inventorywindow.cpp:512 src/gui/inventorywindow.cpp:521
-#: src/gui/popupmenu.cpp:1693 src/gui/popupmenu.cpp:1788
-#: src/gui/popupmenu.cpp:1833
+#: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160
+#: src/gui/inventorywindow.cpp:539 src/gui/inventorywindow.cpp:548
+#: src/gui/popupmenu.cpp:1696 src/gui/popupmenu.cpp:1791
+#: src/gui/popupmenu.cpp:1836
msgid "Unequip"
msgstr "Poista varuste käytöstä"
@@ -916,80 +918,88 @@ msgstr "Poista varuste käytöstä"
msgid "Help"
msgstr "Apua"
-#: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76
+#: src/gui/inventorywindow.cpp:71
+msgid "by name"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:72
+msgid "by id"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:73
+msgid "by weight"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:74
+msgid "by amount"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:75
+msgid "by type"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:111 src/gui/windowmenu.cpp:76
#: src/inventory.cpp:249
msgid "Inventory"
msgstr "Tavarat"
-#: src/gui/inventorywindow.cpp:105
+#: src/gui/inventorywindow.cpp:136
msgid "Slots:"
msgstr "Paikkoja:"
-#: src/gui/inventorywindow.cpp:116
+#: src/gui/inventorywindow.cpp:148
msgid "Filter:"
msgstr "Suodin:"
-#: src/gui/inventorywindow.cpp:117
+#: src/gui/inventorywindow.cpp:149
msgid "Sort:"
msgstr "Järj.:"
-#: src/gui/inventorywindow.cpp:123
-msgid "na"
-msgstr "-"
-
-#: src/gui/inventorywindow.cpp:124
-msgid "az"
-msgstr "A"
-
-#: src/gui/inventorywindow.cpp:125
-msgid "id"
-msgstr "#"
-
-#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
-#: src/gui/inventorywindow.cpp:523 src/gui/popupmenu.cpp:1695
-#: src/gui/popupmenu.cpp:1790 src/gui/popupmenu.cpp:1835
+#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:541
+#: src/gui/inventorywindow.cpp:550 src/gui/popupmenu.cpp:1698
+#: src/gui/popupmenu.cpp:1793 src/gui/popupmenu.cpp:1838
msgid "Equip"
msgstr "Ota käyttöön"
-#: src/gui/inventorywindow.cpp:130 src/gui/inventorywindow.cpp:515
-#: src/gui/inventorywindow.cpp:519 src/gui/popupmenu.cpp:1698
-#: src/gui/popupmenu.cpp:1757 src/gui/popupmenu.cpp:1794
-#: src/gui/popupmenu.cpp:1838
+#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:542
+#: src/gui/inventorywindow.cpp:546 src/gui/popupmenu.cpp:1701
+#: src/gui/popupmenu.cpp:1760 src/gui/popupmenu.cpp:1797
+#: src/gui/popupmenu.cpp:1841
msgid "Use"
msgstr "Käytä"
-#: src/gui/inventorywindow.cpp:144 src/gui/inventorywindow.cpp:620
-#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1799
-#: src/gui/popupmenu.cpp:1842
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:646
+#: src/gui/popupmenu.cpp:1705 src/gui/popupmenu.cpp:1802
+#: src/gui/popupmenu.cpp:1845
msgid "Drop..."
msgstr "Pudota..."
-#: src/gui/inventorywindow.cpp:145 src/gui/popupmenu.cpp:1711
-#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1851
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1714
+#: src/gui/popupmenu.cpp:1811 src/gui/popupmenu.cpp:1854
msgid "Split"
msgstr "Jaa"
-#: src/gui/inventorywindow.cpp:146 src/gui/outfitwindow.cpp:60
+#: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60
#: src/gui/popupmenu.cpp:549
msgid "Outfits"
msgstr "Asukokonaisuudet"
-#: src/gui/inventorywindow.cpp:149
+#: src/gui/inventorywindow.cpp:178
msgid "Weight:"
msgstr "Paino:"
-#: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:611
-#: src/gui/popupmenu.cpp:1674 src/gui/popupmenu.cpp:1811
-#: src/gui/popupmenu.cpp:1854 src/gui/setup.cpp:73
+#: src/gui/inventorywindow.cpp:204 src/gui/inventorywindow.cpp:637
+#: src/gui/popupmenu.cpp:1677 src/gui/popupmenu.cpp:1814
+#: src/gui/popupmenu.cpp:1857 src/gui/setup.cpp:73
msgid "Store"
msgstr "Varastoi"
-#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1718
+#: src/gui/inventorywindow.cpp:205 src/gui/popupmenu.cpp:1721
msgid "Retrieve"
msgstr "Ota"
-#: src/gui/inventorywindow.cpp:622 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1847
+#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1710
+#: src/gui/popupmenu.cpp:1807 src/gui/popupmenu.cpp:1850
#: src/gui/windowmenu.cpp:97
msgid "Drop"
msgstr "Pudota"
@@ -1043,91 +1053,91 @@ msgstr "Paino: %s"
msgid "Kill stats"
msgstr "Tappotilastot"
-#: src/gui/killstats.cpp:65
+#: src/gui/killstats.cpp:66
msgid "Reset stats"
msgstr "Nollaa tiedot"
-#: src/gui/killstats.cpp:66
+#: src/gui/killstats.cpp:67
msgid "Reset timer"
msgstr "Nollaa ajastin"
-#: src/gui/killstats.cpp:70 src/gui/killstats.cpp:206
+#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:207
#, c-format
msgid "Level: %d at %f%%"
msgstr ""
-#: src/gui/killstats.cpp:74 src/gui/killstats.cpp:211
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:212
#, c-format
msgid "Exp: %d/%d Left: %d"
msgstr ""
-#: src/gui/killstats.cpp:77 src/gui/killstats.cpp:217
-#: src/gui/killstats.cpp:226
+#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:218
+#: src/gui/killstats.cpp:227
#, c-format
msgid "1%% = %d exp, avg mob for 1%%: %s"
msgstr ""
-#: src/gui/killstats.cpp:80 src/gui/killstats.cpp:143
-#: src/gui/killstats.cpp:235
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:236
#, c-format
msgid "Kills: %s, total exp: %s"
msgstr ""
-#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145
-#: src/gui/killstats.cpp:221 src/gui/killstats.cpp:231
+#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:146
+#: src/gui/killstats.cpp:222 src/gui/killstats.cpp:232
#, c-format
msgid "Avg Exp: %s, No. of avg mob to next level: %s"
msgstr ""
-#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:163
-#: src/gui/killstats.cpp:238
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:164
+#: src/gui/killstats.cpp:239
#, c-format
msgid "Kills/Min: %s, Exp/Min: %s"
msgstr ""
-#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:90 src/gui/killstats.cpp:95
-#: src/gui/killstats.cpp:290 src/gui/killstats.cpp:306
-#: src/gui/killstats.cpp:324
+#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
+#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
+#: src/gui/killstats.cpp:325
#, c-format
msgid "Exp speed per %d min: %s"
msgid_plural "Exp speed per %d min: %s"
msgstr[0] ""
msgstr[1] ""
-#: src/gui/killstats.cpp:88 src/gui/killstats.cpp:93 src/gui/killstats.cpp:98
+#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:94 src/gui/killstats.cpp:99
#, c-format
msgid "Time for next level per %d min: %s"
msgid_plural "Time for next level per %d min: %s"
msgstr[0] ""
msgstr[1] ""
-#: src/gui/killstats.cpp:101 src/gui/killstats.cpp:242
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
msgid "Last kill exp:"
msgstr ""
-#: src/gui/killstats.cpp:103 src/gui/killstats.cpp:356
-#: src/gui/killstats.cpp:362 src/gui/killstats.cpp:368
-#: src/gui/killstats.cpp:373
+#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
+#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:374
msgid "Time before jacko spawn:"
msgstr ""
-#: src/gui/killstats.cpp:295 src/gui/killstats.cpp:302
-#: src/gui/killstats.cpp:312 src/gui/killstats.cpp:319
-#: src/gui/killstats.cpp:331 src/gui/killstats.cpp:338
+#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
+#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
+#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
#, c-format
msgid " Time for next level: %s"
msgstr ""
-#: src/gui/killstats.cpp:362
+#: src/gui/killstats.cpp:363
#, c-format
msgid "%s %d?"
msgstr ""
-#: src/gui/killstats.cpp:368
+#: src/gui/killstats.cpp:369
msgid "jacko spawning"
msgstr ""
-#: src/guildmanager.cpp:464 src/net/ea/guildhandler.cpp:439
+#: src/guildmanager.cpp:484 src/net/ea/guildhandler.cpp:439
msgid "You have left the guild."
msgstr "Olet eronnut killasta."
@@ -1225,7 +1235,7 @@ msgid "Submit"
msgstr "Lähetä"
#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:142
+#: src/gui/setup_other.cpp:151
msgid "NPC"
msgstr "Ei-pelaajahahmo (NPC)"
@@ -1313,7 +1323,7 @@ msgstr "Huomioi jälleen"
#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:185
#: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:428
#: src/gui/popupmenu.cpp:677 src/gui/popupmenu.cpp:693
-#: src/playerrelations.cpp:400
+#: src/playerrelations.cpp:415
msgid "Completely ignore"
msgstr "Jätä täysin huomiotta"
@@ -1364,7 +1374,7 @@ msgid "Show Items"
msgstr "Näytä tavarat"
#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:705
-#: src/gui/popupmenu.cpp:2020
+#: src/gui/popupmenu.cpp:2023
msgid "Undress"
msgstr "Riisu"
@@ -1412,8 +1422,8 @@ msgstr "Lisää nimi keskusteluun"
msgid "Pick up"
msgstr "Nosta"
-#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:1732
-#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1855
+#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:1735
+#: src/gui/popupmenu.cpp:1815 src/gui/popupmenu.cpp:1858
msgid "Add to chat"
msgstr "Lisää keskusteluun"
@@ -1425,8 +1435,8 @@ msgstr "Karttaolio"
msgid "Rename"
msgstr "Nimeä uudelleen"
-#: src/gui/popupmenu.cpp:532 src/gui/popupmenu.cpp:1973
-#: src/gui/popupmenu.cpp:1991 src/gui/popupmenu.cpp:1996
+#: src/gui/popupmenu.cpp:532 src/gui/popupmenu.cpp:1976
+#: src/gui/popupmenu.cpp:1994 src/gui/popupmenu.cpp:1999
msgid "Remove"
msgstr "Poista"
@@ -1502,85 +1512,85 @@ msgstr ""
msgid "Comment: "
msgstr ""
-#: src/gui/popupmenu.cpp:1657
+#: src/gui/popupmenu.cpp:1660
msgid "Add to trade"
msgstr "Lisää kauppaan"
-#: src/gui/popupmenu.cpp:1663
+#: src/gui/popupmenu.cpp:1666
msgid "Add to trade 10"
msgstr "Lisää 10 kauppaan"
-#: src/gui/popupmenu.cpp:1666
+#: src/gui/popupmenu.cpp:1669
msgid "Add to trade half"
msgstr "Lisää puolet kauppaan"
-#: src/gui/popupmenu.cpp:1668
+#: src/gui/popupmenu.cpp:1671
msgid "Add to trade all"
msgstr "Lisää kaikki kauppaan"
-#: src/gui/popupmenu.cpp:1680
+#: src/gui/popupmenu.cpp:1683
msgid "Store 10"
msgstr "Varastoi 10"
-#: src/gui/popupmenu.cpp:1683
+#: src/gui/popupmenu.cpp:1686
msgid "Store half"
msgstr "Varastoi puolet"
-#: src/gui/popupmenu.cpp:1685
+#: src/gui/popupmenu.cpp:1688
msgid "Store all"
msgstr "Varastoi kaikki"
-#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1800
-#: src/gui/popupmenu.cpp:1843
+#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1803
+#: src/gui/popupmenu.cpp:1846
msgid "Drop all"
msgstr ""
-#: src/gui/popupmenu.cpp:1724
+#: src/gui/popupmenu.cpp:1727
msgid "Retrieve 10"
msgstr "Ota 10"
-#: src/gui/popupmenu.cpp:1727
+#: src/gui/popupmenu.cpp:1730
msgid "Retrieve half"
msgstr "Ota puolet"
-#: src/gui/popupmenu.cpp:1729
+#: src/gui/popupmenu.cpp:1732
msgid "Retrieve all"
msgstr "Ota kaikki"
-#: src/gui/popupmenu.cpp:1760 src/gui/popupmenu.cpp:1816
+#: src/gui/popupmenu.cpp:1763 src/gui/popupmenu.cpp:1819
msgid "Load old item shortcuts"
msgstr "Lataa vanhat tavarapikavalinnat"
-#: src/gui/popupmenu.cpp:1859
+#: src/gui/popupmenu.cpp:1862
msgid "Load old drop shortcuts"
msgstr "Lataa vanhat pudotuspikavalinnat"
-#: src/gui/popupmenu.cpp:1885 src/gui/popupmenu.cpp:1920
+#: src/gui/popupmenu.cpp:1888 src/gui/popupmenu.cpp:1923
msgid "Hide"
msgstr "Piilota"
-#: src/gui/popupmenu.cpp:1891 src/gui/popupmenu.cpp:1926
+#: src/gui/popupmenu.cpp:1894 src/gui/popupmenu.cpp:1929
msgid "Show"
msgstr "Näytä"
-#: src/gui/popupmenu.cpp:1933
+#: src/gui/popupmenu.cpp:1936
msgid "Reset yellow bar"
msgstr "Palauta oletusmuokkaimet (keltainen palkki)"
-#: src/gui/popupmenu.cpp:1935 src/gui/statuswindow.cpp:241
+#: src/gui/popupmenu.cpp:1938 src/gui/statuswindow.cpp:241
msgid "Copy to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:1953 src/gui/socialwindow.cpp:958
+#: src/gui/popupmenu.cpp:1956 src/gui/socialwindow.cpp:958
#: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028
msgid "(default)"
msgstr "(oletus)"
-#: src/gui/popupmenu.cpp:1965 src/gui/popupmenu.cpp:1983
+#: src/gui/popupmenu.cpp:1968 src/gui/popupmenu.cpp:1986
msgid "Move up"
msgstr "Siirrä ylös"
-#: src/gui/popupmenu.cpp:1970 src/gui/popupmenu.cpp:1988
+#: src/gui/popupmenu.cpp:1973 src/gui/popupmenu.cpp:1991
msgid "Move down"
msgstr "Siirrä alas"
@@ -1828,7 +1838,7 @@ msgstr ""
msgid "Use local time"
msgstr ""
-#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:157
+#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:166
msgid "Other"
msgstr ""
@@ -1991,115 +2001,127 @@ msgstr "Piirrä polku"
msgid "Draw hotkeys on map"
msgstr "Piirrä siirtymäpikanäppäimet kartalle"
-#: src/gui/setup_other.cpp:88
-msgid "Moving"
+#: src/gui/setup_other.cpp:87
+msgid "Enable lazy scrolling"
msgstr ""
#: src/gui/setup_other.cpp:90
+msgid "Scroll laziness"
+msgstr ""
+
+#: src/gui/setup_other.cpp:93
+msgid "Scroll radius"
+msgstr ""
+
+#: src/gui/setup_other.cpp:97
+msgid "Moving"
+msgstr ""
+
+#: src/gui/setup_other.cpp:99
msgid "Auto fix position"
msgstr "Korjaa sijainti automaattisesti"
-#: src/gui/setup_other.cpp:93
+#: src/gui/setup_other.cpp:102
msgid "Attack while moving"
msgstr "Hyökkää liikkuessa"
-#: src/gui/setup_other.cpp:96
+#: src/gui/setup_other.cpp:105
msgid "Sync player move"
msgstr "Synkronoi pelaajan liikkeet"
-#: src/gui/setup_other.cpp:99
+#: src/gui/setup_other.cpp:108
msgid "Crazy move A program"
msgstr "Villiliike (a) -ohjelma"
-#: src/gui/setup_other.cpp:103
+#: src/gui/setup_other.cpp:112
msgid "Player"
msgstr ""
-#: src/gui/setup_other.cpp:105
+#: src/gui/setup_other.cpp:114
msgid "Show own hp bar"
msgstr "Näytä oma vp-palkki"
-#: src/gui/setup_other.cpp:108
+#: src/gui/setup_other.cpp:117
msgid "Enable quick stats"
msgstr "Ota pikatilastot käyttöön"
-#: src/gui/setup_other.cpp:111
+#: src/gui/setup_other.cpp:120
msgid "Cycle player targets"
msgstr "Vaihda pelaajakohteita syklissä"
-#: src/gui/setup_other.cpp:114
+#: src/gui/setup_other.cpp:123
msgid "Show job exp messages"
msgstr "Näytä työkokemusviestit"
-#: src/gui/setup_other.cpp:117
+#: src/gui/setup_other.cpp:126
msgid "Show players popups"
msgstr "Näytä pelaajaponnahdusikkunat"
-#: src/gui/setup_other.cpp:120
+#: src/gui/setup_other.cpp:129
msgid "Afk message"
msgstr ""
-#: src/gui/setup_other.cpp:123
+#: src/gui/setup_other.cpp:132
msgid "Show job"
msgstr "Näytä työ"
-#: src/gui/setup_other.cpp:126
+#: src/gui/setup_other.cpp:135
msgid "Enable attack filter"
msgstr "Ota käyttöön hyökkäyssuodin"
-#: src/gui/setup_other.cpp:129
+#: src/gui/setup_other.cpp:138
msgid "Enable advert protocol"
msgstr ""
-#: src/gui/setup_other.cpp:135
+#: src/gui/setup_other.cpp:144
msgid "Accept sell/buy requests"
msgstr "Salli osta/myy-pyynnöt"
-#: src/gui/setup_other.cpp:138
+#: src/gui/setup_other.cpp:147
msgid "Enable shop mode"
msgstr "Ota kauppatila käyttöön"
-#: src/gui/setup_other.cpp:144
+#: src/gui/setup_other.cpp:153
msgid "Log NPC dialogue"
msgstr "Kirjaa keskustelut ei-pelaajahahmojen kanssa lokiin"
-#: src/gui/setup_other.cpp:148
+#: src/gui/setup_other.cpp:157
msgid "Bots support"
msgstr ""
-#: src/gui/setup_other.cpp:150
+#: src/gui/setup_other.cpp:159
msgid "Enable auction bot support"
msgstr ""
-#: src/gui/setup_other.cpp:153
+#: src/gui/setup_other.cpp:162
msgid "Enable guild bot support and disable native guild support"
msgstr ""
-#: src/gui/setup_other.cpp:159
+#: src/gui/setup_other.cpp:168
msgid "Enable server side attack"
msgstr "Ota käyttöön palvelinpuolen hyökkäys"
-#: src/gui/setup_other.cpp:162
+#: src/gui/setup_other.cpp:171
msgid "Enable bot checker"
msgstr "Ota bottitutka käyttöön"
-#: src/gui/setup_other.cpp:165
+#: src/gui/setup_other.cpp:174
msgid "Enable buggy servers protection"
msgstr "Ota käyttöön suoja bugisten palvelinten varalta"
-#: src/gui/setup_other.cpp:168
+#: src/gui/setup_other.cpp:177
msgid "Enable debug log"
msgstr "Ota käyttöön debug-loki"
-#: src/gui/setup_other.cpp:171
+#: src/gui/setup_other.cpp:180
msgid "Low traffic mode"
msgstr "Matalan liikenteen tila"
-#: src/gui/setup_other.cpp:174
+#: src/gui/setup_other.cpp:183
msgid "Hide shield sprite"
msgstr "Piilota kilpihahmo"
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:186
msgid "Show background"
msgstr "Näytä tausta"
@@ -2116,29 +2138,29 @@ msgid "Auto adjust perfomance"
msgstr ""
#: src/gui/setup_perfomance.cpp:61
-msgid "Show beings transparency"
-msgstr ""
-
-#: src/gui/setup_perfomance.cpp:64
msgid "Hw acceleration"
msgstr "Rautakiihdytys"
-#: src/gui/setup_perfomance.cpp:67
+#: src/gui/setup_perfomance.cpp:64
msgid "Enable opacity cache (Software, can use many memory)"
msgstr ""
-#: src/gui/setup_perfomance.cpp:70
+#: src/gui/setup_perfomance.cpp:67
msgid "Enable map reduce (Software)"
msgstr ""
-#: src/gui/setup_perfomance.cpp:73
+#: src/gui/setup_perfomance.cpp:70
msgid "Better quality (disable for better perfomance)"
msgstr ""
-#: src/gui/setup_perfomance.cpp:76
+#: src/gui/setup_perfomance.cpp:73
msgid "Enable alpha channel fix (Software, can be very slow)"
msgstr ""
+#: src/gui/setup_perfomance.cpp:77
+msgid "Show beings transparency"
+msgstr ""
+
#: src/gui/setup_perfomance.cpp:80
msgid "Enable reorder sprites."
msgstr ""
@@ -2391,7 +2413,7 @@ msgid "FPS limit:"
msgstr "Piirtonopeusrajoitin (FPS):"
#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
-#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709
+#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:710
msgid "Alt FPS limit: "
msgstr "Vaihtoehtoinen FPS-rajoitin:"
@@ -2417,7 +2439,7 @@ msgstr "Hiukkastehosteiden yksityiskohtaisuus"
#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
-#: src/gui/setup_video.cpp:707
+#: src/gui/setup_video.cpp:708
msgid "None"
msgstr "-"
@@ -2524,22 +2546,22 @@ msgstr "Ylös"
msgid "Skill points available: %d"
msgstr "%d taitopistettä käyttämättä"
-#: src/gui/skilldialog.cpp:418
+#: src/gui/skilldialog.cpp:420
#, c-format
msgid "Skill Set %d"
msgstr "Taitojoukko %d"
-#: src/gui/skilldialog.cpp:430
+#: src/gui/skilldialog.cpp:432
#, c-format
msgid "Skill %d"
msgstr "Taito %d"
-#: src/gui/skilldialog.cpp:497 src/gui/skilldialog.cpp:550
+#: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554
#, c-format
msgid "Lvl: %d"
msgstr "Taso: %d"
-#: src/gui/skilldialog.cpp:542
+#: src/gui/skilldialog.cpp:546
#, c-format
msgid "Lvl: %d (%+d)"
msgstr "Taso: %d (%+d)"
@@ -3462,23 +3484,23 @@ msgstr "Kotipaikan raja"
msgid "Road Point"
msgstr "Väyläpiste"
-#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:472
+#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:474
msgid "Who Is Online - Updating"
msgstr "Kuka on linjoila - päivitän"
-#: src/gui/whoisonline.cpp:102
+#: src/gui/whoisonline.cpp:104
msgid "Update"
msgstr "Päivitä"
-#: src/gui/whoisonline.cpp:295
+#: src/gui/whoisonline.cpp:297
msgid "Who Is Online - "
msgstr "Kuka on linjoilla - "
-#: src/gui/whoisonline.cpp:486
+#: src/gui/whoisonline.cpp:488
msgid "Who Is Online - error"
msgstr "Kuka on linjoilla - virhe"
-#: src/gui/whoisonline.cpp:517
+#: src/gui/whoisonline.cpp:519
msgid "Who Is Online - Update"
msgstr "Kuka on linjoilla - päivitä"
@@ -4153,68 +4175,68 @@ msgstr ""
"Päällekkäiset näppäinoikotiet \"%s\" ja \"%s\" voivat aiheuttaa outouksia; "
"ole hyvä ja poista päällekkäisyydet. "
-#: src/localplayer.cpp:370
+#: src/localplayer.cpp:372
msgid "You were killed by "
msgstr "Sinut otti hengiltä "
-#: src/localplayer.cpp:1401
+#: src/localplayer.cpp:1413
msgid "Tried to pick up nonexistent item."
msgstr "Yritit nostaa olemattoman tavaran."
-#: src/localplayer.cpp:1403
+#: src/localplayer.cpp:1415
msgid "Item is too heavy."
msgstr "Tavara on liian painava."
-#: src/localplayer.cpp:1405
+#: src/localplayer.cpp:1417
msgid "Item is too far away."
msgstr "Tavara on liian kaukana."
-#: src/localplayer.cpp:1407
+#: src/localplayer.cpp:1419
msgid "Inventory is full."
msgstr "Sinulla on liikaa tavaraa ennestään."
-#: src/localplayer.cpp:1409
+#: src/localplayer.cpp:1421
msgid "Stack is too big."
msgstr "Kasa on liian suuri."
-#: src/localplayer.cpp:1412
+#: src/localplayer.cpp:1424
msgid "Item belongs to someone else."
msgstr "Tavara kuuluu jollekulle muulle."
-#: src/localplayer.cpp:1415
+#: src/localplayer.cpp:1427
msgid "Unknown problem picking up item."
msgstr "Tuntematon ongelma esti tavaran nostamisen."
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1439
+#: src/localplayer.cpp:1451
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
msgstr[0] "[@@%2$d|%3$s@@] (%1$d kpl) otettu."
msgstr[1] "[@@%2$d|%3$s@@] (%1$d kpl) otettu."
-#: src/localplayer.cpp:3173
+#: src/localplayer.cpp:3187
msgid "Away"
msgstr "Poissa"
-#: src/localplayer.cpp:3474
+#: src/localplayer.cpp:3488
msgid "Follow: "
msgstr "Seuraa: "
-#: src/localplayer.cpp:3476 src/localplayer.cpp:3491
+#: src/localplayer.cpp:3490 src/localplayer.cpp:3505
msgid "Follow canceled"
msgstr "Seuraaminen keskeytetty"
-#: src/localplayer.cpp:3483
+#: src/localplayer.cpp:3497
msgid "Imitation: "
msgstr "Matki: "
-#: src/localplayer.cpp:3485 src/localplayer.cpp:3493
+#: src/localplayer.cpp:3499 src/localplayer.cpp:3507
msgid "Imitation canceled"
msgstr "Matkiminen keskeytetty"
-#: src/localplayer.cpp:3845
+#: src/localplayer.cpp:3859
msgid "You see "
msgstr "Näet "
@@ -4416,16 +4438,16 @@ msgstr "MVP-pelaaja."
msgid "MVP player: "
msgstr "MVP-pelaaja: "
-#: src/net/ea/gamehandler.cpp:86
+#: src/net/ea/gamehandler.cpp:87
#, c-format
msgid "Online users: %d"
msgstr "Käyttäjiä palvelimella: %d"
-#: src/net/ea/gamehandler.cpp:98
+#: src/net/ea/gamehandler.cpp:99
msgid "Game"
msgstr "Peli"
-#: src/net/ea/gamehandler.cpp:98
+#: src/net/ea/gamehandler.cpp:99
msgid "Request to quit denied!"
msgstr "Lopetuspyyntö evätty!"
@@ -5484,19 +5506,19 @@ msgstr "Yhteys palvelimeen katkaistu. "
msgid "%s is not in your party!"
msgstr "%s ei ole ryhmässäsi!"
-#: src/playerrelations.cpp:414
+#: src/playerrelations.cpp:429
msgid "Print '...'"
msgstr "Tulosta '...'"
-#: src/playerrelations.cpp:434
+#: src/playerrelations.cpp:449
msgid "Blink name"
msgstr "Vilkuta nimeä"
-#: src/playerrelations.cpp:478
+#: src/playerrelations.cpp:493
msgid "Floating '...' bubble"
msgstr "Leijuva '...' -puhekupla"
-#: src/playerrelations.cpp:481
+#: src/playerrelations.cpp:496
msgid "Floating bubble"
msgstr "Leijuva puhekupla"
diff --git a/po/fr.po b/po/fr.po
index 3145f92d9..3ec205a5f 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -2,16 +2,17 @@
# Copyright (C) YEAR The ManaPlus Developers
# This file is distributed under the same license as the PACKAGE package.
#
+# Translators:
+# Andrei Karas <akaras@inbox.ru>, 2011.
# <antoinebcn@hotmail.com>, 2011.
-# Jumpy <antoinebcn@hotmail.com>, 2011.
# Bernard <nard@bh28.net>, 2011.
-# Andrei Karas <akaras@inbox.ru>, 2011.
+# Jumpy <antoinebcn@hotmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-09-02 18:27+0300\n"
-"PO-Revision-Date: 2011-09-02 15:29+0000\n"
+"POT-Creation-Date: 2011-09-10 01:34+0300\n"
+"PO-Revision-Date: 2011-09-09 22:37+0000\n"
"Last-Translator: akaras <akaras@inbox.ru>\n"
"Language-Team: French (http://www.transifex.net/projects/p/manaplus/team/"
"fr/)\n"
@@ -21,25 +22,25 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1)\n"
-#: src/actorspritemanager.cpp:1034
+#: src/actorspritemanager.cpp:1046
msgid "Visible on map"
msgstr "Visible sur la carte"
-#: src/being.cpp:549
+#: src/being.cpp:551
msgid "dodge"
msgstr "esquivé"
-#: src/being.cpp:549
+#: src/being.cpp:551
msgid "miss"
msgstr "raté"
#. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1529
+#: src/being.cpp:1532
msgid "A"
msgstr "A"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1534
+#: src/being.cpp:1537
msgid "I"
msgstr "I"
@@ -109,22 +110,22 @@ msgstr "Désinscription réussie"
msgid "Farewell, come back any time..."
msgstr "A bientôt, revenez quand vous voudrez..."
-#: src/client.cpp:1428 src/client.cpp:1458 src/client.cpp:1502
-#: src/client.cpp:1927 src/client.cpp:1934
+#: src/client.cpp:1428 src/client.cpp:1458 src/client.cpp:1504
+#: src/client.cpp:1929 src/client.cpp:1936
#, 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:1633
+#: src/client.cpp:1635
#, c-format
msgid "Invalid update host: %s"
msgstr "Site de mise à jour invalide : %s"
-#: src/client.cpp:1667 src/client.cpp:1673
+#: src/client.cpp:1669 src/client.cpp:1675
msgid "Error creating updates directory!"
msgstr "Impossible de créer le dossier de mise à jour !"
-#: src/client.cpp:1694
+#: src/client.cpp:1696
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
@@ -328,19 +329,19 @@ msgstr ""
msgid "Network Error"
msgstr "Erreur Réseau"
-#: src/game.cpp:1236
+#: src/game.cpp:1243
msgid "Ignoring incoming trade requests"
msgstr "Ignorer les requêtes d'échanges entrantes"
-#: src/game.cpp:1243
+#: src/game.cpp:1250
msgid "Accepting incoming trade requests"
msgstr "Accepter les requêtes d'échanges entrantes"
-#: src/game.cpp:1629
+#: src/game.cpp:1636
msgid "Could Not Load Map"
msgstr "La carte n'a pu être chargée"
-#: src/game.cpp:1630
+#: src/game.cpp:1637
#, c-format
msgid "Error while loading %s"
msgstr "Erreur durant le chargement %s"
@@ -369,31 +370,31 @@ msgstr "Commentaire : %s"
msgid "Bot Checker"
msgstr "Testeur de Robot"
-#: src/gui/botcheckerwindow.cpp:295 src/gui/setup_relations.cpp:64
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
msgid "Name"
msgstr "Nom"
-#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:133
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:133
#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:646
#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:265
msgid "Attack"
msgstr "Attaquer"
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:297
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297
#: src/keyboardconfig.cpp:62
msgid "Talk"
msgstr "Parler"
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:263
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:263
#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:703
msgid "Move"
msgstr "Déplacement"
-#: src/gui/botcheckerwindow.cpp:299
+#: src/gui/botcheckerwindow.cpp:300
msgid "Result"
msgstr "Résultat"
-#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:124
+#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:124
msgid "Reset"
msgstr "Réinitialiser"
@@ -439,7 +440,7 @@ msgid "Max"
msgstr "Max."
#: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:147 src/gui/setup_other.cpp:133
+#: src/gui/inventorywindow.cpp:176 src/gui/setup_other.cpp:142
msgid "Shop"
msgstr "Boutique"
@@ -458,10 +459,10 @@ msgstr "Vendre"
#: src/gui/popupmenu.cpp:516 src/gui/popupmenu.cpp:540
#: src/gui/popupmenu.cpp:554 src/gui/popupmenu.cpp:573
#: src/gui/popupmenu.cpp:790 src/gui/popupmenu.cpp:814
-#: src/gui/popupmenu.cpp:1734 src/gui/popupmenu.cpp:1762
-#: src/gui/popupmenu.cpp:1818 src/gui/popupmenu.cpp:1861
-#: src/gui/popupmenu.cpp:1896 src/gui/popupmenu.cpp:1936
-#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2023
+#: src/gui/popupmenu.cpp:1737 src/gui/popupmenu.cpp:1765
+#: src/gui/popupmenu.cpp:1821 src/gui/popupmenu.cpp:1864
+#: src/gui/popupmenu.cpp:1899 src/gui/popupmenu.cpp:1939
+#: src/gui/popupmenu.cpp:2006 src/gui/popupmenu.cpp:2026
#: src/gui/quitdialog.cpp:54 src/gui/register.cpp:82 src/gui/setup.cpp:72
#: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:238
#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
@@ -563,7 +564,7 @@ msgstr "Coupe :"
msgid "Race:"
msgstr "Race:"
-#: src/gui/charcreatedialog.cpp:95 src/gui/charselectdialog.cpp:478
+#: src/gui/charcreatedialog.cpp:95 src/gui/charselectdialog.cpp:480
#: src/gui/socialwindow.cpp:1139
msgid "Create"
msgstr "Créer"
@@ -631,26 +632,26 @@ msgstr "Entrer le mot de passe pour effacer le personnage"
msgid "Enter password:"
msgstr "Entrer le mot de passe :"
-#: src/gui/charselectdialog.cpp:408 src/gui/serverdialog.cpp:298
+#: src/gui/charselectdialog.cpp:410 src/gui/serverdialog.cpp:298
#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:122
#: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:241
msgid "Delete"
msgstr "Supprimer"
-#: src/gui/charselectdialog.cpp:466
+#: src/gui/charselectdialog.cpp:468
msgid "Choose"
msgstr "Choisir"
-#: src/gui/charselectdialog.cpp:469
+#: src/gui/charselectdialog.cpp:471
#, c-format
msgid "Level %d"
msgstr "Niveau %d"
-#: src/gui/charselectdialog.cpp:480 src/gui/charselectdialog.cpp:481
+#: src/gui/charselectdialog.cpp:482 src/gui/charselectdialog.cpp:483
msgid "(empty)"
msgstr "(vide)"
-#: src/gui/chatwindow.cpp:112
+#: src/gui/chatwindow.cpp:112 src/gui/inventorywindow.cpp:70
msgid "default"
msgstr "défaut"
@@ -706,11 +707,12 @@ msgstr "arc en ciel 2"
msgid "rainbow 3"
msgstr "arc en ciel 3"
-#: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
-#: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
-#: src/gui/setup_theme.cpp:73 src/gui/setup_theme.cpp:127
-#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
-#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
+#: src/gui/chatwindow.cpp:142 src/gui/inventorywindow.cpp:90
+#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78
+#: src/gui/setup_relations.cpp:220 src/gui/setup_theme.cpp:73
+#: src/gui/setup_theme.cpp:127 src/gui/setup_video.cpp:211
+#: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141
+#: src/gui/textcommandeditor.cpp:160
msgid "???"
msgstr "???"
@@ -743,7 +745,7 @@ msgstr "Non"
msgid "Ignore"
msgstr "Ignorer"
-#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:97
+#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:99
#: src/gui/setup_other.cpp:64
msgid "Map"
msgstr "Carte"
@@ -884,7 +886,7 @@ msgid "Did You Know?"
msgstr "Le saviez-vous ?"
#: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
-#: src/gui/inventorywindow.cpp:176 src/gui/npcdialog.cpp:53
+#: src/gui/inventorywindow.cpp:206 src/gui/npcdialog.cpp:53
#: src/gui/popupmenu.cpp:588 src/gui/shopwindow.cpp:113
msgid "Close"
msgstr "Fermer"
@@ -910,10 +912,10 @@ msgstr "Ok"
msgid "Equipment"
msgstr "Équipement"
-#: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:131
-#: src/gui/inventorywindow.cpp:512 src/gui/inventorywindow.cpp:521
-#: src/gui/popupmenu.cpp:1693 src/gui/popupmenu.cpp:1788
-#: src/gui/popupmenu.cpp:1833
+#: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160
+#: src/gui/inventorywindow.cpp:539 src/gui/inventorywindow.cpp:548
+#: src/gui/popupmenu.cpp:1696 src/gui/popupmenu.cpp:1791
+#: src/gui/popupmenu.cpp:1836
msgid "Unequip"
msgstr "Retirer"
@@ -921,80 +923,88 @@ msgstr "Retirer"
msgid "Help"
msgstr "Aide"
-#: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76
+#: src/gui/inventorywindow.cpp:71
+msgid "by name"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:72
+msgid "by id"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:73
+msgid "by weight"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:74
+msgid "by amount"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:75
+msgid "by type"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:111 src/gui/windowmenu.cpp:76
#: src/inventory.cpp:249
msgid "Inventory"
msgstr "Inventaire"
-#: src/gui/inventorywindow.cpp:105
+#: src/gui/inventorywindow.cpp:136
msgid "Slots:"
msgstr "Emplacements :"
-#: src/gui/inventorywindow.cpp:116
+#: src/gui/inventorywindow.cpp:148
msgid "Filter:"
msgstr "Filtre :"
-#: src/gui/inventorywindow.cpp:117
+#: src/gui/inventorywindow.cpp:149
msgid "Sort:"
msgstr "Tri :"
-#: src/gui/inventorywindow.cpp:123
-msgid "na"
-msgstr "sans"
-
-#: src/gui/inventorywindow.cpp:124
-msgid "az"
-msgstr "a-z"
-
-#: src/gui/inventorywindow.cpp:125
-msgid "id"
-msgstr "id"
-
-#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
-#: src/gui/inventorywindow.cpp:523 src/gui/popupmenu.cpp:1695
-#: src/gui/popupmenu.cpp:1790 src/gui/popupmenu.cpp:1835
+#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:541
+#: src/gui/inventorywindow.cpp:550 src/gui/popupmenu.cpp:1698
+#: src/gui/popupmenu.cpp:1793 src/gui/popupmenu.cpp:1838
msgid "Equip"
msgstr "Équiper"
-#: src/gui/inventorywindow.cpp:130 src/gui/inventorywindow.cpp:515
-#: src/gui/inventorywindow.cpp:519 src/gui/popupmenu.cpp:1698
-#: src/gui/popupmenu.cpp:1757 src/gui/popupmenu.cpp:1794
-#: src/gui/popupmenu.cpp:1838
+#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:542
+#: src/gui/inventorywindow.cpp:546 src/gui/popupmenu.cpp:1701
+#: src/gui/popupmenu.cpp:1760 src/gui/popupmenu.cpp:1797
+#: src/gui/popupmenu.cpp:1841
msgid "Use"
msgstr "Utiliser"
-#: src/gui/inventorywindow.cpp:144 src/gui/inventorywindow.cpp:620
-#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1799
-#: src/gui/popupmenu.cpp:1842
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:646
+#: src/gui/popupmenu.cpp:1705 src/gui/popupmenu.cpp:1802
+#: src/gui/popupmenu.cpp:1845
msgid "Drop..."
msgstr "Jeter..."
-#: src/gui/inventorywindow.cpp:145 src/gui/popupmenu.cpp:1711
-#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1851
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1714
+#: src/gui/popupmenu.cpp:1811 src/gui/popupmenu.cpp:1854
msgid "Split"
msgstr "Partager"
-#: src/gui/inventorywindow.cpp:146 src/gui/outfitwindow.cpp:60
+#: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60
#: src/gui/popupmenu.cpp:549
msgid "Outfits"
msgstr "Tenues"
-#: src/gui/inventorywindow.cpp:149
+#: src/gui/inventorywindow.cpp:178
msgid "Weight:"
msgstr "Poids :"
-#: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:611
-#: src/gui/popupmenu.cpp:1674 src/gui/popupmenu.cpp:1811
-#: src/gui/popupmenu.cpp:1854 src/gui/setup.cpp:73
+#: src/gui/inventorywindow.cpp:204 src/gui/inventorywindow.cpp:637
+#: src/gui/popupmenu.cpp:1677 src/gui/popupmenu.cpp:1814
+#: src/gui/popupmenu.cpp:1857 src/gui/setup.cpp:73
msgid "Store"
msgstr "Entreposer"
-#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1718
+#: src/gui/inventorywindow.cpp:205 src/gui/popupmenu.cpp:1721
msgid "Retrieve"
msgstr "Récupérer"
-#: src/gui/inventorywindow.cpp:622 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1847
+#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1710
+#: src/gui/popupmenu.cpp:1807 src/gui/popupmenu.cpp:1850
#: src/gui/windowmenu.cpp:97
msgid "Drop"
msgstr "Jeter"
@@ -1048,91 +1058,91 @@ msgstr "Poids : %s"
msgid "Kill stats"
msgstr "Statistiques"
-#: src/gui/killstats.cpp:65
+#: src/gui/killstats.cpp:66
msgid "Reset stats"
msgstr "RaZ stats"
-#: src/gui/killstats.cpp:66
+#: src/gui/killstats.cpp:67
msgid "Reset timer"
msgstr "RaZ temps"
-#: src/gui/killstats.cpp:70 src/gui/killstats.cpp:206
+#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:207
#, c-format
msgid "Level: %d at %f%%"
msgstr "Niveau : %d à %f%%"
-#: src/gui/killstats.cpp:74 src/gui/killstats.cpp:211
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:212
#, c-format
msgid "Exp: %d/%d Left: %d"
msgstr "Exp : %d/%d Reste : %d"
-#: src/gui/killstats.cpp:77 src/gui/killstats.cpp:217
-#: src/gui/killstats.cpp:226
+#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:218
+#: src/gui/killstats.cpp:227
#, c-format
msgid "1%% = %d exp, avg mob for 1%%: %s"
msgstr "1%% = %d Moyenne des monstres tués 1%% : %s"
-#: src/gui/killstats.cpp:80 src/gui/killstats.cpp:143
-#: src/gui/killstats.cpp:235
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:236
#, c-format
msgid "Kills: %s, total exp: %s"
msgstr "Nbre Tués : %s, total exp : %s"
-#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145
-#: src/gui/killstats.cpp:221 src/gui/killstats.cpp:231
+#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:146
+#: src/gui/killstats.cpp:222 src/gui/killstats.cpp:232
#, c-format
msgid "Avg Exp: %s, No. of avg mob to next level: %s"
msgstr "Moyenne Exp: %s, Nombre de monstres pour le prochain niveau : %s"
-#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:163
-#: src/gui/killstats.cpp:238
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:164
+#: src/gui/killstats.cpp:239
#, c-format
msgid "Kills/Min: %s, Exp/Min: %s"
msgstr "Tués/Min : %s, Exp/Min : %s"
-#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:90 src/gui/killstats.cpp:95
-#: src/gui/killstats.cpp:290 src/gui/killstats.cpp:306
-#: src/gui/killstats.cpp:324
+#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
+#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
+#: src/gui/killstats.cpp:325
#, c-format
msgid "Exp speed per %d min: %s"
msgid_plural "Exp speed per %d min: %s"
msgstr[0] "Rapidité exp pour %d min : %s"
msgstr[1] "Rapidité exp pour %d min : %s"
-#: src/gui/killstats.cpp:88 src/gui/killstats.cpp:93 src/gui/killstats.cpp:98
+#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:94 src/gui/killstats.cpp:99
#, c-format
msgid "Time for next level per %d min: %s"
msgid_plural "Time for next level per %d min: %s"
msgstr[0] "Temps pour le prochain niveau %d min : %s"
msgstr[1] "Temps pour le prochain niveau %d min : %s"
-#: src/gui/killstats.cpp:101 src/gui/killstats.cpp:242
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
msgid "Last kill exp:"
msgstr "Exp du dernier tué :"
-#: src/gui/killstats.cpp:103 src/gui/killstats.cpp:356
-#: src/gui/killstats.cpp:362 src/gui/killstats.cpp:368
-#: src/gui/killstats.cpp:373
+#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
+#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:374
msgid "Time before jacko spawn:"
msgstr "Temps avant l'arrivée de Jack0 :"
-#: src/gui/killstats.cpp:295 src/gui/killstats.cpp:302
-#: src/gui/killstats.cpp:312 src/gui/killstats.cpp:319
-#: src/gui/killstats.cpp:331 src/gui/killstats.cpp:338
+#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
+#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
+#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
#, c-format
msgid " Time for next level: %s"
msgstr " Temps pour le prochain niveau : %s"
-#: src/gui/killstats.cpp:362
+#: src/gui/killstats.cpp:363
#, c-format
msgid "%s %d?"
msgstr "%s %d?"
-#: src/gui/killstats.cpp:368
+#: src/gui/killstats.cpp:369
msgid "jacko spawning"
msgstr "Arrivée de Jack0"
-#: src/guildmanager.cpp:464 src/net/ea/guildhandler.cpp:439
+#: src/guildmanager.cpp:484 src/net/ea/guildhandler.cpp:439
msgid "You have left the guild."
msgstr "vous avez quitté la guilde."
@@ -1230,7 +1240,7 @@ msgid "Submit"
msgstr "Soumettre"
#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:142
+#: src/gui/setup_other.cpp:151
msgid "NPC"
msgstr "PNJ"
@@ -1318,7 +1328,7 @@ msgstr "Ne plus ignorer"
#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:185
#: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:428
#: src/gui/popupmenu.cpp:677 src/gui/popupmenu.cpp:693
-#: src/playerrelations.cpp:400
+#: src/playerrelations.cpp:415
msgid "Completely ignore"
msgstr "Ignorer complètement"
@@ -1369,7 +1379,7 @@ msgid "Show Items"
msgstr "Montrer les objets"
#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:705
-#: src/gui/popupmenu.cpp:2020
+#: src/gui/popupmenu.cpp:2023
msgid "Undress"
msgstr "Déshabiller"
@@ -1417,8 +1427,8 @@ msgstr "Ajouter le nom dans la boite de dialogue"
msgid "Pick up"
msgstr "Ramasser"
-#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:1732
-#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1855
+#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:1735
+#: src/gui/popupmenu.cpp:1815 src/gui/popupmenu.cpp:1858
msgid "Add to chat"
msgstr "Ajouter à la conversation"
@@ -1430,8 +1440,8 @@ msgstr "Objet de carte"
msgid "Rename"
msgstr "Renommer"
-#: src/gui/popupmenu.cpp:532 src/gui/popupmenu.cpp:1973
-#: src/gui/popupmenu.cpp:1991 src/gui/popupmenu.cpp:1996
+#: src/gui/popupmenu.cpp:532 src/gui/popupmenu.cpp:1976
+#: src/gui/popupmenu.cpp:1994 src/gui/popupmenu.cpp:1999
msgid "Remove"
msgstr "Enlever"
@@ -1507,85 +1517,85 @@ msgstr "Le joueur commente "
msgid "Comment: "
msgstr "Commentaire : "
-#: src/gui/popupmenu.cpp:1657
+#: src/gui/popupmenu.cpp:1660
msgid "Add to trade"
msgstr "Ajouter à la transaction"
-#: src/gui/popupmenu.cpp:1663
+#: src/gui/popupmenu.cpp:1666
msgid "Add to trade 10"
msgstr "Ajouter 10 dans l'échange"
-#: src/gui/popupmenu.cpp:1666
+#: src/gui/popupmenu.cpp:1669
msgid "Add to trade half"
msgstr "Ajouter la moitié dans l'échange"
-#: src/gui/popupmenu.cpp:1668
+#: src/gui/popupmenu.cpp:1671
msgid "Add to trade all"
msgstr "Ajouter tout dans l'échange"
-#: src/gui/popupmenu.cpp:1680
+#: src/gui/popupmenu.cpp:1683
msgid "Store 10"
msgstr "Entreposer 10"
-#: src/gui/popupmenu.cpp:1683
+#: src/gui/popupmenu.cpp:1686
msgid "Store half"
msgstr "Entreposer la moitié"
-#: src/gui/popupmenu.cpp:1685
+#: src/gui/popupmenu.cpp:1688
msgid "Store all"
msgstr "Entreposer tout"
-#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1800
-#: src/gui/popupmenu.cpp:1843
+#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1803
+#: src/gui/popupmenu.cpp:1846
msgid "Drop all"
msgstr "Jeter tout"
-#: src/gui/popupmenu.cpp:1724
+#: src/gui/popupmenu.cpp:1727
msgid "Retrieve 10"
msgstr "Reprendre 10"
-#: src/gui/popupmenu.cpp:1727
+#: src/gui/popupmenu.cpp:1730
msgid "Retrieve half"
msgstr "Reprendre la moitié"
-#: src/gui/popupmenu.cpp:1729
+#: src/gui/popupmenu.cpp:1732
msgid "Retrieve all"
msgstr "Reprendre tout"
-#: src/gui/popupmenu.cpp:1760 src/gui/popupmenu.cpp:1816
+#: src/gui/popupmenu.cpp:1763 src/gui/popupmenu.cpp:1819
msgid "Load old item shortcuts"
msgstr "Charger les anciens raccourcis d'objets"
-#: src/gui/popupmenu.cpp:1859
+#: src/gui/popupmenu.cpp:1862
msgid "Load old drop shortcuts"
msgstr "Charger les anciens raccourcis de jets d'objets"
-#: src/gui/popupmenu.cpp:1885 src/gui/popupmenu.cpp:1920
+#: src/gui/popupmenu.cpp:1888 src/gui/popupmenu.cpp:1923
msgid "Hide"
msgstr "Cacher"
-#: src/gui/popupmenu.cpp:1891 src/gui/popupmenu.cpp:1926
+#: src/gui/popupmenu.cpp:1894 src/gui/popupmenu.cpp:1929
msgid "Show"
msgstr "Montrer"
-#: src/gui/popupmenu.cpp:1933
+#: src/gui/popupmenu.cpp:1936
msgid "Reset yellow bar"
msgstr "Remise aux valeurs de défaut de la barre jaune"
-#: src/gui/popupmenu.cpp:1935 src/gui/statuswindow.cpp:241
+#: src/gui/popupmenu.cpp:1938 src/gui/statuswindow.cpp:241
msgid "Copy to chat"
msgstr "Copier dans la conversation"
-#: src/gui/popupmenu.cpp:1953 src/gui/socialwindow.cpp:958
+#: src/gui/popupmenu.cpp:1956 src/gui/socialwindow.cpp:958
#: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028
msgid "(default)"
msgstr "(défaut)"
-#: src/gui/popupmenu.cpp:1965 src/gui/popupmenu.cpp:1983
+#: src/gui/popupmenu.cpp:1968 src/gui/popupmenu.cpp:1986
msgid "Move up"
msgstr "Aller vers le haut"
-#: src/gui/popupmenu.cpp:1970 src/gui/popupmenu.cpp:1988
+#: src/gui/popupmenu.cpp:1973 src/gui/popupmenu.cpp:1991
msgid "Move down"
msgstr "Aller vers le bas"
@@ -1832,7 +1842,7 @@ msgstr "Temps"
msgid "Use local time"
msgstr "Utiliser l’horaire local"
-#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:157
+#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:166
msgid "Other"
msgstr "Autre"
@@ -1995,115 +2005,127 @@ msgstr "Afficher le chemin"
msgid "Draw hotkeys on map"
msgstr "Afficher les touches-raccourcis sur la carte"
-#: src/gui/setup_other.cpp:88
+#: src/gui/setup_other.cpp:87
+msgid "Enable lazy scrolling"
+msgstr ""
+
+#: src/gui/setup_other.cpp:90
+msgid "Scroll laziness"
+msgstr ""
+
+#: src/gui/setup_other.cpp:93
+msgid "Scroll radius"
+msgstr ""
+
+#: src/gui/setup_other.cpp:97
msgid "Moving"
msgstr "En mouvement"
-#: src/gui/setup_other.cpp:90
+#: src/gui/setup_other.cpp:99
msgid "Auto fix position"
msgstr "Auto-correction de position"
-#: src/gui/setup_other.cpp:93
+#: src/gui/setup_other.cpp:102
msgid "Attack while moving"
msgstr "Attaquer en bougeant"
-#: src/gui/setup_other.cpp:96
+#: src/gui/setup_other.cpp:105
msgid "Sync player move"
msgstr "Synchroniser les mouvements du joueur"
-#: src/gui/setup_other.cpp:99
+#: src/gui/setup_other.cpp:108
msgid "Crazy move A program"
msgstr "Programme A de mouvement de fou"
-#: src/gui/setup_other.cpp:103
+#: src/gui/setup_other.cpp:112
msgid "Player"
msgstr "Joueur"
-#: src/gui/setup_other.cpp:105
+#: src/gui/setup_other.cpp:114
msgid "Show own hp bar"
msgstr "Afficher votre propre barre de vie"
-#: src/gui/setup_other.cpp:108
+#: src/gui/setup_other.cpp:117
msgid "Enable quick stats"
msgstr "Activer les statistiques instantanées"
-#: src/gui/setup_other.cpp:111
+#: src/gui/setup_other.cpp:120
msgid "Cycle player targets"
msgstr "Entourer les joueurs visés"
-#: src/gui/setup_other.cpp:114
+#: src/gui/setup_other.cpp:123
msgid "Show job exp messages"
msgstr "Afficher les expériences de compétences"
-#: src/gui/setup_other.cpp:117
+#: src/gui/setup_other.cpp:126
msgid "Show players popups"
msgstr "Afficher les pop-ups des joueurs"
-#: src/gui/setup_other.cpp:120
+#: src/gui/setup_other.cpp:129
msgid "Afk message"
msgstr "Message d'absence"
-#: src/gui/setup_other.cpp:123
+#: src/gui/setup_other.cpp:132
msgid "Show job"
msgstr "Afficher les compétences"
-#: src/gui/setup_other.cpp:126
+#: src/gui/setup_other.cpp:135
msgid "Enable attack filter"
msgstr "Activer le mode attaque"
-#: src/gui/setup_other.cpp:129
+#: src/gui/setup_other.cpp:138
msgid "Enable advert protocol"
msgstr "Lancer le protocole d'avertissements"
-#: src/gui/setup_other.cpp:135
+#: src/gui/setup_other.cpp:144
msgid "Accept sell/buy requests"
msgstr "Accepter les requêtes d'achat et de vente"
-#: src/gui/setup_other.cpp:138
+#: src/gui/setup_other.cpp:147
msgid "Enable shop mode"
msgstr "Activer le mode boutique"
-#: src/gui/setup_other.cpp:144
+#: src/gui/setup_other.cpp:153
msgid "Log NPC dialogue"
msgstr "Enregistrer les conversations des PNJ"
-#: src/gui/setup_other.cpp:148
+#: src/gui/setup_other.cpp:157
msgid "Bots support"
msgstr ""
-#: src/gui/setup_other.cpp:150
+#: src/gui/setup_other.cpp:159
msgid "Enable auction bot support"
msgstr ""
-#: src/gui/setup_other.cpp:153
+#: src/gui/setup_other.cpp:162
msgid "Enable guild bot support and disable native guild support"
msgstr ""
-#: src/gui/setup_other.cpp:159
+#: src/gui/setup_other.cpp:168
msgid "Enable server side attack"
msgstr "Activer l'attaque de la part du serveur"
-#: src/gui/setup_other.cpp:162
+#: src/gui/setup_other.cpp:171
msgid "Enable bot checker"
msgstr "Activer le testeur de robots"
-#: src/gui/setup_other.cpp:165
+#: src/gui/setup_other.cpp:174
msgid "Enable buggy servers protection"
msgstr "Activer la protection contre les serveurs instables"
-#: src/gui/setup_other.cpp:168
+#: src/gui/setup_other.cpp:177
msgid "Enable debug log"
msgstr "Activer l'enregistrement des informations"
-#: src/gui/setup_other.cpp:171
+#: src/gui/setup_other.cpp:180
msgid "Low traffic mode"
msgstr "Mode traffic faible"
-#: src/gui/setup_other.cpp:174
+#: src/gui/setup_other.cpp:183
msgid "Hide shield sprite"
msgstr "Cacher le bouclier"
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:186
msgid "Show background"
msgstr "Montrer le fond"
@@ -2120,29 +2142,29 @@ msgid "Auto adjust perfomance"
msgstr "Ajustement automatique des performances"
#: src/gui/setup_perfomance.cpp:61
-msgid "Show beings transparency"
-msgstr "Montrer les êtres en transparence"
-
-#: src/gui/setup_perfomance.cpp:64
msgid "Hw acceleration"
msgstr "Accélération matériel"
-#: src/gui/setup_perfomance.cpp:67
+#: src/gui/setup_perfomance.cpp:64
msgid "Enable opacity cache (Software, can use many memory)"
msgstr ""
-#: src/gui/setup_perfomance.cpp:70
+#: src/gui/setup_perfomance.cpp:67
msgid "Enable map reduce (Software)"
msgstr ""
-#: src/gui/setup_perfomance.cpp:73
+#: src/gui/setup_perfomance.cpp:70
msgid "Better quality (disable for better perfomance)"
msgstr ""
-#: src/gui/setup_perfomance.cpp:76
+#: src/gui/setup_perfomance.cpp:73
msgid "Enable alpha channel fix (Software, can be very slow)"
msgstr ""
+#: src/gui/setup_perfomance.cpp:77
+msgid "Show beings transparency"
+msgstr "Montrer les êtres en transparence"
+
#: src/gui/setup_perfomance.cpp:80
msgid "Enable reorder sprites."
msgstr ""
@@ -2395,7 +2417,7 @@ msgid "FPS limit:"
msgstr "Limite FPS :"
#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
-#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709
+#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:710
msgid "Alt FPS limit: "
msgstr "Alterner les limites FPS"
@@ -2421,7 +2443,7 @@ msgstr "Détail des particules"
#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
-#: src/gui/setup_video.cpp:707
+#: src/gui/setup_video.cpp:708
msgid "None"
msgstr "Rien"
@@ -2535,22 +2557,22 @@ msgstr "Augmenter"
msgid "Skill points available: %d"
msgstr "Points de compétences : %d"
-#: src/gui/skilldialog.cpp:418
+#: src/gui/skilldialog.cpp:420
#, c-format
msgid "Skill Set %d"
msgstr "Compétence choisie : %d"
-#: src/gui/skilldialog.cpp:430
+#: src/gui/skilldialog.cpp:432
#, c-format
msgid "Skill %d"
msgstr "Compétence %d"
-#: src/gui/skilldialog.cpp:497 src/gui/skilldialog.cpp:550
+#: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554
#, c-format
msgid "Lvl: %d"
msgstr "Niveau : %d"
-#: src/gui/skilldialog.cpp:542
+#: src/gui/skilldialog.cpp:546
#, c-format
msgid "Lvl: %d (%+d)"
msgstr "Niveau : %d (%+d)"
@@ -3479,23 +3501,23 @@ msgstr "Limites de votre position"
msgid "Road Point"
msgstr "Étape"
-#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:472
+#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:474
msgid "Who Is Online - Updating"
msgstr "Qui est en ligne - Mise à jour"
-#: src/gui/whoisonline.cpp:102
+#: src/gui/whoisonline.cpp:104
msgid "Update"
msgstr "Mise à jour"
-#: src/gui/whoisonline.cpp:295
+#: src/gui/whoisonline.cpp:297
msgid "Who Is Online - "
msgstr "Qui est en ligne - "
-#: src/gui/whoisonline.cpp:486
+#: src/gui/whoisonline.cpp:488
msgid "Who Is Online - error"
msgstr "Qui est en ligne - Erreur"
-#: src/gui/whoisonline.cpp:517
+#: src/gui/whoisonline.cpp:519
msgid "Who Is Online - Update"
msgstr "Qui est en ligne - Mise à jour"
@@ -4173,68 +4195,68 @@ msgstr ""
"Conflit entre les touches \"%s\" and \"%s\". Changez au moins l'une des "
"touches ou attendez vous à un possible comportement étrange du jeu."
-#: src/localplayer.cpp:370
+#: src/localplayer.cpp:372
msgid "You were killed by "
msgstr "Vous avez été tué par "
-#: src/localplayer.cpp:1401
+#: src/localplayer.cpp:1413
msgid "Tried to pick up nonexistent item."
msgstr "Vous avez essayé de prendre un item qui n'existe pas."
-#: src/localplayer.cpp:1403
+#: src/localplayer.cpp:1415
msgid "Item is too heavy."
msgstr "L'objet est trop lourd."
-#: src/localplayer.cpp:1405
+#: src/localplayer.cpp:1417
msgid "Item is too far away."
msgstr "L'objet est trop éloigné"
-#: src/localplayer.cpp:1407
+#: src/localplayer.cpp:1419
msgid "Inventory is full."
msgstr "L'inventaire est plein"
-#: src/localplayer.cpp:1409
+#: src/localplayer.cpp:1421
msgid "Stack is too big."
msgstr "La pile est trop grande"
-#: src/localplayer.cpp:1412
+#: src/localplayer.cpp:1424
msgid "Item belongs to someone else."
msgstr "L'objet appartient a quelqu'un d'autre"
-#: src/localplayer.cpp:1415
+#: src/localplayer.cpp:1427
msgid "Unknown problem picking up item."
msgstr "Problème inconnu pour ramasser l'objet."
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1439
+#: src/localplayer.cpp:1451
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
msgstr[0] "Vous avez ramassé %d [@@%d|%s@@]."
msgstr[1] "Vous avez ramassé %d [@@%d|%s@@]."
-#: src/localplayer.cpp:3173
+#: src/localplayer.cpp:3187
msgid "Away"
msgstr "Inactif"
-#: src/localplayer.cpp:3474
+#: src/localplayer.cpp:3488
msgid "Follow: "
msgstr "Suivre : "
-#: src/localplayer.cpp:3476 src/localplayer.cpp:3491
+#: src/localplayer.cpp:3490 src/localplayer.cpp:3505
msgid "Follow canceled"
msgstr "Suivi annulé"
-#: src/localplayer.cpp:3483
+#: src/localplayer.cpp:3497
msgid "Imitation: "
msgstr "Imitation: "
-#: src/localplayer.cpp:3485 src/localplayer.cpp:3493
+#: src/localplayer.cpp:3499 src/localplayer.cpp:3507
msgid "Imitation canceled"
msgstr "Imitation annulée"
-#: src/localplayer.cpp:3845
+#: src/localplayer.cpp:3859
msgid "You see "
msgstr "Vous voyez "
@@ -4444,16 +4466,16 @@ msgstr "Joueur MVP"
msgid "MVP player: "
msgstr "MVP joueur :"
-#: src/net/ea/gamehandler.cpp:86
+#: src/net/ea/gamehandler.cpp:87
#, c-format
msgid "Online users: %d"
msgstr "Joueurs en ligne : %d"
-#: src/net/ea/gamehandler.cpp:98
+#: src/net/ea/gamehandler.cpp:99
msgid "Game"
msgstr "Jeu"
-#: src/net/ea/gamehandler.cpp:98
+#: src/net/ea/gamehandler.cpp:99
msgid "Request to quit denied!"
msgstr "Requête de départ refusée !"
@@ -5534,19 +5556,19 @@ msgstr "Connexion au serveur terminée."
msgid "%s is not in your party!"
msgstr "%s n'est pas membre de votre groupe !"
-#: src/playerrelations.cpp:414
+#: src/playerrelations.cpp:429
msgid "Print '...'"
msgstr "Affiche '...'"
-#: src/playerrelations.cpp:434
+#: src/playerrelations.cpp:449
msgid "Blink name"
msgstr "Fais clignoter le nom"
-#: src/playerrelations.cpp:478
+#: src/playerrelations.cpp:493
msgid "Floating '...' bubble"
msgstr "Bulle flottante '...'"
-#: src/playerrelations.cpp:481
+#: src/playerrelations.cpp:496
msgid "Floating bubble"
msgstr "Bulle flottante"
diff --git a/po/hr.po b/po/hr.po
index bce0b9017..cdcf9c1d2 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-09-02 18:27+0300\n"
+"POT-Creation-Date: 2011-09-10 01:34+0300\n"
"PO-Revision-Date: 2011-08-09 22:16+0000\n"
"Last-Translator: akaras <akaras@inbox.ru>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,25 +18,25 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2\n"
-#: src/actorspritemanager.cpp:1034
+#: src/actorspritemanager.cpp:1046
msgid "Visible on map"
msgstr ""
-#: src/being.cpp:549
+#: src/being.cpp:551
msgid "dodge"
msgstr ""
-#: src/being.cpp:549
+#: src/being.cpp:551
msgid "miss"
msgstr ""
#. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1529
+#: src/being.cpp:1532
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1534
+#: src/being.cpp:1537
msgid "I"
msgstr ""
@@ -106,22 +106,22 @@ msgstr ""
msgid "Farewell, come back any time..."
msgstr ""
-#: src/client.cpp:1428 src/client.cpp:1458 src/client.cpp:1502
-#: src/client.cpp:1927 src/client.cpp:1934
+#: src/client.cpp:1428 src/client.cpp:1458 src/client.cpp:1504
+#: src/client.cpp:1929 src/client.cpp:1936
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
-#: src/client.cpp:1633
+#: src/client.cpp:1635
#, c-format
msgid "Invalid update host: %s"
msgstr ""
-#: src/client.cpp:1667 src/client.cpp:1673
+#: src/client.cpp:1669 src/client.cpp:1675
msgid "Error creating updates directory!"
msgstr ""
-#: src/client.cpp:1694
+#: src/client.cpp:1696
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
@@ -326,19 +326,19 @@ msgstr ""
msgid "Network Error"
msgstr "Mreža Greška"
-#: src/game.cpp:1236
+#: src/game.cpp:1243
msgid "Ignoring incoming trade requests"
msgstr "Ignoriranje dolaznih zahtjeva za trgovanje"
-#: src/game.cpp:1243
+#: src/game.cpp:1250
msgid "Accepting incoming trade requests"
msgstr "Prihvaćanje dolaznih zahtjeva za trgovanje"
-#: src/game.cpp:1629
+#: src/game.cpp:1636
msgid "Could Not Load Map"
msgstr ""
-#: src/game.cpp:1630
+#: src/game.cpp:1637
#, c-format
msgid "Error while loading %s"
msgstr "Greška prilikom učitavanja %s"
@@ -367,31 +367,31 @@ msgstr ""
msgid "Bot Checker"
msgstr ""
-#: src/gui/botcheckerwindow.cpp:295 src/gui/setup_relations.cpp:64
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
msgid "Name"
msgstr "Ime"
-#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:133
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:133
#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:646
#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:265
msgid "Attack"
msgstr "Napad"
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:297
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297
#: src/keyboardconfig.cpp:62
msgid "Talk"
msgstr "Govori"
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:263
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:263
#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:703
msgid "Move"
msgstr ""
-#: src/gui/botcheckerwindow.cpp:299
+#: src/gui/botcheckerwindow.cpp:300
msgid "Result"
msgstr ""
-#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:124
+#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:124
msgid "Reset"
msgstr "Poništi"
@@ -437,7 +437,7 @@ msgid "Max"
msgstr "Max"
#: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:147 src/gui/setup_other.cpp:133
+#: src/gui/inventorywindow.cpp:176 src/gui/setup_other.cpp:142
msgid "Shop"
msgstr "Trgovina"
@@ -456,10 +456,10 @@ msgstr "Prodaj"
#: src/gui/popupmenu.cpp:516 src/gui/popupmenu.cpp:540
#: src/gui/popupmenu.cpp:554 src/gui/popupmenu.cpp:573
#: src/gui/popupmenu.cpp:790 src/gui/popupmenu.cpp:814
-#: src/gui/popupmenu.cpp:1734 src/gui/popupmenu.cpp:1762
-#: src/gui/popupmenu.cpp:1818 src/gui/popupmenu.cpp:1861
-#: src/gui/popupmenu.cpp:1896 src/gui/popupmenu.cpp:1936
-#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2023
+#: src/gui/popupmenu.cpp:1737 src/gui/popupmenu.cpp:1765
+#: src/gui/popupmenu.cpp:1821 src/gui/popupmenu.cpp:1864
+#: src/gui/popupmenu.cpp:1899 src/gui/popupmenu.cpp:1939
+#: src/gui/popupmenu.cpp:2006 src/gui/popupmenu.cpp:2026
#: src/gui/quitdialog.cpp:54 src/gui/register.cpp:82 src/gui/setup.cpp:72
#: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:238
#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
@@ -561,7 +561,7 @@ msgstr ""
msgid "Race:"
msgstr ""
-#: src/gui/charcreatedialog.cpp:95 src/gui/charselectdialog.cpp:478
+#: src/gui/charcreatedialog.cpp:95 src/gui/charselectdialog.cpp:480
#: src/gui/socialwindow.cpp:1139
msgid "Create"
msgstr "Stvori"
@@ -629,26 +629,26 @@ msgstr ""
msgid "Enter password:"
msgstr ""
-#: src/gui/charselectdialog.cpp:408 src/gui/serverdialog.cpp:298
+#: src/gui/charselectdialog.cpp:410 src/gui/serverdialog.cpp:298
#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:122
#: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:241
msgid "Delete"
msgstr "Obriši"
-#: src/gui/charselectdialog.cpp:466
+#: src/gui/charselectdialog.cpp:468
msgid "Choose"
msgstr ""
-#: src/gui/charselectdialog.cpp:469
+#: src/gui/charselectdialog.cpp:471
#, c-format
msgid "Level %d"
msgstr ""
-#: src/gui/charselectdialog.cpp:480 src/gui/charselectdialog.cpp:481
+#: src/gui/charselectdialog.cpp:482 src/gui/charselectdialog.cpp:483
msgid "(empty)"
msgstr ""
-#: src/gui/chatwindow.cpp:112
+#: src/gui/chatwindow.cpp:112 src/gui/inventorywindow.cpp:70
msgid "default"
msgstr ""
@@ -704,11 +704,12 @@ msgstr ""
msgid "rainbow 3"
msgstr ""
-#: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
-#: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
-#: src/gui/setup_theme.cpp:73 src/gui/setup_theme.cpp:127
-#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
-#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
+#: src/gui/chatwindow.cpp:142 src/gui/inventorywindow.cpp:90
+#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78
+#: src/gui/setup_relations.cpp:220 src/gui/setup_theme.cpp:73
+#: src/gui/setup_theme.cpp:127 src/gui/setup_video.cpp:211
+#: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141
+#: src/gui/textcommandeditor.cpp:160
msgid "???"
msgstr "???"
@@ -741,7 +742,7 @@ msgstr "Ne"
msgid "Ignore"
msgstr ""
-#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:97
+#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:99
#: src/gui/setup_other.cpp:64
msgid "Map"
msgstr "Karta"
@@ -882,7 +883,7 @@ msgid "Did You Know?"
msgstr ""
#: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
-#: src/gui/inventorywindow.cpp:176 src/gui/npcdialog.cpp:53
+#: src/gui/inventorywindow.cpp:206 src/gui/npcdialog.cpp:53
#: src/gui/popupmenu.cpp:588 src/gui/shopwindow.cpp:113
msgid "Close"
msgstr "Zatvori"
@@ -908,10 +909,10 @@ msgstr "U redu"
msgid "Equipment"
msgstr "Oprema"
-#: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:131
-#: src/gui/inventorywindow.cpp:512 src/gui/inventorywindow.cpp:521
-#: src/gui/popupmenu.cpp:1693 src/gui/popupmenu.cpp:1788
-#: src/gui/popupmenu.cpp:1833
+#: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160
+#: src/gui/inventorywindow.cpp:539 src/gui/inventorywindow.cpp:548
+#: src/gui/popupmenu.cpp:1696 src/gui/popupmenu.cpp:1791
+#: src/gui/popupmenu.cpp:1836
msgid "Unequip"
msgstr "Skini opremu"
@@ -919,80 +920,90 @@ msgstr "Skini opremu"
msgid "Help"
msgstr "Pomoć"
-#: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76
+#: src/gui/inventorywindow.cpp:71
+#, fuzzy
+msgid "by name"
+msgstr "Vidljiva imena"
+
+#: src/gui/inventorywindow.cpp:72
+msgid "by id"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:73
+#, fuzzy
+msgid "by weight"
+msgstr "Težina:"
+
+#: src/gui/inventorywindow.cpp:74
+msgid "by amount"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:75
+msgid "by type"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:111 src/gui/windowmenu.cpp:76
#: src/inventory.cpp:249
msgid "Inventory"
msgstr "Zalihe"
-#: src/gui/inventorywindow.cpp:105
+#: src/gui/inventorywindow.cpp:136
msgid "Slots:"
msgstr "Mjesta:"
-#: src/gui/inventorywindow.cpp:116
+#: src/gui/inventorywindow.cpp:148
msgid "Filter:"
msgstr ""
-#: src/gui/inventorywindow.cpp:117
+#: src/gui/inventorywindow.cpp:149
msgid "Sort:"
msgstr ""
-#: src/gui/inventorywindow.cpp:123
-msgid "na"
-msgstr ""
-
-#: src/gui/inventorywindow.cpp:124
-msgid "az"
-msgstr ""
-
-#: src/gui/inventorywindow.cpp:125
-msgid "id"
-msgstr ""
-
-#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
-#: src/gui/inventorywindow.cpp:523 src/gui/popupmenu.cpp:1695
-#: src/gui/popupmenu.cpp:1790 src/gui/popupmenu.cpp:1835
+#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:541
+#: src/gui/inventorywindow.cpp:550 src/gui/popupmenu.cpp:1698
+#: src/gui/popupmenu.cpp:1793 src/gui/popupmenu.cpp:1838
msgid "Equip"
msgstr "Opremi"
-#: src/gui/inventorywindow.cpp:130 src/gui/inventorywindow.cpp:515
-#: src/gui/inventorywindow.cpp:519 src/gui/popupmenu.cpp:1698
-#: src/gui/popupmenu.cpp:1757 src/gui/popupmenu.cpp:1794
-#: src/gui/popupmenu.cpp:1838
+#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:542
+#: src/gui/inventorywindow.cpp:546 src/gui/popupmenu.cpp:1701
+#: src/gui/popupmenu.cpp:1760 src/gui/popupmenu.cpp:1797
+#: src/gui/popupmenu.cpp:1841
msgid "Use"
msgstr "Upotrijebi"
-#: src/gui/inventorywindow.cpp:144 src/gui/inventorywindow.cpp:620
-#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1799
-#: src/gui/popupmenu.cpp:1842
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:646
+#: src/gui/popupmenu.cpp:1705 src/gui/popupmenu.cpp:1802
+#: src/gui/popupmenu.cpp:1845
msgid "Drop..."
msgstr ""
-#: src/gui/inventorywindow.cpp:145 src/gui/popupmenu.cpp:1711
-#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1851
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1714
+#: src/gui/popupmenu.cpp:1811 src/gui/popupmenu.cpp:1854
msgid "Split"
msgstr "Razdvoji"
-#: src/gui/inventorywindow.cpp:146 src/gui/outfitwindow.cpp:60
+#: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60
#: src/gui/popupmenu.cpp:549
msgid "Outfits"
msgstr ""
-#: src/gui/inventorywindow.cpp:149
+#: src/gui/inventorywindow.cpp:178
msgid "Weight:"
msgstr "Težina:"
-#: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:611
-#: src/gui/popupmenu.cpp:1674 src/gui/popupmenu.cpp:1811
-#: src/gui/popupmenu.cpp:1854 src/gui/setup.cpp:73
+#: src/gui/inventorywindow.cpp:204 src/gui/inventorywindow.cpp:637
+#: src/gui/popupmenu.cpp:1677 src/gui/popupmenu.cpp:1814
+#: src/gui/popupmenu.cpp:1857 src/gui/setup.cpp:73
msgid "Store"
msgstr "Pohrani"
-#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1718
+#: src/gui/inventorywindow.cpp:205 src/gui/popupmenu.cpp:1721
msgid "Retrieve"
msgstr "Preuzmi"
-#: src/gui/inventorywindow.cpp:622 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1847
+#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1710
+#: src/gui/popupmenu.cpp:1807 src/gui/popupmenu.cpp:1850
#: src/gui/windowmenu.cpp:97
msgid "Drop"
msgstr "Ispusti"
@@ -1046,51 +1057,51 @@ msgstr ""
msgid "Kill stats"
msgstr ""
-#: src/gui/killstats.cpp:65
+#: src/gui/killstats.cpp:66
msgid "Reset stats"
msgstr ""
-#: src/gui/killstats.cpp:66
+#: src/gui/killstats.cpp:67
msgid "Reset timer"
msgstr ""
-#: src/gui/killstats.cpp:70 src/gui/killstats.cpp:206
+#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:207
#, c-format
msgid "Level: %d at %f%%"
msgstr ""
-#: src/gui/killstats.cpp:74 src/gui/killstats.cpp:211
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:212
#, c-format
msgid "Exp: %d/%d Left: %d"
msgstr ""
-#: src/gui/killstats.cpp:77 src/gui/killstats.cpp:217
-#: src/gui/killstats.cpp:226
+#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:218
+#: src/gui/killstats.cpp:227
#, c-format
msgid "1%% = %d exp, avg mob for 1%%: %s"
msgstr ""
-#: src/gui/killstats.cpp:80 src/gui/killstats.cpp:143
-#: src/gui/killstats.cpp:235
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:236
#, c-format
msgid "Kills: %s, total exp: %s"
msgstr ""
-#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145
-#: src/gui/killstats.cpp:221 src/gui/killstats.cpp:231
+#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:146
+#: src/gui/killstats.cpp:222 src/gui/killstats.cpp:232
#, c-format
msgid "Avg Exp: %s, No. of avg mob to next level: %s"
msgstr ""
-#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:163
-#: src/gui/killstats.cpp:238
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:164
+#: src/gui/killstats.cpp:239
#, c-format
msgid "Kills/Min: %s, Exp/Min: %s"
msgstr ""
-#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:90 src/gui/killstats.cpp:95
-#: src/gui/killstats.cpp:290 src/gui/killstats.cpp:306
-#: src/gui/killstats.cpp:324
+#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
+#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
+#: src/gui/killstats.cpp:325
#, c-format
msgid "Exp speed per %d min: %s"
msgid_plural "Exp speed per %d min: %s"
@@ -1098,7 +1109,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: src/gui/killstats.cpp:88 src/gui/killstats.cpp:93 src/gui/killstats.cpp:98
+#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:94 src/gui/killstats.cpp:99
#, c-format
msgid "Time for next level per %d min: %s"
msgid_plural "Time for next level per %d min: %s"
@@ -1106,33 +1117,33 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: src/gui/killstats.cpp:101 src/gui/killstats.cpp:242
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
msgid "Last kill exp:"
msgstr ""
-#: src/gui/killstats.cpp:103 src/gui/killstats.cpp:356
-#: src/gui/killstats.cpp:362 src/gui/killstats.cpp:368
-#: src/gui/killstats.cpp:373
+#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
+#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:374
msgid "Time before jacko spawn:"
msgstr ""
-#: src/gui/killstats.cpp:295 src/gui/killstats.cpp:302
-#: src/gui/killstats.cpp:312 src/gui/killstats.cpp:319
-#: src/gui/killstats.cpp:331 src/gui/killstats.cpp:338
+#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
+#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
+#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
#, c-format
msgid " Time for next level: %s"
msgstr ""
-#: src/gui/killstats.cpp:362
+#: src/gui/killstats.cpp:363
#, c-format
msgid "%s %d?"
msgstr ""
-#: src/gui/killstats.cpp:368
+#: src/gui/killstats.cpp:369
msgid "jacko spawning"
msgstr ""
-#: src/guildmanager.cpp:464 src/net/ea/guildhandler.cpp:439
+#: src/guildmanager.cpp:484 src/net/ea/guildhandler.cpp:439
msgid "You have left the guild."
msgstr ""
@@ -1230,7 +1241,7 @@ msgid "Submit"
msgstr "Dostavi"
#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:142
+#: src/gui/setup_other.cpp:151
msgid "NPC"
msgstr "NPC"
@@ -1318,7 +1329,7 @@ msgstr ""
#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:185
#: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:428
#: src/gui/popupmenu.cpp:677 src/gui/popupmenu.cpp:693
-#: src/playerrelations.cpp:400
+#: src/playerrelations.cpp:415
msgid "Completely ignore"
msgstr ""
@@ -1369,7 +1380,7 @@ msgid "Show Items"
msgstr ""
#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:705
-#: src/gui/popupmenu.cpp:2020
+#: src/gui/popupmenu.cpp:2023
msgid "Undress"
msgstr ""
@@ -1417,8 +1428,8 @@ msgstr ""
msgid "Pick up"
msgstr ""
-#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:1732
-#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1855
+#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:1735
+#: src/gui/popupmenu.cpp:1815 src/gui/popupmenu.cpp:1858
msgid "Add to chat"
msgstr ""
@@ -1430,8 +1441,8 @@ msgstr ""
msgid "Rename"
msgstr ""
-#: src/gui/popupmenu.cpp:532 src/gui/popupmenu.cpp:1973
-#: src/gui/popupmenu.cpp:1991 src/gui/popupmenu.cpp:1996
+#: src/gui/popupmenu.cpp:532 src/gui/popupmenu.cpp:1976
+#: src/gui/popupmenu.cpp:1994 src/gui/popupmenu.cpp:1999
msgid "Remove"
msgstr ""
@@ -1507,85 +1518,85 @@ msgstr ""
msgid "Comment: "
msgstr ""
-#: src/gui/popupmenu.cpp:1657
+#: src/gui/popupmenu.cpp:1660
msgid "Add to trade"
msgstr ""
-#: src/gui/popupmenu.cpp:1663
+#: src/gui/popupmenu.cpp:1666
msgid "Add to trade 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1666
+#: src/gui/popupmenu.cpp:1669
msgid "Add to trade half"
msgstr ""
-#: src/gui/popupmenu.cpp:1668
+#: src/gui/popupmenu.cpp:1671
msgid "Add to trade all"
msgstr ""
-#: src/gui/popupmenu.cpp:1680
+#: src/gui/popupmenu.cpp:1683
msgid "Store 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1683
+#: src/gui/popupmenu.cpp:1686
msgid "Store half"
msgstr ""
-#: src/gui/popupmenu.cpp:1685
+#: src/gui/popupmenu.cpp:1688
msgid "Store all"
msgstr ""
-#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1800
-#: src/gui/popupmenu.cpp:1843
+#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1803
+#: src/gui/popupmenu.cpp:1846
msgid "Drop all"
msgstr ""
-#: src/gui/popupmenu.cpp:1724
+#: src/gui/popupmenu.cpp:1727
msgid "Retrieve 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1727
+#: src/gui/popupmenu.cpp:1730
msgid "Retrieve half"
msgstr ""
-#: src/gui/popupmenu.cpp:1729
+#: src/gui/popupmenu.cpp:1732
msgid "Retrieve all"
msgstr ""
-#: src/gui/popupmenu.cpp:1760 src/gui/popupmenu.cpp:1816
+#: src/gui/popupmenu.cpp:1763 src/gui/popupmenu.cpp:1819
msgid "Load old item shortcuts"
msgstr ""
-#: src/gui/popupmenu.cpp:1859
+#: src/gui/popupmenu.cpp:1862
msgid "Load old drop shortcuts"
msgstr ""
-#: src/gui/popupmenu.cpp:1885 src/gui/popupmenu.cpp:1920
+#: src/gui/popupmenu.cpp:1888 src/gui/popupmenu.cpp:1923
msgid "Hide"
msgstr ""
-#: src/gui/popupmenu.cpp:1891 src/gui/popupmenu.cpp:1926
+#: src/gui/popupmenu.cpp:1894 src/gui/popupmenu.cpp:1929
msgid "Show"
msgstr ""
-#: src/gui/popupmenu.cpp:1933
+#: src/gui/popupmenu.cpp:1936
msgid "Reset yellow bar"
msgstr ""
-#: src/gui/popupmenu.cpp:1935 src/gui/statuswindow.cpp:241
+#: src/gui/popupmenu.cpp:1938 src/gui/statuswindow.cpp:241
msgid "Copy to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:1953 src/gui/socialwindow.cpp:958
+#: src/gui/popupmenu.cpp:1956 src/gui/socialwindow.cpp:958
#: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028
msgid "(default)"
msgstr ""
-#: src/gui/popupmenu.cpp:1965 src/gui/popupmenu.cpp:1983
+#: src/gui/popupmenu.cpp:1968 src/gui/popupmenu.cpp:1986
msgid "Move up"
msgstr ""
-#: src/gui/popupmenu.cpp:1970 src/gui/popupmenu.cpp:1988
+#: src/gui/popupmenu.cpp:1973 src/gui/popupmenu.cpp:1991
msgid "Move down"
msgstr ""
@@ -1831,7 +1842,7 @@ msgstr ""
msgid "Use local time"
msgstr ""
-#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:157
+#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:166
msgid "Other"
msgstr ""
@@ -1994,115 +2005,127 @@ msgstr ""
msgid "Draw hotkeys on map"
msgstr ""
-#: src/gui/setup_other.cpp:88
-msgid "Moving"
+#: src/gui/setup_other.cpp:87
+msgid "Enable lazy scrolling"
msgstr ""
#: src/gui/setup_other.cpp:90
-msgid "Auto fix position"
+msgid "Scroll laziness"
msgstr ""
#: src/gui/setup_other.cpp:93
+msgid "Scroll radius"
+msgstr ""
+
+#: src/gui/setup_other.cpp:97
+msgid "Moving"
+msgstr ""
+
+#: src/gui/setup_other.cpp:99
+msgid "Auto fix position"
+msgstr ""
+
+#: src/gui/setup_other.cpp:102
msgid "Attack while moving"
msgstr ""
-#: src/gui/setup_other.cpp:96
+#: src/gui/setup_other.cpp:105
msgid "Sync player move"
msgstr ""
-#: src/gui/setup_other.cpp:99
+#: src/gui/setup_other.cpp:108
msgid "Crazy move A program"
msgstr ""
-#: src/gui/setup_other.cpp:103
+#: src/gui/setup_other.cpp:112
msgid "Player"
msgstr ""
-#: src/gui/setup_other.cpp:105
+#: src/gui/setup_other.cpp:114
msgid "Show own hp bar"
msgstr ""
-#: src/gui/setup_other.cpp:108
+#: src/gui/setup_other.cpp:117
msgid "Enable quick stats"
msgstr ""
-#: src/gui/setup_other.cpp:111
+#: src/gui/setup_other.cpp:120
msgid "Cycle player targets"
msgstr ""
-#: src/gui/setup_other.cpp:114
+#: src/gui/setup_other.cpp:123
msgid "Show job exp messages"
msgstr ""
-#: src/gui/setup_other.cpp:117
+#: src/gui/setup_other.cpp:126
msgid "Show players popups"
msgstr ""
-#: src/gui/setup_other.cpp:120
+#: src/gui/setup_other.cpp:129
msgid "Afk message"
msgstr ""
-#: src/gui/setup_other.cpp:123
+#: src/gui/setup_other.cpp:132
msgid "Show job"
msgstr ""
-#: src/gui/setup_other.cpp:126
+#: src/gui/setup_other.cpp:135
msgid "Enable attack filter"
msgstr ""
-#: src/gui/setup_other.cpp:129
+#: src/gui/setup_other.cpp:138
msgid "Enable advert protocol"
msgstr ""
-#: src/gui/setup_other.cpp:135
+#: src/gui/setup_other.cpp:144
msgid "Accept sell/buy requests"
msgstr ""
-#: src/gui/setup_other.cpp:138
+#: src/gui/setup_other.cpp:147
msgid "Enable shop mode"
msgstr ""
-#: src/gui/setup_other.cpp:144
+#: src/gui/setup_other.cpp:153
msgid "Log NPC dialogue"
msgstr ""
-#: src/gui/setup_other.cpp:148
+#: src/gui/setup_other.cpp:157
msgid "Bots support"
msgstr ""
-#: src/gui/setup_other.cpp:150
+#: src/gui/setup_other.cpp:159
msgid "Enable auction bot support"
msgstr ""
-#: src/gui/setup_other.cpp:153
+#: src/gui/setup_other.cpp:162
msgid "Enable guild bot support and disable native guild support"
msgstr ""
-#: src/gui/setup_other.cpp:159
+#: src/gui/setup_other.cpp:168
msgid "Enable server side attack"
msgstr ""
-#: src/gui/setup_other.cpp:162
+#: src/gui/setup_other.cpp:171
msgid "Enable bot checker"
msgstr ""
-#: src/gui/setup_other.cpp:165
+#: src/gui/setup_other.cpp:174
msgid "Enable buggy servers protection"
msgstr ""
-#: src/gui/setup_other.cpp:168
+#: src/gui/setup_other.cpp:177
msgid "Enable debug log"
msgstr ""
-#: src/gui/setup_other.cpp:171
+#: src/gui/setup_other.cpp:180
msgid "Low traffic mode"
msgstr ""
-#: src/gui/setup_other.cpp:174
+#: src/gui/setup_other.cpp:183
msgid "Hide shield sprite"
msgstr ""
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:186
msgid "Show background"
msgstr ""
@@ -2119,27 +2142,27 @@ msgid "Auto adjust perfomance"
msgstr ""
#: src/gui/setup_perfomance.cpp:61
-msgid "Show beings transparency"
+msgid "Hw acceleration"
msgstr ""
#: src/gui/setup_perfomance.cpp:64
-msgid "Hw acceleration"
+msgid "Enable opacity cache (Software, can use many memory)"
msgstr ""
#: src/gui/setup_perfomance.cpp:67
-msgid "Enable opacity cache (Software, can use many memory)"
+msgid "Enable map reduce (Software)"
msgstr ""
#: src/gui/setup_perfomance.cpp:70
-msgid "Enable map reduce (Software)"
+msgid "Better quality (disable for better perfomance)"
msgstr ""
#: src/gui/setup_perfomance.cpp:73
-msgid "Better quality (disable for better perfomance)"
+msgid "Enable alpha channel fix (Software, can be very slow)"
msgstr ""
-#: src/gui/setup_perfomance.cpp:76
-msgid "Enable alpha channel fix (Software, can be very slow)"
+#: src/gui/setup_perfomance.cpp:77
+msgid "Show beings transparency"
msgstr ""
#: src/gui/setup_perfomance.cpp:80
@@ -2394,7 +2417,7 @@ msgid "FPS limit:"
msgstr ""
#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
-#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709
+#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:710
msgid "Alt FPS limit: "
msgstr ""
@@ -2420,7 +2443,7 @@ msgstr ""
#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
-#: src/gui/setup_video.cpp:707
+#: src/gui/setup_video.cpp:708
msgid "None"
msgstr ""
@@ -2526,22 +2549,22 @@ msgstr "Gore"
msgid "Skill points available: %d"
msgstr ""
-#: src/gui/skilldialog.cpp:418
+#: src/gui/skilldialog.cpp:420
#, c-format
msgid "Skill Set %d"
msgstr ""
-#: src/gui/skilldialog.cpp:430
+#: src/gui/skilldialog.cpp:432
#, c-format
msgid "Skill %d"
msgstr ""
-#: src/gui/skilldialog.cpp:497 src/gui/skilldialog.cpp:550
+#: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554
#, c-format
msgid "Lvl: %d"
msgstr ""
-#: src/gui/skilldialog.cpp:542
+#: src/gui/skilldialog.cpp:546
#, c-format
msgid "Lvl: %d (%+d)"
msgstr ""
@@ -3464,23 +3487,23 @@ msgstr ""
msgid "Road Point"
msgstr ""
-#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:472
+#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:474
msgid "Who Is Online - Updating"
msgstr ""
-#: src/gui/whoisonline.cpp:102
+#: src/gui/whoisonline.cpp:104
msgid "Update"
msgstr ""
-#: src/gui/whoisonline.cpp:295
+#: src/gui/whoisonline.cpp:297
msgid "Who Is Online - "
msgstr ""
-#: src/gui/whoisonline.cpp:486
+#: src/gui/whoisonline.cpp:488
msgid "Who Is Online - error"
msgstr ""
-#: src/gui/whoisonline.cpp:517
+#: src/gui/whoisonline.cpp:519
msgid "Who Is Online - Update"
msgstr ""
@@ -4149,41 +4172,41 @@ msgid ""
"strange behaviour."
msgstr ""
-#: src/localplayer.cpp:370
+#: src/localplayer.cpp:372
msgid "You were killed by "
msgstr ""
-#: src/localplayer.cpp:1401
+#: src/localplayer.cpp:1413
msgid "Tried to pick up nonexistent item."
msgstr ""
-#: src/localplayer.cpp:1403
+#: src/localplayer.cpp:1415
msgid "Item is too heavy."
msgstr ""
-#: src/localplayer.cpp:1405
+#: src/localplayer.cpp:1417
msgid "Item is too far away."
msgstr ""
-#: src/localplayer.cpp:1407
+#: src/localplayer.cpp:1419
msgid "Inventory is full."
msgstr ""
-#: src/localplayer.cpp:1409
+#: src/localplayer.cpp:1421
msgid "Stack is too big."
msgstr ""
-#: src/localplayer.cpp:1412
+#: src/localplayer.cpp:1424
msgid "Item belongs to someone else."
msgstr ""
-#: src/localplayer.cpp:1415
+#: src/localplayer.cpp:1427
msgid "Unknown problem picking up item."
msgstr ""
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1439
+#: src/localplayer.cpp:1451
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -4191,27 +4214,27 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: src/localplayer.cpp:3173
+#: src/localplayer.cpp:3187
msgid "Away"
msgstr ""
-#: src/localplayer.cpp:3474
+#: src/localplayer.cpp:3488
msgid "Follow: "
msgstr ""
-#: src/localplayer.cpp:3476 src/localplayer.cpp:3491
+#: src/localplayer.cpp:3490 src/localplayer.cpp:3505
msgid "Follow canceled"
msgstr ""
-#: src/localplayer.cpp:3483
+#: src/localplayer.cpp:3497
msgid "Imitation: "
msgstr ""
-#: src/localplayer.cpp:3485 src/localplayer.cpp:3493
+#: src/localplayer.cpp:3499 src/localplayer.cpp:3507
msgid "Imitation canceled"
msgstr ""
-#: src/localplayer.cpp:3845
+#: src/localplayer.cpp:3859
msgid "You see "
msgstr ""
@@ -4412,16 +4435,16 @@ msgstr ""
msgid "MVP player: "
msgstr ""
-#: src/net/ea/gamehandler.cpp:86
+#: src/net/ea/gamehandler.cpp:87
#, c-format
msgid "Online users: %d"
msgstr ""
-#: src/net/ea/gamehandler.cpp:98
+#: src/net/ea/gamehandler.cpp:99
msgid "Game"
msgstr ""
-#: src/net/ea/gamehandler.cpp:98
+#: src/net/ea/gamehandler.cpp:99
msgid "Request to quit denied!"
msgstr ""
@@ -5463,19 +5486,19 @@ msgstr ""
msgid "%s is not in your party!"
msgstr "%s nije u vašoj partiji!"
-#: src/playerrelations.cpp:414
+#: src/playerrelations.cpp:429
msgid "Print '...'"
msgstr ""
-#: src/playerrelations.cpp:434
+#: src/playerrelations.cpp:449
msgid "Blink name"
msgstr ""
-#: src/playerrelations.cpp:478
+#: src/playerrelations.cpp:493
msgid "Floating '...' bubble"
msgstr ""
-#: src/playerrelations.cpp:481
+#: src/playerrelations.cpp:496
msgid "Floating bubble"
msgstr ""
diff --git a/po/hu.po b/po/hu.po
index fbd9c2691..8bd7cca8c 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-09-02 18:27+0300\n"
+"POT-Creation-Date: 2011-09-10 01:34+0300\n"
"PO-Revision-Date: 2011-08-09 22:16+0000\n"
"Last-Translator: akaras <akaras@inbox.ru>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,25 +17,25 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-#: src/actorspritemanager.cpp:1034
+#: src/actorspritemanager.cpp:1046
msgid "Visible on map"
msgstr ""
-#: src/being.cpp:549
+#: src/being.cpp:551
msgid "dodge"
msgstr ""
-#: src/being.cpp:549
+#: src/being.cpp:551
msgid "miss"
msgstr ""
#. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1529
+#: src/being.cpp:1532
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1534
+#: src/being.cpp:1537
msgid "I"
msgstr ""
@@ -105,22 +105,22 @@ msgstr ""
msgid "Farewell, come back any time..."
msgstr ""
-#: src/client.cpp:1428 src/client.cpp:1458 src/client.cpp:1502
-#: src/client.cpp:1927 src/client.cpp:1934
+#: src/client.cpp:1428 src/client.cpp:1458 src/client.cpp:1504
+#: src/client.cpp:1929 src/client.cpp:1936
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
-#: src/client.cpp:1633
+#: src/client.cpp:1635
#, c-format
msgid "Invalid update host: %s"
msgstr ""
-#: src/client.cpp:1667 src/client.cpp:1673
+#: src/client.cpp:1669 src/client.cpp:1675
msgid "Error creating updates directory!"
msgstr "Hiba a frissítési könyvtár létrehozása közben!"
-#: src/client.cpp:1694
+#: src/client.cpp:1696
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
@@ -321,19 +321,19 @@ msgstr ""
msgid "Network Error"
msgstr "Hálózati hiba"
-#: src/game.cpp:1236
+#: src/game.cpp:1243
msgid "Ignoring incoming trade requests"
msgstr "Kereskedési kérelmek elutasítása"
-#: src/game.cpp:1243
+#: src/game.cpp:1250
msgid "Accepting incoming trade requests"
msgstr "Kereskedési kérelmek elfogadása"
-#: src/game.cpp:1629
+#: src/game.cpp:1636
msgid "Could Not Load Map"
msgstr ""
-#: src/game.cpp:1630
+#: src/game.cpp:1637
#, c-format
msgid "Error while loading %s"
msgstr "Hiba %s betöltése közben"
@@ -362,31 +362,31 @@ msgstr ""
msgid "Bot Checker"
msgstr ""
-#: src/gui/botcheckerwindow.cpp:295 src/gui/setup_relations.cpp:64
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
msgid "Name"
msgstr "Név"
-#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:133
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:133
#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:646
#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:265
msgid "Attack"
msgstr "Támadás"
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:297
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297
#: src/keyboardconfig.cpp:62
msgid "Talk"
msgstr "Csevegés"
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:263
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:263
#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:703
msgid "Move"
msgstr ""
-#: src/gui/botcheckerwindow.cpp:299
+#: src/gui/botcheckerwindow.cpp:300
msgid "Result"
msgstr ""
-#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:124
+#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:124
msgid "Reset"
msgstr "Alaphelyzet"
@@ -432,7 +432,7 @@ msgid "Max"
msgstr "Max."
#: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:147 src/gui/setup_other.cpp:133
+#: src/gui/inventorywindow.cpp:176 src/gui/setup_other.cpp:142
msgid "Shop"
msgstr "Üzlet"
@@ -451,10 +451,10 @@ msgstr "Eladás"
#: src/gui/popupmenu.cpp:516 src/gui/popupmenu.cpp:540
#: src/gui/popupmenu.cpp:554 src/gui/popupmenu.cpp:573
#: src/gui/popupmenu.cpp:790 src/gui/popupmenu.cpp:814
-#: src/gui/popupmenu.cpp:1734 src/gui/popupmenu.cpp:1762
-#: src/gui/popupmenu.cpp:1818 src/gui/popupmenu.cpp:1861
-#: src/gui/popupmenu.cpp:1896 src/gui/popupmenu.cpp:1936
-#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2023
+#: src/gui/popupmenu.cpp:1737 src/gui/popupmenu.cpp:1765
+#: src/gui/popupmenu.cpp:1821 src/gui/popupmenu.cpp:1864
+#: src/gui/popupmenu.cpp:1899 src/gui/popupmenu.cpp:1939
+#: src/gui/popupmenu.cpp:2006 src/gui/popupmenu.cpp:2026
#: src/gui/quitdialog.cpp:54 src/gui/register.cpp:82 src/gui/setup.cpp:72
#: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:238
#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
@@ -556,7 +556,7 @@ msgstr ""
msgid "Race:"
msgstr ""
-#: src/gui/charcreatedialog.cpp:95 src/gui/charselectdialog.cpp:478
+#: src/gui/charcreatedialog.cpp:95 src/gui/charselectdialog.cpp:480
#: src/gui/socialwindow.cpp:1139
msgid "Create"
msgstr "Létrehozás"
@@ -624,26 +624,26 @@ msgstr ""
msgid "Enter password:"
msgstr ""
-#: src/gui/charselectdialog.cpp:408 src/gui/serverdialog.cpp:298
+#: src/gui/charselectdialog.cpp:410 src/gui/serverdialog.cpp:298
#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:122
#: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:241
msgid "Delete"
msgstr "Törlés"
-#: src/gui/charselectdialog.cpp:466
+#: src/gui/charselectdialog.cpp:468
msgid "Choose"
msgstr ""
-#: src/gui/charselectdialog.cpp:469
+#: src/gui/charselectdialog.cpp:471
#, c-format
msgid "Level %d"
msgstr ""
-#: src/gui/charselectdialog.cpp:480 src/gui/charselectdialog.cpp:481
+#: src/gui/charselectdialog.cpp:482 src/gui/charselectdialog.cpp:483
msgid "(empty)"
msgstr ""
-#: src/gui/chatwindow.cpp:112
+#: src/gui/chatwindow.cpp:112 src/gui/inventorywindow.cpp:70
msgid "default"
msgstr ""
@@ -699,11 +699,12 @@ msgstr ""
msgid "rainbow 3"
msgstr ""
-#: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
-#: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
-#: src/gui/setup_theme.cpp:73 src/gui/setup_theme.cpp:127
-#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
-#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
+#: src/gui/chatwindow.cpp:142 src/gui/inventorywindow.cpp:90
+#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78
+#: src/gui/setup_relations.cpp:220 src/gui/setup_theme.cpp:73
+#: src/gui/setup_theme.cpp:127 src/gui/setup_video.cpp:211
+#: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141
+#: src/gui/textcommandeditor.cpp:160
msgid "???"
msgstr "???"
@@ -736,7 +737,7 @@ msgstr "Nem"
msgid "Ignore"
msgstr ""
-#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:97
+#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:99
#: src/gui/setup_other.cpp:64
msgid "Map"
msgstr "Térkép"
@@ -877,7 +878,7 @@ msgid "Did You Know?"
msgstr ""
#: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
-#: src/gui/inventorywindow.cpp:176 src/gui/npcdialog.cpp:53
+#: src/gui/inventorywindow.cpp:206 src/gui/npcdialog.cpp:53
#: src/gui/popupmenu.cpp:588 src/gui/shopwindow.cpp:113
msgid "Close"
msgstr "Bezár"
@@ -903,10 +904,10 @@ msgstr "Ok"
msgid "Equipment"
msgstr "Felszerelés"
-#: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:131
-#: src/gui/inventorywindow.cpp:512 src/gui/inventorywindow.cpp:521
-#: src/gui/popupmenu.cpp:1693 src/gui/popupmenu.cpp:1788
-#: src/gui/popupmenu.cpp:1833
+#: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160
+#: src/gui/inventorywindow.cpp:539 src/gui/inventorywindow.cpp:548
+#: src/gui/popupmenu.cpp:1696 src/gui/popupmenu.cpp:1791
+#: src/gui/popupmenu.cpp:1836
msgid "Unequip"
msgstr "Nem használ"
@@ -914,80 +915,90 @@ msgstr "Nem használ"
msgid "Help"
msgstr "Súgó"
-#: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76
+#: src/gui/inventorywindow.cpp:71
+#, fuzzy
+msgid "by name"
+msgstr "Látható nevek"
+
+#: src/gui/inventorywindow.cpp:72
+msgid "by id"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:73
+#, fuzzy
+msgid "by weight"
+msgstr "Súly:"
+
+#: src/gui/inventorywindow.cpp:74
+msgid "by amount"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:75
+msgid "by type"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:111 src/gui/windowmenu.cpp:76
#: src/inventory.cpp:249
msgid "Inventory"
msgstr "Táska"
-#: src/gui/inventorywindow.cpp:105
+#: src/gui/inventorywindow.cpp:136
msgid "Slots:"
msgstr "Hely:"
-#: src/gui/inventorywindow.cpp:116
+#: src/gui/inventorywindow.cpp:148
msgid "Filter:"
msgstr ""
-#: src/gui/inventorywindow.cpp:117
+#: src/gui/inventorywindow.cpp:149
msgid "Sort:"
msgstr ""
-#: src/gui/inventorywindow.cpp:123
-msgid "na"
-msgstr ""
-
-#: src/gui/inventorywindow.cpp:124
-msgid "az"
-msgstr ""
-
-#: src/gui/inventorywindow.cpp:125
-msgid "id"
-msgstr ""
-
-#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
-#: src/gui/inventorywindow.cpp:523 src/gui/popupmenu.cpp:1695
-#: src/gui/popupmenu.cpp:1790 src/gui/popupmenu.cpp:1835
+#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:541
+#: src/gui/inventorywindow.cpp:550 src/gui/popupmenu.cpp:1698
+#: src/gui/popupmenu.cpp:1793 src/gui/popupmenu.cpp:1838
msgid "Equip"
msgstr "Használ"
-#: src/gui/inventorywindow.cpp:130 src/gui/inventorywindow.cpp:515
-#: src/gui/inventorywindow.cpp:519 src/gui/popupmenu.cpp:1698
-#: src/gui/popupmenu.cpp:1757 src/gui/popupmenu.cpp:1794
-#: src/gui/popupmenu.cpp:1838
+#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:542
+#: src/gui/inventorywindow.cpp:546 src/gui/popupmenu.cpp:1701
+#: src/gui/popupmenu.cpp:1760 src/gui/popupmenu.cpp:1797
+#: src/gui/popupmenu.cpp:1841
msgid "Use"
msgstr "Bevet"
-#: src/gui/inventorywindow.cpp:144 src/gui/inventorywindow.cpp:620
-#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1799
-#: src/gui/popupmenu.cpp:1842
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:646
+#: src/gui/popupmenu.cpp:1705 src/gui/popupmenu.cpp:1802
+#: src/gui/popupmenu.cpp:1845
msgid "Drop..."
msgstr ""
-#: src/gui/inventorywindow.cpp:145 src/gui/popupmenu.cpp:1711
-#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1851
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1714
+#: src/gui/popupmenu.cpp:1811 src/gui/popupmenu.cpp:1854
msgid "Split"
msgstr "Felosztás"
-#: src/gui/inventorywindow.cpp:146 src/gui/outfitwindow.cpp:60
+#: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60
#: src/gui/popupmenu.cpp:549
msgid "Outfits"
msgstr ""
-#: src/gui/inventorywindow.cpp:149
+#: src/gui/inventorywindow.cpp:178
msgid "Weight:"
msgstr "Súly:"
-#: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:611
-#: src/gui/popupmenu.cpp:1674 src/gui/popupmenu.cpp:1811
-#: src/gui/popupmenu.cpp:1854 src/gui/setup.cpp:73
+#: src/gui/inventorywindow.cpp:204 src/gui/inventorywindow.cpp:637
+#: src/gui/popupmenu.cpp:1677 src/gui/popupmenu.cpp:1814
+#: src/gui/popupmenu.cpp:1857 src/gui/setup.cpp:73
msgid "Store"
msgstr "Raktároz"
-#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1718
+#: src/gui/inventorywindow.cpp:205 src/gui/popupmenu.cpp:1721
msgid "Retrieve"
msgstr "Magához vesz"
-#: src/gui/inventorywindow.cpp:622 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1847
+#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1710
+#: src/gui/popupmenu.cpp:1807 src/gui/popupmenu.cpp:1850
#: src/gui/windowmenu.cpp:97
msgid "Drop"
msgstr "Eldob"
@@ -1041,91 +1052,91 @@ msgstr ""
msgid "Kill stats"
msgstr ""
-#: src/gui/killstats.cpp:65
+#: src/gui/killstats.cpp:66
msgid "Reset stats"
msgstr ""
-#: src/gui/killstats.cpp:66
+#: src/gui/killstats.cpp:67
msgid "Reset timer"
msgstr ""
-#: src/gui/killstats.cpp:70 src/gui/killstats.cpp:206
+#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:207
#, c-format
msgid "Level: %d at %f%%"
msgstr ""
-#: src/gui/killstats.cpp:74 src/gui/killstats.cpp:211
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:212
#, c-format
msgid "Exp: %d/%d Left: %d"
msgstr ""
-#: src/gui/killstats.cpp:77 src/gui/killstats.cpp:217
-#: src/gui/killstats.cpp:226
+#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:218
+#: src/gui/killstats.cpp:227
#, c-format
msgid "1%% = %d exp, avg mob for 1%%: %s"
msgstr ""
-#: src/gui/killstats.cpp:80 src/gui/killstats.cpp:143
-#: src/gui/killstats.cpp:235
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:236
#, c-format
msgid "Kills: %s, total exp: %s"
msgstr ""
-#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145
-#: src/gui/killstats.cpp:221 src/gui/killstats.cpp:231
+#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:146
+#: src/gui/killstats.cpp:222 src/gui/killstats.cpp:232
#, c-format
msgid "Avg Exp: %s, No. of avg mob to next level: %s"
msgstr ""
-#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:163
-#: src/gui/killstats.cpp:238
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:164
+#: src/gui/killstats.cpp:239
#, c-format
msgid "Kills/Min: %s, Exp/Min: %s"
msgstr ""
-#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:90 src/gui/killstats.cpp:95
-#: src/gui/killstats.cpp:290 src/gui/killstats.cpp:306
-#: src/gui/killstats.cpp:324
+#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
+#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
+#: src/gui/killstats.cpp:325
#, c-format
msgid "Exp speed per %d min: %s"
msgid_plural "Exp speed per %d min: %s"
msgstr[0] ""
msgstr[1] ""
-#: src/gui/killstats.cpp:88 src/gui/killstats.cpp:93 src/gui/killstats.cpp:98
+#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:94 src/gui/killstats.cpp:99
#, c-format
msgid "Time for next level per %d min: %s"
msgid_plural "Time for next level per %d min: %s"
msgstr[0] ""
msgstr[1] ""
-#: src/gui/killstats.cpp:101 src/gui/killstats.cpp:242
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
msgid "Last kill exp:"
msgstr ""
-#: src/gui/killstats.cpp:103 src/gui/killstats.cpp:356
-#: src/gui/killstats.cpp:362 src/gui/killstats.cpp:368
-#: src/gui/killstats.cpp:373
+#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
+#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:374
msgid "Time before jacko spawn:"
msgstr ""
-#: src/gui/killstats.cpp:295 src/gui/killstats.cpp:302
-#: src/gui/killstats.cpp:312 src/gui/killstats.cpp:319
-#: src/gui/killstats.cpp:331 src/gui/killstats.cpp:338
+#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
+#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
+#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
#, c-format
msgid " Time for next level: %s"
msgstr ""
-#: src/gui/killstats.cpp:362
+#: src/gui/killstats.cpp:363
#, c-format
msgid "%s %d?"
msgstr ""
-#: src/gui/killstats.cpp:368
+#: src/gui/killstats.cpp:369
msgid "jacko spawning"
msgstr ""
-#: src/guildmanager.cpp:464 src/net/ea/guildhandler.cpp:439
+#: src/guildmanager.cpp:484 src/net/ea/guildhandler.cpp:439
msgid "You have left the guild."
msgstr ""
@@ -1223,7 +1234,7 @@ msgid "Submit"
msgstr "Küldés"
#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:142
+#: src/gui/setup_other.cpp:151
msgid "NPC"
msgstr "Gépjátékos"
@@ -1311,7 +1322,7 @@ msgstr ""
#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:185
#: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:428
#: src/gui/popupmenu.cpp:677 src/gui/popupmenu.cpp:693
-#: src/playerrelations.cpp:400
+#: src/playerrelations.cpp:415
msgid "Completely ignore"
msgstr ""
@@ -1362,7 +1373,7 @@ msgid "Show Items"
msgstr ""
#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:705
-#: src/gui/popupmenu.cpp:2020
+#: src/gui/popupmenu.cpp:2023
msgid "Undress"
msgstr ""
@@ -1410,8 +1421,8 @@ msgstr ""
msgid "Pick up"
msgstr ""
-#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:1732
-#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1855
+#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:1735
+#: src/gui/popupmenu.cpp:1815 src/gui/popupmenu.cpp:1858
msgid "Add to chat"
msgstr ""
@@ -1423,8 +1434,8 @@ msgstr ""
msgid "Rename"
msgstr ""
-#: src/gui/popupmenu.cpp:532 src/gui/popupmenu.cpp:1973
-#: src/gui/popupmenu.cpp:1991 src/gui/popupmenu.cpp:1996
+#: src/gui/popupmenu.cpp:532 src/gui/popupmenu.cpp:1976
+#: src/gui/popupmenu.cpp:1994 src/gui/popupmenu.cpp:1999
msgid "Remove"
msgstr ""
@@ -1500,85 +1511,85 @@ msgstr ""
msgid "Comment: "
msgstr ""
-#: src/gui/popupmenu.cpp:1657
+#: src/gui/popupmenu.cpp:1660
msgid "Add to trade"
msgstr ""
-#: src/gui/popupmenu.cpp:1663
+#: src/gui/popupmenu.cpp:1666
msgid "Add to trade 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1666
+#: src/gui/popupmenu.cpp:1669
msgid "Add to trade half"
msgstr ""
-#: src/gui/popupmenu.cpp:1668
+#: src/gui/popupmenu.cpp:1671
msgid "Add to trade all"
msgstr ""
-#: src/gui/popupmenu.cpp:1680
+#: src/gui/popupmenu.cpp:1683
msgid "Store 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1683
+#: src/gui/popupmenu.cpp:1686
msgid "Store half"
msgstr ""
-#: src/gui/popupmenu.cpp:1685
+#: src/gui/popupmenu.cpp:1688
msgid "Store all"
msgstr ""
-#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1800
-#: src/gui/popupmenu.cpp:1843
+#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1803
+#: src/gui/popupmenu.cpp:1846
msgid "Drop all"
msgstr ""
-#: src/gui/popupmenu.cpp:1724
+#: src/gui/popupmenu.cpp:1727
msgid "Retrieve 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1727
+#: src/gui/popupmenu.cpp:1730
msgid "Retrieve half"
msgstr ""
-#: src/gui/popupmenu.cpp:1729
+#: src/gui/popupmenu.cpp:1732
msgid "Retrieve all"
msgstr ""
-#: src/gui/popupmenu.cpp:1760 src/gui/popupmenu.cpp:1816
+#: src/gui/popupmenu.cpp:1763 src/gui/popupmenu.cpp:1819
msgid "Load old item shortcuts"
msgstr ""
-#: src/gui/popupmenu.cpp:1859
+#: src/gui/popupmenu.cpp:1862
msgid "Load old drop shortcuts"
msgstr ""
-#: src/gui/popupmenu.cpp:1885 src/gui/popupmenu.cpp:1920
+#: src/gui/popupmenu.cpp:1888 src/gui/popupmenu.cpp:1923
msgid "Hide"
msgstr ""
-#: src/gui/popupmenu.cpp:1891 src/gui/popupmenu.cpp:1926
+#: src/gui/popupmenu.cpp:1894 src/gui/popupmenu.cpp:1929
msgid "Show"
msgstr ""
-#: src/gui/popupmenu.cpp:1933
+#: src/gui/popupmenu.cpp:1936
msgid "Reset yellow bar"
msgstr ""
-#: src/gui/popupmenu.cpp:1935 src/gui/statuswindow.cpp:241
+#: src/gui/popupmenu.cpp:1938 src/gui/statuswindow.cpp:241
msgid "Copy to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:1953 src/gui/socialwindow.cpp:958
+#: src/gui/popupmenu.cpp:1956 src/gui/socialwindow.cpp:958
#: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028
msgid "(default)"
msgstr ""
-#: src/gui/popupmenu.cpp:1965 src/gui/popupmenu.cpp:1983
+#: src/gui/popupmenu.cpp:1968 src/gui/popupmenu.cpp:1986
msgid "Move up"
msgstr ""
-#: src/gui/popupmenu.cpp:1970 src/gui/popupmenu.cpp:1988
+#: src/gui/popupmenu.cpp:1973 src/gui/popupmenu.cpp:1991
msgid "Move down"
msgstr ""
@@ -1824,7 +1835,7 @@ msgstr ""
msgid "Use local time"
msgstr ""
-#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:157
+#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:166
msgid "Other"
msgstr ""
@@ -1987,115 +1998,127 @@ msgstr ""
msgid "Draw hotkeys on map"
msgstr ""
-#: src/gui/setup_other.cpp:88
-msgid "Moving"
+#: src/gui/setup_other.cpp:87
+msgid "Enable lazy scrolling"
msgstr ""
#: src/gui/setup_other.cpp:90
-msgid "Auto fix position"
+msgid "Scroll laziness"
msgstr ""
#: src/gui/setup_other.cpp:93
+msgid "Scroll radius"
+msgstr ""
+
+#: src/gui/setup_other.cpp:97
+msgid "Moving"
+msgstr ""
+
+#: src/gui/setup_other.cpp:99
+msgid "Auto fix position"
+msgstr ""
+
+#: src/gui/setup_other.cpp:102
msgid "Attack while moving"
msgstr ""
-#: src/gui/setup_other.cpp:96
+#: src/gui/setup_other.cpp:105
msgid "Sync player move"
msgstr ""
-#: src/gui/setup_other.cpp:99
+#: src/gui/setup_other.cpp:108
msgid "Crazy move A program"
msgstr ""
-#: src/gui/setup_other.cpp:103
+#: src/gui/setup_other.cpp:112
msgid "Player"
msgstr ""
-#: src/gui/setup_other.cpp:105
+#: src/gui/setup_other.cpp:114
msgid "Show own hp bar"
msgstr ""
-#: src/gui/setup_other.cpp:108
+#: src/gui/setup_other.cpp:117
msgid "Enable quick stats"
msgstr ""
-#: src/gui/setup_other.cpp:111
+#: src/gui/setup_other.cpp:120
msgid "Cycle player targets"
msgstr ""
-#: src/gui/setup_other.cpp:114
+#: src/gui/setup_other.cpp:123
msgid "Show job exp messages"
msgstr ""
-#: src/gui/setup_other.cpp:117
+#: src/gui/setup_other.cpp:126
msgid "Show players popups"
msgstr ""
-#: src/gui/setup_other.cpp:120
+#: src/gui/setup_other.cpp:129
msgid "Afk message"
msgstr ""
-#: src/gui/setup_other.cpp:123
+#: src/gui/setup_other.cpp:132
msgid "Show job"
msgstr ""
-#: src/gui/setup_other.cpp:126
+#: src/gui/setup_other.cpp:135
msgid "Enable attack filter"
msgstr ""
-#: src/gui/setup_other.cpp:129
+#: src/gui/setup_other.cpp:138
msgid "Enable advert protocol"
msgstr ""
-#: src/gui/setup_other.cpp:135
+#: src/gui/setup_other.cpp:144
msgid "Accept sell/buy requests"
msgstr ""
-#: src/gui/setup_other.cpp:138
+#: src/gui/setup_other.cpp:147
msgid "Enable shop mode"
msgstr ""
-#: src/gui/setup_other.cpp:144
+#: src/gui/setup_other.cpp:153
msgid "Log NPC dialogue"
msgstr ""
-#: src/gui/setup_other.cpp:148
+#: src/gui/setup_other.cpp:157
msgid "Bots support"
msgstr ""
-#: src/gui/setup_other.cpp:150
+#: src/gui/setup_other.cpp:159
msgid "Enable auction bot support"
msgstr ""
-#: src/gui/setup_other.cpp:153
+#: src/gui/setup_other.cpp:162
msgid "Enable guild bot support and disable native guild support"
msgstr ""
-#: src/gui/setup_other.cpp:159
+#: src/gui/setup_other.cpp:168
msgid "Enable server side attack"
msgstr ""
-#: src/gui/setup_other.cpp:162
+#: src/gui/setup_other.cpp:171
msgid "Enable bot checker"
msgstr ""
-#: src/gui/setup_other.cpp:165
+#: src/gui/setup_other.cpp:174
msgid "Enable buggy servers protection"
msgstr ""
-#: src/gui/setup_other.cpp:168
+#: src/gui/setup_other.cpp:177
msgid "Enable debug log"
msgstr ""
-#: src/gui/setup_other.cpp:171
+#: src/gui/setup_other.cpp:180
msgid "Low traffic mode"
msgstr ""
-#: src/gui/setup_other.cpp:174
+#: src/gui/setup_other.cpp:183
msgid "Hide shield sprite"
msgstr ""
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:186
msgid "Show background"
msgstr ""
@@ -2112,27 +2135,27 @@ msgid "Auto adjust perfomance"
msgstr ""
#: src/gui/setup_perfomance.cpp:61
-msgid "Show beings transparency"
+msgid "Hw acceleration"
msgstr ""
#: src/gui/setup_perfomance.cpp:64
-msgid "Hw acceleration"
+msgid "Enable opacity cache (Software, can use many memory)"
msgstr ""
#: src/gui/setup_perfomance.cpp:67
-msgid "Enable opacity cache (Software, can use many memory)"
+msgid "Enable map reduce (Software)"
msgstr ""
#: src/gui/setup_perfomance.cpp:70
-msgid "Enable map reduce (Software)"
+msgid "Better quality (disable for better perfomance)"
msgstr ""
#: src/gui/setup_perfomance.cpp:73
-msgid "Better quality (disable for better perfomance)"
+msgid "Enable alpha channel fix (Software, can be very slow)"
msgstr ""
-#: src/gui/setup_perfomance.cpp:76
-msgid "Enable alpha channel fix (Software, can be very slow)"
+#: src/gui/setup_perfomance.cpp:77
+msgid "Show beings transparency"
msgstr ""
#: src/gui/setup_perfomance.cpp:80
@@ -2387,7 +2410,7 @@ msgid "FPS limit:"
msgstr ""
#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
-#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709
+#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:710
msgid "Alt FPS limit: "
msgstr ""
@@ -2413,7 +2436,7 @@ msgstr ""
#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
-#: src/gui/setup_video.cpp:707
+#: src/gui/setup_video.cpp:708
msgid "None"
msgstr ""
@@ -2519,22 +2542,22 @@ msgstr "Fejleszt"
msgid "Skill points available: %d"
msgstr ""
-#: src/gui/skilldialog.cpp:418
+#: src/gui/skilldialog.cpp:420
#, c-format
msgid "Skill Set %d"
msgstr ""
-#: src/gui/skilldialog.cpp:430
+#: src/gui/skilldialog.cpp:432
#, c-format
msgid "Skill %d"
msgstr ""
-#: src/gui/skilldialog.cpp:497 src/gui/skilldialog.cpp:550
+#: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554
#, c-format
msgid "Lvl: %d"
msgstr ""
-#: src/gui/skilldialog.cpp:542
+#: src/gui/skilldialog.cpp:546
#, c-format
msgid "Lvl: %d (%+d)"
msgstr ""
@@ -3458,23 +3481,23 @@ msgstr ""
msgid "Road Point"
msgstr ""
-#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:472
+#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:474
msgid "Who Is Online - Updating"
msgstr ""
-#: src/gui/whoisonline.cpp:102
+#: src/gui/whoisonline.cpp:104
msgid "Update"
msgstr ""
-#: src/gui/whoisonline.cpp:295
+#: src/gui/whoisonline.cpp:297
msgid "Who Is Online - "
msgstr ""
-#: src/gui/whoisonline.cpp:486
+#: src/gui/whoisonline.cpp:488
msgid "Who Is Online - error"
msgstr ""
-#: src/gui/whoisonline.cpp:517
+#: src/gui/whoisonline.cpp:519
msgid "Who Is Online - Update"
msgstr ""
@@ -4144,68 +4167,68 @@ msgid ""
"strange behaviour."
msgstr ""
-#: src/localplayer.cpp:370
+#: src/localplayer.cpp:372
msgid "You were killed by "
msgstr ""
-#: src/localplayer.cpp:1401
+#: src/localplayer.cpp:1413
msgid "Tried to pick up nonexistent item."
msgstr ""
-#: src/localplayer.cpp:1403
+#: src/localplayer.cpp:1415
msgid "Item is too heavy."
msgstr ""
-#: src/localplayer.cpp:1405
+#: src/localplayer.cpp:1417
msgid "Item is too far away."
msgstr ""
-#: src/localplayer.cpp:1407
+#: src/localplayer.cpp:1419
msgid "Inventory is full."
msgstr ""
-#: src/localplayer.cpp:1409
+#: src/localplayer.cpp:1421
msgid "Stack is too big."
msgstr ""
-#: src/localplayer.cpp:1412
+#: src/localplayer.cpp:1424
msgid "Item belongs to someone else."
msgstr ""
-#: src/localplayer.cpp:1415
+#: src/localplayer.cpp:1427
msgid "Unknown problem picking up item."
msgstr ""
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1439
+#: src/localplayer.cpp:1451
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
msgstr[0] ""
msgstr[1] ""
-#: src/localplayer.cpp:3173
+#: src/localplayer.cpp:3187
msgid "Away"
msgstr ""
-#: src/localplayer.cpp:3474
+#: src/localplayer.cpp:3488
msgid "Follow: "
msgstr ""
-#: src/localplayer.cpp:3476 src/localplayer.cpp:3491
+#: src/localplayer.cpp:3490 src/localplayer.cpp:3505
msgid "Follow canceled"
msgstr ""
-#: src/localplayer.cpp:3483
+#: src/localplayer.cpp:3497
msgid "Imitation: "
msgstr ""
-#: src/localplayer.cpp:3485 src/localplayer.cpp:3493
+#: src/localplayer.cpp:3499 src/localplayer.cpp:3507
msgid "Imitation canceled"
msgstr ""
-#: src/localplayer.cpp:3845
+#: src/localplayer.cpp:3859
msgid "You see "
msgstr ""
@@ -4406,16 +4429,16 @@ msgstr ""
msgid "MVP player: "
msgstr ""
-#: src/net/ea/gamehandler.cpp:86
+#: src/net/ea/gamehandler.cpp:87
#, c-format
msgid "Online users: %d"
msgstr ""
-#: src/net/ea/gamehandler.cpp:98
+#: src/net/ea/gamehandler.cpp:99
msgid "Game"
msgstr ""
-#: src/net/ea/gamehandler.cpp:98
+#: src/net/ea/gamehandler.cpp:99
msgid "Request to quit denied!"
msgstr ""
@@ -5459,19 +5482,19 @@ msgstr ""
msgid "%s is not in your party!"
msgstr "%s nincs a csapatodban!"
-#: src/playerrelations.cpp:414
+#: src/playerrelations.cpp:429
msgid "Print '...'"
msgstr ""
-#: src/playerrelations.cpp:434
+#: src/playerrelations.cpp:449
msgid "Blink name"
msgstr ""
-#: src/playerrelations.cpp:478
+#: src/playerrelations.cpp:493
msgid "Floating '...' bubble"
msgstr ""
-#: src/playerrelations.cpp:481
+#: src/playerrelations.cpp:496
msgid "Floating bubble"
msgstr ""
diff --git a/po/id.po b/po/id.po
index fec9e367a..adc9bd48a 100644
--- a/po/id.po
+++ b/po/id.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-09-02 18:27+0300\n"
+"POT-Creation-Date: 2011-09-10 01:34+0300\n"
"PO-Revision-Date: 2011-09-02 15:29+0000\n"
"Last-Translator: akaras <akaras@inbox.ru>\n"
"Language-Team: Indonesian (http://www.transifex.net/projects/p/manaplus/team/"
@@ -20,25 +20,25 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0\n"
-#: src/actorspritemanager.cpp:1034
+#: src/actorspritemanager.cpp:1046
msgid "Visible on map"
msgstr "Terlihat di peta"
-#: src/being.cpp:549
+#: src/being.cpp:551
msgid "dodge"
msgstr "Menghindar"
-#: src/being.cpp:549
+#: src/being.cpp:551
msgid "miss"
msgstr "Luput"
#. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1529
+#: src/being.cpp:1532
msgid "A"
msgstr "A"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1534
+#: src/being.cpp:1537
msgid "I"
msgstr "l"
@@ -108,22 +108,22 @@ msgstr "Telah tidak terdaftar"
msgid "Farewell, come back any time..."
msgstr "Selamat tinggal, datang kembali setiap saat"
-#: src/client.cpp:1428 src/client.cpp:1458 src/client.cpp:1502
-#: src/client.cpp:1927 src/client.cpp:1934
+#: src/client.cpp:1428 src/client.cpp:1458 src/client.cpp:1504
+#: src/client.cpp:1929 src/client.cpp:1936
#, 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:1633
+#: src/client.cpp:1635
#, c-format
msgid "Invalid update host: %s"
msgstr "Gagal mengupdate host: %s"
-#: src/client.cpp:1667 src/client.cpp:1673
+#: src/client.cpp:1669 src/client.cpp:1675
msgid "Error creating updates directory!"
msgstr "Gagal membuat direktori update!"
-#: src/client.cpp:1694
+#: src/client.cpp:1696
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "kesalahan %s tidak ada dan tidak dapat dibuat!keluar."
@@ -319,19 +319,19 @@ msgstr "Koneksi ke server terputus"
msgid "Network Error"
msgstr "Kesalahan jaringan"
-#: src/game.cpp:1236
+#: src/game.cpp:1243
msgid "Ignoring incoming trade requests"
msgstr "Abaikan permohonan transaksi"
-#: src/game.cpp:1243
+#: src/game.cpp:1250
msgid "Accepting incoming trade requests"
msgstr "Terima permohonan transaksi"
-#: src/game.cpp:1629
+#: src/game.cpp:1636
msgid "Could Not Load Map"
msgstr "Tidak dapat menampilkan peta"
-#: src/game.cpp:1630
+#: src/game.cpp:1637
#, c-format
msgid "Error while loading %s"
msgstr "Error ketika menunggu %s"
@@ -360,31 +360,31 @@ msgstr "Komentar: %s"
msgid "Bot Checker"
msgstr "Pengecek Bot"
-#: src/gui/botcheckerwindow.cpp:295 src/gui/setup_relations.cpp:64
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
msgid "Name"
msgstr "Nama"
-#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:133
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:133
#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:646
#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:265
msgid "Attack"
msgstr "Pukul"
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:297
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297
#: src/keyboardconfig.cpp:62
msgid "Talk"
msgstr "Berbicara"
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:263
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:263
#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:703
msgid "Move"
msgstr "Jalan"
-#: src/gui/botcheckerwindow.cpp:299
+#: src/gui/botcheckerwindow.cpp:300
msgid "Result"
msgstr "Hasil"
-#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:124
+#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:124
msgid "Reset"
msgstr "Reset"
@@ -430,7 +430,7 @@ msgid "Max"
msgstr "Max"
#: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:147 src/gui/setup_other.cpp:133
+#: src/gui/inventorywindow.cpp:176 src/gui/setup_other.cpp:142
msgid "Shop"
msgstr "Toko"
@@ -449,10 +449,10 @@ msgstr "Jual"
#: src/gui/popupmenu.cpp:516 src/gui/popupmenu.cpp:540
#: src/gui/popupmenu.cpp:554 src/gui/popupmenu.cpp:573
#: src/gui/popupmenu.cpp:790 src/gui/popupmenu.cpp:814
-#: src/gui/popupmenu.cpp:1734 src/gui/popupmenu.cpp:1762
-#: src/gui/popupmenu.cpp:1818 src/gui/popupmenu.cpp:1861
-#: src/gui/popupmenu.cpp:1896 src/gui/popupmenu.cpp:1936
-#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2023
+#: src/gui/popupmenu.cpp:1737 src/gui/popupmenu.cpp:1765
+#: src/gui/popupmenu.cpp:1821 src/gui/popupmenu.cpp:1864
+#: src/gui/popupmenu.cpp:1899 src/gui/popupmenu.cpp:1939
+#: src/gui/popupmenu.cpp:2006 src/gui/popupmenu.cpp:2026
#: src/gui/quitdialog.cpp:54 src/gui/register.cpp:82 src/gui/setup.cpp:72
#: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:238
#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
@@ -554,7 +554,7 @@ msgstr "Gaya rambut"
msgid "Race:"
msgstr "Ras:"
-#: src/gui/charcreatedialog.cpp:95 src/gui/charselectdialog.cpp:478
+#: src/gui/charcreatedialog.cpp:95 src/gui/charselectdialog.cpp:480
#: src/gui/socialwindow.cpp:1139
msgid "Create"
msgstr "Buat"
@@ -622,26 +622,26 @@ msgstr "Masukan Sandi untuk menghapus karakter"
msgid "Enter password:"
msgstr "Masukkan sandi"
-#: src/gui/charselectdialog.cpp:408 src/gui/serverdialog.cpp:298
+#: src/gui/charselectdialog.cpp:410 src/gui/serverdialog.cpp:298
#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:122
#: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:241
msgid "Delete"
msgstr "Hapus"
-#: src/gui/charselectdialog.cpp:466
+#: src/gui/charselectdialog.cpp:468
msgid "Choose"
msgstr "Pilih"
-#: src/gui/charselectdialog.cpp:469
+#: src/gui/charselectdialog.cpp:471
#, c-format
msgid "Level %d"
msgstr "Level %d"
-#: src/gui/charselectdialog.cpp:480 src/gui/charselectdialog.cpp:481
+#: src/gui/charselectdialog.cpp:482 src/gui/charselectdialog.cpp:483
msgid "(empty)"
msgstr "(kosong)"
-#: src/gui/chatwindow.cpp:112
+#: src/gui/chatwindow.cpp:112 src/gui/inventorywindow.cpp:70
msgid "default"
msgstr "kembalikan ke semula"
@@ -697,11 +697,12 @@ msgstr "pelangi 2"
msgid "rainbow 3"
msgstr "pelangi 3"
-#: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
-#: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
-#: src/gui/setup_theme.cpp:73 src/gui/setup_theme.cpp:127
-#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
-#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
+#: src/gui/chatwindow.cpp:142 src/gui/inventorywindow.cpp:90
+#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78
+#: src/gui/setup_relations.cpp:220 src/gui/setup_theme.cpp:73
+#: src/gui/setup_theme.cpp:127 src/gui/setup_video.cpp:211
+#: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141
+#: src/gui/textcommandeditor.cpp:160
msgid "???"
msgstr "???"
@@ -734,7 +735,7 @@ msgstr "Tidak"
msgid "Ignore"
msgstr "Abaikan"
-#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:97
+#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:99
#: src/gui/setup_other.cpp:64
msgid "Map"
msgstr "Peta"
@@ -875,7 +876,7 @@ msgid "Did You Know?"
msgstr "Apakah kamu tahu?"
#: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
-#: src/gui/inventorywindow.cpp:176 src/gui/npcdialog.cpp:53
+#: src/gui/inventorywindow.cpp:206 src/gui/npcdialog.cpp:53
#: src/gui/popupmenu.cpp:588 src/gui/shopwindow.cpp:113
msgid "Close"
msgstr "Tutup"
@@ -901,10 +902,10 @@ msgstr "OK"
msgid "Equipment"
msgstr "Perlengkapan"
-#: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:131
-#: src/gui/inventorywindow.cpp:512 src/gui/inventorywindow.cpp:521
-#: src/gui/popupmenu.cpp:1693 src/gui/popupmenu.cpp:1788
-#: src/gui/popupmenu.cpp:1833
+#: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160
+#: src/gui/inventorywindow.cpp:539 src/gui/inventorywindow.cpp:548
+#: src/gui/popupmenu.cpp:1696 src/gui/popupmenu.cpp:1791
+#: src/gui/popupmenu.cpp:1836
msgid "Unequip"
msgstr "Lepaskan"
@@ -912,80 +913,90 @@ msgstr "Lepaskan"
msgid "Help"
msgstr "Bantuan"
-#: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76
+#: src/gui/inventorywindow.cpp:71
+#, fuzzy
+msgid "by name"
+msgstr "Ganti nama"
+
+#: src/gui/inventorywindow.cpp:72
+msgid "by id"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:73
+#, fuzzy
+msgid "by weight"
+msgstr "Berat"
+
+#: src/gui/inventorywindow.cpp:74
+msgid "by amount"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:75
+msgid "by type"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:111 src/gui/windowmenu.cpp:76
#: src/inventory.cpp:249
msgid "Inventory"
msgstr "Perbekalan"
-#: src/gui/inventorywindow.cpp:105
+#: src/gui/inventorywindow.cpp:136
msgid "Slots:"
msgstr "Slot"
-#: src/gui/inventorywindow.cpp:116
+#: src/gui/inventorywindow.cpp:148
msgid "Filter:"
msgstr "Penyaring:"
-#: src/gui/inventorywindow.cpp:117
+#: src/gui/inventorywindow.cpp:149
msgid "Sort:"
msgstr "Susun"
-#: src/gui/inventorywindow.cpp:123
-msgid "na"
-msgstr "t/a"
-
-#: src/gui/inventorywindow.cpp:124
-msgid "az"
-msgstr "az"
-
-#: src/gui/inventorywindow.cpp:125
-msgid "id"
-msgstr "id"
-
-#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
-#: src/gui/inventorywindow.cpp:523 src/gui/popupmenu.cpp:1695
-#: src/gui/popupmenu.cpp:1790 src/gui/popupmenu.cpp:1835
+#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:541
+#: src/gui/inventorywindow.cpp:550 src/gui/popupmenu.cpp:1698
+#: src/gui/popupmenu.cpp:1793 src/gui/popupmenu.cpp:1838
msgid "Equip"
msgstr "Pakai"
-#: src/gui/inventorywindow.cpp:130 src/gui/inventorywindow.cpp:515
-#: src/gui/inventorywindow.cpp:519 src/gui/popupmenu.cpp:1698
-#: src/gui/popupmenu.cpp:1757 src/gui/popupmenu.cpp:1794
-#: src/gui/popupmenu.cpp:1838
+#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:542
+#: src/gui/inventorywindow.cpp:546 src/gui/popupmenu.cpp:1701
+#: src/gui/popupmenu.cpp:1760 src/gui/popupmenu.cpp:1797
+#: src/gui/popupmenu.cpp:1841
msgid "Use"
msgstr "Gunakan"
-#: src/gui/inventorywindow.cpp:144 src/gui/inventorywindow.cpp:620
-#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1799
-#: src/gui/popupmenu.cpp:1842
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:646
+#: src/gui/popupmenu.cpp:1705 src/gui/popupmenu.cpp:1802
+#: src/gui/popupmenu.cpp:1845
msgid "Drop..."
msgstr "Buang..."
-#: src/gui/inventorywindow.cpp:145 src/gui/popupmenu.cpp:1711
-#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1851
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1714
+#: src/gui/popupmenu.cpp:1811 src/gui/popupmenu.cpp:1854
msgid "Split"
msgstr "Pecah"
-#: src/gui/inventorywindow.cpp:146 src/gui/outfitwindow.cpp:60
+#: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60
#: src/gui/popupmenu.cpp:549
msgid "Outfits"
msgstr "Setelan"
-#: src/gui/inventorywindow.cpp:149
+#: src/gui/inventorywindow.cpp:178
msgid "Weight:"
msgstr "Berat"
-#: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:611
-#: src/gui/popupmenu.cpp:1674 src/gui/popupmenu.cpp:1811
-#: src/gui/popupmenu.cpp:1854 src/gui/setup.cpp:73
+#: src/gui/inventorywindow.cpp:204 src/gui/inventorywindow.cpp:637
+#: src/gui/popupmenu.cpp:1677 src/gui/popupmenu.cpp:1814
+#: src/gui/popupmenu.cpp:1857 src/gui/setup.cpp:73
msgid "Store"
msgstr "Simpan"
-#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1718
+#: src/gui/inventorywindow.cpp:205 src/gui/popupmenu.cpp:1721
msgid "Retrieve"
msgstr "Kembalikan"
-#: src/gui/inventorywindow.cpp:622 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1847
+#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1710
+#: src/gui/popupmenu.cpp:1807 src/gui/popupmenu.cpp:1850
#: src/gui/windowmenu.cpp:97
msgid "Drop"
msgstr "Buang"
@@ -1039,89 +1050,89 @@ msgstr "Berat: %s"
msgid "Kill stats"
msgstr "Stat membunuh"
-#: src/gui/killstats.cpp:65
+#: src/gui/killstats.cpp:66
msgid "Reset stats"
msgstr "Atur ulang stats"
-#: src/gui/killstats.cpp:66
+#: src/gui/killstats.cpp:67
msgid "Reset timer"
msgstr "Atur ulang penghitung waktu"
-#: src/gui/killstats.cpp:70 src/gui/killstats.cpp:206
+#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:207
#, c-format
msgid "Level: %d at %f%%"
msgstr "Level: %d pada %f%%"
-#: src/gui/killstats.cpp:74 src/gui/killstats.cpp:211
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:212
#, c-format
msgid "Exp: %d/%d Left: %d"
msgstr "Exp: %d%d Tersisa:%d"
-#: src/gui/killstats.cpp:77 src/gui/killstats.cpp:217
-#: src/gui/killstats.cpp:226
+#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:218
+#: src/gui/killstats.cpp:227
#, c-format
msgid "1%% = %d exp, avg mob for 1%%: %s"
msgstr "%%= %d exp, rata-rata mob untuk 1%%: %s"
-#: src/gui/killstats.cpp:80 src/gui/killstats.cpp:143
-#: src/gui/killstats.cpp:235
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:236
#, c-format
msgid "Kills: %s, total exp: %s"
msgstr "Membunuh: %s, exp total: %s"
-#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145
-#: src/gui/killstats.cpp:221 src/gui/killstats.cpp:231
+#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:146
+#: src/gui/killstats.cpp:222 src/gui/killstats.cpp:232
#, c-format
msgid "Avg Exp: %s, No. of avg mob to next level: %s"
msgstr "Rata-rata: %s, No. dari rata-rata mob ke level selanjutnya: %s"
-#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:163
-#: src/gui/killstats.cpp:238
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:164
+#: src/gui/killstats.cpp:239
#, c-format
msgid "Kills/Min: %s, Exp/Min: %s"
msgstr "Membunuh/menit: %s, Exp/menit: %s"
-#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:90 src/gui/killstats.cpp:95
-#: src/gui/killstats.cpp:290 src/gui/killstats.cpp:306
-#: src/gui/killstats.cpp:324
+#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
+#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
+#: src/gui/killstats.cpp:325
#, c-format
msgid "Exp speed per %d min: %s"
msgid_plural "Exp speed per %d min: %s"
msgstr[0] "Kecepatan Exp per %d menit: %s"
-#: src/gui/killstats.cpp:88 src/gui/killstats.cpp:93 src/gui/killstats.cpp:98
+#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:94 src/gui/killstats.cpp:99
#, c-format
msgid "Time for next level per %d min: %s"
msgid_plural "Time for next level per %d min: %s"
msgstr[0] "Waktu sebelum naik ke level selanjutnya %d menit: %s"
-#: src/gui/killstats.cpp:101 src/gui/killstats.cpp:242
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
msgid "Last kill exp:"
msgstr "Exp terakhir"
-#: src/gui/killstats.cpp:103 src/gui/killstats.cpp:356
-#: src/gui/killstats.cpp:362 src/gui/killstats.cpp:368
-#: src/gui/killstats.cpp:373
+#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
+#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:374
msgid "Time before jacko spawn:"
msgstr "waktu sebelum Jacko kembali"
-#: src/gui/killstats.cpp:295 src/gui/killstats.cpp:302
-#: src/gui/killstats.cpp:312 src/gui/killstats.cpp:319
-#: src/gui/killstats.cpp:331 src/gui/killstats.cpp:338
+#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
+#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
+#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
#, c-format
msgid " Time for next level: %s"
msgstr "waktu untuk ke level selanjutnya: %s"
-#: src/gui/killstats.cpp:362
+#: src/gui/killstats.cpp:363
#, c-format
msgid "%s %d?"
msgstr "%s %d?"
-#: src/gui/killstats.cpp:368
+#: src/gui/killstats.cpp:369
msgid "jacko spawning"
msgstr "Jacko bertelur"
-#: src/guildmanager.cpp:464 src/net/ea/guildhandler.cpp:439
+#: src/guildmanager.cpp:484 src/net/ea/guildhandler.cpp:439
msgid "You have left the guild."
msgstr ""
@@ -1219,7 +1230,7 @@ msgid "Submit"
msgstr "Masukan"
#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:142
+#: src/gui/setup_other.cpp:151
msgid "NPC"
msgstr "NPC"
@@ -1307,7 +1318,7 @@ msgstr "Batalkan pengabaian"
#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:185
#: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:428
#: src/gui/popupmenu.cpp:677 src/gui/popupmenu.cpp:693
-#: src/playerrelations.cpp:400
+#: src/playerrelations.cpp:415
msgid "Completely ignore"
msgstr ""
@@ -1358,7 +1369,7 @@ msgid "Show Items"
msgstr "Perlihatkan item"
#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:705
-#: src/gui/popupmenu.cpp:2020
+#: src/gui/popupmenu.cpp:2023
msgid "Undress"
msgstr "Tanggalkan pakaian"
@@ -1406,8 +1417,8 @@ msgstr "Tambahkan nama ke Obrolan"
msgid "Pick up"
msgstr "Ambil"
-#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:1732
-#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1855
+#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:1735
+#: src/gui/popupmenu.cpp:1815 src/gui/popupmenu.cpp:1858
msgid "Add to chat"
msgstr "Ambil ke obrolan"
@@ -1419,8 +1430,8 @@ msgstr "Daftar barang"
msgid "Rename"
msgstr "Ganti nama"
-#: src/gui/popupmenu.cpp:532 src/gui/popupmenu.cpp:1973
-#: src/gui/popupmenu.cpp:1991 src/gui/popupmenu.cpp:1996
+#: src/gui/popupmenu.cpp:532 src/gui/popupmenu.cpp:1976
+#: src/gui/popupmenu.cpp:1994 src/gui/popupmenu.cpp:1999
msgid "Remove"
msgstr "Hapus"
@@ -1496,85 +1507,85 @@ msgstr "Komentar pemain"
msgid "Comment: "
msgstr "komentar"
-#: src/gui/popupmenu.cpp:1657
+#: src/gui/popupmenu.cpp:1660
msgid "Add to trade"
msgstr ""
-#: src/gui/popupmenu.cpp:1663
+#: src/gui/popupmenu.cpp:1666
msgid "Add to trade 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1666
+#: src/gui/popupmenu.cpp:1669
msgid "Add to trade half"
msgstr ""
-#: src/gui/popupmenu.cpp:1668
+#: src/gui/popupmenu.cpp:1671
msgid "Add to trade all"
msgstr "Tambahkan semua ke Penukaran"
-#: src/gui/popupmenu.cpp:1680
+#: src/gui/popupmenu.cpp:1683
msgid "Store 10"
msgstr "Masukkan 10"
-#: src/gui/popupmenu.cpp:1683
+#: src/gui/popupmenu.cpp:1686
msgid "Store half"
msgstr "Masukkan setengah"
-#: src/gui/popupmenu.cpp:1685
+#: src/gui/popupmenu.cpp:1688
msgid "Store all"
msgstr "Masukkan semua"
-#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1800
-#: src/gui/popupmenu.cpp:1843
+#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1803
+#: src/gui/popupmenu.cpp:1846
msgid "Drop all"
msgstr "Buang semuanya"
-#: src/gui/popupmenu.cpp:1724
+#: src/gui/popupmenu.cpp:1727
msgid "Retrieve 10"
msgstr "Ambil 10"
-#: src/gui/popupmenu.cpp:1727
+#: src/gui/popupmenu.cpp:1730
msgid "Retrieve half"
msgstr "Ambil setengah"
-#: src/gui/popupmenu.cpp:1729
+#: src/gui/popupmenu.cpp:1732
msgid "Retrieve all"
msgstr "Ambil semua"
-#: src/gui/popupmenu.cpp:1760 src/gui/popupmenu.cpp:1816
+#: src/gui/popupmenu.cpp:1763 src/gui/popupmenu.cpp:1819
msgid "Load old item shortcuts"
msgstr "Muat jalan pintas iItem lama"
-#: src/gui/popupmenu.cpp:1859
+#: src/gui/popupmenu.cpp:1862
msgid "Load old drop shortcuts"
msgstr "Muat jalan pintas Buang yang lama"
-#: src/gui/popupmenu.cpp:1885 src/gui/popupmenu.cpp:1920
+#: src/gui/popupmenu.cpp:1888 src/gui/popupmenu.cpp:1923
msgid "Hide"
msgstr "Sembunyikan"
-#: src/gui/popupmenu.cpp:1891 src/gui/popupmenu.cpp:1926
+#: src/gui/popupmenu.cpp:1894 src/gui/popupmenu.cpp:1929
msgid "Show"
msgstr "Tampilkan"
-#: src/gui/popupmenu.cpp:1933
+#: src/gui/popupmenu.cpp:1936
msgid "Reset yellow bar"
msgstr "Atur ulang bar kuning"
-#: src/gui/popupmenu.cpp:1935 src/gui/statuswindow.cpp:241
+#: src/gui/popupmenu.cpp:1938 src/gui/statuswindow.cpp:241
msgid "Copy to chat"
msgstr "Pindahkan ke chat"
-#: src/gui/popupmenu.cpp:1953 src/gui/socialwindow.cpp:958
+#: src/gui/popupmenu.cpp:1956 src/gui/socialwindow.cpp:958
#: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028
msgid "(default)"
msgstr "(kembalikan)"
-#: src/gui/popupmenu.cpp:1965 src/gui/popupmenu.cpp:1983
+#: src/gui/popupmenu.cpp:1968 src/gui/popupmenu.cpp:1986
msgid "Move up"
msgstr "Bergerak keatas"
-#: src/gui/popupmenu.cpp:1970 src/gui/popupmenu.cpp:1988
+#: src/gui/popupmenu.cpp:1973 src/gui/popupmenu.cpp:1991
msgid "Move down"
msgstr "Bergerak kebawah"
@@ -1820,7 +1831,7 @@ msgstr "Waktu"
msgid "Use local time"
msgstr "Pengunaan waktu lokal"
-#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:157
+#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:166
msgid "Other"
msgstr "Lainnya"
@@ -1983,115 +1994,128 @@ msgstr ""
msgid "Draw hotkeys on map"
msgstr ""
-#: src/gui/setup_other.cpp:88
+#: src/gui/setup_other.cpp:87
+#, fuzzy
+msgid "Enable lazy scrolling"
+msgstr "Perbolehkan riwayat obrolan"
+
+#: src/gui/setup_other.cpp:90
+msgid "Scroll laziness"
+msgstr ""
+
+#: src/gui/setup_other.cpp:93
+msgid "Scroll radius"
+msgstr ""
+
+#: src/gui/setup_other.cpp:97
msgid "Moving"
msgstr "Bergerak"
-#: src/gui/setup_other.cpp:90
+#: src/gui/setup_other.cpp:99
msgid "Auto fix position"
msgstr "Perbaiki posisi otomatis"
-#: src/gui/setup_other.cpp:93
+#: src/gui/setup_other.cpp:102
msgid "Attack while moving"
msgstr "Menyerang ketika berjalan"
-#: src/gui/setup_other.cpp:96
+#: src/gui/setup_other.cpp:105
msgid "Sync player move"
msgstr ""
-#: src/gui/setup_other.cpp:99
+#: src/gui/setup_other.cpp:108
msgid "Crazy move A program"
msgstr "Program Crazy move A"
-#: src/gui/setup_other.cpp:103
+#: src/gui/setup_other.cpp:112
msgid "Player"
msgstr "Pemain"
-#: src/gui/setup_other.cpp:105
+#: src/gui/setup_other.cpp:114
msgid "Show own hp bar"
msgstr "Tampilkan hp bar sendiri"
-#: src/gui/setup_other.cpp:108
+#: src/gui/setup_other.cpp:117
msgid "Enable quick stats"
msgstr ""
-#: src/gui/setup_other.cpp:111
+#: src/gui/setup_other.cpp:120
msgid "Cycle player targets"
msgstr "Siklus target pemain"
-#: src/gui/setup_other.cpp:114
+#: src/gui/setup_other.cpp:123
msgid "Show job exp messages"
msgstr "Tampilkan pesan exp job"
-#: src/gui/setup_other.cpp:117
+#: src/gui/setup_other.cpp:126
msgid "Show players popups"
msgstr "Tampilkan popup pemain"
-#: src/gui/setup_other.cpp:120
+#: src/gui/setup_other.cpp:129
msgid "Afk message"
msgstr "Pesan saat meninggalkan keyboard"
-#: src/gui/setup_other.cpp:123
+#: src/gui/setup_other.cpp:132
msgid "Show job"
msgstr "Perlihatkan Job"
-#: src/gui/setup_other.cpp:126
+#: src/gui/setup_other.cpp:135
msgid "Enable attack filter"
msgstr "Perbolehkan Penyaring Serangan"
-#: src/gui/setup_other.cpp:129
+#: src/gui/setup_other.cpp:138
msgid "Enable advert protocol"
msgstr ""
-#: src/gui/setup_other.cpp:135
+#: src/gui/setup_other.cpp:144
msgid "Accept sell/buy requests"
msgstr "Terima permintaan jual/beli"
-#: src/gui/setup_other.cpp:138
+#: src/gui/setup_other.cpp:147
msgid "Enable shop mode"
msgstr "Perbolehkan mode Jual"
-#: src/gui/setup_other.cpp:144
+#: src/gui/setup_other.cpp:153
msgid "Log NPC dialogue"
msgstr "Riwayat dialog NPC"
-#: src/gui/setup_other.cpp:148
+#: src/gui/setup_other.cpp:157
msgid "Bots support"
msgstr ""
-#: src/gui/setup_other.cpp:150
+#: src/gui/setup_other.cpp:159
msgid "Enable auction bot support"
msgstr ""
-#: src/gui/setup_other.cpp:153
+#: src/gui/setup_other.cpp:162
msgid "Enable guild bot support and disable native guild support"
msgstr ""
-#: src/gui/setup_other.cpp:159
+#: src/gui/setup_other.cpp:168
msgid "Enable server side attack"
msgstr ""
-#: src/gui/setup_other.cpp:162
+#: src/gui/setup_other.cpp:171
msgid "Enable bot checker"
msgstr "Perbolehkan pengecekan bot"
-#: src/gui/setup_other.cpp:165
+#: src/gui/setup_other.cpp:174
msgid "Enable buggy servers protection"
msgstr ""
-#: src/gui/setup_other.cpp:168
+#: src/gui/setup_other.cpp:177
msgid "Enable debug log"
msgstr ""
-#: src/gui/setup_other.cpp:171
+#: src/gui/setup_other.cpp:180
msgid "Low traffic mode"
msgstr ""
-#: src/gui/setup_other.cpp:174
+#: src/gui/setup_other.cpp:183
msgid "Hide shield sprite"
msgstr ""
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:186
msgid "Show background"
msgstr "Perlihatkan latar belakang"
@@ -2108,29 +2132,29 @@ msgid "Auto adjust perfomance"
msgstr ""
#: src/gui/setup_perfomance.cpp:61
-msgid "Show beings transparency"
-msgstr ""
-
-#: src/gui/setup_perfomance.cpp:64
msgid "Hw acceleration"
msgstr "Akselerasi perangkat keras"
-#: src/gui/setup_perfomance.cpp:67
+#: src/gui/setup_perfomance.cpp:64
msgid "Enable opacity cache (Software, can use many memory)"
msgstr ""
-#: src/gui/setup_perfomance.cpp:70
+#: src/gui/setup_perfomance.cpp:67
msgid "Enable map reduce (Software)"
msgstr ""
-#: src/gui/setup_perfomance.cpp:73
+#: src/gui/setup_perfomance.cpp:70
msgid "Better quality (disable for better perfomance)"
msgstr ""
-#: src/gui/setup_perfomance.cpp:76
+#: src/gui/setup_perfomance.cpp:73
msgid "Enable alpha channel fix (Software, can be very slow)"
msgstr ""
+#: src/gui/setup_perfomance.cpp:77
+msgid "Show beings transparency"
+msgstr ""
+
#: src/gui/setup_perfomance.cpp:80
msgid "Enable reorder sprites."
msgstr ""
@@ -2383,7 +2407,7 @@ msgid "FPS limit:"
msgstr "Batas FPS:"
#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
-#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709
+#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:710
msgid "Alt FPS limit: "
msgstr "batas Alt FPS:"
@@ -2409,7 +2433,7 @@ msgstr "Detil partikel"
#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
-#: src/gui/setup_video.cpp:707
+#: src/gui/setup_video.cpp:708
msgid "None"
msgstr "Tidak ada"
@@ -2515,22 +2539,22 @@ msgstr "Naik"
msgid "Skill points available: %d"
msgstr "poin Skill yang tersedia: %d"
-#: src/gui/skilldialog.cpp:418
+#: src/gui/skilldialog.cpp:420
#, c-format
msgid "Skill Set %d"
msgstr ""
-#: src/gui/skilldialog.cpp:430
+#: src/gui/skilldialog.cpp:432
#, c-format
msgid "Skill %d"
msgstr "Skill %d"
-#: src/gui/skilldialog.cpp:497 src/gui/skilldialog.cpp:550
+#: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554
#, c-format
msgid "Lvl: %d"
msgstr "Level: %d"
-#: src/gui/skilldialog.cpp:542
+#: src/gui/skilldialog.cpp:546
#, c-format
msgid "Lvl: %d (%+d)"
msgstr "Level: %d (%+d)"
@@ -3453,23 +3477,23 @@ msgstr ""
msgid "Road Point"
msgstr ""
-#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:472
+#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:474
msgid "Who Is Online - Updating"
msgstr ""
-#: src/gui/whoisonline.cpp:102
+#: src/gui/whoisonline.cpp:104
msgid "Update"
msgstr ""
-#: src/gui/whoisonline.cpp:295
+#: src/gui/whoisonline.cpp:297
msgid "Who Is Online - "
msgstr ""
-#: src/gui/whoisonline.cpp:486
+#: src/gui/whoisonline.cpp:488
msgid "Who Is Online - error"
msgstr ""
-#: src/gui/whoisonline.cpp:517
+#: src/gui/whoisonline.cpp:519
msgid "Who Is Online - Update"
msgstr ""
@@ -4137,67 +4161,67 @@ msgid ""
"strange behaviour."
msgstr ""
-#: src/localplayer.cpp:370
+#: src/localplayer.cpp:372
msgid "You were killed by "
msgstr ""
-#: src/localplayer.cpp:1401
+#: src/localplayer.cpp:1413
msgid "Tried to pick up nonexistent item."
msgstr "Mencoba mengambil item yang tidak lagi ada"
-#: src/localplayer.cpp:1403
+#: src/localplayer.cpp:1415
msgid "Item is too heavy."
msgstr "item terlalu berat"
-#: src/localplayer.cpp:1405
+#: src/localplayer.cpp:1417
msgid "Item is too far away."
msgstr "barang terlalu jauh"
-#: src/localplayer.cpp:1407
+#: src/localplayer.cpp:1419
msgid "Inventory is full."
msgstr "Perbekalan sudah penuh"
-#: src/localplayer.cpp:1409
+#: src/localplayer.cpp:1421
msgid "Stack is too big."
msgstr ""
-#: src/localplayer.cpp:1412
+#: src/localplayer.cpp:1424
msgid "Item belongs to someone else."
msgstr "Barang milik orang lain."
-#: src/localplayer.cpp:1415
+#: src/localplayer.cpp:1427
msgid "Unknown problem picking up item."
msgstr ""
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1439
+#: src/localplayer.cpp:1451
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
msgstr[0] ""
-#: src/localplayer.cpp:3173
+#: src/localplayer.cpp:3187
msgid "Away"
msgstr ""
-#: src/localplayer.cpp:3474
+#: src/localplayer.cpp:3488
msgid "Follow: "
msgstr "Ikuti:"
-#: src/localplayer.cpp:3476 src/localplayer.cpp:3491
+#: src/localplayer.cpp:3490 src/localplayer.cpp:3505
msgid "Follow canceled"
msgstr "Batal mengikuti"
-#: src/localplayer.cpp:3483
+#: src/localplayer.cpp:3497
msgid "Imitation: "
msgstr "Tirukan:"
-#: src/localplayer.cpp:3485 src/localplayer.cpp:3493
+#: src/localplayer.cpp:3499 src/localplayer.cpp:3507
msgid "Imitation canceled"
msgstr "Batal menirukan"
-#: src/localplayer.cpp:3845
+#: src/localplayer.cpp:3859
msgid "You see "
msgstr ""
@@ -4398,16 +4422,16 @@ msgstr ""
msgid "MVP player: "
msgstr ""
-#: src/net/ea/gamehandler.cpp:86
+#: src/net/ea/gamehandler.cpp:87
#, c-format
msgid "Online users: %d"
msgstr ""
-#: src/net/ea/gamehandler.cpp:98
+#: src/net/ea/gamehandler.cpp:99
msgid "Game"
msgstr ""
-#: src/net/ea/gamehandler.cpp:98
+#: src/net/ea/gamehandler.cpp:99
msgid "Request to quit denied!"
msgstr ""
@@ -5449,19 +5473,19 @@ msgstr ""
msgid "%s is not in your party!"
msgstr ""
-#: src/playerrelations.cpp:414
+#: src/playerrelations.cpp:429
msgid "Print '...'"
msgstr ""
-#: src/playerrelations.cpp:434
+#: src/playerrelations.cpp:449
msgid "Blink name"
msgstr ""
-#: src/playerrelations.cpp:478
+#: src/playerrelations.cpp:493
msgid "Floating '...' bubble"
msgstr ""
-#: src/playerrelations.cpp:481
+#: src/playerrelations.cpp:496
msgid "Floating bubble"
msgstr ""
@@ -5493,3 +5517,12 @@ msgstr "MP %+d"
#: src/resources/itemdb.cpp:169
msgid "Unknown item"
msgstr ""
+
+#~ msgid "na"
+#~ msgstr "t/a"
+
+#~ msgid "az"
+#~ msgstr "az"
+
+#~ msgid "id"
+#~ msgstr "id"
diff --git a/po/ja.po b/po/ja.po
index 7b964a5ec..ef61ead4f 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -2,16 +2,17 @@
# Copyright (C) YEAR The ManaPlus Developers
# This file is distributed under the same license as the PACKAGE package.
#
-# <Necromong@inbox.ru>, 2011.
+# Translators:
+# Andrei Karas <akaras@inbox.ru>, 2011.
# Necromonger <Necromong@inbox.ru>, 2011.
+# <Necromong@inbox.ru>, 2011.
# sn0w75 <ibenrunnin@gmail.com>, 2011.
-# Andrei Karas <akaras@inbox.ru>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-09-02 18:27+0300\n"
-"PO-Revision-Date: 2011-09-02 15:29+0000\n"
+"POT-Creation-Date: 2011-09-10 01:34+0300\n"
+"PO-Revision-Date: 2011-09-09 22:37+0000\n"
"Last-Translator: akaras <akaras@inbox.ru>\n"
"Language-Team: Japanese (http://www.transifex.net/projects/p/manaplus/team/"
"ja/)\n"
@@ -21,25 +22,25 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0\n"
-#: src/actorspritemanager.cpp:1034
+#: src/actorspritemanager.cpp:1046
msgid "Visible on map"
msgstr ""
-#: src/being.cpp:549
+#: src/being.cpp:551
msgid "dodge"
msgstr "ドッジ"
-#: src/being.cpp:549
+#: src/being.cpp:551
msgid "miss"
msgstr "ミス"
#. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1529
+#: src/being.cpp:1532
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1534
+#: src/being.cpp:1537
msgid "I"
msgstr ""
@@ -109,22 +110,22 @@ msgstr "登録解除成功"
msgid "Farewell, come back any time..."
msgstr "さよなら、いつでも戻ってね..."
-#: src/client.cpp:1428 src/client.cpp:1458 src/client.cpp:1502
-#: src/client.cpp:1927 src/client.cpp:1934
+#: src/client.cpp:1428 src/client.cpp:1458 src/client.cpp:1504
+#: src/client.cpp:1929 src/client.cpp:1936
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%s は存在しないので作成することが不可能!終了中…"
-#: src/client.cpp:1633
+#: src/client.cpp:1635
#, c-format
msgid "Invalid update host: %s"
msgstr "無効なアップデートホスト: %s"
-#: src/client.cpp:1667 src/client.cpp:1673
+#: src/client.cpp:1669 src/client.cpp:1675
msgid "Error creating updates directory!"
msgstr "更新フォルダの作成エラー"
-#: src/client.cpp:1694
+#: src/client.cpp:1696
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "エラー: %s は存在しないので作成することが不可能!終了中…"
@@ -321,19 +322,19 @@ msgstr ""
msgid "Network Error"
msgstr "ネットワークエラー"
-#: src/game.cpp:1236
+#: src/game.cpp:1243
msgid "Ignoring incoming trade requests"
msgstr "他人からのトレードリクエストを無視します。"
-#: src/game.cpp:1243
+#: src/game.cpp:1250
msgid "Accepting incoming trade requests"
msgstr "他人からのトレードリクエストを受け入れます。"
-#: src/game.cpp:1629
+#: src/game.cpp:1636
msgid "Could Not Load Map"
msgstr "マップをロードできませんでした"
-#: src/game.cpp:1630
+#: src/game.cpp:1637
#, c-format
msgid "Error while loading %s"
msgstr "%sをロードしている間にエラーが起きました。"
@@ -362,31 +363,31 @@ msgstr ""
msgid "Bot Checker"
msgstr "ボット"
-#: src/gui/botcheckerwindow.cpp:295 src/gui/setup_relations.cpp:64
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
msgid "Name"
msgstr "名前"
-#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:133
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:133
#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:646
#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:265
msgid "Attack"
msgstr "攻撃"
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:297
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297
#: src/keyboardconfig.cpp:62
msgid "Talk"
msgstr "話す"
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:263
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:263
#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:703
msgid "Move"
msgstr "動く"
-#: src/gui/botcheckerwindow.cpp:299
+#: src/gui/botcheckerwindow.cpp:300
msgid "Result"
msgstr "結果"
-#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:124
+#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:124
msgid "Reset"
msgstr "リセット"
@@ -432,7 +433,7 @@ msgid "Max"
msgstr "最大"
#: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:147 src/gui/setup_other.cpp:133
+#: src/gui/inventorywindow.cpp:176 src/gui/setup_other.cpp:142
msgid "Shop"
msgstr "店"
@@ -451,10 +452,10 @@ msgstr "売る"
#: src/gui/popupmenu.cpp:516 src/gui/popupmenu.cpp:540
#: src/gui/popupmenu.cpp:554 src/gui/popupmenu.cpp:573
#: src/gui/popupmenu.cpp:790 src/gui/popupmenu.cpp:814
-#: src/gui/popupmenu.cpp:1734 src/gui/popupmenu.cpp:1762
-#: src/gui/popupmenu.cpp:1818 src/gui/popupmenu.cpp:1861
-#: src/gui/popupmenu.cpp:1896 src/gui/popupmenu.cpp:1936
-#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2023
+#: src/gui/popupmenu.cpp:1737 src/gui/popupmenu.cpp:1765
+#: src/gui/popupmenu.cpp:1821 src/gui/popupmenu.cpp:1864
+#: src/gui/popupmenu.cpp:1899 src/gui/popupmenu.cpp:1939
+#: src/gui/popupmenu.cpp:2006 src/gui/popupmenu.cpp:2026
#: src/gui/quitdialog.cpp:54 src/gui/register.cpp:82 src/gui/setup.cpp:72
#: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:238
#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
@@ -556,7 +557,7 @@ msgstr "髪スタイル"
msgid "Race:"
msgstr "人種:"
-#: src/gui/charcreatedialog.cpp:95 src/gui/charselectdialog.cpp:478
+#: src/gui/charcreatedialog.cpp:95 src/gui/charselectdialog.cpp:480
#: src/gui/socialwindow.cpp:1139
msgid "Create"
msgstr "作成"
@@ -624,26 +625,26 @@ msgstr ""
msgid "Enter password:"
msgstr ""
-#: src/gui/charselectdialog.cpp:408 src/gui/serverdialog.cpp:298
+#: src/gui/charselectdialog.cpp:410 src/gui/serverdialog.cpp:298
#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:122
#: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:241
msgid "Delete"
msgstr "削除"
-#: src/gui/charselectdialog.cpp:466
+#: src/gui/charselectdialog.cpp:468
msgid "Choose"
msgstr "選ぶ"
-#: src/gui/charselectdialog.cpp:469
+#: src/gui/charselectdialog.cpp:471
#, c-format
msgid "Level %d"
msgstr "レベル%d"
-#: src/gui/charselectdialog.cpp:480 src/gui/charselectdialog.cpp:481
+#: src/gui/charselectdialog.cpp:482 src/gui/charselectdialog.cpp:483
msgid "(empty)"
msgstr "(空っぽ)"
-#: src/gui/chatwindow.cpp:112
+#: src/gui/chatwindow.cpp:112 src/gui/inventorywindow.cpp:70
msgid "default"
msgstr "デフォルト"
@@ -699,11 +700,12 @@ msgstr "虹 2"
msgid "rainbow 3"
msgstr "虹 3"
-#: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
-#: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
-#: src/gui/setup_theme.cpp:73 src/gui/setup_theme.cpp:127
-#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
-#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
+#: src/gui/chatwindow.cpp:142 src/gui/inventorywindow.cpp:90
+#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78
+#: src/gui/setup_relations.cpp:220 src/gui/setup_theme.cpp:73
+#: src/gui/setup_theme.cpp:127 src/gui/setup_video.cpp:211
+#: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141
+#: src/gui/textcommandeditor.cpp:160
msgid "???"
msgstr "???"
@@ -736,7 +738,7 @@ msgstr "いいえ"
msgid "Ignore"
msgstr "無視"
-#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:97
+#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:99
#: src/gui/setup_other.cpp:64
msgid "Map"
msgstr "地図"
@@ -877,7 +879,7 @@ msgid "Did You Know?"
msgstr ""
#: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
-#: src/gui/inventorywindow.cpp:176 src/gui/npcdialog.cpp:53
+#: src/gui/inventorywindow.cpp:206 src/gui/npcdialog.cpp:53
#: src/gui/popupmenu.cpp:588 src/gui/shopwindow.cpp:113
msgid "Close"
msgstr "閉じる"
@@ -903,10 +905,10 @@ msgstr "OK"
msgid "Equipment"
msgstr "装備"
-#: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:131
-#: src/gui/inventorywindow.cpp:512 src/gui/inventorywindow.cpp:521
-#: src/gui/popupmenu.cpp:1693 src/gui/popupmenu.cpp:1788
-#: src/gui/popupmenu.cpp:1833
+#: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160
+#: src/gui/inventorywindow.cpp:539 src/gui/inventorywindow.cpp:548
+#: src/gui/popupmenu.cpp:1696 src/gui/popupmenu.cpp:1791
+#: src/gui/popupmenu.cpp:1836
msgid "Unequip"
msgstr "外す"
@@ -914,80 +916,88 @@ msgstr "外す"
msgid "Help"
msgstr "ヘルプ"
-#: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76
+#: src/gui/inventorywindow.cpp:71
+msgid "by name"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:72
+msgid "by id"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:73
+msgid "by weight"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:74
+msgid "by amount"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:75
+msgid "by type"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:111 src/gui/windowmenu.cpp:76
#: src/inventory.cpp:249
msgid "Inventory"
msgstr "アイテム"
-#: src/gui/inventorywindow.cpp:105
+#: src/gui/inventorywindow.cpp:136
msgid "Slots:"
msgstr "スロット"
-#: src/gui/inventorywindow.cpp:116
+#: src/gui/inventorywindow.cpp:148
msgid "Filter:"
msgstr "フィルタ:"
-#: src/gui/inventorywindow.cpp:117
+#: src/gui/inventorywindow.cpp:149
msgid "Sort:"
msgstr "類:"
-#: src/gui/inventorywindow.cpp:123
-msgid "na"
-msgstr "不足"
-
-#: src/gui/inventorywindow.cpp:124
-msgid "az"
-msgstr "字母"
-
-#: src/gui/inventorywindow.cpp:125
-msgid "id"
-msgstr "id"
-
-#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
-#: src/gui/inventorywindow.cpp:523 src/gui/popupmenu.cpp:1695
-#: src/gui/popupmenu.cpp:1790 src/gui/popupmenu.cpp:1835
+#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:541
+#: src/gui/inventorywindow.cpp:550 src/gui/popupmenu.cpp:1698
+#: src/gui/popupmenu.cpp:1793 src/gui/popupmenu.cpp:1838
msgid "Equip"
msgstr "装備する"
-#: src/gui/inventorywindow.cpp:130 src/gui/inventorywindow.cpp:515
-#: src/gui/inventorywindow.cpp:519 src/gui/popupmenu.cpp:1698
-#: src/gui/popupmenu.cpp:1757 src/gui/popupmenu.cpp:1794
-#: src/gui/popupmenu.cpp:1838
+#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:542
+#: src/gui/inventorywindow.cpp:546 src/gui/popupmenu.cpp:1701
+#: src/gui/popupmenu.cpp:1760 src/gui/popupmenu.cpp:1797
+#: src/gui/popupmenu.cpp:1841
msgid "Use"
msgstr "使う"
-#: src/gui/inventorywindow.cpp:144 src/gui/inventorywindow.cpp:620
-#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1799
-#: src/gui/popupmenu.cpp:1842
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:646
+#: src/gui/popupmenu.cpp:1705 src/gui/popupmenu.cpp:1802
+#: src/gui/popupmenu.cpp:1845
msgid "Drop..."
msgstr "落とす..."
-#: src/gui/inventorywindow.cpp:145 src/gui/popupmenu.cpp:1711
-#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1851
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1714
+#: src/gui/popupmenu.cpp:1811 src/gui/popupmenu.cpp:1854
msgid "Split"
msgstr "分割する"
-#: src/gui/inventorywindow.cpp:146 src/gui/outfitwindow.cpp:60
+#: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60
#: src/gui/popupmenu.cpp:549
msgid "Outfits"
msgstr "服"
-#: src/gui/inventorywindow.cpp:149
+#: src/gui/inventorywindow.cpp:178
msgid "Weight:"
msgstr "重量"
-#: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:611
-#: src/gui/popupmenu.cpp:1674 src/gui/popupmenu.cpp:1811
-#: src/gui/popupmenu.cpp:1854 src/gui/setup.cpp:73
+#: src/gui/inventorywindow.cpp:204 src/gui/inventorywindow.cpp:637
+#: src/gui/popupmenu.cpp:1677 src/gui/popupmenu.cpp:1814
+#: src/gui/popupmenu.cpp:1857 src/gui/setup.cpp:73
msgid "Store"
msgstr "保存"
-#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1718
+#: src/gui/inventorywindow.cpp:205 src/gui/popupmenu.cpp:1721
msgid "Retrieve"
msgstr "取り戻す"
-#: src/gui/inventorywindow.cpp:622 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1847
+#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1710
+#: src/gui/popupmenu.cpp:1807 src/gui/popupmenu.cpp:1850
#: src/gui/windowmenu.cpp:97
msgid "Drop"
msgstr "落とす"
@@ -1041,89 +1051,89 @@ msgstr "重力:%s"
msgid "Kill stats"
msgstr "殺人統計ウィンドウ"
-#: src/gui/killstats.cpp:65
+#: src/gui/killstats.cpp:66
msgid "Reset stats"
msgstr "統計をれセット"
-#: src/gui/killstats.cpp:66
+#: src/gui/killstats.cpp:67
msgid "Reset timer"
msgstr "タイマーをれセット"
-#: src/gui/killstats.cpp:70 src/gui/killstats.cpp:206
+#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:207
#, c-format
msgid "Level: %d at %f%%"
msgstr ""
-#: src/gui/killstats.cpp:74 src/gui/killstats.cpp:211
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:212
#, c-format
msgid "Exp: %d/%d Left: %d"
msgstr ""
-#: src/gui/killstats.cpp:77 src/gui/killstats.cpp:217
-#: src/gui/killstats.cpp:226
+#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:218
+#: src/gui/killstats.cpp:227
#, c-format
msgid "1%% = %d exp, avg mob for 1%%: %s"
msgstr ""
-#: src/gui/killstats.cpp:80 src/gui/killstats.cpp:143
-#: src/gui/killstats.cpp:235
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:236
#, c-format
msgid "Kills: %s, total exp: %s"
msgstr ""
-#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145
-#: src/gui/killstats.cpp:221 src/gui/killstats.cpp:231
+#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:146
+#: src/gui/killstats.cpp:222 src/gui/killstats.cpp:232
#, c-format
msgid "Avg Exp: %s, No. of avg mob to next level: %s"
msgstr ""
-#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:163
-#: src/gui/killstats.cpp:238
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:164
+#: src/gui/killstats.cpp:239
#, c-format
msgid "Kills/Min: %s, Exp/Min: %s"
msgstr ""
-#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:90 src/gui/killstats.cpp:95
-#: src/gui/killstats.cpp:290 src/gui/killstats.cpp:306
-#: src/gui/killstats.cpp:324
+#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
+#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
+#: src/gui/killstats.cpp:325
#, c-format
msgid "Exp speed per %d min: %s"
msgid_plural "Exp speed per %d min: %s"
msgstr[0] ""
-#: src/gui/killstats.cpp:88 src/gui/killstats.cpp:93 src/gui/killstats.cpp:98
+#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:94 src/gui/killstats.cpp:99
#, c-format
msgid "Time for next level per %d min: %s"
msgid_plural "Time for next level per %d min: %s"
msgstr[0] ""
-#: src/gui/killstats.cpp:101 src/gui/killstats.cpp:242
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
msgid "Last kill exp:"
msgstr ""
-#: src/gui/killstats.cpp:103 src/gui/killstats.cpp:356
-#: src/gui/killstats.cpp:362 src/gui/killstats.cpp:368
-#: src/gui/killstats.cpp:373
+#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
+#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:374
msgid "Time before jacko spawn:"
msgstr ""
-#: src/gui/killstats.cpp:295 src/gui/killstats.cpp:302
-#: src/gui/killstats.cpp:312 src/gui/killstats.cpp:319
-#: src/gui/killstats.cpp:331 src/gui/killstats.cpp:338
+#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
+#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
+#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
#, c-format
msgid " Time for next level: %s"
msgstr ""
-#: src/gui/killstats.cpp:362
+#: src/gui/killstats.cpp:363
#, c-format
msgid "%s %d?"
msgstr ""
-#: src/gui/killstats.cpp:368
+#: src/gui/killstats.cpp:369
msgid "jacko spawning"
msgstr ""
-#: src/guildmanager.cpp:464 src/net/ea/guildhandler.cpp:439
+#: src/guildmanager.cpp:484 src/net/ea/guildhandler.cpp:439
msgid "You have left the guild."
msgstr ""
@@ -1221,7 +1231,7 @@ msgid "Submit"
msgstr "決定"
#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:142
+#: src/gui/setup_other.cpp:151
msgid "NPC"
msgstr "NPC"
@@ -1309,7 +1319,7 @@ msgstr ""
#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:185
#: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:428
#: src/gui/popupmenu.cpp:677 src/gui/popupmenu.cpp:693
-#: src/playerrelations.cpp:400
+#: src/playerrelations.cpp:415
msgid "Completely ignore"
msgstr "完全無視"
@@ -1360,7 +1370,7 @@ msgid "Show Items"
msgstr ""
#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:705
-#: src/gui/popupmenu.cpp:2020
+#: src/gui/popupmenu.cpp:2023
msgid "Undress"
msgstr ""
@@ -1408,8 +1418,8 @@ msgstr ""
msgid "Pick up"
msgstr ""
-#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:1732
-#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1855
+#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:1735
+#: src/gui/popupmenu.cpp:1815 src/gui/popupmenu.cpp:1858
msgid "Add to chat"
msgstr "チャットに追加"
@@ -1421,8 +1431,8 @@ msgstr "マップアイテム"
msgid "Rename"
msgstr ""
-#: src/gui/popupmenu.cpp:532 src/gui/popupmenu.cpp:1973
-#: src/gui/popupmenu.cpp:1991 src/gui/popupmenu.cpp:1996
+#: src/gui/popupmenu.cpp:532 src/gui/popupmenu.cpp:1976
+#: src/gui/popupmenu.cpp:1994 src/gui/popupmenu.cpp:1999
msgid "Remove"
msgstr "取り去る"
@@ -1498,85 +1508,85 @@ msgstr ""
msgid "Comment: "
msgstr ""
-#: src/gui/popupmenu.cpp:1657
+#: src/gui/popupmenu.cpp:1660
msgid "Add to trade"
msgstr "に貿易を足す"
-#: src/gui/popupmenu.cpp:1663
+#: src/gui/popupmenu.cpp:1666
msgid "Add to trade 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1666
+#: src/gui/popupmenu.cpp:1669
msgid "Add to trade half"
msgstr ""
-#: src/gui/popupmenu.cpp:1668
+#: src/gui/popupmenu.cpp:1671
msgid "Add to trade all"
msgstr ""
-#: src/gui/popupmenu.cpp:1680
+#: src/gui/popupmenu.cpp:1683
msgid "Store 10"
msgstr "10保存"
-#: src/gui/popupmenu.cpp:1683
+#: src/gui/popupmenu.cpp:1686
msgid "Store half"
msgstr "半分保存"
-#: src/gui/popupmenu.cpp:1685
+#: src/gui/popupmenu.cpp:1688
msgid "Store all"
msgstr "全部保存"
-#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1800
-#: src/gui/popupmenu.cpp:1843
+#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1803
+#: src/gui/popupmenu.cpp:1846
msgid "Drop all"
msgstr ""
-#: src/gui/popupmenu.cpp:1724
+#: src/gui/popupmenu.cpp:1727
msgid "Retrieve 10"
msgstr "10取る"
-#: src/gui/popupmenu.cpp:1727
+#: src/gui/popupmenu.cpp:1730
msgid "Retrieve half"
msgstr "半分取る"
-#: src/gui/popupmenu.cpp:1729
+#: src/gui/popupmenu.cpp:1732
msgid "Retrieve all"
msgstr "全部取る"
-#: src/gui/popupmenu.cpp:1760 src/gui/popupmenu.cpp:1816
+#: src/gui/popupmenu.cpp:1763 src/gui/popupmenu.cpp:1819
msgid "Load old item shortcuts"
msgstr ""
-#: src/gui/popupmenu.cpp:1859
+#: src/gui/popupmenu.cpp:1862
msgid "Load old drop shortcuts"
msgstr ""
-#: src/gui/popupmenu.cpp:1885 src/gui/popupmenu.cpp:1920
+#: src/gui/popupmenu.cpp:1888 src/gui/popupmenu.cpp:1923
msgid "Hide"
msgstr " 隠す"
-#: src/gui/popupmenu.cpp:1891 src/gui/popupmenu.cpp:1926
+#: src/gui/popupmenu.cpp:1894 src/gui/popupmenu.cpp:1929
msgid "Show"
msgstr "見せる"
-#: src/gui/popupmenu.cpp:1933
+#: src/gui/popupmenu.cpp:1936
msgid "Reset yellow bar"
msgstr ""
-#: src/gui/popupmenu.cpp:1935 src/gui/statuswindow.cpp:241
+#: src/gui/popupmenu.cpp:1938 src/gui/statuswindow.cpp:241
msgid "Copy to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:1953 src/gui/socialwindow.cpp:958
+#: src/gui/popupmenu.cpp:1956 src/gui/socialwindow.cpp:958
#: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028
msgid "(default)"
msgstr "(デフォルト)"
-#: src/gui/popupmenu.cpp:1965 src/gui/popupmenu.cpp:1983
+#: src/gui/popupmenu.cpp:1968 src/gui/popupmenu.cpp:1986
msgid "Move up"
msgstr ""
-#: src/gui/popupmenu.cpp:1970 src/gui/popupmenu.cpp:1988
+#: src/gui/popupmenu.cpp:1973 src/gui/popupmenu.cpp:1991
msgid "Move down"
msgstr ""
@@ -1824,7 +1834,7 @@ msgstr ""
msgid "Use local time"
msgstr ""
-#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:157
+#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:166
msgid "Other"
msgstr ""
@@ -1987,115 +1997,127 @@ msgstr "パスを描画"
msgid "Draw hotkeys on map"
msgstr ""
-#: src/gui/setup_other.cpp:88
-msgid "Moving"
+#: src/gui/setup_other.cpp:87
+msgid "Enable lazy scrolling"
msgstr ""
#: src/gui/setup_other.cpp:90
-msgid "Auto fix position"
+msgid "Scroll laziness"
msgstr ""
#: src/gui/setup_other.cpp:93
+msgid "Scroll radius"
+msgstr ""
+
+#: src/gui/setup_other.cpp:97
+msgid "Moving"
+msgstr ""
+
+#: src/gui/setup_other.cpp:99
+msgid "Auto fix position"
+msgstr ""
+
+#: src/gui/setup_other.cpp:102
msgid "Attack while moving"
msgstr ""
-#: src/gui/setup_other.cpp:96
+#: src/gui/setup_other.cpp:105
msgid "Sync player move"
msgstr ""
-#: src/gui/setup_other.cpp:99
+#: src/gui/setup_other.cpp:108
msgid "Crazy move A program"
msgstr ""
-#: src/gui/setup_other.cpp:103
+#: src/gui/setup_other.cpp:112
msgid "Player"
msgstr ""
-#: src/gui/setup_other.cpp:105
+#: src/gui/setup_other.cpp:114
msgid "Show own hp bar"
msgstr "自分のHPバーを表示する"
-#: src/gui/setup_other.cpp:108
+#: src/gui/setup_other.cpp:117
msgid "Enable quick stats"
msgstr ""
-#: src/gui/setup_other.cpp:111
+#: src/gui/setup_other.cpp:120
msgid "Cycle player targets"
msgstr ""
-#: src/gui/setup_other.cpp:114
+#: src/gui/setup_other.cpp:123
msgid "Show job exp messages"
msgstr ""
-#: src/gui/setup_other.cpp:117
+#: src/gui/setup_other.cpp:126
msgid "Show players popups"
msgstr ""
-#: src/gui/setup_other.cpp:120
+#: src/gui/setup_other.cpp:129
msgid "Afk message"
msgstr ""
-#: src/gui/setup_other.cpp:123
+#: src/gui/setup_other.cpp:132
msgid "Show job"
msgstr "仕事を表示する"
-#: src/gui/setup_other.cpp:126
+#: src/gui/setup_other.cpp:135
msgid "Enable attack filter"
msgstr ""
-#: src/gui/setup_other.cpp:129
+#: src/gui/setup_other.cpp:138
msgid "Enable advert protocol"
msgstr ""
-#: src/gui/setup_other.cpp:135
+#: src/gui/setup_other.cpp:144
msgid "Accept sell/buy requests"
msgstr ""
-#: src/gui/setup_other.cpp:138
+#: src/gui/setup_other.cpp:147
msgid "Enable shop mode"
msgstr ""
-#: src/gui/setup_other.cpp:144
+#: src/gui/setup_other.cpp:153
msgid "Log NPC dialogue"
msgstr ""
-#: src/gui/setup_other.cpp:148
+#: src/gui/setup_other.cpp:157
msgid "Bots support"
msgstr ""
-#: src/gui/setup_other.cpp:150
+#: src/gui/setup_other.cpp:159
msgid "Enable auction bot support"
msgstr ""
-#: src/gui/setup_other.cpp:153
+#: src/gui/setup_other.cpp:162
msgid "Enable guild bot support and disable native guild support"
msgstr ""
-#: src/gui/setup_other.cpp:159
+#: src/gui/setup_other.cpp:168
msgid "Enable server side attack"
msgstr ""
-#: src/gui/setup_other.cpp:162
+#: src/gui/setup_other.cpp:171
msgid "Enable bot checker"
msgstr ""
-#: src/gui/setup_other.cpp:165
+#: src/gui/setup_other.cpp:174
msgid "Enable buggy servers protection"
msgstr ""
-#: src/gui/setup_other.cpp:168
+#: src/gui/setup_other.cpp:177
msgid "Enable debug log"
msgstr "デバッグループを有効にする"
-#: src/gui/setup_other.cpp:171
+#: src/gui/setup_other.cpp:180
msgid "Low traffic mode"
msgstr ""
-#: src/gui/setup_other.cpp:174
+#: src/gui/setup_other.cpp:183
msgid "Hide shield sprite"
msgstr ""
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:186
msgid "Show background"
msgstr "背景を表示する"
@@ -2112,27 +2134,27 @@ msgid "Auto adjust perfomance"
msgstr ""
#: src/gui/setup_perfomance.cpp:61
-msgid "Show beings transparency"
+msgid "Hw acceleration"
msgstr ""
#: src/gui/setup_perfomance.cpp:64
-msgid "Hw acceleration"
+msgid "Enable opacity cache (Software, can use many memory)"
msgstr ""
#: src/gui/setup_perfomance.cpp:67
-msgid "Enable opacity cache (Software, can use many memory)"
+msgid "Enable map reduce (Software)"
msgstr ""
#: src/gui/setup_perfomance.cpp:70
-msgid "Enable map reduce (Software)"
+msgid "Better quality (disable for better perfomance)"
msgstr ""
#: src/gui/setup_perfomance.cpp:73
-msgid "Better quality (disable for better perfomance)"
+msgid "Enable alpha channel fix (Software, can be very slow)"
msgstr ""
-#: src/gui/setup_perfomance.cpp:76
-msgid "Enable alpha channel fix (Software, can be very slow)"
+#: src/gui/setup_perfomance.cpp:77
+msgid "Show beings transparency"
msgstr ""
#: src/gui/setup_perfomance.cpp:80
@@ -2387,7 +2409,7 @@ msgid "FPS limit:"
msgstr "FPSリミット"
#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
-#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709
+#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:710
msgid "Alt FPS limit: "
msgstr ""
@@ -2413,7 +2435,7 @@ msgstr "粒子の詳細"
#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
-#: src/gui/setup_video.cpp:707
+#: src/gui/setup_video.cpp:708
msgid "None"
msgstr "なし"
@@ -2519,22 +2541,22 @@ msgstr "上げる"
msgid "Skill points available: %d"
msgstr "スキルポイント: %d"
-#: src/gui/skilldialog.cpp:418
+#: src/gui/skilldialog.cpp:420
#, c-format
msgid "Skill Set %d"
msgstr "スキルセット %d"
-#: src/gui/skilldialog.cpp:430
+#: src/gui/skilldialog.cpp:432
#, c-format
msgid "Skill %d"
msgstr "スキル %d"
-#: src/gui/skilldialog.cpp:497 src/gui/skilldialog.cpp:550
+#: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554
#, c-format
msgid "Lvl: %d"
msgstr "Lvl: %d"
-#: src/gui/skilldialog.cpp:542
+#: src/gui/skilldialog.cpp:546
#, c-format
msgid "Lvl: %d (%+d)"
msgstr "Lvl:%d (%+d)"
@@ -3459,23 +3481,23 @@ msgstr ""
msgid "Road Point"
msgstr "ロードのポイント"
-#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:472
+#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:474
msgid "Who Is Online - Updating"
msgstr ""
-#: src/gui/whoisonline.cpp:102
+#: src/gui/whoisonline.cpp:104
msgid "Update"
msgstr "アップデート"
-#: src/gui/whoisonline.cpp:295
+#: src/gui/whoisonline.cpp:297
msgid "Who Is Online - "
msgstr ""
-#: src/gui/whoisonline.cpp:486
+#: src/gui/whoisonline.cpp:488
msgid "Who Is Online - error"
msgstr ""
-#: src/gui/whoisonline.cpp:517
+#: src/gui/whoisonline.cpp:519
msgid "Who Is Online - Update"
msgstr ""
@@ -4148,67 +4170,67 @@ msgid ""
"strange behaviour."
msgstr ""
-#: src/localplayer.cpp:370
+#: src/localplayer.cpp:372
msgid "You were killed by "
msgstr ""
-#: src/localplayer.cpp:1401
+#: src/localplayer.cpp:1413
msgid "Tried to pick up nonexistent item."
msgstr ""
-#: src/localplayer.cpp:1403
+#: src/localplayer.cpp:1415
msgid "Item is too heavy."
msgstr ""
-#: src/localplayer.cpp:1405
+#: src/localplayer.cpp:1417
msgid "Item is too far away."
msgstr ""
-#: src/localplayer.cpp:1407
+#: src/localplayer.cpp:1419
msgid "Inventory is full."
msgstr ""
-#: src/localplayer.cpp:1409
+#: src/localplayer.cpp:1421
msgid "Stack is too big."
msgstr ""
-#: src/localplayer.cpp:1412
+#: src/localplayer.cpp:1424
msgid "Item belongs to someone else."
msgstr ""
-#: src/localplayer.cpp:1415
+#: src/localplayer.cpp:1427
msgid "Unknown problem picking up item."
msgstr ""
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1439
+#: src/localplayer.cpp:1451
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
msgstr[0] ""
-#: src/localplayer.cpp:3173
+#: src/localplayer.cpp:3187
msgid "Away"
msgstr "去って"
-#: src/localplayer.cpp:3474
+#: src/localplayer.cpp:3488
msgid "Follow: "
msgstr "従う: "
-#: src/localplayer.cpp:3476 src/localplayer.cpp:3491
+#: src/localplayer.cpp:3490 src/localplayer.cpp:3505
msgid "Follow canceled"
msgstr ""
-#: src/localplayer.cpp:3483
+#: src/localplayer.cpp:3497
msgid "Imitation: "
msgstr "擬い: "
-#: src/localplayer.cpp:3485 src/localplayer.cpp:3493
+#: src/localplayer.cpp:3499 src/localplayer.cpp:3507
msgid "Imitation canceled"
msgstr ""
-#: src/localplayer.cpp:3845
+#: src/localplayer.cpp:3859
msgid "You see "
msgstr "あなた"
@@ -4409,16 +4431,16 @@ msgstr "プレイヤー MVP"
msgid "MVP player: "
msgstr "プレイヤー MVP "
-#: src/net/ea/gamehandler.cpp:86
+#: src/net/ea/gamehandler.cpp:87
#, c-format
msgid "Online users: %d"
msgstr "オンラインユーザー:%d"
-#: src/net/ea/gamehandler.cpp:98
+#: src/net/ea/gamehandler.cpp:99
msgid "Game"
msgstr "ゲーム"
-#: src/net/ea/gamehandler.cpp:98
+#: src/net/ea/gamehandler.cpp:99
msgid "Request to quit denied!"
msgstr ""
@@ -5468,19 +5490,19 @@ msgstr ""
msgid "%s is not in your party!"
msgstr "%sはパーティにはいない!"
-#: src/playerrelations.cpp:414
+#: src/playerrelations.cpp:429
msgid "Print '...'"
msgstr "'...'を表示する"
-#: src/playerrelations.cpp:434
+#: src/playerrelations.cpp:449
msgid "Blink name"
msgstr "名前を瞬き"
-#: src/playerrelations.cpp:478
+#: src/playerrelations.cpp:493
msgid "Floating '...' bubble"
msgstr "フローティング'...'バブル"
-#: src/playerrelations.cpp:481
+#: src/playerrelations.cpp:496
msgid "Floating bubble"
msgstr "フローティングバブル"
diff --git a/po/manaplus.pot b/po/manaplus.pot
index 5a4a251a7..7a643a645 100644
--- a/po/manaplus.pot
+++ b/po/manaplus.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-09-02 18:27+0300\n"
+"POT-Creation-Date: 2011-09-10 01:34+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"
@@ -18,25 +18,25 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-#: src/actorspritemanager.cpp:1034
+#: src/actorspritemanager.cpp:1046
msgid "Visible on map"
msgstr ""
-#: src/being.cpp:549
+#: src/being.cpp:551
msgid "dodge"
msgstr ""
-#: src/being.cpp:549
+#: src/being.cpp:551
msgid "miss"
msgstr ""
#. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1529
+#: src/being.cpp:1532
msgid "A"
msgstr ""
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1534
+#: src/being.cpp:1537
msgid "I"
msgstr ""
@@ -106,22 +106,22 @@ msgstr ""
msgid "Farewell, come back any time..."
msgstr ""
-#: src/client.cpp:1428 src/client.cpp:1458 src/client.cpp:1502
-#: src/client.cpp:1927 src/client.cpp:1934
+#: src/client.cpp:1428 src/client.cpp:1458 src/client.cpp:1504
+#: src/client.cpp:1929 src/client.cpp:1936
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
-#: src/client.cpp:1633
+#: src/client.cpp:1635
#, c-format
msgid "Invalid update host: %s"
msgstr ""
-#: src/client.cpp:1667 src/client.cpp:1673
+#: src/client.cpp:1669 src/client.cpp:1675
msgid "Error creating updates directory!"
msgstr ""
-#: src/client.cpp:1694
+#: src/client.cpp:1696
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
@@ -319,19 +319,19 @@ msgstr ""
msgid "Network Error"
msgstr ""
-#: src/game.cpp:1236
+#: src/game.cpp:1243
msgid "Ignoring incoming trade requests"
msgstr ""
-#: src/game.cpp:1243
+#: src/game.cpp:1250
msgid "Accepting incoming trade requests"
msgstr ""
-#: src/game.cpp:1629
+#: src/game.cpp:1636
msgid "Could Not Load Map"
msgstr ""
-#: src/game.cpp:1630
+#: src/game.cpp:1637
#, c-format
msgid "Error while loading %s"
msgstr ""
@@ -360,31 +360,31 @@ msgstr ""
msgid "Bot Checker"
msgstr ""
-#: src/gui/botcheckerwindow.cpp:295 src/gui/setup_relations.cpp:64
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
msgid "Name"
msgstr ""
-#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:133
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:133
#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:646
#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:265
msgid "Attack"
msgstr ""
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:297
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297
#: src/keyboardconfig.cpp:62
msgid "Talk"
msgstr ""
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:263
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:263
#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:703
msgid "Move"
msgstr ""
-#: src/gui/botcheckerwindow.cpp:299
+#: src/gui/botcheckerwindow.cpp:300
msgid "Result"
msgstr ""
-#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:124
+#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:124
msgid "Reset"
msgstr ""
@@ -430,7 +430,7 @@ msgid "Max"
msgstr ""
#: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:147 src/gui/setup_other.cpp:133
+#: src/gui/inventorywindow.cpp:176 src/gui/setup_other.cpp:142
msgid "Shop"
msgstr ""
@@ -449,10 +449,10 @@ msgstr ""
#: src/gui/popupmenu.cpp:516 src/gui/popupmenu.cpp:540
#: src/gui/popupmenu.cpp:554 src/gui/popupmenu.cpp:573
#: src/gui/popupmenu.cpp:790 src/gui/popupmenu.cpp:814
-#: src/gui/popupmenu.cpp:1734 src/gui/popupmenu.cpp:1762
-#: src/gui/popupmenu.cpp:1818 src/gui/popupmenu.cpp:1861
-#: src/gui/popupmenu.cpp:1896 src/gui/popupmenu.cpp:1936
-#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2023
+#: src/gui/popupmenu.cpp:1737 src/gui/popupmenu.cpp:1765
+#: src/gui/popupmenu.cpp:1821 src/gui/popupmenu.cpp:1864
+#: src/gui/popupmenu.cpp:1899 src/gui/popupmenu.cpp:1939
+#: src/gui/popupmenu.cpp:2006 src/gui/popupmenu.cpp:2026
#: src/gui/quitdialog.cpp:54 src/gui/register.cpp:82 src/gui/setup.cpp:72
#: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:238
#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
@@ -554,7 +554,7 @@ msgstr ""
msgid "Race:"
msgstr ""
-#: src/gui/charcreatedialog.cpp:95 src/gui/charselectdialog.cpp:478
+#: src/gui/charcreatedialog.cpp:95 src/gui/charselectdialog.cpp:480
#: src/gui/socialwindow.cpp:1139
msgid "Create"
msgstr ""
@@ -622,26 +622,26 @@ msgstr ""
msgid "Enter password:"
msgstr ""
-#: src/gui/charselectdialog.cpp:408 src/gui/serverdialog.cpp:298
+#: src/gui/charselectdialog.cpp:410 src/gui/serverdialog.cpp:298
#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:122
#: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:241
msgid "Delete"
msgstr ""
-#: src/gui/charselectdialog.cpp:466
+#: src/gui/charselectdialog.cpp:468
msgid "Choose"
msgstr ""
-#: src/gui/charselectdialog.cpp:469
+#: src/gui/charselectdialog.cpp:471
#, c-format
msgid "Level %d"
msgstr ""
-#: src/gui/charselectdialog.cpp:480 src/gui/charselectdialog.cpp:481
+#: src/gui/charselectdialog.cpp:482 src/gui/charselectdialog.cpp:483
msgid "(empty)"
msgstr ""
-#: src/gui/chatwindow.cpp:112
+#: src/gui/chatwindow.cpp:112 src/gui/inventorywindow.cpp:70
msgid "default"
msgstr ""
@@ -697,11 +697,12 @@ msgstr ""
msgid "rainbow 3"
msgstr ""
-#: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
-#: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
-#: src/gui/setup_theme.cpp:73 src/gui/setup_theme.cpp:127
-#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
-#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
+#: src/gui/chatwindow.cpp:142 src/gui/inventorywindow.cpp:90
+#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78
+#: src/gui/setup_relations.cpp:220 src/gui/setup_theme.cpp:73
+#: src/gui/setup_theme.cpp:127 src/gui/setup_video.cpp:211
+#: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141
+#: src/gui/textcommandeditor.cpp:160
msgid "???"
msgstr ""
@@ -734,7 +735,7 @@ msgstr ""
msgid "Ignore"
msgstr ""
-#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:97
+#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:99
#: src/gui/setup_other.cpp:64
msgid "Map"
msgstr ""
@@ -875,7 +876,7 @@ msgid "Did You Know?"
msgstr ""
#: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
-#: src/gui/inventorywindow.cpp:176 src/gui/npcdialog.cpp:53
+#: src/gui/inventorywindow.cpp:206 src/gui/npcdialog.cpp:53
#: src/gui/popupmenu.cpp:588 src/gui/shopwindow.cpp:113
msgid "Close"
msgstr ""
@@ -901,10 +902,10 @@ msgstr ""
msgid "Equipment"
msgstr ""
-#: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:131
-#: src/gui/inventorywindow.cpp:512 src/gui/inventorywindow.cpp:521
-#: src/gui/popupmenu.cpp:1693 src/gui/popupmenu.cpp:1788
-#: src/gui/popupmenu.cpp:1833
+#: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160
+#: src/gui/inventorywindow.cpp:539 src/gui/inventorywindow.cpp:548
+#: src/gui/popupmenu.cpp:1696 src/gui/popupmenu.cpp:1791
+#: src/gui/popupmenu.cpp:1836
msgid "Unequip"
msgstr ""
@@ -912,80 +913,88 @@ msgstr ""
msgid "Help"
msgstr ""
-#: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76
-#: src/inventory.cpp:249
-msgid "Inventory"
+#: src/gui/inventorywindow.cpp:71
+msgid "by name"
msgstr ""
-#: src/gui/inventorywindow.cpp:105
-msgid "Slots:"
+#: src/gui/inventorywindow.cpp:72
+msgid "by id"
msgstr ""
-#: src/gui/inventorywindow.cpp:116
-msgid "Filter:"
+#: src/gui/inventorywindow.cpp:73
+msgid "by weight"
msgstr ""
-#: src/gui/inventorywindow.cpp:117
-msgid "Sort:"
+#: src/gui/inventorywindow.cpp:74
+msgid "by amount"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:75
+msgid "by type"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:111 src/gui/windowmenu.cpp:76
+#: src/inventory.cpp:249
+msgid "Inventory"
msgstr ""
-#: src/gui/inventorywindow.cpp:123
-msgid "na"
+#: src/gui/inventorywindow.cpp:136
+msgid "Slots:"
msgstr ""
-#: src/gui/inventorywindow.cpp:124
-msgid "az"
+#: src/gui/inventorywindow.cpp:148
+msgid "Filter:"
msgstr ""
-#: src/gui/inventorywindow.cpp:125
-msgid "id"
+#: src/gui/inventorywindow.cpp:149
+msgid "Sort:"
msgstr ""
-#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
-#: src/gui/inventorywindow.cpp:523 src/gui/popupmenu.cpp:1695
-#: src/gui/popupmenu.cpp:1790 src/gui/popupmenu.cpp:1835
+#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:541
+#: src/gui/inventorywindow.cpp:550 src/gui/popupmenu.cpp:1698
+#: src/gui/popupmenu.cpp:1793 src/gui/popupmenu.cpp:1838
msgid "Equip"
msgstr ""
-#: src/gui/inventorywindow.cpp:130 src/gui/inventorywindow.cpp:515
-#: src/gui/inventorywindow.cpp:519 src/gui/popupmenu.cpp:1698
-#: src/gui/popupmenu.cpp:1757 src/gui/popupmenu.cpp:1794
-#: src/gui/popupmenu.cpp:1838
+#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:542
+#: src/gui/inventorywindow.cpp:546 src/gui/popupmenu.cpp:1701
+#: src/gui/popupmenu.cpp:1760 src/gui/popupmenu.cpp:1797
+#: src/gui/popupmenu.cpp:1841
msgid "Use"
msgstr ""
-#: src/gui/inventorywindow.cpp:144 src/gui/inventorywindow.cpp:620
-#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1799
-#: src/gui/popupmenu.cpp:1842
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:646
+#: src/gui/popupmenu.cpp:1705 src/gui/popupmenu.cpp:1802
+#: src/gui/popupmenu.cpp:1845
msgid "Drop..."
msgstr ""
-#: src/gui/inventorywindow.cpp:145 src/gui/popupmenu.cpp:1711
-#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1851
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1714
+#: src/gui/popupmenu.cpp:1811 src/gui/popupmenu.cpp:1854
msgid "Split"
msgstr ""
-#: src/gui/inventorywindow.cpp:146 src/gui/outfitwindow.cpp:60
+#: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60
#: src/gui/popupmenu.cpp:549
msgid "Outfits"
msgstr ""
-#: src/gui/inventorywindow.cpp:149
+#: src/gui/inventorywindow.cpp:178
msgid "Weight:"
msgstr ""
-#: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:611
-#: src/gui/popupmenu.cpp:1674 src/gui/popupmenu.cpp:1811
-#: src/gui/popupmenu.cpp:1854 src/gui/setup.cpp:73
+#: src/gui/inventorywindow.cpp:204 src/gui/inventorywindow.cpp:637
+#: src/gui/popupmenu.cpp:1677 src/gui/popupmenu.cpp:1814
+#: src/gui/popupmenu.cpp:1857 src/gui/setup.cpp:73
msgid "Store"
msgstr ""
-#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1718
+#: src/gui/inventorywindow.cpp:205 src/gui/popupmenu.cpp:1721
msgid "Retrieve"
msgstr ""
-#: src/gui/inventorywindow.cpp:622 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1847
+#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1710
+#: src/gui/popupmenu.cpp:1807 src/gui/popupmenu.cpp:1850
#: src/gui/windowmenu.cpp:97
msgid "Drop"
msgstr ""
@@ -1039,91 +1048,91 @@ msgstr ""
msgid "Kill stats"
msgstr ""
-#: src/gui/killstats.cpp:65
+#: src/gui/killstats.cpp:66
msgid "Reset stats"
msgstr ""
-#: src/gui/killstats.cpp:66
+#: src/gui/killstats.cpp:67
msgid "Reset timer"
msgstr ""
-#: src/gui/killstats.cpp:70 src/gui/killstats.cpp:206
+#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:207
#, c-format
msgid "Level: %d at %f%%"
msgstr ""
-#: src/gui/killstats.cpp:74 src/gui/killstats.cpp:211
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:212
#, c-format
msgid "Exp: %d/%d Left: %d"
msgstr ""
-#: src/gui/killstats.cpp:77 src/gui/killstats.cpp:217
-#: src/gui/killstats.cpp:226
+#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:218
+#: src/gui/killstats.cpp:227
#, c-format
msgid "1%% = %d exp, avg mob for 1%%: %s"
msgstr ""
-#: src/gui/killstats.cpp:80 src/gui/killstats.cpp:143
-#: src/gui/killstats.cpp:235
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:236
#, c-format
msgid "Kills: %s, total exp: %s"
msgstr ""
-#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145
-#: src/gui/killstats.cpp:221 src/gui/killstats.cpp:231
+#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:146
+#: src/gui/killstats.cpp:222 src/gui/killstats.cpp:232
#, c-format
msgid "Avg Exp: %s, No. of avg mob to next level: %s"
msgstr ""
-#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:163
-#: src/gui/killstats.cpp:238
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:164
+#: src/gui/killstats.cpp:239
#, c-format
msgid "Kills/Min: %s, Exp/Min: %s"
msgstr ""
-#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:90 src/gui/killstats.cpp:95
-#: src/gui/killstats.cpp:290 src/gui/killstats.cpp:306
-#: src/gui/killstats.cpp:324
+#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
+#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
+#: src/gui/killstats.cpp:325
#, c-format
msgid "Exp speed per %d min: %s"
msgid_plural "Exp speed per %d min: %s"
msgstr[0] ""
msgstr[1] ""
-#: src/gui/killstats.cpp:88 src/gui/killstats.cpp:93 src/gui/killstats.cpp:98
+#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:94 src/gui/killstats.cpp:99
#, c-format
msgid "Time for next level per %d min: %s"
msgid_plural "Time for next level per %d min: %s"
msgstr[0] ""
msgstr[1] ""
-#: src/gui/killstats.cpp:101 src/gui/killstats.cpp:242
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
msgid "Last kill exp:"
msgstr ""
-#: src/gui/killstats.cpp:103 src/gui/killstats.cpp:356
-#: src/gui/killstats.cpp:362 src/gui/killstats.cpp:368
-#: src/gui/killstats.cpp:373
+#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
+#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:374
msgid "Time before jacko spawn:"
msgstr ""
-#: src/gui/killstats.cpp:295 src/gui/killstats.cpp:302
-#: src/gui/killstats.cpp:312 src/gui/killstats.cpp:319
-#: src/gui/killstats.cpp:331 src/gui/killstats.cpp:338
+#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
+#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
+#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
#, c-format
msgid " Time for next level: %s"
msgstr ""
-#: src/gui/killstats.cpp:362
+#: src/gui/killstats.cpp:363
#, c-format
msgid "%s %d?"
msgstr ""
-#: src/gui/killstats.cpp:368
+#: src/gui/killstats.cpp:369
msgid "jacko spawning"
msgstr ""
-#: src/guildmanager.cpp:464 src/net/ea/guildhandler.cpp:439
+#: src/guildmanager.cpp:484 src/net/ea/guildhandler.cpp:439
msgid "You have left the guild."
msgstr ""
@@ -1221,7 +1230,7 @@ msgid "Submit"
msgstr ""
#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:142
+#: src/gui/setup_other.cpp:151
msgid "NPC"
msgstr ""
@@ -1309,7 +1318,7 @@ msgstr ""
#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:185
#: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:428
#: src/gui/popupmenu.cpp:677 src/gui/popupmenu.cpp:693
-#: src/playerrelations.cpp:400
+#: src/playerrelations.cpp:415
msgid "Completely ignore"
msgstr ""
@@ -1360,7 +1369,7 @@ msgid "Show Items"
msgstr ""
#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:705
-#: src/gui/popupmenu.cpp:2020
+#: src/gui/popupmenu.cpp:2023
msgid "Undress"
msgstr ""
@@ -1408,8 +1417,8 @@ msgstr ""
msgid "Pick up"
msgstr ""
-#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:1732
-#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1855
+#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:1735
+#: src/gui/popupmenu.cpp:1815 src/gui/popupmenu.cpp:1858
msgid "Add to chat"
msgstr ""
@@ -1421,8 +1430,8 @@ msgstr ""
msgid "Rename"
msgstr ""
-#: src/gui/popupmenu.cpp:532 src/gui/popupmenu.cpp:1973
-#: src/gui/popupmenu.cpp:1991 src/gui/popupmenu.cpp:1996
+#: src/gui/popupmenu.cpp:532 src/gui/popupmenu.cpp:1976
+#: src/gui/popupmenu.cpp:1994 src/gui/popupmenu.cpp:1999
msgid "Remove"
msgstr ""
@@ -1498,85 +1507,85 @@ msgstr ""
msgid "Comment: "
msgstr ""
-#: src/gui/popupmenu.cpp:1657
+#: src/gui/popupmenu.cpp:1660
msgid "Add to trade"
msgstr ""
-#: src/gui/popupmenu.cpp:1663
+#: src/gui/popupmenu.cpp:1666
msgid "Add to trade 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1666
+#: src/gui/popupmenu.cpp:1669
msgid "Add to trade half"
msgstr ""
-#: src/gui/popupmenu.cpp:1668
+#: src/gui/popupmenu.cpp:1671
msgid "Add to trade all"
msgstr ""
-#: src/gui/popupmenu.cpp:1680
+#: src/gui/popupmenu.cpp:1683
msgid "Store 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1683
+#: src/gui/popupmenu.cpp:1686
msgid "Store half"
msgstr ""
-#: src/gui/popupmenu.cpp:1685
+#: src/gui/popupmenu.cpp:1688
msgid "Store all"
msgstr ""
-#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1800
-#: src/gui/popupmenu.cpp:1843
+#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1803
+#: src/gui/popupmenu.cpp:1846
msgid "Drop all"
msgstr ""
-#: src/gui/popupmenu.cpp:1724
+#: src/gui/popupmenu.cpp:1727
msgid "Retrieve 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1727
+#: src/gui/popupmenu.cpp:1730
msgid "Retrieve half"
msgstr ""
-#: src/gui/popupmenu.cpp:1729
+#: src/gui/popupmenu.cpp:1732
msgid "Retrieve all"
msgstr ""
-#: src/gui/popupmenu.cpp:1760 src/gui/popupmenu.cpp:1816
+#: src/gui/popupmenu.cpp:1763 src/gui/popupmenu.cpp:1819
msgid "Load old item shortcuts"
msgstr ""
-#: src/gui/popupmenu.cpp:1859
+#: src/gui/popupmenu.cpp:1862
msgid "Load old drop shortcuts"
msgstr ""
-#: src/gui/popupmenu.cpp:1885 src/gui/popupmenu.cpp:1920
+#: src/gui/popupmenu.cpp:1888 src/gui/popupmenu.cpp:1923
msgid "Hide"
msgstr ""
-#: src/gui/popupmenu.cpp:1891 src/gui/popupmenu.cpp:1926
+#: src/gui/popupmenu.cpp:1894 src/gui/popupmenu.cpp:1929
msgid "Show"
msgstr ""
-#: src/gui/popupmenu.cpp:1933
+#: src/gui/popupmenu.cpp:1936
msgid "Reset yellow bar"
msgstr ""
-#: src/gui/popupmenu.cpp:1935 src/gui/statuswindow.cpp:241
+#: src/gui/popupmenu.cpp:1938 src/gui/statuswindow.cpp:241
msgid "Copy to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:1953 src/gui/socialwindow.cpp:958
+#: src/gui/popupmenu.cpp:1956 src/gui/socialwindow.cpp:958
#: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028
msgid "(default)"
msgstr ""
-#: src/gui/popupmenu.cpp:1965 src/gui/popupmenu.cpp:1983
+#: src/gui/popupmenu.cpp:1968 src/gui/popupmenu.cpp:1986
msgid "Move up"
msgstr ""
-#: src/gui/popupmenu.cpp:1970 src/gui/popupmenu.cpp:1988
+#: src/gui/popupmenu.cpp:1973 src/gui/popupmenu.cpp:1991
msgid "Move down"
msgstr ""
@@ -1822,7 +1831,7 @@ msgstr ""
msgid "Use local time"
msgstr ""
-#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:157
+#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:166
msgid "Other"
msgstr ""
@@ -1985,115 +1994,127 @@ msgstr ""
msgid "Draw hotkeys on map"
msgstr ""
-#: src/gui/setup_other.cpp:88
-msgid "Moving"
+#: src/gui/setup_other.cpp:87
+msgid "Enable lazy scrolling"
msgstr ""
#: src/gui/setup_other.cpp:90
-msgid "Auto fix position"
+msgid "Scroll laziness"
msgstr ""
#: src/gui/setup_other.cpp:93
+msgid "Scroll radius"
+msgstr ""
+
+#: src/gui/setup_other.cpp:97
+msgid "Moving"
+msgstr ""
+
+#: src/gui/setup_other.cpp:99
+msgid "Auto fix position"
+msgstr ""
+
+#: src/gui/setup_other.cpp:102
msgid "Attack while moving"
msgstr ""
-#: src/gui/setup_other.cpp:96
+#: src/gui/setup_other.cpp:105
msgid "Sync player move"
msgstr ""
-#: src/gui/setup_other.cpp:99
+#: src/gui/setup_other.cpp:108
msgid "Crazy move A program"
msgstr ""
-#: src/gui/setup_other.cpp:103
+#: src/gui/setup_other.cpp:112
msgid "Player"
msgstr ""
-#: src/gui/setup_other.cpp:105
+#: src/gui/setup_other.cpp:114
msgid "Show own hp bar"
msgstr ""
-#: src/gui/setup_other.cpp:108
+#: src/gui/setup_other.cpp:117
msgid "Enable quick stats"
msgstr ""
-#: src/gui/setup_other.cpp:111
+#: src/gui/setup_other.cpp:120
msgid "Cycle player targets"
msgstr ""
-#: src/gui/setup_other.cpp:114
+#: src/gui/setup_other.cpp:123
msgid "Show job exp messages"
msgstr ""
-#: src/gui/setup_other.cpp:117
+#: src/gui/setup_other.cpp:126
msgid "Show players popups"
msgstr ""
-#: src/gui/setup_other.cpp:120
+#: src/gui/setup_other.cpp:129
msgid "Afk message"
msgstr ""
-#: src/gui/setup_other.cpp:123
+#: src/gui/setup_other.cpp:132
msgid "Show job"
msgstr ""
-#: src/gui/setup_other.cpp:126
+#: src/gui/setup_other.cpp:135
msgid "Enable attack filter"
msgstr ""
-#: src/gui/setup_other.cpp:129
+#: src/gui/setup_other.cpp:138
msgid "Enable advert protocol"
msgstr ""
-#: src/gui/setup_other.cpp:135
+#: src/gui/setup_other.cpp:144
msgid "Accept sell/buy requests"
msgstr ""
-#: src/gui/setup_other.cpp:138
+#: src/gui/setup_other.cpp:147
msgid "Enable shop mode"
msgstr ""
-#: src/gui/setup_other.cpp:144
+#: src/gui/setup_other.cpp:153
msgid "Log NPC dialogue"
msgstr ""
-#: src/gui/setup_other.cpp:148
+#: src/gui/setup_other.cpp:157
msgid "Bots support"
msgstr ""
-#: src/gui/setup_other.cpp:150
+#: src/gui/setup_other.cpp:159
msgid "Enable auction bot support"
msgstr ""
-#: src/gui/setup_other.cpp:153
+#: src/gui/setup_other.cpp:162
msgid "Enable guild bot support and disable native guild support"
msgstr ""
-#: src/gui/setup_other.cpp:159
+#: src/gui/setup_other.cpp:168
msgid "Enable server side attack"
msgstr ""
-#: src/gui/setup_other.cpp:162
+#: src/gui/setup_other.cpp:171
msgid "Enable bot checker"
msgstr ""
-#: src/gui/setup_other.cpp:165
+#: src/gui/setup_other.cpp:174
msgid "Enable buggy servers protection"
msgstr ""
-#: src/gui/setup_other.cpp:168
+#: src/gui/setup_other.cpp:177
msgid "Enable debug log"
msgstr ""
-#: src/gui/setup_other.cpp:171
+#: src/gui/setup_other.cpp:180
msgid "Low traffic mode"
msgstr ""
-#: src/gui/setup_other.cpp:174
+#: src/gui/setup_other.cpp:183
msgid "Hide shield sprite"
msgstr ""
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:186
msgid "Show background"
msgstr ""
@@ -2110,27 +2131,27 @@ msgid "Auto adjust perfomance"
msgstr ""
#: src/gui/setup_perfomance.cpp:61
-msgid "Show beings transparency"
+msgid "Hw acceleration"
msgstr ""
#: src/gui/setup_perfomance.cpp:64
-msgid "Hw acceleration"
+msgid "Enable opacity cache (Software, can use many memory)"
msgstr ""
#: src/gui/setup_perfomance.cpp:67
-msgid "Enable opacity cache (Software, can use many memory)"
+msgid "Enable map reduce (Software)"
msgstr ""
#: src/gui/setup_perfomance.cpp:70
-msgid "Enable map reduce (Software)"
+msgid "Better quality (disable for better perfomance)"
msgstr ""
#: src/gui/setup_perfomance.cpp:73
-msgid "Better quality (disable for better perfomance)"
+msgid "Enable alpha channel fix (Software, can be very slow)"
msgstr ""
-#: src/gui/setup_perfomance.cpp:76
-msgid "Enable alpha channel fix (Software, can be very slow)"
+#: src/gui/setup_perfomance.cpp:77
+msgid "Show beings transparency"
msgstr ""
#: src/gui/setup_perfomance.cpp:80
@@ -2385,7 +2406,7 @@ msgid "FPS limit:"
msgstr ""
#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
-#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709
+#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:710
msgid "Alt FPS limit: "
msgstr ""
@@ -2411,7 +2432,7 @@ msgstr ""
#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
-#: src/gui/setup_video.cpp:707
+#: src/gui/setup_video.cpp:708
msgid "None"
msgstr ""
@@ -2517,22 +2538,22 @@ msgstr ""
msgid "Skill points available: %d"
msgstr ""
-#: src/gui/skilldialog.cpp:418
+#: src/gui/skilldialog.cpp:420
#, c-format
msgid "Skill Set %d"
msgstr ""
-#: src/gui/skilldialog.cpp:430
+#: src/gui/skilldialog.cpp:432
#, c-format
msgid "Skill %d"
msgstr ""
-#: src/gui/skilldialog.cpp:497 src/gui/skilldialog.cpp:550
+#: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554
#, c-format
msgid "Lvl: %d"
msgstr ""
-#: src/gui/skilldialog.cpp:542
+#: src/gui/skilldialog.cpp:546
#, c-format
msgid "Lvl: %d (%+d)"
msgstr ""
@@ -3455,23 +3476,23 @@ msgstr ""
msgid "Road Point"
msgstr ""
-#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:472
+#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:474
msgid "Who Is Online - Updating"
msgstr ""
-#: src/gui/whoisonline.cpp:102
+#: src/gui/whoisonline.cpp:104
msgid "Update"
msgstr ""
-#: src/gui/whoisonline.cpp:295
+#: src/gui/whoisonline.cpp:297
msgid "Who Is Online - "
msgstr ""
-#: src/gui/whoisonline.cpp:486
+#: src/gui/whoisonline.cpp:488
msgid "Who Is Online - error"
msgstr ""
-#: src/gui/whoisonline.cpp:517
+#: src/gui/whoisonline.cpp:519
msgid "Who Is Online - Update"
msgstr ""
@@ -4139,68 +4160,68 @@ msgid ""
"strange behaviour."
msgstr ""
-#: src/localplayer.cpp:370
+#: src/localplayer.cpp:372
msgid "You were killed by "
msgstr ""
-#: src/localplayer.cpp:1401
+#: src/localplayer.cpp:1413
msgid "Tried to pick up nonexistent item."
msgstr ""
-#: src/localplayer.cpp:1403
+#: src/localplayer.cpp:1415
msgid "Item is too heavy."
msgstr ""
-#: src/localplayer.cpp:1405
+#: src/localplayer.cpp:1417
msgid "Item is too far away."
msgstr ""
-#: src/localplayer.cpp:1407
+#: src/localplayer.cpp:1419
msgid "Inventory is full."
msgstr ""
-#: src/localplayer.cpp:1409
+#: src/localplayer.cpp:1421
msgid "Stack is too big."
msgstr ""
-#: src/localplayer.cpp:1412
+#: src/localplayer.cpp:1424
msgid "Item belongs to someone else."
msgstr ""
-#: src/localplayer.cpp:1415
+#: src/localplayer.cpp:1427
msgid "Unknown problem picking up item."
msgstr ""
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1439
+#: src/localplayer.cpp:1451
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
msgstr[0] ""
msgstr[1] ""
-#: src/localplayer.cpp:3173
+#: src/localplayer.cpp:3187
msgid "Away"
msgstr ""
-#: src/localplayer.cpp:3474
+#: src/localplayer.cpp:3488
msgid "Follow: "
msgstr ""
-#: src/localplayer.cpp:3476 src/localplayer.cpp:3491
+#: src/localplayer.cpp:3490 src/localplayer.cpp:3505
msgid "Follow canceled"
msgstr ""
-#: src/localplayer.cpp:3483
+#: src/localplayer.cpp:3497
msgid "Imitation: "
msgstr ""
-#: src/localplayer.cpp:3485 src/localplayer.cpp:3493
+#: src/localplayer.cpp:3499 src/localplayer.cpp:3507
msgid "Imitation canceled"
msgstr ""
-#: src/localplayer.cpp:3845
+#: src/localplayer.cpp:3859
msgid "You see "
msgstr ""
@@ -4401,16 +4422,16 @@ msgstr ""
msgid "MVP player: "
msgstr ""
-#: src/net/ea/gamehandler.cpp:86
+#: src/net/ea/gamehandler.cpp:87
#, c-format
msgid "Online users: %d"
msgstr ""
-#: src/net/ea/gamehandler.cpp:98
+#: src/net/ea/gamehandler.cpp:99
msgid "Game"
msgstr ""
-#: src/net/ea/gamehandler.cpp:98
+#: src/net/ea/gamehandler.cpp:99
msgid "Request to quit denied!"
msgstr ""
@@ -5450,19 +5471,19 @@ msgstr ""
msgid "%s is not in your party!"
msgstr ""
-#: src/playerrelations.cpp:414
+#: src/playerrelations.cpp:429
msgid "Print '...'"
msgstr ""
-#: src/playerrelations.cpp:434
+#: src/playerrelations.cpp:449
msgid "Blink name"
msgstr ""
-#: src/playerrelations.cpp:478
+#: src/playerrelations.cpp:493
msgid "Floating '...' bubble"
msgstr ""
-#: src/playerrelations.cpp:481
+#: src/playerrelations.cpp:496
msgid "Floating bubble"
msgstr ""
diff --git a/po/nl_BE.po b/po/nl_BE.po
index 128e50c2a..d02ebbca5 100644
--- a/po/nl_BE.po
+++ b/po/nl_BE.po
@@ -2,14 +2,15 @@
# Copyright (C) YEAR The ManaPlus Developers
# This file is distributed under the same license as the PACKAGE package.
#
+# Translators:
# Jeroen De Meerleer <jeroen.de.meerleer@telenet.be>, 2011.
# Maarten Vanraes <maarten.vanraes@gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-09-02 18:27+0300\n"
-"PO-Revision-Date: 2011-09-02 15:29+0000\n"
+"POT-Creation-Date: 2011-09-10 01:34+0300\n"
+"PO-Revision-Date: 2011-09-09 22:37+0000\n"
"Last-Translator: akaras <akaras@inbox.ru>\n"
"Language-Team: Dutch (Belgium/Flemish) (http://www.transifex.net/projects/p/"
"manaplus/team/nl_BE/)\n"
@@ -19,25 +20,25 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-#: src/actorspritemanager.cpp:1034
+#: src/actorspritemanager.cpp:1046
msgid "Visible on map"
msgstr "Zichtbaar op de map"
-#: src/being.cpp:549
+#: src/being.cpp:551
msgid "dodge"
msgstr "ontwijkt"
-#: src/being.cpp:549
+#: src/being.cpp:551
msgid "miss"
msgstr "mist"
#. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1529
+#: src/being.cpp:1532
msgid "A"
msgstr "A"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1534
+#: src/being.cpp:1537
msgid "I"
msgstr "I"
@@ -107,22 +108,22 @@ msgstr "Registratie ongedaan gemaakt!"
msgid "Farewell, come back any time..."
msgstr "Tot ziens..."
-#: src/client.cpp:1428 src/client.cpp:1458 src/client.cpp:1502
-#: src/client.cpp:1927 src/client.cpp:1934
+#: src/client.cpp:1428 src/client.cpp:1458 src/client.cpp:1504
+#: src/client.cpp:1929 src/client.cpp:1936
#, 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:1633
+#: src/client.cpp:1635
#, c-format
msgid "Invalid update host: %s"
msgstr "Ongeldige update host %s"
-#: src/client.cpp:1667 src/client.cpp:1673
+#: src/client.cpp:1669 src/client.cpp:1675
msgid "Error creating updates directory!"
msgstr "Fout bij het creëren van de update map!"
-#: src/client.cpp:1694
+#: src/client.cpp:1696
#, 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."
@@ -323,19 +324,19 @@ msgstr "De verbinding met de server is verbroken."
msgid "Network Error"
msgstr "Netwerkfout"
-#: src/game.cpp:1236
+#: src/game.cpp:1243
msgid "Ignoring incoming trade requests"
msgstr "Inkomende handelsaanvragen negeren"
-#: src/game.cpp:1243
+#: src/game.cpp:1250
msgid "Accepting incoming trade requests"
msgstr "Inkomende handelsaanvragen accepteren"
-#: src/game.cpp:1629
+#: src/game.cpp:1636
msgid "Could Not Load Map"
msgstr "Kon Map Niet Laden"
-#: src/game.cpp:1630
+#: src/game.cpp:1637
#, c-format
msgid "Error while loading %s"
msgstr "Fout bij het laden van %s"
@@ -364,31 +365,31 @@ msgstr ""
msgid "Bot Checker"
msgstr "Bot Controleerder"
-#: src/gui/botcheckerwindow.cpp:295 src/gui/setup_relations.cpp:64
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
msgid "Name"
msgstr "Naam"
-#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:133
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:133
#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:646
#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:265
msgid "Attack"
msgstr "Aanvallen"
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:297
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297
#: src/keyboardconfig.cpp:62
msgid "Talk"
msgstr "Spreken"
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:263
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:263
#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:703
msgid "Move"
msgstr "Beweeg"
-#: src/gui/botcheckerwindow.cpp:299
+#: src/gui/botcheckerwindow.cpp:300
msgid "Result"
msgstr "Resultaat"
-#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:124
+#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:124
msgid "Reset"
msgstr "Reset"
@@ -434,7 +435,7 @@ msgid "Max"
msgstr "Maximum"
#: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:147 src/gui/setup_other.cpp:133
+#: src/gui/inventorywindow.cpp:176 src/gui/setup_other.cpp:142
msgid "Shop"
msgstr "Winkel"
@@ -453,10 +454,10 @@ msgstr "Verkopen"
#: src/gui/popupmenu.cpp:516 src/gui/popupmenu.cpp:540
#: src/gui/popupmenu.cpp:554 src/gui/popupmenu.cpp:573
#: src/gui/popupmenu.cpp:790 src/gui/popupmenu.cpp:814
-#: src/gui/popupmenu.cpp:1734 src/gui/popupmenu.cpp:1762
-#: src/gui/popupmenu.cpp:1818 src/gui/popupmenu.cpp:1861
-#: src/gui/popupmenu.cpp:1896 src/gui/popupmenu.cpp:1936
-#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2023
+#: src/gui/popupmenu.cpp:1737 src/gui/popupmenu.cpp:1765
+#: src/gui/popupmenu.cpp:1821 src/gui/popupmenu.cpp:1864
+#: src/gui/popupmenu.cpp:1899 src/gui/popupmenu.cpp:1939
+#: src/gui/popupmenu.cpp:2006 src/gui/popupmenu.cpp:2026
#: src/gui/quitdialog.cpp:54 src/gui/register.cpp:82 src/gui/setup.cpp:72
#: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:238
#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
@@ -558,7 +559,7 @@ msgstr "Haarstijl:"
msgid "Race:"
msgstr "Ras:"
-#: src/gui/charcreatedialog.cpp:95 src/gui/charselectdialog.cpp:478
+#: src/gui/charcreatedialog.cpp:95 src/gui/charselectdialog.cpp:480
#: src/gui/socialwindow.cpp:1139
msgid "Create"
msgstr "Aanmaken"
@@ -626,26 +627,26 @@ msgstr "Geef uw wachtwoord om uw personage te verwijderen"
msgid "Enter password:"
msgstr "Geef wachtwoord:"
-#: src/gui/charselectdialog.cpp:408 src/gui/serverdialog.cpp:298
+#: src/gui/charselectdialog.cpp:410 src/gui/serverdialog.cpp:298
#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:122
#: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:241
msgid "Delete"
msgstr "Verwijderen"
-#: src/gui/charselectdialog.cpp:466
+#: src/gui/charselectdialog.cpp:468
msgid "Choose"
msgstr "Kies"
-#: src/gui/charselectdialog.cpp:469
+#: src/gui/charselectdialog.cpp:471
#, c-format
msgid "Level %d"
msgstr "Niveau %d"
-#: src/gui/charselectdialog.cpp:480 src/gui/charselectdialog.cpp:481
+#: src/gui/charselectdialog.cpp:482 src/gui/charselectdialog.cpp:483
msgid "(empty)"
msgstr "(leeg)"
-#: src/gui/chatwindow.cpp:112
+#: src/gui/chatwindow.cpp:112 src/gui/inventorywindow.cpp:70
msgid "default"
msgstr "standaard"
@@ -701,11 +702,12 @@ msgstr "regenboog 2"
msgid "rainbow 3"
msgstr "regenboog 3"
-#: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
-#: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
-#: src/gui/setup_theme.cpp:73 src/gui/setup_theme.cpp:127
-#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
-#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
+#: src/gui/chatwindow.cpp:142 src/gui/inventorywindow.cpp:90
+#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78
+#: src/gui/setup_relations.cpp:220 src/gui/setup_theme.cpp:73
+#: src/gui/setup_theme.cpp:127 src/gui/setup_video.cpp:211
+#: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141
+#: src/gui/textcommandeditor.cpp:160
msgid "???"
msgstr "???"
@@ -738,7 +740,7 @@ msgstr "Nee"
msgid "Ignore"
msgstr "Negeer"
-#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:97
+#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:99
#: src/gui/setup_other.cpp:64
msgid "Map"
msgstr "Map"
@@ -862,7 +864,7 @@ msgstr ""
#: 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
@@ -879,7 +881,7 @@ msgid "Did You Know?"
msgstr "Weet u?"
#: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
-#: src/gui/inventorywindow.cpp:176 src/gui/npcdialog.cpp:53
+#: src/gui/inventorywindow.cpp:206 src/gui/npcdialog.cpp:53
#: src/gui/popupmenu.cpp:588 src/gui/shopwindow.cpp:113
msgid "Close"
msgstr "Sluiten"
@@ -905,10 +907,10 @@ msgstr "OK"
msgid "Equipment"
msgstr "Uitrusting"
-#: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:131
-#: src/gui/inventorywindow.cpp:512 src/gui/inventorywindow.cpp:521
-#: src/gui/popupmenu.cpp:1693 src/gui/popupmenu.cpp:1788
-#: src/gui/popupmenu.cpp:1833
+#: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160
+#: src/gui/inventorywindow.cpp:539 src/gui/inventorywindow.cpp:548
+#: src/gui/popupmenu.cpp:1696 src/gui/popupmenu.cpp:1791
+#: src/gui/popupmenu.cpp:1836
msgid "Unequip"
msgstr "Afdoen"
@@ -916,80 +918,88 @@ msgstr "Afdoen"
msgid "Help"
msgstr "Help"
-#: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76
+#: src/gui/inventorywindow.cpp:71
+msgid "by name"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:72
+msgid "by id"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:73
+msgid "by weight"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:74
+msgid "by amount"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:75
+msgid "by type"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:111 src/gui/windowmenu.cpp:76
#: src/inventory.cpp:249
msgid "Inventory"
msgstr "Inventaris"
-#: src/gui/inventorywindow.cpp:105
+#: src/gui/inventorywindow.cpp:136
msgid "Slots:"
msgstr "Sloten:"
-#: src/gui/inventorywindow.cpp:116
+#: src/gui/inventorywindow.cpp:148
msgid "Filter:"
msgstr "Filter:"
-#: src/gui/inventorywindow.cpp:117
+#: src/gui/inventorywindow.cpp:149
msgid "Sort:"
msgstr "Sorteer:"
-#: src/gui/inventorywindow.cpp:123
-msgid "na"
-msgstr "na"
-
-#: src/gui/inventorywindow.cpp:124
-msgid "az"
-msgstr "az"
-
-#: src/gui/inventorywindow.cpp:125
-msgid "id"
-msgstr "id"
-
-#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
-#: src/gui/inventorywindow.cpp:523 src/gui/popupmenu.cpp:1695
-#: src/gui/popupmenu.cpp:1790 src/gui/popupmenu.cpp:1835
+#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:541
+#: src/gui/inventorywindow.cpp:550 src/gui/popupmenu.cpp:1698
+#: src/gui/popupmenu.cpp:1793 src/gui/popupmenu.cpp:1838
msgid "Equip"
msgstr "Uitrusten"
-#: src/gui/inventorywindow.cpp:130 src/gui/inventorywindow.cpp:515
-#: src/gui/inventorywindow.cpp:519 src/gui/popupmenu.cpp:1698
-#: src/gui/popupmenu.cpp:1757 src/gui/popupmenu.cpp:1794
-#: src/gui/popupmenu.cpp:1838
+#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:542
+#: src/gui/inventorywindow.cpp:546 src/gui/popupmenu.cpp:1701
+#: src/gui/popupmenu.cpp:1760 src/gui/popupmenu.cpp:1797
+#: src/gui/popupmenu.cpp:1841
msgid "Use"
msgstr "Gebruiken"
-#: src/gui/inventorywindow.cpp:144 src/gui/inventorywindow.cpp:620
-#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1799
-#: src/gui/popupmenu.cpp:1842
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:646
+#: src/gui/popupmenu.cpp:1705 src/gui/popupmenu.cpp:1802
+#: src/gui/popupmenu.cpp:1845
msgid "Drop..."
msgstr "Neerleggen..."
-#: src/gui/inventorywindow.cpp:145 src/gui/popupmenu.cpp:1711
-#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1851
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1714
+#: src/gui/popupmenu.cpp:1811 src/gui/popupmenu.cpp:1854
msgid "Split"
msgstr "Splitsen"
-#: src/gui/inventorywindow.cpp:146 src/gui/outfitwindow.cpp:60
+#: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60
#: src/gui/popupmenu.cpp:549
msgid "Outfits"
msgstr "Kleren"
-#: src/gui/inventorywindow.cpp:149
+#: src/gui/inventorywindow.cpp:178
msgid "Weight:"
msgstr "Gewicht:"
-#: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:611
-#: src/gui/popupmenu.cpp:1674 src/gui/popupmenu.cpp:1811
-#: src/gui/popupmenu.cpp:1854 src/gui/setup.cpp:73
+#: src/gui/inventorywindow.cpp:204 src/gui/inventorywindow.cpp:637
+#: src/gui/popupmenu.cpp:1677 src/gui/popupmenu.cpp:1814
+#: src/gui/popupmenu.cpp:1857 src/gui/setup.cpp:73
msgid "Store"
msgstr "Opslaan"
-#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1718
+#: src/gui/inventorywindow.cpp:205 src/gui/popupmenu.cpp:1721
msgid "Retrieve"
msgstr "Afhalen"
-#: src/gui/inventorywindow.cpp:622 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1847
+#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1710
+#: src/gui/popupmenu.cpp:1807 src/gui/popupmenu.cpp:1850
#: src/gui/windowmenu.cpp:97
msgid "Drop"
msgstr "Neerleggen"
@@ -1043,91 +1053,91 @@ msgstr "Gewicht: %s"
msgid "Kill stats"
msgstr "Doden statistieken"
-#: src/gui/killstats.cpp:65
+#: src/gui/killstats.cpp:66
msgid "Reset stats"
msgstr "Herzet statistieken"
-#: src/gui/killstats.cpp:66
+#: src/gui/killstats.cpp:67
msgid "Reset timer"
msgstr "Herzet timer"
-#: src/gui/killstats.cpp:70 src/gui/killstats.cpp:206
+#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:207
#, c-format
msgid "Level: %d at %f%%"
msgstr ""
-#: src/gui/killstats.cpp:74 src/gui/killstats.cpp:211
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:212
#, c-format
msgid "Exp: %d/%d Left: %d"
msgstr ""
-#: src/gui/killstats.cpp:77 src/gui/killstats.cpp:217
-#: src/gui/killstats.cpp:226
+#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:218
+#: src/gui/killstats.cpp:227
#, c-format
msgid "1%% = %d exp, avg mob for 1%%: %s"
msgstr ""
-#: src/gui/killstats.cpp:80 src/gui/killstats.cpp:143
-#: src/gui/killstats.cpp:235
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:236
#, c-format
msgid "Kills: %s, total exp: %s"
msgstr ""
-#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145
-#: src/gui/killstats.cpp:221 src/gui/killstats.cpp:231
+#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:146
+#: src/gui/killstats.cpp:222 src/gui/killstats.cpp:232
#, c-format
msgid "Avg Exp: %s, No. of avg mob to next level: %s"
msgstr ""
-#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:163
-#: src/gui/killstats.cpp:238
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:164
+#: src/gui/killstats.cpp:239
#, c-format
msgid "Kills/Min: %s, Exp/Min: %s"
msgstr ""
-#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:90 src/gui/killstats.cpp:95
-#: src/gui/killstats.cpp:290 src/gui/killstats.cpp:306
-#: src/gui/killstats.cpp:324
+#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
+#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
+#: src/gui/killstats.cpp:325
#, c-format
msgid "Exp speed per %d min: %s"
msgid_plural "Exp speed per %d min: %s"
msgstr[0] ""
msgstr[1] ""
-#: src/gui/killstats.cpp:88 src/gui/killstats.cpp:93 src/gui/killstats.cpp:98
+#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:94 src/gui/killstats.cpp:99
#, c-format
msgid "Time for next level per %d min: %s"
msgid_plural "Time for next level per %d min: %s"
msgstr[0] ""
msgstr[1] ""
-#: src/gui/killstats.cpp:101 src/gui/killstats.cpp:242
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
msgid "Last kill exp:"
msgstr ""
-#: src/gui/killstats.cpp:103 src/gui/killstats.cpp:356
-#: src/gui/killstats.cpp:362 src/gui/killstats.cpp:368
-#: src/gui/killstats.cpp:373
+#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
+#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:374
msgid "Time before jacko spawn:"
msgstr ""
-#: src/gui/killstats.cpp:295 src/gui/killstats.cpp:302
-#: src/gui/killstats.cpp:312 src/gui/killstats.cpp:319
-#: src/gui/killstats.cpp:331 src/gui/killstats.cpp:338
+#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
+#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
+#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
#, c-format
msgid " Time for next level: %s"
msgstr " Tijd tot volgend niveau: %s"
-#: src/gui/killstats.cpp:362
+#: src/gui/killstats.cpp:363
#, c-format
msgid "%s %d?"
msgstr ""
-#: src/gui/killstats.cpp:368
+#: src/gui/killstats.cpp:369
msgid "jacko spawning"
msgstr ""
-#: src/guildmanager.cpp:464 src/net/ea/guildhandler.cpp:439
+#: src/guildmanager.cpp:484 src/net/ea/guildhandler.cpp:439
msgid "You have left the guild."
msgstr ""
@@ -1225,7 +1235,7 @@ msgid "Submit"
msgstr "Indienen"
#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:142
+#: src/gui/setup_other.cpp:151
msgid "NPC"
msgstr "NPC"
@@ -1274,11 +1284,11 @@ msgstr "Handel"
#: src/gui/popupmenu.cpp:134 src/gui/popupmenu.cpp:393
msgid "Whisper"
-msgstr ""
+msgstr "Fluister"
#: src/gui/popupmenu.cpp:138 src/gui/popupmenu.cpp:650
msgid "Heal"
-msgstr ""
+msgstr "Genees"
#: src/gui/popupmenu.cpp:145 src/gui/popupmenu.cpp:399
#: src/gui/popupmenu.cpp:657
@@ -1313,7 +1323,7 @@ msgstr ""
#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:185
#: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:428
#: src/gui/popupmenu.cpp:677 src/gui/popupmenu.cpp:693
-#: src/playerrelations.cpp:400
+#: src/playerrelations.cpp:415
msgid "Completely ignore"
msgstr "Volledig genegeerd"
@@ -1364,7 +1374,7 @@ msgid "Show Items"
msgstr "Toon Voorwerpen"
#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:705
-#: src/gui/popupmenu.cpp:2020
+#: src/gui/popupmenu.cpp:2023
msgid "Undress"
msgstr "ontkleed"
@@ -1412,8 +1422,8 @@ msgstr ""
msgid "Pick up"
msgstr "Raap op"
-#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:1732
-#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1855
+#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:1735
+#: src/gui/popupmenu.cpp:1815 src/gui/popupmenu.cpp:1858
msgid "Add to chat"
msgstr "Aan chat toevoegen"
@@ -1425,8 +1435,8 @@ msgstr "Plaats voorwerp op de kaart"
msgid "Rename"
msgstr "Hernoem"
-#: src/gui/popupmenu.cpp:532 src/gui/popupmenu.cpp:1973
-#: src/gui/popupmenu.cpp:1991 src/gui/popupmenu.cpp:1996
+#: src/gui/popupmenu.cpp:532 src/gui/popupmenu.cpp:1976
+#: src/gui/popupmenu.cpp:1994 src/gui/popupmenu.cpp:1999
msgid "Remove"
msgstr "Verwijder"
@@ -1502,85 +1512,85 @@ msgstr ""
msgid "Comment: "
msgstr ""
-#: src/gui/popupmenu.cpp:1657
+#: src/gui/popupmenu.cpp:1660
msgid "Add to trade"
msgstr ""
-#: src/gui/popupmenu.cpp:1663
+#: src/gui/popupmenu.cpp:1666
msgid "Add to trade 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1666
+#: src/gui/popupmenu.cpp:1669
msgid "Add to trade half"
msgstr ""
-#: src/gui/popupmenu.cpp:1668
+#: src/gui/popupmenu.cpp:1671
msgid "Add to trade all"
msgstr ""
-#: src/gui/popupmenu.cpp:1680
+#: src/gui/popupmenu.cpp:1683
msgid "Store 10"
msgstr "Plaats 10"
-#: src/gui/popupmenu.cpp:1683
+#: src/gui/popupmenu.cpp:1686
msgid "Store half"
msgstr "Plaats de helft"
-#: src/gui/popupmenu.cpp:1685
+#: src/gui/popupmenu.cpp:1688
msgid "Store all"
msgstr "Plaats alles"
-#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1800
-#: src/gui/popupmenu.cpp:1843
+#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1803
+#: src/gui/popupmenu.cpp:1846
msgid "Drop all"
msgstr "Laat alles vallen"
-#: src/gui/popupmenu.cpp:1724
+#: src/gui/popupmenu.cpp:1727
msgid "Retrieve 10"
msgstr "Haal 10 op"
-#: src/gui/popupmenu.cpp:1727
+#: src/gui/popupmenu.cpp:1730
msgid "Retrieve half"
msgstr "Haal de helft op"
-#: src/gui/popupmenu.cpp:1729
+#: src/gui/popupmenu.cpp:1732
msgid "Retrieve all"
msgstr "Haal alles op"
-#: src/gui/popupmenu.cpp:1760 src/gui/popupmenu.cpp:1816
+#: src/gui/popupmenu.cpp:1763 src/gui/popupmenu.cpp:1819
msgid "Load old item shortcuts"
msgstr "Laden van oude voorwerpsnelkoppelingen"
-#: src/gui/popupmenu.cpp:1859
+#: src/gui/popupmenu.cpp:1862
msgid "Load old drop shortcuts"
msgstr "Laden van oude neerleggingsnelkoppeling"
-#: src/gui/popupmenu.cpp:1885 src/gui/popupmenu.cpp:1920
+#: src/gui/popupmenu.cpp:1888 src/gui/popupmenu.cpp:1923
msgid "Hide"
msgstr "Verberg"
-#: src/gui/popupmenu.cpp:1891 src/gui/popupmenu.cpp:1926
+#: src/gui/popupmenu.cpp:1894 src/gui/popupmenu.cpp:1929
msgid "Show"
msgstr "Toon"
-#: src/gui/popupmenu.cpp:1933
+#: src/gui/popupmenu.cpp:1936
msgid "Reset yellow bar"
msgstr ""
-#: src/gui/popupmenu.cpp:1935 src/gui/statuswindow.cpp:241
+#: src/gui/popupmenu.cpp:1938 src/gui/statuswindow.cpp:241
msgid "Copy to chat"
msgstr "Kopieer naar chat"
-#: src/gui/popupmenu.cpp:1953 src/gui/socialwindow.cpp:958
+#: src/gui/popupmenu.cpp:1956 src/gui/socialwindow.cpp:958
#: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028
msgid "(default)"
msgstr "(standaard)"
-#: src/gui/popupmenu.cpp:1965 src/gui/popupmenu.cpp:1983
+#: src/gui/popupmenu.cpp:1968 src/gui/popupmenu.cpp:1986
msgid "Move up"
msgstr "Beweeg naar boven"
-#: src/gui/popupmenu.cpp:1970 src/gui/popupmenu.cpp:1988
+#: src/gui/popupmenu.cpp:1973 src/gui/popupmenu.cpp:1991
msgid "Move down"
msgstr "Beweeg naar beneden"
@@ -1828,7 +1838,7 @@ msgstr "Tijd"
msgid "Use local time"
msgstr "Gebruik lokale tijd"
-#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:157
+#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:166
msgid "Other"
msgstr "Andere"
@@ -1865,7 +1875,7 @@ msgstr "Spectrum"
#: src/gui/setup_colors.cpp:97 src/gui/setup_colors.cpp:319
msgid "Delay:"
-msgstr ""
+msgstr "Vertraging:"
#: src/gui/setup_colors.cpp:112
msgid "Red:"
@@ -1985,121 +1995,133 @@ msgstr "Toon uitgebreide minimaps"
#: src/gui/setup_other.cpp:81
msgid "Draw path"
-msgstr ""
+msgstr "Teken de weg"
#: src/gui/setup_other.cpp:84
msgid "Draw hotkeys on map"
msgstr ""
-#: src/gui/setup_other.cpp:88
+#: src/gui/setup_other.cpp:87
+msgid "Enable lazy scrolling"
+msgstr ""
+
+#: src/gui/setup_other.cpp:90
+msgid "Scroll laziness"
+msgstr ""
+
+#: src/gui/setup_other.cpp:93
+msgid "Scroll radius"
+msgstr ""
+
+#: src/gui/setup_other.cpp:97
msgid "Moving"
msgstr "Bewegen"
-#: src/gui/setup_other.cpp:90
+#: src/gui/setup_other.cpp:99
msgid "Auto fix position"
msgstr ""
-#: src/gui/setup_other.cpp:93
+#: src/gui/setup_other.cpp:102
msgid "Attack while moving"
msgstr "Aanvallen tijdens verplaatsen"
-#: src/gui/setup_other.cpp:96
+#: src/gui/setup_other.cpp:105
msgid "Sync player move"
msgstr ""
-#: src/gui/setup_other.cpp:99
+#: src/gui/setup_other.cpp:108
msgid "Crazy move A program"
msgstr ""
-#: src/gui/setup_other.cpp:103
+#: src/gui/setup_other.cpp:112
msgid "Player"
msgstr "Speler"
-#: src/gui/setup_other.cpp:105
+#: src/gui/setup_other.cpp:114
msgid "Show own hp bar"
msgstr "Toon hp statusbalk van jezelf"
-#: src/gui/setup_other.cpp:108
+#: src/gui/setup_other.cpp:117
msgid "Enable quick stats"
msgstr "Zet snelle statistieken aan"
-#: src/gui/setup_other.cpp:111
+#: src/gui/setup_other.cpp:120
msgid "Cycle player targets"
msgstr ""
-#: src/gui/setup_other.cpp:114
+#: src/gui/setup_other.cpp:123
msgid "Show job exp messages"
msgstr ""
-#: src/gui/setup_other.cpp:117
+#: src/gui/setup_other.cpp:126
msgid "Show players popups"
msgstr ""
-#: src/gui/setup_other.cpp:120
+#: src/gui/setup_other.cpp:129
msgid "Afk message"
msgstr ""
-#: src/gui/setup_other.cpp:123
+#: src/gui/setup_other.cpp:132
msgid "Show job"
msgstr ""
-#: src/gui/setup_other.cpp:126
+#: src/gui/setup_other.cpp:135
msgid "Enable attack filter"
msgstr ""
-#: src/gui/setup_other.cpp:129
+#: src/gui/setup_other.cpp:138
msgid "Enable advert protocol"
msgstr ""
-#: src/gui/setup_other.cpp:135
+#: src/gui/setup_other.cpp:144
msgid "Accept sell/buy requests"
msgstr "Accepteer koop/verkoop aanvragen"
-#: src/gui/setup_other.cpp:138
+#: src/gui/setup_other.cpp:147
msgid "Enable shop mode"
msgstr "shop modus aanzetten"
-#: src/gui/setup_other.cpp:144
+#: src/gui/setup_other.cpp:153
msgid "Log NPC dialogue"
msgstr ""
-#: src/gui/setup_other.cpp:148
+#: src/gui/setup_other.cpp:157
msgid "Bots support"
msgstr ""
-#: src/gui/setup_other.cpp:150
+#: src/gui/setup_other.cpp:159
msgid "Enable auction bot support"
msgstr ""
-#: src/gui/setup_other.cpp:153
+#: src/gui/setup_other.cpp:162
msgid "Enable guild bot support and disable native guild support"
msgstr ""
-#: src/gui/setup_other.cpp:159
+#: src/gui/setup_other.cpp:168
msgid "Enable server side attack"
-msgstr ""
+msgstr "Aanval gecontroleerd door server aanzetten"
-#: src/gui/setup_other.cpp:162
+#: src/gui/setup_other.cpp:171
msgid "Enable bot checker"
-msgstr ""
+msgstr "Bot controle aanzetten"
-#: src/gui/setup_other.cpp:165
+#: src/gui/setup_other.cpp:174
msgid "Enable buggy servers protection"
-msgstr ""
+msgstr "Beveiliging tegen fouten van server aanzetten"
-#: src/gui/setup_other.cpp:168
+#: src/gui/setup_other.cpp:177
msgid "Enable debug log"
msgstr "Zet debug log aan"
-#: src/gui/setup_other.cpp:171
+#: src/gui/setup_other.cpp:180
msgid "Low traffic mode"
msgstr ""
-#: src/gui/setup_other.cpp:174
+#: src/gui/setup_other.cpp:183
msgid "Hide shield sprite"
msgstr ""
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:186
msgid "Show background"
msgstr "Toon achtergrond"
@@ -2116,29 +2138,29 @@ msgid "Auto adjust perfomance"
msgstr ""
#: src/gui/setup_perfomance.cpp:61
-msgid "Show beings transparency"
-msgstr ""
-
-#: src/gui/setup_perfomance.cpp:64
msgid "Hw acceleration"
msgstr "Hw acceleratie"
-#: src/gui/setup_perfomance.cpp:67
+#: src/gui/setup_perfomance.cpp:64
msgid "Enable opacity cache (Software, can use many memory)"
msgstr ""
-#: src/gui/setup_perfomance.cpp:70
+#: src/gui/setup_perfomance.cpp:67
msgid "Enable map reduce (Software)"
msgstr ""
-#: src/gui/setup_perfomance.cpp:73
+#: src/gui/setup_perfomance.cpp:70
msgid "Better quality (disable for better perfomance)"
msgstr ""
-#: src/gui/setup_perfomance.cpp:76
+#: src/gui/setup_perfomance.cpp:73
msgid "Enable alpha channel fix (Software, can be very slow)"
msgstr ""
+#: src/gui/setup_perfomance.cpp:77
+msgid "Show beings transparency"
+msgstr ""
+
#: src/gui/setup_perfomance.cpp:80
msgid "Enable reorder sprites."
msgstr ""
@@ -2245,27 +2267,27 @@ msgstr "Tijdens negeren:"
#: src/gui/setup_theme.cpp:107
msgid "Tiny (10)"
-msgstr ""
+msgstr "Heel klein (10)"
#: src/gui/setup_theme.cpp:108
msgid "Small (11)"
-msgstr ""
+msgstr "Klein (11)"
#: src/gui/setup_theme.cpp:109
msgid "Medium (12)"
-msgstr ""
+msgstr "Middelmatig (12)"
#: src/gui/setup_theme.cpp:110
msgid "Large (13)"
-msgstr ""
+msgstr "Groot (13)"
#: src/gui/setup_theme.cpp:111
msgid "Big (14)"
-msgstr ""
+msgstr "Heel groot (14)"
#: src/gui/setup_theme.cpp:112
msgid "Huge (15)"
-msgstr ""
+msgstr "Extreem groot (15)"
#: src/gui/setup_theme.cpp:143
msgid "Theme"
@@ -2391,7 +2413,7 @@ msgid "FPS limit:"
msgstr "FPS limiet:"
#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
-#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709
+#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:710
msgid "Alt FPS limit: "
msgstr "Alt FPS limiet: "
@@ -2417,7 +2439,7 @@ msgstr ""
#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
-#: src/gui/setup_video.cpp:707
+#: src/gui/setup_video.cpp:708
msgid "None"
msgstr "Geen"
@@ -2529,22 +2551,22 @@ msgstr "Omhoog"
msgid "Skill points available: %d"
msgstr ""
-#: src/gui/skilldialog.cpp:418
+#: src/gui/skilldialog.cpp:420
#, c-format
msgid "Skill Set %d"
msgstr ""
-#: src/gui/skilldialog.cpp:430
+#: src/gui/skilldialog.cpp:432
#, c-format
msgid "Skill %d"
msgstr ""
-#: src/gui/skilldialog.cpp:497 src/gui/skilldialog.cpp:550
+#: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554
#, c-format
msgid "Lvl: %d"
msgstr "Niv: %d"
-#: src/gui/skilldialog.cpp:542
+#: src/gui/skilldialog.cpp:546
#, c-format
msgid "Lvl: %d (%+d)"
msgstr "Niv: %d (%+d)"
@@ -2695,7 +2717,7 @@ msgstr "Uitnodiging tot guild ontvangen, maar er is er al één."
#: src/gui/socialwindow.cpp:1431
#, c-format
msgid "%s has invited you to join the guild %s."
-msgstr ""
+msgstr "%s heeft je uitgenodigd om guid %s te vervoegen."
#: src/gui/socialwindow.cpp:1437
msgid "Accept Guild Invite"
@@ -2742,7 +2764,7 @@ msgstr "Kies uw groepsnaam."
#: src/gui/specialswindow.cpp:79 src/gui/windowmenu.cpp:88
msgid "Specials"
-msgstr ""
+msgstr "Specialen"
#: src/gui/statuspopup.cpp:198
msgid "(D) default moves"
@@ -3367,11 +3389,11 @@ msgstr ""
#: src/gui/userpalette.cpp:129
msgid "Party Members"
-msgstr ""
+msgstr "Groep Leden"
#: src/gui/userpalette.cpp:130
msgid "Guild Members"
-msgstr ""
+msgstr "Guild Leden"
#: src/gui/userpalette.cpp:131
msgid "Particle Effects"
@@ -3469,23 +3491,23 @@ msgstr ""
msgid "Road Point"
msgstr ""
-#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:472
+#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:474
msgid "Who Is Online - Updating"
msgstr "Wie Is Online - Bijwerken"
-#: src/gui/whoisonline.cpp:102
+#: src/gui/whoisonline.cpp:104
msgid "Update"
msgstr "Bijwerken"
-#: src/gui/whoisonline.cpp:295
+#: src/gui/whoisonline.cpp:297
msgid "Who Is Online - "
msgstr "Wie Is Online - "
-#: src/gui/whoisonline.cpp:486
+#: src/gui/whoisonline.cpp:488
msgid "Who Is Online - error"
msgstr "Wie Is Online - fout"
-#: src/gui/whoisonline.cpp:517
+#: src/gui/whoisonline.cpp:519
msgid "Who Is Online - Update"
msgstr "Wie Is Online - Bijgewerkt"
@@ -3997,11 +4019,11 @@ msgstr "Emoticon snelkoppeling %d"
#: src/keyboardconfig.cpp:261
msgid "Wear Outfit"
-msgstr ""
+msgstr "Draag Kledij"
#: src/keyboardconfig.cpp:263
msgid "Copy Outfit"
-msgstr ""
+msgstr "Kopiëer Kledij"
#: src/keyboardconfig.cpp:265
msgid "Copy equipped to Outfit"
@@ -4137,7 +4159,7 @@ msgstr ""
#: src/keyboardconfig.cpp:331
msgid "On / Off audio"
-msgstr ""
+msgstr "Aan / Uit audio"
#: src/keyboardconfig.cpp:333
msgid "Enable / Disable away mode"
@@ -4162,68 +4184,68 @@ msgid ""
"strange behaviour."
msgstr ""
-#: src/localplayer.cpp:370
+#: src/localplayer.cpp:372
msgid "You were killed by "
msgstr "U bent gedoodt door "
-#: src/localplayer.cpp:1401
+#: src/localplayer.cpp:1413
msgid "Tried to pick up nonexistent item."
msgstr "Geprobeerd een nietbestaand voorwerp op te rapen."
-#: src/localplayer.cpp:1403
+#: src/localplayer.cpp:1415
msgid "Item is too heavy."
msgstr "Voorwerp is te zwaar."
-#: src/localplayer.cpp:1405
+#: src/localplayer.cpp:1417
msgid "Item is too far away."
msgstr "Voorwerp is te ver weg."
-#: src/localplayer.cpp:1407
+#: src/localplayer.cpp:1419
msgid "Inventory is full."
msgstr ""
-#: src/localplayer.cpp:1409
+#: src/localplayer.cpp:1421
msgid "Stack is too big."
msgstr ""
-#: src/localplayer.cpp:1412
+#: src/localplayer.cpp:1424
msgid "Item belongs to someone else."
msgstr "Voorwerp behoort bij iemand anders."
-#: src/localplayer.cpp:1415
+#: src/localplayer.cpp:1427
msgid "Unknown problem picking up item."
msgstr "Onbekend probleem bij het oprapen van voorwerp."
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1439
+#: src/localplayer.cpp:1451
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
msgstr[0] "U raapte op %d [@@%d|%s@@]."
msgstr[1] "U raapte op %d [@@%d|%s@@]."
-#: src/localplayer.cpp:3173
+#: src/localplayer.cpp:3187
msgid "Away"
msgstr "Weg"
-#: src/localplayer.cpp:3474
+#: src/localplayer.cpp:3488
msgid "Follow: "
msgstr "Volg: "
-#: src/localplayer.cpp:3476 src/localplayer.cpp:3491
+#: src/localplayer.cpp:3490 src/localplayer.cpp:3505
msgid "Follow canceled"
msgstr "Volgen onderbroken"
-#: src/localplayer.cpp:3483
+#: src/localplayer.cpp:3497
msgid "Imitation: "
msgstr "Imitatie: "
-#: src/localplayer.cpp:3485 src/localplayer.cpp:3493
+#: src/localplayer.cpp:3499 src/localplayer.cpp:3507
msgid "Imitation canceled"
msgstr "Imitatie onderbroken"
-#: src/localplayer.cpp:3845
+#: src/localplayer.cpp:3859
msgid "You see "
msgstr ""
@@ -4426,16 +4448,16 @@ msgstr ""
msgid "MVP player: "
msgstr ""
-#: src/net/ea/gamehandler.cpp:86
+#: src/net/ea/gamehandler.cpp:87
#, c-format
msgid "Online users: %d"
msgstr "Online gebruikers: %d"
-#: src/net/ea/gamehandler.cpp:98
+#: src/net/ea/gamehandler.cpp:99
msgid "Game"
msgstr "Spel"
-#: src/net/ea/gamehandler.cpp:98
+#: src/net/ea/gamehandler.cpp:99
msgid "Request to quit denied!"
msgstr "Aanvraag op de stoppen is geweigerd!"
@@ -4445,7 +4467,7 @@ msgstr "Guild aangemaakt."
#: src/net/ea/guildhandler.cpp:88 src/net/ea/guildhandler.cpp:93
msgid "You are already in guild."
-msgstr ""
+msgstr "U bent al in deze guild."
#: src/net/ea/guildhandler.cpp:98
msgid "Emperium check failed."
@@ -5496,19 +5518,19 @@ msgstr "Verbinding met server beëindigd. "
msgid "%s is not in your party!"
msgstr "%s is niet in jouw groep!"
-#: src/playerrelations.cpp:414
+#: src/playerrelations.cpp:429
msgid "Print '...'"
msgstr "Say '...'"
-#: src/playerrelations.cpp:434
+#: src/playerrelations.cpp:449
msgid "Blink name"
msgstr "Blink naam"
-#: src/playerrelations.cpp:478
+#: src/playerrelations.cpp:493
msgid "Floating '...' bubble"
msgstr "Zwevende '...' bel"
-#: src/playerrelations.cpp:481
+#: src/playerrelations.cpp:496
msgid "Floating bubble"
msgstr "Zwevende bel"
diff --git a/po/pt.po b/po/pt.po
index 57b505c92..6b1e0cf4e 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -2,16 +2,17 @@
# Copyright (C) YEAR The ManaPlus Developers
# This file is distributed under the same license as the PACKAGE package.
#
+# Translators:
+# Andrei Karas <akaras@inbox.ru>, 2011.
# <freya.df@gmail.com>, 2011.
# freya <freya.df@gmail.com>, 2011.
-# Andrei Karas <akaras@inbox.ru>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-09-02 18:27+0300\n"
-"PO-Revision-Date: 2011-09-02 18:59+0000\n"
-"Last-Translator: freya <freya.df@gmail.com>\n"
+"POT-Creation-Date: 2011-09-10 01:34+0300\n"
+"PO-Revision-Date: 2011-09-09 22:37+0000\n"
+"Last-Translator: akaras <akaras@inbox.ru>\n"
"Language-Team: Portuguese (http://www.transifex.net/projects/p/manaplus/team/"
"pt/)\n"
"Language: pt\n"
@@ -20,25 +21,25 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-#: src/actorspritemanager.cpp:1034
+#: src/actorspritemanager.cpp:1046
msgid "Visible on map"
msgstr "Visivel no mapa"
-#: src/being.cpp:549
+#: src/being.cpp:551
msgid "dodge"
msgstr "desviou"
-#: src/being.cpp:549
+#: src/being.cpp:551
msgid "miss"
msgstr "errou"
#. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1529
+#: src/being.cpp:1532
msgid "A"
msgstr "A"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1534
+#: src/being.cpp:1537
msgid "I"
msgstr "l"
@@ -108,22 +109,22 @@ msgstr "Registro cancelado com sucesso"
msgid "Farewell, come back any time..."
msgstr "Tchau, volte sempre..."
-#: src/client.cpp:1428 src/client.cpp:1458 src/client.cpp:1502
-#: src/client.cpp:1927 src/client.cpp:1934
+#: src/client.cpp:1428 src/client.cpp:1458 src/client.cpp:1504
+#: src/client.cpp:1929 src/client.cpp:1936
#, 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:1633
+#: src/client.cpp:1635
#, c-format
msgid "Invalid update host: %s"
msgstr "Host de atualização inválido: %s"
-#: src/client.cpp:1667 src/client.cpp:1673
+#: src/client.cpp:1669 src/client.cpp:1675
msgid "Error creating updates directory!"
msgstr "Erro ao criar pasta de atualizações!"
-#: src/client.cpp:1694
+#: src/client.cpp:1696
#, 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."
@@ -324,19 +325,19 @@ msgstr "A conexão com o servidor caiu."
msgid "Network Error"
msgstr "Erro de conexão"
-#: src/game.cpp:1236
+#: src/game.cpp:1243
msgid "Ignoring incoming trade requests"
msgstr "Ignorando propostas de negócios"
-#: src/game.cpp:1243
+#: src/game.cpp:1250
msgid "Accepting incoming trade requests"
msgstr "Aceitando propostas de negócios"
-#: src/game.cpp:1629
+#: src/game.cpp:1636
msgid "Could Not Load Map"
msgstr "Não foi possível carregar o mapa"
-#: src/game.cpp:1630
+#: src/game.cpp:1637
#, c-format
msgid "Error while loading %s"
msgstr "Erro ao carregar %s"
@@ -365,31 +366,31 @@ msgstr "Comentário: %s"
msgid "Bot Checker"
msgstr "Analizador de bot"
-#: src/gui/botcheckerwindow.cpp:295 src/gui/setup_relations.cpp:64
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
msgid "Name"
msgstr "Nome"
-#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:133
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:133
#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:646
#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:265
msgid "Attack"
msgstr "Atacar"
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:297
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297
#: src/keyboardconfig.cpp:62
msgid "Talk"
msgstr "Falar"
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:263
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:263
#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:703
msgid "Move"
msgstr "Mover"
-#: src/gui/botcheckerwindow.cpp:299
+#: src/gui/botcheckerwindow.cpp:300
msgid "Result"
msgstr "Resultado"
-#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:124
+#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:124
msgid "Reset"
msgstr "Resetar"
@@ -435,7 +436,7 @@ msgid "Max"
msgstr "Máximo"
#: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:147 src/gui/setup_other.cpp:133
+#: src/gui/inventorywindow.cpp:176 src/gui/setup_other.cpp:142
msgid "Shop"
msgstr "Loja"
@@ -454,10 +455,10 @@ msgstr "Vender"
#: src/gui/popupmenu.cpp:516 src/gui/popupmenu.cpp:540
#: src/gui/popupmenu.cpp:554 src/gui/popupmenu.cpp:573
#: src/gui/popupmenu.cpp:790 src/gui/popupmenu.cpp:814
-#: src/gui/popupmenu.cpp:1734 src/gui/popupmenu.cpp:1762
-#: src/gui/popupmenu.cpp:1818 src/gui/popupmenu.cpp:1861
-#: src/gui/popupmenu.cpp:1896 src/gui/popupmenu.cpp:1936
-#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2023
+#: src/gui/popupmenu.cpp:1737 src/gui/popupmenu.cpp:1765
+#: src/gui/popupmenu.cpp:1821 src/gui/popupmenu.cpp:1864
+#: src/gui/popupmenu.cpp:1899 src/gui/popupmenu.cpp:1939
+#: src/gui/popupmenu.cpp:2006 src/gui/popupmenu.cpp:2026
#: src/gui/quitdialog.cpp:54 src/gui/register.cpp:82 src/gui/setup.cpp:72
#: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:238
#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
@@ -559,7 +560,7 @@ msgstr "Estilo do Cabelo:"
msgid "Race:"
msgstr "Corrida:"
-#: src/gui/charcreatedialog.cpp:95 src/gui/charselectdialog.cpp:478
+#: src/gui/charcreatedialog.cpp:95 src/gui/charselectdialog.cpp:480
#: src/gui/socialwindow.cpp:1139
msgid "Create"
msgstr "Criar"
@@ -627,26 +628,26 @@ msgstr "Entre com a Senha para Deletar o usuario"
msgid "Enter password:"
msgstr "Entre com a senha"
-#: src/gui/charselectdialog.cpp:408 src/gui/serverdialog.cpp:298
+#: src/gui/charselectdialog.cpp:410 src/gui/serverdialog.cpp:298
#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:122
#: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:241
msgid "Delete"
msgstr "Excluir"
-#: src/gui/charselectdialog.cpp:466
+#: src/gui/charselectdialog.cpp:468
msgid "Choose"
msgstr "Escolher"
-#: src/gui/charselectdialog.cpp:469
+#: src/gui/charselectdialog.cpp:471
#, c-format
msgid "Level %d"
msgstr "Nível %d"
-#: src/gui/charselectdialog.cpp:480 src/gui/charselectdialog.cpp:481
+#: src/gui/charselectdialog.cpp:482 src/gui/charselectdialog.cpp:483
msgid "(empty)"
msgstr "(vazio)"
-#: src/gui/chatwindow.cpp:112
+#: src/gui/chatwindow.cpp:112 src/gui/inventorywindow.cpp:70
msgid "default"
msgstr "padrão"
@@ -702,11 +703,12 @@ msgstr "arco-íris 2"
msgid "rainbow 3"
msgstr "arco-íris 3"
-#: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
-#: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
-#: src/gui/setup_theme.cpp:73 src/gui/setup_theme.cpp:127
-#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
-#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
+#: src/gui/chatwindow.cpp:142 src/gui/inventorywindow.cpp:90
+#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78
+#: src/gui/setup_relations.cpp:220 src/gui/setup_theme.cpp:73
+#: src/gui/setup_theme.cpp:127 src/gui/setup_video.cpp:211
+#: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141
+#: src/gui/textcommandeditor.cpp:160
msgid "???"
msgstr "???"
@@ -739,7 +741,7 @@ msgstr "Não"
msgid "Ignore"
msgstr "Ignora"
-#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:97
+#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:99
#: src/gui/setup_other.cpp:64
msgid "Map"
msgstr "Mapa"
@@ -880,7 +882,7 @@ msgid "Did You Know?"
msgstr "Você sabia?"
#: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
-#: src/gui/inventorywindow.cpp:176 src/gui/npcdialog.cpp:53
+#: src/gui/inventorywindow.cpp:206 src/gui/npcdialog.cpp:53
#: src/gui/popupmenu.cpp:588 src/gui/shopwindow.cpp:113
msgid "Close"
msgstr "Fechar"
@@ -906,10 +908,10 @@ msgstr "OK"
msgid "Equipment"
msgstr "Equipamento"
-#: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:131
-#: src/gui/inventorywindow.cpp:512 src/gui/inventorywindow.cpp:521
-#: src/gui/popupmenu.cpp:1693 src/gui/popupmenu.cpp:1788
-#: src/gui/popupmenu.cpp:1833
+#: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160
+#: src/gui/inventorywindow.cpp:539 src/gui/inventorywindow.cpp:548
+#: src/gui/popupmenu.cpp:1696 src/gui/popupmenu.cpp:1791
+#: src/gui/popupmenu.cpp:1836
msgid "Unequip"
msgstr "Desequipar"
@@ -917,80 +919,88 @@ msgstr "Desequipar"
msgid "Help"
msgstr "Ajuda"
-#: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76
+#: src/gui/inventorywindow.cpp:71
+msgid "by name"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:72
+msgid "by id"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:73
+msgid "by weight"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:74
+msgid "by amount"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:75
+msgid "by type"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:111 src/gui/windowmenu.cpp:76
#: src/inventory.cpp:249
msgid "Inventory"
msgstr "Inventário"
-#: src/gui/inventorywindow.cpp:105
+#: src/gui/inventorywindow.cpp:136
msgid "Slots:"
msgstr "Slots:"
-#: src/gui/inventorywindow.cpp:116
+#: src/gui/inventorywindow.cpp:148
msgid "Filter:"
msgstr "Filtro:"
-#: src/gui/inventorywindow.cpp:117
+#: src/gui/inventorywindow.cpp:149
msgid "Sort:"
msgstr "Classificar"
-#: src/gui/inventorywindow.cpp:123
-msgid "na"
-msgstr "na"
-
-#: src/gui/inventorywindow.cpp:124
-msgid "az"
-msgstr "az"
-
-#: src/gui/inventorywindow.cpp:125
-msgid "id"
-msgstr "id"
-
-#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
-#: src/gui/inventorywindow.cpp:523 src/gui/popupmenu.cpp:1695
-#: src/gui/popupmenu.cpp:1790 src/gui/popupmenu.cpp:1835
+#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:541
+#: src/gui/inventorywindow.cpp:550 src/gui/popupmenu.cpp:1698
+#: src/gui/popupmenu.cpp:1793 src/gui/popupmenu.cpp:1838
msgid "Equip"
msgstr "Equipar"
-#: src/gui/inventorywindow.cpp:130 src/gui/inventorywindow.cpp:515
-#: src/gui/inventorywindow.cpp:519 src/gui/popupmenu.cpp:1698
-#: src/gui/popupmenu.cpp:1757 src/gui/popupmenu.cpp:1794
-#: src/gui/popupmenu.cpp:1838
+#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:542
+#: src/gui/inventorywindow.cpp:546 src/gui/popupmenu.cpp:1701
+#: src/gui/popupmenu.cpp:1760 src/gui/popupmenu.cpp:1797
+#: src/gui/popupmenu.cpp:1841
msgid "Use"
msgstr "Usar"
-#: src/gui/inventorywindow.cpp:144 src/gui/inventorywindow.cpp:620
-#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1799
-#: src/gui/popupmenu.cpp:1842
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:646
+#: src/gui/popupmenu.cpp:1705 src/gui/popupmenu.cpp:1802
+#: src/gui/popupmenu.cpp:1845
msgid "Drop..."
msgstr "Descartar..."
-#: src/gui/inventorywindow.cpp:145 src/gui/popupmenu.cpp:1711
-#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1851
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1714
+#: src/gui/popupmenu.cpp:1811 src/gui/popupmenu.cpp:1854
msgid "Split"
msgstr "Dividir"
-#: src/gui/inventorywindow.cpp:146 src/gui/outfitwindow.cpp:60
+#: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60
#: src/gui/popupmenu.cpp:549
msgid "Outfits"
msgstr "Roupas"
-#: src/gui/inventorywindow.cpp:149
+#: src/gui/inventorywindow.cpp:178
msgid "Weight:"
msgstr "Peso:"
-#: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:611
-#: src/gui/popupmenu.cpp:1674 src/gui/popupmenu.cpp:1811
-#: src/gui/popupmenu.cpp:1854 src/gui/setup.cpp:73
+#: src/gui/inventorywindow.cpp:204 src/gui/inventorywindow.cpp:637
+#: src/gui/popupmenu.cpp:1677 src/gui/popupmenu.cpp:1814
+#: src/gui/popupmenu.cpp:1857 src/gui/setup.cpp:73
msgid "Store"
msgstr "Armazenar"
-#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1718
+#: src/gui/inventorywindow.cpp:205 src/gui/popupmenu.cpp:1721
msgid "Retrieve"
msgstr "Retirar"
-#: src/gui/inventorywindow.cpp:622 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1847
+#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1710
+#: src/gui/popupmenu.cpp:1807 src/gui/popupmenu.cpp:1850
#: src/gui/windowmenu.cpp:97
msgid "Drop"
msgstr "Descartar"
@@ -1044,91 +1054,91 @@ msgstr "Peso: %s"
msgid "Kill stats"
msgstr "Estatísticas"
-#: src/gui/killstats.cpp:65
+#: src/gui/killstats.cpp:66
msgid "Reset stats"
msgstr "Resetar Status"
-#: src/gui/killstats.cpp:66
+#: src/gui/killstats.cpp:67
msgid "Reset timer"
msgstr "Resetar tempo"
-#: src/gui/killstats.cpp:70 src/gui/killstats.cpp:206
+#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:207
#, c-format
msgid "Level: %d at %f%%"
msgstr "Nível: %d em %f%%"
-#: src/gui/killstats.cpp:74 src/gui/killstats.cpp:211
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:212
#, c-format
msgid "Exp: %d/%d Left: %d"
msgstr "Exp: %d%d faltando: %d"
-#: src/gui/killstats.cpp:77 src/gui/killstats.cpp:217
-#: src/gui/killstats.cpp:226
+#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:218
+#: src/gui/killstats.cpp:227
#, c-format
msgid "1%% = %d exp, avg mob for 1%%: %s"
msgstr "1%% = %d exp, avg mob para 1%%: %s"
-#: src/gui/killstats.cpp:80 src/gui/killstats.cpp:143
-#: src/gui/killstats.cpp:235
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:236
#, c-format
msgid "Kills: %s, total exp: %s"
msgstr "Mortes: %s, total exp: %s"
-#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145
-#: src/gui/killstats.cpp:221 src/gui/killstats.cpp:231
+#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:146
+#: src/gui/killstats.cpp:222 src/gui/killstats.cpp:232
#, c-format
msgid "Avg Exp: %s, No. of avg mob to next level: %s"
msgstr "Avg Exp: %s, No de avg mob para o próximo nível: %s"
-#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:163
-#: src/gui/killstats.cpp:238
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:164
+#: src/gui/killstats.cpp:239
#, c-format
msgid "Kills/Min: %s, Exp/Min: %s"
msgstr "Mortes/Min: %s Exp/Min: %s"
-#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:90 src/gui/killstats.cpp:95
-#: src/gui/killstats.cpp:290 src/gui/killstats.cpp:306
-#: src/gui/killstats.cpp:324
+#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
+#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
+#: src/gui/killstats.cpp:325
#, c-format
msgid "Exp speed per %d min: %s"
msgid_plural "Exp speed per %d min: %s"
msgstr[0] "Velocidade de exp por %d min: %s"
msgstr[1] "Velocidade de exp por %d mins: %s"
-#: src/gui/killstats.cpp:88 src/gui/killstats.cpp:93 src/gui/killstats.cpp:98
+#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:94 src/gui/killstats.cpp:99
#, c-format
msgid "Time for next level per %d min: %s"
msgid_plural "Time for next level per %d min: %s"
msgstr[0] "Tempo para próximo nível por %d min: %s"
msgstr[1] "Tempo para próximo nível por %d mins: %s"
-#: src/gui/killstats.cpp:101 src/gui/killstats.cpp:242
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
msgid "Last kill exp:"
msgstr "Exp de última morte:"
-#: src/gui/killstats.cpp:103 src/gui/killstats.cpp:356
-#: src/gui/killstats.cpp:362 src/gui/killstats.cpp:368
-#: src/gui/killstats.cpp:373
+#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
+#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:374
msgid "Time before jacko spawn:"
msgstr "Tempo para próximo JackO:"
-#: src/gui/killstats.cpp:295 src/gui/killstats.cpp:302
-#: src/gui/killstats.cpp:312 src/gui/killstats.cpp:319
-#: src/gui/killstats.cpp:331 src/gui/killstats.cpp:338
+#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
+#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
+#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
#, c-format
msgid " Time for next level: %s"
msgstr "Tempo para próximo nível: %s"
-#: src/gui/killstats.cpp:362
+#: src/gui/killstats.cpp:363
#, c-format
msgid "%s %d?"
msgstr "%s %d?"
-#: src/gui/killstats.cpp:368
+#: src/gui/killstats.cpp:369
msgid "jacko spawning"
msgstr "JackOvai aparecer"
-#: src/guildmanager.cpp:464 src/net/ea/guildhandler.cpp:439
+#: src/guildmanager.cpp:484 src/net/ea/guildhandler.cpp:439
msgid "You have left the guild."
msgstr "Você saiu da Guilda."
@@ -1226,7 +1236,7 @@ msgid "Submit"
msgstr "Enviar"
#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:142
+#: src/gui/setup_other.cpp:151
msgid "NPC"
msgstr "NPC"
@@ -1314,7 +1324,7 @@ msgstr "Não ignorar"
#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:185
#: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:428
#: src/gui/popupmenu.cpp:677 src/gui/popupmenu.cpp:693
-#: src/playerrelations.cpp:400
+#: src/playerrelations.cpp:415
msgid "Completely ignore"
msgstr "Ignorar completamente"
@@ -1365,7 +1375,7 @@ msgid "Show Items"
msgstr "Mostar itens:"
#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:705
-#: src/gui/popupmenu.cpp:2020
+#: src/gui/popupmenu.cpp:2023
msgid "Undress"
msgstr "Deixar sem Roupas"
@@ -1413,8 +1423,8 @@ msgstr "Adicionar nome ao chat"
msgid "Pick up"
msgstr "Pegar"
-#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:1732
-#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1855
+#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:1735
+#: src/gui/popupmenu.cpp:1815 src/gui/popupmenu.cpp:1858
msgid "Add to chat"
msgstr "Nome no chat"
@@ -1426,8 +1436,8 @@ msgstr "Mapa Item"
msgid "Rename"
msgstr "Renomear"
-#: src/gui/popupmenu.cpp:532 src/gui/popupmenu.cpp:1973
-#: src/gui/popupmenu.cpp:1991 src/gui/popupmenu.cpp:1996
+#: src/gui/popupmenu.cpp:532 src/gui/popupmenu.cpp:1976
+#: src/gui/popupmenu.cpp:1994 src/gui/popupmenu.cpp:1999
msgid "Remove"
msgstr "A Remover"
@@ -1503,85 +1513,85 @@ msgstr "Comentário do jogador"
msgid "Comment: "
msgstr "Comentário:"
-#: src/gui/popupmenu.cpp:1657
+#: src/gui/popupmenu.cpp:1660
msgid "Add to trade"
msgstr "Add. na negociação"
-#: src/gui/popupmenu.cpp:1663
+#: src/gui/popupmenu.cpp:1666
msgid "Add to trade 10"
msgstr "Add. 10 na negociação"
-#: src/gui/popupmenu.cpp:1666
+#: src/gui/popupmenu.cpp:1669
msgid "Add to trade half"
msgstr "Add. metade na negociação"
-#: src/gui/popupmenu.cpp:1668
+#: src/gui/popupmenu.cpp:1671
msgid "Add to trade all"
msgstr "Add. todos na negociação"
-#: src/gui/popupmenu.cpp:1680
+#: src/gui/popupmenu.cpp:1683
msgid "Store 10"
msgstr "Guardar 10"
-#: src/gui/popupmenu.cpp:1683
+#: src/gui/popupmenu.cpp:1686
msgid "Store half"
msgstr "Guardar metade"
-#: src/gui/popupmenu.cpp:1685
+#: src/gui/popupmenu.cpp:1688
msgid "Store all"
msgstr "Guardar tudo"
-#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1800
-#: src/gui/popupmenu.cpp:1843
+#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1803
+#: src/gui/popupmenu.cpp:1846
msgid "Drop all"
msgstr "Descartar tudo"
-#: src/gui/popupmenu.cpp:1724
+#: src/gui/popupmenu.cpp:1727
msgid "Retrieve 10"
msgstr "Retirar 10"
-#: src/gui/popupmenu.cpp:1727
+#: src/gui/popupmenu.cpp:1730
msgid "Retrieve half"
msgstr "Retirar metade"
-#: src/gui/popupmenu.cpp:1729
+#: src/gui/popupmenu.cpp:1732
msgid "Retrieve all"
msgstr "Retirar tudo"
-#: src/gui/popupmenu.cpp:1760 src/gui/popupmenu.cpp:1816
+#: src/gui/popupmenu.cpp:1763 src/gui/popupmenu.cpp:1819
msgid "Load old item shortcuts"
msgstr "Carregar antigos atalhos de item"
-#: src/gui/popupmenu.cpp:1859
+#: src/gui/popupmenu.cpp:1862
msgid "Load old drop shortcuts"
msgstr "Carregar antigos atalhos de descarte"
-#: src/gui/popupmenu.cpp:1885 src/gui/popupmenu.cpp:1920
+#: src/gui/popupmenu.cpp:1888 src/gui/popupmenu.cpp:1923
msgid "Hide"
msgstr "Ocultar"
-#: src/gui/popupmenu.cpp:1891 src/gui/popupmenu.cpp:1926
+#: src/gui/popupmenu.cpp:1894 src/gui/popupmenu.cpp:1929
msgid "Show"
msgstr "Mostrar"
-#: src/gui/popupmenu.cpp:1933
+#: src/gui/popupmenu.cpp:1936
msgid "Reset yellow bar"
msgstr "Resetar barra amarela"
-#: src/gui/popupmenu.cpp:1935 src/gui/statuswindow.cpp:241
+#: src/gui/popupmenu.cpp:1938 src/gui/statuswindow.cpp:241
msgid "Copy to chat"
msgstr "Copiar para o chat"
-#: src/gui/popupmenu.cpp:1953 src/gui/socialwindow.cpp:958
+#: src/gui/popupmenu.cpp:1956 src/gui/socialwindow.cpp:958
#: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028
msgid "(default)"
msgstr "(padrão)"
-#: src/gui/popupmenu.cpp:1965 src/gui/popupmenu.cpp:1983
+#: src/gui/popupmenu.cpp:1968 src/gui/popupmenu.cpp:1986
msgid "Move up"
msgstr "Mover a cima"
-#: src/gui/popupmenu.cpp:1970 src/gui/popupmenu.cpp:1988
+#: src/gui/popupmenu.cpp:1973 src/gui/popupmenu.cpp:1991
msgid "Move down"
msgstr "Mover a baixo"
@@ -1828,7 +1838,7 @@ msgstr "Tempo"
msgid "Use local time"
msgstr "Usar hora local"
-#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:157
+#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:166
msgid "Other"
msgstr "Outro"
@@ -1991,115 +2001,127 @@ msgstr "Desenhar caminho"
msgid "Draw hotkeys on map"
msgstr "Desenhar atalhos no mapa"
-#: src/gui/setup_other.cpp:88
+#: src/gui/setup_other.cpp:87
+msgid "Enable lazy scrolling"
+msgstr ""
+
+#: src/gui/setup_other.cpp:90
+msgid "Scroll laziness"
+msgstr ""
+
+#: src/gui/setup_other.cpp:93
+msgid "Scroll radius"
+msgstr ""
+
+#: src/gui/setup_other.cpp:97
msgid "Moving"
msgstr "Movendo"
-#: src/gui/setup_other.cpp:90
+#: src/gui/setup_other.cpp:99
msgid "Auto fix position"
msgstr "Auto-ajustar posição"
-#: src/gui/setup_other.cpp:93
+#: src/gui/setup_other.cpp:102
msgid "Attack while moving"
msgstr "Atacar enquanto se move"
-#: src/gui/setup_other.cpp:96
+#: src/gui/setup_other.cpp:105
msgid "Sync player move"
msgstr "Sincronizar movimento"
-#: src/gui/setup_other.cpp:99
+#: src/gui/setup_other.cpp:108
msgid "Crazy move A program"
msgstr "Movimentos loucos"
-#: src/gui/setup_other.cpp:103
+#: src/gui/setup_other.cpp:112
msgid "Player"
msgstr "Jogador"
-#: src/gui/setup_other.cpp:105
+#: src/gui/setup_other.cpp:114
msgid "Show own hp bar"
msgstr "Mostrar minha barra de hp"
-#: src/gui/setup_other.cpp:108
+#: src/gui/setup_other.cpp:117
msgid "Enable quick stats"
msgstr "Habilitar stats rápidos"
-#: src/gui/setup_other.cpp:111
+#: src/gui/setup_other.cpp:120
msgid "Cycle player targets"
msgstr "Alvo de jogadores em ciclo"
-#: src/gui/setup_other.cpp:114
+#: src/gui/setup_other.cpp:123
msgid "Show job exp messages"
msgstr "Mostrar menssagens de job exp"
-#: src/gui/setup_other.cpp:117
+#: src/gui/setup_other.cpp:126
msgid "Show players popups"
msgstr "Mostrar popups de jogadores"
-#: src/gui/setup_other.cpp:120
+#: src/gui/setup_other.cpp:129
msgid "Afk message"
msgstr "Mensagem Ausente"
-#: src/gui/setup_other.cpp:123
+#: src/gui/setup_other.cpp:132
msgid "Show job"
msgstr "Mostrar job"
-#: src/gui/setup_other.cpp:126
+#: src/gui/setup_other.cpp:135
msgid "Enable attack filter"
msgstr "A habilitar filtro de ataque"
-#: src/gui/setup_other.cpp:129
+#: src/gui/setup_other.cpp:138
msgid "Enable advert protocol"
msgstr "Habilitar protocolo de aviso"
-#: src/gui/setup_other.cpp:135
+#: src/gui/setup_other.cpp:144
msgid "Accept sell/buy requests"
msgstr "Aceitar convites de compra/venda"
-#: src/gui/setup_other.cpp:138
+#: src/gui/setup_other.cpp:147
msgid "Enable shop mode"
msgstr "Habilitar modo loja"
-#: src/gui/setup_other.cpp:144
+#: src/gui/setup_other.cpp:153
msgid "Log NPC dialogue"
msgstr "Salvar diálogos com NPC"
-#: src/gui/setup_other.cpp:148
+#: src/gui/setup_other.cpp:157
msgid "Bots support"
msgstr "Suporte de bots"
-#: src/gui/setup_other.cpp:150
+#: src/gui/setup_other.cpp:159
msgid "Enable auction bot support"
msgstr "Habilitar suporte há bot de leilão"
-#: src/gui/setup_other.cpp:153
+#: src/gui/setup_other.cpp:162
msgid "Enable guild bot support and disable native guild support"
msgstr "Ativar o suporte a bot guilda e desabilitar o suporte nativo guilda"
-#: src/gui/setup_other.cpp:159
+#: src/gui/setup_other.cpp:168
msgid "Enable server side attack"
msgstr "Habilitar ataque do lado do servidor"
-#: src/gui/setup_other.cpp:162
+#: src/gui/setup_other.cpp:171
msgid "Enable bot checker"
msgstr "Habilitar Analisador de bot"
-#: src/gui/setup_other.cpp:165
+#: src/gui/setup_other.cpp:174
msgid "Enable buggy servers protection"
msgstr "Habilitar proteção contra servidores com bugs"
-#: src/gui/setup_other.cpp:168
+#: src/gui/setup_other.cpp:177
msgid "Enable debug log"
msgstr "Habilitar Depurador"
-#: src/gui/setup_other.cpp:171
+#: src/gui/setup_other.cpp:180
msgid "Low traffic mode"
msgstr "Modo de baixo tráfego"
-#: src/gui/setup_other.cpp:174
+#: src/gui/setup_other.cpp:183
msgid "Hide shield sprite"
msgstr "Ocultar sprite de escudo"
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:186
msgid "Show background"
msgstr "Mostrar imagem de fundo"
@@ -2116,29 +2138,29 @@ msgid "Auto adjust perfomance"
msgstr "Auto ajuste de performance"
#: src/gui/setup_perfomance.cpp:61
-msgid "Show beings transparency"
-msgstr "Mostrar transparencia "
-
-#: src/gui/setup_perfomance.cpp:64
msgid "Hw acceleration"
msgstr "Aceleração por HW"
-#: src/gui/setup_perfomance.cpp:67
+#: src/gui/setup_perfomance.cpp:64
msgid "Enable opacity cache (Software, can use many memory)"
msgstr "Habilitar cache de opacidade (Software, pode usar muita memória)"
-#: src/gui/setup_perfomance.cpp:70
+#: src/gui/setup_perfomance.cpp:67
msgid "Enable map reduce (Software)"
msgstr "Habilitar redução de mapa (Software)"
-#: src/gui/setup_perfomance.cpp:73
+#: src/gui/setup_perfomance.cpp:70
msgid "Better quality (disable for better perfomance)"
msgstr "Melhor qualidade (Desative para melhor performace)"
-#: src/gui/setup_perfomance.cpp:76
+#: src/gui/setup_perfomance.cpp:73
msgid "Enable alpha channel fix (Software, can be very slow)"
msgstr "Habilitar correção de canal alpha (Software, pode ficar muito lento)"
+#: src/gui/setup_perfomance.cpp:77
+msgid "Show beings transparency"
+msgstr "Mostrar transparencia "
+
#: src/gui/setup_perfomance.cpp:80
msgid "Enable reorder sprites."
msgstr "Habilitar reordenar sprites"
@@ -2391,7 +2413,7 @@ msgid "FPS limit:"
msgstr "Limite FPS:"
#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
-#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709
+#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:710
msgid "Alt FPS limit: "
msgstr "Limite FPS alt: "
@@ -2417,7 +2439,7 @@ msgstr "Detalhe de partículas"
#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
-#: src/gui/setup_video.cpp:707
+#: src/gui/setup_video.cpp:708
msgid "None"
msgstr "Nenhum"
@@ -2527,22 +2549,22 @@ msgstr "+"
msgid "Skill points available: %d"
msgstr "Pontos de habilidade disponíveis: %d"
-#: src/gui/skilldialog.cpp:418
+#: src/gui/skilldialog.cpp:420
#, c-format
msgid "Skill Set %d"
msgstr "Habilidade %d"
-#: src/gui/skilldialog.cpp:430
+#: src/gui/skilldialog.cpp:432
#, c-format
msgid "Skill %d"
msgstr "Habilidade %d"
-#: src/gui/skilldialog.cpp:497 src/gui/skilldialog.cpp:550
+#: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554
#, c-format
msgid "Lvl: %d"
msgstr "Nível: %d"
-#: src/gui/skilldialog.cpp:542
+#: src/gui/skilldialog.cpp:546
#, c-format
msgid "Lvl: %d (%+d)"
msgstr "Nível: %d (%+d)"
@@ -3466,23 +3488,23 @@ msgstr "Borda do Lugar Inicial"
msgid "Road Point"
msgstr "Ponto de estrada"
-#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:472
+#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:474
msgid "Who Is Online - Updating"
msgstr "Quem está online - Atualizando"
-#: src/gui/whoisonline.cpp:102
+#: src/gui/whoisonline.cpp:104
msgid "Update"
msgstr "Atualizar"
-#: src/gui/whoisonline.cpp:295
+#: src/gui/whoisonline.cpp:297
msgid "Who Is Online - "
msgstr "Quem está online - "
-#: src/gui/whoisonline.cpp:486
+#: src/gui/whoisonline.cpp:488
msgid "Who Is Online - error"
msgstr "Quem está online - Erro"
-#: src/gui/whoisonline.cpp:517
+#: src/gui/whoisonline.cpp:519
msgid "Who Is Online - Update"
msgstr "Quem está online - Atualizado"
@@ -4154,68 +4176,68 @@ msgstr ""
"Conflito com as teclas \"%s\" e \"%s\" . Resolva o conflito para não "
"comprometer a jogabilidade."
-#: src/localplayer.cpp:370
+#: src/localplayer.cpp:372
msgid "You were killed by "
msgstr "Você foi morto por "
-#: src/localplayer.cpp:1401
+#: src/localplayer.cpp:1413
msgid "Tried to pick up nonexistent item."
msgstr "Você tentou pegar um item não existente."
-#: src/localplayer.cpp:1403
+#: src/localplayer.cpp:1415
msgid "Item is too heavy."
msgstr "Este item é muito pesado."
-#: src/localplayer.cpp:1405
+#: src/localplayer.cpp:1417
msgid "Item is too far away."
msgstr "Item está muito longe"
-#: src/localplayer.cpp:1407
+#: src/localplayer.cpp:1419
msgid "Inventory is full."
msgstr "O inventário está cheio."
-#: src/localplayer.cpp:1409
+#: src/localplayer.cpp:1421
msgid "Stack is too big."
msgstr "Esta pilha é muito grande."
-#: src/localplayer.cpp:1412
+#: src/localplayer.cpp:1424
msgid "Item belongs to someone else."
msgstr "Este item pertence a outra pessoa."
-#: src/localplayer.cpp:1415
+#: src/localplayer.cpp:1427
msgid "Unknown problem picking up item."
msgstr "Problema desconhecido ao tentar pegar item."
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1439
+#: src/localplayer.cpp:1451
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
msgstr[0] "Você pegou %d [@@%d|%s@@]."
msgstr[1] "Você pegou %d [@@%d|%s@@]."
-#: src/localplayer.cpp:3173
+#: src/localplayer.cpp:3187
msgid "Away"
msgstr "Indisponivel "
-#: src/localplayer.cpp:3474
+#: src/localplayer.cpp:3488
msgid "Follow: "
msgstr "Seguindo:"
-#: src/localplayer.cpp:3476 src/localplayer.cpp:3491
+#: src/localplayer.cpp:3490 src/localplayer.cpp:3505
msgid "Follow canceled"
msgstr "Seguir cancelado"
-#: src/localplayer.cpp:3483
+#: src/localplayer.cpp:3497
msgid "Imitation: "
msgstr "Imitando:"
-#: src/localplayer.cpp:3485 src/localplayer.cpp:3493
+#: src/localplayer.cpp:3499 src/localplayer.cpp:3507
msgid "Imitation canceled"
msgstr "Imitação cancelada"
-#: src/localplayer.cpp:3845
+#: src/localplayer.cpp:3859
msgid "You see "
msgstr "Você vê "
@@ -4420,16 +4442,16 @@ msgstr "Jogador VIP."
msgid "MVP player: "
msgstr "Jogador VIP: "
-#: src/net/ea/gamehandler.cpp:86
+#: src/net/ea/gamehandler.cpp:87
#, c-format
msgid "Online users: %d"
msgstr "Jogadores online: %d"
-#: src/net/ea/gamehandler.cpp:98
+#: src/net/ea/gamehandler.cpp:99
msgid "Game"
msgstr "Jogo"
-#: src/net/ea/gamehandler.cpp:98
+#: src/net/ea/gamehandler.cpp:99
msgid "Request to quit denied!"
msgstr "Requisição de saída negada!"
@@ -5491,19 +5513,19 @@ msgstr "Conexão com o servidor interrompida. "
msgid "%s is not in your party!"
msgstr "%s não está em seu grupo!"
-#: src/playerrelations.cpp:414
+#: src/playerrelations.cpp:429
msgid "Print '...'"
msgstr "Imprimir '...'"
-#: src/playerrelations.cpp:434
+#: src/playerrelations.cpp:449
msgid "Blink name"
msgstr "Piscar nome"
-#: src/playerrelations.cpp:478
+#: src/playerrelations.cpp:493
msgid "Floating '...' bubble"
msgstr "Bolha '...' flutuante"
-#: src/playerrelations.cpp:481
+#: src/playerrelations.cpp:496
msgid "Floating bubble"
msgstr "Bolha Flutuante"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index b27a872a4..ca955b19b 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -2,18 +2,19 @@
# Copyright (C) YEAR The ManaPlus Developers
# This file is distributed under the same license as the PACKAGE package.
#
+# Translators:
# <alasmirt@gmail.com>, 2011.
# alastrim <alasmirt@gmail.com>, 2011.
+# Andrei Karas <akaras@inbox.ru>, 2011.
# <freya.df@gmail.com>, 2011.
# freya <freya.df@gmail.com>, 2011.
-# Andrei Karas <akaras@inbox.ru>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-09-02 18:27+0300\n"
-"PO-Revision-Date: 2011-09-02 19:00+0000\n"
-"Last-Translator: freya <freya.df@gmail.com>\n"
+"POT-Creation-Date: 2011-09-10 01:34+0300\n"
+"PO-Revision-Date: 2011-09-09 22:37+0000\n"
+"Last-Translator: akaras <akaras@inbox.ru>\n"
"Language-Team: Portuguese (Brazilian) (http://www.transifex.net/projects/p/"
"manaplus/team/pt_BR/)\n"
"Language: pt_BR\n"
@@ -22,25 +23,25 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1)\n"
-#: src/actorspritemanager.cpp:1034
+#: src/actorspritemanager.cpp:1046
msgid "Visible on map"
msgstr "Mapa visivel "
-#: src/being.cpp:549
+#: src/being.cpp:551
msgid "dodge"
msgstr "desviou"
-#: src/being.cpp:549
+#: src/being.cpp:551
msgid "miss"
msgstr "errou"
#. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1529
+#: src/being.cpp:1532
msgid "A"
msgstr "A"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1534
+#: src/being.cpp:1537
msgid "I"
msgstr "I"
@@ -110,22 +111,22 @@ msgstr "Registro cancelado com sucesso"
msgid "Farewell, come back any time..."
msgstr "Tchau, volte sempre..."
-#: src/client.cpp:1428 src/client.cpp:1458 src/client.cpp:1502
-#: src/client.cpp:1927 src/client.cpp:1934
+#: src/client.cpp:1428 src/client.cpp:1458 src/client.cpp:1504
+#: src/client.cpp:1929 src/client.cpp:1936
#, 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:1633
+#: src/client.cpp:1635
#, c-format
msgid "Invalid update host: %s"
msgstr "Host de atualização inválido: %s"
-#: src/client.cpp:1667 src/client.cpp:1673
+#: src/client.cpp:1669 src/client.cpp:1675
msgid "Error creating updates directory!"
msgstr "Erro ao criar pasta de atualizações!"
-#: src/client.cpp:1694
+#: src/client.cpp:1696
#, 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."
@@ -326,19 +327,19 @@ msgstr "A conexão com o servidor caiu."
msgid "Network Error"
msgstr "Erro de conexão"
-#: src/game.cpp:1236
+#: src/game.cpp:1243
msgid "Ignoring incoming trade requests"
msgstr "Ignorando propostas de negócios"
-#: src/game.cpp:1243
+#: src/game.cpp:1250
msgid "Accepting incoming trade requests"
msgstr "Aceitando propostas de negócios"
-#: src/game.cpp:1629
+#: src/game.cpp:1636
msgid "Could Not Load Map"
msgstr "Não foi possível carregar o mapa"
-#: src/game.cpp:1630
+#: src/game.cpp:1637
#, c-format
msgid "Error while loading %s"
msgstr "Erro ao carregar %s"
@@ -367,31 +368,31 @@ msgstr "Comentário: %s"
msgid "Bot Checker"
msgstr "Analizador de bot"
-#: src/gui/botcheckerwindow.cpp:295 src/gui/setup_relations.cpp:64
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
msgid "Name"
msgstr "Nome"
-#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:133
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:133
#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:646
#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:265
msgid "Attack"
msgstr "Atacar"
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:297
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297
#: src/keyboardconfig.cpp:62
msgid "Talk"
msgstr "Falar"
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:263
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:263
#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:703
msgid "Move"
msgstr "Mover"
-#: src/gui/botcheckerwindow.cpp:299
+#: src/gui/botcheckerwindow.cpp:300
msgid "Result"
msgstr "Resultado"
-#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:124
+#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:124
msgid "Reset"
msgstr "Resetar"
@@ -437,7 +438,7 @@ msgid "Max"
msgstr "Máximo"
#: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:147 src/gui/setup_other.cpp:133
+#: src/gui/inventorywindow.cpp:176 src/gui/setup_other.cpp:142
msgid "Shop"
msgstr "Loja"
@@ -456,10 +457,10 @@ msgstr "Vender"
#: src/gui/popupmenu.cpp:516 src/gui/popupmenu.cpp:540
#: src/gui/popupmenu.cpp:554 src/gui/popupmenu.cpp:573
#: src/gui/popupmenu.cpp:790 src/gui/popupmenu.cpp:814
-#: src/gui/popupmenu.cpp:1734 src/gui/popupmenu.cpp:1762
-#: src/gui/popupmenu.cpp:1818 src/gui/popupmenu.cpp:1861
-#: src/gui/popupmenu.cpp:1896 src/gui/popupmenu.cpp:1936
-#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2023
+#: src/gui/popupmenu.cpp:1737 src/gui/popupmenu.cpp:1765
+#: src/gui/popupmenu.cpp:1821 src/gui/popupmenu.cpp:1864
+#: src/gui/popupmenu.cpp:1899 src/gui/popupmenu.cpp:1939
+#: src/gui/popupmenu.cpp:2006 src/gui/popupmenu.cpp:2026
#: src/gui/quitdialog.cpp:54 src/gui/register.cpp:82 src/gui/setup.cpp:72
#: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:238
#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
@@ -561,7 +562,7 @@ msgstr "Estilo do Cabelo:"
msgid "Race:"
msgstr "Corrida:"
-#: src/gui/charcreatedialog.cpp:95 src/gui/charselectdialog.cpp:478
+#: src/gui/charcreatedialog.cpp:95 src/gui/charselectdialog.cpp:480
#: src/gui/socialwindow.cpp:1139
msgid "Create"
msgstr "Criar"
@@ -629,26 +630,26 @@ msgstr "Entre com a senha para apagar o personagem"
msgid "Enter password:"
msgstr "Entre com a senha:"
-#: src/gui/charselectdialog.cpp:408 src/gui/serverdialog.cpp:298
+#: src/gui/charselectdialog.cpp:410 src/gui/serverdialog.cpp:298
#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:122
#: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:241
msgid "Delete"
msgstr "Excluir"
-#: src/gui/charselectdialog.cpp:466
+#: src/gui/charselectdialog.cpp:468
msgid "Choose"
msgstr "Escolher"
-#: src/gui/charselectdialog.cpp:469
+#: src/gui/charselectdialog.cpp:471
#, c-format
msgid "Level %d"
msgstr "Nível %d"
-#: src/gui/charselectdialog.cpp:480 src/gui/charselectdialog.cpp:481
+#: src/gui/charselectdialog.cpp:482 src/gui/charselectdialog.cpp:483
msgid "(empty)"
msgstr "(vazio)"
-#: src/gui/chatwindow.cpp:112
+#: src/gui/chatwindow.cpp:112 src/gui/inventorywindow.cpp:70
msgid "default"
msgstr "padrão"
@@ -704,11 +705,12 @@ msgstr "arco-íris 2"
msgid "rainbow 3"
msgstr "arco-íris 3"
-#: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
-#: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
-#: src/gui/setup_theme.cpp:73 src/gui/setup_theme.cpp:127
-#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
-#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
+#: src/gui/chatwindow.cpp:142 src/gui/inventorywindow.cpp:90
+#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78
+#: src/gui/setup_relations.cpp:220 src/gui/setup_theme.cpp:73
+#: src/gui/setup_theme.cpp:127 src/gui/setup_video.cpp:211
+#: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141
+#: src/gui/textcommandeditor.cpp:160
msgid "???"
msgstr "???"
@@ -741,7 +743,7 @@ msgstr "Não"
msgid "Ignore"
msgstr "Ignora"
-#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:97
+#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:99
#: src/gui/setup_other.cpp:64
msgid "Map"
msgstr "Mapa"
@@ -882,7 +884,7 @@ msgid "Did You Know?"
msgstr "Você Sabia?"
#: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
-#: src/gui/inventorywindow.cpp:176 src/gui/npcdialog.cpp:53
+#: src/gui/inventorywindow.cpp:206 src/gui/npcdialog.cpp:53
#: src/gui/popupmenu.cpp:588 src/gui/shopwindow.cpp:113
msgid "Close"
msgstr "Fechar"
@@ -908,10 +910,10 @@ msgstr "OK"
msgid "Equipment"
msgstr "Equipamento"
-#: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:131
-#: src/gui/inventorywindow.cpp:512 src/gui/inventorywindow.cpp:521
-#: src/gui/popupmenu.cpp:1693 src/gui/popupmenu.cpp:1788
-#: src/gui/popupmenu.cpp:1833
+#: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160
+#: src/gui/inventorywindow.cpp:539 src/gui/inventorywindow.cpp:548
+#: src/gui/popupmenu.cpp:1696 src/gui/popupmenu.cpp:1791
+#: src/gui/popupmenu.cpp:1836
msgid "Unequip"
msgstr "Desequipar"
@@ -919,80 +921,88 @@ msgstr "Desequipar"
msgid "Help"
msgstr "Ajuda"
-#: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76
+#: src/gui/inventorywindow.cpp:71
+msgid "by name"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:72
+msgid "by id"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:73
+msgid "by weight"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:74
+msgid "by amount"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:75
+msgid "by type"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:111 src/gui/windowmenu.cpp:76
#: src/inventory.cpp:249
msgid "Inventory"
msgstr "Inventário"
-#: src/gui/inventorywindow.cpp:105
+#: src/gui/inventorywindow.cpp:136
msgid "Slots:"
msgstr "Slots:"
-#: src/gui/inventorywindow.cpp:116
+#: src/gui/inventorywindow.cpp:148
msgid "Filter:"
msgstr "Filtro:"
-#: src/gui/inventorywindow.cpp:117
+#: src/gui/inventorywindow.cpp:149
msgid "Sort:"
msgstr "Classificar"
-#: src/gui/inventorywindow.cpp:123
-msgid "na"
-msgstr "na"
-
-#: src/gui/inventorywindow.cpp:124
-msgid "az"
-msgstr "az"
-
-#: src/gui/inventorywindow.cpp:125
-msgid "id"
-msgstr "id"
-
-#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
-#: src/gui/inventorywindow.cpp:523 src/gui/popupmenu.cpp:1695
-#: src/gui/popupmenu.cpp:1790 src/gui/popupmenu.cpp:1835
+#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:541
+#: src/gui/inventorywindow.cpp:550 src/gui/popupmenu.cpp:1698
+#: src/gui/popupmenu.cpp:1793 src/gui/popupmenu.cpp:1838
msgid "Equip"
msgstr "Equipar"
-#: src/gui/inventorywindow.cpp:130 src/gui/inventorywindow.cpp:515
-#: src/gui/inventorywindow.cpp:519 src/gui/popupmenu.cpp:1698
-#: src/gui/popupmenu.cpp:1757 src/gui/popupmenu.cpp:1794
-#: src/gui/popupmenu.cpp:1838
+#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:542
+#: src/gui/inventorywindow.cpp:546 src/gui/popupmenu.cpp:1701
+#: src/gui/popupmenu.cpp:1760 src/gui/popupmenu.cpp:1797
+#: src/gui/popupmenu.cpp:1841
msgid "Use"
msgstr "Usar"
-#: src/gui/inventorywindow.cpp:144 src/gui/inventorywindow.cpp:620
-#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1799
-#: src/gui/popupmenu.cpp:1842
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:646
+#: src/gui/popupmenu.cpp:1705 src/gui/popupmenu.cpp:1802
+#: src/gui/popupmenu.cpp:1845
msgid "Drop..."
msgstr "Descartar..."
-#: src/gui/inventorywindow.cpp:145 src/gui/popupmenu.cpp:1711
-#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1851
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1714
+#: src/gui/popupmenu.cpp:1811 src/gui/popupmenu.cpp:1854
msgid "Split"
msgstr "Dividir"
-#: src/gui/inventorywindow.cpp:146 src/gui/outfitwindow.cpp:60
+#: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60
#: src/gui/popupmenu.cpp:549
msgid "Outfits"
msgstr "Roupas"
-#: src/gui/inventorywindow.cpp:149
+#: src/gui/inventorywindow.cpp:178
msgid "Weight:"
msgstr "Peso:"
-#: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:611
-#: src/gui/popupmenu.cpp:1674 src/gui/popupmenu.cpp:1811
-#: src/gui/popupmenu.cpp:1854 src/gui/setup.cpp:73
+#: src/gui/inventorywindow.cpp:204 src/gui/inventorywindow.cpp:637
+#: src/gui/popupmenu.cpp:1677 src/gui/popupmenu.cpp:1814
+#: src/gui/popupmenu.cpp:1857 src/gui/setup.cpp:73
msgid "Store"
msgstr "Armazenar"
-#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1718
+#: src/gui/inventorywindow.cpp:205 src/gui/popupmenu.cpp:1721
msgid "Retrieve"
msgstr "Retirar"
-#: src/gui/inventorywindow.cpp:622 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1847
+#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1710
+#: src/gui/popupmenu.cpp:1807 src/gui/popupmenu.cpp:1850
#: src/gui/windowmenu.cpp:97
msgid "Drop"
msgstr "Descartar"
@@ -1046,91 +1056,91 @@ msgstr "Peso: %s"
msgid "Kill stats"
msgstr "Estatísticas"
-#: src/gui/killstats.cpp:65
+#: src/gui/killstats.cpp:66
msgid "Reset stats"
msgstr "Resetar Status"
-#: src/gui/killstats.cpp:66
+#: src/gui/killstats.cpp:67
msgid "Reset timer"
msgstr "Resetar tempo"
-#: src/gui/killstats.cpp:70 src/gui/killstats.cpp:206
+#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:207
#, c-format
msgid "Level: %d at %f%%"
msgstr "Nível: %d em %f%%"
-#: src/gui/killstats.cpp:74 src/gui/killstats.cpp:211
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:212
#, c-format
msgid "Exp: %d/%d Left: %d"
msgstr "Exp: %d%d Falta: %d"
-#: src/gui/killstats.cpp:77 src/gui/killstats.cpp:217
-#: src/gui/killstats.cpp:226
+#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:218
+#: src/gui/killstats.cpp:227
#, c-format
msgid "1%% = %d exp, avg mob for 1%%: %s"
msgstr "1%% = %d ex, avg mob por 1%%: %s"
-#: src/gui/killstats.cpp:80 src/gui/killstats.cpp:143
-#: src/gui/killstats.cpp:235
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:236
#, c-format
msgid "Kills: %s, total exp: %s"
msgstr "Mortes: %s Total exp: %s"
-#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145
-#: src/gui/killstats.cpp:221 src/gui/killstats.cpp:231
+#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:146
+#: src/gui/killstats.cpp:222 src/gui/killstats.cpp:232
#, c-format
msgid "Avg Exp: %s, No. of avg mob to next level: %s"
msgstr "Avg Exp: %s No. de avg mob para próximo nível: %s"
-#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:163
-#: src/gui/killstats.cpp:238
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:164
+#: src/gui/killstats.cpp:239
#, c-format
msgid "Kills/Min: %s, Exp/Min: %s"
msgstr "Mortes/Min: %s Exp/Min: %s"
-#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:90 src/gui/killstats.cpp:95
-#: src/gui/killstats.cpp:290 src/gui/killstats.cpp:306
-#: src/gui/killstats.cpp:324
+#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
+#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
+#: src/gui/killstats.cpp:325
#, c-format
msgid "Exp speed per %d min: %s"
msgid_plural "Exp speed per %d min: %s"
msgstr[0] "Velocidade de exp por %d min: %s"
msgstr[1] "Velocidade de exp por %d mins: %s"
-#: src/gui/killstats.cpp:88 src/gui/killstats.cpp:93 src/gui/killstats.cpp:98
+#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:94 src/gui/killstats.cpp:99
#, c-format
msgid "Time for next level per %d min: %s"
msgid_plural "Time for next level per %d min: %s"
msgstr[0] "Tempo para o próximo nível %d min: %s "
msgstr[1] "Tempo para o próximo nível %d mins: %s "
-#: src/gui/killstats.cpp:101 src/gui/killstats.cpp:242
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
msgid "Last kill exp:"
msgstr "Ultim exp por morte:"
-#: src/gui/killstats.cpp:103 src/gui/killstats.cpp:356
-#: src/gui/killstats.cpp:362 src/gui/killstats.cpp:368
-#: src/gui/killstats.cpp:373
+#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
+#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:374
msgid "Time before jacko spawn:"
msgstr "Tempo para próxima aparição do JackO:"
-#: src/gui/killstats.cpp:295 src/gui/killstats.cpp:302
-#: src/gui/killstats.cpp:312 src/gui/killstats.cpp:319
-#: src/gui/killstats.cpp:331 src/gui/killstats.cpp:338
+#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
+#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
+#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
#, c-format
msgid " Time for next level: %s"
msgstr "Tempo para próximo nível: %s"
-#: src/gui/killstats.cpp:362
+#: src/gui/killstats.cpp:363
#, c-format
msgid "%s %d?"
msgstr "%s %d?"
-#: src/gui/killstats.cpp:368
+#: src/gui/killstats.cpp:369
msgid "jacko spawning"
msgstr "Aparição do JackO"
-#: src/guildmanager.cpp:464 src/net/ea/guildhandler.cpp:439
+#: src/guildmanager.cpp:484 src/net/ea/guildhandler.cpp:439
msgid "You have left the guild."
msgstr "Você saiu da Guilda."
@@ -1228,7 +1238,7 @@ msgid "Submit"
msgstr "Enviar"
#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:142
+#: src/gui/setup_other.cpp:151
msgid "NPC"
msgstr "NPC"
@@ -1316,7 +1326,7 @@ msgstr "Não ignorar"
#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:185
#: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:428
#: src/gui/popupmenu.cpp:677 src/gui/popupmenu.cpp:693
-#: src/playerrelations.cpp:400
+#: src/playerrelations.cpp:415
msgid "Completely ignore"
msgstr "Ignorar completamente"
@@ -1367,7 +1377,7 @@ msgid "Show Items"
msgstr "Mostrar itens:"
#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:705
-#: src/gui/popupmenu.cpp:2020
+#: src/gui/popupmenu.cpp:2023
msgid "Undress"
msgstr "Despir"
@@ -1415,8 +1425,8 @@ msgstr "Adicionar nome ao chat"
msgid "Pick up"
msgstr "Pegar"
-#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:1732
-#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1855
+#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:1735
+#: src/gui/popupmenu.cpp:1815 src/gui/popupmenu.cpp:1858
msgid "Add to chat"
msgstr "Nome no chat"
@@ -1428,8 +1438,8 @@ msgstr "Mapa Item"
msgid "Rename"
msgstr "Renomear"
-#: src/gui/popupmenu.cpp:532 src/gui/popupmenu.cpp:1973
-#: src/gui/popupmenu.cpp:1991 src/gui/popupmenu.cpp:1996
+#: src/gui/popupmenu.cpp:532 src/gui/popupmenu.cpp:1976
+#: src/gui/popupmenu.cpp:1994 src/gui/popupmenu.cpp:1999
msgid "Remove"
msgstr "Remover"
@@ -1505,85 +1515,85 @@ msgstr "Comentário do jogador"
msgid "Comment: "
msgstr "Comentário:"
-#: src/gui/popupmenu.cpp:1657
+#: src/gui/popupmenu.cpp:1660
msgid "Add to trade"
msgstr "Add. na negociação"
-#: src/gui/popupmenu.cpp:1663
+#: src/gui/popupmenu.cpp:1666
msgid "Add to trade 10"
msgstr "Add. 10 na negociação"
-#: src/gui/popupmenu.cpp:1666
+#: src/gui/popupmenu.cpp:1669
msgid "Add to trade half"
msgstr "Add. metade na negociação"
-#: src/gui/popupmenu.cpp:1668
+#: src/gui/popupmenu.cpp:1671
msgid "Add to trade all"
msgstr "Add. todos na negociação"
-#: src/gui/popupmenu.cpp:1680
+#: src/gui/popupmenu.cpp:1683
msgid "Store 10"
msgstr "Guardar 10"
-#: src/gui/popupmenu.cpp:1683
+#: src/gui/popupmenu.cpp:1686
msgid "Store half"
msgstr "Guardar metade"
-#: src/gui/popupmenu.cpp:1685
+#: src/gui/popupmenu.cpp:1688
msgid "Store all"
msgstr "Guardar tudo"
-#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1800
-#: src/gui/popupmenu.cpp:1843
+#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1803
+#: src/gui/popupmenu.cpp:1846
msgid "Drop all"
msgstr "Descartar tudo"
-#: src/gui/popupmenu.cpp:1724
+#: src/gui/popupmenu.cpp:1727
msgid "Retrieve 10"
msgstr "Retirar 10"
-#: src/gui/popupmenu.cpp:1727
+#: src/gui/popupmenu.cpp:1730
msgid "Retrieve half"
msgstr "Retirar metade"
-#: src/gui/popupmenu.cpp:1729
+#: src/gui/popupmenu.cpp:1732
msgid "Retrieve all"
msgstr "Retirar tudo"
-#: src/gui/popupmenu.cpp:1760 src/gui/popupmenu.cpp:1816
+#: src/gui/popupmenu.cpp:1763 src/gui/popupmenu.cpp:1819
msgid "Load old item shortcuts"
msgstr "Carregar antigos atalhos de item"
-#: src/gui/popupmenu.cpp:1859
+#: src/gui/popupmenu.cpp:1862
msgid "Load old drop shortcuts"
msgstr "Carregar antigos atalhos de descarte"
-#: src/gui/popupmenu.cpp:1885 src/gui/popupmenu.cpp:1920
+#: src/gui/popupmenu.cpp:1888 src/gui/popupmenu.cpp:1923
msgid "Hide"
msgstr "Ocultar"
-#: src/gui/popupmenu.cpp:1891 src/gui/popupmenu.cpp:1926
+#: src/gui/popupmenu.cpp:1894 src/gui/popupmenu.cpp:1929
msgid "Show"
msgstr "Mostrar"
-#: src/gui/popupmenu.cpp:1933
+#: src/gui/popupmenu.cpp:1936
msgid "Reset yellow bar"
msgstr "Zerar barra amarela"
-#: src/gui/popupmenu.cpp:1935 src/gui/statuswindow.cpp:241
+#: src/gui/popupmenu.cpp:1938 src/gui/statuswindow.cpp:241
msgid "Copy to chat"
msgstr "Copiar para chat"
-#: src/gui/popupmenu.cpp:1953 src/gui/socialwindow.cpp:958
+#: src/gui/popupmenu.cpp:1956 src/gui/socialwindow.cpp:958
#: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028
msgid "(default)"
msgstr "(padrão)"
-#: src/gui/popupmenu.cpp:1965 src/gui/popupmenu.cpp:1983
+#: src/gui/popupmenu.cpp:1968 src/gui/popupmenu.cpp:1986
msgid "Move up"
msgstr "Mover para cima"
-#: src/gui/popupmenu.cpp:1970 src/gui/popupmenu.cpp:1988
+#: src/gui/popupmenu.cpp:1973 src/gui/popupmenu.cpp:1991
msgid "Move down"
msgstr "Mover para baixo"
@@ -1830,7 +1840,7 @@ msgstr "Tempo"
msgid "Use local time"
msgstr "Usar tempo local"
-#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:157
+#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:166
msgid "Other"
msgstr "Outro"
@@ -1993,115 +2003,127 @@ msgstr "Desenhar caminho"
msgid "Draw hotkeys on map"
msgstr "Desenhar atalhos no mapa"
-#: src/gui/setup_other.cpp:88
+#: src/gui/setup_other.cpp:87
+msgid "Enable lazy scrolling"
+msgstr ""
+
+#: src/gui/setup_other.cpp:90
+msgid "Scroll laziness"
+msgstr ""
+
+#: src/gui/setup_other.cpp:93
+msgid "Scroll radius"
+msgstr ""
+
+#: src/gui/setup_other.cpp:97
msgid "Moving"
msgstr "Movendo"
-#: src/gui/setup_other.cpp:90
+#: src/gui/setup_other.cpp:99
msgid "Auto fix position"
msgstr "Auto-ajustar posição"
-#: src/gui/setup_other.cpp:93
+#: src/gui/setup_other.cpp:102
msgid "Attack while moving"
msgstr "Atacar enquanto se move"
-#: src/gui/setup_other.cpp:96
+#: src/gui/setup_other.cpp:105
msgid "Sync player move"
msgstr "Sincronizar movimento"
-#: src/gui/setup_other.cpp:99
+#: src/gui/setup_other.cpp:108
msgid "Crazy move A program"
msgstr "Movimentos loucos"
-#: src/gui/setup_other.cpp:103
+#: src/gui/setup_other.cpp:112
msgid "Player"
msgstr "Jogador"
-#: src/gui/setup_other.cpp:105
+#: src/gui/setup_other.cpp:114
msgid "Show own hp bar"
msgstr "Mostrar minha barra de hp"
-#: src/gui/setup_other.cpp:108
+#: src/gui/setup_other.cpp:117
msgid "Enable quick stats"
msgstr "Habilitar stats rápidos"
-#: src/gui/setup_other.cpp:111
+#: src/gui/setup_other.cpp:120
msgid "Cycle player targets"
msgstr "Alvo de jogadores em ciclo"
-#: src/gui/setup_other.cpp:114
+#: src/gui/setup_other.cpp:123
msgid "Show job exp messages"
msgstr "Mostrar mensagens de job exp"
-#: src/gui/setup_other.cpp:117
+#: src/gui/setup_other.cpp:126
msgid "Show players popups"
msgstr "Mostrar popups de jogadores"
-#: src/gui/setup_other.cpp:120
+#: src/gui/setup_other.cpp:129
msgid "Afk message"
msgstr "Mensagem Ausente"
-#: src/gui/setup_other.cpp:123
+#: src/gui/setup_other.cpp:132
msgid "Show job"
msgstr "Mostrar job"
-#: src/gui/setup_other.cpp:126
+#: src/gui/setup_other.cpp:135
msgid "Enable attack filter"
msgstr "Habilitar filtro de ataque"
-#: src/gui/setup_other.cpp:129
+#: src/gui/setup_other.cpp:138
msgid "Enable advert protocol"
msgstr "Habilitar o protocolo de aviso"
-#: src/gui/setup_other.cpp:135
+#: src/gui/setup_other.cpp:144
msgid "Accept sell/buy requests"
msgstr "Aceitar convites de compra/venda"
-#: src/gui/setup_other.cpp:138
+#: src/gui/setup_other.cpp:147
msgid "Enable shop mode"
msgstr "Habilitar modo loja"
-#: src/gui/setup_other.cpp:144
+#: src/gui/setup_other.cpp:153
msgid "Log NPC dialogue"
msgstr "Salvar diálogos com NPC"
-#: src/gui/setup_other.cpp:148
+#: src/gui/setup_other.cpp:157
msgid "Bots support"
msgstr "Suporte de bots"
-#: src/gui/setup_other.cpp:150
+#: src/gui/setup_other.cpp:159
msgid "Enable auction bot support"
msgstr "Habilitar suporte ao bot de leilão"
-#: src/gui/setup_other.cpp:153
+#: src/gui/setup_other.cpp:162
msgid "Enable guild bot support and disable native guild support"
msgstr "Ativar o suporte a bot guilda e desabilitar o suporte nativo guilda"
-#: src/gui/setup_other.cpp:159
+#: src/gui/setup_other.cpp:168
msgid "Enable server side attack"
msgstr "Habilitar ataque do lado do servidor"
-#: src/gui/setup_other.cpp:162
+#: src/gui/setup_other.cpp:171
msgid "Enable bot checker"
msgstr "Habilitar Analisador de bot"
-#: src/gui/setup_other.cpp:165
+#: src/gui/setup_other.cpp:174
msgid "Enable buggy servers protection"
msgstr "Habilitar proteção contra servidores com bugs"
-#: src/gui/setup_other.cpp:168
+#: src/gui/setup_other.cpp:177
msgid "Enable debug log"
msgstr "Habilitar Depurador"
-#: src/gui/setup_other.cpp:171
+#: src/gui/setup_other.cpp:180
msgid "Low traffic mode"
msgstr "Modo de baixo tráfego"
-#: src/gui/setup_other.cpp:174
+#: src/gui/setup_other.cpp:183
msgid "Hide shield sprite"
msgstr "Ocultar sprite de escudo"
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:186
msgid "Show background"
msgstr "Mostrar imagem de fundo"
@@ -2118,29 +2140,29 @@ msgid "Auto adjust perfomance"
msgstr "Auto ajustar performance"
#: src/gui/setup_perfomance.cpp:61
-msgid "Show beings transparency"
-msgstr "Mostrar transparencia"
-
-#: src/gui/setup_perfomance.cpp:64
msgid "Hw acceleration"
msgstr "Aceleração por HW"
-#: src/gui/setup_perfomance.cpp:67
+#: src/gui/setup_perfomance.cpp:64
msgid "Enable opacity cache (Software, can use many memory)"
msgstr "Habilitar cache de opacidade (Software, pode se usar muita memória)"
-#: src/gui/setup_perfomance.cpp:70
+#: src/gui/setup_perfomance.cpp:67
msgid "Enable map reduce (Software)"
msgstr "Habilitar redução de mapa (Software)"
-#: src/gui/setup_perfomance.cpp:73
+#: src/gui/setup_perfomance.cpp:70
msgid "Better quality (disable for better perfomance)"
msgstr "Melhor qualidade (desabilita para melhor performance)"
-#: src/gui/setup_perfomance.cpp:76
+#: src/gui/setup_perfomance.cpp:73
msgid "Enable alpha channel fix (Software, can be very slow)"
msgstr "Habilitar ajuste de canal alpha (Software, pode ficar muito lento)"
+#: src/gui/setup_perfomance.cpp:77
+msgid "Show beings transparency"
+msgstr "Mostrar transparencia"
+
#: src/gui/setup_perfomance.cpp:80
msgid "Enable reorder sprites."
msgstr "Habilitar reordenar sprites."
@@ -2393,7 +2415,7 @@ msgid "FPS limit:"
msgstr "Limite FPS:"
#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
-#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709
+#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:710
msgid "Alt FPS limit: "
msgstr "Limite FPS alt: "
@@ -2419,7 +2441,7 @@ msgstr "Detalhe de partículas"
#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
-#: src/gui/setup_video.cpp:707
+#: src/gui/setup_video.cpp:708
msgid "None"
msgstr "Nenhum"
@@ -2529,22 +2551,22 @@ msgstr "+"
msgid "Skill points available: %d"
msgstr "Pontos de habilidade disponíveis: %d"
-#: src/gui/skilldialog.cpp:418
+#: src/gui/skilldialog.cpp:420
#, c-format
msgid "Skill Set %d"
msgstr "Habilidade %d"
-#: src/gui/skilldialog.cpp:430
+#: src/gui/skilldialog.cpp:432
#, c-format
msgid "Skill %d"
msgstr "Habilidade %d"
-#: src/gui/skilldialog.cpp:497 src/gui/skilldialog.cpp:550
+#: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554
#, c-format
msgid "Lvl: %d"
msgstr "Nível: %d"
-#: src/gui/skilldialog.cpp:542
+#: src/gui/skilldialog.cpp:546
#, c-format
msgid "Lvl: %d (%+d)"
msgstr "Nível: %d (%+d)"
@@ -3468,23 +3490,23 @@ msgstr "Borda do Lugar Inicial"
msgid "Road Point"
msgstr "Ponto de estrada"
-#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:472
+#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:474
msgid "Who Is Online - Updating"
msgstr "Quem está online - Atualizando"
-#: src/gui/whoisonline.cpp:102
+#: src/gui/whoisonline.cpp:104
msgid "Update"
msgstr "Atualizar"
-#: src/gui/whoisonline.cpp:295
+#: src/gui/whoisonline.cpp:297
msgid "Who Is Online - "
msgstr "Quem está online - "
-#: src/gui/whoisonline.cpp:486
+#: src/gui/whoisonline.cpp:488
msgid "Who Is Online - error"
msgstr "Quem está online - Erro"
-#: src/gui/whoisonline.cpp:517
+#: src/gui/whoisonline.cpp:519
msgid "Who Is Online - Update"
msgstr "Quem está online - Atualizado"
@@ -4156,68 +4178,68 @@ msgstr ""
"Conflito com as teclas \"%s\" e \"%s\" . Resolva o conflito para não "
"comprometer a jogabilidade."
-#: src/localplayer.cpp:370
+#: src/localplayer.cpp:372
msgid "You were killed by "
msgstr "Você foi morto por "
-#: src/localplayer.cpp:1401
+#: src/localplayer.cpp:1413
msgid "Tried to pick up nonexistent item."
msgstr "Você tentou pegar um item não existente."
-#: src/localplayer.cpp:1403
+#: src/localplayer.cpp:1415
msgid "Item is too heavy."
msgstr "Este item é muito pesado."
-#: src/localplayer.cpp:1405
+#: src/localplayer.cpp:1417
msgid "Item is too far away."
msgstr "Item está muito longe"
-#: src/localplayer.cpp:1407
+#: src/localplayer.cpp:1419
msgid "Inventory is full."
msgstr "O inventário está cheio."
-#: src/localplayer.cpp:1409
+#: src/localplayer.cpp:1421
msgid "Stack is too big."
msgstr "Esta pilha é muito grande."
-#: src/localplayer.cpp:1412
+#: src/localplayer.cpp:1424
msgid "Item belongs to someone else."
msgstr "Este item pertence a outra pessoa."
-#: src/localplayer.cpp:1415
+#: src/localplayer.cpp:1427
msgid "Unknown problem picking up item."
msgstr "Problema desconhecido ao tentar pegar item."
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1439
+#: src/localplayer.cpp:1451
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
msgstr[0] "Você pegou %d [@@%d|%s@@]."
msgstr[1] "Você pegou %d [@@%d|%s@@]."
-#: src/localplayer.cpp:3173
+#: src/localplayer.cpp:3187
msgid "Away"
msgstr "Indisponivel "
-#: src/localplayer.cpp:3474
+#: src/localplayer.cpp:3488
msgid "Follow: "
msgstr "Seguindo:"
-#: src/localplayer.cpp:3476 src/localplayer.cpp:3491
+#: src/localplayer.cpp:3490 src/localplayer.cpp:3505
msgid "Follow canceled"
msgstr "Seguindo cancelado"
-#: src/localplayer.cpp:3483
+#: src/localplayer.cpp:3497
msgid "Imitation: "
msgstr "Imitando:"
-#: src/localplayer.cpp:3485 src/localplayer.cpp:3493
+#: src/localplayer.cpp:3499 src/localplayer.cpp:3507
msgid "Imitation canceled"
msgstr "Imitação cancelada"
-#: src/localplayer.cpp:3845
+#: src/localplayer.cpp:3859
msgid "You see "
msgstr "Você vê "
@@ -4422,16 +4444,16 @@ msgstr "Jogador VIP."
msgid "MVP player: "
msgstr "Jogador VIP: "
-#: src/net/ea/gamehandler.cpp:86
+#: src/net/ea/gamehandler.cpp:87
#, c-format
msgid "Online users: %d"
msgstr "Jogadores online: %d"
-#: src/net/ea/gamehandler.cpp:98
+#: src/net/ea/gamehandler.cpp:99
msgid "Game"
msgstr "Jogo"
-#: src/net/ea/gamehandler.cpp:98
+#: src/net/ea/gamehandler.cpp:99
msgid "Request to quit denied!"
msgstr "Requisição de saída negada!"
@@ -5493,19 +5515,19 @@ msgstr "Conexão com o servidor interrompida. "
msgid "%s is not in your party!"
msgstr "%s não está em seu grupo!"
-#: src/playerrelations.cpp:414
+#: src/playerrelations.cpp:429
msgid "Print '...'"
msgstr "Imprimir '...'"
-#: src/playerrelations.cpp:434
+#: src/playerrelations.cpp:449
msgid "Blink name"
msgstr "Piscar nome"
-#: src/playerrelations.cpp:478
+#: src/playerrelations.cpp:493
msgid "Floating '...' bubble"
msgstr "Bolha '...' flutuante"
-#: src/playerrelations.cpp:481
+#: src/playerrelations.cpp:496
msgid "Floating bubble"
msgstr "Bolha Flutuante"
diff --git a/po/ru.po b/po/ru.po
index 6e2d28545..2db6bda60 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -2,16 +2,17 @@
# Copyright (C) YEAR The ManaPlus Developers
# This file is distributed under the same license as the PACKAGE package.
#
-# <reslayer@mail.ru>, 2011.
-# <Necromong@inbox.ru>, 2011.
-# Necromonger <Necromong@inbox.ru>, 2011.
+# Translators:
# Andrei Karas <akaras@inbox.ru>, 2011.
+# Necromonger <Necromong@inbox.ru>, 2011.
+# <Necromong@inbox.ru>, 2011.
+# <reslayer@mail.ru>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-09-02 18:27+0300\n"
-"PO-Revision-Date: 2011-09-02 15:34+0000\n"
+"POT-Creation-Date: 2011-09-10 01:34+0300\n"
+"PO-Revision-Date: 2011-09-09 22:39+0000\n"
"Last-Translator: akaras <akaras@inbox.ru>\n"
"Language-Team: Russian (http://www.transifex.net/projects/p/manaplus/team/"
"ru/)\n"
@@ -22,25 +23,25 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
-#: src/actorspritemanager.cpp:1034
+#: src/actorspritemanager.cpp:1046
msgid "Visible on map"
msgstr "Видимые на карте"
-#: src/being.cpp:549
+#: src/being.cpp:551
msgid "dodge"
msgstr "уворот"
-#: src/being.cpp:549
+#: src/being.cpp:551
msgid "miss"
msgstr "промах"
#. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1529
+#: src/being.cpp:1532
msgid "A"
msgstr "О"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1534
+#: src/being.cpp:1537
msgid "I"
msgstr "Б"
@@ -110,22 +111,22 @@ msgstr "Регистрация удалена"
msgid "Farewell, come back any time..."
msgstr "Хорошо, возвращайтесь в любое время..."
-#: src/client.cpp:1428 src/client.cpp:1458 src/client.cpp:1502
-#: src/client.cpp:1927 src/client.cpp:1934
+#: src/client.cpp:1428 src/client.cpp:1458 src/client.cpp:1504
+#: src/client.cpp:1929 src/client.cpp:1936
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr "%s не существует, и не может быть создано! Выход."
-#: src/client.cpp:1633
+#: src/client.cpp:1635
#, c-format
msgid "Invalid update host: %s"
msgstr "Некорректный сервер обновлений: %s"
-#: src/client.cpp:1667 src/client.cpp:1673
+#: src/client.cpp:1669 src/client.cpp:1675
msgid "Error creating updates directory!"
msgstr "Ошибка создания директории для обновлений!"
-#: src/client.cpp:1694
+#: src/client.cpp:1696
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr "Ошибка: %s не существует, и не может быть создан! Выход."
@@ -332,19 +333,19 @@ msgstr "Соединение с сервером потеряно."
msgid "Network Error"
msgstr "Ошибка сети"
-#: src/game.cpp:1236
+#: src/game.cpp:1243
msgid "Ignoring incoming trade requests"
msgstr "Игнорировать предложения о торговле"
-#: src/game.cpp:1243
+#: src/game.cpp:1250
msgid "Accepting incoming trade requests"
msgstr "Принимать предложения о торговле"
-#: src/game.cpp:1629
+#: src/game.cpp:1636
msgid "Could Not Load Map"
msgstr "Не удалось загрузить карту"
-#: src/game.cpp:1630
+#: src/game.cpp:1637
#, c-format
msgid "Error while loading %s"
msgstr "Ошибка во время загрузки %s"
@@ -373,31 +374,31 @@ msgstr "Комментарий: %s"
msgid "Bot Checker"
msgstr "Окно детектора ботов"
-#: src/gui/botcheckerwindow.cpp:295 src/gui/setup_relations.cpp:64
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
msgid "Name"
msgstr "Имя"
-#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:133
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:133
#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:646
#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:265
msgid "Attack"
msgstr "Атака"
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:297
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297
#: src/keyboardconfig.cpp:62
msgid "Talk"
msgstr "Разговор"
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:263
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:263
#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:703
msgid "Move"
msgstr "Движение"
-#: src/gui/botcheckerwindow.cpp:299
+#: src/gui/botcheckerwindow.cpp:300
msgid "Result"
msgstr "Результат"
-#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:124
+#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:124
msgid "Reset"
msgstr "Сбросить"
@@ -443,7 +444,7 @@ msgid "Max"
msgstr "Макс"
#: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:147 src/gui/setup_other.cpp:133
+#: src/gui/inventorywindow.cpp:176 src/gui/setup_other.cpp:142
msgid "Shop"
msgstr "Магазин"
@@ -462,10 +463,10 @@ msgstr "Продать"
#: src/gui/popupmenu.cpp:516 src/gui/popupmenu.cpp:540
#: src/gui/popupmenu.cpp:554 src/gui/popupmenu.cpp:573
#: src/gui/popupmenu.cpp:790 src/gui/popupmenu.cpp:814
-#: src/gui/popupmenu.cpp:1734 src/gui/popupmenu.cpp:1762
-#: src/gui/popupmenu.cpp:1818 src/gui/popupmenu.cpp:1861
-#: src/gui/popupmenu.cpp:1896 src/gui/popupmenu.cpp:1936
-#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2023
+#: src/gui/popupmenu.cpp:1737 src/gui/popupmenu.cpp:1765
+#: src/gui/popupmenu.cpp:1821 src/gui/popupmenu.cpp:1864
+#: src/gui/popupmenu.cpp:1899 src/gui/popupmenu.cpp:1939
+#: src/gui/popupmenu.cpp:2006 src/gui/popupmenu.cpp:2026
#: src/gui/quitdialog.cpp:54 src/gui/register.cpp:82 src/gui/setup.cpp:72
#: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:238
#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
@@ -567,7 +568,7 @@ msgstr "Стрижка:"
msgid "Race:"
msgstr "Раса:"
-#: src/gui/charcreatedialog.cpp:95 src/gui/charselectdialog.cpp:478
+#: src/gui/charcreatedialog.cpp:95 src/gui/charselectdialog.cpp:480
#: src/gui/socialwindow.cpp:1139
msgid "Create"
msgstr "Создать"
@@ -635,26 +636,26 @@ msgstr "Введите пароль для удаления персонажа"
msgid "Enter password:"
msgstr "Введите пароль:"
-#: src/gui/charselectdialog.cpp:408 src/gui/serverdialog.cpp:298
+#: src/gui/charselectdialog.cpp:410 src/gui/serverdialog.cpp:298
#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:122
#: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:241
msgid "Delete"
msgstr "Удалить"
-#: src/gui/charselectdialog.cpp:466
+#: src/gui/charselectdialog.cpp:468
msgid "Choose"
msgstr "Выбрать"
-#: src/gui/charselectdialog.cpp:469
+#: src/gui/charselectdialog.cpp:471
#, c-format
msgid "Level %d"
msgstr "Уровень: %d"
-#: src/gui/charselectdialog.cpp:480 src/gui/charselectdialog.cpp:481
+#: src/gui/charselectdialog.cpp:482 src/gui/charselectdialog.cpp:483
msgid "(empty)"
msgstr "(пусто)"
-#: src/gui/chatwindow.cpp:112
+#: src/gui/chatwindow.cpp:112 src/gui/inventorywindow.cpp:70
msgid "default"
msgstr "По умолчанию"
@@ -710,11 +711,12 @@ msgstr "радуга 2"
msgid "rainbow 3"
msgstr "радуга 3"
-#: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
-#: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
-#: src/gui/setup_theme.cpp:73 src/gui/setup_theme.cpp:127
-#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
-#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
+#: src/gui/chatwindow.cpp:142 src/gui/inventorywindow.cpp:90
+#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78
+#: src/gui/setup_relations.cpp:220 src/gui/setup_theme.cpp:73
+#: src/gui/setup_theme.cpp:127 src/gui/setup_video.cpp:211
+#: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141
+#: src/gui/textcommandeditor.cpp:160
msgid "???"
msgstr "???"
@@ -747,7 +749,7 @@ msgstr "Нет"
msgid "Ignore"
msgstr "Игнорировать"
-#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:97
+#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:99
#: src/gui/setup_other.cpp:64
msgid "Map"
msgstr "Карта"
@@ -888,7 +890,7 @@ msgid "Did You Know?"
msgstr "Вы знаете?"
#: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
-#: src/gui/inventorywindow.cpp:176 src/gui/npcdialog.cpp:53
+#: src/gui/inventorywindow.cpp:206 src/gui/npcdialog.cpp:53
#: src/gui/popupmenu.cpp:588 src/gui/shopwindow.cpp:113
msgid "Close"
msgstr "Закрыть"
@@ -914,10 +916,10 @@ msgstr "ОК"
msgid "Equipment"
msgstr "Снаряжение"
-#: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:131
-#: src/gui/inventorywindow.cpp:512 src/gui/inventorywindow.cpp:521
-#: src/gui/popupmenu.cpp:1693 src/gui/popupmenu.cpp:1788
-#: src/gui/popupmenu.cpp:1833
+#: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160
+#: src/gui/inventorywindow.cpp:539 src/gui/inventorywindow.cpp:548
+#: src/gui/popupmenu.cpp:1696 src/gui/popupmenu.cpp:1791
+#: src/gui/popupmenu.cpp:1836
msgid "Unequip"
msgstr "Снять"
@@ -925,80 +927,88 @@ msgstr "Снять"
msgid "Help"
msgstr "Помощь"
-#: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76
+#: src/gui/inventorywindow.cpp:71
+msgid "by name"
+msgstr "по названию"
+
+#: src/gui/inventorywindow.cpp:72
+msgid "by id"
+msgstr "по ид"
+
+#: src/gui/inventorywindow.cpp:73
+msgid "by weight"
+msgstr "по весу"
+
+#: src/gui/inventorywindow.cpp:74
+msgid "by amount"
+msgstr "по кол-ву."
+
+#: src/gui/inventorywindow.cpp:75
+msgid "by type"
+msgstr "по типу"
+
+#: src/gui/inventorywindow.cpp:111 src/gui/windowmenu.cpp:76
#: src/inventory.cpp:249
msgid "Inventory"
msgstr "Инвентарь"
-#: src/gui/inventorywindow.cpp:105
+#: src/gui/inventorywindow.cpp:136
msgid "Slots:"
msgstr "Вместимость:"
-#: src/gui/inventorywindow.cpp:116
+#: src/gui/inventorywindow.cpp:148
msgid "Filter:"
msgstr "Фильтр:"
-#: src/gui/inventorywindow.cpp:117
+#: src/gui/inventorywindow.cpp:149
msgid "Sort:"
msgstr "Сорт.:"
-#: src/gui/inventorywindow.cpp:123
-msgid "na"
-msgstr "нет"
-
-#: src/gui/inventorywindow.cpp:124
-msgid "az"
-msgstr "ая"
-
-#: src/gui/inventorywindow.cpp:125
-msgid "id"
-msgstr "ид"
-
-#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
-#: src/gui/inventorywindow.cpp:523 src/gui/popupmenu.cpp:1695
-#: src/gui/popupmenu.cpp:1790 src/gui/popupmenu.cpp:1835
+#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:541
+#: src/gui/inventorywindow.cpp:550 src/gui/popupmenu.cpp:1698
+#: src/gui/popupmenu.cpp:1793 src/gui/popupmenu.cpp:1838
msgid "Equip"
msgstr "Надеть"
-#: src/gui/inventorywindow.cpp:130 src/gui/inventorywindow.cpp:515
-#: src/gui/inventorywindow.cpp:519 src/gui/popupmenu.cpp:1698
-#: src/gui/popupmenu.cpp:1757 src/gui/popupmenu.cpp:1794
-#: src/gui/popupmenu.cpp:1838
+#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:542
+#: src/gui/inventorywindow.cpp:546 src/gui/popupmenu.cpp:1701
+#: src/gui/popupmenu.cpp:1760 src/gui/popupmenu.cpp:1797
+#: src/gui/popupmenu.cpp:1841
msgid "Use"
msgstr "Использовать"
-#: src/gui/inventorywindow.cpp:144 src/gui/inventorywindow.cpp:620
-#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1799
-#: src/gui/popupmenu.cpp:1842
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:646
+#: src/gui/popupmenu.cpp:1705 src/gui/popupmenu.cpp:1802
+#: src/gui/popupmenu.cpp:1845
msgid "Drop..."
msgstr "Бросить"
-#: src/gui/inventorywindow.cpp:145 src/gui/popupmenu.cpp:1711
-#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1851
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1714
+#: src/gui/popupmenu.cpp:1811 src/gui/popupmenu.cpp:1854
msgid "Split"
msgstr "Разделить"
-#: src/gui/inventorywindow.cpp:146 src/gui/outfitwindow.cpp:60
+#: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60
#: src/gui/popupmenu.cpp:549
msgid "Outfits"
msgstr "Наряды"
-#: src/gui/inventorywindow.cpp:149
+#: src/gui/inventorywindow.cpp:178
msgid "Weight:"
msgstr "Вес:"
-#: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:611
-#: src/gui/popupmenu.cpp:1674 src/gui/popupmenu.cpp:1811
-#: src/gui/popupmenu.cpp:1854 src/gui/setup.cpp:73
+#: src/gui/inventorywindow.cpp:204 src/gui/inventorywindow.cpp:637
+#: src/gui/popupmenu.cpp:1677 src/gui/popupmenu.cpp:1814
+#: src/gui/popupmenu.cpp:1857 src/gui/setup.cpp:73
msgid "Store"
msgstr "Сохранить"
-#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1718
+#: src/gui/inventorywindow.cpp:205 src/gui/popupmenu.cpp:1721
msgid "Retrieve"
msgstr "Получить"
-#: src/gui/inventorywindow.cpp:622 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1847
+#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1710
+#: src/gui/popupmenu.cpp:1807 src/gui/popupmenu.cpp:1850
#: src/gui/windowmenu.cpp:97
msgid "Drop"
msgstr "Бросить"
@@ -1052,51 +1062,51 @@ msgstr "Вес: %s"
msgid "Kill stats"
msgstr "Окно статистики атак"
-#: src/gui/killstats.cpp:65
+#: src/gui/killstats.cpp:66
msgid "Reset stats"
msgstr "Сбросить стат."
-#: src/gui/killstats.cpp:66
+#: src/gui/killstats.cpp:67
msgid "Reset timer"
msgstr "Сбросить таймер"
-#: src/gui/killstats.cpp:70 src/gui/killstats.cpp:206
+#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:207
#, c-format
msgid "Level: %d at %f%%"
msgstr "Уровень: %d на %f%%"
-#: src/gui/killstats.cpp:74 src/gui/killstats.cpp:211
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:212
#, c-format
msgid "Exp: %d/%d Left: %d"
msgstr "Опыт: %d/%d Осталось: %d"
-#: src/gui/killstats.cpp:77 src/gui/killstats.cpp:217
-#: src/gui/killstats.cpp:226
+#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:218
+#: src/gui/killstats.cpp:227
#, c-format
msgid "1%% = %d exp, avg mob for 1%%: %s"
msgstr "1%% = %d опыта, среднее кол-во мобов для 1%%: %s"
-#: src/gui/killstats.cpp:80 src/gui/killstats.cpp:143
-#: src/gui/killstats.cpp:235
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:236
#, c-format
msgid "Kills: %s, total exp: %s"
msgstr "Убийств: %s, опыта: %s"
-#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145
-#: src/gui/killstats.cpp:221 src/gui/killstats.cpp:231
+#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:146
+#: src/gui/killstats.cpp:222 src/gui/killstats.cpp:232
#, c-format
msgid "Avg Exp: %s, No. of avg mob to next level: %s"
msgstr "Средний опыт: %s, среднее кол-во мобов до след. уровня: %s"
-#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:163
-#: src/gui/killstats.cpp:238
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:164
+#: src/gui/killstats.cpp:239
#, c-format
msgid "Kills/Min: %s, Exp/Min: %s"
msgstr "Убийств в минуту: %s, Опыта в минуту: %s"
-#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:90 src/gui/killstats.cpp:95
-#: src/gui/killstats.cpp:290 src/gui/killstats.cpp:306
-#: src/gui/killstats.cpp:324
+#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
+#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
+#: src/gui/killstats.cpp:325
#, c-format
msgid "Exp speed per %d min: %s"
msgid_plural "Exp speed per %d min: %s"
@@ -1104,7 +1114,7 @@ msgstr[0] "Опыт за %d мин.: %s"
msgstr[1] "Опыт за %d мин.: %s"
msgstr[2] "Опыт за %d мин.: %s"
-#: src/gui/killstats.cpp:88 src/gui/killstats.cpp:93 src/gui/killstats.cpp:98
+#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:94 src/gui/killstats.cpp:99
#, c-format
msgid "Time for next level per %d min: %s"
msgid_plural "Time for next level per %d min: %s"
@@ -1112,33 +1122,33 @@ msgstr[0] "Время до следующего уровня в мин. %d: %s"
msgstr[1] "Время до следующего уровня в мин. %d: %s"
msgstr[2] "Время до следующего уровня в мин. %d: %s"
-#: src/gui/killstats.cpp:101 src/gui/killstats.cpp:242
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
msgid "Last kill exp:"
msgstr "Опыт за последнее убийство:"
-#: src/gui/killstats.cpp:103 src/gui/killstats.cpp:356
-#: src/gui/killstats.cpp:362 src/gui/killstats.cpp:368
-#: src/gui/killstats.cpp:373
+#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
+#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:374
msgid "Time before jacko spawn:"
msgstr "Время до появления jacko:"
-#: src/gui/killstats.cpp:295 src/gui/killstats.cpp:302
-#: src/gui/killstats.cpp:312 src/gui/killstats.cpp:319
-#: src/gui/killstats.cpp:331 src/gui/killstats.cpp:338
+#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
+#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
+#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
#, c-format
msgid " Time for next level: %s"
msgstr " Время до следующего уровня: %s"
-#: src/gui/killstats.cpp:362
+#: src/gui/killstats.cpp:363
#, c-format
msgid "%s %d?"
msgstr "%s %d?"
-#: src/gui/killstats.cpp:368
+#: src/gui/killstats.cpp:369
msgid "jacko spawning"
msgstr "jacko появляется"
-#: src/guildmanager.cpp:464 src/net/ea/guildhandler.cpp:439
+#: src/guildmanager.cpp:484 src/net/ea/guildhandler.cpp:439
msgid "You have left the guild."
msgstr "Вы покинули гильдию."
@@ -1236,7 +1246,7 @@ msgid "Submit"
msgstr "Применить"
#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:142
+#: src/gui/setup_other.cpp:151
msgid "NPC"
msgstr "NPC"
@@ -1324,7 +1334,7 @@ msgstr "Не игнорировать"
#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:185
#: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:428
#: src/gui/popupmenu.cpp:677 src/gui/popupmenu.cpp:693
-#: src/playerrelations.cpp:400
+#: src/playerrelations.cpp:415
msgid "Completely ignore"
msgstr "@@ignore|Полностью игнорировать@@"
@@ -1375,7 +1385,7 @@ msgid "Show Items"
msgstr "Показать предметы"
#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:705
-#: src/gui/popupmenu.cpp:2020
+#: src/gui/popupmenu.cpp:2023
msgid "Undress"
msgstr "Раздеть"
@@ -1423,8 +1433,8 @@ msgstr "Добавить имя в чат"
msgid "Pick up"
msgstr "Поднять"
-#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:1732
-#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1855
+#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:1735
+#: src/gui/popupmenu.cpp:1815 src/gui/popupmenu.cpp:1858
msgid "Add to chat"
msgstr "Добавить в чат"
@@ -1436,8 +1446,8 @@ msgstr "Элмент карты"
msgid "Rename"
msgstr "Переименовать"
-#: src/gui/popupmenu.cpp:532 src/gui/popupmenu.cpp:1973
-#: src/gui/popupmenu.cpp:1991 src/gui/popupmenu.cpp:1996
+#: src/gui/popupmenu.cpp:532 src/gui/popupmenu.cpp:1976
+#: src/gui/popupmenu.cpp:1994 src/gui/popupmenu.cpp:1999
msgid "Remove"
msgstr "Удалить"
@@ -1513,85 +1523,85 @@ msgstr "Комментарий "
msgid "Comment: "
msgstr "Комментарий: "
-#: src/gui/popupmenu.cpp:1657
+#: src/gui/popupmenu.cpp:1660
msgid "Add to trade"
msgstr "Добавить к сделке"
-#: src/gui/popupmenu.cpp:1663
+#: src/gui/popupmenu.cpp:1666
msgid "Add to trade 10"
msgstr "Добавить к сделке 10"
-#: src/gui/popupmenu.cpp:1666
+#: src/gui/popupmenu.cpp:1669
msgid "Add to trade half"
msgstr "Добавить к сделке половину"
-#: src/gui/popupmenu.cpp:1668
+#: src/gui/popupmenu.cpp:1671
msgid "Add to trade all"
msgstr "Добавить к торговле все"
-#: src/gui/popupmenu.cpp:1680
+#: src/gui/popupmenu.cpp:1683
msgid "Store 10"
msgstr "Сохранить 10"
-#: src/gui/popupmenu.cpp:1683
+#: src/gui/popupmenu.cpp:1686
msgid "Store half"
msgstr "Сохранить половину"
-#: src/gui/popupmenu.cpp:1685
+#: src/gui/popupmenu.cpp:1688
msgid "Store all"
msgstr "Сохранить все"
-#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1800
-#: src/gui/popupmenu.cpp:1843
+#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1803
+#: src/gui/popupmenu.cpp:1846
msgid "Drop all"
msgstr "Бросить все"
-#: src/gui/popupmenu.cpp:1724
+#: src/gui/popupmenu.cpp:1727
msgid "Retrieve 10"
msgstr "Получить 10"
-#: src/gui/popupmenu.cpp:1727
+#: src/gui/popupmenu.cpp:1730
msgid "Retrieve half"
msgstr "Получить половину"
-#: src/gui/popupmenu.cpp:1729
+#: src/gui/popupmenu.cpp:1732
msgid "Retrieve all"
msgstr "Получить все"
-#: src/gui/popupmenu.cpp:1760 src/gui/popupmenu.cpp:1816
+#: src/gui/popupmenu.cpp:1763 src/gui/popupmenu.cpp:1819
msgid "Load old item shortcuts"
msgstr "Загрузить старые горячие клавиши предметов"
-#: src/gui/popupmenu.cpp:1859
+#: src/gui/popupmenu.cpp:1862
msgid "Load old drop shortcuts"
msgstr "Загрузить старые данные"
-#: src/gui/popupmenu.cpp:1885 src/gui/popupmenu.cpp:1920
+#: src/gui/popupmenu.cpp:1888 src/gui/popupmenu.cpp:1923
msgid "Hide"
msgstr "Спрятать"
-#: src/gui/popupmenu.cpp:1891 src/gui/popupmenu.cpp:1926
+#: src/gui/popupmenu.cpp:1894 src/gui/popupmenu.cpp:1929
msgid "Show"
msgstr "Показать"
-#: src/gui/popupmenu.cpp:1933
+#: src/gui/popupmenu.cpp:1936
msgid "Reset yellow bar"
msgstr "сбросить настройки"
-#: src/gui/popupmenu.cpp:1935 src/gui/statuswindow.cpp:241
+#: src/gui/popupmenu.cpp:1938 src/gui/statuswindow.cpp:241
msgid "Copy to chat"
msgstr "Скопировать в чат"
-#: src/gui/popupmenu.cpp:1953 src/gui/socialwindow.cpp:958
+#: src/gui/popupmenu.cpp:1956 src/gui/socialwindow.cpp:958
#: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028
msgid "(default)"
msgstr "(по умолчанию)"
-#: src/gui/popupmenu.cpp:1965 src/gui/popupmenu.cpp:1983
+#: src/gui/popupmenu.cpp:1968 src/gui/popupmenu.cpp:1986
msgid "Move up"
msgstr "Передвинуть выше"
-#: src/gui/popupmenu.cpp:1970 src/gui/popupmenu.cpp:1988
+#: src/gui/popupmenu.cpp:1973 src/gui/popupmenu.cpp:1991
msgid "Move down"
msgstr "Передвинуть ниже"
@@ -1838,7 +1848,7 @@ msgstr "Время"
msgid "Use local time"
msgstr "Использовать местное время"
-#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:157
+#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:166
msgid "Other"
msgstr "Другое"
@@ -2001,115 +2011,127 @@ msgstr "Рисовать путь"
msgid "Draw hotkeys on map"
msgstr "Рисовать клавиши на карте"
-#: src/gui/setup_other.cpp:88
+#: src/gui/setup_other.cpp:87
+msgid "Enable lazy scrolling"
+msgstr "Включить ленивую прокрутку"
+
+#: src/gui/setup_other.cpp:90
+msgid "Scroll laziness"
+msgstr "ленивая прокрутка"
+
+#: src/gui/setup_other.cpp:93
+msgid "Scroll radius"
+msgstr "радиус прокрутки"
+
+#: src/gui/setup_other.cpp:97
msgid "Moving"
msgstr "Движения"
-#: src/gui/setup_other.cpp:90
+#: src/gui/setup_other.cpp:99
msgid "Auto fix position"
msgstr "Авто. исправ. позиции"
-#: src/gui/setup_other.cpp:93
+#: src/gui/setup_other.cpp:102
msgid "Attack while moving"
msgstr "Атаковать в движении"
-#: src/gui/setup_other.cpp:96
+#: src/gui/setup_other.cpp:105
msgid "Sync player move"
msgstr "Синх. движение"
-#: src/gui/setup_other.cpp:99
+#: src/gui/setup_other.cpp:108
msgid "Crazy move A program"
msgstr "Программа для сумасшедших движений A"
-#: src/gui/setup_other.cpp:103
+#: src/gui/setup_other.cpp:112
msgid "Player"
msgstr "Игрок"
-#: src/gui/setup_other.cpp:105
+#: src/gui/setup_other.cpp:114
msgid "Show own hp bar"
msgstr "Показывать свою жизнь"
-#: src/gui/setup_other.cpp:108
+#: src/gui/setup_other.cpp:117
msgid "Enable quick stats"
msgstr "Включить быструю смену статов"
-#: src/gui/setup_other.cpp:111
+#: src/gui/setup_other.cpp:120
msgid "Cycle player targets"
msgstr "Прокручивать прицел по игрокам"
-#: src/gui/setup_other.cpp:114
+#: src/gui/setup_other.cpp:123
msgid "Show job exp messages"
msgstr "Показывать опыт работы."
-#: src/gui/setup_other.cpp:117
+#: src/gui/setup_other.cpp:126
msgid "Show players popups"
msgstr "Показ. всплыв. сообщения игроков"
-#: src/gui/setup_other.cpp:120
+#: src/gui/setup_other.cpp:129
msgid "Afk message"
msgstr "Ответ в режиме \"отошел\""
-#: src/gui/setup_other.cpp:123
+#: src/gui/setup_other.cpp:132
msgid "Show job"
msgstr "Показывать уровень работы"
-#: src/gui/setup_other.cpp:126
+#: src/gui/setup_other.cpp:135
msgid "Enable attack filter"
msgstr "Включить фильтр атак"
-#: src/gui/setup_other.cpp:129
+#: src/gui/setup_other.cpp:138
msgid "Enable advert protocol"
msgstr "Включить режим посылки состояния"
-#: src/gui/setup_other.cpp:135
+#: src/gui/setup_other.cpp:144
msgid "Accept sell/buy requests"
msgstr "Принимать запросы купить/продать"
-#: src/gui/setup_other.cpp:138
+#: src/gui/setup_other.cpp:147
msgid "Enable shop mode"
msgstr "Включить режим магазина"
-#: src/gui/setup_other.cpp:144
+#: src/gui/setup_other.cpp:153
msgid "Log NPC dialogue"
msgstr "Сохранять текст NPC"
-#: src/gui/setup_other.cpp:148
+#: src/gui/setup_other.cpp:157
msgid "Bots support"
msgstr "Поддержка ботов"
-#: src/gui/setup_other.cpp:150
+#: src/gui/setup_other.cpp:159
msgid "Enable auction bot support"
msgstr "Включить поддержку бота аукционов"
-#: src/gui/setup_other.cpp:153
+#: src/gui/setup_other.cpp:162
msgid "Enable guild bot support and disable native guild support"
msgstr "Включить поддержку гильд-бота"
-#: src/gui/setup_other.cpp:159
+#: src/gui/setup_other.cpp:168
msgid "Enable server side attack"
msgstr "Включить серверную атаку"
-#: src/gui/setup_other.cpp:162
+#: src/gui/setup_other.cpp:171
msgid "Enable bot checker"
msgstr "Включить детектор ботов"
-#: src/gui/setup_other.cpp:165
+#: src/gui/setup_other.cpp:174
msgid "Enable buggy servers protection"
msgstr "Включить защиту от сбойных серверов"
-#: src/gui/setup_other.cpp:168
+#: src/gui/setup_other.cpp:177
msgid "Enable debug log"
msgstr "Включить отлад. лог"
-#: src/gui/setup_other.cpp:171
+#: src/gui/setup_other.cpp:180
msgid "Low traffic mode"
msgstr "Режим кеширования игроков"
-#: src/gui/setup_other.cpp:174
+#: src/gui/setup_other.cpp:183
msgid "Hide shield sprite"
msgstr "Спрятать картинку счита"
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:186
msgid "Show background"
msgstr "Показать фон"
@@ -2126,33 +2148,33 @@ msgid "Auto adjust perfomance"
msgstr "Автоматически подстраивать производительность"
#: src/gui/setup_perfomance.cpp:61
-msgid "Show beings transparency"
-msgstr "Отображать прозрачность на персонажах и монстрах"
-
-#: src/gui/setup_perfomance.cpp:64
msgid "Hw acceleration"
msgstr "Аппаратное ускорение"
-#: src/gui/setup_perfomance.cpp:67
+#: src/gui/setup_perfomance.cpp:64
msgid "Enable opacity cache (Software, can use many memory)"
msgstr ""
"Включить кеш прозрачности (программный режим, может использовать много "
"памяти)"
-#: src/gui/setup_perfomance.cpp:70
+#: src/gui/setup_perfomance.cpp:67
msgid "Enable map reduce (Software)"
msgstr "Включить оптимизацию карты (программный режим)"
-#: src/gui/setup_perfomance.cpp:73
+#: src/gui/setup_perfomance.cpp:70
msgid "Better quality (disable for better perfomance)"
msgstr "Улучшение качества (выключите для лучшей производительности)"
-#: src/gui/setup_perfomance.cpp:76
+#: src/gui/setup_perfomance.cpp:73
msgid "Enable alpha channel fix (Software, can be very slow)"
msgstr ""
"Включить исправление альфа канала (программный режим, может быть очень "
"медленным)"
+#: src/gui/setup_perfomance.cpp:77
+msgid "Show beings transparency"
+msgstr "Отображать прозрачность на персонажах и монстрах"
+
#: src/gui/setup_perfomance.cpp:80
msgid "Enable reorder sprites."
msgstr "Включить перестановку спрайтов"
@@ -2406,7 +2428,7 @@ msgid "FPS limit:"
msgstr "Ограничить кадр/с:"
#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
-#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709
+#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:710
msgid "Alt FPS limit: "
msgstr "Альтер. ограничить кадр/с: "
@@ -2432,7 +2454,7 @@ msgstr "Детализация частиц"
#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
-#: src/gui/setup_video.cpp:707
+#: src/gui/setup_video.cpp:708
msgid "None"
msgstr "Нет"
@@ -2544,22 +2566,22 @@ msgstr "Верх"
msgid "Skill points available: %d"
msgstr "Очков навыков осталось: %d"
-#: src/gui/skilldialog.cpp:418
+#: src/gui/skilldialog.cpp:420
#, c-format
msgid "Skill Set %d"
msgstr "Умение %d"
-#: src/gui/skilldialog.cpp:430
+#: src/gui/skilldialog.cpp:432
#, c-format
msgid "Skill %d"
msgstr "Умение %d"
-#: src/gui/skilldialog.cpp:497 src/gui/skilldialog.cpp:550
+#: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554
#, c-format
msgid "Lvl: %d"
msgstr "Уровень: %d"
-#: src/gui/skilldialog.cpp:542
+#: src/gui/skilldialog.cpp:546
#, c-format
msgid "Lvl: %d (%+d)"
msgstr "Уровень: %d (%+d)"
@@ -3484,23 +3506,23 @@ msgstr "Бордюр домашней позиции"
msgid "Road Point"
msgstr "Точка дороги"
-#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:472
+#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:474
msgid "Who Is Online - Updating"
msgstr "Кто онлайн - обновление"
-#: src/gui/whoisonline.cpp:102
+#: src/gui/whoisonline.cpp:104
msgid "Update"
msgstr "Обновить"
-#: src/gui/whoisonline.cpp:295
+#: src/gui/whoisonline.cpp:297
msgid "Who Is Online - "
msgstr "Кто онлайн - "
-#: src/gui/whoisonline.cpp:486
+#: src/gui/whoisonline.cpp:488
msgid "Who Is Online - error"
msgstr "Кто онлайн - ошибка"
-#: src/gui/whoisonline.cpp:517
+#: src/gui/whoisonline.cpp:519
msgid "Who Is Online - Update"
msgstr "Кто онлайн - обновление"
@@ -4173,41 +4195,41 @@ msgstr ""
"Конфликт клавиш \"%s\" и \"%s\".Исправьте их, или игра может себя странно "
"вести."
-#: src/localplayer.cpp:370
+#: src/localplayer.cpp:372
msgid "You were killed by "
msgstr "Вы были убиты "
-#: src/localplayer.cpp:1401
+#: src/localplayer.cpp:1413
msgid "Tried to pick up nonexistent item."
msgstr "Попытка поднять несуществующий предмет."
-#: src/localplayer.cpp:1403
+#: src/localplayer.cpp:1415
msgid "Item is too heavy."
msgstr "Предмет слишком тяжелый."
-#: src/localplayer.cpp:1405
+#: src/localplayer.cpp:1417
msgid "Item is too far away."
msgstr "Предмет слишком далеко"
-#: src/localplayer.cpp:1407
+#: src/localplayer.cpp:1419
msgid "Inventory is full."
msgstr "Инвентарь переполнен."
-#: src/localplayer.cpp:1409
+#: src/localplayer.cpp:1421
msgid "Stack is too big."
msgstr "Слишком много предметов."
-#: src/localplayer.cpp:1412
+#: src/localplayer.cpp:1424
msgid "Item belongs to someone else."
msgstr "Предмет принадлежит кому-то еще."
-#: src/localplayer.cpp:1415
+#: src/localplayer.cpp:1427
msgid "Unknown problem picking up item."
msgstr "Неизвестная проблема при поднятии предмета."
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1439
+#: src/localplayer.cpp:1451
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -4215,27 +4237,27 @@ msgstr[0] "Вы подняли %d [@@%d|%s@@]."
msgstr[1] "Вы подняли %d [@@%d|%s@@]."
msgstr[2] "Вы подняли %d [@@%d|%s@@]."
-#: src/localplayer.cpp:3173
+#: src/localplayer.cpp:3187
msgid "Away"
msgstr "Отошел"
-#: src/localplayer.cpp:3474
+#: src/localplayer.cpp:3488
msgid "Follow: "
msgstr "Следование: "
-#: src/localplayer.cpp:3476 src/localplayer.cpp:3491
+#: src/localplayer.cpp:3490 src/localplayer.cpp:3505
msgid "Follow canceled"
msgstr "Следование отменено"
-#: src/localplayer.cpp:3483
+#: src/localplayer.cpp:3497
msgid "Imitation: "
msgstr "Имитация: "
-#: src/localplayer.cpp:3485 src/localplayer.cpp:3493
+#: src/localplayer.cpp:3499 src/localplayer.cpp:3507
msgid "Imitation canceled"
msgstr "Имитация отменена"
-#: src/localplayer.cpp:3845
+#: src/localplayer.cpp:3859
msgid "You see "
msgstr "Вы видите "
@@ -4438,16 +4460,16 @@ msgstr "Игрок MVP."
msgid "MVP player: "
msgstr "Игрок MVP: "
-#: src/net/ea/gamehandler.cpp:86
+#: src/net/ea/gamehandler.cpp:87
#, c-format
msgid "Online users: %d"
msgstr "Пользователей онлайн: %d"
-#: src/net/ea/gamehandler.cpp:98
+#: src/net/ea/gamehandler.cpp:99
msgid "Game"
msgstr "Игра"
-#: src/net/ea/gamehandler.cpp:98
+#: src/net/ea/gamehandler.cpp:99
msgid "Request to quit denied!"
msgstr "Запрос на выход отклонен!"
@@ -5507,19 +5529,19 @@ msgstr "Подключение к серверу прервано."
msgid "%s is not in your party!"
msgstr "%s не в группе!"
-#: src/playerrelations.cpp:414
+#: src/playerrelations.cpp:429
msgid "Print '...'"
msgstr "Печатать '...'"
-#: src/playerrelations.cpp:434
+#: src/playerrelations.cpp:449
msgid "Blink name"
msgstr "Мигать именем"
-#: src/playerrelations.cpp:478
+#: src/playerrelations.cpp:493
msgid "Floating '...' bubble"
msgstr "Плавающий '...' пузырек"
-#: src/playerrelations.cpp:481
+#: src/playerrelations.cpp:496
msgid "Floating bubble"
msgstr "Плавающий пузырек"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 0ade28fe2..e159fa701 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -2,14 +2,15 @@
# Copyright (C) YEAR The ManaPlus Developers
# This file is distributed under the same license as the PACKAGE package.
#
-# <colorfullife81@gmail.com>, 2011.
+# Translators:
# Andrei Karas <akaras@inbox.ru>, 2011.
+# <colorfullife81@gmail.com>, 2011.
msgid ""
msgstr ""
"Project-Id-Version: ManaPlus\n"
"Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2011-09-02 18:27+0300\n"
-"PO-Revision-Date: 2011-09-02 15:29+0000\n"
+"POT-Creation-Date: 2011-09-10 01:34+0300\n"
+"PO-Revision-Date: 2011-09-09 22:37+0000\n"
"Last-Translator: akaras <akaras@inbox.ru>\n"
"Language-Team: Chinese (China) (http://www.transifex.net/projects/p/manaplus/"
"team/zh_CN/)\n"
@@ -19,25 +20,25 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0\n"
-#: src/actorspritemanager.cpp:1034
+#: src/actorspritemanager.cpp:1046
msgid "Visible on map"
msgstr "在地图上可见"
-#: src/being.cpp:549
+#: src/being.cpp:551
msgid "dodge"
msgstr "躲闪"
-#: src/being.cpp:549
+#: src/being.cpp:551
msgid "miss"
msgstr "小姐"
#. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1529
+#: src/being.cpp:1532
msgid "A"
msgstr "A"
#. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1534
+#: src/being.cpp:1537
msgid "I"
msgstr "I"
@@ -107,22 +108,22 @@ msgstr "注销成功"
msgid "Farewell, come back any time..."
msgstr "永别了,任何时候回来... ..."
-#: src/client.cpp:1428 src/client.cpp:1458 src/client.cpp:1502
-#: src/client.cpp:1927 src/client.cpp:1934
+#: src/client.cpp:1428 src/client.cpp:1458 src/client.cpp:1504
+#: src/client.cpp:1929 src/client.cpp:1936
#, c-format
msgid "%s doesn't exist and can't be created! Exiting."
msgstr ""
-#: src/client.cpp:1633
+#: src/client.cpp:1635
#, c-format
msgid "Invalid update host: %s"
msgstr ""
-#: src/client.cpp:1667 src/client.cpp:1673
+#: src/client.cpp:1669 src/client.cpp:1675
msgid "Error creating updates directory!"
msgstr "创建更新目录错误!"
-#: src/client.cpp:1694
+#: src/client.cpp:1696
#, c-format
msgid "Error: %s doesn't exist and can't be created! Exiting."
msgstr ""
@@ -315,19 +316,19 @@ msgstr "服务器的连接丢失。"
msgid "Network Error"
msgstr "网络错误"
-#: src/game.cpp:1236
+#: src/game.cpp:1243
msgid "Ignoring incoming trade requests"
msgstr "忽略新进的交易请求"
-#: src/game.cpp:1243
+#: src/game.cpp:1250
msgid "Accepting incoming trade requests"
msgstr "接受传入的交易请求"
-#: src/game.cpp:1629
+#: src/game.cpp:1636
msgid "Could Not Load Map"
msgstr "不能加载地图"
-#: src/game.cpp:1630
+#: src/game.cpp:1637
#, c-format
msgid "Error while loading %s"
msgstr "加载%s时出现错误"
@@ -356,31 +357,31 @@ msgstr "评论: %s"
msgid "Bot Checker"
msgstr "机器人检查"
-#: src/gui/botcheckerwindow.cpp:295 src/gui/setup_relations.cpp:64
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:64
msgid "Name"
msgstr "姓名"
-#: src/gui/botcheckerwindow.cpp:296 src/gui/popupmenu.cpp:133
+#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:133
#: src/gui/popupmenu.cpp:310 src/gui/popupmenu.cpp:646
#: src/keyboardconfig.cpp:48 src/net/tmwa/generalhandler.cpp:265
msgid "Attack"
msgstr "攻击"
-#: src/gui/botcheckerwindow.cpp:297 src/gui/popupmenu.cpp:297
+#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:297
#: src/keyboardconfig.cpp:62
msgid "Talk"
msgstr "说话"
-#: src/gui/botcheckerwindow.cpp:298 src/gui/popupmenu.cpp:263
+#: src/gui/botcheckerwindow.cpp:299 src/gui/popupmenu.cpp:263
#: src/gui/popupmenu.cpp:302 src/gui/popupmenu.cpp:703
msgid "Move"
msgstr "移动"
-#: src/gui/botcheckerwindow.cpp:299
+#: src/gui/botcheckerwindow.cpp:300
msgid "Result"
msgstr "结果"
-#: src/gui/botcheckerwindow.cpp:310 src/gui/npcdialog.cpp:124
+#: src/gui/botcheckerwindow.cpp:311 src/gui/npcdialog.cpp:124
msgid "Reset"
msgstr "重置"
@@ -426,7 +427,7 @@ msgid "Max"
msgstr "最大"
#: src/gui/buyselldialog.cpp:40 src/gui/buyselldialog.cpp:49
-#: src/gui/inventorywindow.cpp:147 src/gui/setup_other.cpp:133
+#: src/gui/inventorywindow.cpp:176 src/gui/setup_other.cpp:142
msgid "Shop"
msgstr "商店"
@@ -445,10 +446,10 @@ msgstr "出售"
#: src/gui/popupmenu.cpp:516 src/gui/popupmenu.cpp:540
#: src/gui/popupmenu.cpp:554 src/gui/popupmenu.cpp:573
#: src/gui/popupmenu.cpp:790 src/gui/popupmenu.cpp:814
-#: src/gui/popupmenu.cpp:1734 src/gui/popupmenu.cpp:1762
-#: src/gui/popupmenu.cpp:1818 src/gui/popupmenu.cpp:1861
-#: src/gui/popupmenu.cpp:1896 src/gui/popupmenu.cpp:1936
-#: src/gui/popupmenu.cpp:2003 src/gui/popupmenu.cpp:2023
+#: src/gui/popupmenu.cpp:1737 src/gui/popupmenu.cpp:1765
+#: src/gui/popupmenu.cpp:1821 src/gui/popupmenu.cpp:1864
+#: src/gui/popupmenu.cpp:1899 src/gui/popupmenu.cpp:1939
+#: src/gui/popupmenu.cpp:2006 src/gui/popupmenu.cpp:2026
#: src/gui/quitdialog.cpp:54 src/gui/register.cpp:82 src/gui/setup.cpp:72
#: src/gui/socialwindow.cpp:1077 src/gui/textcommandeditor.cpp:238
#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
@@ -550,7 +551,7 @@ msgstr "发型:"
msgid "Race:"
msgstr ""
-#: src/gui/charcreatedialog.cpp:95 src/gui/charselectdialog.cpp:478
+#: src/gui/charcreatedialog.cpp:95 src/gui/charselectdialog.cpp:480
#: src/gui/socialwindow.cpp:1139
msgid "Create"
msgstr "建立"
@@ -618,26 +619,26 @@ msgstr "删除字符输入的密码"
msgid "Enter password:"
msgstr "输入密码:"
-#: src/gui/charselectdialog.cpp:408 src/gui/serverdialog.cpp:298
+#: src/gui/charselectdialog.cpp:410 src/gui/serverdialog.cpp:298
#: src/gui/setup_relations.cpp:243 src/gui/shopwindow.cpp:122
#: src/gui/shopwindow.cpp:125 src/gui/textcommandeditor.cpp:241
msgid "Delete"
msgstr "删除"
-#: src/gui/charselectdialog.cpp:466
+#: src/gui/charselectdialog.cpp:468
msgid "Choose"
msgstr "选择"
-#: src/gui/charselectdialog.cpp:469
+#: src/gui/charselectdialog.cpp:471
#, c-format
msgid "Level %d"
msgstr "等级 %d"
-#: src/gui/charselectdialog.cpp:480 src/gui/charselectdialog.cpp:481
+#: src/gui/charselectdialog.cpp:482 src/gui/charselectdialog.cpp:483
msgid "(empty)"
msgstr "()"
-#: src/gui/chatwindow.cpp:112
+#: src/gui/chatwindow.cpp:112 src/gui/inventorywindow.cpp:70
msgid "default"
msgstr "默认"
@@ -693,11 +694,12 @@ msgstr "彩虹2"
msgid "rainbow 3"
msgstr "彩虹3"
-#: src/gui/chatwindow.cpp:142 src/gui/itemamountwindow.cpp:93
-#: src/gui/logindialog.cpp:78 src/gui/setup_relations.cpp:220
-#: src/gui/setup_theme.cpp:73 src/gui/setup_theme.cpp:127
-#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:102
-#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:160
+#: src/gui/chatwindow.cpp:142 src/gui/inventorywindow.cpp:90
+#: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:78
+#: src/gui/setup_relations.cpp:220 src/gui/setup_theme.cpp:73
+#: src/gui/setup_theme.cpp:127 src/gui/setup_video.cpp:211
+#: src/gui/textcommandeditor.cpp:102 src/gui/textcommandeditor.cpp:141
+#: src/gui/textcommandeditor.cpp:160
msgid "???"
msgstr "???"
@@ -730,7 +732,7 @@ msgstr "否"
msgid "Ignore"
msgstr "忽略"
-#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:97
+#: src/gui/debugwindow.cpp:72 src/gui/minimap.cpp:50 src/gui/minimap.cpp:99
#: src/gui/setup_other.cpp:64
msgid "Map"
msgstr "地图"
@@ -871,7 +873,7 @@ msgid "Did You Know?"
msgstr "你知道吗?"
#: src/gui/didyouknowwindow.cpp:63 src/gui/helpwindow.cpp:59
-#: src/gui/inventorywindow.cpp:176 src/gui/npcdialog.cpp:53
+#: src/gui/inventorywindow.cpp:206 src/gui/npcdialog.cpp:53
#: src/gui/popupmenu.cpp:588 src/gui/shopwindow.cpp:113
msgid "Close"
msgstr "关闭"
@@ -897,10 +899,10 @@ msgstr "确定"
msgid "Equipment"
msgstr "装备"
-#: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:131
-#: src/gui/inventorywindow.cpp:512 src/gui/inventorywindow.cpp:521
-#: src/gui/popupmenu.cpp:1693 src/gui/popupmenu.cpp:1788
-#: src/gui/popupmenu.cpp:1833
+#: src/gui/equipmentwindow.cpp:95 src/gui/inventorywindow.cpp:160
+#: src/gui/inventorywindow.cpp:539 src/gui/inventorywindow.cpp:548
+#: src/gui/popupmenu.cpp:1696 src/gui/popupmenu.cpp:1791
+#: src/gui/popupmenu.cpp:1836
msgid "Unequip"
msgstr "卸下装备"
@@ -908,80 +910,88 @@ msgstr "卸下装备"
msgid "Help"
msgstr "帮助"
-#: src/gui/inventorywindow.cpp:80 src/gui/windowmenu.cpp:76
+#: src/gui/inventorywindow.cpp:71
+msgid "by name"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:72
+msgid "by id"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:73
+msgid "by weight"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:74
+msgid "by amount"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:75
+msgid "by type"
+msgstr ""
+
+#: src/gui/inventorywindow.cpp:111 src/gui/windowmenu.cpp:76
#: src/inventory.cpp:249
msgid "Inventory"
msgstr "物品栏"
-#: src/gui/inventorywindow.cpp:105
+#: src/gui/inventorywindow.cpp:136
msgid "Slots:"
msgstr "槽:"
-#: src/gui/inventorywindow.cpp:116
+#: src/gui/inventorywindow.cpp:148
msgid "Filter:"
msgstr "过滤器:"
-#: src/gui/inventorywindow.cpp:117
+#: src/gui/inventorywindow.cpp:149
msgid "Sort:"
msgstr "排序:"
-#: src/gui/inventorywindow.cpp:123
-msgid "na"
-msgstr "na"
-
-#: src/gui/inventorywindow.cpp:124
-msgid "az"
-msgstr "az"
-
-#: src/gui/inventorywindow.cpp:125
-msgid "id"
-msgstr "id"
-
-#: src/gui/inventorywindow.cpp:129 src/gui/inventorywindow.cpp:514
-#: src/gui/inventorywindow.cpp:523 src/gui/popupmenu.cpp:1695
-#: src/gui/popupmenu.cpp:1790 src/gui/popupmenu.cpp:1835
+#: src/gui/inventorywindow.cpp:158 src/gui/inventorywindow.cpp:541
+#: src/gui/inventorywindow.cpp:550 src/gui/popupmenu.cpp:1698
+#: src/gui/popupmenu.cpp:1793 src/gui/popupmenu.cpp:1838
msgid "Equip"
msgstr "装备"
-#: src/gui/inventorywindow.cpp:130 src/gui/inventorywindow.cpp:515
-#: src/gui/inventorywindow.cpp:519 src/gui/popupmenu.cpp:1698
-#: src/gui/popupmenu.cpp:1757 src/gui/popupmenu.cpp:1794
-#: src/gui/popupmenu.cpp:1838
+#: src/gui/inventorywindow.cpp:159 src/gui/inventorywindow.cpp:542
+#: src/gui/inventorywindow.cpp:546 src/gui/popupmenu.cpp:1701
+#: src/gui/popupmenu.cpp:1760 src/gui/popupmenu.cpp:1797
+#: src/gui/popupmenu.cpp:1841
msgid "Use"
msgstr "使用"
-#: src/gui/inventorywindow.cpp:144 src/gui/inventorywindow.cpp:620
-#: src/gui/popupmenu.cpp:1702 src/gui/popupmenu.cpp:1799
-#: src/gui/popupmenu.cpp:1842
+#: src/gui/inventorywindow.cpp:173 src/gui/inventorywindow.cpp:646
+#: src/gui/popupmenu.cpp:1705 src/gui/popupmenu.cpp:1802
+#: src/gui/popupmenu.cpp:1845
msgid "Drop..."
msgstr "掉落... ..."
-#: src/gui/inventorywindow.cpp:145 src/gui/popupmenu.cpp:1711
-#: src/gui/popupmenu.cpp:1808 src/gui/popupmenu.cpp:1851
+#: src/gui/inventorywindow.cpp:174 src/gui/popupmenu.cpp:1714
+#: src/gui/popupmenu.cpp:1811 src/gui/popupmenu.cpp:1854
msgid "Split"
msgstr "分离"
-#: src/gui/inventorywindow.cpp:146 src/gui/outfitwindow.cpp:60
+#: src/gui/inventorywindow.cpp:175 src/gui/outfitwindow.cpp:60
#: src/gui/popupmenu.cpp:549
msgid "Outfits"
msgstr "装具"
-#: src/gui/inventorywindow.cpp:149
+#: src/gui/inventorywindow.cpp:178
msgid "Weight:"
msgstr "重量:"
-#: src/gui/inventorywindow.cpp:174 src/gui/inventorywindow.cpp:611
-#: src/gui/popupmenu.cpp:1674 src/gui/popupmenu.cpp:1811
-#: src/gui/popupmenu.cpp:1854 src/gui/setup.cpp:73
+#: src/gui/inventorywindow.cpp:204 src/gui/inventorywindow.cpp:637
+#: src/gui/popupmenu.cpp:1677 src/gui/popupmenu.cpp:1814
+#: src/gui/popupmenu.cpp:1857 src/gui/setup.cpp:73
msgid "Store"
msgstr "存储"
-#: src/gui/inventorywindow.cpp:175 src/gui/popupmenu.cpp:1718
+#: src/gui/inventorywindow.cpp:205 src/gui/popupmenu.cpp:1721
msgid "Retrieve"
msgstr "取回"
-#: src/gui/inventorywindow.cpp:622 src/gui/popupmenu.cpp:1707
-#: src/gui/popupmenu.cpp:1804 src/gui/popupmenu.cpp:1847
+#: src/gui/inventorywindow.cpp:648 src/gui/popupmenu.cpp:1710
+#: src/gui/popupmenu.cpp:1807 src/gui/popupmenu.cpp:1850
#: src/gui/windowmenu.cpp:97
msgid "Drop"
msgstr "丢弃"
@@ -1035,89 +1045,89 @@ msgstr "重量:%s"
msgid "Kill stats"
msgstr "杀敌统计"
-#: src/gui/killstats.cpp:65
+#: src/gui/killstats.cpp:66
msgid "Reset stats"
msgstr "复位统计"
-#: src/gui/killstats.cpp:66
+#: src/gui/killstats.cpp:67
msgid "Reset timer"
msgstr "复位定时器"
-#: src/gui/killstats.cpp:70 src/gui/killstats.cpp:206
+#: src/gui/killstats.cpp:71 src/gui/killstats.cpp:207
#, c-format
msgid "Level: %d at %f%%"
msgstr "等级:%d 在 %f%%"
-#: src/gui/killstats.cpp:74 src/gui/killstats.cpp:211
+#: src/gui/killstats.cpp:75 src/gui/killstats.cpp:212
#, c-format
msgid "Exp: %d/%d Left: %d"
msgstr ""
-#: src/gui/killstats.cpp:77 src/gui/killstats.cpp:217
-#: src/gui/killstats.cpp:226
+#: src/gui/killstats.cpp:78 src/gui/killstats.cpp:218
+#: src/gui/killstats.cpp:227
#, c-format
msgid "1%% = %d exp, avg mob for 1%%: %s"
msgstr ""
-#: src/gui/killstats.cpp:80 src/gui/killstats.cpp:143
-#: src/gui/killstats.cpp:235
+#: src/gui/killstats.cpp:81 src/gui/killstats.cpp:144
+#: src/gui/killstats.cpp:236
#, c-format
msgid "Kills: %s, total exp: %s"
msgstr ""
-#: src/gui/killstats.cpp:82 src/gui/killstats.cpp:145
-#: src/gui/killstats.cpp:221 src/gui/killstats.cpp:231
+#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:146
+#: src/gui/killstats.cpp:222 src/gui/killstats.cpp:232
#, c-format
msgid "Avg Exp: %s, No. of avg mob to next level: %s"
msgstr ""
-#: src/gui/killstats.cpp:83 src/gui/killstats.cpp:163
-#: src/gui/killstats.cpp:238
+#: src/gui/killstats.cpp:84 src/gui/killstats.cpp:164
+#: src/gui/killstats.cpp:239
#, c-format
msgid "Kills/Min: %s, Exp/Min: %s"
msgstr ""
-#: src/gui/killstats.cpp:85 src/gui/killstats.cpp:90 src/gui/killstats.cpp:95
-#: src/gui/killstats.cpp:290 src/gui/killstats.cpp:306
-#: src/gui/killstats.cpp:324
+#: src/gui/killstats.cpp:86 src/gui/killstats.cpp:91 src/gui/killstats.cpp:96
+#: src/gui/killstats.cpp:291 src/gui/killstats.cpp:307
+#: src/gui/killstats.cpp:325
#, c-format
msgid "Exp speed per %d min: %s"
msgid_plural "Exp speed per %d min: %s"
msgstr[0] ""
-#: src/gui/killstats.cpp:88 src/gui/killstats.cpp:93 src/gui/killstats.cpp:98
+#: src/gui/killstats.cpp:89 src/gui/killstats.cpp:94 src/gui/killstats.cpp:99
#, c-format
msgid "Time for next level per %d min: %s"
msgid_plural "Time for next level per %d min: %s"
msgstr[0] ""
-#: src/gui/killstats.cpp:101 src/gui/killstats.cpp:242
+#: src/gui/killstats.cpp:102 src/gui/killstats.cpp:243
msgid "Last kill exp:"
msgstr "最后EXP:"
-#: src/gui/killstats.cpp:103 src/gui/killstats.cpp:356
-#: src/gui/killstats.cpp:362 src/gui/killstats.cpp:368
-#: src/gui/killstats.cpp:373
+#: src/gui/killstats.cpp:104 src/gui/killstats.cpp:357
+#: src/gui/killstats.cpp:363 src/gui/killstats.cpp:369
+#: src/gui/killstats.cpp:374
msgid "Time before jacko spawn:"
msgstr ""
-#: src/gui/killstats.cpp:295 src/gui/killstats.cpp:302
-#: src/gui/killstats.cpp:312 src/gui/killstats.cpp:319
-#: src/gui/killstats.cpp:331 src/gui/killstats.cpp:338
+#: src/gui/killstats.cpp:296 src/gui/killstats.cpp:303
+#: src/gui/killstats.cpp:313 src/gui/killstats.cpp:320
+#: src/gui/killstats.cpp:332 src/gui/killstats.cpp:339
#, c-format
msgid " Time for next level: %s"
msgstr ""
-#: src/gui/killstats.cpp:362
+#: src/gui/killstats.cpp:363
#, c-format
msgid "%s %d?"
msgstr "%s %d?"
-#: src/gui/killstats.cpp:368
+#: src/gui/killstats.cpp:369
msgid "jacko spawning"
msgstr ""
-#: src/guildmanager.cpp:464 src/net/ea/guildhandler.cpp:439
+#: src/guildmanager.cpp:484 src/net/ea/guildhandler.cpp:439
msgid "You have left the guild."
msgstr "你已经离开工会."
@@ -1215,7 +1225,7 @@ msgid "Submit"
msgstr "提交"
#: src/gui/npcdialog.cpp:59 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:142
+#: src/gui/setup_other.cpp:151
msgid "NPC"
msgstr "NPC"
@@ -1303,7 +1313,7 @@ msgstr ""
#: src/gui/popupmenu.cpp:167 src/gui/popupmenu.cpp:185
#: src/gui/popupmenu.cpp:415 src/gui/popupmenu.cpp:428
#: src/gui/popupmenu.cpp:677 src/gui/popupmenu.cpp:693
-#: src/playerrelations.cpp:400
+#: src/playerrelations.cpp:415
msgid "Completely ignore"
msgstr "完全忽略"
@@ -1354,7 +1364,7 @@ msgid "Show Items"
msgstr "显示项目"
#: src/gui/popupmenu.cpp:266 src/gui/popupmenu.cpp:705
-#: src/gui/popupmenu.cpp:2020
+#: src/gui/popupmenu.cpp:2023
msgid "Undress"
msgstr ""
@@ -1402,8 +1412,8 @@ msgstr ""
msgid "Pick up"
msgstr "拾取"
-#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:1732
-#: src/gui/popupmenu.cpp:1812 src/gui/popupmenu.cpp:1855
+#: src/gui/popupmenu.cpp:513 src/gui/popupmenu.cpp:1735
+#: src/gui/popupmenu.cpp:1815 src/gui/popupmenu.cpp:1858
msgid "Add to chat"
msgstr "加入聊天"
@@ -1415,8 +1425,8 @@ msgstr "地图项"
msgid "Rename"
msgstr "重命名"
-#: src/gui/popupmenu.cpp:532 src/gui/popupmenu.cpp:1973
-#: src/gui/popupmenu.cpp:1991 src/gui/popupmenu.cpp:1996
+#: src/gui/popupmenu.cpp:532 src/gui/popupmenu.cpp:1976
+#: src/gui/popupmenu.cpp:1994 src/gui/popupmenu.cpp:1999
msgid "Remove"
msgstr ""
@@ -1492,85 +1502,85 @@ msgstr "玩家评论"
msgid "Comment: "
msgstr "评论:"
-#: src/gui/popupmenu.cpp:1657
+#: src/gui/popupmenu.cpp:1660
msgid "Add to trade"
msgstr ""
-#: src/gui/popupmenu.cpp:1663
+#: src/gui/popupmenu.cpp:1666
msgid "Add to trade 10"
msgstr ""
-#: src/gui/popupmenu.cpp:1666
+#: src/gui/popupmenu.cpp:1669
msgid "Add to trade half"
msgstr ""
-#: src/gui/popupmenu.cpp:1668
+#: src/gui/popupmenu.cpp:1671
msgid "Add to trade all"
msgstr ""
-#: src/gui/popupmenu.cpp:1680
+#: src/gui/popupmenu.cpp:1683
msgid "Store 10"
msgstr "商店10"
-#: src/gui/popupmenu.cpp:1683
+#: src/gui/popupmenu.cpp:1686
msgid "Store half"
msgstr "商店的一半"
-#: src/gui/popupmenu.cpp:1685
+#: src/gui/popupmenu.cpp:1688
msgid "Store all"
msgstr "商店所有"
-#: src/gui/popupmenu.cpp:1703 src/gui/popupmenu.cpp:1800
-#: src/gui/popupmenu.cpp:1843
+#: src/gui/popupmenu.cpp:1706 src/gui/popupmenu.cpp:1803
+#: src/gui/popupmenu.cpp:1846
msgid "Drop all"
msgstr "所有"
-#: src/gui/popupmenu.cpp:1724
+#: src/gui/popupmenu.cpp:1727
msgid "Retrieve 10"
msgstr "拿出10"
-#: src/gui/popupmenu.cpp:1727
+#: src/gui/popupmenu.cpp:1730
msgid "Retrieve half"
msgstr "拿出一半"
-#: src/gui/popupmenu.cpp:1729
+#: src/gui/popupmenu.cpp:1732
msgid "Retrieve all"
msgstr "检索所有"
-#: src/gui/popupmenu.cpp:1760 src/gui/popupmenu.cpp:1816
+#: src/gui/popupmenu.cpp:1763 src/gui/popupmenu.cpp:1819
msgid "Load old item shortcuts"
msgstr ""
-#: src/gui/popupmenu.cpp:1859
+#: src/gui/popupmenu.cpp:1862
msgid "Load old drop shortcuts"
msgstr ""
-#: src/gui/popupmenu.cpp:1885 src/gui/popupmenu.cpp:1920
+#: src/gui/popupmenu.cpp:1888 src/gui/popupmenu.cpp:1923
msgid "Hide"
msgstr "隐藏"
-#: src/gui/popupmenu.cpp:1891 src/gui/popupmenu.cpp:1926
+#: src/gui/popupmenu.cpp:1894 src/gui/popupmenu.cpp:1929
msgid "Show"
msgstr "显示"
-#: src/gui/popupmenu.cpp:1933
+#: src/gui/popupmenu.cpp:1936
msgid "Reset yellow bar"
msgstr ""
-#: src/gui/popupmenu.cpp:1935 src/gui/statuswindow.cpp:241
+#: src/gui/popupmenu.cpp:1938 src/gui/statuswindow.cpp:241
msgid "Copy to chat"
msgstr ""
-#: src/gui/popupmenu.cpp:1953 src/gui/socialwindow.cpp:958
+#: src/gui/popupmenu.cpp:1956 src/gui/socialwindow.cpp:958
#: src/gui/socialwindow.cpp:993 src/gui/socialwindow.cpp:1028
msgid "(default)"
msgstr "(默认)"
-#: src/gui/popupmenu.cpp:1965 src/gui/popupmenu.cpp:1983
+#: src/gui/popupmenu.cpp:1968 src/gui/popupmenu.cpp:1986
msgid "Move up"
msgstr "x"
-#: src/gui/popupmenu.cpp:1970 src/gui/popupmenu.cpp:1988
+#: src/gui/popupmenu.cpp:1973 src/gui/popupmenu.cpp:1991
msgid "Move down"
msgstr ""
@@ -1816,7 +1826,7 @@ msgstr "时间"
msgid "Use local time"
msgstr "使用本地时间"
-#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:157
+#: src/gui/setup_chat.cpp:123 src/gui/setup_other.cpp:166
msgid "Other"
msgstr "其他"
@@ -1979,115 +1989,127 @@ msgstr "绘制路径"
msgid "Draw hotkeys on map"
msgstr ""
-#: src/gui/setup_other.cpp:88
+#: src/gui/setup_other.cpp:87
+msgid "Enable lazy scrolling"
+msgstr ""
+
+#: src/gui/setup_other.cpp:90
+msgid "Scroll laziness"
+msgstr ""
+
+#: src/gui/setup_other.cpp:93
+msgid "Scroll radius"
+msgstr ""
+
+#: src/gui/setup_other.cpp:97
msgid "Moving"
msgstr "移动"
-#: src/gui/setup_other.cpp:90
+#: src/gui/setup_other.cpp:99
msgid "Auto fix position"
msgstr "自动修复的位置"
-#: src/gui/setup_other.cpp:93
+#: src/gui/setup_other.cpp:102
msgid "Attack while moving"
msgstr "攻击的同时移动"
-#: src/gui/setup_other.cpp:96
+#: src/gui/setup_other.cpp:105
msgid "Sync player move"
msgstr "同步播放移动"
-#: src/gui/setup_other.cpp:99
+#: src/gui/setup_other.cpp:108
msgid "Crazy move A program"
msgstr "疯狂的举动的程序"
-#: src/gui/setup_other.cpp:103
+#: src/gui/setup_other.cpp:112
msgid "Player"
msgstr "玩家"
-#: src/gui/setup_other.cpp:105
+#: src/gui/setup_other.cpp:114
msgid "Show own hp bar"
msgstr "显示自己的HP栏"
-#: src/gui/setup_other.cpp:108
+#: src/gui/setup_other.cpp:117
msgid "Enable quick stats"
msgstr "启用快速统计"
-#: src/gui/setup_other.cpp:111
+#: src/gui/setup_other.cpp:120
msgid "Cycle player targets"
msgstr ""
-#: src/gui/setup_other.cpp:114
+#: src/gui/setup_other.cpp:123
msgid "Show job exp messages"
msgstr "显示工作EXP消息"
-#: src/gui/setup_other.cpp:117
+#: src/gui/setup_other.cpp:126
msgid "Show players popups"
msgstr "显示球员弹出窗口"
-#: src/gui/setup_other.cpp:120
+#: src/gui/setup_other.cpp:129
msgid "Afk message"
msgstr ""
-#: src/gui/setup_other.cpp:123
+#: src/gui/setup_other.cpp:132
msgid "Show job"
msgstr "显示工作"
-#: src/gui/setup_other.cpp:126
+#: src/gui/setup_other.cpp:135
msgid "Enable attack filter"
msgstr "启用攻击过滤器"
-#: src/gui/setup_other.cpp:129
+#: src/gui/setup_other.cpp:138
msgid "Enable advert protocol"
msgstr ""
-#: src/gui/setup_other.cpp:135
+#: src/gui/setup_other.cpp:144
msgid "Accept sell/buy requests"
msgstr "接受出售/购买请求"
-#: src/gui/setup_other.cpp:138
+#: src/gui/setup_other.cpp:147
msgid "Enable shop mode"
msgstr "启用店模式"
-#: src/gui/setup_other.cpp:144
+#: src/gui/setup_other.cpp:153
msgid "Log NPC dialogue"
msgstr "NPC对话"
-#: src/gui/setup_other.cpp:148
+#: src/gui/setup_other.cpp:157
msgid "Bots support"
msgstr ""
-#: src/gui/setup_other.cpp:150
+#: src/gui/setup_other.cpp:159
msgid "Enable auction bot support"
msgstr ""
-#: src/gui/setup_other.cpp:153
+#: src/gui/setup_other.cpp:162
msgid "Enable guild bot support and disable native guild support"
msgstr ""
-#: src/gui/setup_other.cpp:159
+#: src/gui/setup_other.cpp:168
msgid "Enable server side attack"
msgstr "启用服务器端的攻击"
-#: src/gui/setup_other.cpp:162
+#: src/gui/setup_other.cpp:171
msgid "Enable bot checker"
msgstr "启用BOT检查"
-#: src/gui/setup_other.cpp:165
+#: src/gui/setup_other.cpp:174
msgid "Enable buggy servers protection"
msgstr "启用BUG保护"
-#: src/gui/setup_other.cpp:168
+#: src/gui/setup_other.cpp:177
msgid "Enable debug log"
msgstr "启用调试日志"
-#: src/gui/setup_other.cpp:171
+#: src/gui/setup_other.cpp:180
msgid "Low traffic mode"
msgstr "低流量模式"
-#: src/gui/setup_other.cpp:174
+#: src/gui/setup_other.cpp:183
msgid "Hide shield sprite"
msgstr ""
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:186
msgid "Show background"
msgstr "显示背景"
@@ -2104,29 +2126,29 @@ msgid "Auto adjust perfomance"
msgstr "自动调整"
#: src/gui/setup_perfomance.cpp:61
-msgid "Show beings transparency"
-msgstr ""
-
-#: src/gui/setup_perfomance.cpp:64
msgid "Hw acceleration"
msgstr "硬件加速"
-#: src/gui/setup_perfomance.cpp:67
+#: src/gui/setup_perfomance.cpp:64
msgid "Enable opacity cache (Software, can use many memory)"
msgstr ""
-#: src/gui/setup_perfomance.cpp:70
+#: src/gui/setup_perfomance.cpp:67
msgid "Enable map reduce (Software)"
msgstr ""
-#: src/gui/setup_perfomance.cpp:73
+#: src/gui/setup_perfomance.cpp:70
msgid "Better quality (disable for better perfomance)"
msgstr ""
-#: src/gui/setup_perfomance.cpp:76
+#: src/gui/setup_perfomance.cpp:73
msgid "Enable alpha channel fix (Software, can be very slow)"
msgstr ""
+#: src/gui/setup_perfomance.cpp:77
+msgid "Show beings transparency"
+msgstr ""
+
#: src/gui/setup_perfomance.cpp:80
msgid "Enable reorder sprites."
msgstr ""
@@ -2379,7 +2401,7 @@ msgid "FPS limit:"
msgstr "FPS限制:"
#: src/gui/setup_video.cpp:306 src/gui/setup_video.cpp:341
-#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:709
+#: src/gui/setup_video.cpp:562 src/gui/setup_video.cpp:710
msgid "Alt FPS limit: "
msgstr ""
@@ -2405,7 +2427,7 @@ msgstr "l"
#: src/gui/setup_video.cpp:339 src/gui/setup_video.cpp:342
#: src/gui/setup_video.cpp:561 src/gui/setup_video.cpp:696
-#: src/gui/setup_video.cpp:707
+#: src/gui/setup_video.cpp:708
msgid "None"
msgstr "w"
@@ -2511,22 +2533,22 @@ msgstr "升级"
msgid "Skill points available: %d"
msgstr "技能点:%d个"
-#: src/gui/skilldialog.cpp:418
+#: src/gui/skilldialog.cpp:420
#, c-format
msgid "Skill Set %d"
msgstr ""
-#: src/gui/skilldialog.cpp:430
+#: src/gui/skilldialog.cpp:432
#, c-format
msgid "Skill %d"
msgstr "技能为%d"
-#: src/gui/skilldialog.cpp:497 src/gui/skilldialog.cpp:550
+#: src/gui/skilldialog.cpp:499 src/gui/skilldialog.cpp:554
#, c-format
msgid "Lvl: %d"
msgstr "等级: %d"
-#: src/gui/skilldialog.cpp:542
+#: src/gui/skilldialog.cpp:546
#, c-format
msgid "Lvl: %d (%+d)"
msgstr "等级: %d(%+d)"
@@ -3449,23 +3471,23 @@ msgstr "家居广场边界"
msgid "Road Point"
msgstr "路点"
-#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:472
+#: src/gui/whoisonline.cpp:81 src/gui/whoisonline.cpp:474
msgid "Who Is Online - Updating"
msgstr "谁在线 - 更新"
-#: src/gui/whoisonline.cpp:102
+#: src/gui/whoisonline.cpp:104
msgid "Update"
msgstr "更新"
-#: src/gui/whoisonline.cpp:295
+#: src/gui/whoisonline.cpp:297
msgid "Who Is Online - "
msgstr "谁在线 -"
-#: src/gui/whoisonline.cpp:486
+#: src/gui/whoisonline.cpp:488
msgid "Who Is Online - error"
msgstr "谁在线 - 错误"
-#: src/gui/whoisonline.cpp:517
+#: src/gui/whoisonline.cpp:519
msgid "Who Is Online - Update"
msgstr "谁在线 - 更新"
@@ -4133,67 +4155,67 @@ msgid ""
"strange behaviour."
msgstr ""
-#: src/localplayer.cpp:370
+#: src/localplayer.cpp:372
msgid "You were killed by "
msgstr "你被打死"
-#: src/localplayer.cpp:1401
+#: src/localplayer.cpp:1413
msgid "Tried to pick up nonexistent item."
msgstr ""
-#: src/localplayer.cpp:1403
+#: src/localplayer.cpp:1415
msgid "Item is too heavy."
msgstr "项目是太重了。"
-#: src/localplayer.cpp:1405
+#: src/localplayer.cpp:1417
msgid "Item is too far away."
msgstr "物品太远了。"
-#: src/localplayer.cpp:1407
+#: src/localplayer.cpp:1419
msgid "Inventory is full."
msgstr ""
-#: src/localplayer.cpp:1409
+#: src/localplayer.cpp:1421
msgid "Stack is too big."
msgstr ""
-#: src/localplayer.cpp:1412
+#: src/localplayer.cpp:1424
msgid "Item belongs to someone else."
msgstr ""
-#: src/localplayer.cpp:1415
+#: src/localplayer.cpp:1427
msgid "Unknown problem picking up item."
msgstr ""
#. TRANSLATORS: %d is number,
#. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1439
+#: src/localplayer.cpp:1451
#, c-format
msgid "You picked up %d [@@%d|%s@@]."
msgid_plural "You picked up %d [@@%d|%s@@]."
msgstr[0] "你拾起%d[@@%d|%s @@]。"
-#: src/localplayer.cpp:3173
+#: src/localplayer.cpp:3187
msgid "Away"
msgstr "距离"
-#: src/localplayer.cpp:3474
+#: src/localplayer.cpp:3488
msgid "Follow: "
msgstr "跟随:"
-#: src/localplayer.cpp:3476 src/localplayer.cpp:3491
+#: src/localplayer.cpp:3490 src/localplayer.cpp:3505
msgid "Follow canceled"
msgstr ""
-#: src/localplayer.cpp:3483
+#: src/localplayer.cpp:3497
msgid "Imitation: "
msgstr ""
-#: src/localplayer.cpp:3485 src/localplayer.cpp:3493
+#: src/localplayer.cpp:3499 src/localplayer.cpp:3507
msgid "Imitation canceled"
msgstr ""
-#: src/localplayer.cpp:3845
+#: src/localplayer.cpp:3859
msgid "You see "
msgstr "你看"
@@ -4394,16 +4416,16 @@ msgstr "MVP球员。"
msgid "MVP player: "
msgstr "MVP球员:"
-#: src/net/ea/gamehandler.cpp:86
+#: src/net/ea/gamehandler.cpp:87
#, c-format
msgid "Online users: %d"
msgstr "在线用户数:%d"
-#: src/net/ea/gamehandler.cpp:98
+#: src/net/ea/gamehandler.cpp:99
msgid "Game"
msgstr "游戏"
-#: src/net/ea/gamehandler.cpp:98
+#: src/net/ea/gamehandler.cpp:99
msgid "Request to quit denied!"
msgstr ""
@@ -5451,19 +5473,19 @@ msgstr "连接到服务器终止。"
msgid "%s is not in your party!"
msgstr "%s不在你的帮会中!"
-#: src/playerrelations.cpp:414
+#: src/playerrelations.cpp:429
msgid "Print '...'"
msgstr ""
-#: src/playerrelations.cpp:434
+#: src/playerrelations.cpp:449
msgid "Blink name"
msgstr ""
-#: src/playerrelations.cpp:478
+#: src/playerrelations.cpp:493
msgid "Floating '...' bubble"
msgstr ""
-#: src/playerrelations.cpp:481
+#: src/playerrelations.cpp:496
msgid "Floating bubble"
msgstr "流动的泡沫"